Revision: 201011
authorDremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
Fri, 16 Apr 2010 14:53:31 +0300
changeset 18 7d11f9a6646f
parent 4 75a71fdb4c92
child 21 c707676bf59f
Revision: 201011 Kit: 201015
applicationmanagement/BWINS/ApplicationManagementu.def
applicationmanagement/RfsPlugin/group/RfsAppMgmtPlugin.mmp
applicationmanagement/RfsPlugin/group/bld.inf
applicationmanagement/RfsPlugin/inc/RfsAppMgmtPlugin.h
applicationmanagement/RfsPlugin/src/102073BF.rss
applicationmanagement/RfsPlugin/src/Proxy.cpp
applicationmanagement/RfsPlugin/src/RfsAppMgmtPlugin.cpp
applicationmanagement/amadapter2/group/amadapter.mmp
applicationmanagement/amadapter2/group/bld.inf
applicationmanagement/amadapter2/inc/amadapter.h
applicationmanagement/amadapter2/inc/nsmldmiapmatcher.h
applicationmanagement/amadapter2/inc/nsmldmuri.h
applicationmanagement/amadapter2/rom/amadapter.iby
applicationmanagement/amadapter2/src/amadapter.cpp
applicationmanagement/amadapter2/src/amadapter.rss
applicationmanagement/amadapter2/src/nsmldmiapmatcher.cpp
applicationmanagement/amadapter2/src/nsmldmuri.cpp
applicationmanagement/build_am.bat
applicationmanagement/build_am_all.bat
applicationmanagement/build_am_tests.bat
applicationmanagement/build_module.bat
applicationmanagement/cenrep/keys_application_management.xls
applicationmanagement/clean_am.bat
applicationmanagement/clean_am_all.bat
applicationmanagement/clean_am_tests.bat
applicationmanagement/clean_module.bat
applicationmanagement/client/BWINS/ApplicationManagementu.def
applicationmanagement/client/eabi/ApplicationManagementu.def
applicationmanagement/client/group/ApplicationManagementClient.mmp
applicationmanagement/client/group/bld.inf
applicationmanagement/client/src/ApplicationManagementClient.cpp
applicationmanagement/conf/application_management.confml
applicationmanagement/conf/application_management_1020781C.crml
applicationmanagement/deployam.bat
applicationmanagement/eabi/ApplicationManagementu.def
applicationmanagement/group/bld.inf
applicationmanagement/inc/ApplicationManagementClient.h
applicationmanagement/inc/ApplicationManagementClientServer.h
applicationmanagement/inc/ApplicationManagementCommon.h
applicationmanagement/inc/ApplicationManagementConst.h
applicationmanagement/inc/ApplicationManagementRfs.h
applicationmanagement/inc/amprivateCRKeys.h
applicationmanagement/inc/ampskeys.h
applicationmanagement/inc/debug.h
applicationmanagement/omascomoadapter/group/bld.inf
applicationmanagement/omascomoadapter/group/omascomoadapter.mmp
applicationmanagement/omascomoadapter/inc/nsmldmiapmatcher.h
applicationmanagement/omascomoadapter/inc/nsmldmuri.h
applicationmanagement/omascomoadapter/inc/omascomoadapter.h
applicationmanagement/omascomoadapter/inc/omascomoadapterdb.h
applicationmanagement/omascomoadapter/src/20021335.SPD
applicationmanagement/omascomoadapter/src/20021335.txt
applicationmanagement/omascomoadapter/src/nsmldmiapmatcher.cpp
applicationmanagement/omascomoadapter/src/nsmldmuri.cpp
applicationmanagement/omascomoadapter/src/omascomoadapter.cpp
applicationmanagement/omascomoadapter/src/omascomoadapter.rss
applicationmanagement/omascomoadapter/src/omascomoadapterdb.cpp
applicationmanagement/options/BWINS/AMInstallOptionsu.def
applicationmanagement/options/eabi/AMInstallOptionsu.def
applicationmanagement/options/group/AMInstallOptions.mmp
applicationmanagement/options/group/bld.inf
applicationmanagement/options/group/instopts_def.xml
applicationmanagement/options/inc/aminstalloptions.h
applicationmanagement/options/inc/aminstalloptionsint.h
applicationmanagement/options/rom/aminstalloptions.iby
applicationmanagement/options/src/AMInstallOptions.cpp
applicationmanagement/rom/1020781C.txt
applicationmanagement/rom/appmgmt.iby
applicationmanagement/server/group/ApplicationManagementServer.mmp
applicationmanagement/server/group/ApplicationManagement_reg.rss
applicationmanagement/server/group/applicationmanagement.rss
applicationmanagement/server/group/bld.inf
applicationmanagement/server/inc/AMAppHideUtil.h
applicationmanagement/server/inc/AMDeploymentComponent.h
applicationmanagement/server/inc/AMDownload.h
applicationmanagement/server/inc/AMDownloadManager.h
applicationmanagement/server/inc/AMDownloaddb.h
applicationmanagement/server/inc/AMDownloader.h
applicationmanagement/server/inc/AMPreInstallApp.h
applicationmanagement/server/inc/AppMgmtProgDialog.h
applicationmanagement/server/inc/AppMgmtSrvApp.h
applicationmanagement/server/inc/AppMgmtSrvDocument.h
applicationmanagement/server/inc/AppMgmtSrvUI.h
applicationmanagement/server/inc/ApplicationManagementJavaUtility.h
applicationmanagement/server/inc/ApplicationManagementServer.h
applicationmanagement/server/inc/ApplicationManagementUtility.h
applicationmanagement/server/inc/ApplicationManagementUtilityFactory.h
applicationmanagement/server/inc/PlatformSecurityPolicies.h
applicationmanagement/server/inc/amdeploymentcomponent.inl
applicationmanagement/server/inc/amdeploymentcomponentdata.h
applicationmanagement/server/inc/amsmlhelper.h
applicationmanagement/server/inc/amstorage.h
applicationmanagement/server/inc/nsmldmiapmatcher.h
applicationmanagement/server/inc/nsmldmuri.h
applicationmanagement/server/loc/applicationmanagement.loc
applicationmanagement/server/src/1020781C.SPD
applicationmanagement/server/src/1020781C.txt
applicationmanagement/server/src/AMAppHideUtil.cpp
applicationmanagement/server/src/AMDeploymentComponent.cpp
applicationmanagement/server/src/AMDeploymentComponentData.cpp
applicationmanagement/server/src/AMDownload.cpp
applicationmanagement/server/src/AMDownloadManager.cpp
applicationmanagement/server/src/AMDownloaddb.cpp
applicationmanagement/server/src/AMDownloader.cpp
applicationmanagement/server/src/AMPreInstallApp.cpp
applicationmanagement/server/src/AMSmlHelper.cpp
applicationmanagement/server/src/AppMgmtProgDialog.cpp
applicationmanagement/server/src/AppMgmtSrvApp.cpp
applicationmanagement/server/src/AppMgmtSrvDocument.cpp
applicationmanagement/server/src/AppMgmtSrvUi.cpp
applicationmanagement/server/src/ApplicationManagementJavaUtility.cpp
applicationmanagement/server/src/ApplicationManagementJavaUtilityFactory.cpp
applicationmanagement/server/src/ApplicationManagementServer.cpp
applicationmanagement/server/src/ApplicationManagementUtility.cpp
applicationmanagement/server/src/ApplicationManagementUtilityFactory.cpp
applicationmanagement/server/src/amstorage.cpp
applicationmanagement/server/src/nsmldmiapmatcher.cpp
applicationmanagement/server/src/nsmldmuri.cpp
applicationmanagement/tsrc/tarmappmng/BWINS/amtestu.def
applicationmanagement/tsrc/tarmappmng/conf/amtest.cfg
applicationmanagement/tsrc/tarmappmng/data/dmtestmappings.txt
applicationmanagement/tsrc/tarmappmng/data/testhbuf_S60_3_X_v_1_0_0.SISx
applicationmanagement/tsrc/tarmappmng/data/verysilent_c_en.xml
applicationmanagement/tsrc/tarmappmng/eabi/amtestu.def
applicationmanagement/tsrc/tarmappmng/group/amtest.mmp
applicationmanagement/tsrc/tarmappmng/group/amtest.pkg
applicationmanagement/tsrc/tarmappmng/group/bld.inf
applicationmanagement/tsrc/tarmappmng/inc/TestDmDDFObject.h
applicationmanagement/tsrc/tarmappmng/inc/amtest.h
applicationmanagement/tsrc/tarmappmng/inc/dmatest.h
applicationmanagement/tsrc/tarmappmng/init/amtest.ini
applicationmanagement/tsrc/tarmappmng/src/TestDmDDFObject.cpp
applicationmanagement/tsrc/tarmappmng/src/amtest.cpp
applicationmanagement/tsrc/tarmappmng/src/amtestBlocks.cpp
applicationmanagement/tsrc/tarmappmng/src/dmatest.cpp
customization/DMUtils/bld/DMUtils.mmp
customization/DMUtils/bld/bld.inf
customization/DMUtils/inc/FileCoderB64.h
customization/DMUtils/inc/TARMCharConv.h
customization/DMUtils/inc/TARMDmAdapter.h
customization/DMUtils/inc/TARMDmStreamAdapter.h
customization/DMUtils/inc/TPtrC8I.h
customization/DMUtils/inc/nsmldmiapmatcher.h
customization/DMUtils/inc/nsmldmuri.h
customization/DMUtils/src/FileCoderB64.cpp
customization/DMUtils/src/TARMCharConv.cpp
customization/DMUtils/src/TARMDmAdapter.cpp
customization/DMUtils/src/TARMDmStreamAdapter.cpp
customization/DMUtils/src/nsmldmiapmatcher.cpp
customization/DMUtils/src/nsmldmuri.cpp
customization/EmbeddedLinkAdapter/bld/EmbeddedLinkAdapter.mmp
customization/EmbeddedLinkAdapter/bld/bld.inf
customization/EmbeddedLinkAdapter/inc/EmbeddedLinkAdapter.h
customization/EmbeddedLinkAdapter/inc/EmbeddedLinkApp.h
customization/EmbeddedLinkAdapter/inc/EmbeddedLinkHandler.h
customization/EmbeddedLinkAdapter/rom/EmbeddedLinkAdapter.iby
customization/EmbeddedLinkAdapter/src/EmbeddedLinkAdapter.cpp
customization/EmbeddedLinkAdapter/src/EmbeddedLinkAdapter.rss
customization/EmbeddedLinkAdapter/src/EmbeddedLinkApp.cpp
customization/EmbeddedLinkAdapter/src/EmbeddedLinkHandler.cpp
customization/Index.txt
customization/OperatorLogoAdapter/bld/OperatorLogoAdapter.mmp
customization/OperatorLogoAdapter/bld/bld.inf
customization/OperatorLogoAdapter/inc/OperatorLogoAdapter.h
customization/OperatorLogoAdapter/inc/SyncImageOperations.h
customization/OperatorLogoAdapter/rom/OperatorLogoAdapter.iby
customization/OperatorLogoAdapter/src/OperatorLogoAdapter.cpp
customization/OperatorLogoAdapter/src/OperatorLogoAdapter.rss
customization/OperatorLogoAdapter/src/SyncImageOperations.cpp
customization/ScreenSaverAdapter/ScreenSaverServer/Group/ScreenSaverClient.mmp
customization/ScreenSaverAdapter/ScreenSaverServer/Group/ScreenSaverServer.mmp
customization/ScreenSaverAdapter/ScreenSaverServer/Group/bld.inf
customization/ScreenSaverAdapter/ScreenSaverServer/bwins/ScreenSaverClientu.def
customization/ScreenSaverAdapter/ScreenSaverServer/eabi/ScreenSaverClientu.def
customization/ScreenSaverAdapter/ScreenSaverServer/inc/ScreenSaverClient.h
customization/ScreenSaverAdapter/ScreenSaverServer/inc/ScreenSaverClientServer.h
customization/ScreenSaverAdapter/ScreenSaverServer/inc/ScreenSaverServer.h
customization/ScreenSaverAdapter/ScreenSaverServer/inc/ScreenSaverSession.h
customization/ScreenSaverAdapter/ScreenSaverServer/src/ScreenSaverClient.cpp
customization/ScreenSaverAdapter/ScreenSaverServer/src/ScreenSaverServer.cpp
customization/ScreenSaverAdapter/ScreenSaverServer/src/ScreenSaverSession.cpp
customization/ScreenSaverAdapter/bld/ScreenSaverAdapter.mmp
customization/ScreenSaverAdapter/bld/bld.inf
customization/ScreenSaverAdapter/inc/ScreenSaverAdapter.h
customization/ScreenSaverAdapter/inc/ScreenSaverList.h
customization/ScreenSaverAdapter/rom/ScreenSaverAdapter.iby
customization/ScreenSaverAdapter/src/ScreenSaverAdapter.cpp
customization/ScreenSaverAdapter/src/ScreenSaverAdapter.rss
customization/ScreenSaverAdapter/src/ScreenSaverList.cpp
customization/ThemesAdapter/bld/ThemesAdapter.mmp
customization/ThemesAdapter/bld/bld.inf
customization/ThemesAdapter/inc/ThemesAdapter.h
customization/ThemesAdapter/inc/ThemesList.h
customization/ThemesAdapter/rom/ThemesAdapter.iby
customization/ThemesAdapter/src/ThemesAdapter.cpp
customization/ThemesAdapter/src/ThemesAdapter.rss
customization/ThemesAdapter/src/ThemesList.cpp
customization/UISettingsSrv/bld/bld.inf
customization/UISettingsSrv/client/BWINS/UISettingsClientu.def
customization/UISettingsSrv/client/eabi/UISettingsClientu.def
customization/UISettingsSrv/client/group/UISettingsClient.mmp
customization/UISettingsSrv/client/group/bld.inf
customization/UISettingsSrv/client/src/UISettingsSrvClient.cpp
customization/UISettingsSrv/inc/UISettingsSrvClient.h
customization/UISettingsSrv/inc/UISettingsSrvConstants.h
customization/UISettingsSrv/rom/UISettingsSrv.iby
customization/UISettingsSrv/rom/UISettingsSrvResources.iby
customization/UISettingsSrv/server/Data/UISettingsSrv.rss
customization/UISettingsSrv/server/Inc/UISettingsSrv.h
customization/UISettingsSrv/server/Inc/UISettingsSrv.hrh
customization/UISettingsSrv/server/Inc/UISettingsSrvApp.h
customization/UISettingsSrv/server/Inc/UISettingsSrvAppView.h
customization/UISettingsSrv/server/Inc/UISettingsSrvDocument.h
customization/UISettingsSrv/server/Inc/UISettingsSrvUi.h
customization/UISettingsSrv/server/Src/UISettingsSrvApp.cpp
customization/UISettingsSrv/server/Src/UISettingsSrvAppView.cpp
customization/UISettingsSrv/server/Src/UISettingsSrvDocument.cpp
customization/UISettingsSrv/server/Src/UISettingsSrvServer.cpp
customization/UISettingsSrv/server/Src/UISettingsSrvSession.cpp
customization/UISettingsSrv/server/Src/UISettingsSrvUi.cpp
customization/UISettingsSrv/server/aif/UISettingsSrv_aif.rss
customization/UISettingsSrv/server/aif/UISettingsSrv_reg.rss
customization/UISettingsSrv/server/aif/context_pane_icon.bmp
customization/UISettingsSrv/server/aif/context_pane_icon_mask.bmp
customization/UISettingsSrv/server/aif/list_icon.bmp
customization/UISettingsSrv/server/aif/list_icon_mask.bmp
customization/UISettingsSrv/server/group/UISettingsSrv.mmp
customization/UISettingsSrv/server/group/bld.inf
customization/UISettingsSrv/server/group/icons_aif_bitmaps_dc.MK
customization/UISettingsSrv/server/group/icons_aif_scalable_dc.MK
customization/WallpaperAdapter/bld/WallpaperAdapter.mmp
customization/WallpaperAdapter/bld/bld.inf
customization/WallpaperAdapter/inc/WallpaperAdapter.h
customization/WallpaperAdapter/rom/WallpaperAdapter.iby
customization/WallpaperAdapter/src/WallpaperAdapter.cpp
customization/WallpaperAdapter/src/WallpaperAdapter.rss
customization/build_adapter.bat
customization/build_adapters.bat
customization/cenrep/keys_customization.xls
customization/clean_adapter.bat
customization/clean_adapters.bat
customization/conf/customization.confml
customization/conf/customization_10207831.crml
customization/group/bld.inf
customization/include/debug.h
customization/isadapter/bld/bld.inf
customization/isadapter/bld/isadapter.mmp
customization/isadapter/inc/IdleSoftkeysAppTargetManager.h
customization/isadapter/inc/IdleSoftkeysWebTargetManager.h
customization/isadapter/inc/IsAdapterConstants.h
customization/isadapter/inc/IsAdapterDefines.h
customization/isadapter/inc/IsAdapterLiterals.h
customization/isadapter/inc/UiSettingsUtil.h
customization/isadapter/inc/isadapter.h
customization/isadapter/rom/10207831.txt
customization/isadapter/rom/isadapter.iby
customization/isadapter/src/IdleSoftkeysAppTargetManager.cpp
customization/isadapter/src/IdleSoftkeysWebTargetManager.cpp
customization/isadapter/src/UiSettingsUtil.cpp
customization/isadapter/src/isadapter.cpp
customization/isadapter/src/isadapter.rss
customization/supadapter/bld/bld.inf
customization/supadapter/bld/supadapter.mmp
customization/supadapter/inc/supadapter.h
customization/supadapter/rom/supadapter.iby
customization/supadapter/src/supadapter.cpp
customization/supadapter/src/supadapter.rss
customization/tsrc/tarmcustomization/BWINS/ThemesTestu.def
customization/tsrc/tarmcustomization/conf/ThemesTest.cfg
customization/tsrc/tarmcustomization/data/bug_OpLogoAdapter.jpg
customization/tsrc/tarmcustomization/data/bug_SupAdapter.jpg
customization/tsrc/tarmcustomization/data/bug_WallPaperAdapter.jpg
customization/tsrc/tarmcustomization/data/dontpush_IsAdapter.jpg
customization/tsrc/tarmcustomization/data/testhbuf_S60_3_X_v_1_0_0.SISx
customization/tsrc/tarmcustomization/data/verysilent_c_en.xml
customization/tsrc/tarmcustomization/eabi/ThemesTestu.def
customization/tsrc/tarmcustomization/group/ThemesTest.iby
customization/tsrc/tarmcustomization/group/ThemesTest.mmp
customization/tsrc/tarmcustomization/group/ThemesTest.pkg
customization/tsrc/tarmcustomization/group/bld.inf
customization/tsrc/tarmcustomization/inc/TestDmCallback.h
customization/tsrc/tarmcustomization/inc/TestDmDDFObject.h
customization/tsrc/tarmcustomization/inc/TestParams.h
customization/tsrc/tarmcustomization/inc/ThemesTest.h
customization/tsrc/tarmcustomization/init/ThemesTest.ini
customization/tsrc/tarmcustomization/src/TestDmCallback.cpp
customization/tsrc/tarmcustomization/src/TestDmDDFObject.cpp
customization/tsrc/tarmcustomization/src/TestParams.cpp
customization/tsrc/tarmcustomization/src/ThemesTest.cpp
customization/tsrc/tarmcustomization/src/ThemesTestBlocks.cpp
devicecontrol.pro
devicediagnostics/Updates/devdiagapp.pkg
devicediagnostics/Updates/devdiagapp_sis.bat
devicediagnostics/build/cenrep/cenrep.bat
devicediagnostics/build/cenrep/keys_devdiag.xls
devicediagnostics/build/cenrep/keys_devdiagvibratest.xls
devicediagnostics/build/cenrep/keys_diagaudiorecorderplugin.xls
devicediagnostics/build/cenrep/keys_diagbrowserplugin.xls
devicediagnostics/build/cenrep/keys_diagdatanetworktestplugin.xls
devicediagnostics/build/cenrep/keys_diagnosticsfw.xls
devicediagnostics/build/cenrep/keys_diagresultsdb.xls
devicediagnostics/build/cenrep/keys_diagspeakertestplugin.xls
devicediagnostics/build/cenrep/keys_pdnetworkcoveragetest.xls
devicediagnostics/build/cenrep_sis.bat
devicediagnostics/build/cenrep_sis.pkg
devicediagnostics/build/devdiagapp_armv5_udeb.pkg
devicediagnostics/build/devdiagapp_cenrep.pkg
devicediagnostics/build/devdiagapp_udeb_sis.bat
devicediagnostics/build/s60_rnd/rd_rootca/rd-key.pem
devicediagnostics/build/s60_rnd/rd_rootca/rd.cer
devicediagnostics/devdiagapp/cenrep_files/clean_cenrep.bat
devicediagnostics/devdiagapp/cenrep_files/create_cenrep.bat
devicediagnostics/devdiagapp/cenrep_files/keys_devdiag.xls
devicediagnostics/devdiagapp/cenrep_files/output/inifiles/2000E542.txt
devicediagnostics/devdiagapp/cenrep_files/output/key_sheets_info.storable
devicediagnostics/devdiagapp/cenrep_files/output/rfs/cenrep_rfs.txt
devicediagnostics/devdiagapp/conf/devdiag.confml
devicediagnostics/devdiagapp/conf/devdiag_2000E542.crml
devicediagnostics/devdiagapp/data/devdiagapp.rss
devicediagnostics/devdiagapp/data/devdiagapp_loc.rss
devicediagnostics/devdiagapp/data/devdiagapp_reg.rss
devicediagnostics/devdiagapp/group/bld.inf
devicediagnostics/devdiagapp/group/devdiag_icons_aif_scalable.mk
devicediagnostics/devdiagapp/group/devdiagapp.mmp
devicediagnostics/devdiagapp/group/devdiagapp.xml
devicediagnostics/devdiagapp/inc/devdiag.pan
devicediagnostics/devdiagapp/inc/devdiagapp.hrh
devicediagnostics/devdiagapp/inc/devdiagappapplication.h
devicediagnostics/devdiagapp/inc/devdiagappappui.h
devicediagnostics/devdiagapp/inc/devdiagappdocument.h
devicediagnostics/devdiagapp/inc/devdiagcommoncanceldialogs.h
devicediagnostics/devdiagapp/inc/devdiagcommonskipdialogs.h
devicediagnostics/devdiagapp/inc/devdiagdef.h
devicediagnostics/devdiagapp/inc/devdiagengine.h
devicediagnostics/devdiagapp/inc/devdiagengineobserver.h
devicediagnostics/devdiagapp/inc/devdiagexecutionresults.h
devicediagnostics/devdiagapp/inc/devdiagplugincontainer.h
devicediagnostics/devdiagapp/inc/devdiagpluginview.h
devicediagnostics/devdiagapp/inc/devdiagprivatecrkeys.h
devicediagnostics/devdiagapp/inc/devdiagruntimereqsinfo.h
devicediagnostics/devdiagapp/inc/devdiagsuitecontainer.h
devicediagnostics/devdiagapp/inc/devdiagsuiteview.h
devicediagnostics/devdiagapp/inc/devdiagutil.h
devicediagnostics/devdiagapp/loc/devdiagapp.loc
devicediagnostics/devdiagapp/rom_files/devdiagapp_ui.iby
devicediagnostics/devdiagapp/rom_files/devdiagapp_ui_resources.iby
devicediagnostics/devdiagapp/src/devdiagapp.cpp
devicediagnostics/devdiagapp/src/devdiagappapplication.cpp
devicediagnostics/devdiagapp/src/devdiagappappui.cpp
devicediagnostics/devdiagapp/src/devdiagappdocument.cpp
devicediagnostics/devdiagapp/src/devdiagcommoncanceldialogs.cpp
devicediagnostics/devdiagapp/src/devdiagcommonskipdialogs.cpp
devicediagnostics/devdiagapp/src/devdiagengine.cpp
devicediagnostics/devdiagapp/src/devdiagexecutionresults.cpp
devicediagnostics/devdiagapp/src/devdiagexecutionresults_old.cpp
devicediagnostics/devdiagapp/src/devdiagplugincontainer.cpp
devicediagnostics/devdiagapp/src/devdiagpluginview.cpp
devicediagnostics/devdiagapp/src/devdiagruntimereqsInfo.cpp
devicediagnostics/devdiagapp/src/devdiagsuitecontainer.cpp
devicediagnostics/devdiagapp/src/devdiagsuiteview.cpp
devicediagnostics/devdiagapp/src/devdiagutil.cpp
devicediagnostics/devdiaggsplugin/data/2000E544.rss
devicediagnostics/devdiaggsplugin/data/gsdevdiagpluginrsc.rss
devicediagnostics/devdiaggsplugin/group/bld.inf
devicediagnostics/devdiaggsplugin/group/clean.cmd
devicediagnostics/devdiaggsplugin/group/gsdevdiagplugin.mmp
devicediagnostics/devdiaggsplugin/group/gsdevdiagpluginicons.mk
devicediagnostics/devdiaggsplugin/inc/gsdevdiagplugin.h
devicediagnostics/devdiaggsplugin/inc/gsdevdiagplugin.hrh
devicediagnostics/devdiaggsplugin/inc/gsdevdiagplugin.loc
devicediagnostics/devdiaggsplugin/loc/gsdevdiagplugin.loc
devicediagnostics/devdiaggsplugin/rom_files/gsdevdiagplugin.iby
devicediagnostics/devdiaggsplugin/rom_files/gsdevdiagplugin_resources.iby
devicediagnostics/devdiaggsplugin/src/gsdevdiagplugin.cpp
devicediagnostics/devdiaggsplugin/src/gsdevdiagpluginimplementationtable.cpp
devicediagnostics/diagplugins/DiagInternalMemoryPlugin/data/devdiaginternalmemoryplugin.rss
devicediagnostics/diagplugins/DiagInternalMemoryPlugin/data/devdiaginternalmemorypluginrsc.rss
devicediagnostics/diagplugins/DiagInternalMemoryPlugin/group/bld.inf
devicediagnostics/diagplugins/DiagInternalMemoryPlugin/group/diaginternalmemoryplugin.mmp
devicediagnostics/diagplugins/DiagInternalMemoryPlugin/group/diaginternalmemoryplugin.xml
devicediagnostics/diagplugins/DiagInternalMemoryPlugin/inc/diaginternalmemoryplugin.h
devicediagnostics/diagplugins/DiagInternalMemoryPlugin/inc/diaginternalmemoryplugin.hrh
devicediagnostics/diagplugins/DiagInternalMemoryPlugin/loc/diaginternalmemoryplugin.loc
devicediagnostics/diagplugins/DiagInternalMemoryPlugin/rom_files/diaginternalmemoryplugin.iby
devicediagnostics/diagplugins/DiagInternalMemoryPlugin/rom_files/diaginternalmemoryplugin_resources.iby
devicediagnostics/diagplugins/DiagInternalMemoryPlugin/src/diaginternalmemoryplugin.cpp
devicediagnostics/diagplugins/DiagInternalMemoryPlugin/src/diaginternalmemorypluginimplementationtable.cpp
devicediagnostics/diagplugins/diagbatterychargerplugin/data/devdiagbatterychargercabletestplugin.rss
devicediagnostics/diagplugins/diagbatterychargerplugin/data/devdiagbatterychargercabletestpluginrsc.rss
devicediagnostics/diagplugins/diagbatterychargerplugin/group/bld.inf
devicediagnostics/diagplugins/diagbatterychargerplugin/group/diagbatterychargercabletestplugin.mmp
devicediagnostics/diagplugins/diagbatterychargerplugin/inc/diagbatterychargercableengine.h
devicediagnostics/diagplugins/diagbatterychargerplugin/inc/diagbatterychargercableplugin.h
devicediagnostics/diagplugins/diagbatterychargerplugin/inc/diagbatterychargercabletestplugin.hrh
devicediagnostics/diagplugins/diagbatterychargerplugin/inc/diagbatterychargercallbackinterface.h
devicediagnostics/diagplugins/diagbatterychargerplugin/loc/diagbatterychargercabletestplugin.loc
devicediagnostics/diagplugins/diagbatterychargerplugin/rom_files/devdiagbatterychargerplugin.iby
devicediagnostics/diagplugins/diagbatterychargerplugin/rom_files/devdiagbatterychargerplugin_resources.iby
devicediagnostics/diagplugins/diagbatterychargerplugin/src/diagbatterychargercableengine.cpp
devicediagnostics/diagplugins/diagbatterychargerplugin/src/diagbatterychargercableplugin.cpp
devicediagnostics/diagplugins/diagbatterychargerplugin/src/diagbatterychargerpluginimpltbl.cpp
devicediagnostics/diagplugins/diagbrowserplugin/cenrep_files/clean_cenrep.bat
devicediagnostics/diagplugins/diagbrowserplugin/cenrep_files/create_cenrep.bat
devicediagnostics/diagplugins/diagbrowserplugin/cenrep_files/keys_diagbrowserplugin.xls
devicediagnostics/diagplugins/diagbrowserplugin/conf/diagbrowserplugin.confml
devicediagnostics/diagplugins/diagbrowserplugin/conf/diagbrowserplugin_2000E59A.crml
devicediagnostics/diagplugins/diagbrowserplugin/data/devdiagbrowserplugin.rss
devicediagnostics/diagplugins/diagbrowserplugin/data/devdiagbrowserpluginrsc.rss
devicediagnostics/diagplugins/diagbrowserplugin/group/bld.inf
devicediagnostics/diagplugins/diagbrowserplugin/group/diagbrowserplugin.mmp
devicediagnostics/diagplugins/diagbrowserplugin/inc/diagbrowserplugin.h
devicediagnostics/diagplugins/diagbrowserplugin/inc/diagbrowserplugin.hrh
devicediagnostics/diagplugins/diagbrowserplugin/inc/diagbrowserplugin.pan
devicediagnostics/diagplugins/diagbrowserplugin/inc/diagbrowserpluginmodel.h
devicediagnostics/diagplugins/diagbrowserplugin/inc/diagbrowserpluginmodelobserver.h
devicediagnostics/diagplugins/diagbrowserplugin/inc/diagbrowserpluginprivatecrkeys.h
devicediagnostics/diagplugins/diagbrowserplugin/loc/diagbrowserplugin.loc
devicediagnostics/diagplugins/diagbrowserplugin/rom_files/devdiagbrowserplugin.iby
devicediagnostics/diagplugins/diagbrowserplugin/rom_files/devdiagbrowserplugin_resources.iby
devicediagnostics/diagplugins/diagbrowserplugin/src/diagbrowserplugin.cpp
devicediagnostics/diagplugins/diagbrowserplugin/src/diagbrowserpluginimplementationtable.cpp
devicediagnostics/diagplugins/diagbrowserplugin/src/diagbrowserpluginmodel.cpp
devicediagnostics/diagplugins/diagdatanetworkplugin/cenrep_files/clean_cenrep.bat
devicediagnostics/diagplugins/diagdatanetworkplugin/cenrep_files/keys_diagdatanetworktestplugin.xls
devicediagnostics/diagplugins/diagdatanetworkplugin/cenrep_files/make_cenrep.bat
devicediagnostics/diagplugins/diagdatanetworkplugin/conf/diagdatanetworktestplugin.confml
devicediagnostics/diagplugins/diagdatanetworkplugin/conf/diagdatanetworktestplugin_2000E598.crml
devicediagnostics/diagplugins/diagdatanetworkplugin/data/devdiagdatanetworktestplugin.rss
devicediagnostics/diagplugins/diagdatanetworkplugin/data/devdiagdatanetworktestpluginrsc.rss
devicediagnostics/diagplugins/diagdatanetworkplugin/group/bld.inf
devicediagnostics/diagplugins/diagdatanetworkplugin/group/diagdatanetworktestplugin.mmp
devicediagnostics/diagplugins/diagdatanetworkplugin/inc/diagdatanetworkprivatecrkeys.h
devicediagnostics/diagplugins/diagdatanetworkplugin/inc/diagdatanetworktestcallbackinterface.h
devicediagnostics/diagplugins/diagdatanetworkplugin/inc/diagdatanetworktestpdpengine.h
devicediagnostics/diagplugins/diagdatanetworkplugin/inc/diagdatanetworktestplugin.h
devicediagnostics/diagplugins/diagdatanetworkplugin/inc/diagdatanetworktestplugin.hrh
devicediagnostics/diagplugins/diagdatanetworkplugin/loc/diagdatanetworktestplugin.loc
devicediagnostics/diagplugins/diagdatanetworkplugin/rom_files/devdiagdatanetworktestplugin.iby
devicediagnostics/diagplugins/diagdatanetworkplugin/rom_files/devdiagdatanetworktestplugin_resources.iby
devicediagnostics/diagplugins/diagdatanetworkplugin/src/diagdatanetworktestpdpengine.cpp
devicediagnostics/diagplugins/diagdatanetworkplugin/src/diagdatanetworktestplugin.cpp
devicediagnostics/diagplugins/diagdatanetworkplugin/src/diagdatanetworktestpluginimplementationtable.cpp
devicediagnostics/diagplugins/diagearpieceplugin/cenrep_files/cleanup.bat
devicediagnostics/diagplugins/diagearpieceplugin/cenrep_files/generate_ini.bat
devicediagnostics/diagplugins/diagearpieceplugin/cenrep_files/keys_diagaudiorecorderplugin.xls
devicediagnostics/diagplugins/diagearpieceplugin/conf/diagaudiorecorderplugin.confml
devicediagnostics/diagplugins/diagearpieceplugin/conf/diagaudiorecorderplugin_2000E58C.crml
devicediagnostics/diagplugins/diagearpieceplugin/data/devdiagaudioplugin.rss
devicediagnostics/diagplugins/diagearpieceplugin/data/devdiagaudiopluginrsc.rss
devicediagnostics/diagplugins/diagearpieceplugin/group/bld.inf
devicediagnostics/diagplugins/diagearpieceplugin/group/diagaudioplugin.mmp
devicediagnostics/diagplugins/diagearpieceplugin/inc/diagaudioplugin.h
devicediagnostics/diagplugins/diagearpieceplugin/inc/diagaudioplugin.hrh
devicediagnostics/diagplugins/diagearpieceplugin/inc/diagaudiorecorderprivatecrkeys.h
devicediagnostics/diagplugins/diagearpieceplugin/loc/diagaudioplugin.loc
devicediagnostics/diagplugins/diagearpieceplugin/rom_files/devdiagaudioplugin.iby
devicediagnostics/diagplugins/diagearpieceplugin/rom_files/devdiagaudioplugin_resources.iby
devicediagnostics/diagplugins/diagearpieceplugin/src/diagaudioplugin.cpp
devicediagnostics/diagplugins/diagearpieceplugin/src/diagaudiopluginimplementationtable.cpp
devicediagnostics/diagplugins/diagexternalmediacardplugin/data/devdiagexternalmediacardplugin.rss
devicediagnostics/diagplugins/diagexternalmediacardplugin/data/devdiagexternalmediacardpluginrsc.rss
devicediagnostics/diagplugins/diagexternalmediacardplugin/group/bld.inf
devicediagnostics/diagplugins/diagexternalmediacardplugin/group/diagexternalmediacardplugin.mmp
devicediagnostics/diagplugins/diagexternalmediacardplugin/group/diagexternalmediacardplugin.xml
devicediagnostics/diagplugins/diagexternalmediacardplugin/inc/diagexternalmediacardplugin.h
devicediagnostics/diagplugins/diagexternalmediacardplugin/inc/diagexternalmediacardplugin.hrh
devicediagnostics/diagplugins/diagexternalmediacardplugin/loc/diagexternalmediacardplugin.loc
devicediagnostics/diagplugins/diagexternalmediacardplugin/rom_files/devdiagextmediacardplugin.iby
devicediagnostics/diagplugins/diagexternalmediacardplugin/rom_files/devdiagextmediacardplugin_resources.iby
devicediagnostics/diagplugins/diagexternalmediacardplugin/src/diagexternalmediacardplugin.cpp
devicediagnostics/diagplugins/diagexternalmediacardplugin/src/diagexternalmediacardpluginimplementationtable.cpp
devicediagnostics/diagplugins/diagheadsetcableplugin/data/devdiagheadsetcabletestplugin.rss
devicediagnostics/diagplugins/diagheadsetcableplugin/data/devdiagheadsetcabletestpluginrsc.rss
devicediagnostics/diagplugins/diagheadsetcableplugin/group/bld.inf
devicediagnostics/diagplugins/diagheadsetcableplugin/group/diagheadsetcabletestplugin.mmp
devicediagnostics/diagplugins/diagheadsetcableplugin/group/diagheadsetcabletestplugin.xml
devicediagnostics/diagplugins/diagheadsetcableplugin/inc/diagheadsetcableengine.h
devicediagnostics/diagplugins/diagheadsetcableplugin/inc/diagheadsetcableplugin.h
devicediagnostics/diagplugins/diagheadsetcableplugin/inc/diagheadsetcabletestcallbackinterface.h
devicediagnostics/diagplugins/diagheadsetcableplugin/inc/diagheadsetcabletestplugin.hrh
devicediagnostics/diagplugins/diagheadsetcableplugin/loc/diagheadsetcabletestplugin.loc
devicediagnostics/diagplugins/diagheadsetcableplugin/rom_files/devdiagheadsetcableplugin.iby
devicediagnostics/diagplugins/diagheadsetcableplugin/rom_files/devdiagheadsetcableplugin_resources.iby
devicediagnostics/diagplugins/diagheadsetcableplugin/src/diagheadsetcableengine.cpp
devicediagnostics/diagplugins/diagheadsetcableplugin/src/diagheadsetcableplugin.cpp
devicediagnostics/diagplugins/diagheadsetcableplugin/src/diagheadsetpluginImplementationtable.cpp
devicediagnostics/diagplugins/diagloudspeakerplugin/cenrep_files/cleanup.bat
devicediagnostics/diagplugins/diagloudspeakerplugin/cenrep_files/generate_ini.bat
devicediagnostics/diagplugins/diagloudspeakerplugin/cenrep_files/keys_diagspeakertestplugin.xls
devicediagnostics/diagplugins/diagloudspeakerplugin/conf/diagspeakertestplugin.confml
devicediagnostics/diagplugins/diagloudspeakerplugin/conf/diagspeakertestplugin_2000E58E.crml
devicediagnostics/diagplugins/diagloudspeakerplugin/data/devdiagspeakerplugin.rss
devicediagnostics/diagplugins/diagloudspeakerplugin/data/devdiagspeakerpluginrsc.rss
devicediagnostics/diagplugins/diagloudspeakerplugin/group/bld.inf
devicediagnostics/diagplugins/diagloudspeakerplugin/group/diagspeakerplugin.mmp
devicediagnostics/diagplugins/diagloudspeakerplugin/group/diagspeakerplugin.xml
devicediagnostics/diagplugins/diagloudspeakerplugin/group/log.txt
devicediagnostics/diagplugins/diagloudspeakerplugin/inc/diagspeakerplugin.h
devicediagnostics/diagplugins/diagloudspeakerplugin/inc/diagspeakerplugin.hrh
devicediagnostics/diagplugins/diagloudspeakerplugin/inc/diagspeakertestprivatecrkeys.h
devicediagnostics/diagplugins/diagloudspeakerplugin/loc/diagspeakerplugin.loc
devicediagnostics/diagplugins/diagloudspeakerplugin/rom_files/devdiagspeakerplugin.iby
devicediagnostics/diagplugins/diagloudspeakerplugin/rom_files/devdiagspeakerplugin_resources.iby
devicediagnostics/diagplugins/diagloudspeakerplugin/src/diagspeakerplugin.cpp
devicediagnostics/diagplugins/diagloudspeakerplugin/src/diagspeakerpluginimplementationtable.cpp
devicediagnostics/diagplugins/diagnetcoverageplugin/cenrep_files/clean_cenrep.bat
devicediagnostics/diagplugins/diagnetcoverageplugin/cenrep_files/create_cenrep.bat
devicediagnostics/diagplugins/diagnetcoverageplugin/cenrep_files/keys_pdnetworkcoveragetest.xls
devicediagnostics/diagplugins/diagnetcoverageplugin/conf/pdnetworkcoveragetest.confml
devicediagnostics/diagplugins/diagnetcoverageplugin/conf/pdnetworkcoveragetest_2000E596.crml
devicediagnostics/diagplugins/diagnetcoverageplugin/data/devdiagnetcoverageplugin.rss
devicediagnostics/diagplugins/diagnetcoverageplugin/data/devdiagnetcoveragepluginrsc.rss
devicediagnostics/diagplugins/diagnetcoverageplugin/group/bld.inf
devicediagnostics/diagplugins/diagnetcoverageplugin/group/diagnetcoverageplugin.mmp
devicediagnostics/diagplugins/diagnetcoverageplugin/group/diagnetcoverageplugin.xml
devicediagnostics/diagplugins/diagnetcoverageplugin/inc/diagnetcoverageplugin.h
devicediagnostics/diagplugins/diagnetcoverageplugin/inc/diagnetcoverageplugin.hrh
devicediagnostics/diagplugins/diagnetcoverageplugin/inc/diagnetcoveragepluginprivatecrkeys.h
devicediagnostics/diagplugins/diagnetcoverageplugin/loc/diagnetcoverageplugin.loc
devicediagnostics/diagplugins/diagnetcoverageplugin/rom_files/devdiagnetcoverageplugin.iby
devicediagnostics/diagplugins/diagnetcoverageplugin/rom_files/devdiagnetcoverageplugin_resources.iby
devicediagnostics/diagplugins/diagnetcoverageplugin/src/diagnetcoverageplugin.cpp
devicediagnostics/diagplugins/diagnetcoverageplugin/src/diagnetcoveragepluginimplementationtable.cpp
devicediagnostics/diagplugins/diagpdptestengine/inc/diagpdptestengine.h
devicediagnostics/diagplugins/diagpdptestengine/src/diagpdptestengine.cpp
devicediagnostics/diagplugins/diagusbcableplugin/data/devdiagusbcabletestplugin.rss
devicediagnostics/diagplugins/diagusbcableplugin/data/devdiagusbcabletestpluginrsc.rss
devicediagnostics/diagplugins/diagusbcableplugin/group/bld.inf
devicediagnostics/diagplugins/diagusbcableplugin/group/diagusbcabletestplugin.mmp
devicediagnostics/diagplugins/diagusbcableplugin/group/diagusbcabletestplugin.xml
devicediagnostics/diagplugins/diagusbcableplugin/inc/diagusbcabletestcallbackinterface.h
devicediagnostics/diagplugins/diagusbcableplugin/inc/diagusbcabletestengine.h
devicediagnostics/diagplugins/diagusbcableplugin/inc/diagusbcabletestplugin.h
devicediagnostics/diagplugins/diagusbcableplugin/inc/diagusbcabletestplugin.hrh
devicediagnostics/diagplugins/diagusbcableplugin/loc/diagusbcabletestplugin.loc
devicediagnostics/diagplugins/diagusbcableplugin/rom_files/devdiagusbcableplugin.iby
devicediagnostics/diagplugins/diagusbcableplugin/rom_files/devdiagusbcableplugin_resources.iby
devicediagnostics/diagplugins/diagusbcableplugin/src/diagusbcabletestengine.cpp
devicediagnostics/diagplugins/diagusbcableplugin/src/diagusbcabletestplugin.cpp
devicediagnostics/diagplugins/diagusbcableplugin/src/diagusbpluginimplementationtable.cpp
devicediagnostics/diagplugins/diagvibrateplugin/cenrep_files/clean_cenrep.bat
devicediagnostics/diagplugins/diagvibrateplugin/cenrep_files/create_cenrep.bat
devicediagnostics/diagplugins/diagvibrateplugin/cenrep_files/keys_devdiagvibratest.xls
devicediagnostics/diagplugins/diagvibrateplugin/conf/devdiagvibratest.confml
devicediagnostics/diagplugins/diagvibrateplugin/conf/devdiagvibratest_2000E586.crml
devicediagnostics/diagplugins/diagvibrateplugin/data/devdiagvibrateplugin.rss
devicediagnostics/diagplugins/diagvibrateplugin/data/devdiagvibratepluginrsc.rss
devicediagnostics/diagplugins/diagvibrateplugin/group/bld.inf
devicediagnostics/diagplugins/diagvibrateplugin/group/diagvibrateplugin.mmp
devicediagnostics/diagplugins/diagvibrateplugin/group/diagvibrateplugin.xml
devicediagnostics/diagplugins/diagvibrateplugin/inc/diagvibrateplugin.h
devicediagnostics/diagplugins/diagvibrateplugin/inc/diagvibrateplugin.hrh
devicediagnostics/diagplugins/diagvibrateplugin/inc/diagvibratepluginengine.h
devicediagnostics/diagplugins/diagvibrateplugin/inc/diagvibratepluginobserver.h
devicediagnostics/diagplugins/diagvibrateplugin/inc/diagvibratepluginprivatecrkeys.h
devicediagnostics/diagplugins/diagvibrateplugin/loc/devdiagvibrateplugin.loc
devicediagnostics/diagplugins/diagvibrateplugin/rom_files/devdiagvibrateplugin.iby
devicediagnostics/diagplugins/diagvibrateplugin/rom_files/devdiagvibrateplugin_resources.iby
devicediagnostics/diagplugins/diagvibrateplugin/src/diagvibrateplugin.cpp
devicediagnostics/diagplugins/diagvibrateplugin/src/diagvibratepluginImplementationtable.cpp
devicediagnostics/diagplugins/diagvibrateplugin/src/diagvibratepluginengine.cpp
devicediagnostics/diagplugins/group/bld.inf
devicediagnostics/diagsuites/diagconnectivitysuiteplugin/data/devdiagconnectivitysuiteplugin.rss
devicediagnostics/diagsuites/diagconnectivitysuiteplugin/data/devdiagconnectivitysuitepluginrsc.rss
devicediagnostics/diagsuites/diagconnectivitysuiteplugin/group/bld.inf
devicediagnostics/diagsuites/diagconnectivitysuiteplugin/group/diagconnectivitysuiteplugin.mmp
devicediagnostics/diagsuites/diagconnectivitysuiteplugin/group/diagconnectivitysuiteplugin_icons.mk
devicediagnostics/diagsuites/diagconnectivitysuiteplugin/inc/diagconnectivitysuiteplugin.h
devicediagnostics/diagsuites/diagconnectivitysuiteplugin/inc/diagconnectivitysuiteplugin.hrh
devicediagnostics/diagsuites/diagconnectivitysuiteplugin/inc/diagconnectivitysuiteplugin.pan
devicediagnostics/diagsuites/diagconnectivitysuiteplugin/loc/diagconnectivitysuiteplugin.loc
devicediagnostics/diagsuites/diagconnectivitysuiteplugin/rom_files/devdiagconnectivitysuiteplugin.iby
devicediagnostics/diagsuites/diagconnectivitysuiteplugin/src/diagconnectivitysuiteplugin.cpp
devicediagnostics/diagsuites/diagconnectivitysuiteplugin/src/diagconnectivitysuitepluginimplementationtable.cpp
devicediagnostics/diagsuites/diagcoveragesuiteplugin/data/devdiagcoveragesuiteplugin.rss
devicediagnostics/diagsuites/diagcoveragesuiteplugin/data/devdiagcoveragesuitepluginrsc.rss
devicediagnostics/diagsuites/diagcoveragesuiteplugin/group/bld.inf
devicediagnostics/diagsuites/diagcoveragesuiteplugin/group/diagcoveragesuiteplugin.mmp
devicediagnostics/diagsuites/diagcoveragesuiteplugin/group/diagcoveragesuiteplugin_icons.mk
devicediagnostics/diagsuites/diagcoveragesuiteplugin/inc/diagcoveragesuiteplugin.h
devicediagnostics/diagsuites/diagcoveragesuiteplugin/inc/diagcoveragesuiteplugin.hrh
devicediagnostics/diagsuites/diagcoveragesuiteplugin/inc/diagcoveragesuiteplugin.pan
devicediagnostics/diagsuites/diagcoveragesuiteplugin/loc/diagcoveragesuiteplugin.loc
devicediagnostics/diagsuites/diagcoveragesuiteplugin/rom_files/devdiagcoveragesuiteplugin.iby
devicediagnostics/diagsuites/diagcoveragesuiteplugin/src/diagcoveragesuiteplugin.cpp
devicediagnostics/diagsuites/diagcoveragesuiteplugin/src/diagcoveragesuitepluginimplementationtable.cpp
devicediagnostics/diagsuites/diaghardwaresuiteplugin/data/devdiaghardwaresuiteplugin.rss
devicediagnostics/diagsuites/diaghardwaresuiteplugin/data/devdiaghardwaresuitepluginrsc.rss
devicediagnostics/diagsuites/diaghardwaresuiteplugin/group/bld.inf
devicediagnostics/diagsuites/diaghardwaresuiteplugin/group/diaghardwaresuiteplugin.mmp
devicediagnostics/diagsuites/diaghardwaresuiteplugin/group/diaghardwaresuiteplugin_icons.mk
devicediagnostics/diagsuites/diaghardwaresuiteplugin/inc/diaghardwaresuiteplugin.h
devicediagnostics/diagsuites/diaghardwaresuiteplugin/inc/diaghardwaresuiteplugin.hrh
devicediagnostics/diagsuites/diaghardwaresuiteplugin/inc/diaghardwaresuiteplugin.pan
devicediagnostics/diagsuites/diaghardwaresuiteplugin/loc/diaghardwaresuiteplugin.loc
devicediagnostics/diagsuites/diaghardwaresuiteplugin/rom_files/devdiaghardwaresuiteplugin.iby
devicediagnostics/diagsuites/diaghardwaresuiteplugin/src/diaghardwaresuiteplugin.cpp
devicediagnostics/diagsuites/diaghardwaresuiteplugin/src/diaghardwaresuitepluginimplementationtable.cpp
devicediagnostics/diagsuites/diagservicessuiteplugin/data/devdiagservicessuiteplugin.rss
devicediagnostics/diagsuites/diagservicessuiteplugin/data/devdiagservicessuitepluginrsc.rss
devicediagnostics/diagsuites/diagservicessuiteplugin/group/bld.inf
devicediagnostics/diagsuites/diagservicessuiteplugin/group/diagservicessuiteplugin.mmp
devicediagnostics/diagsuites/diagservicessuiteplugin/group/diagservicessuiteplugin_icons.mk
devicediagnostics/diagsuites/diagservicessuiteplugin/inc/diagservicessuiteplugin.h
devicediagnostics/diagsuites/diagservicessuiteplugin/inc/diagservicessuiteplugin.hrh
devicediagnostics/diagsuites/diagservicessuiteplugin/inc/diagservicessuiteplugin.pan
devicediagnostics/diagsuites/diagservicessuiteplugin/loc/diagservicessuiteplugin.loc
devicediagnostics/diagsuites/diagservicessuiteplugin/rom_files/devdiagservicessuiteplugin.iby
devicediagnostics/diagsuites/diagservicessuiteplugin/src/diagservicessuiteplugin.cpp
devicediagnostics/diagsuites/diagservicessuiteplugin/src/diagservicessuitepluginimplementationtable.cpp
devicediagnostics/diagsuites/diagtoplevelsuiteplugin/data/devdiagtoplevelsuiteplugin.rss
devicediagnostics/diagsuites/diagtoplevelsuiteplugin/data/devdiagtoplevelsuitepluginrsc.rss
devicediagnostics/diagsuites/diagtoplevelsuiteplugin/group/bld.inf
devicediagnostics/diagsuites/diagtoplevelsuiteplugin/group/diagtoplevelsuiteplugin.mmp
devicediagnostics/diagsuites/diagtoplevelsuiteplugin/inc/diagtoplevelsuiteplugin.h
devicediagnostics/diagsuites/diagtoplevelsuiteplugin/inc/diagtoplevelsuiteplugin.hrh
devicediagnostics/diagsuites/diagtoplevelsuiteplugin/inc/diagtoplevelsuiteplugin.pan
devicediagnostics/diagsuites/diagtoplevelsuiteplugin/rom_files/devdiagtoplevelsuiteplugin.iby
devicediagnostics/diagsuites/diagtoplevelsuiteplugin/src/diagtoplevelsuiteplugin.cpp
devicediagnostics/diagsuites/diagtoplevelsuiteplugin/src/diagtoplevelsuitepluginimplementationtable.cpp
devicediagnostics/diagsuites/group/bld.inf
devicediagnostics/group/bld.inf
devicediagnostics/group/build.bat
devicediagnostics/group/parse_build_warnings.pl
devicediagnostics/sis/devdiagapp.pkg
devicediagnostics/sis/devdiagapp.sis
devicediagnostics/sis/devdiagapp_sis.bat
deviceupdatesui/adapters/bld/bld.inf
deviceupdatesui/adapters/devdetail/bld/DevDetail_HwV.txt
deviceupdatesui/adapters/devdetail/bld/DevDetail_SwV.txt
deviceupdatesui/adapters/devdetail/bld/bld.inf
deviceupdatesui/adapters/devdetail/bld/nsmldmdevdetailadapter.mmp
deviceupdatesui/adapters/devdetail/inc/nsmldmdevdetailadapter.h
deviceupdatesui/adapters/devdetail/src/nsmldmdevdetailadapter.cpp
deviceupdatesui/adapters/devdetail/src/nsmldmdevdetailadapter.rss
deviceupdatesui/adapters/devdetail/src/nsmldmdevdetailutils_ARM.cpp
deviceupdatesui/adapters/devdetail/src/nsmldmdevdetailutils_WINSCW.cpp
deviceupdatesui/adapters/devinfo/bld/bld.inf
deviceupdatesui/adapters/devinfo/bld/nsmldmdevinfoadapter.mmp
deviceupdatesui/adapters/devinfo/inc/nsmldmdevinfoadapter.h
deviceupdatesui/adapters/devinfo/src/nsmldmdevinfoadapter.cpp
deviceupdatesui/adapters/devinfo/src/nsmldmdevinfoadapter.rss
deviceupdatesui/adapters/inc/nsmldmimpluids.h
deviceupdatesui/adapters/syncmldm12/bld/bld.inf
deviceupdatesui/adapters/syncmldm12/bld/nsmldmsettingsadapter12.mmp
deviceupdatesui/adapters/syncmldm12/inc/NSmlDMSettingsAdapter12.h
deviceupdatesui/adapters/syncmldm12/src/NSmlDmSettingsAdapter12.cpp
deviceupdatesui/adapters/syncmldm12/src/nsmldmsettingsadapter12.rss
deviceupdatesui/adapters/syncmldm12/tsrc/bwins/syncmldm12testu.def
deviceupdatesui/adapters/syncmldm12/tsrc/conf/syncmldm12test.cfg
deviceupdatesui/adapters/syncmldm12/tsrc/eabi/syncmldm12testu.def
deviceupdatesui/adapters/syncmldm12/tsrc/group/bld.inf
deviceupdatesui/adapters/syncmldm12/tsrc/group/syncmldm12test.mmp
deviceupdatesui/adapters/syncmldm12/tsrc/group/syncmldm12test.pkg
deviceupdatesui/adapters/syncmldm12/tsrc/inc/TestDmDDFObject.h
deviceupdatesui/adapters/syncmldm12/tsrc/inc/dmatest.h
deviceupdatesui/adapters/syncmldm12/tsrc/inc/syncmldm12test.h
deviceupdatesui/adapters/syncmldm12/tsrc/init/syncmldm12test.ini
deviceupdatesui/adapters/syncmldm12/tsrc/src/TestDmDDFObject.cpp
deviceupdatesui/adapters/syncmldm12/tsrc/src/dmatest.cpp
deviceupdatesui/adapters/syncmldm12/tsrc/src/syncmldm12test.cpp
deviceupdatesui/adapters/syncmldm12/tsrc/src/syncmldm12testBlocks.cpp
deviceupdatesui/cpqtsp/Cpqtsp.pri
deviceupdatesui/cpqtsp/cpqtsp.pro
deviceupdatesui/cpqtsp/inc/CWPBioControl.h
deviceupdatesui/cpqtsp/inc/CWPNameValue.h
deviceupdatesui/cpqtsp/inc/CWPStringPair.h
deviceupdatesui/cpqtsp/inc/CpQtSpMainWindow.h
deviceupdatesui/cpqtsp/inc/CpQtSpView.h
deviceupdatesui/cpqtsp/inc/ProvisioningDebug.h
deviceupdatesui/cpqtsp/inc/ProvisioningUIDs.h
deviceupdatesui/cpqtsp/resources/service_conf.xml
deviceupdatesui/cpqtsp/rom/cpqtsp.iby
deviceupdatesui/cpqtsp/rom/cpsqtsp_resources.iby
deviceupdatesui/cpqtsp/src/CWPBioControl.cpp
deviceupdatesui/cpqtsp/src/CWPNameValue.cpp
deviceupdatesui/cpqtsp/src/CWPStringPair.cpp
deviceupdatesui/cpqtsp/src/CpQtSpMainWindow.cpp
deviceupdatesui/cpqtsp/src/CpQtSpView.cpp
deviceupdatesui/cpqtsp/src/main.cpp
deviceupdatesui/devicemanagementnotifiersplugin/PnpUtilLogger.h
deviceupdatesui/devicemanagementnotifiersplugin/devicemanagementnotifierdevman.qrc
deviceupdatesui/devicemanagementnotifiersplugin/devicemanagementnotifierplugin.cpp
deviceupdatesui/devicemanagementnotifiersplugin/devicemanagementnotifierplugin_p.h
deviceupdatesui/devicemanagementnotifiersplugin/devicemanagementnotifiersplugin.pro
deviceupdatesui/devicemanagementnotifiersplugin/devicemanagementnotifierutils.cpp
deviceupdatesui/devicemanagementnotifiersplugin/devicemanagementnotifierutils.h
deviceupdatesui/devicemanagementnotifiersplugin/devicemanagementnotifierwidget.cpp
deviceupdatesui/devicemanagementnotifiersplugin/devicemanagementnotifierwidget_p.h
deviceupdatesui/devicemanagementnotifiersplugin/iconnotifier.svg
deviceupdatesui/devicemanagementnotifiersplugin/syncmlnotifierprivate.cpp
deviceupdatesui/devicemanagementnotifiersplugin/syncmlnotifierprivate.h
deviceupdatesui/deviceupdates/conf/101F6DE5.txt
deviceupdatesui/deviceupdates/deviceupdates.pro
deviceupdatesui/deviceupdates/inc/dmadvancedview.h
deviceupdatesui/deviceupdates/inc/dmfotaview.h
deviceupdatesui/deviceupdates/inc/dminforetrieval.h
deviceupdatesui/deviceupdates/inc/nsmldmdbnotifier.h
deviceupdatesui/deviceupdates/inc/nsmldmdef.h
deviceupdatesui/deviceupdates/inc/nsmldmssyncui.hrh
deviceupdatesui/deviceupdates/inc/nsmldmsyncappengine.h
deviceupdatesui/deviceupdates/inc/nsmldmsyncdebug.h
deviceupdatesui/deviceupdates/inc/nsmldmsynchandler.h
deviceupdatesui/deviceupdates/inc/nsmldmsyncinternalpskeys.h
deviceupdatesui/deviceupdates/inc/nsmldmsyncprivatecrkeys.h
deviceupdatesui/deviceupdates/inc/nsmldmsyncprofile.h
deviceupdatesui/deviceupdates/inc/nsmldmsyncprofileitem.h
deviceupdatesui/deviceupdates/inc/nsmldmsyncprofilelist.h
deviceupdatesui/deviceupdates/inc/nsmldmsyncutil.h
deviceupdatesui/deviceupdates/inc/nsmldmuidefines.h
deviceupdatesui/deviceupdates/inc/serversettingsview.h
deviceupdatesui/deviceupdates/inc/settingsdataformcustomitem.h
deviceupdatesui/deviceupdates/resources/deviceupdates.qrc
deviceupdatesui/deviceupdates/resources/qgn_indi_sett_protected_add.svg
deviceupdatesui/deviceupdates/resources/qgn_prop_sml_bt.svg
deviceupdatesui/deviceupdates/resources/qgn_prop_sml_http.svg
deviceupdatesui/deviceupdates/resources/qgn_prop_sml_http_off.svg
deviceupdatesui/deviceupdates/resources/qtg_large_avatar.svg
deviceupdatesui/deviceupdates/rom/deviceupdates.iby
deviceupdatesui/deviceupdates/rom/deviceupdates_resources.iby
deviceupdatesui/deviceupdates/src/dmadvancedview.cpp
deviceupdatesui/deviceupdates/src/dmfotaview.cpp
deviceupdatesui/deviceupdates/src/dminforetrieval.cpp
deviceupdatesui/deviceupdates/src/main.cpp
deviceupdatesui/deviceupdates/src/nsmldmdbnotifier.cpp
deviceupdatesui/deviceupdates/src/nsmldmsyncappengine.cpp
deviceupdatesui/deviceupdates/src/nsmldmsynchandler.cpp
deviceupdatesui/deviceupdates/src/nsmldmsyncprofile.cpp
deviceupdatesui/deviceupdates/src/nsmldmsyncprofileitem.cpp
deviceupdatesui/deviceupdates/src/nsmldmsyncprofilelist.cpp
deviceupdatesui/deviceupdates/src/nsmldmsyncutil.cpp
deviceupdatesui/deviceupdates/src/serversettingsview.cpp
deviceupdatesui/deviceupdates/src/settingsdataformcustomitem.cpp
deviceupdatesui/deviceupdatesplugin/deviceupdatesplugin.pro
deviceupdatesui/deviceupdatesplugin/inc/deviceupdatesdata.h
deviceupdatesui/deviceupdatesplugin/inc/deviceupdatesplugin.h
deviceupdatesui/deviceupdatesplugin/src/deviceupdatesdata.cpp
deviceupdatesui/deviceupdatesplugin/src/deviceupdatesplugin.cpp
deviceupdatesui/deviceupdatesqtsp/deviceupdatesqtsp.pro
deviceupdatesui/deviceupdatesqtsp/inc/DmTelServiceHandler.h
deviceupdatesui/deviceupdatesqtsp/resources/service_conf.xml
deviceupdatesui/deviceupdatesqtsp/rom/deviceupdatesqtsp.iby
deviceupdatesui/deviceupdatesqtsp/rom/deviceupdatesqtsp_resources.iby
deviceupdatesui/deviceupdatesqtsp/src/DmTelServiceHandler.cpp
deviceupdatesui/deviceupdatesqtsp/src/main.cpp
deviceupdatesui/deviceupdatesui.pro
group/bld.inf
layers.sysdef.xml
omacp/group/bld.inf
omacp/group/omacplogger.h
omacp/omacpadapters/EmailAdapter/Group/101F84E4.rss
omacp/omacpadapters/EmailAdapter/Group/WPEmailAdapter.mmp
omacp/omacpadapters/EmailAdapter/Group/WPEmailAdapterResource.rss
omacp/omacpadapters/EmailAdapter/Group/bld.inf
omacp/omacpadapters/EmailAdapter/Inc/CWPEmailAdapter.h
omacp/omacpadapters/EmailAdapter/Inc/CWPEmailItem.h
omacp/omacpadapters/EmailAdapter/Inc/CWPEmailSaveItem.h
omacp/omacpadapters/EmailAdapter/Inc/CWPEmailSaveSmtpImapItem.h
omacp/omacpadapters/EmailAdapter/Inc/CWPEmailSaveSmtpPopItem.h
omacp/omacpadapters/EmailAdapter/Inc/EmailAdapter.pan
omacp/omacpadapters/EmailAdapter/src/CWPEmailAdapter.cpp
omacp/omacpadapters/EmailAdapter/src/CWPEmailAdapterGroupProxy.cpp
omacp/omacpadapters/EmailAdapter/src/CWPEmailAdapterMain.cpp
omacp/omacpadapters/EmailAdapter/src/CWPEmailItem.cpp
omacp/omacpadapters/EmailAdapter/src/CWPEmailLog.h
omacp/omacpadapters/EmailAdapter/src/CWPEmailSaveItem.cpp
omacp/omacpadapters/EmailAdapter/src/CWPEmailSaveSmtpImapItem.cpp
omacp/omacpadapters/EmailAdapter/src/CWPEmailSaveSmtpPopItem.cpp
omacp/omacpadapters/EmailAdapter/src/CWPLog.cpp
omacp/omacpadapters/EmailAdapter/src/Cwplog.h
omacp/omacpadapters/EmailAdapter/src/LogDef.h
omacp/omacpadapters/EmailAdapter/src/WPEmail.hrh
omacp/omacpadapters/group/bld.inf
omacp/omacpadapters/group/omacpadapteruids.h
omacp/omacpadapters/rom/omacpadapters.iby
omacp/omacpadapters/rom/omacpresources.iby
omadm/dcmo/dcmoadapters/extmemctrl/data/2002132B.rss
omadm/dcmo/dcmoadapters/extmemctrl/group/bld.inf
omadm/dcmo/dcmoadapters/extmemctrl/group/extmemctrldcmoadapter.mmp
omadm/dcmo/dcmoadapters/extmemctrl/inc/extmemctrldcmoadapter.h
omadm/dcmo/dcmoadapters/extmemctrl/src/extmemctrldcmoadapter.cpp
omadm/dcmo/dcmoadapters/extmemctrl/src/extmemctrldcmoadapterproxy.cpp
omadm/dcmo/dcmoadapters/group/bld.inf
omadm/dcmo/group/bld.inf
omadm/dcmo/rom/dcmo.iby
omadm/group/bld.inf
omadm/omadmappui/OmaDmCPPlugin/BWinscw/OmaDmCPPluginu.def
omadm/omadmappui/OmaDmCPPlugin/data/1028339D.rss
omadm/omadmappui/OmaDmCPPlugin/data/OmaDmCPPluginResource.rss
omadm/omadmappui/OmaDmCPPlugin/eabi/OmaDmCPPluginu.def
omadm/omadmappui/OmaDmCPPlugin/group/OmaDmCPPlugin.mmp
omadm/omadmappui/OmaDmCPPlugin/group/bld.inf
omadm/omadmappui/OmaDmCPPlugin/inc/OmaDMCPFlag.h
omadm/omadmappui/OmaDmCPPlugin/inc/OmaDMCPPlugin.h
omadm/omadmappui/OmaDmCPPlugin/src/OmaDMCPPlugin.cpp
omadm/omadmappui/aif/NSmlDMSyncaif.rss
omadm/omadmappui/cenrep/keys_nsmldmsync.xls
omadm/omadmappui/conf/nsmldmsync.confml
omadm/omadmappui/conf/nsmldmsync_101F6DE5.crml
omadm/omadmappui/data/NSmlDMSync.rss
omadm/omadmappui/data/NSmlDMSync_reg.rss
omadm/omadmappui/data/NsmlDMsync_caption.rss
omadm/omadmappui/group/NSmlDMSync.mmp
omadm/omadmappui/group/backup_registration.xml
omadm/omadmappui/group/bld.inf
omadm/omadmappui/group/dmui_icons.mk
omadm/omadmappui/group/dmui_icons_aif_bitmaps.mk
omadm/omadmappui/group/dmui_icons_aif_bitmaps_dc.mk
omadm/omadmappui/group/dmui_icons_aif_scalable.mk
omadm/omadmappui/group/dmui_icons_aif_scalable_dc.mk
omadm/omadmappui/group/dmui_icons_dc.mk
omadm/omadmappui/help/data/xhtml.zip
omadm/omadmappui/help/group/bld.inf
omadm/omadmappui/help/inc/dm.hlp.hrh
omadm/omadmappui/help/rom/omadmappuihelps_variant.iby
omadm/omadmappui/inc/NSmlDMAuthQueryDlg.h
omadm/omadmappui/inc/NSmlDMDbNotifier.h
omadm/omadmappui/inc/NSmlDMDlgProfileView.h
omadm/omadmappui/inc/NSmlDMFotaContainer.h
omadm/omadmappui/inc/NSmlDMFotaModel.h
omadm/omadmappui/inc/NSmlDMFotaSettingsDialog.h
omadm/omadmappui/inc/NSmlDMFotaView.h
omadm/omadmappui/inc/NSmlDMItemData.h
omadm/omadmappui/inc/NSmlDMProfilesContainer.h
omadm/omadmappui/inc/NSmlDMProfilesView.h
omadm/omadmappui/inc/NSmlDMProgress.h
omadm/omadmappui/inc/NSmlDMSync.hlp.hrh
omadm/omadmappui/inc/NSmlDMSyncApp.h
omadm/omadmappui/inc/NSmlDMSyncAppEngine.h
omadm/omadmappui/inc/NSmlDMSyncAppServer.h
omadm/omadmappui/inc/NSmlDMSyncAppUi.h
omadm/omadmappui/inc/NSmlDMSyncDebug.h
omadm/omadmappui/inc/NSmlDMSyncDialog.h
omadm/omadmappui/inc/NSmlDMSyncDocument.h
omadm/omadmappui/inc/NSmlDMSyncHandler.h
omadm/omadmappui/inc/NSmlDMSyncPrivateCRKeys.h
omadm/omadmappui/inc/NSmlDMSyncProfile.h
omadm/omadmappui/inc/NSmlDMSyncProfileItem.h
omadm/omadmappui/inc/NSmlDMSyncProfileList.h
omadm/omadmappui/inc/NSmlDMSyncState.h
omadm/omadmappui/inc/NSmlDMSyncUi.hrh
omadm/omadmappui/inc/NSmlDMSyncUtil.h
omadm/omadmappui/inc/NSmlDMUIDefines.h
omadm/omadmappui/inc/NSmlDMdef.h
omadm/omadmappui/inc/nsmldmsyncinternalpskeys.h
omadm/omadmappui/loc/NSmlDMSync.loc
omadm/omadmappui/loc/NSmlDMSyncFota.loc
omadm/omadmappui/rom/OmaDmAppUi.iby
omadm/omadmappui/rom/OmaDmAppUiResources.iby
omadm/omadmappui/src/NSmlDMAuthQueryDlg.cpp
omadm/omadmappui/src/NSmlDMDbNotifier.cpp
omadm/omadmappui/src/NSmlDMDlgProfileView.cpp
omadm/omadmappui/src/NSmlDMFotaContainer.cpp
omadm/omadmappui/src/NSmlDMFotaModel.cpp
omadm/omadmappui/src/NSmlDMFotaModel_nofota.cpp
omadm/omadmappui/src/NSmlDMFotaSettingsDialog.cpp
omadm/omadmappui/src/NSmlDMFotaView.cpp
omadm/omadmappui/src/NSmlDMItemData.cpp
omadm/omadmappui/src/NSmlDMProfilesContainer.cpp
omadm/omadmappui/src/NSmlDMProfilesView.cpp
omadm/omadmappui/src/NSmlDMProgress.cpp
omadm/omadmappui/src/NSmlDMSyncApp.cpp
omadm/omadmappui/src/NSmlDMSyncAppEngine.cpp
omadm/omadmappui/src/NSmlDMSyncAppServer.cpp
omadm/omadmappui/src/NSmlDMSyncAppUi_fota.cpp
omadm/omadmappui/src/NSmlDMSyncAppUi_nofota.cpp
omadm/omadmappui/src/NSmlDMSyncDialog.cpp
omadm/omadmappui/src/NSmlDMSyncDocument.cpp
omadm/omadmappui/src/NSmlDMSyncHandler.cpp
omadm/omadmappui/src/NSmlDMSyncProfile.cpp
omadm/omadmappui/src/NSmlDMSyncProfileItem.cpp
omadm/omadmappui/src/NSmlDMSyncProfileList.cpp
omadm/omadmappui/src/NSmlDMSyncState.cpp
omadm/omadmappui/src/NSmlDMSyncUtil.cpp
omadm/omadmappui/tsrc/Bmarm/ui_dmuiu.def
omadm/omadmappui/tsrc/Bwins/ui_dmuiu.def
omadm/omadmappui/tsrc/conf/tcConnSet.cfg
omadm/omadmappui/tsrc/conf/ui_dmui.cfg
omadm/omadmappui/tsrc/eabi/ui_dmuiu.def
omadm/omadmappui/tsrc/group/bld.inf
omadm/omadmappui/tsrc/group/ui_dmui.mmp
omadm/omadmappui/tsrc/group/ui_dmui.pkg
omadm/omadmappui/tsrc/inc/ui_dmui.h
omadm/omadmappui/tsrc/init/ui_dmui.ini
omadm/omadmappui/tsrc/src/ui_dmui.cpp
omadm/omadmappui/tsrc/src/ui_dmuiBlocks.cpp
omadm/omadmextensions/adapters/bld/bld.inf
omadm/omadmextensions/adapters/browseradapter/bld/bld.inf
omadm/omadmextensions/adapters/browseradapter/bld/nsmlbrowseradapter.mmp
omadm/omadmextensions/adapters/browseradapter/inc/nsmlbrowseradapter.h
omadm/omadmextensions/adapters/browseradapter/src/nsmlbrowseradapter.cpp
omadm/omadmextensions/adapters/browseradapter/src/nsmldmbrowseradapter.rss
omadm/omadmextensions/adapters/connmoadapter/group/bld.inf
omadm/omadmextensions/adapters/connmoadapter/group/connmoadapter.mmp
omadm/omadmextensions/adapters/connmoadapter/inc/AddBuffer.h
omadm/omadmextensions/adapters/connmoadapter/inc/BranchBase.h
omadm/omadmextensions/adapters/connmoadapter/inc/ConnMoAdapter.h
omadm/omadmextensions/adapters/connmoadapter/inc/NapBranch.h
omadm/omadmextensions/adapters/connmoadapter/inc/ProxyBranch.h
omadm/omadmextensions/adapters/connmoadapter/inc/Utils.h
omadm/omadmextensions/adapters/connmoadapter/rom/connmoadapter.iby
omadm/omadmextensions/adapters/connmoadapter/src/AddBuffer.cpp
omadm/omadmextensions/adapters/connmoadapter/src/BranchBase.cpp
omadm/omadmextensions/adapters/connmoadapter/src/ConnMoAdapter.cpp
omadm/omadmextensions/adapters/connmoadapter/src/ConnMoAdapter.rss
omadm/omadmextensions/adapters/connmoadapter/src/Luid.cpp
omadm/omadmextensions/adapters/connmoadapter/src/NapBranch.cpp
omadm/omadmextensions/adapters/connmoadapter/src/ProxyBranch.cpp
omadm/omadmextensions/adapters/connmoadapter/src/Utils.cpp
omadm/omadmextensions/adapters/connmoadapter/traces/OstTraceDefinitions.h
omadm/omadmextensions/adapters/connmoadapter/traces/fixed_id.definitions
omadm/omadmextensions/adapters/connmoadapter/traces/trace.properties
omadm/omadmextensions/adapters/dcmodmadapter/data/dcmodmadapter.rss
omadm/omadmextensions/adapters/dcmodmadapter/group/bld.inf
omadm/omadmextensions/adapters/dcmodmadapter/group/dcmodmadapter.mmp
omadm/omadmextensions/adapters/dcmodmadapter/inc/dcmodmadapter.h
omadm/omadmextensions/adapters/dcmodmadapter/src/dcmodmadapter.cpp
omadm/omadmextensions/adapters/dcmodmadapter/src/dcmodmadaptermain.cpp
omadm/omadmextensions/adapters/devdetail/bld/DevDetail_HwV.txt
omadm/omadmextensions/adapters/devdetail/bld/DevDetail_SwV.txt
omadm/omadmextensions/adapters/devdetail/bld/bld.inf
omadm/omadmextensions/adapters/devdetail/bld/nsmldmdevdetailadapter.mmp
omadm/omadmextensions/adapters/devdetail/inc/nsmldmdevdetailadapter.h
omadm/omadmextensions/adapters/devdetail/src/nsmldmdevdetailadapter.cpp
omadm/omadmextensions/adapters/devdetail/src/nsmldmdevdetailadapter.rss
omadm/omadmextensions/adapters/devdetail/src/nsmldmdevdetailutils_ARM.cpp
omadm/omadmextensions/adapters/devdetail/src/nsmldmdevdetailutils_WINSCW.cpp
omadm/omadmextensions/adapters/devinfo/bld/bld.inf
omadm/omadmextensions/adapters/devinfo/bld/nsmldmdevinfoadapter.mmp
omadm/omadmextensions/adapters/devinfo/inc/nsmldmdevinfoadapter.h
omadm/omadmextensions/adapters/devinfo/src/nsmldmdevinfoadapter.cpp
omadm/omadmextensions/adapters/devinfo/src/nsmldmdevinfoadapter.rss
omadm/omadmextensions/adapters/email/bld/bld.inf
omadm/omadmextensions/adapters/email/bld/nsmldmemailadapter.mmp
omadm/omadmextensions/adapters/email/inc/nsmldmemailadapter.h
omadm/omadmextensions/adapters/email/sis/emailadapter.pkg
omadm/omadmextensions/adapters/email/sis/gensis.bat
omadm/omadmextensions/adapters/email/src/nsmldmemailadapter.cpp
omadm/omadmextensions/adapters/email/src/nsmldmemailadapter.rss
omadm/omadmextensions/adapters/email/tsrc/bwins/emailtestu.def
omadm/omadmextensions/adapters/email/tsrc/conf/emailtest.cfg
omadm/omadmextensions/adapters/email/tsrc/eabi/emailtestu.def
omadm/omadmextensions/adapters/email/tsrc/group/bld.inf
omadm/omadmextensions/adapters/email/tsrc/group/emailtest.mmp
omadm/omadmextensions/adapters/email/tsrc/group/emailtest.pkg
omadm/omadmextensions/adapters/email/tsrc/inc/TestDmDDFObject.h
omadm/omadmextensions/adapters/email/tsrc/inc/dmatest.h
omadm/omadmextensions/adapters/email/tsrc/inc/emailtest.h
omadm/omadmextensions/adapters/email/tsrc/init/emailtest.ini
omadm/omadmextensions/adapters/email/tsrc/src/TestDmDDFObject.cpp
omadm/omadmextensions/adapters/email/tsrc/src/dmatest.cpp
omadm/omadmextensions/adapters/email/tsrc/src/emailtest.cpp
omadm/omadmextensions/adapters/email/tsrc/src/emailtestBlocks.cpp
omadm/omadmextensions/adapters/fota/bld/bld.inf
omadm/omadmextensions/adapters/fota/bld/nsmldmfotaadapter.mmp
omadm/omadmextensions/adapters/fota/cenrep/keys_fotaadapter.xls
omadm/omadmextensions/adapters/fota/conf/fotaadapter.confml
omadm/omadmextensions/adapters/fota/conf/fotaadapter_101F9A08.crml
omadm/omadmextensions/adapters/fota/inc/fotaadapterCRKeys.h
omadm/omadmextensions/adapters/fota/inc/nsmldmfotaadapter.h
omadm/omadmextensions/adapters/fota/inc/nsmldmfotaadapterdb.h
omadm/omadmextensions/adapters/fota/src/101F9A02.SPD
omadm/omadmextensions/adapters/fota/src/101F9A02.txt
omadm/omadmextensions/adapters/fota/src/nsmldmfotaadapter.cpp
omadm/omadmextensions/adapters/fota/src/nsmldmfotaadapter.rss
omadm/omadmextensions/adapters/fota/src/nsmldmfotaadapterdb.cpp
omadm/omadmextensions/adapters/globalwlansettings/group/bld.inf
omadm/omadmextensions/adapters/globalwlansettings/group/globalwlanadapter.mmp
omadm/omadmextensions/adapters/globalwlansettings/inc/globalwlanadapter.h
omadm/omadmextensions/adapters/globalwlansettings/rom/globalwlanadapter.iby
omadm/omadmextensions/adapters/globalwlansettings/src/globalwlanadapter.cpp
omadm/omadmextensions/adapters/globalwlansettings/src/globalwlanadapter.rss
omadm/omadmextensions/adapters/imps/bld/bld.inf
omadm/omadmextensions/adapters/imps/bld/nsmldmimpsadapter.mmp
omadm/omadmextensions/adapters/imps/inc/nsmldmimpsadapter.h
omadm/omadmextensions/adapters/imps/rom/nsmldmimpsadapter.iby
omadm/omadmextensions/adapters/imps/src/101F9A2A.loc
omadm/omadmextensions/adapters/imps/src/nsmldmimpsadapter.cpp
omadm/omadmextensions/adapters/imps/src/nsmldmimpsadapter.rss
omadm/omadmextensions/adapters/inc/nsmldmimpluids.h
omadm/omadmextensions/adapters/mms/bld/bld.inf
omadm/omadmextensions/adapters/mms/bld/nsmldmmmsadapter.mmp
omadm/omadmextensions/adapters/mms/inc/nsmldmmmsadapter.h
omadm/omadmextensions/adapters/mms/src/nsmldmmmsadapter.cpp
omadm/omadmextensions/adapters/mms/src/nsmldmmmsadapter.rss
omadm/omadmextensions/adapters/mms/tsrc/bwins/mmstestu.def
omadm/omadmextensions/adapters/mms/tsrc/conf/mmstest.cfg
omadm/omadmextensions/adapters/mms/tsrc/eabi/mmstestu.def
omadm/omadmextensions/adapters/mms/tsrc/group/bld.inf
omadm/omadmextensions/adapters/mms/tsrc/group/mmstest.mmp
omadm/omadmextensions/adapters/mms/tsrc/group/mmstest.pkg
omadm/omadmextensions/adapters/mms/tsrc/inc/TestDmDDFObject.h
omadm/omadmextensions/adapters/mms/tsrc/inc/dmatest.h
omadm/omadmextensions/adapters/mms/tsrc/inc/mmstest.h
omadm/omadmextensions/adapters/mms/tsrc/init/mmstest.ini
omadm/omadmextensions/adapters/mms/tsrc/src/TestDmDDFObject.cpp
omadm/omadmextensions/adapters/mms/tsrc/src/dmatest.cpp
omadm/omadmextensions/adapters/mms/tsrc/src/mmstest.cpp
omadm/omadmextensions/adapters/mms/tsrc/src/mmstestBlocks.cpp
omadm/omadmextensions/adapters/nsmldinternet/group/bld.inf
omadm/omadmextensions/adapters/nsmldinternet/group/nsmlinternetadapter.mmp
omadm/omadmextensions/adapters/nsmldinternet/inc/NSmlInternetAdapter.h
omadm/omadmextensions/adapters/nsmldinternet/inc/NSmlWLanAdapter.h
omadm/omadmextensions/adapters/nsmldinternet/inc/NSmlWlanSettings.h
omadm/omadmextensions/adapters/nsmldinternet/rom/nsmlinternetadapter.iby
omadm/omadmextensions/adapters/nsmldinternet/src/NSmlInternetAdapter.cpp
omadm/omadmextensions/adapters/nsmldinternet/src/NSmlInternetAdapter.rss
omadm/omadmextensions/adapters/nsmldinternet/src/NSmlWLanAdapter.cpp
omadm/omadmextensions/adapters/nsmldinternet/src/NSmlWlanSettings.cpp
omadm/omadmextensions/adapters/nsmldmalwaysonadapter/group/bld.inf
omadm/omadmextensions/adapters/nsmldmalwaysonadapter/group/nsmldmalwaysonadapter.mmp
omadm/omadmextensions/adapters/nsmldmalwaysonadapter/inc/logger.h
omadm/omadmextensions/adapters/nsmldmalwaysonadapter/inc/nsmldmalwaysonadapter.h
omadm/omadmextensions/adapters/nsmldmalwaysonadapter/inc/nsmldmalwaysonadapter.inl
omadm/omadmextensions/adapters/nsmldmalwaysonadapter/inc/nsmldmalwaysonsettingstore.h
omadm/omadmextensions/adapters/nsmldmalwaysonadapter/rom/nsmldmalwaysonadapter.iby
omadm/omadmextensions/adapters/nsmldmalwaysonadapter/src/nsmldmalwaysonadapter.cpp
omadm/omadmextensions/adapters/nsmldmalwaysonadapter/src/nsmldmalwaysonadapter.rss
omadm/omadmextensions/adapters/nsmldmalwaysonadapter/src/nsmldmalwaysonsettingstore.cpp
omadm/omadmextensions/adapters/nsmldmbmadapter/group/bld.inf
omadm/omadmextensions/adapters/nsmldmbmadapter/group/nsmldmbmadapter.mmp
omadm/omadmextensions/adapters/nsmldmbmadapter/inc/bmadapterlogger.h
omadm/omadmextensions/adapters/nsmldmbmadapter/inc/nsmldmbmadapter.h
omadm/omadmextensions/adapters/nsmldmbmadapter/inc/nsmldmbmadapter.inl
omadm/omadmextensions/adapters/nsmldmbmadapter/inc/nsmldmbmsettingstore.h
omadm/omadmextensions/adapters/nsmldmbmadapter/rom/nsmldmbmadapter.iby
omadm/omadmextensions/adapters/nsmldmbmadapter/src/nsmldmbmadapter.cpp
omadm/omadmextensions/adapters/nsmldmbmadapter/src/nsmldmbmadapter.rss
omadm/omadmextensions/adapters/nsmldmbmadapter/src/nsmldmbmsettingstore.cpp
omadm/omadmextensions/adapters/streamingadapter/bld/bld.inf
omadm/omadmextensions/adapters/streamingadapter/bld/nsmlstreamingadapter.mmp
omadm/omadmextensions/adapters/streamingadapter/conf/streamingadapter.confml
omadm/omadmextensions/adapters/streamingadapter/conf/streamingadapter_20024310.crml
omadm/omadmextensions/adapters/streamingadapter/inc/nsmlstreamingadapter.h
omadm/omadmextensions/adapters/streamingadapter/inc/streamingadapterCRKeys.h
omadm/omadmextensions/adapters/streamingadapter/src/nsmldmstreamingadapter.rss
omadm/omadmextensions/adapters/streamingadapter/src/nsmlstreamingadapter.cpp
omadm/omadmextensions/adapters/syncmldm/bld/bld.inf
omadm/omadmextensions/adapters/syncmldm/bld/nsmldmsettingsadapter.mmp
omadm/omadmextensions/adapters/syncmldm/inc/NSmlDMSettingsAdapter.h
omadm/omadmextensions/adapters/syncmldm/src/NSmlDmSettingsAdapter.cpp
omadm/omadmextensions/adapters/syncmldm/src/nsmldmsettingsadapter.rss
omadm/omadmextensions/adapters/syncmldm/tsrc/bwins/syncmldmtestu.def
omadm/omadmextensions/adapters/syncmldm/tsrc/conf/syncmldmtest.cfg
omadm/omadmextensions/adapters/syncmldm/tsrc/eabi/syncmldmtestu.def
omadm/omadmextensions/adapters/syncmldm/tsrc/group/bld.inf
omadm/omadmextensions/adapters/syncmldm/tsrc/group/syncmldmtest.mmp
omadm/omadmextensions/adapters/syncmldm/tsrc/group/syncmldmtest.pkg
omadm/omadmextensions/adapters/syncmldm/tsrc/inc/TestDmDDFObject.h
omadm/omadmextensions/adapters/syncmldm/tsrc/inc/dmatest.h
omadm/omadmextensions/adapters/syncmldm/tsrc/inc/syncmldmtest.h
omadm/omadmextensions/adapters/syncmldm/tsrc/init/syncmldmtest.ini
omadm/omadmextensions/adapters/syncmldm/tsrc/src/TestDmDDFObject.cpp
omadm/omadmextensions/adapters/syncmldm/tsrc/src/dmatest.cpp
omadm/omadmextensions/adapters/syncmldm/tsrc/src/syncmldmtest.cpp
omadm/omadmextensions/adapters/syncmldm/tsrc/src/syncmldmtestBlocks.cpp
omadm/omadmextensions/adapters/syncmldm12/bld/bld.inf
omadm/omadmextensions/adapters/syncmldm12/bld/nsmldmsettingsadapter12.mmp
omadm/omadmextensions/adapters/syncmldm12/inc/NSmlDMSettingsAdapter12.h
omadm/omadmextensions/adapters/syncmldm12/src/NSmlDmSettingsAdapter12.cpp
omadm/omadmextensions/adapters/syncmldm12/src/nsmldmsettingsadapter12.rss
omadm/omadmextensions/adapters/syncmldm12/tsrc/bwins/syncmldm12testu.def
omadm/omadmextensions/adapters/syncmldm12/tsrc/conf/syncmldm12test.cfg
omadm/omadmextensions/adapters/syncmldm12/tsrc/eabi/syncmldm12testu.def
omadm/omadmextensions/adapters/syncmldm12/tsrc/group/bld.inf
omadm/omadmextensions/adapters/syncmldm12/tsrc/group/syncmldm12test.mmp
omadm/omadmextensions/adapters/syncmldm12/tsrc/group/syncmldm12test.pkg
omadm/omadmextensions/adapters/syncmldm12/tsrc/inc/TestDmDDFObject.h
omadm/omadmextensions/adapters/syncmldm12/tsrc/inc/dmatest.h
omadm/omadmextensions/adapters/syncmldm12/tsrc/inc/syncmldm12test.h
omadm/omadmextensions/adapters/syncmldm12/tsrc/init/syncmldm12test.ini
omadm/omadmextensions/adapters/syncmldm12/tsrc/src/TestDmDDFObject.cpp
omadm/omadmextensions/adapters/syncmldm12/tsrc/src/dmatest.cpp
omadm/omadmextensions/adapters/syncmldm12/tsrc/src/syncmldm12test.cpp
omadm/omadmextensions/adapters/syncmldm12/tsrc/src/syncmldm12testBlocks.cpp
omadm/omadmextensions/adapters/syncmlds/bld/bld.inf
omadm/omadmextensions/adapters/syncmlds/bld/nsmldssettingsadapter.mmp
omadm/omadmextensions/adapters/syncmlds/inc/NSmlDSSettingsAdapter.h
omadm/omadmextensions/adapters/syncmlds/src/NSmlDsSettingsAdapter.cpp
omadm/omadmextensions/adapters/syncmlds/src/nsmldssettingsadapter.rss
omadm/omadmextensions/adapters/syncmlds/tsrc/bwins/syncmldstestu.def
omadm/omadmextensions/adapters/syncmlds/tsrc/conf/syncmldstest.cfg
omadm/omadmextensions/adapters/syncmlds/tsrc/eabi/syncmldstestu.def
omadm/omadmextensions/adapters/syncmlds/tsrc/group/bld.inf
omadm/omadmextensions/adapters/syncmlds/tsrc/group/syncmldstest.mmp
omadm/omadmextensions/adapters/syncmlds/tsrc/group/syncmldstest.pkg
omadm/omadmextensions/adapters/syncmlds/tsrc/inc/TestDmDDFObject.h
omadm/omadmextensions/adapters/syncmlds/tsrc/inc/dmatest.h
omadm/omadmextensions/adapters/syncmlds/tsrc/inc/syncmldstest.h
omadm/omadmextensions/adapters/syncmlds/tsrc/init/syncmldstest.ini
omadm/omadmextensions/adapters/syncmlds/tsrc/src/TestDmDDFObject.cpp
omadm/omadmextensions/adapters/syncmlds/tsrc/src/dmatest.cpp
omadm/omadmextensions/adapters/syncmlds/tsrc/src/syncmldstest.cpp
omadm/omadmextensions/adapters/syncmlds/tsrc/src/syncmldstestBlocks.cpp
omadm/omadmextensions/adapters/wlanctrldcmoadapter/data/wlanctrldcmoadapter.rss
omadm/omadmextensions/adapters/wlanctrldcmoadapter/group/bld.inf
omadm/omadmextensions/adapters/wlanctrldcmoadapter/group/wlanctrldcmoadapter.mmp
omadm/omadmextensions/adapters/wlanctrldcmoadapter/inc/wlanctrldcmoadapter.h
omadm/omadmextensions/adapters/wlanctrldcmoadapter/rom/wlanctrldcmoadapter.iby
omadm/omadmextensions/adapters/wlanctrldcmoadapter/src/wlanctrldcmoadapter.cpp
omadm/omadmextensions/adapters/wlanctrldcmoadapter/src/wlanctrldcmoadapterproxy.cpp
omadm/omadmextensions/group/bld.inf
package_definition.xml
pnpmobileservices/group/bld.inf
pnpmobileservices/pnpms/BMARM/NHWRPARSER.DEF
pnpmobileservices/pnpms/BMARM/PNP.DEF
pnpmobileservices/pnpms/BWINS/NHWRPARSER.DEF
pnpmobileservices/pnpms/BWINS/PNP.DEF
pnpmobileservices/pnpms/OnlineSupport/aif/OnlineSupportAif.rss
pnpmobileservices/pnpms/OnlineSupport/aif/OnlineSupport_reg.rss
pnpmobileservices/pnpms/OnlineSupport/data/OnlineSupport.rss
pnpmobileservices/pnpms/OnlineSupport/data/OnlineSupport_caption.rss
pnpmobileservices/pnpms/OnlineSupport/data/Thumbs.db
pnpmobileservices/pnpms/OnlineSupport/data/online_icon42x29.bmp
pnpmobileservices/pnpms/OnlineSupport/data/online_icon42x29mask.bmp
pnpmobileservices/pnpms/OnlineSupport/data/online_icon44x44.bmp
pnpmobileservices/pnpms/OnlineSupport/data/online_icon44x44mask.bmp
pnpmobileservices/pnpms/OnlineSupport/group/Icons2.mk
pnpmobileservices/pnpms/OnlineSupport/group/Icons2_aif_bitmaps.mk
pnpmobileservices/pnpms/OnlineSupport/group/Icons2_aif_bitmaps_dc.mk
pnpmobileservices/pnpms/OnlineSupport/group/Icons2_aif_scalable.mk
pnpmobileservices/pnpms/OnlineSupport/group/Icons2_aif_scalable_dc.mk
pnpmobileservices/pnpms/OnlineSupport/group/Icons2_dc.mk
pnpmobileservices/pnpms/OnlineSupport/group/bldsis.mk
pnpmobileservices/pnpms/OnlineSupport/group/online_icon42x29.bmp
pnpmobileservices/pnpms/OnlineSupport/group/online_icon42x29_mask.bmp
pnpmobileservices/pnpms/OnlineSupport/group/online_icon42x29_mask_soft.bmp
pnpmobileservices/pnpms/OnlineSupport/group/online_icon44x44.bmp
pnpmobileservices/pnpms/OnlineSupport/group/online_icon44x44_mask.bmp
pnpmobileservices/pnpms/OnlineSupport/group/online_icon44x44_mask_soft.bmp
pnpmobileservices/pnpms/OnlineSupport/inc/CCMAppUi.h
pnpmobileservices/pnpms/OnlineSupport/inc/CCMApplication.h
pnpmobileservices/pnpms/OnlineSupport/inc/CCMDocument.h
pnpmobileservices/pnpms/OnlineSupport/inc/CCMRegistrationMonitor.h
pnpmobileservices/pnpms/OnlineSupport/inc/CCMSocketsEngine.h
pnpmobileservices/pnpms/OnlineSupport/inc/DeviceParameterDefs.h
pnpmobileservices/pnpms/OnlineSupport/inc/MCMRegisterationStatusNotifier.h
pnpmobileservices/pnpms/OnlineSupport/inc/MCMSocketsEngineNotifier.h
pnpmobileservices/pnpms/OnlineSupport/inc/MiniBrowser.h
pnpmobileservices/pnpms/OnlineSupport/inc/MiniBrowserObserver.h
pnpmobileservices/pnpms/OnlineSupport/inc/OnlineSupport.hrh
pnpmobileservices/pnpms/OnlineSupport/inc/OnlineSupportLogger.h
pnpmobileservices/pnpms/OnlineSupport/inc/OnlineSupportPrivateCRKeys.h
pnpmobileservices/pnpms/OnlineSupport/inc/VersionStrings.h
pnpmobileservices/pnpms/OnlineSupport/inc/ccmdialogmonitor.h
pnpmobileservices/pnpms/OnlineSupport/inc/mcmdialogstatusnotifier.h
pnpmobileservices/pnpms/OnlineSupport/loc/OnlineSupport.loc
pnpmobileservices/pnpms/OnlineSupport/src/CCMAppUi.cpp
pnpmobileservices/pnpms/OnlineSupport/src/CCMApplication.cpp
pnpmobileservices/pnpms/OnlineSupport/src/CCMDocument.cpp
pnpmobileservices/pnpms/OnlineSupport/src/Ccmregistrationmonitor.cpp
pnpmobileservices/pnpms/OnlineSupport/src/Ccmsocketsengine.cpp
pnpmobileservices/pnpms/OnlineSupport/src/MiniBrowser.cpp
pnpmobileservices/pnpms/OnlineSupport/src/ccmdialogmonitor.cpp
pnpmobileservices/pnpms/PnP/NHwrParser/HttpProvContent.cpp
pnpmobileservices/pnpms/PnP/NHwrParser/HttpProvContent.h
pnpmobileservices/pnpms/PnP/NHwrParser/HttpProvContentType.cpp
pnpmobileservices/pnpms/PnP/NHwrParser/HttpProvContentType.h
pnpmobileservices/pnpms/PnP/NHwrParser/HttpProvHeaders.cpp
pnpmobileservices/pnpms/PnP/NHwrParser/HttpProvHeaders.h
pnpmobileservices/pnpms/PnP/NHwrParser/HttpProvStates.h
pnpmobileservices/pnpms/PnP/NHwrParser/NHeadWrapperParser.cpp
pnpmobileservices/pnpms/PnP/NHwrParser/NHeadWrapperParser.h
pnpmobileservices/pnpms/PnP/NHwrParser/NHwrParserLogger.h
pnpmobileservices/pnpms/PnP/NHwrParser/SupportedContentTypes.h
pnpmobileservices/pnpms/PnP/PnpProvisioningAppAif/PnpProvisioning_reg.rss
pnpmobileservices/pnpms/PnP/PnpProvisioningAppAif/PnpProvisioningaif.rss
pnpmobileservices/pnpms/PnP/PnpProvisioningAppAif/context_pane_icon.bmp
pnpmobileservices/pnpms/PnP/PnpProvisioningAppAif/context_pane_icon_mask.bmp
pnpmobileservices/pnpms/PnP/PnpProvisioningAppAif/context_pane_icon_mask_soft.bmp
pnpmobileservices/pnpms/PnP/PnpProvisioningAppAif/list_icon.bmp
pnpmobileservices/pnpms/PnP/PnpProvisioningAppAif/list_icon_mask.bmp
pnpmobileservices/pnpms/PnP/PnpProvisioningAppAif/list_icon_mask_soft.bmp
pnpmobileservices/pnpms/PnP/PnpProvisioningAppData/PnpProvisioning.rss
pnpmobileservices/pnpms/PnP/PnpProvisioningAppData/PnpProvisioningTest.wbf
pnpmobileservices/pnpms/PnP/PnpProvisioningAppData/PnpProvisioning_caption.rss
pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning.loc
pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_00.loc
pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_01.loc
pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_02.loc
pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_03.loc
pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_04.loc
pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_05.loc
pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_06.loc
pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_07.loc
pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_08.loc
pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_09.loc
pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_10.loc
pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_13.loc
pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_14.loc
pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_15.loc
pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_157.loc
pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_158.loc
pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_159.loc
pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_16.loc
pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_160.loc
pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_161.loc
pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_17.loc
pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_18.loc
pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_25.loc
pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_26.loc
pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_27.loc
pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_28.loc
pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_29.loc
pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_30.loc
pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_31.loc
pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_32.loc
pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_33.loc
pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_37.loc
pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_39.loc
pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_42.loc
pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_45.loc
pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_49.loc
pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_51.loc
pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_54.loc
pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_57.loc
pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_59.loc
pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_67.loc
pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_68.loc
pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_70.loc
pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_76.loc
pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_78.loc
pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_79.loc
pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_83.loc
pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_93.loc
pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/PnpLogger.h
pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/PnpProvisioningApp.h
pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/PnpProvisioningAppUi.h
pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/PnpProvisioningDocument.h
pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/PnpProvisioningSaver.h
pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/PnpServiceActivation.h
pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/cwaitdialogmonitor.h
pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/mwaitdialogstatusnotifier.h
pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/pnpprovisioning.hrh
pnpmobileservices/pnpms/PnP/PnpProvisioningAppSrc/PnpProvisioningApp.cpp
pnpmobileservices/pnpms/PnP/PnpProvisioningAppSrc/PnpProvisioningAppUi.cpp
pnpmobileservices/pnpms/PnP/PnpProvisioningAppSrc/PnpProvisioningDocument.cpp
pnpmobileservices/pnpms/PnP/PnpProvisioningAppSrc/PnpProvisioningSaver.cpp
pnpmobileservices/pnpms/PnP/PnpProvisioningAppSrc/PnpServiceActivation.cpp
pnpmobileservices/pnpms/PnP/PnpProvisioningAppSrc/cwaitdialogmonitor.cpp
pnpmobileservices/pnpms/PnP/group/Icons.mk
pnpmobileservices/pnpms/PnP/group/Icons_aif_scalable.mk
pnpmobileservices/pnpms/PnP/group/Icons_aif_scalable_dc.mk
pnpmobileservices/pnpms/PnP/group/Icons_dc.mk
pnpmobileservices/pnpms/PnP/group/context_pane_icon.bmp
pnpmobileservices/pnpms/PnP/group/context_pane_icon_mask.bmp
pnpmobileservices/pnpms/PnP/group/context_pane_icon_mask_soft.bmp
pnpmobileservices/pnpms/PnP/group/list_icon.bmp
pnpmobileservices/pnpms/PnP/group/list_icon_mask.bmp
pnpmobileservices/pnpms/PnP/group/list_icon_mask_soft.bmp
pnpmobileservices/pnpms/PnP/loc/pnpprovisioning.loc
pnpmobileservices/pnpms/PnP/recnhwr/1020433B.rss
pnpmobileservices/pnpms/PnP/recnhwr/PnpRecnhwrLogger.h
pnpmobileservices/pnpms/PnP/recnhwr/recnhwr.cpp
pnpmobileservices/pnpms/PnP/recnhwr/recnhwr.h
pnpmobileservices/pnpms/PnpPaosFilter/data/10272D33.rss
pnpmobileservices/pnpms/PnpPaosFilter/group/bld_paos_sis_stub.mk
pnpmobileservices/pnpms/PnpPaosFilter/src/HdcToPaosInterface.h
pnpmobileservices/pnpms/PnpPaosFilter/src/PnpPaosFilter.cpp
pnpmobileservices/pnpms/PnpPaosFilter/src/PnpPaosFilter.h
pnpmobileservices/pnpms/PnpPaosFilter/src/PnpPaosFilterDll.cpp
pnpmobileservices/pnpms/PnpPaosFilter/src/PnpPaosFilterPrivateCRKeys.h
pnpmobileservices/pnpms/PnpPaosFilter/src/PnpPaosLogger.h
pnpmobileservices/pnpms/PnpPaosFilter/src/PnpPaosXml.cpp
pnpmobileservices/pnpms/PnpPaosFilter/src/PnpPaosXml.h
pnpmobileservices/pnpms/ServiceHelpPlugin/Group/ServiceHelpPlugin.mmp
pnpmobileservices/pnpms/ServiceHelpPlugin/Group/ServiceHelpPluginIcons.mk
pnpmobileservices/pnpms/ServiceHelpPlugin/Group/bld.inf
pnpmobileservices/pnpms/ServiceHelpPlugin/data/20019597.rss
pnpmobileservices/pnpms/ServiceHelpPlugin/inc/ServiceHelpPlugin.h
pnpmobileservices/pnpms/ServiceHelpPlugin/inc/ServicePluginLogger.h
pnpmobileservices/pnpms/ServiceHelpPlugin/src/ServiceHelpPlugin.cpp
pnpmobileservices/pnpms/ServiceHelpPlugin/src/ServiceHelpPluginImplementationTable.cpp
pnpmobileservices/pnpms/cenrep/keys_pnpms.xls
pnpmobileservices/pnpms/conf/pnpms.confml
pnpmobileservices/pnpms/conf/pnpms_10204338.crml
pnpmobileservices/pnpms/conf/pnpms_1020433A.crml
pnpmobileservices/pnpms/conf/pnpms_10272D33.crml
pnpmobileservices/pnpms/eabi/NHwrParser.DEF
pnpmobileservices/pnpms/eabi/PnP.DEF
pnpmobileservices/pnpms/group/NHwrParser.mmp
pnpmobileservices/pnpms/group/OnlineSupport.mmp
pnpmobileservices/pnpms/group/PnpPaosFilter.mmp
pnpmobileservices/pnpms/group/PnpUtil.mmp
pnpmobileservices/pnpms/group/Pnpprovisioning.mmp
pnpmobileservices/pnpms/group/bld.inf
pnpmobileservices/pnpms/group/bld_paos.inf
pnpmobileservices/pnpms/group/bld_pnp.inf
pnpmobileservices/pnpms/group/bld_pnputil.inf
pnpmobileservices/pnpms/group/bld_servicehelp.inf
pnpmobileservices/pnpms/group/recnhwr.mmp
pnpmobileservices/pnpms/install/CentralRepositoryInit.pkg
pnpmobileservices/pnpms/install/MakeRndSignedFor30.bat
pnpmobileservices/pnpms/install/MakeRndSignedPatchFor30.bat
pnpmobileservices/pnpms/install/PnPNokiaS2-1.pkg
pnpmobileservices/pnpms/install/PnpPaos_S3-0.pkg
pnpmobileservices/pnpms/install/PnpPaos_S3-0_patch.pkg
pnpmobileservices/pnpms/install/PnpPaos_S3-0_stub.pkg
pnpmobileservices/pnpms/install/Support_S3-0_stub.pkg
pnpmobileservices/pnpms/install/Support_w_Paos_S2-6.pkg
pnpmobileservices/pnpms/install/Support_w_Paos_S2-8.pkg
pnpmobileservices/pnpms/install/Support_w_Paos_S3-0.pkg
pnpmobileservices/pnpms/install/Support_w_Paos_S3-0_patch.pkg
pnpmobileservices/pnpms/install/compile_localization_resources.bat
pnpmobileservices/pnpms/install/old/Support w PnPDemo S2-1.pkg
pnpmobileservices/pnpms/install/old/Support w PnPDemo S2-6.pkg
pnpmobileservices/pnpms/install/old/Support_S2-1.pkg
pnpmobileservices/pnpms/install/test/MakeSignedSisFor30_PnPPaosFilter.bat
pnpmobileservices/pnpms/install/test/MakeSignedSisFor30_PnPProv.bat
pnpmobileservices/pnpms/install/test/PnPProv S2-1.pkg
pnpmobileservices/pnpms/install/test/PnPProv S2-8.pkg
pnpmobileservices/pnpms/install/test/PnPProv_S3_0.pkg
pnpmobileservices/pnpms/install/test/PnpPaosFilter S2-8.pkg
pnpmobileservices/pnpms/install/test/PnpPaosFilter S3-0.pkg
pnpmobileservices/pnpms/install/test/PnpPaosFilter.pkg
pnpmobileservices/pnpms/install/test/Support S2-1.pkg
pnpmobileservices/pnpms/install/test/Support S2-6.pkg
pnpmobileservices/pnpms/install/test/Support S2-8.pkg
pnpmobileservices/pnpms/install/test/Support S3-0.pkg
pnpmobileservices/pnpms/install/udeb/CentralRepositoryInit.pkg
pnpmobileservices/pnpms/install/udeb/MakeRndSignedFor30.bat
pnpmobileservices/pnpms/install/udeb/MakeRndSignedPatchFor30.bat
pnpmobileservices/pnpms/install/udeb/PnpPaos_S3-0_patch_udeb.pkg
pnpmobileservices/pnpms/install/udeb/PnpPaos_S3-0_stub_udeb.pkg
pnpmobileservices/pnpms/install/udeb/PnpPaos_S3-0_udeb.pkg
pnpmobileservices/pnpms/install/udeb/Support_S3-0_stub_udeb.pkg
pnpmobileservices/pnpms/install/udeb/Support_w_Paos_S2-8_udeb.pkg
pnpmobileservices/pnpms/install/udeb/Support_w_Paos_S3-0_patch_udeb.pkg
pnpmobileservices/pnpms/install/udeb/Support_w_Paos_S3-0_udeb.pkg
pnpmobileservices/pnpms/install/wins/MakeRndSignedPatchFor30.bat
pnpmobileservices/pnpms/install/wins/PnpPaos_S3-0_patch_winscw_udeb.pkg
pnpmobileservices/pnpms/install/wins/PnpPaos_S3-0_stub_winscw_udeb.pkg
pnpmobileservices/pnpms/install/wins/Support_S3-0_stub_winscw_udeb.pkg
pnpmobileservices/pnpms/install/wins/Support_w_Paos_S3-0_patch_winscw_udeb.pkg
pnpmobileservices/pnpms/rom/OnlineSupport.iby
pnpmobileservices/pnpms/rom/OnlineSupportResources.iby
pnpmobileservices/pnpms/rom/PnPMS.iby
pnpmobileservices/pnpms/rom/Pnp.iby
pnpmobileservices/pnpms/rom/PnpPaosFilter.iby
pnpmobileservices/pnpms/rom/PnpResources.iby
pnpmobileservices/pnpms/tsrc/Bmarm/TestPnpUtilu.def
pnpmobileservices/pnpms/tsrc/Bwins/TestPnpUtilu.def
pnpmobileservices/pnpms/tsrc/conf/ui_ImumDomainApi.cfg
pnpmobileservices/pnpms/tsrc/conf/ui_ImumDomainApiTest.cfg
pnpmobileservices/pnpms/tsrc/data/Pnpprovisioningfile
pnpmobileservices/pnpms/tsrc/eabi/TestPnpUtilu.def
pnpmobileservices/pnpms/tsrc/group/TestPnpUtil.mmp
pnpmobileservices/pnpms/tsrc/group/TestPnpUtil.pkg
pnpmobileservices/pnpms/tsrc/group/bld.inf
pnpmobileservices/pnpms/tsrc/inc/TestPnpUtil.h
pnpmobileservices/pnpms/tsrc/init/TestFramework.ini
pnpmobileservices/pnpms/tsrc/src/TestPnpUtil.cpp
pnpmobileservices/pnpms/tsrc/src/TestPnpUtilBlocks.cpp
sysdef_1_4_0.dtd
sysdef_1_5_1.dtd
--- a/applicationmanagement/BWINS/ApplicationManagementu.def	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-EXPORTS
-	?ActivateL@RApplicationManagement@NApplicationManagement@@QBEXK@Z @ 1 NONAME ; void NApplicationManagement::RApplicationManagement::ActivateL(unsigned long) const
-	?Close@RAppMgmtRfs@@QAEXXZ @ 2 NONAME ; void RAppMgmtRfs::Close(void)
-	?Close@RApplicationManagement@NApplicationManagement@@QAEXXZ @ 3 NONAME ; void NApplicationManagement::RApplicationManagement::Close(void)
-	?Connect@RAppMgmtRfs@@QAEHXZ @ 4 NONAME ; int RAppMgmtRfs::Connect(void)
-	?Connect@RApplicationManagement@NApplicationManagement@@QAEHABVTCertInfo@@@Z @ 5 NONAME ; int NApplicationManagement::RApplicationManagement::Connect(class TCertInfo const &)
-	?Connect@RApplicationManagement@NApplicationManagement@@QAEHXZ @ 6 NONAME ; int NApplicationManagement::RApplicationManagement::Connect(void)
-	?DeactivateL@RApplicationManagement@NApplicationManagement@@QBEXK@Z @ 7 NONAME ; void NApplicationManagement::RApplicationManagement::DeactivateL(unsigned long) const
-	?DeliverL@RApplicationManagement@NApplicationManagement@@QBEKABV?$TBuf8@$0BAA@@@@Z @ 8 NONAME ; unsigned long NApplicationManagement::RApplicationManagement::DeliverL(class TBuf8<256> const &) const
-	?DeploymentComponent@RApplicationManagement@NApplicationManagement@@QBEHKAAUTDeploymentComponent@2@@Z @ 9 NONAME ; int NApplicationManagement::RApplicationManagement::DeploymentComponent(unsigned long, struct NApplicationManagement::TDeploymentComponent &) const
-	?DeploymentComponentDataL@RApplicationManagement@NApplicationManagement@@QBEXKW4TDeplCompAttrType@2@AAVCBufBase@@@Z @ 10 NONAME ; void NApplicationManagement::RApplicationManagement::DeploymentComponentDataL(unsigned long, enum NApplicationManagement::TDeplCompAttrType, class CBufBase &) const
-	?DeploymentComponentDataSizeL@RApplicationManagement@NApplicationManagement@@QBEHKABW4TDeplCompAttrType@2@@Z @ 11 NONAME ; int NApplicationManagement::RApplicationManagement::DeploymentComponentDataSizeL(unsigned long, enum NApplicationManagement::TDeplCompAttrType const &) const
-	?DeploymentComponentIdsL@RApplicationManagement@NApplicationManagement@@QBEHAAV?$RArray@K@@W4TDeploymentComponentState@2@@Z @ 12 NONAME ; int NApplicationManagement::RApplicationManagement::DeploymentComponentIdsL(class RArray<unsigned long> &, enum NApplicationManagement::TDeploymentComponentState) const
-	?DeploymentComponentUserIdL@RApplicationManagement@NApplicationManagement@@QBEXKAAV?$TBuf8@$0BAA@@@@Z @ 13 NONAME ; void NApplicationManagement::RApplicationManagement::DeploymentComponentUserIdL(unsigned long, class TBuf8<256> &) const
-	?DownloadL@RApplicationManagement@NApplicationManagement@@QBEKABV?$TBuf8@$0BAA@@@@Z @ 14 NONAME ; unsigned long NApplicationManagement::RApplicationManagement::DownloadL(class TBuf8<256> const &) const
-	?InstallL@RApplicationManagement@NApplicationManagement@@QBEXKW4TDeploymentComponentState@2@@Z @ 15 NONAME ; void NApplicationManagement::RApplicationManagement::InstallL(unsigned long, enum NApplicationManagement::TDeploymentComponentState) const
-	?PerformRfsL@RAppMgmtRfs@@QBEXXZ @ 16 NONAME ; void RAppMgmtRfs::PerformRfsL(void) const
-	?RemoveL@RApplicationManagement@NApplicationManagement@@QBEXK@Z @ 17 NONAME ; void NApplicationManagement::RApplicationManagement::RemoveL(unsigned long) const
-	?StartDownloadL@RApplicationManagement@NApplicationManagement@@QBEXKW4TDownloadTarget@2@@Z @ 18 NONAME ; void NApplicationManagement::RApplicationManagement::StartDownloadL(unsigned long, enum NApplicationManagement::TDownloadTarget) const
-	?StateChangeComplete@RApplicationManagement@NApplicationManagement@@QBEHK@Z @ 19 NONAME ; int NApplicationManagement::RApplicationManagement::StateChangeComplete(unsigned long) const
-	?StateChangingDCIdsL@RApplicationManagement@NApplicationManagement@@QBEHAAV?$RArray@K@@@Z @ 20 NONAME ; int NApplicationManagement::RApplicationManagement::StateChangingDCIdsL(class RArray<unsigned long> &) const
-	?UpdateDeploymentComponentDataL@RApplicationManagement@NApplicationManagement@@QBEXKW4TDeplCompAttrType@2@ABVTDesC8@@1@Z @ 21 NONAME ; void NApplicationManagement::RApplicationManagement::UpdateDeploymentComponentDataL(unsigned long, enum NApplicationManagement::TDeplCompAttrType, class TDesC8 const &, class TDesC8 const &) const
-	?UpdateDeploymentComponentL@RApplicationManagement@NApplicationManagement@@QBEXKW4TDeplCompAttrType@2@ABVTDesC8@@@Z @ 22 NONAME ; void NApplicationManagement::RApplicationManagement::UpdateDeploymentComponentL(unsigned long, enum NApplicationManagement::TDeplCompAttrType, class TDesC8 const &) const
-	?UpdateL@RApplicationManagement@NApplicationManagement@@QBEXKK@Z @ 23 NONAME ; void NApplicationManagement::RApplicationManagement::UpdateL(unsigned long, unsigned long) const
-	?DeploymentComponentTempInstFile@RApplicationManagement@NApplicationManagement@@QBEXKAAVRFile@@ABW4TDeplCompAttrType@2@@Z @ 24 NONAME ; void NApplicationManagement::RApplicationManagement::DeploymentComponentTempInstFile(unsigned long, class RFile &, enum NApplicationManagement::TDeplCompAttrType const &) const
-	?UpdateDeploymentComponentStreamedDataL@RApplicationManagement@NApplicationManagement@@QBEXKW4TDeplCompAttrType@2@ABVTDesC8@@@Z @ 25 NONAME ; void NApplicationManagement::RApplicationManagement::UpdateDeploymentComponentStreamedDataL(unsigned long, enum NApplicationManagement::TDeplCompAttrType, class TDesC8 const &) const
-
--- a/applicationmanagement/RfsPlugin/group/RfsAppMgmtPlugin.mmp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-/*
-* 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: Implementation of applicationmanagement components
-*
-*
-*/
-
-
-// To get the APP_LAYER_SYSTEMINCLUDE-definition
-#include <platform_paths.hrh>
-
-TARGET         rfsappmgmtplugin.dll
-TARGETTYPE	   PLUGIN
-CAPABILITY	   CAP_ECOM_PLUGIN
-VENDORID	     VID_DEFAULT
-UID            0x10009D8D 0x102073BF
-
-SOURCEPATH     ../src
-SOURCE         RfsAppMgmtPlugin.cpp 
-SOURCE         Proxy.cpp
-
-START RESOURCE 102073BF.rss
-TARGET rfsappmgmtplugin.rsc
-LANGUAGE_IDS
-END
-
-
-
-USERINCLUDE     ../inc
-USERINCLUDE	    ../../inc
-
-APP_LAYER_SYSTEMINCLUDE
-SYSTEMINCLUDE   /epoc32/include/ecom
-
-LIBRARY 	      euser.lib       // Base library
-LIBRARY 	      ecom.lib	    // ECom library
-LIBRARY 	      applicationmanagement.lib
-LIBRARY 	      flogger.lib
-
-SMPSAFE
--- a/applicationmanagement/RfsPlugin/group/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-/*
-* 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: 
-*	 This file provides the information required for building RFS AppMgmt
-*    	plugin
-*
-*/
-
-
-PRJ_PLATFORMS
-
-PRJ_MMPFILES
-../group/RfsAppMgmtPlugin.mmp
-
-
-PRJ_TESTMMPFILES
-
-
--- a/applicationmanagement/RfsPlugin/inc/RfsAppMgmtPlugin.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,86 +0,0 @@
-/*
-* 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: Implementation of applicationmanagement components
-*  
-*
-*/
-
-
-
-#ifndef RFSAPPMGMTPLUGIN_H
-#define RFSAPPMGMTPLUGIN_H
-
-//  INCLUDES
-#include <e32base.h>
-
-#include "rfsPlugin.h"
-
-// CLASS DECLARATION
-
-class CRfsAppMgmtPlugin: public CRFSPlugin
-    {
-public:
-
-    /**
-    * Two-phased constructor.
-	* @param	aInitParams initial parameters
-    */
-    static CRfsAppMgmtPlugin* NewL(TAny* aInitParams);
-
-    /**
-    * Destructor.
-    */
-    virtual ~CRfsAppMgmtPlugin();
-
-    /**
-    * 
-	* @param
-    */
-    void RestoreFactorySettingsL( const TRfsReason aType );
-
-    /**
-    * 
-	* @param
-    */
-    void GetScriptL( const TRfsReason aType, TDes& aPath );
-
-    /**
-    * 
-	* @param
-    */
-    void ExecuteCustomCommandL( const TRfsReason aType, TDesC& aCommand );
-private:
-
-    /**
-    * C++ default constructor.
-    */
-    CRfsAppMgmtPlugin();
-
-    /**
-    * Constructor.
-    * @param	aInitParams initial parameters
-	*/
-	CRfsAppMgmtPlugin(TAny* aInitParams);
-
-    /**
-    * Constructor
-    */
-    void ConstructL();
-    };
-
-
-
-#endif      // RFSAPPMGMTPLUGIN_H
-
-// End of File
--- a/applicationmanagement/RfsPlugin/src/102073BF.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-/*
-* Copyright (c) 1020 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: Implementation of applicationmanagement components
-*
-*
-*/
-
-
-#include "registryinfo.rh"
-
-// Declares info for two implementations
-RESOURCE REGISTRY_INFO theInfo
-	{
-	// UID for the DLL
-	dll_uid = 0x102073BF;
-	// Declare array of interface info
-	interfaces = 
-		{
-		INTERFACE_INFO
-			{
-			// UID of interface that is implemented
-			interface_uid = 0x102073BB;
-			implementations = 
-				{
-				// Info for CSrcsBTConnection
-				IMPLEMENTATION_INFO
-					{
-					implementation_uid = 0x102073C0;
-					version_no = 1;
-					display_name = "RFS AppMgmt Plugin";
-					default_data = "N"; // N = Normal RFS, D = Deep RFS, I = Init RFS (FirstBoot RFS)
-					opaque_data = "";
-					}
-				};
-			}
-		};
-	}
-
--- a/applicationmanagement/RfsPlugin/src/Proxy.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-/*
-* 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: 
-*     This class export ECom interface implementations.
-*
-*/
-
-
-#include <e32std.h>
-#include <implementationproxy.h>
-
-#include "RfsAppMgmtPlugin.h"
-
-// Map the interface UIDs to implementation factory functions
-const TImplementationProxy ImplementationTable[] =
-    {
-    	IMPLEMENTATION_PROXY_ENTRY(0x102073C0,	CRfsAppMgmtPlugin::NewL)
-    };
-
-// Exported proxy for instantiation method resolution
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy(TInt& aTableCount)
-    {
-    aTableCount = sizeof(ImplementationTable) / sizeof(TImplementationProxy);
-
-    return ImplementationTable;
-    }
-
--- a/applicationmanagement/RfsPlugin/src/RfsAppMgmtPlugin.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,95 +0,0 @@
-/*
-* 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: Implementation of applicationmanagement components
-*     
-*
-*/
-
-
-// INCLUDE FILES
-#include "ApplicationManagementRfs.h"
-#include "RfsAppMgmtPlugin.h"
-#include "debug.h"
-
-_LIT(KScriptPath, "");
-
-// ================= MEMBER FUNCTIONS =======================
-
-// C++ default constructor can NOT contain any code, that
-// might leave.
-//
-CRfsAppMgmtPlugin::CRfsAppMgmtPlugin()
-    {
-    }
-
-CRfsAppMgmtPlugin::CRfsAppMgmtPlugin(TAny* /*aInitParams*/)
-    {
-    }
-
-// Destructor
-CRfsAppMgmtPlugin::~CRfsAppMgmtPlugin()
-    {
-    }
-
-// ---------------------------------------------------------
-// NewL
-// ---------------------------------------------------------
-//
-CRfsAppMgmtPlugin* CRfsAppMgmtPlugin::NewL(TAny* aInitParams)
-    {
-    RDEBUG("CRfsAppMgmtPlugin::NewL()");
-    CRfsAppMgmtPlugin* self = new (ELeave) CRfsAppMgmtPlugin(aInitParams);
-    CleanupStack::PushL(self);
-    self->ConstructL();
-    CleanupStack::Pop();
-    return self;
-    }
-
-
-// ---------------------------------------------------------
-// ConstructL
-// ---------------------------------------------------------
-//
-void CRfsAppMgmtPlugin::ConstructL()
-    {
-    RDEBUG("CRfsAppMgmtPlugin::ConstructL()");
-    }
-
-void CRfsAppMgmtPlugin::RestoreFactorySettingsL( const TRfsReason /*aType*/ )
-    {
-    RDEBUG("CRfsAppMgmtPlugin::RestoreFactorySettingsL()");
-    RAppMgmtRfs appManagement;
-    if( appManagement.Connect() == KErrNone )
-        {
-        RDEBUG("CRfsAppMgmtPlugin::RestoreFactorySettingsL(): Connected to AppMgmt ");
-        appManagement.PerformRfsL();
-        appManagement.Close();
-        }
-    else
-        {
-        RDEBUG("CStartupAppUi::RTCStatus(): Unable to connect to AppMgmt ");
-        }
-    }
-
-void CRfsAppMgmtPlugin::GetScriptL( const TRfsReason /*aType*/, TDes& aPath )
-    {
-    aPath.Copy( KScriptPath);
-    }
-
-void CRfsAppMgmtPlugin::ExecuteCustomCommandL( const TRfsReason /*aType*/,
-                                        TDesC& /*aCommand*/ )
-    {
-    }
-
-// End of file
--- a/applicationmanagement/amadapter2/group/amadapter.mmp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,80 +0,0 @@
-/*
-* 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: Implementation of applicationmanagement components
-*
-*/
-  
-
-// To get the APP_LAYER_SYSTEMINCLUDE-definition
-#include <platform_paths.hrh>
-#include "defaultcaps.hrh"
-
-TARGET          amadapter2.dll
-
-CAPABILITY 	    CAP_ECOM_PLUGIN
-
-TARGETTYPE      PLUGIN
-UID             0x10009D8D 0x10207844
-VENDORID        VID_DEFAULT
-
-MACRO __AM_LASTERROR_NODE // uncomment to enable /SCM/Ext/LastError node
-
-APP_LAYER_SYSTEMINCLUDE
-SYSTEMINCLUDE 	/epoc32/include/ecom
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-SYSTEMINCLUDE 	/epoc32/include/devman
-#else
-// nothing
-#endif
-
-SOURCEPATH      ../src
-SOURCE          amadapter.cpp
-SOURCE					nsmldmiapmatcher.cpp
-SOURCE					nsmldmuri.cpp
-
-USERINCLUDE     ../inc 
-USERINCLUDE			../../inc
-USERINCLUDE 		../../options/inc // install options
-
-
-START RESOURCE amadapter.rss
-TARGET amadapter2.rsc
-END
-
-
-LIBRARY		euser.lib 
-LIBRARY		ecom.lib 
-LIBRARY     estor.lib
-LIBRARY		efsrv.lib 
-LIBRARY		applicationmanagement.lib
-LIBRARY		centralrepository.lib 
-LIBRARY 	aminstalloptions.lib 
-LIBRARY		featmgr.lib 
-LIBRARY 	flogger.lib
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-LIBRARY		devmancmdmgr.lib
-LIBRARY		dmtreeclient.lib
-#else
-LIBRARY		nsmldmtreedbclient.lib
-LIBRARY		nsmldmclientserverutils.lib
-LIBRARY		nsmldmiapmatcher.lib 
-#endif
-
-	
-
-SMPSAFE
-// End of File
-
--- a/applicationmanagement/amadapter2/group/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-/*
-* Copyright (c) 2004 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:  build info file for application management adapter
-*
-*/
-
-
-#include <platform_paths.hrh>
-
-PRJ_EXPORTS
-../rom/amadapter.iby						CORE_APP_LAYER_IBY_EXPORT_PATH(amadapter.iby)
-
-PRJ_TESTEXPORTS
-/* Commenting the internal folder exports
-../internal/AmadapterTestScript.cfg /epoc32/winscw/c/testframework/AmadapterTestScript.cfg
-../internal/verysilent_c_en.xml /epoc32/winscw/c/TestFramework/amadapter/verysilent_c_en.xml
-../internal/barew_locserv.sisx	/epoc32/winscw/c/TestFramework/amadapter/barew_locserv.sisx
-../internal/barew_locserv2.sisx	/epoc32/winscw/c/TestFramework/amadapter/barew_locserv2.sisx
-*/
-
-
-PRJ_MMPFILES
-./amadapter.mmp
-
-
-
-
--- a/applicationmanagement/amadapter2/inc/amadapter.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,797 +0,0 @@
-/*
-* 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:  Application Management DM Adapter 
-*
-*/
-
-
-
-#ifndef __AMADAPTER_H__
-#define __AMADAPTER_H__
-
-// ------------------------------------------------------------------------------------------------
-// Includes
-// ------------------------------------------------------------------------------------------------
-#include <e32base.h>
-#include <smldmadapter.h>
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-#include <dmtree.h>
-#else
-#include "nsmldmtreedbclient.h"
-#endif
-
-#include "ApplicationManagementClient.h"
-
-namespace NApplicationManagement
-	{
-	
-const TUint KAMAdapterImplUid = 0x10207845;
-
-// the DDF version must be changed if any changes in DDF structure ( built in DDFStructureL() function )
-_LIT8( KAMDDFVersion, "1.0" ); 
-
-_LIT8( KAMTextPlain, "text/plain" );
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-_LIT8( KAMNodeName, "./SCM" );
-#else
-_LIT8( KAMNodeName, "SCM" );
-#endif
-_LIT8( KAMNodeDescription, "This node is the root node for all application management functionality" );
-
-_LIT8( KAMInventoryNodeName, "Inventory" );
-_LIT8( KAMInventoryNodeDescription, "This node is start node of application inventory" );
-
-_LIT8( KAMDeliveredNodeName, "Delivered" );
-_LIT8( KAMDeliveredNodeDescription, "This is node under which applications that are delivered but not installed are found." );
-
-_LIT8( KAMDeployedNodeName, "Deployed" );
-_LIT8( KAMDeployedNodeDescription, "This is a node under which deployed applications are found" );
-
-_LIT8( KAMDeliveredDynaNodeDescription, "This dynamic node is placeholder applications that are in Delivered state" );
-
-_LIT8( KAMIDNodeName, "ID" );
-_LIT8( KAMIDNodeDescription, "This leaf node holds an identifier for an application" );
-
-_LIT8( KAMNameNodeName, "Name" );
-_LIT8( KAMNameNodeDescription, "This leaf node holds name of an application" );
-
-_LIT8( KAMVersionNodeName, "Version" );
-_LIT8( KAMVersionNodeDescription, "This leaf node holds the version of an application" );
-
-_LIT8( KAMStateValueNodeName, "StateValue" );
-_LIT8( KAMStateValueNodeDescription, "This leaf node holds the state value of an application (active/inactive)" );
-
-_LIT8( KAMDataNodeName, "Data" );
-_LIT8( KAMDataNodeDescription, "This leaf node holds the data of an application" );
-
-_LIT8( KAMDescriptorNodeName, "Descriptor" );
-_LIT8( KAMDescriptorNodeDescription, "This leaf node holds the possible metadata of an application" );
-
-_LIT8( KAMOperationsNodeName, "Operations" );
-_LIT8( KAMOperationsNodeDescription, "This is a node under which operations are found" );
-
-_LIT8( KAMInstallOptsNodeName, "InstallOpts" );
-_LIT8( KAMInstallOptsNodeDescription, "This is a node that holds the installation options of an application" );
-
-_LIT8( KAMDeployedDynaNodeDescription, "This dynamic node is placeholder applications that are in Inactive state" );
-
-
-_LIT8( KAMDownloadOperationNodeName, "Download" );
-_LIT8( KAMDownloadOperationNodeDescription, "Starts the download" );
-
-_LIT8( KAMConRefNodeName, "ConRef" );
-_LIT8( KAMConRefNodeDescription, "Holds reference to IAP" );
-
-
-_LIT8( KAMLocalOperationsNodeDescription, "This is the root node for local operations" );
-
-_LIT8( KAMActivateNodeName, "Activate" );
-_LIT8( KAMActivateNodeDescription, "Exec command causes device to activate an inactive application" );
-
-_LIT8( KAMDeActivateNodeName, "Deactivate" );
-_LIT8( KAMDeActivateNodeDescription, "Exec command causes device to stop and deactivate an active application" );
-
-_LIT8( KAMInstallNodeName, "Install" );
-_LIT8( KAMInstallNodeDescription, "Exec command causes device to install a delivered application" );
-
-_LIT8( KAMInstallAndActivateNodeName, "InstallAndActivate" );
-_LIT8( KAMInstallAndActivateNodeDescription, "Exec command causes device to install a delivered application and activate it" );
-
-_LIT8( KAMUpdateNodeName, "Update" );
-_LIT8( KAMUpdateNodeDescription, "Exec command causes device to update an application" );
-
-_LIT8( KAMUpdateAndActivateNodeName, "UpdateAndActivate" );
-_LIT8( KAMUpdateAndActivateNodeDescription, "Exec command causes device to update an application and activate it" );
-
-_LIT8( KAMRemoveNodeName, "Remove" );
-_LIT8( KAMRemoveNodeDescription, "Exec command causes device to remove an application" );
-
-
-_LIT8( KAMDownloadNodeName, "Download" );
-_LIT8( KAMDownloadNodeDescription, "This node is a root node for application download functionality" );
-
-_LIT8( KAMDownloadAndInstallNodeName, "DownloadAndInstall" );
-_LIT8( KAMDownloadAndInstallOperationNodeDescription, "Starts the download and installs component when complete" );
-
-_LIT8( KAMDownloadAndInstallAndActivateNodeName, "DownloadAndInstallAndActivate" );
-_LIT8( KAMDownloadAndInstallAndActivateNodeDescription, "Starts the download and installs and activates component when complete" );
-
-_LIT8( KAMDownloadAndUpdateNodeName, "DownloadAndUpdate" );
-_LIT8( KAMDownloadAndUpdateNodeDescription, "Starts the download and installs component when complete" );
-
-_LIT8( KAMDownloadAndUpdateAndActivateNodeName, "DownloadAndUpdateAndActivate" );
-_LIT8( KAMDownloadAndUpdateAndActivateNodeDescription, "Starts the download and updates and activates component when complete" );
-
-_LIT8( KAMDownloadDynaNodeDescription, "This node is a placeholder for identifier of an application that is to be downloaded" );
-
-_LIT8( KAMURINodeName, "URI" );
-_LIT8( KAMURINodeDescription, "This leaf node holds the URL from which the application should be downloaded" );
-
-_LIT8( KAMStatusNodeName, "Status" );
-_LIT8( KAMStatusNodeDescription, "This leaf node holds the status of the download" );
-
-#ifdef __AM_LASTERROR_NODE
-_LIT8( KAMExtNodeName, "Ext" );
-_LIT8( KAMExtNodeDescription, "Non std extentions are found under this leaf" );
-_LIT8( KAMLastErrorNodeName, "LastError" );
-_LIT8( KAMLastErrorDescription, "This leaf node may hold the error" );
-#endif
-
-_LIT8( KAMDynamicNodeName, "" );
-_LIT( KAMSeparator16, "/" );
-
-_LIT8( KAMSeparator8, "/" );
-
-_LIT8( KAMRootChilds, "Inventory/Download" );
-_LIT8( KAMInventoryChilds, "Delivered/Deployed" );
-//_LIT8( KAMLocalOperationsChilds, "Activate/DeActivate/Install/Update/Remove" );
-
-_LIT8( KAMDownloadDynaChilds, "ID/Name/Version/URI/Status/Operations" );
-_LIT8( KAMInventoryDynaChilds, "ID/Name/Version/StateValue/Operations" );
-_LIT8( KAMDownloadOperationChilds, "Download/DownloadAndInstall/DownloadAndInstallAndActivate/DownloadAndUpdate/DownloadAndUpdateAndActivate" );
-_LIT8( KAMDeployedOperationChilds, "Activate/Deactivate/Remove" );
-_LIT8( KAMDeliveredOperationChilds, "Install/Update/InstallAndActivate/UpdateAndActivate/Remove" );
-_LIT8( KAMInventoryDeliveredDynaChilds, "ID/Name/Version/Descriptor/Data/InstallOpts/Operations" );
-
-
-struct TAMCommandBufferElement
-	{
-	TInt iStatusRef;
-	TBuf8<256> iURI;
-	TAMCommandBufferElement( TInt aRef, const TDesC8 &aURI )
-		: iStatusRef( aRef ), iURI( aURI )
-		{
-		}
-	};
-	
-typedef RArray<TAMCommandBufferElement> TAMCommandBuffer;	
-
-// ------------------------------------------------------------------------------------------------
-// CAmAdapter 
-// ------------------------------------------------------------------------------------------------
-class CAmAdapter : public CSmlDmAdapter
-	{
-public:
-	static CAmAdapter* NewL( MSmlDmCallback* aDmCallback );
-	static CAmAdapter* NewLC( MSmlDmCallback* aDmCallback );
-
-	virtual ~CAmAdapter();
-
-
-/**
-	The function returns current version of the DDF.
-	By asking current DDF versions from adapters DM Module can control
-	possible changes in the data structure and send the changed DDF
-	description to a management server.
-	This function is always called after DDFStructureL.
-    @param aVersion DDF version of the adapter. (filled by the adapter)
-	@publishedPartner
-	@prototype
-	*/
-	virtual void DDFVersionL( CBufBase& aVersion );
-	
-	/**
-	The function for filling the DDF structure of the adapter
-	This function is only called once, immediately after the adapter is created.
-	@param aDDFObject	Reference to root object. A DM adapter starts filling
-						the data structure by calling AddChildObjectL to the root object and
-						so describes the DDF of the adapter. 
-	@publishedPartner
-	@prototype
-	*/
-	virtual void DDFStructureL( MSmlDmDDFObject& aDDF );
-	
-	/**
-	The function creates new leaf objects, or replaces data in existing leaf
-	objects. The information about the success of the command should be
-	returned by calling SetStatusL function of MSmlDmCallback callback
-	interface. This makes it possible to buffer the commands.  However, all
-	the status codes for buffered commands must be returned at the latest when
-	the adapter's CompleteOutstandingCmdsL() is called.
-	@param aURI			URI of the object
-	@param aLUID		LUID of the object (if the adapter has earlier returned a
-						LUID to the DM Module). For new objects, this is the LUID
-						inherited through the parent node.
-	@param aObject		Data of the object.
-	@param aType		MIME type of the object
-	@param aStatusRef	Reference to correct command, i.e. this reference
-						must be used when calling the SetStatusL of this command
-	@publishedPartner
-	@prototype
-	*/
-	virtual void UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID,
-									const TDesC8& aObject, const TDesC8& aType,
-									TInt aStatusRef );
-		
-	/**
-	The function creates new leaf objects, or replaces data in existing leaf
-	objects, in the case where data is large enough to be streamed. The
-	information about the success of the command should be returned by calling
-	SetStatusL function of MSmlDmCallback callback interface. This makes it
-	possible to buffer the commands.  However, all the status codes for buffered
-	commands must be returned at the latest when the CompleteOutstandingCmdsL()
-	of adapter is called.
-	@param aURI		URI of the object
-	@param aLUID		LUID of the object (if the adapter has earlier returned a
-						LUID to the DM Module). For new objects, this is the LUID
-						inherited through the parent node.
-	@param aStream	Data of the object. Adapter should create write stream
-						and return, when data is written to stream by DM agent,
-						StreamCommittedL() is called by DM engine
-	@param aType		MIME type of the object
-	@param aStatusRef	Reference to correct command, i.e. this reference
-						must be used when calling the SetStatusL of this
-						command.
-	@publishedPartner
-	@prototype
-	*/
-	virtual void UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID,
-									RWriteStream*& aStream, const TDesC8& aType,
-		 							TInt aStatusRef );
-	
-	/**
-	The function deletes an object and its child objects. The SetStatusL
-	should be used as described in UpdateLeafObjectL()
-	@param aURI		URI of the object
-	@param aLUID		LUID of the object (if the adapter have earlier returned
-						LUID to the DM Module).
-	@param aStatusRef	Reference to correct command, i.e. this reference must
-						be used when calling the SetStatusL of this command.
-	@publishedPartner
-	@prototype
-	*/
-	virtual void DeleteObjectL( const TDesC8& aURI, const TDesC8& aLUID,
-								TInt aStatusRef );
-	
-	/**
-	The function fetches data of a leaf object. The SetStatusL should be used
-	as described in UpdateLeafObjectL(). The data is returned by using the
-	SetResultsL function of MSmlCallback callback interface, and may be streamed.
-	@param aURI			URI of the object
-	@param aLUID			LUID of the object (if the adapter have earlier
-							returned LUID to the DM Module).   
-	@param aType 			MIME type of the object
-	@param aResultsRef	Reference to correct results, i.e. this reference
-							must be used when returning the result by calling
-							the SetResultsL.
-	@param aStatusRef		Reference to correct command, i.e. this reference
-							must be used when calling the SetStatusL of this
-							command.
-	@publishedPartner
-	@prototype
-	*/
-	virtual void FetchLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID,
-								   const TDesC8& aType, TInt aResultsRef,
-								   TInt aStatusRef );
-	
-	/**
-	The function fetches the size of the data of a leaf object. The size is
-	in bytes, and must reflect the number of bytes that will be transferred
-	when the framework calls FetchLeafObjectL. The SetStatusL should be used
-	as described in FetchLeafObjectL(). The size value is returned by using
-	the SetResultsL function of MSmlCallback callback interface, and must be
-	a decimal integer expressed as a string, eg. "1234".
-	Results from this call MUST NOT be streamed.
-	@param aURI			URI of the object
-	@param aLUID			LUID of the object (if the adapter have earlier
-							returned LUID to the DM Module).   
-	@param aType 			MIME type of the object
-	@param aResultsRef	Reference to correct results, i.e. this reference
-							must be used when returning the result by calling
-							the SetResultsL.
-	@param aStatusRef		Reference to correct command, i.e. this reference
-							must be used when calling the SetStatusL of this
-							command.
-	@publishedPartner
-	@prototype
-	*/
-	virtual void FetchLeafObjectSizeL( const TDesC8& aURI, const TDesC8& aLUID,
-									   const TDesC8& aType, TInt aResultsRef,
-									   TInt aStatusRef );
-	/**
-	The function fetches URI list. An adapter returns the list of URI segments
-	under the given URI be separated by slash ("/"). The URI segment names for
-	new objects must be given by the adapter.
-	The list is returned by calling the SetResultsL function of MSmlCallback
-	callback interface.	Results from this call MUST NOT be streamed.
-	@param aParentURI					URI of the parent object
-	@param aParentLUID				LUID of the parent object (if the
-										adapter have earlier returned LUID to
-										the DM Module).   
-	@param aPreviousURISegmentList	URI list with mapping LUID information,
-										which is known by DM engine. An adapter
-										can use this information when verifying
-										if old objects still exists. An adapter
-										also knows what objects are new to DM
-										engine and can provide LUID mapping for
-										them. aPreviousURISegmentList parameter
-										(see above) helps to recognise new
-										objects.
-	@param aResultsRef				Reference to correct results, i.e. this
-										reference must be used when returning
-										the result by calling the SetResultsL.
-	@param aStatusRef					Reference to correct command, i.e. this
-										reference must be used when calling the
-										SetStatusL of this command.
-	@publishedPartner
-	@prototype
-	*/
-	virtual void ChildURIListL( const TDesC8& aURI, const TDesC8& aLUID,
-					const CArrayFix<TSmlDmMappingInfo>& aPreviousURISegmentList,
-					TInt aResultsRef, TInt aStatusRef );
-	
-	/**
-	The function adds node object. In some cases an implementation of the
-	function may be empty function, if the node object does not need concrete
-	database update. Still this function may be helpful to an adapter, i.e. in
-	passing mapping LUID of the node to DM Module. The SetStatusL should be
-	used as described in UpdateLeafObjectL()
-	@param aURI			URI of the object
-	@param aParentLUID	LUID of the parent object (if the adapter have
-							earlier returned LUID to the DM Module).   
-	@param aStatusRef		Reference to correct command, i.e. this reference
-							must be used when calling the SetStatusL of this
-							command.
-	@publishedPartner
-	@prototype
-	*/
-	virtual void AddNodeObjectL( const TDesC8& aURI, const TDesC8& aParentLUID,
-								 TInt aStatusRef );
-
-	/**
-	The function implements execute command. The information about the success
-	of the command should be returned by calling SetStatusL function of
-	MSmlDmCallback callback interface. This makes it possible to buffer the
-	commands.
-	However, all the status codes for buffered commands must be returned at
-	the latest when the CompleteOutstandingCmdsL() of adapter is called.
-	@param aURI			URI of the command
-	@param aLUID			LUID of the object (if the adapter have earlier
-							returned LUID to the DM Module).   
-	@param aArgument		Argument for the command
-	@param aType			MIME type of the object 
-	@param aStatusRef		Reference to correct command, i.e. this reference
-							must be used when calling the SetStatusL of this
-							command.
-	@publishedPartner
-	@prototype
-	*/
-	virtual void ExecuteCommandL( const TDesC8& aURI, const TDesC8& aLUID,
-							      const TDesC8& aArgument, const TDesC8& aType,
-								  TInt aStatusRef );
-
-	/**
-	The function implements execute command. The information about the
-	success of the command should be returned by calling SetStatusL function
-	of MSmlDmCallback callback interface. This makes it possible to buffer the
-	commands.
-	However, all the status codes for buffered commands must be returned at
-	the latest when the CompleteOutstandingCmdsL() of adapter is called.
-	@param aURI			URI of the command
-	@param aLUID			LUID of the object (if the adapter have earlier
-							returned LUID to the DM Module).   
-	@param aStream		Argument for the command. Adapter should create
-							write stream and return, when data is written to
-							stream by DM agent, StreamCommittedL() is called by
-							DM engine
-	@param aType			MIME type of the object 
-	@param aStatusRef		Reference to correct command, i.e. this reference
-							must be used when calling the SetStatusL of this
-							command.
-	@publishedPartner
-	@prototype
-	*/
-	virtual void ExecuteCommandL( const TDesC8& aURI, const TDesC8& aLUID,
-								  RWriteStream*& aStream, const TDesC8& aType,
-								  TInt aStatusRef );
-
-	/**
-	The function implements copy command. The information about the success of
-	the command should be returned by calling SetStatusL function of
-	MSmlDmCallback callback interface. This makes it possible to buffer the
-	commands.
-	However, all the status codes for buffered commands must be returned at
-	the latest when the CompleteOutstandingCmdsL() of adapter is called.
-	@param aTargetURI		Target URI for the command
-	@param aSourceLUID	LUID of the target object (if one exists, and if the adapter
-							has	earlier returned a LUID to the DM Module).   
-	@param aSourceURI		Source URI for the command
-	@param aSourceLUID	LUID of the source object (if the adapter has
-							earlier returned a LUID to the DM Module).   
-	@param aType			MIME type of the objects
-	@param aStatusRef		Reference to correct command, i.e. this reference
-							must be used when calling the SetStatusL of this
-							command.
-	@publishedPartner
-	@prototype
-	*/
-	virtual void CopyCommandL( const TDesC8& aTargetURI, const TDesC8& aTargetLUID,
-							   const TDesC8& aSourceURI, const TDesC8& aSourceLUID,
-							   const TDesC8& aType, TInt aStatusRef );
-
-	/**
-	The function indicates start of Atomic command.
-	@publishedPartner
-	@prototype
-	*/
-	virtual void StartAtomicL();
-	
-	/**
-	The function indicates successful end of Atomic command. The adapter
-	should commit all changes issued between StartAtomicL() and
-	CommitAtomicL()
-	@publishedPartner
-	@prototype
-	*/
-	virtual void CommitAtomicL();
-	
-	/**
-	The function indicates unsuccessful end of Atomic command. The adapter
-	should rollback all changes issued between StartAtomicL() and
-	RollbackAtomicL(). If rollback fails for a command, adapter should use
-	SetStatusL() to indicate it.
-	@publishedPartner
-	@prototype
-	*/
-	virtual void RollbackAtomicL();
-	
-	/**
-    Returns ETrue if adapter supports streaming otherwise EFalse.
-	@param aItemSize size limit for stream usage
-    @return TBool ETrue for streaming support
-	@publishedPartner
-	@prototype
-    */
-	virtual TBool StreamingSupport( TInt& aItemSize ) ;
-	
-	/**
-    Called when stream returned from UpdateLeafObjectL or ExecuteCommandL has
-	been written to and committed. Not called when fetching item.
-	@publishedPartner
-	@prototype
-    */	
-#ifdef __TARM_SYMBIAN_CONVERGENCY	
-	virtual void StreamCommittedL( RWriteStream& aStream );
-#else
-	virtual void StreamCommittedL();
-#endif	
-	/**
-	The function tells the adapter that all the commands of the message that
-	can be passed to the adapter have now been passed.  This indciates that
-	the adapter must supply status codes and results to any buffered commands.
-	This must be done at latest by the time this function returns.
-	This function is used at the end of SyncML messages, and during processing
-	of Atomic.   In the case of Atomic processing, the function will be
-	followed by a call to CommitAtomicL or RollbackAtomicL.
-	@publishedPartner
-	@prototype
-	*/
-	virtual void CompleteOutstandingCmdsL();
-	
-private:
-	CAmAdapter( TAny* aDmCallback );
-	void ConstructL();
-	TInt DesToIntL( const TDesC8& aLuid );
-	HBufC8* IntToDes8LC( const TInt aLuid );
-	
-	TBool CheckStateL( const TDeploymentComponent &aComp, const TDesC8& aURI );
-	TBool CheckStateL( const TDesC8& aURI,const TDesC8& aLUID );
-	/**
-	 * UpdateFlagFromMapping Maps a node name to internal attribute flag that
-	 * 	is used by server to identify to data 
-	 * @param aMapping	The SyncML node name
-	 * @return  TDeplCompAttrType the attribute type
-	 */
-	TDeplCompAttrType UpdateFlagFromMapping( const TDesC8& aMapping );
-	
-	/**
-	 * IdListL Looks up the given state user ids of deployment components,
-	 * 	and places them to currentList in the format specified by SyncML spec 
-	 * @param aState	The deployment component state in which we are interested
-	 * @param aCurrentList The buffer where the results are placed
-	 * @param aAppend Does the list possibly contain some items already
-	 * @return  TError EOk if successful
-	 */
-	TError IdListL( TDeploymentComponentState aState, 
-			CBufBase &aCurrentList, TBool aAppend = EFalse );
-	
-	/**
-	 * DeliverOrDownloadL Depending on aURI, creates new delivery or download component
-	 *
-	 * @param aUserId	The name of dynamic node.
-	 * @param aURI		The full URI
-	 * @param aCnt		Count of URI segments
-	 * @param aParentMapping	The parent data
-	 * @param aStatus A reference to the error which will be set the status of the operation
-	 * @return  TError EOk if successful
-	 */
-	void DeliverOrDownloadL( const TDesC8 &aUserId, const TDesC8 &aURI, 
-		TInt aCnt, const TDesC8 &aParentMapping, 
-		MSmlDmAdapter::TError &aStatus );
-
-	
-	/**
-	 * Fills the node info in ddf structure
-	 */
-	void FillNodeInfoL( MSmlDmDDFObject& aNode, TSmlDmAccessTypes aAccTypes, 
-		MSmlDmDDFObject::TOccurence aOccurrence,
-		MSmlDmDDFObject::TScope aScope, MSmlDmDDFObject::TDFFormat aFormat,
-		const TDesC8& aDescription); 
-		
-	/**
-	 * Fills the node info in ddf structure, without default mime type
-	 */	
-	void FillNodeInfoNoDefaultMimeL( MSmlDmDDFObject& aNode, TSmlDmAccessTypes aAccTypes, 
-		MSmlDmDDFObject::TOccurence aOccurrence,
-		MSmlDmDDFObject::TScope aScope, MSmlDmDDFObject::TDFFormat aFormat,
-		const TDesC8& aDescription); 
-		
-	TBool IsImage(const TDesC8& aMime) ;
-	/**
-	Calls Callback().SetResultsL()
-	*/
-	void SetResultsL( TInt aResultsRef, CBufBase& aObject,
-							  const TDesC8& aType );
-/**
-	Calls Callback().SetStatusL()
-	*/
-	void SetStatusL( TInt aStatusRef,
-							 MSmlDmAdapter::TError aErrorCode );
-//	TInt FindBuffered( const TDesC8 &aURI ) ;
-	RApplicationManagement &SessionL();
-	TDeploymentComponentState StateL( const TDesC8& aURI );
-
-	void CheckStateChangesL();
-	void CheckStateChangesInternalL();
-	
-	
-	TPtrC8 URISegsUpTo(const TDesC8& aURI, TInt aUpTo, TBool aInclKeno=EFalse);
-	
-	/**
-	 * Helper method to move acl. Copies acl of node aFrom to acl of aTo,
-	 * and removes acl from aFrom.
-	 *
-	 * @param aFrom The source uri
-	 * @param aTo	The target uri
-	 */
-	void MoveAclL( const TDesC8 &aFrom, const TDesC8 &aTo );
-	
-	/**
-	 * Helper method to move nodes in SCM tree
-	 *
-	 * 1. Sets mapping of aOriginal to null.
-	 * 2. If aNewURI is null, constructs new uri depending on aTargetstate.
-	 * 3. Sets mapping of aNewURI to aLUID
-	 * 4. Moves acls of aOriginal to aNewURI (using MoveAclL)
-	 *
-	 * @param aOriginal The uri of original node to be moved
-	 * @param aTargetstate The target state the node is moving to
-	 * @param aLUID The luid of the original node
-	 * @param aNewUri The new uri of the node (will be constructed and left to stack if null)
-	 */
-	void SetMappingLC( const TDesC8 &aOriginal, 
-		const TDeploymentComponentState aTargetstate, const TDesC8 &aLUID, 
-		HBufC8 *&aNewUri );
-		
-	/**
-	 * Helper method to move nodes in SCM tree
-	 *
-	 * 1. Sets mapping of aOriginal to null.
-	 * 2. Sets mapping of a uri constructed using aTargetState to aLUID
-	 * 2. Moves acls of aOriginal to a uri constructed using aTargetState (using MoveAclL)
-	 *
-	 * @param aOriginal The uri of original node to be moved
-	 * @param aTargetstate The target state the node is moving to
-	 * @param aLUID The luid of the original node
-	 */
-	void SetMappingL( const TDesC8 &aOriginalURI, 
-		const TDeploymentComponentState aTargetState, const TDesC8 &aLUID ) ;
-	
-	/**
-	 * Helper method to set DM LUID mappings directly database.
-	 *
-	 * @param aURI The uri of node whose mapping is to be set
-	 * @param aLUID The new mapping value
-	 * @return Possible database error - KErrNone if successful
-	 */
-	TInt DirectSetMappingL( const TDesC8 &aURI, const TDesC8 &aLUID );
-	
-	TInt DirectRemoveMappingL(const TDesC8 &aURI);
-	/**
-	 * Helper method to get DM LUID mappings directly from database.
-	 *
-	 * @param aURI The uri of node whose mapping is to be found
-	 * @return The luid mapping - Empty string if not found.
-	 */
-	 HBufC8 *DirectGetLuidAllocLC( const TDesC8 &aURI );
-	
-	
-	/**
-	 * Helper method to perform install
-	 *
-	 * @param aLuidi The mapping value of component as integer
-	 * @param aURI The uri of node that is to be installed
-	 * @param aLUID The mapping value of component as text
-	 * @param aTargetstate The target state the node is moving to (EDCSActive or EDCSInactive)
-	 * @param aRet	The SyncML Error code - value will be updated according to success
-	 */
-	void InstallL( const TUint aLuidi, const TDesC8& aURI, const TDesC8& aLUID, 
-					const TDeploymentComponentState aTargetState, TError &aRet );
-	
-	/**
-	 * Helper method to perform update
-	 *
-	 * @param aLuidi The mapping value of component as integer
-	 * @param aURI The uri of node that is to be installed
-	 * @param aLUID The mapping value of component as text
-	 * @param aTargetstate The target state the node is moving to (EDCSActive or EDCSInactive)
-	 * @param aRet	The SyncML Error code - value will be updated according to success
-	 */
-	void UpdateL( const TUint aLuidi, const TDesC8& aURI, const TDesC8& aSourceLUID, 
-					const TDeploymentComponentState aTargetState, TError &aRet );
-	/**
-	 maps symbian error code to DM error code as follows:
-	  Kerrnone-> EOk
-	  Kerrnotfound ->Enotfound
-	  all oether -> EError
-	 */
-	void DefaultMapError( const TInt aErr, TError &aRet, const TDesC8& aDes = KNullDesC8 );
-	
-	/**
-	 * Deactivates given component if given state is inactive
-	 */
-	void DeactivateIfInactive( const TUint aLuidi, const TDeploymentComponentState aTargetState );
-	
-	/**
-	 * Finds luid from app mgmt server to given userid
-	 */
-	TUint32 GetLuidForUserIdL( const TDesC8 &aUserId, const TDeploymentComponentState aState );
-
-	TUint32 GetLuidL( const TDesC8 &aDMLuid, const TDesC8 &aUserId, 
-		const TDeploymentComponentState aState );
-	
-	/**
-	 * places result in current
-	 * @param aParent The deployment component identifying uri 
-	 * @param aMapping The user id part of the deployment component uri
-	 * @param aLuid Internal id of the deployment compoennt
-	 * @param aCurrentList The list that will get the data
-	 * @param aStatus The syncml status
-	 */
-	void GetComponentDataL( const TDesC8& aParent, const TDesC8& aMapping, const TUint32 aLuid, 
-		CBufBase &aCurrentList, CBufBase &currentMime, TError &aStatus );
-	/**
-	 * returns luid of leaf node, or 0
-	 */
-	TInt GetLeafLuidL( const TDesC8 &aURI, const TDesC8 & aParentMapping ) ;
-	/**
-	 * returns length of result
-	 */
-	TInt GetSizeL( const TDeplCompAttrType aDataType, const TInt aLuid, TError &aRet );
-
-	/**
-	 * places installoptions of given aLuid to aBuf
-	 */
-	void InstallOptionsDataL(const TUint32 aLuid, const TDeplCompAttrType& aDataType, 
-			CBufBase &aBuf, CBufBase *aRaw = NULL);
-	
-	/**
-	 * Gets the luid using GetLuidL, and updates aStatus to ENotFound if not found...
-	 */
-	TUint32 GetLuid2L( const TDesC8 &aDMLuid, const TDesC8 &aUserId, 
-			const TDeploymentComponentState aState, TError &aStatus );
-
-	/**
-	 * Finds out correct download target based on download operation 
-	 */
-	TDownloadTarget DownloadTargetL( const TDesC8& aOperation );
-	
-	TPtrC8 LastURISeg(const TDesC8& aURI);
-	TInt DesToInt(const TDesC8& aLuid);
-		
-#ifdef __AM_LASTERROR_NODE
-	void SetLastErrorL( const TDesC8& aLastError, const TInt aErr );
-	const TDesC8& LastError();
-	void SetErrorL( const TDesC8& aDes, const TInt aErr );
-#endif
-
-
-
-	/**
-	The function creates new leaf objects, or replaces data in existing leaf
-	objects. The information about the success of the command should be
-	returned by calling SetStatusL function of MSmlDmCallback callback
-	interface. This makes it possible to buffer the commands.  However, all
-	the status codes for buffered commands must be returned at the latest when
-	the adapter's CompleteOutstandingCmdsL() is called.
-	@param aURI			URI of the object
-	@param aLUID		LUID of the object (if the adapter has earlier returned a
-						LUID to the DM Module). For new objects, this is the LUID
-						inherited through the parent node.
-	@param aObject		Data of the object.
-	@param aType		MIME type of the object
-	@param aStatusRef	Reference to correct command, i.e. this reference
-						must be used when calling the SetStatusL of this command
-	@publishedPartner
-	@prototype
-	*/
-	void _UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID,
-									const TDesC8& aObject, const TDesC8& aType,
-									TInt aStatusRef, MSmlDmAdapter::TError& aStatus );
-	/**
-	 * The function creates new leaf objects, or replaces data in existing leaf
-	 */	
-	void CloseStreaming();
-	TInt GetAdapterValue();
-	void SetAdapterValue(TInt aAdapterValue);
-	
-private:
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-	RDmTree iDbSession;
-#else
-	RNSmlDMCallbackSession iDbSession; // to change acl location
-#endif
-
-	RApplicationManagement iManagement ;
-	TBool iSessionOpened ;
-	TAMCommandBuffer iBuffer;
-	TBool iInAtomic ;
-	TBool iUpdated; // have we checked changed state DCs?
-	// Streaming API support
-	TBool iStreamOpen;
-	RFileWriteStream iStream;
-    TInt iStatusRef;
-	RFs iStreamRFs;
-	RFile iStreamFile;
-	TBool iIsStreamedContent;
-	HBufC8*	iStreamedURI;
-	HBufC8* iStreamedLuid;
-	HBufC8*	iStreamedType;
-	TBool iCertRequired;
-	TBool iTrustAdded;
-	
-#ifdef __AM_LASTERROR_NODE
-	HBufC8 *iLastError;
-#endif
-
-   HBufC8 *iUriDel;
-};
-
-	} // namespace
-#endif // __AMDMADAPTER_H__
-
-// End of File
--- a/applicationmanagement/amadapter2/inc/nsmldmiapmatcher.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,129 +0,0 @@
-/*
-* 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:  DM Tree module
-*
-*/
-
-
-#ifndef __NSMLDMIAPMATCHER_H__
-#define __NSMLDMIAPMATCHER_H__
-
-// ------------------------------------------------------------------------------------------------
-// Includes
-// ------------------------------------------------------------------------------------------------
-#include <e32base.h>
-#include "nsmldmuri.h"
-
-//CLASS FORWARDS
-class MSmlDmCallback;
-
-_LIT8( KNSmlDMIAPUri, "AP" );
-_LIT8( KNSmlDMSeparator8, "/" );
-_LIT8( KNSmlDMIAPUriDotSlash, "./" );
-_LIT8( KNSmlDMConnMOIAPUri, "NAP" );
-
-const TUint8 KNSmlDMSlash = 0x2f; //forward slash
-/**
-* CNSmlDMIAPMatcher contains services for generating URI from IAPId and
-* vice versa in DM plug-in adapters. The class needs the working
-* MSmlDmCallback callback interface for operating, so ths can be used only
-* by DM plug-in adapters
-*
-*  @since
-*/
-class CNSmlDMIAPMatcher : public CBase
-	{
-    public:
-		/**
-		* Destructor
-		*/
-	    ~CNSmlDMIAPMatcher();
-
-		/**
-		* Two-phased constructor
-		* @param	aDmCallback			Pointer to callback interface
-		* @return						Pointer to newly created module instance
-		*/
-        static CNSmlDMIAPMatcher* NewL( MSmlDmCallback* aDmCallback);
-
-		/**
-		* Two-phased constructor, pushes pointer to cleanup stack.
-		* @param	aDmCallback			Pointer to callback interface
-		* @return						Pointer to newly created module instance
-		*/
-        static CNSmlDMIAPMatcher* NewLC( MSmlDmCallback* aDmCallback);
-
-		/**
-		* Gets the IAP id which corresponds to given URI
-		* @param	aURI				Accespoint URI
-		* @return						Accespoint id in AP database
-		*/
-        TInt IAPIdFromURIL( const TDesC8& aURI );
-
-		/**
-		* Generates the URI which corresponds to given IAP Id
-		* @param	aIAPId				Accespoint Id
-		* @return						Accesspoint URI in DM
-		*/
-        HBufC8* URIFromIAPIdL( TInt aIAPId );
-
-    private:
-		/**
-		* Second phase constructor
-		* @param	aDmCallback			Pointer to callback interface
-		*/
-        void ConstructL(MSmlDmCallback* aDmCallback);
-
-		/**
-		* Changes the given descriptor to Integer
-		* @param	aLuid				Luid in descriptor format
-		* @return						Luid in TInt type
-		*/
-        TInt DesToInt(const TDesC8& aLuid) const;
-
-		/**
-		* Return the URI without ./ at the beginning, if those exist
-		* @param	aURI		Uri
-		* @return 		 		Uri without ./
-		*/
-        TPtrC8 RemoveDotSlash(const TDesC8& aURI) const;
-
-		/**
-		* Return the last uri segment of the aURI
-		* @param	aURI		Uri
-		* @return 		 		The last uri segment
-		*/
-        TPtrC8 LastURISeg(const TDesC8& aURI) const;
-        
-    /**
-		* Return the last uri segment of the aURI
-		* @return 		 		The AccessPoint Reference
-		*/
-        const TDesC8& GetConRef() ;
-
-    private:
-    
- 		/**
-		* Pointer to callback interface
-		*/
-		MSmlDmCallback* iCallback;
-		
-		/**
-		* Boolean to check FeatMgr Initialization
-		*/
-		TBool iFeatMgrInitialized;
-	
-	};
-
-#endif // __NSMLDMIAPMATCHER_H__
--- a/applicationmanagement/amadapter2/inc/nsmldmuri.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,95 +0,0 @@
-/*
-* 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:  DM Utilities
-*
-*/
-
-
-#ifndef __NSMLDMURI_H
-#define __NSMLDMURI_H
-
-#include <e32std.h>
-#include <e32base.h>
-#include <e32def.h>
-
-
-const TUint8 KNSmlDMUriSeparator = 0x2f; //forward slash
-
-_LIT8(KNSmlDmRootUri, ".");
-_LIT8(KNSmlDmUriDotSlash, "./");
-_LIT8( KNSmlDmQuestionMark, "?" );
-
-// ===========================================================================
-// NSmlDmURI
-// ===========================================================================
-/**
-* NSmlDmURI contains just static methods for parsing URIs
-*
-*  @since
-*/
-class NSmlDmURI
-	{
-	public:
-	/**
-	* Return the parent URI of given URI
-	* @param	aURI		Uri
-	* @return 		 		Parent URI
-	*/
-	static TPtrC8 ParentURI(const TDesC8& aURI);
-
-	/**
-	* Return the last URI segment of given URI
-	* @param	aURI		Uri
-	* @return 		 		Last URI segment
-	*/
-	static TPtrC8 LastURISeg(const TDesC8& aURI);
-
-	/**
-	* Return the URI without ./ at the beginning, if those exist
-	* @param	aURI		Uri
-	* @return 		 		Uri without ./
-	*/
-	static TPtrC8 RemoveDotSlash(const TDesC8& aURI);
-
-	/**
-	* Return the URI without property info at the end (?prop=...)
-	* @param	aURI		Uri
-	* @return 		 		Uri without property info
-	*/
-	static TPtrC8 RemoveProp(const TDesC8& aURI);
-
-	/**
-	* Return the URI without last segment
-	* @param	aURI		Uri
-	* @return 		 		URI without last uri segment
-	*/
-	static TPtrC8 RemoveLastSeg(const TDesC8& aURI);
-
-	/**
-	* Return the aLocationth URI segment.
-	* @param	aURI		Uri
-	* @param	aLocation	The wanted segment number
-	* @return 		 		The aLocationth URI segment
-	*/
-	static TPtrC8 URISeg(const TDesC8& aURI,TInt aLocation);
-
-	/**
-	* Return the number of URI  segments of given URI
-	* @param	aURI		Uri
-	* @return 		 		Number of segments
-	*/
-	static TInt NumOfURISegs(const TDesC8& aURI);
-	};
-
-#endif // __NSMLDMURI_H
--- a/applicationmanagement/amadapter2/rom/amadapter.iby	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of applicationmanagement components
-*
-*/
-#ifndef __AMDMADAPTER_IBY__
-#define __AMDMADAPTER_IBY__
-
-//#if defined(__SYNCML_DM) && defined(__SAP_APPLICATION_MANAGEMENT)
-#if defined(__SYNCML_DM) 
-ECOM_PLUGIN(amadapter2.dll, amadapter2.rsc)
-#endif
-
-#endif
--- a/applicationmanagement/amadapter2/src/amadapter.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3897 +0,0 @@
-/*
-* 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:  Application Management DM Adapter
-*
-*/
-
-
-/**
-
-1. Remember the applications managed by Corporate Admin Role certificate
- 1.1 They must be removed during rfs
- 1.2 Others must be left as is (applications at least must be left)
-
-*/
-
-/*
-
-./SCM -+-> Inventory -+--> Deployed ---> <X> * ---+--> ID
-      |            	 |              			 |
-      |            	 |              			 |--> Name ?
-      |            	 |              			 |
-      |            	 |      			 		 |--> Version ?
-      |            	 |      			 		 |
-      |            	 |            			     |--> StateValue ?
-      |            	 |      			 		 |
-      |            	 |            			     |--> EnvType ? X
-      |            	 |       					 |
-      |        	  	 |				             |--> Operations ---+-> Activate ?
-      |        	  	 |        					 |					|
-      |        	  	 |        					 |					|-> Deactivate ?
-      |        	  	 |        					 |					|
-      |        	  	 |        					 |					|-> Remove ?
-      |        	  	 |        					 |					|
-      |        	  	 |        					 |					|-> Ext ? X
-      |        	  	 |        					 |
-      |        	  	 |				             |--> Ext ? X
-      |        	  	 |            
-      |        	  	 +--> Delivered ---> <X> * --+--> ID
-      |            	                			 |
-      |            	                			 |--> Data
-      |            	                			 |
-      |            	        			 		 |--> Name ?
-      |				  							 |
-      |				  							 |--> Version ?
-      |				  							 |
-      |				  							 |--> InstallOpts ?
-      |            	        			 		 |
-      |            	              			     |--> Descriptor ?
-      |            	        			 		 |
-      |            	              			     |--> EnvType ? X
-      |            	        			 		 |
-      |            	              			     |--> ContentType ? X
-      |            	         					 |
-      |        	  	  				             |--> Operations ---+-> Install ?
-      |        	  	          					 |					|
-      |        	  	          					 |					|-> Update ?
-      |        	  	          					 |					|
-      |        	  	          					 |					|-> InstallAndActivate ? 
-      |        	  	          					 |					|
-      |        	  	          					 |					|-> UpdateAndActivate ? 
-      |        	  	          					 |					|
-      |        	  	          					 |					|-> Remove ?
-      |        	  	          					 |					|
-      |        	  	          					 |					|-> Ext ?
-      |        	  	          					 |
-      |        	  	  				             |--> Ext ?
-	  |
-      |
-      +-> Download --> <X> * ---+-> ID
-      |							|
-      |							|-> URI
-      |							|
-      |							|-> Name ?
-      |							|
-      |							|-> Version ?
-      |							|
-      |							|-> InstallOpts ? X      
-      |							|
-      |							|-> ConRef ? X      
-      |							|
-      |							|-> Status ?
-      |							|
-      |							|-> EnvType ? X
-      |							|
-      |							|-> ContentType ? X
-	  |							|
-      |			             	|--> Operations ----+-> Download ?
-      |						    |					|
-      |       	  	          	|				 	|-> DownloadAndInstall ? X
-      |        	  	          	|				 	|
-      |        	  	          	|				 	|-> DownloadAndInstallAndActivate ? X
-      |        	  	          	|				 	|
-      |        	  	          	|				 	|-> DownloadAndUpdate ? X
-      |        	  	          	|				 	|
-      |        	  	          	|				 	|-> DownloadAndUpdateAndActivate ? X
-      |        	  	          	|				 	|
-      |        	  	          	|				 	|-> Ext ?
-      |        	  	          	|				 
-      |        	  	  			|--> Ext ?
-	  |
-	  |--> Ext -> LastError (Debug Only) ?
-
-*/
-
-#define __AM_CHECKSTATE_CHANGES // uncomment to enable dynamic acl
-#include <badesca.h>
-#include <fbs.h>
-#include <s32file.h> 
-#include "amadapter.h"
-#include <implementationproxy.h> // For TImplementationProxy definition
-#include <f32file.h>
-#include "nsmldmuri.h"
-#include "nsmldmiapmatcher.h"
-#include "debug.h"
-
-#include <centralrepository.h>
-#include "aminstalloptions.h"
-#include <featmgr.h>
-#include "amprivateCRKeys.h"
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-#include <dmtreenode.h>
-#include <devman.h>
-#include "nsmldmuri.h"
-
-// Constants
-_LIT8( KDeployedURI, "./SCM/Inventory/Deployed/" );
-_LIT8( KDeliveredURI, "./SCM/Inventory/Delivered/" );
-_LIT8( KDownloadURI, "./SCM/Download/" );
-#else
-#include <nsmldmuri.h>
-
-// Constants
-_LIT8( KDeployedURI, "SCM/Inventory/Deployed/" );
-_LIT8( KDeliveredURI, "SCM/Inventory/Delivered/" );
-_LIT8( KDownloadURI, "SCM/Download/" );
-#endif
-
-#ifdef __NSML_DEBUG__
-#pragma message("NSml Debugging is ON!")
-#else
-#endif
-
-
-using namespace NApplicationManagement;
-
-
-
-_LIT8( KAMStateValueActive, "Active" );
-_LIT8( KAMStateValueInactive, "Inactive" );
-
-
-_LIT8( KSisxMimeType, "x-epoc/x-sisx-app" );
-_LIT8( KSisMimeType, "application/vnd.symbian.install" );
-_LIT8( KPipMimeType, "application/x-pip" );
-_LIT8( KJadMIMEType, "text/vnd.sun.j2me.app-descriptor" );
-_LIT8( KJarMIMEType, "application/java-archive" );
-_LIT8( KJavaMIMEType, "application/java" );
-
-_LIT8( KInstallOptsMimeType, "text/xml" );
-
-
-
-const TUint8 KNSmlDMAMSeparatorDef = 0x2f; //forward slash
-#ifdef __AM_LASTERROR_NODE
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-_LIT8( KAMLastErrorURI, "./SCM/Ext/LastError" );
-#else
-_LIT8( KAMLastErrorURI, "SCM/Ext/LastError" );
-#endif
-_LIT8( KStdError, "Error %d" );
-
-#define MAPERROR(x,y,z) DefaultMapError(x,y,z)
-#else
-
-#define MAPERROR(x,y,z) DefaultMapError(x,y)
-#endif
-
-
-// ------------------------------------------------------------------------------------------------
-// CAmAdapter* CAmAdapter::NewL( )
-// ------------------------------------------------------------------------------------------------
-CAmAdapter* CAmAdapter::NewL( MSmlDmCallback* aDmCallback )
-	{
-	RDEBUG("CAmAdapter::NewL(): begin");
-
-	CAmAdapter* self = NewLC( aDmCallback );
-	CleanupStack::Pop();
-	return self;
-	}
-
-// ------------------------------------------------------------------------------------------------
-// CAmAdapter* CAmAdapter::NewLC( )
-// ------------------------------------------------------------------------------------------------
-CAmAdapter* CAmAdapter::NewLC( MSmlDmCallback* aDmCallback )
-	{
-	CAmAdapter* self = new( ELeave ) CAmAdapter( aDmCallback );
-	CleanupStack::PushL( self );
-	self->ConstructL();
-	return self;
-	}
-
-
-// ------------------------------------------------------------------------------------------------
-// CAmAdapter::CAmAdapter()
-// ------------------------------------------------------------------------------------------------
-CAmAdapter::CAmAdapter( TAny* aEcomArguments ) 
-	: CSmlDmAdapter( aEcomArguments ), iSessionOpened ( EFalse ), iBuffer( 8 ), 
-	iInAtomic( EFalse ), iUpdated( EFalse ), iIsStreamedContent( EFalse )
-	{
-	}
-
-
-// ------------------------------------------------------------------------------------------------
-// CAmAdapter::~CAmAdapter()
-// ------------------------------------------------------------------------------------------------
-CAmAdapter::~CAmAdapter()
-	{
-	RDEBUG( "CAmAdapter::~CAmAdapter" );
-	iDbSession.Close();
-	iManagement.Close(); // make sure we're closed
-	iSessionOpened = EFalse ;
-	iBuffer.Close();
-
-	CloseStreaming();  // Ensures that no streams are left open and that the temporary file is removed
-	
-	delete	iStreamedURI;
-	delete  iStreamedLuid;
-	delete	iStreamedType;
-	
-#ifdef __AM_LASTERROR_NODE
-	delete iLastError;
-#endif
-
-
-    if(iUriDel)
-    delete iUriDel;
-	RDEBUG( "CAmAdapter::~CAmAdapter end" );
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  CAmAdapter::DDFVersionL()
-// ------------------------------------------------------------------------------------------------
-void CAmAdapter::DDFVersionL( CBufBase& aDDFVersion )
-	{
-	aDDFVersion.InsertL( 0, KAMDDFVersion );
-	}
-
-
-// ------------------------------------------------------------------------------------------------
-//  CAmAdapter::DDFStructureL()
-//
-// ------------------------------------------------------------------------------------------------
-void CAmAdapter::DDFStructureL( MSmlDmDDFObject& aDDF )
-	{
-	RDEBUG( "CAmAdapter::DDFStructureL(): begin" );
-	
-	TSmlDmAccessTypes accessTypesGet;
-	accessTypesGet.SetGet();
-	
-	TSmlDmAccessTypes accessTypesExec;
-	accessTypesExec.SetExec();	
-
-	TSmlDmAccessTypes accessTypesExecReplace = accessTypesExec;
-	accessTypesExecReplace.SetReplace();
-	
-	TSmlDmAccessTypes accessTypesGetAdd = accessTypesGet;
-	accessTypesGetAdd.SetAdd();
-	
-	TSmlDmAccessTypes accessTypesGetReplace = accessTypesGet;
-	accessTypesGetReplace.SetGet();
-		
-	TSmlDmAccessTypes accessTypesGetAddReplace = accessTypesGetAdd;
-	accessTypesGetAddReplace.SetReplace();
-	
-	TSmlDmAccessTypes accessTypesGetAddReplaceDelete = accessTypesGetAddReplace;
-	accessTypesGetAddReplaceDelete.SetDelete();
-
-
-	
-	
-	/*
-	Node: ./SCM
-	AM node is the common parent to all application management functionality nodes. 
-	Support: Mandatory
-	Occurs: One
-	Format: Node
-	Access Types: Get
-	Values: N/A
-	*/
-	//MSmlDmDDFObject& root = aDDF.AddChildObjectGroupL();
-	MSmlDmDDFObject& am = aDDF.AddChildObjectL( KAMNodeName );
-	FillNodeInfoL( am, accessTypesGet, MSmlDmDDFObject::EOne, MSmlDmDDFObject::EPermanent,
-		MSmlDmDDFObject::ENode, KAMNodeDescription );
-	
-	/*
-	Node: ./SCM/Inventory
-	This node is start node to application inventory. 
-	Support: Mandatory
-	Occurs: One
-	Format: Node
-	Access Types: Get
-	Values: N/A
-	*/
-	MSmlDmDDFObject& inv = am.AddChildObjectL( KAMInventoryNodeName );
-	FillNodeInfoL( inv, accessTypesGet, MSmlDmDDFObject::EOne, MSmlDmDDFObject::EPermanent,
-		MSmlDmDDFObject::ENode, KAMInventoryNodeDescription );
-		
-	/*
-	Node: ./SCM/Inventory/Delivered
-	This is node under which applications that are delivered but not installed are found.
-	Support: Mandatory
-	Occurs: One
-	Format: Node
-	Access Types: Get, Add
-	Values: N/A
-	*/
-	MSmlDmDDFObject& del = inv.AddChildObjectL( KAMDeliveredNodeName );
-	FillNodeInfoL( del, accessTypesGetAdd, MSmlDmDDFObject::EOne, MSmlDmDDFObject::EPermanent,
-		MSmlDmDDFObject::ENode, KAMDeliveredNodeDescription );
-		
-		
-	/*
-	Node: ./SCM/Inventory/Deployed
-	This is a node under which active applications are found.
-	The child node descriptions are same as Delivered sibling node, except that <X> cannot be created, data node does not exist and there's no InstallOpts leaf.
-	Support: Mandatory
-	Occurs: One
-	Format: Node
-	Access Types: Get
-	Values: N/A
-	*/
-	
-	MSmlDmDDFObject& ac = inv.AddChildObjectL( KAMDeployedNodeName );
-	FillNodeInfoL( ac, accessTypesGet, MSmlDmDDFObject::EOne, MSmlDmDDFObject::EPermanent,
-		MSmlDmDDFObject::ENode, KAMDeployedNodeDescription );
-	
-	/*
-	Node: ./SCM/Inventory/Delivered/<X>
-	This dynamic node is placeholder applications that are in Delivered state. 
-	Support: Mandatory
-	Occurs: ZeroOrMore
-	Format: Node
-	Access Types: Get, Add, Replace, Delete
-	Values: N/A
-	*/
-	MSmlDmDDFObject& deldyna = del.AddChildObjectGroupL();
-	FillNodeInfoL( deldyna, accessTypesGetAddReplaceDelete, MSmlDmDDFObject::EZeroOrMore, 
-		MSmlDmDDFObject::EDynamic,
-		MSmlDmDDFObject::ENode, KAMDeliveredDynaNodeDescription );
-
-	/*
-	Node: ./SCM/Inventory/Delivered/<X>/ID
-	This leaf node holds an identifier for an application.
-	Support: Mandatory
-	Occurs: One
-	Format: Chr
-	Access Types: Get 
-	Values: N/A
-	*/
-	MSmlDmDDFObject& delid = deldyna.AddChildObjectL( KAMIDNodeName );
-	FillNodeInfoL( delid, accessTypesGet, MSmlDmDDFObject::EOne, MSmlDmDDFObject::EPermanent,
-		MSmlDmDDFObject::EChr, KAMIDNodeDescription );
-
-	/*
-	Node: ./SCM/Inventory/Delivered/<X>/Name
-	This leaf node holds name of an application. 
-	Support: Mandatory
-	Occurs: One
-	Format: Chr
-	Access Types: Get ( + Add, Replace access within Delivered node only)
-	Values: N/A
-	*/
-	MSmlDmDDFObject& delname = deldyna.AddChildObjectL( KAMNameNodeName );
-	FillNodeInfoL( delname, accessTypesGetAddReplace, MSmlDmDDFObject::EZeroOrOne, MSmlDmDDFObject::EPermanent,
-		MSmlDmDDFObject::EChr, KAMNameNodeDescription );
-
-	/*
-	Node: ./SCM/Inventory/Delivered/<X>/Version
-	This leaf node holds the version of an application. 
-	Support: Mandatory
-	Occurs: One
-	Format: Chr
-	Access Types: Get ( + Add, Replace access within Delivered node only)
-	Values: N/A
-	*/
-	MSmlDmDDFObject& delver = deldyna.AddChildObjectL( KAMVersionNodeName );
-	FillNodeInfoL( delver, accessTypesGetAddReplace, MSmlDmDDFObject::EZeroOrOne, MSmlDmDDFObject::EPermanent,
-		MSmlDmDDFObject::EChr, KAMVersionNodeDescription );
-
-
-	/*
-	Node: ./SCM/Inventory/Delivered/<X>/Data
-	This leaf node holds the data of an application. 
-	Support: Mandatory
-	Occurs: One
-	Format: Bin
-	Access Types: Add, Get, Replace
-	Values: N/A
-	*/
-	MSmlDmDDFObject& delda = deldyna.AddChildObjectL( KAMDataNodeName );
-	FillNodeInfoNoDefaultMimeL( delda, accessTypesGetAddReplace, MSmlDmDDFObject::EZeroOrOne, MSmlDmDDFObject::EPermanent,
-		MSmlDmDDFObject::EBin, KAMDataNodeDescription );
-		
-	delda.AddDFTypeMimeTypeL( KSisxMimeType );
-	delda.AddDFTypeMimeTypeL( KSisMimeType );
-	delda.AddDFTypeMimeTypeL( KPipMimeType );
-	
-	FeatureManager::InitializeLibL();
-	if( FeatureManager::FeatureSupported(KFeatureIdJavaMIDP20) )
-		{
-		delda.AddDFTypeMimeTypeL( KJadMIMEType );
-		delda.AddDFTypeMimeTypeL( KJarMIMEType );
-		delda.AddDFTypeMimeTypeL( KJavaMIMEType);
-		}
-	
-	FeatureManager::UnInitializeLib();
-	
-	
-
-	/*
-	Node: ./SCM/Inventory/Delivered/<X>/Descriptor
-	This leaf node holds the possible metadata of an application. Descriptor can be for example such a data that is required by the actual data in the Data leaf, but for some reason they cannot be bundled into same package. An example is Java JAR and JAD file combination, in which JAD file could be placed in MetaData and JAR in Data leaf.
-	Support: Optional
-	Occurs: One
-	Format: Bin
-	Access Types: Add, Get, Replace
-	Values: N/A
-	*/
-	MSmlDmDDFObject& delmd = deldyna.AddChildObjectL( KAMDescriptorNodeName );
-	FillNodeInfoL( delmd, accessTypesGetAddReplace, MSmlDmDDFObject::EZeroOrOne, MSmlDmDDFObject::EPermanent,
-		MSmlDmDDFObject::EBin, KAMDescriptorNodeDescription );
-
-	/*
-	Node: ./SCM/Inventory/Delivered/<X>/InstallOpts
-	This is a node that holds the installation options of an application.  
-
-	Support: Optional
-	Occurs: ZeroOrOne
-	Format: Xml
-	Access Types: Get, Replace
-	Values: N/A
-	*/
-	MSmlDmDDFObject& delio = deldyna.AddChildObjectL( KAMInstallOptsNodeName );
-	FillNodeInfoNoDefaultMimeL( delio, accessTypesGetAddReplace, MSmlDmDDFObject::EZeroOrOne, MSmlDmDDFObject::EPermanent,
-		MSmlDmDDFObject::EXml, KAMInstallOptsNodeDescription );
-	delio.AddDFTypeMimeTypeL( KInstallOptsMimeType );
-	
-	/*
-	Node: ./SCM/Inventory/Delivered/<X>/Operations
-		This is a node that allows vendors to extend functionality.
-	Support: Optional
-	Occurs: One
-	Format: Node
-	Access Types: Get, Replace, Add, Delete
-	Values: N/A
-	*/
-	MSmlDmDDFObject& delop = deldyna.AddChildObjectL( KAMOperationsNodeName );
-	FillNodeInfoL( delop, accessTypesGet, MSmlDmDDFObject::EOne, MSmlDmDDFObject::EPermanent,
-		MSmlDmDDFObject::ENode, KAMOperationsNodeDescription );
-		
-	/*
-	Node: ./SCM/Inventory/Delivered/<X>/Operations/Install
-		Exec command causes device to install a delivered application. The data inside 
-		exec command refers to the application to be installed. 
-	Support: Mandatory
-	Occurs: One
-	Format: Node
-	Access Types: Exec, Replace
-	Values: N/A
-	*/
-	MSmlDmDDFObject& loinst = delop.AddChildObjectL( KAMInstallNodeName );
-	FillNodeInfoL( loinst, accessTypesExecReplace, MSmlDmDDFObject::EOne, MSmlDmDDFObject::EPermanent,
-		MSmlDmDDFObject::ENode, KAMInstallNodeDescription );
-
-	/*
-	Node: ./SCM/Inventory/Delivered/<X>/Operations/InstallAndActivate
-		Exec command causes device to install a delivered application. The data inside 
-		exec command refers to the application to be installed. 
-	Support: Mandatory
-	Occurs: One
-	Format: Node
-	Access Types: Exec, Replace
-	Values: N/A
-	*/
-	MSmlDmDDFObject& loinstact = delop.AddChildObjectL( KAMInstallAndActivateNodeName );
-	FillNodeInfoL( loinstact, accessTypesExecReplace, MSmlDmDDFObject::EOne, MSmlDmDDFObject::EPermanent,
-		MSmlDmDDFObject::ENode, KAMInstallAndActivateNodeDescription );
-	
-	/*
-	Node: ./SCM/Inventory/Delivered/<X>/Operations/Update
-		Exec command causes device to update an application. The data inside exec command 
-		refers to the application to be updated. 
-		In practice the flow is so that:
-		1.	Admin puts a new data with same ID in inventory/delivered or inventory/download.
-		2.	Admin deactivates existing component with same ID. 
-		3.	Server executes update with item data targeting to the ID.
-		So actually update needs at least three "high level" commands; add data for update, 
-			deactivate old, do the update.
-
-	Support: Optional
-	Occurs: One
-	Format: Node
-	Access Types: Exec, Replace
-	Values: N/A
-
-	*/
-	MSmlDmDDFObject& loupd = delop.AddChildObjectL( KAMUpdateNodeName );
-	FillNodeInfoL( loupd, accessTypesExecReplace, MSmlDmDDFObject::EOne, MSmlDmDDFObject::EPermanent,
-		MSmlDmDDFObject::ENode, KAMUpdateNodeDescription );
-
-	/*
-	Node: ./SCM/Inventory/Delivered/<X>/Operations/UpdateAndActivate
-	Exec command causes device to update an application and activate it. The data inside exec command refers to the application to be updated. 
-	In practice the flow is so that:
-	1.	Admin puts a new data with same ID in inventory/delivered or inventory/download.
-	2.	Admin deactivates existing component with same ID. 
-	3.	Server executes update with item data targeting to the ID.
-	So actually update needs at least three "high level" commands; add data for update, deactivate old, do the update.
-
-	Support: Optional
-	Occurs: One
-	Format: Node
-	Access Types: Exec, Replace
-	Values: N/A
-	*/
-	MSmlDmDDFObject& loupda = delop.AddChildObjectL( KAMUpdateAndActivateNodeName );
-	FillNodeInfoL( loupda, accessTypesExecReplace, MSmlDmDDFObject::EOne, MSmlDmDDFObject::EPermanent,
-		MSmlDmDDFObject::ENode, KAMUpdateAndActivateNodeDescription );
-
-	/*
-	Node: ./SCM/Inventory/Delivered/<X>/Operations/Remove
-	Exec command causes device to remove an application. The data inside exec command refers to the application to be removed. The application must be in Inactive state in order for remove to be successful.
-	Support: Mandatory
-	Occurs: One
-	Format: Node
-	Access Types: Exec, Replace
-	Values: N/A
-	*/
-	MSmlDmDDFObject& lorem = delop.AddChildObjectL( KAMRemoveNodeName );
-	FillNodeInfoL( lorem, accessTypesExecReplace, MSmlDmDDFObject::EOne, MSmlDmDDFObject::EPermanent,
-		MSmlDmDDFObject::ENode, KAMRemoveNodeDescription );
-			
-				
-/*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
-	DEPLOYED
-*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*/
-
-
-	/*
-	Node: ./SCM/Inventory/Deployed/<X>
-		This dynamic node is placeholder applications that are in Inactive state. 
-	Support: Mandatory
-	Occurs: ZeroOrMore
-	Format: Node
-	Access Types: Get, Replace
-	Values: N/A
-	*/
-	MSmlDmDDFObject& depldyna = ac.AddChildObjectGroupL();
-	FillNodeInfoL( depldyna, accessTypesGetReplace, MSmlDmDDFObject::EZeroOrMore, MSmlDmDDFObject::EDynamic,
-		MSmlDmDDFObject::ENode, KAMDeployedDynaNodeDescription );
-
-	/*
-	Node: ./SCM/Inventory/Deployed/<X>/ID
-		This leaf node holds an identifier for an application. This cannot be changed.
-	Support: Mandatory
-	Occurs: One
-	Format: Chr
-	Access Types: Get
-	Values: N/A
-	*/
-	MSmlDmDDFObject& deplid = depldyna.AddChildObjectL( KAMIDNodeName );
-	FillNodeInfoL( deplid, accessTypesGet, MSmlDmDDFObject::EOne, MSmlDmDDFObject::EPermanent,
-		MSmlDmDDFObject::EChr, KAMIDNodeDescription );
-		
-	/*
-	Node: ./SCM/Inventory/Deployed/<X>/Name
-		This leaf node holds name of an application.
-	Support: Mandatory
-	Occurs: One
-	Format: Chr
-	Access Types: Get, Add, Replace
-	Values: N/A
-	*/
-	MSmlDmDDFObject& deplname = depldyna.AddChildObjectL( KAMNameNodeName );
-	FillNodeInfoL( deplname, accessTypesGetAddReplace, MSmlDmDDFObject::EZeroOrOne, MSmlDmDDFObject::EPermanent,
-		MSmlDmDDFObject::EChr, KAMNameNodeDescription );
-
-	/*
-	Node: ./SCM/Inventory/Deployed/<X>/Version
-		This leaf node holds the version of an application.
-	Support: Mandatory
-	Occurs: One
-	Format: Chr
-	Access Types: Get, Add, Replace
-	Values: N/A
-	*/
-	MSmlDmDDFObject& deplver = depldyna.AddChildObjectL( KAMVersionNodeName );
-	FillNodeInfoL( deplver, accessTypesGetAddReplace, MSmlDmDDFObject::EZeroOrOne, MSmlDmDDFObject::EPermanent,
-		MSmlDmDDFObject::EChr, KAMVersionNodeDescription );
-		
-	/*
-	Node: ./SCM/Inventory/Deployed/<X>/StateValue
-		This leaf node holds state value of an application. 
-	Support: ?
-	Occurs: One
-	Format: Chr
-	Access Types: Get 
-	Values: N/A
-	*/
-	MSmlDmDDFObject& deplstate = depldyna.AddChildObjectL( KAMStateValueNodeName );
-	FillNodeInfoL( deplstate, accessTypesGet, MSmlDmDDFObject::EOne, MSmlDmDDFObject::EPermanent,
-		MSmlDmDDFObject::EChr, KAMStateValueNodeDescription );
-
-
-
-	/*
-	Node: ./SCM/Inventory/Deployed/<X>/Operations
-		This is a node that allows vendors to extend functionality.
-	Support: Optional
-	Occurs: One
-	Format: Node
-	Access Types: Get, Replace, Add, Delete
-	Values: N/A
-
-	*/
-	MSmlDmDDFObject& deplop = depldyna.AddChildObjectL( KAMOperationsNodeName );
-	FillNodeInfoL( deplop, accessTypesGet, MSmlDmDDFObject::EOne, MSmlDmDDFObject::EPermanent,
-		MSmlDmDDFObject::ENode, KAMOperationsNodeDescription );
-		
-		
-
-	/*
-	Node: ./SCM/Inventory/Deployed/<X>/Operations/Remove
-		Exec command causes device to remove an application. The data inside exec command 
-		refers to the application to be removed. The application must be in Inactive state 
-		in order for remove to be successful.
-	Support: Mandatory
-	Occurs: One
-	Format: Node
-	Access Types: Exec, Replace
-	Values: N/A
-	*/
-	MSmlDmDDFObject& deplrem = deplop.AddChildObjectL( KAMRemoveNodeName );
-	FillNodeInfoL( deplrem, accessTypesExecReplace, MSmlDmDDFObject::EOne, MSmlDmDDFObject::EPermanent,
-		MSmlDmDDFObject::ENode, KAMRemoveNodeDescription );
-		
-	/*
-	Node: ./SCM/Inventory/Deployed/<X>/Operations/Activate
-		Exec command causes device to activate an application. 
-	Support: Mandatory
-	Occurs: One
-	Format: Node
-	Access Types: Exec, Replace
-	Values: N/A
-	*/
-	MSmlDmDDFObject& deplac = deplop.AddChildObjectL( KAMActivateNodeName );
-	FillNodeInfoL( deplac, accessTypesExecReplace, MSmlDmDDFObject::EOne, MSmlDmDDFObject::EPermanent,
-		MSmlDmDDFObject::ENode, KAMActivateNodeDescription );
-		
-	/*
-	Node: ./SCM/Inventory/Deployed/<X>/Operations/Deactivate
-		Exec command causes device to deactivate an application. 
-	Support: Mandatory
-	Occurs: One
-	Format: Node
-	Access Types: Exec, Replace
-	Values: N/A
-	*/
-	MSmlDmDDFObject& depldeac = deplop.AddChildObjectL( KAMDeActivateNodeName );
-	FillNodeInfoL( depldeac, accessTypesExecReplace, MSmlDmDDFObject::EOne, MSmlDmDDFObject::EPermanent,
-		MSmlDmDDFObject::ENode, KAMDeActivateNodeDescription );
-			
-/*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
-	DOWNLOAD
-*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*/
-
-	/*
-	Node: ./SCM/Download
-		This node is a root node for application download functionality. In practice download 
-		works so that admin adds nodes under this node, and they are automatically moved to 
-		Inventory/Delivered when the download has been finished. Running get command targeting 
-		to this node returns a list of pending downloads. 
-	Support: Mandatory 
-	Occurs: One
-	Format: Node
-	Access Types: Get, Add, Replace
-	Values: N/A
-	*/
-	MSmlDmDDFObject& dow = am.AddChildObjectL( KAMDownloadNodeName );
-	FillNodeInfoL( dow, accessTypesGetAddReplace, MSmlDmDDFObject::EOne, MSmlDmDDFObject::EPermanent,
-		MSmlDmDDFObject::ENode, KAMDownloadNodeDescription );
-
-
-	/*
-	Node: ./SCM/Download/<X>
-	This node is a placeholder for identifier of an application that is to be downloaded. 
-	Support: Mandatory 
-	Occurs: One
-	Format: Node
-	Access Types: Get, Add, Replace, Delete
-	Values: N/A
-	*/
-	MSmlDmDDFObject& dowdyna = dow.AddChildObjectGroupL();
-	FillNodeInfoL( dowdyna, accessTypesGetAddReplaceDelete, MSmlDmDDFObject::EZeroOrMore, MSmlDmDDFObject::EDynamic,
-		MSmlDmDDFObject::ENode, KAMDownloadDynaNodeDescription );
-
-
-		/*
-	Node: ./SCM/Download/<X>/ID
-	This leaf node holds an identifier for an application. 
-	Support: Mandatory
-	Occurs: One
-	Format: Chr
-	Access Types: Get
-	Values: N/A
-	*/
-	MSmlDmDDFObject& dowid = dowdyna.AddChildObjectL( KAMIDNodeName );
-	FillNodeInfoL( dowid, accessTypesGet, MSmlDmDDFObject::EOne, MSmlDmDDFObject::EPermanent,
-		MSmlDmDDFObject::EChr, KAMIDNodeDescription );
-		
-	/*
-	Node: ./SCM/Download/<X>/Name
-	This leaf node holds name of an application. 
-	Support: Mandatory
-	Occurs: One
-	Format: Chr
-	Access Types: Add, Get, Replace
-	Values: N/A
-	*/
-	MSmlDmDDFObject& downame = dowdyna.AddChildObjectL( KAMNameNodeName );
-	FillNodeInfoL( downame, accessTypesGetAddReplace, MSmlDmDDFObject::EZeroOrOne, MSmlDmDDFObject::EPermanent,
-		MSmlDmDDFObject::EChr, KAMNameNodeDescription );
-
-	/*
-	Node: ./SCM/Download/<X>/Version
-	This leaf node holds the version of an application. 
-	Support: Mandatory
-	Occurs: One
-	Format: Chr
-	Access Types: Add, Get, Replace
-	Values: N/A
-	*/
-	MSmlDmDDFObject& dowver = dowdyna.AddChildObjectL( KAMVersionNodeName );
-	FillNodeInfoL( dowver, accessTypesGetAddReplace, MSmlDmDDFObject::EZeroOrOne, MSmlDmDDFObject::EPermanent,
-		MSmlDmDDFObject::EChr, KAMVersionNodeDescription );
-
-	/*
-	Node: ./SCM/Download/<X>/URI
-	This leaf node holds the URL from which the application should be downloaded.
-	Support: Mandatory 
-	Occurs: One
-	Format: Chr
-	Access Types: Add, Get, Replace
-	Values: N/A
-	*/
-	MSmlDmDDFObject& dowuri = dowdyna.AddChildObjectL( KAMURINodeName );
-	FillNodeInfoL( dowuri, accessTypesGetAddReplace, MSmlDmDDFObject::EZeroOrOne, MSmlDmDDFObject::EPermanent,
-		MSmlDmDDFObject::EChr, KAMURINodeDescription );
-	
-	/*
-	Node: ./SCM/Download/<X>/Status
-	This leaf node holds the status of the download. The client updates the node value. The values are typically error codes of download protocol. Initially after the URI leaf is filled, this will get value 100, and will be replaced by one.
-	Support: Optional 
-	Occurs: One
-	Format: Chr
-	Access Types: Get
-	Values: N/A
-	*/
-	MSmlDmDDFObject& dowstat = dowdyna.AddChildObjectL( KAMStatusNodeName );
-	FillNodeInfoL( dowstat, accessTypesGet, MSmlDmDDFObject::EOne, MSmlDmDDFObject::EPermanent,
-		MSmlDmDDFObject::EChr, KAMStatusNodeDescription );
-
-	/*
-	Node: ./SCM/Download/<X>/InstallOpts
-	This is a node that holds the installation options of an application.  
-
-	Support: Optional
-	Occurs: ZeroOrOne
-	Format: Xml
-	Access Types: Add, Get, Replace
-	Values: N/A
-	*/
-	MSmlDmDDFObject& dowio = dowdyna.AddChildObjectL( KAMInstallOptsNodeName );
-	FillNodeInfoNoDefaultMimeL( dowio, accessTypesGetAddReplace, MSmlDmDDFObject::EZeroOrOne, MSmlDmDDFObject::EPermanent,
-		MSmlDmDDFObject::EXml, KAMInstallOptsNodeDescription );
-	dowio.AddDFTypeMimeTypeL( KInstallOptsMimeType );
-	
-	/*
-	Node: ./SCM/Download/<X>/ConRef
-	This is a node that holds the installation options of an application.  
-
-	Support: Optional
-	Occurs: ZeroOrOne
-	Format: Xml
-	Access Types: Add, Get, Replace
-	Values: N/A
-	*/
-	MSmlDmDDFObject& dowcr = dowdyna.AddChildObjectL( KAMConRefNodeName );
-	FillNodeInfoL( dowcr, accessTypesGetAddReplace, MSmlDmDDFObject::EZeroOrOne, MSmlDmDDFObject::EPermanent,
-		MSmlDmDDFObject::EChr, KAMConRefNodeDescription );
-					
-	/*
-	Node: ./SCM/Download/<X>/Operations
-	This is a node that holds the operation nodes.
-	Support: Optional
-	Occurs: One
-	Format: Node
-	Access Types: Get, Replace, Add, Delete
-	Values: N/A
-
-	*/
-	MSmlDmDDFObject& dowop = dowdyna.AddChildObjectL( KAMOperationsNodeName );
-	FillNodeInfoL( dowop, accessTypesGet, MSmlDmDDFObject::EOne, MSmlDmDDFObject::EPermanent,
-		MSmlDmDDFObject::ENode, KAMOperationsNodeDescription );
-
-	/*
-	Node: ./SCM/Download/<X>/Operations/Download
-	Exec command causes device to download an application. The dynamic node specifies the application to be downloaded. 
-	Support: Mandatory
-	Occurs: One
-	Format: Node
-	Access Types: Exec
-	Values: N/A
-	*/
-	MSmlDmDDFObject& dowdown = dowop.AddChildObjectL( KAMDownloadOperationNodeName );
-	FillNodeInfoL( dowdown, accessTypesExecReplace, MSmlDmDDFObject::EOne, MSmlDmDDFObject::EPermanent,
-		MSmlDmDDFObject::ENode, KAMDownloadOperationNodeDescription );
-					
-	/*
-	Node: ./SCM/Download/<X>/Operations/DownloadAndInstall
-	Exec command causes device to download and install an application. The dynamic node specifies the application to be downloaded. 
-	Support: Mandatory
-	Occurs: One
-	Format: Node
-	Access Types: Exec
-	Values: N/A
-	*/
-	MSmlDmDDFObject& dowdowni = dowop.AddChildObjectL( KAMDownloadAndInstallNodeName );
-	FillNodeInfoL( dowdowni, accessTypesExec, MSmlDmDDFObject::EOne, MSmlDmDDFObject::EPermanent,
-		MSmlDmDDFObject::ENode, KAMDownloadAndInstallOperationNodeDescription );
-		
-	/*
-	Node: ./SCM/Download/<X>/Operations/DownloadAndInstallAndActivate
-	Exec command causes device to download and install and activate an application. The dynamic node specifies the application to be downloaded. 
-	Support: Mandatory
-	Occurs: One
-	Format: Node
-	Access Types: Exec
-	Values: N/A
-	*/
-	MSmlDmDDFObject& dowdownia = dowop.AddChildObjectL( KAMDownloadAndInstallAndActivateNodeName );
-	FillNodeInfoL( dowdownia, accessTypesExec, MSmlDmDDFObject::EOne, MSmlDmDDFObject::EPermanent,
-		MSmlDmDDFObject::ENode, KAMDownloadAndInstallAndActivateNodeDescription );
-		
-	/*
-	Node: ./SCM/Download/<X>/Operations/DownloadAndUpdate
-	Exec command causes device to download and update an application. The dynamic node specifies the application to be downloaded. 
-	Support: Mandatory
-	Occurs: One
-	Format: Node
-	Access Types: Exec
-	Values: N/A
-	*/
-	MSmlDmDDFObject& dowdownu = dowop.AddChildObjectL( KAMDownloadAndUpdateNodeName );
-	FillNodeInfoL( dowdownu, accessTypesExec, MSmlDmDDFObject::EOne, MSmlDmDDFObject::EPermanent,
-		MSmlDmDDFObject::ENode, KAMDownloadAndUpdateNodeDescription );
-		
-	/*
-	Node: ./SCM/Download/<X>/Operations/DownloadAndUpdateAndActivate
-	Exec command causes device to download and install and activate an application. The dynamic node specifies the application to be downloaded. 
-	Support: Mandatory
-	Occurs: One
-	Format: Node
-	Access Types: Exec
-	Values: N/A
-	*/
-	MSmlDmDDFObject& dowdownua = dowop.AddChildObjectL( KAMDownloadAndUpdateAndActivateNodeName );
-	FillNodeInfoL( dowdownua, accessTypesExec, MSmlDmDDFObject::EOne, MSmlDmDDFObject::EPermanent,
-		MSmlDmDDFObject::ENode, KAMDownloadAndUpdateAndActivateNodeName );
-		
-		
-#ifdef __AM_LASTERROR_NODE
-	MSmlDmDDFObject& amext = am.AddChildObjectL( KAMExtNodeName );
-	FillNodeInfoL( amext, accessTypesGet, MSmlDmDDFObject::EOne, MSmlDmDDFObject::EPermanent,
-		MSmlDmDDFObject::ENode, KAMExtNodeDescription );
-		
-	MSmlDmDDFObject& amerr = amext.AddChildObjectL( KAMLastErrorNodeName );
-	FillNodeInfoL( amerr, accessTypesGet, MSmlDmDDFObject::EOne, MSmlDmDDFObject::EPermanent,
-		MSmlDmDDFObject::EChr, KAMLastErrorDescription );
-#endif
-	
-    if (GetAdapterValue() == KAMSCMAdapter)
-        {
-        CheckStateChangesL();
-        SetAdapterValue(KAMDefaultValue);
-        }
-	RDEBUG( "CAmAdapter::DDFStructureL(): end" );	
-	}
-
-// ------------------------------------------------------------------------------------------------
-// CAmAdapter::SessionL()
-// ------------------------------------------------------------------------------------------------
-RApplicationManagement &CAmAdapter::SessionL()
-	{
-	if ( !iSessionOpened )
-		{
-		TCertInfo info ;
-		
-		const TUid KCentralRepositoryUid = 
-			{
-			0x10207843
-			};
-		const TInt KCertKey = 0x01;
-		CRepository *re = NULL;
-		TRAPD( errx, re = CRepository::NewL ( KCentralRepositoryUid ) );
-		if (errx == KErrNone && re)
-			{
-			TPckg<TCertInfo> pcert( info );
-			errx = re->Get( KCertKey, pcert ) ;
-				
-			RDEBUG_2("aCertInfo.iFingerprint.Length() is  %u",info.iFingerprint.Length() );
-			if ( errx == KErrNone )
-				{
-				RDEBUG("CAmAdapter::SessionL() errx == KErrNone");
-				}
-			else
-				{
-				if ( errx != KErrNotFound )
-					{
-					RDEBUG("CAmAdapter::SessionL() errx != KErrNotFound");
-					}
-				else
-					{
-					RDEBUG("CAmAdapter::SessionL() errx == KErrNotFound");
-					}
-				
-				}	
-			delete re ;
-			}
-					
-		if ( errx == KErrNotFound || !iCertRequired)
-			{
-			RDEBUG("CAmAdapter::SessionL() calling iManagement.Connect()");
-			User::LeaveIfError( iManagement.Connect() );
-			iSessionOpened = ETrue;
-			iTrustAdded = EFalse;
-			}
-		else
-			{
-			RDEBUG("CAmAdapter::SessionL() calling iManagement.Connect( info )");
-			User::LeaveIfError( iManagement.Connect( info ) );
-			iSessionOpened = ETrue;
-			iTrustAdded = ETrue;
-			}
-		}
-	return iManagement;		
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  CAmAdapter::UpdateLeafObjectL()
-// ------------------------------------------------------------------------------------------------
-void CAmAdapter::UpdateLeafObjectL( 
-	const TDesC8& aURI, 
-	const TDesC8& aLUID, 
-	const TDesC8& aObject, 
-	const TDesC8& aType, 
-	TInt aStatusRef )
-	{
-	RDEBUG8_4("CAmAdapter::UpdateLeafObjectL(): begin, '%S', '%S' '%S'", &aURI, &aLUID, &aType );
-
-	MSmlDmAdapter::TError status = EOk;
-	SetAdapterValue(KAMSCMAdapter);
-	_UpdateLeafObjectL( aURI, aLUID, aObject, aType, aStatusRef, status);
-
-	SetStatusL( aStatusRef, status );
-	if ( status == EOk )
-		{
-		if ( iInAtomic )
-			{
-			iBuffer.Append( TAMCommandBufferElement( aStatusRef, aURI ) );
-			}
-		}
-	RDEBUG_2("CAmAdapter::UpdateLeafObjectL(): end (%d)", status);
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  CAmAdapter::UpdateLeafObjectL()
-// ------------------------------------------------------------------------------------------------
-void CAmAdapter::_UpdateLeafObjectL( 
-	const TDesC8& aURI, 
-	const TDesC8& aLUID, 
-	const TDesC8& aObject, 
-	const TDesC8& aType, 
-	TInt /*aStatusRef*/,
-	MSmlDmAdapter::TError& aStatus )
-	{
-	RDEBUG("CAmAdapter::_UpdateLeafObjectL(): begin");
-
-	CheckStateChangesL();
-
-	TError status( EError );
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-	TPtrC8 uriPtrc = NSmlDmURI::RemoveDotSlash( aURI );
-	TInt numSeqs( NSmlDmURI::NumOfURISegs( uriPtrc ) );
-	TPtrC8 mapping( NSmlDmURI::LastURISeg( uriPtrc ) );
-	TPtrC8 parent( NSmlDmURI::RemoveLastSeg( uriPtrc ) );
-#else
-	TInt numSeqs( NSmlDmURI::NumOfURISegs( aURI ) );
-	TPtrC8 mapping( NSmlDmURI::LastURISeg( aURI ) );
-	TPtrC8 parent( NSmlDmURI::RemoveLastSeg( aURI ) );
-#endif
-
-	if (mapping == KAMNameNodeName)
-	{
-		if (aObject.Size() > KDeploymentComponentNameMaxLength)
-		{
-			aStatus = ETooLargeObject;
-			return ;
-		}
-	}
-	else if (mapping == KAMVersionNodeName)
-	{
-		if (aObject.Size() > KDeploymentComponentVersionMaxLength)
-		{
-			aStatus = ETooLargeObject;
-			return ;
-		}
-	}
-	else if(mapping == KAMConRefNodeName)
-	{
-		if (aObject.Size() > KMaxConRef)
-		{
-			aStatus = ETooLargeObject;
-			return ;
-		}
-	}
-
-	TPtrC8 grandParent( NSmlDmURI::RemoveLastSeg( parent ) );
-	TPtrC8 grandParentMapping( NSmlDmURI::LastURISeg( grandParent ) );		
-	RApplicationManagement &session = SessionL();
-	TDeploymentComponentState state( EDCSNone ) ;	
-	if ( numSeqs == 4 || numSeqs == 5 )
-		{
-		if ( numSeqs == 4 )
-			{
-			state = EDCSDownload;
-			}
-		else 
-			{
-			if ( grandParentMapping == KAMDeliveredNodeName )
-				{
-				state = EDCSDelivered;
-				}
-			else if ( grandParentMapping == KAMDeployedNodeName )
-				{
-				state = EDCSActive;
-				}
-			else
-				{
-				RDEBUG8_3( "CAmAdapter::UpdateLeafObjectL(): ILLEGAL LEVEL %d NODE %S", numSeqs, &aURI );
-				User::Leave( KErrArgument );
-				}
-			}
-		}
-	else
-		{
-		RDEBUG8_3("CAmAdapter::UpdateLeafObjectL(): ILLEGAL LEVEL %d NODE %S", numSeqs, &aURI );
-		}
-	if ( state == EDCSDelivered || state == EDCSDownload ||state == EDCSActive ||state == EDCSInactive )
-		{
-		if ( aLUID != KNullDesC8 )
-			{
-			TInt iluid ( DesToIntL( aLUID ) );
-		    TDeploymentComponent comp ;
-		    TInt err( session.DeploymentComponent( iluid, comp ) );
-		    if ( err == KErrNone )
-		    	{
-	    		TDeplCompAttrType fl( UpdateFlagFromMapping( mapping ) );
-
-		    	if ( mapping == KAMDataNodeName || mapping == KAMDescriptorNodeName )
-		    		{
-		    		TInt erx(KErrNone);
-		    		
-					if ( iIsStreamedContent )
-						{
-						CloseStreaming();
-			    		TRAP( erx, session.UpdateDeploymentComponentStreamedDataL( iluid, fl, aType ) );
-						}
-					else
-						{
-						// 
-			    		TRAP( erx, session.UpdateDeploymentComponentDataL( iluid, fl, aObject, aType ) );
-						}
-		    		MAPERROR( erx, status, _L8("Update Delivered Data or metadata %d") );
-		    		}
-		    	else
-		    		{
-		    		if ( fl != EDCNone )
-		    			{
-		    			TPtrC8 obj;
-		    			TAMInstallOptions opts;
-		    			TAMInstallOptionsPckg optsb( opts );
-		    			TPckgBuf<TInt> iap;
-		    			if ( fl == EDCInstallOptions )
-		    				{
-		    				InstallOptionsParser::ParseOptionsL( aObject, opts );
-		    				if ( opts.iIAP == -1 && opts.iConRef != KNullDesC8() )
-		    					{
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-							
-			    				//CNSmlDMIAPMatcher* iapfinder = CNSmlDMIAPMatcher::NewLC( &Callback() );
-			    				//opts.iIAP = iapfinder->IAPIdFromURIL( opts.iConRef );
-			    				//CleanupStack::PopAndDestroy( iapfinder );
-					            CArrayFix<TSmlDmMappingInfo>* mapArray = new CArrayFixFlat<TSmlDmMappingInfo>(4);
-					            CleanupStack::PushL(mapArray);
-					        
-						        Callback().GetMappingInfoListL( KNSmlDMMMSSlashIAPUri,*mapArray );
-
-								TInt iap = KErrNotFound; 
-						        TSmlDmMappingInfo mapInfo;
-					        
-						        for(TInt i = 0;i<mapArray->Count();i++)
-							        {
-							        if(LastURISeg(opts.iConRef)==mapArray->At(i).iURISeg)
-								        {
-								        iap=DesToInt(mapArray->At(i).iURISegLUID);
-						                break;
-								        }
-							        }
-							    opts.iIAP = iap;   
-						        mapArray->Reset();
-						        CleanupStack::PopAndDestroy(); //mapArray
-					    				
-#else
-							CNSmlDMIAPMatcher* iapfinder = CNSmlDMIAPMatcher::NewLC( &Callback() );
-			    				opts.iIAP = iapfinder->IAPIdFromURIL( opts.iConRef );
-			    				CleanupStack::PopAndDestroy( iapfinder );
-#endif			    				
-			    				}
-		    				obj.Set( optsb );
-		    				}
-		    			else if ( fl == EDCConRef )
-		    				{
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-						
-		    				//CNSmlDMIAPMatcher* iapfinder = CNSmlDMIAPMatcher::NewLC( &Callback() );
-			    			//TInt i( iapfinder->IAPIdFromURIL( aObject ) );
-			    			//CleanupStack::PopAndDestroy( iapfinder );
-			    			//iap() = i;
-				            CArrayFix<TSmlDmMappingInfo>* mapArray = new CArrayFixFlat<TSmlDmMappingInfo>(4);
-				            CleanupStack::PushL(mapArray);
-				        
-					        Callback().GetMappingInfoListL( KNSmlDMMMSSlashIAPUri,*mapArray );
-
-							TInt iapValue = KErrNotFound; 
-					        TSmlDmMappingInfo mapInfo;
-				        
-					        for(TInt i = 0;i<mapArray->Count();i++)
-						        {
-						        if(LastURISeg(opts.iConRef)==mapArray->At(i).iURISeg)
-							        {
-							        iapValue=DesToInt(mapArray->At(i).iURISegLUID);
-					                break;
-							        }
-						        }
-						    iap() = iapValue;   
-					        mapArray->Reset();
-					        CleanupStack::PopAndDestroy(); //mapArray
-			    			
-#else
-						CNSmlDMIAPMatcher* iapfinder = CNSmlDMIAPMatcher::NewLC( &Callback() );
-			    			TInt i( iapfinder->IAPIdFromURIL( aObject ) );
-			    			CleanupStack::PopAndDestroy( iapfinder );
-			    			iap() = i;
-#endif
-			    			obj.Set( iap );
-		    				}
-		    			else
-		    				{
-		    				obj.Set( aObject );
-		    				}
-		    			TRAPD( erx, session.UpdateDeploymentComponentL( iluid, fl, obj ) );
-			    		MAPERROR( erx, status, _L8("Update some attribute %d") );
-		    			}
-		    		else
-		    			{
-		    			status = ENotFound;
-		    			RDEBUG( "CAmAdapter::UpdateLeafObjectL(): Unknown Target leaf" );
-		    			}
-		    		}
-		    	}
-			else
-				{
-				RDEBUG_3( "CAmAdapter::UpdateLeafObjectL(): FAILED TO GET COMPONENT OF ID %d: %d" , iluid, err );
-				status = ENotFound;
-				}
-			}
-		else
-			{
-			RDEBUG8_2( "CAmAdapter::UpdateLeafObjectL(): Faild to get luid allocation and find buffered for '%S'", &parent );	
-			status = ENotFound;
-			}
-		}
-	else
-		{
-		RDEBUG8_2( "CAmAdapter::UpdateLeafObjectL(): WARNING Tried to update illegal state leaf! '%S'", &grandParentMapping );
-		}
-
-	aStatus = status;
-
-	RDEBUG("CAmAdapter::_UpdateLeafObjectL(): end");
-	}
-	
-// ------------------------------------------------------------------------------------------------
-// CAmAdapter::UpdateLeafObjectL
-// ------------------------------------------------------------------------------------------------
-void CAmAdapter::UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID,
-									RWriteStream*& aStream, const TDesC8& aType,
-		 							TInt aStatusRef )
-{
-	RDEBUG8_4("CAmAdapter::UpdateLeafObjectL() aStream: begin, '%S', '%S' '%S'", &aURI, &aLUID, &aType );
-
-	TError status( CSmlDmAdapter::EOk );
-
-	if(iStreamedURI)
-	{
-		delete iStreamedURI;
-		iStreamedURI = NULL;		
-	}
-	iStreamedURI = aURI.AllocL();
-
-	if(iStreamedLuid)
-	{
-		delete iStreamedLuid;
-		iStreamedLuid = NULL;
-	}
-	iStreamedLuid = aLUID.AllocL();
-
-	if(iStreamedType)
-	{
-		delete iStreamedType;
-		iStreamedType = NULL;		
-	}
-	iStreamedType = aType.AllocL();
-
-	if(!iStreamOpen)
-		{
-		RApplicationManagement &session = SessionL();
-		TDeplCompAttrType attrType;
-		TPtrC8 mapping( NSmlDmURI::LastURISeg( aURI ) );
-		TDeplCompAttrType fl( UpdateFlagFromMapping( mapping ) );
-		if ( mapping == KAMDataNodeName )
-		{
-			attrType = EDCData;
-		}
-		else if( mapping == KAMDescriptorNodeName )
-		{
-			attrType = EDCMetaData;
-		}
-		else
-		{
-			RDEBUG8_2("CAmAdapter::UpdateLeafObjectL(): Unknown mapping: (%S)", &mapping);
-			status = CSmlDmAdapter::EError;
-		}
-		
-		if( status == CSmlDmAdapter::EOk )
-			{
-			TInt iluid ( DesToIntL( aLUID ) );
-			session.DeploymentComponentTempInstFileL( iluid, iStreamFile, attrType );
-			iStream.Attach( iStreamFile );
-			aStream = &iStream;
-			iStreamOpen = ETrue;
-			iIsStreamedContent = ETrue;
-			}
-		}
-	if ( !iInAtomic )
-		{
-        iStatusRef = aStatusRef;		
-		Callback().SetStatusL( aStatusRef, status );		
-		}
-	else
-		{
-		iBuffer.Append( TAMCommandBufferElement( aStatusRef, aURI ) );
-		}	
-
-	RDEBUG("CAmAdapter::UpdateLeafObjectL() aStream : end");
-}		 						
-	
-// ------------------------------------------------------------------------------------------------
-// CAmAdapter::UpdateFlagFromMapping( const TDesC8& aMapping )
-// ------------------------------------------------------------------------------------------------
-TDeplCompAttrType CAmAdapter::UpdateFlagFromMapping( const TDesC8& aMapping )
-	{
-
-	TDeplCompAttrType res ;
-	if ( aMapping == KAMIDNodeName )
-		{
-		res = EDCId;
-		}
-	else if ( aMapping == KAMNameNodeName )
-		{
-		res = EDCName;
-		}
-	else if ( aMapping == KAMVersionNodeName )
-		{
-		res = EDCVersion;
-		}
-	else if ( aMapping == KAMStateValueNodeName )
-		{
-		res = EDCStateValue;
-		}
-	else if ( aMapping == KAMInstallOptsNodeName )
-		{
-		res = EDCInstallOptions;
-		}
-	else if ( aMapping == KAMDescriptorNodeName )
-		{
-		res = EDCMetaData;
-		}
-	else if ( aMapping == KAMDataNodeName )
-		{
-		res = EDCData;
-		}
-	else if( aMapping == KAMURINodeName )
-		{
-		res = EDCDownloadURI;
-		}
-	else if ( aMapping == KAMStatusNodeName )
-		{
-		res = EDCStatus;
-		}
-	else if ( aMapping == KAMConRefNodeName )
-		{
-		res = EDCConRef;
-		}
-	else
-		{
-		//User::Leave( KErrArgument );
-		res = EDCNone;
-		}
-	return res;
-	}
-	
-// ------------------------------------------------------------------------------------------------
-// CAmAdapter::GetLuidForUserIdL( const TDesC8 &aUserId, 
-//		const TDeploymentComponentState aState )
-// ------------------------------------------------------------------------------------------------	
-TUint32 CAmAdapter::GetLuidForUserIdL( const TDesC8 &aUserId, const TDeploymentComponentState aState )
-	{
-	TUint32 ret( 0 );
-	if ( aState != EDCSNone )
-		{
-		RElementIdArray array;
-		TInt err( SessionL().DeploymentComponentIdsL( array, aState ) );
-		if ( err == KErrNone )
-			{
-			CleanupClosePushL( array );
-			TInt count( array.Count() );
-			for( TInt i( 0 ); i < count && ret == 0; i++ )
-				{
-				TUint32 el = array[i];
-				TDCUserId dc;
-				SessionL().DeploymentComponentUserIdL( el, dc );
-				if ( dc == aUserId )
-					{
-					ret = el;
-					}
-				}
-			CleanupStack::PopAndDestroy( &array );
-			}
-		else
-			{
-			}
-		}
-	return ret;	
-	}
-	
-// ------------------------------------------------------------------------------------------------
-// CAmAdapter::GetLuid2L( const TDesC8 &aDMLuid, const TDesC8 &aUserId, 
-//		const TDeploymentComponentState aState, TError &aStatus )
-// ------------------------------------------------------------------------------------------------	
-TUint32 CAmAdapter::GetLuid2L( const TDesC8 &aDMLuid, const TDesC8 &aUserId, 
-	const TDeploymentComponentState aState, TError &aStatus )
-	{
-	TUint32 ret( GetLuidL(aDMLuid, aUserId, aState ) );
-	if ( (TInt32)ret <= 0 )
-		{
-		aStatus = ENotFound;
-		}
-	return ret;	
-	}
-	
-// ------------------------------------------------------------------------------------------------
-// CAmAdapter::GetLuidL( const TDesC8 &aDMLuid, const TDesC8 &aUserId, 
-//		const TDeploymentComponentState aState )
-// ------------------------------------------------------------------------------------------------	
-TUint32 CAmAdapter::GetLuidL( const TDesC8 &aDMLuid, const TDesC8 &aUserId, 
-	const TDeploymentComponentState aState )
-	{
-	TUint32 ret( 0 );
-	if ( aDMLuid == KNullDesC8 )
-		{
-		ret = GetLuidForUserIdL( aUserId, aState );
-		}
-	else
-		{
-		ret = DesToIntL( aDMLuid ) ;
-		}
-	
-	return ret;	
-	}
-	
-// ------------------------------------------------------------------------------------------------
-// CAmAdapter::DeleteObjectL( const TDesC8& aURI, const TDesC8& aLUID )
-// ------------------------------------------------------------------------------------------------
-void CAmAdapter::DeleteObjectL( const TDesC8& aURI, const TDesC8& aLUID, const TInt aStatusRef )
-	{
-
-	RDEBUG8_4("CAmAdapter::DeleteObjectL(): begin (%S, %S, %d)" , &aURI, &aLUID, aStatusRef );
-	SetAdapterValue(KAMSCMAdapter);
-	CheckStateChangesL();
-	
-	TError ret( EError );
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY	
-	TPtrC8 uriPtrc = NSmlDmURI::RemoveDotSlash(aURI);	
-	TInt cnt( NSmlDmURI::NumOfURISegs( uriPtrc ) );
-	TPtrC8 mapping( NSmlDmURI::LastURISeg( uriPtrc ) );
-#else
-	TInt cnt( NSmlDmURI::NumOfURISegs( aURI ) );
-	TPtrC8 mapping( NSmlDmURI::LastURISeg( aURI ) );
-#endif
-	
-	switch ( cnt )
-		{
-		case 3:
-		case 4:
-			{
-			
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-			TPtrC8 which( NSmlDmURI::URISeg( uriPtrc, cnt == 4 ? 3 : 2 ) );
-#else
-			TPtrC8 which( NSmlDmURI::URISeg( aURI, cnt == 4 ? 3 : 2 ) );
-#endif
-			if ( which == KAMDeliveredNodeName || which == KAMDownloadNodeName )
-				{
-				TUint32 luid( GetLuidL( aLUID, mapping, (which == KAMDeliveredNodeName ? EDCSDelivered : EDCSDownload) ) );
-				if ( luid > 0 )
-					{
-					TRAPD( err, SessionL().RemoveL( luid ) );
-					if ( err == KErrNone || err == KErrNotFound )
-						{
-						ret = EOk;
-						Callback().SetMappingL( aURI, KNullDesC8 );
-						if ( err == KErrNone && iInAtomic )
-			    			{
-			    			iBuffer.Append( TAMCommandBufferElement( aStatusRef, aURI ) );
-			    			}
-						}
-					else
-						{
-						MAPERROR( err, ret, _L8("Delete %d") );	
-						}
-					}
-				else
-					{
-					RDEBUG( "CAmAdapter::DeleteObjectL(): WARNING Object not found" );	
-					ret = ENotFound;
-					}
-				}
-			else
-				{
-				RDEBUG8_2( "CAmAdapter::DeleteObjectL(): ERROR Removing node %S is not supported", &aURI );	
-				}
-			break;
-			}
-		default:
-			{
-			RDEBUG8_3( "CAmAdapter::DeleteObjectL(): ILLEGAL LEVEL %d NODE %S", cnt, &aURI );
-			break;
-			}
-		}
-	SetStatusL( aStatusRef, ret );
-	RDEBUG( "CAmAdapter::DeleteObjectL(): end" );
-	}
-
-
-// ------------------------------------------------------------------------------------------------
-// CAmAdapter::DeactivateIfInactive( const TUint aLuidi, const TDeploymentComponentState aTargetState )
-// ------------------------------------------------------------------------------------------------
-void CAmAdapter::DeactivateIfInactive( const TUint aLuidi, const TDeploymentComponentState aTargetState )
-	{
-	if ( aTargetState == EDCSInactive )
-		{
-		RDEBUG( "CAmAdapter::DeactivateIfInactive():  deactivating!" );
-		TRAPD( derr, iManagement.DeactivateL( aLuidi ) );
-		if ( derr != KErrNone )
-			{
-			RDEBUG_2("CAmAdapter::DeactivateIfInactive(): ERROR deactivating failed %d", derr );
-			}
-		}
-	}
-
-void CAmAdapter::InstallL( 
-	TUint aLuidi, 
-	const TDesC8& aURI, 
-	const TDesC8& aLUID, 
-	const TDeploymentComponentState aTargetState,
-	TError &aRet
-	 ) 
-	{
-
-
-	#ifdef __TARM_SYMBIAN_CONVERGENCY	
-		TPtrC8 uriPtrc = NSmlDmURI::RemoveDotSlash(aURI);	
-	#else
-		//nothing
-	#endif
-
-	TRAPD( err, SessionL().InstallL( aLuidi, aTargetState ) );
-	if ( err == KErrNone )
-		{
-		// Dont Update the mappings in client to reflect new
-		//		position in the management tree ( Inactive or Active..)
-		RDEBUG( "CAmAdapter::InstallL(): Install success!" );
-		
-		//TPtrC8 aclmapping( URISegsUpTo( aURI, 4) );
-		//SetMappingL( aclmapping, aTargetState, aLUID);
-		//iManagement.StateChangeComplete( aLuidi );			
-						
-		
-		
-		DeactivateIfInactive( aLuidi, aTargetState );
-		aRet = EOk;
-		}
-	else
-		{
-		RDEBUG_2( "CAmAdapter::InstallL(): INSTALL FAILED '%d'" , err);	
-		MAPERROR( err, aRet, _L8("Install %d") );
-		}
-	}
-	
-	
-// ------------------------------------------------------------------------------------------------
-// CAmAdapter::DefaultMapError( const TInt aErr, TError &aRet )
-// ------------------------------------------------------------------------------------------------
-void CAmAdapter::DefaultMapError( const TInt aErr, TError &aRet, const TDesC8& 
-	#ifdef __AM_LASTERROR_NODE
-	aDes 
-	#endif
-	)
-	{
-	if ( aErr == KErrNone )
-		{
-		aRet = EOk;
-		}
-	else if ( aErr == KErrNotFound )
-		{
-		aRet = ENotFound;
-		}
-	else if ( aErr == KErrArgument )
-		{
-		aRet = EInvalidObject ;
-		}
-	else if( aErr == KErrAlreadyExists )
-		{
-		aRet = EAlreadyExists;
-		}
-	else
-		{
-		aRet = EError;
-		}
-	#ifdef __AM_LASTERROR_NODE
-	TInt err = KErrNone;
-	TRAP( err, SetErrorL( aDes, aErr ) );
-	#endif
-	}
-
-#ifdef __AM_LASTERROR_NODE	
-void CAmAdapter::SetErrorL( const TDesC8& aDes, const TInt aErr )
-	{
-	if ( aDes != KNullDesC8 )
-		{
-		SetLastErrorL( aDes, aErr );
-		}
-	else
-		{
-		SetLastErrorL(KStdError, aErr);
-		}
-	}
-#endif	
-	
-	
-// ------------------------------------------------------------------------------------------------
-// CAmAdapter::ExecuteCommandL( const TDesC8& aURI, const TDesC8& aLUID, const TDesC8& aArgument, 
-//	const TDesC8& aType, 
-//	TInt aStatusRef )
-// ------------------------------------------------------------------------------------------------
-TDownloadTarget CAmAdapter::DownloadTargetL( const TDesC8& aCommand )
-	{
-	if ( aCommand == KAMDownloadOperationNodeName )
-		{
-		return EDeliver;
-		}
-	else if ( aCommand == KAMDownloadAndInstallNodeName )
-		{
-		return EInstall;
-		}
-	else if ( aCommand == KAMDownloadAndInstallAndActivateNodeName )
-		{
-		return EInstallAndActivate;
-		}
-	else if ( aCommand == KAMDownloadAndUpdateNodeName )
-		{
-		return EUpdate;
-		}
-	else if ( aCommand == KAMDownloadAndUpdateAndActivateNodeName )
-		{
-		return EUpdateAndActivate;
-		}
-
-	RDEBUG8_2( "CAmAdapter::DownloadTargetL(): ASKED OPERATION NOT SUPPORTED Download '%S'", &aCommand );
-	User::Leave( KErrArgument );
-	// NOTE! will not ever come here! Only to get rid of compiler warning !!
-	return EDeliver;
-	}
-	
-// ------------------------------------------------------------------------------------------------
-// CAmAdapter::ExecuteCommandL( const TDesC8& aURI, const TDesC8& aLUID, const TDesC8& aArgument, 
-//	const TDesC8& aType, 
-//	TInt aStatusRef )
-// ------------------------------------------------------------------------------------------------
-void CAmAdapter::ExecuteCommandL( const TDesC8& aURI, 
-	const TDesC8& aLUID, 
-	const TDesC8& /*aArgument*/, 
-	const TDesC8& /*aType*/, 
-	TInt aStatusRef ) 
-	{
-
-
-	#ifdef __TARM_SYMBIAN_CONVERGENCY	
-		TPtrC8 uriPtrc = NSmlDmURI::RemoveDotSlash(aURI);	
-	#else
-		//nothing
-	#endif
-
-	RDEBUG8_3("CAmAdapter::ExecuteCommandL(): begin, '%S', '%S'", &aURI, &aLUID );
-	SetAdapterValue(KAMSCMAdapter);
-	CheckStateChangesL();
-	TError ret( EError );
-	
-	if( aLUID == KNullDesC8 )
-		{
-		RDEBUG("CAmAdapter::ExecuteCommandL(): WARNING no valid luid provided" );
-		}
-	
-	#ifdef __TARM_SYMBIAN_CONVERGENCY	
-		TInt cnt( NSmlDmURI::NumOfURISegs( uriPtrc ) );
-	#else
-		TInt cnt( NSmlDmURI::NumOfURISegs( aURI ) );
-	#endif	
-	
-	TPtrC8 mapping( NSmlDmURI::LastURISeg( aURI ) );
-	
-	const TInt KDownloadMappingURILoc = 3;
-	switch ( cnt )
-		{
-		case 5:
-			{
-			TUint32 iluid( GetLuidL( aLUID, NSmlDmURI::URISeg(aURI, KDownloadMappingURILoc), EDCSDownload  ) ) ;	
-			
-			// Track the Newly added delivered  node to make sure that this reference
-			// of delivered node is removed from Tree DB.
-			// This delivered node is removed only if Execute command is successful
-			// by either adding Install, Install& activate etc.
-			// This Fix would be applicable in case of DM 1.2. 
-				
-
-
-			TPtrC8 urival(URISegsUpTo(aURI, KDownloadMappingURILoc));
-			
-			if(iUriDel)
-			{
-				delete iUriDel;
-				iUriDel = NULL;
-			}
-	
-			
-			
-			iUriDel = urival.AllocL();
-			
-			RDEBUG_2("CAmAdapter::ExecuteCommandL(): luid is %d", iluid );
-			if ( iluid > 0 )
-				{
-				TDownloadTarget target = DownloadTargetL( mapping );
-		
-				TRAPD( errx, SessionL().StartDownloadL( iluid, target ) );
-			
-		
-				/*if(target == EInstall || target == EInstallAndActivate || target == EUpdate || target == EUpdateAndActivate)
-				{
-				TInt err( iDbSession.RemoveMappingInfoL( KAMAdapterImplUid, *iUriDel, ETrue ) );
-				}*/
-				if ( errx == KErrNone )
-					{
-					RDEBUG( "CAmAdapter::ExecuteCommandL(): StartDownloadL Successful " );	
-					ret = EOk;
-					}
-				else
-					{
-					RDEBUG_2( "CAmAdapter::ExecuteCommandL(): StartDownloadL FAILED '%d'", errx );	
-					if ( errx == KErrNotFound )
-						{
-						ret = ENotFound;
-						}
-					else if ( errx == KErrArgument )
-						{
-						ret = EInvalidObject ;
-						}
-					else
-						{
-						ret = EError;
-						}
-					}
-		
-				}
-			else
-				{
-				ret = ENotFound;
-				RDEBUG( "CAmAdapter::ExecuteCommandL(): case 5 Not found node" );
-				}
-			break;
-			}
-		case 6:
-			{
-			const TInt KInventoryMappingURILoc = 4 ;
-			
-	
-			// Track the Newly added delivered  node to make sure that this reference
-			// of delivered node is removed from Tree DB.
-			// This delivered node is removed only if Execute command is successful
-			// by either adding Install, Install& activate etc.
-			// This Fix would be applicable in case of DM 1.2. 
-
-
-			TPtrC8 urival(URISegsUpTo(aURI, KInventoryMappingURILoc));
-			
-			if(iUriDel)
-			{
-				delete iUriDel;
-				iUriDel = NULL;
-			}
-	
-			
-			
-			iUriDel = urival.AllocL();
-			
-			if ( mapping == KAMInstallNodeName || mapping == KAMInstallAndActivateNodeName )
-				{
-				TUint32 iluid( GetLuidL( aLUID, NSmlDmURI::URISeg(aURI, KInventoryMappingURILoc), EDCSDelivered  ) ) ;
-				if( iluid > 0 )
-					{
-					TDeploymentComponentState targetstate = ((mapping == KAMInstallNodeName) ? EDCSInactive : EDCSActive);
-					InstallL( iluid, aURI, aLUID, targetstate, ret );	
-					
-					//TInt err( iDbSession.RemoveMappingInfoL( KAMAdapterImplUid, *iUriDel, iluid ) );
-					}
-				else
-					{
-					ret = ENotFound;
-					RDEBUG( "CAmAdapter::ExecuteCommandL(): case 6 install Not found node" );
-					}
-				}
-			else if ( mapping == KAMRemoveNodeName )	
-				{
-				TUint32 iluid( GetLuidL( aLUID, NSmlDmURI::URISeg(aURI, KInventoryMappingURILoc), EDCSDelivered  ) ) ;
-				if ( (TInt32)iluid <= 0 )
-					{
-					iluid = GetLuidL( aLUID, NSmlDmURI::URISeg(aURI, KInventoryMappingURILoc), EDCSActive  )  ;
-					if ( (TInt32)iluid <= 0 )
-						{
-						iluid = GetLuidL( aLUID, NSmlDmURI::URISeg(aURI, KInventoryMappingURILoc), EDCSInactive  )  ;
-						}
-					}
-				if( iluid > 0 )
-					{
-					TRAPD( err, SessionL().RemoveL( iluid ) );
-					if ( err == KErrNone )
-						{
-						RDEBUG( "CAmAdapter::ExecuteCommandL(): Remove success!" );
-						TPtrC8 aclmapping( URISegsUpTo( aURI, 4) );
-						
-						// "Nullify" the mapping for argument
-						DirectSetMappingL( aclmapping, KNullDesC8 );
-						ret = EOk;
-						if ( iInAtomic )
-			    			{
-			    			iBuffer.Append( TAMCommandBufferElement( aStatusRef, aURI ) );
-			    			}
-						}
-					else
-						{
-						RDEBUG_2( "CAmAdapter::ExecuteCommandL(): Remove FAILED '%d'", err);	
-						
-						MAPERROR( err, ret, _L8("Execute Remove %d") );
-						}
-					}
-				else
-					{
-					ret = ENotFound;
-					RDEBUG( "CAmAdapter::ExecuteCommandL(): case 6 remove Not found node" );
-					}
-				}
-			else if ( mapping == KAMUpdateNodeName )
-				{
-				RDEBUG8_2( "CAmAdapter::ExecuteCommandL(): Update: '%S'", &mapping );
-				TUint32 iluid( GetLuidL( aLUID, NSmlDmURI::URISeg(aURI, KInventoryMappingURILoc), EDCSDelivered  ) ) ;
-				if( iluid > 0 )
-					{
-					UpdateL( iluid, aURI, aLUID, EDCSInactive, ret );
-					//TInt err( iDbSession.RemoveMappingInfoL( KAMAdapterImplUid, *iUriDel, iluid ) );
-					}
-				else
-					{
-					ret = ENotFound;
-					RDEBUG( "CAmAdapter::ExecuteCommandL(): case 6 Update Not found node" );
-					}
-				}
-			else if ( mapping == KAMUpdateAndActivateNodeName )
-				{
-				RDEBUG8_2( "CAmAdapter::ExecuteCommandL(): UpdateAndActivate: '%S'", &mapping );
-				TUint32 iluid( GetLuidL( aLUID, NSmlDmURI::URISeg(aURI, KInventoryMappingURILoc), EDCSDelivered  ) ) ;
-				if( iluid > 0 )
-					{
-					UpdateL( iluid, aURI, aLUID, EDCSActive, ret );	
-					//TInt err( iDbSession.RemoveMappingInfoL( KAMAdapterImplUid, *iUriDel, iluid ) );	
-					}
-				else
-					{
-					ret = ENotFound;
-					RDEBUG( "CAmAdapter::ExecuteCommandL(): case 6 UpdateAndActivate Not found node" );
-					}
-				}
-			else if ( mapping == KAMActivateNodeName )
-				{
-				//DBG_ARGS8( "CAmAdapter::ExecuteCommandL(): Activating " );
-				TUint32 iluid( GetLuidL( aLUID, NSmlDmURI::URISeg(aURI, KInventoryMappingURILoc), EDCSActive ) );
-				if ( (TInt32)iluid <= 0 )
-					{
-					iluid = GetLuidL( aLUID, NSmlDmURI::URISeg(aURI, KInventoryMappingURILoc), EDCSInactive  )  ;
-					}
-				if( iluid > 0 )
-					{
-					TRAPD( erx, SessionL().ActivateL( iluid ) );
-					
-					MAPERROR( erx, ret, _L8("Activate %d") );
-					}
-				else
-					{
-					ret = ENotFound;
-					RDEBUG( "CAmAdapter::ExecuteCommandL(): case 6 Activate Not found node" );
-					}
-				}
-			else if ( mapping == KAMDeActivateNodeName )
-				{
-				//DBG_ARGS8( "CAmAdapter::ExecuteCommandL(): Inactivating " );
-				TUint32 iluid( GetLuidL( aLUID, NSmlDmURI::URISeg(aURI, KInventoryMappingURILoc), EDCSActive ) );
-				if ( (TInt32)iluid <= 0 )
-					{
-					iluid = GetLuidL( aLUID, NSmlDmURI::URISeg(aURI, KInventoryMappingURILoc), EDCSInactive  )  ;
-					}
-				if( iluid > 0 )
-					{
-					TRAPD( erx, SessionL().DeactivateL( iluid ) );
-					
-					MAPERROR( erx, ret,_L8("Dectivate %d") );
-					}
-				else
-					{
-					ret = ENotFound;
-					RDEBUG( "CAmAdapter::ExecuteCommandL(): case 6 DeActivate Not found node" );
-					}
-				}	
-			else
-				{
-				RDEBUG8_2( "CAmAdapter::ExecuteCommandL(): ASKED NOT SUPPORTED OPERATION '%S'", &mapping );
-				User::Leave( KErrArgument );
-				}
-			break;
-			}
-		
-		default:
-			{
-			RDEBUG8_3( "CAmAdapter::ExecuteCommandL(): ILLEGAL LEVEL %d NODE %S", cnt, &aURI );
-			User::Leave( KErrArgument );			
-			break;
-			}
-		}
-	SetStatusL( aStatusRef, ret ) ;
-	}
-
-
-
-// ------------------------------------------------------------------------------------------------
-// CAmAdapter::UpdateL( 
-// 	const TUint aLuidi, 
-// 	const TDesC8& aURI, 
-// 	const TDesC8& aSourceLUID,
-// 	const TDeploymentComponentState aTargetState,
-// 	TError &aRet
-// ------------------------------------------------------------------------------------------------
-void CAmAdapter::UpdateL( 
-	const TUint aLuidi, 
-	const TDesC8& aURI, 
-	const TDesC8& aSourceLUID,
-	const TDeploymentComponentState aTargetState,
-	TError &aRet
-	 ) 
-	{	
-
-
-	#ifdef __TARM_SYMBIAN_CONVERGENCY	
-		TPtrC8 uriPtrc = NSmlDmURI::RemoveDotSlash(aURI);	
-	#else
-		//nothing
-	#endif
-
-	CBufBase *delivered = CBufFlat::NewL( 128 );
-	CleanupStack::PushL( delivered );
-	
-	#ifdef __TARM_SYMBIAN_CONVERGENCY	
-		TPtrC8 aclmapping( NSmlDmURI::URISeg( uriPtrc, 4 ) );
-	#else
-		TPtrC8 aclmapping( NSmlDmURI::URISeg( aURI, 4 ) );
-	#endif
-
-	
-	HBufC8 *targetURI = HBufC8::NewLC( KDeployedURI().Length() + aclmapping.Length() );
-	
-	TPtr8 targetPtr( targetURI->Des() );
-	targetPtr.Copy( KDeployedURI );
-	targetPtr.Append( aclmapping );
-	
-	HBufC8 *deployed = Callback().GetLuidAllocL( targetPtr ) ;
-	CleanupStack::PushL( deployed );
-	
-	//DBG_ARGS8( "CAmAdapter::UpdateL(): Updating '%S' luid: '%S'" ), &targetPtr, &(*deployed));
-	if ( *deployed == KNullDesC8 )
-		{
-		//DBG_ARGS8( "CAmAdapter::UpdateL(): Failed to find to update target '%S'" ), &targetPtr );
-		aRet = EError;
-		}
-	else
-		{
-		// Found delivered & active or inactive components! Do update!
-		TInt depluid( DesToIntL( *deployed ) );
-		TRAPD( erx, SessionL().UpdateL( aLuidi, depluid ) );
-		MAPERROR( erx, aRet,_L8("Update %d") );
-		if ( erx == KErrNone )
-			{
-			//SetMappingLC( aclmapping, aTargetState, aSourceLUID, targetURI );
-			DeactivateIfInactive( aLuidi, aTargetState ); 
-			}
-		}
-	CleanupStack::PopAndDestroy( deployed ) ;
-	CleanupStack::PopAndDestroy( targetURI ) ;
-	CleanupStack::PopAndDestroy( delivered ) ;
-	}
-
-
-// ------------------------------------------------------------------------------------------------
-//  CAmAdapter::CheckStateL( const TDeploymentComponent &aComp, const TDesC8& aURI
-// ------------------------------------------------------------------------------------------------
-TBool CAmAdapter::CheckStateL( const TDeploymentComponent &aComp, const TDesC8& aURI )
-	{
-	// Scenarios like "./SCM/Download/Node1/Operations/Install" NumOfURISegs won't work.
-	
-	TBool ret;
-	if ((aComp.iState ==  EDCSDelivered) || (aComp.iState == EDCSActive) || ( aComp.iState == EDCSInactive) || (aComp.iState == EDCSDownload))
-	{
-        // Check for map & __TARM_SYMBIAN_CONVERGENCY also ?
-        ret = ETrue;
-    }
-	else
-	    ret = EFalse;
-	return ret;
-#if 0
-	#ifdef __TARM_SYMBIAN_CONVERGENCY
-		TPtrC8 uriPtrc = NSmlDmURI::RemoveDotSlash(aURI);	
-		TInt cnt( NSmlDmURI::NumOfURISegs( uriPtrc ) ) ;
-	#else
-		TInt cnt( NSmlDmURI::NumOfURISegs( aURI ) ) ;
-	#endif
-
-	TBool ret( EFalse );
-	//TInt cnt( NSmlDmURI::NumOfURISegs( aURI ) ) ;
-	if ( cnt == 4 )
-		{
-		#ifdef __TARM_SYMBIAN_CONVERGENCY	
-			TPtrC8 uriPtrc = NSmlDmURI::RemoveDotSlash(aURI);	
-			TPtrC8 map( NSmlDmURI::URISeg( uriPtrc, 3 ) );
-		#else
-			TPtrC8 map( NSmlDmURI::URISeg( aURI, 3 ) );
-		#endif		
-		switch ( aComp.iState )
-			{
-			case EDCSDelivered:
-				ret = (map == KAMDeliveredNodeName);
-				break;
-			case EDCSActive:
-			case EDCSInactive:
-				ret = (map == KAMDeployedNodeName);
-				break;
-			default:
-				ret = EFalse;
-				break;
-			}
-		}
-	else if ( cnt == 3 )
-		{
-		if ( NSmlDmURI::URISeg( aURI, 2 ) == KAMDownloadNodeName && aComp.iState == EDCSDownload) 
-			{
-			ret = ETrue; 
-			}
-		}
-	return ret;
-#endif
-	}
-
-
-// ------------------------------------------------------------------------------------------------
-//  CAmAdapter::StateL( const TDeploymentComponent &aComp, const TDesC8& aURI
-// ------------------------------------------------------------------------------------------------
-TDeploymentComponentState CAmAdapter::StateL( const TDesC8& aURI )
-	{
-
-
-	#ifdef __TARM_SYMBIAN_CONVERGENCY	
-		TPtrC8 uriPtrc = NSmlDmURI::RemoveDotSlash(aURI);	
-	#else
-		//nothing
-	#endif
-
-	TDeploymentComponentState ret( EDCSNone );
-	#ifdef __TARM_SYMBIAN_CONVERGENCY	
-		TInt cnt( NSmlDmURI::NumOfURISegs( uriPtrc ) ) ;	
-	#else
-		TInt cnt( NSmlDmURI::NumOfURISegs( aURI ) ) ;
-	#endif	
-	if ( cnt > 2)
-		{
-		#ifdef __TARM_SYMBIAN_CONVERGENCY	
-			TPtrC8 map( NSmlDmURI::URISeg( uriPtrc, 2 ) );	
-		#else
-			TPtrC8 map( NSmlDmURI::URISeg( aURI, 2 ) );
-		#endif	
-		if ( map == KAMInventoryNodeName )
-			{
-			#ifdef __TARM_SYMBIAN_CONVERGENCY
-				TPtrC8 map( NSmlDmURI::URISeg( uriPtrc, 2 ) );	
-			#else
-				TPtrC8 map( NSmlDmURI::URISeg( aURI, 2 ) );
-			#endif	
-			map.Set( NSmlDmURI::URISeg( aURI, 3 ) );
-			if ( map == KAMDeployedNodeName )
-				{
-					
-				}
-			else if ( map == KAMDeliveredNodeName )
-				{
-				ret = EDCSDelivered;
-				}
-			else
-				{
-				User::Leave( KErrArgument );
-				}
-			}
-		else if( map == KAMDownloadNodeName )
-			{
-			ret = EDCSDownload;
-			}
-		else
-			{
-			User::Leave( KErrArgument );
-			}
-		}
-	return ret;
-	}
-	
-
-// ------------------------------------------------------------------------------------------------
-//  CAmAdapter::CheckStateL( const TDesC8& aURI, const TDesC8& aLUID )
-// ------------------------------------------------------------------------------------------------
-TBool CAmAdapter::CheckStateL( const TDesC8& aURI, const TDesC8& aLUID )
-	{
-
-
-	TUint32 iluid( DesToIntL( aLUID ) );
-    TDeploymentComponent comp ;
-    TInt err( SessionL().DeploymentComponent( iluid, comp ) );
-    TBool ret( EFalse );
-    if ( err == KErrNone )
-    	{
-		ret = CheckStateL( comp, aURI );
-    	}
-	return ret;
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  CAmAdapter::InstallOptionsDataL(const TUint32 iluid, const TDeplCompAttrType& aDataType, 
-//		CBufBase &aBuf, CBufBase *aRaw/*= NULL*/)
-// ------------------------------------------------------------------------------------------------
-void CAmAdapter::InstallOptionsDataL(const TUint32 iluid, const TDeplCompAttrType& aDataType, 
-		CBufBase &aBuf, CBufBase *aRaw/*= NULL*/)
-	{
-	TAMInstallOptionsPckgBuf iop;
-	TBool pushed( EFalse );
-	if ( !aRaw ) 
-		{
-		aRaw = CBufFlat::NewL(32);
-		CleanupStack::PushL( aRaw );
-		pushed = ETrue;
-		SessionL().DeploymentComponentDataL( iluid, aDataType, *aRaw );
-		}
-	
-	iop.Copy( aRaw->Ptr( 0 ) );
-	if ( pushed )
-		{
-		CleanupStack::PopAndDestroy( aRaw );
-		}
-	InstallOptionsParser::SerializeOptionsL( iop(), aBuf);
-	}
-
-	
-// ------------------------------------------------------------------------------------------------
-//  CAmAdapter::GetComponentDataL( const TDesC8& parent, const TDesC8& mapping, 
-//		const TUint32 iluid, CBufBase *currentList, CBufBase *currentMime, TError &status )
-// ------------------------------------------------------------------------------------------------
-void CAmAdapter::GetComponentDataL( const TDesC8& parent, const TDesC8& mapping, 
-		const TUint32 iluid, CBufBase &currentList, CBufBase &currentMime, TError &status )
-	{
-	TDeploymentComponent comp ;
-    TInt err( SessionL().DeploymentComponent( iluid, comp ) );
-    if ( err == KErrNone )
-    	{
-    	RDEBUG_3( "CAmAdapter::GetComponentDataL(): DeploymentComponent response: %d, state: %d", err, comp.iState );	
-    	if ( CheckStateL( comp, parent ) )
-    		{
-			if ( mapping == KAMIDNodeName )
-				{
-				currentList.InsertL( 0, comp.iId );
-				status = EOk;
-				}
-			else if ( mapping == KAMNameNodeName )
-				{
-				currentList.InsertL( 0, comp.iName );
-				status = EOk;
-				}
-			else if ( mapping == KAMVersionNodeName )
-				{
-				currentList.InsertL( 0, comp.iVersion );
-				status = EOk;
-				}
-			else
-				{
-				TDeplCompAttrType dataType( UpdateFlagFromMapping( mapping ) );
-				if ( comp.iState == EDCSDownload )
-					{
-					if ( dataType == EDCDownloadURI || dataType == EDCStatus)
-						{
-						SessionL().DeploymentComponentDataL( iluid, dataType, currentList );
-						status = EOk ;
-						}
-					else if (  dataType == EDCInstallOptions )
-						{
-						InstallOptionsDataL( iluid, dataType, currentList );
-						status = EOk;
-						}
-					else if ( dataType == EDCConRef )
-						{
-						CBufBase *b = CBufFlat::NewL(4);
-						CleanupStack::PushL( b );
-						SessionL().DeploymentComponentDataL( iluid, dataType, *b);
-						TPckgBuf<TInt> iap;
-						iap.Copy( b->Ptr( 0 ) );
-						CleanupStack::PopAndDestroy( b );
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-
-			            CArrayFix<TSmlDmMappingInfo>* mapArray = new CArrayFixFlat<TSmlDmMappingInfo>(4);
-			            CleanupStack::PushL(mapArray);
-			        
-				        Callback().GetMappingInfoListL( KNSmlDMMMSSlashIAPUri,*mapArray );
-
-						//TInt iap = KErrNotFound; 
-				        TSmlDmMappingInfo mapInfo;
-				        HBufC8 * uri = NULL;
-				        TPtr8 tempURI(uri->Des());
-			        
-				        for(TInt i = 0;i<mapArray->Count();i++)
-					        {
-						        if(iap()==DesToInt(mapArray->At(i).iURISegLUID))
-						        {
-									tempURI=mapArray->At(i).iURISeg;      	
-						        }
-						        
-					        }
-					    mapArray->Reset();
-				        CleanupStack::PopAndDestroy(); //mapArray
-		    			if ( uri != NULL )
-		    				{
-		    				CleanupStack::PushL( uri ) ;
-			    			currentList.InsertL( 0, *uri );
-			    			CleanupStack::PopAndDestroy( uri ) ;
-		    				}				        
-				        
-#else
-						
-						CNSmlDMIAPMatcher* iapfinder = CNSmlDMIAPMatcher::NewLC( &Callback() );
-		    			HBufC8 * uri = iapfinder->URIFromIAPIdL( iap() ) ;
-		    			CleanupStack::PopAndDestroy( iapfinder );
-		    			if ( uri != NULL )
-		    				{
-		    				CleanupStack::PushL( uri ) ;
-			    			currentList.InsertL( 0, *uri );
-			    			CleanupStack::PopAndDestroy( uri ) ;
-		    				}
-		    			
-#endif
-		    			status = EOk;
-						}
-					else
-						{
-						RDEBUG8_2( "CAmAdapter::GetComponentDataL(): ASKED NOT SUPPORTED LEAF '%S'", &mapping );
-						}
-					}
-				else if ( comp.iState == EDCSDelivered )
-					{
-					if ( dataType == EDCData || dataType == EDCMetaData || dataType == EDCInstallOptions)
-						{
-						CBufBase *raw = CBufFlat::NewL( 128 );
-						CleanupStack::PushL( raw );
-						SessionL().DeploymentComponentDataL( iluid, dataType, *raw );
-						TPtrC8 source( raw->Ptr(0) );
-						if ( source.Length() > 0 )
-							{
-		    				if ( dataType == EDCData )
-		    					{
-								currentList.InsertL( 0, source );
-								SessionL().DeploymentComponentDataL( iluid, EDCDataMime, currentMime );
-						
-		    					}
-		    				else if ( dataType == EDCInstallOptions )
-		    					{
-		    					InstallOptionsDataL( iluid, dataType, currentList, raw );
-		    					}
-		    				else
-		    					{
-		    					currentList.InsertL( 0, source );
-		    					SessionL().DeploymentComponentDataL( iluid, EDCMetaDataMime, currentMime );
-		    					}
-							}
-						else
-							{
-							// 0 data length...
-							}
-						status = EOk;
-						CleanupStack::PopAndDestroy( raw );
-						RDEBUG8_2( "CAmAdapter::GetComponentDataL(): DeploymentComponentDataL called '%S'", &mapping );
-						}
-					}
-				else if ( dataType == EDCStateValue )
-					{
-					if ( comp.iState == EDCSActive )
-						{
-						currentList.InsertL( 0, KAMStateValueActive() );
-						}
-					else 
-						{
-						currentList.InsertL( 0, KAMStateValueInactive() );
-						}
-					status = EOk;
-					}
-				else
-					{
-					RDEBUG8_2( "CAmAdapter::GetComponentDataL(): ERROR ASKED NOT SUPPORTED LEAF '%S'", &mapping );
-					}	    	
-				}
-			}
-    	else
-    		{
-    		RDEBUG8_3( "CAmAdapter::GetComponentDataL(): WARNING Asked illegal state leaf '%S', %d", &mapping, comp.iState );
-	    	status = ENotFound;
-    		}
-    	}
-	else
-		{
-		RDEBUG_3( "CAmAdapter::GetComponentDataL(): ERROR FAILED TO GET COMPOMENT OF ID %d: %d", iluid, err );
-		MAPERROR( err, status,_L8("Get Component %d") );
-		}
-	}
-	
-// ------------------------------------------------------------------------------------------------
-//  CAmAdapter::GetLeafLuidL(const TDesC8 &aURI, const TDesC8 & aParentMapping ) 
-// ------------------------------------------------------------------------------------------------
-TInt CAmAdapter::GetLeafLuidL(const TDesC8 &aURI, const TDesC8 & aParentMapping ) 
-	{
-
-
-	#ifdef __TARM_SYMBIAN_CONVERGENCY	
-		TPtrC8 uriPtrc = NSmlDmURI::RemoveDotSlash(aURI);
-		TInt numSeqs( NSmlDmURI::NumOfURISegs( uriPtrc ) );	
-	#else
-		TInt numSeqs( NSmlDmURI::NumOfURISegs( aURI ) );
-	#endif
-
-	TUint32 iluid( 0 );
-	//TInt numSeqs( NSmlDmURI::NumOfURISegs( aURI ) );
-		
-	switch ( numSeqs )
-		{
-		case 4: // must be a download leaf
-			{
-			iluid = GetLuidForUserIdL( aParentMapping, EDCSDownload ) ;
-			break;
-			}
-		case 5: // download operation or delivered or deployed leaf
-			{
-			if ( URISegsUpTo( aURI, 2, ETrue ) == KDownloadURI )
-				{
-				RDEBUG8_2( "CAmAdapter::GetLeafLuidL(): WARNING download operation leaf '%S'", &aURI );
-				//status = EOk; 
-				}
-			else 
-				{
-				TPtrC8 start( URISegsUpTo( aURI, 3, ETrue ) );
-				if ( start == KDeliveredURI )	
-					{
-					iluid = GetLuidForUserIdL( aParentMapping, EDCSDelivered ) ;
-					}
-				else if ( start == KDeployedURI )
-					{
-					iluid = GetLuidForUserIdL( aParentMapping, EDCSActive ) ;
-					if( (TInt32)iluid <= 0 )
-						{
-						iluid = GetLuidForUserIdL( aParentMapping, EDCSInactive ) ;
-						}
-					}
-				else
-					{
-					RDEBUG8_2( "CAmAdapter::GetLeafLuidL(): WARNING strange uri '%S'", &aURI );
-					}
-				}
-			break;
-			}
-		case 6: // delivered or deployed operation leaf
-			{
-			//iluid = GetLuidForUserIdL( parentMapping, EDCSDownload ) ;
-			//status = EOk;
-			RDEBUG8_2( "CAmAdapter::GetLeafLuidL(): WARNING delivered or deployed operation leaf '%S'", &aURI );
-			break;
-			}
-		default: // illegal uri
-			{
-			RDEBUG8_2( "CAmAdapter::GetLeafLuidL(): ERROR requested luid of illegal URI '%S'", &aURI );
-			break;
-			}
-		}
-	return iluid;
-	}
-	
-// ------------------------------------------------------------------------------------------------
-//  CAmAdapter::FetchLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, const TDesC8& aType, 
-//			CBufBase& aObject )
-// ------------------------------------------------------------------------------------------------
-void CAmAdapter::FetchLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, const TDesC8& aType, 
-		const TInt aResultsRef, TInt aStatusRef )
-	{
-
-	#ifdef __TARM_SYMBIAN_CONVERGENCY	
-		TPtrC8 uriPtrc = NSmlDmURI::RemoveDotSlash(aURI);
-	#else
-		//Nothing
-	#endif
-
-
-	RDEBUG8_4("CAmAdapter::FetchLeafObjectL('%S', '%S', '%S'): begin", &aURI, &aLUID, &aType );
-	SetAdapterValue(KAMSCMAdapter);
-	CheckStateChangesL();
-	TError status( EError );
-	
-	CBufBase *currentList = CBufFlat::NewL( 128 );
-	CleanupStack::PushL( currentList );
-	
-	CBufBase *currentMime = CBufFlat::NewL( 128 );
-	CleanupStack::PushL( currentMime );
-	
-	TPtrC8 mapping( NSmlDmURI::LastURISeg( aURI ) );
-	TPtrC8 parent( NSmlDmURI::RemoveLastSeg( aURI ) );
-	TPtrC8 parentMapping( NSmlDmURI::LastURISeg( parent ) );
-
-	HBufC8 *luid = NULL;
-	if ( aLUID != KNullDesC8 )
-		{
-		luid = aLUID.AllocLC();
-		}
-	else 
-		{ // try if we find it from download path
-		TBuf8<256> down;
-		down = KDownloadURI;
-		down.Append ( parentMapping );
-		luid = Callback().GetLuidAllocL( down );
-		CleanupStack::PushL( luid );
-		if ( *luid != KNullDesC8 )
-			{ 
-			// make it to found next time
-			DirectSetMappingL( parent, *luid );
-			MoveAclL( down, parent );
-			
-			// remove old
-			DirectSetMappingL( down, KNullDesC8 );
-			}
-		}
-	if ( *luid != KNullDesC8 )
-		{
-		TUint32 iluid ( DesToIntL( *luid ) );
-		RDEBUG8_2( "CAmAdapter::FetchLeafObjectL(): Luid is : %d", iluid );
-	    GetComponentDataL( parent, mapping, iluid, *currentList, *currentMime, status );
-		}
-	else
-		{
-		TUint32 iluid( GetLeafLuidL( aURI, parentMapping ) );
-		if ( iluid > 0 )
-			{
-			HBufC8 *l = IntToDes8LC( iluid );
-			DirectSetMappingL( parent, *l );
-			CleanupStack::PopAndDestroy( l );
-			GetComponentDataL( parent, mapping, iluid, *currentList, *currentMime, status );
-			}
-		else
-			{
-			RDEBUG8_2( "CAmAdapter::FetchLeafObjectL(): WARNING Faild to get luid allocation for '%S'", &parent );
-			if ( aLUID == KNullDesC8 )
-				{
-#ifdef __AM_LASTERROR_NODE
-				if ( aURI == KAMLastErrorURI ) 
-					{
-					const TDesC8& error= LastError();
-					RDEBUG8_2( "CAmAdapter::FetchLeafObjectL(): Returning last error '%S'", &error );
-					currentList->InsertL(0, error );
-					status = EOk;
-					}
-				else 
-					{
-					status = ENotFound;
-					}
-#else
-				status = ENotFound ;
-#endif
-				}
-			}
-		}
-	
-	SetStatusL( aStatusRef, status );
-	if( status == EOk )
-		{
-		if ( iInAtomic )
-			{
-			iBuffer.Append( TAMCommandBufferElement( aStatusRef, aURI ) );
-			}
-		Callback().SetResultsL( aResultsRef, *currentList, 
-			( (currentMime->Size() > 0) ? currentMime->Ptr(0) : aType ) );
-		}
-	CleanupStack::PopAndDestroy( luid );
-	CleanupStack::PopAndDestroy( currentMime ); //currentMime
-	CleanupStack::PopAndDestroy( currentList ); //currentList
-	RDEBUG("CAmAdapter::FetchLeafObjectL: end" );
-	}
-
-
-// ------------------------------------------------------------------------------------------------
-//  CAmAdapter::IdListL( TDeploymentComponentState aState, 
-//					CBufBase *aCurrentList, TBool aAppend /* = EFalse */)
-// ------------------------------------------------------------------------------------------------
-CAmAdapter::TError CAmAdapter::IdListL( 
-	TDeploymentComponentState aState, 
-	CBufBase &aCurrentList, TBool aAppend /* = EFalse */)
-	{
-	CAmAdapter::TError ret( CAmAdapter::EError );
-	RElementIdArray array;
-	TPtrC8 uriStart;
-	TBuf8<256> uri;
-	switch ( aState )
-		{
-		case EDCSDelivered:
-			uriStart.Set( KDeliveredURI );
-			break;
-		case EDCSActive:
-		case EDCSInactive:
-			uriStart.Set( KDeployedURI ) ;
-			break;
-		case EDCSDownload:
-			uriStart.Set( KDownloadURI ) ;
-			break;
-		default:
-			break;
-			
-		}
-	TInt err( SessionL().DeploymentComponentIdsL( array, aState ) );
-	if ( err == KErrNone )
-		{
-		TInt count( array.Count() );
-		if ( count && aAppend && aCurrentList.Size() )
-			{
-			aCurrentList.InsertL( aCurrentList.Size(), KAMSeparator8 );
-			}
-		for( TInt i( 0 ); i < count; i++ )
-			{
-			TUint32 el = array[i];
-			TDCUserId dc;
-			SessionL().DeploymentComponentUserIdL( el, dc );
-			
-			if ( uriStart == KNullDesC8() )
-				{
-				TDeploymentComponent comp ;
-			    err = SessionL().DeploymentComponent( el, comp ) ;
-			    if ( err == KErrNone )
-			    	{
-			    	switch ( comp.iState )
-			    		{
-			    		case EDCSDelivered:
-							uriStart.Set( KDeliveredURI );
-							break;
-						case EDCSActive:
-						case EDCSInactive:
-							uriStart.Set( KDeployedURI ) ;
-							break;
-						case EDCSDownload:
-							uriStart.Set( KDownloadURI ) ;
-							break;
-						default:
-							break;
-			    		}
-			    	}
-				}
-			if ( uriStart != KNullDesC8() )
-				{
-				uri.Copy( uriStart );
-				uri.Append( dc );
-				HBufC8 *luid = DirectGetLuidAllocLC( uri ); //Callback().GetLuidAllocL( uri );
-				if ( KNullDesC8() == *luid )				
-					{
-					RDEBUG8_3( "CAmAdapter::IdListL(): WARNING updating lost luid of '%S' %d", &uri, el );
-					HBufC8 *l = IntToDes8LC( el );
-					if ( *luid == *l )
-						{
-						RDEBUG( "CAmAdapter::IdListL(): WARNING CANCEL (not really updating, they're the same already" );
-						}
-					else
-						{
-						DirectSetMappingL( uri, *l );
-						}
-					CleanupStack::PopAndDestroy( l );
-					}
-				CleanupStack::PopAndDestroy( luid );
-			
-				}
-			else
-				{
-				RDEBUG_2( "CAmAdapter::IdListL(): WARNING failed to get component state of id %d, cannot check mappings ", el );
-				}
-			aCurrentList.InsertL( aCurrentList.Size(), dc);
-			if ( i + 1 < count )
-				{
-				aCurrentList.InsertL( aCurrentList.Size(), KAMSeparator8 );
-				}
-			}
-		ret = EOk;
-		}
-	else
-		{
-		RDEBUG_2( "CAmAdapter::IdListL(): Error %d", err );
-		}
-	array.Reset();
-	return ret; 	
-	}
-		
-// ------------------------------------------------------------------------------------------------
-//  CAmAdapter::ChildURIListL( const TDesC8& aURI, const TDesC8& aParentLUID, 
-//			const CArrayFix<TSmlDmMappingInfo>& /*aPreviousURISegmentList*/, const TInt aResultsRef, 
-//			TInt aStatusRef );
-// ------------------------------------------------------------------------------------------------
-void CAmAdapter::ChildURIListL( const TDesC8& aURI, const TDesC8& aParentLUID, 
-	const CArrayFix<TSmlDmMappingInfo>& /*aPreviousURISegmentList*/, const TInt aResultsRef, 
-	TInt aStatusRef  )
-	{
-
-	
-	#ifdef __TARM_SYMBIAN_CONVERGENCY	
-		TPtrC8 uriPtrc = NSmlDmURI::RemoveDotSlash(aURI);
-	#else
-		//Nothing
-	#endif
-
-	RDEBUG8_3 ( "CAmAdapter::ChildURIListL(): begin ('%S', '%S')" , &aURI, &aParentLUID );
-	CheckStateChangesL();
-	
-	TError ret( EError );
-		
-	CBufBase *currentList = CBufFlat::NewL( 128 );
-	CleanupStack::PushL( currentList );
-
-	#ifdef __TARM_SYMBIAN_CONVERGENCY	
-		TInt numSeqs( NSmlDmURI::NumOfURISegs( uriPtrc ) );
-	#else
-		TInt numSeqs( NSmlDmURI::NumOfURISegs( aURI ) );
-	#endif
-	
-	TPtrC8 mapping( NSmlDmURI::LastURISeg( aURI ) );
-	if ( numSeqs == 1 ) 
-		{
-		currentList->InsertL( 0, KAMRootChilds );
-		ret = EOk;
-		}
-	else if ( numSeqs == 2 )
-		{
-		if ( mapping == KAMInventoryNodeName)
-			{
-			currentList->InsertL( 0, KAMInventoryChilds );
-			ret = EOk;
-			}
-		else if ( mapping == KAMDownloadNodeName )
-			{
-			RDEBUG8_2( "CAmAdapter::ChildURIListL(): Level 2 NODE %S", &aURI );
-			TDeploymentComponentState state ( EDCSDownload );
-			ret = IdListL( state, *currentList );
-			}
-		else
-			{
-			RDEBUG8_2( "CAmAdapter::ChildURIListL(): ILLEGAL LEVEL 2 NODE %S", &aURI );
-			User::Leave( KErrArgument );
-			}	
-		}
-	else if ( numSeqs == 3 )
-		{
-		if ( mapping == KAMDeliveredNodeName )
-			{
-			RDEBUG8_2( "CAmAdapter::ChildURIListL(): Level 3 NODE %S", &aURI );
-			TDeploymentComponentState state ( EDCSDelivered );			
-			ret = IdListL( state, *currentList );	
-			}
-		else if ( mapping == KAMDeployedNodeName )
-			{
-			TDeploymentComponentState state ( EDCSActive );
-			ret = IdListL( state, *currentList );
-			if ( ret == EOk )
-				{
-				state = EDCSInactive ;
-				ret = IdListL( state, *currentList, ETrue );
-				}
-			}
-		else
-			{
-			if ( aParentLUID != KNullDesC8 )
-				{
-				if ( CheckStateL( aURI, aParentLUID ) )
-					{
-					TPtrC8 parent( NSmlDmURI::RemoveLastSeg( aURI ) );
-					TPtrC8 parentMapping( NSmlDmURI::LastURISeg( parent ) );
-					if ( parentMapping == KAMDownloadNodeName )
-						{
-						currentList->InsertL( 0, KAMDownloadDynaChilds );
-						ret = EOk;
-						}
-					else
-						{
-						RDEBUG8_2( "CAmAdapter::ChildURIListL(): ILLEGAL LEVEL 3 NODE %S", &aURI );
-						User::Leave( KErrArgument );
-						}
-					}
-				else
-					{
-					RDEBUG8_2( "CAmAdapter::ChildURIListL(): DC has changed state %S", &aURI );
-					ret = ENotFound;	
-					}
-				}
-			else
-				{
-				RDEBUG8_2( "CAmAdapter::ChildURIListL(): Level3 Node not found %S", &aURI );
-				ret = ENotFound;
-				}
-			}
-		}
-	else if ( numSeqs == 4 )
-		{
-		TPtrC8 parent( NSmlDmURI::RemoveLastSeg( aURI ) );
-		TPtrC8 parentMapping( NSmlDmURI::LastURISeg( parent ) );
-		if ( aParentLUID == KNullDesC8 )
-			{
-			RDEBUG8_2( "CAmAdapter::ChildURIListL(): WARNING possibly a illegal level 4 node %S", &aURI );
-			ret = ENotFound;
-			}
-				
-		if ( parentMapping == KAMDeliveredNodeName )
-			{
-			if ( GetLuid2L( aParentLUID, mapping, EDCSDelivered, ret ) > 0 )
-				{
-				currentList->InsertL( 0, KAMInventoryDeliveredDynaChilds );
-				ret = EOk;	
-				}
-			}
-		else if ( parentMapping == KAMDeployedNodeName )
-			{
-			if ( GetLuid2L( aParentLUID, mapping, EDCSActive, ret ) > 0 )
-				{
-				currentList->InsertL( 0, KAMInventoryDynaChilds );
-				ret = EOk;
-				}
-			else if ( GetLuid2L( aParentLUID, mapping, EDCSInactive, ret ) > 0 )
-				{
-				currentList->InsertL( 0, KAMInventoryDynaChilds );
-				ret = EOk;
-				}
-			}
-		else if ( mapping == KAMOperationsNodeName )
-			{
-		    if ( GetLuid2L( aParentLUID, parentMapping, EDCSDownload, ret ) > 0 )
-		    	{
-		    	if ( CheckStateL( aURI, aParentLUID ) )
-		    		{
-		    		currentList->InsertL( 0, KAMDownloadOperationChilds );
-					ret = EOk;	
-		    		}
-		    	else
-		    		{
-		    		RDEBUG8_2( "CAmAdapter::ChildURIListL(): Level3 operations DC changed state '%S'", &aURI );
-					ret = ENotFound;
-		    		}
-		    	}
-			}
-		else
-			{
-			RDEBUG8_2( "CAmAdapter::ChildURIListL(): Level4 Node not found '%S'", &aURI );
-			ret = ENotFound;
-			}
-		}
-	else if ( numSeqs == 5 )
-		{
-		if ( aParentLUID == KNullDesC8 )
-			{
-			RDEBUG8_2( "CAmAdapter::ChildURIListL(): WARNING possibly a illegal level 5 node %S", &aURI );
-			ret = ENotFound;
-			}
-		if ( mapping == KAMOperationsNodeName )
-			{
-			TPtrC8 parent( NSmlDmURI::RemoveLastSeg( aURI ) );
-			TPtrC8 parentMapping( NSmlDmURI::LastURISeg( parent ) );
-			TPtrC8 gparent( NSmlDmURI::RemoveLastSeg( parent ) );
-			TPtrC8 gparentMapping( NSmlDmURI::LastURISeg( gparent ) );
-			if ( gparentMapping == KAMDeliveredNodeName )
-				{
-				if ( GetLuid2L( aParentLUID, parentMapping, EDCSDelivered, ret ) > 0 )
-					{
-					currentList->InsertL( 0, KAMDeliveredOperationChilds );
-					ret = EOk;	
-					}
-				}
-			else if ( gparentMapping == KAMDeployedNodeName )
-				{
-				if ( GetLuid2L( aParentLUID, parentMapping, EDCSActive, ret ) > 0 )
-					{
-					currentList->InsertL( 0, KAMDeployedOperationChilds );
-					ret = EOk;
-					}
-				else if ( GetLuid2L( aParentLUID, parentMapping, EDCSInactive, ret ) > 0 )
-					{
-					currentList->InsertL( 0, KAMDeployedOperationChilds );
-					ret = EOk;
-					}
-				}
-			else 
-				{
-				RDEBUG8_2( "CAmAdapter::ChildURIListL(): Level5 Node not found wrong parent '%S'", &aURI );
-				ret = ENotFound;
-				}
-			}
-		else
-			{
-			RDEBUG8_2( "CAmAdapter::ChildURIListL(): Level5 Node not found '%S'", &aURI );
-			ret = ENotFound;
-			}
-		}
-	else 
-		{
-		RDEBUG8_3( "CAmAdapter::ChildURIListL(): ILLEGAL LEVEL %d NODE %S", numSeqs, &aURI );
-		ret = EError;
-		}
-	
-	SetStatusL( aStatusRef, ret );
-	
-	if( ret == EOk )
-		{
-		if ( iInAtomic )
-			{
-			iBuffer.Append( TAMCommandBufferElement( aStatusRef, aURI ) );
-			}
-		Callback().SetResultsL( aResultsRef, *currentList, KNullDesC8 );
-		}
-	CleanupStack::PopAndDestroy(); //currentList
-	}
-
-
-// ------------------------------------------------------------------------------------------------
-//  CAmAdapter::DeliverOrDownloadL( const TDesC8 &aUserId, const TDesC8 &aURI, TInt aCnt, 
-//		const TDesC8 &aParentMapping, MSmlDmAdapter::TError &aStatus )
-// ------------------------------------------------------------------------------------------------
-void CAmAdapter::DeliverOrDownloadL( const TDesC8 &aUserId, const TDesC8 &aURI, TInt aCnt, 
-	const TDesC8 &aParentMapping, MSmlDmAdapter::TError &aStatus )
-	{
-
-
-	#ifdef __TARM_SYMBIAN_CONVERGENCY	
-		TPtrC8 uriPtrc = NSmlDmURI::RemoveDotSlash(aURI);
-	#else
-		//Nothing
-	#endif
-
-	switch ( aCnt )
-		{
-		case 3:
-			{
-			if ( aParentMapping == KAMDownloadNodeName )
-				{	
-				TUint32 luid( SessionL().DownloadL( aUserId ) );
-				Callback().SetMappingL( aURI, *IntToDes8LC( luid ) );
-				CleanupStack::PopAndDestroy();
-				aStatus = EOk;
-				}
-			else
-				{
-				RDEBUG( "CAmAdapter::DeliverOrDownloadL(): ERROR Illegal parent");
-				}
-			break;
-			} 	
-		case 4:
-			{
-			if ( aParentMapping == KAMDeliveredNodeName )
-				{	
-				TUint32 luid( SessionL().DeliverL( aUserId ) );
-				Callback().SetMappingL( aURI, *IntToDes8LC( luid ) );
-				CleanupStack::PopAndDestroy();
-				aStatus = EOk;
-				}
-			else
-				{
-				RDEBUG( "CAmAdapter::DeliverOrDownloadL(): ERROR Illegal parent");
-				}
-			break;
-			} 	
-		default:
-			{
-			RDEBUG( "CAmAdapter::DeliverOrDownloadL(): ERROR Illegal URI");
-			break;
-			}
-		}
-	}			
-
-
-// ------------------------------------------------------------------------------------------------
-// CAmAdapter::AddNodeObjectL( const TDesC8& aURI, const TDesC& aParentLUID )
-// ------------------------------------------------------------------------------------------------
-void CAmAdapter::AddNodeObjectL( const TDesC8& aURI, const TDesC8& aParentLUID, TInt aStatusRef )
-	{
-
-
-	#ifdef __TARM_SYMBIAN_CONVERGENCY	
-		TPtrC8 uriPtrc = NSmlDmURI::RemoveDotSlash(aURI);
-		TPtrC8 mapping( NSmlDmURI::LastURISeg( uriPtrc ) );
-		TPtrC8 parent( NSmlDmURI::RemoveLastSeg( uriPtrc ) );
-		TPtrC8 parentMapping( NSmlDmURI::LastURISeg( parent ) );
-		TInt cnt( NSmlDmURI::NumOfURISegs( uriPtrc ) );
-	#else
-		TPtrC8 mapping( NSmlDmURI::LastURISeg( aURI ) );
-		TPtrC8 parent( NSmlDmURI::RemoveLastSeg( aURI ) );
-		TPtrC8 parentMapping( NSmlDmURI::LastURISeg( parent ) );
-		TInt cnt( NSmlDmURI::NumOfURISegs( aURI ) );
-	#endif
-
-	RDEBUG8_3( "CAmAdapter::AddNodeObjectL(): begin '%S', '%S'", &aURI, &aParentLUID );
-	SetAdapterValue(KAMSCMAdapter);
-	CheckStateChangesL();
-	TError status ( EError );
-//	TPtrC8 mapping( NSmlDmURI::LastURISeg( aURI ) );
-//	TPtrC8 parent( NSmlDmURI::RemoveLastSeg( aURI ) );
-//	TPtrC8 parentMapping( NSmlDmURI::LastURISeg( parent ) );
-//	TInt cnt( NSmlDmURI::NumOfURISegs( aURI ) );
-	TUint32 iluid( GetLuidL( aParentLUID, mapping, (parentMapping == KAMDeliveredNodeName ? EDCSDelivered : ( parentMapping == KAMDownloadNodeName ? EDCSDownload : EDCSNone ) ) ) ) ;
-	if( !iluid && parentMapping == KAMDownloadNodeName )
-	    {
-            // This is added for avoiding duplicate node creation in Delivered/Download only.
-            iluid = GetLuidL( aParentLUID, mapping, EDCSDelivered );        
-	    }
-	if ( iluid == 0 )
-		{
-		// Not found, add it ... 
-		DeliverOrDownloadL( mapping, aURI, cnt, parentMapping, status );
-		}
-	else
-		{
-		RDEBUG_2( "CAmAdapter::AddNodeObjectL(): WARNING May Already exists '%d'", iluid );
-		TDeploymentComponent comp ;
-		TInt err( SessionL().DeploymentComponent( iluid, comp ) );
-		if ( err == KErrNone )
-			{
-			RDEBUG_2( "CAmAdapter::AddNodeObjectL(): ERROR Already exists '%d'", iluid );
-			if ( comp.iState == StateL( aURI ) )
-				{
-				RDEBUG( "CAmAdapter::AddNodeObjectL():    (state is ok) " );
-				}
-			else
-				{
-				RDEBUG( "CAmAdapter::AddNodeObjectL():    (state is NOK) " );
-				}
-			status = EAlreadyExists;
-			}
-		else
-			{
-			if ( err == KErrNotFound )
-				{
-				RDEBUG_2( "CAmAdapter::AddNodeObjectL(): WARNING Already exists but not found '%d'", iluid );
-				DeliverOrDownloadL( mapping, aURI, cnt, parentMapping, status );
-				}
-			else
-				{
-				
-				RDEBUG_2( "CAmAdapter::AddNodeObjectL(): ERROR May exists, but failed to fetch get one? '%d'", err );
-				}
-			}
-		}
-	if ( status == EOk )
-		{
-		if ( iInAtomic )
-    		{
-			iBuffer.Append( TAMCommandBufferElement( aStatusRef, aURI ) );
-			}
-		}
-	
-	
-	
-	SetStatusL( aStatusRef, status );
-	RDEBUG( "CAmAdapter::AddNodeObject(): end" );
-	}
-
-
-	
-	
-// ------------------------------------------------------------------------------------------------
-// CAmAdapter::GetSizeL( const TDesC8& aURI, const TDesC& aParentLUID )
-// ------------------------------------------------------------------------------------------------
-TInt CAmAdapter::GetSizeL( const TDeplCompAttrType aDataType, const TInt aLuid, TError &aRet )
-	{
-	TInt size( 0 );
-	if ( aDataType == EDCStateValue )
-		{
-		TDeploymentComponent comp;
-		TInt err( SessionL().DeploymentComponent( aLuid, comp ) );
-		if ( err == KErrNone )
-			{
-			if ( comp.iState == EDCSActive )
-				{
-				size = KAMStateValueActive().Length();
-				}
-			else 
-				{
-				size = KAMStateValueInactive().Length() ;
-				}
-			aRet = EOk;
-			}
-		}
-	else 
-		{
-		size = SessionL().DeploymentComponentDataSizeL( aLuid, aDataType );
-		aRet = EOk;
-		}
-	return size;
-	}
-
-
-// ------------------------------------------------------------------------------------------------
-// CAmAdapter::FetchLeafObjectSizeL( const TDesC8& aURI, const TDesC& aParentLUID )
-// ------------------------------------------------------------------------------------------------
-void CAmAdapter::FetchLeafObjectSizeL( const TDesC8& aURI, const TDesC8& aLUID,
-									   const TDesC8& aType, TInt aResultsRef,
-									   TInt aStatusRef )
-	{
-
-
-
-	RDEBUG8_4("CAmAdapter::FetchLeafObjectSizeL('%S', '%S', '%S'): begin", &aURI, &aLUID, &aType );
-	CheckStateChangesL();
-	TError status( EError );
-	CBufBase *currentList = CBufFlat::NewL( 128 );
-	CleanupStack::PushL( currentList );
-	
-	TPtrC8 mapping( NSmlDmURI::LastURISeg( aURI ) );
-	TPtrC8 parent( NSmlDmURI::RemoveLastSeg( aURI ) );
-	TPtrC8 parentMapping( NSmlDmURI::LastURISeg( parent ) );
-	TInt size( 0 );
-	HBufC8 *luid = NULL;
-	if ( aLUID != KNullDesC8 )
-		{
-		luid = aLUID.AllocLC();
-		}
-	else 
-		{ // try if we find it from download path
-		TBuf8<256> down;
-		down = KDownloadURI;
-		down.Append ( parentMapping );
-		luid = Callback().GetLuidAllocL( down );
-		CleanupStack::PushL( luid );
-		if ( *luid != KNullDesC8 )
-			{ 
-			// make it to found next time
-			DirectSetMappingL( parent, *luid );
-			MoveAclL( down, parent );
-			
-			// remove old
-			DirectSetMappingL( down, KNullDesC8 );
-			}
-		}
-	TDeplCompAttrType dataType( UpdateFlagFromMapping( mapping ) );
-	if ( *luid != KNullDesC8 )
-		{
-		TUint32 iluid ( DesToIntL( *luid ) );
-		RDEBUG_2( "CAmAdapter::FetchLeafObjectSizeL(): Luid is : %d", iluid );
-	    size = GetSizeL( dataType, iluid, status );
-		}
-	else
-		{
-		TUint32 iluid( GetLeafLuidL( aURI, parentMapping ) );
-		if ( iluid > 0 )
-			{
-			HBufC8 *l = IntToDes8LC( iluid );
-			DirectSetMappingL( parent, *l );
-			CleanupStack::PopAndDestroy( l );
-			size = GetSizeL( dataType, iluid, status );
-			}
-		else
-			{
-			RDEBUG8_2( "CAmAdapter::FetchLeafObjectSizeL(): WARNING Faild to get luid allocation for '%S'", &parent );
-			if ( aLUID == KNullDesC8 )
-				{
-				status = ENotFound ;
-				}
-			}
-		}
-	SetStatusL( aStatusRef, status );
-	if( status == EOk && size > 0 )
-		{
-		HBufC8 *hsize = IntToDes8LC( size );
-		currentList->InsertL( 0, *hsize );
-		if ( iInAtomic )
-			{
-			iBuffer.Append( TAMCommandBufferElement( aStatusRef, aURI ) );
-			}
-		Callback().SetResultsL( aResultsRef, *currentList, aType );
-		CleanupStack::PopAndDestroy( hsize );
-		}
-	CleanupStack::PopAndDestroy( luid );
-	CleanupStack::PopAndDestroy( currentList ); //currentList	
-	}
-	
-	
-// ------------------------------------------------------------------------------------------------
-// CAmAdapter::ExecuteCommandL( const TDesC8& aURI, const TDesC& aParentLUID )
-// ------------------------------------------------------------------------------------------------
-void CAmAdapter::ExecuteCommandL( const TDesC8& /*aURI*/, const TDesC8& /*aLUID*/,
-								  RWriteStream*& /*aStream*/, const TDesC8& /*aType*/,
-								  TInt /*aStatusRef*/ )
-	{
-	RDEBUG("CAmAdapter::ExecuteCommandL(stream): begin (NOT SUPPORTED)");
-	User::Leave( KErrNotSupported );
-	}
-	
-
-// ------------------------------------------------------------------------------------------------
-// CAmAdapter::CopyCommandL( const TDesC8& aURI, const TDesC& aParentLUID )
-// ------------------------------------------------------------------------------------------------
-void CAmAdapter::CopyCommandL( const TDesC8& /*aTargetURI*/, const TDesC8& /*aTargetLUID*/,
-							   const TDesC8& /*aSourceURI*/, const TDesC8& /*aSourceLUID*/,
-							   const TDesC8& /*aType*/, TInt aStatusRef )
-	{
-	RDEBUG("CAmAdapter::CopyCommandL(): begin (NOT SUPPORTED)");
-	SetStatusL( aStatusRef, EError );
-	
-	}
-	
-
-// ------------------------------------------------------------------------------------------------
-// CAmAdapter::StartAtomicL(  )
-// ------------------------------------------------------------------------------------------------
-void CAmAdapter::StartAtomicL()
-	{
-	RDEBUG("CAmAdapter::StartAtomicL(): begin (NOT properly SUPPORTED)");
-	iInAtomic = ETrue ;
-	}
-	
-
-// ------------------------------------------------------------------------------------------------
-// CAmAdapter::CommitAtomicL(  )
-// ------------------------------------------------------------------------------------------------
-void CAmAdapter::CommitAtomicL()
-	{
-	RDEBUG("CAmAdapter::CommitAtomicL(): begin (NOT SUPPORTED)");
-	iInAtomic = EFalse ; // the initial statuses are already set
-	}
-	
-
-// ------------------------------------------------------------------------------------------------
-// CAmAdapter::RollbackAtomicL(  )
-// ------------------------------------------------------------------------------------------------
-void CAmAdapter::RollbackAtomicL()
-	{
-	RDEBUG("CAmAdapter::RollbackAtomicL(): begin (NOT properly SUPPORTED)");
-	TInt count( iBuffer.Count() );
-	for ( TInt i( 0 ); i < count; i++ )
-		{
-		TAMCommandBufferElement &pm( iBuffer[i] );
-		SetStatusL( pm.iStatusRef, ERollbackFailed );
-		}
-	}
-
-
-// ------------------------------------------------------------------------------------------------
-// CAmAdapter::StreamingSupport( )
-// ------------------------------------------------------------------------------------------------
-TBool CAmAdapter::StreamingSupport( TInt& aItemSize ) 
-	{
-	RDEBUG("CAmAdapter::StreamingSupport(): begin");
-	aItemSize = 1024;
-	RDEBUG("CAmAdapter::StreamingSupport(): end");
-	return ETrue;
-	}
-	
-
-// ------------------------------------------------------------------------------------------------
-// CAmAdapter::StreamCommittedL( )
-// ------------------------------------------------------------------------------------------------
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-void CAmAdapter::StreamCommittedL( RWriteStream& /*aStream*/ )
-#else
-void CAmAdapter::StreamCommittedL()
-#endif
-	{
-	RDEBUG("CAmAdapter::StreamCommittedL(): begin");
-
-	if(iStreamOpen)
-		{
-		iStream.CommitL();
-		}
-
-	MSmlDmAdapter::TError status = EOk;
-
-	TRAPD( err,	_UpdateLeafObjectL( *iStreamedURI, *iStreamedLuid, KNullDesC8(), *iStreamedType, iStatusRef, status ) );
-
-	if(err != KErrNone)
-	{
-		RDEBUG_2("CAmAdapter::StreamCommittedL(): _UpdateLeafObjectL returned error (%d)", err);
-	}
-	
-	iIsStreamedContent = EFalse;
-	iStreamOpen = EFalse;
-
-	Callback().SetStatusL( iStatusRef, status );		
-
-	RDEBUG("CAmAdapter::StreamCommittedL(): end");
-	}
-	
-// ------------------------------------------------------------------------------------------------
-// CAmAdapter::CloseStreaming( )
-// ------------------------------------------------------------------------------------------------
-void CAmAdapter::CloseStreaming()
-{
-	if( iStreamOpen )
-	{
-		RDEBUG("CAmAdapter::CloseStreaming(): closing");
-		iStreamFile.Close();  // !!! Closing this will also close the iStreamRFs because it is adopted from server
-		iStreamOpen = EFalse;
-	}
-}
-
-	
-// ------------------------------------------------------------------------------------------------
-// CAmAdapter::CompleteOutstandingCmdsL()
-// ------------------------------------------------------------------------------------------------
-void CAmAdapter::CompleteOutstandingCmdsL()
-	{
-	RDEBUG("CAmAdapter::CompleteOutstandingCmdsL(): begin");
-/*	iManagement.Close();
-	iSessionOpened = EFalse ;*/
-	iBuffer.Reset();
-	RDEBUG("CAmAdapter::CompleteOutstandingCmdsL(): Management session closed");
-	}
-
-
-
-// ------------------
-//
-// ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-const TImplementationProxy ImplementationTable[] = 
-	{
-	//
-	IMPLEMENTATION_PROXY_ENTRY( KAMAdapterImplUid, CAmAdapter::NewL )
-	};
-
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy( TInt& aTableCount )
-	{
-	aTableCount = sizeof( ImplementationTable ) / sizeof( TImplementationProxy );
-	return ImplementationTable;
-	}
-
-
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-TInt CAmAdapter::DesToIntL( const TDesC8& aLuid )
-	{
-	TLex8 lex( aLuid );
-	TInt value = 0;
-	User::LeaveIfError( lex.Val( value ) );
-	return value;
-	}
-
-
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-HBufC8* CAmAdapter::IntToDes8LC( const TInt aLuid )
-	{
-	HBufC8* buf = HBufC8::NewLC( 10 ); //10 = max length of 32bit integer
-	TPtr8 ptrBuf = buf->Des();
-	ptrBuf.Num( aLuid );
-	return buf;
-	}
-
-
-
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-void CAmAdapter::ConstructL()
-	{
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-	iDbSession.ConnectL();
-#else
-	User::LeaveIfError( iDbSession.Connect());
-#endif
-	}
-
-// ------------------------------------------------------------------------------------------------
-// CAmAdapter::SetStatusL( TInt aStatusRef, MSmlDmAdapter::TError aErrorCode ) 
-// ------------------------------------------------------------------------------------------------
-void CAmAdapter::SetStatusL( TInt aStatusRef,
-						 MSmlDmAdapter::TError aErrorCode ) 
-	{
-	RDEBUG_3("CAmAdapter::SetStatusL( %d, %d )", aStatusRef, aErrorCode );
-	Callback().SetStatusL( aStatusRef, aErrorCode );
-	}
-							 
-// ------------------------------------------------------------------------------------------------
-// CAmAdapter::SetResultsL( TInt aResultsRef, CBufBase& aObject, const TDesC8& aType )
-// ------------------------------------------------------------------------------------------------
-void CAmAdapter::SetResultsL( TInt aResultsRef, CBufBase& aObject,
-						  const TDesC8& aType )
-	{
-	Callback().SetResultsL( aResultsRef, aObject, aType );
-	
-	}
-							  
-// -------------------------------------------------------------------------------------
-// CAmAdapter::FillNodeInfoL()
-// Fills the node info in ddf structure
-// -------------------------------------------------------------------------------------
-void CAmAdapter::FillNodeInfoL( MSmlDmDDFObject& aNode,TSmlDmAccessTypes aAccTypes,
-		MSmlDmDDFObject::TOccurence aOccurrence, MSmlDmDDFObject::TScope aScope, 
-		MSmlDmDDFObject::TDFFormat aFormat,const TDesC8& aDescription)
-	{
-	FillNodeInfoNoDefaultMimeL( aNode, aAccTypes, aOccurrence, aScope, aFormat, aDescription );
-	if(aFormat!=MSmlDmDDFObject::ENode)
-		{
-		aNode.AddDFTypeMimeTypeL(KAMTextPlain);
-		}
-	
-	}
-
-
-// -------------------------------------------------------------------------------------
-// CAmAdapter::FillNodeInfoNoDefaultMimeL()
-// Fills the node info in ddf structure, without default mime type
-// -------------------------------------------------------------------------------------
-void CAmAdapter::FillNodeInfoNoDefaultMimeL( MSmlDmDDFObject& aNode,TSmlDmAccessTypes aAccTypes,
-		MSmlDmDDFObject::TOccurence aOccurrence, MSmlDmDDFObject::TScope aScope, 
-		MSmlDmDDFObject::TDFFormat aFormat,const TDesC8& aDescription)
-	{
-	aNode.SetAccessTypesL(aAccTypes);
-	aNode.SetOccurenceL(aOccurrence);
-	aNode.SetScopeL(aScope);
-	aNode.SetDFFormatL(aFormat);
-	
-	aNode.SetDescriptionL(aDescription);
-	}
-	
-// -------------------------------------------------------------------------------------
-// CAmAdapter::CheckStateChangesInternalL()
-// Updates the changed DC states to DM client mappings and ACLs
-// -------------------------------------------------------------------------------------
-void CAmAdapter::CheckStateChangesInternalL()
-	{
-
-
-#ifdef __AM_CHECKSTATE_CHANGES
-	RDEBUG( "CAmAdapter::CheckStateChangesLInternal(): begin" );	
-	if ( !iUpdated )
-		{
-		RDEBUG( "CAmAdapter::CheckStateChangesLInternal(): !iUpdated" );
-		RElementIdArray arr;
-		CleanupClosePushL( arr );
-		TInt err( SessionL().StateChangingDCIdsL( arr ) );
-		if ( err == KErrNone )
-			{
-			TInt c( arr.Count() );
-			for( TInt i( 0 ); i < c; i++ )
-				{
-				TDeploymentComponent comp ;
-				err = iManagement.DeploymentComponent( arr[i], comp );
-				if ( err == KErrNone )
-					{
-					TDCUserId dc;
-					SessionL().DeploymentComponentUserIdL( arr[i], dc );
-					const TInt KNSmlDmMaxUriLength = 256;
-					HBufC8 *uri = HBufC8::NewLC( KNSmlDmMaxUriLength );
-					TPtr8 puri( uri->Des() );
-#ifdef __TARM_SYMBIAN_CONVERGENCY					
-					RDmTreeNode uriNode;
-					CleanupClosePushL(uriNode);
-
-					RBuf8 acl;
-					acl.CreateL(128);
-					CleanupClosePushL(acl);
-					
-					HBufC8 *newUri = HBufC8::NewLC( KNSmlDmMaxUriLength );
-					TPtr8 pnewUri( newUri->Des() );
-								
-					RDmTreeNode newUriNode;
-					CleanupClosePushL(newUriNode);
-#else
-					CBufBase* acl = CBufFlat::NewL( 128 );
-					CleanupStack::PushL( acl );
-				
-					HBufC8 *newUri = HBufC8::NewLC( KNSmlDmMaxUriLength );
-					TPtr8 pnewUri( newUri->Des() );
-
-#endif
-					
-					switch ( comp.iOldState ) 
-						{
-						case EDCSDelivered:
-							{
-							RDEBUG( "CAmAdapter::CheckStateChangesLInternal(): Old State = EDCSDelivered" );
-							puri.Copy( KDeliveredURI() );
-							puri.Append( dc );
-					
-							HBufC8 *luid = DirectGetLuidAllocLC( puri );
-							
-							if ( *luid == KNullDesC8 )
-								{ 
-                                        // try if we find it from download path
-                                        puri.Zero();
-                                        puri.Copy( KDownloadURI() );
-                                        puri.Append( dc );                                       
-                                        luid = DirectGetLuidAllocLC( puri );     
-								}
-							
-							// check if the luid is still null
-							
-							if ( *luid != KNullDesC8 )
-								{
-								// "Nullify" the old mapping 
-								//DirectSetMappingL( puri, KNullDesC8 );
-								DirectRemoveMappingL(puri);
-#ifdef __TARM_SYMBIAN_CONVERGENCY								
-								iDbSession.OpenNodeL(puri, uriNode, RDmTree::EReadOnly);
-								uriNode.DmPropertyL( DevMan::EACL, acl );
-#else
-								err = iDbSession.GetAclL(puri, *acl, EFalse ); // no need for inherited
-#endif										
-								// Determine new uri 
-								switch( comp.iState )
-									{
-									case EDCSActive:
-									case EDCSInactive: // both have same node
-										{
-										pnewUri.Copy( KDeployedURI() );
-										pnewUri.Append( dc );
-										DirectSetMappingL( pnewUri, *luid );	
-										if ( err == KErrNone )
-											{
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-											iDbSession.OpenNodeL(pnewUri, newUriNode, RDmTree::EReadOnly);
-											uriNode.RemoveDmPropertyL( DevMan::EACL );
-											newUriNode.SetDmPropertyL( DevMan::EACL, acl );
-#else
-											err = iDbSession.DeleteAclL( puri );
-											
-											err = iDbSession.UpdateAclL( pnewUri, acl->Ptr( 0 ) );
-#endif
-											}
-										else
-											{
-											RDEBUG_2("CAmAdapter::CheckStateChangesL: ERROR Failed to get acl from %d ", err );
-											}
-										iManagement.StateChangeComplete( arr[i] );							
-										break;
-										}
-									default:
-										{
-										
-										RDEBUG_2("CAmAdapter::CheckStateChangesL: WARNING Illegal state change from delivered to %d ", comp.iState );
-			
-										break;
-										}
-									}	
-								}
-							else
-                                {
-                                // probably moved already
-                                iManagement.StateChangeComplete( arr[i] );
-                                }
-							
-							CleanupStack::PopAndDestroy( luid );		
-							break;
-							}
-						case EDCSDownload:
-							{
-							RDEBUG( "CAmAdapter::CheckStateChangesLInternal(): Old State = EDCSDownload" );
-							puri.Copy( KDownloadURI() );
-							puri.Append( dc );
-							HBufC8 *luid = DirectGetLuidAllocLC( puri ); //Callback().GetLuidAllocL( puri );
-							//CleanupStack::PushL( luid );
-							if ( *luid == KNullDesC8 )
-								{ // probably moved already
-								CleanupStack::PopAndDestroy( luid );
-								puri.Copy( KDeliveredURI() );
-								puri.Append( dc );
-								luid = DirectGetLuidAllocLC( puri ); //Callback().GetLuidAllocL( puri );
-								if ( *luid == KNullDesC8 )
-								{ // probably moved already
-							
-									iManagement.StateChangeComplete( arr[i] );
-									
-								}
-								}
-							else
-								{
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-								iDbSession.OpenNodeL(puri, uriNode, RDmTree::EReadOnly);
-								uriNode.DmPropertyL( DevMan::EACL, acl );
-#else
-								err = iDbSession.GetAclL(puri, *acl, EFalse ); // no need for inherited
-#endif							
-								// "Nullify" the old mapping 
-								//DirectSetMappingL( puri, KNullDesC8 );
-								DirectRemoveMappingL(puri);
-								switch( comp.iState )
-									{
-									case EDCSActive:
-									case EDCSInactive: // both have same node
-										{
-										pnewUri.Copy( KDeployedURI() );
-										pnewUri.Append( dc );
-										DirectSetMappingL( pnewUri, *luid );	
-										if ( err == KErrNone )
-											{
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-											iDbSession.OpenNodeL(pnewUri, newUriNode, RDmTree::EReadOnly);
-											uriNode.RemoveDmPropertyL( DevMan::EACL );
-											newUriNode.SetDmPropertyL( DevMan::EACL, acl );
-#else											
-											err = iDbSession.DeleteAclL( puri );
-											err = iDbSession.UpdateAclL( pnewUri, acl->Ptr( 0 ) );
-#endif
-											}
-										else
-											{
-											RDEBUG_2("CAmAdapter::CheckStateChangesL: ERROR Failed to get acl from %d ", err );
-											}
-										iManagement.StateChangeComplete( arr[i] );							
-										break;
-										}
-									case EDCSDelivered:
-										{
-										RDEBUG( "CAmAdapter::CheckStateChangesLInternal(): Current State = EDCSDelivered" );
-										pnewUri.Copy( KDeliveredURI() );
-										pnewUri.Append( dc );
-										DirectSetMappingL( pnewUri, *luid );
-										if ( err == KErrNone )
-											{
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-											iDbSession.OpenNodeL(pnewUri, newUriNode, RDmTree::EReadOnly);
-											uriNode.RemoveDmPropertyL( DevMan::EACL );
-											newUriNode.SetDmPropertyL( DevMan::EACL, acl );
-#else
-											
-											err = iDbSession.DeleteAclL( puri );
-											err = iDbSession.UpdateAclL( pnewUri, acl->Ptr( 0 ) );
-#endif
-											}
-										else
-											{
-											RDEBUG_2("CAmAdapter::CheckStateChangesL: ERROR Failed to get acl from %d ", err );
-											}
-										iManagement.StateChangeComplete( arr[i] );								
-										break;
-										}
-									default:
-										{
-										
-										RDEBUG_2("CAmAdapter::CheckStateChangesL: WARNING Illegal state change from delivered to %d ", comp.iState );
-										break;
-										}
-									}
-							
-								}
-							CleanupStack::PopAndDestroy( luid );		
-							break;
-							}
-						case EDCSActive:
-						case EDCSInactive: // these both are in same node
-							{
-							if (comp.iState == EDCSDelete)
-							    {
-		                         puri.Copy( KDeployedURI());
-		                         puri.Append( dc ); 
-		                         HBufC8 *bufLuid = DirectGetLuidAllocLC( puri );
-		                         TUint32 luid = DesToIntL( *bufLuid ) ;
-		                         TRAPD(err,SessionL().RemoveL( luid ));
-		                         if ( err == KErrNone || err == KErrNotFound )
-		                             {}
-		                         DirectRemoveMappingL(puri);
-		                         iManagement.StateChangeComplete( arr[i] );
-		                         CleanupStack::PopAndDestroy(bufLuid);
-		                         RDEBUG("CAmAdapter::CheckStateChangesL:DirectRemoveMappingL for comp with istate EDCSDelete " );
-		                         break;
-							    }
-							RDEBUG_3("CAmAdapter::CheckStateChangesL: No need to move anything in change from %d to %d ", comp.iOldState, comp.iState );
-							iManagement.StateChangeComplete( arr[i] );								
-							break;
-							}
-						}
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-					CleanupStack::PopAndDestroy( &newUriNode );
-					CleanupStack::PopAndDestroy( newUri );
-					CleanupStack::PopAndDestroy( &uriNode );
-					CleanupStack::PopAndDestroy( &acl );
-					CleanupStack::PopAndDestroy( uri );
-#else
-					CleanupStack::PopAndDestroy( newUri );	
-					CleanupStack::PopAndDestroy( acl );
-					CleanupStack::PopAndDestroy( uri );			
-#endif
-					}
-				else
-					{
-					RDEBUG_2("CAmAdapter::CheckStateChangesL: ERROR Failed to get component: %d ", err );				
-					}
-				}
-			iUpdated = ETrue;
-			}
-		else
-			{
-			RDEBUG_2("CAmAdapter::CheckStateChangesL: ERROR Failed to get state change dcs: %d ", err );				
-			}
-		CleanupStack::PopAndDestroy( &arr );
-		}
-	else
-		{
-		RDEBUG("CAmAdapter::CheckStateChangesL: Already updated! ");				
-		}
-	RDEBUG( "CAmAdapter::CheckStateChangesL(): end" );	
-#else
-	DBG_ARGS8( "CAmAdapter::CheckStateChangesL(): disabled" );	
-#endif
-	}
-
-
-// -------------------------------------------------------------------------------------
-// CAmAdapter::CheckStateChangesL()
-// Updates acl and mapping trees to match state changes
-// -------------------------------------------------------------------------------------
-void CAmAdapter::CheckStateChangesL()	
-	{
-	iCertRequired = EFalse ;
-	RDEBUG( "CAmAdapter::CheckStateChangesL(): iCertRequired = EFalse" );
-	TRAPD( err, CheckStateChangesInternalL() );
-	if ( err != KErrNone )
-		{
-		RDEBUG_2("CAmAdapter::CheckStateChangesL(): warning failed to check state changes %d", err );
-		}
-	iCertRequired = ETrue ;
-	RDEBUG( "CAmAdapter::CheckStateChangesL(): iCertRequired = ETrue" );
-	if ( !iTrustAdded )
-		{
-			RDEBUG( "CAmAdapter::CheckStateChangesL(): Adding Trust Closing Session" );
-			iManagement.Close();
-			iSessionOpened = EFalse;
-			RApplicationManagement &session = SessionL();
-			RDEBUG( "CAmAdapter::CheckStateChangesL(): Adding Trust new session started" );
-		}
-	}
-
-		
-// -------------------------------------------------------------------------------------
-// CAmAdapter::URISegsUpTo(const TDesC8& aURI, TInt aUpTo)
-// -------------------------------------------------------------------------------------
-TPtrC8 CAmAdapter::URISegsUpTo( const TDesC8& aURI, TInt aUpTo, TBool aInclKeno/*=EFalse*/)
-	{
-
-
-
-	TPtrC8 ret;
-	TInt numOfURISegs( 0 );
-	for( TInt i( 0 ); i < aURI.Length() && ret.Ptr() == NULL; i++ )
-		{
-		if( aURI[i] == KNSmlDMUriSeparator )
-			{
-			numOfURISegs++;
-			if( aUpTo == numOfURISegs )
-				{
-				if( aInclKeno && aURI.Length() > i+1)
-					{
-					ret.Set( aURI.Left( i + 1 ) );
-					}
-				else
-					{
-					ret.Set( aURI.Left( i ) );
-					}
-				}
-			}
-		}
-	return ret;
-	}
-	
-		
-// -------------------------------------------------------------------------------------
-// CAmAdapter::DirectGetLuidAllocLC( const TDesC8 &aURI )
-// -------------------------------------------------------------------------------------	
-HBufC8 *CAmAdapter::DirectGetLuidAllocLC( const TDesC8 &aURI )
-	{
-
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-	HBufC8 *ret = Callback().GetLuidAllocL( aURI );
-#else
-	HBufC8* ret = iDbSession.GetLuidAllocL( KAMAdapterImplUid, aURI );
-#endif
-	
-	CleanupStack::PushL( ret );
-	return ret;
-	}
-	
-	
-// -------------------------------------------------------------------------------------
-// CAmAdapter::DirectSetMappingL( const TDesC8 &aURI, const TDesC8 &aLUID )
-// -------------------------------------------------------------------------------------		
-TInt CAmAdapter::DirectSetMappingL( const TDesC8 &aURI, const TDesC8 &aLUID )
-	{
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-	TRAPD( err, Callback().SetMappingL( aURI, aLUID ) );
-#else
-	TInt err( iDbSession.AddMappingInfoL( KAMAdapterImplUid, aURI, aLUID ) );
-#endif
-	return err;
-	}
-	
-// -------------------------------------------------------------------------------------
-// CAmAdapter::DirectRemoveMappingL( const TDesC8 &aURI )
-// -------------------------------------------------------------------------------------        
-TInt CAmAdapter::DirectRemoveMappingL( const TDesC8 &aURI )
-    {
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-    TRAPD( err, Callback().SetMappingL( aURI, aLUID ) );
-#else
-    TInt err( iDbSession.RemoveMappingInfoL( KAMAdapterImplUid, aURI, ETrue ) );
-#endif
-    return err;
-    }
-	
-// -------------------------------------------------------------------------------------
-// CAmAdapter::MoveAclL( const TDesC8 &aFrom, const TDesC8 &aTo )
-// -------------------------------------------------------------------------------------		
-void CAmAdapter::MoveAclL( const TDesC8 &aFrom, const TDesC8 &aTo )
-	{	
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-	RDmTreeNode from;
-	CleanupClosePushL(from);
-
-	RDmTreeNode to;
-	CleanupClosePushL(to);
-
-	RBuf8 acl;
-	acl.CreateL(128);
-	CleanupClosePushL(acl);
-
-	iDbSession.OpenNodeL(aFrom, from, RDmTree::EReadOnly);
-	TRAPD( err, from.DmPropertyL( DevMan::EACL, acl ) );
-	if ( err == KErrNone )
-		{
-		iDbSession.OpenNodeL(aTo, to, RDmTree::EReadOnly);
-		from.RemoveDmPropertyL( DevMan::EACL );
-		to.SetDmPropertyL( DevMan::EACL, acl );
-		}
-	CleanupStack::PopAndDestroy( 3, &from );
-#else
-	CBufBase *acl = CBufFlat::NewL( 128 );
-	CleanupStack::PushL( acl );
-	TInt err  (iDbSession.GetAclL(aFrom, *acl, EFalse ) ); // no need for inherited
-	if ( err == KErrNone )
-		{
-		err = iDbSession.DeleteAclL( aFrom );
-		err = iDbSession.UpdateAclL( aTo, acl->Ptr( 0 ) );
-		}
-	CleanupStack::PopAndDestroy( acl );
-#endif
-	}
-
-
-// -------------------------------------------------------------------------------------
-// CAmAdapter::SetMappingL( const TDesC8 &aOriginalURI, 
-//	const TDeploymentComponentState aTargetState, const TDesC8 &aLUID )
-// -------------------------------------------------------------------------------------		
-void CAmAdapter::SetMappingL( const TDesC8 &aOriginalURI, 
-	const TDeploymentComponentState aTargetState, const TDesC8 &aLUID )
-	{
-
-
-	HBufC8 * targeturi = NULL;
-	SetMappingLC( aOriginalURI, aTargetState, aLUID, targeturi );
-	CleanupStack::PopAndDestroy( targeturi );
-	}
-
-
-// -------------------------------------------------------------------------------------
-// CAmAdapter::SetMappingLC( const TDesC8 &aOriginalURI, 
-//	const TDeploymentComponentState aTargetState, const TDesC8 &aLUID, 
-//	HBufC8 *&aNewUri )
-// -------------------------------------------------------------------------------------		
-void CAmAdapter::SetMappingLC( const TDesC8 &aOriginalURI, 
-	const TDeploymentComponentState aTargetState, const TDesC8 &aLUID, HBufC8 *&aNewUri )
-	{
-
-	
-	// "Nullify" the mapping for argument
-	DirectSetMappingL( aOriginalURI, KNullDesC8 );
-	
-	// Determine new uri for aArgument
-	TPtrC8 puri;
-	if ( aNewUri == NULL )	
-		{
-		TPtrC8 argMapping( NSmlDmURI::LastURISeg( aOriginalURI ) );
-		TPtrC8 target;
-		if ( aTargetState == EDCSInactive || aTargetState == EDCSActive )
-			{
-			target.Set( KDeployedURI() );
-			}
-		else if ( aTargetState == EDCSDelivered )
-			{
-			target.Set( KDeliveredURI() );
-			}
-		else
-			{
-			
-			User::Leave( KErrArgument );
-			}
-	
-		aNewUri = HBufC8::NewLC( target.Length() + argMapping.Length() );
-		TPtr8 p( aNewUri->Des() );
-		p.Copy( target );
-		p.Append( argMapping );
-		puri.Set( p );
-		}
-	else
-		{
-		puri.Set( *aNewUri );
-		}
-	DirectSetMappingL( puri, aLUID );
-	MoveAclL( aOriginalURI, puri );
-	}
-
-
-#ifdef __AM_LASTERROR_NODE
-// ------------------------------------------------------------------------------------------------
-// CAmAdapter::SetLastErrorL( const TDesC8& aLastError, const TInt aError )
-// ------------------------------------------------------------------------------------------------	
-void CAmAdapter::SetLastErrorL( const TDesC8& aLastError, const TInt aError )
-	{
-	if ( iLastError )
-		{
-		TPtrC8 p(*iLastError);
-		RDEBUG8_2( "CAmAdapter::SetLastErrorL: clearing last error %S", &p);
-		delete iLastError;
-		iLastError = NULL;
-		}
-	iLastError = HBufC8::NewL( aLastError.Length() + 10);
-	iLastError->Des().Format( aLastError, aError );
-	}
-	
-const TDesC8& CAmAdapter::LastError()
-	{
-	return iLastError == NULL ? KNullDesC8() : *iLastError;
-	}
-	
-#endif
-
-TPtrC8 CAmAdapter::LastURISeg(const TDesC8& aURI)
-    {
-    TInt i;
-    for(i=aURI.Length()-1;i>=0;i--)
-        {
-        if(aURI[i]==KNSmlDMAMSeparatorDef)
-            {
-            break;
-            }
-        }
-    if(i==0)
-        {
-        return aURI;
-        }
-    else
-        {
-        return aURI.Mid(i+1);
-        }
-    }
-
-TInt CAmAdapter::DesToInt(const TDesC8& aLuid)
-    {
-    TLex8 lex(aLuid);
-    TInt value = 0;
-    lex.Val(value);
-    return value;
-    }
-TInt CAmAdapter::GetAdapterValue()
-    {
-    TInt adapterValue;
-    CRepository *repository = NULL;
-    TRAPD( err, repository = CRepository::NewL ( KCRUidPrivateApplicationManagementKeys ) );
-    if (err == KErrNone)
-        {
-        err = repository->Get(KAMAdapterValue, adapterValue);
-        }
-    delete repository;
-    repository = NULL;
-    return adapterValue;
-    }
-
-void CAmAdapter::SetAdapterValue(TInt aAdapterValue)
-    {
-    
-    CRepository *repository = NULL;
-    TRAPD( err, repository = CRepository::NewL ( KCRUidPrivateApplicationManagementKeys ) );
-    if (err == KErrNone)
-        {
-        err = repository->Set(KAMAdapterValue, aAdapterValue);
-        }
-    delete repository;
-    repository = NULL;
-    }
-
-// End of File
-
--- a/applicationmanagement/amadapter2/src/amadapter.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-/*
-* 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: 
-*       Registery info for Application Management DM Adapter.
-*
-*/
-
-
-#include <registryinfo.rh>
-#define KSmlDMInterfaceUid 0x102018B4
-
-RESOURCE REGISTRY_INFO theRegistryInfo
-  {
-  dll_uid = 0x10207844; //The DLL's 3rd UID.
-  interfaces = 
-      {
-      INTERFACE_INFO
-          {
-          interface_uid = KSmlDMInterfaceUid; // DM interface UID
-          implementations = 
-            {
-            IMPLEMENTATION_INFO
-                {
-                implementation_uid = 0x10207845; // SCM DM Adapter implementation UID
-                version_no = 1; 
-                display_name = "Application Management DM Adapter";
-                default_data = "";
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-                opaque_data = "host=0x101F9A02";
-#else
-								opaque_data = "";
-#endif
-                }
-            };
-          }
-      };
-    }
-
-// End of File
--- a/applicationmanagement/amadapter2/src/nsmldmiapmatcher.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,235 +0,0 @@
-/*
-* 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:  DM Tree module
-*
-*/
-
-
-// ------------------------------------------------------------------------------------------------
-// Includes
-// ------------------------------------------------------------------------------------------------
-
-#include <utf.h>
-#include "nsmldmiapmatcher.h"
-#include <smldmadapter.h>
-#include <featmgr.h>
-
-// ------------------------------------------------------------------------------------------------
-// CNSmlDMIAPMatcher* CNSmlDMIAPMatcher::NewL( MSmlDmCallback* aDmCallback )
-// ------------------------------------------------------------------------------------------------
-CNSmlDMIAPMatcher* CNSmlDMIAPMatcher::NewL( 
-	MSmlDmCallback* aDmCallback )
-    {
-    CNSmlDMIAPMatcher* self = CNSmlDMIAPMatcher::NewLC( aDmCallback );	
-    CleanupStack::Pop();
-    return self;
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CNSmlDMIAPMatcher* CNSmlDMIAPMatcher::NewLC( MSmlDmCallback* aDmCallback )
-// ------------------------------------------------------------------------------------------------
-CNSmlDMIAPMatcher* CNSmlDMIAPMatcher::NewLC(
-	MSmlDmCallback* aDmCallback )
-    {
-    CNSmlDMIAPMatcher* self = new( ELeave ) CNSmlDMIAPMatcher;
-    CleanupStack::PushL( self );
-    self->ConstructL( aDmCallback );
-    return self;
-    }
-
-// ------------------------------------------------------------------------------------------------
-// void CNSmlDMIAPMatcher::ConstructL( MSmlDmCallback* aDmCallback )
-// ------------------------------------------------------------------------------------------------
-void CNSmlDMIAPMatcher::ConstructL( MSmlDmCallback* aDmCallback )
-    {
-    iCallback = aDmCallback;
-    FeatureManager::InitializeLibL();
-    iFeatMgrInitialized = ETrue;
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CNSmlDMIAPMatcher::~CNSmlDMIAPMatcher()
-// ------------------------------------------------------------------------------------------------
-CNSmlDMIAPMatcher::~CNSmlDMIAPMatcher()
-    {
-    	if(iFeatMgrInitialized)
-    		{
-    			FeatureManager::UnInitializeLib();
-    		}
-    }
-
-// ------------------------------------------------------------------------------------------------
-// TInt CNSmlDMIAPMatcher::IAPIdFromURIL( const TDesC8& aURI )
-// ------------------------------------------------------------------------------------------------
-TInt CNSmlDMIAPMatcher::IAPIdFromURIL( const TDesC8& aURI )
-    {
-    TInt iapId(KErrNotFound);
-
-	MSmlDmAdapter::TError status;
-	CBufBase* allIAPs = CBufFlat::NewL(16);
-	CleanupStack::PushL(allIAPs);
-	iCallback->FetchLinkL( GetConRef(), *allIAPs, status );
-	TPtrC8 uri = RemoveDotSlash(aURI);
-
-    if( status == MSmlDmAdapter::EOk &&
-        uri.Find(GetConRef()) == 0 &&
-        allIAPs->Ptr(0).Find(LastURISeg(uri))>=0)
-        {
-        HBufC8* luid = iCallback->GetLuidAllocL( uri ); 
-
-        if ( luid->Length() )
-            {
-            iapId = DesToInt(*luid);
-            } 
-        delete luid;
-        }
-
-    CleanupStack::PopAndDestroy(allIAPs);
-    
-    return iapId;
-    }
-
-// ------------------------------------------------------------------------------------------------
-// HBufC8* CNSmlDMIAPMatcher::URIFromIAPIdL( TInt aIAPId )
-// ------------------------------------------------------------------------------------------------
-HBufC8* CNSmlDMIAPMatcher::URIFromIAPIdL( TInt aIAPId )
-    {
-    CBufBase *allIAPs = CBufFlat::NewL(16);
-	CleanupStack::PushL(allIAPs);
-    MSmlDmAdapter::TError status;
-
-    iCallback->FetchLinkL( GetConRef(), *allIAPs, status );
-
-    if ( status == MSmlDmAdapter::EOk )
-        {   
-        TInt index(0);
-        TInt segStart(0);
-
-        while ( index != KErrNotFound)
-            {                
-            TPtrC8 allIAPsptr = allIAPs->Ptr(segStart).Mid(0);
-            index = allIAPsptr.Locate('/');
-            HBufC8* uriSeg = 0;
-
-            if ( index == KErrNotFound )
-                {
-                TPtrC8 uriSeg8Ptr = allIAPs->Ptr(segStart);
-                uriSeg = uriSeg8Ptr.AllocLC();
-                }
-            else
-                {
-                TPtrC8 uriSeg8Ptr = allIAPs->Ptr(segStart).Mid( 0, index );
-                uriSeg = uriSeg8Ptr.AllocLC();
-                }
-
-            HBufC8* uri = HBufC8::NewLC( GetConRef().Length() + 1 +
-            	uriSeg->Length() );
-            	
-			TPtr8 uriPtr = uri->Des();
-			uriPtr.Format( GetConRef());
-			uriPtr.Append( KNSmlDMSeparator8 );
-			uriPtr.Append( *uriSeg );
-			HBufC8* luid = iCallback->GetLuidAllocL( uriPtr );
-			CleanupStack::PushL(luid);
-
-			if ( luid->Length() > 0 )
-				{				
-				TInt iapId = DesToInt(luid->Des());
-				if ( iapId == aIAPId )
-					{
-		            CleanupStack::PopAndDestroy();  //luid
-		            CleanupStack::Pop();  //uri
-		            CleanupStack::PopAndDestroy(2);  //uriSeg, allIAPs
-		            return uri;
-					}
-				}
-            CleanupStack::PopAndDestroy(3); // luid, uri, uriSeg
-
-            segStart += index + 1;
-            }        
-        }
-
-    CleanupStack::PopAndDestroy(); // allIAPs
-
-    return 0;
-    }
-
-// ------------------------------------------------------------------------------------------------
-// TInt CNSmlDMIAPMatcher::DesToInt(const TDesC& aLuid)
-// ------------------------------------------------------------------------------------------------
-TInt CNSmlDMIAPMatcher::DesToInt(const TDesC8& aLuid) const
-	{
-	TLex8 lex(aLuid);
-	TInt value = 0;
-	lex.Val(value);
-	return value;
-	}
-
-// ------------------------------------------------------------------------------------------------
-// TPtrC8 CNSmlDMIAPMatcher::RemoveDotSlash(const TDesC8& aURI) const
-// ------------------------------------------------------------------------------------------------
-TPtrC8 CNSmlDMIAPMatcher::RemoveDotSlash(const TDesC8& aURI) const
-	{
-	if(aURI.Find(KNSmlDMIAPUriDotSlash)==0)
-		{
-		return aURI.Right( aURI.Length()-KNSmlDMIAPUriDotSlash().Length() );
-		}
-	else
-		{
-		return aURI;
-		}
-	}
-
-// ------------------------------------------------------------------------------------------------
-// CNSmlDMIAPMatcher::TPtrC8 LastURISeg(const TDesC8& aURI)
-// Returns only the last uri segemnt
-// ------------------------------------------------------------------------------------------------
-TPtrC8 CNSmlDMIAPMatcher::LastURISeg(const TDesC8& aURI) const
-	{
-	TInt i;
-	for(i=aURI.Length()-1;i>=0;i--)
-		{
-		if(aURI[i]==KNSmlDMSlash)
-			{
-			break;
-			}
-		}
-	if(i==0)
-		{
-		return aURI;
-		}
-	else
-		{
-		return aURI.Mid(i+1);
-		}
-	}
-	
-// ------------------------------------------------------------------------------------------------
-// CNSmlDMIAPMatcher::const TDesC8& GetConRef()
-// Returns the connection reference
-// ------------------------------------------------------------------------------------------------
-const TDesC8& CNSmlDMIAPMatcher::GetConRef()
-	{
-	if(FeatureManager::FeatureSupported(KFeatureIdFfDmConnmoAdapter))
-		{
-			return KNSmlDMConnMOIAPUri();
-		}
-	else
-		{
-			return KNSmlDMIAPUri();
-		}	
-  }
-  
-
-
--- a/applicationmanagement/amadapter2/src/nsmldmuri.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,208 +0,0 @@
-/*
-* 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:  DM Utilities
-*
-*/
-
-
-#include "nsmldmuri.h"
-
-// ===========================================================================
-// NSmlDmURI
-// ===========================================================================
-
-// ------------------------------------------------------------------------------------------------
-// TPtrC8 NSmlDmURI::ParentURI(const TDesC8& aURI)
-// returns parent uri, i.e. removes last uri segment
-// ------------------------------------------------------------------------------------------------
-TPtrC8 NSmlDmURI::ParentURI(const TDesC8& aURI)
-	{
-	TBool onlyOneSeg = ETrue;
-	TInt i;
-	for(i=aURI.Length()-1;i>=0;i--)
-		{
-		if(aURI[i]==KNSmlDMUriSeparator)
-			{
-			onlyOneSeg = EFalse;
-			break;
-			}
-		}
-	if(onlyOneSeg)
-		{
-		return KNSmlDmRootUri();
-		}
-	else
-		{
-		return aURI.Left(i);
-		}
-	}
-
-// ------------------------------------------------------------------------------------------------
-// TPtrC8 NSmlDmURI::LastURISeg(const TDesC8& aURI)
-// Returns only the last uri segemnt
-// ------------------------------------------------------------------------------------------------
-TPtrC8 NSmlDmURI::LastURISeg(const TDesC8& aURI)
-	{
-	TInt i;
-	for(i=aURI.Length()-1;i>=0;i--)
-		{
-		if(aURI[i]==KNSmlDMUriSeparator)
-			{
-			break;
-			}
-		}
-	if(i==0)
-		{
-		return aURI;
-		}
-	else
-		{
-		return aURI.Mid(i+1);
-		}
-	}
-
-// ------------------------------------------------------------------------------------------------
-// TPtrC8 NSmlDmURI::RemoveDotSlash(const TDesC8& aURI)
-// return uri without dot and slash in start
-// ------------------------------------------------------------------------------------------------
-TPtrC8 NSmlDmURI::RemoveDotSlash(const TDesC8& aURI)
-	{
-
-	TInt offset = 0;
-	TInt endSlash = 0;
-
-	if(aURI.Find(KNSmlDmUriDotSlash)==0)
-		{
-		offset = 2;
-		}
-	else
-		{
-		return aURI;
-		}
-
-	if(aURI.Length()>2&&aURI[aURI.Length()-1]==KNSmlDMUriSeparator)
-		{
-		endSlash = 1;
-		}
-
-	return aURI.Mid(offset,aURI.Length()-endSlash-offset);
-	}
-
-// ------------------------------------------------------------------------------------------------
-// TPtrC8 NSmlDmURI::RemoveProp(const TDesC8& aURI)
-// removes property from the uri
-// ------------------------------------------------------------------------------------------------
-TPtrC8 NSmlDmURI::RemoveProp(const TDesC8& aURI)
-	{
-	TInt offset = aURI.Find(KNSmlDmQuestionMark);
-	if(offset!=KErrNotFound)
-		{
-		return aURI.Left(offset); 
-		}
-	return aURI;
-	}
-
-// ------------------------------------------------------------------------------------------------
-// TPtrC8 NSmlDmURI::RemoveLastSeg(const TDesC8& aURI)
-// Removes last uri segment
-// ------------------------------------------------------------------------------------------------
-TPtrC8 NSmlDmURI::RemoveLastSeg(const TDesC8& aURI)
-	{
-	TInt i;
-	for(i=aURI.Length()-1;i>=0;i--)
-		{
-		if(aURI[i]==KNSmlDMUriSeparator)
-			{
-			break;
-			}
-		}
-
-	if(i>0)
-		{
-		return aURI.Left(i);
-		}
-	else
-		{
-		return KNullDesC8();
-		}
-	}
-
-
-// ------------------------------------------------------------------------------------------------
-// TPtrC8 NSmlDmURI::URISeg(const TDesC8& aURI,TInt aLocation)
-// Returns the aLocation:th URI segment
-// ------------------------------------------------------------------------------------------------
-TPtrC8 NSmlDmURI::URISeg(const TDesC8& aURI,TInt aLocation)
-	{
-	TInt begin=0;
-	TInt end;
-	TInt num=0;
-
-	for(end=0;end<aURI.Length();end++)
-		{
-		if(aURI[end]==KNSmlDMUriSeparator||end==aURI.Length()-1)
-			{
-			num++;
-			if(num==aLocation)
-				{
-				break;
-				}
-			else
-				{
-				begin = end;
-				}
-			}
-		}
-	if(begin==0)
-		{
-		if(end==aURI.Length()-1)
-			{
-			return aURI;
-			}
-		else
-			{
-			return aURI.Left(end);
-			}
-		}
-	else
-		{
-		if(end==aURI.Length()-1)
-			{
-			return aURI.Mid(begin+1,end-begin);
-			}
-		else
-			{
-			return aURI.Mid(begin+1,end-begin-1);
-			}
-		}
-	}
-
-
-// ------------------------------------------------------------------------------------------------
-// TInt NSmlDmURI::NumOfURISegs(const TDesC8& aURI)
-// Returns the num of uri segs
-// ------------------------------------------------------------------------------------------------
-TInt NSmlDmURI::NumOfURISegs(const TDesC8& aURI)
-	{
-	TInt numOfURISegs = 1;
-	for(TInt i=0;i<aURI.Length();i++)
-		{
-		if(aURI[i]==KNSmlDMUriSeparator)
-			{
-			numOfURISegs++;
-			}
-		}
-	return numOfURISegs;
-	}
-
--- a/applicationmanagement/build_am.bat	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-rem
-rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-rem All rights reserved.
-rem This component and the accompanying materials are made available
-rem under the terms of "Eclipse Public License v1.0"
-rem which accompanies this distribution, and is available
-rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
-rem
-rem Initial Contributors:
-rem Nokia Corporation - initial contribution.
-rem
-rem Contributors:
-rem
-rem Description: Implementation of applicationmanagement components
-rem
-
-@echo off
-
-call build_module options %1 %2
-rem call build_module installer %1 %2
-
-
-echo ######################
-echo Building client+server
-echo ######################
-
-
-pushd group
-call bldmake bldfiles
-@call abld export
-@call abld makefile %1
-@call abld resource %1 %2
-@call abld target %1 %2
-@call abld freeze %1 
-@call abld makefile %1 
-@call abld library %1 
-@call abld final %1 %2
-popd
-
-call build_module amadapter2 %1 %2
-
-echo ##########################
-echo Build AM finished
-echo ##########################
\ No newline at end of file
--- a/applicationmanagement/build_am_all.bat	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-rem
-rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-rem All rights reserved.
-rem This component and the accompanying materials are made available
-rem under the terms of "Eclipse Public License v1.0"
-rem which accompanies this distribution, and is available
-rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
-rem
-rem Initial Contributors:
-rem Nokia Corporation - initial contribution.
-rem
-rem Contributors:
-rem
-rem Description: Implementation of applicationmanagement components
-rem
-
-@echo off
-
-@call build_am %1 %2
-@call build_am_tests %1 %2
--- a/applicationmanagement/build_am_tests.bat	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-rem
-rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-rem All rights reserved.
-rem This component and the accompanying materials are made available
-rem under the terms of "Eclipse Public License v1.0"
-rem which accompanies this distribution, and is available
-rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
-rem
-rem Initial Contributors:
-rem Nokia Corporation - initial contribution.
-rem
-rem Contributors:
-rem
-rem Description: Implementation of applicationmanagement components
-rem
-
-@echo off
-call build_module amadapter2\internal\amatest %1 %2
-call build_module internal\amtest %1 %2
-echo ##########################
-echo Building AM tests finished
-echo ##########################
\ No newline at end of file
--- a/applicationmanagement/build_module.bat	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-rem
-rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-rem All rights reserved.
-rem This component and the accompanying materials are made available
-rem under the terms of "Eclipse Public License v1.0"
-rem which accompanies this distribution, and is available
-rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
-rem
-rem Initial Contributors:
-rem Nokia Corporation - initial contribution.
-rem
-rem Contributors:
-rem
-rem Description: Implementation of applicationmanagement components
-rem
-
-@echo off
-echo ############
-echo Building %1
-echo ############
-echo 
-
-pushd %1\group
-call bldmake bldfiles
-@call abld export
-@call abld makefile %2
-@call abld resource %2 %3
-@call abld target %2 %3
-@call abld freeze %2
-@call abld makefile %2
-@call abld library %2
-@call abld final %2 %3
-popd
\ No newline at end of file
Binary file applicationmanagement/cenrep/keys_application_management.xls has changed
--- a/applicationmanagement/clean_am.bat	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-rem
-rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-rem All rights reserved.
-rem This component and the accompanying materials are made available
-rem under the terms of "Eclipse Public License v1.0"
-rem which accompanies this distribution, and is available
-rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
-rem
-rem Initial Contributors:
-rem Nokia Corporation - initial contribution.
-rem
-rem Contributors:
-rem
-rem Description: Implementation of applicationmanagement components
-rem
-
-@echo off
-echo ######################
-echo Cleaning client+server
-echo ######################
-echo 
-
-pushd group
-@if exist abld.bat call abld reallyclean %1 %2
-@call bldmake clean
-
-rem @if exist ..\BWINS call rmdir /S /Q ..\BWINS
-rem @if exist ..\Bmarm call rmdir /S /Q ..\Bmarm
-rem @if exist ..\eabi call rmdir /S /Q ..\eabi
-
-popd
-
-call clean_module amadapter2 %1 %2
-rem call clean_module installer %1 %2
-call clean_module options %1 %2
\ No newline at end of file
--- a/applicationmanagement/clean_am_all.bat	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-rem
-rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-rem All rights reserved.
-rem This component and the accompanying materials are made available
-rem under the terms of "Eclipse Public License v1.0"
-rem which accompanies this distribution, and is available
-rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
-rem
-rem Initial Contributors:
-rem Nokia Corporation - initial contribution.
-rem
-rem Contributors:
-rem
-rem Description: Implementation of applicationmanagement components
-rem
-
-@echo off
-
-@call clean_am %1 %2
-@call clean_am_tests %1 %2
--- a/applicationmanagement/clean_am_tests.bat	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-rem
-rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-rem All rights reserved.
-rem This component and the accompanying materials are made available
-rem under the terms of "Eclipse Public License v1.0"
-rem which accompanies this distribution, and is available
-rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
-rem
-rem Initial Contributors:
-rem Nokia Corporation - initial contribution.
-rem
-rem Contributors:
-rem
-rem Description: Implementation of applicationmanagement components
-rem
-
-@echo off
-
-call clean_module amadapter\internal\amatest %1 %2
-call clean_module internal\amtest %1 %2
-
-echo ##########################
-echo Cleaning AM tests finished
-echo ##########################
\ No newline at end of file
--- a/applicationmanagement/clean_module.bat	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-rem
-rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-rem All rights reserved.
-rem This component and the accompanying materials are made available
-rem under the terms of "Eclipse Public License v1.0"
-rem which accompanies this distribution, and is available
-rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
-rem
-rem Initial Contributors:
-rem Nokia Corporation - initial contribution.
-rem
-rem Contributors:
-rem
-rem Description: Implementation of applicationmanagement components
-rem
-
-@echo off
-echo ########################
-echo Cleaning %1
-echo ########################
-
-pushd %1\group
-@if exist abld.bat call abld.bat reallyclean %2 %3
-@call bldmake clean
-rem @if exist ..\BWINS call rmdir /S /Q ..\BWINS
-rem @if exist ..\Bmarm call rmdir /S /Q ..\Bmarm
-rem @if exist ..\eabi call rmdir /S /Q ..\eabi
-popd
\ No newline at end of file
--- a/applicationmanagement/client/BWINS/ApplicationManagementu.def	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-EXPORTS
-	??0RAppMgmtRfs@@QAE@XZ @ 1 NONAME ; RAppMgmtRfs::RAppMgmtRfs(void)
-	??0RApplicationManagement@NApplicationManagement@@QAE@XZ @ 2 NONAME ; NApplicationManagement::RApplicationManagement::RApplicationManagement(void)
-	?ActivateL@RApplicationManagement@NApplicationManagement@@QBEXK@Z @ 3 NONAME ; void NApplicationManagement::RApplicationManagement::ActivateL(unsigned long) const
-	?Close@RAppMgmtRfs@@QAEXXZ @ 4 NONAME ; void RAppMgmtRfs::Close(void)
-	?Close@RApplicationManagement@NApplicationManagement@@QAEXXZ @ 5 NONAME ; void NApplicationManagement::RApplicationManagement::Close(void)
-	?Connect@RAppMgmtRfs@@QAEHXZ @ 6 NONAME ; int RAppMgmtRfs::Connect(void)
-	?Connect@RApplicationManagement@NApplicationManagement@@QAEHABVTCertInfo@@@Z @ 7 NONAME ; int NApplicationManagement::RApplicationManagement::Connect(class TCertInfo const &)
-	?Connect@RApplicationManagement@NApplicationManagement@@QAEHXZ @ 8 NONAME ; int NApplicationManagement::RApplicationManagement::Connect(void)
-	?DeactivateL@RApplicationManagement@NApplicationManagement@@QBEXK@Z @ 9 NONAME ; void NApplicationManagement::RApplicationManagement::DeactivateL(unsigned long) const
-	?DeliverL@RApplicationManagement@NApplicationManagement@@QBEKABV?$TBuf8@$0BAA@@@@Z @ 10 NONAME ; unsigned long NApplicationManagement::RApplicationManagement::DeliverL(class TBuf8<256> const &) const
-	?DeploymentComponent@RApplicationManagement@NApplicationManagement@@QBEHKAAUTDeploymentComponent@2@@Z @ 11 NONAME ; int NApplicationManagement::RApplicationManagement::DeploymentComponent(unsigned long, struct NApplicationManagement::TDeploymentComponent &) const
-	?DeploymentComponentDataL@RApplicationManagement@NApplicationManagement@@QBEXKW4TDeplCompAttrType@2@AAVCBufBase@@@Z @ 12 NONAME ; void NApplicationManagement::RApplicationManagement::DeploymentComponentDataL(unsigned long, enum NApplicationManagement::TDeplCompAttrType, class CBufBase &) const
-	?DeploymentComponentDataSizeL@RApplicationManagement@NApplicationManagement@@QBEHKABW4TDeplCompAttrType@2@@Z @ 13 NONAME ; int NApplicationManagement::RApplicationManagement::DeploymentComponentDataSizeL(unsigned long, enum NApplicationManagement::TDeplCompAttrType const &) const
-	?DeploymentComponentIdsL@RApplicationManagement@NApplicationManagement@@QBEHAAV?$RArray@K@@W4TDeploymentComponentState@2@@Z @ 14 NONAME ; int NApplicationManagement::RApplicationManagement::DeploymentComponentIdsL(class RArray<unsigned long> &, enum NApplicationManagement::TDeploymentComponentState) const
-	?DeploymentComponentTempInstFileL@RApplicationManagement@NApplicationManagement@@QBEXKAAVRFile@@ABW4TDeplCompAttrType@2@@Z @ 15 NONAME ; void NApplicationManagement::RApplicationManagement::DeploymentComponentTempInstFileL(unsigned long, class RFile &, enum NApplicationManagement::TDeplCompAttrType const &) const
-	?DeploymentComponentUserIdL@RApplicationManagement@NApplicationManagement@@QBEXKAAV?$TBuf8@$0BAA@@@@Z @ 16 NONAME ; void NApplicationManagement::RApplicationManagement::DeploymentComponentUserIdL(unsigned long, class TBuf8<256> &) const
-	?DownloadL@RApplicationManagement@NApplicationManagement@@QBEKABV?$TBuf8@$0BAA@@@@Z @ 17 NONAME ; unsigned long NApplicationManagement::RApplicationManagement::DownloadL(class TBuf8<256> const &) const
-	?GenericAlertSentL@RApplicationManagement@NApplicationManagement@@QBEXK@Z @ 18 NONAME ; void NApplicationManagement::RApplicationManagement::GenericAlertSentL(unsigned long) const
-	?GetFinalResultsForGAL@RApplicationManagement@NApplicationManagement@@QBEXKAAHAAVTDes8@@@Z @ 19 NONAME ; void NApplicationManagement::RApplicationManagement::GetFinalResultsForGAL(unsigned long, int &, class TDes8 &) const
-	?InstallL@RApplicationManagement@NApplicationManagement@@QBEXKW4TDeploymentComponentState@2@@Z @ 20 NONAME ; void NApplicationManagement::RApplicationManagement::InstallL(unsigned long, enum NApplicationManagement::TDeploymentComponentState) const
-	?PerformRfsL@RAppMgmtRfs@@QBEXXZ @ 21 NONAME ; void RAppMgmtRfs::PerformRfsL(void) const
-	?RemoveL@RApplicationManagement@NApplicationManagement@@QBEXK@Z @ 22 NONAME ; void NApplicationManagement::RApplicationManagement::RemoveL(unsigned long) const
-	?StartDownloadL@RApplicationManagement@NApplicationManagement@@QBEXKW4TDownloadTarget@2@@Z @ 23 NONAME ; void NApplicationManagement::RApplicationManagement::StartDownloadL(unsigned long, enum NApplicationManagement::TDownloadTarget) const
-	?StateChangeComplete@RApplicationManagement@NApplicationManagement@@QBEHK@Z @ 24 NONAME ; int NApplicationManagement::RApplicationManagement::StateChangeComplete(unsigned long) const
-	?StateChangingDCIdsL@RApplicationManagement@NApplicationManagement@@QBEHAAV?$RArray@K@@@Z @ 25 NONAME ; int NApplicationManagement::RApplicationManagement::StateChangingDCIdsL(class RArray<unsigned long> &) const
-	?UpdateDeploymentComponentDataL@RApplicationManagement@NApplicationManagement@@QBEXKW4TDeplCompAttrType@2@ABVTDesC8@@1@Z @ 26 NONAME ; void NApplicationManagement::RApplicationManagement::UpdateDeploymentComponentDataL(unsigned long, enum NApplicationManagement::TDeplCompAttrType, class TDesC8 const &, class TDesC8 const &) const
-	?UpdateDeploymentComponentL@RApplicationManagement@NApplicationManagement@@QBEXKW4TDeplCompAttrType@2@ABVTDesC8@@@Z @ 27 NONAME ; void NApplicationManagement::RApplicationManagement::UpdateDeploymentComponentL(unsigned long, enum NApplicationManagement::TDeplCompAttrType, class TDesC8 const &) const
-	?UpdateDeploymentComponentStreamedDataL@RApplicationManagement@NApplicationManagement@@QBEXKW4TDeplCompAttrType@2@ABVTDesC8@@@Z @ 28 NONAME ; void NApplicationManagement::RApplicationManagement::UpdateDeploymentComponentStreamedDataL(unsigned long, enum NApplicationManagement::TDeplCompAttrType, class TDesC8 const &) const
-	?UpdateL@RApplicationManagement@NApplicationManagement@@QBEXKK@Z @ 29 NONAME ; void NApplicationManagement::RApplicationManagement::UpdateL(unsigned long, unsigned long) const
-	?CheckStatusNodesL@RApplicationManagement@NApplicationManagement@@QBEXXZ @ 30 NONAME ; void NApplicationManagement::RApplicationManagement::CheckStatusNodesL(void) const
-
--- a/applicationmanagement/client/eabi/ApplicationManagementu.def	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-EXPORTS
-	_ZN11RAppMgmtRfs5CloseEv @ 1 NONAME
-	_ZN11RAppMgmtRfs7ConnectEv @ 2 NONAME
-	_ZN11RAppMgmtRfsC1Ev @ 3 NONAME
-	_ZN11RAppMgmtRfsC2Ev @ 4 NONAME
-	_ZN22NApplicationManagement22RApplicationManagement5CloseEv @ 5 NONAME
-	_ZN22NApplicationManagement22RApplicationManagement7ConnectERK9TCertInfo @ 6 NONAME
-	_ZN22NApplicationManagement22RApplicationManagement7ConnectEv @ 7 NONAME
-	_ZN22NApplicationManagement22RApplicationManagementC1Ev @ 8 NONAME
-	_ZN22NApplicationManagement22RApplicationManagementC2Ev @ 9 NONAME
-	_ZNK11RAppMgmtRfs11PerformRfsLEv @ 10 NONAME
-	_ZNK22NApplicationManagement22RApplicationManagement11DeactivateLEm @ 11 NONAME
-	_ZNK22NApplicationManagement22RApplicationManagement14StartDownloadLEmNS_15TDownloadTargetE @ 12 NONAME
-	_ZNK22NApplicationManagement22RApplicationManagement17GenericAlertSentLEm @ 13 NONAME
-	_ZNK22NApplicationManagement22RApplicationManagement19DeploymentComponentEmRNS_20TDeploymentComponentE @ 14 NONAME
-	_ZNK22NApplicationManagement22RApplicationManagement19StateChangeCompleteEm @ 15 NONAME
-	_ZNK22NApplicationManagement22RApplicationManagement19StateChangingDCIdsLER6RArrayImE @ 16 NONAME
-	_ZNK22NApplicationManagement22RApplicationManagement21GetFinalResultsForGALEmRiR5TDes8 @ 17 NONAME
-	_ZNK22NApplicationManagement22RApplicationManagement23DeploymentComponentIdsLER6RArrayImENS_25TDeploymentComponentStateE @ 18 NONAME
-	_ZNK22NApplicationManagement22RApplicationManagement24DeploymentComponentDataLEmNS_17TDeplCompAttrTypeER8CBufBase @ 19 NONAME
-	_ZNK22NApplicationManagement22RApplicationManagement26DeploymentComponentUserIdLEmR5TBuf8ILi256EE @ 20 NONAME
-	_ZNK22NApplicationManagement22RApplicationManagement26UpdateDeploymentComponentLEmNS_17TDeplCompAttrTypeERK6TDesC8 @ 21 NONAME
-	_ZNK22NApplicationManagement22RApplicationManagement28DeploymentComponentDataSizeLEmRKNS_17TDeplCompAttrTypeE @ 22 NONAME
-	_ZNK22NApplicationManagement22RApplicationManagement30UpdateDeploymentComponentDataLEmNS_17TDeplCompAttrTypeERK6TDesC8S4_ @ 23 NONAME
-	_ZNK22NApplicationManagement22RApplicationManagement32DeploymentComponentTempInstFileLEmR5RFileRKNS_17TDeplCompAttrTypeE @ 24 NONAME
-	_ZNK22NApplicationManagement22RApplicationManagement38UpdateDeploymentComponentStreamedDataLEmNS_17TDeplCompAttrTypeERK6TDesC8 @ 25 NONAME
-	_ZNK22NApplicationManagement22RApplicationManagement7RemoveLEm @ 26 NONAME
-	_ZNK22NApplicationManagement22RApplicationManagement7UpdateLEmm @ 27 NONAME
-	_ZNK22NApplicationManagement22RApplicationManagement8DeliverLERK5TBuf8ILi256EE @ 28 NONAME
-	_ZNK22NApplicationManagement22RApplicationManagement8InstallLEmNS_25TDeploymentComponentStateE @ 29 NONAME
-	_ZNK22NApplicationManagement22RApplicationManagement9ActivateLEm @ 30 NONAME
-	_ZNK22NApplicationManagement22RApplicationManagement9DownloadLERK5TBuf8ILi256EE @ 31 NONAME
-	_ZTI11RAppMgmtRfs @ 32 NONAME ; #<TI>#
-	_ZTIN22NApplicationManagement22RApplicationManagementE @ 33 NONAME ; #<TI>#
-	_ZTV11RAppMgmtRfs @ 34 NONAME ; #<VT>#
-	_ZTVN22NApplicationManagement22RApplicationManagementE @ 35 NONAME ; #<VT>#
-	_ZNK22NApplicationManagement22RApplicationManagement17CheckStatusNodesLEv @ 36 NONAME
-
--- a/applicationmanagement/client/group/ApplicationManagementClient.mmp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-/*
-* 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: Implementation of applicationmanagement components
-*
-*/
-  
-
-// To get the APP_LAYER_SYSTEMINCLUDE-definition
-#include <platform_paths.hrh>
-#include "defaultcaps.hrh"
-
-TARGET        applicationmanagement.dll
-TARGETTYPE    dll
-UID           0x1000008d 0x1020781B
-CAPABILITY    CAP_CLIENT_DLL
-
-SOURCEPATH    ../src
-SOURCE        ApplicationManagementClient.cpp
-
-USERINCLUDE   . ../../inc 
-APP_LAYER_SYSTEMINCLUDE
-
-LIBRARY       euser.lib
-LIBRARY				bafl.lib
-LIBRARY 			flogger.lib
-LIBRARY				efsrv.lib
-LIBRARY         apparc.lib         
-LIBRARY         apgrfx.lib
-LIBRARY         avkon.lib
-LIBRARY         estor.lib
-LIBRARY         cone.lib
-LIBRARY         eikcore.lib
-LIBRARY			centralrepository.lib
-
-
-SMPSAFE
--- a/applicationmanagement/client/group/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-/*
-* 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:  build info file for application management client & server
-*
-*/
-
-
-PRJ_MMPFILES
-
-ApplicationManagementClient.mmp
--- a/applicationmanagement/client/src/ApplicationManagementClient.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,842 +0,0 @@
-/*
-* Copyright (c) 2000 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:   Implementation of Application Management Components
-*
-*/
-
-
-
-
-#include <e32svr.h>
-#include "ApplicationManagementClientServer.h"
-#include "ApplicationManagementClient.h"
-#include "ApplicationManagementRfs.h"
-#include "debug.h"
-#include <apacmdln.h>
-#include <apgtask.h>
-
-
-#include <apgcli.h>
-
-#include <badesca.h>
-
-using namespace NApplicationManagement;
-
-// ----------------------------------------------------------------------------------------
-// Server startup code
-// ----------------------------------------------------------------------------------------
-
-static TInt StartAMServerL()
-	{
-	RDEBUG("RApplicationManagement: Starting server...");
-	
-	TInt err = KErrNone;
-	const TUid nameUid = TUid::Uid(KUikonUidPluginInterfaceNotifiers);
-    	
-	const TUid appServerUid = TUid::Uid(KAppMgmtServerUid );
-	
-	RApaLsSession apa;
-    err = apa.Connect();
-    User::LeaveIfError(err);
-    CleanupClosePushL(apa);
-
-    // Get application information
-    TApaAppInfo info;
-    
-    for(TInt i = 20; ((err = apa.GetAppInfo(info, 
-	    appServerUid)) == RApaLsSession::EAppListInvalid) && i > 0; i--)
-        {
-        User::After(500000);
-        }
-    User::LeaveIfError(err);
-
-	TRequestStatus aRequestStatusForRendezvous;
-    
-    // Start aplication server
-    CApaCommandLine* cmdLine = CApaCommandLine::NewLC();
-    cmdLine->SetExecutableNameL(info.iFullName);
-    cmdLine->SetServerRequiredL(nameUid.iUid );
-    cmdLine->SetCommandL(EApaCommandBackground);
-    TThreadId   srvid;
-    err = apa.StartApp(*cmdLine, srvid, &aRequestStatusForRendezvous);
-    User::LeaveIfError(err);
-
-	User::WaitForRequest(aRequestStatusForRendezvous);
-	CleanupStack::PopAndDestroy(2, &apa);	// cmdLine and apa 
-
-	return KErrNone;
-	}
-
-EXPORT_C RAppMgmtRfs::RAppMgmtRfs()
-    {
-    }
-EXPORT_C TInt RAppMgmtRfs::Connect()
-	{
-	TInt retry=2;
-	TVersion ver( KAMVerMajor, KAMVerMinor, KAMVerBuild );
-	for (;;)
-		{
-		
-		TInt r;
-		
-		const TUid nameUid = TUid::Uid(KUikonUidPluginInterfaceNotifiers);
-    	
-		const TUid appServerUid = TUid::Uid(KAppMgmtServerUid );
-		
-		_LIT(KServerNameFormat, "%08x_%08x_AppServer");
-		TFullName serverName;
-		serverName.Format(KServerNameFormat, 
-		nameUid, appServerUid);
-        TRAP(r, ConnectExistingByNameL(serverName) );
-        if(r)
-            {
-            
-            r = CreateSession (serverName, ver);
-            
-            }    
-		if (r!=KErrNotFound && r!=KErrServerTerminated)
-			return r;
-		if (--retry==0)
-			return r;
-		TRAP_IGNORE(r=StartAMServerL());
-		if (r!=KErrNone && r!=KErrAlreadyExists)
-			{
-			return r;
-			}
-		}
-	}
-	
-	
-EXPORT_C void RAppMgmtRfs::Close()
-	{
-	REikAppServiceBase::Close();  //basecall
-	}
-
-// New methods
-EXPORT_C void RAppMgmtRfs::PerformRfsL() const
-	{
-	User::LeaveIfError( SendReceive( EPerformRfs, TIpcArgs() ) );	
-	}
-	
-TUid RAppMgmtRfs::ServiceUid() const
-	{
-	return TUid::Uid( KAMServiceUid);
-	}
-
-	
-EXPORT_C RApplicationManagement::RApplicationManagement()
-    {
-    }
-
-// This is the standard retry pattern for server connection
-EXPORT_C TInt RApplicationManagement::Connect( )
-	{
-	TInt retry=2;
-	TVersion ver( KAMVerMajor, KAMVerMinor, KAMVerBuild );
-	for (;;)
-		{
-		
-		TInt r;
-		
-		const TUid nameUid = TUid::Uid(KUikonUidPluginInterfaceNotifiers);
-    	
-		const TUid appServerUid = TUid::Uid(KAppMgmtServerUid );
-		
-		_LIT(KServerNameFormat, "%08x_%08x_AppServer");
-		TFullName serverName;
-		serverName.Format(KServerNameFormat, 
-		nameUid, appServerUid);
-        TRAP(r, ConnectExistingByNameL(serverName) );
-        if(r)
-            {
-            
-            r = CreateSession (serverName, ver);
-            
-            }    
-		if (r!=KErrNotFound && r!=KErrServerTerminated)
-			return r;
-		if (--retry==0)
-			return r;
-		TRAP_IGNORE(r=StartAMServerL())
-		if (r!=KErrNone && r!=KErrAlreadyExists)
-			{
-			return r;
-			}
-		}
-	}
-
-EXPORT_C TInt RApplicationManagement::Connect( const TCertInfo &aCertInfo )
-	{
-	TInt r( Connect() );
-	if ( r == KErrNone || r == KErrAlreadyExists )
-		{
-		TPckg<TCertInfo> pkg( aCertInfo );
-		r = SendReceive( EAddTrust, TIpcArgs( &pkg ) );
-		}
-	return r;
-	}
-
-	
-EXPORT_C void RApplicationManagement::Close()
-	{
-	REikAppServiceBase::Close();
-	}
-
-
-	
-EXPORT_C TUint32 RApplicationManagement::DeliverL( const TDCUserId &aUserId ) const
-	{
-	TDeploymentComponent aInfo( KNullDesC8(), KNullDesC8(), KNullDesC8(), EDCSNone );
-	TDeploymentComponentIPC pkg( aInfo, KNullDesC8(), aUserId );
-		
-	TPckg<TDeploymentComponentIPC> pinfo(pkg);
-	TUint32 id = 0;
-	TPckg< TUint32 > pid( id );
-	const TDesC8& empty = KNullDesC8();
-	
-	TInt err( SendReceive( EDeplCompDeliverStartOperation2, TIpcArgs( &pinfo, &empty, &pid) ) );	
-	if ( err == KErrNone )
-		{
-		RDEBUG_2( "ApplicationManagementServer: DeliverL start SUCCESS id: %d", id );
-		//TPckg<TDeploymentComponent> pinfo2(aInfo);
-
-		err = SendReceive( EDeplCompDeliverCompleteOperation, TIpcArgs( &pid, &empty, &empty ));
-		
-		if ( err == KErrNone )
-			{	
-			RDEBUG_2( "ApplicationManagementServer: DeliverL complete SUCCESS id: %d", id );
-			err = id;
-			}
-		else
-			{
-			RDEBUG_2( "ApplicationManagementServer: DeliverL failed2... %d", err);
-			}
-		}
-	else
-		{
-		RDEBUG_2("ApplicationManagementServer: DeliverL failed1... %d", err);
-		}
-	User::LeaveIfError( err );
-	return err;
-	}
-	
-	
-	
-EXPORT_C TInt RApplicationManagement::DeploymentComponent( 
-	TUint32 aInternalId, TDeploymentComponent &aReturnValue ) const
-	{
-	TPckg<TDeploymentComponent> pinfo(aReturnValue);
-	TPckg< TUint32 > pid( aInternalId );
-	TInt err( SendReceive( EDeplCompGetOperation, TIpcArgs( &pid, &pinfo) ) );	
-	if ( err == KErrNone )
-		{
-		RDEBUG_2( "RApplicationManagement: DeploymentComponent start SUCCESS id: %d", aInternalId );
-		}
-	else
-		{
-		RDEBUG_2("RApplicationManagement: DeploymentComponent failed... %d", err);
-		}
-		
-	return err;
-	}
-	
-	
-EXPORT_C void RApplicationManagement::DeploymentComponentUserIdL( 
-	TUint32 aInternalId, TDCUserId &aResponse ) const
-	{
-	
-	TPckgC< TUint32 > pid( aInternalId );
-	TInt err( SendReceive( EDeplCompGetUserIdOperation, TIpcArgs( &pid, &aResponse) ) );	
-	if ( err == KErrNone )
-		{
-		RDEBUG_2( "RApplicationManagement: DeploymentComponentUserIdL SUCCESS id: %d", aInternalId );
-		}
-	else
-		{
-		RDEBUG_2( "RApplicationManagement: DeploymentComponentUserIdL failed... %d", err);
-		}
-		
-	User::LeaveIfError( err );
-	}
-	
-	
-/**
-* @param aInternalId Id of the component to be found
-* @param aBuffer a buffer to store results
-* @return KErrNone Symbian error code
-*/
-EXPORT_C void RApplicationManagement::DeploymentComponentDataL( 
-	TUint32 aInternalId, TDeplCompAttrType aDataType, CBufBase &aBuffer ) const
-	{
-	//aBuffer.ResizeL(
-	TPckg< TUint32 > pid( aInternalId );
-	TPckg< TDeplCompAttrType > pdt( aDataType );
-	TInt length( 0 );
-	TPckg< TInt > plen( length );
-	aBuffer.Reset();
-	TInt err( KErrNone) ;
-	if ( aDataType == EDCInstallOptions 
-		|| aDataType == EDCMetaData 
-		|| aDataType ==	EDCData
-		|| aDataType ==	EDCDataMime
-		|| aDataType ==	EDCMetaDataMime
-	 	|| aDataType == EDCDownloadURI )
-		{
-		err = SendReceive( EDeplCompGetDataLengthOperation, TIpcArgs( &pid, &pdt, &plen) ) ;
-		if ( err == KErrNone )
-			{
-		
-			}
-		else
-			{
-			RDEBUG_2( "RApplicationManagement: DeploymentComponentDataL EDeplCompGetDataLengthOperation ERROR failed to get length... %d", err );
-			}
-		}
-	else if ( aDataType == EDCStatus)
-		{
-		length = 0; // to make sure we don't fetch it twice
-		TPckgBuf<TInt> ptr;
-		err = SendReceive( EDeplCompGetDataOperation, TIpcArgs( &pid, &pdt, &ptr ) );
-		if ( err == KErrNone )
-			{	
-			TBuf8<10> b;
-			b.AppendNum( ptr() );
-			aBuffer.InsertL( 0, b );
-			RDEBUG( "RApplicationManagement: DeploymentComponentDataL EDCDownloadStatus SUCCESS!" );
-			}
-		else
-			{
-			RDEBUG_2( "RApplicationManagement: DeploymentComponentDataL EDCDownloadStatus ERROR failed... %d", err );
-			}
-		}
-	else if ( aDataType == EDCConRef )
-		{
-		length = 0; // to make sure we don't fetch it twice
-		TPckgBuf<TInt> ptr;
-		err = SendReceive( EDeplCompGetDataOperation, TIpcArgs( &pid, &pdt, &ptr ) );
-		if ( err == KErrNone )
-			{	
-			aBuffer.InsertL( 0, ptr );
-			RDEBUG( "RApplicationManagement: DeploymentComponentDataL EDCConRef SUCCESS!" );
-			}
-		else
-			{
-			RDEBUG_2( "RApplicationManagement: DeploymentComponentDataL EDCConRefERROR failed... %d" , err );
-			}
-		}
-	else
-		{
-		User::Leave( KErrArgument );
-		}
-	if ( length > 0 )
-		{
-		HBufC8 *buf = HBufC8::NewLC( length );
-		TPtr8 ptr( buf->Des() );
-		err = SendReceive( EDeplCompGetDataOperation, TIpcArgs( &pid, &pdt, &ptr ) );
-		if ( err == KErrNone )
-			{	
-			aBuffer.InsertL( 0, ptr );
-			RDEBUG( "RApplicationManagement: DeploymentComponentDataL EDeplCompGetDataOperation SUCCESS!" );
-			}
-		else
-			{
-			RDEBUG_2( "RApplicationManagement: DeploymentComponentDataL EDeplCompGetDataOperationERROR failed... %d", err );
-			}
-		CleanupStack::PopAndDestroy( buf );
-		}
-	else
-		{
-		RDEBUG( "RApplicationManagement: DeploymentComponentDataL:  Length is zero" );
-		}
-	User::LeaveIfError( err );
-	}
-	
-	
-EXPORT_C TInt RApplicationManagement::DeploymentComponentIdsL(
-			RElementIdArray &aArray, const TDeploymentComponentState aState	) const
-	{
-	RDEBUG_2( "RApplicationManagement: DeploymentComponentIds aState=%d!", aState );
-	TInt count = 0;
-	TPckg<TInt> cnt(count);
-	TPckg<TDeploymentComponentState> pk(aState);
-	TInt err( SendReceive( EDeplCompCountOperation, TIpcArgs( &cnt, &pk ) ) );
-	RDEBUG_2( "RApplicationManagement: DeploymentComponentIds : Count is %d", count );
-	if ( err == KErrNone )
-		{
-		if ( count > 0 )
-			{
-			aArray.Reset();
-			for ( TInt i( 0 ); i != count; ++i )
-				{
-				aArray.AppendL( 0 );
-				}
-			TPtr8 p( reinterpret_cast< TUint8* >( &aArray[0] ), 0, count * sizeof( TUint32 ) );
-			err = SendReceive( EDeplCompIdsOperation, TIpcArgs( &p, &pk ) ) ;	
-			if ( err == KErrNone )
-				{	
-				RDEBUG( "RApplicationManagement: DeploymentComponentIds SUCCESS!" );
-				}
-			else
-				{
-				RDEBUG_2( "RApplicationManagement: DeploymentComponentIds failed... %d", err );
-				}
-			}
-		}
-	else
-		{
-		RDEBUG_2( "RApplicationManagement: DeploymentComponentIds failed to get count... %d", err);
-		}
-	return err;
-	}
-	
-/**
-* InstallL Installs given deployment component.
-* @param aDeploymentComponent The deployment component to be installed
-* @param aTargetState Will the installed component be actibve or inactive (default active)
-* @return KErrNone Symbian error code
-*/
-EXPORT_C void RApplicationManagement::InstallL( TUint32 aInternalId, 
-	TDeploymentComponentState aTargetState  ) const
-	{
-	TPckg<TUint32> id(aInternalId);
-	if ( aTargetState != EDCSActive && aTargetState != EDCSInactive )
-		{
-		// install only to either of above states
-		User::Leave( KErrArgument );
-		}
-	TPckg<TDeploymentComponentState> pk( aTargetState );
-
-	TInt err( SendReceive( EInstallOperation, TIpcArgs( &id, &pk ) ) );	
-	if ( err == KErrNone )
-		{
-		RDEBUG( "RApplicationManagement: InstallL SUCCESS!" );
-		}
-	else
-		{
-		RDEBUG_2("ApplicationManagementServer: InstallL failed... %d", err);
-		if( err == KErrNotFound )
-			{
-			err = KErrArgument ; // indicates that data was not filled...
-			}
-		}
-	User::LeaveIfError( err ) ;
-	}
-	
-EXPORT_C void RApplicationManagement::UpdateDeploymentComponentDataL( 
-		TUint32 aInternalId, TDeplCompAttrType aItem, const TDesC8 &aItemData, const TDesC8 &aDataMime  ) const
-	{
-	TDeplCompDataIPC ipc ;
-	ipc.iDataMime = aDataMime;
-	ipc.iInternalId = aInternalId ;
-	ipc.iAttrType = aItem ;
-	TPckg<TDeplCompDataIPC> pipc( ipc );
-	
-	TInt err( SendReceive( EDeplCompUpdateDataOperation, TIpcArgs( &pipc, &aItemData ) ) );	
-	if ( err == KErrNone )
-		{
-		RDEBUG( "RApplicationManagement: UpdateDeploymentComponentDataL SUCCESS!" );
-		}
-	else
-		{
-		RDEBUG_2("ApplicationManagementServer: UpdateDeploymentComponentDataL failed... %d", err);
-		}
-	User::LeaveIfError( err );
-	}
-
-EXPORT_C void RApplicationManagement::UpdateDeploymentComponentStreamedDataL( 
-		TUint32 aInternalId, TDeplCompAttrType aItem, const TDesC8 &aDataMime  ) const
-	{
-	TDeplCompDataIPC ipc ;
-	ipc.iDataMime = aDataMime;
-	ipc.iInternalId = aInternalId ;
-	ipc.iAttrType = aItem ;
-	TPckg<TDeplCompDataIPC> pipc( ipc );
-	
-	TInt err( SendReceive( EDeplCompUpdateStreamedDataOperation, TIpcArgs( &pipc ) ) );	
-	if ( err == KErrNone )
-		{
-		RDEBUG( "RApplicationManagement: UpdateDeploymentComponentStreamedDataL SUCCESS!" );
-		}
-	else
-		{
-		RDEBUG_2("ApplicationManagementServer: UpdateDeploymentComponentStreamedDataL failed... %d", err);
-		}
-	User::LeaveIfError( err );
-	}
-		
-	
-EXPORT_C void RApplicationManagement::UpdateDeploymentComponentL( 
-			TUint32 aInternalId, TDeplCompAttrType aItem, const TDesC8 &aItemData ) const
-	{
-	TPckg<TUint32> id(aInternalId);
-	TPckg<TDeplCompAttrType> itemid(aItem);
-	
-	TInt err( SendReceive( EDeplCompAttrUpdateOperation, TIpcArgs( &id, &itemid, &aItemData ) ) );	
-	if ( err == KErrNone )
-		{
-		RDEBUG( "RApplicationManagement: UpdateDeploymentComponentL SUCCESS!" );
-		}
-	else
-		{
-		RDEBUG_2("ApplicationManagementServer: UpdateDeploymentComponentL failed... %d", err);
-		}
-	User::LeaveIfError( err );
-	}
-	
-
-/**
-* RemoveL Removes given deployment component.
-* @param aInternalId Id of the component to be removed
-* @return KErrNone Symbian error code
-*/
-EXPORT_C void RApplicationManagement::RemoveL( TUint32 aInternalId ) const
-	{
-	TPckg< TUint32 > id( aInternalId );
-	RDEBUG_2( "RApplicationManagement: RemoveL %d!" , aInternalId );
-		
-	TInt err( SendReceive( EDeplCompRemoveOperation, TIpcArgs( &id ) ) );	
-	if ( err == KErrNone )
-		{
-		RDEBUG( "RApplicationManagement: RemoveL SUCCESS!" );
-		}
-	else if ( err == KErrNotFound )
-		{
-		RDEBUG( "RApplicationManagement: RemoveL WARNING Component already missing!" );
-		}
-	else
-		{
-		RDEBUG_2("ApplicationManagementServer: RemoveL failed... %d", err);
-		User::LeaveIfError( err );
-		}
-	}
-	
-
-/**
-		* StartDownloadL Starts download of deployment component.
-		* @param aInternalId The id of the component to be downloaded
-	    * @return 
-		*/
-EXPORT_C void RApplicationManagement::StartDownloadL( TUint32 aInternalId, 
-		const TDownloadTarget aTarget ) const
-	{
-	TPckg< TUint32 > id( aInternalId );
-	RDEBUG_2( "RApplicationManagement: StartDownloadL %d!", aInternalId );
-	TPckg< TDownloadTarget > trg( aTarget );
-	TInt err( SendReceive( EDeplCompStartDownloadOperation, TIpcArgs( &id, &trg ) ) );	
-	if ( err == KErrNone )
-		{
-		RDEBUG( "RApplicationManagement: StartDownloadL SUCCESS!" );
-		}
-	else
-		{
-		RDEBUG_2("ApplicationManagementServer: StartDownloadL failed... %d", err);
-		}
-	User::LeaveIfError( err );
-	}
-		
-
-EXPORT_C TUint32 RApplicationManagement::DownloadL( const TDCUserId &aUserId ) const
-	{
-	TUint32 id( 0 ) ;
-	TPckg< TUint32 > pid( id );
-	
-	TInt err( SendReceive( EDeplCompDownloadOperation, TIpcArgs( &pid, &aUserId ) ) );	
-	if ( err == KErrNone )
-		{
-		RDEBUG( "RApplicationManagement: DownloadL SUCCESS!" );
-		err = pid() ;
-		}
-	else
-		{
-		RDEBUG_2("ApplicationManagementServer: DownloadL failed... %d", err);
-		}
-	return err ;
-	}
-	
-EXPORT_C void RApplicationManagement::UpdateL( TUint32 aSourceInternalId, TUint32 aTargetInternalId ) const
-	{
-	TPckg< TUint32 > sid( aSourceInternalId );
-	TPckg< TUint32 > tid( aTargetInternalId );
-	
-	TInt err( SendReceive( EDeplCompUpdateOperation, TIpcArgs( &sid, &tid ) ) );	
-	if ( err == KErrNone )
-		{
-		RDEBUG( "RApplicationManagement: UpdateL SUCCESS!" );
-		}
-	else
-		{
-		RDEBUG_2("ApplicationManagementServer: UpdateL failed... %d", err);
-		}
-	User::LeaveIfError( err );
-	}
-	
-
-
-EXPORT_C TInt RApplicationManagement::StateChangingDCIdsL( RElementIdArray &aArray ) const
-	{
-	RDEBUG( "RApplicationManagement: StateChangingDCIds " );
-	TInt count( 0 ) ;
-	TPckg<TInt> cnt(count);
-	TInt err( SendReceive( EGetStateChangingIdsCountOperation, TIpcArgs( &cnt ) ) );	
-	if ( err == KErrNone )
-		{
-		aArray.Reset();
-		if ( count > 0 )
-			{
-			for ( TInt i( 0 ); i != count; ++i )
-				{
-				aArray.AppendL( 0 );
-				}
-			TPtr8 p( reinterpret_cast< TUint8* >( &aArray[0] ), 0, count * sizeof( TUint32 ) );
-			err = SendReceive( EGetStateChangingIdsOperation, TIpcArgs( &p ) ) ;	
-			if ( err == KErrNone )
-				{	
-				RDEBUG( "RApplicationManagement: StateChangingDCIds SUCCESS!" );
-				}
-			else
-				{
-				RDEBUG_2( "RApplicationManagement: StateChangingDCIds failed... %d" , err );
-				}
-			}
-		else
-			{
-			RDEBUG_2("RApplicationManagement: StateChangingDCIds SUCCESS zero dcs... %d", count);	
-			}
-		}
-	else
-		{
-		RDEBUG_2("RApplicationManagement: StateChangingDCIds failed... %d", err);
-		}
-	return err;
-	}
-	
-
-EXPORT_C TInt RApplicationManagement::StateChangeComplete( TUint32 aInternalId ) const
-	{
-	TPckg<TUint32> id(aInternalId);
-	
-	TInt err( SendReceive( ECompleteStateChangeOperation, TIpcArgs( &id ) ) );	
-	if ( err == KErrNone )
-		{
-		RDEBUG( "RApplicationManagement: StateChangeComplete SUCCESS!" );		
-		}
-	else
-		{
-		RDEBUG_2("ApplicationManagementServer: StateChangeComplete failed... %d", err);
-		if( err == KErrNotFound )
-			{
-			err = KErrArgument ; // indicates that data was not filled...
-			}
-		}
-	return ( err ) ;
-	}
-
-
-/**
-* ActivateL Tries to activate given deployment component
-*	
-* @param aInternalId The id of the component to be activated
-*/
-EXPORT_C void RApplicationManagement::ActivateL( TUint32 aInternalId ) const
-	{
-	TPckg< TUint32 > id( aInternalId );
-	RDEBUG_2( "RApplicationManagement: ActivateL %d!" , aInternalId );
-	
-	TInt err( SendReceive( EDeplCompActivateOperation, TIpcArgs( &id ) ) );	
-	if ( err == KErrNone )
-		{
-		RDEBUG( "RApplicationManagement: ActivateL SUCCESS!" );
-		}
-	else
-		{
-		RDEBUG_2("ApplicationManagementServer: ActivateL failed... %d", err);
-		}
-	User::LeaveIfError( err );	
-	}
-	
-/**
-* DeactivateL Tries to deactivate given deployment component
-*	
-* @param aInternalId The id of the component to be deactivated
-*/
-EXPORT_C void RApplicationManagement::DeactivateL( TUint32 aInternalId ) const
-	{
-	TPckg< TUint32 > id( aInternalId );
-	RDEBUG_2( "RApplicationManagement: DeactivateL %d!", aInternalId );
-	
-	TInt err( SendReceive( EDeplCompDeactivateOperation, TIpcArgs( &id ) ) );	
-	if ( err == KErrNone )
-		{
-		RDEBUG( "RApplicationManagement: DeactivateL SUCCESS!" );
-		}
-	else
-		{
-		RDEBUG_2("ApplicationManagementServer: DeactivateL failed... %d", err);
-		}
-	User::LeaveIfError( err );	
-	}
-		
-
-/**
-* DeploymentComponentDataSizeL Get deployment component attribute size
-*	
-* @param aInternalId The id of the component 
-* @param aItem The type of attribute whose size is to be got
-* @return The size
-*/
-EXPORT_C TInt RApplicationManagement::DeploymentComponentDataSizeL( TUint32 aInternalId, const TDeplCompAttrType &aDataType ) const
-	{
-	TPckg< TUint32 > pid( aInternalId );
-	TPckg< TDeplCompAttrType > pdt( aDataType );
-	TInt length( 0 );
-	TPckg< TInt > plen( length );
-	TInt err( KErrNone) ;
-	if ( aDataType == EDCInstallOptions 
-		|| aDataType == EDCMetaData 
-		|| aDataType ==	EDCData
-	 	|| aDataType == EDCDownloadURI )
-		{
-		err = SendReceive( EDeplCompGetDataLengthOperation, TIpcArgs( &pid, &pdt, &plen) ) ;
-		if ( err == KErrNone )
-			{
-			
-			}
-		}
-	else if ( aDataType == EDCStatus )
-		{
-		length = 0;
-		TPckgBuf<TInt> ptr;
-		err = SendReceive( EDeplCompGetDataOperation, TIpcArgs( &pid, &pdt, &ptr ) );
-		if ( err == KErrNone )
-			{	
-			TBuf8<10> b;
-			b.AppendNum( ptr() );
-			length = b.Length();
-			RDEBUG( "RApplicationManagement: DeploymentComponentDataSizeL elseif SUCCESS!" );
-			}
-		else
-			{
-			RDEBUG_2( "RApplicationManagement: DeploymentComponentDataSizeL ERROR failed... %d", err );
-			}
-		}
-	else
-		{
-		TPckgBuf<TDeploymentComponent> pinfo;
-		TPckg< TUint32 > pid( aInternalId );
-		err = SendReceive( EDeplCompGetOperation, TIpcArgs( &pid, &pinfo) );
-		if ( err == KErrNone )
-			{
-			RDEBUG_2( "RApplicationManagement: DeploymentComponentDataSizeL else SUCCESS id: %d", aInternalId );
-			switch ( aDataType )
-				{
-				case EDCId:
-					{
-					length = pinfo().iId.Length();
-					break;
-					}
-				case EDCName:
-					{
-					length = pinfo().iName.Length();
-					break;
-					}
-				case EDCVersion:
-					{
-					length = pinfo().iVersion.Length();
-					break;
-					}
-				default:
-					{
-					break;
-					}
-				}
-			}
-		else
-			{
-			RDEBUG_2("RApplicationManagement: DeploymentComponentDataSizeL failed... %d", err);
-			}
-		}
-			
-	RDEBUG_2("RApplicationManagement: DeploymentComponentDataSizeL returning... %d", length);
-			
-	return length;
-	}
-
-/**
-* DeploymentComponentTempInstFileL ask file handle from server to be used
-*	
-* @param aInternalId The id of the component 
-* @param aTempFile temporary file handle 
-* @param aItem The type of attribute whose type of temporary file to get
-* @return KErrNone Symbian error code
-*/
-EXPORT_C void RApplicationManagement::DeploymentComponentTempInstFileL( TUint32 aInternalId, RFile& aTempFile, const TDeplCompAttrType &aItem ) const
-	{
-	RDEBUG_3( "RApplicationManagement: DeploymentComponentTempInstFileL: Id (%d) AttrType (%d)", aInternalId, aItem );
-	TPckg<TUint32> id(aInternalId);
-	TPckg<TDeplCompAttrType> itemid(aItem);
-	TPckgBuf<TInt> filehandle;
-
-	TInt fshandle = SendReceive(EDeplCompGetTemporaryInstFile, TIpcArgs( &id, &itemid, &filehandle ) );
-	TInt err = aTempFile.AdoptFromServer( fshandle, filehandle() ) ;
-	User::LeaveIfError( err );
-	RDEBUG_2( "RApplicationManagement: DeploymentComponentTempInstFileL fshandle (%d)", fshandle );
-	}
-
-/**
-* GetFinalResultsForGAL ask results from AM Server. In response AM 
-* server returns final result and target URI of node
-*	
-* @param aInternalId The id of the component 
-* @param aFinalResult Final result of deployment component
-* @param aTargetURI Target URI of deployment component
-* @return void
-*/
-
-EXPORT_C void RApplicationManagement::GetFinalResultsForGAL(TUint32 aInternalId, TInt& aFinalResult,  TDes8& aTargetURI) const
-{
-	TPckg<TUint32>  internalid(aInternalId);
-	TPckg<TInt>  finalresult(aFinalResult);
-	TPckg<TDesC8> targeturi(aTargetURI);
-	
-	TInt err = SendReceive(EDeplCompGetFinalResultForGA, TIpcArgs( &internalid, &finalresult, &aTargetURI) );
-}
-
-EXPORT_C void RApplicationManagement::GenericAlertSentL(TUint32 aInternalId) const
-{
-	
-	TPckg<TUint32>  internalid(aInternalId);
-	
-	
-	TInt err = SendReceive(EDeplCompGenericAlertSent, TIpcArgs( &internalid) );
-}
-
-/**
-* Implementation of Service UID() from base class. Returns AM service UID 
-* to framework
-*	
-* @return uid of AM service UID
-*/
-EXPORT_C void RApplicationManagement::CheckStatusNodesL( ) const
-    {
-    User::LeaveIfError( SendReceive( ECheckStatusNodes, TIpcArgs() ) );
-    }
-
-TUid RApplicationManagement::ServiceUid() const
-	{
-    	
-
-	return TUid::Uid( KAMServiceUid);
-	}
-
-//  End of File
Binary file applicationmanagement/conf/application_management.confml has changed
Binary file applicationmanagement/conf/application_management_1020781C.crml has changed
--- a/applicationmanagement/deployam.bat	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-rem
-rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-rem All rights reserved.
-rem This component and the accompanying materials are made available
-rem under the terms of "Eclipse Public License v1.0"
-rem which accompanies this distribution, and is available
-rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
-rem
-rem Initial Contributors:
-rem Nokia Corporation - initial contribution.
-rem
-rem Contributors:
-rem
-rem Description: Implementation of applicationmanagement components
-rem
-
-@echo off
-
-@echo This script adds the required centrep files and resets required databases
-rem @echo It also empties DM databases!!! Press Ctrl-C if not
-rem @pause
-
-@xcopy /Q /Y group\1020781c.txt \epoc32\winscw\c\private\10202be9\persists\
-@if exist \epoc32\winscw\c\private\10202be9\persists\1020781c.cre call del \epoc32\winscw\c\private\10202be9\persists\1020781c.cre
-@echo removing DM databases...
-@del /Q \epoc32\winscw\c\private\087295d3\*.*
-@echo removing AppMgmt private data
-@del /Q \epoc32\winscw\c\private\1020781c\*.*
-
-
-@echo Deployment done
\ No newline at end of file
--- a/applicationmanagement/eabi/ApplicationManagementu.def	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-EXPORTS
-	_ZN11RAppMgmtRfs5CloseEv @ 1 NONAME
-	_ZN11RAppMgmtRfs7ConnectEv @ 2 NONAME
-	_ZN22NApplicationManagement22RApplicationManagement5CloseEv @ 3 NONAME
-	_ZN22NApplicationManagement22RApplicationManagement7ConnectERK9TCertInfo @ 4 NONAME
-	_ZN22NApplicationManagement22RApplicationManagement7ConnectEv @ 5 NONAME
-	_ZNK11RAppMgmtRfs11PerformRfsLEv @ 6 NONAME
-	_ZNK22NApplicationManagement22RApplicationManagement11DeactivateLEm @ 7 NONAME
-	_ZNK22NApplicationManagement22RApplicationManagement14StartDownloadLEmNS_15TDownloadTargetE @ 8 NONAME
-	_ZNK22NApplicationManagement22RApplicationManagement19DeploymentComponentEmRNS_20TDeploymentComponentE @ 9 NONAME
-	_ZNK22NApplicationManagement22RApplicationManagement19StateChangeCompleteEm @ 10 NONAME
-	_ZNK22NApplicationManagement22RApplicationManagement19StateChangingDCIdsLER6RArrayImE @ 11 NONAME
-	_ZNK22NApplicationManagement22RApplicationManagement23DeploymentComponentIdsLER6RArrayImENS_25TDeploymentComponentStateE @ 12 NONAME
-	_ZNK22NApplicationManagement22RApplicationManagement24DeploymentComponentDataLEmNS_17TDeplCompAttrTypeER8CBufBase @ 13 NONAME
-	_ZNK22NApplicationManagement22RApplicationManagement26DeploymentComponentUserIdLEmR5TBuf8ILi256EE @ 14 NONAME
-	_ZNK22NApplicationManagement22RApplicationManagement26UpdateDeploymentComponentLEmNS_17TDeplCompAttrTypeERK6TDesC8 @ 15 NONAME
-	_ZNK22NApplicationManagement22RApplicationManagement28DeploymentComponentDataSizeLEmRKNS_17TDeplCompAttrTypeE @ 16 NONAME
-	_ZNK22NApplicationManagement22RApplicationManagement30UpdateDeploymentComponentDataLEmNS_17TDeplCompAttrTypeERK6TDesC8S4_ @ 17 NONAME
-	_ZNK22NApplicationManagement22RApplicationManagement7RemoveLEm @ 18 NONAME
-	_ZNK22NApplicationManagement22RApplicationManagement7UpdateLEmm @ 19 NONAME
-	_ZNK22NApplicationManagement22RApplicationManagement8DeliverLERK5TBuf8ILi256EE @ 20 NONAME
-	_ZNK22NApplicationManagement22RApplicationManagement8InstallLEmNS_25TDeploymentComponentStateE @ 21 NONAME
-	_ZNK22NApplicationManagement22RApplicationManagement9ActivateLEm @ 22 NONAME
-	_ZNK22NApplicationManagement22RApplicationManagement9DownloadLERK5TBuf8ILi256EE @ 23 NONAME
-	_ZNK22NApplicationManagement22RApplicationManagement31DeploymentComponentTempInstFileEmR5RFileRKNS_17TDeplCompAttrTypeE @ 24 NONAME
-	_ZNK22NApplicationManagement22RApplicationManagement38UpdateDeploymentComponentStreamedDataLEmNS_17TDeplCompAttrTypeERK6TDesC8 @ 25 NONAME
-
--- a/applicationmanagement/group/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-/*
-* 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:  build info file for application management client & server
-*
-*/
-
-
-
-#include <platform_paths.hrh>
-
-PRJ_EXPORTS
-//../rom/1020781c.txt /epoc32/data/Z/private/10202be9/1020781c.txt
-//../rom/1020781c.txt /epoc32/RELEASE/winscw/UDEB/z/private/10202be9/1020781c.txt
-//../rom/1020781c.txt /epoc32/RELEASE/winscw/UREL/z/private/10202be9/1020781c.txt
-
-../rom/appmgmt.iby	CORE_APP_LAYER_IBY_EXPORT_PATH(appmgmt.iby)
-// Generic configuration interface for component cenrep settings  
-../conf/application_management.confml                        APP_LAYER_CONFML(application_management.confml)
-../conf/application_management_1020781C.crml 	        APP_LAYER_CRML(application_management_1020781C.crml)
-
-PRJ_MMPFILES
-
-#include "../options/group/bld.inf"
-#include "../client/group/bld.inf"
-#include "../server/group/bld.inf"
-#include "../RfsPlugin/group/bld.inf"
-#include "../amadapter2/group/bld.inf"
-#include "../omascomoadapter/group/bld.inf"
--- a/applicationmanagement/inc/ApplicationManagementClient.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,310 +0,0 @@
-/*
-* Copyright (c) 2000 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: Implementation of applicationmanagement components
-*
-*/
-
-
-#ifndef __APPLICATIONMANAGEMENTCLIENT_H__
-#define __APPLICATIONMANAGEMENTCLIENT_H__
-
-// INCLUDES
-
-#include <e32std.h>
-#include "ApplicationManagementCommon.h"
-#include "ApplicationManagementClientServer.h"
-#include "ApplicationManagementConst.h"
-#include <ssl.h>
-#include <f32file.h>
-#include <AknServerApp.h>
-#include <uikon.hrh>
-
-typedef RArray<TUint32> RElementIdArray;
-
-namespace NApplicationManagement
-	{
-
-// CLASS DECLARATION
-
-/**
-*  RApplicationManagement class to establish ApplicationManagement server connection
-*/
-class RAMTC : public RSessionBase
-	{
-		public:
-    /**
-	* Connect Connects client side to application management server
-    * @return KErrNone Symbian error code
-    */
-	IMPORT_C TInt Connect();
-	
-	
-    /**
-	* Close Close server connection
-    */
-	IMPORT_C void Close();
-
-	/**
-	* GetApplicationUidL finds uid for given deployment component.
-	* @param aInternalId Id of the deployment component, whose uid is wished
-	* @param aUid	After successful call, will hold the uid
-	*/	
-	IMPORT_C void GetApplicationUidL( TInt aInternalId, TUid &aUid );
-	};
-	
-
-
-class RApplicationManagement : public RAknAppServiceBase
-	{
-	public:
-
-	       public: // Constructors 
-
-	IMPORT_C RApplicationManagement();
-	    /**
-		* Connect Connects client side to application management server
-	    * @return KErrNone Symbian error code
-        */
-		IMPORT_C TInt Connect( const TCertInfo &aCertInfo );
-		IMPORT_C TInt Connect( );
-		
-	    /**
-		* Close Close server connection
-        */
-		IMPORT_C void Close();
-		
-	
-//Session management		
-	    /**
-		* DeliverL Add deployment component to the system. At least some parameter
-		* (in the aInfo or aData) must not be empty.
-		*
-		* @param aInfo  TDeploymentComponentInfo containing the essentials of component
-		* @param aData The Delivery deployment component Data
-		* @param aInstallOpts Optional install options
-		* @param aMetaData Optional meta data for install operation
-	    * @return Created Internal Id for the deployment component
-        */
-	
-		/**
-		* DownloadL Adds deployment component with EDCSDownload to the system. 
-		* @param aUserId The user id of the component
-	    * @return Created Internal Id for the deployment component
-        */
-		IMPORT_C TUint32 DownloadL( const TDCUserId &aUserId ) const;
-			
-		IMPORT_C TUint32 DeliverL( const TDCUserId &aUserId ) const;
-		/**
-		* DeploymentComponent Returns the deployment component having the given Id.
-		* If there's no such deployment component, method returns
-		* KErrNotFound. 
-		
-		* @param aId Id of the component to be found
-	    * @return KErrNone  Symbian error code (KErrNotFound if not found)
-		*/
-		IMPORT_C TInt DeploymentComponent( 
-			TUint32 aInternalId, TDeploymentComponent &aReturnValue ) const;
-			
-		/**
-		* DeploymentComponentUserId Returns the user id of deployment component 
-		* having the given internal Id.
-		* @param aId Id of the component to be found
-		* @param aResponse The buffer in which the user id will be placed
-	    * @return KErrNone  Symbian error code (KErrNotFound if not found)
-		*/
-		IMPORT_C void DeploymentComponentUserIdL( 
-			TUint32 aInternalId, TDCUserId &aResponse ) const;
-	
-		/**
-		* DeploymentComponentDataL Fetches data for component that's in EDCSDelivered state.
-		* @param aInternalId Id of the component to be found
-		* @param aDataType Type of the data to be found. Must be one of EDCInstallOptions
-		*		EDCMetaData, EDCData, 
-		* @param aBuffer The buffer that will be filled with the data
-	    * @return 
-		*/
-		IMPORT_C void DeploymentComponentDataL( 
-			TUint32 aInternalId, TDeplCompAttrType aDataType, CBufBase &aBuffer ) const;
-			
-		
-		/**
-		* UpdateDeploymentComponentL Updates deployment component.
-		* @param aInternalId Id of the component to be updated
-		* @param aItem Type of the data to be updated.
-		* @param aItemData The data
-	    * @leave The deployment component, or NULL if there's not one
-		*/
-		IMPORT_C void UpdateDeploymentComponentL( TUint32 aInternalId,
-			TDeplCompAttrType aItem, const TDesC8 &aItemData ) const;
-		
-		/**
-		* UpdateDeploymentComponentL Updates deployment component with mime type too.
-		* @param aInternalId Id of the component to be updated
-		* @param aItem Type of the data to be updated. This must be 
-		*	EDCMetaData or EDCData for call to be successful
-		* @param aItemData The data
-		* @param aDataMime The data mime type
-	    * @leave The deployment component, or NULL if there's not one
-		*/	
-		IMPORT_C void UpdateDeploymentComponentDataL( 
-			TUint32 aInternalId, TDeplCompAttrType aItem, 
-			const TDesC8 &aItemData, const TDesC8 &aDataMime ) const; 
-
-		/**
-		* UpdateDeploymentComponentStreamedDataL Updates deployment component with mime type too.
-		* @param aInternalId Id of the component to be updated
-		* @param aItem Type of the data to be updated. This must be 
-		*	EDCMetaData or EDCData for call to be successful
-		* @param aDataMime The data mime type
-	    * @leave The deployment component, or NULL if there's not one
-		*/	
-		IMPORT_C void UpdateDeploymentComponentStreamedDataL( 
-			TUint32 aInternalId, TDeplCompAttrType aItem, const TDesC8 &aDataMime ) const; 
-		
-		/**
-		* DeploymentComponentIds Returns array of the deployment component Ids, that exist in the
-		* system. Optionally one can give a TDeploymentComponentState flag to restrict
-		* resulted ids to those components that has the given state.
-		* @param aArray Will hold the response
-		* @param aState Optional state of the wished deployment components
-	    * @return KErrNone Symbian error code
-		*/
-		IMPORT_C TInt DeploymentComponentIdsL(
-			RElementIdArray &aArray, 
-			const TDeploymentComponentState aState = EDCSNone  ) const;
-			
-		/**
-		* InstallL Installs given deployment component.
-		* @param aInternalId The id of deployment component to be installed
-	    * @param aTargetState Will the installed component be actibve or inactive (default active)
-		* @return KErrNone Symbian error code
-		*/
-		IMPORT_C void InstallL( TUint32 aInternalId , 
-			TDeploymentComponentState aTargetState = EDCSActive) const;
-
-		/**
-		* RemoveL Removes given deployment component.
-		* @param aInternalId The id of the component to be removed
-	    * @return 
-		*/
-		IMPORT_C void RemoveL( TUint32 aInternalId ) const;
-		
-		/**
-		* UpdateL Updates the given deployment
-		* @param aSourceInternalId The id of the component that is source of update
-		* @param aTargetInternalId The id of the component that is target of update
-	    * @leave 
-		*/
-		IMPORT_C void UpdateL( TUint32 aSourceInternalId, TUint32 aTargetInternalId ) const;
-		
-		/**
-		* StartDownloadL Starts download of deployment component.
-		* @param aInternalId The id of the component to be downloaded
-		* @param aTargetState The target state of download (
-	    * @return 
-		*/
-		IMPORT_C void StartDownloadL( TUint32 aInternalId, 
-			const TDownloadTarget aTarget= EDeliver  ) const;
-		
-		
-	 	/**
-		* StateChangingDCIds Returns array of the deployment component Ids, that are
-		* in the state changing list. Currently they are those that are being downloaded.
-		* @param aArray Will hold the response
-		
-	    * @return KErrNone Symbian error code
-		*/
-		IMPORT_C TInt StateChangingDCIdsL( RElementIdArray &aArray ) const;
-		
-		/**
-		* StateChangeComplete Informs server that the state of component is updated in the
-		*	adapter, and that it thus can be removed from the list of state changing objects.
-		* @param aInternalId The id of the component to be removed from list
-		*
-	    * @return KErrNone Symbian error code
-		*/
-		IMPORT_C TInt StateChangeComplete( TUint32 aInternalId ) const;
-		
-		/**
-		* ActivateL Tries to activate given deployment component
-		*	
-		* @param aInternalId The id of the component to be activated
-		*/
-		IMPORT_C void ActivateL( TUint32 aInternalId ) const;
-		
-		/**
-		* DeactivateL Tries to deactivate given deployment component
-		*	
-		* @param aInternalId The id of the component to be deactivated
-		*/
-		IMPORT_C void DeactivateL( TUint32 aInternalId ) const;
-		
-		/**
-		* DeploymentComponentDataSizeL Get deployment component attribute size
-		*	
-		* @param aInternalId The id of the component 
-		* @param aItem The type of attribute whose size is to be got
-		* @return The size
-		*/
-		IMPORT_C TInt DeploymentComponentDataSizeL( TUint32 aInternalId, 
-			const TDeplCompAttrType &aItem ) const;
-
-		/**
-		* DeploymentComponentTempInstFile ask file handle from server to be used
-		*	
-		* @param aTempFile temporary file handle 
-		* @param aItem The type of attribute whose type of temporary file to get
-	    * @return KErrNone Symbian error code
-		*/
-		IMPORT_C void DeploymentComponentTempInstFileL( TUint32 aInternalId, RFile& aTempFile, const TDeplCompAttrType &aItem ) const;
-
-		/**
-		 * GetFinalResultsForGAL ask results from AM Server. In response AM 
-         * server returns final result and target URI of node
-         *	
-         * @param aInternalId The id of the component 
-         * @param aFinalResult Final result of deployment component
-         * @param aTargetURI Target URI of deployment component
-         * @return void
-         */
-		IMPORT_C void GetFinalResultsForGAL(TUint32 aInternalId, TInt& aFinalResult,  TDes8& aTargetURI) const;
-		
-		IMPORT_C void GenericAlertSentL(TUint32 aInternalId) const;
-		
-		/**
-		* Implementation of Service UID() from base class. Returns AM service UID 
-		* to framework
-		*	
-		* @return uid of AM service UID
-		*/	
-		TUid ServiceUid() const;  
-        /**
-         * CheckStatusNodes Checks all deployed,delivered and download component's status node values
-         * and set the state accordingly. For ex, on first SCOMO session if status node = Download progress
-         * which means that download operation is failed in previous sessiona and hence we need to set the
-         * value of status node to Download failed.
-         *   
-         */
-        IMPORT_C void CheckStatusNodesL( ) const;
-		  
-	private:	
-	};
-
-
-	}
-
-#endif //__APPLICATIONMANAGEMENTCLIENT_H__
-
-
-//  End of File
--- a/applicationmanagement/inc/ApplicationManagementClientServer.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,84 +0,0 @@
-/*
-* Copyright (c) 2000 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: Implementation of applicationmanagement components
-*
-*/
-
-// 
-
-#ifndef __APPLICATIONMANAGEMENTCLIENTSERVER_H__
-#define __APPLICATIONMANAGEMENTCLIENTSERVER_H__
-
-#include <e32std.h>
-
-_LIT(KApplicationManagementServerName,"ApplicationManagement");
-_LIT(KApplicationManagementServerImg,"ApplicationManagement");		// DLL/EXE name
-
-const TUid KApplicationManagementServerUid={0x1020781C};
-
-namespace NApplicationManagement
-	{
-	
-//const TInt KMaxReturnMessageLength = 100;
-//const TInt KElementIdMaxLength = 100;
-
-const TUint KMessageDelimiterChar = '|' ;
-
-
-const TInt KAMVerMajor = 1;
-const TInt KAMVerMinor = 0;
-const TInt KAMVerBuild = 0;
-
-
-enum TApplicationManagementMessages
-	{
-	EAddTrust,
-	EDeplCompCountOperation,
-	EDeplCompIdsOperation,
-//	EDeplCompDeliverStartOperation,
-	EDeplCompDeliverCompleteOperation,
-	EDeplCompGetOperation,
-	EDeplCompGetDataOperation,
-	EDeplCompGetDataLengthOperation,
-	EDeplCompAttrUpdateOperation, // updates "simple" common attribute
-	EDeplCompUpdateDataOperation, // updates "larger" attrbute, such as data
-	EDeplCompUpdateStreamedDataOperation,// 10
-	EInstallOperation, 
-	EUpdateOperation,
-	EDeplCompRemoveOperation,
-	EDeplCompDownloadOperation,
-	EDeplCompActivateOperation,
-	EDeplCompDeactivateOperation,
-	EDeplCompDeliverStartOperation2,
-	EDeplCompUpdateOperation, // updates whole component
-	EDeplCompGetUserIdOperation, // returns the user id
-	EDeplCompStartDownloadOperation,  // 20
-	EGetStateChangingIdsCountOperation,
-	EGetStateChangingIdsOperation, // gets list of ids that are potentially changing state
-	ECompleteStateChangeOperation, // completes change of state
-	EDeplCompGetTemporaryInstFile,
-	EDeplCompGetTargetURI,
-	EDeplCompGetFinalResultForGA,
-	EDeplCompGenericAlertSent,
-	ECheckStatusNodes,
-    EPerformRfs,
-	ELast
-	
-	};
-
-	
-	}
-#endif// __ApplicationManagementCLIENTSERVER_H__
-	
-//  End of File
--- a/applicationmanagement/inc/ApplicationManagementCommon.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,215 +0,0 @@
-/*
-* Copyright (c) 2000 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: Implementation of applicationmanagement components
-*
-*/
-
-
-#ifndef __APPLICATIONMANAGEMENTCOMMON_H__
-#define __APPLICATIONMANAGEMENTCOMMON_H__
-
-#include <e32base.h>
-#include <uikon.hrh>
-#include "ApplicationManagementConst.h"
-
-namespace NApplicationManagement
-	{
-
-const TUint32  KAppMgmtServerUid         = {0x1020781C};
-
-const TUint32 KAMServiceUid = {0x1020781B};
-
-const TUint32 KOmaDMAppUid = {0x1020781C};
-const TInt KVersionLength= 7; // 3 for Major, 1 for '.' and 3 for Minor
-_LIT( KLiteralPeriod, ".");
-
-const TInt KAMDefaultValue = 0;
-const TInt KAMSCMAdapter = 1;
-const TInt KAMSCOMOAdapter = 2;
-
-const int KDCIdMaxLength = 128 ;
-typedef TBuf8<KDCIdMaxLength> TDeploymentComponentId;
-
-const int KDeploymentComponentNameMaxLength = 128 ;
-typedef TBuf8<KDeploymentComponentNameMaxLength> TDeploymentComponentName;
-
-const int KDeploymentComponentVersionMaxLength = 32;
-typedef TBuf8<KDeploymentComponentVersionMaxLength> TDeploymentComponentVersion;
-
-const int KDeploymentComponentDescriptionMaxLength = 512;
-typedef TBuf8<KDeploymentComponentVersionMaxLength> TDeploymentComponentDescription;
-
-const int KDeploymentComponentPkgIdMaxLength = 256;
-typedef TBuf8<KDeploymentComponentPkgIdMaxLength> TDeploymentComponentPkgId;
-
-const int KDeploymentComponentPkgIdRefMaxLength = 256;
-typedef TBuf8<KDeploymentComponentPkgIdRefMaxLength> TDeploymentComponentPkgIdRef;
-
-const int KDeploymentComponentPkgTypeRefMaxLength = 256;
-typedef TBuf8<KDeploymentComponentPkgTypeRefMaxLength> TDeploymentComponentPkgType;
-
-typedef TBuf8<KDeploymentComponentNameMaxLength> TMidletnameName;
-
-typedef TBuf8<KDeploymentComponentNameMaxLength> TMidletVendorName;
-typedef TBuf8<KDeploymentComponentVersionMaxLength> TMidletVersion;
-
-typedef TBuf8<KDeploymentComponentNameMaxLength> TPreInstalledAppName;
-typedef TBuf8<KDeploymentComponentNameMaxLength> TPreInstalledAppVendorName;
-typedef TBuf8<KDeploymentComponentVersionMaxLength> TPreInstalledVersion;
-
-const int KDeploymentComponentURLMaxLength = 32;
-
-const int KMaxMimeLength = 256 ;
-typedef TBuf8<KMaxMimeLength> TMimeType;
-
-const int KMaxDCUserIdLength = 256;
-typedef TBuf8<KMaxDCUserIdLength> TDCUserId;
-
-enum TDeploymentComponentState
-	{
-	EDCSError = -1,
-	EDCSNone = 0,
-	EDCSDelivered = 1,
-	EDCSInactive = 2,
-	EDCSActive = 3,
-	EDCSDownload = 4,
-	EDCSDeployed =5,
-	EDCSDelete = 6
-	};
-	
-enum TDeplCompAttrType 
-	{
-	EDCNone = 0,
-	EDCId = 1,
-	EDCName = 2,
-	EDCVersion = 4,
-	EDCInstallOptions = 8,
-	EDCMetaData = 16,
-	EDCMetaDataMime = 24,
-	EDCData = 32,
-	EDCDataMime = 48,
-	EDCStatus = 64,
-	EDCDownloadURI = 128,
-	EDCStateValue = 256,
-	EDCConRef = 512,
-	EDCDescriptionRef = 1024,
-	EDCPkgID = 2048,
-	EDCPkgType = 4096
-	};
-
-enum TDownloadTarget
-	{
-	EDeliver,
-	EInstall,
-	EInstallAndActivate,
-	EUpdate,
-	EUpdateAndActivate
-	};
-enum TSCOMOStatusNodeStates
-    {
-    //Download Status Values
-    EIdle = 10,
-    EDownload_DownloadFailed = 20,
-    EDownload_DownloadProgress = 30,
-    EDownload_DownloadComplete = 40,
-    EDownload_InstallProgress = 50,
-    EDownload_InstalledFailedWithData = 60,
-    EDownload_InstalledFailedWithOutData = 70,
-    //Delivered Status Values
-    EDelivered_RemoveFailed = 20,
-    EDelivered_RemoveProgress = 30,
-    EDelivered_InstallProgress = 40,
-    EDelivered_InstalledFailedWithData = 50,
-    EDelivered_InstallFailedwithOutData = 60,
-    //Deployed Status Values
-    EDeployed_RemoveFailed = 20,
-    EDeployed_RemoveProgress = 30,
-    EDeployed_ActivateFailed = 40,
-    EDeployed_ActivateProgress = 50,
-    EDeployed_DeactivateFailed = 60,
-    EDeployed_DeactivateProgress = 70
-    };
-/**
-*  CAMDeliveryDeploymentComponent class to represent delivery items
-*/	
-
-struct TDeploymentComponent 
-	{
-	// Data
-	TDeploymentComponentId iId ;
-	TDeploymentComponentName iName;
-	TDeploymentComponentVersion iVersion ;
-	TDeploymentComponentDescription iDescription;
-	TDeploymentComponentPkgId iPkgID;
-	TDeploymentComponentPkgIdRef iPkgIDRef;
-	TDeploymentComponentPkgType iPkgType;
-	TDeploymentComponentState iState ;
-	TDeploymentComponentState iOldState ;
-	TDeploymentComponent() : iId( KNullDesC8() ),
-							 iName( KNullDesC8() ),
-							 iVersion( KNullDesC8() ),
-							 iDescription (KNullDesC8),
-							 iState( EDCSNone ),
-							 iOldState ( EDCSNone ) 
-							 
-	{
-	
-	}
-	TDeploymentComponent( const TDesC8 &aId, 
-						  const TDesC8 &aName, 
-						  const TDesC8 &aVersion, 
-						  TDeploymentComponentState aState )
-		: iId( aId ), 
-		iName( aName ), 
-		iVersion ( aVersion ), 
-		iState ( aState ), 
-		iOldState( EDCSNone )
-		{
-		} 
-	};
-
-struct TDeploymentComponentIPC
-	{
-	TDeploymentComponent iComponent;
-	TBuf8<256> iMimeType;
-	TDCUserId iUserId;
-	TDeploymentComponentIPC() : iComponent(),
-								iMimeType( KNullDesC8() ),
-								iUserId( KNullDesC8())
-								
-		{
-		
-		}
-	TDeploymentComponentIPC( const TDeploymentComponent &aComponent,
-		const TDesC8 &aMimeType,
-		const TDCUserId &aUserId) 
-			: iComponent( aComponent ), 
-				iMimeType( aMimeType ),
-				iUserId( aUserId )
-		{
-		
-		}
-	};
-	
-struct TDeplCompDataIPC
-	{
-	TUint32 iInternalId;
-	TDeplCompAttrType iAttrType;
-	TBuf8<256> iDataMime;
-	};	
-	
-	}
-#endif 
-
-//  End of File
--- a/applicationmanagement/inc/ApplicationManagementConst.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,87 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
- *
- * Description:  Implementation of applicationmanagement components
- *
-*/
-
-
-#ifndef __AMC_H__
-#define __AMC_H__
-
-
-// Successful - The Request has Succeeded
-
-const TInt KStatusSuccess = 1200;
-
-//User chose not to accept the operation when prompted
-
-const TInt KStatusUserCancelled = 1401;
-
-//The Software Component download failed 
-
-const TInt KStatusDownloadFailed = 1402;
-
-//The download failed due to insufficient memory in the Device 
-//to save the Delivery Package.
-
-const TInt KStatusDowloadFailedOOM = 1404;
-
-//Software Component  installation failed in the Device
-
-const TInt KStatusInstallFailed = 1405;
-
-//The install failed because there wasn't sufficient memory to install 
-//the Software Component in the Device.
-
-const TInt KStatusInstallFailedOOM = 1406;
-
-//Failure to positively validate digital signature of the Delivery Package
-
-const TInt KStatusPkgValidationFailed = 1407;
-
-//The Software Component Remove operation failed
-
-const TInt KStatusRemoveFailed = 1408;
-
-//The Software Component Activate operation failed
-
-const TInt KStatusActivationFailed = 1409;
-
-//The Software Component Deactivate operation failed
-
-const TInt KStatusDeactivationFailed = 1410;
-
-//The Operation has been rejected because the device does not support the target environment type
-
-const TInt KStatusUnSupportedEnvironment = 1413;
-
-//Alternate Download Server Error Encountered
-
-const TInt KStatusAltDowldError = 1500;
-
-//The Alternate Download Server is unavailable or does not respond
-
-const TInt KStatusAltDowldUnavailable = 1501;
-
-//Authentication was Required but Authentication Failure was encountered when downloading Software Component
-
-const TInt KStatusAlternateDownldAuthFail = 1403;
-
-
-
-
-    
-
-#endif
-//  End of File
--- a/applicationmanagement/inc/ApplicationManagementRfs.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,71 +0,0 @@
-/*
-* Copyright (c) 2000 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: Implementation of applicationmanagement components
-*
-*/
-
-
-#ifndef __AMRFS_H__
-#define __AMRFS_H__
-
-#include <e32std.h>
-#include <AknServerApp.h>
-#include <e32std.h>
-#include "ApplicationManagementClientServer.h"
-#include <ssl.h>
-#include <f32file.h>
-#include <AknServerApp.h>
-#include <uikon.hrh>
-
-class RAppMgmtRfs : public RAknAppServiceBase
-	{
-	public: // Constructors 
-
-	IMPORT_C RAppMgmtRfs();
-	
-	/**
-	 * Connect Connects to ApplicationManagmeent server (starts it if it's not 
-	 *	running
-	 * @return KErrNone or Symbian error code
-	 */
-	IMPORT_C TInt Connect();
-	
-	
-	/**
-	 * Close Closes connection to ApplicationManagement server
-	 * @return KErrNone or Symbian error code
-	 */
-	IMPORT_C void Close();
-
-	// New methods
-	
-	/**
-	 * PerformRfsL Causes ApplicationManagement to prepare for RFS. That means
-	 * 	uninstall of serveral applications, etc.
-	 * @return KErrNone or Symbian error code
-	 */
-	IMPORT_C void PerformRfsL() const;
-	
-	  /**
-		* Implementation of Service UID() from base class. Returns AM service UID 
-		* to framework
-		*	
-		* @return uid of AM service UID
-		*/	
-		TUid ServiceUid() const;  
-	};
-	
-#endif
-
-//  End of File
--- a/applicationmanagement/inc/amprivateCRKeys.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,190 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
- *
- * Description:  Implementation of applicationmanagement components
- *
-*/
-
-#ifndef __AMPRIVATECRKEYS_H__
-#define __AMPRIVATECRKEYS_H__
-
-/**
-* Application Management Internal Keys UID
-*/
-const TUid KCRUidPrivateApplicationManagementKeys = {	0x1020781C };
-
-/**
-* CenRep key that holds smallest supported Internal Component Id 
-*
-* Possible integer values:
-* positive integer values 
-*
-* Default value: -1 (not defined)
-*
-* Note: Only for Application Management private use
-*
-*/
- 
-const TInt KMinIdValue = 0x20;
-
-/**
-* CenRep key for Next free ID:
-* Holds the next free if for deployment component
-*
-* Possible integer values:
-* positive integer values 
-*
-* Default value: -1 (not defined)
-*
-* Note: Only for Application Management private use
-*
-*/
-const TInt KNextIdKey = 0x01;
-
-/**
-* Holds the lenght of deployment component id list
-*
-* Possible integer values:
-* positive integer values 
-*
-* Default value: 0 
-*
-* Note: Only for Application Management private use
-*
-*/
-const TInt KIdListLengthKey = 0x02;
-
-/**
-* Holds the deployment component id list
-*
-* Possible string values: Application Management defined
-*
-* Default value: (empty)
-*
-* Note: Only for Application Management private use
-*
-*/
-const TInt KIdListKey = 0x03 ;
-
-/**
-* Holds the value which determines whether SYnc or Async operation
-* is enabled
-*
-* Possible string values: Application Management defined
-*
-* Default value: 1 ( ASync is enabled)
-*
-* Note: Only for Application Management private use
-*
-*/
-const TInt KAsyncEnabled = 0x04;
-
-/**
-* This value is static node name and cenrep configurable
-*
-* Possible string values: Application Management defined
-*
-* Note: Only for Application Management private use
-*
-*/
-
-const TInt KAMDownloadPredefinedNode= 0x05 ;
-
-/**
-* This value is retry count and determines the maximum
-* allowable retry count
-*
-* Possible string values: Application Management defined
-*
-* Note: Only for Application Management private use
-*
-*/
-const TInt KMaxRetryCount = 0x06;
-
-/**
-* This value stores the status of Sync reporting 
-*
-* Possible string values: Application Management defined
-*
-* Note: Only for Application Management private use
-*
-*/
-const TInt KAMSyncStatus = 0x07;
-
-/**
-* This value tells which adapter(SCM/SCOMO) did DM operations (ADD/DELETE/GET/UPDATE/EXEC) in previous DM session.
-* Based on this we will call CheckStateChangesL() in DDFStructurel() API 
-*
-* Possible string values: default      - 0
-*                         SCM adapter  - 1
-*                         SCOMO adapter -2
-*
-* Note: Only for Application Management private use
-*
-*/
-const TInt KAMAdapterValue = 0x08;
-
-/**
-* This value checks if Static node feature is enabled  
-* if value is 1 then CMCCSCM static node is visible under 
-* download node otherwise it is not visible
-* 
-* default value from platform side this feature is disabled.
-* 
-* Note: Only for Application Management private use
-*/
-const TInt KAMStaticNodeEnabled = 0x09;
-
-/**
-* This value indicate SCOMO MetaType used in generic alert and this 
-* is configurable
-* 
-* Note: Only for Application Management private use
-* 
-* 
-*/
-const TInt KSCOMOMetaTypeKey = 0x0A;
-
-/**
-* This value indicate SCOMO MetaFormat used in generic alert and this 
-* is configurable
-* 
-* Note: Only for Application Management private use
-* 
-* 
-*/
-const TInt KSCOMOMetaFormatKey = 0x0B;
-
-/**
-* This value indicate SCOMO Mark used in generic alert and this 
-* is configurable
-* 
-* Note: Only for Application Management private use
-* 
-* 
-*/
-const TInt KSCOMOMark = 0x0C;
-
-/**
-* This default value is used to get drive from cenrep and this is
-* applicable in case of silent mode of SCOMO operation
-* 
-* Note: Only for Application Management private use
-* 
-* 
-*/
-const TInt KDefaultDriveForInstall = 0x0D;
-
-#endif // __AMPRIVATECRKEYS_H__
-
-// End of file
--- a/applicationmanagement/inc/ampskeys.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
- *
- * Description:  Implementation of applicationmanagement components
- *
-*/
-
- 
-#ifndef __AMPSKEYS_H__
-#define __AMPSKEYS_H__
-
-// Application Management Server UID for Publish and Subscribe key
-
-const TUid KUidPSApplicationManagementKeys = { 0x1020781C };
-
-// P&S key to check whether AM UI Server is enabled or disabled
-
-const TUint KAMServerUIEnabled = 0x00001;
-
-// P&S key to check whether device management session is silent
-// or interactive(can be information or nonspecified as well)
-
-const TUint KAMOperationNonSilent = 0x00002;
-
-// P&S key to Notify OMA SCOMO adapter as soon as download is
-// complete. This will be applicable in case of Sync operation
-
-const TUint KSyncNotifier = 0x000004;
-
-// Set this P&S key so that DM UI will not be closed in case of server initiated session
-// applicable only for Interactive, Informative or Non specified
-
-const TUint KDMUINotClosed = 0x00005;
-
-
-// DM UI application ID
-
-const TUid KPSUidNSmlDMSyncApp = {0x101f6de5};
-
-// Key defined in DM UI Fw to know application management server
-// whether session started in silent mode or non-silent
-
-const TUint32 KSilentSession = 0x0000000D;
-
-
-
-
-#endif
-
-
--- a/applicationmanagement/inc/debug.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,85 +0,0 @@
-/*
-* 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:  Application Management Debug macro definitions
-*
-*/
-
-
-#ifndef DEBUG_HEADER_
-#define DEBUG_HEADER_
-
-// INCLUDES
-
-#include <f32file.h>
-#include <flogger.h>
-
-// CONSTANTS
-_LIT( KTarmLogFolderName, "tarm" );
-_LIT( KTarmLogFileName, "tarm.log" );
-// MACROS
-
-#ifdef _TARM_FILE_DEBUG
-		#define RDEBUG(X)					RFileLogger::Write( KTarmLogFolderName, KTarmLogFileName, EFileLoggingModeAppend, _L(X) )
-		#define RDEBUG_2(X,Y)			RFileLogger::WriteFormat( KTarmLogFolderName, KTarmLogFileName, EFileLoggingModeAppend, _L(X),Y )	
-		#define RDEBUG_3(X,Y,Z)	  RFileLogger::WriteFormat( KTarmLogFolderName, KTarmLogFileName, EFileLoggingModeAppend, _L(X),Y,Z )	
-		#define RDEBUG_4(X,Y,Z,A)	  RFileLogger::WriteFormat( KTarmLogFolderName, KTarmLogFileName, EFileLoggingModeAppend, _L(X),Y,Z,A )	
-		#define RDEBUG_5(X,Y,Z,A,B)	  RFileLogger::WriteFormat( KTarmLogFolderName, KTarmLogFileName, EFileLoggingModeAppend, _L(X),Y,Z,A,B )
-		
-		#define RDEBUG8_2(X,Y)			RFileLogger::WriteFormat( KTarmLogFolderName, KTarmLogFileName, EFileLoggingModeAppend, _L8(X),Y )	
-		#define RDEBUG8_3(X,Y,Z)	  RFileLogger::WriteFormat( KTarmLogFolderName, KTarmLogFileName, EFileLoggingModeAppend, _L8(X),Y,Z )	
-		#define RDEBUG8_4(X,Y,Z,A)	  RFileLogger::WriteFormat( KTarmLogFolderName, KTarmLogFileName, EFileLoggingModeAppend, _L8(X),Y,Z,A )	
-		#define RDEBUG8_5(X,Y,Z,A,B)	  RFileLogger::WriteFormat( KTarmLogFolderName, KTarmLogFileName, EFileLoggingModeAppend, _L8(X),Y,Z,A,B )
-		#define RDEBUG_HEX8(X,Y)	RFileLogger::HexDump( KTarmLogFolderName, KTarmLogFileName, EFileLoggingModeAppend, NULL, NULL, X,Y )	
-		
-#else
-
-	#ifdef _DEBUG
-		#define RDEBUG(X)								RDebug::Print(_L(X))
-		#define RDEBUG_2(X,Y)						RDebug::Print(_L(X),Y)
-		#define RDEBUG_3(X,Y,Z)					RDebug::Print(_L(X),Y,Z)
-		#define RDEBUG_4(X,Y,Z,A)					RDebug::Print(_L(X),Y,Z,A)
-		#define RDEBUG_5(X,Y,Z,A,B)					RDebug::Print(_L(X),Y,Z,A,B)
-		
-		#define RDEBUG8_2(X,Y)						RDebug::Printf(X,Y)
-		#define RDEBUG8_3(X,Y,Z)					RDebug::Printf(X,Y,Z)
-		#define RDEBUG8_4(X,Y,Z,A)					RDebug::Printf(X,Y,Z,A)
-		#define RDEBUG8_5(X,Y,Z,A,B)					RDebug::Printf(X,Y,Z,A,B)
-		
-		#define RDEBUG_HEX8(X,Y)
-		
-	#else
-		#define RDEBUG(X)								
-		#define RDEBUG_2(X,Y)						
-		#define RDEBUG_3(X,Y,Z)	
-		#define RDEBUG_4(X,Y,Z,A)	
-		#define RDEBUG_5(X,Y,Z,A,B)	
-		
-		#define RDEBUG8_2(X,Y)
-		#define RDEBUG8_3(X,Y,Z)	
-		#define RDEBUG8_4(X,Y,Z,A)			
-		#define RDEBUG8_5(X,Y,Z,A,B)		
-		
-		#define RDEBUG_HEX8(X,Y)		
-		
-	#endif // _DEBUG
-	
-#endif // _TARM_FILE_DEBUG
-
-
-
-
-#endif // DEBUG_HEADER_
-
-
-
--- a/applicationmanagement/omascomoadapter/group/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-/*
-* Copyright (c) 2004 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:  build info file for application management adapter
-*
-*/
-
-
-#include <platform_paths.hrh>
-
-PRJ_EXPORTS
-
-
-// ARMv5 udeb
-../src/20021335.SPD        /epoc32/release/armv5/udeb/z/private/100012a5/policy/20021335.spd
-
-// ARMv5 urel
-../src/20021335.SPD        /epoc32/release/armv5/urel/z/private/100012a5/policy/20021335.spd
-
-// WINSCW udeb
-../src/20021335.SPD        /epoc32/release/winscw/udeb/z/private/100012a5/policy/20021335.spd
-
-// WINSCW urel
-../src/20021335.SPD        /epoc32/release/winscw/urel/z/private/100012a5/policy/20021335.spd
-
-../src/20021335.SPD        /epoc32/data/z/private/100012a5/policy/20021335.spd
-
-PRJ_MMPFILES
-./omascomoadapter.mmp
-
-
-
-
--- a/applicationmanagement/omascomoadapter/group/omascomoadapter.mmp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,84 +0,0 @@
-/*
-* 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:  Implementation of oma scomo adapter
-*
-*/
-  
-
-// To get the APP_LAYER_SYSTEMINCLUDE-definition
-#include <platform_paths.hrh>
-#include "defaultcaps.hrh"
-
-
-TARGET          omascomoadapter.dll
-
-CAPABILITY 	    CAP_GENERAL_DLL
-
-TARGETTYPE      PLUGIN
-UID             0x10009D8D 0x20021335
-VENDORID        VID_DEFAULT
-
-MACRO __AM_LASTERROR_NODE // uncomment to enable /SCOMO/Ext/LastError node
-
-APP_LAYER_SYSTEMINCLUDE
-SYSTEMINCLUDE 	/epoc32/include/ecom
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-SYSTEMINCLUDE 	/epoc32/include/devman
-#else
-// nothing
-#endif
-
-SOURCEPATH      ../src
-SOURCE          omascomoadapter.cpp
-SOURCE					nsmldmiapmatcher.cpp
-SOURCE					nsmldmuri.cpp
-SOURCE		omascomoadapterdb.cpp
-
-USERINCLUDE     ../inc 
-USERINCLUDE			../../inc
-USERINCLUDE 		../../options/inc // install options
-USERINCLUDE 		../../server/inc  //for amprivateCRKeys.h
- 
-
-START RESOURCE omascomoadapter.rss
-TARGET omascomoadapter.rsc
-END
-
-
-LIBRARY		euser.lib edbms.lib sysutil.lib 
-LIBRARY		ecom.lib 
-LIBRARY     estor.lib
-LIBRARY		efsrv.lib 
-LIBRARY		applicationmanagement.lib
-LIBRARY		centralrepository.lib 
-LIBRARY 	aminstalloptions.lib 
-LIBRARY		featmgr.lib 
-LIBRARY 	flogger.lib
-LIBRARY			syncmlclientapi.lib
-LIBRARY			nsmlprivateapi.lib
-LIBRARY     	syncservice.lib
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-LIBRARY		devmancmdmgr.lib
-LIBRARY		dmtreeclient.lib
-#else
-LIBRARY		nsmldmtreedbclient.lib
-LIBRARY		nsmldmclientserverutils.lib
-LIBRARY		nsmldmiapmatcher.lib apgrfx.lib ws32.lib 
-#endif
-
-SMPSAFE
-
-// End of File
--- a/applicationmanagement/omascomoadapter/inc/nsmldmiapmatcher.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,129 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
- *
- * Description:  Implementation of applicationmanagement components
- *
-*/
-
-
-#ifndef __NSMLDMIAPMATCHER_H__
-#define __NSMLDMIAPMATCHER_H__
-
-// ------------------------------------------------------------------------------------------------
-// Includes
-// ------------------------------------------------------------------------------------------------
-#include <e32base.h>
-#include "nsmldmuri.h"
-
-//CLASS FORWARDS
-class MSmlDmCallback;
-
-_LIT8( KNSmlDMIAPUri, "AP" );
-_LIT8( KNSmlDMSeparator8, "/" );
-_LIT8( KNSmlDMIAPUriDotSlash, "./" );
-_LIT8( KNSmlDMConnMOIAPUri, "NAP" );
-
-const TUint8 KNSmlDMSlash = 0x2f; //forward slash
-/**
-* CNSmlDMIAPMatcher contains services for generating URI from IAPId and
-* vice versa in DM plug-in adapters. The class needs the working
-* MSmlDmCallback callback interface for operating, so ths can be used only
-* by DM plug-in adapters
-*
-*  @since
-*/
-class CNSmlDMIAPMatcher : public CBase
-	{
-    public:
-		/**
-		* Destructor
-		*/
-	    ~CNSmlDMIAPMatcher();
-
-		/**
-		* Two-phased constructor
-		* @param	aDmCallback			Pointer to callback interface
-		* @return						Pointer to newly created module instance
-		*/
-        static CNSmlDMIAPMatcher* NewL( MSmlDmCallback* aDmCallback);
-
-		/**
-		* Two-phased constructor, pushes pointer to cleanup stack.
-		* @param	aDmCallback			Pointer to callback interface
-		* @return						Pointer to newly created module instance
-		*/
-        static CNSmlDMIAPMatcher* NewLC( MSmlDmCallback* aDmCallback);
-
-		/**
-		* Gets the IAP id which corresponds to given URI
-		* @param	aURI				Accespoint URI
-		* @return						Accespoint id in AP database
-		*/
-        TInt IAPIdFromURIL( const TDesC8& aURI );
-
-		/**
-		* Generates the URI which corresponds to given IAP Id
-		* @param	aIAPId				Accespoint Id
-		* @return						Accesspoint URI in DM
-		*/
-        HBufC8* URIFromIAPIdL( TInt aIAPId );
-
-    private:
-		/**
-		* Second phase constructor
-		* @param	aDmCallback			Pointer to callback interface
-		*/
-        void ConstructL(MSmlDmCallback* aDmCallback);
-
-		/**
-		* Changes the given descriptor to Integer
-		* @param	aLuid				Luid in descriptor format
-		* @return						Luid in TInt type
-		*/
-        TInt DesToInt(const TDesC8& aLuid) const;
-
-		/**
-		* Return the URI without ./ at the beginning, if those exist
-		* @param	aURI		Uri
-		* @return 		 		Uri without ./
-		*/
-        TPtrC8 RemoveDotSlash(const TDesC8& aURI) const;
-
-		/**
-		* Return the last uri segment of the aURI
-		* @param	aURI		Uri
-		* @return 		 		The last uri segment
-		*/
-        TPtrC8 LastURISeg(const TDesC8& aURI) const;
-        
-    /**
-		* Return the last uri segment of the aURI
-		* @return 		 		The AccessPoint Reference
-		*/
-        const TDesC8& GetConRef() ;
-
-    private:
-    
- 		/**
-		* Pointer to callback interface
-		*/
-		MSmlDmCallback* iCallback;
-		
-		/**
-		* Boolean to check FeatMgr Initialization
-		*/
-		TBool iFeatMgrInitialized;
-	
-	};
-
-#endif // __NSMLDMIAPMATCHER_H__
--- a/applicationmanagement/omascomoadapter/inc/nsmldmuri.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,94 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
- *
- * Description:  Implementation of applicationmanagement components
- *
-*/
-
-#ifndef __NSMLDMURI_H
-#define __NSMLDMURI_H
-
-#include <e32std.h>
-#include <e32base.h>
-#include <e32def.h>
-
-
-const TUint8 KNSmlDMUriSeparator = 0x2f; //forward slash
-
-_LIT8(KNSmlDmRootUri, ".");
-_LIT8(KNSmlDmUriDotSlash, "./");
-_LIT8( KNSmlDmQuestionMark, "?" );
-
-// ===========================================================================
-// NSmlDmURI
-// ===========================================================================
-/**
-* NSmlDmURI contains just static methods for parsing URIs
-*
-*  @since
-*/
-class NSmlDmURI
-	{
-	public:
-	/**
-	* Return the parent URI of given URI
-	* @param	aURI		Uri
-	* @return 		 		Parent URI
-	*/
-	static TPtrC8 ParentURI(const TDesC8& aURI);
-
-	/**
-	* Return the last URI segment of given URI
-	* @param	aURI		Uri
-	* @return 		 		Last URI segment
-	*/
-	static TPtrC8 LastURISeg(const TDesC8& aURI);
-
-	/**
-	* Return the URI without ./ at the beginning, if those exist
-	* @param	aURI		Uri
-	* @return 		 		Uri without ./
-	*/
-	static TPtrC8 RemoveDotSlash(const TDesC8& aURI);
-
-	/**
-	* Return the URI without property info at the end (?prop=...)
-	* @param	aURI		Uri
-	* @return 		 		Uri without property info
-	*/
-	static TPtrC8 RemoveProp(const TDesC8& aURI);
-
-	/**
-	* Return the URI without last segment
-	* @param	aURI		Uri
-	* @return 		 		URI without last uri segment
-	*/
-	static TPtrC8 RemoveLastSeg(const TDesC8& aURI);
-
-	/**
-	* Return the aLocationth URI segment.
-	* @param	aURI		Uri
-	* @param	aLocation	The wanted segment number
-	* @return 		 		The aLocationth URI segment
-	*/
-	static TPtrC8 URISeg(const TDesC8& aURI,TInt aLocation);
-
-	/**
-	* Return the number of URI  segments of given URI
-	* @param	aURI		Uri
-	* @return 		 		Number of segments
-	*/
-	static TInt NumOfURISegs(const TDesC8& aURI);
-	};
-
-#endif // __NSMLDMURI_H
--- a/applicationmanagement/omascomoadapter/inc/omascomoadapter.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,851 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
- *
- * Description:  Implementation of applicationmanagement components
- *
-*/
-
-
-#ifndef __OMASCOMOADAPTER_H__
-#define __OMASCOMOADAPTER_H__
-
-// ------------------------------------------------------------------------------------------------
-// Includes
-// ------------------------------------------------------------------------------------------------
-#include <e32base.h>
-#include <smldmadapter.h>
-#include "omascomoadapterdb.h"
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-#include <dmtree.h>
-#else
-#include "nsmldmtreedbclient.h"
-#endif
-
-#include "ApplicationManagementClient.h"
-
-namespace NApplicationManagement
-    {
-
-    const TUint KAMAdapterImplUid = 0x20021336;
-    
-    const TInt KMaxSizeString = 256;
-
-    // the DDF version must be changed if any changes in DDF structure ( built in DDFStructureL() function )
-    _LIT8( KAMDDFVersion, "1.0" );
-
-    _LIT8( KAMTextPlain, "text/plain" );
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-    _LIT8( KAMNodeName, "./SCOMO" );
-#else
-    _LIT8( KAMNodeName, "SCOMO" );
-#endif
-    _LIT8( KAMNodeDescription, "This node is the root node for all application management functionality" );
-
-    _LIT8( KAMInventoryNodeName, "Inventory" );
-    _LIT8( KAMInventoryNodeDescription, "This node is start node of application inventory" );
-
-    _LIT8( KAMDeliveredNodeName, "Delivered" );
-    _LIT8( KAMDeliveredNodeDescription, "This is node under which applications that are delivered but not installed are found." );
-
-    _LIT8( KAMDeployedNodeName, "Deployed" );
-    _LIT8( KAMDeployedNodeDescription, "This is a node under which deployed applications are found" );
-
-    _LIT8( KAMDeliveredDynaNodeDescription, "This dynamic node is placeholder applications that are in Delivered state" );
-
-    _LIT8( KAMPkgIDNodeName, "PkgID" );
-    _LIT8( KAMPkgIDNodeDescription, "This leaf node holds an package identifier for an application" );
-
-
-    _LIT8( KAMIDNodeName, "ID" );
-    _LIT8( KAMIDNodeDescription, "This leaf node holds an identifier for an deployment component" );
-    
-    _LIT8( KAMPkgIDRefNodeName, "PkgIDRef" );
-    _LIT8( KAMPkgIDRefNodeDescription, "This leaf node holds an identifier for an deployment component" );
-
-    _LIT8( KAMNameNodeName, "Name" );
-    _LIT8( KAMNameNodeDescription, "This leaf node holds name of an application" );
-
-    _LIT8( KAMVersionNodeName, "Version" );
-    _LIT8( KAMVersionNodeDescription, "This leaf node holds the version of an application" );
-
-    _LIT8( KAMStateValueNodeName, "State" );
-    _LIT8( KAMStateValueNodeDescription, "This leaf node holds the state value of an application (active/inactive)" );
-
-    _LIT8( KAMDataNodeName, "Data" );
-    _LIT8( KAMDataNodeDescription, "This leaf node holds the data of an application" );
-
-    _LIT8( KAMDescriptorNodeName, "Descriptor" );
-    _LIT8( KAMDescriptorNodeDescription, "This leaf node holds the possible metadata of an application" );
-
-    _LIT8( KAMOperationsNodeName, "Operations" );
-    _LIT8( KAMOperationsNodeDescription, "This is a node under which operations are found" );
-
-    _LIT8( KAMInstallOptsNodeName, "InstallOpts" );
-    _LIT8( KAMInstallOptsNodeDescription, "This is a node that holds the installation options of an application" );
-
-    _LIT8( KAMDeployedDynaNodeDescription, "This dynamic node is placeholder applications that are in Inactive state" );
-
-    _LIT8( KAMDownloadOperationNodeName, "Download" );
-    _LIT8( KAMDownloadOperationNodeDescription, "Starts the download" );
-
-    _LIT8( KAMConRefNodeName, "ConRef" );
-    _LIT8( KAMConRefNodeDescription, "Holds reference to IAP" );
-
-    _LIT8( KAMLocalOperationsNodeDescription, "This is the root node for local operations" );
-
-    _LIT8( KAMActivateNodeName, "Activate" );
-    _LIT8( KAMActivateNodeDescription, "Exec command causes device to activate an inactive application" );
-
-    _LIT8( KAMDeActivateNodeName, "Deactivate" );
-    _LIT8( KAMDeActivateNodeDescription, "Exec command causes device to stop and deactivate an active application" );
-
-    _LIT8( KAMInstallNodeName, "Install" );
-    _LIT8( KAMInstallNodeDescription, "Exec command causes device to install a delivered application" );
-
-    _LIT8( KAMInstallInactiveNodeName, "InstallInactive" );
-    _LIT8( KAMInstallInactivateNodeDescription, "Exec command causes device to install a delivered application and activate it" );
-
-    _LIT8( KAMUpdateNodeName, "Update" );
-    _LIT8( KAMUpdateNodeDescription, "Exec command causes device to update an application" );
-
-    _LIT8( KAMUpdateAndActivateNodeName, "UpdateAndActivate" );
-    _LIT8( KAMUpdateAndActivateNodeDescription, "Exec command causes device to update an application and activate it" );
-
-    _LIT8( KAMRemoveNodeName, "Remove" );
-    _LIT8( KAMRemoveNodeDescription, "Exec command causes device to remove an application" );
-
-    _LIT8( KAMDownloadNodeName, "Download" );
-    _LIT8( KAMDownloadNodeDescription, "This node is a root node for application download functionality" );
-
-    _LIT8( KAMDownloadAndInstallNodeName, "DownloadInstall" );
-    _LIT8( KAMDownloadAndInstallOperationNodeDescription, "Starts the download and installs component when complete" );
-
-    _LIT8( KAMDownloadAndInstallAndInActivateNodeName, "DownloadInstallInactive" );
-    _LIT8( KAMDownloadAndInstallAndInActivateNodeDescription, "Starts the download and installs and activates component when complete" );
-
-    _LIT8( KAMDownloadAndUpdateNodeName, "DownloadAndUpdate" );
-    _LIT8( KAMDownloadAndUpdateNodeDescription, "Starts the download and installs component when complete" );
-
-    _LIT8( KAMDownloadAndUpdateAndActivateNodeName, "DownloadAndUpdateAndActivate" );
-    _LIT8( KAMDownloadAndUpdateAndActivateNodeDescription, "Starts the download and updates and activates component when complete" );
-
-    _LIT8( KAMDownloadDynaNodeDescription, "This node is a placeholder for identifier of an application that is to be downloaded" );
-
-    _LIT8( KAMURINodeName, "PkgURL" );
-    _LIT8( KAMURINodeDescription, "This leaf node holds the URL from which the application should be downloaded" );
-
-    _LIT8( KAMStatusNodeName, "Status" );
-    _LIT8( KAMStatusNodeDescription, "This leaf node holds the status of the download" );
-
-    _LIT8( KAMDescriptionNodeName, "Description" );
-    _LIT8( KAMDescriptionNodeDescription, "This leaf node holds the description of the download" );
-    
-    _LIT8( KAMPkgTypeNodeName, "PkgType" );
-    _LIT8( KAMPkgTypeNodeDescription, "This leaf node holds the PkgType of the download or delivered" );
-
-#ifdef __AM_LASTERROR_NODE
-    _LIT8( KAMExtNodeName, "Ext" );
-    _LIT8( KAMExtNodeDescription, "Non std extentions are found under this leaf" );
-    _LIT8( KAMLastErrorNodeName, "LastError" );
-    _LIT8( KAMLastErrorDescription, "This leaf node may hold the error" );
-#endif
-
-    _LIT8( KAMDynamicNodeName, "" );
-    _LIT( KAMSeparator16, "/" );
-
-    _LIT8( KAMSeparator8, "/" );
-
-    _LIT8( KAMRootChilds, "Inventory/Download" );
-    _LIT8( KAMInventoryChilds, "Delivered/Deployed" );
-    //_LIT8( KAMLocalOperationsChilds, "Activate/DeActivate/Install/Update/Remove" );
-
-    _LIT8( KAMDownloadDynaChilds, "PkgID/Name/PkgURL/Description/Status/PkgType/Operations" );
-_LIT8( KAMInventoryDynaChilds, "ID/PkgIDRef/Name/Description/Version/State/Operations" );
-_LIT8( KAMDownloadOperationChilds, "Download/DownloadInstall/DownloadInstallInactivate" );
-_LIT8( KAMDeployedOperationChilds, "Activate/Deactivate/Remove" );
-_LIT8( KAMDeliveredOperationChilds, "Install/InstallInactive/Remove" );
-_LIT8( KAMInventoryDeliveredDynaChilds, "PkgID/Data/Name/Description/Status/State/PkgType/Operations" );
-
-    _LIT8( KNSmlDMSCOMOMetaType,"org.openmobilealliance.dm.softwarecomponent.OperationComplete" );
-    _LIT8( KNSmlDMSCOMOMetaFormat, "text/plain" );
-    
-    _LIT8(KDataStart, "<![CDATA[");
-            _LIT8(KDataEnd, "]]>");
-            _LIT8(KResultCodeStart, "<ResultCode>");
-            _LIT8(KResultCodeEnd, "</ResultCode>");
-            _LIT8(KIdentifierStart, "<Identifier>");
-            _LIT8(KIdentifierEnd, "</Identifier>");
-                    
-            
-            _LIT8(KMark, "warning");
-
-    struct TAMCommandBufferElement
-        {
-        TInt iStatusRef;
-        TBuf8<256> iURI;
-        TAMCommandBufferElement(TInt aRef, const TDesC8 &aURI) :
-            iStatusRef(aRef), iURI(aURI)
-            {
-            }
-        };
-
-    typedef RArray<TAMCommandBufferElement> TAMCommandBuffer;
-
-    // ------------------------------------------------------------------------------------------------
-    // CSCOMOAdapter 
-    // ------------------------------------------------------------------------------------------------
-    class CSCOMOAdapter : public CSmlDmAdapter
-        {
-public:
-        static CSCOMOAdapter* NewL(MSmlDmCallback* aDmCallback);
-        static CSCOMOAdapter* NewLC(MSmlDmCallback* aDmCallback);
-
-        virtual ~CSCOMOAdapter();
-
-        /**
-         The function returns current version of the DDF.
-         By asking current DDF versions from adapters DM Module can control
-         possible changes in the data structure and send the changed DDF
-         description to a management server.
-         This function is always called after DDFStructureL.
-         @param aVersion DDF version of the adapter. (filled by the adapter)
-         @publishedPartner
-         @prototype
-         */
-        virtual void DDFVersionL(CBufBase& aVersion);
-
-        /**
-         The function for filling the DDF structure of the adapter
-         This function is only called once, immediately after the adapter is created.
-         @param aDDFObject	Reference to root object. A DM adapter starts filling
-         the data structure by calling AddChildObjectL to the root object and
-         so describes the DDF of the adapter. 
-         @publishedPartner
-         @prototype
-         */
-        virtual void DDFStructureL(MSmlDmDDFObject& aDDF);
-
-        /**
-         The function creates new leaf objects, or replaces data in existing leaf
-         objects. The information about the success of the command should be
-         returned by calling SetStatusL function of MSmlDmCallback callback
-         interface. This makes it possible to buffer the commands.  However, all
-         the status codes for buffered commands must be returned at the latest when
-         the adapter's CompleteOutstandingCmdsL() is called.
-         @param aURI			URI of the object
-         @param aLUID		LUID of the object (if the adapter has earlier returned a
-         LUID to the DM Module). For new objects, this is the LUID
-         inherited through the parent node.
-         @param aObject		Data of the object.
-         @param aType		MIME type of the object
-         @param aStatusRef	Reference to correct command, i.e. this reference
-         must be used when calling the SetStatusL of this command
-         @publishedPartner
-         @prototype
-         */
-        virtual void UpdateLeafObjectL(const TDesC8& aURI,
-                const TDesC8& aLUID, const TDesC8& aObject,
-                const TDesC8& aType, TInt aStatusRef);
-
-        /**
-         The function creates new leaf objects, or replaces data in existing leaf
-         objects, in the case where data is large enough to be streamed. The
-         information about the success of the command should be returned by calling
-         SetStatusL function of MSmlDmCallback callback interface. This makes it
-         possible to buffer the commands.  However, all the status codes for buffered
-         commands must be returned at the latest when the CompleteOutstandingCmdsL()
-         of adapter is called.
-         @param aURI		URI of the object
-         @param aLUID		LUID of the object (if the adapter has earlier returned a
-         LUID to the DM Module). For new objects, this is the LUID
-         inherited through the parent node.
-         @param aStream	Data of the object. Adapter should create write stream
-         and return, when data is written to stream by DM agent,
-         StreamCommittedL() is called by DM engine
-         @param aType		MIME type of the object
-         @param aStatusRef	Reference to correct command, i.e. this reference
-         must be used when calling the SetStatusL of this
-         command.
-         @publishedPartner
-         @prototype
-         */
-        virtual void UpdateLeafObjectL(const TDesC8& aURI,
-                const TDesC8& aLUID, RWriteStream*& aStream,
-                const TDesC8& aType, TInt aStatusRef);
-
-        /**
-         The function deletes an object and its child objects. The SetStatusL
-         should be used as described in UpdateLeafObjectL()
-         @param aURI		URI of the object
-         @param aLUID		LUID of the object (if the adapter have earlier returned
-         LUID to the DM Module).
-         @param aStatusRef	Reference to correct command, i.e. this reference must
-         be used when calling the SetStatusL of this command.
-         @publishedPartner
-         @prototype
-         */
-        virtual void DeleteObjectL(const TDesC8& aURI, const TDesC8& aLUID,
-                TInt aStatusRef);
-
-        /**
-         The function fetches data of a leaf object. The SetStatusL should be used
-         as described in UpdateLeafObjectL(). The data is returned by using the
-         SetResultsL function of MSmlCallback callback interface, and may be streamed.
-         @param aURI			URI of the object
-         @param aLUID			LUID of the object (if the adapter have earlier
-         returned LUID to the DM Module).   
-         @param aType 			MIME type of the object
-         @param aResultsRef	Reference to correct results, i.e. this reference
-         must be used when returning the result by calling
-         the SetResultsL.
-         @param aStatusRef		Reference to correct command, i.e. this reference
-         must be used when calling the SetStatusL of this
-         command.
-         @publishedPartner
-         @prototype
-         */
-        virtual void FetchLeafObjectL(const TDesC8& aURI,
-                const TDesC8& aLUID, const TDesC8& aType, TInt aResultsRef,
-                TInt aStatusRef);
-
-        /**
-         The function fetches the size of the data of a leaf object. The size is
-         in bytes, and must reflect the number of bytes that will be transferred
-         when the framework calls FetchLeafObjectL. The SetStatusL should be used
-         as described in FetchLeafObjectL(). The size value is returned by using
-         the SetResultsL function of MSmlCallback callback interface, and must be
-         a decimal integer expressed as a string, eg. "1234".
-         Results from this call MUST NOT be streamed.
-         @param aURI			URI of the object
-         @param aLUID			LUID of the object (if the adapter have earlier
-         returned LUID to the DM Module).   
-         @param aType 			MIME type of the object
-         @param aResultsRef	Reference to correct results, i.e. this reference
-         must be used when returning the result by calling
-         the SetResultsL.
-         @param aStatusRef		Reference to correct command, i.e. this reference
-         must be used when calling the SetStatusL of this
-         command.
-         @publishedPartner
-         @prototype
-         */
-        virtual void FetchLeafObjectSizeL(const TDesC8& aURI,
-                const TDesC8& aLUID, const TDesC8& aType, TInt aResultsRef,
-                TInt aStatusRef);
-        /**
-         The function fetches URI list. An adapter returns the list of URI segments
-         under the given URI be separated by slash ("/"). The URI segment names for
-         new objects must be given by the adapter.
-         The list is returned by calling the SetResultsL function of MSmlCallback
-         callback interface.	Results from this call MUST NOT be streamed.
-         @param aParentURI					URI of the parent object
-         @param aParentLUID				LUID of the parent object (if the
-         adapter have earlier returned LUID to
-         the DM Module).   
-         @param aPreviousURISegmentList	URI list with mapping LUID information,
-         which is known by DM engine. An adapter
-         can use this information when verifying
-         if old objects still exists. An adapter
-         also knows what objects are new to DM
-         engine and can provide LUID mapping for
-         them. aPreviousURISegmentList parameter
-         (see above) helps to recognise new
-         objects.
-         @param aResultsRef				Reference to correct results, i.e. this
-         reference must be used when returning
-         the result by calling the SetResultsL.
-         @param aStatusRef					Reference to correct command, i.e. this
-         reference must be used when calling the
-         SetStatusL of this command.
-         @publishedPartner
-         @prototype
-         */
-        virtual void ChildURIListL(const TDesC8& aURI, const TDesC8& aLUID,
-                const CArrayFix<TSmlDmMappingInfo>& aPreviousURISegmentList,
-                TInt aResultsRef, TInt aStatusRef);
-
-        /**
-         The function adds node object. In some cases an implementation of the
-         function may be empty function, if the node object does not need concrete
-         database update. Still this function may be helpful to an adapter, i.e. in
-         passing mapping LUID of the node to DM Module. The SetStatusL should be
-         used as described in UpdateLeafObjectL()
-         @param aURI			URI of the object
-         @param aParentLUID	LUID of the parent object (if the adapter have
-         earlier returned LUID to the DM Module).   
-         @param aStatusRef		Reference to correct command, i.e. this reference
-         must be used when calling the SetStatusL of this
-         command.
-         @publishedPartner
-         @prototype
-         */
-        virtual void AddNodeObjectL(const TDesC8& aURI,
-                const TDesC8& aParentLUID, TInt aStatusRef);
-
-        /**
-         The function implements execute command. The information about the success
-         of the command should be returned by calling SetStatusL function of
-         MSmlDmCallback callback interface. This makes it possible to buffer the
-         commands.
-         However, all the status codes for buffered commands must be returned at
-         the latest when the CompleteOutstandingCmdsL() of adapter is called.
-         @param aURI			URI of the command
-         @param aLUID			LUID of the object (if the adapter have earlier
-         returned LUID to the DM Module).   
-         @param aArgument		Argument for the command
-         @param aType			MIME type of the object 
-         @param aStatusRef		Reference to correct command, i.e. this reference
-         must be used when calling the SetStatusL of this
-         command.
-         @publishedPartner
-         @prototype
-         */
-        virtual void
-                ExecuteCommandL(const TDesC8& aURI, const TDesC8& aLUID,
-                        const TDesC8& aArgument, const TDesC8& aType,
-                        TInt aStatusRef);
-
-        /**
-         The function implements execute command. The information about the
-         success of the command should be returned by calling SetStatusL function
-         of MSmlDmCallback callback interface. This makes it possible to buffer the
-         commands.
-         However, all the status codes for buffered commands must be returned at
-         the latest when the CompleteOutstandingCmdsL() of adapter is called.
-         @param aURI			URI of the command
-         @param aLUID			LUID of the object (if the adapter have earlier
-         returned LUID to the DM Module).   
-         @param aStream		Argument for the command. Adapter should create
-         write stream and return, when data is written to
-         stream by DM agent, StreamCommittedL() is called by
-         DM engine
-         @param aType			MIME type of the object 
-         @param aStatusRef		Reference to correct command, i.e. this reference
-         must be used when calling the SetStatusL of this
-         command.
-         @publishedPartner
-         @prototype
-         */
-        virtual void ExecuteCommandL(const TDesC8& aURI, const TDesC8& aLUID,
-                RWriteStream*& aStream, const TDesC8& aType, TInt aStatusRef);
-
-        /**
-         The function implements copy command. The information about the success of
-         the command should be returned by calling SetStatusL function of
-         MSmlDmCallback callback interface. This makes it possible to buffer the
-         commands.
-         However, all the status codes for buffered commands must be returned at
-         the latest when the CompleteOutstandingCmdsL() of adapter is called.
-         @param aTargetURI		Target URI for the command
-         @param aSourceLUID	LUID of the target object (if one exists, and if the adapter
-         has	earlier returned a LUID to the DM Module).   
-         @param aSourceURI		Source URI for the command
-         @param aSourceLUID	LUID of the source object (if the adapter has
-         earlier returned a LUID to the DM Module).   
-         @param aType			MIME type of the objects
-         @param aStatusRef		Reference to correct command, i.e. this reference
-         must be used when calling the SetStatusL of this
-         command.
-         @publishedPartner
-         @prototype
-         */
-        virtual void CopyCommandL(const TDesC8& aTargetURI,
-                const TDesC8& aTargetLUID, const TDesC8& aSourceURI,
-                const TDesC8& aSourceLUID, const TDesC8& aType,
-                TInt aStatusRef);
-
-        /**
-         The function indicates start of Atomic command.
-         @publishedPartner
-         @prototype
-         */
-        virtual void StartAtomicL();
-
-        /**
-         The function indicates successful end of Atomic command. The adapter
-         should commit all changes issued between StartAtomicL() and
-         CommitAtomicL()
-         @publishedPartner
-         @prototype
-         */
-        virtual void CommitAtomicL();
-
-        /**
-         The function indicates unsuccessful end of Atomic command. The adapter
-         should rollback all changes issued between StartAtomicL() and
-         RollbackAtomicL(). If rollback fails for a command, adapter should use
-         SetStatusL() to indicate it.
-         @publishedPartner
-         @prototype
-         */
-        virtual void RollbackAtomicL();
-
-        /**
-         Returns ETrue if adapter supports streaming otherwise EFalse.
-         @param aItemSize size limit for stream usage
-         @return TBool ETrue for streaming support
-         @publishedPartner
-         @prototype
-         */
-        virtual TBool StreamingSupport(TInt& aItemSize);
-
-        /**
-         Called when stream returned from UpdateLeafObjectL or ExecuteCommandL has
-         been written to and committed. Not called when fetching item.
-         @publishedPartner
-         @prototype
-         */
-#ifdef __TARM_SYMBIAN_CONVERGENCY	
-        virtual void StreamCommittedL( RWriteStream& aStream );
-#else
-        virtual void StreamCommittedL();
-#endif	
-        /**
-         The function tells the adapter that all the commands of the message that
-         can be passed to the adapter have now been passed.  This indciates that
-         the adapter must supply status codes and results to any buffered commands.
-         This must be done at latest by the time this function returns.
-         This function is used at the end of SyncML messages, and during processing
-         of Atomic.   In the case of Atomic processing, the function will be
-         followed by a call to CommitAtomicL or RollbackAtomicL.
-         @publishedPartner
-         @prototype
-         */
-        virtual void CompleteOutstandingCmdsL();
-
-private:
-        CSCOMOAdapter(TAny* aDmCallback);
-        void ConstructL();
-        TInt DesToIntL(const TDesC8& aLuid);
-        HBufC8* IntToDes8LC(const TInt aLuid);
-
-        TBool CheckStateL(const TDeploymentComponent &aComp,
-                const TDesC8& aURI);
-        TBool CheckStateL(const TDesC8& aURI, const TDesC8& aLUID);
-        /**
-         * UpdateFlagFromMapping Maps a node name to internal attribute flag that
-         * 	is used by server to identify to data 
-         * @param aMapping	The SyncML node name
-         * @return  TDeplCompAttrType the attribute type
-         */
-        TDeplCompAttrType UpdateFlagFromMapping(const TDesC8& aMapping);
-
-        /**
-         * IdListL Looks up the given state user ids of deployment components,
-         * 	and places them to currentList in the format specified by SyncML spec 
-         * @param aState	The deployment component state in which we are interested
-         * @param aCurrentList The buffer where the results are placed
-         * @param aAppend Does the list possibly contain some items already
-         * @return  TError EOk if successful
-         */
-        TError IdListL(TDeploymentComponentState aState,
-                CBufBase &aCurrentList, TBool aAppend = EFalse);
-
-        /**
-         * DeliverOrDownloadL Depending on aURI, creates new delivery or download component
-         *
-         * @param aUserId	The name of dynamic node.
-         * @param aURI		The full URI
-         * @param aCnt		Count of URI segments
-         * @param aParentMapping	The parent data
-         * @param aStatus A reference to the error which will be set the status of the operation
-         * @return  TError EOk if successful
-         */
-        void DeliverOrDownloadL(const TDesC8 &aUserId, const TDesC8 &aURI,
-                TInt aCnt, const TDesC8 &aParentMapping,
-                MSmlDmAdapter::TError &aStatus);
-
-        /**
-         * Fills the node info in ddf structure
-         */
-        void
-                FillNodeInfoL(MSmlDmDDFObject& aNode,
-                        TSmlDmAccessTypes aAccTypes,
-                        MSmlDmDDFObject::TOccurence aOccurrence,
-                        MSmlDmDDFObject::TScope aScope,
-                        MSmlDmDDFObject::TDFFormat aFormat,
-                        const TDesC8& aDescription);
-
-        /**
-         * Fills the node info in ddf structure, without default mime type
-         */
-        void
-                FillNodeInfoNoDefaultMimeL(MSmlDmDDFObject& aNode,
-                        TSmlDmAccessTypes aAccTypes,
-                        MSmlDmDDFObject::TOccurence aOccurrence,
-                        MSmlDmDDFObject::TScope aScope,
-                        MSmlDmDDFObject::TDFFormat aFormat,
-                        const TDesC8& aDescription);
-
-        TBool IsImage(const TDesC8& aMime);
-        /**
-         Calls Callback().SetResultsL()
-         */
-        void SetResultsL(TInt aResultsRef, CBufBase& aObject,
-                const TDesC8& aType);
-        /**
-         Calls Callback().SetStatusL()
-         */
-        void SetStatusL(TInt aStatusRef, MSmlDmAdapter::TError aErrorCode);
-        //	TInt FindBuffered( const TDesC8 &aURI ) ;
-        RApplicationManagement &SessionL();
-        TDeploymentComponentState StateL(const TDesC8& aURI);
-
-        void CheckStateChangesL();
-        void CheckStateChangesInternalL();
-
-        TPtrC8 URISegsUpTo(const TDesC8& aURI, TInt aUpTo,
-                TBool aInclKeno=EFalse);
-
-        /**
-         * Helper method to move acl. Copies acl of node aFrom to acl of aTo,
-         * and removes acl from aFrom.
-         *
-         * @param aFrom The source uri
-         * @param aTo	The target uri
-         */
-        void MoveAclL(const TDesC8 &aFrom, const TDesC8 &aTo);
-
-        /**
-         * Helper method to move nodes in SCOMO tree
-         *
-         * 1. Sets mapping of aOriginal to null.
-         * 2. If aNewURI is null, constructs new uri depending on aTargetstate.
-         * 3. Sets mapping of aNewURI to aLUID
-         * 4. Moves acls of aOriginal to aNewURI (using MoveAclL)
-         *
-         * @param aOriginal The uri of original node to be moved
-         * @param aTargetstate The target state the node is moving to
-         * @param aLUID The luid of the original node
-         * @param aNewUri The new uri of the node (will be constructed and left to stack if null)
-         */
-        void SetMappingLC(const TDesC8 &aOriginal,
-                const TDeploymentComponentState aTargetstate,
-                const TDesC8 &aLUID, HBufC8 *&aNewUri);
-
-        /**
-         * Helper method to move nodes in SCOMO tree
-         *
-         * 1. Sets mapping of aOriginal to null.
-         * 2. Sets mapping of a uri constructed using aTargetState to aLUID
-         * 2. Moves acls of aOriginal to a uri constructed using aTargetState (using MoveAclL)
-         *
-         * @param aTargetstate The target state the node is moving to
-         * @param aLUID The luid of the original node
-         */
-        void SetMappingL(const TDesC8 &aOriginalURI,
-                const TDeploymentComponentState aTargetState,
-                const TDesC8 &aLUID);
-
-        /**
-         * Helper method to set DM LUID mappings directly database.
-         *
-         * @param aURI The uri of node whose mapping is to be set
-         * @param aLUID The new mapping value
-         * @return Possible database error - KErrNone if successful
-         */
-        TInt DirectSetMappingL(const TDesC8 &aURI, const TDesC8 &aLUID);
-
-	TInt DirectRemoveMappingL(const TDesC8 &aURI);
-
-        /**
-         * Helper method to get DM LUID mappings directly from database.
-         *
-         * @param aURI The uri of node whose mapping is to be found
-         * @return The luid mapping - Empty string if not found.
-         */
-        HBufC8 *DirectGetLuidAllocLC(const TDesC8 &aURI);
-
-        /**
-         * Helper method to perform install
-         *
-         * @param aLuidi The mapping value of component as integer
-         * @param aURI The uri of node that is to be installed
-         * @param aLUID The mapping value of component as text
-         * @param aTargetstate The target state the node is moving to (EDCSActive or EDCSInactive)
-         * @param aRet	The SyncML Error code - value will be updated according to success
-         */
-        void InstallL(const TUint aLuidi, const TDesC8& aURI,
-                const TDesC8& aLUID,
-                const TDeploymentComponentState aTargetState, TError &aRet);
-
-        /**
-         * Helper method to perform update
-         *
-         * @param aLuidi The mapping value of component as integer
-         * @param aURI The uri of node that is to be installed
-         * @param aLUID The mapping value of component as text
-         * @param aTargetstate The target state the node is moving to (EDCSActive or EDCSInactive)
-         * @param aRet	The SyncML Error code - value will be updated according to success
-         */
-        void UpdateL(const TUint aLuidi, const TDesC8& aURI,
-                const TDesC8& aSourceLUID,
-                const TDeploymentComponentState aTargetState, TError &aRet);
-        /**
-         maps symbian error code to DM error code as follows:
-         Kerrnone-> EOk
-         Kerrnotfound ->Enotfound
-         all oether -> EError
-         */
-        void DefaultMapError(const TInt aErr, TError &aRet,
-                const TDesC8& aDes = KNullDesC8);
-
-        /**
-         * Deactivates given component if given state is inactive
-         */
-        void DeactivateIfInactive(const TUint aLuidi,
-                const TDeploymentComponentState aTargetState);
-
-        /**
-         * Finds luid from app mgmt server to given userid
-         */
-        TUint32 GetLuidForUserIdL(const TDesC8 &aUserId,
-                const TDeploymentComponentState aState);
-
-        TUint32 GetLuidL(const TDesC8 &aDMLuid, const TDesC8 &aUserId,
-                const TDeploymentComponentState aState);
-
-        /**
-         * places result in current
-         * @param aParent The deployment component identifying uri 
-         * @param aMapping The user id part of the deployment component uri
-         * @param aLuid Internal id of the deployment compoennt
-         * @param aCurrentList The list that will get the data
-         * @param aStatus The syncml status
-         */
-        void GetComponentDataL(const TDesC8& aParent, const TDesC8& aMapping,
-                const TUint32 aLuid, CBufBase &aCurrentList,
-                CBufBase &currentMime, TError &aStatus);
-        /**
-         * returns luid of leaf node, or 0
-         */
-        TInt GetLeafLuidL(const TDesC8 &aURI, const TDesC8 & aParentMapping);
-        /**
-         * returns length of result
-         */
-        TInt GetSizeL(const TDeplCompAttrType aDataType, const TInt aLuid,
-                TError &aRet);
-
-        /**
-         * places installoptions of given aLuid to aBuf
-         */
-        void InstallOptionsDataL(const TUint32 aLuid,
-                const TDeplCompAttrType& aDataType, CBufBase &aBuf,
-                CBufBase *aRaw = NULL);
-
-        /**
-         * Gets the luid using GetLuidL, and updates aStatus to ENotFound if not found...
-         */
-        TUint32 GetLuid2L(const TDesC8 &aDMLuid, const TDesC8 &aUserId,
-                const TDeploymentComponentState aState, TError &aStatus);
-
-        /**
-         * Finds out correct download target based on download operation 
-         */
-        TDownloadTarget DownloadTargetL(const TDesC8& aOperation);
-
-        TPtrC8 LastURISeg(const TDesC8& aURI);
-        TInt DesToInt(const TDesC8& aLuid);
-
-#ifdef __AM_LASTERROR_NODE
-        void SetLastErrorL(const TDesC8& aLastError, const TInt aErr);
-        const TDesC8& LastError();
-        void SetErrorL(const TDesC8& aDes, const TInt aErr);
-#endif
-
-        /**
-         The function creates new leaf objects, or replaces data in existing leaf
-         objects. The information about the success of the command should be
-         returned by calling SetStatusL function of MSmlDmCallback callback
-         interface. This makes it possible to buffer the commands.  However, all
-         the status codes for buffered commands must be returned at the latest when
-         the adapter's CompleteOutstandingCmdsL() is called.
-         @param aURI			URI of the object
-         @param aLUID		LUID of the object (if the adapter has earlier returned a
-         LUID to the DM Module). For new objects, this is the LUID
-         inherited through the parent node.
-         @param aObject		Data of the object.
-         @param aType		MIME type of the object
-         @param aStatusRef	Reference to correct command, i.e. this reference
-         must be used when calling the SetStatusL of this command
-         @publishedPartner
-         @prototype
-         */
-        void _UpdateLeafObjectL(const TDesC8& aURI, const TDesC8& aLUID,
-                const TDesC8& aObject, const TDesC8& aType, TInt aStatusRef,
-                MSmlDmAdapter::TError& aStatus);
-        /**
-         * The function creates new leaf objects, or replaces data in existing leaf
-         */
-        void CloseStreaming();
-
-        void GetServerInfoL(TSmlProfileId& aProfId, HBufC8*& aServerId) const;
-
-        void SendPendingGenericAlertL();
-
-        void ASyncReportL(TUint32 aLuid, const TDesC8& aArgument,
-                const TDownloadTarget aTarget, const TDesC8& aURI);
-
-        void SyncReportL(TUint32 aLuid, const TDesC8& aArgument,
-                const TDownloadTarget aTarget, const TDesC8& aURI, TError &aRet);
-	/**
-	 Checks if predefined node for Download object is in tree if not add to the tree 
-	*/
-	void CheckAndAddPredefinedNodeL();
-	/**
-	 Gets  predefined node for Download object from cenrep 
-	 */
-	void GetPredefinedNodeL(TDes8& aNode);
-	TInt GetAdapterValue();
-	void SetAdapterValue(TInt aAdapterValue);
-	TBool RecognizeMimeType(const TDesC8& aMimeType);
-
-private:
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-        RDmTree iDbSession;
-#else
-        RNSmlDMCallbackSession iDbSession; // to change acl location
-#endif
-
-        RApplicationManagement iManagement;
-        TBool iSessionOpened;
-        TAMCommandBuffer iBuffer;
-        TBool iInAtomic;
-        TBool iUpdated; // have we checked changed state DCs?
-        // Streaming API support
-        TBool iStreamOpen;
-        RFileWriteStream iStream;
-        TInt iStatusRef;
-        RFs iStreamRFs;
-        RFile iStreamFile;
-        TBool iIsStreamedContent;
-        HBufC8* iStreamedURI;
-        HBufC8* iStreamedLuid;
-        HBufC8* iStreamedType;
-        TBool iCertRequired;
-        TBool iTrustAdded;
-        CSCOMOAdapterDb* iAMdb;
-        TUint iInternalId;
-#ifdef __AM_LASTERROR_NODE
-        HBufC8 *iLastError;
-#endif
-
-        HBufC8 *iUriDel;
-        };
-
-    } // namespace
-#endif // __AMDMADAPTER_H__
-// End of File
--- a/applicationmanagement/omascomoadapter/inc/omascomoadapterdb.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,193 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
- *
- * Description:  Implementation of applicationmanagement components
- *
-*/
-
-#ifndef __SCOMOADAPTERDB_H
-#define __SCOMOADAPTERDB_H
-
-// INCLUDE FILES
-
-#include <e32std.h>
-#include <e32base.h>
-#include <d32dbms.h>
-#include <f32file.h>
-#include <SyncMLDef.h>
-
-// CONSTANTS
-
-// null final result value
-const TInt KAMNullResult = 0;
-
-// Database name & location
-const TInt KAMAdapterDbDrive = EDriveC;
-const TUid KAMPolicyUID =
-    {
-    0x20021335
-    };
-const TInt KAMMaxPkgURLLength( 2048);
-const TInt KAMMaxPkgNameLength( 80);
-const TInt KAMMaxPkgVersionLength( 80);
-
-_LIT( KDBMSSecureID, "secure[20021335]" );
-
-_LIT( KAMAdapterDbName, "c:TARMAppMgmtAdapterDB.db" );
-
-// Table and column names
-_LIT( KTableAMMgmtObject, "AMMgmtObject" );
-_LIT( KAMMgmtObjectId, "Id" );
-_LIT( KAMMgmtObjectProfileId, "ProfileId" );
-_LIT( KAMMgmtObjectServerId, "ServerId" );
-_LIT( KAMMgmtObjectRetryCount, "RetryCount");
-
-// SQL statements
-_LIT( KCreateAMMgmtObjectTable, "CREATE TABLE AMMgmtObject ( Id \
-COUNTER NOT NULL,  ProfileId INTEGER, ServerId CHAR(%d), RetryCount INTEGER" );
-
-_LIT( KGetAMMgmtObject, "SELECT * FROM AMMgmtObject WHERE Id = %d" );
-
-_LIT( KGetUnfinishedAMMgmtObjectByServerId, "SELECT * FROM AMMgmtObject \
-WHERE Id = %d AND ServerId = '%S'" );
-
-_LIT( KDeleteAMMgmtObject,"DELETE FROM AMMgmtObject WHERE Id = %d");
-
-// Max. lengths of string fields in AMMgmtObject
-const TInt KMaxMgmtUriLength = 60;
-const TInt KMaxServerIdLength = 150;
-const TInt KMaxCorrelatorLength = 150;
-
-// Estimate of url size used in max row size (OOD checks)
-const TInt KPkgURLLengthEstimate = 350;
-
-// space needed for above integers in buffer
-const TInt KAMMgmtObjectIntLength = 4;
-
-// space needed for an integer in buffer
-const TInt KAMMgmtObjectIntegerLength = 10;
-
-// Size of empty AM database in bytes (+ additional treshold)
-const TInt KAMAdapterEmptyDbSize = 350;
-
-// Estimated maximum size of AMMgmtObject table row (+ additional treshold)
-const TInt KMaxAMMgmtObjectRowSize = KAMMaxPkgNameLength
-        + KAMMaxPkgVersionLength + KPkgURLLengthEstimate + KMaxMgmtUriLength
-        + KMaxServerIdLength + KMaxCorrelatorLength + 115;
-
-// TYPEDEFS
-typedef TInt TDmAMObjectId;
-typedef RArray<TDmAMObjectId> RDmAMObjectArray;
-
-_LIT(NCol1, "Id");
-_LIT(NCol2, "LUID");
-_LIT(NCol3, "ProfileId");
-_LIT(NCol4, "ServerId");
-_LIT(NCol5, "Correlator");
-_LIT(NCol6, "SourceURI");
-_LIT(NCol7, "RetryCount");
-
-class CAMDbItem : public CBase
-    {
-public:
-    static CAMDbItem* NewL();
-    ~CAMDbItem();
-
-    TInt id;
-    TUint32 iLUID;
-    TInt iProfileId;
-
-    HBufC8* iServerID;
-    HBufC8* iCorrelator;
-    HBufC8* iSourceURI;
-    TInt iRetryCount;
-
-    };
-
-// CLASS DECLARATION
-
-/**
- *  CSCOMOAdapterDb provides an interface for accessing AM database.
- *  
- *  @lib SCOMOAdapter.lib
- *  
- */
-class CSCOMOAdapterDb : public CBase
-    {
-
-public:
-
-    /**
-     * Two-phased constructor.
-     * @return A pointer to the newly created instance.
-     */
-    static CSCOMOAdapterDb* NewL();
-
-    /**
-     * Two-phased constructor. Pushes the pointer onto the CleanupStack.
-     * @return A pointer to the newly created instance.
-     */
-    static CSCOMOAdapterDb* NewLC();
-
-    /**
-     * Destructor.
-     */
-    virtual ~CSCOMOAdapterDb();
-
-    void CreateTableL(RDbDatabase& aDatabase);
-
-    void CreateandOpenL(TParse& name);
-
-    TBool DeleteFromDatabaseL(TUint32 aLuid);
-
-    void SaveToDatabaseL(TInt& aIndex, TUint32 aLuid, TInt aProfileid,
-            TInt aRetryCount, const TDesC8& aSourceURI,
-            const TDesC8& aServerid, const TDesC8& aCorrelator);
-
-    void ReadItemsL(RPointerArray<CAMDbItem>& aItemArray, TDesC& aSqlQuery);
-
-    void ReadDbItemsL(RPointerArray<CAMDbItem>& aItemArray);
-
-    void GetEntryForServerIDL(RPointerArray<CAMDbItem>& aItemArray, TDesC8& aValue);
-    
-    void UpdateRetryCountForLuidL(TInt aLuid, TInt aRetryCount);
-    
-    TInt GetRetryCountForLuidL(TInt aLuid);
-    
-    void BeginDatabaseTransaction();
-
-    void CommitDatabaseTransaction();
-    
-    void PrepareLuidQuery(TInt aLuid, TDes& aSqlQuery);
-
-
-private:
-
-    void ConstructL();
-
-    CSCOMOAdapterDb();
-
-private:
-
-    RDbNamedDatabase iDatabase;
-    RFs iFsSession;
-    RDbs iRdbSession;
-
-    RDbTable iAMObjectTable;
-    CDbColSet* iColSet;
-    RDbView iView;
-
-    };
-
-#endif // __AMADAPTERDB_H   
-// End of File
Binary file applicationmanagement/omascomoadapter/src/20021335.SPD has changed
--- a/applicationmanagement/omascomoadapter/src/20021335.txt	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-[database]
-read
-capability = ReadDeviceData
-write
-capability = WriteDeviceData
-schema
-capability = WriteDeviceData
-
-[backup]
-SID = 101F8597
--- a/applicationmanagement/omascomoadapter/src/nsmldmiapmatcher.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,235 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
- *
- * Description:  Implementation of applicationmanagement components
- *
-*/
-
-
-// ------------------------------------------------------------------------------------------------
-// Includes
-// ------------------------------------------------------------------------------------------------
-
-#include <utf.h>
-#include "nsmldmiapmatcher.h"
-#include <smldmadapter.h>
-#include <featmgr.h>
-
-// ------------------------------------------------------------------------------------------------
-// CNSmlDMIAPMatcher* CNSmlDMIAPMatcher::NewL( MSmlDmCallback* aDmCallback )
-// ------------------------------------------------------------------------------------------------
-CNSmlDMIAPMatcher* CNSmlDMIAPMatcher::NewL( 
-	MSmlDmCallback* aDmCallback )
-    {
-    CNSmlDMIAPMatcher* self = CNSmlDMIAPMatcher::NewLC( aDmCallback );	
-    CleanupStack::Pop();
-    return self;
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CNSmlDMIAPMatcher* CNSmlDMIAPMatcher::NewLC( MSmlDmCallback* aDmCallback )
-// ------------------------------------------------------------------------------------------------
-CNSmlDMIAPMatcher* CNSmlDMIAPMatcher::NewLC(
-	MSmlDmCallback* aDmCallback )
-    {
-    CNSmlDMIAPMatcher* self = new( ELeave ) CNSmlDMIAPMatcher;
-    CleanupStack::PushL( self );
-    self->ConstructL( aDmCallback );
-    return self;
-    }
-
-// ------------------------------------------------------------------------------------------------
-// void CNSmlDMIAPMatcher::ConstructL( MSmlDmCallback* aDmCallback )
-// ------------------------------------------------------------------------------------------------
-void CNSmlDMIAPMatcher::ConstructL( MSmlDmCallback* aDmCallback )
-    {
-    iCallback = aDmCallback;
-    FeatureManager::InitializeLibL();
-    iFeatMgrInitialized = ETrue;
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CNSmlDMIAPMatcher::~CNSmlDMIAPMatcher()
-// ------------------------------------------------------------------------------------------------
-CNSmlDMIAPMatcher::~CNSmlDMIAPMatcher()
-    {
-    	if(iFeatMgrInitialized)
-    		{
-    			FeatureManager::UnInitializeLib();
-    		}
-    }
-
-// ------------------------------------------------------------------------------------------------
-// TInt CNSmlDMIAPMatcher::IAPIdFromURIL( const TDesC8& aURI )
-// ------------------------------------------------------------------------------------------------
-TInt CNSmlDMIAPMatcher::IAPIdFromURIL( const TDesC8& aURI )
-    {
-    TInt iapId(KErrNotFound);
-
-	MSmlDmAdapter::TError status;
-	CBufBase* allIAPs = CBufFlat::NewL(16);
-	CleanupStack::PushL(allIAPs);
-	iCallback->FetchLinkL( GetConRef(), *allIAPs, status );
-	TPtrC8 uri = RemoveDotSlash(aURI);
-
-    if( status == MSmlDmAdapter::EOk &&
-        uri.Find(GetConRef()) == 0 &&
-        allIAPs->Ptr(0).Find(LastURISeg(uri))>=0)
-        {
-        HBufC8* luid = iCallback->GetLuidAllocL( uri ); 
-
-        if ( luid->Length() )
-            {
-            iapId = DesToInt(*luid);
-            } 
-        delete luid;
-        }
-
-    CleanupStack::PopAndDestroy(allIAPs);
-    
-    return iapId;
-    }
-
-// ------------------------------------------------------------------------------------------------
-// HBufC8* CNSmlDMIAPMatcher::URIFromIAPIdL( TInt aIAPId )
-// ------------------------------------------------------------------------------------------------
-HBufC8* CNSmlDMIAPMatcher::URIFromIAPIdL( TInt aIAPId )
-    {
-    CBufBase *allIAPs = CBufFlat::NewL(16);
-	CleanupStack::PushL(allIAPs);
-    MSmlDmAdapter::TError status;
-
-    iCallback->FetchLinkL( GetConRef(), *allIAPs, status );
-
-    if ( status == MSmlDmAdapter::EOk )
-        {   
-        TInt index(0);
-        TInt segStart(0);
-
-        while ( index != KErrNotFound)
-            {                
-            TPtrC8 allIAPsptr = allIAPs->Ptr(segStart).Mid(0);
-            index = allIAPsptr.Locate('/');
-            HBufC8* uriSeg = 0;
-
-            if ( index == KErrNotFound )
-                {
-                TPtrC8 uriSeg8Ptr = allIAPs->Ptr(segStart);
-                uriSeg = uriSeg8Ptr.AllocLC();
-                }
-            else
-                {
-                TPtrC8 uriSeg8Ptr = allIAPs->Ptr(segStart).Mid( 0, index );
-                uriSeg = uriSeg8Ptr.AllocLC();
-                }
-
-            HBufC8* uri = HBufC8::NewLC( GetConRef().Length() + 1 +
-            	uriSeg->Length() );
-            	
-			TPtr8 uriPtr = uri->Des();
-			uriPtr.Format( GetConRef());
-			uriPtr.Append( KNSmlDMSeparator8 );
-			uriPtr.Append( *uriSeg );
-			HBufC8* luid = iCallback->GetLuidAllocL( uriPtr );
-			CleanupStack::PushL(luid);
-
-			if ( luid->Length() > 0 )
-				{				
-				TInt iapId = DesToInt(luid->Des());
-				if ( iapId == aIAPId )
-					{
-		            CleanupStack::PopAndDestroy();  //luid
-		            CleanupStack::Pop();  //uri
-		            CleanupStack::PopAndDestroy(2);  //uriSeg, allIAPs
-		            return uri;
-					}
-				}
-            CleanupStack::PopAndDestroy(3); // luid, uri, uriSeg
-
-            segStart += index + 1;
-            }        
-        }
-
-    CleanupStack::PopAndDestroy(); // allIAPs
-
-    return 0;
-    }
-
-// ------------------------------------------------------------------------------------------------
-// TInt CNSmlDMIAPMatcher::DesToInt(const TDesC& aLuid)
-// ------------------------------------------------------------------------------------------------
-TInt CNSmlDMIAPMatcher::DesToInt(const TDesC8& aLuid) const
-	{
-	TLex8 lex(aLuid);
-	TInt value = 0;
-	lex.Val(value);
-	return value;
-	}
-
-// ------------------------------------------------------------------------------------------------
-// TPtrC8 CNSmlDMIAPMatcher::RemoveDotSlash(const TDesC8& aURI) const
-// ------------------------------------------------------------------------------------------------
-TPtrC8 CNSmlDMIAPMatcher::RemoveDotSlash(const TDesC8& aURI) const
-	{
-	if(aURI.Find(KNSmlDMIAPUriDotSlash)==0)
-		{
-		return aURI.Right( aURI.Length()-KNSmlDMIAPUriDotSlash().Length() );
-		}
-	else
-		{
-		return aURI;
-		}
-	}
-
-// ------------------------------------------------------------------------------------------------
-// CNSmlDMIAPMatcher::TPtrC8 LastURISeg(const TDesC8& aURI)
-// Returns only the last uri segemnt
-// ------------------------------------------------------------------------------------------------
-TPtrC8 CNSmlDMIAPMatcher::LastURISeg(const TDesC8& aURI) const
-	{
-	TInt i;
-	for(i=aURI.Length()-1;i>=0;i--)
-		{
-		if(aURI[i]==KNSmlDMSlash)
-			{
-			break;
-			}
-		}
-	if(i==0)
-		{
-		return aURI;
-		}
-	else
-		{
-		return aURI.Mid(i+1);
-		}
-	}
-	
-// ------------------------------------------------------------------------------------------------
-// CNSmlDMIAPMatcher::const TDesC8& GetConRef()
-// Returns the connection reference
-// ------------------------------------------------------------------------------------------------
-const TDesC8& CNSmlDMIAPMatcher::GetConRef()
-	{
-	if(FeatureManager::FeatureSupported(KFeatureIdFfDmConnmoAdapter))
-		{
-			return KNSmlDMConnMOIAPUri();
-		}
-	else
-		{
-			return KNSmlDMIAPUri();
-		}	
-  }
-  
-
-
--- a/applicationmanagement/omascomoadapter/src/nsmldmuri.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,208 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
- *
- * Description:  Implementation of applicationmanagement components
- *
-*/
-
-
-#include "nsmldmuri.h"
-
-// ===========================================================================
-// NSmlDmURI
-// ===========================================================================
-
-// ------------------------------------------------------------------------------------------------
-// TPtrC8 NSmlDmURI::ParentURI(const TDesC8& aURI)
-// returns parent uri, i.e. removes last uri segment
-// ------------------------------------------------------------------------------------------------
-TPtrC8 NSmlDmURI::ParentURI(const TDesC8& aURI)
-	{
-	TBool onlyOneSeg = ETrue;
-	TInt i;
-	for(i=aURI.Length()-1;i>=0;i--)
-		{
-		if(aURI[i]==KNSmlDMUriSeparator)
-			{
-			onlyOneSeg = EFalse;
-			break;
-			}
-		}
-	if(onlyOneSeg)
-		{
-		return KNSmlDmRootUri();
-		}
-	else
-		{
-		return aURI.Left(i);
-		}
-	}
-
-// ------------------------------------------------------------------------------------------------
-// TPtrC8 NSmlDmURI::LastURISeg(const TDesC8& aURI)
-// Returns only the last uri segemnt
-// ------------------------------------------------------------------------------------------------
-TPtrC8 NSmlDmURI::LastURISeg(const TDesC8& aURI)
-	{
-	TInt i;
-	for(i=aURI.Length()-1;i>=0;i--)
-		{
-		if(aURI[i]==KNSmlDMUriSeparator)
-			{
-			break;
-			}
-		}
-	if(i==0)
-		{
-		return aURI;
-		}
-	else
-		{
-		return aURI.Mid(i+1);
-		}
-	}
-
-// ------------------------------------------------------------------------------------------------
-// TPtrC8 NSmlDmURI::RemoveDotSlash(const TDesC8& aURI)
-// return uri without dot and slash in start
-// ------------------------------------------------------------------------------------------------
-TPtrC8 NSmlDmURI::RemoveDotSlash(const TDesC8& aURI)
-	{
-
-	TInt offset = 0;
-	TInt endSlash = 0;
-
-	if(aURI.Find(KNSmlDmUriDotSlash)==0)
-		{
-		offset = 2;
-		}
-	else
-		{
-		return aURI;
-		}
-
-	if(aURI.Length()>2&&aURI[aURI.Length()-1]==KNSmlDMUriSeparator)
-		{
-		endSlash = 1;
-		}
-
-	return aURI.Mid(offset,aURI.Length()-endSlash-offset);
-	}
-
-// ------------------------------------------------------------------------------------------------
-// TPtrC8 NSmlDmURI::RemoveProp(const TDesC8& aURI)
-// removes property from the uri
-// ------------------------------------------------------------------------------------------------
-TPtrC8 NSmlDmURI::RemoveProp(const TDesC8& aURI)
-	{
-	TInt offset = aURI.Find(KNSmlDmQuestionMark);
-	if(offset!=KErrNotFound)
-		{
-		return aURI.Left(offset); 
-		}
-	return aURI;
-	}
-
-// ------------------------------------------------------------------------------------------------
-// TPtrC8 NSmlDmURI::RemoveLastSeg(const TDesC8& aURI)
-// Removes last uri segment
-// ------------------------------------------------------------------------------------------------
-TPtrC8 NSmlDmURI::RemoveLastSeg(const TDesC8& aURI)
-	{
-	TInt i;
-	for(i=aURI.Length()-1;i>=0;i--)
-		{
-		if(aURI[i]==KNSmlDMUriSeparator)
-			{
-			break;
-			}
-		}
-
-	if(i>0)
-		{
-		return aURI.Left(i);
-		}
-	else
-		{
-		return KNullDesC8();
-		}
-	}
-
-
-// ------------------------------------------------------------------------------------------------
-// TPtrC8 NSmlDmURI::URISeg(const TDesC8& aURI,TInt aLocation)
-// Returns the aLocation:th URI segment
-// ------------------------------------------------------------------------------------------------
-TPtrC8 NSmlDmURI::URISeg(const TDesC8& aURI,TInt aLocation)
-	{
-	TInt begin=0;
-	TInt end;
-	TInt num=0;
-
-	for(end=0;end<aURI.Length();end++)
-		{
-		if(aURI[end]==KNSmlDMUriSeparator||end==aURI.Length()-1)
-			{
-			num++;
-			if(num==aLocation)
-				{
-				break;
-				}
-			else
-				{
-				begin = end;
-				}
-			}
-		}
-	if(begin==0)
-		{
-		if(end==aURI.Length()-1)
-			{
-			return aURI;
-			}
-		else
-			{
-			return aURI.Left(end);
-			}
-		}
-	else
-		{
-		if(end==aURI.Length()-1)
-			{
-			return aURI.Mid(begin+1,end-begin);
-			}
-		else
-			{
-			return aURI.Mid(begin+1,end-begin-1);
-			}
-		}
-	}
-
-
-// ------------------------------------------------------------------------------------------------
-// TInt NSmlDmURI::NumOfURISegs(const TDesC8& aURI)
-// Returns the num of uri segs
-// ------------------------------------------------------------------------------------------------
-TInt NSmlDmURI::NumOfURISegs(const TDesC8& aURI)
-	{
-	TInt numOfURISegs = 1;
-	for(TInt i=0;i<aURI.Length();i++)
-		{
-		if(aURI[i]==KNSmlDMUriSeparator)
-			{
-			numOfURISegs++;
-			}
-		}
-	return numOfURISegs;
-	}
-
--- a/applicationmanagement/omascomoadapter/src/omascomoadapter.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4466 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
- *
- * Description:  Implementation of applicationmanagement components
- *
-*/
-
-
-
-/**
-
- 1. Remember the applications managed by Corporate Admin Role certificate
- 1.1 They must be removed during rfs
- 1.2 Others must be left as is (applications at least must be left)
-
- */
-
-
-#define __AM_CHECKSTATE_CHANGES // uncomment to enable dynamic acl
-#include <badesca.h>
-#include <fbs.h>
-#include <s32file.h> 
-#include "omascomoadapter.h"
-#include <implementationproxy.h> // For TImplementationProxy definition
-#include <f32file.h>
-#include "nsmldmuri.h"
-#include "nsmldmiapmatcher.h"
-#include "debug.h"
-#include "amprivateCRKeys.h"
-#include <centralrepository.h>
-#include "aminstalloptions.h"
-#include <featmgr.h>
-#include <apgtask.h>
-#include <w32std.h>
-
-#include <SyncMLClient.h>
-#include <SyncMLClientDM.h>
-#include <e32property.h>
-#include <centralrepository.h>
-#include <DevManInternalCRKeys.h>
-#include<HttpDownloadMgrCommon.h>
-
-#include "NSmlPrivateAPI.h"
-
-#include "nsmldmconst.h"
-#include "ampskeys.h"
-
-#include "nsmldmtreedbclient.h"
-#include "SyncService.h"
-#include "amprivateCRKeys.h"
-#include <e32cmn.h>
-#include <SWInstDefs.h>
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-#include <dmtreenode.h>
-#include <devman.h>
-#include "nsmldmuri.h"
-
-// Constants
-_LIT8( KDeployedURI, "./SCOMO/Inventory/Deployed/" );
-_LIT8( KDeliveredURI, "./SCOMO/Inventory/Delivered/" );
-_LIT8( KDownloadURI, "./SCOMO/Download/" );
-#else
-#include <nsmldmuri.h>
-
-// Constants
-_LIT8( KDeployedURI, "SCOMO/Inventory/Deployed/" );
-_LIT8( KDeliveredURI, "SCOMO/Inventory/Delivered/" );
-_LIT8( KDownloadURI, "SCOMO/Download/" );
-#endif
-
-#ifdef __NSML_DEBUG__
-#pragma message("NSml Debugging is ON!")
-#else
-#endif
-
-using namespace NApplicationManagement;
-
-_LIT8( KAMStateValueActive, "20" );
-_LIT8( KAMStateValueInactive, "10" );
-_LIT8( KAMStateValueDelivered, "10" );
-
-_LIT8( KSisxMimeType, "x-epoc/x-sisx-app" );
-_LIT8( KSisMimeType, "application/vnd.symbian.install" );
-_LIT8( KPipMimeType, "application/x-pip" );
-_LIT8( KJadMIMEType, "text/vnd.sun.j2me.app-descriptor" );
-_LIT8( KJarMIMEType, "application/java-archive" );
-_LIT8( KJavaMIMEType, "application/java" );
-
-
-
-const TUint8 KNSmlDMAMSeparatorDef = 0x2f; //forward slash
-#ifdef __AM_LASTERROR_NODE
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-_LIT8( KAMLastErrorURI, "./SCOMO/Ext/LastError" );
-#else
-_LIT8( KAMLastErrorURI, "SCOMO/Ext/LastError" );
-#endif
-_LIT8( KStdError, "Error %d" );
-
-#define MAPERROR(x,y,z) DefaultMapError(x,y,z)
-#else
-
-#define MAPERROR(x,y,z) DefaultMapError(x,y)
-#endif
-
-
-// ------------------------------------------------------------------------------------------------
-// CSCOMOAdapter* CSCOMOAdapter::NewL( )
-// ------------------------------------------------------------------------------------------------
-CSCOMOAdapter* CSCOMOAdapter::NewL(MSmlDmCallback* aDmCallback)
-    {
-    RDEBUG("CSCOMOAdapter::NewL(): begin");
-
-    CSCOMOAdapter* self = NewLC(aDmCallback);
-    CleanupStack::Pop();
-    return self;
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CSCOMOAdapter* CSCOMOAdapter::NewLC( )
-// ------------------------------------------------------------------------------------------------
-CSCOMOAdapter* CSCOMOAdapter::NewLC(MSmlDmCallback* aDmCallback)
-    {
-    CSCOMOAdapter* self = new( ELeave ) CSCOMOAdapter( aDmCallback );
-    CleanupStack::PushL(self);
-    self->ConstructL();
-    return self;
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CSCOMOAdapter::CSCOMOAdapter()
-// ------------------------------------------------------------------------------------------------
-CSCOMOAdapter::CSCOMOAdapter(TAny* aEcomArguments) :
-    CSmlDmAdapter(aEcomArguments), iSessionOpened(EFalse), iBuffer( 8),
-            iInAtomic(EFalse), iUpdated(EFalse), iIsStreamedContent(EFalse)
-    {
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CSCOMOAdapter::~CSCOMOAdapter()
-// ------------------------------------------------------------------------------------------------
-CSCOMOAdapter::~CSCOMOAdapter()
-    {
-    RDEBUG( "CSCOMOAdapter::~CSCOMOAdapter" );
-    iDbSession.Close();
-    iManagement.Close(); // make sure we're closed
-    iSessionOpened = EFalse;
-    iBuffer.Close();
-
-    CloseStreaming(); // Ensures that no streams are left open and that the temporary file is removed
-
-    delete iStreamedURI;
-    delete iStreamedLuid;
-    delete iStreamedType;
-
-#ifdef __AM_LASTERROR_NODE
-    delete iLastError;
-#endif
-
-    if (iAMdb)
-        delete iAMdb;
-
-    if (iUriDel)
-        delete iUriDel;
-    RDEBUG( "CSCOMOAdapter::~CSCOMOAdapter end" );
-    }
-
-// ------------------------------------------------------------------------------------------------
-//  CSCOMOAdapter::DDFVersionL()
-// ------------------------------------------------------------------------------------------------
-void CSCOMOAdapter::DDFVersionL(CBufBase& aDDFVersion)
-    {
-    aDDFVersion.InsertL( 0, KAMDDFVersion);
-    }
-
-// ------------------------------------------------------------------------------------------------
-//  CSCOMOAdapter::DDFStructureL()
-//
-// ------------------------------------------------------------------------------------------------
-void CSCOMOAdapter::DDFStructureL(MSmlDmDDFObject& aDDF)
-    {
-    RDEBUG( "CSCOMOAdapter::DDFStructureL(): begin" );
-
-    TSmlDmAccessTypes accessTypesGet;
-    accessTypesGet.SetGet();
-
-    TSmlDmAccessTypes accessTypesExec;
-    accessTypesExec.SetExec();
-
-    TSmlDmAccessTypes accessTypesAdd;
-    accessTypesAdd.SetAdd();
-
-    TSmlDmAccessTypes accessTypesExecReplace = accessTypesExec;
-    accessTypesExecReplace.SetReplace();
-
-    TSmlDmAccessTypes accessTypesGetAdd = accessTypesGet;
-    accessTypesGetAdd.SetAdd();
-
-    TSmlDmAccessTypes accessTypesGetReplace = accessTypesGet;
-    accessTypesGetReplace.SetGet();
-
-    TSmlDmAccessTypes accessTypesGetAddReplace = accessTypesGetAdd;
-    accessTypesGetAddReplace.SetReplace();
-
-    TSmlDmAccessTypes accessTypesGetAddReplaceDelete =
-            accessTypesGetAddReplace;
-    accessTypesGetAddReplaceDelete.SetDelete();
-
-    TSmlDmAccessTypes accessTypesAddReplace = 
-	    accessTypesAdd;
-    accessTypesAddReplace.SetReplace();
-
-    /*
-     Node: ./SCOMO
-     AM node is the common parent to all application management functionality nodes. 
-     Support: Mandatory
-     Occurs: One
-     Format: Node
-     Access Types: Get
-     Values: N/A
-     */
-    //MSmlDmDDFObject& root = aDDF.AddChildObjectGroupL();
-    MSmlDmDDFObject& am = aDDF.AddChildObjectL(KAMNodeName);
-    FillNodeInfoL(am, accessTypesGet, MSmlDmDDFObject::EOne,
-            MSmlDmDDFObject::EPermanent, MSmlDmDDFObject::ENode,
-            KAMNodeDescription);
-
-    /*
-     Node: ./SCOMO/Inventory
-     This node is start node to application inventory. 
-     Support: Mandatory
-     Occurs: One
-     Format: Node
-     Access Types: Get
-     Values: N/A
-     */
-    MSmlDmDDFObject& inv = am.AddChildObjectL(KAMInventoryNodeName);
-    FillNodeInfoL(inv, accessTypesGet, MSmlDmDDFObject::EOne,
-            MSmlDmDDFObject::EPermanent, MSmlDmDDFObject::ENode,
-            KAMInventoryNodeDescription);
-
-    /*
-     Node: ./SCOMO/Inventory/Delivered
-     This is node under which applications that are delivered but not installed are found.
-     Support: Mandatory
-     Occurs: One
-     Format: Node
-     Access Types: Get, Add
-     Values: N/A
-     */
-    MSmlDmDDFObject& del = inv.AddChildObjectL(KAMDeliveredNodeName);
-    FillNodeInfoL(del, accessTypesGetAdd, MSmlDmDDFObject::EOne,
-            MSmlDmDDFObject::EPermanent, MSmlDmDDFObject::ENode,
-            KAMDeliveredNodeDescription);
-
-    /*
-     Node: ./SCOMO/Inventory/Deployed
-     This is a node under which active applications are found.
-     The child node descriptions are same as Delivered sibling node, except that <X> cannot be created, data node does not exist and there's no InstallOpts leaf.
-     Support: Mandatory
-     Occurs: One
-     Format: Node
-     Access Types: Get
-     Values: N/A
-     */
-
-    MSmlDmDDFObject& ac = inv.AddChildObjectL(KAMDeployedNodeName);
-    FillNodeInfoL(ac, accessTypesGet, MSmlDmDDFObject::EOne,
-            MSmlDmDDFObject::EPermanent, MSmlDmDDFObject::ENode,
-            KAMDeployedNodeDescription);
-
-    /*
-     Node: ./SCOMO/Inventory/Delivered/<X>
-     This dynamic node is placeholder applications that are in Delivered state. 
-     Support: Mandatory
-     Occurs: ZeroOrMore
-     Format: Node
-     Access Types: Get, Add, Replace, Delete
-     Values: N/A
-     */
-    MSmlDmDDFObject& deldyna = del.AddChildObjectGroupL();
-    FillNodeInfoL(deldyna, accessTypesGetAddReplaceDelete,
-            MSmlDmDDFObject::EZeroOrMore, MSmlDmDDFObject::EDynamic,
-            MSmlDmDDFObject::ENode, KAMDeliveredDynaNodeDescription);
-
-    /*
-     Node: ./SCOMO/Inventory/Delivered/<X>/PkgID
-     This leaf node holds an identifier for an application.
-     Support: Mandatory
-     Occurs: One
-     Format: Chr
-     Access Types: Get, Add, Replace
-     Values: N/A
-     */
-    MSmlDmDDFObject& delid = deldyna.AddChildObjectL(KAMPkgIDNodeName);
-    FillNodeInfoL(delid, accessTypesGetAddReplace, MSmlDmDDFObject::EOne,
-            MSmlDmDDFObject::EPermanent, MSmlDmDDFObject::EChr,
-            KAMPkgIDNodeDescription);
-
-    /*
-     Node: ./SCOMO/Inventory/Delivered/<X>/Name
-     This leaf node holds name of an application. 
-     Support: Mandatory
-     Occurs: One
-     Format: Chr
-     Access Types: Get ( + Add, Replace access within Delivered node only)
-     Values: N/A
-     */
-    MSmlDmDDFObject& delname = deldyna.AddChildObjectL(KAMNameNodeName);
-    FillNodeInfoL(delname, accessTypesGetAddReplace,
-            MSmlDmDDFObject::EZeroOrOne, MSmlDmDDFObject::EPermanent,
-            MSmlDmDDFObject::EChr, KAMNameNodeDescription);
-
-    
-    /*
-     Node: ./SCM/Inventory/Delivered/<X>/Status
-     This leaf node holds the status of the Delivered. The client updates the node value. 
-     The values are typically error codes of Operations done on delivered node
-     Support: Mandatory 
-     Occurs: One
-     Format: Int
-     Access Types: Get
-     Values: N/A
-     */
-    MSmlDmDDFObject& delstatus = deldyna.AddChildObjectL(KAMStatusNodeName);
-    FillNodeInfoL(delstatus, accessTypesGet, MSmlDmDDFObject::EOne,
-            MSmlDmDDFObject::EPermanent, MSmlDmDDFObject::EInt,
-            KAMStatusNodeDescription);
-
-    /*
-     Node: ./SCOMO/Inventory/Delivered/<X>/PkgType
-     This leaf node holds an identifier for an application.
-     Support: Mandatory
-     Occurs: One
-     Format: Chr
-     Access Types: Get 
-     Values: N/A
-     */
-    MSmlDmDDFObject& delpkgtype = deldyna.AddChildObjectL(KAMPkgTypeNodeName);
-    FillNodeInfoL(delpkgtype, accessTypesGetAddReplace, MSmlDmDDFObject::EZeroOrOne,
-            MSmlDmDDFObject::EPermanent, MSmlDmDDFObject::EChr,
-            KAMPkgTypeNodeDescription);
-    
-    
-    /*
-     Node: ./SCOMO/Inventory/Delivered/<X>/Data
-     This leaf node holds the data of an application. 
-     Support: Mandatory
-     Occurs: One
-     Format: Bin
-     Access Types: Add, Replace
-     Values: N/A
-     */
-    MSmlDmDDFObject& delda = deldyna.AddChildObjectL(KAMDataNodeName);
-    FillNodeInfoNoDefaultMimeL(delda, accessTypesAddReplace,
-            MSmlDmDDFObject::EZeroOrOne, MSmlDmDDFObject::EPermanent,
-            MSmlDmDDFObject::EBin, KAMDataNodeDescription);
-
-    delda.AddDFTypeMimeTypeL(KSisxMimeType);
-    delda.AddDFTypeMimeTypeL(KSisMimeType);
-    delda.AddDFTypeMimeTypeL(KPipMimeType);
-
-    FeatureManager::InitializeLibL();
-    if (FeatureManager::FeatureSupported(KFeatureIdJavaMIDP20) )
-        {
-        delda.AddDFTypeMimeTypeL(KJadMIMEType);
-        delda.AddDFTypeMimeTypeL(KJarMIMEType);
-        delda.AddDFTypeMimeTypeL(KJavaMIMEType);
-        }
-
-    FeatureManager::UnInitializeLib();
-
-    /*
-     Node: ./SCOMO/Inventory/Delivered/<X>/Description
-     This leaf node holds the possible metadata of an application. Descriptor can be for example such a data that is required by the actual data in the Data leaf, but for some reason they cannot be bundled into same package. An example is Java JAR and JAD file combination, in which JAD file could be placed in MetaData and JAR in Data leaf.
-     Support: Optional
-     Occurs: One
-     Format: Bin
-     Access Types: Add, Get, Replace
-     Values: N/A
-     */
-    MSmlDmDDFObject& delmd = deldyna.AddChildObjectL(KAMDescriptionNodeName);
-    FillNodeInfoL(delmd, accessTypesGetAddReplace,
-            MSmlDmDDFObject::EZeroOrOne, MSmlDmDDFObject::EPermanent,
-            MSmlDmDDFObject::EBin, KAMDescriptorNodeDescription);
-
-     /*
-     Node: ./SCOMO/Inventory/Delivered/<X>/State
-     This leaf node holds state value of an application. 
-     Support: ?
-     Occurs: One
-     Format: Chr
-     Access Types: Get 
-     Values: N/A
-     */
-    MSmlDmDDFObject& delstate =
-            deldyna.AddChildObjectL(KAMStateValueNodeName);
-    FillNodeInfoL(delstate, accessTypesGet, MSmlDmDDFObject::EOne,
-            MSmlDmDDFObject::EPermanent, MSmlDmDDFObject::EChr,
-            KAMStateValueNodeDescription);
-    
-    /*
-     Node: ./SCOMO/Inventory/Delivered/<X>/Operations
-     This is a node that allows vendors to extend functionality.
-     Support: Optional
-     Occurs: One
-     Format: Node
-     Access Types: Get, Replace, Add, Delete
-     Values: N/A
-     */
-    MSmlDmDDFObject& delop = deldyna.AddChildObjectL(KAMOperationsNodeName);
-    FillNodeInfoL(delop, accessTypesGet, MSmlDmDDFObject::EOne,
-            MSmlDmDDFObject::EPermanent, MSmlDmDDFObject::ENode,
-            KAMOperationsNodeDescription);
-
-    /*
-     Node: ./SCOMO/Inventory/Delivered/<X>/Operations/Install
-     Exec command causes device to install a delivered application. The data inside 
-     exec command refers to the application to be installed. 
-     Support: Mandatory
-     Occurs: One
-     Format: Node
-     Access Types: Exec, Replace
-     Values: N/A
-     */
-    MSmlDmDDFObject& loinst = delop.AddChildObjectL(KAMInstallNodeName);
-    FillNodeInfoL(loinst, accessTypesExecReplace, MSmlDmDDFObject::EOne,
-            MSmlDmDDFObject::EPermanent, MSmlDmDDFObject::ENode,
-            KAMInstallNodeDescription);
-
-    /*
-     Node: ./SCOMO/Inventory/Delivered/<X>/Operations/InstallInactive
-     Exec command causes device to install a delivered application. The data inside 
-     exec command refers to the application to be installed. 
-     Support: Mandatory
-     Occurs: One
-     Format: Node
-     Access Types: Exec, Replace
-     Values: N/A
-     */
-    MSmlDmDDFObject& loinstact =
-            delop.AddChildObjectL(KAMInstallInactiveNodeName);
-    FillNodeInfoL(loinstact, accessTypesExecReplace, MSmlDmDDFObject::EOne,
-            MSmlDmDDFObject::EPermanent, MSmlDmDDFObject::ENode,
-            KAMInstallInactivateNodeDescription);
-
-    
-    /*
-     Node: ./SCOMO/Inventory/Delivered/<X>/Operations/Remove
-     Exec command causes device to remove an application. The data inside exec command refers to the application to be removed. The application must be in Inactive state in order for remove to be successful.
-     Support: Mandatory
-     Occurs: One
-     Format: Node
-     Access Types: Exec, Replace
-     Values: N/A
-     */
-    MSmlDmDDFObject& lorem = delop.AddChildObjectL(KAMRemoveNodeName);
-    FillNodeInfoL(lorem, accessTypesExecReplace, MSmlDmDDFObject::EOne,
-            MSmlDmDDFObject::EPermanent, MSmlDmDDFObject::ENode,
-            KAMRemoveNodeDescription);
-
-    /*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
-     DEPLOYED
-     *=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*/
-
-    /*
-     Node: ./SCOMO/Inventory/Deployed/<X>
-     This dynamic node is placeholder applications that are in Inactive state. 
-     Support: Mandatory
-     Occurs: ZeroOrMore
-     Format: Node
-     Access Types: Get, Replace
-     Values: N/A
-     */
-    MSmlDmDDFObject& depldyna = ac.AddChildObjectGroupL();
-    FillNodeInfoL(depldyna, accessTypesGetReplace,
-            MSmlDmDDFObject::EZeroOrMore, MSmlDmDDFObject::EDynamic,
-            MSmlDmDDFObject::ENode, KAMDeployedDynaNodeDescription);
-
-    /*
-     Node: ./SCOMO/Inventory/Deployed/<X>/ID
-     This leaf node holds an identifier for an application. This cannot be changed.
-     Support: Mandatory
-     Occurs: One
-     Format: Chr
-     Access Types: Get
-     Values: N/A
-     */
-    MSmlDmDDFObject& deplid = depldyna.AddChildObjectL(KAMIDNodeName);
-    FillNodeInfoL(deplid, accessTypesGet, MSmlDmDDFObject::EOne,
-            MSmlDmDDFObject::EPermanent, MSmlDmDDFObject::EChr,
-            KAMIDNodeDescription);
-
-    /*
-     Node: ./SCOMO/Inventory/Deployed/<X>/Name
-     This leaf node holds name of an application.
-     Support: Mandatory
-     Occurs: One
-     Format: Chr
-     Access Types: Get, Add, Replace
-     Values: N/A
-     */
-    MSmlDmDDFObject& deplname = depldyna.AddChildObjectL(KAMNameNodeName);
-    FillNodeInfoL(deplname, accessTypesGetAddReplace,
-            MSmlDmDDFObject::EZeroOrOne, MSmlDmDDFObject::EPermanent,
-            MSmlDmDDFObject::EChr, KAMNameNodeDescription);
-
-    /*
-     Node: ./SCOMO/Inventory/Deployed/<X>/Version
-     This leaf node holds the version of an application.
-     Support: Mandatory
-     Occurs: One
-     Format: Chr
-     Access Types: Get, Add, Replace
-     Values: N/A
-     */
-    MSmlDmDDFObject& deplver = depldyna.AddChildObjectL(KAMVersionNodeName);
-    FillNodeInfoL(deplver, accessTypesGetAddReplace,
-            MSmlDmDDFObject::EZeroOrOne, MSmlDmDDFObject::EPermanent,
-            MSmlDmDDFObject::EChr, KAMVersionNodeDescription);
-    
-    /*
-     Node: ./SCOMO/Inventory/Deployed/<X>/Description
-     This leaf node holds the version of an application.
-     Support: Mandatory
-     Occurs: One
-     Format: Chr
-     Access Types: Get, Add, Replace
-     Values: N/A
-     */
-    MSmlDmDDFObject& depldesc = depldyna.AddChildObjectL(KAMDescriptionNodeName);
-    FillNodeInfoL(depldesc, accessTypesGetAddReplace,
-            MSmlDmDDFObject::EZeroOrOne, MSmlDmDDFObject::EPermanent,
-            MSmlDmDDFObject::EChr, KAMDescriptionNodeDescription);        
-            
-    /*
-     Node: ./SCOMO/Inventory/Deployed/<X>/PkgIDRef
-     This leaf node holds an identifier for an application. This cannot be changed.
-     Support: Mandatory
-     Occurs: One
-     Format: Chr
-     Access Types: Get
-     Values: N/A
-     */
-    MSmlDmDDFObject& deplidref = depldyna.AddChildObjectL(KAMPkgIDRefNodeName);
-    FillNodeInfoL(deplidref, accessTypesGet, MSmlDmDDFObject::EOne,
-            MSmlDmDDFObject::EPermanent, MSmlDmDDFObject::EChr,
-            KAMPkgIDRefNodeDescription);
-
-    /*
-     Node: ./SCOMO/Inventory/Deployed/<X>/Status
-     This leaf node holds the status of the Deployed. The client updates the node value. 
-     The values are typically error codes of Operations done on deployed node
-     Support: Mandatory 
-     Occurs: One
-     Format: Int
-     Access Types: Get
-     Values: N/A
-     */
-    MSmlDmDDFObject& deplstatus = depldyna.AddChildObjectL(KAMStatusNodeName);
-    FillNodeInfoL(deplstatus, accessTypesGet, MSmlDmDDFObject::EOne,
-            MSmlDmDDFObject::EPermanent, MSmlDmDDFObject::EInt,
-            KAMStatusNodeDescription);
-
-    /*
-     Node: ./SCOMO/Inventory/Deployed/<X>/State
-     This leaf node holds state value of an application. 
-     Support: ?
-     Occurs: One
-     Format: Chr
-     Access Types: Get 
-     Values: N/A
-     */
-    MSmlDmDDFObject& deplstate =
-            depldyna.AddChildObjectL(KAMStateValueNodeName);
-    FillNodeInfoL(deplstate, accessTypesGet, MSmlDmDDFObject::EOne,
-            MSmlDmDDFObject::EPermanent, MSmlDmDDFObject::EChr,
-            KAMStateValueNodeDescription);
-
-    /*
-     Node: ./SCOMO/Inventory/Deployed/<X>/Operations
-     This is a node that allows vendors to extend functionality.
-     Support: Optional
-     Occurs: One
-     Format: Node
-     Access Types: Get, Replace, Add, Delete
-     Values: N/A
-
-     */
-    MSmlDmDDFObject& deplop = depldyna.AddChildObjectL(KAMOperationsNodeName);
-    FillNodeInfoL(deplop, accessTypesGet, MSmlDmDDFObject::EOne,
-            MSmlDmDDFObject::EPermanent, MSmlDmDDFObject::ENode,
-            KAMOperationsNodeDescription);
-
-    /*
-     Node: ./SCOMO/Inventory/Deployed/<X>/Operations/Remove
-     Exec command causes device to remove an application. The data inside exec command 
-     refers to the application to be removed. The application must be in Inactive state 
-     in order for remove to be successful.
-     Support: Mandatory
-     Occurs: One
-     Format: Node
-     Access Types: Exec, Replace
-     Values: N/A
-     */
-    MSmlDmDDFObject& deplrem = deplop.AddChildObjectL(KAMRemoveNodeName);
-    FillNodeInfoL(deplrem, accessTypesExecReplace, MSmlDmDDFObject::EOne,
-            MSmlDmDDFObject::EPermanent, MSmlDmDDFObject::ENode,
-            KAMRemoveNodeDescription);
-
-    /*
-     Node: ./SCOMO/Inventory/Deployed/<X>/Operations/Activate
-     Exec command causes device to activate an application. 
-     Support: Mandatory
-     Occurs: One
-     Format: Node
-     Access Types: Exec, Replace
-     Values: N/A
-     */
-    MSmlDmDDFObject& deplac = deplop.AddChildObjectL(KAMActivateNodeName);
-    FillNodeInfoL(deplac, accessTypesExecReplace, MSmlDmDDFObject::EOne,
-            MSmlDmDDFObject::EPermanent, MSmlDmDDFObject::ENode,
-            KAMActivateNodeDescription);
-
-    /*
-     Node: ./SCOMO/Inventory/Deployed/<X>/Operations/Deactivate
-     Exec command causes device to deactivate an application. 
-     Support: Mandatory
-     Occurs: One
-     Format: Node
-     Access Types: Exec, Replace
-     Values: N/A
-     */
-    MSmlDmDDFObject& depldeac = deplop.AddChildObjectL(KAMDeActivateNodeName);
-    FillNodeInfoL(depldeac, accessTypesExecReplace, MSmlDmDDFObject::EOne,
-            MSmlDmDDFObject::EPermanent, MSmlDmDDFObject::ENode,
-            KAMDeActivateNodeDescription);
-
-    /*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
-     DOWNLOAD
-     *=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*/
-
-    /*
-     Node: ./SCOMO/Download
-     This node is a root node for application download functionality. In practice download 
-     works so that admin adds nodes under this node, and they are automatically moved to 
-     Inventory/Delivered when the download has been finished. Running get command targeting 
-     to this node returns a list of pending downloads. 
-     Support: Mandatory 
-     Occurs: One
-     Format: Node
-     Access Types: Get, Add, Replace
-     Values: N/A
-     */
-    MSmlDmDDFObject& dow = am.AddChildObjectL(KAMDownloadNodeName);
-    FillNodeInfoL(dow, accessTypesGetAddReplace, MSmlDmDDFObject::EOne,
-            MSmlDmDDFObject::EPermanent, MSmlDmDDFObject::ENode,
-            KAMDownloadNodeDescription);
-
-    /*
-     Node: ./SCOMO/Download/<X>
-     This node is a placeholder for identifier of an application that is to be downloaded. 
-     Support: Mandatory 
-     Occurs: One
-     Format: Node
-     Access Types: Get, Add, Replace, Delete
-     Values: N/A
-     */
-    MSmlDmDDFObject& dowdyna = dow.AddChildObjectGroupL();
-    FillNodeInfoL(dowdyna, accessTypesGetAddReplaceDelete,
-            MSmlDmDDFObject::EZeroOrMore, MSmlDmDDFObject::EDynamic,
-            MSmlDmDDFObject::ENode, KAMDownloadDynaNodeDescription);
-
-    /*
-     Node: ./SCOMO/Download/<X>/PkgID
-     This leaf node holds an identifier for an application. 
-     Support: Mandatory
-     Occurs: One
-     Format: Chr
-     Access Types: Get
-     Values: N/A
-     */
-    MSmlDmDDFObject& dowid = dowdyna.AddChildObjectL(KAMPkgIDNodeName);
-    FillNodeInfoL(dowid, accessTypesGetAddReplace, MSmlDmDDFObject::EOne,
-            MSmlDmDDFObject::EPermanent, MSmlDmDDFObject::EChr,
-            KAMPkgIDNodeDescription);
-
-    /*
-     Node: ./SCOMO/Download/<X>/Name
-     This leaf node holds name of an application. 
-     Support: Mandatory
-     Occurs: One
-     Format: Chr
-     Access Types: Add, Get, Replace
-     Values: N/A
-     */
-    MSmlDmDDFObject& downame = dowdyna.AddChildObjectL(KAMNameNodeName);
-    FillNodeInfoL(downame, accessTypesGetAddReplace,
-            MSmlDmDDFObject::EZeroOrOne, MSmlDmDDFObject::EPermanent,
-            MSmlDmDDFObject::EChr, KAMNameNodeDescription);
-
-    
-    /*
-     Node: ./SCOMO/Download/<X>/PkgURL
-     This leaf node holds the URL from which the application should be downloaded.
-     Support: Mandatory 
-     Occurs: One
-     Format: Chr
-     Access Types: Add, Get, Replace
-     Values: N/A
-     */
-    MSmlDmDDFObject& dowuri = dowdyna.AddChildObjectL(KAMURINodeName);
-    FillNodeInfoL(dowuri, accessTypesGetAddReplace,
-            MSmlDmDDFObject::EZeroOrOne, MSmlDmDDFObject::EPermanent,
-            MSmlDmDDFObject::EChr, KAMURINodeDescription);
-            
-    /*
-     Node: /SCOMO/Download/<X>/PkgType
-     This leaf node holds an identifier for an application.
-     Support: Mandatory
-     Occurs: One
-     Format: Chr
-     Access Types: Add, Get, Replace
-     Values: N/A
-     */
-    MSmlDmDDFObject& dowpkgtype = dowdyna.AddChildObjectL(KAMPkgTypeNodeName);
-    FillNodeInfoL(dowpkgtype, accessTypesGetAddReplace, MSmlDmDDFObject::EZeroOrOne,
-            MSmlDmDDFObject::EPermanent, MSmlDmDDFObject::EChr,
-            KAMPkgTypeNodeDescription);
-
-    /*
-     Node: ./SCOMO/Download/<X>/Status
-     This leaf node holds the status of the download. The client updates the node value. The values are typically error codes of download protocol. Initially after the URI leaf is filled, this will get value 100, and will be replaced by one.
-     Support: Optional 
-     Occurs: One
-     Format: Chr
-     Access Types: Get
-     Values: N/A
-     */
-    MSmlDmDDFObject& dowstat = dowdyna.AddChildObjectL(KAMStatusNodeName);
-    FillNodeInfoL(dowstat, accessTypesGet, MSmlDmDDFObject::EOne,
-            MSmlDmDDFObject::EPermanent, MSmlDmDDFObject::EChr,
-            KAMStatusNodeDescription);
-
-    /*
-     Node: ./SCOMO/Download/<X>/Description
-     This leaf node holds the version of an application. 
-     Support: Mandatory
-     Occurs: One
-     Format: Chr
-     Access Types: Add, Get, Replace
-     Values: N/A
-     */
-    MSmlDmDDFObject& dowver = dowdyna.AddChildObjectL(KAMDescriptionNodeName);
-    FillNodeInfoL(dowver, accessTypesGetAddReplace,
-            MSmlDmDDFObject::EZeroOrOne, MSmlDmDDFObject::EPermanent,
-            MSmlDmDDFObject::EChr, KAMDescriptionNodeDescription);
-    
-    
-    /*
-     Node: ./SCOMO/Download/<X>/Operations
-     This is a node that holds the operation nodes.
-     Support: Optional
-     Occurs: One
-     Format: Node
-     Access Types: Get, Replace, Add, Delete
-     Values: N/A
-
-     */
-    MSmlDmDDFObject& dowop = dowdyna.AddChildObjectL(KAMOperationsNodeName);
-    FillNodeInfoL(dowop, accessTypesGet, MSmlDmDDFObject::EOne,
-            MSmlDmDDFObject::EPermanent, MSmlDmDDFObject::ENode,
-            KAMOperationsNodeDescription);
-
-    /*
-     Node: ./SCOMO/Download/<X>/Operations/Download
-     Exec command causes device to download an application. The dynamic node specifies the application to be downloaded. 
-     Support: Mandatory
-     Occurs: One
-     Format: Node
-     Access Types: Exec
-     Values: N/A
-     */
-    MSmlDmDDFObject& dowdown =
-            dowop.AddChildObjectL(KAMDownloadOperationNodeName);
-    FillNodeInfoL(dowdown, accessTypesExecReplace, MSmlDmDDFObject::EOne,
-            MSmlDmDDFObject::EPermanent, MSmlDmDDFObject::ENode,
-            KAMDownloadOperationNodeDescription);
-
-    /*
-     Node: ./SCOMO/Download/<X>/Operations/DownloadInstall
-     Exec command causes device to download and install an application. The dynamic node specifies the application to be downloaded. 
-     Support: Mandatory
-     Occurs: One
-     Format: Node
-     Access Types: Exec
-     Values: N/A
-     */
-    MSmlDmDDFObject& dowdowni =
-            dowop.AddChildObjectL(KAMDownloadAndInstallNodeName);
-    FillNodeInfoL(dowdowni, accessTypesExec, MSmlDmDDFObject::EOne,
-            MSmlDmDDFObject::EPermanent, MSmlDmDDFObject::ENode,
-            KAMDownloadAndInstallOperationNodeDescription);
-
-    /*
-     Node: ./SCOMO/Download/<X>/Operations/DownloadInstallInactive
-     Exec command causes device to download and install and activate an application. The dynamic node specifies the application to be downloaded. 
-     Support: Mandatory
-     Occurs: One
-     Format: Node
-     Access Types: Exec
-     Values: N/A
-     */
-    MSmlDmDDFObject& dowdownia =
-            dowop.AddChildObjectL(KAMDownloadAndInstallAndInActivateNodeName);
-    FillNodeInfoL(dowdownia, accessTypesExec, MSmlDmDDFObject::EOne,
-            MSmlDmDDFObject::EPermanent, MSmlDmDDFObject::ENode,
-            KAMDownloadAndInstallAndInActivateNodeName);
-
-    
-#ifdef __AM_LASTERROR_NODE
-    MSmlDmDDFObject& amext = am.AddChildObjectL(KAMExtNodeName);
-    FillNodeInfoL(amext, accessTypesGet, MSmlDmDDFObject::EOne,
-            MSmlDmDDFObject::EPermanent, MSmlDmDDFObject::ENode,
-            KAMExtNodeDescription);
-
-    MSmlDmDDFObject& amerr = amext.AddChildObjectL(KAMLastErrorNodeName);
-    FillNodeInfoL(amerr, accessTypesGet, MSmlDmDDFObject::EOne,
-            MSmlDmDDFObject::EPermanent, MSmlDmDDFObject::EChr,
-            KAMLastErrorDescription);
-#endif
-
-    // Ignore generic alert error status if any otherwise adapter fails to load 
-    
-    TRAP_IGNORE(SendPendingGenericAlertL());
-    if (GetAdapterValue() == KAMSCOMOAdapter)
-        {
-        CheckStateChangesL();
-        SetAdapterValue(KAMDefaultValue);
-        }
-    CheckAndAddPredefinedNodeL();
-    RDEBUG( "CSCOMOAdapter::DDFStructureL(): end" );
-    }
-
-void CSCOMOAdapter::SendPendingGenericAlertL()
-    {
-
-    // get information of the remote DM server
-    TSmlProfileId profId = 0;
-    HBufC8* serverId= NULL;
-    TBuf8<KMaxSizeString> scomometatype;
-    TBuf8<KMaxSizeString> scomometaformat;
-    TBuf8<KMaxSizeString> scomomark;
-
-    TBuf8<512> targetURIGet;
-
-    TUint32 internalid = KErrNone;
-    TInt finalresult = KErrNone;
-    TInt i =0;
-
-    // Get all the generic alert parameters from cenrep
-    // to construct generic alert message
-    CRepository *repository=CRepository::NewLC ( KCRUidPrivateApplicationManagementKeys );
-    repository->Get(KSCOMOMetaTypeKey,scomometatype);
-    repository->Get(KSCOMOMetaFormatKey,scomometaformat);
-    repository->Get(KSCOMOMark,scomomark);
-    CleanupStack::PopAndDestroy();
-    
-    // Retrive server info of current DM Session
-
-    GetServerInfoL(profId, serverId);
-    CleanupStack::PushL(serverId);
-
-    RPointerArray<CAMDbItem> genericalerts;
-    
-
-    // Get generic alert entry from Database for particular server ID.
-    TRAPD(err, iAMdb->GetEntryForServerIDL(genericalerts, *serverId));
-    
-    
-    // Send Pending generic alerts for server
-    
-    for(i=0; i<genericalerts.Count(); i++)
-    {
-    	
-    if (genericalerts.Count()!= 0 && err == KErrNone)
-        {  
-
-	
-       
-            internalid = genericalerts[i]->iLUID;
-           
-            // Get Target URI and Final Generic Alert result from App. Mgmt. Server 
-            // database.
-
-            TRAPD(err, SessionL().GetFinalResultsForGAL(internalid, finalresult,
-                    targetURIGet));
-                    
-            // If data in SCOMO DB is inconsistent with AM Server DB or
-            // if it exceeds retry count then delete that entry from adapter
-            // and server database
-            
-            if(finalresult <= KErrNone || err!=KErrNone)
-            {
-            	iAMdb->DeleteFromDatabaseL(internalid);
-            	User::Leave(KErrGeneral);
-            }
-	         
-            
-            TBuf8<6> dataresult;
-            dataresult.Num(finalresult);
-            
-            TPtrC8 mapping(NSmlDmURI::LastURISeg(targetURIGet) );
-            
-            
-            TInt retryupdate = iAMdb->GetRetryCountForLuidL(internalid);
-            
-            // If retryupdate in Zero then delete its entry from 
-            // database.
-            
-            if(retryupdate == KErrNone)
-            {
-            iAMdb->DeleteFromDatabaseL(internalid);
-            SessionL().GenericAlertSentL(internalid);
-            User::Leave(KErrCompletion);	
-            }
-            
-            // Decrement the retry count and update in database for
-            // that internalid.
-            iAMdb->UpdateRetryCountForLuidL(internalid, --retryupdate);    
-            
-            
-
-            // open handle to private api
-
-            RNSmlPrivateAPI privateAPI;
-            privateAPI.OpenL();
-            CleanupClosePushL(privateAPI);
-            
-            RArray<CNSmlDMAlertItem> iItemArray;
-            
-
-    		CNSmlDMAlertItem* item = new (ELeave) CNSmlDMAlertItem ;
-    		
-    		HBufC8 *data = HBufC8::NewL(1024);
-            
-            TPtr8 ptr = data->Des();
-            ptr.Append(KDataStart);
-            ptr.Append(KResultCodeStart);
-            ptr.Append(dataresult);
-            ptr.Append(KResultCodeEnd);
-            ptr.Append(KIdentifierStart);
-            ptr.Append(mapping);
-            ptr.Append(KIdentifierEnd);
-            ptr.Append(KDataEnd);
-
-            HBufC8 *sourceuri = genericalerts[i]->iSourceURI;
-    		
-    		item->iSource = sourceuri;
-
-			HBufC8 *targeturi = targetURIGet.AllocL();
-    		
-    		item->iTarget = targeturi;
-    		
-    		HBufC8 *metatype = scomometatype.AllocL();
-    		            
-    		item->iMetaType = metatype;
-    		            
-    		HBufC8 *metaformat = scomometaformat.AllocL();         
-
-    		item->iMetaFormat = metaformat;
-
-    		HBufC8 *metamark = scomomark.AllocL();
-    		            
-    		item->iMetaMark = metamark;
-    
-    		item->iData = data;
-    
-    		iItemArray.AppendL(*item);
-            
-            TRAP_IGNORE(privateAPI.AddDMGenericAlertRequestL(              
-                    *genericalerts[i]->iCorrelator,iItemArray ));
-                    
-                    
-            delete data;
-            
-            delete metamark;
-            
-            delete metaformat;
-            
-            delete metatype;
-            
-            delete targeturi;
-            delete item;
-                    
-            iItemArray.Reset();			
-			iItemArray.Close();
-            CleanupStack::PopAndDestroy( &privateAPI);
-            }
-        }
-    genericalerts.ResetAndDestroy();
-    CleanupStack::PopAndDestroy(); //serverid
-
-
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CSCOMOAdapter::SessionL()
-// ------------------------------------------------------------------------------------------------
-RApplicationManagement &CSCOMOAdapter::SessionL()
-    {
-    if ( !iSessionOpened)
-        {
-        TCertInfo info;
-
-        const TUid KCentralRepositoryUid =
-            {
-            0x10207843
-            };
-        const TInt KCertKey = 0x01;
-        CRepository *re= NULL;
-        TRAPD( errx, re = CRepository::NewL ( KCentralRepositoryUid ) );
-        if (errx == KErrNone && re)
-            {
-            TPckg<TCertInfo> pcert(info);
-            errx = re->Get(KCertKey, pcert) ;
-
-            RDEBUG("CSCOMOAdapter::SessionL() aCertInfo");
-
-            //RDEBUG_2("aCertInfo.iFingerprint.Length() is  %u",info.iFingerprint.Length() );
-            if (errx == KErrNone)
-                {
-                RDEBUG("CSCOMOAdapter::SessionL() errx == KErrNone");
-                }
-            else
-                {
-                if (errx != KErrNotFound)
-                    {
-                    RDEBUG("CSCOMOAdapter::SessionL() errx != KErrNotFound");
-                    }
-                else
-                    {
-                    RDEBUG("CSCOMOAdapter::SessionL() errx == KErrNotFound");
-                    }
-
-                }
-            delete re;
-            }
-
-        if (errx == KErrNotFound || !iCertRequired)
-            {
-            RDEBUG("CSCOMOAdapter::SessionL() calling iManagement.Connect()");
-            User::LeaveIfError(iManagement.Connect() );
-            iSessionOpened = ETrue;
-            iTrustAdded = EFalse;
-            }
-        else
-            {
-            RDEBUG("CSCOMOAdapter::SessionL() calling iManagement.Connect( info )");
-            User::LeaveIfError(iManagement.Connect(info) );
-            iSessionOpened = ETrue;
-            iTrustAdded = ETrue;
-            }
-        }
-    return iManagement;
-    }
-
-// ------------------------------------------------------------------------------------------------
-//  CSCOMOAdapter::UpdateLeafObjectL()
-// ------------------------------------------------------------------------------------------------
-void CSCOMOAdapter::UpdateLeafObjectL(const TDesC8& aURI,
-        const TDesC8& aLUID, const TDesC8& aObject, const TDesC8& aType,
-        TInt aStatusRef)
-    {
-    RDEBUG8_4("CSCOMOAdapter::UpdateLeafObjectL(): begin, '%S', '%S' '%S'", &aURI, &aLUID, &aType );
-
-    MSmlDmAdapter::TError status = EOk;
-    SetAdapterValue(KAMSCOMOAdapter);
-    _UpdateLeafObjectL(aURI, aLUID, aObject, aType, aStatusRef, status);
-
-    SetStatusL(aStatusRef, status);
-    if (status == EOk)
-        {
-        if (iInAtomic)
-            {
-            iBuffer.Append(TAMCommandBufferElement(aStatusRef, aURI) );
-            }
-        }
-    RDEBUG_2("CSCOMOAdapter::UpdateLeafObjectL(): end (%d)", status);
-    }
-
-// ------------------------------------------------------------------------------------------------
-//  CSCOMOAdapter::UpdateLeafObjectL()
-// ------------------------------------------------------------------------------------------------
-void CSCOMOAdapter::_UpdateLeafObjectL(const TDesC8& aURI,
-        const TDesC8& aLUID, const TDesC8& aObject, const TDesC8& aType,
-        TInt /*aStatusRef*/, MSmlDmAdapter::TError& aStatus)
-    {
-    RDEBUG("CSCOMOAdapter::_UpdateLeafObjectL(): begin");
-
-    CheckStateChangesL();
-
-    TError status(EError);
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-    TPtrC8 uriPtrc = NSmlDmURI::RemoveDotSlash( aURI );
-    TInt numSeqs( NSmlDmURI::NumOfURISegs( uriPtrc ) );
-    TPtrC8 mapping( NSmlDmURI::LastURISeg( uriPtrc ) );
-    TPtrC8 parent( NSmlDmURI::RemoveLastSeg( uriPtrc ) );
-#else
-    TInt numSeqs(NSmlDmURI::NumOfURISegs(aURI) );
-    TPtrC8 mapping(NSmlDmURI::LastURISeg(aURI) );
-    TPtrC8 parent(NSmlDmURI::RemoveLastSeg(aURI) );
-#endif
-
-    if (mapping == KAMNameNodeName)
-        {
-        if (aObject.Size() > KDeploymentComponentNameMaxLength)
-            {
-            aStatus = ETooLargeObject;
-            return;
-            }
-        }
-    else
-        if (mapping == KAMVersionNodeName)
-            {
-            if (aObject.Size() > KDeploymentComponentVersionMaxLength)
-                {
-                aStatus = ETooLargeObject;
-                return;
-                }
-            }
-        else
-	if (mapping == KAMURINodeName)
-	  {
-	   if (aObject.Size() > KMaxUrlLength)
-                {
-                aStatus = ETooLargeObject;
-                return;
-                }
-
-	  }
-        else
-            if (mapping == KAMConRefNodeName)
-                {
-                if (aObject.Size() > KMaxConRef)
-                    {
-                    aStatus = ETooLargeObject;
-                    return;
-                    }
-                }
-            else
-                if (mapping == KAMDescriptionNodeName)
-                    {
-                    if (aObject.Size() > 512)
-                        {
-                        aStatus = ETooLargeObject;
-                        return;
-                        }
-                    }
-            else
-               if(mapping == KAMPkgIDNodeName)
-               {
-               if(aObject.Size() > 256)
-               {
-               	aStatus = ETooLargeObject;
-                        return;
-               }
-               }
-            else
-              if(mapping == KAMPkgTypeNodeName)
-              {
-                // ADD check for PkgType MIME Type if not supported 
-                // error status should be sent and operation should stop
-                
-              	if(aObject.Size() >100)
-              	{
-              		aStatus = ETooLargeObject;
-                        return;
-              	}
-              }
-             
-
-    TPtrC8 grandParent(NSmlDmURI::RemoveLastSeg(parent) );
-    TPtrC8 grandParentMapping(NSmlDmURI::LastURISeg(grandParent) );
-    RApplicationManagement &session = SessionL();
-    TDeploymentComponentState state(EDCSNone);
-    if (numSeqs == 4 || numSeqs == 5)
-        {
-        if (numSeqs == 4)
-            {
-            state = EDCSDownload;
-            }
-        else
-            {
-            if (grandParentMapping == KAMDeliveredNodeName)
-                {
-                state = EDCSDelivered;
-                }
-            else
-                if (grandParentMapping == KAMDeployedNodeName)
-                    {
-                    state = EDCSActive;
-                    }
-                else
-                    {
-                    RDEBUG8_3( "CSCOMOAdapter::UpdateLeafObjectL(): ILLEGAL LEVEL %d NODE %S", numSeqs, &aURI );
-                    User::Leave(KErrArgument);
-                    }
-            }
-        }
-    else
-        {
-        RDEBUG8_3("CSCOMOAdapter::UpdateLeafObjectL(): ILLEGAL LEVEL %d NODE %S", numSeqs, &aURI );
-        }
-    if (state == EDCSDelivered || state == EDCSDownload ||state == EDCSActive
-            ||state == EDCSInactive)
-        {
-        if (aLUID != KNullDesC8)
-            {
-            TInt iluid(DesToIntL(aLUID) );
-            TDeploymentComponent comp;
-            TInt err(session.DeploymentComponent(iluid, comp) );
-            if (err == KErrNone)
-                {
-                
-                // Set default component install options for particular iluid.
-                TPtrC8 obj;
-                TAMInstallOptions opts; 
-                TAMInstallOptionsPckg optsb(opts);
-                
-                TBuf<KMaxSizeString> drive;
-                
-                CRepository *rep = CRepository::NewLC(KCRUidPrivateApplicationManagementKeys );
-                rep->Get(KDefaultDriveForInstall,drive);
-                CleanupStack::PopAndDestroy();
-                
-                //TChar KDefaultDrive = 'c';
-                TChar KDefaultDrive = drive[0]; 
-                
-	 			opts.iOptions.iUpgrade = SwiUI::EPolicyAllowed;
-     			opts.iOptions.iOptionalItems = SwiUI::EPolicyAllowed;
-     			opts.iOptions.iOCSP = SwiUI::EPolicyAllowed;
-     			opts.iOptions.iIgnoreOCSPWarnings = SwiUI::EPolicyAllowed;
-					
-     			opts.iOptions.iUntrusted = SwiUI::EPolicyAllowed;
-     			opts.iOptions.iPackageInfo = SwiUI::EPolicyAllowed;
-     			opts.iOptions.iCapabilities = SwiUI::EPolicyAllowed;
-     			opts.iOptions.iKillApp = SwiUI::EPolicyAllowed;
-     			opts.iOptions.iOverwrite = SwiUI::EPolicyAllowed;
-     			opts.iOptions.iDownload = SwiUI::EPolicyAllowed;
-     			opts.iOptions.iDrive = KDefaultDrive;
-     			opts.iOptions.iLang = ELangNone;
-     			opts.iOptions.iUsePhoneLang = EFalse ;
-     			
-     			obj.Set(optsb);
-                
-                TRAP_IGNORE( session.UpdateDeploymentComponentL( iluid, EDCInstallOptions, obj ) );
-                
-                
-                TDeplCompAttrType fl(UpdateFlagFromMapping(mapping) );
-
-                           
-                if (mapping == KAMDataNodeName || mapping
-                        == KAMDescriptorNodeName)
-                    {
-                    TInt erx(KErrNone);
-                    if ((mapping == KAMDataNodeName) &&(RecognizeMimeType(aType)== EFalse))
-                        {
-                        User::Leave(EInvalidObject);
-                        }
-                    if (iIsStreamedContent)
-                        {
-                        CloseStreaming();
-                        TRAP( erx, session.UpdateDeploymentComponentStreamedDataL( iluid, fl, aType ) );
-                        }
-                    else
-                        {
-                        // 
-                        TRAP( erx, session.UpdateDeploymentComponentDataL( iluid, fl, aObject, aType ) );
-                        }
-                    MAPERROR( erx, status, _L8("Update Delivered Data or metadata %d") );
-                    }
-                else
-                    {
-                    if (fl != EDCNone)
-                        {
-                        TPtrC8 obj;
-                        TAMInstallOptions opts;
-                        TAMInstallOptionsPckg optsb(opts);
-                        TPckgBuf<TInt> iap;
-                        if (fl == EDCInstallOptions)
-                            {
-                            }
-                        else
-                            if (fl == EDCConRef)
-                                {
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-
-                                //CNSmlDMIAPMatcher* iapfinder = CNSmlDMIAPMatcher::NewLC( &Callback() );
-                                //TInt i( iapfinder->IAPIdFromURIL( aObject ) );
-                                //CleanupStack::PopAndDestroy( iapfinder );
-                                //iap() = i;
-                                CArrayFix<TSmlDmMappingInfo>* mapArray = new CArrayFixFlat<TSmlDmMappingInfo>(4);
-                                CleanupStack::PushL(mapArray);
-
-                                Callback().GetMappingInfoListL( KNSmlDMMMSSlashIAPUri,*mapArray );
-
-                                TInt iapValue = KErrNotFound;
-                                TSmlDmMappingInfo mapInfo;
-
-                                for(TInt i = 0;i<mapArray->Count();i++)
-                                    {
-                                    if(LastURISeg(opts.iConRef)==mapArray->At(i).iURISeg)
-                                        {
-                                        iapValue=DesToInt(mapArray->At(i).iURISegLUID);
-                                        break;
-                                        }
-                                    }
-                                iap() = iapValue;
-                                mapArray->Reset();
-                                CleanupStack::PopAndDestroy(); //mapArray
-
-#else
-                                CNSmlDMIAPMatcher
-                                        * iapfinder =
-                                                CNSmlDMIAPMatcher::NewLC( &Callback() );
-                                TInt i(iapfinder->IAPIdFromURIL(aObject) );
-                                CleanupStack::PopAndDestroy(iapfinder);
-                                iap() = i;
-#endif
-                                obj.Set(iap);
-                                }
-                            else
-                                {
-                                obj.Set(aObject);
-                                }
-                        TRAPD( erx, session.UpdateDeploymentComponentL( iluid, fl, obj ) )
-                        ;
-                        MAPERROR( erx, status, _L8("Update some attribute %d") );
-                        }
-                    else
-                        {
-                        status = ENotFound;
-                        RDEBUG( "CSCOMOAdapter::UpdateLeafObjectL(): Unknown Target leaf" );
-                        }
-                    }
-                }
-            else
-                {
-                RDEBUG_3( "CSCOMOAdapter::UpdateLeafObjectL(): FAILED TO GET COMPONENT OF ID %d: %d" , iluid, err );
-                status = ENotFound;
-                }
-            }
-        else
-            {
-            RDEBUG8_2( "CSCOMOAdapter::UpdateLeafObjectL(): Faild to get luid allocation and find buffered for '%S'", &parent );
-            status = ENotFound;
-            }
-        }
-    else
-        {
-        RDEBUG8_2( "CSCOMOAdapter::UpdateLeafObjectL(): WARNING Tried to update illegal state leaf! '%S'", &grandParentMapping );
-        }
-
-    aStatus = status;
-
-    RDEBUG("CSCOMOAdapter::_UpdateLeafObjectL(): end");
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CSCOMOAdapter::UpdateLeafObjectL
-// ------------------------------------------------------------------------------------------------
-void CSCOMOAdapter::UpdateLeafObjectL(const TDesC8& aURI,
-        const TDesC8& aLUID, RWriteStream*& aStream, const TDesC8& aType,
-        TInt aStatusRef)
-    {
-    RDEBUG8_4("CSCOMOAdapter::UpdateLeafObjectL() aStream: begin, '%S', '%S' '%S'", &aURI, &aLUID, &aType );
-
-    TError status(CSmlDmAdapter::EOk);
-
-    if (iStreamedURI)
-        {
-        delete iStreamedURI;
-        iStreamedURI = NULL;
-        }
-    iStreamedURI = aURI.AllocL();
-
-    if (iStreamedLuid)
-        {
-        delete iStreamedLuid;
-        iStreamedLuid = NULL;
-        }
-    iStreamedLuid = aLUID.AllocL();
-
-    if (iStreamedType)
-        {
-        delete iStreamedType;
-        iStreamedType = NULL;
-        }
-    iStreamedType = aType.AllocL();
-
-    if (!iStreamOpen)
-        {
-        RApplicationManagement &session = SessionL();
-        TDeplCompAttrType attrType;
-        TPtrC8 mapping(NSmlDmURI::LastURISeg(aURI) );
-        TDeplCompAttrType fl(UpdateFlagFromMapping(mapping) );
-        if (mapping == KAMDataNodeName)
-            {
-            attrType = EDCData;
-            }
-        else
-            if (mapping == KAMDescriptorNodeName)
-                {
-                attrType = EDCMetaData;
-                }
-            else
-                {
-                RDEBUG8_2("CSCOMOAdapter::UpdateLeafObjectL(): Unknown mapping: (%S)", &mapping);
-                status = CSmlDmAdapter::EError;
-                }
-
-        if (status == CSmlDmAdapter::EOk)
-            {
-            TInt iluid(DesToIntL(aLUID) );
-            session.DeploymentComponentTempInstFileL(iluid, iStreamFile,
-                    attrType);
-            iStream.Attach(iStreamFile);
-            aStream = &iStream;
-            iStreamOpen = ETrue;
-            iIsStreamedContent = ETrue;
-            }
-        }
-    if ( !iInAtomic)
-        {
-        iStatusRef = aStatusRef;
-        Callback().SetStatusL(aStatusRef, status);
-        }
-    else
-        {
-        iBuffer.Append(TAMCommandBufferElement(aStatusRef, aURI) );
-        }
-
-    RDEBUG("CSCOMOAdapter::UpdateLeafObjectL() aStream : end");
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CSCOMOAdapter::UpdateFlagFromMapping( const TDesC8& aMapping )
-// ------------------------------------------------------------------------------------------------
-TDeplCompAttrType CSCOMOAdapter::UpdateFlagFromMapping(const TDesC8& aMapping)
-    {
-
-    TDeplCompAttrType res;
-    if (aMapping == KAMIDNodeName)
-        {
-        res = EDCId;
-        }
-    else
-        if (aMapping == KAMNameNodeName)
-            {
-            res = EDCName;
-            }
-        else
-            if (aMapping == KAMVersionNodeName)
-                {
-                res = EDCVersion;
-                }
-            else
-                if (aMapping == KAMStateValueNodeName)
-                    {
-                    res = EDCStateValue;
-                    }
-                else
-                    if (aMapping == KAMInstallOptsNodeName)
-                        {
-                        res = EDCInstallOptions;
-                        }
-                    else
-                        if (aMapping == KAMDescriptorNodeName)
-                            {
-                            res = EDCMetaData;
-                            }
-                        else
-                            if (aMapping == KAMDataNodeName)
-                                {
-                                res = EDCData;
-                                }
-                            else
-                                if (aMapping == KAMURINodeName)
-                                    {
-                                    res = EDCDownloadURI;
-                                    }
-                                else
-                                    if (aMapping == KAMStatusNodeName)
-                                        {
-                                         res = EDCStatus;
-                                        }
-                                    else
-                                        if (aMapping == KAMConRefNodeName)
-                                            {
-                                            res = EDCConRef;
-                                            }
-                                        else
-                                            if (aMapping
-                                                    == KAMDescriptionNodeName)
-                                                {
-                                                res = EDCDescriptionRef;
-                                                }
-                                              else
-                                                if(aMapping == KAMPkgIDNodeName)
-                                                {
-                                                	res = EDCPkgID;
-                                                }
-                                                else
-                                                if(aMapping == KAMPkgTypeNodeName)
-                                                {
-                                                	res = EDCPkgType;
-                                                }
-                                                
-
-                                            else
-                                                {
-                                                //User::Leave( KErrArgument );
-                                                res = EDCNone;
-                                                }
-    return res;
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CSCOMOAdapter::GetLuidForUserIdL( const TDesC8 &aUserId, 
-//		const TDeploymentComponentState aState )
-// ------------------------------------------------------------------------------------------------	
-TUint32 CSCOMOAdapter::GetLuidForUserIdL(const TDesC8 &aUserId,
-        const TDeploymentComponentState aState)
-    {
-    TUint32 ret( 0);
-    if (aState != EDCSNone)
-        {
-        RElementIdArray array;
-        TInt err(SessionL().DeploymentComponentIdsL(array, aState) );
-        if (err == KErrNone)
-            {
-            CleanupClosePushL(array);
-            TInt count(array.Count() );
-            for (TInt i( 0); i < count && ret == 0; i++)
-                {
-                TUint32 el = array[i];
-                TDCUserId dc;
-                SessionL().DeploymentComponentUserIdL(el, dc);
-                if (dc == aUserId)
-                    {
-                    ret = el;
-                    }
-                }
-            CleanupStack::PopAndDestroy( &array);
-            }
-        else
-            {
-            }
-        }
-    return ret;
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CSCOMOAdapter::GetLuid2L( const TDesC8 &aDMLuid, const TDesC8 &aUserId, 
-//		const TDeploymentComponentState aState, TError &aStatus )
-// ------------------------------------------------------------------------------------------------	
-TUint32 CSCOMOAdapter::GetLuid2L(const TDesC8 &aDMLuid,
-        const TDesC8 &aUserId, const TDeploymentComponentState aState,
-        TError &aStatus)
-    {
-    TUint32 ret(GetLuidL(aDMLuid, aUserId, aState) );
-    if ( (TInt32)ret <= 0)
-        {
-        aStatus = ENotFound;
-        }
-    return ret;
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CSCOMOAdapter::GetLuidL( const TDesC8 &aDMLuid, const TDesC8 &aUserId, 
-//		const TDeploymentComponentState aState )
-// ------------------------------------------------------------------------------------------------	
-TUint32 CSCOMOAdapter::GetLuidL(const TDesC8 &aDMLuid, const TDesC8 &aUserId,
-        const TDeploymentComponentState aState)
-    {
-    TUint32 ret( 0);
-    if (aDMLuid == KNullDesC8)
-        {
-        ret = GetLuidForUserIdL(aUserId, aState);
-        }
-    else
-        {
-        ret = DesToIntL(aDMLuid) ;
-        }
-
-    return ret;
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CSCOMOAdapter::DeleteObjectL( const TDesC8& aURI, const TDesC8& aLUID )
-// ------------------------------------------------------------------------------------------------
-void CSCOMOAdapter::DeleteObjectL(const TDesC8& aURI, const TDesC8& aLUID,
-        const TInt aStatusRef)
-    {
-
-    RDEBUG8_4("CSCOMOAdapter::DeleteObjectL(): begin (%S, %S, %d)" , &aURI, &aLUID, aStatusRef );
-    SetAdapterValue(KAMSCOMOAdapter);
-    CheckStateChangesL();
-
-    TError ret(EError);
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY	
-    TPtrC8 uriPtrc = NSmlDmURI::RemoveDotSlash(aURI);
-    TInt cnt( NSmlDmURI::NumOfURISegs( uriPtrc ) );
-    TPtrC8 mapping( NSmlDmURI::LastURISeg( uriPtrc ) );
-#else
-    TInt cnt(NSmlDmURI::NumOfURISegs(aURI) );
-    TPtrC8 mapping(NSmlDmURI::LastURISeg(aURI) );
-#endif
-	
-	TBuf8<KMaxFullName> temp;
-	GetPredefinedNodeL(temp);
-	TInt comp = mapping.Compare( temp );
-		if (temp.Length() && mapping.Compare( temp ) == 0)
-            {
-            MSmlDmAdapter::TError status = MSmlDmAdapter::ENotAllowed;
-            Callback().SetStatusL( aStatusRef, status );
-            return;
-            }
-    switch (cnt)
-        {
-        case 3:
-        case 4:
-            {
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-            TPtrC8 which( NSmlDmURI::URISeg( uriPtrc, cnt == 4 ? 3 : 2 ) );
-#else
-            TPtrC8 which(NSmlDmURI::URISeg(aURI, cnt == 4 ? 3 : 2) );
-#endif
-            if (which == KAMDeliveredNodeName || which == KAMDownloadNodeName)
-                {
-                TUint32 luid(GetLuidL(aLUID, mapping, (which
-                        == KAMDeliveredNodeName
-                                                ? EDCSDelivered
-                                                   : EDCSDownload)) );
-                if (luid > 0)
-                    {
-                    TRAPD( err, SessionL().RemoveL( luid ) )
-                    ;
-                    if (err == KErrNone || err == KErrNotFound)
-                        {
-                        ret = EOk;
-                        Callback().SetMappingL(aURI, KNullDesC8);
-                        if (err == KErrNone && iInAtomic)
-                            {
-                            iBuffer.Append(TAMCommandBufferElement(
-                                    aStatusRef, aURI) );
-                            }
-                        }
-                    else
-                        {
-                        MAPERROR( err, ret, _L8("Delete %d") );
-                        }
-                    }
-                else
-                    {
-                    RDEBUG( "CSCOMOAdapter::DeleteObjectL(): WARNING Object not found" );
-                    ret = ENotFound;
-                    }
-                }
-            else
-                {
-                RDEBUG8_2( "CSCOMOAdapter::DeleteObjectL(): ERROR Removing node %S is not supported", &aURI );
-                }
-            break;
-            }
-        default:
-            {
-            RDEBUG8_3( "CSCOMOAdapter::DeleteObjectL(): ILLEGAL LEVEL %d NODE %S", cnt, &aURI );
-            break;
-            }
-        }
-    SetStatusL(aStatusRef, ret);
-    RDEBUG( "CSCOMOAdapter::DeleteObjectL(): end" );
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CSCOMOAdapter::DeactivateIfInactive( const TUint aLuidi, const TDeploymentComponentState aTargetState )
-// ------------------------------------------------------------------------------------------------
-void CSCOMOAdapter::DeactivateIfInactive(const TUint aLuidi,
-        const TDeploymentComponentState aTargetState)
-    {
-    if (aTargetState == EDCSInactive)
-        {
-        RDEBUG( "CSCOMOAdapter::DeactivateIfInactive():  deactivating!" );
-        TRAPD( derr, iManagement.DeactivateL( aLuidi ) )
-        ;
-        if (derr != KErrNone)
-            {
-            RDEBUG_2("CSCOMOAdapter::DeactivateIfInactive(): ERROR deactivating failed %d", derr );
-            }
-        }
-    }
-
-void CSCOMOAdapter::InstallL(TUint aLuidi, const TDesC8& aURI,
-        const TDesC8& aLUID, const TDeploymentComponentState aTargetState,
-        TError &aRet)
-    {
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY	
-    TPtrC8 uriPtrc = NSmlDmURI::RemoveDotSlash(aURI);
-#else
-    //nothing
-#endif
-
-    TRAPD( err, SessionL().InstallL( aLuidi, aTargetState ) )
-    ;
-    if (err == KErrNone)
-        {
-        // Update the mappings in client to reflect new
-        //		position in the management tree ( Inactive or Active..)
-        RDEBUG( "CSCOMOAdapter::InstallL(): Install success!" );
-
-        TPtrC8 aclmapping(URISegsUpTo(aURI, 4) );
-        SetMappingL(aclmapping, aTargetState, aLUID);
-        iManagement.StateChangeComplete(aLuidi);
-
-        DeactivateIfInactive(aLuidi, aTargetState);
-        aRet = EOk;
-        }
-    else
-        {
-        RDEBUG_2( "CSCOMOAdapter::InstallL(): INSTALL FAILED '%d'" , err);
-        MAPERROR( err, aRet, _L8("Install %d") );
-        }
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CSCOMOAdapter::DefaultMapError( const TInt aErr, TError &aRet )
-// ------------------------------------------------------------------------------------------------
-void CSCOMOAdapter::DefaultMapError(const TInt aErr, TError &aRet,
-        const TDesC8&
-#ifdef __AM_LASTERROR_NODE
-        aDes
-#endif
-)
-    {
-    if (aErr == KErrNone)
-        {
-        aRet = EOk;
-        }
-    else
-        if (aErr == KErrNotFound)
-            {
-            aRet = ENotFound;
-            }
-        else
-            if (aErr == KErrArgument)
-                {
-                aRet = EInvalidObject;
-                }
-            else
-                if (aErr == KErrAlreadyExists)
-                    {
-                    aRet = EAlreadyExists;
-                    }
-                else
-                    {
-                    aRet = EError;
-                    }
-#ifdef __AM_LASTERROR_NODE
-    TInt err = KErrNone;
-    TRAP( err, SetErrorL( aDes, aErr ) );
-#endif
-    }
-
-#ifdef __AM_LASTERROR_NODE	
-void CSCOMOAdapter::SetErrorL(const TDesC8& aDes, const TInt aErr)
-    {
-    if (aDes != KNullDesC8)
-        {
-        SetLastErrorL(aDes, aErr);
-        }
-    else
-        {
-        SetLastErrorL(KStdError, aErr);
-        }
-    }
-#endif	
-
-// ------------------------------------------------------------------------------------------------
-// CSCOMOAdapter::ExecuteCommandL( const TDesC8& aURI, const TDesC8& aLUID, const TDesC8& aArgument, 
-//	const TDesC8& aType, 
-//	TInt aStatusRef )
-// ------------------------------------------------------------------------------------------------
-TDownloadTarget CSCOMOAdapter::DownloadTargetL(const TDesC8& aCommand)
-    {
-    if (aCommand == KAMDownloadOperationNodeName)
-        {
-        return EDeliver;
-        }
-    else
-        if (aCommand == KAMDownloadAndInstallNodeName)
-            {
-            return EInstallAndActivate;
-            }
-        else
-            if (aCommand == KAMDownloadAndInstallAndInActivateNodeName)
-                {
-                return EInstall;
-                }
-
-    RDEBUG8_2( "CSCOMOAdapter::DownloadTargetL(): ASKED OPERATION NOT SUPPORTED Download '%S'", &aCommand );
-    User::Leave(KErrArgument);
-    // NOTE! will not ever come here! Only to get rid of compiler warning !!
-    return EDeliver;
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CSCOMOAdapter::ExecuteCommandL( const TDesC8& aURI, const TDesC8& aLUID, const TDesC8& aArgument, 
-//	const TDesC8& aType, 
-//	TInt aStatusRef )
-// ------------------------------------------------------------------------------------------------
-void CSCOMOAdapter::ExecuteCommandL(const TDesC8& aURI, const TDesC8& aLUID,
-        const TDesC8& aArgument, const TDesC8& /*aType*/, TInt aStatusRef)
-    {
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY	//Done by Dipak
-    TPtrC8 uriPtrc = NSmlDmURI::RemoveDotSlash(aURI);
-#else
-    //nothing
-#endif
-
-    RDEBUG8_3("CSCOMOAdapter::ExecuteCommandL(): begin, '%S', '%S'", &aURI, &aLUID );
-    SetAdapterValue(KAMSCOMOAdapter);
-    CheckStateChangesL();
-    TError ret(EExecUndefError);
-
-    if (aLUID == KNullDesC8)
-        {
-        RDEBUG("CSCOMOAdapter::ExecuteCommandL(): WARNING no valid luid provided" );
-        }
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY	//Done by Dipak
-    TInt cnt( NSmlDmURI::NumOfURISegs( uriPtrc ) );
-#else
-    TInt cnt(NSmlDmURI::NumOfURISegs(aURI) );
-#endif	
-
-    TPtrC8 mapping(NSmlDmURI::LastURISeg(aURI) );
-
-    const TInt KDownloadMappingURILoc = 3;
-    switch (cnt)
-        {
-        case 5:
-            {
-            TUint32 iluid(GetLuidL(aLUID, NSmlDmURI::URISeg(aURI,
-                    KDownloadMappingURILoc), EDCSDownload) );
-
-            // Track the Newly added delivered  node to make sure that this reference
-            // of delivered node is removed from Tree DB.
-            // This delivered node is removed only if Execute command is successful
-            // by either adding Install, Install& activate etc.
-            // This Fix would be applicable in case of DM 1.2. 
-
-
-            TPtrC8 urival(URISegsUpTo(aURI, KDownloadMappingURILoc));
-
-            if (iUriDel)
-                {
-                delete iUriDel;
-                iUriDel = NULL;
-                }
-
-            iUriDel = urival.AllocL();
-
-            RDEBUG_2("CSCOMOAdapter::ExecuteCommandL(): luid is %d", iluid );
-            if (iluid > 0)
-                {
-                TDownloadTarget target = DownloadTargetL(mapping);
-
-                TRAPD( errx, SessionL().StartDownloadL( iluid, target ) );
-                
-
-                //Check If Sync is supported. Default is ASyncReporting.
-                //If ASyncSupported is 0 mean Sync reporting is supported.  
-                TInt ASyncSupported = -1;
-
-                CRepository *repository=CRepository::NewLC ( KCRUidPrivateApplicationManagementKeys );
-                repository->Get(KAsyncEnabled,ASyncSupported);
-                CleanupStack::PopAndDestroy();
-                    
-				if(errx == KErrNone)
-				{
-                if (ASyncSupported)
-                    ASyncReportL(iluid, aArgument, target, aURI);
-                else
-                    SyncReportL(iluid, aArgument, target, aURI, ret);
-				}
-
-                if (target == EInstall || target == EInstallAndActivate)
-                    {
-                    TInt err(iDbSession.RemoveMappingInfoL(KAMAdapterImplUid,
-                            *iUriDel, iluid) );
-                    }
-                if (errx == KErrNone)
-                    {
-                    RDEBUG( "CSCOMOAdapter::ExecuteCommandL(): StartDownloadL Successful " );
-                    if (ASyncSupported)
-                    {
-                       
-                       ret = EAcceptedForProcessing;
-                    }
-                        
-                    
-                    }
-                else
-                    {
-                    RDEBUG_2( "CSCOMOAdapter::ExecuteCommandL(): StartDownloadL FAILED '%d'", errx );
-                    if (errx == KErrNotFound)
-                        {
-                        ret = ENotFound;
-                        }
-                    else
-                        if (errx == KErrArgument)
-                            {
-                            ret = EExecUndefError;
-                            }
-                        else
-                            {
-                            ret = EExecUndefError;
-                            }
-                    }
-
-                }
-            else
-                {
-                ret = EExecUndefError;
-                RDEBUG( "CSCOMOAdapter::ExecuteCommandL(): case 5 Not found node" );
-                }
-            break;
-            }
-        case 6:
-            {
-            const TInt KInventoryMappingURILoc = 4;
-
-            // Track the Newly added delivered  node to make sure that this reference
-            // of delivered node is removed from Tree DB.
-            // This delivered node is removed only if Execute command is successful
-            // by either adding Install, Install& activate etc.
-            // This Fix would be applicable in case of DM 1.2. 
-
-
-            TPtrC8 urival(URISegsUpTo(aURI, KInventoryMappingURILoc));
-
-            if (iUriDel)
-                {
-                delete iUriDel;
-                iUriDel = NULL;
-                }
-
-            iUriDel = urival.AllocL();
-
-            if (mapping == KAMInstallNodeName || mapping
-                    == KAMInstallInactiveNodeName)
-                {
-                TUint32 iluid(GetLuidL(aLUID, NSmlDmURI::URISeg(aURI,
-                        KInventoryMappingURILoc), EDCSDelivered) );
-                if (iluid > 0)
-                    {
-                    TDeploymentComponentState targetstate = ((mapping
-                            == KAMInstallNodeName)
-                                                   ? EDCSActive
-                                                      : EDCSInactive);
-                    InstallL(iluid, aURI, aLUID, targetstate, ret);
-
-                    TInt err(iDbSession.RemoveMappingInfoL(KAMAdapterImplUid,
-                            *iUriDel, iluid) );
-                    }
-                else
-                    {
-                    ret = EExecInstallFailed;
-                    RDEBUG( "CSCOMOAdapter::ExecuteCommandL(): case 6 install Not found node" );
-                    }
-                }
-            else
-                if (mapping == KAMRemoveNodeName)
-                    {
-                    TPtrC8 parent( NSmlDmURI::RemoveLastSeg( urival ) );
-                    TPtrC8 ParentMapping( NSmlDmURI::LastURISeg( parent ) );
-                    TUint32 iluid(0);
-                    if ( ParentMapping == KAMDeliveredNodeName )
-                        {
-                        iluid = GetLuidL(aLUID, NSmlDmURI::URISeg(aURI,
-                                                    KInventoryMappingURILoc), EDCSDelivered) ;
-                        }
-                    
-                    else if ( ParentMapping == KAMDeployedNodeName)
-                        {
-                        iluid = GetLuidL(aLUID, NSmlDmURI::URISeg(aURI,
-                                KInventoryMappingURILoc), EDCSActive) ;
-                        if ( (TInt32)iluid <= 0)
-                            {
-                            iluid = GetLuidL(aLUID, NSmlDmURI::URISeg(aURI,
-                                    KInventoryMappingURILoc), EDCSInactive) ;
-                            }
-                        }
-                    if (iluid > 0)
-                        {
-                        TRAPD( err, SessionL().RemoveL( iluid ) )
-                        ;
-                        if (err == KErrNone)
-                            {
-                            RDEBUG( "CSCOMOAdapter::ExecuteCommandL(): Remove success!" );
-                            TPtrC8 aclmapping(URISegsUpTo(aURI, 4) );
-
-                            // "Nullify" the mapping for argument
-                           err = iDbSession.RemoveMappingInfoL(KAMAdapterImplUid, aclmapping);
-                            if (err == KErrNone)
-                                {
-                                ret = EExecSuccess;
-                                }
-                            if (iInAtomic)
-                                {
-                                iBuffer.Append(TAMCommandBufferElement(
-                                        aStatusRef, aURI) );
-                                }
-                            }
-                        else
-                            {
-                            RDEBUG_2( "CSCOMOAdapter::ExecuteCommandL(): Remove FAILED '%d'", err);
-
-                            if (err == SwiUI::KSWInstErrUserCancel)
-                                ret = EExecUserCancelled;
-                            else
-                                MAPERROR( err, ret, _L8("Execute Remove %d") );
-                            }
-                        }
-                    else
-                        {
-                        ret = EExecRemoveFailed;
-                        RDEBUG( "CSCOMOAdapter::ExecuteCommandL(): case 6 remove Not found node" );
-                        }
-                    }
-                        else
-                            if (mapping == KAMActivateNodeName)
-                                {
-                                //DBG_ARGS8( "CSCOMOAdapter::ExecuteCommandL(): Activating " );
-                                TUint32 iluid(GetLuidL(aLUID,
-                                        NSmlDmURI::URISeg(aURI,
-                                                KInventoryMappingURILoc),
-                                        EDCSActive) );
-                                if ( (TInt32)iluid <= 0)
-                                    {
-                                    iluid = GetLuidL(aLUID,
-                                            NSmlDmURI::URISeg(aURI,
-                                                    KInventoryMappingURILoc),
-                                            EDCSInactive) ;
-                                    }
-                                if (iluid > 0)
-                                    {
-                                    TRAP_IGNORE( SessionL().ActivateL( iluid ) );
-                                    ret = EExecSuccess;
-								
-                                    //MAPERROR( erx, ret, _L8("Activate %d") );
-                                    }
-                                else
-                                    {
-                                    ret = EExecActivateFailed;
-                                    RDEBUG( "CSCOMOAdapter::ExecuteCommandL(): case 6 Activate Not found node" );
-                                    }
-                                }
-                            else
-                                if (mapping == KAMDeActivateNodeName)
-                                    {
-                                    //DBG_ARGS8( "CSCOMOAdapter::ExecuteCommandL(): Inactivating " );
-                                    TUint32 iluid(GetLuidL(aLUID,
-                                            NSmlDmURI::URISeg(aURI,
-                                                    KInventoryMappingURILoc),
-                                            EDCSActive) );
-                                    if ( (TInt32)iluid <= 0)
-                                        {
-                                        iluid
-                                                = GetLuidL(
-                                                        aLUID,
-                                                        NSmlDmURI::URISeg(
-                                                                aURI,
-                                                                KInventoryMappingURILoc),
-                                                        EDCSInactive) ;
-                                        }
-                                    if (iluid > 0)
-                                        {
-                                        TRAP_IGNORE(SessionL().DeactivateL( iluid ) )
-                                        ;
-										ret = EExecSuccess;
-                                        //MAPERROR( erx, ret,_L8("Dectivate %d") );
-                                        }
-                                    else
-                                        {
-                                        ret = EExecDeactivateFailed;
-                                        RDEBUG( "CSCOMOAdapter::ExecuteCommandL(): case 6 DeActivate Not found node" );
-                                        }
-                                    }
-                                else
-                                    {
-                                    RDEBUG8_2( "CSCOMOAdapter::ExecuteCommandL(): ASKED NOT SUPPORTED OPERATION '%S'", &mapping );
-                                    
-                                    ret = EExecUndefError;
-                                    }
-            break;
-            }
-
-        default:
-            {
-            RDEBUG8_3( "CSCOMOAdapter::ExecuteCommandL(): ILLEGAL LEVEL %d NODE %S", cnt, &aURI );
-            
-            ret = EExecUndefError;
-            break;
-            }
-        }
-    SetStatusL(aStatusRef, ret) ;
-    }
-
-void CSCOMOAdapter::ASyncReportL(TUint32 aLuid, const TDesC8& aArgument,
-        const TDownloadTarget aTarget,const TDesC8& aURI)
-    {
-
-    // while sending generic alert
-    // adapter uses entry stored in database and constructs generic alert
-    // using SyncML framework API.
-
-    TInt index = 0;
-
-	// Default max retry count is 5. It is also cenep configurable
-	// Cenrep configuration responsible can change the max retry 
-	// count
-    TInt retrycount = 5;
-    
-    CRepository *repository = CRepository::NewLC ( KCRUidPrivateApplicationManagementKeys );
-    repository->Get(KMaxRetryCount,retrycount);
-    CleanupStack::PopAndDestroy(); //repository
-      
-    TSmlProfileId profId = KErrNotFound;
-    HBufC8* serverId= NULL;
-
-    //Retrive Server Information
-
-    GetServerInfoL(profId, serverId);
-
-    CleanupStack::PushL(serverId);
-
-    //Add Download entry to database
-
-    iAMdb->SaveToDatabaseL(index, aLuid, profId, retrycount, aURI,
-            *serverId, aArgument);
-
-    CleanupStack::PopAndDestroy(serverId);
-
-    }
-
-void CSCOMOAdapter::SyncReportL(TUint32 aLuid, const TDesC8& aArgument,
-        const TDownloadTarget aTarget,const TDesC8& aURI, TError &aRet )
-    {
-    TInt status = KStatusSuccess;
-
-    RProperty counter;
-    TInt r=counter.Attach(KUidPSApplicationManagementKeys, KSyncNotifier,
-            EOwnerThread);
-    User::LeaveIfError(r);
-
-    CSyncService *syncService = CSyncService::NewL(NULL, KDevManServiceStart);
-    if (syncService)
-        {
-        syncService->EnableProgressNoteL(EFalse);
-        }
-
-    delete syncService;
-
-    // wait for the previously attached ‘counter’ property to be updated
-    TRequestStatus s;
-    counter.Subscribe(s);
-    User::WaitForRequest(s);
-    
-    CRepository *repository = CRepository::NewLC ( KCRUidPrivateApplicationManagementKeys );
-    repository->Get(KAMSyncStatus,status);
-    CleanupStack::PopAndDestroy();
-                		   
-		switch(status)
-		{
-			case KStatusUserCancelled:
-			{
-				aRet = MSmlDmAdapter::EExecUserCancelled;
-				break;
-			}
-			               
-			case KStatusDowloadFailedOOM:
-			{
-				aRet = MSmlDmAdapter::EExecDownFailOOM;
-				break;
-			}
-
-			case KStatusAlternateDownldAuthFail:
-			{
-			    aRet = MSmlDmAdapter::EExecAltDwnldAuthFail;
-			    break;	
-			}
-
-			case KStatusDownloadFailed:
-			{
-				aRet = MSmlDmAdapter::EExecDownloadFailed;
-				break;
-			}
-
-			case KStatusPkgValidationFailed:
-			{
-				aRet = MSmlDmAdapter::EExecPkgValidationFail;
-				break;
-			}
-
-			case KStatusInstallFailedOOM:
-			{
-				aRet = MSmlDmAdapter::EExecInstallOOM;
-				break;
-			}
-
-			case KStatusInstallFailed:
-			{
-				aRet = MSmlDmAdapter::EExecInstallFailed;
-				break;
-			}
-		
-		  case KStatusUnSupportedEnvironment:
-			{
-				aRet = MSmlDmAdapter::EExecOperationReject;
-				break;
-			}
-			
-			case KStatusAltDowldUnavailable:
-			{
-				aRet = MSmlDmAdapter::EExecAltDwnldSrvUnavailable;
-				break;
-			}
-		
-			default:
-			{
-			    aRet = MSmlDmAdapter::EExecSuccess;
-				break;
-			}
-		}                
-    
-
-    }
-
-void CSCOMOAdapter::GetServerInfoL(TSmlProfileId& aProfId, HBufC8*& aServerId) const
-    {
-    // Open session
-    RSyncMLSession session;
-    session.OpenL();
-    CleanupClosePushL(session);
-
-    // get current job's id (and usage type)
-    TSmlJobId jobId = KErrNotFound;
-    TSmlUsageType type = ESmlDevMan;
-    session.CurrentJobL(jobId, type);
-
-    // open currently running job
-    RSyncMLDevManJob dmJob;
-    dmJob.OpenL(session, jobId);
-    CleanupClosePushL(dmJob);
-
-    // get job's profile id
-    aProfId = dmJob.Profile();
-
-    // open profile using id in read-only mode
-    RSyncMLDevManProfile dmProf;
-    dmProf.OpenL(session, aProfId, ESmlOpenRead);
-    CleanupClosePushL(dmProf);
-
-    // get profile's server id
-    aServerId = dmProf.ServerId().AllocL();
-
-    // close handles
-    CleanupStack::PopAndDestroy( &dmProf);
-    CleanupStack::PopAndDestroy( &dmJob);
-    CleanupStack::PopAndDestroy( &session);
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CSCOMOAdapter::UpdateL( 
-// 	const TUint aLuidi, 
-// 	const TDesC8& aURI, 
-// 	const TDesC8& aSourceLUID,
-// 	const TDeploymentComponentState aTargetState,
-// 	TError &aRet
-// ------------------------------------------------------------------------------------------------
-void CSCOMOAdapter::UpdateL(const TUint aLuidi, const TDesC8& aURI,
-        const TDesC8& aSourceLUID,
-        const TDeploymentComponentState aTargetState, TError &aRet)
-    {
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY	//Done by Dipak
-    TPtrC8 uriPtrc = NSmlDmURI::RemoveDotSlash(aURI);
-#else
-    //nothing
-#endif
-
-    CBufBase *delivered = CBufFlat::NewL( 128);
-    CleanupStack::PushL(delivered);
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY	//Done by Dipak
-    TPtrC8 aclmapping( NSmlDmURI::URISeg( uriPtrc, 4 ) );
-#else
-    TPtrC8 aclmapping(NSmlDmURI::URISeg(aURI, 4) );
-#endif
-
-    HBufC8 *targetURI = HBufC8::NewLC(KDeployedURI().Length() + aclmapping.Length() );
-
-    TPtr8 targetPtr(targetURI->Des() );
-    targetPtr.Copy(KDeployedURI);
-    targetPtr.Append(aclmapping);
-
-    HBufC8 *deployed = Callback().GetLuidAllocL(targetPtr) ;
-    CleanupStack::PushL(deployed);
-
-    //DBG_ARGS8( "CSCOMOAdapter::UpdateL(): Updating '%S' luid: '%S'" ), &targetPtr, &(*deployed));
-    if ( *deployed == KNullDesC8)
-        {
-        //DBG_ARGS8( "CSCOMOAdapter::UpdateL(): Failed to find to update target '%S'" ), &targetPtr );
-        aRet = EError;
-        }
-    else
-        {
-        // Found delivered & active or inactive components! Do update!
-        TInt depluid(DesToIntL( *deployed ));
-        TRAPD( erx, SessionL().UpdateL( aLuidi, depluid ) )
-        ;
-        MAPERROR( erx, aRet,_L8("Update %d") );
-        if (erx == KErrNone)
-            {
-            SetMappingLC(aclmapping, aTargetState, aSourceLUID, targetURI);
-            DeactivateIfInactive(aLuidi, aTargetState);
-            }
-        }
-    CleanupStack::PopAndDestroy(deployed) ;
-    CleanupStack::PopAndDestroy(targetURI) ;
-    CleanupStack::PopAndDestroy(delivered) ;
-    }
-
-// ------------------------------------------------------------------------------------------------
-//  CSCOMOAdapter::CheckStateL( const TDeploymentComponent &aComp, const TDesC8& aURI
-// ------------------------------------------------------------------------------------------------
-TBool CSCOMOAdapter::CheckStateL(const TDeploymentComponent &aComp,
-        const TDesC8& aURI)
-    {
-	TBool ret;
-	if ((aComp.iState ==  EDCSDelivered) || (aComp.iState == EDCSActive) || ( aComp.iState == EDCSInactive) || (aComp.iState == EDCSDownload))
-	{
-        // Check for map & __TARM_SYMBIAN_CONVERGENCY also ?
-        ret = ETrue;
-    }
-	else
-	    ret = EFalse;
-	return ret;
-    }
-
-// ------------------------------------------------------------------------------------------------
-//  CSCOMOAdapter::StateL( const TDeploymentComponent &aComp, const TDesC8& aURI
-// ------------------------------------------------------------------------------------------------
-TDeploymentComponentState CSCOMOAdapter::StateL(const TDesC8& aURI)
-    {
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY	//Done by Dipak
-    TPtrC8 uriPtrc = NSmlDmURI::RemoveDotSlash(aURI);
-#else
-    //nothing
-#endif
-
-    TDeploymentComponentState ret(EDCSNone);
-#ifdef __TARM_SYMBIAN_CONVERGENCY	//Done by Dipak
-    TInt cnt( NSmlDmURI::NumOfURISegs( uriPtrc ) );
-#else
-    TInt cnt(NSmlDmURI::NumOfURISegs(aURI) );
-#endif	
-    if (cnt > 2)
-        {
-#ifdef __TARM_SYMBIAN_CONVERGENCY	//Done by Dipak
-        TPtrC8 map( NSmlDmURI::URISeg( uriPtrc, 2 ) );
-#else
-        TPtrC8 map(NSmlDmURI::URISeg(aURI, 2) );
-#endif	
-        if (map == KAMInventoryNodeName)
-            {
-#ifdef __TARM_SYMBIAN_CONVERGENCY	//Done by Dipak
-            TPtrC8 map( NSmlDmURI::URISeg( uriPtrc, 2 ) );
-#else
-            TPtrC8 map(NSmlDmURI::URISeg(aURI, 2) );
-#endif	
-            map.Set(NSmlDmURI::URISeg(aURI, 3) );
-            if (map == KAMDeployedNodeName)
-                {
-
-                }
-            else
-                if (map == KAMDeliveredNodeName)
-                    {
-                    ret = EDCSDelivered;
-                    }
-                else
-                    {
-                    User::Leave(KErrArgument);
-                    }
-            }
-        else
-            if (map == KAMDownloadNodeName)
-                {
-                ret = EDCSDownload;
-                }
-            else
-                {
-                User::Leave(KErrArgument);
-                }
-        }
-    return ret;
-    }
-
-// ------------------------------------------------------------------------------------------------
-//  CSCOMOAdapter::CheckStateL( const TDesC8& aURI, const TDesC8& aLUID )
-// ------------------------------------------------------------------------------------------------
-TBool CSCOMOAdapter::CheckStateL(const TDesC8& aURI, const TDesC8& aLUID)
-    {
-
-    TUint32 iluid(DesToIntL(aLUID) );
-    TDeploymentComponent comp;
-    TInt err(SessionL().DeploymentComponent(iluid, comp) );
-    TBool ret(EFalse);
-    if (err == KErrNone)
-        {
-        ret = CheckStateL(comp, aURI);
-        }
-    return ret;
-    }
-
-// ------------------------------------------------------------------------------------------------
-//  CSCOMOAdapter::InstallOptionsDataL(const TUint32 iluid, const TDeplCompAttrType& aDataType, 
-//		CBufBase &aBuf, CBufBase *aRaw/*= NULL*/)
-// ------------------------------------------------------------------------------------------------
-void CSCOMOAdapter::InstallOptionsDataL(const TUint32 iluid,
-        const TDeplCompAttrType& aDataType, CBufBase &aBuf, CBufBase *aRaw/*= NULL*/)
-    {
-    TAMInstallOptionsPckgBuf iop;
-    TBool pushed(EFalse);
-    if ( !aRaw)
-        {
-        aRaw = CBufFlat::NewL(32);
-        CleanupStack::PushL(aRaw);
-        pushed = ETrue;
-        SessionL().DeploymentComponentDataL(iluid, aDataType, *aRaw);
-        }
-
-    iop.Copy(aRaw->Ptr( 0) );
-    if (pushed)
-        {
-        CleanupStack::PopAndDestroy(aRaw);
-        }
-    InstallOptionsParser::SerializeOptionsL(iop(), aBuf);
-    }
-
-// ------------------------------------------------------------------------------------------------
-//  CSCOMOAdapter::GetComponentDataL( const TDesC8& parent, const TDesC8& mapping, 
-//		const TUint32 iluid, CBufBase *currentList, CBufBase *currentMime, TError &status )
-// ------------------------------------------------------------------------------------------------
-void CSCOMOAdapter::GetComponentDataL(const TDesC8& parent,
-        const TDesC8& mapping, const TUint32 iluid, CBufBase &currentList,
-        CBufBase &currentMime, TError &status)
-    {
-    TDeploymentComponent comp;
-    TInt err(SessionL().DeploymentComponent(iluid, comp) );
-    if (err == KErrNone)
-        {
-        RDEBUG_3( "CSCOMOAdapter::GetComponentDataL(): DeploymentComponent response: %d, state: %d", err, comp.iState );
-        if (CheckStateL(comp, parent) )
-            {
-            if (mapping == KAMPkgIDNodeName)
-                {
-                currentList.InsertL( 0, comp.iPkgID);
-                status = EOk;
-                }
-            else
-                if (mapping == KAMNameNodeName)
-                    {
-                    currentList.InsertL( 0, comp.iName);
-                    status = EOk;
-                    }
-                else
-                    if (mapping == KAMVersionNodeName)
-                        {
-                        currentList.InsertL( 0, comp.iVersion);
-                        status = EOk;
-                        }
-                else
-                   if(mapping == KAMIDNodeName)
-                   {
-                   	
-                        currentList.InsertL( 0, comp.iId);
-                        status = EOk;
-                        
-                   }
-                else
-                   if(mapping == KAMPkgIDRefNodeName)
-                   {
-                   	
-                        currentList.InsertL( 0, comp.iPkgIDRef);
-                        status = EOk;
-                        
-                   }
-				else
-                   if(mapping == KAMPkgIDNodeName)
-                   {
-                   	
-                        currentList.InsertL( 0, comp.iPkgID);
-                        status = EOk;
-                        
-                   }               
-				else
-                   if(mapping == KAMPkgTypeNodeName)
-                   {
-                   	
-                        currentList.InsertL( 0, comp.iPkgType);
-                        status = EOk;
-                        
-                   }             
-                else 
-                   if ( mapping == KAMStatusNodeName )
-                {
-                TDeplCompAttrType dataType( UpdateFlagFromMapping( mapping ) );
-                SessionL().DeploymentComponentDataL( iluid, dataType, currentList );
-                status = EOk;
-                }			
-
-                    else
-                        if (mapping == KAMDescriptionNodeName)
-                            {
-                            currentList.InsertL(0, comp.iDescription);
-                            status = EOk;
-                            }
-                        else
-                            {
-                            TDeplCompAttrType
-                                    dataType(UpdateFlagFromMapping(mapping) );
-                            if (comp.iState == EDCSDownload)
-                                {
-					if ( dataType == EDCDownloadURI )//|| dataType == EDCDownloadStatus )
-                                    {
-                                    SessionL().DeploymentComponentDataL(iluid,
-                                            dataType, currentList);
-                                    status = EOk;
-                                    }
-                                else
-                                    if (dataType == EDCInstallOptions)
-                                        {
-                                        InstallOptionsDataL(iluid, dataType,
-                                                currentList);
-                                        status = EOk;
-                                        }
-                                    else
-                                        if (dataType == EDCConRef)
-                                            {
-                                            CBufBase *b = CBufFlat::NewL(4);
-                                            CleanupStack::PushL(b);
-                                            SessionL().DeploymentComponentDataL(
-                                                    iluid, dataType, *b);
-                                            TPckgBuf<TInt> iap;
-                                            iap.Copy(b->Ptr( 0) );
-                                            CleanupStack::PopAndDestroy(b);
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-
-                                            CArrayFix<TSmlDmMappingInfo>* mapArray = new CArrayFixFlat<TSmlDmMappingInfo>(4);
-                                            CleanupStack::PushL(mapArray);
-
-                                            Callback().GetMappingInfoListL( KNSmlDMMMSSlashIAPUri,*mapArray );
-
-                                            //TInt iap = KErrNotFound; 
-                                            TSmlDmMappingInfo mapInfo;
-                                            HBufC8 * uri = NULL;
-                                            TPtr8 tempURI(uri->Des());
-
-                                            for(TInt i = 0;i<mapArray->Count();i++)
-                                                {
-                                                if(iap()==DesToInt(mapArray->At(i).iURISegLUID))
-                                                    {
-                                                    tempURI=mapArray->At(i).iURISeg;
-                                                    }
-
-                                                }
-                                            mapArray->Reset();
-                                            CleanupStack::PopAndDestroy(); //mapArray
-                                            if ( uri != NULL )
-                                                {
-                                                CleanupStack::PushL( uri );
-                                                currentList.InsertL( 0, *uri );
-                                                CleanupStack::PopAndDestroy( uri );
-                                                }
-
-#else
-
-                                            CNSmlDMIAPMatcher
-                                                    * iapfinder =
-                                                            CNSmlDMIAPMatcher::NewLC( &Callback() );
-                                            HBufC8
-                                                    * uri =
-                                                            iapfinder->URIFromIAPIdL(iap() ) ;
-                                            CleanupStack::PopAndDestroy(iapfinder);
-                                            if (uri != NULL)
-                                                {
-                                                CleanupStack::PushL(uri) ;
-                                                currentList.InsertL( 0, *uri);
-                                                CleanupStack::PopAndDestroy(uri) ;
-                                                }
-
-#endif
-                                            status = EOk;
-                                            }
-                                        else
-                                            {
-                                            RDEBUG8_2( "CSCOMOAdapter::GetComponentDataL(): ASKED NOT SUPPORTED LEAF '%S'", &mapping );
-                                            }
-                                }
-                            else
-                                if (comp.iState == EDCSDelivered)
-                                    {
-                                    if(mapping == KAMStateValueNodeName)
-                                        {
-                                      currentList.InsertL( 0,KAMStateValueDelivered() );
-                                      status = EOk;
-                                        }
-                                    if (dataType == EDCData || dataType
-                                            == EDCMetaData || dataType
-                                            == EDCInstallOptions)
-                                        {
-                                        CBufBase *raw = CBufFlat::NewL( 128);
-                                        CleanupStack::PushL(raw);
-                                        SessionL().DeploymentComponentDataL(
-                                                iluid, dataType, *raw);
-                                        TPtrC8 source(raw->Ptr(0) );
-                                        if (source.Length() > 0)
-                                            {
-                                            if (dataType == EDCData)
-                                                {
-                                                currentList.InsertL( 0,
-                                                        source);
-                                                SessionL().DeploymentComponentDataL(
-                                                        iluid, EDCDataMime,
-                                                        currentMime);
-
-                                                }
-                                            else
-                                                if (dataType
-                                                        == EDCInstallOptions)
-                                                    {
-                                                    InstallOptionsDataL(
-                                                            iluid, dataType,
-                                                            currentList, raw);
-                                                    }
-                                                else
-                                                    {
-                                                    currentList.InsertL( 0,
-                                                            source);
-                                                    SessionL().DeploymentComponentDataL(
-                                                            iluid,
-                                                            EDCMetaDataMime,
-                                                            currentMime);
-                                                    }
-                                            }
-                                        else
-                                            {
-                                            // 0 data length...
-                                            }
-                                        status = EOk;
-                                        CleanupStack::PopAndDestroy(raw);
-                                        RDEBUG8_2( "CSCOMOAdapter::GetComponentDataL(): DeploymentComponentDataL called '%S'", &mapping );
-                                        }
-                                    }
-                                else
-                                    if (dataType == EDCStateValue)
-                                        {
-                                        if (comp.iState == EDCSActive)
-                                            {
-                                            currentList.InsertL( 0,
-                                                    KAMStateValueActive() );
-                                            }
-                                        else
-                                            {
-                                            currentList.InsertL( 0,
-                                                    KAMStateValueInactive() );
-                                            }
-                                        status = EOk;
-                                        }
-                                    else
-                                        {
-                                        RDEBUG8_2( "CSCOMOAdapter::GetComponentDataL(): ERROR ASKED NOT SUPPORTED LEAF '%S'", &mapping );
-                                        }
-                            }
-            }
-        else
-            {
-            RDEBUG8_3( "CSCOMOAdapter::GetComponentDataL(): WARNING Asked illegal state leaf '%S', %d", &mapping, comp.iState );
-            status = ENotFound;
-            }
-        }
-    else
-        {
-        RDEBUG_3( "CSCOMOAdapter::GetComponentDataL(): ERROR FAILED TO GET COMPOMENT OF ID %d: %d", iluid, err );
-        MAPERROR( err, status,_L8("Get Component %d") );
-        }
-    }
-
-// ------------------------------------------------------------------------------------------------
-//  CSCOMOAdapter::GetLeafLuidL(const TDesC8 &aURI, const TDesC8 & aParentMapping ) 
-// ------------------------------------------------------------------------------------------------
-TInt CSCOMOAdapter::GetLeafLuidL(const TDesC8 &aURI,
-        const TDesC8 & aParentMapping)
-    {
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY	//Done by Dipak
-    TPtrC8 uriPtrc = NSmlDmURI::RemoveDotSlash(aURI);
-    TInt numSeqs( NSmlDmURI::NumOfURISegs( uriPtrc ) );
-#else
-    TInt numSeqs(NSmlDmURI::NumOfURISegs(aURI) );
-#endif
-
-    TUint32 iluid( 0);
-    //TInt numSeqs( NSmlDmURI::NumOfURISegs( aURI ) );//Dipak
-
-    switch (numSeqs)
-        {
-        case 4: // must be a download leaf
-            {
-            iluid = GetLuidForUserIdL(aParentMapping, EDCSDownload) ;
-            break;
-            }
-        case 5: // download operation or delivered or deployed leaf
-            {
-            if (URISegsUpTo(aURI, 2, ETrue) == KDownloadURI)
-                {
-                RDEBUG8_2( "CSCOMOAdapter::GetLeafLuidL(): WARNING download operation leaf '%S'", &aURI );
-                //status = EOk; 
-                }
-            else
-                {
-                TPtrC8 start(URISegsUpTo(aURI, 3, ETrue) );
-                if (start == KDeliveredURI)
-                    {
-                    iluid = GetLuidForUserIdL(aParentMapping, EDCSDelivered) ;
-                    }
-                else
-                    if (start == KDeployedURI)
-                        {
-                        iluid = GetLuidForUserIdL(aParentMapping, EDCSActive) ;
-                        if ( (TInt32)iluid <= 0)
-                            {
-                            iluid = GetLuidForUserIdL(aParentMapping,
-                                    EDCSInactive) ;
-                            }
-                        }
-                    else
-                        {
-                        RDEBUG8_2( "CSCOMOAdapter::GetLeafLuidL(): WARNING strange uri '%S'", &aURI );
-                        }
-                }
-            break;
-            }
-        case 6: // delivered or deployed operation leaf
-            {
-            //iluid = GetLuidForUserIdL( parentMapping, EDCSDownload ) ;
-            //status = EOk;
-            RDEBUG8_2( "CSCOMOAdapter::GetLeafLuidL(): WARNING delivered or deployed operation leaf '%S'", &aURI );
-            break;
-            }
-        default: // illegal uri
-            {
-            RDEBUG8_2( "CSCOMOAdapter::GetLeafLuidL(): ERROR requested luid of illegal URI '%S'", &aURI );
-            break;
-            }
-        }
-    return iluid;
-    }
-
-// ------------------------------------------------------------------------------------------------
-//  CSCOMOAdapter::FetchLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, const TDesC8& aType, 
-//			CBufBase& aObject )
-// ------------------------------------------------------------------------------------------------
-void CSCOMOAdapter::FetchLeafObjectL(const TDesC8& aURI, const TDesC8& aLUID,
-        const TDesC8& aType, const TInt aResultsRef, TInt aStatusRef)
-    {
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY	//Done by Dipak
-    TPtrC8 uriPtrc = NSmlDmURI::RemoveDotSlash(aURI);
-#else
-    //Nothing
-#endif
-
-    RDEBUG8_4("CSCOMOAdapter::FetchLeafObjectL('%S', '%S', '%S'): begin", &aURI, &aLUID, &aType );
-    SetAdapterValue(KAMSCOMOAdapter);
-    CheckStateChangesL();
-    TError status(EError);
-
-    CBufBase *currentList = CBufFlat::NewL( 128);
-    CleanupStack::PushL(currentList);
-
-    CBufBase *currentMime = CBufFlat::NewL( 128);
-    CleanupStack::PushL(currentMime);
-
-    TPtrC8 mapping(NSmlDmURI::LastURISeg(aURI) );
-    TPtrC8 parent(NSmlDmURI::RemoveLastSeg(aURI) );
-    TPtrC8 parentMapping(NSmlDmURI::LastURISeg(parent) );
-
-    HBufC8 *luid= NULL;
-    if (aLUID != KNullDesC8)
-        {
-        luid = aLUID.AllocLC();
-        }
-    else
-        { // try if we find it from download path
-        TBuf8<256> down;
-        down = KDownloadURI;
-        down.Append(parentMapping);
-        luid = Callback().GetLuidAllocL(down);
-        CleanupStack::PushL(luid);
-        if ( *luid != KNullDesC8)
-            {
-            // make it to found next time
-            DirectSetMappingL(parent, *luid);
-            MoveAclL(down, parent);
-
-            // remove old
-            DirectSetMappingL(down, KNullDesC8);
-            }
-        }
-    if ( *luid != KNullDesC8)
-        {
-        TUint32 iluid(DesToIntL( *luid ));
-        RDEBUG8_2( "CSCOMOAdapter::FetchLeafObjectL(): Luid is : %d", iluid );
-        GetComponentDataL(parent, mapping, iluid, *currentList, *currentMime,
-                status);
-        }
-    else
-        {
-        TUint32 iluid(GetLeafLuidL(aURI, parentMapping) );
-        if (iluid > 0)
-            {
-            HBufC8 *l = IntToDes8LC(iluid);
-            DirectSetMappingL(parent, *l);
-            CleanupStack::PopAndDestroy(l);
-            GetComponentDataL(parent, mapping, iluid, *currentList,
-                    *currentMime, status);
-            }
-        else
-            {
-            RDEBUG8_2( "CSCOMOAdapter::FetchLeafObjectL(): WARNING Faild to get luid allocation for '%S'", &parent );
-            if (aLUID == KNullDesC8)
-                {
-#ifdef __AM_LASTERROR_NODE
-                if (aURI == KAMLastErrorURI)
-                    {
-                    const TDesC8& error= LastError();
-                    RDEBUG8_2( "CSCOMOAdapter::FetchLeafObjectL(): Returning last error '%S'", &error );
-                    currentList->InsertL(0, error);
-                    status = EOk;
-                    }
-                else
-                    {
-                    status = ENotFound;
-                    }
-#else
-                status = ENotFound;
-#endif
-                }
-            }
-        }
-
-    SetStatusL(aStatusRef, status);
-    if (status == EOk)
-        {
-        if (iInAtomic)
-            {
-            iBuffer.Append(TAMCommandBufferElement(aStatusRef, aURI) );
-            }
-        Callback().SetResultsL(aResultsRef, *currentList,
-                ( (currentMime->Size() > 0) ? currentMime->Ptr(0) : aType ));
-        }
-    CleanupStack::PopAndDestroy(luid);
-    CleanupStack::PopAndDestroy(currentMime); //currentMime
-    CleanupStack::PopAndDestroy(currentList); //currentList
-    RDEBUG("CSCOMOAdapter::FetchLeafObjectL: end" );
-    }
-
-// ------------------------------------------------------------------------------------------------
-//  CSCOMOAdapter::IdListL( TDeploymentComponentState aState, 
-//					CBufBase *aCurrentList, TBool aAppend /* = EFalse */)
-// ------------------------------------------------------------------------------------------------
-CSCOMOAdapter::TError CSCOMOAdapter::IdListL(
-        TDeploymentComponentState aState, CBufBase &aCurrentList,
-        TBool aAppend /* = EFalse */)
-    {
-	RDEBUG_2( "CSCOMOAdapter::IdListL:Begin aState is %d", aState);
-    CSCOMOAdapter::TError ret(CSCOMOAdapter::EError);
-    RElementIdArray array;
-    TPtrC8 uriStart;
-    TBuf8<256> uri;
-	
-    switch (aState)
-        {
-        case EDCSDelivered:
-            uriStart.Set(KDeliveredURI);
-            break;
-        case EDCSActive:
-        case EDCSInactive:
-            uriStart.Set(KDeployedURI) ;
-            break;
-        case EDCSDownload:
-            uriStart.Set(KDownloadURI) ;
-            break;
-        default:
-            break;
-
-        }
-    TInt err(SessionL().DeploymentComponentIdsL(array, aState) );
-    if (err == KErrNone)
-        {
-        TInt count(array.Count() );
-		RDEBUG_2( "CSCOMOAdapter::IdListL: count is %d", count);
-        if (count && aAppend && aCurrentList.Size() )
-            {
-				RDEBUG("CSCOMOAdapter::IdListL: Inserting list size" );
-            aCurrentList.InsertL(aCurrentList.Size(), KAMSeparator8);
-            }
-        for (TInt i( 0); i < count; i++)
-            {
-            TUint32 el = array[i];
-            TDCUserId dc;
-            SessionL().DeploymentComponentUserIdL(el, dc);
-			RDEBUG_2("CSCOMOAdapter::IdListL: Node name is %S", &dc);
-            if (uriStart == KNullDesC8() )
-                {
-					RDEBUG("CSCOMOAdapter::IdListL: uriStart == KNullDesC8()" );
-                TDeploymentComponent comp;
-                err = SessionL().DeploymentComponent(el, comp) ;
-                if (err == KErrNone)
-                    {
-                    switch (comp.iState)
-                        {
-                        case EDCSDelivered:
-                            uriStart.Set(KDeliveredURI);
-                            break;
-                        case EDCSActive:
-                        case EDCSInactive:
-                            uriStart.Set(KDeployedURI) ;
-                            break;
-                        case EDCSDownload:
-                            uriStart.Set(KDownloadURI) ;
-                            break;
-                        default:
-                            break;
-                        }
-                    }
-                }
-            if (uriStart != KNullDesC8() )
-                {
-                uri.Copy(uriStart);
-                uri.Append(dc);
-                HBufC8 *luid = DirectGetLuidAllocLC(uri); //Callback().GetLuidAllocL( uri );
-				RDEBUG_2( "CSCOMOAdapter::IdListL: luid is %S", luid);
-                if (KNullDesC8() == *luid)
-                    {
-                    RDEBUG8_3( "CSCOMOAdapter::IdListL(): WARNING updating lost luid of '%S' %d", &uri, el );
-                    HBufC8 *l = IntToDes8LC(el);
-                    if ( *luid == *l)
-                        {
-                        RDEBUG( "CSCOMOAdapter::IdListL(): WARNING CANCEL (not really updating, they're the same already" );
-                        }
-                    else
-                        {
-							RDEBUG("CSCOMOAdapter::IdListL: DirectSetMappingL" );
-                        DirectSetMappingL(uri, *l);
-                        }
-                    CleanupStack::PopAndDestroy(l);
-                    }
-                CleanupStack::PopAndDestroy(luid);
-
-                }
-            else
-                {
-                RDEBUG_2( "CSCOMOAdapter::IdListL(): WARNING failed to get component state of id %d, cannot check mappings ", el );
-                }
-            aCurrentList.InsertL(aCurrentList.Size(), dc);
-            if (i + 1 < count)
-                {
-					RDEBUG("CSCOMOAdapter::IdListL: Adding Separator" );
-                aCurrentList.InsertL(aCurrentList.Size(), KAMSeparator8);
-                }
-            }
-        ret = EOk;
-        }
-    else
-        {
-        RDEBUG_2( "CSCOMOAdapter::IdListL(): Error %d", err );
-        }
-    array.Reset();
-	RDEBUG("CSCOMOAdapter::IdListL: end" );
-    return ret;
-    }
-
-// ------------------------------------------------------------------------------------------------
-//  CSCOMOAdapter::ChildURIListL( const TDesC8& aURI, const TDesC8& aParentLUID, 
-//			const CArrayFix<TSmlDmMappingInfo>& /*aPreviousURISegmentList*/, const TInt aResultsRef, 
-//			TInt aStatusRef );
-// ------------------------------------------------------------------------------------------------
-void CSCOMOAdapter::ChildURIListL(const TDesC8& aURI,
-        const TDesC8& aParentLUID,
-        const CArrayFix<TSmlDmMappingInfo>& /*aPreviousURISegmentList*/,
-        const TInt aResultsRef, TInt aStatusRef)
-    {
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY	//Done by Dipak
-    TPtrC8 uriPtrc = NSmlDmURI::RemoveDotSlash(aURI);
-#else
-    //Nothing
-#endif
-
-    RDEBUG8_3 ( "CSCOMOAdapter::ChildURIListL(): begin ('%S', '%S')" , &aURI, &aParentLUID );
-    CheckStateChangesL();
-
-    TError ret(EError);
-
-    CBufBase *currentList = CBufFlat::NewL( 128);
-    CleanupStack::PushL(currentList);
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY	
-    TInt numSeqs( NSmlDmURI::NumOfURISegs( uriPtrc ) );
-#else
-    TInt numSeqs(NSmlDmURI::NumOfURISegs(aURI) );
-#endif
-
-    TPtrC8 mapping(NSmlDmURI::LastURISeg(aURI) );
-    if (numSeqs == 1)
-        {
-        currentList->InsertL( 0, KAMRootChilds);
-        ret = EOk;
-        }
-    else
-        if (numSeqs == 2)
-            {
-            if (mapping == KAMInventoryNodeName)
-                {
-                currentList->InsertL( 0, KAMInventoryChilds);
-                ret = EOk;
-                }
-            else
-                if (mapping == KAMDownloadNodeName)
-                    {
-                    RDEBUG8_2( "CSCOMOAdapter::ChildURIListL(): Level 2 NODE %S", &aURI );
-                    TDeploymentComponentState state(EDCSDownload);
-                    ret = IdListL(state, *currentList);
-                    }
-                else
-                    {
-                    RDEBUG8_2( "CSCOMOAdapter::ChildURIListL(): ILLEGAL LEVEL 2 NODE %S", &aURI );
-                    User::Leave(KErrArgument);
-                    }
-            }
-        else
-            if (numSeqs == 3)
-                {
-                if (mapping == KAMDeliveredNodeName)
-                    {
-                    RDEBUG8_2( "CSCOMOAdapter::ChildURIListL(): Level 3 NODE %S", &aURI );
-                    TDeploymentComponentState state(EDCSDelivered);
-                    ret = IdListL(state, *currentList);
-                    }
-                else
-                    if (mapping == KAMDeployedNodeName)
-                        {
-                        TDeploymentComponentState state(EDCSActive);
-                        ret = IdListL(state, *currentList);
-                        if (ret == EOk)
-                            {
-                            state = EDCSInactive;
-                            ret = IdListL(state, *currentList, ETrue);
-                            }
-                        }
-                    else
-                        {
-                        if (aParentLUID != KNullDesC8)
-                            {
-                            if (CheckStateL(aURI, aParentLUID) )
-                                {
-                                TPtrC8
-                                        parent(NSmlDmURI::RemoveLastSeg(aURI) );
-                                TPtrC8
-                                        parentMapping(NSmlDmURI::LastURISeg(parent) );
-                                if (parentMapping == KAMDownloadNodeName)
-                                    {
-                                    currentList->InsertL( 0,
-                                            KAMDownloadDynaChilds);
-                                    ret = EOk;
-                                    }
-                                else
-                                    {
-                                    RDEBUG8_2( "CSCOMOAdapter::ChildURIListL(): ILLEGAL LEVEL 3 NODE %S", &aURI );
-                                    User::Leave(KErrArgument);
-                                    }
-                                }
-                            else
-                                {
-                                RDEBUG8_2( "CSCOMOAdapter::ChildURIListL(): DC has changed state %S", &aURI );
-                                ret = ENotFound;
-                                }
-                            }
-                        else
-                            {
-                            RDEBUG8_2( "CSCOMOAdapter::ChildURIListL(): Level3 Node not found %S", &aURI );
-                            ret = ENotFound;
-                            }
-                        }
-                }
-            else
-                if (numSeqs == 4)
-                    {
-                    TPtrC8 parent(NSmlDmURI::RemoveLastSeg(aURI) );
-                    TPtrC8 parentMapping(NSmlDmURI::LastURISeg(parent) );
-                    if (aParentLUID == KNullDesC8)
-                        {
-                        RDEBUG8_2( "CSCOMOAdapter::ChildURIListL(): WARNING possibly a illegal level 4 node %S", &aURI );
-                        ret = ENotFound;
-                        }
-
-                    if (parentMapping == KAMDeliveredNodeName)
-                        {
-                        if (GetLuid2L(aParentLUID, mapping, EDCSDelivered,
-                                ret) > 0)
-                            {
-                            currentList->InsertL( 0,
-                                    KAMInventoryDeliveredDynaChilds);
-                            ret = EOk;
-                            }
-                        }
-                    else
-                        if (parentMapping == KAMDeployedNodeName)
-                            {
-                            if (GetLuid2L(aParentLUID, mapping, EDCSActive,
-                                    ret) > 0)
-                                {
-                                currentList->InsertL( 0,
-                                        KAMInventoryDynaChilds);
-                                ret = EOk;
-                                }
-                            else
-                                if (GetLuid2L(aParentLUID, mapping,
-                                        EDCSInactive, ret) > 0)
-                                    {
-                                    currentList->InsertL( 0,
-                                            KAMInventoryDynaChilds);
-                                    ret = EOk;
-                                    }
-                            }
-                        else
-                            if (mapping == KAMOperationsNodeName)
-                                {
-                                if (GetLuid2L(aParentLUID, parentMapping,
-                                        EDCSDownload, ret) > 0)
-                                    {
-                                    if (CheckStateL(aURI, aParentLUID) )
-                                        {
-                                        currentList->InsertL( 0,
-                                                KAMDownloadOperationChilds);
-                                        ret = EOk;
-                                        }
-                                    else
-                                        {
-                                        RDEBUG8_2( "CSCOMOAdapter::ChildURIListL(): Level3 operations DC changed state '%S'", &aURI );
-                                        ret = ENotFound;
-                                        }
-                                    }
-                                }
-                            else
-                                {
-                                RDEBUG8_2( "CSCOMOAdapter::ChildURIListL(): Level4 Node not found '%S'", &aURI );
-                                ret = ENotFound;
-                                }
-                    }
-                else
-                    if (numSeqs == 5)
-                        {
-                        if (aParentLUID == KNullDesC8)
-                            {
-                            RDEBUG8_2( "CSCOMOAdapter::ChildURIListL(): WARNING possibly a illegal level 5 node %S", &aURI );
-                            ret = ENotFound;
-                            }
-                        if (mapping == KAMOperationsNodeName)
-                            {
-                            TPtrC8 parent(NSmlDmURI::RemoveLastSeg(aURI) );
-                            TPtrC8
-                                    parentMapping(NSmlDmURI::LastURISeg(parent) );
-                            TPtrC8 gparent(NSmlDmURI::RemoveLastSeg(parent) );
-                            TPtrC8
-                                    gparentMapping(NSmlDmURI::LastURISeg(gparent) );
-                            if (gparentMapping == KAMDeliveredNodeName)
-                                {
-                                if (GetLuid2L(aParentLUID, parentMapping,
-                                        EDCSDelivered, ret) > 0)
-                                    {
-                                    currentList->InsertL( 0,
-                                            KAMDeliveredOperationChilds);
-                                    ret = EOk;
-                                    }
-                                }
-                            else
-                                if (gparentMapping == KAMDeployedNodeName)
-                                    {
-                                    if (GetLuid2L(aParentLUID, parentMapping,
-                                            EDCSActive, ret) > 0)
-                                        {
-                                        currentList->InsertL( 0,
-                                                KAMDeployedOperationChilds);
-                                        ret = EOk;
-                                        }
-                                    else
-                                        if (GetLuid2L(aParentLUID,
-                                                parentMapping, EDCSInactive,
-                                                ret) > 0)
-                                            {
-                                            currentList->InsertL( 0,
-                                                    KAMDeployedOperationChilds);
-                                            ret = EOk;
-                                            }
-                                    }
-                                else
-                                    {
-                                    RDEBUG8_2( "CSCOMOAdapter::ChildURIListL(): Level5 Node not found wrong parent '%S'", &aURI );
-                                    ret = ENotFound;
-                                    }
-                            }
-                        else
-                            {
-                            RDEBUG8_2( "CSCOMOAdapter::ChildURIListL(): Level5 Node not found '%S'", &aURI );
-                            ret = ENotFound;
-                            }
-                        }
-                    else
-                        {
-                        RDEBUG8_3( "CSCOMOAdapter::ChildURIListL(): ILLEGAL LEVEL %d NODE %S", numSeqs, &aURI );
-                        ret = EError;
-                        }
-
-    SetStatusL(aStatusRef, ret);
-
-    if (ret == EOk)
-        {
-        if (iInAtomic)
-            {
-            iBuffer.Append(TAMCommandBufferElement(aStatusRef, aURI) );
-            }
-        Callback().SetResultsL(aResultsRef, *currentList, KNullDesC8);
-        }
-    CleanupStack::PopAndDestroy(); //currentList
-    }
-
-// ------------------------------------------------------------------------------------------------
-//  CSCOMOAdapter::DeliverOrDownloadL( const TDesC8 &aUserId, const TDesC8 &aURI, TInt aCnt, 
-//		const TDesC8 &aParentMapping, MSmlDmAdapter::TError &aStatus )
-// ------------------------------------------------------------------------------------------------
-void CSCOMOAdapter::DeliverOrDownloadL(const TDesC8 &aUserId,
-        const TDesC8 &aURI, TInt aCnt, const TDesC8 &aParentMapping,
-        MSmlDmAdapter::TError &aStatus)
-    {
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY	//Done by Dipak
-    TPtrC8 uriPtrc = NSmlDmURI::RemoveDotSlash(aURI);
-#else
-    //Nothing
-#endif
-
-    switch (aCnt)
-        {
-        case 3:
-            {
-            if (aParentMapping == KAMDownloadNodeName)
-                {
-                TUint32 luid(SessionL().DownloadL(aUserId) );
-                Callback().SetMappingL(aURI, *IntToDes8LC(luid) );
-                CleanupStack::PopAndDestroy();
-                aStatus = EOk;
-                }
-            else
-                {
-                RDEBUG( "CSCOMOAdapter::DeliverOrDownloadL(): ERROR Illegal parent");
-                }
-            break;
-            }
-        case 4:
-            {
-            if (aParentMapping == KAMDeliveredNodeName)
-                {
-                TUint32 luid(SessionL().DeliverL(aUserId) );
-                Callback().SetMappingL(aURI, *IntToDes8LC(luid) );
-                CleanupStack::PopAndDestroy();
-                aStatus = EOk;
-                }
-            else
-                {
-                RDEBUG( "CSCOMOAdapter::DeliverOrDownloadL(): ERROR Illegal parent");
-                }
-            break;
-            }
-        default:
-            {
-            RDEBUG( "CSCOMOAdapter::DeliverOrDownloadL(): ERROR Illegal URI");
-            break;
-            }
-        }
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CSCOMOAdapter::AddNodeObjectL( const TDesC8& aURI, const TDesC& aParentLUID )
-// ------------------------------------------------------------------------------------------------
-void CSCOMOAdapter::AddNodeObjectL(const TDesC8& aURI,
-        const TDesC8& aParentLUID, TInt aStatusRef)
-    {
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY	//Done by Dipak
-    TPtrC8 uriPtrc = NSmlDmURI::RemoveDotSlash(aURI);
-    TPtrC8 mapping( NSmlDmURI::LastURISeg( uriPtrc ) );
-    TPtrC8 parent( NSmlDmURI::RemoveLastSeg( uriPtrc ) );
-    TPtrC8 parentMapping( NSmlDmURI::LastURISeg( parent ) );
-    TInt cnt( NSmlDmURI::NumOfURISegs( uriPtrc ) );
-#else
-    TPtrC8 mapping(NSmlDmURI::LastURISeg(aURI) );
-    TPtrC8 parent(NSmlDmURI::RemoveLastSeg(aURI) );
-    TPtrC8 parentMapping(NSmlDmURI::LastURISeg(parent) );
-    TInt cnt(NSmlDmURI::NumOfURISegs(aURI) );
-#endif
-
-    RDEBUG8_3( "CSCOMOAdapter::AddNodeObjectL(): begin '%S', '%S'", &aURI, &aParentLUID );
-    SetAdapterValue(KAMSCOMOAdapter);
-    CheckStateChangesL();
-    TError status(EError);
-    //	TPtrC8 mapping( NSmlDmURI::LastURISeg( aURI ) );//Dipak
-    //	TPtrC8 parent( NSmlDmURI::RemoveLastSeg( aURI ) );
-    //	TPtrC8 parentMapping( NSmlDmURI::LastURISeg( parent ) );
-    //	TInt cnt( NSmlDmURI::NumOfURISegs( aURI ) );
-	TUint32 iluid( GetLuidL( aParentLUID, mapping, (parentMapping == KAMDeliveredNodeName ? EDCSDelivered : ( parentMapping == KAMDownloadNodeName ? EDCSDownload : EDCSNone ) ) ) ) ;
-	if( !iluid)
-	    {
-            // This is added for avoiding duplicate node creation in Delivered/Download only.
-	    iluid = GetLuidL( aParentLUID, mapping, (parentMapping == KAMDeliveredNodeName ? EDCSDownload:EDCSDelivered ));
-	    }
-    if (iluid == 0)
-        {
-        // Not found, add it ... 
-        DeliverOrDownloadL(mapping, aURI, cnt, parentMapping, status);
-        }
-    else
-        {
-        RDEBUG_2( "CSCOMOAdapter::AddNodeObjectL(): WARNING May Already exists '%d'", iluid );
-        TDeploymentComponent comp;
-        TInt err(SessionL().DeploymentComponent(iluid, comp) );
-        if (err == KErrNone)
-            {
-            RDEBUG_2( "CSCOMOAdapter::AddNodeObjectL(): ERROR Already exists '%d'", iluid );
-            if (comp.iState == StateL(aURI) )
-                {
-                RDEBUG( "CSCOMOAdapter::AddNodeObjectL():    (state is ok) " );
-                }
-            else
-                {
-                RDEBUG( "CSCOMOAdapter::AddNodeObjectL():    (state is NOK) " );
-                }
-            status = EAlreadyExists;
-            }
-        else
-            {
-            if (err == KErrNotFound)
-                {
-                RDEBUG_2( "CSCOMOAdapter::AddNodeObjectL(): WARNING Already exists but not found '%d'", iluid );
-                DeliverOrDownloadL(mapping, aURI, cnt, parentMapping, status);
-                }
-            else
-                {
-
-                RDEBUG_2( "CSCOMOAdapter::AddNodeObjectL(): ERROR May exists, but failed to fetch get one? '%d'", err );
-                }
-            }
-        }
-    if (status == EOk)
-        {
-        if (iInAtomic)
-            {
-            iBuffer.Append(TAMCommandBufferElement(aStatusRef, aURI) );
-            }
-        }
-
-    //status = EAcceptedForProcessing;
-    //TInt error = 202;
-    SetStatusL(aStatusRef, status);
-    RDEBUG( "CSCOMOAdapter::AddNodeObject(): end" );
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CSCOMOAdapter::GetSizeL( const TDesC8& aURI, const TDesC& aParentLUID )
-// ------------------------------------------------------------------------------------------------
-TInt CSCOMOAdapter::GetSizeL(const TDeplCompAttrType aDataType,
-        const TInt aLuid, TError &aRet)
-    {
-    TInt size( 0);
-    if (aDataType == EDCStateValue)
-        {
-        TDeploymentComponent comp;
-        TInt err(SessionL().DeploymentComponent(aLuid, comp) );
-        if (err == KErrNone)
-            {
-            if (comp.iState == EDCSActive)
-                {
-                size = KAMStateValueActive().Length();
-                }
-            else if (comp.iState == EDCSDelivered)
-                {
-                size = KAMStateValueDelivered().Length();
-                }
-            else
-                {
-                size = KAMStateValueInactive().Length() ;
-                }
-            aRet = EOk;
-            }
-        }
-    else
-        {
-        size = SessionL().DeploymentComponentDataSizeL(aLuid, aDataType);
-        aRet = EOk;
-        }
-    return size;
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CSCOMOAdapter::FetchLeafObjectSizeL( const TDesC8& aURI, const TDesC& aParentLUID )
-// ------------------------------------------------------------------------------------------------
-void CSCOMOAdapter::FetchLeafObjectSizeL(const TDesC8& aURI,
-        const TDesC8& aLUID, const TDesC8& aType, TInt aResultsRef,
-        TInt aStatusRef)
-    {
-
-    RDEBUG8_4("CSCOMOAdapter::FetchLeafObjectSizeL('%S', '%S', '%S'): begin", &aURI, &aLUID, &aType );
-    CheckStateChangesL();
-    TError status(EError);
-    CBufBase *currentList = CBufFlat::NewL( 128);
-    CleanupStack::PushL(currentList);
-
-    TPtrC8 mapping(NSmlDmURI::LastURISeg(aURI) );
-    TPtrC8 parent(NSmlDmURI::RemoveLastSeg(aURI) );
-    TPtrC8 parentMapping(NSmlDmURI::LastURISeg(parent) );
-    TInt size( 0);
-    HBufC8 *luid= NULL;
-    if (aLUID != KNullDesC8)
-        {
-        luid = aLUID.AllocLC();
-        }
-    else
-        { // try if we find it from download path
-        TBuf8<256> down;
-        down = KDownloadURI;
-        down.Append(parentMapping);
-        luid = Callback().GetLuidAllocL(down);
-        CleanupStack::PushL(luid);
-        if ( *luid != KNullDesC8)
-            {
-            // make it to found next time
-            DirectSetMappingL(parent, *luid);
-            MoveAclL(down, parent);
-
-            // remove old
-            DirectSetMappingL(down, KNullDesC8);
-            }
-        }
-    TDeplCompAttrType dataType(UpdateFlagFromMapping(mapping) );
-    if ( *luid != KNullDesC8)
-        {
-        TUint32 iluid(DesToIntL( *luid ));
-        RDEBUG_2( "CSCOMOAdapter::FetchLeafObjectSizeL(): Luid is : %d", iluid );
-        size = GetSizeL(dataType, iluid, status);
-        }
-    else
-        {
-        TUint32 iluid(GetLeafLuidL(aURI, parentMapping) );
-        if (iluid > 0)
-            {
-            HBufC8 *l = IntToDes8LC(iluid);
-            DirectSetMappingL(parent, *l);
-            CleanupStack::PopAndDestroy(l);
-            size = GetSizeL(dataType, iluid, status);
-            }
-        else
-            {
-            RDEBUG8_2( "CSCOMOAdapter::FetchLeafObjectSizeL(): WARNING Faild to get luid allocation for '%S'", &parent );
-            if (aLUID == KNullDesC8)
-                {
-                status = ENotFound;
-                }
-            }
-        }
-    SetStatusL(aStatusRef, status);
-    if (status == EOk && size > 0)
-        {
-        HBufC8 *hsize = IntToDes8LC(size);
-        currentList->InsertL( 0, *hsize);
-        if (iInAtomic)
-            {
-            iBuffer.Append(TAMCommandBufferElement(aStatusRef, aURI) );
-            }
-        Callback().SetResultsL(aResultsRef, *currentList, aType);
-        CleanupStack::PopAndDestroy(hsize);
-        }
-    CleanupStack::PopAndDestroy(luid);
-    CleanupStack::PopAndDestroy(currentList); //currentList	
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CSCOMOAdapter::ExecuteCommandL( const TDesC8& aURI, const TDesC& aParentLUID )
-// ------------------------------------------------------------------------------------------------
-void CSCOMOAdapter::ExecuteCommandL(const TDesC8& /*aURI*/,
-        const TDesC8& /*aLUID*/, RWriteStream*& /*aStream*/,
-        const TDesC8& /*aType*/, TInt /*aStatusRef*/)
-    {
-    RDEBUG("CSCOMOAdapter::ExecuteCommandL(stream): begin (NOT SUPPORTED)");
-    User::Leave(KErrNotSupported);
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CSCOMOAdapter::CopyCommandL( const TDesC8& aURI, const TDesC& aParentLUID )
-// ------------------------------------------------------------------------------------------------
-void CSCOMOAdapter::CopyCommandL(const TDesC8& /*aTargetURI*/,
-        const TDesC8& /*aTargetLUID*/, const TDesC8& /*aSourceURI*/,
-        const TDesC8& /*aSourceLUID*/, const TDesC8& /*aType*/,
-        TInt aStatusRef)
-    {
-    RDEBUG("CSCOMOAdapter::CopyCommandL(): begin (NOT SUPPORTED)");
-    SetStatusL(aStatusRef, EError);
-
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CSCOMOAdapter::StartAtomicL(  )
-// ------------------------------------------------------------------------------------------------
-void CSCOMOAdapter::StartAtomicL()
-    {
-    RDEBUG("CSCOMOAdapter::StartAtomicL(): begin (NOT properly SUPPORTED)");
-    iInAtomic = ETrue;
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CSCOMOAdapter::CommitAtomicL(  )
-// ------------------------------------------------------------------------------------------------
-void CSCOMOAdapter::CommitAtomicL()
-    {
-    RDEBUG("CSCOMOAdapter::CommitAtomicL(): begin (NOT SUPPORTED)");
-    iInAtomic = EFalse; // the initial statuses are already set
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CSCOMOAdapter::RollbackAtomicL(  )
-// ------------------------------------------------------------------------------------------------
-void CSCOMOAdapter::RollbackAtomicL()
-    {
-    RDEBUG("CSCOMOAdapter::RollbackAtomicL(): begin (NOT properly SUPPORTED)");
-    TInt count(iBuffer.Count() );
-    for (TInt i( 0); i < count; i++)
-        {
-        TAMCommandBufferElement &pm(iBuffer[i]);
-        SetStatusL(pm.iStatusRef, ERollbackFailed);
-        }
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CSCOMOAdapter::StreamingSupport( )
-// ------------------------------------------------------------------------------------------------
-TBool CSCOMOAdapter::StreamingSupport(TInt& aItemSize)
-    {
-    RDEBUG("CSCOMOAdapter::StreamingSupport(): begin");
-    //aItemSize = 1024;
-    
-    // After Generic alert is sent delete that entry from database and notify
-    // AM server to delete the appropriate entry in its database.
-    
-    if(aItemSize == KNSmlDMResetGenAlerts)
-    {
-      TSmlProfileId profId = 0;
-      HBufC8* serverId = NULL;
-      TRAP_IGNORE(GetServerInfoL( profId, serverId ));
-      
-    
-    TUint32 internalid;
-    RPointerArray<CAMDbItem> genericalerts;
-    
-
-    // Get generic alert entry from Database for particular server ID.
-    TRAPD(err, iAMdb->GetEntryForServerIDL(genericalerts, *serverId));
-
-    if (genericalerts.Count()!= KErrNone && err == KErrNone)
-        {
-          	for(TInt i=0; i<genericalerts.Count(); i++)
-    		{
-			internalid = genericalerts[i]->iLUID;
-			// Delete the all the generic alert details from SCOMO adapeter DB
-			// Also delete the appropriate entry from AM Server DB as well.
-            TRAP_IGNORE(iAMdb->DeleteFromDatabaseL(internalid));
-            TRAP_IGNORE(SessionL().GenericAlertSentL(internalid));
-    		}
-        }
-    
-
-    genericalerts.ResetAndDestroy();
-    delete serverId;
-
-    _LIT(KNull,"");
-    // No monitoring required after generic alert is sent
-    TInt err_rep = KErrNone;
-    CRepository *repository1 = NULL;
-
-    TRAP(err_rep, repository1 =CRepository::NewL ( KCRUidDeviceManagementInternalKeys ));
-  
-    if(err_rep == KErrNone)  
-    {
-    repository1 ->Set(KDevManServerIdKey ,KNull);
-    repository1 ->Set(KDevManIapIdKey, KErrNone);
-    repository1 ->Set(KDevManEnableDMNetworkMon, KErrNone);
-    }
-     
-    if(repository1)
-     delete repository1;
-      
-    }
-    aItemSize = 1024;
-    RDEBUG("CSCOMOAdapter::StreamingSupport(): end");
-    return ETrue;
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CSCOMOAdapter::StreamCommittedL( )
-// ------------------------------------------------------------------------------------------------
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-void CSCOMOAdapter::StreamCommittedL( RWriteStream& /*aStream*/)
-#else
-void CSCOMOAdapter::StreamCommittedL()
-#endif
-    {
-    RDEBUG("CSCOMOAdapter::StreamCommittedL(): begin");
-
-    if (iStreamOpen)
-        {
-        iStream.CommitL();
-        }
-
-    MSmlDmAdapter::TError status = EOk;
-
-    TRAPD( err, _UpdateLeafObjectL( *iStreamedURI, *iStreamedLuid, KNullDesC8(), *iStreamedType, iStatusRef, status ) )
-    ;
-
-    if (err != KErrNone)
-        {
-        RDEBUG_2("CSCOMOAdapter::StreamCommittedL(): _UpdateLeafObjectL returned error (%d)", err);
-        }
-
-    iIsStreamedContent = EFalse;
-    iStreamOpen = EFalse;
-
-    Callback().SetStatusL(iStatusRef, status);
-
-    RDEBUG("CSCOMOAdapter::StreamCommittedL(): end");
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CSCOMOAdapter::CloseStreaming( )
-// ------------------------------------------------------------------------------------------------
-void CSCOMOAdapter::CloseStreaming()
-    {
-    if (iStreamOpen)
-        {
-        RDEBUG("CSCOMOAdapter::CloseStreaming(): closing");
-        iStreamFile.Close(); // !!! Closing this will also close the iStreamRFs because it is adopted from server
-        iStreamOpen = EFalse;
-        }
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CSCOMOAdapter::CompleteOutstandingCmdsL()
-// ------------------------------------------------------------------------------------------------
-void CSCOMOAdapter::CompleteOutstandingCmdsL()
-    {
-    RDEBUG("CSCOMOAdapter::CompleteOutstandingCmdsL(): begin");
-    /*	iManagement.Close();
-     iSessionOpened = EFalse ;*/
-    iBuffer.Reset();
-    RDEBUG("CSCOMOAdapter::CompleteOutstandingCmdsL(): Management session closed");
-    }
-
-// ------------------
-//
-// ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-const TImplementationProxy ImplementationTable[] =
-    {
-    //
-            IMPLEMENTATION_PROXY_ENTRY( KAMAdapterImplUid, CSCOMOAdapter::NewL )
-    };
-
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy( TInt& aTableCount )
-    {
-    aTableCount = sizeof( ImplementationTable ) / sizeof( TImplementationProxy );
-    return ImplementationTable;
-    }
-
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-TInt CSCOMOAdapter::DesToIntL(const TDesC8& aLuid)
-    {
-    TLex8 lex(aLuid);
-    TInt value = 0;
-    User::LeaveIfError(lex.Val(value) );
-    return value;
-    }
-
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-HBufC8* CSCOMOAdapter::IntToDes8LC(const TInt aLuid)
-    {
-    HBufC8* buf = HBufC8::NewLC( 10); //10 = max length of 32bit integer
-    TPtr8 ptrBuf = buf->Des();
-    ptrBuf.Num(aLuid);
-    return buf;
-    }
-
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-void CSCOMOAdapter::ConstructL()
-    {
-    iAMdb = CSCOMOAdapterDb::NewL();
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-    iDbSession.ConnectL();
-#else
-    User::LeaveIfError(iDbSession.Connect());
-#endif
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CSCOMOAdapter::SetStatusL( TInt aStatusRef, MSmlDmAdapter::TError aErrorCode ) 
-// ------------------------------------------------------------------------------------------------
-void CSCOMOAdapter::SetStatusL(TInt aStatusRef,
-        MSmlDmAdapter::TError aErrorCode)
-    {
-    RDEBUG_3("CSCOMOAdapter::SetStatusL( %d, %d )", aStatusRef, aErrorCode );
-    Callback().SetStatusL(aStatusRef, aErrorCode);
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CSCOMOAdapter::SetResultsL( TInt aResultsRef, CBufBase& aObject, const TDesC8& aType )
-// ------------------------------------------------------------------------------------------------
-void CSCOMOAdapter::SetResultsL(TInt aResultsRef, CBufBase& aObject,
-        const TDesC8& aType)
-    {
-    Callback().SetResultsL(aResultsRef, aObject, aType);
-
-    }
-
-// -------------------------------------------------------------------------------------
-// CSCOMOAdapter::FillNodeInfoL()
-// Fills the node info in ddf structure
-// -------------------------------------------------------------------------------------
-void CSCOMOAdapter::FillNodeInfoL(MSmlDmDDFObject& aNode,
-        TSmlDmAccessTypes aAccTypes, MSmlDmDDFObject::TOccurence aOccurrence,
-        MSmlDmDDFObject::TScope aScope, MSmlDmDDFObject::TDFFormat aFormat,
-        const TDesC8& aDescription)
-    {
-    FillNodeInfoNoDefaultMimeL(aNode, aAccTypes, aOccurrence, aScope,
-            aFormat, aDescription);
-    if (aFormat!=MSmlDmDDFObject::ENode)
-        {
-        aNode.AddDFTypeMimeTypeL(KAMTextPlain);
-        }
-
-    }
-
-// -------------------------------------------------------------------------------------
-// CSCOMOAdapter::FillNodeInfoNoDefaultMimeL()
-// Fills the node info in ddf structure, without default mime type
-// -------------------------------------------------------------------------------------
-void CSCOMOAdapter::FillNodeInfoNoDefaultMimeL(MSmlDmDDFObject& aNode,
-        TSmlDmAccessTypes aAccTypes, MSmlDmDDFObject::TOccurence aOccurrence,
-        MSmlDmDDFObject::TScope aScope, MSmlDmDDFObject::TDFFormat aFormat,
-        const TDesC8& aDescription)
-    {
-    aNode.SetAccessTypesL(aAccTypes);
-    aNode.SetOccurenceL(aOccurrence);
-    aNode.SetScopeL(aScope);
-    aNode.SetDFFormatL(aFormat);
-
-    aNode.SetDescriptionL(aDescription);
-    }
-
-// -------------------------------------------------------------------------------------
-// CSCOMOAdapter::CheckStateChangesInternalL()
-// Updates the changed DC states to DM client mappings and ACLs
-// -------------------------------------------------------------------------------------
-void CSCOMOAdapter::CheckStateChangesInternalL()
-    {
-
-#ifdef __AM_CHECKSTATE_CHANGES
-    RDEBUG( "CSCOMOAdapter::CheckStateChangesLInternal(): begin" );
-    if ( !iUpdated)
-        {
-        RDEBUG( "CSCOMOAdapter::CheckStateChangesLInternal(): !iUpdated" );
-        RElementIdArray arr;
-        CleanupClosePushL(arr);
-		SessionL().CheckStatusNodesL();
-		RElementIdArray array;
-		TInt err( SessionL().DeploymentComponentIdsL( array, EDCSActive ) ); //to sync with SIS/Java registry
-		err = SessionL().DeploymentComponentIdsL( array, EDCSInactive ); //to sync with SIS/Java registry
-		CleanupClosePushL(array);
-        err = SessionL().StateChangingDCIdsL(arr);
-        if (err == KErrNone)
-            {
-            TInt c(arr.Count() );
-            for (TInt i( 0); i < c; i++)
-                {
-                TDeploymentComponent comp;
-                err = iManagement.DeploymentComponent(arr[i], comp);
-                if (err == KErrNone)
-                    {
-                    TDCUserId dc;
-                    SessionL().DeploymentComponentUserIdL(arr[i], dc);
-                    const TInt KNSmlDmMaxUriLength = 256;
-                    HBufC8 *uri = HBufC8::NewLC(KNSmlDmMaxUriLength);
-                    TPtr8 puri(uri->Des() );
-#ifdef __TARM_SYMBIAN_CONVERGENCY					
-                    RDmTreeNode uriNode;
-                    CleanupClosePushL(uriNode);
-
-                    RBuf8 acl;
-                    acl.CreateL(128);
-                    CleanupClosePushL(acl);
-
-                    HBufC8 *newUri = HBufC8::NewLC( KNSmlDmMaxUriLength );
-                    TPtr8 pnewUri( newUri->Des() );
-
-                    RDmTreeNode newUriNode;
-                    CleanupClosePushL(newUriNode);
-#else
-                    CBufBase* acl = CBufFlat::NewL( 128);
-                    CleanupStack::PushL(acl);
-
-                    HBufC8 *newUri = HBufC8::NewLC(KNSmlDmMaxUriLength);
-                    TPtr8 pnewUri(newUri->Des() );
-
-#endif
-
-                    switch (comp.iOldState)
-                        {
-                        case EDCSDelivered:
-                            {
-                            RDEBUG( "CSCOMOAdapter::CheckStateChangesLInternal(): Old State = EDCSDelivered" );
-                            puri.Copy(KDeliveredURI() );
-                            puri.Append(dc);
-
-                            HBufC8 *luid = DirectGetLuidAllocLC(puri);
-
-                            if ( *luid == KNullDesC8)
-                                { // probably moved already
-                                iManagement.StateChangeComplete(arr[i]);
-                                }
-                            else
-                                {
-                                // "Nullify" the old mapping 
-								//DirectSetMappingL( puri, KNullDesC8 );
-								DirectRemoveMappingL(puri);
-#ifdef __TARM_SYMBIAN_CONVERGENCY								
-                                iDbSession.OpenNodeL(puri, uriNode, RDmTree::EReadOnly);
-                                uriNode.DmPropertyL( DevMan::EACL, acl );
-#else
-                                err = iDbSession.GetAclL(puri, *acl, EFalse); // no need for inherited
-#endif										
-                                // Determine new uri 
-                                switch (comp.iState)
-                                    {
-                                    case EDCSActive:
-                                    case EDCSInactive: // both have same node
-                                        {
-                                        pnewUri.Copy(KDeployedURI() );
-                                        pnewUri.Append(dc);
-                                        DirectSetMappingL(pnewUri, *luid);
-                                        if (err == KErrNone)
-                                            {
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-                                            iDbSession.OpenNodeL(pnewUri, newUriNode, RDmTree::EReadOnly);
-                                            uriNode.RemoveDmPropertyL( DevMan::EACL );
-                                            newUriNode.SetDmPropertyL( DevMan::EACL, acl );
-#else
-                                            err = iDbSession.DeleteAclL(puri);
-
-                                            err = iDbSession.UpdateAclL(
-                                                    pnewUri, acl->Ptr( 0) );
-#endif
-                                            }
-                                        else
-                                            {
-                                            RDEBUG_2("CSCOMOAdapter::CheckStateChangesL: ERROR Failed to get acl from %d ", err );
-                                            }
-                                        iManagement.StateChangeComplete(arr[i]);
-                                        break;
-                                        }
-                                    default:
-                                        {
-
-                                        RDEBUG_2("CSCOMOAdapter::CheckStateChangesL: WARNING Illegal state change from delivered to %d ", comp.iState );
-
-                                        break;
-                                        }
-                                    }
-                                }
-                            CleanupStack::PopAndDestroy(luid);
-                            break;
-                            }
-                        case EDCSDownload:
-                            {
-                            RDEBUG( "CSCOMOAdapter::CheckStateChangesLInternal(): Old State = EDCSDownload" );
-                            puri.Copy(KDownloadURI() );
-                            //check DC contains SCOMODefault.
-                            TBuf8<256> staticnode;
-                            TInt staticnodeenabled = 0;
-                            CRepository* cenrep = CRepository::NewLC( KCRUidPrivateApplicationManagementKeys );
-                            cenrep->Get( KAMDownloadPredefinedNode, staticnode ); 
-                            cenrep->Get( KAMStaticNodeEnabled, staticnodeenabled );
-                            CleanupStack::PopAndDestroy(); //cenrep
-                            if (dc.Find(staticnode) != KErrNotFound && staticnodeenabled)
-                                {
-                                puri.Append(staticnode);
-                                }
-                            else
-                                {
-                                puri.Append(dc);
-                                }
-
-
-                            HBufC8 *luid = DirectGetLuidAllocLC(puri); //Callback().GetLuidAllocL( puri );
-                            //CleanupStack::PushL( luid );
-                            if ( *luid == KNullDesC8)
-                                { // probably moved already
-                                CleanupStack::PopAndDestroy(luid);
-                                puri.Copy(KDeliveredURI() );
-                                puri.Append(dc);
-                                luid = DirectGetLuidAllocLC(puri); //Callback().GetLuidAllocL( puri );
-                                if ( *luid == KNullDesC8)
-                                    { // probably moved already
-
-                                    iManagement.StateChangeComplete(arr[i]);
-
-                                    }
-                                }
-                            else
-                                {
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-                                iDbSession.OpenNodeL(puri, uriNode, RDmTree::EReadOnly);
-                                uriNode.DmPropertyL( DevMan::EACL, acl );
-#else
-                                err = iDbSession.GetAclL(puri, *acl, EFalse); // no need for inherited
-#endif							
-                                // "Nullify" the old mapping 
-								//DirectSetMappingL( puri, KNullDesC8 );
-								DirectRemoveMappingL(puri);
-                                switch (comp.iState)
-                                    {
-                                    case EDCSActive:
-                                    case EDCSInactive: // both have same node
-                                        {
-                                        pnewUri.Copy(KDeployedURI() );
-                                        pnewUri.Append(dc);
-                                        DirectSetMappingL(pnewUri, *luid);
-                                        if (err == KErrNone)
-                                            {
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-                                            iDbSession.OpenNodeL(pnewUri, newUriNode, RDmTree::EReadOnly);
-                                            uriNode.RemoveDmPropertyL( DevMan::EACL );
-                                            newUriNode.SetDmPropertyL( DevMan::EACL, acl );
-#else											
-                                            err = iDbSession.DeleteAclL(puri);
-                                            err = iDbSession.UpdateAclL(
-                                                    pnewUri, acl->Ptr( 0) );
-#endif
-                                            }
-                                        else
-                                            {
-                                            RDEBUG_2("CSCOMOAdapter::CheckStateChangesL: ERROR Failed to get acl from %d ", err );
-                                            }
-                                        iManagement.StateChangeComplete(arr[i]);
-                                        break;
-                                        }
-                                    case EDCSDelivered:
-                                        {
-                                        RDEBUG( "CSCOMOAdapter::CheckStateChangesLInternal(): Current State = EDCSDelivered" );
-                                        pnewUri.Copy(KDeliveredURI() );
-                                        pnewUri.Append(dc);
-                                        DirectSetMappingL(pnewUri, *luid);
-                                        if (err == KErrNone)
-                                            {
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-                                            iDbSession.OpenNodeL(pnewUri, newUriNode, RDmTree::EReadOnly);
-                                            uriNode.RemoveDmPropertyL( DevMan::EACL );
-                                            newUriNode.SetDmPropertyL( DevMan::EACL, acl );
-#else
-
-                                            err = iDbSession.DeleteAclL(puri);
-                                            err = iDbSession.UpdateAclL(
-                                                    pnewUri, acl->Ptr( 0) );
-#endif
-                                            }
-                                        else
-                                            {
-                                            RDEBUG_2("CSCOMOAdapter::CheckStateChangesL: ERROR Failed to get acl from %d ", err );
-                                            }
-                                        iManagement.StateChangeComplete(arr[i]);
-                                        break;
-                                        }
-                                    default:
-                                        {
-
-                                        RDEBUG_2("CSCOMOAdapter::CheckStateChangesL: WARNING Illegal state change from delivered to %d ", comp.iState );
-                                        break;
-                                        }
-                                    }
-
-                                }
-                            CleanupStack::PopAndDestroy(luid);
-                            break;
-                            }
-                        case EDCSActive:
-                        case EDCSInactive: // these both are in same node
-                            {
-
-                            RDEBUG_3("CSCOMOAdapter::CheckStateChangesL: No need to move anything in change from %d to %d ", comp.iOldState, comp.iState );
-                            iManagement.StateChangeComplete(arr[i]);
-                            break;
-                            }
-                        }
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-                    CleanupStack::PopAndDestroy( &newUriNode );
-                    CleanupStack::PopAndDestroy( newUri );
-                    CleanupStack::PopAndDestroy( &uriNode );
-                    CleanupStack::PopAndDestroy( &acl );
-                    CleanupStack::PopAndDestroy( uri );
-#else
-                    CleanupStack::PopAndDestroy(newUri);
-                    CleanupStack::PopAndDestroy(acl);
-                    CleanupStack::PopAndDestroy(uri);
-#endif
-                    }
-                else
-                    {
-                    RDEBUG_2("CSCOMOAdapter::CheckStateChangesL: ERROR Failed to get component: %d ", err );
-                    }
-                }
-            iUpdated = ETrue;
-            }
-        else
-            {
-            RDEBUG_2("CSCOMOAdapter::CheckStateChangesL: ERROR Failed to get state change dcs: %d ", err );
-            }
-        CleanupStack::PopAndDestroy( &array);
-        CleanupStack::PopAndDestroy( &arr);
-        }
-    else
-        {
-        RDEBUG("CSCOMOAdapter::CheckStateChangesL: Already updated! ");
-        }
-    RDEBUG( "CSCOMOAdapter::CheckStateChangesL(): end" );
-#else
-    DBG_ARGS8( "CSCOMOAdapter::CheckStateChangesL(): disabled" );
-#endif
-    }
-
-// -------------------------------------------------------------------------------------
-// CSCOMOAdapter::CheckStateChangesL()
-// Updates acl and mapping trees to match state changes
-// -------------------------------------------------------------------------------------
-void CSCOMOAdapter::CheckStateChangesL()
-    {
-    iCertRequired = EFalse;
-    RDEBUG( "CSCOMOAdapter::CheckStateChangesL(): iCertRequired = EFalse" );
-    TRAPD( err, CheckStateChangesInternalL() )
-    ;
-    if (err != KErrNone)
-        {
-        RDEBUG_2("CSCOMOAdapter::CheckStateChangesL(): warning failed to check state changes %d", err );
-        }
-    iCertRequired = ETrue;
-    RDEBUG( "CSCOMOAdapter::CheckStateChangesL(): iCertRequired = ETrue" );
-    if ( !iTrustAdded)
-        {
-        RDEBUG( "CSCOMOAdapter::CheckStateChangesL(): Adding Trust Closing Session" );
-        iManagement.Close();
-        iSessionOpened = EFalse;
-        RApplicationManagement &session = SessionL();
-        RDEBUG( "CSCOMOAdapter::CheckStateChangesL(): Adding Trust new session started" );
-        }
-    }
-
-// -------------------------------------------------------------------------------------
-// CSCOMOAdapter::URISegsUpTo(const TDesC8& aURI, TInt aUpTo)
-// -------------------------------------------------------------------------------------
-TPtrC8 CSCOMOAdapter::URISegsUpTo(const TDesC8& aURI, TInt aUpTo,
-        TBool aInclKeno/*=EFalse*/)
-    {
-
-    TPtrC8 ret;
-    TInt numOfURISegs( 0);
-    for (TInt i( 0); i < aURI.Length() && ret.Ptr() == NULL; i++)
-        {
-        if (aURI[i] == KNSmlDMUriSeparator)
-            {
-            numOfURISegs++;
-            if (aUpTo == numOfURISegs)
-                {
-                if (aInclKeno && aURI.Length() > i+1)
-                    {
-                    ret.Set(aURI.Left(i + 1) );
-                    }
-                else
-                    {
-                    ret.Set(aURI.Left(i) );
-                    }
-                }
-            }
-        }
-    return ret;
-    }
-
-// -------------------------------------------------------------------------------------
-// CSCOMOAdapter::DirectGetLuidAllocLC( const TDesC8 &aURI )
-// -------------------------------------------------------------------------------------	
-HBufC8 *CSCOMOAdapter::DirectGetLuidAllocLC(const TDesC8 &aURI)
-    {
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-    HBufC8 *ret = Callback().GetLuidAllocL( aURI );
-#else
-    HBufC8* ret = iDbSession.GetLuidAllocL(KAMAdapterImplUid, aURI);
-#endif
-
-    CleanupStack::PushL(ret);
-    return ret;
-    }
-
-// -------------------------------------------------------------------------------------
-// CSCOMOAdapter::DirectSetMappingL( const TDesC8 &aURI, const TDesC8 &aLUID )
-// -------------------------------------------------------------------------------------		
-TInt CSCOMOAdapter::DirectSetMappingL(const TDesC8 &aURI, const TDesC8 &aLUID)
-    {
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-    TRAPD( err, Callback().SetMappingL( aURI, aLUID ) );
-#else
-    TInt err(iDbSession.AddMappingInfoL(KAMAdapterImplUid, aURI, aLUID) );
-#endif
-    return err;
-    }
-
-// -------------------------------------------------------------------------------------
-// CSCOMOAdapter::MoveAclL( const TDesC8 &aFrom, const TDesC8 &aTo )
-// -------------------------------------------------------------------------------------		
-void CSCOMOAdapter::MoveAclL(const TDesC8 &aFrom, const TDesC8 &aTo)
-    {
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-    RDmTreeNode from;
-    CleanupClosePushL(from);
-
-    RDmTreeNode to;
-    CleanupClosePushL(to);
-
-    RBuf8 acl;
-    acl.CreateL(128);
-    CleanupClosePushL(acl);
-
-    iDbSession.OpenNodeL(aFrom, from, RDmTree::EReadOnly);
-    TRAPD( err, from.DmPropertyL( DevMan::EACL, acl ) );
-    if ( err == KErrNone )
-        {
-        iDbSession.OpenNodeL(aTo, to, RDmTree::EReadOnly);
-        from.RemoveDmPropertyL( DevMan::EACL );
-        to.SetDmPropertyL( DevMan::EACL, acl );
-        }
-    CleanupStack::PopAndDestroy( 3, &from );
-#else
-    CBufBase *acl = CBufFlat::NewL( 128);
-    CleanupStack::PushL(acl);
-    TInt err(iDbSession.GetAclL(aFrom, *acl, EFalse) ); // no need for inherited
-    if (err == KErrNone)
-        {
-        err = iDbSession.DeleteAclL(aFrom);
-        err = iDbSession.UpdateAclL(aTo, acl->Ptr( 0) );
-        }
-    CleanupStack::PopAndDestroy(acl);
-#endif
-    }
-
-// -------------------------------------------------------------------------------------
-// CSCOMOAdapter::SetMappingL( const TDesC8 &aOriginalURI, 
-//	const TDeploymentComponentState aTargetState, const TDesC8 &aLUID )
-// -------------------------------------------------------------------------------------		
-void CSCOMOAdapter::SetMappingL(const TDesC8 &aOriginalURI,
-        const TDeploymentComponentState aTargetState, const TDesC8 &aLUID)
-    {
-
-    HBufC8 * targeturi= NULL;
-    SetMappingLC(aOriginalURI, aTargetState, aLUID, targeturi);
-    CleanupStack::PopAndDestroy(targeturi);
-    }
-
-// -------------------------------------------------------------------------------------
-// CSCOMOAdapter::SetMappingLC( const TDesC8 &aOriginalURI, 
-//	const TDeploymentComponentState aTargetState, const TDesC8 &aLUID, 
-//	HBufC8 *&aNewUri )
-// -------------------------------------------------------------------------------------		
-void CSCOMOAdapter::SetMappingLC(const TDesC8 &aOriginalURI,
-        const TDeploymentComponentState aTargetState, const TDesC8 &aLUID,
-        HBufC8 *&aNewUri)
-    {
-
-    // "Nullify" the mapping for argument
-    DirectSetMappingL(aOriginalURI, KNullDesC8);
-
-    // Determine new uri for aArgument
-    TPtrC8 puri;
-    if (aNewUri == NULL)
-        {
-        TPtrC8 argMapping(NSmlDmURI::LastURISeg(aOriginalURI) );
-        TPtrC8 target;
-        if (aTargetState == EDCSInactive || aTargetState == EDCSActive)
-            {
-            target.Set(KDeployedURI() );
-            }
-        else
-            if (aTargetState == EDCSDelivered)
-                {
-                target.Set(KDeliveredURI() );
-                }
-            else
-                {
-
-                User::Leave(KErrArgument);
-                }
-
-        aNewUri = HBufC8::NewLC(target.Length() + argMapping.Length() );
-        TPtr8 p(aNewUri->Des() );
-        p.Copy(target);
-        p.Append(argMapping);
-        puri.Set(p);
-        }
-    else
-        {
-        puri.Set( *aNewUri);
-        }
-    DirectSetMappingL(puri, aLUID);
-    MoveAclL(aOriginalURI, puri);
-    }
-
-#ifdef __AM_LASTERROR_NODE
-// ------------------------------------------------------------------------------------------------
-// CSCOMOAdapter::SetLastErrorL( const TDesC8& aLastError, const TInt aError )
-// ------------------------------------------------------------------------------------------------	
-void CSCOMOAdapter::SetLastErrorL(const TDesC8& aLastError, const TInt aError)
-    {
-    if (iLastError)
-        {
-        TPtrC8 p(*iLastError);
-        RDEBUG8_2( "CSCOMOAdapter::SetLastErrorL: clearing last error %S", &p);
-        delete iLastError;
-        iLastError = NULL;
-        }
-    iLastError = HBufC8::NewL(aLastError.Length() + 10);
-    iLastError->Des().Format(aLastError, aError);
-    }
-
-const TDesC8& CSCOMOAdapter::LastError()
-    {
-    return iLastError == NULL ? KNullDesC8() : *iLastError;
-    }
-
-#endif
-
-TPtrC8 CSCOMOAdapter::LastURISeg(const TDesC8& aURI)
-    {
-    TInt i;
-    for (i=aURI.Length()-1; i>=0; i--)
-        {
-        if (aURI[i]==KNSmlDMAMSeparatorDef)
-            {
-            break;
-            }
-        }
-    if (i==0)
-        {
-        return aURI;
-        }
-    else
-        {
-        return aURI.Mid(i+1);
-        }
-    }
-
-TInt CSCOMOAdapter::DesToInt(const TDesC8& aLuid)
-    {
-    TLex8 lex(aLuid);
-    TInt value = 0;
-    lex.Val(value);
-    return value;
-    }
-void CSCOMOAdapter::CheckAndAddPredefinedNodeL()
-    {
-
-    // Check if SCOMODefault node addition is enabled.
-    TInt staticnodeenabled = 0;
-    CRepository* cenrep = CRepository::NewLC( KCRUidPrivateApplicationManagementKeys );
-    cenrep->Get( KAMStaticNodeEnabled, staticnodeenabled ); 
-    CleanupStack::PopAndDestroy(); //cenrep
-        
-    
-    if(staticnodeenabled)
-    {
-      TBuf8<KMaxFullName> temp;
-      GetPredefinedNodeL(temp);
-      if (temp.Length())
-        {
-
-        TBuf8<KMaxFullName> temp1;
-        temp1.Zero();
-        temp1.Copy(KAMNodeName);
-        temp1.Append(KAMSeparator8);
-        temp1.Append(KAMDownloadNodeName);
-        temp1.Append(KAMSeparator8);
-        temp1.Append(temp);
-        HBufC8* luid = DirectGetLuidAllocLC(temp1);
-
-        if (luid->Length() > 0)
-            {
-            CleanupStack::PopAndDestroy(luid);
-            return;
-            }
-        else
-            {
-            // Not found, add node and mapping ... 
-            //TError status(EError);
-            TPtrC8 mapping(NSmlDmURI::LastURISeg(temp1) );
-            TPtrC8 parent(NSmlDmURI::RemoveLastSeg(temp1) );
-            TPtrC8 parentMapping(NSmlDmURI::LastURISeg(parent) );
-            TInt cnt(NSmlDmURI::NumOfURISegs(temp1) );
-            TUint32 newLuid(SessionL().DownloadL(mapping));
-            //Callback().SetMappingL( temp1, *IntToDes8LC( newLuid ) );
-            //CleanupStack::PopAndDestroy();
-            DirectSetMappingL(temp1, *IntToDes8LC(newLuid) );
-            CleanupStack::PopAndDestroy(); // for IntToDes8LC()
-            CleanupStack::PopAndDestroy(luid);
-            }
-        }
-    }
-    }
-// ---------------------------------------------------------------------------
-// CAmAdapter::GetPredefinedNodeL()
-// Gets  predefined node for Download object from cenrep 
-// ---------------------------------------------------------------------------
-//
-void CSCOMOAdapter::GetPredefinedNodeL(TDes8& aNode)
-	{
-	CRepository* centrep( NULL);
-	aNode.Zero();
-   	centrep = CRepository::NewLC( KCRUidPrivateApplicationManagementKeys );
-
-    if ( centrep )
-	    {
-        TBuf8<256> temp;
-		TInt err = centrep->Get( KAMDownloadPredefinedNode, temp );
-    	if (centrep->Get( KAMDownloadPredefinedNode, temp )==KErrNone && temp.Length() )
-			{
-			temp.Trim();
-			aNode.Copy(temp);
-			}
-		CleanupStack::PopAndDestroy(centrep);
-	    }
-	}
-// -------------------------------------------------------------------------------------
-// CAmAdapter::DirectRemoveMappingL( const TDesC8 &aURI )
-// -------------------------------------------------------------------------------------        
-TInt CSCOMOAdapter::DirectRemoveMappingL( const TDesC8 &aURI )
-    {
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-    TRAPD( err, Callback().SetMappingL( aURI, aLUID ) );
-#else
-    TInt err( iDbSession.RemoveMappingInfoL( KAMAdapterImplUid, aURI, ETrue ) );
-#endif
-    return err;
-    }
-TInt CSCOMOAdapter::GetAdapterValue()
-    {
-    TInt adapterValue;
-    CRepository *repository = NULL;
-    TRAPD( err, repository = CRepository::NewL ( KCRUidPrivateApplicationManagementKeys ) );
-    if (err == KErrNone)
-        {
-        err = repository->Get(KAMAdapterValue, adapterValue);
-        }
-    delete repository;
-    repository = NULL;
-    return adapterValue;
-    }
-
-void CSCOMOAdapter::SetAdapterValue(TInt aAdapterValue)
-    {
-    CRepository *repository = NULL;
-    TRAPD( err, repository = CRepository::NewL ( KCRUidPrivateApplicationManagementKeys ) );
-    if (err == KErrNone)
-        {
-        err = repository->Set(KAMAdapterValue, aAdapterValue);
-        }
-    delete repository;
-    repository = NULL;
-    }
-TBool CSCOMOAdapter::RecognizeMimeType(const TDesC8& aMimeType)
-    {
-    TBool isSupportedMimeType = EFalse;
-    if ((aMimeType == KSisxMimeType )||(aMimeType == KSisMimeType )||(aMimeType == KPipMimeType )||
-            (aMimeType == KJadMIMEType )||(aMimeType == KJarMIMEType )||(aMimeType == KJavaMIMEType ))
-        {
-        isSupportedMimeType = ETrue;
-        }
-    return isSupportedMimeType;
-    }
-// End of File
-
--- a/applicationmanagement/omascomoadapter/src/omascomoadapter.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
- *
- * Description:  Implementation of applicationmanagement components
- *
-*/
-
-
-#include <registryinfo.rh>
-#define KSmlDMInterfaceUid 0x102018B4
-
-RESOURCE REGISTRY_INFO theRegistryInfo
-  {
-  dll_uid = 0x20021335; //The DLL's 3rd UID.
-  interfaces = 
-      {
-      INTERFACE_INFO
-          {
-          interface_uid = KSmlDMInterfaceUid; // DM interface UID
-          implementations = 
-            {
-            IMPLEMENTATION_INFO
-                {
-                implementation_uid = 0x20021336; // SCOMO DM Adapter implementation UID
-                version_no = 1; 
-                display_name = "Application Management DM Adapter";
-                default_data = "";
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-                opaque_data = "host=0x101F9A02";
-#else
-								opaque_data = "";
-#endif
-                }
-            };
-          }
-      };
-    }
-
-// End of File
--- a/applicationmanagement/omascomoadapter/src/omascomoadapterdb.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,447 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
- *
- * Description:  Implementation of applicationmanagement components
- *
-*/
-
-
-// INCLUDE FILES
-#include <sysutil.h>
-#include <bautils.h>
-
-#include "omascomoadapterdb.h"
-#include "debug.h"
-
-// ============================ MEMBER FUNCTIONS =============================
-
-// ---------------------------------------------------------------------------
-//  CSCOMOAdapterDb::NewL()
-//  Creates a new instance of CSCOMOAdapterDb object.
-// ---------------------------------------------------------------------------
-// 
-CSCOMOAdapterDb* CSCOMOAdapterDb::NewL()
-    {
-    RDEBUG("CSCOMOAdapterDb::NewL(): begin");
-
-    CSCOMOAdapterDb* self = CSCOMOAdapterDb::NewLC();
-    CleanupStack::Pop(self);
-
-    RDEBUG("CSCOMOAdapterDb::NewL(): end");
-
-    return self;
-    }
-
-// ---------------------------------------------------------------------------
-//  CSCOMOAdapterDb::NewLC()
-//  Creates a new instance of CSCOMOAdapterDb object. 
-//  Pushes and leaves new instance onto CleanupStack.
-// ---------------------------------------------------------------------------
-// 
-CSCOMOAdapterDb* CSCOMOAdapterDb::NewLC()
-    {
-    RDEBUG("CSCOMOAdapterDb::NewLC(): begin");
-
-    CSCOMOAdapterDb* self = new( ELeave ) CSCOMOAdapterDb();
-    CleanupStack::PushL(self);
-    self->ConstructL();
-
-    RDEBUG("CSCOMOAdapterDb::NewLC(): end");
-
-    return self;
-    }
-
-// ---------------------------------------------------------------------------
-//  CSCOMOAdapterDb::ConstructL()
-//  Second phase constructor.
-// ---------------------------------------------------------------------------
-// 
-void CSCOMOAdapterDb::ConstructL()
-    {
-    RDEBUG("CSCOMOAdapterDb::ConstructL(): begin");
-
-    TParse name;
-    TInt err;
-
-    User::LeaveIfError(iFsSession.Connect());
-    User::LeaveIfError(iRdbSession.Connect() );
-
-    iFsSession.SetSessionToPrivate(EDriveC);
-
-#ifdef SYMBIAN_SECURE_DBMS
-    name.Set(KAMAdapterDbName, NULL, NULL);
-    err = iDatabase.Open(iRdbSession, name.FullName(), KDBMSSecureID);
-#else
-    name.Set( KAMAdapterDbName, KNonSecureDbFullName, NULL );
-    err = iDatabase.Open(iRdbSession, DBFileName);
-#endif
-
-    if (err == KErrNotFound)
-        {
-        CreateandOpenL(name);
-        }
-    else
-        {
-
-        if ( (err == KErrEof ) || (err == KErrCorrupt ) || (err
-                == KErrArgument ))
-            {
-
-            iRdbSession.DeleteDatabase(name.FullName(), KAMPolicyUID);
-            CreateandOpenL(name);
-            }
-
-        }
-
-    RDEBUG("CSCOMOAdapterDb::ConstructL(): end");
-    }
-
-// -----------------------------------------------------------------------------
-// CWPInternetAPDB::CreateandOpenL
-// -----------------------------------------------------------------------------
-//    
-void CSCOMOAdapterDb::CreateandOpenL(TParse& name)
-    {
-
-    TInt err;
-
-#ifdef SYMBIAN_SECURE_DBMS
-    iDatabase.Create(iRdbSession, name.FullName(), KDBMSSecureID);
-#else
-    if( SysUtil::FFSSpaceBelowCriticalLevelL( &iFsSession, KEmptyDbSizeEstimate ) )
-        {
-        User::Leave( KErrDiskFull );
-        }
-    iDatabase.Create(iFsSession, name.FullName());
-#endif	
-
-    CreateTableL(iDatabase);
-    iDatabase.Close();
-#ifdef SYMBIAN_SECURE_DBMS
-
-    err = iDatabase.Open(iRdbSession, name.FullName(), KDBMSSecureID);
-
-#else
-    err = iDatabase.Open(iFsSession, DBFileName);
-#endif
-
-    //Debug
-    if (err != KErrNone)
-        {
-
-        User::LeaveIfError(err);
-        }
-
-    }
-
-// -----------------------------------------------------------------------------
-// CWPInternetAPDB::CreateTableL
-// -----------------------------------------------------------------------------
-//  
-void CSCOMOAdapterDb::CreateTableL(RDbDatabase& aDatabase)
-    {
-
-    // Create a table definition
-    CDbColSet* columns=CDbColSet::NewLC();
-
-    // Add Columns
-    TDbCol id(NCol1, EDbColInt32);
-
-    // automatic indexing for items,it is our key field.
-    id.iAttributes=id.EAutoIncrement;
-    columns->AddL(id);
-    columns->AddL(TDbCol(NCol2, EDbColInt32));
-    columns->AddL(TDbCol(NCol3, EDbColInt32));
-    columns->AddL(TDbCol(NCol4, EDbColText8, 255));
-    columns->AddL(TDbCol(NCol5, EDbColText8, 255));
-    columns->AddL(TDbCol(NCol6, EDbColText8, 255));
-    columns->AddL(TDbCol(NCol7, EDbColInt32));
-
-    //possibility of Panic 
-
-    // Create a table
-    TRAPD(err, aDatabase.CreateTable(KTableAMMgmtObject, *columns) );
-
-    if(err!=KErrNone)
-    User::Leave(err);
-
-    // cleanup the column set
-    CleanupStack::PopAndDestroy(columns);
-
-    }
-
-// ---------------------------------------------------------------------------
-//  CSCOMOAdapterDb::CSCOMOAdapterDb()
-//  Constructor.
-// ---------------------------------------------------------------------------
-// 
-CSCOMOAdapterDb::CSCOMOAdapterDb()
-    {
-    RDEBUG("CSCOMOAdapterDb::CSCOMOAdapterDb(): begin");
-    RDEBUG("CSCOMOAdapterDb::CSCOMOAdapterDb(): end");
-    }
-
-// ---------------------------------------------------------------------------
-//  CSCOMOAdapterDb::~CSCOMOAdapterDb()
-//  Destructor.
-// ---------------------------------------------------------------------------
-// 
-CSCOMOAdapterDb::~CSCOMOAdapterDb()
-    {
-    RDEBUG("CSCOMOAdapterDb::~CSCOMOAdapterDb(): begin");
-
-    iView.Close();
-
-    delete iColSet;
-    iAMObjectTable.Close();
-
-    iDatabase.Close();
-    iFsSession.Close();
-    iRdbSession.Close();
-
-    RDEBUG("CSCOMOAdapterDb::~CSCOMOAdapterDb(): ends");
-    }
-
-CAMDbItem::~CAMDbItem()
-    {
-    delete iServerID;
-    delete iCorrelator;
-    delete iSourceURI;
-    }
-
-void CSCOMOAdapterDb::GetEntryForServerIDL(RPointerArray<CAMDbItem>& aItemArray,
-        TDesC8& aValue)
-    {
-
-    aItemArray.Reset();// first reset the array
-
-    _LIT(KEqualToString,"='%S'");
-    _LIT(KQuery, "SELECT * FROM %S WHERE %S");
-
-    TBuf<256> serverid;
-    serverid.Copy(aValue);
-
-    TBuf<100> bufsql;
-    bufsql.Append(KQuery);
-    bufsql.Append(KEqualToString);
-    TBuf<100> bufsql1;
-    bufsql1.Format(bufsql, &KTableAMMgmtObject, &NCol4, &serverid);
-
-    ReadItemsL(aItemArray, bufsql1);
-
-    }
-
-
-
-// -----------------------------------------------------------------------------
-// CWPInternetAPDB::ReadItemsL
-// -----------------------------------------------------------------------------
-// 
-void CSCOMOAdapterDb::ReadItemsL(RPointerArray<CAMDbItem>& aItemArray,
-        TDesC& aSqlQuery)
-    {
-
-    RDbView view;
-    view.Prepare(iDatabase, TDbQuery(aSqlQuery));
-    CleanupClosePushL(view);
-    view.EvaluateAll();
-    view.FirstL();
-
-    while (view.AtRow())
-        {
-        view.GetL();
-
-        CAMDbItem *dbitem = new(ELeave) CAMDbItem;
-        dbitem->id = view.ColInt(1);
-        dbitem->iLUID = view.ColInt(2);
-        dbitem->iProfileId = view.ColInt(3);
-
-        dbitem->iServerID = (view.ColDes8(4)).AllocL();
-        dbitem->iCorrelator = (view.ColDes8(5)).AllocL();
-        dbitem->iSourceURI = (view.ColDes8(6)).AllocL();
-
-        dbitem->iRetryCount = view.ColInt(7);
-
-        aItemArray.Append(dbitem);
-        view.NextL();
-        }
-
-    CleanupStack::PopAndDestroy(); // view
-
-    }
-
-// -----------------------------------------------------------------------------
-// CWPInternetAPDB::SaveToDatabaseL
-// -----------------------------------------------------------------------------
-//   
-void CSCOMOAdapterDb::SaveToDatabaseL(TInt& aIndex, TUint32 aLuid,
-        TInt aProfileid, TInt aRetryCount, const TDesC8& aSourceURI,
-        const TDesC8& aServerid, const TDesC8& aCorrelator)
-    {
-
-    BeginDatabaseTransaction();
-
-    TFileName sqlQuery;
-    sqlQuery.Copy(_L("SELECT * FROM "));
-    sqlQuery.Append(KTableAMMgmtObject);
-
-    RDbView view;
-    view.Prepare(iDatabase, TDbQuery(sqlQuery));
-    CleanupClosePushL(view);
-
-    view.InsertL();
-
-    view.SetColL(2, aLuid);
-    view.SetColL(3, aProfileid);
-    view.SetColL(4, aServerid);
-    view.SetColL(5, aCorrelator);
-    view.SetColL(6, aSourceURI);
-    view.SetColL(7, aRetryCount);
-
-    view.PutL();
-
-    aIndex = view.ColInt(1);// autoincrement gives us unique index.
-
-    CleanupStack::PopAndDestroy(1); // view
-    
-    CommitDatabaseTransaction();
-
-    }
-
-// -----------------------------------------------------------------------------
-// CWPInternetAPDB::DeleteFromDatabaseL
-// -----------------------------------------------------------------------------
-//
-TBool CSCOMOAdapterDb::DeleteFromDatabaseL(TUint32 aLuid)
-    {
-
-    TBool rowsdeleted = EFalse;
-    TFileName sqlQuery;
-	
-	PrepareLuidQuery(aLuid, sqlQuery);
-	
-
-    BeginDatabaseTransaction();
-
-    RDbView view;
-    // query buffer with index finds only the selected item row.
-    view.Prepare(iDatabase, TDbQuery(sqlQuery));
-    CleanupClosePushL(view);
-
-    view.EvaluateAll();
-    view.FirstL();
-
-    if (!view.IsEmptyL())
-        {
-        // we have autoincrement in index so it should be unique
-        // but just to make sure, we use 'while', instead of 'if'
-        while (view.AtRow())
-            {
-            view.GetL();
-            view.DeleteL();
-            view.NextL();
-            }
-
-        
-        CommitDatabaseTransaction();
-        // compacts the databse, by physically removig deleted data.
-        iDatabase.Compact();
-        rowsdeleted = ETrue;
-        }
-    CleanupStack::PopAndDestroy(1); // view
-
-
-    return rowsdeleted;
-    }
-
-void CSCOMOAdapterDb::UpdateRetryCountForLuidL(TInt aLuid, TInt aRetryCount)
-{
-	TFileName sqlQuery;
-	
-	PrepareLuidQuery(aLuid, sqlQuery);
-	
-	BeginDatabaseTransaction();
-	
-	RDbView view;
-	view.Prepare(iDatabase, TDbQuery(sqlQuery));
-	CleanupClosePushL(view);
-	
-	view.EvaluateAll();
-	view.FirstL();
-	
-	if(view.AtRow())            
-	{			
-		view.UpdateL();
-		view.SetColL(7, aRetryCount);		
-		view.PutL();
-	}
-			
-	CleanupStack::PopAndDestroy(1); // view
-	
-    CommitDatabaseTransaction();
-}
-
-TInt CSCOMOAdapterDb::GetRetryCountForLuidL(TInt aLuid)
-{
-    TInt retrycount = KErrNone;
-	TFileName sqlQuery;
-    
-    PrepareLuidQuery(aLuid, sqlQuery);
-    
-    BeginDatabaseTransaction();
-    
-    RDbView view;
-    view.Prepare(iDatabase, TDbQuery(sqlQuery));
-    CleanupClosePushL(view);
-    view.EvaluateAll();
-    view.FirstL();
-
-    if (!view.IsEmptyL())
-    {
-    
-    if(view.AtRow())            
-	{
-    view.GetL();
-	}
-	
-    retrycount = view.ColInt(7);
-	
-    }
-
-	CleanupStack::PopAndDestroy(1); // view
-	
-	CommitDatabaseTransaction();
-
-	return retrycount;    
-    
-}
-
-void CSCOMOAdapterDb::PrepareLuidQuery(TInt aLuid, TDes& aSqlQuery)
-{
-	aSqlQuery.Copy(_L("SELECT * FROM "));
-    aSqlQuery.Append(KTableAMMgmtObject);
-    aSqlQuery.Append(_L(" WHERE "));
-    aSqlQuery.Append(NCol2);
-    aSqlQuery.Append(_L(" = "));
-    aSqlQuery.AppendNum(aLuid);
-}
-
-void CSCOMOAdapterDb::BeginDatabaseTransaction()
-{
-	iDatabase.Begin();
-}
-
-void CSCOMOAdapterDb::CommitDatabaseTransaction()
-{
-	iDatabase.Commit();
-}
--- a/applicationmanagement/options/BWINS/AMInstallOptionsu.def	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-EXPORTS
-	?ParseOptionsL@InstallOptionsParser@@SAXABVTDesC8@@AAUTAMInstallOptions@NApplicationManagement@@@Z @ 1 NONAME ; void InstallOptionsParser::ParseOptionsL(class TDesC8 const &, struct NApplicationManagement::TAMInstallOptions &)
-	?ParseOptionsL@InstallOptionsParser@@SAXABVTDesC8@@AAVTInstallOptions@SwiUI@@@Z @ 2 NONAME ; void InstallOptionsParser::ParseOptionsL(class TDesC8 const &, class SwiUI::TInstallOptions &)
-	?ParseOptionsL@InstallOptionsParser@@SAXABVTDesC8@@AAVTUninstallOptions@SwiUI@@@Z @ 3 NONAME ; void InstallOptionsParser::ParseOptionsL(class TDesC8 const &, class SwiUI::TUninstallOptions &)
-	?SerializeOptionsL@InstallOptionsParser@@SAXABUTAMInstallOptions@NApplicationManagement@@AAVCBufBase@@@Z @ 4 NONAME ; void InstallOptionsParser::SerializeOptionsL(struct NApplicationManagement::TAMInstallOptions const &, class CBufBase &)
-	?SerializeOptionsL@InstallOptionsParser@@SAXABVTInstallOptions@SwiUI@@AAVCBufBase@@@Z @ 5 NONAME ; void InstallOptionsParser::SerializeOptionsL(class SwiUI::TInstallOptions const &, class CBufBase &)
-	?SerializeOptionsL@InstallOptionsParser@@SAXABVTUninstallOptions@SwiUI@@AAVCBufBase@@@Z @ 6 NONAME ; void InstallOptionsParser::SerializeOptionsL(class SwiUI::TUninstallOptions const &, class CBufBase &)
-
--- a/applicationmanagement/options/eabi/AMInstallOptionsu.def	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-EXPORTS
-	_ZN20InstallOptionsParser13ParseOptionsLERK6TDesC8RN22NApplicationManagement17TAMInstallOptionsE @ 1 NONAME
-	_ZN20InstallOptionsParser13ParseOptionsLERK6TDesC8RN5SwiUI15TInstallOptionsE @ 2 NONAME
-	_ZN20InstallOptionsParser13ParseOptionsLERK6TDesC8RN5SwiUI17TUninstallOptionsE @ 3 NONAME
-	_ZN20InstallOptionsParser17SerializeOptionsLERKN22NApplicationManagement17TAMInstallOptionsER8CBufBase @ 4 NONAME
-	_ZN20InstallOptionsParser17SerializeOptionsLERKN5SwiUI15TInstallOptionsER8CBufBase @ 5 NONAME
-	_ZN20InstallOptionsParser17SerializeOptionsLERKN5SwiUI17TUninstallOptionsER8CBufBase @ 6 NONAME
-	_ZTI17CAMInstOptsParser @ 7 NONAME ; #<TI>#
-	_ZTI19CAMUninstOptsParser @ 8 NONAME ; #<TI>#
-	_ZTI21CAMInstOptsParserBase @ 9 NONAME ; #<TI>#
-	_ZTV17CAMInstOptsParser @ 10 NONAME ; #<VT>#
-	_ZTV19CAMUninstOptsParser @ 11 NONAME ; #<VT>#
-	_ZTV21CAMInstOptsParserBase @ 12 NONAME ; #<VT>#
-
--- a/applicationmanagement/options/group/AMInstallOptions.mmp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-/*
-* 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: Implementation of applicationmanagement components
-*
-*/
-  
-
-// To get the APP_LAYER_SYSTEMINCLUDE-definition
-#include <platform_paths.hrh>
-#include "defaultcaps.hrh"
-
-TARGET        aminstalloptions.dll
-TARGETTYPE    dll
-UID           0x10207835
-CAPABILITY    CAP_GENERAL_DLL
-
-SOURCEPATH    ../src
-SOURCE        AMInstallOptions.cpp
-
-USERINCLUDE   ../inc 
-USERINCLUDE   ../../inc
-APP_LAYER_SYSTEMINCLUDE
-SYSTEMINCLUDE /epoc32/include/xml
-#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
-SYSTEMINCLUDE 	/epoc32/include/platform/xml
-#endif
-
-LIBRARY		    xmlframework.lib 
-LIBRARY		    euser.lib 
-LIBRARY		    bafl.lib
-LIBRARY 	    flogger.lib
-
-
-SMPSAFE
--- a/applicationmanagement/options/group/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-/*
-* 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:  build info file for application management options
-*
-*/
-
-
-#include <platform_paths.hrh>
-PRJ_EXPORTS
-../inc/aminstalloptions.h  |../../../inc/aminstalloptions.h
-../rom/aminstalloptions.iby				CORE_APP_LAYER_IBY_EXPORT_PATH(aminstalloptions.iby)
-
-PRJ_MMPFILES
-AMInstallOptions.mmp
-
-//PRJ_TESTMMPFILES
--- a/applicationmanagement/options/group/instopts_def.xml	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,124 +0,0 @@
-<instoptexamples>
-<!-- 
-Each option can be left out (by commenting it away or removing). 
-The start tag above is only to make this file viewable using IE etc browsers.
-
-Empty or illegal (unknown) attribute values are interpreted as "no" was chosen 
-and installation will not be completed.
-
--->
-
-<InstOpts>
- <!-- 
- value: Installation drive letter 
- Special value: '!' uses any drive having enough space. 
- -->
- <StdOpt name="drive" value="e"/> 
- 
- <!-- ISO language code
- Special value: '*' uses phone's default language 
- -->   	
- <StdOpt name="lang" value="FI" /> 
- 
- <!--	
-  Name: upgrade
-  Possible Values: yes | no 
-  Description: Tells what is answered to "Application exists, do you want to upgrade?" like question.
-  -->
- <StdOpt name="upgrade" value="yes"/>
- 
- <!--	
-  Description: Kill existing application if running.
-  Possible Values: yes | no 
-  -->
- <StdOpt name="kill" value="yes"/> 
- 
- <!--	
-  Description: Response to package info dialog. It also sets policy to
-  handle all other warnings than ocsp, and FileTexts and possible questions
-  in the package. 
-  Possible Values: yes | no 
-  -->
- <StdSymOpt name="pkginfo" value="yes"/> 
- 
- <!--	
-  Description: Response to options dialog. 
-  This either selects all or none options.
-  Possible Values: yes | no 
-  -->
- <StdSymOpt name="optionals" value="yes"/>  
-
- <!--	
-  Description: Response to "grant capabilities" dialog.
-  Possible Values: yes | no 
-  NOTE: This has been commented out as an example. If now
-  	content package needs to be granted some capabilities,
-  	installation will fail because of missing option.
-  -->
- <!-- <StdSymOpt name="capabilities" value="yes"/> --> 
- 
- <!--	
-  Description: Response to install untrusted application dialog.
-  Possible Values: yes | no
-  -->
- <StdSymOpt name="untrusted" value="yes"/> 
-  
-  <!--	
-  Description: Determines whether OCSP check will be done automatically.
-  Possible Values: yes | no 
-  -->
- <StdSymOpt name="ocsp" value="yes"/> 
- 
-  <!--	
-  Description: Determines whether OCSP warnings will ignored automatically.
-  Possible Values: yes | no 
-  -->
- <StdSymOpt name="ignoreocspwarn" value="yes"/> 
- 
-  <!--	
-  Description: Determines whether files will be overwritten automatically,
-  if the file exists.
-  Possible Values: yes | no
-  -->
- <StdSymOpt name="fileoverwrite" value="yes"/> 
-
-
-  <!--	
-  Description: Determines whether RMS data will be updated
-  in midlet (java) install.
-  Possible Values: yes | no 
-  -->
- <StdSymOpt name="upgradedata" value="no"/>
- 
-
- <!-- Download username  -->
- <StdOpt name="httpusername" value="username"/>
-  <!-- Download password  -->
- <StdOpt name="httppassword" value="password"/>
-  <!-- Allow download 
- Possible Values: yes | no  -->
- <StdOpt name="download" value="yes"/>
-  <!-- 
-  Direct DM tree reference 
- <StdOpt name="conref" value="./AP/APId011"/>
--->
-</InstOpts>
- 
-<UninstOpts>
-<!--	
-  Description: Kill existing application if running.
-  Possible Values: yes | no 
-  -->
- <StdOpt name="kill" value="yes"/> 
- 
- <!--	
-  Description: Determines whether we should continue uninstall if any
-  of the component's dependendants still exist in device
-  Possible Values: yes | no 
-  -->
- <StdSymOpt name="allowdependencybreak" value="yes"/> 
- 
- 
-</UninstOpts>
-
-</instoptexamples>
\ No newline at end of file
--- a/applicationmanagement/options/inc/aminstalloptions.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-/*
-* Copyright (c) 2000 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 interface
-*
-*/
-
-
-#ifndef __AMINSTALLOPTIONSAPI_H__
-#define __AMINSTALLOPTIONSAPI_H__
-
-#include <SWInstDefs.h>
-namespace NApplicationManagement
-	{
-	const int KMaxConRef = 256;
-	struct TAMInstallOptions
-		{
-		TBuf8<KMaxConRef> iConRef;
-		TInt iIAP;
-		SwiUI::TInstallOptions iOptions;
-		TAMInstallOptions() : iConRef( KNullDesC8()),
-							  iIAP(-1), iOptions()
-			{
-			}
-		};
-
-	typedef TPckgBuf<TAMInstallOptions> TAMInstallOptionsPckgBuf;
-	typedef TPckg<TAMInstallOptions> TAMInstallOptionsPckg;
-
-	}
-	
-
-class InstallOptionsParser
-	{
-public:
-	IMPORT_C static void ParseOptionsL( const TDesC8 &aBuffer, SwiUI::TInstallOptions &aResult);
-	IMPORT_C static void SerializeOptionsL( const SwiUI::TInstallOptions &aOptions, CBufBase &aResult );
-	IMPORT_C static void ParseOptionsL( const TDesC8 &aBuffer, SwiUI::TUninstallOptions &aResult);
-	IMPORT_C static void SerializeOptionsL( const SwiUI::TUninstallOptions  &aOptions, CBufBase &aResult );
-	
-	IMPORT_C static void ParseOptionsL( const TDesC8 &aBuffer, NApplicationManagement::TAMInstallOptions &aResult);
-	IMPORT_C static void SerializeOptionsL( const NApplicationManagement::TAMInstallOptions &aOptions, CBufBase &aResult );
-	};    
-	
-    
-#endif
-
-//  End of File
--- a/applicationmanagement/options/inc/aminstalloptionsint.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,112 +0,0 @@
-/*
-* Copyright (c) 2000 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:  Internal header for ApplicationManagementOptions
-*
-*/
-
-
-#ifndef __AMINSTALLOPTIONSINT_H__
-#define __AMINSTALLOPTIONSINT_H__
-
-
-#include <parser.h>
-
-#include <contenthandler.h>
-#include <documentparameters.h>
-#include <SWInstDefs.h>
-
-
-class CAMInstOptsParserBase : public CBase, public Xml::MContentHandler
-	{
-public:
-	virtual ~CAMInstOptsParserBase();
-	void ParseL();
-protected:
-	const TDesC8 &iBuffer;
-	Xml::CParser *iParser ;
-	TInt iCustIndex ;
-	SwiUI::TPolicy iDefaultPolicy;
-	
-	CAMInstOptsParserBase( 
-		const TDesC8 &aBuffer, 
-		SwiUI::TPolicy aDefaultPolicy = SwiUI::EPolicyUserConfirm 
-	  )	: iBuffer( aBuffer ), iCustIndex(-1), iDefaultPolicy ( aDefaultPolicy )
-		{
-		
-		}
-
-	void SetPolicyValue( SwiUI::TPolicy &aPolicy, const TDesC8& aValue ) const;
-	void ConstructL();
-	
-
-	virtual void OnStartDocumentL(const Xml::RDocumentParameters& aDocParam, TInt aErrorCode);
-	virtual void OnEndDocumentL(TInt aErrorCode);
-	virtual void OnStartElementL(const Xml::RTagInfo& aElement, const Xml::RAttributeArray& aAttributes, TInt aErrorCode);
-	virtual void OnEndElementL(const Xml::RTagInfo& aElement, TInt aErrorCode);
-	virtual void OnContentL(const TDesC8& aBytes, TInt aErrorCode);
-	virtual void OnStartPrefixMappingL(const RString& aPrefix, const RString& aUri, TInt aErrorCode);
-	virtual void OnEndPrefixMappingL(const RString& aPrefix, TInt aErrorCode);
-	virtual void OnIgnorableWhiteSpaceL(const TDesC8& aBytes, TInt aErrorCode);
-	virtual void OnSkippedEntityL(const RString& aName, TInt aErrorCode);
-	virtual void OnProcessingInstructionL(const TDesC8& aTarget, const TDesC8& aData, TInt aErrorCode);
-	virtual void OnError(TInt aErrorCode);
-	TAny* GetExtendedInterface(const TInt32 aUid);
-	
-	};	
-	
-class CAMInstOptsParser : public CAMInstOptsParserBase//, public Xml::MContentHandler
-	{
-	//SwiUI::TInstallOptions &iResult;
-	NApplicationManagement::TAMInstallOptions &iResult;
-
-	//void ParseL();
-	public:
-		
-			
-		static CAMInstOptsParser * NewL( const TDesC8 &aBuffer, NApplicationManagement::TAMInstallOptions &aResult );
-		static CAMInstOptsParser * NewLC( const TDesC8 &aBuffer, NApplicationManagement::TAMInstallOptions &aResult );
-		
-		CAMInstOptsParser( const TDesC8 &aBuffer, NApplicationManagement::TAMInstallOptions &aResult ) 
-			: CAMInstOptsParserBase ( aBuffer ), iResult( aResult )
-			{
-			
-			}
-		
-		virtual ~CAMInstOptsParser();
-	
-    	void OnStartElementL(const Xml::RTagInfo& aElement, const Xml::RAttributeArray& aAttributes, TInt aErrorCode);
-	private:
-	};    			
-
-class CAMUninstOptsParser : public CAMInstOptsParserBase
-	{
-	SwiUI::TUninstallOptions &iResult; 
-	public:
-		static CAMUninstOptsParser * NewL( const TDesC8 &aBuffer, SwiUI::TUninstallOptions &aResult );
-		static CAMUninstOptsParser * NewLC( const TDesC8 &aBuffer, SwiUI::TUninstallOptions &aResult );
-		
-		CAMUninstOptsParser( const TDesC8 &aBuffer, SwiUI::TUninstallOptions &aResult ) 
-			: CAMInstOptsParserBase( aBuffer ), iResult( aResult )
-			{
-			
-			}
-		virtual ~CAMUninstOptsParser();
-	
-    	void OnStartElementL(const Xml::RTagInfo& aElement, const Xml::RAttributeArray& aAttributes, TInt aErrorCode);
-	private:
-	};    
-
-#endif // __AMINSTALLOPTIONSINT_H__
-
-//  End of File
--- a/applicationmanagement/options/rom/aminstalloptions.iby	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of applicationmanagement components
-*
-*/
-
-#ifndef __AMINSTALLOPTIONS_IBY__
-#define __AMINSTALLOPTIONS_IBY__
-
-file=ABI_DIR\BUILD_DIR\AMInstallOptions.dll     							SHARED_LIB_DIR\AMInstallOptions.dll
-
-#endif
--- a/applicationmanagement/options/src/AMInstallOptions.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,927 +0,0 @@
-/*
-* Copyright (c) 2000 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:  ApplicationManagementOptions implementation
-*
-*/
-
-
-
-#include <e32debug.h>
-#include <s32mem.h>
-#include "debug.h"
-#include "aminstalloptions.h"
-#include "aminstalloptionsint.h"
-	
-
-namespace AMXml
-	{
-	
-	struct TLangCodeMapping 
-		{
-		//const TText8 *const iCode ;
-		const TText8 * iCode ;
-		TLanguage iLang ;
-		};
-		
-	// Language options
-	const TLangCodeMapping KLangOptions[] = 
-		{
-		{_S8("EN"), ELangEnglish},
-		{_S8("FR"), ELangFrench},
-		{_S8("GE"), ELangGerman},
-		{_S8("SP"), ELangSpanish},
-		{_S8("IT"), ELangItalian},
-		{_S8("SW"), ELangSwedish},
-		{_S8("DA"), ELangDanish},
-		{_S8("NO"), ELangNorwegian},
-		{_S8("FI"), ELangFinnish},
-		{_S8("AM"), ELangAmerican},
-		{_S8("SF"), ELangSwissFrench},
-		{_S8("SG"), ELangSwissGerman},
-		{_S8("PO"), ELangPortuguese},
-		{_S8("TU"), ELangTurkish},
-		{_S8("IC"), ELangIcelandic},
-		{_S8("RU"), ELangRussian},
-		{_S8("HU"), ELangHungarian},
-		{_S8("DU"), ELangDutch},
-		{_S8("BL"), ELangBelgianFlemish},
-		{_S8("AU"), ELangAustralian},
-		{_S8("BF"), ELangBelgianFrench},
-		{_S8("AS"), ELangAustrian},
-		{_S8("NZ"), ELangNewZealand},
-		{_S8("IF"), ELangInternationalFrench},
-		{_S8("CS"), ELangCzech},
-		{_S8("SK"), ELangSlovak},
-		{_S8("PL"), ELangPolish},
-		{_S8("SL"), ELangSlovenian},
-		{_S8("TC"), ELangTaiwanChinese},
-		{_S8("HK"), ELangHongKongChinese},
-		{_S8("ZH"), ELangPrcChinese},
-		{_S8("JA"), ELangJapanese},
-		{_S8("TH"), ELangThai},
-		{_S8("AF"), ELangAfrikaans },
-		{_S8("SQ"), ELangAlbanian },
-		{_S8("AH"), ELangAmharic },
-		{_S8("AR"), ELangArabic },
-		{_S8("HY"), ELangArmenian },
-		{_S8("TL"), ELangTagalog },
-		{_S8("BE"), ELangBelarussian },
-		{_S8("BN"), ELangBengali },
-		{_S8("BG"), ELangBulgarian },
-		{_S8("MY"), ELangBurmese },
-		{_S8("CA"), ELangCatalan },
-		{_S8("HR"), ELangCroatian },
-		{_S8("CE"), ELangCanadianEnglish },
-		{_S8("IE"), ELangInternationalEnglish },
-		{_S8("SF"), ELangSouthAfricanEnglish },
-		{_S8("ET"), ELangEstonian },
-		{_S8("FA"), ELangFarsi },
-		{_S8("CF"), ELangCanadianFrench },
-		{_S8("GD"), ELangScotsGaelic },
-		{_S8("KA"), ELangGeorgian },
-		{_S8("EL"), ELangGreek },
-		{_S8("CG"), ELangCyprusGreek },
-		{_S8("GU"), ELangGujarati },
-		{_S8("HE"), ELangHebrew },
-		{_S8("HI"), ELangHindi },
-		{_S8("IN"), ELangIndonesian },
-		{_S8("GA"), ELangIrish },
-		{_S8("SZ"), ELangSwissItalian },
-		{_S8("KN"), ELangKannada },
-		{_S8("KK"), ELangKazakh },
-		{_S8("KM"), ELangKhmer },
-		{_S8("KO"), ELangKorean },
-		{_S8("LO"), ELangLao },
-		{_S8("LV"), ELangLatvian },
-		{_S8("LT"), ELangLithuanian },
-		{_S8("MK"), ELangMacedonian },
-		{_S8("MS"), ELangMalay },
-		{_S8("ML"), ELangMalayalam },
-		{_S8("MR"), ELangMarathi },
-		{_S8("MO"), ELangMoldavian },
-		{_S8("MN"), ELangMongolian },
-		{_S8("NN"), ELangNorwegianNynorsk },
-		{_S8("BP"), ELangBrazilianPortuguese },
-		{_S8("PA"), ELangPunjabi },
-		{_S8("RO"), ELangRomanian },
-		{_S8("SR"), ELangSerbian },
-		{_S8("SI"), ELangSinhalese },
-		{_S8("SO"), ELangSomali },
-		{_S8("OS"), ELangInternationalSpanish },
-		{_S8("LS"), ELangLatinAmericanSpanish },
-		{_S8("SH"), ELangSwahili },
-		{_S8("FS"), ELangFinlandSwedish },
-		//{_S8("??"), ELangReserved1 },
-		{_S8("TA"), ELangTamil },
-		{_S8("TE"), ELangTelugu },
-		{_S8("BO"), ELangTibetan },
-		{_S8("TI"), ELangTigrinya },
-		{_S8("CT"), ELangCyprusTurkish },
-		{_S8("TK"), ELangTurkmen },
-		{_S8("UK"), ELangUkrainian },
-		{_S8("UR"), ELangUrdu },
-		//{_S8("??"), ELangReserved2 },
-		{_S8("VI"), ELangVietnamese },
-		{_S8("CY"), ELangWelsh },
-		{_S8("ZU"), ELangZulu },
-		//{_S8("??"), ELangOther },
-		//{_S8("??"), ELangNone  }
-		};
-		
-	const TInt KNumLangOptions = (sizeof(KLangOptions)/sizeof(TLangCodeMapping));
-		
-	// boolean "value" attribute values
-	_LIT8( KIOValueTrue, "yes" );
-	_LIT8( KIOValueFalse, "no" );
-	// notimp _LIT8( KIOAsk, "askuser" );
-	
-	_LIT8( KIODefaultLanguage, "*");
-	
-	// notimp _LIT8( KIOMissingOptionPolicyValDefault, "usedefault" );
-	_LIT8( KIOMissingOptionPolicyValFail, "fail" );
-	// notimp _LIT8( KIOMissingOptionPolicyValAsk, "askuser" );
-	
-	// "Name" attribute values
-	_LIT8( KIODrive, "drive" );
-	_LIT8( KIOLanguage, "lang" );
-	_LIT8( KIOUpgrade, "upgrade" );
-	_LIT8( KIOKill, "kill" );
-	
-	// sym specific
-	_LIT8( KIOCapabilities, "capabilities" );
-	_LIT8( KIOUntrusted, "untrusted" );
-	_LIT8( KIOPkginfo, "pkginfo" );
-	_LIT8( KIOOptionalItems, "optionals" );
-	
-	_LIT8 ( KIOOCSP, "ocsp" );
-	_LIT8 ( KIOOCSPWarning, "ignoreocspwarn" );
-	_LIT8 ( KIOOverwrite, "fileoverwrite" );
-	
-	_LIT8 ( KIOUpgradeData, "upgradedata" ); // iUpgradeData
-	
-	_LIT8( KUIOBreakDependency, "allowdependencybreak" );
-	
-	_LIT8( KIOAttrNameDefaultPolicy, "missingoptionpolicy" );
-	
-	_LIT8( KIODownload, "download" );
-	_LIT8( KIOHttpUsername, "httpusername" );
-	_LIT8( KIOHttpPassword, "httppassword" );
-	_LIT8( KIOIAP, "conref" );
-	
-	namespace Reader
-		{
-		// XML node names
-		_LIT8( KIOStartElement, "InstOpts") ;
-		_LIT8( KIOStdOpt, "StdOpt");
-		_LIT8( KIOStdSymOpt, "StdSymOpt" );
-		_LIT8( KIOCustSymOpts, "CustSymOpts" );
-		// notimp _LIT8( KIOOpt, "Opt" );
-
-		// Xml attribute names
-		// notimp _LIT8( KIOOptAttrIndex, "index" );
-		_LIT8( KIOAttrName, "name" );
-		_LIT8( KIOAttrValue, "value" );
-		
-		}
-		
-	namespace Writer
-		{
-		_LIT8( KIOStartElement, "<InstOpts>") ;
-		_LIT8( KIOStdOptFormat, "<StdOpt name=\"%S\" value=\"%S\"/>" );
-		_LIT8( KIOStdSymOptFormat, "<StdSymOpt name=\"%S\" value=\"%S\"/>" );
-		// notimp _LIT8( KIOCustSymOptsStartFormat, "<CustSymOpts cnt=\"%d\">" );
-		// notimp _LIT8( KIOCustSymOptsEnd, "</CustSymOpts>" );
-		// notimp _LIT8( KIOOptFormat, "<Opt index=\"%d\" value=\"%S\"/>" );
-		_LIT8( KIOStartElementEnd, "</InstOpts>") ;		
-		
-		_LIT8( KUIOStartElement, "<UninstOpts>" );
-		_LIT8( KUIOStartElementEnd, "</UninstOpts>" );
-		}
-	}
-	
-///////////////////////////////////////////////////
-//
-// CAMInstOptsParserBase
-//
-///////////////////////////////////////////////////
-
-	
-CAMInstOptsParserBase::~CAMInstOptsParserBase()
-	{
-	delete iParser;
-	iParser = NULL;
-	}
-
-void CAMInstOptsParserBase::SetPolicyValue( SwiUI::TPolicy &aPolicy, const TDesC8& aValue ) const
-	{
-	using namespace AMXml;
-	
-	if ( aValue == KIOValueTrue )
-		{
-		aPolicy = SwiUI::EPolicyAllowed ;
-		}
-	else if ( aValue == KIOValueFalse )
-		{
-		aPolicy = SwiUI::EPolicyNotAllowed ;
-		}
-	else
-		{
-		aPolicy = iDefaultPolicy;
-		}
-	}
-void CAMInstOptsParserBase::ConstructL()
-	{
-	iParser = Xml::CParser::NewL( _L8( "text/xml"), *this );	
-	
-	}
-	
-void CAMInstOptsParserBase::ParseL()
-	{
-	Xml::ParseL( *iParser, iBuffer );
-	}	
-	
-void CAMInstOptsParserBase::OnStartElementL(const Xml::RTagInfo& /*aElement*/, 
-		const Xml::RAttributeArray& /*aAttributes*/, TInt aErrorCode)
-	{
-	RDEBUG("CAMInstOptsParserBase::OnStartElementL");
-	if( aErrorCode != KErrNone )
-		{
-		RDEBUG_2( "		->OnStartElementL (aErrorCode '%d')", aErrorCode );		
-		}
-	}
-	
-void CAMInstOptsParserBase::OnEndDocumentL(TInt aErrorCode)
-	{
-	RDEBUG("CAMInstOptsParserBase::OnEndDocumentL");
-	if( aErrorCode != KErrNone )
-		{
-		RDEBUG_2( "		->OnEndDocumentL (aErrorCode '%d')", aErrorCode );		
-		}
-	}
-
-void CAMInstOptsParserBase::OnStartDocumentL(const Xml::RDocumentParameters& aDocParam, TInt aErrorCode)
-	{
-	RDEBUG("CAMInstOptsParserBase::OnStartDocumentL");
-	if( aErrorCode != KErrNone )
-		{
-		const TDesC8 &d = aDocParam.CharacterSetName().DesC();
-		RDEBUG8_3( "	->OnStartDocumentL (aDocParam '%S', aErrorCode %d)" , 
-			&d,aErrorCode );	
-		}
-	}
-	
-void CAMInstOptsParserBase::OnEndElementL(const Xml::RTagInfo& aElement, TInt aErrorCode)
-	{
-	RDEBUG("CAMInstOptsParserBase::OnEndElementL");
-	if( aErrorCode != KErrNone )
-		{
-		const TDesC8 &d = aElement.LocalName().DesC();
-		RDEBUG8_3( "		->OnEndElementL (LocalName '%S', aErrorCode %d)", 
-			&d,aErrorCode );
-		}
-	}
-	
-void CAMInstOptsParserBase::OnContentL(
-		#ifdef _DEBUG 
-			const TDesC8& aBytes
-		#else 
-			const TDesC8& /*aBytes*/
-		#endif 
-	,TInt aErrorCode )
-	{
-	RDEBUG("CAMInstOptsParserBase::OnContentL");
-	if( aErrorCode != KErrNone )
-		{
-		#ifdef _DEBUG
-			RDEBUG8_3( "		->OnContentL (abytes '%S', aErrorCode %d)", 
-				&aBytes, aErrorCode );
-		#else
-			RDEBUG8_2( "		->OnContentL (aErrorCode %d)", aErrorCode );
-		#endif		
-		}
-	
-	}
-void CAMInstOptsParserBase::OnStartPrefixMappingL(const RString& /*aPrefix*/, 
-	const RString& /*aUri*/, TInt /*aErrorCode*/)
-	{
-	
-	}
-void CAMInstOptsParserBase::OnEndPrefixMappingL(const RString& /*aPrefix*/, TInt /*aErrorCode*/)
-	{
-	
-	}
-void CAMInstOptsParserBase::OnIgnorableWhiteSpaceL(const TDesC8& /*aBytes*/, TInt /*aErrorCode*/)
-	{
-	
-	}
-void CAMInstOptsParserBase::OnSkippedEntityL(const RString& /*aName*/, TInt /*aErrorCode*/)
-	{
-	
-	}
-void CAMInstOptsParserBase::OnProcessingInstructionL(const TDesC8& /*aTarget*/, 
-	const TDesC8& /*aData*/, TInt /*aErrorCode*/)
-	{
-	
-	}
-void CAMInstOptsParserBase::OnError(TInt aErrorCode)
-	{
-	RDEBUG("CAMInstOptsParserBase::OnError");
-	if( aErrorCode != KErrNone )
-		{
-		RDEBUG_2( "		->OnError ( aErrorCode %d)",aErrorCode );
-	}
-	}
-	
-
-	
-TAny* CAMInstOptsParserBase::GetExtendedInterface(const TInt32 /*aUid*/)
-	{
-	
-	return NULL;		
-	}
-
-
-///////////////////////////////////////////////////
-//
-// CAMInstOptsParser
-//
-///////////////////////////////////////////////////
-
-CAMInstOptsParser * CAMInstOptsParser::NewLC( const TDesC8 &aBuffer, NApplicationManagement::TAMInstallOptions &aResult )
-	{
-	CAMInstOptsParser *self = new ( ELeave ) CAMInstOptsParser( aBuffer, aResult );
-	CleanupStack::PushL( self );
-	self->ConstructL() ;
-	return self ;
-	}
-	
-CAMInstOptsParser *CAMInstOptsParser::NewL( const TDesC8 &aBuffer, 
-	NApplicationManagement::TAMInstallOptions &aResult )	
-	{
-	CAMInstOptsParser *self = NewLC ( aBuffer, aResult );
-	CleanupStack::Pop( self );
-	return self ;
-	}
-	
-CAMUninstOptsParser * CAMUninstOptsParser::NewLC( const TDesC8 &aBuffer, SwiUI::TUninstallOptions &aResult )
-	{
-	CAMUninstOptsParser *self = new ( ELeave ) CAMUninstOptsParser( aBuffer, aResult );
-	CleanupStack::PushL( self );
-	self->ConstructL() ;
-	return self ;
-	}
-	
-CAMUninstOptsParser *CAMUninstOptsParser::NewL( const TDesC8 &aBuffer, 
-	SwiUI::TUninstallOptions &aResult )	
-	{
-	CAMUninstOptsParser *self = NewLC ( aBuffer, aResult );
-	CleanupStack::Pop( self );
-	return self ;
-	}
-	
-	
-CAMInstOptsParser::~CAMInstOptsParser()
-	{
-	
-	}
-	
-	
-void CAMInstOptsParser::OnStartElementL(const Xml::RTagInfo& aElement, 
-		const Xml::RAttributeArray& aAttributes, 
-		#ifdef _DEBUG 
-			TInt aErrorCode
-		#else 
-			TInt /*aErrorCode*/
-		#endif 
-		)
-	{
-	
-#ifdef _DEBUG
-	RDEBUG8_3( "CAMInstOptsParser::OnStartElementL (LocalName '%S', aErrorCode %d)", 
-		&aElement.LocalName().DesC(),aErrorCode );
-	TInt count2( aAttributes.Count() );
-	for( TInt i( 0 ); i < count2; i++ )
-		{
-		RDEBUG8_5( "   Attribute %d, type=%d, '%S'='%S' ",i,aAttributes[i].Type(), 
-		 &aAttributes[i].Value().DesC(), &aAttributes[i].Attribute().LocalName().DesC() );
-		
-		}
-#endif
-
-	using namespace AMXml;
-
-	
-	const TPtrC8 name( aElement.LocalName().DesC() );
-	if ( name == Reader::KIOStartElement )
-		{
-		
-		if ( aAttributes.Count() == 1 )
-			{
-			TPtrC8 attrname( aAttributes[0].Attribute().LocalName().DesC() );
-			if ( attrname == KIOAttrNameDefaultPolicy)
-				{
-				
-				using namespace SwiUI;
-				TPtrC8 attrval( aAttributes[0].Value().DesC() );
-				if ( attrval == KIOMissingOptionPolicyValFail)
-					{
-					iDefaultPolicy = EPolicyNotAllowed;
-					}
-				else
-					{
-					iDefaultPolicy = EPolicyUserConfirm;
-					}
-				}
-			}
-		}
-	else if ( name != Reader::KIOCustSymOpts )
-		{
-		RDEBUG8_2( "   Processing element '%S'", &name );
-		TInt c( aAttributes.Count() );
-		if ( c == 2 )
-			{
-			TPtrC8 attrname( aAttributes[0].Attribute().LocalName().DesC() );
-			TPtrC8 attrnameval( aAttributes[0].Value().DesC() );
-			TPtrC8 attrval( aAttributes[1].Attribute().LocalName().DesC() );
-			TPtrC8 attrvalval( aAttributes[1].Value().DesC() );
-			RDEBUG8_5( "   Name '%S'='%S' Val '%S'='%S' ",&attrname, &attrnameval,
-				&attrval, &attrvalval );
-			if ( attrname == Reader::KIOAttrName )
-				{
-				if ( attrval == Reader::KIOAttrValue )
-					{
-					if ( name == Reader::KIOStdOpt )
-						{
-						if ( attrnameval == KIODrive )
-							{
-							TInt len = attrvalval.Length();
-							if (len == 0)
-								{
-								TChar KDefaultDrive = 'c';
-								iResult.iOptions.iDrive = KDefaultDrive;
-								//RDEBUG8_2( " Set drive to %c ", iResult.iOptions.iDrive );
-								}
-							else
-								{
-								RDEBUG8_2( " Setting drive to %c ", attrvalval[0] );
-								iResult.iOptions.iDrive = attrvalval[0];		
-								}
-							}
-						else if ( attrnameval == KIOLanguage )
-							{
-							if ( attrvalval == KIODefaultLanguage )
-								{
-								iResult.iOptions.iUsePhoneLang = ETrue;
-								}
-							else
-								{
-								for( TInt i( 0 ); i < KNumLangOptions; i++ )
-									{
-									if ( attrvalval == TPtrC8( KLangOptions[i].iCode ) )
-										{
-									#ifdef _DEBUG
-										TPtrC8 code( KLangOptions[i].iCode );
-										RDEBUG8_2( " OnStartElementL : Found language %S", &code);
-									#endif
-										iResult.iOptions.iLang = KLangOptions[i].iLang; 
-										break;
-										}
-									}	
-								}
-							
-							}
-						else if ( attrnameval == KIOUpgrade )
-							{
-							RDEBUG8_2( " Setting Upgrade to %S ", &attrvalval );
-							SetPolicyValue( iResult.iOptions.iUpgrade, attrvalval );
-							}
-						else if ( attrnameval == KIOKill )
-							{
-							RDEBUG8_2( " Setting iKillApp to %S ", &attrvalval );
-							SetPolicyValue( iResult.iOptions.iKillApp, attrvalval );
-							}
-						else if ( attrnameval == KIOHttpUsername )
-							{
-							RDEBUG8_2( " Setting iLogin to %S ", &attrvalval );
-							iResult.iOptions.iLogin.Copy( attrvalval.Left( SwiUI::KSWInstMaxUserNameLength ) );
-							}
-						else if ( attrnameval == KIOHttpPassword )
-							{
-							RDEBUG8_2( " Setting iPassword to %S ", &attrvalval );
-							iResult.iOptions.iPassword.Copy( attrvalval.Left( SwiUI::KSWInstMaxPasswordLength ) );
-							}
-						else if ( attrnameval == KIODownload )
-							{
-							RDEBUG8_2( " Setting iDownload to %S ", &attrvalval );
-							SetPolicyValue( iResult.iOptions.iDownload, attrvalval );
-							}
-						else if ( attrnameval == KIOIAP )
-							{
-							RDEBUG8_2( " Setting iConRef to %S ", &attrvalval );
-							iResult.iConRef = attrvalval;
-							
-							
-							}
-							/*
-	_LIT8( KIOIAP, "iap" );
-*/
-
-						else 
-							{
-							RDEBUG8_3( " WARNING Unsupported name attribute value: '%S' for '%S' ", &attrnameval, &name );
-							}
-						}
-					else if ( name == Reader::KIOStdSymOpt )
-						{
-						if ( attrnameval == KIOCapabilities )
-							{
-							RDEBUG8_2( " Setting iCapabilities to %S ", &attrvalval );
-							SetPolicyValue( iResult.iOptions.iCapabilities, attrvalval );
-							}
-						else if ( attrnameval == KIOUntrusted )
-							{
-							RDEBUG8_2( " Setting iUntrusted to %S ", &attrvalval );
-							SetPolicyValue( iResult.iOptions.iUntrusted, attrvalval );
-							}
-						else if ( attrnameval == KIOPkginfo )
-							{
-							RDEBUG8_2( " Setting iPackageInfo to %S ", &attrvalval );
-							SetPolicyValue( iResult.iOptions.iPackageInfo, attrvalval );
-							}
-						else if ( attrnameval == KIOOCSP )
-							{
-							RDEBUG8_2( " Setting iOCSP to %S ", &attrvalval );
-							SetPolicyValue( iResult.iOptions.iOCSP, attrvalval );
-							}
-						else if ( attrnameval == KIOOCSPWarning )
-							{
-							RDEBUG8_2( " Setting iIgnoreOCSPWarnings to %S ", &attrvalval );
-							SetPolicyValue( iResult.iOptions.iIgnoreOCSPWarnings, attrvalval );
-							}
-						else if ( attrnameval == KIOOptionalItems )
-							{
-							RDEBUG8_2( " Setting iOptionalItems to %S ", &attrvalval );
-							SetPolicyValue( iResult.iOptions.iOptionalItems, attrvalval );
-							}
-						else if ( attrnameval == KIOOverwrite )
-							{
-							RDEBUG8_2( " Setting iOverwrite to %S ", &attrvalval );
-							SetPolicyValue( iResult.iOptions.iOverwrite, attrvalval );
-							}	
-						else if ( attrnameval == KIOUpgradeData )
-							{
-							RDEBUG8_2( " Setting iUpgradeData to %S ", &attrvalval );
-							SetPolicyValue( iResult.iOptions.iUpgradeData, attrvalval );
-							}	
-							
-						else
-							{
-							RDEBUG8_3( " WARNING Unsupported name sym attribute value: '%S' for '%S' ", &attrnameval, &name );
-							}
-						}
-					else
-						{
-						RDEBUG("WARNING, unsupported name attribute!");
-						}
-					}
-				else
-					{
-					RDEBUG8_3( " ERROR invalid second attribute!: '%S', expteced: '%S' ", &attrval, &Reader::KIOAttrValue() );
-					}
-				}
-			else
-				{
-				RDEBUG8_3( " ERROR invalid first attribute!: '%S', expteced: '%S' ", &attrname, &Reader::KIOAttrName() );
-				}
-			}
-		else
-			{
-			RDEBUG8_3( " ERROR unsupported count of attributes!!: '%d' for '%S' ", c, &name);
-			}
-		}
-	else
-		{
-		RDEBUG( " ERROR custom options not implemented!!!!" );
-	
-		}
-	}
-	
-
-///////////////////////////////////////////////////
-//
-// CAMUninstOptsParser
-//
-///////////////////////////////////////////////////
-
-CAMUninstOptsParser::~CAMUninstOptsParser()
-	{
-	
-	}
-	
-void CAMUninstOptsParser::OnStartElementL(const Xml::RTagInfo& aElement, 
-		const Xml::RAttributeArray& aAttributes, 
-		#ifdef _DEBUG 
-			TInt aErrorCode
-		#else 
-			TInt /*aErrorCode*/
-		#endif 
-		)
-	{
-	
-#ifdef _DEBUG
-	RDEBUG8_3( "CAMUninstOptsParser::OnStartElementL (LocalName '%S', aErrorCode %d)", 
-		&aElement.LocalName().DesC(),aErrorCode );
-	TInt count2( aAttributes.Count() );
-	for( TInt i( 0 ); i < count2; i++ )
-		{
-		RDEBUG8_5( "   Attribute %d, type=%d, '%S'='%S' ",i,aAttributes[i].Type(), 
-		 &aAttributes[i].Value().DesC(), &aAttributes[i].Attribute().LocalName().DesC() );
-		
-		}
-#endif
-
-	using namespace AMXml;
-
-	
-	const TPtrC8 name( aElement.LocalName().DesC() );
-	if ( name == Reader::KIOStartElement )
-		{
-		
-		}
-	else if ( name != Reader::KIOCustSymOpts )
-		{
-		RDEBUG8_2( "   Processing element '%S'", &name );
-		TInt c( aAttributes.Count() );
-		if ( c == 2 )
-			{
-			TPtrC8 attrname( aAttributes[0].Attribute().LocalName().DesC() );
-			TPtrC8 attrnameval( aAttributes[0].Value().DesC() );
-			TPtrC8 attrval( aAttributes[1].Attribute().LocalName().DesC() );
-			TPtrC8 attrvalval( aAttributes[1].Value().DesC() );
-			RDEBUG8_5( "   Name '%S'='%S' Val '%S'='%S' ",&attrname, &attrnameval,
-				&attrval, &attrvalval );
-			if ( attrname == Reader::KIOAttrName )
-				{
-				if ( attrval == Reader::KIOAttrValue )
-					{
-					if ( name == Reader::KIOStdOpt )
-						{
-						if ( attrnameval == KIOKill )
-							{
-							RDEBUG8_2( " Setting iKillApp to %S ", &attrvalval );
-							SetPolicyValue( iResult.iKillApp, attrvalval );
-							}
-						else 
-							{
-							RDEBUG8_3( " WARNING Unsupported name attribute value: '%S' for '%S' ", &attrnameval, &name );
-							}
-						}
-					else if ( name == Reader::KIOStdSymOpt )
-						{
-						if ( attrnameval == KUIOBreakDependency )
-							{
-							RDEBUG8_2( " Setting iDependecyBreak to %S ", &attrvalval );
-							SetPolicyValue( iResult.iBreakDependency, attrvalval );
-							}
-						else
-							{
-							RDEBUG8_3( " WARNING Unsupported name attribute value: '%S' for '%S' ", &attrnameval, &name );
-							}
-						}
-					else
-						{
-						RDEBUG("WARNING, unsupported name attribute value");
-						}
-					}
-				else
-					{
-					RDEBUG8_3( " ERROR invalid second attribute!: '%S', expteced: '%S' ", &attrval, &Reader::KIOAttrValue() );
-					}
-				}
-			else
-				{
-				RDEBUG8_3( " ERROR invalid first attribute!: '%S', expteced: '%S' ", &attrname, &Reader::KIOAttrName() );
-				}
-			}
-		else
-			{
-			RDEBUG8_3( " ERROR unsupported count of attributes!!: '%d' for '%S' ", c, &name);
-			}
-		}
-	else
-		{
-		RDEBUG( " ERROR custom options not implemented!!!!" );
-		
-		}
-	}
-	
-
-///////////////////////////////////////////////////
-//
-// InstallOptionsParser
-//
-///////////////////////////////////////////////////
-
-EXPORT_C void InstallOptionsParser::ParseOptionsL( const TDesC8 &aBuffer, SwiUI::TInstallOptions &aResult)
-	{
-	NApplicationManagement::TAMInstallOptions opts;
-	opts.iOptions.iUsePhoneLang = EFalse;
-	CAMInstOptsParser *parser = CAMInstOptsParser::NewLC( aBuffer, opts );
-	parser->ParseL();
-	aResult = opts.iOptions;
-	CleanupStack::PopAndDestroy( parser );
-	}
-	
-EXPORT_C void InstallOptionsParser::ParseOptionsL( const TDesC8 &aBuffer, NApplicationManagement::TAMInstallOptions &aResult)
-	{
-	aResult.iOptions.iUsePhoneLang = EFalse;
-	CAMInstOptsParser *parser = CAMInstOptsParser::NewLC( aBuffer, aResult );
-	parser->ParseL();
-	CleanupStack::PopAndDestroy( parser );
-	}
-	
-EXPORT_C void InstallOptionsParser::ParseOptionsL( const TDesC8 &aBuffer, SwiUI::TUninstallOptions &aResult)
-	{
-	CAMUninstOptsParser *parser = CAMUninstOptsParser::NewLC( aBuffer, aResult );
-	parser->ParseL();
-	CleanupStack::PopAndDestroy( parser );
-	}
-	
-EXPORT_C void InstallOptionsParser::SerializeOptionsL( const SwiUI::TUninstallOptions  &aOptions, CBufBase &aResult )
-	{
-	using namespace AMXml;
-	using namespace AMXml::Writer;
-	using namespace SwiUI;
-
-	aResult.InsertL(aResult.Size(), Writer::KUIOStartElement );
-	
-	HBufC8 *tmp = HBufC8::NewLC( 128 );
-	TPtr8 ptmp( tmp->Des() );
-	
-	if ( aOptions.iKillApp != EPolicyUserConfirm )
-		{
-		ptmp.Format( KIOStdOptFormat, &KIOKill, ( aOptions.iKillApp == EPolicyAllowed ? &KIOValueTrue : &KIOValueFalse ) );
-		aResult.InsertL( aResult.Size(), ptmp );
-		}
-	if ( aOptions.iBreakDependency != EPolicyUserConfirm )
-		{
-		ptmp.Format( KIOStdSymOptFormat, &KUIOBreakDependency, ( aOptions.iKillApp == EPolicyAllowed ? &KIOValueTrue : &KIOValueFalse ) );
-		aResult.InsertL( aResult.Size(), ptmp );
-		}
-	aResult.InsertL(aResult.Size(), Writer::KUIOStartElementEnd );
-	
-	CleanupStack::PopAndDestroy( tmp );
-	}
-
-EXPORT_C void InstallOptionsParser::SerializeOptionsL( const SwiUI::TInstallOptions &aOptions, CBufBase &aResult )
-	{
-	NApplicationManagement::TAMInstallOptions options;
-	options.iOptions = aOptions;
-	SerializeOptionsL( options, aResult );
-	}
-	
-EXPORT_C void InstallOptionsParser::SerializeOptionsL( const NApplicationManagement::TAMInstallOptions &aOptions, CBufBase &aResult )
-	{
-		
-	using namespace AMXml;
-	using namespace AMXml::Writer;
-	using namespace SwiUI;
-	
-	const SwiUI::TInstallOptions &options = aOptions.iOptions;
-	
-	aResult.InsertL(aResult.Size(), Writer::KIOStartElement );
-	
-	HBufC8 *tmp = HBufC8::NewLC( 128 );
-	TPtr8 ptmp( tmp->Des() );
-	TBuf8<1> b ;
-	b.Append( options.iDrive );
-	ptmp.Format( KIOStdOptFormat, &KIODrive, &b );
-	aResult.InsertL( aResult.Size(), ptmp );
-	
-	if( options.iUsePhoneLang )
-		{
-		ptmp.Format( KIOStdOptFormat, &KIOLanguage, &KIODefaultLanguage )	;
-		}
-	else
-		{
-		if( options.iLang != ELangNone )
-			{
-			TBool found( EFalse );
-			for( TInt i( 0 ); !found && i < KNumLangOptions; i++ )
-				{
-				if ( KLangOptions[i].iLang == options.iLang )
-					{
-				#ifdef _DEBUG
-		 		 	TPtrC8 code( KLangOptions[i].iCode );
-				 	RDEBUG8_2( " InstallOptionsParser::SerializeOptionsL : Found language %S", &code );
-				#endif
-					TPtrC8 p( KLangOptions[i].iCode );
-					ptmp.Format( KIOStdOptFormat, &KIOLanguage, &p )	;
-					
-					found = ETrue;
-					}
-				}
-			if ( !found )
-				{
-				ptmp.Format( KNullDesC8() );
-				}
-			}
-		else
-			{
-			ptmp.Format( KNullDesC8() );
-			}
-		}
-	aResult.InsertL( aResult.Size(), ptmp );
-	
-	if ( options.iUpgrade != EPolicyUserConfirm )
-		{
-		ptmp.Format( KIOStdOptFormat, &KIOUpgrade, ( options.iUpgrade == EPolicyAllowed ? &KIOValueTrue : &KIOValueFalse ) );
-		aResult.InsertL( aResult.Size(), ptmp );
-		
-		}
-	if ( options.iKillApp != EPolicyUserConfirm )
-		{
-		ptmp.Format( KIOStdOptFormat, &KIOKill, ( options.iKillApp == EPolicyAllowed ? &KIOValueTrue : &KIOValueFalse ) );
-		aResult.InsertL( aResult.Size(), ptmp );
-		}
-	if ( options.iPackageInfo != EPolicyUserConfirm )
-		{
-		ptmp.Format( KIOStdSymOptFormat, &KIOPkginfo, ( options.iPackageInfo == EPolicyAllowed ? &KIOValueTrue : &KIOValueFalse ) );
-		aResult.InsertL( aResult.Size(), ptmp );
-		}	
-	if ( options.iCapabilities != EPolicyUserConfirm )
-		{
-		ptmp.Format( KIOStdSymOptFormat, &KIOCapabilities, ( options.iCapabilities == EPolicyAllowed ? &KIOValueTrue : &KIOValueFalse ) );
-		aResult.InsertL( aResult.Size(), ptmp );
-		}
-	if ( options.iUntrusted != EPolicyUserConfirm )
-		{
-		ptmp.Format( KIOStdSymOptFormat, &KIOUntrusted, ( options.iUntrusted == EPolicyAllowed ? &KIOValueTrue : &KIOValueFalse ) );
-		aResult.InsertL( aResult.Size(), ptmp );
-		}	
-	if ( options.iOCSP != EPolicyUserConfirm )
-		{
-		ptmp.Format( KIOStdSymOptFormat, &KIOOCSP, ( options.iOCSP == EPolicyAllowed ? &KIOValueTrue : &KIOValueFalse ) );
-		aResult.InsertL( aResult.Size(), ptmp );
-		}	
-	if ( options.iIgnoreOCSPWarnings != EPolicyUserConfirm )
-		{
-		ptmp.Format( KIOStdSymOptFormat, &KIOOCSPWarning, ( options.iIgnoreOCSPWarnings == EPolicyAllowed ? &KIOValueTrue : &KIOValueFalse ) );
-		aResult.InsertL( aResult.Size(), ptmp );
-		}	
-	if ( options.iOptionalItems != EPolicyUserConfirm )
-		{
-		ptmp.Format( KIOStdSymOptFormat, &KIOOptionalItems, ( options.iOptionalItems == EPolicyAllowed ? &KIOValueTrue : &KIOValueFalse ) );
-		aResult.InsertL( aResult.Size(), ptmp );
-		}	
-	if ( options.iOverwrite != EPolicyUserConfirm )
-		{
-		ptmp.Format( KIOStdSymOptFormat, &KIOOverwrite, ( options.iOverwrite == EPolicyAllowed ? &KIOValueTrue : &KIOValueFalse ) );
-		aResult.InsertL( aResult.Size(), ptmp );
-		}	
-	if ( options.iUpgradeData != EPolicyUserConfirm )
-		{
-		ptmp.Format( KIOStdSymOptFormat, &KIOUpgradeData, ( options.iUpgradeData == EPolicyAllowed ? &KIOValueTrue : &KIOValueFalse ) );
-		aResult.InsertL( aResult.Size(), ptmp );
-		}	
-	if ( options.iDownload != EPolicyUserConfirm )
-		{
-		ptmp.Format( KIOStdOptFormat, &KIODownload, ( options.iDownload == EPolicyAllowed ? &KIOValueTrue : &KIOValueFalse ) );
-		aResult.InsertL( aResult.Size(), ptmp );
-		}
-	if ( options.iPassword != KNullDesC() )
-		{
-        TBuf8<KSWInstMaxPasswordLength> password;        
-		password.Copy( options.iPassword );
-		ptmp.Format( KIOStdOptFormat, &KIOHttpPassword, &password );
-		aResult.InsertL( aResult.Size(), ptmp );
-		}
-	if ( options.iLogin != KNullDesC() )
-		{
-		TBuf8<KSWInstMaxUserNameLength> login;
-		login.Copy( options.iLogin );
-		ptmp.Format( KIOStdOptFormat, &KIOHttpUsername, &login );
-		aResult.InsertL( aResult.Size(), ptmp );
-		}	
-	if ( aOptions.iConRef != KNullDesC8() )
-		{
-		ptmp.Format( KIOStdOptFormat, &KIOIAP, &aOptions.iConRef);
-		aResult.InsertL( aResult.Size(), ptmp );
-		}
-	aResult.InsertL( aResult.Size(), KIOStartElementEnd );
-	
-	CleanupStack::PopAndDestroy( tmp );
-	}
-	
-// End of File
Binary file applicationmanagement/rom/1020781C.txt has changed
--- a/applicationmanagement/rom/appmgmt.iby	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of applicationmanagement components
-*
-*/
-
-#ifndef __APPLICATIONMANAGEMENT_IBY__
-#define __APPLICATIONMANAGEMENT_IBY__
-
-//#if defined(__SAP_APPLICATION_MANAGEMENT)
-	
-	S60_APP_EXE(ApplicationManagement)
-
-      S60_APP_RESOURCE( ApplicationManagement )
-      
-      // _reg.rsc has to be in "import" folder to allow updating application exe with a SISX-file
-    data=\EPOC32\DATA\Z\private\10003a3f\apps\ApplicationManagement_reg.RSC \private\10003a3f\import\apps\ApplicationManagement_reg.RSC
-
-	file=ABI_DIR\BUILD_DIR\ApplicationManagement.dll		SHARED_LIB_DIR\ApplicationManagement.dll
-	
-	ECOM_PLUGIN(RfsAppMgmtPlugin.dll,102073BF.rsc)
-      ECOM_PLUGIN(omascomoadapter.dll, omascomoadapter.rsc)
-
-       data=ZPRIVATE\100012a5\policy\20021335.spd      PRIVATE\100012a5\policy\20021335.spd
-
-       data=ZPRIVATE\100012a5\policy\1020781C.spd      PRIVATE\100012a5\policy\1020781C.spd
-
-	
-//#endif // #ifdef __SAP_APPLICATION_MANAGEMENT
-
-#endif
--- a/applicationmanagement/server/group/ApplicationManagementServer.mmp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,146 +0,0 @@
-/*
-* 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:  Implementation of applicationmanagement components
-*
-*/
-  
-
-// To get the APP_LAYER_SYSTEMINCLUDE-definition
-#include <platform_paths.hrh>
-#include "defaultcaps.hrh"
-#include "defaultcaps.hrh"
-#include <bldvariant.hrh>
-#include <data_caging_paths.hrh>
-
-TARGET             applicationmanagement.exe
-EPOCSTACKSIZE      0x5000
-targettype         exe
-
-//MACRO __AM_CONNECT_INSTALLER_ONSTARTUP_
-
-UID             0x100039CE 0x1020781C 
-//SECUREID		  0x1020781C
-
-CAPABILITY    	CAP_SERVER TrustedUI DiskAdmin AllFiles NetworkControl  
-//last two capabilities are added to read pre-instaled apps directory 
-VENDORID 		    VID_DEFAULT
-
-START RESOURCE applicationmanagement.rss
-HEADER
-TARGETPATH APP_RESOURCE_DIR
-LANGUAGE_IDS
-END
-
-START RESOURCE ApplicationManagement_reg.rss
-DEPENDS applicationmanagement.rsg
-// Do not change the UID below.
-TARGETPATH /private/10003a3f/apps
-END
-SOURCEPATH    	../src
-SOURCE        	ApplicationManagementServer.cpp
-SOURCE		  		AMDeploymentComponent.cpp
-SOURCE		  		AMDeploymentComponentData.cpp
-SOURCE		  	AMDownloadManager.cpp
-SOURCE		  		AMDownload.cpp
-SOURCE		  	AMDownloader.cpp
-SOURCE 		  		amstorage.cpp
-SOURCE		  		AMSmlHelper.cpp
-SOURCE					ApplicationManagementUtility.cpp
-SOURCE					nsmldmiapmatcher.cpp
-SOURCE					nsmldmuri.cpp
-SOURCE					AMAppHideUtil.cpp
-SOURCE				AMDownloaddb.cpp
-SOURCE			AppMgmtSrvApp.cpp
-SOURCE			AppMgmtSrvDocument.cpp
-SOURCE			AppMgmtSrvUi.cpp
-SOURCE			AppMgmtProgDialog.cpp
-SOURCE 			AMPreInstallApp.cpp
-
-
-#ifdef __JAVA_MIDP20
-SOURCE					ApplicationManagementJavaUtilityFactory.cpp
-SOURCE					ApplicationManagementJavaUtility.cpp
-#else
-SOURCE					ApplicationManagementUtilityFactory.cpp
-#endif
-
-USERINCLUDE   	. ../inc 
-USERINCLUDE     ../../inc
-USERINCLUDE 		../../options/inc
-
-#ifdef __USE_AMINSTALLER__
-USERINCLUDE 		../installer/inc 
-#endif
-
-APP_LAYER_SYSTEMINCLUDE
-SYSTEMINCLUDE 	/epoc32/include/ecom
-SYSTEMINCLUDE		/epoc32/include/swi
-#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
-SYSTEMINCLUDE 	/epoc32/include/platform/mw/swi
-#endif
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-SYSTEMINCLUDE 	/epoc32/include/devman
-#else
-// nothing
-#endif
-
-LIBRARY         euser.lib edbms.lib sysutil.lib 
-LIBRARY         efsrv.lib esock.lib
-LIBRARY         bafl.lib 
-LIBRARY			centralrepository.lib 
-LIBRARY 		estor.lib 
-LIBRARY 		sisregistryclient.lib
-LIBRARY 		aminstalloptions.lib
-LIBRARY			sisxfile.lib 
-LIBRARY 		swidataprovider.lib 
-LIBRARY 		siscontroller.lib
-LIBRARY		imut.lib
-LIBRARY		downloadmgr.lib
-LIBRARY 	swinstcli.lib
-LIBRARY         drmhelper.lib
-LIBRARY         drmlicensemanager.lib
-LIBRARY         ezip.lib
-LIBRARY         platformenv.lib
-#ifdef __TARM_SYMBIAN_CONVERGENCY
- LIBRARY				dmtreeclient.lib
- LIBRARY				SmlClient.lib
-#else
- LIBRARY				nsmldmtreedbhandler.lib
- LIBRARY  			syncmlclientapi.lib
- LIBRARY 				nsmldmmodule.lib
- LIBRARY 				nsmldmtreedbclient.lib connmon.lib commonengine.lib
- LIBRARY     		nsmltransporthandler.lib
-LIBRARY     		nsmltransport.lib cone.lib javaregistryclient.lib avkon.lib eikcore.lib  apparc.lib
-#endif // __TARM_SYMBIAN_CONVERGENCY
-
-#ifdef __JAVA_MIDP20
-//LIBRARY     javaregistry.lib   
-#endif
-LIBRARY			featmgr.lib 
-
-//#ifdef __SAP_POLICY_MANAGEMENT
-LIBRARY 		policyengine.lib 
-//#endif
-
-LIBRARY 		flogger.lib syncservice.lib
-LIBRARY			apengine.lib aknskins.lib aknskinsrv.lib
-LIBRARY     commdb.lib aknnotify.lib eiksrv.lib apgrfx.lib ws32.lib eikctl.lib
-LIBRARY     ecom.lib
-LIBRARY             caf.lib
-
-
-SMPSAFE
-// End of File
-
--- a/applicationmanagement/server/group/ApplicationManagement_reg.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
- *
- * Description:  Implementation of applicationmanagement components
- *
-*/
-
-
-#include <appinfo.rh>
-#include <applicationmanagement.rsg>
-
-#include <data_caging_paths_strings.hrh>
-
-UID2 KUidAppRegistrationResourceFile
-UID3 0x1020781C  // Define your application UID here
-
-RESOURCE APP_REGISTRATION_INFO
-    {
-    app_file 			= "ApplicationManagement";
-    localisable_resource_file = APP_RESOURCE_DIR"\\ApplicationManagement";
-    localisable_resource_id = R_APPLICATIONMANAGEMENT_LOCALISABLE_APP_INFO;
-    hidden					= KAppIsHidden;
-	embeddability			= KAppEmbeddable;
-    newfile 				= KAppSupportsNewFile;
-	launch					= KAppLaunchInBackground;
-    }
-
-// End of File
--- a/applicationmanagement/server/group/applicationmanagement.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,105 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
- *
- * Description:  Implementation of applicationmanagement components
- *
-*/
-
-//  RESOURCE IDENTIFIER
-NAME    SIVA // 4 letter ID
-
-
-//  INCLUDES
-#include <bldvariant.hrh>
-#include <eikon.rh>
-#include <uikon.rh>
-#include <avkon.rsg>
-#include <avkon.rh>
-#include <avkon.mbg>
-#include <avkon.hrh>
-#include <AvkonIcons.hrh>
-#include <avkon.loc>
-#include <CommonDialogs.rh>
-#include <CommonDialogs.hrh>
-#include <data_caging_paths_strings.hrh>
-//#include "fotaserver.loc"
-
-//
-// AIF icons/files
-//
-#include <appinfo.rh>
-#include <applicationmanagement.loc>
-
-//  CONSTANTS  
-
-//  RESOURCE DEFINITIONS 
-
-RESOURCE RSS_SIGNATURE { }
-
-RESOURCE TBUF { buf = "ApplicationManagement"; }
-
-RESOURCE EIK_APP_INFO
-	{
-      
-	}
-
-RESOURCE TBUF r_progress_downloading
-    {
-    buf = qtn_dm_wait_downloading;
-    }
-
-RESOURCE TBUF r_download_cancelled
-    {
-    buf = qtn_dm_query_download_cancelled;
-    }
-
-//
-// AIF icons/files
-//
-RESOURCE LOCALISABLE_APP_INFO r_applicationmanagement_localisable_app_info
-    {
-    caption_and_icon = 
-    CAPTION_AND_ICON_INFO
-        {
-        number_of_icons = 0;
-        };
-    }
-
-RESOURCE DIALOG r_progress_note
-    {
-    flags = EAknProgressNoteFlags;
-    buttons = R_AVKON_SOFTKEYS_CANCEL;
-    items =
-        {
-        DLG_LINE
-            {
-            type = EAknCtNote;
-            id = EGeneralNote;
-            control = AVKON_NOTE
-                {
-                layout = EProgressLayout;
-                singular_label =qtn_dm_wait_downloading;
-                };
-            }
-        };
-    }
-
-RESOURCE TBUF r_downloadfailed_connection
-    {
-    buf = qtn_dm_query_connection_failed;
-    }
-
-RESOURCE TBUF r_downloadfailed_general
-    {
-    buf = qtn_dm_query_general_failed;
-    }
--- a/applicationmanagement/server/group/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-/*
-* 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:  build info file for application management client & server
-*
-*/
-#include <platform_paths.hrh>
-
-PRJ_EXPORTS
-// ARMv5 udeb
-../src/1020781C.SPD        /epoc32/release/armv5/udeb/z/private/100012a5/policy/1020781C.SPD
-
-// ARMv5 urel
-../src/1020781C.SPD        /epoc32/release/armv5/urel/z/private/100012a5/policy/1020781C.SPD
-
-// WINSCW udeb
-../src/1020781C.SPD        /epoc32/release/winscw/udeb/z/private/100012a5/policy/1020781C.SPD
-
-// WINSCW urel
-../src/1020781C.SPD        /epoc32/release/winscw/urel/z/private/100012a5/policy/1020781C.SPD
-
-../src/1020781C.SPD        /epoc32/data/z/private/100012a5/policy/1020781C.SPD
-
-../loc/applicationmanagement.loc	APP_LAYER_LOC_EXPORT_PATH(applicationmanagement.loc)
-
-
-
-PRJ_MMPFILES
-
-ApplicationManagementServer.mmp
--- a/applicationmanagement/server/inc/AMAppHideUtil.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,105 +0,0 @@
-/*
- * 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: Implementation of applicationmanagement components
- *
- */
-
-
-#ifndef __AMAPPHIDEUTIL_H__
-#define __AMAPPHIDEUTIL_H__
-
-#include <e32base.h>
-
-
-
-namespace NApplicationManagement
-    {
-
-    typedef RArray<TUid> RUidArray;
-
-    class CAMAppHideUtil : public CBase
-        {
-        RUidArray iHiddenUids; // The hidden uid list
-        TBool iChanged;
-        /**
-         * Constructor
-         */
-        CAMAppHideUtil();
-
-
-        /**
-         * Second phase constructor. Loads the uid list from centrep.
-         */
-        void ConstructL();
-
-
-
-        void ParseUids( RUidArray &aUid, const TDesC8& aUidList );
-
-        /**
-         * Loads uids from centrep
-         */
-        void LoadUidsL();
-
-        /**
-         * Parses uid, returning KErrNone if successful
-         */ 
-        TInt ParseUid( TLex &aLex, TUid &aUid ) const;
-
-        /**
-         * Skips delimiter, returning ETrue if delimiter is expected one.
-         */
-        TBool SkipDelim( TLex &aLex ) const;
-
-        /**
-         * Puts aUid to aBuf and if aHasMore also adds delimiter
-         */
-        void PersistUid( const TUid &aUid, TDes &aBuf, TBool aHasMore ) const;
-    public:
-        /**
-         * Destructor
-         */
-        virtual ~CAMAppHideUtil();
-
-        /**
-         * Creates new CAMAppHideUtil instance
-         */
-        static CAMAppHideUtil* CAMAppHideUtil::NewL();
-
-        /**
-         * Adds uid to list, and updates the repository if needed
-         */
-        void AddUidL(const TUid& aUid, TBool aPersist = EFalse );
-
-        /**
-         * Removed uid from list, and updates the repository if needed
-         */
-        void RemoveUidL( const TUid& aUid, TBool aPersist = EFalse );
-
-        /**
-         * Writes uids to centrep
-         */
-        void PersistUidsL();
-
-        /**
-         * Resets the hidden uid array
-         */
-        void Reset();
-        };
-
-    }
-
-#endif // #ifdef __AMAPPHIDEUTIL_H__
-
-//  End of File
--- a/applicationmanagement/server/inc/AMDeploymentComponent.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,306 +0,0 @@
-/*
- * Copyright (c) 2000 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: Implementation of applicationmanagement components
- *
- */
-
-
-#ifndef __CAMDEPLOYMENTCOMPONENT__
-#define __CAMDEPLOYMENTCOMPONENT__
-
-#include <e32base.h>
-#include <centralrepository.h>
-#include <f32file.h> 
-#include <SyncMLDef.h>
-
-#include "ApplicationManagementCommon.h"
-#include "aminstalloptions.h"
-#include "amdeploymentcomponentdata.h"
-#include "AMDownload.h"
-#include<HttpDownloadMgrCommon.h>
-
-
-namespace NApplicationManagement
-    {
-
-
-    //const TInt KMaxURILength = 2048;
-    _LIT8( KAMDCDelimiter, "|" );
-
-    // FORWARD DECLARATIONS
-    class CDeploymentComponent;
-    class CAMDownload;
-
-
-    class MDownloadCallback
-        {
-    public:
-        virtual void DownloadComplete( class CDeploymentComponent *aComponent, TInt aStatus ) = 0;
-        virtual TBool UidExistsL( const TUid &aUid, CDeploymentComponent *& aCompo, CDeploymentComponent *aIgnored ) = 0;
-        };
-
-    class CDeploymentComponent : public CBase, public MAMDownloadStateObserver
-        {
-
-    public: // From MAMDownloadStateObserver	
-        void StatusUpdateL( TInt aNewStatus );
-        void SuccessStatusUpdateL( const TDesC &aDlFileName, const TDesC8& aDlMimeType );
-
-        void SetStatusNode(const TSCOMOStatusNodeStates &aStatus) const;
-    private:
-        // Data
-        TDeploymentComponentId iId;
-        TDeploymentComponentName iName;
-        TDeploymentComponentVersion iVersion;
-        TDeploymentComponentState iState;
-        TDeploymentComponentDescription iDescription;
-        TDeploymentComponentPkgId iPkgID;
-        TDeploymentComponentPkgIdRef iPkgIDRef;
-        TDeploymentComponentPkgType iPkgType;
-        TDeploymentComponentName iMidletName;
-        TDeploymentComponentName iMideltVendorName;
-        TDeploymentComponentVersion iMidletVersion;
-        TUint32 iInternalId;
-        TUid iUid;
-        TDCUserId iUserId;
-
-        CDeploymentComponentData *iMetaData;
-        CDeploymentComponentData *iData;
-        TAMInstallOptions iInstallOpts;
-        TBool iInstallOptsSet;
-        TUint32 iPkgVersion;
-        TBool iRemovableApp;
-
-        TInt iDownloadStatus;
-        mutable TInt iStatus;
-        TBuf8<KMaxUrlLength> iDownloadURI;
-        TDownloadTarget iDownloadTarget;
-        SwiUI::TUninstallOptions iUninstallOpts;
-
-        TInt iOwner; // TCertInfo index in CAMStorage::iCertificates
-        TDeploymentComponentState iOldState;
-        MDownloadCallback *iCallback; // not owned
-
-        TSmlProfileId iOwnerProfile; // profile stored only runtime until download has completed
-        CRepository *iRepository;
-
-        // Constructors	
-        CDeploymentComponent( TInt iInternalId ); 
-        static CDeploymentComponent* NewL( TInt iInternalId, const TDCUserId &aUserId);
-        static CDeploymentComponent* NewLC( TInt iInternalId, const TDCUserId &aUserId );
-        static CDeploymentComponent* LoadL( TInt iInternalId, const TDesC8 &aBuffer );
-        static CDeploymentComponent* LoadLC( TInt iInternalId, const TDesC8 &aBuffer );
-
-        void ConstructL( const TDCUserId &aUserId );
-        void ConstructLoadL( const TDesC8 &aBuffer );
-
-        void SetAttr( TDes8 &aAttr, const TDesC8 &aNewVal ) const;
-
-        /**
-         * @param aState The new state
-         * @return TInt KErrNone if all ok, system error code if visiblity change failed
-         */
-
-        TInt SetState( const TDeploymentComponentState &aState ) ;
-        /**
-	Returns number of bytes written to aBuffer
-         */
-        virtual TInt SerializedFormL( RWriteStream &aBuffer ) const;
-        /**
-	Returns length of serizlied form
-         */
-        virtual TInt SerializedFormLength() const;
-        HBufC8* IntToDes8LC( const TInt aLuid );
-    public:
-        virtual ~CDeploymentComponent();
-        TInt DownloadStatus() const;
-        inline const TDeploymentComponentId &ComponentId() const;
-
-        inline const TDeploymentComponentName &ComponentName() const;
-
-        inline const TDeploymentComponentVersion &ComponentVersion() const;
-
-        inline TDeploymentComponentState State() const;
-
-        inline const TUint32 InternalId() const;
-
-        inline const TUid & Uid() const;
-
-        //inline const TInt DownloadStatus() const;
-
-        inline const TDesC8 &DownloadURI() const ;
-
-        inline const TDeploymentComponentPkgId& PkgId() const ;
-
-        inline const TDeploymentComponentDescription& Description() const;
-
-        inline const TDeploymentComponentPkgIdRef& PkgIDRef() const;
-
-        inline const TDeploymentComponentPkgType& PkgType() const;
-
-        inline const TMidletnameName& MidletName() const;
-        inline const TMidletVendorName& MidletVendor() const;
-        inline const TMidletVersion& MidletVersion() const;
-
-
-
-        virtual void PersistL( CRepository &aRepository ) const;
-
-        virtual void DestroyL( CRepository &aRepository ) ;
-        /**
-	Copies current state to argument
-         */
-        void CopyStateTo( TDeploymentComponent &aInfo ) const;
-
-        void SetUid( const TUid aUid );
-
-        void Set( const TDeploymentComponent &aInfo );
-
-        void SetDownloadURIL( const TDesC8 &aURI );
-
-        void SetDownloadTarget( const TDownloadTarget& aDownloadTarget );
-
-        void SetDescriptionL( const TDesC8 &aVersion );
-
-        void SetPkgIDL( const TDesC8 &aPkgID );
-
-        void SetPkgTypeL( const TDesC8 &aPkgType );
-
-        void SetMidletNameL( const TDesC8 &aMidletName );
-
-        void SetMidletVendorL( const TDesC8 &aMidletVendor );
-
-        void SetMidletVersionL( const TDesC8 &aMidletVersion );
-
-        void SetAppRemovableStatus(const TBool &aRemovable);
-
-        void SetCallback( MDownloadCallback *aListener )
-            {
-            iCallback = aListener;
-            }
-
-
-        /**
-	UserId returns the id specified by user
-         */
-        inline const TDesC8& UserId() const;
-        /*
-         * Returns the status Node value of the Component ID.
-         * */
-        inline const TInt Status() const;
-
-        CDeploymentComponent &operator=( const CDeploymentComponent &aData );
-
-
-
-        /**
-         * SetIAPL Sets the iap
-         * @param The new iap id
-         */
-        void SetIAPL( const TInt aIap );
-
-
-        /**
-         * @return The iap id
-         */
-        TInt GetIAP() const;
-
-        /**
-         * IsJavaMimeL
-         * @return ETrue if mime is recognised Java mime
-         */
-        static TBool IsJavaMimeL( const TDesC8& aMime );
-        /**
-                 * IsSisMimeL
-                 * @return ETrue if mime is recognised Sis mime
-                 */
-                static TBool IsSisMimeL( const TDesC8& aMime );
-
-        /**
-         * DownloadFailed
-         * @return ETrue if download status is such that it indicates failure, EFalse otherwise
-         */
-        TBool DownloadFailed() const;
-
-        /**
-         * OwnerProfile returns the owner profile - -1 if there's no such
-         */
-        const TSmlProfileId& OwnerProfile() const;
-
-        /**
-         * OwnerProfile 
-         */
-        void SetOwnerProfile( TSmlProfileId aOwnerProfile);
-
-
-        /**
-         * MimeType
-         * @return Component mimetype. This can be mimetype from data or metadata. Usually metadata mimetype is returned in Java case.
-         * In case of Java if both Jad and Jar exist, then it is Jad mimetype.
-         * In case of Java if only Jar exist, then it is Jar mimetype.
-         * In case of Java if only Jad exist, the it is Jad mimetype.
-         */
-        const TDesC8& MimeType() const;
-
-
-    protected:
-
-        static CDeploymentComponent *LoadComponentL (  TInt aInternalId, const TDesC8 &aBuffer ) ;
-    public:
-        CDeploymentComponentData &Data();
-        const CDeploymentComponentData &Data() const;
-        CDeploymentComponentData &MetaData();
-        const CDeploymentComponentData &MetaData() const;
-        const TAMInstallOptions &InstallOpts() const;
-        const SwiUI::TUninstallOptions &UninstallOpts() const;
-        TBool InstallOptsSet() const;
-        TBool AppRemovable() const;
-        void SetDataL( const TDesC8 &aMimeType );
-        void SetMetaDataL( const TDesC8 &aMimeType );
-        void SetDataL( const TDesC8 &aData, const TDesC8 &aMimeType );
-        void SetDataL( const TDesC &aFileName, const TDesC8 &aMimeType );
-        void SetMetaDataL( const TDesC8 &aMetaData, const TDesC8 &aMimeType );
-        void SetInstallOptsL( const TDesC8 &aInstallOptions );
-        void ResetDataL( RFs &aFs );
-
-        void SetIdL( const TDesC8 &aId );
-        void SetNameL( const TDesC8 &aName );
-        void SetVersionL( const TDesC8 &aVersion );
-        void SetMimeTypeL( const TDesC8 &aMimeType );
-        void SetOwner( const TInt &aCertInfoId );
-        TInt Owner( ) const
-        {
-        return iOwner;
-        }
-        TDownloadTarget DownloadTarget() const
-        {
-        return iDownloadTarget;
-        }
-
-        inline const TDeploymentComponentState& OldState() const;
-
-        inline void StateChangeComplete();
-
-
-        friend class CDeliveryComponentStorage;
-        };
-
-#include "amdeploymentcomponent.inl"
-
-    }
-
-
-#endif	
-
-//  End of File
--- a/applicationmanagement/server/inc/AMDownload.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,117 +0,0 @@
-/*
- * Copyright (c) 2002-2004 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: Implementation of applicationmanagement components
- *
- */
-
-#ifndef __CAMDOWNLOAD_H__
-#define __CAMDOWNLOAD_H__
-
-#include <e32base.h>
-#include <downloadmgrclient.h>
-
-
-// FORWARD DECLARATIONS
-class RHttpDownload;
-
-namespace NApplicationManagement
-    {
-
-    // FORWARD DECLARATIONS
-    class CDeploymentComponent;
-    class CAMDownloader;
-
-    /**
-     * Mix in interface that will receive status updates
-     *	as the download progresses.
-     */
-    class MAMDownloadStateObserver
-        {
-public:
-        /**
-         * StatusUpdateL Sets the current download status. This is 
-         *	currently HTTP status code 
-         *	(200 is success, 400+ failure, 100-199 in progress)
-         * @param	aNewStatus	The new download status 
-         */
-        virtual void StatusUpdateL(TInt aNewStatus) = 0;
-        virtual void SuccessStatusUpdateL(const TDesC &aDlFileName,
-                const TDesC8& aDlMimeType) = 0;
-        };
-
-    class MAMDownloaderObserver
-        {
-public:
-        /* Whenever User cancels the download AM Download observes the event. If User cancels
-         * then calls download complete of AM Server*/
-        virtual void SetStatus(TInt aStatus) = 0;
-        };
-
-    /**
-     *  CAMDownload contains context info about specific download.
-     *
-     *  @since Series 
-     */
-    class CAMDownload : public CBase, public MAMDownloaderObserver
-        {
-private:
-        /**
-         * C++ default constructor.
-         */
-        CAMDownload(CDeploymentComponent *aComponent);
-
-        /**
-         * By default Symbian 2nd phase constructor is private.
-         */
-        void ConstructL(RHttpDownload& aDownload);
-
-public:
-        // Constructors and destructor
-
-        /**
-         * Two-phased constructor.
-         */
-        static CAMDownload* NewL(RHttpDownload& aDownload,
-                CDeploymentComponent *aComponent);
-
-        /**
-         * Destructor.
-         */
-        virtual ~CAMDownload();
-
-public:
-
-        TBool DownloadURIMatch(const TDesC8& aURI);
-
-        const TDesC8& DownloadURI();
-        const TDesC8& ContentMimeType();
-
-        TInt StartDownload();
-        TInt StopDownload();
-        TInt ContinueDownload();
-        void DownloadCompleted();
-        void DownloadFailedL(THttpDownloadState aDownloadState);
-        TInt32 DownloadErrorCodeL();
-        void ProgressDialogL(TInt32 aDownloadedSize, TInt32 aContentSize, THttpProgressState aState);
-        void SetStatus(TInt aStatus);
-
-private:
-        CAMDownloader* iDownloader; // owned				
-        CDeploymentComponent* iComponent; // NOT owned
-        };
-
-    } //namespace NApplicationManagement
-
-#endif // __CAMDOWNLOAD_H__
-// End of File
--- a/applicationmanagement/server/inc/AMDownloadManager.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,190 +0,0 @@
-/*
- * Copyright (c) 2002-2004 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: Implementation of applicationmanagement components
- *
- */
-
-#ifndef __CAMDOWNLOADMANAGER_H__
-#define __CAMDOWNLOADMANAGER_H__
-
-#include <e32base.h>
-#include <downloadmgrclient.h>
-
-#include "AMDeploymentComponent.h"
-#include "aminstalloptions.h"
-
-namespace NApplicationManagement
-    {
-
-    // FORWARD DECLARATIONS
-    class CDeploymentComponent;
-
-    // CLASS DECLARATION
-
-    class MDownloadMngrObserver
-        {
-public:
-        virtual void ComponentDownloadComplete(
-                class CDeploymentComponent *aComponent, TInt iapid,
-                HBufC8* aServerId) = 0;
-        virtual TBool HasUidL(const TUid &aUid,
-                CDeploymentComponent *& aCompo,
-                CDeploymentComponent *aIgnored) = 0;
-        };
-
-    /**
-     *  CAMDownloadManager lets AM to download content.
-     *
-     *  @since Series 
-     */
-    class CAMDownloadManager : public CBase, public MHttpDownloadMgrObserver,
-        public MDownloadCallback
-        {
-private:
-        /**
-         * C++ default constructor.
-         */
-        CAMDownloadManager(MDownloadMngrObserver& aObserver);
-
-        /**
-         * By default Symbian 2nd phase constructor is private.
-         */
-        void ConstructL();
-
-public:
-        // Constructors and destructor
-
-        /**
-         * Two-phased constructor.
-         */
-        static CAMDownloadManager* NewL(MDownloadMngrObserver& aObserver);
-        /**
-         * Destructor.
-         */
-        virtual ~CAMDownloadManager();
-
-public:
-        // From MHttpDownloadMgrObserver 
-
-        /**
-         * Indicates an event.
-         * @param aDownload The download with which the event occured.
-         * @param aEvent Event type.
-         * @return None.
-         */
-        void HandleDMgrEventL(RHttpDownload& aDownload,
-                THttpDownloadEvent aEvent);
-
-public:
-        // from MDownloadCallback
-
-        /**
-         * 
-         * @param aComponent 
-         * @param aStatus 
-         */
-        void DownloadComplete(CDeploymentComponent *aComponent, TInt aStatus);
-
-        /**
-         * Looks all deployments components and sis & java registries
-         * to find out whether given uid is already used...
-         * @param aUid The uid to be looked for
-         * @return ETrue if uid is found, EFalse otherwise
-         */
-        TBool UidExistsL(const TUid &aUid, CDeploymentComponent *& aCompo,
-                CDeploymentComponent *aIgnored);
-                
-        TBool IsOMASCOMOEnabledL();
-
-public:
-        // New functions
-
-        /**
-         *
-         */
-        void AddDownloadL(CDeploymentComponent *aComponent);
-
-        /**
-         *
-         */
-        TInt DownloadCount() const;
-
-        /**
-         *
-         */
-        //void CancelDownloads();		
-
-private:
-        void ConnectHttpDownloadMgrL();
-        RHttpDownload& CreateHttpDownloadL(CDeploymentComponent *aComponent);
-        void SetIAPL(CDeploymentComponent *aComponent);
-        void SetUserNamePassword(RHttpDownload& aDownload,
-                CDeploymentComponent *aComponent);
-        void SyncMLCurrentProfileIdL(TSmlProfileId& aOwnerProfile);
-
-        CAMDownload* FindDownload(const TDesC8& aURI);
-        CAMDownload* FindDownload(RHttpDownload& aDownload);
-        CAMDownload* FindDownload(CDeploymentComponent *aComponent);
-        void DownloadURI(RHttpDownload& aDownload, TDes8& aURI);
-
-        void HandlePausedEventL(CAMDownload& aDownload);
-        void HandleNonProgEventL(CAMDownload& aDownload);
-        void HandleContentTypeRecEventL(CAMDownload& aDownload);
-        void HandleDlCompletedEventL(CAMDownload& aDownload);
-        void HandleDlFailedEventL(CAMDownload& aDownload, THttpDownloadState aDownloadState);
-        void HandleDlDeleteEventL(CAMDownload* aDownload);
-
-        /**
-         * Completed download for component.
-         * @param aComponent The component which download is completed.
-         */
-        void DownloadCompleteL(CDeploymentComponent *aComponent);
-
-        /**
-         * Cancel downloading of content.
-         * @param aDownload The download which is  cancelled.
-         */
-        void CancelDownloadL(CAMDownload& aDownload);
-        void HandleAlreadyRunningL(TInt32 aDownloadedSize,
-                TInt32 aContentSize, CAMDownload& aDownload, THttpProgressState aState);
-
-public:
-        // Functions from base classes
-
-private:
-        // Data
-        RHttpDownloadMgr iDownloadMgr;
-        TBool iDownloadMgrConnected;
-        
-        RPointerArray<CAMDownload> iDownloads;
-        
-        RPointerArray<CAMDownload> iPrevDownloads;
-        
-        TInt iPrevDownldCount;
-        
-        MDownloadMngrObserver& iObserver;
-
-        TInt iapid;
-        HBufC8 *iServerId;
-        TBool iOMASCOMOEnabled;
-        TBool iNoteDisabled;
-        
-        };
-
-    } // namespace NApplicationManagement
-
-
-
-#endif // __CAMDOWNLOADMANAGER_H__
-// End of File
--- a/applicationmanagement/server/inc/AMDownloaddb.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,142 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
- *
- * Description:  Implementation of applicationmanagement components
- *
-*/
-
-
-#ifndef __AMDownloaddb_H
-#define __AMDownloaddb_H
-
-// INCLUDE FILES
-
-#include <e32std.h>
-#include <e32base.h>
-#include <d32dbms.h>
-#include <f32file.h>
-#include <SyncMLDef.h>
-
-// CONSTANTS
-
-// null final result value
-const TInt KAMNullResult = 0;
-
-// Database name & location
-const TInt KAMDownloaddbDrive = EDriveC;
-const TUid KAMPolicyUID =
-    {
-    0x1020781C
-    };
-const TInt KAMMaxPkgURLLength( 2048);
-const TInt KAMMaxPkgNameLength( 80);
-const TInt KAMMaxPkgVersionLength( 80);
-
-_LIT( KDBMSSecureID, "secure[1020781C]" );
-
-_LIT( KAMDownloaddbName, "c:TARMAppMgmtDownloadDB.db" );
-
-// Table and column names
-_LIT( KTableAMMgmtObject, "AMMgmtObject" );
-
-_LIT(NCol1, "Id");
-_LIT(NCol2, "LUID");
-_LIT(NCol3, "Result");
-_LIT(NCol4, "TargetURI");
-_LIT(NCol5, "IAPId");
-
-class CAMDbItem : public CBase
-    {
-public:
-    static CAMDbItem* NewL();
-    ~CAMDbItem();
-
-    TInt id;
-    TUint32 iLUID;
-    TInt iResult;
-
-    HBufC8* iTargetURI;
-
-    TUint32 iapid;
-
-    };
-
-// CLASS DECLARATION
-
-/**
- *  CAMDownloaddb provides an interface for accessing AM database.
- *  
- *  @lib AMadapter.lib
- *  
- */
-class CAMDownloaddb : public CBase
-    {
-
-public:
-
-    /**
-     * Two-phased constructor.
-     * @return A pointer to the newly created instance.
-     */
-    static CAMDownloaddb* NewL();
-
-    /**
-     * Two-phased constructor. Pushes the pointer onto the CleanupStack.
-     * @return A pointer to the newly created instance.
-     */
-    static CAMDownloaddb* NewLC();
-
-    /**
-     * Destructor.
-     */
-    virtual ~CAMDownloaddb();
-
-    void CreateTableL(RDbDatabase& aDatabase);
-
-    void CreateandOpenL(TParse& name);
-
-    TBool DeleteFromDatabaseL(TUint32 aLUID);
-
-    void SaveToDatabaseL(TInt& aIndex, TUint32 aLuid, TInt aResult,
-            const TDesC8& aTargetURI, TUint32 aIapid);
-
-    void ReadItemsL(RPointerArray<CAMDbItem>& aItemArray, TDesC& aQueryBuffer);
-
-    void ReadDbItemsL(RPointerArray<CAMDbItem>& aItemArray);
-
-    void GetEntryForLUIDL(RPointerArray<CAMDbItem>& aItemArray, TDesC& aValue);
-
-    /**
-     * Second phase construction.
-     */
-    void ConstructL();
-
-    /**
-     * Constructor.
-     */
-    CAMDownloaddb();
-
-private:
-
-    RDbNamedDatabase iDatabase;
-    RFs iFsSession;
-    RDbs iRdbSession;
-
-    RDbTable iAMObjectTable;
-    CDbColSet* iColSet;
-    RDbView iView;
-
-    };
-
-#endif // __AMDownloaddb_H   
-// End of File
--- a/applicationmanagement/server/inc/AMDownloader.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,152 +0,0 @@
-/*
- * Copyright (c) 2002-2004 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: Implementation of applicationmanagement components
- *
- */
-
-#ifndef __CAMDOWNLOADER_H__
-#define __CAMDOWNLOADER_H__
-
-#include <e32base.h>
-#include "AppMgmtProgDialog.h"
-#include "AppMgmtSrvApp.h"
-
-// FORWARD DECLARATIONS
-class RHttpDownload;
-
-namespace NApplicationManagement
-    {
-
-    // CLASS DECLARATION
-
-    /**
-     *  CAMDownloader lets AM to download content.
-     *
-     *  @since Series 
-     */
-    class CAMDownloader : public CBase, public MDLProgressDlgObserver
-        {
-public:
-        // Constructors and destructor
-
-        /**
-         * Two-phased constructor.
-         */
-        static CAMDownloader* NewL(RHttpDownload& aDownload,
-                MAMDownloaderObserver& aObserver);
-        /**
-         * Destructor.
-         */
-        virtual ~CAMDownloader();
-        void HandleDLProgressDialogExitL(TInt aButtonId);
-	void DisplayDownloadFailedNoteL(THttpDownloadMgrError aError, TInt32 aGlobalErr);
-
-private:
-        /**
-         * C++ default constructor.
-         */
-        CAMDownloader(RHttpDownload& aDownload,
-                MAMDownloaderObserver& aObserver);
-
-        /**
-         * By default Symbian 2nd phase constructor is private.
-         */
-        void ConstructL();
-
-public:
-        // New functions
-
-        void CreateAndUpdateProgressDialogL(TInt32 aDownloadedSize,
-                TInt32 aContentSize, THttpProgressState aState);
-        /**
-         * Starts download of content
-         * @since 
-         * @leave If staring download fails
-         */
-        TInt StartDownload();
-
-        /**
-         * Stop download of content
-         * @since 
-         */
-        TInt StopDownload();
-
-        /**
-         * Continue download of content
-         * @since 
-         */
-        TInt ContinueDownload();
-
-        /**
-         * 
-         * @since 
-         */
-        TBool CompareDownloadURI(const TDesC8& aURI);
-
-        /**
-         *
-         * @leave If staring download fails
-         */
-        TInt32 DownloadStatusCodeL(THttpDownloadState aDownloadState);
-
-        /**
-         * Returns the filename that holds the downloaded
-         *		content if download is successful
-         * @since 
-         * @return	filename
-         */
-        const TDesC& FileName();
-
-        /**
-         * Returns the mimetype of downloaded
-         * @since 
-         * @return	mimetype
-         */
-        const TDesC8& MimeType();
-
-        /**
-         * Returns the URI for download
-         * @since 
-         * @return	download URI
-         */
-        const TDesC8& DownloadURI();
-
-private:
-        void FileNameFromDownloadL();
-        void ContentTypeFromDownloadL();
-        void DownloadURIFromDownloadL();
-
-public:
-        // Functions from base classes
-        TUint32 iProgStarted;
-        TUint32 iSetFinalValue;
-
-        CAppMgmtProgDialog *iProgressNote;
-
-private:
-        // Data
-        RHttpDownload &iDownload;
-
-        HBufC *iFileName;
-        HBufC8 *iContentType;
-        HBufC8 *iURI;
-        MAMDownloaderObserver& iObserver;
-        TBool iProgressCancelled;
-        THttpProgressState iCurrentDownloadProgState;
-        };
-
-    } // namespace NApplicationManagement
-
-#endif // __CAMDOWNLOADER_H__
-// End of File
--- a/applicationmanagement/server/inc/AMPreInstallApp.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,86 +0,0 @@
-/*
- * Copyright (c) 2000 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: Implementation of applicationmanagement components
- *
- */
-
-#ifndef AMPREINSTALLAPP_H_
-#define AMPREINSTALLAPP_H_
-
-#include <e32base.h>
-#include <badesca.h> 
-#include <f32file.h>
-#include "ApplicationManagementCommon.h"
-#include "amstorage.h"
-
-
-_LIT(KPreInstallPath, "\\private\\10202dce\\");
-
-namespace NApplicationManagement
-    {
-    
-    class TPreInstalledAppParams
-        {
-public:
-        TUid iPreInstalledAppUid;
-#if 1
-       TPreInstalledAppName iPreInstalledAppame;
-       TPreInstalledAppVendorName iPreInstalledAppVendorName;
-       TPreInstalledVersion iVersion;
-       TMimeType iMimeType;
-#endif
-        //TPreInstalledVersion bufVersion;
-#if 0
-        HBufC* iPreInstalledAppame;
-        HBufC* iPreInstalledAppVendorName;
-#endif
-        };
-    
-    class CAMPreInstallApp : public CBase
-        {
-
-public:
-        ~CAMPreInstallApp();
-        static CAMPreInstallApp* NewL();
-        static CAMPreInstallApp* NewLC();
-        void ListPreInstalledAppL(const TDesC& installDocPath);
-        void ListPreInstalledAppL();
-        TBool RecognizeL(TDesC& aPathAndName, HBufC* aMimeType);
-        void MakeAllInstallPathsL();
-        void GetPreInstalledAppsL(RPointerArray<TPreInstalledAppParams> &aPreInstalledAppParams);
-private:
-        CAMPreInstallApp();
-
-        void ConstructL();
-
-private:
-
-        TFileName iPreInstallPath; // Path where to scan for pre-install files
-#ifdef RD_MULTIPLE_DRIVE        
-        CDesCArray* iInstallDocPathArray;
-#else        
-        TFileName iPreInstallDocumentPath; // Path where to scan for pre-install files  
-#endif // RD_MULTIPLE_DRIVE
-
-        RFs iFs;
-        CDeliveryComponentStorage *iStorage;
-        RPointerArray<TPreInstalledAppParams> iPreInstalledAppParams;
-        
-        };
-
-
-
-    }
-
-#endif /*AMPREINSTALLAPP_H_*/
--- a/applicationmanagement/server/inc/AppMgmtProgDialog.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,89 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
- *
- * Description:  Implementation of applicationmanagement components
- *
-*/
-
-
-#include <eikprogi.h>
-#include <AknWaitDialog.h> 
-#include <AknProgressDialog.h>
-
-#include <coemain.h>
-
-class MDLProgressDlgObserver
-    {
-public:
-
-    /**
-     * Called when the dialog is going to be closed.
-     *
-     * @since S60 v3.1
-     * @param aButtonId    Id of the button, which was used to cancel 
-     *                       the dialog.
-     */
-    virtual void HandleDLProgressDialogExitL(TInt aButtonId) = 0;
-    };
-
-class CAppMgmtProgDialog : public CBase, public MProgressDialogCallback
-    {
-public:
-
-    CAppMgmtProgDialog(MDLProgressDlgObserver *iCallback);
-    ~CAppMgmtProgDialog();
-
-    void StartProgressNoteL();
-    void UpdateProcessL(TInt aProgress);
-
-    void SetFinalValueL(TInt32 aFinalvalue);
-
-    /**
-     * Offers key event for progress dialog.
-     *
-     * @since S60 v3.1
-     * @param aKeyEvent             Key event
-     * @param aType                 Event type
-     * @return None
-     */
-    TKeyResponse OfferKeyEventL(const TKeyEvent& aKeyEvent, TEventCode aType);
-
-public:
-    // from base classes
-
-
-    /**
-     * From CEikDialog, respond to softkey inputs.
-     *
-     * @since S60 v3.1
-     * @para aButtonId, type of pressed Button or Softkey
-     * @return TBool, ETrue if exit the dialog, otherwise EFalse.
-     */
-    TBool OkToExitL(TInt aButtonId);
-
-    void ProgressCompletedL();
-
-public:
-
-protected:
-    // other system interface functions
-    void DialogDismissedL(TInt aButtonId);
-
-private:
-
-    CAknProgressDialog* iProgressDialog;
-    CEikProgressInfo* iProgressInfo;
-
-    MDLProgressDlgObserver* iDlgObserver;
-
-    };
--- a/applicationmanagement/server/inc/AppMgmtSrvApp.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,103 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
- *
- * Description:  Implementation of applicationmanagement components
- *
-*/
-
-
-#ifndef __AppMgmtSRVAPP_H_
-#define __AppMgmtSRVAPP_H_
-
-// INCLUDES
-#include <eikapp.h>
-#include <aknapp.h>
-
-#include "AppMgmtSrvUI.h"
-
-#include "ApplicationManagementServer.h"
-using namespace NApplicationManagement;
-
-//class CApplicationManagementServer;
-
-// CLASS DECLARATION
-
-/**
- * AppMgmt server application
- *
- *  @lib    AppMgmtserver
- *  @since  S60 v3.1
- */
-class CAppMgmtSrvApp : public CAknApplication
-    {
-
-public:
-    NApplicationManagement::CApplicationManagementServer* Server();
-
-    CAppMgmtSrvApp();
-
-    virtual ~CAppMgmtSrvApp();
-
-    /**
-     * Show or hide UI
-     *
-     * @since   S60   v3.1
-     * @param   aVisible    Tells whether to hide / show the ui
-     * @return  none
-     */
-    void SetUIVisibleL();
-
-private:
-    /**
-     * From CApaApplication, creates AppMgmtSrvDocument document object.
-     * @since   S60   v3.1
-     * @param    None    
-     * @return A pointer to the created document object.
-     */
-    CApaDocument* CreateDocumentL();
-
-    /**
-     * From CApaApplication, returns application's UID (KUidAppMgmtServer).
-     * @since   S60   v3.1
-     * @param    None
-     * @return   The value of KUidAppMgmtServer.
-     */
-    TUid AppDllUid() const;
-
-    /**
-     * From CApaApplication
-     * @since   S60   v3.1
-     * @param   aAppServer returned server
-     * @return  None
-     */
-    void NewAppServerL(CApaAppServer*& aAppServer);
-
-public:
-
-    /**
-     * AppMgmt server.
-     * Own. 
-     */
-    CApplicationManagementServer* iAppMgmtServer;
-
-    /**
-     * Document
-     * Own. 
-     */
-    CAppMgmtSrvDocument* iDocument;
-
-    };
-
-#endif
-
-// End of File
--- a/applicationmanagement/server/inc/AppMgmtSrvDocument.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,99 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
- *
- * Description:  Implementation of applicationmanagement components
- *
-*/
-
-
-#ifndef CAppMgmtSRVDOCUMENT_H
-#define CAppMgmtSRVDOCUMENT_H
-
-// INCLUDES
-#include <aknapp.h>
-#include <AknDoc.h>
-#include <eikenv.h>
-
-// FORWARD DECLARATIONS
-class CEikAppUi;
-class CEikEnv;
-class CNSmlDMSyncProfileList;
-
-// CLASS DECLARATION
-
-/**
- *  CAppMgmtSrvDocument application class.
- *
- *  @lib    AppMgmtserver
- *  @since  S60 v3.1
- */
-class CAppMgmtSrvDocument : public CAknDocument
-    {
-public:
-
-    /**
-     * Two-phased constructor.
-     */
-    static CAppMgmtSrvDocument* NewL(CAknApplication& aApp);
-
-    /**
-     * Destructor.
-     */
-    virtual ~CAppMgmtSrvDocument();
-
-public:
-    // New functions
-
-    /**
-     * Getter fo CEikAppUi class
-     * @param    None
-     * @return   Pointer to the CEikAppUi
-     */
-    CEikAppUi* AppUi() const
-        {
-        return iAppUi;
-        }
-
-private:
-
-    /**
-     * Constructor
-     * @param    aApp Used by akndocument
-     * @return   None
-     */
-    CAppMgmtSrvDocument(CEikApplication& aApp) :
-        CAknDocument(aApp)
-        {
-        }
-
-    void ConstructL();
-
-    /**
-     * From CEikDocument, create CAppMgmtSrvUi "App UI" object.
-     * @param    None
-     * @return   UI
-     */
-    CEikAppUi* CreateAppUiL();
-
-private:
-
-    /**
-     * Reference to eikonenv
-     * 
-     */
-    //CEikonEnv*                          iEikEnv;
-    };
-
-#endif
-
-// End of File
--- a/applicationmanagement/server/inc/AppMgmtSrvUI.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,114 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
- *
- * Description:  Implementation of applicationmanagement components
- *
-*/
-
-#ifndef CAppMgmtSRVUI_H
-#define CAppMgmtSRVUI_H
-
-#include <bldvariant.hrh>
-
-// INCLUDES
-#include <eikapp.h>
-#include <eikdoc.h>
-#include <e32std.h>
-#include <coeccntx.h>
-#include <aknappui.h>
-#include <eikdialg.h>
-#include <eikmenup.h>
-#include <aknnavi.h>
-#include <aknnavide.h>
-#include <aknnavilabel.h>
-#include <akntitle.h>
-#include <AknProgressDialog.h>
-
-#include "AppMgmtSrvDocument.h"
-#include <aknViewAppUi.h>
-
-// FORWARD DECLARATIONS
-
-/**
- *  Application UI class 
- *
- *  @lib    AppMgmtserver
- *  @since  S60 v3.1
- */
-class CAppMgmtSrvUi : public CAknAppUi
-    {
-public:
-    // Constructors and destructor
-
-    void ConstructL();
-
-    virtual ~CAppMgmtSrvUi();
-
-    void HandleForegroundEventL(TBool aValue);
-
-private:
-    // from base classes
-
-
-    /**
-     * @param aResourceId        
-     * @param aMenuPane
-     * @return none
-     */
-    void DynInitMenuPaneL(TInt aResourceId, CEikMenuPane* aMenuPane);
-
-    /**
-     * From CEikAppUi, takes care of command handling.
-     * @param aCommand id of the  command to be handled
-     * @return None 
-     */
-    void HandleCommandL(TInt aCommand);
-
-    /**
-     * From CEikAppUi, handles key events.
-     * @param aKeyEvent  Event to handled.
-     * @param aType   Type of the key event. 
-     * @return Reponse code (EKeyWasConsumed, EKeyWasNotConsumed). 
-     */
-    virtual TKeyResponse HandleKeyEventL(const TKeyEvent& aKeyEvent,
-            TEventCode aType);
-
-    /**
-     * From CAknAppUi, handles file change.
-     * @param aFileName New file to be opened.
-     * @return None
-     */
-    void OpenFileL(const TDesC& aFileName);
-
-    /**
-     * From CAknAppUi, Preparing to close server
-     * @param None
-     * @return None
-     */
-    void PrepareToExit();
-
-public:
-
-private:
-    //Data
-
-    /**
-     * Should AppMgmt operation close on an system event (ex. MMC card removal)?
-     */
-    TBool iNeedToClose;
-
-    };
-
-#endif
-
-// End of File
--- a/applicationmanagement/server/inc/ApplicationManagementJavaUtility.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,78 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
- *
- * Description:  Implementation of applicationmanagement components
- *
-*/
-
-
-#ifndef __APPLICATIONMANAGEMENTJAVAUTILITY_H__
-#define __APPLICATIONMANAGEMENTJAVAUTILITY_H__
-
-//  EXTERNAL INCLUDES
-#include <e32base.h>
-
-#include <javaregistryincludes.h>
-using namespace Java;
-
-//  INTERNAL INCLUDES
-#include "ApplicationManagementUtility.h"
-
-namespace NApplicationManagement
-    {
-
-    //  CLASS DEFINITION
-    /**
-     *
-     *   
-     *
-     */
-    class CApplicationManagementJavaUtility :
-        public CApplicationManagementUtility
-        {
-
-public:
-        // Constructors and destructors
-
-        static CApplicationManagementJavaUtility* NewL(); // Static constructor
-        static CApplicationManagementJavaUtility* NewLC(); // Static constructor
-        ~CApplicationManagementJavaUtility(); // Destructor
-
-private:
-        // Constructors and destructors
-
-        CApplicationManagementJavaUtility(); // Default constructor
-        void ConstructL(); // Second phase construct
-
-public:
-        // New methods
-
-        TBool FindInstalledJavaUidL(const TUid &aUid) const;
-
-        void InstalledSuiteUidsL(RArray <TUid>&);
-
-        void JavaUidsL(RArray<TUid> &aUids);
-
-        void RefreshJavaRegistryL();
-        void GetInstalledMidletParametersL(
-                TMidletParameters& aMidletParameters);
-
-private:
-        // Data
-
-        CJavaRegistry* iJavaRegistry;
-        };
-
-    }
-
-#endif      //  __ApplicationManagementJavaUtility_H__
--- a/applicationmanagement/server/inc/ApplicationManagementServer.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,448 +0,0 @@
-/*
- * Copyright (c) 2000 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: Implementation of applicationmanagement components
- *
- */
-
-#ifndef __APPLICATIONMANAGEMENTSERVER_H__
-#define __APPLICATIONMANAGEMENTSERVER_H__
-
-// INCLUDES
-#include <SyncMLClient.h>
-#include <e32base.h>
-#include <centralrepository.h>
-#include <SWInstApi.h>
-#include <ssl.h>
-#include <swi/launcher.h>
-#include <swi/sisregistrysession.h>
-#include <swi/sisregistrypackage.h>
-#include <swi/sisregistryentry.h>
-#include <DownloadMgrClient.h>
-
-#include "ApplicationManagementClientServer.h"
-#include "PlatformSecurityPolicies.h"
-#include "AMDeploymentComponent.h"
-#include "amstorage.h"
-#include "ApplicationManagementUtility.h"
-#include "AMDownloaddb.h"
-
-#include "AMDownloadManager.h"
-// CONSTANTS
-const TInt KBase64BufSize = 131072;
-class CAppMgmtSrvApp;
-
-namespace NApplicationManagement
-    {
-
-    // -----------------------------------------------------------
-    // ApplicationManagement server panic codes
-    // -----------------------------------------------------------
-    enum TApplicationManagementPanic
-        {
-        EPanicGeneral,
-        EBadSubsessionHandle,
-        EPanicIllegalFunction,
-        EBadDescriptor
-        };
-
-    // FUNCTION PROTOTYPES
-
-    void PanicClient(const RMessagePtr2& aMessage,
-            TApplicationManagementPanic aPanic);
-
-    // CLASS DECLARATION     
-    class CShutdown : public CTimer
-        {
-        enum
-            {
-            KApplicationManagementShutdownDelay = 0x3000000 // approx 30s
-            };
-public:
-        inline CShutdown();
-        inline void ConstructL();
-        inline void Start();
-	inline void Stop();
-private:
-        void RunL();
-        };
-
-    /**
-     *  CApplicationManagementServer 
-     *  Description.
-     */
-
-    class CApplicationManagementServer : public CAknAppServer,
-        public MDownloadMngrObserver
-        {
-public:
-        static CApplicationManagementServer* NewL();
-        ~CApplicationManagementServer();
-
-        void Panic(TInt aPanicCode);
-        void AddSession();
-        void DropSession();
-
-        CPolicyServer::TCustomResult CreateServiceSecurityCheckL(
-                TUid aServiceType, const RMessage2& aMsg, TInt& aAction,
-                TSecurityInfo& aMissing);
-private:
-
-        CApplicationManagementServer();
-        virtual void ConstructL(const TDesC &aServerName);
-        /*CSession2* NewSessionL(const TVersion& aVersion, 
-         const RMessage2& aMessage) const;*/
-
-        //From CPolicyServer
-        CPolicyServer::TCustomResult
-                CustomSecurityCheckL(const RMessage2& aMsg, TInt& aAction,
-                        TSecurityInfo& aMissing);
-
-        // browses sis registry
-        void LookupSisRegistryL();
-
-        //New methods	
-        void DownloadCompleteL(CDeploymentComponent *aComponent, TInt iapid,
-                HBufC8* aServerId);
-
-        void InstallCompleteL(const CDeploymentComponent &aCompo,
-                const TBool &aInstallSuccess=ETrue);
-                
-        TInt GetErrorStatus(TInt aErrorDownload, TInt aErrorInstall);
-        
-        void EnableDMNetworkMonL(TInt iapid, HBufC8 *aServerId);
-
-public:
-
-        /**
-         * 	Storage Returns the storage
-         * @return The storage pointer
-         */
-        inline CDeliveryComponentStorage *Storage()
-            {
-            return iStorage;
-            }
-
-        /**
-         * UninstallL Uninstalls the given deployment component.
-         * @param aComponent The component to be uninstalled
-         * @param aStatus TRequestStatus of the call
-         */
-        void UninstallL(const CDeploymentComponent &aComponent,
-                TRequestStatus &aStatus);
-
-        void AddDownloadL(CDeploymentComponent *aComponent);
-
-        void PerformRFSL();
-        void RemoveInternalL(const CDeploymentComponent &aCompo,
-                TBool aDoUninstall = ETrue);
-
-        TBool CheckCertL(const TCertInfo &aInfo) const;
-        void DoTheInstallL(CDeploymentComponent &aCompo);
-
-        void GetAMServerDownloadDBL(TUint32 internalid, TInt& finalresult,
-                TDes8& atargetURI);
-                
-        TBool IsOMASCOMOEnabledL();
-
-        /**
-         * JavaUidsL Returns java uids.
-         * @param aUids the array to hold uids
-         */
-        void JavaUidsL(RArray<TUid> &aUids) const;
-
-        /**
-         * FullUpdateL updates target with source
-         * @param sid Source deployment component id
-         * @param tid Target deployment component id
-         */
-        void FullUpdateL(const TUint32 sid, const TUint32 tid);
-
-        /**
-         * SetDataL sets data to deployment component and checks possible uid overlaps
-         * @param aCompo deployment component where data is set
-         * @param aData new data to be set
-         * @param aMime mimetype of the new data to be set
-         */
-        void SetDataL(CDeploymentComponent &aCompo, const TDesC8 &aData,
-                const TDesC8 &aMime);
-        /**
-         * Checks of data in file is Base64 decoded.
-         * @param aFile file to be checked if data is encoded
-         * @param aLength data length in file
-         * @return ETrue if given data in file is Base64 encoded
-         */
-        TBool IsDataFileB64EncodedL(RFile &aFile, TInt& aLength);
-
-        /**
-         * Checks of data is Base64 decoded.
-         * @param aData data to be checked for encoding
-         * @return ETrue if given data is Base64 encoded
-         */
-        TBool CheckB64Encode(const TDesC8& aData);
-
-        /**
-         * B64 Decodes data in aData and return decoded data
-         * @param aSourceFile file containing decoded data
-         * @param aDestinationFile file where to decode data
-         */
-        void DecodeB64DataFileL(RFile& aSourceFile, RFile& aDestinationFile);
-
-        /**
-         * B64 Decodes data in aData and return decoded data
-         * @param aData decoded data
-         * @return Decoded data
-         */
-        HBufC8* DecodeB64DataLC(const TDesC8 &aData);
-
-        /**
-         * B64 Encodes data in aData to aTarget
-         * @param aData data which is encoded
-         * @param aTarget encoded data buffer
-         */
-        void EncodeDataL(const TDesC8& aData, CBufBase &aTarget);
-        void HandleAllClientsClosed();
-
-        void DeleteGenericAlertForIDL(TUint32 internalid);
-        void CheckforDuplicateMidletsL(TMidletParameters& amidletParameters);
-
-public:
-        // from MDownloadMngrObserver
-
-        /**
-         * 
-         * @param aComponent 
-         * @param aStatus 
-         */
-        void ComponentDownloadComplete(CDeploymentComponent *aComponent,
-                TInt iapid, HBufC8 *aServerId);
-
-        /**
-         * Looks all deployments components and sis & java registries
-         * to find out whether given uid is already used...
-         * @param aUid The uid to be looked for
-         * @return ETrue if uid is found, EFalse otherwise
-         */
-        TBool HasUidL(const TUid &aUid, CDeploymentComponent *& aCompo,
-                CDeploymentComponent *aIgnored);
-
-        void ComponentDownloadFailed(CDeploymentComponent *aComponent,
-                TInt aReason);
-
-        void StartShutDownTimerL();
-
-        void SendServerToBackground();
-
-        void BringServertoForeground();
-
-        void BringDMUItoForeground();
-        TBool IsInstalledAppRemovableL(TDriveNumber &iDrive);
-
-private:
-
-        /**
-         * FullUpdateL updates target with source
-         * @param sid Source deployment component 
-         * @param tid Target deployment component 
-         */
-        void FullUpdateL(CDeploymentComponent &scompo,
-                const CDeploymentComponent &tcompo);
-
-        /**
-         * InstallL Installs the given deployment component. Async version.
-         * @param aComponent The component to be installed
-         * @param aStatus TRequestStatus of the call
-         */
-        void InstallL(const CDeploymentComponent &aComponent,
-                TRequestStatus &aStatus);
-        /**
-         * InstallL Installs the given deployment component. Syncronized version.
-         * @param aComponent The component to be installed
-         */
-        void InstallL(const CDeploymentComponent &aComponent);
-
-        /**
-         * PrepareInstallL Prepares install of given component.
-         * @param aComponent The component to be installed
-         * @param aFileName	If call is successful, will contain 
-         * the name of file ready to be installed
-         * @return ETrue if preparation is successful, EFalse otherwise
-         */
-        TBool PrepareInstallL(const CDeploymentComponent &aComponent,
-                TFileName &aFileName);
-
-        /**
-         * Finds whether the given uid is found in sis or java registry.
-         * Searches first sis registry and uses FindJavaUidL if not found
-         */
-        TBool FindInstalledSisUidL(const TUid &aUid) const;
-
-        /**
-         * Finds whether the given uid is found in java registry
-         */
-        TBool FindInstalledJavaUidL(const TUid &aUid) const;
-        void SetSisAppVersionAndDriveL(CDeploymentComponent &aCompo);
-        void JavaInstallL(CDeploymentComponent &aCompo);
-        void SisInstallL(const CDeploymentComponent &aCompo);
-        TUid FindNewUid(const RArray<TUid> &aUidsOrig,
-                const RArray<TUid> &aUidsNew) const;
-
-        /**
-         * Reads Jar file name from Jad file
-         * @param aFile file handle for Jad file where to find Jar filename
-         * @return aFileName	If call is successful, will contain the name of file ready to be installed
-         */
-        TFileName ReadJarFileNameL(RFile& aFile) const;
-
-        /**
-         * Reads line of data from file.
-         * @param aStream stream handle where to read data
-         * @param aLineBuffer buffer where function appends read data for line. Return a full line at time.
-         */
-        void ReadLineL(RReadStream& aStream, TDes8& aLineBuffer) const;
-
-        /**
-         * DoDataUpdateCheck checks whether there's dc having same data uid
-         * @return The conflicting DC or NULL
-         */
-        CDeploymentComponent * DoDataUpdateCheckL(
-                CDeploymentComponent &aCompo);
-
-        // Functions used to generate temporary files Java installation use case
-        // where both Jad and Jar files are delivered to phone and Jad file is used to install 
-        // the Java application from local Jar file.
-        void GenerateTempJarFileNameL(RFs &aFs, const TDesC& aMetaSource,
-                TFileName &aFileName) const;
-
-        void GenerateTempFileNameL(const RFs &aFs, const TDesC& aSource,
-                TFileName &aFileName) const;
-
-        void GenerateTempFileNameL(RFs &aFs,
-                const CDeploymentComponent& aCompo, TFileName& aSource,
-                TFileName &aMetaSource, TFileName &aFileName,
-                TFileName &aMetaFileName) const;
-
-        void GenerateTempFileNameL(RFs &aFs,
-                const CDeploymentComponent& aCompo, TFileName &aFileName,
-                TFileName &aMetaFileName) const;
-
-        CApaAppServiceBase* CreateServiceL(TUid aServiceType) const;
-
-public:
-
-        CAppMgmtSrvApp* iParentApp;
-
-private:
-
-        TInt iSessionCount;
-        CShutdown iShutdown;
-        CApplicationManagementUtility* iUtility;
-        CDeliveryComponentStorage *iStorage;
-        TBool iInstallInProgress;
-
-        //SwiUI::RSWInstSilentLauncher iInstaller;
-        SwiUI::RSWInstLauncher iInstaller;
-        SwiUI::TInstallOptionsPckg iInstallOptions;
-        SwiUI::TUninstallOptionsPckg iUninstallOptions;
-        SwiUI::TInstallReqPckg iInstallReq;
-
-        RFs iInstallRFs;
-        RFile iInstallFile;
-
-        CAMDownloadManager* iDownloadMngr;
-
-        CAMDownloaddb* iAMServerDB;
-        TBool iOMASCOMOEnabled;
-
-        };
-
-    namespace NPolicyConstants
-        {
-
-        // "CSF" + CA + SerialNumber + Fingerprint) ;
-        //_LIT( KSubjectFormat, "CSF%S%S%S" );
-        namespace NActions
-            {
-            _LIT8( KUse, "Use" );
-            }
-        _LIT8( KResourceValue, "ApplicationManagement" );
-        }
-
-    class CApplicationManagementSession : public CAknAppServiceBase
-        {
-public:
-        inline CApplicationManagementSession();
-        inline CApplicationManagementSession(const TCertInfo &aInfo);
-        void CreateL();
-private:
-        ~CApplicationManagementSession();
-        inline CApplicationManagementServer& Server() const;
-
-        void ServiceL(const RMessage2& aMessage);
-        TBool PreDispatchMessageL(const RMessage2 &aMessage);
-        void DispatchMessageL(const RMessage2& aMessage);
-        void ServiceError(const RMessage2& aMessage, TInt aError);
-
-        void ComponentCountL(const RMessage2& aMessage);
-        void ComponentIdsL(const RMessage2& aMessage) const;
-        void Deliver2L(const RMessage2& aMessage) const;
-        void DeliverCompleteL(const RMessage2& aMessage) const;
-        void GetComponentL(const RMessage2& aMessage) const;
-        void InstallL(const RMessage2 &aMessage) const;
-        void UpdateL(const RMessage2 &aMessage) const;
-        void GetDataL(const RMessage2 &aMessage) const;
-        void GetDataLengthL(const RMessage2 &aMessage) const;
-        void RemoveL(const RMessage2 &aMessage) const;
-        void UpdateDataL(const RMessage2 &aMessage) const;
-        void UpdateStreamedDataL(const RMessage2& aMessage) const;
-        void DownloadL(const RMessage2 &aMessage) const;
-        void AddTrustL(const RMessage2 &aMessage);
-        void FullUpdateL(const RMessage2 &aMessage) const;
-        void GetUserIdL(const RMessage2 &aMessage) const;
-        void StartDownloadL(const RMessage2& aMessage) const;
-        void StateChangeComponentIdsL(const RMessage2& aMessage) const;
-        void StateChangeComponentIdsCountL(const RMessage2& aMessage) const;
-        void StateChangeCompleteL(const RMessage2& aMessage) const;
-        void ActivateL(const RMessage2& aMessage) const;
-        void DeactivateL(const RMessage2& aMessage) const;
-        void GetTemporaryInstFileL(const RMessage2 &aMessage) const;
-        void GetFinalResultForGAL(const RMessage2 &aMessage);
-
-        TInt PackageSizeL(Swi::RSisRegistrySession& aSession,
-                Swi::RSisRegistryEntry& aEntry);
-        TInt AugmentationSizeL(Swi::RSisRegistrySession& aSession,
-                const Swi::CSisRegistryPackage& aPackage);
-
-        void RemoveInternalL(const TUint32 &aId) const;
-
-        /**
-         * Collects active components in aArrt and places them in aArr
-         */
-        void ActiveComponentsL(const RComponentIdArray &aArrt,
-                RComponentIdArray &aArr,TDeploymentComponentState &aState) const;
-
-        void GenericAlertSentForIdL(const RMessage2& aMessage) const;
-
-        void CheckStatusNodesValuesL();
-
-private:
-        void LookupSisRegistryL();
-
-        TCertInfo iCertInfo;
-        TBool iTrustAdded;
-        };
-
-    }
-#endif //__APPLICATIONMANAGEMENTSERVER_H__
-//  End of File
-
--- a/applicationmanagement/server/inc/ApplicationManagementUtility.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,82 +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 "Eclipse Public License v1.0"
- * which accompanies this distribution, and is available
- * at the URL "http://www.eclipse.org/legal/epl-v10.html".
- *
- * Initial Contributors:
- * Nokia Corporation - initial contribution.
- *
- * Contributors:
- *
- * Description: Implementation of applicationmanagement components
- *
- */
-
-#ifndef __CApplicationManagementUtility_H__
-#define __CApplicationManagementUtility_H__
-
-//  EXTERNAL INCLUDES
-#include <e32base.h>
-#include "ApplicationManagementCommon.h"
-#include "javaregistryentry.h"
-namespace NApplicationManagement
-    {
-
-    //  CLASS DEFINITION
-    /**
-     *
-     *   
-     *
-     */
-
-    class TMidletParameters
-        {
-public:
-        TUid iMidletUid;
-        TMidletnameName iMidletName;
-        TMidletVendorName iMidletVenorName;
-        TMidletVersion bufVersion;
-        TDriveNumber iDrive;
-
-        };
-    class CApplicationManagementUtility : public CBase
-        {
-
-public:
-        // Constructors and destructors
-
-        static CApplicationManagementUtility* NewL(); // Static constructor
-        static CApplicationManagementUtility* NewLC(); // Static constructor
-        ~CApplicationManagementUtility(); // Destructor
-
-protected:
-
-        CApplicationManagementUtility(); // Default constructor
-
-private:
-        // Constructors and destructors
-
-        void ConstructL(); // Second phase construct
-
-
-public:
-        // New methods
-
-        virtual TBool FindInstalledJavaUidL(const TUid &aUid) const;
-
-        virtual void InstalledSuiteUidsL(RArray <TUid>);
-
-        virtual void JavaUidsL(RArray<TUid> &aUids);
-
-        virtual void RefreshJavaRegistryL();
-        virtual void GetInstalledMidletParametersL(
-                TMidletParameters& aMidletParameters);
-
-        };
-
-    }
-
-#endif      //  __CApplicationManagementUtility_H__
--- a/applicationmanagement/server/inc/ApplicationManagementUtilityFactory.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +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 "Eclipse Public License v1.0"
- * which accompanies this distribution, and is available
- * at the URL "http://www.eclipse.org/legal/epl-v10.html".
- *
- * Initial Contributors:
- * Nokia Corporation - initial contribution.
- *
- * Contributors:
- *
- * Description: Implementation of applicationmanagement components
- *
- */
-#ifndef __APPLICATIONMANAGEMENTUTILITYFACTORY_H__
-#define __APPLICATIONMANAGEMENTUTILITYFACTORY_H__
-
-//  INTERNAL INCLUDES
-#include "ApplicationManagementUtility.h"
-
-namespace NApplicationManagement
-    {
-
-    //  CLASS DEFINITION
-    /**
-     *
-     *   
-     *
-     */
-    class ApplicationManagementUtilityFactory
-    //: public CBase
-        {
-
-public:
-        // New methods
-
-        /**
-         *	
-         *	@param 
-         *	@return 
-         */
-        static CApplicationManagementUtility* CreateManagementUtilityL();
-
-        };
-
-    }
-
-#endif      //  __APPLICATIONMANAGEMENTUTILITYFACTORY_H__
--- a/applicationmanagement/server/inc/PlatformSecurityPolicies.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 2000 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: Implementation of applicationmanagement components
- *
- */
-
-#ifndef __PLATFORM_SECURITY_POLICIES__
-#define __PLATFORM_SECURITY_POLICIES__
-
-// INCLUDES
-
-#include <e32base.h>
-
-#include "ApplicationManagementClientServer.h"
-
-// CONSTANTS
-
-const TUint KApplicationManagementRangeCount = 3;
-
-const TInt KApplicationManagementRanges[KApplicationManagementRangeCount] =
-    {
-
-    NApplicationManagement::EAddTrust, //For Management
-            NApplicationManagement::EPerformRfs,
-            NApplicationManagement::ELast
-,//ENotSupported
-};
-
-const TUint8
-        KApplicationManagementSecurityElementsIndex[KApplicationManagementRangeCount] =
-            {
-            0, //applies to 1st range 
-                    1,
-                    CPolicyServer::ENotSupported
-            };
-
-//capability checks
-const CPolicyServer::TPolicyElement KApplicationManagementSecurityElements[] =
-    {
-        {
-        _INIT_SECURITY_POLICY_C1(ECapabilityTrustedUI), CPolicyServer::EFailClient
-        },
-        {
-        _INIT_SECURITY_POLICY_S1(0x101f9a02, ECapabilityDiskAdmin), CPolicyServer::EFailClient
-        }
-    };
-
-//Package all the above together into a policy
-//CPolicyServer::TPolicy KApplicationManagementSecurityPolicy;
-
-#endif
-
-//  End of File
--- a/applicationmanagement/server/inc/amdeploymentcomponent.inl	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,100 +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 "Eclipse Public License v1.0"
- * which accompanies this distribution, and is available
- * at the URL "http://www.eclipse.org/legal/epl-v10.html".
- *
- * Initial Contributors:
- * Nokia Corporation - initial contribution.
- *
- * Contributors:
- *
- * Description: Implementation of applicationmanagement components
- *
- */
-#include "amdeploymentcomponentdata.h"
-
-inline const TDesC8 &CDeploymentComponent::DownloadURI() const
-    {
-    return iDownloadURI;
-    }
-
-inline const TUid & CDeploymentComponent::Uid() const
-    {
-    return iUid;
-    }
-
-inline const TDeploymentComponentId &CDeploymentComponent::ComponentId() const
-    {
-    return iId;
-    }
-
-inline const TDeploymentComponentName &CDeploymentComponent::ComponentName() const
-    {
-    return iName;
-    }
-
-inline const TDeploymentComponentVersion &CDeploymentComponent::ComponentVersion() const
-    {
-    return iVersion;
-    }
-
-inline TDeploymentComponentState CDeploymentComponent::State() const
-    {
-    return iState;
-    }
-
-inline const TUint32 CDeploymentComponent::InternalId() const
-    {
-    return iInternalId;
-    }
-
-inline const TDesC8& CDeploymentComponent::UserId() const
-    {
-    return iUserId;
-    }
-
-inline const TDeploymentComponentState& CDeploymentComponent::OldState() const
-    {
-    return iOldState;
-    }
-
-inline void CDeploymentComponent::StateChangeComplete()
-    {
-    iOldState = EDCSNone;
-    }
-inline const TInt CDeploymentComponent::Status() const
-    {
-    return iStatus;
-    }
-inline const TDeploymentComponentPkgId& CDeploymentComponent::PkgId() const
-    {
-    return iPkgID;
-    }
-inline const TDeploymentComponentDescription& CDeploymentComponent::Description() const
-    {
-    return iDescription;
-    }
-inline const TDeploymentComponentPkgIdRef& CDeploymentComponent::PkgIDRef() const
-    {
-    return iPkgIDRef;
-    }
-inline const TDeploymentComponentPkgType& CDeploymentComponent::PkgType() const
-    {
-    return iPkgType;
-    }
-
-inline const TMidletnameName& CDeploymentComponent::MidletName() const
-    {
-    return iMidletName;
-    }
-inline const TMidletVendorName& CDeploymentComponent::MidletVendor() const
-    {
-    return iMideltVendorName;
-    }
-inline const TMidletVersion& CDeploymentComponent::MidletVersion() const
-    {
-    return iMidletVersion;
-    }
--- a/applicationmanagement/server/inc/amdeploymentcomponentdata.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,117 +0,0 @@
-/*
- * Copyright (c) 2000 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: Implementation of applicationmanagement components
- *
- */
-
-#ifndef __AMDEPLOYMENTCOMPONENTDATA_H__
-#define __AMDEPLOYMENTCOMPONENTDATA_H__
-
-#include <e32base.h>
-#include <f32file.h> 
-#include <s32strm.h>
-
-#include "ApplicationManagementCommon.h"
-
-namespace NApplicationManagement
-    {
-
-    /**
-     *  Data class to Data access
-     */
-    class CDeploymentComponentData : public CBase
-        {
-public:
-        enum TType
-            {
-            EData,
-            EInstallOptions,
-            EMetaData
-            };
-private:
-        CDeploymentComponentData(TType aType, const TDesC8 &aDataFile);
-        CDeploymentComponentData();
-
-        void ConstructL(const TDesC8 &aData, const TDesC8 &aMime);
-        void ConstructLoadL(RReadStream &aStream);
-        /**
-         Possibly changes mutable iData
-         */
-        void LoadDataL() const;
-
-        TBool IsSISInstallFile(const TDesC8 &aMimeType);
-
-public:
-        static CDeploymentComponentData* NewL(TType aType,
-                const TDesC8 &aData, const TDesC8 &aMime,
-                const TDesC8 &aDataFile);
-
-        static CDeploymentComponentData* NewLC(TType aType,
-                const TDesC8 &aData, const TDesC8 &aMime,
-                const TDesC8 &aDataFile);
-
-        static CDeploymentComponentData* LoadL(RReadStream &aStream);
-
-        static CDeploymentComponentData* LoadLC(RReadStream &aStream);
-
-        virtual ~CDeploymentComponentData();
-
-        void SerializedFormL(RWriteStream &aBuffer) const;
-        TInt SerializedFormLength() const;
-
-        const TDesC8 &Data() const;
-        const TDesC8 &DataFileName() const;
-        void ResetData(RFs &aFs);
-        TInt DataLengthL() const;
-        inline TType Type() const;
-
-        TUid SetDataL(const TDesC8& aMimeType);
-        TUid SetDataL(const TDesC8 &aData, const TDesC8& aMimeType);
-        TUid SetDataL(const TFileName &aData, const TDesC8& aMimeType);
-        void SetDataFileNameL(const TDesC8 &aNewFileName);
-        void SetMimeTypeL(const TDesC8 &aMimeType);
-        inline const TDesC8 &MimeType() const;
-
-        void PersistL(RFs &aFs);
-        void DestroyL(RFs &aFs) const;
-
-        CDeploymentComponentData &operator=(
-                const CDeploymentComponentData &aData);
-
-        TUid ResolveUidL(RFs &aFs);
-
-        TUid ParseUidFromSisFileL(RFile& aHandleToFile);
-
-private:
-        mutable HBufC8 *iData;
-        TBuf8<KMaxFileName> iDataFileName;
-        TMimeType iMimeType;
-        TType iType;
-
-        };
-
-    inline CDeploymentComponentData::TType CDeploymentComponentData::Type() const
-        {
-        return iType;
-        }
-
-    inline const TDesC8 &CDeploymentComponentData::MimeType() const
-        {
-        return iMimeType;
-        }
-    }
-
-#endif
-
-//  End of File
--- a/applicationmanagement/server/inc/amsmlhelper.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,80 +0,0 @@
-/*
- * Copyright (c) 2000 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: Implementation of applicationmanagement components
- *
- */
-
-#ifndef __AMSMLHELPER_H__
-#define __AMSMLHELPER_H__
-
-#include <SyncMLDef.h>
-#include <SyncMLTransportProperties.h>
-#include <SyncMLClient.h>
-#include <SyncMLClientDM.h>
-
-namespace NApplicationManagement
-    {
-
-    /**
-     * Utility class that wraps access to DM client functionality
-     */
-    class SmlHelper
-        {
-public:
-
-        // NOTE: this enum must match with property array described in 
-        // SyncML_Sync_Agent_Client_API_Specification.doc.
-        enum TNSmlSyncTransportProperties
-            {
-            EPropertyIntenetAccessPoint = 0,
-            EPropertyHttpUsed = 5,
-            EPropertyHttpUserName = 6,
-            EPropertyHttpPassword = 7
-            };
-
-        /**
-         * GetCurrentProfileIdL Finds out the current syncml DM session profile id.
-         * @param aProfile Will contain the current profile id if call is successfull
-         * @return Success status (KErrNone if successful)
-         */
-        static TInt GetCurrentProfileIdL(TSmlProfileId &aProfile);
-        /**
-         * LaunchSessionL Launches SyncML DM session using given profile id.
-         * @param aProfile The id of profile which is to be used to start DM session
-         * @return Success status (KErrNone if successful)
-         */
-        static TInt LaunchSessionL(TSmlProfileId &aProfile);
-
-        /**
-         * Fetch the default IAP used by the currently active DM profile
-         * @param aDefaultIAP on successfull return contains the default IAP number
-         */
-
-        static void GetDefaultIAPFromDMProfileL(TInt& aDefaultIAP);
-
-        static void GetConnectionPropertyNameL(RSyncMLSession& aSyncSession,
-                TDes8& aText, TInt aPropertyPos);
-
-        static TInt StrToInt(const TDesC& aText, TInt& aNum);
-
-        static HBufC8* GetCurrentServerIDL();
-
-        };
-
-    }
-	
-	
-#endif
-
-//  End of File
--- a/applicationmanagement/server/inc/amstorage.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,194 +0,0 @@
-/*
- * Copyright (c) 2000 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: Implementation of applicationmanagement components
- *
- */
-
-#ifndef __AMDSTORAGE_H__
-#define __AMDSTORAGE_H__
-
-#include "ApplicationManagementCommon.h"
-#include <e32base.h>
-#include <ssl.h>
-
-#include <s32mem.h>
-class CRepository;
-
-namespace NApplicationManagement
-    {
-
-    class CDeploymentComponent;
-    class CAMAppHideUtil;
-
-    class RComponentIdArray : public RArray<TUint32>
-        {
-public:
-        void SetListL(const TDesC8& aChilds);
-        void GetListLC(HBufC8 *& aChilds, TInt &aLength);
-        void RemoveByValue(TUint32 aValue);
-        };
-
-    typedef TPckgBuf<TCertInfo> TCertInfoPckg;
-
-    class RCertArray : public RPointerArray<TCertInfoPckg>
-        {
-public:
-        void ExternalizeL(RWriteStream& aStream) const;
-        void InternalizeL(RReadStream& aStream);
-        TInt FindByValue(const TCertInfoPckg &aPckg);
-        };
-    /**
-     *  Factory class to Data component creation
-     */
-    class CDeliveryComponentStorage : public CBase
-        {
-        /**
-         * Constructor
-         */
-        CDeliveryComponentStorage();
-
-        /**
-         * 2nd phase constructor. Loads compontns
-         */
-        void ConstructL();
-
-        /**
-         * Saves the state to disk
-         */
-        void PersistStateL();
-
-        /**
-         * Loads components from disk
-         */
-        void LoadComponentsL();
-
-        /**
-         * Creates and returns next free deployment component id
-         */
-        TInt NextKey();
-
-        /**
-         * Loads certificate array
-         */
-        void LoadCertsL();
-
-        /**
-         * Saves and closes certificate array
-         */
-        void CloseCertificatesL();
-
-public:
-
-        /**
-         * Creates new storage object and constructs it
-         */
-        static CDeliveryComponentStorage* NewL();
-
-        /**
-         * Creates new storage object and constructs it, leaving it
-         * on the cleanup stack
-         */
-        static CDeliveryComponentStorage* NewLC();
-
-        /**
-         * Destructor
-         */
-        virtual ~CDeliveryComponentStorage();
-
-        /**
-         * GetComponentIds Returns the const id array of component ids.
-         */
-        const RComponentIdArray &GetComponentIds() const;
-
-        /**
-         * Places all those component's ids in array who have possibly changed
-         * state and no StateChangedL for that id called afterwards.
-         * @param aArray array to hold the ids
-         */
-        void GetStateChangeComponentIdsL(RComponentIdArray &aArray);
-
-        /**
-         * StateChangedL Confirms that state change has been acknowledged by user
-         * @param aInternalId The id whose state change is confirmed.
-         */
-        void StateChangedL(TUint32 aInternalId);
-
-        /**
-         * Creates new deployment component object having given state and user id
-         * and constructs it. Optionally component may have owning certificate.
-         * @param aState the state of to-be-created component
-         * @param aUserId the user id of to-be-created component
-         * @param aCertInfo the certificate of the owner of to-be-created component
-         */
-        CDeploymentComponent *NewComponentL(
-                const TDeploymentComponentState &aState,
-                const TDCUserId &aUserId, const TCertInfo *aCertInfo = NULL);
-
-        /**
-         * DeliverL makes the given component ot delivered state
-         * @param aComponent the component that'll be delivered
-         */
-        void DeliverL(CDeploymentComponent &aComponent);
-
-        /**
-         * UpdateL updates the given component permanently
-         * @param aComponent the component that'll be persisted
-         */
-        void UpdateL(const CDeploymentComponent &aComponent);
-
-        /**
-         * RemoveL Removes the deployment component having given id. The related object
-         * will be invalid after call.
-         * @param aInternalId the to-be-removed component's id
-         */
-        void RemoveL(TUint32 aInternalId);
-
-        /**
-         * InstalledL updates the given component state 
-         * @param aComponent the component that'll be persisted
-         */
-        void InstalledL(CDeploymentComponent &aComponent);
-
-    //Update Deplyoment Components State variable
-	void SetDeploymentComponentState(CDeploymentComponent &aComponent,TDeploymentComponentState aState);
-        CDeploymentComponent &ComponentL(TUint32 aInternalId);
-        void ActivateL(CDeploymentComponent &aComponent);
-        void DeactivateL(CDeploymentComponent &aComponent);
-
-        void CheckForDuplicateNodesInDeployedL(
-                CDeploymentComponent &aComponent);
-        HBufC8* IntToDes8LC(const TInt aLuid);
-
-        const RCertArray &Certificates() const
-            {
-            return iCertificates;
-            }
-protected:
-
-        CDeploymentComponent *LoadComponentL(TInt aInternalId,
-                const TDesC8 &aBuffer) const;
-private:
-        CRepository *iRepository;
-        RPointerArray<CDeploymentComponent> iComponents;
-        RComponentIdArray iComponentIds;
-        TInt iNextId;
-        RCertArray iCertificates;
-        CAMAppHideUtil *iHidder;
-        };
-
-    }
-
-#endif __AMDELIVERYCOMPSTORAGE_H__
-
-//  End of File
--- a/applicationmanagement/server/inc/nsmldmiapmatcher.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,116 +0,0 @@
-/*
- * 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:  DM Tree module
- *
- */
-
-#ifndef __NSMLDMIAPMATCHER_H__
-#define __NSMLDMIAPMATCHER_H__
-
-// ------------------------------------------------------------------------------------------------
-// Includes
-// ------------------------------------------------------------------------------------------------
-#include <e32base.h>
-#include "nsmldmuri.h"
-
-//CLASS FORWARDS
-class MSmlDmCallback;
-
-_LIT8( KNSmlDMIAPUri, "AP" );
-_LIT8( KNSmlDMSeparator8, "/" );
-_LIT8( KNSmlDMIAPUriDotSlash, "./" );
-
-const TUint8 KNSmlDMSlash = 0x2f; //forward slash
-/**
- * CNSmlDMIAPMatcher contains services for generating URI from IAPId and
- * vice versa in DM plug-in adapters. The class needs the working
- * MSmlDmCallback callback interface for operating, so ths can be used only
- * by DM plug-in adapters
- *
- *  @since
- */
-class CNSmlDMIAPMatcher : public CBase
-    {
-public:
-    /**
-     * Destructor
-     */
-    ~CNSmlDMIAPMatcher();
-
-    /**
-     * Two-phased constructor
-     * @param	aDmCallback			Pointer to callback interface
-     * @return						Pointer to newly created module instance
-     */
-    static CNSmlDMIAPMatcher* NewL(MSmlDmCallback* aDmCallback);
-
-    /**
-     * Two-phased constructor, pushes pointer to cleanup stack.
-     * @param	aDmCallback			Pointer to callback interface
-     * @return						Pointer to newly created module instance
-     */
-    static CNSmlDMIAPMatcher* NewLC(MSmlDmCallback* aDmCallback);
-
-    /**
-     * Gets the IAP id which corresponds to given URI
-     * @param	aURI				Accespoint URI
-     * @return						Accespoint id in AP database
-     */
-    TInt IAPIdFromURIL(const TDesC8& aURI);
-
-    /**
-     * Generates the URI which corresponds to given IAP Id
-     * @param	aIAPId				Accespoint Id
-     * @return						Accesspoint URI in DM
-     */
-    HBufC8* URIFromIAPIdL(TInt aIAPId);
-
-private:
-    /**
-     * Second phase constructor
-     * @param	aDmCallback			Pointer to callback interface
-     */
-    void ConstructL(MSmlDmCallback* aDmCallback);
-
-    /**
-     * Changes the given descriptor to Integer
-     * @param	aLuid				Luid in descriptor format
-     * @return						Luid in TInt type
-     */
-    TInt DesToInt(const TDesC8& aLuid) const;
-
-    /**
-     * Return the URI without ./ at the beginning, if those exist
-     * @param	aURI		Uri
-     * @return 		 		Uri without ./
-     */
-    TPtrC8 RemoveDotSlash(const TDesC8& aURI) const;
-
-    /**
-     * Return the last uri segment of the aURI
-     * @param	aURI		Uri
-     * @return 		 		The last uri segment
-     */
-    TPtrC8 LastURISeg(const TDesC8& aURI) const;
-
-private:
-
-    /**
-     * Pointer to callback interface
-     */
-    MSmlDmCallback* iCallback;
-
-    };
-
-#endif // __NSMLDMIAPMATCHER_H__
--- a/applicationmanagement/server/inc/nsmldmuri.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2002 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:  DM tree etc.
- *
- */
-
-#ifndef __NSMLDMURI_H
-#define __NSMLDMURI_H
-
-#include <e32std.h>
-#include <e32base.h>
-
-#define KNSmlDMUriSeparator '/'
-_LIT8(KNSmlDmRootUri, ".");
-_LIT8(KNSmlDmUriDotSlash, "./");
-_LIT8( KNSmlDmQuestionMark, "?" );
-
-// ===========================================================================
-// NSmlDmURI
-// ===========================================================================
-class NSmlDmURI
-    {
-public:
-    static TPtrC8 ParentURI(const TDesC8& aURI);
-    static TPtrC8 LastURISeg(const TDesC8& aURI);
-    static TPtrC8 RemoveDotSlash(const TDesC8& aURI);
-    static TPtrC8 RemoveProp(const TDesC8& aURI);
-    static TPtrC8 RemoveLastSeg(const TDesC8& aURI);
-    static TPtrC8
-            URISeg(const TDesC8& aURI, TInt aLocation, TInt aSegCount=1);
-    static TInt NumOfURISegs(const TDesC8& aURI);
-    };
-
-#endif // __NSMLDMURI_H
--- a/applicationmanagement/server/loc/applicationmanagement.loc	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:   Localisation file. 
-*
-*/
-
-// LOCALISATION STRINGS
-
-// d: This wait note is used while download in progress
-// l: popup_note_wait_window
-// r: 5.2
-#define qtn_dm_wait_downloading "Downloading"
-
-// d: Information note is displayed when user cancels download progress
-// l: popup_note_window/opt2
-// r: 5.2
-#define qtn_dm_query_download_cancelled "Download Cancelled"
-
-// d: Information note is displayed when download fails due to loss in network
-// d: connection
-// l: popup_note_window/opt2
-// r: 5.2
-#define qtn_dm_query_connection_failed "Download failed due to connection error"
-
-// d: Information note is displayed when download fails for any other reason like
-// d: out of memory etc.
-// l: popup_info_list_pane_t1
-// r: 5.2
-#define qtn_dm_query_general_failed "Download failed due to general error"
-// End of File
Binary file applicationmanagement/server/src/1020781C.SPD has changed
--- a/applicationmanagement/server/src/1020781C.txt	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-[database]
-read
-capability = ReadDeviceData
-write
-capability = WriteDeviceData
-schema
-capability = WriteDeviceData
-
-[backup]
-SID = 101F8597
--- a/applicationmanagement/server/src/AMAppHideUtil.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,214 +0,0 @@
-/*
- * 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: Implementation of applicationmanagement components
- *
- */
-
-#include "AMAppHideUtil.h"
-
-#include <centralrepository.h>
-#include <menu2internalcrkeys.h>
-
-#include "debug.h"
-
-using namespace NApplicationManagement;
-
-// The uid list delimiter
-static const TChar KUidDelimiter = ',';
-
-// -----------------------------------------------------------------------------
-// CAMAppHideUtil::CAMAppHideUtil()
-// -----------------------------------------------------------------------------
-CAMAppHideUtil::CAMAppHideUtil() :
-    iChanged(EFalse)
-    {
-
-    }
-
-// -----------------------------------------------------------------------------
-// CAMAppHideUtil::ConstructL()
-// -----------------------------------------------------------------------------
-void CAMAppHideUtil::ConstructL()
-    {
-    LoadUidsL();
-    }
-
-// -----------------------------------------------------------------------------
-// CAMAppHideUtil::~CAMAppHideUtil()
-// -----------------------------------------------------------------------------
-CAMAppHideUtil::~CAMAppHideUtil()
-    {
-    iHiddenUids.Close();
-    }
-
-// -----------------------------------------------------------------------------
-// CAMAppHideUtil::NewL()
-// -----------------------------------------------------------------------------
-CAMAppHideUtil* CAMAppHideUtil::NewL()
-    {
-    CAMAppHideUtil *me = new ( ELeave ) CAMAppHideUtil();
-    CleanupStack::PushL(me);
-    me->ConstructL();
-    CleanupStack::Pop(me);
-    return me;
-    }
-
-// -----------------------------------------------------------------------------
-// CAMAppHideUtil::AddUidL(const TUid& aUid )
-// -----------------------------------------------------------------------------
-void CAMAppHideUtil::AddUidL(const TUid& aUid, TBool aPersist /*= EFalse */)
-    {
-    TInt idx(iHiddenUids.Find(aUid));
-    if (idx == KErrNotFound)
-        {
-        TInt err(iHiddenUids.Append(aUid) );
-        if (err == KErrNone)
-            {
-            iChanged = ETrue;
-            if (aPersist)
-                {
-                PersistUidsL();
-                }
-            }
-        else
-            {
-            RDEBUG_2( "Failed to append uid to hidden list: %d", err );
-            }
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// CAMAppHideUtil::RemoveUidL( const TUid& aUid )
-// -----------------------------------------------------------------------------
-void CAMAppHideUtil::RemoveUidL(const TUid& aUid, TBool aPersist /*= EFalse */)
-    {
-    TInt idx(iHiddenUids.Find(aUid));
-    if (idx != KErrNotFound)
-        {
-        iHiddenUids.Remove(idx);
-        iChanged = ETrue;
-        if (aPersist)
-            {
-            PersistUidsL();
-            }
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// CAMAppHideUtil::PersistUid( const TUid &aUid, TDes &aBuf, TBool aHasMore )
-// -----------------------------------------------------------------------------
-void CAMAppHideUtil::PersistUid(const TUid &aUid, TDes &aBuf, TBool aHasMore) const
-    {
-    aBuf.AppendNumFixedWidth(aUid.iUid, EHex, 8);
-    if (aHasMore)
-        {
-        aBuf.Append(KUidDelimiter);
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// CAMAppHideUtil::PersistUidsL()
-// -----------------------------------------------------------------------------
-void CAMAppHideUtil::PersistUidsL()
-    {
-    if (iChanged)
-        {
-        TBuf<NCentralRepositoryConstants::KMaxUnicodeStringLength> buf;
-        RDEBUG_2( "PersistUids: count %d", iHiddenUids.Count() );
-        for (TInt i(iHiddenUids.Count() - 1); i >= 0; --i)
-            {
-            RDEBUG_3( "PersistUids: cur %d %x", i,iHiddenUids[i].iUid );
-            PersistUid(iHiddenUids[i], buf, i > 0) ;
-            }
-        CRepository *rep = CRepository::NewLC(KCRUidMenu);
-        TInt err(rep->Set(KMenuHideApplication, buf) );
-        CleanupStack::PopAndDestroy(rep);
-        if (err != KErrNone)
-            {
-            RDEBUG_2( "PersistUids: ERROR failed to set key: %d", err );
-            User::Leave(err);
-            }
-        RDEBUG_2( "CAMAppHideUtil::PersistUidsL - Saved '%S'", &buf);
-        iChanged = EFalse;
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// CAMAppHideUtil::ParseUid( TLex &, TUid &aUid ) 
-// -----------------------------------------------------------------------------
-TInt CAMAppHideUtil::ParseUid(TLex &aLex, TUid &aUid) const
-    {
-    aUid = TUid::Null();
-    aLex.Mark();
-    while (aLex.Peek().IsHexDigit() )
-        {
-        aLex.Inc();
-        }
-    TPtrC uidToken = aLex.MarkedToken();
-    TLex uidLex(uidToken);
-    TInt err(uidLex.Val( (TUint32& )aUid.iUid, EHex) );
-    return err;
-    }
-
-// ------------------------------------------------------------------------------
-// CAMAppHideUtil::SkipDelim( TLex & )
-// -----------------------------------------------------------------------------
-TBool CAMAppHideUtil::SkipDelim(TLex &aLex) const
-    {
-    TBool ret(EFalse);
-    if (aLex.Peek() == KUidDelimiter)
-        {
-        aLex.Inc();
-        ret = ETrue;
-        }
-    return (ret );
-    }
-
-// -----------------------------------------------------------------------------
-// CAMAppHideUtil::LoadUidsL()
-// -----------------------------------------------------------------------------
-void CAMAppHideUtil::LoadUidsL()
-    {
-    CRepository *rep = CRepository::NewLC(KCRUidMenu);
-    TBuf<NCentralRepositoryConstants::KMaxUnicodeStringLength> buf;
-    TInt err(rep->Get(KMenuHideApplication, buf) );
-    CleanupStack::PopAndDestroy(rep);
-    if (err == KErrNone)
-        {
-        RDEBUG_2( "CAMAppHideUtil::LoadUidsL - Loading '%S'", &buf);
-        TLex lex(buf);
-        TUid aUid(TUid::Null());
-        do
-            {
-            err = ParseUid(lex, aUid) ;
-            }
-        while (err == KErrNone && iHiddenUids.Append(aUid) == KErrNone
-                && !lex.Eos() && SkipDelim(lex) );
-        }
-    RDEBUG_2( "CAMAppHideUtil::LoadUidsL-Loaded (last parsing status: %d)", err);
-    }
-
-// -----------------------------------------------------------------------------
-// CAMAppHideUtil::Reset()
-// -----------------------------------------------------------------------------
-void CAMAppHideUtil::Reset()
-    {
-    if (iHiddenUids.Count() > 0)
-        {
-        iChanged = ETrue;
-        }
-    iHiddenUids.Reset();
-    }
-
-// End of File
--- a/applicationmanagement/server/src/AMDeploymentComponent.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,830 +0,0 @@
-/*
- * 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: Implementation of applicationmanagement components
- *
- */
-
-#include "AMDownload.h"
-#include "AMDeploymentComponent.h"
-#include "debug.h"
-#include <e32debug.h>
-#include <s32mem.h>
-#include <featmgr.h>
-#include "amprivateCRKeys.h"
-//#include "aminstalloptions.h"
-#include <ssl.h>	
-#ifdef __SERIES60_30__
-#include <CMenuClient.h>
-#endif
-#include "amsmlhelper.h"
-
-using namespace NApplicationManagement;
-
-_LIT8( KAMDCDataSuffix, "_D.txt");
-_LIT8( KAMDCMetaDataSuffix, "_M.txt");
-
-
-/***************************************************
- // CDeploymentComponent
- ***************************************************/
-
-CDeploymentComponent* CDeploymentComponent::NewLC(TInt aInternalId,
-        const TDCUserId &aUserId)
-    {
-    CDeploymentComponent *self = new ( ELeave ) CDeploymentComponent( aInternalId );
-    CleanupStack::PushL(self) ;
-    self->ConstructL(aUserId) ;
-    return self;
-    }
-
-CDeploymentComponent* CDeploymentComponent::NewL(TInt aInternalId,
-        const TDCUserId &aUserId)
-    {
-    CDeploymentComponent *self = NewLC(aInternalId, aUserId);
-    CleanupStack::Pop(self) ;
-    return self;
-    }
-
-CDeploymentComponent* CDeploymentComponent::LoadLC(TInt aInternalId,
-        const TDesC8 &aBuffer)
-    {
-    CDeploymentComponent *self = new ( ELeave ) CDeploymentComponent(aInternalId);
-    CleanupStack::PushL(self) ;
-    self->ConstructLoadL(aBuffer) ;
-    return self;
-    }
-
-CDeploymentComponent* CDeploymentComponent::LoadL(TInt aInternalId,
-        const TDesC8 &aBuffer)
-    {
-    CDeploymentComponent *self = LoadLC(aInternalId, aBuffer);
-    CleanupStack::Pop(self) ;
-    return self;
-    }
-
-CDeploymentComponent::CDeploymentComponent(TInt aInternalId) :
-iInternalId(aInternalId), iPkgVersion( 3), iOwner( -1),
-iOwnerProfile( -1)
-        {
-        iUninstallOpts.iKillApp = SwiUI::EPolicyAllowed;
-        SwiUI::TInstallOptions &opts = iInstallOpts.iOptions;
-        opts.iUpgrade = SwiUI::EPolicyNotAllowed;
-        opts.iOptionalItems = SwiUI::EPolicyNotAllowed;
-        opts.iOCSP = SwiUI::EPolicyNotAllowed;
-        opts.iIgnoreOCSPWarnings = SwiUI::EPolicyNotAllowed;
-        //    iIgnoreOtherWarnings = SwiUI::EPolicyNotAllowed;
-        opts.iUntrusted = SwiUI::EPolicyNotAllowed;
-        opts.iPackageInfo = SwiUI::EPolicyNotAllowed;
-        opts.iCapabilities = SwiUI::EPolicyNotAllowed;
-        opts.iKillApp = SwiUI::EPolicyNotAllowed;
-        opts.iOverwrite = SwiUI::EPolicyNotAllowed;
-        opts.iDownload = SwiUI::EPolicyNotAllowed;
-        opts.iDrive = SwiUI::EPolicyNotAllowed;
-        opts.iLang = ELangNone;
-        opts.iUsePhoneLang = EFalse;
-        }
-
-CDeploymentComponent::~CDeploymentComponent()
-    {
-    RDEBUG8_3( "CDeploymentComponent::~CDeploymentComponent 0x%X - 0x%X",
-            reinterpret_cast<TUint>(this), reinterpret_cast<TUint>(this)+sizeof( CDeploymentComponent ) );
-    delete iData;
-    iData = NULL;
-
-    delete iMetaData;
-    iMetaData = NULL;
-    }
-
-CDeploymentComponent &CDeploymentComponent::operator=( const CDeploymentComponent &aData )
-    {
-    if( &aData != this )
-        {
-        *iData = aData.Data();
-        *iMetaData = aData.MetaData();
-        iId = aData.ComponentId();
-        iName = aData.ComponentName();
-        iVersion = aData.iVersion;
-        iState = aData.State();
-        iInternalId = aData.InternalId();
-        iUid = aData.Uid();
-        iUserId = aData.iUserId;
-        iOwner = aData.iOwner;
-        iInstallOpts = aData.InstallOpts();
-        iPkgID = aData.PkgId();
-        iDescription = aData.Description();
-        iPkgIDRef = aData.PkgIDRef();
-        iPkgType = aData.PkgType();
-        iRemovableApp = aData.AppRemovable();
-        iInstallOptsSet = aData.InstallOptsSet();
-        iPkgVersion = aData.iPkgVersion;
-        iDownloadStatus = aData.iDownloadStatus;
-        iDownloadURI = aData.iDownloadURI;
-        iUninstallOpts = aData.UninstallOpts();
-        iOwnerProfile = aData.OwnerProfile();
-        }
-    return *this;
-    }
-
-void CDeploymentComponent::PersistL(CRepository &aRepository) const
-    {
-    CBufBase *buf = CBufFlat::NewL( 32);
-    CleanupStack::PushL(buf);
-    TInt length(SerializedFormLength() );
-    buf->ExpandL(0, length+1);
-    TPtr8 p3(buf->Ptr(0) );
-    RDesWriteStream stream(p3);
-    TInt len(SerializedFormL(stream) );
-    TBuf8< NCentralRepositoryConstants::KMaxBinaryLength> tbuf;
-
-    TInt err(aRepository.Get(iInternalId, tbuf) );
-    if (err == KErrNotFound)
-        {
-        err = aRepository.Create(iInternalId, buf->Ptr(0) );
-        RDEBUG_3( "CDeploymentComponent::PersistL:  Created %d to centrep with status %d", iInternalId, err );
-        }
-    else
-        {
-        User::LeaveIfError(err) ;
-        err = aRepository.Set(iInternalId, buf->Ptr(0) );
-        RDEBUG_3( "CDeploymentComponent::PersistL:  Persisted %d to centrep with status %d", iInternalId, err );
-        }
-    User::LeaveIfError(err) ;
-    CleanupStack::PopAndDestroy(buf);
-    RFs fs;
-    User::LeaveIfError(fs.Connect() );
-    CleanupClosePushL(fs);
-    iData->PersistL(fs);
-    iMetaData->PersistL(fs);
-    CleanupStack::PopAndDestroy( &fs) ;
-    }
-
-void CDeploymentComponent::CopyStateTo(TDeploymentComponent &aInfo) const
-    {
-    aInfo.iId = iId;
-    aInfo.iName = iName;
-    aInfo.iVersion = iVersion;
-    aInfo.iDescription = iDescription;
-    aInfo.iPkgID = iPkgID;
-    aInfo.iPkgIDRef = iPkgIDRef;
-    aInfo.iPkgType = iPkgType;
-    aInfo.iState = iState;
-    aInfo.iOldState = iOldState;
-    }
-
-TBool CDeploymentComponent::IsJavaMimeL(const TDesC8& aMime)
-    {
-
-    FeatureManager::InitializeLibL();
-    TBool supported = EFalse;
-
-    if (FeatureManager::FeatureSupported(KFeatureIdJavaMIDP20) )
-        {
-        supported = ((aMime == SwiUI::KJarMIMEType || aMime
-                == SwiUI::KJadMIMEType || aMime == SwiUI::KJarxMIMEType
-                || aMime == SwiUI::KJavaMIMEType) ? ETrue : EFalse );
-        }
-    FeatureManager::UnInitializeLib();
-
-    return supported;
-    }
-
-TBool CDeploymentComponent::IsSisMimeL(const TDesC8& aMime)
-    {
-
-    
-    TBool supported = EFalse;
-
-    supported = ((aMime == SwiUI::KSisxMimeType || aMime
-                == SwiUI::KSisMimeType || aMime == SwiUI::KPipMimeType) ? ETrue : EFalse );
-   
-    return supported;
-    }
-
-void CDeploymentComponent::ConstructL(const TDCUserId &aUserId)
-    {
-    iUserId = aUserId;
-    RFs fs;
-    User::LeaveIfError(fs.Connect() );
-    CleanupClosePushL(fs);
-    TInt e(fs.CreatePrivatePath(KDefaultDrive) );
-    User::LeaveIfError(e);
-    TBuf<30> privatePath;
-    fs.PrivatePath(privatePath);
-    CleanupStack::PopAndDestroy( &fs);
-
-    TInt privPathLength(privatePath.Length() );
-    TBuf8<10> buf;
-    buf.NumFixedWidth(iInternalId, EHex, 10);
-
-    TBuf8 <30> path;
-    path.Copy(privatePath);
-    HBufC8 *afilename = HBufC8::NewLC(privPathLength + 10 + KAMDCDataSuffix().Length());
-    *afilename = path;
-    TPtr8 afn(afilename->Des() );
-    afn.Append(buf);
-    afn.Append(KAMDCDataSuffix) ;
-    iData = CDeploymentComponentData::NewL(CDeploymentComponentData::EData,
-            KNullDesC8, KNullDesC8, afn);
-
-    afn.Replace(privPathLength + 10, KAMDCMetaDataSuffix().Length(), KAMDCMetaDataSuffix);
-    iMetaData = CDeploymentComponentData::NewL(
-            CDeploymentComponentData::EMetaData, KNullDesC8, KNullDesC8, afn);
-
-    CleanupStack::PopAndDestroy(afilename);
-    }
-
-TInt CDeploymentComponent::SerializedFormLength() const
-    {
-    //   0			1		2		3		4		5			6			7	8			9			10		11
-    // iUserId , iState, iPkgVer, iUid, iIdLen, iNameLen, iVersLen, iDownState, iOwner, iOldState ,iDownUriLen, iInstallOptsset
-    return (20*4)+iUserId.Length() + iId.Length() + iName.Length()
-            + iVersion.Length() +
-
-    iMidletName.Length() + iMideltVendorName.Length()
-            + iMidletVersion.Length()+ iDownloadURI.Length()
-            + iDescription.Length()+ iPkgID.Length()+iPkgIDRef.Length()
-            +iPkgType.Length()+ sizeof(iRemovableApp) + iData->SerializedFormLength()
-            + iMetaData->SerializedFormLength() + sizeof(TAMInstallOptions);
-    }
-
-TInt CDeploymentComponent::SerializedFormL(RWriteStream &aBuffer) const
-    {
-#ifdef _DEBUG
-    RDEBUG_2( "Offset before uint: %d", aBuffer.Sink()->TellL( MStreamBuf::EWrite ).Offset() );
-#endif
-
-    aBuffer.WriteUint32L(iPkgVersion);
-
-#ifdef _DEBUG
-    RDEBUG_2( "Offset after uint: %d" , aBuffer.Sink()->TellL( MStreamBuf::EWrite ).Offset() );
-#endif
-
-    aBuffer.WriteUint32L(iState);
-    aBuffer.WriteUint32L(iStatus);
-    aBuffer.WriteUint32L(iUid.iUid);
-    aBuffer.WriteUint32L(iUserId.Length() );
-    aBuffer.WriteL(iUserId);
-    aBuffer.WriteUint32L(iId.Length() );
-    aBuffer.WriteL(iId);
-    aBuffer.WriteUint32L(iName.Length() );
-    aBuffer.WriteL(iName);
-    aBuffer.WriteUint32L(iVersion.Length() );
-    aBuffer.WriteL(iVersion);
-    aBuffer.WriteUint32L(iMidletName.Length() );
-    aBuffer.WriteL(iMidletName);
-    aBuffer.WriteUint32L(iMideltVendorName.Length() );
-    aBuffer.WriteL(iMideltVendorName);
-    aBuffer.WriteUint32L(iMidletVersion.Length() );
-    aBuffer.WriteL(iMidletVersion);
-    aBuffer.WriteInt32L(iDownloadStatus);
-    aBuffer.WriteInt32L(iOwner);
-    aBuffer.WriteUint32L(iOldState);
-    aBuffer.WriteUint32L(iDownloadURI.Length() );
-    aBuffer.WriteL(iDownloadURI);
-    aBuffer.WriteUint32L(iDescription.Length() );
-    aBuffer.WriteL(iDescription);
-    aBuffer.WriteUint32L(iPkgID.Length() );
-    aBuffer.WriteL(iPkgID);
-    aBuffer.WriteUint32L(iPkgIDRef.Length() );
-    aBuffer.WriteL(iPkgIDRef);
-    aBuffer.WriteUint32L(iPkgType.Length() );
-    aBuffer.WriteL(iPkgType);
-    aBuffer.WriteUint32L(iRemovableApp);
-    iData->SerializedFormL(aBuffer);
-    iMetaData->SerializedFormL(aBuffer);
-    aBuffer.WriteUint32L(iInstallOptsSet);
-    TPckg<TAMInstallOptions> opts(iInstallOpts);
-    aBuffer.WriteL(opts);
-    return aBuffer.Sink()->TellL( MStreamBuf::EWrite ).Offset();
-    }
-
-void CDeploymentComponent::ConstructLoadL(const TDesC8 &aBuffer)
-    {
-    RDEBUG( "CDeploymentComponent::ConstructLoadL ");
-    TDeploymentComponent aRes;
-    TMimeType aType;
-
-    RDesReadStream stream(aBuffer);
-    iPkgVersion = stream.ReadUint32L();
-
-    iState = static_cast<TDeploymentComponentState>(stream.ReadUint32L() );
-    iStatus = static_cast<TSCOMOStatusNodeStates>(stream.ReadUint32L() );
-    iUid.iUid = stream.ReadUint32L();
-
-    TUint32 len(stream.ReadUint32L() );
-    stream.ReadL(iUserId, len);
-
-    len = stream.ReadUint32L();
-    stream.ReadL(iId, len);
-
-    len = stream.ReadUint32L();
-    stream.ReadL(iName, len);
-
-    len = stream.ReadUint32L();
-    stream.ReadL(iVersion, len);
-
-    len = stream.ReadUint32L();
-    stream.ReadL(iMidletName, len);
-
-    len = stream.ReadUint32L();
-    stream.ReadL(iMideltVendorName, len);
-
-    len = stream.ReadUint32L();
-    stream.ReadL(iMidletVersion, len);
-
-    iDownloadStatus = stream.ReadInt32L();
-
-    if (iPkgVersion > 1)
-        {
-        iOwner = stream.ReadInt32L();
-        }
-    if (iPkgVersion > 2)
-        {
-        iOldState = TDeploymentComponentState(stream.ReadUint32L() );
-        }
-
-    len = stream.ReadUint32L() ;
-    stream.ReadL(iDownloadURI, len);
-
-    len = stream.ReadUint32L();
-    stream.ReadL(iDescription, len);
-
-    len = stream.ReadUint32L();
-    stream.ReadL(iPkgID, len);
-
-    len = stream.ReadUint32L();
-    stream.ReadL(iPkgIDRef, len);
-
-    len = stream.ReadUint32L();
-    stream.ReadL(iPkgType, len);
-
-    iRemovableApp = stream.ReadUint32L();
-    iData = CDeploymentComponentData::LoadL(stream);
-    iMetaData = CDeploymentComponentData::LoadL(stream);
-
-    //using namespace SwiUI;
-    iInstallOptsSet = stream.ReadUint32L();
-    TAMInstallOptionsPckg opts(iInstallOpts);
-    stream.ReadL(opts, opts.Length() );
-    RDEBUG( "CDeploymentComponent::ConstructLoadL end");
-    }
-
-CDeploymentComponentData &CDeploymentComponent::Data()
-    {
-    return *iData;
-    }
-
-const CDeploymentComponentData &CDeploymentComponent::Data() const
-    {
-    return *iData;
-    }
-
-CDeploymentComponentData &CDeploymentComponent::MetaData()
-    {
-    return *iMetaData;
-    }
-
-const CDeploymentComponentData &CDeploymentComponent::MetaData() const
-    {
-    return *iMetaData;
-    }
-
-const TAMInstallOptions &CDeploymentComponent::InstallOpts() const
-    {
-    return iInstallOpts;
-    }
-
-const SwiUI::TUninstallOptions &CDeploymentComponent::UninstallOpts() const
-    {
-    return iUninstallOpts;
-    }
-
-TBool CDeploymentComponent::InstallOptsSet() const
-    {
-    return iInstallOptsSet;
-    }
-
-TBool CDeploymentComponent::AppRemovable() const
-    {
-    return iRemovableApp;
-    }
-
-void CDeploymentComponent::SetMetaDataL(const TDesC8 &aMimeType)
-    {
-    iMetaData->DataFileName();
-    iMetaData->SetDataL(aMimeType);
-    }
-
-void CDeploymentComponent::SetMetaDataL(const TDesC8 &aMetaData,
-        const TDesC8 &aMimeType)
-    {
-    iMetaData->SetDataL(aMetaData, aMimeType);
-    }
-
-void CDeploymentComponent::SetAppRemovableStatus(const TBool &aRemovable)
-    {
-    iRemovableApp = aRemovable;
-    }
-
-void CDeploymentComponent::SetInstallOptsL(const TDesC8 &aInstallOpts)
-    {
-    using namespace SwiUI;
-    if (aInstallOpts != KNullDesC8)
-        {
-        RDEBUG8_2( "CDeploymentComponent::SetInstallOptsL: '%S'", &aInstallOpts );
-        TInt tmpIAP(iInstallOpts.iIAP);
-        TAMInstallOptionsPckg pckg(iInstallOpts);
-        pckg.Copy(aInstallOpts);
-        iInstallOptsSet= ETrue;
-
-        if (iInstallOpts.iIAP == -1 && tmpIAP > -1)
-            {
-            RDEBUG8_2( "CDeploymentComponent::SetInstallOptsL: using IAPid %d", tmpIAP );
-            iInstallOpts.iIAP = tmpIAP;
-            }
-        }
-
-    }
-
-void CDeploymentComponent::ResetDataL(RFs &aFs)
-    {
-    iData->ResetData(aFs);
-    iMetaData->ResetData(aFs);
-    }
-
-void CDeploymentComponent::SetAttr(TDes8 &aAttr, const TDesC8 &aNewVal) const
-    {
-    if (aNewVal.Length() > aAttr.MaxLength() )
-        {
-        aAttr = aNewVal.Left(aAttr.MaxLength() );
-        }
-    else
-        {
-        aAttr = aNewVal;
-        }
-    }
-
-void CDeploymentComponent::SetIdL(const TDesC8 &aId)
-    {
-    SetAttr(iId, aId);
-    }
-
-void CDeploymentComponent::SetNameL(const TDesC8 &aName)
-    {
-    if (iName != aName)
-        {
-        SetAttr(iName, aName);
-        }
-    }
-
-void CDeploymentComponent::SetVersionL(const TDesC8 &aVersion)
-    {
-    SetAttr(iVersion, aVersion);
-    }
-void CDeploymentComponent::SetMimeTypeL( const TDesC8 &aMimeType )
-{
-	iData->SetMimeTypeL(aMimeType);
-}
-
-void CDeploymentComponent::SetDescriptionL(const TDesC8 &aDescription)
-    {
-    SetAttr(iDescription, aDescription);
-    }
-
-void CDeploymentComponent::SetPkgIDL(const TDesC8 &aPkgID)
-    {
-    // PkgID and PkgIDRef should be same and Get done on PkgID
-    // when state is in Download or Delivered and PkgIDRef is
-    // returned when state is in Deployed state
-    SetAttr(iPkgID, aPkgID);
-    SetAttr(iPkgIDRef, aPkgID);
-    }
-
-void CDeploymentComponent::SetPkgTypeL(const TDesC8 &aPkgType)
-    {
-
-    SetAttr(iPkgType, aPkgType);
-
-    }
-void CDeploymentComponent::SetMidletNameL(const TDesC8 &aMidletName)
-    {
-    SetAttr(iMidletName, aMidletName);
-    }
-
-void CDeploymentComponent::SetMidletVendorL(const TDesC8 &aMidletVendor)
-    {
-    SetAttr(iMideltVendorName, aMidletVendor);
-    }
-
-void CDeploymentComponent::SetMidletVersionL(const TDesC8 &aMidletVersion)
-    {
-    SetAttr(iMidletVersion, aMidletVersion);
-    }
-
-void CDeploymentComponent::SetUid(const TUid aUid)
-    {
-    RDEBUG8_2("CDeploymentComponent::SetUid 0x%x", aUid.iUid );
-    iUid = aUid;
-    iId.Zero();
-    if (iUid != TUid::Null() )
-        {
-        iId.AppendNumFixedWidth(iUid.iUid, EHex, 8);
-        }
-    }
-
-void CDeploymentComponent::SetOwnerProfile(TSmlProfileId aOwnerProfile)
-    {
-    iOwnerProfile = aOwnerProfile;
-    }
-
-TInt CDeploymentComponent::SetState(const TDeploymentComponentState &aState)
-    {
-    RDEBUG_2( "CDeploymentComponent::SetState - set to state (%d)", aState );
-
-    TInt ret(KErrNone);
-    iOldState = iState;
-    iState = aState;
-#ifdef __SERIES60_30__
-    if( iState != iOldState && iState != EDCSDownload && iState != EDCSDelivered )
-        {
-        if ( iUid != TUid::Null() )
-            {
-            RMenuServSession ses;
-            TBool visible( EFalse );
-            if ( iState == EDCSActive )
-                {
-                visible = ETrue;
-                }
-            TRAP( ret, ses.SetApplicationVisibilityL( iUid.iUid, visible ) );
-            if (ret != KErrNone )
-                {
-                RDEBUG_2( "CDeploymentComponent::SetState - failed to set visiblity %d", ret );
-                }
-            else
-                {
-                RDEBUG_2( "CDeploymentComponent::SetState - Set visiblity to %d", visible );
-                }
-            }
-        else
-            {
-            RDEBUG( "CDeploymentComponent::SetState - No need to set visibility to null uid" );
-            }
-
-        }
-    else
-        {
-        RDEBUG( "CDeploymentComponent::SetState - No need to change visibility " );
-        }
-#endif	
-    return ret;
-    }
-
-void CDeploymentComponent::SetStatusNode(
-        const TSCOMOStatusNodeStates &aStatus) const
-    {
-    iStatus = aStatus;
-    CRepository *repository=NULL;
-
-    TRAPD( erx, repository = CRepository::NewL ( KCRUidPrivateApplicationManagementKeys ) )
-    ;
-    if (erx!=KErrNone)
-        return;
-
-    TRAPD(err, PersistL(*repository))
-    ;
-
-    delete repository;
-
-    if (err!=KErrNone)
-        return;
-
-    }
-
-void CDeploymentComponent::Set(const TDeploymentComponent &aInfo)
-    {
-    iId = aInfo.iId;
-    iName = aInfo.iId;
-    iVersion = aInfo.iVersion;
-    iDescription = aInfo.iDescription;
-    iPkgID = aInfo.iPkgID;
-    iPkgIDRef = aInfo.iPkgIDRef;
-    iPkgType = aInfo.iPkgType;
-    }
-
-void CDeploymentComponent::SetDownloadURIL(const TDesC8 &aURI)
-    {
-    if (iState == EDCSDownload)
-        {
-        iDownloadURI = aURI;
-        }
-    else
-        {
-        RDEBUG_2( "CDeploymentComponent::SetDownloadURIL: ERROR Illegal state: %d", iState );
-        User::Leave(KErrNotSupported) ;
-        }
-    }
-
-void CDeploymentComponent::SetDownloadTarget(
-        const TDownloadTarget& aDownloadTarget)
-    {
-    RDEBUG_2("CDeploymentComponent::SetDownloadTarget: (%d)", aDownloadTarget);
-    iDownloadTarget = aDownloadTarget;
-    }
-
-void CDeploymentComponent::SetDataL(const TDesC8 &aData,
-        const TDesC8 &aMimeType)
-    {
-    iUid = iData->SetDataL(aData, aMimeType);
-    iId.Zero();
-    if (iUid != TUid::Null() )
-        {
-        iId.AppendNumFixedWidth(iUid.iUid, EHex, 8);
-        }
-    }
-
-void CDeploymentComponent::SetDataL(const TDesC &aFileName,
-        const TDesC8 &aMimeType)
-    {
-    SetUid(iData->SetDataL(aFileName, aMimeType) );
-    }
-
-void CDeploymentComponent::SetDataL(const TDesC8 &aMimeType)
-    {
-    SetUid(iData->SetDataL(aMimeType) );
-    }
-
-// ----------------------------------------------------------------------------------------
-// CDeploymentComponent::StatusUpdateL
-// ----------------------------------------------------------------------------------------	
-void CDeploymentComponent::StatusUpdateL(TInt aNewStatus)
-    {
-    RDEBUG( "CDeploymentComponent::StatusUpdateL : begin");
-    RDEBUG_2( "CDeploymentComponent::StatusUpdateL %d", aNewStatus );
-
-    if (State() == EDCSDownload)
-        {
-        iDownloadStatus = aNewStatus;
-        RDEBUG_2( "CDeploymentComponent::StatusUpdate: Set status to: %d", iDownloadStatus );
-
-        if (DownloadFailed() )
-            {
-            SetStatusNode(EDownload_DownloadFailed);
-            RDEBUG8_2( "CDeploymentComponent::StatusUpdate: ERROR Failed to download URI: '%S' ", &iDownloadURI );
-            }
-
-        if (iCallback)
-            {
-            iCallback->DownloadComplete( this, iDownloadStatus);
-            }
-        }
-    else
-        {
-        RDEBUG_2( "CDeploymentComponent::StatusUpdate: ERROR Illegal state: %d", State() );
-        }
-    RDEBUG( "CDeploymentComponent::StatusUpdateL : end");
-    }
-
-// ----------------------------------------------------------------------------------------
-// CDeploymentComponent::SuccessStatusUpdateL
-// ----------------------------------------------------------------------------------------	
-void CDeploymentComponent::SuccessStatusUpdateL(const TDesC &aDlFileName,
-        const TDesC8& aDlMimeType)
-    {
-    RDEBUG( "CDeploymentComponent::SuccessStatusUpdateL : start");
-    SetDataL(aDlFileName, aDlMimeType);
-
-    // Set PkgID same as MiME type of downloaded content
-    SetPkgTypeL(aDlMimeType);
-
-    CDeploymentComponent* conflict( NULL);
-    TBool dlOk(ETrue);
-    if (iUid != TUid::Null() )
-        {
-        __ASSERT_DEBUG( iCallback, User::Invariant() );
-        if (iCallback->UidExistsL(iUid, conflict, this) )
-            {
-            }
-        }
-    else
-        {
-        RDEBUG( "CDeploymentComponent::StatusUpdateL - WARNING cannot detect uid" );
-        if (IsJavaMimeL(aDlMimeType) ||IsSisMimeL(aDlMimeType) )
-            {
-            RDEBUG( "CDeploymentComponent::StatusUpdateL - Ignoring prev warning because it's java" );
-            }
-        else
-            {
-            dlOk = EFalse;
-            //The Operation has been rejected because the device does not support this MIME type.
-            iDownloadStatus = KStatusUnSupportedEnvironment;
-            }
-        }
-
-    if (dlOk)
-        {
-        /*for Predefined static node, append static node name with Internal ID before 
-         * moving to delivered state to avoid duplicates
-         */
-        TBuf8<256> staticnode;
-        TInt staticnodeenabled = 0;
-        CRepository* cenrep = CRepository::NewLC( KCRUidPrivateApplicationManagementKeys );
-        cenrep->Get( KAMDownloadPredefinedNode, staticnode ); 
-        cenrep->Get( KAMStaticNodeEnabled, staticnodeenabled );
-        CleanupStack::PopAndDestroy(); //cenrep
-        if (iUserId.Compare(staticnode) == 0 && staticnodeenabled)
-            {
-            iUserId.Append(*IntToDes8LC(iInternalId));
-            CleanupStack::PopAndDestroy(); // for IntToDes8LC()
-            }
-
-        //Reset the value of DownloadStatus for success update
-        iDownloadStatus = 0;
-                
-        SetState(EDCSDelivered);
-        SetStatusNode(EIdle);
-        }
-
-    if (iCallback)
-        {
-        iCallback->DownloadComplete( this, iDownloadStatus);
-        }
-
-    RDEBUG( "CDeploymentComponent::SuccessStatusUpdateL : end");
-    }
-
-const TSmlProfileId& CDeploymentComponent::OwnerProfile() const
-    {
-    return iOwnerProfile;
-    }
-
-const TDesC8& CDeploymentComponent::MimeType() const
-    {
-    if (iMetaData->MimeType().Length() )
-        {
-        return iMetaData->MimeType();
-        }
-    return iData->MimeType();
-    }
-
-TBool CDeploymentComponent::DownloadFailed() const // http or symbian error
-    {
-    return (iDownloadStatus >= 400 || iDownloadStatus < 0) ? ETrue : EFalse;
-    }
-
-TInt CDeploymentComponent::DownloadStatus() const
-    {
-    return iDownloadStatus;
-    }
-
-void CDeploymentComponent::DestroyL(CRepository &aRepository)
-    {
-    TDeploymentComponentState st(State() );
-    if ( !(st == EDCSActive || st == EDCSInactive))
-        {
-        RFs fs;
-        User::LeaveIfError(fs.Connect() );
-        CleanupClosePushL(fs);
-        iMetaData->DestroyL(fs);
-        iData->DestroyL(fs);
-        CleanupStack::PopAndDestroy( &fs) ;// fs
-        }
-
-    TInt err(aRepository.Delete(iInternalId) );
-    RDEBUG_3( "CDeploymentComponent::DestroyL:  Deleting %d in centrep resulted with status %d", iInternalId, err );
-    }
-
-void CDeploymentComponent::SetOwner(const TInt &aInfo)
-    {
-    iOwner = aInfo;
-    }
-
-void CDeploymentComponent::SetIAPL(const TInt aIap)
-    {
-    RDEBUG8_2( "CDeploymentComponent::SetIAPL: %d ", aIap );
-    iInstallOpts.iIAP = aIap;
-    }
-
-TInt CDeploymentComponent::GetIAP() const
-    {
-    return iInstallOpts.iIAP;
-    }
-HBufC8* CDeploymentComponent::IntToDes8LC(const TInt aLuid)
-    {
-    HBufC8* buf = HBufC8::NewLC( 10); //10 = max length of 32bit integer
-    TPtr8 ptrBuf = buf->Des();
-    ptrBuf.Num(aLuid);
-    return buf;
-    }
-
-//  End of File
--- a/applicationmanagement/server/src/AMDeploymentComponentData.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,471 +0,0 @@
-/*
- * Copyright (c) 2000 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: Implementation of applicationmanagement components
- *
- */
-
-#include "amdeploymentcomponentdata.h"
-
-#include <bautils.h>
-#include <sisdataprovider.h>
-
-#include <DRMLicenseManager.h>
-#include "debug.h"
-#include <pathinfo.h>
-#include <zipfilemember.h>
-
-_LIT8( KSisxMimeType, "x-epoc/x-sisx-app" );
-_LIT( KTempDir, "piptemp\\" );
-_LIT8( KPipMimeType, "application/x-pip" );
-_LIT8( KDrmMessageMimeType, "application/vnd.oma.drm.message" );
-_LIT8( KDrmContentMimeType, "application/vnd.oma.drm.content" );
-_LIT8( KSisMimeType, "application/vnd.symbian.install");
-
-using namespace NApplicationManagement;
-
-/**
- *  Data class to Data access
- */
-CDeploymentComponentData::CDeploymentComponentData()
-    {
-    }
-
-CDeploymentComponentData::CDeploymentComponentData(TType aType,
-        const TDesC8 &aDataFile) :
-    iDataFileName(aDataFile), iType(aType)
-    {
-
-    }
-
-void CDeploymentComponentData::ConstructL(const TDesC8 &aData,
-        const TDesC8 &aMime)
-    {
-    SetDataL(aData, aMime);
-    }
-
-CDeploymentComponentData &CDeploymentComponentData::operator=(
-        const CDeploymentComponentData &aData )
-    {
-    if( &aData != this )
-        {
-        SetDataL( aData.Data(), aData.MimeType() );
-        iType = aData.iType;
-        iDataFileName = aData.iDataFileName;
-        }
-    return *this;
-    }
-
-void CDeploymentComponentData::ConstructLoadL(RReadStream &aStream)
-    {
-    TUint32 len(aStream.ReadUint32L() );
-    aStream.ReadL(iDataFileName, len);
-
-    len = aStream.ReadUint32L();
-    aStream.ReadL(iMimeType, len);
-    }
-
-CDeploymentComponentData* CDeploymentComponentData::NewL(TType aType,
-        const TDesC8 &aData, const TDesC8 &aMime, const TDesC8 &aDataFile)
-    {
-    CDeploymentComponentData *self = CDeploymentComponentData::NewLC(aType,
-            aData, aMime, aDataFile);
-    CleanupStack::Pop();
-    return self;
-    }
-
-CDeploymentComponentData* CDeploymentComponentData::NewLC(TType aType,
-        const TDesC8 &aData, const TDesC8 &aMime, const TDesC8 &aDataFile)
-    {
-    CDeploymentComponentData *self = new ( ELeave ) CDeploymentComponentData( aType, aDataFile);
-    CleanupStack::PushL(self) ;
-    self->ConstructL(aData, aMime);
-    return self;
-    }
-
-CDeploymentComponentData* CDeploymentComponentData::LoadL(
-        RReadStream &aBuffer)
-    {
-    CDeploymentComponentData *self =
-            CDeploymentComponentData::LoadLC(aBuffer);
-    CleanupStack::Pop();
-    return self;
-    }
-
-CDeploymentComponentData* CDeploymentComponentData::LoadLC(
-        RReadStream &aBuffer)
-    {
-    CDeploymentComponentData *self = new ( ELeave ) CDeploymentComponentData();
-    CleanupStack::PushL(self) ;
-    self->ConstructLoadL(aBuffer);
-    return self;
-    }
-
-CDeploymentComponentData::~CDeploymentComponentData()
-    {
-    RDEBUG8_3("CDeploymentComponentData::~CDeploymentComponentData 0x%X - 0x%X", reinterpret_cast<TUint>(this),
-            reinterpret_cast<TUint>(this)+sizeof( CDeploymentComponentData ) );
-
-    delete iData;
-    iData = NULL;
-    }
-
-TInt CDeploymentComponentData::DataLengthL() const
-    {
-    TInt ret( 0);
-    if (iData == NULL)
-        {
-        if (iDataFileName.Length() > 0)
-            {
-            RFs fs;
-            User::LeaveIfError(fs.Connect() );
-            CleanupClosePushL(fs); // 1
-            TEntry entry;
-            TFileName fileName;
-            fileName.Copy(iDataFileName);
-            User::LeaveIfError(fs.Entry(fileName, entry) );
-            ret = entry.iSize;
-            CleanupStack::PopAndDestroy( &fs);
-            }
-        }
-    else
-        {
-        ret = iData->Length();
-        }
-    return ret;
-    }
-
-const TDesC8 &CDeploymentComponentData::Data() const
-    {
-    if (iData == NULL)
-        {
-        TRAPD( err, LoadDataL() )
-        ;
-        if (err != KErrNone)
-            {
-            return KNullDesC8();
-            }
-        }
-    if (iData != NULL)
-        {
-        return *iData;
-        }
-    else
-        {
-        return KNullDesC8();
-        }
-    }
-
-void CDeploymentComponentData::LoadDataL() const
-    {
-
-    if (iDataFileName.Length() > 0)
-        {
-        RFs fs;
-        User::LeaveIfError(fs.Connect() );
-        CleanupClosePushL(fs); // 1
-        RFile file;
-        TFileName fileName;
-        fileName.Copy(iDataFileName);
-        TInt err(file.Open(fs, fileName, EFileRead) );
-        if (err == KErrNone)
-            {
-            CleanupClosePushL(file); // 2
-            TInt fsize;
-            User::LeaveIfError(file.Size(fsize) );
-            iData = HBufC8::NewL(fsize);
-            TPtr8 ptr(iData->Des() );
-            User::LeaveIfError(file.Read(ptr) );
-            CleanupStack::PopAndDestroy( &file);
-            }
-        else
-            {
-            RDEBUG_3( "ERROR Leaving CDeploymentComponentData::Data - SEVERE Could not open data file '%S': %d!",
-                    &fileName, err );
-            User::Leave(KErrNotFound) ;
-            }
-        CleanupStack::PopAndDestroy( &fs);
-        }
-    else
-        {
-        RDEBUG( "ERROR Leaving CDeploymentComponentData::LoadDataL() - No file to load!" );
-        User::Leave(KErrNotFound) ;
-        }
-    }
-
-TUid CDeploymentComponentData::SetDataL(const TDesC8& aMimeType)
-    {
-    RDEBUG8_2("CDeploymentComponentData::SetDataL() aMimeType: (%S)", &aMimeType);
-
-    TUid ret(TUid::Null());
-    iMimeType = aMimeType.Left(KMaxMimeLength);
-
-    if (IsSISInstallFile(aMimeType) )
-        {
-        RFs fs;
-        User::LeaveIfError(fs.Connect() );
-        CleanupClosePushL(fs);
-        ret = ResolveUidL(fs);
-        CleanupStack::PopAndDestroy( &fs);
-        }
-    RDEBUG8_2("CDeploymentComponentData::SetDataL() UID: (0x%x)", ret.iUid);
-    return ret;
-    }
-
-TUid CDeploymentComponentData::SetDataL(const TFileName &aData,
-        const TDesC8& aMimeType)
-    {
-    RDEBUG_2("CDeploymentComponentData::SetDataL() TFileName: (%S)", &aData);
-
-    TUid ret(TUid::Null());
-    iMimeType = aMimeType.Left(KMaxMimeLength) ;
-    RFs fs;
-    User::LeaveIfError(fs.Connect() );
-    CleanupClosePushL(fs);
-    CFileMan *fm = CFileMan::NewL(fs);
-    CleanupStack::PushL(fm);
-    TFileName fn;
-    fn.Copy(iDataFileName);
-    User::LeaveIfError(fm->Copy(aData, fn) );
-
-    if (IsSISInstallFile(aMimeType) )
-        {
-        ret = ResolveUidL(fs);
-        }
-
-    CleanupStack::PopAndDestroy(fm);
-    CleanupStack::PopAndDestroy( &fs);
-    RDEBUG_2("CDeploymentComponentData::SetDataL() (%d)", ret.iUid);
-
-    return ret;
-    }
-
-TUid CDeploymentComponentData::SetDataL(const TDesC8 &aData,
-        const TDesC8 &aMimeType)
-    {
-    TUid ret(TUid::Null());
-    if (iData)
-        {
-        delete iData;
-        iData = NULL;
-        }
-    iData = aData.AllocL();
-    ret = SetDataL(aMimeType);
-    return ret;
-    }
-
-TBool CDeploymentComponentData::IsSISInstallFile(const TDesC8 &aMimeType)
-    {
-    TBool isSIS(EFalse);
-
-    if (aMimeType == KSisxMimeType || aMimeType == KPipMimeType || aMimeType
-            == KDrmMessageMimeType || aMimeType == KDrmContentMimeType || aMimeType == KSisMimeType)
-        {
-        isSIS = ETrue;
-        }
-
-    return isSIS;
-    }
-
-TUid CDeploymentComponentData::ResolveUidL(RFs& aFs)
-    {
-    RDEBUG("CDeploymentComponentData::ResolveUidL()");
-
-    TUid ret(TUid::Null() );
-    HBufC* buf = HBufC::NewLC(KMaxFileName);
-    TPtr16 ptr = buf->Des();
-    ptr.Copy(iDataFileName);
-
-    // if PIP/DRM package, we need to use license manager to extract the sis file
-    if (iMimeType == KPipMimeType || iMimeType == KDrmMessageMimeType
-            || iMimeType == KDrmContentMimeType)
-        {
-        RDEBUG8_2("	-> mime: %S", &iMimeType );
-
-        RFile originalFile;
-        RFile decryptedFile;
-        TFileName decryptedTempFileName;
-
-        RDEBUG_2("	-> opening original file: %S", &ptr );
-        // leave if can not open the original file
-        User::LeaveIfError(originalFile.Open(aFs, ptr, EFileWrite) );
-        RDEBUG("	-> done");
-
-        // First construct the temp path
-        User::LeaveIfError(aFs.PrivatePath(decryptedTempFileName) );
-        // set drive letter into the path
-        decryptedTempFileName.Insert( 0, TParsePtrC( PathInfo::PhoneMemoryRootPath() ).Drive() );
-        // append "piptemp\\"	
-        decryptedTempFileName.Append(KTempDir);
-        // create the folder
-        aFs.MkDir(decryptedTempFileName);
-
-        // Use license manager to extract files from the pip package
-        CDRMLicenseManager* licenseMgr = CDRMLicenseManager::NewL();
-        CleanupStack::PushL(licenseMgr);
-        // decryp from the original file into the temp file   
-        RDEBUG_2("	-> extracting SIS file into: %S", &decryptedTempFileName);
-        User::LeaveIfError(licenseMgr->ExtractSISFileL(originalFile,
-                decryptedTempFileName) );
-        RDEBUG("	-> done");
-
-        // Get the sis file name 
-        decryptedTempFileName.Append( *(licenseMgr->GetSISMemberL()->Name() ));
-        // open temporary handle to it.
-        RDEBUG_2("	-> opening decrypted file: %S", &decryptedTempFileName );
-        User::LeaveIfError(decryptedFile.Open(aFs, decryptedTempFileName,
-                EFileShareAny) );
-        RDEBUG("	-> done");
-        // parse the uid from the file
-        ret = ParseUidFromSisFileL(decryptedFile);
-
-        // no use anymore for the decrypted file
-        decryptedFile.Close();
-        // delete the temp file
-        TInt err = aFs.Delete(decryptedTempFileName);
-        if (err != KErrNone)
-            {
-            RDEBUG_2("**** ERROR, unable to delete temporary file: %S", &decryptedTempFileName );
-            }
-
-        CleanupStack::PopAndDestroy(licenseMgr);
-        decryptedFile.Close();
-        originalFile.Close();
-        }
-    else
-        if (iMimeType == KSisxMimeType || iMimeType == KSisMimeType )
-            {
-            RDEBUG("	-> mime: x-epoc/x-sisx-app");
-            RFile originalFile;
-            RDEBUG_2("	-> opening file: %S", &ptr );
-            User::LeaveIfError(originalFile.Open(aFs, ptr, EFileRead) );
-            RDEBUG("	-> opened ok");
-            ret = ParseUidFromSisFileL(originalFile);
-            originalFile.Close();
-            }
-
-        else
-            {
-            RDEBUG8_2( "**** ERROR - CDeploymentComponentData::ResolveUidL( ) - cannot get uid from mime type: %S", &iMimeType );
-            }
-
-    CleanupStack::PopAndDestroy(buf);
-    return ret;
-    }
-
-void CDeploymentComponentData::SerializedFormL(RWriteStream &aBuffer) const
-    {
-    aBuffer.WriteUint32L(iDataFileName.Length() );
-    aBuffer.WriteL(iDataFileName);
-
-    aBuffer.WriteUint32L(iMimeType.Length() );
-    aBuffer.WriteL(iMimeType);
-
-    }
-
-void CDeploymentComponentData::DestroyL(RFs &aFs) const
-    {
-    TFileName fn;
-    fn.Copy(iDataFileName);
-    aFs.Delete(fn) ;
-    }
-
-const TDesC8 &CDeploymentComponentData::DataFileName() const
-    {
-    return iDataFileName;
-    }
-
-void CDeploymentComponentData::PersistL(RFs &aFs)
-    {
-    if (iData)
-        {
-        RFile file;
-        TFileName aFile;
-        aFile.Copy(iDataFileName) ;
-        RDEBUG_3( "CDeploymentComponentData::PersistL() - Saving '%S', dataLenght %d", &aFile, (iData ? iData->Length() : 0) );
-        User::LeaveIfError(file.Replace(aFs, aFile, EFileWrite) );
-        CleanupClosePushL(file) ;
-
-        file.Write( *iData) ;
-        file.Flush();
-        delete iData;
-        iData = NULL;
-        CleanupStack::PopAndDestroy( &file) ; // file
-        }
-    else
-        {
-        RDEBUG( "CDeploymentComponentData::PersistL() - Already persisted" );
-        }
-    RDEBUG( "CDeploymentComponentData::PersistL() - Done" );
-    }
-
-TInt CDeploymentComponentData::SerializedFormLength() const
-    {
-    return iDataFileName.Length() + (2 * 4) + iMimeType.Length();
-    }
-
-void CDeploymentComponentData::SetDataFileNameL(const TDesC8 &aNewFileName)
-    {
-    if (aNewFileName.Length() > 0)
-        {
-        RFs fs;
-        User::LeaveIfError(fs.Connect() );
-        CleanupClosePushL(fs);
-        TFileName newfile;
-        newfile.Copy(aNewFileName);
-        TFileName oldfile;
-        oldfile.Copy(iDataFileName);
-        User::LeaveIfError(BaflUtils::RenameFile(fs, oldfile, newfile) );
-        CleanupStack::PopAndDestroy( &fs);
-        iDataFileName = aNewFileName;
-        }
-    else
-        {
-        RDEBUG( "CDeploymentComponentData::SetDataFileNameL - ERROR Cannot set empty filename!" );
-        User::Leave(KErrArgument);
-        }
-    }
-void CDeploymentComponentData::SetMimeTypeL(const TDesC8 &aMimeType)
-{
-	iMimeType = aMimeType.Left(KMaxMimeLength) ;
-}
-void CDeploymentComponentData::ResetData(RFs &aFs)
-    {
-    TRAP_IGNORE(DestroyL( aFs ));
-    iDataFileName = KNullDesC8();
-    delete iData;
-    iData = NULL;
-    }
-
-TUid CDeploymentComponentData::ParseUidFromSisFileL(RFile& aHandleToFile)
-    {
-    RDEBUG("CDeploymentComponentData::ParseUidFromSisFileL");
-
-    TUid appUid;
-    TInt uidLen = sizeof(TInt32);
-    TInt seekLen = sizeof(TInt32) + sizeof(TInt32);
-    User::LeaveIfError(aHandleToFile.Seek(ESeekStart, seekLen));
-    TPckg<TInt32> uid1(appUid.iUid);
-    User::LeaveIfError(aHandleToFile.Read(uid1, uidLen));
-
-    if (uid1.Length() != uidLen)
-        {
-        RDEBUG("**** ERROR - uid length inconsistency - underflow");
-        User::Leave(KErrUnderflow);
-        }
-
-    RDEBUG_2("	-> returning SIS UID: %d", appUid.iUid );
-    return appUid;
-    }
-
-//  End of File
--- a/applicationmanagement/server/src/AMDownload.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,204 +0,0 @@
-/*
- * Copyright (c) 2002-2004 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: Implementation of applicationmanagement components
- *
- */
-
-// INCLUDE FILES
-#include "AMDownload.h"
-#include "AMDownloader.h"
-#include "AMDeploymentComponent.h"
-#include "debug.h"
-
-using namespace NApplicationManagement;
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CAMDownload::CAMDownload
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CAMDownload::CAMDownload(CDeploymentComponent *aComponent) :
-    iComponent(aComponent)
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// CAMDownload::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CAMDownload::ConstructL(RHttpDownload& aDownload)
-    {
-    iDownloader = CAMDownloader::NewL(aDownload, *this);
-    }
-
-// -----------------------------------------------------------------------------
-// CAMDownload::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CAMDownload* CAMDownload::NewL(RHttpDownload& aDownload,
-        CDeploymentComponent *aComponent)
-    {
-    CAMDownload* self = new( ELeave ) CAMDownload( aComponent );
-
-    CleanupStack::PushL(self);
-    self->ConstructL(aDownload);
-    CleanupStack::Pop();
-
-    return self;
-    }
-
-// ---------------------------------------------------------------------------
-// Destructor
-// ---------------------------------------------------------------------------
-CAMDownload::~CAMDownload()
-    {
-    RDEBUG_3( "CAMDownload::~CAMDownload 0x%X - 0x%X", reinterpret_cast<TUint>( this ),
-            reinterpret_cast<TUint>(this)+sizeof( CAMDownload ) );
-
-    delete iDownloader;
-    }
-
-// ---------------------------------------------------------------------------
-// DownloadCompleted
-// ---------------------------------------------------------------------------
-void CAMDownload::DownloadCompleted()
-    {
-    RDEBUG( "CAMDownload::DownloadCompleted: start");
-
-    TInt err(KErrNone);
-    TRAP( err, iComponent->SuccessStatusUpdateL( iDownloader->FileName(), iDownloader->MimeType() ) );
-    if (err != KErrNone)
-        {
-        RDEBUG_2(" ->iComponent::StatusUpdateL: %d", err );
-        }
-    RDEBUG_2( "CAMDownload::DownloadCompleted: end Download delete ERROR (%d)", err );
-    }
-
-// ---------------------------------------------------------------------------
-// DownloadFailed
-//
-// EDlAttrStatusCode = 500,// Status code from response header (TInt32 - read-only)
-// EDlAttrErrorId,         // See THttpDownloadMgrError (TInt32 - read-only)
-// EDlAttrGlobalErrorId,   // Global error id (TInt32 - read-only)
-// EDlAttrContentType,     // Content type from response header
-//   (String8<KMaxContentTypeLength> - read/write. Write is accepted only if EDlAttrContinue is ETrue)
-// ---------------------------------------------------------------------------
-void CAMDownload::DownloadFailedL(THttpDownloadState aDownloadState)
-    {
-    RDEBUG( "CAMDownload::DownloadFailed: start");
-    TInt err(KErrNone);
-    TInt32 errorCode = iDownloader->DownloadStatusCodeL(aDownloadState);
-    TRAP( err, iComponent->StatusUpdateL( errorCode ) );
-
-    if (err != KErrNone)
-        {
-        RDEBUG_2(" ->iComponent::StatusUpdateL: %d", err );
-        }
-    RDEBUG_2( "CAMDownload::DownloadFailed: end Download delete ERROR (%d)", err );
-    }
-
-void CAMDownload::SetStatus(TInt aStatus)
-    {
-    TRAPD( err, iComponent->StatusUpdateL( aStatus ) )
-    ;
-    if (err != KErrNone)
-        {
-        RDEBUG_2(" ->iComponent::StatusUpdateL: %d", err );
-        }
-    RDEBUG_2( "CAMDownload::DownloadFailed: end Download delete ERROR (%d)", err );
-    }
-
-// ---------------------------------------------------------------------------
-// DownloadErrorCodeL
-//
-// EDlAttrStatusCode = 500,// Status code from response header (TInt32 - read-only)
-// EDlAttrErrorId,         // See THttpDownloadMgrError (TInt32 - read-only)
-// EDlAttrGlobalErrorId,   // Global error id (TInt32 - read-only)
-// EDlAttrContentType,     // Content type from response header
-//   (String8<KMaxContentTypeLength> - read/write. Write is accepted only if EDlAttrContinue is ETrue)
-// ---------------------------------------------------------------------------
-/*TInt32 CAMDownload::DownloadErrorCodeL()
-    {
-    return iDownloader->DownloadStatusCodeL();
-    }*/
-
-// ---------------------------------------------------------------------------
-// ContinueDownload
-// ---------------------------------------------------------------------------
-TInt CAMDownload::ContinueDownload()
-    {
-    RDEBUG("CAMDownload::ContinueDownload");
-    TInt result(KErrNone);
-    result = iDownloader->ContinueDownload();
-    return result;
-    }
-
-// ---------------------------------------------------------------------------
-// StartDownload
-// ---------------------------------------------------------------------------
-TInt CAMDownload::StartDownload()
-    {
-    RDEBUG("CAMDownload::StartDownload");
-    TInt result(KErrNone);
-    result = iDownloader->StartDownload();
-    return result;
-    }
-
-// ---------------------------------------------------------------------------
-// StopDownload
-// ---------------------------------------------------------------------------
-TInt CAMDownload::StopDownload()
-    {
-    RDEBUG("CAMDownload::StopDownload");
-    TInt result(KErrNone);
-    result = iDownloader->StopDownload();
-    return result;
-    }
-
-void CAMDownload::ProgressDialogL(TInt32 aDownloadedSize, TInt32 aContentSize, THttpProgressState aState)
-    {
-
-    iDownloader->CreateAndUpdateProgressDialogL(aDownloadedSize, aContentSize, aState);
-
-    }
-// ---------------------------------------------------------------------------
-// DownloadURIMatch
-// ---------------------------------------------------------------------------
-TBool CAMDownload::DownloadURIMatch(const TDesC8& aURI)
-    {
-    return iDownloader->CompareDownloadURI(aURI);
-    }
-
-// ---------------------------------------------------------------------------
-// DownloadURI
-// ---------------------------------------------------------------------------
-const TDesC8& CAMDownload::DownloadURI()
-    {
-    return iDownloader->DownloadURI();
-    }
-
-// ---------------------------------------------------------------------------
-// ContentMimeType
-// ---------------------------------------------------------------------------
-const TDesC8& CAMDownload::ContentMimeType()
-    {
-    return iDownloader->MimeType();
-    }
-
-//  End of File
--- a/applicationmanagement/server/src/AMDownloadManager.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,741 +0,0 @@
-/*
- * Copyright (c) 2002-2004 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:  Implementation of applicationmanagement components
- *
- */
-
-// INCLUDE FILES
-//#include <DownloadMgrClient.h>
-
-#include "AMDownloadManager.h"
-//#include "AMDownload.h"
-//#include "amdeploymentcomponent.h"
-#include "amsmlhelper.h"
-#include "debug.h"
-#include "AppMgmtSrvApp.h"
-#include <e32property.h>
-#include <aknnotewrappers.h>
-#include "ampskeys.h"
-#include "SyncService.h"
-#include "amprivateCRKeys.h"
-
-using namespace NApplicationManagement;
-
-// from THttpDownloadState
-const TText * KDownloadStates[] =
-    {
-    _S( "Empty" ), _S( "EHttpDlCreated" ), _S( "EHttpDlInprogress" ), _S( "EHttpDlPaused" ), _S( "EHttpDlCompleted" ), _S( "EHttpDlFailed" ),
-
-    // The following states are temporary.
-            // e.g. download adopt EHttpDlMoved state,
-            // but right after that, it returns to the
-            // original EHttpDlCompleted state
-
-            // download is moved from one client instance to another one.
-            _S( "EHttpDlMoved" ),
-            // MMC card or other storage media is removed from the phone.
-            _S( "EHttpDlMediaRemoved" ),
-            // MMC card or other storage media inserted and 
-            // downloaded content file found on it. 
-            // If MMC card inserted, but (partially) downloaded content file 
-            // is not found on it, download is failed with error reason
-            // EContentFileIntegrity.
-            _S( "EHttpDlMediaInserted" ),
-            // Download process can be paused again. This event only occurs after
-            // EHttpDlNonPausable.
-            _S( "EHttpDlPausable" ),
-            // Download process cannot be paused, or the content will be lost.
-            _S( "EHttpDlNonPausable" ),
-            // Download is delete from another client instance.
-            _S( "EHttpDlDeleted" ),
-            // Download is started when it's already progressing
-            _S( "EHttpDlAlreadyRunning" ),
-            // Download is going to be deleted.
-            _S( "EHttpDlDeleting" ),
-
-            // Internally used download event. Do NOT deal with them
-            _S( "EHttpDlCancelTransaction" )
-    };
-
-// These enumarated values come with EHttpDlInprogress
-// The only exception is EHttpContentTypeReceived that pauses
-// the download until client app accepts and resumes, or
-// deletes/resets it.
-const TText * ProgStates(THttpProgressState state)
-    {
-    switch (state)
-        {
-        case EHttpProgNone:
-            return _S( "EHttpProgNone" );
-        case EHttpStarted:
-            return _S("EHttpStarted");
-        case EHttpProgCreatingConnection:
-            return _S("EHttpProgCreatingConnection");
-        case EHttpProgConnectionNeeded:
-            return _S("EHttpProgConnectionNeeded");
-
-        case EHttpProgConnected:
-            return _S("EHttpProgConnected");
-        case EHttpProgConnectionSuspended:
-            return _S("EHttpProgConnectionSuspended");
-        case EHttpProgDisconnected:
-            return _S("EHttpProgDisconnected");
-        case EHttpProgDownloadStarted:
-            return _S("EHttpProgDownloadStarted" );
-        case EHttpContentTypeRequested:
-            return _S("EHttpContentTypeRequested" );
-        case EHttpContentTypeReceived:
-            // Download status is EHttpDlPaused!
-            // Application can check the received content type here
-            // and decide whether to accept it or not.
-            // Call Start again to carry on download, or
-            // Delete to delete this download
-            return _S("EHttpContentTypeReceived" );
-        case EHttpProgSubmitIssued:
-            return _S("EHttpProgSubmitIssued" );
-        case EHttpProgResponseHeaderReceived:
-            return _S("EHttpProgResponseHeaderReceived" );
-        case EHttpProgResponseBodyReceived:
-            return _S("EHttpProgResponseBodyReceived" );
-        case EHttpProgRedirectedPermanently:
-            return _S("EHttpProgRedirectedPermanently" );
-        case EHttpProgRedirectedTemporarily:
-            return _S("EHttpProgRedirectedTemporarily" );
-        case EHttpProgMovingContentFile:
-            return _S("EHttpProgMovingContentFile" );
-        case EHttpProgContentFileMoved:
-            return _S("EHttpProgContentFileMoved" );
-        default:
-            return _S( "Unknown" );
-        }
-    }
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CAMDownloadManager::CAMDownloadManager
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CAMDownloadManager::CAMDownloadManager(MDownloadMngrObserver& aObserver) :
-    iObserver(aObserver)
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// CAMDownloadManager::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CAMDownloadManager::ConstructL()
-    {
-    iOMASCOMOEnabled = ETrue;
-    iNoteDisabled = EFalse;
-    
-    }
-
-// -----------------------------------------------------------------------------
-// CAMDownloadManager::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CAMDownloadManager* CAMDownloadManager::NewL(MDownloadMngrObserver& aObserver)
-    {
-    CAMDownloadManager* self = new( ELeave ) CAMDownloadManager( aObserver );
-
-    CleanupStack::PushL(self);
-    self->ConstructL();
-    CleanupStack::Pop();
-
-    return self;
-    }
-
-// ---------------------------------------------------------------------------
-// Destructor
-// ---------------------------------------------------------------------------
-CAMDownloadManager::~CAMDownloadManager()
-    {
-    RDEBUG_3( "CAMDownloadManager::~CAMDownloadManager 0x%X - 0x%X", reinterpret_cast<TUint>( this ),
-            reinterpret_cast<TUint>(this)+sizeof( CAMDownloadManager ) );
-
-    iDownloads.ResetAndDestroy();
-    
-    iPrevDownloads.ResetAndDestroy();
-
-    RDEBUG( "CAMDownloadManager::~CAMDownloadManager() - closing downloadmgr" );
-    if (iDownloadMgr.Handle())
-            iDownloadMgr.Close();
-
-
-    if (iServerId)
-        delete iServerId;
-    
-    
-    RDEBUG( "CAMDownloadManager::~CAMDownloadManager() - closed downloadmgr" );
-    }
-
-// ---------------------------------------------------------------------------
-// CancelDownloads
-// ---------------------------------------------------------------------------
-/*
- void CAMDownloadManager::CancelDownloads()
- {
- TInt err = KErrNone;
- TRAP( err, CancelDownloadsL() );
- RDEBUG_2("CAMDownloadManager::Cancel() ERR(%d)", err);
- User::LeaveIfError( err );
- }
- */
-
-// ---------------------------------------------------------------------------
-// CancelDownloads
-// ---------------------------------------------------------------------------
-/*
- void CAMDownloadManager::CancelDownloadsL()
- {
- }
- */
-
-// ---------------------------------------------------------------------------
-// CancelDownloadL
-// ---------------------------------------------------------------------------
-void CAMDownloadManager::CancelDownloadL(CAMDownload& aDownload)
-    {
-    RDEBUG("CAMDownloadManager::CancelDownloadL()");
-    ConnectHttpDownloadMgrL();
-
-    TInt delres(aDownload.StopDownload() );
-    if (delres != KErrNone)
-        {
-        RDEBUG8_3( "CAMDownloadManager::CancelDownloadL: ERROR Failed to delete download '%S': '%d'",
-                &aDownload.DownloadURI(), delres );
-        }
-    }
-
-// ------------------------------------------------------------------------------------------------
-//  CAMDownloadManager::ConnectHttpDownloadMgrL()
-// ------------------------------------------------------------------------------------------------
-void CAMDownloadManager::ConnectHttpDownloadMgrL()
-    {
-    if ( !iDownloadMgrConnected)
-        {
-        const TUid KUid =
-            {
-            0x1020781C
-            // ApplicationManagementServer
-                };
-
-        iDownloadMgr.ConnectL(KUid, *this, EFalse);
-        iDownloadMgrConnected = ETrue;
-        RDEBUG( "CAMDownloadManager::ConnectHttpDownloadMgrL(): Connected to download manager" );
-        }
-    }
-
-// ----------------------------------------------------------------------------------------
-// CAMDownloadManager::AddDownloadL
-// ----------------------------------------------------------------------------------------	
-void CAMDownloadManager::AddDownloadL(CDeploymentComponent *aComponent)
-    {
-    RDEBUG("CAMDownloadManager::AddDownloadL Add new Download: ");
-    TPtrC8 uriPtr(aComponent->DownloadURI() );
-    RDEBUG_HEX8(uriPtr.Ptr(), uriPtr.Size());
-    aComponent->SetCallback( this);
-    CAMDownload* download = 0;
-    download = FindDownload(aComponent->DownloadURI() );
-    if (download)
-        {
-        RDEBUG8_2("CAMDownloadManager::AddDownloadL Download already exist, cancelling: (%S)", &aComponent->DownloadURI());
-        CancelDownloadL( *download);
-        }
-
-    iNoteDisabled = EFalse;
-
-    // DM session alive. Check the type of Server Alert
-    // Silent or NOn-Silent
-
-
-    // PubSub key used to share information about the
-    // type of the server alert for device management session.
-    // Contains the identifier of server alert type
-    // started from DM Server
-
-
-    TInt nonSilentOperation = KErrNotFound;
-    RProperty::Get(KPSUidNSmlDMSyncApp, KSilentSession, nonSilentOperation);
-    
-    iOMASCOMOEnabled = IsOMASCOMOEnabledL();
-    
-    // If OMA SCOMO is not enabled then default make the download operation silent
-    if (!iOMASCOMOEnabled)
-        nonSilentOperation = 0;
-
-    // Get the type of session(silent or non-silent) from DM Session and store in AM server
-    // P&S key since DM Session is terminated as soon as download starts.
-
-    RProperty::Set(KUidPSApplicationManagementKeys, KAMOperationNonSilent,
-            nonSilentOperation);
-
-    // Set this P&S key so that DM UI will not be closed in case of server initiated session
-    // applicable only for Interactive, Informative or Non specified
-
-    TInt dmuinotclosed = 1;
-    RProperty::Set(KUidPSApplicationManagementKeys, KDMUINotClosed,
-            dmuinotclosed);
-
-    RHttpDownload& httpdownload(CreateHttpDownloadL(aComponent) );
-    
-   
-    CAMDownload* newDL = CAMDownload::NewL(httpdownload, aComponent);
-    CleanupStack::PushL(newDL);
-    iDownloads.Append(newDL);
-    
-    // keep track of all the downloads in another array
-    // to ensure that downloads are not missed from actual array
-    // during cleanup
-    
-    iPrevDownloads.Append(newDL);
-    
-    // start the newly created download
-    newDL->StartDownload();
-    aComponent->SetStatusNode(EDownload_DownloadProgress);
-    TSmlProfileId ownerProfile;
-    SyncMLCurrentProfileIdL(ownerProfile);
-    aComponent->SetOwnerProfile(ownerProfile);
-    CleanupStack::Pop(newDL);
-    
-    
-    RDEBUG("CAMDownloadManager::AddDownloadL end");
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CAMDownloadManager::IsOMASCOMOEnabledL()
-// ------------------------------------------------------------------------------------------------
-
-TBool CAMDownloadManager::IsOMASCOMOEnabledL()
-    {
-    TInt adapterValue;
-    
-    CRepository *repository = CRepository::NewLC ( KCRUidPrivateApplicationManagementKeys ) ;
-    repository->Get(KAMAdapterValue, adapterValue);
-    CleanupStack::PopAndDestroy();
-    
-    if(adapterValue ==0 || adapterValue == 1)
-     return EFalse;
-    else
-     return ETrue;
-    
-    }
-
-
-// ----------------------------------------------------------------------------------------
-// CAMDownloadManager::CreateHttpDownloadL
-// ----------------------------------------------------------------------------------------	
-RHttpDownload& CAMDownloadManager::CreateHttpDownloadL(
-        CDeploymentComponent *aComponent)
-    {
-    RDEBUG( "CAMDownloadManager::CreateHttpDownload: start" );
-    ConnectHttpDownloadMgrL();
-    TBool dlCreated(EFalse);
-    RHttpDownload &dl = iDownloadMgr.CreateDownloadL(
-            aComponent->DownloadURI(), dlCreated);
-    iServerId = SmlHelper::GetCurrentServerIDL();
-    if (dlCreated)
-        {
-        RDEBUG( "CAMDownloadManager::CreateHttpDownload: Created Download" );
-        dl.SetBoolAttribute(EDlAttrNoContentTypeCheck, ETrue);
-        iDownloadMgr.SetBoolAttribute(EDlMgrSilentMode, ETrue);
-        SetIAPL(aComponent);
-        SetUserNamePassword(dl, aComponent);
-        }
-    else
-        {
-        RDEBUG( "CAMDownloadManager::CreateHttpDownload: Download already exists!" );
-        THttpDownloadState dlst;
-        dl.GetIntAttribute(EDlAttrState, (TInt32&)dlst );
-        THttpProgressState prst;
-        dl.GetIntAttribute(EDlAttrProgressState, (TInt32&)prst );
-
-        SetIAPL(aComponent);
-				RDEBUG_3( "CAMDownloadManager::CreateHttpDownload: DownloadState: '%s', progstate: '%s'", KDownloadStates[dlst], ProgStates( prst ) );
-
-        if (dlst == EHttpDlPaused)
-            {
-            RDEBUG( "CAMDownloadManager::CreateHttpDownload: download paused" );
-            }
-        else
-            {
-            RDEBUG( "CAMDownloadManager::CreateHttpDownload: resetting download!" );
-            dl.Reset();
-            }
-        }
-    RDEBUG( "CAMDownloadManager::CreateHttpDownload: end" );
-    return dl;
-    }
-
-// ----------------------------------------------------------------------------------------
-// CAMDownloadManager::SetIAPL
-// ----------------------------------------------------------------------------------------	
-void CAMDownloadManager::SetIAPL(CDeploymentComponent *aComponent)
-    {
-    RDEBUG( "CAMDownloadManager::SetIAPL: start" );
-    TInt iap(KErrNotFound);
-
-    const TAMInstallOptions &opts = aComponent->InstallOpts();
-    RDEBUG_2( "CAMDownloadManager::SetIAPL : Setting Iap Id to %d ", opts.iIAP );
-
-    if (opts.iIAP == -1)
-        {
-        TRAPD( err, SmlHelper::GetDefaultIAPFromDMProfileL( iap ) )
-        ;
-        if (err != KErrNone)
-            {
-            RDEBUG_2("CAMDownloadManager::SetIAPL: ERROR when trying to fetch DM profile default IAP: %d", err );
-            }
-        }
-    else
-        {
-        iap = opts.iIAP;
-        }
-    if (iap == -1)
-        {
-        iap = 0; //as DL mgr treats 0 (zero) as "Always Ask"
-        }
-    iapid = iap;
-    TInt errDL(iDownloadMgr.SetIntAttribute(EDlMgrIap, iap) );
-    if (errDL != KErrNone)
-        {
-        RDEBUG_2("CAMDownloadManager::SetIAPL: ERROR when trying to set DownloadManager IAP: %d", errDL );
-        }
-    else
-        {
-        RDEBUG_2( "CAMDownloadManager::SetIAPL: Set IAP Id to (%d) ", iap);
-        }
-
-#ifdef _DEBUG
-    TInt err(iDownloadMgr.SetIntAttribute(EDlMgrIap, 11) );
-    RDEBUG_2( "CAMDownloadManager::SetIAPL (debug only): WARNING Overriding IAP Id to 11 results %d", err );
-#endif		
-    }
-
-// ----------------------------------------------------------------------------------------
-// CAMDownloadManager::SetUserNamePassword
-// ----------------------------------------------------------------------------------------	
-void CAMDownloadManager::SetUserNamePassword(RHttpDownload& aDownload,
-        CDeploymentComponent *aComponent)
-    {
-    RDEBUG( "CAMDownloadManager::SetUserNamePassword: start" );
-    const TAMInstallOptions &opts = aComponent->InstallOpts();
-    if (opts.iOptions.iPassword.Length() && opts.iOptions.iLogin.Length() )
-        {
-        TBuf8<KMaxPath> password;
-        TBuf8<KMaxPath> login;
-        password.Copy(opts.iOptions.iPassword);
-        login.Copy(opts.iOptions.iLogin);
-
-        TInt err(aDownload.SetStringAttribute(EDlAttrPassword, password) );
-        RDEBUG8_3( "CAMDownloadManager::SetUserNamePassword: response to EDlAttrPassword set to '%S': %d", &password, err );
-        err = aDownload.SetStringAttribute(EDlAttrUsername, login);
-        RDEBUG8_3( "CAMDownloadManager::SetUserNamePassword: response to EDlAttrUsername set to '%S': %d", &login, err );
-        }
-    RDEBUG( "CAMDownloadManager::SetUserNamePassword: end" );
-    }
-
-// ----------------------------------------------------------------------------------------
-// CAMDownloadManager::SyncMLCurrentProfileIdL
-// ----------------------------------------------------------------------------------------	
-void CAMDownloadManager::SyncMLCurrentProfileIdL(TSmlProfileId& aOwnerProfile)
-    {
-    RDEBUG( "CAMDownloadManager::SyncMLCurrentProfileIdL: start" );
-#ifdef _DEBUG
-    TRAPD( erx, SmlHelper::GetCurrentProfileIdL( aOwnerProfile ) )
-    ;
-    if (erx != KErrNone)
-        {
-        RDEBUG_2( "CAMDownloadManager::SyncMLCurrentProfileIdL (debug): Failed to get profile id: %d", erx );
-        }
-    else
-        {
-        RDEBUG_2( "CAMDownloadManager::SyncMLCurrentProfileIdL (debug): Using profile id: %d", aOwnerProfile );
-        }
-#else
-    SmlHelper::GetCurrentProfileIdL( aOwnerProfile );
-    RDEBUG_2( "CAMDownloadManager::SyncMLCurrentProfileIdL: Find profile id: %d", aOwnerProfile );
-#endif
-    }
-
-// ----------------------------------------------------------------------------------------
-// CAMDownloadManager::FindDownload
-// ----------------------------------------------------------------------------------------	
-CAMDownload* CAMDownloadManager::FindDownload(const TDesC8& aURI)
-    {
-    CAMDownload* download = 0;
-
-    //find corresponding download from list
-    for (TInt i(0); i < iDownloads.Count(); i++)
-        {
-        download = iDownloads[i];
-        if (download->DownloadURIMatch(aURI) )
-            {
-            RDEBUG("CAMDownloadManager::FindDownload: Found valid download");
-            break;
-            }
-        download = 0;
-        }
-    return download;
-    }
-
-// ----------------------------------------------------------------------------------------
-// CAMDownloadManager::FindDownload
-// ----------------------------------------------------------------------------------------	
-CAMDownload* CAMDownloadManager::FindDownload(RHttpDownload& aDownload)
-    {
-    CAMDownload* download = 0;
-    TBuf8<KMaxUrlLength> uri;
-    DownloadURI(aDownload, uri);
-    download = FindDownload(uri);
-    return download;
-    }
-
-// ----------------------------------------------------------------------------------------
-// CAMDownloadManager::FindDownload
-// ----------------------------------------------------------------------------------------	
-CAMDownload* CAMDownloadManager::FindDownload(
-        CDeploymentComponent *aComponent)
-    {
-    CAMDownload* download = 0;
-    download = FindDownload(aComponent->DownloadURI() );
-    return download;
-    }
-
-// ----------------------------------------------------------------------------------------
-// CAMDownloadManager::DownloadURI
-// ----------------------------------------------------------------------------------------	
-void CAMDownloadManager::DownloadURI(RHttpDownload& aDownload, TDes8& aURI)
-    {
-    TInt err(aDownload.GetStringAttribute(EDlAttrReqUrl, aURI) );
-    RDEBUG_2("CAMDownloadManager::DownloadURI err: (%d)", err);
-    }
-
-// ----------------------------------------------------------------------------------------
-// CAMDownloadManager::HandleDMgrEventL
-// ----------------------------------------------------------------------------------------	
-void CAMDownloadManager::HandleDMgrEventL(RHttpDownload& aDownload,
-        THttpDownloadEvent aEvent)
-    {
-    //RDEBUG_3( "CAMDownloadManager::HandleDMgrEventL: DownloadState: '%s', progstate: '%s'", 
-    //	KDownloadStates[aEvent.iDownloadState], ProgStates( aEvent.iProgressState ) );
-
-    TInt32 contentsize;
-    TInt32 downloadedsize;
-
-    User::LeaveIfError(aDownload.GetIntAttribute(EDlAttrDownloadedSize,
-            downloadedsize) );
-    User::LeaveIfError(aDownload.GetIntAttribute(EDlAttrLength, contentsize) );
-
-    CAMDownload* download = FindDownload(aDownload);
-
-    if ( !download)
-        {
-        TBuf8<KMaxUrlLength> uri;
-        DownloadURI(aDownload, uri);
-        RDEBUG8_2("CAMDownloadManager::HandleDMgrEventL: Could not find download: (%S)", &uri);
-        //User::Leave( KErrNotFound );	// Don't do this! DownloadMgrClient::HandleDMgrEventL does not handle leave correctly.
-        }
-    else
-        {
-        switch (aEvent.iDownloadState)
-            {
-           /* case EHttpDlPaused:
-                HandlePausedEventL( *download);
-                break;*/
-            case EHttpDlCreated:
-                {
-                if (aEvent.iProgressState == EHttpProgNone)
-                    {
-                    HandleNonProgEventL( *download);
-                    }
-                }
-                break;
-            case EHttpDlInprogress:
-                {
-                HandleAlreadyRunningL(downloadedsize, contentsize, *download, aEvent.iProgressState);
-
-                if (!iNoteDisabled)
-                    {
-                    CSyncService *syncService =
-                            CSyncService::NewL(NULL, KDevManServiceStart);
-                    if (syncService)
-                        {
-                        syncService->EnableProgressNoteL(EFalse);
-                        }
-
-                    delete syncService;
-                    iNoteDisabled = ETrue;
-                    }
-                }
-                break;
-            case EHttpContentTypeReceived:
-                HandleContentTypeRecEventL( *download);
-                break;
-            case EHttpDlCompleted:
-                HandleDlCompletedEventL( *download);
-                break;
-            case EHttpDlPaused:
-            case EHttpDlFailed:
-                HandleDlFailedEventL( *download, aEvent.iDownloadState);
-                break;
-            case EHttpDlDeleting:
-            case EHttpDlDeleted:
-                HandleDlDeleteEventL(download);
-                break;
-            default:
-                /*			RDEBUG8_2( "CAMDownloadManager::HandleDMgrEventL: Not handled download event: (%S)",
-                 KDownloadStates[aEvent.iDownloadState] ); 
-                 
-                 */
-                break;
-            }
-        }
-    RDEBUG( "CAMDownloadManager::HandleDMgrEventL: end" );
-    }
-
-// ----------------------------------------------------------------------------------------
-// CAMDownloadManager::HandlePausedEventL
-// ----------------------------------------------------------------------------------------	
-void CAMDownloadManager::HandlePausedEventL(CAMDownload& aDownload)
-    {
-    RDEBUG( "CAMDownloadManager::HandlePausedEventL" );
-    aDownload.ContinueDownload();
-    }
-
-// ----------------------------------------------------------------------------------------
-// CAMDownloadManager::HandleNonProgEventL
-// ----------------------------------------------------------------------------------------	
-void CAMDownloadManager::HandleNonProgEventL(CAMDownload& aDownload)
-    {
-    RDEBUG( "CAMDownloadManager::HandleNonProgEventL" );
-    aDownload.ContinueDownload();
-    }
-
-// ----------------------------------------------------------------------------------------
-// CAMDownloadManager::HandleContentTypeRecEventL
-// ----------------------------------------------------------------------------------------	
-void CAMDownloadManager::HandleContentTypeRecEventL(CAMDownload& aDownload)
-    {
-    RDEBUG( "CAMDownloadManager::HandleContentTypeRecEventL: EHttpContentTypeReceived " );
-    const TDesC8& mimetype(aDownload.ContentMimeType() );
-    RDEBUG8_2( "CAMDownloadManager::HandleContentTypeRecEventL: Content type: (%S)", &mimetype );
-    }
-
-// ----------------------------------------------------------------------------------------
-// CAMDownloadManager::HandleDlCompletedEventL
-// ----------------------------------------------------------------------------------------	
-void CAMDownloadManager::HandleDlCompletedEventL(CAMDownload& aDownload)
-    {
-    RDEBUG( "CAMDownloadManager::HandleDlCompletedEventL" );
-    aDownload.DownloadCompleted();
-    }
-
-// ----------------------------------------------------------------------------------------
-// CAMDownloadManager::HandleDlFailedEventL
-// ----------------------------------------------------------------------------------------	
-void CAMDownloadManager::HandleDlFailedEventL(CAMDownload& aDownload, THttpDownloadState aDownloadState)
-    {
-    RDEBUG( "CAMDownloadManager::HandleDlFailedEventL" );
-    aDownload.DownloadFailedL(aDownloadState);
-    }
-
-// ----------------------------------------------------------------------------------------
-// CAMDownloadManager::HandleDlDeleteEventL
-// ----------------------------------------------------------------------------------------	
-void CAMDownloadManager::HandleDlDeleteEventL(CAMDownload* aDownload)
-    {
-    RDEBUG( "CAMDownloadManager::HandleDlDeleteEventL - start" );
-    TInt idx(iDownloads.Find(aDownload) );
-        {
-        RDEBUG_2( "CAMDownloadManager::HandleDlDeleteEventL found download: (%d) delete it", idx );
-        iDownloads.Remove(idx);
-        //	delete aDownload;
-        }
-    RDEBUG( "CAMDownloadManager::HandleDlDeleteEventL - end" );
-    }
-
-// ----------------------------------------------------------------------------------------
-// CAMDownloadManager::DownloadComplete
-// ----------------------------------------------------------------------------------------	
-void CAMDownloadManager::DownloadComplete(CDeploymentComponent *aComponent,
-        TInt aStatus)
-    {
-    RDEBUG_2( "CAMDownloadManager::DownloadComplete - start with status (%d)", aStatus );
-    TInt err(KErrNone);
-    TRAP( err, DownloadCompleteL( aComponent ));
-    RDEBUG_2( "CAMDownloadManager::DownloadComplete - end with status (%d)", err);
-    }
-
-// ----------------------------------------------------------------------------------------
-// CAMDownloadManager::DownloadCompleteL
-// ----------------------------------------------------------------------------------------	
-void CAMDownloadManager::DownloadCompleteL(CDeploymentComponent *aComponent)
-    {
-    RDEBUG( "CAMDownloadManager::DownloadComplete - start" );
-    __ASSERT_DEBUG( aComponent, User::Invariant() );
-
-    CAMDownload* dowload = FindDownload(aComponent);
-
-    TInt idx(iDownloads.Find(dowload) );
-    if (dowload)
-        dowload->StopDownload(); // delete RHttpDownload
-    if (KErrNotFound != idx)
-        {
-        // NOTICE: Download is removed from downloadmanager AFTER receiving EHttpDlDeleting message
-        //         from RHttpDownload
-        // Call server
-        iObserver.ComponentDownloadComplete(aComponent, iapid, iServerId);
-        }
-
-    RDEBUG( "CAMDownloadManager::DownloadComplete - end" );
-    }
-
-// ----------------------------------------------------------------------------------------
-// CAMDownloadManager::UidExistsL
-// ----------------------------------------------------------------------------------------	
-TBool CAMDownloadManager::UidExistsL(const TUid &aUid,
-        CDeploymentComponent *& aCompo, CDeploymentComponent *aIgnored)
-    {
-    TBool uidExist(EFalse);
-    uidExist = iObserver.HasUidL(aUid, aCompo, aIgnored);
-    return uidExist;
-    }
-
-// ----------------------------------------------------------------------------------------
-// CAMDownloadManager::DownloadCount
-// ----------------------------------------------------------------------------------------	
-TInt CAMDownloadManager::DownloadCount() const
-    {
-    TInt count(0);
-    count = iDownloads.Count();
-    RDEBUG_2( "CAMDownloadManager::DownloadCount: (%d)", count );
-    return count;
-    }
-
-void CAMDownloadManager::HandleAlreadyRunningL(TInt32 aDownloadedSize,
-        TInt32 aContentSize, CAMDownload& aDownload, THttpProgressState aState)
-    {
-
-    aDownload.ProgressDialogL(aDownloadedSize, aContentSize, aState);
-
-    }
-
-//  End of File	
--- a/applicationmanagement/server/src/AMDownloaddb.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,388 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
- *
- * Description:  Implementation of applicationmanagement components
- *
-*/
-
-// INCLUDE FILES
-#include <sysutil.h>
-#include <bautils.h>
-
-#include "AMDownloaddb.h"
-#include "debug.h"
-
-// ============================ MEMBER FUNCTIONS =============================
-
-// ---------------------------------------------------------------------------
-//  CAMDownloaddb::NewL()
-//  Creates a new instance of CAMDownloaddb object.
-// ---------------------------------------------------------------------------
-// 
-CAMDownloaddb* CAMDownloaddb::NewL()
-    {
-    RDEBUG("CAMDownloaddb::NewL(): begin");
-
-    CAMDownloaddb* self = CAMDownloaddb::NewLC();
-    CleanupStack::Pop(self);
-
-    RDEBUG("CAMDownloaddb::NewL(): end");
-
-    return self;
-    }
-
-// ---------------------------------------------------------------------------
-//  CAMDownloaddb::NewLC()
-//  Creates a new instance of CAMDownloaddb object. 
-//  Pushes and leaves new instance onto CleanupStack.
-// ---------------------------------------------------------------------------
-// 
-CAMDownloaddb* CAMDownloaddb::NewLC()
-    {
-    RDEBUG("CAMDownloaddb::NewLC(): begin");
-
-    CAMDownloaddb* self = new( ELeave ) CAMDownloaddb();
-    CleanupStack::PushL(self);
-    self->ConstructL();
-
-    RDEBUG("CAMDownloaddb::NewLC(): end");
-
-    return self;
-    }
-
-// ---------------------------------------------------------------------------
-//  CAMDownloaddb::ConstructL()
-//  Second phase constructor.
-// ---------------------------------------------------------------------------
-// 
-void CAMDownloaddb::ConstructL()
-    {
-    RDEBUG("CAMDownloaddb::ConstructL(): begin");
-
-    TParse name;
-    TInt err;
-
-    User::LeaveIfError(iFsSession.Connect());
-    User::LeaveIfError(iRdbSession.Connect() );
-
-    iFsSession.SetSessionToPrivate(EDriveC);
-
-#ifdef SYMBIAN_SECURE_DBMS
-    name.Set(KAMDownloaddbName, NULL, NULL);
-    err = iDatabase.Open(iRdbSession, name.FullName(), KDBMSSecureID);
-#else
-    name.Set( KAMDownloaddbName, KNonSecureDbFullName, NULL );
-    err = iDatabase.Open(iRdbSession, DBFileName);
-#endif
-
-    if (err == KErrNotFound)
-        {
-        CreateandOpenL(name);
-        }
-    else
-        {
-
-        if ( (err == KErrEof ) || (err == KErrCorrupt ) || (err
-                == KErrArgument ))
-            {
-            // something seriously wrong with the db, delete it and try 
-            // to create new
-            iRdbSession.DeleteDatabase(name.FullName(), KAMPolicyUID);
-            CreateandOpenL(name);
-            }
-
-        }
-
-    RDEBUG("CAMDownloaddb::ConstructL(): end");
-    }
-
-// -----------------------------------------------------------------------------
-// CWPInternetAPDB::CreateandOpenL
-// -----------------------------------------------------------------------------
-//    
-void CAMDownloaddb::CreateandOpenL(TParse& name)
-    {
-
-    TInt err;
-
-#ifdef SYMBIAN_SECURE_DBMS
-    iDatabase.Create(iRdbSession, name.FullName(), KDBMSSecureID);
-#else
-    if( SysUtil::FFSSpaceBelowCriticalLevelL( &iFsSession, KEmptyDbSizeEstimate ) )
-        {
-        User::Leave( KErrDiskFull );
-        }
-    iDatabase.Create(iFsSession, name.FullName());
-#endif	
-
-    CreateTableL(iDatabase);
-    iDatabase.Close();
-#ifdef SYMBIAN_SECURE_DBMS
-
-    err = iDatabase.Open(iRdbSession, name.FullName(), KDBMSSecureID);
-
-#else
-    err = iDatabase.Open(iFsSession, DBFileName);
-#endif
-
-    //Debug
-    if (err != KErrNone)
-        {
-
-        User::LeaveIfError(err);
-        }
-
-    }
-
-// -----------------------------------------------------------------------------
-// CWPInternetAPDB::CreateTableL
-// -----------------------------------------------------------------------------
-//  
-void CAMDownloaddb::CreateTableL(RDbDatabase& aDatabase)
-    {
-
-    // Create a table definition
-    CDbColSet* columns=CDbColSet::NewLC();
-
-    // Add Columns
-    TDbCol id(NCol1, EDbColInt32);
-
-    // automatic indexing for items,it is our key field.
-    id.iAttributes=id.EAutoIncrement;
-    columns->AddL(id);
-    columns->AddL(TDbCol(NCol2, EDbColInt32));
-    columns->AddL(TDbCol(NCol3, EDbColInt32));
-    columns->AddL(TDbCol(NCol4, EDbColText8, 255));
-    columns->AddL(TDbCol(NCol5, EDbColInt32));
-
-    // Create a table
-    TRAPD(err, aDatabase.CreateTable(KTableAMMgmtObject, *columns) )
-    ;
-
-    if (err!=KErrNone)
-        User::Leave(err);
-
-    // cleanup the column set
-    CleanupStack::PopAndDestroy(columns);
-
-    }
-
-// ---------------------------------------------------------------------------
-//  CAMDownloaddb::CAMDownloaddb()
-//  Constructor.
-// ---------------------------------------------------------------------------
-// 
-CAMDownloaddb::CAMDownloaddb()
-    {
-    RDEBUG("CAMDownloaddb::CAMDownloaddb(): begin");
-    RDEBUG("CAMDownloaddb::CAMDownloaddb(): end");
-    }
-
-// ---------------------------------------------------------------------------
-//  CAMDownloaddb::~CAMDownloaddb()
-//  Destructor.
-// ---------------------------------------------------------------------------
-// 
-CAMDownloaddb::~CAMDownloaddb()
-    {
-    RDEBUG("CAMDownloaddb::~CAMDownloaddb(): begin");
-
-    iView.Close();
-
-    delete iColSet;
-    iAMObjectTable.Close();
-
-    iDatabase.Close();
-    iFsSession.Close();
-    iRdbSession.Close();
-
-    RDEBUG("CAMDownloaddb::~CAMDownloaddb(): ends");
-    }
-
-CAMDbItem::~CAMDbItem()
-    {
-    delete iTargetURI;
-
-    }
-
-void CAMDownloaddb::GetEntryForLUIDL(RPointerArray<CAMDbItem>& aItemArray,
-        TDesC& aValue)
-    {
-    RDEBUG( "CAMDownloaddb::GetEntryForLUIDL: Step1" );
-    aItemArray.Reset();// first reset the array
-
-    _LIT(KEqualToString,"=%d");
-    _LIT(KQuery, "SELECT * FROM %S WHERE %S");
-
-    RDEBUG( "CAMDownloaddb::GetEntryForLUIDL: Step2" );
-
-    TBuf<100> bufsql;
-    bufsql.Append(KQuery);
-    bufsql.Append(KEqualToString);
-    TLex lex(aValue);
-
-    RDEBUG( "CAMDownloaddb::GetEntryForLUIDL: Step3" );
-
-    TInt value;
-    lex.Val(value);
-
-    TBuf<100> bufsql1;
-    bufsql1.Format(bufsql, &KTableAMMgmtObject, &NCol2, value);
-
-    RDEBUG( "CAMDownloaddb::GetEntryForLUIDL: Step4" );
-
-    ReadItemsL(aItemArray, bufsql1);
-
-    RDEBUG( "CAMDownloaddb::GetEntryForLUIDL: Step5" );
-
-    }
-
-// -----------------------------------------------------------------------------
-// CWPInternetAPDB::ReadDbItemsL
-// -----------------------------------------------------------------------------
-//   
-void CAMDownloaddb::ReadDbItemsL(RPointerArray<CAMDbItem>& aItemArray)
-    {
-
-    aItemArray.Reset();// first reset the array
-
-    TFileName sqlQuery;
-
-    // just get all columns & rows of same originator
-    sqlQuery.Copy(_L("SELECT * FROM "));
-    sqlQuery.Append(KTableAMMgmtObject);
-
-    ReadItemsL(aItemArray, sqlQuery);
-
-    }
-
-// -----------------------------------------------------------------------------
-// CWPInternetAPDB::ReadItemsL
-// -----------------------------------------------------------------------------
-// 
-void CAMDownloaddb::ReadItemsL(RPointerArray<CAMDbItem>& aItemArray,
-        TDesC& asqlQuery)
-    {
-
-    RDEBUG( "CAMDownloaddb::ReadItemsL: Step1" );
-
-    RDbView view;
-    view.Prepare(iDatabase, TDbQuery(asqlQuery));
-    CleanupClosePushL(view);
-    view.EvaluateAll();
-    view.FirstL();
-
-    while (view.AtRow())
-        {
-        view.GetL();
-
-        CAMDbItem *dbitem = new(ELeave) CAMDbItem;
-        CleanupStack::PushL(dbitem);
-        dbitem->id = view.ColInt(1);
-        dbitem->iLUID = view.ColInt(2);
-        dbitem->iResult = view.ColInt(3);
-
-        dbitem->iTargetURI= (view.ColDes8(4)).AllocL();
-
-        dbitem->iapid = view.ColInt(5);
-        aItemArray.Append(dbitem);
-        CleanupStack::Pop(dbitem);
-        view.NextL();
-        }
-
-    CleanupStack::PopAndDestroy(); // view
-
-    }
-
-// -----------------------------------------------------------------------------
-// CWPInternetAPDB::SaveToDatabaseL
-// -----------------------------------------------------------------------------
-//   
-void CAMDownloaddb::SaveToDatabaseL(TInt& aIndex, TUint32 aLuid,
-        TInt aResult, const TDesC8& aTargetURI, TUint32 aIapid)
-    {
-
-    iDatabase.Begin();
-
-    TFileName sqlQuery;
-    sqlQuery.Copy(_L("SELECT * FROM "));
-    sqlQuery.Append(KTableAMMgmtObject);
-
-    RDbView view;
-    view.Prepare(iDatabase, TDbQuery(sqlQuery));
-    CleanupClosePushL(view);
-
-    view.InsertL();
-
-    view.SetColL(2, aLuid);
-    view.SetColL(3, aResult);
-    view.SetColL(4, aTargetURI);
-    view.SetColL(5, aIapid);
-
-    view.PutL();
-
-    aIndex = view.ColInt(1);// autoincrement gives us unique index.
-
-    CleanupStack::PopAndDestroy(1); // view
-    iDatabase.Commit();
-
-    }
-
-// -----------------------------------------------------------------------------
-// CWPInternetAPDB::DeleteFromDatabaseL
-// -----------------------------------------------------------------------------
-//
-TBool CAMDownloaddb::DeleteFromDatabaseL(TUint32 aLUID)
-    {
-
-    TBool rowsdeleted = EFalse;
-    TFileName sqlQuery;
-    sqlQuery.Copy(_L("SELECT * FROM "));
-    sqlQuery.Append(KTableAMMgmtObject);
-    sqlQuery.Append(_L(" WHERE "));
-    sqlQuery.Append(NCol2);
-    sqlQuery.Append(_L(" = "));
-    sqlQuery.AppendNum(aLUID);
-
-    iDatabase.Begin();
-
-    RDbView view;
-    // query buffer with index finds only the selected item row.
-    view.Prepare(iDatabase, TDbQuery(sqlQuery));
-    CleanupClosePushL(view);
-
-    view.EvaluateAll();
-    view.FirstL();
-
-    if (!view.IsEmptyL())
-        {
-        // we have autoincrement in index so it should be unique
-        // but just to make sure, we use 'while', instead of 'if'
-        while (view.AtRow())
-            {
-            view.GetL();
-            view.DeleteL();
-            view.NextL();
-            }
-
-        iDatabase.Commit();
-        // compacts the databse, by physically removig deleted data.
-        iDatabase.Compact();
-        rowsdeleted = ETrue;
-        }
-    CleanupStack::PopAndDestroy(1); // view
-
-
-    return rowsdeleted;
-    }
-
--- a/applicationmanagement/server/src/AMDownloader.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,602 +0,0 @@
-/*
- * Copyright (c) 2002-2004 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:  Implementation of applicationmanagement components
- *
- */
-
-
-// INCLUDE FILES
-//#include <BrowserUiInternalCRKeys.h>
-#include <DownloadMgrClient.h>
-
-#include "AMDownloader.h"
-//#include "aminstalloptions.h"
-#include "debug.h"
-#include <e32property.h>
-#include <aknnotewrappers.h> 
-#include <AknNotify.h>
-#include <AknNotifyStd.h>
-#include <AknGlobalNote.h>
-#include "ampskeys.h"
-#include "ApplicationManagementConst.h"
-#include <applicationmanagement.rsg>
-#include <StringLoader.h>
-#include <etelpckt.h>
-#include <exterror.h>
-#include <wlanerrorcodes.h>
-#include <CoreApplicationUIsSDKCRKeys.h>// for KCRUidCoreApplicationUIs
-
-using namespace NApplicationManagement;
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CAMDownloader::CAMDownloader
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CAMDownloader::CAMDownloader(RHttpDownload& aDownload,
-        MAMDownloaderObserver& aObserver) :
-        iDownload(aDownload), iObserver(aObserver)
-        {
-        }
-
-// -----------------------------------------------------------------------------
-// CAMDownloader::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CAMDownloader::ConstructL()
-    {
-    iProgStarted=0;
-    iSetFinalValue =0;
-    iProgressCancelled = EFalse;
-    iCurrentDownloadProgState = EHttpProgNone;
-    iProgressNote= new(ELeave)CAppMgmtProgDialog(this);
-    }
-
-// -----------------------------------------------------------------------------
-// CAMDownloader::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CAMDownloader* CAMDownloader::NewL(RHttpDownload& aDownload,
-        MAMDownloaderObserver& aObserver)
-    {
-    CAMDownloader* self = new( ELeave ) CAMDownloader( aDownload, aObserver );
-
-    CleanupStack::PushL(self);
-    self->ConstructL();
-    CleanupStack::Pop();
-
-    return self;
-    }
-
-// ---------------------------------------------------------------------------
-// Destructor
-// ---------------------------------------------------------------------------
-CAMDownloader::~CAMDownloader()
-    {
-    RDEBUG_3( "CAMDownloader::~CAMDownloader 0x%X - 0x%X", reinterpret_cast<TUint>( this ),
-            reinterpret_cast<TUint>(this)+sizeof( CAMDownloader ) );
-
-    if (iProgressNote)
-        delete iProgressNote;
-
-    if (iFileName)
-        {
-        delete iFileName;
-        iFileName = NULL;
-        }
-
-    if (iContentType)
-        {
-        delete iContentType;
-        iContentType = NULL;
-        }
-
-    delete iURI;
-    iURI = NULL;
-    }
-
-// ---------------------------------------------------------------------------
-// StartDownload()
-// ---------------------------------------------------------------------------
-TInt CAMDownloader::StartDownload()
-    {
-    RDEBUG("CAMDownloader::StartDownload");
-    TInt err(iDownload.SetIntAttribute(EDlAttrAction, EMove) );
-    RDEBUG_2("CAMDownload::StartDownload: response to EDlAttrAction set to true: (%d)", err );
-
-    err = iDownload.Start();
-    if (err == KErrNone)
-        {
-        RDEBUG( "CAMDownload::StartDownloadL: Started download successfully!!" );
-        }
-    else
-        {
-        RDEBUG_2( "CAMDownload::StartDownloadL: ERROR Failed to start downlad '%d'", err );
-        }
-    return err;
-    }
-
-// ---------------------------------------------------------------------------
-// StopDownload()
-// ---------------------------------------------------------------------------
-TInt CAMDownloader::StopDownload()
-    {
-    RDEBUG("CAMDownloader::StopDownload");
-    TInt result(KErrNone);
-    if (!iProgressCancelled)
-        {
-        TRAP_IGNORE(iProgressNote->ProgressCompletedL());
-        }
-    result = iDownload.Delete();
-    RDEBUG_2("CAMDownloader::StopDownload: result (%d)", result);
-    return result;
-    }
-
-// ---------------------------------------------------------------------------
-// ContinueDownload()
-// ---------------------------------------------------------------------------
-TInt CAMDownloader::ContinueDownload()
-    {
-    RDEBUG("CAMDownloader::ContinueDownload");
-    TInt result(KErrNone);
-    result = iDownload.Start();
-    RDEBUG_2("CAMDownloader::ContinueDownload: result (%d)", result);
-    return result;
-    }
-
-void CAMDownloader::CreateAndUpdateProgressDialogL(TInt32 aDownloadedSize,
-        TInt32 aContentSize, THttpProgressState aState)
-    {
-
-    if (iProgStarted && aState == EHttpProgConnectionSuspended)    
-    {
-     if (!iProgressCancelled)
-        {
-        TRAP_IGNORE(iProgressNote->ProgressCompletedL());
-        }
-     iProgressCancelled = ETrue;
-    
-    TInt UIdisabled=0;
-    RProperty::Set(KUidPSApplicationManagementKeys, KAMServerUIEnabled,
-                UIdisabled);
-
-     TApaTaskList taskList(CEikonEnv::Static()->WsSession() );
-            TApaTask task = taskList.FindApp(TUid::Uid(KAppMgmtServerUid));
-
-            task.SetWgId(CEikonEnv::Static()->RootWin().Identifier());
-
-            if (task.Exists())
-                task.SendToBackground();
-
-
-
-    iCurrentDownloadProgState = EHttpProgConnectionSuspended;          
-
-     RDEBUG( "CreateAndUpdateProgressDialogL : CAMDownloader Connection Failed" );  
-        HBufC *netlossnote = StringLoader::LoadLC(R_DOWNLOADFAILED_CONNECTION);
-
-        CAknGlobalNote* globalNote = CAknGlobalNote::NewL();
-        CleanupStack::PushL(globalNote);
-        
-        globalNote->ShowNoteL(EAknGlobalErrorNote, *netlossnote);
-
-        CleanupStack::PopAndDestroy( 2);// globalNote, dialognote
-
-    
-    }
-
-    if (!iProgStarted)
-        {
-
-        RDEBUG( "CAMDownloadManager::HandleAlreadyRunningL - StartProgressNoteL" );
-        iProgressNote->StartProgressNoteL();
-
-        // UI in progress whenever switch btween application occur AM server will be moved 
-        // to foreground
-
-        //Define P&Skey
-
-
-        TInt UIenabled = 1;
-        TInt err = RProperty::Set(KUidPSApplicationManagementKeys,
-                KAMServerUIEnabled, UIenabled);
-        User::LeaveIfError(err); // invalid
-
-
-        //Check if operation is silent or Non Silent
-
-        TInt operNonSilent = -1;
-
-        RProperty::Get(KUidPSApplicationManagementKeys,
-                KAMOperationNonSilent, operNonSilent);
-
-         RDEBUG_2( "CAMDownloader::Value of operNonSilent '%d'", operNonSilent );
-
-        if (operNonSilent==1 || operNonSilent==KErrNotFound)
-            {
-            TApaTaskList taskList(CEikonEnv::Static()->WsSession() );
-            TApaTask task = taskList.FindApp(TUid::Uid(KAppMgmtServerUid));
-
-            task.SetWgId(CEikonEnv::Static()->RootWin().Identifier());
-
-            if (task.Exists())
-                task.BringToForeground();
-
-            }
-         else
-            {
-			RDEBUG( "CAMDownloadManager::HandleAlreadyRunningL - CreateAndUpdateProgressDialogL UI enabled = 0" );
-
-		    TInt UIenabled = 0;
-			TInt err = RProperty::Set(KUidPSApplicationManagementKeys,
-			                KAMServerUIEnabled, UIenabled);
-        	User::LeaveIfError(err); // invalid
-			}
-
-        iProgStarted = 1;
-        }
-
-    if (!iSetFinalValue && aContentSize>=0)
-        {
-        RDEBUG( "CAMDownloadManager::HandleAlreadyRunningL - SetFinalValue" );
-        if (!iProgressCancelled)
-        {
-        iProgressNote->SetFinalValueL(aContentSize);
-        iSetFinalValue = 1;
-        }
-        }
-    else
-        if (aContentSize>=0)
-         {
-            RDEBUG( "CAMDownloadManager::HandleAlreadyRunningL - UpdateProcessL" );
-            if (!iProgressCancelled)
-            {
-             iProgressNote->UpdateProcessL(aDownloadedSize);
-             }
-          }
-
-    RDEBUG( "CAMDownloadManager::HandleAlreadyRunningL - END" );
-
-    }
-
-// ---------------------------------------------------------------------------
-// CAMDownloader::FileNameFromDownloadL
-// ---------------------------------------------------------------------------
-void CAMDownloader::FileNameFromDownloadL()
-    {
-    RFile f;
-    TInt err(iDownload.GetFileHandleAttribute(f));
-    if (err == KErrNone)
-        {
-        TFileName fn;
-        err = f.Name(fn);
-        if (err == KErrNone)
-            {
-            if (iFileName)
-                {
-                delete iFileName;
-                iFileName = NULL;
-                }
-            iFileName = fn.AllocL();
-
-            }
-        else
-            {
-
-            }
-        }
-    else
-        {
-        RDEBUG_2( "CAMDownloader::GetFileNameL: WARNING Failed to get download file handle '%d'", err );
-        RDEBUG("CAMDownloader::GetFileNameL: Using filename instead");
-        TBuf<KMaxPath> file;
-        err = iDownload.GetStringAttribute(EDlAttrDestFilename, file);
-        if (err == KErrNone)
-            {
-            if (iFileName)
-                {
-                delete iFileName;
-                iFileName = NULL;
-                }
-            iFileName = file.AllocL();
-
-            }
-        else
-            {
-
-            }
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// CAMDownloader::ContentTypeFromDownloadL
-// ---------------------------------------------------------------------------
-void CAMDownloader::ContentTypeFromDownloadL()
-    {
-    TBuf8<KMaxContentTypeLength> contype;
-    TInt err(iDownload.GetStringAttribute(EDlAttrContentType, contype) );
-    if (err != KErrNone)
-        {
-        RDEBUG_2( "CAMDownloader::ContentTypeFromDownloadL: Failed to get content type: %d", err );
-        }
-    else
-        {
-        if (iContentType)
-            {
-            delete iContentType;
-            iContentType = NULL;
-            }
-        iContentType = contype.AllocL();
-        RDEBUG( "CAMDownloader::ContentTypeFromDownloadL: ");RDEBUG_HEX8( iContentType->Ptr(), iContentType->Size() );
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// CAMDownloader::DownloadURIFromDownloadL
-// ---------------------------------------------------------------------------
-void CAMDownloader::DownloadURIFromDownloadL()
-    {
-    TBuf8<KMaxUrlLength> uri;
-    TInt err(iDownload.GetStringAttribute(EDlAttrReqUrl, uri) );
-    if (err != KErrNone)
-        {
-        RDEBUG_2( "CAMDownloader::DownloadURIFromDownloadL: Failed to get uri: %d", err );
-        }
-    else
-        {
-        if (iURI)
-            {
-            delete iURI;
-            iURI = NULL;
-            }
-        iURI = uri.AllocL();
-        RDEBUG( "CAMDownloader::DownloadURIFromDownloadL: ");RDEBUG_HEX8( iURI->Ptr(), iURI->Size() );
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// CAMDownloader::FileName
-// ---------------------------------------------------------------------------
-const TDesC& CAMDownloader::FileName()
-    {
-    if (iFileName)
-        {
-        return *iFileName;
-        }
-    else
-        {
-        TRAPD( err, FileNameFromDownloadL() )
-        ;
-        if (err == KErrNone)
-            {
-            return *iFileName;
-            }
-        }
-
-    return KNullDesC();
-    }
-
-// ---------------------------------------------------------------------------
-// CAMDownloader::MimeType
-// ---------------------------------------------------------------------------
-const TDesC8& CAMDownloader::MimeType()
-    {
-    if (iContentType)
-        {
-        return *iContentType;
-        }
-    else
-        {
-        TRAPD( err, ContentTypeFromDownloadL() )
-        ;
-        if (err == KErrNone)
-            {
-            return *iContentType;
-            }
-        }
-    return KNullDesC8();
-    }
-
-// ---------------------------------------------------------------------------
-// CAMDownloader::DownloadURI
-// ---------------------------------------------------------------------------
-const TDesC8& CAMDownloader::DownloadURI()
-    {
-    if (iURI)
-        {
-        return *iURI;
-        }
-    else
-        {
-        TRAPD( err, DownloadURIFromDownloadL() )
-        ;
-        if (err == KErrNone)
-            {
-            return *iURI;
-            }
-        }
-    return KNullDesC8();
-    }
-
-// ---------------------------------------------------------------------------
-// CompareDownloadURI
-// ---------------------------------------------------------------------------
-TBool CAMDownloader::CompareDownloadURI(const TDesC8& aURI)
-    {
-    TBool match(EFalse);
-    if (DownloadURI() == aURI)
-        {
-        match = ETrue;
-        }
-    return match;
-    }
-
-// ---------------------------------------------------------------------------
-// DownloadStatusCode
-// ---------------------------------------------------------------------------
-TInt32 CAMDownloader::DownloadStatusCodeL(THttpDownloadState aDownloadState)
-    {
-    RDEBUG_2( "CAMDownloader::DownloadStatusCodeL: State '%d'", aDownloadState );	
-    
-    TInt32 code;
-    User::LeaveIfError(iDownload.GetIntAttribute(EDlAttrStatusCode, code) );
-    RDEBUG_2( "CAMDownloader::DownloadStatusCodeL: ERROR download status code '%d'", code );
-
-    THttpDownloadMgrError errx;
-    User::LeaveIfError(iDownload.GetIntAttribute(EDlAttrErrorId,
-            (TInt32&)errx ) );
-    RDEBUG_2( "CAMDownloader::DownloadStatusCodeL: ERROR download error id '%d'", errx );
-
-    TInt32 gerr;
-    User::LeaveIfError(iDownload.GetIntAttribute(EDlAttrGlobalErrorId, gerr) );
-    RDEBUG_2( "CAMDownloader::DownloadStatusCodeL: ERROR global error id '%d'", gerr );
-
-    TInt32 res(KErrNone);
-    if (code == 0 || code == 200)
-        {
-        res = errx;
-        
-        }
-    else
-        {
-        res = code;
-        }
-
-    if (errx == EHttpUnhandled || errx == EGeneral || errx
-            == EConnectionFailed || errx == ETransactionFailed)
-        {
-        res = gerr;
-        }
-    if (errx == EDiskFull)
-        res = KStatusDowloadFailedOOM;
-
-    if(errx == ETransactionFailed && gerr == -7376)
-        res = KStatusAltDowldUnavailable;
-
-    if (errx == EHttpAuthenticationFailed)
-        res = KStatusAlternateDownldAuthFail;
-
-    RDEBUG( "Result code visited" ); 
-
-    if(iCurrentDownloadProgState == EHttpProgConnectionSuspended && aDownloadState == EHttpDlPaused)
-    {
-      RDEBUG( "Connection lost and  suspended" ); 
-      res = KStatusDownloadFailed;
-      
-    }
-
-    // Display note in case of download failure
-    // if download fails because of network loss then display note specific to Networkloss
-    // else display note for general
-    if(errx != ENoError )
-    TRAP_IGNORE(DisplayDownloadFailedNoteL(errx,gerr));
-    
-    if (!iProgressCancelled)
-            {
-            RDEBUG( "iProgressNote->ProgressCompletedL() Start" ); 
-            TRAP_IGNORE(iProgressNote->ProgressCompletedL());
-            RDEBUG( "iProgressNote->ProgressCompletedL() End" ); 
-            }
-    
-    iProgressCancelled = ETrue;
-    
-    RDEBUG_2( "CAMDownloader::DownloadStatusCodeL: Status code (%d)", res );
-    return res;
-    }
-
-// ---------------------------------------------------------------------------
-// DisplayDownloadFailedNoteL
-// ---------------------------------------------------------------------------
-
-void CAMDownloader::DisplayDownloadFailedNoteL(THttpDownloadMgrError aError, TInt32 aGlobalErr)
-    {
-
-    TBool iOffline = EFalse;
-    TInt allowed(0);
-    CRepository* coreAppUisCr = CRepository::NewLC( KCRUidCoreApplicationUIs );
-    coreAppUisCr->Get( KCoreAppUIsNetworkConnectionAllowed, allowed ) ;
-    CleanupStack::PopAndDestroy( coreAppUisCr );
-    if( allowed != ECoreAppUIsNetworkConnectionAllowed )
-        {
-        iOffline = ETrue;
-        }
-
-    // current phone in offline mode or connection failure display note to user that connection is lost
-
-    if(aError == EConnectionFailed || iOffline)
-        {
-         RDEBUG( "DisplayDownloadFailedNoteL : CAMDownloader Connection Failed" );  
-        HBufC *netlossnote = StringLoader::LoadLC(R_DOWNLOADFAILED_CONNECTION);
-
-        CAknGlobalNote* globalNote = CAknGlobalNote::NewL();
-        CleanupStack::PushL(globalNote);
-        
-        globalNote->ShowNoteL(EAknGlobalErrorNote, *netlossnote);
-
-        CleanupStack::PopAndDestroy( 2);// globalNote, dialognote
-        }
-    else
-        {
-        RDEBUG( "DisplayDownloadFailedNoteL : CAMDownloader" );       
-
-        HBufC *generrornote = StringLoader::LoadLC(R_DOWNLOADFAILED_GENERAL);
-        TRequestStatus status;              
-
-        CAknGlobalNote* dialog = CAknGlobalNote::NewLC();
-        dialog->SetSoftkeys(R_AVKON_SOFTKEYS_OK_EMPTY);
-        
-        dialog->ShowNoteL(status, EAknGlobalErrorNote, *generrornote);
-        User::WaitForRequest(status);
-
-        // ignore the softkey status..
-
-        CleanupStack::PopAndDestroy(2);         // pop dialog, generrornote
-        }    
-
-    }
-
-// ---------------------------------------------------------------------------
-// HandleDLProgressDialogExitL
-// ---------------------------------------------------------------------------
-
-void CAMDownloader::HandleDLProgressDialogExitL(TInt aButtonId)
-    {
-
-    if (aButtonId == EAknSoftkeyCancel)
-        {
-        iProgressCancelled = ETrue;
-
-        HBufC* note = StringLoader::LoadLC( R_DOWNLOAD_CANCELLED);
-
-        CAknGlobalNote* globalNote = CAknGlobalNote::NewL();
-        CleanupStack::PushL(globalNote);
-        globalNote->ShowNoteL(EAknGlobalInformationNote, *note);
-
-        CleanupStack::PopAndDestroy( 2);// globalNote, note
-
-
-        TInt UIdisabled=0;
-        RProperty::Set(KUidPSApplicationManagementKeys, KAMServerUIEnabled,
-                UIdisabled);
-
-        iObserver.SetStatus(KStatusUserCancelled);
-        }
-
-    }
-//  End of File
--- a/applicationmanagement/server/src/AMPreInstallApp.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,289 +0,0 @@
-/*
- * Copyright (c) 2000 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: Implementation of applicationmanagement components
- *
- */
-
-#include "AMPreInstallApp.h"
-#include <pathinfo.h>
-#include <driveinfo.h>
-#include "debug.h"
-#include <apmstd.h>  //for KMaxDataTypeLength
-#include <sisregistrysession.h>
-#include <sisregistrypackage.h>
-#include <e32cmn.h> 
-#include<utf.h>
-#include<sisregistryentry.h>
-#include <caf/caf.h>
-#include <apgcli.h>
-#include <SWInstDefs.h>
-
-using namespace NApplicationManagement;
-CAMPreInstallApp* CAMPreInstallApp::NewL()
-    {
-    CAMPreInstallApp* self = CAMPreInstallApp::NewLC();
-    CleanupStack::Pop(self);
-    return self;
-
-    }
-CAMPreInstallApp* CAMPreInstallApp::NewLC()
-    {
-    CAMPreInstallApp *self = new ( ELeave ) CAMPreInstallApp(  );
-    CleanupStack::PushL( self ) ;
-    self->ConstructL() ;
-    return self;
-
-    }
-CAMPreInstallApp::CAMPreInstallApp()
-    {
-    }
-CAMPreInstallApp::~CAMPreInstallApp()
-    {
-    delete iStorage;
-    iFs.Close();
-    #ifdef RD_MULTIPLE_DRIVE        
- 		  delete iInstallDocPathArray;
-    #endif    
-    iPreInstalledAppParams.ResetAndDestroy();
-    }
-void CAMPreInstallApp::ConstructL()
-    {
-    iStorage = CDeliveryComponentStorage::NewL();
-    User::LeaveIfError(iFs.Connect() );
-    TPtrC mmcDrive(TParsePtrC( PathInfo::MemoryCardRootPath() ).Drive());
-      iPreInstallPath.Append(mmcDrive);
-      iPreInstallPath.Append(KPreInstallPath);
-    }
-void CAMPreInstallApp::GetPreInstalledAppsL(RPointerArray<TPreInstalledAppParams> &aPreInstalledAppParams)
-    {
-
-    MakeAllInstallPathsL();
-    ListPreInstalledAppL();
-    aPreInstalledAppParams = iPreInstalledAppParams;
-    }
-
-
-void CAMPreInstallApp::ListPreInstalledAppL(const TDesC& installDocPath)
-    {
-
-    RDEBUG("Clist_PreInstallAppUi: ListPreInstalledApp: <<<<");
-    CDir* dir= NULL;
-    TInt err = iFs.GetDir(installDocPath, KEntryAttNormal, ESortByName, dir);
-   // _LIT(KInstallpath,"C:\\private\\10202dce\\");
-    //TInt err = iFs.GetDir(KInstallpath, KEntryAttNormal, ESortByName, dir);
-    RDEBUG_2("Clist_PreInstallAppUi: ListPreInstalledApp: err in getting dir list : %d",err);
-    
-    if (err==KErrNone)
-        {
-        CleanupStack::PushL(dir);
-        RDEBUG_2("Clist_PreInstallAppUi: ListPreInstalledApp: no of dir's : %d",dir->Count());
-        for (TInt i(0); i < dir->Count(); i++)
-            {
-
-	    RDEBUG_2("Clist_PreInstallAppUi: ListPreInstalledApp: <<<< dir entry %d", i);
-            TEntry entry;
-            entry = (*dir)[i];
-            HBufC* pathAndName = HBufC::NewLC(installDocPath.Length()
-                    + entry.iName.Length() );
-            TPtr ptrPathAndName = pathAndName->Des();
-            ptrPathAndName.Append(installDocPath);
-            ptrPathAndName.Append(entry.iName);
-
-            HBufC* mimeType = HBufC::NewLC(KMaxDataTypeLength);
-            //Recognize     
-            if (!RecognizeL(*pathAndName, mimeType))
-                {
-                CleanupStack::PopAndDestroy(mimeType);
-                CleanupStack::PopAndDestroy(pathAndName);
-                continue;
-                }
-
-#ifdef RD_MULTIPLE_DRIVE
-            if ( TParsePtrC( installDocPath ).Path().CompareF(KPreInstallPath) == 0 )
-#else
-            if (installDocPath.CompareF(iPreInstallPath) == 0)
-#endif
-                {
-
-		RDEBUG("Clist_PreInstallAppUi: ListPreInstalledApp: <<<< Entered installDocPath.CompareF(iPreInstallPath)");
-                Swi::RSisRegistrySession regSession;
-                CleanupClosePushL(regSession);
-                User::LeaveIfError(regSession.Connect() );
-
-                RArray<TUid> uids;
-                CleanupClosePushL(uids);
-
-                regSession.InstalledUidsL(uids);
-
-                RFile temp;
-                User::LeaveIfError(temp.Open(iFs, *pathAndName,
-                        EFileShareReadersOnly | EFileRead) );
-                CleanupClosePushL(temp);
-
-                TUid appUid;
-                TInt uidLen = sizeof(TInt32);
-                TInt seekLen = sizeof(TInt32) + sizeof(TInt32);
-
-                User::LeaveIfError(temp.Seek(ESeekStart, seekLen));
-
-                TPckg<TInt32> uid1(appUid.iUid);
-                User::LeaveIfError(temp.Read(uid1, uidLen));
-                if (uid1.Length() != uidLen)
-                    {
-                    User::Leave(KErrUnderflow);
-                    }
-
-                //checking whether this is installed or not
-                TBool installed = regSession.IsInstalledL(appUid);
-                Swi::RSisRegistryEntry registryEntry;
-                TInt regEntryError = registryEntry.Open(regSession, appUid);
-		RDEBUG_2("Clist_PreInstallAppUi: ListPreInstalledApp: RegEntryError : %d",regEntryError);
-
-		//User::LeaveIfError(regEntryError);
-		if (regEntryError == KErrNone)
-		    {
-                CleanupClosePushL(registryEntry);
-                TBool isPreInstalled = registryEntry.PreInstalledL();
-                RDEBUG_4("Clist_PreInstallAppUi: ListPreInstalledApp: UID is : '0x%X', installed:, preinstalled %d  %d",appUid,installed,isPreInstalled);
-
-                for (TInt i(0); isPreInstalled && i < uids.Count(); i++)
-                    {
-                    if (appUid == uids[i])
-                        {
-
-			RDEBUG("Clist_PreInstallAppUi: appUid == uids[i]");
-                        Swi::CSisRegistryPackage* sisRegistry = NULL;
-                        TRAPD( err, sisRegistry = regSession.SidToPackageL( uids[i] ) ) ;
-                        //User::LeaveIfError(err);
-			if(err == KErrNone)
-			{
-
-			RDEBUG("Clist_PreInstallAppUi: err == KErrNone");
-                        TPreInstalledAppParams *params =
-                                new (ELeave) TPreInstalledAppParams;
-                        params->iPreInstalledAppame.Copy(sisRegistry->Name());
-                        params->iPreInstalledAppVendorName.Copy(
-                                sisRegistry->Vendor());
-                        params->iPreInstalledAppUid = sisRegistry->Uid();
-                        params->iMimeType.Copy(*mimeType);
-                        //Get version
-                        TVersion version = registryEntry.VersionL();
-                        TBuf8<KVersionLength> pkgDes;
-                        pkgDes.AppendNum(version.iMajor);
-                        pkgDes.Append(KLiteralPeriod);
-                        pkgDes.AppendNum(version.iMinor);
-                        params->iVersion.Copy(pkgDes);
-
-                        iPreInstalledAppParams.Append(params);
-
-                        RDEBUG_2("Clist_PreInstallAppUi: ListPreInstalledApp: Installed App UID is : '0x%X'",appUid);
-                        RDEBUG_2("Clist_PreInstallAppUi: ListPreInstalledApp: Installed App Name is: %S",&(sisRegistry->Name()));
-                        RDEBUG_2("Clist_PreInstallAppUi: ListPreInstalledApp: Installed App Vendor is: %S",&(sisRegistry->Vendor()));
-                        RDEBUG_2("Clist_PreInstallAppUi: ListPreInstalledApp: Installed App UID is : '0x%X'",sisRegistry->Uid());
-                        delete sisRegistry;
-			}
-                        continue;
-                        }
-                    }
-
-                CleanupStack::PopAndDestroy(&registryEntry);
-		    }
-                CleanupStack::PopAndDestroy(&temp);
-                CleanupStack::PopAndDestroy(&uids);
-                CleanupStack::PopAndDestroy(&regSession);
-                CleanupStack::PopAndDestroy(mimeType);
-                CleanupStack::PopAndDestroy(pathAndName);
-                }
-            }
-         CleanupStack::PopAndDestroy(dir);
-        }
-    }
-void CAMPreInstallApp::ListPreInstalledAppL()
-    {
-    iPreInstalledAppParams.Reset();
-#ifdef RD_MULTIPLE_DRIVE
-    TInt count = iInstallDocPathArray->Count();
-    for ( TInt index(0); index < count; index++ )
-        {
-        if ( (*iInstallDocPathArray)[index].Length()> 0 )
-            {
-            ListPreInstalledAppL( (*iInstallDocPathArray)[index] );
-            }
-        }
-#else   
-    if (iPreInstallDocumentPath.Length() > 0)
-        {
-        ListPreInstalledAppL(iPreInstallDocumentPath);
-        }
-#endif
-    }
-TBool CAMPreInstallApp::RecognizeL(TDesC& aPathAndName, HBufC* aMimeType)
-    {
-    TBool IsOK(ETrue);
-    ContentAccess::CContent* pkgContent = ContentAccess::CContent::NewLC(
-            aPathAndName, ContentAccess::EContentShareReadWrite);
-    
-    TPtr mimePtr(aMimeType->Des());
-    pkgContent->GetStringAttribute(ContentAccess::EMimeType, mimePtr);
-
-    HBufC8* tmpMime8 = HBufC8::NewLC(aMimeType->Length());
-    tmpMime8->Des().Copy(*aMimeType);
-    TPtr8 mimePtr8(tmpMime8->Des());
-
-    if ((mimePtr8 != SwiUI::KSisxMimeType) && (mimePtr8
-            != SwiUI::KSisMimeType) && (mimePtr8 != SwiUI::KPipMimeType))
-        {
-        IsOK = EFalse;
-        }
-    CleanupStack::PopAndDestroy(tmpMime8);
-    CleanupStack::PopAndDestroy(pkgContent);
-    return IsOK;
-
-    }
-void CAMPreInstallApp::MakeAllInstallPathsL()
-    {
-#ifdef RD_MULTIPLE_DRIVE        
-    iInstallDocPathArray = new (ELeave) CDesCArrayFlat( 2 );
-    TDriveList driveList;
-    TInt driveCount = 0;
-    //User::LeaveIfError(iFs.Connect() );
-    User::LeaveIfError( DriveInfo::GetUserVisibleDrives(iFs, driveList,driveCount));
-    TUint driveStatus = 0;
-    for (TInt index(0); index < KMaxDrives; index++)
-        {
-        if (driveList[index])
-            {
-            User::LeaveIfError( DriveInfo::GetDriveStatus(iFs, index,
-                    driveStatus));
-            TFileName path;
-            TDriveUnit driveUnit(index);
-            if ( !(driveStatus & DriveInfo::EDriveRemote ))
-                {
-                if (driveStatus & DriveInfo::EDriveRemovable)
-                    {
-                    path.Zero();
-                    path.Append(driveUnit.Name() );
-                    path.Append(KPreInstallPath);
-                    iInstallDocPathArray->AppendL(path);
-                    }
-                }
-            }
-        }
-    //iFs.Close();
-#else   
-    TPtrC mmcDrive(TParsePtrC( PathInfo::MemoryCardRootPath() ).Drive());
-    iPreInstallDocumentPath.Append(mmcDrive);
-    iPreInstallDocumentPath.Append(KPreInstallPath);
-#endif //RD_MULTIPLE_DRIVE 
-    }
--- a/applicationmanagement/server/src/AMSmlHelper.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,324 +0,0 @@
-/*
- * Copyright (c) 2000 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: Implementation of applicationmanagement components
- *
- */
-
-#include "amsmlhelper.h"
-#include <SyncMLClientDM.h>
-#include "debug.h"
-#include <rconnmon.h> 
-#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
-#include <es_sock.h>
-#else
-#include <es_sock.h>
-#include <es_enum_internal.h>
-#include <es_sock_partner.h>
-#endif
-#include <es_enum.h>
-
-const TUid KUidNSmlMediumTypeInternet =
-    {
-    0x101F99F0
-    };
-const TUid KSosServerUid =
-    {
-    0x101F99FB
-    };
-
-const TInt KBufSize32 = 32;
-
-using namespace NApplicationManagement;
-
-/*
- void CApplicationManagementServer::StartDMSessionL( )
- {
- RSyncMLSession ses;
- ses.OpenL() ;
- 
- CleanupClosePushL( ses );
- TSmlJobId jid;
- TSmlUsageType jtype;
- ses.CurrentJobL(jid, jtype );
- RSyncMLDevManJob job;
- job.OpenL( ses, jid );
- CleanupClosePushL( job ) ;
- TSmlProfileId pid( job.Profile() );
- RSyncMLDevManProfile prof;
- prof.OpenL( ses, pid, ESmlOpenRead );
- 
- TBuf<64> serverid;
- serverid.Copy( prof.ServerId()) ;
- prof.Close();
- 
- CleanupStack::PopAndDestroy( &job )	;
- CleanupStack::PopAndDestroy( &ses )	;
- }
- */
-
-TInt SmlHelper::GetCurrentProfileIdL(TSmlProfileId &aProfile)
-    {
-    RSyncMLSession ses;
-    ses.OpenL() ;
-    CleanupClosePushL(ses);
-    TSmlJobId jid;
-    TSmlUsageType jtype;
-    ses.CurrentJobL(jid, jtype);
-    RSyncMLDevManJob job;
-    job.OpenL(ses, jid);
-    CleanupClosePushL(job) ;
-    TSmlProfileId pid(job.Profile() );
-    aProfile = pid;
-
-    CleanupStack::PopAndDestroy( &job) ;
-    CleanupStack::PopAndDestroy( &ses) ;
-    return 0;
-    }
-
-HBufC8* SmlHelper::GetCurrentServerIDL()
-    {
-    HBufC8 *serverid;
-    //TBufC<256> serverid;
-    RSyncMLSession ses;
-    ses.OpenL() ;
-    CleanupClosePushL(ses);
-    TSmlJobId jid;
-    TSmlUsageType jtype;
-    ses.CurrentJobL(jid, jtype);
-    RSyncMLDevManJob job;
-    job.OpenL(ses, jid);
-    CleanupClosePushL(job) ;
-    TSmlProfileId pid(job.Profile() );
-    //aProfile = pid;
-    RSyncMLDevManProfile syncProfile;
-    syncProfile.OpenL(ses, pid);
-    RDEBUG("	5/8");
-    CleanupClosePushL(syncProfile);
-
-    serverid = syncProfile.ServerId().AllocLC();
-
-    CleanupStack::Pop(); // serverid
-
-    CleanupStack::PopAndDestroy( &syncProfile);
-    CleanupStack::PopAndDestroy( &job) ;
-    CleanupStack::PopAndDestroy( &ses) ;
-
-    return serverid;
-    }
-
-TInt SmlHelper::LaunchSessionL(TSmlProfileId &aProfile)
-    {
-    if (aProfile > -1)
-        {
-        RSyncMLSession syncSession;
-        RSyncMLConnection conn;
-        RSyncMLDevManJob dmJob;
-        RSyncMLDevManProfile dmProfile;
-
-        //TSmlProfileId id ;
-        TSmlConnectionId cid;
-        syncSession.OpenL();
-        CleanupClosePushL(syncSession);
-
-        TRAPD( err, dmProfile.OpenL( syncSession, aProfile, ESmlOpenRead ) )
-        if (err == KErrNone)
-            {
-            CleanupClosePushL(dmProfile);
-            conn.OpenL(dmProfile, KUidNSmlMediumTypeInternet.iUid);
-            CleanupStack::PopAndDestroy( &dmProfile) ;
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-            cid = conn.Identifier();
-#else
-            cid = conn.ConnectionId();
-#endif
-            conn.Close();
-            dmJob.CreateL(syncSession, aProfile, cid);
-            dmJob.Close();
-            }
-        CleanupStack::PopAndDestroy( &syncSession) ; //
-        return err;
-        }
-    else
-        {
-        return KErrArgument;
-        }
-    }
-
-void SmlHelper::GetDefaultIAPFromDMProfileL(TInt& aDefaultIAP)
-    {
-    RDEBUG("ApplicationManagementServer::GetDefaultIAPFromDMProfileL() - start");
-
-    // first try to obtain the current profile id
-    RSyncMLSession ses;
-    ses.OpenL();
-    RDEBUG("	1/8");
-    CleanupClosePushL(ses);
-
-    TSmlJobId jid;
-    TSmlUsageType jtype;
-    ses.CurrentJobL(jid, jtype);
-    RDEBUG("	2/8");
-    RSyncMLDevManJob job;
-    job.OpenL(ses, jid);
-    RDEBUG("	3/8");
-    CleanupClosePushL(job);
-    // get profile id
-    TSmlProfileId pid(job.Profile() );
-    CleanupStack::PopAndDestroy( &job);
-
-    TBuf8<KBufSize32> key;
-    TBuf<KBufSize32> value;
-    TInt num = KErrNotFound;
-
-    // get connection property name first
-    GetConnectionPropertyNameL(ses, key, EPropertyIntenetAccessPoint);
-    RDEBUG("	4/8");
-    // we need to open sync profile in ordere to open the RSyncMLConnection
-    RSyncMLDevManProfile syncProfile;
-    syncProfile.OpenL(ses, pid);
-    RDEBUG("	5/8");
-    CleanupClosePushL(syncProfile);
-
-    TSmlTransportId transport;
-    RArray<TSmlTransportId> connections;
-    _LIT8( KNSmlIAPId, "NSmlIapId" );
-
-    // now open the syncML connection
-    RSyncMLConnection syncConnection;
-    syncProfile.ListConnectionsL(connections);
-
-    transport = connections[0];
-    syncConnection.OpenL(syncProfile, transport);
-    RDEBUG("	6/8");
-    CleanupClosePushL(syncConnection);
-
-    const TDesC8& source(syncConnection.GetPropertyL(KNSmlIAPId) );
-    RDEBUG("	7/8");
-    value.Copy(source.Left(value.MaxLength() ) );
-    User::LeaveIfError(StrToInt(value, num) );
-    RDEBUG("	8/8");
-
-    aDefaultIAP = num;
-
-    // If there is no default Access point in DM profile then use
-    // currently used access point by DM session
-
-    if (aDefaultIAP == -1)
-        {
-
-        TInt sockIapid = -1;
-
-        RSocketServ serv;
-        CleanupClosePushL(serv);
-        User::LeaveIfError(serv.Connect() );
-
-        RConnection conn;
-        CleanupClosePushL(conn);
-        User::LeaveIfError(conn.Open(serv) );
-
-        TUint count( 0);
-        User::LeaveIfError(conn.EnumerateConnections(count) );
-        // enumerate connections
-        for (TUint idx=1; idx<=count; ++idx)
-            {
-            TConnectionInfo connectionInfo;
-            TConnectionInfoBuf connInfo(connectionInfo);
-
-            TInt err = conn.GetConnectionInfo(idx, connInfo); // iapid
-            if (err != KErrNone)
-                {
-                CleanupStack::PopAndDestroy( 2); // conn, serv
-                User::Leave(err);
-                }
-            // enumerate connectionclients
-            TConnectionEnumArg conArg;
-            conArg.iIndex = idx;
-            TConnEnumArgBuf conArgBuf(conArg);
-            err=conn.Control(KCOLConnection, KCoEnumerateConnectionClients,
-                    conArgBuf);
-            if (err != KErrNone)
-                {
-                CleanupStack::PopAndDestroy( 2); // conn, serv
-                User::Leave(err);
-                }
-            TInt cliCount = conArgBuf().iCount;
-            for (TUint j=1; j<=cliCount; ++j)
-                {
-                TConnectionGetClientInfoArg conCliInfo;
-                conCliInfo.iIndex = j;
-                TConnGetClientInfoArgBuf conCliInfoBuf(conCliInfo);
-                err=conn.Control(KCOLConnection, KCoGetConnectionClientInfo,
-                        conCliInfoBuf);
-
-                if (err != KErrNone)
-                    {
-                    CleanupStack::PopAndDestroy( 2); // conn, serv
-                    User::Leave(err);
-                    }
-                TConnectionClientInfo conCliInf = conCliInfoBuf().iClientInfo;
-                TUid uid = conCliInf.iUid;
-                if (uid == KSosServerUid)
-                    {
-                    sockIapid = connInfo().iIapId;
-
-                    }
-
-                }
-            }
-        CleanupStack::PopAndDestroy( 2); // conn, serv		
-
-        aDefaultIAP = sockIapid;
-
-        }
-    // get profile's server id
-    //aServerId = syncProfile.ServerId().AllocL();
-
-    CleanupStack::PopAndDestroy( &syncConnection);
-    CleanupStack::PopAndDestroy( &syncProfile);
-
-    CleanupStack::PopAndDestroy( &ses);
-    connections.Close();
-    RDEBUG("ApplicationManagementServer::GetDefaultIAPFromDMProfileL() - end");
-    }
-
-void SmlHelper::GetConnectionPropertyNameL(RSyncMLSession& aSyncSession,
-        TDes8& aText, TInt aPropertyPos)
-    {
-    RDEBUG("ApplicationManagementServer::GetConnectionPropertyNameL() - start");
-
-    // at the moment RSyncMLTransport is only needed
-    // for internet connection settings
-    RSyncMLTransport transport;
-    CleanupClosePushL(transport);
-    transport.OpenL(aSyncSession, KUidNSmlMediumTypeInternet.iUid);
-
-    const CSyncMLTransportPropertiesArray& arr = transport.Properties();
-
-    __ASSERT_DEBUG( arr.Count()> aPropertyPos, User::Panic(_L("invalid count"), KErrGeneral) );
-
-    const TSyncMLTransportPropertyInfo& info = arr.At(aPropertyPos);
-    aText = info.iName;
-    CleanupStack::PopAndDestroy( &transport);
-
-    RDEBUG("ApplicationManagementServer::GetConnectionPropertyNameL() - end");
-    }
-
-TInt SmlHelper::StrToInt(const TDesC& aText, TInt& aNum)
-    {
-    TLex lex(aText);
-    TInt err = lex.Val(aNum);
-    return err;
-    }
-
-// End of File
--- a/applicationmanagement/server/src/AppMgmtProgDialog.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,86 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
- *
- * Description:  Implementation of applicationmanagement components
- *
-*/
-#include "AppMgmtProgDialog.h"
-#include <avkon.rsg>
-#include <applicationmanagement.rsg>
-#include <eikenv.h>
-#include <aknnotewrappers.h>
-#include <avkon.hrh>
-
-CAppMgmtProgDialog::CAppMgmtProgDialog(MDLProgressDlgObserver *iCallback) :
-    iDlgObserver(iCallback)
-    {
-
-    }
-
-CAppMgmtProgDialog::~CAppMgmtProgDialog()
-    {
-    if (iProgressDialog)
-        {
-        delete iProgressDialog;
-        }
-
-    }
-
-void CAppMgmtProgDialog::StartProgressNoteL()
-    {
-    iProgressDialog = new (ELeave) CAknProgressDialog(
-            (REINTERPRET_CAST(CEikDialog**, &iProgressDialog)),
-            ETrue);
-    iProgressDialog->PrepareLC(R_PROGRESS_NOTE);
-    iProgressInfo = iProgressDialog->GetProgressInfoL();
-    iProgressDialog->SetCallback(this);
-    iProgressDialog->RunLD();
-    iProgressInfo->SetFinalValue(500);
-
-    }
-
-void CAppMgmtProgDialog::UpdateProcessL(TInt aProgress)
-    {
-    if (iProgressInfo)
-        {
-        iProgressInfo->SetAndDraw(aProgress);
-        }
-    }
-
-void CAppMgmtProgDialog::ProgressCompletedL()
-    {
-    if (iProgressDialog)
-        {
-        iProgressDialog->ProcessFinishedL();
-        }
-
-    }
-
-void CAppMgmtProgDialog::SetFinalValueL(TInt32 aFinalValue)
-    {
-    iProgressInfo = iProgressDialog->GetProgressInfoL();
-    iProgressInfo-> SetFinalValue(aFinalValue);
-    }
-
-void CAppMgmtProgDialog::DialogDismissedL(TInt aButtonId)
-    {
-
-    //|| aButtonId == EAknSoftkeyEmpty
-    if (aButtonId == EAknSoftkeyCancel)
-        {
-
-        iDlgObserver->HandleDLProgressDialogExitL(aButtonId);
-
-        }
-    }
-
--- a/applicationmanagement/server/src/AppMgmtSrvApp.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,149 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
- *
- * Description:  Implementation of applicationmanagement components
- *
-*/
-
-
-// INCLUDE FILES
-#include <apgwgnam.h>
-#include <apgcli.h>
-#include "AppMgmtSrvApp.h"
-#include "AppMgmtSrvDocument.h"
-#include "ApplicationManagementCommon.h"
-
-#include <apgtask.h>
-
-// ---------------------------------------------------------------------------
-// CAppMgmtSrvApp::CAppMgmtSrvApp
-// ---------------------------------------------------------------------------
-CAppMgmtSrvApp::CAppMgmtSrvApp()
-    {
-    }
-
-// ---------------------------------------------------------------------------
-// CAppMgmtSrvApp::AppDllUid()
-// Returns application UID
-// ---------------------------------------------------------------------------
-//
-TUid CAppMgmtSrvApp::AppDllUid() const
-    {
-    TUid AppMgmtuid;
-    AppMgmtuid.iUid = KAppMgmtServerUid;
-    return AppMgmtuid;
-    }
-
-// --------------------------------------------------------------------------
-// CAppMgmtSrvApp::SetUIVisibleL
-// Turns UI visible or hidden
-// --------------------------------------------------------------------------
-//
-void CAppMgmtSrvApp::SetUIVisibleL()
-    {
-    /*CAppMgmtSrvUi*  ui = (CAppMgmtSrvUi*)iDocument->AppUi();
-     
-     TApaTaskList taskList( CEikonEnv::Static()->WsSession() );
-     TApaTask task = taskList.FindApp( TUid::Uid(KAppMgmtServerUid ));
-     
-     if(task.Exists())
-     {
-     if(!aVisible)
-     {
-     
-     ui->HideApplicationFromFSW(ETrue);
-     
-     }
-     else
-     {
-     
-     task.BringToForeground();
-     }*/
-
-    }
-
-// ---------------------------------------------------------------------------
-// CAppMgmtSrvApp::~CAppMgmtSrvApp()
-// ---------------------------------------------------------------------------
-//
-CAppMgmtSrvApp::~CAppMgmtSrvApp()
-    {
-    }
-
-// ---------------------------------------------------------------------------
-// CAppMgmtSrvApp::CreateDocumentL()
-// Creates AppMgmtSrvDocument object
-// ---------------------------------------------------------------------------
-//
-CApaDocument* CAppMgmtSrvApp::CreateDocumentL()
-    {
-
-    iDocument = CAppMgmtSrvDocument::NewL( *this);
-    return iDocument;
-    }
-
-#include <eikstart.h>
-
-// ---------------------------------------------------------------------------
-// NewApplication() 
-// Constructs CAppMgmtSrvApp
-// Returns: CApaDocument*: created application object
-// ---------------------------------------------------------------------------
-//
-LOCAL_C CApaApplication* NewApplication()
-    {
-
-    return new CAppMgmtSrvApp;
-    }
-
-// ---------------------------------------------------------------------------
-// ServerL() 
-// Getter for server
-// ---------------------------------------------------------------------------
-//
-CApplicationManagementServer* CAppMgmtSrvApp::Server()
-    {
-    return iAppMgmtServer;
-    }
-
-// ---------------------------------------------------------------------------
-// NewAppServerL() 
-// Called by framwork
-// ---------------------------------------------------------------------------
-//
-void CAppMgmtSrvApp::NewAppServerL(CApaAppServer*& aAppServer)
-    {
-
-    iAppMgmtServer = CApplicationManagementServer::NewL();
-    iAppMgmtServer->iParentApp = this;
-    aAppServer = iAppMgmtServer;
-    }
-
-// ---------------------------------------------------------------------------
-// E32Main
-// ---------------------------------------------------------------------------
-//
-GLDEF_C TInt E32Main()
-    {
-    TInt err;
-    RProcess pr;
-    TFullName fn = pr.FullName();
-
-    RDebug::Print(_L("[AppMgmtServer] E32Main:    >> called by %S"), &fn);
-
-    err = EikStart::RunApplication(NewApplication);
-
-    return err;
-    }
-
-// End of File
--- a/applicationmanagement/server/src/AppMgmtSrvDocument.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
- *
- * Description:  Implementation of applicationmanagement components
- *
-*/
-
-
-// INCLUDE FILES
-#include <StringLoader.h>
-#include "AppMgmtSrvDocument.h"
-#include "AppMgmtSrvUI.h"
-
-// ================= MEMBER FUNCTIONS =======================
-
-// ---------------------------------------------------------------------------
-// Desctructor
-// ---------------------------------------------------------------------------
-//
-CAppMgmtSrvDocument::~CAppMgmtSrvDocument()
-    {
-    }
-
-void CAppMgmtSrvDocument::ConstructL()
-    {
-
-    }
-
-CAppMgmtSrvDocument* CAppMgmtSrvDocument::NewL(CAknApplication& aApp)
-    {
-
-    CAppMgmtSrvDocument* self = new (ELeave) CAppMgmtSrvDocument( aApp );
-    CleanupStack::PushL(self);
-    self->ConstructL();
-    CleanupStack::Pop(); //self
-    return self;
-    }
-
-CEikAppUi* CAppMgmtSrvDocument::CreateAppUiL()
-    {
-
-    return new (ELeave) CAppMgmtSrvUi;
-    }
-
-// End of File
--- a/applicationmanagement/server/src/AppMgmtSrvUi.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,140 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
- *
- * Description:  Implementation of applicationmanagement components
- *
-*/
-
-
-// INCLUDES 
-#include <apgwgnam.h>
-#include <aknnotewrappers.h>
-#include <StringLoader.h>
-#include <textresolver.h>
-#include "AppMgmtSrvUI.h"
-#include "AppMgmtSrvApp.h"
-#include "debug.h"
-
-// ============================ MEMBER FUNCTIONS =============================
-//
-
-// ---------------------------------------------------------------------------
-// CAppMgmtSrvUi::ConstructL
-// Symbian 2nd phase constructor can leave.
-// ---------------------------------------------------------------------------
-//
-void CAppMgmtSrvUi::ConstructL()
-    {
-
-    BaseConstructL(EAknEnableSkin | EAknEnableMSK);
-
-    CAppMgmtSrvApp* app = (CAppMgmtSrvApp*) Application();
-    CApplicationManagementServer* server = app->Server();
-    server->StartShutDownTimerL();
-    
-    server->SendServerToBackground();
-
-    this->StatusPane()->MakeVisible(EFalse);
-
-    HideApplicationFromFSW(ETrue);
-
-    }
-
-// ---------------------------------------------------------------------------
-// Destructor
-// ---------------------------------------------------------------------------
-CAppMgmtSrvUi::~CAppMgmtSrvUi()
-    {
-
-    }
-
-// ---------------------------------------------------------------------------
-// CAppMgmtSrvUi::DynInitMenuPaneL
-// ---------------------------------------------------------------------------
-//
-void CAppMgmtSrvUi::DynInitMenuPaneL(TInt /*aResourceId*/, CEikMenuPane* /*aMenuPane*/)
-    {
-
-    }
-
-// ---------------------------------------------------------------------------
-// CAppMgmtSrvUi::HandleKeyEventL
-// ---------------------------------------------------------------------------
-//
-TKeyResponse CAppMgmtSrvUi::HandleKeyEventL(const TKeyEvent& aKeyEvent,
-        TEventCode aType)
-    {
-
-    if (aType == EEventKey && aKeyEvent.iCode == EKeyEscape)
-        {
-
-        //Handle not required. Since UI Server goes to background and
-        // brought to foreground at the time of displaying dialogs
-
-        }
-
-    return EKeyWasNotConsumed;
-    }
-
-// ---------------------------------------------------------------------------
-// CAppMgmtSrvUi::HandleCommandL
-// ---------------------------------------------------------------------------
-//
-void CAppMgmtSrvUi::HandleCommandL(TInt aCommand)
-    {
-
-    switch (aCommand)
-        {
-        case EAknCmdExit:
-        case EEikCmdExit:
-            break;
-
-        default:
-            break;
-        }
-
-    }
-
-// ---------------------------------------------------------------------------
-// CAppMgmtAppUi::OpenFileL
-// This is called by framework when application is already open in background
-// and user open other file in eg. FileBrowse.
-// New file to been shown is passed via aFileName.
-// ---------------------------------------------------------------------------
-//
-void CAppMgmtSrvUi::OpenFileL(const TDesC& aFileName)
-    {
-
-    }
-
-// ---------------------------------------------------------------------------
-// CAppMgmtAppUi::PrepareToExit
-// This is called by framework when application is about to exit
-// and server can prepare to stop any active downloads
-// ---------------------------------------------------------------------------
-//
-void CAppMgmtSrvUi::PrepareToExit()
-    {
-
-    }
-
-void CAppMgmtSrvUi::HandleForegroundEventL(TBool aValue)
-    {
-    if (aValue == EFalse)
-        RDEBUG( "CAppMgmtSrvUi::HandleForegroundEventL aValue::EFalse" );
-    else
-        RDEBUG( "CAppMgmtSrvUi::HandleForegroundEventL aValue::ETrue" );
-
-    CAknAppUi::HandleForegroundEventL(aValue);
-    // No Handle required    
-    }
--- a/applicationmanagement/server/src/ApplicationManagementJavaUtility.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,204 +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 "Eclipse Public License v1.0"
- * which accompanies this distribution, and is available
- * at the URL "http://www.eclipse.org/legal/epl-v10.html".
- *
- * Initial Contributors:
- * Nokia Corporation - initial contribution.
- *
- * Contributors:
- *
- * Description: Implementation of applicationmanagement components
- *
- */
-
-//	CLASS HEADER
-#include "ApplicationManagementJavaUtility.h"
-#include <debug.h>
-#include <e32property.h>
-#include <javadomainpskeys.h>
-#include <javaregistryincludes.h>
-#include <appversion.h>
-//  EXTERNAL INCLUDES
-//#include <mjavaregistry.h>
-
-//  INTERNAL INCLUDES
-
-
-using namespace NApplicationManagement;
-
-//----------------------------------------------------------------------------
-// 
-//----------------------------------------------------------------------------
-// CONSTRUCTION
-CApplicationManagementJavaUtility* CApplicationManagementJavaUtility::NewL()
-    {
-    CApplicationManagementJavaUtility* self =
-            CApplicationManagementJavaUtility::NewLC();
-    CleanupStack::Pop();
-
-    return self;
-    }
-
-//----------------------------------------------------------------------------
-// 
-//----------------------------------------------------------------------------
-//
-CApplicationManagementJavaUtility* CApplicationManagementJavaUtility::NewLC()
-    {
-    CApplicationManagementJavaUtility* self = new( ELeave ) CApplicationManagementJavaUtility();
-    CleanupStack::PushL(self);
-
-    self->ConstructL();
-    return self;
-    }
-
-//----------------------------------------------------------------------------
-// 
-//----------------------------------------------------------------------------
-// Destructor (virtual by CBase)
-CApplicationManagementJavaUtility::~CApplicationManagementJavaUtility()
-    {
-
-    if (iJavaRegistry)
-        {
-        delete iJavaRegistry;
-        }
-    }
-
-//----------------------------------------------------------------------------
-// 
-//----------------------------------------------------------------------------
-// Default constructor
-CApplicationManagementJavaUtility::CApplicationManagementJavaUtility()
-    {
-    }
-
-//----------------------------------------------------------------------------
-// 
-//----------------------------------------------------------------------------
-// Second phase construct
-void CApplicationManagementJavaUtility::ConstructL()
-    {
-    RefreshJavaRegistryL();
-    }
-
-//  METHODS
-
-//----------------------------------------------------------------------------
-// 
-//----------------------------------------------------------------------------
-//
-TBool CApplicationManagementJavaUtility::FindInstalledJavaUidL(
-        const TUid &aUid) const
-    {
-    TBool ret;
-    ret = iJavaRegistry->RegistryEntryExistsL(aUid);
-    return ret;
-
-    }
-
-//----------------------------------------------------------------------------
-// 
-//----------------------------------------------------------------------------
-//
-void CApplicationManagementJavaUtility::InstalledSuiteUidsL(
-        RArray <TUid>& aUids)
-    {
-    iJavaRegistry->GetRegistryEntryUidsL(aUids);
-    }
-
-//----------------------------------------------------------------------------
-// 
-//----------------------------------------------------------------------------
-//
-void CApplicationManagementJavaUtility::JavaUidsL(RArray<TUid> &aUids)
-    {
-    iJavaRegistry->GetRegistryEntryUidsL(aUids);
-    }
-
-//----------------------------------------------------------------------------
-// 
-//----------------------------------------------------------------------------
-//
-void CApplicationManagementJavaUtility::RefreshJavaRegistryL()
-    {
-    if (iJavaRegistry)
-        {
-        delete iJavaRegistry;
-        iJavaRegistry = NULL;
-        }
-
-    iJavaRegistry = CJavaRegistry::NewL();
-    }
-void CApplicationManagementJavaUtility::GetInstalledMidletParametersL(
-        TMidletParameters& aMidletParameters)
-    {
-    RDEBUG( "CApplicationManagementJavaUtility::GetInstalledMidletParametersL: Start");
-    TInt suiteUid = 0;
-    // Get UID for the latest installed Midlet suite
-    // KPSUidJavaLatestInstallation = 0x10282567
-    RProperty::Get(KUidSystemCategory, KPSUidJavaLatestInstallation, suiteUid);
-
-    if ( !suiteUid)
-        {
-        User::Leave(KErrNotFound);
-        }
-
-    RArray<TUid> uids;
-    CleanupClosePushL(uids);
-
-    Java::CJavaRegistry* javaRegistry;
-    javaRegistry = Java::CJavaRegistry::NewLC();
-
-    Java::CJavaRegistryEntry* regEntry =
-            javaRegistry->RegistryEntryL(TUid::Uid(suiteUid) );
-
-    if (regEntry)
-        {
-        CleanupStack::PushL(regEntry);
-        Java::TJavaRegistryEntryType entryType = regEntry->Type();
-
-        if ( (entryType >= Java::EGeneralPackage ) && (entryType
-                < Java::EGeneralApplication))
-            {
-            //package entry
-            Java::CJavaRegistryPackageEntry * regPackageEntry =
-                    static_cast<Java::CJavaRegistryPackageEntry*>(regEntry );
-            regPackageEntry->GetEmbeddedEntries(uids);
-
-            aMidletParameters.iMidletUid = uids[0]; // conidered the first application from the suite
-            aMidletParameters.iMidletName.Copy(regPackageEntry->Name());
-            aMidletParameters.iMidletVenorName.Copy(regPackageEntry->Vendor());
-
-            TAppVersion version;
-            version = regPackageEntry->Version();
-            _LIT8(KDot,".");
-            aMidletParameters.bufVersion.Num(version.iMajor);
-            aMidletParameters.bufVersion.Append(KDot);
-            aMidletParameters.bufVersion.AppendNum(version.iMinor);
-            }
-        else
-            {
-            //application entry
-            uids.AppendL(regEntry->Uid() );
-            aMidletParameters.iMidletUid = regEntry->Uid();
-            aMidletParameters.iMidletName.Copy(regEntry->Name());
-            //How to get Vendor& version name for java application
-            aMidletParameters.iMidletVenorName.Copy(KNullDesC8);
-            TAppVersion version(0,0,0);
-            _LIT8(KDot,".");
-            aMidletParameters.bufVersion.Num(version.iMajor);
-            aMidletParameters.bufVersion.Append(KDot);
-            aMidletParameters.bufVersion.AppendNum(version.iMinor);
-            }
-        CleanupStack::PopAndDestroy(regEntry);
-        }
-    CleanupStack::PopAndDestroy(javaRegistry);
-    CleanupStack::PopAndDestroy( &uids);
-    RDEBUG( "CApplicationManagementJavaUtility::GetInstalledMidletParametersL: End");
-    }
-//  END OF FILE
--- a/applicationmanagement/server/src/ApplicationManagementJavaUtilityFactory.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +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 "Eclipse Public License v1.0"
- * which accompanies this distribution, and is available
- * at the URL "http://www.eclipse.org/legal/epl-v10.html".
- *
- * Initial Contributors:
- * Nokia Corporation - initial contribution.
- *
- * Contributors:
- *
- * Description: Implementation of applicationmanagement components
- *
- */
-
-//	CLASS HEADER
-#include "ApplicationManagementUtilityFactory.h"
-
-#include "ApplicationManagementJavaUtility.h"
-
-using namespace NApplicationManagement;
-
-//  METHODS
-CApplicationManagementUtility* ApplicationManagementUtilityFactory::CreateManagementUtilityL()
-    {
-    return CApplicationManagementJavaUtility::NewL();
-    }
-
-//  END OF FILE
--- a/applicationmanagement/server/src/ApplicationManagementServer.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3902 +0,0 @@
-/*
- * Copyright (c) 2000 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: Implementation of applicationmanagement components
- *
- */
-
-#define __INCLUDE_CAPABILITY_NAMES__
-
-#include <e32svr.h>
-#include <badesca.h>
-#include <e32cmn.h>
-#include <bautils.h> 
-#include <featmgr.h>
-#include <imcvcodc.h>
-#include <uikon.hrh>
-#include <e32property.h>
-#include "ApplicationManagementConst.h"
-#include "ampskeys.h"
-#include <SWInstDefs.h>
-#include "amprivateCRKeys.h"
-#include <PolicyEngineClient.h>
-#include <PolicyEngineXACML.h>
-#include <pathinfo.h>
-#include <driveinfo.h>
-
-#include "ApplicationManagementCommon.h"
-#include "ApplicationManagementClientServer.h"
-#include "ApplicationManagementServer.h"
-#include "AMDeploymentComponent.h"
-#include "amsmlhelper.h"
-#include "ApplicationManagementUtility.h"
-#include "ApplicationManagementUtilityFactory.h"
-
-#include "debug.h"
-
-#include "coemain.h"
-#include <aknnotewrappers.h>
-#include "SyncService.h"
-#include "AMPreInstallApp.h"
-#include <DevManInternalCRKeys.h>
-
-using namespace NApplicationManagement;
-
-#ifdef __AM_CONNECT_INSTALLER_ONSTARTUP_	
-
-#pragma message("AM Connecting installer at startup")
-#else
-#pragma message("AM Connecting installer when needed")
-#endif
-
-// Needed only for jad+jar installation  
-_LIT( KInstallDir, "c:\\temp\\" );
-_LIT8(KMIDletJarURL, "MIDlet-Jar-URL");
-
-//OMA SCOMO Specific
-_LIT8(KDownloadState, "./SCOMO/Download/");
-_LIT8(KDeliveredState, "./SCOMO/Inventory/Delivered/");
-_LIT8(KDeployedState, "./SCOMO/Inventory/Deployed/");
-
-// ------------------------------------------------------------------------------------------------
-// CShutDown::CShutdown()
-// ------------------------------------------------------------------------------------------------
-
-inline CShutdown::CShutdown() :
-    CTimer(-1)
-    {
-    CActiveScheduler::Add(this);
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CShutDown::ConstructL()
-// ------------------------------------------------------------------------------------------------
-
-inline void CShutdown::ConstructL()
-    {
-    CTimer::ConstructL();
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CShutDown::Start()
-// ------------------------------------------------------------------------------------------------
-
-inline void CShutdown::Start()
-    {
-    RDEBUG( "ApplicationManagementServer: starting shutdown timeout" );
-    After(KApplicationManagementShutdownDelay);
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CShutDown::RunL()
-// ------------------------------------------------------------------------------------------------
-
-void CShutdown::RunL()
-    {
-    RDEBUG( "ApplicationManagementServer timeout ... closing" );
-    CActiveScheduler::Stop();
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CShutDown::Start()
-// ------------------------------------------------------------------------------------------------
-
-inline void CShutdown::Stop()
-    {
-    RDEBUG( "ApplicationManagementServer: Stop" );
-    CActiveScheduler::Stop();
-    }
-
-
-// ------------------------------------------------------------------------------------------------
-// CApplicationManagementServer::CreateServiceL()
-// ------------------------------------------------------------------------------------------------
-CApaAppServiceBase* CApplicationManagementServer::CreateServiceL(
-        TUid aServiceType) const
-    {
-    RDEBUG( "ApplicationManagementServer CreateServiceL" );
-    if (aServiceType.iUid == KAMServiceUid)
-        {
-        return ((CApaAppServiceBase*) (new (ELeave) CApplicationManagementSession));
-        }
-    else
-        {
-        return CAknAppServer::CreateServiceL(aServiceType);
-        }
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CApplicationManagementServer::SendServerToBackground()
-// ------------------------------------------------------------------------------------------------
-
-void CApplicationManagementServer::SendServerToBackground()
-    {
-
-    RDEBUG( "ApplicationManagementServer SendServerToBackground - Start " );
-    TApaTaskList taskList(CEikonEnv::Static()->WsSession() );
-    TApaTask task = taskList.FindApp(TUid::Uid(KAppMgmtServerUid));
-    
-     TInt id = CEikonEnv::Static()->RootWin().Identifier();
-
-    RDEBUG_2( "CApplicationManagementServer:::SendServerToBackground %d", id );
-	
-    task.SetWgId(id);
-
-    if (task.Exists())
-        {
-	RDEBUG( "ApplicationManagementServer SendServerToBackground - Start 1" );
-        task.SendToBackground();
-        }
-    RDEBUG( "ApplicationManagementServer SendServerToBackground - End " );
-    TInt amServerEnabled = 0;
-    RProperty::Set(KUidPSApplicationManagementKeys, KAMServerUIEnabled,
-            amServerEnabled);
-    RDEBUG( "ApplicationManagementServer SendServerToBackground - End 2 " );
-
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CApplicationManagementServer::BringServertoForeground()
-// ------------------------------------------------------------------------------------------------
-
-void CApplicationManagementServer::BringServertoForeground()
-    {
-
-    RDEBUG( "CApplicationManagementServer:::BringServertoForeground " );
-    TApaTaskList taskList(CEikonEnv::Static()->WsSession() );
-    TApaTask task = taskList.FindApp(TUid::Uid(KAppMgmtServerUid));
-
-    TInt id = CEikonEnv::Static()->RootWin().Identifier();
-
-    RDEBUG_2( "CApplicationManagementServer:::BringServertoForeground %d", id );
-	
-    task.SetWgId(id);
-    if (task.Exists())
-        {
-	RDEBUG( "ApplicationManagementServer SendServerToBackground - BringServertoForeground " );
-        task.BringToForeground();
-        }
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CApplicationManagementServer::BringServertoForeground()
-// ------------------------------------------------------------------------------------------------
-
-void CApplicationManagementServer::BringDMUItoForeground()
-    {
-    RDEBUG( "ApplicationManagementServer DownloadComplete - DM UI Broughtto foreground Start " );
-
-    TApaTaskList taskList(CEikonEnv::Static()->WsSession() );
-    TApaTask task = taskList.FindApp(KPSUidNSmlDMSyncApp);
-
-    const TInt id = task.WgId();
-    task.SetWgId(id);
-    RDEBUG_2( "CApplicationManagementServer:::BringDMUItoForeground %d", id );
-    
-    if (task.Exists())
-        {
-        RDEBUG( "ApplicationManagementServer DownloadComplete - DM UI Broughtto foreground " );
-        task.BringToForeground();
-        }
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CApplicationManagementServer::ComponentDownloadComplete()
-// ------------------------------------------------------------------------------------------------
-
-void CApplicationManagementServer::ComponentDownloadComplete(
-        CDeploymentComponent *aComponent, TInt iapid, HBufC8 *aServerId)
-    {
-    TInt err = KErrNone;
-    TRAP( err, DownloadCompleteL( aComponent, iapid, aServerId ));
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CApplicationManagementServer::DownloadCompleteL()
-// ------------------------------------------------------------------------------------------------
-
-void CApplicationManagementServer::DownloadCompleteL(
-        CDeploymentComponent *aComponent, TInt iapid, HBufC8 *aServerId)
-    {
-    RDEBUG( "ApplicationManagementServer DownloadComplete - start" );
-    __ASSERT_DEBUG( aComponent, User::Invariant() );
-    iStorage->UpdateL( *aComponent);
-    TInt errdownload = KErrNone;
-    TInt errInstall = KErrNone;
-    TInt status = KStatusSuccess;
-    if ( !aComponent->DownloadFailed() )
-        {
-        CDeploymentComponent *old = DoDataUpdateCheckL( *aComponent);
-        TDownloadTarget trgt = aComponent->DownloadTarget();
-        switch (trgt)
-            {
-            case EDeliver:
-                {
-                break;
-                }
-            case EInstall:
-            case EInstallAndActivate:
-                {
-                TRAP(errInstall,DoTheInstallL( *aComponent));
-                if (trgt == EInstall && errInstall == KErrNone)
-                    {
-                    iStorage->DeactivateL( *aComponent);
-                    }
-                /* to avoid duplicates in deployed tree if user delivered upgrade package
-                 * by using "Install/InstallActivate" operation. if upgrade package is delivered 
-                 * by Update/UpdateandActivate" , this been handled in next switch case
-                 */
-
-                break;
-                }
-
-            case EUpdate:
-            case EUpdateAndActivate:
-                {
-                if (old)
-                    {
-                    FullUpdateL( *aComponent, *old);
-                    if (trgt == EUpdate)
-                        {
-                        iStorage->DeactivateL( *aComponent);
-                        }
-                    }
-                break;
-                }
-            default:
-                {
-                break;
-                }
-            }
-
-        }
-    else
-        {
-        errdownload = aComponent->DownloadStatus();
-        }
-
-    RDEBUG( "ApplicationManagementServer DownloadComplete - Start Send to background" );
-    //Download Completed/ Failed or installation success/ failure Send server to Background.
-
-    SendServerToBackground();
-
-    // Bring DM UI to foreground provided operation is in non silent mode.
-    TInt operNonSilent = KErrNotFound;
-
-    RProperty::Get(KUidPSApplicationManagementKeys, KAMOperationNonSilent,
-            operNonSilent);
-
-    if (operNonSilent==1 || operNonSilent==KErrNotFound)
-        {
-        RDEBUG( "ApplicationManagementServer DownloadComplete - DM UI Bring " );
-        BringDMUItoForeground();
-        }
-
-    iOMASCOMOEnabled = IsOMASCOMOEnabledL();
-		
-
-    if (iOMASCOMOEnabled)
-        {
-
-
-				status = GetErrorStatus(errdownload,errInstall); 
-		      
-        TInt ASyncSupported = -1;
-
-        CRepository *repository = CRepository::NewLC( KUidPSApplicationManagementKeys );
-        repository->Get(KAsyncEnabled, ASyncSupported);
-        CleanupStack::PopAndDestroy();
-        
-        // For Sync Reporting
-        if (!ASyncSupported)
-            {
-            
-            // Update Central Repository with proper error code for Sync
-            
-           
-            CRepository *repository= CRepository::NewLC ( KUidPSApplicationManagementKeys ) ;
-            repository->Set(KAMSyncStatus, status);
-            CleanupStack::PopAndDestroy();
-                        
-            RProperty counter;
-            
-            TInt r=counter.Attach(KUidPSApplicationManagementKeys,
-                    KSyncNotifier, EOwnerThread);
-            User::LeaveIfError(r);
-
-            TInt err = counter.Set(KErrCancel);
-            User::LeaveIfError(err);
-            counter.Close();
-
-            }
-        else// Do AsyncReporting
-            {
-
-            // Get deployement component entries
-            TInt internalid = aComponent->InternalId();
-
-            TBuf8<256> targetURI;
-
-            TDeploymentComponentState state = aComponent->State();
-
-            if (state == EDCSDownload)
-                {
-                targetURI.Append(KDownloadState);
-                targetURI.Append(aComponent->UserId());
-                }
-            else
-                if (state == EDCSDelivered)
-                    {
-                    targetURI.Append(KDeliveredState);
-                    targetURI.Append(aComponent->UserId());
-
-                    }
-                else
-                    if (state == EDCSActive|| state == EDCSInactive)
-                        {
-                        targetURI.Append(KDeployedState);
-                        targetURI.Append(aComponent->UserId());
-                        }
-
-            //Save Entry to database with status and target URI of deployment component
-
-            TInt index;
-            iAMServerDB->SaveToDatabaseL(index, internalid, status,
-                    targetURI, iapid);
-
-            EnableDMNetworkMonL(iapid, aServerId);
-            }
-
-        }
-    if (iDownloadMngr->DownloadCount() == 0)
-        {
-        
-        RDEBUG_2( "CApplicationManagementServer::ConstructL - ERROR leaving cannot connect installer: %d", iSessionCount );
-        
-        // Is session count is not modified whenever there is error then at the end of download complete decrement
-        //  the session count.
-        
-        if(status != KStatusSuccess && iSessionCount != 0 )
-            {
-            iSessionCount--; 
-            }
-       
-        if (iSessionCount == 0)
-            {  
-		       iShutdown.Stop();
-            }
-        }
-
-    RDEBUG( "ApplicationManagementServer DownloadComplete - end" );
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CApplicationManagementServer::IsOMASCOMOEnabledL()
-// ------------------------------------------------------------------------------------------------
-
-TBool CApplicationManagementServer::IsOMASCOMOEnabledL()
-    {
-    TInt adapterValue;
-    
-    CRepository *repository = CRepository::NewLC ( KCRUidPrivateApplicationManagementKeys ) ;
-    repository->Get(KAMAdapterValue, adapterValue);
-    CleanupStack::PopAndDestroy();
-    
-    if(adapterValue ==0 || adapterValue == 1)
-     return EFalse;
-    else
-     return ETrue;
-    
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CApplicationManagementServer::GetErrorStatus()
-// ------------------------------------------------------------------------------------------------
-TInt CApplicationManagementServer::GetErrorStatus(TInt aErrorDownload, TInt aErrorInstall)
-{
-	       TInt status = KStatusSuccess;
-	       
-	       if (aErrorDownload!=KErrNone)
-                {
-                if (aErrorDownload == KStatusUserCancelled || aErrorDownload
-                        == KStatusDowloadFailedOOM || aErrorDownload
-                         == KStatusUnSupportedEnvironment || aErrorDownload 
-                        ==KStatusAlternateDownldAuthFail || aErrorDownload == KStatusAltDowldUnavailable)
-                    {
-                    status = aErrorDownload;
-                    }
-                else
-                    status = KStatusDownloadFailed;
-                }
-
-            else
-                if (aErrorInstall!=KErrNone)
-                    {
-                    if (aErrorInstall == SwiUI::KSWInstErrSecurityFailure)
-                        status = KStatusPkgValidationFailed;
-                    if (aErrorInstall == SwiUI::KSWInstErrInsufficientMemory)
-                        status = KStatusInstallFailedOOM;
-                    else
-                        status = KStatusInstallFailed;
-
-                    }
-                    
-           return status;
-
-}
-
-   
-// ------------------------------------------------------------------------------------------------
-// CApplicationManagementServer::EnableDMNetworkMonL()
-// ------------------------------------------------------------------------------------------------
-void CApplicationManagementServer::EnableDMNetworkMonL(TInt iapid, HBufC8 *aServerId)
-{
-						TInt retryenabled = 1;
-						_LIT( KNetMon,"\\dmnetworkmon.exe" );
-            
-            // Enable DM Network Monitoring for retry of Generic alert in case of N/W loss
-
-            CRepository *repository= CRepository::NewLC ( KCRUidDeviceManagementInternalKeys );
-            repository->Set(KDevManEnableDMNetworkMon, retryenabled);
-            repository->Set(KDevManServerIdKey, *aServerId);
-            repository->Set(KDevManIapIdKey, iapid);
-            CleanupStack::PopAndDestroy();
-               
-						// create NetMon EXE
-            RProcess rp;
-            TInt err = rp.Create(KNetMon,KNullDesC);
-            User::LeaveIfError(err);
-            TRequestStatus stat;
-            rp.Rendezvous(stat);
-                            
-            if (stat!=KRequestPending)
-              rp.Kill(0);     // abort startup
-            else
-              rp.Resume();    // logon OK - start the server
-            TInt r=(rp.ExitType()==EExitPanic) ? KErrGeneral : stat.Int();
-                        rp.Close();
-
-	
-}
-
-// ------------------------------------------------------------------------------------------------
-// CApplicationManagementServer::CApplicationManagementServer
-// ------------------------------------------------------------------------------------------------
-
-inline CApplicationManagementServer::CApplicationManagementServer()
-    {
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CApplicationManagementServer::AddSession()
-// ------------------------------------------------------------------------------------------------
-
-void CApplicationManagementServer::AddSession()
-    {
-    // A new session is being created
-    RDEBUG( "ApplicationManagementServer: CApplicationManagementServer::AddSession" );
-    ++iSessionCount;
-
-    // Cancel the shutdown timer if it was running
-    iShutdown.Cancel();
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CApplicationManagementServer::DropSession()
-// ------------------------------------------------------------------------------------------------
-
-void CApplicationManagementServer::DropSession()
-    {
-    // A session is being destroyed
-    RDEBUG( "ApplicationManagementServer: CApplicationManagementServer::DropSession" );
-
-    // Start the shutdown timer if it is the last session
-    if ( --iSessionCount == 0)
-        {
-        if (iDownloadMngr->DownloadCount() > 0)
-            {
-            RDEBUG( "ApplicationManagementServer: CApplicationManagementServer::DropSession download in progress" );
-            }
-        else
-            {
-            iShutdown.Start();
-            }
-        }
-    }
-
-// -----------------------------------------------------------------------------------------------------------
-// CApplicationManagementServer::AddDownloadL( CDeploymentComponent *aComponent )
-// -----------------------------------------------------------------------------------------------------------
-
-void CApplicationManagementServer::AddDownloadL(
-        CDeploymentComponent *aComponent)
-    {
-    __ASSERT_DEBUG( aComponent, User::Invariant() );
-    iDownloadMngr->AddDownloadL(aComponent);
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CApplicationManagementServer::NewLC
-// ------------------------------------------------------------------------------------------------
-
-CApplicationManagementServer* CApplicationManagementServer::NewL()
-    {
-
-    CApplicationManagementServer* self=new(ELeave) CApplicationManagementServer;
-
-    return self;
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CApplicationManagementServer::CreateServiceSecurityCheckL
-// ------------------------------------------------------------------------------------------------
-
-CPolicyServer::TCustomResult CApplicationManagementServer::CreateServiceSecurityCheckL(
-        TUid aServiceType, const RMessage2& aMsg, TInt& aAction,
-        TSecurityInfo& aMissing)
-    {
-    TInt32 trustRange = EAddTrust;
-    TInt32 performRFS = EPerformRfs;
-    TInt32 last = ELast;
-
-    if ( (aServiceType.iUid >= trustRange)
-            && (aServiceType.iUid < performRFS ))
-        {
-        if (aMsg.HasCapability(TCapability(ECapabilityTrustedUI) ) )
-            {
-            return CPolicyServer::EPass;
-            }
-        else
-            {
-            return CPolicyServer::EFail;
-            }
-        }
-
-    else
-        if ( (aServiceType.iUid >= performRFS) && (aServiceType.iUid < last))
-
-            {
-            if (aMsg.HasCapability(TCapability(ECapabilityDiskAdmin))
-                    && (aMsg.SecureId().iId == 0x101f9a02 ))
-                {
-                return CPolicyServer::EPass;
-                }
-            else
-                {
-                return CPolicyServer::EFail;
-                }
-            }
-
-        else
-            if (aServiceType.iUid == last)
-                {
-                return CPolicyServer::EFail;
-                }
-
-            else
-                {
-                return CAknAppServer::CreateServiceSecurityCheckL(
-                        aServiceType, aMsg, aAction, aMissing);
-                }
-
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CApplicationManagementServer::~CApplicationManagementServer
-// ------------------------------------------------------------------------------------------------
-
-CApplicationManagementServer::~CApplicationManagementServer()
-    {
-    RDEBUG_3("CApplicationManagementServer::~CApplicationManagementServer 0x%X - 0x%X", reinterpret_cast<TUint>(this ),
-            reinterpret_cast<TUint>(this)+sizeof( CApplicationManagementServer ) );
-    FeatureManager::UnInitializeLib();
-    iInstaller.Close();
-    delete iStorage;
-
-    delete iUtility;
-    delete iAMServerDB;
-
-    RProperty::Delete(KUidPSApplicationManagementKeys, KAMServerUIEnabled);
-
-    RProperty::Delete(KUidPSApplicationManagementKeys, KAMOperationNonSilent);
-
-    RProperty::Delete(KUidPSApplicationManagementKeys, KSyncNotifier);
-
-    RProperty::Delete(KUidPSApplicationManagementKeys, KDMUINotClosed);
-
-    
-    iInstallFile.Close();
-    iInstallRFs.Close();
-
-    delete iDownloadMngr;
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CApplicationManagementServer::HandleAllClientsClosed
-// ------------------------------------------------------------------------------------------------
-void CApplicationManagementServer::HandleAllClientsClosed()
-    {
-    // Do Nothing
-    RDEBUG( "CApplicationManagementServer::HandleAllClientsClosed" );
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CApplicationManagementServer::ConstructL
-// ------------------------------------------------------------------------------------------------
-
-void CApplicationManagementServer::ConstructL(const TDesC &aServerName)
-    {
-
-    // 2nd phase construction - ensure the timer and server objects are running
-    RDEBUG( "CApplicationManagementServer::ConstructL - Start" );
-
-    iOMASCOMOEnabled = ETrue;
-
-    CAknAppServer::ConstructL(aServerName);
-    TRAPD( errf, FeatureManager::InitializeLibL() )
-    ;
-    if (errf != KErrNone)
-        {
-        User::Leave(errf);
-        }
-
-    RDEBUG( "CApplicationManagementServer::ConstructL - start" );
-
-    iStorage = CDeliveryComponentStorage::NewL();
-
-    iUtility
-            = ApplicationManagementUtilityFactory::CreateManagementUtilityL();
-    iDownloadMngr = CAMDownloadManager::NewL( *this);
-    iAMServerDB = CAMDownloaddb::NewL();
-
-    // Define P&S Keys
-    RProperty::Define(KUidPSApplicationManagementKeys, KAMServerUIEnabled,
-            RProperty::EInt);
-
-    RProperty::Define(KUidPSApplicationManagementKeys, KAMOperationNonSilent,
-            RProperty::EInt);
-
-    RProperty::Define(KUidPSApplicationManagementKeys, KSyncNotifier,
-            RProperty::EInt);
-
-    RProperty::Define(KUidPSApplicationManagementKeys, KDMUINotClosed,
-            RProperty::EInt);
-
-    RProperty syncproperty;
-
-    //Ignore error status
-    syncproperty.Attach(KUidPSApplicationManagementKeys, KSyncNotifier,
-            EOwnerThread);
-    syncproperty.Set(KErrNone);
-    syncproperty.Close();
-    
-    SendServerToBackground();
-
-#ifdef __AM_CONNECT_INSTALLER_ONSTARTUP_	
-    TInt err( iInstaller.Connect() );
-    if ( err != KErrNone )
-        {
-        RDEBUG_2( "CApplicationManagementServer::ConstructL - ERROR leaving cannot connect installer: %d", err );
-        User::LeaveIfError( err );
-        }
-#endif	
-    RDEBUG( "CApplicationManagementServer::ConstructL - end" );
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CApplicationManagementServer::StartShutDownTimer()
-// ------------------------------------------------------------------------------------------------
-
-void CApplicationManagementServer::StartShutDownTimerL()
-    {
-
-    RDEBUG( "CApplicationManagementServer::ConstructL - end" );
-
-    iShutdown.ConstructL();
-    // ensure that the server still exits even if the 1st client fails to connect
-    iShutdown.Start();
-
-    RDEBUG( "CApplicationManagementServer::ConstructL - end" );
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CApplicationManagementServer::CustomSecurityCheckL()
-// ------------------------------------------------------------------------------------------------
-
-CPolicyServer::TCustomResult CApplicationManagementServer::CustomSecurityCheckL(
-        const RMessage2& /*aMsg*/, TInt& /*aAction*/, TSecurityInfo& /*aMissing*/)
-    {
-    return EPass;
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CApplicationManagementServer::InstallCompleteL()
-// ------------------------------------------------------------------------------------------------
-
-void CApplicationManagementServer::InstallCompleteL(
-        const CDeploymentComponent& aCompo, const TBool &aInstallSuccess)
-    {
-    RDEBUG_2("CApplicationManagementServer::InstallCompleteL start (%d)", aInstallSuccess);
-    iInstallFile.Close();
-
-    // if java jad + jar install, remove files from c:\temp directory
-    if (CDeploymentComponent::IsJavaMimeL(aCompo.MetaData().MimeType() ) && CDeploymentComponent::IsJavaMimeL(aCompo.Data().MimeType() ) )
-        {
-        TFileName fn, fn2;
-        GenerateTempFileNameL(iInstallRFs, aCompo, fn, fn2);
-        RDEBUG_3("CApplicationManagementServer::InstallCompleteL delete files: (%S) (%S)", &fn, &fn2);
-        User::LeaveIfError(iInstallRFs.Delete(fn) );
-        User::LeaveIfError(iInstallRFs.Delete(fn2) );
-        }
-
-    if (aInstallSuccess)
-        {
-        // Remove temporary files from private directory 
-        const_cast<CDeploymentComponent&>(aCompo).ResetDataL(iInstallRFs);
-        }
-
-    iInstallRFs.Close();
-
-    iInstallInProgress = EFalse;
-#ifndef __AM_CONNECT_INSTALLER_ONSTARTUP_	
-    iInstaller.Close() ;
-#endif
-    RDEBUG("CApplicationManagementServer::InstallCompleteL end");
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CApplicationManagementServer::GenerateTempJarFileNameL()
-// ------------------------------------------------------------------------------------------------
-
-void CApplicationManagementServer::GenerateTempJarFileNameL(RFs &aFs,
-        const TDesC& aMetaSource, TFileName &aFileName) const
-    {
-    if (aMetaSource != KNullDesC)
-        {
-        RFile file;
-        User::LeaveIfError(file.Open(aFs, aMetaSource, EFileRead) );
-        CleanupClosePushL(file);
-        TFileName temp;
-        temp = ReadJarFileNameL(file);
-        GenerateTempFileNameL(aFs, temp, aFileName);
-        CleanupStack::PopAndDestroy( &file);
-        }
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CApplicationManagementServer::GenerateTempFileNameL()
-// ------------------------------------------------------------------------------------------------
-
-void CApplicationManagementServer::GenerateTempFileNameL(const RFs &aFs,
-        const TDesC& aSource, TFileName &aFileName) const
-    {
-    if (aSource != KNullDesC)
-        {
-        aFileName.Copy(KInstallDir);
-        TParse p;
-        User::LeaveIfError(aFs.Parse(aSource, p) );
-        aFileName.Append(p.NameAndExt() );
-        }
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CApplicationManagementServer::GenerateTempFileNameL()
-// ------------------------------------------------------------------------------------------------
-
-void CApplicationManagementServer::GenerateTempFileNameL(RFs &aFs,
-        const CDeploymentComponent& aCompo, TFileName& aSource,
-        TFileName &aMetaSource, TFileName &aFileName,
-        TFileName &aMetaFileName) const
-    {
-    if ( !BaflUtils::FolderExists(aFs, KInstallDir) )
-        {
-        aFs.MkDirAll(KInstallDir);
-        }
-
-    aMetaSource.Copy(aCompo.MetaData().DataFileName() );
-    GenerateTempFileNameL(aFs, aMetaSource, aMetaFileName);
-    aSource.Copy(aCompo.Data().DataFileName() );
-    GenerateTempJarFileNameL(aFs, aMetaSource, aFileName);
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CApplicationManagementServer::GenerateTempFileNameL()
-// ------------------------------------------------------------------------------------------------	
-
-void CApplicationManagementServer::GenerateTempFileNameL(RFs &aFs,
-        const CDeploymentComponent& aCompo, TFileName &aFileName,
-        TFileName &aMetaFileName) const
-    {
-    TFileName ftemp, msource;
-    GenerateTempFileNameL(aFs, aCompo, ftemp, msource, aFileName,
-            aMetaFileName);
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CApplicationManagementServer::ReadJarFileNameL()
-// ------------------------------------------------------------------------------------------------
-
-TFileName CApplicationManagementServer::ReadJarFileNameL(RFile& aFile) const
-    {
-    TFileName jarFileName;
-    HBufC8* lineBuffer = HBufC8::NewLC(KMaxFileName+72); // lets hope all lines fit to this
-    TPtr8 linePtr(lineBuffer->Des() );
-    TInt length(0);
-    aFile.Size(length);
-    HBufC8* data = HBufC8::NewLC(length);
-    TPtr8 ptr(data->Des() );
-    aFile.Read(ptr);
-    RDesReadStream stream(*data);
-    CleanupClosePushL(stream);
-    TInt colonIndex = -1;
-    TInt err(KErrNone);
-    TInt found(KErrNotFound);
-    const TInt KJadNameValueSeparator = 0x3A; //':' 
-
-    for (;;)
-        {
-        TRAP( err, ReadLineL(stream, linePtr) );
-        if (err == KErrNone)
-            {
-            RDEBUG8_2("Read line: (%S)", &linePtr);
-            found = linePtr.Find(KMIDletJarURL);
-            if (found != KErrNotFound && found == 0) // found
-                {
-                TPtrC8 filename(linePtr);
-                colonIndex = linePtr.Locate(KJadNameValueSeparator);
-                if (colonIndex != KErrNotFound)
-                    {
-                    filename.Set(linePtr.Mid(colonIndex+1)); // get jar filename, format is: MIDlet-Jar-URL: bomber.jar
-                    jarFileName.Copy(filename);
-                    jarFileName.Trim();
-                    break;
-                    }
-                }
-            }
-        else
-            {
-            User::Leave(err);
-            }
-        }
-    CleanupStack::PopAndDestroy(3, lineBuffer); // stream, data
-    return jarFileName;
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CApplicationManagementServer::ReadLineL()
-// ------------------------------------------------------------------------------------------------
-
-void CApplicationManagementServer::ReadLineL(RReadStream& aStream,
-        TDes8& aLineBuffer) const
-    {
-    TBuf8<1> input;
-    const TUint32 LF = 10;
-    const TUint32 CR = 13;
-    TBool endOfLine(EFalse);
-    TInt errRead(KErrNone);
-
-    // reset
-    aLineBuffer.Zero();
-
-    while ( !endOfLine)
-        {
-        TRAP(errRead, aStream.ReadL(input, 1));
-
-        if (errRead == KErrEof)
-            {
-            // EOF
-            User::Leave(KErrEof);
-            }
-        // check special characters	
-        if (input[0] == LF)
-            {
-            // End of line
-            endOfLine = ETrue;
-            }
-        else
-            if (input[0] == CR)
-                {
-                // Only end of line if not followed by a LF
-                }
-            else
-                {
-                // We put any other character in the buffer
-                if (aLineBuffer.Length() < aLineBuffer.MaxLength())
-                    {
-                    aLineBuffer.Append(input[0]);
-                    }
-                }
-        }
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CApplicationManagementServer::PrepareInstallL()
-// ------------------------------------------------------------------------------------------------	
-
-TBool CApplicationManagementServer::PrepareInstallL(
-        const CDeploymentComponent &aComponent, TFileName &aFileName)
-    {
-    RDEBUG( "CApplicationManagementServer::PrepareInstallL" );
-    TBool res(ETrue);
-
-#ifndef __AM_CONNECT_INSTALLER_ONSTARTUP_
-    TInt err(iInstaller.Connect() );
-    if (err != KErrNone)
-        {
-        RDEBUG_2( "CApplicationManagementServer::PrepareInstallL - ERROR leaving cannot connect installer: %d", err );
-        User::LeaveIfError(err);
-        }
-    CleanupClosePushL(iInstaller);
-#endif
-
-    RDEBUG( "CApplicationManagementServer::PrepareInstallL - connected to installer" );
-    // Copy data file name (install file)
-    if (aComponent.Data().DataFileName().Length() > 0)
-        {
-        aFileName.Copy(aComponent.Data().DataFileName() );
-        }
-    else
-        {
-        // data file has not been created for component!	
-        User::Leave(KErrNotFound);
-        }
-    // Open RFs session
-    User::LeaveIfError(iInstallRFs.Connect() );
-    User::LeaveIfError(iInstallRFs.ShareProtected() );
-
-    // set installoptions and correct mime type
-    using namespace SwiUI;
-    iInstallOptions = aComponent.InstallOpts().iOptions;
-    TInstallReq req;
-	if (aComponent.Data().MimeType() == SwiUI::KSisMimeType) 
-	{
-		//convert if MIME type is application/vnd.symbian.install to x-epoc/x-sisx-app
-		//as installer doesn't support application/vnd.symbian.install MIME type from S60 3rd edition onwards.
-		req.iMIME = SwiUI::KSisxMimeType;
-	}
-	else 
-	{
-		req.iMIME = aComponent.Data().MimeType();
-	}
-
-	if (CDeploymentComponent::IsJavaMimeL(aComponent.MetaData().MimeType() ) ) {
-		// Check if both jad and jar files already exist in the phone	
-		if (CDeploymentComponent::IsJavaMimeL(aComponent.Data().MimeType() ) && aComponent.MetaData().MimeType() == SwiUI::KJadMIMEType) {
-			// Move both files to temporary location and use jad to install java application
-			CFileMan *fm = CFileMan::NewL(iInstallRFs);
-			CleanupStack::PushL(fm);
-			TFileName source, metasource, metatarget;
-			aFileName.Copy(KNullDesC8() ); // reset
-			GenerateTempFileNameL(iInstallRFs, aComponent, source, metasource,
-					aFileName, metatarget);
-
-            RDEBUG_2( "CApplicationManagementServer::PrepareInstallL - temp jar file '%S'", &aFileName );
-            RDEBUG_2( "CApplicationManagementServer::PrepareInstallL - temp jad file '%S'", &metatarget );
-
-            // Copy datafile (jar)
-            TInt copyer(fm->Copy(source, aFileName) );
-
-            // Copy metadatafile (jad)
-            TInt copyer2(fm->Copy(metasource, metatarget) );
-
-            CleanupStack::PopAndDestroy(fm);
-
-            RDEBUG_3( "CApplicationManagementServer::PrepareInstallL - (%d)-(%d)", copyer, copyer2 );
-
-            if (copyer == KErrNone && copyer2 == KErrNone)
-                {
-                res = ETrue;
-                aFileName = metatarget;
-                req.iMIME = aComponent.MetaData().MimeType();
-                }
-            else
-                {
-                User::Leave(KErrWrite);
-                }
-            }
-        else
-            if (aComponent.MetaData().MimeType() == SwiUI::KJadMIMEType)
-                {
-                aFileName.Copy(aComponent.MetaData().DataFileName() );
-                req.iMIME = aComponent.MetaData().MimeType();
-                RDEBUG_2( "CApplicationManagementServer::PrepareInstallL - Using Jad file to install java application: %S", &aFileName );
-                }
-        }
-
-    if (aComponent.GetIAP() > -1)
-        {
-        req.iIAP = aComponent.GetIAP();
-        RDEBUG_2( "CApplicationManagementServer::PrepareInstallL: setting iap to %d", req.iIAP );
-        }
-    else
-        {
-        TInt iap = KErrNotFound;
-        TRAPD( err, SmlHelper::GetDefaultIAPFromDMProfileL( iap ) )
-        ;
-        if (err == KErrNone)
-            {
-            req.iIAP = iap;
-            RDEBUG_2("	-> using DM profile default IAP: %d", iap);
-            }
-        else
-            {
-            RDEBUG_2("**** ERROR while fetching DM profile default iap: %d", err );
-            }
-        }
-
-    iInstallReq = SwiUI::TInstallReqPckg(req);
-    RDEBUG8_2( "CApplicationManagementServer::PrepareInstallL: mime type is (%S)", &req.iMIME);
-    RDEBUG_2( "CApplicationManagementServer::PrepareInstallL - Using temp file '%S'", &aFileName );
-
-    User::LeaveIfError(iInstallFile.Open(iInstallRFs, aFileName, EFileRead) );
-    TInt sz;
-    User::LeaveIfError(iInstallFile.Size(sz) );
-    if ( !(sz > 0))
-        {
-        res = EFalse;
-        RDEBUG( "CApplicationManagementServer::PrepareInstallL - ERROR size of source file is 0!" );
-        }
-
-#ifndef __AM_CONNECT_INSTALLER_ONSTARTUP_
-    CleanupStack::Pop( &iInstaller);
-#endif
-
-    RDEBUG( "CApplicationManagementServer::PrepareInstallL end" );
-    return res;
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CApplicationManagementServer::InstallL()
-// ------------------------------------------------------------------------------------------------	
-
-void CApplicationManagementServer::InstallL(
-        const CDeploymentComponent &aComponent, TRequestStatus &aStatus)
-    {
-    RDEBUG( "CApplicationManagementServer::InstallL (async): begin" );
-
-    if (iInstallInProgress == EFalse)
-        {
-        TFileName fn;
-        if (PrepareInstallL(aComponent, fn) )
-            {
-            RDEBUG_3( "CApplicationManagementServer::InstallL: Install '%S' sizeof opts: %d", &fn, sizeof (aComponent.InstallOpts()));
-
-            // Silent or Non Silent Installation is choosen based on DM session started in silent or non silent
-
-            TInt err = KErrNone;
-            TInt nonSilentOperation = KErrNotFound;
-            RProperty::Get(KUidPSApplicationManagementKeys,
-                    KAMOperationNonSilent, nonSilentOperation);
-
-            if (!nonSilentOperation)
-                {
-                TRAP( err ,iInstaller.SilentInstall( aStatus, iInstallFile, iInstallReq, iInstallOptions ) );
-                }
-            else
-                {
-                TRAP( err ,iInstaller.Install( aStatus, iInstallFile, iInstallReq ) );
-                }
-
-            RDEBUG_2( "CApplicationManagementServer::InstallL: status: %d", err);
-            User::LeaveIfError(err);
-            iInstallInProgress = ETrue;
-            }
-        else
-            {
-            RDEBUG( "CApplicationManagementServer::InstallL - PrepareInstallL failed, leaving" );
-            User::Leave(KErrArgument);
-            }
-        }
-    else
-        {
-        RDEBUG( "CApplicationManagementServer::InstallL (async): previous install still in progress...bailing out" );
-        TRequestStatus * status = &aStatus;
-        User::RequestComplete(status, KErrInUse);
-        }
-    RDEBUG( "CApplicationManagementServer::InstallL (async): end" );
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CApplicationManagementServer::PrepareInstallL()
-// ------------------------------------------------------------------------------------------------	
-
-void CApplicationManagementServer::InstallL(
-        const CDeploymentComponent &aComponent)
-    {
-    RDEBUG( "CApplicationManagementServer::InstallL: begin" );
-
-    if (iInstallInProgress == EFalse)
-        {
-        TFileName fn;
-        if (PrepareInstallL(aComponent, fn) )
-            {
-            iInstallInProgress = ETrue;
-            RDEBUG_2( "CApplicationManagementServer::InstallL: Install '%S' ", &fn);
-            SwiUI::TInstallOptionsPckg pkg(aComponent.InstallOpts().iOptions);
-            TRAPD( err ,iInstaller.SilentInstall( fn, pkg ) )
-            ;
-            User::LeaveIfError(err);
-            iInstallInProgress = EFalse;
-            }
-        else
-            {
-            RDEBUG( "CApplicationManagementServer::InstallL - PrepareInstallL failed, leaving" );
-            User::Leave(KErrArgument);
-            }
-        }
-    RDEBUG( "CApplicationManagementServer::InstallL: end" );
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CApplicationManagementServer::UninstallL()
-// ------------------------------------------------------------------------------------------------	
-
-void CApplicationManagementServer::UninstallL(
-        const CDeploymentComponent &aComponent, TRequestStatus &aStatus)
-    {
-    RDEBUG( "CApplicationManagementServer::UninstallL: begin" );
-    if (iInstallInProgress == EFalse)
-        {
-        TInt err(iInstaller.Connect() );
-        User::LeaveIfError(err);
-        RDEBUG_2( "CApplicationManagementServer::UninstallL: UninstallL '0x%X' ", aComponent.Uid());
-        using namespace SwiUI;
-        iUninstallOptions = aComponent.UninstallOpts();
-
-        TInt nonSilentOperation = KErrNotFound;
-
-        RProperty::Get(KPSUidNSmlDMSyncApp, KSilentSession,
-                nonSilentOperation);
-
-				iOMASCOMOEnabled = IsOMASCOMOEnabledL();
-
-        if (!iOMASCOMOEnabled)
-            nonSilentOperation = 0;
-        if (!nonSilentOperation)
-            {
-            TRAP( err ,iInstaller.SilentUninstall( aStatus, aComponent.Uid(),
-                            iUninstallOptions, aComponent.MimeType() ) );
-            }
-        else
-            {
-            TRAP( err ,iInstaller.Uninstall( aStatus, aComponent.Uid(), aComponent.MimeType() ) );
-            CSyncService *syncService =
-                    CSyncService::NewL(NULL, KDevManServiceStart);
-            if (syncService)
-                {
-                syncService->EnableProgressNoteL(EFalse);
-                }
-
-            delete syncService;
-            }
-
-        RDEBUG_2( "CApplicationManagementServer::UninstallL: UninstallL result '0x%X'", err );
-        User::LeaveIfError(err);
-        iInstallInProgress = ETrue;
-        }
-    else
-        {
-        RDEBUG( "CApplicationManagementServer::UninstallL: previous uninstall still in progress...bailing out" );
-        TRequestStatus * status = &aStatus;
-        User::RequestComplete(status, KErrInUse);
-        }
-
-    RDEBUG( "CApplicationManagementServer::UninstallL: end" );
-    }
-// ------------------------------------------------------------------------------------------------
-// CApplicationManagementServer::PerformRFSL()
-// ------------------------------------------------------------------------------------------------
-
-void CApplicationManagementServer::PerformRFSL()
-    {
-    RDEBUG( "CApplicationManagementServer::PerformRFSL: begin" );
-    const RComponentIdArray &arrt = iStorage->GetComponentIds();
-    TCertInfoPckg *corcert= NULL;
-    for (TInt i( 0); i < arrt.Count(); i++)
-        {
-        RDEBUG_3( "CApplicationManagementServer::PerformRFSL processing dc %d of %d", i, arrt.Count() );
-        CDeploymentComponent &c = iStorage->ComponentL(arrt[i]);
-
-        const RCertArray &certs = iStorage->Certificates();
-        TInt index = c.Owner();
-        TCertInfoPckg *certp = NULL;
-        if (index >= 0)
-        {
-        	certp = certs[ c.Owner() ];
-        }
-        if ( !corcert && certp)
-            {
-            if (CheckCertL( (*certp)() ) )
-                {
-                corcert = certp;
-                RDEBUG_2( "CApplicationManagementServer::PerformRFSL Found CORP Cert! Removing %d ", i );
-                RemoveInternalL(c);
-                }
-            else
-                {
-                RDEBUG_2( "CApplicationManagementServer::PerformRFSL skipping %d because not corp dc", i );
-                }
-            }
-        else
-            {
-            if (corcert == certp)
-                {
-                RDEBUG_2( "CApplicationManagementServer::PerformRFSL Removing %d ", i );
-                RemoveInternalL(c);
-                }
-            else
-                {
-                RDEBUG_2( "CApplicationManagementServer::PerformRFSL skipping %d because not corp dc", i );
-                }
-            }
-        }
-    RDEBUG( "CApplicationManagementServer::PerformRFSL: end" );
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CApplicationManagementServer::RemoveInternalL()
-// ------------------------------------------------------------------------------------------------
-
-void CApplicationManagementServer::RemoveInternalL(
-        const CDeploymentComponent &aCompo, TBool aDoUninstall /* = ETrue */)
-    {
-    RDEBUG_2("CApplicationManagementServer: RemoveInternalL - Remove id: (%d)", aCompo.InternalId() );
-
-    aCompo.SetStatusNode(EDelivered_RemoveProgress);
-    TInt err(KErrNone);
-    TDeploymentComponentState st(aCompo.State() );
-    if (st == EDCSDelivered || st == EDCSDownload)
-        {
-        TRAP(err,iStorage->RemoveL( aCompo.InternalId() ));
-        }
-    else
-        if (st == EDCSActive || st == EDCSInactive)
-            {
-            if (aDoUninstall)
-                {
-                if (aCompo.Uid() != TUid::Null() )
-                    {
-                    //TInt err= KErrNone;
-
-                    TInt nonSilentOperation = KErrNotFound;
-
-                    RProperty::Get(KPSUidNSmlDMSyncApp, KSilentSession,
-                            nonSilentOperation);
-
-										iOMASCOMOEnabled = IsOMASCOMOEnabledL();
-
-                    if (!iOMASCOMOEnabled)
-                        nonSilentOperation = 0;
-
-                    if (nonSilentOperation!=0)
-                        {
-
-                        BringServertoForeground();
-
-                        TInt amServerEnabled = 1;
-                        err = RProperty::Set(KUidPSApplicationManagementKeys,
-                                KAMServerUIEnabled, amServerEnabled);
-                        User::LeaveIfError(err); // invalid
-
-                        }
-
-                    TRequestStatus s;
-                    TRAP(err,UninstallL( aCompo, s ));
-                    User::WaitForRequest(s);
-                    iInstallInProgress = EFalse;
-                    // Capturing Installer errors,if any
-                    err = s.Int();
-
-                    TInt amServerEnabled = 0;
-                    RProperty::Set(KUidPSApplicationManagementKeys,
-                            KAMServerUIEnabled, amServerEnabled);
-                    //User::LeaveIfError(err); // invalid
-
-                    SendServerToBackground();
-
-                    // Bring DM UI to foreground
-                    if (nonSilentOperation!=0)
-                        {
-                        BringDMUItoForeground();
-                        }
-
-                    if (s.Int() == KErrNone)
-                        {
-                        RDEBUG("CApplicationManagementServer::RemoveInternalL Uninstalled");
-                        }
-                    else
-                        if (s.Int() == KErrNotFound)
-                            {
-                            RDEBUG( "CApplicationManagementServer: RemoveInternalL WARNING component was not found by uninstaller" );
-                            }
-                        else
-                            {
-                            RDEBUG_2("CApplicationManagementServer: RemoveInternalL ERROR uninstall failed %d", s.Int() );
-                            
-                            }
-                    }
-                else
-                    {
-                    RDEBUG( "CApplicationManagementServer: RemoveInternalL ERROR component is deployed but has null uid - it cannot be uninstalled!" );
-                    }
-                }
-            else
-                {
-                RDEBUG_2("CApplicationManagementServer: RemoveInternalL - Skipped uninstall of %d", aCompo.InternalId() );
-                }
-            /*
-             *   if (unstall is sucesss) then remove component from storage
-             *   
-             */
-            if (err == KErrNone)
-                {
-                iStorage->RemoveL(aCompo.InternalId() );
-                }
-            }
-        else
-            {
-            RDEBUG_2("CApplicationManagementServer: RemoveInternalL ERROR called with illegal state component id %d", aCompo.State() );
-            User::Leave(KErrArgument);
-            }
-    /*  
-     * if error set state to remove failed
-     * Finally call userleaveiferror()
-     * */
-    if (err != KErrNone)
-        {
-        aCompo.SetStatusNode(EDelivered_RemoveFailed);
-        }
-    User::LeaveIfError(err);
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CApplicationManagementServer::CheckCertL()
-// ------------------------------------------------------------------------------------------------
-
-TBool CApplicationManagementServer::CheckCertL(const TCertInfo &aInfo) const
-    {
-    TBool go(EFalse);
-
-    if (FeatureManager::FeatureSupported( KFeatureIdSapPolicyManagement) )
-        {
-        //	#ifdef __SAP_POLICY_MANAGEMENT
-        RPolicyEngine peng;
-
-        // The management session
-        //
-        TInt err(peng.Connect() );
-
-        if (err == KErrNone)
-            {
-            CleanupClosePushL(peng);
-            RPolicyRequest rq;
-            err = rq.Open(peng) ;
-            if (err == KErrNone)
-                {
-                CleanupClosePushL(rq);
-
-                TRequestContext rc;
-
-                using namespace PolicyEngineXACML;
-                using namespace NPolicyConstants;
-
-                rc.AddSubjectAttributeL(KTrustedSubject, aInfo);
-                rc.AddResourceAttributeL(KResourceId, KApplicationManagement,
-                        KStringDataType);
-
-                TResponse resp;
-                err = rq.MakeRequest(rc, resp);
-                if (err == KErrNone)
-                    {
-                    if (resp.GetResponseValue() == EResponsePermit
-#ifdef _DEBUG
-                            || resp.GetResponseValue()
-                                    == EResponseNotApplicable
-#endif 
-                    )
-                        {
-                        go = ETrue;
-                        }
-                    else
-                        {
-                        RDEBUG_2( "CApplicationManagementSession::CheckCertL; Policy response denies access! %d", resp.GetResponseValue());
-                        }
-                    }
-                else
-                    {
-                    RDEBUG_2( "CApplicationManagementSession::CheckCertL; ERROR making policy request! %d", err);
-                    }
-                CleanupStack::PopAndDestroy( &rq) ;
-                }
-            else
-                {
-                RDEBUG_2( "CApplicationManagementSession::CheckCertL; ERROR Failed to open policy engine session! %d", err);
-                }
-            CleanupStack::PopAndDestroy( &peng) ;
-            }
-        else
-            {
-            RDEBUG_2( "CApplicationManagementSession::CheckCertL; ERROR Failed to connect policy engine! %d", err);
-            }
-        User::LeaveIfError(err);
-        }
-    else
-        {
-        RDEBUG( "CApplicationManagementSession::CheckCertL; No PolicyManagement by featmgr-> cert ok!" );
-        go = ETrue;
-        }
-    return go;
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CApplicationManagementServer::HasUidL()
-// ------------------------------------------------------------------------------------------------	
-
-TBool CApplicationManagementServer::HasUidL(const TUid &aUid,
-        CDeploymentComponent *& aCompo, CDeploymentComponent *aIgnored /* = NULL */)
-    {
-    TBool found(EFalse);
-    const RComponentIdArray &arrt = iStorage->GetComponentIds();
-    TInt count(arrt.Count() );
-    for (TInt i( 0); i < count; i++)
-        {
-        CDeploymentComponent &compo = iStorage->ComponentL(arrt[i]);
-        if (compo.Uid() == aUid)
-            {
-            if ( &compo != aIgnored)
-                {
-                aCompo = &compo;
-                found = ETrue;
-                RDEBUG_3( "ApplicationManagementServer: UidExistsL 0x%X - Found NOT ignored %d", aUid.iUid, compo.InternalId() );
-                }
-            else
-                {
-                RDEBUG( "ApplicationManagementServer: UidExistsL - Found ignored " );
-                }
-            }
-        }
-    if ( !found)
-        {
-        found = FindInstalledSisUidL(aUid);
-        if ( !found)
-            {
-            found = FindInstalledJavaUidL(aUid);
-            }
-        }
-    return found;
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CApplicationManagementServer::FindInstalledSisUidL()
-// ------------------------------------------------------------------------------------------------	
-
-TBool CApplicationManagementServer::FindInstalledSisUidL(const TUid &aUid) const
-    {
-    TBool found(EFalse);
-    Swi::RSisRegistrySession sisses;
-    TInt r(sisses.Connect() );
-    User::LeaveIfError(r) ;
-    CleanupClosePushL(sisses);
-
-    RArray<TUid> uids;
-    sisses.InstalledUidsL(uids);
-    CleanupClosePushL(uids);
-
-    TInt uidc(uids.Count() );
-    for (TInt j( 0); found == EFalse && j < uidc; j++)
-        {
-        if (uids[j] == aUid)
-            {
-            found = ETrue;
-            }
-        }
-    CleanupStack::PopAndDestroy( &uids);
-    CleanupStack::PopAndDestroy( &sisses);
-
-    return found;
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CApplicationManagementServer::FindInstalledJavaUidL()
-// ------------------------------------------------------------------------------------------------	
-
-TBool CApplicationManagementServer::FindInstalledJavaUidL(const TUid &aUid) const
-    {
-    TBool found(EFalse);
-    iUtility->RefreshJavaRegistryL();
-    found = iUtility->FindInstalledJavaUidL(aUid);
-    return found;
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CApplicationManagementServer::FindNewUid()
-// ------------------------------------------------------------------------------------------------	
-
-TUid CApplicationManagementServer::FindNewUid(const RArray<TUid> &aUidsOrig,
-        const RArray<TUid> &aUidsNew) const
-    {
-    TUid ret(TUid::Null() );
-    TInt c1(aUidsOrig.Count() );
-    TInt c2(aUidsNew.Count() );
-    if (c2 >= c1)
-        {
-        for (TInt i(c2 - 1); i >= 0 && !ret.iUid; i--)
-            {
-            if (aUidsOrig.Find(aUidsNew[i]) == KErrNotFound)
-                {
-                ret = aUidsNew[i];
-                }
-
-            }
-        }
-    return ret;
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CApplicationManagementServer::JavaUidsL()
-// ------------------------------------------------------------------------------------------------	
-
-void CApplicationManagementServer::JavaUidsL(RArray<TUid> &aUids) const
-    {
-    iUtility->RefreshJavaRegistryL();
-    iUtility->JavaUidsL(aUids);
-    }
-
-void CApplicationManagementServer::CheckforDuplicateMidletsL(
-        TMidletParameters& amidletParameters)
-    {
-    RDEBUG( "CApplicationManagementServer::CheckforDuplicateMidletsL: Start");
-    const RComponentIdArray &arrt = iStorage->GetComponentIds();
-    TInt cont(arrt.Count() );
-    for (TInt i( 0); i < cont; i++)
-        {
-        CDeploymentComponent &compo = iStorage->ComponentL(arrt[i]);
-        if (((compo.State() == EDCSActive) || (compo.State() == EDCSInactive ))
-                && (compo.MidletName()== amidletParameters.iMidletName)
-                && (compo.MidletVendor()== amidletParameters.iMidletVenorName))
-            {
-            //remove old one
-            iStorage->RemoveL(compo.InternalId() );
-            }
-        }
-
-    RDEBUG( "CApplicationManagementServer::CheckforDuplicateMidletsL: End");
-    }
-// ------------------------------------------------------------------------------------------------
-// CApplicationManagementServer::JavaInstallL()
-// ------------------------------------------------------------------------------------------------	
-
-void CApplicationManagementServer::JavaInstallL(CDeploymentComponent &aCompo)
-    {
-    RDEBUG( "CApplicationManagementServer::JavaInstallL: Start");
-
-    TRequestStatus s;
-    TInt err(KErrNone);
-    // set state to install progress
-    aCompo.SetStatusNode(EDelivered_InstallProgress);
-    TRAP(err,InstallL( aCompo,s ));
-    if (err != KErrNone)
-        {
-        aCompo.SetStatusNode(EDelivered_InstalledFailedWithData);
-        User::Leave(err);
-        }
-    User::WaitForRequest(s);
-    SendServerToBackground();
-    if (s != KErrNone)
-        {
-        RDEBUG_2( "ApplicationManagementSession: JavaInstallL failed with code %d",
-                s.Int() );
-        // set state to install failed with data
-        aCompo.SetStatusNode(EDelivered_InstalledFailedWithData);
-        User::Leave(s.Int() );
-        }
-    else
-        {
-        TMidletParameters midletParameters;
-        iUtility->RefreshJavaRegistryL();
-        //Ignore if any error comes
-        TRAPD(err,iUtility->GetInstalledMidletParametersL(midletParameters))
-        ;
-        TRAP(err,CheckforDuplicateMidletsL(midletParameters));
-
-        if (err != KErrNone)
-            {
-            aCompo.SetStatusNode(EDelivered_InstalledFailedWithData);
-            User::Leave(err);
-            }
-        else
-            {
-            aCompo.SetStatusNode(EIdle);
-            }
-        aCompo.SetUid(midletParameters.iMidletUid);
-
-        RDEBUG( "CApplicationManagementServer::JavaInstallL: Step1");
-        if (aCompo.ComponentVersion() == KNullDesC8)
-            {
-            aCompo.SetVersionL(midletParameters.bufVersion);
-
-            }
-
-        TBool status = EFalse;
-
-        //Since "C" drive is not removable
-
-        if (midletParameters.iDrive!=EDriveC)
-            {
-            status = IsInstalledAppRemovableL(midletParameters.iDrive);
-            }
-        if (status)
-            {
-            RDEBUG( "IsInstalledAppRemovableL(midletParameters.iDrive); True");
-            }
-        else
-            {
-            RDEBUG( "IsInstalledAppRemovableL(midletParameters.iDrive); False");
-            }
-
-        //check for status drive
-        aCompo.SetAppRemovableStatus(status);
-        }
-
-    RDEBUG( "CApplicationManagementServer::JavaInstallL: End");
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CApplicationManagementServer::SisInstallL()
-// ------------------------------------------------------------------------------------------------	
-
-void CApplicationManagementServer::SisInstallL(
-        const CDeploymentComponent &aCompo)
-    {
-    TRequestStatus s;
-    // set state to install progress
-    aCompo.SetStatusNode(EDelivered_InstallProgress);
-    TInt err(KErrNone);
-    TRAP(err,InstallL( aCompo,s ));
-    if (err != KErrNone)
-        {
-        aCompo.SetStatusNode(EDelivered_InstalledFailedWithData);
-        User::Leave(err);
-        }
-    User::WaitForRequest(s);
-    if (s != KErrNone)
-        {
-        RDEBUG_2("ApplicationManagementSession: SisInstallL failed with code %d",
-                s.Int() );
-        // set state to install failed with data
-        aCompo.SetStatusNode(EDelivered_InstalledFailedWithData);
-        User::Leave(s.Int() );
-        }
-    else
-        {
-        // set state to install sucessful
-        aCompo.SetStatusNode(EIdle);
-        RDEBUG("ApplicationManagementSession: SisInstallL successfull" );
-        }
-    RDEBUG( "CApplicationManagementServer::SisInstallL: End");
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CApplicationManagementServer::DoTheInstallL()
-// ------------------------------------------------------------------------------------------------	
-
-void CApplicationManagementServer::DoTheInstallL(CDeploymentComponent &aCompo)
-    {
-    RDEBUG( "CApplicationManagementServer::DoTheInstallL: Start");
-    TInt error(KErrNone);
-    if (CDeploymentComponent::IsJavaMimeL(aCompo.Data().MimeType() )
-            || CDeploymentComponent::IsJavaMimeL(aCompo.MetaData().MimeType() ) )
-        {
-        TRAP( error, JavaInstallL( aCompo ) );
-        }
-    else
-        {
-        TRAP( error, SisInstallL( aCompo ) );
-        SetSisAppVersionAndDriveL(aCompo);
-        }
-    
-    SendServerToBackground();
-
-    if (error == KErrNone)
-        {
-        InstallCompleteL(aCompo, ETrue);
-        CDeploymentComponent *old = DoDataUpdateCheckL(aCompo);
-        if (old)
-            {
-            if (aCompo.State() == EDCSDelivered)
-                {
-                if (old->State() == EDCSActive || old->State()== EDCSInactive)
-                    {
-                    RDEBUG("AMSession: DoTheInstallL ** deleting old node **" );
-                    iStorage->RemoveL(old->InternalId() );
-                    }
-                }
-            }
-        iStorage->InstalledL(aCompo);
-        }
-    else
-        {
-        InstallCompleteL(aCompo, EFalse);
-        User::Leave(error);
-        }
-    RDEBUG( "CApplicationManagementServer::DoTheInstallL: End");
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CApplicationManagementServer::DoDataUpdateCheckL()
-// ------------------------------------------------------------------------------------------------	
-
-CDeploymentComponent *CApplicationManagementServer::DoDataUpdateCheckL(
-        CDeploymentComponent &aCompo)
-    {
-    CDeploymentComponent *old= NULL;
-    if (aCompo.Uid() != TUid::Null() && HasUidL(aCompo.Uid(), old, &aCompo) )
-        {
-        // check for Uid component.. Legacy code removed.
-        }
-    return old;
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CApplicationManagementServer::SetDataL()
-// ------------------------------------------------------------------------------------------------
-
-void CApplicationManagementServer::SetDataL(CDeploymentComponent &aCompo,
-        const TDesC8 &aData, const TDesC8 &aMime)
-    {
-    aCompo.SetDataL(aData, aMime);
-    DoDataUpdateCheckL(aCompo);
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CApplicationManagementServer::FullUpdateL()
-// ------------------------------------------------------------------------------------------------
-
-void CApplicationManagementServer::FullUpdateL(const TUint32 sid,
-        const TUint32 tid)
-    {
-    CDeploymentComponent &scompo = iStorage->ComponentL(sid);
-    CDeploymentComponent &tcompo = iStorage->ComponentL(tid);
-    FullUpdateL(scompo, tcompo);
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CApplicationManagementServer::FullUpdateL()
-// ------------------------------------------------------------------------------------------------
-
-void CApplicationManagementServer::FullUpdateL(CDeploymentComponent &scompo,
-        const CDeploymentComponent &tcompo)
-    {
-    if (scompo.State() == EDCSDelivered)
-        {
-        if (tcompo.State() == EDCSActive || tcompo.State() == EDCSInactive)
-            {
-            TRequestStatus s2;
-            InstallL(scompo, s2);
-            User::WaitForRequest(s2);
-            if (s2 != KErrNone)
-                {
-                RDEBUG_2( "ApplicationManagementSession: FullUpdateL failed with code %d", s2.Int() );
-                User::Leave(s2.Int() );
-                }
-            else
-                {
-                InstallCompleteL(scompo);
-                // Before deleting old node ,copy node values which are not set in new node from old node
-                if (scompo.ComponentId()== KNullDesC8)
-                scompo.SetIdL(tcompo.ComponentId());
-                
-                if (scompo.ComponentName()== KNullDesC8)
-                scompo.SetNameL(tcompo.ComponentName());
-                
-                if (scompo.ComponentVersion()== KNullDesC8)
-                scompo.SetVersionL(tcompo.ComponentVersion());
-                
-                //Tag tcompo state for deletion. Cant delete now, since nsmldmtree woudnt be updated
-                //Remove the const'ness since state needs to be updated.
-                
-                iStorage->SetDeploymentComponentState(const_cast <CDeploymentComponent &>(tcompo),EDCSDelete);
-
-                iStorage->InstalledL( scompo );
-                RDEBUG( "ApplicationManagementSession: FullUpdateL ok" );
-                }
-            }
-        else
-            {
-            RDEBUG_2( "ApplicationManagementSession: ERROR FullUpdateL called for illegal state component: %d!", scompo.State() );
-            User::Leave(KErrArgument);
-            }
-        }
-    else
-        {
-        RDEBUG( "ApplicationManagementSession: ERROR FullUpdateL called for illegal state message!" );
-        User::Leave(KErrArgument);
-        }
-    }
-
-// -------------------------------------------------------------------------------------------------------------------
-// CApplicationManagementServer::IsDataFileB64EncodedL()
-// -------------------------------------------------------------------------------------------------------------------
-TBool CApplicationManagementServer::IsDataFileB64EncodedL(RFile &aFile,
-        TInt& aLength)
-    {
-    RDEBUG("CApplicationManagementServer::IsDataFileB64EncodedL()  : start");
-    TBool encoded = ETrue; // assume b64 encoded
-    TInt bufSize(KBase64BufSize);
-    TInt offset(0);
-    HBufC8 *dataBuf = HBufC8::NewLC(bufSize);
-    TPtr8 dataPtr = dataBuf->Des();
-    aFile.Size(aLength);
-    aFile.Seek(ESeekStart, offset);
-
-    while (encoded)
-        {
-        aFile.Read(dataPtr);
-        if ( !dataPtr.Length() )
-            {
-            break;
-            }
-        offset = 0;
-        aFile.Seek(ESeekCurrent, offset);
-        RDEBUG_2("OFFSET: %d", offset);
-        encoded = CheckB64Encode(dataPtr);
-        }
-    RDEBUG_2("Encoded: %d", encoded);
-    CleanupStack::PopAndDestroy(dataBuf);
-    offset = 0;
-    aFile.Seek(ESeekStart, offset);
-
-    RDEBUG("CApplicationManagementServer::IsDataFileB64EncodedL()  : end");
-    return encoded;
-    }
-
-// -------------------------------------------------------------------------------------------------------------------
-// CApplicationManagementServer::CheckB64Encode( const TDesC8& aData )
-// -------------------------------------------------------------------------------------------------------------------
-TBool CApplicationManagementServer::CheckB64Encode(const TDesC8& aData)
-    {
-    TInt inputIndex = 0;
-    TInt inputLen = aData.Length();
-
-    while (inputIndex < inputLen)
-        {
-        const TUint8& p = aData[ inputIndex ];
-
-        if ((p >= 48 && p <= 57) || (p >= 65 && p <= 90) || (p >= 97 && p
-                <= 122) || p == 43 || p == 47 || p == 61 || p == 10 || p
-                == 13)
-            {
-            }
-        else
-            {
-            return EFalse;
-            }
-
-        inputIndex++;
-
-        }
-
-    return ETrue;
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CApplicationManagementServer::GetAMServerDownloadDBL()
-// ------------------------------------------------------------------------------------------------	
-
-void CApplicationManagementServer::GetAMServerDownloadDBL(TUint32 internalid,
-        TInt& finalresult, TDes8& aTargetURI)
-    {
-    RDEBUG( "CApplicationManagementServer::GetAMServerDownloadDBL(): Step1" );
-
-    TBuf<50> internalidbuf;
-
-    RDEBUG( "CApplicationManagementServer::GetAMServerDownloadDBL(): Step2" );
-    internalidbuf.Num(internalid);
-
-    RDEBUG( "CApplicationManagementServer::GetAMServerDownloadDBL(): Step3" );
-
-    RPointerArray<CAMDbItem> aItemArray;
-
-    RDEBUG( "CApplicationManagementServer::GetAMServerDownloadDBL(): Step4" );
-
-    iAMServerDB->GetEntryForLUIDL(aItemArray, internalidbuf);
-
-    RDEBUG( "CApplicationManagementServer::GetAMServerDownloadDBL(): Step5" );
-
-    if (aItemArray.Count()!=0)
-        {
-        RDEBUG( "CApplicationManagementServer::GetAMServerDownloadDBL(): Step6" );
-
-        finalresult = aItemArray[0]->iResult;
-
-        RDEBUG( "CApplicationManagementServer::GetAMServerDownloadDBL(): Step7" );
-
-        if (finalresult < KErrNone)
-            User::Leave(KErrGeneral);
-
-        RDEBUG( "CApplicationManagementServer::GetAMServerDownloadDBL(): Step8" );
-
-        if (*aItemArray[0]->iTargetURI == KNullDesC8())
-            User::Leave(KErrGeneral);
-
-        RDEBUG( "CApplicationManagementServer::GetAMServerDownloadDBL(): Step9" );
-        aTargetURI.Copy(*aItemArray[0]->iTargetURI);
-
-        }
-    RDEBUG( "CApplicationManagementServer::GetAMServerDownloadDBL(): Step10" );
-    aItemArray.ResetAndDestroy();
-
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CApplicationManagementServer::DeleteGenericAlertForIDL()
-// ------------------------------------------------------------------------------------------------	
-
-void CApplicationManagementServer::DeleteGenericAlertForIDL(TUint32 internalid)
-    {
-    iAMServerDB->DeleteFromDatabaseL(internalid);
-    }
-
-// -------------------------------------------------------------------------------------------------------------------
-// CApplicationManagementServer::DecodeB64DataFileL( RFile& aDataFile, RFile& aDestinationFile )
-// -------------------------------------------------------------------------------------------------------------------
-void CApplicationManagementServer::DecodeB64DataFileL(RFile& aSourceFile,
-        RFile& aDestinationFile)
-    {
-    RDEBUG( "CApplicationManagementServer::DecodeB64DataFileL(): Start" );
-    // Create buffers
-    //TInt b64bufferSize = 131072;
-    TInt decodedBufferSize = ( (KBase64BufSize*3) / 4 + 16 );
-    HBufC8 *dataBuf = HBufC8::NewLC(KBase64BufSize);
-    TPtr8 dataPtr = dataBuf->Des();
-    HBufC8* targetBuf = HBufC8::NewLC(decodedBufferSize);
-    TPtr8 targetPtr(targetBuf->Des() );
-
-    TInt offset(0);
-    TInt length(0);
-    TBool reading(ETrue);
-    aSourceFile.Size(length);
-    RDEBUG_2( "CApplicationManagementServer::DecodeB64DataFileL(): b64 file total size: (%d)", length );
-    aSourceFile.Seek(ESeekStart, offset);
-
-    // Initialize decoder
-    TImCodecB64 B64Coder;
-    B64Coder.Initialise();
-
-    while (reading)
-        {
-        aSourceFile.Read(dataPtr);
-        if ( !dataPtr.Length() )
-            {
-            // EOF
-            break;
-            }
-        offset = 0;
-        aSourceFile.Seek(ESeekCurrent, offset);
-        RDEBUG_2("OFFSET: %d", offset);
-
-        // decode data
-        B64Coder.Decode(dataPtr, targetPtr);
-        // write decoded data to temporary file
-        aDestinationFile.Write(targetPtr);
-        }
-    CleanupStack::PopAndDestroy(targetBuf);
-    CleanupStack::PopAndDestroy(dataBuf);
-
-    offset = 0;
-    aDestinationFile.Seek(ESeekStart, offset);
-    RDEBUG( "CApplicationManagementServer::DecodeB64DataFileL(): end" );
-    }
-
-// -------------------------------------------------------------------------------------------------------------------
-// CApplicationManagementServer::DecodeB64DataLC( const TDesC8& aData )
-// -------------------------------------------------------------------------------------------------------------------
-HBufC8* CApplicationManagementServer::DecodeB64DataLC(const TDesC8 &aData)
-    {
-    RDEBUG( "CApplicationManagementServer::DecodeB64DataLC(): Start" );
-    TImCodecB64 B64Coder;
-    B64Coder.Initialise();
-    HBufC8 *target = HBufC8::NewLC( (aData.Length() * 3 ) / 4 + 16);
-    TPtr8 targetPtr(target->Des() );
-    B64Coder.Decode(aData, targetPtr);
-    RDEBUG( "CApplicationManagementServer::DecodeB64DataLC(): End" );
-    return target;
-    }
-
-// -------------------------------------------------------------------------------------------------------------------
-//  CApplicationManagementServer::EncodeDataL( const TDesC8& aData, CBufBase &aTarget )
-// -------------------------------------------------------------------------------------------------------------------
-void CApplicationManagementServer::EncodeDataL(const TDesC8& aData,
-        CBufBase &aTarget)
-    {
-    TInt outLen(aData.Length() * 2);
-    aTarget.ExpandL(0, outLen);
-    TImCodecB64 B64Coder;
-    B64Coder.Initialise();
-    TPtr8 target(aTarget.Ptr(0) );
-    TInt decoded(B64Coder.Encode(aData, target) );
-    TInt s(target.Length() );
-    aTarget.ResizeL(s);
-    //	TInt s2( aTarget.Size());
-    aTarget.Compress();
-    //	TInt s3( aTarget.Size() );
-    if ( !decoded)
-        {
-        RDEBUG( "CApplicationManagementServer::EncodeDataL(): Encoding b64 failed?" );
-        }
-    }
-
-// -------------------------------------------------------------------------------------------------------------------
-// CApplicationManagementSession::CApplicationManagementSession
-// -------------------------------------------------------------------------------------------------------------------
-inline CApplicationManagementSession::CApplicationManagementSession()
-    {
-    RDEBUG_2( "CApplicationManagementSession::CApplicationManagementSession 0x%x", this);
-    }
-
-// -------------------------------------------------------------------------------------------------------------------
-// CApplicationManagementSession::CApplicationManagementSession
-// -------------------------------------------------------------------------------------------------------------------
-
-inline CApplicationManagementSession::CApplicationManagementSession(
-        const TCertInfo &aInfo) :
-    iCertInfo(aInfo)
-    {
-    RDEBUG( "CApplicationManagementSession::CApplicationManagementSession (cert) " );
-    }
-
-// -------------------------------------------------------------------------------------------------------------------
-// CApplicationManagementSession::Server()
-// -------------------------------------------------------------------------------------------------------------------
-
-inline CApplicationManagementServer& CApplicationManagementSession::Server() const
-    {
-    return *static_cast<CApplicationManagementServer*>( const_cast<CServer2*>(CSession2::Server()));
-    }
-
-// -------------------------------------------------------------------------------------------------------------------
-// CApplicationManagementSession::CreateL()
-// -------------------------------------------------------------------------------------------------------------------
-// 2nd phase construct for sessions - called by the CServer framework
-
-void CApplicationManagementSession::CreateL()
-    {
-    RDEBUG_2( "ApplicationManagementSession: CApplicationManagementSession::CreateL: 0x%x", this );
-
-    Server().AddSession();
-    CAknAppServiceBase::CreateL();
-    }
-
-// -------------------------------------------------------------------------------------------------------------------
-// CApplicationManagementSession::~CApplicationManagementSession()
-// -------------------------------------------------------------------------------------------------------------------
-
-CApplicationManagementSession::~CApplicationManagementSession()
-    {
-    RDEBUG_3("CApplicationManagementSession::~CApplicationManagementSession 0x%X - 0x%X", reinterpret_cast<TUint>(this),
-            reinterpret_cast<TUint>(this)+sizeof( CApplicationManagementSession ) );
-    RDEBUG_2("CApplicationManagementSession::~CApplicationManagementSession iCertInfo offs 0x%X",
-            reinterpret_cast<TUint>(&this->iCertInfo) - reinterpret_cast<TUint>(this) );
-
-    Server().DropSession();
-    }
-
-// -------------------------------------------------------------------------------------------------------------------
-// CApplicationManagementSession::ServiceL()
-// -------------------------------------------------------------------------------------------------------------------
-
-void CApplicationManagementSession::ServiceL(const RMessage2& aMessage)
-    {
-    if (aMessage.Function() == EPerformRfs)
-        {
-        TRAPD( err, Server().PerformRFSL() )
-        ;
-        aMessage.Complete(err);
-        }
-    else
-        {
-        TBool handled(EFalse);
-        TInt err(KErrNone);
-        TRAP( err, handled = PreDispatchMessageL( aMessage ) );
-        if ( !handled)
-            {
-            TRAP(err,DispatchMessageL(aMessage));
-            }
-
-        // Some of the functions contains operations that already complete message
-        // doing Complete() twice will cause panic
-        if (aMessage.Handle() )
-            {
-            aMessage.Complete(err);
-            }
-        }
-    }
-
-// CApplicationManagementSession::PreDispatchMessageL()
-// -------------------------------------------------------------------------------------------------------------------
-
-TBool CApplicationManagementSession::PreDispatchMessageL(
-        const RMessage2 &aMessage)
-    {
-    TBool ret(EFalse);
-    // These succeed regardless of certificate....
-    switch (aMessage.Function() )
-        {
-        case EGetStateChangingIdsCountOperation:
-            {
-            // gets count of items list of ids that are potentially changing state
-            StateChangeComponentIdsCountL(aMessage);
-            ret = ETrue;
-            break;
-            }
-        case EGetStateChangingIdsOperation:
-            {
-            // gets list of ids that are potentially changing state
-            StateChangeComponentIdsL(aMessage);
-            ret = ETrue;
-            break;
-            }
-        case ECompleteStateChangeOperation: // completes change of state
-            {
-            StateChangeCompleteL(aMessage);
-            ret = ETrue;
-            break;
-            }
-        default:
-            {
-            break;
-            }
-        }
-    return ret;
-    }
-
-// -------------------------------------------------------------------------------------------------------------------
-// CApplicationManagementSession::DispatchMessageL()
-// -------------------------------------------------------------------------------------------------------------------
-
-void CApplicationManagementSession::DispatchMessageL(const RMessage2& aMessage)
-    {
-    RDEBUG_2( "CApplicationManagementSession::DispatchMessageL; %d" ,
-            aMessage.Function() );
-
-    TBool go(EFalse);
-    if (iTrustAdded)
-        {
-        go = Server().CheckCertL(iCertInfo);
-        }
-    else
-        {
-        go = ETrue;
-        }
-
-    if (go)
-        {
-        switch (aMessage.Function() )
-            {
-            case EAddTrust:
-                {
-                RDEBUG_2( "CApplicationManagementSession::DispatchMessageL; EAddTrust this=0x%x", this );
-                AddTrustL(aMessage);
-                break;
-                }
-            case EDeplCompCountOperation:
-                {
-                ComponentCountL(aMessage);
-                return;
-                }
-            case EDeplCompIdsOperation:
-                {
-                ComponentIdsL(aMessage);
-                return;
-                }
-            case EDeplCompDeliverCompleteOperation:
-                {
-                DeliverCompleteL(aMessage);
-                break;
-                }
-            case EDeplCompGetOperation:
-                {
-                GetComponentL(aMessage) ;
-                break;
-                }
-            case EInstallOperation:
-                {
-                InstallL(aMessage) ;
-                break;
-                }
-            case EDeplCompAttrUpdateOperation:
-                {
-                UpdateL(aMessage) ;
-                break;
-                }
-            case EDeplCompGetDataOperation:
-                {
-                GetDataL(aMessage) ;
-                break;
-                }
-            case EDeplCompGetDataLengthOperation:
-                {
-                GetDataLengthL(aMessage) ;
-                break;
-                }
-            case EDeplCompRemoveOperation:
-                {
-                RemoveL(aMessage) ;
-                break;
-                }
-            case EDeplCompDeliverStartOperation2:
-                {
-                Deliver2L(aMessage) ;
-                break;
-                }
-            case EDeplCompUpdateDataOperation:
-                {
-                UpdateDataL(aMessage) ;
-                break;
-                }
-            case EDeplCompUpdateStreamedDataOperation:
-                {
-                UpdateStreamedDataL(aMessage) ;
-                break;
-                }
-            case EDeplCompDownloadOperation:
-                {
-                DownloadL(aMessage) ;
-                break;
-                }
-            case EDeplCompUpdateOperation:
-                {
-                FullUpdateL(aMessage) ;
-                break;
-                }
-            case EDeplCompGetUserIdOperation:
-                {
-                GetUserIdL(aMessage);
-                break;
-                }
-            case EDeplCompStartDownloadOperation:
-                {
-                StartDownloadL(aMessage);
-                break;
-                }
-            case EDeplCompDeactivateOperation:
-                {
-                DeactivateL(aMessage);
-                break;
-                }
-            case EDeplCompActivateOperation:
-                {
-                ActivateL(aMessage);
-                break;
-                }
-            case EDeplCompGetTemporaryInstFile:
-                {
-                GetTemporaryInstFileL(aMessage);
-                break;
-                }
-
-            case EDeplCompGetFinalResultForGA:
-                {
-                GetFinalResultForGAL(aMessage);
-                break;
-
-                }
-            case EDeplCompGenericAlertSent:
-                {
-                GenericAlertSentForIdL(aMessage);
-                break;
-                }
-            case ECheckStatusNodes:
-                {
-                CheckStatusNodesValuesL();
-                break;
-                }
-
-            default:
-                {
-                User::Leave(KErrNotSupported);
-                break;
-                }
-            }
-        }
-    else
-        {
-        RDEBUG_2( "CApplicationManagementSession::DispatchMessageL; Policy prevented action this=0x%x", this );
-        User::Leave(KErrAccessDenied);
-        }
-    }
-
-// -------------------------------------------------------------------------------------------------------------------
-// CApplicationManagementSession::GenericAlertSentForIdL()
-// -------------------------------------------------------------------------------------------------------------------
-
-void CApplicationManagementSession::GenericAlertSentForIdL(
-        const RMessage2& aMessage) const
-    {
-    TUint32 luid;
-    TPckg<TUint32> pk(luid);
-    TInt read(aMessage.Read(0, pk));
-
-    Server().DeleteGenericAlertForIDL(luid);
-
-    }
-
-// -------------------------------------------------------------------------------------------------------------------
-// CApplicationManagementSession::GetFinalResultForGAL()
-// -------------------------------------------------------------------------------------------------------------------
-
-void CApplicationManagementSession::GetFinalResultForGAL(
-        const RMessage2& aMessage)
-    {
-
-    RDEBUG( "CApplicationManagementSession: GetFinalResultForGAL Step 1" );
-    TUint32 luid;
-    TPckg<TUint32> pk(luid);
-
-    TInt finalresult = KErrNone;
-
-    RDEBUG( "CApplicationManagementSession: GetFinalResultForGAL Step 2" );
-
-    HBufC8 *targetURI = HBufC8::NewL(512);
-    TPtr8 ptr = targetURI->Des();
-
-    RDEBUG( "CApplicationManagementSession: GetFinalResultForGAL Step 3" );
-
-    TInt read(aMessage.Read(0, pk));
-
-    RDEBUG( "CApplicationManagementSession: GetFinalResultForGAL Step 4" );
-
-    Server().GetAMServerDownloadDBL(luid, finalresult, ptr);
-
-    RDEBUG( "CApplicationManagementSession: GetFinalResultForGAL Step 5" );
-
-    RDEBUG_2( "ApplicationManagementServer: GetFinalResultForGAL Count is %d", finalresult );
-    TPckg<TInt> p1(finalresult);
-    aMessage.WriteL(1, p1);
-
-    RDEBUG( "CApplicationManagementSession: GetFinalResultForGAL Step 6" );
-    aMessage.WriteL(2, ptr);
-
-    RDEBUG( "CApplicationManagementSession: GetFinalResultForGAL Step 7" );
-    if (targetURI)
-        delete targetURI;
-
-    }
-
-// -------------------------------------------------------------------------------------------------------------------
-// CApplicationManagementSession::ComponentCountL()
-// -------------------------------------------------------------------------------------------------------------------
-
-void CApplicationManagementSession::ComponentCountL(const RMessage2& aMessage)
-    {
-    RDEBUG( "CApplicationManagementSession: ComponentCountL" );
-    TDeploymentComponentState st;
-    TPckg<TDeploymentComponentState> pk(st);
-
-    TInt read(aMessage.Read( 1, pk) );
-    RDEBUG_3( "CApplicationManagementSession: ComponentCountL State is %d, read %d", st, read);
-
-    const RComponentIdArray &arrt = Server().Storage()->GetComponentIds();
-    RComponentIdArray arr;
-    CleanupClosePushL(arr);
-    if ((st == EDCSActive)||(st == EDCSInactive))
-        {
-        ActiveComponentsL(arrt, arr,st);
-        }
-    else
-        {
-        TInt count(arrt.Count() );
-        for (TInt i( 0); i < count; i++)
-            {
-            CDeploymentComponent &compo = Server().Storage()->ComponentL(arrt[i]);
-            if (st == EDCSNone || compo.State() == st)
-                {
-                arr.Append(arrt[i]);
-                }
-            }
-        }
-    TInt n(arr.Count() );
-    CleanupStack::PopAndDestroy( &arr);
-
-    RDEBUG_2( "ApplicationManagementServer: ComponentCountL Count is %d", n );
-    TPckg<TInt> p(n);
-
-    aMessage.WriteL(0, p);
-
-    }
-
-// -------------------------------------------------------------------------------------------------------------------
-// CApplicationManagementSession::ActiveComponentsL()
-// -------------------------------------------------------------------------------------------------------------------
-
-void CApplicationManagementSession::ActiveComponentsL(
-        const RComponentIdArray &aArrt, RComponentIdArray &aArr,TDeploymentComponentState &aState) const
-    {
-    Swi::RSisRegistrySession sisses;
-    TInt r(sisses.Connect() );
-    User::LeaveIfError(r) ;
-    CleanupClosePushL(sisses);
-
-    RArray<TUid> uids;
-    sisses.InstalledUidsL(uids);
-    CleanupClosePushL(uids);
-    TInt cont(aArrt.Count() );
-    TInt uidc(uids.Count() );
-    RArray<TUid> juids;
-    Server().JavaUidsL(juids);
-    CleanupClosePushL(juids);
-    TInt juidc(juids.Count() );
-    RComponentIdArray rem;
-    CleanupClosePushL(rem);
-    for (TInt i( 0); i < cont; i++)
-        {
-        CDeploymentComponent &compo = Server().Storage()->ComponentL(aArrt[i]);
-        TDeploymentComponentState state = compo.State();
-        if (state == aState)
-            {
-            TBool add(EFalse);
-            const TUid &uid(compo.Uid() );
-            for (TInt j( 0); add == EFalse && j < uidc; j++)
-                {
-
-                if (uids[j] == uid)
-                    {
-                   
-                    RDEBUG( "CApplicationManagementSession::ActiveComponentsL Entered" );
-                    
-                    // Check if this registry entry is present
-                    Swi::RSisRegistrySession sisSession;
-    								User::LeaveIfError(sisSession.Connect());
-    								CleanupClosePushL(sisSession);
-
-    								Swi::RSisRegistryEntry sisEntry;
-
-                    //Opens the base package entry by specifying a UID. 
-                    User::LeaveIfError(sisEntry.Open(sisSession, compo.Uid()));
-                    CleanupClosePushL(sisEntry);   
-
-										add  = sisEntry.IsPresentL();	
-										
-			  if(add)
-                    {
-				
-				// If Present update the Version, name and other info to that deployement component. Since application would have got an update
-                        // by some other means
-				
-                        TVersion version = sisEntry.VersionL();
-                        TBuf8<KVersionLength> pkgDes;
-                        pkgDes.AppendNum(version.iMajor);
-                        pkgDes.Append(KLiteralPeriod);
-                        pkgDes.AppendNum(version.iMinor);
-                        
-				
-				HBufC *packagename = sisEntry.PackageNameL();
-				TBuf8<512> packagename8;
-				packagename8.Copy(*packagename);
-				delete packagename;
-
-                        compo.SetNameL(packagename8);
-                        compo.SetVersionL(pkgDes);
-				                        
-
-                        Server().Storage()->UpdateL( compo );
-                        
-
-				
-
-				RDEBUG( "CApplicationManagementSession::ActiveComponentsL ETrue" );
-
-
-			  }
-			  else
-			      RDEBUG( "CApplicationManagementSession::ActiveComponentsL EFalse" );
-																	    
-	
-                    CleanupStack::PopAndDestroy(2, &sisSession);
-                                   
-                    }
-                }
-            if ( !add) // go throug java suites
-                {
-                for (TInt k( 0); add == EFalse && k < juidc; k++)
-                    {
-                    if (juids[k] == uid)
-                        {
-                        add = ETrue;
-                        }
-                    }
-                }
-            if (add)
-                {
-                aArr.Append(aArrt[i]);
-                }
-            else
-                {
-                RDEBUG8_3( "ApplicationManagementServer: ActiveComponentCountL skipping 0x%x, %S",
-                        compo.Uid() ,&compo.ComponentId() );
-                rem.Append(aArrt[i]);
-                }
-            }
-        }
-    TInt rc(rem.Count() );
-    for (TInt t( 0); t < rc; t++)
-        {
-        RDEBUG_2( "ApplicationManagementServer: ActiveComponentCountL removing non existing %d", rem[t] );
-        CDeploymentComponent &compo = Server().Storage()->ComponentL(rem[t]);
-        if(!compo.AppRemovable())
-        Server().RemoveInternalL(compo, EFalse);
-        }
-    CleanupStack::PopAndDestroy( &rem);
-    CleanupStack::PopAndDestroy( &juids);
-    CleanupStack::PopAndDestroy( &uids);
-    CleanupStack::PopAndDestroy( &sisses);
-    }
-
-// -------------------------------------------------------------------------------------------------------------------
-// CApplicationManagementSession::ComponentIdsL()
-// -------------------------------------------------------------------------------------------------------------------
-
-void CApplicationManagementSession::ComponentIdsL(const RMessage2& aMessage) const
-    {
-    RDEBUG( "CApplicationManagementSession: ComponentIdsL" );
-    TDeploymentComponentState st;
-    TPckg<TDeploymentComponentState> pk(st);
-
-    TInt read(aMessage.Read( 1, pk) );
-    RDEBUG_3( "CApplicationManagementSession: ComponentIdsL State is %d, read %d", st, read);
-
-    const RComponentIdArray &arrt = Server().Storage()->GetComponentIds();
-    TInt buflen( 0);
-    TUint32* buf= NULL;
-    if (st == EDCSNone)
-        {
-        buflen = arrt.Count() ;
-        buf = new ( ELeave ) TUint32[buflen];
-        CleanupArrayDeletePushL(buf);
-        for (TInt i( 0); i < buflen; i++)
-            {
-            RDEBUG_2("ApplicationManagementSession: ComponentIdsL Adding %d!!", arrt[i]);
-            buf[i] = arrt[i];
-            }
-        }
-    else
-        {
-        RComponentIdArray arr;
-        if (st == EDCSActive)
-            {
-            ActiveComponentsL(arrt, arr,st);
-            }
-        else
-            {
-            TInt artc(arrt.Count() );
-            for (TInt i( 0); i < artc; i++)
-                {
-                CDeploymentComponent &compo = Server().Storage()->ComponentL(arrt[i]);
-                if (compo.State() == st)
-                    {
-                    arr.Append(arrt[i]);
-                    }
-                }
-            }
-        buflen = arr.Count() ;
-        buf = new ( ELeave ) TUint32[buflen];
-        CleanupArrayDeletePushL(buf);
-
-        TUint32 len(aMessage.GetDesMaxLength( 0) / 4);
-        if (buflen == len)
-            {
-            RDEBUG( "CApplicationManagementSession: ComponentIdsL Right count!!" );
-            }
-        else
-            {
-            RDEBUG_3( "CApplicationManagementSession: ComponentIdsL Wrong count (is %d, should be %d)!!", len, buflen);
-            if (len < buflen)
-                {
-                buflen = len;
-                }
-            }
-        for (TInt i( 0); i < buflen; i++)
-            {
-            RDEBUG_2( "CApplicationManagementSession: ComponentIdsL Adding %d!!",
-                    arr[i] );
-            buf[i] = arr[i];
-            }
-        arr.Close();
-        }
-
-    TPtrC8 p( ( TUint8* ) buf, buflen * sizeof(TUint32));
-    aMessage.WriteL( 0, p);
-
-    CleanupStack::PopAndDestroy(buf);
-    }
-
-#ifdef _DEBUG
-HBufC* Des8to16LC(const TDesC8 &aDes)
-    {
-    HBufC *b = HBufC::NewLC(aDes.Length() );
-    TPtr p(b->Des() );
-    p.Copy(aDes);
-    return b;
-    }
-
-HBufC* ToStringLC(TDeploymentComponent &aComp)
-    {
-    HBufC *b = HBufC::NewLC(aComp.iId.Length() + aComp.iName.Length()
-            + aComp.iVersion.Length() + 10 + 50);
-    TPtr p(b->Des() );
-    _LIT( KFormat, "Id: '%S', Name: '%S', Version: '%S', State: %d, OldState: %d");
-    p.Format(KFormat, &*Des8to16LC(aComp.iId), &*Des8to16LC(aComp.iName),
-            &*Des8to16LC(aComp.iVersion), aComp.iState, aComp.iOldState) ;
-    CleanupStack::PopAndDestroy( 3);
-    return b;
-    }
-#endif
-
-// -------------------------------------------------------------------------------------------------------------------
-// CApplicationManagementSession::Deliver2L()
-// -------------------------------------------------------------------------------------------------------------------
-
-void CApplicationManagementSession::Deliver2L(const RMessage2& aMessage) const
-    {
-    RDEBUG( "ApplicationManagementSession: Deliver2L" );
-
-    TDeploymentComponentIPC comp;
-    TPckg< TDeploymentComponentIPC> pcomp(comp);
-    TInt read2(aMessage.Read( 0, pcomp) );
-
-    HBufC8 *data = HBufC8::NewLC(aMessage.GetDesLength( 1) );
-    TPtr8 pbuf(data->Des());
-    TInt read(aMessage.Read( 1, pbuf) );
-
-    CDeploymentComponent *compo= NULL;
-    if (iTrustAdded)
-        {
-        compo = Server().Storage()->NewComponentL(EDCSDelivered, comp.iUserId, &iCertInfo);
-        }
-    else
-        {
-        compo = Server().Storage()->NewComponentL(EDCSDelivered, comp.iUserId);
-        }
-
-    compo->Set(comp.iComponent);
-    compo->Data().SetDataL(pbuf, comp.iMimeType);
-    Server().Storage()->UpdateL( *compo);
-    compo->CopyStateTo(comp.iComponent);
-
-#ifdef _DEBUG
-    RDEBUG_2( "Deliver2L: TDeploymentComponent is '%S'",
-            ToStringLC( comp.iComponent ) );
-    CleanupStack::PopAndDestroy();
-#endif
-
-    TPckg< TDeploymentComponent> pcomp2(comp.iComponent);
-    aMessage.Write( 0, pcomp2);
-    CleanupStack::PopAndDestroy(data) ;
-    TInt n(compo->InternalId() );
-    TPckg<TUint32> p(n);
-    aMessage.WriteL( 2, p);
-    }
-
-// -------------------------------------------------------------------------------------------------------------------
-// CApplicationManagementSession::DeliverCompleteL()
-// -------------------------------------------------------------------------------------------------------------------
-
-void CApplicationManagementSession::DeliverCompleteL(const RMessage2& aMessage) const
-    {
-    RDEBUG( "ApplicationManagementSession: DeliverCompleteL" );
-    TUint32 id;
-    TPckg<TUint32> pid(id);
-
-    TInt read(aMessage.Read( 0, pid) );
-    RDEBUG_2( "ApplicationManagementSession: DeliverCompleteL id is %d", id );
-
-    CDeploymentComponent &compo = Server().Storage()->ComponentL(id);
-
-    HBufC8 *opts = HBufC8::NewLC(aMessage.GetDesLength( 1) );
-    TPtr8 popts(opts->Des() );
-    TInt read1(aMessage.Read( 1, popts) );
-    compo.SetInstallOptsL( *opts);
-
-    HBufC8 *meta = HBufC8::NewLC(aMessage.GetDesLength( 2) );
-    TPtr8 pmeta(meta->Des() );
-    TInt read2(aMessage.Read( 2, pmeta) );
-    compo.SetMetaDataL( *meta, KNullDesC8);
-
-    CleanupStack::PopAndDestroy(meta) ;
-    CleanupStack::PopAndDestroy(opts) ;
-    Server().Storage()->UpdateL(compo);
-    }
-
-// -------------------------------------------------------------------------------------------------------------------
-// CApplicationManagementSession::GetComponentL()
-// -------------------------------------------------------------------------------------------------------------------
-
-void CApplicationManagementSession::GetComponentL(const RMessage2& aMessage) const
-    {
-    RDEBUG( "ApplicationManagementSession: GetComponentL" );
-    TUint32 id;
-    TPckg<TUint32> pid(id);
-    TInt read(aMessage.Read( 0, pid) );
-
-    RDEBUG_2( "ApplicationManagementSession: GetComponentL id is %d", id );
-    CDeploymentComponent &compo = Server().Storage()->ComponentL(id);
-
-    TDeploymentComponent comp;
-    compo.CopyStateTo(comp);
-
-    TPckg< TDeploymentComponent> pcomp(comp);
-    aMessage.Write( 1, pcomp);
-    }
-
-// -------------------------------------------------------------------------------------------------------------------
-// CApplicationManagementSession::StartDownloadL()
-// -------------------------------------------------------------------------------------------------------------------
-
-void CApplicationManagementSession::StartDownloadL(const RMessage2& aMessage) const
-    {
-    RDEBUG( "ApplicationManagementSession: StartDownloadL" );
-    TUint32 id = 0;
-    TPckg<TUint32> pid(id);
-    TInt read(aMessage.Read( 0, pid) );
-
-    TPckgBuf<TDownloadTarget> target;
-    read = aMessage.Read( 1, target) ;
-    RDEBUG_2( "ApplicationManagementSession: StartDownloadL id is %d", id );
-
-    CDeploymentComponent &compo = Server().Storage()->ComponentL(id);
-    compo.SetDownloadTarget(target() );
-    Server().AddDownloadL( &compo);
-    }
-
-// -------------------------------------------------------------------------------------------------------------------
-// CApplicationManagementSession::DeactivateL()
-// -------------------------------------------------------------------------------------------------------------------
-
-void CApplicationManagementSession::DeactivateL(const RMessage2& aMessage) const
-    {
-    RDEBUG( "ApplicationManagementSession: DeactivateL" );
-    TUint32 id = 0;
-    TPckg<TUint32> pid(id);
-    TInt read(aMessage.Read( 0, pid) );
-
-    RDEBUG_2( "ApplicationManagementSession: DeactivateL id is %d", id );
-    CDeploymentComponent &compo = Server().Storage()->ComponentL(id);
-    Server().Storage()->DeactivateL(compo);
-    }
-
-// -------------------------------------------------------------------------------------------------------------------
-// CApplicationManagementSession::ActivateL()
-// -------------------------------------------------------------------------------------------------------------------
-
-void CApplicationManagementSession::ActivateL(const RMessage2& aMessage) const
-    {
-    RDEBUG( "ApplicationManagementSession: ActivateL" );
-    TUint32 id;
-    TPckg<TUint32> pid(id);
-    TInt read(aMessage.Read( 0, pid) );
-
-    RDEBUG_2( "ApplicationManagementSession: ActivateL id is %d", id );
-    CDeploymentComponent &compo = Server().Storage()->ComponentL(id);
-    Server().Storage()->ActivateL(compo);
-    }
-
-// -------------------------------------------------------------------------------------------------------------------
-// CApplicationManagementSession::GetUserIdL()
-// -------------------------------------------------------------------------------------------------------------------
-
-void CApplicationManagementSession::GetUserIdL(const RMessage2& aMessage) const
-    {
-    RDEBUG( "ApplicationManagementSession: GetUserIdL" );
-    TUint32 id = 0;
-    TPckg<TUint32> pid(id);
-    TInt read(aMessage.Read( 0, pid) );
-
-    RDEBUG_2( "ApplicationManagementSession: GetUserIdL id is %d", id );
-    CDeploymentComponent &compo = Server().Storage()->ComponentL(id);
-
-    aMessage.Write( 1, compo.UserId() );
-    }
-
-// -------------------------------------------------------------------------------------------------------------------
-// CApplicationManagementSession::GetTemporaryInstFileL()
-// -------------------------------------------------------------------------------------------------------------------
-
-void CApplicationManagementSession::GetTemporaryInstFileL(
-        const RMessage2& aMessage) const
-    {
-    // TIpcArgs( &id, &itemid, &filehandle )
-    RDEBUG( "ApplicationManagementSession: GetTemporaryInstFileL" );
-    TUint32 id;
-    TPckg<TUint32> pid(id);
-    TInt read(aMessage.Read( 0, pid) );
-
-    TDeplCompAttrType item;
-    TPckg<TDeplCompAttrType> itemid(item);
-    read = aMessage.Read( 1, itemid);
-
-    RDEBUG_2( "ApplicationManagementSession: GetTemporaryInstFileL id is %d", id );
-    CDeploymentComponent &compo = Server().Storage()->ComponentL(id);
-
-    TFileName fileName;
-
-    if (item == EDCData)
-        {
-        fileName.Copy(compo.Data().DataFileName() );
-        }
-    else
-        if (item == EDCMetaData)
-            {
-            fileName.Copy(compo.MetaData().DataFileName() );
-            }
-        else
-            {
-            RDEBUG_2( "ApplicationManagementSession: GetTemporaryInstFileL: Not supported type: (%d)", item);
-            User::Leave(KErrNotSupported);
-            }
-
-    RDEBUG_2( "ApplicationManagementSession: GetTemporaryInstFileL: (%S)", &fileName);
-
-    RFs fs;
-    User::LeaveIfError(fs.Connect() );
-    User::LeaveIfError(fs.ShareProtected() );
-    CleanupClosePushL(fs);
-    RFile file;
-    User::LeaveIfError(file.Open(fs, fileName, EFileWrite) );
-    CleanupClosePushL(file);
-
-    // Takes care of completing with session (RFs), 
-    // SendReceieve returns session handle at client side
-    User::LeaveIfError(file.TransferToClient(aMessage, 2) );
-    CleanupStack::PopAndDestroy(2, &fs); // fs , file	
-    }
-
-// -------------------------------------------------------------------------------------------------------------------
-// CApplicationManagementSession::PackageSizeL()
-// -------------------------------------------------------------------------------------------------------------------
-
-TInt CApplicationManagementSession::PackageSizeL(
-        Swi::RSisRegistrySession& aSession, Swi::RSisRegistryEntry& aEntry)
-    {
-    RPointerArray<Swi::CSisRegistryPackage> listPackages;
-    TInt size(0);
-    TInt err(0);
-    CleanupClosePushL(listPackages);
-
-    aEntry.AugmentationsL(listPackages);
-
-    for (TInt index(0); index < listPackages.Count(); index++)
-        {
-        TRAP(err, AugmentationSizeL( aSession, *listPackages[index]))
-        if (err != KErrNone)
-            {
-            break;
-            }
-        }
-
-    if (err != KErrNone)
-        {
-        size = 0;
-        }
-    else
-        {
-        TRAP(err, size += aEntry.SizeL() );
-        }
-
-    listPackages.ResetAndDestroy();
-    CleanupStack::PopAndDestroy( &listPackages);
-
-    if (err != KErrNone)
-        {
-        //We leave if there was an error, 
-        // but we have to clean up the listPackages before the leave.
-        User::Leave(err);
-        }
-
-    return size;
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CAppMngrSisxInfo::AugmentationSizeL()
-// Returns the Size of the package
-// (other items were commented in a header).
-// ------------------------------------------------------------------------------------------------
-//  
-TInt CApplicationManagementSession::AugmentationSizeL(
-        Swi::RSisRegistrySession& aSession,
-        const Swi::CSisRegistryPackage& aPackage)
-    {
-    TInt size(0);
-    Swi::RSisRegistryEntry regEntry;
-    CleanupClosePushL(regEntry);
-
-    regEntry.OpenL(aSession, aPackage);
-    size += PackageSizeL(aSession, regEntry);
-
-    CleanupStack::PopAndDestroy( &regEntry);
-
-    return size;
-    }
-
-// -------------------------------------------------------------------------------------------------------------------
-// CApplicationManagementSession::LookupSisRegistryL()
-// -------------------------------------------------------------------------------------------------------------------
-
-void CApplicationManagementSession::LookupSisRegistryL()
-    {
-    Swi::RSisRegistrySession sisses;
-    TInt r(sisses.Connect() );
-    RPointerArray<Swi::CSisRegistryPackage> pkgs(12);
-    sisses.InstalledPackagesL(pkgs);
-
-    TInt count(pkgs.Count() );
-    for (TInt i( 0); i < count; i++)
-        {
-        Swi::CSisRegistryPackage* p = pkgs[i];
-
-        RDEBUG_5(" Found package: %d, '%S', uid: 0x%X, size: %d" ,
-                i, &p->Name(), p->Uid().iUid, AugmentationSizeL( sisses, *p ) );
-        }
-
-    sisses.Close();
-    pkgs.ResetAndDestroy();
-
-    }
-
-// -------------------------------------------------------------------------------------------------------------------
-// CApplicationManagementSession::InstallL()
-// -------------------------------------------------------------------------------------------------------------------
-
-void CApplicationManagementSession::InstallL(const RMessage2& aMessage) const
-    {
-    RDEBUG( "ApplicationManagementSession: InstallL" );
-    TUint32 id;
-    TPckg<TUint32> pid(id);
-    TInt read(aMessage.Read( 0, pid) );
-
-    TDeploymentComponentState targetst;
-    TPckg<TDeploymentComponentState> pk(targetst);
-
-    read = aMessage.Read( 1, pk) ;
-
-    RDEBUG_3( "ApplicationManagementSession: InstallL id is %d, targetstate %d",
-            id, targetst );
-
-    CDeploymentComponent &compo = Server().Storage()->ComponentL(id);
-    if (compo.State() == EDCSDelivered)
-        {
-        Server().DoTheInstallL(compo) ;
-        }
-    else
-        {
-        User::Leave(KErrArgument);
-        }
-    RDEBUG_2( "ApplicationManagementSession: InstallL success. New compo state (%d)", compo.State());
-    }
-
-// -------------------------------------------------------------------------------------------------------------------
-// CApplicationManagementSession::UpdateDataL()
-// -------------------------------------------------------------------------------------------------------------------
-
-void CApplicationManagementSession::UpdateDataL(const RMessage2& aMessage) const
-    {
-    RDEBUG( "ApplicationManagementSession: UpdateDataL" );
-
-    TDeplCompDataIPC ipc;
-    TPckg<TDeplCompDataIPC> pipc(ipc);
-    TInt read(aMessage.Read( 0, pipc) );
-    RDEBUG_2( "ApplicationManagementSession: UpdateDataL id is %d", ipc.iInternalId );
-
-    HBufC8 *buf = HBufC8::NewLC(aMessage.GetDesLength( 1) );
-    TPtr8 pbuf(buf->Des() );
-    TInt read2(aMessage.Read( 1, pbuf) );
-
-    CDeploymentComponent &compo = Server().Storage()->ComponentL(ipc.iInternalId);
-
-    if (Server().CheckB64Encode(pbuf) )
-        {
-        RDEBUG( "ApplicationManagementSession: UpdateDataL data is base64 encoded");
-        // b64 encoded data, decode it 
-        HBufC8* tmp;
-        tmp = Server().DecodeB64DataLC(pbuf);
-        pbuf.Copy( *tmp);
-        pbuf = buf->Des();
-        CleanupStack::PopAndDestroy(tmp);
-        }
-
-    if (compo.State() == EDCSDelivered)
-        {
-        if (ipc.iAttrType == EDCData)
-            {
-            compo.SetDataL(pbuf, ipc.iDataMime);
-            }
-        else
-            if (ipc.iAttrType == EDCMetaData)
-                {
-                compo.SetMetaDataL(pbuf, ipc.iDataMime);
-                }
-            else
-                {
-                RDEBUG_2( "ApplicationManagementSession::UpdateDataL -  ERROR UpdateDataL called for illegal item: %d!", ipc.iAttrType );
-                User::Leave(KErrArgument);
-                }
-
-        Server().Storage()->UpdateL(compo);
-        }
-    else
-        {
-        RDEBUG( "ApplicationManagementSession::UpdateDataL -  ERROR UpdateDataL called for illegal state message!" );
-        User::Leave(KErrArgument);
-        }
-    CleanupStack::PopAndDestroy(buf);
-    }
-
-// -------------------------------------------------------------------------------------------------------------------
-// CApplicationManagementSession::UpdateStreamedDataL()
-// -------------------------------------------------------------------------------------------------------------------
-
-void CApplicationManagementSession::UpdateStreamedDataL(
-        const RMessage2& aMessage) const
-    {
-    RDEBUG( "ApplicationManagementSession: UpdateStreamedDataL() Start");
-    TDeplCompDataIPC ipc;
-    TPckg<TDeplCompDataIPC> pipc(ipc);
-    TInt read(aMessage.Read( 0, pipc) );
-    RDEBUG_2( "ApplicationManagementSession: UpdateStreamedDataL id is %d", ipc.iInternalId );
-
-    CDeploymentComponent &compo = Server().Storage()->ComponentL(ipc.iInternalId);
-
-    if (compo.State() == EDCSDelivered)
-        {
-        RFs fs;
-        User::LeaveIfError(fs.Connect() );
-        CleanupClosePushL(fs);
-        RFile file;
-        TFileName dataFileName;
-        TInt length(0);
-
-        if (ipc.iAttrType == EDCData)
-            {
-            dataFileName.Copy(compo.Data().DataFileName() ) ;
-            }
-        else
-            if (ipc.iAttrType == EDCMetaData)
-                {
-                dataFileName.Copy(compo.MetaData().DataFileName() ) ;
-                }
-            else
-                {
-                RDEBUG_2( "ApplicationManagementSession::UpdateStreamedDataL -  ERROR called for illegal item: %d!", ipc.iAttrType );
-                User::Leave(KErrArgument);
-                }
-
-        RDEBUG_2( "ApplicationManagementSession::UpdateStreamedDataL(): using dataFile: (%S)", &dataFileName );
-
-        // EFileWrite So we can delete the original decoded data file
-        User::LeaveIfError(file.Open(fs, dataFileName, EFileWrite) );
-        CleanupClosePushL(file) ;
-        if (Server().IsDataFileB64EncodedL(file, length) )
-            {
-            RDEBUG( "CApplicationManagementServer::UpdateStreamedDataL(): data is decoded" );
-
-            TFileName tempFileName;
-            TBuf<30> privatePath;
-            fs.PrivatePath(privatePath);
-            RFile tempFile;
-            TInt err(KErrNone);
-            err = tempFile.Temp(fs, privatePath, tempFileName, EFileWrite);
-            if (err == KErrNone)
-                {
-                RDEBUG_2( "ApplicationManagementSession::UpdateStreamedDataL(): created tempFile: (%S)", &tempFileName );
-                }
-            else
-                {
-                User::Leave(err);
-                }
-            CleanupClosePushL(tempFile);
-
-            TRAP( err, Server().DecodeB64DataFileL( file, tempFile ) );
-            if (err != KErrNone)
-                {
-                RDEBUG_2( "ApplicationManagementSession::UpdateStreamedDataL -  failed to decode datafile: %d", err );
-                CleanupStack::PopAndDestroy( 2, &file);
-                compo.ResetDataL(fs); // Remove both files if exists
-                User::Leave(err);
-                }
-            else
-                {
-                // close both files, delete decode file and rename temp file to correct one
-                CleanupStack::PopAndDestroy( 2, &file);
-                fs.Delete(dataFileName);
-                err = fs.Rename(tempFileName, dataFileName);
-                RDEBUG_2( "ApplicationManagementSession::UpdateStreamedDataL -  successfully decoded datafile: %d", err );
-                }
-            CleanupStack::PopAndDestroy( &fs);
-            }
-        else
-            {
-            RDEBUG( "ApplicationManagementSession::UpdateStreamedDataL(): data is NOT decoded" );
-            CleanupStack::PopAndDestroy( 2, &fs);
-            }
-
-        if (ipc.iAttrType == EDCData)
-            {
-            compo.SetDataL(ipc.iDataMime);
-            }
-        else
-            {
-            compo.SetMetaDataL(ipc.iDataMime);
-            }
-
-        Server().Storage()->UpdateL(compo);
-        }
-    else
-        {
-        RDEBUG( "ApplicationManagementSession::UpdateStreamedDataL -  ERROR called for illegal state message!" );
-        User::Leave(KErrArgument);
-        }
-    RDEBUG( "ApplicationManagementSession: UpdateStreamedDataL() End");
-    }
-
-// -------------------------------------------------------------------------------------------------------------------
-// CApplicationManagementSession::UpdateL()
-// -------------------------------------------------------------------------------------------------------------------
-
-void CApplicationManagementSession::UpdateL(const RMessage2& aMessage) const
-    {
-    RDEBUG( "ApplicationManagementSession: UpdateL" );
-
-    TUint32 id;
-    TPckg<TUint32> pid(id);
-    TInt read(aMessage.Read( 0, pid) );
-    RDEBUG_2("ApplicationManagementSession: UpdateL id is %d", id );
-
-    TDeplCompAttrType item;
-    TPckg<TDeplCompAttrType> itemid(item);
-    TInt read1(aMessage.Read( 1, itemid) );
-    HBufC8 *buf = HBufC8::NewLC(aMessage.GetDesLength( 2) );
-    TPtr8 pbuf(buf->Des() );
-    TInt read2(aMessage.Read( 2, pbuf) );
-
-    CDeploymentComponent &c = Server().Storage()->ComponentL(id);
-    TDeploymentComponentState st(c.State() );
-    if (st == EDCSDelivered || st == EDCSDownload)
-        {
-        switch (item)
-            {
-            case EDCId:
-                {
-                c.SetIdL(pbuf);
-                break;
-                }
-            case EDCName:
-                {
-                c.SetNameL(pbuf);
-                break;
-                }
-            case EDCVersion:
-                {
-                c.SetVersionL(pbuf);
-                break;
-                }
-            case EDCDescriptionRef:
-                {
-                c.SetDescriptionL(pbuf);
-                break;
-                }
-            case EDCInstallOptions:
-                {
-                c.SetInstallOptsL(pbuf);
-                break;
-                }
-            case EDCMetaData:
-                {
-                c.SetMetaDataL(pbuf, KNullDesC8);
-                break;
-                }
-            case EDCPkgID:
-                {
-                c.SetPkgIDL(pbuf);
-                break;
-                }
-            case EDCPkgType:
-                {
-                c.SetPkgTypeL(pbuf);
-                break;
-                }
-
-            default:
-                {
-                if (st == EDCSDelivered)
-                    {
-                    switch (item)
-                        {
-                        case EDCData:
-                            {
-                            c.SetDataL(pbuf, KNullDesC8);
-                            if (c.State() == EDCSDownload)
-                                {
-                                //	Server().StartDownload( *compo );
-                                }
-                            break;
-                            }
-                        default:
-                            {
-                            RDEBUG_2("ApplicationManagementSession: ERROR UpdateL called for illegal item type!!!! %d", item );
-                            User::Leave(KErrArgument);
-                            }
-                        }
-                    }
-                else
-                    if (st == EDCSDownload)
-                        {
-                        switch (item)
-                            {
-                            case EDCId:
-                                {
-                                c.SetIdL(pbuf);
-                                break;
-                                }
-                            case EDCName:
-                                {
-                                c.SetNameL(pbuf);
-                                break;
-                                }
-                            case EDCVersion:
-                                {
-                                c.SetVersionL(pbuf);
-                                break;
-                                }
-                            case EDCDownloadURI:
-                                {
-                                c.SetDownloadURIL(pbuf);
-                                break;
-                                }
-                            case EDCConRef:
-                                {
-                                TPckgBuf<TInt> aInt;
-                                aInt.Copy(pbuf);
-                                c.SetIAPL(aInt() );
-                                break;
-                                }
-                            default:
-                                {
-                                RDEBUG_2( "ApplicationManagementSession: ERROR UpdateL called for illegal item type!!!! %d", item );
-                                User::Leave(KErrArgument);
-                                break;
-                                }
-                            }
-                        }
-                break;
-                }
-            }
-        Server().Storage()->UpdateL(c);
-        }
-    else
-        if (st == EDCSActive ||st == EDCSInactive)
-            {
-            switch (item)
-                {
-                case EDCName:
-                    {
-                    c.SetNameL(pbuf);
-                    break;
-                    }
-                case EDCVersion:
-                    {
-                    c.SetVersionL(pbuf);
-                    break;
-                    }
-                case EDCDescriptionRef:
-                {
-                c.SetDescriptionL(pbuf);
-                break;
-                }
-                default:
-                    {
-                    RDEBUG_2( "ApplicationManagementSession: ERROR UpdateL called for illegal item type!!!! %d", item );
-                    User::Leave(KErrArgument);
-                    break;
-                    }
-                }
-            Server().Storage()->UpdateL(c);
-            }
-        else
-            {
-            RDEBUG( "ApplicationManagementSession: ERROR UpdateL called for illegal state message!" );
-            User::Leave(KErrArgument);
-            }
-    CleanupStack::PopAndDestroy(buf);
-    }
-
-// -------------------------------------------------------------------------------------------------------------------
-// CApplicationManagementSession::GetDataLengthL()
-// -------------------------------------------------------------------------------------------------------------------
-
-void CApplicationManagementSession::GetDataLengthL(const RMessage2& aMessage) const
-    {
-    RDEBUG( "ApplicationManagementSession: GetDataLengthL" );
-    TUint32 id;
-    TPckg<TUint32> pid(id);
-
-    TInt read(aMessage.Read( 0, pid) );
-
-    TInt length( 0);
-
-    TDeplCompAttrType dt;
-    TPckg< TDeplCompAttrType> pdt(dt);
-    read = aMessage.Read( 1, pdt) ;
-    CDeploymentComponent &compo = Server().Storage()->ComponentL(id);
-    if (compo.State() == EDCSDelivered)
-        {
-        if (dt == EDCInstallOptions)
-            {
-            if (compo.InstallOptsSet() )
-                {
-                length = sizeof(TAMInstallOptions);
-                }
-            }
-        else
-            if (dt == EDCData)
-                {
-                length = compo.Data().DataLengthL();
-                }
-            else
-                if (dt == EDCDataMime)
-                    {
-                    length = compo.Data().MimeType().Length();
-                    }
-                else
-                    if (dt == EDCMetaData)
-                        {
-                        length = compo.MetaData().DataLengthL();
-                        }
-                    else
-                        if (dt == EDCMetaDataMime)
-                            {
-                            length = compo.MetaData().MimeType().Length();
-                            }
-                        else
-                            {
-                            RDEBUG_2( "ApplicationManagementSession: GetDataLengthL ERROR called with illegal type %d", dt );
-                            User::Leave(KErrArgument);
-                            }
-        }
-    else
-        if (compo.State() == EDCSDownload)
-            {
-            if (dt == EDCDownloadURI)
-                {
-                length = compo.DownloadURI().Length();
-                }
-            else
-                if (dt == EDCInstallOptions)
-                    {
-                    if (compo.InstallOptsSet() )
-                        {
-                        length = sizeof(TAMInstallOptions);
-                        }
-                    }
-                else
-                    {
-                    RDEBUG_2( "ApplicationManagementSession: GetDataLengthL ERROR Download / called with illegal state component id %d",
-                            compo.State() );
-                    User::Leave(KErrArgument);
-                    }
-            }
-        else
-            {
-            RDEBUG_2( "ApplicationManagementSession: GetDataLengthL ERROR called with illegal state component id %d",
-                    compo.State() );
-            User::Leave(KErrArgument);
-            }
-
-    TPckg< TInt> pcomp(length);
-    aMessage.Write( 2, pcomp);
-    }
-
-// -------------------------------------------------------------------------------------------------------------------
-// CApplicationManagementSession::GetDataL()
-// -------------------------------------------------------------------------------------------------------------------
-
-void CApplicationManagementSession::GetDataL(const RMessage2& aMessage) const
-    {
-    RDEBUG( "ApplicationManagementSession: GetDataL" );
-    TUint32 id;
-    TPckg<TUint32> pid(id);
-
-    TInt read(aMessage.Read( 0, pid) );
-
-    TDeplCompAttrType dt;
-    TPckg< TDeplCompAttrType> pdt(dt);
-    read = aMessage.Read( 1, pdt) ;
-
-    RDEBUG_3( "ApplicationManagementSession: GetDataL id is %d, and attribute %d", id, dt );
-    CDeploymentComponent &compo = Server().Storage()->ComponentL(id);
-    if (dt == EDCStatus)
-        {
-        TPckg<TInt> p(compo.Status() );
-        aMessage.Write( 2, p);
-        }
-    else
-        if (compo.State() == EDCSDelivered)
-            {
-            if (dt == EDCInstallOptions)
-                {
-                if (compo.InstallOptsSet() )
-                    {
-                    TAMInstallOptionsPckgBuf pckg(compo.InstallOpts() );
-                    aMessage.Write( 2, pckg);
-                    }
-                else
-                    {
-                    aMessage.Write( 2, KNullDesC8);
-                    }
-                }
-            else
-                if (dt == EDCData)
-                    {
-                    aMessage.Write( 2, compo.Data().Data() );
-                    }
-                else
-                    if (dt == EDCDataMime)
-                        {
-                        aMessage.Write( 2, compo.Data().MimeType() );
-                        }
-                    else
-                        if (dt == EDCMetaData)
-                            {
-                            aMessage.Write( 2, compo.MetaData().Data() );
-                            }
-                        else
-                            if (dt == EDCMetaDataMime)
-                                {
-                                aMessage.Write( 2, compo.MetaData().MimeType() );
-                                }
-                            else
-                                {
-                                RDEBUG_2( "ApplicationManagementSession: GetDataL ERROR called with illegal type %d", dt );
-                                User::Leave(KErrArgument);
-                                }
-            }
-        else
-            if (compo.State() == EDCSDownload)
-                {
-
-                if (dt == EDCDownloadURI)
-                    {
-                    aMessage.Write( 2, compo.DownloadURI() );
-                    }
-
-                else
-                    if (dt == EDCInstallOptions)
-                        {
-                        if (compo.InstallOptsSet() )
-                            {
-                            TAMInstallOptionsPckgBuf
-                                    pckg(compo.InstallOpts() );
-                            aMessage.Write( 2, pckg);
-                            }
-                        else
-                            {
-                            aMessage.Write( 2, KNullDesC8);
-                            }
-                        }
-                    else
-                        if (dt == EDCConRef)
-                            {
-                            TPckg<TInt> p(compo.GetIAP() );
-                            aMessage.Write( 2, p);
-                            }
-                        else
-                            {
-                            RDEBUG_2( "ApplicationManagementSession:GetDataL ERROR called with illegal type %d", dt );
-                            User::Leave(KErrArgument);
-                            }
-                }
-            else
-                {
-                RDEBUG_2("ApplicationManagementSession: GetDataL ERROR called with illegal state component id %d", compo.State() );
-                User::Leave(KErrArgument);
-                }
-    }
-
-// -------------------------------------------------------------------------------------------------------------------
-// CApplicationManagementSession::RemoveL()
-// -------------------------------------------------------------------------------------------------------------------
-
-void CApplicationManagementSession::RemoveL(const RMessage2& aMessage) const
-    {
-    RDEBUG( "ApplicationManagementSession: RemoveL" );
-    TUint32 id;
-    TPckg<TUint32> pid(id);
-    TInt read(aMessage.Read( 0, pid) );
-    RDEBUG_2( "ApplicationManagementSession: RemoveL id is %d", id );
-    RemoveInternalL(id);
-    }
-
-// -------------------------------------------------------------------------------------------------------------------
-// CApplicationManagementSession::RemoveInternalL()
-// -------------------------------------------------------------------------------------------------------------------
-
-void CApplicationManagementSession::RemoveInternalL(const TUint32 &aId) const
-    {
-    CDeploymentComponent &compo = Server().Storage()->ComponentL(aId);
-
-    Server().RemoveInternalL(compo);
-    }
-
-// -------------------------------------------------------------------------------------------------------------------
-// CApplicationManagementSession::DownloadL()
-// -------------------------------------------------------------------------------------------------------------------
-
-void CApplicationManagementSession::DownloadL(const RMessage2& aMessage) const
-    {
-    RDEBUG( "ApplicationManagementSession: DownloadL" );
-
-    TDCUserId userId;
-    aMessage.ReadL( 1, userId);
-    CDeploymentComponent *compo= NULL;
-
-    if (iTrustAdded)
-        {
-        compo = Server().Storage()->NewComponentL(EDCSDownload, userId, &iCertInfo);
-        }
-    else
-        {
-        compo = Server().Storage()->NewComponentL(EDCSDownload, userId);
-        }
-    TUint32 i(compo->InternalId() );
-    TPckg<TUint32> p(i);
-    aMessage.WriteL(0, p);
-    }
-
-// -------------------------------------------------------------------------------------------------------------------
-// CApplicationManagementSession::FullUpdateL()
-// -------------------------------------------------------------------------------------------------------------------
-
-void CApplicationManagementSession::FullUpdateL(const RMessage2& aMessage) const
-    {
-    RDEBUG( "ApplicationManagementSession: FullUpdateL" );
-
-    TUint32 sid;
-
-    TPckg<TUint32> psid(sid);
-    TInt read(aMessage.Read( 0, psid) );
-    TUint32 tid;
-    TPckg<TUint32> ptid(tid);
-    TInt read2(aMessage.Read( 1, ptid) );
-
-    RDEBUG_3( "ApplicationManagementSession: FullUpdateL sid is %d, tid is %d", sid, tid );
-    CApplicationManagementServer &server = Server();
-    server.FullUpdateL(sid, tid);
-    }
-
-// -------------------------------------------------------------------------------------------------------------------
-// CApplicationManagementSession::ServiceError()
-// -------------------------------------------------------------------------------------------------------------------
-
-void CApplicationManagementSession::ServiceError(const RMessage2& aMessage,
-        TInt aError)
-    {
-    RDEBUG_2( "ApplicationManagementSession: CApplicationManagementSession::ServiceError %d", aError);
-    CSession2::ServiceError(aMessage, aError);
-    }
-
-// -------------------------------------------------------------------------------------------------------------------
-// CApplicationManagementSession::AddTrustL()
-// -------------------------------------------------------------------------------------------------------------------
-
-void CApplicationManagementSession::AddTrustL(const RMessage2 &aMessage)
-    {
-    TPckg<TCertInfo> pkg(iCertInfo);
-    aMessage.ReadL( 0, pkg);
-    iTrustAdded = ETrue;
-    }
-
-// -------------------------------------------------------------------------------------------------------------------
-// CApplicationManagementSession::StateChangeComponentIdsL()
-// -------------------------------------------------------------------------------------------------------------------
-
-void CApplicationManagementSession::StateChangeComponentIdsL(
-        const RMessage2& aMessage) const
-    {
-    RDEBUG( "CApplicationManagementSession: StateChangeComponentIdsL" );
-    RComponentIdArray arr;
-    Server().Storage()->GetStateChangeComponentIdsL(arr);
-    TInt buflen(arr.Count() );
-    TUint32* buf = new ( ELeave ) TUint32[buflen];
-    CleanupArrayDeletePushL(buf);
-    for (TInt i( 0); i < buflen; i++)
-        {
-        RDEBUG_2( "ApplicationManagementSession:ComponentIdsL Adding %d!!", arr[i]);
-        buf[i] = arr[i];
-        }
-    TPtrC8 p( ( TUint8* ) buf, buflen * sizeof(TUint32));
-    aMessage.WriteL( 0, p);
-    arr.Close();
-    CleanupStack::PopAndDestroy(buf);
-    RDEBUG( "CApplicationManagementSession: StateChangeComponentIdsL end" );
-
-    }
-
-// -------------------------------------------------------------------------------------------------------------------
-// CApplicationManagementSession::StateChangeComponentIdsCountL()
-// -------------------------------------------------------------------------------------------------------------------
-
-void CApplicationManagementSession::StateChangeComponentIdsCountL(
-        const RMessage2& aMessage) const
-    {
-    RDEBUG( "CApplicationManagementSession: StateChangeComponentIdsCountL" );
-                RPointerArray<TPreInstalledAppParams> preInstalledAppParams;
-                CAMPreInstallApp* preInstallApp = CAMPreInstallApp::NewL();
-                preInstallApp->GetPreInstalledAppsL(preInstalledAppParams);
-                TInt count = 0;
-                for (count = 0; count< preInstalledAppParams.Count(); count++)
-                    {
-                    RDEBUG8_2("CApplicationManagementSession::DownloadL: Installed App Name is: %S",&(preInstalledAppParams[count]->iPreInstalledAppame));
-                    RDEBUG8_2("CApplicationManagementSession::DownloadL: Installed App Vendor is: %S",&(preInstalledAppParams[count]->iPreInstalledAppVendorName));
-                    RDEBUG_2("CApplicationManagementSession::DownloadL: Installed App UID is : '0x%X'",preInstalledAppParams[count]->iPreInstalledAppUid);
-
-                    TBool found = EFalse;
-                    const RComponentIdArray &arrt = Server().Storage()->GetComponentIds();
-                    TInt countval(arrt.Count() );
-                    for (TInt i( 0); i < countval; i++)
-                        {
-                        CDeploymentComponent &compo = Server().Storage()->ComponentL(arrt[i]);
-                        if (compo.Uid()== preInstalledAppParams[count]->iPreInstalledAppUid)
-                            {
-                            RDEBUG( "CApplicationManagementSession: ActiveComponentsL found= TRUE" );
-                            found = ETrue;
-                            }
-                        }
-                    if (!found)
-                        {
-                        RDEBUG( "CApplicationManagementSession: Adding Pre-installed app" );
-                        TDCUserId preInstalledAppName;
-                        preInstalledAppName.Copy(preInstalledAppParams[count]->iPreInstalledAppame);
-                        CDeploymentComponent *preInstallCompo= NULL;
-                        RDEBUG8_2("CApplicationManagementSession: Installed App Name is: %S",&preInstalledAppName);
-                        preInstallCompo = Server().Storage()->NewComponentL(EDCSActive, preInstalledAppName);
-                        preInstallCompo->SetUid(preInstalledAppParams[count]->iPreInstalledAppUid);
-                        preInstallCompo->SetNameL(preInstalledAppName);
-                        preInstallCompo->SetVersionL(preInstalledAppParams[count]->iVersion);
-                        preInstallCompo->SetMimeTypeL(preInstalledAppParams[count]->iMimeType);
-				preInstallCompo->SetAppRemovableStatus(ETrue);
-
-                        Server().Storage()->UpdateL( *preInstallCompo );
-                        Server().Storage()->CheckForDuplicateNodesInDeployedL(*preInstallCompo);
-                        }
-                    }
-                delete preInstallApp;
-    RComponentIdArray arr;
-    Server().Storage()->GetStateChangeComponentIdsL(arr);
-    TPckgBuf<TInt> buflen(arr.Count() );
-    aMessage.WriteL( 0, buflen);
-    arr.Close();
-    RDEBUG( "CApplicationManagementSession: StateChangeComponentIdsCountL end" );
-    }
-
-// -------------------------------------------------------------------------------------------------------------------
-// CApplicationManagementSession::StateChangeCompleteL()
-// -------------------------------------------------------------------------------------------------------------------
-
-void CApplicationManagementSession::StateChangeCompleteL(
-        const RMessage2& aMessage) const
-    {
-    RDEBUG( "CApplicationManagementSession: StateChangeCompleteL" );
-    TUint32 tid;
-    TPckg<TUint32> ptid(tid);
-    TInt read2(aMessage.Read( 0, ptid) );
-    Server().Storage()->StateChangedL(tid);
-    }
-void CApplicationManagementSession::CheckStatusNodesValuesL()
-    {
-    const RComponentIdArray &arrt = Server().Storage()->GetComponentIds();
-    TInt cont(arrt.Count() );
-    TBool isUpdateRequired = ETrue;
-    for (TInt i( 0); i < cont; i++)
-        {
-        CDeploymentComponent &compo = Server().Storage()->ComponentL(arrt[i]);
-        isUpdateRequired = EFalse;
-        if (compo.Status() == EDownload_DownloadProgress)
-            {
-            compo.SetStatusNode(EDownload_DownloadFailed);
-            isUpdateRequired = ETrue;
-            }
-        else
-            if (compo.Status() == EDelivered_InstallProgress)
-                {
-                compo.SetStatusNode(EDelivered_InstalledFailedWithData);
-                isUpdateRequired = ETrue;
-                }
-            else
-                if (compo.Status() == EDelivered_RemoveProgress)
-                    {
-                    compo.SetStatusNode(EDelivered_RemoveFailed);
-                    isUpdateRequired = ETrue;
-                    }
-                else
-                    if (compo.Status() == EDeployed_RemoveProgress)
-                        {
-                        compo.SetStatusNode(EDeployed_RemoveFailed);
-                        isUpdateRequired = ETrue;
-                        }
-                    else
-                        if (compo.Status() == EDeployed_ActivateProgress)
-                            {
-                            compo.SetStatusNode(EDeployed_ActivateFailed);
-                            isUpdateRequired = ETrue;
-                            }
-                        else
-                            if (compo.Status()
-                                    == EDeployed_DeactivateProgress)
-                                {
-                                compo.SetStatusNode(EDeployed_DeactivateFailed);
-                                isUpdateRequired = ETrue;
-                                }
-        if (isUpdateRequired)
-            Server().Storage()->UpdateL(compo);
-        }
-
-    }
-
-void CApplicationManagementServer::SetSisAppVersionAndDriveL(
-        CDeploymentComponent &aCompo)
-    {
-    RDEBUG( "CApplicationManagementSession: SetSisAppVersionAndDriveL: Begin" );
-
-        Swi::RSisRegistrySession sisSession;
-        User::LeaveIfError(sisSession.Connect());
-        CleanupClosePushL(sisSession);
-        
-        Swi::RSisRegistryEntry sisEntry;
-        
-        //Opens the base package entry by specifying a UID. 
-        User::LeaveIfError(sisEntry.Open(sisSession, aCompo.Uid()));
-        CleanupClosePushL(sisEntry);
-
-    TUint drivesMask = sisEntry.InstalledDrivesL();
-    
-    TInt drive= EDriveA;
-    TDriveNumber installedDrive = EDriveC;
-    
-    if( drivesMask )
-    {
-    // Select the highest drive as location drive. That's the case when 
-    // all installation is not in same drive
-    
-    while( drivesMask >>= 1 )
-    {
-    drive++;
-    }
-    
-    RDEBUG_2( "drive -> SetSisAppVersionAndDriveL %d", drive);
-    
-    installedDrive = (TDriveNumber)drive;
-    }
-    
-
-    TBool status = EFalse;
-
-    //Since "C" drive is not removable
-
-    if (installedDrive!=EDriveC)
-        {
-        status = IsInstalledAppRemovableL(installedDrive);
-        }
-    if (status)
-        {
-        RDEBUG( "IsInstalledAppRemovableL(SetSisAppVersionAndDriveL); True");
-        }
-    else
-        {
-        RDEBUG( "IsInstalledAppRemovableL(SetSisAppVersionAndDriveL); False");
-        }
-   
-    //check for status drive
-    aCompo.SetAppRemovableStatus(status);
-    
-    TVersion version = sisEntry.VersionL();
-
-    if (aCompo.ComponentVersion() == KNullDesC8)
-        {
-        TBuf8<KVersionLength> pkgDes;
-        pkgDes.AppendNum(version.iMajor);
-        pkgDes.Append(KLiteralPeriod);
-        pkgDes.AppendNum(version.iMinor);
-        aCompo.SetVersionL(pkgDes);
-
-        }
-    CleanupStack::PopAndDestroy(2, &sisSession);
-
-    RDEBUG( "CApplicationManagementSession: SetSisAppVersionAndDriveL: End" );
-    }
-
-TBool CApplicationManagementServer::IsInstalledAppRemovableL(
-        TDriveNumber &iDrive)
-    {
-
-    RDEBUG( "IsInstalledAppRemovableL: Step1" );
-    TBool removable=EFalse;
-    RFs rfs;
-    User::LeaveIfError(rfs.Connect() );
-    CleanupClosePushL(rfs);
-    TDriveList driveList;
-    TInt driveCount;
-
-    //Get all removeable drive, both physically and logically
-    User::LeaveIfError(DriveInfo::GetUserVisibleDrives(rfs, driveList,
-            driveCount, KDriveAttRemovable));
-
-    TInt max(driveList.Length());
-
-    RDEBUG_2( "driveList.Length() %d", max);
-
-    RDEBUG_2( "driveCount %d", driveCount);
-
-    TBuf<26> buf;
-    buf.Copy(driveList);
-    RDEBUG_2( "Drive Info (%S)", &buf);
-
-    for (TInt i=0; i<max; ++i)
-        {
-
-        //RDEBUG( "IsInstalledAppRemovableL: Step2" );
-        if (driveList[i])
-            {
-            TUint status;
-            RDEBUG( "IsInstalledAppRemovableL: Step3" );
-            DriveInfo::GetDriveStatus(rfs, i, status);
-
-            RDEBUG( "IsInstalledAppRemovableL: Step4" );
-            //To make sure the drive is physically removeable not logically removeable  
-            if (status & DriveInfo::EDriveRemovable)
-                {
-                RDEBUG( "IsInstalledAppRemovableL: Drive removable" );
-                RDEBUG_2( "IsInstalledAppRemovableL: Drive removable Drive ID %d", i);
-                if (i == iDrive)
-                    {
-                    RDEBUG( "IsInstalledAppRemovableL: Step5" );
-                    removable=ETrue;
-                    break;
-                    }
-                }
-            }
-        }
-
-    CleanupStack::PopAndDestroy( &rfs);
-
-    return removable;
-
-    }
-//  End of File
--- a/applicationmanagement/server/src/ApplicationManagementUtility.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,84 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
- *
-* Description:  Implementation of applicationmanagement components
- *
-*/
-
-
-//	CLASS HEADER
-#include "ApplicationManagementUtility.h"
-#include "debug.h"
-using namespace NApplicationManagement;
-
-// CONSTRUCTION
-CApplicationManagementUtility* CApplicationManagementUtility::NewL()
-    {
-    CApplicationManagementUtility* self =
-            CApplicationManagementUtility::NewLC();
-    CleanupStack::Pop();
-
-    return self;
-    }
-
-CApplicationManagementUtility* CApplicationManagementUtility::NewLC()
-    {
-    CApplicationManagementUtility* self = new( ELeave ) CApplicationManagementUtility();
-    CleanupStack::PushL(self);
-
-    self->ConstructL();
-    return self;
-    }
-
-// Destructor (virtual by CBase)
-CApplicationManagementUtility::~CApplicationManagementUtility()
-    {
-    }
-
-// Default constructor
-CApplicationManagementUtility::CApplicationManagementUtility()
-    {
-    }
-
-// Second phase construct
-void CApplicationManagementUtility::ConstructL()
-    {
-    }
-
-TBool CApplicationManagementUtility::FindInstalledJavaUidL(const TUid& /*aUid*/) const
-    {
-    return EFalse;
-    }
-
-void CApplicationManagementUtility::InstalledSuiteUidsL(RArray <TUid>)
-    {
-    // do nothing
-    }
-
-void CApplicationManagementUtility::JavaUidsL(RArray<TUid>& /*aUids*/)
-    {
-    // do nothing
-    }
-
-void CApplicationManagementUtility::RefreshJavaRegistryL()
-    {
-    // do nothing
-    }
-void CApplicationManagementUtility::GetInstalledMidletParametersL(
-        TMidletParameters& /*aMidletParameters*/)
-    {
-    RDEBUG( "CApplicationManagementUtility::GetInstalledMidletParametersL: Start");
-    //do nothng
-    RDEBUG( "CApplicationManagementUtility::GetInstalledMidletParametersL: end");
-    }
-//  END OF FILE
--- a/applicationmanagement/server/src/ApplicationManagementUtilityFactory.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +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 "Eclipse Public License v1.0"
- * which accompanies this distribution, and is available
- * at the URL "http://www.eclipse.org/legal/epl-v10.html".
- *
- * Initial Contributors:
- * Nokia Corporation - initial contribution.
- *
- * Contributors:
- *
- * Description: Implementation of applicationmanagement components
- *
- */
-
-//	CLASS HEADER
-#include "ApplicationManagementUtilityFactory.h"
-
-using namespace NApplicationManagement;
-
-//  METHODS
-CApplicationManagementUtility* ApplicationManagementUtilityFactory::CreateManagementUtilityL()
-    {
-    return CApplicationManagementUtility::NewL();
-    }
-
-//  END OF FILE
\ No newline at end of file
--- a/applicationmanagement/server/src/amstorage.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,642 +0,0 @@
-/*
- * Copyright (c) 2000 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: Implementation of applicationmanagement components
- *
- */
-
-#include "amstorage.h"
-#include <centralrepository.h>
-#include "AMDeploymentComponent.h"
-#include "debug.h"
-#include <s32mem.h>
-#include "amprivateCRKeys.h"
-#include <s32file.h>
-#include <e32des8.h>
-#ifndef __SERIES60_30__
-#include "AMAppHideUtil.h"
-#endif
-
-using namespace NApplicationManagement;
-
-// CONSTANTS
-
-
-/***************************************************
- // RComponentIdArray
- ***************************************************/
-
-void RComponentIdArray::SetListL(const TDesC8& aChilds)
-    {
-#ifdef _DEBUG
-    HBufC *b = HBufC::NewLC(aChilds.Length() );
-    TPtr p(b->Des() );
-    p.Copy(aChilds);
-    RDEBUG_2( "RComponentIdArray::SetListL: Setting list from: '%S'", &p);
-    CleanupStack::PopAndDestroy(b);
-#endif
-
-    RDesReadStream buf(aChilds);
-    //TInt size( buf.Source()->TellL( MStreamBuf::ERead ).SizeL() );
-    TInt left(aChilds.Length() );
-    const TInt KSize(sizeof(TUint32));
-    while (left > 0)
-        {
-        TUint32 val(buf.ReadUint32L() );
-#ifdef _DEBUG
-        RDEBUG_2( "RComponentIdArray::SetListL: Appending id: '%d'", val);
-#endif
-        Append(val);
-        left -= KSize;
-        }
-    buf.Close();
-    }
-
-void RComponentIdArray::RemoveByValue(TUint32 aValue)
-    {
-    TInt ind(Find(aValue) );
-    Remove(ind);
-    }
-
-void RComponentIdArray::GetListLC(HBufC8 *&aChilds, TInt &aLength)
-    {
-    ASSERT( aChilds == NULL );
-    TInt c(Count() );
-    if (c > 0)
-        {
-        aLength = c * sizeof(TUint32);
-        aChilds = HBufC8::NewLC(aLength);
-        TPtr8 p(aChilds->Des() );
-        RDesWriteStream stream(p);
-        CleanupClosePushL(stream);
-        TInt i( 0);
-        do
-            {
-            stream.WriteUint32L(operator[](i) );
-            }
-        while ( ++i < c);
-        stream.CommitL();
-        CleanupStack::PopAndDestroy( &stream);
-        }
-    else
-        {
-        aChilds = KNullDesC8().AllocLC();
-        aLength = 0;
-        }
-    }
-
-/*	
- void TCertInfoPckg::ExternalizeL(RWriteStream& aStream) const
- {
- aStream << iId;
- TPckgBuf<TCertInfo>::ExternalizeL( aStream );
- }
-
- void TCertInfoPckg::InternalizeL(RReadStream& aStream)
- {
- 
- }
- */
-
-void RCertArray::ExternalizeL(RWriteStream& aStream) const
-    {
-    TInt c(Count() );
-    aStream.WriteInt32L(c);
-    for (TInt i( 0); i < c; i++)
-        {
-        aStream.WriteInt32L(i);
-        aStream << (*(operator[](i)));
-        }
-    }
-
-void RCertArray::InternalizeL(RReadStream& aStream)
-    {
-    TInt c(aStream.ReadInt32L() );
-    for (TInt i( 0); i < c; i++)
-        {
-        TCertInfoPckg *pkg = new ( ELeave ) TCertInfoPckg;
-        RDEBUG_2( "RCertArray::InternalizeL - allocated TCertInfoPckg 0x%X", reinterpret_cast<TUint>( pkg ) );
-        CleanupStack::PushL(pkg);
-        TInt idx(aStream.ReadInt32L() );
-        aStream >> (*pkg);
-        Append(pkg);
-        CleanupStack::Pop(pkg);
-        }
-    }
-
-TInt RCertArray::FindByValue(const TCertInfoPckg &aPckg)
-    {
-    TInt c(Count() );
-    for (TInt i( 0); i < c; i++)
-        {
-        if (operator[](i)->Compare(aPckg) == 0)
-            {
-            return i;
-            }
-        }
-    return KErrNotFound;
-    }
-
-/***************************************************
- // CDeliveryComponentStorage
- ***************************************************/
-
-CDeliveryComponentStorage::CDeliveryComponentStorage()
-    {
-
-    }
-
-void CDeliveryComponentStorage::ConstructL()
-    {
-#ifndef __SERIES60_30__
-    iHidder = CAMAppHideUtil::NewL();
-#endif
-    LoadCertsL();
-    TRAPD( erx, iRepository = CRepository::NewL ( KCRUidPrivateApplicationManagementKeys ) )
-    ;
-    if (erx != KErrNone)
-        {
-        RDEBUG_2( "CDeliveryComponentStorage::ConstructL() ERROR CentRep not initialized: Check deployment! %d", erx );
-        User::Leave(erx);
-        }
-    TInt err(iRepository->Get(KNextIdKey, iNextId) );
-    if (err == KErrNotFound)
-        {
-        iNextId = KMinIdValue;
-        User::LeaveIfError(iRepository->Create(KNextIdKey, iNextId) );
-        }
-    else
-        {
-        User::LeaveIfError(err);
-        }
-    LoadComponentsL();
-    }
-
-void CDeliveryComponentStorage::LoadCertsL()
-    {
-    RFs fs;
-    User::LeaveIfError(fs.Connect() );
-    CleanupClosePushL(fs);
-    TInt e(fs.CreatePrivatePath(KDefaultDrive) );
-
-    User::LeaveIfError(e);
-    TBuf<64> privatePath;
-    User::LeaveIfError(fs.PrivatePath(privatePath) );
-
-    TInt privPathLength(privatePath.Length() );
-    _LIT( KCertFile, "amcerts.dat");
-    HBufC *afile = HBufC::NewLC(privPathLength + KCertFile().Length());
-    *afile = privatePath;
-    afile->Des().Append(KCertFile);
-    RFileReadStream certFile;
-    TInt err(certFile.Open(fs, *afile, EFileRead) );
-    if (err == KErrNone)
-        {
-        CleanupClosePushL(certFile);
-        iCertificates.InternalizeL(certFile);
-        CleanupStack::PopAndDestroy( &certFile);
-        }
-    else
-        if (err == KErrNotFound)
-            {
-
-            }
-        else
-            {
-            User::Leave(err);
-            }
-    CleanupStack::PopAndDestroy(afile);
-    CleanupStack::PopAndDestroy( &fs);
-    }
-
-CDeliveryComponentStorage* CDeliveryComponentStorage::NewLC()
-    {
-    CDeliveryComponentStorage *self = new ( ELeave ) CDeliveryComponentStorage( );
-    CleanupStack::PushL(self) ;
-    self->ConstructL() ;
-    return self;
-    }
-
-CDeliveryComponentStorage* CDeliveryComponentStorage::NewL()
-    {
-    CDeliveryComponentStorage *self = NewLC();
-    CleanupStack::Pop(self) ;
-    return self;
-    }
-
-TInt CDeliveryComponentStorage::NextKey()
-    {
-    TInt oldNext(iNextId++);
-    iRepository->Set(KNextIdKey, iNextId);
-    return oldNext;
-    }
-
-CDeliveryComponentStorage::~CDeliveryComponentStorage()
-    {
-    RDEBUG_3( "CDeliveryComponentStorage::~CDeliveryComponentStorage 0x%X - 0x%X", reinterpret_cast<TUint>(this),
-            reinterpret_cast<TUint>(this)+sizeof( CDeliveryComponentStorage ) );
-    delete iRepository;
-    iRepository = NULL;
-    iComponents.ResetAndDestroy();
-    iComponentIds.Close();
-    TRAPD( err,CloseCertificatesL() )
-    ;
-    if (err != KErrNone)
-        {
-        RDEBUG_2( "CDeliveryComponentStorage::~CDeliveryComponentStorage: ERROR Failed to close certificate storage properly: %d", err);
-        }
-#ifndef __SERIES60_30__
-    delete iHidder;
-    iHidder = NULL;
-#endif
-    }
-
-void CDeliveryComponentStorage::CloseCertificatesL()
-    {
-    RFs fs;
-    User::LeaveIfError(fs.Connect() );
-    CleanupClosePushL(fs);
-    TInt e(fs.CreatePrivatePath(KDefaultDrive) );
-
-    User::LeaveIfError(e);
-    TBuf<64> privatePath;
-    User::LeaveIfError(fs.PrivatePath(privatePath) );
-
-    TInt privPathLength(privatePath.Length() );
-    _LIT( KCertFile, "amcerts.dat");
-    HBufC *afile = HBufC::NewLC(privPathLength + KCertFile().Length());
-    *afile = privatePath;
-    afile->Des().Append(KCertFile);
-    RFileWriteStream certFile;
-
-    TInt err(certFile.Replace(fs, *afile, EFileWrite) );
-    if (err == KErrNone)
-        {
-        CleanupClosePushL(certFile);
-        iCertificates.ExternalizeL(certFile);
-        CleanupStack::PopAndDestroy( &certFile);
-        }
-    else
-        if (err == KErrNotFound)
-            {
-
-            }
-        else
-            {
-            User::Leave(err);
-            }
-    CleanupStack::PopAndDestroy(afile);
-    CleanupStack::PopAndDestroy( &fs);
-    iCertificates.ResetAndDestroy();
-    }
-
-const RComponentIdArray &CDeliveryComponentStorage::GetComponentIds() const
-    {
-    return iComponentIds;
-    }
-
-void CDeliveryComponentStorage::GetStateChangeComponentIdsL(
-        RComponentIdArray &aArray)
-    {
-    RDEBUG_2( "CDeliveryComponentStorage::GetStateChangeComponentIdsL %d dcs", iComponentIds.Count());
-    aArray.Reset();
-    TInt c(iComponentIds.Count() );
-    for (TInt i( 0); i < c; i++)
-        {
-        CDeploymentComponent &compo = ComponentL(iComponentIds[i]);
-        if (compo.OldState() != EDCSNone)
-            {
-            aArray.Append(iComponentIds[i]);
-            }
-        }
-    RDEBUG( "CDeliveryComponentStorage::GetStateChangeComponentIdsL end");
-    }
-
-void CDeliveryComponentStorage::StateChangedL(TUint32 aInternalId)
-    {
-    RDEBUG_2( "CDeliveryComponentStorage::StateChangedL id %d", aInternalId);
-    CDeploymentComponent &compo = ComponentL(aInternalId);
-    compo.StateChangeComplete();
-    UpdateL(compo);
-    }
-
-void CDeliveryComponentStorage::LoadComponentsL()
-    {
-    TInt length( 0);
-    TInt err(iRepository->Get(KIdListLengthKey, length) );
-    if (err == KErrNotFound)
-        {
-        length = 0;
-        User::LeaveIfError(iRepository->Create(KIdListLengthKey, length) );
-        }
-    else
-        {
-        User::LeaveIfError(err);
-        }
-    HBufC8 *listbuf = HBufC8::NewLC(length) ;
-    TPtr8 ptr(listbuf->Des() );
-    err = iRepository->Get(KIdListKey, ptr) ;
-    if (err == KErrNotFound)
-        {
-        err = iRepository->Create(KIdListKey, KNullDesC8);
-        }
-    else
-        {
-
-        }
-    User::LeaveIfError(err);
-    TRAPD(code, iComponentIds.SetListL( ptr ))
-    ;
-    if (code != KErrEof)
-        {
-        User::LeaveIfError(code);
-        }
-
-    CleanupStack::PopAndDestroy(listbuf);
-#ifndef __SERIES60_30__
-    TInt i(iComponentIds.Count() );
-    //iHidder->Reset();
-    while ( --i >= 0)
-        {
-        CDeploymentComponent &comp = ComponentL(iComponentIds[i]);
-        if (comp.State() == EDCSInactive)
-            {
-            iHidder->AddUidL(comp.Uid());
-            }
-        else
-            if (comp.State() == EDCSActive)
-                {
-                iHidder->RemoveUidL(comp.Uid() );
-                }
-        }
-    iHidder->PersistUidsL();
-#endif
-
-    }
-
-CDeploymentComponent *CDeliveryComponentStorage::NewComponentL(
-        const TDeploymentComponentState &aState, const TDCUserId &aUserId,
-        const TCertInfo *aCertInfo/* = NULL */)
-    {
-    CDeploymentComponent *newc = CDeploymentComponent::NewLC(NextKey(),
-            aUserId);
-    if (aCertInfo != NULL)
-        {
-        TCertInfoPckg *p = new( ELeave ) TCertInfoPckg(*aCertInfo);
-        RDEBUG_2( "CDeliveryComponentStorage::NewComponentL - allocated TCertInfoPckg 0x%X", reinterpret_cast<TUint>( p ) );
-
-        TInt idx(iCertificates.FindByValue(*p) );
-        if (idx == KErrNotFound)
-            {
-            RDEBUG_2( "CDeliveryComponentStorage::NewComponentL - TCertInfoPckg NOT found 0x%X", reinterpret_cast<TUint>( p ) );
-            iCertificates.Append(p);
-            idx = iCertificates.Count() - 1;
-            }
-        else
-            {
-            RDEBUG_2( "CDeliveryComponentStorage::NewComponentL - TCertInfoPckg found at %d, deleting temporary", idx );
-            delete p;
-            p = NULL;
-            }
-        if (idx >= 0)
-            {
-            RDEBUG_2( "CDeliveryComponentStorage::NewComponentL - TCertInfoPckg found 0x%X", reinterpret_cast<TUint>( p ) );
-            newc->SetOwner(idx);
-            }
-        else
-            {
-            RDEBUG_3( "CDeliveryComponentStorage::NewComponentL - WARNING Could not add certificate 0x%X: %d", reinterpret_cast<TUint>( p ), idx );
-
-            }
-        }
-    newc->SetState(aState);
-    newc->SetStatusNode(EIdle);
-    UpdateL( *newc);
-    iComponents.Append(newc);
-    iComponentIds.Append(newc->InternalId() );
-RDEBUG_2( "CDeliveryComponentStorage::NewComponentL -Internal ID is  %d, ", newc->InternalId() );
-    PersistStateL();
-    CleanupStack::Pop(newc);
-    return newc;
-    }
-
-void CDeliveryComponentStorage::UpdateL(
-        const CDeploymentComponent &aComponent)
-    {
-    aComponent.PersistL( *iRepository) ;
-
-#ifndef __SERIES60_30__
-    if (aComponent.State() == EDCSInactive)
-        {
-        iHidder->AddUidL(aComponent.Uid(), ETrue);
-        }
-    else
-        {
-        iHidder->RemoveUidL(aComponent.Uid(), ETrue);
-        }
-#endif
-    }
-
-void CDeliveryComponentStorage::PersistStateL()
-    {
-    TInt length( 0);
-    HBufC8 *buf= NULL;
-    iComponentIds.GetListLC(buf, length);
-    User::LeaveIfError(iRepository->Set(KIdListLengthKey, length) );
-    User::LeaveIfError(iRepository->Set(KIdListKey, *buf) );
-    CleanupStack::PopAndDestroy(buf);
-    }
-
-void CDeliveryComponentStorage::RemoveL(TUint32 aInternalId)
-    {
-    RDEBUG_2("CDeliveryComponentStorage::RemoveL - Remove id: (%d)", aInternalId );
-    TInt count(iComponents.Count() );
-    for (TInt i( 0); i < count; i++)
-        {
-        CDeploymentComponent *el = iComponents[i];
-        if (aInternalId == el->iInternalId)
-            {
-#ifndef __SERIES60_30__
-            iHidder->RemoveUidL(el->Uid(), ETrue);
-#endif
-            iComponents.Remove(i);
-            iComponentIds.RemoveByValue(aInternalId);
-            el->DestroyL( *iRepository);
-            delete el;
-            RDEBUG_2("CDeliveryComponentStorage::RemoveL - Removed id: (%d)", aInternalId );
-            PersistStateL();
-            break;
-            }
-        }
-    }
-
-CDeploymentComponent &CDeliveryComponentStorage::ComponentL(
-        TUint32 aInternalId)
-    {
-    CDeploymentComponent *resp= NULL;
-    TInt count(iComponents.Count() );
-    for (TInt i( 0); i < count; i++)
-        {
-        CDeploymentComponent *el = iComponents[i];
-        if (aInternalId == el->iInternalId)
-            {
-            resp = el;
-            break;
-            }
-        }
-    if (resp == NULL)
-        {
-        TBuf8< NCentralRepositoryConstants::KMaxBinaryLength> buf;
-        TInt err(iRepository->Get(aInternalId, buf) );
-        User::LeaveIfError(err) ;
-        resp = LoadComponentL(aInternalId, buf) ;
-        iComponents.Append(resp);
-        }
-    if (resp == NULL)
-        {
-        User::Leave(KErrNotFound);
-        }
-    return *resp;
-    }
-
-CDeploymentComponent *CDeliveryComponentStorage::LoadComponentL(
-        TInt aInternalId, const TDesC8 &aBuffer) const
-    {
-    CDeploymentComponent *res = CDeploymentComponent::LoadL(aInternalId,
-            aBuffer);
-#ifdef _DEBUG
-    if (res)
-        {
-        RDEBUG8_4( "CDeliveryComponentStorage::LoadComponentL - loaded component state %d, internalid %d, and userid: %S", res->State(), res->InternalId(),&res->UserId() );
-        }
-    else
-        {
-        RDEBUG( "CDeliveryComponentStorage::LoadComponentL - WARNING failed to load component" );
-        }
-#endif
-    return res;
-    }
-void CDeliveryComponentStorage::CheckForDuplicateNodesInDeployedL(
-        CDeploymentComponent &aComponent)
-    {
-    TInt CompIdsCount(iComponentIds.Count() );
-    RDEBUG8_2("CheckForDuplicateNodesInDeployedL: CompIdsCount-> (%d)", CompIdsCount );
-    RDEBUG8_2("CheckForDuplicateNodesInDeployedL: aComponent UserID is %S", &(aComponent.UserId()));
-    for (TInt i( 0); i < CompIdsCount; i++)
-        {
-        CDeploymentComponent &compo = ComponentL(iComponentIds[i]);
-        RDEBUG8_2("CheckForDuplicateNodesInDeployedL: compo UserID is %S", &(compo.UserId()));
-        if (&aComponent != &compo)
-        {
-        if (((compo.State()== EDCSActive) || (compo.State()== EDCSInactive))
-                &&(compo.UserId() == aComponent.UserId()))
-            {
-            (aComponent.iUserId).Append(*IntToDes8LC(aComponent.iInternalId));
-            CleanupStack::PopAndDestroy();
-            break;
-            }
-          }
-        }
-    }
-
-HBufC8* CDeliveryComponentStorage::IntToDes8LC(const TInt aLuid)
-    {
-    HBufC8* buf = HBufC8::NewLC( 10); //10 = max length of 32bit integer
-    TPtr8 ptrBuf = buf->Des();
-    ptrBuf.Num(aLuid);
-    return buf;
-    }
-
-void CDeliveryComponentStorage::InstalledL(CDeploymentComponent &aComponent)
-    {
-    CheckForDuplicateNodesInDeployedL(aComponent);
-    aComponent.SetState(EDCSActive);
-    // set state to IDLE 
-    aComponent.SetStatusNode(EIdle);
-    UpdateL(aComponent);
-    }
-
-void CDeliveryComponentStorage::DeactivateL(CDeploymentComponent &aComponent)
-    {
-    /* :
-     * set state to InActivate in progress
-     * use TRAP instead of leaving.
-     */
-    aComponent.SetStatusNode(EDeployed_DeactivateProgress);
-    //User::LeaveIfError(aComponent.SetState(EDCSInactive) );
-    TInt err = aComponent.SetState(EDCSInactive);
-    if (err == KErrNone)
-        {
-        TRAP(err,UpdateL(aComponent));
-        }
-    //UpdateL(aComponent);
-    /*:
-     * if error set state to InActivate failed or else set to Idle
-     * call userleaveiferror()
-     */
-    if (err == KErrNone)
-        {
-        aComponent.SetStatusNode(EIdle);
-        }
-    else
-        {
-        aComponent.SetStatusNode(EDeployed_DeactivateFailed);
-        }
-    User::LeaveIfError(err);
-    }
-
-void CDeliveryComponentStorage::SetDeploymentComponentState(CDeploymentComponent &aComponent,TDeploymentComponentState aState)
-    {
-    aComponent.SetState( aState );
-    TRAP_IGNORE(UpdateL( aComponent ));    
-    }
-
-void CDeliveryComponentStorage::ActivateL(CDeploymentComponent &aComponent)
-    {
-    /* :
-     * set state to Activate in progress
-     * use TRAP instead of leaving.
-     */
-    aComponent.SetStatusNode(EDeployed_ActivateProgress);
-    TInt err = aComponent.SetState(EDCSActive);
-    //UpdateL( aComponent );
-    if (err == KErrNone)
-        {
-        TRAP(err,UpdateL(aComponent));
-        }
-    /*:
-     * if error set state to InActivate failed or else set to Idle
-     * call userleaveiferror()
-     */
-    if (err == KErrNone)
-        {
-        aComponent.SetStatusNode(EIdle);
-        }
-    else
-        {
-        aComponent.SetStatusNode(EDeployed_ActivateFailed);
-        }
-    User::LeaveIfError(err);
-    }
-
-/*void CDeliveryComponentStorage::UninstalledL( CDeploymentComponent &aComponent )
- {
- aComponent.SetState( EDCSInactive );
- UpdateL( aComponent );
- }
- 
- void CDeliveryComponentStorage::ResetL()
- {
- }
- */
-//  End of File
--- a/applicationmanagement/server/src/nsmldmiapmatcher.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,202 +0,0 @@
-/*
- * 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:  DM Tree module
- *
- */
-
-#include "nsmldmiapmatcher.h"
-
-#include <utf.h>
-#include <smldmadapter.h>
-
-// -----------------------------------------------------------------------------
-// CNSmlDMIAPMatcher* CNSmlDMIAPMatcher::NewL( MSmlDmCallback* aDmCallback )
-// -----------------------------------------------------------------------------
-CNSmlDMIAPMatcher* CNSmlDMIAPMatcher::NewL(MSmlDmCallback* aDmCallback)
-    {
-    CNSmlDMIAPMatcher* self = CNSmlDMIAPMatcher::NewLC(aDmCallback);
-    CleanupStack::Pop();
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMIAPMatcher* CNSmlDMIAPMatcher::NewLC( MSmlDmCallback* aDmCallback )
-// -----------------------------------------------------------------------------
-CNSmlDMIAPMatcher* CNSmlDMIAPMatcher::NewLC(MSmlDmCallback* aDmCallback)
-    {
-    CNSmlDMIAPMatcher* self = new( ELeave ) CNSmlDMIAPMatcher;
-    CleanupStack::PushL(self);
-    self->ConstructL(aDmCallback);
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// void CNSmlDMIAPMatcher::ConstructL( MSmlDmCallback* aDmCallback )
-// -----------------------------------------------------------------------------
-void CNSmlDMIAPMatcher::ConstructL(MSmlDmCallback* aDmCallback)
-    {
-    iCallback = aDmCallback;
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMIAPMatcher::~CNSmlDMIAPMatcher()
-// -----------------------------------------------------------------------------
-CNSmlDMIAPMatcher::~CNSmlDMIAPMatcher()
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// TInt CNSmlDMIAPMatcher::IAPIdFromURIL( const TDesC8& aURI )
-// -----------------------------------------------------------------------------
-TInt CNSmlDMIAPMatcher::IAPIdFromURIL(const TDesC8& aURI)
-    {
-    TInt iapId(KErrNotFound);
-
-    MSmlDmAdapter::TError status;
-    CBufBase* allIAPs = CBufFlat::NewL(16);
-    CleanupStack::PushL(allIAPs);
-    iCallback->FetchLinkL(KNSmlDMIAPUri, *allIAPs, status);
-    TPtrC8 uri = RemoveDotSlash(aURI);
-
-    if (status == MSmlDmAdapter::EOk && uri.Find(KNSmlDMIAPUri) == 0
-            && allIAPs->Ptr(0).Find(LastURISeg(uri))>=0)
-        {
-        HBufC8* luid = iCallback->GetLuidAllocL(uri);
-
-        if (luid->Length() )
-            {
-            iapId = DesToInt(*luid);
-            }
-        delete luid;
-        }
-
-    CleanupStack::PopAndDestroy(allIAPs);
-
-    return iapId;
-    }
-
-// -----------------------------------------------------------------------------
-// HBufC8* CNSmlDMIAPMatcher::URIFromIAPIdL( TInt aIAPId )
-// -----------------------------------------------------------------------------
-HBufC8* CNSmlDMIAPMatcher::URIFromIAPIdL(TInt aIAPId)
-    {
-    CBufBase *allIAPs = CBufFlat::NewL(16);
-    CleanupStack::PushL(allIAPs);
-    MSmlDmAdapter::TError status;
-
-    iCallback->FetchLinkL(KNSmlDMIAPUri, *allIAPs, status);
-
-    if (status == MSmlDmAdapter::EOk)
-        {
-        TInt index(0);
-        TInt segStart(0);
-
-        while (index != KErrNotFound)
-            {
-            TPtrC8 allIAPsptr = allIAPs->Ptr(segStart).Mid(0);
-            index = allIAPsptr.Locate('/');
-            HBufC8* uriSeg = 0;
-
-            if (index == KErrNotFound)
-                {
-                TPtrC8 uriSeg8Ptr = allIAPs->Ptr(segStart);
-                uriSeg = uriSeg8Ptr.AllocLC();
-                }
-            else
-                {
-                TPtrC8 uriSeg8Ptr = allIAPs->Ptr(segStart).Mid( 0, index);
-                uriSeg = uriSeg8Ptr.AllocLC();
-                }
-
-            HBufC8* uri = HBufC8::NewLC(KNSmlDMIAPUri().Length() + 1 + uriSeg->Length() );
-
-            TPtr8 uriPtr = uri->Des();
-            uriPtr.Format(KNSmlDMIAPUri);
-            uriPtr.Append(KNSmlDMSeparator8);
-            uriPtr.Append( *uriSeg);
-            HBufC8* luid = iCallback->GetLuidAllocL(uriPtr);
-            CleanupStack::PushL(luid);
-
-            if (luid->Length() > 0)
-                {
-                TInt iapId = DesToInt(luid->Des());
-                if (iapId == aIAPId)
-                    {
-                    CleanupStack::PopAndDestroy(); //luid
-                    CleanupStack::Pop(); //uri
-                    CleanupStack::PopAndDestroy(2); //uriSeg, allIAPs
-                    return uri;
-                    }
-                }
-            CleanupStack::PopAndDestroy(3); // luid, uri, uriSeg
-
-            segStart += index + 1;
-            }
-        }
-
-    CleanupStack::PopAndDestroy(); // allIAPs
-
-    return 0;
-    }
-
-// -----------------------------------------------------------------------------
-// TInt CNSmlDMIAPMatcher::DesToInt(const TDesC& aLuid)
-// -----------------------------------------------------------------------------
-TInt CNSmlDMIAPMatcher::DesToInt(const TDesC8& aLuid) const
-    {
-    TLex8 lex(aLuid);
-    TInt value = 0;
-    lex.Val(value);
-    return value;
-    }
-
-// -----------------------------------------------------------------------------
-// TPtrC8 CNSmlDMIAPMatcher::RemoveDotSlash(const TDesC8& aURI) const
-// -----------------------------------------------------------------------------
-TPtrC8 CNSmlDMIAPMatcher::RemoveDotSlash(const TDesC8& aURI) const
-    {
-    if (aURI.Find(KNSmlDMIAPUriDotSlash)==0)
-        {
-        return aURI.Right(aURI.Length()-KNSmlDMIAPUriDotSlash().Length() );
-        }
-    else
-        {
-        return aURI;
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMIAPMatcher::TPtrC8 LastURISeg(const TDesC8& aURI)
-// Returns only the last uri segemnt
-// -----------------------------------------------------------------------------
-TPtrC8 CNSmlDMIAPMatcher::LastURISeg(const TDesC8& aURI) const
-    {
-    TInt i;
-    for (i=aURI.Length()-1; i>=0; i--)
-        {
-        if (aURI[i]==KNSmlDMSlash)
-            {
-            break;
-            }
-        }
-    if (i==0)
-        {
-        return aURI;
-        }
-    else
-        {
-        return aURI.Mid(i+1);
-        }
-    }
-
--- a/applicationmanagement/server/src/nsmldmuri.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,207 +0,0 @@
-/*
- * Copyright (c) 2002 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:  DM tree etc.
- *
- */
-
-#include "nsmldmuri.h"
-
-// ------------------------------------------------------------------------------------------------
-//  NSmlDmURI
-// ------------------------------------------------------------------------------------------------
-
-
-// ------------------------------------------------------------------------------------------------
-// TPtrC8 NSmlDmURI::ParentURI(const TDesC8& aURI)
-// returns parent uri, i.e. removes last uri segment
-// ------------------------------------------------------------------------------------------------
-TPtrC8 NSmlDmURI::ParentURI(const TDesC8& aURI)
-    {
-    TBool onlyOneSeg = ETrue;
-    TInt i;
-    for (i=aURI.Length()-1; i>=0; i--)
-        {
-        if (aURI[i]==KNSmlDMUriSeparator)
-            {
-            onlyOneSeg = EFalse;
-            break;
-            }
-        }
-    if (onlyOneSeg)
-        {
-        return KNSmlDmRootUri();
-        }
-    else
-        {
-        return aURI.Left(i);
-        }
-    }
-
-// ------------------------------------------------------------------------------------------------
-// TPtrC8 NSmlDmURI::LastURISeg(const TDesC8& aURI)
-// Returns only the last uri segemnt
-// ------------------------------------------------------------------------------------------------
-TPtrC8 NSmlDmURI::LastURISeg(const TDesC8& aURI)
-    {
-    TInt i;
-    for (i=aURI.Length()-1; i>=0; i--)
-        {
-        if (aURI[i]==KNSmlDMUriSeparator)
-            {
-            break;
-            }
-        }
-    if (i==0)
-        {
-        return aURI;
-        }
-    else
-        {
-        return aURI.Mid(i+1);
-        }
-    }
-
-// ------------------------------------------------------------------------------------------------
-// TPtrC8 NSmlDmURI::RemoveDotSlash(const TDesC8& aURI)
-// return uri without dot and slash in start
-// ------------------------------------------------------------------------------------------------
-TPtrC8 NSmlDmURI::RemoveDotSlash(const TDesC8& aURI)
-    {
-
-    TInt offset = 0;
-    TInt endSlash = 0;
-
-    if (aURI.Find(KNSmlDmUriDotSlash)==0)
-        {
-        offset = 2;
-        }
-    else
-        {
-        return aURI;
-        }
-
-    if (aURI.Length()>2&&aURI[aURI.Length()-1]==KNSmlDMUriSeparator)
-        {
-        endSlash = 1;
-        }
-
-    return aURI.Mid(offset, aURI.Length()-endSlash-offset);
-    }
-
-// ------------------------------------------------------------------------------------------------
-// TPtrC8 NSmlDmURI::RemoveProp(const TDesC8& aURI)
-// removes property from the uri
-// ------------------------------------------------------------------------------------------------
-TPtrC8 NSmlDmURI::RemoveProp(const TDesC8& aURI)
-    {
-    TInt offset = aURI.Find(KNSmlDmQuestionMark);
-    if (offset!=KErrNotFound)
-        {
-        return aURI.Left(offset);
-        }
-    return aURI;
-    }
-
-// ------------------------------------------------------------------------------------------------
-// TPtrC8 NSmlDmURI::RemoveLastSeg(const TDesC8& aURI)
-// Removes last uri segment
-// ------------------------------------------------------------------------------------------------
-TPtrC8 NSmlDmURI::RemoveLastSeg(const TDesC8& aURI)
-    {
-    TInt i;
-    for (i=aURI.Length()-1; i>=0; i--)
-        {
-        if (aURI[i]==KNSmlDMUriSeparator)
-            {
-            break;
-            }
-        }
-
-    if (i>0)
-        {
-        return aURI.Left(i);
-        }
-    else
-        {
-        return KNullDesC8();
-        }
-    }
-
-// ------------------------------------------------------------------------------------------------
-// TPtrC8 NSmlDmURI::URISeg(const TDesC8& aURI,TInt aLocation,TInt aSegCount=1)
-// Returns the aLocation:th URI segment
-// ------------------------------------------------------------------------------------------------
-TPtrC8 NSmlDmURI::URISeg(const TDesC8& aURI, TInt aLocation, TInt aSegCount/*=1*/)
-    {
-    TInt i, start;
-    if (aLocation < 0)
-        {
-        return aURI.Mid(0, 0);
-        }
-    if (aLocation > 0)
-        {
-        for (start=0, i=0; (start<aURI.Length()) && (i<aLocation); start++)
-            {
-            if (aURI[start]=='/')
-                {
-                i++;
-                }
-            if (i==aLocation)
-                {
-                break;
-                }
-            }
-        }
-    else
-        {
-        start=-1;
-        }
-    // empty segment
-    if (start+1 >= aURI.Length())
-        {
-        return aURI.Mid(0, 0);
-        }
-    // start points to beginning of segment
-    for (i=start+1; i<aURI.Length(); i++)
-        {
-        if (aURI[i]=='/')
-            {
-            aSegCount--;
-            if (aSegCount == 0)
-                {
-                break;
-                }
-            }
-        }
-    // i points to end of segment   
-    return aURI.Mid(start+1, i-start-1);
-    }
-
-// ------------------------------------------------------------------------------------------------
-// TInt NSmlDmURI::NumOfURISegs(const TDesC8& aURI)
-// Returns the num of uri segs
-// ------------------------------------------------------------------------------------------------
-TInt NSmlDmURI::NumOfURISegs(const TDesC8& aURI)
-    {
-    TInt numOfURISegs = 1;
-    for (TInt i=0; i<aURI.Length(); i++)
-        {
-        if (aURI[i]==KNSmlDMUriSeparator)
-            {
-            numOfURISegs++;
-            }
-        }
-    return numOfURISegs;
-    }
-
--- a/applicationmanagement/tsrc/tarmappmng/BWINS/amtestu.def	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	?LibEntryL@@YAPAVCScriptBase@@AAVCTestModuleIf@@@Z @ 1 NONAME ; class CScriptBase * LibEntryL(class CTestModuleIf &)
-
--- a/applicationmanagement/tsrc/tarmappmng/conf/amtest.cfg	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,120 +0,0 @@
-[StifSettings]
-CapsModifier= example.exe
-[EndStifSettings]
-
-[Test]
-title DDF
-create amtest foobar
-foobar DDFStructure
-delete foobar
-[Endtest] 
-
-[Test]
-title List
-create amtest foobar
-foobar List 
-delete foobar
-[Endtest] 
-
-
-[Test]
-title ListAndDetail
-create amtest foobar
-foobar Details 
-delete foobar
-[Endtest] 
-
-[Test]
-title FetchDelivered
-create amtest foobar
-foobar FetchNode SCM/Inventory/Delivered
-delete foobar
-[Endtest] 
-
-[Test]
-title FetchDeployed
-create amtest foobar
-foobar FetchNode SCM/Inventory/Deployed
-delete foobar
-[Endtest]
-
-[Test]
-title Deliver
-create amtest foobar
-foobar Deliver Id1 Nimi Version E:\Testing\Data\testhbuf_S60_3_X_v_1_0_0.SISx E:\Testing\Data\verysilent_c_en.xml
-delete foobar
-[Endtest] 
-
-[Test]
-title AddNode
-create amtest foobar
-foobar AddNode SCM/Inventory/Delivered/AppTestNode
-foobar AddNode SCM/Inventory/Delivered/AppTest123
-delete foobar
-[Endtest]
-
-[Test]
-title FetchLeaf
-create amtest foobar
-foobar FetchLeaf SCM/Inventory/Delivered/AppTestNode/Name E:\Testing\Data\LeafResults.txt
-delete foobar
-[Endtest]
-
-[Test]
-title AddUpdateFetchNode
-create amtest foobar
-foobar AddNode SCM/Download/AMDownloadNode3
-foobar FetchLeafObjectSizeL SCM/Download/AMDownloadNode/ID E:\Testing\Data\LeafResults.txt
-foobar FetchLeafObjectSizeL SCM/Download/AMDownloadNode/Name E:\Testing\Data\LeafResults.txt
-delete foobar
-[Endtest]
-
-
-[Test]
-title DeleteNode
-create amtest foobar
-foobar DeleteNode SCM/Inventory/Delivered/AppTest123
-delete foobar
-[Endtest]
-
-
-[Test]
-title StartAtomic
-create amtest foobar
-foobar StartAtomic
-delete foobar
-[Endtest]
-
-[Test]
-title CommitAtomic
-create amtest foobar
-foobar CommitAtomic
-delete foobar
-[Endtest]
-
-
-#[Test]
-#title Install
-#create amtest foobar
-#foobar Install 20
-#delete foobar
-#[Endtest] 
-
-[Test]
-title BareInstall
-create amtest foobar
-foobar BareInstall E:\Testing\Data\bare.sisx
-delete foobar
-[Endtest] 
-
-[Test]
-title DeliverApp
-create amtest foobar
-foobar AddNode SCM/Inventory/Delivered/TestApp5
-foobar UpdateLeaf SCM/Inventory/Delivered/TestApp5/Name Test
-foobar UpdateLeaf SCM/Inventory/Delivered/TestApp5/Version 1.0
-foobar UpdateLeaf SCM/Inventory/Delivered/TestApp5/InstallOpts E:\Testing\Data\TestFramework\verysilent_c_en.xml text/xml
-foobar UpdateLeaf SCM/Inventory/Delivered/TestApp5/Data E:\Testing\Data\TestFramework\testhbuf_S60_3_X_v_1_0_0.SISx
-foobar Execute SCM/Inventory/Delivered/TestApp5/Operations/InstallAndActivate
-delete foobar
-[Endtest]
\ No newline at end of file
Binary file applicationmanagement/tsrc/tarmappmng/data/dmtestmappings.txt has changed
Binary file applicationmanagement/tsrc/tarmappmng/data/testhbuf_S60_3_X_v_1_0_0.SISx has changed
--- a/applicationmanagement/tsrc/tarmappmng/data/verysilent_c_en.xml	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-<InstOpts>
- <StdOpt name="drive" value="c"/> 
- <StdOpt name="lang" value="EN" /> 
- <StdOpt name="upgrade" value="yes"/>
- <StdOpt name="kill" value="yes"/> 
- <StdSymOpt name="pkginfo" value="yes"/> 
- <StdSymOpt name="optionals" value="yes"/>
- <StdSymOpt name="ocsp" value="yes"/>
- <StdSymOpt name="capabilities" value="yes"/>  
- <StdSymOpt name="untrusted" value="yes"/> 
- <StdSymOpt name="ignoreocspwarn" value="yes"/>
- <StdSymOpt name="ignorewarn" value="no"/>
- <StdSymOpt name="fileoverwrite" value="yes"/> 
-</InstOpts>
\ No newline at end of file
--- a/applicationmanagement/tsrc/tarmappmng/eabi/amtestu.def	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-EXPORTS
-	_Z9LibEntryLR13CTestModuleIf @ 1 NONAME
-	_ZTI7Camtest @ 2 NONAME ; #<TI>#
-	_ZTV7Camtest @ 3 NONAME ; #<VT>#
-	_ZTI16CTestDmDDFObject @ 4 NONAME ; #<TI>#
-	_ZTI8Cdmatest @ 5 NONAME ; #<TI>#
-	_ZTV16CTestDmDDFObject @ 6 NONAME ; #<VT>#
-	_ZTV8Cdmatest @ 7 NONAME ; #<VT>#
-
--- a/applicationmanagement/tsrc/tarmappmng/group/amtest.mmp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +0,0 @@
-/*
-* Copyright (c) 2002 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: Implementation of applicationmanagement components
-*
-*/
-
-
-// To get the APP_LAYER_SYSTEMINCLUDE-definition
-#include <platform_paths.hrh>
-
-TARGET          amtest.dll
-TARGETTYPE      dll
-UID             0x1000008D 0x101FB3E3
-CAPABILITY      ALL -TCB
-
-//TARGETPATH    
-DEFFILE         amtest.def
-
-SOURCEPATH      ../src
-SOURCE          dmatest.cpp
-SOURCE          TestDmDDFObject.cpp
-SOURCE          amtest.cpp
-SOURCE          amtestBlocks.cpp
-
-USERINCLUDE     ../inc 
-USERINCLUDE     ../../../inc
-
-
-APP_LAYER_SYSTEMINCLUDE
-SYSTEMINCLUDE   /epoc32/include 
-
-SYSTEMINCLUDE 	/epoc32/include/ecom
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-SYSTEMINCLUDE 	/epoc32/include/devman
-#else
-// nothing
-#endif
-
-LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib 
-LIBRARY					ApplicationManagement.lib
-LIBRARY         efsrv.lib 
-LIBRARY         SWInstCli.lib
-LIBRARY					ecom.lib
-LIBRARY         apgrfx.lib
-LIBRARY         apmime.lib
-LIBRARY         estor.lib 
-
-LANG			      SC
-
-
-
-SMPSAFE
-// End of File
-
--- a/applicationmanagement/tsrc/tarmappmng/group/amtest.pkg	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +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 "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:  Package file for project Advance Device Management, Application Management component.
-;File: amtest.pkg;
-;File: amtest.pkg;
-;
-
-
-;*Languages
-&EN
-;
-;*Standard SIS file header. This section specifies the package name,
-;application UID, and version/build numbers. Add the package TYPE here if needed.
-#{"amtest"},(0x101FB3E3),1,0,1;
-;
-
-;*Unique (Non-Localised) Vendor name
-;This is used in combination with signing to prevent the unauthroized
-;upgrade ofa a package by someone other than the rightful vendor.
-:"Nokia"
-
-;*Localized Vendor Name
-;This specifies the localised vendor name(s) correspodning to language(s).
-%{"Nokia Test EN"}
-
-;*Files To Copy...<src> <destination>
-"\epoc32\release\armv5\urel\amtest.dll" -"C:\sys\bin\amtest.dll"
-"..\conf\amtest.cfg" -"C:\TestFramework\amtest.cfg"
-"..\init\amtest.ini" -"C:\TestFramework\amtest.ini"
-"..\data\dmtestmappings.txt" -"E:\Testing\Data\dmtestmappings.txt"
-"..\data\testhbuf_S60_3_X_v_1_0_0.SISx" -"E:\Testing\Data\testhbuf_S60_3_X_v_1_0_0.SISx"
-"..\data\verysilent_c_en.xml" -"E:\Testing\Data\verysilent_c_en.xml"
--- a/applicationmanagement/tsrc/tarmappmng/group/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-/*
-* Copyright (c) 2002 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: Implementation of applicationmanagement components
-*
-*/
-
-
-
-PRJ_PLATFORMS
-// specify the platforms your component needs to be built for here
-// defaults to WINS MARM so you can ignore this if you just build these
-DEFAULT
-
-PRJ_TESTEXPORTS
-// NOTE: If using ARS requirements all export operations should be done under this.
-// 'abld test export'
-
-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
-
-
-PRJ_MMPFILES
-// Specify the .mmp files required for building the important component
-// releasables.
-//
-// Specify "tidy" if the component you need to build doesn't need to be
-// released. Specify "ignore" if the MMP file exists but should be
-// ignored.
-
-
-PRJ_TESTMMPFILES
-// NOTE: If using ARS requirements .mmp file operation should be done under this.
-// 'abld test build'
-
-amtest.mmp
-
-//  End of File
--- a/applicationmanagement/tsrc/tarmappmng/inc/TestDmDDFObject.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,199 +0,0 @@
-/*
-* Copyright (c) 2002-2004 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: Implementation of applicationmanagement components
-*
-*/
-
-
-
-#ifndef __TESTDMDDFOBJECT_H
-#define __TESTDMDDFOBJECT_H
-
-//  INCLUDES
-//#include <?include_file>
-#include <smldmadapter.h>
-
-// CONSTANTS
-//const ?type ?constant_var = ?constant;
-
-// MACROS
-//#define ?macro ?macro_def
-
-// DATA TYPES
-//enum ?declaration
-//typedef ?declaration
-//extern ?data_type;
-
-// FUNCTION PROTOTYPES
-//?type ?function_name(?arg_list);
-
-// FORWARD DECLARATIONS
-class CStifLogger;
-
-// CLASS DECLARATION
-
-/**
-*  ?one_line_short_description.
-*  ?other_description_lines
-*
-*  @lib ?library
-*  @since Series ?XX ?SeriesXX_version
-*/
-class CTestDmDDFObject : public CBase, public MSmlDmDDFObject
-    {
-    public:  // Constructors and destructor
-        
-        /**
-        * Two-phased constructor.
-        */
-        static CTestDmDDFObject* NewL( CStifLogger *aLog );
-        static CTestDmDDFObject* NewLC( CStifLogger *aLog );
-        
-        /**
-        * Destructor.
-        */
-        virtual ~CTestDmDDFObject();
-
-    public: // New functions
-        
-        /**
-        * ?member_description.
-        * @since Series ?XX ?SeriesXX_version
-        * @param ?arg1 ?description
-        * @return ?description
-        */
-        //?type ?member_function( ?type ?arg1 );
-
-		virtual void SetNameL( const TDesC8& aName );
-		
-		void DumpL( const TDesC8& aParentName, TBool aFullDump = ETrue );
-		void ExternalizeL(RWriteStream& aStream) const;
-		
-		
-
-    public: // Functions from base classes
-    
-//sf-    *********************************
-    
-		void SetAccessTypesL( TSmlDmAccessTypes aAccessTypes );
-		void SetDefaultValueL( const TDesC8& aDefaultValue );
-		void SetDescriptionL( const TDesC8& aDescription );
-		void SetDFFormatL( TDFFormat aFormat );
-		void SetOccurenceL( TOccurence aOccurence );
-		void SetScopeL( TScope aScope );
-		void SetDFTitleL( const TDesC8& aTitle );
-		void AddDFTypeMimeTypeL( const TDesC8& aMimeType );
-		void SetAsObjectGroup();
-		MSmlDmDDFObject& AddChildObjectL(const TDesC8& aNodeName);
-		MSmlDmDDFObject& AddChildObjectGroupL();
-
-//sf-    #############################
-
-		const TDesC8& Name();
-		TSmlDmAccessTypes  AccessTypes();
-		const TDesC8& DefaultValue();
-		const TDesC8& Description();
-		TDFFormat DFFormat();
-		TOccurence Occurence();
-		TScope Scope();
-		const TDesC8& DFTitle();
-		const TDesC8& DFTypeMimeType();
-		TBool ObjectGroup();
-		
-		TInt ChildObjectCount();
-		CTestDmDDFObject& ChildObject( TInt aIndex );
-
-		CTestDmDDFObject* FindChildObject( const TDesC8& aName );
-		TInt SubObjectsCount();
-
-
-    protected:  // New functions
-        
-        /**
-        * ?member_description.
-        * @since Series ?XX ?SeriesXX_version
-        * @param ?arg1 ?description
-        * @return ?description
-        */
-        //?type ?member_function( ?type ?arg1 );
-
-    protected:  // Functions from base classes
-        
-        /**
-        * From ?base_class ?member_description
-        */
-        //?type ?member_function();
-
-    private:
-
-        /**
-        * C++ default constructor.
-        */
-        CTestDmDDFObject( CStifLogger *aLog );
-
-        /**
-        * By default Symbian 2nd phase constructor is private.
-        */
-        void ConstructL();
-
-        // Prohibit copy constructor if not deriving from CBase.
-        // CTestDmDDFObject( const CTestDmDDFObject& );
-        // Prohibit assigment operator if not deriving from CBase.
-        // CTestDmDDFObject& operator=( const CTestDmDDFObject& );
-
-    public:     // Data
-        // ?one_line_short_description_of_data
-        //?data_declaration;
-    
-    protected:  // Data
-        // ?one_line_short_description_of_data
-        //?data_declaration;
-
-    private:    // Data
-        // ?one_line_short_description_of_data
-        //?data_declaration;
-		HBufC8* iName;
-
-		TSmlDmAccessTypes iAccessTypes;
-		HBufC8* iDefaultValue;
-		HBufC8* iDescription;
-		TDFFormat iFormat;
-		TOccurence iOccurence;
-		TScope iScope;
-		HBufC8* iTitle;
-		HBufC8* iMimeType;
-		TBool iObjectGroup;
-		
-		RPointerArray<CTestDmDDFObject> iChildren;
-
-         
-        // Reserved pointer for future extension
-        //TAny* iReserved;
-
-    public:     // Friend classes
-        //?friend_class_declaration;
-    protected:  // Friend classes
-        //?friend_class_declaration;
-    private:    // Friend classes
-        //?friend_class_declaration;
-        /**
-        * Logger.
-        */
-        CStifLogger*    iLog;
-
-    };
-
-#endif      // __TESTDMDDFOBJECT_H
-            
-// End of File
--- a/applicationmanagement/tsrc/tarmappmng/inc/amtest.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,130 +0,0 @@
-/*
-* Copyright (c) 2002 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: Implementation of applicationmanagement components
-*
-*/
-
-
-
-#ifndef AMTEST_H
-#define AMTEST_H
-
-//  INCLUDES
-#include <StifLogger.h>
-#include <TestScripterInternal.h>
-#include <StifTestModule.h>
-#include <smldmadapter.h>
-#include "dmatest.h"
-
-const TUint KNSmlDMAMAdapterImplUid = 0x10207845;
-
-	
-
-const TUid KAdapterUid = 
-		{
-		KNSmlDMAMAdapterImplUid
-		};
-// Logging path
-_LIT( KamtestLogPath, "\\logs\\testframework\\amtest\\" ); 
-// Log file
-_LIT( KamtestLogFile, "amtest.txt" ); 
-
-
-// FORWARD DECLARATIONS
-class Camtest;
-
-
-// CLASS DECLARATION
-
-/**
-*  Camtest test class for STIF Test Framework TestScripter.
-*  ?other_description_lines
-*
-*  @lib ?library
-*  @since ?Series60_version
-*/
-class Camtest : public Cdmatest
-    {
-    public:  // Constructors and destructor
-        
-        /**
-        * Two-phased constructor.
-        */
-        static Camtest* NewL( CTestModuleIf& aTestModuleIf );
-        
-        /**
-        * Destructor.
-        */
-        virtual ~Camtest();
-
-    public: // Functions from base classes
-
-        /**
-        * From CScriptBase Runs a script line.
-        * @since ?Series60_version
-        * @param aItem Script line containing method name and parameters
-        * @return Symbian OS error code
-        */
-        virtual TInt RunMethodL( CStifItemParser& aItem );
-                
-
-    private:
-
-        /**
-        * C++ default constructor.
-        */
-        Camtest( CTestModuleIf& aTestModuleIf );
-
-        /**
-        * By default Symbian 2nd phase constructor is private.
-        */
-        void ConstructL();
-
-        // Prohibit copy constructor if not deriving from CBase.
-        // ?classname( const ?classname& );
-        // Prohibit assigment operator if not deriving from CBase.
-        // ?classname& operator=( const ?classname& );
-    
-        /**
-        * Frees all resources allocated from test methods.
-        * @since ?Series60_version
-        */
-        virtual void Delete();
-        
-        /**
-        * Test methods are listed below. 
-        */
-        
-        /**
-        * Example test method.
-        * @since ?Series60_version
-        * @param aItem Script line containing parameters.
-        * @return Symbian OS error code.
-        */
-        virtual TInt ExampleL( CStifItemParser& aItem ) ;
-        virtual TInt DeliverL( CStifItemParser& aItem ) ;
-        virtual TInt DetailsL( CStifItemParser& aItem ) ;
-		virtual TInt InstallL( CStifItemParser& aItem ) ;
-		virtual TInt BareInstallL( CStifItemParser& aItem ) ;
-		
-
-    private:    // Data
-        HBufC8 *GetNextStringLC ( CStifItemParser& aItem, const TDesC &aName );
-
-
-    };
-
-#endif      // AMTEST_H
-            
-// End of File
--- a/applicationmanagement/tsrc/tarmappmng/inc/dmatest.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,272 +0,0 @@
-/*
-* Copyright (c) 2002-2004 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:  Helper base class for dm adapter testing
-*
-*/
-
-
-
-#ifndef __DMA_TEST_H__
-#define __DMA_TEST_H__
-
-//  INCLUDES
-#include <StifLogger.h>
-#include <TestScripterInternal.h>
-#include <StifTestModule.h>
-#include <apmstd.h>
-#include <smldmadapter.h>
-
-class Cdmatest;
-
-
-struct TMapping
-	{
-	TBuf8<256> iURI;
-	TBuf8<64> iLuid;
-	TMapping( const TDesC8 &aURI, const TDesC8 &aLuid )  : iURI( aURI ), iLuid( aLuid )
-	{
-		
-		}
-	};
-	
-typedef RArray<TMapping> RMappingArray;
-
-typedef void (Cdmatest::* ResultsFunction)( TInt , CBufBase& , const TDesC8&  ) ; 
-
-
-// CLASS DECLARATION
-
-/**
-*  ?one_line_short_description.
-*  ?other_description_lines
-*
-*  @lib ?library
-*  @since Series ?XX ?SeriesXX_version
-*/
-class Cdmatest : public CScriptBase, public MSmlDmCallback
-    {
-    
-    public:  // Constructors and destructor
-        
-        /**
-        * Destructor.
-        */
-        virtual ~Cdmatest();
-
-    public: // Functions from base classes
-
-        /**
-        * From CScriptBase Runs a script line.
-        * @since ?Series60_version
-        * @param aItem Script line containing method name and parameters
-        * @return Symbian OS error code
-        */
-        virtual TInt RunMethodL( CStifItemParser& aItem ) = 0;
-    
-
-	public:
-		/**
-		The function is used to return the data in case of FetchLeafObjectL(),
-		FetchLeafObjectSizeL() and ChildURIListL() functions. It should not be
-		called where the DM command has failed, i.e. the error code returned in
-		SetStatusL is something other than EOk.
-		@param aResultsRef	Reference to correct command
-		@param aObject		The data which should be returned
-		@param aType			MIME type of the object
-		@publishedPartner
-		@prototype
-		*/
-		void SetResultsL( TInt aResultsRef, CBufBase& aObject,
-								  const TDesC8& aType );
-		
-		/**
-		The function is used to return the data in case of FetchLeafObjectL() and
-		ChildURIListL() functions, where the size of the data being returned is
-		large enough for the Adapter to stream it. This function should not be
-		called when command was failed, i.e. the error code returned in SetStatusL
-		is something other than EOk.
-		@param aResultsRef	Reference to correct command
-		@param aStream		Large data which should be returned, DM engine
-								closes stream when it has read all the data
-		@param aType			MIME type of the object
-		@publishedPartner
-		@prototype
-		*/
-		void SetResultsL( TInt /*aResultsRef*/, RReadStream*& /*aStream*/,
-								  const TDesC8& /*aType*/ ) 
-		{
-			
-		}
-
-		/**
-		The function returns information about the Add,Update,Delete and Fetch
-		commands success to DM engine. The reference to correct command must be
-		used when calling the SetStatusL function, the reference is got from the
-		argument of the command functions. The SetStatusL function must be called
-		separately for every single command.
-		@param aStatusRef	Reference to correct command
-		@param aErrorCode	Information about the command success
-		@publishedPartner
-		@prototype
-		*/
-		void SetStatusL( TInt aStatusRef,
-								 MSmlDmAdapter::TError aErrorCode ) ;
-
-		/**
-		The function passes map information to DM Module. This function is called
-		for a new management object, both for node objects and for leaf objects.
-		In addition if ChildURIListL() function has returned new objects a mapping
-		information of the new objects must be passed. A mapping is treated as
-		inheritable. If the mapping is not set with this function, the mapping
-		LUID of the parent object is passed in following commands to the object.
-		@param aURI	URI of the object. 
-		@param aLUID	LUID of the object. LUID must contain the all information,
-						which is needed for retrieve the invidual object from the
-						database. Typically it is ID for the database table. In
-						more complicated structures it can be combination of IDs,
-						which represent path to the object.
-		@publishedPartner
-		@prototype
-		*/
-		void SetMappingL( const TDesC8& aURI, const TDesC8& aLUID );
-
-		/**
-		The function is used to make a fetch to other adapters. The most common
-		use is to make a fetch to the AP adapter, because when managing the access
-		points, the data comes as URI. For example, there are ToNAPId field in
-		some adapters, and data to it can be something like AP/IAPidx, and then
-		the link to AP adapter is needed.
-		Using FetchLinkL causes the DM Framework to make a Get request to the
-		appropriate DM adapter.  The receiving adapter MUST complete the Get
-		request synchronously.
-		@param aURI		URI of the object. 
-		@param aData		Reference to data, i.e. data is returned here
-		@param aStatus	The status of fetch command is returned here
-		@publishedPartner
-		@prototype
-		*/
-		void FetchLinkL( const TDesC8& /*aURI*/, CBufBase& /*aData*/,
-								 MSmlDmAdapter::TError& /*aStatus*/ ) 
-			{
-				
-			}
-
-		/**
-		The function returns the LUID which is mapped to aURI. If LUID is not
-		found, the function allocates a null length string, i.e. the function
-		allocates memory in every case.
-		@param aURI	URI of the object. 
-		@publishedPartner
-		@prototype
-		*/
-		HBufC8* GetLuidAllocL( const TDesC8& aURI ) ;
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-    
-    void GetMappingInfoListL( const TDesC8& aURI,
-								CArrayFix<TSmlDmMappingInfo>& aSegmentList );
-
-#else
-// nothing
-#endif
-		        
-    protected:  // New functions
-
-        
-		void FetchNodeResultsL( TInt aResultsRef, CBufBase& aObject,
-							  const TDesC8& aType );
-		void SaveDataL( TInt aResultsRef, CBufBase& aObject,
-							  const TDesC8& aType ) ;
-							  
-		TPtrC8 LastURISeg( const TDesC8& aURI );
-		TPtrC8 RemoveLastURISeg( const TDesC8& aURI );
-		TPtrC RemoveLastURISeg( const TDesC& aURI );
-		void SetURIL( const TDesC& aURI );
-		void SetURIL( const TDesC8& aURI );
-		void SetURIL( HBufC8* aURI );		
-		HBufC8 *LoadFileLC( const TDesC &aFileName, TDataType &aType );
-		HBufC8 *LoadFileLC( const TDesC8 &aFileName, TDataType &aType );
-		HBufC8 *GetNextStringLC ( CStifItemParser& aItem, const TDesC &aName );
-		HBufC8* GetLuidAllocLC( const TDesC8& aURI ) ;
-		TPtrC8 RemoveLastSeg(const TDesC8& aURI);
-		
-		TInt FetchNodeL( CStifItemParser& aItem ) ;
-		TInt FetchLeafL( CStifItemParser& aItem ) ;
-		TInt AddNodeL( CStifItemParser& aItem );
-		TInt DeleteObjectL( CStifItemParser& aItem );	
-		TInt UpdateLeafL( CStifItemParser& aItem )	;
-		TInt UpdateLeafDataL( CStifItemParser& aItem ) ;
-		TInt UpdateLeafDataURLL( CStifItemParser& aItem ) ;
-		
-		TInt ExecuteLeafL ( CStifItemParser& aItem ) ;
-		TInt ExecuteLeafDataL ( CStifItemParser& aItem ) ;
-		TInt StartAtomicL( CStifItemParser& aItem )	;
-		TInt CommitAtomicL( CStifItemParser& aItem )	;
-		TInt RollbackAtomicL( CStifItemParser& aItem )	;
-		TInt CompleteCommandsL( CStifItemParser& aItem );
-		TInt DDFStructureL( CStifItemParser& aItem )	;
-		TInt FetchLeafObjectSizeL( CStifItemParser& aItem )	;
-		//Newly added	
-		TInt Cdmatest::AddLeafNode( CStifItemParser& aItem );
-		TInt Cdmatest::InstallActivate( CStifItemParser& aItem );			
-		//Newly ended
-
-    protected:
-
-        /**
-        * C++ default constructor.
-        */
-        Cdmatest( CTestModuleIf& aTestModuleIf, TUid aUid );
-
-        /**
-        * By default Symbian 2nd phase constructor is private.
-        */
-        void ConstructL();
-
-        // Prohibit copy constructor if not deriving from CBase.
-        // Cdmatest( const Cdmatest& );
-        // Prohibit assigment operator if not deriving from CBase.
-        // Cdmatest& operator=( const Cdmatest& );
-
-		/**
-        * Frees all resources allocated from test methods.
-        * @since ?Series60_version
-        */
-        virtual void Delete();
-        void LoadMappingsL();
-        void SaveMappingsL();
-    public:     // Data
-        // ?one_line_short_description_of_data
-        //?data_declaration;
-    
-    protected:  // Data
-        // ?one_line_short_description_of_data
-        //?data_declaration;
-		MSmlDmAdapter::TError iStatus ;
-        ResultsFunction iResultsFunction;
-        CSmlDmAdapter *iAdapter ;
-        HBufC8 *iURI; 
-        CArrayFix<TSmlDmMappingInfo> *iEmptyMappingInfoArray;
-		TFileName iSaveFileName;
-		RMappingArray iMappingTable;
-		TUid iUid;
-		TInt iCounter;
-		//class CNSmlDmMgmtTree* iMgmtTree;
-		class CNSmlDmMgmtTree* iMgmtTree;
-		CSmlDmAdapter *Adapter() ;
-    };
-
-#endif      // __DMA_TEST_H__
-            
-// End of File
--- a/applicationmanagement/tsrc/tarmappmng/init/amtest.ini	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,221 +0,0 @@
-#
-# This is STIF initialization file
-# Comment lines start with '#'-character.
-# See STIF TestFramework users guide.doc for instructions
-
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-# Set following test engine settings:
-#	- Set Test Reporting mode. TestReportMode's possible values are:
-#		+ 'Summary': Summary of the tested test cases.
-#		+ 'Environment': Hardware and software info.
-#		+ 'TestCases': Test case report.
-#		+ 'FullReport': Set of all above ones.
-#		+ Example 'TestReportMode= Summary TestCases'
-#
-# 	- CreateTestReport setting controls report creation mode
-#		+ YES, Test report will created.
-#		+ NO, No Test report.
-#
-# 	- File path indicates the base path of the test report.
-# 	- File name indicates the name of the test report.
-#
-# 	- File format indicates the type of the test report.
-#		+ TXT, Test report file will be txt type, for example 'TestReport.txt'.
-#		+ HTML, Test report will be html type, for example 'TestReport.html'.
-#   + XML, Test report will be xml type, for example 'TestReport.xml'.
-#          Note, that xml format is available only when output is set to FILE.
-#
-# 	- File output indicates output source of the test report.
-#		+ FILE, Test report logging to file.
-#		+ RDEBUG, Test report logging to using rdebug.
-#
-# 	- File Creation Mode indicates test report overwriting if file exist.
-#		+ OVERWRITE, Overwrites if the Test report file exist.
-#		+ APPEND, Continue logging after the old Test report information if
-#                 report exist.
-# 	- Sets a device reset module's dll name(Reboot).
-#		+ If Nokia specific reset module is not available or it is not correct one
-#		  StifHWResetStub module may use as a template for user specific reset
-#		  module.
-# 	- Sets STIF test measurement disable options. e.g. pluging1 and pluging2 disablation
-#		DisableMeasurement= stifmeasurementplugin01 stifmeasurementplugin02
-#
-
-[Engine_Defaults]
-
-TestReportMode= FullReport    # Possible values are: 'Empty', 'Summary', 'Environment',
-                                                     'TestCases' or 'FullReport'
-
-CreateTestReport= YES         # Possible values: YES or NO
-
-TestReportFilePath= C:\LOGS\TestFramework\
-TestReportFileName= TestReport
-
-TestReportFormat= TXT         # Possible values: TXT, HTML or XML
-TestReportOutput= FILE        # Possible values: FILE or RDEBUG
-TestReportFileCreationMode= OVERWRITE # Possible values: OVERWRITE or APPEND
-
-DeviceResetDllName= StifResetForNokia.dll # e.g. 'StifHWResetStub.dll' for user specific reseting
-
-DisableMeasurement= stifmeasurementdisablenone  # Possible values are:
-              # 'stifmeasurementdisablenone', 'stifmeasurementdisableall'
-              # 'stifmeasurementplugin01', 'stifmeasurementplugin02',
-              # 'stifmeasurementplugin03', 'stifmeasurementplugin04',
-              # 'stifmeasurementplugin05' or 'stifbappeaprofiler'
-
-Timeout= 0                    # Default timeout value for each test case. In milliseconds
-#UITestingSupport= YES        # Possible values: YES or NO
-#SeparateProcesses= YES       # Possible values: YES or NO (default: NO)
-[End_Defaults]
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-
-
-
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-# Module configurations start
-# Modules are added between module tags
-# tags. Module name is specified after ModuleName= tag, like
-# ModuleName= XXXXXXXXX
-# Modules might have initialisation file, specified as
-# IniFile= c:\testframework\YYYYYY
-# Modules might have several configuration files, like
-# TestCaseFile= c:\testframework\NormalCases.txt
-# TestCaseFile= c:\testframework\SmokeCases.txt
-# TestCaseFile= c:\testframework\ManualCases.txt
-
-# (TestCaseFile is synonym for old term ConfigFile)
-
-# Following case specifies demo module settings. Demo module
-# does not read any settings from file, so tags 
-# IniFile and TestCaseFile are not used.
-# In the simplest case it is enough to specify only the
-# name of the test module when adding new test module
-
-[New_Module]
-#ModuleName= demomodule
-
-ModuleName= testscripter
-# ADM Test-Automation
-ConfigFile= C:\TestFramework\amtest.cfg
-[End_Module]
-
-
-# Load testmoduleXXX, optionally with initialization file and/or test case files
-#[New_Module]
-#ModuleName= testmodulexxx
-
-#TestModuleXXX used initialization file
-#IniFile= c:\testframework\init.txt
-
-#TestModuleXXX used configuration file(s)
-#TestCaseFile= c:\testframework\testcases1.cfg
-#TestCaseFile= c:\testframework\testcases2.cfg
-#TestCaseFile= c:\testframework\manualtestcases.cfg
-
-#[End_Module]
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-
-
-
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-# Set STIF logging overwrite parameters for Logger.
-# 	Hardware and emulator environment logging path and styles can
-# 	be configured from here to overwrite the Logger's implemented values.
-#	
-#	Settings description:
-#	- Indicates option for creation log directory/directories. If log directory/directories
-#         is/are not created by user they will make by software.
-#		+ YES, Create log directory/directories if not allready exist.
-#		+ NO, Log directory/directories not created. Only created one is used.
-#
-#	- Overwrite emulator path setting.
-#		+ Example: If 'EmulatorBasePath= C:\LOGS\TestFramework\' and in code is defined 
-#		           Logger's path 'D:\\LOGS\\Module\\' with those definition the path
-#		           will be 'C:\LOGS\TestFramework\LOGS\Module\'
-#
-#	- Overwrite emulator's logging format.
-#		+ TXT, Log file(s) will be txt type(s), for example 'Module.txt'.
-#		+ HTML, Log file(s) will be html type(s), for example 'Module.html'.
-#
-#	- Overwrited emulator logging output source.
-#		+ FILE, Logging to file(s).
-#		+ RDEBUG, Logging to using rdebug(s).
-#
-#	- Overwrite hardware path setting (Same description as above in emulator path).
-#	- Overwrite hardware's logging format(Same description as above in emulator format).
-#	- Overwrite hardware's logging output source(Same description as above in emulator output).
-#
-#	- File Creation Mode indicates file overwriting if file exist.
-#		+ OVERWRITE, Overwrites if file(s) exist.
-#		+ APPEND, Continue logging after the old logging information if file(s) exist.
-#
-#	- Will thread id include to the log filename.
-#		+ YES, Thread id to log file(s) name, Example filename 'Module_b9.txt'.
-#		+ NO, No thread id to log file(s), Example filename 'Module.txt'.
-#
-#	- Will time stamps include the to log file.
-#		+ YES, Time stamp added to each line in log file(s). Time stamp is 
-#                 for example'12.Nov.2003 115958    LOGGING INFO'
-#		+ NO, No time stamp(s).
-#
-#	- Will line breaks include to the log file.
-#		+ YES, Each logging event includes line break and next log event is in own line.
-#		+ NO, No line break(s).
-#
-#	- Will event ranking include to the log file.
-#		+ YES, Event ranking number added to each line in log file(s). Ranking number
-#                 depends on environment's tics, for example(includes time stamp also)
-#                 '012   12.Nov.2003 115958    LOGGING INFO'
-#		+ NO, No event ranking.
-#
-#	- Will write log file in unicode format.
-#		+ YES, Log file will be written in unicode format
-#		+ NO, Log will be written as normal, not unicode, file.
-#
-
-[Logger_Defaults]
-
-#NOTE: If you want to set Logger using next setting(s) remove comment(s)'#'
-#NOTE: TestEngine and TestServer logging settings cannot change here
-
-#CreateLogDirectories= YES    # Possible values: YES or NO
-
-#EmulatorBasePath= C:\LOGS\TestFramework\
-#EmulatorFormat= HTML         # Possible values: TXT or HTML
-#EmulatorOutput= FILE         # Possible values: FILE or RDEBUG
-
-#HardwareBasePath= D:\LOGS\TestFramework\
-#HardwareFormat= HTML         # Possible values: TXT or HTML
-#HardwareOutput= FILE         # Possible values: FILE or RDEBUG
-
-#FileCreationMode= OVERWRITE  # Possible values: OVERWRITE or APPEND
-
-#ThreadIdToLogFile= YES       # Possible values: YES or NO
-#WithTimeStamp= YES           # Possible values: YES or NO
-#WithLineBreak= YES           # Possible values: YES or NO
-#WithEventRanking= YES        # Possible values: YES or NO
-
-#FileUnicode= YES             # Possible values: YES or NO
-#AddTestCaseTitle= YES        # Possible values: YES or NO
-[End_Logger_Defaults]
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-
-
-
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-# Set filters to be used by ConsoleUI.
-# 	If you want to use filter with ConsoleUI, simply remove comments
-# 	from section below and provide valid filter entries.
-#   Each filter line has to start with "filter= " keyword.
-#   Filter can contain special wildcard characters:
-#     *  which stands for none or any literal;
-#     ?  which stands for single character.
-#   Filters are not case-sensitive.
-
-#[Filters]
-#filter= *math*
-#filter= *radio*
-#[End_Filters]
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-
-# End of file
--- a/applicationmanagement/tsrc/tarmappmng/src/TestDmDDFObject.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,512 +0,0 @@
-/*
-* Copyright (c) 2002-2004 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: Implementation of applicationmanagement components
-*
-*/
-
-
-
-// INCLUDE FILES
-
-#include "TestDmDDFObject.h"
-#include "StifLogger.h"
-
-// EXTERNAL DATA STRUCTURES
-//extern  ?external_data;
-
-// EXTERNAL FUNCTION PROTOTYPES  
-//extern ?external_function( ?arg_type,?arg_type );
-
-// CONSTANTS
-//const ?type ?constant_var = ?constant;
-
-// MACROS
-//#define ?macro ?macro_def
-
-// LOCAL CONSTANTS AND MACROS
-//const ?type ?constant_var = ?constant;
-//#define ?macro_name ?macro_def
-
-// MODULE DATA STRUCTURES
-//enum ?declaration
-//typedef ?declaration
-
-// LOCAL FUNCTION PROTOTYPES
-//?type ?function_name( ?arg_type, ?arg_type );
-
-// FORWARD DECLARATIONS
-//class ?FORWARD_CLASSNAME;
-
-// ============================= LOCAL FUNCTIONS ===============================
-
-
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CTestDmDDFObject::CTestDmDDFObject
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CTestDmDDFObject::CTestDmDDFObject( CStifLogger *aLog )
-	: iName( 0 )
-	, iAccessTypes()
-	, iDefaultValue( 0 )
-	, iDescription( 0 )
-	, iFormat( (TDFFormat)0 )
-	, iOccurence( (TOccurence)0 )
-	, iScope( (TScope)0 )
-	, iTitle ( 0 )
-	, iMimeType( 0 )
-	, iObjectGroup( EFalse )
-	, iLog( aLog )
-//	RPointerArray<CTestDmDDFObject> iChildren;
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// CTestDmDDFObject::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CTestDmDDFObject::ConstructL()
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// CTestDmDDFObject::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CTestDmDDFObject* CTestDmDDFObject::NewL( CStifLogger *aLog )
-    {
-    CTestDmDDFObject* self = CTestDmDDFObject::NewLC( aLog );
-    CleanupStack::Pop( self );
-
-    return self;
-    }
-
-CTestDmDDFObject* CTestDmDDFObject::NewLC( CStifLogger *aLog )
-    {
-    CTestDmDDFObject* self = new( ELeave ) CTestDmDDFObject( aLog );
-    
-    CleanupStack::PushL( self );
-    self->ConstructL();
-
-    return self;
-    }
-
-    
-// Destructor
-CTestDmDDFObject::~CTestDmDDFObject()
-    {
-	delete iName;
-	delete iDefaultValue;
-	delete iDescription;
-	delete iTitle;
-	delete iMimeType;
-	iChildren.ResetAndDestroy();
-    }
-
-
-// -----------------------------------------------------------------------------
-// CTestDmDDFObject::?member_function
-// ?implementation_description
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-/*?type CTestDmDDFObject::?member_function(
-    ?arg_type arg,
-    ?arg_type arg )
-    {
-    
-    ?code
-    
-    }
-*/
-
-void CTestDmDDFObject::SetAccessTypesL( TSmlDmAccessTypes aAccessTypes )
-	{
-	iLog->Log( _L8( "SetAccessTypesL, aAccessTypes=%d" ), aAccessTypes.GetACL() );
-	iAccessTypes = aAccessTypes;
-	}
-
-void CTestDmDDFObject::SetDefaultValueL( const TDesC8& aDefaultValue )
-	{
-	iLog->Log( _L8( "SetDefaultValueL, aDefaultValue='%S'" ), &aDefaultValue );
-	delete iDefaultValue;
-	iDefaultValue = 0;
-	iDefaultValue = aDefaultValue.AllocL();
-	}
-
-void CTestDmDDFObject::SetDescriptionL( const TDesC8& aDescription )
-	{
-	iLog->Log( _L8( "SetDescriptionL, aDescription='%S'" ), &aDescription );
-	delete iDescription;
-	iDescription = 0;
-	iDescription = aDescription.AllocL();
-	}
-	
-void CTestDmDDFObject::SetDFFormatL( TDFFormat aFormat )
-	{
-	iLog->Log( _L8( "SetDFFormatL, aFormat=%d" ), aFormat );
-	iFormat = aFormat;
-	}
-	
-void CTestDmDDFObject::SetOccurenceL( TOccurence aOccurence )
-	{
-	iLog->Log( _L8( "SetOccurenceL, aOccurence=%d" ), aOccurence );
-	iOccurence = aOccurence;
-	}
-	
-void CTestDmDDFObject::SetScopeL( TScope aScope )
-	{
-	iLog->Log( _L8( "SetScopeL, aScope=%d" ), aScope );
-	iScope = aScope;
-	}
-	
-void CTestDmDDFObject::SetDFTitleL( const TDesC8& aTitle )
-	{
-	iLog->Log( _L8( "SetDFTitleL, aTitle='%S'" ), &aTitle );
-	delete iTitle;
-	iTitle = 0;
-	iTitle = aTitle.AllocL();
-	}
-	
-void CTestDmDDFObject::AddDFTypeMimeTypeL( const TDesC8& aMimeType )
-	{
-	iLog->Log( _L8( "AddDFTypeMimeTypeL, aMimeType='%S'" ), &aMimeType );
-	delete iMimeType;
-	iMimeType = 0;
-	iMimeType = aMimeType.AllocL();
-	}
-	
-void CTestDmDDFObject::SetAsObjectGroup()
-	{
-	iLog->Log( _L8( "SetAsObjectGroup, true" ) );
-	iObjectGroup = ETrue;
-	}
-	
-MSmlDmDDFObject& CTestDmDDFObject::AddChildObjectL(const TDesC8& aNodeName)
-	{
-	iLog->Log( _L8( "AddChildObjectL, aNodeName='%S'" ), &aNodeName );
-	CTestDmDDFObject* child = CTestDmDDFObject::NewLC( iLog ); //, aNodeName );
-	child->SetNameL( aNodeName );
-	iChildren.AppendL( child );
-	CleanupStack::Pop( child ); // Don't destroy
-	return *child;
-	}
-
-MSmlDmDDFObject& CTestDmDDFObject::AddChildObjectGroupL()
-	{
-	iLog->Log( _L8( "AddChildObjectGroupL, ''" ) );
-	CTestDmDDFObject* child = CTestDmDDFObject::NewLC( iLog ); //, KNullDesC );
-	child->SetAsObjectGroup();
-	iChildren.AppendL( child );
-	CleanupStack::Pop( child ); // Don't destroy
-	return *child;
-	}
-
-// Own functions
-
-void CTestDmDDFObject::SetNameL( const TDesC8& aName )
-	{
-	delete iName;
-	iName = 0;
-	iName = aName.AllocL();
-	}
-
-void CTestDmDDFObject::DumpL( const TDesC8& aParentName, TBool aFullDump )
-	{
-	TPtrC8 name( _L8("<X>") );
-	if (iName && iName->Length() > 0)
-		{
-		name.Set( *iName );
-		}
-
-	HBufC8* fullName = HBufC8::NewLC( aParentName.Length() + name.Length() + 1 );
-	*fullName = aParentName;
-	if (aParentName.Length() > 0 && aParentName[ aParentName.Length() - 1 ] != '/')
-		{
-		fullName->Des().Append( _L8("/"));
-		}
-	fullName->Des().Append( name );
-
-	/* Translate some members to text for dumping */
-	TBuf8<20> strAccessTypes;
-	TUint8 accessTypes = iAccessTypes.GetACL();
-	if ((accessTypes & iAccessTypes.EAccessType_Add) != 0)
-		{
-		strAccessTypes.Append( _L8("A") );
-		}
-	if ((accessTypes & iAccessTypes.EAccessType_Copy) != 0)
-		{
-		strAccessTypes.Append( _L8("C") );
-		}
-	if ((accessTypes & iAccessTypes.EAccessType_Delete) != 0)
-		{
-		strAccessTypes.Append( _L8("D") );
-		}
-	if ((accessTypes & iAccessTypes.EAccessType_Exec) != 0)
-		{
-		strAccessTypes.Append( _L8("E") );
-		}
-	if ((accessTypes & iAccessTypes.EAccessType_Get) != 0)
-		{
-		strAccessTypes.Append( _L8("G") );
-		}
-	if ((accessTypes & iAccessTypes.EAccessType_Replace) != 0)
-		{
-		strAccessTypes.Append( _L8("R") );
-		}
-	
-	TBuf8<20> strFormat;
-	switch( iFormat )
-		{
-	case EB64:
-		strFormat = _L8("Base64");
-		break;
-	case EBool:
-		strFormat = _L8("Bool");
-		break;
-	case EChr:
-		strFormat = _L8("Chr");
-		break;
-	case EInt:
-		strFormat = _L8("Int");
-		break;
-	case ENode:
-		strFormat = _L8("Node");
-		break;
-	case ENull:
-		strFormat = _L8("Null");
-		break;
-	case EXml:
-		strFormat = _L8("Xml");
-		break;
-	case EBin:
-		strFormat = _L8("Bin");
-		break;
-	default:
-		break;
-		}
-
-
-	TBuf8<20> strOccurence;
-	switch( iOccurence )
-		{
-	case EOne:
-		/** The node appears exactly once */
-		strOccurence = _L8("M:1");
-		break;
-	case EZeroOrOne:
-		/** The node is optional and may appear zero or once */
-		strOccurence = _L8("O:0-1");
-		break;
-	case EZeroOrMore:
-		/** The node is optional and may appear zero or more times */
-		strOccurence = _L8("O:0-*");
-		break;
-	case EOneOrMore:
-		/** The node is mandatory and may appear once or more times */
-		strOccurence = _L8("M:1-*");
-		break;
-	case EZeroOrN:
-		/** The node is optional and may appear between once and 'N' times */
-		strOccurence = _L8("O:1-N");
-		break;
-	case EOneOrN:
-		/** The node is mandatory and may appear between once and 'N' times */
-		strOccurence = _L8("M:1-N");
-		break;
-	default:
-		break;
-		}
-	
-	
-	TBuf8<20> strScope;
-	switch( iScope)
-		{
-	case EPermanent:
-		/** The node appears exactly once */
-		strScope = _L8("Permanent");
-		break;
-	case EDynamic:
-		/** The node is optional and may appear zero or once */
-		strScope = _L8("O:Dynamic");
-		break;
-	default:
-		break;
-		}
-
-	
-	/* Dump main data */
-	if (aFullDump)
-		{
-		iLog->Log( _L8( "DDFObject: '%S'" ), fullName );
-		}
-		else
-		{
-		iLog->Log( _L8( "DDFObject: '%S'   (%S), %S, %S, %S" ),
-					fullName, &strAccessTypes, &strFormat, &strOccurence, &strScope );
-		}
-	
-	/* Dump members */
-	if (aFullDump)
-		{
-		TPtrC8 empty( _L8( "<null>" ) );
-		#define CHK_NULL(a) ((a)==0?(TDesC8*)(&empty):(TDesC8*)(a))
-
-		iLog->Log( _L8( "    iName=='%S'" ), iName );
-		iLog->Log( _L8( "    iAccessTypes=%d (%S)" ), iAccessTypes.GetACL(), &strAccessTypes );
-		iLog->Log( _L8( "    iDefaultValue='%S'" ), CHK_NULL(iDefaultValue));
-		iLog->Log( _L8( "    iDescription='%S'" ), CHK_NULL(iDescription ));
-		iLog->Log( _L8( "    iFormat=%d (%S)" ), iFormat, &strFormat );
-		iLog->Log( _L8( "    iOccurence=%d (%S)" ), iOccurence, &strOccurence );
-		iLog->Log( _L8( "    iScope=%d (%S)" ), iScope, &strScope );
-		iLog->Log( _L8( "    iTitle='%S'" ), CHK_NULL(iTitle ));
-		iLog->Log( _L8( "    iMimeType='%S'" ), CHK_NULL(iMimeType ));
-		iLog->Log( _L8( "----------------------------------" ) );
-		}
-	
-	/* Dump children */
-	for (TInt i = 0 ; i < iChildren.Count() ; i++)
-		{
-		iChildren[i]->DumpL( *fullName, aFullDump );
-		}
-
-	CleanupStack::PopAndDestroy( fullName );
-	}
-
-/*
-void CTestDmDDFObject::ExternalizeL(RWriteStream& aStream) const
-	{
-	X;
-	aStream << *iName << eol;
-	}
-*/
-
-const TDesC8& CTestDmDDFObject::Name()
-	{
-	return (iName != 0) ? *iName : KNullDesC8();
-	}
-
-TSmlDmAccessTypes  CTestDmDDFObject::AccessTypes()
-	{
-	return iAccessTypes;
-	}
-
-const TDesC8& CTestDmDDFObject::DefaultValue()
-	{
-	return (iDefaultValue != 0) ? *iDefaultValue : KNullDesC8();
-	}
-
-const TDesC8& CTestDmDDFObject::Description()
-	{
-	return (iDescription != 0) ? *iDescription : KNullDesC8();
-	}
-
-CTestDmDDFObject::TDFFormat CTestDmDDFObject::DFFormat()
-	{
-	return iFormat;
-	}
-
-CTestDmDDFObject::TOccurence CTestDmDDFObject::Occurence()
-	{
-	return iOccurence;
-	}
-
-CTestDmDDFObject::TScope CTestDmDDFObject::Scope()
-	{
-	return iScope;
-	}
-
-const TDesC8& CTestDmDDFObject::DFTitle()
-	{
-	return (iTitle != 0) ? *iTitle : KNullDesC8();
-	}
-
-const TDesC8& CTestDmDDFObject::DFTypeMimeType()
-	{
-	return (iMimeType != 0) ? *iMimeType : KNullDesC8();
-	}
-
-TBool CTestDmDDFObject::ObjectGroup()
-	{
-	return iObjectGroup;
-	}
-
-TInt CTestDmDDFObject::ChildObjectCount()
-	{
-	return iChildren.Count();
-	}
-
-CTestDmDDFObject& CTestDmDDFObject::ChildObject( TInt aIndex )
-	{
-	return *iChildren[aIndex];
-	}
-
-CTestDmDDFObject* CTestDmDDFObject::FindChildObject( const TDesC8& aName )
-	{
-	CTestDmDDFObject* foundObject = 0;
-
-	for (TInt i = 0 ; i < iChildren.Count() ; i++)
-		{
-		if ( aName.CompareC( iChildren[i]->Name() ) == 0 )
-			{
-			foundObject = iChildren[i];
-			break;
-			}
-		}
-
-	return foundObject;
-	}
-
-TInt CTestDmDDFObject::SubObjectsCount()
-	{
-	TInt count = 0;
-
-	TInt i;
-	for (i = 0 ; i < iChildren.Count() ; i++)
-		{
-		count += iChildren[i]->SubObjectsCount();
-		}
-	count += i;
-
-	return count;
-	}
-
-/*
-// ========================== OTHER EXPORTED FUNCTIONS =========================
-
-// -----------------------------------------------------------------------------
-// ?function_name implements...
-// ?implementation_description.
-// Returns: ?value_1: ?description
-//          ?value_n: ?description
-//                    ?description
-// -----------------------------------------------------------------------------
-//
-?type  ?function_name(
-    ?arg_type arg,  // ?description
-    ?arg_type arg )  // ?description
-    {
-
-    ?code
-
-    }
-*/
-//  End of File  
--- a/applicationmanagement/tsrc/tarmappmng/src/amtest.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,103 +0,0 @@
-/*
-* Copyright (c) 2002 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: Implementation of applicationmanagement components
-*
-*/
-
-
-
-// INCLUDE FILES
-#include <Stiftestinterface.h>
-#include "amtest.h"
-#include <stiflogger.h>
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// Camtest::Camtest
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-Camtest::Camtest( CTestModuleIf& aTestModuleIf )
-		: Cdmatest( aTestModuleIf, KAdapterUid )
-    {
-    }
-// -----------------------------------------------------------------------------
-// Camtest::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void Camtest::ConstructL()
-    {
-    iLog = CStifLogger::NewL( KamtestLogPath, 
-                          KamtestLogFile,
-                          CStifLogger::ETxt,
-                          CStifLogger::EFile );
-                          
-    iLog->Log( _L( "Loading Adapter" ) );
-    
-	Cdmatest::ConstructL();                         	
-
-    }
-
-// -----------------------------------------------------------------------------
-// Camtest::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-Camtest* Camtest::NewL( 
-    CTestModuleIf& aTestModuleIf )
-    {
-    Camtest* self = new (ELeave) Camtest( aTestModuleIf );
-    
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop();
-
-    return self;
-    
-    }
-    
-// Destructor
-Camtest::~Camtest()
-    { 
-    
-    // Delete resources allocated from test methods
-//    Delete();
-    
-    // Delete logger
-//    delete iLog;  
-    
-    }
-
-// ========================== OTHER EXPORTED FUNCTIONS =========================
-
-// -----------------------------------------------------------------------------
-// LibEntryL is a polymorphic Dll entry point.
-// Returns: CScriptBase: New CScriptBase derived object
-// -----------------------------------------------------------------------------
-//
-EXPORT_C CScriptBase* LibEntryL( 
-    CTestModuleIf& aTestModuleIf ) // Backpointer to STIF Test Framework
-    {
-    
-    return ( CScriptBase* ) Camtest::NewL( aTestModuleIf );
-        
-    }
-
-
-    
-//  End of File
--- a/applicationmanagement/tsrc/tarmappmng/src/amtestBlocks.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,507 +0,0 @@
-/*
-* Copyright (c) 2002 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: Implementation of applicationmanagement components
-*
-*/
-
-
-
-// INCLUDE FILES
-#include <e32svr.h>
-#include <StifParser.h>
-#include <Stiftestinterface.h>
-#include "amtest.h"
-#include "applicationmanagementclient.h"
-#include <e32math.h>
-#include <f32file.h>
-#include <swinstapi.h>
-
-
-using namespace NApplicationManagement;
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// Camtest::Delete
-// Delete here all resources allocated and opened from test methods. 
-// Called from destructor. 
-// -----------------------------------------------------------------------------
-//
-void Camtest::Delete() 
-    {
-    
-    }
-    
-// -----------------------------------------------------------------------------
-// Camtest::RunMethodL
-// Run specified method. Contains also table of test mothods and their names.
-// -----------------------------------------------------------------------------
-//
-TInt Camtest::RunMethodL( 
-    CStifItemParser& aItem ) 
-    {
-   
-    TStifFunctionInfo const KFunctions[] =
-        {  
-        // Copy this line for every implemented function.
-        // First string is the function name used in TestScripter script file.
-        // Second is the actual implementation member function. 
-        ENTRY( "DDFStructure", Camtest::DDFStructureL),
-        ENTRY( "List", Camtest::ExampleL ),
-        ENTRY( "Deliver", Camtest::DeliverL ),
-        ENTRY( "Details", Camtest::DetailsL ),
-        ENTRY( "Install", Camtest::InstallL ),
-        ENTRY( "BareInstall", Camtest::BareInstallL ),
-        ENTRY( "FetchNode", Camtest::FetchNodeL ),
-        ENTRY( "FetchLeaf", Camtest::FetchLeafL ),
-        ENTRY( "FetchLeafObjectSizeL", Camtest::FetchLeafObjectSizeL ),
-        //ENTRY( "CompleteCommands", Cdmatest::CompleteCommandsL ),
-        ENTRY( "AddNode", Camtest::AddNodeL ),
-        ENTRY( "UpdateLeaf", Camtest::UpdateLeafL ),
-        ENTRY( "UpdateLeafData", Camtest::UpdateLeafDataL ),
-        ENTRY( "UpdateLeafDataURI", Camtest::UpdateLeafDataURLL ),
-        ENTRY( "Execute", Camtest::ExecuteLeafL ),
-        ENTRY( "ExecuteData", Camtest::ExecuteLeafDataL ),
-        ENTRY( "DeleteNode", Camtest::DeleteObjectL ),
-        ENTRY( "StartAtomic", Camtest::StartAtomicL),
-	    ENTRY( "CommitAtomic", Camtest::CommitAtomicL),
-	    ENTRY( "RollbackAtomic", Camtest::RollbackAtomicL),
-	    //Newly addded
-	    ENTRY( "AddLeafNode", Camtest::AddLeafNode),
-	    ENTRY( "InstallActivate", Camtest::InstallActivate),
-	    //Newly ended
-//	    ENTRY( "BareAppInstall", Camtest::BareAppInstallL),
-/*        ENTRY( "DDFStructure", Camtest::DDFStructureL),*///BareAppInstallL
-        };
-
-    const TInt count = sizeof( KFunctions ) / 
-                        sizeof( TStifFunctionInfo );
-
-    return RunInternalL( KFunctions, count, aItem );
-
-    }    
-
-// -----------------------------------------------------------------------------
-// Camtest::ExampleL
-// Example test method function.
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-TInt Camtest::ExampleL( CStifItemParser& /*aItem*/ )
-    {
-    
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("amtest"), _L("In Example") );
-    // Print to log file
-    iLog->Log(_L("In Example"));
-
-    RApplicationManagement ams ;
-    TInt err( ams.Connect() );
-    
-    if ( err == KErrNone )
-    	{    	    
-	    RElementIdArray array;
-	    ams.DeploymentComponentIdsL(array);
-		iLog->Log( _L( "Found %d Ids" ), array.Count() );
-		for ( TInt i = 0; i < array.Count(); i++ )
-			{
-			iLog->Log( _L( "  Id %d: %d" ), i, array[i] );
-			}
-			
-			
-		TDeploymentComponent comp ;
-		comp.iId = _L8( "Iidee" );
-		TBuf8<10> buf;
-		TTime tm;
-		tm.HomeTime();
-		TInt64 rn = tm.Int64() ;
-		TInt rand = Math::Rand( rn ) ;
-		buf.NumFixedWidth( rand, EHex, 10);
-	
-		comp.iId.Append( buf );
-		comp.iVersion = _L8( "2.3" );
-		comp.iName = _L8( "Nimi" );
-		
-		err = ams.DeliverL(/*_L8("Leaf"), */comp.iId/*, comp.iName, comp.iVersion, EDCSDelivered, _L8("datadatadatadata"), _L8("iopts"), _L8("meta") */) ;
-		iLog->Log( _L( " Deliver response: %d, state: %d" ), err, comp.iState );
-		User::LeaveIfError ( err );
-		err = KErrNone;
-		
-		array.Reset();
-		ams.DeploymentComponentIdsL(array);
-		iLog->Log( _L( "Found 2ndtime %d Ids" ), array.Count() );
-		for ( TInt i = 0; i < array.Count(); i++ )
-			{
-			iLog->Log( _L( "  Id %d: %d" ), i, array[i] );
-			
-			TDeploymentComponent comp2 ;
-			err = ams.DeploymentComponent(array[i], comp);
-			iLog->Log( _L( " DeploymentComponent response: %d, state: %d" ), err, comp.iState );
-			if ( err == KErrNone )
-				{
-				HBufC *b = HBufC::NewLC( comp.iId.Length() );
-				TPtr p( b->Des() );
-				p.Copy( comp.iId );
-				
-				iLog->Log( _L( "CompId: %S" ), &p );
-				CleanupStack::PopAndDestroy();
-				}
-			else
-				{
-				
-				}
-			}
-		ams.Close();
-		}
-	else
-		{
-		iLog->Log( _L( "Failed to connect: %d" ), err);
-		}
-
-    return err;
-    
-    }
-    
-// -----------------------------------------------------------------------------
-// Camtest::ExampleL
-// Example test method function.
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-TInt Camtest::DetailsL( CStifItemParser& aItem )
-    {
-    
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("amtest"), _L("In DetailsL") );
-    // Print to log file
-    iLog->Log(_L("In DetailsL"));
-
-    RApplicationManagement ams ;
-    TInt err( ams.Connect() );
-    
-    if ( err == KErrNone )
-    	{    	
-	    
-	    TInt i( 0 );
-	    TInt nodename;
-	    i = aItem.GetNextInt ( nodename ) ;
-	    if ( i != KErrNone ) 
-		    {
-		    iLog->Log( _L( "ERROR Reading id argument: 0x%X"), i);
-		    //return i;
-		    }
-		else
-			{
-			iLog->Log( _L("id: %d"), nodename);
-			}
-	    
-	    RElementIdArray array;
-	    ams.DeploymentComponentIdsL(array);
-		iLog->Log( _L( "Found %d Ids" ), array.Count() );
-		for ( TInt i = 0; i < array.Count(); i++ )
-			{
-			
-			iLog->Log( _L( "  Id %d: %d" ), i, array[i] );
-
-			TDeploymentComponent comp2 ;
-			err = ams.DeploymentComponent(array[i], comp2);
-			iLog->Log( _L( " DeploymentComponent response: %d, state: %d" ), err, comp2.iState );
-			if ( err == KErrNone )
-				{
-				HBufC *b = HBufC::NewLC( comp2.iId.Length() );
-				TPtr p( b->Des() );
-				p.Copy( comp2.iId );
-				
-				iLog->Log( _L( "CompId: %S" ), &p );
-				CleanupStack::PopAndDestroy();
-				}
-			else
-				{
-				
-				}
-			}
-		User::LeaveIfError ( err );
-		err = KErrNone;
-		ams.Close();
-		}
-	else
-		{
-		iLog->Log( _L( "Failed to connect: %d" ), err);
-		}
-    return err;
-    }
-    
-    
-// -----------------------------------------------------------------------------
-// Camtest::InstallL
-// -----------------------------------------------------------------------------
-//
-TInt Camtest::InstallL( CStifItemParser& aItem )
-    {
-    
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("amtest"), _L("In InstallL") );
-    // Print to log file
-    
-    iLog->Log(_L("In DetailsL"));
-    TCertInfo info ;
-	info.iFingerprint =_L8("finger");
-	info.iSerialNo = _L8("serial");
-	
-    RApplicationManagement ams ;
-    TInt err( ams.Connect( info ) );
-    
-    
-    if ( err == KErrNone )
-    	{    	
-    	
-        TInt i( 0 );
-	    TUint32 nodename;
-	    i = aItem.GetNextInt ( (TInt&)nodename ) ;
-	    if ( i != KErrNone ) 
-		    {
-		    iLog->Log( _L( "ERROR Reading id argument: 0x%X"), i);
-		    //return i;
-		    }
-		else
-			{
-			iLog->Log( _L("id: %d"), nodename);
-			}
-	    
-/*	    RElementIdArray array;
-	    ams.DeploymentComponentIdsL(array);
-		iLog->Log( _L( "Found %d Ids" ), array.Count() );
-		for ( TInt i = 0; i < array.Count(); i++ )
-			{
-			
-			iLog->Log( _L( "  Id %d: %d" ), i, array[i] );
-
-			TDeploymentComponent comp2 ;
-			err = ams.DeploymentComponent(array[i], comp2);
-			iLog->Log( _L( " DeploymentComponent response: %d, state: %d" ), err, comp2.iState );
-			if ( err == KErrNone )
-				{
-				HBufC *b = HBufC::NewLC( comp2.iId.Length() );
-				TPtr p( b->Des() );
-				p.Copy( comp2.iId );
-				
-				iLog->Log( _L( "CompId: %S" ), &p );
-				CleanupStack::PopAndDestroy();
-				
-				}
-			else
-				{
-				
-				}
-				
-			if ( nodename == array[i] )
-				{
-				iLog->Log( _L( "CompId: %S" ), &p );
-				}
-			}
-		*/
-		ams.InstallL( nodename ) ;
-		User::LeaveIfError ( err );
-		err = KErrNone;
-
-		ams.Close();
-		}
-	else
-		{
-		iLog->Log( _L( "Failed to connect: %d" ), err);
-		}
-    return err;
-    }
-    
-// -----------------------------------------------------------------------------
-// Camtest::InstallL
-// -----------------------------------------------------------------------------
-//
-TInt Camtest::BareInstallL( CStifItemParser& aItem )
-    {
-    
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("amtest"), _L("In InstallL") );
-    // Print to log file
-    iLog->Log(_L("In DetailsL"));
-
-/*void CAmAdapter::InstallL( 
-	TUint aLuidi, 
-	const TDesC8& aURI, 
-	const TDesC8& aLUID, 
-	const TDeploymentComponentState aTargetState,
-	TError &aRet
-    TInt aluidi( 0 );
-    TUint32 aLuidInt;
-    aluidi = aItem.GetNextInt ( (TInt&)aLuidInt ) ;
-	
-	
-    TPtrC8 nodename( GetNextStringLC ( aItem, _L("Node name") )->Des() ) ;
-    
-	
-    SetURIL( nodename );
-    
-    HBufC8 *luid = GetLuidAllocLC( *iURI );
-    TError ret( EError );
-	
-	TRAPD( err, Adapter()->InstallL(aluidi,*iURI, *luid,3 ,ret));*/
-
-	//using namespace SwiUI;
-    SwiUI::RSWInstLauncher ams ;
-    TInt err( ams.Connect() );
-    
-    if ( err == KErrNone )
-    	{    	
-    	CleanupClosePushL( ams );
-	    iLog->Log( _L( "Connected!" ));
-	    TPtrC filename ;
-	    User::LeaveIfError( aItem.GetNextString( filename ) );
-	    
-	   	
-	   		
-   		TRequestStatus stat;
-   		
-   		ams.Install( stat, filename  );
-   		User::WaitForRequest( stat );
-   		CleanupStack::Pop();
-   		
-		ams.Close();
-		}
-	else
-		{
-		iLog->Log( _L( "Failed to connect: %d" ), err);
-		}
-    return err;
-    }
-        
-        
-HBufC8 *Camtest::GetNextStringLC ( CStifItemParser& aItem, const TDesC &aName )
-	{
-	TPtrC nodename;
-	nodename.Set( KNullDesC );
-
-    TInt i( aItem.GetNextString ( nodename ) );
-    if ( i != KErrNone ) 
-	    {
-	    iLog->Log( _L( "ERROR Reading '%S' argument: 0x%X" ), &aName, i );
-	    }
-	else
-		{
-		iLog->Log( _L("%S: %S"), &aName, &nodename);
-		}
-	
-	HBufC8 *buf = HBufC8::NewLC( nodename.Length() ) ;
-	buf->Des().Copy( nodename );
-	
-	return buf;
-	}
-	
-	
-HBufC8 *LoadFileL( const TDesC8 &aDataFile )
-	{
-	RFs fs ;
-	User::LeaveIfError( fs.Connect() );
-	CleanupClosePushL( fs ); // 1
-	RFile file ;
-	TFileName fn; 
-	fn.Copy( aDataFile );
-	User::LeaveIfError ( file.Open( fs, fn, EFileRead ) );
-	CleanupClosePushL( file ); // 2
-	TInt size;
-	User::LeaveIfError( file.Size( size ) );
-	
-	HBufC8 *res = HBufC8::NewLC( size ); //3
-	TPtr8 p( res->Des() );
-	User::LeaveIfError( file.Read( p ) );
-	CleanupStack::Pop(); // res
-	CleanupStack::PopAndDestroy( 2 ); // file, fs
-	CleanupStack::PushL( res );
-	return res ;
-	}
-	
-// -----------------------------------------------------------------------------
-// Camtest::ExampleL
-// Example test method function.
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-TInt Camtest::DeliverL( CStifItemParser& aItem )
-    {
-    
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("amtest"), _L("In DeliverL") );
-    // Print to log file
-    iLog->Log(_L("In DeliverL"));
-
-    RApplicationManagement ams ;
-    TInt err( ams.Connect() );
-    
-    if ( err == KErrNone )
-    	{    	
-    	CleanupClosePushL( ams );
-	    HBufC8 *id = GetNextStringLC ( aItem, _L("Id") ) ;
-	    HBufC8 *name = GetNextStringLC( aItem, _L( "Name" )  ) ;
-	    HBufC8 *version = GetNextStringLC (  aItem, _L( "Version" ) ) ;
-	    HBufC8 *data = GetNextStringLC ( aItem, _L( "data" ) ) ;
-	    HBufC8 *instopt = GetNextStringLC (aItem, _L( "InstOpts" ) ) ;
-	    if ( data != NULL )
-	    	{
-	    	//HBufC8 *datat = NULL;	
-		    HBufC8 *datat = LoadFileL( *data );
-		    RElementIdArray array;
-		    ams.DeploymentComponentIdsL(array);
-			iLog->Log( _L( "Found %d Ids" ), array.Count() );
-			for ( TInt i = 0; i < array.Count(); i++ )
-				{
-				iLog->Log( _L( "  Id %d: %d" ), i, array[i] );
-				}
-								
-			TDeploymentComponent comp ;
-			comp.iId = *id;
-			comp.iVersion = *version;
-			comp.iName = *name;
-			
-			err = ams.DeliverL(/*_L8("Jee"),*/ comp.iId/*, comp.iName, comp.iVersion, EDCSDelivered , *datat, *instopt, _L8("meta") */) ;
-			iLog->Log( _L( " Deliver response: %d, state: %d" ), err, comp.iState );
-			User::LeaveIfError ( err );
-			err = KErrNone;
-			
-			array.Reset();
-			ams.DeploymentComponentIdsL(array);
-			iLog->Log( _L( "Found 2ndtime %d Ids" ), array.Count() );
-			for ( TInt i = 0; i < array.Count(); i++ )
-				{
-				iLog->Log( _L( "  Id %d: %d" ), i, array[i] );
-				}
-				
-			CleanupStack::PopAndDestroy( datat ); 
-	    	}
-		CleanupStack::PopAndDestroy( instopt ); 
-		CleanupStack::PopAndDestroy( data ); 
-		CleanupStack::PopAndDestroy( version );
-		CleanupStack::PopAndDestroy( name );
-		CleanupStack::PopAndDestroy( id ); 
-		CleanupStack::PopAndDestroy( ); //ams
-		}
-	else
-		{
-		iLog->Log( _L( "Failed to connect: %d" ), err);
-		}
-
-    return err;
-    
-    }        
-   
-
-//  End of File
--- a/applicationmanagement/tsrc/tarmappmng/src/dmatest.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1127 +0,0 @@
-/*
-* Copyright (c) 2002-2004 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: Implementation of applicationmanagement components
-*
-*/
-
-
-
-// INCLUDE FILES
-#include "dmatest.h"
-
-#include <StifParser.h>
-#include <Stiftestinterface.h>
-#include <S32FILE.H>
-
-#include <s32mem.h>
-#include <apgcli.h>
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-	#include "nsmldmtreedtd.h"
-#else
-	//nothing
-#endif
-//#include "nsmldmtreedtd.h"
-#include "TestDmDDFObject.h"
-
-
-#include <e32svr.h>
-#include "applicationmanagementclient.h"
-#include <e32math.h>
-#include <f32file.h>
-#include <swinstapi.h>
-
-using namespace NApplicationManagement;
-
-_LIT8( KEmptyType, "" );
-_LIT8( KDefaultType, "text/plain" );
-_LIT( KMappingTableFile, "c:\\TestFramework\\dmtestmappings.txt" );
-//_LIT8( KNSmlDMSeparator8, "/" );
-
-//Newly added
-_LIT8( KAMInstallOptsNodeName, "InstallOpts" );
-_LIT8( KAMDataNodeName, "Data" );
-//Newly ended
-const TUint8 KNSmlDMUriSeparator = 0x2f; //forward slash
-
-#define LEAVE_IF_ERROR(x,msg) \
-	{ TInt __xres = (x); if ( __xres < 0 ) { if ( iLog ) iLog->Log( (msg), __xres ); User::Leave( __xres );	} }
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// Cdmatest::Cdmatest
-// C++ default constructor can NOT contain any code, that
-// leave.
-// -----------------------------------------------------------------------------
-//
-Cdmatest::Cdmatest(CTestModuleIf& aTestModuleIf, TUid aUid ):
-        CScriptBase( aTestModuleIf ), iMappingTable(2), iUid( aUid )
-    {
-    
-    }
-
-// -----------------------------------------------------------------------------
-// Cdmatest::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void Cdmatest::ConstructL()
-    {
-    
-    
-    Adapter();
-  	iEmptyMappingInfoArray = new ( ELeave ) CArrayFixFlat<TSmlDmMappingInfo>(1);
-	
-	TRAPD( err, LoadMappingsL() );
-	if (err != KErrEof && err != KErrNone && err != KErrNotFound)
-		{
-		User::Leave( err );
-		}
-    }
-    
-CSmlDmAdapter *Cdmatest::Adapter() 
-	{
-	if ( iAdapter == NULL )
-		{
-		if ( iLog )
-			{
-			iLog->Log( _L( "Loading Adapter" ) );
-			}
-  			
-  		TRAPD( err, iAdapter = CSmlDmAdapter::NewL( iUid, *this ) );
-	if ( err == KErrNone )
-		{
-		if (iLog )
-			{
-			iLog->Log( _L( "Loaded" ) );	
-			}
-		}
-	else
-		{
-		if (iLog)
-			{
-			iLog->Log( _L( "Failed to load adapter: %d" ), err );
-			}
-	//	User::Leave( err ); 
-		iAdapter = NULL;
-		}
-		}
-	return iAdapter;
-	}
-    
-    
-void Cdmatest::LoadMappingsL()
-	{
-	TDataType type; 
-	HBufC8 *data = LoadFileLC( KMappingTableFile,  type );
-	RDesReadStream buf( *data );
-	CleanupClosePushL( buf );
-	//buf.Set( aChilds)
-	TInt len( data->Length() );
-	while (buf.Source()->TellL( MStreamBuf::ERead ).Offset() < len)
-		{
-		TUint32 val = buf.ReadUint32L();
-		TBuf8<256> uri;
-		TBuf8<64> luid;
-		buf.ReadL(uri, val);
-		val = buf.ReadUint32L();
-		buf.ReadL(luid, val);
-		TMapping m( uri, luid ) ;
-		TInt err( iMappingTable.Append( m )	);
-		if ( err == KErrNone )
-			{
-			iLog->Log( _L8( "Loaded mapping: '%S' : '%S'"), &m.iURI, &m.iLuid );
-			}
-		else
-			{
-			iLog->Log( _L8( "FAILED TO Load mapping: '%d' "), err );
-			}
-		}
-	CleanupStack::PopAndDestroy( &buf); // buf
-	CleanupStack::PopAndDestroy( data ); // data
-	}
-
-void Cdmatest::SaveMappingsL()
-    {
-	TInt c( iMappingTable.Count() );
-	if ( c > 0 )
-	{
-    	RFs fs;
-    	User::LeaveIfError( fs.Connect() );
-    	CleanupClosePushL( fs );
-    	RFileWriteStream buf;
-    	User::LeaveIfError( buf.Replace( fs, KMappingTableFile, EFileWrite ) );
-    	CleanupClosePushL( buf );
-		
-		TInt i( 0 ) ;
-		do 
-			{
-			buf.WriteUint32L( iMappingTable[i].iURI.Length() );
-			buf.WriteL( iMappingTable[i].iURI );
-			buf.WriteUint32L( iMappingTable[i].iLuid.Length() );
-			buf.WriteL( iMappingTable[i].iLuid );
-			}
-		while ( ++i < c )	;
-		buf.CommitL();
-		buf.Close();
-	
-		CleanupStack::PopAndDestroy(); // buf
-		CleanupStack::PopAndDestroy(); // fs
-		}
-    }
-    	
-   
-// Destructor
-Cdmatest::~Cdmatest()
-    {
-    // Delete resources allocated from test methods
-    TRAPD(err, SaveMappingsL() );
-    if ( err != KErrNone )
-    	{
-    		if(iLog)
-    			iLog->Log( _L8( "Failed to save mappings!: %d"), err );
-    	}
-    Delete();
-    
-    // Delete logger
-    delete iLog;  
-    delete iEmptyMappingInfoArray;
-    delete iAdapter;
-    delete iURI;
-    iMappingTable.Reset();
-    REComSession::FinalClose();
-    }
-
-
-// -----------------------------------------------------------------------------
-// Camatest::Delete
-// Delete here all resources allocated and opened from test methods. 
-// Called from destructor. 
-// -----------------------------------------------------------------------------
-//
-void Cdmatest::Delete() 
-    {
-    
-    }
-
-// -----------------------------------------------------------------------------
-// Cdmatest::?member_function
-// ?implementation_description
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-
-
-        
-HBufC8 *Cdmatest::GetNextStringLC ( CStifItemParser& aItem, const TDesC &aName )
-	{
-	TPtrC nodename( KNullDesC );
-
-    TInt i( aItem.GetNextString ( nodename ) );
-    if ( i != KErrNone ) 
-	    {
-	    iLog->Log( _L( "ERROR Reading '%S' argument: 0x%X" ), &aName, i );
-	    }
-	else
-		{
-		iLog->Log( _L("%S: %S"), &aName, &nodename);
-		}
-	
-	HBufC8 *buf = HBufC8::NewLC( nodename.Length() ) ;
-	buf->Des().Copy( nodename );
-	return buf;
-	}
-	
-TInt Cdmatest::FetchNodeL( CStifItemParser& aItem )	
-	{
-
-    TInt ret( KErrNone );
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("Cdmatest"), _L("FetchNodeL") );
-
-	iResultsFunction = FetchNodeResultsL;
-	
-    TPtrC8 nodename( GetNextStringLC( aItem, _L(" nodename" ) )->Des() ) ;
-//    TPtrC8 datafile( GetNextStringLC( aItem, _L("outputfile" )->Des() ) ;
-		
-	SetURIL(nodename) ;
-	HBufC8 *luid = GetLuidAllocLC( *iURI );
-	Adapter()->ChildURIListL( *iURI, *luid, *iEmptyMappingInfoArray, 4, 5) ;
-	if ( iStatus == MSmlDmAdapter::EOk )
-		{
-		}
-	else
-		{
-		iLog->Log( _L("FetchNodeL: ChildUriList Error ! %d" ), iStatus );	
-		ret = KErrGeneral ;
-		}
-	CleanupStack::PopAndDestroy( luid ) ; 
-	CleanupStack::PopAndDestroy() ; // nodename
-	iLog->Log( _L("FetchNodeL: Test Complete with status %d" ), ret );	
-
-    return ret;
-	}
-	
-TInt Cdmatest::StartAtomicL( CStifItemParser& /*aItem*/ )	
-	{
-	TRAPD( err, Adapter()->StartAtomicL() ) ;
-	iLog->Log( _L("StartAtomicL: Atomic started resulting error %d" ), err );	
-    return err;
-	}
-
-TInt Cdmatest::RollbackAtomicL( CStifItemParser& /*aItem*/ )	
-	{
-	TRAPD( err, Adapter()->RollbackAtomicL() ) ;
-	iLog->Log( _L("RollbackAtomicL: Atomic rolled back resulting error %d" ), err );	
-    return err;
-	}
-	
-TInt Cdmatest::CommitAtomicL( CStifItemParser& /*aItem*/ )	
-	{
-	TRAPD( err, Adapter()->CommitAtomicL() ) ;
-	iLog->Log( _L("RollbackAtomicL: Atomic commited resulting error %d" ), err );	
-    return err;
-	}
-	
-
-TInt Cdmatest::DDFStructureL( CStifItemParser& /*aItem*/ )	
-	{
-	CTestDmDDFObject* ddfRoot = CTestDmDDFObject::NewLC( iLog ); //, aNodeName );
-
-
-	TRAPD( err, iAdapter->DDFStructureL( *ddfRoot ) ) ;
-	CleanupStack::PopAndDestroy( ddfRoot );
-
-	iLog->Log( _L("DDFStructureL: method called resulting error %d" ), err );	
-    return err;
-	}
-		
-		
-TInt Cdmatest::AddNodeL( CStifItemParser& aItem )	
-	{
-
-    TInt ret( KErrNone );
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("Cdmatest"), _L("AddNodeL") );
-
-    
-    TPtrC8 nodename( GetNextStringLC ( aItem, _L("nodename" ) )->Des() ) ;
-    SetURIL( nodename );
-
-	Adapter()->AddNodeObjectL( *iURI, KEmptyType, 8 ) ;
-	if ( iStatus == MSmlDmAdapter::EOk )
-		{
-		iLog->Log( _L("AddNodeL: AddNodeObjectL Successful! %d" ), iStatus );	
-		}
-	else
-		{
-		iLog->Log( _L("AddNodeL: AddNodeObjectL Error ! %d" ), iStatus );	
-		ret = KErrGeneral ;
-		}
-		
-	CleanupStack::PopAndDestroy() ; // nodename
-	iLog->Log( _L("AddNodeL Test Complete with status %d" ), ret );	
-
-    return ret;
-	}
-		
-TInt Cdmatest::UpdateLeafL( CStifItemParser& aItem )	
-	{
-
-    TInt ret( KErrNone );
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("Cdmatest"), _L("UpdateLeafL") );
-
-    TPtrC8 nodename( GetNextStringLC ( aItem, _L("Node name") )->Des() ) ;
-    TPtrC8 datafile (GetNextStringLC( aItem, _L("datafile"))->Des() );
-    
-	HBufC8 *mime = GetNextStringLC( aItem, _L("mime") ) ;
-    //SetURIL( nodename );
-    
-    TPtrC8 last( LastURISeg( nodename ) );
- 	HBufC8 *luid = GetLuidAllocLC( *iURI );
-    
-    TDataType type;
-    TPtrC8 data;
-    if ((last == KAMInstallOptsNodeName) ||(last == KAMDataNodeName))
-    {
-    	 
-    HBufC8*	bufdata =  LoadFileLC( datafile, type );//->Des() ;
-    data.Set(bufdata->Des());
-    }
-    
-	TPtrC8 mimePtr( *mime == KNullDesC8 ? type.Des8() : mime->Des() );
-	if ((last == KAMInstallOptsNodeName) ||(last == KAMDataNodeName))
-	{
-		Adapter()->UpdateLeafObjectL( nodename , *luid, data, mimePtr, 3);
-	}
-	else
-	{
-		Adapter()->UpdateLeafObjectL( nodename , *luid, datafile, mimePtr, 3);	
-	}
-	
-	
-		if ( iStatus == MSmlDmAdapter::EOk )
-		{
-		iLog->Log( _L("UpdateLeafL: UpdateLeafObjectL Successful! %d" ), iStatus );	
-		}
-	else
-		{
-		iLog->Log( _L("UpdateLeafL UpdateLeafObjectL Error ! %d" ), iStatus );	
-		ret = KErrGeneral ;
-		}
-	if ((last == KAMInstallOptsNodeName) ||(last == KAMDataNodeName))
-	{
-		CleanupStack::PopAndDestroy(); // loadfile	
-	}
-	CleanupStack::PopAndDestroy(); // luid
-	CleanupStack::PopAndDestroy(); // mime
-	CleanupStack::PopAndDestroy(); // datafile
-	CleanupStack::PopAndDestroy(); // nodename
-	iLog->Log( _L("UpdateLeafL Test Complete with status %d" ), ret );	
-
-    return ret;
-	}
-/*		
-TInt Cdmatest::UpdateLeafL( CStifItemParser& aItem )	
-	{
-
-    TInt ret( KErrNone );
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("Cdmatest"), _L("UpdateLeafL") );
-
-    TPtrC8 nodename( GetNextStringLC ( aItem, _L("Node name") )->Des() ) ;
-    TPtrC8 datafile (GetNextStringLC( aItem, _L("datafile"))->Des() );
-    
-	HBufC8 *mime = GetNextStringLC( aItem, _L("mime") ) ;
-    SetURIL( nodename );
-    
-    
- 	HBufC8 *luid = GetLuidAllocLC( *iURI );
-    
-    TDataType type; 
-    TPtrC8 data( LoadFileLC( datafile, type )->Des() );
-	TPtrC8 mimePtr( *mime == KNullDesC8 ? type.Des8() : mime->Des() );
-
-	Adapter()->UpdateLeafObjectL( *iURI , *luid, data, mimePtr, 3);
-		if ( iStatus == MSmlDmAdapter::EOk )
-		{
-		iLog->Log( _L("UpdateLeafL: UpdateLeafObjectL Successful! %d" ), iStatus );	
-		}
-	else
-		{
-		iLog->Log( _L("UpdateLeafL UpdateLeafObjectL Error ! %d" ), iStatus );	
-		ret = KErrGeneral ;
-		}
-	CleanupStack::PopAndDestroy(); // loadfile
-	CleanupStack::PopAndDestroy(); // luid
-	CleanupStack::PopAndDestroy(); // mime
-	CleanupStack::PopAndDestroy(); // datafile
-	CleanupStack::PopAndDestroy(); // nodename
-	iLog->Log( _L("UpdateLeafL Test Complete with status %d" ), ret );	
-
-    return ret;
-	}	
-	
-*/
-TInt Cdmatest::UpdateLeafDataURLL( CStifItemParser& aItem )	
-	{
-
-    TInt ret( KErrNone );
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("Cdmatest"), _L("UpdateLeafDataL") );
-
-    TPtrC8 nodename( GetNextStringLC ( aItem, _L("Node name") )->Des() ) ;
-    TPtrC8 http (GetNextStringLC( aItem, _L("http"))->Des() );
-    TPtrC8 url (GetNextStringLC( aItem, _L("rest of url"))->Des() );
-	HBufC8 *mime = GetNextStringLC( aItem, _L("mime") ) ;
-    SetURIL( nodename );
-    
-    _LIT8( KTag, "://" );
-    
-    HBufC8 *fullurl = HBufC8::NewLC( http.Length() + KTag().Length() + url.Length() );
-    TPtr8 pfullurl( fullurl->Des() );
-    pfullurl.Copy( http ) ;
-    pfullurl.Append( KTag );
-    pfullurl.Append( url );
-    TPtrC8 mimePtr( *mime == KNullDesC8 ? KDefaultType() : mime->Des() );
-    
-    TPtrC8 parentURI(RemoveLastSeg(nodename));
-    HBufC8 *luid = GetLuidAllocLC( parentURI );
-
-	Adapter()->UpdateLeafObjectL( *iURI , *luid, pfullurl, mimePtr, 3);
-	if ( iStatus == MSmlDmAdapter::EOk )
-		{
-		iLog->Log( _L("UpdateLeafDataL: UpdateLeafObjectL Successful! %d" ), iStatus );	
-		}
-	else
-		{
-		iLog->Log( _L("UpdateLeafDataL UpdateLeafObjectL Error ! %d" ), iStatus );	
-		ret = KErrGeneral ;
-		}
-	CleanupStack::PopAndDestroy( luid ); // 
-	CleanupStack::PopAndDestroy( mime ); // mime
-	CleanupStack::PopAndDestroy(); // url
-	CleanupStack::PopAndDestroy(); // http
-	CleanupStack::PopAndDestroy(); // nodename
-	iLog->Log( _L("UpdateLeafDataL Test Complete with status %d" ), ret );	
-
-    return ret;
-	}
-    
-TInt Cdmatest::UpdateLeafDataL( CStifItemParser& aItem )	
-	{
-
-    TInt ret( KErrNone );
-    // Print to UI
-   TestModuleIf().Printf( 0, _L("Camtest"), _L("UpdateLeafDataL") );
-
-    TPtrC8 nodename( GetNextStringLC ( aItem, _L("Node name") )->Des() ) ;
-    TPtrC8 data (GetNextStringLC( aItem, _L("data"))->Des() );
-
-	HBufC8 *mime = GetNextStringLC( aItem, _L("mime") ) ;
-	
-    SetURIL( nodename );
-    
-        
-    TPtrC8 mimePtr( *mime == KNullDesC8 ? KDefaultType() : mime->Des() );
-    
-     
-    HBufC8 *luid = GetLuidAllocLC( *iURI );
-//    
-//    virtual void UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID,
-//									const TDesC8& aObject, const TDesC8& aType,
-//									TInt aStatusRef ) = 0;
-//   
-	Adapter()->UpdateLeafObjectL( *iURI, *luid, data, mimePtr, 3);
-	if ( iStatus == MSmlDmAdapter::EOk )
-		{
-		iLog->Log( _L("UpdateLeafDataL: UpdateLeafObjectL Successful! %d" ), iStatus );	
-		}
-	else
-		{
-		iLog->Log( _L("UpdateLeafDataL UpdateLeafObjectL Error ! %d" ), iStatus );	
-		ret = KErrGeneral ;
-		}
-	
-	CleanupStack::PopAndDestroy(); // mime
-	CleanupStack::PopAndDestroy(); // luid
-	CleanupStack::PopAndDestroy(); // data
-	CleanupStack::PopAndDestroy(); // nodename
-	iLog->Log( _L("UpdateLeafDataL Test Complete with status %d" ), ret );	
-
-    return ret;
-	}	
-			
-TInt Cdmatest::FetchLeafL( CStifItemParser& aItem )	
-	{
-
-    TInt ret( KErrNone );
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("Camtest"), _L("FetchLeafL") );
-
-	iResultsFunction = NULL;
-	
-    TInt i( 0 );
-    TPtrC8 nodename ( GetNextStringLC( aItem, _L( "nodename" ) )->Des() ) ;
-    
-    //TPtrC datafile;
-    TPtrC datafile( KNullDesC );
-    i = aItem.GetNextString ( datafile ) ;
-    if ( i != KErrNone ) 
-	    {
-	    iLog->Log(_L("FetchLeafL: ERROR Reading outfile argument: 0x%X"), i );
-	    //return i;
-	    }
-	else
-		{
-		iSaveFileName = datafile;
-		iLog->Log( _L( " Save file nameis '%S'" ), &iSaveFileName );
-		iResultsFunction = SaveDataL;
-		}
-    
-	SetURIL(nodename) ;
-		
-		/*
-			void FetchLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID,
-								   const TDesC8& aType, TInt aResultsRef,
-								   TInt aStatusRef );
-		*/
-
-	HBufC8 *luid = GetLuidAllocLC( *iURI );
-	Adapter()->FetchLeafObjectL( *iURI, *luid, KEmptyType, 7, 8 ) ;
-	if ( iStatus == MSmlDmAdapter::EOk )
-		{
-		iLog->Log( _L("FetchLeafL: FetchLeafObjectL Successful! %d" ), iStatus );	
-		}
-	else
-		{
-		iLog->Log( _L("FetchLeafL: FetchLeafObjectL Error ! %d" ), iStatus );	
-		ret = KErrGeneral ;
-		}
-	CleanupStack::PopAndDestroy( luid );
-	CleanupStack::PopAndDestroy(  ); // nodename
-	iLog->Log( _L("FetchLeafL Test Complete with status %d" ), ret );	
-    return ret;
-	}	
-
-
-TInt Cdmatest::ExecuteLeafL( CStifItemParser& aItem )		
-	{
-	TInt ret( KErrNone );
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("Camtest"), _L("ExecuteLeafL") );
-
-	iResultsFunction = NULL;
-	
-    TPtrC8 nodename( GetNextStringLC ( aItem, _L("Nodename") )->Des() ) ;
-    TPtrC8 datafile( GetNextStringLC ( aItem, _L("Input file") )->Des() ) ;
-	
-	SetURIL(nodename) ;
-
-		/*
-			virtual void ExecuteCommandL( const TDesC8& aURI, const TDesC8& aLUID,
-							      const TDesC8& aArgument, const TDesC8& aType,
-								  TInt aStatusRef ) = 0;
-		*/
-	TDataType type;
-	TPtrC8 data( LoadFileLC( datafile, type )->Des() );
-	
-    TPtrC8 parentURI(RemoveLastSeg(nodename));
-    HBufC8 *luid = GetLuidAllocLC( parentURI );
-
-	Adapter()->ExecuteCommandL( *iURI, data, data, KEmptyType, 11 ) ;
-	if ( iStatus == MSmlDmAdapter::EOk )
-		{
-		iLog->Log( _L("ExecuteLeafL: ExecuteCommandL Successful! %d" ), iStatus );	
-		}
-	else
-		{
-		iLog->Log( _L("ExecuteLeafL: ExecuteCommandL FetchLeafObjectL Error ! %d" ), iStatus );	
-		ret = KErrGeneral ;
-		}
-	CleanupStack::PopAndDestroy( luid ); // luid
-	CleanupStack::PopAndDestroy(); // data
-	CleanupStack::PopAndDestroy(); // datafile
-	CleanupStack::PopAndDestroy(); // nodename
-	
-	iLog->Log( _L("ExecuteLeafL: Test Complete with status %d" ), ret );	
-
-    return ret;
-	}
-	
-TInt Cdmatest::CompleteCommandsL( CStifItemParser& /*aItem*/ )
-	{
-	TRAPD( err, Adapter()->CompleteOutstandingCmdsL() );
-	delete iAdapter;
-	iAdapter = NULL;
-	return err;
-	}
-TInt Cdmatest::DeleteObjectL( CStifItemParser& aItem )
-{
-	TInt ret( KErrNone );
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("Camtest"), _L("DeleteObjectL") );
-
-    TPtrC8 nodename( GetNextStringLC ( aItem, _L("Nodename") )->Des() ) ;
-
-	SetURIL(nodename) ;
-
-	HBufC8 *luid = GetLuidAllocLC( *iURI );
-	Adapter()->DeleteObjectL( *iURI, *luid, 11 ) ;
-	if ( iStatus == MSmlDmAdapter::EOk )
-		{
-		iLog->Log( _L("DeleteObjectL: DeleteObjectL Successful! %d" ), iStatus );	
-		}
-	else
-		{
-		iLog->Log( _L("DeleteObjectL: DeleteObjectL FetchLeafObjectL Error ! %d" ), iStatus );	
-		ret = KErrGeneral ;
-		}
-	CleanupStack::PopAndDestroy( luid ); // luid
-	CleanupStack::PopAndDestroy(); // nodename	
-	iLog->Log( _L("DeleteObjectL Test Complete with status %d" ), ret );	
-
-    return ret;	
-}
-	
-TInt Cdmatest::ExecuteLeafDataL( CStifItemParser& aItem )		
-	{
-	TInt ret( KErrNone );
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("Camtest"), _L("ExecuteLeafL") );
-
-	iResultsFunction = NULL;
-	
-    TPtrC8 nodename( GetNextStringLC ( aItem, _L("Nodename") )->Des() ) ;
-    TPtrC8 data( GetNextStringLC ( aItem, _L("Input data") )->Des() ) ;
-    
-	SetURIL(nodename) ;
-
-		/*
-			virtual void ExecuteCommandL( const TDesC8& aURI, const TDesC8& aLUID,
-							      const TDesC8& aArgument, const TDesC8& aType,
-								  TInt aStatusRef ) = 0;
-		*/
-
-    TPtrC8 parentURI(RemoveLastSeg(nodename));
-    HBufC8 *luid = GetLuidAllocLC( parentURI );
-    
-	//Adapter()->ExecuteCommandL( *iURI, *luid, data, KEmptyType, 11 ) ;
-	Adapter()->ExecuteCommandL( *iURI, data, data, KEmptyType, 11 ) ;
-	if ( iStatus == MSmlDmAdapter::EOk )
-		{
-		iLog->Log( _L("ExecuteLeafDataL: ExecuteCommandL Successful! %d" ), iStatus );	
-		}
-	else
-		{
-		iLog->Log( _L("ExecuteLeafDataL: ExecuteCommandL FetchLeafObjectL Error ! %d" ), iStatus );	
-		ret = KErrGeneral ;
-		}
-	CleanupStack::PopAndDestroy(); // luid
-	CleanupStack::PopAndDestroy(); // data		
-	CleanupStack::PopAndDestroy(); // nodename	
-	iLog->Log( _L("ExecuteLeafDataL Test Complete with status %d" ), ret );	
-
-    return ret;
-	}
-	
-	
-	//Newly added
-TInt Cdmatest::AddLeafNode( CStifItemParser& aItem )			
-{
-	return KErrNone;
-}
-	
-TInt Cdmatest::InstallActivate( CStifItemParser& aItem )			
-{
-	return KErrNone;	
-}	
-	
-	//Newly ended
-
-
-HBufC8 *Cdmatest::LoadFileLC( const TDesC &aFileName, TDataType &aType )	
-	{
-	RFs fs ;
-	LEAVE_IF_ERROR( fs.Connect(), _L( "Could not connect fileserver: %d"  ) );
-	
-	CleanupClosePushL( fs );
-	RFile file ;
-	LEAVE_IF_ERROR( file.Open(fs,aFileName,EFileRead), _L( "Could not open file: %d" ) );
-	
-	
-	
-	CleanupClosePushL( file );
-	TInt dataSize ;
-	LEAVE_IF_ERROR( file.Size( dataSize ), _L( "Could not get file size: %d" ) );
-	HBufC8 *nodedata = HBufC8::NewL ( dataSize );
-	CleanupStack::PushL( nodedata );
-	TPtr8 nodedataptr( nodedata->Des() );
-	LEAVE_IF_ERROR( file.Read( nodedataptr ), _L( "Could not read file: %d" ) );
-	TDataRecognitionResult aDataType;
-	RApaLsSession ls ;
-	TInt err( ls.Connect() );
-	if ( err == KErrNone )
-		{
-		CleanupClosePushL( ls );
-		err = ls.RecognizeData(aFileName, nodedataptr, aDataType)  ;
-		if ( err == KErrNone )
-			{
-			aType = aDataType.iDataType;
-			}
-		else
-			{
-			iLog->Log( _L("LoadFileLC: WARNING Failed to get type: %d" ), err );
-			aType = TDataType( KDefaultType );
-			}	
-		CleanupStack::PopAndDestroy( &ls ); 
-		}
-	else
-		{
-		iLog->Log( _L("LoadFileLC: WARNING Failed to connect rapalssession: %d" ), err );
-		}	
-	CleanupStack::Pop( nodedata );
-	CleanupStack::PopAndDestroy( &file ); 
-	CleanupStack::PopAndDestroy( &fs ); 
-	CleanupStack::PushL( nodedata );
-	return nodedata ;
-	}
-
-HBufC8 *Cdmatest::LoadFileLC( const TDesC8 &aFileName, TDataType &aType )	
-	{
-	TFileName fn ;
-	fn.Copy( aFileName );
-	return LoadFileLC( fn, aType );
-	}
-	
-
-void Cdmatest::SaveDataL( TInt /*aResultsRef*/, CBufBase& aObject,
-							  const TDesC8& aType ) 
-	{
-	iLog->Log( _L8( "Saving data of type: '%S'" ), &aType );
-	RFs fs;
-	User::LeaveIfError( fs.Connect() );
-	CleanupClosePushL( fs );
-	RFile file;
-	User::LeaveIfError( file.Replace ( fs, iSaveFileName, EFileWrite ) );
-	CleanupClosePushL( file );
-	TPtrC8 p( aObject.Ptr( 0 ) );
-	User::LeaveIfError( file.Write( p ) );
-	CleanupStack::PopAndDestroy( 2 ); // file, fs
-	}
-							  
-		
-	
-void Cdmatest::FetchNodeResultsL( TInt /*aResultsRef*/, CBufBase& aObject,
-							  const TDesC8& /*aType*/ )
-	{
-	TPtrC8 ptr( aObject.Ptr( 0 ) );	
-	iLog->Log( _L8("FetchNodeResultsL for '%S': '%S'" ), iURI, &ptr );
-	
-	if ( ptr.Length() > 0 )
-		{
-		TPtrC8 last( LastURISeg( ptr ) );
-		HBufC8 *oldUri = HBufC8::NewL( iURI->Length() );
-		(*oldUri) = *iURI; 
-		do 
-			{
-			iLog->Log ( _L8( " Node: '%S' "), &last );
-			HBufC8 *nUri = HBufC8::NewLC( oldUri->Length() + 1 + last.Length() );
-			nUri->Des().Copy( *oldUri ) ;
-			nUri->Des().Append( '/' );
-			nUri->Des().Append( last );
-			
-			SetURIL( nUri );
-					
-//		    TPtrC8 parentURI(RemoveLastSeg(*nUri));
-//		    HBufC8 *luid = GetLuidAllocLC( parentURI );
-			HBufC8 *luid = GetLuidAllocLC( *iURI );
-			
-			if(*luid != KNullDesC8)
-			{
-			Adapter()->ChildURIListL( *nUri, *luid, *iEmptyMappingInfoArray, 4, 5 );	
-			}
-			else
-			{
-			Adapter()->FetchLeafObjectL( *nUri, KNullDesC8, KEmptyType, 7, 8 ) ;	
-			}
-			//Adapter()->ChildURIListL( *nUri, KNullDesC8, *iEmptyMappingInfoArray, 4, 5 );
-			
-			
-
-			CleanupStack::PopAndDestroy( luid ); 
-			CleanupStack::Pop( nUri );			
-			
-			ptr.Set( RemoveLastURISeg( ptr ) );
-			last.Set( LastURISeg( ptr ) );
-			
-			}
-		while (last != KNullDesC8);	
-		}
-	
-	}
-	
-
-	
-TPtrC8 Cdmatest::LastURISeg( const TDesC8& aURI )
-	{
-	TInt i;
-	for( i = aURI.Length() - 1; i >= 0; i-- ) 
-		{
-		if( aURI[i] == '/' )
-			{
-			break;
-			}
-		}
-
-	if( i == 0 )
-		{
-		return aURI;
-		}
-	else
-		{
-		return aURI.Mid( i+1 );
-		}
-	}
-TPtrC8 Cdmatest::RemoveLastSeg(const TDesC8& aURI)
-	{
-	TInt i;
-	for(i=aURI.Length()-1;i>=0;i--)
-		{
-		if(aURI[i]==KNSmlDMUriSeparator)
-			{
-			break;
-			}
-		}
-
-	if(i>0)
-		{
-		return aURI.Left(i);
-		}
-	else
-		{
-		return KNullDesC8();
-		}
-	}
-
-// ------------------------------------------------------------------------------------------------
-// TPtrC8 Cdmatest::RemoveLastURISeg(const TDesC8& aURI)
-// returns parent uri, i.e. removes last uri segment
-// ------------------------------------------------------------------------------------------------
-TPtrC8 Cdmatest::RemoveLastURISeg( const TDesC8& aURI )
-	{
-	TInt i;
-	for ( i = aURI.Length() - 1; i >= 0 ; i-- )
-		{
-		if( aURI[i] == '/' )
-			{
-			break;
-			}
-		}
-	if ( i > -1 )
-		{
-		return aURI.Left( i );	
-		}
-	else
-		{
-		return KNullDesC8();
-		}
-	}	
-	
-TPtrC Cdmatest::RemoveLastURISeg( const TDesC& aURI )
-	{
-	TInt i;
-	for ( i = aURI.Length() - 1; i >= 0 ; i-- )
-		{
-		if( aURI[i] == '/' )
-			{
-			break;
-			}
-		}
-	if ( i > -1 )
-		{
-		return aURI.Left( i );	
-		}
-	else
-
-		{
-		return KNullDesC();
-		}
-	}		
-	
-void Cdmatest::SetURIL( const TDesC& aURI )
-	{
-	if ( iURI != NULL )
-		{
-		delete iURI ;
-		iURI = NULL;
-		}
-	iURI = HBufC8::NewL( aURI.Length() ) ;
-	iURI->Des().Copy( aURI );
-	}
-	
-void Cdmatest::SetURIL( const TDesC8& aURI )
-	{
-	if ( iURI != NULL )
-		{
-		delete iURI ;
-		iURI = NULL;
-		}
-	iURI = HBufC8::NewL( aURI.Length() ) ;
-	iURI->Des().Copy( aURI );
-	}	
-
-void Cdmatest::SetURIL( HBufC8* aURI )
-	{
-	if ( iURI != NULL )
-		{
-		delete iURI ;
-		iURI = NULL;
-		}
-	iURI = aURI ;
-	}
-		
-		
-		
-void Cdmatest::SetResultsL( 
-	TInt aResultsRef, 
-	CBufBase& aObject,
-	const TDesC8& aType )
-	{
-	TPtrC8 ptr( aObject.Ptr(0) );
-	iLog->Log( _L8( "SetResults, ref=%d, object='%S', type='%S'" ), aResultsRef, &ptr, &aType );
-	if ( iResultsFunction )
-		{
-		(this->*iResultsFunction)( aResultsRef, aObject, aType );
-		iResultsFunction = NULL ;
-		}
-	
-	}
-
-
-void Cdmatest::SetStatusL( TInt aStatusRef,
-							 MSmlDmAdapter::TError aErrorCode ) 
-	{
-	iStatus = aErrorCode ;
-	iLog->Log( _L( "SetStatusL, ref=%d, code=%d" ), aStatusRef, aErrorCode );
-	
-	
-	}
-	
-void Cdmatest::SetMappingL( const TDesC8& aURI, const TDesC8& aLUID ) 
-	{
-	iLog->Log( _L8( "SetMappingL, aURI='%s', aLUID='%s'" ), aURI.Ptr(), aLUID.Ptr() );	
-	
-	iMappingTable.Append(TMapping( aURI, aLUID ) )	;
-	}
-	
-HBufC8* Cdmatest::GetLuidAllocL( const TDesC8& aURI ) 
-	{
-	iLog->Log( _L8( "GetLuidAllocL, aURI='%S'" ), &aURI );		
-	HBufC8 *res = NULL;		
-	for( TInt i(0); i < iMappingTable.Count(); i++ )	
-		{
-		if ( aURI == iMappingTable[i].iURI )
-			{
-			res = iMappingTable[i].iLuid.AllocL();
-			}
-		}
-	if ( res == NULL )
-		{
-		res = HBufC8::NewL( 0 );
-		}
-	iLog->Log( _L8( "GetLuidAllocL, response='%S'" ), res );
-	return res;
-	}	    
-    
-HBufC8* Cdmatest::GetLuidAllocLC( const TDesC8& aURI ) 
-	{
-	iLog->Log( _L8( "GetLuidAllocL, aURI='%S'" ), &aURI );
-	HBufC8 *res = NULL;		
-	for( TInt i(0); i < iMappingTable.Count(); i++ )	
-		{
-		if ( aURI == iMappingTable[i].iURI )
-			{
-			res = iMappingTable[i].iLuid.AllocLC();
-			break;
-			}
-		}
-	if ( res == NULL )
-		{
-		res = HBufC8::NewLC( 0 );
-		}
-	iLog->Log( _L8( "GetLuidAllocLC, response='%S'" ), res );
-	return res ;
-	}	
-    	
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-    
-void Cdmatest::GetMappingInfoListL( const TDesC8& /*aURI*/,
-								CArrayFix<TSmlDmMappingInfo>& /*aSegmentList*/ )
-	{
-	// do nothing
-	}								
-
-#else
-// nothing
-#endif
-
-TInt Cdmatest::FetchLeafObjectSizeL( CStifItemParser& aItem )
-	{
-		TInt ret( KErrNone );
-	    // Print to UI
-	    TestModuleIf().Printf( 0, _L("Camtest"), _L("ExecuteLeafL") );
-
-		iResultsFunction = NULL;
-		
-	    TPtrC8 nodename( GetNextStringLC ( aItem, _L("Nodename") )->Des() ) ;
-	    
-	    //TPtrC datafile;
-	    TInt i( 0 );
-	    TPtrC datafile( KNullDesC );
-	    i = aItem.GetNextString ( datafile ) ;
-	    if ( i != KErrNone ) 
-		    {
-		    iLog->Log(_L("FetchLeafL: ERROR Reading outfile argument: 0x%X"), i );
-		    //return i;
-		    }
-		else
-			{
-			iSaveFileName = datafile;
-			iLog->Log( _L( " Save file name is '%S'" ), &iSaveFileName );
-			iResultsFunction = SaveDataL;
-			}	    
-		SetURIL(nodename) ;
-
-//		HBufC8 *luid = GetLuidAllocLC( *iURI );
-	    TPtrC8 parentURI(RemoveLastSeg(nodename));
-	    HBufC8 *luid = GetLuidAllocLC( parentURI );
-
-		CleanupStack::PushL( luid );
-
-//		void FetchLeafObjectSizeL( const TDesC8& aURI, const TDesC8& aLUID, const TDesC8& aType, TInt aResultsRef, TInt aStatusRef );
-		iAdapter->FetchLeafObjectSizeL( *iURI, *luid, KEmptyType, 7, 8 );
-		if ( iStatus == MSmlDmAdapter::EOk )
-			{
-			iLog->Log( _L("FetchLeafObjectSizeL: FetchLeafObjectSizeL Successful! %d" ), iStatus );	
-			}
-		else
-			{
-			iLog->Log( _L("FetchLeafObjectSizeL: FetchLeafObjectSizeL Error ! %d" ), iStatus );	
-			ret = KErrGeneral ;
-			}
-
-
-
-		// Cleanup
-		CleanupStack::PopAndDestroy();
-		CleanupStack::Pop( luid );
-		CleanupStack::PopAndDestroy();//nodename
-//		CleanupStack::PopAndDestroy();//nodename
-		
-		
-			iLog->Log( _L("FetchLeafObjectSizeL Test Complete with status %d" ), ret );	
-		return ret;
-	}
-
-/*TInt Cdmatest::BareAppInstallL( CStifItemParser& aItem )
-    {
-    
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("amtest"), _L("In InstallL") );
-    // Print to log file
-    iLog->Log(_L("In DetailsL"));
-
-    TInt aluidi( 0 );
-    TUint32 aLuidInt;
-    aluidi = aItem.GetNextInt ( (TInt&)aLuidInt ) ;
-	
-	
-    TPtrC8 nodename( GetNextStringLC ( aItem, _L("Node name") )->Des() ) ;
-    
-	
-    SetURIL( nodename );
-    
-    HBufC8 *luid = GetLuidAllocLC( *iURI );
-    MSmlDmAdapter::TError ret( MSmlDmAdapter::EError );
-	
-	TRAPD( err, Adapter()->InstallL(aluidi,*iURI, *luid,3 ,ret));
-
-    return err;
-
-    }*/
-
-
-//  End of File
--- a/customization/DMUtils/bld/DMUtils.mmp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,84 +0,0 @@
-/*
-* Copyright (c) 2002 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: Implementation of customization components
-*
-*/
-
-
-// To get the APP_LAYER_SYSTEMINCLUDE-definition
-#include <platform_paths.hrh>
-
-#define STATIC_DMUTILS_LIB 1
-//#define DYNAMIC_DMUTILS_LIB 1
-
-#ifdef DYNAMIC_DMUTILS_LIB
-#include "defaultcaps.hrh"
-CAPABILITY      CAP_GENERAL_DLL
-#endif
-
-#ifdef DYNAMIC_DMUTILS_LIB
-TARGET          DMUtils.dll
-TARGETTYPE      DLL
-#endif
-
-#ifdef STATIC_DMUTILS_LIB
-TARGET          dmutils.lib
-TARGETTYPE      LIB
-#endif
-
-
-APP_LAYER_SYSTEMINCLUDE
-SYSTEMINCLUDE   /epoc32/include/swi
-SYSTEMINCLUDE 	/epoc32/include/ecom
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-SYSTEMINCLUDE 	/epoc32/include/devman
-#else
-// nothing
-#endif
-
-SOURCEPATH      ../src
-USERINCLUDE     ../inc
-USERINCLUDE     ../../include
-
-SOURCE          FileCoderB64.cpp
-SOURCE          nsmldmuri.cpp
-SOURCE          TARMDmAdapter.cpp
-SOURCE          TARMDmStreamAdapter.cpp
-SOURCE          nsmldmiapmatcher.cpp
-SOURCE          TARMCharConv.cpp
-
-LIBRARY         euser.lib
-LIBRARY         ecom.lib
-LIBRARY					charconv.lib
-LIBRARY         sysutil.lib
-LIBRARY					edbms.lib
-LIBRARY         bafl.lib
-LIBRARY         commonengine.lib
-LIBRARY         imut.lib
-LIBRARY         apparc.lib
-LIBRARY         ws32.lib
-LIBRARY         apgrfx.lib
-LIBRARY         cone.lib
-LIBRARY         efsrv.lib // RFile
-LIBRARY         estor.lib // RFileWriteStream
-LIBRARY 				flogger.lib
-LIBRARY         featmgr.lib
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-LIBRARY		      devmancmdmgr.lib
-#else
-// nothing
-#endif
-
-SMPSAFE
--- a/customization/DMUtils/bld/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-/*
-* Copyright (c) 2002 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:  build info file for DMUtils
-*
-*/
-
-
-PRJ_MMPFILES
-./DMUtils.mmp
--- a/customization/DMUtils/inc/FileCoderB64.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,71 +0,0 @@
-/*
-* Copyright (c) 2002-2004 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: Implementation of customization components
-*
-*/
-
-
-
-#ifndef FILE_CODER_B64_H
-#define FILE_CODER_B64_H
-
-//  INCLUDES
-#include <e32base.h>
-
-
-// CLASS DECLARATION
-
-/**
-*  ?one_line_short_description.
-*  ?other_description_lines
-*
-*  @lib ?library
-*  @since Series ?XX ?SeriesXX_version
-*/
-class TFileCoderB64 // : public ?base_class_list
-    {
-
-    public: // New functions
-        
-        /**
-        * Encode data from given file to memory with B64 coding.
-        * @since Series 60 3.1
-        * @param aFileName file to be encoded
-        * @param aData return encoded data object
-        * @return void
-        */
-        TInt EncodeL( const TDesC8& aFileName, CBufFlat &aData ) const;
-        TInt EncodeL( const TDesC8& aFileName, HBufC8* &aData ) const;
-
-        /**
-        * Decode B64 data to temporary file.
-        * @since Series 60 3.1
-        * @param aData Data object to be decoded
-        * @param aFileName return created temporary file name
-        * @return void
-        */
-        void DecodeL( const TDesC8& aData, TDes& aFileName ) const;
-
-        void DecodeToL( const TDesC8& aData, const TDesC& aFileName ) const;
-        
-    public: // static function
-    
-    	static TBool CheckB64Encode( const TDesC8& aData );
-        
-
-    };
-
-#endif      // FILE_CODER_B64_H
-            
-// End of File
--- a/customization/DMUtils/inc/TARMCharConv.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-/*
-* 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:  TARM character conversion methods
-*
-*/
-
-
-// Link _your_ project with CharConv.lib if you use these methods
-
-#ifndef __TARMCharConv_H__
-#define __TARMCharConv_H__
-
-#include <e32base.h>
-#include "nsmldmuri.h" // For export macros
-
-class CTARMCharConv : public CBase
-    {
-    private:
-    CTARMCharConv();
-    
-    public:
-    NSMLDMURI_IMPORT_C static HBufC8*  ConvertToUtf8LC(const TDesC16& aText);
-    NSMLDMURI_IMPORT_C static HBufC16* ConvertFromUtf8LC(const TDesC8& aText);
-    };
-
-#endif //__TARMCharConv_H__
--- a/customization/DMUtils/inc/TARMDmAdapter.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,99 +0,0 @@
-/*
-* Copyright (c) 2002-2004 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: Implementation of customization components
-*
-*/
-
-
-
-#ifndef __TARMDmAdapter_H__
-#define __TARMDmAdapter_H__
-
-//  INCLUDES
-#include <e32base.h>
-#include <smldmadapter.h>
-
-//#ifdef __SAP_POLICY_MANAGEMENT
-#include <PolicyEngineClient.h>
-//#endif
-
-
-
-
-// Adapter to check policy and if allowed to call "original" adapter
-class CTARMDmAdapter : public CSmlDmAdapter
-	{
-public:
-
-	// Implementation of MSmlDmAdapter interface functions that make policy checks
-	// ===========================================================================
-private:
-	void UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, const TDesC8& aObject, const TDesC8& aType, TInt aStatusRef );
-	void UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, RWriteStream*& aStream, const TDesC8& aType, TInt aStatusRef );
-	void DeleteObjectL( const TDesC8& aURI, const TDesC8& aLUID, TInt aStatusRef );
-	void FetchLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, const TDesC8& aType, TInt aResultsRef, TInt aStatusRef );
-	void FetchLeafObjectSizeL( const TDesC8& aURI, const TDesC8& aLUID, const TDesC8& aType, TInt aResultsRef, TInt aStatusRef );
-	void ChildURIListL( const TDesC8& aURI, const TDesC8& aLUID, const CArrayFix<TSmlDmMappingInfo>& aPreviousURISegmentList, TInt aResultsRef, TInt aStatusRef );
-
-	void AddNodeObjectL( const TDesC8& aURI, const TDesC8& aParentLUID, TInt aStatusRef );
-	void ExecuteCommandL( const TDesC8& aURI, const TDesC8& aLUID, const TDesC8& aArgument, const TDesC8& aType, TInt aStatusRef );
-	void ExecuteCommandL( const TDesC8& aURI, const TDesC8& aLUID, RWriteStream*& aStream, const TDesC8& aType, TInt aStatusRef );
-	void CopyCommandL( const TDesC8& aTargetURI, const TDesC8& aTargetLUID, const TDesC8& aSourceURI, const TDesC8& aSourceLUID, const TDesC8& aType, TInt aStatusRef );
-
-	// Implementation of MSmlDmAdapter interface functions AFTER policy checks
-	// =======================================================================
-public:
-	virtual void _UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, const TDesC8& aObject, const TDesC8& aType, TInt aStatusRef ) = 0;
-	virtual void _UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, RWriteStream*& aStream, const TDesC8& aType, TInt aStatusRef ) = 0;
-	virtual void _DeleteObjectL( const TDesC8& aURI, const TDesC8& aLUID, TInt aStatusRef ) = 0;
-	virtual void _FetchLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, const TDesC8& aType, TInt aResultsRef, TInt aStatusRef ) = 0;
-	virtual void _FetchLeafObjectSizeL( const TDesC8& aURI, const TDesC8& aLUID, const TDesC8& aType, TInt aResultsRef, TInt aStatusRef ) = 0;
-	virtual void _ChildURIListL( const TDesC8& aURI, const TDesC8& aLUID, const CArrayFix<TSmlDmMappingInfo>& aPreviousURISegmentList, TInt aResultsRef, TInt aStatusRef ) = 0;
-
-	virtual void _AddNodeObjectL( const TDesC8& aURI, const TDesC8& aParentLUID, TInt aStatusRef ) = 0;
-	virtual void _ExecuteCommandL( const TDesC8& aURI, const TDesC8& aLUID, const TDesC8& aArgument, const TDesC8& aType, TInt aStatusRef ) = 0;
-	virtual void _ExecuteCommandL( const TDesC8& aURI, const TDesC8& aLUID, RWriteStream*& aStream, const TDesC8& aType, TInt aStatusRef ) = 0;
-	virtual void _CopyCommandL( const TDesC8& aTargetURI, const TDesC8& aTargetLUID, const TDesC8& aSourceURI, const TDesC8& aSourceLUID, const TDesC8& aType, TInt aStatusRef ) = 0;
-
-	// Other
-
-//#ifdef __SAP_POLICY_MANAGEMENT
-	// PolicyCheck
-	virtual TPtrC8 PolicyRequestResourceL( const TDesC8& aURI ) = 0;
-	virtual TInt CheckPolicyL( const TDesC8& aURI );
-	virtual TInt CheckPolicy2L( const TDesC8& aResource );
-//#endif
-	// Other
-
-protected:
-	CTARMDmAdapter( MSmlDmCallback* aCallback );
-	virtual ~CTARMDmAdapter();
-
-private:
-	virtual void InitializeL();
-
-protected:
-	TBool iInitialized;
-	
-private:
-
-//#ifdef __SAP_POLICY_MANAGEMENT
-    RPolicyEngine   iPE;
-    RPolicyRequest  iPR;
-//#endif    
-	};
-
-#endif      // __TARMDmAdapter_H__
-
-// End of File
--- a/customization/DMUtils/inc/TARMDmStreamAdapter.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,184 +0,0 @@
-/*
-* Copyright (c) 2002-2004 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: Implementation of customization components
-*
-*/
-
-
-#ifndef __TARMDmStreamAdapter_H__
-#define __TARMDmStreamAdapter_H__
-
-//  INCLUDES
-#include <e32base.h>
-#include <s32file.h> //RFileWriteStream
-#include "TARMDmAdapter.h"
-
-/**
-* This class adds streaming support to CTARMDmAdapter
-*
-* To enable streaming in your adapter:
-*
-* 1) Inherit from CTARMDmStreamAdapter
-* 2) Implement StreamingSupport (to return ETrue and set item size)
-* 3) Implement StreamType to return the stream support type
-*
-* Stream types:
-*
-* - EStreamToBuffer to get data in aObject argument
-* - EStreamToFile to get data in a file, file name is in iFileStoreFileName
-* - EStreamToNone to use streaming methods of CTARMDmAdapter
-*
-* 4) Use CTARMDmStreamAdapter::StreamCommittedL()
-*
-* StreamCommittedL will complete operation with call to the non-streaming method:
-*
-* - _UpdateLeafObjectL or
-* - _ExecuteCommandL
-*
-*
-*/
-class CTARMDmStreamAdapter : public CTARMDmAdapter
-	{
-public:
-    enum TAdapterStreamType
-        {
-        EStreamToNone,        
-        EStreamToBuffer,
-        EStreamToFile
-        };
-
-    class CTARMDmStreamAdapterBuffer : public CBase
-        {
-        public:
-        
-            enum TTARMDMAction
-                {
-                ETARMActionNone,
-                ETARMActionUpdate,
-                ETARMActionExecute,
-                };
-        private:
-            HBufC8 *iURI;
-            HBufC8 *iLUID;
-            HBufC8 *iType;
-            TInt iStatusRef;
-            TInt iResultRef;
-            CTARMDmStreamAdapterBuffer::TTARMDMAction iAction; 
-        public:
-            CTARMDmStreamAdapterBuffer::CTARMDmStreamAdapterBuffer()
-                : iURI( 0 )
-                , iLUID( 0 )
-                , iType( 0 )
-                , iStatusRef( 0 )
-                , iResultRef( 0 )
-                , iAction( CTARMDmStreamAdapterBuffer::ETARMActionNone )
-                {
-                }
-             static CTARMDmStreamAdapterBuffer* CTARMDmStreamAdapterBuffer::NewL(
-                        const TDesC8 &aURI,
-                        const TDesC8 &aLUID,
-                        const TDesC8 &aType,
-                        TInt aStatusRef,
-                        TInt aResultRef,
-                        CTARMDmStreamAdapterBuffer::TTARMDMAction aAction
-                        )
-                {
-                CTARMDmStreamAdapterBuffer* newObject = new (ELeave) CTARMDmStreamAdapterBuffer();
-                newObject->iURI  = aURI.AllocL();
-                newObject->iLUID = aLUID.AllocL();
-                newObject->iType = aType.AllocL();
-                newObject->iStatusRef = aStatusRef;
-                newObject->iResultRef = aResultRef;
-                newObject->iAction = aAction;
-                return newObject;
-                }
-            CTARMDmStreamAdapterBuffer::~CTARMDmStreamAdapterBuffer()
-                {
-                delete iURI;
-                delete iLUID;
-                delete iType;
-                }
-            const TDesC8& CTARMDmStreamAdapterBuffer::URI() const
-                {
-                return *iURI;
-                }
-            const TDesC8& CTARMDmStreamAdapterBuffer::LUID() const
-                {
-                return *iLUID;
-                }
-            const TDesC8& CTARMDmStreamAdapterBuffer::Type() const
-                {
-                return *iType;
-                }
-            TInt CTARMDmStreamAdapterBuffer::StatusRef() const
-                {
-                return iStatusRef;
-                }
-            TInt CTARMDmStreamAdapterBuffer::ResultRef() const
-                {
-                return iResultRef;
-                }
-            CTARMDmStreamAdapterBuffer::TTARMDMAction CTARMDmStreamAdapterBuffer::Action() const
-                {
-                return iAction;
-                }
-        };
-
-	// Implementation of MSmlDmAdapter interface functions that make policy checks
-	// ===========================================================================
-private:
-	void UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, RWriteStream*& aStream, const TDesC8& aType, TInt aStatusRef );
-	void ExecuteCommandL( const TDesC8& aURI, const TDesC8& aLUID, RWriteStream*& aStream, const TDesC8& aType, TInt aStatusRef );
-
-	// Implementation of MSmlDmAdapter interface functions AFTER policy checks
-	// =======================================================================
-public:
-	virtual void _UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, const TDesC8& aObject, const TDesC8& aType, TInt aStatusRef ) = 0;
-	virtual void _ExecuteCommandL( const TDesC8& aURI, const TDesC8& aLUID, const TDesC8& aArgument, const TDesC8& aType, TInt aStatusRef ) = 0;
-	virtual void _UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, RWriteStream*& aStream, const TDesC8& aType, TInt aStatusRef ) = 0;
-	virtual void _ExecuteCommandL( const TDesC8& aURI, const TDesC8& aLUID, RWriteStream*& aStream, const TDesC8& aType, TInt aStatusRef ) = 0;
-
-	// Other
-	virtual TAdapterStreamType StreamType( const TDesC8& aURI );
-	void StreamToBufferL( RWriteStream*& aStream );
-	void StreamToFileL( RWriteStream*& aStream );
-#ifdef __TARM_SYMBIAN_CONVERGENCY	
-		virtual void StreamCommittedL( RWriteStream& aStream );
-#else
-		virtual void StreamCommittedL();
-#endif	
-
-    void SetActionInfoL( CTARMDmStreamAdapterBuffer::TTARMDMAction aAction,
-                         const TDesC8& aURI, const TDesC8& aLUID, const TDesC8& aType,
-                         TInt aStatusRef, TInt aResultRef );
-    void ClearActionInfo();
-    CTARMDmStreamAdapterBuffer& ActionInfoL();
-    void CommitActionL( const TDesC8& aObject );
-
-protected:
-	CTARMDmStreamAdapter( MSmlDmCallback* aCallback );
-	virtual ~CTARMDmStreamAdapter();
-
-private:
-    RFs                 iFs;
-    RFileWriteStream    iWriteStream;
-    TFileName           iFileStoreFileName;
-    TAdapterStreamType  iStreamType;
-
-    CTARMDmStreamAdapterBuffer *iActionInfo;
-	};
-
-#endif      // __TARMDmStreamAdapter_H__
-
-// End of File
--- a/customization/DMUtils/inc/TPtrC8I.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,76 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of customization components
-*
-*/
-#ifndef _TPTRC8I_H_INCLUDED_
-#define _TPTRC8I_H_INCLUDED_
-
-class TPtrC8I : public TPtrC8
-	{
-	public:
-
-	inline TPtrC8I( const TDesC8 &aDes ): TPtrC8( aDes )
-		{
-		}
-
-	inline TBool operator==( const TDesC8 &aDes )
-		{
-		HBufC8* copyThis  = this->Alloc();
-		TPtr8 ptrThis     = copyThis->Des();
-
-		HBufC8* copyParam = aDes.Alloc();
-		TPtr8 ptrParam    = copyParam->Des();
-
-		ptrThis.LowerCase();
-		ptrThis.TrimAll();
-		ptrParam.LowerCase();
-		ptrParam.TrimAll();
-		TBool ret = ptrParam == ptrThis;
-		delete copyParam;
-		delete copyThis;
-
-		return ret;
-		}
-	};
-
-class TPtrC16I : public TPtrC16
-	{
-	public:
-
-	inline TPtrC16I( const TDesC16 &aDes ): TPtrC16( aDes )
-		{
-		}
-
-	inline TBool operator==( const TDesC16 &aDes )
-		{
-		HBufC16* copyThis  = this->Alloc();
-		TPtr16   ptrThis   = copyThis->Des();
-
-		HBufC16* copyParam = aDes.Alloc();
-		TPtr16   ptrParam  = copyParam->Des();
-
-		ptrThis.LowerCase();
-		ptrThis.TrimAll();
-		ptrParam.LowerCase();
-		ptrParam.TrimAll();
-		TBool ret = ptrParam == ptrThis;
-		delete copyParam;
-		delete copyThis;
-
-		return ret;
-		}
-	};
-
-#endif //_TPTRC8I_H_INCLUDED_
--- a/customization/DMUtils/inc/nsmldmiapmatcher.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,129 +0,0 @@
-/*
-* 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:  DM Tree module
-*
-*/
-
-
-#ifndef __NSMLDMIAPMATCHER_H__
-#define __NSMLDMIAPMATCHER_H__
-
-// ------------------------------------------------------------------------------------------------
-// Includes
-// ------------------------------------------------------------------------------------------------
-#include <e32base.h>
-#include "nsmldmuri.h"
-
-//CLASS FORWARDS
-class MSmlDmCallback;
-
-_LIT8( KNSmlDMIAPUri, "AP" );
-_LIT8( KNSmlDMSeparator8, "/" );
-_LIT8( KNSmlDMIAPUriDotSlash, "./" );
-_LIT8( KNSmlDMConnMOIAPUri, "NAP" );
-
-const TUint8 KNSmlDMSlash = 0x2f; //forward slash
-/**
-* CNSmlDMIAPMatcher contains services for generating URI from IAPId and
-* vice versa in DM plug-in adapters. The class needs the working
-* MSmlDmCallback callback interface for operating, so ths can be used only
-* by DM plug-in adapters
-*
-*  @since
-*/
-class CNSmlDMIAPMatcher : public CBase
-	{
-    public:
-		/**
-		* Destructor
-		*/
-	    ~CNSmlDMIAPMatcher();
-
-		/**
-		* Two-phased constructor
-		* @param	aDmCallback			Pointer to callback interface
-		* @return						Pointer to newly created module instance
-		*/
-        NSMLDMURI_IMPORT_C static CNSmlDMIAPMatcher* NewL( MSmlDmCallback* aDmCallback);
-
-		/**
-		* Two-phased constructor, pushes pointer to cleanup stack.
-		* @param	aDmCallback			Pointer to callback interface
-		* @return						Pointer to newly created module instance
-		*/
-        NSMLDMURI_IMPORT_C static CNSmlDMIAPMatcher* NewLC( MSmlDmCallback* aDmCallback);
-
-		/**
-		* Gets the IAP id which corresponds to given URI
-		* @param	aURI				Accespoint URI
-		* @return						Accespoint id in AP database
-		*/
-        NSMLDMURI_IMPORT_C TInt IAPIdFromURIL( const TDesC8& aURI );
-
-		/**
-		* Generates the URI which corresponds to given IAP Id
-		* @param	aIAPId				Accespoint Id
-		* @return						Accesspoint URI in DM
-		*/
-        NSMLDMURI_IMPORT_C HBufC8* URIFromIAPIdL( TInt aIAPId );
-
-    private:
-		/**
-		* Second phase constructor
-		* @param	aDmCallback			Pointer to callback interface
-		*/
-        void ConstructL(MSmlDmCallback* aDmCallback);
-
-		/**
-		* Changes the given descriptor to Integer
-		* @param	aLuid				Luid in descriptor format
-		* @return						Luid in TInt type
-		*/
-        TInt DesToInt(const TDesC8& aLuid) const;
-
-		/**
-		* Return the URI without ./ at the beginning, if those exist
-		* @param	aURI		Uri
-		* @return 		 		Uri without ./
-		*/
-        TPtrC8 RemoveDotSlash(const TDesC8& aURI) const;
-
-		/**
-		* Return the last uri segment of the aURI
-		* @param	aURI		Uri
-		* @return 		 		The last uri segment
-		*/
-        TPtrC8 LastURISeg(const TDesC8& aURI) const;
-        
-     /**
-		* Return the last uri segment of the aURI
-		* @return 		 		The AccessPoint Reference
-		*/
-        const TDesC8& GetConRef() ;   
-
-    private:
-    
- 		/**
-		* Pointer to callback interface
-		*/
-		MSmlDmCallback* iCallback;
-		
-		/**
-		* Boolean to check FeatMgr Initialization
-		*/
-		TBool iFeatMgrInitialized;
-	
-	};
-
-#endif // __NSMLDMIAPMATCHER_H__
--- a/customization/DMUtils/inc/nsmldmuri.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-/*
-* Copyright (c) 2002 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:  DM tree etc.
-*
-*/
-
-
-
-#ifndef __NSMLDMURI_H
-#define __NSMLDMURI_H
-
-#include <e32std.h>
-#include <e32base.h>
-
-#define KNSmlDMUriSeparator '/'
-_LIT8(KNSmlDmRootUri, ".");
-_LIT8(KNSmlDmUriDotSlash, "./");
-_LIT8( KNSmlDmQuestionMark, "?" );
-//#define KNSmlDMMappingSeparator '&'
-//#define KNSmlDMAclSeparator '+'
-//#define KNSmlDMAclUriSeparator 0xa
-//#define KNSmlDMAclCommandSeparator '&'
-
-// Choose one depending on library type
-#define STATIC_DMUTILS_LIB 1
-//#define DYNAMIC_DMUTILS_LIB 1
-
-#ifdef STATIC_DMUTILS_LIB
-#define NSMLDMURI_IMPORT_C
-#define NSMLDMURI_EXPORT_C
-#else
-#define NSMLDMURI_IMPORT_C IMPORT_C
-#define NSMLDMURI_EXPORT_C EXPORT_C
-#endif
-
-// ===========================================================================
-// NSmlDmURI
-// ===========================================================================
-class NSmlDmURI
-	{
-	public:
-	NSMLDMURI_IMPORT_C static TPtrC8 ParentURI(const TDesC8& aURI);
-	NSMLDMURI_IMPORT_C static TPtrC8 LastURISeg(const TDesC8& aURI);
-	NSMLDMURI_IMPORT_C static TPtrC8 RemoveDotSlash(const TDesC8& aURI);
-	NSMLDMURI_IMPORT_C static TPtrC8 RemoveProp(const TDesC8& aURI);
-	NSMLDMURI_IMPORT_C static TPtrC8 RemoveLastSeg(const TDesC8& aURI);
-	NSMLDMURI_IMPORT_C static TPtrC8 URISeg(const TDesC8& aURI,TInt aLocation,TInt aSegCount=1);
-	NSMLDMURI_IMPORT_C static TInt NumOfURISegs(const TDesC8& aURI);
-	};
-
-#endif // __NSMLDMURI_H
--- a/customization/DMUtils/src/FileCoderB64.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,246 +0,0 @@
-/*
-* Copyright (c) 2002-2004 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:  $Description: $
-*
-*/
-
-
-
-// INCLUDE FILES
-#include "FileCoderB64.h"
-#include <f32file.h>
-#include <imcvcodc.h>
-
-
-// -----------------------------------------------------------------------------
-// TFileCoderB64::EncodeL()
-// Encode file content to memory
-// -----------------------------------------------------------------------------
-//
-TInt TFileCoderB64::EncodeL( const TDesC8& aFileName, CBufFlat &aData ) const
-    {
-	TInt err( KErrNone );
-	TInt size( 0 );
-
-	RFs fs ;
-	CleanupClosePushL( fs );
-
-	RFile f ;
-	CleanupClosePushL( f );
-
-	User::LeaveIfError ( fs.Connect() );
-
-	TFileName fileName;
-	fileName.Copy( aFileName ); // Convert from TDesC8 to TDes16
-	err = f.Open ( fs, fileName, EFileRead );
-	User::LeaveIfError( err );
-	if ( err == KErrNone )
-		{
-		err = f.Size( size );
-		}
-			
-	if ( err == KErrNone ) 
-		{
-		aData.ResizeL( ( size * 4 + 2 ) / 3 );
-		HBufC8 *data = HBufC8::NewLC( size );
-
-		TPtr8 dataPtr( data->Des() );
-		err = f.Read( dataPtr );
-
-		TImCodecB64 B64Coder;
-		
-		TPtr8 targetPtr( aData.Ptr( 0 ) );
-		B64Coder.Encode( *data, targetPtr ); //target->Des() );
-
-		CleanupStack::PopAndDestroy( data ); // data
-		}
-			
-	CleanupStack::PopAndDestroy( &f ); // f
-	CleanupStack::PopAndDestroy( &fs ); // fs
-	
-	return err;
-    }
-
-TInt TFileCoderB64::EncodeL( const TDesC8& aFileName, HBufC8* &aData ) const
-    {
-	TInt err( KErrNone );
-	TInt size( 0 );
-
-	RFs fs ;
-	CleanupClosePushL( fs );
-
-	RFile f ;
-	CleanupClosePushL( f );
-
-	User::LeaveIfError ( fs.Connect() );
-
-	TFileName fileName;
-	fileName.Copy( aFileName ); // Convert from TDesC8 to TDes16
-	err = f.Open ( fs, fileName, EFileRead );
-	User::LeaveIfError( err );
-	if ( err == KErrNone )
-		{
-		err = f.Size( size );
-		}
-			
-	if ( err == KErrNone ) 
-		{
-		aData = HBufC8::NewLC( ( size * 4 + 2 ) / 3 );
-		HBufC8 *data = HBufC8::NewLC( size );
-
-		TPtr8 dataPtr( data->Des() );
-		err = f.Read( dataPtr );
-
-		TImCodecB64 B64Coder;
-
-		TPtr8 targetPtr( aData->Des() );
-		B64Coder.Encode( dataPtr, targetPtr ); //target->Des() );
-
-		CleanupStack::PopAndDestroy( data ); // data
-		CleanupStack::Pop( aData ); // aData
-		}
-			
-	CleanupStack::PopAndDestroy( &f ); // f
-	CleanupStack::PopAndDestroy( &fs ); // fs
-
-	return err;
-    }
-
-// -----------------------------------------------------------------------------
-// TFileCoderB64::DecodeL()
-// Create temporay file and decode data to it
-// -----------------------------------------------------------------------------
-//
-
-
-void TFileCoderB64::DecodeL( const TDesC8& aData, TDes& aFileName ) const
-	{
-	TInt err( KErrNone );
-
-	RFs fs ;
-	CleanupClosePushL( fs );
-
-	RFile f ;
-	CleanupClosePushL( f );
-
-	User::LeaveIfError ( fs.Connect() );
-
-	_LIT(KTmpFilePath, "c:\\system\\temp\\");
-
-	err = fs.MkDirAll( KTmpFilePath );
-//sf-	err = f.Temp(fs, KTmpFilePath, aFileName, EFileWrite);
-	TFileName buf;
-	err = f.Temp(fs, KTmpFilePath, buf, EFileWrite);
-	User::LeaveIfError( err );
-	aFileName = buf;
-	
-	if ( err == KErrNone )
-		{
-		}
-		
-	if ( err == KErrNone )
-		{
-		TImCodecB64 B64Coder;
-		HBufC8 *target = HBufC8::NewLC( ( aData.Length() * 3 ) / 4 );
-		TPtr8 targetPtr( target->Des() );
-		TBool result = B64Coder.Decode( aData, targetPtr );
-		if( result )
-			{
-			User::Leave( KErrNotSupported );
-			}
-
-		f.Write ( targetPtr );
-		f.Flush();
-		f.Close();
-
-		CleanupStack::PopAndDestroy( target );
-		}
-
-	CleanupStack::PopAndDestroy( &f ); // f
-	CleanupStack::PopAndDestroy( &fs ); // fs
-	}
-
-
-// -----------------------------------------------------------------------------
-// TFileCoderB64::DecodeToL()
-// Open/Create/Replace file and decode data to it
-// -----------------------------------------------------------------------------
-//
-void TFileCoderB64::DecodeToL( const TDesC8& aData, const TDesC& aFileName ) const
-	{
-	TInt err( KErrNone );
-
-	RFs fs ;
-	CleanupClosePushL( fs );
-
-	RFile f ;
-	CleanupClosePushL( f );
-
-	User::LeaveIfError ( fs.Connect() );
-
-	err = fs.MkDirAll( aFileName );
-	err = f.Replace( fs, aFileName, EFileWrite );
-	User::LeaveIfError( err );
-	
-	if ( err == KErrNone )
-		{
-		TImCodecB64 B64Coder;
-		HBufC8 *target = HBufC8::NewLC( ( aData.Length() * 3 ) / 4 );
-		TPtr8 targetPtr( target->Des() );
-		TBool result = B64Coder.Decode( aData, targetPtr );
-		if( result )
-			{
-			User::Leave( KErrNotSupported );
-			}
-
-		f.Write ( targetPtr );
-		f.Flush();
-		f.Close();
-
-		CleanupStack::PopAndDestroy( target );
-		}
-
-	CleanupStack::PopAndDestroy( &f ); // f
-	CleanupStack::PopAndDestroy( &fs ); // fs
-	}
-
-
-TBool TFileCoderB64::CheckB64Encode( const TDesC8& aData )
-	{
-	TInt inputIndex = 0;
-	TInt inputLen = aData.Length();
-	
-	while (inputIndex < inputLen)
-		{
-		const TUint8& p = aData[ inputIndex ];
-
-		if ((p >= 48 && p <=  57) ||
-			(p >= 65 && p <=  90) ||
-			(p >= 97 && p <= 122) ||
-			 p == 43 || p == 47 ||
-			 p == 61 || p == 10 || p == 13 )
-			{
-			}
-		else
-			{
-			return EFalse;
-			}
-
-		inputIndex++;
-			
-		}
-
-	return ETrue;
-	}
-//  End of File  
--- a/customization/DMUtils/src/TARMCharConv.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,103 +0,0 @@
-/*
-* 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:  TARM character conversion methods
-*
-*/
-
-
-#include "TARMCharConv.h"
-
-#include <utf.h>
-
-CTARMCharConv::CTARMCharConv()
-	{
-	
-	}
-
-// ------------------------------------------------------------------------------------------------
-// TInt CTARMCharConv::ConvertToUtf8LC
-// Encodes from Unicode UCS-2 to UTF-8
-// ------------------------------------------------------------------------------------------------
-NSMLDMURI_EXPORT_C HBufC8* CTARMCharConv::ConvertToUtf8LC(const TDesC16& aText)
-    {
-    TPtrC16    remainder( aText );
-    TBuf8<20>  utfBuffer;
-    HBufC8     *ret    = 0;
-    CBufFlat   *buffer = CBufFlat::NewL( 128 );
-    CleanupStack::PushL( buffer );
-
-    TBool finish = EFalse;
-    while( !finish )
-        {
-        utfBuffer.Zero();
-        TInt unconverted = CnvUtfConverter::ConvertFromUnicodeToUtf8( utfBuffer, remainder );
-        if( unconverted >= 0 )
-            {
-            remainder.Set( remainder.Right( unconverted ) );
-            buffer->InsertL( buffer->Size(), utfBuffer );
-            finish = (unconverted == 0);
-            }
-        else
-            {
-            User::Leave( unconverted );
-            }
-        }
-
-    buffer->Compress();
-    ret = buffer->Ptr( 0 ).Alloc();
-    CleanupStack::PopAndDestroy( buffer );
-    CleanupStack::PushL( ret );
-    return ret;
-    }
-
-
-// ------------------------------------------------------------------------------------------------
-// TInt CTARMCharConv::ConvertFromUtf8LC
-// Decodes from UTF-8 to Unicode UCS-2
-// ------------------------------------------------------------------------------------------------
-NSMLDMURI_EXPORT_C HBufC16* CTARMCharConv::ConvertFromUtf8LC(const TDesC8& aText)
-    {
-    TPtrC8     remainder( aText );
-    TBuf16<20> unicodeBuffer;
-    HBufC16    *ret    = 0;
-    CBufFlat   *buffer = CBufFlat::NewL( 128 );
-    CleanupStack::PushL( buffer );
-
-    TBool finish = EFalse;
-    while( !finish )
-        {
-        unicodeBuffer.Zero();
-        TInt unconverted = CnvUtfConverter::ConvertToUnicodeFromUtf8( unicodeBuffer, remainder );
-        if( unconverted >= 0 )
-            {
-            remainder.Set( remainder.Right( unconverted ) );
-            TPtrC8 ptr( reinterpret_cast<const unsigned char*>(unicodeBuffer.Ptr()), unicodeBuffer.Length()*2 );
-            buffer->InsertL( buffer->Size(), ptr );
-            finish = (unconverted == 0);
-            }
-        else
-            {
-            User::Leave( unconverted );
-            }
-        }
-
-    buffer->Compress();
-    TPtrC16 ptr16( reinterpret_cast<const unsigned short*>(buffer->Ptr( 0 ).Ptr()), buffer->Size() / 2 );
-    ret = ptr16.Alloc();
-    CleanupStack::PopAndDestroy( buffer );
-    CleanupStack::PushL( ret );
-    return ret;
-    }
-
-// End of file
--- a/customization/DMUtils/src/TARMDmAdapter.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,509 +0,0 @@
-/*
-* Copyright (c) 2002-2004 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:  $Description: $
-*
-*/
-
-
-
-// INCLUDE FILES
-#include <smldmadapter.h>
-#include <featmgr.h>
-#include "TARMDmAdapter.h"
-#include "debug.h"
-
-//#ifdef __SAP_POLICY_MANAGEMENT
-#include <PolicyEngineClient.h>
-#include <SettingEnforcementInfo.h>
-#include <DMCert.h>
-#include <PolicyEngineXACML.h>
-//#endif
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-//
-// CTARMDmAdapter
-//
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-// -----------------------------------------------------------------------------
-// CTARMDmAdapter::
-// 
-// -----------------------------------------------------------------------------
-//
-CTARMDmAdapter::CTARMDmAdapter( MSmlDmCallback* aCallback )
-	: CSmlDmAdapter( aCallback )
-	, iInitialized( EFalse )
-	{
-	RDEBUG( "CTARMDmAdapter::CTARMDmAdapter" );
-	}
-
-// -----------------------------------------------------------------------------
-// CTARMDmAdapter::
-// 
-// -----------------------------------------------------------------------------
-//
-/*
-void CTARMDmAdapter::ConstructL()
-	{
-    User::LeaveIfError( iPE.Connect() );
-    User::LeaveIfError( iPR.Open( iPE ) );
-	}
-*/
-
-void CTARMDmAdapter::InitializeL()
-	{
-	RDEBUG( "CTARMDmAdapter::InitializeL >" );
-	if ( !iInitialized )
-		{
-//#ifdef __SAP_POLICY_MANAGEMENT			
-TRAPD( errf, FeatureManager::InitializeLibL() );
-	if( errf != KErrNone )
-	{
-		User::Leave(errf);
-	}
-if(FeatureManager::FeatureSupported(KFeatureIdSapPolicyManagement ))
-{
-	    User::LeaveIfError( iPE.Connect() );
-	    User::LeaveIfError( iPR.Open( iPE ) );
-}
-	FeatureManager::UnInitializeLib();
-	    
-//#endif	    
-	    iInitialized = ETrue;
-		}
-    RDEBUG( "CTARMDmAdapter::InitializeL <" );
-	}
-
-// -----------------------------------------------------------------------------
-// CTARMDmAdapter::
-// 
-// -----------------------------------------------------------------------------
-//
-CTARMDmAdapter::~CTARMDmAdapter()
-	{
-	RDEBUG( "CTARMDmAdapter::~CTARMDmAdapter >" );
-	if ( iInitialized )
-		{
-//#ifdef __SAP_POLICY_MANAGEMENT			
-TRAPD( errf, FeatureManager::InitializeLibL() );
-if(errf)
-{
-	RDEBUG( "CTARMDmAdapter::~CTARMDmAdapter error in feature mgr initializing>" );
-}
-	if(FeatureManager::FeatureSupported(KFeatureIdSapPolicyManagement ))
-	{
-		iPR.Close();
-		iPE.Close();
-	}
-	FeatureManager::UnInitializeLib();
-	    
-//#endif			
-		}
-	RDEBUG( "CTARMDmAdapter::~CTARMDmAdapter <" );
-	}
-
-// -----------------------------------------------------------------------------
-// CTARMDmAdapter::
-// 
-// -----------------------------------------------------------------------------
-//
-void CTARMDmAdapter::UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, const TDesC8& aObject, const TDesC8& aType, TInt aStatusRef )
-	{
-	RDEBUG( "CTARMDmAdapter::UpdateLeafObjectL >" );
-//#ifdef __SAP_POLICY_MANAGEMENT	
-	TRAPD( errf, FeatureManager::InitializeLibL() );
-	if( errf != KErrNone )
-		{
-		User::Leave(errf);
-		}
-	if(FeatureManager::FeatureSupported(KFeatureIdSapPolicyManagement))
-	{
-	if (CheckPolicyL( aURI ) != KErrNone)
-		{
-		Callback().SetStatusL( aStatusRef, EError );
-		return;
-		}
-	}
-	FeatureManager::UnInitializeLib();
-//#endif		
-	_UpdateLeafObjectL( aURI, aLUID, aObject, aType, aStatusRef );
-	RDEBUG( "CTARMDmAdapter::UpdateLeafObjectL <" );
-	}
-
-// -----------------------------------------------------------------------------
-// CTARMDmAdapter::
-// 
-// -----------------------------------------------------------------------------
-//
-void CTARMDmAdapter::UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, RWriteStream*& aStream, const TDesC8& aType, TInt aStatusRef )
-	{
-	RDEBUG( "CTARMDmAdapter::UpdateLeafObjectL >" );
-//#ifdef __SAP_POLICY_MANAGEMENT
-	TRAPD( errf, FeatureManager::InitializeLibL() );
-	if( errf != KErrNone )
-		{
-		User::Leave(errf);
-		}
-	if(FeatureManager::FeatureSupported(KFeatureIdSapPolicyManagement))
-	{
-	if (CheckPolicyL( aURI ) != KErrNone)
-		{
-		Callback().SetStatusL( aStatusRef, EError );
-		return;
-		}
-	}
-	FeatureManager::UnInitializeLib();
-//#endif		
-	_UpdateLeafObjectL( aURI, aLUID, aStream, aType, aStatusRef );
-	RDEBUG( "CTARMDmAdapter::UpdateLeafObjectL <" );
-	}
-
-// -----------------------------------------------------------------------------
-// CTARMDmAdapter::
-// 
-// -----------------------------------------------------------------------------
-//
-void CTARMDmAdapter::DeleteObjectL( const TDesC8& aURI, const TDesC8& aLUID, TInt aStatusRef )
-	{
-	RDEBUG( "CTARMDmAdapter::DeleteObjectL >" );
-//#ifdef __SAP_POLICY_MANAGEMENT	
-	TRAPD( errf, FeatureManager::InitializeLibL() );
-	if( errf != KErrNone )
-		{
-		User::Leave(errf);
-		}
-	if(FeatureManager::FeatureSupported(KFeatureIdSapPolicyManagement))
-	{
-	if (CheckPolicyL( aURI ) != KErrNone)
-		{
-		Callback().SetStatusL( aStatusRef, EError );
-		return;
-		}
-	}
-	FeatureManager::UnInitializeLib();
-//#endif		
-	_DeleteObjectL( aURI, aLUID, aStatusRef );
-	RDEBUG( "CTARMDmAdapter::DeleteObjectL <" );
-	}
-
-// -----------------------------------------------------------------------------
-// CTARMDmAdapter::
-// 
-// -----------------------------------------------------------------------------
-//
-void CTARMDmAdapter::FetchLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, const TDesC8& aType, TInt aResultsRef, TInt aStatusRef )
-	{
-	RDEBUG( "CTARMDmAdapter::FetchLeafObjectL >" );
-//#ifdef __SAP_POLICY_MANAGEMENT	
-	TRAPD( errf, FeatureManager::InitializeLibL() );
-	if( errf != KErrNone )
-		{
-		User::Leave(errf);
-		}
-	if(FeatureManager::FeatureSupported(KFeatureIdSapPolicyManagement))
-	{
-	if (CheckPolicyL( aURI ) != KErrNone)
-		{
-		Callback().SetStatusL( aStatusRef, EError );
-		return;
-		}
-	}
-	FeatureManager::UnInitializeLib();
-//#endif		
-	_FetchLeafObjectL( aURI, aLUID, aType, aResultsRef, aStatusRef );
-	RDEBUG( "CTARMDmAdapter::FetchLeafObjectL <" );
-	}
-
-// -----------------------------------------------------------------------------
-// CTARMDmAdapter::
-// 
-// -----------------------------------------------------------------------------
-//
-void CTARMDmAdapter::FetchLeafObjectSizeL( const TDesC8& aURI, const TDesC8& aLUID, const TDesC8& aType, TInt aResultsRef, TInt aStatusRef )
-	{
-	RDEBUG( "CTARMDmAdapter::FetchLeafObjectSizeL >" );
-//#ifdef __SAP_POLICY_MANAGEMENT	
-	TRAPD( errf, FeatureManager::InitializeLibL() );
-	if( errf != KErrNone )
-		{
-		User::Leave(errf);
-		}
-	if(FeatureManager::FeatureSupported(KFeatureIdSapPolicyManagement))
-	{
-	if (CheckPolicyL( aURI ) != KErrNone)
-		{
-		Callback().SetStatusL( aStatusRef, EError );
-		return;
-		}
-	}
-	FeatureManager::UnInitializeLib();
-
-//#endif		
-	_FetchLeafObjectSizeL( aURI, aLUID, aType, aResultsRef, aStatusRef );
-	RDEBUG( "CTARMDmAdapter::FetchLeafObjectSizeL <" );
-	}
-
-// -----------------------------------------------------------------------------
-// CTARMDmAdapter::
-// 
-// -----------------------------------------------------------------------------
-//
-void CTARMDmAdapter::ChildURIListL( const TDesC8& aURI, const TDesC8& aLUID, const CArrayFix<TSmlDmMappingInfo>& aPreviousURISegmentList, TInt aResultsRef, TInt aStatusRef )
-	{
-	RDEBUG( "CTARMDmAdapter::ChildURIListL >" );
-//#ifdef __SAP_POLICY_MANAGEMENT	
-	TRAPD( errf, FeatureManager::InitializeLibL() );
-	if( errf != KErrNone )
-		{
-		User::Leave(errf);
-		}
-	if(FeatureManager::FeatureSupported(KFeatureIdSapPolicyManagement))
-	{
-	if (CheckPolicyL( aURI ) != KErrNone)
-		{
-		Callback().SetStatusL( aStatusRef, EError );
-		return;
-		}
-	}
-	FeatureManager::UnInitializeLib();
-
-//#endif		
-	_ChildURIListL( aURI, aLUID, aPreviousURISegmentList, aResultsRef, aStatusRef );
-	RDEBUG( "CTARMDmAdapter::ChildURIListL <" );
-	}
-
-// -----------------------------------------------------------------------------
-// CTARMDmAdapter::
-// 
-// -----------------------------------------------------------------------------
-//
-void CTARMDmAdapter::AddNodeObjectL( const TDesC8& aURI, const TDesC8& aParentLUID, TInt aStatusRef )
-	{
-	RDEBUG( "CTARMDmAdapter::AddNodeObjectL >" );
-//#ifdef __SAP_POLICY_MANAGEMENT	
-	TRAPD( errf, FeatureManager::InitializeLibL() );
-	if( errf != KErrNone )
-		{
-		User::Leave(errf);
-		}
-	if(FeatureManager::FeatureSupported(KFeatureIdSapPolicyManagement))
-	{
-	if (CheckPolicyL( aURI ) != KErrNone)
-		{
-		Callback().SetStatusL( aStatusRef, EError );
-		return;
-		}
-	}
-	FeatureManager::UnInitializeLib();
-
-//#endif		
-	_AddNodeObjectL( aURI, aParentLUID, aStatusRef );
-	RDEBUG( "CTARMDmAdapter::AddNodeObjectL <" );
-	}
-
-// -----------------------------------------------------------------------------
-// CTARMDmAdapter::
-// 
-// -----------------------------------------------------------------------------
-//
-void CTARMDmAdapter::ExecuteCommandL( const TDesC8& aURI, const TDesC8& aLUID, const TDesC8& aArgument, const TDesC8& aType, TInt aStatusRef )
-	{
-	RDEBUG( "CTARMDmAdapter::ExecuteCommandL >" );
-//#ifdef __SAP_POLICY_MANAGEMENT	
-	TRAPD( errf, FeatureManager::InitializeLibL() );
-	if( errf != KErrNone )
-		{
-		User::Leave(errf);
-		}
-	if(FeatureManager::FeatureSupported(KFeatureIdSapPolicyManagement))
-	{
-	if (CheckPolicyL( aURI ) != KErrNone)
-		{
-		Callback().SetStatusL( aStatusRef, EError );
-		return;
-		}
-	}
-	FeatureManager::UnInitializeLib();
-
-//#endif		
-	_ExecuteCommandL( aURI, aLUID, aArgument, aType, aStatusRef );
-	RDEBUG( "CTARMDmAdapter::ExecuteCommandL <" );
-	}
-
-// -----------------------------------------------------------------------------
-// CTARMDmAdapter::
-// 
-// -----------------------------------------------------------------------------
-//
-void CTARMDmAdapter::ExecuteCommandL( const TDesC8& aURI, const TDesC8& aLUID, RWriteStream*& aStream, const TDesC8& aType, TInt aStatusRef )
-	{
-	RDEBUG( "CTARMDmAdapter::ExecuteCommandL (stream) >" );
-//#ifdef __SAP_POLICY_MANAGEMENT	
-	TRAPD( errf, FeatureManager::InitializeLibL() );
-	if( errf != KErrNone )
-		{
-		User::Leave(errf);
-		}
-	if(FeatureManager::FeatureSupported(KFeatureIdSapPolicyManagement))
-	{
-	if (CheckPolicyL( aURI ) != KErrNone)
-		{
-		Callback().SetStatusL( aStatusRef, EError );
-		return;
-		}
-	}
-	FeatureManager::UnInitializeLib();
-
-//#endif		
-	_ExecuteCommandL( aURI, aLUID, aStream, aType, aStatusRef );
-	RDEBUG( "CTARMDmAdapter::ExecuteCommandL (stream) <" );
-	}
-
-// -----------------------------------------------------------------------------
-// CTARMDmAdapter::
-// 
-// -----------------------------------------------------------------------------
-//
-void CTARMDmAdapter::CopyCommandL( const TDesC8& aTargetURI, const TDesC8& aTargetLUID, const TDesC8& aSourceURI, const TDesC8& aSourceLUID, const TDesC8& aType, TInt aStatusRef )
-	{
-	RDEBUG( "CTARMDmAdapter::CopyCommandL >" );
-//#ifdef __SAP_POLICY_MANAGEMENT	
-	TRAPD( errf, FeatureManager::InitializeLibL() );
-	if( errf != KErrNone )
-		{
-		User::Leave(errf);
-		}
-	if(FeatureManager::FeatureSupported(KFeatureIdSapPolicyManagement))
-	{
-	if (CheckPolicyL( aTargetURI ) != KErrNone)
-		{
-		Callback().SetStatusL( aStatusRef, EError );
-		return;
-		}
-	}
-	FeatureManager::UnInitializeLib();
-	
-//#endif		
-	_CopyCommandL( aTargetURI, aTargetLUID, aSourceURI, aSourceLUID, aType, aStatusRef );
-	RDEBUG( "CTARMDmAdapter::CopyCommandL <" );
-	}
-
-// -----------------------------------------------------------------------------
-// CTARMDmAdapter::
-// 
-// -----------------------------------------------------------------------------
-//
-
-//#ifdef __SAP_POLICY_MANAGEMENT
-
-TInt CTARMDmAdapter::CheckPolicyL( const TDesC8& aURI )
-	{
-	RDEBUG( "CTARMDmAdapter::CheckPolicyL >" );
-	TRAPD( errf, FeatureManager::InitializeLibL() );
-	if( errf != KErrNone )
-		{
-		return errf;
-		}
-	if(!FeatureManager::FeatureSupported(KFeatureIdSapPolicyManagement))
-	{
-		FeatureManager::UnInitializeLib();
-		return KErrNotSupported;
-	}
-	FeatureManager::UnInitializeLib();
-	InitializeL();
-	TPtrC8 resource = PolicyRequestResourceL( aURI );
-
-	TInt ret = CheckPolicy2L( resource );
-	RDEBUG_2( "CTARMDmAdapter::CheckPolicyL < %d", ret );
-	return ret;
-	}
-
-// -----------------------------------------------------------------------------
-// CTARMDmAdapter::
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CTARMDmAdapter::CheckPolicy2L( const TDesC8& aResource )
-	{
-	RDEBUG( "CTARMDmAdapter::CheckPolicy2L >" );
-	TRAPD( errf, FeatureManager::InitializeLibL() );
-	if( errf != KErrNone )
-		{
-		return errf;
-		}
-	if(!FeatureManager::FeatureSupported(KFeatureIdSapPolicyManagement))
-	{
-		FeatureManager::UnInitializeLib();
-		return KErrNotSupported;
-	}
-	FeatureManager::UnInitializeLib();
-	TInt ret = KErrNone;
-	
-    TRequestContext context;
-    TResponse response;
-
-	// Get Certificate
-    RDMCert dmcert;
-    TCertInfo ci;
-    ret = dmcert.Get( ci );
-
-    // If got certificate then put is as subject to policy request
-	if (ret == KErrNone)
-		{
-	    context.AddSubjectAttributeL( PolicyEngineXACML::KTrustedSubject, ci );
-		}
-	else if (ret == KErrNotFound)
-		{
-		ret = KErrNone;
-		}
-
-	// Check Policy
-	if (ret == KErrNone)
-		{
-	    context.AddResourceAttributeL( 
-	        PolicyEngineXACML::KResourceId, 
-	        aResource,
-	        PolicyEngineXACML::KStringDataType );
-		ret = iPR.MakeRequest( context, response );
-		}
-
-	// Check Policy request result
-	if (ret == KErrNone)
-		{
-    	TResponseValue resp = response.GetResponseValue();
-	    switch( resp )
-	        {
-		    case EResponsePermit:
-	        	ret = KErrNone;
-		        break;
-	        case EResponseDeny:
-		    case EResponseNotApplicable:
-		    case EResponseIndeterminate:
-		    default:
-	    	    ret = KErrAccessDenied;
-	    	    break;
-			}
-		}
-
-    RDEBUG_2( "CTARMDmAdapter::CheckPolicy2L < %d", ret );
-	return ret;
-	}
-
-//#endif
-
-
-// End of File
--- a/customization/DMUtils/src/TARMDmStreamAdapter.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,414 +0,0 @@
-/*
-* Copyright (c) 2002-2004 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:  $Description: $
-*
-*/
-
-
-
-// INCLUDE FILES
-#include "TARMDmStreamAdapter.h"
-#include "debug.h"
-#include <featmgr.h>
-_LIT( KTempFilePath, "C:\\system\\temp\\" );
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-//
-// CTARMDmStreamAdapter
-//
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-// -----------------------------------------------------------------------------
-// CTARMDmStreamAdapter::CTARMDmStreamAdapter
-// 
-// -----------------------------------------------------------------------------
-//
-CTARMDmStreamAdapter::CTARMDmStreamAdapter( MSmlDmCallback* aCallback )
-	: CTARMDmAdapter( aCallback )
-	, iActionInfo( 0 )
-	{
-	RDEBUG( "CTARMDmStreamAdapter::CTARMDmStreamAdapter" );
-	if(!iFs.Connect())
-		{
-			RDEBUG( "CTARMDmStreamAdapter::CTARMDmStreamAdapter unable to connect to the fileserver" );
-		}
-	}
-
-// -----------------------------------------------------------------------------
-// CTARMDmStreamAdapter::~CTARMDmStreamAdapter
-// 
-// -----------------------------------------------------------------------------
-//
-CTARMDmStreamAdapter::~CTARMDmStreamAdapter()
-	{
-	RDEBUG( "CTARMDmStreamAdapter::~CTARMDmStreamAdapter >" );
-	ClearActionInfo();
-    iFs.Close();
-	RDEBUG( "CTARMDmStreamAdapter::~CTARMDmStreamAdapter <" );
-	}
-
-// -----------------------------------------------------------------------------
-// CTARMDmStreamAdapter::
-// 
-// -----------------------------------------------------------------------------
-//
-void CTARMDmStreamAdapter::UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, RWriteStream*& aStream, const TDesC8& aType, TInt aStatusRef )
-	{
-	RDEBUG( "CTARMDmStreamAdapter::UpdateLeafObjectL >" );
-
-//#ifdef __SAP_POLICY_MANAGEMENT
-TRAPD( errf, FeatureManager::InitializeLibL() );
-	if( errf != KErrNone )
-	{
-		User::Leave(errf);
-	}
-if(FeatureManager::FeatureSupported(KFeatureIdSapPolicyManagement ))
-{
-	if (CheckPolicyL( aURI ) != KErrNone)
-		{
-		Callback().SetStatusL( aStatusRef, EError );
-		return;
-		}
-}
-FeatureManager::UnInitializeLib();
-
-	
-//#endif
-
-	SetActionInfoL(CTARMDmStreamAdapterBuffer::ETARMActionUpdate,
-	               aURI,
-	               aLUID,
-	               aType,
-	               aStatusRef,
-	               -1); // No result ref
-
-    TInt itemSize;
-    TAdapterStreamType streamType = EStreamToNone;
-	if( StreamingSupport( itemSize ) )
-	    {
-	    streamType = StreamType( aURI );
-	    }
-
-    if( EStreamToNone != streamType )
-        {
-        if( EStreamToFile == streamType )
-            {
-            StreamToFileL( aStream );
-            }
-        else
-        if( EStreamToBuffer == streamType )
-            {
-            StreamToBufferL( aStream );
-            }
-        Callback().SetStatusL( aStatusRef, EOk );  
-        }
-    else
-        {
-    	_UpdateLeafObjectL( aURI, aLUID, aStream, aType, aStatusRef );
-        }
-
-	RDEBUG( "CTARMDmStreamAdapter::UpdateLeafObjectL <" );
-	}
-
-// -----------------------------------------------------------------------------
-// CTARMDmStreamAdapter::
-// 
-// -----------------------------------------------------------------------------
-//
-void CTARMDmStreamAdapter::ExecuteCommandL( const TDesC8& aURI, const TDesC8& aLUID, RWriteStream*& aStream, const TDesC8& aType, TInt aStatusRef )
-	{
-	RDEBUG( "CTARMDmStreamAdapter::ExecuteCommandL (stream) >" );
-
-//#ifdef __SAP_POLICY_MANAGEMENT
-TRAPD( errf, FeatureManager::InitializeLibL() );
-	if( errf != KErrNone )
-	{
-		User::Leave(errf);
-	}
-if(FeatureManager::FeatureSupported(KFeatureIdSapPolicyManagement ))
-{
-	if (CheckPolicyL( aURI ) != KErrNone)
-		{
-		Callback().SetStatusL( aStatusRef, EError );
-		return;
-		}
-}
-FeatureManager::UnInitializeLib();
-//#endif		
-
-	SetActionInfoL(CTARMDmStreamAdapterBuffer::ETARMActionExecute,
-	               aURI,
-	               aLUID,
-	               aType,
-	               aStatusRef,
-	               -1); // no result ref
-
-    TInt itemSize;
-    TAdapterStreamType streamType = CTARMDmStreamAdapter::EStreamToNone;
-	if( StreamingSupport( itemSize ) )
-	    {
-	    streamType = StreamType( aURI );
-	    }
-
-    if( CTARMDmStreamAdapter::EStreamToNone != streamType )
-        {
-        if( CTARMDmStreamAdapter::EStreamToFile == streamType )
-            {
-            StreamToFileL( aStream );
-            }
-        else
-        if( CTARMDmStreamAdapter::EStreamToBuffer == streamType )
-            {
-            StreamToBufferL( aStream );
-            }
-        Callback().SetStatusL( aStatusRef, EOk ); 
-        }
-    else
-        {
-        _ExecuteCommandL( aURI, aLUID, aStream, aType, aStatusRef );
-        }
-
-	RDEBUG( "CTARMDmStreamAdapter::ExecuteCommandL (stream) <" );
-	}
-
-// -----------------------------------------------------------------------------
-// CTARMDmStreamAdapter::StreamType
-// 
-// -----------------------------------------------------------------------------
-//
-CTARMDmStreamAdapter::TAdapterStreamType CTARMDmStreamAdapter::StreamType( const TDesC8& /*aURI*/ )
-    {
-	RDEBUG( "CTARMDmStreamAdapter::StreamType ><" );
-    
-    return CTARMDmStreamAdapter::EStreamToNone;
-    }
-
-// -----------------------------------------------------------------------------
-// CTARMDmStreamAdapter::StreamToBufferL
-// 
-// -----------------------------------------------------------------------------
-//
-void CTARMDmStreamAdapter::StreamToBufferL( RWriteStream*& aStream )
-    {
-	RDEBUG( "CTARMDmStreamAdapter::StreamToBufferL >" );
-    
-    User::LeaveIfError( iWriteStream.Temp(
-                    iFs,
-                    KTempFilePath(),
-                    iFileStoreFileName,
-                    EFileWrite
-                    ));
-
-    aStream = &iWriteStream;
-    // StreamCommittedL is called when stream is complete
-    iStreamType = CTARMDmStreamAdapter::EStreamToBuffer;
-
-
-	RDEBUG( "CTARMDmStreamAdapter::StreamToBufferL <" );
-    }
-
-// -----------------------------------------------------------------------------
-// CTARMDmStreamAdapter::StreamToFileL
-// 
-// -----------------------------------------------------------------------------
-//
-void CTARMDmStreamAdapter::StreamToFileL( RWriteStream*& aStream )
-    {
-	RDEBUG( "CTARMDmStreamAdapter::StreamToFileL >" );
-
-
-    User::LeaveIfError( iWriteStream.Temp(
-                    iFs,
-                    KTempFilePath(),
-                    iFileStoreFileName,
-                    EFileWrite
-                    ));
-
-    aStream = &iWriteStream;
-    // StreamCommittedL is called when stream is complete
-    iStreamType = CTARMDmStreamAdapter::EStreamToFile;
-    
-
-	RDEBUG( "CTARMDmStreamAdapter::StreamToFileL <" );
-    }
-
-// -----------------------------------------------------------------------------
-// CTARMDmStreamAdapter::StreamCommittedL
-// 
-// -----------------------------------------------------------------------------
-//
-#ifdef __TARM_SYMBIAN_CONVERGENCY	
-void CTARMDmStreamAdapter::StreamCommittedL( RWriteStream& /*aStream*/ )
-#else
-void CTARMDmStreamAdapter::StreamCommittedL()
-#endif	
-    {
-	RDEBUG( "CTARMDmStreamAdapter::StreamCommittedL >" );
-
-    TInt itemSize = 0;
-    if( StreamingSupport( itemSize ) )
-        {
-        
-        TAdapterStreamType type = iStreamType;
-        iStreamType = CTARMDmStreamAdapter::EStreamToNone;
-
-        if(CTARMDmStreamAdapter::EStreamToNone == type )
-            {
-            ClearActionInfo();
-            User::Leave( KErrGeneral );
-            }
-
-        iWriteStream.Close();
-
-        if(CTARMDmStreamAdapter::EStreamToBuffer == type )
-            {           
-            // Load file to memory
-            RFile f;
-            User::LeaveIfError( f.Open( iFs, iFileStoreFileName, EFileRead ) );
-            CleanupClosePushL( f );
-
-            TInt size;
-            User::LeaveIfError( f.Size( size ) );
-
-            HBufC8* buf = HBufC8::NewLC( size );
-            TPtr8 ptr8( buf->Des() );
-            User::LeaveIfError( f.Read( ptr8 ) );
-
-            // Pass data as argument
-            CommitActionL( ptr8 );
-
-            CleanupStack::PopAndDestroy( buf );
-            CleanupStack::PopAndDestroy( &f );
-            }
-         else
-            {
-            // Streamed to file, no data in arguments
-            CommitActionL( KNullDesC8() );
-            }
-
-        iFs.Delete( iFileStoreFileName );
-        
-        }
-
-    ClearActionInfo();
-
-	RDEBUG( "CTARMDmStreamAdapter::StreamCommittedL <" );
-    }
-
-// -----------------------------------------------------------------------------
-// CTARMDmStreamAdapter::SetActionInfoL
-// 
-// -----------------------------------------------------------------------------
-//
-void CTARMDmStreamAdapter::SetActionInfoL( CTARMDmStreamAdapterBuffer::TTARMDMAction aAction,
-                                     const TDesC8& aURI,
-                                     const TDesC8& aLUID,
-                                     const TDesC8& aType,
-                                     TInt aStatusRef,
-                                     TInt aResultRef )
-    {
-	RDEBUG( "CTARMDmStreamAdapter::SetActionInfoL >" );
-
-    ClearActionInfo();
-    iActionInfo = CTARMDmStreamAdapterBuffer::NewL(
-                        aURI,
-                        aLUID,
-                        aType,
-                        aStatusRef,
-                        aResultRef,
-                        aAction
-                        );
-
-	RDEBUG( "CTARMDmStreamAdapter::SetActionInfoL <" );
-    }
-
-// -----------------------------------------------------------------------------
-// CTARMDmStreamAdapter::ClearActionInfo
-// 
-// -----------------------------------------------------------------------------
-//
-void CTARMDmStreamAdapter::ClearActionInfo()
-    {
-	RDEBUG( "CTARMDmStreamAdapter::ClearActionInfo >" );
-
-    delete iActionInfo;
-    iActionInfo = 0;
-
-	RDEBUG( "CTARMDmStreamAdapter::ClearActionInfo <" );
-    }
-
-// -----------------------------------------------------------------------------
-// CTARMDmStreamAdapter::ActionInfoL
-// 
-// -----------------------------------------------------------------------------
-//
-CTARMDmStreamAdapter::CTARMDmStreamAdapterBuffer& CTARMDmStreamAdapter::ActionInfoL()
-    {
-	RDEBUG( "CTARMDmStreamAdapter::ActionInfoL >" );
-
-    if( 0 == iActionInfo )
-        {
-        User::Leave( KErrNotFound );
-        }
-
-	RDEBUG( "CTARMDmStreamAdapter::ActionInfoL <" );
-    return *iActionInfo;
-    }
-
-// -----------------------------------------------------------------------------
-// CTARMDmStreamAdapter::CommitActionL
-// 
-// -----------------------------------------------------------------------------
-//
-void CTARMDmStreamAdapter::CommitActionL( const TDesC8 &aObject )
-    {
-	RDEBUG( "CTARMDmStreamAdapter::CommitActionL >" );
-
-    CTARMDmStreamAdapterBuffer& action = ActionInfoL();
-
-    switch( action.Action() )
-        {
-        case CTARMDmStreamAdapterBuffer::ETARMActionUpdate:
-    	_UpdateLeafObjectL(
-    	            action.URI(),
-    	            action.LUID(),
-    	            aObject,
-    	            action.Type(),
-    	            action.StatusRef()
-    	            );
-        break;
-
-        case CTARMDmStreamAdapterBuffer::ETARMActionExecute:
-        _ExecuteCommandL(
-    	            action.URI(),
-    	            action.LUID(),
-    	            aObject,
-    	            action.Type(),
-    	            action.StatusRef() 
-                    );
-        break;
-
-        default:
-        User::Leave( KErrNotSupported );
-        break;
-        }
-
-	RDEBUG( "CTARMDmStreamAdapter::CommitActionL <" );
-    }
-
-// End of File
--- a/customization/DMUtils/src/nsmldmiapmatcher.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,235 +0,0 @@
-/*
-* 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:  DM Tree module
-*
-*/
-
-
-// ------------------------------------------------------------------------------------------------
-// Includes
-// ------------------------------------------------------------------------------------------------
-
-#include <utf.h>
-#include "nsmldmiapmatcher.h"
-#include <smldmadapter.h>
-#include <featmgr.h>
-
-// ------------------------------------------------------------------------------------------------
-// CNSmlDMIAPMatcher* CNSmlDMIAPMatcher::NewL( MSmlDmCallback* aDmCallback )
-// ------------------------------------------------------------------------------------------------
-NSMLDMURI_EXPORT_C CNSmlDMIAPMatcher* CNSmlDMIAPMatcher::NewL( 
-	MSmlDmCallback* aDmCallback )
-    {
-    CNSmlDMIAPMatcher* self = CNSmlDMIAPMatcher::NewLC( aDmCallback );	
-    CleanupStack::Pop();
-    return self;
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CNSmlDMIAPMatcher* CNSmlDMIAPMatcher::NewLC( MSmlDmCallback* aDmCallback )
-// ------------------------------------------------------------------------------------------------
-NSMLDMURI_EXPORT_C CNSmlDMIAPMatcher* CNSmlDMIAPMatcher::NewLC(
-	MSmlDmCallback* aDmCallback )
-    {
-    CNSmlDMIAPMatcher* self = new( ELeave ) CNSmlDMIAPMatcher;
-    CleanupStack::PushL( self );
-    self->ConstructL( aDmCallback );
-    return self;
-    }
-
-// ------------------------------------------------------------------------------------------------
-// void CNSmlDMIAPMatcher::ConstructL( MSmlDmCallback* aDmCallback )
-// ------------------------------------------------------------------------------------------------
-void CNSmlDMIAPMatcher::ConstructL( MSmlDmCallback* aDmCallback )
-    {
-    iCallback = aDmCallback;
-    FeatureManager::InitializeLibL();
-    iFeatMgrInitialized = ETrue;
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CNSmlDMIAPMatcher::~CNSmlDMIAPMatcher()
-// ------------------------------------------------------------------------------------------------
-CNSmlDMIAPMatcher::~CNSmlDMIAPMatcher()
-    {
-    	if(iFeatMgrInitialized)
-    		{
-    			FeatureManager::UnInitializeLib();
-    		}
-    }
-
-// ------------------------------------------------------------------------------------------------
-// TInt CNSmlDMIAPMatcher::IAPIdFromURIL( const TDesC8& aURI )
-// ------------------------------------------------------------------------------------------------
-NSMLDMURI_EXPORT_C TInt CNSmlDMIAPMatcher::IAPIdFromURIL( const TDesC8& aURI )
-    {
-    TInt iapId(KErrNotFound);
-
-	MSmlDmAdapter::TError status;
-	CBufBase* allIAPs = CBufFlat::NewL(16);
-	CleanupStack::PushL(allIAPs);
-	iCallback->FetchLinkL( GetConRef(), *allIAPs, status );
-	TPtrC8 uri = RemoveDotSlash(aURI);
-
-    if( status == MSmlDmAdapter::EOk &&
-        uri.Find(GetConRef()) == 0 &&
-        allIAPs->Ptr(0).Find(LastURISeg(uri))>=0)
-        {
-        HBufC8* luid = iCallback->GetLuidAllocL( uri ); 
-
-        if ( luid->Length() )
-            {
-            iapId = DesToInt(*luid);
-            } 
-        delete luid;
-        }
-
-    CleanupStack::PopAndDestroy(allIAPs);
-    
-    return iapId;
-    }
-
-// ------------------------------------------------------------------------------------------------
-// HBufC8* CNSmlDMIAPMatcher::URIFromIAPIdL( TInt aIAPId )
-// ------------------------------------------------------------------------------------------------
-NSMLDMURI_EXPORT_C HBufC8* CNSmlDMIAPMatcher::URIFromIAPIdL( TInt aIAPId )
-    {
-    CBufBase *allIAPs = CBufFlat::NewL(16);
-	CleanupStack::PushL(allIAPs);
-    MSmlDmAdapter::TError status;
-
-    iCallback->FetchLinkL( GetConRef(), *allIAPs, status );
-
-    if ( status == MSmlDmAdapter::EOk )
-        {   
-        TInt index(0);
-        TInt segStart(0);
-
-        while ( index != KErrNotFound)
-            {                
-            TPtrC8 allIAPsptr = allIAPs->Ptr(segStart).Mid(0);
-            index = allIAPsptr.Locate('/');
-            HBufC8* uriSeg = 0;
-
-            if ( index == KErrNotFound )
-                {
-                TPtrC8 uriSeg8Ptr = allIAPs->Ptr(segStart);
-                uriSeg = uriSeg8Ptr.AllocLC();
-                }
-            else
-                {
-                TPtrC8 uriSeg8Ptr = allIAPs->Ptr(segStart).Mid( 0, index );
-                uriSeg = uriSeg8Ptr.AllocLC();
-                }
-
-            HBufC8* uri = HBufC8::NewLC( GetConRef().Length() + 1 +
-            	uriSeg->Length() );
-            	
-			TPtr8 uriPtr = uri->Des();
-			uriPtr.Format( GetConRef());
-			uriPtr.Append( KNSmlDMSeparator8 );
-			uriPtr.Append( *uriSeg );
-			HBufC8* luid = iCallback->GetLuidAllocL( uriPtr );
-			CleanupStack::PushL(luid);
-
-			if ( luid->Length() > 0 )
-				{				
-				TInt iapId = DesToInt(luid->Des());
-				if ( iapId == aIAPId )
-					{
-		            CleanupStack::PopAndDestroy();  //luid
-		            CleanupStack::Pop();  //uri
-		            CleanupStack::PopAndDestroy(2);  //uriSeg, allIAPs
-		            return uri;
-					}
-				}
-            CleanupStack::PopAndDestroy(3); // luid, uri, uriSeg
-
-            segStart += index + 1;
-            }        
-        }
-
-    CleanupStack::PopAndDestroy(); // allIAPs
-
-    return 0;
-    }
-
-// ------------------------------------------------------------------------------------------------
-// TInt CNSmlDMIAPMatcher::DesToInt(const TDesC& aLuid)
-// ------------------------------------------------------------------------------------------------
-TInt CNSmlDMIAPMatcher::DesToInt(const TDesC8& aLuid) const
-	{
-	TLex8 lex(aLuid);
-	TInt value = 0;
-	lex.Val(value);
-	return value;
-	}
-
-// ------------------------------------------------------------------------------------------------
-// TPtrC8 CNSmlDMIAPMatcher::RemoveDotSlash(const TDesC8& aURI) const
-// ------------------------------------------------------------------------------------------------
-TPtrC8 CNSmlDMIAPMatcher::RemoveDotSlash(const TDesC8& aURI) const
-	{
-	if(aURI.Find(KNSmlDMIAPUriDotSlash)==0)
-		{
-		return aURI.Right( aURI.Length()-KNSmlDMIAPUriDotSlash().Length() );
-		}
-	else
-		{
-		return aURI;
-		}
-	}
-
-// ------------------------------------------------------------------------------------------------
-// CNSmlDMIAPMatcher::TPtrC8 LastURISeg(const TDesC8& aURI)
-// Returns only the last uri segemnt
-// ------------------------------------------------------------------------------------------------
-TPtrC8 CNSmlDMIAPMatcher::LastURISeg(const TDesC8& aURI) const
-	{
-	TInt i;
-	for(i=aURI.Length()-1;i>=0;i--)
-		{
-		if(aURI[i]==KNSmlDMSlash)
-			{
-			break;
-			}
-		}
-	if(i==0)
-		{
-		return aURI;
-		}
-	else
-		{
-		return aURI.Mid(i+1);
-		}
-	}
-	
-// ------------------------------------------------------------------------------------------------
-// CNSmlDMIAPMatcher::const TDesC8& GetConRef()
-// Returns the connection reference
-// ------------------------------------------------------------------------------------------------
-const TDesC8& CNSmlDMIAPMatcher::GetConRef()
-	{
-	if(FeatureManager::FeatureSupported(KFeatureIdFfDmConnmoAdapter))
-		{
-			return KNSmlDMConnMOIAPUri();
-		}
-	else
-		{
-			return KNSmlDMIAPUri();
-		}	
-  }	
-	
-
-
--- a/customization/DMUtils/src/nsmldmuri.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,211 +0,0 @@
-/*
-* Copyright (c) 2002 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:  DM tree etc.
-*
-*/
-
-
-
-#include "nsmldmuri.h"
-
-// ------------------------------------------------------------------------------------------------
-//  NSmlDmURI
-// ------------------------------------------------------------------------------------------------
-
-
-// ------------------------------------------------------------------------------------------------
-// TPtrC8 NSmlDmURI::ParentURI(const TDesC8& aURI)
-// returns parent uri, i.e. removes last uri segment
-// ------------------------------------------------------------------------------------------------
-NSMLDMURI_EXPORT_C TPtrC8 NSmlDmURI::ParentURI(const TDesC8& aURI)
-	{
-	TBool onlyOneSeg = ETrue;
-	TInt i;
-	for(i=aURI.Length()-1;i>=0;i--)
-		{
-		if(aURI[i]==KNSmlDMUriSeparator)
-			{
-			onlyOneSeg = EFalse;
-			break;
-			}
-		}
-	if(onlyOneSeg)
-		{
-		return KNSmlDmRootUri();
-		}
-	else
-		{
-		return aURI.Left(i);
-		}
-	}
-
-// ------------------------------------------------------------------------------------------------
-// TPtrC8 NSmlDmURI::LastURISeg(const TDesC8& aURI)
-// Returns only the last uri segemnt
-// ------------------------------------------------------------------------------------------------
-NSMLDMURI_EXPORT_C TPtrC8 NSmlDmURI::LastURISeg(const TDesC8& aURI)
-	{
-	TInt i;
-	for(i=aURI.Length()-1;i>=0;i--)
-		{
-		if(aURI[i]==KNSmlDMUriSeparator)
-			{
-			break;
-			}
-		}
-	if(i==0)
-		{
-		return aURI;
-		}
-	else
-		{
-		return aURI.Mid(i+1);
-		}
-	}
-
-// ------------------------------------------------------------------------------------------------
-// TPtrC8 NSmlDmURI::RemoveDotSlash(const TDesC8& aURI)
-// return uri without dot and slash in start
-// ------------------------------------------------------------------------------------------------
-NSMLDMURI_EXPORT_C TPtrC8 NSmlDmURI::RemoveDotSlash(const TDesC8& aURI)
-	{
-
-	TInt offset = 0;
-	TInt endSlash = 0;
-
-	if(aURI.Find(KNSmlDmUriDotSlash)==0)
-		{
-		offset = 2;
-		}
-	else
-		{
-		return aURI;
-		}
-
-	if(aURI.Length()>2&&aURI[aURI.Length()-1]==KNSmlDMUriSeparator)
-		{
-		endSlash = 1;
-		}
-
-	return aURI.Mid(offset,aURI.Length()-endSlash-offset);
-	}
-
-// ------------------------------------------------------------------------------------------------
-// TPtrC8 NSmlDmURI::RemoveProp(const TDesC8& aURI)
-// removes property from the uri
-// ------------------------------------------------------------------------------------------------
-NSMLDMURI_EXPORT_C TPtrC8 NSmlDmURI::RemoveProp(const TDesC8& aURI)
-	{
-	TInt offset = aURI.Find(KNSmlDmQuestionMark);
-	if(offset!=KErrNotFound)
-		{
-		return aURI.Left(offset); 
-		}
-	return aURI;
-	}
-
-// ------------------------------------------------------------------------------------------------
-// TPtrC8 NSmlDmURI::RemoveLastSeg(const TDesC8& aURI)
-// Removes last uri segment
-// ------------------------------------------------------------------------------------------------
-NSMLDMURI_EXPORT_C TPtrC8 NSmlDmURI::RemoveLastSeg(const TDesC8& aURI)
-	{
-	TInt i;
-	for(i=aURI.Length()-1;i>=0;i--)
-		{
-		if(aURI[i]==KNSmlDMUriSeparator)
-			{
-			break;
-			}
-		}
-
-	if(i>0)
-		{
-		return aURI.Left(i);
-		}
-	else
-		{
-		return KNullDesC8();
-		}
-	}
-
-
-// ------------------------------------------------------------------------------------------------
-// TPtrC8 NSmlDmURI::URISeg(const TDesC8& aURI,TInt aLocation,TInt aSegCount=1)
-// Returns the aLocation:th URI segment
-// ------------------------------------------------------------------------------------------------
-NSMLDMURI_EXPORT_C TPtrC8 NSmlDmURI::URISeg(const TDesC8& aURI,TInt aLocation,TInt aSegCount/*=1*/)
-	{
-    TInt i, start;
-    if(aLocation < 0)
-        {
-            return aURI.Mid(0, 0);
-        }
-    if(aLocation > 0)
-        {
-        for (start=0, i=0; (start<aURI.Length()) && (i<aLocation); start++)
-            {
-            if(aURI[start]=='/')
-                {
-                i++;
-                }
-            if(i==aLocation)
-                {
-                break;
-                }
-            }
-        }
-    else
-        {
-            start=-1;
-        }
-    // empty segment
-    if(start+1 >= aURI.Length())
-        {
-        return aURI.Mid(0, 0);
-        }        
-    // start points to beginning of segment
-    for (i=start+1; i<aURI.Length(); i++)
-        {
-        if(aURI[i]=='/')
-            {
-            aSegCount--;
-            if(aSegCount == 0)
-                {
-                break;
-                }
-            }
-        }
-    // i points to end of segment   
-    return aURI.Mid(start+1, i-start-1);
-	}
-
-
-// ------------------------------------------------------------------------------------------------
-// TInt NSmlDmURI::NumOfURISegs(const TDesC8& aURI)
-// Returns the num of uri segs
-// ------------------------------------------------------------------------------------------------
-NSMLDMURI_EXPORT_C TInt NSmlDmURI::NumOfURISegs(const TDesC8& aURI)
-	{
-	TInt numOfURISegs = 1;
-	for(TInt i=0;i<aURI.Length();i++)
-		{
-		if(aURI[i]==KNSmlDMUriSeparator)
-			{
-			numOfURISegs++;
-			}
-		}
-	return numOfURISegs;
-	}
-
--- a/customization/EmbeddedLinkAdapter/bld/EmbeddedLinkAdapter.mmp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,76 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of customization components
-*
-*/
-
-// To get the APP_LAYER_SYSTEMINCLUDE-definition
-#include <platform_paths.hrh>
-#include "defaultcaps.hrh"
-
-CAPABILITY      CAP_GENERAL_DLL
-TARGET          embeddedlinkadapter.dll
-TARGETTYPE      PLUGIN
-UID             0x10009D8D 0x1020782B
-VENDORID        VID_DEFAULT
-
-SOURCEPATH      ../src
-SOURCE	        EmbeddedLinkAdapter.cpp
-SOURCE	        EmbeddedLinkApp.cpp
-SOURCE	        EmbeddedLinkHandler.cpp
-
-
-START RESOURCE  EmbeddedLinkAdapter.rss
-TARGET          embeddedlinkadapter.rsc
-LANGUAGE_IDS
-END
-
-
-
-USERINCLUDE 		. 
-USERINCLUDE 		../inc
-USERINCLUDE 		../../include
-USERINCLUDE     ../../DMUtils/inc
-
-
-APP_LAYER_SYSTEMINCLUDE
-SYSTEMINCLUDE 	/epoc32/include/ecom
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-SYSTEMINCLUDE 	/epoc32/include/devman
-#else
-// nothing
-#endif
-
-LIBRARY		       euser.lib
-LIBRARY		       ecom.lib
-LIBRARY		       favouritesengine.lib
-LIBRARY 	       flogger.lib
-
-//#ifdef __SAP_POLICY_MANAGEMENT
-LIBRARY		       policyengine.lib
-LIBRARY		       dmutil.lib
-//#endif
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-LIBRARY		       devmancmdmgr.lib
-#else
-// nothing
-#endif
-
-STATICLIBRARY	   dmutils.lib
-LIBRARY                 featmgr.lib
-LIBRARY				charconv.lib
-
-SMPSAFE
--- a/customization/EmbeddedLinkAdapter/bld/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of customization components
-*
-*/
-#include <platform_paths.hrh>
-
-PRJ_EXPORTS
-../rom/EmbeddedLinkAdapter.iby										CORE_APP_LAYER_IBY_EXPORT_PATH(embeddedlinkadapter.iby)
-
-PRJ_MMPFILES
-./EmbeddedLinkAdapter.mmp
-
-PRJ_TESTEXPORTS
-/*../test/EmbeddedLinksTestScript.cfg	/epoc32/winscw/c/TestFramework/EmbeddedLinksTestScript.cfg*/
--- a/customization/EmbeddedLinkAdapter/inc/EmbeddedLinkAdapter.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,163 +0,0 @@
-/*
-* Copyright (c) 2002 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:  DM Email Settings Adapter
-*
-*/
-
-
-
-#ifndef __NSMLEMBEDDEDLINKADAPTER_H__
-#define __NSMLEMBEDDEDLINKADAPTER_H__
-
-
-#include "TARMDmAdapter.h"
-#include "EmbeddedLinkApp.h"
-
-const TUint KNSmlEmbeddedLinkAdapterImplUid = 0x1020782C;
-
-// the DDF version must be changed if any changes in DDF structure ( built in DDFStructureL() function )
-_LIT8( KNSmlEmbeddedLinkAdapterDDFVersion, "1.0" ); 
-
-_LIT8( KNSmlEmbeddedLinkAdapterTextPlain, "text/plain" );
-_LIT8( KNSmlEmbeddedLinkAdapterNodeName, "Apps" );
-_LIT8( KNSmlEmbeddedLinkEmbeddedLinks,"EmbeddedLinks") ;
-_LIT8( KNSmlEmbeddedLinkCustomization, "Customization");
-_LIT8( KNSmlEmbeddedLinkAdapterShutdown,"reboot") ;
-_LIT8( KNSmlEmbeddedLinkAdapterDescription, "The interior object holds all apps objects" );
-_LIT8( KNSmlEmbeddedLinkAdapterDynamicNodeDescription, "Placeholder for one or more Group objects" );
-_LIT8( KNSmlEmbeddedLinkAdapterDynamicNode2Description, "Placeholder for one or more Vendor objects" );
-_LIT8( KNSmlEmbeddedLinkAdapterDynamicNode3Description, "Placeholder for one or more Package objects" );
-_LIT8( KNSmlEmbeddedLinkAdapterPkgDataDescription, "The Data associated with the DM tree application package" );
-_LIT8( KNSmlEmbeddedLinkAdapterPkgNameDescription, "The Name associated with the DM tree application package" );
-_LIT8( KNSmlEmbeddedLinkAdapterPkgVersionDescription, "Version associated with the DM tree application package" );
-_LIT8( KNSmlEmbeddedLinkAdapterPkgMimeTypeDescription, "Mime type associated with the DM tree application package" );
-_LIT8( KNSmlEmbeddedLinkAdapterIsInstalledDescription, "IsInstalled status associated with the DM tree application package" );
-_LIT8( KNSmlEmbeddedLinkAdapterIsRunningDescription, "IsRunning status associated with the DM tree application package" );
-_LIT8( KNSmlEmbeddedLinkAdapterPkgVendorDescription, "name of the vendor associated with the DM tree application package" );
-_LIT8( KNSmlEmbeddedLinkAdapterInstallationDateDescription, "InstallationDate associated with the DM tree application package" );
-_LIT8( KNSmlEmbeddedLinkAdapterInstallationPathDescription, "InstallationPath associated with the DM tree application package" );
-
-_LIT8( KNSmlEmbeddedLinkDynamicNode, "" );
-_LIT8( KNSmlEmbeddedLinkLink, "Links");
-_LIT8( KNSmlEmbeddedLinkURL, "URL");
-_LIT8( KNSmlEmbeddedLinkName, "Name");
-_LIT8( KNSmlEmbeddedLinkUserName, "UserName" );
-_LIT8( KNSmlEmbeddedLinkPassword, "Password" );
-_LIT8( KNSmlEmbeddedLinkConfRef, "ConRef");
-_LIT8( KNSmlEmbeddedLinkID, "ID" );
-_LIT8( KNSmlEmbeddedLinkAppName, "AppName" );
-
-_LIT8( KLinkLeafs8, "URL/Name/UserName/Password/ConRef" );
-_LIT8( KRootLeafs8, "EmbeddedLinks" );
-_LIT8( KAppLeafs8, "Links/ID/AppName" );
-
-// WapAp strings
-_LIT8( KWapApDefault, "" );
-_LIT8( KWapApNull, "null" );
-
-
-class CEmbeddedLinkHandler;
-
-// ------------------------------------------------------------------------------------------------
-// CNSmlDmEmailAdapter 
-// ------------------------------------------------------------------------------------------------
-class CNSmlEmbeddedLinkAdapter : public CTARMDmAdapter
-	{
-public:
-	static CNSmlEmbeddedLinkAdapter* NewL(MSmlDmCallback* aDmCallback );
-	static CNSmlEmbeddedLinkAdapter* NewLC(MSmlDmCallback* aDmCallback );
-
-	virtual ~CNSmlEmbeddedLinkAdapter();
-
-	// Implementation of MSmlDmAdapter interface
-	// =========================================
-	void DDFVersionL( CBufBase& aVersion );
-	void DDFStructureL( MSmlDmDDFObject& aDDF );
-	
-	void _UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, const TDesC8& aObject, const TDesC8& aType, TInt aStatusRef );
-	void _UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, RWriteStream*& aStream, const TDesC8& aType, TInt aStatusRef );
-	void _DeleteObjectL( const TDesC8& aURI, const TDesC8& aLUID, TInt aStatusRef );
-	void _FetchLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, const TDesC8& aType, TInt aResultsRef, TInt aStatusRef );
-	void _FetchLeafObjectSizeL( const TDesC8& aURI, const TDesC8& aLUID, const TDesC8& aType, TInt aResultsRef, TInt aStatusRef );
-	void _ChildURIListL( const TDesC8& aURI, const TDesC8& aLUID, const CArrayFix<TSmlDmMappingInfo>& aPreviousURISegmentList, TInt aResultsRef, TInt aStatusRef );
-	
-	void _AddNodeObjectL( const TDesC8& aURI, const TDesC8& aParentLUID, TInt aStatusRef );
-	void _ExecuteCommandL( const TDesC8& aURI, const TDesC8& aLUID, const TDesC8& aArgument, const TDesC8& aType, TInt aStatusRef );
-	void _ExecuteCommandL( const TDesC8& aURI, const TDesC8& aLUID, RWriteStream*& aStream, const TDesC8& aType, TInt aStatusRef );
-	void _CopyCommandL( const TDesC8& aTargetURI, const TDesC8& aTargetLUID, const TDesC8& aSourceURI, const TDesC8& aSourceLUID, const TDesC8& aType, TInt aStatusRef );
-
-	void StartAtomicL();
-	void CommitAtomicL();
-	void RollbackAtomicL();
-	TBool StreamingSupport( TInt& aItemSize );
-#ifdef __TARM_SYMBIAN_CONVERGENCY	
-		virtual void StreamCommittedL( RWriteStream& aStream );
-#else
-		virtual void StreamCommittedL();
-#endif	
-	void CompleteOutstandingCmdsL();
-
-	// PolicyCheck, resource name
-	TPtrC8 PolicyRequestResourceL( const TDesC8& aURI );
-
-	TBool LuidMappingInAdapter() { return ETrue ;}
-	TBool AdapterCanChangeACL() { return ETrue ; } 
-
-private:
-	void ConstructL( );	
-
-	CNSmlEmbeddedLinkAdapter( MSmlDmCallback* aDmCallback );
-
-	enum TNodeId
-		{
-		ENodeUnknown,
-
-		ENodeCustomization,
-		ENodeEmbeddedLinks,
-		ENodeEmbeddedLinksX1,
-		ENodeLinks,
-		ENodeID,
-		ENodeAppName,
-		ENodeLinksX2,
-		ENodeURL,
-		ENodeName,
-		ENodeUserName,
-		ENodePassword,
-		ENodeConRef,
-
-		ENodeLast
-		};
-
-	TNodeId NodeId( const TDesC8& aURI );
-
-	void FillNodeInfoL( MSmlDmDDFObject& aNode,TSmlDmAccessTypes aAccTypes,MSmlDmDDFObject::TOccurence aOccurrence, MSmlDmDDFObject::TScope aScope, MSmlDmDDFObject::TDFFormat aFormat,const TDesC8& aDescription );
-	TInt RecognizeAppTypeL(const TDesC8& aURI, TDes& aAppName);
-
-private:
-
-	MSmlDmCallback* iCallBack;
-
-	/** Temporary buffer for got messages.. */
-	RArray<CEmbeddedLinkApp> iBuffer;
-
-	TInt iLuid;
-	CEmbeddedLinkHandler* iLinkHandler;
-
-};
-
-
-
-	
-
-#endif // __CNSmlEmbeddedLinkAdapter_H__
--- a/customization/EmbeddedLinkAdapter/inc/EmbeddedLinkApp.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of customization components
-*
-*/
-#ifndef  EMBEDDEDLINKAPP_H
-#define  EMBEDDEDLINKAPP_H
-#include "EmbeddedLinkHandler.h"
-#include <f32file.h>
-#include <FavouritesItem.h>
-#include <FavouritesItemList.h>
-
-class CEmbeddedLinkApp : public CBase
-{
-	public:		// public standard methods
-		static CEmbeddedLinkApp* NewL( TInt aId );
-		static CEmbeddedLinkApp* NewLC( TInt aId );
-		virtual ~CEmbeddedLinkApp();	
-	private:	// private standard methods
-		void ConstructL( TInt aId );
-		
-	
-	public:		// public methods
-		TInt AddLinkL( TDesC& aName, TDesC& aUrl, const TDesC& aUsername=KNullDesC, 
-			const TDesC& aPassword=KNullDesC, TInt aApId=KErrNotFound );
-
-		TInt GetLinkL( TInt aUid, CFavouritesItem& aFavItem );
-		TInt GetLinksL( CFavouritesItemList& aFavItemList );
-		TPtrC GetURI();
-		TInt SetURI( const TDesC& aURI );
-		TInt RemoveLinkL( TInt aUid );
-		TInt UpdateNameL( const TDesC& aName, TInt aUid );
-		TInt UpdateUrlL( const TDesC& aUrl, TInt aUid );
-		TInt UpdateUserNameL( const TDesC& aUserName, const TInt aUid );
-		TInt UpdatePasswordL( const TDesC& aPassword, const TInt aUid );
-		TInt UpdateWapApL( const TDesC& aWapAp, const TInt aUid );
-		TInt GetLinkUidL( TDesC& aName, TDesC& aAddress, TInt folderUid, TInt& aUid );
-
-		TInt AppId() const;
-		TPtrC AppName() const;
-
-	private:	// private methods
-		TInt GetAppName( TDes& aName );
-		TInt FolderUidL( );
-	
-	public:		// public class variables
-		TBuf<64> iURI;
-	
-	private:	// private class variables
-
-		RFavouritesSession iFavouritesSess;
-
-		TBuf<32> iAppName;
-		TInt iId;
-};
-
-#endif
-
-
-
-
--- a/customization/EmbeddedLinkAdapter/inc/EmbeddedLinkHandler.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,78 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of customization components
-*
-*/
-
-#ifndef  EMBEDDEDLINKHANDLER_H
-#define  EMBEDDEDLINKHANDLER_H
-
-#include <e32base.h>
-#include <favouriteslimits.h>
-#include <e32std.h>
-
-#include <FavouritesDb.h>
-
-
-class CEmbeddedLinkApp;
-
-class CEmbeddedLinkHandler : public CBase
-{
-	public:
-		static CEmbeddedLinkHandler* NewL();
-		static CEmbeddedLinkHandler* NewLC();
-		~CEmbeddedLinkHandler();
-	private:
-		void ConstructL();
-			
-	public:
-		enum TLinkAppType
-		{
-			EImageLinkApp = 0,
-			ERingtoneLinkApp,
-			EVideoLinkApp,
-			EAudioLinkApp,
-			ESkinLinkApp,
-			EGameLinkApp,
-			EApplicationLinkApp
-		};
-		typedef TBuf<10> TEmbeddedLinkAppName;
-		void SupportingApplicationsL( RArray<TEmbeddedLinkAppName>& aArray );
-		TInt GetLinkAppL( TInt aLinkType, CEmbeddedLinkApp*& aLinkApp );
-		TInt RemoveLinkL( TInt aLinkUid );
-		TInt UpdateLinkUrlL( TInt aLinkUid, const TDesC& aURL );
-		TInt UpdateLinkNameL( TInt aLinkUid, const TDesC& aName );
-		TInt UpdateUserNameL( TInt aLinkUid, const TDesC& aUserName );
-		TInt UpdatePasswordL( TInt aLinkUid, const TDesC& aPassword );
-		TInt UpdateWapApL( TInt aLinkUid, const TDesC& aWapAp );
-
-	private:
-	
-	public:
-		CEmbeddedLinkApp* iEmbeddedLinkImage;
-		CEmbeddedLinkApp* iEmbeddedLinkRingtone;
-		CEmbeddedLinkApp* iEmbeddedLinkVideo;
-		CEmbeddedLinkApp* iEmbeddedLinkAudio;
-		CEmbeddedLinkApp* iEmbeddedLinkSkin;
-		CEmbeddedLinkApp* iEmbeddedLinkGame;
-		CEmbeddedLinkApp* iEmbeddedLinkApplication;	
-		CEmbeddedLinkApp* iEmbeddedLinkMusic;	
-	private:
-
-		RFavouritesSession iFavouritesSess;
-
-
-};
-
-#endif
\ No newline at end of file
--- a/customization/EmbeddedLinkAdapter/rom/EmbeddedLinkAdapter.iby	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of customization components
-*
-*/
-#ifndef __EmbeddedLinkAdapter_IBY__
-#define __EmbeddedLinkAdapter_IBY__
-
-//#ifdef __SAP_EMBEDDED_LINK_ADAPTER
-
-ECOM_PLUGIN(EmbeddedLinkAdapter.dll, EmbeddedLinkAdapter.rsc)
-
-//#endif //__SAP_EMBEDDED_LINK_ADAPTER
-
-#endif //__EmbeddedLinkAdapter_IBY__
--- a/customization/EmbeddedLinkAdapter/src/EmbeddedLinkAdapter.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1018 +0,0 @@
-/*
-* Copyright (c) 2004 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:  DM Email Settings Adapter
-*
-*/
-
-
-
-#include "EmbeddedLinkAdapter.h"
-
-#include <implementationproxy.h> // For TImplementationProxy definition
-
-//#ifdef __SAP_POLICY_MANAGEMENT
-#include <PolicyEngineXACML.h>
-//#endif
-
-#include "EmbeddedLinkHandler.h"
-#include "nsmldmuri.h"
-#include "debug.h"
-#include <featmgr.h>
-#include <utf.h> 
-
-
-#define TO_BE_IMPLEMENTED()	{ ret = EError; }
-
-typedef TBuf<10> TEmbeddedLinkAppName;
-
-// ------------------------------------------------------------------------------------------------
-// CNSmlEmbeddedLinkAdapter* CNSmlEmbeddedLinkAdapter::NewL( )
-// ------------------------------------------------------------------------------------------------
-CNSmlEmbeddedLinkAdapter* CNSmlEmbeddedLinkAdapter::NewL( MSmlDmCallback* aDmCallback )
-	{
-	RDEBUG("CNSmlEmbeddedLinkAdapter::NewL(): begin");
-	CNSmlEmbeddedLinkAdapter* self = NewLC( aDmCallback );
-	CleanupStack::Pop();
-	return self;
-	}
-
-// ------------------------------------------------------------------------------------------------
-// CNSmlEmbeddedLinkAdapter* CNSmlEmbeddedLinkAdapter::NewLC( )
-// ------------------------------------------------------------------------------------------------
-CNSmlEmbeddedLinkAdapter* CNSmlEmbeddedLinkAdapter::NewLC( MSmlDmCallback* aDmCallback )
-	{
-	RDEBUG("CNSmlEmbeddedLinkAdapter::NewLC(): begin");
-	CNSmlEmbeddedLinkAdapter* self = new ( ELeave ) CNSmlEmbeddedLinkAdapter( aDmCallback );
-	CleanupStack::PushL( self );
-	self->ConstructL( );
-	return self;
-	}
-
-
-// ------------------------------------------------------------------------------------------------
-// CNSmlEmbeddedLinkAdapter::CNSmlEmbeddedLinkAdapter()
-// ------------------------------------------------------------------------------------------------
-
-CNSmlEmbeddedLinkAdapter::CNSmlEmbeddedLinkAdapter( MSmlDmCallback* aDmCallback ) 
-	: CTARMDmAdapter( aDmCallback )
-	, iCallBack( aDmCallback )
-	{
-	RDEBUG("CNSmlEmbeddedLinkAdapter::CNSmlEmbeddedLinkAdapter(): begin");
-	}
-
-
-// ------------------------------------------------------------------------------------------------
-// CNSmlEmbeddedLinkAdapter::~CNSmlEmbeddedLinkAdapter()
-// ------------------------------------------------------------------------------------------------
-
-
-CNSmlEmbeddedLinkAdapter::~CNSmlEmbeddedLinkAdapter()
-	{
-	RDEBUG("CNSmlEmbeddedLinkAdapter::~CNSmlEmbeddedLinkAdapter(): begin");
-	FeatureManager::UnInitializeLib();
-	delete iLinkHandler;
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  CNSmlEmbeddedLinkAdapter::DDFVersionL()
-// ------------------------------------------------------------------------------------------------
-void CNSmlEmbeddedLinkAdapter::DDFVersionL( CBufBase& aDDFVersion )
-	{
-	RDEBUG("CNSmlEmbeddedLinkAdapter::DDFVersionL(TDes& aDDFVersion): begin");
-	aDDFVersion.InsertL( 0,KNSmlEmbeddedLinkAdapterDDFVersion );
-	RDEBUG("CNSmlEmbeddedLinkAdapter::DDFVersionL(TDes& aDDFVersion): end");
-	}
-
-
-// ------------------------------------------------------------------------------------------------
-//  CNSmlEmbeddedLinkAdapter::DDFStructureL()
-//
-// ------------------------------------------------------------------------------------------------
-void CNSmlEmbeddedLinkAdapter::DDFStructureL( MSmlDmDDFObject& aDDF )
-	{
-	RDEBUG("CNSmlEmbeddedLinkAdapter::DDFStructureL(): begin");	
-
-	TSmlDmAccessTypes accessTypesGet;
-	accessTypesGet.SetGet();
-
-	TSmlDmAccessTypes accessTypesAddGet;
-	accessTypesAddGet.SetAdd();
-	accessTypesAddGet.SetGet();
-
-	TSmlDmAccessTypes accessTypesGetReplace;
-	accessTypesGetReplace.SetGet();
-	accessTypesGetReplace.SetReplace();
-
-	TSmlDmAccessTypes accessTypesNone;
-
-	/*
-	Node: ./Customization
-	*/
-	MSmlDmDDFObject& Customization = aDDF.AddChildObjectL( KNSmlEmbeddedLinkCustomization );
-	FillNodeInfoL( Customization, accessTypesGet, MSmlDmDDFObject::EOne, MSmlDmDDFObject::EPermanent,
-				MSmlDmDDFObject::ENode, KNullDesC8 );	
-	
-	/*
-	Node: ./EmbeddedLinks
-	*/
-	MSmlDmDDFObject& EmbeddedLinks = Customization.AddChildObjectL( KNSmlEmbeddedLinkEmbeddedLinks );
-	FillNodeInfoL( EmbeddedLinks, accessTypesGet, MSmlDmDDFObject::EOne, MSmlDmDDFObject::EPermanent,
-				MSmlDmDDFObject::ENode, KNullDesC8 );
-
-
-	/*
-	Node: ./EmbeddedLinks/<X>
-	*/
-	MSmlDmDDFObject& groupNode = EmbeddedLinks.AddChildObjectGroupL( );
-	FillNodeInfoL( groupNode, accessTypesGet, MSmlDmDDFObject::EZeroOrMore, MSmlDmDDFObject::EDynamic,
-					MSmlDmDDFObject::ENode, KNSmlEmbeddedLinkDynamicNode );
-
-	/*
-	Node: ./EmbeddedLinks/<X>/Links
-	*/
-	MSmlDmDDFObject& Links = groupNode.AddChildObjectL( KNSmlEmbeddedLinkLink );
-	FillNodeInfoL( Links,accessTypesAddGet, MSmlDmDDFObject::EOne, MSmlDmDDFObject::EPermanent,
-					MSmlDmDDFObject::ENode, KNSmlEmbeddedLinkLink );
-
-	/*
-	Node: ./EmbeddedLinks/<X>/ID
-	*/
-	/*
-	MSmlDmDDFObject& idNode = groupNode.AddChildObjectL( KNSmlEmbeddedLinkID );
-	FillNodeInfoL( idNode, accessTypesGet, MSmlDmDDFObject::EOne, MSmlDmDDFObject::EPermanent,
-					MSmlDmDDFObject::EChr, KNSmlEmbeddedLinkLink );
-	*/
-	/*
-	Node: ./EmbeddedLinks/<X>/AppName
-	*/
-	/*
-	MSmlDmDDFObject& appNameNode = groupNode.AddChildObjectL( KNSmlEmbeddedLinkAppName );
-	FillNodeInfoL( appNameNode, accessTypesGet, MSmlDmDDFObject::EOne, MSmlDmDDFObject::EPermanent,
-					MSmlDmDDFObject::EChr, KNSmlEmbeddedLinkLink );
-	*/
-	
-	/*
-	Node: ./EmbeddedLinks/<X>/Links/<X>
-	*/
-	TSmlDmAccessTypes accessTypesAddDeleteGetReplace;
-	accessTypesAddDeleteGetReplace.SetAdd();
-	accessTypesAddDeleteGetReplace.SetDelete();
-	accessTypesAddDeleteGetReplace.SetGet();
-	accessTypesAddDeleteGetReplace.SetReplace();
-
-	MSmlDmDDFObject& group2Node = Links.AddChildObjectGroupL( );
-	FillNodeInfoL( group2Node, accessTypesAddDeleteGetReplace, MSmlDmDDFObject::EZeroOrMore,
-					MSmlDmDDFObject::EDynamic,			//EDynamic
-					MSmlDmDDFObject::ENode, KNSmlEmbeddedLinkLink );
-
-
-	/*
-	Node: ./EmbeddedLinks/<X>/Links/<X>/URL
-	*/
-	MSmlDmDDFObject& urlNode = group2Node.AddChildObjectL( KNSmlEmbeddedLinkURL );
-	FillNodeInfoL( urlNode, accessTypesGetReplace, MSmlDmDDFObject::EOne, MSmlDmDDFObject::EPermanent,
-					MSmlDmDDFObject::EChr, KNSmlEmbeddedLinkURL );
-
-	/*
-	Node: ./EmbeddedLinks/<X>/Links/<X>/Name
-	*/
-	MSmlDmDDFObject& nameNode = group2Node.AddChildObjectL( KNSmlEmbeddedLinkName );
-	FillNodeInfoL( nameNode, accessTypesGetReplace, MSmlDmDDFObject::EZeroOrOne, MSmlDmDDFObject::EDynamic,
-					MSmlDmDDFObject::EChr, KNSmlEmbeddedLinkName );
-
-	/*
-	Node: ./EmbeddedLinks/<X>/Links/<X>/UserName
-	*/
-	MSmlDmDDFObject& usernameNode = group2Node.AddChildObjectL( KNSmlEmbeddedLinkUserName );
-	FillNodeInfoL( usernameNode, accessTypesGetReplace, MSmlDmDDFObject::EZeroOrOne, MSmlDmDDFObject::EDynamic,
-					MSmlDmDDFObject::EChr, KNSmlEmbeddedLinkUserName );
-
-	/*
-	Node: ./EmbeddedLinks/<X>/Links/<X>/Password
-	*/
-	MSmlDmDDFObject& passwordNode = group2Node.AddChildObjectL( KNSmlEmbeddedLinkPassword );
-	FillNodeInfoL( passwordNode, accessTypesGetReplace, MSmlDmDDFObject::EZeroOrOne, MSmlDmDDFObject::EDynamic,
-					MSmlDmDDFObject::EChr, KNSmlEmbeddedLinkPassword );
-
-	/*
-	Node: ./EmbeddedLinks/<X>/Links/<X>/ConRef
-	*/
-	MSmlDmDDFObject& confrefNode = group2Node.AddChildObjectL( KNSmlEmbeddedLinkConfRef );
-	FillNodeInfoL( confrefNode, accessTypesGetReplace, MSmlDmDDFObject::EZeroOrOne, MSmlDmDDFObject::EDynamic,
-					MSmlDmDDFObject::EChr, KNSmlEmbeddedLinkConfRef );
-
-
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  CNSmlEmbeddedLinkAdapter::UpdateLeafObjectL()
-// ------------------------------------------------------------------------------------------------
-void CNSmlEmbeddedLinkAdapter::_UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& /*aLUID*/, const TDesC8& aObject, const TDesC8& /*aType*/, const TInt aStatusRef )	//OK
-	{
-	RDEBUG( "CNSmlEmbeddedLinkAdapter::UpdateLeafObjectL(): begin" );
-
-	TError ret( EOk ) ;
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-	TPtrC8 uriPtrc = NSmlDmURI::RemoveDotSlash( aURI );
-	TInt cnt( NSmlDmURI::NumOfURISegs( uriPtrc ) );
-	TPtrC8 field( NSmlDmURI::LastURISeg( uriPtrc ) ) ;
-#else
-	TInt cnt( NSmlDmURI::NumOfURISegs( aURI ) );
-	TPtrC8 field( NSmlDmURI::LastURISeg( aURI ) ) ;
-#endif	
-	
-	TBuf<1000>obj;
-	TInt err = CnvUtfConverter::ConvertToUnicodeFromUtf8(obj,aObject);
-	
-	if( cnt == 6 )
-		{	
-		TInt linkUid;
-		
-		HBufC8* luid = iCallBack->GetLuidAllocL( NSmlDmURI::RemoveLastSeg( aURI ) );	
-
-		TLex8 lexa( luid->Des() );
-		TInt err = lexa.Val( linkUid );
-
-		delete luid;
-
-		if (err == KErrNone)
-			{
-			if ( field == KNSmlEmbeddedLinkURL )
-				{
-				iLinkHandler->UpdateLinkUrlL( linkUid, obj );
-				}
-			else if ( field == KNSmlEmbeddedLinkName )
-				{
-				iLinkHandler->UpdateLinkNameL( linkUid, obj );
-				}
-			else if ( field == KNSmlEmbeddedLinkUserName )
-				{
-				iLinkHandler->UpdateUserNameL( linkUid, obj );
-				}
-			else if ( field == KNSmlEmbeddedLinkPassword )
-				{
-				iLinkHandler->UpdatePasswordL( linkUid, obj );
-				}
-			else if ( field == KNSmlEmbeddedLinkConfRef )
-				{
-				iLinkHandler->UpdateWapApL( linkUid, obj );
-				}
-			else 
-				{
-				ret = EInvalidObject;
-				}
-			}
-		else 
-			{
-			ret = EInvalidObject;
-			}
-		} 
-	else 
-		{
-		ret = EInvalidObject;
-		}
-
-	iCallBack->SetStatusL( aStatusRef, ret );
-	}
-
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-void CNSmlEmbeddedLinkAdapter::_UpdateLeafObjectL( const TDesC8& /*aURI*/, const TDesC8& /*aLUID*/, RWriteStream*& /*aStream*/, const TDesC8& /*aType*/, TInt aStatusRef )
-	{
-	RDEBUG( "CNSmlEmbeddedLinkAdapter::UpdateLeafObjectL(...RWriteStream...): begin" );
-	//Not supported
-	TError ret = EError;
-	iCallBack->SetStatusL( aStatusRef, ret );
-	}
-
-// ------------------------------------------------------------------------------------------------
-// CNSmlEmbeddedLinkAdapter::DeleteObjectL( const TDesC& aURI, const TDesC& aLUID )
-// ------------------------------------------------------------------------------------------------
-void CNSmlEmbeddedLinkAdapter::_DeleteObjectL( const TDesC8& aURI, const TDesC8& /*aLUID*/, const TInt aStatusRef )		// OK
-	{
-	RDEBUG("CNSmlEmbeddedLinkAdapter::DeleteLeafObjectL( ): begin");
-
-	TError ret = EOk ;
-	TInt linkUid;
-	HBufC8* field = HBufC8::NewLC( 16 );
-	
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-	TPtrC8 uriPtrc = NSmlDmURI::RemoveDotSlash( aURI );
-	TInt cnt( NSmlDmURI::NumOfURISegs( uriPtrc ) );
-	field->Des().Copy( NSmlDmURI::LastURISeg( uriPtrc ) );
-#else
-	TInt cnt( NSmlDmURI::NumOfURISegs( aURI ) );
-	field->Des().Copy( NSmlDmURI::LastURISeg( aURI ) );
-#endif	
-
-	if ( cnt == 5 )
-		{					// remove item from bookmarks
-			
-		HBufC8* luid = iCallBack->GetLuidAllocL( aURI );
-	
-		TLex8 lexa( luid->Des() );
-		TInt err( lexa.Val( linkUid ) );
-		delete luid;
-		luid = NULL;
-		if ( err == KErrNone )
-			{
-			iLinkHandler->RemoveLinkL( linkUid );
-			} 
-		else 
-			{
-			ret = EInvalidObject;
-			}
-
-		} 
-	else if ( cnt == 6 ) 
-		{
-		
-		HBufC8* luid=iCallBack->GetLuidAllocL( NSmlDmURI::RemoveLastSeg( aURI ) );		
-		TLex8 lexa( luid->Des() );
-		
-		TInt err( lexa.Val( linkUid ) );
-		delete luid;
-		luid = NULL;
-		TBuf<8> emptyStr;
-		emptyStr.Copy( _L("") );
-		
-		if ( err == KErrNone )
-			{
-			if( field->Des() == KNSmlEmbeddedLinkURL )
-				{
-				//iLinkHandler->UpdateLinkUrlL(linkUid, _L(""));
-				iLinkHandler->UpdateLinkUrlL( linkUid, emptyStr );
-				}
-			else if ( field->Des() == KNSmlEmbeddedLinkName )
-				{
-				iLinkHandler->UpdateLinkNameL( linkUid, emptyStr );
-				}
-			else if ( field->Des() == KNSmlEmbeddedLinkUserName )
-				{
-				iLinkHandler->UpdateUserNameL(linkUid, emptyStr);
-				}
-			else if ( field->Des() == KNSmlEmbeddedLinkPassword )
-				{
-				iLinkHandler->UpdatePasswordL( linkUid, emptyStr );
-				}
-			else if ( field->Des() == KNSmlEmbeddedLinkConfRef ) 
-				{
-				
-				}
-			else 
-				{
-				ret = EInvalidObject;
-				}
-			}
-		else 
-			{
-			ret = EInvalidObject;
-			}
-		
-		}	
-	else
-		{
-		}
-	CleanupStack::PopAndDestroy(); //  field
-	iCallBack->SetStatusL(aStatusRef, ret);
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  CNSmlEmbeddedLinkAdapter::FetchLeafObjectL( const TDesC& aURI, const TDesC& aLUID, const TDesC& aType, CBufBase& aObject )
-// ------------------------------------------------------------------------------------------------
-void CNSmlEmbeddedLinkAdapter::_FetchLeafObjectL( const TDesC8& aURI, const TDesC8& /*aLUID*/, const TDesC8& aType, const TInt aResultsRef, const TInt aStatusRef )
-	{
-	RDEBUG( "CNSmlEmbeddedLinkAdapter::FetchLeafObjectL(): begin" );
-
-	TError ret( EOk );
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-	TPtrC8 uriPtrc = NSmlDmURI::RemoveDotSlash( aURI );
-	TInt cnt( NSmlDmURI::NumOfURISegs( uriPtrc ) );
-	TPtrC8 mapping( NSmlDmURI::LastURISeg( uriPtrc ) );
-#else
-	TInt cnt( NSmlDmURI::NumOfURISegs( aURI ) );
-	TPtrC8 mapping( NSmlDmURI::LastURISeg( aURI ) );
-#endif
-	
-	HBufC *data = HBufC::NewLC( 1000 );			
-	CBufBase* object = CBufFlat::NewL( 1000 );
-	CleanupStack::PushL( object );
-
-	TBuf<64> appName;
-	
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-	RecognizeAppTypeL( uriPtrc, appName );
-#else
-	RecognizeAppTypeL( aURI, appName );
-#endif	
-	
-	if ( cnt == 6 )
-		{
-		
-		TPtrC8 linkName( NSmlDmURI::RemoveLastSeg( aURI ) );	
-		HBufC8* uidBuf = iCallBack->GetLuidAllocL( linkName );
-		
-		CleanupStack::PushL( uidBuf );
-		TInt uidInt;
-		TInt app;
-
-		TLex8 leksa( uidBuf->Des() );
-		leksa.Val( uidInt );
-
-		TLex leksa2( appName );
-		leksa2.Val( app );
-
-		CEmbeddedLinkApp* linkApp = NULL;
-		
-		User::LeaveIfError( iLinkHandler->GetLinkAppL( app, linkApp ) );
-
-		CFavouritesItem* favItem = CFavouritesItem::NewL();
-		CleanupStack::PushL( favItem );
-		linkApp->GetLinkL( uidInt, *favItem );
-
-
-		// HBufC *uidi = iCallback->GetLuidALloc(linkname);
-		// tee uidista TUid ja  hae browserista uidia vastaava linkki
-		// kaiva applikaatiofoldertieto urin seasta jos tartteee
-		// ota linkistä tarvittava tieto kuten allakin on jo tehhty
-
-		if( mapping == KNSmlEmbeddedLinkURL )
-			{
-			data->Des().Copy( favItem->Url() );
-			} 
-		else if ( mapping == KNSmlEmbeddedLinkName )
-			{
-			data->Des().Copy( favItem->Name() );
-			}
-		else if ( mapping == KNSmlEmbeddedLinkUserName )
-			{
-			ret = EError;
-			}
-		else if( mapping == KNSmlEmbeddedLinkPassword )
-			{
-			ret = EError;
-			}
-		else if( mapping == KNSmlEmbeddedLinkConfRef )
-			{
-			TFavouritesWapAp wapAp = favItem->WapAp();
-			if (wapAp.IsDefault())
-				{
-				data->Des().Copy( KWapApDefault() );
-				}
-			else if (wapAp.IsNull())
-				{
-				data->Des().Copy( KWapApNull() );
-				}
-			else
-				{
-				TUint32 val = wapAp.ApId();
-				data->Des().Num( (TInt64)val );
-				}
-			}
-		else
-			{
-			ret = EInvalidObject;
-			}
-
-		CleanupStack::PopAndDestroy( 2 );	// favItem, //sf-NO:(linkApp), uidBuf
-		}
-	else if ( cnt == 4 )
-		{
-		TInt app;
-		TLex leksaApp( appName );
-		leksaApp.Val( app );
-
-		CEmbeddedLinkApp* linkApp = NULL;
-		User::LeaveIfError( iLinkHandler->GetLinkAppL( app, linkApp ) );
-
-		if( mapping == KNSmlEmbeddedLinkID )
-			{
-			TInt id = linkApp->AppId();
-			data->Des().Num( (TInt64)id );
-			}
-		else if ( mapping == KNSmlEmbeddedLinkAppName )
-			{
-			TPtrC name = linkApp->AppName();
-			data->Des().Copy( name );
-			}
-		else
-			{
-			ret = EInvalidObject;
-			}
-		}
-	else 
-		{
-		ret = EInvalidObject;
-		}
-	TBuf8<1000> resultBuf;
-	 TInt retVal = CnvUtfConverter::ConvertFromUnicodeToUtf8(resultBuf,data->Des());
-	object->InsertL( 0, resultBuf );
-	iCallBack->SetResultsL( aResultsRef, *object, aType );
-	iCallBack->SetStatusL( aStatusRef, ret );
-	CleanupStack::PopAndDestroy( 2 ); // object, data
-	}
-
-
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-void CNSmlEmbeddedLinkAdapter::_FetchLeafObjectSizeL( const TDesC8& aURI, const TDesC8& /*aLUID*/, const TDesC8& /*aType*/, TInt /*aResultsRef*/, TInt aStatusRef )
-	{
-	RDEBUG("CNSmlEmbeddedLinkAdapter::FetchLeafObjectSizeL(): begin");
-
-	TError ret = EOk;
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-	TPtrC8 uriPtrc = NSmlDmURI::RemoveDotSlash( aURI );
-	TNodeId nodeId = NodeId( uriPtrc );
-#else
-	TNodeId nodeId = NodeId( aURI );
-#endif	
-
-	switch( nodeId )
-		{
-	case ENodeCustomization:
-		ret = EError;
-		break;
-
-	default:
-		ret = EError;
-		break;
-		}
-
-	iCallBack->SetStatusL( aStatusRef, ret );
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  CNSmlEmbeddedLinkAdapter::ChildURIListL( const TDesC& aURI, const TDesC& aParentLUID, const CArrayFix<TNSmlDmMappingInfo>& aPreviousURISegmentList, CArrayFix<TPtrC>& aCurrentURISegmentList )
-// ------------------------------------------------------------------------------------------------
-void CNSmlEmbeddedLinkAdapter::_ChildURIListL( const TDesC8& aURI, 
-		const TDesC8& /*aParentLUID*/, 
-		const CArrayFix<TSmlDmMappingInfo>& /*aPreviousURISegmentList*/, 
-		const TInt aResultsRef, const TInt aStatusRef  )		//OK
-	{
-	RDEBUG("CNSmlEmbeddedLinkAdapter::ChildURIListL(): begin");
-	TError ret( EOk );
-	HBufC *data = HBufC::NewLC( 1000 );	
-	CBufBase* object = CBufFlat::NewL( 1000 );
-	
-	CleanupStack::PushL( object );
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-	TPtrC8 uriPtrc = NSmlDmURI::RemoveDotSlash( aURI );
-	TInt cnt( NSmlDmURI::NumOfURISegs( uriPtrc ) );
-#else
-	TInt cnt( NSmlDmURI::NumOfURISegs( aURI ) );
-#endif
-
-	if ( cnt == 1 )
-		{
-		object->InsertL( 0, KRootLeafs8 );
-		}
-	else if ( cnt == 2 )
-		{							// application list							
-		RArray<TEmbeddedLinkAppName> array;
-		
-		iLinkHandler->SupportingApplicationsL( array );
-		
-		data->Des().Zero();
-		TBuf<8> app;
-		for( TInt i=0; i<array.Count(); i++)
-			{
-			if ( i > 0 ) 
-				{
-				data->Des().Append( '/' );
-				}
-			app=array[i];
-			data->Des().Append( array[i] );
-			}
-		array.Close();
-		}	
-	else if ( cnt == 3 )
-		{
-		object->InsertL( 0, KAppLeafs8 );
-		} 
-	else if ( cnt == 4 )
-		{				// tietyn applikaation linkkilistaus		/Customization/EmbeddedLinks/4/Links
-		TBuf<32> appName;
-		TInt appType;
-#ifdef __TARM_SYMBIAN_CONVERGENCY		
-		User::LeaveIfError( RecognizeAppTypeL( uriPtrc, appName ) );
-#else
-		User::LeaveIfError( RecognizeAppTypeL( aURI, appName ) );
-#endif		
-		TLex lexa( appName );
-		User::LeaveIfError( lexa.Val( appType ) );
-	
-		CEmbeddedLinkApp* linkApp = NULL;
-		
-		User::LeaveIfError( iLinkHandler->GetLinkAppL( appType, linkApp ) );
-		
-		CFavouritesItemList* itemList = new ( ELeave ) CFavouritesItemList;
-		CleanupStack::PushL( itemList );
-
-		linkApp->GetLinksL( *itemList );
-		
-		HBufC8 *URIname = HBufC8::NewLC( 64 );
-		
-		TBuf8<32> uidBuf;
-
-		for( TInt i = 0; i < itemList->Count(); i++ )
-			{				// Generates the list of bookmarks AND also maps the luids to the bookmarks
-			if( i > 0 && object->Size() > 0 ) 
-				{
-				data->Des().Append( '/' );
-				}
-			data->Des().Append( itemList->At( i )->Name() );
-			{
-			TBuf8<1000> resultBuf;
-			TInt retVal = CnvUtfConverter::ConvertFromUnicodeToUtf8(resultBuf,data->Des());
-			object->InsertL( object->Size(), resultBuf);
-			data->Des().Zero();
-			}
-			// TODO, SymbianConvergencym is this aURI ok in this method? should be I guess...
-			URIname->Des().Append( aURI );
-			URIname->Des().Append( _L8( "/" ) );
-			URIname->Des().Append( itemList->At( i )->Name() );
-			
-			TInt contekstiId( itemList->At( i )->ContextId() );
-			TInt pfolderid( itemList->At( i )->ParentFolder() );	
-			TInt linkUid( itemList->At( i )->Uid() );
-			uidBuf.AppendNum( (TInt64)linkUid );
-			
-			HBufC8* ptr = iCallBack->GetLuidAllocL( URIname->Des() );
-			
-			if ( ptr->Length() == 0 )
-				{
-				iCallBack->SetMappingL( URIname->Des(), uidBuf );		// Check if the bookmark has already a luid mapping	
-				}
-			
-			delete ptr;
-			ptr = NULL;
-			
-			uidBuf.Zero();
-			URIname->Des().Zero();
-		
-			}
-		CleanupStack::PopAndDestroy( 2 );	// URIname, itemList, //sf-NO:linkApp
-		}
-	else if ( cnt == 5 )
-		{
-		object->InsertL( 0, KLinkLeafs8 );
-		} 
-	else 
-		{
-		ret = EInvalidObject;
-		}
-	    TBuf8<1000> resultBuf;
-	     TInt retVal = CnvUtfConverter::ConvertFromUnicodeToUtf8(resultBuf,data->Des());
-	    object->InsertL( 0, resultBuf );
-	
-	iCallBack->SetResultsL( aResultsRef, *object, KNullDesC8 );
-	iCallBack->SetStatusL( aStatusRef, ret );
-	CleanupStack::PopAndDestroy( 2 );	//data, object
-	}
-
-
-// ------------------------------------------------------------------------------------------------
-// CNSmlEmbeddedLinkAdapter::AddNodeObjectL( const TDesC& aURI, const TDesC& aParentLUID )
-// ------------------------------------------------------------------------------------------------
-void CNSmlEmbeddedLinkAdapter::_AddNodeObjectL( const TDesC8& aURI, const TDesC8& /*aParentLUID*/, const TInt aStatusRef )
-{
-	TError ret( EOk );
-	RDEBUG( "CNSmlEmbeddedLinkAdapter::AddNodeObjectL(): begin" );
-
-	// tee uus bookmark
-	// sitte iCallback->SetMapping (aURI, bookmarkUIDi favouriteItemistä);
-
-	TInt appType;
-	TBuf<32> appName;
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-	TPtrC8 uriPtrc = NSmlDmURI::RemoveDotSlash( aURI );
-	User::LeaveIfError( RecognizeAppTypeL( uriPtrc, appName ) );
-#else
-	User::LeaveIfError( RecognizeAppTypeL( aURI, appName ) );
-#endif	
-	
-	TLex lexa( appName );
-
-	User::LeaveIfError( lexa.Val( appType ) );
-	
-	CEmbeddedLinkApp* linkApp = NULL;
-	User::LeaveIfError( iLinkHandler->GetLinkAppL( appType, linkApp ) );
-
-	TBuf<8> emptyStr;
-	emptyStr.Copy( _L( "Unknown" ) );
-
-	TInt luid( linkApp->AddLinkL( emptyStr, emptyStr ) );
-	if( luid < KErrNone )
-		{
-		ret = EError;
-		}
-	else
-		{
-		TBuf8<16> luidBuf;
-		luidBuf.AppendNum( (TInt64)luid );
-		iCallBack->SetMappingL( aURI, luidBuf );	
-		}
-
-	iCallBack->SetStatusL( aStatusRef, ret );
-}
-
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-void CNSmlEmbeddedLinkAdapter::_ExecuteCommandL( const TDesC8& /*aURI*/, const TDesC8& /*aLUID*/, const TDesC8& /*aArgument*/, const TDesC8& /*aType*/, TInt aStatusRef )
-	{
-	RDEBUG("CNSmlEmbeddedLinkAdapter::ExecuteCommandL(): begin");
-	//Not supported
-	TError ret = EError;
-	iCallBack->SetStatusL( aStatusRef, ret );
-	}
-
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-void CNSmlEmbeddedLinkAdapter::_ExecuteCommandL( const TDesC8& /*aURI*/, const TDesC8& /*aLUID*/, RWriteStream*& /*aStream*/, const TDesC8& /*aType*/, TInt aStatusRef )
-	{
-	RDEBUG("CNSmlEmbeddedLinkAdapter::ExecuteCommandL(...RWriteStream...): begin");
-	//Not supported
-	TError ret = EError;
-	iCallBack->SetStatusL( aStatusRef, ret );
-	}
-	
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-void CNSmlEmbeddedLinkAdapter::_CopyCommandL( const TDesC8& /*aTargetURI*/, const TDesC8& /*aTargetLUID*/, const TDesC8& /*aSourceURI*/, const TDesC8& /*aSourceLUID*/, const TDesC8& /*aType*/, TInt aStatusRef )
-	{
-	RDEBUG("CNSmlEmbeddedLinkAdapter::CopyCommandL(): begin");
-	//Not supported
-	TError ret = EError;
-	iCallBack->SetStatusL( aStatusRef, ret );
-	}
-
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-void CNSmlEmbeddedLinkAdapter::StartAtomicL()
-	{
-	RDEBUG("CNSmlEmbeddedLinkAdapter::StartAtomicL(): begin");
-	//Not supported
-	}
-
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-void CNSmlEmbeddedLinkAdapter::CommitAtomicL()
-	{
-	RDEBUG("CNSmlEmbeddedLinkAdapter::CommitAtomicL(): begin");
-	//Not supported
-	}
-
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-void CNSmlEmbeddedLinkAdapter::RollbackAtomicL()
-	{
-	RDEBUG("CNSmlEmbeddedLinkAdapter::RollbackAtomicL(): begin");
-	//Not supported
-	}
-
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-TBool CNSmlEmbeddedLinkAdapter::StreamingSupport( TInt& /*aItemSize*/ )
-	{
-	RDEBUG("CNSmlEmbeddedLinkAdapter::StreamingSupport(): begin");
-	return EFalse;
-	}
-
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-#ifdef __TARM_SYMBIAN_CONVERGENCY	
-void CNSmlEmbeddedLinkAdapter::StreamCommittedL( RWriteStream& /*aStream*/ )
-#else
-void CNSmlEmbeddedLinkAdapter::StreamCommittedL()
-#endif	
-	{	
-	RDEBUG("CNSmlEmbeddedLinkAdapter::StreamCommittedL(): begin");
-	RDEBUG("CNSmlEmbeddedLinkAdapter::StreamCommittedL(): end");
-	}
-
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-void CNSmlEmbeddedLinkAdapter::CompleteOutstandingCmdsL()
-	{
-	RDEBUG("CNSmlEmbeddedLinkAdapter::CompleteOutstandingCmdsL(): begin");
-	}
-
-// -----------------------------------------------------------------------------
-// 
-// -----------------------------------------------------------------------------
-//
-//#ifdef __SAP_POLICY_MANAGEMENT
-
-TPtrC8 CNSmlEmbeddedLinkAdapter::PolicyRequestResourceL( const TDesC8& /*aURI*/ )
-{
-	
-	if(!FeatureManager::FeatureSupported(KFeatureIdSapPolicyManagement ))
-	{
-		User::Leave(KErrNotSupported);
-		
-	}
-		return PolicyEngineXACML::KCustomizationManagement();
-	
-}
-	
-//#endif
-
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-CNSmlEmbeddedLinkAdapter::TNodeId CNSmlEmbeddedLinkAdapter::NodeId( const TDesC8& aURI )
-	{
-	TNodeId id = ENodeUnknown;
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-	TPtrC8 uriPtrc = NSmlDmURI::RemoveDotSlash( aURI );
-	TInt cnt = NSmlDmURI::NumOfURISegs( uriPtrc ) ;
-	TPtrC8 app = NSmlDmURI::LastURISeg( uriPtrc ) ;
-#else
-	TInt cnt = NSmlDmURI::NumOfURISegs( aURI ) ;
-	TPtrC8 app = NSmlDmURI::LastURISeg( aURI ) ;
-#endif
-
-	if ( cnt == 1 )
-		{
-		if (app == KNSmlEmbeddedLinkCustomization)
-			{
-			id = ENodeCustomization;
-			}
-		}
-	else if ( cnt == 2 ) 
-		{
-		if (app == KNSmlEmbeddedLinkEmbeddedLinks)
-			{
-			id = ENodeEmbeddedLinks;
-			}
-		}
-	else if ( cnt == 3 ) 
-		{
-		id = ENodeEmbeddedLinksX1;
-		}
-	else if ( cnt == 4 ) 
-		{
-		if (app == KNSmlEmbeddedLinkLink)
-			{
-			id = ENodeLinks;
-			}
-		else if (app == KNSmlEmbeddedLinkID)
-			{
-			id = ENodeID;
-			}
-		else if (app == KNSmlEmbeddedLinkAppName)
-			{
-			id = ENodeAppName;
-			}
-		}
-	else if ( cnt == 5 ) 
-		{
-		id = ENodeLinksX2;
-		}
-	else if ( cnt == 6 )
-		{
-		if (app == KNSmlEmbeddedLinkEmbeddedLinks)
-			{
-			id = ENodeURL;
-			}
-		else if (app == KNSmlEmbeddedLinkEmbeddedLinks)
-			{
-			id = ENodeName;
-			}
-		else if (app == KNSmlEmbeddedLinkEmbeddedLinks)
-			{
-			id = ENodeUserName;
-			}
-		else if (app == KNSmlEmbeddedLinkEmbeddedLinks)
-			{
-			id = ENodePassword;
-			}
-		else if (app == KNSmlEmbeddedLinkEmbeddedLinks)
-			{
-			id = ENodeConRef;
-			}
-		}
-
-	return id;
-	}
-
-// ------------------------------------------------------------------------------------------------
-// CNSmlEmbeddedLinkAdapter::RecognizeAppTypeL(const TDesC8& aURI, TDes& aAppName)
-// ------------------------------------------------------------------------------------------------
-TInt CNSmlEmbeddedLinkAdapter::RecognizeAppTypeL( const TDesC8& aURI, TDes& aAppName )
-	{
-	HBufC8 *appName = HBufC8::NewLC( 64 );
-	
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-	TPtrC8 uriPtrc = NSmlDmURI::RemoveDotSlash( aURI );
-	appName->Des().Copy( uriPtrc );
-#else
-	appName->Des().Copy( aURI );
-#endif	
-
-	if ( NSmlDmURI::NumOfURISegs( aURI ) > 2 )
-		{
-		while( NSmlDmURI::NumOfURISegs( appName->Des() ) > 3 )
-			{
-			
-			appName->Des().Copy( NSmlDmURI::RemoveLastSeg( appName->Des() ) );
-			}
-		appName->Des().Copy( NSmlDmURI::LastURISeg( appName->Des() ) );
-		aAppName.Copy( appName->Des() );
-		} 
-	else 
-		{
-		CleanupStack::PopAndDestroy();	//appName
-		return KErrNotFound;	
-		}
-	CleanupStack::PopAndDestroy();	//appName
-	return KErrNone;
-	}
-
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-const TImplementationProxy ImplementationTable[] = 
-{
-	{ {KNSmlEmbeddedLinkAdapterImplUid}, (TProxyNewLPtr)CNSmlEmbeddedLinkAdapter::NewL }
-};
-
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy( TInt& aTableCount )
-{
-	aTableCount = sizeof(ImplementationTable) / sizeof(TImplementationProxy);
-	return ImplementationTable;
-}
-
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-void CNSmlEmbeddedLinkAdapter::ConstructL( )
-{
-	TRAPD( errf, FeatureManager::InitializeLibL() );
-	if( errf != KErrNone )
-	{
-		User::Leave(errf);
-	}
-	if(FeatureManager::FeatureSupported(KFeatureIdSapEmbeddedLinkAdapter))
-	{
-			iLinkHandler = CEmbeddedLinkHandler::NewL();
-	}
-	else
-	{
-		FeatureManager::UnInitializeLib();
-   		User::Leave( KErrNotSupported );
-	}
-}
-
-
-// -------------------------------------------------------------------------------------
-// CNSmlEmbeddedLinkAdapter::FillNodeInfoL()
-// Fills the node info in ddf structure
-// -------------------------------------------------------------------------------------
-void CNSmlEmbeddedLinkAdapter::FillNodeInfoL( MSmlDmDDFObject& aNode,TSmlDmAccessTypes aAccTypes,
-										MSmlDmDDFObject::TOccurence aOccurrence, MSmlDmDDFObject::TScope aScope, 
-										MSmlDmDDFObject::TDFFormat aFormat,const TDesC8& aDescription )
-{
-	aNode.SetAccessTypesL(aAccTypes);
-	aNode.SetOccurenceL(aOccurrence);
-	aNode.SetScopeL(aScope);
-	aNode.SetDFFormatL(aFormat);
-	if(aFormat!=MSmlDmDDFObject::ENode)
-	{
-		aNode.AddDFTypeMimeTypeL(KNSmlEmbeddedLinkAdapterTextPlain);
-	}
-	aNode.SetDescriptionL(aDescription);
-}
-
-
--- a/customization/EmbeddedLinkAdapter/src/EmbeddedLinkAdapter.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-/*
-* Copyright (c) 2002 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: 
-*       Registery info for DM Embeddedlink adapter .
-*
-*/
-
-
-#include <registryinfo.rh>
-
-#define KSmlDMInterfaceUid 0x102018B4
-
-RESOURCE REGISTRY_INFO theRegistryInfo
-  {
-  dll_uid = 0x1020782B; //The DLL's 3rd UID.
-  interfaces = 
-      {
-      INTERFACE_INFO
-          {
-          interface_uid = KSmlDMInterfaceUid; // DM interface UID
-          implementations = 
-            {
-            IMPLEMENTATION_INFO
-                {
-                implementation_uid = 0x1020782C; // DM Embeddedlink implementation UID
-                version_no = 1; 
-                display_name = "DM EmbeddedLink Adapter";
-                default_data = "";
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-                opaque_data = "host=0x101F9A02";
-#else
-								opaque_data = "";
-#endif
-                }
-            };
-          }
-      };
-    }
--- a/customization/EmbeddedLinkAdapter/src/EmbeddedLinkApp.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,538 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of customization components
-*
-*/
-
-
-#include "EmbeddedLinkApp.h"
-
-
-// ---------------------------------------------------------
-// CEmbeddedLinkApp::NewL
-//
-//
-// ---------------------------------------------------------
-CEmbeddedLinkApp* CEmbeddedLinkApp::NewL( TInt aId )
-	{
-	CEmbeddedLinkApp* self = CEmbeddedLinkApp::NewLC( aId );
-    CleanupStack::Pop( self );
-    return self;
-	}
-
-// ---------------------------------------------------------
-// CEmbeddedLinkApp::NewLC
-//
-//
-// ---------------------------------------------------------
-CEmbeddedLinkApp* CEmbeddedLinkApp::NewLC( TInt aId )
-	{
-	CEmbeddedLinkApp* self = new ( ELeave ) CEmbeddedLinkApp;
-    CleanupStack::PushL( self );
-    self->ConstructL( aId );
-    return self;
-	}
-
-// ---------------------------------------------------------
-// CEmbeddedLinkApp::ConstructL
-//
-//
-// ---------------------------------------------------------
-void CEmbeddedLinkApp::ConstructL( TInt aId )
-	{
-	User::LeaveIfError( iFavouritesSess.Connect() );
-
-
-	iId=aId;
-	User::LeaveIfError( GetAppName( iAppName ) );
-//sf-	iFolderUid=0; //sf-FolderUidL();
-	}
-
-// ---------------------------------------------------------
-// CEmbeddedLinkApp::~CEmbeddedLinkApp
-//
-//
-// ---------------------------------------------------------
-CEmbeddedLinkApp::~CEmbeddedLinkApp()
-	{
-	iFavouritesSess.Close();
-	}
-
-// ---------------------------------------------------------
-// CEmbeddedLinkApp::AddLinkL
-//
-//
-// ---------------------------------------------------------
-TInt CEmbeddedLinkApp::AddLinkL( TDesC& aName, TDesC& aUrl, const TDesC& aUsername, 
-					const TDesC& aPassword, TInt aApId )
-	{
-	TInt err( KErrNone );
-
-  RFavouritesDb db;
-  User::LeaveIfError( db.Open( iFavouritesSess, KBrowserBookmarks ) );
-  CleanupClosePushL<RFavouritesDb>( db );
-
-
-	CFavouritesItem* favItem = CFavouritesItem::NewLC();
-
-	favItem->SetNameL( aName );
-	favItem->SetUrlL( aUrl );
-	favItem->SetType( CFavouritesItem::EItem );
-	
-	if ( aUsername != KNullDesC ) 
-		{
-		favItem->SetUserNameL( aUsername );
-		}
-	if ( aPassword != KNullDesC )
-		{
-		favItem->SetPasswordL( aPassword );
-		}
-	
-	if ( aApId != KErrNotFound )
-		{
-		TFavouritesWapAp wapAp;
-		wapAp=aApId;
-		favItem->SetWapAp( wapAp );	
-		}
-
-	favItem->SetParentFolder( FolderUidL() ); //sf-iFolderUid );
-
-	err = db.Add( *favItem, ETrue );
-//	db->CommitL();			KAATAA !!!!!
-	db.Close();
-
-	if ( err == KErrNone )
-		{
-		err = favItem->Uid();
-		}
-	else 
-		{
-		}
-
-	CleanupStack::PopAndDestroy( 2 ); //db, favItem
-
-	return err;
-	}
-
-// ---------------------------------------------------------
-// CEmbeddedLinkApp::GetLinkUidL
-//
-//
-// ---------------------------------------------------------
-TInt CEmbeddedLinkApp::GetLinkUidL( TDesC& aName, TDesC& /*aAddress*/, TInt folderUid, TInt& aUid )
-	{
-  RFavouritesDb db;
-  User::LeaveIfError( db.Open( iFavouritesSess, KBrowserBookmarks ) );
-  CleanupClosePushL<RFavouritesDb>( db );
-
-	CArrayFixFlat<TInt>* array = new ( ELeave ) CArrayFixFlat<TInt>( 16 );
-	CleanupStack::PushL( array );
-	TInt err = KErrNone;
-
-	err=db.GetUids( *array, folderUid, CFavouritesItem::EItem, &aName, KFavouritesNullContextId );	
-
-	if ( err == KErrNone && array->Count() < 2 )
-		{
-		for ( TInt i = 0; i < array->Count(); i++ )
-			{
-			aUid=array->At( i );
-			}
-		}
-	else
-		{
-		err = KErrBadName;		
-		}	 
-
-	db.Close();
-
-	CleanupStack::PopAndDestroy( 2 );	// db, array
-		
-	return err;
-	}
-
-// ---------------------------------------------------------
-// CEmbeddedLinkApp::GetLinkL
-//
-//
-// ---------------------------------------------------------
-TInt CEmbeddedLinkApp::GetLinkL( TInt aUid, CFavouritesItem& aFavItem )
-	{
-	TInt err( KErrNone );
-
-  RFavouritesDb db;
-  User::LeaveIfError( db.Open( iFavouritesSess, KBrowserBookmarks ) );
-  CleanupClosePushL<RFavouritesDb>( db );
-
-	err=db.Get( aUid, aFavItem );
-	db.Close();
-
-	
-	CleanupStack::PopAndDestroy();
-	return err;
-	}
-
-// ---------------------------------------------------------
-// CEmbeddedLinkApp::GetLinksL
-//
-//
-// ---------------------------------------------------------
-TInt CEmbeddedLinkApp::GetLinksL( CFavouritesItemList& aFavItemList )
-	{
-	TInt err( KErrNone );
-	
-	CArrayFixFlat<TInt>* array = new (ELeave) CArrayFixFlat<TInt>( 16 );
-	CleanupStack::PushL( array );
-
-  RFavouritesDb db;
-  User::LeaveIfError( db.Open( iFavouritesSess, KBrowserBookmarks ) );
-  CleanupClosePushL<RFavouritesDb>( db );
-
-	err = db.GetUids( *array, KFavouritesNullUid, CFavouritesItem::EFolder, NULL, iId );	// Get all folder uids related to the app
-
-
-	if ( err == KErrNone )																	// Then get the links in the folder
-		{
-		for ( TInt i = 0; i < array->Count(); i++ )
-			{
-			err = db.GetAll( aFavItemList, array->At( i ), CFavouritesItem::EItem, NULL, KFavouritesNullContextId );	
-			}	
-		}	
-
-	db.Close();
-	
-	CleanupStack::PopAndDestroy( 2 ); // array, db
-	return err;
-	}
-	
-// ---------------------------------------------------------
-// CEmbeddedLinkApp::RemoveLinkL
-//
-//
-// ---------------------------------------------------------
-TInt CEmbeddedLinkApp::RemoveLinkL( TInt aUid )
-	{
-	TInt err = KErrNone;
-
-  RFavouritesDb db;
-  User::LeaveIfError( db.Open( iFavouritesSess, KBrowserBookmarks ) );
-  CleanupClosePushL<RFavouritesDb>( db );
-
-	err = db.Delete( aUid );
-	db.Close();
-
-
-	CleanupStack::PopAndDestroy(); // db
-
-	return err;
- 	}
-
-// ---------------------------------------------------------
-// CEmbeddedLinkApp::GetAppNameL
-//
-//
-// ---------------------------------------------------------
-TInt CEmbeddedLinkApp::GetAppName( TDes& aName )
-	{
-	TInt err( KErrNone );
-
-	switch( iId )
-		{
-		case KFavouritesNullContextId:
-		aName.Copy(_L("Unused"));
-		break;
-		
-		case KFavouritesApplicationContextId:
-		aName.Copy(_L("Application"));
-		break;
-		
-		case KFavouritesImageContextId:
-		aName.Copy(_L("Image"));
-		break;
-		
-		case KFavouritesAudioContextId:
-		aName.Copy(_L("Audio"));
-		break;
-		
-		case KFavouritesVideoContextId:
-		aName.Copy(_L("Video"));
-		break;
-		
-		case KFavouritesGameDataContextId:
-		aName.Copy(_L("GameData"));
-		break;
-		
-		case KFavouritesRingingToneContextId:
-		aName.Copy(_L("RingingTone"));
-		break;
-		
-		case KFavouritesSkinContextId:
-		aName.Copy(_L("Skin"));
-		break;
-		
-		case KFavouritesMusicContextId:
-		aName.Copy(_L("Music"));
-		break;
-
-		default:
-		err=KErrNotFound;
-		break;
-		}
-
-	return err;
-	}
-
-// ---------------------------------------------------------
-// CEmbeddedLinkApp::UpdateUrlL
-//
-//
-// ---------------------------------------------------------
-TInt CEmbeddedLinkApp::UpdateUrlL( const TDesC& aUrl, TInt aUid )
-	{
-	TInt err( KErrNone );
-
-  RFavouritesDb db;
-  User::LeaveIfError( db.Open( iFavouritesSess, KBrowserBookmarks ) );
-  CleanupClosePushL<RFavouritesDb>( db );
-
-	CFavouritesItem* favItem = CFavouritesItem::NewLC();
-	
-	err = db.Get( aUid, *favItem );
-
-	if ( err==KErrNone )
-		{
-		favItem->SetUrlL( aUrl );
-		err = db.Update( *favItem, aUid, ETrue );
-		}
-	
-	db.Close();
-
-	CleanupStack::PopAndDestroy( 2 ); //db, favItem
-	
-	return err;
-}
-
-// ---------------------------------------------------------
-// CEmbeddedLinkApp::UpdateNameL
-//
-//
-// ---------------------------------------------------------
-TInt CEmbeddedLinkApp::UpdateNameL( const TDesC& aName, TInt aUid )
-{
-	TInt err( KErrNone );
-
-  RFavouritesDb db;
-  User::LeaveIfError( db.Open( iFavouritesSess, KBrowserBookmarks ) );
-  CleanupClosePushL<RFavouritesDb>( db );
-
-	CFavouritesItem* favItem = CFavouritesItem::NewLC();
-	
-	err = db.Get( aUid, *favItem );
-
-	if ( err == KErrNone )
-		{
-		favItem->SetNameL( aName );
-		err = db.Update( *favItem, aUid, ETrue );
-		}
-		
-	db.Close();
-
-	CleanupStack::PopAndDestroy( 2 ); //db, favItem
-	
-	return err;
-}
-
-// ---------------------------------------------------------
-// CEmbeddedLinkApp::UpdateUserNameL
-//
-//
-// ---------------------------------------------------------
-TInt CEmbeddedLinkApp::UpdateUserNameL( const TDesC& aUserName, const TInt aUid )
-	{
-	TInt err( KErrNone );
-
-  RFavouritesDb db;
-  User::LeaveIfError( db.Open( iFavouritesSess, KBrowserBookmarks ) );
-  CleanupClosePushL<RFavouritesDb>( db );
-
-	CFavouritesItem* favItem = CFavouritesItem::NewLC();
-	
-	err = db.Get( aUid, *favItem );
-
-	if ( err == KErrNone )
-		{
-		favItem->SetUserNameL( aUserName );
-		err = db.Update( *favItem, aUid, ETrue );
-		}
-
-	db.Close();
-
-	CleanupStack::PopAndDestroy( 2 ); //db, favItem
-
-	return err;
-	}
-
-// ---------------------------------------------------------
-// CEmbeddedLinkApp::UpdatePasswordL
-//
-//
-// ---------------------------------------------------------
-TInt CEmbeddedLinkApp::UpdatePasswordL( const TDesC& aPassword, const TInt aUid )
-	{
-	TInt err( KErrNone );
-
-  RFavouritesDb db;
-  User::LeaveIfError( db.Open( iFavouritesSess, KBrowserBookmarks ) );
-  CleanupClosePushL<RFavouritesDb>( db );
-
-	CFavouritesItem* favItem = CFavouritesItem::NewLC();
-	
-	err = db.Get( aUid, *favItem );
-
-	if ( err == KErrNone )
-		{
-		favItem->SetPasswordL( aPassword );
-		err = db.Update( *favItem, aUid, ETrue );
-		}
-
-	db.Close();
-
-	CleanupStack::PopAndDestroy( 2 ); //db, favItem
-	
-	return err;
-	}
-
-// ---------------------------------------------------------
-// CEmbeddedLinkApp::UpdateWapApL
-//
-//
-// ---------------------------------------------------------
-TInt CEmbeddedLinkApp::UpdateWapApL( const TDesC& aWapAp, const TInt aUid )
-	{
-	TInt err( KErrNone );
-
-  RFavouritesDb db;
-  User::LeaveIfError( db.Open( iFavouritesSess, KBrowserBookmarks ) );
-  CleanupClosePushL<RFavouritesDb>( db );
-
-	CFavouritesItem* favItem = CFavouritesItem::NewLC();
-	
-	err = db.Get( aUid, *favItem );
-
-	if ( err == KErrNone )
-		{
-        TFavouritesWapAp wapAp;
-        wapAp.SetDefault();
-        if (aWapAp.Length() > 0)
-        	{
-        	TUint value = 0;
-			TLex lex( aWapAp );
-			TInt lexErr = lex.Val( value );
-			if (lexErr == KErrNone)
-				{
-				wapAp.SetApId( value );
-				}
-			else
-				{
-				wapAp.SetNull();
-				}
-        	}
-
-		favItem->SetWapAp( wapAp );	
-
-		err = db.Update( *favItem, aUid, ETrue );
-		}
-
-	db.Close();
-
-	CleanupStack::PopAndDestroy( 2 ); //db, favItem
-	
-	return err;
-	}
-
-// ---------------------------------------------------------
-// CEmbeddedLinkApp::GetURI
-//
-//
-// ---------------------------------------------------------
-TPtrC CEmbeddedLinkApp::GetURI()
-	{
-	return iURI.Ptr();
-	}
-
-// ---------------------------------------------------------
-// CEmbeddedLinkApp::SetURI
-//
-//
-// ---------------------------------------------------------
-TInt CEmbeddedLinkApp::SetURI( const TDesC& aURI )
-	{
-	iURI.Copy(aURI);
-	return KErrNone;
-	}
-
-// ---------------------------------------------------------
-// CEmbeddedLinkApp::AppId
-//
-//
-// ---------------------------------------------------------
-TInt CEmbeddedLinkApp::AppId() const
-	{
-	return iId;
-	}
-
-// ---------------------------------------------------------
-// CEmbeddedLinkApp::AppName
-//
-//
-// ---------------------------------------------------------
-TPtrC CEmbeddedLinkApp::AppName() const
-	{
-	return iAppName;
-	}
-
-// ---------------------------------------------------------
-// CEmbeddedLinkApp::FolderUidL
-// ---------------------------------------------------------
-TInt CEmbeddedLinkApp::FolderUidL( )
-	{
-  RFavouritesDb db;
-  User::LeaveIfError( db.Open( iFavouritesSess, KBrowserBookmarks ) );
-  CleanupClosePushL<RFavouritesDb>( db );
-
-	CArrayFixFlat<TInt>* array = new ( ELeave ) CArrayFixFlat<TInt>( 16 );
-	CleanupStack::PushL( array );
-
-	TInt err = KErrNone;
-
-	err = db.GetUids( *array, KFavouritesNullUid, CFavouritesItem::EFolder, NULL, iId );
-
-	User::LeaveIfError( err );
-
-	TInt folderUid = 0;
-
-	if (array->Count() == 0)
-		{
-//sf-		User::Leave( KErrNotFound );
-		}
-	else
-		{
-		folderUid = (*array)[0];
-		}
-
-	db.Close();
-
-	CleanupStack::PopAndDestroy( 2 ); //db, array
-
-	return folderUid;
-	}
--- a/customization/EmbeddedLinkAdapter/src/EmbeddedLinkHandler.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,346 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of customization components
-*
-*/
-
-#include "EmbeddedLinkHandler.h"
-#include "EmbeddedLinkApp.h"
-
-// ---------------------------------------------------------
-// CEmbeddedLinkHandler::NewL
-//
-//
-// ---------------------------------------------------------
-CEmbeddedLinkHandler* CEmbeddedLinkHandler::NewL()
-{
-	CEmbeddedLinkHandler* self = CEmbeddedLinkHandler::NewLC();
-    CleanupStack::Pop( self );
-    return self;
-}
-
-// ---------------------------------------------------------
-// CEmbeddedLinkHandler::NewLC
-//
-//
-// ---------------------------------------------------------
-CEmbeddedLinkHandler* CEmbeddedLinkHandler::NewLC()
-{
-	CEmbeddedLinkHandler* self = new ( ELeave ) CEmbeddedLinkHandler;
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    return self;
-}
-
-// ---------------------------------------------------------
-// CEmbeddedLinkHandler::ConstructL
-//
-//
-// ---------------------------------------------------------
-void CEmbeddedLinkHandler::ConstructL()
-{
-	iEmbeddedLinkImage = CEmbeddedLinkApp::NewL( KFavouritesImageContextId );
-	iEmbeddedLinkRingtone = CEmbeddedLinkApp::NewL( KFavouritesRingingToneContextId );
-	iEmbeddedLinkVideo = CEmbeddedLinkApp::NewL( KFavouritesVideoContextId );
-	iEmbeddedLinkAudio = CEmbeddedLinkApp::NewL( KFavouritesAudioContextId );
-	iEmbeddedLinkSkin = CEmbeddedLinkApp::NewL( KFavouritesSkinContextId );
-	iEmbeddedLinkGame = CEmbeddedLinkApp::NewL( KFavouritesGameDataContextId );
-	iEmbeddedLinkApplication = CEmbeddedLinkApp::NewL( KFavouritesApplicationContextId );
-	iEmbeddedLinkMusic = CEmbeddedLinkApp::NewL( KFavouritesMusicContextId );
-
-	User::LeaveIfError( iFavouritesSess.Connect() );
-}
-
-// ---------------------------------------------------------
-// CEmbeddedLinkHandler::~CEmbeddedLinkHandler
-//
-//
-// ---------------------------------------------------------
-CEmbeddedLinkHandler::~CEmbeddedLinkHandler()
-	{
-	delete iEmbeddedLinkImage;
-	delete iEmbeddedLinkRingtone;
-	delete iEmbeddedLinkVideo;
-	delete iEmbeddedLinkAudio;
-	delete iEmbeddedLinkSkin;
-	delete iEmbeddedLinkGame;
-	delete iEmbeddedLinkApplication;
-	delete iEmbeddedLinkMusic;
-
-	iFavouritesSess.Close();
-	}
-
-// ---------------------------------------------------------
-// CEmbeddedLinkHandler::SupportingApplicationsL
-//
-//
-// ---------------------------------------------------------
-void CEmbeddedLinkHandler::SupportingApplicationsL( RArray<TEmbeddedLinkAppName>& aArray )
-	{
-	TEmbeddedLinkAppName appName;
-	
-	appName.Zero();
-	appName.AppendNum( KFavouritesApplicationContextId, EHex );
-	aArray.Append( appName )	;
-
-	appName.Zero();
-	appName.AppendNum( KFavouritesImageContextId, EHex );
-	aArray.Append( appName )	;
-
-	appName.Zero();
-	appName.AppendNum( KFavouritesAudioContextId, EHex );
-	aArray.Append( appName );
-
-	appName.Zero();
-	appName.AppendNum( KFavouritesVideoContextId, EHex );
-	aArray.Append( appName );
-
-	appName.Zero();
-	appName.AppendNum( KFavouritesGameDataContextId, EHex );
-	aArray.Append( appName );
-	
-	appName.Zero();
-	appName.AppendNum( KFavouritesRingingToneContextId, EHex );
-	aArray.Append( appName );
-	
-	appName.Zero();
-	appName.AppendNum( KFavouritesSkinContextId, EHex );
-	aArray.Append( appName );	
-
-	appName.Zero();
-	appName.AppendNum( KFavouritesMusicContextId, EHex );
-	aArray.Append( appName );
-	}
-
-// ---------------------------------------------------------
-// CEmbeddedLinkHandler::GetLinkAppL
-//
-//
-// ---------------------------------------------------------
-TInt CEmbeddedLinkHandler::GetLinkAppL( TInt aLinkType, CEmbeddedLinkApp*& aLinkApp )
-	{
-	TInt err( KErrNone );
-	
-	switch( aLinkType )
-		{
-		//Lisää browseri! KFavouritesRootUid
-		
-		case KFavouritesImageContextId:
-		aLinkApp = iEmbeddedLinkImage;
-		break;
-		
-		case KFavouritesRingingToneContextId:
-		aLinkApp = iEmbeddedLinkRingtone;
-		break;
-		
-		case KFavouritesVideoContextId:
-		aLinkApp = iEmbeddedLinkVideo;
-		break;
-		
-		case KFavouritesAudioContextId:
-		aLinkApp = iEmbeddedLinkAudio;
-		break;
-		
-		case KFavouritesSkinContextId:
-		aLinkApp = iEmbeddedLinkSkin;
-		break;
-		
-		case KFavouritesGameDataContextId:
-		aLinkApp = iEmbeddedLinkGame;
-		break;
-		
-		case KFavouritesApplicationContextId:
-		aLinkApp = iEmbeddedLinkApplication;
-		break;
-
-		case KFavouritesMusicContextId:
-		aLinkApp = iEmbeddedLinkMusic;
-		break;
-		
-		default:
-		err = KErrNotFound;
-		break;
-		}	
-	
-	return err;
-	}
-
-
-TInt CEmbeddedLinkHandler::RemoveLinkL( TInt aLinkUid )
-	{
-	TInt ret = KErrNone;
-
-  RFavouritesDb db;
-  User::LeaveIfError( db.Open( iFavouritesSess, KBrowserBookmarks ) );
-  CleanupClosePushL<RFavouritesDb>( db );
-
-	ret=db.Delete( aLinkUid );
-	db.Close();
-
-
-	CleanupStack::PopAndDestroy(); //db
-	return ret;
-	}
-
-
-TInt CEmbeddedLinkHandler::UpdateLinkUrlL( TInt aLinkUid, const TDesC& aURL )
-	{
-	TInt err( KErrNone );
-
-  RFavouritesDb db;
-  User::LeaveIfError( db.Open( iFavouritesSess, KBrowserBookmarks ) );
-  CleanupClosePushL<RFavouritesDb>( db );
-
-	CFavouritesItem* favItem = CFavouritesItem::NewL();
-	CleanupStack::PushL( favItem );
-	
-	err = db.Get( aLinkUid, *favItem );
-	
-	if( err==KErrNone )
-		{
-		favItem->SetUrlL( aURL );
-		}
-
-	err = db.Update( *favItem, aLinkUid, ETrue );
-	db.Close();
-
-	CleanupStack::PopAndDestroy( 2 ); //db, favItem
-	
-	return err;
-	}
-
-
-TInt CEmbeddedLinkHandler::UpdateLinkNameL( TInt aLinkUid, const TDesC& aName )
-	{
-	TInt err( KErrNone );
-
-  RFavouritesDb db;
-  User::LeaveIfError( db.Open( iFavouritesSess, KBrowserBookmarks ) );
-  CleanupClosePushL<RFavouritesDb>( db );
-
-	CFavouritesItem* favItem = CFavouritesItem::NewL();
-	CleanupStack::PushL( favItem );
-
-	err = db.Get( aLinkUid, *favItem );
-	
-	if( err == KErrNone )
-		{
-		favItem->SetNameL( aName );
-		}
-
-	err=db.Update( *favItem, aLinkUid, ETrue );
-	db.Close();
-
-	CleanupStack::PopAndDestroy( 2 ); //db
-	
-	return err;
-	}
-
-
-TInt CEmbeddedLinkHandler::UpdateUserNameL( TInt aLinkUid, const TDesC& aUserName )
-	{
-	TInt err( KErrNone );
-
-  RFavouritesDb db;
-  User::LeaveIfError( db.Open( iFavouritesSess, KBrowserBookmarks ) );
-  CleanupClosePushL<RFavouritesDb>( db );
-
-	CFavouritesItem* favItem = CFavouritesItem::NewL();
-	CleanupStack::PushL( favItem );
-
-	err = db.Get( aLinkUid, *favItem );
-
-	if( err==KErrNone )
-		{
-		favItem->SetUserNameL( aUserName );
-		}
-
-	err = db.Update( *favItem, aLinkUid, ETrue );
-	db.Close();
-
-	CleanupStack::PopAndDestroy( 2 ); //db
-	
-	return err;
-	}
-
-
-TInt CEmbeddedLinkHandler::UpdatePasswordL( TInt aLinkUid, const TDesC& aPassword )
-	{
-	TInt err( KErrNone );
-
-  RFavouritesDb db;
-  User::LeaveIfError( db.Open( iFavouritesSess, KBrowserBookmarks ) );
-  CleanupClosePushL<RFavouritesDb>( db );
-
-	CFavouritesItem* favItem = CFavouritesItem::NewL();
-	CleanupStack::PushL( favItem );
-	
-	err = db.Get( aLinkUid, *favItem );
-
-	if ( err == KErrNone ) 
-		{
-		favItem->SetPasswordL( aPassword );
-		}
-
-	err = db.Update( *favItem, aLinkUid, ETrue );
-	db.Close();
-
-	CleanupStack::PopAndDestroy( 2 ); //db
-	
-	return err;
-	}
-
-TInt CEmbeddedLinkHandler::UpdateWapApL( TInt aLinkUid, const TDesC& aWapAp )
-	{
-	TInt err( KErrNone );
-
-  RFavouritesDb db;
-  User::LeaveIfError( db.Open( iFavouritesSess, KBrowserBookmarks ) );
-  CleanupClosePushL<RFavouritesDb>( db );
-
-	CFavouritesItem* favItem = CFavouritesItem::NewL();
-	CleanupStack::PushL( favItem );
-	
-	err = db.Get( aLinkUid, *favItem );
-
-	if ( err == KErrNone ) 
-		{
-        TFavouritesWapAp wapAp;
-        wapAp.SetDefault();
-        if (aWapAp.Length() > 0)
-        	{
-        	TUint value = 0;
-			TLex lex( aWapAp );
-			TInt lexErr = lex.Val( value );
-			if (lexErr == KErrNone)
-				{
-				wapAp.SetApId( value );
-				}
-			else
-				{
-				wapAp.SetNull();
-				}
-        	}
-
-		favItem->SetWapAp( wapAp );	
-		}
-
-	err = db.Update( *favItem, aLinkUid, ETrue );
-	db.Close();
-
-	CleanupStack::PopAndDestroy( 2 ); //db
-	
-	return err;
-	}
-
--- a/customization/Index.txt	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-DeviceManagement Adapters:
---------------------------
-
-Path				Explanation			UIDs (Implementation / Component)
-====				===================		=================================
-pmadapter  			Policy Management		See XLS
-terminalcontrol/tcadapter	Terminal Control 		0x0EEEEE01 / 0x0EEEEE00
-appmgmt/amadapter		Applicaton Management		See XLS
-WallpaperAdapter  		WallPaper customization		See XLS
-EmbeddedLinkAdapter		Embedded Links customization	See XLS
-supadapter 			StartUP customization		0x0FDDEF01 / 0x0FDDEEFB
-ScreenSaverAdapter  		ScreenSaver customization	See XLS
-isadapter  			Idle SOftkeys customization	0x0FDDEF04 / 0x0FDDEEFF
-ThemesAdapter			Themes customization		See XLS
-OperatorLogoAdapter		Operator Logo customization	See XLS
-
-DMUtils				Common utilities for DM adapters         - / -
--- a/customization/OperatorLogoAdapter/bld/OperatorLogoAdapter.mmp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,85 +0,0 @@
-/*
-* Copyright (c) 2002 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: Implementation of customization components
-*
-*/
-  
-
-// To get the APP_LAYER_SYSTEMINCLUDE-definition
-#include <platform_paths.hrh>
-#include "defaultcaps.hrh"
-
-CAPABILITY      CAP_GENERAL_DLL
-TARGET          operatorlogoadapter.dll
-TARGETTYPE      PLUGIN
-UID             0x10009D8D 0x10207829
-VENDORID        VID_DEFAULT
-
-APP_LAYER_SYSTEMINCLUDE
-SYSTEMINCLUDE   /epoc32/include/swi
-SYSTEMINCLUDE 	/epoc32/include/ecom
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-SYSTEMINCLUDE 	/epoc32/include/devman
-#else
-// nothing
-#endif
-
-SOURCEPATH      ../src
-
-USERINCLUDE     ../inc
-USERINCLUDE			../../include
-USERINCLUDE     ../../DMUtils/inc
-
-SOURCE          OperatorLogoAdapter.cpp
-SOURCE          SyncImageOperations.cpp
-
-
-// RESOURCE       
-START RESOURCE  OperatorLogoAdapter.rss
-TARGET          operatorlogoadapter.rsc
-LANGUAGE_IDS
-END
-
-
-
-LIBRARY			    euser.lib
-LIBRARY			    efsrv.lib
-LIBRARY			    ecom.lib
-LIBRARY			    imut.lib
-LIBRARY         imageconversion.lib
-LIBRARY         bitmaptransforms.lib
-LIBRARY         fbscli.lib
-LIBRARY			    ws32.lib
-LIBRARY         etel.lib
-LIBRARY         etelmm.lib
-LIBRARY         phoneclient.lib
-LIBRARY 		    flogger.lib
-
-//#ifdef __SAP_POLICY_MANAGEMENT
-LIBRARY			    policyengine.lib
-LIBRARY			    dmutil.lib
-//#endif
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-LIBRARY		      devmancmdmgr.lib
-#else
-// nothing
-#endif
-
-STATICLIBRARY	  dmutils.lib
-LIBRARY                 featmgr.lib
-LIBRARY			    mediaclientimage.lib
-
-SMPSAFE
--- a/customization/OperatorLogoAdapter/bld/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-/*
-* Copyright (c) 2002 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:  build info file for Operator Logo customization Adapter
-*
-*/
-
-
-#include <platform_paths.hrh>
-
-PRJ_EXPORTS
-../rom/OperatorLogoAdapter.iby											CORE_APP_LAYER_IBY_EXPORT_PATH(OperatorLogoAdapter.iby)
-
-PRJ_MMPFILES
-./OperatorLogoAdapter.mmp
-
-PRJ_TESTEXPORTS
-/*../test/OperatorLogoTestScript.cfg	/epoc32/winscw/c/TestFramework/OperatorLogoTestScript.cfg
-../test/oplogo.jpg	/epoc32/winscw/c/TestFramework/data/oplogo.jpg*/
--- a/customization/OperatorLogoAdapter/inc/OperatorLogoAdapter.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,136 +0,0 @@
-/*
-* Copyright (c) 2002 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:  DM Operator Logo Adapter
-*
-*/
-
-
-
-#ifndef __OPERATORLOGOADAPTER_H__
-#define __OPERATORLOGOADAPTER_H__
-
-// ------------------------------------------------------------------------------------------------
-// Includes
-// ------------------------------------------------------------------------------------------------
-#include "TARMDmAdapter.h"
-
-#include <fbs.h>
-
-const TUint KOperatorLogoAdapterImplUid = 0x1020782A;
-
-// the DDF version must be changed if any changes in DDF structure ( built in DDFStructureL() function )
-_LIT8( KOperatorLogoDDFVersion, "1.0" ); 
-
-_LIT8( KOperatorLogoCustomization, "Customization" );
-_LIT8( KOperatorLogoCustomizationD, "Customization node" );
-_LIT8( KOperatorLogoOperatorLogo, "OperatorLogo" );
-_LIT8( KOperatorLogoOperatorLogoD, "OperatorLogo node" );
-_LIT8( KOperatorLogoLogoData, "Data" );
-_LIT8( KOperatorLogoLogoDataD, "LogoData node" );
-
-
-_LIT8( KNSmlDMTextPlain, "text/plain" );
-_LIT8( KNSmlDMImageAny, "image/*" );
-
-// ------------------------------------------------------------------------------------------------
-// COperatorLogoAdapter 
-// ------------------------------------------------------------------------------------------------
-class COperatorLogoAdapter : public CTARMDmAdapter
-	{
-public:
-	static COperatorLogoAdapter* NewL(MSmlDmCallback* aDmCallback );
-	static COperatorLogoAdapter* NewLC(MSmlDmCallback* aDmCallback );
-
-	virtual ~COperatorLogoAdapter();
-
-
-	// Implementation of MSmlDmAdapter interface
-	// =========================================
-	void DDFVersionL( CBufBase& aVersion );
-	void DDFStructureL( MSmlDmDDFObject& aDDF );
-	
-	void _UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, const TDesC8& aObject, const TDesC8& aType, TInt aStatusRef );
-	void _UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, RWriteStream*& aStream, const TDesC8& aType, TInt aStatusRef );
-	void _DeleteObjectL( const TDesC8& aURI, const TDesC8& aLUID, TInt aStatusRef );
-	void _FetchLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, const TDesC8& aType, TInt aResultsRef, TInt aStatusRef );
-	void _FetchLeafObjectSizeL( const TDesC8& aURI, const TDesC8& aLUID, const TDesC8& aType, TInt aResultsRef, TInt aStatusRef );
-	void _ChildURIListL( const TDesC8& aURI, const TDesC8& aLUID, const CArrayFix<TSmlDmMappingInfo>& aPreviousURISegmentList, TInt aResultsRef, TInt aStatusRef );
-	
-	void _AddNodeObjectL( const TDesC8& aURI, const TDesC8& aParentLUID, TInt aStatusRef );
-	void _ExecuteCommandL( const TDesC8& aURI, const TDesC8& aLUID, const TDesC8& aArgument, const TDesC8& aType, TInt aStatusRef );
-	void _ExecuteCommandL( const TDesC8& aURI, const TDesC8& aLUID, RWriteStream*& aStream, const TDesC8& aType, TInt aStatusRef );
-	void _CopyCommandL( const TDesC8& aTargetURI, const TDesC8& aTargetLUID, const TDesC8& aSourceURI, const TDesC8& aSourceLUID, const TDesC8& aType, TInt aStatusRef );
-
-	void StartAtomicL();
-	void CommitAtomicL();
-	void RollbackAtomicL();
-	TBool StreamingSupport( TInt& aItemSize );
-#ifdef __TARM_SYMBIAN_CONVERGENCY	
-		virtual void StreamCommittedL( RWriteStream& aStream );
-#else
-		virtual void StreamCommittedL();
-#endif	
-	void CompleteOutstandingCmdsL();
-
-	// PolicyCheck, resource name
-//#ifdef __SAP_POLICY_MANAGEMENT	
-	TPtrC8 PolicyRequestResourceL( const TDesC8& aURI );
-//#endif
-
-private:
-	void ConstructL( );
-
-	COperatorLogoAdapter( MSmlDmCallback* aDmCallback );
-
-	enum TNodeId
-		{
-		ENodeUnknown,
-
-		ENodeCustomization,
-		ENodeOperatorLogo,
-		ENodeLogoData,
-		
-		ENodeLast
-		};
-
-	TNodeId NodeId( const TDesC8& aURI );
-
-	void FillNodeInfoL( MSmlDmDDFObject& aNode,TSmlDmAccessTypes aAccTypes,MSmlDmDDFObject::TOccurence aOccurrence, MSmlDmDDFObject::TScope aScope, MSmlDmDDFObject::TDFFormat aFormat,const TDesC8& aDescription,TBool aObjectGroup);
-
-	TBool IsText(const TDesC8& aMime);
-	TBool IsImage(const TDesC8& aMime);
-	TError GetOperatorLogoL( CBufBase& aData, TDes8& aMimeType );
-	TError SetOperatorLogoL( const TDesC8& aData, const TDesC8& aMime );
-	TError SetOperatorLogoText( const TDesC8& aData, const TDesC8& aMime );
-	TError SetOperatorLogoImageL( const TDesC8& aData, const TDesC8& aMime );
-	TError DeleteOperatorLogoImageL();
-
-	void LoadBitmapL( const TDesC& aFileName, CFbsBitmap& aBitmap );
-	void ScaleBitmapL( CFbsBitmap& aBitmap, TInt aX, TInt aY );
-	void GetScreenDisplayModeL( TDisplayMode &aDisplayMode );
-	void GetOpInfoL( TInt& aMCC, TInt& aMNC );
-	void SaveOperatorLogoBitmapL( TInt aBitmapHandle, TInt aMCC, TInt aMNC );
-
-private:
-
-	MSmlDmCallback* iCallBack;
-
-
-};
-
-
-
-	
-
-#endif // __OPERATORLOGOADAPTER_H__
--- a/customization/OperatorLogoAdapter/inc/SyncImageOperations.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +0,0 @@
-/*
-* Copyright (c) 2002 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:  Synchronous Image Operations
-*
-*/
-
-
-
-#ifndef __SyncImageOperations_H__
-#define __SyncImageOperations_H__
-
-
-
-#define __WITHIN_MCI_LIBRARY	// Needed because of conflicting typedef
-#include <mdaimageconverter.h>
-
-
-// ------------------------------------------------------------------------------------------------
-// CSyncDither
-// ------------------------------------------------------------------------------------------------
-class CSyncDither : public CBase, public MMdaImageUtilObserver
-	{
-public:
-
-	// Other
-	static TInt DitherL( CFbsBitmap& aBitmap, TDisplayMode aDisplayMode );
-
-protected:
-	static CSyncDither* NewL( );
-	static CSyncDither* NewLC( );
-
-	virtual ~CSyncDither();
-
-	TInt DoDitherL( CFbsBitmap& aBitmap, TDisplayMode aDisplayMode );
-
-private:
-	CSyncDither();
-	void ConstructL();
-
-private: // from MMdaImageUtilObserver
-	void MiuoCreateComplete(TInt aError);
-	void MiuoOpenComplete(TInt aError);
-	void MiuoConvertComplete(TInt aError);
-
-private: // new
-	void BeginWait();
-	void EndWait();
-
-private:
-	CMdaImageBitmapToBitmapUtility* iDitherer;
-	CActiveSchedulerWait iScheduler;
-	TInt iError;
-
-	};
-
-
-#endif // __SyncImageOperations_H__
--- a/customization/OperatorLogoAdapter/rom/OperatorLogoAdapter.iby	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of customization components
-*
-*/
-#ifndef __OperatorLogoAdapter_IBY__
-#define __OperatorLogoAdapter_IBY__
-
-//#ifdef __SAP_OPERATOR_LOGO_ADAPTER
-
-ECOM_PLUGIN(OperatorLogoAdapter.dll, OperatorLogoAdapter.rsc)
-
-//#endif //__SAP_OPERATOR_LOGO_ADAPTER
-
-#endif //__OperatorLogoAdapter_IBY__
--- a/customization/OperatorLogoAdapter/src/OperatorLogoAdapter.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1025 +0,0 @@
-/*
-* Copyright (c) 2002 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:  DM Operator Logo Adapter
-*
-*/
-
-
-/*
-
-./Customization -+--> OperatorLogo -+--> LogoData
-
-*/
-
-#include "OperatorLogoAdapter.h"
-
-#include <implementationproxy.h> // For TImplementationProxy definition
-#include <coemain.h>
-#include <imageconversion.h>
-#include <bitmaptransforms.h>
-#include <RPhCltServer.h>
-
-#include <CPhCltImageHandler.h>
-#include <CPhCltBaseImageParams.h>
-
-//#ifdef __SAP_POLICY_MANAGEMENT
-#include <PolicyEngineXACML.h>
-//#endif
-
-#include "nsmldmuri.h"
-#include "FileCoderB64.h"
-#include "debug.h"
-#include <featmgr.h>
-
-const TInt KLogoMaxWidthPixels      = 97;
-const TInt KLogoMaxHeightPixels     = 25;
-_LIT( KOperatorLogoAdapterTmpFilePath, "c:\\system\\temp\\DM_OPLogo.bin" );
-
-class CWaitScheduler : public CActive
-	{
-	// Functions
-	public:
-		static CWaitScheduler* NewL( TInt aPriority = EPriorityStandard );
-
-		TInt WaitForRequest();
-
-	private:
-		CWaitScheduler( TInt aPriority );
-		void ConstructL();
-		virtual ~CWaitScheduler();
-
-		void RunL();
-		void DoCancel();
-
-	// Data
-	private:
-		CActiveSchedulerWait iScheduler;
-
-	};
-// ------------------------------------------------------------------------------------------------
-
-CWaitScheduler* CWaitScheduler::NewL( TInt aPriority )
-	{
-	CWaitScheduler* self = new( ELeave ) CWaitScheduler( aPriority );
-	CleanupStack::PushL( self );
-	self->ConstructL( );
-	CleanupStack::Pop( self );
-	return self;
-	}
-
-CWaitScheduler::CWaitScheduler( TInt aPriority )
-	: CActive( aPriority )
-	{
-	CActiveScheduler::Add( this );
-	}
-
-void CWaitScheduler::ConstructL()
-	{
-	}
-
-CWaitScheduler::~CWaitScheduler()
-	{
-	if ( IsActive() )
-		{
-		User::Panic( _L("CSyncWait"), 1 );
-		}
-	}
-
-TInt CWaitScheduler::WaitForRequest()
-	{
-	SetActive();
-	iScheduler.Start();
-	return iStatus.Int();
-	}
-
-void CWaitScheduler::RunL()
-	{
-	iScheduler.AsyncStop();
-	}
-
-void CWaitScheduler::DoCancel()
-	{
-	User::Panic( _L("CSyncWait"), 2 );
-	}
-
-
-// ------------------------------------------------------------------------------------------------
-// COperatorLogoAdapter* COperatorLogoAdapter::NewL( )
-// ------------------------------------------------------------------------------------------------
-COperatorLogoAdapter* COperatorLogoAdapter::NewL( MSmlDmCallback* aDmCallback )
-	{
-	RDEBUG("COperatorLogoAdapter::NewL(): begin");
-
-	COperatorLogoAdapter* self = NewLC( aDmCallback );
-	CleanupStack::Pop();
-	return self;
-	}
-
-// ------------------------------------------------------------------------------------------------
-// COperatorLogoAdapter* COperatorLogoAdapter::NewLC( )
-// ------------------------------------------------------------------------------------------------
-COperatorLogoAdapter* COperatorLogoAdapter::NewLC( MSmlDmCallback* aDmCallback )
-	{
-	COperatorLogoAdapter* self = new( ELeave ) COperatorLogoAdapter( aDmCallback );
-	CleanupStack::PushL( self );
-	self->ConstructL( );
-	return self;
-	}
-
-
-// ------------------------------------------------------------------------------------------------
-// COperatorLogoAdapter::COperatorLogoAdapter()
-// ------------------------------------------------------------------------------------------------
-
-COperatorLogoAdapter::COperatorLogoAdapter( MSmlDmCallback* aDmCallback )
-	: CTARMDmAdapter( aDmCallback )
-	, iCallBack( aDmCallback )
-	{
-	}
-
-// -------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-void COperatorLogoAdapter::ConstructL( )
-	{
-	
-		TRAPD( errf, FeatureManager::InitializeLibL() );
-		if( errf != KErrNone )
-		{
-			User::Leave(errf);
-		}
-		
-		
-	    if(FeatureManager::FeatureSupported(KFeatureIdSapOperatorLogoAdapter))
-		{
-	    User::LeaveIfError( RFbsSession::Connect() );
-		}
-		else
-		{
-			FeatureManager::UnInitializeLib();
-	   		User::Leave( KErrNotSupported );
-		}
-	}
-
-// ------------------------------------------------------------------------------------------------
-// COperatorLogoAdapter::~COperatorLogoAdapter()
-// ------------------------------------------------------------------------------------------------
-
-
-COperatorLogoAdapter::~COperatorLogoAdapter()
-	{
-	
-	FeatureManager::UnInitializeLib();
-	RFbsSession::Disconnect();
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  COperatorLogoAdapter::DDFVersionL()
-// ------------------------------------------------------------------------------------------------
-void COperatorLogoAdapter::DDFVersionL( CBufBase& aDDFVersion )
-	{
-	aDDFVersion.InsertL( 0, KOperatorLogoDDFVersion );
-	}
-
-
-// ------------------------------------------------------------------------------------------------
-//  COperatorLogoAdapter::DDFStructureL()
-//
-// ------------------------------------------------------------------------------------------------
-void COperatorLogoAdapter::DDFStructureL( MSmlDmDDFObject& aDDF )
-	{
-	RDEBUG( "COperatorLogoAdapter::DDFStructureL(): begin" );
-	
-	TSmlDmAccessTypes accessTypesGet;
-	accessTypesGet.SetGet();
-	
-	TSmlDmAccessTypes accessTypesGetReplace;
-	accessTypesGetReplace.SetGet();
-	accessTypesGetReplace.SetReplace();
-
-
-	/*
-	Node: ./Customzation
-	This interior node is the common parent to all customization..
-	Status: Required
-	Occurs: One
-	Format: Node
-	Access Types: Get
-	Values: N/A
-	*/
-	MSmlDmDDFObject& customization = aDDF.AddChildObjectL( KOperatorLogoCustomization );
-	FillNodeInfoL(customization, accessTypesGet, MSmlDmDDFObject::EOne, MSmlDmDDFObject::EPermanent,
-		MSmlDmDDFObject::ENode, KOperatorLogoCustomizationD, ETrue );
-	
-	/*
-	Node: ./Customization/OperatorLogo
-	This interior node acts as a placeholder for one or more update packages within a same content provider group.
-	Status: Required
-	Occurs: One
-	Format: Node
-	Access Types: Get
-	Values: N/A
-	*/
-	MSmlDmDDFObject& operatorLogo = customization.AddChildObjectL( KOperatorLogoOperatorLogo );
-	FillNodeInfoL( operatorLogo, accessTypesGet, MSmlDmDDFObject::EOne, MSmlDmDDFObject::EPermanent,
-		MSmlDmDDFObject::ENode, KOperatorLogoOperatorLogoD, ETrue );
-	
-	/*
-	Node: ./Customization/OperatorLogo/Data
-	Status: Optional
-	Occurs: One
-	Format: bin
-	Access Types: Get, Replace
-	Values: N/A
-	*/
-
-	MSmlDmDDFObject& logoData = operatorLogo.AddChildObjectL(KOperatorLogoLogoData);
-	FillNodeInfoL( logoData, accessTypesGetReplace, MSmlDmDDFObject::EOne, MSmlDmDDFObject::EPermanent,
-		MSmlDmDDFObject::EBin, KOperatorLogoLogoDataD, EFalse);
-	logoData.AddDFTypeMimeTypeL( KNSmlDMTextPlain );
-	logoData.AddDFTypeMimeTypeL( KNSmlDMImageAny );
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  COperatorLogoAdapter::UpdateLeafObjectL()
-//  
-// ------------------------------------------------------------------------------------------------
-void COperatorLogoAdapter::_UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& /*aLUID*/, const TDesC8& aObject, const TDesC8& aType, const TInt aStatusRef )
-	{
-	RDEBUG( "COperatorLogoAdapter::UpdateLeafObjectL(): begin" );
-
-	TError ret = EOk ;
-	
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-	TPtrC8 uriPtrc = NSmlDmURI::RemoveDotSlash( aURI );
-	TNodeId nodeId = NodeId( uriPtrc );
-#else
-	TNodeId nodeId = NodeId( aURI );
-#endif	
-	
-	switch( nodeId )
-		{
-	case ENodeLogoData:
-		ret = SetOperatorLogoL( aObject, aType );
-		break;
-
-	case ENodeUnknown:
-		ret = ENotFound;
-		break;
-
-	default:
-		ret = EError;
-		break;
-		}
-
-	iCallBack->SetStatusL( aStatusRef, ret );
-	}
-
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-void COperatorLogoAdapter::_UpdateLeafObjectL( const TDesC8& /*aURI*/, const TDesC8& /*aLUID*/, RWriteStream*& /*aStream*/, const TDesC8& /*aType*/, TInt aStatusRef )
-	{
-	RDEBUG( "COperatorLogoAdapter::UpdateLeafObjectL(...RWriteStream...): begin" );
-	// Not supported
-	TError ret = EError;
-	iCallBack->SetStatusL( aStatusRef, ret );
-	}
-
-// ------------------------------------------------------------------------------------------------
-// COperatorLogoAdapter::DeleteObjectL( const TDesC& aURI, const TDesC& aLUID )
-// ------------------------------------------------------------------------------------------------
-void COperatorLogoAdapter::_DeleteObjectL( const TDesC8& /*aURI*/, const TDesC8& /*aLUID*/, const TInt aStatusRef )
-	{
-	RDEBUG( "COperatorLogoAdapter::DeleteObjectL(): begin" );
-	// Not supported
-	TError ret = EError;
-	iCallBack->SetStatusL( aStatusRef, ret );
-	}
-
-
-// ------------------------------------------------------------------------------------------------
-//  COperatorLogoAdapter::FetchLeafObjectL( const TDesC& aURI, const TDesC& aLUID, const TDesC& aType, CBufBase& aObject )
-// ------------------------------------------------------------------------------------------------
-void COperatorLogoAdapter::_FetchLeafObjectL( const TDesC8& aURI, const TDesC8& /*aLUID*/, const TDesC8& /*aType*/, const TInt /*aResultsRef*/, const TInt aStatusRef )
-	{
-	RDEBUG("COperatorLogoAdapter::FetchLeafObjectL(): begin");
-
-	TError ret = EOk ;
-	
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-	TPtrC8 uriPtrc = NSmlDmURI::RemoveDotSlash( aURI );
-	TNodeId nodeId = NodeId( uriPtrc );
-#else
-	TNodeId nodeId = NodeId( aURI );
-#endif	
-
-	switch( nodeId )
-		{
-	case ENodeLogoData:
-		// Get not supported for operator logo
-		ret = EError;
-		break;
-
-	case ENodeUnknown:
-		ret = ENotFound;
-		break;
-
-	default:
-		ret = EError;
-		break;
-		}
-
-	iCallBack->SetStatusL( aStatusRef, ret );
-
-}
-
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-void COperatorLogoAdapter::_FetchLeafObjectSizeL( const TDesC8& aURI, const TDesC8& /*aLUID*/, const TDesC8& /*aType*/, TInt /*aResultsRef*/, TInt aStatusRef )
-	{
-	RDEBUG("COperatorLogoAdapter::FetchLeafObjectSizeL(): begin");
-
-	TError ret = EOk ;
-	
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-	TPtrC8 uriPtrc = NSmlDmURI::RemoveDotSlash( aURI );
-	TNodeId nodeId = NodeId( uriPtrc );
-#else
-	TNodeId nodeId = NodeId( aURI );
-#endif	
-
-	switch( nodeId )
-		{
-	case ENodeLogoData:
-		// Get not supported for operator logo
-		ret = EError;
-		break;
-
-	case ENodeUnknown:
-		ret = ENotFound;
-		break;
-	default:
-		ret = EError;
-		break;
-		}
-
-
-	iCallBack->SetStatusL( aStatusRef, ret );
-
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  COperatorLogoAdapter::ChildURIListL( const TDesC& aURI, const TDesC& aParentLUID, const CArrayFix<TNSmlDmMappingInfo>& aPreviousURISegmentList, CArrayFix<TPtrC>& aCurrentURISegmentList )
-// ------------------------------------------------------------------------------------------------
-void COperatorLogoAdapter::_ChildURIListL( const TDesC8& aURI, const TDesC8& /*aParentLUID*/, const CArrayFix<TSmlDmMappingInfo>& /*aPreviousURISegmentList*/, TInt aResultsRef, TInt aStatusRef  )
-	{
-	RDEBUG("COperatorLogoAdapter::ChildURIListL(): begin");
-
-	TError ret = EOk ;
-	
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-	TPtrC8 uriPtrc = NSmlDmURI::RemoveDotSlash( aURI );
-	TNodeId nodeId = NodeId( uriPtrc );
-#else
-	TNodeId nodeId = NodeId( aURI );
-#endif	
-
-	CBufBase *currentList = CBufFlat::NewL( 128 );
-	CleanupStack::PushL( currentList );
-
-	switch( nodeId )
-		{
-	case ENodeCustomization:
-		currentList->InsertL( currentList->Size(), KOperatorLogoOperatorLogo() );
-		break;
-
-	case ENodeOperatorLogo:
-		currentList->InsertL( currentList->Size(), KOperatorLogoLogoData );
-		break;
-
-	case ENodeLogoData:
-		// No children, leave list empty
-		break;
-
-	case ENodeUnknown:
-		ret = ENotFound;
-		break;
-
-	default:
-		ret = EError;
-		break;
-		}
-
-	if( ret == EOk )
-		{
-		iCallBack->SetResultsL( aResultsRef, *currentList, KNullDesC8 );
-		}
-
-	iCallBack->SetStatusL( aStatusRef, ret );
-
-	CleanupStack::PopAndDestroy(currentList); //currentList
-	}
-
-
-// ------------------------------------------------------------------------------------------------
-// COperatorLogoAdapter::AddNodeObjectL( const TDesC& aURI, const TDesC& aParentLUID )
-// ------------------------------------------------------------------------------------------------
-void COperatorLogoAdapter::_AddNodeObjectL( const TDesC8& /*aURI*/, const TDesC8& /*aParentLUID*/, const TInt aStatusRef )
-	{
-	RDEBUG("COperatorLogoAdapter::AddNodeObjectL(): begin");
-	// Not supported
-	TError ret = EError;
-	iCallBack->SetStatusL( aStatusRef, ret );
-	}
-
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-void COperatorLogoAdapter::_ExecuteCommandL( const TDesC8& /*aURI*/, const TDesC8& /*aLUID*/, const TDesC8& /*aArgument*/, const TDesC8& /*aType*/, TInt aStatusRef )
-	{
-	RDEBUG("COperatorLogoAdapter::ExecuteCommandL(): begin");
-	// Not supported
-	TError ret = EError;
-	iCallBack->SetStatusL( aStatusRef, ret );
-	}
-
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-void COperatorLogoAdapter::_ExecuteCommandL( const TDesC8& /*aURI*/, const TDesC8& /*aLUID*/, RWriteStream*& /*aStream*/, const TDesC8& /*aType*/, TInt aStatusRef )
-	{
-	RDEBUG("COperatorLogoAdapter::ExecuteCommandL(...RWriteStream...): begin");
-	//Not supported
-	TError ret = EError;
-	iCallBack->SetStatusL( aStatusRef, ret );
-	}
-	
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-void COperatorLogoAdapter::_CopyCommandL( const TDesC8& /*aTargetURI*/, const TDesC8& /*aTargetLUID*/, const TDesC8& /*aSourceURI*/, const TDesC8& /*aSourceLUID*/, const TDesC8& /*aType*/, TInt aStatusRef )
-	{
-	RDEBUG("COperatorLogoAdapter::CopyCommandL(): begin");
-	//Not supported
-	TError ret = EError;
-	iCallBack->SetStatusL( aStatusRef, ret );
-	}
-
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-void COperatorLogoAdapter::StartAtomicL()
-	{
-	RDEBUG("COperatorLogoAdapter::StartAtomicL(): begin");
-	//Not supported
-	}
-
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-void COperatorLogoAdapter::CommitAtomicL()
-	{
-	RDEBUG("COperatorLogoAdapter::CommitAtomicL(): begin");
-	//Not supported
-	}
-
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-void COperatorLogoAdapter::RollbackAtomicL()
-	{
-	RDEBUG("COperatorLogoAdapter::RollbackAtomicL(): begin");
-	//Not supported
-	}
-
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-TBool COperatorLogoAdapter::StreamingSupport( TInt& /*aItemSize*/ )
-	{
-	RDEBUG("COperatorLogoAdapter::StreamingSupport(): begin");
-	return EFalse;
-	}
-
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-#ifdef __TARM_SYMBIAN_CONVERGENCY	
-void COperatorLogoAdapter::StreamCommittedL( RWriteStream& /*aStream*/ )
-#else
-void COperatorLogoAdapter::StreamCommittedL()
-#endif	
-	{	
-	RDEBUG("COperatorLogoAdapter::StreamCommittedL(): begin");
-	RDEBUG("COperatorLogoAdapter::StreamCommittedL(): end");
-	}
-
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-void COperatorLogoAdapter::CompleteOutstandingCmdsL()
-	{
-	RDEBUG("COperatorLogoAdapter::CompleteOutstandingCmdsL(): begin");
-	}
-
-// -----------------------------------------------------------------------------
-// 
-// -----------------------------------------------------------------------------
-//
-//#ifdef __SAP_POLICY_MANAGEMENT
-TPtrC8 COperatorLogoAdapter::PolicyRequestResourceL( const TDesC8& /*aURI*/ )
-	{
-	if(!FeatureManager::FeatureSupported(KFeatureIdSapPolicyManagement ))
-	{
-		User::Leave(KErrNotSupported);
-		
-	}
-	
-	return PolicyEngineXACML::KCustomizationManagement();	
-
-	}
-//#endif
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-COperatorLogoAdapter::TNodeId COperatorLogoAdapter::NodeId( const TDesC8& aURI )
-	{
-	TNodeId id = ENodeUnknown;
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-	TPtrC8 uriPtrc = NSmlDmURI::RemoveDotSlash( aURI );
-	TInt cnt = NSmlDmURI::NumOfURISegs( uriPtrc );
-	TPtrC8 app = NSmlDmURI::LastURISeg( uriPtrc );
-#else
-	TInt cnt = NSmlDmURI::NumOfURISegs( aURI );
-	TPtrC8 app = NSmlDmURI::LastURISeg( aURI );
-#endif	
-
-	if ( cnt == 1 )
-		{
-		if (app == KOperatorLogoCustomization)
-			{
-			id = ENodeCustomization;
-			}
-		}
-	else if ( cnt == 2 ) 
-		{
-		if (app == KOperatorLogoOperatorLogo)
-			{
-			id = ENodeOperatorLogo;
-			}
-		}
-	else if ( cnt == 3 ) 
-		{
-		if (app == KOperatorLogoLogoData)
-			{
-			id = ENodeLogoData;
-			}
-		}
-
-	return id;
-	}
-
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-const TImplementationProxy ImplementationTable[] = 
-	{
-	{ {KOperatorLogoAdapterImplUid}, (TProxyNewLPtr)COperatorLogoAdapter::NewL }
-	};
-
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy( TInt& aTableCount )
-	{
-	aTableCount = sizeof( ImplementationTable ) / sizeof( TImplementationProxy );
-	return ImplementationTable;
-	}
-
-
-
-// -------------------------------------------------------------------------------------
-// COperatorLogoAdapter::FillNodeInfoL()
-// Fills the node info in ddf structure
-// -------------------------------------------------------------------------------------
-void COperatorLogoAdapter::FillNodeInfoL( MSmlDmDDFObject& aNode,TSmlDmAccessTypes aAccTypes,
-										MSmlDmDDFObject::TOccurence aOccurrence, MSmlDmDDFObject::TScope aScope, 
-										MSmlDmDDFObject::TDFFormat aFormat,const TDesC8& aDescription,TBool /*aObjectGroup*/)
-	{
-	aNode.SetAccessTypesL(aAccTypes);
-	aNode.SetOccurenceL(aOccurrence);
-	aNode.SetScopeL(aScope);
-	aNode.SetDFFormatL(aFormat);
-	if(aFormat!=MSmlDmDDFObject::ENode)
-		{
-		aNode.AddDFTypeMimeTypeL(KNSmlDMTextPlain);
-		}
-	aNode.SetDescriptionL(aDescription);
-	}
-
-// -------------------------------------------------------------------------------------
-// COperatorLogoAdapter::IsText()
-// Checks whether the given mime type is text format (that we support)
-// -------------------------------------------------------------------------------------
-TBool COperatorLogoAdapter::IsText(const TDesC8& aMime)
-	{
-	TBool ret = EFalse;
-	if (aMime == _L8("text/plain") || aMime == _L8("text/*"))
-		{
-			ret = ETrue;
-		}
-	return ret;
-	}
-
-// -------------------------------------------------------------------------------------
-// COperatorLogoAdapter::IsImage()
-// Checks whether the given mime type is image format (that we support)
-// -------------------------------------------------------------------------------------
-TBool COperatorLogoAdapter::IsImage(const TDesC8& aMime)
-	{
-	TBool ret = EFalse;
-	if (aMime == _L8("image/jpeg") || aMime == _L8("image/gif"))
-		{
-			ret = ETrue;
-		}
-	return ret;
-	}
-
-
-
-
-
-// ------------------------------------------------------------------------------------------------
-//  COperatorLogoAdapter::SetOperatorLogoL()
-// ------------------------------------------------------------------------------------------------
-MSmlDmAdapter::TError COperatorLogoAdapter::SetOperatorLogoL(const TDesC8& aData, const TDesC8& aMime) 
-	{
-	TError ret = EOk;
-
-	if (aData.Length() > 0)
-		{
-		ret = SetOperatorLogoImageL( aData, aMime );
-		}
-	else
-		{
-		ret = DeleteOperatorLogoImageL();
-		}
-
-	return ret;
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  COperatorLogoAdapter::SetOperatorLogoImageL()
-// ------------------------------------------------------------------------------------------------
-MSmlDmAdapter::TError COperatorLogoAdapter::SetOperatorLogoImageL(const TDesC8& aData, const TDesC8& /*aMime*/) 
-	{
-	RDEBUG("COperatorLogoAdapter::SetOperatorLogoImageL(): begin");
-	TError ret = EOk;
-
-	TInt mcc = 0;
-	TInt mnc = 0;
-
-
-	TFileCoderB64 decoder;
-	TPtrC fileName( KOperatorLogoAdapterTmpFilePath );
-
-	RFs fs;
-	User::LeaveIfError( fs.Connect() );
-	CleanupClosePushL( fs );
-
-	TBool isEncoded = TFileCoderB64::CheckB64Encode( aData );
-	if( isEncoded )
-		{
-		decoder.DecodeToL( aData, fileName );
-		}
-	else
-		{
-		// aData is original data, save it to fileName
-		RFile file;
-		User::LeaveIfError( file.Replace( fs, fileName, EFileWrite));
-		CleanupClosePushL( file );
-		User::LeaveIfError( file.Write( aData ) );
-		
-		CleanupStack::PopAndDestroy();//file
-		}
-		
-	CFbsBitmap* bitmap = new (ELeave) CFbsBitmap;
-	CleanupStack::PushL( bitmap );
-
-	LoadBitmapL( fileName, *bitmap );
-
-#ifndef TEST_CODE_LOAD_AND_SCALE
-	TSize bmpSize = bitmap->SizeInPixels();
-	if (bmpSize.iWidth > KLogoMaxWidthPixels ||
-		bmpSize.iHeight > KLogoMaxHeightPixels)
-		{
-		ScaleBitmapL( *bitmap, KLogoMaxWidthPixels, KLogoMaxHeightPixels );
-		}
-#endif // !TEST_CODE_LOAD_AND_SCALE
-
-	GetOpInfoL( mcc, mnc );
-	SaveOperatorLogoBitmapL( bitmap->Handle(), mcc, mnc );
-
-	CleanupStack::PopAndDestroy( bitmap );
-
-	fs.Delete( fileName );
-	CleanupStack::PopAndDestroy();//fs
-
-
-	RDEBUG("COperatorLogoAdapter::SetOperatorLogoImageL(): end");
-	return ret;
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  COperatorLogoAdapter::DeleteOperatorLogoImageL()
-// ------------------------------------------------------------------------------------------------
-MSmlDmAdapter::TError COperatorLogoAdapter::DeleteOperatorLogoImageL()
-	{
-	TError ret = EOk;
-	TInt bmpHandle = 0;
-	TInt mcc = 0;
-	TInt mnc = 0;
-
-	GetOpInfoL( mcc, mnc );
-	// Setting operatorlogo bitmap handle to zero will delete it
-	SaveOperatorLogoBitmapL( bmpHandle, mcc, mnc );
-
-	return ret;
-	}
-
-
-
-// ------------------------------------------------------------------------------------------------
-//  COperatorLogoAdapter::
-// ------------------------------------------------------------------------------------------------
-void COperatorLogoAdapter::LoadBitmapL( const TDesC& aFileName, CFbsBitmap& aBitmap )
-	{
-	RFs fs;
-	User::LeaveIfError( fs.Connect() );
-	CleanupClosePushL( fs );
-
-	const CImageDecoder::TOptions opt =
-		(CImageDecoder::TOptions)
-			(
-			CImageDecoder::EOptionAlwaysThread
-#ifndef TEST_CODE_LOAD_AND_DITHER
-			| CImageDecoder::EOptionNoDither
-#endif // !TEST_CODE_LOAD_AND_DITHER
-			);
-	CImageDecoder* decoder = CImageDecoder::FileNewL( fs, aFileName, opt );
-	CleanupStack::PushL( decoder );
-
-	TInt frameCount = decoder->FrameCount();
-	TFrameInfo frameInfo = decoder->FrameInfo();
-
-	TSize bmpSize = frameInfo.iOverallSizeInPixels;
-	TDisplayMode bmpDispMode = frameInfo.iFrameDisplayMode;
-
-	// Adjust Display Mode
-	if (bmpDispMode > EColor64K)
-		{
-		bmpDispMode = EColor64K;
-		}
-
-	// Check target bitmap size
-	const TSize KLogoMaxSize( KLogoMaxWidthPixels, KLogoMaxHeightPixels );
-
-#ifdef TEST_CODE_LOAD_AND_SCALE
-	TUint32 ratioX = (static_cast<TUint32>( (KLogoMaxSize.iWidth) << 16) ) / bmpSize.iWidth;
-	TUint32 ratioY = (static_cast<TUint32>( (KLogoMaxSize.iHeight) << 16) ) / bmpSize.iHeight;
-	TUint32 ratio = Min( ratioX, ratioY );
-
-	if ( (frameInfo.iFlags & TFrameInfo::EFullyScaleable) == 0 )
-		{
-		if (ratio < (1<<13) )
-			{
-			ratio = (1<<13); // 1/8;
-			}
-		else if (ratio < (1<<14) )
-			{
-			ratio = (1<<14); // 1/4;
-			}
-		else if (ratio < (1<<15) )
-			{
-			ratio = (1<<15); // 1/2;
-			}
-		else
-			{
-			ratio = (1<<16); // 1/1;
-			}
-		}
-
-	bmpSize.iWidth = (((bmpSize.iWidth << 1) + 1) * ratio) >> 17;
-	bmpSize.iHeight = (((bmpSize.iHeight << 1) + 1) * ratio) >> 17;
-#endif // TEST_CODE_LOAD_AND_SCALE
-
-#ifdef TEST_CODE_LOAD_AND_DITHER
-	GetScreenDisplayModeL( bmpDispMode );
-	if (bmpDispMode == EColor16MA)
-		{
-		bmpDispMode = EColor16M;
-		}
-#endif // TEST_CODE_LOAD_AND_DITHER
-
-	aBitmap.Reset();
-	TInt err = aBitmap.Create( bmpSize, bmpDispMode );
-	User::LeaveIfError( err );
-
-	TRequestStatus reqStatus = KRequestPending;
-
-	decoder->Convert( &reqStatus, aBitmap );
-	User::WaitForRequest( reqStatus );
-
-	err = reqStatus.Int();
-	User::LeaveIfError( err );
-
-	CleanupStack::PopAndDestroy( decoder );
-	CleanupStack::PopAndDestroy( &fs );
-	}
-
-
-// ------------------------------------------------------------------------------------------------
-//  COperatorLogoAdapter::
-// ------------------------------------------------------------------------------------------------
-void COperatorLogoAdapter::ScaleBitmapL( CFbsBitmap& aBitmap, TInt aX, TInt aY )
-	{
-	CBitmapScaler* scaler = CBitmapScaler::NewL();
-	CleanupStack::PushL( scaler );
-
-	CWaitScheduler* waitScheduler = CWaitScheduler::NewL();
-	CleanupStack::PushL( waitScheduler );
-
-	TSize dstSize = aBitmap.SizeInPixels();
-	if (dstSize.iWidth > aX || dstSize.iHeight > aY)
-		{
-		dstSize.iWidth = aX;
-		dstSize.iHeight = aY;
-
-		scaler->Scale( &waitScheduler->iStatus, aBitmap, dstSize );//, TBool aMaintainAspectRatio=ETrue);
-		waitScheduler->WaitForRequest();
-		}
-
-	// Cleanup
-	CleanupStack::PopAndDestroy( waitScheduler );
-	CleanupStack::PopAndDestroy( scaler );
-	}
-
-
-// ------------------------------------------------------------------------------------------------
-//  COperatorLogoAdapter::
-// ------------------------------------------------------------------------------------------------
-void COperatorLogoAdapter::GetScreenDisplayModeL( TDisplayMode &aDisplayMode )
-	{
-	// Device display mode
-	RWsSession ws;
-	User::LeaveIfError( ws.Connect() );
-	CleanupClosePushL( ws );
-
-	CWsScreenDevice* screen = new (ELeave) CWsScreenDevice( ws );
-	CleanupStack::PushL( screen );
-	User::LeaveIfError( screen->Construct() );
-
-	aDisplayMode = screen->DisplayMode();
-
-	CleanupStack::PopAndDestroy( screen );
-	screen = 0;
-
-	CleanupStack::PopAndDestroy( &ws );
-	}
-
-
-
-// ------------------------------------------------------------------------------------------------
-//  COperatorLogoAdapter::
-// ------------------------------------------------------------------------------------------------
-void COperatorLogoAdapter::GetOpInfoL( TInt& aMCC, TInt& aMNC )
-	{
-	RDEBUG("COperatorLogoAdapter::GetOpInfoL(): begin");
-	TInt err = KErrNone ;
-
-	aMCC = 0; // -1;
-	aMNC = 0; // -1;
-
-	RTelServer telServer ;
-	RMobilePhone mobilePhone;
-
-	CleanupClosePushL( telServer );
-	CleanupClosePushL( mobilePhone );
-
-	err = telServer.Connect();
-	User::LeaveIfError( err );
-
-	TInt phoneCount = 0;
-	err =  telServer.EnumeratePhones( phoneCount );
-	User::LeaveIfError( err );
-
-	TInt i = 0;
-	TBool found = EFalse;
-
-	for (i = 0 ; i < phoneCount && !found ; i++)
-		{
-		RTelServer::TPhoneInfo phoneInfo;
-		err = telServer.GetPhoneInfo( i, phoneInfo );
-		User::LeaveIfError( err );
-
-		err = mobilePhone.Open( telServer, phoneInfo.iName );
-
-		if (err == KErrNone)
-			{
-			TRequestStatus status;
-			RMobilePhone::TMobilePhoneNetworkInfoV1 v1Info;
-			RMobilePhone::TMobilePhoneNetworkInfoV1Pckg pckgInfo( v1Info );
-
-			// There are some problems with GetHomeNetwork() returned MNC when using old SIM-cards that have additional or invalid MNC in them.
-			// Therefor we prefer using network returned MNC if we are registered to home network.
-			// Otherwise we try to use MNC originated from SIM, should work but doesn't always because of SIM-errors.
-			RMobilePhone::TMobilePhoneRegistrationStatus regStatus;
-			mobilePhone.GetNetworkRegistrationStatus( status, regStatus );
-			User::WaitForRequest( status );
-
-			if (regStatus == RMobilePhone::ERegisteredOnHomeNetwork)
-				{
-				mobilePhone.GetCurrentNetwork( status, pckgInfo );
-				User::WaitForRequest( status );
-				}
-			else
-				{
-
-				mobilePhone.GetHomeNetwork( status, pckgInfo );
-				User::WaitForRequest( status );
-				}
-
-			TLex lex;
-			lex.Assign( v1Info.iCountryCode );
-			lex.Val( aMCC );
-			lex.Assign( v1Info.iNetworkId );
-			lex.Val( aMNC );
-
-			found = ETrue;
-			}
-
-		mobilePhone.Close();
-		}
-
-	telServer.Close();
-
-	CleanupStack::Pop( &mobilePhone );
-	CleanupStack::Pop( &telServer );
-	RDEBUG("COperatorLogoAdapter::GetOpInfoL(): end");
-	}
-
-
-
-
-// ------------------------------------------------------------------------------------------------
-//  COperatorLogoAdapter::SaveOperatorLogoBitmapL()
-// ------------------------------------------------------------------------------------------------
-void COperatorLogoAdapter::SaveOperatorLogoBitmapL( TInt aBitmapHandle, TInt aMCC, TInt aMNC )
-	{
-	TInt err = 0;
-	// Check parameters
-	if(aMCC == 0 || aMNC == 0)
-		{
-		return;
-		}
-		
-	
-    
-	CPhCltImageHandler* handler = CPhCltImageHandler::NewL(); 	
-	User::LeaveIfNull( handler );
-
-	// Create image parameter class
-	CPhCltImageParams* params = handler->CPhCltBaseImageParamsL( EPhCltTypeOperatorLogo );
-	CPhCltExtOperatorLogoParams* imageParams = static_cast<CPhCltExtOperatorLogoParams*>(params);
-
-	// Specify country and network code
-	imageParams->SetCodesL( aMCC, aMNC, EPhCltLogoTypeOTA );
-
-	// set CFbsBitmap handle of existing logo instance
-	if (aBitmapHandle == 0)
-		{
-		aBitmapHandle = KPhCltDeleteOperatorLogo;
-		}
-	imageParams->AddImageL( aBitmapHandle );
-
-	// store image
-	err = handler->SaveImages( *imageParams );
-	User::LeaveIfError( err );
-		
-    
-	}
-
--- a/customization/OperatorLogoAdapter/src/OperatorLogoAdapter.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-/*
-* Copyright (c) 2002 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: 
-*       Registery info for TARM DM Operator Logo customization Adapter.
-*
-*/
-
-
-#include <registryinfo.rh>
-#define KSmlDMInterfaceUid 0x102018B4
-
-RESOURCE REGISTRY_INFO theRegistryInfo
-  {
-  dll_uid = 0x10207829; //The DLL's 3rd UID.
-  interfaces =
-      {
-      INTERFACE_INFO
-          {
-          interface_uid = KSmlDMInterfaceUid; // DM interface UID
-          implementations =
-            {
-            IMPLEMENTATION_INFO
-                {
-                implementation_uid = 0x1020782A; // DM Operator Logo Adapter implementation UID
-                version_no = 1;
-                display_name = "DM Operator Logo Adapter";
-                default_data = "";
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-                opaque_data = "host=0x101F9A02";
-#else
-								opaque_data = "";
-#endif
-                }
-            };
-          }
-      };
-    }
--- a/customization/OperatorLogoAdapter/src/SyncImageOperations.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,192 +0,0 @@
-/*
-* Copyright (c) 2002 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:  Synchronous Image Operations
-*
-*/
-
-
-#include "SyncImageOperations.h"
-
-// ------------------------------------------------------------------------------------------------
-// CSyncDither* CSyncDither::NewL()
-// ------------------------------------------------------------------------------------------------
-CSyncDither* CSyncDither::NewL()
-	{
-	CSyncDither* self = NewLC();
-	CleanupStack::Pop();
-	return self;
-	}
-
-// ------------------------------------------------------------------------------------------------
-// CSyncDither* CSyncDither::NewLC()
-// ------------------------------------------------------------------------------------------------
-CSyncDither* CSyncDither::NewLC()
-	{
-	CSyncDither* self = new (ELeave) CSyncDither();
-	CleanupStack::PushL( self );
-	self->ConstructL();
-	return self;
-	}
-
-
-// ------------------------------------------------------------------------------------------------
-// CSyncDither::CSyncDither()
-// ------------------------------------------------------------------------------------------------
-CSyncDither::CSyncDither(  )
-	: iDitherer( 0 )
-	, iScheduler()
-	, iError( KErrNone )
-	{
-	}
-
-// ------------------------------------------------------------------------------------------------
-// CSyncDither::ConstructL()
-// ------------------------------------------------------------------------------------------------
-void CSyncDither::ConstructL()
-	{
-	iDitherer = CMdaImageBitmapToBitmapUtility::NewL( *this );
-	}
-
-// ------------------------------------------------------------------------------------------------
-// CSyncDither::~CSyncDither()
-// ------------------------------------------------------------------------------------------------
-CSyncDither::~CSyncDither()
-	{
-	delete iDitherer;
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  CSyncDither::
-// ------------------------------------------------------------------------------------------------
-TInt CSyncDither::DitherL( CFbsBitmap& aBitmap, TDisplayMode aDisplayMode )
-	{
-	TInt err = KErrNone;
-
-
-	CSyncDither* obj = CSyncDither::NewLC();
-	err = obj->DoDitherL( aBitmap, aDisplayMode );
-
-	CleanupStack::PopAndDestroy( obj );
-	return err;
-	}
-
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-//
-// Internal methods
-//
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-TInt CSyncDither::DoDitherL( CFbsBitmap& aBitmap, TDisplayMode aDisplayMode )
-	{
-	iError = KErrNone;
-
-	CFbsBitmap* tmpBitmap = new (ELeave) CFbsBitmap();
-	CleanupStack::PushL( tmpBitmap );
-
-	TSize bmpSize = aBitmap.SizeInPixels();
-	User::LeaveIfError( tmpBitmap->Create( bmpSize, aDisplayMode ) );
-
-	if(iError == KErrNone)
-		{
-		// Open original bitmap
-	    iDitherer->OpenL( aBitmap );
-	    iScheduler.Start();
-        }
-
-    if(iError == KErrNone)
-        {
-	    // Dither bitmap
-	    iDitherer->ConvertL( *tmpBitmap );
-	    iScheduler.Start();
-        }
-
-	// Replace original bitmap with the new one.
-    if(iError == KErrNone)
-        {
-		aBitmap.Reset();
-		aBitmap.Duplicate( tmpBitmap->Handle() );
-        }
-
-	// Cleanup
-	CleanupStack::PopAndDestroy( tmpBitmap );
-
-    return iError;
-    }
-
-// ------------------------------------------------------------------------------------------------
-//  CSyncDither::
-// ------------------------------------------------------------------------------------------------
-void CSyncDither::MiuoCreateComplete(TInt aError)
-	{
-	iError = aError;
-	iScheduler.AsyncStop();
-	}
-void CSyncDither::MiuoOpenComplete(TInt aError)
-	{
-	iError = aError;
-	iScheduler.AsyncStop();
-	}
-void CSyncDither::MiuoConvertComplete(TInt aError)
-	{
-	iError = aError;
-	iScheduler.AsyncStop();
-	}
-
-
-
-#if 0
-// -----------------------------------------------------------------------------
-// RAknsSrvSession::EnumerateSkinPackages
-// -----------------------------------------------------------------------------
-//
-EXPORT_C CArrayPtr<CAknsSrvSkinInformationPkg>* 
-    RAknsSrvSession::EnumerateSkinPackagesL( 
-        TAknSkinSrvSkinPackageLocation aLocation )
-    {
-    AKNS_TRACE1("RAknsSrvSession::EnumerateSkinPackagesL %i", aLocation);
-
-
-
-
-    CArrayPtrFlat<CAknsSrvSkinInformationPkg>* array = 
-        new (ELeave) CArrayPtrFlat<CAknsSrvSkinInformationPkg>(5);
-    CleanupStack::PushL( TCleanupItem(
-        AknsSrvCArrayPtrCAknsSrvSkinInformationPkgCleanup, array ) );
-    
-    CDesC16ArrayFlat* skinfiles = new (ELeave) CDesC16ArrayFlat(5);
-    CleanupStack::PushL(skinfiles);
-
-    switch (aLocation)
-        {
-        // Drives z and c
-        case EAknsSrvPhone: 
-            AknsSrvUtils::SearchDirectoriesL(KAknSkinSrvSystemSkinPath, 
-                skinfiles );
-            AknsSrvUtils::SearchDirectoriesL(KAknSkinSrvSkinPathLFFS, 
-                skinfiles );
-            break;
-        // drive e
-        case EAknsSrvMMC: 
-            AknsSrvUtils::SearchDirectoriesL(KAknSkinSrvSkinPathMMC, 
-                skinfiles );
-            break;
-        // all drives
-        case EAknsSrvAll: 
-#endif
-
-
-// ------------------------------------------------------------------------------------------------
-// EOF
-// ------------------------------------------------------------------------------------------------
--- a/customization/ScreenSaverAdapter/ScreenSaverServer/Group/ScreenSaverClient.mmp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-/*
-* 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: Implementation of customization components
-*
-*/
- 
-
-
-
-#include <platform_paths.hrh>
-#include "defaultcaps.hrh"
-
-CAPABILITY	CAP_CLIENT_DLL 
-
-TARGET        screensaverclient.dll
-TARGETTYPE    dll
-UID           0x1000008D 0x2000F8AC
-VENDORID 	  VID_DEFAULT
-
-SOURCEPATH    ../src
-SOURCE        ScreenSaverClient.cpp
-
-USERINCLUDE   ../inc
-USERINCLUDE   ../../../include
-
-SYSTEMINCLUDE 	/epoc32/include/ecom
-
-APP_LAYER_SYSTEMINCLUDE
-
-
-LIBRARY      	euser.lib  
-LIBRARY		 	ecom.lib
-
-LIBRARY 		flogger.lib
-LIBRARY 		estor.lib
-LIBRARY 		bafl.lib 
-LIBRARY 		efsrv.lib 
-
-SMPSAFE
--- a/customization/ScreenSaverAdapter/ScreenSaverServer/Group/ScreenSaverServer.mmp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-/*
-* 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: Implementation of customization components
-*
-*/
- 
-
-
-
-#include <platform_paths.hrh>
-#include "defaultcaps.hrh"
-
-
-
-CAPABILITY   CAP_APPLICATION
-
-
-TARGET        screensaverserver.exe
-TARGETTYPE    exe
-UID           0x2000F8AB
-VENDORID 	  VID_DEFAULT
-
-SOURCEPATH    ../src
-SOURCE        ScreenSaverServer.cpp
-SOURCE		  ScreenSaverSession.cpp
-
-
-USERINCLUDE   ../inc
-USERINCLUDE   ../../../include
-
-SYSTEMINCLUDE  /epoc32/include/ecom
-
-APP_LAYER_SYSTEMINCLUDE
-
-
-LIBRARY       euser.lib
-LIBRARY		  ecom.lib
-LIBRARY 	  flogger.lib
-LIBRARY 	  estor.lib
-
-
-
-
-
-SMPSAFE
--- a/customization/ScreenSaverAdapter/ScreenSaverServer/Group/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-/*
-* 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: Implementation of customization components
-*
-*/
- 
-PRJ_MMPFILES
-
-./ScreenSaverServer.mmp
-./ScreenSaverClient.mmp
-
--- a/customization/ScreenSaverAdapter/ScreenSaverServer/bwins/ScreenSaverClientu.def	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-EXPORTS
-	?Close@RScreenSaverClient@@QAEXXZ @ 1 NONAME ; void RScreenSaverClient::Close(void)
-	?Connect@RScreenSaverClient@@QAEHXZ @ 2 NONAME ; int RScreenSaverClient::Connect(void)
-	?DisplayName@CScreenSaverListInfo@@QBEABVTDesC16@@XZ @ 3 NONAME ; class TDesC16 const & CScreenSaverListInfo::DisplayName(void) const
-	?GetScreenSaverListInfoL@RScreenSaverClient@@QAEXAAV?$RPointerArray@VCScreenSaverListInfo@@@@@Z @ 4 NONAME ; void RScreenSaverClient::GetScreenSaverListInfoL(class RPointerArray<class CScreenSaverListInfo> &)
-	?GetScreenSaverListL@RScreenSaverClient@@QAEXAAVCDesC16Array@@@Z @ 5 NONAME ; void RScreenSaverClient::GetScreenSaverListL(class CDesC16Array &)
-	?ImplementationUid@CScreenSaverListInfo@@QBE?AVTUid@@XZ @ 6 NONAME ; class TUid CScreenSaverListInfo::ImplementationUid(void) const
-	?OpaqueData@CScreenSaverListInfo@@QBEABVTDesC8@@XZ @ 7 NONAME ; class TDesC8 const & CScreenSaverListInfo::OpaqueData(void) const
-	?Version@CScreenSaverListInfo@@QBEHXZ @ 8 NONAME ; int CScreenSaverListInfo::Version(void) const
-
--- a/customization/ScreenSaverAdapter/ScreenSaverServer/eabi/ScreenSaverClientu.def	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-EXPORTS
-	_ZN18RScreenSaverClient19GetScreenSaverListLER12CDesC16Array @ 1 NONAME
-	_ZN18RScreenSaverClient23GetScreenSaverListInfoLER13RPointerArrayI20CScreenSaverListInfoE @ 2 NONAME
-	_ZN18RScreenSaverClient5CloseEv @ 3 NONAME
-	_ZN18RScreenSaverClient7ConnectEv @ 4 NONAME
-	_ZNK20CScreenSaverListInfo10OpaqueDataEv @ 5 NONAME
-	_ZNK20CScreenSaverListInfo11DisplayNameEv @ 6 NONAME
-	_ZNK20CScreenSaverListInfo17ImplementationUidEv @ 7 NONAME
-	_ZNK20CScreenSaverListInfo7VersionEv @ 8 NONAME
-	_ZTI20CScreenSaverListInfo @ 9 NONAME ; #<TI>#
-	_ZTV20CScreenSaverListInfo @ 10 NONAME ; #<VT>#
-
--- a/customization/ScreenSaverAdapter/ScreenSaverServer/inc/ScreenSaverClient.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,106 +0,0 @@
-/*
-* 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:  DM Screensaver Adapter
-*
-*/
-
-
-
-#ifndef __SCREENSAVER_CLIENT_H__
-#define __SCREENSAVER_CLIENT_H__
-
-
-
-#include <e32std.h>
-#include <e32base.h>
-#include <e32cmn.h>
-#include <ecom/implementationinformation.h>
-#include <badesca.h>
-#include <s32mem.h>
-
-
-
-
-
-class CScreenSaverListInfo : public CBase
-{
-
-	public:
-	static 	  CScreenSaverListInfo* NewLC( TUid aUid, 
-										   TInt aVersion, 
-										   TDesC*  aName, 
-										   TDesC8* aOpaqueData);
-										   
-	static 	  CScreenSaverListInfo* NewL( TUid aUid, 
-										   TInt aVersion, 
-										   TDesC*  aName, 
-										   TDesC8* aOpaqueData);	
-										   
-	~CScreenSaverListInfo();									   								   
-	
-	IMPORT_C const TDesC& DisplayName() const;
-	
-	IMPORT_C const TDesC8& OpaqueData() const;
-	
-	IMPORT_C TUid ImplementationUid() const;
-	
-	IMPORT_C TInt Version() const;
-	
-	private:
-	
-	CScreenSaverListInfo(TUid aUid, 
-						TInt aVersion);
-	void ConstructL(TDesC*  aName, 
-					TDesC8* aOpaqueData);
-	
-	
-	TUid 	iUid;
-	TInt 	iVersion;
-	HBufC*  iName;
-	HBufC8* iOpaqueData;
-};
-
-
-typedef RPointerArray<CScreenSaverListInfo> RSSListInfoPtrArray;
-
-
-class RScreenSaverClient : public RSessionBase
-{
-	public:
-	    /**
-		* Connect Connects client side to Screen saver server
-	    * @return KErrNone Symbian error code
-        */
-		IMPORT_C TInt Connect();
-
-	    /**
-		* Close Close server connection
-        */
-		IMPORT_C void Close();
-		
-		/**
-		* Use this method to get screen saver list information like name,version,display name
-		*/
-		IMPORT_C void GetScreenSaverListInfoL(RSSListInfoPtrArray &aScreenSaverList);
-		/**
-		* Use this method to get screen saver list UIDs
-		*/
-		//IMPORT_C void GetScreenSaverListL(RArray< TUid >& aUids,CDesCArray& aIds);
-		IMPORT_C void GetScreenSaverListL(CDesCArray& aIds);
-	};
-
-
-
-
-#endif
--- a/customization/ScreenSaverAdapter/ScreenSaverServer/inc/ScreenSaverClientServer.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-/*
-* 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: Implementation of customization components
-*
-*/
- 
-#ifndef __SCREENSAVER_CLIENTSERVER_H__
-#define  __SCREENSAVER_CLIENTSERVER_H__
-
-#include <e32std.h>
-#include <e32base.h>
-
-// server name
-
-_LIT(KDMSSServerName,"ScreenSaverServer");
-_LIT(KDMSSServerImg,"ScreenSaverServer");//can be removed
-
-const TUid KDMSSServerUid={0x2000F8AB}; 
-const TInt KSSInfoBufferLength = 1000;
-enum TSSServerMessages
-{
-	EGetAvailableScreenSavers,
-	EGetscreensaverInfo,
-	EScreenSaversCount
-};
-
-#endif
\ No newline at end of file
--- a/customization/ScreenSaverAdapter/ScreenSaverServer/inc/ScreenSaverServer.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +0,0 @@
-/*
-* 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: Implementation of customization components
-*
-*/
- 
-
-
-#ifndef __SCREENSAVER_SERVER_H__
-#define __SCREENSAVER_SERVER_H__
-
-#include <e32base.h>
-#include <e32std.h>
-#include <ecom/implementationinformation.h>
-#include<ScreensaverpluginIntDef.h>
-
-
-// CLASS DECLARATION     
-class CShutdown : public CTimer
-	{
-	enum 
-		{
-		KScreenSaverServerShutdownDelay = 0x300000//0x1000000 changed to 3 sec
-		};	
-public:
-	inline CShutdown();
-	inline void ConstructL();
-	inline void Start();
-private:
-	void RunL();
-	};
-
-
-
-class CScreenSaverServer: public CServer2
-{
-	friend class CScreenSaverSession;
-	
-	public:
-		~CScreenSaverServer();
-		static CServer2*    NewLC();
-		void AddSession();
-		void DropSession();
-	
-	private:
-		TInt iSessionCount;
-		CShutdown iShutdown;
-	private:	
-		void GetAvailableScreenSaversL(RImplInfoPtrArray& aScreenSaverList);
-		void ConstructL();
-		CScreenSaverServer();
-	protected:
-		CSession2* NewSessionL(const TVersion&,const RMessage2&) const;
-
-};
-
-
-#endif
\ No newline at end of file
--- a/customization/ScreenSaverAdapter/ScreenSaverServer/inc/ScreenSaverSession.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-/*
-* 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: Implementation of customization components
-*
-*/
- 
-
-#ifndef __SCREENSAVER_SESSION_H__
-#define __SCREENSAVER_SESSION_H__
-
-#include "ScreenSaverServer.h"
-#include <s32mem.h>
-
-class CScreenSaverSession: public CSession2
-{
-	friend class CScreenSaverServer;
-	public:
-		~CScreenSaverSession();
-	void CreateL();
-	
-	private:
-		CScreenSaverSession();
-		CScreenSaverServer& Server();
-		
-		void ServiceL(const RMessage2& aMessage);
-		void DispatchMessageL(const RMessage2& aMessage);
-		void ServiceError(const RMessage2 &aMessage, TInt aError);
-};
-
-
-#endif
\ No newline at end of file
--- a/customization/ScreenSaverAdapter/ScreenSaverServer/src/ScreenSaverClient.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,254 +0,0 @@
-/*
-* 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: Implementation of customization components
-*
-*/
- 
-
-
-#include "ScreenSaverClientServer.h"
-#include "ScreenSaverClient.h"
-#include "debug.h"
-#include <f32file.h>
-
-
-TInt StartServer()
-	{
-	RDEBUG("RScreenSaverClient: StartServer()...");	
-	const TUidType serverUid(KNullUid,KNullUid,KDMSSServerUid);
-
-	RProcess server;
-	TInt r=server.Create(KDMSSServerImg,KNullDesC);
-
-	if (r!=KErrNone)
-		{
-		RDEBUG_2("RScreenSaverClient: server start failed %d",r);
-		return r;
-		}
-	TRequestStatus stat;
-	server.Rendezvous(stat);
-	if (stat!=KRequestPending)
-		server.Kill(0);		// abort startup
-	else
-		server.Resume();	// logon OK - start the server
-	RDEBUG("RScreenSaverClient: Started");
-	User::WaitForRequest(stat);		// wait for start or death
-	r=(server.ExitType()==EExitPanic) ? KErrGeneral : stat.Int();
-	server.Close();
-	return r;
-	}
-
-EXPORT_C TInt RScreenSaverClient::Connect()
-	{
-	RDEBUG("RScreenSaverClient::Connect - start");
-	TInt retry=2;
-	for (;;)
-		{
-		TInt r=CreateSession(KDMSSServerName,TVersion(0,0,0),50);
-		if (r!=KErrNotFound && r!=KErrServerTerminated)
-			return r;
-		if (--retry==0)
-			return r;
-		r=StartServer();
-		if (r!=KErrNone && r!=KErrAlreadyExists)
-			return r;
-		}
-	}
-
-
-EXPORT_C void RScreenSaverClient::Close()
-	{
-	RSessionBase::Close();  //basecall
-	}
-	
-	
-//EXPORT_C void RScreenSaverClient::GetScreenSaverListL(RArray< TUid >& aUids,CDesCArray& aIds)
-EXPORT_C void RScreenSaverClient::GetScreenSaverListL(CDesCArray& aIds)
-	{
-	RDEBUG("	-> RScreenSaverClient: GetScreenSaverList ... STARTED!");
-	TInt ssCount(0);
-	TPckgBuf<TInt>count(ssCount);
-	
-	User::LeaveIfError(SendReceive(EScreenSaversCount,TIpcArgs(&count)));
-	ssCount = count();
-	RDEBUG_2(" RScreenSaverClient: GetScreenSaverList **SSCount : %d",ssCount);
-	
-	HBufC8* buffer = HBufC8::NewLC((sizeof(TUid)*ssCount)+sizeof(TInt8));
-    TPtr8 bufPtr = buffer->Des();
-    TInt err =  SendReceive(EGetAvailableScreenSavers,TIpcArgs(&bufPtr));
-	
-	if ( err == KErrNone || err == KErrOverflow )
-		{
-		RDesReadStream stream( bufPtr );
-		CleanupClosePushL( stream );
-		TInt count = stream.ReadInt8L();
-
-		for ( TInt i = 0; i < count; ++i )
-        	{
-	        TUid uid = TUid::Uid(stream.ReadInt32L());
-	        //aUids.AppendL( uid );
-	        aIds.AppendL( uid.Name() );
-        	}
-        
-		//aUids.SortSigned( );
-		aIds.Sort( );
-		
-    	CleanupStack::PopAndDestroy(&stream);
-		CleanupStack::PopAndDestroy(buffer);
-		}
-	RDEBUG("	-> RScreenSaverClient: GetScreenSaverList ... END!");
-	}
-	
-	
-EXPORT_C void RScreenSaverClient::GetScreenSaverListInfoL(RSSListInfoPtrArray &aScreenSaverList)
-	{
-	RDEBUG("	-> RScreenSaverClient: GetScreenSaverListInfo ... STARTED!");
-	
-	TInt ssCount(0);
-	TPckgBuf<TInt>count(ssCount);
-	User::LeaveIfError(SendReceive(EScreenSaversCount,TIpcArgs(&count)));
-	
-	ssCount = count();
-	RDEBUG_2(" RScreenSaverClient: GetScreenSaverListInfo **SSCount : %d",ssCount);
-
-	HBufC8* buffer = HBufC8::NewLC(KSSInfoBufferLength * ssCount);
-    TPtr8 bufPtr = buffer->Des();
-
-	TInt err =  SendReceive(EGetscreensaverInfo,TIpcArgs(&bufPtr));
-	TInt lenght = bufPtr.Length();
-	if ( err == KErrNone || err == KErrOverflow )
-		{
-		RDesReadStream stream( bufPtr );
-		CleanupClosePushL( stream );
-		TInt count = stream.ReadInt8L();
-		
-			
-		for ( TInt i = 0; i < count; ++i )
-    		{
-	        TUid uid = TUid::Uid(stream.ReadInt32L());
-	        TInt version = stream.ReadInt32L();
-	        
-	        TInt length = stream.ReadUint32L();
-	        HBufC* name = HBufC::NewLC( stream,length  );
-	        
-	        length = stream.ReadUint32L();
-	        HBufC8* opaqueData = HBufC8::NewLC( stream, length );
-	        
-	        
-	        CScreenSaverListInfo *ScreensaverInfo = CScreenSaverListInfo::NewL(uid,
-	        																   version,
-	        																   name,
-	 	       																   opaqueData);
-	        //TInt error = aScreenSaverList.Append(ScreensaverInfo);
-	        User::LeaveIfError(aScreenSaverList.Append(ScreensaverInfo));
-	        
-	        CleanupStack::PopAndDestroy(opaqueData); 
-	        CleanupStack::PopAndDestroy(name); 
-    		}
-  	   	CleanupStack::PopAndDestroy(&stream);
-		CleanupStack::PopAndDestroy(buffer);
-		}
-	RDEBUG("	-> RScreenSaverClient: GetScreenSaverListInfo ... Ended!");
-	}
-
-
-
-CScreenSaverListInfo* CScreenSaverListInfo::NewL(TUid aUid, 
-												   TInt aVersion, 
-												   TDesC*  aName, 
-												   TDesC8* aOpaqueData)
-	{
-	CScreenSaverListInfo* self = CScreenSaverListInfo::NewLC(aUid, 
-															aVersion, 
-															aName, 
-															aOpaqueData);
-    CleanupStack::Pop(self);
-    return self;
-	}
-												   
-
-CScreenSaverListInfo* CScreenSaverListInfo::NewLC(TUid aUid, 
-												   TInt aVersion, 
-												   TDesC*  aName, 
-												   TDesC8* aOpaqueData)
-	{
-	RDEBUG("CScreenSaverListInfo::NewLC - start");
-	
-	CScreenSaverListInfo* self = new(ELeave)CScreenSaverListInfo(aUid,aVersion);
-	CleanupStack::PushL(self);
-	self->ConstructL(aName,aOpaqueData);
-	RDEBUG("CScreenSaverListInfo::NewLC - end");
-	return self;
-	}
-
-
-CScreenSaverListInfo::CScreenSaverListInfo(TUid aUid, 
-											TInt aVersion)
-											
-		
-	:CBase(),
-	iUid(aUid),
-	iVersion(aVersion)								
-	{
-	//Do nothing here
-	}
-
-CScreenSaverListInfo::~CScreenSaverListInfo()
-	{
-	delete iName;
-	iName = NULL;
-	delete iOpaqueData;
-	iOpaqueData = NULL;
-	}
-
-void CScreenSaverListInfo::ConstructL(TDesC*  aName, 
-									  TDesC8* aOpaqueData)
-	{
-	iName = aName->AllocL();
-	iOpaqueData = aOpaqueData->AllocL();
-	}
-
-
-EXPORT_C const TDesC& CScreenSaverListInfo::DisplayName() const
-	{
-	if(iName == NULL)
-		return KNullDesC();
-	else
-		return *iName;
-	}
-
-
-
-EXPORT_C const TDesC8& CScreenSaverListInfo::OpaqueData() const
-	{
-	if(iOpaqueData == NULL)
-		return KNullDesC8();
-	else
-		return *iOpaqueData;
-	}
-
-
-EXPORT_C TUid CScreenSaverListInfo::ImplementationUid() const
-	{
-	return iUid;
-	}
-
-
-EXPORT_C TInt CScreenSaverListInfo::Version() const
-	{
-	return iVersion;
-	}
-	
-//End of file
-
--- a/customization/ScreenSaverAdapter/ScreenSaverServer/src/ScreenSaverServer.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,214 +0,0 @@
-/*
-* 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: Implementation of customization components
-*
-*/
- 
-
-
-#include "ScreenSaverServer.h"
-#include "ScreenSaverClientServer.h"
-#include "ScreenSaverSession.h"
-
-#include "debug.h"
-
-
-
-
-
-// ----------------------------------------------------------------------------------------
-// Server startup code
-// ----------------------------------------------------------------------------------------
-static void RunServerL()
-	{
-	// naming the server thread after the server helps to debug panics
-	__UHEAP_MARK;
-
-	User::LeaveIfError(User::RenameThread(KDMSSServerName)); 
-
-	// create and install the active scheduler
-
-	CActiveScheduler* s=new(ELeave) CActiveScheduler;
-	CleanupStack::PushL(s);
-	CActiveScheduler::Install(s);
-	__UHEAP_MARK;
-
-	// create the server (leave it on the cleanup stack)
-	CServer2 *t = CScreenSaverServer::NewLC();
-	// Initialisation complete, now signal the client
-
-	RProcess::Rendezvous(KErrNone);
-
-	// Ready to run
-	RDEBUG("CScreenSaverServer is running");
-	CActiveScheduler::Start();
-
-
-	// Cleanup the server and scheduler
-	CleanupStack::PopAndDestroy(t);
-	__UHEAP_MARKEND;
-
-	CleanupStack::PopAndDestroy(s);
-	__UHEAP_MARKEND;
-	}
-
-// Server process entry-point
-TInt E32Main()
-	{
-	__UHEAP_MARK;
-	RDEBUG("CScreenSaverServer: E32Main");
-	CTrapCleanup* cleanup=CTrapCleanup::New();
-	TInt r=KErrNoMemory;
-	if (cleanup)
-		{
-		TRAP(r,RunServerL());
-		RDEBUG_2("CScreenSaverServer closed with code: %d", r);
-		delete cleanup;
-		}
-	__UHEAP_MARKEND;
-	return r;
-	}
-
-
-
-
-// -----------------------------------------------------------------------------
-// CShutDown::CShutdown()
-// -----------------------------------------------------------------------------
-
-inline CShutdown::CShutdown()
-	:CTimer(-1)
-	{
-	CActiveScheduler::Add(this);
-	}
-	
-	
-// -----------------------------------------------------------------------------
-// CShutDown::ConstructL()
-// -----------------------------------------------------------------------------
-
-inline void CShutdown::ConstructL()
-	{
-	CTimer::ConstructL();
-	}
-
-// -----------------------------------------------------------------------------
-// CShutDown::Start()
-// -----------------------------------------------------------------------------
-
-inline void CShutdown::Start()
-	{
-	
-	RDEBUG( "creenSaverServer: starting shutdown timeout" );
-	
-	After(KScreenSaverServerShutdownDelay);
-	//SetActive();
-	}
-
-// -----------------------------------------------------------------------------
-// CShutDown::RunL()
-// -----------------------------------------------------------------------------
-
-void CShutdown::RunL()
-	{
-	RDEBUG( "creenSaverServer timeout ... closing" );
-	CActiveScheduler::Stop();
-	}
-
-
-
-
-CServer2* CScreenSaverServer::NewLC()
-	{
-	RDEBUG("CScreenSaverServer::NewLC - start");
-	
-	CScreenSaverServer* self=new(ELeave) CScreenSaverServer;
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	RDEBUG("CScreenSaverServer::NewLC - end");
-	return self;
-	}
-
-
-
-void CScreenSaverServer::ConstructL()
-	{
-	RDEBUG("CScreenSaverServer::ConstructL start");
-	
-	StartL(KDMSSServerName);
-	iShutdown.ConstructL();
-	iShutdown.Start();	
-	
-	RDEBUG("CScreenSaverServer::ConstructL end");
-	}
-
-
-CScreenSaverServer::CScreenSaverServer() :CServer2(0)
-	{
-	RDEBUG("CScreenSaverServer::CScreenSaverServer()");
-	}
-	// -----------------------------------------------------------------------------
-// CApplicationManagementServer::AddSession()
-// -----------------------------------------------------------------------------
-
-void CScreenSaverServer::AddSession()
-	{
-	// A new session is being created
-	RDEBUG( "CScreenSaverServer::AddSession" );
-	++iSessionCount;
-	
-	// Cancel the shutdown timer if it was running
-	iShutdown.Cancel();
-	}
-
-
-// -----------------------------------------------------------------------------
-// CApplicationManagementServer::DropSession()
-// -----------------------------------------------------------------------------
-
-void CScreenSaverServer::DropSession()
-	{
-	// A session is being destroyed
-	RDEBUG( "CScreenSaverServer::DropSession" );
-
-	// Start the shutdown timer if it is the last session
-	if ( --iSessionCount == 0 )
-		{
-			iShutdown.Start();
-		}
-	}
-
-
-
-
-CScreenSaverServer::~CScreenSaverServer()
-	{
-	RDEBUG("CScreenSaverServer::CScreenSaverServer()");
-	}
-
-
-
-CSession2* CScreenSaverServer::NewSessionL(const TVersion&,const RMessage2&) const
-	{
-	RDEBUG("CScreenSaverServer::NewSessionL");
-	return new (ELeave) CScreenSaverSession();
-	}
-
-
-void CScreenSaverServer::GetAvailableScreenSaversL(RImplInfoPtrArray& aScreenSaverList)
-	{
-	RDEBUG("CScreenSaverServer::GetAvailableScreenSavers()");
-	CScreensaverPluginInterfaceDefinition::ListImplementationsL( aScreenSaverList );
-	REComSession::FinalClose();
-	}
--- a/customization/ScreenSaverAdapter/ScreenSaverServer/src/ScreenSaverSession.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,186 +0,0 @@
-/*
-* 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: Implementation of customization components
-*
-*/
- 
-
-#include <mmf/common/mmfcontrollerpluginresolver.h>
-#include "ScreenSaverSession.h"
-#include "ScreenSaverClientServer.h"
-#include <badesca.h>
-#include "debug.h"
-#include <ecom/implementationinformation.h>
-#include <e32cmn.h>
-#include <f32file.h>
-
-CScreenSaverSession::CScreenSaverSession()
-	{
-	RDEBUG("CScreenSaverSession::CScreenSaverSession");
-	}
-
-
-CScreenSaverSession::~CScreenSaverSession()
-	{
-	RDEBUG("CScreenSaverSession::~CScreenSaverSession");
-	Server().DropSession();
-	}
-
-CScreenSaverServer& CScreenSaverSession::Server()
-	{
-	return *static_cast<CScreenSaverServer*>(const_cast<CServer2*>(CSession2::Server()));
-	}
-
-// ----------------------------------------------------------------------------------------
-// CScreenSaverSession::CreateL
-// 2nd phase construct for sessions - called by the CServer framework
-// ----------------------------------------------------------------------------------------
-void CScreenSaverSession::CreateL()
-	{
-	RDEBUG("CScreenSaverSession::CreateL");
-	Server().AddSession();
-	
-	}
-
-
-void CScreenSaverSession::ServiceL(const RMessage2& aMessage)
-	{
-	TRAPD(err,DispatchMessageL(aMessage));
-	aMessage.Complete(err);
-	}
-
-void CScreenSaverSession::ServiceError(const RMessage2& aMessage,TInt aError)
-	{
-	RDEBUG_2("CScreenSaverSession::ServiceError %d",aError);
-	CSession2::ServiceError(aMessage,aError);
-	}
-	
-
-void CScreenSaverSession::DispatchMessageL(const RMessage2& aMessage)
-	{
-	
-	switch(aMessage.Function())
-		{
-		case EGetAvailableScreenSavers:
-			{
-			RDEBUG("	DispatchMessageL case: EGetAvailableScreenSavers");
-			
-			
-			RImplInfoPtrArray screenSaverList;
-			CleanupResetAndDestroyPushL( screenSaverList ); 
-			Server().GetAvailableScreenSaversL(screenSaverList);
-			
-			TInt ssCount(0);
-			ssCount = screenSaverList.Count();
-			RDEBUG_2("	DispatchMessageL case: EGetAvailableScreenSavers : SSCount : %d",ssCount);
-			HBufC8* buffer = HBufC8::NewLC((sizeof(TUid)*ssCount)+sizeof(TInt8));
-   			TPtr8 bufPtr = buffer->Des();
-   			
-   			RDesWriteStream stream;
-			stream.Open( bufPtr );
-			
-			CleanupClosePushL(stream);
-			
-			const TInt count = screenSaverList.Count();
-			
-			stream.WriteUint8L(TUint(count));
-			for ( TInt i = 0 ; i < count ; i++ )
-				{
-				CImplementationInformation* implInfo = screenSaverList[i];
-				stream.WriteInt32L( implInfo->ImplementationUid().iUid);
-				}
-			stream.CommitL();
-		    aMessage.WriteL( 0, bufPtr, 0 );
-
-		    CleanupStack::PopAndDestroy(&stream);
-		    	
-		    CleanupStack::PopAndDestroy(buffer);
-		    	
-		    CleanupStack::PopAndDestroy( &screenSaverList ); // screenSaverList
-		    
-			}
-			break;
-		
-		case EGetscreensaverInfo:
-			{
-			RDEBUG("	DispatchMessageL case: EGetscreensaverInfo");
-			
-			RImplInfoPtrArray screenSaverList;
-			CleanupResetAndDestroyPushL( screenSaverList ); 
-			
-			Server().GetAvailableScreenSaversL(screenSaverList);
-			
-			TInt ssCount(0);
-			ssCount = screenSaverList.Count();
-			RDEBUG_2("	DispatchMessageL case: EGetscreensaverInfo : SSCount : %d",ssCount);
-			
-			HBufC8* buffer = HBufC8::NewLC(KSSInfoBufferLength*ssCount);
-   			TPtr8 bufPtr = buffer->Des();
-   			
-   			RDesWriteStream stream;
-			stream.Open( bufPtr );
-			CleanupClosePushL(stream);
-			
-			const TInt count = screenSaverList.Count();
-			
-			stream.WriteUint8L(TUint(count));
-			
-			for ( TInt i = 0 ; i < count ; i++ )
-				{
-					CImplementationInformation* implInfo = screenSaverList[i];
-					
-					stream.WriteInt32L( implInfo->ImplementationUid().iUid);	//Uid
-					stream.WriteInt32L( implInfo->Version());					//Version
-					
-					stream.WriteInt32L( implInfo->DisplayName().Length());	//Dispaly  Name		
-					stream << implInfo->DisplayName();
-					
-					stream.WriteInt32L( implInfo->OpaqueData().Length());   //Opaque Data
-					stream << implInfo->OpaqueData();
-					
-				}
-			stream.CommitL();
-		    aMessage.WriteL( 0, bufPtr, 0 );
-
-		    CleanupStack::PopAndDestroy(&stream);
-		    CleanupStack::PopAndDestroy(buffer);
-		    CleanupStack::PopAndDestroy( &screenSaverList );
-		    
-			}
-			break;
-		
-		case EScreenSaversCount:
-			{
-			RDEBUG("	DispatchMessageL case: EScreenSaversCount");
-				
-			RImplInfoPtrArray screenSaverCount;
-			CleanupResetAndDestroyPushL( screenSaverCount ); 
-			TInt count(0);
-			
-			Server().GetAvailableScreenSaversL(screenSaverCount);
-			
-			count = screenSaverCount.Count();
-			TPckgBuf<TInt>ssCount(count);
-
-			aMessage.WriteL(0,ssCount);
-			CleanupStack::Pop(&screenSaverCount)	;
-		    screenSaverCount.ResetAndDestroy();
-			
-			}
-			break;
-		default:
-			break;
-		}
-	}
-	
--- a/customization/ScreenSaverAdapter/bld/ScreenSaverAdapter.mmp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,90 +0,0 @@
-/*
-* Copyright (c) 2002 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: Implementation of customization components
-*
-*/
-  
-
-// To get the APP_LAYER_SYSTEMINCLUDE-definition
-#include <platform_paths.hrh>
-#include "defaultcaps.hrh"
-
-CAPABILITY      CAP_GENERAL_DLL
-TARGET          screensaveradapter.dll
-TARGETTYPE      PLUGIN
-UID             0x10009D8D 0x1020782D
-VENDORID        VID_DEFAULT
-
-
-APP_LAYER_SYSTEMINCLUDE
-SYSTEMINCLUDE   /epoc32/include/swi
-#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
-SYSTEMINCLUDE 	/epoc32/include/platform/mw/swi
-#endif
-SYSTEMINCLUDE 	/epoc32/include/ecom
-SYSTEMINCLUDE 	/epoc32/include/xml
-SYSTEMINCLUDE 	/epoc32/include/mmf/common	// For CleanupResetAndDestroyPushL()
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-SYSTEMINCLUDE 	/epoc32/include/devman
-#else
-// nothing
-#endif
-
-SOURCEPATH      ../src
-
-USERINCLUDE		  ../inc
-USERINCLUDE		  ../../include
-USERINCLUDE		  ../../DMUtils/inc
-USERINCLUDE     ../../../inc
-
-USERINCLUDE     ../ScreenSaverServer/inc
-SOURCE          ScreenSaverAdapter.cpp
-SOURCE          ScreenSaverList.cpp
-
-START RESOURCE  ScreenSaverAdapter.rss
-TARGET screensaveradapter.rsc
-LANGUAGE_IDS
-END
-
-
-
-LIBRARY		      euser.lib
-LIBRARY		      efsrv.lib
-LIBRARY		      bafl.lib	//eg. CDesCArray
-LIBRARY		      ecom.lib
-LIBRARY		      imut.lib
-LIBRARY		      centralrepository.lib
-LIBRARY		      swinstcli.lib
-LIBRARY		      aminstalloptions.lib
-LIBRARY		      sisregistryclient.lib
-
-//#ifdef __SAP_POLICY_MANAGEMENT
-LIBRARY		      policyengine.lib
-LIBRARY		      dmutil.lib
-//#endif
-
-LIBRARY         flogger.lib
-
-STATICLIBRARY	  dmutils.lib
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-LIBRARY		      devmancmdmgr.lib
-#else
-// nothing
-#endif
-LIBRARY           screensaverclient.lib
-LIBRARY                 featmgr.lib
-
-SMPSAFE
--- a/customization/ScreenSaverAdapter/bld/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-/*
-* Copyright (c) 2002 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:  build info file for screensaver settings adapter
-*
-*/
-
-#include <platform_paths.hrh>
-
-PRJ_EXPORTS
-../rom/ScreenSaverAdapter.iby								CORE_APP_LAYER_IBY_EXPORT_PATH(screensaveradapter.iby)
-
-PRJ_MMPFILES
-./ScreenSaverAdapter.mmp
-
-#include "../ScreenSaverServer/Group/bld.inf"
-
-
-
--- a/customization/ScreenSaverAdapter/inc/ScreenSaverAdapter.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,169 +0,0 @@
-/*
-* Copyright (c) 2002 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:  DM Screensaver Adapter
-*
-*/
-
-
-
-#ifndef __NSMLScreenSaverAdapter_H__
-#define __NSMLScreenSaverAdapter_H__
-
-
-#include "TARMDmAdapter.h"
-
-
-const TUint KNSmlDMScreenSaverAdapterImplUid = 0x1020782E;
-
-// the DDF version must be changed if any changes in DDF structure ( built in DDFStructureL() function )
-_LIT8( KNSmlSCDDFVersion, "1.0" ); 
-
-_LIT8( KNSmlSCTextPlain, "text/plain" );
-
-_LIT8( KNSmlCustomizationNodeName, "Customization" );
-_LIT8( KNSmlSCDescription, "The interior object holds all customization objects" );
-
-_LIT8( KNSmlSCScreenSavers, "ScreenSavers" );
-_LIT8( KNSmlSCScreenSaversNodeDescription, "ScreenSavers is a common parent node for nodes managing screen savers");
-
-_LIT8( KNSmlSCAvailableScreenSaversNodeName, "AvailableScreenSavers" );
-_LIT8( KNSmlSCAvailableScreenSaversNodeDescription, "This node holds the available screen saver placeholders");
-
-_LIT8( KNSmlSCActiveScNodeName, "ActiveSc" );
-_LIT8( KNSmlSCActiveScNodeDescription, "This node is a link to the currently active screen saver");
-
-_LIT8( KNSmlSCDynamicDescription, "This is a placeholder to screen saver ID identifying a screen saver");
-
-_LIT8( KNSmlSCDataNodeName, "Data" );
-_LIT8( KNSmlSCDataNodeDescription, "Replace command will install a screen saver that's in the data field of the command");
-
-_LIT8( KNSmlSCIDNodeName, "ID" );
-_LIT8( KNSmlSCIDNodeDescription, "This leaf node holds the ID of the screen saver");
-
-_LIT8( KNSmlSCNameNodeName, "Name" );
-_LIT8( KNSmlSCNameNodeDescription, "This leaf node holds the name of the screen saver");
-
-_LIT8( KNSmlSCDescriptionNodeName, "Description" );
-_LIT8( KNSmlSCDescriptionNodeDescription, "This leaf node holds the description of the screen saver");
-
-_LIT8( KNSmlSCCustomPropertyNodeName, "CustomProperty" );
-_LIT8( KNSmlSCCustomPropertyNodeDescription, "This leaf node holds the custom property value of the screen saver");
-
-_LIT8( KNSmlSCVersionNodeName, "Version" );
-_LIT8( KNSmlSCVersionNodeDescription, "This leaf node holds the version of the screen saver");
-
-_LIT8( KNSmlSCInstallOptionsNodeName, "InstallOptions" );
-_LIT8( KNSmlSCInstallOptionsNodeDescription, "Holds the install options for next install");
-
-_LIT8( KNSmlSCActiveScRef, "Customization/ScreenSavers/AvailableScreenSavers/" );
-
-_LIT8( KSlash, "/" );
-
-
-class CScreenSaverList;
-
-// ------------------------------------------------------------------------------------------------
-// CNSmlDmEmailAdapter 
-// ------------------------------------------------------------------------------------------------
-class CScreenSaverAdapter : public CTARMDmAdapter
-	{
-public:
-	static CScreenSaverAdapter* NewL(MSmlDmCallback* aDmCallback );
-	static CScreenSaverAdapter* NewLC(MSmlDmCallback* aDmCallback );
-
-	virtual ~CScreenSaverAdapter();
-
-	// Implementation of MSmlDmAdapter interface
-	// =========================================
-	void DDFVersionL( CBufBase& aVersion );
-	void DDFStructureL( MSmlDmDDFObject& aDDF );
-	
-	void _UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, const TDesC8& aObject, const TDesC8& aType, TInt aStatusRef );
-	void _UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, RWriteStream*& aStream, const TDesC8& aType, TInt aStatusRef );
-	void _DeleteObjectL( const TDesC8& aURI, const TDesC8& aLUID, TInt aStatusRef );
-	void _FetchLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, const TDesC8& aType, TInt aResultsRef, TInt aStatusRef );
-	void _FetchLeafObjectSizeL( const TDesC8& aURI, const TDesC8& aLUID, const TDesC8& aType, TInt aResultsRef, TInt aStatusRef );
-	void _ChildURIListL( const TDesC8& aURI, const TDesC8& aLUID, const CArrayFix<TSmlDmMappingInfo>& aPreviousURISegmentList, TInt aResultsRef, TInt aStatusRef );
-	
-	void _AddNodeObjectL( const TDesC8& aURI, const TDesC8& aParentLUID, TInt aStatusRef );
-	void _ExecuteCommandL( const TDesC8& aURI, const TDesC8& aLUID, const TDesC8& aArgument, const TDesC8& aType, TInt aStatusRef );
-	void _ExecuteCommandL( const TDesC8& aURI, const TDesC8& aLUID, RWriteStream*& aStream, const TDesC8& aType, TInt aStatusRef );
-	void _CopyCommandL( const TDesC8& aTargetURI, const TDesC8& aTargetLUID, const TDesC8& aSourceURI, const TDesC8& aSourceLUID, const TDesC8& aType, TInt aStatusRef );
-
-	void StartAtomicL();
-	void CommitAtomicL();
-	void RollbackAtomicL();
-	TBool StreamingSupport( TInt& aItemSize );
-#ifdef __TARM_SYMBIAN_CONVERGENCY	
-		virtual void StreamCommittedL( RWriteStream& aStream );
-#else
-		virtual void StreamCommittedL();
-#endif	
-	void CompleteOutstandingCmdsL();
-
-	// PolicyCheck, resource name
-//#ifdef __SAP_POLICY_MANAGEMENT	
-	TPtrC8 PolicyRequestResourceL( const TDesC8& aURI );
-//#endif
-
-protected:
-	// Other
-	void GetLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, const TDesC8& aType, CBufBase& aResult, TError& aRet );
-
-private:
-	void ConstructL( );
-	CScreenSaverAdapter( MSmlDmCallback* aDmCallback );
-
-	enum TNodeId
-		{
-		ENodeUnknown,
-
-		ENodeCustomization,
-		ENodeScreenSavers,
-
-		ENodeAvailableScreenSavers,
-		ENodeActiveSc,
-
-		ENodeAvailableScreenSaversX,
-
-		ENodeData,
-		ENodeID,
-		ENodeName,
-		ENodeDescription,
-		ENodeCustomProperty,
-		ENodeVersion,
-		ENodeInstallOptions,
-
-		ENodeLast
-		};
-
-	TNodeId NodeId( const TDesC8& aURI );
-
-	void FillNodeInfoL( MSmlDmDDFObject& aNode,TSmlDmAccessTypes aAccTypes,MSmlDmDDFObject::TOccurence aOccurrence, MSmlDmDDFObject::TScope aScope, MSmlDmDDFObject::TDFFormat aFormat,const TDesC8& aDescription );
-	TBool IsImage(const TDesC8& aMime) ;
-
-
-	void InstalledPackagesL( RArray< TUid >& aUids );
-//	void InstalledScreenSaversL( RArray< TUid >& aUids );
-	void InstalledScreenSaversL( CDesCArray& aIds );
-
-private:
-
-	MSmlDmCallback* iCallBack;
-	CScreenSaverList* iScreenSavers;
-	TBool iScreensaverOff;
-
-};
-
-#endif // __NSMLScreenSaverAdapter_H__
--- a/customization/ScreenSaverAdapter/inc/ScreenSaverList.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,145 +0,0 @@
-/*
-* Copyright (c) 2002 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:  DM ScreenSaver List
-*
-*/
-
-
-
-#ifndef __ScreenSaverList_H__
-#define __ScreenSaverList_H__
-
-// ------------------------------------------------------------------------------------------------
-// Includes
-// ------------------------------------------------------------------------------------------------
-#include <e32base.h>
-#include <smldmadapter.h>
-#include <SWInstApi.h>
-
-// Constants
-const TInt KPkgId_ScrId_Separator = ':';
-const TInt KDisableScreensaver     = 1;
-const TInt KEnableScreensaver      = 0;
-
-
-// ------------------------------------------------------------------------------------------------
-// CScreenSaverInfo
-// ------------------------------------------------------------------------------------------------
-class CScreenSaverInfo : public CBase
-	{
-public:
-	static CScreenSaverInfo* NewL( const TDesC& aId );
-	static CScreenSaverInfo* NewLC( const TDesC& aId );
-
-	virtual ~CScreenSaverInfo();
-
-	// Other
-	const TDesC8& Id();
-
-	const TDesC8& Name();
-	void SetNameL( const TDesC8& aName );
-	void SetNameL( const TDesC& aName );
-
-	const TDesC8& Description();
-	void SetDescriptionL( const TDesC8& aDescription );
-
-	const TDesC8& CustomProperty();
-	void SetCustomPropertyL( const TDesC8& aCustomProperty );
-
-	const TDesC8& Version();
-	void SetVersionL( const TDesC8& aVersion );
-
-	void ActivateL();
-
-	enum TScreenSaverType 
-		{
-		EText = 0,
-		EDateTime = 1,
-		EObject = 3
-		};
-		
-	TScreenSaverType TypeId();
-	TBool IsActivatedL();
-	const TDesC8& FileName();
-
-
-protected:
-
-private:
-	CScreenSaverInfo( );
-	void ConstructL( const TDesC& aId );
-
-private:
-	HBufC8* iId;
-	HBufC8* iName;
-	HBufC8* iDescription;
-	HBufC8* iCustomProperty;
-	HBufC8* iVersion;
-	};
-
-// ------------------------------------------------------------------------------------------------
-// CScreenSaverList
-// ------------------------------------------------------------------------------------------------
-class CScreenSaverList : public CBase
-	{
-public:
-	static CScreenSaverList* NewL( );
-	static CScreenSaverList* NewLC( );
-
-	virtual ~CScreenSaverList();
-
-	MSmlDmAdapter::TError GetScreenSaverListL( const CArrayFix<TSmlDmMappingInfo>& aPreviousList, CBufBase& aList );
-
-	MSmlDmAdapter::TError GetIdL( const TDesC8& aId, CBufBase& aResult );
-
-	MSmlDmAdapter::TError GetNameL( const TDesC8& aId, CBufBase& aResult );
-	MSmlDmAdapter::TError SetNameL( const TDesC8& aId, const TDesC8& aData );
-
-	MSmlDmAdapter::TError GetDescriptionL( const TDesC8& aId, CBufBase& aResult );
-	MSmlDmAdapter::TError SetDescriptionL( const TDesC8& aId, const TDesC8& aData );
-
-	MSmlDmAdapter::TError GetCustomPropertyL( const TDesC8& aId, CBufBase& aResult );
-	MSmlDmAdapter::TError SetCustomPropertyL( const TDesC8& aId, const TDesC8& aData );
-
-	MSmlDmAdapter::TError GetVersionL( const TDesC8& aId, CBufBase& aResult );
-	MSmlDmAdapter::TError SetVersionL( const TDesC8& aId, const TDesC8& aVersion );
-
-	MSmlDmAdapter::TError GetActiveL( CBufBase& aResult );
-	MSmlDmAdapter::TError SetActiveL( const TDesC8& aId );
-
-	MSmlDmAdapter::TError SetInstallOptionsL( const TDesC8& aOptions );
-	MSmlDmAdapter::TError InstallL( const TDesC& aFileName );
-
-	MSmlDmAdapter::TError DeleteL( const TDesC8& aLUID );
-
-private:
-	CScreenSaverList( );
-	void ConstructL( );
-
-	void CheckUpdatesL();
-	void LoadL();
-	TBool LoadPluginsL( const TDesC& aPath );
-
-	CScreenSaverInfo* FindByIdL( const TDesC8& aId );
-	TPtrC8 ScreenSaverIdFromLUID( const TDesC8& aLUID );
-	void GetDefaultInstallOptions( SwiUI::TInstallOptions& aOptions );
-
-private:
-	TBool iDirty;
-    CArrayPtr< CScreenSaverInfo >* iScreenSavers;
-	SwiUI::TInstallOptions iInstallOptions;
-	};
-
-
-#endif // __ScreenSaverList_H__
--- a/customization/ScreenSaverAdapter/rom/ScreenSaverAdapter.iby	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of customization components
-*
-*/
-#ifndef __ScreenSaverAdapter_IBY__
-#define __ScreenSaverAdapter_IBY__
-
-//#ifdef __SAP_SCREENSAVER_ADAPTER
-
-S60_APP_EXE(ScreenSaverServer)
-file=ABI_DIR\BUILD_DIR\ScreenSaverClient.dll      											SHARED_LIB_DIR\ScreenSaverClient.dll
-ECOM_PLUGIN(ScreenSaverAdapter.dll, ScreenSaverAdapter.rsc)
-
-//#endif //__SAP_SCREENSAVER_ADAPTER
-
-#endif //__ScreenSaverAdapter_IBY__
--- a/customization/ScreenSaverAdapter/src/ScreenSaverAdapter.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1376 +0,0 @@
-/*
-* Copyright (c) 2002 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:  DM Screensaver Adapter
-*
-*/
-
-
-/*
-
-./Customization -+--> ScreenSaver --+--> AvailableScreenSavers --> <X> * ---+---> Data
-									|										|
-									|--> ActiveSc							|---> ID
-									 										|
-																			|---> Name
-																			|
-																			|---> Description
-																			|
-																			|---> CustomProperty
-																			|
-																			|---> Version
-																			|
-																			|---> InstallOptions
-
-*/
-
-
-
-#include <badesca.h>
-#include <implementationproxy.h> // For TImplementationProxy definition
-#include <sisregistrysession.h>
-#include <ScreensaverpluginIntDef.h>
-#include <mmfcontrollerpluginresolver.h> // For CleanupResetAndDestroyPushL
-
-//#ifdef __SAP_POLICY_MANAGEMENT
-#include <PolicyEngineXACML.h>
-//#endif
-
-#include "ScreenSaverAdapter.h"
-#include "ScreenSaverList.h"
-#include "nsmldmuri.h"
-#include "FileCoderB64.h"
-#include "debug.h"
-
-#include "ScreenSaverClient.h"
-#include "e32property.h"
-#include <ScreensaverInternalPSKeys.h>
-#include <featmgr.h>
-
-
-_LIT( KScreenSaverAdapterTmpInstallPath, "c:\\system\\temp\\DM_ScrSav.sisx" );
-const TInt KPostInstallTimeOut = 10000000; // 10 seconds
-_LIT8( KScreenSaverActiveRef, "Customization/ScreenSavers/AvailableScreenSavers/" );
-
-// ------------------------------------------------------------------------------------------------
-// CScreenSaverAdapter* CScreenSaverAdapter::NewL( )
-// ------------------------------------------------------------------------------------------------
-CScreenSaverAdapter* CScreenSaverAdapter::NewL(MSmlDmCallback* aDmCallback )
-	{
-	CScreenSaverAdapter* self = NewLC( aDmCallback );
-	CleanupStack::Pop();
-	return self;
-	}
-
-// ------------------------------------------------------------------------------------------------
-// CScreenSaverAdapter* CScreenSaverAdapter::NewLC( )
-// ------------------------------------------------------------------------------------------------
-CScreenSaverAdapter* CScreenSaverAdapter::NewLC(MSmlDmCallback* aDmCallback )
-	{
-	CScreenSaverAdapter* self = new (ELeave) CScreenSaverAdapter( aDmCallback );
-	CleanupStack::PushL( self );
-	self->ConstructL();
-	return self;
-	}
-
-
-// ------------------------------------------------------------------------------------------------
-// CScreenSaverAdapter::CScreenSaverAdapter()
-// ------------------------------------------------------------------------------------------------
-
-CScreenSaverAdapter::CScreenSaverAdapter( MSmlDmCallback* aDmCallback ) //: CSmlDmAdapter()
-	: CTARMDmAdapter( aDmCallback )
-	, iCallBack( aDmCallback )
-	, iScreenSavers( 0 )
-	{
-	}
-
-// ------------------------------------------------------------------------------------------------
-// CScreenSaverAdapter::ConstructL()
-// ------------------------------------------------------------------------------------------------
-void CScreenSaverAdapter::ConstructL( )
-	{
-	
-		TRAPD( errf, FeatureManager::InitializeLibL() );
-		if( errf != KErrNone )
-		{
-			User::Leave(errf);
-		}
-		if(FeatureManager::FeatureSupported(KFeatureIdSapScreensaverAdapter))
-		{
-			iScreenSavers = CScreenSaverList::NewL();
-			iScreensaverOff = EFalse;	
-		}
-		else
-		{
-			FeatureManager::UnInitializeLib();
-	   		User::Leave( KErrNotSupported );
-		}
-	}
-
-// ------------------------------------------------------------------------------------------------
-// CScreenSaverAdapter::~CScreenSaverAdapter()
-// ------------------------------------------------------------------------------------------------
-
-
-CScreenSaverAdapter::~CScreenSaverAdapter()
-	{
-	TInt error;
-	FeatureManager::UnInitializeLib();
-	if (iScreensaverOff)
-	{
-		
-		error = RProperty::Define(
-        KPSUidScreenSaver,
-        KScreenSaverAllowScreenSaver,
-        RProperty::EInt,
-        ECapabilityReadUserData,
-        ECapabilityWriteUserData);
-      if(error)  
-  		  RDEBUG_2("CScreenSaverInfo::KPSUidScreenSaver defined error %d",error);
-      		
-   		error=RProperty::Set(KPSUidScreenSaver,KScreenSaverAllowScreenSaver,KEnableScreensaver);
-   		if(error)
-   		  RDEBUG_2("CScreenSaverInfo::KPSUidScreenSaver while setting error %d",error);
-  	}
-
-  	
-  	RDEBUG_2("CScreenSaverInfo::KScreenSaverOn set to one error %d",error);	
-	delete iScreenSavers;
-	iScreenSavers = 0;
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  CScreenSaverAdapter::DDFVersionL()
-// ------------------------------------------------------------------------------------------------
-void CScreenSaverAdapter::DDFVersionL(CBufBase& aDDFVersion)
-	{
-	aDDFVersion.InsertL(0,KNSmlSCDDFVersion);
-	}
-
-
-// ------------------------------------------------------------------------------------------------
-//  CScreenSaverAdapter::DDFStructureL()
-//
-// ------------------------------------------------------------------------------------------------
-void CScreenSaverAdapter::DDFStructureL( MSmlDmDDFObject& aDDF )
-	{
-
-
-	TSmlDmAccessTypes accessTypesGet;
-	accessTypesGet.SetGet();
-
-	TSmlDmAccessTypes accessTypesAddGet;
-	accessTypesAddGet.SetAdd();
-	accessTypesAddGet.SetGet();
-
-	TSmlDmAccessTypes accessTypesGetReplace;
-	accessTypesGetReplace.SetGet();
-	accessTypesGetReplace.SetReplace();
-
-	TSmlDmAccessTypes accessTypesReplace;
-	accessTypesReplace.SetReplace();
-
-	TSmlDmAccessTypes accessTypesGetReplaceDelete;
-	accessTypesGetReplaceDelete.SetGet();
-	accessTypesGetReplaceDelete.SetReplace();
-	accessTypesGetReplaceDelete.SetDelete();
-//sf- For testing:
-	accessTypesGetReplaceDelete.SetAdd();
-//sf- For testing ends.
-
-	/*
-	Node: ./Customization
-	This interior node is the common parent to all customization..
-	Status: Required
-	Occurs: One
-	Format: Node
-	Access Types: Get
-	Values: N/A
-	*/
-	MSmlDmDDFObject& customization = aDDF.AddChildObjectL(KNSmlCustomizationNodeName);
-	FillNodeInfoL(customization, accessTypesGet, MSmlDmDDFObject::EOne, MSmlDmDDFObject::EPermanent,
-		MSmlDmDDFObject::ENode, KNSmlSCDescription);
-
-	/*
-	Node: ./Customization/ScreenSavers
-	ScreenSavers is a common parent node for nodes managing screen savers. .
-	Status: Required
-	Occurs: One
-	Format: Node
-	Access Types: Add,Get
-	Values: N/A
-	*/
-	MSmlDmDDFObject& screenSavers = customization.AddChildObjectL(KNSmlSCScreenSavers);
-	FillNodeInfoL(screenSavers, accessTypesGet, MSmlDmDDFObject::EOne, MSmlDmDDFObject::EPermanent,
-		MSmlDmDDFObject::ENode, KNSmlSCScreenSaversNodeDescription);
-
-	/*
-	Node: ./Customization/ScreenSavers/AvailableScreenSavers
-	This is parent node for currently existing screen savers..
-	Status: Required
-	Occurs: One
-	Format: Node
-	Access Types: Add, Get
-	Values: N/A
-	*/
-	MSmlDmDDFObject& availableScreenSavers = screenSavers.AddChildObjectL(KNSmlSCAvailableScreenSaversNodeName);
-	FillNodeInfoL(availableScreenSavers, accessTypesAddGet, MSmlDmDDFObject::EZeroOrMore, MSmlDmDDFObject::EDynamic,
-		MSmlDmDDFObject::ENode, KNSmlSCAvailableScreenSaversNodeDescription);
-
-	/*
-	Node: ./Customization/ScreenSavers/AvailableScreenSavers/<X>
-	This is a placeholder to screen saver ID identifying a screen saver.
-	Status: Required
-	Occurs: ZeroOrMore
-	Format: Node
-	Access Types: Get, Replace, Delete
-	Values: N/A
-	*/
-	MSmlDmDDFObject& dynNode = availableScreenSavers.AddChildObjectGroupL();
-	FillNodeInfoL(dynNode, accessTypesGetReplaceDelete, MSmlDmDDFObject::EZeroOrMore, MSmlDmDDFObject::EDynamic,
-		MSmlDmDDFObject::ENode, KNSmlSCDynamicDescription);
-
-	/*
-	Node: ./Customization/ScreenSavers/ActiveSc
-	This node is a link to the currently active screen saver.
-	Status: Required
-	Occurs: One
-	Format: Chr (reference to management tree)
-	Access Types: Get, Replace
-	Values: N/A
-	*/
-	MSmlDmDDFObject& activescNode = screenSavers.AddChildObjectL(KNSmlSCActiveScNodeName);
-	FillNodeInfoL(activescNode,accessTypesGetReplace,MSmlDmDDFObject::EOne,MSmlDmDDFObject::EPermanent,
-		MSmlDmDDFObject::EChr,KNSmlSCActiveScNodeDescription);
-
-	/*
-	Node: ./Customization/ScreenSavers/AvailableScreenSavers/<X>/Data
-	Replace command will install a screen saver that's in the data field of the command.
-	Status: Optional
-	Occurs: One
-	Format: bin
-	Access Types: Replace
-	Values: N/A
-	*/
-	MSmlDmDDFObject& data = dynNode.AddChildObjectL(KNSmlSCDataNodeName);
-	FillNodeInfoL(data, accessTypesReplace, MSmlDmDDFObject::EOne, MSmlDmDDFObject::EPermanent,
-		MSmlDmDDFObject::EBin, KNSmlSCDataNodeDescription);
-	data.AddDFTypeMimeTypeL( SwiUI::KSisxMimeType() );
-
-	/*
-	Node: ./Customization/ScreenSavers/AvailableScreenSavers/<X>/ID
-	This leaf node holds the ID of the screen saver
-	Status: Required
-	Occurs: One
-	Format: chr
-	Access Types: Get, Replace
-	Values: N/A
-	*/
-	MSmlDmDDFObject& idNode = dynNode.AddChildObjectL(KNSmlSCIDNodeName);
-	FillNodeInfoL(idNode,accessTypesGetReplace,MSmlDmDDFObject::EOne,MSmlDmDDFObject::EDynamic,
-		MSmlDmDDFObject::EChr,KNSmlSCIDNodeDescription);
-
-	/*
-	Node: ./Customization/ScreenSavers/AvailableScreenSavers/<X>/Name
-	This leaf node holds the name of the screen saver. 
-	Status: Optional
-	Occurs: One
-	Format: chr
-	Access Types: Get, Replace
-	Values: N/A
-	*/
-	MSmlDmDDFObject& nameNode = dynNode.AddChildObjectL(KNSmlSCNameNodeName);
-	FillNodeInfoL(nameNode,accessTypesGetReplace,MSmlDmDDFObject::EOne,MSmlDmDDFObject::EDynamic,
-		MSmlDmDDFObject::EChr,KNSmlSCNameNodeDescription);
-
-	/*
-	Node: ./Customization/ScreenSavers/AvailableScreenSavers/<X>/Description
-	This leaf node holds the description of the screen saver. 
-	Status: Optional
-	Occurs: One
-	Format: chr
-	Access Types: Get, Replace
-	Values: N/A
-	*/
-	MSmlDmDDFObject& descNode = dynNode.AddChildObjectL(KNSmlSCDescriptionNodeName);
-	FillNodeInfoL(descNode,accessTypesGetReplace,MSmlDmDDFObject::EOne,MSmlDmDDFObject::EDynamic,
-		MSmlDmDDFObject::EChr,KNSmlSCDescriptionNodeDescription);
-
-	/*
-	Node: ./Customization/ScreenSavers/AvailableScreenSavers/<X>/CustomProperty
-	This leaf node holds the custom property value of the screen saver. 
-	Status: Optional
-	Occurs: One
-	Format: chr
-	Access Types: Get, Replace
-	Values: N/A
-	*/
-	MSmlDmDDFObject& customNode = dynNode.AddChildObjectL(KNSmlSCCustomPropertyNodeName);
-	FillNodeInfoL(customNode,accessTypesGetReplace,MSmlDmDDFObject::EOne,MSmlDmDDFObject::EDynamic,
-		MSmlDmDDFObject::EChr,KNSmlSCCustomPropertyNodeDescription);
-
-	/*
-	Node: ./Customization/ScreenSavers/AvailableScreenSavers/<X>/Version
-	This leaf node holds the version of the screen saver. 
-	Status: Optional
-	Occurs: One
-	Format: chr
-	Access Types: Get, Replace
-	Values: N/A
-	*/
-	MSmlDmDDFObject& verNode = dynNode.AddChildObjectL(KNSmlSCVersionNodeName);
-	FillNodeInfoL(verNode,accessTypesGetReplace,MSmlDmDDFObject::EOne,MSmlDmDDFObject::EDynamic,
-		MSmlDmDDFObject::EChr,KNSmlSCVersionNodeDescription);
-
-	/*
-	Node: ./Customization/ScreenSavers/AvailableScreenSavers/<X>/InstallOptions
-	Holds the install options for next install. 
-	Status: Optional 
-	Occurs: One
-	Format: Chr
-	Access Types: Replace
-	Values: N/A
-	*/
-	MSmlDmDDFObject& installOptionsNode = dynNode.AddChildObjectL(KNSmlSCInstallOptionsNodeName);
-	FillNodeInfoL(installOptionsNode, accessTypesReplace, MSmlDmDDFObject::EOne, MSmlDmDDFObject::EPermanent,
-		MSmlDmDDFObject::EChr, KNSmlSCInstallOptionsNodeDescription);
-
-
-
-
-	}
-
-
-// ------------------------------------------------------------------------------------------------
-//  CScreenSaverAdapter::UpdateLeafObjectL()
-//  
-// ------------------------------------------------------------------------------------------------
-void CScreenSaverAdapter::_UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& /*aLUID*/, const TDesC8& aObject, const TDesC8& /*aType*/, const TInt aStatusRef )
-	{
-	RDEBUG("CScreenSaverAdapter::UpdateLeafObjectL(): begin");
-
-	TError ret = EOk ;
-	
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-	TPtrC8 uriPtrc = NSmlDmURI::RemoveDotSlash( aURI );
-	TNodeId nodeId = NodeId( uriPtrc );
-	TPtrC8 parentURI = NSmlDmURI::ParentURI( uriPtrc );
-#else
-	TNodeId nodeId = NodeId( aURI );
-	TPtrC8 parentURI = NSmlDmURI::ParentURI( aURI );
-#endif	
-	
-	TPtrC8 screenSaverId = NSmlDmURI::LastURISeg( parentURI );
-	HBufC8* parentLUID = iCallBack->GetLuidAllocL( parentURI );
-	CleanupStack::PushL( parentLUID );
-	
-	switch( nodeId )
-		{
-	case ENodeActiveSc:
-		{
-		TPtrC8 activeName = NSmlDmURI::LastURISeg( aObject );
-
-		HBufC8* fullName = HBufC8::NewLC( KScreenSaverActiveRef().Length() + activeName.Length() + 1 );
-		fullName->Des().Copy( KScreenSaverActiveRef );
-		fullName->Des().Append( activeName );
-		HBufC8* luid = iCallBack->GetLuidAllocL( *fullName );
-		CleanupStack::PushL( luid );
-
-		ret = iScreenSavers->SetActiveL( *luid  );
-		if( ret == MSmlDmAdapter::EOk )
-			{
-			iScreensaverOff = ETrue;
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-			iCallBack->SetMappingL( uriPtrc, *fullName );
-#else
-			iCallBack->SetMappingL( aURI, *fullName );
-#endif			
-			}
-		
-		CleanupStack::PopAndDestroy( luid );
-		CleanupStack::PopAndDestroy( fullName );
-		break;
-		}
-	case ENodeData:
-		{
-		RFs fs;
-		User::LeaveIfError( fs.Connect() );
-		CleanupClosePushL( fs );
-
-		TFileCoderB64 decoder;
-		TPtrC fileName( KScreenSaverAdapterTmpInstallPath );
-		TBool isEncoded = TFileCoderB64::CheckB64Encode( aObject );
-		if( isEncoded )
-			{
-			decoder.DecodeToL( aObject, fileName );
-			}
-		else
-			{
-			// aObject is original data, save it to fileName
-			RFile file;
-			User::LeaveIfError( file.Replace( fs, fileName, EFileWrite));
-			CleanupClosePushL( file );
-			User::LeaveIfError( file.Write( aObject ) );
-			
-			CleanupStack::PopAndDestroy(); // file
-			}		
-
-		// Get current status of installed packages and screen savers
-		RArray< TUid > oldPackages;
-		CleanupClosePushL( oldPackages );
-
-		RArray< TUid > newPackages;
-		CleanupClosePushL( newPackages );
-
-		CDesCArrayFlat* oldScreenSavers = new (ELeave) CDesCArrayFlat( 8 );
-		CleanupStack::PushL( oldScreenSavers );
-
-		CDesCArrayFlat* newScreenSavers = new (ELeave) CDesCArrayFlat( 8 );
-		CleanupStack::PushL( newScreenSavers );
-
-		InstalledPackagesL( oldPackages );
-		InstalledScreenSaversL( *oldScreenSavers );
-		
-		
-		  
-		User::ResetInactivityTime(); 	
-		TInt  error = RProperty::Define(
-        KPSUidScreenSaver,
-        KScreenSaverAllowScreenSaver,
-        RProperty::EInt,
-        ECapabilityReadUserData,
-        ECapabilityWriteUserData);
-        
-	 	error=RProperty::Set(KPSUidScreenSaver,KScreenSaverAllowScreenSaver,KDisableScreensaver);
-		iScreensaverOff = ETrue;
-		// Open ECom session and setup notifier
-		REComSession& ecom = REComSession::OpenL();
-		CleanupClosePushL( ecom );
-		TRequestStatus ecomStatus;
-
-		// Install screen saver
-		ret = iScreenSavers->InstallL( fileName );
-
-		ecom.NotifyOnChange( ecomStatus );
-
-		// Wait until ECom server finds new plugin
-		if (ret == EOk)
-			{
-			TRequestStatus timeoutStatus;
-			RTimer timeout;
-			User::LeaveIfError( timeout.CreateLocal() );
-			CleanupClosePushL( timeout );
-			timeout.After( timeoutStatus, KPostInstallTimeOut );
-
-			User::WaitForRequest( ecomStatus, timeoutStatus );
-
-			if( timeoutStatus.Int() == KRequestPending)
-				{
-				timeout.Cancel();
-				User::WaitForRequest( timeoutStatus );
-				}
-			CleanupStack::PopAndDestroy( &timeout );
-			}
-
-		// Close ECom session
-		if (ecomStatus.Int() == KRequestPending)
-			{
-			ecom.CancelNotifyOnChange( ecomStatus );
-			User::WaitForRequest( ecomStatus );
-			}
-		CleanupStack::PopAndDestroy( &ecom );
-			
-		// Find out which package and screen savers where installed
-		InstalledPackagesL( newPackages );
-		InstalledScreenSaversL( *newScreenSavers );
-
-		TInt count = 0;
-		TInt i = 0;
-
-		count = oldPackages.Count();
-		for (i = 0 ; i < count ; i++)
-			{
-			TInt idx = newPackages.FindInSignedKeyOrder( oldPackages[ i ] );
-			if (idx >= 0)
-				{
-				newPackages.Remove( idx );
-				}
-			}
-
-		count = oldScreenSavers->Count();
-		for (i = 0 ; i < count ; i++)
-			{
-			TInt idx = 0;
-			TInt err = newScreenSavers->Find( (*oldScreenSavers)[ i ], idx );
-			if (err == 0)
-				{
-				newScreenSavers->Delete( idx );
-				}
-			}
-
-		RDEBUG_3("newPackages.Count() (%d) newScreenSavers->Count() (%d)", newPackages.Count(), newScreenSavers->Count());
-
-		// Save package uid to DMTree with LUID mapping
-		// We can handle only situation where only one new package is found.
-		if (newPackages.Count() == 1 && newScreenSavers->Count() > 0)
-			{
-			TUid pkgUid = newPackages[ 0 ];
-
-			HBufC8* luid = HBufC8::NewL( KMaxUidName + 1 + (*newScreenSavers)[0].Length() );
-			CleanupStack::PushL( luid );
-			TPtr8 luidPtr = luid->Des();
-			luidPtr.Copy( pkgUid.Name() );
-			luidPtr.Append( KPkgId_ScrId_Separator );
-			luidPtr.Append( (*newScreenSavers)[0] );
-			
-			RDEBUG8_2("CScreenSaverAdapter::UpdateLeafObjectL() Luid for new screensaver (%S)", &luidPtr);
-			iCallBack->SetMappingL( parentURI, *luid );
-
-			CleanupStack::PopAndDestroy( luid );
-			}
-		else
-			{
-			ret = EError;
-			}
-			
-		// Remove temporary installations file
-		fs.Delete( fileName );
-
-		// Cleanup
-		CleanupStack::PopAndDestroy( newScreenSavers );
-		CleanupStack::PopAndDestroy( oldScreenSavers );
-		CleanupStack::PopAndDestroy( &newPackages );
-		CleanupStack::PopAndDestroy( &oldPackages );
-		CleanupStack::PopAndDestroy( &fs );
-		}
-		break;
-
-	case ENodeInstallOptions:
-		ret = iScreenSavers->SetInstallOptionsL( aObject );
-		break;
-
-	case ENodeName:
-		if (aObject.Length() > 0)
-			{
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-			iCallBack->SetMappingL( uriPtrc, aObject );
-#else			
-			iCallBack->SetMappingL( aURI, aObject );
-#endif			
-			}
-		else
-			{
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-			iCallBack->SetMappingL( uriPtrc, _L8(" ") );
-#else			
-			iCallBack->SetMappingL( aURI, _L8(" ") );
-#endif			
-			
-			}
-
-		if (parentLUID->Length() > 1)
-			{
-			screenSaverId.Set( *parentLUID );
-			ret = iScreenSavers->SetNameL( screenSaverId, aObject );
-			}
-		else
-			{
-			ret = EError;
-			}
-		break;
-
-	case ENodeDescription:
-		if (aObject.Length() > 0)
-			{
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-			iCallBack->SetMappingL( uriPtrc, aObject );
-#else			
-			iCallBack->SetMappingL( aURI, aObject );
-#endif	
-			}
-		else
-			{
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-			iCallBack->SetMappingL( uriPtrc, _L8(" ") );
-#else			
-			iCallBack->SetMappingL( aURI, _L8(" ") );
-#endif		
-			}
-
-		if (parentLUID->Length() > 1)
-			{
-			screenSaverId.Set( *parentLUID );
-			ret = iScreenSavers->SetDescriptionL( screenSaverId, aObject );
-			}
-		else
-			{
-			ret = EError;
-			}
-		
-		break;
-
-	case ENodeCustomProperty:
-		if (aObject.Length() > 0)
-			{
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-			iCallBack->SetMappingL( uriPtrc, aObject );
-#else			
-			iCallBack->SetMappingL( aURI, aObject );
-#endif
-			}
-		else
-			{
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-			iCallBack->SetMappingL( uriPtrc, _L8(" ") );
-#else			
-			iCallBack->SetMappingL( aURI, _L8(" ") );
-#endif	
-			}
-
-		if (parentLUID->Length() > 1)
-			{
-			screenSaverId.Set( *parentLUID );
-			ret = iScreenSavers->SetCustomPropertyL( screenSaverId, aObject );
-			}
-		else
-			{
-			ret = EError;
-			}
-		
-		break;
-
-	case ENodeVersion:
-		if (aObject.Length() > 0)
-			{
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-			iCallBack->SetMappingL( uriPtrc, aObject );
-#else			
-			iCallBack->SetMappingL( aURI, aObject );
-#endif
-			}
-		else
-			{
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-			iCallBack->SetMappingL( uriPtrc, _L8(" ") );
-#else			
-			iCallBack->SetMappingL( aURI, _L8(" ") );
-#endif
-			}
-
-		if (parentLUID->Length() > 1)
-			{
-			screenSaverId.Set( *parentLUID );
-			ret = iScreenSavers->SetVersionL( screenSaverId, aObject );
-			}
-		else
-			{
-			ret = EError;
-			}
-		
-		break;
-
-	case ENodeUnknown:
-		ret = ENotFound;
-		break;
-
-	default:
-		ret = EError;
-		break;
-		}
-
-	CleanupStack::PopAndDestroy( parentLUID );
-
-	iCallBack->SetStatusL( aStatusRef, ret );
-	RDEBUG("CScreenSaverAdapter::UpdateLeafObjectL(): end");
-	}
-
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-void CScreenSaverAdapter::_UpdateLeafObjectL( const TDesC8& /*aURI*/, const TDesC8& /*aLUID*/, RWriteStream*& /*aStream*/, const TDesC8& /*aType*/, TInt aStatusRef )
-	{
-	RDEBUG( "CScreenSaverAdapter::UpdateLeafObjectL(...RWriteStream...): begin" );
-	//Not supported
-	TError ret = EError;
-	iCallBack->SetStatusL( aStatusRef, ret );
-	}
-
-
-// ------------------------------------------------------------------------------------------------
-// CScreenSaverAdapter::DeleteObjectL( const TDesC& aURI, const TDesC& aLUID )
-// ------------------------------------------------------------------------------------------------
-void CScreenSaverAdapter::_DeleteObjectL( const TDesC8& aURI, const TDesC8& aLUID, const TInt aStatusRef )
-	{
-	RDEBUG( "CScreenSaverAdapter::DeleteObjectL(): begin" );
-	TError ret = EOk ;
-	
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-	TPtrC8 uriPtrc = NSmlDmURI::RemoveDotSlash( aURI );
-	TNodeId nodeId = NodeId( uriPtrc );
-	TPtrC8 screenSaverId = NSmlDmURI::LastURISeg( uriPtrc );
-#else
-	TNodeId nodeId = NodeId( aURI );
-	TPtrC8 screenSaverId = NSmlDmURI::LastURISeg( aURI );
-#endif	
-
-	switch( nodeId )
-		{
-	case ENodeAvailableScreenSaversX:
-		{
-#ifdef __TARM_SYMBIAN_CONVERGENCY	
-		TPtrC8 parentURI = NSmlDmURI::ParentURI( uriPtrc );
-#else	
-		TPtrC8 parentURI = NSmlDmURI::ParentURI( aURI );
-#endif	
-		HBufC8* parentLUID = iCallBack->GetLuidAllocL( parentURI );
-		CleanupStack::PushL( parentLUID );
-
-		// Set default return code to ENotFound in case we can't event try to delete package
-		ret = ENotFound;
-
-		if (aLUID != *parentLUID)
-			{
-			ret = iScreenSavers->DeleteL( aLUID );
-			}
-
-		CleanupStack::PopAndDestroy( parentLUID );
-		}
-		break;
-
-	case ENodeUnknown:
-		ret = ENotFound;
-		break;
-
-	default:
-		ret = EError;
-		break;
-		}
-
-	iCallBack->SetStatusL( aStatusRef, ret );
-	RDEBUG( "CScreenSaverAdapter::DeleteObjectL(): end" );
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  CScreenSaverAdapter::GetLeafObjectL()
-// ------------------------------------------------------------------------------------------------
-void CScreenSaverAdapter::GetLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, const TDesC8& /*aType*/, CBufBase& aResult, TError& aRet )
-	{	
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-	TPtrC8 uriPtrc = NSmlDmURI::RemoveDotSlash( aURI );
-	TNodeId nodeId = NodeId( uriPtrc );
-	TPtrC8 parentURI = NSmlDmURI::ParentURI( uriPtrc );
-#else
-	TNodeId nodeId = NodeId( aURI );
-	TPtrC8 parentURI = NSmlDmURI::ParentURI( aURI );
-#endif		
-	
-	TPtrC8 screenSaverId = NSmlDmURI::LastURISeg( parentURI );
-
-	HBufC8* parentLUID = iCallBack->GetLuidAllocL( parentURI );
-	CleanupStack::PushL( parentLUID );
-
-	HBufC8* trimmedLUID = aLUID.AllocL();
-	CleanupStack::PushL( trimmedLUID );
-	trimmedLUID->Des().Trim();
-
-	switch( nodeId )
-		{
-	case ENodeActiveSc:
-		{
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-		HBufC8* luid = iCallBack->GetLuidAllocL( uriPtrc );
-#else
-		HBufC8* luid = iCallBack->GetLuidAllocL( aURI );
-#endif		
-		CleanupStack::PushL( luid );
-		aResult.InsertL( aResult.Size(), *luid );
-		CleanupStack::PopAndDestroy( luid );
-		}
-		break;
-
-	case ENodeID:
-		{
-		if (parentLUID->Length() > 1)
-			{
-			screenSaverId.Set( *parentLUID );
-			}
-		aRet = iScreenSavers->GetIdL( screenSaverId, aResult );
-		}
-		break;
-
-	case ENodeName:
-		if ( trimmedLUID->Length() > 0 && *trimmedLUID != *parentLUID)
-			{
-			aResult.InsertL( aResult.Size(), aLUID );
-			}
-		else
-			{
-			if (parentLUID->Length() > 1)
-				{
-				screenSaverId.Set( *parentLUID );
-				}
-			aRet = iScreenSavers->GetNameL( screenSaverId, aResult );
-			}
-		break;
-
-	case ENodeDescription:
-		if ( trimmedLUID->Length() > 0 && *trimmedLUID != *parentLUID)
-			{
-			aResult.InsertL( aResult.Size(), aLUID );
-			}
-		else
-			{
-			if (parentLUID->Length() > 1)
-				{
-				screenSaverId.Set( *parentLUID );
-				}
-			aRet = iScreenSavers->GetDescriptionL( screenSaverId, aResult );
-			}
-		break;
-
-	case ENodeCustomProperty:
-		if ( trimmedLUID->Length() > 0 && *trimmedLUID != *parentLUID)
-			{
-			aResult.InsertL( aResult.Size(), aLUID );
-			}
-		else
-			{
-			if (parentLUID->Length() > 1)
-				{
-				screenSaverId.Set( *parentLUID );
-				}
-			aRet = iScreenSavers->GetCustomPropertyL( screenSaverId, aResult );
-			}
-		break;
-
-	case ENodeVersion:
-		if ( trimmedLUID->Length() > 0 && *trimmedLUID != *parentLUID)
-			{
-			aResult.InsertL( aResult.Size(), aLUID );
-			}
-		else
-			{
-			if (parentLUID->Length() > 1)
-				{
-				screenSaverId.Set( *parentLUID );
-				}
-			aRet = iScreenSavers->GetVersionL( screenSaverId, aResult );
-			}
-		break;
-
-	case ENodeUnknown:
-		aRet = ENotFound;
-		break;
-
-	default:
-		aRet = EError;
-		break;
-		}
-
-	CleanupStack::PopAndDestroy( trimmedLUID );
-	CleanupStack::PopAndDestroy( parentLUID );
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  CScreenSaverAdapter::FetchLeafObjectL( const TDesC& aURI, const TDesC& aLUID, const TDesC& aType, CBufBase& aObject )
-// ------------------------------------------------------------------------------------------------
-void CScreenSaverAdapter::_FetchLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, const TDesC8& aType, const TInt aResultsRef, const TInt aStatusRef )
-	{
-	RDEBUG("CScreenSaverAdapter::FetchLeafObjectL(): begin");
-	TError ret = EOk ;
-
-	CBufBase *result = CBufFlat::NewL( 128 );
-	CleanupStack::PushL( result );
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-	TPtrC8 uriPtrc = NSmlDmURI::RemoveDotSlash( aURI );
-	GetLeafObjectL( uriPtrc, aLUID, aType, *result, ret );
-#else
-	GetLeafObjectL( aURI, aLUID, aType, *result, ret );
-#endif
-
-	if( ret == EOk )
-		{
-		iCallBack->SetResultsL( aResultsRef, *result, KNullDesC8 );
-		}
-
-	iCallBack->SetStatusL( aStatusRef, ret );
-
-	CleanupStack::PopAndDestroy( result );
-	RDEBUG("CScreenSaverAdapter::FetchLeafObjectL(): end");
-	}
-
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-void CScreenSaverAdapter::_FetchLeafObjectSizeL( const TDesC8& aURI, const TDesC8& aLUID, const TDesC8& aType, TInt aResultsRef, TInt aStatusRef )
-	{
-	RDEBUG("CScreenSaverAdapter::FetchLeafObjectSizeL(): begin");
-	TError ret = EOk ;
-
-	CBufBase *result = CBufFlat::NewL( 128 );
-	CleanupStack::PushL( result );
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-	TPtrC8 uriPtrc = NSmlDmURI::RemoveDotSlash( aURI );
-	GetLeafObjectL( uriPtrc, aLUID, aType, *result, ret );
-#else
-	GetLeafObjectL( aURI, aLUID, aType, *result, ret );
-#endif
-
-	if (ret == EOk)
-		{
-		TBuf8<20> len;
-		len.AppendNum( result->Size() );
-		result->Reset();
-		result->InsertL( 0, len );
-
-		iCallBack->SetResultsL( aResultsRef, *result, KNullDesC8() );
-		}
-
-	iCallBack->SetStatusL( aStatusRef, ret );
-
-	CleanupStack::PopAndDestroy( result );
-	RDEBUG("CScreenSaverAdapter::FetchLeafObjectSizeL(): end");
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  CScreenSaverAdapter::ChildURIListL( const TDesC& aURI, const TDesC& aParentLUID, const CArrayFix<TNSmlDmMappingInfo>& aPreviousURISegmentList, CArrayFix<TPtrC>& aCurrentURISegmentList )
-// ------------------------------------------------------------------------------------------------
-void CScreenSaverAdapter::_ChildURIListL( const TDesC8& aURI, const TDesC8& /*aParentLUID*/, const CArrayFix<TSmlDmMappingInfo>& aPreviousURISegmentList, const TInt aResultsRef, const TInt aStatusRef )
-	{
-	RDEBUG("CScreenSaverAdapter::ChildURIListL(): begin");
-	TError ret = EOk;
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-	TPtrC8 uriPtrc = NSmlDmURI::RemoveDotSlash( aURI );
-	TNodeId nodeId = NodeId( uriPtrc );
-#else
-	TNodeId nodeId = NodeId( aURI );
-#endif	
-
-	CBufBase *result = CBufFlat::NewL( 128 );
-	CleanupStack::PushL( result );
-
-	switch( nodeId )
-		{
-	case ENodeCustomization:
-		result->InsertL( result->Size(), KNSmlSCScreenSavers() );
-		break;
-	case ENodeScreenSavers:
-		result->InsertL( result->Size(), KNSmlSCAvailableScreenSaversNodeName() );
-		result->InsertL( result->Size(), KSlash() );
-		result->InsertL( result->Size(), KNSmlSCActiveScNodeName() );
-		break;
-	case ENodeAvailableScreenSavers:
-		ret = iScreenSavers->GetScreenSaverListL( aPreviousURISegmentList, *result );
-		break;
-	case ENodeActiveSc:
-		break;
-	case ENodeInstallOptions:
-		break;
-	case ENodeAvailableScreenSaversX:
-		result->InsertL( result->Size(), KNSmlSCDataNodeName() );
-		result->InsertL( result->Size(), KSlash() );
-		result->InsertL( result->Size(), KNSmlSCIDNodeName() );
-		result->InsertL( result->Size(), KSlash() );
-		result->InsertL( result->Size(), KNSmlSCNameNodeName() );
-		result->InsertL( result->Size(), KSlash() );
-		result->InsertL( result->Size(), KNSmlSCDescriptionNodeName() );
-		result->InsertL( result->Size(), KSlash() );
-		result->InsertL( result->Size(), KNSmlSCCustomPropertyNodeName() );
-		result->InsertL( result->Size(), KSlash() );
-		result->InsertL( result->Size(), KNSmlSCVersionNodeName() );
-		result->InsertL( result->Size(), KSlash() );
-		result->InsertL( result->Size(), KNSmlSCInstallOptionsNodeName() );
-		break;
-	case ENodeData:
-		break;
-	case ENodeID:
-		break;
-	case ENodeName:
-		break;
-	case ENodeDescription:
-		break;
-	case ENodeCustomProperty:
-		break;
-	case ENodeVersion:
-		break;
-
-	case ENodeUnknown:
-		ret = ENotFound;
-		break;
-
-	default:
-		ret = EError;
-		break;
-		}
-
-	if( ret == EOk )
-		{
-		iCallBack->SetResultsL( aResultsRef, *result, KNullDesC8 );
-		}
-
-	iCallBack->SetStatusL( aStatusRef, ret );
-
-	CleanupStack::PopAndDestroy( result );
-	RDEBUG("CScreenSaverAdapter::ChildURIListL(): end");
-	}
-
-
-// ------------------------------------------------------------------------------------------------
-// CScreenSaverAdapter::AddNodeObjectL( const TDesC& aURI, const TDesC& aParentLUID )
-// ------------------------------------------------------------------------------------------------
-void CScreenSaverAdapter::_AddNodeObjectL( const TDesC8& aURI, const TDesC8& /*aParentLUID*/, const TInt aStatusRef )
-	{
-	RDEBUG("CScreenSaverAdapter::AddNodeObjectL(): begin");
-	TError ret = EOk ;
-	
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-	TPtrC8 uriPtrc = NSmlDmURI::RemoveDotSlash( aURI );
-	TPtrC8 parentURI = NSmlDmURI::ParentURI( uriPtrc );
-#else
-	TPtrC8 parentURI = NSmlDmURI::ParentURI( aURI );
-#endif	
-
-	TNodeId parentNodeId = NodeId( parentURI );
-
-	
-	HBufC8* parentLUID = iCallBack->GetLuidAllocL( parentURI );
-	CleanupStack::PushL( parentLUID );
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-	HBufC8* trimmedLUID = iCallBack->GetLuidAllocL( uriPtrc );
-#else
-	HBufC8* trimmedLUID = iCallBack->GetLuidAllocL( aURI );
-#endif
-	
-	CleanupStack::PushL( trimmedLUID );
-	trimmedLUID->Des().Trim();
-
-
-	switch( parentNodeId )
-		{
-	case ENodeAvailableScreenSavers:
-		// Set LUID mapping to make this new node permanent
-		if ( trimmedLUID->Length() > 0 && *trimmedLUID != *parentLUID)
-			{
-			ret = EAlreadyExists;
-			}
-		else
-			{
-#ifdef __TARM_SYMBIAN_CONVERGENCY			
-			iCallBack->SetMappingL( uriPtrc, _L8(" ") );
-#else
-			iCallBack->SetMappingL( aURI, _L8(" ") );			
-#endif			
-			}
-		break;
-
-	default:
-		ret = EError;
-		break;
-		}
-
-	// Cleanup
-	CleanupStack::Pop( trimmedLUID );
-	CleanupStack::Pop( parentLUID );
-
-	iCallBack->SetStatusL( aStatusRef, ret );
-	RDEBUG("CScreenSaverAdapter::AddNodeObjectL(): end");
-	}
-
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-void CScreenSaverAdapter::_ExecuteCommandL( const TDesC8& /*aURI*/, const TDesC8& /*aLUID*/, const TDesC8& /*aArgument*/, const TDesC8& /*aType*/, TInt aStatusRef )
-	{
-	RDEBUG("CScreenSaverAdapter::ExecuteCommandL(): begin");
-	// Not supported for any node
-	CSmlDmAdapter::TError ret = CSmlDmAdapter::EError;
-	iCallBack->SetStatusL(aStatusRef, ret);
-	RDEBUG("CScreenSaverAdapter::ExecuteCommandL(): end");
-	}
-
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-void CScreenSaverAdapter::_ExecuteCommandL( const TDesC8& /*aURI*/, const TDesC8& /*aLUID*/, RWriteStream*& /*aStream*/, const TDesC8& /*aType*/, TInt aStatusRef )
-	{
-	RDEBUG("CScreenSaverAdapter::ExecuteCommandL(...RWriteStream...): begin");
-	//Not supported
-	TError ret = EError;
-	iCallBack->SetStatusL( aStatusRef, ret );
-	}
-	
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-void CScreenSaverAdapter::_CopyCommandL( const TDesC8& /*aTargetURI*/, const TDesC8& /*aTargetLUID*/, const TDesC8& /*aSourceURI*/, const TDesC8& /*aSourceLUID*/, const TDesC8& /*aType*/, TInt aStatusRef )
-	{
-	RDEBUG("CScreenSaverAdapter::CopyCommandL(): begin");
-	//Not supported
-	TError ret = EError;
-	iCallBack->SetStatusL( aStatusRef, ret );
-	}
-
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-void CScreenSaverAdapter::StartAtomicL()
-	{
-	RDEBUG("CScreenSaverAdapter::StartAtomicL(): begin");
-	//Not supported
-	}
-
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-void CScreenSaverAdapter::CommitAtomicL()
-	{
-	RDEBUG("CScreenSaverAdapter::CommitAtomicL(): begin");
-	//Not supported
-	}
-
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-void CScreenSaverAdapter::RollbackAtomicL()
-	{
-	RDEBUG("CScreenSaverAdapter::RollbackAtomicL(): begin");
-	//Not supported
-	}
-
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-TBool CScreenSaverAdapter::StreamingSupport( TInt& /*aItemSize*/ )
-	{
-	RDEBUG("CScreenSaverAdapter::StreamingSupport(): begin");
-	return EFalse;
-	}
-
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-#ifdef __TARM_SYMBIAN_CONVERGENCY	
-void CScreenSaverAdapter::StreamCommittedL( RWriteStream& /*aStream*/ )
-#else
-void CScreenSaverAdapter::StreamCommittedL()
-#endif	
-	{	
-	RDEBUG("CScreenSaverAdapter::StreamCommittedL(): begin");
-	RDEBUG("CScreenSaverAdapter::StreamCommittedL(): end");
-	}
-
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-void CScreenSaverAdapter::CompleteOutstandingCmdsL()
-	{
-	RDEBUG("CScreenSaverAdapter::CompleteOutstandingCmdsL(): begin");
-	}
-
-// -----------------------------------------------------------------------------
-// 
-// -----------------------------------------------------------------------------
-//
-//#ifdef __SAP_POLICY_MANAGEMENT
-TPtrC8 CScreenSaverAdapter::PolicyRequestResourceL( const TDesC8& /*aURI*/ )
-	{
-	if(!FeatureManager::FeatureSupported(KFeatureIdSapPolicyManagement ))
-	{
-		User::Leave(KErrNotSupported);
-		
-	}
-		return PolicyEngineXACML::KCustomizationManagement();	
-	}
-//#endif
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-CScreenSaverAdapter::TNodeId CScreenSaverAdapter::NodeId( const TDesC8& aURI )
-	{
-	TNodeId id = ENodeUnknown;
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-	TPtrC8 uriPtrc = NSmlDmURI::RemoveDotSlash( aURI );
-	TInt cnt = NSmlDmURI::NumOfURISegs( uriPtrc );
-	TPtrC8 app = NSmlDmURI::LastURISeg( uriPtrc );
-#else
-	TInt cnt = NSmlDmURI::NumOfURISegs( aURI );
-	TPtrC8 app = NSmlDmURI::LastURISeg( aURI );
-#endif
-
-/*
-./Customization -+--> ScreenSaver --+----> CurrentScreenSavers --> <X> * ---+-----> ID
-									|										|
-									|----> ActiveSc							|-----> Name
-									|										|
-									|----> InstallScreenSaver				|-----> Description
-									|										|
-									|----> InstallOptions					|-----> CustomProperty
-																			|
-																			|-----> Version
-																																
-*/
-
-	if ( cnt == 1 )
-		{
-		if (app == KNSmlCustomizationNodeName)
-			{
-			id = ENodeCustomization;
-			}
-		}
-	else if ( cnt == 2 ) 
-		{
-		if (app == KNSmlSCScreenSavers)
-			{
-			id = ENodeScreenSavers;
-			}
-		}
-	else if ( cnt == 3 ) 
-		{
-		if (app == KNSmlSCAvailableScreenSaversNodeName)
-			{
-			id = ENodeAvailableScreenSavers;
-			}
-		else if (app == KNSmlSCActiveScNodeName)
-			{
-			id = ENodeActiveSc;
-			}
-		}
-	else if ( cnt == 4 ) 
-		{
-		id = ENodeAvailableScreenSaversX;
-		}
-	else if ( cnt == 5 ) 
-		{
-		if (app == KNSmlSCDataNodeName)
-			{
-			id = ENodeData;
-			}
-		else if (app == KNSmlSCIDNodeName)
-			{
-			id = ENodeID;
-			}
-		else if (app == KNSmlSCNameNodeName)
-			{
-			id = ENodeName;
-			}
-		else if (app == KNSmlSCDescriptionNodeName)
-			{
-			id = ENodeDescription;
-			}
-		else if (app == KNSmlSCCustomPropertyNodeName)
-			{
-			id = ENodeCustomProperty;
-			}
-		else if (app == KNSmlSCVersionNodeName)
-			{
-			id = ENodeVersion;
-			}
-		else if (app == KNSmlSCInstallOptionsNodeName)
-			{
-			id = ENodeInstallOptions;
-			}
-		}
-
-	return id;
-	}
-
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-const TImplementationProxy ImplementationTable[] = 
-	{
-	{ {KNSmlDMScreenSaverAdapterImplUid}, (TProxyNewLPtr)CScreenSaverAdapter::NewL }
-	};
-
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy( TInt& aTableCount )
-	{
-	aTableCount = sizeof(ImplementationTable) / sizeof(TImplementationProxy);
-	return ImplementationTable;
-	}
-
-// -------------------------------------------------------------------------------------
-// CScreenSaverAdapter::FillNodeInfoL()
-// Fills the node info in ddf structure
-// -------------------------------------------------------------------------------------
-void CScreenSaverAdapter::FillNodeInfoL( MSmlDmDDFObject& aNode,TSmlDmAccessTypes aAccTypes,
-										MSmlDmDDFObject::TOccurence aOccurrence, MSmlDmDDFObject::TScope aScope, 
-										MSmlDmDDFObject::TDFFormat aFormat,const TDesC8& aDescription )
-	{
-	aNode.SetAccessTypesL(aAccTypes);
-	aNode.SetOccurenceL(aOccurrence);
-	aNode.SetScopeL(aScope);
-	aNode.SetDFFormatL(aFormat);
-	if(aFormat!=MSmlDmDDFObject::ENode)
-		{
-		aNode.AddDFTypeMimeTypeL(KNSmlSCTextPlain);
-		}
-	aNode.SetDescriptionL(aDescription);
-	}
-
-// -------------------------------------------------------------------------------------
-// CScreenSaverAdapter::IsImage()
-// Checks whether the given mime type is image format (that we support)
-// -------------------------------------------------------------------------------------
-TBool CScreenSaverAdapter::IsImage(const TDesC8& aMime) 
-	{
-	
-	if (aMime == _L8("image/jpeg") || aMime == _L8("image/gif")) 
-		{
-			return ETrue;
-		}
-	return EFalse;
-	}
-
-// -------------------------------------------------------------------------------------
-// CScreenSaverAdapter::
-// -------------------------------------------------------------------------------------
-void CScreenSaverAdapter::InstalledPackagesL( RArray< TUid >& aUids )
-	{
-	Swi::RSisRegistrySession reg;
-	User::LeaveIfError( reg.Connect() );
-	CleanupClosePushL( reg );
-
-	reg.InstalledUidsL( aUids );
-	aUids.SortSigned( );
-
-	CleanupStack::PopAndDestroy( &reg );
-	}
-
-
-
-// -------------------------------------------------------------------------------------
-// CScreenSaverAdapter::
-// -------------------------------------------------------------------------------------
-void CScreenSaverAdapter::InstalledScreenSaversL( CDesCArray& aIds )
-	{
-	RDEBUG("	-> CScreenSaverAdapter: GetScreenSaverList ... START!");
-	
-	RScreenSaverClient ssClient;
-	User::LeaveIfError( ssClient.Connect() );
-	CleanupClosePushL( ssClient );
-	ssClient.GetScreenSaverListL(aIds );
-	CleanupStack::PopAndDestroy( &ssClient );
-	
-	RDEBUG("	-> CScreenSaverAdapter: GetScreenSaverList ... END!");
-	}
-
-
--- a/customization/ScreenSaverAdapter/src/ScreenSaverAdapter.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-/*
-* Copyright (c) 2002 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: 
-*       Registery info for DM Screensaver Settings.
-*
-*/
-
-
-#include <registryinfo.rh>
-#define KSmlDMInterfaceUid 0x102018B4
-
-RESOURCE REGISTRY_INFO theRegistryInfo
-  {
-  dll_uid = 0x1020782D; //The DLL's 3rd UID.
-  interfaces = 
-      {
-      INTERFACE_INFO
-          {
-          interface_uid = KSmlDMInterfaceUid; // DM interface UID
-          implementations = 
-            {
-            IMPLEMENTATION_INFO
-                {
-                implementation_uid = 0x1020782E; // DM Startup implementation UID
-                version_no = 1; 
-                display_name = "DM Screensaver Adapter";
-                default_data = "";
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-                opaque_data = "host=0x101F9A02";
-#else
-								opaque_data = "";
-#endif
-                }
-            };
-          }
-      };
-    }
--- a/customization/ScreenSaverAdapter/src/ScreenSaverList.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,943 +0,0 @@
-/*
-* Copyright (c) 2002 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:  DM ScreenSaver List
-*
-*/
-
-
-#include "ScreenSaverList.h"
-
-#include <implementationproxy.h> // For TImplementationProxy definition
-#include <e32def.h>
-#include <centralrepository.h>
-#include <ScreensaverpluginIntDef.h>
-#include <mmfcontrollerpluginresolver.h> // For CleanupResetAndDestroyPushL
-#include "aminstalloptions.h"
-#include <ScreensaverInternalCRKeys.h>
-#include <ScreensaverInternalPSKeys.h>
-#include "debug.h"
-#include "ScreenSaverClient.h"
-#include <e32property.h>
-_LIT8( KSlash, "/" );
-#include <e32cmn.h>
-_LIT( KPslnScreenSaverTypeDateTime, "DateTime" );
-_LIT( KPslnScreenSaverTypeText, "Text" );
-
-const TInt KPslnMaxNumberOfScreenSaverText  = 15;
-const TInt KPostTimeOut = 10000000; // 10 seconds
-
-// ------------------------------------------------------------------------------------------------
-// CScreenSaverList* CScreenSaverList::NewL( )
-// ------------------------------------------------------------------------------------------------
-CScreenSaverList* CScreenSaverList::NewL( )
-	{
-	RDEBUG("CScreenSaverList::NewL(): begin");
-
-	CScreenSaverList* self = NewLC( );
-	CleanupStack::Pop();
-	return self;
-	}
-
-// ------------------------------------------------------------------------------------------------
-// CScreenSaverList* CScreenSaverList::NewLC( )
-// ------------------------------------------------------------------------------------------------
-CScreenSaverList* CScreenSaverList::NewLC( )
-	{
-	CScreenSaverList* self = new( ELeave ) CScreenSaverList( );
-	CleanupStack::PushL( self );
-	self->ConstructL( );
-	return self;
-	}
-
-
-// ------------------------------------------------------------------------------------------------
-// CScreenSaverList::CScreenSaverList()
-// ------------------------------------------------------------------------------------------------
-CScreenSaverList::CScreenSaverList(  )
-	: iDirty( ETrue )
-    , iScreenSavers( 0 )
-	, iInstallOptions()
-	{
-	GetDefaultInstallOptions( iInstallOptions );
-	}
-
-// ------------------------------------------------------------------------------------------------
-// CScreenSaverList::ConstructL()
-// ------------------------------------------------------------------------------------------------
-void CScreenSaverList::ConstructL(  )
-	{
-	}
-
-// ------------------------------------------------------------------------------------------------
-// CScreenSaverList::~CScreenSaverList()
-// ------------------------------------------------------------------------------------------------
-CScreenSaverList::~CScreenSaverList()
-	{
-	if (iScreenSavers)
-		{
-		iScreenSavers->ResetAndDestroy();
-		delete iScreenSavers;
-		}
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  CScreenSaverList::GetScreenSaverListL()
-// ------------------------------------------------------------------------------------------------
-MSmlDmAdapter::TError CScreenSaverList::GetScreenSaverListL( const CArrayFix<TSmlDmMappingInfo>& aPreviousList, CBufBase& aList )
-	{
-	CheckUpdatesL();
-
-	CDesC8ArrayFlat* names = new (ELeave) CDesC8ArrayFlat( 32 );
-	CleanupStack::PushL( names );
-
-	CDesC8ArrayFlat* luids = new (ELeave) CDesC8ArrayFlat( 32 );
-	CleanupStack::PushL( luids );
-
-	TInt i = 0;
-
-	// Create list of previous screen savers
-	for (i = 0 ; i < aPreviousList.Count() ; i++)
-		{
-		TPtrC8 screenSaverId = ScreenSaverIdFromLUID( aPreviousList[i].iURISegLUID );
-
-		names->AppendL( aPreviousList[i].iURISeg );
-		luids->AppendL( screenSaverId );
-		}
-
-	// Find and add missing screen savers
-	for (i = 0 ; i < iScreenSavers->Count() ; i++)
-		{
-		TInt idx = 0;
-		TPtrC8 name = (*iScreenSavers)[i]->Id();
-		if (luids->Find( name, idx ) != 0)
-			{
-			// not found
-			// Check that current "name" is not in use
-			if (names->Find( name, idx ) != 0)
-				{
-				// not found, add it
-				names->AppendL( name );
-				}
-			}
-		}
-
-
-	// Fill result
-	for (i = 0 ; i < names->Count() ; i++)
-		{
-		if (i > 0)
-			{
-			aList.InsertL( aList.Size(), KSlash );
-			}
-		aList.InsertL( aList.Size(), (*names)[i] );
-		}
-
-	// Cleanup
-	CleanupStack::PopAndDestroy( luids );
-	CleanupStack::PopAndDestroy( names );
-
-	return MSmlDmAdapter::EOk;
-
-//sf-	TInt i = 0;
-//sf-	for (i = 0 ; i < iScreenSavers->Count() ; i++)
-//sf-		{
-//sf-		if (i > 0)
-//sf-			{
-//sf-			aList.InsertL( aList.Size(), KSlash );
-//sf-			}
-//sf-
-//sf-	    CScreenSaverInfo *info = (*iScreenSavers)[i];
-//sf-		aList.InsertL( aList.Size(), info->Id() );
-//sf-		}
-//sf-
-//sf-
-//sf-	return MSmlDmAdapter::EOk;
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  CScreenSaverList::GetIdL()
-// ------------------------------------------------------------------------------------------------
-MSmlDmAdapter::TError CScreenSaverList::GetIdL( const TDesC8& aId, CBufBase& aResult )
-	{
-	MSmlDmAdapter::TError ret = MSmlDmAdapter::ENotFound;
-
-	CScreenSaverInfo* screenSaverInfo = FindByIdL( aId );
-	if (screenSaverInfo != 0)
-		{
-		aResult.InsertL( aResult.Size(), screenSaverInfo->Id() );
-		ret = MSmlDmAdapter::EOk;
-		}
-
-	return ret;
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  CScreenSaverList::GetNameL()
-// ------------------------------------------------------------------------------------------------
-MSmlDmAdapter::TError CScreenSaverList::GetNameL( const TDesC8& aId, CBufBase& aResult )
-	{
-	MSmlDmAdapter::TError ret = MSmlDmAdapter::ENotFound;
-
-	CScreenSaverInfo* screenSaverInfo = FindByIdL( aId );
-	if (screenSaverInfo != 0)
-		{
-		aResult.InsertL( aResult.Size(), screenSaverInfo->Name() );
-		ret = MSmlDmAdapter::EOk;
-		}
-
-	return ret;
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  CScreenSaverList::SetNameL()
-// ------------------------------------------------------------------------------------------------
-MSmlDmAdapter::TError CScreenSaverList::SetNameL( const TDesC8& aId, const TDesC8& aData )
-	{
-	MSmlDmAdapter::TError ret = MSmlDmAdapter::ENotFound;
-
-	CScreenSaverInfo* screenSaverInfo = FindByIdL( aId );
-	if (screenSaverInfo != 0)
-		{
-		screenSaverInfo->SetNameL( aData );
-		ret = MSmlDmAdapter::EOk;
-		}
-
-	return ret;
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  CScreenSaverList::GetDescriptionL()
-// ------------------------------------------------------------------------------------------------
-MSmlDmAdapter::TError CScreenSaverList::GetDescriptionL( const TDesC8& aId, CBufBase& aResult )
-	{
-	MSmlDmAdapter::TError ret = MSmlDmAdapter::ENotFound;
-
-	CScreenSaverInfo* screenSaverInfo = FindByIdL( aId );
-	if (screenSaverInfo != 0)
-		{
-		aResult.InsertL( aResult.Size(), screenSaverInfo->Description() );
-		ret = MSmlDmAdapter::EOk;
-		}
-
-	return ret;
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  CScreenSaverList::SetDescriptionL()
-// ------------------------------------------------------------------------------------------------
-MSmlDmAdapter::TError CScreenSaverList::SetDescriptionL( const TDesC8& aId, const TDesC8& aData )
-	{
-	MSmlDmAdapter::TError ret = MSmlDmAdapter::ENotFound;
-
-	CScreenSaverInfo* screenSaverInfo = FindByIdL( aId );
-	if (screenSaverInfo != 0)
-		{
-		screenSaverInfo->SetDescriptionL( aData );
-		ret = MSmlDmAdapter::EOk;
-		}
-
-	return ret;
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  CScreenSaverList::GetCustomPropertyL()
-// ------------------------------------------------------------------------------------------------
-MSmlDmAdapter::TError CScreenSaverList::GetCustomPropertyL( const TDesC8& aId, CBufBase& aResult )
-	{
-	MSmlDmAdapter::TError ret = MSmlDmAdapter::ENotFound;
-
-	CScreenSaverInfo* screenSaverInfo = FindByIdL( aId );
-	if (screenSaverInfo != 0)
-		{
-		aResult.InsertL( aResult.Size(), screenSaverInfo->CustomProperty() );
-		ret = MSmlDmAdapter::EOk;
-		}
-
-	return ret;
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  CScreenSaverList::SetCustomPropertyL()
-// ------------------------------------------------------------------------------------------------
-MSmlDmAdapter::TError CScreenSaverList::SetCustomPropertyL( const TDesC8& aId, const TDesC8& aData )
-	{
-	MSmlDmAdapter::TError ret = MSmlDmAdapter::ENotFound;
-
-	CScreenSaverInfo* screenSaverInfo = FindByIdL( aId );
-	if (screenSaverInfo != 0)
-		{
-		screenSaverInfo->SetCustomPropertyL( aData );
-		ret = MSmlDmAdapter::EOk;
-		}
-
-	return ret;
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  CScreenSaverList::GetVersionL()
-// ------------------------------------------------------------------------------------------------
-MSmlDmAdapter::TError CScreenSaverList::GetVersionL( const TDesC8& aId, CBufBase& aResult )
-	{
-	MSmlDmAdapter::TError ret = MSmlDmAdapter::ENotFound;
-
-	CScreenSaverInfo* screenSaverInfo = FindByIdL( aId );
-	if (screenSaverInfo != 0)
-		{
-		aResult.InsertL( aResult.Size(), screenSaverInfo->Version() );
-		ret = MSmlDmAdapter::EOk;
-		}
-
-	return ret;
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  CScreenSaverList::SetVersionL()
-// ------------------------------------------------------------------------------------------------
-MSmlDmAdapter::TError CScreenSaverList::SetVersionL( const TDesC8& aId, const TDesC8& aVersion )
-	{
-	MSmlDmAdapter::TError ret = MSmlDmAdapter::ENotFound;
-
-	CScreenSaverInfo* screenSaverInfo = FindByIdL( aId );
-	if (screenSaverInfo != 0)
-		{
-		screenSaverInfo->SetVersionL( aVersion );
-		ret = MSmlDmAdapter::EOk;
-		}
-
-	return ret;
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  CScreenSaverList::GetActiveL()
-// ------------------------------------------------------------------------------------------------
-MSmlDmAdapter::TError CScreenSaverList::GetActiveL( CBufBase& aResult )
-	{
-	MSmlDmAdapter::TError ret = MSmlDmAdapter::EOk;
-
-    TInt screenSaverTypeId = 0; // Text
-    TFileName screenSaverFileName;
-
-    CRepository* repository = CRepository::NewLC( KCRUidScreenSaver );
-    TInt error = repository->Get( KScreenSaverObject, screenSaverTypeId );
-
-    if( error == KErrNone )
-    	{
-		if( screenSaverTypeId == 0 ) // Text
-	        {
-			screenSaverFileName = KPslnScreenSaverTypeText;
-	        }
-	    else if( screenSaverTypeId == 1 ) // Date&time
-	        {
-			screenSaverFileName = KPslnScreenSaverTypeDateTime;
-	        }
-		else if( screenSaverTypeId == 3 )// Object
-			{
-			error = repository->Get( KScreenSaverPluginName, screenSaverFileName );
-			}
-		else
-			{
-			error = KErrUnknown;
-			}
-    	}
-
-    CleanupStack::PopAndDestroy( repository );
-
-    if( error == KErrNone )
-    	{
-		TBuf8<KMaxFileName> screenSaverFileName8;
-		screenSaverFileName8.Copy( screenSaverFileName );
-
-		aResult.InsertL( aResult.Size(), screenSaverFileName8 );
-    	}
-    else
-    	{
-    	ret = MSmlDmAdapter::EError;
-    	}
-
-	return ret;
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  CScreenSaverList::SetActiveL()
-// ------------------------------------------------------------------------------------------------
-MSmlDmAdapter::TError CScreenSaverList::SetActiveL( const TDesC8& aId )
-	{
-	MSmlDmAdapter::TError ret = MSmlDmAdapter::EOk;
-
-	CScreenSaverInfo* screenSaverInfo = FindByIdL( aId );
-	if (screenSaverInfo != 0)
-		{
-		screenSaverInfo->ActivateL();
-		}
-	else
-		{
-		ret = MSmlDmAdapter::EError;
-		}
-
-	return ret;
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  CScreenSaverList::SetInstallOptionsL()
-// ------------------------------------------------------------------------------------------------
-MSmlDmAdapter::TError CScreenSaverList::SetInstallOptionsL( const TDesC8& aOptions )
-	{
-	MSmlDmAdapter::TError ret = MSmlDmAdapter::EOk;
-	TInt errCode = KErrNone;
-
-	GetDefaultInstallOptions( iInstallOptions );
-
-	if (aOptions.Length() > 0)
-		{
-		TRAP( errCode, InstallOptionsParser::ParseOptionsL( aOptions, iInstallOptions ) );
-		}
-	if (errCode != KErrNone)
-		{
-		ret = MSmlDmAdapter::EError;
-		}
-
-	return ret;
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  CScreenSaverList::InstallL()
-// ------------------------------------------------------------------------------------------------
-MSmlDmAdapter::TError CScreenSaverList::InstallL( const TDesC& aFileName )
-	{
-	MSmlDmAdapter::TError ret = MSmlDmAdapter::EOk;
-	TInt errCode = KErrNone;
-
-	iDirty = ETrue;
-
-	// Install using options if given and otherwise with default options
-	SwiUI::RSWInstLauncher installer;
-	User::LeaveIfError( installer.Connect() );
-	CleanupClosePushL( installer );
-
-	SwiUI::TInstallOptionsPckg optPckg( iInstallOptions );
-	errCode = installer.SilentInstall( aFileName, optPckg );
-	CleanupStack::PopAndDestroy( &installer );
-
-	if (errCode != KErrNone)
-		{
-		ret = MSmlDmAdapter::EError;
-		}
-
-	return ret;
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  CScreenSaverList::DeleteL()
-// ------------------------------------------------------------------------------------------------
-MSmlDmAdapter::TError CScreenSaverList::DeleteL( const TDesC8& aLUID )
-	{
-	MSmlDmAdapter::TError ret = MSmlDmAdapter::EOk;
-	TInt errCode = KErrNone;
-
-	CScreenSaverInfo* screenSaverInfo = FindByIdL( aLUID );
-	if( screenSaverInfo != NULL )
-		{
-	    CRepository* repository = CRepository::NewLC( KCRUidScreenSaver );
-
-	    if( screenSaverInfo->TypeId() == CScreenSaverInfo::EObject )
-	        {
-		    TFileName screenSaverFileName;
-		    screenSaverFileName.Copy( screenSaverInfo->FileName() );
-		    
-		    TFileName repFileName;
-			repository->Get( KScreenSaverPluginName, repFileName );
-			if( repFileName == screenSaverFileName )
-				{
-				TBuf<KPslnMaxNumberOfScreenSaverText> screenText;
-				screenText.Copy( screenSaverInfo->CustomProperty() );
-		        errCode = repository->Set( KScreenSaverText, screenText );
-				errCode = repository->Set( KScreenSaverObject, CScreenSaverInfo::EText );  
-				
-				TRequestStatus timeoutStatus /*= KRequestPending*/;
-				RTimer timeout;
-				User::LeaveIfError( timeout.CreateLocal() );
-				CleanupClosePushL( timeout );
-				timeout.After( timeoutStatus, KPostTimeOut );
-
-				User::WaitForRequest( timeoutStatus );
-
-				if( timeoutStatus.Int() == KRequestPending)
-					{
-					timeout.Cancel();
-					User::WaitForRequest( timeoutStatus );
-					}
-				CleanupStack::PopAndDestroy( &timeout );
-				     
-				}
-	        }
-	    CleanupStack::PopAndDestroy( repository );
-		
-		}
-	else
-		{
-		errCode = KErrNotFound;
-		}
-
-	if( errCode == KErrNone )
-		{
-		iDirty = ETrue;
-
-		TUint pkgUid = 0;
-		TLex8 parser( aLUID );
-		if ((parser.Get() == '[') &&
-			(parser.Val( pkgUid, EHex ) == KErrNone) &&
-			(parser.Get() == ']'))
-			{
-			// Uninstall silent
-			SwiUI::RSWInstLauncher installer;
-			User::LeaveIfError( installer.Connect() );
-			CleanupClosePushL( installer );
-
-			SwiUI::TUninstallOptions uninstallOptions;
-			SwiUI::TUninstallOptionsPckg optPckg( uninstallOptions );
-
-			errCode = installer.SilentUninstall( TUid::Uid( pkgUid ), optPckg, SwiUI::KSisxMimeType() );
-
-			CleanupStack::PopAndDestroy( &installer );
-			}
-		}
-		
-	if (errCode == KErrNotFound)
-		{
-		ret = MSmlDmAdapter::ENotFound;
-		}
-	else if (errCode != KErrNone)
-		{
-		ret = MSmlDmAdapter::EError;
-		}
-
-	return ret;
-	}
-
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-//
-// Internal methods
-//
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-// ------------------------------------------------------------------------------------------------
-//  CScreenSaverList::CheckUpdatesL()
-// ------------------------------------------------------------------------------------------------
-void CScreenSaverList::CheckUpdatesL()
-	{
-	if (iDirty)
-		{
-		LoadL();
-		iDirty = EFalse;
-		}
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  CScreenSaverList::LoadL()
-// ------------------------------------------------------------------------------------------------
-void CScreenSaverList::LoadL()
-	{
-	CScreenSaverInfo* entry = 0;
-    // Add descriptors for system screensavers
-    delete iScreenSavers;
-    iScreenSavers = 0;
-    iScreenSavers = new (ELeave) CArrayPtrFlat< CScreenSaverInfo >( 8 );
-
-	entry = CScreenSaverInfo::NewLC( KPslnScreenSaverTypeDateTime );
-    iScreenSavers->AppendL( entry );
-    CleanupStack::Pop( entry );
-
-	entry = CScreenSaverInfo::NewLC( KPslnScreenSaverTypeText );
-    iScreenSavers->AppendL( entry );
-    CleanupStack::Pop( entry );
-
-    // The path variable is not used
-    // The signature of this function could be changed in later releases
-    LoadPluginsL( KNullDesC );
-//sf-    LoadPluginsL( KPslnScreensaverPathROM );
-//sf-    LoadPluginsL( KPslnScreensaverPathLFFS );
-//sf-    LoadPluginsL( KPslnScreensaverPathMMC );
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  CScreenSaverList::LoadPluginsL()
-// ------------------------------------------------------------------------------------------------
-TBool CScreenSaverList::LoadPluginsL( const TDesC& /*aPath*/ )
-	{
-	RDEBUG(" CScreenSaverList: LoadPluginsL ... <");
-    TBool found = EFalse;
-    
-    RScreenSaverClient ssClient;
-    
-    User::LeaveIfError( ssClient.Connect() );
-	CleanupClosePushL( ssClient );
-	
-	RSSListInfoPtrArray sslistinfo;
-	CleanupResetAndDestroyPushL( sslistinfo );
-	
-	ssClient.GetScreenSaverListInfoL(sslistinfo );
-	const TInt count = sslistinfo.Count();
-	RDEBUG_2(" CScreenSaverList: LoadPluginsL : SScount is :%d",count);
-	
-	for( TInt i = 0 ; i < count ; i++ )
-        {
-        CScreenSaverListInfo* implInfo = sslistinfo[i];
-        
-		CScreenSaverInfo* entry = CScreenSaverInfo::NewLC(
-		implInfo->ImplementationUid().Name() );
-		entry->SetNameL( implInfo->DisplayName() );
-
-		TBuf8<20> version;
-		version.Num( implInfo->Version() );
-		entry->SetVersionL( version );
-		entry->SetCustomPropertyL( implInfo->OpaqueData() );
-
-		iScreenSavers->AppendL( entry );
-		CleanupStack::Pop( entry );
-
-        found = ETrue;
-        }
-	
-	CleanupStack::PopAndDestroy( &sslistinfo );
-	CleanupStack::PopAndDestroy( &ssClient );
-	RDEBUG(" CScreenSaverList: LoadPluginsL ... >");
-	return found;
-    }
-
-// ------------------------------------------------------------------------------------------------
-//  CScreenSaverList::
-// ------------------------------------------------------------------------------------------------
-CScreenSaverInfo* CScreenSaverList::FindByIdL( const TDesC8& aId )
-	{
-	CheckUpdatesL();
-
-	CScreenSaverInfo* entry = 0;
-	TInt i = 0;
-	TPtrC8 id = ScreenSaverIdFromLUID( aId );
-	if (id.Length() == 0)
-		{
-		id.Set( aId );
-		}
-
-	for (i = 0 ; i < iScreenSavers->Count() ; i++)
-		{
-		if (id == (*iScreenSavers)[i]->Id())
-			{
-			entry = (*iScreenSavers)[i];
-			break;
-			}
-		}
-
-	return entry;
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  CScreenSaverList::ScreenSaverIdFromLUID()
-// ------------------------------------------------------------------------------------------------
-TPtrC8 CScreenSaverList::ScreenSaverIdFromLUID( const TDesC8& aLUID )
-	{
-	TInt pos = aLUID.Locate( KPkgId_ScrId_Separator );
-	if (pos == KErrNotFound)
-		{
-		pos = aLUID.Length() - 1;
-		}
-	return aLUID.Mid( pos + 1 );
-	}
-
-
-// ------------------------------------------------------------------------------------------------
-//  CScreenSaverList::GetDefaultInstallOptions()
-// ------------------------------------------------------------------------------------------------
-void CScreenSaverList::GetDefaultInstallOptions( SwiUI::TInstallOptions &aOptions )
-	{
-	SwiUI::TInstallOptions defaultOptions;
-
-	// Return options
-	aOptions = defaultOptions;
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  CScreenSaverList::
-// ------------------------------------------------------------------------------------------------
-
-//=================================================================================================
-//=================================================================================================
-//====
-//==== CScreenSaverInfo
-//====
-//=================================================================================================
-//=================================================================================================
-
-// ------------------------------------------------------------------------------------------------
-//  CScreenSaverInfo::NewL()
-// ------------------------------------------------------------------------------------------------
-CScreenSaverInfo* CScreenSaverInfo::NewL( const TDesC& aId )
-	{
-	RDEBUG("CScreenSaverInfo::NewL(): begin");
-
-	CScreenSaverInfo* self = NewLC( aId );
-	CleanupStack::Pop();
-	return self;
-	}
-
-// ------------------------------------------------------------------------------------------------
-// CScreenSaverInfo* CScreenSaverInfo::NewLC()
-// ------------------------------------------------------------------------------------------------
-CScreenSaverInfo* CScreenSaverInfo::NewLC( const TDesC& aId )
-	{
-	CScreenSaverInfo* self = new( ELeave ) CScreenSaverInfo( );
-	CleanupStack::PushL( self );
-	self->ConstructL( aId );
-	return self;
-	}
-
-
-// ------------------------------------------------------------------------------------------------
-//  CScreenSaverInfo::
-// ------------------------------------------------------------------------------------------------
-CScreenSaverInfo::CScreenSaverInfo()
-	: iId( 0 )
-	, iName( 0 )
-	, iDescription( 0 )
-	, iCustomProperty( 0 )
-	, iVersion( 0 )
-	{
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  CScreenSaverInfo::
-// ------------------------------------------------------------------------------------------------
-void CScreenSaverInfo::ConstructL( const TDesC& aId )
-	{
-	iId = HBufC8::NewL( aId.Length() );
-	iId->Des().Copy( aId );
-	iName = KNullDesC8().AllocL();
-	iDescription = KNullDesC8().AllocL();
-	iCustomProperty = KNullDesC8().AllocL();
-	iVersion = KNullDesC8().AllocL();
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  CScreenSaverInfo::
-// ------------------------------------------------------------------------------------------------
-CScreenSaverInfo::~CScreenSaverInfo()
-	{
-	delete iId;
-	delete iName;
-	delete iDescription;
-	delete iCustomProperty;
-	delete iVersion;
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  CScreenSaverInfo::
-// ------------------------------------------------------------------------------------------------
-const TDesC8& CScreenSaverInfo::Id()
-	{
-	return *iId;
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  CScreenSaverInfo::
-// ------------------------------------------------------------------------------------------------
-const TDesC8& CScreenSaverInfo::Name()
-	{
-	return *iName;
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  CScreenSaverInfo::
-// ------------------------------------------------------------------------------------------------
-void CScreenSaverInfo::SetNameL( const TDesC8& aName )
-	{
-	delete iName;
-	iName = 0;
-	iName = aName.AllocL();
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  CScreenSaverInfo::
-// ------------------------------------------------------------------------------------------------
-void CScreenSaverInfo::SetNameL( const TDesC& aName )
-	{
-	delete iName;
-	iName = 0;
-	iName = HBufC8::NewL( aName.Length() );
-	iName->Des().Copy( aName );
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  CScreenSaverInfo::
-// ------------------------------------------------------------------------------------------------
-const TDesC8& CScreenSaverInfo::Description()
-	{
-	return *iDescription;
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  CScreenSaverInfo::
-// ------------------------------------------------------------------------------------------------
-void CScreenSaverInfo::SetDescriptionL( const TDesC8& aDescription )
-	{
-	delete iDescription;
-	iDescription = 0;
-	iDescription = aDescription.AllocL();
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  CScreenSaverInfo::
-// ------------------------------------------------------------------------------------------------
-const TDesC8& CScreenSaverInfo::CustomProperty()
-	{
-	return *iCustomProperty;
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  CScreenSaverInfo::
-// ------------------------------------------------------------------------------------------------
-void CScreenSaverInfo::SetCustomPropertyL( const TDesC8& aCustomProperty )
-	{
-	delete iCustomProperty;
-	iCustomProperty = 0;
-	iCustomProperty = aCustomProperty.AllocL();
-	// Update settings if needed
-	if (IsActivatedL() && TypeId() == EText)
-		{
-		ActivateL();
-		}
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  CScreenSaverInfo::
-// ------------------------------------------------------------------------------------------------
-const TDesC8& CScreenSaverInfo::Version()
-	{
-	return *iVersion;
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  CScreenSaverInfo::
-// ------------------------------------------------------------------------------------------------
-void CScreenSaverInfo::SetVersionL( const TDesC8& aVersion )
-	{
-	delete iVersion;
-	iVersion = 0;
-	iVersion = aVersion.AllocL();
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  CScreenSaverInfo::
-// ------------------------------------------------------------------------------------------------
-CScreenSaverInfo::TScreenSaverType CScreenSaverInfo::TypeId()
-	{
-	TScreenSaverType screenSaverTypeId = EText;
-	TFileName fileName;
-	fileName.Copy( FileName() );
-
-    if( fileName.CompareF( KPslnScreenSaverTypeText ) == 0 )
-        {
-        screenSaverTypeId = EText; // 0=Text
-        }
-    else if( fileName.CompareF( KPslnScreenSaverTypeDateTime ) == 0 )
-        {
-        screenSaverTypeId = EDateTime; // 1=Date&time
-        }
-	else
-		{
-		screenSaverTypeId = EObject; // 3=Object
-		}
-
-	return screenSaverTypeId;
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  CScreenSaverInfo::
-// ------------------------------------------------------------------------------------------------
-TBool CScreenSaverInfo::IsActivatedL()
-	{
-	TBool activated = EFalse;
-
-    TInt screenSaverTypeId = 0; // Text
-    TFileName screenSaverFileName;
-
-    CRepository* repository = CRepository::NewLC( KCRUidScreenSaver );
-
-    TInt error = repository->Get( KScreenSaverObject, screenSaverTypeId );
-    if( screenSaverTypeId == 3 )
-        {
-		repository->Get( KScreenSaverPluginName, screenSaverFileName );
-        }
-    CleanupStack::PopAndDestroy( repository );
-
-    if( screenSaverTypeId == 0 && TypeId() == EText ) // Text
-        {
-		activated = ETrue;
-        }
-    else if( screenSaverTypeId == 1 && TypeId() == EDateTime ) // Date&time
-        {
-		activated = ETrue;
-        }
-	else if( screenSaverTypeId == 3 && TypeId() == EObject )// Object
-		{
-		TFileName fileName;
-		fileName.Copy( FileName() );
-		activated = ( fileName.CompareF( screenSaverFileName ) == 0 );
-		}
-
-	return activated;
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  CScreenSaverInfo::
-// ------------------------------------------------------------------------------------------------
-void CScreenSaverInfo::ActivateL()
-	{
-    CRepository* repository = CRepository::NewLC( KCRUidScreenSaver );
-
-
-	if( TypeId() == EText )
-        {
-		TBuf<KPslnMaxNumberOfScreenSaverText> screenText;
-		screenText.Copy( CustomProperty() );
-        repository->Set( KScreenSaverText, screenText );
-        }
-	else if( TypeId() == EDateTime )
-        {
-//sf-		TBuf<KPslnMaxNumberOfScreenSaverText> screenText;
-//sf-		screenText.Copy( CustomProperty() );
-//sf-        error = repository->Set( KScreenSaverText, screenText );
-        }
-    else if( TypeId() == EObject )
-        {
-	    TFileName screenSaverFileName;
-	    screenSaverFileName.Copy( FileName() );
-		repository->Set( KScreenSaverPluginName, screenSaverFileName );
-        }
-    repository->Set( KScreenSaverObject, TypeId() );
-    CleanupStack::PopAndDestroy( repository );
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  CScreenSaverInfo::
-// ------------------------------------------------------------------------------------------------
-const TDesC8& CScreenSaverInfo::FileName()
-	{
-	return *iId;
-	}
-
-// ------------------------------------------------------------------------------------------------
-// EOF
-// ------------------------------------------------------------------------------------------------
--- a/customization/ThemesAdapter/bld/ThemesAdapter.mmp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,90 +0,0 @@
-/*
-* Copyright (c) 2002 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: Implementation of customization components
-*
-*/
-  
-
-// To get the APP_LAYER_SYSTEMINCLUDE-definition
-#include <platform_paths.hrh>
-#include "defaultcaps.hrh"
-
-CAPABILITY      CAP_GENERAL_DLL
-TARGET          themesadapter.dll
-TARGETTYPE      PLUGIN
-UID             0x10009D8D 0x10207827
-VENDORID        VID_DEFAULT
-
-APP_LAYER_SYSTEMINCLUDE
-SYSTEMINCLUDE   /epoc32/include/swi
-#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
-SYSTEMINCLUDE 	/epoc32/include/platform/mw/swi
-#endif
-SYSTEMINCLUDE 	/epoc32/include/ecom
-SYSTEMINCLUDE 	/epoc32/include/xml
-SYSTEMINCLUDE		/epoc32/include/mm
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-SYSTEMINCLUDE 	/epoc32/include/devman
-#else
-// nothing
-#endif
-
-SOURCEPATH      ../src
-
-USERINCLUDE		  ../inc
-USERINCLUDE		  ../../include
-USERINCLUDE		  ../../DMUtils/inc
-USERINCLUDE     ../../../inc
-
-
-SOURCE          ThemesAdapter.cpp
-SOURCE          ThemesList.cpp
-
-START RESOURCE  ThemesAdapter.rss
-TARGET themesadapter.rsc
-LANGUAGE_IDS
-END
-
-
-
-LIBRARY			     euser.lib
-LIBRARY			     efsrv.lib
-LIBRARY			     bafl.lib
-LIBRARY			     ecom.lib
-LIBRARY			     imut.lib
-LIBRARY 		     flogger.lib
-LIBRARY			     swinstcli.lib
-LIBRARY			     aminstalloptions.lib
-LIBRARY			     sisregistryclient.lib
-LIBRARY          centralrepository.lib
-LIBRARY          aknskinsrv.lib
-LIBRARY					charconv.lib
-#ifdef RD_MULTIPLE_DRIVE
-LIBRARY         platformenv.lib 
-#endif
-//#ifdef __SAP_POLICY_MANAGEMENT
-LIBRARY			     policyengine.lib
-LIBRARY			     dmutil.lib
-//#endif
-LIBRARY                 featmgr.lib
-STATICLIBRARY	   dmutils.lib
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-LIBRARY		       devmancmdmgr.lib
-#else
-// nothing
-#endif
-
-SMPSAFE
--- a/customization/ThemesAdapter/bld/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 2002 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:  build info file for Themes Adapter
-*
-*/
-
-#include <platform_paths.hrh>
-
-PRJ_EXPORTS
-../rom/ThemesAdapter.iby												CORE_APP_LAYER_IBY_EXPORT_PATH(themesadapter.iby)
-
-PRJ_MMPFILES
-./ThemesAdapter.mmp
--- a/customization/ThemesAdapter/inc/ThemesAdapter.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,153 +0,0 @@
-/*
-* Copyright (c) 2002 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:  DM Themes Adapter
-*
-*/
-
-
-
-#ifndef __THEMESADAPTER_H__
-#define __THEMESADAPTER_H__
-
-// ------------------------------------------------------------------------------------------------
-// Includes
-// ------------------------------------------------------------------------------------------------
-#include <e32base.h>
-#include <smldmadapter.h>
-#include "TARMDmAdapter.h"
-#include "SWInstApi.h"
-
-
-const TUint KThemesAdapterImplUid = 0x10207828;
-
-// the DDF version must be changed if any changes in DDF structure ( built in DDFStructureL() function )
-_LIT8( KThemesAdapterDDFVersion, "1.0" ); 
-
-_LIT8( KThemesAdapterTextPlain, "text/plain" );
-_LIT8( KSlash, "/" );
-_LIT8( KThemesAdapterCustomization, "Customization" );
-_LIT8( KThemesAdapterCustomizationD, "Customization node" );
-_LIT8( KThemesAdapterThemes, "Themes" );
-_LIT8( KThemesAdapterThemesD, "Themes node" );
-_LIT8( KThemesAdapterAvailableThemes, "AvailableThemes" );
-_LIT8( KThemesAdapterAvailableThemesD, "AvailableThemes node" );
-_LIT8( KThemesAdapterDynamicNodeD, "" );
-_LIT8( KThemesAdapterXId, "ID" );
-_LIT8( KThemesAdapterXIdD, "ID node" );
-_LIT8( KThemesAdapterXName, "Name" );
-_LIT8( KThemesAdapterXNameD, "Name node" );
-_LIT8( KThemesAdapterXVersion, "Version" );
-_LIT8( KThemesAdapterXVersionD, "Version node" );
-_LIT8( KThemesAdapterXData, "Data" );
-_LIT8( KThemesAdapterXDataD, "Data node" );
-_LIT8( KThemesAdapterXInstallOptions, "InstallOptions" );
-_LIT8( KThemesAdapterXInstallOptionsD, "InstallOptions node" );
-_LIT8( KThemesAdapterActiveTheme, "ActiveTheme" );
-_LIT8( KThemesAdapterActiveThemeD, "ActiveTheme node" );
-_LIT8( KThemesAdapterActiveThemeRef, "Customization/Themes/AvailableThemes/" );
-_LIT8( KThemesAdapterAvailableThemeBase, "Customization/Themes/AvailableThemes/" );
-_LIT8( KThemesAdapterTrue, "True" );
-_LIT8( KThemesAdapterFalse, "False" );
-_LIT8( KThemesAdapterListOfLeafs, "Image" );
-_LIT( KThemesAdapterSeparator16, "/" );
-_LIT8( KWPSeparator8, "/" );
-
-
-class CThemesList;
-
-// ------------------------------------------------------------------------------------------------
-// CThemesAdapter 
-// ------------------------------------------------------------------------------------------------
-class CThemesAdapter : public CTARMDmAdapter
-	{
-public:
-	static CThemesAdapter* NewL(MSmlDmCallback* aDmCallback );
-	static CThemesAdapter* NewLC(MSmlDmCallback* aDmCallback );
-
-	virtual ~CThemesAdapter();
-
-	// Implementation of MSmlDmAdapter interface
-	// =========================================
-	void DDFVersionL( CBufBase& aVersion );
-	void DDFStructureL( MSmlDmDDFObject& aDDF );
-
-	void _UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, const TDesC8& aObject, const TDesC8& aType, TInt aStatusRef );
-	void _UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, RWriteStream*& aStream, const TDesC8& aType, TInt aStatusRef );
-	void _DeleteObjectL( const TDesC8& aURI, const TDesC8& aLUID, TInt aStatusRef );
-	void _FetchLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, const TDesC8& aType, TInt aResultsRef, TInt aStatusRef );
-	void _FetchLeafObjectSizeL( const TDesC8& aURI, const TDesC8& aLUID, const TDesC8& aType, TInt aResultsRef, TInt aStatusRef );
-	void _ChildURIListL( const TDesC8& aURI, const TDesC8& aLUID, const CArrayFix<TSmlDmMappingInfo>& aPreviousURISegmentList, TInt aResultsRef, TInt aStatusRef );
-
-	void _AddNodeObjectL( const TDesC8& aURI, const TDesC8& aParentLUID, TInt aStatusRef );
-	void _ExecuteCommandL( const TDesC8& aURI, const TDesC8& aLUID, const TDesC8& aArgument, const TDesC8& aType, TInt aStatusRef );
-	void _ExecuteCommandL( const TDesC8& aURI, const TDesC8& aLUID, RWriteStream*& aStream, const TDesC8& aType, TInt aStatusRef );
-	void _CopyCommandL( const TDesC8& aTargetURI, const TDesC8& aTargetLUID, const TDesC8& aSourceURI, const TDesC8& aSourceLUID, const TDesC8& aType, TInt aStatusRef );
-
-	void StartAtomicL();
-	void CommitAtomicL();
-	void RollbackAtomicL();
-	TBool StreamingSupport( TInt& aItemSize );
-#ifdef __TARM_SYMBIAN_CONVERGENCY	
-		virtual void StreamCommittedL( RWriteStream& aStream );
-#else
-		virtual void StreamCommittedL();
-#endif	
-	void CompleteOutstandingCmdsL();
-
-	// PolicyCheck, resource name
-//#ifdef __SAP_POLICY_MANAGEMENT	
-	TPtrC8 PolicyRequestResourceL( const TDesC8& aURI );
-//#endif
-
-	// Other
-	void GetLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, const TDesC8& aType, CBufBase& aResult, TError& aRet );
-
-
-private:
-	CThemesAdapter( MSmlDmCallback* aDmCallback );
-	void ConstructL(/*MSmlDmCallback* aDmCallback*/);
-
-	enum TNodeId
-		{
-		ENodeUnknown,
-
-		ENodeCustomization,
-		ENodeThemes,
-		ENodeAvailableThemes,
-		ENodeX,
-		ENodeXId,
-		ENodeXName,
-		ENodeXVersion,
-		ENodeXData,
-		ENodeXInstallOptions,
-		ENodeActiveTheme,
-		
-		ENodeLast
-		};
-
-	TNodeId NodeId( const TDesC8& aURI );
-
-	void FillNodeInfoL( MSmlDmDDFObject& aNode,TSmlDmAccessTypes aAccTypes,MSmlDmDDFObject::TOccurence aOccurrence, MSmlDmDDFObject::TScope aScope, MSmlDmDDFObject::TDFFormat aFormat,const TDesC8& aDescription,TBool aObjectGroup);
-	TBool IsImage(const TDesC& aMime) ;
-	void SyncWithAvkonSkinDB(CDesC8ArrayFlat& themes);
-
-private:
-
-	MSmlDmCallback* iCallBack;
-	CThemesList* iThemes;
-	HBufC8*		iActiveTheme;
-
-	};
-
-#endif // __THEMESADAPTER_H__
--- a/customization/ThemesAdapter/inc/ThemesList.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,118 +0,0 @@
-/*
-* Copyright (c) 2002 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:  DM Themes List
-*
-*/
-
-
-
-#ifndef __ThemesList_H__
-#define __ThemesList_H__
-
-// ------------------------------------------------------------------------------------------------
-// Includes
-// ------------------------------------------------------------------------------------------------
-#include <e32base.h>
-#include <smldmadapter.h>
-#include <SWInstApi.h>
-#include <AknsSrvClient.h>
-
-
-class CAknsSrvSkinInformationPkg;
-class CThemeItem;
-class CDesC8Array;
-
-// ------------------------------------------------------------------------------------------------
-// CThemesList
-// ------------------------------------------------------------------------------------------------
-class CThemesList : public CBase
-	{
-public:
-	static CThemesList* NewL( );
-	static CThemesList* NewLC( );
-
-	virtual ~CThemesList();
-
-	// Other
-	
-	MSmlDmAdapter::TError GetInstalledPIDListL( const CArrayFix<TSmlDmMappingInfo>& aPreviousList, CDesC8ArrayFlat& themes, CDesC8Array& aNewThemes );
-	MSmlDmAdapter::TError GetThemeIdL( const TDesC8& aPID, CBufBase& aResult );
-	MSmlDmAdapter::TError GetThemeNameL( const TDesC8& aPID, CBufBase& aResult );
-	MSmlDmAdapter::TError GetThemeVersionL( const TDesC8& aPID, CBufBase& aResult );
-
-	MSmlDmAdapter::TError GetActiveThemeL( CBufBase& aResult );
-	MSmlDmAdapter::TError SetActiveThemeL( const TDesC8& aPID );
-
-	MSmlDmAdapter::TError SetInstallOptionsL( const TDesC8& aOptions );
-	MSmlDmAdapter::TError InstallThemeL( const TDesC& aFileName, TDes8& aSisPkgUid, TDes8& aThemePkgId );
-
-	MSmlDmAdapter::TError DeleteThemeL( const TDesC8& aThemeId, const TUid& aPkgUid, HBufC8* luid);
-
-protected:
-
-private:
-	CThemesList( );
-	void ConstructL( );
-
-	void CheckUpdatesL();
-	void LoadSkinsL();
-	CAknsSrvSkinInformationPkg* FindThemeL( const TDesC8& aPID );
-	void GetDefaultInstallOptions( SwiUI::TInstallOptions& aOptions );
-
-	TAknSkinSrvSkinPackageLocation LocationFromPath( const TDesC& aPath );
-
-	CDesC8Array* InstalledPackagesL( );
-	CDesC8Array* InstalledThemesL( );
-	CDesC8Array* FindNewItemsL( const CDesC8Array& aItemsOrg, const CDesC8Array& aItemsNew );
-
-private:
-
-	TBool iDirty;
-    RAknsSrvSession iAknsSrv;
-    CArrayPtr<CAknsSrvSkinInformationPkg>* iSkins;
-
-	RArray<CThemeItem> iThemeItems;
-
-	SwiUI::TInstallOptions iInstallOptions;
-	};
-
-// ------------------------------------------------------------------------------------------------
-// CThemeItem
-// ------------------------------------------------------------------------------------------------
-class CThemeItem : public CBase
-	{
-public:
-	static CThemeItem* NewL( MSmlDmCallback* aDmCallback );
-	static CThemeItem* NewLC( MSmlDmCallback* aDmCallback );
-
-	virtual ~CThemeItem();
-
-	// Other
-	MSmlDmAdapter::TError GetDMNameL( CBufBase& aResult );
-	MSmlDmAdapter::TError GetIdL( CBufBase& aResult );
-	MSmlDmAdapter::TError GetNameL( CBufBase& aResult );
-	MSmlDmAdapter::TError GetVersionL( CBufBase& aResult );
-
-protected:
-
-private:
-	CThemeItem( );
-	void ConstructL( );
-
-private:
-	HBufC8* iDMName;
-    CAknsSrvSkinInformationPkg* iSkinInfo;
-	};
-
-#endif // __ThemesList_H__
--- a/customization/ThemesAdapter/rom/ThemesAdapter.iby	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of customization components
-*
-*/
-#ifndef __ThemesAdapter_IBY__
-#define __ThemesAdapter_IBY__
-
-//#ifdef __SAP_THEMES_ADAPTER
-
-ECOM_PLUGIN(ThemesAdapter.dll, ThemesAdapter.rsc)
-
-#endif //__SAP_THEMES_ADAPTER
-
-//#endif //__ThemesAdapter_IBY__
--- a/customization/ThemesAdapter/src/ThemesAdapter.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1276 +0,0 @@
-/*
-* Copyright (c) 2002 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:  DM Themes Adapter
-*
-*/
-
-
-/*
-
-./Customization -+--> Themes -+--> AvailableThemes -+--> <X> * -+--> ID
-                              |                                 |
-                              |                                 |--> Name
-                              |                                 |
-                              |                                 |--> Version
-                              |                                 |
-                              |                                 |--> Data
-                              |                                 |
-                              |                                 |--> InstallOptions
-                              |
-                              |--> ActiveTheme
-
-*/
-
-  
-#include <badesca.h>
-#include <fbs.h>
-#include <imcvcodc.h>
-#include "debug.h"
-#include "ThemesAdapter.h"
-#include "ThemesList.h"
-#include "nsmldmuri.h"
-#include <implementationproxy.h> // For TImplementationProxy definition
-#include <f32file.h>
-#include <e32def.h>
-#include "FileCoderB64.h"
-#include "aminstalloptions.h"
-#include "AknsSrvClient.h"
-#include <AknSkinsInternalCRKeys.h>
-#include <centralrepository.h>
-#include <utf.h> 
-//#ifdef __SAP_POLICY_MANAGEMENT
-#include <PolicyEngineXACML.h>
-#include <SettingEnforcementInfo.h>
-//#endif
-#include <featmgr.h>
-
-
-_LIT( KThemesAdapterTmpInstallPath, "c:\\system\\temp\\DMTheme.sis" );
-_LIT8(KOpenBrace, "(");
-_LIT8(KCloseBrace, ")");
-
-// ------------------------------------------------------------------------------------------------
-// CThemesAdapter* CThemesAdapter::NewL( )
-// ------------------------------------------------------------------------------------------------
-CThemesAdapter* CThemesAdapter::NewL( MSmlDmCallback* aDmCallback )
-	{
-	RDEBUG("CThemesAdapter::NewL(): begin");
-
-	CThemesAdapter* self = NewLC( aDmCallback );
-	CleanupStack::Pop();
-	return self;
-	}
-
-// ------------------------------------------------------------------------------------------------
-// CThemesAdapter* CThemesAdapter::NewLC( )
-// ------------------------------------------------------------------------------------------------
-CThemesAdapter* CThemesAdapter::NewLC( MSmlDmCallback* aDmCallback )
-	{
-	RDEBUG("CThemesAdapter::NewLC(): begin");
-	CThemesAdapter* self = new( ELeave ) CThemesAdapter( aDmCallback );
-	CleanupStack::PushL( self );
-	self->ConstructL( );
-	return self;
-	}
-
-
-// ------------------------------------------------------------------------------------------------
-// CThemesAdapter::CThemesAdapter()
-// ------------------------------------------------------------------------------------------------
-CThemesAdapter::CThemesAdapter( MSmlDmCallback* aDmCallback )
-	: CTARMDmAdapter( aDmCallback )
-	, iCallBack( aDmCallback )
-	, iThemes( 0 )
-	{
-	RDEBUG("CThemesAdapter::CThemesAdapter(): begin");
-	}
-
-// ------------------------------------------------------------------------------------------------
-// CThemesAdapter::ConstructL()
-// ------------------------------------------------------------------------------------------------
-void CThemesAdapter::ConstructL( )
-	{
-		TRAPD( errf, FeatureManager::InitializeLibL() );
-		if( errf != KErrNone )
-		{
-			User::Leave(errf);
-		}
-		
-		if(FeatureManager::FeatureSupported(KFeatureIdSapThemesAdapter))
-		{
-				RDEBUG("CThemesAdapter::ConstructL(): begin");
-				iThemes = CThemesList::NewL();
-		}
-		else
-		{
-			FeatureManager::UnInitializeLib();
-	   		User::Leave( KErrNotSupported );
-		}
-	}
-
-// ------------------------------------------------------------------------------------------------
-// CThemesAdapter::~CThemesAdapter()
-// ------------------------------------------------------------------------------------------------
-
-
-CThemesAdapter::~CThemesAdapter()
-	{
-	RDEBUG("CThemesAdapter::~CThemesAdapter(): begin");
-	
-	FeatureManager::UnInitializeLib();
-	delete iThemes;
-	delete iActiveTheme;
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  CThemesAdapter::DDFVersionL()
-// ------------------------------------------------------------------------------------------------
-void CThemesAdapter::DDFVersionL( CBufBase& aDDFVersion )
-	{
-	RDEBUG("CThemesAdapter::DDFVersionL(): begin");
-	aDDFVersion.InsertL( 0, KThemesAdapterDDFVersion );
-	}
-
-
-// ------------------------------------------------------------------------------------------------
-//  CThemesAdapter::DDFStructureL()
-//
-// ------------------------------------------------------------------------------------------------
-void CThemesAdapter::DDFStructureL( MSmlDmDDFObject& aDDF )
-	{
-	RDEBUG( "CThemesAdapter::DDFStructureL(): begin" );
-
-	TSmlDmAccessTypes accessTypesGet;
-	accessTypesGet.SetGet();
-
-	TSmlDmAccessTypes accessTypesAddGet;
-	accessTypesAddGet.SetAdd();
-	accessTypesAddGet.SetGet();
-
-	TSmlDmAccessTypes accessTypesGetReplace;
-	accessTypesGetReplace.SetGet();
-	accessTypesGetReplace.SetReplace();
-
-	TSmlDmAccessTypes accessTypesDeleteGetReplace;
-	accessTypesDeleteGetReplace.SetDelete();
-	accessTypesDeleteGetReplace.SetGet();
-	accessTypesDeleteGetReplace.SetReplace();
-//sf- For testing:
-	accessTypesDeleteGetReplace.SetAdd();
-//sf- For testing ends.
-
-	TSmlDmAccessTypes accessTypesReplace;
-	accessTypesReplace.SetReplace();
-
-	/*
-	Node: ./Customization
-	This interior node is the common parent to all customization..
-	Status: Required
-	Occurs: One
-	Format: Node
-	Access Types: Get
-	Values: N/A
-	*/
-	// Customization
-	MSmlDmDDFObject& customization = aDDF.AddChildObjectL( KThemesAdapterCustomization );
-	FillNodeInfoL(customization, accessTypesGet, MSmlDmDDFObject::EOne, MSmlDmDDFObject::EPermanent,
-		MSmlDmDDFObject::ENode, KThemesAdapterCustomizationD, ETrue );
-
-	/*
-	Node: ./Customization/Themes
-
-	Status: Required
-	Occurs: One
-	Format: Node
-	Access Types: Get
-	Values: N/A
-	*/
-	MSmlDmDDFObject& themes = customization.AddChildObjectL( KThemesAdapterThemes );
-	FillNodeInfoL( themes, accessTypesGet, MSmlDmDDFObject::EOne, MSmlDmDDFObject::EPermanent,
-		MSmlDmDDFObject::ENode, KThemesAdapterThemesD, ETrue );
-
-	/*
-	Node: ./Customization/Themes/AvailableThemes
-
-	Status: Required
-	Occurs: One
-	Format: Node
-	Access Types: Add, Get
-	Values: N/A
-	*/
-	MSmlDmDDFObject& availableThemes = themes.AddChildObjectL( KThemesAdapterAvailableThemes);
-	FillNodeInfoL( availableThemes, accessTypesAddGet, MSmlDmDDFObject::EOne, MSmlDmDDFObject::EPermanent,
-		MSmlDmDDFObject::ENode, KThemesAdapterAvailableThemesD, ETrue );
-
-	/*
-	Node: ./Customization/Themes/AvailableThemes/<X>
-
-	Status: Required
-	Occurs: Zero or more
-	Format: Node
-	Access Types: Delete, Get, Replace
-	Values: N/A
-	*/
-	MSmlDmDDFObject& oneCurTheme = availableThemes.AddChildObjectGroupL();
-	FillNodeInfoL( oneCurTheme, accessTypesDeleteGetReplace, MSmlDmDDFObject::EZeroOrMore, MSmlDmDDFObject::EDynamic,
-		MSmlDmDDFObject::ENode, KThemesAdapterDynamicNodeD, ETrue );
-
-	/*
-	Node: ./Customization/Themes/AvailableThemes/<X>/ID
-
-	Status: Required
-	Occurs: One
-	Format: Chr
-	Access Types: Get
-	Values: N/A
-	*/
-	MSmlDmDDFObject& id = oneCurTheme.AddChildObjectL( KThemesAdapterXId );
-	FillNodeInfoL( id, accessTypesGet, MSmlDmDDFObject::EOne, MSmlDmDDFObject::EPermanent,
-		MSmlDmDDFObject::EChr, KThemesAdapterXIdD, ETrue );
-
-	/*
-	Node: ./Customization/Themes/AvailableThemes/<X>/Name
-
-	Status: Optional
-	Occurs: One
-	Format: Chr
-	Access Types: Get, Replace
-	Values: N/A
-	*/
-	MSmlDmDDFObject& name = oneCurTheme.AddChildObjectL( KThemesAdapterXName );
-	FillNodeInfoL( name, accessTypesGetReplace, MSmlDmDDFObject::EZeroOrOne, MSmlDmDDFObject::EPermanent,
-		MSmlDmDDFObject::EChr, KThemesAdapterXNameD, ETrue );
-
-	/*
-	Node: ./Customization/Themes/AvailableThemes/<X>/Version
-
-	Status: Optional
-	Occurs: One
-	Format: Chr
-	Access Types: Get, Replace
-	Values: N/A
-	*/
-	MSmlDmDDFObject& version = oneCurTheme.AddChildObjectL( KThemesAdapterXVersion );
-	FillNodeInfoL( version, accessTypesGetReplace, MSmlDmDDFObject::EZeroOrOne, MSmlDmDDFObject::EPermanent,
-		MSmlDmDDFObject::EChr, KThemesAdapterXVersionD, ETrue );
-
-	/*
-	Node: ./Customization/Themes/AvailableThemes/<X>/Data
-
-	Status: Required
-	Occurs: One
-	Format: Chr
-	Access Types: Get
-	Values: N/A
-	*/
-	MSmlDmDDFObject& data = oneCurTheme.AddChildObjectL( KThemesAdapterXData );
-	FillNodeInfoL( data, accessTypesReplace, MSmlDmDDFObject::EOne, MSmlDmDDFObject::EPermanent,
-		MSmlDmDDFObject::EBin, KThemesAdapterXDataD, ETrue );
-
-
-	/*
-	Node: ./Customization/Themes/AvailableThemes/<X>/InstallOptions
-
-	Status: ?
-	Occurs: One
-	Format: Chr
-	Access Types: Get
-	Values: N/A
-	*/
-	MSmlDmDDFObject& installOptions = oneCurTheme.AddChildObjectL( KThemesAdapterXInstallOptions );
-	FillNodeInfoL( installOptions, accessTypesReplace, MSmlDmDDFObject::EOne, MSmlDmDDFObject::EPermanent,
-		MSmlDmDDFObject::EXml, KThemesAdapterXInstallOptionsD, ETrue );
-
-
-	/*
-	Node: ./Customization/Themes/ActiveTheme
-
-	Status: Required
-	Occurs: One
-	Format: Chr
-	Access Types: Get, Replace
-	Values: N/A
-	*/
-	MSmlDmDDFObject& activeTheme = themes.AddChildObjectL( KThemesAdapterActiveTheme );
-	FillNodeInfoL( activeTheme, accessTypesGetReplace, MSmlDmDDFObject::EOne, MSmlDmDDFObject::EPermanent,
-		MSmlDmDDFObject::EChr, KThemesAdapterActiveThemeD, ETrue );
-
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  CThemesAdapter::UpdateLeafObjectL()
-//  
-// ------------------------------------------------------------------------------------------------
-void CThemesAdapter::_UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& /*aLUID*/, const TDesC8& aObject, const TDesC8& /*aType*/, const TInt aStatusRef )
-	{
-	RDEBUG( "CThemesAdapter::UpdateLeafObjectL(): begin" );
-	
-	TError ret = EOk ;
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-	TPtrC8 uriPtrc = NSmlDmURI::RemoveDotSlash( aURI );
-	TNodeId nodeId = NodeId( uriPtrc );
-#else
-	TNodeId nodeId = NodeId( aURI );
-#endif
-	
-	switch( nodeId )
-		{
-	case ENodeXName:
-		if (aObject.Length() > 0)
-			{
-#ifdef __TARM_SYMBIAN_CONVERGENCY	
-			iCallBack->SetMappingL( uriPtrc, aObject );
-#else		
-			iCallBack->SetMappingL( aURI, aObject );
-#endif			
-			}
-		else
-			{
-#ifdef __TARM_SYMBIAN_CONVERGENCY		
-			iCallBack->SetMappingL( uriPtrc, _L8(" ") );
-#else	
-			iCallBack->SetMappingL( aURI, _L8(" ") );
-#endif			
-			}
-		break;
-
-	case ENodeXVersion:
-		if (aObject.Length() > 0)
-			{
-#ifdef __TARM_SYMBIAN_CONVERGENCY	
-			iCallBack->SetMappingL( uriPtrc, aObject );
-#else		
-			iCallBack->SetMappingL( aURI, aObject );
-#endif	
-			}
-		else
-			{
-#ifdef __TARM_SYMBIAN_CONVERGENCY		
-			iCallBack->SetMappingL( uriPtrc, _L8(" ") );
-#else	
-			iCallBack->SetMappingL( aURI, _L8(" ") );
-#endif	
-			}
-		break;
-
-	case ENodeXData:
-		{
-		RFs fs;
-		User::LeaveIfError( fs.Connect() );
-		CleanupClosePushL( fs );
-
-		TFileCoderB64 decoder;
-		TPtrC fileName( KThemesAdapterTmpInstallPath );
-
-	 	TBool isEncoded = TFileCoderB64::CheckB64Encode( aObject );
-	 	if( isEncoded )
-	 		{
-	 		decoder.DecodeToL( aObject, fileName );
-	 		}
-		else
-			{
-			// aData is original data, save it to fileName
-			RFile file;
-			User::LeaveIfError( file.Replace( fs, fileName, EFileWrite));
-			CleanupClosePushL( file );
-			file.Write( aObject );
-			
-			CleanupStack::PopAndDestroy(); // file
-			}		
-
-		TBuf8<KMaxUidName+20> sisPkgUid;
-		TBuf8<KAknsPkgIDDesSize> themePkgId;
-
-		// Install using options if given and otherwise with default options
-		ret = iThemes->InstallThemeL( fileName, sisPkgUid, themePkgId );
-		
-		// Set LUIDs for theme and theme/id
-		if (ret == KErrNone)
-			{
-#ifdef __TARM_SYMBIAN_CONVERGENCY		
-			TPtrC8 parentURI = NSmlDmURI::ParentURI( uriPtrc );
-#else	
-			TPtrC8 parentURI = NSmlDmURI::ParentURI( aURI );
-#endif					
-			HBufC8* dataURI = HBufC8::NewLC( parentURI.Length() + KThemesAdapterXData().Length() + 1 );
-			HBufC8* idURI = HBufC8::NewLC( parentURI.Length() + KThemesAdapterXId().Length() + 1 );
-			dataURI->Des().Copy( parentURI );
-			dataURI->Des().Append( KSlash );
-			dataURI->Des().Append( KThemesAdapterXData );
-			idURI->Des().Copy( parentURI );
-
-			iCallBack->SetMappingL( *dataURI, sisPkgUid );
-			iCallBack->SetMappingL( *idURI, themePkgId );
-
-			CleanupStack::PopAndDestroy( idURI );
-			CleanupStack::PopAndDestroy( dataURI );
-			
-			if( iActiveTheme != NULL )
-				{
-				TPtrC8 pid = NSmlDmURI::LastURISeg( *iActiveTheme );
-				HBufC8* themeRef = HBufC8::NewLC( KThemesAdapterActiveThemeRef().Length() + pid.Length() + 1 );
-				themeRef->Des().Copy( KThemesAdapterActiveThemeRef );
-				themeRef->Des().Append( pid );
-				HBufC8* luid = iCallBack->GetLuidAllocL( *themeRef );
-				CleanupStack::PushL( luid );
-
-				if (luid->Length() > 1)
-					{
-					pid.Set( *luid );
-					ret = iThemes->SetActiveThemeL( pid );
-					delete iActiveTheme;
-					iActiveTheme = NULL;
-					}
-
-				CleanupStack::PopAndDestroy( luid );
-				CleanupStack::PopAndDestroy( themeRef );
-				
-				}
-		
-			}
-
-		// Remove temporary installations file
-		fs.Delete( fileName );
-		CleanupStack::PopAndDestroy( &fs );
-		}
-		break;
-
-	case ENodeXInstallOptions:
-		ret = iThemes->SetInstallOptionsL( aObject );
-		break;
-
-	case ENodeActiveTheme:
-		{
-		if( iActiveTheme != NULL )
-			{
-			delete iActiveTheme;
-			iActiveTheme = NULL;
-			}
-		iActiveTheme = aObject.AllocL();
-		TPtrC8 pid = NSmlDmURI::LastURISeg( aObject );
-		HBufC8* themeRef = HBufC8::NewLC( KThemesAdapterActiveThemeRef().Length() + pid.Length() + 1 );
-		themeRef->Des().Copy( KThemesAdapterActiveThemeRef );
-		themeRef->Des().Append( pid );
-		HBufC8* luid = iCallBack->GetLuidAllocL( *themeRef );
-		CleanupStack::PushL( luid );
-
-			if (luid->Length() > 1)
-			{
-			pid.Set( *luid );
-			}
-			ret = iThemes->SetActiveThemeL( pid );
-			if( ret == MSmlDmAdapter::EOk )
-				{
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-				iCallBack->SetMappingL( uriPtrc, *themeRef );
-#else
-				iCallBack->SetMappingL( aURI, *themeRef );
-#endif				
-				}
-			else
-			{
-				ret = EError;
-			}
-
-			delete iActiveTheme;
-			iActiveTheme = NULL;
-
-		CleanupStack::PopAndDestroy( luid );
-		CleanupStack::PopAndDestroy( themeRef );
-		}
-		break;
-
-	default:
-		ret = EError;
-		break;
-		}
-		
-	iCallBack->SetStatusL( aStatusRef,  ret );
-	}
-
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-void CThemesAdapter::_UpdateLeafObjectL( const TDesC8& /*aURI*/, const TDesC8& /*aLUID*/, RWriteStream*& /*aStream*/, const TDesC8& /*aType*/, TInt aStatusRef )
-	{
-	RDEBUG( "CThemesAdapter::UpdateLeafObjectL(...RWriteStream...): begin" );
-	TError ret = EError ;
-	iCallBack->SetStatusL( aStatusRef,  ret );
-	}
-
-// ------------------------------------------------------------------------------------------------
-// CThemesAdapter::DeleteObjectL( const TDesC& aURI, const TDesC& aLUID )
-// ------------------------------------------------------------------------------------------------
-void CThemesAdapter::_DeleteObjectL( const TDesC8& aURI, const TDesC8& /*aLUID*/, const TInt aStatusRef)
-	{
-	RDEBUG( "CThemesAdapter::DeleteObjectL(): begin" );
-
-	TError ret = EOk ;
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-	TPtrC8 uriPtrc = NSmlDmURI::RemoveDotSlash( aURI );
-	TNodeId nodeId = NodeId( uriPtrc );
-#else
-	TNodeId nodeId = NodeId( aURI );
-#endif	
-
-	switch( nodeId )
-		{
-	case ENodeX:
-		{
-		TUint pkgUid = 0;
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-		HBufC8* dataURI = HBufC8::NewLC( uriPtrc.Length() + KThemesAdapterXData().Length() + 1 );
-		dataURI->Des().Append( uriPtrc );
-#else
-		HBufC8* dataURI = HBufC8::NewLC( aURI.Length() + KThemesAdapterXData().Length() + 1 );
-		dataURI->Des().Append( aURI );
-#endif			
-		
-		HBufC8* themeId = iCallBack->GetLuidAllocL( *dataURI );
-		CleanupStack::PushL( themeId );
-		
-		dataURI->Des().Append( KSlash );
-		dataURI->Des().Append( KThemesAdapterXData );
-		HBufC8* luid = iCallBack->GetLuidAllocL( *dataURI );
-		CleanupStack::PushL( luid );
-		
-		if (luid->CompareF(KNullDesC8) == 0 )
-		    {
-		    ret = ENotFound;
-		    CleanupStack::PopAndDestroy( 3 ); //luid, themeId, dataURI
-		    break; 
-		    }
-				
-		TLex8 parser( *luid );
-		if ((parser.Get() == '[') &&
-			(parser.Val( pkgUid, EHex ) == KErrNone) &&
-			(parser.Get() == ']'))
-			{
-			//luid for getting index 
-			ret = iThemes->DeleteThemeL(  *themeId, TUid::Uid( pkgUid ),luid);
-			}
-		else
-			{
-			ret = ENotAllowed;
-            }
-	
-		CleanupStack::PopAndDestroy( 3 );
-		
-		}
-		break;
-
-	default:
-		ret = EError;
-		break;
-		}
-
-	iCallBack->SetStatusL( aStatusRef,  ret );
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  CThemesAdapter::GetLeafObjectL( const TDesC& aURI, const TDesC& aLUID, const TDesC& aType, CBufBase& aObject, TError& aRet )
-// ------------------------------------------------------------------------------------------------
-void CThemesAdapter::GetLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, const TDesC8& /*aType*/, CBufBase& aResult, TError& aRet )
-	{
-	RDEBUG("CThemesAdapter::GetLeafObjectL(): begin");
-	aRet = EOk;
-	
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-	TPtrC8 uriPtrc = NSmlDmURI::RemoveDotSlash( aURI );
-	TNodeId nodeId = NodeId( uriPtrc );
-	TPtrC8 parentURI = NSmlDmURI::ParentURI( uriPtrc );
-#else
-	TNodeId nodeId = NodeId( aURI );
-	TPtrC8 parentURI = NSmlDmURI::ParentURI( aURI );
-#endif	
-	
-	TPtrC8 pid = NSmlDmURI::LastURISeg( parentURI );
-	
-	HBufC8* parentLUID = iCallBack->GetLuidAllocL(parentURI);
-    CleanupStack::PushL(parentLUID);
-	
-	//Check for Active theme; if it is not, then only check for DM installed parent node
-    if (nodeId != ENodeActiveTheme && parentLUID->CompareF(KNullDesC8) == 0)
-        {
-        aRet = ENotFound;
-        }
-		
-	if (aRet == EOk)
-        {
-        HBufC8* trimmedLUID = aLUID.AllocL();
-        CleanupStack::PushL(trimmedLUID);
-        trimmedLUID->Des().Trim();
-
-        switch (nodeId)
-            {
-            case ENodeXId:
-                if (trimmedLUID->Length() > 0 && *trimmedLUID != *parentLUID)
-                    {
-                    aResult.InsertL(aResult.Size(), aLUID);
-                    }
-                else
-                    {
-                    if (parentLUID->Length() > 1)
-                        {
-                        pid.Set(*parentLUID);
-                        }
-                    aRet = iThemes->GetThemeIdL(pid, aResult);
-                    }
-                break;
-
-            case ENodeXName:
-                {
-
-                if (trimmedLUID->Length() > 0 && *trimmedLUID != *parentLUID)
-                    {
-                    aResult.InsertL(aResult.Size(), aLUID);
-                    }
-                if (parentLUID->Length() > 1)
-                    {
-                    pid.Set(*parentLUID);
-                    aResult.InsertL(aResult.Size(), KOpenBrace);
-                    aRet = iThemes->GetThemeNameL(pid, aResult);
-                    aResult.InsertL(aResult.Size(), KCloseBrace);
-                    }
-                }
-                break;
-
-            case ENodeXVersion:
-                if (trimmedLUID->Length() > 0 && *trimmedLUID != *parentLUID)
-                    {
-                    aResult.InsertL(aResult.Size(), aLUID);
-                    }
-                else
-                    {
-                    if (parentLUID->Length() > 1)
-                        {
-                        pid.Set(*parentLUID);
-                        }
-                    aRet = iThemes->GetThemeVersionL(pid, aResult);
-                    }
-                break;
-
-            case ENodeActiveTheme:
-                {
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-                TPtrC8 uriPtrc = NSmlDmURI::RemoveDotSlash( aURI );
-                HBufC8* luid = iCallBack->GetLuidAllocL( uriPtrc );
-#else
-                HBufC8* luid = iCallBack->GetLuidAllocL(aURI);
-#endif
-                CleanupStack::PushL(luid);
-
-                HBufC8* themePID = iCallBack->GetLuidAllocL(aLUID);
-                CleanupStack::PushL(themePID);
-                // Get the current active theme UID
-                TAknsPkgIDBuf buf;
-                CRepository* skinsRepository = CRepository::NewLC(
-                        KCRUidPersonalisation);
-                TInt errCode = skinsRepository->Get(KPslnActiveSkinUid, buf);
-
-                HBufC16* themePID16 = HBufC16::NewLC(themePID->Length());
-                themePID16->Des().Copy(themePID->Des());
-
-                if (themePID16->Compare(buf) == 0)
-                    {
-                    RDEBUG("CThemesAdapter::GetLeafObjectL(): UIDs MATCH ");
-                    aResult.InsertL(aResult.Size(), *luid);
-                    aResult.InsertL(aResult.Size(), KOpenBrace);
-                    aRet = iThemes->GetThemeNameL(*themePID, aResult);
-                    aResult.InsertL(aResult.Size(), KCloseBrace);
-                    }
-                else
-                    {
-                    //means Active theme set by DM server is changed to some other theme
-                    //manually from settings
-                    RDEBUG(
-                            "CThemesAdapter::GetLeafObjectL(): UIDs Doesn't MATCH ");
-                    HBufC8* buf8 = HBufC8::NewLC(KAknsPkgIDDesSize);
-                    buf8->Des().Copy(buf);
-                    aRet = iThemes->GetThemeNameL(*buf8, aResult);
-                    CleanupStack::PopAndDestroy(buf8);
-                    }
-                CleanupStack::PopAndDestroy(themePID16);
-                CleanupStack::PopAndDestroy(skinsRepository);
-                CleanupStack::PopAndDestroy(themePID);
-                CleanupStack::PopAndDestroy(luid);
-                }
-                break;
-
-            default:
-                aRet = EError;
-                break;
-            }
-
-        CleanupStack::PopAndDestroy(trimmedLUID);
-        }
-	CleanupStack::PopAndDestroy( parentLUID );
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  CThemesAdapter::FetchLeafObjectL( const TDesC& aURI, const TDesC& aLUID, const TDesC& aType, CBufBase& aObject )
-// ------------------------------------------------------------------------------------------------
-void CThemesAdapter::_FetchLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, const TDesC8& aType, const TInt aResultsRef, const TInt aStatusRef )
-	{
-	RDEBUG("CThemesAdapter::FetchLeafObjectL(): begin");
-
-	TError ret = EOk ;
-
-	CBufBase *result = CBufFlat::NewL( 128 );
-	CleanupStack::PushL( result );
-	
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-		TPtrC8 uriPtrc = NSmlDmURI::RemoveDotSlash( aURI );
-		GetLeafObjectL( uriPtrc, aLUID, aType, *result, ret );
-#else
-		GetLeafObjectL( aURI, aLUID, aType, *result, ret );
-#endif
-
-	if (ret == EOk)
-		{
-		iCallBack->SetResultsL( aResultsRef, *result, KThemesAdapterTextPlain() );
-		}
-
-	iCallBack->SetStatusL( aStatusRef, ret );
-
-	CleanupStack::PopAndDestroy( result );
-	}
-
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-void CThemesAdapter::_FetchLeafObjectSizeL( const TDesC8& aURI, const TDesC8& aLUID, const TDesC8& aType, TInt aResultsRef, TInt aStatusRef )
-	{
-	RDEBUG("CThemesAdapter::FetchLeafObjectSizeL(): begin");
-
-	TError ret = EOk ;
-
-	CBufBase *result = CBufFlat::NewL( 128 );
-	CleanupStack::PushL( result );
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-		TPtrC8 uriPtrc = NSmlDmURI::RemoveDotSlash( aURI );
-		GetLeafObjectL( uriPtrc, aLUID, aType, *result, ret );
-#else
-		GetLeafObjectL( aURI, aLUID, aType, *result, ret );
-#endif	
-
-	if (ret == EOk)
-		{
-		TBuf8<20> len;
-		len.AppendNum( result->Size() );
-		result->Reset();
-		result->InsertL( 0, len );
-
-		iCallBack->SetResultsL( aResultsRef, *result, KThemesAdapterTextPlain() );
-		}
-
-	iCallBack->SetStatusL( aStatusRef, ret );
-
-	CleanupStack::PopAndDestroy( result );
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  CThemesAdapter::ChildURIListL( const TDesC& aURI, const TDesC& aParentLUID, const CArrayFix<TSmlDmMappingInfo>& aPreviousURISegmentList, CArrayFix<TPtrC>& aCurrentURISegmentList )
-// ------------------------------------------------------------------------------------------------
-void CThemesAdapter::_ChildURIListL( const TDesC8& aURI, const TDesC8& /*aLUID*/, const CArrayFix<TSmlDmMappingInfo>& aPreviousURISegmentList, const TInt aResultsRef, const TInt aStatusRef  )
-	{
-	RDEBUG("CThemesAdapter::ChildURIListL(): begin");
-
-	TError ret = EOk ;
-	
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-	TPtrC8 uriPtrc = NSmlDmURI::RemoveDotSlash( aURI );
-	TNodeId nodeId = NodeId( uriPtrc );
-#else
-	TNodeId nodeId = NodeId( aURI );
-#endif	
-
-	CBufBase *currentList = CBufFlat::NewL( 128 );
-	CleanupStack::PushL( currentList );
-	
-	
-
-	
-        switch (nodeId)
-        {
-        case ENodeCustomization:
-            currentList->InsertL(currentList->Size(), KThemesAdapterThemes);
-            break;
-
-        case ENodeThemes:
-            currentList->InsertL(currentList->Size(),
-                    KThemesAdapterAvailableThemes);
-            currentList->InsertL(currentList->Size(), KSlash);
-            currentList->InsertL(currentList->Size(),
-                    KThemesAdapterActiveTheme);
-            break;
-
-        case ENodeAvailableThemes:
-            {
-            CDesC8ArrayFlat* newThemes = new (ELeave) CDesC8ArrayFlat(16);
-            CleanupStack::PushL(newThemes);
-
-            CDesC8ArrayFlat* themes = new (ELeave) CDesC8ArrayFlat(32);
-            CleanupStack::PushL(themes);
-
-            iThemes->GetInstalledPIDListL(aPreviousURISegmentList, *themes,
-                    *newThemes);
-
-            SyncWithAvkonSkinDB(*themes);
-            //get actual theme names and send to DM server
-            TInt i = 0;
-            TPtrC8 pid;
-            for (i = 0; i < themes->Count(); i++)
-                {
-
-                HBufC8* themeRef = HBufC8::NewLC(
-                        KThemesAdapterActiveThemeRef().Length()
-                                + (*themes)[i].Length() + 1);
-                themeRef->Des().Copy(KThemesAdapterActiveThemeRef);
-                themeRef->Des().Append((*themes)[i]);
-                HBufC8* luid = iCallBack->GetLuidAllocL(*themeRef);
-                CleanupStack::PushL(luid);
-
-                if (luid->Length() > 1)
-                    {
-                    if (currentList->Size() > 0)
-                        {
-                        currentList->InsertL(currentList->Size(), KSlash);
-                        }
-                    pid.Set(*luid);
-                    currentList->InsertL(currentList->Size(), (*themes)[i]);
-                    currentList->InsertL(currentList->Size(), KOpenBrace);
-                    TInt ret = iThemes->GetThemeNameL(pid, *currentList);
-                    currentList->InsertL(currentList->Size(), KCloseBrace);
-                    }
-                CleanupStack::PopAndDestroy(luid);
-                CleanupStack::PopAndDestroy(themeRef);
-                }
-            for (i = 0; i < newThemes->Count(); i++)
-                {
-                if (currentList->Size() > 0)
-                    {
-                    currentList->InsertL(currentList->Size(), KSlash);
-                    }
-                pid.Set((*newThemes)[i]);
-                TInt ret = iThemes->GetThemeNameL(pid, *currentList);
-                }
-
-            CleanupStack::PopAndDestroy(themes);
-            CleanupStack::PopAndDestroy(newThemes);
-            }
-            break;
-
-        case ENodeX:
-            {
-            //Determine whether the node is DM installed node
-            HBufC8* lUID = iCallBack->GetLuidAllocL(aURI);
-
-            if (lUID->CompareF(KNullDesC8) == 0)
-                {
-                ret = ENotFound;
-                }
-
-            delete lUID;
-
-            if (ret == EOk)
-                {
-                currentList->InsertL(currentList->Size(), KThemesAdapterXId);
-                currentList->InsertL(currentList->Size(), KSlash);
-                currentList->InsertL(currentList->Size(), KThemesAdapterXName);
-                currentList->InsertL(currentList->Size(), KSlash);
-                currentList->InsertL(currentList->Size(),
-                        KThemesAdapterXVersion);
-                currentList->InsertL(currentList->Size(), KSlash);
-                currentList->InsertL(currentList->Size(), KThemesAdapterXData);
-                currentList->InsertL(currentList->Size(), KSlash);
-                currentList->InsertL(currentList->Size(),
-                        KThemesAdapterXInstallOptions);
-                }
-
-            break;
-            }
-
-        case ENodeXId:
-            // No children, leave list empty
-            break;
-
-        case ENodeXName:
-            // No children, leave list empty
-            break;
-
-        case ENodeXVersion:
-            // No children, leave list empty
-            break;
-
-        case ENodeXData:
-            // No children, leave list empty
-            break;
-
-        case ENodeXInstallOptions:
-            // No children, leave list empty
-            break;
-
-        case ENodeActiveTheme:
-            // No children, leave list empty
-            break;
-
-        case ENodeUnknown:
-            ret = ENotFound;
-            break;
-
-        default:
-            break;
-        }
-	if( ret == EOk )
-		{
-		iCallBack->SetResultsL( aResultsRef, *currentList, KNullDesC8 );
-		}
-
-    iCallBack->SetStatusL(aStatusRef, ret);
-
-	CleanupStack::PopAndDestroy(currentList); //currentList
-	}
-
-
-// ------------------------------------------------------------------------------------------------
-// CThemesAdapter::AddNodeObjectL( const TDesC& aURI, const TDesC& aParentLUID )
-// ------------------------------------------------------------------------------------------------
-void CThemesAdapter::_AddNodeObjectL( const TDesC8& aURI, const TDesC8& /*aParentLUID*/, const TInt aStatusRef )
-	{
-	RDEBUG("CThemesAdapter::AddNodeObjectL(): begin");
-
-	TError ret = EOk ;
-	
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-	TPtrC8 uriPtrc = NSmlDmURI::RemoveDotSlash( aURI );
-	TPtrC8 parentURI = NSmlDmURI::ParentURI( uriPtrc );
-#else
-	TPtrC8 parentURI = NSmlDmURI::ParentURI( aURI );
-#endif	
-
-	TNodeId parentNodeId = NodeId( parentURI );
-
-	
-	HBufC8* parentLUID = iCallBack->GetLuidAllocL( parentURI );
-	CleanupStack::PushL( parentLUID );
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-	HBufC8* trimmedLUID = iCallBack->GetLuidAllocL( uriPtrc );
-#else	
-	HBufC8* trimmedLUID = iCallBack->GetLuidAllocL( aURI );
-#endif
-	
-	CleanupStack::PushL( trimmedLUID );
-	trimmedLUID->Des().Trim();
-
-	switch( parentNodeId )
-		{
-	case ENodeAvailableThemes:
-		// Set LUID mapping to make this new node permanent
-		if ( trimmedLUID->Length() > 0 && *trimmedLUID != *parentLUID)
-			{
-			ret = EAlreadyExists;
-			}
-		else
-			{
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-			iCallBack->SetMappingL( uriPtrc, _L8(" ") );	
-#else	
-			iCallBack->SetMappingL( aURI, _L8(" ") );
-#endif				
-			}
-		break;
-
-	default:
-		ret = EError;
-		break;
-		}
-
-	// Cleanup
-	CleanupStack::Pop( trimmedLUID );
-	CleanupStack::Pop( parentLUID );
-
-	iCallBack->SetStatusL( aStatusRef, ret );
-	}
-
-
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-void CThemesAdapter::_ExecuteCommandL( const TDesC8& /*aURI*/, const TDesC8& /*aLUID*/, const TDesC8& /*aArgument*/, const TDesC8& /*aType*/, TInt aStatusRef )
-	{
-	RDEBUG("CThemesAdapter::ExecuteCommandL(): begin");
-	//Not supported
-	TError ret = EError;
-	iCallBack->SetStatusL( aStatusRef, ret );
-	}
-
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-void CThemesAdapter::_ExecuteCommandL( const TDesC8& /*aURI*/, const TDesC8& /*aLUID*/, RWriteStream*& /*aStream*/, const TDesC8& /*aType*/, TInt aStatusRef )
-	{
-	RDEBUG("CThemesAdapter::ExecuteCommandL(...RWriteStream...): begin");
-	//Not supported
-	TError ret = EError;
-	iCallBack->SetStatusL( aStatusRef, ret );
-	}
-	
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-void CThemesAdapter::_CopyCommandL( const TDesC8& /*aTargetURI*/, const TDesC8& /*aTargetLUID*/, const TDesC8& /*aSourceURI*/, const TDesC8& /*aSourceLUID*/, const TDesC8& /*aType*/, TInt aStatusRef )
-	{
-	RDEBUG("CThemesAdapter::CopyCommandL(): begin");
-	//Not supported
-	TError ret = EError;
-	iCallBack->SetStatusL( aStatusRef, ret );
-	}
-
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-void CThemesAdapter::StartAtomicL()
-	{
-	RDEBUG("CThemesAdapter::StartAtomicL(): begin");
-	//Not supported
-	}
-
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-void CThemesAdapter::CommitAtomicL()
-	{
-	RDEBUG("CThemesAdapter::CommitAtomicL(): begin");
-	//Not supported
-	}
-
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-void CThemesAdapter::RollbackAtomicL()
-	{
-	RDEBUG("CThemesAdapter::RollbackAtomicL(): begin");
-	//Not supported
-	}
-
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-TBool CThemesAdapter::StreamingSupport( TInt& /*aItemSize*/ )
-	{
-	RDEBUG("CThemesAdapter::StreamingSupport(): begin");
-	return EFalse;
-	}
-
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-#ifdef __TARM_SYMBIAN_CONVERGENCY	
-void CThemesAdapter::StreamCommittedL( RWriteStream& /*aStream*/ )
-#else
-void CThemesAdapter::StreamCommittedL()
-#endif	
-	{	
-	RDEBUG("CThemesAdapter::StreamCommittedL(): begin");
-	RDEBUG("CThemesAdapter::StreamCommittedL(): end");
-	}
-
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-void CThemesAdapter::CompleteOutstandingCmdsL()
-	{
-	RDEBUG("CThemesAdapter::CompleteOutstandingCmdsL(): begin");
-	}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-//
-//#ifdef __SAP_POLICY_MANAGEMENT
-TPtrC8 CThemesAdapter::PolicyRequestResourceL( const TDesC8& /*aURI*/ )
-	{
-	if(!FeatureManager::FeatureSupported(KFeatureIdSapPolicyManagement ))
-	{
-	User::Leave(KErrNotSupported);
-	}
-	RDEBUG("CThemesAdapter::PolicyRequestResourceL(): begin");
-	return PolicyEngineXACML::KCustomizationManagement();
-	}
-//#endif
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-CThemesAdapter::TNodeId CThemesAdapter::NodeId( const TDesC8& aURI )
-	{
-	TNodeId id = ENodeUnknown;
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-	TPtrC8 uriPtrc = NSmlDmURI::RemoveDotSlash( aURI );
-	TInt cnt( NSmlDmURI::NumOfURISegs( uriPtrc ) );
-	TPtrC8 app( NSmlDmURI::LastURISeg( uriPtrc ) );
-#else
-	TInt cnt( NSmlDmURI::NumOfURISegs( aURI ) );
-	TPtrC8 app( NSmlDmURI::LastURISeg( aURI ) );
-#endif
-
-	if ( cnt == 1 )
-		{
-		// /Customization (G)
-		if (app == KThemesAdapterCustomization)
-			{
-			id = ENodeCustomization;
-			}
-		}
-	else if ( cnt == 2 ) 
-		{
-		// /Customization/Themes (G)
-		if (app == KThemesAdapterThemes)
-			{
-			id = ENodeThemes;
-			}
-		}
-	else if ( cnt == 3 ) 
-		{
-		// /Customization/Themes/AvailableThemes (AG)
-		// /Customization/Themes/ActiveTheme (GR)
-		if (app == KThemesAdapterAvailableThemes)
-			{
-			id = ENodeAvailableThemes;
-			}
-		else if (app == KThemesAdapterActiveTheme)
-			{
-			id = ENodeActiveTheme;
-			}
-		}
-	else if (cnt == 4)
-		{
-		// /Customization/Themes/CurrentThemes/<X> (DGR)
-		id = ENodeX;
-		}
-	else if (cnt == 5)
-		{
-		// /Customization/Themes/CurrentThemes/<X>/ID (G)
-		// /Customization/Themes/CurrentThemes/<X>/Name (GR)
-		// /Customization/Themes/CurrentThemes/<X>/Version (GR)
-		// /Customization/Themes/CurrentThemes/<X>/Data (R)
-		// /Customization/Themes/CurrentThemes/<X>/InstallOptions (R)
-		if (app == KThemesAdapterXId)
-			{
-			id = ENodeXId;
-			}
-		else if (app == KThemesAdapterXName)
-			{
-			id = ENodeXName;
-			}
-		else if (app == KThemesAdapterXVersion)
-			{
-			id = ENodeXVersion;
-			}
-		else if (app == KThemesAdapterXData)
-			{
-			id = ENodeXData;
-			}
-		else if (app == KThemesAdapterXInstallOptions)
-			{
-			id = ENodeXInstallOptions;
-			}
-		}
-
-	return id;
-	}
-
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-const TImplementationProxy ImplementationTable[] = 
-	{
-	{ {KThemesAdapterImplUid}, (TProxyNewLPtr)CThemesAdapter::NewL }
-	};
-
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy( TInt& aTableCount )
-	{
-	aTableCount = sizeof( ImplementationTable ) / sizeof( TImplementationProxy );
-	return ImplementationTable;
-	}
-
-// -------------------------------------------------------------------------------------
-// CThemesAdapter::FillNodeInfoL()
-// Fills the node info in ddf structure
-// -------------------------------------------------------------------------------------
-void CThemesAdapter::FillNodeInfoL( MSmlDmDDFObject& aNode,TSmlDmAccessTypes aAccTypes,
-										MSmlDmDDFObject::TOccurence aOccurrence, MSmlDmDDFObject::TScope aScope, 
-										MSmlDmDDFObject::TDFFormat aFormat,const TDesC8& aDescription,TBool /*aObjectGroup*/)
-	{
-	aNode.SetAccessTypesL(aAccTypes);
-	aNode.SetOccurenceL(aOccurrence);
-	aNode.SetScopeL(aScope);
-	aNode.SetDFFormatL(aFormat);
-	if(aFormat!=MSmlDmDDFObject::ENode)
-		{
-		aNode.AddDFTypeMimeTypeL(KThemesAdapterTextPlain);
-		}
-	aNode.SetDescriptionL(aDescription);
-	}
-
-// -------------------------------------------------------------------------------------
-// CThemesAdapter::IsImage()
-// Checks whether the given mime type is image format (that we support)
-// -------------------------------------------------------------------------------------
-TBool CThemesAdapter::IsImage(const TDesC& aMime) 
-	{
-	
-	if (aMime == _L("image/jpeg") || aMime == _L("image/gif")) 
-		{
-			return ETrue;
-		}
-	return ETrue ; 
-	//return EFalse;
-	}
-void CThemesAdapter::SyncWithAvkonSkinDB(CDesC8ArrayFlat& themes)
-    {
-    TInt i = 0;
-    TPtrC8 pid;
-    for (i=0; i<themes.Count(); i++)
-        {
-        HBufC8* themeRef = HBufC8::NewLC(KThemesAdapterActiveThemeRef().Length() + themes[i].Length() + 1);
-        themeRef->Des().Copy(KThemesAdapterActiveThemeRef);
-        themeRef->Des().Append(themes[i]);
-        HBufC8* luid = iCallBack->GetLuidAllocL( *themeRef);
-        CleanupStack::PushL(luid);
-
-        if (luid->Length() > 1)
-            {
-            pid.Set( *luid);
-            }
-        CBufBase *themeName = CBufFlat::NewL( 128);
-        CleanupStack::PushL(themeName);
-        TInt ret = iThemes->GetThemeNameL(pid, *themeName);
-        if (themeName->Size()== 0)
-            {
-            iCallBack->SetMappingL( *themeRef, KNullDesC8);
-            }
-        CleanupStack::PopAndDestroy(themeName);
-        CleanupStack::PopAndDestroy(luid);
-        CleanupStack::PopAndDestroy(themeRef);
-        }
-    }
--- a/customization/ThemesAdapter/src/ThemesAdapter.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-/*
-* Copyright (c) 2002 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: 
-*       Registery info for TARM DM Themes customization Adapter.
-*
-*/
-
-
-#include <registryinfo.rh>
-#define KSmlDMInterfaceUid 0x102018B4
-
-RESOURCE REGISTRY_INFO theRegistryInfo
-  {
-  dll_uid = 0x10207827; //The DLL's 3rd UID.
-  interfaces = 
-      {
-      INTERFACE_INFO
-          {
-          interface_uid = KSmlDMInterfaceUid; // DM interface UID
-          implementations = 
-            {
-            IMPLEMENTATION_INFO
-                {
-                implementation_uid = 0x10207828; // DM implementation UID
-                version_no = 1; 
-                display_name = "DM Themes Adapter";
-                default_data = "";
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-                opaque_data = "host=0x101F9A02";
-#else
-								opaque_data = "";
-#endif
-                }
-            };
-          }
-      };
-    }
--- a/customization/ThemesAdapter/src/ThemesList.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,803 +0,0 @@
-/*
-* Copyright (c) 2002 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:  DM Themes List
-*
-*/
-
-
-#include "ThemesList.h"
-
-#include <badesca.h>
-#include <implementationproxy.h> // For TImplementationProxy definition
-#include <e32def.h>
-#include <centralrepository.h>
-#include <AknSkinsInternalCRKeys.h>
-#include <sisregistrysession.h>
-#include <sisregistrypackage.h>
-
-#include "FileCoderB64.h"
-#include "aminstalloptions.h"
-#include "debug.h"
-
-#ifdef RD_MULTIPLE_DRIVE
-#include <driveinfo.h>
-#endif //RD_MULTIPLE_DRIVEs
-
-_LIT8( KSlash, "/" );
-_LIT8(KCol,":");
-const TInt KPostTimeOut = 10000000; // 10 seconds
-
-
-// ------------------------------------------------------------------------------------------------
-// CThemesList* CThemesList::NewL( )
-// ------------------------------------------------------------------------------------------------
-CThemesList* CThemesList::NewL( ) //sf-MSmlDmCallback* aDmCallback )
-	{
-	RDEBUG("CThemesList::NewL(): begin");
-
-	CThemesList* self = NewLC();
-	CleanupStack::Pop();
-	return self;
-	}
-
-// ------------------------------------------------------------------------------------------------
-// CThemesList* CThemesList::NewLC( )
-// ------------------------------------------------------------------------------------------------
-CThemesList* CThemesList::NewLC( ) //sf-MSmlDmCallback* aDmCallback )
-	{
-	CThemesList* self = new( ELeave ) CThemesList();
-	CleanupStack::PushL( self );
-	self->ConstructL( );
-	return self;
-	}
-
-
-// ------------------------------------------------------------------------------------------------
-// CThemesList::CThemesList()
-// ------------------------------------------------------------------------------------------------
-CThemesList::CThemesList( ) //sf-MSmlDmCallback* aDmCallback )
-//sf-	: iCallBack( aDmCallback )
-	: iDirty( ETrue )
-    , iAknsSrv( )
-    , iSkins( 0 )
-	, iInstallOptions()
-	{
-	GetDefaultInstallOptions( iInstallOptions );
-	}
-
-// ------------------------------------------------------------------------------------------------
-// CThemesList::ConstructL()
-// ------------------------------------------------------------------------------------------------
-void CThemesList::ConstructL(  )
-	{
-	User::LeaveIfError( iAknsSrv.Connect() );
-	}
-
-// ------------------------------------------------------------------------------------------------
-// CThemesList::~CThemesList()
-// ------------------------------------------------------------------------------------------------
-CThemesList::~CThemesList()
-	{
-	if (iSkins)
-		{
-		iSkins->ResetAndDestroy();
-		delete iSkins;
-		}
-	iAknsSrv.Close();
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  CThemesList::GetInstalledPIDListL()
-// ------------------------------------------------------------------------------------------------
-
-MSmlDmAdapter::TError CThemesList::GetInstalledPIDListL( const CArrayFix<TSmlDmMappingInfo>& aPreviousList, CDesC8ArrayFlat& themes, CDesC8Array& aNewThemes )
-	{
-	TInt i = 0;
-	TInt pos = 0;
-
-	CheckUpdatesL();
-
-	CDesC8ArrayFlat* luids = new (ELeave) CDesC8ArrayFlat( 32 );
-	CleanupStack::PushL( luids );
-
-	// Create list of existing themes
-	for (i = 0 ; i < aPreviousList.Count() ; i++)
-		{
-		themes.AppendL( aPreviousList[i].iURISeg );
-		luids->AppendL( aPreviousList[i].iURISegLUID );
-		}
-
-	// Find and add missing themes
-
-	for (i = 0 ; i < iSkins->Count() ; i++)
-		{
-		TAknsPkgIDBuf pidBuf;
-		TBuf8<KSmlMaxURISegLen> name;
-
-        TAknsPkgID pid = (*iSkins)[i]->PID();
-        pid.CopyToDes( pidBuf );
-        name.Copy( pidBuf );
-
-		if (luids->Find( name, pos ) != 0)
-			{
-			// not found
-			// Check that current "name" is not in use
-			if (themes.Find( name, pos ) != 0)
-				{
-				// not found
-				// add it to both current and new themes
-			//	themes->AppendL( name );
-				aNewThemes.AppendL( name );
-				}
-			}
-		}
-
-	// Fill result
-#if 0
-	for (i = 0 ; i < themes->Count() ; i++)
-		{
-		if (i > 0)
-			{
-			aList.InsertL( aList.Size(), KSlash );
-			}
-		aList.InsertL( aList.Size(), (*themes)[i] );
-		}
-
-#endif
-	// Cleanup
-	CleanupStack::PopAndDestroy( luids );
-	//CleanupStack::PopAndDestroy( themes );
-
-	return MSmlDmAdapter::EOk;
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  CThemesList::GetThemeIdL()
-// ------------------------------------------------------------------------------------------------
-MSmlDmAdapter::TError CThemesList::GetThemeIdL( const TDesC8& aPID, CBufBase& aResult )
-	{
-	MSmlDmAdapter::TError ret = MSmlDmAdapter::ENotFound;
-
-	CAknsSrvSkinInformationPkg* theme = FindThemeL( aPID );
-	if (theme != 0)
-		{
-		TAknsPkgIDBuf pid;
-		theme->PID().CopyToDes( pid );
-		TBuf8<KAknsPkgIDDesSize> pid8;
-		pid8.Copy( pid );
-		aResult.InsertL( aResult.Size(), pid8 );
-		ret = MSmlDmAdapter::EOk;
-		}
-
-	return ret;
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  CThemesList::GetThemeNameL()
-// ------------------------------------------------------------------------------------------------
-MSmlDmAdapter::TError CThemesList::GetThemeNameL( const TDesC8& aPID, CBufBase& aResult )
-	{
-	MSmlDmAdapter::TError ret = MSmlDmAdapter::ENotFound;
-
-	CAknsSrvSkinInformationPkg* theme = FindThemeL( aPID );
-	if (theme != 0)
-		{
-		TDesC& name = theme->Name();
-		HBufC8* buf = HBufC8::NewLC( name.Length() );
-		buf->Des().Copy( name );
-		aResult.InsertL( aResult.Size(), *buf );
-		CleanupStack::PopAndDestroy( buf );
-		ret = MSmlDmAdapter::EOk;
-		}
-
-	return ret;
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  CThemesList::GetThemeVersionL()
-// ------------------------------------------------------------------------------------------------
-MSmlDmAdapter::TError CThemesList::GetThemeVersionL( const TDesC8& aPID, CBufBase& /*aResult*/ )
-	{
-	MSmlDmAdapter::TError ret = MSmlDmAdapter::ENotFound;
-
-	CAknsSrvSkinInformationPkg* theme = FindThemeL( aPID );
-	if (theme != 0)
-		{
-		// Empty version, not supported (yet?)
-		ret = MSmlDmAdapter::EOk;
-		}
-
-	return ret;
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  CThemesList::GetActiveThemeL()
-// ------------------------------------------------------------------------------------------------
-MSmlDmAdapter::TError CThemesList::GetActiveThemeL( CBufBase& aResult )
-	{
-	MSmlDmAdapter::TError ret = MSmlDmAdapter::EOk;
-	TInt errCode = KErrNone;
-	TAknsPkgID pid = KAknsNullPkgID;
-    TAknsPkgIDBuf buf;
-
-    CRepository* skinsRepository = CRepository::NewLC( KCRUidPersonalisation );
-
-    errCode = skinsRepository->Get( KPslnActiveSkinUid, buf );
-    if( errCode == KErrNone )
-        {
-        TRAP( errCode, pid.SetFromDesL( buf ) );
-        }
-    if( errCode != KErrNone )
-        {
-//sf-        pid.Set( KAknsPIDDefaultSystemSkin );
-//sf- changes to KAknsPIDS60DefaltSystemSkin and
-//sf-         to KAknsPIDProductDefaultSystemSkin
-//sf- and the product default should be used (because variation might be done).
-//sf- Starting from S60 3.1 wk50 or wk52
-//sf- But: CenRep key should always hold a value so this code is not necessary.
-        }
-
-    pid.CopyToDes( buf );
-
-	CleanupStack::PopAndDestroy( skinsRepository );
-	skinsRepository = 0;
-
-	TBuf8<KAknsPkgIDDesSize> buf8;
-	buf8.Copy( buf );
-
-	aResult.InsertL( aResult.Size(), buf8 );
-
-	return ret;
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  CThemesList::SetActiveThemeL()
-// ------------------------------------------------------------------------------------------------
-MSmlDmAdapter::TError CThemesList::SetActiveThemeL( const TDesC8& aPID )
-	{
-	MSmlDmAdapter::TError ret = MSmlDmAdapter::EOk;
-	TInt errCode = KErrNone;
-
-	CAknsSrvSkinInformationPkg* theme = FindThemeL( aPID );
-	if (theme == 0)
-		{
-		errCode = KErrNotFound;
-		}
-	if (errCode == KErrNone)
-		{
-		errCode = iAknsSrv.SetAllDefinitionSets( theme->PID() );
-		}
-	if (errCode == KErrNone)
-		{
-		// Save settings to repository
-        TAknsPkgIDBuf pidBuf;
-        theme->PID().CopyToDes( pidBuf );
-
-		TAknSkinSrvSkinPackageLocation location =
-			LocationFromPath( theme->IniFileDirectory() );
-
-		CRepository* skinsRepository = CRepository::NewLC( KCRUidPersonalisation );
-
-        errCode = skinsRepository->Set( KPslnActiveSkinUid, pidBuf );
-        errCode = skinsRepository->Set( KPslnActiveSkinLocation, location );
-
-        CleanupStack::PopAndDestroy( skinsRepository );
-		}
-
-	if (errCode != KErrNone)
-		{
-		ret = MSmlDmAdapter::EError;
-		}
-
-	return ret;
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  CThemesList::SetInstallOptionsL()
-// ------------------------------------------------------------------------------------------------
-MSmlDmAdapter::TError CThemesList::SetInstallOptionsL( const TDesC8& aOptions )
-	{
-	MSmlDmAdapter::TError ret = MSmlDmAdapter::EOk;
-	TInt errCode = KErrNone;
-
-	GetDefaultInstallOptions( iInstallOptions );
-
-	if (aOptions.Length() > 0)
-	{
-		TRAP( errCode, InstallOptionsParser::ParseOptionsL( aOptions, iInstallOptions ) );
-	}
-	if (errCode != KErrNone)
-		{
-		ret = MSmlDmAdapter::EError;
-		}
-
-	return ret;
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  CThemesList::InstallThemeL()
-// ------------------------------------------------------------------------------------------------
-MSmlDmAdapter::TError CThemesList::InstallThemeL( const TDesC& aFileName, TDes8& aSisPkgUid, TDes8& aThemePkgId )
-	{
-	MSmlDmAdapter::TError ret = MSmlDmAdapter::EOk;
-	TInt errCode = KErrNone;
-
-	CDesC8Array* pkgUidsOrg = InstalledPackagesL( );
-	CleanupStack::PushL( pkgUidsOrg );
-	CDesC8Array* thmPidsOrg = InstalledThemesL( );
-	CleanupStack::PushL( thmPidsOrg );
-
-	// Install using options if given and otherwise with default options
-	SwiUI::RSWInstLauncher installer;
-	User::LeaveIfError( installer.Connect() );
-	CleanupClosePushL( installer );
-
-	SwiUI::TInstallOptionsPckg optPckg( iInstallOptions );
-	errCode = installer.SilentInstall( aFileName, optPckg );
-	CleanupStack::PopAndDestroy( &installer );
-
-	// Retrieve new list of installed packages and themes
-	CDesC8Array* pkgUidsNew = InstalledPackagesL( );
-	CleanupStack::PushL( pkgUidsNew );
-	CDesC8Array* thmPidsNew = InstalledThemesL( );
-	CleanupStack::PushL( thmPidsNew );
-
-	// Try to find sis package uid and theme package id
-	CDesC8Array* pkgUidsDif = FindNewItemsL( *pkgUidsOrg, *pkgUidsNew );
-	CleanupStack::PushL( pkgUidsDif );
-
-	CDesC8Array* thmPidsDif = FindNewItemsL( *thmPidsOrg, *thmPidsNew );
-	CleanupStack::PushL( thmPidsDif );
-
-	if (pkgUidsDif->Count() == 1)
-		{
-		aSisPkgUid = (*pkgUidsDif)[0];
-		}
-	if (thmPidsDif->Count() > 0)
-		{
-		aThemePkgId = (*thmPidsDif)[0];
-		}
-	RDEBUG_2( " CThemesList::InstallThemeL : SISPKGUID %X", &(aSisPkgUid) );
-	RDEBUG_2( " CThemesList::InstallThemeL : THEMEPKGUID %X", &(aThemePkgId) );
-
-	// Cleanup
-	CleanupStack::PopAndDestroy( thmPidsDif );
-	CleanupStack::PopAndDestroy( pkgUidsDif );
-	CleanupStack::PopAndDestroy( thmPidsNew );
-	CleanupStack::PopAndDestroy( pkgUidsNew );
-	CleanupStack::PopAndDestroy( thmPidsOrg );
-	CleanupStack::PopAndDestroy( pkgUidsOrg );
-
-	// Convert error code
-	if (errCode != KErrNone)
-		{
-		ret = MSmlDmAdapter::EError;
-		}
-
-	return ret;
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  CThemesList::DeleteThemeL()
-// ------------------------------------------------------------------------------------------------
-MSmlDmAdapter::TError CThemesList::DeleteThemeL( const TDesC8& aThemeId, const TUid& aPkgUid,HBufC8* aLuid)
-	{
-	MSmlDmAdapter::TError ret = MSmlDmAdapter::EOk;
-	TInt errCode = KErrNone;
-	
-	CAknsSrvSkinInformationPkg* theme = FindThemeL( aThemeId );
-	if (theme != NULL)
-		{
-		// Save settings to repository
-        TAknsPkgIDBuf pidBuf;
-        TAknsPkgID themepid = theme->PID();
-        themepid.CopyToDes(pidBuf);
-                
-        CRepository* skinsRepository = CRepository::NewLC(
-                KCRUidPersonalisation);
-
-        TAknsPkgIDBuf repBuf;
-        errCode = skinsRepository->Get(KPslnActiveSkinUid, repBuf);
-        if (errCode == KErrNone)
-            {
-            TAknsPkgID activepid = KAknsNullPkgID;
-            activepid.SetFromDesL(repBuf);
-
-            //Comparing the UIds of the active theme and the theme to be deleted
-            if (themepid.Uid() == activepid.Uid())
-                {
-                // deleted theme is active theme, deactive it first
-                TInt count = iSkins->Count();
-                if (count > 1)
-                    {
-                    pidBuf.Zero();
-                    CAknsSrvSkinInformationPkg* defaultTheme = (*iSkins)[0];
-                    defaultTheme->PID().CopyToDes(pidBuf);
-                    TBuf8<KAknsPkgIDDesSize> pidBuf8;
-                    pidBuf8.Copy(pidBuf);
-                    errCode = SetActiveThemeL(pidBuf8);
-
-                    if (errCode == KErrNone)
-                        {
-                        TRequestStatus timeoutStatus /*= KRequestPending*/;
-
-                        RTimer timeout;
-                        User::LeaveIfError(timeout.CreateLocal());
-                        CleanupClosePushL(timeout);
-                        timeout.After(timeoutStatus, KPostTimeOut);
-
-                        User::WaitForRequest(timeoutStatus);
-
-                        if (timeoutStatus.Int() == KRequestPending)
-                            {
-                            timeout.Cancel();
-                            User::WaitForRequest(timeoutStatus);
-                            }
-                        CleanupStack::PopAndDestroy(&timeout);
-                        }
-                    }
-                else
-                    {
-                    errCode = KErrGeneral;
-                    }
-                }
-
-            CleanupStack::PopAndDestroy(skinsRepository);
-            }
-
-        }
-    else
-        {
-        errCode = KErrNotFound;
-        }
-	
-
-	if( errCode == KErrNone )
-		{
-		iDirty = ETrue;
-
-		// Uninstall silent
-		SwiUI::RSWInstLauncher installer;
-		User::LeaveIfError( installer.Connect() );
-		CleanupClosePushL( installer );
-		
-		//Silent uninstall not working because of getting wrong package name
-		//So we used SilentCustomUninstall which uses  index and pkgUid to get correct package name
-		
-		TInt idx( KErrNotFound );
-		SwiUI::TOpUninstallIndexParam params;
-        params.iUid = aPkgUid;
-        TPtrC8 ptr1 = aLuid->Des();
-       	idx= ptr1.Find(KCol);
-       	if(idx != KErrNotFound)
-       		{
-        	TPtrC8 ptr = ptr1.Right((ptr1.Length()-idx)-1);
-        	TLex8 lex(ptr); 
-			lex.Val(params.iIndex); 
-       		}
-       	else
-       		{
-       	    ret = MSmlDmAdapter::ENotFound;
-			}
-         	 
-        SwiUI::TOpUninstallIndexParamPckg pckg( params );
-		SwiUI::TOperation operation( SwiUI::EOperationUninstallIndex );
-		
-		SwiUI::TUninstallOptions uninstallOptions;
-		SwiUI::TUninstallOptionsPckg optPckg( uninstallOptions );
-
-  		errCode = installer.SilentCustomUninstall( operation, optPckg, pckg,SwiUI::KSisxMimeType() );
-		RDEBUG_2("CThemesList::DeleteThemeL Uninstall silent :  errCode %X",errCode );
-
-		CleanupStack::PopAndDestroy( &installer );
-		}
-		
-	if (errCode == KErrNotFound)
-		{
-		ret = MSmlDmAdapter::ENotFound;
-		}
-	else if (errCode != KErrNone)
-		{
-		ret = MSmlDmAdapter::EError;
-		}
-
-	return ret;
-	}
-
-
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-//
-// Internal methods
-//
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-// ------------------------------------------------------------------------------------------------
-//  CThemesList::CheckUpdatesL()
-// ------------------------------------------------------------------------------------------------
-void CThemesList::CheckUpdatesL()
-	{
-	if (iDirty)
-		{
-		LoadSkinsL();
-		iDirty = EFalse;
-		}
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  CThemesList::LoadSkinsL()
-// ------------------------------------------------------------------------------------------------
-void CThemesList::LoadSkinsL()
-	{
-	// Cleanup old list
-	if (iSkins)
-		{
-		iSkins->ResetAndDestroy();
-		delete iSkins;
-		iSkins = 0;
-		}
-
-    // Drives z and c case EAknsSrvPhone: 
-    // drive e case EAknsSrvMMC: 
-    // all drives case EAknsSrvAll: 
-    iSkins = iAknsSrv.EnumerateSkinPackagesL( EAknsSrvAll );
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  CThemesList::
-// ------------------------------------------------------------------------------------------------
-CAknsSrvSkinInformationPkg* CThemesList::FindThemeL( const TDesC8& aPID )
-	{
-	CheckUpdatesL();
-
-	CAknsSrvSkinInformationPkg* theme = 0;
-	TInt i = 0;
-	TAknsPkgID pid = KAknsNullPkgID;
-
-	TAknsPkgIDBuf pidBuf;
-	pidBuf.Copy( aPID );
-
-	TRAPD( err, pid.SetFromDesL( pidBuf ) );
-
-	if (err == KErrNone)
-		{
-		for (i = 0 ; i < iSkins->Count() ; i++)
-			{
-			if ((*iSkins)[i]->PID() == pid)
-				{
-				theme = (*iSkins)[i];
-				break;
-				}
-			}
-		}
-
-	return theme;
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  CThemesList::GetDefaultInstallOptions()
-// ------------------------------------------------------------------------------------------------
-void CThemesList::GetDefaultInstallOptions( SwiUI::TInstallOptions &aOptions )
-	{
-	SwiUI::TInstallOptions defaultOptions;
-
-	// Return options
-	aOptions = defaultOptions;
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  CThemesList::
-// ------------------------------------------------------------------------------------------------
-TAknSkinSrvSkinPackageLocation CThemesList::LocationFromPath( const TDesC& aPath )
-    {
-#ifndef RD_MULTIPLE_DRIVE
-    TBuf<1> driveLetterBuf;
-    driveLetterBuf.CopyUC( aPath.Left(1) );
-    if( driveLetterBuf.Compare( _L("E") ) == 0 )
-        {
-        return EAknsSrvMMC;
-        }
-    return EAknsSrvPhone;
-#else
-	RFs fs;
-    User::LeaveIfError(fs.Connect());
-    CleanupClosePushL(fs);
-
-    TInt drive = EDriveC;
-    TUint driveStatus = 0;
-    TInt err = RFs::CharToDrive( aPath[0], drive );
-    err = DriveInfo::GetDriveStatus( fs, drive, driveStatus );
-    CleanupStack::PopAndDestroy(); // fs
-    if ( driveStatus & DriveInfo::EDriveExternallyMountable )
-        {
-        RDEBUG("CThemesList::LocationFromPath(): from MMC");
-        return EAknsSrvMMC;
-        }
-
-    
-    RDEBUG("CThemesList::LocationFromPath(): from Phone");
-    return EAknsSrvPhone;
-
-#endif  //RD_MULTIPLE_DRIVE
-    }
-
-// ------------------------------------------------------------------------------------------------
-//  CThemesList::
-// ------------------------------------------------------------------------------------------------
-CDesC8Array* CThemesList::InstalledPackagesL( )
-	{
-	CDesC8ArrayFlat* packages = new (ELeave) CDesC8ArrayFlat( 32 );
-	CleanupStack::PushL( packages );
-
-	RArray< TUid > uids;
-	CleanupClosePushL( uids );
-
-	RPointerArray< Swi::CSisRegistryPackage > pkgs;
-	CleanupClosePushL( pkgs );
-
-	Swi::RSisRegistrySession reg;
-	User::LeaveIfError( reg.Connect() );
-	CleanupClosePushL( reg );
-
-	reg.InstalledUidsL( uids );
-	reg.InstalledPackagesL( pkgs );
-
-	TInt i = 0;
-	TInt count = uids.Count();
-	for (i = 0 ; i < count ; i++)
-		{
-		TBuf8<KMaxUidName> uidBuf8;
-		uidBuf8.Copy( uids[i].Name() );
-
-		RDEBUG8_3( "uid[%d]=%S", i, &uidBuf8 );
-		}
-
-	count = pkgs.Count();
-	for (i = 0 ; i < count ; i++)
-		{
-		TPtrC uidName = pkgs[i]->Uid().Name();
-		TPtrC name = pkgs[i]->Name();
-		TPtrC vendor = pkgs[i]->Vendor();
-
-		RDEBUG_5( "pkg[%d]: uid=%S, idx=%d, name=%S", i,
-			&uidName,
-			pkgs[i]->Index(),
-			&name );
-
-
-		TBuf<KMaxUidName+20> uidBuf;
-		uidBuf = pkgs[i]->Uid().Name();
-		uidBuf.Append( _L(":") );
-		uidBuf.AppendNum( pkgs[i]->Index() );
-
-		TBuf8<KMaxUidName+20> uidBuf8;
-		uidBuf8.Copy( uidBuf );
-
-		packages->AppendL( uidBuf8 );
-		}
-
-	CleanupStack::PopAndDestroy( &reg );
-
-	pkgs.ResetAndDestroy();
-	CleanupStack::PopAndDestroy( &pkgs );
-	CleanupStack::PopAndDestroy( &uids );
-
-	CleanupStack::Pop( packages );
-	return packages;
-	}
-
-
-// ------------------------------------------------------------------------------------------------
-//  CThemesList::
-// ------------------------------------------------------------------------------------------------
-CDesC8Array* CThemesList::InstalledThemesL( )
-	{
-	LoadSkinsL();
-
-	CDesC8ArrayFlat* themes = new (ELeave) CDesC8ArrayFlat( 32 );
-	CleanupStack::PushL( themes );
-
-	TInt i = 0;
-	TInt count = iSkins->Count();
-
-	for (i = 0 ; i < count ; i++)
-		{
-		TAknsPkgIDBuf pidBuf;
-		TBuf8<KAknsPkgIDDesSize> pidBuf8;
-
-        TAknsPkgID pid = (*iSkins)[i]->PID();
-        pid.CopyToDes( pidBuf );
-        pidBuf8.Copy( pidBuf );
-
-		themes->AppendL( pidBuf8 );
-
-        TPtrC directory = (*iSkins)[i]->Directory();
-        TPtrC iniFileDirectory = (*iSkins)[i]->IniFileDirectory();
-        TPtrC name = (*iSkins)[i]->Name();
-        TPtrC idleStateWallPaperImageFileName = (*iSkins)[i]->IdleStateWallPaperImageFileName();
-        TPtrC pinboarWallPaperImageFileName = (*iSkins)[i]->PinboarWallPaperImageFileName();
-        TInt idleStateWallPaperImageIndex = (*iSkins)[i]->IdleStateWallPaperImageIndex();
-        TInt pinboardWallPaperImageIndex = (*iSkins)[i]->PinboardWallPaperImageIndex();
-        TBool isDeletable = (*iSkins)[i]->IsDeletable();
-        TBool isCopyable = (*iSkins)[i]->IsCopyable();
-        TAknsPkgID colorSchemePID = (*iSkins)[i]->ColorSchemePID();
-        TBool hasIconset = (*iSkins)[i]->HasIconset();
-        TAknsSkinSrvSkinProtectionType protectionType = (*iSkins)[i]->ProtectionType();
-        TBool isCorrupted = (*iSkins)[i]->IsCorrupted();
-        TDesC& fullName = (*iSkins)[i]->FullName();
-
-
-		TAknsPkgIDBuf colorSchemeBuf;
-        colorSchemePID.CopyToDes( colorSchemeBuf );
-
-		RDEBUG_4( "skin[%d]: pid=%S, name=%S", i, &pidBuf, &name );
-		RDEBUG_2( "          directory=%S", &directory );
-		RDEBUG_2( "          iniFileDirectory=%S", &iniFileDirectory );
-		RDEBUG_2( "          name=%S", &name );
-		RDEBUG_2( "          idleStateWallPaperImageFileName=%S", &idleStateWallPaperImageFileName );
-		RDEBUG_2( "          pinboarWallPaperImageFileName=%S", &pinboarWallPaperImageFileName );
-		RDEBUG_2( "          idleStateWallPaperImageIndex=%d", idleStateWallPaperImageIndex );
-		RDEBUG_2( "          pinboardWallPaperImageIndex=%d", pinboardWallPaperImageIndex );
-		RDEBUG_2( "          isDeletable=%d", isDeletable );
-		RDEBUG_2( "          isCopyable=%d", isCopyable );
-		RDEBUG_2( "          colorSchemePID=%S", &colorSchemeBuf );
-		RDEBUG_2( "          hasIconset=%d", hasIconset );
-		RDEBUG_2( "          protectionType=%d", protectionType );
-		RDEBUG_2( "          isCorrupted=%d", isCorrupted );
-		RDEBUG_2( "          fullName=%S", &fullName );
-		}
-
-	themes->Sort();
-
-	CleanupStack::Pop( themes );
-	return themes;
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  CThemesList::
-// ------------------------------------------------------------------------------------------------
-CDesC8Array* CThemesList::FindNewItemsL( const CDesC8Array& aItemsOrg, const CDesC8Array& aItemsNew )
-	{
-	CDesC8Array* result = new (ELeave) CDesC8ArrayFlat( 16 );
-	CleanupStack::PushL( result );
-
-	TInt i = 0;
-	TInt count = aItemsNew.Count();
-	for (i = 0 ; i < count ; i++)
-		{
-		result->AppendL( aItemsNew[ i ] );
-		}
-
-	result->Sort();
-
-	count = aItemsOrg.Count();
-	for (i = 0 ; i < count ; i++)
-		{
-		TInt idx = -1;
-		if (result->FindIsq( aItemsOrg[ i ], idx, ECmpNormal ) == 0)
-			{
-			result->Delete( idx );
-			}
-		}
-
-	result->Compress( );
-
-	CleanupStack::Pop( result );
-	return result;
-	}
-
-// ------------------------------------------------------------------------------------------------
-// EOF
-// ------------------------------------------------------------------------------------------------
--- a/customization/UISettingsSrv/bld/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-/*
-* Copyright (c) 2003 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 file provides the information required for building the
-*                UISettingsSrv (server and client).
-*
-*/
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-../rom/UISettingsSrv.iby																CORE_APP_LAYER_IBY_EXPORT_PATH(uisettingssrv.iby)
-../rom/UISettingsSrvResources.iby												LANGUAGE_APP_LAYER_IBY_EXPORT_PATH(uisettingssrvresources.iby)
-
-PRJ_MMPFILES
-
-#include "../client/group/bld.inf"
-#include "../server/group/bld.inf"
-
-PRJ_TESTMMPFILES
-
-//  End of File
--- a/customization/UISettingsSrv/client/BWINS/UISettingsClientu.def	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-EXPORTS
-	??0RUISettingsSrv@@QAE@XZ @ 1 NONAME ; RUISettingsSrv::RUISettingsSrv(void)
-	?Connect@RUISettingsSrv@@QAEHXZ @ 2 NONAME ; int RUISettingsSrv::Connect(void)
-	?GetSoftkeyBitmap@RUISettingsSrv@@QAEHHAAVTDes16@@AAVTDes8@@@Z @ 3 NONAME ; int RUISettingsSrv::GetSoftkeyBitmap(int, class TDes16 &, class TDes8 &)
-	?GetSoftkeyMask@RUISettingsSrv@@QAEHHAAVTDes16@@AAVTDes8@@@Z @ 4 NONAME ; int RUISettingsSrv::GetSoftkeyMask(int, class TDes16 &, class TDes8 &)
-	?GetStartupImagePath@RUISettingsSrv@@QAEHAAVTDes16@@@Z @ 5 NONAME ; int RUISettingsSrv::GetStartupImagePath(class TDes16 &)
-	?GetStartupNoteType@RUISettingsSrv@@QAEHAAH@Z @ 6 NONAME ; int RUISettingsSrv::GetStartupNoteType(int &)
-	?GetStartupTextL@RUISettingsSrv@@QAEPAVHBufC16@@XZ @ 7 NONAME ; class HBufC16 * RUISettingsSrv::GetStartupTextL(void)
-	?SetSoftkeyBitmap@RUISettingsSrv@@QAEHHABVTDesC16@@ABVTDesC8@@@Z @ 8 NONAME ; int RUISettingsSrv::SetSoftkeyBitmap(int, class TDesC16 const &, class TDesC8 const &)
-	?SetSoftkeyMask@RUISettingsSrv@@QAEHHABVTDesC16@@ABVTDesC8@@@Z @ 9 NONAME ; int RUISettingsSrv::SetSoftkeyMask(int, class TDesC16 const &, class TDesC8 const &)
-	?SetStartupImage@RUISettingsSrv@@QAEHABVTDesC16@@@Z @ 10 NONAME ; int RUISettingsSrv::SetStartupImage(class TDesC16 const &)
-	?SetStartupNoteType@RUISettingsSrv@@QAEHH@Z @ 11 NONAME ; int RUISettingsSrv::SetStartupNoteType(int)
-	?SetStartupText@RUISettingsSrv@@QAEHABVTDesC16@@@Z @ 12 NONAME ; int RUISettingsSrv::SetStartupText(class TDesC16 const &)
-	?Version@RUISettingsSrv@@QBE?AVTVersion@@XZ @ 13 NONAME ; class TVersion RUISettingsSrv::Version(void) const
-
--- a/customization/UISettingsSrv/client/eabi/UISettingsClientu.def	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-EXPORTS
-	_ZN14RUISettingsSrv14GetSoftkeyMaskEiR6TDes16R5TDes8 @ 1 NONAME
-	_ZN14RUISettingsSrv14SetSoftkeyMaskEiRK7TDesC16RK6TDesC8 @ 2 NONAME
-	_ZN14RUISettingsSrv14SetStartupTextERK7TDesC16 @ 3 NONAME
-	_ZN14RUISettingsSrv15GetStartupTextLEv @ 4 NONAME
-	_ZN14RUISettingsSrv15SetStartupImageERK7TDesC16 @ 5 NONAME
-	_ZN14RUISettingsSrv16GetSoftkeyBitmapEiR6TDes16R5TDes8 @ 6 NONAME
-	_ZN14RUISettingsSrv16SetSoftkeyBitmapEiRK7TDesC16RK6TDesC8 @ 7 NONAME
-	_ZN14RUISettingsSrv18GetStartupNoteTypeERi @ 8 NONAME
-	_ZN14RUISettingsSrv18SetStartupNoteTypeEi @ 9 NONAME
-	_ZN14RUISettingsSrv19GetStartupImagePathER6TDes16 @ 10 NONAME
-	_ZN14RUISettingsSrv7ConnectEv @ 11 NONAME
-	_ZN14RUISettingsSrvC1Ev @ 12 NONAME
-	_ZN14RUISettingsSrvC2Ev @ 13 NONAME
-	_ZNK14RUISettingsSrv7VersionEv @ 14 NONAME
-
--- a/customization/UISettingsSrv/client/group/UISettingsClient.mmp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-/*
-* Copyright (c) 2003 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: Implementation of customization components
-*
-*/
-
-
-
-// To get the APP_LAYER_SYSTEMINCLUDE-definition
-#include <platform_paths.hrh>
-
-TARGET        uisettingsclient.dll
-TARGETTYPE    dll
-UID           0x1000008D 0x10207838
-CAPABILITY    all -tcb
-
-SOURCEPATH    ../../client/src
-SOURCE        UISettingsSrvClient.cpp
-
-USERINCLUDE   .
-USERINCLUDE   ../inc 
-USERINCLUDE   ../../inc
-USERINCLUDE   ../../../include
-USERINCLUDE   ../../server/Inc
-
-APP_LAYER_SYSTEMINCLUDE
-
-LIBRARY		    euser.lib
-LIBRARY		    apparc.lib
-LIBRARY 	    flogger.lib
-
-// EXPORTUNFROZEN
-
-SMPSAFE
--- a/customization/UISettingsSrv/client/group/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-/*
-* Copyright (c) 2003 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 file provides the information required for building the
-*                UISettingsSrvClient.
-*
-*/
-
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-PRJ_MMPFILES
-UISettingsClient.mmp
-
-PRJ_TESTMMPFILES
-
-//  End of File
--- a/customization/UISettingsSrv/client/src/UISettingsSrvClient.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,323 +0,0 @@
-/*
-* Copyright (c) 2002-2004 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: Implementation of customization components
-*
-*/
-
-
-
-// INCLUDE FILES
-#include "UISettingsSrvConstants.h"
-#include "UISettingsSrvClient.h"
-
-#include "UISettingsSrv.h"
-#include "debug.h"
-
-#include <eikdll.h>
-#include <apacmdln.h>
-
-#include <apgcli.h> // apgrfx.lib
-
-
-// Create the server thread
-// This function is exported from the DLL and called from the client 
-LOCAL_C TInt StartServerL()
-    {
-	RDEBUG("UISettingsSrv: Starting server...");
-
-	const TUidType serverUid(KNullUid,KNullUid,KUISettingsSrvUid);
-
-	// EPOC and EKA 2 is easy, we just create a new server process. Simultaneous
-	// launching of two such processes should be detected when the second one
-	// attempts to create the server object, failing with KErrAlreadyExists.
-	RProcess server;
-	//TInt r=server.Create(KHelloWorldServerImg,KNullDesC,serverUid);
-	TInt r = 0;
-//sf	TInt r=server.Create( KUISettingsSrvImg, KNullDesC );
-
-	CApaCommandLine * cmd = CApaCommandLine::NewLC();
-#if (defined(SYMBIAN_SUPPORT_UI_FRAMEWORKS_V1) || !defined(SYMBIAN_HIDE_UI_FRAMEWORKS_V1)) && !defined(SYMBIAN_REMOVE_UI_FRAMEWORKS_V1)
-	// cmd->SetLibraryNameL( KUISettingsSrvImg ); // kpo not available in w20
-#else
-	cmd->SetExecutableNameL( KUISettingsSrvImg );
-#endif
-	cmd->SetDocumentNameL( KNullDesC );
-//sf-	cmd->SetCommandL( EApaCommandRun );
-	cmd->SetCommandL( EApaCommandBackground );
-
-#if (defined(SYMBIAN_SUPPORT_UI_FRAMEWORKS_V1) || !defined(SYMBIAN_HIDE_UI_FRAMEWORKS_V1)) && !defined(SYMBIAN_REMOVE_UI_FRAMEWORKS_V1)
-	r = server.Create( KUISettingsSrvImg, cmd->FullCommandLine() );  // kpo not available in w20
-#else
-	r = server.Create( KUISettingsSrvImg, KNullDesC() );
-#endif
-
-
-	cmd->SetProcessEnvironmentL( server );
-
-
-
-	CleanupStack::PopAndDestroy( cmd );
-
-
-	if ( r != KErrNone )
-		{
-		RDEBUG_2( "UISettingsSrv: server start failed %d",r);
-		return r;
-		}
-	TRequestStatus stat;
-	server.Rendezvous( stat );
-	if (stat!=KRequestPending)
-		{
-		server.Kill(0);		// abort startup
-		}
-	else
-		{
-		server.Resume();	// logon OK - start the server
-		}
-	RDEBUG("UISettingsSrv: Started");
-
-	User::WaitForRequest( stat );		// wait for start or death
-	// we can't use the 'exit reason' if the server panicked as this
-	// is the panic 'reason' and may be '0' which cannot be distinguished
-	// from KErrNone
-	r = (server.ExitType() == EExitPanic) ? KErrGeneral : stat.Int();
-	server.Close();
-	return r;
-    }
-
-
-
-
-	
-
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-//**********************************
-//RUISettingsSrv
-//**********************************
-
-EXPORT_C RUISettingsSrv::RUISettingsSrv()
-	{
-	}
-
-
-// This is the standard retry pattern for server connection
-EXPORT_C TInt RUISettingsSrv::Connect()
-	{
-	TInt retry=2;
-	for (;;)
-		{
-		TInt r=CreateSession( KUISettingsSrvName, TVersion(0,0,0), 1 );
-		if ( r != KErrNotFound && r != KErrServerTerminated )
-			{
-			return r;
-			}
-		if ( --retry == 0 )
-			{
-			return r;
-			}
-		TRAPD( err, r = StartServerL() );
-		if( err != KErrNone )
-			{
-			return err;
-			}
-		if ( r != KErrNone && r != KErrAlreadyExists )
-			{
-			return r;
-			}
-		}
-	}
-
-// Return the client side version number.
-EXPORT_C TVersion RUISettingsSrv::Version(void) const
-	{
-	return(TVersion(KUISettingsSrvMajorVersionNumber,KUISettingsSrvMinorVersionNumber,KUISettingsSrvBuildVersionNumber));
-	}
-
-EXPORT_C TInt RUISettingsSrv::SetStartupImage( const TDesC& aImagePath )
-	{
-	TIpcArgs args( &aImagePath );
-	return SendReceive( EUISettingsSrvSetStartupImage, args );
-	}
-
-EXPORT_C TInt RUISettingsSrv::GetStartupImagePath( TDes& aImagePath )
-	{
-	TIpcArgs args( &aImagePath );
-	return SendReceive( EUISettingsSrvGetStartupImagePath, args );
-	}
-
-EXPORT_C TInt RUISettingsSrv::SetStartupText( const TDesC& aText )
-    {
-	TIpcArgs args( &aText );
-	return SendReceive( EUISettingsSrvSetStartupText, args );
-    }
-
-EXPORT_C HBufC* RUISettingsSrv::GetStartupTextL( )
-    {
-	TInt len = 0;
-	TPckg<TInt> lenp( len );
-	TIpcArgs args1( &lenp );
-	
-	User::LeaveIfError( SendReceive( EUISettingsSrvGetStartupTextSize, args1 ) );
-	
-	HBufC* buf = HBufC::NewLC( len );
-	TPtr ptr( buf->Des() );
-	TIpcArgs args2( &ptr );
-	User::LeaveIfError( SendReceive( EUISettingsSrvGetStartupText, args2 ) );
-	CleanupStack::Pop( buf );
-
-	return buf;
-    }
-
-EXPORT_C TInt RUISettingsSrv::SetStartupNoteType( TInt aType )
-    {
-	TIpcArgs args( aType );
-	return SendReceive( EUISettingsSrvSetStartupNoteType, args );
-    }
-
-EXPORT_C TInt RUISettingsSrv::GetStartupNoteType( TInt &aType )
-    {
-	TPckg<TInt> typep( aType );
-	TIpcArgs args( &typep );
-	return SendReceive( EUISettingsSrvGetStartupNoteType, args );
-    }
-
-/* EXPORT_C TInt RUISettingsSrv::UpdateShortcutTargetList()
-    {
-    return SendReceive( EUISettingsSrvUpdateShortcutList );
-    }
-
-EXPORT_C TInt RUISettingsSrv::GetShortcutTargetCount( TInt aRtMask, TInt &aCount )
-    {
-	TPckg<TInt> countp( aCount );
-	TIpcArgs args( aRtMask, &countp );
-	return SendReceive( EUISettingsSrvGetShortcutCount, args );
-    }
-
-EXPORT_C TInt RUISettingsSrv::GetShortcutTargetType( TInt aRtMask, TInt aIndex, TInt& aType )
-    {
-	TPckg<TInt> typep( aType );
-	TIpcArgs args( aRtMask, aIndex, &typep );
-	return SendReceive( EUISettingsSrvGetShortcutType, args );
-    }
-
-EXPORT_C TInt RUISettingsSrv::GetShortcutTargetCaption( TInt aRtMask, TInt aIndex, TDes& aCaption )
-    {
-	TIpcArgs args( aRtMask, aIndex, &aCaption );
-	return SendReceive( EUISettingsSrvGetShortcutTargetCaption, args );
-    }
-
-EXPORT_C TInt RUISettingsSrv::GetShortcutTargetAppUid( TInt aRtMask, TInt aIndex, TInt& aUid )
-    {
-    TPckg<TInt> uidp( aUid );
-	TIpcArgs args( aRtMask, aIndex, &uidp );
-	return SendReceive( EUISettingsSrvGetShortcutAppUid, args );
-    }
-
-EXPORT_C TInt RUISettingsSrv::GetShortcutTargetIndex( TInt aRtMask, TScActionType aActionType, TInt& aIndex )
-    {
-    TPckg<TInt> indexp( aIndex );
-	TIpcArgs args( aRtMask, aActionType.iUid, &indexp );
-	return SendReceive( EUISettingsSrvGetShortcutIndexFromAT, args );
-    }
-
-EXPORT_C TInt RUISettingsSrv::GetShortcutTargetIndex( TInt aRtMask, TInt aUid, TInt& aIndex )
-    {
-    TPckg<TInt> indexp( aIndex );
-	TIpcArgs args( aRtMask, aUid, &indexp );
-	return SendReceive( EUISettingsSrvGetShortcutIndex, args );
-    }
-
-EXPORT_C TInt RUISettingsSrv::SetShortcutTargetAppIndex( TInt aActionType, TInt aRtType, TInt aIndex )
-    {
-	TIpcArgs args( aRtType, aActionType, aIndex );
-	return SendReceive( EUISettingsSrvSetShortcutTargetAppIndex, args );
-    }
-
-EXPORT_C TInt RUISettingsSrv::GetShortcutRtType( TInt aActionType, TInt &aRtType )
-    {
-    TPckg<TInt> rttypep( aRtType );
-	TIpcArgs args( aActionType, &rttypep );
-	return SendReceive( EUISettingsSrvGetShortcutRtType, args );
-    }
-
-EXPORT_C TInt RUISettingsSrv::SetShortcutTargetCaption( TInt aRtMask, TInt aIndex, const TDesC& aCaption)
-    {
-	TIpcArgs args( aRtMask, aIndex, &aCaption );
-	return SendReceive( EUISettingsSrvSetShortcutTargetCaption, args );	
-    }
-
-EXPORT_C TInt RUISettingsSrv::SetShortcutTargetBitmap( TInt aRtMask, TInt aIndex, const TDesC& aFileName, const TDesC8& aMimeType )
-    {
-	TIpcArgs args( aRtMask, aIndex, &aFileName, &aMimeType );
-	return SendReceive( EUISettingsSrvSetShortcutTargetBitmap, args );
-    }
-
-EXPORT_C TInt RUISettingsSrv::SetShortcutTargetMask( TInt aRtMask, TInt aIndex, const TDesC& aFileName, const TDesC8& aMimeType )
-    {
-	TIpcArgs args( aRtMask, aIndex, &aFileName, &aMimeType );
-	return SendReceive( EUISettingsSrvSetShortcutTargetMask, args );
-    }
-
-EXPORT_C TInt RUISettingsSrv::GetShortcutTargetBitmap( TInt aRtMask, TInt aIndex, TDes& aFileName, TDes8& aMimeType )
-    {
-	TIpcArgs args( aRtMask, aIndex, &aFileName, &aMimeType );
-	return SendReceive( EUISettingsSrvGetShortcutTargetBitmap, args );
-    }
-
-EXPORT_C TInt RUISettingsSrv::GetShortcutTargetMask( TInt aRtMask, TInt aIndex, TDes& aFileName, TDes8& aMimeType )
-    {
-	TIpcArgs args( aRtMask, aIndex, &aFileName, &aMimeType );
-	return SendReceive( EUISettingsSrvGetShortcutTargetMask, args );
-    }
-*/
-EXPORT_C TInt RUISettingsSrv::GetSoftkeyBitmap( TInt aSoftkeyId,
-                                                TDes& aFileName,
-                                                TDes8& aMimeType )
-    {
-	TIpcArgs args( aSoftkeyId, &aFileName, &aMimeType );
-	return SendReceive( EUISettingsSrvGetSoftkeyBitmap, args );
-    }
-
-EXPORT_C TInt RUISettingsSrv::GetSoftkeyMask( TInt aSoftkeyId,
-                                              TDes& aFileName,
-                                              TDes8& aMimeType )
-    {
-	TIpcArgs args( aSoftkeyId, &aFileName, &aMimeType );
-	return SendReceive( EUISettingsSrvGetSoftkeyMask, args );
-    }
-
-EXPORT_C TInt RUISettingsSrv::SetSoftkeyBitmap (
-                                          TInt aSoftkeyId,
-                                          const TDesC& aFileName,
-                                          const TDesC8& aMimeType )
-    {
-	TIpcArgs args( aSoftkeyId, &aFileName, &aMimeType );
-	return SendReceive( EUISettingsSrvSetSoftkeyBitmap, args );
-    }
-
-EXPORT_C TInt RUISettingsSrv::SetSoftkeyMask (
-                                          TInt aSoftkeyId,
-                                          const TDesC& aFileName,
-                                          const TDesC8& aMimeType )
-    {
-	TIpcArgs args( aSoftkeyId, &aFileName, &aMimeType );
-	return SendReceive( EUISettingsSrvSetSoftkeyMask, args );
-    }
-
-
-
-//  End of File  
--- a/customization/UISettingsSrv/inc/UISettingsSrvClient.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,109 +0,0 @@
-/*
-* 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: Implementation of customization components
-*
-*/
-
-#if !defined(__UISettingsSrvClient_H__)
-#define __UISettingsSrvClient_H__
-
-#if !defined(__E32BASE_H__)
-#include <e32base.h>
-#endif
-
-// #include "ScShortcutUids.h"
-
-//**********************************
-//RUISettingsSrv
-//**********************************
-// The client class. An RSessionBase sends messages to the server with the function 
-// RSessionBase::SendReceive(); specifying an opcode (TCountServRqst) and and array of argument pointers. 
-// Functions in derived classes, such as RUISettingsSrv::Increase(), are wrappers for different calls to 
-// SendReceive().
-// Most of the functions here return void because if they fail the server will panic the client.
-// If they return it can be assumed that there is no error.
-
-class RUISettingsSrv : public RSessionBase
-	{
-
-public:
-
-	IMPORT_C RUISettingsSrv();
-
-	IMPORT_C TInt Connect();
-	IMPORT_C TVersion Version() const;
-
-	IMPORT_C TInt SetStartupImage( const TDesC& aImagePath );
-	IMPORT_C TInt GetStartupImagePath( TDes& aImagePath );
-
-	IMPORT_C TInt   SetStartupText( const TDesC& aText );
-	IMPORT_C HBufC* GetStartupTextL( );
-
-	IMPORT_C TInt SetStartupNoteType( TInt aType );
-	IMPORT_C TInt GetStartupNoteType( TInt &aType );
-
-/*	IMPORT_C TInt UpdateShortcutTargetList();
-	IMPORT_C TInt GetShortcutTargetCount( TInt aRtMask, TInt &aCount );
-	IMPORT_C TInt GetShortcutTargetType( TInt aRtMask, TInt aIndex, TInt& aType );
-    IMPORT_C TInt GetShortcutTargetCaption( TInt aRtMask, TInt aIndex, TDes& aCaption );
-	IMPORT_C TInt GetShortcutTargetAppUid( TInt aRtMask, TInt aIndex, TInt& aUid );
-	IMPORT_C TInt GetShortcutTargetIndex( TInt aRtMask, TScActionType aActionType, TInt& aUid );
-	IMPORT_C TInt GetShortcutTargetIndex( TInt aRtMask, TInt aIndex, TInt& aUid );
-	IMPORT_C TInt SetShortcutTargetAppIndex( TInt aActionType, TInt aRtType, TInt aIndex );
-
-	IMPORT_C TInt GetShortcutRtType( TInt aUid, TInt &aRtType );
-	IMPORT_C TInt SetShortcutTargetCaption( TInt aRtMask, TInt aIndex, const TDesC& aCaption);
-
-	IMPORT_C TInt SetShortcutTargetBitmap   ( TInt aRtMask, TInt aIndex,
-	                                          const TDesC& aFileName,
-	                                          const TDesC8& aMimeType );
-
-	IMPORT_C TInt SetShortcutTargetMask     ( TInt aRtMask, TInt aIndex,
-	                                          const TDesC& aFileName,
-	                                          const TDesC8& aMimeType );
-
-	IMPORT_C TInt GetShortcutTargetBitmap   ( TInt aRtMask, TInt aIndex,
-	                                          TDes& aFileName, TDes8& aMimeType );
-
-	IMPORT_C TInt GetShortcutTargetMask     ( TInt aRtMask, TInt aIndex,
-	                                          TDes& aFileName, TDes8& aMimeType );
-
-*/
-	IMPORT_C TInt GetSoftkeyBitmap          ( TInt aSoftkeyId,
-	                                          TDes& aFileName, TDes8& aMimeType );
-
-	IMPORT_C TInt GetSoftkeyMask            ( TInt aSoftkeyId,
-	                                          TDes& aFileName, TDes8& aMimeType );
-
-	IMPORT_C TInt SetSoftkeyBitmap          ( TInt aSoftkeyId,
-	                                          const TDesC& aFileName,
-	                                          const TDesC8& aMimeType );
-
-	IMPORT_C TInt SetSoftkeyMask            ( TInt aSoftkeyId,
-	                                          const TDesC& aFileName,
-	                                          const TDesC8& aMimeType );
-
-private:
-		/**
-		* Starts UISettingsSrv.
-		* @param aServerExeName. The name of server.
-		* @return TInt. KErrNone or one of the system wide error codes.
-		*/
-		TInt LaunchServer( const TDesC& aServerName );
-
-	};
-
-
-#endif
-
--- a/customization/UISettingsSrv/inc/UISettingsSrvConstants.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,91 +0,0 @@
-/*
-* 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: Implementation of customization components
-*
-*/
-
-#include <e32base.h>
-
-
-// server name
-
-_LIT(KUISettingsSrvName,"UISettingsSrv");
-_LIT(KUISettingsSrvImg,"UISettingsSrv");
-
-const TUid KUISettingsSrvUid = { 0x10207839 };
-
-
-// KUISettingsSrvStackSize
-// KUISettingsSrvInitHeapSize
-// KUISettingsSrvMaxHeapSize
-
-// A version must be specifyed when creating a session with the server
-
-const TUint KUISettingsSrvMajorVersionNumber=0;
-const TUint KUISettingsSrvMinorVersionNumber=1;
-const TUint KUISettingsSrvBuildVersionNumber=1;
-
-//sf- IMPORT_C TInt StartThread();
-
-const int koje=33;
-
-// opcodes used in message passing between client and server
-enum TUISettingsSrvRqst
-	{
-	EUISettingsSrvSetStartupImage = 0,
-	EUISettingsSrvGetStartupImagePath,
-	EUISettingsSrvSetStartupText,
-	EUISettingsSrvGetStartupText,
-	EUISettingsSrvGetStartupTextSize,
-	EUISettingsSrvSetStartupNoteType,
-	EUISettingsSrvGetStartupNoteType,
-	
-	EUISettingsSrvUpdateShortcutList,
-	EUISettingsSrvGetShortcutCount,
-	EUISettingsSrvGetShortcutType,
-	EUISettingsSrvGetShortcutAppUid,
-	EUISettingsSrvGetShortcutIndexFromAT,
-	EUISettingsSrvGetShortcutIndex,
-	EUISettingsSrvSetShortcutTargetAppIndex,
-	EUISettingsSrvGetShortcutRtType,
-
-	EUISettingsSrvGetShortcutTargetCaption,
-	EUISettingsSrvSetShortcutTargetCaption,
-
-	EUISettingsSrvSetShortcutTargetBitmap,
-	EUISettingsSrvSetShortcutTargetMask,
-	EUISettingsSrvGetShortcutTargetBitmap,
-	EUISettingsSrvGetShortcutTargetMask,
-
-	EUISettingsSrvGetSoftkeyBitmap,
-	EUISettingsSrvGetSoftkeyMask,
-
-	EUISettingsSrvSetSoftkeyBitmap,
-	EUISettingsSrvSetSoftkeyMask,
-
-	EUISettingsSrvLastCmd
-	};
-
-enum TUISettingsSrvLeave
-{
-	ENonNumericString
-};
-
-enum EUiSrvScRtType
-    {
-    EUiSrvRtTypeNul = 0,
-    EUiSrvRtTypeApp = 1,
-    EUiSrvRtTypeBm  = 2
-    };
-
--- a/customization/UISettingsSrv/rom/UISettingsSrv.iby	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of customization components
-*
-*/
-#ifndef __UISettingsSrv_IBY__
-#define __UISettingsSrv_IBY__
-
-//#ifdef __SAP_UI_SETTING_SERVER
-
-S60_APP_EXE(UISettingsSrv)
-S60_APP_AIF_RSC(UISettingsSrv)
-
-file=ABI_DIR\BUILD_DIR\UISettingsClient.dll     	SHARED_LIB_DIR\UISettingsClient.dll
-
-//#endif //__SAP_UI_SETTING_SERVER
-
-#endif //__UISettingsSrv_IBY__
--- a/customization/UISettingsSrv/rom/UISettingsSrvResources.iby	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of customization components
-*
-*/
-#ifndef __UISettingsSrvResources_IBY__
-#define __UISettingsSrvResources_IBY__
-
-//#ifdef __SAP_UI_SETTING_SERVER
-
-S60_APP_RESOURCE(UISettingsSrv)
-
-//#endif //__SAP_UI_SETTING_SERVER
-
-#endif //__UISettingsSrvResources_IBY__
--- a/customization/UISettingsSrv/server/Data/UISettingsSrv.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,163 +0,0 @@
-/*
-* Copyright (c) 2002-2004 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: 
-*        Resource file for UISettingsSrv
-*
-*/
-
-
-//  RESOURCE IDENTIFIER
-NAME    UISS // 4 letter ID
-
-//  INCLUDES
-
-//sf-#include    <bldvariant.hrh>
-#include    <eikon.rh>
-#include    <avkon.rsg>
-#include    <avkon.rh>
-#include    <avkon.mbg>
-//sf-#include    <eikcore.rsg>
-//sf-#include    <eikon.rsg>
-//sf-#include    <appinfo.rh>
-//sf-#include    <gsicon.mbg>
-#include    <avkon.loc>
-/*sf--
-#include    "SecUi.loc"
-#include    <gs.hrh>
-#include    "gs.loc"
-#include    "gs.rh"
-#include    "cf.loc"
-#include    "softreject.loc"
-#include    "phonesettings.loc"
-#include    "MobileOriginatedCalls.loc"
-#include    "Phone.hrh"
-#include    <AvkonIcons.hrh>
---fs*/
-
-#include <uikon.rh>
-#include <appinfo.rh>
-
-#include    <data_caging_paths_strings.hrh>
-
-#include "UISettingsSrv.hrh"
-//#include "UISettingsSrv.loc"
-
-// CONSTANTS
-
- #ifdef __SCALABLE_ICONS
-    #define KUISettingsSrvBitmap      "Z:"APP_BITMAP_DIR"\\UISettingsSrv\\UISettingsSrvIcon.mif"
- #else
-    #define KUISettingsSrvBitmap      "Z:"APP_BITMAP_DIR"\\UISettingsSrv\\UISettingsSrvIcon.mbm"
- #endif //__SCALABLE_ICONS
-
-
-
-//sf-enum TCFMenuCommands
-//sf-    {
-//sf-    EAppCmdCreatePopupList = 5007
-//sf-    };
-
-//  RESOURCE DEFINITIONS 
-
-RESOURCE RSS_SIGNATURE
-    {
-    }
-
-RESOURCE TBUF
-    {
-    buf="UISettingsSrv";
-    }
-
-//----------------------------------------------------
-//   
-//    EIK_APP_INFO
-//    It contains application information.
-//
-//----------------------------------------------------
-//
-RESOURCE EIK_APP_INFO
-    {
-    menubar=r_uiss_menubar;
-    hotkeys=r_uiss_hotkeys;
-    cba = R_AVKON_SOFTKEYS_OPTIONS_EXIT;
-    }
-
-//----------------------------------------------------
-//   
-//    r_starter_hotkeys
-//
-//----------------------------------------------------
-//
-RESOURCE HOTKEYS r_uiss_hotkeys
-{
-    control=
-    {
-        HOTKEY { command=EAknCmdExit; key='e'; }
-    };
-}
-
-//----------------------------------------------------
-//   
-//    r_starter_menubar
-//
-//----------------------------------------------------
-//
-RESOURCE MENU_BAR r_uiss_menubar
-    {
-    titles=
-        {
-        MENU_TITLE { menu_pane=r_uiss_menu; txt="File"; }
-        };
-    }
-
-//----------------------------------------------------
-//   
-//    r_starter_menu
-//
-//----------------------------------------------------
-//
-RESOURCE MENU_PANE r_uiss_menu
-    {
-    items=
-        {
-//        MENU_ITEM { command=EUISSCmdTest; txt = qtn_appl_test; },
-//        MENU_ITEM { command=EUISSCmdTest; txt = qtn_appl_test2; },
-//        MENU_ITEM { command=EUISSCmdStartSrv; txt = qtn_appl_start_srv; },
-//        MENU_ITEM { command=EUISSCmdTestEnd; txt = qtn_appl_test_end; },
-        MENU_ITEM { command=EAknCmdExit; txt = qtn_options_exit; }
-        };
-    }
-
-// SVG changes
-RESOURCE LOCALISABLE_APP_INFO r_uiss_localisable_app_info
-    {
-//    short_caption = qtn_apps_settings_grid;
-    caption_and_icon = 
-    CAPTION_AND_ICON_INFO
-        {
-//        caption = qtn_apps_settings_list;
-#ifdef __SCALABLE_ICONS
-        number_of_icons = 1;
-        icon_file = APP_BITMAP_DIR"\\UISettingsSrv_aif.mif";
-#else
-        number_of_icons = 2;
-        icon_file = APP_BITMAP_DIR"\\UISettingsSrv_aif.mbm";
-#endif
-        };
-    }
-
-//End of File
-
-
-
--- a/customization/UISettingsSrv/server/Inc/UISettingsSrv.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,245 +0,0 @@
-/*
-* Copyright (c) 2002 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:  
-*        class definition for CUISettingsSrvServer and CUISettingsSrvSession
-*
-*/
-
-#ifndef __UISettingsSrv_H__
-#define __UISettingsSrv_H__
-
-// INCLUDES
-#include <e32base.h>
-#include <f32file.h>
-// #include "ScSelectableShortcutListObserver.h"
-// #include "ScShortcutUids.h"
-// #include "ScShortcutEngineObserver.h"
-#include <gsasyncimagehandling.h>
-#include <mgsasyncimagehandlingobserver.h>
-
-// CONSTANTS
-// MACROS
-//#define ?macro ?macro_def
-
-// DATA TYPES
-
-// reasons for server panic
-enum TUISettingsSrvPanic
-	{
-	EBadRequest,
-	EBadDescriptor,
-	EMainSchedulerError,
-	ESvrCreateServer,
-	ESvrStartServer,
-	ECreateTrapCleanup,
-	ENotImplementedYet
-	};
-
-
-// FUNCTION PROTOTYPES
-
-// function to panic the server
-GLREF_C void PanicServer(TUISettingsSrvPanic aPanic);
-// thread function for server
-GLREF_C TInt CountServerThread(TAny *);
-
-
-
-// FORWARD DECLARATIONS
-
-// class CScShortcutEngine;
-class CScSelectableShortcutList;
-
-// CLASS DECLARATION
-const TUint KUISettingsSrvShutdownDelay = 120000000L;
-
-class CShutdown : public CTimer
-	{
-public:
-	inline CShutdown();
-	inline void ConstructL();
-	inline void Start();
-	void RunL();
-	};
-
-
-//**********************************
-//CUISettingsSrvServer
-//**********************************
-//The server class; an active object.
-//Contains an instance of RServer; a handle to the kernel server representation which is used 
-//to receive messages. 
-
-class CUISettingsSrvServer : public CPolicyServer
-                          // , public MScSelectableShortcutListObserver
-                          // , public MScEngineObserver
-                           , public MGSAsyncImageHandlingObserver
-	{
-public:
-	static CUISettingsSrvServer* NewL();
-	virtual ~CUISettingsSrvServer();
-
-	virtual CSession2* NewSessionL(const TVersion& aVersion,const RMessage2& aMessage) const;
-	static TInt ThreadFunction(TAny* aStarted);
-
-    // From MScSelectableShortcutListObserver
-    void ScSSLOHandleListChangedL();
-    void ScSSLOHandleListConstructionComplete(TInt aError);
-
-    // From MScEngineObserver
-    //TBool MScEngineHandleShortcutEvent(
-    //                    TScShortcutEvent aEvent,
-    //                    TScActionType aType
-    //                    );
-
-	void GetShortcutTargetListL();
-
-    void AddListChangeNotifierL(TInt *aFlag);
-    void RemoveListChangeNotifierL(TInt *aFlag);
-	void SetShortcutListMaskL(CScSelectableShortcutList& aScAppList, TInt aMask);
-
-	void GetShortcutTargetCountL(const RMessage2 &aMessage);
-	void GetShortcutTargetTypeL(const RMessage2 &aMessage);
-	void GetShortcutTargetAppUidL(const RMessage2 &aMessage);
-	void GetShortcutTargetIndexFromATL(const RMessage2 &aMessage);
-	void GetShortcutTargetIndexL(const RMessage2 &aMessage);
-	void SetShortcutTargetAppIndexL(const RMessage2 &aMessage);
-	void GetShortcutRtTypeL(const RMessage2 &aMessage);
-
-	void SetShortcutTargetCaptionL(const RMessage2 &aMessage);
-	void GetShortcutTargetCaptionL(const RMessage2 &aMessage);
-
-	void SetShortcutTargetBitmapL(const RMessage2 &aMessage, TBool aIsMask=EFalse);
-	void GetShortcutTargetBitmapL(const RMessage2 &aMessage, TBool aIsMask=EFalse);
-
-	void SetSoftkeyBitmapL(const RMessage2 &aMessage, TBool aIsMask=EFalse);
-	void GetSoftkeyBitmapL(const RMessage2 &aMessage, TBool aIsMask=EFalse);
-
-    void SetStartupImageL( const TDesC &aFilePath );
-	void SetStartupImageL(const RMessage2 &aMessage);
-	void GetStartupImagePathL(const RMessage2 &aMessage);
-	void SetStartupTextL(const RMessage2 &aMessage);
-	void GetStartupTextL(const RMessage2 &aMessage);
-	void GetStartupTextSizeL(const RMessage2 &aMessage);
-	void SetStartupNoteTypeL(const RMessage2 &aMessage);
-	void GetStartupNoteTypeL(const RMessage2 &aMessage);
-
-    CFbsBitmap* LoadBitmapL( const TDesC& aFileName, const TDesC8& aType );
-
-    // From MGSAsyncImageHandlingObserver
-	void ImageHandlingCompleteL( TInt aError );
-
-public:
-	void AddSession();
-	void RemoveSession();
-	void Shutdown();
-
-protected:
-	CUISettingsSrvServer(TInt aPriority);
-	void ConstructL();
-
-private:
-    CPolicyServer::TCustomResult CustomSecurityCheckL(const RMessage2& aMsg, TInt& aAction, TSecurityInfo& aMissing);
-
-private:
-	RFs         iFs;
-	TInt		iActive;
-	TInt        iSessionCount;
-	CShutdown   iShutdownTimer;
-	CActiveSchedulerWait iASWait;
-//	CScShortcutEngine* iShortcuts;
-	RArray<TInt32> iIndeces;
-	RArray<TInt*> iNotifyChanges;
-	CGSAsyncImageHandling* iImgHandling;
-	CRepository* iStartupRep;
-	CScSelectableShortcutList* iAppList;
-	const TUid iIdleBitmapUid;
-	const TUid iAIBitmapUid;
-    TFileName iTemporaryImageFile;
-    TInt iImageHandlingError;
-
-#define UISETTINGSSRV_POLICYCOUNT  2
-    static const CPolicyServer::TPolicy iConnectionPolicy;
-    static const TInt   iRanges[UISETTINGSSRV_POLICYCOUNT];
-    static const TUint8 iElementsIndex[UISETTINGSSRV_POLICYCOUNT];
-	};
-
-//**********************************
-//CUISettingsSrvSession
-//**********************************
-//This class represents a session in the server.
-//CSession::Client() returns the client thread.
-//Functions are provided to respond appropriately to client messages.
-
-
-class CUISettingsSrvSession : public CSession2
-	{
-public:
-	
-	// construct / destruct
-	static CUISettingsSrvSession* NewL(CUISettingsSrvServer * aServer);
-	
-	~CUISettingsSrvSession();
-
-	//service request
-	virtual void ServiceL(const RMessage2 &aMessage);
-	TBool DispatchMessageL(const RMessage2 &aMessage);
-
-	void SetStartupImageL(const RMessage2 &aMessage);
-	void GetStartupImagePathL(const RMessage2 &aMessage);
-	void SetStartupTextL(const RMessage2 &aMessage);
-	void GetStartupTextL(const RMessage2 &aMessage);
-	void GetStartupTextSizeL(const RMessage2 &aMessage);
-	void SetStartupNoteTypeL(const RMessage2 &aMessage);
-	void GetStartupNoteTypeL(const RMessage2 &aMessage);
-
-	void GetShortcutTargetListL( );
-	void GetShortcutTargetCountL(const RMessage2 &aMessage);
-	void GetShortcutTargetTypeL(const RMessage2 &aMessage);
-    void GetShortcutTargetAppUidL(const RMessage2 &aMessage);
-	void GetShortcutTargetIndexFromATL(const RMessage2 &aMessage);
-	void GetShortcutTargetIndexL(const RMessage2 &aMessage);
-	void SetShortcutTargetAppIndexL(const RMessage2 &aMessage);
-	void GetShortcutRtTypeL(const RMessage2 &aMessage);
-
-	void SetShortcutTargetCaptionL(const RMessage2 &aMessage);
-	void GetShortcutTargetCaptionL(const RMessage2 &aMessage);
-
-	void SetShortcutTargetBitmapL(const RMessage2 &aMessage, TBool aIsMask=EFalse);
-	void GetShortcutTargetBitmapL(const RMessage2 &aMessage, TBool aIsMask=EFalse);
-
-	void SetSoftkeyBitmapL(const RMessage2 &aMessage, TBool aIsMask=EFalse);
-	void GetSoftkeyBitmapL(const RMessage2 &aMessage, TBool aIsMask=EFalse);
-
-	void AppListCheckL();
-
-	static HBufC8*  CopyParameter8L( const RMessage2 &aMsg, TInt aIndex );
-	static HBufC16* CopyParameter16L( const RMessage2 &aMsg, TInt aIndex );
-
-protected:
-	// panic the client
-	void PanicClient(const RMessagePtr2& aMessage,TInt aPanic);
-	// safewrite between client and server
-	void Write(const TAny* aPtr,const TDesC8& aDes,TInt anOffset=0);
-	
-	CUISettingsSrvSession(CUISettingsSrvServer * aServer);
-	void ConstructL();
-
-private:
-	CUISettingsSrvServer *iServer;
-	TInt iCount;
-	TInt iListChanged;
-	};
-
-#endif // __UISettingsSrv_H__
--- a/customization/UISettingsSrv/server/Inc/UISettingsSrv.hrh	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-/*
-* Copyright (c) 2003 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: Implementation of customization components
-*
-*  The file contains values for UISettingsSrv software settings. 
-*
-*
-*/
-
-
-#ifndef UISettingsSrv_HRH
-#define UISettingsSrv_HRH
-
-enum TUISettingsSrvCommandIds
-    {
-    EUISSCmdTest = 1,
-    EUISSCmdTest2,
-    EUISSCmdStartSrv,
-    EUISSCmdTestEnd
-    };
-
-
-//sf-enum TStarterDlgLineId // dialog line ids
-//sf-    {
-//sf-    EStarterDlg1Label = 1,
-//sf-    EStarterDlg2Label
-//sf-    };
-
-
-#endif // UISettingsSrv_HRH
-
-
-// End of File
--- a/customization/UISettingsSrv/server/Inc/UISettingsSrvApp.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +0,0 @@
-/*
-* Copyright (c) 2002 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:  
-*     UISettingsSrvApp is an application class required by Symbian OS architecture.
-*
-*/
-
-
-#ifndef __UISettingsSrvApp_H__
-#define __UISettingsSrvApp_H__
-
-// INCLUDES
-#include <aknapp.h>
-#include <e32std.h>
-
-
-// CONSTANTS
-// UID of app
-const   TUid    KUidUISettingsSrv = { 0x10207839 };
-
-
-// CLASS DECLARATION
-
-class CUISettingsSrvServer;
-
-
-/**
-*  CGSApp application class.
-*/
-class CUISettingsSrvApp : public CAknApplication
-{
-	public:
-		CUISettingsSrvApp( CUISettingsSrvServer* aServer );
-		virtual ~CUISettingsSrvApp();
-
-    private: // from CApaApplication
-
-        /**
-        * Create CUISettingsSrvDocument document object.
-        * 
-        */
-        CApaDocument* CreateDocumentL();
-
-        /**
-        * Returns application UID.
-        * @return KUidGS.
-        */
-        TUid AppDllUid() const;
-        
-	private:
-		CUISettingsSrvServer* iServer;
-};
-
-
-#endif // __UISettingsSrvApp_H__
--- a/customization/UISettingsSrv/server/Inc/UISettingsSrvAppView.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,91 +0,0 @@
-/*
-* Copyright (c) 2003 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: Implementation of customization components
-*
-*/
-
-
-#ifndef __UISettingsSrvAppView_H__
-#define __UISettingsSrvAppView_H__
-
-
-#include <coecntrl.h>
-
-/*! 
-  @class CUISettingsSrvAppView
-  
-  @discussion An instance of CUISettingsSrvAppView is the Application View object
-  for the HelloWorldBasic example application
-  */
-class CUISettingsSrvAppView : public CCoeControl
-    {
-public:
-
-/*!
-  @function NewL
-   
-  @discussion Create a CUISettingsSrvAppView object, which will draw itself to aRect
-  @param aRect The rectangle this view will be drawn to
-  @result A pointer to the created instance of CUISettingsSrvAppView
-  */
-    static CUISettingsSrvAppView* NewL(const TRect& aRect);
-
-/*!
-  @function NewLC
-   
-  @discussion Create a CUISettingsSrvAppView object, which will draw itself to aRect
-  @param aRect The rectangle this view will be drawn to
-  @result A pointer to the created instance of CUISettingsSrvAppView
-  */
-    static CUISettingsSrvAppView* NewLC(const TRect& aRect);
-
-
-/*!
-  @function ~CUISettingsSrvAppView
-  
-  @discussion Destroy the object
-  */
-     ~CUISettingsSrvAppView();
-
-
-public:  // from CCoeControl
-/*!
-  @function Draw
-  
-  @discussion Draw this CUISettingsSrvAppView to the screen
-  @param aRect The rectangle of this view that needs updating
-  */
-    void Draw(const TRect& aRect) const;
-  
-
-private:
-
-/*!
-  @function ConstructL
-  
-  @discussion  Perform the second phase construction of a CUISettingsSrvAppView object
-  @param aRect The rectangle this view will be drawn to
-  */
-    void ConstructL(const TRect& aRect);
-
-/*!
-  @function CUISettingsSrvAppView
-  
-  @discussion Perform the first phase of two phase construction 
-  */
-    CUISettingsSrvAppView();
-    };
-
-
-#endif // __UISettingsSrvAppView_H__
--- a/customization/UISettingsSrv/server/Inc/UISettingsSrvDocument.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,84 +0,0 @@
-/*
-* Copyright (c) 2002 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:  
-*           Document class required by Symbian OS architecture.
-*
-*/
-
-
-#ifndef __UISettingsSrvDocument_H__
-#define __UISettingsSrvDocument_H__
-
-// INCLUDES
-#include <AknDoc.h>
-
-// CONSTANTS
-
-// FORWARD DECLARATIONS
-class  CEikAppUi;
-class CVpnSettingsUi;
-
-//sf-class CUISettingsSrvDocument;
-
-// CLASS DECLARATION
-
-/**
-*  CGSDocument application class.
-*/
-class CUISettingsSrvDocument : public CAknDocument
-{
-    public: // constructor and destructor
-        /**
-        * Two-phased constructor
-        * @param aApp Application.
-        * @return GS document.
-        */
-        static CUISettingsSrvDocument* NewL(CEikApplication& aApp);
-
-        /**
-        * Destructor.
-        */
-        virtual ~CUISettingsSrvDocument();
-
-    private:
-
-        /**
-        * C++ constructor
-        */
-        CUISettingsSrvDocument(CEikApplication& aApp) : CAknDocument(aApp) { }
-
-        /**
-        * Symbian OS default constructor.
-        * 
-        */
-        void ConstructL();
-
-    private: // from CEikDocument
-
-		void UpdateTaskNameL(CApaWindowGroupName* aWgName);
-
-        /**
-        * Create CGSUi "App UI" object.
-        * @return Eikon application UI.
-        */
-        CEikAppUi* CreateAppUiL();
-
-    private: // data
-
-    public:
-        CVpnSettingsUi* iVpnSettingsUi;
-};
-
-#endif // __UISettingsSrvDocument_H__
-
--- a/customization/UISettingsSrv/server/Inc/UISettingsSrvUi.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,127 +0,0 @@
-/*
-* Copyright (c) 2002 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:  
-*        class definition for CUISettingsSrvUi
-*
-*/
-
-
-#ifndef __UISettingsSrvUi_H__
-#define __UISettingsSrvUi_H__
-
-// INCLUDES
-#include <aknViewAppUi.h>
-#include <aknsettingpage.h>
-#include <AknTabObserver.h>
-//#include <scshortcut.hrh>
-//#include <scuiobserver.h>
-#include <ecom/ecom.h>
-#include <MMGFetchVerifier.h>
-
-
-// CLASS DECLARATION
-class CAknWaitDialog;
-class CAknNavigationControlContainer;
-class CAknTabGroup;
-class CAknNavigationDecorator;
-class CAknQueryDialog;
-//
-class CScShortcutUi;
-
-class CUISettingsSrvAppView;
-
-//sf-
-/*sf--
-//For embedding CC in CS
-class TAppInfo
-	{
-public:
-	TAppInfo(TUid aUid, const TDesC& aFile)
-		: iUid(aUid), iFile(aFile)
-		{}
-	TUid iUid;
-	TFileName iFile;
-	};
---fs*/
-
-/**
-*  'AppUi' class.
-*  UI class for UISettingsSrv application
-*/
-class CUISettingsSrvUi : public CAknAppUi //sf-CAknViewAppUi
-//sf-, public MAknSettingPageObserver,
-//sf-              public MAknTabObserver, public MMGFetchVerifier,
-//sf-              public MScUiObserver, public MGSViewOwner
-    {
-    public: // Constructors and destructor
-    
-        /**
-        * C++ default constructor
-        */
-        CUISettingsSrvUi();
-
-        /**
-        * Symbian OS default constructor.
-        * 
-        */      
-        void ConstructL();
-
-        /**
-        * Destructor.
-        */      
-        ~CUISettingsSrvUi();
-
-    public: // from CEikAppUi
-        /**
-        * Takes care of command handling.
-        * @param aCommand command to be handled
-        * 
-        */
-        void HandleCommandL(TInt aCommand);
-
-    public: // new
-
-    private:
-        // From MEikMenuObserver
-        void DynInitMenuPaneL(TInt aResourceId,CEikMenuPane* aMenuPane);
-
-    private: // from CEikAppUi
-        /**
-        * handles key events
-        * @param aKeyEvent 
-        * @param aType type of the key event 
-        * @return TKeyResponse
-        */
-        virtual TKeyResponse HandleKeyEventL(const TKeyEvent& aKeyEvent,
-                                             TEventCode aType);
-
-
-    private: // new
-    	CUISettingsSrvAppView* iAppView;
-
-    protected: // data
-
-    public:
-        CAknTabGroup* iTabGroup;   //tab group handle
-
-    protected:
-
-    protected:
-        CApaDocument* iEmbedded;
-
-    private: // For AI Settings View integration
-//sf-        CGSAIMyTodaySettingsViewInterface* iAISettingsViewInterface;
-    };
-
-#endif // __UISettingsSrvUi_H__
--- a/customization/UISettingsSrv/server/Src/UISettingsSrvApp.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,107 +0,0 @@
-/*
-* Copyright (c) 2002-2004 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: 
-*        UISettingsSrv Application
-*
-*/
-
-
-// INCLUDE FILES
-#include    <eikstart.h>
-#include    "UISettingsSrvApp.h"
-#include    "UISettingsSrvDocument.h"
-
-#include    "UISettingsSrv.h"
-#include    "UISettingsSrvConstants.h"
-#include	"debug.h"
-
-// ========================= MEMBER FUNCTIONS ================================
-
-// ---------------------------------------------------------------------------
-// CUISettingsSrvApp::CUISettingsSrvApp()
-//
-// ---------------------------------------------------------------------------
-CUISettingsSrvApp::CUISettingsSrvApp( CUISettingsSrvServer* aServer )
-	: iServer( aServer )
-    {
-    }
-
-// ---------------------------------------------------------------------------
-// CUISettingsSrvApp::~CUISettingsSrvApp()
-//
-// ---------------------------------------------------------------------------
-CUISettingsSrvApp::~CUISettingsSrvApp()
-    {
-    delete iServer;
-    }
-
-// ---------------------------------------------------------------------------
-// CUISettingsSrvApp::AppDllUid()
-// Returns application UID
-//
-// ---------------------------------------------------------------------------
-TUid CUISettingsSrvApp::AppDllUid() const
-    {
-    return KUidUISettingsSrv;
-    }
-
-// ---------------------------------------------------------------------------
-// CUISettingsSrvApp::CreateDocumentL()
-// Creates CGSDocument object
-//
-// ---------------------------------------------------------------------------
-CApaDocument* CUISettingsSrvApp::CreateDocumentL()
-    {
-    return CUISettingsSrvDocument::NewL(*this);
-    }
-
-// ===================== OTHER EXPORTED FUNCTIONS ============================
-//
-
-// ---------------------------------------------------------------------------
-// NewApplication() 
-// constructs CUISettingsSrvApp
-// Returns: CApaDocument*: created application object
-//
-// ---------------------------------------------------------------------------
-LOCAL_C CApaApplication* NewApplication()
-    {
-
-	// create the server
-	CUISettingsSrvServer* server = NULL;
-	
-	TInt err = KErrNone;
-	TRAP( err, server = CUISettingsSrvServer::NewL() );
-
-	// Initialisation complete, now signal the client
-	RProcess::Rendezvous(KErrNone);
-
-//sf-	// Ready to run
-	RDEBUG("UISettingsSrv about to run");
-
-	//
-    // Continue with normal UI startup
-    //
-    return new CUISettingsSrvApp( server );
-    }
-
-// ---------------------------------------------------------------------------
-// E32Main()
-//
-// ---------------------------------------------------------------------------
-GLDEF_C TInt E32Main()
-    {
-    return EikStart::RunApplication( NewApplication );
-    }
-
--- a/customization/UISettingsSrv/server/Src/UISettingsSrvAppView.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-/*
-* Copyright (c) 2003 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: Implementation of customization components
-*
-*/
-
-
-#include <coemain.h>
-
-#include "UISettingsSrvAppView.h"
-
-CUISettingsSrvAppView* CUISettingsSrvAppView::NewL(const TRect& aRect)
-    {
-    CUISettingsSrvAppView* self = CUISettingsSrvAppView::NewLC(aRect);
-    CleanupStack::Pop(self);
-    return self;
-    }
-
-CUISettingsSrvAppView* CUISettingsSrvAppView::NewLC(const TRect& aRect)
-    {
-    CUISettingsSrvAppView* self = new (ELeave) CUISettingsSrvAppView;
-    CleanupStack::PushL(self);
-    self->ConstructL(aRect);
-    return self;
-    }
-
-CUISettingsSrvAppView::CUISettingsSrvAppView()
-    {
-	// No implementation required
-    }
-
-CUISettingsSrvAppView::~CUISettingsSrvAppView()
-    {
-	// No implementation required
-    }
-
-void CUISettingsSrvAppView::ConstructL(const TRect& aRect)
-    {
-    // Create a window for this application view
-    CreateWindowL();
-
-    // Set the windows size
-    SetRect(aRect);
-
-    // Activate the window, which makes it ready to be drawn
-    ActivateL();
-    }
-
-// Draw this application's view to the screen
-void CUISettingsSrvAppView::Draw(const TRect& /*aRect*/) const
-    {
-    // Get the standard graphics context 
-    CWindowGc& gc = SystemGc();
-    
-    // Gets the control's extent
-    TRect rect = Rect();
-    
-    // Clears the screen
-    gc.Clear(rect);
-    }
-
-
--- a/customization/UISettingsSrv/server/Src/UISettingsSrvDocument.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,86 +0,0 @@
-/*
-* Copyright (c) 2002 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: 
-*        Document for the UISettingsSrv Application
-*
-*/
-
-
-// INCLUDE FILES
-#include    "UISettingsSrvDocument.h"
-#include    "UISettingsSrvUi.h"
-#include	<apgwgnam.h>
-
-// ================= MEMBER FUNCTIONS =======================
-
-// ----------------------------------------------------
-// CUISettingsSrvDocument::~CUISettingsSrvDocument()
-// destructor
-//
-// ----------------------------------------------------
-//
-CUISettingsSrvDocument::~CUISettingsSrvDocument()
-    {
-    }
-
-// ----------------------------------------------------
-// CUISettingsSrvDocument::ConstructL()
-// Symbian OS default constructor can leave.
-//
-// ----------------------------------------------------
-//
-void CUISettingsSrvDocument::ConstructL()
-    {
-    }
-
-// ----------------------------------------------------
-// CUISettingsSrvDocument::NewL()
-// Two-phased constructor.
-//
-// ----------------------------------------------------
-//
-CUISettingsSrvDocument* CUISettingsSrvDocument::NewL(
-        CEikApplication& aApp)
-    {
-    CUISettingsSrvDocument* self = new(ELeave) CUISettingsSrvDocument(aApp);
-    CleanupStack::PushL(self);
-    self->ConstructL();
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// ----------------------------------------------------
-// CUISettingsSrvDocument::UpdateTaskNameL()
-// Two-phased constructor.
-//
-// ----------------------------------------------------
-//
-void CUISettingsSrvDocument::UpdateTaskNameL(CApaWindowGroupName* aWgName)
-	{
-	CAknDocument::UpdateTaskNameL( aWgName );
-	aWgName->SetHidden( ETrue );
-	}
-
-// ----------------------------------------------------
-// CUISettingsSrvDocument::CreateAppUiL()
-// constructs CGSUi
-//
-// ----------------------------------------------------
-//
-CEikAppUi* CUISettingsSrvDocument::CreateAppUiL()
-    {
-    return new(ELeave) CUISettingsSrvUi;
-    }
-
-// End of File
--- a/customization/UISettingsSrv/server/Src/UISettingsSrvServer.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1536 +0,0 @@
-/*
-* Copyright (c) 2002-2004 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: Implementation of customization components
-*
-*/
-
-
-
-// INCLUDE FILES
-#include "UISettingsSrvConstants.h"
-#include "UISettingsSrv.h"
-#include <e32svr.h>
-#include <e32math.h>
-#include <e32uid.h>
-
-#include    <eikapp.h>
-#include    <avkon.hrh>
-#include    <akncontext.h>
-#include    <aknnavi.h>
-#include    <aknnavide.h>
-#include    <akntabgrp.h>
-#include    <akntitle.h>
-#include    <aknnotedialog.h>
-#include    <AknWaitDialog.h>
-#include    <aknslider.h>
-#include    <AknQueryDialog.h>
-#include    <aknsettingpage.h>
-#include    <aknradiobuttonsettingpage.h>
-#include    <aknslidersettingpage.h>
-#include    <akntextsettingpage.h>
-#include    <AknDateFormatUtils.h>
-#include    <AknUtils.h>
-#include    <AknsConstants.h>    //for determining skin change
-#include    <barsread.h>
-#include    <hal.h>
-#include <e32property.h>
-#include <centralrepository.h>
-#include <AknSkinsInternalCRKeys.h>
-#include <AknIconSrvClient.h>
-#include <startupdomaincrkeys.h>
-	
-
-// #include <ScShortcut.h>
-// #include <ScShortcutUids.h>
-// #include <ScShortcutBase.h>
-// #include <ScShortcutEngine.h>
-// #include <ScSelectableShortcutList.h>
-// #include <ScShortcutCustomOperations.h>
-
-
-#include <gsasyncimagehandling.h>
-#include <backgroundimage.h>
-#include <imageconversion.h>
-
-#include "debug.h"
-
-// Type defintions
-typedef TInt TScBookmarkEngineId;	// NOTE ! This is copied from ScBookmarkDbManager.h
-									// to avoid illegal userinclude
-
-const TUid KUidIdleApp = { 0x101FD64C };
-/******************************************************************************************
-
-    Security policies of this server are defined here:   
-
-*/
-
-/**
-    Ranges (inclusive):
-        0: EUISettingsSrvSetStartupImage to (EUISettingsSrvLastCmd-1)
-        1: EUISettingsSrvLastCmd to KMaxTInt
-*/
-const TInt CUISettingsSrvServer::iRanges[UISETTINGSSRV_POLICYCOUNT] =
-                {EUISettingsSrvSetStartupImage, EUISettingsSrvLastCmd};
-
-/**
-    For range 0: Always pass
-    For range 1: Not supported
-*/
-const TUint8 CUISettingsSrvServer::iElementsIndex[UISETTINGSSRV_POLICYCOUNT] = 
-                {CPolicyServer::EAlwaysPass, CPolicyServer::ENotSupported};
-
-/**
-    The policy
-*/
-const CPolicyServer::TPolicy CUISettingsSrvServer::iConnectionPolicy =
-    {
-        CPolicyServer::ECustomCheck, // Check connection
-        UISETTINGSSRV_POLICYCOUNT,
-        iRanges,
-        iElementsIndex,
-        0
-    };
-
-// MACROS
-#define WELCOME_NOTE_MAX_LENGTH 100
-//_LIT( KTempFilePath, "c:\\system\\temp\\" );
-_LIT( KUISSWelcomeImagePath,    "c:\\system\\data\\welcomedata.mbm");
-//_LIT8( KMimeTypeImageMbm, "image/x-epoc-mbm");
-
-// ----------------------------------------------------------------------------------------
-// CShutDown
-// ----------------------------------------------------------------------------------------
-
-inline CShutdown::CShutdown()
-	:CTimer(-1)
-	{
-	CActiveScheduler::Add(this);
-	}
-
-inline void CShutdown::ConstructL()
-	{
-	CTimer::ConstructL();
-	}
-
-inline void CShutdown::Start()
-	{
-	RDEBUG( "UiSettingsSrv: Starting shutdown timeout" );
-	After( KUISettingsSrvShutdownDelay );
-	}
-
-void CShutdown::RunL()
-	{
-	RDEBUG( "UiSettingsSrv: Timeout ... closing" );
-	CEikonEnv::Static()->EikAppUi()->HandleCommandL( EEikCmdExit );
-	}
-
-// ----------------------------------------------------------------------------------------
-// CUISettingsSrvServer
-// ----------------------------------------------------------------------------------------
-CUISettingsSrvServer::CUISettingsSrvServer(TInt aPriority)
-	: CPolicyServer (
-	    aPriority, // Active object priority
-	    iConnectionPolicy,
-	    EUnsharableSessions
-	  )
-	, iActive( 0 )
-	, iSessionCount( 0 )
-//	, iShortcuts( 0 )
-	, iImgHandling( 0 )
-	, iAppList( 0 )
-	, iIdleBitmapUid( KUidIdleApp )
-	, iAIBitmapUid( KUidIdleApp ) 
-	{
-	}
-
-// ----------------------------------------------------------------------------------------
-// CTerminalControlServer::CustomSecurityCheckL
-// ----------------------------------------------------------------------------------------
-CPolicyServer::TCustomResult CUISettingsSrvServer::CustomSecurityCheckL(const RMessage2& aMsg, TInt& /*aAction*/, TSecurityInfo& /*aMissing*/)
-	{
-	RDEBUG("CUISettingsSrvServer::CustomSecurityCheckL");
-
-    _LIT_SECURITY_POLICY_C7(
-                KRequiredCapabilities1,
-                ECapabilityNetworkServices,
-                ECapabilityLocalServices,
-                ECapabilityLocation,
-                ECapabilityReadUserData,
-                ECapabilityWriteUserData,
-                ECapabilityReadDeviceData,
-                ECapabilityWriteDeviceData
-                );
-
-    _LIT_SECURITY_POLICY_C3(
-                KRequiredCapabilities2,
-                ECapabilitySwEvent,
-                ECapabilityUserEnvironment,
-                ECapabilityNetworkControl
-                );
-
-		TInt policy1 = KRequiredCapabilities1().CheckPolicy( aMsg );
-		if( !policy1 )
-		    {
-            RDEBUG("CUISettingsSrvServer::CustomSecurityCheckL Capabilities ERROR");
-            return EFail;
-		    }
-
-		TInt policy2 = KRequiredCapabilities2().CheckPolicy( aMsg );
-		if( !policy2 )
-		    {
-            RDEBUG("CUISettingsSrvServer::CustomSecurityCheckL Capabilities ERROR");
-            return EFail;
-		    }
-
-        RDEBUG("CUISettingsSrvServer::CustomSecurityCheckL Capabilities OK");
-        return EPass;
-	}
-
-CUISettingsSrvServer::~CUISettingsSrvServer()
-	{
-	iShutdownTimer.Cancel();
-
-//    delete iAppList;
-
-//	delete iShortcuts;
-
-    if( iTemporaryImageFile.Length() > 0 )
-        {
-        RDEBUG( "CUISettingsSrvServer::~CUISettingsSrvServer() Deleting temporary file" );
-        iFs.Delete( iTemporaryImageFile );
-        iTemporaryImageFile.Zero();
-        }
-
-	iFs.Close();
-
-	iIndeces.Reset();
-	iNotifyChanges.Reset();
-
-	delete iImgHandling;
-
-	delete iStartupRep;
-	}
-
-
-void CUISettingsSrvServer::ConstructL()
-	{
-	RDEBUG( "CUISettingsSrvServer::ConstructL" );
-
-	User::LeaveIfError( iFs.Connect() );
-//    iShortcuts = CScShortcutEngine::NewL(iFs, *this);
-//    RDEBUG_2( "CUISettingsSrvServer::ConstructL CScShortcutEngine ALLOC %x", iShortcuts );
-
-	iShutdownTimer.ConstructL();
-	iShutdownTimer.Start();
-	StartL(KUISettingsSrvName);
-
-    iImgHandling = CGSAsyncImageHandling::NewL(
-                        iFs, this, KUISSWelcomeImagePath() );
-
-    RDEBUG_2( "CUISettingsSrvServer::ConstructL CGSAsyncImageHandling ALLOC %x", iImgHandling );
-
-    iStartupRep = CRepository::NewL( KCRUidStartupConf );
-    RDEBUG_2( "CUISettingsSrvServer::ConstructL CRepository ALLOC %x", iStartupRep );
-	}
-
-// Create and start a new count server.
-CUISettingsSrvServer* CUISettingsSrvServer::NewL()
-	{
-	RDEBUG( "CUISettingsSrvServer::NewL" );
-
-	CUISettingsSrvServer *pS = 0;
-	pS = new (ELeave) CUISettingsSrvServer( EPriorityStandard );
-    RDEBUG_2( "CUISettingsSrvServer::NewL CUISettingsSrvServer ALLOC %x", pS );
-
-	CleanupStack::PushL( pS );
-
-	pS->ConstructL();
-
-	CleanupStack::Pop( pS );
-	return pS;
-	}
-
-
-// Create a new server session.
-CSession2 *CUISettingsSrvServer::NewSessionL(const TVersion& aVersion,const RMessage2& /*aMessage*/) const
-	{
-	RDEBUG( "CUISettingsSrvServer::NewSessionL" );
-
-	// check we're the right version
-	TVersion v(KUISettingsSrvMajorVersionNumber,KUISettingsSrvMinorVersionNumber,KUISettingsSrvBuildVersionNumber);
-	if (!User::QueryVersionSupported(v,aVersion))
-		{
-		User::Leave(KErrNotSupported);
-		}
-
-	// make new session
-	return CUISettingsSrvSession::NewL( ( CUISettingsSrvServer*) this );
-	}
-
-void CUISettingsSrvServer::AddSession()
-	{
-	RDEBUG( "CUISettingsSrvServer::AddSession" );
-
-	iSessionCount++;
-	iShutdownTimer.Cancel();
-	}
-
-void CUISettingsSrvServer::RemoveSession()
-	{
-	RDEBUG( "CUISettingsSrvServer::RemoveSession" );
-
-	iSessionCount--;
-	if (iSessionCount <= 0)
-		{
-		iShutdownTimer.Start();
-		}
-	}
-
-void CUISettingsSrvServer::Shutdown()
-	{
-	RDEBUG( "CUISettingsSrvServer::Shutdown" );	
-	}
-
-// From MScSelectableShortcutListObserver
-void CUISettingsSrvServer::ScSSLOHandleListChangedL()
-    {
-	RDEBUG( "CUISettingsSrvServer::ScSSLOHandleListChangedL" );
-
-	// Shortcut list has changed, notify sessions about the situation!
-    for(TInt i=0; i<iNotifyChanges.Count(); i++)
-        {
-        TInt* flag = iNotifyChanges[ i ];
-        if( flag != 0 )
-            {
-            *flag = 1;
-            }
-        }
-    }
-
-// From MScSelectableShortcutListObserver
-void CUISettingsSrvServer::ScSSLOHandleListConstructionComplete(TInt /*aError*/)
-    {
-	RDEBUG( "CUISettingsSrvServer::ScSSLOHandleListConstructionComplete" );
-
-    if( iASWait.IsStarted() )
-    {
-        iASWait.AsyncStop();
-    }
-    }
-
-// From MScEngineObserver
-// TBool CUISettingsSrvServer::MScEngineHandleShortcutEvent(
-//                    TScShortcutEvent /*aEvent*/,
-//                    TScActionType /*aType*/
-//                    )
-//    {
-//	RDEBUG( "CUISettingsSrvServer::MScEngineHandleShortcutEvent" );
-
-//    return EFalse;
-//    } */
-
-void CUISettingsSrvServer::GetShortcutTargetListL()
-    {
-/*	RDEBUG( "CUISettingsSrvServer::GetShortcutTargetListL" );
-
-    if( iASWait.IsStarted() )
-        {
-        User::Leave( KErrServerBusy );
-        }
-
-    // Remember count of previous list
-    TInt oldCount = 0;
-    if( iAppList != 0 )
-        {
-        oldCount = iAppList->Count();
-        }
-
-    delete iAppList;
-    iAppList = 0;
-
-    delete iShortcuts;
-    iShortcuts = 0;
-
-    iShortcuts = CScShortcutEngine::NewL(iFs, *this);
-    RDEBUG_2( "CUISettingsSrvServer::GetShortcutTargetListL CScShortcutEngine ALLOC %x", iShortcuts );
-
-    const CScSelectableShortcutList::TCaptionType typeSettings = 
-                CScSelectableShortcutList::ECaptionTypeSoftkey;
-    iAppList = iShortcuts->SelectableApplicationListLC( typeSettings, *this );
-
-    iASWait.Start();
-    CleanupStack::Pop( iAppList );
-
-    //
-    // If list had already changed (and engine had not notified that to us)
-    // set flag to indicate that clients data is most probably outdated
-    //
-    if( (oldCount > 0) && (oldCount != iAppList->Count()) )
-        {
-        ScSSLOHandleListChangedL();
-        }
-        
-    */
-    }
-
-void CUISettingsSrvServer::SetShortcutListMaskL(CScSelectableShortcutList& aScAppList, TInt aMask)
-    {
-/*	RDEBUG( "CUISettingsSrvServer::SetShortcutListMaskL" );
-
-    iIndeces.Reset();
-    TInt i, count = aScAppList.Count();
-
-    for(i=0; i<count; i++)
-        {
-        TScRtType rtType = aScAppList.At( i ).MScRtType();
-        TInt rt = EUiSrvRtTypeNul;
-
-        if( aMask == EUiSrvRtTypeNul)
-            {
-            iIndeces.AppendL( i );
-            }
-        else
-            {
-            switch( rtType.iUid )
-                {
-                case KScRtTypeUidValueNativeApp:
-                case KScRtTypeUidValueMailbox:
-                case KScRtTypeUidValueMsgEditor:
-                case KScRtTypeUidValueNewMessage:
-                case KScRtTypeUidValueNoEffect:
-                default:
-                    rt |= EUiSrvRtTypeApp;
-                break;
-
-                case KScRtTypeUidValueBookmark:
-                    {
-                    rt |= EUiSrvRtTypeBm;
-                    TUid uid = TUid::Uid( KScCustomOpValueBookmarkGetURL );
-                    HBufC* url = (HBufC*)
-                             aScAppList.At( i ).MScCustomOperationL(
-                                    uid,
-                                    (TAny*)0,
-                                    (TAny*)0
-                                    );
-                    delete url;               
-                    }
-                break;
-                }
-
-            if( (aMask & rt) == rt )
-                {
-                iIndeces.AppendL( i );
-                }
-            }
-        }
-        
-    */
-    }
-
-void CUISettingsSrvServer::AddListChangeNotifierL(TInt *aFlag)
-    {
-	RDEBUG( "CUISettingsSrvServer::AddListChangeNotifierL" );
-
-    iNotifyChanges.AppendL( aFlag );
-    }
-
-void CUISettingsSrvServer::RemoveListChangeNotifierL(TInt *aFlag)
-    {
-	RDEBUG( "CUISettingsSrvServer::RemoveListChangeNotifierL" );
-
-    iNotifyChanges.Remove( iNotifyChanges.FindL(aFlag) );
-    }
-
-void CUISettingsSrvServer::GetShortcutTargetCountL(
-                            const RMessage2 &aMessage )
-    {
-	RDEBUG( "CUISettingsSrvServer::GetShortcutTargetCountL" );
-
-    SetShortcutListMaskL( *iAppList, aMessage.Int0() );
-
-    TInt count = iIndeces.Count();
-    TPckg<TInt> countp( count );
-    aMessage.Write(1, countp);
-    }
-
-void CUISettingsSrvServer::GetShortcutTargetTypeL( const RMessage2 &aMessage )
-    {
-/*	RDEBUG( "CUISettingsSrvServer::GetShortcutTargetTypeL" );
-
-    SetShortcutListMaskL( *iAppList, aMessage.Int0() );
-
-    TInt index = aMessage.Int1();
-    TInt type = iAppList->At( iIndeces[ index ] ).MScRtType().iUid;
-    TPckg<TInt> typep( type );
-    aMessage.Write(2, typep);
-
-*/
-    }
-
-void CUISettingsSrvServer::GetShortcutTargetCaptionL( const RMessage2 &aMessage )
-    {
-/*	RDEBUG( "CUISettingsSrvServer::GetShortcutTargetCaptionL" );
-
-    SetShortcutListMaskL( *iAppList, aMessage.Int0() );
-
-    TInt index = aMessage.Int1();
-    TPtrC caption( iAppList->At( iIndeces[ index ] ).MScCaption( MScShortcut::EScCaptionTypeSoftkey ) );
-    aMessage.Write(2, caption);
-*/
-    }
-
-void CUISettingsSrvServer::GetShortcutTargetAppUidL( const RMessage2 &aMessage )
-    {
-/*	RDEBUG( "CUISettingsSrvServer::GetShortcutTargetAppUidL" );
-
-    SetShortcutListMaskL( *iAppList, aMessage.Int0() );
-
-    TInt index = aMessage.Int1();
-    
-    TInt appUid = 0;
-    
-    const CScShortcutBase &sc = iAppList->At( iIndeces[ index ] );
-    if( sc.MScRtType() == KScRtTypeUidBookmark )
-        {
-        appUid = (TInt)iAppList->At( iIndeces[ index ] ).CustomOperationL( KScCustomOpBookmarkGetBookmarkId, NULL, NULL );
-        }
-    else
-        {
-        appUid = (TInt)iAppList->At( iIndeces[ index ] ).CustomOperationL( KScCustomOpNativeAppGetUid, NULL, NULL );
-        }
-    TPckg<TInt> uidp( appUid );
-    aMessage.Write(2, uidp);
-    
-*/
-    }
-
-void CUISettingsSrvServer::GetShortcutTargetIndexFromATL( const RMessage2 &aMessage )
-    {
-/*	RDEBUG( "CUISettingsSrvServer::GetShortcutTargetIndexFromATL" );
-
-    SetShortcutListMaskL( *iAppList, aMessage.Int0() );
-
-    TInt i, index = -1;
-    TInt actionType = aMessage.Int1();
-    const CScShortcutBase &sc = iShortcuts->ShortcutL( TUid::Uid( actionType ) );
-
-    for(i=0; i<iIndeces.Count(); i++)
-        {
-        if( iAppList->At( iIndeces[ i ] ).IsEqual( sc ) )
-            {
-            index = i;
-            break;
-            }
-        }
-
-    TPckg<TInt> indexp( index );
-    aMessage.Write(2, indexp);
-    
-*/
-
-    }
-
-void CUISettingsSrvServer::GetShortcutTargetIndexL( const RMessage2 &aMessage )
-    {
-/*	RDEBUG( "CUISettingsSrvServer::GetShortcutTargetIndexL" );
-
-    TInt type = aMessage.Int0();
-
-    SetShortcutListMaskL( *iAppList, type );
-
-    TInt i, index = -1;
-    TInt theUid = aMessage.Int1();
-
-    for(i=0; i<iIndeces.Count(); i++)
-        {
-        if( (type & EUiSrvRtTypeBm) == EUiSrvRtTypeBm )
-            {
-                TScBookmarkEngineId bmUid = -1;
-
-                TRAPD
-                (
-                 reason,
-                 bmUid = (TScBookmarkEngineId)iAppList->At( iIndeces[ i ] ).CustomOperationL( KScCustomOpBookmarkGetBookmarkId, NULL, NULL )
-                );
-
-                if( (KErrNone == reason) && (bmUid == theUid) )
-                    {
-                    index = i;
-                    break;
-                    }
-            }
-        if( (type & EUiSrvRtTypeApp) == EUiSrvRtTypeApp )
-            {
-                TInt appUid = -1;
-
-                TRAPD
-                (
-                 reason,
-                 appUid = (TInt)iAppList->At( iIndeces[ i ] ).CustomOperationL( KScCustomOpNativeAppGetUid, NULL, NULL )
-                );
-
-                if( (KErrNone == reason) && (appUid == theUid) )
-                    {
-                    index = i;
-                    break;
-                    }
-            }
-        }
-
-    TPckg<TInt> indexp( index );
-    aMessage.Write(2, indexp);
-*/
-    }
-
-void CUISettingsSrvServer::SetShortcutTargetAppIndexL(const RMessage2 &aMessage)
-    {
-/*	RDEBUG( "CUISettingsSrvServer::SetShortcutTargetAppIndexL >" );
-
-    SetShortcutListMaskL( *iAppList, aMessage.Int0() );
-
-    TInt actionType = aMessage.Int1();
-    TInt index = aMessage.Int2();
-
-    RDEBUG( "CUISettingsSrvServer::SetShortcutTargetAppIndexL get Shortcut index" );
-    TInt scIndex = iIndeces[ index ];
-
-    if( scIndex >= iAppList->Count() )
-        {
-        RDEBUG_3( "CUISettingsSrvServer::SetShortcutTargetAppIndexL Index out of bound! %d >= %d", scIndex, iAppList->Count() );
-        User::Leave( KErrArgument );
-        }
-
-    RDEBUG( "CUISettingsSrvServer::SetShortcutTargetAppIndexL get Shortcut from the list" );
-    const CScShortcutBase &newSc = iAppList->At( scIndex );
-
-    RDEBUG( "CUISettingsSrvServer::SetShortcutTargetAppIndexL entering iShortcuts->SetShortcutL" );
-    iShortcuts->SetShortcutL( TUid::Uid( actionType ), newSc );
-
-    RDEBUG( "CUISettingsSrvServer::SetShortcutTargetAppIndexL <" );
-*/
-    }
-
-void CUISettingsSrvServer::GetShortcutRtTypeL(const RMessage2 &aMessage)
-    {
-/*	RDEBUG( "CUISettingsSrvServer::GetShortcutRtTypeL" );
-
-
-    TInt actionType = aMessage.Int0();
-    const CScShortcutBase &sc = iShortcuts->ShortcutL( TUid::Uid( actionType ) );
-
-    TInt rtType = sc.RtType().iUid;
-
-    TPckg<TInt> rttypep( rtType );
-    aMessage.Write(1, rttypep);
-*/
-    }
-
-void CUISettingsSrvServer::SetShortcutTargetCaptionL(const RMessage2 &aMessage)
-    {
-/*	RDEBUG( "CUISettingsSrvServer::SetShortcutTargetCaptionL" );
-
-    SetShortcutListMaskL( *iAppList, aMessage.Int0() );
-
-    HBufC16 *caption = CUISettingsSrvSession::CopyParameter16L( aMessage, 2 );
-    CleanupStack::PushL( caption );
-
-    CleanupStack::PopAndDestroy( caption );
-*/
-    }
-
-void CUISettingsSrvServer::SetShortcutTargetBitmapL(const RMessage2 &aMessage, TBool aIsMask/*=EFalse*/)
-    {
-/*	RDEBUG( "CUISettingsSrvServer::SetShortcutTargetBitmapL >" );
-
-    SetShortcutListMaskL( *iAppList, aMessage.Int0() );
-
-    TInt index  = aMessage.Int1();
-
-    HBufC16 *filename = CUISettingsSrvSession::CopyParameter16L( aMessage, 2 );
-    CleanupStack::PushL( filename );
-
-    HBufC8 *mimetype = CUISettingsSrvSession::CopyParameter8L( aMessage, 3 );
-    CleanupStack::PushL( mimetype );
-
-    CFbsBitmap *bitmap = LoadBitmapL( *filename, *mimetype );
-    CleanupStack::PushL( bitmap );
-
-    CScShortcutBase &sc = (CScShortcutBase&)iAppList->At( iIndeces[ index ] );
-    CScShortcutBitmapArray &scBitmapArray = sc.MScMultipleBitmapsL();
-
-    CScShortcutBitmap *oldBitmap = 0;
-    CScShortcutBitmap *newBitmap = 0;
-
-    TRAP_IGNORE(
-           oldBitmap = & scBitmapArray.BitmapL( iIdleBitmapUid ) );
-
-    if( 0 == oldBitmap )
-        {
-        if( aIsMask )
-            {
-            RDEBUG( "CUISettingsSrvServer::SetShortcutTargetBitmapL ERROR Trying to set mask when there is no image");
-            User::Leave( KErrNotSupported );
-            }
-        newBitmap = CScShortcutBitmap::NewL( iIdleBitmapUid );
-        RDEBUG_2( "CUISettingsSrvServer::SetShortcutTargetBitmapL CScShortcutBitmap::NewL ALLOC %x", newBitmap );
-        }
-    else
-        {
-        newBitmap = CScShortcutBitmap::NewCopyL( *oldBitmap );
-        RDEBUG_2( "CUISettingsSrvServer::SetShortcutTargetBitmapL CScShortcutBitmap::NewCopyL ALLOC %x", newBitmap );
-        }
-
-    CleanupStack::PushL( newBitmap );
-
-    // Set image or mask
-    if( ! aIsMask )
-        {
-        RDEBUG( "CUISettingsSrvServer::SetShortcutTargetBitmapL Setting BITMAP" );
-        newBitmap->SetImageL( bitmap );
-        }
-    else
-        {
-        if( !newBitmap->HasBitmap() )
-            {
-            RDEBUG( "CUISettingsSrvServer::SetShortcutTargetBitmapL ERROR Trying to set mask when there is no image 2");
-            User::Leave( KErrNotSupported );
-            }
-        RDEBUG( "CUISettingsSrvServer::SetShortcutTargetBitmapL Setting MASK" );
-        newBitmap->SetMaskL( bitmap );
-        }
-
-    RDEBUG( "CUISettingsSrvServer::SetShortcutTargetBitmapL Updating shortcut bitmaps" );
-    scBitmapArray.SetBitmapL( iIdleBitmapUid, newBitmap );
-
-    CleanupStack::Pop( newBitmap );
-    CleanupStack::Pop( bitmap );
-    CleanupStack::PopAndDestroy( mimetype );
-    CleanupStack::PopAndDestroy( filename );
-
-    RDEBUG( "CUISettingsSrvServer::SetShortcutTargetBitmapL <" );
-*/
-    }
-
-void CUISettingsSrvServer::GetShortcutTargetBitmapL(const RMessage2 &aMessage, TBool aIsMask/*=EFalse*/)
-    {
-/*	RDEBUG( "CUISettingsSrvServer::GetShortcutTargetBitmapL >" );
-
-    SetShortcutListMaskL( *iAppList, aMessage.Int0() );
-    TInt index  = aMessage.Int1();
-
-    CScShortcutBase &sc = (CScShortcutBase&)iAppList->At( iIndeces[ index ] );
-    CScShortcutBitmapArray &scBitmapArray = sc.MScMultipleBitmapsL();
-    CScShortcutBitmap *scBitmap = 0;
-
-    TRAP_IGNORE(
-           scBitmap = & scBitmapArray.BitmapL( iIdleBitmapUid ) );
-
-    if( 0 == scBitmap )
-        {
-        User::Leave( KErrNotFound );
-        }
-
-    CFbsBitmap *bitmap = 0;
-
-    if( !aIsMask )
-        {
-        bitmap = &scBitmap->ImageL();
-        }
-    else
-        {
-        bitmap = &scBitmap->MaskL();
-        }
-
-    CleanupStack::PushL( bitmap );
-
-    //
-    // Delete previous temp file
-    //
-    if( iTemporaryImageFile.Length() > 0 )
-        {
-        iFs.Delete( iTemporaryImageFile );
-        iTemporaryImageFile.Zero();
-        }
-
-    //
-    // Create new temp file
-    //
-    RFile file;
-    User::LeaveIfError( file.Temp( iFs, KTempFilePath, iTemporaryImageFile, EFileWrite ) );
-    CleanupClosePushL( file );
-
-    bitmap->Save( file );
-
-    // Close file
-    CleanupStack::PopAndDestroy( &file );
-
-    CleanupStack::PopAndDestroy( bitmap );
-
-    RDEBUG( "CUISettingsSrvServer::GetShortcutTargetBitmapL <" );
-    
-*/
-    }
-
-void CUISettingsSrvServer::SetSoftkeyBitmapL(const RMessage2 &aMessage, TBool aIsMask/*=EFalse*/)
-    {
-/*	RDEBUG( "CUISettingsSrvServer::SetSoftkeyBitmapL >" );
-
-    TUid imageUid ( iIdleBitmapUid );
-    TInt softkeyUid = aMessage.Int0();
-    switch( softkeyUid )
-        {
-        default:
-        case KScActionTypeUidValueNull:
-            User::Leave( KErrArgument );
-        break;
-
-        case KScActionTypeUidValueSoftkeyLeft:
-        case KScActionTypeUidValueSoftkeyRight:
-        case KScActionTypeUidValueScrollkeyLeft:
-        case KScActionTypeUidValueScrollkeyRight:
-        case KScActionTypeUidValueScrollkeyUp:
-        case KScActionTypeUidValueScrollkeyDown:
-        case KScActionTypeUidValueScrollkeySelect:
-        imageUid = iIdleBitmapUid;
-        break;
-
-        case KActiveIdleScUidValueItem1:
-        case KActiveIdleScUidValueItem2:
-        case KActiveIdleScUidValueItem3:
-        case KActiveIdleScUidValueItem4:
-        case KActiveIdleScUidValueItem5:
-        imageUid = iAIBitmapUid;
-        break;
-        }
-
-    HBufC16 *filename = CUISettingsSrvSession::CopyParameter16L( aMessage, 1 );
-    CleanupStack::PushL( filename );
-
-    HBufC8 *mimetype = CUISettingsSrvSession::CopyParameter8L( aMessage, 2 );
-    CleanupStack::PushL( mimetype );
-
-    CFbsBitmap *bitmap = LoadBitmapL( *filename, *mimetype );
-    CleanupStack::PushL( bitmap );
-
-    CScShortcutBase& shortcut = iShortcuts->ShortcutL( TUid::Uid( softkeyUid ) );
-    CScShortcutBitmapArray &scBitmapArray = shortcut.MScMultipleBitmapsL();
-
-    CScShortcutBitmap *oldBitmap = 0;
-    CScShortcutBitmap *newBitmap = 0;
-
-    TRAP_IGNORE(
-           oldBitmap = & scBitmapArray.BitmapL( imageUid ) );
-
-    if( 0 == oldBitmap )
-        {
-        if( aIsMask )
-            {
-            RDEBUG( "CUISettingsSrvServer::SetSoftkeyBitmapL ERROR Trying to set mask when there is no image");
-            User::Leave( KErrNotSupported );
-            }
-        newBitmap = CScShortcutBitmap::NewL( imageUid );
-        RDEBUG_2( "CUISettingsSrvServer::SetSoftkeyBitmapL CScShortcutBitmap::NewL ALLOC %x", newBitmap );
-        }
-    else
-        {
-        newBitmap = CScShortcutBitmap::NewCopyL( *oldBitmap );
-        RDEBUG_2( "CUISettingsSrvServer::SetSoftkeyBitmapL CScShortcutBitmap::NewCopyL ALLOC %x", newBitmap );
-        }
-
-    CleanupStack::PushL( newBitmap );
-
-    // Set image or mask
-    if( ! aIsMask )
-        {
-        RDEBUG( "CUISettingsSrvServer::SetSoftkeyBitmapL Setting BITMAP" );
-        newBitmap->SetImageL( bitmap );
-        }
-    else
-        {
-        if( !newBitmap->HasBitmap() )
-            {
-            RDEBUG( "CUISettingsSrvServer::SetSoftkeyBitmapL ERROR Trying to set mask when there is no image 2");
-            User::Leave( KErrNotSupported );
-            }
-        RDEBUG( "CUISettingsSrvServer::SetSoftkeyBitmapL Setting MASK" );
-        newBitmap->SetMaskL( bitmap );
-        }
-
-    RDEBUG( "CUISettingsSrvServer::SetSoftkeyBitmapL Updating shortcut bitmaps" );
-    scBitmapArray.SetBitmapL( imageUid, newBitmap );
-
-    // Shortcut is updated ...
-    iShortcuts->SetShortcutL( TUid::Uid( softkeyUid ), shortcut );
-
-    CleanupStack::Pop( newBitmap );
-    CleanupStack::Pop( bitmap );
-    CleanupStack::PopAndDestroy( mimetype );
-    CleanupStack::PopAndDestroy( filename );
-
-	RDEBUG( "CUISettingsSrvServer::SetSoftkeyBitmapL <" );
-*/
-    }
-
-void CUISettingsSrvServer::GetSoftkeyBitmapL(const RMessage2 &aMessage, TBool aIsMask/*=EFalse*/)
-    {
-/*	RDEBUG( "CUISettingsSrvServer::GetSoftkeyBitmapL" );
-
-    TUid imageUid ( iIdleBitmapUid );
-    TInt softkeyUid = aMessage.Int0();
-    switch( softkeyUid )
-        {
-        default:
-        case KScActionTypeUidValueNull:
-            User::Leave( KErrArgument );
-        break;
-
-        case KScActionTypeUidValueSoftkeyLeft:
-        case KScActionTypeUidValueSoftkeyRight:
-        case KScActionTypeUidValueScrollkeyLeft:
-        case KScActionTypeUidValueScrollkeyRight:
-        case KScActionTypeUidValueScrollkeyUp:
-        case KScActionTypeUidValueScrollkeyDown:
-        case KScActionTypeUidValueScrollkeySelect:
-        imageUid = iIdleBitmapUid;
-        break;
-
-        case KActiveIdleScUidValueItem1:
-        case KActiveIdleScUidValueItem2:
-        case KActiveIdleScUidValueItem3:
-        case KActiveIdleScUidValueItem4:
-        case KActiveIdleScUidValueItem5:
-        imageUid = iAIBitmapUid;
-        break;
-        }
-
-    CScShortcutBase& shortcut = iShortcuts->ShortcutL( TUid::Uid( softkeyUid ) );
-    CScShortcutBitmapArray &scBitmapArray = shortcut.MScMultipleBitmapsL();
-    CScShortcutBitmap *scBitmap = 0;
-
-    TRAP_IGNORE(
-           scBitmap = & scBitmapArray.BitmapL( imageUid ) );
-
-    if( 0 == scBitmap )
-        {
-        User::Leave( KErrNotFound );
-        }
-
-    CFbsBitmap *bitmap = 0;
-
-    if( !aIsMask )
-        {
-        bitmap = &scBitmap->ImageL();
-        }
-    else
-        {
-        bitmap = &scBitmap->MaskL();
-        }
-
-    CleanupStack::PushL( bitmap );
-
-    //
-    // Delete previous temp file
-    //
-    if( iTemporaryImageFile.Length() > 0 )
-        {
-        iFs.Delete( iTemporaryImageFile );
-        iTemporaryImageFile.Zero();
-        }
-
-    //
-    // Create new temp file
-    //
-    RFile file;
-    User::LeaveIfError( file.Temp( iFs, KTempFilePath, iTemporaryImageFile, EFileWrite ) );
-    CleanupClosePushL( file );
-
-    bitmap->Save( file );
-
-    aMessage.Write(1, iTemporaryImageFile);
-    aMessage.Write(2, KMimeTypeImageMbm);
-
-    // Close file
-    CleanupStack::PopAndDestroy( &file );
-
-    CleanupStack::PopAndDestroy( bitmap );
-*/
-    }
-
-void CUISettingsSrvServer::SetStartupImageL( const TDesC &aFilePath )
-    {
-	RDEBUG( "CUISettingsSrvServer::SetStartupImageL" );
-
-    if( iASWait.IsStarted() )
-        {
-        User::Leave( KErrServerBusy );
-        }
-
-    if( iImgHandling->IsActive() )
-        {
-        iASWait.Start();
-        }
-
-    CGSBackgroundImage *bgImage = CGSBackgroundImage::NewL();
-    RDEBUG_2( "CUISettingsSrvServer::SetShortcutTargetBitmapL CGSBackgroundImage::NewL ALLOC %x", bgImage );
-
-    CleanupStack::PushL( bgImage );
-    bgImage->SetWelcomeNoteImageL( aFilePath, *iImgHandling );
-    iImageHandlingError = KErrNone;
-    User::LeaveIfError( iImageHandlingError );
-
-    User::LeaveIfError( iStartupRep->Set( KStartupWelcomeNoteImage, KUISSWelcomeImagePath ) );
-
-    CleanupStack::PopAndDestroy( bgImage );
-    }
-
-void CUISettingsSrvServer::SetStartupImageL(const RMessage2 &aMessage)
-    {
-	RDEBUG( "CUISettingsSrvServer::SetStartupImageL" );
-
-    HBufC16* text = CUISettingsSrvSession::CopyParameter16L( aMessage, 0 );
-    CleanupStack::PushL( text );
-
-    SetStartupImageL( *text );
-
-    CleanupStack::PopAndDestroy( text );
-    }
-
-void CUISettingsSrvServer::GetStartupImagePathL(const RMessage2 &aMessage)
-    {
-	RDEBUG( "CUISettingsSrvServer::GetStartupImagePathL" );
-
-    TFileName imageLocation;
-
-    CRepository* rep = CRepository::NewLC( KCRUidStartupConf );
-    RDEBUG_2( "CUISettingsSrvServer::GetStartupImagePathL CRepository::NewLC ALLOC %x", rep );
-
-    User::LeaveIfError( rep->Get( KStartupWelcomeNoteImage, imageLocation ) );
-
-    CleanupStack::PopAndDestroy( rep );
-
-    aMessage.Write(0, imageLocation);
-    }
-
-void CUISettingsSrvServer::SetStartupTextL(const RMessage2 &aMessage)
-    {
-	RDEBUG( "CUISettingsSrvServer::SetStartupTextL" );
-
-    HBufC16* text = CUISettingsSrvSession::CopyParameter16L( aMessage, 0 );
-    CleanupStack::PushL( text );
-
-    User::LeaveIfError( iStartupRep->Set( KStartupWelcomeNoteText, *text ) );
-
-    CleanupStack::PopAndDestroy( text );
-    }
-
-void CUISettingsSrvServer::GetStartupTextL(const RMessage2 &aMessage)
-    {
-	RDEBUG( "CUISettingsSrvServer::GetStartupTextL" );
-
-    TBuf<WELCOME_NOTE_MAX_LENGTH> welcomeText;
-
-    User::LeaveIfError( iStartupRep->Get( KStartupWelcomeNoteText, welcomeText ) );
-
-    aMessage.Write(0, welcomeText);
-    }
-
-void CUISettingsSrvServer::GetStartupTextSizeL(const RMessage2 &aMessage)
-    {
-	RDEBUG( "CUISettingsSrvServer::GetStartupTextSizeL" );
-
-    TBuf<WELCOME_NOTE_MAX_LENGTH> welcomeText;
-
-    User::LeaveIfError( iStartupRep->Get( KStartupWelcomeNoteText, welcomeText ) );
-
-    TInt len = welcomeText.Length();
-    TPckg<TInt> lenp( len );
-    aMessage.Write(0, lenp);
-    }
-
-void CUISettingsSrvServer::SetStartupNoteTypeL(const RMessage2 &aMessage)
-    {
-	RDEBUG( "CUISettingsSrvServer::SetStartupNoteTypeL" );
-
-    TInt type = aMessage.Int0();
-
-    User::LeaveIfError( iStartupRep->Set( KStartupWelcomeNoteType, type ) );
-    }
-
-void CUISettingsSrvServer::GetStartupNoteTypeL(const RMessage2 &aMessage)
-    {
-	RDEBUG( "CUISettingsSrvServer::GetStartupNoteTypeL" );
-
-    TInt type = 0;
-
-    User::LeaveIfError( iStartupRep->Get( KStartupWelcomeNoteType, type ) );
-
-    TPckg<TInt> typep( type );
-    aMessage.Write(0, typep);
-    }
-
-// -------------------------------------------------------------------------------------
-// CUISettingsSrvServer::LoadBitmapL
-// -------------------------------------------------------------------------------------
-CFbsBitmap* CUISettingsSrvServer::LoadBitmapL( const TDesC& aFileName, const TDesC8& aType )
-    {
-	RDEBUG( "CUISettingsSrvServer::LoadBitmapL" );
-
-    if( aType.Length() == 0 )
-        {
-    	RDEBUG( "CUISettingsSrvServer::LoadBitmapL ERROR Mime type is missing!" );
-        User::Leave( KErrArgument );
-        }
-
-	RDEBUG_2( "CUISettingsSrvServer::LoadBitmapL Filename:  %S", &aFileName );
-	RDEBUG8_2( "CUISettingsSrvServer::LoadBitmapL Mime type: %S", &aType );
-
-    //
-    // Convert to CFbsImages
-    //
-    const CImageDecoder::TOptions options = CImageDecoder::EOptionAlwaysThread;
-
-    CImageDecoder* img = CImageDecoder::FileNewL( 
-                            iFs,
-                            aFileName,
-                            aType,
-                            options);
-
-    RDEBUG_2( "CUISettingsSrvServer::LoadBitmapL CImageDecoder::FileNewL ALLOC %x", img );
-
-    CleanupStack::PushL( img );
-    
-    CFbsBitmap* bitmap = 0;
-
-    if( img != 0 )
-        {
-        TFrameInfo frameInfo = img->FrameInfo();
-        TRequestStatus rs( KErrNone );
-
-        bitmap = new (ELeave) CFbsBitmap();
-        RDEBUG_2( "CUISettingsSrvServer::LoadBitmapL CFbsBitmap bitmap ALLOC %x", bitmap );
-
-        CleanupStack::PushL( bitmap );
-        bitmap->Create( frameInfo.iOverallSizeInPixels, frameInfo.iFrameDisplayMode );
-
-        CFbsBitmap* mask   =  new (ELeave) CFbsBitmap();
-        RDEBUG_2( "CUISettingsSrvServer::LoadBitmapL CFbsBitmap mask ALLOC %x", mask );
-
-        CleanupStack::PushL( mask );
-        mask->Create( frameInfo.iOverallSizeInPixels, frameInfo.iFrameDisplayMode );
-
-        mask->SetDisplayMode( EGray2 );
-
-        img->Convert( &rs, *bitmap, *mask );
-        User::WaitForRequest( rs );
-
-        User::LeaveIfError( rs.Int() );
-
-        CleanupStack::PopAndDestroy( mask );
-        CleanupStack::Pop( bitmap );
-        }
-
-    CleanupStack::PopAndDestroy( img );
-
-    return bitmap;
-    }
-
-void CUISettingsSrvServer::ImageHandlingCompleteL( TInt aError )
-    {
-    if( iASWait.IsStarted() )
-    {
-        iASWait.AsyncStop();
-    }
-    iImageHandlingError = aError;
-	RDEBUG( "CUISettingsSrvServer::ImageHandlingCompleteL" );
-    }
-
-// ----------------------------------------------------------------------------------------
-// CUISettingsSrvSession
-// ----------------------------------------------------------------------------------------
-
-
-// constructor
-CUISettingsSrvSession::CUISettingsSrvSession(CUISettingsSrvServer * aServer)
-	: iServer( aServer )
-	, iListChanged( 0 )
-	{
-	RDEBUG( "CUISettingsSrvSession::CUISettingsSrvSession" );
-
-	}
-
-void CUISettingsSrvSession::ConstructL()
-	{
-	iServer->AddSession();
-	iServer->AddListChangeNotifierL( &iListChanged );
-	}
-
-CUISettingsSrvSession::~CUISettingsSrvSession()
-	{
-	RDEBUG( "CUISettingsSrvSession::~CUISettingsSrvSession" );
-
-	if( iServer != NULL )
-		{
-		TInt err = KErrNone;
-		TRAP( err, iServer->RemoveListChangeNotifierL( &iListChanged ) );
-		iServer->RemoveSession();
-		}
-	}
-
-CUISettingsSrvSession* CUISettingsSrvSession::NewL(CUISettingsSrvServer* aServer)
-	{
-	RDEBUG( "CUISettingsSrvSession::NewL" );
-
-	CUISettingsSrvSession* self =  new (ELeave) CUISettingsSrvSession( aServer );
-    CleanupStack::PushL( self );
-    self->ConstructL( );
-    CleanupStack::Pop();
-
-    return self;	
-	}
-
-
-void CUISettingsSrvSession::ServiceL(const RMessage2& aMessage)
-	{
-	RDEBUG( "CUISettingsSrvSession::ServiceL" );
-
-	TBool complete = ETrue;
-	TRAPD(err,complete = DispatchMessageL(aMessage));
-	if( complete )
-	    {
-	    aMessage.Complete(err);
-	    }
-	}
-
-
-
-// service a client request; test the opcode and then do appropriate servicing
-TBool CUISettingsSrvSession::DispatchMessageL(const RMessage2& aMessage)
-	{
-	RDEBUG( "CUISettingsSrvSession::DispatchMessageL" );
-
-	switch (aMessage.Function())
-        {
-    case EUISettingsSrvSetStartupImage:
-        SetStartupImageL( aMessage );
-        return ETrue;
-    case EUISettingsSrvGetStartupImagePath:
-        GetStartupImagePathL( aMessage );
-        return ETrue;
-    case EUISettingsSrvSetStartupText:
-        SetStartupTextL( aMessage );
-        return ETrue;
-	case EUISettingsSrvGetStartupText:
-        GetStartupTextL( aMessage );
-        return ETrue;
-	case EUISettingsSrvGetStartupTextSize:
-        GetStartupTextSizeL( aMessage );
-        return ETrue;
-	case EUISettingsSrvSetStartupNoteType:
-        SetStartupNoteTypeL( aMessage );
-        return ETrue;
-	case EUISettingsSrvGetStartupNoteType:
-        GetStartupNoteTypeL( aMessage );
-        return ETrue;
-    case EUISettingsSrvUpdateShortcutList:
-        GetShortcutTargetListL( );
-        return ETrue;
-	case EUISettingsSrvGetShortcutCount:
-	    GetShortcutTargetCountL( aMessage );
-        return ETrue;
-    case EUISettingsSrvGetShortcutType:
-	    GetShortcutTargetTypeL( aMessage );
-        return ETrue;    
-	case EUISettingsSrvGetShortcutTargetCaption:
-	    GetShortcutTargetCaptionL( aMessage );
-        return ETrue;
-    case EUISettingsSrvSetShortcutTargetCaption:
-        SetShortcutTargetCaptionL( aMessage );
-        return ETrue;
-    case EUISettingsSrvGetShortcutAppUid:
-	    GetShortcutTargetAppUidL( aMessage );
-        return ETrue;
-    case EUISettingsSrvGetShortcutIndexFromAT:
-	    GetShortcutTargetIndexFromATL( aMessage );
-        return ETrue;
-    case EUISettingsSrvGetShortcutIndex:
-	    GetShortcutTargetIndexL( aMessage );
-        return ETrue;
-    case EUISettingsSrvSetShortcutTargetAppIndex:
-	    SetShortcutTargetAppIndexL( aMessage );
-        return ETrue;
-    case EUISettingsSrvGetShortcutRtType:
-        GetShortcutRtTypeL( aMessage );
-        return ETrue;
-    case EUISettingsSrvSetShortcutTargetBitmap:    
-        SetShortcutTargetBitmapL( aMessage );
-        return ETrue;
-    case EUISettingsSrvSetShortcutTargetMask:
-        SetShortcutTargetBitmapL( aMessage, ETrue );
-        return ETrue;
-    case EUISettingsSrvGetShortcutTargetBitmap:    
-        GetShortcutTargetBitmapL( aMessage );
-        return ETrue;
-    case EUISettingsSrvGetShortcutTargetMask:
-        GetShortcutTargetBitmapL( aMessage, ETrue );
-        return ETrue;
-    case EUISettingsSrvGetSoftkeyBitmap:
-        GetSoftkeyBitmapL( aMessage );
-        return ETrue;
-    case EUISettingsSrvGetSoftkeyMask:
-        GetSoftkeyBitmapL( aMessage, ETrue );
-        return ETrue;
-    case EUISettingsSrvSetSoftkeyBitmap:
-        SetSoftkeyBitmapL( aMessage );
-        return ETrue;
-    case EUISettingsSrvSetSoftkeyMask:
-        SetSoftkeyBitmapL( aMessage, ETrue );
-        return ETrue;
-
-	// requests we don't understand at all are a different thing,
-	// so panic the client here, this function also completes the message
-	default:
-		PanicClient(aMessage, EBadRequest);
-		return ETrue;
-        }
-	}
-
-void CUISettingsSrvSession::SetStartupImageL(const RMessage2 &aMessage)
-    {
-	RDEBUG( "CUISettingsSrvSession::SetStartupImageL" );
-    ((CUISettingsSrvServer*)Server())->SetStartupImageL( aMessage );
-    }
-
-void CUISettingsSrvSession::GetStartupImagePathL(const RMessage2 &aMessage)
-    {
-	RDEBUG( "CUISettingsSrvSession::GetStartupImagePathL" );
-    ((CUISettingsSrvServer*)Server())->GetStartupImagePathL( aMessage );
-    }
-
-void CUISettingsSrvSession::SetStartupTextL(const RMessage2 &aMessage)
-    {
-	RDEBUG( "CUISettingsSrvSession::SetStartupTextL" );
-    ((CUISettingsSrvServer*)Server())->SetStartupTextL( aMessage );
-    }
-
-void CUISettingsSrvSession::GetStartupTextL(const RMessage2 &aMessage)
-    {
-	RDEBUG( "CUISettingsSrvSession::GetStartupTextL" );
-    ((CUISettingsSrvServer*)Server())->GetStartupTextL( aMessage );
-    }
-
-void CUISettingsSrvSession::GetStartupTextSizeL(const RMessage2 &aMessage)
-    {
-	RDEBUG( "CUISettingsSrvSession::GetStartupTextSizeL" );
-    ((CUISettingsSrvServer*)Server())->GetStartupTextSizeL( aMessage );
-    }
-
-void CUISettingsSrvSession::SetStartupNoteTypeL(const RMessage2 &aMessage)
-    {
-	RDEBUG( "CUISettingsSrvSession::SetStartupNoteTypeL" );
-    ((CUISettingsSrvServer*)Server())->SetStartupNoteTypeL( aMessage );
-    }
-
-void CUISettingsSrvSession::GetStartupNoteTypeL(const RMessage2 &aMessage)
-    {
-	RDEBUG( "CUISettingsSrvSession::GetStartupNoteTypeL" );
-    ((CUISettingsSrvServer*)Server())->GetStartupNoteTypeL( aMessage );
-    }
-
-void CUISettingsSrvSession::GetShortcutTargetListL( )
-    {
-	RDEBUG( "CUISettingsSrvSession::GetShortcutTargetListL" );
-    ((CUISettingsSrvServer*)Server())->GetShortcutTargetListL( );
-
-    // If short list had changed, server has notified it by settings flag
-    // Clear flag of this session, other currently connected clients will still get notified
-    // NOTE: There is no way to notify future clients about changes, there will be errors ...
-    // 
-    iListChanged = 0;
-    }
-
-void CUISettingsSrvSession::GetShortcutTargetCountL( const RMessage2 &aMessage )
-    {
-	RDEBUG( "CUISettingsSrvSession::GetShortcutTargetCountL" );
-
-    AppListCheckL();   
-    ((CUISettingsSrvServer*)Server())->GetShortcutTargetCountL( aMessage );
-    }
-
-void CUISettingsSrvSession::GetShortcutTargetTypeL( const RMessage2 &aMessage )
-    {
-	RDEBUG( "CUISettingsSrvSession::GetShortcutTargetTypeL" );
-
-    AppListCheckL();
-    ((CUISettingsSrvServer*)Server())->GetShortcutTargetTypeL( aMessage );
-    }
-
-void CUISettingsSrvSession::GetShortcutTargetCaptionL( const RMessage2 &aMessage )
-    {
-	RDEBUG( "CUISettingsSrvSession::GetShortcutTargetCaptionL" );
-
-    AppListCheckL();
-    ((CUISettingsSrvServer*)Server())->GetShortcutTargetCaptionL( aMessage );
-    }
-
-void CUISettingsSrvSession::GetShortcutTargetAppUidL( const RMessage2 &aMessage )
-    {
-	RDEBUG( "CUISettingsSrvSession::GetShortcutTargetAppUidL" );
-
-    AppListCheckL();
-    ((CUISettingsSrvServer*)Server())->GetShortcutTargetAppUidL( aMessage  );
-    }
-
-void CUISettingsSrvSession::GetShortcutTargetIndexL( const RMessage2 &aMessage )
-    {
-	RDEBUG( "CUISettingsSrvSession::GetShortcutTargetIndexL" );
-
-    AppListCheckL();
-    ((CUISettingsSrvServer*)Server())->GetShortcutTargetIndexL( aMessage );
-    }
-
-void CUISettingsSrvSession::GetShortcutTargetIndexFromATL( const RMessage2 &aMessage )
-    {
-	RDEBUG( "CUISettingsSrvSession::GetShortcutTargetIndexFromATL" );
-
-    AppListCheckL();
-    ((CUISettingsSrvServer*)Server())->GetShortcutTargetIndexFromATL( aMessage );
-    }
-
-void CUISettingsSrvSession::SetShortcutTargetAppIndexL(const RMessage2 &aMessage)
-    {
-	RDEBUG( "CUISettingsSrvSession::SetShortcutTargetAppIndexL" );
-
-    AppListCheckL();
-    ((CUISettingsSrvServer*)Server())->SetShortcutTargetAppIndexL( aMessage );    
-    }
-
-void CUISettingsSrvSession::GetShortcutRtTypeL(const RMessage2 &aMessage)
-    {
-	RDEBUG( "CUISettingsSrvSession::GetShortcutRtTypeL" );
-
-    AppListCheckL();
-    ((CUISettingsSrvServer*)Server())->GetShortcutRtTypeL( aMessage );    
-    }
-
-void CUISettingsSrvSession::SetShortcutTargetCaptionL(const RMessage2 &aMessage)
-    {
-	RDEBUG( "CUISettingsSrvSession::SetShortcutTargetCaptionL" );
-
-    AppListCheckL();
-    ((CUISettingsSrvServer*)Server())->SetShortcutTargetCaptionL( aMessage );
-    }
-
-void CUISettingsSrvSession::SetShortcutTargetBitmapL(const RMessage2 &aMessage, TBool aIsMask/*=EFalse*/)
-    {
-	RDEBUG( "CUISettingsSrvSession::SetShortcutTargetBitmapL" );
-
-    AppListCheckL();
-    ((CUISettingsSrvServer*)Server())->SetShortcutTargetBitmapL( aMessage, aIsMask );
-    }
-
-void CUISettingsSrvSession::GetShortcutTargetBitmapL(const RMessage2 &aMessage, TBool aIsMask/*=EFalse*/)
-    {
-	RDEBUG( "CUISettingsSrvSession::GetShortcutTargetBitmapL" );
-
-    AppListCheckL();
-    ((CUISettingsSrvServer*)Server())->GetShortcutTargetBitmapL( aMessage, aIsMask );
-    }
-
-void CUISettingsSrvSession::SetSoftkeyBitmapL(const RMessage2 &aMessage, TBool aIsMask/*=EFalse*/)
-    {
-	RDEBUG( "CUISettingsSrvSession::SetSoftkeyBitmapL" );
-
-    AppListCheckL();
-    ((CUISettingsSrvServer*)Server())->SetSoftkeyBitmapL( aMessage, aIsMask );
-    }
-
-void CUISettingsSrvSession::GetSoftkeyBitmapL(const RMessage2 &aMessage, TBool aIsMask/*=EFalse*/)
-    {
-	RDEBUG( "CUISettingsSrvSession::GetSoftkeyBitmapL" );
-
-    AppListCheckL();
-    ((CUISettingsSrvServer*)Server())->GetSoftkeyBitmapL( aMessage, aIsMask );
-    }
-
-void CUISettingsSrvSession::AppListCheckL()
-    {
-	RDEBUG( "CUISettingsSrvSession::AppListCheckL" );
-
-    if( iListChanged == 1 )
-        {
-        // Shortcut list has changed during the session
-        // This session is therefore invalid and all following commands will fail
-    	RDEBUG( "CUISettingsSrvSession::AppListCheckL Invalidate session!" );
-        User::Leave( KErrCorrupt );
-        }
-    }
-
-HBufC8* CUISettingsSrvSession::CopyParameter8L( const RMessage2 &aMsg, TInt aIndex )
-    {
-	RDEBUG( "CUISettingsSrvSession::CopyParameter8L" );
-
-    TInt length = aMsg.GetDesLengthL( aIndex );
-    
-    HBufC8* buffer = HBufC8::NewL( length );
-    RDEBUG_2( "CUISettingsSrvSession::CopyParameter8L HBufC8::NewL ALLOC %x", buffer );
-
-    TPtr8 ptr( buffer->Des() );
-    aMsg.ReadL( aIndex, ptr );
-
-    return buffer;
-    }
-
-HBufC16* CUISettingsSrvSession::CopyParameter16L( const RMessage2 &aMsg, TInt aIndex )
-    {
-	RDEBUG( "CUISettingsSrvSession::CopyParameter16L" );
-
-    TInt length = aMsg.GetDesLengthL( aIndex );
-
-    HBufC16* buffer = HBufC16::NewL( length );
-    RDEBUG_2("CUISettingsSrvSession::CopyParameter16L HBufC16::NewL ALLOC %x", buffer );
-
-    TPtr16 ptr( buffer->Des() );
-    aMsg.ReadL( aIndex, ptr );
-
-    return buffer;
-    }
-
-// RMessagePtr2::Panic() also completes the message. This is:
-// (a) important for efficient cleanup within the kernel
-// (b) a problem if the message is completed a second time
-void CUISettingsSrvSession::PanicClient(const RMessagePtr2& aMessage,TInt aPanic)
-	{
-	_LIT(KTxtServer,"CountServ server");
-	aMessage.Panic(KTxtServer,aPanic);
-	}
-
-
-// ========================== OTHER EXPORTED FUNCTIONS =========================
-
-// ----------------------------------------------------------------------------------------
-// Global functions
-// ----------------------------------------------------------------------------------------
-
-
-
-// Panic the server
-GLDEF_C void PanicServer(TUISettingsSrvPanic aPanic)
-	{
-	_LIT(KTxtServerPanic,"UISettingsSrv server panic");
-	User::Panic(KTxtServerPanic,aPanic);
-	}
-
-
-//  End of File  
--- a/customization/UISettingsSrv/server/Src/UISettingsSrvSession.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,151 +0,0 @@
-/*
-* Copyright (c) 2002-2004 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: Implementation of customization components
-*
-*/
-
-
-
-// INCLUDE FILES
-#include    "?include_file"
-#include    <?include_file>
-
-// EXTERNAL DATA STRUCTURES
-//extern  ?external_data;
-
-// EXTERNAL FUNCTION PROTOTYPES  
-//extern ?external_function( ?arg_type,?arg_type );
-
-// CONSTANTS
-//const ?type ?constant_var = ?constant;
-
-// MACROS
-//#define ?macro ?macro_def
-
-// LOCAL CONSTANTS AND MACROS
-//const ?type ?constant_var = ?constant;
-//#define ?macro_name ?macro_def
-
-// MODULE DATA STRUCTURES
-//enum ?declaration
-//typedef ?declaration
-
-// LOCAL FUNCTION PROTOTYPES
-//?type ?function_name( ?arg_type, ?arg_type );
-
-// FORWARD DECLARATIONS
-//class ?FORWARD_CLASSNAME;
-
-// ============================= LOCAL FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// ?function_name ?description.
-// ?description
-// Returns: ?value_1: ?description
-//          ?value_n: ?description_line1
-//                    ?description_line2
-// -----------------------------------------------------------------------------
-//
-?type ?function_name(
-    ?arg_type arg,  // ?description
-    ?arg_type arg)  // ?description
-    {
-
-    ?code  // ?comment
-
-    // ?comment
-    ?code
-    }
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// ?classname::?classname
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-?classname::?classname()
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// ?classname::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void ?classname::ConstructL()
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// ?classname::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-?classname* ?classname::NewL()
-    {
-    ?classname* self = new( ELeave ) ?classname;
-    
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop();
-
-    return self;
-    }
-
-    
-// Destructor
-?classname::~?classname()
-    {
-    
-    }
-
-
-// -----------------------------------------------------------------------------
-// ?classname::?member_function
-// ?implementation_description
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-?type ?classname::?member_function(
-    ?arg_type arg,
-    ?arg_type arg )
-    {
-    
-    ?code
-    
-    }
-
-// ========================== OTHER EXPORTED FUNCTIONS =========================
-
-// -----------------------------------------------------------------------------
-// ?function_name implements...
-// ?implementation_description.
-// Returns: ?value_1: ?description
-//          ?value_n: ?description
-//                    ?description
-// -----------------------------------------------------------------------------
-//
-?type  ?function_name(
-    ?arg_type arg,  // ?description
-    ?arg_type arg )  // ?description
-    {
-
-    ?code
-
-    }
-
-//  End of File  
--- a/customization/UISettingsSrv/server/Src/UISettingsSrvUi.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,222 +0,0 @@
-/*
-* Copyright (c) 2002-2004 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: 
-*        General Settings User Interface
-*
-*/
-
-
-// INCLUDE FILES
-//sf-#include    <bldvariant.hrh>
-#include    <eikapp.h>
-#include    <avkon.hrh>
-#include    <akncontext.h>
-#include    <aknnavi.h>
-#include    <aknnavide.h>
-#include    <akntabgrp.h>
-#include    <akntitle.h>
-#include    <aknnotedialog.h>
-#include    <AknWaitDialog.h>
-#include    <aknslider.h>
-#include    <AknQueryDialog.h>
-#include    <aknsettingpage.h>
-#include    <aknradiobuttonsettingpage.h>
-#include    <aknslidersettingpage.h>
-#include    <akntextsettingpage.h>
-#include    <AknDateFormatUtils.h>
-#include    <AknUtils.h>
-#include    <AknsConstants.h>    //for determining skin change
-#include    <barsread.h>
-#include    <hal.h>
-#include    <featmgr.h>
-
-
-    #include    <e32property.h>
-    #include    <PSVariables.h>
-
-
-#include    <aknnotewrappers.h>    // for reboot
-#include    <PtiEngine.h>
-
-#include    <AknFep.rsg>  
-#include    <avkon.rsg>
-#include    <e32std.h>             // The USER class
-#include    <AknFepGlobalEnums.h>  // EPinyin
-
-#include	<apgwgnam.h>
-
-#include    "UISettingsSrvUi.h"
-#include    "UISettingsSrvAppView.h"
-#include    "UISettingsSrvDocument.h"
-
-#include    <UISettingsSrv.rsg>
-#include    "UISettingsSrv.hrh"
-
-#include    "UISettingsSrv.h"
-
-//CONSTANTS
-// _LIT( KGSAppUiClassName, "CUISettingsSrvUi" );
-
-
-
-// ================= MEMBER FUNCTIONS =======================
-
-
-// ----------------------------------------------------
-// CUISettingsSrvUi::CUISettingsSrvUi()
-// 
-// Default constructor.
-// ----------------------------------------------------
-CUISettingsSrvUi::CUISettingsSrvUi()
-//sf-	: 
-    {
-    }
-
-// ----------------------------------------------------
-// CUISettingsSrvUi::ConstructL()
-// 
-// Symbian OS two-phased constructor
-// ----------------------------------------------------
-void CUISettingsSrvUi::ConstructL()
-    {
-    FeatureManager::InitializeLibL();
-
-    BaseConstructL( 0 ); //sf- EAknEnableSkin );
-
-/*
-*/
-    iAppView = CUISettingsSrvAppView::NewL(ClientRect());
-    AddToStackL(iAppView);
-/*
-*/
-
-	// Hide application from task list
-	RWsSession& ws = iEikonEnv->WsSession();
-    RWindowGroup& rootWin = iEikonEnv->RootWin();
-    TInt wgId = rootWin.Identifier();
-
-	CApaWindowGroupName *windowGroupName =
-		CApaWindowGroupName::NewL(ws, wgId);
-
-	windowGroupName->SetHidden( ETrue );
-	windowGroupName->SetWindowGroupName( rootWin );
-
-	delete windowGroupName;
-    }
-
-// ----------------------------------------------------
-// CUISettingsSrvUi::~CUISettingsSrvUi()
-// destructor
-// frees reserved resources
-// ----------------------------------------------------
-CUISettingsSrvUi::~CUISettingsSrvUi()
-    {
-//sf-    delete iDecoratedTabGroup;
-//sf-    delete iDatimTitleText;
-//sf-    delete iWaitDialog;
-
-    FeatureManager::UnInitializeLib();
-
-    if (iAppView)
-        {
-        iEikonEnv->RemoveFromStack(iAppView);
-        delete iAppView;
-        iAppView = NULL;
-        }
-
-    //
-//sf-    delete iShortcutUi;
-
-    //Embedding - removing created document
-/*sf--
-    if ( iEmbedded )
-	    {
-	    iEikonEnv->Process()->DestroyDocument( iEmbedded );
-	    iEmbedded = NULL;
-	    }
---fs*/
-    }
-
-// ------------------------------------------------------------------------------
-// CUISettingsSrvUi::DynInitMenuPaneL(TInt aResourceId,CEikMenuPane* aMenuPane)
-//  This function is called by the EIKON framework just before it displays
-//  a menu pane. Its default implementation is empty, and by overriding it,
-//  the application can set the state of menu items dynamically according
-//  to the state of application data.
-// ------------------------------------------------------------------------------
-//
-void CUISettingsSrvUi::DynInitMenuPaneL(
-    TInt /*aResourceId*/,CEikMenuPane* /*aMenuPane*/)
-    {
-    }
-
-// ----------------------------------------------------
-// CUISettingsSrvUi::HandleCommandL(TInt aCommand)
-// 
-// Handles commands directed to this class.
-// ----------------------------------------------------
-void CUISettingsSrvUi::HandleCommandL(TInt aCommand)
-    {
-    switch (aCommand)
-        {
-        case EEikCmdExit:   //both exit commands should do the same thing
-            iEikonEnv->InfoMsg(_L("ex1"));
-        case EAknCmdExit:
-            iEikonEnv->InfoMsg(_L("exit2"));
-            Exit();
-            break;
-        /*
-        case EUISSCmdTest:
-            iEikonEnv->InfoMsg(_L("...test..."));
-            break;
-        case EUISSCmdTest2:           
-            _LIT(message,"Halloo");
-            CAknInformationNote* informationNote = new (ELeave) CAknInformationNote;
-            informationNote->ExecuteLD(message);
-            break;
-        */
-        case EUISSCmdStartSrv:
-        	CUISettingsSrvServer::NewL();
-            break;
-        default:
-            CAknAppUi::HandleCommandL(aCommand);
-//sf-            CAknViewAppUi::HandleCommandL(aCommand);
-            break;
-        }
-    }
-
-
-
-// ----------------------------------------------------
-// CUISettingsSrvUi::HandleKeyEventL()
-// 
-// Called when a key is pressed and no other class has catched the event.
-// Handles only key events that are meant to control the tab group. 
-// ----------------------------------------------------
-TKeyResponse CUISettingsSrvUi::HandleKeyEventL(const TKeyEvent& /*aKeyEvent*/,TEventCode /*aType*/)
-    {
-    return EKeyWasNotConsumed;
-/*sf--
-    // Check if the event should be handled
-    if (aType != EEventKey ||  iNaviContainer->Top() != iDecoratedTabGroup)
-        {
-        return EKeyWasNotConsumed;
-        }
-    return iTabGroup->OfferKeyEventL( aKeyEvent, aType );
---fs*/
-    }
-
-
-
-//End of File
--- a/customization/UISettingsSrv/server/aif/UISettingsSrv_aif.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-/*
-* Copyright (c)  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: 
-*     RSS for creating the aif file for UISettingsSrv.
-*
-*/
-
-
-#include <aiftool.rh>
-
-RESOURCE AIF_DATA
-    {
-    app_uid=0x10207839;
-    num_icons=2;
-    embeddability=KAppNotEmbeddable;
-    newfile=KAppDoesNotSupportNewFile;
-    }
-
-// End of File
--- a/customization/UISettingsSrv/server/aif/UISettingsSrv_reg.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-/*
-* Copyright (c) 2004 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: Implementation of customization components
-*
-*/
-
-
-#include <appinfo.rh>
-#include <UISettingsSrv.rsg>
-#include <data_caging_paths_strings.hrh>
-
-UID2 KUidAppRegistrationResourceFile
-UID3 0x10207839 // Define your application UID here
-
-RESOURCE APP_REGISTRATION_INFO
-    {
-    app_file = "UISettingsSrv";
-	hidden = KAppIsHidden;
-//sf-	embeddability = KAppEmbeddableUiNotStandAlone;
-
-    
-    localisable_resource_file = "\\resource\\apps\\UISettingsSrv";
- 
-    localisable_resource_id = R_UISS_LOCALISABLE_APP_INFO;
-  //  service_list = { 0 };
-    }
-
-// End of File
Binary file customization/UISettingsSrv/server/aif/context_pane_icon.bmp has changed
Binary file customization/UISettingsSrv/server/aif/context_pane_icon_mask.bmp has changed
Binary file customization/UISettingsSrv/server/aif/list_icon.bmp has changed
Binary file customization/UISettingsSrv/server/aif/list_icon_mask.bmp has changed
--- a/customization/UISettingsSrv/server/group/UISettingsSrv.mmp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,82 +0,0 @@
-/*
-* Copyright (c) 2002 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 is project specification file for UI Settings Server. 
-*
-*/
-
-
-// To get the APP_LAYER_SYSTEMINCLUDE-definition
-#include <platform_paths.hrh>
-#include <data_caging_paths.hrh>
-
-CAPABILITY     CAP_APPLICATION NetworkControl
-VENDORID       VID_DEFAULT
-TARGET			   uisettingssrv.exe
-TARGETTYPE     exe
-UID            0x0 0x10207839
-EPOCSTACKSIZE  0x5000 
-
-
-SOURCEPATH     ../Src
-
-SOURCE         UISettingsSrvApp.cpp
-SOURCE         UISettingsSrvUi.cpp
-SOURCE         UISettingsSrvDocument.cpp
-SOURCE         UISettingsSrvAppView.cpp
-SOURCE         UISettingsSrvServer.cpp
-
-START RESOURCE ../Data/UISettingsSrv.rss
-HEADER
-TARGETPATH APP_RESOURCE_DIR
-LANGUAGE_IDS
-END  // RESOURCE
-
-START RESOURCE ../aif/UISettingsSrv_reg.rss
-DEPENDS uisettingssrv.rsg
-TARGETPATH /private/10003a3f/apps
-END
-
-
-#ifdef __PROTOCOL_CDMA
-#include "UISettingsSrvCdma.mmp"
-#endif //__PROTOCOL_CDMA
-
-// User include paths
-USERINCLUDE     .
-USERINCLUDE     ../Inc
-USERINCLUDE     ../../inc
-USERINCLUDE     ../../../include
-
-APP_LAYER_SYSTEMINCLUDE
-
-// Libraries required by framework
-LIBRARY         apparc.lib 
-LIBRARY         avkon.lib 
-LIBRARY         cone.lib 
-LIBRARY         eikcore.lib 
-LIBRARY         euser.lib 
-LIBRARY         ws32.lib
-LIBRARY         apgrfx.lib                 // for RApaLsSession
-LIBRARY         efsrv.lib
-LIBRARY         featmgr.lib                // feature manager 
-LIBRARY         centralrepository.lib
-// LIBRARY         ScShortcutEngine.lib
-LIBRARY         backgroundimage.lib
-LIBRARY         imageconversion.lib
-LIBRARY         fbscli.lib
-LIBRARY         flogger.lib
-
-
-SMPSAFE
--- a/customization/UISettingsSrv/server/group/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-/*
-* Copyright (c) 2003 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 file provides the information required for building the
-*                whole of a UISettingsSrv.
-*
-*/
-
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-PRJ_EXTENSIONS
-START EXTENSION s60/mifconv
-  OPTION TARGETFILE UISettingsSrv_aif.mif
-  OPTION SOURCES -c8,8 qgn_menu_note
-END
-
-PRJ_MMPFILES
-
-/*
- #ifdef __SCALABLE_ICONS
-//   gnumakefile icons_aif_scalable_dc.mk
- #else
-   gnumakefile icons_aif_bitmaps_dc.mk
- #endif
-*/ 
-
-UISettingsSrv.mmp
-
-PRJ_TESTMMPFILES
-
-
-//  End of File  
--- a/customization/UISettingsSrv/server/group/icons_aif_bitmaps_dc.MK	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-#
-# Copyright (c) 2004 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: Implementation of customization components
-#
-
-ifeq (WINS,$(findstring WINS, $(PLATFORM)))
-ZDIR=\epoc32\release\$(PLATFORM)\$(CFG)\Z
-else
-ZDIR=\epoc32\data\z
-endif
-
-# ----------------------------------------------------------------------------
-TARGETDIR=$(ZDIR)\RESOURCE\APPS
-ICONTARGETFILENAME=$(TARGETDIR)\UISettingsSrv_aif.mbm
-
-do_nothing :
-	@rem do_nothing
-
-MAKMAKE : do_nothing
-
-BLD : do_nothing
-
-CLEAN : do_nothing
-
-LIB : do_nothing
-
-CLEANLIB : do_nothing
-
-# ----------------------------------------------------------------------------
-RESOURCE :
-	mifconv $(ICONTARGETFILENAME) \
-		/c8,8 qgn_menu_note_lst.bmp 
-	mifconv $(ICONTARGETFILENAME) \
-		/c8,8 qgn_menu_note_cxt.bmp
-
-FREEZE : do_nothing
-
-SAVESPACE : do_nothing
-
-RELEASABLES :
-	@echo $(ICONTARGETFILENAME)
-
-FINAL : do_nothing
-
--- a/customization/UISettingsSrv/server/group/icons_aif_scalable_dc.MK	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-#
-# Copyright (c) 2004 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: Implementation of customization components
-#
-
-ifeq (WINS,$(findstring WINS, $(PLATFORM)))
-ZDIR=\epoc32\release\$(PLATFORM)\$(CFG)\Z
-else
-ZDIR=\epoc32\data\z
-endif
-
-# ----------------------------------------------------------------------------
-TARGETDIR=$(ZDIR)\RESOURCE\APPS
-ICONTARGETFILENAME=$(TARGETDIR)\UISettingsSrv_aif.mif
-
-do_nothing :
-	@rem do_nothing
-
-MAKMAKE : do_nothing
-
-BLD : do_nothing
-
-CLEAN : do_nothing
-
-LIB : do_nothing
-
-CLEANLIB : do_nothing
-
-# ----------------------------------------------------------------------------
-RESOURCE :
-	mifconv $(ICONTARGETFILENAME) \
-		/c8,8 qgn_menu_note.svg
-
-FREEZE : do_nothing
-
-SAVESPACE : do_nothing
-
-RELEASABLES :
-	@echo $(ICONTARGETFILENAME)
-
-FINAL : do_nothing
-
--- a/customization/WallpaperAdapter/bld/WallpaperAdapter.mmp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,76 +0,0 @@
-/*
-* Copyright (c) 2002 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: Implementation of customization components
-*
-*/
-
-
-// To get the APP_LAYER_SYSTEMINCLUDE-definition
-#include <platform_paths.hrh>
-#include "defaultcaps.hrh"
-
-CAPABILITY      CAP_GENERAL_DLL
-TARGET          wallpaperadapter.dll
-TARGETTYPE      PLUGIN
-UID             0x10009D8D 0x1020782F
-VENDORID        VID_DEFAULT
-
-APP_LAYER_SYSTEMINCLUDE
-SYSTEMINCLUDE   /epoc32/include/swi
-SYSTEMINCLUDE 	/epoc32/include/ecom
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-SYSTEMINCLUDE 	/epoc32/include/devman
-#else
-// nothing
-#endif
-
-SOURCEPATH      ../src
-USERINCLUDE     ../inc
-USERINCLUDE     ../../include
-USERINCLUDE     ../../DMUtils/inc
-
-
-SOURCE          WallpaperAdapter.cpp
-
-START RESOURCE  WallpaperAdapter.rss
-TARGET          wallpaperadapter.rsc
-LANGUAGE_IDS
-END
-
-
-
-LIBRARY		      euser.lib
-LIBRARY		      efsrv.lib
-LIBRARY		      ecom.lib
-LIBRARY		      imut.lib
-
-//#ifdef __SAP_POLICY_MANAGEMENT
-LIBRARY		      policyengine.lib
-LIBRARY		      dmutil.lib
-//#endif
-
-LIBRARY		      aknswallpaperutils.lib // for set as background
-LIBRARY 	      flogger.lib
-
-LIBRARY                 featmgr.lib
-STATICLIBRARY	  dmutils.lib
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-LIBRARY		      devmancmdmgr.lib
-#else
-// nothing
-#endif
-
-SMPSAFE
--- a/customization/WallpaperAdapter/bld/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-/*
-* Copyright (c) 2002 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:  build info file for email settings adapter
-*
-*/
-
-#include <platform_paths.hrh>
-
-PRJ_EXPORTS
-../rom/WallpaperAdapter.iby				CORE_APP_LAYER_IBY_EXPORT_PATH(wallpaperadapter.iby)
-
-PRJ_MMPFILES 
-./WallpaperAdapter.mmp
-
-PRJ_TESTEXPORTS
-/*../test/WallpaperTestScript.cfg	/epoc32/winscw/c/TestFramework/WallpaperTestScript.cfg
-../test/logo.jpg	/epoc32/winscw/c/TestFramework/testdata/logo.jpg
-../test/logo.mbm	/epoc32/winscw/c/TestFramework/testdata/logo.mbm
-../test/error.jpg	/epoc32/winscw/c/TestFramework/testdata/error.jpg*/
--- a/customization/WallpaperAdapter/inc/WallpaperAdapter.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,124 +0,0 @@
-/*
-* Copyright (c) 2002 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:  DM Wallpaper Adapter
-*
-*/
-
-
-
-#ifndef __WallpaperAdapter_H__
-#define __WallpaperAdapter_H__
-
-// ------------------------------------------------------------------------------------------------
-// Includes
-// ------------------------------------------------------------------------------------------------
-#include <e32base.h>
-#include <smldmadapter.h>
-#include "TARMDmAdapter.h"
-
-
-const TUint KSmlDMWallpaperAdapterImplUid = 0x10207830;
-
-// the DDF version must be changed if any changes in DDF structure ( built in DDFStructureL() function )
-_LIT8( KSmlWPDDFVersion, "1.0" ); 
-_LIT8( KSmlWPTextPlain, "text/plain" );
-_LIT( KSmlWPDescription, "The interior object holds all wallpaper objects" );
-
-_LIT8( KSmlCustomizationN, "Customization" );
-_LIT8( KSmlCustomizationD, "Customization node" );
-_LIT8( KSmlWPWallpaperN, "Wallpaper" );
-_LIT8( KSmlWPWallpaperD, "Wallpaper node" );
-_LIT8( KSmlWPDataN, "Data" );
-_LIT8( KSmlWPImageD, "Image node" );
-
-_LIT8( KWPSeparator, "/" );
-
-// ------------------------------------------------------------------------------------------------
-// CWallpaperAdapter 
-// ------------------------------------------------------------------------------------------------
-class CWallpaperAdapter : public CTARMDmAdapter
-	{
-public:
-	static CWallpaperAdapter* NewL(MSmlDmCallback* aDmCallback );
-	static CWallpaperAdapter* NewLC(MSmlDmCallback* aDmCallback );
-
-	virtual ~CWallpaperAdapter();
-
-	// Implementation of MSmlDmAdapter interface
-	// =========================================
-	void DDFVersionL( CBufBase& aVersion );
-	void DDFStructureL( MSmlDmDDFObject& aDDF );
-	
-	void _UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, const TDesC8& aObject, const TDesC8& aType, TInt aStatusRef );
-	void _UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, RWriteStream*& aStream, const TDesC8& aType, TInt aStatusRef );
-	void _DeleteObjectL( const TDesC8& aURI, const TDesC8& aLUID, TInt aStatusRef );
-	void _FetchLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, const TDesC8& aType, TInt aResultsRef, TInt aStatusRef );
-	void _FetchLeafObjectSizeL( const TDesC8& aURI, const TDesC8& aLUID, const TDesC8& aType, TInt aResultsRef, TInt aStatusRef );
-	void _ChildURIListL( const TDesC8& aURI, const TDesC8& aLUID, const CArrayFix<TSmlDmMappingInfo>& aPreviousURISegmentList, TInt aResultsRef, TInt aStatusRef );
-
-	void _AddNodeObjectL( const TDesC8& aURI, const TDesC8& aParentLUID, TInt aStatusRef );
-	void _ExecuteCommandL( const TDesC8& aURI, const TDesC8& aLUID, const TDesC8& aArgument, const TDesC8& aType, TInt aStatusRef );
-	void _ExecuteCommandL( const TDesC8& aURI, const TDesC8& aLUID, RWriteStream*& aStream, const TDesC8& aType, TInt aStatusRef );
-	void _CopyCommandL( const TDesC8& aTargetURI, const TDesC8& aTargetLUID, const TDesC8& aSourceURI, const TDesC8& aSourceLUID, const TDesC8& aType, TInt aStatusRef );
-
-	void StartAtomicL();
-	void CommitAtomicL();
-	void RollbackAtomicL();
-	TBool StreamingSupport( TInt& aItemSize );
-#ifdef __TARM_SYMBIAN_CONVERGENCY	
-		virtual void StreamCommittedL( RWriteStream& aStream );
-#else
-		virtual void StreamCommittedL();
-#endif	
-	void CompleteOutstandingCmdsL();
-
-	// PolicyCheck, resource name
-//#ifdef __SAP_POLICY_MANAGEMENT	
-	TPtrC8 PolicyRequestResourceL( const TDesC8& aURI );
-//#endif
-private:
-	void ConstructL();
-	CWallpaperAdapter( MSmlDmCallback* aDmCallback );
-
-	enum TNodeId
-		{
-		ENodeUnknown,
-		ENodeCustomization,
-		ENodeWallpaper,
-		ENodeImage,
-		ENodeLast
-		};
-
-	TNodeId NodeId( const TDesC8& aURI );
-
-	void FillNodeInfoL( MSmlDmDDFObject& aNode,
-						TSmlDmAccessTypes aAccTypes,
-						MSmlDmDDFObject::TOccurence aOccurrence,
-						MSmlDmDDFObject::TScope aScope,
-						MSmlDmDDFObject::TDFFormat aFormat,
-						const TDesC8& aDescription,
-						TBool aObjectGroup);
-
-	TBool IsImageL(const TDesC8& aMime) ;
-private:
-
-	MSmlDmCallback* iCallBack;
-
-};
-
-
-
-	
-
-#endif // __WallpaperAdapter_H__
--- a/customization/WallpaperAdapter/rom/WallpaperAdapter.iby	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of customization components
-*
-*/
-#ifndef __WallpaperAdapter_IBY__
-#define __WallpaperAdapter_IBY__
-
-//#ifdef __SAP_WALLPAPER_ADAPTER
-
-ECOM_PLUGIN(WallpaperAdapter.dll, WallpaperAdapter.rsc)
-
-//#endif //__SAP_WALLPAPER_ADAPTER
-
-#endif //__WallpaperAdapter_IBY__
--- a/customization/WallpaperAdapter/src/WallpaperAdapter.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,732 +0,0 @@
-/*
-* Copyright (c) 2002 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:  DM Wallpaper Adapter
-*
-*/
-
-
-/*
-./Customization -+--> Wallpaper -+--> Image
-
-
-./Customization -+--> Wallpaper -+--> Image
-
-./Customization -+--> Themes -+--> CurrentThemes -+--> <X> * -+--> AppRef
-                 |            |                               |
-                 |            |                               |--> ID
-                 |            |                               |
-                 |            |                               |--> Name
-                 |            |                               |
-                 |            |                               |--> Version
-                 |            |
-                 |            |--> ActiveTheme
-                 |            |
-                 |            |--> InstallTheme
-                 |            |
-                 |            |--> InstallOptions
-                 |
-                 |
-                 |
-./Customization -+--> OperatorLogo -+--> LogoData
-                 |
-                 |
-                 |
-./Customization -+--> EmbeddedLinks -+--> <X> * -+--> Links -+--> <X> * -+--> URL
-                 |                               |                       |
-                 |                               |--> ID                 |--> Name
-                 |                               |                       |
-                 |                               |--> AppName            |--> UserName
-                 |                                                       |
-                 |                                                       |--> Password
-                 |                                                       |
-                 |                                                       |--> ConRef
-                 |                                                       |
-                 |                                                       |
-                 |
-                 |
-./Customization -+--> Startup -+--> WelcomeData
-                 |
-                 |
-                 |
-./Customization -+--> ScreenSaver --+----> CurrentScreenSavers --> <X> * ---+-----> ID
-				 |					|										|
-				 |					|----> ActiveSc							|-----> Name
-				 |					|										|
-				 |					|----> InstallScreenSaver				|-----> Description
-				 |					|										|
-				 |					|----> InstallOptions					|-----> CustomProperty
-				 |															|
-				 |															|-----> Version
-                 |
-                 |
-                 |
-./Customization -+--> Wallpaper -+--> Image
-                 |
-                 |
-                 |
-./Customization -+--> IdleSoftkeys -+--> SoftKeys -+--> <X> * -+--> ID
-                 |                  |                          |
-                 |                  |                          |--> Caption
-                 |                  |                          |
-                 |                  |                          |--> Image
-                 |                  |                          |
-                 |                  |                          |--> TargetRef
-                 |                  |
-                 |                  |
-                 |                  |--> Targets -+--> <X> * -+--> ID
-                 |                  |                         |
-                 |                  |                         |--> Description
-                 |                  |
-                 |                  |
-                 |                  |--> WebTargets -+--> <X> * -+--> ID
-                 |                                               |
-                 |                                               |--> Description
-                 |                                               |
-                 |                                               |--> URL
-                 |                                               |
-                 |                                               |--> UserName
-                 |                                               |
-                 |                                               |--> Password
-                 |                                               |
-                 |                                               |--> ConRef
-                 |
-                 |
-                 |-->
-                 |
-                 |-->
-                 |
-                 |-->
-                 |
-                 |-->
-                 |
-                 |-->
-                 |
-                 |-->
-                 |
-                 |-->
-                 |
-                 |
-                 |
-
-*/
-
-#include <imcvcodc.h>
-#include "debug.h"
-#include "WallpaperAdapter.h"
-#include "nsmldmuri.h"
-#include <implementationproxy.h> // For TImplementationProxy definition
-#include <f32file.h>
-#include "FileCoderB64.h"
-#include <AknsWallpaperUtils.h>
-
-//#ifdef __SAP_POLICY_MANAGEMENT
-#include <PolicyEngineXACML.h>
-//#endif
-#include <featmgr.h>
-#ifdef __Sml_DEBUG__
-#pragma message("Sml Debugging is ON!")
-#endif
-
-
-_LIT( KIVBackgroundImagePathBin, "c:\\system\\data\\backgroundimage.bin" );
-
-_LIT8( KMimeTypeJpeg, "image/jpeg" );
-_LIT8( KMimeTypeGif, "image/jpeg" );
-
-// ------------------------------------------------------------------------------------------------
-// CWallpaperAdapter* CWallpaperAdapter::NewL( )
-// ------------------------------------------------------------------------------------------------
-CWallpaperAdapter* CWallpaperAdapter::NewL( MSmlDmCallback* aDmCallback )
-	{
-	RDEBUG("CWallpaperAdapter::NewL(): begin");
-
-	CWallpaperAdapter* self = NewLC( aDmCallback );
-	CleanupStack::Pop();
-	return self;
-	}
-
-// ------------------------------------------------------------------------------------------------
-// CWallpaperAdapter* CWallpaperAdapter::NewLC( )
-// ------------------------------------------------------------------------------------------------
-CWallpaperAdapter* CWallpaperAdapter::NewLC( MSmlDmCallback* aDmCallback )
-	{
-	CWallpaperAdapter* self = new( ELeave ) CWallpaperAdapter( aDmCallback );
-	CleanupStack::PushL( self );
-	self->ConstructL();
-	return self;
-	}
-
-// ------------------------------------------------------------------------------------------------
-// CWallpaperAdapter::CWallpaperAdapter()
-// ------------------------------------------------------------------------------------------------
-
-CWallpaperAdapter::CWallpaperAdapter( MSmlDmCallback* aDmCallback )
-	: CTARMDmAdapter( aDmCallback )
-	, iCallBack( aDmCallback )
-	{
-	RDEBUG("CWallpaperAdapter::CWallpaperAdapter()");
-	}
-
-// ------------------------------------------------------------------------------------------------
-// CWallpaperAdapter::~CWallpaperAdapter()
-// ------------------------------------------------------------------------------------------------
-
-CWallpaperAdapter::~CWallpaperAdapter()
-	{
-	RDEBUG("CWallpaperAdapter::~CWallpaperAdapter()");
-	FeatureManager::UnInitializeLib();
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  CWallpaperAdapter::DDFVersionL()
-// ------------------------------------------------------------------------------------------------
-void CWallpaperAdapter::DDFVersionL( CBufBase& aDDFVersion )
-	{
-	aDDFVersion.InsertL( 0, KSmlWPDDFVersion );
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  CWallpaperAdapter::DDFStructureL()
-//
-// ------------------------------------------------------------------------------------------------
-void CWallpaperAdapter::DDFStructureL( MSmlDmDDFObject& aDDF )
-	{
-	RDEBUG( "CWallpaperAdapter::DDFStructureL(): begin" );
-	
-	TSmlDmAccessTypes accessTypesGet;
-	accessTypesGet.SetGet();
-	
-	/*
-	Node: ./Customzation
-	This interior node is the common parent to all customization..
-	Status: Required
-	Occurs: One
-	Format: Node
-	Access Types: Get
-	Values: N/A
-	*/
-	// Apps
-	MSmlDmDDFObject& apps = aDDF.AddChildObjectL( KSmlCustomizationN );
-	FillNodeInfoL(apps, accessTypesGet, MSmlDmDDFObject::EOne, MSmlDmDDFObject::EPermanent,
-		MSmlDmDDFObject::ENode, KSmlCustomizationD, EFalse );
-
-	/*
-	Node: ./Customization/Wallpaper
-	This interior node acts as a placeholder for one or more update packages within a same content provider group.
-	Status: Required
-	Occurs: One
-	Format: Node
-	Access Types: Get
-	Values: N/A
-	*/
-	// Apps/<x>/
-	// e.g. /Apps/Games
-	MSmlDmDDFObject& groupNode = apps.AddChildObjectL( KSmlWPWallpaperN );
-	FillNodeInfoL( groupNode, accessTypesGet, MSmlDmDDFObject::EOne, MSmlDmDDFObject::EPermanent,
-		MSmlDmDDFObject::ENode, KSmlWPWallpaperD, EFalse );
-
-	/*
-	Node: ./Customization/Wallpaper/Data
-Image node stores the wallpaper image as binary data, and its runtime Type determines the interpretation.
-·	Status: Optional
-·	Occurs: One
-·	Format: bin
-·	Access Types: Get, Replace
-·	Values: N/A
-	*/
-	TSmlDmAccessTypes accessTypesGetReplace;
-	accessTypesGetReplace.SetGet();
-	accessTypesGetReplace.SetReplace();
-
-	MSmlDmDDFObject& imageNode = groupNode.AddChildObjectL( KSmlWPDataN );
-	FillNodeInfoL( imageNode, accessTypesGetReplace, MSmlDmDDFObject::EOne, MSmlDmDDFObject::EPermanent,
-		MSmlDmDDFObject::EBin, KSmlWPImageD, EFalse);
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  CWallpaperAdapter::UpdateLeafObjectL()
-//  
-// ------------------------------------------------------------------------------------------------
-void CWallpaperAdapter::_UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& /*aLUID*/, const TDesC8& aObject, const TDesC8& aType, const TInt aStatusRef )
-	{
-
-	RDEBUG( "CWallpaperAdapter::UpdateLeafObjectL(): begin" );
-	TError ret = EOk ;
-	TInt err = KErrNone;
-	
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-	TPtrC8 uriPtrc = NSmlDmURI::RemoveDotSlash(aURI);
-	TInt cnt = NSmlDmURI::NumOfURISegs( uriPtrc ) ;
-#else
-	TInt cnt = NSmlDmURI::NumOfURISegs( aURI ) ;
-#endif
-
-	if ( cnt == 3 ) 
-		{
-		TPtrC8 app = NSmlDmURI::LastURISeg( aURI ) ;
-		if ( app == KSmlWPDataN ) 
-			{
-			if( IsImageL( aType ) )
-				{
-				RFs fs;
-				User::LeaveIfError( fs.Connect() );
-				CleanupClosePushL( fs );
-				
-				TBool setWallpaper = aObject.Length();
-				if (setWallpaper)
-					{
-					TFileCoderB64 decoder;
-					TBool isEncoded = TFileCoderB64::CheckB64Encode( aObject );
-					if (isEncoded )
-						{
-						decoder.DecodeToL( aObject, KIVBackgroundImagePathBin() );
-						}
-					else
-						{
-						// aObject is original data, save it to KIVBackgroundImagePathBin()
-						RFile file;
-						User::LeaveIfError( file.Replace( fs, KIVBackgroundImagePathBin(), EFileWrite));
-						CleanupClosePushL( file );
-						User::LeaveIfError( file.Write( aObject ) );
-						
-						CleanupStack::PopAndDestroy(); // file
-						}					
-					err = AknsWallpaperUtils::SetIdleWallpaper( KIVBackgroundImagePathBin(), 0 );
-					}
-				else
-					{
-					// Clear wallpaper
-					err = AknsWallpaperUtils::SetIdleWallpaper( KNullDesC(), 0 );
-					// Delete wallpaper file
-					fs.Delete( KIVBackgroundImagePathBin() );
-					}
-				
-				if (err != KErrNone)
-					{
-					ret = EError;
-					}
-				CleanupStack::PopAndDestroy(); // fs
-				}
-			else
-				{
-				RDEBUG("*** mime type is not supported!");
-				ret = EInvalidObject;
-				}
-			}
-		}
-	else
-		{
-		ret = EError ;
-		}
-
-	iCallBack->SetStatusL( aStatusRef, ret );
-	}
-
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-void CWallpaperAdapter::_UpdateLeafObjectL( const TDesC8& /*aURI*/, const TDesC8& /*aLUID*/, RWriteStream*& /*aStream*/, const TDesC8& /*aType*/, TInt aStatusRef )
-	{
-	RDEBUG( "CWallpaperAdapter::UpdateLeafObjectL(...RWriteStream...): begin" );
-	//Not supported
-	TError ret = EError;
-	iCallBack->SetStatusL( aStatusRef, ret );
-	}
-
-
-// ------------------------------------------------------------------------------------------------
-// CWallpaperAdapter::DeleteObjectL( const TDesC& aURI, const TDesC& aLUID )
-// ------------------------------------------------------------------------------------------------
-void CWallpaperAdapter::_DeleteObjectL( const TDesC8& /*aURI*/, const TDesC8& /*aLUID*/, const TInt aStatusRef )
-	{
-	RDEBUG( "CWallpaperAdapter::DeleteObjectL(): begin" );
-	//Not supported
-	CSmlDmAdapter::TError ret = CSmlDmAdapter::EError;
-	iCallBack->SetStatusL( aStatusRef, ret );
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  CWallpaperAdapter::FetchLeafObjectL( const TDesC& aURI, const TDesC& aLUID, const TDesC& aType, CBufBase& aObject )
-// ------------------------------------------------------------------------------------------------
-void CWallpaperAdapter::_FetchLeafObjectL( const TDesC8& aURI, const TDesC8& /*aLUID*/, const TDesC8& /*aType*/, const TInt /*aResultsRef*/, const TInt aStatusRef )
-	{
-	RDEBUG("CWallpaperAdapter::FetchLeafObjectL(): begin");
-	CSmlDmAdapter::TError status = CSmlDmAdapter::EOk;
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-	TPtrC8 uriPtrc = NSmlDmURI::RemoveDotSlash(aURI);
-	TInt numSeqs( NSmlDmURI::NumOfURISegs( uriPtrc ) );
-#else
-	TInt numSeqs( NSmlDmURI::NumOfURISegs( aURI ) );
-#endif
-
-	if( numSeqs == 3 ) 
-		{
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-	TPtrC8 mapping( NSmlDmURI::LastURISeg( uriPtrc ) );
-#else
-	TPtrC8 mapping( NSmlDmURI::LastURISeg( aURI ) );
-#endif		
-		if( mapping == KSmlWPDataN ) 
-			{
-			status = CSmlDmAdapter::EError;
-			}
-		} 
-	else 
-		{
-		status = EInvalidObject ;
-		}
-	iCallBack->SetStatusL( aStatusRef, status );
-	}
-
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-void CWallpaperAdapter::_FetchLeafObjectSizeL( const TDesC8& aURI, const TDesC8& /*aLUID*/, const TDesC8& /*aType*/, TInt /*aResultsRef*/, TInt aStatusRef )
-	{
-	RDEBUG("CWallpaperAdapter::FetchLeafObjectSizeL(): begin");
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-	TPtrC8 uriPtrc = NSmlDmURI::RemoveDotSlash(aURI);
-	TNodeId nodeId = NodeId( uriPtrc );
-#else
-	TNodeId nodeId = NodeId( aURI );
-#endif
-
-	TError ret = EOk ;
-
-	switch( nodeId )
-		{
-		case ENodeCustomization:
-			ret = EError;
-			break;
-
-		case ENodeWallpaper:
-			ret = EError;
-			break;
-
-		case ENodeImage:
-			ret = EError;
-			break;
-
-		default:
-			ret = EError;
-			break;
-		}
-
-	iCallBack->SetStatusL( aStatusRef, ret );
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  CWallpaperAdapter::ChildURIListL( const TDesC& aURI, const TDesC& aParentLUID, const CArrayFix<TSmlDmMappingInfo>& aPreviousURISegmentList, CArrayFix<TPtrC>& aCurrentURISegmentList )
-// ------------------------------------------------------------------------------------------------
-void CWallpaperAdapter::_ChildURIListL( const TDesC8& aURI, const TDesC8& /*aParentLUID*/, const CArrayFix<TSmlDmMappingInfo>& /*aPreviousURISegmentList*/, const TInt aResultsRef, const TInt aStatusRef  )
-	{
-	RDEBUG("CWallpaperAdapter::ChildURIListL(): begin");
-	
-	CSmlDmAdapter::TError ret = CSmlDmAdapter::EOk;
-		
-	CBufBase *currentList = CBufFlat::NewL( 128 );
-	CleanupStack::PushL( currentList );
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-	TPtrC8 uriPtrc = NSmlDmURI::RemoveDotSlash(aURI);
-	TInt numSeqs( NSmlDmURI::NumOfURISegs( uriPtrc ) );
-#else
-	TInt numSeqs( NSmlDmURI::NumOfURISegs( aURI ) );
-#endif
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY	
-	if ( numSeqs == 0 || uriPtrc == _L8("") )
-#else
-	if ( numSeqs == 0 || aURI == _L8("") )
-#endif	
-		{
-		currentList->InsertL( 0, KSmlCustomizationN() );
-		}
-	else if (numSeqs == 1)
-		{
-		currentList->InsertL( 0, KSmlWPWallpaperN() );
-		}
-	else if (numSeqs == 2)
-		{
-		currentList->InsertL( 0, KSmlWPDataN() );
-		}
-	else if (numSeqs == 3)
-		{
-		//Empty result, no error code
-		//currentList->InsertL( 0, KNullDesC8() );
-		}
-	else
-		{
-		ret = CSmlDmAdapter::EError;
-		}
-	
-	iCallBack->SetStatusL( aStatusRef, ret );
-	
-	if( ret==CSmlDmAdapter::EOk )
-		{
-		iCallBack->SetResultsL( aResultsRef, *currentList, KNullDesC8 );
-		}
-	
-	CleanupStack::PopAndDestroy(); //currentList
-	}
-
-// ------------------------------------------------------------------------------------------------
-// CWallpaperAdapter::AddNodeObjectL( const TDesC& aURI, const TDesC& aParentLUID )
-// ------------------------------------------------------------------------------------------------
-void CWallpaperAdapter::_AddNodeObjectL( const TDesC8& /*aURI*/, const TDesC8& /*aParentLUID*/, const TInt aStatusRef )
-	{
-	RDEBUG("CWallpaperAdapter::AddNodeObjectL(): begin");
-	//Not supported
-	CSmlDmAdapter::TError ret = CSmlDmAdapter::EError;
-	iCallBack->SetStatusL( aStatusRef, ret );
-	}
-
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-void CWallpaperAdapter::_ExecuteCommandL( const TDesC8& /*aURI*/, const TDesC8& /*aLUID*/, const TDesC8& /*aArgument*/, const TDesC8& /*aType*/, TInt aStatusRef )
-	{
-	RDEBUG("CWallpaperAdapter::ExecuteCommandL(): begin");
-	//Not supported
-	TError ret = EError;
-	iCallBack->SetStatusL( aStatusRef, ret );
-	}
-
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-void CWallpaperAdapter::_ExecuteCommandL( const TDesC8& /*aURI*/, const TDesC8& /*aLUID*/, RWriteStream*& /*aStream*/, const TDesC8& /*aType*/, TInt aStatusRef )
-	{
-	RDEBUG("CWallpaperAdapter::ExecuteCommandL(...RWriteStream...): begin");
-	//Not supported
-	TError ret = EError;
-	iCallBack->SetStatusL( aStatusRef, ret );
-	}
-	
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-void CWallpaperAdapter::_CopyCommandL( const TDesC8& /*aTargetURI*/, const TDesC8& /*aTargetLUID*/, const TDesC8& /*aSourceURI*/, const TDesC8& /*aSourceLUID*/, const TDesC8& /*aType*/, TInt aStatusRef )
-	{
-	RDEBUG("CWallpaperAdapter::CopyCommandL()");
-	//Not supported
-	TError ret = EError;
-	iCallBack->SetStatusL( aStatusRef, ret );
-	}
-
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-void CWallpaperAdapter::StartAtomicL()
-	{
-	RDEBUG("CWallpaperAdapter::StartAtomicL()");
-	//Not supported
-	}
-
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-void CWallpaperAdapter::CommitAtomicL()
-	{
-	RDEBUG("CWallpaperAdapter::CommitAtomicL()");
-	//Not supported
-	}
-
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-void CWallpaperAdapter::RollbackAtomicL()
-	{
-	RDEBUG("CWallpaperAdapter::RollbackAtomicL()");
-	//Not supported
-	}
-
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-TBool CWallpaperAdapter::StreamingSupport( TInt& /*aItemSize*/ )
-	{
-	RDEBUG("CWallpaperAdapter::StreamingSupport()");
-	return EFalse;
-	}
-
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-#ifdef __TARM_SYMBIAN_CONVERGENCY	
-void CWallpaperAdapter::StreamCommittedL( RWriteStream& /*aStream*/ )
-#else
-void CWallpaperAdapter::StreamCommittedL()
-#endif	
-	{	
-	RDEBUG("CWallpaperAdapter::StreamCommittedL(): begin");
-	RDEBUG("CWallpaperAdapter::StreamCommittedL(): end");
-	}
-
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-void CWallpaperAdapter::CompleteOutstandingCmdsL()
-	{
-	RDEBUG("CWallpaperAdapter::CompleteOutstandingCmdsL()");
-	}
-
-// -----------------------------------------------------------------------------
-// 
-// -----------------------------------------------------------------------------
-//
-//#ifdef __SAP_POLICY_MANAGEMENT
-TPtrC8 CWallpaperAdapter::PolicyRequestResourceL( const TDesC8& /*aURI*/ )
-	{
-	
-if(!FeatureManager::FeatureSupported(KFeatureIdSapPolicyManagement ))
-{
-	User::Leave(KErrNotSupported);
-	
-}
-return PolicyEngineXACML::KCustomizationManagement();
-
-	
-	}
-//#endif
-
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-CWallpaperAdapter::TNodeId CWallpaperAdapter::NodeId( const TDesC8& aURI )
-	{
-	TNodeId id = ENodeUnknown;
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-	TPtrC8 uriPtrc = NSmlDmURI::RemoveDotSlash( aURI );
-	TInt cnt( NSmlDmURI::NumOfURISegs( uriPtrc ) );
-	TPtrC8 app = NSmlDmURI::LastURISeg( uriPtrc );
-#else
-	TInt cnt( NSmlDmURI::NumOfURISegs( aURI ) );
-	TPtrC8 app = NSmlDmURI::LastURISeg( aURI );
-#endif
-
-	if ( cnt == 1 )
-		{
-		if (app == KSmlCustomizationN)
-			{
-			id = ENodeCustomization;
-			}
-		}
-	else if ( cnt == 2 ) 
-		{
-		if (app == KSmlWPWallpaperN)
-			{
-			id = ENodeWallpaper;
-			}
-		}
-	else if ( cnt == 3 ) 
-		{
-		if (app == KSmlWPDataN)
-			{
-			id = ENodeImage;
-			}
-		}
-
-	return id;
-	}
-
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-const TImplementationProxy ImplementationTable[] = 
-	{
-	{ {KSmlDMWallpaperAdapterImplUid}, (TProxyNewLPtr)CWallpaperAdapter::NewL }
-	};
-
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy( TInt& aTableCount )
-	{
-	aTableCount = sizeof( ImplementationTable ) / sizeof( TImplementationProxy );
-	return ImplementationTable;
-	}
-
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-void CWallpaperAdapter::ConstructL( )
-	{
-		TRAPD( errf, FeatureManager::InitializeLibL() );
-		if( errf != KErrNone )
-		{
-			User::Leave(errf);
-		}
-		if( ! FeatureManager::FeatureSupported(KFeatureIdSapWallpaperAdapter))
-		{
-			
-	   		User::Leave( KErrNotSupported );
-		}
-	}
-
-// -------------------------------------------------------------------------------------
-// CWallpaperAdapter::FillNodeInfoL()
-// Fills the node info in ddf structure
-// -------------------------------------------------------------------------------------
-void CWallpaperAdapter::FillNodeInfoL( MSmlDmDDFObject& aNode,TSmlDmAccessTypes aAccTypes,
-								MSmlDmDDFObject::TOccurence aOccurrence, MSmlDmDDFObject::TScope aScope, 
-								MSmlDmDDFObject::TDFFormat aFormat,const TDesC8& aDescription,TBool aObjectGroup)
-	{
-	aNode.SetAccessTypesL(aAccTypes);
-	aNode.SetOccurenceL(aOccurrence);
-	aNode.SetScopeL(aScope);
-	aNode.SetDFFormatL(aFormat);
-	if(aFormat!=MSmlDmDDFObject::ENode)
-		{
-		aNode.AddDFTypeMimeTypeL(KSmlWPTextPlain);
-		}
-	aNode.SetDescriptionL(aDescription);
-	if(aObjectGroup)
-		{
-		aNode.SetAsObjectGroup();
-		}
-	}
-
-// -------------------------------------------------------------------------------------
-// CWallpaperAdapter::IsImage()
-// Checks whether the given mime type is image format (that we support)
-// -------------------------------------------------------------------------------------
-TBool CWallpaperAdapter::IsImageL( const TDesC8& aMime ) 
-	{
-	RDEBUG_2("CWallpaperAdapter::IsImageL( %S )", &aMime );
-	TBool ret = EFalse;
-	HBufC8* buf = aMime.AllocLC();
-	TPtr8 ptr = buf->Des();
-	ptr.LowerCase();
-	ptr.Trim();
-	
-	
-	
-	if( ptr == KMimeTypeJpeg )
-		{
-		ret = ETrue;
-		}
-	else if( ptr == KMimeTypeGif )
-		{
-		ret = ETrue;
-		}
-
-	CleanupStack::PopAndDestroy( buf );
-	return ret;
-	}
-	
-
--- a/customization/WallpaperAdapter/src/WallpaperAdapter.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-/*
-* Copyright (c) 2002 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: 
-*       Registery info for Wallpaper
-*
-*/
-
-
-#include <registryinfo.rh>
-#define KSmlDMInterfaceUid 0x102018B4
-
-RESOURCE REGISTRY_INFO theRegistryInfo
-  {
-  dll_uid = 0x1020782F; //The DLL's 3rd UID.
-  interfaces = 
-      {
-      INTERFACE_INFO
-          {
-          interface_uid = KSmlDMInterfaceUid; // DM interface UID
-          implementations = 
-            {
-            IMPLEMENTATION_INFO
-                {
-                implementation_uid = 0x10207830; // DM WallpaperAdapter implementation UID
-                version_no = 1; 
-                display_name = "DM Wallpaper Adapter";
-                default_data = "";
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-                opaque_data = "host=0x101F9A02";
-#else
-								opaque_data = "";
-#endif
-                }
-            };
-          }
-      };
-    }
--- a/customization/build_adapter.bat	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-rem
-rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-rem All rights reserved.
-rem This component and the accompanying materials are made available
-rem under the terms of "Eclipse Public License v1.0"
-rem which accompanies this distribution, and is available
-rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
-rem
-rem Initial Contributors:
-rem Nokia Corporation - initial contribution.
-rem
-rem Contributors:
-rem
-rem Description: Implementation of customization components
-rem
-
-@echo off
-echo ############
-echo Building %1
-echo ############
-echo 
-
-cd %1\bld
-call bldmake bldfiles
-call abld build %2 %3
-cd ..\..
\ No newline at end of file
--- a/customization/build_adapters.bat	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-rem
-rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-rem All rights reserved.
-rem This component and the accompanying materials are made available
-rem under the terms of "Eclipse Public License v1.0"
-rem which accompanies this distribution, and is available
-rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
-rem
-rem Initial Contributors:
-rem Nokia Corporation - initial contribution.
-rem
-rem Contributors:
-rem
-rem Description: Implementation of customization components
-rem
-
-call build_adapter DMUtils %1 %2
-call build_adapter UISettingsSrv %1 %2
-call build_adapter EmbeddedLinkAdapter %1 %2
-REM --not yet-- call build_adapter isadapter %1 %2
-call build_adapter OperatorLogoAdapter %1 %2
-call build_adapter ScreenSaverAdapter %1 %2
-call build_adapter supadapter %1 %2
-call build_adapter ThemesAdapter %1 %2
-call build_adapter WallpaperAdapter %1 %2
Binary file customization/cenrep/keys_customization.xls has changed
--- a/customization/clean_adapter.bat	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-rem
-rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-rem All rights reserved.
-rem This component and the accompanying materials are made available
-rem under the terms of "Eclipse Public License v1.0"
-rem which accompanies this distribution, and is available
-rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
-rem
-rem Initial Contributors:
-rem Nokia Corporation - initial contribution.
-rem
-rem Contributors:
-rem
-rem Description: Implementation of customization components
-rem
-
-@echo off
-echo ############
-echo Cleaning %1
-echo ############
-echo 
-
-pushd %1\bld
-call abld reallyclean %2 %3
-popd
\ No newline at end of file
--- a/customization/clean_adapters.bat	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-rem
-rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-rem All rights reserved.
-rem This component and the accompanying materials are made available
-rem under the terms of "Eclipse Public License v1.0"
-rem which accompanies this distribution, and is available
-rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
-rem
-rem Initial Contributors:
-rem Nokia Corporation - initial contribution.
-rem
-rem Contributors:
-rem
-rem Description: Implementation of customization components
-rem
-
-call clean_adapter DMUtils %1 %2
-call clean_adapter UISettingsSrv %1 %2
-call clean_adapter EmbeddedLinkAdapter %1 %2
-call clean_adapter isadapter %1 %2
-call clean_adapter OperatorLogoAdapter %1 %2
-call clean_adapter ScreenSaverAdapter %1 %2
-call clean_adapter supadapter %1 %2
-call clean_adapter ThemesAdapter %1 %2
-call clean_adapter WallpaperAdapter %1 %2
Binary file customization/conf/customization.confml has changed
Binary file customization/conf/customization_10207831.crml has changed
--- a/customization/group/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-/*
-* 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:  Customization
-*
-*/
-
-
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-// Generic configuration interface for component cenrep settings  
-../conf/customization.confml                        APP_LAYER_CONFML(customization.confml)
-../conf/customization_10207831.crml 	        APP_LAYER_CRML(customization_10207831.crml)
-PRJ_MMPFILES
-
-//#include "../UISettingsSrv/Client/group/bld.inf"
-#include "../DMUtils/bld/bld.inf"
-//#include "../UISettingsSrv/Server/group/bld.inf"
-#include "../UISettingsSrv/bld/bld.inf"
-
-#include "../isadapter/bld/bld.inf"
-#include "../supadapter/bld/bld.inf"
-#include "../WallpaperAdapter/bld/bld.inf"
-#include "../OperatorLogoAdapter/bld/bld.inf"
-#include "../ScreenSaverAdapter/bld/bld.inf"
-#include "../ThemesAdapter/bld/bld.inf"
-#include "../EmbeddedLinkAdapter/bld/bld.inf"
-
--- a/customization/include/debug.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,80 +0,0 @@
-/*
-* 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:  Application Management Debug macro definitions
-*
-*/
-
-
-#ifndef DEBUG_HEADER_
-#define DEBUG_HEADER_
-
-// INCLUDES
-
-#include <f32file.h>
-#include <flogger.h>
-
-// CONSTANTS
-_LIT( KTarmLogFolderName, "tarm" );
-_LIT( KTarmLogFileName, "tarm.log" );
-// MACROS
-
-#ifdef _TARM_FILE_DEBUG
-		#define RDEBUG(X)					RFileLogger::Write( KTarmLogFolderName, KTarmLogFileName, EFileLoggingModeAppend, _L(X) )
-		#define RDEBUG_2(X,Y)			RFileLogger::WriteFormat( KTarmLogFolderName, KTarmLogFileName, EFileLoggingModeAppend, _L(X),Y )	
-		#define RDEBUG_3(X,Y,Z)	  RFileLogger::WriteFormat( KTarmLogFolderName, KTarmLogFileName, EFileLoggingModeAppend, _L(X),Y,Z )	
-		#define RDEBUG_4(X,Y,Z,A)	  RFileLogger::WriteFormat( KTarmLogFolderName, KTarmLogFileName, EFileLoggingModeAppend, _L(X),Y,Z,A )	
-		#define RDEBUG_5(X,Y,Z,A,B)	  RFileLogger::WriteFormat( KTarmLogFolderName, KTarmLogFileName, EFileLoggingModeAppend, _L(X),Y,Z,A,B )
-		
-		#define RDEBUG8_2(X,Y)			RFileLogger::WriteFormat( KTarmLogFolderName, KTarmLogFileName, EFileLoggingModeAppend, _L8(X),Y )	
-		#define RDEBUG8_3(X,Y,Z)	  RFileLogger::WriteFormat( KTarmLogFolderName, KTarmLogFileName, EFileLoggingModeAppend, _L8(X),Y,Z )	
-		#define RDEBUG8_4(X,Y,Z,A)	  RFileLogger::WriteFormat( KTarmLogFolderName, KTarmLogFileName, EFileLoggingModeAppend, _L8(X),Y,Z,A )	
-		#define RDEBUG8_5(X,Y,Z,A,B)	  RFileLogger::WriteFormat( KTarmLogFolderName, KTarmLogFileName, EFileLoggingModeAppend, _L8(X),Y,Z,A,B )
-		
-#else
-
-	#ifdef _DEBUG
-		#define RDEBUG(X)								RDebug::Print(_L(X))
-		#define RDEBUG_2(X,Y)						RDebug::Print(_L(X),Y)
-		#define RDEBUG_3(X,Y,Z)					RDebug::Print(_L(X),Y,Z)
-		#define RDEBUG_4(X,Y,Z,A)					RDebug::Print(_L(X),Y,Z,A)
-		#define RDEBUG_5(X,Y,Z,A,B)					RDebug::Print(_L(X),Y,Z,A,B)
-		
-		#define RDEBUG8_2(X,Y)						RDebug::Printf(X,Y)
-		#define RDEBUG8_3(X,Y,Z)					RDebug::Printf(X,Y,Z)
-		#define RDEBUG8_4(X,Y,Z,A)					RDebug::Printf(X,Y,Z,A)
-		#define RDEBUG8_5(X,Y,Z,A,B)					RDebug::Printf(X,Y,Z,A,B)
-		
-	#else
-		#define RDEBUG(X)								
-		#define RDEBUG_2(X,Y)						
-		#define RDEBUG_3(X,Y,Z)	
-		#define RDEBUG_4(X,Y,Z,A)	
-		#define RDEBUG_5(X,Y,Z,A,B)	
-		
-		#define RDEBUG8_2(X,Y)
-		#define RDEBUG8_3(X,Y,Z)	
-		#define RDEBUG8_4(X,Y,Z,A)			
-		#define RDEBUG8_5(X,Y,Z,A,B)		
-		
-	#endif // _DEBUG
-	
-#endif // _TARM_FILE_DEBUG
-
-
-
-
-#endif // DEBUG_HEADER_
-
-
-
--- a/customization/isadapter/bld/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-/*
-* Copyright (c) 2002 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:  build info file for idlescreen softkey settings adapter
-*
-*/
-
-#include <platform_paths.hrh>
-
-PRJ_EXPORTS
-../rom/10207831.txt /epoc32/release/winscw/udeb/z/private/10202be9/10207831.txt
-../rom/10207831.txt /epoc32/release/winscw/urel/z/private/10202be9/10207831.txt
-../rom/10207831.txt /epoc32/data/z/private/10202be9/10207831.txt
-
-../rom/isadapter.iby										CORE_APP_LAYER_IBY_EXPORT_PATH(isadapter.iby)
-
-PRJ_MMPFILES
-./isadapter.mmp
--- a/customization/isadapter/bld/isadapter.mmp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,91 +0,0 @@
-/*
-* 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: Implementation of customization components
-*
-*/
-  
-
-// To get the APP_LAYER_SYSTEMINCLUDE-definition
-#include <platform_paths.hrh>
-#include "defaultcaps.hrh"
-
-CAPABILITY      CAP_ECOM_PLUGIN
-TARGET          isadapter.dll
-TARGETTYPE      PLUGIN
-UID             0x10009D8D 0x10207831
-SECUREID        0x10207831
-VENDORID        VID_DEFAULT
-
-
-SOURCEPATH      ../src
-SOURCE          isadapter.cpp
-SOURCE          UiSettingsUtil.cpp
-SOURCE          IdleSoftkeysWebTargetManager.cpp
-SOURCE          IdleSoftkeysAppTargetManager.cpp
-
-APP_LAYER_SYSTEMINCLUDE
-SYSTEMINCLUDE   /epoc32/include/swi
-SYSTEMINCLUDE 	/epoc32/include/ecom
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-SYSTEMINCLUDE 	/epoc32/include/devman
-#else
-// nothing
-#endif
-
-USERINCLUDE     ../inc 
-USERINCLUDE     ../../include
-//USERINCLUDE     ../../UISettingsSrv/inc
-USERINCLUDE     ../../DMUtils/inc
-
-
-START RESOURCE  isadapter.rss
-TARGET          isadapter.rsc
-LANGUAGE_IDS
-END
-
-
-LIBRARY         euser.lib
-LIBRARY			bafl.lib 
-LIBRARY         ecom.lib 
-LIBRARY         efsrv.lib
-LIBRARY         sysutil.lib
-LIBRARY         apparc.lib
-LIBRARY         charconv.lib
-LIBRARY         favouritesengine.lib
-//LIBRARY         uisettingsclient.lib
-LIBRARY         centralrepository.lib
-LIBRARY         imut.lib
-LIBRARY         estor.lib
-LIBRARY 				flogger.lib
-LIBRARY			apgrfx.lib
-LIBRARY			javaregistryclient.lib
-LIBRARY                 msgs.lib
-LIBRARY                 featmgr.lib             // For feature manager
-
-//#ifdef __SAP_POLICY_MANAGEMENT
-LIBRARY         policyengine.lib
-LIBRARY         dmutil.lib
-//#endif
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-LIBRARY		      devmancmdmgr.lib
-#else
-// nothing
-#endif
-
-STATICLIBRARY   dmutils.lib
-
-
-SMPSAFE
--- a/customization/isadapter/inc/IdleSoftkeysAppTargetManager.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +0,0 @@
-/*
-* Copyright (c) 2002 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:  DM Idle SoftKey Adapter
-*
-*/
-
-
-#ifndef __IdleSoftkeysAppTargetManager_H__
-#define __IdleSoftkeysAppTargetManager_H__
-
-// symbian
-#include <e32base.h>
-#include <smldmadapter.h>
-
-class CUiSettingsUtil;
-
-class CIdleSoftkeysAppTargetManager : public CBase
-    {
-
-    public:
-
-    
-    CIdleSoftkeysAppTargetManager::CIdleSoftkeysAppTargetManager(MSmlDmCallback *& aCallBack);
-    ~CIdleSoftkeysAppTargetManager();
-    
-    //
-    // Targets
-    //
-    TInt        ListTargetsL                            (
-                                                        CBufFlat &aList
-                                                        );
-
-    HBufC8*     GenerateNodeNameL                       (
-                                                        TInt aIndex
-                                                        );
-
-    void        GetTargetFromNodeNameL                  (
-                                                        const TDesC8& aNodeName,
-                                                        TInt &aIndex,
-                                                        TDes8 &aTargetCaption
-                                                        );
-
-    void        SetCaptionL                             (
-                                                        const TDesC8& aURI,
-                                                        const TDesC8& aCaption
-                                                        );
-
-    private:
-	
-	TBool					iUiSettingsNotInitialized;
-    MSmlDmCallback*         &iCallBack;
-    CUiSettingsUtil 		*iUiSettings;
-    };
-
-#endif //__IdleSoftkeysAppTargetManager_H__
-
-
--- a/customization/isadapter/inc/IdleSoftkeysWebTargetManager.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,128 +0,0 @@
-/*
-* Copyright (c) 2002 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:  DM Idle SoftKey Adapter
-*
-*/
-
-
-#ifndef __IdleSoftkeysWebTargetManager_H__
-#define __IdleSoftkeysWebTargetManager_H__
-
-
-// symbian
-#include <e32base.h>
-#include <smldmadapter.h>
-// s60
-#include <favouritesdb.h>           // Favourites Database
-
-class CUiSettingsUtil;
-
-class CIdleSoftkeysWebTargetManager : public CBase
-    {
-    public:
-
-    CIdleSoftkeysWebTargetManager::CIdleSoftkeysWebTargetManager(
-        MSmlDmCallback *& aCallBack,
-        RFavouritesDb   & aFavDbSrv );
-        
-  	~CIdleSoftkeysWebTargetManager();
-
-    //
-    // Webtargets
-    //
-    TInt        ListWebTargetsL                         ( CBufFlat &aList );
-
-    void        CheckWebTargetsL                        ( );
-
-#ifdef ISADAPTER_USE_CAPTION_IN_WEBTARGET_NAME
-    HBufC8*     GenerateNodeNameL                       ( TInt aIndex );
-#endif
-
-    HBufC8*     GenerateNodeNameL                       ( TInt aIndex, const TDesC8 &aPrefix );
-
-    HBufC8*     GenerateNodeNameL                       ( const TDesC8 &aText );
-
-    TInt        RenameL                                 (
-                                                        const TDesC8& aURI,
-                                                        const TDesC8& aLUID,
-                                                        const TDesC8& aNewURI
-                                                        );
-
-    TInt        GetTargetFromNodeNameL                  (
-                                                        const TDesC8& aURI,
-                                                        TInt &aIndex
-                                                        );
-
-    TInt        GetTargetFromNodeNameL                  ( 
-                                                        const TDesC8& aURI,
-                                                        CFavouritesItem &aItem,
-                                                        TInt &aIndex
-                                                        );
-
-    void        PrepareItemL                            (
-                                                        const TDesC8& aURI,
-                                                        CFavouritesItem &aItem,
-                                                        TInt &aIndex
-                                                        );
-
-    void        ReleaseItemL                            (
-                                                        CFavouritesItem &aItem,
-                                                        TBool aUpdate=ETrue
-                                                        );
-
-    void        SetCaptionL                             (
-                                                        const TDesC8& aURI,
-                                                        const TDesC8& aCaption
-                                                        );
-
-    void        FindWapApL                              (
-                                                        const TDesC8& aURI,
-                                                        TInt &aWapAp
-                                                        );
-
-
-    //
-    // URI mapping database ( Webtarget node name / LUID )
-    //
-    TInt        UpdateLUIDDatabaseL     (
-                                        const TDesC8& aURI,
-                                        const TDesC8& aLUID,
-                                        TInt &aIndex
-                                        );
-
-    TInt        FindLUIDByURIL          (
-                                        const TDesC8& aURI,
-                                        TDes8& aLUID,
-                                        TInt &aIndex
-                                        );
-
-    TInt        FindURIByLUIDL          (
-                                        TDes8& aURI,
-                                        const TDesC8& aLUID,
-                                        TInt &aIndex
-                                        );
-
-    TInt        CheckLUIDDatabaseL      (
-                                        TBool aCleanDatabase=ETrue
-                                        );
-
-    private:
-    
-	TBool					iUiSettingsNotInitialized;
-    MSmlDmCallback*         &iCallBack;
-    RFavouritesDb           &iFavDb;
-    CUiSettingsUtil 		*iUiSettings;
-    };
-
-#endif //#ifndef __IdleSoftkeysWebTargetManager_H__
--- a/customization/isadapter/inc/IsAdapterConstants.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,95 +0,0 @@
-/*
-* Copyright (c) 2002 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:  DM Idle SoftKey Adapter
-*
-*/
-
-
-#ifndef __IsAdapterConstants_H__
-#define __IsAdapterConstants_H__
-
-//#include <ScShortcutUids.h>
-
-_LIT(KTempFilePath, "c:\\system\\temp\\");
-_LIT8(KDefaultApName8, "Default");
-
-
-#define KScActionTypeUidValueNull                  0x0
-#define KScActionTypeUidValueSoftkeyLeft           0x01000100
-#define KScActionTypeUidValueSoftkeyRight          0x01000101
-#define KScActionTypeUidValueScrollkeyLeft         0x01000000
-#define KScActionTypeUidValueScrollkeyRight        0x01000001
-#define KScActionTypeUidValueScrollkeyUp           0x01000002
-#define KScActionTypeUidValueScrollkeyDown         0x01000003
-#define KScActionTypeUidValueScrollkeySelect       0x01000004
-
-// Active Idle
-#define KActiveIdleScUidValueItem1                 0x00000001
-#define KActiveIdleScUidValueItem2                 0x00000002
-#define KActiveIdleScUidValueItem3                 0x00000003
-#define KActiveIdleScUidValueItem4                 0x00000004
-#define KActiveIdleScUidValueItem5                 0x00000005
-#define KActiveIdleScUidValueItem6                 0x00000006
-
-#define KScRtTypeUidValueBookmark	1
-
-const TInt CIsAdapter::iSoftkeyList[] =
-    {
-    
-#ifdef KScActionTypeUidValueSoftkeyLeft
-    KScActionTypeUidValueSoftkeyLeft,
-#endif
-#ifdef KScActionTypeUidValueSoftkeyRight
-    KScActionTypeUidValueSoftkeyRight,
-#endif
-#ifdef KScActionTypeUidValueScrollkeyLeft
-    KScActionTypeUidValueScrollkeyLeft,
-#endif
-#ifdef KScActionTypeUidValueScrollkeyRight
-    KScActionTypeUidValueScrollkeyRight,
-#endif
-#ifdef KScActionTypeUidValueScrollkeyUp
-    KScActionTypeUidValueScrollkeyUp,
-#endif
-#ifdef KScActionTypeUidValueScrollkeyDown
-    KScActionTypeUidValueScrollkeyDown,
-#endif
-#ifdef KScActionTypeUidValueScrollkeySelect
-    KScActionTypeUidValueScrollkeySelect,
-#endif
-#ifdef KActiveIdleScUidValueItem1
-    KActiveIdleScUidValueItem1,
-#endif
-#ifdef KActiveIdleScUidValueItem2
-    KActiveIdleScUidValueItem2,
-#endif
-#ifdef KActiveIdleScUidValueItem3
-    KActiveIdleScUidValueItem3,
-#endif
-#ifdef KActiveIdleScUidValueItem4
-    KActiveIdleScUidValueItem4,
-#endif
-#ifdef KActiveIdleScUidValueItem5
-    KActiveIdleScUidValueItem5,
-#endif
-#ifdef KActiveIdleScUidValueItem6
-    KActiveIdleScUidValueItem6
-#endif
-
-    };
-
-#define NumberOfSoftkeys (sizeof(iSoftkeyList) / sizeof(TInt32))
-//#define NumberOfSoftkeys 6
-
-#endif //__IsAdapterConstants_H__
\ No newline at end of file
--- a/customization/isadapter/inc/IsAdapterDefines.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-/*
-* Copyright (c) 2002 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:  DM Idle SoftKey Adapter
-*
-*/
-
-
-#ifndef __IsAdapterDefines_H__
-#define __IsAdapterDefines_H__
-
-#define KNSmlDMISAdapterImplUidValue     0x10207832
-#define KNSmlDMISAdapterCentRepUidValue  0x10207831
-#define KNSmlDMISAdapterImplUid          TUid::Uid( KNSmlDMISAdapterImplUidValue )
-#define KNSmlDMISAdapterCentRepUid       TUid::Uid( KNSmlDMISAdapterCentRepUidValue )
-
-#define KRepositoryEntryMaxLength  512
-#define KRepositoryIdBookmarkCount 1
-#define KRepositoryIdBookmarkFirst 2
-#define ISADAPTER_SHORTCUT_CAPTION_MAXLENGTH 128
-#define KISTBufMaxLength 100
-#ifndef MAX_NUMBER_OF_DIGITS_IN_10BASE_INT64
-#define MAX_NUMBER_OF_DIGITS_IN_10BASE_INT64 21
-#endif
-
-#endif
\ No newline at end of file
--- a/customization/isadapter/inc/IsAdapterLiterals.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,172 +0,0 @@
-/*
-* Copyright (c) 2002 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:  DM Idle SoftKey Adapter
-*
-*/
-
-
-#ifndef __IsAdapterLiterals_H__
-#define __IsAdapterLiterals_H__
-
-// the DDF version must be changed if any changes in DDF structure ( built in DDFStructureL() function )
-_LIT8( KNSmlISDDFVersion, "1.0" ); 
-_LIT8( KMimeTypeImageMbm, "image/x-epoc-mbm");
-_LIT8( KNSmlISTextPlain, "text/plain" );
-_LIT8( KNSmlISNodeName, "Apps" );
-_LIT8( KNSmlISDynamicNode, "" );
-_LIT8( KNSmlISSeparator, "/" );
-
-//
-// Customization, IdleSoftkeys, Softkeys, Targets, WebTargets
-//
-_LIT8( KPrefixSoftkeyNodeName,       "Softkey" );
-_LIT8( KFormatSoftkeyNodeName,       "Softkey%d" );
-_LIT8( KPrefixTargetNodeName,        "Target" );
-_LIT8( KFormatTargetNodeName,        "Target%d" );
-_LIT8( KPrefixAppTargetNodeName,     "AppTarget" );
-_LIT8( KFormatAppTargetNodeName,     "AppTarget%d" );
-_LIT8( KPrefixEditorTargetNodeName,  "EditorTarget" );
-_LIT8( KFormatEditorTargetNodeName,  "EditorTarget%d" );
-_LIT8( KPrefixSpecialTargetNodeName, "OtherTarget" );
-_LIT8( KFormatSpecialTargetNodeName, "OtherTarget%d" );
-_LIT8( KPrefixWebTargetURI,          "Customization/IdleSoftkeys/WebTargets/" );
-_LIT8( KPrefixWebTargetNodeName,     "WebTarget" );
-_LIT8( KFormatWebTargetNodeName,     "WebTarget%d" );
-
-_LIT8( KISLeftSoftkeyName,          "Left softkey" );
-_LIT8( KISRightSoftkeyName,         "Right softkey" );
-_LIT8( KISScrollLeftSoftkeyName,    "Left arrow softkey" );
-_LIT8( KISScrollRightSoftkeyName,   "Right arrow softkey" );
-_LIT8( KISScrollUpSoftkeyName,      "Up arrow softkey" );
-_LIT8( KISScrollDownSoftkeyName,    "Down arrow softkey" );
-_LIT8( KISSelectionSoftkeyName,     "Selection softkey" );
-_LIT8( KISAISoftkeyName1,           "Active Idle softkey 1" );
-_LIT8( KISAISoftkeyName2,           "Active Idle softkey 2" );
-_LIT8( KISAISoftkeyName3,           "Active Idle softkey 3" );
-_LIT8( KISAISoftkeyName4,           "Active Idle softkey 4" );
-_LIT8( KISAISoftkeyName5,           "Active Idle softkey 5" );
-_LIT8( KISAISoftkeyName6,           "Active Idle softkey 6" );
-
-_LIT8( KNSmlCustomizationNodeName,  "Customization" );
-_LIT8( KNSmlIS_IdleSoftKeyNodeName, "IdleSoftkeys" );
-_LIT8( KNSmlIS_SoftKeysNodeName,    "SoftKeys" );
-_LIT8( KNSmlIS_TargetsNodeName,     "Targets" );
-_LIT8( KNSmlIS_WebTargetsNodeName,  "WebTargets" );
-
-_LIT8( KNSmlISDescription, "The interior object holds all idle softkey objects" );
-_LIT8( KNSmlISIdleSoftKeyNodeDescription, "Holds all idle softkey customization nodes");
-_LIT8( KNSmlISSoftkeysNodeDescription, "Holds all softkeys objects in idle softkey customization");
-_LIT8( KNSmlISTargetsNodeDescription, "Holds all targets objects in idle softkey customization");
-_LIT8( KNSmlISWebTargetsNodeDescription, "Holds all web targets objects in idle softkey customization");
-_LIT8( KNSmlISSoftkeysXNodeDescription, "Holds all softkey information in a web targets object");
-_LIT8( KNSmlISTargetsXNodeDescription, "Holds all target information in a web targets object");
-_LIT8( KNSmlISWebTargetsXNodeDescription, "Holds all web target information in a web targets object");
-
-// Softkeys/X/*
-_LIT8( KNSmlIS_SoftkeysIDNodeName,        "ID" );
-_LIT8( KNSmlIS_SoftkeysTargetRefNodeName, "TargetRef" );
-#ifdef IDLESOFTKEY_ADAPTER_SOFTKEY_IMAGES
-_LIT8( KNSmlIS_SoftkeysImageNoneName,     "Image" );
-#ifdef IDLESOFTKEY_ADAPTER_IMAGEMASK
-_LIT8( KNSmlIS_SoftkeysMaskNodeName,      "Mask" );
-#endif
-#endif
-
-_LIT8( KNSmlIS_SoftkeysIDDescription,        "This object holds id of a Softkeys node" );
-_LIT8( KNSmlIS_SoftkeysTargetRefDescription, "This object holds target reference of a Softkeys node" );
-#ifdef IDLESOFTKEY_ADAPTER_SOFTKEY_IMAGES
-_LIT8( KNSmlIS_SoftkeysImageDescription,     "This object holds image mask of a Softkeys node" );
-#ifdef IDLESOFTKEY_ADAPTER_IMAGEMASK
-_LIT8( KNSmlIS_SoftkeysMaskDescription,      "This object holds image mask of a Softkeys node" );
-#endif
-#endif
-
-// Targets/X/*
-_LIT8( KNSmlIS_TargetsIDNodeName,          "ID" );
-_LIT8( KNSmlIS_TargetsDescriptionNodeName, "Description" );
-_LIT8( KNSmlIS_TargetsCaptionName,         "Caption" );
-#ifndef IDLESOFTKEY_ADAPTER_SOFTKEY_IMAGES
-_LIT8( KNSmlIS_TargetsImageNodeName,       "Image" );
-#ifdef IDLESOFTKEY_ADAPTER_IMAGEMASK
-_LIT8( KNSmlIS_TargetsMaskNodeName,        "Mask" );
-#endif
-#endif
-
-_LIT8( KNSmlIS_TargetsIDDescription,          "This object holds id of a Targets node" );
-_LIT8( KNSmlIS_TargetsDescriptionDescription, "This object holds description of a Targets node" );
-_LIT8( KNSmlIS_TargetsCaptionDescription,     "This object holds caption of a Targets node" );
-#ifndef IDLESOFTKEY_ADAPTER_SOFTKEY_IMAGES
-_LIT8( KNSmlIS_TargetsImageDescription,       "This object holds image of a Targets node" );
-#ifdef IDLESOFTKEY_ADAPTER_IMAGEMASK
-_LIT8( KNSmlIS_TargetsMaskDescription,        "This object holds image mask of a Targets node" );
-#endif
-#endif
-
-// WebTargets/X/*
-_LIT8( KNSmlIS_WebTargetsIDNodeName,          "ID" );
-_LIT8( KNSmlIS_WebTargetsDescriptionNodeName, "Description" );
-_LIT8( KNSmlIS_WebTargetsURLNodeName,         "URL" );
-_LIT8( KNSmlIS_WebTargetsUserNameNodeName,    "UserName" );
-_LIT8( KNSmlIS_WebTargetsPasswordNodeName,    "Password" );
-_LIT8( KNSmlIS_WebTargetsConRefNodeName,      "ConRef" );
-_LIT8( KNSmlIS_WebTargetsCaptionNodeName,     "Caption" );
-#ifndef IDLESOFTKEY_ADAPTER_SOFTKEY_IMAGES
-_LIT8( KNSmlIS_WebTargetsImageNodeName,       "Image" );
-#ifdef IDLESOFTKEY_ADAPTER_IMAGEMASK
-_LIT8( KNSmlIS_WebTargetsMaskNodeName,        "Mask" );
-#endif
-#endif
-
-_LIT8( KNSmlIS_WebTargetsIDDescription,          "This object holds id of a WebTargets node" );
-_LIT8( KNSmlIS_WebTargetsDescriptionDescription, "This object holds description of a WebTargets node" );
-_LIT8( KNSmlIS_WebTargetsURLDescription,         "This object holds URL of a WebTargets node" );
-_LIT8( KNSmlIS_WebTargetsUserNameDescription,    "This object holds user name of a WebTargets node" );
-_LIT8( KNSmlIS_WebTargetsPasswordDescription,    "This object holds password of a WebTargets node" );
-_LIT8( KNSmlIS_WebTargetsConRefDescription,      "This object holds connection reference of a WebTargets node" );
-_LIT8( KNSmlIS_WebTargetsCaptionDescription,     "This object holds caption of a WebTargets node" );
-#ifndef IDLESOFTKEY_ADAPTER_SOFTKEY_IMAGES
-_LIT8( KNSmlIS_WebTargetsImageDescription,       "This object holds image of a WebTargets node" );
-#ifdef IDLESOFTKEY_ADAPTER_IMAGEMASK
-_LIT8( KNSmlIS_WebTargetsMaskDescription,        "This object holds image mask of a WebTargets node" );
-#endif
-#endif
-
-
-// Used by UiSettingsUtil
-
-	_LIT(KNewMsg,"localapp:0x100058C5?new=msg");
-	_LIT(KNewEmail,"localapp:0x100058C5?new=email");
-	_LIT(KNewSyncMLMail,"localapp:0x100058C5?new=syncmlmail");
-	_LIT(KNewMMS,"localapp:0x100058C5?new=postcard");
-	_LIT(KNewAudioMsg,"localapp:0x100058C5?new=audiomsg");
-	_LIT(KNewMsgType,"localapp:0x100058C5?new");
-	_LIT(KChangeTheme,"localapp:0x10005A32?view=0x102750A7");
-	
-	_LIT(KNewMsgCaption,"New Message");
-	_LIT(KNewEmailCaption,"New Email");
-	_LIT(KNewSyncMLMailCaption,"New Syncml Mail");
-	_LIT(KNewMMSCaption,"New Postcard");
-	_LIT(KNewAudioMsgCaption,"New Audio Message");
-	_LIT(KNewMsgTypeCaption,"Select Message Type");
-	_LIT(KChangeThemeCaption,"Change Idle Theme");
-	
-	   	
-
-	_LIT16(KFormat,"%x");
-	_LIT(KAppText,"localapp:0x");
-    _LIT(KMailBoxText,"localapp:0x100058C5?mailbox=");
-    _LIT(KBookmarkText,"localapp:0x102750FB?bkm=0x");
-    
-
-#endif //__IsAdapterLiterals_H__
--- a/customization/isadapter/inc/UiSettingsUtil.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,130 +0,0 @@
-/*
-* 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:  DM Idle SoftKey Adapter
-*
-*/
-
-
-#ifndef __UISETTINGSUTIL_H__
-#define __UISETTINGSUTIL_H__
-
-#include <favouritesdb.h>           // Favourites Database
-#include <msvapi.h>
-#include <apgcli.h>
-#include <centralrepository.h>
-
-#include "javaregistry.h"
-#include "javaregistryentry.h"
-
-
-using namespace Java;
-
-class CUiSettingsUtil : public CBase, public MMsvSessionObserver
-{
-public:
-
-    static CUiSettingsUtil* NewL( );
-    static CUiSettingsUtil* NewLC( );
-
-    ~CUiSettingsUtil();
-    
-    // Returns whether the uid is of an application or bookmark
-  	void GetShortcutRtTypeL(TInt aUid, TInt &aRtType);
-  	
-  	// Returns the index of the matching uid Applications and WebTargets
-    TInt GetShortcutTargetIndexL(TInt aUid, TInt& aIndex); 
-    
-    // returns the total number of Softkeys
-	
-	TInt GetSoftkeyCountL();
-    
-    // Application Target Functions
-    
-    // Initializes the Normal, Java, Mailbox and Static Applications
-    void ReadTargetsL();    
-    
-    // Returns the index of the matching index for Normal and Java Applications
-    TInt GetAppTargetCaptionL(TInt index, TDes& aBufferCaption);
-    
-    // Sets the Softkey Target, given the Softkey UID and the App Index
-    TInt SetShortcutTargetAppIndexL( TInt aUid, TInt aIndex );
-  	
-  	// returns total number of applications
-	TInt GetNoOfTargetApps();	
-	
-	// Web Target Functions
-	
-	// Initializes the WebTarget List
-	void ReadBookmarksL();
-	
-	// returns the number of webtargets
-	TInt GetWebTargetsCount( TInt &aCount );
-	
-	// Returns the index of the matching uid for webtargets
-	TInt GetWebTargetAppUid( TInt aIndex, TInt& aUid );
-	
-	// Returns the caption of the matching index for webtargets
-	TInt GetWebTargetCaption( TInt aIndex, TDes& aCaption );
-	
-	// Get the wetarget index given the UID
-	TInt GetWebTargetIndex( TInt& aIndex, TInt& aUid );
-		
-	// Sets the Softkey Target, given the Softkey UID and the WebTarget Index
-	TInt SetShortcutTargetWebIndexL( TInt aUid, TInt aIndex );
-  	
-  	
-  	void HandleSessionEventL(TMsvSessionEvent aEvent, TAny* /*aArg1*/, TAny* /*aArg2*/, TAny* /*aArg3*/);
-  	
-private:	
-	
-	void ConstructL( );
-    CUiSettingsUtil();
-    	
-	// Following four functions initialize their respective lists
-	// Each is called from ReadTargetsL()
-	void ReadJavaTargetsL();
-	void ReadMailBoxesL();
-	void ReadAppTargetsL();
-	void ReadStaticAppTargetsL();
-	
-	// Checks if the java application is NonNative
-	TBool IsNonNativeL(const TUid& aUid) const ;
-	
-	// Gets the key value for a given Softkey node
-	void GetKeyValueL(TInt aUid, TDes16 &aValue);
-	
-	// Gets the Application Info at the given node
-	TBool GetAppInfoAtIndex(TInt aIndex, TApaAppInfo& aAppInfo);
-	
-	// Finds the matching app (normal and Java) in the list to the UID
-  	TBool GetAppIndexToUID(TUid aUID, TInt& aIndex );
-  	
-	// Finds the matching MailBox in the list to the name
-  	TBool GetMailBoxTargetIndex(const TDesC& aName, TInt& aIndex );
-  	
-	// Finds the matching static application in the list to the name
-  	TBool GetStaticAppIndex(const TDesC& aKeyValue,TInt& aIndex) ;
-  	    
-private:
-
-	CFavouritesItemList*				iFavList;    
-    RArray<TUid> 						iJaveUids;
-    RPointerArray<TApaAppInfo> 			iListItems;
-	CDesCArray* 						iMailBoxes;
-	CDesCArrayFlat*						iStaticAppParam ;
-	CDesCArrayFlat*						iStaticAppCaption ;
-};
-
-
-#endif // __UISETTINGSUTIL_H__
\ No newline at end of file
--- a/customization/isadapter/inc/isadapter.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,258 +0,0 @@
-/*
-* Copyright (c) 2002 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:  DM Idle SoftKey Adapter
-*
-*/
-
-
-
-#ifndef __NSMLISADAPTER_H__
-#define __NSMLISADAPTER_H__
-
-#define IDLESOFTKEY_ADAPTER_IMAGEMASK
-
-#define IDLESOFTKEY_ADAPTER_SOFTKEY_IMAGES
-
-// tarm
-#include "TARMDmStreamAdapter.h"
-
-#include "IdleSoftkeysWebTargetManager.h"
-#include "centralrepository.h"
-
-
-//_LIT( KBrowserBookmarks, "BrowserBookmarks" );
-
-class CIdleSoftkeysWebTargetManager;
-class CIdleSoftkeysAppTargetManager;
-class CUiSettingsUtil;
-
-// ------------------------------------------------------------------------------------------------
-// CIsAdapter
-// ------------------------------------------------------------------------------------------------
-class CIsAdapter : public CTARMDmStreamAdapter
-    {
-private:
-    enum TIsNodeIdentifier
-        {
-        EIsNodeCustomization = 0,
-        EIsNodeIdleSoftkeys,
-        EIsNodeSoftKeys,
-        EIsNodeTargets,
-        EIsNodeWebTargets,
-        EIsNodeSoftKeysX,
-        EIsNodeTargetsX,
-        EIsNodeWebTargetsX,
-        EIsNodeSoftKeysXID,
-        EIsNodeSoftKeysXTargetRef,
-#ifdef IDLESOFTKEY_ADAPTER_SOFTKEY_IMAGES
-        EIsNodeSoftKeysXImage,
-#ifdef IDLESOFTKEY_ADAPTER_IMAGEMASK
-        EIsNodeSoftKeysXMask,
-#endif
-#endif
-        EIsNodeTargetsXID,
-        EIsNodeTargetsXDescription,
-        EIsNodeTargetsXCaption,
-#ifndef IDLESOFTKEY_ADAPTER_SOFTKEY_IMAGES
-        EIsNodeTargetsXImage,
-#ifdef IDLESOFTKEY_ADAPTER_IMAGEMASK
-        EIsNodeTargetsXImageMask,
-#endif
-#endif
-        EIsNodeWebTargetsXID,
-        EIsNodeWebTargetsXDescription,
-        EIsNodeWebTargetsXURL,
-        EIsNodeWebTargetsXUserName,
-        EIsNodeWebTargetsXPassword,
-        EIsNodeWebTargetsXConRef,
-        EIsNodeWebTargetsXCaption,
-#ifndef IDLESOFTKEY_ADAPTER_SOFTKEY_IMAGES
-        EIsNodeWebTargetsXImage,
-#ifdef IDLESOFTKEY_ADAPTER_IMAGEMASK
-        EIsNodeWebTargetsXImageMask,
-#endif
-#endif
-        EIsNodeNotUsedAndAlwaysLast
-        };
-
-public:
-    CIsAdapter(TAny* aEcomArguments);
-
-    static CIsAdapter* NewL(MSmlDmCallback* aDmCallback );
-    static CIsAdapter* NewLC(MSmlDmCallback* aDmCallback );
-
-    virtual ~CIsAdapter();
-
-    // Pure virtual methods
-    // From CSmlDmAdapter
-    void DDFVersionL                ( CBufBase& aVersion );
-    void DDFStructureL              ( MSmlDmDDFObject& aDDF );
-
-    void UpdateLeafObjectL          ( CSmlDmAdapter::TError &aStatus,
-                                      const TDesC8& aURI, const TDesC8& aLUID,
-                                      const TDesC8& aObject, const TDesC8& aType );
-    void DeleteObjectL              ( CSmlDmAdapter::TError &aStatus, const TDesC8& aURI,
-                                      const TDesC8& aLUID );
-    CSmlDmAdapter::TError
-         FetchLeafObjectL           ( const TDesC8& aURI, const TDesC8& aLUID,
-                                      TDes8& aNewMime, CBufFlat& object );
-    void AddNodeObjectL             ( CSmlDmAdapter::TError &aStatus, const TDesC8& aURI,
-                                      const TDesC8& aParentLUID );
-
-    void _UpdateLeafObjectL         ( const TDesC8& aURI, const TDesC8& aLUID,
-                                      const TDesC8& aObject, const TDesC8& aType, TInt aStatusRef );
-    void _UpdateLeafObjectL         ( const TDesC8& aURI, const TDesC8& aLUID, RWriteStream*& aStream,
-                                      const TDesC8& aType, TInt aStatusRef );
-    void _DeleteObjectL             ( const TDesC8& aURI, const TDesC8& aLUID, TInt aStatusRef );
-    void _FetchLeafObjectL          ( const TDesC8& aURI, const TDesC8& aLUID,
-                                      const TDesC8& aType, TInt aResultsRef, TInt aStatusRef );
-    void _FetchLeafObjectSizeL      ( const TDesC8& aURI, const TDesC8& aLUID,
-                                      const TDesC8& aType, TInt aResultsRef, TInt aStatusRef );
-    void _ChildURIListL             ( const TDesC8& aURI, const TDesC8& aLUID,
-                                      const CArrayFix<TSmlDmMappingInfo>& aPreviousURISegmentList,
-                                      TInt aResultsRef, TInt aStatusRef );
-    void _AddNodeObjectL            ( const TDesC8& aURI, const TDesC8& aParentLUID, TInt aStatusRef );
-    void _ExecuteCommandL           ( const TDesC8& aURI, const TDesC8& aLUID,
-                                      const TDesC8& aArgument, const TDesC8& aType, TInt aStatusRef );
-    void _ExecuteCommandL           ( const TDesC8& aURI, const TDesC8& aLUID,
-                                      RWriteStream*& aStream, const TDesC8& aType, TInt aStatusRef );
-    void _CopyCommandL              ( const TDesC8& aTargetURI, const TDesC8& aTargetLUID,
-                                      const TDesC8& aSourceURI, const TDesC8& aSourceLUID,
-                                      const TDesC8& aType, TInt aStatusRef );
-    void StartAtomicL               ( );
-    void CommitAtomicL              ( );
-    void RollbackAtomicL            ( );
-    TAdapterStreamType StreamType   ( const TDesC8& aURI );
-    TBool StreamingSupport          ( TInt& aItemSize );
-    void CompleteOutstandingCmdsL   ( );
-
-private:
-    void ConstructL(MSmlDmCallback* aDmCallback);
-
-    //
-    // DDF methods
-    //
-    void FillNodeInfoL( MSmlDmDDFObject& aNode,TSmlDmAccessTypes aAccTypes,
-            MSmlDmDDFObject::TOccurence aOccurrence,
-            MSmlDmDDFObject::TScope aScope,
-            MSmlDmDDFObject::TDFFormat aFormat,
-            const TDesC8& aDescription,
-            const TDesC8& aMimeType);
-
-    //
-    // URI & argument handling
-    //
-    void        CopyAndTrimMimeType         (TDes8& aNewMime, const TDesC8& aType);
-
-    TIsNodeIdentifier
-                GetNodeIdentifier           (const TDesC8& aURI);
-
-    //
-    // Softkeys
-    //
-    TInt        ListSoftkeysL               ( CBufFlat &aList );
-
-    TInt        GetSoftkeyUidFromNodeNameL  ( const TDesC8& aNodeName );
-
-    HBufC8*     GenerateSoftkeyNodeNameL    ( TInt aIndex );
-
-    TInt        GetSoftkeyIndexFromUid      ( TInt aUid );
-
-    void        AddShortcutNameL            ( CBufFlat& aBuffer,
-                                              TInt aUid );
-
-    void        SetShortcutTargetL          ( const TDesC8& aURI, TInt aUid );
-
-    //
-    // Common for targets
-    //
-#ifdef IDLESOFTKEY_ADAPTER_SOFTKEY_IMAGES
-    void        GetSoftkeyImageL            ( TInt aSoftkeyUid, CBufFlat &aImageBuffer, TBool aGetMask=EFalse );
-#endif
-
-#ifndef IDLESOFTKEY_ADAPTER_SOFTKEY_IMAGES
-    void        GetApplicationImageL                   (
-                                                        TInt aIndex,
-                                                        CBufFlat &aImageBuffer,
-                                                        TBool aGetMask=EFalse
-                                                        );
-
-    void        GetBookmarkImageL                      (
-                                                        TInt aIndex,
-                                                        CBufFlat &aImageBuffer,
-                                                        TBool aGetMask=EFalse
-                                                        );
-
-    void        GetShortcutImageL                      (
-                                                        TInt aRtMask,
-                                                        TInt aIndex,
-                                                        CBufFlat &aImageBuffer,
-                                                        TBool aGetMask=EFalse
-                                                        );
-
-#endif
-
-    //
-    // Other
-    //
-    CSmlDmAdapter::TError GetShortcutTargetURIL         (
-                                                        CBufFlat& aBuffer,
-                                                        TInt aUid
-                                                        );
-
-    HBufC16*    CreateCopy16LC                          ( const TDesC8& aText );
-
-//#ifdef __SAP_POLICY_MANAGEMENT
-    TPtrC8      PolicyRequestResourceL                  ( const TDesC8& aURI );
-//#endif
-
-    //
-    // Image handling
-    //
-#ifdef IDLESOFTKEY_ADAPTER_SOFTKEY_IMAGES
-    void        SetSoftkeyImageL               ( const TDesC8& aURI,
-                                                 const TDesC8& aObject,
-                                                 const TDesC8& aType);
-#endif
-
-#ifndef IDLESOFTKEY_ADAPTER_SOFTKEY_IMAGES
-    void        SetShortcutTargetImageL        ( const TDesC8& aURI,
-                                                 const TDesC8& aObject,
-                                                 const TDesC8& aType);
-#endif
-
-    TInt        DecodeImageToFileL             ( const TDesC8& aObject );
-
-    void        DecodeImageL                   ( CBufFlat& aBuffer, const TDesC8& aObject );
-
-    void        EncodeImageL                   ( CBufFlat& aBuffer, const TDesC8& aObject );
-
-private:
-    TFileName               iTemporaryImageFile;
-    static const TInt     iSoftkeyList[];
-	TBool					iUiSettingsNotInitialized;
-	
-    RFs                     iFs;
-    RFavouritesSession      iFavSession;
-    RFavouritesDb           iFavDb;
-
-    MSmlDmCallback*         iCallBack;
-    CFavouritesItemList*    iFavList;
-
-    CIdleSoftkeysWebTargetManager *iWebTargetManager;
-    CIdleSoftkeysAppTargetManager *iAppTargetManager;
-    CUiSettingsUtil *iUiSettings;
-};
-
-#endif // __NSMLISADAPTER_H__
Binary file customization/isadapter/rom/10207831.txt has changed
--- a/customization/isadapter/rom/isadapter.iby	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of customization components
-*
-*/
-#ifndef __ISADAPTER_IBY__
-#define __ISADAPTER_IBY__
-
-//#ifdef __SAP_IDLE_SOFTKEY_ADAPTER
-
-ECOM_PLUGIN(isadapter.dll, isadapter.rsc)
-
-//#endif //__SAP_IDLE_SOFTKEY_ADAPTER
-
-#endif //__ISADAPTER_IBY__
--- a/customization/isadapter/src/IdleSoftkeysAppTargetManager.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,184 +0,0 @@
-/*
-* Copyright (c) 2002 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:  DM Idle SoftKey  Adapter
-*
-*/
-
-
-#include "IdleSoftkeysAppTargetManager.h"
-#include "UiSettingsUtil.h"
-// symbian
-// s60
-#include <centralrepository.h>
-// tarm
-#include "IsAdapterLiterals.h"
-#include "IsAdapterDefines.h"
-#include "nsmldmuri.h"
-#include "TARMCharConv.h"
-#include "TPtrC8I.h"
-#include "debug.h"
-
-
-CIdleSoftkeysAppTargetManager::CIdleSoftkeysAppTargetManager(MSmlDmCallback *& aCallBack)
-        : iCallBack( aCallBack )
-	{
-       	iUiSettingsNotInitialized = ETrue;
-	}
-
-CIdleSoftkeysAppTargetManager::~CIdleSoftkeysAppTargetManager()
-	{
-	if(iUiSettingsNotInitialized == EFalse)
-		{
-		delete iUiSettings;
-		}
-	}
-
-// -------------------------------------------------------------------------------------
-// CIdleSoftkeysAppTargetManager::ListTargetsL
-// This method will list all application targets in the shortcut engine
-// -------------------------------------------------------------------------------------
-TInt CIdleSoftkeysAppTargetManager::ListTargetsL( CBufFlat &aList )
-    {
-    RDEBUG( "CIdleSoftkeysAppTargetManager::ListTargetsL() >" );
-
-    TInt i, num ;
-
-   	if(iUiSettingsNotInitialized)
-   	{
-   		iUiSettings = CUiSettingsUtil::NewL( );
-   		iUiSettings->ReadTargetsL();
-   		iUiSettingsNotInitialized = EFalse;
-   	}   
-    
-	num = iUiSettings->GetNoOfTargetApps();
-		
-    for(i=0; i<num; i++)
-        {
-        if(i>0)
-            {
-            aList.InsertL( aList.Size(), KNSmlISSeparator() );
-            }
-
-        HBufC8* targetName = GenerateNodeNameL( i );
-        CleanupStack::PushL( targetName );
-
-        aList.InsertL( aList.Size(), *targetName ); 
-
-        CleanupStack::PopAndDestroy( targetName );
-        }
-
-    RDEBUG( "CIdleSoftkeysAppTargetManager::ListTargetsL() <" );
-    return KErrNone;
-    }
-
-
-// -------------------------------------------------------------------------------------
-// CIdleSoftkeysAppTargetManager::GenerateNodeNameL
-// This method generates name for a target according to a given index
-// -------------------------------------------------------------------------------------
-HBufC8* CIdleSoftkeysAppTargetManager::GenerateNodeNameL(TInt aIndex)
-    {
-    RDEBUG( "CIdleSoftkeysAppTargetManager::GenerateNodeNameL() >" );
-
-    HBufC8* targetName = HBufC8::NewL( KPrefixTargetNodeName().Length()
-                                + MAX_NUMBER_OF_DIGITS_IN_10BASE_INT64 );
-
-    TPtr8 ptr( targetName->Des() );
-
-    ptr.Format(KFormatTargetNodeName, aIndex+1);
-
-    RDEBUG8_2( "CIdleSoftkeysAppTargetManager::GenerateNodeNameL() < %S", &targetName );
-    return targetName;
-    }
-
-
-// -------------------------------------------------------------------------------------
-// CIdleSoftkeysAppTargetManager::GetTargetFromNodeNameL
-// This method parses a node name and returns matching application index and caption
-// -------------------------------------------------------------------------------------
-void CIdleSoftkeysAppTargetManager::GetTargetFromNodeNameL(const TDesC8& aNodeName, TInt &aIndex, TDes8 &aTargetCaption)
-    {
-    RDEBUG( "CIdleSoftkeysAppTargetManager::GetTargetFromNodeNameL() >" );
-
-    TInt index = -1;
-    TInt compareLenApp = KPrefixTargetNodeName().Length();
-
-    if(aNodeName.Left(compareLenApp) == KFormatTargetNodeName().Left(compareLenApp))
-        {
-        if(iUiSettingsNotInitialized)
-   		{	
-   			iUiSettings = CUiSettingsUtil::NewL( );
-   			iUiSettings->ReadTargetsL() ;
-   			iUiSettingsNotInitialized = EFalse;
-   		}
-        
-        TInt num;
-        num = iUiSettings->GetNoOfTargetApps();
-		
-        TLex8 lex;
-        lex.Assign( aNodeName );
-
-        lex.Inc( compareLenApp );
-        User::LeaveIfError( lex.Val(index) );
-        index--;
-        User::LeaveIfError( index>=0 && index<num ? KErrNone : KErrGeneral );
-
-        HBufC8* targetName = GenerateNodeNameL( index );
-        CleanupStack::PushL( targetName );
-
-        TPtr8 ptr( targetName->Des() );
-        User::LeaveIfError( ptr == aNodeName ? KErrNone : KErrGeneral );
-
-        CleanupStack::PopAndDestroy( targetName );
-
-        HBufC* buffer = HBufC::NewLC( aTargetCaption.MaxLength() );
-        RDEBUG_2( "CIdleSoftkeysAppTargetManager::GetTargetFromNodeNameL() HBufC buffer ALLOC %x", buffer);
-        TPtr bufferPtr( buffer->Des() );
-        User::LeaveIfError(iUiSettings->GetAppTargetCaptionL( index, bufferPtr )) ;
-        aTargetCaption.Copy( bufferPtr );
-        CleanupStack::PopAndDestroy( buffer );
-        aIndex = index;
-    }
-    else
-    {
-#ifdef __WINS_DEBUG_TRACE__
-       User::Panic( _L("IsAdapter"), 1 );
-#else
-       User::Leave( KErrNotFound );
-#endif
-    }
-
-    RDEBUG( "CIdleSoftkeysAppTargetManager::GetTargetFromNodeNameL() <" );
-    }
-
-
-// -------------------------------------------------------------------------------------
-// CIdleSoftkeysAppTargetManager::SetCaptionL
-// This method sets a new caption to a target (shortcut)
-// -------------------------------------------------------------------------------------
-void CIdleSoftkeysAppTargetManager::SetCaptionL( const TDesC8& aURI, const TDesC8& aCaption )
-    {
-    RDEBUG( "CIdleSoftkeysAppTargetManager::SetCaptionL() >" );
-
-    TBuf8<ISADAPTER_SHORTCUT_CAPTION_MAXLENGTH> caption;
-    TInt       index;
-    GetTargetFromNodeNameL( NSmlDmURI::URISeg( aURI, 3 ), index, caption );
-
-    HBufC* newCaption = CTARMCharConv::ConvertFromUtf8LC( aCaption );
-    CleanupStack::PopAndDestroy( newCaption );
-
-    RDEBUG( "CIdleSoftkeysAppTargetManager::SetCaptionL() <" );
-    }
-
-//End of file
--- a/customization/isadapter/src/IdleSoftkeysWebTargetManager.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1024 +0,0 @@
-/*
-* Copyright (c) 2002 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:  DM Idle SoftKey  Adapter
-*
-*/
-
-
-#include "IdleSoftkeysWebTargetManager.h"
-#include "UiSettingsUtil.h"
-// symbian
-// s60
-#include <centralrepository.h>
-// tarm
-#include "IsAdapterLiterals.h"
-#include "IsAdapterDefines.h"
-#include "nsmldmuri.h"
-#include "TARMCharConv.h"
-#include "TPtrC8I.h"
-#include "debug.h"
-
-// #define ISADAPTER_USE_CAPTION_IN_WEBTARGET_NAME
-
-
-CIdleSoftkeysWebTargetManager::CIdleSoftkeysWebTargetManager( MSmlDmCallback *& aCallBack,
-        RFavouritesDb   & aFavDb ) : iCallBack( aCallBack ), iFavDb( aFavDb )        
-        {
-        	iUiSettingsNotInitialized = ETrue;	
-        }
-        
-CIdleSoftkeysWebTargetManager::~CIdleSoftkeysWebTargetManager()
-	{
-	if(iUiSettingsNotInitialized == EFalse)
-		{
-		delete iUiSettings;
-		}
-	}
-
-        
-// -------------------------------------------------------------------------------------
-// CIdleSoftkeysWebTargetManager::ListWebTargetsL
-// -------------------------------------------------------------------------------------
-TInt CIdleSoftkeysWebTargetManager::ListWebTargetsL( CBufFlat &aList )
-    {
-    RDEBUG( "CIdleSoftkeysWebTargetManager::ListWebTargetsL() >" );
-
-    TInt i, num = 6, offset;
-   	if(iUiSettingsNotInitialized)
-   	{
-   		iUiSettings = CUiSettingsUtil::NewL( );
-   		iUiSettings->ReadBookmarksL();
-   		iUiSettingsNotInitialized = EFalse;
-   	}
-	iUiSettings->GetWebTargetsCount( num ) ;
-    HBufC8* dataH = HBufC8::NewLC( KRepositoryEntryMaxLength );
-    RDEBUG_2( "CIdleSoftkeysWebTargetManager::ListWebTargetsL() HBufC8 dataH ALLOC %x", dataH);
-    TPtr8 data( dataH->Des() );
-
-    for(i=0, offset=0; i<num; i++)
-        {
-        TBuf8<MAX_NUMBER_OF_DIGITS_IN_10BASE_INT64> numBuf;
-        TInt mappingIndex;
-        TInt bmUid;
-
-        //
-        // List BM's with valid UID (>= 0)
-        //
-        // General names for the new bookmarks on the fly
-        //
-        User::LeaveIfError(iUiSettings->GetWebTargetAppUid( i, bmUid ));
-        
-        
-        if( bmUid >= 0 )
-            {
-            mappingIndex = -1;
-            numBuf.Num( bmUid );
-            HBufC8* targetName = NULL;
-
-            //
-            // Case 1: There is already URI to LUID mapping, continue with that
-            //
-            if( (KErrNone == FindURIByLUIDL( data, numBuf, mappingIndex )) && (mappingIndex != -1) )
-                {
-                //
-                // LUid was found in the database
-                //
-                targetName = GenerateNodeNameL( NSmlDmURI::LastURISeg(data) );
-                CleanupStack::PushL(targetName);
-                }
-#ifdef ISADAPTER_USE_CAPTION_IN_WEBTARGET_NAME
-            else
-            //
-            // Case 2: Bookmark caption is not used in mappings, use that webtarget name
-            //
-            if( NULL != (targetName = GenerateNodeNameL( i )) )
-                {
-                //
-                // 
-                //
-                CleanupStack::PushL(targetName);
-                UpdateLUIDDatabaseL( *targetName, numBuf, mappingIndex);
-                }
-#endif
-            else
-                {
-                //
-                // Generate unique name
-                //
-                targetName = GenerateNodeNameL( offset, KPrefixWebTargetURI() );
-                CleanupStack::PushL(targetName);
-
-                mappingIndex = -1;
-                while( (KErrNone == FindLUIDByURIL( *targetName, data, mappingIndex )) &&
-                       (mappingIndex != -1) )
-                    {
-                    offset ++;
-                    mappingIndex = -1;
-
-                    CleanupStack::PopAndDestroy( targetName );
-                    targetName = GenerateNodeNameL( offset, KPrefixWebTargetURI() );
-                    CleanupStack::PushL(targetName);
-                    }
-
-                // We have now unique webtarget node name and unique LUid
-                //
-                numBuf.Num( bmUid );
-                mappingIndex = -1;
-                UpdateLUIDDatabaseL( *targetName, numBuf, mappingIndex);
-                }
-
-            // Add webtarget node name to list
-            //
-            if( aList.Size() > 0 )
-            {
-                aList.InsertL( aList.Size(), KNSmlISSeparator() );
-            }
-            aList.InsertL( aList.Size(), NSmlDmURI::LastURISeg(*targetName) );
-            CleanupStack::PopAndDestroy( targetName );
-            }
-        }
-
-    CleanupStack::PopAndDestroy( dataH );
-
-    RDEBUG( "CIdleSoftkeysWebTargetManager::ListWebTargetsL() <" );
-    return KErrNone;
-    }
-
-// -------------------------------------------------------------------------------------
-// CIdleSoftkeysWebTargetManager::CheckWebTargetsL
-// -------------------------------------------------------------------------------------
-void CIdleSoftkeysWebTargetManager::CheckWebTargetsL()
-    {
-    RDEBUG( "CIdleSoftkeysWebTargetManager::CheckWebTargetsL() ><" );
-    }
-
-#ifdef ISADAPTER_USE_CAPTION_IN_WEBTARGET_NAME
-// -------------------------------------------------------------------------------------
-// CIdleSoftkeysWebTargetManager::GenerateNodeNameL
-// -------------------------------------------------------------------------------------
-HBufC8* CIdleSoftkeysWebTargetManager::GenerateNodeNameL(TInt aIndex)
-    {
-    RDEBUG( "CIdleSoftkeysWebTargetManager::GenerateNodeNameL() 1 >" );
-
-    //
-    // Get caption of the bookmark
-    //
-    TBuf<64> caption; 
-    if(iUiSettingsNotInitialized)
-   	{
-   		iUiSettings = CUiSettingsUtil::NewL( );
-   		iUiSettings->ReadBookmarksL();
-   		iUiSettingsNotInitialized = EFalse;
-   	}
-   	
-    User::LeaveIfError( iUiSettings->GetWebTargetCaption( aIndex, caption ) );
-    
-
-    
-    if( HasInvalidCharacters( caption ) )
-        {
-        return NULL;
-        }
-
-    //
-    // Generate URI with caption
-    // Reserve space
-    //
-    TInt length = caption.Length() + KPrefixWebTargetURI().Length();
-    HBufC8* targetName = HBufC8::NewLC( length );
-    TPtr8 ptr( targetName->Des() );
-
-    //
-    // Generate URI with caption
-    // Append strings
-    //
-    ptr.Append( KPrefixWebTargetURI() );
-    ptr.Append( caption );
-
-    HBufC8* dataH = HBufC8::NewLC( KRepositoryEntryMaxLength );
-    TPtr8 data( dataH->Des() );
-    TInt index = -1;
-    TBool okToAdd = (KErrNone != FindLUIDByURIL( ptr, data, index ));
-    CleanupStack::PopAndDestroy( dataH );
-
-    if( okToAdd )
-        {
-        RDEBUG8_2( "CIdleSoftkeysWebTargetManager::GenerateNodeNameL() 1 < %S", &targetName );
-        CleanupStack::Pop(targetName);
-        return targetName;
-        }
-    else
-        {
-        RDEBUG( "CIdleSoftkeysWebTargetManager::GenerateNodeNameL() 1 < NULL, WebTarget name was reserved!" );
-        CleanupStack::PopAndDestroy(targetName);
-        return NULL;
-        }
-    }
-#endif
-
-// -------------------------------------------------------------------------------------
-// CIdleSoftkeysWebTargetManager::GenerateNodeNameL
-// -------------------------------------------------------------------------------------
-HBufC8* CIdleSoftkeysWebTargetManager::GenerateNodeNameL(TInt aIndex, const TDesC8 &aPrefix)
-    {
-    RDEBUG( "CIdleSoftkeysWebTargetManager::GenerateNodeNameL() 2 >" );
-
-    TInt length = aPrefix.Length()
-                    + KPrefixWebTargetNodeName().Length()
-                    + MAX_NUMBER_OF_DIGITS_IN_10BASE_INT64;
-
-    RDEBUG_2( "CIdleSoftkeysWebTargetManager::GenerateNodeNameL() 2 About to ALLOC %d bytes.", length );
-
-    HBufC8* targetName = HBufC8::NewL( length );
-
-    RDEBUG_2( "CIdleSoftkeysWebTargetManager::GenerateNodeNameL() 2 ALLOC HBufC8 targetName %x", targetName );
-
-    TPtr8 ptr( targetName->Des() );
-
-    ptr.Format(KFormatWebTargetNodeName, aIndex+1);
-    ptr.Insert(0, aPrefix);
-
-    RDEBUG8_2( "CIdleSoftkeysWebTargetManager::GenerateNodeNameL() 2 < %S", &targetName );
-    return targetName;
-    }
-
-// -------------------------------------------------------------------------------------
-// CIdleSoftkeysWebTargetManager::GenerateNodeNameL
-// -------------------------------------------------------------------------------------
-HBufC8* CIdleSoftkeysWebTargetManager::GenerateNodeNameL(const TDesC8 &aText)
-    {
-    RDEBUG( "CIdleSoftkeysWebTargetManager::GenerateNodeNameL() 3 >" );
-
-    TInt length = aText.Length();
-
-    RDEBUG_2( "CIdleSoftkeysWebTargetManager::GenerateNodeNameL() 3 About to ALLOC %d bytes.", length );
-
-    HBufC8* targetName = HBufC8::NewL( length );
-
-    RDEBUG_2("CIdleSoftkeysWebTargetManager::GenerateNodeNameL() 3 ALLOC HBufC8 targetName %x", targetName );
-
-    TPtr8 ptr( targetName->Des() );
-
-    ptr.Copy( aText );
-
-    RDEBUG8_2( "CIdleSoftkeysWebTargetManager::GenerateNodeNameL() 3 < %S", &targetName );
-    return targetName;
-    }
-
-// -------------------------------------------------------------------------------------
-// CIdleSoftkeysWebTargetManager::RenameL
-// -------------------------------------------------------------------------------------
-TInt CIdleSoftkeysWebTargetManager::RenameL( const TDesC8& aURI, const TDesC8& /*aLUID*/,
-                                   const TDesC8& aNewURI )
-    {
-    RDEBUG( "CIdleSoftkeysWebTargetManager::RenameL() >" );
-
-    HBufC8* dataH = HBufC8::NewLC( KRepositoryEntryMaxLength );
-    RDEBUG_2( "CIdleSoftkeysWebTargetManager::RenameL() HBufC8 dataH ALLOC %x", dataH);
-
-    TPtr8 data( dataH->Des() );
-    TInt index = -1;
-    TInt retVal = KErrNone;
-
-// OPTION 1: URI is already new one, find old according to LUID
-#ifdef NOT_DEFINED
-
-    // If we find some URI with that LUID ...
-    if( ((KErrNone != FindLUIDByURIL( aURI, data, index ))) &&
-         (KErrNone == FindURIByLUIDL( data, aLUID, index )) && (index != -1)  )
-    
-        {
-        // ... we replace that URI with new one
-        UpdateLUIDDatabaseL( aURI, aLUID, index );
-        }
-    else
-        {
-        retVal = KErrNotFound;
-        }
-
-// OPTION 2: New (complete) URI is found in the argument
-#else
-
-    TInt index2 = -1;
-    if ( (KErrNone != FindLUIDByURIL( aNewURI, data, index )) &&
-         (KErrNone == FindLUIDByURIL( aURI, data,  index2 )) 
-         )
-        {
-        UpdateLUIDDatabaseL( aNewURI, data, index2 );
-        }
-    else
-        {
-        retVal = KErrNotFound;
-        }
-
-#endif
-
-    CleanupStack::PopAndDestroy( dataH );
-
-    RDEBUG_2( "CIdleSoftkeysWebTargetManager::RenameL() < %d", retVal );
-    return retVal;
-    }
-
-// -------------------------------------------------------------------------------------
-// CIdleSoftkeysWebTargetManager::GetTargetFromNodeNameL
-// -------------------------------------------------------------------------------------
-TInt CIdleSoftkeysWebTargetManager::GetTargetFromNodeNameL(const TDesC8& aURI, TInt &aIndex )
-    {
-    RDEBUG( "CIdleSoftkeysWebTargetManager::GetTargetFromNodeNameL() >" );
-	__UHEAP_MARK;
-    CSmlDmAdapter::TError status = CSmlDmAdapter::EOk;
-    TInt index = -1;
-    TInt compareLen = KPrefixWebTargetNodeName().Length();
-    TPtrC8 nodeName = NSmlDmURI::URISeg(aURI, 3);
-
-    HBufC8* dataH = HBufC8::NewLC( KRepositoryEntryMaxLength );
-    RDEBUG_2( "CIdleSoftkeysWebTargetManager::GetTargetFromNodeNameL() HBufC8 dataH ALLOC %x", dataH);
-    TPtr8 data( dataH->Des() );
-
-    if( NSmlDmURI::NumOfURISegs( aURI ) >= 4 )
-        {
-        TInt bmIndex = -1;
-        HBufC8* targetName = NULL;
-        if( KErrNone == FindLUIDByURIL( NSmlDmURI::URISeg(aURI, 0, 4), data, bmIndex ) )
-            {
-            targetName = GenerateNodeNameL( NSmlDmURI::LastURISeg(aURI) );
-            }
-        else
-            {
-            status = CSmlDmAdapter::EError;
-            }
-
-        if( CSmlDmAdapter::EOk == status )
-            {
-            CleanupStack::PushL( targetName );
-            TPtrC8 ptr( NSmlDmURI::LastURISeg(*targetName) );
-            if( ptr == nodeName )
-                {
-                aIndex = index;
-                }
-            CleanupStack::PopAndDestroy( targetName );
-            }
-        }
-    else
-        {
-        status = CSmlDmAdapter::EError;
-        }
-
-    CleanupStack::PopAndDestroy( dataH );
-	__UHEAP_MARKEND;
-    RDEBUG_2( "CIdleSoftkeysWebTargetManager::GetTargetFromNodeNameL() < %d", (TInt)status );
-    return status;
-    }
-
-// -------------------------------------------------------------------------------------
-// CIdleSoftkeysWebTargetManager::GetTargetFromNodeNameL
-// -------------------------------------------------------------------------------------
-TInt CIdleSoftkeysWebTargetManager::GetTargetFromNodeNameL(const TDesC8& aURI, CFavouritesItem &aItem, TInt &aIndex )
-    {
-    RDEBUG( "CIdleSoftkeysWebTargetManager::GetTargetFromNodeNameL() >" );
-
-    CSmlDmAdapter::TError status = CSmlDmAdapter::EOk;
-    TInt bmIndex = -1;
-    TInt bmUid = -1;
-    TInt compareLen = KPrefixWebTargetNodeName().Length();
-    TPtrC8 nodeName = NSmlDmURI::URISeg(aURI, 3);
-
-    HBufC8* dataH = HBufC8::NewLC( KRepositoryEntryMaxLength );
-    RDEBUG_2( "CIdleSoftkeysWebTargetManager::GetTargetFromNodeNameL() HBufC8 dataH ALLOC %x", dataH);
-    TPtr8 data( dataH->Des() );
-
-    if( NSmlDmURI::NumOfURISegs( aURI ) >= 4 )
-        {
-        TInt repIndex = -1;
-        HBufC8* targetName = NULL;
-        if( KErrNone == FindLUIDByURIL( NSmlDmURI::URISeg(aURI, 0, 4), data, repIndex ) )
-            {
-            targetName = GenerateNodeNameL( nodeName );
-            CleanupStack::PushL( targetName );
-            TPtrC8 ptr( NSmlDmURI::LastURISeg(*targetName) );
-            User::LeaveIfError( ptr == nodeName ? KErrNone : KErrGeneral );
-            CleanupStack::PopAndDestroy( targetName );
-
-            TLex8 lex;
-            lex.Assign(data);
-            User::LeaveIfError( lex.Val( bmUid ) );
-            TInt ret = KErrNone;
-           	if(iUiSettingsNotInitialized)
-   			{	
-   				iUiSettings = CUiSettingsUtil::NewL( );
-   				iUiSettings->ReadBookmarksL();
-   				iUiSettingsNotInitialized = EFalse;
-   			}
-           	User::LeaveIfError(iUiSettings->GetWebTargetIndex(bmUid,bmIndex));
-            if( -1 == bmIndex )
-                {
-                ret = KErrNotFound;
-                }
-            if( KErrNotFound == ret )
-                {
-                User::LeaveIfError(iUiSettings->GetWebTargetIndex(bmUid, bmIndex));                
-                }
-            else
-                {
-                User::LeaveIfError( ret );
-                }
-            }
-        else
-            {
-            status = CSmlDmAdapter::EError;
-            }
-
-        if( CSmlDmAdapter::EOk == status )
-            {
-            if( KErrNone == iFavDb.Get( bmUid, aItem ) )
-                {
-                aIndex = bmIndex;
-                }
-            else
-                {
-                status = CSmlDmAdapter::EError;
-                }
-            }
-        }
-    else
-        {
-        status = CSmlDmAdapter::EError;
-        }
-
-    CleanupStack::PopAndDestroy( dataH );
-
-    RDEBUG_2( "CIdleSoftkeysWebTargetManager::GetTargetFromNodeNameL() < %d", (TInt)status );
-    return status;
-    }
-
-// -------------------------------------------------------------------------------------
-// CIdleSoftkeysWebTargetManager::PrepareItemL
-// -------------------------------------------------------------------------------------
-void CIdleSoftkeysWebTargetManager::PrepareItemL( const TDesC8& aURI, CFavouritesItem &aItem, TInt &aIndex )
-    {
-    RDEBUG( "CIdleSoftkeysWebTargetManager::PrepareItemL() >" );
-	CheckWebTargetsL();
-    TInt error = GetTargetFromNodeNameL( aURI, aItem, aIndex );
-    if( KErrNone != error )
-        {
-        RDEBUG_2( "CIdleSoftkeysWebTargetManager::PrepareItemL TError %d", error );
-        User::Leave( KErrNotFound );
-        }
-
-    RDEBUG( "CIdleSoftkeysWebTargetManager::PrepareItemL() <" );
-    }
-
-// -------------------------------------------------------------------------------------
-// CIdleSoftkeysWebTargetManager::ReleaseItemL
-// -------------------------------------------------------------------------------------
-void CIdleSoftkeysWebTargetManager::ReleaseItemL( CFavouritesItem &aItem, TBool aUpdate/*=ETrue*/ )
-    {
-    if( aUpdate )
-        {
-        User::LeaveIfError( iFavDb.Update( aItem, aItem.Uid(), ETrue ) );
-        }
-    }
-
-// -------------------------------------------------------------------------------------
-// CIdleSoftkeysWebTargetManager::SetCaptionL
-// -------------------------------------------------------------------------------------
-void CIdleSoftkeysWebTargetManager::SetCaptionL( const TDesC8& aURI, const TDesC8& aCaption )
-    {
-    RDEBUG( "CIdleSoftkeysWebTargetManager::SetCaptionL() >" );
-
-    TInt index;
-
-    CFavouritesItem *favItem = CFavouritesItem::NewLC();
-    RDEBUG_2( "CIdleSoftkeysWebTargetManager::SetCaptionL() CFavouritesItem ALLOC %x", favItem);
-
-    HBufC* newCaption = CTARMCharConv::ConvertFromUtf8LC( aCaption );
-
-    PrepareItemL( aURI, *favItem, index );
-    favItem->SetNameL( *newCaption );
-    if( favItem->Name().Compare( *newCaption ) != 0 )
-        {
-        User::Leave( KErrGeneral );
-        }
-    ReleaseItemL( *favItem );
-
-    CleanupStack::PopAndDestroy( newCaption );
-    CleanupStack::PopAndDestroy( favItem );
-
-    RDEBUG( "CIdleSoftkeysWebTargetManager::SetCaptionL() <" );
-    }
-
-// -------------------------------------------------------------------------------------
-// CIdleSoftkeysWebTargetManager::FindWapApL
-// -------------------------------------------------------------------------------------
-void CIdleSoftkeysWebTargetManager::FindWapApL( const TDesC8& aURI, TInt &aWapAp )
-    {
-    TPtrC8  apURI     = NSmlDmURI::RemoveDotSlash( aURI );
-    TInt    numOfSegs = NSmlDmURI::NumOfURISegs( apURI );
-    TPtrC8I seg1      = NSmlDmURI::URISeg( apURI, 0 );
-    TInt    value     = 0;
-
-    if( (numOfSegs == 2) && (seg1.Compare( _L8("AP") ) == 0) )
-        {
-        HBufC8* buf = iCallBack->GetLuidAllocL( apURI );
-        CleanupStack::PushL( buf );
-        if( buf->Des().Length() == 0 )
-            {
-            CleanupStack::PopAndDestroy( buf );
-            buf = iCallBack->GetLuidAllocL( aURI );
-            CleanupStack::PushL( buf );
-            if( buf->Des().Length() == 0 )
-                {
-                CleanupStack::PopAndDestroy( buf );
-                User::Leave( KErrNotFound );
-                }
-            }
-
-        TLex8 lex;
-        lex.Assign( buf->Des() );
-        User::LeaveIfError( lex.Val( value ) );
-        CleanupStack::PopAndDestroy( buf );
-        }
-    else
-        {
-        User::Leave( KErrArgument );
-        }
-
-    aWapAp = value;
-    }
-
-
-// -------------------------------------------------------------------------------------
-// CIdleSoftkeysWebTargetManager::UpdateLUIDDatabaseL
-// -------------------------------------------------------------------------------------
-TInt CIdleSoftkeysWebTargetManager::UpdateLUIDDatabaseL(const TDesC8& aURI, const TDesC8& aLUID, TInt &aIndex)
-    {
-    RDEBUG( "CIdleSoftkeysWebTargetManager::UpdateLUIDDatabaseL() >" );
-
-    TInt ret = KErrGeneral;
-
-    CRepository* rep = CRepository::NewLC( KNSmlDMISAdapterCentRepUid );
-    RDEBUG_2( "CIdleSoftkeysWebTargetManager::UpdateLUIDDatabaseL() CRepository ALLOC %x", rep);
-
-    HBufC8* data = HBufC8::NewLC( aURI.Length() + aLUID.Length() + 1 );
-    RDEBUG_2( "CIdleSoftkeysWebTargetManager::UpdateLUIDDatabaseL() HBufC8 ALLOC data %x", data);
-    TPtr8 dataPtr( data->Des() );
-
-    dataPtr.Copy(aURI);
-    dataPtr.Append(TChar(' '));
-    dataPtr.Append(aLUID);
-
-    TInt count = 0;
-
-    // Get / create the count
-    //
-    ret = rep->Get((TUint32)KRepositoryIdBookmarkCount, count);
-    if( ret == KErrNotFound )
-        {
-        ret = rep->Create((TUint32)KRepositoryIdBookmarkCount, count);
-        }
-
-    if( KErrNone == ret )
-        {
-        // Replace old or ...
-        //
-        if( aIndex != -1 )
-            {
-            ret = rep->Set(aIndex, dataPtr );
-            }
-        else
-        // ... Create new index
-        //
-            {
-            TUint32 newIndex = (TUint32)KRepositoryIdBookmarkFirst + count;
-
-            ret = rep->Create(newIndex, dataPtr);
-            if(KErrAlreadyExists == ret)
-                {
-                ret = rep->Set(newIndex, dataPtr);
-                }
-            
-            if( KErrNone == ret )
-                {
-                HBufC8* check = HBufC8::NewLC( dataPtr.Length() );
-                RDEBUG_2( "CIdleSoftkeysWebTargetManager::UpdateLUIDDatabaseL() HBufC8 ALLOC check %x", check);
-                TPtr8 checkPtr( check->Des() );
-
-                User::LeaveIfError( rep->Get(newIndex, checkPtr ) );
-                User::LeaveIfError( (dataPtr.Compare( checkPtr )==0)?KErrNone:KErrGeneral );
-                aIndex = newIndex;
-
-                CleanupStack::PopAndDestroy( check );
-
-                rep->Set((TUint32)KRepositoryIdBookmarkCount, count+1 );
-                }
-            }
-        }
-
-    CleanupStack::PopAndDestroy( data );
-    CleanupStack::PopAndDestroy( rep );
-
-    RDEBUG_2( "CIdleSoftkeysWebTargetManager::UpdateLUIDDatabaseL() returns %d<", ret );
-    if(ret == KErrNone && !iUiSettingsNotInitialized)
-   	{
-   		iUiSettings->ReadBookmarksL();   		
-   	}
-    return ret;
-    }
-
-// -------------------------------------------------------------------------------------
-// CIdleSoftkeysWebTargetManager::CheckLUIDDatabaseL
-// -------------------------------------------------------------------------------------
-TInt CIdleSoftkeysWebTargetManager::CheckLUIDDatabaseL( TBool aCleanDatabase/*=ETrue*/ )
-    {
-    RDEBUG( "CIdleSoftkeysWebTargetManager::CheckLUIDDatabaseL() >" );
-
-    TInt i;
-    TInt j;
-    TInt ret = KErrNone;
-    TUint32 repIndex, repIndex2;
-    TInt strIndex;
-    TLex8 lex;
-	
-	if(iUiSettingsNotInitialized)
-   	{
-   		iUiSettings = CUiSettingsUtil::NewL( );
-		iUiSettings->ReadBookmarksL();   		
-		iUiSettingsNotInitialized = EFalse;
-   	}
-   	else
-   	{
-   		iUiSettings->ReadBookmarksL();
-   	}
-	
-    CRepository* rep = CRepository::NewLC( KNSmlDMISAdapterCentRepUid );
-    RDEBUG_2( "CIdleSoftkeysWebTargetManager::CheckLUIDDatabaseL() CRepository ALLOC %x", rep);
-
-    HBufC8* repDataH = HBufC8::NewLC( KRepositoryEntryMaxLength );
-    RDEBUG_2("CIdleSoftkeysWebTargetManager::CheckLUIDDatabaseL() HBufC8 repDataH ALLOC %x", repDataH);
-    TPtr8 repData( repDataH->Des() );
-
-    HBufC8* repData2H = HBufC8::NewLC( KRepositoryEntryMaxLength );
-    RDEBUG_2( "CIdleSoftkeysWebTargetManager::CheckLUIDDatabaseL() HBufC8 repData2H ALLOC %x", repData2H);
-    TPtr8 repData2( repData2H->Des() );
-
-    TInt count = 0;
-    ret = rep->Get((TUint32)KRepositoryIdBookmarkCount, count);
-
-    if( KErrNone == ret )
-        {
-        // DEBUG TEST S
-#ifdef __WINS__
-        for( i=0; i<count; i++ )
-            {
-            repIndex = (TUint32)i + KRepositoryIdBookmarkFirst;
-            ret = rep->Get(repIndex, repData);
-            if( KErrNone != ret )
-                {
-                User::Panic(_L("IS_DEBUG"), 1);
-                }
-
-            strIndex = repData.Find( _L8(" ") );
-            if( strIndex < 1 )
-                {
-                User::Panic(_L("IS_DEBUG"), 2);
-                }
-
-            TInt theLuid, bmIndex = -1;
-            lex.Assign( repData );
-            lex.Inc( strIndex );
-
-            TChar ch = lex.Get( );
-            if( ch != TChar(' ') )
-                {
-                User::Panic(_L("IS_DEBUG"), 3);
-                }
-            if( KErrNone != lex.Val( theLuid ) )
-                {
-                User::Panic(_L("IS_DEBUG"), 4);
-                }
-            if( theLuid < 0 )
-                {
-                User::Panic(_L("IS_DEBUG"), 5);
-                }
-            
-            if( (KErrNone != iUiSettings->GetWebTargetIndex(theLuid, bmIndex) /*iUiSrv.GetShortcutTargetIndex( EUiSrvRtTypeBm, theLuid, bmIndex )*/ ) ||
-                (bmIndex == -1) )
-                {
-                RDEBUG( "CIdleSoftkeysWebTargetManager::CheckLUIDDatabaseL(): WARNING Non-existent BM-UID in IsAdapter!" );
-                }
-            
-            if( (NSmlDmURI::NumOfURISegs( repData.Left(strIndex) ) != 4) ||
-                (NSmlDmURI::URISeg( repData, 0 ) != KNSmlCustomizationNodeName()) ||
-                (NSmlDmURI::URISeg( repData, 1 ) != KNSmlIS_IdleSoftKeyNodeName()) ||
-                (NSmlDmURI::URISeg( repData, 2 ) != KNSmlIS_WebTargetsNodeName())
-                )
-                {
-                User::Panic(_L("IS_DEBUG"), 6);
-                }
-            }
-
-        for( i=0; i<count-1; i++ )
-            {
-            repIndex = (TUint32)i + KRepositoryIdBookmarkFirst;
-            rep->Get(repIndex, repData);
-            strIndex = repData.Find( _L8(" ") );
-            lex.Assign( repData );
-            lex.Inc( strIndex ); lex.Inc( 1 );
-            TInt theLuid;
-            lex.Val( theLuid );
-            for( j=i+1; j<count; j++ )
-                {
-                TInt strIndex2;
-                repIndex2 = (TUint32)j + KRepositoryIdBookmarkFirst;
-                rep->Get(repIndex2, repData2);
-                strIndex2 = repData2.Find( _L8(" ") );
-                lex.Assign( repData2 );
-                lex.Inc( strIndex2 ); lex.Inc( 1 );
-                TInt theLuid2;
-                lex.Val( theLuid2 );
-
-                if( repData.Left( strIndex+1 ).Compare( repData2.Left( strIndex+1 ) ) == 0 )
-                    {
-                    User::Panic(_L("IS_DEBUG"), 7);
-                    }
-                if( theLuid == theLuid2 )
-                    {
-                    User::Panic(_L("IS_DEBUG"), 8);
-                    }
-                }
-            }
-#endif
-        // DEBUG TEST E
-
-        for( i=0; i<count; i++ )
-            {
-            repIndex = (TUint32)i + KRepositoryIdBookmarkFirst;
-
-            ret = rep->Get(repIndex, repData);
-            if( KErrNone == ret )
-                {
-                    strIndex = repData.Find( _L8(" ") );
-                    if( strIndex > 0 )
-                        {
-                        TInt theLuid, bmIndex = -1;
-                        lex.Assign( repData );
-                        lex.Inc( strIndex+1 );
-                        if( KErrNone == lex.Val( theLuid ) )
-                            {
-                            if( theLuid < 0 )
-                                {
-                                rep->Set( repIndex, KNullDesC() );
-                                }
-                            
-                            if( (KErrNone != iUiSettings->GetWebTargetIndex(theLuid, bmIndex) /*iUiSrv.GetShortcutTargetIndex( EUiSrvRtTypeBm, theLuid, bmIndex )*/ ) ||
-                                (bmIndex == -1) )
-                                {
-                                TBool exists = EFalse;
-                                iFavDb.ItemExists( theLuid, exists );
-                                if( !exists )
-                                    {
-                                    if( aCleanDatabase )
-                                        {
-                                        rep->Set( repIndex, KNullDesC() );
-                                        RDEBUG( "CIdleSoftkeysWebTargetManager::CheckLUIDDatabaseL(): WARNING Removing invalid WebTarget LUID mapping" );
-                                        }
-                                    else
-                                        {
-                                        RDEBUG( "CIdleSoftkeysWebTargetManager::CheckLUIDDatabaseL(): WARNING Invalid WebTarget LUID" );
-                                        }
-                                    }
-                                }
-                                
-                            }
-                        if( (NSmlDmURI::NumOfURISegs( repData.Left(strIndex) ) != 4) ||
-                            (NSmlDmURI::URISeg( repData, 0 ).Compare( KNSmlCustomizationNodeName() ) != 0) ||
-                            (NSmlDmURI::URISeg( repData, 1 ).Compare( KNSmlIS_IdleSoftKeyNodeName() ) != 0) ||
-                            (NSmlDmURI::URISeg( repData, 2 ).Compare( KNSmlIS_WebTargetsNodeName() ) != 0)
-                            )
-                            {
-                            rep->Set( repIndex, KNullDesC() );
-                            RDEBUG( "CIdleSoftkeysWebTargetManager::CheckLUIDDatabaseL(): WARNING Invalid WebTarget URI" );
-                            }
-                        }
-                }
-            }
-        }
-
-    // Get rid of empty entries and update count
-    count = 0;
-    ret = rep->Get((TUint32)KRepositoryIdBookmarkCount, count);
-    TInt oldcount = count;
-    TInt newcount = count;
-	RArray<TInt32> remList;
-	CleanupClosePushL(remList);
-    if( KErrNone == ret )
-        {
-        for( i=0; i<count; i++ )
-            {
-            repIndex = (TUint32)i + KRepositoryIdBookmarkFirst;
-
-            ret = rep->Get(repIndex, repData);
-            if( KErrNone == ret )
-                {
-                if( repData.Length() == 0 )
-                    {
-                    for( j=count; j>i+1; j-- )
-                        {
-                        repIndex2 = (TUint32)j-1 + KRepositoryIdBookmarkFirst;
-                        ret = rep->Get(repIndex2, repData2);
-                        if( (KErrNone == ret) && (repData2.Length() > 0) )
-                            {
-                            repData.Copy(repData2);
-                            repData2.Zero();
-                            ret = rep->Set(repIndex, repData);
-                            ret = rep->Set(repIndex2, repData2);
-                            newcount --;
-                            remList.Append(j);
-                            break;
-                            }
-                        }
-                    if( j == i+1 && remList.Find(j) == KErrNotFound)
-                        {
-                        // Did not find a replacement, just delete the entry
-                        newcount --;
-                        }
-                    }
-                }
-            }
-        ret = rep->Set((TUint32)KRepositoryIdBookmarkCount, newcount);
-        
-        for(i=newcount; i<oldcount; i++)
-            {
-            repIndex = (TUint32)i + KRepositoryIdBookmarkFirst;
-            ret = rep->Delete( repIndex );
-            }
-
-        for(i=0; i<newcount; i++)
-            {
-            TUint32 repIndex = (TUint32)i + KRepositoryIdBookmarkFirst;
-            ret = rep->Get( repIndex, repData );
-            if( (KErrNone != ret) || (repData.Length() == 0) )
-                {
-                count = i;
-                ret = rep->Set((TUint32)KRepositoryIdBookmarkCount, count);
-                break;
-                }
-            }
-        }
-    CleanupStack::PopAndDestroy(&remList);
-    CleanupStack::PopAndDestroy( repData2H );
-    CleanupStack::PopAndDestroy( repDataH );
-    CleanupStack::PopAndDestroy( rep );
-
-    RDEBUG_2( "CIdleSoftkeysWebTargetManager::CheckLUIDDatabaseL() returns %d<", ret );
-    //iUiSettings->ReadBookmarksL();
-    return ret;
-    }
-
-// -------------------------------------------------------------------------------------
-// CIdleSoftkeysWebTargetManager::FindLUIDByURIL
-// -------------------------------------------------------------------------------------
-TInt CIdleSoftkeysWebTargetManager::FindLUIDByURIL(const TDesC8& aURI, TDes8& aLUID, TInt &aIndex)
-    {
-    RDEBUG8_2( "CIdleSoftkeysWebTargetManager::FindLUIDByURIL() > URI=%S", &aURI );
-
-    TInt ret = KErrGeneral;
-
-    CRepository* rep = CRepository::NewLC( KNSmlDMISAdapterCentRepUid );
-    RDEBUG_2( "CIdleSoftkeysWebTargetManager::FindLUIDByURIL() CRepository ALLOC %x", rep);
-
-    HBufC8* repDataH = HBufC8::NewLC( KRepositoryEntryMaxLength );
-    RDEBUG_2("CIdleSoftkeysWebTargetManager::FindLUIDByURIL() HBufC8 repDataH ALLOC %x", repDataH);
-    TPtr8 repData( repDataH->Des() );
-
-    TInt count;
-
-    ret = rep->Get((TUint32)KRepositoryIdBookmarkCount, count);
-    if( KErrNone == ret )
-        {
-        RDEBUG("CIdleSoftkeysWebTargetManager::FindLUIDByURIL() rep->Get((TUint32)KRepositoryIdBookmarkCount");
-        TInt i;
-        for( i=0; i<count; i++ )
-            {
-            TUint32 repIndex = (TUint32)i + KRepositoryIdBookmarkFirst;
-
-            ret = rep->Get(repIndex, repData);
-            if( KErrNone == ret )
-                {
-                RDEBUG_2( "CIdleSoftkeysWebTargetManager::FindLUIDByURIL() rep->Get(repIndex, repData), repIndex=%d", repIndex);
-                RDEBUG8_2( "CIdleSoftkeysWebTargetManager::FindLUIDByURIL() rep->Get(repIndex, repData), repData=%S", &repData);
-                if(repData.Length() > aURI.Length())
-                    {
-                    if( repData.Left( aURI.Length() ).Compare( aURI ) == 0 )
-                        {
-                        RDEBUG( "CIdleSoftkeysWebTargetManager::FindLUIDByURIL(), lexical analysis starts" );
-                        TLex8 lex;
-                        lex.Assign( repData );
-                        lex.Inc( aURI.Length() );
-                        TChar ch = lex.Get();
-                        RDEBUG( "CIdleSoftkeysWebTargetManager::FindLUIDByURIL(), lexical analysis more" );
-                        if( ch == TChar(' ') )
-                            {
-                            aLUID.Copy( lex.Remainder() );
-                            aIndex = repIndex;
-                            ret = KErrNone;
-                            RDEBUG( "CIdleSoftkeysWebTargetManager::FindLUIDByURIL(), lexical analysis OK." );
-                            break;
-                            }
-                        }
-                    }
-                }
-            }
-
-        if( i==count )
-            {
-            ret = KErrNotFound;
-            }
-        }
-
-    CleanupStack::PopAndDestroy( repDataH );
-    CleanupStack::PopAndDestroy( rep );
-
-    RDEBUG_2( "CIdleSoftkeysWebTargetManager::FindLUIDByURIL() < %d", ret );
-    return ret;
-    }
-
-// -------------------------------------------------------------------------------------
-// CIdleSoftkeysWebTargetManager::FindURIByLUIDL
-// -------------------------------------------------------------------------------------
-TInt CIdleSoftkeysWebTargetManager::FindURIByLUIDL(TDes8& aURI, const TDesC8& aLUID, TInt &aIndex)
-    {
-    RDEBUG( "CIdleSoftkeysWebTargetManager::FindURIByLUIDL() >" );
-
-    TInt ret = KErrGeneral;
-
-    CRepository* rep = CRepository::NewLC( KNSmlDMISAdapterCentRepUid );
-    RDEBUG_2( "CIdleSoftkeysWebTargetManager::FindURIByLUIDL() CRepository ALLOC %x", rep);
-
-    HBufC8* repDataH = HBufC8::NewLC( KRepositoryEntryMaxLength );
-    RDEBUG_2( "CIdleSoftkeysWebTargetManager::FindURIByLUIDL() HBufC8 repDataH ALLOC %x", repDataH);
-    TPtr8 repData( repDataH->Des() );
-
-    HBufC8* verifyDataH = HBufC8::NewLC( KRepositoryEntryMaxLength );
-    RDEBUG_2( "CIdleSoftkeysWebTargetManager::FindURIByLUIDL() HBufC8 verifyDataH ALLOC %x", verifyDataH);
-    TPtr8 verifyData( verifyDataH->Des() );
-
-    TInt count;
-
-    ret = rep->Get((TUint32)KRepositoryIdBookmarkCount, count);
-    if( KErrNone == ret )
-        {
-        TInt i;
-        for( i=0; i<count; i++ )
-            {
-            TUint32 repIndex = (TUint32)i + KRepositoryIdBookmarkFirst;
-
-            ret = rep->Get(repIndex, repData);
-            if( KErrNone == ret )
-                {
-                if(repData.Length() > aLUID.Length())
-                    {
-                    TInt strIndex = repData.Find( aLUID );
-
-                    if( strIndex > 0 )
-                        {
-                        verifyData.Copy( repData.Left( strIndex ) );
-                        verifyData.Append( aLUID );
-
-                        if( verifyData.Compare( repData ) == 0 )
-                            {
-                            aURI.Copy( repData.Left( strIndex - 1 ) );
-                            aIndex = repIndex;
-                            ret = KErrNone;
-                            break;
-                            }
-                        }
-                    }
-                }
-            }
-        if( i==count )
-            {
-            ret = KErrNotFound;
-            }
-        }
-
-    CleanupStack::PopAndDestroy( verifyDataH );
-    CleanupStack::PopAndDestroy( repDataH );
-    CleanupStack::PopAndDestroy( rep );
-
-    RDEBUG_2( "CIdleSoftkeysWebTargetManager::FindURIByLUIDL() < %d", ret );
-    return ret;
-    }
-
-// End of file
--- a/customization/isadapter/src/UiSettingsUtil.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,847 +0,0 @@
-/*
-* 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:  DM Idle SoftKey Adapter
-*
-*/
-
-
-// s60
-#include <favouritesitemlist.h>
-#include <msvuids.h>
-#include <SenduiMtmUids.h>
-#include <javaregistryentrytype.h>
-#include <featmgr.h>
-#include <aiscutplugindomaincrkeys.h>
-
-#include "UiSettingsUtil.h"
-#include "IsAdapterLiterals.h"
-
-#include "debug.h"
-
-
-// ------------------------------------------------------------------------------------------------
-// CUiSettingsUtil* CUiSettingsUtil::NewL( )
-// ------------------------------------------------------------------------------------------------
-CUiSettingsUtil* CUiSettingsUtil::NewL( )
-    {
-    RDEBUG( "CUiSettingsUtil::NewL() >" );
-    CUiSettingsUtil* self = NewLC( );
-    CleanupStack::Pop();
-    RDEBUG( "CUiSettingsUtil::NewL() <" );
-    return self;
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CUiSettingsUtil* CUiSettingsUtil::NewLC( )
-// ------------------------------------------------------------------------------------------------
-CUiSettingsUtil* CUiSettingsUtil::NewLC( )
-    {
-    RDEBUG( "CUiSettingsUtil::NewLC() >" );
-    CUiSettingsUtil* self = new (ELeave) CUiSettingsUtil();
-    CleanupStack::PushL(self);
-    self->ConstructL();
-    RDEBUG( "CUiSettingsUtil::NewLC() <" );
-    return self;
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CUiSettingsUtil::CUiSettingsUtil()
-// ------------------------------------------------------------------------------------------------
-CUiSettingsUtil::CUiSettingsUtil()
-    {
-    RDEBUG( "CUiSettingsUtil::CUiSettingsUtil()" );
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CUiSettingsUtil::ConstructL
-// ------------------------------------------------------------------------------------------------
-void CUiSettingsUtil::ConstructL()
-    {
-    RDEBUG( "CUiSettingsUtil::ConstructL() >" );
-
-	FeatureManager::InitializeLibL();
-	
-/*	ReadAppTargetsL();
-	ReadJavaTargetsL();	
-	ReadMailBoxesL();
-	ReadBookmarksL();
-	ReadStaticAppTargetsL();*/
-	
-    
-    RDEBUG( "CIsAdapter::ConstructL() <" );
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CUiSettingsUtil::~CUiSettingsUtil()
-// ------------------------------------------------------------------------------------------------
-CUiSettingsUtil::~CUiSettingsUtil()
-    {
-    RDEBUG( "CUiSettingsUtil::~CUiSettingsUtil() >" );
-	
-	if(iListItems.Count())
-		iListItems.ResetAndDestroy();
-	
-	if(iJaveUids.Count())
-		iJaveUids.Reset();
-		
-	if(iMailBoxes)
-	{
-		iMailBoxes->Reset();
-		delete iMailBoxes;		
-	}
-	
-	if(iStaticAppParam)
-	{
-		iStaticAppParam->Reset();
-		delete iStaticAppParam;	
-	}
-	
-	if(iStaticAppCaption)
-	{
-		iStaticAppCaption->Reset();
-		delete iStaticAppCaption;		
-	}
-	
-	if(iFavList)
-	{
-		delete iFavList;
-	}
-    
-    FeatureManager::UnInitializeLib();
-    
-    RDEBUG( "CUiSettingsUtil::~CUiSettingsUtil() <" );
-    }
-   
-// ------------------------------------------------------------------------------------------------
-// CUiSettingsUtil::GetShortcutRtType
-// ------------------------------------------------------------------------------------------------
-  
-void CUiSettingsUtil::GetShortcutRtTypeL(TInt aUid, TInt &aRtType)
-{	
-	RDEBUG( "CUiSettingsUtil::GetShortcutRtTypeL() >" );
-	aRtType = 1;	
-    TBuf16<256> KeyValue;
-    GetKeyValueL(aUid, KeyValue);
-  	TInt temp = KeyValue.FindF(KBookmarkText); 
-	if(temp==KErrNotFound)
-		aRtType = 0;
-	RDEBUG( "CUiSettingsUtil::GetShortcutRtTypeL() <" );
-}
-
-// ------------------------------------------------------------------------------------------------
-// CUiSettingsUtil* CUiSettingsUtil::GetSoftkeyCountL( )
-// ------------------------------------------------------------------------------------------------
-
-TInt CUiSettingsUtil::GetSoftkeyCountL()
-{		
-	RDEBUG( "CUiSettingsUtil::GetSoftkeyCountL() >" );
-	TInt count;
-	CRepository *cenRep = CRepository::NewL(KCRUidShortcutItems);
-	RArray<TUint32> defaultThemeKeys;
-    CleanupClosePushL(defaultThemeKeys);
-    cenRep->FindL(KScutCenRepKeyThemeDefault, KScutCenRepKeyMask, defaultThemeKeys);
-    count = defaultThemeKeys.Count();
-    //default SoftKeys always return Active Idle softkeys
-    //total number of Softkeys = defalult + scroll (left,right,up,down,selection)
-    count = count + 5;
-    CleanupStack::PopAndDestroy(&defaultThemeKeys);
-    delete cenRep;    
-    RDEBUG( "CUiSettingsUtil::GetSoftkeyCountL() <" ); 
-    return count;       
-}
-
-// ------------------------------------------------------------------------------------------------
-// CUiSettingsUtil* CUiSettingsUtil::GetKeyValueL( )
-// ------------------------------------------------------------------------------------------------
-
-void CUiSettingsUtil::GetKeyValueL(TInt aUid, TDes16 &aKeyValue)
-{	
-	RDEBUG( "CUiSettingsUtil::GetKeyValueL() >" );
-		CRepository *cenRep = CRepository::NewL(KCRUidShortcutItems);
-    
-    RArray<TUint32> defaultThemeKeys;
-    CleanupClosePushL(defaultThemeKeys);
-
-    RArray<TUint32> userDefinedKeys;
-    CleanupClosePushL(userDefinedKeys);	
-    
-    cenRep->FindL(KScutCenRepKeyThemeDefault, KScutCenRepKeyMask, defaultThemeKeys);
-    cenRep->FindL(KScutCenRepKeyUserDefined, KScutCenRepKeyMask, userDefinedKeys);
-
-	TUint keyUid = aUid;
-	keyUid = keyUid | 0x80000000 ;
-    TUint defaultThemeKey;
-    TUint userDefinedKey;
-    TInt countThemeKey;
-    TInt countUserKey;
-	TBool isUserDefinedKey = EFalse;
-
-    countThemeKey = defaultThemeKeys.Count();
-    countUserKey = 	userDefinedKeys.Count();
-    TBuf16<256> KeyValue; 
- 
-//First retrive the UID of the softkey's application    
-    for (TInt i = 0; i < countUserKey; i++)
-    {
-        userDefinedKey = userDefinedKeys[i];
-        userDefinedKey = userDefinedKey | 0x80000000;
-        if (keyUid == userDefinedKey)
-        {
-        	isUserDefinedKey = ETrue;
-        	cenRep->Get(userDefinedKeys[i],KeyValue);
-        	break;
-        }
-    }
-    
-    if (!isUserDefinedKey)
-    {
-    	for (TInt i = 0; i < countThemeKey; i++)
-    	{
-        	defaultThemeKey = defaultThemeKeys[i];
-        	if (keyUid == defaultThemeKey)
-        	{
-        		cenRep->Get(defaultThemeKey,KeyValue);
-        		break;
-        	}
-    	}	
-    }	
-    aKeyValue = KeyValue;
-    delete cenRep;
-    CleanupStack::PopAndDestroy(&userDefinedKeys);
-    CleanupStack::PopAndDestroy(&defaultThemeKeys);
-    RDEBUG( "CUiSettingsUtil::GetKeyValueL() <" );    
-}
-
-// ------------------------------------------------------------------------------------------------
-// CUiSettingsUtil::GetShortcutTargetIndex()
-// ------------------------------------------------------------------------------------------------
-  
-TInt CUiSettingsUtil::GetShortcutTargetIndexL(TInt aUid, TInt& aIndex) 
-{	
-	RDEBUG( "CUiSettingsUtil::GetShortcutTargetIndexL() >" );
-	TInt index;
-    TBuf16<256> KeyValue;
-    GetKeyValueL(aUid, KeyValue);
-    if(GetStaticAppIndex(KeyValue, index))
-    {
-    	aIndex=index + iListItems.Count() + iJaveUids.Count() + iMailBoxes->Count();
-    	return KErrNone;
-    }
-    TInt FindBm = KeyValue.FindF(KBookmarkText);
-    if (FindBm==KErrNotFound)
-    {    	    	
-    	TInt FindMB = KeyValue.FindF(KMailBoxText);
-   	    if (FindMB==KErrNotFound)
-   	    {
-   	       	TInt FindApp = KeyValue.FindF(KAppText); 
-			KeyValue.Delete(0, KAppText().Length());
-
-			TLex16 lex(KeyValue);
-			TInt64 value;
-			lex.Val(value, EHex);
-		
-			TUid ApplicationUid = { value };
-			
-    		if(GetAppIndexToUID(ApplicationUid, index))	
-    		{
-    			aIndex = index;
-    		}
-    		else
-			{
-				aIndex = -1;
-				return KErrArgument;
-			}	
-   	    }
-   	    else 
-   	    {
-   	    	KeyValue.Delete(0, KMailBoxText().Length());
-   	    	if( GetMailBoxTargetIndex(KeyValue, index))
-   	    	{
-   	    		aIndex = index + iListItems.Count() + iJaveUids.Count();
-   	    	}
-   	    	else
-   	    	{
-   	    		aIndex = -1;
-   	    		return KErrArgument;
-   	    	}	
-   	    }
-   	}
-    else
-    {
-    	KeyValue.Delete(0, KBookmarkText().Length());
-
-		TLex16 lex(KeyValue);
-		TInt64 value;
-		lex.Val(value, EHex);
-		
-		TInt WebUid = value ;
-		
-		if (GetWebTargetIndex( WebUid, index) == KErrNotFound)
-		{
-			aIndex = -1;
-			return KErrArgument;
-		}
-		else
-			aIndex = index;
-    }
-    RDEBUG( "CUiSettingsUtil::GetShortcutTargetIndexL() <" );
-    return KErrNone;            
-}
-
-// ------------------------------------------------------------------------------------------------
-// CUiSettingsUtil::GetAppTargetCaptionL()
-// ------------------------------------------------------------------------------------------------
-
-// Caption and description are the same. They are obtained from
-// RApaLsSession API by passing the application UID
-// ApplicationUID is obtained from the CentRep
-
-TInt CUiSettingsUtil::GetAppTargetCaptionL(TInt aIndex, TDes& aBufferCaption) 
-{		
-    RDEBUG( "CUiSettingsUtil::GetShortcutTargetCaptionL() >" );
-    TInt NoOfTargetApps = iListItems.Count();
-    TInt NoOfJavaApps = iJaveUids.Count();
-    TInt NoOfMailBoxes = iMailBoxes->Count();
-    TInt NoOfStaticApps = iStaticAppParam->Count();
-         
-    if(aIndex < NoOfTargetApps)
-    {
-		TApaAppInfo appInfo;
-		GetAppInfoAtIndex(aIndex, appInfo);
-	    aBufferCaption.Copy(appInfo.iCaption);        
-	}
-    else if ((aIndex - NoOfTargetApps) < NoOfJavaApps )
-    {
-      	CJavaRegistry* registry = CJavaRegistry::NewLC();
-		CJavaRegistryEntry* entry = 
-				registry->RegistryEntryL( iJaveUids[aIndex - NoOfTargetApps] );
-		CleanupStack::PushL(entry);
-   		const TDesC& name = entry->Name();
-   		aBufferCaption.Copy(name);
-   		CleanupStack::PopAndDestroy(entry);
-    	CleanupStack::PopAndDestroy(registry);		
-    }
-    else if((aIndex - NoOfTargetApps - NoOfJavaApps ) < NoOfMailBoxes)
-    {
-    	TInt index = aIndex - NoOfTargetApps - NoOfJavaApps;
-    	aBufferCaption = iMailBoxes->MdcaPoint(index);
-    }    
-    else if((aIndex - NoOfTargetApps - NoOfJavaApps - NoOfMailBoxes) < NoOfStaticApps)
-    {
-    	TInt index = aIndex - NoOfTargetApps - NoOfJavaApps - NoOfMailBoxes;
-    	aBufferCaption = iStaticAppCaption->MdcaPoint(index);
-    }
-    else
-    {
-    	return KErrArgument;
-    }
-    RDEBUG( "CUiSettingsUtil::GetShortcutTargetCaptionL() <" );
-    return KErrNone;    
-}
-
-// ------------------------------------------------------------------------------------------------
-// CUiSettingsUtil::SetShortcutTargetAppIndex()
-// ------------------------------------------------------------------------------------------------
-
-TInt CUiSettingsUtil::SetShortcutTargetAppIndexL( TInt aUid, TInt aIndex )
-{	
-	RDEBUG( "CUiSettingsUtil::SetShortcutTargetAppIndexL() >" );
-	TUint softkeyID = aUid;
-    
-	TBuf16<256> SetKeyValue;
-	TBuf16<10> appUid ;
-    
-    TInt NoOfTargetApps = iListItems.Count();
-    TInt NoOfJavaApps = iJaveUids.Count();
-    TInt NoOfMailBoxes = iMailBoxes->Count();
-    TInt NoOfStaticApps = iStaticAppParam->Count();
-            
-    CRepository *cenRep = CRepository::NewL(KCRUidShortcutItems);
-    TBool found = EFalse;
-    if (aIndex < NoOfTargetApps)
-    {
-    	TApaAppInfo appInfo;
-		found = GetAppInfoAtIndex(aIndex, appInfo);
-		appUid.Format(KFormat,appInfo.iUid);
-		SetKeyValue = KAppText;
-		SetKeyValue.Insert (SetKeyValue.Length(),appUid);	
-    }
-    else if ((aIndex - NoOfTargetApps) < NoOfJavaApps)
-    {
-    	CJavaRegistry* registry = CJavaRegistry::NewLC();
-    	CJavaRegistryEntry* entry = registry->RegistryEntryL( iJaveUids[aIndex - NoOfTargetApps] );
-    	CleanupStack::PushL(entry);
-    	const TDesC& name = entry->Name();
-       	found = ETrue;
-    	appUid.Format(KFormat,entry->Uid());
-    	CleanupStack::PopAndDestroy(entry);
-    	CleanupStack::PopAndDestroy(registry);
-    	SetKeyValue = KAppText;
-    	SetKeyValue.Insert (SetKeyValue.Length(),appUid);	
-    }
-    else if((aIndex - NoOfTargetApps - NoOfJavaApps) < NoOfMailBoxes)
-    {
-    	TInt index = aIndex - NoOfTargetApps - NoOfJavaApps;    
-    	SetKeyValue = KMailBoxText;
-    	SetKeyValue.Insert (SetKeyValue.Length(),iMailBoxes->MdcaPoint(index)); 
-    	found = ETrue;
-    }
-    else if((aIndex - NoOfTargetApps - NoOfJavaApps - NoOfMailBoxes) < NoOfStaticApps)
-    {
-    	TInt index = aIndex - NoOfTargetApps - NoOfJavaApps - NoOfMailBoxes;
-    	SetKeyValue.Insert (SetKeyValue.Length(),iStaticAppParam->MdcaPoint(index));
-    	found = ETrue;
-    }
-    else
-    {
-    	delete cenRep;
-    	return KErrArgument;
-    }
-    	
-	if (found)	
-	{				
-		cenRep->Set(softkeyID,SetKeyValue);
-	}
-	delete cenRep;	
-	RDEBUG( "CUiSettingsUtil::SetShortcutTargetAppIndexL() <" );
-	return KErrNone;
-}
-
-// ------------------------------------------------------------------------------------------------
-// CUiSettingsUtil* CUiSettingsUtil::GetAppInfoAtIndex( )
-// ------------------------------------------------------------------------------------------------
-
-TBool CUiSettingsUtil::GetAppInfoAtIndex(TInt aIndex, TApaAppInfo& aAppInfo )
-{	
-	RDEBUG( "CUiSettingsUtil::GetAppInfoAtIndex() >" );
-	aAppInfo = *iListItems[aIndex];
-	if(aIndex < iListItems.Count() )
-		return ETrue;
-	else
-		return EFalse;	
-}
-
-// ------------------------------------------------------------------------------------------------
-// CUiSettingsUtil* CUiSettingsUtil::GetAppIndexToUID( )
-// ------------------------------------------------------------------------------------------------
-
-TBool CUiSettingsUtil::GetAppIndexToUID(TUid aUID, TInt& aIndex )
-{
-	RDEBUG( "CUiSettingsUtil::GetAppIndexToUID() >" );
-	TBool found = EFalse;
-	for (TInt i=0; i < iListItems.Count() ; i++)
-	{
-	    if(iListItems[i]->iUid == aUID)
-        {	
-        	found = ETrue;
-        	aIndex = i;
-	    	break;	
-    	}
-    }
-    if(!found)
-    {
-    	for (TInt i=0; i < iJaveUids.Count() ; i++)
-		{
-	    	if(iJaveUids[i] == aUID)
-        	{	
-        		found = ETrue;
-        		aIndex = i + iListItems.Count();
-	    		break;	
-    		}
-    	}
-    }
-    RDEBUG( "CUiSettingsUtil::GetAppIndexToUID() <" );
-	return found;	
-}
-
-// ------------------------------------------------------------------------------------------------
-// CUiSettingsUtil* CUiSettingsUtil::GetMailBoxTargetIndex( )
-// ------------------------------------------------------------------------------------------------
-
-TBool CUiSettingsUtil::GetMailBoxTargetIndex(const TDesC& aName, TInt& aIndex )
-{
-	RDEBUG( "CUiSettingsUtil::GetMailBoxTargetIndex() >" );
-	TBool found = EFalse;
-	for (TInt i=0; i < iMailBoxes->Count() ; i++)
-	{
-	    if(aName.CompareF(iMailBoxes->MdcaPoint(i)) == 0 )
-        {	
-        	found = ETrue;
-        	aIndex = i;
-	    	break;	
-    	}
-    }
-    RDEBUG( "CUiSettingsUtil::GetMailBoxTargetIndex() <" );
-	return found;
-}
-
-// ------------------------------------------------------------------------------------------------
-// CUiSettingsUtil* CUiSettingsUtil::GetStaticAppIndex( )
-// ------------------------------------------------------------------------------------------------
-
-TBool CUiSettingsUtil::GetStaticAppIndex(const TDesC& aKeyValue, TInt& aIndex)
-{	
-	RDEBUG( "CUiSettingsUtil::GetStaticAppIndex() >" );
-	TBool found = EFalse;
-	for (TInt i=0; i < iStaticAppParam->Count() ; i++)
-	{
-	    if(aKeyValue.CompareF(iStaticAppParam->MdcaPoint(i)) == 0 )
-        {	
-        	found = ETrue;
-        	aIndex = i;
-	    	break;	
-    	}
-    }
-    RDEBUG( "CUiSettingsUtil::GetStaticAppIndex() <" );
-	return found;	
-}
-
-// ------------------------------------------------------------------------------------------------
-// CUiSettingsUtil* CUiSettingsUtil::ReadTargetsL( )
-// ------------------------------------------------------------------------------------------------
-
-void CUiSettingsUtil::ReadTargetsL()
-{
-	RDEBUG( "CUiSettingsUtil::ReadTargetsL() >" );
-	ReadAppTargetsL();
-	ReadJavaTargetsL();
-	ReadMailBoxesL();	
-	ReadStaticAppTargetsL();
-	RDEBUG( "CUiSettingsUtil::ReadTargetsL() <" );
-}
-
-// ------------------------------------------------------------------------------------------------
-// CUiSettingsUtil* CUiSettingsUtil::ReadAppTargetsL( )
-// ------------------------------------------------------------------------------------------------
-
-void CUiSettingsUtil::ReadAppTargetsL()
-{
-	RDEBUG( "CUiSettingsUtil::ReadAppTargetsL() >" );
-	RApaLsSession apaSession;
-	if ( apaSession.Handle() == KNullHandle )
-    {
-    	User::LeaveIfError( apaSession.Connect() );
-    }
-	       
-	TInt count_app =0 ;
-	if (apaSession.GetAllApps() == KErrNone)
-	{
-		TInt err = apaSession.AppCount(count_app);
-	}
-	iListItems.ReserveL(150);
-	for (TInt i=0; i < count_app ; i++)
-	{
-	    TApaAppInfo* appInfo = new (ELeave) TApaAppInfo;
-	    TInt err = apaSession.GetNextApp(*appInfo);
-   	    if (err == KErrNone)
-    	{
-		    TApaAppCapabilityBuf buf;
-   		    if (apaSession.GetAppCapability(buf, appInfo->iUid) == KErrNone &&
-       	       !buf().iAppIsHidden && !IsNonNativeL(appInfo->iUid) )
-        	{
-    	   		iListItems.Append(appInfo);	
-    	   	}
-    	   	else
-    	   	{
-    	   		delete appInfo;
-    	   	}
-       	}
-       	else
-       	{
-       		delete appInfo;	
-       	}
-	}
-	apaSession.Close();	
-	RDEBUG( "CUiSettingsUtil::ReadAppTargetsL() <" );
-}
-
-// ------------------------------------------------------------------------------------------------
-// CUiSettingsUtil* CUiSettingsUtil::ReadJavaTargetsL( )
-// ------------------------------------------------------------------------------------------------
-
-void CUiSettingsUtil::ReadJavaTargetsL()
-{
-	RDEBUG( "CUiSettingsUtil::ReadJavaTargetsL() >" );
-	CJavaRegistry* registry = CJavaRegistry::NewLC();
-
-    // get all uids stored in registry
-    RArray<TUid> uids;
-    CleanupClosePushL(uids);
-    registry->GetRegistryEntryUidsL( uids );
-	//TBool duplicate = EFalse ;
-	for(TInt i =0; i <uids.Count();i++)
-	{
-		CJavaRegistryEntry* entry = registry->RegistryEntryL( uids[i] );
-		CleanupStack::PushL(entry);
-		if(entry->Type() >= EGeneralApplication)
-		{
-			iJaveUids.Append(uids[i]);
-		}
-		CleanupStack::PopAndDestroy(entry);
-	}
-	CleanupStack::PopAndDestroy(&uids);
-	CleanupStack::PopAndDestroy(registry);	
-	RDEBUG( "CUiSettingsUtil::ReadJavaTargetsL() <" );
-}
-
-// ------------------------------------------------------------------------------------------------
-// CUiSettingsUtil* CUiSettingsUtil::ReadMailBoxesL( )
-// ------------------------------------------------------------------------------------------------
-
-void CUiSettingsUtil::ReadMailBoxesL()
-{
-	RDEBUG( "CUiSettingsUtil::ReadMailBoxesL() >" );
-	CMsvSession* msvSession = CMsvSession::OpenAsObserverL(*this);
-	iMailBoxes = new (ELeave) CDesCArrayFlat(1);
-    
-    CMsvEntry* rootEntry = msvSession->GetEntryL(KMsvRootIndexEntryIdValue);
-    CleanupStack::PushL(rootEntry);
-
-    for (TInt i = rootEntry->Count() - 1; i >= 0; --i)
-    {
-        const TMsvEntry& tentry = (*rootEntry)[i];
-
-        if (tentry.iMtm == KSenduiMtmImap4Uid || tentry.iMtm == KSenduiMtmPop3Uid)
-        {
-            iMailBoxes->AppendL(tentry.iDetails);
-        }
-    }
-	CleanupStack::PopAndDestroy(rootEntry);
-	delete msvSession;
-	RDEBUG( "CUiSettingsUtil::ReadMailBoxesL() <" );
-}
-
-// ------------------------------------------------------------------------------------------------
-// CUiSettingsUtil* CUiSettingsUtil::ReadStaticAppTargetsL( )
-// ------------------------------------------------------------------------------------------------
-
-void CUiSettingsUtil::ReadStaticAppTargetsL()
-{
-	RDEBUG( "CUiSettingsUtil::ReadStaticAppTargetsL() >" );
-	//add the code to read the static applications here
-	
-	iStaticAppParam = new (ELeave) CDesCArrayFlat(1);
-	iStaticAppCaption = new (ELeave) CDesCArrayFlat(1);
-	
-	iStaticAppParam->AppendL(KNewMsg());
-	iStaticAppCaption->AppendL(KNewMsgCaption());
-	
-	iStaticAppParam->AppendL(KNewEmail());
-	iStaticAppCaption->AppendL(KNewEmailCaption());
-	
-	#ifdef __SYNCML_DS_EMAIL
-		iStaticAppParam->AppendL(KNewSyncMLMail());
-		iStaticAppCaption->AppendL(KNewSyncMLMailCaption());
-	#endif	
-	
-	if (FeatureManager::FeatureSupported(KFeatureIdMmsPostcard))
-    {
-        // New Postcard item.
-        iStaticAppParam->AppendL(KNewMMS());
-		iStaticAppCaption->AppendL(KNewMMSCaption());
-    }
-
-    if (FeatureManager::FeatureSupported(KFeatureIdAudioMessaging))
-    {
-    	// New Audio Messaging
-    	iStaticAppParam->AppendL(KNewAudioMsg());
-		iStaticAppCaption->AppendL(KNewAudioMsgCaption());
-    }	
-    
-	iStaticAppParam->AppendL(KNewMsgType());
-	iStaticAppCaption->AppendL(KNewMsgTypeCaption());
-	
-	iStaticAppParam->AppendL(KChangeTheme());
-	iStaticAppCaption->AppendL(KChangeThemeCaption());		
-	RDEBUG( "CUiSettingsUtil::ReadStaticAppTargetsL() <" );
-}
-
-// ------------------------------------------------------------------------------------------------
-// CUiSettingsUtil* CUiSettingsUtil::IsNonNativeL( )
-// ------------------------------------------------------------------------------------------------
-
-TBool CUiSettingsUtil::IsNonNativeL(const TUid& aUid) const
-{
-    RDEBUG( "CUiSettingsUtil::IsNonNativeL() >" );
-    TBool ret = EFalse;
-
-    const TUid KMidletAppType = { 0x10210E26 };
-    TUid typeuid = KNullUid;
-	RApaLsSession apaSession;
-	if ( apaSession.Handle() == KNullHandle )
-	       {
-	       User::LeaveIfError( apaSession.Connect() );
-	       }
-    if (KErrNone == apaSession.GetAppType(typeuid, aUid))
-    {
-        if (typeuid == KMidletAppType)
-        {
-            ret = ETrue;
-        }
-    }
-    apaSession.Close();
-    RDEBUG( "CUiSettingsUtil::IsNonNativeL() <" );
-    return ret;
-}
-
-// ------------------------------------------------------------------------------------------------
-// CUiSettingsUtil* CUiSettingsUtil::GetNoOfTargetApps( )
-// ------------------------------------------------------------------------------------------------
-
-TInt CUiSettingsUtil::GetNoOfTargetApps()
-{
-	RDEBUG( "CUiSettingsUtil::GetNoOfTargetApps() >" );
-	return iListItems.Count() + iJaveUids.Count() + iMailBoxes->Count() + iStaticAppParam->Count();
-}
-
-// ------------------------------------------------------------------------------------------------
-// CUiSettingsUtil* CUiSettingsUtil::ReadBookmarksL( )
-// ------------------------------------------------------------------------------------------------
-
-void CUiSettingsUtil::ReadBookmarksL()
-{
-	RDEBUG( "CUiSettingsUtil::ReadBookmarksL() >" );
-	RFavouritesSession                  bmSess;
-    RFavouritesDb                       bmDb;
-	User::LeaveIfError(bmSess.Connect());
-    User::LeaveIfError(bmDb.Open(bmSess, KBrowserBookmarks));
-    if(iFavList)
-    {
-    	delete iFavList;
-    	iFavList = NULL;
-    }
-	iFavList = new (ELeave) CFavouritesItemList();
-    TInt err = bmDb.GetAll(*iFavList, KFavouritesNullUid, CFavouritesItem::EItem);
-    bmDb.Close();
-    bmSess.Close();
-    RDEBUG( "CUiSettingsUtil::ReadBookmarksL() <" );
-}
-
-// ------------------------------------------------------------------------------------------------
-// CUiSettingsUtil* CUiSettingsUtil::GetWebTargetsCount( )
-// ------------------------------------------------------------------------------------------------
-
-TInt CUiSettingsUtil::GetWebTargetsCount( TInt &aCount )
-{
-	RDEBUG( "CUiSettingsUtil::GetWebTargetAppUid() >" );
-	aCount = iFavList->Count();	
-	RDEBUG( "CUiSettingsUtil::GetWebTargetAppUid() <" );
-    return KErrNone;    
-}
-
-// ------------------------------------------------------------------------------------------------
-// CUiSettingsUtil* CUiSettingsUtil::GetWebTargetAppUid( )
-// ------------------------------------------------------------------------------------------------
-
-TInt CUiSettingsUtil::GetWebTargetAppUid( TInt aIndex, TInt& aUid )
-{
-    RDEBUG( "CUiSettingsUtil::GetWebTargetAppUid() >" );
-    CFavouritesItem* item;
-    if(aIndex>=0 && aIndex<iFavList->Count())
-	    item = iFavList->At(aIndex);
-    else
-    	return KErrArgument;
-    aUid  = item->Uid();
-    RDEBUG( "CUiSettingsUtil::GetWebTargetAppUid() <" );
-    return KErrNone;    
-}
-
-// ------------------------------------------------------------------------------------------------
-// CUiSettingsUtil* CUiSettingsUtil::GetWebTargetCaption( )
-// ------------------------------------------------------------------------------------------------
-
-TInt CUiSettingsUtil::GetWebTargetCaption( TInt aIndex, TDes& aCaption )
-{
-    RDEBUG( "CUiSettingsUtil::GetWebTargetCaption() >" );
-    CFavouritesItem* item;
-    if(aIndex>=0 && aIndex<iFavList->Count())
-   	   	item = iFavList->At(aIndex);
-    else
-    	return KErrArgument;
-    aCaption = 	item->Name();
-    RDEBUG( "CUiSettingsUtil::GetWebTargetCaption() <" );
-    return KErrNone;
-}
-
-// ------------------------------------------------------------------------------------------------
-// CUiSettingsUtil* CUiSettingsUtil::GetWebTargetIndex( )
-// ------------------------------------------------------------------------------------------------
-
-TInt CUiSettingsUtil::GetWebTargetIndex( TInt& aUid, TInt& aIndex)
-{
-	RDEBUG( "CUiSettingsUtil::GetWebTargetIndex() >" );
-	TBool found = EFalse;
-	TInt i;
-    for (i=0; i < iFavList->Count() ; i++)
-    {
-       	CFavouritesItem* item = iFavList->At(i);
-       	if(item->Uid() == aUid)
-       	{
-       		found = ETrue;
-       		break;	
-       	}
-    }
-    if (found)
-    {
-    	aIndex = i;
-    	return KErrNone;
-    }    	
-    else
-    {
-        aIndex = -1;
-        return KErrNotFound;
-    }
-}
-
-// ------------------------------------------------------------------------------------------------
-// CUiSettingsUtil* CUiSettingsUtil::SetShortcutTargetWebIndexL( )
-// ------------------------------------------------------------------------------------------------
-
-TInt CUiSettingsUtil::SetShortcutTargetWebIndexL( TInt aUid, TInt aIndex )
-{
-	RDEBUG( "CUiSettingsUtil::SetShortcutTargetWebIndexL() >" );
-	TUint webTargetID = aUid;
-    CFavouritesItem* item;         
-    CRepository *cenRep = CRepository::NewL(KCRUidShortcutItems);
-   	if(aIndex>=0 && aIndex<iFavList->Count())
-   	   	item = iFavList->At(aIndex);
-   	else
-   	{
-   		delete cenRep;
-   		return KErrArgument;
-   	}   		
-   	
-	TBuf16<256> SetKeyValue;
-	TBuf16<10> appUid ;			
-	appUid.Format(KFormat,item->Uid());
-	SetKeyValue = KBookmarkText;
-	SetKeyValue.Insert (SetKeyValue.Length(),appUid);
-	cenRep->Set(webTargetID, SetKeyValue);			
-
-	delete cenRep;
-	RDEBUG( "CUiSettingsUtil::SetShortcutTargetWebIndexL() <" );
-	return KErrNone;
-}
-
-// ------------------------------------------------------------------------------------------------
-// CUiSettingsUtil* CUiSettingsUtil::HandleSessionEventL( )
-// ------------------------------------------------------------------------------------------------
-
-void CUiSettingsUtil::HandleSessionEventL(TMsvSessionEvent /*aEvent*/, TAny* /*aArg1*/, TAny* /*aArg2*/, TAny* /*aArg3*/)
-{
-  	// A null function
-  	// since we are not registering for any observer
-  	// but required since its a pure virtual function in 
-  	// the parent class
-}
--- a/customization/isadapter/src/isadapter.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2537 +0,0 @@
-/*
-* Copyright (c) 2002 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:  DM Idle SoftKey  Adapter
-*
-*/
-
-
-#include "isadapter.h"
-
-#include "IsAdapterDefines.h"
-#include "IsAdapterLiterals.h"
-#include "IdleSoftkeysAppTargetManager.h"
-#include "UiSettingsUtil.h"
-
-// symbian
-#include <implementationproxy.h>
-#include <centralrepository.h>
-#include <imcvcodc.h>
-// s60
-#include <FavouritesItemList.h>
-
-// tarm
-//#ifdef __SAP_POLICY_MANAGEMENT
-#include <SettingEnforcementInfo.h>
-#include <PolicyEngineXACML.h>
-#include <DMCert.h>
-//#endif
-
-//#include "UISettingsSrvConstants.h"
-#include "IsAdapterConstants.h"
-#include "nsmldmiapmatcher.h"
-#include "nsmldmuri.h"
-#include "TPtrC8I.h"
-#include "TARMCharConv.h"
-#include "FileCoderB64.h"
-#include "debug.h"
-#include <featmgr.h>
-// ------------------------------------------------------------------------------------------------
-// CIsAdapter* CIsAdapter::NewL( )
-// ------------------------------------------------------------------------------------------------
-CIsAdapter* CIsAdapter::NewL(MSmlDmCallback* aDmCallback )
-    {
-    RDEBUG( "CIsAdapter::NewL() >" );
-    CIsAdapter* self = NewLC( aDmCallback );
-    CleanupStack::Pop();
-    RDEBUG( "CIsAdapter::NewL() <" );
-    return self;
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CIsAdapter* CIsAdapter::NewLC( )
-// ------------------------------------------------------------------------------------------------
-CIsAdapter* CIsAdapter::NewLC(MSmlDmCallback* aDmCallback )
-    {
-    RDEBUG( "CIsAdapter::NewLC() >" );
-    CIsAdapter* self = new (ELeave) CIsAdapter(aDmCallback);
-    CleanupStack::PushL(self);
-    self->ConstructL(aDmCallback);
-    RDEBUG( "CIsAdapter::NewLC() <" );
-    return self;
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CIsAdapter::CIsAdapter()
-// ------------------------------------------------------------------------------------------------
-CIsAdapter::CIsAdapter(TAny* aEcomArguments)
-: CTARMDmStreamAdapter((MSmlDmCallback*)aEcomArguments)
-, iFavList(0)
-, iWebTargetManager(0)
-, iAppTargetManager(0)
-, iUiSettings(0)
-    {
-    RDEBUG( "CIsAdapter::CIsAdapter()" );
-    iUiSettingsNotInitialized = ETrue;
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CIsAdapter::~CIsAdapter()
-// ------------------------------------------------------------------------------------------------
-CIsAdapter::~CIsAdapter()
-    {
-    RDEBUG( "CIsAdapter::~CIsAdapter() >" );
-	FeatureManager::UnInitializeLib();
-    delete iWebTargetManager;
-    delete iAppTargetManager;
-    delete iUiSettings;
-
-    iFavDb.Close();
-    iFavSession.Close();
-
-    if( iFavList != 0 )
-        {
-        delete iFavList;
-        iFavList = 0;
-        }
-
-    if( iTemporaryImageFile.Length() > 0 )
-        {
-        RDEBUG( "CIsAdapter::~CIsAdapter() Deleting temporary file" );
-        RFs fs;
-        TInt err = fs.Connect();
-        if( err == KErrNone )
-        	{
-        	fs.Delete( iTemporaryImageFile );
-        	fs.Close();
-        	iTemporaryImageFile.Zero();
-        	}
-        }    
-
-    RDEBUG( "CIsAdapter::~CIsAdapter() <" );
-    }
-
-
-
-// ------------------------------------------------------------------------------------------------
-//  CIsAdapter::DDFVersionL()
-// ------------------------------------------------------------------------------------------------
-void CIsAdapter::DDFVersionL(CBufBase& aDDFVersion)
-    {
-    RDEBUG( "CIsAdapter::DDFVersionL() >" );
-
-    aDDFVersion.InsertL(0,KNSmlISDDFVersion);
-
-    RDEBUG( "CIsAdapter::DDFVersionL() <" );
-    }
-
-// ------------------------------------------------------------------------------------------------
-//  CIsAdapter::DDFStructureL()
-// ------------------------------------------------------------------------------------------------
-void CIsAdapter::DDFStructureL( MSmlDmDDFObject& aDDF )
-    {
-    RDEBUG( "CIsAdapter::DDFStructureL() >" );
-
-    TSmlDmAccessTypes accessTypesGet;
-    accessTypesGet.SetGet();
-
-    TSmlDmAccessTypes accessTypesAddGet;
-    accessTypesAddGet.SetAdd();
-    accessTypesAddGet.SetGet();
-
-    TSmlDmAccessTypes accessTypesGetReplace;
-    accessTypesGetReplace.SetGet();
-    accessTypesGetReplace.SetReplace();
-
-    TSmlDmAccessTypes accessTypesADGR;
-    accessTypesADGR.SetAdd();
-    accessTypesADGR.SetDelete();
-    accessTypesADGR.SetGet();
-    accessTypesADGR.SetReplace();
-
-    /*
-    Node: ./Customzation
-    This interior node is the common parent to all customization..
-    Status: Required
-    Occurs: One
-    Format: Node
-    Access Types: Get
-    Values: N/A
-    */
-    MSmlDmDDFObject& apps = aDDF.AddChildObjectL(KNSmlCustomizationNodeName);
-    FillNodeInfoL(apps,accessTypesGet,MSmlDmDDFObject::EOne,MSmlDmDDFObject::EPermanent,MSmlDmDDFObject::ENode,
-        KNSmlISDescription,KNullDesC8());
-
-    /*
-    Node: ./Customization/IdleSoftKey
-    This interior node acts as a placeholder for one or more update packages within a same content provider group.
-    Status: Required
-    Occurs: One
-    Format: Node
-    Access Types: Get
-    Values: N/A
-    */
-    MSmlDmDDFObject& groupNode = apps.AddChildObjectL(KNSmlIS_IdleSoftKeyNodeName);
-    FillNodeInfoL(groupNode,accessTypesGet,MSmlDmDDFObject::EOne,MSmlDmDDFObject::EPermanent,
-        MSmlDmDDFObject::ENode,KNSmlISIdleSoftKeyNodeDescription,KNullDesC8());
-
-    // IdleSoftkeys/*
-    MSmlDmDDFObject& groupNodeSoftkeys = groupNode.AddChildObjectL(KNSmlIS_SoftKeysNodeName);
-    FillNodeInfoL(groupNodeSoftkeys,accessTypesGet,MSmlDmDDFObject::EOne,MSmlDmDDFObject::EPermanent,
-        MSmlDmDDFObject::ENode,KNSmlISSoftkeysNodeDescription,KNullDesC8());
-
-    MSmlDmDDFObject& groupNodeTargets = groupNode.AddChildObjectL(KNSmlIS_TargetsNodeName);
-    FillNodeInfoL(groupNodeTargets,accessTypesGet,MSmlDmDDFObject::EOne,MSmlDmDDFObject::EPermanent,
-        MSmlDmDDFObject::ENode,KNSmlISTargetsNodeDescription,KNullDesC8());
-
-    MSmlDmDDFObject& groupNodeWebTargets = groupNode.AddChildObjectL(KNSmlIS_WebTargetsNodeName);
-    FillNodeInfoL(groupNodeWebTargets,accessTypesAddGet,MSmlDmDDFObject::EOne,MSmlDmDDFObject::EPermanent,
-        MSmlDmDDFObject::ENode,KNSmlISWebTargetsNodeDescription,KNullDesC8());
-
-    // Dynamic node lists, IdleSoftkeys/*/X
-    MSmlDmDDFObject& groupNodeSoftkeysX = groupNodeSoftkeys.AddChildObjectGroupL();
-    FillNodeInfoL(groupNodeSoftkeysX,accessTypesGet,MSmlDmDDFObject::EOneOrMore,MSmlDmDDFObject::EDynamic,
-        MSmlDmDDFObject::ENode,KNSmlISSoftkeysXNodeDescription,KNullDesC8());
-
-    MSmlDmDDFObject& groupNodeTargetsX = groupNodeTargets.AddChildObjectGroupL();
-    FillNodeInfoL(groupNodeTargetsX,accessTypesGet,MSmlDmDDFObject::EZeroOrMore,MSmlDmDDFObject::EDynamic,
-        MSmlDmDDFObject::ENode,KNSmlISTargetsXNodeDescription,KNullDesC8());
-
-    MSmlDmDDFObject& groupNodeWebTargetsX = groupNodeWebTargets.AddChildObjectGroupL();
-    FillNodeInfoL(groupNodeWebTargetsX,accessTypesADGR,MSmlDmDDFObject::EZeroOrMore,MSmlDmDDFObject::EDynamic,
-        MSmlDmDDFObject::ENode,KNSmlISWebTargetsXNodeDescription,KNullDesC8());
-
-    // Softkeys/X/*
-    MSmlDmDDFObject& sId = groupNodeSoftkeysX.AddChildObjectL(KNSmlIS_SoftkeysIDNodeName);
-    FillNodeInfoL(sId,accessTypesGet,MSmlDmDDFObject::EOne,MSmlDmDDFObject::EPermanent,
-        MSmlDmDDFObject::EChr,KNSmlIS_SoftkeysIDDescription,KNSmlISTextPlain());
-    MSmlDmDDFObject& sRef = groupNodeSoftkeysX.AddChildObjectL(KNSmlIS_SoftkeysTargetRefNodeName);
-    FillNodeInfoL(sRef,accessTypesGetReplace,MSmlDmDDFObject::EOne,MSmlDmDDFObject::EPermanent,
-        MSmlDmDDFObject::EChr,KNSmlIS_SoftkeysTargetRefDescription,KNSmlISTextPlain());
-#ifdef IDLESOFTKEY_ADAPTER_SOFTKEY_IMAGES
-    MSmlDmDDFObject& sImage = groupNodeSoftkeysX.AddChildObjectL(KNSmlIS_SoftkeysImageNoneName);
-    FillNodeInfoL(sImage,accessTypesGetReplace,MSmlDmDDFObject::EOne,MSmlDmDDFObject::EPermanent,
-        MSmlDmDDFObject::EBin,KNSmlIS_SoftkeysImageDescription,KMimeTypeImageMbm());
-#ifdef IDLESOFTKEY_ADAPTER_IMAGEMASK
-    MSmlDmDDFObject& sImageMask = groupNodeSoftkeysX.AddChildObjectL(KNSmlIS_SoftkeysMaskNodeName);
-    FillNodeInfoL(sImageMask,accessTypesGetReplace,MSmlDmDDFObject::EOne,MSmlDmDDFObject::EPermanent,
-        MSmlDmDDFObject::EBin,KNSmlIS_SoftkeysMaskDescription,KMimeTypeImageMbm());
-#endif
-#endif
-    // Targets/X/*
-    MSmlDmDDFObject& tId = groupNodeTargetsX.AddChildObjectL(KNSmlIS_TargetsIDNodeName);
-    FillNodeInfoL(tId,accessTypesGet,MSmlDmDDFObject::EOne,MSmlDmDDFObject::EPermanent,
-        MSmlDmDDFObject::EChr,KNSmlIS_TargetsIDDescription,KNSmlISTextPlain());
-
-    MSmlDmDDFObject& tDesc = groupNodeTargetsX.AddChildObjectL(KNSmlIS_TargetsDescriptionNodeName);
-    FillNodeInfoL(tDesc,accessTypesGet,MSmlDmDDFObject::EOne,MSmlDmDDFObject::EPermanent,
-        MSmlDmDDFObject::EChr,KNSmlIS_TargetsDescriptionDescription,KNSmlISTextPlain());
-
-    MSmlDmDDFObject& tCaption = groupNodeTargetsX.AddChildObjectL(KNSmlIS_TargetsCaptionName);
-    FillNodeInfoL(tCaption,accessTypesGetReplace,MSmlDmDDFObject::EOne,MSmlDmDDFObject::EPermanent,
-        MSmlDmDDFObject::EChr,KNSmlIS_TargetsCaptionDescription,KNSmlISTextPlain());
-
-#ifndef IDLESOFTKEY_ADAPTER_SOFTKEY_IMAGES
-    MSmlDmDDFObject& tImage = groupNodeTargetsX.AddChildObjectL(KNSmlIS_TargetsImageNodeName);
-    FillNodeInfoL(tImage,accessTypesGetReplace,MSmlDmDDFObject::EOne,MSmlDmDDFObject::EPermanent,
-        MSmlDmDDFObject::EBin,KNSmlIS_TargetsImageDescription,KMimeTypeImageMbm());
-
-#ifdef IDLESOFTKEY_ADAPTER_IMAGEMASK
-    MSmlDmDDFObject& tImageMask = groupNodeTargetsX.AddChildObjectL(KNSmlIS_TargetsMaskNodeName);
-    FillNodeInfoL(tImageMask,accessTypesGetReplace,MSmlDmDDFObject::EOne,MSmlDmDDFObject::EPermanent,
-        MSmlDmDDFObject::EBin,KNSmlIS_TargetsMaskDescription,KMimeTypeImageMbm());
-#endif
-#endif
-
-    // WebTargets/X/*
-    MSmlDmDDFObject& wId = groupNodeWebTargetsX.AddChildObjectL(KNSmlIS_WebTargetsIDNodeName);
-    FillNodeInfoL(wId,accessTypesGet,MSmlDmDDFObject::EOne,MSmlDmDDFObject::EPermanent,
-        MSmlDmDDFObject::EChr,KNSmlIS_WebTargetsIDDescription,KNSmlISTextPlain());
-
-    MSmlDmDDFObject& wDesc = groupNodeWebTargetsX.AddChildObjectL(KNSmlIS_WebTargetsDescriptionNodeName);
-    FillNodeInfoL(wDesc,accessTypesGetReplace,MSmlDmDDFObject::EOne,MSmlDmDDFObject::EPermanent,
-        MSmlDmDDFObject::EChr,KNSmlIS_WebTargetsDescriptionDescription,KNSmlISTextPlain());
-
-    MSmlDmDDFObject& wURL = groupNodeWebTargetsX.AddChildObjectL(KNSmlIS_WebTargetsURLNodeName);
-    FillNodeInfoL(wURL,accessTypesGetReplace,MSmlDmDDFObject::EOne,MSmlDmDDFObject::EPermanent,
-        MSmlDmDDFObject::EChr,KNSmlIS_WebTargetsURLDescription,KNSmlISTextPlain());
-
-    MSmlDmDDFObject& wUserName = groupNodeWebTargetsX.AddChildObjectL(KNSmlIS_WebTargetsUserNameNodeName);
-    FillNodeInfoL(wUserName,accessTypesGetReplace,MSmlDmDDFObject::EOne,MSmlDmDDFObject::EPermanent,
-        MSmlDmDDFObject::EChr,KNSmlIS_WebTargetsUserNameDescription,KNSmlISTextPlain());
-
-    MSmlDmDDFObject& wPassword = groupNodeWebTargetsX.AddChildObjectL(KNSmlIS_WebTargetsPasswordNodeName);
-    FillNodeInfoL(wPassword,accessTypesGetReplace,MSmlDmDDFObject::EOne,MSmlDmDDFObject::EPermanent,
-        MSmlDmDDFObject::EChr,KNSmlIS_WebTargetsPasswordDescription,KNSmlISTextPlain());
-
-    MSmlDmDDFObject& wConRef = groupNodeWebTargetsX.AddChildObjectL(KNSmlIS_WebTargetsConRefNodeName);
-    FillNodeInfoL(wConRef,accessTypesGetReplace,MSmlDmDDFObject::EOne,MSmlDmDDFObject::EPermanent,
-        MSmlDmDDFObject::EChr,KNSmlIS_WebTargetsConRefDescription,KNSmlISTextPlain());
-        
-    MSmlDmDDFObject& wCaption = groupNodeWebTargetsX.AddChildObjectL(KNSmlIS_WebTargetsCaptionNodeName);
-    FillNodeInfoL(wCaption,accessTypesGetReplace,MSmlDmDDFObject::EOne,MSmlDmDDFObject::EPermanent,
-        MSmlDmDDFObject::EChr,KNSmlIS_WebTargetsCaptionDescription,KNSmlISTextPlain());
-
-#ifndef IDLESOFTKEY_ADAPTER_SOFTKEY_IMAGES
-    MSmlDmDDFObject& wImage = groupNodeWebTargetsX.AddChildObjectL(KNSmlIS_WebTargetsImageNodeName);
-    FillNodeInfoL(wImage,accessTypesGetReplace,MSmlDmDDFObject::EOne,MSmlDmDDFObject::EPermanent,
-        MSmlDmDDFObject::EBin,KNSmlIS_WebTargetsImageDescription,KMimeTypeImageMbm());
-
-#ifdef IDLESOFTKEY_ADAPTER_IMAGEMASK
-    MSmlDmDDFObject& wImageMask = groupNodeWebTargetsX.AddChildObjectL(KNSmlIS_WebTargetsMaskNodeName);
-    FillNodeInfoL(wImageMask,accessTypesGetReplace,MSmlDmDDFObject::EOne,MSmlDmDDFObject::EPermanent,
-        MSmlDmDDFObject::EBin,KNSmlIS_WebTargetsMaskDescription,KMimeTypeImageMbm());
-#endif
-#endif
-
-    RDEBUG( "CIsAdapter::DDFStructureL() <" );
-    }
-
-// ------------------------------------------------------------------------------------------------
-//  CIsAdapter::UpdateLeafObjectL()
-// ------------------------------------------------------------------------------------------------
-void CIsAdapter::UpdateLeafObjectL( CSmlDmAdapter::TError &aStatus,
-                                    const TDesC8& aURI, const TDesC8& aLUID,
-                                    const TDesC8& aObject, const TDesC8& aType)
-    {
-    RDEBUG( "CIsAdapter::UpdateLeafObjectL() >" );
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-	TPtrC8 uriPtrc = NSmlDmURI::RemoveDotSlash( aURI );
-	CIsAdapter::TIsNodeIdentifier identifier = GetNodeIdentifier( uriPtrc );
-#else
-	CIsAdapter::TIsNodeIdentifier identifier = GetNodeIdentifier( aURI );
-#endif
-
-    HBufC16* strBuf;
-    TInt value;
-    CFavouritesItem *favItem = CFavouritesItem::NewLC();
-    RDEBUG_2( "CIsAdapter::UpdateLeafObjectL() CFavouritesItem ALLOC %x", favItem );
-    TPtrC8 ptr8(0, 0);
-
-    switch( identifier )
-        {
-
-#ifdef IDLESOFTKEY_ADAPTER_SOFTKEY_IMAGES
-            case EIsNodeSoftKeysXImage:
-	#ifdef __TARM_SYMBIAN_CONVERGENCY            
-            SetSoftkeyImageL( uriPtrc, aObject, aType );
-	#else
-			SetSoftkeyImageL( aURI, aObject, aType );
-	#endif            
-            break;
-
-#ifdef IDLESOFTKEY_ADAPTER_IMAGEMASK
-            case EIsNodeSoftKeysXMask:
-	#ifdef __TARM_SYMBIAN_CONVERGENCY            
-            SetSoftkeyImageL( uriPtrc, aObject, aType );
-	#else
-			SetSoftkeyImageL( aURI, aObject, aType );
-	#endif     
-            break;
-#endif
-#endif
-
-            case EIsNodeSoftKeysXTargetRef:
-#ifdef __TARM_SYMBIAN_CONVERGENCY            
-            ptr8.Set( NSmlDmURI::URISeg( uriPtrc, 3 ) );
-#else
-			ptr8.Set( NSmlDmURI::URISeg( aURI, 3 ) );
-#endif                 
-            value = GetSoftkeyUidFromNodeNameL( ptr8 );
-            SetShortcutTargetL( aObject, value );
-            break;
-
-            case EIsNodeTargetsXCaption:
-#ifdef __TARM_SYMBIAN_CONVERGENCY            
-            iAppTargetManager->SetCaptionL( uriPtrc, aObject );
-#else
-			iAppTargetManager->SetCaptionL( aURI, aObject );
-#endif            
-            break;
-
-#ifndef IDLESOFTKEY_ADAPTER_SOFTKEY_IMAGES
-            case EIsNodeTargetsXImage:
-	#ifdef __TARM_SYMBIAN_CONVERGENCY            
-            SetShortcutTargetImageL( uriPtrc, aObject, aType );
-	#else
-			SetShortcutTargetImageL( aURI, aObject, aType );
-	#endif               
-            
-            break;
-
-#ifdef IDLESOFTKEY_ADAPTER_IMAGEMASK
-            case EIsNodeTargetsXImageMask:
-	#ifdef __TARM_SYMBIAN_CONVERGENCY            
-            SetShortcutTargetImageL( uriPtrc, aObject, aType );
-	#else
-			SetShortcutTargetImageL( aURI, aObject, aType );
-	#endif                          
-            break;
-#endif
-#endif
-
-            case EIsNodeWebTargetsX:
-#ifdef __TARM_SYMBIAN_CONVERGENCY             
-            if( KErrNone != iWebTargetManager->RenameL( uriPtrc, aLUID, aObject ) )
-#else
-			if( KErrNone != iWebTargetManager->RenameL( aURI, aLUID, aObject ) )
-#endif            
-                {
-                aStatus = CSmlDmAdapter::EError;
-                }
-            break;
-
-            case EIsNodeWebTargetsXDescription:
-            case EIsNodeWebTargetsXURL:
-            case EIsNodeWebTargetsXUserName:
-            case EIsNodeWebTargetsXPassword:
-            case EIsNodeWebTargetsXConRef:
-                {
-#ifdef __TARM_SYMBIAN_CONVERGENCY                   
-                iWebTargetManager->PrepareItemL( uriPtrc, *favItem, value );
-#else
-				iWebTargetManager->PrepareItemL( aURI, *favItem, value );
-#endif                
-                strBuf = CTARMCharConv::ConvertFromUtf8LC( aObject );
-
-                switch( identifier )
-                {
-                    case EIsNodeWebTargetsXDescription:
-                        favItem->SetNameL( *strBuf );
-                    break;
-
-                    case EIsNodeWebTargetsXURL:
-                        favItem->SetUrlL( *strBuf );
-                        if( favItem->Url().Compare( *strBuf ) != 0 )
-                            {
-                            RDEBUG( "CIsAdapter::UpdateLeafObjectL() Bookmark URL setting failed with FavouritesEngine!" );
-                            aStatus = CSmlDmAdapter::EError;
-                            }
-                    break;
-
-                    case EIsNodeWebTargetsXUserName:
-                        favItem->SetUserNameL( *strBuf );
-                    break;
-
-                    case EIsNodeWebTargetsXPassword:
-                        favItem->SetPasswordL( *strBuf );
-                    break;
-
-                    case EIsNodeWebTargetsXConRef:
-                        TFavouritesWapAp wapAp;
-                        if( aObject.Length() == 0 )
-                            {
-                            wapAp.SetDefault();
-                            }
-                        else
-                            {
-                            iWebTargetManager->FindWapApL( aObject, value );
-                            wapAp.SetApId( value );
-                            }
-                        favItem->SetWapAp( wapAp );
-                    break;
-                }
-
-                CleanupStack::PopAndDestroy( strBuf );
-                iWebTargetManager->ReleaseItemL( *favItem );
-                }
-                break;
-
-            case EIsNodeWebTargetsXCaption:
-#ifdef __TARM_SYMBIAN_CONVERGENCY              
-            iWebTargetManager->SetCaptionL( uriPtrc, aObject );
-#else
-			iWebTargetManager->SetCaptionL( aURI, aObject );
-#endif            
-            break;
-
-#ifndef IDLESOFTKEY_ADAPTER_SOFTKEY_IMAGES
-            case EIsNodeWebTargetsXImage:
-	#ifdef __TARM_SYMBIAN_CONVERGENCY             
-            SetShortcutTargetImageL( uriPtrc, aObject, aType );
-	#else
-			SetShortcutTargetImageL( aURI, aObject, aType );
-	#endif            
-            break;
-
-#ifdef IDLESOFTKEY_ADAPTER_IMAGEMASK
-            case EIsNodeWebTargetsXImageMask:
-	#ifdef __TARM_SYMBIAN_CONVERGENCY              
-            SetShortcutTargetImageL( uriPtrc, aObject, aType );
-	#else
-			SetShortcutTargetImageL( aURI, aObject, aType );
-	#endif            
-            break;
-#endif
-#endif
-
-            default:
-                aStatus = CSmlDmAdapter::EError;
-            break;
-        };
-
-    CleanupStack::PopAndDestroy( favItem );
-
-    RDEBUG( "CIsAdapter::UpdateLeafObjectL() <" );
-    }
-
-// ------------------------------------------------------------------------------------------------
-//  CIsAdapter::_UpdateLeafObjectL()
-// ------------------------------------------------------------------------------------------------
-void CIsAdapter::_UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID,
-                                    const TDesC8& aObject, const TDesC8& aType,
-                                    TInt aStatusRef )
-    {
-    RDEBUG( "CIsAdapter::_UpdateLeafObjectL() >" );
-
-    TBuf8<KISTBufMaxLength> mimeType;
-    CopyAndTrimMimeType(mimeType, aType);
-
-    CSmlDmAdapter::TError status = CSmlDmAdapter::EOk;
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-	TPtrC8 uriPtrc = NSmlDmURI::RemoveDotSlash( aURI );
-	TRAPD( reason, 
-           UpdateLeafObjectL( status, uriPtrc, aLUID, aObject, aType ) );
-#else
-	TRAPD( reason, 
-           UpdateLeafObjectL( status, aURI, aLUID, aObject, aType ) );
-#endif
-
-    if( KErrNone != reason )
-        {
-        RDEBUG_2( "CIsAdapter::_UpdateLeafObjectL: Error code %d", reason );
-        status = CSmlDmAdapter::EError;
-        }
-
-    iCallBack->SetStatusL(aStatusRef, status);
-
-    RDEBUG( "CIsAdapter::_UpdateLeafObjectL() <" );
-    }
-
-// ------------------------------------------------------------------------------------------------
-//  CIsAdapter::_UpdateLeafObjectL()
-// ------------------------------------------------------------------------------------------------
-void CIsAdapter::_UpdateLeafObjectL( const TDesC8& /*aURI*/, const TDesC8& /*aLUID*/,
-                                    RWriteStream*& /*aStream*/, const TDesC8& /*aType*/,
-                                    TInt aStatusRef )
-    {
-    RDEBUG( "CIsAdapter::_UpdateLeafObjectL() (stream) >" );
-
-	// SymbianConvergencyNote! Check _UpdateLeafObjectL() <-> removes the "./" !
-
-    CSmlDmAdapter::TError ret = CSmlDmAdapter::EError;
-    iCallBack->SetStatusL(aStatusRef, ret);
-
-    RDEBUG( "CIsAdapter::_UpdateLeafObjectL() (stream) <" );
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CIsAdapter::DeleteObjectL
-// ------------------------------------------------------------------------------------------------
-void CIsAdapter::DeleteObjectL( CSmlDmAdapter::TError &aStatus, const TDesC8& aURI,
-                                const TDesC8& /*aLUID*/)
-    {
-    RDEBUG( "CIsAdapter::DeleteObjectL() >" );
-
-	// NOTE! Look _DeleteObjectL() <-> removes the "./" from the aURI !!
-
-    CIsAdapter::TIsNodeIdentifier identifier = GetNodeIdentifier( aURI );
-    CFavouritesItem *favItem = CFavouritesItem::NewLC();
-    RDEBUG_2( "CIsAdapter::DeleteObjectL() CFavouritesItem ALLOC %x", favItem );
-    TInt index;
-    TInt status = KErrNone;
-
-    switch( identifier )
-        {
-            case EIsNodeWebTargetsX:
-            status = iWebTargetManager->GetTargetFromNodeNameL( aURI, *favItem, index );
-            if( (0 != favItem) && (KErrNone == status) )
-                {
-                User::LeaveIfError( iFavDb.Delete( favItem->Uid() ) );
-                iWebTargetManager->CheckLUIDDatabaseL( ETrue );
-                //iWebTargetManager->iUiSettings->ReadBookmarksL();
-                }
-            else
-                {
-                aStatus = CSmlDmAdapter::EError;
-                }
-            break;
-
-            default:
-                aStatus = CSmlDmAdapter::EError;
-            break;
-        };
-
-    CleanupStack::PopAndDestroy( favItem );    
-
-    RDEBUG( "CIsAdapter::DeleteObjectL() <" );
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CIsAdapter::_DeleteObjectL
-// ------------------------------------------------------------------------------------------------
-void CIsAdapter::_DeleteObjectL( const TDesC8& aURI, const TDesC8& aLUID, TInt aStatusRef )
-    {
-    RDEBUG( "CIsAdapter::_DeleteObjectL() >" );
-
-    CSmlDmAdapter::TError status = CSmlDmAdapter::EOk;
-  
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-	TPtrC8 uriPtrc = NSmlDmURI::RemoveDotSlash( aURI );
-	TRAPD( reason,
-           DeleteObjectL( status, uriPtrc, aLUID ) );
-#else
-	TRAPD( reason,
-           DeleteObjectL( status, aURI, aLUID ) );
-#endif  
-
-    if( KErrNone != reason )
-        {
-        RDEBUG_2( "CIsAdapter::_DeleteObjectL: Error code %d", reason );
-        status = CSmlDmAdapter::EError;
-        }
-
-    iCallBack->SetStatusL(aStatusRef, status);
-
-    RDEBUG( "CIsAdapter::_DeleteObjectL() <" );
-    }
-
-// ------------------------------------------------------------------------------------------------
-//  CIsAdapter::FetchLeafObjectL
-// ------------------------------------------------------------------------------------------------
-CSmlDmAdapter::TError CIsAdapter::FetchLeafObjectL( const TDesC8& aURI, const TDesC8& /*aLUID*/,
-                                                    TDes8& aNewMime, CBufFlat& aObject )
-    {
-    RDEBUG( "CIsAdapter::FetchLeafObjectL() >" );
-
-	// SymbianConvergency NOTE! Check _FetchLeafObjectL() <-> removes the "./" from the aURI
-
-    TBuf8<KISTBufMaxLength> mimeType;
-    CopyAndTrimMimeType(mimeType, aNewMime);
-
-    CSmlDmAdapter::TError status = CSmlDmAdapter::EOk;
-
-    CIsAdapter::TIsNodeIdentifier identifier = GetNodeIdentifier( aURI );
-
-    TInt softkeyUid;
-    HBufC8* strBuf = 0;
-    TBuf8<MAX_NUMBER_OF_DIGITS_IN_10BASE_INT64> numBuf;
-    TBuf <MAX_NUMBER_OF_DIGITS_IN_10BASE_INT64> numBuf16;
-    CFavouritesItem *favItem = CFavouritesItem::NewLC();
-    RDEBUG_2( "CIsAdapter::FetchLeafObjectL() CFavouritesItem ALLOC %x", favItem );
-    TBuf8<ISADAPTER_SHORTCUT_CAPTION_MAXLENGTH> caption;
-    TInt index;
-
-    switch( identifier )
-        {
-            case EIsNodeCustomization:
-            case EIsNodeIdleSoftkeys:
-            case EIsNodeSoftKeys:
-            case EIsNodeTargets:
-            case EIsNodeWebTargets:
-            case EIsNodeSoftKeysX:
-            case EIsNodeTargetsX:
-            case EIsNodeWebTargetsX:
-            // Empty
-            break;
-
-#ifdef IDLESOFTKEY_ADAPTER_SOFTKEY_IMAGES
-            case EIsNodeSoftKeysXImage:
-            status = CSmlDmAdapter::EError;
-            //softkeyUid = GetSoftkeyUidFromNodeNameL( NSmlDmURI::URISeg( aURI, 3 ) );
-            //GetSoftkeyImageL( softkeyUid, aObject );
-            break;
-
-#ifdef IDLESOFTKEY_ADAPTER_IMAGEMASK
-            case EIsNodeSoftKeysXMask:
-            status = CSmlDmAdapter::EError;
-            //softkeyUid = GetSoftkeyUidFromNodeNameL( NSmlDmURI::URISeg( aURI, 3 ) );
-            //GetSoftkeyImageL( softkeyUid, aObject, ETrue );
-            break;
-#endif
-#endif
-
-            case EIsNodeSoftKeysXID:
-            softkeyUid = GetSoftkeyUidFromNodeNameL( NSmlDmURI::URISeg( aURI, 3 ) );
-            numBuf.Num( softkeyUid );
-            aObject.InsertL( aObject.Size(), numBuf );
-            aObject.InsertL( aObject.Size(), KNSmlISSeparator() );
-            AddShortcutNameL( aObject, softkeyUid );
-            break;
-
-            case EIsNodeSoftKeysXTargetRef:
-            status = GetShortcutTargetURIL( aObject, GetSoftkeyUidFromNodeNameL( NSmlDmURI::URISeg( aURI, 3 ) ) );
-            break;
-
-            case EIsNodeTargetsXID:
-            iAppTargetManager->GetTargetFromNodeNameL( NSmlDmURI::URISeg( aURI, 3 ), index, caption );
-            numBuf.Num( index );
-            aObject.InsertL( aObject.Size(), numBuf );
-            break;
-
-            case EIsNodeTargetsXCaption:
-            iAppTargetManager->GetTargetFromNodeNameL( NSmlDmURI::URISeg( aURI, 3 ), index, caption );
-            aObject.InsertL( aObject.Size(), caption );
-            break;
-
-#ifndef IDLESOFTKEY_ADAPTER_SOFTKEY_IMAGES
-            case EIsNodeTargetsXImage:
-            status = CSmlDmAdapter::EError;
-            //iAppTargetManager->GetTargetFromNodeNameL( NSmlDmURI::URISeg( aURI, 3 ), index, caption );
-            //GetApplicationImageL( index, aObject );
-            break;
-
-#ifdef IDLESOFTKEY_ADAPTER_IMAGEMASK
-            case EIsNodeTargetsXImageMask:
-            status = CSmlDmAdapter::EError;
-            //iAppTargetManager->GetTargetFromNodeNameL( NSmlDmURI::URISeg( aURI, 3 ), index, caption );
-            //GetApplicationImageL( index, aObject, ETrue );
-            break;
-#endif
-#endif
-
-            case EIsNodeTargetsXDescription:
-            iAppTargetManager->GetTargetFromNodeNameL( NSmlDmURI::URISeg( aURI, 3 ), index, caption );
-            aObject.InsertL( aObject.Size(), caption );
-            break;
-
-            case EIsNodeWebTargetsXID:
-            case EIsNodeWebTargetsXDescription:
-            case EIsNodeWebTargetsXURL:
-            case EIsNodeWebTargetsXUserName:
-            case EIsNodeWebTargetsXPassword:
-            case EIsNodeWebTargetsXCaption:
-                {
-                    iWebTargetManager->PrepareItemL( aURI, *favItem, index );
-                    switch( identifier )
-                        {
-                        case EIsNodeWebTargetsXID:
-                        numBuf16.Num( favItem->Uid() );
-                        strBuf = CTARMCharConv::ConvertToUtf8LC( numBuf16 );
-                        aObject.InsertL( aObject.Size(), *strBuf );
-                        break;
-
-                        case EIsNodeWebTargetsXDescription:
-                        strBuf = CTARMCharConv::ConvertToUtf8LC( favItem->Name() );
-                        aObject.InsertL( aObject.Size(), *strBuf );
-                        break;
-
-                        case EIsNodeWebTargetsXURL:
-                        strBuf = CTARMCharConv::ConvertToUtf8LC( favItem->Url() );
-                        aObject.InsertL( aObject.Size(), *strBuf );
-                        break;
-
-                        case EIsNodeWebTargetsXUserName:
-                        status = CSmlDmAdapter::EError;
-                        
-                        //strBuf = CTARMCharConv::ConvertToUtf8LC( favItem->UserName() );
-                        //aObject.InsertL( aObject.Size(), *strBuf );
-                        break;
-
-                        case EIsNodeWebTargetsXPassword:
-                        status = CSmlDmAdapter::EError;
-                        
-                        //strBuf = CTARMCharConv::ConvertToUtf8LC( favItem->Password() );
-                        //aObject.InsertL( aObject.Size(), *strBuf );
-                        break;
-
-                        case EIsNodeWebTargetsXCaption:
-                        strBuf = CTARMCharConv::ConvertToUtf8LC( favItem->Name() );
-                        aObject.InsertL( aObject.Size(), *strBuf );
-                        break;
-                        }
-                    if(strBuf!=NULL) 
-                        {
-                        CleanupStack::PopAndDestroy( strBuf );
-                        }
-                    iWebTargetManager->ReleaseItemL( *favItem, EFalse );
-                }
-                break;
-
-            case EIsNodeWebTargetsXConRef:
-                {
-                iWebTargetManager->PrepareItemL( aURI, *favItem, index );
-
-                TFavouritesWapAp wapAp = favItem->WapAp();
-                if( wapAp.IsDefault() )
-                    {
-                    aObject.InsertL( aObject.Size(), KDefaultApName8() );
-                    }
-                else if( wapAp.IsNull() )
-                    {
-                    // Leave empty
-                    }
-                else
-                    {
-                    CNSmlDMIAPMatcher *matcher = CNSmlDMIAPMatcher::NewLC( iCallBack );
-                    TInt id = wapAp.ApId();
-                    HBufC8* buf = matcher->URIFromIAPIdL( id );
-                    if( 0 == buf )
-                        {
-                        User::Leave( KErrNotFound );
-                        }
-                    CleanupStack::PushL( buf );
-                    aObject.InsertL( aObject.Size(), *buf );
-                    CleanupStack::PopAndDestroy( buf );
-                    CleanupStack::PopAndDestroy( matcher );
-                    }
-
-                iWebTargetManager->ReleaseItemL( *favItem, EFalse );
-                }
-            break;
-
-#ifndef IDLESOFTKEY_ADAPTER_SOFTKEY_IMAGES
-            case EIsNodeWebTargetsXImage:
-            status = CSmlDmAdapter::EError;
-            //iWebTargetManager->PrepareItemL( aURI, *favItem, index );
-            //GetBookmarkImageL( index, aObject );
-            //iWebTargetManager->ReleaseItemL( *favItem, EFalse );
-            break;
-
-#ifdef IDLESOFTKEY_ADAPTER_IMAGEMASK
-            case EIsNodeWebTargetsXImageMask:
-            status = CSmlDmAdapter::EError;
-            //iWebTargetManager->PrepareItemL( aURI, *favItem, index );
-            //GetBookmarkImageL( index, aObject, ETrue );
-            //iWebTargetManager->ReleaseItemL( *favItem, EFalse );
-            break;
-#endif
-#endif
-
-            default:
-                status = CSmlDmAdapter::EError;
-            break;
-        };
-
-    CleanupStack::PopAndDestroy( favItem );
-
-    RDEBUG_2( "CIsAdapter::FetchLeafObjectL() < %d", (TInt)status );
-    return status;
-    }
-
-// ------------------------------------------------------------------------------------------------
-//  CIsAdapter::_FetchLeafObjectL
-// ------------------------------------------------------------------------------------------------
-void CIsAdapter::_FetchLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID,
-                                   const TDesC8& aType, TInt aResultsRef,
-                                   TInt aStatusRef )
-    {
-    RDEBUG("CIsAdapter::_FetchLeafObjectL() >");
-
-    TBuf8<KISTBufMaxLength> mimeType;
-    CopyAndTrimMimeType(mimeType, aType);
-
-    CSmlDmAdapter::TError status = CSmlDmAdapter::EOk;
-
-    CBufFlat *object = CBufFlat::NewL(128);
-    CleanupStack::PushL( object );
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-	TPtrC8 uriPtrc = NSmlDmURI::RemoveDotSlash( aURI );
-	TRAPD(
-        reason,
-        status = FetchLeafObjectL( uriPtrc, aLUID, mimeType, *object ) );
-#else
-	TRAPD(
-        reason,
-        status = FetchLeafObjectL( aURI, aLUID, mimeType, *object ) );
-#endif
-
-    if( KErrNone != reason )
-        {
-        RDEBUG_2( "CIsAdapter::_FetchLeafObjectL: Error code %d", reason);
-        status = CSmlDmAdapter::EError;
-        }
-
-    iCallBack->SetStatusL(aStatusRef, status);
-
-    if( status == CSmlDmAdapter::EOk)
-        {
-        object->Compress();
-        iCallBack->SetResultsL( aResultsRef, *object, mimeType );
-        }
-
-    CleanupStack::PopAndDestroy( object );    
-
-    RDEBUG("CIsAdapter::_FetchLeafObjectL() <");
-    }
-
-// ------------------------------------------------------------------------------------------------
-//  CIsAdapter::_FetchLeafObjectSizeL
-// ------------------------------------------------------------------------------------------------
-void CIsAdapter::_FetchLeafObjectSizeL( const TDesC8& aURI, const TDesC8& aLUID,
-                                       const TDesC8& aType, TInt aResultsRef,
-                                       TInt aStatusRef )
-    {
-    RDEBUG("CIsAdapter::_FetchLeafObjectSizeL() >");
-
-    TBuf8<KISTBufMaxLength> mimeType;
-    CopyAndTrimMimeType(mimeType, aType);
-
-    CSmlDmAdapter::TError status = CSmlDmAdapter::EOk;
-
-    CBufFlat *object = CBufFlat::NewL(128);
-    CleanupStack::PushL( object );
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-	TPtrC8 uriPtrc = NSmlDmURI::RemoveDotSlash( aURI );
-	TRAPD(
-        reason,
-        status = FetchLeafObjectL( uriPtrc, aLUID, mimeType, *object ) );
-#else
-	TRAPD(
-        reason,
-        status = FetchLeafObjectL( aURI, aLUID, mimeType, *object ) );
-#endif
-
-    if( KErrNone != reason )
-        {
-        RDEBUG_2( "CIsAdapter::_FetchLeafObjectSizeL: Error code %d", reason);
-        status = CSmlDmAdapter::EError;
-        }
-
-    iCallBack->SetStatusL(aStatusRef, status);
-
-    if( status == CSmlDmAdapter::EOk)
-        {
-        TBuf8<MAX_NUMBER_OF_DIGITS_IN_10BASE_INT64> numBuf;
-        object->Compress();
-
-        CBufFlat *object2 = CBufFlat::NewL(128);
-        CleanupStack::PushL( object2 );
-
-        numBuf.Num(object->Size());
-        object2->InsertL(0, numBuf);
-        object2->Compress();
-        iCallBack->SetResultsL( aResultsRef, *object2, KNSmlISTextPlain );
-
-        CleanupStack::PopAndDestroy( object2 );
-        }
-
-    CleanupStack::PopAndDestroy( object );    
-
-    RDEBUG("CIsAdapter::_FetchLeafObjectSizeL() <");
-    }
-
-// ------------------------------------------------------------------------------------------------
-//  CIsAdapter::_ChildURIListL
-// ------------------------------------------------------------------------------------------------
-void CIsAdapter::_ChildURIListL( const TDesC8& aURI, const TDesC8& /*aLUID*/,
-                                const CArrayFix<TSmlDmMappingInfo>& /*aPreviousURISegmentList*/,
-                                TInt aResultsRef, TInt aStatusRef )
-    {
-    RDEBUG( "CIsAdapter::_ChildURIListL() >" );
-
-    CSmlDmAdapter::TError ret = CSmlDmAdapter::EOk;
-
-    CBufFlat *currentList = CBufFlat::NewL(128);
-    CleanupStack::PushL(currentList);
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-	TPtrC8 uriPtrc = NSmlDmURI::RemoveDotSlash( aURI );
-	CIsAdapter::TIsNodeIdentifier identifier = GetNodeIdentifier( uriPtrc );
-#else
-	CIsAdapter::TIsNodeIdentifier identifier = GetNodeIdentifier( aURI );
-#endif
-
-    switch( identifier )
-        {
-        case EIsNodeCustomization:
-        currentList->InsertL(currentList->Size(),KNSmlIS_IdleSoftKeyNodeName());
-        break;
-        
-        case EIsNodeIdleSoftkeys:
-        currentList->InsertL(currentList->Size(),KNSmlIS_SoftKeysNodeName());
-        currentList->InsertL(currentList->Size(),KNSmlISSeparator());        
-        currentList->InsertL(currentList->Size(),KNSmlIS_TargetsNodeName());
-        currentList->InsertL(currentList->Size(),KNSmlISSeparator());        
-        currentList->InsertL(currentList->Size(),KNSmlIS_WebTargetsNodeName());
-        break;
-
-        case EIsNodeSoftKeys:
-        ListSoftkeysL( *currentList );
-        break;
-
-        case EIsNodeTargets:
-        iAppTargetManager->ListTargetsL( *currentList );
-        break;
-
-        case EIsNodeWebTargets:
-        
-        //User::LeaveIfError( iUiSrv.UpdateShortcutTargetList() );
-        iWebTargetManager->ListWebTargetsL( *currentList );
-        iWebTargetManager->CheckLUIDDatabaseL( ETrue );
-        break;
-
-        case EIsNodeSoftKeysX:
-        currentList->InsertL(currentList->Size(),KNSmlIS_SoftkeysIDNodeName());
-        currentList->InsertL(currentList->Size(),KNSmlISSeparator());
-        currentList->InsertL(currentList->Size(),KNSmlIS_SoftkeysTargetRefNodeName());
-#ifdef IDLESOFTKEY_ADAPTER_SOFTKEY_IMAGES
-        currentList->InsertL(currentList->Size(),KNSmlISSeparator());
-        currentList->InsertL(currentList->Size(),KNSmlIS_SoftkeysImageNoneName());
-#ifdef IDLESOFTKEY_ADAPTER_IMAGEMASK
-        currentList->InsertL(currentList->Size(),KNSmlISSeparator());
-        currentList->InsertL(currentList->Size(),KNSmlIS_SoftkeysMaskNodeName());
-#endif
-#endif
-        break;
-        
-        case EIsNodeTargetsX:
-        currentList->InsertL(currentList->Size(),KNSmlIS_TargetsIDNodeName());
-        currentList->InsertL(currentList->Size(),KNSmlISSeparator());
-        currentList->InsertL(currentList->Size(),KNSmlIS_TargetsDescriptionNodeName());
-        currentList->InsertL(currentList->Size(),KNSmlISSeparator());
-        currentList->InsertL(currentList->Size(),KNSmlIS_TargetsCaptionName());
-#ifndef IDLESOFTKEY_ADAPTER_SOFTKEY_IMAGES
-        currentList->InsertL(currentList->Size(),KNSmlISSeparator());
-        currentList->InsertL(currentList->Size(),KNSmlIS_TargetsImageNodeName());
-#ifdef IDLESOFTKEY_ADAPTER_IMAGEMASK
-        currentList->InsertL(currentList->Size(),KNSmlISSeparator());
-        currentList->InsertL(currentList->Size(),KNSmlIS_TargetsMaskNodeName());
-#endif
-#endif
-        break;
-        
-        case EIsNodeWebTargetsX:
-        currentList->InsertL(currentList->Size(),KNSmlIS_WebTargetsIDNodeName());
-        currentList->InsertL(currentList->Size(),KNSmlISSeparator());
-        currentList->InsertL(currentList->Size(),KNSmlIS_WebTargetsDescriptionNodeName());
-        currentList->InsertL(currentList->Size(),KNSmlISSeparator());
-        currentList->InsertL(currentList->Size(),KNSmlIS_WebTargetsURLNodeName());
-        currentList->InsertL(currentList->Size(),KNSmlISSeparator());
-        currentList->InsertL(currentList->Size(),KNSmlIS_WebTargetsUserNameNodeName());
-        currentList->InsertL(currentList->Size(),KNSmlISSeparator());
-        currentList->InsertL(currentList->Size(),KNSmlIS_WebTargetsPasswordNodeName());
-        currentList->InsertL(currentList->Size(),KNSmlISSeparator());
-        currentList->InsertL(currentList->Size(),KNSmlIS_WebTargetsConRefNodeName());
-        currentList->InsertL(currentList->Size(),KNSmlISSeparator());
-        currentList->InsertL(currentList->Size(),KNSmlIS_WebTargetsCaptionNodeName());
-#ifndef IDLESOFTKEY_ADAPTER_SOFTKEY_IMAGES
-        currentList->InsertL(currentList->Size(),KNSmlISSeparator());
-        currentList->InsertL(currentList->Size(),KNSmlIS_WebTargetsImageNodeName());
-#ifdef IDLESOFTKEY_ADAPTER_IMAGEMASK
-        currentList->InsertL(currentList->Size(),KNSmlISSeparator());
-        currentList->InsertL(currentList->Size(),KNSmlIS_WebTargetsMaskNodeName());
-#endif
-#endif
-        break;
-
-        case EIsNodeSoftKeysXID:
-        case EIsNodeSoftKeysXTargetRef:
-#ifdef IDLESOFTKEY_ADAPTER_SOFTKEY_IMAGES
-        case EIsNodeSoftKeysXImage:
-#ifdef IDLESOFTKEY_ADAPTER_IMAGEMASK
-        case EIsNodeSoftKeysXMask:
-#endif
-#endif
-        // Empty
-        break;
-
-        case EIsNodeTargetsXID:
-        case EIsNodeTargetsXDescription:
-        case EIsNodeTargetsXCaption:
-#ifndef IDLESOFTKEY_ADAPTER_SOFTKEY_IMAGES
-        case EIsNodeTargetsXImage:        
-#ifdef IDLESOFTKEY_ADAPTER_IMAGEMASK
-        case EIsNodeTargetsXImageMask:
-#endif
-#endif
-        // Empty
-        break;
-
-        case EIsNodeWebTargetsXID:
-        case EIsNodeWebTargetsXDescription:
-        case EIsNodeWebTargetsXURL:
-        case EIsNodeWebTargetsXUserName:
-        case EIsNodeWebTargetsXPassword:
-        case EIsNodeWebTargetsXConRef:
-        case EIsNodeWebTargetsXCaption:
-#ifndef IDLESOFTKEY_ADAPTER_SOFTKEY_IMAGES
-        case EIsNodeWebTargetsXImage:        
-#ifdef IDLESOFTKEY_ADAPTER_IMAGEMASK
-        case EIsNodeWebTargetsXImageMask:
-#endif
-#endif
-        // Empty
-        break;
-
-        default:
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-	if( uriPtrc.Length() == 0 )
-#else
-	if( aURI.Length() == 0 )
-#endif        
-            {
-            currentList->InsertL(0,KNSmlCustomizationNodeName());
-            }
-        else
-            {                
-            ret = CSmlDmAdapter::ENotFound;
-            }
-        break;
-        }
-
-    iCallBack->SetStatusL(aStatusRef, ret);
-
-    if( ret == CSmlDmAdapter::EOk )
-        {
-        iCallBack->SetResultsL(aResultsRef, *currentList, KNSmlISTextPlain);
-        }
-
-    CleanupStack::PopAndDestroy( currentList );
-
-    RDEBUG( "CIsAdapter::_ChildURIListL() <" );
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CIsAdapter::AddNodeObjectL
-// ------------------------------------------------------------------------------------------------
-void CIsAdapter::AddNodeObjectL( CSmlDmAdapter::TError &aStatus, const TDesC8& aURI,
-                                 const TDesC8& /*aParentLUID*/ )
-    {
-    RDEBUG( "CIsAdapter::AddNodeObjectL() >" );
-
-	// SymbianConvergency NOTE! See _AddNodeObjectL() <-> it removes the "./" from aURI
-
-    CIsAdapter::TIsNodeIdentifier identifier = GetNodeIdentifier( aURI );
-
-    HBufC8* dataH = HBufC8::NewLC( KRepositoryEntryMaxLength );
-    RDEBUG_2( "CIsAdapter::AddNodeObjectL() HBufC8 dataH ALLOC %x", dataH);
-    TPtr8 data( dataH->Des() );
-    TInt index = -1;
-    TInt ret = KErrNone;
-
-    switch( identifier )
-        {
-            case EIsNodeWebTargetsX:
-                {
-                TRAPD( reason,
-                    ret = 
-                    iWebTargetManager->GetTargetFromNodeNameL( aURI, index ) ); // Ignore index                
-                if( (KErrNone != reason) || (KErrNone != ret) )
-                    {
-                    RDEBUG_2( "CIsAdapter::AddNodeObjectL: New WebTarget (%d)", reason);
-                    CFavouritesItem *favItem = CFavouritesItem::NewLC();
-                    RDEBUG_2( "CIsAdapter::AddNodeObjectL() CFavouritesItem ALLOC %x", favItem);
-
-                    TPtrC8 namePtr( NSmlDmURI::LastURISeg(aURI) );
-                    HBufC* nameBuf = HBufC::NewLC( namePtr.Length() );
-                    RDEBUG_2( "CIsAdapter::AddNodeObjectL() HBufC nameBuf ALLOC %x", nameBuf);
-
-                    nameBuf->Des().Copy( namePtr );
-                    favItem->SetNameL( *nameBuf );
-                    CleanupStack::PopAndDestroy( nameBuf );
-
-                    favItem->SetUrlL(_L("http://"));
-                    favItem->SetParentFolder(KFavouritesRootUid);
-
-                    if( KErrNone == iFavDb.Add( *favItem, ETrue ) )
-                        {
-                        TBuf8<MAX_NUMBER_OF_DIGITS_IN_10BASE_INT64> newUID;
-                        newUID.Num( favItem->Uid() );
-
-                        if( KErrNone == iWebTargetManager->FindLUIDByURIL( aURI, data, index ) )
-                            {
-                            aStatus = CSmlDmAdapter::EAlreadyExists;
-                            }
-                         
-                            /*
-                        else
-                        if( KErrNone == iWebTargetManager->FindURIByLUIDL( data, newUID, index ) )
-                            {
-                            aStatus = CSmlDmAdapter::EAlreadyExists;
-                            }*/
-                        else
-                            {
-                            RDEBUG8_2( "CIsAdapter::AddNodeObjectL: New WebTarget UID=%S", &newUID );
-                            iWebTargetManager->FindURIByLUIDL( data, newUID, index ); // Replace if LUid exists...
-                            iWebTargetManager->UpdateLUIDDatabaseL( aURI, newUID, index );
-                            iCallBack->SetMappingL( aURI, newUID );
-                            }
-                        }
-                    else
-                        {
-                        aStatus = CSmlDmAdapter::EError;
-                        }
-
-                    CleanupStack::PopAndDestroy( favItem );
-                    }
-                else
-                    {
-                    aStatus = CSmlDmAdapter::EAlreadyExists;
-                    }
-                }
-            break;
-
-            default:
-                aStatus = CSmlDmAdapter::EError;
-            break;
-        };
-
-    CleanupStack::PopAndDestroy(dataH);
-
-    RDEBUG( "CIsAdapter::AddNodeObjectL() <" );
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CIsAdapter::_AddNodeObjectL
-// ------------------------------------------------------------------------------------------------
-void CIsAdapter::_AddNodeObjectL( const TDesC8& aURI, const TDesC8& aParentLUID, TInt aStatusRef )
-    {
-    RDEBUG( "CIsAdapter::_AddNodeObjectL() >" );
-
-    CSmlDmAdapter::TError status = CSmlDmAdapter::EOk;
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-	TPtrC8 uriPtrc = NSmlDmURI::RemoveDotSlash( aURI );
-	TRAPD(
-        reason,
-        AddNodeObjectL( status, uriPtrc, aParentLUID ) );
-#else
-	TRAPD(
-        reason,
-        AddNodeObjectL( status, aURI, aParentLUID ) );
-#endif
-
-    if( KErrNone != reason )
-        {
-        RDEBUG_2( "CIsAdapter::_AddNodeObjectL: Error code %d", reason);
-        status = CSmlDmAdapter::EError;
-        }
-
-    iCallBack->SetStatusL(aStatusRef, status);
-
-    RDEBUG( "CIsAdapter::_AddNodeObjectL() <" );
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CIsAdapter::_ExecuteCommandL
-// ------------------------------------------------------------------------------------------------
-void CIsAdapter::_ExecuteCommandL( const TDesC8& /*aURI*/, const TDesC8& /*aLUID*/,
-                                  const TDesC8& /*aArgument*/, const TDesC8& /*aType*/,
-                                  TInt aStatusRef )
-    {
-    RDEBUG( "CIsAdapter::_ExecuteCommandL() >" );
-
-    CSmlDmAdapter::TError ret = CSmlDmAdapter::EError;
-    iCallBack->SetStatusL(aStatusRef, ret);    
-
-    RDEBUG( "CIsAdapter::_ExecuteCommandL() <" );
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CIsAdapter::_ExecuteCommandL
-// ------------------------------------------------------------------------------------------------
-void CIsAdapter::_ExecuteCommandL( const TDesC8& /*aURI*/, const TDesC8& /*aLUID*/,
-                                  RWriteStream*& /*aStream*/, const TDesC8& /*aType*/,
-                                  TInt aStatusRef )
-    {
-    RDEBUG( "CIsAdapter::_ExecuteCommandL() (stream) >" );
-
-    CSmlDmAdapter::TError ret = CSmlDmAdapter::EError;
-    iCallBack->SetStatusL(aStatusRef, ret);    
-
-    RDEBUG( "CIsAdapter::_ExecuteCommandL() (stream) <" );
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CIsAdapter::_CopyCommandL
-// ------------------------------------------------------------------------------------------------
-void CIsAdapter::_CopyCommandL( const TDesC8& /*aTargetURI*/, const TDesC8& /*aTargetLUID*/,
-                               const TDesC8& /*aSourceURI*/, const TDesC8& /*aSourceLUID*/,
-                               const TDesC8& /*aType*/, TInt aStatusRef )
-    {
-    RDEBUG( "CIsAdapter::_CopyCommandL() >" );
-
-    CSmlDmAdapter::TError ret = CSmlDmAdapter::EError;
-    iCallBack->SetStatusL(aStatusRef, ret);    
-
-    RDEBUG( "CIsAdapter::_CopyCommandL() <" );
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CIsAdapter::StartAtomicL
-// ------------------------------------------------------------------------------------------------
-void CIsAdapter::StartAtomicL()
-    {
-    RDEBUG( "CIsAdapter::StartAtomicL() ><" );
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CIsAdapter::CommitAtomicL
-// ------------------------------------------------------------------------------------------------
-void CIsAdapter::CommitAtomicL()
-    {
-    RDEBUG( "CIsAdapter::CommitAtomicL() ><" );
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CIsAdapter::RollbackAtomicL
-// ------------------------------------------------------------------------------------------------
-void CIsAdapter::RollbackAtomicL()
-    {
-    RDEBUG( "CIsAdapter::RollbackAtomicL() ><" );
-
-    
-    CSmlDmAdapter::TError status = CSmlDmAdapter::ERollbackFailed;
-    iCallBack->SetStatusL(0, status);    
-    }
-
-// -----------------------------------------------------------------------------
-// CIsAdapter::StreamType
-// 
-// -----------------------------------------------------------------------------
-CTARMDmStreamAdapter::TAdapterStreamType CIsAdapter::StreamType( const TDesC8& /*aURI*/ )
-    {
-	RDEBUG( "CIsAdapter::StreamType()" );
-    return CTARMDmStreamAdapter::EStreamToBuffer;
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CIsAdapter::StreamingSupport
-// ------------------------------------------------------------------------------------------------
-TBool CIsAdapter::StreamingSupport( TInt& aItemSize )
-    {
-	RDEBUG( "CIsAdapter::StreamingSupport()" );
-    aItemSize = 1024; // Large images are streamed 
-    return EFalse;	// don't support stream
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CIsAdapter::CompleteOutstandingCmdsL
-// ------------------------------------------------------------------------------------------------
-void CIsAdapter::CompleteOutstandingCmdsL()
-    {
-    RDEBUG( "CIsAdapter::CompleteOutstandingCmdsL() ><" );
-    }
-
-// ------------------------------------------------------------------------------------------------
-// ImplementationTable
-// ------------------------------------------------------------------------------------------------
-const TImplementationProxy ImplementationTable[] = 
-    {
-    { { KNSmlDMISAdapterImplUidValue }, (TProxyNewLPtr)CIsAdapter::NewL }
-    };
-
-// ------------------------------------------------------------------------------------------------
-// ImplementationGroupProxy
-// ------------------------------------------------------------------------------------------------
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy( TInt& aTableCount )
-    {
-    aTableCount = sizeof(ImplementationTable) / sizeof(TImplementationProxy);
-    return ImplementationTable;
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CIsAdapter::ConstructL
-// ------------------------------------------------------------------------------------------------
-void CIsAdapter::ConstructL(MSmlDmCallback *aDmCallback)
-    {
-    RDEBUG( "CIsAdapter::ConstructL() >" );
-	
-	TRAPD( errf, FeatureManager::InitializeLibL() );
-	if( errf != KErrNone )
-	{
-		User::Leave(errf);
-	}
-	
-	if(FeatureManager::FeatureSupported(KFeatureIdSapIdleSoftkeyAdapter))
-	{
-    iCallBack = aDmCallback;
-	
-    //User::LeaveIfError( iUiSrv.Connect() );
-    //iUiSrv.UpdateShortcutTargetList();
-
-    User::LeaveIfError( iFavSession.Connect() );
-    User::LeaveIfError( iFavDb.Open( iFavSession, KBrowserBookmarks ) );
-
-    TInt count = 0;
-    // Get / create the count
-    //
-    CRepository* rep = CRepository::NewLC( KNSmlDMISAdapterCentRepUid );
-    RDEBUG_2( "CIsAdapter::ConstructL() CRepository ALLOC %x", rep);
-
-    TInt ret = rep->Get((TUint32)KRepositoryIdBookmarkCount, count);
-    if( ret == KErrNotFound )
-        {
-        ret = rep->Create((TUint32)KRepositoryIdBookmarkCount, count);
-        }
-
-    CleanupStack::PopAndDestroy( rep );
-
-    iWebTargetManager = new (ELeave) CIdleSoftkeysWebTargetManager(
-                                                      iCallBack,
-                                                      iFavDb 
-                                                      );
-    iWebTargetManager->CheckLUIDDatabaseL( EFalse );
-
-    iAppTargetManager = new (ELeave) CIdleSoftkeysAppTargetManager(
-                                                      iCallBack 
-    
-                                                      );
-    // just creating a pointer to the class
-    // this needs to be initialized before it is used
-    // to initialize we use ReadBookmarksL and ReadTargetsL function
-    iUiSettings = CUiSettingsUtil::NewL( );
-
-    RDEBUG( "CIsAdapter::ConstructL() <" );
-    }
-    else
-	{
-		FeatureManager::UnInitializeLib();
-   		User::Leave( KErrNotSupported );
-	}
-    
-    }
-
-// -------------------------------------------------------------------------------------
-// CIsAdapter::FillNodeInfoL()
-// Fills the node info in ddf structure
-// -------------------------------------------------------------------------------------
-void CIsAdapter::FillNodeInfoL( MSmlDmDDFObject& aNode,TSmlDmAccessTypes aAccTypes,
-                                        MSmlDmDDFObject::TOccurence aOccurrence, MSmlDmDDFObject::TScope aScope, 
-                                        MSmlDmDDFObject::TDFFormat aFormat,const TDesC8& aDescription,const TDesC8& aMimeType)
-    {
-    RDEBUG( "CIsAdapter::FillNodeInfoL() >" );
-
-    aNode.SetAccessTypesL(aAccTypes);
-    aNode.SetOccurenceL(aOccurrence);
-    aNode.SetScopeL(aScope);
-    aNode.SetDFFormatL(aFormat);
-    aNode.SetDescriptionL(aDescription);
-    if(aMimeType.Length() > 0)
-        {
-        aNode.AddDFTypeMimeTypeL(aMimeType);
-        }
-
-    RDEBUG( "CIsAdapter::FillNodeInfoL() <" );
-    }
-
-// -------------------------------------------------------------------------------------
-// CIsAdapter::GetNodeIdentifier
-// -------------------------------------------------------------------------------------
-CIsAdapter::TIsNodeIdentifier CIsAdapter::GetNodeIdentifier(const TDesC8& aURI)
-    {
-    RDEBUG( "CIsAdapter::GetNodeIdentifier() >" );
-
-	// SymbianConvergency NOTE! Look _DeleteObjectL() <-> removes the "./" from the aURI !!
-
-    TInt numOfSegs = NSmlDmURI::NumOfURISegs( aURI );
-    if(numOfSegs == 0)
-        {
-        return CIsAdapter::EIsNodeNotUsedAndAlwaysLast;
-        }
-    
-    TPtrC8I seg1 = NSmlDmURI::URISeg( aURI, 0 );
-
-    if(seg1 == KNSmlCustomizationNodeName)
-        {
-        if(numOfSegs == 1)
-            {
-            return EIsNodeCustomization;
-            }
-
-        // At least 2 segments
-        TPtrC8I seg2 = NSmlDmURI::URISeg( aURI, 1 );
-        if(seg2 == KNSmlIS_IdleSoftKeyNodeName)
-            {
-            if(numOfSegs == 2)
-                {
-                return CIsAdapter::EIsNodeIdleSoftkeys;
-                }
-
-            // At least 3 segments
-            TPtrC8I seg3 = NSmlDmURI::URISeg( aURI, 2 );
-            if(seg3 == KNSmlIS_SoftKeysNodeName)
-                {
-                if(numOfSegs == 3)
-                    {
-                    return CIsAdapter::EIsNodeSoftKeys;
-                    }
-                    
-                // At least 4 segments  
-                if(numOfSegs == 4)
-                    {
-                    return CIsAdapter::EIsNodeSoftKeysX;
-                    }
-
-                // At least 5 segments
-                TPtrC8I seg5 = NSmlDmURI::URISeg( aURI, 4 );
-                if(seg5 == KNSmlIS_SoftkeysIDNodeName)
-                    {
-                    return CIsAdapter::EIsNodeSoftKeysXID;
-                    }
-                    else
-                if(seg5 == KNSmlIS_SoftkeysTargetRefNodeName)
-                    {
-                    return CIsAdapter::EIsNodeSoftKeysXTargetRef;
-                    }
-#ifdef IDLESOFTKEY_ADAPTER_SOFTKEY_IMAGES
-                    else
-                if(seg5 == KNSmlIS_SoftkeysImageNoneName)
-                    {
-                    return CIsAdapter::EIsNodeSoftKeysXImage;
-                    }
-#ifdef IDLESOFTKEY_ADAPTER_IMAGEMASK
-                    else
-                if(seg5 == KNSmlIS_SoftkeysMaskNodeName)
-                    {
-                    return CIsAdapter::EIsNodeSoftKeysXMask;
-                    }
-#endif
-#endif
-                else
-                    {
-                    return CIsAdapter::EIsNodeNotUsedAndAlwaysLast;
-                    }
-                }
-                else
-            if(seg3 == KNSmlIS_TargetsNodeName)
-                {
-                if(numOfSegs == 3)
-                    {
-                    return CIsAdapter::EIsNodeTargets;
-                    }
-
-                // At least 4 segments  
-                if(numOfSegs == 4)
-                    {
-                    return CIsAdapter::EIsNodeTargetsX;
-                    }
-
-                // At least 5 segments
-                TPtrC8I seg5 = NSmlDmURI::URISeg( aURI, 4 );
-                if(seg5 == KNSmlIS_TargetsIDNodeName)
-                    {
-                    return CIsAdapter::EIsNodeTargetsXID;
-                    }
-                    else
-                if(seg5 == KNSmlIS_TargetsDescriptionNodeName)
-                    {
-                    return CIsAdapter::EIsNodeTargetsXDescription;
-                    }
-                // ...
-                    else
-                if(seg5 == KNSmlIS_TargetsCaptionName)
-                    {
-                    return CIsAdapter::EIsNodeTargetsXCaption;
-                    }
-#ifndef IDLESOFTKEY_ADAPTER_SOFTKEY_IMAGES
-                    else
-                if(seg5 == KNSmlIS_TargetsImageNodeName)
-                    {
-                    return CIsAdapter::EIsNodeTargetsXImage;
-                    }
-#ifdef IDLESOFTKEY_ADAPTER_IMAGEMASK
-                    else
-                if(seg5 == KNSmlIS_TargetsMaskNodeName)
-                    {
-                    return CIsAdapter::EIsNodeTargetsXImageMask;
-                    }
-#endif
-#endif
-                // ...
-                else
-                
-                    {
-                    return CIsAdapter::EIsNodeNotUsedAndAlwaysLast;
-                    }
-                }
-                else
-            if(seg3 == KNSmlIS_WebTargetsNodeName)
-                {
-                if(numOfSegs == 3)
-                    {
-                    return CIsAdapter::EIsNodeWebTargets;
-                    }
-
-                // At least 4 segments  
-                if(numOfSegs == 4)
-                    {
-                    return CIsAdapter::EIsNodeWebTargetsX;
-                    }
-
-                // At least 5 segments
-                TPtrC8I seg5 = NSmlDmURI::URISeg( aURI, 4 );
-                if(seg5 == KNSmlIS_WebTargetsIDNodeName)
-                    {
-                    return CIsAdapter::EIsNodeWebTargetsXID;
-                    }
-                    else
-                if(seg5 == KNSmlIS_WebTargetsDescriptionNodeName)
-                    {
-                    return CIsAdapter::EIsNodeWebTargetsXDescription;
-                    }
-                    else
-                if(seg5 == KNSmlIS_WebTargetsURLNodeName)
-                    {
-                    return CIsAdapter::EIsNodeWebTargetsXURL;
-                    }
-                    else
-                if(seg5 == KNSmlIS_WebTargetsUserNameNodeName)
-                    {
-                    return CIsAdapter::EIsNodeWebTargetsXUserName;
-                    }
-                    else
-                if(seg5 == KNSmlIS_WebTargetsPasswordNodeName)
-                    {
-                    return CIsAdapter::EIsNodeWebTargetsXPassword;
-                    }
-                    else
-                if(seg5 == KNSmlIS_WebTargetsConRefNodeName)
-                    {
-                    return CIsAdapter::EIsNodeWebTargetsXConRef;
-                    }
-                // ...
-                    else
-                if(seg5 == KNSmlIS_WebTargetsCaptionNodeName)
-                    {
-                    return CIsAdapter::EIsNodeWebTargetsXCaption;
-                    }
-#ifndef IDLESOFTKEY_ADAPTER_SOFTKEY_IMAGES
-                    else
-                if(seg5 == KNSmlIS_WebTargetsImageNodeName)
-                    {
-                    return CIsAdapter::EIsNodeWebTargetsXImage;
-                    }
-#ifdef IDLESOFTKEY_ADAPTER_IMAGEMASK
-                    else
-                if(seg5 == KNSmlIS_WebTargetsMaskNodeName)
-                    {
-                    return CIsAdapter::EIsNodeWebTargetsXImageMask;
-                    }
-#endif
-#endif
-                // ...
-                else
-                    {
-                    return CIsAdapter::EIsNodeNotUsedAndAlwaysLast;
-                    }                
-                }
-            else
-                {
-                return CIsAdapter::EIsNodeNotUsedAndAlwaysLast;
-                }
-            }
-        else
-            {
-            return CIsAdapter::EIsNodeNotUsedAndAlwaysLast;
-            }
-        }
-    else
-        {
-        return CIsAdapter::EIsNodeNotUsedAndAlwaysLast;
-        }
-
-    // Note: do not return anything here
-    }
-
-   
-// -------------------------------------------------------------------------------------
-// CIsAdapter::CopyAndTrimMimeType
-// -------------------------------------------------------------------------------------
-void CIsAdapter::CopyAndTrimMimeType(TDes8& aNewMime, const TDesC8& aType)
-    {
-    RDEBUG( "CIsAdapter::CopyAndTrimMimeType() >" );
-
-    if(aNewMime.MaxLength() < aType.Length())
-        {
-        aNewMime.Copy( aType.Left(aNewMime.MaxLength()) );
-        }
-    else
-        {
-        aNewMime.Copy( aType );           
-        }        
-    aNewMime.TrimAll();
-    aNewMime.LowerCase();
-    
-    TInt pos;
-    while(( pos = aNewMime.Locate(' ')  ) != KErrNotFound)
-        {
-            aNewMime.Delete(pos, 1);
-        }
-
-    RDEBUG( "CIsAdapter::CopyAndTrimMimeType() <" );
-    }
-
-// -------------------------------------------------------------------------------------
-// CIsAdapter::ListSoftkeysL
-// -------------------------------------------------------------------------------------
-TInt CIsAdapter::ListSoftkeysL( CBufFlat &aList )
-    {
-    RDEBUG( "CIsAdapter::ListSoftkeysL() >" );
-
-    TInt i;
-    for(i=0; i<NumberOfSoftkeys/*iUiSettings->GetSoftkeyCountL()*/; i++)
-        {
-        if(i>0)
-            {
-            aList.InsertL( aList.Size(), KNSmlISSeparator() );
-            }
-
-        HBufC8* softkeyName = GenerateSoftkeyNodeNameL( i );
-        CleanupStack::PushL( softkeyName );
-        
-        aList.InsertL( aList.Size(), *softkeyName );
-
-        CleanupStack::PopAndDestroy( softkeyName );
-        }
-
-    RDEBUG( "CIsAdapter::ListSoftkeysL() <" );
-    return KErrNone;
-    }
-
-// -------------------------------------------------------------------------------------
-// CIsAdapter::GenerateSoftkeyNodeNameL
-// -------------------------------------------------------------------------------------
-HBufC8* CIsAdapter::GenerateSoftkeyNodeNameL(TInt aIndex )
-    {
-    RDEBUG( "CIsAdapter::GenerateSoftkeyNodeNameL() >" );
-
-    TInt index = aIndex;
-
-    HBufC8* softkeyName = HBufC8::NewL( KPrefixSoftkeyNodeName().Length()
-                                + MAX_NUMBER_OF_DIGITS_IN_10BASE_INT64 );
-
-    TPtr8 ptr( softkeyName->Des() );
-
-    ptr.Format(KFormatSoftkeyNodeName, index+1);
-    
-    RDEBUG8_2( "CIsAdapter::GenerateSoftkeyNodeNameL() < %S", &softkeyName );
-    return softkeyName;
-    }
-
-// -------------------------------------------------------------------------------------
-// CIsAdapter::GetSoftkeyIndexFromUid
-// -------------------------------------------------------------------------------------
-TInt CIsAdapter::GetSoftkeyIndexFromUid( TInt aUid )
-    {
-    RDEBUG( "CIsAdapter::GetSoftkeyIndexFromUid() >" );
-
-    switch( aUid )
-        {
-        case KScActionTypeUidValueSoftkeyLeft:
-        return 0;
-        case KScActionTypeUidValueSoftkeyRight:
-        return 1;
-        case KScActionTypeUidValueScrollkeyLeft:
-        return 2;
-        case KScActionTypeUidValueScrollkeyRight:
-        return 3;
-        case KScActionTypeUidValueScrollkeyUp:
-        return 4;
-        case KScActionTypeUidValueScrollkeyDown:
-        return 5;
-        case KScActionTypeUidValueScrollkeySelect:
-        return 6;
-        case KActiveIdleScUidValueItem1:
-        return 7;
-        case KActiveIdleScUidValueItem2:
-        return 8;
-        case KActiveIdleScUidValueItem3:
-        return 9;
-        case KActiveIdleScUidValueItem4:
-        return 10;
-        case KActiveIdleScUidValueItem5:
-        return 11;
-        default:
-        return -1;
-        }
-        
-    //    return aUid;
-    }
-
-// -------------------------------------------------------------------------------------
-// CIsAdapter::GetSoftkeyUidFromNodeNameL
-// -------------------------------------------------------------------------------------
-TInt CIsAdapter::GetSoftkeyUidFromNodeNameL(const TDesC8& aNodeName)
-    {
-    RDEBUG( "CIsAdapter::GetSoftkeyUidFromNodeNameL() >" );
-
-    TInt index = -1;
-    TInt compareLen = KPrefixSoftkeyNodeName().Length();
-    if(aNodeName.Left(compareLen) == KFormatSoftkeyNodeName().Left(compareLen))
-        {
-        TLex8 lex;
-        lex.Assign( aNodeName );
-        
-        lex.Inc( compareLen );
-        User::LeaveIfError( lex.Val(index) );
-        index--;
-        User::LeaveIfError( index>=0 && index<NumberOfSoftkeys/*iUiSettings->GetSoftkeyCountL()*/ ? KErrNone : KErrGeneral );
-        
-        HBufC8* softkeyName = GenerateSoftkeyNodeNameL( index );
-        CleanupStack::PushL( softkeyName );
-        
-        TPtr8 ptr( softkeyName->Des() );
-        User::LeaveIfError( ptr == aNodeName ? KErrNone : KErrGeneral );
-        
-        CleanupStack::PopAndDestroy( softkeyName );
-        }
-    else
-        {
-        User::Leave( KErrNotFound );
-        }
-
-    RDEBUG_2( "CIsAdapter::GetSoftkeyUidFromNodeNameL() < %d", iSoftkeyList[ index ] );
-    return iSoftkeyList[ index ];
-    }
-
-// -------------------------------------------------------------------------------------
-// CIsAdapter::AddShortcutNameL
-// -------------------------------------------------------------------------------------
-void CIsAdapter::AddShortcutNameL(CBufFlat& aBuffer, TInt aUid)
-    {
-    RDEBUG( "CIsAdapter::AddShortcutNameL() >" );
-
-    switch( aUid )
-        {
-        
-            case KScActionTypeUidValueSoftkeyLeft:
-            aBuffer.InsertL( aBuffer.Size(), KISLeftSoftkeyName() );
-            break;
-            case KScActionTypeUidValueSoftkeyRight:
-            aBuffer.InsertL( aBuffer.Size(), KISRightSoftkeyName() );
-            break;
-            case KScActionTypeUidValueScrollkeyLeft:
-            aBuffer.InsertL( aBuffer.Size(), KISScrollLeftSoftkeyName() );
-            break;
-            case KScActionTypeUidValueScrollkeyRight:
-            aBuffer.InsertL( aBuffer.Size(), KISScrollRightSoftkeyName() );
-            break;
-            case KScActionTypeUidValueScrollkeyUp:
-            aBuffer.InsertL( aBuffer.Size(), KISScrollUpSoftkeyName() );
-            break;
-            case KScActionTypeUidValueScrollkeyDown:
-            aBuffer.InsertL( aBuffer.Size(), KISScrollDownSoftkeyName() );
-            break;
-            case KScActionTypeUidValueScrollkeySelect:
-            aBuffer.InsertL( aBuffer.Size(), KISSelectionSoftkeyName() );
-            break;
-
-            case KActiveIdleScUidValueItem1:
-            aBuffer.InsertL( aBuffer.Size(), KISAISoftkeyName1() );
-            break;
-            case KActiveIdleScUidValueItem2:
-            aBuffer.InsertL( aBuffer.Size(), KISAISoftkeyName2() );
-            break;
-            case KActiveIdleScUidValueItem3:
-            aBuffer.InsertL( aBuffer.Size(), KISAISoftkeyName3() );
-            break;
-            case KActiveIdleScUidValueItem4:
-            aBuffer.InsertL( aBuffer.Size(), KISAISoftkeyName4() );
-            break;
-            case KActiveIdleScUidValueItem5:
-            aBuffer.InsertL( aBuffer.Size(), KISAISoftkeyName5() );
-            break;
-            case KActiveIdleScUidValueItem6:
-            aBuffer.InsertL( aBuffer.Size(), KISAISoftkeyName6() );
-            break;
-            
-            
-            
-        }
-    RDEBUG( "CIsAdapter::AddShortcutNameL() <" );
-    }
-
-#ifdef IDLESOFTKEY_ADAPTER_SOFTKEY_IMAGES
-
-void CIsAdapter::GetSoftkeyImageL(
-                    TInt /*aSoftkeyUid*/,
-                    CBufFlat &aImageBuffer,
-                    TBool /*aGetMask*//*=EFalse*/ )
-    {
-    RDEBUG( "CIsAdapter::GetSoftkeyImageL() >" );
-
-    TFileName  filename;
-    TBuf8<128> mimetype;
-    
-    
-    
-    /*
-
-    if( aGetMask )
-        {
-        User::LeaveIfError( iUiSrv.GetSoftkeyMask(
-                                aSoftkeyUid,
-                                filename,
-                                mimetype
-                            ) );
-        }
-    else
-        {
-        User::LeaveIfError( iUiSrv.GetSoftkeyBitmap(
-                                aSoftkeyUid,
-                                filename,
-                                mimetype
-                            ) );
-        }
-        
-        */
-
-    RFs   fileSession;
-    RFile file;
-
-    User::LeaveIfError( fileSession.Connect() );
-    CleanupClosePushL( fileSession );
-
-    //
-    // Create new temp file
-    //
-    User::LeaveIfError( file.Open( fileSession, filename, EFileRead ) );
-    CleanupClosePushL( file );
-
-    //
-    // Decode data to buffer
-    //
-    TInt size = 0;
-    file.Size( size );
-    HBufC8* buffer = HBufC8::NewLC( size );
-
-    TPtr8 ptr( 0, 0 );
-    ptr.Set( buffer->Des() );
-    User::LeaveIfError( file.Read( ptr ) );
-
-    EncodeImageL( aImageBuffer, ptr );
-
-    CleanupStack::PopAndDestroy( buffer );
-
-    // Close file
-    CleanupStack::PopAndDestroy( &file );
-
-    // Close fileSession
-    CleanupStack::PopAndDestroy( &fileSession );
-
-    RDEBUG( "CIsAdapter::GetSoftkeyImageL() <" );
-    }
-
-#endif
-
-#ifndef IDLESOFTKEY_ADAPTER_SOFTKEY_IMAGES
-
-// -------------------------------------------------------------------------------------
-// CIsAdapter::GetApplicationImageL
-// -------------------------------------------------------------------------------------
-void CIsAdapter::GetApplicationImageL(
-                        TInt aIndex,
-                        CBufFlat &aImageBuffer,
-                        TBool aGetMask/*=EFalse*/ )
-    {
-    RDEBUG( "CIsAdapter::GetApplicationImageL() >" );
-
-    GetShortcutImageL(
-        EUiSrvRtTypeApp,
-        aIndex,
-        aImageBuffer,
-        aGetMask
-        );
-
-    RDEBUG( "CIsAdapter::GetApplicationImageL() <" );
-    }
-
-// -------------------------------------------------------------------------------------
-// CIsAdapter::GetBookmarkImageL
-// -------------------------------------------------------------------------------------
-void CIsAdapter::GetBookmarkImageL(
-                        TInt aIndex,
-                        CBufFlat &aImageBuffer,
-                        TBool aGetMask/*=EFalse*/ )
-    {
-    RDEBUG( "CIsAdapter::GetBookmarkImageL() >" );
-
-    GetShortcutImageL(
-        EUiSrvRtTypeBm,
-        aIndex,
-        aImageBuffer,
-        aGetMask
-        );
-
-    RDEBUG( "CIsAdapter::GetBookmarkImageL() <" );
-    }
-
-#endif
-
-#ifndef IDLESOFTKEY_ADAPTER_SOFTKEY_IMAGES
-
-// -------------------------------------------------------------------------------------
-// CIsAdapter::GetShortcutImageL
-// -------------------------------------------------------------------------------------
-void CIsAdapter::GetShortcutImageL(
-                        TInt aRtMask,
-                        TInt aIndex,
-                        CBufFlat &aImageBuffer,
-                        TBool aGetMask/*=EFalse*/ )
-    {
-    RDEBUG( "CIsAdapter::GetShortcutImageL() >" );
-    TFileName  filename;
-    TBuf8<128> mimetype;
-
-    if( aGetMask )
-        {
-        User::LeaveIfError( iUiSrv.GetShortcutTargetMask(
-                                aRtMask,
-                                aIndex,
-                                filename,
-                                mimetype
-                            ) );
-        }
-    else
-        {
-        User::LeaveIfError( iUiSrv.GetShortcutTargetBitmap(
-                                aRtMask,
-                                aIndex,
-                                filename,
-                                mimetype
-                            ) );
-        }
-
-    RFs   fileSession;
-    RFile file;
-
-    User::LeaveIfError( fileSession.Connect() );
-    CleanupClosePushL( fileSession );
-
-    //
-    // Create new temp file
-    //
-    User::LeaveIfError( file.Open( fileSession, filename, EFileRead ) );
-    CleanupClosePushL( file );
-
-    //
-    // Decode data to buffer
-    //
-    TInt size = 0;
-    file.Size( size );
-    HBufC8* buffer = HBufC8::NewLC( size );
-
-    TPtr8 ptr( 0, 0 );
-    ptr.Set( buffer->Des() );
-    User::LeaveIfError( file.Read( ptr ) );
-
-    EncodeImageL( aImageBuffer, ptr );
-
-    CleanupStack::PopAndDestroy( buffer );
-
-    // Close file
-    CleanupStack::PopAndDestroy( &file );
-
-    // Close fileSession
-    CleanupStack::PopAndDestroy( &fileSession );
-
-    RDEBUG( "CIsAdapter::GetShortcutImageL() <" );
-    }
-#endif
-
-#ifdef IDLESOFTKEY_ADAPTER_SOFTKEY_IMAGES
-void CIsAdapter::SetSoftkeyImageL (
-                            const TDesC8& aURI,
-                            const TDesC8& aObject,
-                            const TDesC8& aType)
-    {
-    RDEBUG( "CIsAdapter::SetSoftkeyImageL() >" );
-
-	// SymbianConvergency NOTE! Functions that call this function will parse off the "./"
-	// from the aURI -> no need to parse "./" here
-
-    if( aType.Length() == 0 )
-        {
-        RDEBUG( "CIsAdapter::SetSoftkeyImageL() WARNING Mime type is empty!" );
-        }
-
-    CIsAdapter::TIsNodeIdentifier identifier = GetNodeIdentifier( aURI );
-    TInt softkeyUid = 0;
-
-    if(
-
-           (EIsNodeSoftKeysXImage    != identifier)
-
-#ifdef IDLESOFTKEY_ADAPTER_IMAGEMASK
-
-        && (EIsNodeSoftKeysXMask     != identifier)
-
-#endif
-
-        )
-        {
-        User::Leave( KErrArgument );
-        }
-
-    //
-    // Get shortcut target index
-    //
-    switch( identifier )
-        {
-
-        // Softkeys/*
-        case EIsNodeSoftKeysXImage:
-#ifdef IDLESOFTKEY_ADAPTER_IMAGEMASK
-        case EIsNodeSoftKeysXMask:
-#endif
-            {
-            softkeyUid = GetSoftkeyUidFromNodeNameL( NSmlDmURI::URISeg( aURI, 3 ) );
-            if(softkeyUid)
-               RDEBUG_2( "CIsAdapter::GetShortcutImageL() < %d", softkeyUid  );
-            }
-        break;
-
-        default:
-            User::Leave( KErrArgument );
-        break;
-
-        }
-	
-    //
-    // Decode image data
-    //
-    DecodeImageToFileL( aObject );
-/*
-    switch( identifier )
-        {
-        case EIsNodeSoftKeysXImage:
-        User::LeaveIfError( iUiSrv.SetSoftkeyBitmap(
-                                        softkeyUid,
-                                        iTemporaryImageFile,
-                                        aType ) );
-        break;
-
-#ifdef IDLESOFTKEY_ADAPTER_IMAGEMASK
-        case EIsNodeSoftKeysXMask:
-        User::LeaveIfError( iUiSrv.SetSoftkeyMask(
-                                        softkeyUid,
-                                        iTemporaryImageFile,
-                                        aType ) );
-        break;
-
-#endif
-        }
-        */
-
-    RDEBUG( "CIsAdapter::SetSoftkeyImageL() <" );   
-    }
-#endif
-
-#ifndef IDLESOFTKEY_ADAPTER_SOFTKEY_IMAGES
-// -------------------------------------------------------------------------------------
-// CIsAdapter::SetShortcutTargetImageL
-// -------------------------------------------------------------------------------------
-void CIsAdapter::SetShortcutTargetImageL(
-                               const TDesC8& aURI,
-                               const TDesC8& aObject,
-                               const TDesC8& aType)
-    {
-    RDEBUG( "CIsAdapter::SetShortcutTargetImageL() >" );
-    
-    // SymbianConvergency NOTE! Functions that call this function will parse off the "./"
-	// from the aURI -> no need to parse "./" here
-    
-    if( aType.Length() == 0 )
-        {
-        RDEBUG( "CIsAdapter::SetShortcutTargetImageL() WARNING Mime type is empty!" );
-        }
-
-    CIsAdapter::TIsNodeIdentifier identifier = GetNodeIdentifier( aURI );
-    TInt targetIndex = 0;
-
-    if(
-           (EIsNodeTargetsXImage    != identifier)
-        && (EIsNodeWebTargetsXImage != identifier)
-
-#ifdef IDLESOFTKEY_ADAPTER_IMAGEMASK
-
-        && (EIsNodeTargetsXImageMask    != identifier)
-        && (EIsNodeWebTargetsXImageMask != identifier)
-
-#endif
-
-        )
-        {
-        User::Leave( KErrArgument );
-        }
-
-    //
-    // Get shortcut target index
-    //
-    switch( identifier )
-        {
-
-        // Targets/*
-        case EIsNodeTargetsXImage:
-#ifdef IDLESOFTKEY_ADAPTER_IMAGEMASK
-        case EIsNodeTargetsXImageMask:
-#endif
-            {
-            TBuf8<ISADAPTER_SHORTCUT_CAPTION_MAXLENGTH> caption;
-            iAppTargetManager->GetTargetFromNodeNameL( NSmlDmURI::URISeg( aURI, 3 ), targetIndex, caption );
-            }
-
-        break;
-
-        // WebTargets/*
-        case EIsNodeWebTargetsXImage:
-#ifdef IDLESOFTKEY_ADAPTER_IMAGEMASK
-        case EIsNodeWebTargetsXImageMask:
-#endif
-            {
-            iWebTargetManager->CheckWebTargetsL();
-            CFavouritesItem *favItem = CFavouritesItem::NewLC();
-            RDEBUG_2( _L("CIsAdapter::SetShortcutTargetImageL() CFavouritesItem ALLOC %x"), favItem);
-            if( KErrNone !=
-                iWebTargetManager->GetTargetFromNodeNameL( NSmlDmURI::URISeg( aURI, 0, 4 ), *favItem, targetIndex ) )
-                {
-                User::Leave( KErrNotFound );
-                }
-            CleanupStack::PopAndDestroy( favItem );        
-            }
-
-        break;
-
-        }
-
-    //
-    // Decode image data
-    //
-    DecodeImageToFileL( aObject );
-
-    switch( identifier )
-        {
-        case EIsNodeTargetsXImage:
-        User::LeaveIfError( iUiSrv.SetShortcutTargetBitmap( EUiSrvRtTypeApp,
-                                        targetIndex,
-                                        iTemporaryImageFile,
-                                        aType ) );
-        break;
-
-        case EIsNodeWebTargetsXImage:
-        User::LeaveIfError( iUiSrv.SetShortcutTargetBitmap( EUiSrvRtTypeBm,
-                                        targetIndex,
-                                        iTemporaryImageFile,
-                                        aType ) );
-        break;
-
-#ifdef IDLESOFTKEY_ADAPTER_IMAGEMASK
-        case EIsNodeTargetsXImageMask:
-        User::LeaveIfError( iUiSrv.SetShortcutTargetMask( EUiSrvRtTypeApp,
-                                        targetIndex,
-                                        iTemporaryImageFile,
-                                        aType ) );
-        break;
-
-        case EIsNodeWebTargetsXImageMask:
-        User::LeaveIfError( iUiSrv.SetShortcutTargetMask( EUiSrvRtTypeBm,
-                                        targetIndex,
-                                        iTemporaryImageFile,
-                                        aType ) );
-        break;
-#endif
-        }
-
-    RDEBUG( "CIsAdapter::SetShortcutTargetImageL() <" );
-    }
-#endif
-
-// -------------------------------------------------------------------------------------
-// CIsAdapter::DecodeImageToFileL
-// -------------------------------------------------------------------------------------
-TInt CIsAdapter::DecodeImageToFileL( const TDesC8& aObject )
-    {
-    RDEBUG( "CIsAdapter::DecodeImageToFileL() >" );
-
-    //
-    // Write file to a temp file
-    //
-    RFs   fileSession;
-    RFile file;
-
-    User::LeaveIfError( fileSession.Connect() );
-    CleanupClosePushL( fileSession );
-
-    //
-    // Delete previous temp file
-    //
-    if( iTemporaryImageFile.Length() > 0 )
-        {
-        fileSession.Delete( iTemporaryImageFile );
-        iTemporaryImageFile.Zero();
-        }
-
-    //
-    // Create new temp file
-    //
-    User::LeaveIfError( file.Temp( fileSession, KTempFilePath, iTemporaryImageFile, EFileWrite ) );
-    CleanupClosePushL( file );
-
-    //
-    // Decode data to buffer
-    //
-    CBufFlat* buffer = CBufFlat::NewL( 128 );
-    CleanupStack::PushL( buffer );
-    DecodeImageL( *buffer, aObject );
-
-    // Write buffer to file and release buffer
-    User::LeaveIfError( file.Write( buffer->Ptr(0) ) );
-    CleanupStack::PopAndDestroy( buffer );
-
-    // Close file
-    CleanupStack::PopAndDestroy( &file );
-
-    // Close fileSession
-    CleanupStack::PopAndDestroy( &fileSession );
-
-    RDEBUG( "CIsAdapter::DecodeImageToFileL() <" );
-    return KErrNone;
-    }
-
-// -------------------------------------------------------------------------------------
-// CIsAdapter::DecodeImageL
-// -------------------------------------------------------------------------------------
-void CIsAdapter::DecodeImageL( CBufFlat& aBuffer, const TDesC8& aObject )
-    {
-    RDEBUG( "CIsAdapter::DecodeImageL() >" );
-
-    //
-    // Decoce from base 64
-    //
-    TImCodecB64 B64Coder;
-    HBufC8 *uncoded = HBufC8::NewLC( ( aObject.Length() * 3 ) / 4 + 16 );
-    RDEBUG_2( "CIsAdapter::DecodeImageL() HBufC8 uncoded ALLOC %x", uncoded);
-    TPtr8 uncodedPtr( uncoded->Des() );
-    
-    TBool uncodeResult = TFileCoderB64::CheckB64Encode( aObject );//
-
-	if( uncodeResult )
-		{
-		// use base64 decode
-		B64Coder.Decode( aObject, uncodedPtr );
-		aBuffer.InsertL( 0, uncodedPtr );
-		}
-	else
-		{
-		// original data
-		aBuffer.InsertL( 0, aObject );
-  		}
-
-    CleanupStack::PopAndDestroy( uncoded );
-
-    RDEBUG( "CIsAdapter::DecodeImageL() <" );
-    }
-
-// -------------------------------------------------------------------------------------
-// CIsAdapter::EncodeImageL
-// -------------------------------------------------------------------------------------
-void CIsAdapter::EncodeImageL( CBufFlat& aBuffer, const TDesC8& aObject )
-    {
-    RDEBUG( "CIsAdapter::EncodeImageL() >" );
-
-    //
-    // Decoce from base 64
-    //
-    TImCodecB64 B64Coder;
-    HBufC8 *encoded = HBufC8::NewLC( ( aObject.Length() * 4 ) / 3 + 16 );
-    RDEBUG_2( "CIsAdapter::EncodeImageL() HBufC8 encoded ALLOC %x", encoded);
-    TPtr8 encodedPtr( encoded->Des() );
-    TBool encodeResult = B64Coder.Encode( aObject, encodedPtr );
-
-    aBuffer.InsertL( 0, encodedPtr );
-
-    CleanupStack::PopAndDestroy( encoded );
-
-    RDEBUG( "CIsAdapter::EncodeImageL() <" );
-    }
-
-// -------------------------------------------------------------------------------------
-// CIsAdapter::GetShortcutTargetURIL
-// -------------------------------------------------------------------------------------
-CSmlDmAdapter::TError CIsAdapter::GetShortcutTargetURIL(CBufFlat& aBuffer, TInt aUid )
-    {
-    RDEBUG( "CIsAdapter::GetShortcutTargetURIL() >" );
-
-    TInt rtType = 0;
-    if(iUiSettingsNotInitialized)
-   	{	
-   		iUiSettings->ReadTargetsL() ;
-   		iUiSettings->ReadBookmarksL() ;
-   		iUiSettingsNotInitialized = EFalse;
-   	}
-    iUiSettings->GetShortcutRtTypeL( aUid, rtType );
-    // TScActionType acType = TUid::Uid( aUid );
-    CSmlDmAdapter::TError retVal = CSmlDmAdapter::EOk;
-
-
-    switch( rtType )
-        {
-            default:
-                {
-                TInt index = -1;
-               	User::LeaveIfError(iUiSettings->GetShortcutTargetIndexL( aUid, index ));
-				
-                if( index == -1 )
-                    {
-                    return CSmlDmAdapter::ENotFound;
-                    }
-                else
-                    {
-                    HBufC8* nodeName = iAppTargetManager->GenerateNodeNameL( index );
-                    CleanupStack::PushL( nodeName );
-                    aBuffer.InsertL( aBuffer.Size(), KNSmlCustomizationNodeName() );
-                    aBuffer.InsertL( aBuffer.Size(), KNSmlISSeparator() );
-                    aBuffer.InsertL( aBuffer.Size(), KNSmlIS_IdleSoftKeyNodeName() );
-                    aBuffer.InsertL( aBuffer.Size(), KNSmlISSeparator() );
-                    aBuffer.InsertL( aBuffer.Size(), KNSmlIS_TargetsNodeName() );
-                    aBuffer.InsertL( aBuffer.Size(), KNSmlISSeparator() );
-                    aBuffer.InsertL( aBuffer.Size(), *nodeName );
-                    CleanupStack::PopAndDestroy( nodeName );
-
-                    return CSmlDmAdapter::EOk;
-                    }
-                }
-            
-
-            case KScRtTypeUidValueBookmark:
-                {
-                TInt bmId = -1, index = -1;
-                User::LeaveIfError(iUiSettings->GetShortcutTargetIndexL( aUid, index ));
-                User::LeaveIfError(iUiSettings->GetWebTargetAppUid( index, bmId ));
-          
-                TBuf8<MAX_NUMBER_OF_DIGITS_IN_10BASE_INT64> numBuf;
-                numBuf.Num( bmId );
-                TInt ind = -1;
-
-                HBufC8* dataH = HBufC8::NewLC( KRepositoryEntryMaxLength );
-                TPtr8 data( dataH->Des() );
-                TBool ret = iWebTargetManager->FindURIByLUIDL( data, numBuf, ind );
-                User::LeaveIfError( ret );
-
-                aBuffer.InsertL( aBuffer.Size(), data );
-
-                CleanupStack::PopAndDestroy( dataH );
-                }
-            break;
-            
-        }
-        
-
-    RDEBUG_2( "CIsAdapter::GetShortcutTargetURIL() < %d", retVal );
-    return retVal;
-    }
-
-// -------------------------------------------------------------------------------------
-// CIsAdapter::SetShortcutTargetL
-// -------------------------------------------------------------------------------------
-void CIsAdapter::SetShortcutTargetL(const TDesC8& aURI, TInt aUid)
-    {
-    RDEBUG8_2( "CIsAdapter::SetShortcutTargetL() > %S ", &aURI );
-
-	// SymbianConvergency NOTE! this should be ok, for the aURI part
-    if(iUiSettingsNotInitialized)
-   	{	
-   		iUiSettings->ReadTargetsL() ;
-   		iUiSettings->ReadBookmarksL() ;
-   		iUiSettingsNotInitialized = EFalse;
-   	}
-    TPtrC8 uri( aURI );
-    if( uri.Left(2).Compare( _L8("./") ) == 0 )
-        {
-        uri.Set( aURI.Right( aURI.Length() - 2 ) );
-        }
-
-    CIsAdapter::TIsNodeIdentifier identifier = GetNodeIdentifier( uri );
-    if( (EIsNodeTargetsX != identifier) &&
-        (EIsNodeWebTargetsX != identifier) )
-            {
-            User::Leave( KErrArgument );
-            }
-
-    HBufC16* buf        = CreateCopy16LC( uri );
-    TPtrC8   targetNode = NSmlDmURI::URISeg( uri, 2 );
-    TPtrC8   segment    = NSmlDmURI::URISeg( uri, 3 );
-    TInt index = -1;
-
-    if( targetNode == KNSmlIS_WebTargetsNodeName() )
-        {
-        iWebTargetManager->CheckWebTargetsL();
-        CFavouritesItem *favItem = CFavouritesItem::NewLC();
-        RDEBUG_2( "CIsAdapter::SetShortcutTargetL() CFavouritesItem ALLOC %x", favItem);
-
-        TInt status = KErrNone;
-        TRAPD( reason,
-               status = iWebTargetManager->GetTargetFromNodeNameL( uri, *favItem, index ) );
-        if( (KErrNone == reason) && (0 != favItem) && (KErrNone == status) && (-1 != index) )
-            {
-                  User::LeaveIfError(iUiSettings->SetShortcutTargetWebIndexL (aUid, index));
-            }
-        else
-            {
-            RDEBUG8_2( "CIsAdapter::SetShortcutTargetL: Error in argument, WebTarget %S", &targetNode);
-            User::Leave( KErrArgument );
-            }
-
-        CleanupStack::PopAndDestroy( favItem );
-        }
-    else
-        {
-        if( targetNode == KNSmlIS_TargetsNodeName() )
-            {
-            // Set new target
-            TBuf8<ISADAPTER_SHORTCUT_CAPTION_MAXLENGTH> caption;
-            iAppTargetManager->GetTargetFromNodeNameL( segment, index, caption );
-     		User::LeaveIfError(iUiSettings->SetShortcutTargetAppIndexL (aUid, index));
-            }
-        else
-            {
-            RDEBUG8_2( "CIsAdapter::SetShortcutTargetL: Error in argument, AppTarget %S", &targetNode);
-            User::Leave( KErrArgument );
-            }
-        }
-
-    CleanupStack::PopAndDestroy( buf );
-
-    RDEBUG( "CIsAdapter::SetShortcutTargetL() <" );
-    }
-
-// -------------------------------------------------------------------------------------
-// CIsAdapter::CreateCopy16LC
-// -------------------------------------------------------------------------------------
-HBufC16* CIsAdapter::CreateCopy16LC( const TDesC8& aText )
-    {
-    RDEBUG( "CIsAdapter::CreateCopy16LC() >" );
-
-    HBufC16* buf = HBufC16::NewLC( aText.Length() );
-    RDEBUG_2( "CIsAdapter::CreateCopy16LC() HBufC16 buf ALLOC %x", buf);
-    buf->Des().Copy( aText );
-
-    RDEBUG( "CIsAdapter::CreateCopy16LC() <" );
-    return buf;
-    }
-
-// -----------------------------------------------------------------------------
-// CIsAdapter::PolicyRequestResourceL
-// -----------------------------------------------------------------------------
-//
-//#ifdef __SAP_POLICY_MANAGEMENT
-TPtrC8 CIsAdapter::PolicyRequestResourceL( const TDesC8& /*aURI*/ )
-{
-	if(! FeatureManager::FeatureSupported(KFeatureIdSapPolicyManagement ))
-	{
-    User::Leave(KErrNotSupported);
-  }  
-  
-    RDEBUG8_2( "CIsAdapter::PolicyRequestResourceL() >< %S",
-                &PolicyEngineXACML::KCustomizationManagement() );
-
-	return PolicyEngineXACML::KCustomizationManagement();
-		
-}
-//#endif	
-
--- a/customization/isadapter/src/isadapter.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-/*
-* 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: 
-*       Registery info for DM IdleSoftKey Adapter Settings.
-*
-*/
-
-
-#include <registryinfo.rh>
-#define KSmlDMInterfaceUid 0x102018B4
-
-RESOURCE REGISTRY_INFO theRegistryInfo
-  {
-  dll_uid = 0x10207831; //The DLL's 3rd UID.
-  interfaces = 
-      {
-      INTERFACE_INFO
-          {
-          interface_uid = KSmlDMInterfaceUid; // DM interface UID
-          implementations = 
-            {
-            IMPLEMENTATION_INFO
-                {
-                implementation_uid = 0x10207832; // DM IdleSoftKey implementation UID
-                version_no = 1; 
-                display_name = "DM IdleSoftKey Adapter";
-                default_data = "";
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-                opaque_data = "host=0x101F9A02";
-#else
-								opaque_data = "";
-#endif
-                }
-            };
-          }
-      };
-    }
--- a/customization/supadapter/bld/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 2002 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:  build info file for startup settings adapter
-*
-*/
-
-#include <platform_paths.hrh>
-
-PRJ_EXPORTS
-../rom/supadapter.iby									CORE_APP_LAYER_IBY_EXPORT_PATH(supadapter.iby)
-
-PRJ_MMPFILES
-./supadapter.mmp
--- a/customization/supadapter/bld/supadapter.mmp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
-/*
-* 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: Implementation of customization components
-*
-*/
-  
-
-// To get the APP_LAYER_SYSTEMINCLUDE-definition
-#include <platform_paths.hrh>
-#include        "defaultcaps.hrh"
-
-CAPABILITY      CAP_ECOM_PLUGIN
-TARGET          supadapter.dll
-TARGETTYPE      PLUGIN
-UID             0x10009D8D 0x10207821
-SECUREID        0x10207821
-VENDORID        VID_DEFAULT
-
-
-SOURCEPATH      ../src
-SOURCE          supadapter.cpp
-
-APP_LAYER_SYSTEMINCLUDE
-SYSTEMINCLUDE   /epoc32/include/swi
-SYSTEMINCLUDE 	/epoc32/include/ecom
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-SYSTEMINCLUDE 	/epoc32/include/devman
-#else
-// nothing
-#endif
-
-USERINCLUDE     ../inc
-USERINCLUDE     ../../include
-USERINCLUDE     ../../UISettingsSrv/inc
-USERINCLUDE     ../../DMUtils/inc
-
-//
-// Resources
-//
-START RESOURCE  supadapter.rss
-TARGET          supadapter.rsc
-LANGUAGE_IDS
-END
-
-LIBRARY         euser.lib
-LIBRARY         ecom.lib
-LIBRARY         efsrv.lib
-LIBRARY         imut.lib
-
-//#ifdef __SAP_POLICY_MANAGEMENT
-LIBRARY         policyengine.lib
-LIBRARY         dmutil.lib
-//#endif
-
-LIBRARY         uisettingsclient.lib
-LIBRARY         charconv.lib
-LIBRARY         estor.lib
-LIBRARY 				flogger.lib
-LIBRARY                 featmgr.lib
-
-STATICLIBRARY   dmutils.lib
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-LIBRARY		      devmancmdmgr.lib
-#else
-// nothing
-#endif
-
-SMPSAFE
--- a/customization/supadapter/inc/supadapter.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,197 +0,0 @@
-/*
-* Copyright (c) 2002 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:  DM Startup Adapter
-*
-*/
-
-
-
-#ifndef __NSMLSUPADAPTER_H__
-#define __NSMLSUPADAPTER_H__
-
-// ------------------------------------------------------------------------------------------------
-// Includes
-// ------------------------------------------------------------------------------------------------
-// symbian
-#include <e32base.h>
-#include <smldmadapter.h>
-// s60
-#include "TARMDmStreamAdapter.h"
-#include "UISettingsSrvClient.h"
-//#ifdef __SAP_POLICY_MANAGEMENT
-#include <PolicyEngineClient.h>
-//#endif
-
-const TUint KNSmlDMSUPAdapterImplUid = 0x10207822;
-
-// the DDF version must be changed if any changes in DDF structure ( built in DDFStructureL() function )
-_LIT8( KNSmlSUPDDFVersion, "1.0" ); 
-
-_LIT8( KNSmlSUPTextPlain, "text/plain" );
-_LIT8( KNSmlSUPNodeName, "Apps" );
-_LIT8( KNSmlSUPDescription, "This node is the common parent to all customization objects." );
-_LIT8( KNSmlSUPStartupNodeDescription, "Startup is a common parent node to nodes customizing startup functionality");
-_LIT8( KNSmlSUPWelcomeDataNodeDescription, "Image node stores the WelcomeData (image or text) as binary data, and its runtime Type determines the interpretation");
-_LIT8( KNSmlSUPWelcomeTextNodeDescription, "Text node stores the Welcome Text");
-
-_LIT8( KNSmlSUPDynamicNode, "" );
-_LIT8( KNSmlSUPWelcomeDataNodeName, "Data" );
-_LIT8( KNSmlSUPWelcomeTextNodeName, "Text" );
-_LIT8( KNSmlSUPStartupNodeName, "Startup" );
-_LIT8( KNSmlCustomizationNodeName, "Customization" );
-_LIT8( KNSmlSUPImage8, "WelcomeData" );
-_LIT8( KNSmlSUPStartup8, "Startup" );
-_LIT8( KNSmlCustomizationNodeName8, "Customization" );
-
-//
-// Policies:
-//
-#define SUPADAPTER_POLICY1_SUBJECT_P1 "urn:oasis:names:tc:xacml:2.0:subject:role_id"
-#define SUPADAPTER_POLICY1_SUBJECT_P2 ""
-#define SUPADAPTER_POLICY1_SUBJECT_P3 "http://www.w3.org/2001/XMLSchema#string"
-#define SUPADAPTER_POLICY1_RESOURCE_P1 "urn:oasis:names:tc:xacml:2.0:resource:resource_id"
-#define SUPADAPTER_POLICY1_RESOURCE_P2 "CustomizationManagement"
-#define SUPADAPTER_POLICY1_RESOURCE_P3 "http://www.w3.org/2001/XMLSchema#string"
-_LIT8( KSUPAdapterPolicy1SubjectParam1, SUPADAPTER_POLICY1_SUBJECT_P1 );
-_LIT8( KSUPAdapterPolicy1SubjectParam2, SUPADAPTER_POLICY1_SUBJECT_P2 );
-_LIT8( KSUPAdapterPolicy1SubjectParam3, SUPADAPTER_POLICY1_SUBJECT_P3 );
-_LIT8( KSUPAdapterPolicy1ResourceParam1, SUPADAPTER_POLICY1_RESOURCE_P1 );
-_LIT8( KSUPAdapterPolicy1ResourceParam2, SUPADAPTER_POLICY1_RESOURCE_P2 );
-_LIT8( KSUPAdapterPolicy1ResourceParam3, SUPADAPTER_POLICY1_RESOURCE_P3 );
-
-
-#ifndef MAX_NUMBER_OF_DIGITS_IN_10BASE_INT64
-#define MAX_NUMBER_OF_DIGITS_IN_10BASE_INT64 21
-#endif
-
-// ------------------------------------------------------------------------------------------------
-// CSupAdapter 
-// ------------------------------------------------------------------------------------------------
-class CSupAdapter : public CTARMDmStreamAdapter//, public MMsvSessionObserver
-	{
-private:
-	enum TStartupAdapterLeafType
-	{
-		EText 		= 0,
-		EImage 		= 1,
-		EUnknown 	= 2	
-	};
-
-    enum TSupNodeIdentifier
-        {
-        ESupNodeCustomization = 0,
-        ESupNodeStartup,
-        ESupNodeWelcomeData,
-        ESupNodeWelcomeText,
-        ESupNodeNotUsedAndAlwaysLast
-        };
-
-public:
-	CSupAdapter(TAny* aEcomArguments);
-
-	static CSupAdapter* NewL( MSmlDmCallback* aDmCallback );
-	static CSupAdapter* NewLC( MSmlDmCallback* aDmCallback );
-
-	virtual ~CSupAdapter();
-
-	// Pure virtual methods
-	void DDFVersionL( CBufBase& aVersion );
-
-	void DDFStructureL( MSmlDmDDFObject& aDDF );
-
-	void UpdateLeafObjectL( CSmlDmAdapter::TError& aStatus, const TDesC8& aURI,
-	                        const TDesC8& aLUID, const TDesC8& aObject, const TDesC8& aType );
-
-	CSmlDmAdapter::TError FetchLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, TDes8& aNewMime, CBufFlat* object, TInt &aUncodedSize );
-
-	void _UpdateLeafObjectL     ( const TDesC8& aURI, const TDesC8& aLUID,
-	                              const TDesC8& aObject, const TDesC8& aType, TInt aStatusRef );
-	void _UpdateLeafObjectL     ( const TDesC8& aURI, const TDesC8& aLUID,
-	                              RWriteStream*& aStream, const TDesC8& aType, TInt aStatusRef );
-	void _DeleteObjectL         ( const TDesC8& aURI, const TDesC8& aLUID, TInt aStatusRef );
-	void _FetchLeafObjectL      ( const TDesC8& aURI, const TDesC8& aLUID,
-	                              const TDesC8& aType, TInt aResultsRef, TInt aStatusRef );
-	void _FetchLeafObjectSizeL  ( const TDesC8& aURI, const TDesC8& aLUID,
-	                              const TDesC8& aType, TInt aResultsRef, TInt aStatusRef );
-    void _ChildURIListL         ( const TDesC8& aURI, const TDesC8& aLUID,
-                                  const CArrayFix<TSmlDmMappingInfo>& aPreviousURISegmentList,
-                                  TInt aResultsRef, TInt aStatusRef );
-	void _AddNodeObjectL        ( const TDesC8& aURI, const TDesC8& aParentLUID, TInt aStatusRef );
-	void _ExecuteCommandL       ( const TDesC8& aURI, const TDesC8& aLUID,
-	                              const TDesC8& aArgument, const TDesC8& aType, TInt aStatusRef );
-    void _ExecuteCommandL       ( const TDesC8& aURI, const TDesC8& aLUID,
-                                  RWriteStream*& aStream, const TDesC8& aType, TInt aStatusRef );
-    void _CopyCommandL          ( const TDesC8& aTargetURI, const TDesC8& aTargetLUID,
-                                  const TDesC8& aSourceURI, const TDesC8& aSourceLUID,
-                                  const TDesC8& aType, TInt aStatusRef );
-
-    void StartAtomicL();
-    void CommitAtomicL();
-    void RollbackAtomicL();
-
-    TAdapterStreamType StreamType( const TDesC8& aURI );
-    TBool StreamingSupport( TInt& aItemSize );
-    void CompleteOutstandingCmdsL();
-
-//#ifdef __SAP_POLICY_MANAGEMENT
-    TInt CheckPolicyL();    
-//#endif
-
-private:
-	void ConstructL(MSmlDmCallback* aDmCallback);
-	
-	void FillNodeInfoL( MSmlDmDDFObject& aNode,TSmlDmAccessTypes aAccTypes,MSmlDmDDFObject::TOccurence aOccurrence, MSmlDmDDFObject::TScope aScope, MSmlDmDDFObject::TDFFormat aFormat,const TDesC8& aDescription,const TDesC8& aMimeType);
-	
-	TStartupAdapterLeafType	GetObjectType(const TDesC8& aMime);
-	TBool IsSupportedImageType(const TDesC8& aMime);
-	TBool IsSupportedTextType(const TDesC8& aMime);
-
-	void SetStartupTextL(CSmlDmAdapter::TError& aStatus, const TDesC16& aText);
-	void SetStartupImageL(CSmlDmAdapter::TError& aStatus, const TDesC8& aObject, const TDesC8& aType);
-	
-	CBufFlat* GetStartupTextL(CSmlDmAdapter::TError& aStatus, const TDesC8& aType);
-	CBufFlat* GetStartupImageL(CSmlDmAdapter::TError& aStatus, const TDesC8& aType, TInt &aImageSize);
-	
-	void CopyAndTrimMimeType(TDes8& aNewMime, const TDesC8& aType);
-	
-    CSupAdapter::TSupNodeIdentifier GetNodeIdentifier(const TDesC8& aURI);
-	TStartupAdapterLeafType GetFetchTypeL(CSmlDmAdapter::TError& aStatus, const TDesC8& aType);
-	TStartupAdapterLeafType GetSelectedTypeL(CSmlDmAdapter::TError& aStatus);	
-
-//#ifdef __SAP_POLICY_MANAGEMENT
-    TPtrC8 PolicyRequestResourceL( const TDesC8& aURI );
-//#endif
-
-#ifdef __WINS__	
-public:	
-	void DebugTestsL();
-#endif
-
-
-private:
-
-//#ifdef __SAP_POLICY_MANAGEMENT
-    RPolicyEngine   iPE;
-    RPolicyRequest  iPR;
-//#endif
-
-	MSmlDmCallback* iCallBack;
-	CBufBase *iUndoImage;
-	CBufBase *iUndoText;
-	TInt     iUndoNoteType;
-
-    TFileName iTemporaryImageFile;
-};
-
-#endif // __NSMLSUPADAPTER_H__
--- a/customization/supadapter/rom/supadapter.iby	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of customization components
-*
-*/
-#ifndef __SUPADAPTER_IBY__
-#define __SUPADAPTER_IBY__
-
-//#ifdef __SAP_STARTUP_ADAPTER
-
-ECOM_PLUGIN(supadapter.dll, supadapter.rsc)
-
-#endif
-
-//#endif //__SUPADAPTER_IBY__
--- a/customization/supadapter/src/supadapter.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1635 +0,0 @@
-/*
-* Copyright (c) 2002 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:  DM Startup Adapter
-*
-*/
-
-
-/*
-./Customization -+--> Startup -+--> WelcomeData
-  */
-
-// ------------------------------------------------------------------------------------------------
-// Use this flag to activate mime type checking in adapter
-// Data with unsupported mime types will be rejected
-//  
-// #define SUPADAPTER_CHECK_MIME_TYPES
-#ifdef	SUPADAPTER_CHECK_MIME_TYPES
-
-#define SUPADAPTER_CHECK_TEXT_MIME_TYPE
-#define SUPADAPTER_CHECK_IMAGE_MIME_TYPE
-
-#endif
-
-// ------------------------------------------------------------------------------------------------
-#include "supadapter.h"
-
-// symbian
-#ifndef __WINS_DEBUG_TESTING__
-    #include <implementationproxy.h> // For TImplementationProxy definition
-#endif
-#include <fbs.h>
-#include <f32file.h>
-#include <imcvcodc.h>
-// s60
-#include <AknUtils.h>
-#include <sysutil.h>
-#include <startupdomaincrkeys.h>
-// tarm
-//#ifdef __SAP_POLICY_MANAGEMENT
-#include <DMCert.h>
-#include <SettingEnforcementInfo.h>
-#include <PolicyEngineXACML.h>
-//#endif
-#include "nsmldmuri.h"
-#include "TPtrC8I.h"
-#include "TARMCharConv.h"
-#include "FileCoderB64.h"
-#include "debug.h"
-#include <featmgr.h>
-#include <utf.h> 
-/**
-*
-* Supported MIME types of this adapter
-*
-**/
-_LIT8(KText,              "text/");
-_LIT8(KMimeTypeTextPlain, "text/plain");
-
-#ifdef SUPADAPTER_CHECK_TEXT_MIME_TYPE
-_LIT8(KMimeTypeTextAny,   "text/*");
-#endif
-
-_LIT8(KImage,			  "image/");
-_LIT8(KMimeTypeImageMbm,  "image/x-epoc-mbm");
-
-#ifdef SUPADAPTER_CHECK_IMAGE_MIME_TYPE
-_LIT8(KMimeTypeImageGif,  "image/gif");
-_LIT8(KMimeTypeImagePng,  "image/png");
-_LIT8(KMimeTypeImageJpg,  "image/jpeg");
-_LIT8(KMimeTypeImageAny,  "image/*");
-#endif
-
-// ------------------------------------------------------------------------------------------------
-
-/**
-* Folder for temporary files
-**/
-_LIT(KTempFilePath, "c:\\system\\temp\\");
-
-// This length value is copied from S60/Startup/StartupUserWelcomeNote.h
-const TInt KStartupTBufMaxLength( 100 );
-
-// ------------------------------------------------------------------------------------------------
-// CSupAdapter* CSupAdapter::NewL( )
-// ------------------------------------------------------------------------------------------------
-CSupAdapter* CSupAdapter::NewL(MSmlDmCallback* aDmCallback )
-	{
-	RDEBUG( "CSupAdapter::NewL()" );
-
-	CSupAdapter* self = NewLC( aDmCallback );
-	CleanupStack::Pop();
-	return self;
-	}
-
-// ------------------------------------------------------------------------------------------------
-// CSupAdapter* CSupAdapter::NewLC( )
-// ------------------------------------------------------------------------------------------------
-CSupAdapter* CSupAdapter::NewLC(MSmlDmCallback* aDmCallback )
-	{
-	RDEBUG( "CSupAdapter::NewLC()" );
-
-	CSupAdapter* self = new (ELeave) CSupAdapter(aDmCallback);
-	CleanupStack::PushL(self);
-	self->ConstructL(aDmCallback);
-	return self;
-	}
-
-
-// ------------------------------------------------------------------------------------------------
-// CSupAdapter::CSupAdapter()
-// ------------------------------------------------------------------------------------------------
-CSupAdapter::CSupAdapter(TAny* aEcomArguments)
-: CTARMDmStreamAdapter((MSmlDmCallback*)aEcomArguments)
-, iUndoImage(0)
-, iUndoText(0)
-, iUndoNoteType(-1)
-	{
-	}
-
-
-// ------------------------------------------------------------------------------------------------
-// CSupAdapter::~CSupAdapter()
-// ------------------------------------------------------------------------------------------------
-CSupAdapter::~CSupAdapter()
-	{
-	RDEBUG( "CSupAdapter::~CSupAdapter()" );
-
-    delete iUndoImage; iUndoImage = 0;
-    delete iUndoText;  iUndoText  = 0;
-
-    if( iTemporaryImageFile.Length() > 0 )
-        {
-        RFs fs;
-        if (fs.Connect())
-        	{
-        fs.Delete( iTemporaryImageFile );
-        fs.Close();
-      		}
-        iTemporaryImageFile.Zero();
-        }
-
-//#ifdef __SAP_POLICY_MANAGEMENT
-if(FeatureManager::FeatureSupported(KFeatureIdSapStartupAdapter))
-{
-	if(FeatureManager::FeatureSupported(KFeatureIdSapPolicyManagement ))
-	{
-	iPR.Close();
-	iPE.Close();
-	}
-
-}
-	
-//#endif
-FeatureManager::UnInitializeLib();
-	}
-
-
-// ------------------------------------------------------------------------------------------------
-// CSupAdapter::ConstructL
-// ------------------------------------------------------------------------------------------------
-void CSupAdapter::ConstructL(MSmlDmCallback *aDmCallback)
-	{
-	RDEBUG( "CSupAdapter::ConstructL()" );
-		TRAPD( errf, FeatureManager::InitializeLibL() );
-		if( errf != KErrNone )
-		{
-			User::Leave(errf);
-		}
-			if(FeatureManager::FeatureSupported(KFeatureIdSapStartupAdapter))
-			{
-	iCallBack = aDmCallback;
-
-			//#ifdef __SAP_POLICY_MANAGEMENT
-			if(FeatureManager::FeatureSupported(KFeatureIdSapPolicyManagement ))
-			{
-    User::LeaveIfError( iPE.Connect() );
-    User::LeaveIfError( iPR.Open( iPE ) );
-			}
-			    
-			//#endif
-
-    iTemporaryImageFile.Zero();
-
-#ifdef __WINS_DEBUG_TEST__
-    DebugTestsL();
-#endif
-			}
-			else
-			{
-				
-		   		User::Leave( KErrNotSupported );
-			}
-	}
-
-
-// ------------------------------------------------------------------------------------------------
-//  CSupAdapter::DDFVersionL()
-// ------------------------------------------------------------------------------------------------
-void CSupAdapter::DDFVersionL(CBufBase& aDDFVersion)
-	{
-	RDEBUG( "CSupAdapter::DDFVersionL()" );
-
-	aDDFVersion.InsertL(0,KNSmlSUPDDFVersion);
-	}
-
-
-// ------------------------------------------------------------------------------------------------
-//  CSupAdapter::DDFStructureL()
-//
-// ------------------------------------------------------------------------------------------------
-void CSupAdapter::DDFStructureL( MSmlDmDDFObject& aDDF )
-	{
-	RDEBUG( "CSupAdapter::DDFStructureL()" );
-
-	TSmlDmAccessTypes accessTypesGet;
-	accessTypesGet.SetGet();
-
-	/*
-	Node: ./Customization
-	This interior node is the common parent to all customization objects.
-	Status: Required
-	Occurs: One
-	Format: Node
-	Access Types: Get
-	Values: N/A
-	*/
-	MSmlDmDDFObject& apps = aDDF.AddChildObjectL(KNSmlCustomizationNodeName);
-	FillNodeInfoL(apps,accessTypesGet,MSmlDmDDFObject::EOne,MSmlDmDDFObject::EPermanent,
-	    MSmlDmDDFObject::ENode, KNSmlSUPDescription,KNullDesC8());
-
-	/*
-	Node: ./Customization/Startup
-	Startup is a common parent node to nodes customizing startup functionality
-	Status: Required
-	Occurs: One
-	Format: Node
-	Access Types: Get
-	Values: N/A
-	*/
-	MSmlDmDDFObject& groupNode = apps.AddChildObjectL(KNSmlSUPStartupNodeName);
-	FillNodeInfoL(groupNode,accessTypesGet,MSmlDmDDFObject::EOne,MSmlDmDDFObject::EPermanent,
-		MSmlDmDDFObject::ENode,KNSmlSUPStartupNodeDescription,KNullDesC8());
-
-	/*
-	Node: ./Customization/Startup/Data
-	Image node stores the Startup image as binary data, and its runtime Type determines the interpretation.
-·	Status: Optional
-·	Occurs: One
-·	Format: bin
-·	Access Types: Replace
-·	Values: N/A
-	*/
-	TSmlDmAccessTypes accessTypesReplace;
-	accessTypesReplace.SetReplace();
-
-	MSmlDmDDFObject& imageNode = groupNode.AddChildObjectL(KNSmlSUPWelcomeDataNodeName);
-	FillNodeInfoL(imageNode,accessTypesReplace,MSmlDmDDFObject::EZeroOrOne,MSmlDmDDFObject::EPermanent,
-		MSmlDmDDFObject::EBin,KNSmlSUPWelcomeDataNodeDescription,KNSmlSUPTextPlain());
-	imageNode.AddDFTypeMimeTypeL(KMimeTypeImageMbm);
-	
-	/*
-	Node: ./Customization/Startup/Text
-	Text node stores the Startup text as text, and its runtime Type determines the interpretation.
-·	Status: Optional
-·	Occurs: One
-·	Format: Chr
-·	Access Types: Get, Replace
-·	Values: N/A
-	*/
-	TSmlDmAccessTypes accessTypesGetReplace;
-	accessTypesGetReplace.SetGet();
-	accessTypesGetReplace.SetReplace();
-
-	MSmlDmDDFObject& textNode = groupNode.AddChildObjectL(KNSmlSUPWelcomeTextNodeName);
-	FillNodeInfoL(textNode,accessTypesGetReplace,MSmlDmDDFObject::EZeroOrOne,MSmlDmDDFObject::EPermanent,
-		MSmlDmDDFObject::EChr,KNSmlSUPWelcomeTextNodeDescription,KNSmlSUPTextPlain());
-	}
-
-
-// ------------------------------------------------------------------------------------------------
-//  CSupAdapter::UpdateLeafObjectL()
-// ------------------------------------------------------------------------------------------------
-void CSupAdapter::UpdateLeafObjectL( CSmlDmAdapter::TError& aStatus, const TDesC8& aURI,
-                                     const TDesC8& /*aLUID*/, const TDesC8& aObject, const TDesC8& aType )
-	{
-	RDEBUG( "CSupAdapter::UpdateLeafObjectL()" );
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-	TPtrC8 uriPtrc = NSmlDmURI::RemoveDotSlash( aURI );
-	CSupAdapter::TSupNodeIdentifier identifier = GetNodeIdentifier( uriPtrc );
-#else
-	CSupAdapter::TSupNodeIdentifier identifier = GetNodeIdentifier( aURI );
-#endif
-
-	TStartupAdapterLeafType type;
-
-    switch( identifier )
-        {
-            case ESupNodeWelcomeText:
-            	{
-                HBufC16* source = CTARMCharConv::ConvertFromUtf8LC( aObject );
-                TInt sourceLength = source->Length();
-                TInt destLength = KStartupTBufMaxLength<sourceLength?KStartupTBufMaxLength:sourceLength;
-                TPtrC16 sourcePtr( source->Ptr(), destLength );
-
-				aStatus = CSmlDmAdapter::EOk;
-				SetStartupTextL(aStatus, sourcePtr);
-				CleanupStack::PopAndDestroy( source );
-            	}
-            	break;
-            case ESupNodeWelcomeData:
-				type = GetObjectType( aType );
-				switch(type)
-					{
-					case CSupAdapter::EImage:
-					    aStatus = CSmlDmAdapter::EOk;
-					    SetStartupImageL(aStatus, aObject, aType);
-						break;
-
-					case CSupAdapter::EUnknown:
-					    aStatus = CSmlDmAdapter::EInvalidObject;
-						break;
-					}
-            	break;
-            default:
-            aStatus = CSmlDmAdapter::EError;
-        }
-	}
-
-
-// ------------------------------------------------------------------------------------------------
-//  CSupAdapter::_UpdateLeafObjectL()
-// ------------------------------------------------------------------------------------------------
-void CSupAdapter::_UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, const TDesC8& aObject, const TDesC8& aType, TInt aStatusRef )
-	{
-	RDEBUG8_3( "CSupAdapter::_UpdateLeafObjectL() (%S) (%S)", &aURI, &aType );
-
-	TBuf8<KStartupTBufMaxLength> mimeType;
-	CopyAndTrimMimeType(mimeType, aType);
-
-//#ifdef __SAP_POLICY_MANAGEMENT
-if(FeatureManager::FeatureSupported(KFeatureIdSapPolicyManagement ))
-{
-	User::LeaveIfError( CheckPolicyL() );	
-}
-//#endif
-
-	CSmlDmAdapter::TError status = CSmlDmAdapter::EOk;
-
-    TRAPD(
-        reason,
-        // NOTE! UpdateLeafObjectL removes the "./" from the beginning
-        UpdateLeafObjectL( status, aURI, aLUID, aObject, mimeType ) );
-
-    if( KErrNone != reason )
-        {
-        status = CSmlDmAdapter::EError;
-        }
-
-    iCallBack->SetStatusL(aStatusRef, status);
-	}
-
-
-// ------------------------------------------------------------------------------------------------
-//  CSupAdapter::_UpdateLeafObjectL()
-// ------------------------------------------------------------------------------------------------
-void CSupAdapter::_UpdateLeafObjectL( const TDesC8& /*aURI*/, const TDesC8& /*aLUID*/, RWriteStream*& /*aStream*/, const TDesC8& /*aType*/, TInt aStatusRef )
-    {       
-	RDEBUG( "CSupAdapter::_UpdateLeafObjectL() (stream)" );
-
-    CSmlDmAdapter::TError status = CSmlDmAdapter::EError;
-    iCallBack->SetStatusL(aStatusRef, status);
-    }
-
-
-// ------------------------------------------------------------------------------------------------
-// CSupAdapter::_DeleteObjectL
-// ------------------------------------------------------------------------------------------------
-void CSupAdapter::_DeleteObjectL( const TDesC8& /*aURI*/, const TDesC8& /*aLUID*/, TInt aStatusRef )
-	{
-	RDEBUG( "CSupAdapter::_DeleteObjectL()" );
-
-    CSmlDmAdapter::TError status = CSmlDmAdapter::EError;
-    iCallBack->SetStatusL(aStatusRef, status);
-	}
-
-
-// ------------------------------------------------------------------------------------------------
-// CSupAdapter::_ExecuteCommandL
-// ------------------------------------------------------------------------------------------------
-void CSupAdapter::_ExecuteCommandL( const TDesC8& /*aURI*/, const TDesC8& /*aLUID*/, const TDesC8& /*aArgument*/, const TDesC8& /*aType*/, TInt aStatusRef )
-    {
-	RDEBUG( "CSupAdapter::_ExecuteCommandL()" );
-
-    CSmlDmAdapter::TError status = CSmlDmAdapter::EError;
-    iCallBack->SetStatusL(aStatusRef, status);        
-    }
-    
-    
-// ------------------------------------------------------------------------------------------------
-// CSupAdapter::_ExecuteCommandL
-// ------------------------------------------------------------------------------------------------
-void CSupAdapter::_ExecuteCommandL( const TDesC8& /*aURI*/, const TDesC8& /*aLUID*/, RWriteStream*& /*aStream*/, const TDesC8& /*aType*/, TInt aStatusRef)
-    {
-	RDEBUG( "CSupAdapter::_ExecuteCommandL() (stream)" );
-
-    CSmlDmAdapter::TError status = CSmlDmAdapter::EError;
-    iCallBack->SetStatusL(aStatusRef, status);        
-    }
-    
-    
-// ------------------------------------------------------------------------------------------------
-// CSupAdapter::_CopyCommandL
-// ------------------------------------------------------------------------------------------------
-void CSupAdapter::_CopyCommandL( const TDesC8& /*aTargetURI*/, const TDesC8& /*aTargetLUID*/, const TDesC8& /*aSourceURI*/, const TDesC8& /*aSourceLUID*/, const TDesC8& /*aType*/, TInt aStatusRef)
-    {
-	RDEBUG( "CSupAdapter::_CopyCommandL()" );
-
-    CSmlDmAdapter::TError status = CSmlDmAdapter::EError;
-    iCallBack->SetStatusL(aStatusRef, status);        
-    }
-
-
-// ------------------------------------------------------------------------------------------------
-// CSupAdapter::StartAtomicL
-// ------------------------------------------------------------------------------------------------
-void CSupAdapter::StartAtomicL()
-    {
-	RDEBUG( "CSupAdapter::StartAtomicL()" );
-
-    CSmlDmAdapter::TError status = CSmlDmAdapter::EOk;
-
-    delete iUndoImage; iUndoImage = 0;
-    delete iUndoText;  iUndoText  = 0;
-    iUndoNoteType = -1;
-    
-    // Copy startup image & text
-    TInt imageSize;
-    iUndoImage = GetStartupImageL(status, KMimeTypeImageMbm, imageSize);
-    iUndoText  = GetStartupTextL(status, KMimeTypeTextPlain);
-    }
-    
-// ------------------------------------------------------------------------------------------------
-// CSupAdapter::CommitAtomicL
-// ------------------------------------------------------------------------------------------------
-void CSupAdapter::CommitAtomicL()
-    {
-	RDEBUG( "CSupAdapter::CommitAtomicL()" );
-
-    delete iUndoImage; iUndoImage = 0;
-    delete iUndoText;  iUndoText  = 0;        
-    iUndoNoteType = -1;
-    }
-    
-// ------------------------------------------------------------------------------------------------
-// CSupAdapter::RollbackAtomicL
-// ------------------------------------------------------------------------------------------------
-void CSupAdapter::RollbackAtomicL()
-    {
-	RDEBUG( "CSupAdapter::RollbackAtomicL()" );
-
-    CSmlDmAdapter::TError status = CSmlDmAdapter::EOk;
-
-    if(iUndoImage != 0)        
-        {
-            SetStartupImageL(status, iUndoImage->Ptr(0), KMimeTypeImageMbm);
-            
-            if(status != CSmlDmAdapter::EOk)
-                {
-                    status = CSmlDmAdapter::ERollbackFailed;
-                }
-                
-            delete iUndoImage; iUndoImage = 0;
-        }
-
-    if(iUndoText != 0)
-        {
-            HBufC16* source   = CTARMCharConv::ConvertFromUtf8LC( iUndoText->Ptr( 0 ) );
-            TInt sourceLength = source->Length();
-            TInt destLength   = KStartupTBufMaxLength<sourceLength?KStartupTBufMaxLength:sourceLength;
-            TPtrC16 sourcePtr( source->Ptr(), destLength );
-
-            SetStartupTextL(status, sourcePtr);
-            CleanupStack::PopAndDestroy( source );
-                
-            if(status != CSmlDmAdapter::EOk)
-                {
-                status = CSmlDmAdapter::ERollbackFailed;
-                }
-
-            delete iUndoText; iUndoText = 0;
-        }
-
-    if(iUndoNoteType != -1)
-        {
-            RUISettingsSrv uiSrv;
-            User::LeaveIfError( uiSrv.Connect() );
-            CleanupClosePushL( uiSrv );
-
-            User::LeaveIfError( uiSrv.SetStartupNoteType( iUndoNoteType ) );
-
-            CleanupStack::PopAndDestroy( &uiSrv );
-                
-            iUndoNoteType = -1;
-        }
-
-    
-    iCallBack->SetStatusL(0, status);
-    }
-
-// -----------------------------------------------------------------------------
-// CSupAdapter::StreamType
-// 
-// -----------------------------------------------------------------------------
-//
-CTARMDmStreamAdapter::TAdapterStreamType CSupAdapter::StreamType( const TDesC8& aURI )
-    {
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-	TPtrC8 uriPtrc = NSmlDmURI::RemoveDotSlash( aURI );
-	CSupAdapter::TSupNodeIdentifier identifier = GetNodeIdentifier( uriPtrc );
-#else
-	CSupAdapter::TSupNodeIdentifier identifier = GetNodeIdentifier( aURI );
-#endif    
-
-    switch( identifier )
-        {
-            case ESupNodeWelcomeData:
-            return CTARMDmStreamAdapter::EStreamToBuffer;
-
-            default:
-            return CTARMDmStreamAdapter::EStreamToNone;
-        };
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CSupAdapter::StreamingSupport
-// ------------------------------------------------------------------------------------------------
-TBool CSupAdapter::StreamingSupport( TInt& aItemSize )
-    {
-	RDEBUG( "CSupAdapter::StreamingSupport()" );
-    aItemSize = 1024; // Large images are streamed
-    return ETrue;
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CSupAdapter::CompleteOutstandingCmdsL
-// ------------------------------------------------------------------------------------------------
-void CSupAdapter::CompleteOutstandingCmdsL()
-    {
-	RDEBUG( "CSupAdapter::CompleteOutstandingCmdsL()" );
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CSupAdapter::FetchLeafObjectL
-// ------------------------------------------------------------------------------------------------
-CSmlDmAdapter::TError CSupAdapter::FetchLeafObjectL( const TDesC8& aURI, const TDesC8& /*aLUID*/, TDes8& aNewMime, CBufFlat* object, TInt &aUncodedSize )
-    {
-    RDEBUG( "CSupAdapter::FetchLeafObjectL() begin:" );
-
-    TBuf8<KStartupTBufMaxLength> mimeType;
-	CopyAndTrimMimeType(mimeType, aNewMime);
-
-//#ifdef __SAP_POLICY_MANAGEMENT
-  if(FeatureManager::FeatureSupported(KFeatureIdSapPolicyManagement ))
-{
-	User::LeaveIfError( CheckPolicyL() );	
-}
- //#endif
-
-    CSmlDmAdapter::TError status = CSmlDmAdapter::EOk;
-    TStartupAdapterLeafType type;
-    
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-	TPtrC8 uriPtrc = NSmlDmURI::RemoveDotSlash( aURI );
-	CSupAdapter::TSupNodeIdentifier identifier = GetNodeIdentifier( uriPtrc );
-#else
-	CSupAdapter::TSupNodeIdentifier identifier = GetNodeIdentifier( aURI );
-#endif   
-
-    switch( identifier )
-        {
-            case ESupNodeCustomization:
-            case ESupNodeStartup:
-                // No actions, leave object empty
-            break;
-        case ESupNodeWelcomeData:
-            status = CSmlDmAdapter::EError;
-            break;
-        case ESupNodeWelcomeText:
-                			    CBufFlat *object2 = GetStartupTextL(status, mimeType);
-                			    CleanupStack::PushL(object2);
-
-                			    object->InsertL(0, object2->Ptr(0));
-                                aUncodedSize = object->Size();
-
-                                aNewMime.Copy( KMimeTypeTextPlain );
-
-                			    CleanupStack::PopAndDestroy(object2);
-
-            break;
-        case CSupAdapter::ESupNodeNotUsedAndAlwaysLast:
-                			default:
-                			    
-                			    status = CSmlDmAdapter::EError;
-            break;
-        };
-RDEBUG( "CSupAdapter::FetchLeafObjectL() End:" );
-    return status;
-    }
-
-// ------------------------------------------------------------------------------------------------
-//  CSupAdapter::_FetchLeafObjectL
-// ------------------------------------------------------------------------------------------------
-void CSupAdapter::_FetchLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, const TDesC8& aType, TInt aResultsRef, TInt aStatusRef )
-	{
-	RDEBUG( "CSupAdapter::_FetchLeafObjectL()" );
-
-	TBuf8<KStartupTBufMaxLength> mimeType;
-	CopyAndTrimMimeType(mimeType, aType);
-
-	CBufFlat *object = CBufFlat::NewL(128);
-	CleanupStack::PushL( object );
-
-    TInt uncodedSize;
-    CSmlDmAdapter::TError status = CSmlDmAdapter::EOk;
-
-    TRAPD(
-        reason,
-        // note, FetchLeafObjectL will parse off the "./" from aURI, SymbianConvergency
-	    status = FetchLeafObjectL( aURI, aLUID, mimeType, object, uncodedSize ) );
-
-    if( KErrNone != reason )
-        {
-        status = CSmlDmAdapter::EError;
-        }
-
-	iCallBack->SetStatusL(aStatusRef, status);
-
-	if( status == CSmlDmAdapter::EOk)
-	    {
-        object->Compress();
-        iCallBack->SetResultsL( aResultsRef, *object, mimeType );
-	    }
-
-	CleanupStack::PopAndDestroy( object );
-    }
-
-// ------------------------------------------------------------------------------------------------
-//  CSupAdapter::_FetchLeafObjectSizeL
-// ------------------------------------------------------------------------------------------------
-void CSupAdapter::_FetchLeafObjectSizeL( const TDesC8& aURI, const TDesC8& aLUID, const TDesC8& aType, TInt aResultsRef, TInt aStatusRef )
-    {
-	RDEBUG("CSupAdapter::_FetchLeafObjectSizeL()");
-
-	TBuf8<KStartupTBufMaxLength> mimeType;
-	CopyAndTrimMimeType(mimeType, aType);
-
-	CBufFlat *object = CBufFlat::NewL(128);
-	CleanupStack::PushL( object );
-
-    TInt uncodedSize;
-    CSmlDmAdapter::TError status = CSmlDmAdapter::EOk;
-
-    TRAPD(
-        reason,
-        // NOTE! FetchLeafObjectL will parse off the "./" from the aURI <-> SymbianConveergency
-        status = FetchLeafObjectL( aURI, aLUID, mimeType, object, uncodedSize ) );
-
-    if( KErrNone != reason )
-        {
-        status = CSmlDmAdapter::EError;
-        }
-
-	iCallBack->SetStatusL(aStatusRef, status);
-
-	if( status == CSmlDmAdapter::EOk)
-	    {
-    	TBuf8<MAX_NUMBER_OF_DIGITS_IN_10BASE_INT64> numBuf;
-        object->Compress();
-
-        CBufFlat *object2 = CBufFlat::NewL(128);
-	    CleanupStack::PushL( object2 );
-
-        numBuf.Num(object->Size());
-        object2->InsertL(0, numBuf);
-        object2->Compress();
-        iCallBack->SetResultsL( aResultsRef, *object2, KMimeTypeTextPlain );
-
-        CleanupStack::PopAndDestroy( object2 );
-	    }
-
-	CleanupStack::PopAndDestroy( object );
-    }
-
-// ------------------------------------------------------------------------------------------------
-//  CSupAdapter::_ChildURIListL
-// ------------------------------------------------------------------------------------------------
-void CSupAdapter::_ChildURIListL( const TDesC8& aURI, const TDesC8& /*aLUID*/, const CArrayFix<TSmlDmMappingInfo>& /*aPreviousURISegmentList*/, TInt aResultsRef, TInt aStatusRef )
-	{
-	RDEBUG("CSupAdapter::_ChildURIListL()");
-
-	CSmlDmAdapter::TError ret = CSmlDmAdapter::EOk;
-
-//#ifdef __SAP_POLICY_MANAGEMENT
-if(FeatureManager::FeatureSupported(KFeatureIdSapPolicyManagement ))
-{
-	User::LeaveIfError( CheckPolicyL() );	
-}
-//#endif
-
-	CBufBase *currentList = CBufFlat::NewL(128);
-	CleanupStack::PushL(currentList);
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-	TPtrC8 uriPtrc = NSmlDmURI::RemoveDotSlash( aURI );
-	CSupAdapter::TSupNodeIdentifier identifier = GetNodeIdentifier( uriPtrc );
-#else
-	CSupAdapter::TSupNodeIdentifier identifier = GetNodeIdentifier( aURI );
-#endif
-
-    switch( identifier )
-        {
-            case ESupNodeCustomization:
-            currentList->InsertL(0,KNSmlSUPStartup8());
-            break;
-
-            case ESupNodeStartup:
-            currentList->InsertL(currentList->Size(),KNSmlSUPWelcomeDataNodeName());
-            currentList->InsertL(currentList->Size(),KNSmlSUPWelcomeTextNodeName());
-            break;
-
-            case ESupNodeWelcomeData:
-            case ESupNodeWelcomeText:
-            // Empty
-            break;
-
-            default:
-#ifdef __TARM_SYMBIAN_CONVERGENCY            
-            if( uriPtrc.Length() == 0 )
-#else
-			if( aURI.Length() == 0 )
-#endif            
-                {
-                currentList->InsertL(0,KNSmlCustomizationNodeName8());
-                }
-            else
-                {                
-                ret = CSmlDmAdapter::ENotFound;
-                }
-            break;
-        }
-
-	iCallBack->SetStatusL(aStatusRef, ret);
-
-	if( ret == CSmlDmAdapter::EOk )
-		{
-		iCallBack->SetResultsL(aResultsRef, *currentList, KNSmlSUPTextPlain);
-		}
-
-	CleanupStack::PopAndDestroy( currentList );
-
-	}
-
-// ------------------------------------------------------------------------------------------------
-// CSupAdapter::_AddNodeObjectL
-// ------------------------------------------------------------------------------------------------
-void CSupAdapter::_AddNodeObjectL( const TDesC8& /*aURI*/, const TDesC8& /*aParentLUID*/, TInt aStatusRef )
-	{
-	RDEBUG("CSupAdapter::_AddNodeObjectL()");
-
-	CSmlDmAdapter::TError ret = CSmlDmAdapter::EError;
-	iCallBack->SetStatusL(aStatusRef, ret);
-	}
-
-#ifndef __WINS_DEBUG_TESTING__
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-const TImplementationProxy ImplementationTable[] = 
-	{
-	{ {KNSmlDMSUPAdapterImplUid}, (TProxyNewLPtr)CSupAdapter::NewL }
-	};
-
-// ------------------------------------------------------------------------------------------------
-// ImplementationGroupProxy
-// ------------------------------------------------------------------------------------------------
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy( TInt& aTableCount )
-	{
-	aTableCount = sizeof(ImplementationTable) / sizeof(TImplementationProxy);
-	return ImplementationTable;
-	}
-#endif
-
-// -------------------------------------------------------------------------------------
-// CSupAdapter::FillNodeInfoL()
-// Fills the node info in ddf structure
-// -------------------------------------------------------------------------------------
-void CSupAdapter::FillNodeInfoL( MSmlDmDDFObject& aNode,TSmlDmAccessTypes aAccTypes,
-										MSmlDmDDFObject::TOccurence aOccurrence, MSmlDmDDFObject::TScope aScope, 
-										MSmlDmDDFObject::TDFFormat aFormat,const TDesC8& aDescription,const TDesC8& aMimeType)
-	{
-	RDEBUG("CSupAdapter::FillNodeInfoL()");
-
-	aNode.SetAccessTypesL(aAccTypes);
-	aNode.SetOccurenceL(aOccurrence);
-	aNode.SetScopeL(aScope);
-	aNode.SetDFFormatL(aFormat);
-	aNode.SetDescriptionL(aDescription);
-	if(aMimeType.Length() > 0)
-	    {    
-        aNode.AddDFTypeMimeTypeL(aMimeType);
-	    }
-	}
-
-// -------------------------------------------------------------------------------------
-// CSupAdapter::IsSupportedImageType()
-// Checks whether the given mime type is supported image format
-// -------------------------------------------------------------------------------------
-CSupAdapter::TStartupAdapterLeafType CSupAdapter::GetObjectType(const TDesC8& aMime)
-    {
-	RDEBUG("CSupAdapter::GetObjectType()");
-/*
-	if(IsSupportedTextType(aMime)) 
-	{
-		return CSupAdapter::EText;	
-	}
-*/
-	if(IsSupportedImageType(aMime)) 
-	{
-		return CSupAdapter::EImage;
-	}
-	
-	return CSupAdapter::EUnknown;
-    }
-
-// -------------------------------------------------------------------------------------
-// CSupAdapter::IsSupportedImageType()
-// Checks whether the given mime type is supported image format
-// -------------------------------------------------------------------------------------
-TBool CSupAdapter::IsSupportedImageType(const TDesC8& aMime)
-    {
-	RDEBUG("CSupAdapter::IsSupportedImageType()");
-
-	TBuf8<KStartupTBufMaxLength> mimeType;
-	CopyAndTrimMimeType(mimeType, aMime);
-
-#ifdef SUPADAPTER_CHECK_IMAGE_MIME_TYPE
-
-	if(
-		mimeType == KMimeTypeImageJpg || 
-	    mimeType == KMimeTypeImageGif ||
-	    mimeType == KMimeTypeImagePng ||
-	    mimeType == KMimeTypeImageAny
-	  )
-	{
-		return ETrue;
-	}
-
-	return EFalse;	
-
-#else
-
-	TDesC8 KImageDesC8 = (TDesC8&)KImage;
-	return mimeType.Left(KImageDesC8.Length()) == KImage;
-	
-#endif
-    }
-
-// -------------------------------------------------------------------------------------
-// CSupAdapter::IsSupportedTextType()
-// Checks whether the given mime type is supported text format
-// -------------------------------------------------------------------------------------
-TBool CSupAdapter::IsSupportedTextType(const TDesC8& aMime)
-    {
-	RDEBUG("CSupAdapter::IsSupportedTextType()");
-
-	TBuf8<KStartupTBufMaxLength> mimeType;
-	CopyAndTrimMimeType(mimeType, aMime);
-
-#ifdef SUPADAPTER_CHECK_TEXT_MIME_TYPE
-
-	if(
-		mimeType == KMimeTypeTextPlain || 
-	    mimeType == KMimeTypeTextAny
-	  )
-	{
-		return ETrue;
-	}
-	
-	return EFalse;
-	
-#else
-
-    TDesC8 KTextDesC8  = (TDesC8&)KText;	
-	return mimeType.Left(KTextDesC8.Length()) == KText;
-
-#endif
-    }
-
-// -------------------------------------------------------------------------------------
-// CSupAdapter::SetStartupTextL()
-// Sets and activates startup text
-// -------------------------------------------------------------------------------------
-void CSupAdapter::SetStartupTextL(CSmlDmAdapter::TError& aStatus, const TDesC16& aText)
-    {
-	RDEBUG("CSupAdapter::SetStartupTextL()");
-
-    RUISettingsSrv uiSrv;
-    User::LeaveIfError( uiSrv.Connect() );
-    CleanupClosePushL( uiSrv );
-
-    if( (KErrNone == uiSrv.SetStartupText( aText )) &&
-        (KErrNone == uiSrv.SetStartupNoteType( ETextWelcomeNote )))
-        {
-        // status remains the same
-        }
-    else
-        {
-        aStatus = CSmlDmAdapter::EError;
-        }
-
-    CleanupStack::PopAndDestroy( &uiSrv );
-    }
-
-// -------------------------------------------------------------------------------------
-// CSupAdapter::SetStartupImageL()
-// Sets and activates startup image
-// -------------------------------------------------------------------------------------
-void CSupAdapter::SetStartupImageL(CSmlDmAdapter::TError& aStatus, const TDesC8& aObject, const TDesC8& /*aType*/)
-    {
-	RDEBUG("CSupAdapter::SetStartupImageL()");
-
-	//
-	// Write file to a temp file
-	//
-    RFs   fileSession;
-    RFile file;
-
-    User::LeaveIfError( fileSession.Connect() );
-    CleanupClosePushL( fileSession );
-
-    //
-    // Delete previous temp file
-    //
-    if( iTemporaryImageFile.Length() > 0 )
-        {
-        fileSession.Delete( iTemporaryImageFile );
-        iTemporaryImageFile.Zero();
-        }
-
-    User::LeaveIfError( file.Temp( fileSession, KTempFilePath, iTemporaryImageFile, EFileWrite ) );
-    CleanupClosePushL( file );
-
-	//
-	// Decoce from base 64 and write to file
-	//
-	TImCodecB64 B64Coder;	
-	HBufC8 *target = HBufC8::NewLC( ( aObject.Length() * 3 ) / 4 + 16 );
- 	TPtr8 targetPtr( target->Des() );
- 	TBool decodeResult = TFileCoderB64::CheckB64Encode( aObject );
-	if( decodeResult )
-		{
-		// use decoded data 
-		B64Coder.Decode( aObject, targetPtr );
-		User::LeaveIfError( file.Write( targetPtr ) );
-		}
-	else
-		{
-		// use original data
-		User::LeaveIfError( file.Write ( aObject ) );
-		}
-
-	file.Flush();
-	CleanupStack::PopAndDestroy(target);
-
-	// Close file
-    CleanupStack::PopAndDestroy( &file );
-
-    // Close fileSession
-    CleanupStack::PopAndDestroy( &fileSession );
-
-    //
-    // Set startup image
-    //
-    RUISettingsSrv uiSrv;
-    User::LeaveIfError( uiSrv.Connect() );
-    CleanupClosePushL( uiSrv );
-    
-    if( (KErrNone == uiSrv.SetStartupImage( iTemporaryImageFile )) &&
-        (KErrNone == uiSrv.SetStartupNoteType( EImageWelcomeNote )))
-        {
-        // status remains the same
-        }
-    else
-        {
-        aStatus = CSmlDmAdapter::EError;
-        }
-
-    CleanupStack::PopAndDestroy( &uiSrv );
-    }
-
-// -------------------------------------------------------------------------------------
-// CSupAdapter::GetStartupTextL()
-// Currently returns only plain text
-// -------------------------------------------------------------------------------------
-CBufFlat* CSupAdapter::GetStartupTextL(CSmlDmAdapter::TError& /*aStatus*/, const TDesC8& /*aType*/)
-    {
-	RDEBUG("CSupAdapter::GetStartupTextL()");
-
-    CBufFlat* object = CBufFlat::NewL(128);
-
-    RUISettingsSrv uiSrv;
-    User::LeaveIfError( uiSrv.Connect() );
-    CleanupClosePushL( uiSrv );
-
-    HBufC* text16 = uiSrv.GetStartupTextL();
-    CleanupStack::PushL( text16 );
-
-    HBufC8* text8 = CTARMCharConv::ConvertToUtf8LC( *text16 );
-
-    object->InsertL( 0, *text8 );
-
-    CleanupStack::PopAndDestroy( text8 );
-    CleanupStack::PopAndDestroy( text16 );
-    CleanupStack::PopAndDestroy( &uiSrv );
-
-    return object;
-    }
-
-// -------------------------------------------------------------------------------------
-// CSupAdapter::GetStartupImageL()
-// Currently returns only plain text
-// -------------------------------------------------------------------------------------
-CBufFlat* CSupAdapter::GetStartupImageL(CSmlDmAdapter::TError& aStatus, const TDesC8& /*aType*/, TInt &aImageSize)
-    {
-	RDEBUG("CSupAdapter::GetStartupImageL()");
-
-    TBuf<KMaxFileName>  imageLocation;
-    TBuf8<KMaxFileName> imageLocation8;
-    CBufFlat* object = 0;
-
-    // First, get image location in the file system
-    //
-    RUISettingsSrv uiSrv;
-    User::LeaveIfError( uiSrv.Connect() );
-    CleanupClosePushL( uiSrv );
-    
-    User::LeaveIfError( uiSrv.GetStartupImagePath( imageLocation ) );
-    
-    CleanupStack::PopAndDestroy( &uiSrv );    
-
-    //
-    // Then, create base64 encoded flat buffer of the image
-    //
-    imageLocation8.Copy(imageLocation);
-
-    if(imageLocation8.Length() > 0)
-        {
-        //
-        // Load image into memory
-        // 
-        RFs   fileSession;
-        RFile file;
-        
-        User::LeaveIfError( fileSession.Connect() );
-        CleanupClosePushL( fileSession );
-        
-		TInt err = file.Open ( fileSession, imageLocation, EFileRead );
-		
-		if ( err == KErrNone )
-			{
-			CleanupClosePushL( file );
-		    TInt size( 0 );
-		    
-			err = file.Size( size );
-			if ( err == KErrNone ) 
-				{
-				HBufC8 *data = HBufC8::NewLC( size );
-				TPtr8 ptr( data->Des() );
-				err = file.Read( ptr );
-				
-				TImCodecB64 B64Coder;
-				HBufC8 *target = HBufC8::NewLC( ( size * 4 ) / 3 + 16 );
-				TPtr8 targetPtr( target->Des() );
-				
-				B64Coder.Encode( *data, targetPtr );
-				
-                object = CBufFlat::NewL(targetPtr.Length());
-				object->InsertL( 0, targetPtr );
-				
-				CleanupStack::PopAndDestroy(target);
-				CleanupStack::PopAndDestroy(data);
-				}
-
-			file.Size(aImageSize);
-
-            // Close file
-            CleanupStack::PopAndDestroy( &file );        
-			}
-		else if ( err == KErrNotFound || err == KErrPathNotFound )
-			{
-			RDEBUG("CSupAdapter::GetStartupImageL(): No image file");
-
-			// Remains ok : aStatus = CSmlDmAdapter::EOk;
-			}
-        else
-            {
-            aStatus = CSmlDmAdapter::EError;
-            }
-
-        // Close fileSession
-        CleanupStack::PopAndDestroy( &fileSession );
-
-        }
-    else
-        {
-        
-        // Remains ok: aStatus = CSmlDmAdapter::EOk;
-        object = CBufFlat::NewL(0);
-        }
-
-    return object;
-    }
-
-// -------------------------------------------------------------------------------------
-// CSupAdapter::CopyAndTrimMimeType()
-// -------------------------------------------------------------------------------------
-void CSupAdapter::CopyAndTrimMimeType(TDes8& aNewMime, const TDesC8& aType)
-    {
-	RDEBUG("CSupAdapter::CopyAndTrimMimeType()");
-
-	if(aNewMime.MaxLength() < aType.Length())
-	    {
-	    aNewMime.Copy( aType.Left(aNewMime.MaxLength()) );
-	    }
-    else
-        {
-	    aNewMime.Copy( aType );           
-        }        
-    aNewMime.TrimAll();
-    aNewMime.LowerCase();
-    
-    TInt pos;
-    while(( pos = aNewMime.Locate(' ')  ) != KErrNotFound)
-        {
-            aNewMime.Delete(pos, 1);
-        }
-	RDEBUG8_2("CSupAdapter::CopyAndTrimMimeType() end (%S)", &aNewMime);
-    }
-
-// -------------------------------------------------------------------------------------
-// CSupAdapter::GetFetchTypeL()
-// -------------------------------------------------------------------------------------
-CSupAdapter::TStartupAdapterLeafType CSupAdapter::GetFetchTypeL(CSmlDmAdapter::TError& aStatus, const TDesC8& aType)
-    {
-	RDEBUG("CSupAdapter::GetFetchTypeL()");
-
-	TBuf8<KStartupTBufMaxLength> mimeType;
-	CopyAndTrimMimeType(mimeType, aType);
-
-	TStartupAdapterLeafType type = CSupAdapter::EUnknown;
-
-	TBool validMimeType = ETrue;
-
-	if(mimeType == KMimeTypeImageMbm)
-	    {
-	    type = CSupAdapter::EImage;
-	    }
-	    else
-	if(mimeType == KMimeTypeTextPlain)
-	    {
-	    type = CSupAdapter::EText;
-	    }   			
-	    else
-	if(mimeType.Length() > 0)
-	    {
-	    validMimeType = EFalse;
-	    }
-	else
-	    {
-	    validMimeType = ETrue;
-	    }
-
-    if(validMimeType)
-        {
-            if(type == CSupAdapter::EUnknown)
-                {
-                    type = GetSelectedTypeL(aStatus);
-
-                    if(aStatus != CSupAdapter::EOk)
-                        {
-                            aStatus = CSmlDmAdapter::EError;
-                        }
-                }
-        }
-    else
-        {
-            aStatus = CSmlDmAdapter::EError;
-        }
-
-    return type;
-    }
-
-// -------------------------------------------------------------------------------------
-// CTcAdapter::GetNodeIdentifier
-// -------------------------------------------------------------------------------------
-CSupAdapter::TSupNodeIdentifier CSupAdapter::GetNodeIdentifier(const TDesC8& aURI)
-    {
-	RDEBUG("CSupAdapter::GetNodeIdentifier()");
-
-	// NOTE! This code expects that the aURI starts without "./" so with Symbian Convergency
-	// make sure that the code that calls this function parses the "./" from the beginning of
-	// the string!
-
-    TInt numOfSegs = NSmlDmURI::NumOfURISegs( aURI );
-    if( numOfSegs == 0 )
-        {
-        return CSupAdapter::ESupNodeNotUsedAndAlwaysLast;
-        }
-
-    TPtrC8I seg1 = NSmlDmURI::URISeg( aURI, 0 );
-
-    if(seg1 == KNSmlCustomizationNodeName)
-        {
-        if(numOfSegs == 1)
-            {
-            return CSupAdapter::ESupNodeCustomization;
-            }
-        else
-            {
-            // At least 2 segments
-            TPtrC8I seg2 = NSmlDmURI::URISeg( aURI, 1 );
-
-            if(seg2 == KNSmlSUPStartupNodeName)
-                {
-                if(numOfSegs == 2)
-                    {
-                    return CSupAdapter::ESupNodeStartup;
-                    }
-                else
-                    {
-                    // At least 3 segments
-                    TPtrC8I seg3 = NSmlDmURI::URISeg( aURI, 2 );
-
-                    if(numOfSegs == 3)
-                        {
-                        if(seg3 == KNSmlSUPWelcomeDataNodeName)
-                            {
-                            return CSupAdapter::ESupNodeWelcomeData;
-                            }
-                        else if(seg3 == KNSmlSUPWelcomeTextNodeName)
-                            {
-                            return CSupAdapter::ESupNodeWelcomeText;
-                            }
-                        else
-                            {
-                            return CSupAdapter::ESupNodeNotUsedAndAlwaysLast;
-                            }
-                        }
-                    else
-                        {
-                        return CSupAdapter::ESupNodeNotUsedAndAlwaysLast;
-                        }
-                    }
-                }
-            else
-                {
-                return CSupAdapter::ESupNodeNotUsedAndAlwaysLast;
-                }
-            }
-        }
-    else
-        {
-        return CSupAdapter::ESupNodeNotUsedAndAlwaysLast;
-        }
-
-    // Note: do not return anything here
-    }
-
-// -------------------------------------------------------------------------------------
-// CSupAdapter::GetSelectedTypeL()
-// -------------------------------------------------------------------------------------
-CSupAdapter::TStartupAdapterLeafType CSupAdapter::GetSelectedTypeL(CSmlDmAdapter::TError& /*aStatus*/)
-    {
-	RDEBUG("CSupAdapter::GetSelectedTypeL()");
-
-    TStartupAdapterLeafType retVal = CSupAdapter::EUnknown;
-    TInt type = ETextWelcomeNote;
-
-    RUISettingsSrv uiSrv;
-    User::LeaveIfError( uiSrv.Connect() );
-    CleanupClosePushL( uiSrv );
-
-    User::LeaveIfError( uiSrv.GetStartupNoteType( type ) );
-
-    CleanupStack::PopAndDestroy( &uiSrv );
-
-    switch(type)
-    {
-        case ETextWelcomeNote:
-            retVal = CSupAdapter::EText;
-        break;
-
-        case EImageWelcomeNote:
-            retVal = CSupAdapter::EImage;
-        break;
-    }
-
-    return retVal;
-    }
-
-// -------------------------------------------------------------------------------------
-// CSupAdapter::CheckPolicyL
-// -------------------------------------------------------------------------------------   
-//#ifdef __SAP_POLICY_MANAGEMENT
-
-TInt CSupAdapter::CheckPolicyL()
-    {
-    
-    if(!FeatureManager::FeatureSupported(KFeatureIdSapPolicyManagement ))
-    {
-    	User::Leave(KErrNotSupported);
-    }
-    
-    	
-	TInt result( KErrNone );
-
-#ifdef __WINS__
-
-	return result;
-
-#else
-	RDEBUG("CSupAdapter::CheckPolicyL() ask if enforcement is set");
-	CSettingEnforcementInfo* info = CSettingEnforcementInfo::NewL();
-	CleanupStack::PushL(info);
-    TBool enfed(EFalse);
-	User::LeaveIfError(info->EnforcementActive(ECustomization, enfed));
-	CleanupStack::PopAndDestroy(info);
-
-	RDEBUG_2("CSupAdapter::CheckPolicyL() enforcement: (%d)", enfed);
-
-	if( enfed )
-    {
-    RDMCert dmcert;
-    TCertInfo ci;
-    dmcert.Get( ci ); 
-
-    // Policy Engine Request
-    TRequestContext context;
-    TResponse response;
-    context.AddSubjectAttributeL(
-        PolicyEngineXACML::KTrustedSubject,
-        ci
-        );
-    context.AddResourceAttributeL(
-        PolicyEngineXACML::KResourceId,
-        PolicyEngineXACML::KCustomizationManagement,
-        PolicyEngineXACML::KStringDataType
-        );
-    
-    User::LeaveIfError( iPR.MakeRequest( context, response ) );
-    TResponseValue resp = response.GetResponseValue();
-    switch( resp )
-        {
-	    case EResponsePermit:
-	        break;
-      case EResponseDeny:
-	    case EResponseIndeterminate:
-	    case EResponseNotApplicable:
-	    default:
-    	    result = KErrAccessDenied;
-	    }
-    }
-
-#endif
-	RDEBUG_2("CSupAdapter::CheckPolicyL() end: response (%d)", result);
-    return result;
-    
-    }
-//#endif
-
-// -----------------------------------------------------------------------------
-// CSupAdapter::PolicyRequestResourceL
-// -----------------------------------------------------------------------------
-//
-//#ifdef __SAP_POLICY_MANAGEMENT
-TPtrC8 CSupAdapter::PolicyRequestResourceL( const TDesC8& /*aURI*/ )
-	{
-	
-	if(!FeatureManager::FeatureSupported(KFeatureIdSapPolicyManagement ))
-	{
-		User::Leave(KErrNotSupported);
-		
-	}
-	 RDEBUG("CSupAdapter::PolicyRequestResourceL()");
-
-		return PolicyEngineXACML::KCustomizationManagement();	
-	}
-//#endif
-
-#ifdef __WINS__
-
-// -------------------------------------------------------------------------------------
-// CSupAdapter::DebugTestsL()
-// -------------------------------------------------------------------------------------
-void CSupAdapter::DebugTestsL()
-    {
-	RDEBUG("CSupAdapter::DebugTestsL()");
-
-    TBuf8<1024> buffer;
-
-    ASSERT(NSmlDmURI::URISeg(_L8("1/2/3"), 0) == _L8("1"));
-    ASSERT(NSmlDmURI::URISeg(_L8("1/2/3"), 1) == _L8("2"));
-    ASSERT(NSmlDmURI::URISeg(_L8("1/2/3"), 2) == _L8("3"));
-    ASSERT(NSmlDmURI::URISeg(_L8("1/2/3"), 3) == _L8(""));
-    ASSERT(NSmlDmURI::URISeg(_L8("1/2/3"), 4) == _L8(""));
-    ASSERT(NSmlDmURI::URISeg(_L8("1/2/3"), 5) == _L8(""));
-    ASSERT(NSmlDmURI::URISeg(_L8("1/2/3"), -1) == _L8(""));
-
-    ASSERT(NSmlDmURI::URISeg(_L8("yksi /kaksi / kolme"), 0) == _L8("yksi "));
-    ASSERT(NSmlDmURI::URISeg(_L8("yksi /kaksi / kolme"), 1) == _L8("kaksi "));
-    ASSERT(NSmlDmURI::URISeg(_L8("yksi /kaksi / kolme"), 2) == _L8(" kolme"));
-    ASSERT(NSmlDmURI::URISeg(_L8("yksi /kaksi / kolme"), 3) == _L8(""));
-    ASSERT(NSmlDmURI::URISeg(_L8("yksi /kaksi / kolme"), 4) == _L8(""));
-    ASSERT(NSmlDmURI::URISeg(_L8("yksi /kaksi / kolme"), 5) == _L8(""));
-    ASSERT(NSmlDmURI::URISeg(_L8("yksi /kaksi / kolme"), -1) == _L8(""));
-    
-    //
-    // Text conversions
-    //
-    _LIT16(KText, "abcdefghijklmnopqrstuvxyz1234567890_:;-.,'*!#¤%&/()=?`+´^~¨<>|§½@£${[]}\\\"");
-
-    HBufC8  *utf8Text = CTARMCharConv::ConvertToUtf8LC( KText() );
-    HBufC16 *unicodeText = CTARMCharConv::ConvertFromUtf8LC( *utf8Text );
-    ASSERT( unicodeText->Des().Compare( KText() ) == 0 );
-    CleanupStack::PopAndDestroy( unicodeText );
-    CleanupStack::PopAndDestroy( utf8Text );
-  
-    //
-    // Valid mime types
-    //
-    ASSERT(IsSupportedTextType(_L8("text/")));
-    ASSERT(IsSupportedTextType(_L8("text/plain")));
-    ASSERT(IsSupportedTextType(_L8("TeXt/PlaiN")));
-    ASSERT(IsSupportedTextType(_L8("TEXT/jepulis")));
-    ASSERT(IsSupportedTextType(_L8("text/köök")));
-    ASSERT(IsSupportedTextType(_L8("TEXT/,.,.,.")));
-    ASSERT(IsSupportedTextType(_L8(" text/plain ")));    
-    
-    ASSERT(IsSupportedImageType(_L8("image/*")));
-    ASSERT(IsSupportedImageType(_L8("ImaGe/PnG")));
-    ASSERT(IsSupportedImageType(_L8("IMAGE/jepulis")));
-    ASSERT(IsSupportedImageType(_L8("image/köök")));
-    ASSERT(IsSupportedImageType(_L8("IMAGE/,.,.,.")));
-    ASSERT(IsSupportedImageType(_L8(" IMage/jpeg ")));
-
-    ASSERT(IsSupportedTextType(_L8("text /plain")));
-    ASSERT(IsSupportedTextType(_L8("text / plain")));
-    ASSERT(IsSupportedTextType(_L8("t e x t/jepulis")));
-
-    //
-    // Invalid mime types
-    //    
-    ASSERT(!IsSupportedTextType(_L8("text")));   
-    ASSERT(!IsSupportedTextType(_L8("a text/plain")));
-    ASSERT(!IsSupportedTextType(_L8("_text/plain")));
-    ASSERT(!IsSupportedTextType(_L8("\"text/plain\"")));
-    
-    //
-    // Get/Set startup text
-    //    
-    CSmlDmAdapter::TError status = CSmlDmAdapter::EOk;
-    CBufBase *object, *object2;
-
-    // Get startup text
-    object = GetStartupTextL(status, _L8("text/"));   
-    ASSERT(object != 0);
-    ASSERT(status == CSmlDmAdapter::EOk);
-    delete object;
-
-    // Set startup text
-    _LIT16(KStartupText1, "Startup text: Päivää!");
-    _LIT16(KStartupText2, "Startup text: Päivää!");
-
-    SetStartupTextL(status, KStartupText1());
-    ASSERT(status == CSmlDmAdapter::EOk);
-
-    // Get startup text
-    object = GetStartupTextL(status, buffer);
-    ASSERT(object != 0);
-    ASSERT(status == CSmlDmAdapter::EOk);
-    CleanupStack::PushL( object );
-
-    HBufC16* source = CTARMCharConv::ConvertFromUtf8LC( object->Ptr( 0 ) );
-    TInt sourceLength = source->Length();
-    TInt destLength = KStartupTBufMaxLength<sourceLength?KStartupTBufMaxLength:sourceLength;
-    TPtrC16 sourcePtr( source->Ptr(), destLength );
-    ASSERT( sourcePtr == KStartupText2 );
-	CleanupStack::PopAndDestroy( source );
-
-    CleanupStack::PopAndDestroy( object );
-
-    //
-    // Set/Get startup image
-    //    
-    TUint8 jpeg[773] =
-        {
-        0xff,0xd8,0xff,0xe0,0x00,0x10,0x4a,0x46,0x49,0x46,0x00,0x01,0x01,0x01,0x01,0x2c,
-        0x01,0x2c,0x00,0x00,0xff,0xdb,0x00,0x43,0x00,0x08,0x06,0x06,0x07,0x06,0x05,0x08,
-        0x07,0x07,0x07,0x09,0x09,0x08,0x0a,0x0c,0x14,0x0d,0x0c,0x0b,0x0b,0x0c,0x19,0x12,
-        0x13,0x0f,0x14,0x1d,0x1a,0x1f,0x1e,0x1d,0x1a,0x1c,0x1c,0x20,0x24,0x2e,0x27,0x20,
-        0x22,0x2c,0x23,0x1c,0x1c,0x28,0x37,0x29,0x2c,0x30,0x31,0x34,0x34,0x34,0x1f,0x27,
-        0x39,0x3d,0x38,0x32,0x3c,0x2e,0x33,0x34,0x32,0xff,0xdb,0x00,0x43,0x01,0x09,0x09,
-        0x09,0x0c,0x0b,0x0c,0x18,0x0d,0x0d,0x18,0x32,0x21,0x1c,0x21,0x32,0x32,0x32,0x32,
-        0x32,0x32,0x32,0x32,0x32,0x32,0x32,0x32,0x32,0x32,0x32,0x32,0x32,0x32,0x32,0x32,
-        0x32,0x32,0x32,0x32,0x32,0x32,0x32,0x32,0x32,0x32,0x32,0x32,0x32,0x32,0x32,0x32,
-        0x32,0x32,0x32,0x32,0x32,0x32,0x32,0x32,0x32,0x32,0x32,0x32,0x32,0x32,0xff,0xc0,
-        0x00,0x11,0x08,0x00,0x14,0x00,0x14,0x03,0x01,0x22,0x00,0x02,0x11,0x01,0x03,0x11,
-        0x01,0xff,0xc4,0x00,0x1f,0x00,0x00,0x01,0x05,0x01,0x01,0x01,0x01,0x01,0x01,0x00,
-        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,
-        0x0a,0x0b,0xff,0xc4,0x00,0xb5,0x10,0x00,0x02,0x01,0x03,0x03,0x02,0x04,0x03,0x05,
-        0x05,0x04,0x04,0x00,0x00,0x01,0x7d,0x01,0x02,0x03,0x00,0x04,0x11,0x05,0x12,0x21,
-        0x31,0x41,0x06,0x13,0x51,0x61,0x07,0x22,0x71,0x14,0x32,0x81,0x91,0xa1,0x08,0x23,
-        0x42,0xb1,0xc1,0x15,0x52,0xd1,0xf0,0x24,0x33,0x62,0x72,0x82,0x09,0x0a,0x16,0x17,
-        0x18,0x19,0x1a,0x25,0x26,0x27,0x28,0x29,0x2a,0x34,0x35,0x36,0x37,0x38,0x39,0x3a,
-        0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x4a,0x53,0x54,0x55,0x56,0x57,0x58,0x59,0x5a,
-        0x63,0x64,0x65,0x66,0x67,0x68,0x69,0x6a,0x73,0x74,0x75,0x76,0x77,0x78,0x79,0x7a,
-        0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,
-        0x9a,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xb2,0xb3,0xb4,0xb5,0xb6,0xb7,
-        0xb8,0xb9,0xba,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xd2,0xd3,0xd4,0xd5,
-        0xd6,0xd7,0xd8,0xd9,0xda,0xe1,0xe2,0xe3,0xe4,0xe5,0xe6,0xe7,0xe8,0xe9,0xea,0xf1,
-        0xf2,0xf3,0xf4,0xf5,0xf6,0xf7,0xf8,0xf9,0xfa,0xff,0xc4,0x00,0x1f,0x01,0x00,0x03,
-        0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x01,
-        0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0xff,0xc4,0x00,0xb5,0x11,0x00,
-        0x02,0x01,0x02,0x04,0x04,0x03,0x04,0x07,0x05,0x04,0x04,0x00,0x01,0x02,0x77,0x00,
-        0x01,0x02,0x03,0x11,0x04,0x05,0x21,0x31,0x06,0x12,0x41,0x51,0x07,0x61,0x71,0x13,
-        0x22,0x32,0x81,0x08,0x14,0x42,0x91,0xa1,0xb1,0xc1,0x09,0x23,0x33,0x52,0xf0,0x15,
-        0x62,0x72,0xd1,0x0a,0x16,0x24,0x34,0xe1,0x25,0xf1,0x17,0x18,0x19,0x1a,0x26,0x27,
-        0x28,0x29,0x2a,0x35,0x36,0x37,0x38,0x39,0x3a,0x43,0x44,0x45,0x46,0x47,0x48,0x49,
-        0x4a,0x53,0x54,0x55,0x56,0x57,0x58,0x59,0x5a,0x63,0x64,0x65,0x66,0x67,0x68,0x69,
-        0x6a,0x73,0x74,0x75,0x76,0x77,0x78,0x79,0x7a,0x82,0x83,0x84,0x85,0x86,0x87,0x88,
-        0x89,0x8a,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9a,0xa2,0xa3,0xa4,0xa5,0xa6,
-        0xa7,0xa8,0xa9,0xaa,0xb2,0xb3,0xb4,0xb5,0xb6,0xb7,0xb8,0xb9,0xba,0xc2,0xc3,0xc4,
-        0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xd2,0xd3,0xd4,0xd5,0xd6,0xd7,0xd8,0xd9,0xda,0xe2,
-        0xe3,0xe4,0xe5,0xe6,0xe7,0xe8,0xe9,0xea,0xf2,0xf3,0xf4,0xf5,0xf6,0xf7,0xf8,0xf9,
-        0xfa,0xff,0xda,0x00,0x0c,0x03,0x01,0x00,0x02,0x11,0x03,0x11,0x00,0x3f,0x00,0xf7,
-        0x7b,0xfb,0xeb,0x7d,0x33,0x4e,0xb9,0xbf,0xbc,0x93,0xcb,0xb5,0xb5,0x89,0xe6,0x99,
-        0xf6,0x93,0xb5,0x14,0x12,0xc7,0x03,0x93,0x80,0x0f,0x4a,0x8f,0x4b,0xd4,0xa1,0xd5,
-        0xac,0x16,0xee,0x15,0x91,0x01,0x77,0x8d,0xe3,0x90,0x00,0xd1,0xc8,0x8e,0x51,0xd0,
-        0xe0,0x91,0x95,0x65,0x65,0xc8,0x24,0x1c,0x64,0x12,0x30,0x6a,0x9f,0x89,0x34,0x9b,
-        0x8d,0x73,0x4e,0x8f,0x4d,0x8a,0xe7,0xec,0xf6,0xb3,0x4a,0x05,0xe3,0xae,0x3c,0xcf,
-        0x28,0x02,0x76,0xa0,0x65,0x65,0x6d,0xce,0x11,0x59,0x5c,0x15,0x28,0x5c,0x11,0xcd,
-        0x47,0xa0,0x68,0xb7,0x7a,0x1d,0xc5,0xfc,0x4f,0x7f,0x25,0xe5,0x9d,0xc3,0x8b,0x84,
-        0x79,0xc2,0x09,0x56,0x66,0x2d,0xe6,0x8d,0xb1,0xa2,0x22,0xa1,0xc2,0x30,0xc0,0xc9,
-        0x76,0x91,0x8e,0x49,0xa0,0x0d,0xca,0x28,0xa2,0x80,0x0a,0x28,0xa2,0x80,0x0a,0x28,
-        0xa2,0x80,0x3f,0xff,0xd9            
-        };
-     TPtrC8 jpeg_Ptr8(jpeg, 773);
-
-    // Encode JPEG        
-	TImCodecB64 B64Coder;
-	HBufC8 *target = HBufC8::NewLC( ( 773 * 4 ) / 3 + 16 );
-	TPtr8 targetPtr( target->Des() );	
-	B64Coder.Encode( jpeg_Ptr8, targetPtr );
-
-    // Set image X
-	SetStartupImageL(status,targetPtr,KMimeTypeImageMbm);
-    ASSERT(status == CSmlDmAdapter::EOk);
-        
-    // Get image Y1 (returns encoded MBM)
-    TInt imageSize;
-    object = GetStartupImageL(status,KMimeTypeImageMbm,imageSize);
-    ASSERT(status == CSmlDmAdapter::EOk);
-    CleanupStack::PushL( object );
-       
-    // Set image Y1
-	SetStartupImageL(status,object->Ptr(0),KMimeTypeImageMbm);
-    ASSERT(status == CSmlDmAdapter::EOk);
-    
-    // Get image Y2
-    object2 = GetStartupImageL(status,KMimeTypeImageMbm,imageSize);
-    ASSERT(status == CSmlDmAdapter::EOk);
-
-    // Assert Y1 == Y2
-    ASSERT(object->Ptr(0) == object2->Ptr(0));
-    
-    CleanupStack::PopAndDestroy( object );
-    delete object2;
-    CleanupStack::PopAndDestroy(target);
-
-    //
-    // Other methods, GetFetchTypeL
-    //     
-    status = CSmlDmAdapter::EOk;
-
-    // OK cases
-    GetFetchTypeL(status, _L8(""));
-    ASSERT(status == CSmlDmAdapter::EOk);
-    GetFetchTypeL(status, _L8("text/plain"));
-    ASSERT(status == CSmlDmAdapter::EOk);
-    GetFetchTypeL(status, _L8("image/x-epoc-mbm"));
-    ASSERT(status == CSmlDmAdapter::EOk);
-
-    // Fail cases
-    GetFetchTypeL(status, _L8(" t e x t / "));
-    ASSERT(status != CSmlDmAdapter::EOk); status = CSmlDmAdapter::EOk;
-    GetFetchTypeL(status, _L8("ima ge /"));
-    ASSERT(status != CSmlDmAdapter::EOk); status = CSmlDmAdapter::EOk;
-    GetFetchTypeL(status, _L8("text/"));
-    ASSERT(status != CSmlDmAdapter::EOk); status = CSmlDmAdapter::EOk;
-    GetFetchTypeL(status, _L8("text/"));
-    ASSERT(status != CSmlDmAdapter::EOk); status = CSmlDmAdapter::EOk;
-    GetFetchTypeL(status, _L8("video/"));
-    ASSERT(status != CSmlDmAdapter::EOk); status = CSmlDmAdapter::EOk;
-    GetFetchTypeL(status, _L8("*"));
-    ASSERT(status != CSmlDmAdapter::EOk); status = CSmlDmAdapter::EOk;
-    GetFetchTypeL(status, _L8("text/"));
-    ASSERT(status != CSmlDmAdapter::EOk); status = CSmlDmAdapter::EOk;
-    GetFetchTypeL(status, _L8("image/"));
-    ASSERT(status != CSmlDmAdapter::EOk); status = CSmlDmAdapter::EOk;
-    }
-#endif
-
-
--- a/customization/supadapter/src/supadapter.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-/*
-* 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: 
-*       Registery info for DM Startup Adapter Settings.
-*
-*/
-
-
-#include <registryinfo.rh>
-#define KSmlDMInterfaceUid 0x102018B4
-
-RESOURCE REGISTRY_INFO theRegistryInfo
-  {
-  dll_uid = 0x10207821; //The DLL's 3rd UID.
-  interfaces = 
-      {
-      INTERFACE_INFO
-          {
-          interface_uid = KSmlDMInterfaceUid; // DM interface UID
-          implementations = 
-            {
-            IMPLEMENTATION_INFO
-                {
-                implementation_uid = 0x10207822; // DM Startup implementation UID
-                version_no = 1; 
-                display_name = "DM Startup Adapter";
-                default_data = "";
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-                opaque_data = "host=0x101F9A02";
-#else
-								opaque_data = "";
-#endif
-                }
-            };
-          }
-      };
-    }
--- a/customization/tsrc/tarmcustomization/BWINS/ThemesTestu.def	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	?LibEntryL@@YAPAVCScriptBase@@AAVCTestModuleIf@@@Z @ 1 NONAME ; class CScriptBase * LibEntryL(class CTestModuleIf &)
-
--- a/customization/tsrc/tarmcustomization/conf/ThemesTest.cfg	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,979 +0,0 @@
-//---------------------------------------------------------------------------------------------
-// Test 1 - Test DDF Version and DDF structure
-[Test]
-title Op_logo_DDF
-create ThemesTest ttest
-
-ttest LoadL 1020782A
-
-ttest DDFVersionL ET="1.0"
-
-ttest AddDDFCheckL URI="Customization"                     AccessTypes=G  Format=Node Occurence=One       Scope=Permanent Title="" MimeType=""                 ObjectGroup=0
-ttest AddDDFCheckL URI="Customization/OperatorLogo"        AccessTypes=G  Format=Node Occurence=One       Scope=Permanent Title="" MimeType=""                 ObjectGroup=0
-ttest AddDDFCheckL URI="Customization/OperatorLogo/Data"		   AccessTypes=GR Format=Bin  Occurence=One 	  Scope=Permanent Title="" MimeType="image/*" 	   ObjectGroup=0
-
-ttest DDFStructureL
-
-delete ttest
-[Endtest]
-//---------------------------------------------------------------------------------------------
-// Test 2 - Test all DM operations
-[Test]
-title Op_Logo_Child
-create ThemesTest ttest
-ttest LoadL 1020782A
-
-//
-//	enum TError 
-//		{
-//		/** The command was successful */
-//		EOk = 0,
-//		/** The command failed because no setting exists in the store which corresponds to the
-//			URI or LUID passed to the adapter */
-//		ENotFound = 1,
-//		/** The command failed because the setting can't take the value being passed to the adapter */
-//		EInvalidObject = 2,
-//		/** The command failed because the setting already exists in the store */
-//		EAlreadyExists = 3,
-//		/** The command failed because the setting value is too large to be accommodated in the store */
-//		ETooLargeObject = 4,
-//		/** The command failed because the disk on which the device store resides is full */
-//		EDiskFull = 5,
-//		/** The command failed for an unspecified reason */
-//		EError = 6,
-//		/** The command could not be rolled back successfully */
-//		ERollbackFailed = 7,
-//		/** The command failed because the setting is being used by another client */
-//		EObjectInUse = 8,
-//		/** The command failed because no memory could be allocated */
-//		ENoMemory = 9
-//		};
-//
-
-ttest ChildURIListL URI=""                                  ES=1 ET=""
-ttest ChildURIListL URI="Customization"                     ES=0 ET="OperatorLogo"
-ttest ChildURIListL URI="Customization/OperatorLogo"             ES=0 ET="Data"
-ttest ChildURIListL URI="Customization/OperatorLogo/Data" 		ES=0 ET=""
-
-
-delete ttest
-[Endtest]
-//---------------------------------------------------------------------------------------------
-// Test 3 - Test Startup text
-[Test]
-title Op_Logo_commit
-create ThemesTest ttest
-ttest LoadL 1020782A
-
-ttest StartAtomicL
-ttest UpdateLeafObjectL    URI="Customization/OperatorLogo/Data" ES=0  IF="E:\Testing\Data\bug_OpLogoAdapter.jpg" IM="image/jpg"
-//Sivaji: As GET on Data is not supported, adapter returns an error code EError(=6) so ES=6
-ttest FetchLeafObjectL     URI="Customization/OperatorLogo/Data" ES=6 /*ET="Startup text" EM="text/plain"*/
-ttest CommitAtomicL
-
-ttest StartAtomicL
-ttest UpdateLeafObjectL    URI="Customization/OperatorLogo/Data" ES=0 IF="E:\Testing\Data\bug_OpLogoAdapter.jpg" IM="image/jpg"
-//Sivaji: As GET on Data is not supported, adapter returns an error code EError(=6) so ES=6
-ttest FetchLeafObjectL     URI="Customization/OperatorLogo/Data" ES=6 /*ET="Welcome!" EM="text/plain"*/
-ttest RollbackAtomicL
-
-ttest FetchLeafObjectSizeL URI="Customization/OperatorLogo/Data" ES=6 //ET="12"
-ttest FetchLeafObjectL     URI="Customization/OperatorLogo/Data" ES=6 //ET="Startup text"
-
-delete ttest
-[Endtest]
-
-//---------------------------------------------------------------------------------------------
-// Test 4 - Test Bitmap
-[Test]
-title Op_Logo_Change
-create ThemesTest ttest
-ttest LoadL 1020782A
-
-ttest UpdateLeafObjectL    URI="Customization/OperatorLogo/Data" ES=0 IF="E:\Testing\Data\bug_OpLogoAdapter.jpg" IM="image/jpg"
-//Sivaji: As GET on Data is not supported, adapter returns an error code EError(=6) so ES=6
-ttest FetchLeafObjectL     URI="Customization/OperatorLogo/Data" ES=6
-
-delete ttest
-[Endtest]
-
-//---------------------------------------------------------------------------------------------
-// EOF
-
-
-
-//****************************************************************************************************************************************
-
-
-[Test]
-title SS_DDF
-create ThemesTest ttest
-
-ttest LoadL 1020782E
-ttest DDFVersionL	ET="1.0"
-
-ttest AddDDFCheckL URI="Customization"															AccessTypes=G		DefaultValue="" Description="The interior object holds all customization objects"							Format=Node Occurence=One			Scope=Permanent	Title="" 	MimeType="" ObjectGroup=0
-ttest AddDDFCheckL URI="Customization/ScreenSavers" 											AccessTypes=G		DefaultValue="" Description="ScreenSavers is a common parent node for nodes managing screen savers"			Format=Node Occurence=One			Scope=Permanent	Title="" 	MimeType="" ObjectGroup=0
-ttest AddDDFCheckL URI="Customization/ScreenSavers/AvailableScreenSavers" 						AccessTypes=AG		DefaultValue="" Description="This node holds the available screen saver placeholders"						Format=Node Occurence=ZeroOrMore	Scope=Dynamic	Title="" 	MimeType="" ObjectGroup=0
-ttest AddDDFCheckL URI="Customization/ScreenSavers/AvailableScreenSavers/<X>"					AccessTypes=ADGR	DefaultValue="" Description="This is a placeholder to screen saver ID identifying a screen saver"			Format=Node Occurence=ZeroOrMore	Scope=Dynamic	Title="" 	MimeType="" ObjectGroup=1
-ttest AddDDFCheckL URI="Customization/ScreenSavers/ActiveSc"									AccessTypes=GR		DefaultValue="" Description="This node is a link to the currently active screen saver"						Format=Chr  Occurence=One			Scope=Permanent	Title="" 	MimeType="text/plain" ObjectGroup=0
-ttest AddDDFCheckL URI="Customization/ScreenSavers/AvailableScreenSavers/<X>/Data"				AccessTypes=R		DefaultValue="" Description="Replace command will install a screen saver that's in the data field of the command"	Format=Bin  Occurence=One			Scope=Permanent	Title="" 	MimeType="x-epoc/x-sisx-app" ObjectGroup=0
-ttest AddDDFCheckL URI="Customization/ScreenSavers/AvailableScreenSavers/<X>/ID"				AccessTypes=GR		DefaultValue="" Description="This leaf node holds the ID of the screen saver"								Format=Chr  Occurence=One			Scope=Dynamic	Title="" 	MimeType="text/plain" ObjectGroup=0
-ttest AddDDFCheckL URI="Customization/ScreenSavers/AvailableScreenSavers/<X>/Name"				AccessTypes=GR		DefaultValue="" Description="This leaf node holds the name of the screen saver"								Format=Chr  Occurence=One			Scope=Dynamic	Title="" 	MimeType="text/plain" ObjectGroup=0
-ttest AddDDFCheckL URI="Customization/ScreenSavers/AvailableScreenSavers/<X>/Description"		AccessTypes=GR		DefaultValue="" Description="This leaf node holds the description of the screen saver"						Format=Chr  Occurence=One			Scope=Dynamic	Title="" 	MimeType="text/plain" ObjectGroup=0
-ttest AddDDFCheckL URI="Customization/ScreenSavers/AvailableScreenSavers/<X>/CustomProperty"	AccessTypes=GR		DefaultValue="" Description="This leaf node holds the custom property value of the screen saver"			Format=Chr  Occurence=One			Scope=Dynamic	Title="" 	MimeType="text/plain" ObjectGroup=0
-ttest AddDDFCheckL URI="Customization/ScreenSavers/AvailableScreenSavers/<X>/Version"			AccessTypes=GR		DefaultValue="" Description="This leaf node holds the version of the screen saver"							Format=Chr  Occurence=One			Scope=Dynamic	Title="" 	MimeType="text/plain" ObjectGroup=0
-ttest AddDDFCheckL URI="Customization/ScreenSavers/AvailableScreenSavers/<X>/InstallOptions"	AccessTypes=R		DefaultValue="" Description="Holds the install options for next install"									Format=Chr  Occurence=One			Scope=Permanent	Title="" 	MimeType="text/plain" ObjectGroup=0
-
-ttest DDFStructureL
-
-delete ttest
-[Endtest]
-
-//****************************************************************************************************************************************
-[Test]
-title SS_GetAll
-create ThemesTest ttest
-ttest LoadL 1020782E
-
-ttest ChildURIListL	URI="Customization"																	ES=0	ET="ScreenSavers"
-ttest ChildURIListL	URI="Customization/ScreenSavers"													ES=0	ET="AvailableScreenSavers/ActiveSc"
-ttest ChildURIListL	URI="Customization/ScreenSavers/AvailableScreenSavers"								ES=0	//sf-ET=""
-ttest ChildURIListL	URI="Customization/ScreenSavers/ActiveSc"											ES=0	ET=""
-ttest ChildURIListL	URI="Customization/ScreenSavers/AvailableScreenSavers/<X>/InstallOptions" 			ES=0	ET=""
-ttest ChildURIListL	URI="Customization/ScreenSavers/AvailableScreenSavers/<X>"							ES=0	ET="Data/ID/Name/Description/CustomProperty/Version/InstallOptions"
-ttest ChildURIListL	URI="Customization/ScreenSavers/AvailableScreenSavers/<X>/Data"						ES=0	ET=""
-ttest ChildURIListL	URI="Customization/ScreenSavers/AvailableScreenSavers/<X>/ID"						ES=0	ET=""
-ttest ChildURIListL	URI="Customization/ScreenSavers/AvailableScreenSavers/<X>/Name"						ES=0	ET=""
-ttest ChildURIListL	URI="Customization/ScreenSavers/AvailableScreenSavers/<X>/Description"				ES=0	ET=""
-ttest ChildURIListL	URI="Customization/ScreenSavers/AvailableScreenSavers/<X>/CustomProperty"			ES=0	ET=""
-ttest ChildURIListL	URI="Customization/ScreenSavers/AvailableScreenSavers/<X>/Version"					ES=0	ET=""
-
-ttest FetchLeafObjectSizeL	URI="Customization"															ES=6
-ttest FetchLeafObjectL		URI="Customization"															ES=6
-
-ttest FetchLeafObjectSizeL	URI="Customization/ScreenSavers"											ES=6
-ttest FetchLeafObjectL		URI="Customization/ScreenSavers"											ES=6
-
-ttest FetchLeafObjectSizeL	URI="Customization/ScreenSavers/AvailableScreenSavers"						ES=6
-ttest FetchLeafObjectL		URI="Customization/ScreenSavers/AvailableScreenSavers"						ES=6
-
-ttest FetchLeafObjectSizeL	URI="Customization/ScreenSavers/AvailableScreenSavers/<X>"					ES=6	// ET=""
-ttest FetchLeafObjectL		URI="Customization/ScreenSavers/AvailableScreenSavers/<X>"					ES=6	// ET=""
-
-ttest FetchLeafObjectSizeL	URI="Customization/ScreenSavers/AvailableScreenSavers/Warp/ID"				ES=1	// ET="0"
-ttest FetchLeafObjectL		URI="Customization/ScreenSavers/AvailableScreenSavers/Warp/ID"				ES=1	// ET=""
-
-ttest FetchLeafObjectSizeL	URI="Customization/ScreenSavers/AvailableScreenSavers/Warp/Name"			ES=1	// ET="0"
-ttest FetchLeafObjectL		URI="Customization/ScreenSavers/AvailableScreenSavers/Warp/Name"				ES=1	// ET=""
-
-ttest FetchLeafObjectSizeL	URI="Customization/ScreenSavers/AvailableScreenSavers/Warp/Version"			ES=1	// ET="0"
-ttest FetchLeafObjectL		URI="Customization/ScreenSavers/AvailableScreenSavers/Warp/Version"			ES=1	// ET=""
-
-ttest FetchLeafObjectSizeL	URI="Customization/ScreenSavers/AvailableScreenSavers/Warp/InstallOptions"	ES=6	// ET="0"
-ttest FetchLeafObjectL		URI="Customization/ScreenSavers/AvailableScreenSavers/Warp/InstallOptions"	ES=6	// ET=""
-
-ttest FetchLeafObjectSizeL	URI="Customization/ScreenSavers/AvailableScreenSavers/Warp/Description"		ES=1	// ET="0"
-ttest FetchLeafObjectL		URI="Customization/ScreenSavers/AvailableScreenSavers/Warp/Description"		ES=1	// ET=""
-
-ttest FetchLeafObjectSizeL	URI="Customization/ScreenSavers/AvailableScreenSavers/Warp/CustomProperty"	ES=1	// ET="0"
-ttest FetchLeafObjectL		URI="Customization/ScreenSavers/AvailableScreenSavers/Warp/CustomProperty"	ES=1	// ET=""
-
-ttest FetchLeafObjectSizeL	URI="Customization/ScreenSavers/AvailableScreenSavers/Warp/Data"			ES=6	// ET="0"
-ttest FetchLeafObjectL		URI="Customization/ScreenSavers/AvailableScreenSavers/Warp/Data"			ES=6	// ET=""
-
-ttest FetchLeafObjectSizeL	URI="Customization/ScreenSavers/ActiveSc"									ES=0	// ET="0"
-ttest FetchLeafObjectL		URI="Customization/ScreenSavers/ActiveSc"									ES=0	// ET=""
-
-delete ttest
-[Endtest]
-
-//-----------------------------------------------------------------------------
-[Test]
-title Install_Theme
-create ThemesTest ttest
-ttest LoadL 1020782E
-ttest AddNodeObjectL 	URI="Customization/ScreenSavers/AvailableScreenSavers/Theme1"					ES=0
-ttest UpdateLeafObjectL	URI="Customization/ScreenSavers/AvailableScreenSavers/Theme1/Name"				ES=0	IT=Sivaji
-ttest UpdateLeafObjectL URI="Customization/ScreenSavers/AvailableScreenSavers/Theme1/Version" 			ES=0	IT=1.0
-ttest UpdateLeafObjectL	URI="Customization/ScreenSavers/AvailableScreenSavers/Theme1/InstallOptions"	ES=0	IF="E:\Testing\Data\verysilent_c_en.xml" IM="Xml"
-ttest UpdateLeafObjectL URI="Customization/ScreenSavers/AvailableScreenSavers/Theme1/Data"				ES=0 	IF="E:\Testing\Data\testhbuf_S60_3_X_v_1_0_0.SISx" IM="Bin"
-ttest ChildURIListL		URI="Customization/ScreenSavers/AvailableScreenSavers"							ES=0	/*ET=Theme1*/
-
-
-delete ttest
-[Endtest]
-//-----------------------------------------------------------------------------
-
-[Test]
-title SS_COMMIT_ATOMIC
-create ThemesTest ttest
-ttest LoadL 1020782E
-ttest StartAtomicL
-ttest UpdateLeafObjectL		URI="Customization/ScreenSavers/AvailableScreenSavers/Theme1/Name"				ES=6	IT=Sivaji
-ttest FetchLeafObjectL		URI="Customization/ScreenSavers/AvailableScreenSavers/Theme1/Name"				ES=0	ET=Sivaji
-ttest CommitAtomicL
-
-ttest StartAtomicL
-ttest UpdateLeafObjectL	URI="Customization/ScreenSavers/AvailableScreenSavers/Theme1/Name"					ES=6	IT=Koya
-ttest FetchLeafObjectL		URI="Customization/ScreenSavers/AvailableScreenSavers/Theme1/Name"				ES=0	ET=Koya
-ttest RollbackAtomicL
-
-
-delete ttest
-[Endtest]
-
-//---------------------------------------------------------------------------------------------
-// Test 1 - Test DDF Version and DDF structure
-[Test]
-title Sup_DDF
-create ThemesTest ttest
-
-ttest LoadL 10207822
-
-ttest DDFVersionL ET="1.0"
-
-ttest AddDDFCheckL URI="Customization"                     AccessTypes=G  Format=Node Occurence=One       Scope=Permanent Title="" MimeType=""                 ObjectGroup=0
-ttest AddDDFCheckL URI="Customization/Startup"             AccessTypes=G  Format=Node Occurence=One       Scope=Permanent Title="" MimeType=""                 ObjectGroup=0
-ttest AddDDFCheckL URI="Customization/Startup/Data"		   AccessTypes=R Format=Bin  Occurence=ZeroOrOne Scope=Permanent Title="" MimeType="image/x-epoc-mbm" ObjectGroup=0
-
-ttest AddDDFCheckL URI="Customization/Startup/Text"		   AccessTypes=GR Format=Chr  Occurence=ZeroOrOne Scope=Permanent Title="" MimeType="text/plain" ObjectGroup=0
-
-ttest DDFStructureL
-
-delete ttest
-[Endtest]
-//---------------------------------------------------------------------------------------------
-// Test 2 - Test all DM operations
-[Test]
-title SUP_CHILD
-create ThemesTest ttest
-ttest LoadL 10207822
-
-//
-//	enum TError 
-//		{
-//		/** The command was successful */
-//		EOk = 0,
-//		/** The command failed because no setting exists in the store which corresponds to the
-//			URI or LUID passed to the adapter */
-//		ENotFound = 1,
-//		/** The command failed because the setting can't take the value being passed to the adapter */
-//		EInvalidObject = 2,
-//		/** The command failed because the setting already exists in the store */
-//		EAlreadyExists = 3,
-//		/** The command failed because the setting value is too large to be accommodated in the store */
-//		ETooLargeObject = 4,
-//		/** The command failed because the disk on which the device store resides is full */
-//		EDiskFull = 5,
-//		/** The command failed for an unspecified reason */
-//		EError = 6,
-//		/** The command could not be rolled back successfully */
-//		ERollbackFailed = 7,
-//		/** The command failed because the setting is being used by another client */
-//		EObjectInUse = 8,
-//		/** The command failed because no memory could be allocated */
-//		ENoMemory = 9
-//		};
-//
-
-ttest ChildURIListL URI=""                                  ES=0 ET="Customization"
-ttest ChildURIListL URI="Customization"                     ES=0 ET="Startup"
-ttest ChildURIListL URI="Customization/Startup"             ES=0 ET="DataText"
-ttest ChildURIListL URI="Customization/Startup/Data" 		ES=0 ET=""
-// Sivaji: the below false cases are commented
-
-// False cases
-/*
-ttest ChildURIListL URI="Customisation"                     		ES=1 ET=""
-ttest ChildURIListL URI="Customisation/Startup"             		ES=1 ET=""
-ttest ChildURIListL URI="Customization/Endup"             		ES=1 ET=""
-ttest ChildURIListL URI="Customization/Startup/WelcomeData/WelcomeData" ES=1 ET=""
-ttest ChildURIListL URI="Startup/WelcomeData"                           ES=1 ET=""
-ttest ChildURIListL URI="WelcomeData"                                   ES=1 ET=""
-ttest ChildURIListL URI="Customization/x/WelcomeData"                   ES=1 ET=""
-// ttest ChildURIListL URI="Customization//WelcomeData"                    ES=1 ET=""
-ttest ChildURIListL URI="Customization/Startup/WelcomeDataa"            ES=1 ET=""
-ttest ChildURIListL URI="Customization/Startup/WelcomeDat"              ES=1 ET=""
-ttest ChildURIListL URI="CCustomization/Startup/WelcomeData"            ES=1 ET=""
-ttest ChildURIListL URI="Customization/Startup/WelcomeData"              ES=1 ET=""
-*/
-
-ttest FetchLeafObjectSizeL URI="Customization"         ES=0 ET="0"
-ttest FetchLeafObjectL     URI="Customization"         ES=0 ET=""
-
-ttest FetchLeafObjectSizeL URI="Customization/Startup" ES=0 ET="0"
-ttest FetchLeafObjectL     URI="Customization"         ES=0 ET=""
-
-delete ttest
-[Endtest]
-//---------------------------------------------------------------------------------------------
-// Test 3 - Test Startup text
-[Test]
-title SUP_TEXT
-create ThemesTest ttest
-ttest LoadL 10207822
-
-ttest StartAtomicL
-//Sivaji: ES=-1 for update leaf object as SUP adapter is not calling SetStatusL after updating leaf nodes.
-ttest UpdateLeafObjectL    URI="Customization/Startup/Text" ES=-1 IT="Startup text" IM="text/plain"
-ttest FetchLeafObjectL     URI="Customization/Startup/Text" ES=0 ET="Startup text" EM="text/plain"
-ttest CommitAtomicL
-
-ttest StartAtomicL
-ttest UpdateLeafObjectL    URI="Customization/Startup/Text" ES=-1 IT="Welcome!" IM="text/dunno"
-ttest FetchLeafObjectL     URI="Customization/Startup/Text" ES=0 ET="Welcome!" EM="text/plain"
-ttest RollbackAtomicL
-
-ttest FetchLeafObjectSizeL URI="Customization/Startup/Text" ES=0 ET="12"
-ttest FetchLeafObjectL     URI="Customization/Startup/Text" ES=0 ET="Startup text"
-
-delete ttest
-[Endtest]
-
-//---------------------------------------------------------------------------------------------
-// Test 4 - Test Bitmap
-[Test]
-title SUP_BITMAP
-create ThemesTest ttest
-ttest LoadL 10207822
-
-ttest UpdateLeafObjectL    URI="Customization/Startup/Data" ES=-1 IF="E:\Testing\Data\bug_SupAdapter.jpg" IM="image/jpg"
-//Sivaji: As GET on Data is not supported, adapter returns an error code EError(=6) so ES=6
-ttest FetchLeafObjectL     URI="Customization/Startup/Data" ES=6
-
-delete ttest
-[Endtest]
-
-//---------------------------------------------------------------------------------------------
-// EOF
-//****************************************************************************************************************************************
-
-
-[Test]
-title th_DDF
-create ThemesTest ttest
-
-ttest LoadL 10207828
-ttest DDFVersionL	ET="1.0"
-
-ttest AddDDFCheckL URI="Customization"										AccessTypes=G		DefaultValue="" Description="Customization node"	Format=Node Occurence=One			Scope=Permanent	Title="" 	MimeType="" ObjectGroup=0
-ttest AddDDFCheckL URI="Customization/Themes" 								AccessTypes=G		DefaultValue="" Description="Themes node"			Format=Node Occurence=One			Scope=Permanent	Title="" 	MimeType="" ObjectGroup=0
-ttest AddDDFCheckL URI="Customization/Themes/AvailableThemes" 				AccessTypes=AG		DefaultValue="" Description="AvailableThemes node"	Format=Node Occurence=One			Scope=Permanent	Title="" 	MimeType="" ObjectGroup=0
-ttest AddDDFCheckL URI="Customization/Themes/AvailableThemes/<X>"			AccessTypes=ADGR	DefaultValue="" Description=""						Format=Node Occurence=ZeroOrMore	Scope=Dynamic	Title="" 	MimeType="" ObjectGroup=1
-ttest AddDDFCheckL URI="Customization/Themes/AvailableThemes/<X>/ID"		AccessTypes=G		DefaultValue="" Description="ID node"				Format=Chr  Occurence=One			Scope=Permanent	Title="" 	MimeType="text/plain" ObjectGroup=0
-ttest AddDDFCheckL URI="Customization/Themes/AvailableThemes/<X>/Name"		AccessTypes=GR		DefaultValue="" Description="Name node"				Format=Chr  Occurence=ZeroOrOne		Scope=Permanent	Title="" 	MimeType="text/plain" ObjectGroup=0
-ttest AddDDFCheckL URI="Customization/Themes/AvailableThemes/<X>/Version"	AccessTypes=GR		DefaultValue="" Description="Version node"			Format=Chr  Occurence=ZeroOrOne		Scope=Permanent	Title="" 	MimeType="text/plain" ObjectGroup=0
-ttest AddDDFCheckL URI="Customization/Themes/AvailableThemes/<X>/Data"		AccessTypes=R		DefaultValue="" Description="Data node"				Format=Bin  Occurence=One			Scope=Permanent	Title="" 	MimeType="text/plain" ObjectGroup=0
-ttest AddDDFCheckL URI="Customization/Themes/AvailableThemes/<X>/InstallOptions"			AccessTypes=R	DefaultValue="" Description="InstallOptions node"	Format=Xml  Occurence=One		Scope=Permanent Title="" MimeType="text/plain" ObjectGroup=0
-ttest AddDDFCheckL URI="Customization/Themes/ActiveTheme"					AccessTypes=GR		DefaultValue="" Description="ActiveTheme node"		Format=Chr  Occurence=One			Scope=Permanent Title="" 	MimeType="text/plain" ObjectGroup=0
-
-ttest DDFStructureL
-
-delete ttest
-[Endtest]
-
-//****************************************************************************************************************************************
-[Test]
-title th_GetAll
-create ThemesTest ttest
-ttest LoadL 10207828
-
-ttest ChildURIListL	URI="Customization"											ES=0	ET="Themes"
-ttest ChildURIListL	URI="Customization/Themes"									ES=0	ET="AvailableThemes/ActiveTheme"
-ttest ChildURIListL	URI="Customization/Themes/AvailableThemes"					ES=0	//sf-ET=""
-ttest ChildURIListL	URI="Customization/Themes/AvailableThemes/<X>"				ES=0	ET="ID/Name/Version/Data/InstallOptions"
-ttest ChildURIListL	URI="Customization/Themes/AvailableThemes/<X>/ID"			ES=0	ET=""
-ttest ChildURIListL	URI="Customization/Themes/AvailableThemes/<X>/Name"			ES=0	ET=""
-ttest ChildURIListL	URI="Customization/Themes/AvailableThemes/<X>/Version"		ES=0	ET=""
-ttest ChildURIListL	URI="Customization/Themes/ActiveTheme"						ES=0	ET=""
-ttest ChildURIListL	URI="Customization/Themes/AvailableThemes/<X>/InstallOptions" ES=0	ET=""
-ttest ChildURIListL	URI="Customization/Themes/ActiveTheme"						ES=0	ET=""
-
-
-ttest FetchLeafObjectSizeL	URI="Customization"												ES=6
-ttest FetchLeafObjectL		URI="Customization"												ES=6
-
-ttest FetchLeafObjectSizeL	URI="Customization/Themes"										ES=6
-ttest FetchLeafObjectL		URI="Customization/Themes"										ES=6
-
-ttest FetchLeafObjectSizeL	URI="Customization/Themes/AvailableThemes"						ES=6
-ttest FetchLeafObjectL		URI="Customization/Themes/AvailableThemes"						ES=6
-
-ttest FetchLeafObjectSizeL	URI="Customization/Themes/AvailableThemes/<X>"					ES=6	// ET=""
-ttest FetchLeafObjectL		URI="Customization/Themes/AvailableThemes/<X>"					ES=6	// ET=""
-
-ttest FetchLeafObjectSizeL	URI="Customization/Themes/AvailableThemes/Warp/ID"				ES=1	// ET="0"
-ttest FetchLeafObjectL		URI="Customization/Themes/AvailableThemes/Warp/ID"				ES=1	// ET=""
-
-ttest FetchLeafObjectSizeL	URI="Customization/Themes/AvailableThemes/Warp/Name"			ES=1	// ET="0"
-ttest FetchLeafObjectL		URI="Customization/Themes/CurrentThemes/Warp/Name"				ES=1	// ET=""
-
-ttest FetchLeafObjectSizeL	URI="Customization/Themes/AvailableThemes/Warp/Version"			ES=1	// ET="0"
-ttest FetchLeafObjectL		URI="Customization/Themes/AvailableThemes/Warp/Version"			ES=1	// ET=""
-
-ttest FetchLeafObjectSizeL	URI="Customization/Themes/ActiveTheme"							ES=0	// ET="0"
-ttest FetchLeafObjectL		URI="Customization/Themes/ActiveTheme"							ES=0	// ET=""
-
-ttest FetchLeafObjectSizeL	URI="Customization/Themes/AvailableThemes/Warp/InstallOptions"	ES=6	// ET="0"
-ttest FetchLeafObjectL		URI="Customization/Themes/AvailableThemes/Warp/InstallOptions"	ES=6	// ET=""
-
-ttest FetchLeafObjectSizeL	URI="Customization/Themes/InstallTheme"							ES=6
-ttest FetchLeafObjectL		URI="Customization/Themes/InstallTheme"							ES=6
-
-delete ttest
-[Endtest]
-
-//-----------------------------------------------------------------------------
-[Test]
-title Install_Theme
-create ThemesTest ttest
-ttest LoadL 10207828
-ttest AddNodeObjectL 	URI="Customization/Themes/AvailableThemes/Theme1"					ES=0
-ttest UpdateLeafObjectL	URI="Customization/Themes/AvailableThemes/Theme1/Name"				ES=0	IT=Sivaji
-ttest UpdateLeafObjectL URI="Customization/Themes/AvailableThemes/Theme1/Version" 			ES=0	IT=1.0
-ttest UpdateLeafObjectL	URI="Customization/Themes/AvailableThemes/Theme1/InstallOptions"	ES=0	IF="E:\Testing\Data\verysilent_c_en.xml" IM="Xml"
-ttest UpdateLeafObjectL URI="Customization/Themes/AvailableThemes/Theme1/Data"				ES=0 	IF="E:\Testing\Data\testhbuf_S60_3_X_v_1_0_0.SISx" IM="Bin"
-ttest ChildURIListL		URI="Customization/Themes/AvailableThemes"							ES=0	/*ET=Theme1*/
-
-
-delete ttest
-[Endtest]
-//-----------------------------------------------------------------------------
-
-[Test]
-title Theme_Commit_Rollback_Atomic
-create ThemesTest ttest
-ttest LoadL 1020782E
-ttest StartAtomicL
-ttest UpdateLeafObjectL	URI="Customization/Themes/AvailableThemes/Theme1/Name"				ES=6	IT=Sivaji
-ttest FetchLeafObjectSizeL	URI="Customization/Themes/AvailableThemes/Warp/Name"			ES=0	ET=Sivaji
-ttest CommitAtomicL
-
-ttest StartAtomicL
-ttest UpdateLeafObjectL	URI="Customization/Themes/AvailableThemes/Theme1/Name"				ES=6	IT=Sivaji
-ttest FetchLeafObjectSizeL	URI="Customization/Themes/AvailableThemes/Warp/Name"			ES=0	ET=Sivaji
-ttest RollbackAtomicL
-
-delete ttest
-[Endtest]
-
-
-//---------------------------------------------------------------------------------------------
-// Test 1 - Test DDF Version and DDF structure
-[Test]
-title WallPaper_DDF
-create ThemesTest ttest
-
-ttest LoadL 10207830
-
-ttest DDFVersionL ET="1.0"
-
-ttest AddDDFCheckL URI="Customization"                  AccessTypes=G  Format=Node Occurence=One       Scope=Permanent Title="" MimeType=""                 ObjectGroup=0
-ttest AddDDFCheckL URI="Customization/Wallpaper"        AccessTypes=G  Format=Node Occurence=One       Scope=Permanent Title="" MimeType=""                 ObjectGroup=0
-ttest AddDDFCheckL URI="Customization/Wallpaper/Data"   AccessTypes=GR Format=Bin  Occurence=One 	  Scope=Permanent Title=""  MimeType="text/plain" 	   ObjectGroup=0
-
-ttest DDFStructureL
-
-delete ttest
-[Endtest]
-//---------------------------------------------------------------------------------------------
-// Test 2 - Test all DM operations
-[Test]
-title WallPaper_Child
-create ThemesTest ttest
-ttest LoadL 10207830
-
-//
-//	enum TError 
-//		{
-//		/** The command was successful */
-//		EOk = 0,
-//		/** The command failed because no setting exists in the store which corresponds to the
-//			URI or LUID passed to the adapter */
-//		ENotFound = 1,
-//		/** The command failed because the setting can't take the value being passed to the adapter */
-//		EInvalidObject = 2,
-//		/** The command failed because the setting already exists in the store */
-//		EAlreadyExists = 3,
-//		/** The command failed because the setting value is too large to be accommodated in the store */
-//		ETooLargeObject = 4,
-//		/** The command failed because the disk on which the device store resides is full */
-//		EDiskFull = 5,
-//		/** The command failed for an unspecified reason */
-//		EError = 6,
-//		/** The command could not be rolled back successfully */
-//		ERollbackFailed = 7,
-//		/** The command failed because the setting is being used by another client */
-//		EObjectInUse = 8,
-//		/** The command failed because no memory could be allocated */
-//		ENoMemory = 9
-//		};
-//
-
-ttest ChildURIListL URI=""                                  ES=0 ET="Customization"
-ttest ChildURIListL URI="Customization"                     ES=0 ET="Wallpaper"
-ttest ChildURIListL URI="Customization/Wallpaper"           ES=0 ET="Data"
-ttest ChildURIListL URI="Customization/Wallpaper/Data" 		ES=0 ET=""
-
-
-delete ttest
-[Endtest]
-//---------------------------------------------------------------------------------------------
-// Test 3 - Test Startup text
-[Test]
-title WallPaper_commit
-create ThemesTest ttest
-ttest LoadL 10207830
-
-ttest StartAtomicL
-ttest UpdateLeafObjectL    URI="Customization/OperatorLogo/Data" ES=0  IF="E:\Testing\Data\bug_WallPaperAdapter.jpg" IM="image/jpeg"
-ttest CommitAtomicL
-//Sivaji: Since ttest RollbackAtomicL not suported, just calling that API to get fn coverage
-ttest RollbackAtomicL
-delete ttest
-[Endtest]
-
-//---------------------------------------------------------------------------------------------
-// Test 4 - Test Bitmap
-[Test]
-title WallPaper_Change
-create ThemesTest ttest
-ttest LoadL 10207830
-
-ttest UpdateLeafObjectL    URI="Customization/OperatorLogo/Data" ES=0 IF="E:\Testing\Data\bug_OpLogoAdapter.jpg" IM="image/jpeg"
-//Sivaji: As GET on Data is not supported, adapter returns an error code EError(=6) so ES=6
-ttest FetchLeafObjectL     URI="Customization/OperatorLogo/Data" ES=6
-
-delete ttest
-[Endtest]
-
-//---------------------------------------------------------------------------------------------
-// EOF
-//---------------------------------------------------------------------------------------------
-// Test 1 - Test DDF Version and DDF structure
-[Test]
-title ELink_DDF
-create ThemesTest ttest
-
-ttest LoadL 1020782C
-
-ttest DDFVersionL ET="1.0"
-
-ttest AddDDFCheckL URI="Customization"                 						 AccessTypes=G  	Format=Node Occurence=One      		  Scope=Permanent 	Title="" MimeType=""                 ObjectGroup=0
-ttest AddDDFCheckL URI="Customization/EmbeddedLinks"        				 AccessTypes=G  	Format=Node Occurence=One      		  Scope=Permanent 	Title="" MimeType=""                 ObjectGroup=0
-ttest AddDDFCheckL URI="Customization/EmbeddedLinks/<x>"  					 AccessTypes=G 		Format=Node Occurence=ZeroOrMore 	  Scope=Dynamic 	Title=""  MimeType="" 	  			 ObjectGroup=1
-ttest AddDDFCheckL URI="Customization/EmbeddedLinks/<x>/Links"  			 AccessTypes=AG 	Format=Node  Occurence=One		 	  Scope=Permanent 	Title=""  MimeType="" 	  			 ObjectGroup=0
-ttest AddDDFCheckL URI="Customization/EmbeddedLinks/<x>/Links/<x>"			 AccessTypes=AGDR	Format=Node Occurence=ZeroOrMore 	  Scope=Dynamic 	Title=""  MimeType="" 	   			  ObjectGroup=1
-ttest AddDDFCheckL URI="Customization/EmbeddedLinks/<x>/Links/<x>/URL"  	 AccessTypes=GR		Format=Chr  Occurence=One		 	  Scope=Permanent	Title=""  MimeType="text/plain" 	   ObjectGroup=0
-ttest AddDDFCheckL URI="Customization/EmbeddedLinks/<x>/Links/<x>/Name"		 AccessTypes=GR		Format=Chr  Occurence=ZeroOrOne 	  Scope=Dynamic 	Title=""  MimeType="text/plain" 	   ObjectGroup=0
-ttest AddDDFCheckL URI="Customization/EmbeddedLinks/<x>/Links/<x>/UserName"	 AccessTypes=GR		Format=Chr  Occurence=ZeroOrOne 	  Scope=Dynamic 	Title=""  MimeType="text/plain" 	   ObjectGroup=0
-ttest AddDDFCheckL URI="Customization/EmbeddedLinks/<x>/Links/<x>/Password"	 AccessTypes=GR		Format=Chr  Occurence=ZeroOrOne 	  Scope=Dynamic 	Title=""  MimeType="text/plain" 	   ObjectGroup=0
-ttest AddDDFCheckL URI="Customization/EmbeddedLinks/<x>/Links/<x>/ConRef"	 AccessTypes=GR		Format=Chr  Occurence=ZeroOrOne 	  Scope=Dynamic 	Title=""  MimeType="text/plain" 	   ObjectGroup=0
-
-
-ttest DDFStructureL
-
-delete ttest
-[Endtest]
-//---------------------------------------------------------------------------------------------
-// Test 2 - Test all DM operations
-[Test]
-title ELink_Child
-create ThemesTest ttest
-ttest LoadL 1020782C
-
-//
-//	enum TError 
-//		{
-//		/** The command was successful */
-//		EOk = 0,
-//		/** The command failed because no setting exists in the store which corresponds to the
-//			URI or LUID passed to the adapter */
-//		ENotFound = 1,
-//		/** The command failed because the setting can't take the value being passed to the adapter */
-//		EInvalidObject = 2,
-//		/** The command failed because the setting already exists in the store */
-//		EAlreadyExists = 3,
-//		/** The command failed because the setting value is too large to be accommodated in the store */
-//		ETooLargeObject = 4,
-//		/** The command failed because the disk on which the device store resides is full */
-//		EDiskFull = 5,
-//		/** The command failed for an unspecified reason */
-//		EError = 6,
-//		/** The command could not be rolled back successfully */
-//		ERollbackFailed = 7,
-//		/** The command failed because the setting is being used by another client */
-//		EObjectInUse = 8,
-//		/** The command failed because no memory could be allocated */
-//		ENoMemory = 9
-//		};
-//
-	
-ttest ChildURIListL URI=""                                				  ES=0 ET="EmbeddedLinks"
-
-ttest ChildURIListL URI="Customization/EmbeddedLinks"                     ES=0 ET="1/2/3/4/5/6/7/8"
-ttest ChildURIListL URI="Customization/EmbeddedLinks/<x>"           		ES=0 ET="Links/ID/AppName"
-ttest ChildURIListL URI="Customization/EmbeddedLinks/1/Links" 			ES=0 ET=""
-ttest ChildURIListL URI="Customization/EmbeddedLinks/2/Links" 			ES=0 ET=""
-ttest ChildURIListL URI="Customization/EmbeddedLinks/3/Links" 			ES=0 ET=""
-ttest ChildURIListL URI="Customization/EmbeddedLinks/4/Links" 			ES=0 ET=""
-ttest ChildURIListL URI="Customization/EmbeddedLinks/5/Links" 			ES=0 ET=""
-ttest ChildURIListL URI="Customization/EmbeddedLinks/6/Links" 			ES=0 ET=""
-ttest ChildURIListL URI="Customization/EmbeddedLinks/7/Links" 			ES=0 ET=""
-ttest ChildURIListL URI="Customization/EmbeddedLinks/8/Links" 			ES=0 ET=""
-ttest ChildURIListL URI="Customization/EmbeddedLinks/1/Links/<x>" 		ES=0 ET="URL/Name/UserName/Password/ConRef"
-ttest ChildURIListL URI="Customization/EmbeddedLinks/<x>/Links/<x>/URL" 		ES=2 ET=""
-ttest ChildURIListL URI="Customization/EmbeddedLinks/<x>/Links/<x>/Name" 		ES=2 ET=""
-ttest ChildURIListL URI="Customization/EmbeddedLinks/<x>/Links/<x>/UserName" 	ES=2 ET=""
-ttest ChildURIListL URI="Customization/EmbeddedLinks/<x>/Links/<x>/Password" 	ES=2 ET=""
-ttest ChildURIListL URI="Customization/EmbeddedLinks/<x>/Links/<x>/ConRef" 		ES=2 ET=""
-
-delete ttest
-[Endtest]
-
-//---------------------------------------------------------------------------------------------
-
-// Test 3 - Test Startup text
-[Test]
-title ELink_commit
-create ThemesTest ttest
-ttest LoadL 1020782C
-
-ttest StartAtomicL
-ttest AddNodeObjectL   	   URI="Customization/EmbeddedLinks/1/Links/AppContext"  			ES=0  
-ttest UpdateLeafObjectL    URI="Customization/EmbeddedLinks/1/Links/AppContext/URL"  		ES=0 IT=www.nokia.com  
-ttest UpdateLeafObjectL    URI="Customization/EmbeddedLinks/1/Links/AppContext/Name"  		ES=0 IT=Nokia
-ttest UpdateLeafObjectL    URI="Customization/EmbeddedLinks/1/Links/AppContext/UserName"  	ES=0 IT=Koya
-ttest UpdateLeafObjectL    URI="Customization/EmbeddedLinks/1/Links/AppContext/Password"  	ES=0 IT=Sivaji
-ttest UpdateLeafObjectL    URI="Customization/EmbeddedLinks/1/Links/AppContext/ConRef"  	ES=0 IT=airtelgprs.com
-
-ttest FetchLeafObjectL    URI="Customization/EmbeddedLinks/1/Links/AppContext/URL"  			ES=0  ET=www.nokia.com
-//Sivaji: as we run test cases repeatedly, name will be added as Nokia,Nokia(1),Nokia(2).. etc..So if ET= Nokia and if 
-//we run test cae two times, it will fetch Nokia(2) and returns error code as KErrGeneral so here ES= -2
-ttest FetchLeafObjectL    URI="Customization/EmbeddedLinks/1/Links/AppContext/Name"  			ES=-2
-ttest FetchLeafObjectL    URI="Customization/EmbeddedLinks/1/Links/AppContext/UserName" 		 ES=6
-ttest FetchLeafObjectL    URI="Customization/EmbeddedLinks/1/Links/AppContext/Password"  		ES=6
-//Sivaji: Need to check later why null is returning for ConRef. Might be it should bes et as APId001 like this .... :)
-ttest FetchLeafObjectL    URI="Customization/EmbeddedLinks/1/Links/AppContext/ConRef"  			ES=0  ET=null
-ttest CommitAtomicL
-//Sivaji: Since ttest RollbackAtomicL not suported, just calling that API to get fn coverage
-ttest RollbackAtomicL
-delete ttest
-[Endtest]
-
-//---------------------------------------------------------------------------------------------
-// Test 4 - Test Bitmap
-[Test]
-title ELink_Not_supported
-create ThemesTest ttest
-ttest LoadL 1020782C
-
-//Sivaji: these are not supported. Just called to get function coverage
-ttest CopyCommandL    
-ttest ExecuteCommandL
-ttest CompleteOutstandingCmdsL   
-ttest StreamingSupportL
-ttest StreamCommittedL
-//Sivaji: The ID and Appname is not supported. Added here to get code coverage
-ttest FetchLeafObjectL	URI="Customization/EmbeddedLinks/1/ID"  	
-ttest FetchLeafObjectL	URI="Customization/EmbeddedLinks/1/AppName"  
-
-delete ttest
-[Endtest]
-
-//---------------------------------------------------------------------------------------------
-
-[Test]
-title ELink_Delete_Bookmark
-create ThemesTest ttest
-ttest LoadL 1020782C
-
-ttest AddNodeObjectL   	   URI="Customization/EmbeddedLinks/1/Links/AppContext"  			ES=0  
-ttest UpdateLeafObjectL    URI="Customization/EmbeddedLinks/1/Links/AppContext/URL"  		ES=0 IT=www.nokia.com  
-ttest UpdateLeafObjectL    URI="Customization/EmbeddedLinks/1/Links/AppContext/Name"  		ES=0 IT=Nokia
-ttest UpdateLeafObjectL    URI="Customization/EmbeddedLinks/1/Links/AppContext/UserName"  	ES=0 IT=Koya
-ttest UpdateLeafObjectL    URI="Customization/EmbeddedLinks/1/Links/AppContext/Password"  	ES=0 IT=Sivaji
-ttest UpdateLeafObjectL    URI="Customization/EmbeddedLinks/1/Links/AppContext/ConRef"  	ES=0 IT=airtelgprs.com
-
-
-ttest DeleteObjectL    URI="Customization/EmbeddedLinks/1/Links/AppContext/URL"  		ES=0 IT=www.nokia.com  
-ttest DeleteObjectL    URI="Customization/EmbeddedLinks/1/Links/AppContext/Name"  		ES=0 IT=Nokia
-ttest DeleteObjectL    URI="Customization/EmbeddedLinks/1/Links/AppContext/UserName"  	ES=0 IT=Koya
-ttest DeleteObjectL    URI="Customization/EmbeddedLinks/1/Links/AppContext/Password"  	ES=0 IT=Sivaji
-ttest DeleteObjectL    URI="Customization/EmbeddedLinks/1/Links/AppContext/ConRef"  	ES=0 IT=airtelgprs.com
-ttest DeleteObjectL	   URI="Customization/EmbeddedLinks/1/Links/AppContext"  			ES=0  
-
-
-delete ttest
-[Endtest]
-
-// EOF
-//---------------------------------------------------------------------------------------------
-// Test 1 - Test DDF Version and DDF structure
-[Test]
-title IS_DDF
-create ThemesTest ttest
-
-ttest LoadL 10207832
-
-ttest DDFVersionL ET="1.0"
-
-// ttest AddDDFCheckL URI="" Name="" AccessTypes=[ACDEGR] DefaultValue="" Description="" Format={B64,Bool,Chr,Int,Node,Null,Xml,Bin} Occurence={One,ZeroOrOne,ZeroOrMore,OneOrMore,ZeroOrN,OneOrN} Scope={Permanent,Dynamic} Title="" MimeType="" ObjectGroup={0,1}
-
-ttest AddDDFCheckL URI="Customization"                         AccessTypes=G  Occurence=One       Format=Node Scope=Permanent Title="" MimeType="" ObjectGroup=0
-ttest AddDDFCheckL URI="Customization/IdleSoftkeys"            AccessTypes=G  Occurence=One       Format=Node Scope=Permanent Title="" MimeType="" ObjectGroup=0
-ttest AddDDFCheckL URI="Customization/IdleSoftkeys/SoftKeys"   AccessTypes=G  Occurence=One       Format=Node Scope=Permanent Title="" MimeType="" ObjectGroup=0
-ttest AddDDFCheckL URI="Customization/IdleSoftkeys/Targets"    AccessTypes=G  Occurence=One       Format=Node Scope=Permanent Title="" MimeType="" ObjectGroup=0
-ttest AddDDFCheckL URI="Customization/IdleSoftkeys/WebTargets" AccessTypes=AG Occurence=One       Format=Node Scope=Permanent Title="" MimeType="" ObjectGroup=0
-
-ttest AddDDFCheckL URI="Customization/IdleSoftkeys/SoftKeys/<X>"           AccessTypes=G  Occurence=OneOrMore  Format=Node Scope=Dynamic   Title="" MimeType="" ObjectGroup=1
-ttest AddDDFCheckL URI="Customization/IdleSoftkeys/SoftKeys/<X>/ID"        AccessTypes=G  Occurence=One        Format=Chr  Scope=Permanent Title="" MimeType="text/plain" ObjectGroup=0
-ttest AddDDFCheckL URI="Customization/IdleSoftkeys/SoftKeys/<X>/TargetRef" AccessTypes=GR Occurence=One        Format=Chr  Scope=Permanent Title="" MimeType="text/plain" ObjectGroup=0
-//ttest AddDDFCheckL URI="Customization/IdleSoftkeys/SoftKeys/<X>/Caption"   AccessTypes=GR Occurence=One        Format=Chr  Scope=Permanent Title="" MimeType="text/plain" ObjectGroup=0
-ttest AddDDFCheckL URI="Customization/IdleSoftkeys/SoftKeys/<X>/Image"     AccessTypes=GR Occurence=One        Format=Bin  Scope=Permanent Title="" MimeType="image/x-epoc-mbm" ObjectGroup=0
-ttest AddDDFCheckL URI="Customization/IdleSoftkeys/SoftKeys/<X>/Mask"        AccessTypes=GR   Occurence=One        Format=Bin  Scope=Permanent Title="" MimeType="image/x-epoc-mbm" ObjectGroup=0
-
-ttest AddDDFCheckL URI="Customization/IdleSoftkeys/Targets/<X>"              AccessTypes=G  Occurence=ZeroOrMore Format=Node Scope=Dynamic   Title="" MimeType="" ObjectGroup=1
-ttest AddDDFCheckL URI="Customization/IdleSoftkeys/Targets/<X>/ID"           AccessTypes=G  Occurence=One        Format=Chr  Scope=Permanent Title="" MimeType="text/plain" ObjectGroup=0
-ttest AddDDFCheckL URI="Customization/IdleSoftkeys/Targets/<X>/Description"  AccessTypes=G  Occurence=One        Format=Chr  Scope=Permanent Title="" MimeType="text/plain" ObjectGroup=0
-ttest AddDDFCheckL URI="Customization/IdleSoftkeys/Targets/<X>/Caption"      AccessTypes=GR Occurence=One        Format=Chr  Scope=Permanent Title="" MimeType="text/plain" ObjectGroup=0
-//ttest AddDDFCheckL URI="Customization/IdleSoftkeys/Targets/<X>/Image"        AccessTypes=GR Occurence=One        Format=Bin  Scope=Permanent Title="" MimeType="image/x-epoc-mbm" ObjectGroup=0
-//ttest AddDDFCheckL URI="Customization/IdleSoftkeys/Targets/<X>/Mask"         AccessTypes=GR Occurence=One        Format=Bin  Scope=Permanent Title="" MimeType="image/x-epoc-mbm" ObjectGroup=0
-
-ttest AddDDFCheckL URI="Customization/IdleSoftkeys/WebTargets/<X>"             AccessTypes=ADGR Occurence=ZeroOrMore Format=Node Scope=Dynamic   Title="" MimeType="" ObjectGroup=1
-ttest AddDDFCheckL URI="Customization/IdleSoftkeys/WebTargets/<X>/ID"          AccessTypes=G    Occurence=One        Format=Chr  Scope=Permanent Title="" MimeType="text/plain" ObjectGroup=0
-ttest AddDDFCheckL URI="Customization/IdleSoftkeys/WebTargets/<X>/Description" AccessTypes=GR   Occurence=One        Format=Chr  Scope=Permanent Title="" MimeType="text/plain" ObjectGroup=0
-ttest AddDDFCheckL URI="Customization/IdleSoftkeys/WebTargets/<X>/URL"         AccessTypes=GR   Occurence=One        Format=Chr  Scope=Permanent Title="" MimeType="text/plain" ObjectGroup=0
-ttest AddDDFCheckL URI="Customization/IdleSoftkeys/WebTargets/<X>/UserName"    AccessTypes=GR   Occurence=One        Format=Chr  Scope=Permanent Title="" MimeType="text/plain" ObjectGroup=0
-ttest AddDDFCheckL URI="Customization/IdleSoftkeys/WebTargets/<X>/Password"    AccessTypes=GR   Occurence=One        Format=Chr  Scope=Permanent Title="" MimeType="text/plain" ObjectGroup=0
-ttest AddDDFCheckL URI="Customization/IdleSoftkeys/WebTargets/<X>/ConRef"      AccessTypes=GR   Occurence=One        Format=Chr  Scope=Permanent Title="" MimeType="text/plain" ObjectGroup=0
-ttest AddDDFCheckL URI="Customization/IdleSoftkeys/WebTargets/<X>/Caption"     AccessTypes=GR   Occurence=One        Format=Chr  Scope=Permanent Title="" MimeType="text/plain" ObjectGroup=0
-//ttest AddDDFCheckL URI="Customization/IdleSoftkeys/WebTargets/<X>/Image"       AccessTypes=GR   Occurence=One        Format=Bin  Scope=Permanent Title="" MimeType="image/x-epoc-mbm" ObjectGroup=0
-//ttest AddDDFCheckL URI="Customization/IdleSoftkeys/WebTargets/<X>/Mask"        AccessTypes=GR   Occurence=One        Format=Bin  Scope=Permanent Title="" MimeType="image/x-epoc-mbm" ObjectGroup=0
-
-ttest DDFStructureL
-
-delete ttest
-[Endtest]
-//---------------------------------------------------------------------------------------------
-// Test 2.1 - List targets
-[Test]
-title IS_LIST_TARGETS
-create ThemesTest ttest
-ttest LoadL 10207832
-
-ttest ChildURIListL URI="Customization/IdleSoftkeys/Targets"    ES=0
-
-delete ttest
-[Endtest]
-//---------------------------------------------------------------------------------------------
-// Test 2.2 - List webtargets
-[Test]
-title IS_LIST_WEBTARGETS
-create ThemesTest ttest
-ttest LoadL 10207832
-
-ttest ChildURIListL URI="Customization/IdleSoftkeys/WebTargets"    ES=0
-
-delete ttest
-[Endtest]
-//---------------------------------------------------------------------------------------------
-// Test 2.3 - Child URI lists
-[Test]
-title IS_CHILD
-create ThemesTest ttest
-ttest LoadL 10207832
-
-//
-//	enum TError 
-//		{
-//		/** The command was successful */
-//		EOk = 0,
-//		/** The command failed because no setting exists in the store which corresponds to the
-//			URI or LUID passed to the adapter */
-//		ENotFound = 1,
-//		/** The command failed because the setting can't take the value being passed to the adapter */
-//		EInvalidObject = 2,
-//		/** The command failed because the setting already exists in the store */
-//		EAlreadyExists = 3,
-//		/** The command failed because the setting value is too large to be accommodated in the store */
-//		ETooLargeObject = 4,
-//		/** The command failed because the disk on which the device store resides is full */
-//		EDiskFull = 5,
-//		/** The command failed for an unspecified reason */
-//		EError = 6,
-//		/** The command could not be rolled back successfully */
-//		ERollbackFailed = 7,
-//		/** The command failed because the setting is being used by another client */
-//		EObjectInUse = 8,
-//		/** The command failed because no memory could be allocated */
-//		ENoMemory = 9
-//		};
-//
-
-ttest ChildURIListL URI=""                                  ES=0 ET="Customization"
-ttest ChildURIListL URI="Customization"                     ES=0 ET="IdleSoftkeys"
-ttest ChildURIListL URI="Customization/IdleSoftkeys"        ES=0 ET="SoftKeys/Targets/WebTargets"
-
-ttest ChildURIListL URI="Customization/IdleSoftkeys/SoftKeys"            ES=0
-ttest ChildURIListL URI="Customization/IdleSoftkeys/Targets"             ES=0
-ttest ChildURIListL URI="Customization/IdleSoftkeys/WebTargets"          ES=0
-
-ttest ChildURIListL URI="Customization/IdleSoftkeys/SoftKeys/X"		ES=0 ET="ID/TargetRef/Image/Mask"
-//ttest ChildURIListL URI="Customization/IdleSoftkeys/SoftKeys/X"		ES=0 ET="ID/TargetRef"
-ttest ChildURIListL URI="Customization/IdleSoftkeys/Targets/X"		ES=0 ET="ID/Description/Caption"
-ttest ChildURIListL URI="Customization/IdleSoftkeys/WebTargets/X"	ES=0 ET="ID/Description/URL/UserName/Password/ConRef/Caption"
-
-ttest ChildURIListL URI="Customization/IdleSoftkeys/SoftKeys/X/ID"		ES=0 ET=""
-ttest ChildURIListL URI="Customization/IdleSoftkeys/SoftKeys/X/TargetRef"	ES=0 ET=""
-//ttest ChildURIListL URI="Customization/IdleSoftkeys/SoftKeys/X/Mask"		ES=0 ET=""
-//ttest ChildURIListL URI="Customization/IdleSoftkeys/SoftKeys/X/Image"		ES=0 ET=""
-
-ttest ChildURIListL URI="Customization/IdleSoftkeys/Targets/X/ID"		ES=0 ET=""
-ttest ChildURIListL URI="Customization/IdleSoftkeys/Targets/X/Description"	ES=0 ET=""
-ttest ChildURIListL URI="Customization/IdleSoftkeys/Targets/X/Caption"		ES=0 ET=""
-//ttest ChildURIListL URI="Customization/IdleSoftkeys/Targets/X/Image"		ES=0 ET=""
-//ttest ChildURIListL URI="Customization/IdleSoftkeys/Targets/X/Mask"		ES=0 ET=""
-
-ttest ChildURIListL URI="Customization/IdleSoftkeys/WebTargets/X/ID"		ES=0 ET=""
-ttest ChildURIListL URI="Customization/IdleSoftkeys/WebTargets/X/Description"	ES=0 ET=""
-ttest ChildURIListL URI="Customization/IdleSoftkeys/WebTargets/X/URL"		ES=0 ET=""
-ttest ChildURIListL URI="Customization/IdleSoftkeys/WebTargets/X/UserName"	ES=0 ET=""
-ttest ChildURIListL URI="Customization/IdleSoftkeys/WebTargets/X/Password"	ES=0 ET=""
-ttest ChildURIListL URI="Customization/IdleSoftkeys/WebTargets/X/ConRef"	ES=0 ET=""
-ttest ChildURIListL URI="Customization/IdleSoftkeys/WebTargets/X/Caption"		ES=0 ET=""
-//ttest ChildURIListL URI="Customization/IdleSoftkeys/WebTargets/X/Image"		ES=0 ET=""
-//ttest ChildURIListL URI="Customization/IdleSoftkeys/WebTargets/X/Mask"		ES=0 ET=""
-
-delete ttest
-[Endtest]
-//---------------------------------------------------------------------------------------------
-// Test 3 - Test fetch operations
-[Test]
-title IS_FETCH
-create ThemesTest ttest
-ttest LoadL 10207832
-
-ttest FetchLeafObjectL URI="Customization/IdleSoftkeys/SoftKeys/Softkey1/ID"        IM="text/plain" ES=0
-ttest FetchLeafObjectL URI="Customization/IdleSoftkeys/SoftKeys/Softkey1/TargetRef" IM="text/plain" ES=0
-
-ttest FetchLeafObjectL URI="Customization/IdleSoftkeys/Targets/Target1/ID"                    IM="text/plain" ES=0
-ttest FetchLeafObjectL URI="Customization/IdleSoftkeys/Targets/Target1/Description"           IM="text/plain" ES=0
-ttest FetchLeafObjectL URI="Customization/IdleSoftkeys/Targets/Target1/Caption"               IM="text/plain" ES=0
-//ttest FetchLeafObjectL URI="Customization/IdleSoftkeys/Targets/Target1/Image"                 IM="image/x-epoc-mbm" ES=0
-//ttest FetchLeafObjectL URI="Customization/IdleSoftkeys/Targets/Target1/Mask"                  IM="image/x-epoc-mbm" ES=0
-
-ttest FetchLeafObjectL URI="Customization/IdleSoftkeys/WebTargets/WebTarget1/ID"              IM="text/plain" ES=0
-ttest FetchLeafObjectL URI="Customization/IdleSoftkeys/WebTargets/WebTarget1/Description"     IM="text/plain" ES=0
-ttest FetchLeafObjectL URI="Customization/IdleSoftkeys/WebTargets/WebTarget1/Caption"               IM="text/plain" ES=0
-//ttest FetchLeafObjectL URI="Customization/IdleSoftkeys/WebTargets/WebTarget1/Image"                 IM="image/x-epoc-mbm" ES=0
-//ttest FetchLeafObjectL URI="Customization/IdleSoftkeys/WebTargets/WebTarget1/Mask"                  IM="image/x-epoc-mbm" ES=0
-
-delete ttest
-[Endtest]
-//---------------------------------------------------------------------------------------------
-// Test 4 - Test app target setting
-[Test]
-title IS_SET_APPTARGET
-create ThemesTest ttest
-ttest LoadL 10207832
-
-ttest FetchLeafObjectL URI="Customization/IdleSoftkeys/SoftKeys/Softkey1/ID"         IM="text/plain" ES=0
-ttest FetchLeafObjectL URI="Customization/IdleSoftkeys/Targets/Target1/ID"           IM="text/plain" ES=0
-ttest UpdateLeafObjectL URI="Customization/IdleSoftkeys/SoftKeys/Softkey1/TargetRef" IM="text/plain" ES=0 IT="Customization/IdleSoftkeys/Targets/Target1"
-
-delete ttest
-[Endtest]
-//---------------------------------------------------------------------------------------------
-// Test 5 - Test wab target setting
-[Test]
-title IS_SET_WEBTARGET
-create ThemesTest ttest
-ttest LoadL 10207832
-
-ttest FetchLeafObjectL URI="Customization/IdleSoftkeys/SoftKeys/Softkey1/ID"         IM="text/plain" ES=0
-ttest FetchLeafObjectL URI="Customization/IdleSoftkeys/WebTargets/WebTarget1/ID"     IM="text/plain" ES=0
-ttest UpdateLeafObjectL URI="Customization/IdleSoftkeys/SoftKeys/Softkey1/TargetRef" IM="text/plain" ES=0 IT="Customization/IdleSoftkeys/WebTargets/WebTarget1"
-
-delete ttest
-[Endtest]
-//---------------------------------------------------------------------------------------------
-// Test 6 - Rename WebTarget
-[Test]
-title IS_RENAME_WEBTARGET
-create ThemesTest ttest
-ttest LoadL 10207832
-
-ttest UpdateLeafObjectL URI="Customization/IdleSoftkeys/WebTargets/WebTargetX"      IT="Customization/IdleSoftkeys/WebTargets/WebTarget1"
-
-ttest FetchLeafObjectL URI="Customization/IdleSoftkeys/WebTargets/WebTarget1/ID"    IM="text/plain" ES=0
-ttest UpdateLeafObjectL URI="Customization/IdleSoftkeys/WebTargets/WebTarget1"      IT="Customization/IdleSoftkeys/WebTargets/WebTargetX" ES=0
-ttest FetchLeafObjectL URI="Customization/IdleSoftkeys/WebTargets/WebTarget1/ID"    IM="text/plain" ES=6
-
-ttest FetchLeafObjectL URI="Customization/IdleSoftkeys/WebTargets/WebTargetX/ID"    IM="text/plain" ES=0
-ttest UpdateLeafObjectL URI="Customization/IdleSoftkeys/WebTargets/WebTargetX"      IT="Customization/IdleSoftkeys/WebTargets/WebTarget1" ES=0
-ttest FetchLeafObjectL URI="Customization/IdleSoftkeys/WebTargets/WebTargetX/ID"    IM="text/plain" ES=6
-
-ttest UpdateLeafObjectL URI="Customization/IdleSoftkeys/WebTargets/WebTargetX"      IT="Customization/IdleSoftkeys/WebTargets/WebTarget1" ES=6
-ttest UpdateLeafObjectL URI="Customization/IdleSoftkeys/WebTargets/WebTarget1"      IT="Customization/IdleSoftkeys/WebTargets/WebTarget1" ES=6
-
-delete ttest
-[Endtest]
-//---------------------------------------------------------------------------------------------
-// Test 7 - Add new bookmark
-[Test]
-title IS_NEW_BM
-create ThemesTest ttest
-ttest LoadL 10207832
-
-ttest AddNodeObjectL URI="Customization/IdleSoftkeys/WebTargets/Targetti" ES=0
-
-delete ttest
-[Endtest]
-//---------------------------------------------------------------------------------------------
-// Test 8 - Delete bookmark
-[Test]
-title IS_DELETE_BM
-create ThemesTest ttest
-ttest LoadL 10207832
-
-ttest DeleteObjectL URI="Customization/IdleSoftkeys/WebTargets/Targetti" ES=0
-
-delete ttest
-[Endtest]
-//---------------------------------------------------------------------------------------------
-// Test 9 - Set idle softkey image
-[Test]
-title IS_SET_IMAGE_APP
-create ThemesTest ttest
-ttest LoadL 10207832
-
-ttest UpdateLeafObjectL URI="Customization/IdleSoftkeys/Targets/Target1/Image" IM="image/jpeg" ES=0 IF="E:\Testing\Data\dontpush_IsAdapter.jpg"
-ttest UpdateLeafObjectL URI="Customization/IdleSoftkeys/SoftKeys/Softkey1/TargetRef" IM="text/plain" ES=0 IT="Customization/IdleSoftkeys/Targets/Target1"
-delete ttest
-[Endtest]
-//---------------------------------------------------------------------------------------------
-// Test 9 - Set idle softkey image
-[Test]
-title IS_SET_IMAGE_WEB
-create ThemesTest ttest
-ttest LoadL 10207832
-
-ttest UpdateLeafObjectL URI="Customization/IdleSoftkeys/WebTargets/WebTarget1/Image" IM="image/jpeg" ES=0 IF="z:\testframework\IsAdapter\dontpush.jpg"
-ttest UpdateLeafObjectL URI="Customization/IdleSoftkeys/SoftKeys/Softkey1/TargetRef" IM="text/plain" ES=0 IT="Customization/IdleSoftkeys/WebTargets/WebTarget1"
-delete ttest
-[Endtest]
-//---------------------------------------------------------------------------------------------
-// Test 10 - Get idle softkey image
-[Test]
-title IS_GET_IMAGE
-create ThemesTest ttest
-ttest LoadL 10207832
-
-ttest FetchLeafObjectL URI="Customization/IdleSoftkeys/Targets/Target1/Image" ES=0
-
-delete ttest
-[Endtest]
-//---------------------------------------------------------------------------------------------
-// EOF
Binary file customization/tsrc/tarmcustomization/data/bug_OpLogoAdapter.jpg has changed
Binary file customization/tsrc/tarmcustomization/data/bug_SupAdapter.jpg has changed
Binary file customization/tsrc/tarmcustomization/data/bug_WallPaperAdapter.jpg has changed
Binary file customization/tsrc/tarmcustomization/data/dontpush_IsAdapter.jpg has changed
Binary file customization/tsrc/tarmcustomization/data/testhbuf_S60_3_X_v_1_0_0.SISx has changed
--- a/customization/tsrc/tarmcustomization/data/verysilent_c_en.xml	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-<InstOpts>
- <StdOpt name="drive" value="c"/> 
- <StdOpt name="lang" value="EN" /> 
- <StdOpt name="upgrade" value="yes"/>
- <StdOpt name="kill" value="yes"/> 
- <StdSymOpt name="pkginfo" value="yes"/> 
- <StdSymOpt name="optionals" value="yes"/>
- <StdSymOpt name="ocsp" value="yes"/>
- <StdSymOpt name="capabilities" value="yes"/>  
- <StdSymOpt name="untrusted" value="yes"/> 
- <StdSymOpt name="ignoreocspwarn" value="yes"/>
- <StdSymOpt name="ignorewarn" value="yes"/>
- <StdSymOpt name="fileoverwrite" value="yes"/> 
-</InstOpts>
\ No newline at end of file
--- a/customization/tsrc/tarmcustomization/eabi/ThemesTestu.def	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-EXPORTS
-	_Z9LibEntryLR13CTestModuleIf @ 1 NONAME
-	_ZTI11CTestParams @ 2 NONAME ; #<TI>#
-	_ZTI11CThemesTest @ 3 NONAME ; #<TI>#
-	_ZTI14CDDFTestParams @ 4 NONAME ; #<TI>#
-	_ZTI15CTestDmCallback @ 5 NONAME ; #<TI>#
-	_ZTI16CTestDmDDFObject @ 6 NONAME ; #<TI>#
-	_ZTV11CTestParams @ 7 NONAME ; #<VT>#
-	_ZTV11CThemesTest @ 8 NONAME ; #<VT>#
-	_ZTV14CDDFTestParams @ 9 NONAME ; #<VT>#
-	_ZTV15CTestDmCallback @ 10 NONAME ; #<VT>#
-	_ZTV16CTestDmDDFObject @ 11 NONAME ; #<VT>#
-
--- a/customization/tsrc/tarmcustomization/group/ThemesTest.iby	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of customization components
-*
-*/
-#ifndef __THEMESTEST_IBY__
-#define __THEMESTEST_IBY__
-
-file=ABI_DIR\BUILD_DIR\ThemesTest.dll            		           Sys\Bin\ThemesTest.dll
-
-data=DATAC_\testframework\SupAdapter\SupAdapterTestScript.cfg  TestFramework\SupAdapter\SupAdapterTestScript.cfg
-data=DATAC_\testframework\SupAdapter\bug.jpg.b64               TestFramework\SupAdapter\bug.jpg.b64
-
-data=DATAC_\testframework\IsAdapter\IsAdapterTestScript.cfg    TestFramework\IsAdapter\IsAdapterTestScript.cfg
-data=DATAC_\testframework\IsAdapter\dontpush.jpg    TestFramework\IsAdapter\dontpush.jpg
-
-data=DATAC_\testframework\TcAdapter\TcAdapterTestScript.cfg    TestFramework\TcAdapter\TcAdapterTestScript.cfg
-data=DATAC_\testframework\TcAdapter\tcadapter_expected1.log    TestFramework\TcAdapter\tcadapter_expected1.log
-data=DATAC_\testframework\TcAdapter\tcadapter_expected2.log    TestFramework\TcAdapter\tcadapter_expected2.log
-data=DATAC_\testframework\TcAdapter\TcAdapterPolicy1.txt       TestFramework\TcAdapter\TcAdapterPolicy1.txt
-data=DATAC_\testframework\TcAdapter\TcAdapterPolicy2.txt       TestFramework\TcAdapter\TcAdapterPolicy2.txt
-data=DATAC_\testframework\TcAdapter\TcAdapterPolicy3.txt       TestFramework\TcAdapter\TcAdapterPolicy3.txt
-
-S60_APP_EXE(stiftestframework)
-S60_APP_AIF_RSC(stiftestframework)
-S60_APP_RESOURCE(stiftestframework)
-
-#endif //__THEMESTEST_IBY__
--- a/customization/tsrc/tarmcustomization/group/ThemesTest.mmp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-/*
-* Copyright (c) 2002 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: Implementation of customization components
-*
-*/
-
-
-// To get the APP_LAYER_SYSTEMINCLUDE-definition
-#include <platform_paths.hrh>
-
-TARGET          ThemesTest.dll
-TARGETTYPE      dll
-UID             0x1000008D 0x101FB3E3
-CAPABILITY	    ALL -TCB
-
-//TARGETPATH      
-DEFFILE         ThemesTest.def
-
-SOURCEPATH      ../src
-SOURCE          ThemesTest.cpp
-SOURCE          ThemesTestBlocks.cpp
-SOURCE          TestDmCallback.cpp
-SOURCE          TestDmDDFObject.cpp
-SOURCE          TestParams.cpp
-
-
-USERINCLUDE      ../../../DMUtils/src
-USERINCLUDE      ../../../DMUtils/inc
-SOURCE           ../../../DMUtils/src/FileCoderB64.cpp
-
-USERINCLUDE     ../inc 
-USERINCLUDE     .
-
-
-
-APP_LAYER_SYSTEMINCLUDE
-SYSTEMINCLUDE   /epoc32/include/ecom
-
-LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
-LIBRARY         ecom.lib
-LIBRARY         bafl.lib
-LIBRARY         efsrv.lib
-LIBRARY         imut.lib
-LIBRARY         rfs.lib
-LIBRARY         centralrepository.lib
-LIBRARY         nsmlprivateapi.lib
-LIBRARY         terminalcontrol.lib
-
-#ifdef __SAP_POLICY_MANAGEMENT
-LIBRARY         policyengine.lib
-LIBRARY         dmutil.lib
-#endif
-
-STATICLIBRARY   DMUtils.lib
-
-LANG			SC
-
-
-SMPSAFE
-// End of File
-
--- a/customization/tsrc/tarmcustomization/group/ThemesTest.pkg	Tue Feb 02 00:03:17 2010 +0200
+++ /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 "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:  Package file for Advance Device Management, Customization component
-;File: ThemesTest.pkg;
-
-;File: ThemesTest.pkg;
-;
-
-
-;*Languages
-&EN
-;
-;*Standard SIS file header. This section specifies the package name,
-;application UID, and version/build numbers. Add the package TYPE here if needed.
-#{"ThemesTest"},(0x101FB3E3),1,0,1;
-;
-
-;*Unique (Non-Localised) Vendor name
-;This is used in combination with signing to prevent the unauthroized
-;upgrade ofa a package by someone other than the rightful vendor.
-:"Nokia"
-
-;*Localized Vendor Name
-;This specifies the localised vendor name(s) correspodning to language(s).
-%{"Nokia Test EN"}
-
-;*Files To Copy...<src> <destination>
-"\epoc32\release\armv5\urel\ThemesTest.dll" -"C:\sys\bin\ThemesTest.dll"
-"..\conf\ThemesTest.cfg" -"C:\TestFramework\ThemesTest.cfg"
-"..\init\ThemesTest.ini" -"C:\TestFramework\ThemesTest.ini"
-"..\data\verysilent_c_en.xml" -"E:\Testing\Data\verysilent_c_en.xml"
-"..\data\testhbuf_S60_3_X_v_1_0_0.SISx" -"E:\Testing\Data\testhbuf_S60_3_X_v_1_0_0.SISx"
-"..\data\dontpush_IsAdapter.jpg" -"E:\Testing\Data\dontpush_IsAdapter.jpg"
-"..\data\bug_WallPaperAdapter.jpg" -"E:\Testing\Data\bug_WallPaperAdapter.jpg"
-"..\data\bug_SupAdapter.jpg" -"E:\Testing\Data\bug_SupAdapter.jpg"
-"..\data\bug_OpLogoAdapter.jpg" -"E:\Testing\Data\bug_OpLogoAdapter.jpg"
\ No newline at end of file
--- a/customization/tsrc/tarmcustomization/group/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,89 +0,0 @@
-/*
-* Copyright (c) 2002 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: Implementation of customization components
-*
-*/
-
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_TESTEXPORTS
-// Nothing
-
-PRJ_EXPORTS
-
-/*
-../internal/test/TestFramework.ini                          /epoc32/data/z/system/data/TestFramework.ini
-../internal/test/TestFramework.ini                          /epoc32/data/z/testframework/TestFramework.ini
-../internal/test/TestFramework.ini                          /epoc32/RELEASE/winscw/UDEB/Z/testframework/TestFramework.ini
-../internal/test/TestFramework.ini                          /epoc32/RELEASE/winscw/UREL/Z/testframework/TestFramework.ini
-
-../internal/test/SupAdapter/SupAdapterTestScript.cfg        /epoc32/data/c/testframework/SupAdapter/SupAdapterTestScript.cfg
-
-../internal/test/SupAdapter/SupAdapterTestScript.cfg        /epoc32/RELEASE/winscw/UDEB/Z/testframework/SupAdapter/SupAdapterTestScript.cfg
-
-../internal/test/SupAdapter/SupAdapterTestScript.cfg        /epoc32/RELEASE/winscw/UREL/Z/testframework/SupAdapter/SupAdapterTestScript.cfg
-
-
-../internal/test/IsAdapter/IsAdapterTestScript.cfg          /epoc32/data/c/testframework/IsAdapter/IsAdapterTestScript.cfg
-../internal/test/IsAdapter/IsAdapterTestScript.cfg          /epoc32/RELEASE/winscw/UDEB/Z/testframework/IsAdapter/IsAdapterTestScript.cfg
-../internal/test/IsAdapter/IsAdapterTestScript.cfg          /epoc32/RELEASE/winscw/UREL/Z/testframework/IsAdapter/IsAdapterTestScript.cfg
-../internal/test/IsAdapter/dontpush.jpg                     /epoc32/data/c/testframework/IsAdapter/dontpush.jpg
-../internal/test/IsAdapter/dontpush.jpg                     /epoc32/RELEASE/winscw/UDEB/Z/testframework/IsAdapter/dontpush.jpg
-../internal/test/IsAdapter/dontpush.jpg                     /epoc32/RELEASE/winscw/UREL/Z/testframework/IsAdapter/dontpush.jpg
-
-../internal/test/TcAdapter/TcAdapterTestScript.cfg          /epoc32/data/c/testframework/TcAdapter/TcAdapterTestScript.cfg
-../internal/test/TcAdapter/tcadapter_expected1.log          /epoc32/data/c/testframework/TcAdapter/tcadapter_expected1.log
-../internal/test/TcAdapter/tcadapter_expected2.log          /epoc32/data/c/testframework/TcAdapter/tcadapter_expected2.log
-../internal/test/TcAdapter/TcAdapterPolicy1.txt             /epoc32/data/c/testframework/TcAdapter/TcAdapterPolicy1.txt
-../internal/test/TcAdapter/TcAdapterPolicy2.txt             /epoc32/data/c/testframework/TcAdapter/TcAdapterPolicy2.txt
-../internal/test/TcAdapter/TcAdapterPolicy3.txt             /epoc32/data/c/testframework/TcAdapter/TcAdapterPolicy3.txt
-../internal/test/TcAdapter/TcAdapterTestScript.cfg          /epoc32/RELEASE/winscw/UDEB/Z/testframework/TcAdapter/TcAdapterTestScript.cfg
-../internal/test/TcAdapter/tcadapter_expected1.log          /epoc32/RELEASE/winscw/UDEB/Z/testframework/TcAdapter/tcadapter_expected1.log
-../internal/test/TcAdapter/tcadapter_expected2.log          /epoc32/RELEASE/winscw/UDEB/Z/testframework/TcAdapter/tcadapter_expected2.log
-../internal/test/TcAdapter/TcAdapterPolicy_NokiaCert.txt    /epoc32/RELEASE/winscw/UDEB/Z/testframework/TcAdapter/TcAdapterPolicy_NokiaCert.txt
-../internal/test/TcAdapter/TcAdapterPolicy1.txt             /epoc32/RELEASE/winscw/UDEB/Z/testframework/TcAdapter/TcAdapterPolicy1.txt
-../internal/test/TcAdapter/TcAdapterPolicy2.txt             /epoc32/RELEASE/winscw/UDEB/Z/testframework/TcAdapter/TcAdapterPolicy2.txt
-../internal/test/TcAdapter/TcAdapterTestScript.cfg          /epoc32/RELEASE/winscw/UREL/Z/testframework/TcAdapter/TcAdapterTestScript.cfg
-../internal/test/TcAdapter/tcadapter_expected1.log          /epoc32/RELEASE/winscw/UREL/Z/testframework/TcAdapter/tcadapter_expected1.log
-../internal/test/TcAdapter/tcadapter_expected2.log          /epoc32/RELEASE/winscw/UREL/Z/testframework/TcAdapter/tcadapter_expected2.log
-../internal/test/TcAdapter/TcAdapterPolicy_NokiaCert.txt    /epoc32/RELEASE/winscw/UREL/Z/testframework/TcAdapter/TcAdapterPolicy_NokiaCert.txt
-../internal/test/TcAdapter/TcAdapterPolicy1.txt             /epoc32/RELEASE/winscw/UREL/Z/testframework/TcAdapter/TcAdapterPolicy1.txt
-../internal/test/TcAdapter/TcAdapterPolicy2.txt             /epoc32/RELEASE/winscw/UREL/Z/testframework/TcAdapter/TcAdapterPolicy2.txt
-*/
-// Add here...
-
-PRJ_MMPFILES
-// Specify the .mmp files required for building the important component
-// releasables.
-//
-// Specify "tidy" if the component you need to build doesn't need to be
-// released. Specify "ignore" if the MMP file exists but should be
-// ignored.
-// Example:
-/*
-/agnmodel/group/agnmodel.mmp
-#if defined(MARM)
-/agnmodel/group/agsvexe.mmp
-#endif
-*/
-
-PRJ_TESTMMPFILES
-// NOTE: If using ARS requirements .mmp file operation should be done under this.
-// 'abld test build'
-
-ThemesTest.mmp
-
-//  End of File
--- a/customization/tsrc/tarmcustomization/inc/TestDmCallback.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,250 +0,0 @@
-/*
-* Copyright (c) 2002-2004 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: Implementation of customization components
-*
-*/
-
-
-
-#ifndef __TESTDMCALLBACK_H
-#define __TESTDMCALLBACK_H
-
-//  INCLUDES
-#include <smldmadapter.h>
-#include <badesca.h>
-
-
-// FORWARD DECLARATIONS
-class CStifLogger;
-
-// CLASS DECLARATION
-
-/**
-*  ?one_line_short_description.
-*  ?other_description_lines
-*
-*  @lib ?library
-*  @since Series ?XX ?SeriesXX_version
-*/
-class CTestDmCallback : public CBase, public MSmlDmCallback
-    {
-    public:  // Constructors and destructor
-        
-        /**
-        * Two-phased constructor.
-        */
-        static CTestDmCallback* NewL( CStifLogger *aLog );
-        
-        /**
-        * Destructor.
-        */
-        virtual ~CTestDmCallback();
-
-    public: // New functions
-
-        /**
-        * ?member_description.
-        * @since Series ?XX ?SeriesXX_version
-        * @param ?arg1 ?description
-        * @return ?description
-        */
-        //?type ?member_function( ?type ?arg1 );
-        
-		TPtrC8 GetLuidL( const TDesC8& aURI );
-		TInt FindMappingURI( const TDesC8& aURI );
-		TInt GetNewResultsRefL( );
-		TInt GetNewStatusRefL( );
-		CBufBase& GetResultsObjectL( TInt aResultsRef );
-		TPtrC8 GetResultsTypeL( TInt aResultsRef );
-		MSmlDmAdapter::TError GetStatusL( TInt aStatusRef );
-		void FreeResultsRefsL( );
-		void FreeStatusRefsL( );
-
-    public: // Functions from base classes
-
-        	public:
-		/**
-	The function is used to return the data in case of FetchLeafObjectL(),
-	FetchLeafObjectSizeL() and ChildURIListL() functions. It should not be
-	called where the DM command has failed, i.e. the error code returned in
-	SetStatusL is something other than EOk.
-	@param aResultsRef	Reference to correct command
-	@param aObject		The data which should be returned
-	@param aType			MIME type of the object
-	@publishedPartner
-	@prototype
-	*/
-	void SetResultsL( TInt aResultsRef, CBufBase& aObject,
-							  const TDesC8& aType );
-	
-	/**
-	The function is used to return the data in case of FetchLeafObjectL() and
-	ChildURIListL() functions, where the size of the data being returned is
-	large enough for the Adapter to stream it. This function should not be
-	called when command was failed, i.e. the error code returned in SetStatusL
-	is something other than EOk.
-	@param aResultsRef	Reference to correct command
-	@param aStream		Large data which should be returned, DM engine
-							closes stream when it has read all the data
-	@param aType			MIME type of the object
-	@publishedPartner
-	@prototype
-	*/
-	void SetResultsL( TInt /*aResultsRef*/, RReadStream*& /*aStream*/,
-							  const TDesC8& /*aType*/ ) 
-	{
-		
-	}
-
-	/**
-	The function returns information about the Add,Update,Delete and Fetch
-	commands success to DM engine. The reference to correct command must be
-	used when calling the SetStatusL function, the reference is got from the
-	argument of the command functions. The SetStatusL function must be called
-	separately for every single command.
-	@param aStatusRef	Reference to correct command
-	@param aErrorCode	Information about the command success
-	@publishedPartner
-	@prototype
-	*/
-	void SetStatusL( TInt aStatusRef,
-							 MSmlDmAdapter::TError aErrorCode ) ;
-
-	/**
-	The function passes map information to DM Module. This function is called
-	for a new management object, both for node objects and for leaf objects.
-	In addition if ChildURIListL() function has returned new objects a mapping
-	information of the new objects must be passed. A mapping is treated as
-	inheritable. If the mapping is not set with this function, the mapping
-	LUID of the parent object is passed in following commands to the object.
-	@param aURI	URI of the object. 
-	@param aLUID	LUID of the object. LUID must contain the all information,
-					which is needed for retrieve the invidual object from the
-					database. Typically it is ID for the database table. In
-					more complicated structures it can be combination of IDs,
-					which represent path to the object.
-	@publishedPartner
-	@prototype
-	*/
-	void SetMappingL( const TDesC8& aURI, const TDesC8& aLUID );
-
-	/**
-	The function is used to make a fetch to other adapters. The most common
-	use is to make a fetch to the AP adapter, because when managing the access
-	points, the data comes as URI. For example, there are ToNAPId field in
-	some adapters, and data to it can be something like AP/IAPidx, and then
-	the link to AP adapter is needed.
-	Using FetchLinkL causes the DM Framework to make a Get request to the
-	appropriate DM adapter.  The receiving adapter MUST complete the Get
-	request synchronously.
-	@param aURI		URI of the object. 
-	@param aData		Reference to data, i.e. data is returned here
-	@param aStatus	The status of fetch command is returned here
-	@publishedPartner
-	@prototype
-	*/
-	void FetchLinkL( const TDesC8& /*aURI*/, CBufBase& /*aData*/,
-							 MSmlDmAdapter::TError& /*aStatus*/ ) 
-		{
-			
-		}
-
-	/**
-	The function returns the LUID which is mapped to aURI. If LUID is not
-	found, the function allocates a null length string, i.e. the function
-	allocates memory in every case.
-	@param aURI	URI of the object. 
-	@publishedPartner
-	@prototype
-	*/
-	HBufC8* GetLuidAllocL( const TDesC8& aURI ) ;
-        
-    protected:  // New functions
-        
-        /**
-        * ?member_description.
-        * @since Series ?XX ?SeriesXX_version
-        * @param ?arg1 ?description
-        * @return ?description
-        */
-        //?type ?member_function( ?type ?arg1 );
-
-    protected:  // Functions from base classes
-        
-        /**
-        * From ?base_class ?member_description
-        */
-        //?type ?member_function();
-
-    private:
-
-        /**
-        * C++ default constructor.
-        */
-        CTestDmCallback( CStifLogger *aLog );
-
-        /**
-        * By default Symbian 2nd phase constructor is private.
-        */
-        void ConstructL();
-
-        // Prohibit copy constructor if not deriving from CBase.
-        // CTestDmCallback( const CTestDmCallback& );
-        // Prohibit assigment operator if not deriving from CBase.
-        // CTestDmCallback& operator=( const CTestDmCallback& );
-
-    public:     // Data
-        // ?one_line_short_description_of_data
-        //?data_declaration;
-    
-    protected:  // Data
-        // ?one_line_short_description_of_data
-        //?data_declaration;
-
-    private:    // Data
-        // ?one_line_short_description_of_data
-        //?data_declaration;
-    /**
-    * Logger.
-    */
-    CStifLogger*    iLog;
-
-	/* Containers for URI/LUID mapping */
-
-	CDesC8ArrayFlat iMappingURI;
-	CDesC8ArrayFlat iMappingLuid;
-
-	/* Containers for results */
-	RPointerArray<CBufBase> iResultObjects;
-	CDesC8ArrayFlat iResultTypes;
-
-	/* Container for status */
-	RArray<TInt> iStatusArray;
-//sf-	RArray<MSmlDmAdapter::TError> iStatusArray;
-
-         
-        // Reserved pointer for future extension
-        //TAny* iReserved;
-
-    public:     // Friend classes
-        //?friend_class_declaration;
-    protected:  // Friend classes
-        //?friend_class_declaration;
-    private:    // Friend classes
-        //?friend_class_declaration;
-    };
-
-#endif      // __TESTDMCALLBACK_H
-            
-// End of File
--- a/customization/tsrc/tarmcustomization/inc/TestDmDDFObject.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,199 +0,0 @@
-/*
-* Copyright (c) 2002-2004 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: Implementation of customization components
-*
-*/
-
-
-
-#ifndef __TESTDMDDFOBJECT_H
-#define __TESTDMDDFOBJECT_H
-
-//  INCLUDES
-//#include <?include_file>
-#include <smldmadapter.h>
-
-// CONSTANTS
-//const ?type ?constant_var = ?constant;
-
-// MACROS
-//#define ?macro ?macro_def
-
-// DATA TYPES
-//enum ?declaration
-//typedef ?declaration
-//extern ?data_type;
-
-// FUNCTION PROTOTYPES
-//?type ?function_name(?arg_list);
-
-// FORWARD DECLARATIONS
-class CStifLogger;
-
-// CLASS DECLARATION
-
-/**
-*  ?one_line_short_description.
-*  ?other_description_lines
-*
-*  @lib ?library
-*  @since Series ?XX ?SeriesXX_version
-*/
-class CTestDmDDFObject : public CBase, public MSmlDmDDFObject
-    {
-    public:  // Constructors and destructor
-        
-        /**
-        * Two-phased constructor.
-        */
-        static CTestDmDDFObject* NewL( CStifLogger *aLog );
-        static CTestDmDDFObject* NewLC( CStifLogger *aLog );
-        
-        /**
-        * Destructor.
-        */
-        virtual ~CTestDmDDFObject();
-
-    public: // New functions
-        
-        /**
-        * ?member_description.
-        * @since Series ?XX ?SeriesXX_version
-        * @param ?arg1 ?description
-        * @return ?description
-        */
-        //?type ?member_function( ?type ?arg1 );
-
-		virtual void SetNameL( const TDesC8& aName );
-		
-		void DumpL( const TDesC8& aParentName, TBool aFullDump = ETrue );
-		void ExternalizeL(RWriteStream& aStream) const;
-		
-		
-
-    public: // Functions from base classes
-    
-//sf-    *********************************
-    
-		void SetAccessTypesL( TSmlDmAccessTypes aAccessTypes );
-		void SetDefaultValueL( const TDesC8& aDefaultValue );
-		void SetDescriptionL( const TDesC8& aDescription );
-		void SetDFFormatL( TDFFormat aFormat );
-		void SetOccurenceL( TOccurence aOccurence );
-		void SetScopeL( TScope aScope );
-		void SetDFTitleL( const TDesC8& aTitle );
-		void AddDFTypeMimeTypeL( const TDesC8& aMimeType );
-		void SetAsObjectGroup();
-		MSmlDmDDFObject& AddChildObjectL(const TDesC8& aNodeName);
-		MSmlDmDDFObject& AddChildObjectGroupL();
-
-//sf-    #############################
-
-		const TDesC8& Name();
-		TSmlDmAccessTypes  AccessTypes();
-		const TDesC8& DefaultValue();
-		const TDesC8& Description();
-		TDFFormat DFFormat();
-		TOccurence Occurence();
-		TScope Scope();
-		const TDesC8& DFTitle();
-		const TDesC8& DFTypeMimeType();
-		TBool ObjectGroup();
-		
-		TInt ChildObjectCount();
-		CTestDmDDFObject& ChildObject( TInt aIndex );
-
-		CTestDmDDFObject* FindChildObject( const TDesC8& aName );
-		TInt SubObjectsCount();
-
-
-    protected:  // New functions
-        
-        /**
-        * ?member_description.
-        * @since Series ?XX ?SeriesXX_version
-        * @param ?arg1 ?description
-        * @return ?description
-        */
-        //?type ?member_function( ?type ?arg1 );
-
-    protected:  // Functions from base classes
-        
-        /**
-        * From ?base_class ?member_description
-        */
-        //?type ?member_function();
-
-    private:
-
-        /**
-        * C++ default constructor.
-        */
-        CTestDmDDFObject( CStifLogger *aLog );
-
-        /**
-        * By default Symbian 2nd phase constructor is private.
-        */
-        void ConstructL();
-
-        // Prohibit copy constructor if not deriving from CBase.
-        // CTestDmDDFObject( const CTestDmDDFObject& );
-        // Prohibit assigment operator if not deriving from CBase.
-        // CTestDmDDFObject& operator=( const CTestDmDDFObject& );
-
-    public:     // Data
-        // ?one_line_short_description_of_data
-        //?data_declaration;
-    
-    protected:  // Data
-        // ?one_line_short_description_of_data
-        //?data_declaration;
-
-    private:    // Data
-        // ?one_line_short_description_of_data
-        //?data_declaration;
-		HBufC8* iName;
-
-		TSmlDmAccessTypes iAccessTypes;
-		HBufC8* iDefaultValue;
-		HBufC8* iDescription;
-		TDFFormat iFormat;
-		TOccurence iOccurence;
-		TScope iScope;
-		HBufC8* iTitle;
-		HBufC8* iMimeType;
-		TBool iObjectGroup;
-		
-		RPointerArray<CTestDmDDFObject> iChildren;
-
-         
-        // Reserved pointer for future extension
-        //TAny* iReserved;
-
-    public:     // Friend classes
-        //?friend_class_declaration;
-    protected:  // Friend classes
-        //?friend_class_declaration;
-    private:    // Friend classes
-        //?friend_class_declaration;
-        /**
-        * Logger.
-        */
-        CStifLogger*    iLog;
-
-    };
-
-#endif      // __TESTDMDDFOBJECT_H
-            
-// End of File
--- a/customization/tsrc/tarmcustomization/inc/TestParams.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,361 +0,0 @@
-/*
-* Copyright (c) 2002-2004 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: Implementation of customization components
-*
-*/
-
-
-
-#ifndef __TESTPARAMS_H
-#define __TESTPARAMS_H
-
-//  INCLUDES
-#include <e32base.h>
-#include <smldmadapter.h>
-
-// FORWARD DECLARATIONS
-class CStifLogger;
-class CStifItemParser;
-class CTestDmCallback;
-class CTestDmDDFObject;
-
-// CLASS DECLARATION
-
-/**
-*  ?one_line_short_description.
-*  ?other_description_lines
-*
-*  @lib ?library
-*  @since Series ?XX ?SeriesXX_version
-*/
-class CTestParamsBase : public CBase
-    {
-    public:  // Constructors and destructor
-
-        /**
-        * Destructor.
-        */
-		virtual ~CTestParamsBase();
-
-    public: // New functions
-        
-		TInt CheckStatusL( TInt aStatus );
-		TInt CheckDataL( CBufBase& aObject );
-		TInt CheckTypeL( const TDesC8 &aType );
-
-		TInt CheckL( CTestDmCallback* aCallback );
-		TInt CheckAllL( CTestDmCallback* aCallback );
-
-		TInt CheckResultsRefL( TInt resultsRef );
-		TInt CheckStatusRefL( TInt statusRef );
-
-    public: // Functions from base classes
-
-		virtual TInt SetParam( TInt xxx ) = 0;	
-		
-    protected:  // New functions
-
-        /**
-        * Symbian 2nd phase constructor
-        */
-		void ConstructL( CStifItemParser& aItem );
-
-    private:
-
-        /**
-        * C++ default constructor.
-        */
-		CTestParamsBase( CStifLogger *aLog );
-
-    protected:  // Data
-
-		CStifLogger* iLog;
-    };
-
-/**
-*  ?one_line_short_description.
-*  ?other_description_lines
-*
-*  @lib ?library
-*  @since Series ?XX ?SeriesXX_version
-*/
-class CTestParams : public CBase
-    {
-    public:  // Constructors and destructor
-        
-        /**
-        * Two-phased constructor.
-        */
-		static CTestParams* NewL( CStifLogger *aLog, CStifItemParser& aItem );
-		static CTestParams* NewLC( CStifLogger *aLog, CStifItemParser& aItem );
-        
-        /**
-        * Destructor.
-        */
-		virtual ~CTestParams();
-
-    public: // New functions
-        
-		const TDesC8& Uri();
-		const TDesC8& Data();
-		const TDesC8& DataType();
-		
-		void SetResultsRef( TInt resultsRef );
-		void SetStatusRef( TInt statusRef );
-
-		TInt CheckStatusL( TInt aStatus );
-		TInt CheckDataL( CBufFlat& aObject );
-		TInt CheckDataL( const TDesC8& aObject );
-		TInt CheckTypeL( const TDesC8 &aType );
-
-		TInt CheckL( CTestDmCallback* aCallback );
-		TInt CheckAllL( CTestDmCallback* aCallback );
-
-		TInt CheckResultsRefL( TInt resultsRef );
-		TInt CheckStatusRefL( TInt statusRef );
-
-    protected:  // Functions from base classes
-        
-        /**
-        * From ?base_class ?member_description
-        */
-        //?type ?member_function();
-
-    private:
-
-        /**
-        * C++ default constructor.
-        */
-		CTestParams( CStifLogger *aLog );
-
-        /**
-        * By default Symbian 2nd phase constructor is private.
-        */
-		void ConstructL( CStifItemParser& aItem );
-
-    protected:  // Data
-
-		CStifLogger* iLog;
-
-    private:    // Data
-
-		TPtrC iStr;
-
-		HBufC8* iUri;
-		HBufC8* iData;
-		HBufC8* iDataType;
-
-		HBufC8* iOutputFile;
-
-		TInt iExpectedStatus;
-		HBufC8* iExpectedData;
-		HBufC8* iExpectedType;
-
-		TInt iStatusRef;
-		TInt iResultsRef;
-
-    };
-
-/**
-*  ?one_line_short_description.
-*  ?other_description_lines
-*
-*  @lib ?library
-*  @since Series ?XX ?SeriesXX_version
-*/
-class CDDFTestParams : public CBase
-    {
-    public:  // Constructors and destructor
-        
-        /**
-        * Two-phased constructor.
-        */
-		static CDDFTestParams* NewL( CStifLogger *aLog, CStifItemParser& aItem );
-		static CDDFTestParams* NewLC( CStifLogger *aLog, CStifItemParser& aItem );
-        
-        /**
-        * Destructor.
-        */
-		virtual ~CDDFTestParams();
-
-    public: // New functions
-
-		TInt GetAccessTypesL( TSmlDmAccessTypes& aAccessTypes );
-		TInt GetDefaultValueL( TPtrC8& aDefaultValue );
-		TInt GetDescriptionL( TPtrC8& aDescription );
-		TInt GetDFFormatL( MSmlDmDDFObject::TDFFormat& aFormat );
-		TInt GetOccurenceL( MSmlDmDDFObject::TOccurence& aOccurence );
-		TInt GetScopeL( MSmlDmDDFObject::TScope& aScope );
-		TInt GetDFTitleL( TPtrC8& aTitle );
-		TInt GetDFTypeMimeTypeL( TPtrC8& aMimeType );
-
-		TInt NodeCount();
-		TAny* Node( TInt aIndex );
-
-		const TDesC8& Uri();
-		const TDesC8& Data();
-		const TDesC8& DataType();
-
-		void SetResultsRef( TInt resultsRef );
-		void SetStatusRef( TInt statusRef );
-
-		TInt CheckL( CTestDmDDFObject* aDdfRoot );
-
-    private:
-
-        /**
-        * C++ default constructor.
-        */
-		CDDFTestParams( CStifLogger *aLog );
-
-        /**
-        * By default Symbian 2nd phase constructor is private.
-        */
-		void ConstructL( CStifItemParser& aItem );
-
-    protected:  // Data
-
-		CStifLogger* iLog;
-
-    private:    // Data
-        // ?one_line_short_description_of_data
-        //?data_declaration;
-		HBufC8* iUri;
-		TSmlDmAccessTypes iAccessTypes;
-		HBufC8* iDefaultValue;
-		HBufC8* iDescription;
-		MSmlDmDDFObject::TDFFormat iFormat;
-		MSmlDmDDFObject::TOccurence iOccurence;
-		MSmlDmDDFObject::TScope iScope;
-		HBufC8* iTitle;
-		HBufC8* iMimeType;
-		TInt iObjectGroup;
-    };
-
-
-
-
-/**
-*  ?one_line_short_description.
-*  ?other_description_lines
-*
-*  @lib ?library
-*  @since Series ?XX ?SeriesXX_version
-*/
-class TTestParamVar
-    {
-    public:  // Constructors and destructor
-
-        /**
-        * Constructors.
-        */
-		TTestParamVar( const TDesC8 &aStr );
-
-        /**
-        * Two-phased constructor.
-        */
-//		static CTestParams* NewL( CStifLogger *aLog, CStifItemParser& aItem );
-//		static CTestParams* NewLC( CStifLogger *aLog, CStifItemParser& aItem );
-        
-        /**
-        * Destructor.
-        */
-//		virtual ~TTestParamVar();
-
-    public: // New functions
-        
-        /**
-        * ?member_description.
-        * @since Series ?XX ?SeriesXX_version
-        * @param ?arg1 ?description
-        * @return ?description
-        */
-        //?type ?member_function( ?type ?arg1 );
-		TBool Next();
-		const TDesC8& Name();
-		const TDesC8& Value();
-		TBool ValueExist();
-
-    public: // Functions from base classes
-
-    protected:  // New functions
-        
-        /**
-        * ?member_description.
-        * @since Series ?XX ?SeriesXX_version
-        * @param ?arg1 ?description
-        * @return ?description
-        */
-        //?type ?member_function( ?type ?arg1 );
-		TChar GetChar();
-		void UnGetChar();
-		TPtrC8 GetWord();
-
-    protected:  // Functions from base classes
-        
-        /**
-        * From ?base_class ?member_description
-        */
-        //?type ?member_function();
-
-    private:
-
-        /**
-        * C++ default constructor.
-        */
-		TTestParamVar();
-
-        /**
-        * By default Symbian 2nd phase constructor is private.
-        */
-//		void ConstructL( CStifItemParser& aItem );
-
-        // Prohibit copy constructor if not deriving from CBase.
-        // CTestParams( const CTestParams& );
-        // Prohibit assigment operator if not deriving from CBase.
-        // CTestParams& operator=( const CTestParams& );
-
-    public:     // Data
-        // ?one_line_short_description_of_data
-        //?data_declaration;
-		CStifLogger* iLog;
-    
-    protected:  // Data
-        // ?one_line_short_description_of_data
-        //?data_declaration;
-
-    private:    // Data
-        // ?one_line_short_description_of_data
-        //?data_declaration;
-		TLex8 iLex;
-//sf-		TPtrC8 iStr;
-//sf-		TInt iPos;
-		TPtrC8 iName;
-		TPtrC8 iValue;
-		TBool iValueExist;
-
-        // Reserved pointer for future extension
-        //TAny* iReserved;
-
-    public:     // Friend classes
-        //?friend_class_declaration;
-    protected:  // Friend classes
-        //?friend_class_declaration;
-    private:    // Friend classes
-        //?friend_class_declaration;
-    };
-
-#endif      // __TESTPARAMS_H
-            
-// End of File
--- a/customization/tsrc/tarmcustomization/inc/ThemesTest.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,243 +0,0 @@
-/*
-* Copyright (c) 2002 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: Implementation of customization components
-*
-*/
-
-
-
-#ifndef THEMESTEST_H
-#define THEMESTEST_H
-
-//  INCLUDES
-#include <StifLogger.h>
-#include <TestScripterInternal.h>
-#include <StifTestModule.h>
-
-
-// CONSTANTS
-//const ?type ?constant_var = ?constant;
-
-// MACROS
-//#define ?macro ?macro_def
-// Logging path
-_LIT( KThemesTestLogPath, "\\logs\\testframework\\ThemesTest\\" ); 
-// Log file
-_LIT( KThemesTestLogFile, "ThemesTest.txt" ); 
-
-// FUNCTION PROTOTYPES
-//?type ?function_name(?arg_list);
-
-// FORWARD DECLARATIONS
-//class ?FORWARD_CLASSNAME;
-class CThemesTest;
-class CTestDmCallback;
-class CTestDmDDFObject;
-class CSmlDmAdapter;
-class CTestParams;
-class CDDFTestParams;
-
-// DATA TYPES
-//enum ?declaration
-//typedef ?declaration
-//extern ?data_type;
-
-// CLASS DECLARATION
-
-/**
-*  CThemesTest test class for STIF Test Framework TestScripter.
-*  ?other_description_lines
-*
-*  @lib ?library
-*  @since ?Series60_version
-*/
-class CThemesTest : public CScriptBase
-    {
-    public:  // Constructors and destructor
-        
-        /**
-        * Two-phased constructor.
-        */
-        static CThemesTest* NewL( CTestModuleIf& aTestModuleIf );
-        
-        /**
-        * Destructor.
-        */
-        virtual ~CThemesTest();
-
-    public: // New functions
-        
-        /**
-        * ?member_description.
-        * @since ?Series60_version
-        * @param ?arg1 ?description
-        * @return ?description
-        */
-        //?type ?member_function( ?type ?arg1 );
-
-    public: // Functions from base classes
-
-        /**
-        * From CScriptBase Runs a script line.
-        * @since ?Series60_version
-        * @param aItem Script line containing method name and parameters
-        * @return Symbian OS error code
-        */
-        virtual TInt RunMethodL( CStifItemParser& aItem );
-                
-    protected:  // New functions
-        
-        /**
-        * ?member_description.
-        * @since ?Series60_version
-        * @param ?arg1 ?description
-        * @return ?description
-        */
-        //?type ?member_function( ?type ?arg1 );
-
-    protected:  // Functions from base classes
-        
-        /**
-        * From ?base_class ?member_description
-        */
-        //?type ?member_function();
-
-    private:
-
-        /**
-        * C++ default constructor.
-        */
-        CThemesTest( CTestModuleIf& aTestModuleIf );
-
-        /**
-        * By default Symbian 2nd phase constructor is private.
-        */
-        void ConstructL();
-
-        // Prohibit copy constructor if not deriving from CBase.
-        // ?classname( const ?classname& );
-        // Prohibit assigment operator if not deriving from CBase.
-        // ?classname& operator=( const ?classname& );
-    
-        /**
-        * Frees all resources allocated from test methods.
-        * @since ?Series60_version
-        */
-        void Delete();
-        
-        /**
-        * Test methods are listed below. 
-        */
-        
-        /**
-        * Example test method.
-        * @since ?Series60_version
-        * @param aItem Script line containing parameters.
-        * @return Symbian OS error code.
-        */
-        virtual TInt ExampleL( CStifItemParser& aItem );
-        
-        /**
-        * Seconda test method.
-        * @since ?Series60_version
-        * @param aItem Script line containing parameters.
-        * @return Symbian OS error code.
-        */
-        virtual TInt SecondaL( CStifItemParser& aItem );
-        virtual TInt InstallL( CStifItemParser& aItem );
-
-        /**
-        * Test methods for DM Adapter.
-        * @since ?Series60_version
-        * @param aItem Script line containing parameters.
-        * @return Symbian OS error code.
-        */
-        virtual TInt LoadL( CStifItemParser& aItem );
-		virtual TInt AddDDFCheckL( CStifItemParser& aItem );
-
-		virtual TInt DDFVersionL( CStifItemParser& aItem );
-		virtual TInt DDFStructureL( CStifItemParser& aItem );
-		
-		virtual TInt UpdateLeafObjectL( CStifItemParser& aItem );
-		virtual TInt UpdateLeafObjectStreamL( CStifItemParser& aItem );
-		virtual TInt DeleteObjectL( CStifItemParser& aItem );
-		virtual TInt FetchLeafObjectL( CStifItemParser& aItem );
-		virtual TInt FetchLeafObjectSizeL( CStifItemParser& aItem );
-		virtual TInt ChildURIListL( CStifItemParser& aItem );
-		
-		virtual TInt AddNodeObjectL( CStifItemParser& aItem );
-		virtual TInt ExecuteCommandL( CStifItemParser& aItem );
-		virtual TInt ExecuteCommandStreamL( CStifItemParser& aItem );
-		virtual TInt CopyCommandL( CStifItemParser& aItem );
-		virtual TInt StartAtomicL( CStifItemParser& aItem );
-		virtual TInt CommitAtomicL( CStifItemParser& aItem );
-		virtual TInt RollbackAtomicL( CStifItemParser& aItem );
-		virtual TInt StreamingSupportL( CStifItemParser& aItem );
-		virtual TInt StreamCommittedL( CStifItemParser& aItem );
-		virtual TInt CompleteOutstandingCmdsL( CStifItemParser& aItem );
-#if 0
-		virtual TInt CreateFileL( CStifItemParser& aItem );
-		virtual TInt RFSCommandL( CStifItemParser& aItem );
-		virtual TInt LoadPolicyL( CStifItemParser& aItem );
-		virtual TInt SetCertificateL( CStifItemParser& aItem );
-		virtual TInt ConnectToPolicyServerL( CStifItemParser& aItem );
-		virtual TInt ConnectToDMUTILL( CStifItemParser& aItem );
-		virtual TInt InitDMSessionL( CStifItemParser& aItem );
-		virtual TInt ThirdPartyCommandL( CStifItemParser& aItem );
-		
-    	virtual TInt RRRunL( CStifItemParser& aItem );
-#endif
-		// Other functions
-		void AddParamsL( CTestParams* params );
-		void AddDDFParamsL( CDDFTestParams* aDDFParams );
-		TInt CheckAllL( );
-		TInt CheckDDFL( CTestDmDDFObject *aDDFRoot );
-#if 0
-        HBufC8* GetThirdPartyValueL( TInt aType );
-        void    SetThirdPartyValueL( TInt aType, TDesC8& aData );
-#endif
-    public:     // Data
-        // ?one_line_short_description_of_data
-        //?data_declaration;
-    
-    protected:  // Data
-        // ?one_line_short_description_of_data
-        //?data_declaration;
-
-    private:    // Data
-		CTestDmCallback *iCallback;
-		CSmlDmAdapter *iAdapter;
-
-		RPointerArray< CTestParams > iParams;
-		RPointerArray< CDDFTestParams > iDDFParams;
-
-
-        // ?one_line_short_description_of_data
-        //?data_declaration;
-         
-        // Reserved pointer for future extension
-        //TAny* iReserved;
-
-    public:     // Friend classes
-        //?friend_class_declaration;
-    protected:  // Friend classes
-        //?friend_class_declaration;
-    private:    // Friend classes
-        //?friend_class_declaration;
-
-    };
-
-#endif      // THEMESTEST_H
-            
-// End of File
--- a/customization/tsrc/tarmcustomization/init/ThemesTest.ini	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,218 +0,0 @@
-#
-# This is STIF initialization file
-# Comment lines start with '#'-character.
-# See STIF TestFramework users guide.doc for instructions
-
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-# Set following test engine settings:
-#	- Set Test Reporting mode. TestReportMode's possible values are:
-#		+ 'Summary': Summary of the tested test cases.
-#		+ 'Environment': Hardware and software info.
-#		+ 'TestCases': Test case report.
-#		+ 'FullReport': Set of all above ones.
-#		+ Example 'TestReportMode= Summary TestCases'
-#
-# 	- CreateTestReport setting controls report creation mode
-#		+ YES, Test report will created.
-#		+ NO, No Test report.
-#
-# 	- File path indicates the base path of the test report.
-# 	- File name indicates the name of the test report.
-#
-# 	- File format indicates the type of the test report.
-#		+ TXT, Test report file will be txt type, for example 'TestReport.txt'.
-#		+ HTML, Test report will be html type, for example 'TestReport.html'.
-#   + XML, Test report will be xml type, for example 'TestReport.xml'.
-#          Note, that xml format is available only when output is set to FILE.
-#
-# 	- File output indicates output source of the test report.
-#		+ FILE, Test report logging to file.
-#		+ RDEBUG, Test report logging to using rdebug.
-#
-# 	- File Creation Mode indicates test report overwriting if file exist.
-#		+ OVERWRITE, Overwrites if the Test report file exist.
-#		+ APPEND, Continue logging after the old Test report information if
-#                 report exist.
-# 	- Sets a device reset module's dll name(Reboot).
-#		+ If Nokia specific reset module is not available or it is not correct one
-#		  StifHWResetStub module may use as a template for user specific reset
-#		  module.
-# 	- Sets STIF test measurement disable options. e.g. pluging1 and pluging2 disablation
-#		DisableMeasurement= stifmeasurementplugin01 stifmeasurementplugin02
-#
-
-[Engine_Defaults]
-
-TestReportMode= FullReport    # Possible values are: 'Empty', 'Summary', 'Environment',
-                              #                      'TestCases' or 'FullReport'
-
-CreateTestReport= YES         # Possible values: YES or NO
-
-TestReportFilePath= C:\LOGS\TestFramework\
-TestReportFileName= TestReport
-
-TestReportFormat= TXT         # Possible values: TXT, HTML or XML
-TestReportOutput= FILE        # Possible values: FILE or RDEBUG
-TestReportFileCreationMode= OVERWRITE # Possible values: OVERWRITE or APPEND
-
-DeviceResetDllName= StifResetForNokia.dll # e.g. 'StifHWResetStub.dll' for user specific reseting
-
-DisableMeasurement= stifmeasurementdisablenone  # Possible values are:
-              # 'stifmeasurementdisablenone', 'stifmeasurementdisableall'
-              # 'stifmeasurementplugin01', 'stifmeasurementplugin02',
-              # 'stifmeasurementplugin03', 'stifmeasurementplugin04',
-              # 'stifmeasurementplugin05' or 'stifbappeaprofiler'
-
-Timeout= 0                    # Default timeout value for each test case. In milliseconds
-#UITestingSupport= YES        # Possible values: YES or NO
-#SeparateProcesses= YES       # Possible values: YES or NO (default: NO)
-[End_Defaults]
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-
-
-
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-# Module configurations start
-# Modules are added between module tags
-# tags. Module name is specified after ModuleName= tag, like
-# ModuleName= XXXXXXXXX
-# Modules might have initialisation file, specified as
-# IniFile= c:\testframework\YYYYYY
-# Modules might have several configuration files, like
-# TestCaseFile= c:\testframework\NormalCases.txt
-# TestCaseFile= c:\testframework\SmokeCases.txt
-# TestCaseFile= c:\testframework\ManualCases.txt
-
-# (TestCaseFile is synonym for old term ConfigFile)
-
-# Following case specifies demo module settings. Demo module
-# does not read any settings from file, so tags 
-# IniFile and TestCaseFile are not used.
-# In the simplest case it is enough to specify only the
-# name of the test module when adding new test module
-
-[New_Module]
-ModuleName= testscripter
-TestCaseFile = c:\testframework\ThemesTest.cfg
-[End_Module]
-
-
-# Load testmoduleXXX, optionally with initialization file and/or test case files
-#[New_Module]
-#ModuleName= testmodulexxx
-
-#TestModuleXXX used initialization file
-#IniFile= c:\testframework\init.txt
-
-#TestModuleXXX used configuration file(s)
-#TestCaseFile= c:\testframework\testcases1.cfg
-#TestCaseFile= c:\testframework\testcases2.cfg
-
-
-#[End_Module]
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-
-
-
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-# Set STIF logging overwrite parameters for Logger.
-# 	Hardware and emulator environment logging path and styles can
-# 	be configured from here to overwrite the Logger's implemented values.
-#	
-#	Settings description:
-#	- Indicates option for creation log directory/directories. If log directory/directories
-#         is/are not created by user they will make by software.
-#		+ YES, Create log directory/directories if not allready exist.
-#		+ NO, Log directory/directories not created. Only created one is used.
-#
-#	- Overwrite emulator path setting.
-#		+ Example: If 'EmulatorBasePath= C:\LOGS\TestFramework\' and in code is defined 
-#		           Logger's path 'D:\\LOGS\\Module\\' with those definition the path
-#		           will be 'C:\LOGS\TestFramework\LOGS\Module\'
-#
-#	- Overwrite emulator's logging format.
-#		+ TXT, Log file(s) will be txt type(s), for example 'Module.txt'.
-#		+ HTML, Log file(s) will be html type(s), for example 'Module.html'.
-#
-#	- Overwrited emulator logging output source.
-#		+ FILE, Logging to file(s).
-#		+ RDEBUG, Logging to using rdebug(s).
-#
-#	- Overwrite hardware path setting (Same description as above in emulator path).
-#	- Overwrite hardware's logging format(Same description as above in emulator format).
-#	- Overwrite hardware's logging output source(Same description as above in emulator output).
-#
-#	- File Creation Mode indicates file overwriting if file exist.
-#		+ OVERWRITE, Overwrites if file(s) exist.
-#		+ APPEND, Continue logging after the old logging information if file(s) exist.
-#
-#	- Will thread id include to the log filename.
-#		+ YES, Thread id to log file(s) name, Example filename 'Module_b9.txt'.
-#		+ NO, No thread id to log file(s), Example filename 'Module.txt'.
-#
-#	- Will time stamps include the to log file.
-#		+ YES, Time stamp added to each line in log file(s). Time stamp is 
-#                 for example'12.Nov.2003 115958    LOGGING INFO'
-#		+ NO, No time stamp(s).
-#
-#	- Will line breaks include to the log file.
-#		+ YES, Each logging event includes line break and next log event is in own line.
-#		+ NO, No line break(s).
-#
-#	- Will event ranking include to the log file.
-#		+ YES, Event ranking number added to each line in log file(s). Ranking number
-#                 depends on environment's tics, for example(includes time stamp also)
-#                 '012   12.Nov.2003 115958    LOGGING INFO'
-#		+ NO, No event ranking.
-#
-#	- Will write log file in unicode format.
-#		+ YES, Log file will be written in unicode format
-#		+ NO, Log will be written as normal, not unicode, file.
-#
-
-[Logger_Defaults]
-
-#NOTE: If you want to set Logger using next setting(s) remove comment(s)'#'
-#NOTE: TestEngine and TestServer logging settings cannot change here
-
-#CreateLogDirectories= YES    # Possible values: YES or NO
-
-#EmulatorBasePath= C:\LOGS\TestFramework\
-#EmulatorFormat= HTML         # Possible values: TXT or HTML
-#EmulatorOutput= FILE         # Possible values: FILE or RDEBUG
-
-#HardwareBasePath= D:\LOGS\TestFramework\
-#HardwareFormat= HTML         # Possible values: TXT or HTML
-#HardwareOutput= FILE         # Possible values: FILE or RDEBUG
-
-#FileCreationMode= OVERWRITE  # Possible values: OVERWRITE or APPEND
-
-#ThreadIdToLogFile= YES       # Possible values: YES or NO
-#WithTimeStamp= YES           # Possible values: YES or NO
-#WithLineBreak= YES           # Possible values: YES or NO
-#WithEventRanking= YES        # Possible values: YES or NO
-
-#FileUnicode= YES             # Possible values: YES or NO
-#AddTestCaseTitle= YES        # Possible values: YES or NO
-[End_Logger_Defaults]
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-
-
-
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-# Set filters to be used by ConsoleUI.
-# 	If you want to use filter with ConsoleUI, simply remove comments
-# 	from section below and provide valid filter entries.
-#   Each filter line has to start with "filter= " keyword.
-#   Filter can contain special wildcard characters:
-#     *  which stands for none or any literal;
-#     ?  which stands for single character.
-#   Filters are not case-sensitive.
-
-#[Filters]
-#filter= *math*
-#filter= *radio*
-#[End_Filters]
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-
-# End of file
--- a/customization/tsrc/tarmcustomization/src/TestDmCallback.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,328 +0,0 @@
-/*
-* Copyright (c) 2002-2004 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: Implementation of customization components
-*
-*/
-
-
-
-// INCLUDE FILES
-
-#include    "TestDmCallback.h"
-#include "StifLogger.h"
-
-// EXTERNAL DATA STRUCTURES
-//extern  ?external_data;
-
-// EXTERNAL FUNCTION PROTOTYPES  
-//extern ?external_function( ?arg_type,?arg_type );
-
-// CONSTANTS
-//const ?type ?constant_var = ?constant;
-
-// MACROS
-//#define ?macro ?macro_def
-
-// LOCAL CONSTANTS AND MACROS
-//const ?type ?constant_var = ?constant;
-//#define ?macro_name ?macro_def
-
-// MODULE DATA STRUCTURES
-//enum ?declaration
-//typedef ?declaration
-
-// LOCAL FUNCTION PROTOTYPES
-//?type ?function_name( ?arg_type, ?arg_type );
-
-// FORWARD DECLARATIONS
-//class ?FORWARD_CLASSNAME;
-
-// ============================= LOCAL FUNCTIONS ===============================
-
-
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CTestDmCallback::CTestDmCallback
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CTestDmCallback::CTestDmCallback( CStifLogger *aLog )
-	: iLog( aLog )
-	, iMappingURI( 16 )
-	, iMappingLuid( 16 )
-//	RPointerArray<CBufBase> iResultObjects;
-	, iResultTypes( 16 )
-//	RArray<TInt> iStatusArray;
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// CTestDmCallback::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CTestDmCallback::ConstructL()
-    {
-//	CDesC8ArrayFlat *iMappingURI;
-//	CDesC8ArrayFlat:: *iMappingURI;
-//	CDesC8ArrayFlat *iMappingLuid;
-
-	/* Containers for results */
-//	RPointerArray<CBufBase> iResultObjects;
-//	CDesC8ArrayFlat *iResultTypes;
-
-	/* Container for status */
-//	RArray<TInt> iStatusArray;
-    }
-
-// -----------------------------------------------------------------------------
-// CTestDmCallback::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CTestDmCallback* CTestDmCallback::NewL( CStifLogger *aLog )
-    {
-    CTestDmCallback* self = new( ELeave ) CTestDmCallback( aLog );
-    
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop();
-
-    return self;
-    }
-
-    
-// Destructor
-CTestDmCallback::~CTestDmCallback()
-    {
-    
-    }
-
-
-// -----------------------------------------------------------------------------
-// CTestDmCallback::?member_function
-// ?implementation_description
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-/*?type CTestDmCallback::?member_function(
-    ?arg_type arg,
-    ?arg_type arg )
-    {
-    
-    ?code
-    
-    }
-*/
-
-void CTestDmCallback::SetResultsL( 
-	TInt aResultsRef, 
-	CBufBase& aObject,
-	const TDesC8& aType )
-	{
-	TPtrC8 obj = aObject.Ptr( 0 ).Left( 120 );
-	iLog->Log( _L8( "SetResults, ref=%d, object='%S', type='%S'" ), aResultsRef, &obj, &aType );
-	if (aResultsRef < 0 || aResultsRef >= iResultObjects.Count() || aResultsRef >= iResultTypes.Count())
-		{
-		User::Leave( KErrArgument );
-		}
-		
-//sf-	iResultObjects[ aResultsRef ]->Copy( aObject );
-	iResultObjects[ aResultsRef ]->Reset();
-//sf-	iResultObjects[ aResultsRef ]->InsertL( 0, aObject.Ptr( 0 ) );
-	for (TInt i = 0 ; i < aObject.Size() ; )
-		{
-		TPtrC8 ptr = aObject.Ptr( i );
-		iResultObjects[ aResultsRef ]->InsertL( i, ptr );
-		i += ptr.Length();
-		}
-//sf-	iResultTypes[ aResultsRef ] = aType;
-	iResultTypes.Delete( aResultsRef );
-	iResultTypes.InsertL( aResultsRef, aType );
-	}
-
-void CTestDmCallback::SetStatusL( TInt aStatusRef,
-							 MSmlDmAdapter::TError aErrorCode ) 
-	{
-	iLog->Log( _L8( "SetStatusL, ref=%d, code=%d" ), aStatusRef, aErrorCode );
-	if (aStatusRef < 0 || aStatusRef >= iStatusArray.Count() )
-		{
-		User::Leave( KErrArgument );
-		}
-
-	iStatusArray[ aStatusRef ] = aErrorCode;
-	}
-
-void CTestDmCallback::SetMappingL( const TDesC8& aURI, const TDesC8& aLUID ) 
-	{
-	TPtrC8 ptrUri = aURI;
-	TPtrC8 ptrLuid = aLUID.Left( 80 );
-	iLog->Log( _L8( "SetMappingL, aURI='%S', aLUID='%S'" ), &ptrUri, &ptrLuid );
-
-	TInt idx = FindMappingURI( aURI );
-	if (idx < 0)
-		{
-		iMappingURI.AppendL( aURI );
-		iMappingLuid.AppendL( aLUID );
-		}
-	else
-		{
-//sf-		iMappingLuid[ idx ] = aLUID;
-		iMappingLuid.Delete( idx );
-		iMappingLuid.InsertL( idx, aLUID );
-		}
-	}
-
-HBufC8* CTestDmCallback::GetLuidAllocL( const TDesC8& aURI ) 
-	{
-	iLog->Log( _L8( "GetLuidAllocL, aURI='%S'" ), &aURI );
-	HBufC8* ptr = GetLuidL( aURI ).AllocL();
-	return ptr;
-/*	HBufC8* ptr = 0;
-	TInt idx = FindMappingURI( aURI );
-	if (idx < 0)
-		{
-		ptr = HBufC8::NewL(2);
-		}
-	else
-		{
-		ptr = iMappingLuid[ idx ].AllocL();
-		}
-
-	return ptr;
-*/	}
-
-TPtrC8 CTestDmCallback::GetLuidL( const TDesC8& aURI ) 
-	{
-	iLog->Log( _L8( "GetLuidL, aURI='%S'" ), &aURI );
-	TPtrC8 ptr;
-	TInt idx = FindMappingURI( aURI );
-	if (idx < 0)
-		{
-		ptr.Set( KNullDesC8 );
-		}
-	else
-		{
-		ptr.Set( iMappingLuid[ idx ] );
-		}
-
-	return ptr;
-	}
-
-
-/* New functions */
-
-TInt CTestDmCallback::FindMappingURI( const TDesC8& aURI )
-	{
-	TInt idx = iMappingURI.Count() - 1;
-	while (idx >= 0 && iMappingURI[ idx ] != aURI)
-		{
-		idx--;
-		}
-	return idx;
-	}
-
-TInt CTestDmCallback::GetNewResultsRefL( )
-	{
-	CBufBase* obj = CBufFlat::NewL( 100 );
-	obj->Reset();
-
-	CleanupStack::PushL( obj );
-	User::LeaveIfError( iResultObjects.Append( obj ) );
-	CleanupStack::Pop( obj );
-	iResultTypes.AppendL( KNullDesC8 );
-	
-	TInt ref = iResultObjects.Count() - 1;
-	return ref;
-	}
-
-TInt CTestDmCallback::GetNewStatusRefL( )
-	{
-	User::LeaveIfError( iStatusArray.Append( -1 ) );
-
-	TInt ref = iStatusArray.Count() - 1;
-	return ref;
-	}
-/*TInt CTestDmCallback::GetResultsL( TInt aResultsRef, )
-	CBufBase& aObject,
-	const TDesC8& aType )
-	{
-	
-	}
-*/
-
-CBufBase& CTestDmCallback::GetResultsObjectL( TInt aResultsRef )
-	{
-	if (aResultsRef < 0 || aResultsRef >= iResultObjects.Count() )
-		{
-		User::Leave( KErrArgument );
-		}
-	return *iResultObjects[ aResultsRef ];
-	}
-
-TPtrC8 CTestDmCallback::GetResultsTypeL( TInt aResultsRef )
-	{
-	if (aResultsRef < 0 || aResultsRef >= iResultTypes.Count() )
-		{
-		User::Leave( KErrArgument );
-		}
-	return iResultTypes[aResultsRef];
-	}
-
-MSmlDmAdapter::TError CTestDmCallback::GetStatusL( TInt aStatusRef )
-	{
-	if (aStatusRef < 0 || aStatusRef >= iStatusArray.Count() )
-		{
-		User::Leave( KErrArgument );
-		}
-	return (MSmlDmAdapter::TError ) iStatusArray[aStatusRef];
-	}
-
-void CTestDmCallback::FreeResultsRefsL( )
-	{
-	iResultObjects.ResetAndDestroy();
-	iResultTypes.Reset();
-	}
-	
-void CTestDmCallback::FreeStatusRefsL( )
-	{
-	iStatusArray.Reset();
-	}
-
-
-/*
-// ========================== OTHER EXPORTED FUNCTIONS =========================
-
-// -----------------------------------------------------------------------------
-// ?function_name implements...
-// ?implementation_description.
-// Returns: ?value_1: ?description
-//          ?value_n: ?description
-//                    ?description
-// -----------------------------------------------------------------------------
-//
-?type  ?function_name(
-    ?arg_type arg,  // ?description
-    ?arg_type arg )  // ?description
-    {
-
-    ?code
-
-    }
-*/
-//  End of File  
--- a/customization/tsrc/tarmcustomization/src/TestDmDDFObject.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,512 +0,0 @@
-/*
-* Copyright (c) 2002-2004 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: Implementation of customization components
-*
-*/
-
-
-
-// INCLUDE FILES
-
-#include "TestDmDDFObject.h"
-#include "StifLogger.h"
-
-// EXTERNAL DATA STRUCTURES
-//extern  ?external_data;
-
-// EXTERNAL FUNCTION PROTOTYPES  
-//extern ?external_function( ?arg_type,?arg_type );
-
-// CONSTANTS
-//const ?type ?constant_var = ?constant;
-
-// MACROS
-//#define ?macro ?macro_def
-
-// LOCAL CONSTANTS AND MACROS
-//const ?type ?constant_var = ?constant;
-//#define ?macro_name ?macro_def
-
-// MODULE DATA STRUCTURES
-//enum ?declaration
-//typedef ?declaration
-
-// LOCAL FUNCTION PROTOTYPES
-//?type ?function_name( ?arg_type, ?arg_type );
-
-// FORWARD DECLARATIONS
-//class ?FORWARD_CLASSNAME;
-
-// ============================= LOCAL FUNCTIONS ===============================
-
-
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CTestDmDDFObject::CTestDmDDFObject
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CTestDmDDFObject::CTestDmDDFObject( CStifLogger *aLog )
-	: iName( 0 )
-	, iAccessTypes()
-	, iDefaultValue( 0 )
-	, iDescription( 0 )
-	, iFormat( (TDFFormat)0 )
-	, iOccurence( (TOccurence)0 )
-	, iScope( (TScope)0 )
-	, iTitle ( 0 )
-	, iMimeType( 0 )
-	, iObjectGroup( EFalse )
-//	RPointerArray<CTestDmDDFObject> iChildren;
-	,  iLog( aLog )
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// CTestDmDDFObject::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CTestDmDDFObject::ConstructL()
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// CTestDmDDFObject::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CTestDmDDFObject* CTestDmDDFObject::NewL( CStifLogger *aLog )
-    {
-    CTestDmDDFObject* self = CTestDmDDFObject::NewLC( aLog );
-    CleanupStack::Pop( self );
-
-    return self;
-    }
-
-CTestDmDDFObject* CTestDmDDFObject::NewLC( CStifLogger *aLog )
-    {
-    CTestDmDDFObject* self = new( ELeave ) CTestDmDDFObject( aLog );
-    
-    CleanupStack::PushL( self );
-    self->ConstructL();
-
-    return self;
-    }
-
-    
-// Destructor
-CTestDmDDFObject::~CTestDmDDFObject()
-    {
-	delete iName;
-	delete iDefaultValue;
-	delete iDescription;
-	delete iTitle;
-	delete iMimeType;
-	iChildren.ResetAndDestroy();
-    }
-
-
-// -----------------------------------------------------------------------------
-// CTestDmDDFObject::?member_function
-// ?implementation_description
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-/*?type CTestDmDDFObject::?member_function(
-    ?arg_type arg,
-    ?arg_type arg )
-    {
-    
-    ?code
-    
-    }
-*/
-
-void CTestDmDDFObject::SetAccessTypesL( TSmlDmAccessTypes aAccessTypes )
-	{
-	iLog->Log( _L8( "SetAccessTypesL, aAccessTypes=%d" ), aAccessTypes.GetACL() );
-	iAccessTypes = aAccessTypes;
-	}
-
-void CTestDmDDFObject::SetDefaultValueL( const TDesC8& aDefaultValue )
-	{
-	iLog->Log( _L8( "SetDefaultValueL, aDefaultValue='%S'" ), &aDefaultValue );
-	delete iDefaultValue;
-	iDefaultValue = 0;
-	iDefaultValue = aDefaultValue.AllocL();
-	}
-
-void CTestDmDDFObject::SetDescriptionL( const TDesC8& aDescription )
-	{
-	iLog->Log( _L8( "SetDescriptionL, aDescription='%S'" ), &aDescription );
-	delete iDescription;
-	iDescription = 0;
-	iDescription = aDescription.AllocL();
-	}
-	
-void CTestDmDDFObject::SetDFFormatL( TDFFormat aFormat )
-	{
-	iLog->Log( _L8( "SetDFFormatL, aFormat=%d" ), aFormat );
-	iFormat = aFormat;
-	}
-	
-void CTestDmDDFObject::SetOccurenceL( TOccurence aOccurence )
-	{
-	iLog->Log( _L8( "SetOccurenceL, aOccurence=%d" ), aOccurence );
-	iOccurence = aOccurence;
-	}
-	
-void CTestDmDDFObject::SetScopeL( TScope aScope )
-	{
-	iLog->Log( _L8( "SetScopeL, aScope=%d" ), aScope );
-	iScope = aScope;
-	}
-	
-void CTestDmDDFObject::SetDFTitleL( const TDesC8& aTitle )
-	{
-	iLog->Log( _L8( "SetDFTitleL, aTitle='%S'" ), &aTitle );
-	delete iTitle;
-	iTitle = 0;
-	iTitle = aTitle.AllocL();
-	}
-	
-void CTestDmDDFObject::AddDFTypeMimeTypeL( const TDesC8& aMimeType )
-	{
-	iLog->Log( _L8( "AddDFTypeMimeTypeL, aMimeType='%S'" ), &aMimeType );
-	delete iMimeType;
-	iMimeType = 0;
-	iMimeType = aMimeType.AllocL();
-	}
-	
-void CTestDmDDFObject::SetAsObjectGroup()
-	{
-	iLog->Log( _L8( "SetAsObjectGroup, true" ) );
-	iObjectGroup = ETrue;
-	}
-	
-MSmlDmDDFObject& CTestDmDDFObject::AddChildObjectL(const TDesC8& aNodeName)
-	{
-	iLog->Log( _L8( "AddChildObjectL, aNodeName='%S'" ), &aNodeName );
-	CTestDmDDFObject* child = CTestDmDDFObject::NewLC( iLog ); //, aNodeName );
-	child->SetNameL( aNodeName );
-	iChildren.AppendL( child );
-	CleanupStack::Pop( child ); // Don't destroy
-	return *child;
-	}
-
-MSmlDmDDFObject& CTestDmDDFObject::AddChildObjectGroupL()
-	{
-	iLog->Log( _L8( "AddChildObjectGroupL, ''" ) );
-	CTestDmDDFObject* child = CTestDmDDFObject::NewLC( iLog ); //, KNullDesC );
-	child->SetAsObjectGroup();
-	iChildren.AppendL( child );
-	CleanupStack::Pop( child ); // Don't destroy
-	return *child;
-	}
-
-// Own functions
-
-void CTestDmDDFObject::SetNameL( const TDesC8& aName )
-	{
-	delete iName;
-	iName = 0;
-	iName = aName.AllocL();
-	}
-
-void CTestDmDDFObject::DumpL( const TDesC8& aParentName, TBool aFullDump )
-	{
-	TPtrC8 name( _L8("<X>") );
-	if (iName && iName->Length() > 0)
-		{
-		name.Set( *iName );
-		}
-
-	HBufC8* fullName = HBufC8::NewLC( aParentName.Length() + name.Length() + 1 );
-	*fullName = aParentName;
-	if (aParentName.Length() > 0 && aParentName[ aParentName.Length() - 1 ] != '/')
-		{
-		fullName->Des().Append( _L8("/"));
-		}
-	fullName->Des().Append( name );
-
-	/* Translate some members to text for dumping */
-	TBuf8<20> strAccessTypes;
-	TUint8 accessTypes = iAccessTypes.GetACL();
-	if ((accessTypes & iAccessTypes.EAccessType_Add) != 0)
-		{
-		strAccessTypes.Append( _L8("A") );
-		}
-	if ((accessTypes & iAccessTypes.EAccessType_Copy) != 0)
-		{
-		strAccessTypes.Append( _L8("C") );
-		}
-	if ((accessTypes & iAccessTypes.EAccessType_Delete) != 0)
-		{
-		strAccessTypes.Append( _L8("D") );
-		}
-	if ((accessTypes & iAccessTypes.EAccessType_Exec) != 0)
-		{
-		strAccessTypes.Append( _L8("E") );
-		}
-	if ((accessTypes & iAccessTypes.EAccessType_Get) != 0)
-		{
-		strAccessTypes.Append( _L8("G") );
-		}
-	if ((accessTypes & iAccessTypes.EAccessType_Replace) != 0)
-		{
-		strAccessTypes.Append( _L8("R") );
-		}
-	
-	TBuf8<20> strFormat;
-	switch( iFormat )
-		{
-	case EB64:
-		strFormat = _L8("Base64");
-		break;
-	case EBool:
-		strFormat = _L8("Bool");
-		break;
-	case EChr:
-		strFormat = _L8("Chr");
-		break;
-	case EInt:
-		strFormat = _L8("Int");
-		break;
-	case ENode:
-		strFormat = _L8("Node");
-		break;
-	case ENull:
-		strFormat = _L8("Null");
-		break;
-	case EXml:
-		strFormat = _L8("Xml");
-		break;
-	case EBin:
-		strFormat = _L8("Bin");
-		break;
-	default:
-		break;
-		}
-
-
-	TBuf8<20> strOccurence;
-	switch( iOccurence )
-		{
-	case EOne:
-		/** The node appears exactly once */
-		strOccurence = _L8("M:1");
-		break;
-	case EZeroOrOne:
-		/** The node is optional and may appear zero or once */
-		strOccurence = _L8("O:0-1");
-		break;
-	case EZeroOrMore:
-		/** The node is optional and may appear zero or more times */
-		strOccurence = _L8("O:0-*");
-		break;
-	case EOneOrMore:
-		/** The node is mandatory and may appear once or more times */
-		strOccurence = _L8("M:1-*");
-		break;
-	case EZeroOrN:
-		/** The node is optional and may appear between once and 'N' times */
-		strOccurence = _L8("O:1-N");
-		break;
-	case EOneOrN:
-		/** The node is mandatory and may appear between once and 'N' times */
-		strOccurence = _L8("M:1-N");
-		break;
-	default:
-		break;
-		}
-	
-	
-	TBuf8<20> strScope;
-	switch( iScope)
-		{
-	case EPermanent:
-		/** The node appears exactly once */
-		strScope = _L8("Permanent");
-		break;
-	case EDynamic:
-		/** The node is optional and may appear zero or once */
-		strScope = _L8("O:Dynamic");
-		break;
-	default:
-		break;
-		}
-
-	
-	/* Dump main data */
-	if (aFullDump)
-		{
-		iLog->Log( _L8( "DDFObject: '%S'" ), fullName );
-		}
-		else
-		{
-		iLog->Log( _L8( "DDFObject: '%S'   (%S), %S, %S, %S" ),
-					fullName, &strAccessTypes, &strFormat, &strOccurence, &strScope );
-		}
-	
-	/* Dump members */
-	if (aFullDump)
-		{
-		TPtrC8 empty( _L8( "<null>" ) );
-		#define CHK_NULL(a) ((a)==0?(TDesC8*)(&empty):(TDesC8*)(a))
-
-		iLog->Log( _L8( "    iName=='%S'" ), iName );
-		iLog->Log( _L8( "    iAccessTypes=%d (%S)" ), iAccessTypes.GetACL(), &strAccessTypes );
-		iLog->Log( _L8( "    iDefaultValue='%S'" ), CHK_NULL(iDefaultValue));
-		iLog->Log( _L8( "    iDescription='%S'" ), CHK_NULL(iDescription ));
-		iLog->Log( _L8( "    iFormat=%d (%S)" ), iFormat, &strFormat );
-		iLog->Log( _L8( "    iOccurence=%d (%S)" ), iOccurence, &strOccurence );
-		iLog->Log( _L8( "    iScope=%d (%S)" ), iScope, &strScope );
-		iLog->Log( _L8( "    iTitle='%S'" ), CHK_NULL(iTitle ));
-		iLog->Log( _L8( "    iMimeType='%S'" ), CHK_NULL(iMimeType ));
-		iLog->Log( _L8( "----------------------------------" ) );
-		}
-	
-	/* Dump children */
-	for (TInt i = 0 ; i < iChildren.Count() ; i++)
-		{
-		iChildren[i]->DumpL( *fullName, aFullDump );
-		}
-
-	CleanupStack::PopAndDestroy( fullName );
-	}
-
-/*
-void CTestDmDDFObject::ExternalizeL(RWriteStream& aStream) const
-	{
-	X;
-	aStream << *iName << eol;
-	}
-*/
-
-const TDesC8& CTestDmDDFObject::Name()
-	{
-	return (iName != 0) ? *iName : KNullDesC8();
-	}
-
-TSmlDmAccessTypes  CTestDmDDFObject::AccessTypes()
-	{
-	return iAccessTypes;
-	}
-
-const TDesC8& CTestDmDDFObject::DefaultValue()
-	{
-	return (iDefaultValue != 0) ? *iDefaultValue : KNullDesC8();
-	}
-
-const TDesC8& CTestDmDDFObject::Description()
-	{
-	return (iDescription != 0) ? *iDescription : KNullDesC8();
-	}
-
-CTestDmDDFObject::TDFFormat CTestDmDDFObject::DFFormat()
-	{
-	return iFormat;
-	}
-
-CTestDmDDFObject::TOccurence CTestDmDDFObject::Occurence()
-	{
-	return iOccurence;
-	}
-
-CTestDmDDFObject::TScope CTestDmDDFObject::Scope()
-	{
-	return iScope;
-	}
-
-const TDesC8& CTestDmDDFObject::DFTitle()
-	{
-	return (iTitle != 0) ? *iTitle : KNullDesC8();
-	}
-
-const TDesC8& CTestDmDDFObject::DFTypeMimeType()
-	{
-	return (iMimeType != 0) ? *iMimeType : KNullDesC8();
-	}
-
-TBool CTestDmDDFObject::ObjectGroup()
-	{
-	return iObjectGroup;
-	}
-
-TInt CTestDmDDFObject::ChildObjectCount()
-	{
-	return iChildren.Count();
-	}
-
-CTestDmDDFObject& CTestDmDDFObject::ChildObject( TInt aIndex )
-	{
-	return *iChildren[aIndex];
-	}
-
-CTestDmDDFObject* CTestDmDDFObject::FindChildObject( const TDesC8& aName )
-	{
-	CTestDmDDFObject* foundObject = 0;
-
-	for (TInt i = 0 ; i < iChildren.Count() ; i++)
-		{
-		if ( aName.CompareC( iChildren[i]->Name() ) == 0 )
-			{
-			foundObject = iChildren[i];
-			break;
-			}
-		}
-
-	return foundObject;
-	}
-
-TInt CTestDmDDFObject::SubObjectsCount()
-	{
-	TInt count = 0;
-
-	TInt i;
-	for (i = 0 ; i < iChildren.Count() ; i++)
-		{
-		count += iChildren[i]->SubObjectsCount();
-		}
-	count += i;
-
-	return count;
-	}
-
-/*
-// ========================== OTHER EXPORTED FUNCTIONS =========================
-
-// -----------------------------------------------------------------------------
-// ?function_name implements...
-// ?implementation_description.
-// Returns: ?value_1: ?description
-//          ?value_n: ?description
-//                    ?description
-// -----------------------------------------------------------------------------
-//
-?type  ?function_name(
-    ?arg_type arg,  // ?description
-    ?arg_type arg )  // ?description
-    {
-
-    ?code
-
-    }
-*/
-//  End of File  
--- a/customization/tsrc/tarmcustomization/src/TestParams.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1157 +0,0 @@
-/*
-* Copyright (c) 2002-2004 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: Implementation of customization components
-*
-*/
-
-
-
-// INCLUDE FILES
-
-#include "TestParams.h"
-
-//#include <e32svr.h>
-
-#include <StifLogger.h>
-#include <StifItemParser.h>
-//#include <Stiftestinterface.h>
-
-//#include "ThemesTest.h"
-#include "TestDmCallback.h"
-#include "TestDmDDFObject.h"
-#include "FileCoderB64.h"
-
-#include "nsmldmuri.h"
-
-
-// EXTERNAL DATA STRUCTURES
-//extern  ?external_data;
-
-// EXTERNAL FUNCTION PROTOTYPES  
-//extern ?external_function( ?arg_type,?arg_type );
-
-// CONSTANTS
-//const ?type ?constant_var = ?constant;
-
-// MACROS
-//#define ?macro ?macro_def
-
-// LOCAL CONSTANTS AND MACROS
-//const ?type ?constant_var = ?constant;
-//#define ?macro_name ?macro_def
-
-// MODULE DATA STRUCTURES
-//enum ?declaration
-//typedef ?declaration
-
-// LOCAL FUNCTION PROTOTYPES
-//?type ?function_name( ?arg_type, ?arg_type );
-
-// FORWARD DECLARATIONS
-//class ?FORWARD_CLASSNAME;
-
-// ============================= LOCAL FUNCTIONS ===============================
-
-
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CTestParams::CTestParams
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CTestParams::CTestParams( CStifLogger *aLog )
-	: iLog( aLog )
-//	, iStr( 0 )
-	, iUri( 0 )
-	, iData( 0 )
-	, iDataType( 0 )
-	, iOutputFile( 0 )
-	, iExpectedStatus( -1 )
-	, iExpectedData( 0 )
-	, iExpectedType( 0 )
-	, iStatusRef( -1 )
-	, iResultsRef( -1 )
-	{
-	/**/
-	}
-
-// -----------------------------------------------------------------------------
-// CTestParams::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CTestParams::ConstructL( CStifItemParser& aItem )
-	{
-	// Parse parameters
-	TPtrC str;
-    TInt ret = aItem.Remainder( str );
-
-	TBuf8<200> buf;
-	buf.Copy( str )    ;
-
-	iLog->Log( _L("CmdParams: '%S'"), &str );
-
-
-//	TInt i = 0;	
-//	while (aItem.GetNextString( str ) == KErrNone )	
-//		{
-//		iLog->Log( _L("Par[%d]: '%S'"), i, &str );
-//		}
-
-//	iLog->Log( _L("Version is")) ;
-//	iLog->Log( version->Ptr(0) ) ;
-//	
-//			iLog->Log( _L("Add Test Adding Policy data failed! %d" ), iStatus );	
-
-	TTestParamVar var( buf );
-	while (var.Next())
-		{
-		TPtrC8 key = var.Name();
-		TPtrC8 value = var.Value();
-		TBool exist = var.ValueExist();
-		iLog->Log(_L8("key: '%S', value: '%S', exist: %d"), &key, &value, exist);
-
-/*
-		Syntax:
-		-------
-		
-		URI=
-
-		File=
-		Text=
-
-		IT= Input (text)
-		IF= Input File (filename)
-		OF= Output File
-
-		ET= Expected result (text)
-		EF= Expected file (filename)
-
-*/
-		_LIT8( KURI,			"URI" ); // = value
-
-		_LIT8( KText,			"Text" ); // = "Text input"
-		_LIT8( KFile,			"File" ); // = Filename (and path)
-		_LIT8( KType,			"Type" ); // = MimeType (of data)
-
-		_LIT8( KInputText,		"IT" ); // = "Input Text"
-		_LIT8( KInputFile,		"IF" ); // = InputFileName (and path)
-		_LIT8( KInputFile2,		"IF2" ); // = InputFileName (and path)
-		_LIT8( KInputType,		"IM" ); // = Input MimeType (of data)
-		_LIT8( KOutputFile,		"OF" ); // = OutputFileName (and path) (where result data is saved)
-
-		_LIT8( KExpectedStatus,	"ES" ); // = <Expected Status Code>
-		_LIT8( KExpectedText,	"ET" ); // = "Expected Result Text"
-		_LIT8( KExpectedFile,	"EF" ); // = ExpectedResultFile (and path)
-		_LIT8( KExpectedFile2,	"EF2" ); // = ExpectedResultFile (and path)
-		_LIT8( KExpectedType,	"EM" ); // = Expected MimeType (of return data)
-
-//	, iUri( 0 )
-//	, iData( 0 )
-//	, iDataType( 0 )
-
-		if ( key.CompareF( KURI ) == 0 )
-			{
-			if (iUri == 0)
-				{
-				delete iUri;
-				iUri = 0;
-				iUri = value.AllocL();
-				}
-			else
-				{
-				iLog->Log(_L8("Warning: URI already given, not resetting to: '%S'"), &value );
-				}
-			}
-		else if ( key.CompareF( KInputText ) == 0 || key.CompareF( KText ) == 0 )
-			{
-			delete iData;
-			iData = 0;
-			iData = value.AllocL();
-			}
-		else if ( key.CompareF( KInputFile ) == 0 || key.CompareF( KFile ) == 0 )
-			{
-			delete iData;
-			iData = 0;
-
-			TFileCoderB64 coder;
-			User::LeaveIfError( coder.EncodeL( value, iData ) );
-			}
-		else if ( key.CompareF( KInputFile2) == 0 )
-			{
-			delete iData;
-			iData = 0;
-
-            RFs fs; fs.Connect();
-            TFileName fn; fn.Copy(value);
-            RFile f; f.Open(fs, fn, EFileShareExclusive|EFileRead);
-
-            TInt size; f.Size( size );
-            iData = HBufC8::NewL( size );
-            TPtr8 ptr( iData->Des() );
-            f.Read( ptr );
-
-			f.Close();
-			fs.Close();
-			}
-		else if ( key.CompareF( KInputType ) == 0 || key.CompareF( KType ) == 0 )
-			{
-			delete iDataType;
-			iDataType = 0;
-			iDataType = value.AllocL();
-			}
-		else if (key.CompareF( KOutputFile ) == 0 )
-			{
-			delete iOutputFile;
-			iOutputFile = 0;
-			iOutputFile = value.AllocL();
-			}
-		else if (key.CompareF( KExpectedStatus ) == 0 )
-			{
-			TLex8 lex( value );
-			User::LeaveIfError( lex.Val( iExpectedStatus ) );
-			}
-		else if (key.CompareF( KExpectedText ) == 0 )
-			{
-			delete iExpectedData;
-			iExpectedData = 0;
-			iExpectedData = value.AllocL();
-			}
-		else if (key.CompareF( KExpectedFile ) == 0 )
-			{
-			delete iExpectedData;
-			iExpectedData = 0;
-
-			TFileCoderB64 coder;
-			User::LeaveIfError( coder.EncodeL( value, iExpectedData ) );
-			}
-		else if (key.CompareF( KExpectedFile2 ) == 0 )
-			{
-			delete iExpectedData;
-			iExpectedData = 0;
-
-            RFs fs; fs.Connect();
-            TFileName fn; fn.Copy(value);
-            RFile f; f.Open(fs, fn, EFileShareExclusive|EFileRead);
-            
-            TInt size; f.Size( size );
-            iExpectedData = HBufC8::NewL( size );
-            TPtr8 ptr( iExpectedData->Des() );
-            f.Read( ptr );
-            
-			f.Close();
-			fs.Close();
-			}
-		else if (key.CompareF( KExpectedType ) == 0 )
-			{
-			delete iExpectedType;
-			iExpectedType = 0;
-			iExpectedType = value.AllocL();
-			}
-		else
-			{
-			// Unknown parameter
-			iLog->Log(_L8("Warning: Unknown parameter: key: '%S', value: '%S', exist: %d"), &key, &value, exist);
-			}
-			
-		}
-	// Cleanup
-	}
-
-
-// -----------------------------------------------------------------------------
-// CTestParams::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CTestParams* CTestParams::NewL( CStifLogger *aLog, CStifItemParser& aItem )
-	{
-    CTestParams* self = NewLC( aLog, aItem );
-    CleanupStack::Pop( self );
-
-    return self;
-	}
-CTestParams* CTestParams::NewLC( CStifLogger *aLog, CStifItemParser& aItem )
-	{
-    CTestParams* self = new (ELeave) CTestParams( aLog );
-
-    CleanupStack::PushL( self );
-    self->ConstructL( aItem );
-
-    return self;
-	}
-
-    
-// Destructor
-CTestParams::~CTestParams()
-	{
-	/**/
-	delete iUri;
-	delete iData;
-	delete iDataType;
-	delete iOutputFile;
-	delete iExpectedData;
-	delete iExpectedType;
-	}
-
-
-// -----------------------------------------------------------------------------
-// CTestParams::?member_function
-// ?implementation_description
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-/*?type CTestParams::?member_function(
-    ?arg_type arg,
-    ?arg_type arg )
-    {
-    
-    ?code
-    
-    }
-*/
-
-
-
-
-
-/*
-void CTestParams::SetL( CStifItemParser& aItem )
-	{
-//	iString = aItem.
-	TPtrC str;
-    TInt ret = aItem.Remainder( str );
-	}
-*/
-const TDesC8& CTestParams::Uri()
-	{
-	if (iUri != 0)
-		{
-		return *iUri;
-		}
-	else
-		{
-		return KNullDesC8;
-		}
-	}
-const TDesC8& CTestParams::Data()
-	{
-	if (iData != 0)
-		{
-		return *iData;
-		}
-	else
-		{
-		return KNullDesC8;
-		}
-	}
-const TDesC8& CTestParams::DataType()
-	{
-	if (iDataType != 0)
-		{
-		return *iDataType;
-		}
-	else
-		{
-		return KNullDesC8;
-		}
-	}
-//sf-void CTestParams::SetCallback( CTestDmCallback* aCallback )
-//sf-	{
-//sf-	iCallback = aCallback;
-//sf-	}
-void CTestParams::SetResultsRef( TInt aResultsRef )
-	{
-	iResultsRef = aResultsRef;
-	}
-void CTestParams::SetStatusRef( TInt aStatusRef )
-	{
-	iStatusRef = aStatusRef;
-	}
-
-
-//sf-TInt CTestParams::CheckStatusL( MSmlDmAdapter::TError aStatus )
-TInt CTestParams::CheckStatusL( TInt aStatus )
-	{
-	TInt ret = KErrNone;
-	
-	if (iExpectedStatus >= 0 && iExpectedStatus != aStatus)
-		{
-		iLog->Log( _L8("Error: CTestParams::CheckStatusL: expected=%d, status=%d"), iExpectedStatus, aStatus );
-		ret = KErrGeneral;
-		}
-
-	return ret;
-	}
-
-TInt CTestParams::CheckDataL( CBufFlat& aObject )
-	{
-	TPtrC8 ptr = aObject.Ptr(0);
-	TInt ret = CheckDataL( ptr );
-	return ret;
-/*
-	TInt ret = KErrNone;
-
-	if (iExpectedData)
-		{
-		TPtrC8 ptr = aObject.Ptr(0);
-		if (iExpectedData->Compare( ptr ) != 0)
-			{
-			iLog->Log( _L8("Error: CTestParams::CheckDataL") );
-			ret = KErrGeneral;
-			}
-		}
-
-	return ret;
-*/
-	}
-
-TInt CTestParams::CheckDataL( const TDesC8& aObject )
-	{
-	TInt ret = KErrNone;
-
-	if (iExpectedData)
-		{
-		TInt len1 = iExpectedData->Length();
-		TInt len2 = aObject.Length();
-		if (iExpectedData->Compare( aObject ) != 0)
-			{
-			TPtrC8 expt = iExpectedData->Left( 80 );
-			TPtrC8 real = aObject.Left( 80 );
-//sf-			iLog->Log( _L8("Error: CTestParams::CheckDataL") );
-			iLog->Log( _L8("Error: CTestParams::CheckDataL: expected='%S', real='%S'"), &expt, &real );
-			ret = KErrGeneral;
-			}
-		}
-
-	return ret;
-	}
-
-TInt CTestParams::CheckTypeL( const TDesC8 &aType )
-	{
-	TInt ret = KErrNone;
-
-	if (iExpectedType)
-		{
-		if (iExpectedType->CompareF( aType ) != 0)
-			{
-			iLog->Log( _L8("Error: CTestParams::CheckTypeL: exp='%S', typ='%S'"), iExpectedType, &aType );
-			ret = KErrGeneral;
-			}
-		}
-
-	return ret;
-	}
-
-TInt CTestParams::CheckL( CTestDmCallback* aCallback )
-	{
-	TInt ret = KErrNone;
-//	MSmlDmAdapter::TError status = EOk;
-//		const CBufBase& GetResultsObjectL( TInt aResultsRef );
-//		const TDesC8& GetResultsTypeL( TInt aResultsRef );
-
-	if (iStatusRef >= 0)
-		{
-		MSmlDmAdapter::TError status = aCallback->GetStatusL( iStatusRef );
-		TInt ret1 = CheckStatusL( status );
-
-		ret = (ret != KErrNone) ? ret : ret1;
-		}
-	else
-		{
-//		iLog->"Error: StatusRef not set"
-		}
-
-	if (iResultsRef >= 0)
-		{
-		const CBufBase& tmpObject = aCallback->GetResultsObjectL( iResultsRef );
-		TInt ret1 = CheckDataL( *(CBufFlat*) &tmpObject );
-
-		TPtrC8 tmpType = aCallback->GetResultsTypeL( iResultsRef );
-		TInt ret2 = CheckTypeL( tmpType );
-
-		// choose first error code
-		ret = (ret != KErrNone) ? ret : ret1;
-		ret = (ret != KErrNone) ? ret : ret2;
-		}
-	else
-		{
-//		iLog->"Note: ResultsRef not set"
-		}
-
-	return ret;
-	}
-	
-TInt CTestParams::CheckStatusRefL( TInt aStatusRef )
-	{
-	TInt ret = KErrNone;
-
-	if (iExpectedStatus)
-		{
-		
-		}
-
-	return ret;
-	}
-TInt CTestParams::CheckResultsRefL( TInt aResultsRef )
-	{
-	TInt ret = KErrNone;
-
-	if (iExpectedStatus)
-		{
-		
-		}
-
-	return ret;
-	}
-
-
-//******************************************************************************
-//
-//
-//
-//******************************************************************************
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CDDFTestParams::CDDFTestParams
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CDDFTestParams::CDDFTestParams( CStifLogger *aLog )
-	: iLog( aLog )
-	, iUri( 0 )
-
-//	, iAccessTypes
-	, iDefaultValue( 0 )
-	, iDescription( 0 )
-//	, iFormat( 0 )
-//	, iOccurence( 0 )
-//	, iScope( 0 )
-	, iTitle( 0 )
-	, iMimeType( 0 )
-	, iObjectGroup( 0 )
-	{
-	/**/
-	}
-
-// -----------------------------------------------------------------------------
-// CDDFTestParams::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CDDFTestParams::ConstructL( CStifItemParser& aItem )
-	{
-	// Parse parameters
-	TPtrC str;
-    TInt ret = aItem.Remainder( str );
-
-	HBufC8* ptr = HBufC8::NewLC( str.Length() );
-	ptr->Des().Copy( str );
-
-//sf-	TBuf8<400> buf;
-//sf-	buf.Copy( str )    ;
-
-	iLog->Log( _L("CmdParams: '%S'"), &str );
-
-/*
-		Syntax:
-		-------
-//same as uri		Name=
-		AccessTypes=
-		DefaultValue=
-		Description=
-		Format=
-		Occurence=
-		Scope=
-		Title=
-		MimeType=
-		ObjectGroup=
-*/
-	/* Keywords */
-	_LIT8( KURI,			"URI" ); // = uri
-	_LIT8( KAccessTypes,	"AccessTypes" ); // =
-	_LIT8( KDefaultValue,	"DefaultValue" ); // =
-	_LIT8( KDescription,	"Description" ); // =
-	_LIT8( KFormat,			"Format" ); // =
-	_LIT8( KOccurence,		"Occurence" ); // =
-	_LIT8( KScope,			"Scope" ); // =
-	_LIT8( KTitle,			"Title" ); // =
-	_LIT8( KMimeType,		"MimeType" ); // = 
-	_LIT8( KObjectGroup,	"ObjectGroup" ); // =
-
-	/* AccessTypes */
-	const TChar KAccessType_Add     = 'A';
-	const TChar KAccessType_Copy    = 'C';
-	const TChar KAccessType_Delete	= 'D';
-	const TChar KAccessType_Exec	= 'E';
-	const TChar KAccessType_Get		= 'G';
-	const TChar KAccessType_Replace = 'R';
-
-	/* Format */
-	_LIT8( KFormat_B64,		"B64" );
-	_LIT8( KFormat_Bool,	"Bool" );
-	_LIT8( KFormat_Chr,		"Chr" );
-	_LIT8( KFormat_Int,		"Int" );
-	_LIT8( KFormat_Node,	"Node" );
-	_LIT8( KFormat_Null,	"Null" );
-	_LIT8( KFormat_Xml,		"Xml" );
-	_LIT8( KFormat_Bin,		"Bin" );
-
-	/* Occurrence */
-	_LIT8( KOccurence_One,			"One" );
-	_LIT8( KOccurence_ZeroOrOne,	"ZeroOrOne" );
-	_LIT8( KOccurence_ZeroOrMore,	"ZeroOrMore" );
-	_LIT8( KOccurence_OneOrMore,	"OneOrMore" );
-	_LIT8( KOccurence_ZeroOrN,		"ZeroOrN" );
-	_LIT8( KOccurence_OneOrN,		"OneOrN" );
-
-	/* Scope */
-	_LIT8( KScope_Permanent,	"Permanent" );
-	_LIT8( KScope_Dynamic,		"Dynamic" );
-
-
-	TTestParamVar var( *ptr );
-//sf-	TTestParamVar var( buf );
-	while (var.Next())
-		{
-		TPtrC8 key = var.Name();
-		TPtrC8 value = var.Value();
-		TBool exist = var.ValueExist();
-		iLog->Log(_L8("key: '%S', value: '%S', exist: %d"), &key, &value, exist);
-
-		if ( key.CompareF( KURI ) == 0 )
-			{
-			delete iUri;
-			iUri = 0;
-			iUri = value.AllocL();
-			}
-		else if ( key.CompareF( KAccessTypes ) == 0)
-			{
-//sf-		SetAccessTypes( value );
-			for (TInt i = 0 ; i < value.Length() ; i++)
-				{
-				if ( value[i] == KAccessType_Add )
-					{
-//sf-				iAccessTypes |= TSmlDmAccessTypes::EAccessType_Add;
-					iAccessTypes.SetAdd();
-					}
-				else if ( value[i] == KAccessType_Copy )
-					{
-//sf-				iAccessTypes |= TSmlDmAccessTypes::EAccessType_Copy;
-					iAccessTypes.SetCopy();
-					}
-				else if ( value[i] == KAccessType_Delete )
-					{
-//sf-				iAccessTypes |= TSmlDmAccessTypes::EAccessType_Delete;
-					iAccessTypes.SetDelete();
-					}
-				else if ( value[i] == KAccessType_Exec )
-					{
-//sf-				iAccessTypes |= TSmlDmAccessTypes::EAccessType_Exec;
-					iAccessTypes.SetExec();
-					}
-				else if ( value[i] == KAccessType_Get )
-					{
-//sf-				iAccessTypes |= TSmlDmAccessTypes::EAccessType_Get;
-					iAccessTypes.SetGet();
-					}
-				else if ( value[i] == KAccessType_Replace )
-					{
-//sf-				iAccessTypes |= TSmlDmAccessTypes::EAccessType_Replace;
-					iAccessTypes.SetReplace();
-					}
-				else
-					{
-					iLog->Log(_L8("Warning: Unknown AccessType: '%S'"), &value );
-					}
-				}
-			}
-		else if ( key.CompareF( KDefaultValue ) == 0 )
-			{
-			delete iDefaultValue;
-			iDefaultValue = 0;
-			iDefaultValue = value.AllocL();
-			}
-		else if ( key.CompareF( KDescription ) == 0 )
-			{
-			delete iDescription;
-			iDescription = 0;
-			iDescription = value.AllocL();
-			}
-		else if ( key.CompareF( KFormat ) == 0 )
-			{
-//sf-		SetFormat( value );
-			if (value.CompareF( KFormat_B64 ) == 0 )
-				{
-				iFormat = MSmlDmDDFObject::EB64;
-				}
-			else if (value.CompareF( KFormat_Bool ) == 0 )
-				{
-				iFormat = MSmlDmDDFObject::EBool;
-				}
-			else if (value.CompareF( KFormat_Chr ) == 0 )
-				{
-				iFormat = MSmlDmDDFObject::EChr;
-				}
-			else if (value.CompareF( KFormat_Int ) == 0 )
-				{
-				iFormat = MSmlDmDDFObject::EInt;
-				}
-			else if (value.CompareF( KFormat_Node ) == 0 )
-				{
-				iFormat = MSmlDmDDFObject::ENode;
-				}
-			else if (value.CompareF( KFormat_Null ) == 0 )
-				{
-				iFormat = MSmlDmDDFObject::ENull;
-				}
-			else if (value.CompareF( KFormat_Xml ) == 0 )
-				{
-				iFormat = MSmlDmDDFObject::EXml;
-				}
-			else if (value.CompareF( KFormat_Bin ) == 0 )
-				{
-				iFormat = MSmlDmDDFObject::EBin;
-				}
-			else
-				{
-				iLog->Log(_L8("Warning: Unknown Format: '%S'"), &value );
-				}
-			}
-		else if ( key.CompareF( KOccurence ) == 0 )
-			{
-			if (value.CompareF( KOccurence_One ) == 0 )
-				{
-				iOccurence = MSmlDmDDFObject::EOne;
-				}
-			else if (value.CompareF( KOccurence_ZeroOrOne ) == 0 )
-				{
-				iOccurence = MSmlDmDDFObject::EZeroOrOne;
-				}
-			else if (value.CompareF( KOccurence_ZeroOrMore ) == 0 )
-				{
-				iOccurence = MSmlDmDDFObject::EZeroOrMore;
-				}
-			else if (value.CompareF( KOccurence_OneOrMore ) == 0 )
-				{
-				iOccurence = MSmlDmDDFObject::EOneOrMore;
-				}
-			else if (value.CompareF( KOccurence_ZeroOrN ) == 0 )
-				{
-				iOccurence = MSmlDmDDFObject::EZeroOrN;
-				}
-			else if (value.CompareF( KOccurence_OneOrN ) == 0 )
-				{
-				iOccurence = MSmlDmDDFObject::EOneOrN;
-				}
-			else
-				{
-				iLog->Log(_L8("Warning: Unknown Occurrence: '%S'"), &value );
-				}
-			}
-		else if ( key.CompareF( KScope ) == 0 )
-			{
-			if (value.CompareF( KScope_Permanent ) == 0 )
-				{
-				iScope = MSmlDmDDFObject::EPermanent;
-				}
-			else if (value.CompareF( KScope_Dynamic ) == 0 )
-				{
-				iScope = MSmlDmDDFObject::EDynamic;
-				}
-			else
-				{
-				iLog->Log(_L8("Warning: Unknown Scope: '%S'"), &value );
-				}
-			}
-		else if ( key.CompareF( KTitle ) == 0 )
-			{
-			delete iTitle;
-			iTitle = 0;
-			iTitle = value.AllocL();
-			}
-		else if ( key.CompareF( KMimeType ) == 0 )
-			{
-			delete iMimeType;
-			iMimeType = 0;
-			iMimeType = value.AllocL();
-			}
-		else if ( key.CompareF( KObjectGroup ) == 0 )
-			{
-			TLex8 lex( value );
-			lex.Val( iObjectGroup );
-			}
-		else
-			{
-			// Unknown parameter
-			iLog->Log(_L8("Warning: Unknown parameter: key: '%S', value: '%S', exist: %d"), &key, &value, exist);
-			}
-			
-		}
-		
-	// Cleanup
-	CleanupStack::PopAndDestroy( ptr );
-	}
-
-
-// -----------------------------------------------------------------------------
-// CDDFTestParams::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CDDFTestParams* CDDFTestParams::NewL( CStifLogger *aLog, CStifItemParser& aItem )
-	{
-    CDDFTestParams* self = NewLC( aLog, aItem );
-    CleanupStack::Pop( self );
-
-    return self;
-	}
-CDDFTestParams* CDDFTestParams::NewLC( CStifLogger *aLog, CStifItemParser& aItem )
-	{
-    CDDFTestParams* self = new (ELeave) CDDFTestParams( aLog );
-
-    CleanupStack::PushL( self );
-    self->ConstructL( aItem );
-
-    return self;
-	}
-
-
-// Destructor
-CDDFTestParams::~CDDFTestParams()
-	{
-	/**/
-	delete iUri;
-	delete iDefaultValue;
-	delete iDescription;
-	delete iTitle;
-	delete iMimeType;
-	}
-
-
-// -----------------------------------------------------------------------------
-// CTestParams::?member_function
-// ?implementation_description
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-/*?type CTestParams::?member_function(
-    ?arg_type arg,
-    ?arg_type arg )
-    {
-    
-    ?code
-    
-    }
-*/
-
-const TDesC8& CDDFTestParams::Uri()
-	{
-	if (iUri != 0)
-		{
-		return *iUri;
-		}
-	else
-		{
-		return KNullDesC8;
-		}
-	}
-
-TInt CDDFTestParams::CheckL( CTestDmDDFObject* aDdfRoot )
-	{
-	TInt ret = KErrNone;
-
-	// Find correct node
-	CTestDmDDFObject* curNode = aDdfRoot;
-	TInt num = NSmlDmURI::NumOfURISegs( *iUri );
-
-	for (TInt i = 0 ; i < num && curNode != 0 ; i++)
-		{
-		TPtrC8 nodeName = NSmlDmURI::URISeg( *iUri, i );
-		if ( nodeName.CompareF( _L8("<X>") ) == 0 )
-			{
-			nodeName.Set( KNullDesC8 );
-			}
-		curNode = curNode->FindChildObject( nodeName );
-		}
-
-	// Check node data
-	iLog->Log(_L8("Checking node: URI='%S'"), iUri );
-
-	if (curNode != 0)
-		{
-/*
-		if ( iUri && iUri->Compare( curNode->Uri() ) != 0 )
-			{
-			TPtrC8 expt = *iUri;
-			TPtrC8 real =  curNode->Uri();
-			iLog->Log(_L8("Error: Uri: expected='%S' real='%S'"), &expt, &real );
-			ret = KErrGeneral;
-			}
-*/
-		if ( iAccessTypes.GetACL() != curNode->AccessTypes().GetACL() )
-			{
-			TUint8 expt = iAccessTypes.GetACL();
-			TUint8 real =  curNode->AccessTypes().GetACL();
-			iLog->Log(_L8("Error: AccessTypes: expected=%d real=%d"), expt, real );
-			ret = KErrGeneral;
-			}
-		if ( iDefaultValue && iDefaultValue->Compare( curNode->DefaultValue() ) != 0 )
-			{
-			TPtrC8 expt = *iDefaultValue;
-			TPtrC8 real =  curNode->DefaultValue();
-			iLog->Log(_L8("Error: DefaultValue: expected='%S' real='%S'"), &expt, &real );
-			ret = KErrGeneral;
-			}
-		if ( iDescription && iDescription->Compare( curNode->Description() ) != 0 )
-			{
-			TPtrC8 expt = *iDescription;
-			TPtrC8 real =  curNode->Description();
-			iLog->Log(_L8("Error: DefaultValue: expected='%S' real='%S'"), &expt, &real );
-			ret = KErrGeneral;
-			}
-		if ( iFormat != curNode->DFFormat() )
-			{
-			TInt expt = iFormat;
-			TInt real =  curNode->DFFormat();
-			iLog->Log(_L8("Error: Format: expected=%d real=%d"), expt, real );
-			ret = KErrGeneral;
-			}
-		if ( iOccurence != curNode->Occurence() )
-			{
-			TInt expt = iOccurence;
-			TInt real =  curNode->Occurence();
-			iLog->Log(_L8("Error: Occurence: expected=%d real=%d"), expt, real );
-			ret = KErrGeneral;
-			}
-		if ( iScope != curNode->Scope() )
-			{
-			TInt expt = iScope;
-			TInt real =  curNode->Scope();
-			iLog->Log(_L8("Error: Scope: expected=%d real=%d"), expt, real );
-			ret = KErrGeneral;
-			}
-		if ( iTitle && iTitle->Compare( curNode->DFTitle() ) != 0 )
-			{
-			TPtrC8 expt = *iTitle;
-			TPtrC8 real =  curNode->DFTitle();
-			iLog->Log(_L8("Error: Title: expected='%S' real='%S'"), &expt, &real );
-			ret = KErrGeneral;
-			}
-		if ( iMimeType && iMimeType->Compare( curNode->DFTypeMimeType() ) != 0 )
-			{
-			TPtrC8 expt = *iMimeType;
-			TPtrC8 real =  curNode->DFTypeMimeType();
-			iLog->Log(_L8("Error: MimeType: expected='%S' real='%S'"), &expt, &real );
-			ret = KErrGeneral;
-			}
-		if ( iObjectGroup != curNode->ObjectGroup() )
-			{
-			TInt expt = iObjectGroup;
-			TInt real =  curNode->ObjectGroup();
-			iLog->Log(_L8("Error: ObjectGroup: expected=%d real=%d"), expt, real );
-			ret = KErrGeneral;
-			}
-		}
-	else
-		{
-		iLog->Log(_L8("Error: Node not found") );
-		ret = KErrGeneral;
-		}
-
-	return ret;
-	}
-
-//******************************************************************************
-//
-//
-//
-//******************************************************************************
-
-
-TTestParamVar::TTestParamVar( const TDesC8 &aStr )
-	: iLog( 0 )
-	, iLex( aStr )
-//sf-	: iStr( aStr )
-//sf-	, iPos( 0 )
-	, iName( KNullDesC8 )
-	, iValue( KNullDesC8 )
-	, iValueExist( EFalse )
-	{
-	}
-
-TBool TTestParamVar::Next()
-	{
-	TBool ok = ETrue;
-	
-	iName.Set( KNullDesC8 );
-	iValue.Set( KNullDesC8 );
-	iValueExist = EFalse;
-
-	ok = !iLex.Eos();
-
-	if (ok)
-		{
-		iName.Set( GetWord() );
-		if (iName.Length() == 0)
-			{
-			ok = EFalse;
-			}
-		}
-
-	TChar chr = GetChar();
-	if (chr == '=')
-		{
-		iValue.Set( GetWord() );
-/*
-        TInt i, j, k = iValue.Length();
-        for( i=j=0; i<k; i++,j++ )
-            {
-            if( iValue[i] == TChar('\"') && iValue[i+1] == TChar('\"') )
-                {
-                i++;
-                }
-            iValue[j] = iValue[i];
-            }
-        iValue.SetLength(j);
-        */
-/*            
-		while( iValue.Find( _L("\"\"") != KErrNotFound ) 
-		    {
-		    iValue.Replace( iValue.Find( _L("\"\""), 2, _L("\"") );
-		    }
-		    */
-		
-		iValueExist = ETrue;
-		}
-	else if (!chr.Eos())
-		{
-		UnGetChar();
-		}
-
-	if (ok && iLog)
-		{
-		iLog->Log( _L8("name: '%S', value: '%S', exist: %d"), &iName, &iValue, iValueExist );
-		}
-
-	return ok;
-	}
-
-const TDesC8& TTestParamVar::Name()
-	{
-	return iName;
-	}
-
-const TDesC8& TTestParamVar::Value()
-	{
-	return iValue;
-	}
-
-TBool TTestParamVar::ValueExist()
-	{
-	return iValueExist;
-	}
-
-TChar TTestParamVar::GetChar()
-	{
-	iLex.SkipSpace();
-	return iLex.Get();
-	}
-
-void TTestParamVar::UnGetChar()
-	{
-	iLex.UnGet();
-	}
-
-TPtrC8 TTestParamVar::GetWord()
-	{
-	TBool quoted = EFalse;
-
-	iLex.SkipSpace();
-
-	// Check if word is quoted
-	if (iLex.Peek() == '\"')
-		{
-		iLex.Get();
-		quoted = ETrue;
-		}
-
-	// Mark start position of word
-	iLex.Mark();
-
-	// Seek end of word and extract it
-	TBool ready = EFalse;
-	while (!ready && !iLex.Eos())
-		{
-		TChar chr = iLex.Get();
-
-//sf-	if (chr == '\"' || (!quoted && (chr.IsSpace() || chr == '=')))
-		if (quoted)
-			{
-			if (chr == '\"')
-				{
-				if((iLex.Eos()) || (iLex.Peek() == ' '))
-				    {
-				    iLex.UnGet();
-				    ready = ETrue;
-				    }
-				}
-			}
-		else if (chr.IsSpace() || chr == '=' || chr == '\"')
-			{
-			iLex.UnGet();
-			ready = ETrue;
-			}
-		}
-
-	// Extract word
-	TPtrC8 word = iLex.MarkedToken();
-	if (quoted)
-		{
-		iLex.Get();
-		}
-
-	// return
-	return word;
-	}
-
-
-/*
-// ========================== OTHER EXPORTED FUNCTIONS =========================
-
-// -----------------------------------------------------------------------------
-// ?function_name implements...
-// ?implementation_description.
-// Returns: ?value_1: ?description
-//          ?value_n: ?description
-//                    ?description
-// -----------------------------------------------------------------------------
-//
-?type  ?function_name(
-    ?arg_type arg,  // ?description
-    ?arg_type arg )  // ?description
-    {
-
-    ?code
-
-    }
-*/
-//  End of File  
--- a/customization/tsrc/tarmcustomization/src/ThemesTest.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,191 +0,0 @@
-/*
-* Copyright (c) 2002 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: Implementation of customization components
-*
-*/
-
-
-
-// INCLUDE FILES
-#include <Stiftestinterface.h>
-#include "ThemesTest.h"
-#include "TestDmCallback.h"
-//#include "TestDmDDFObject.h"
-//#include "FileCoderB64.h"
-#include "TestParams.h"
-
-
-// EXTERNAL DATA STRUCTURES
-//extern  ?external_data;
-
-// EXTERNAL FUNCTION PROTOTYPES  
-//extern ?external_function( ?arg_type,?arg_type );
-
-// CONSTANTS
-//const ?type ?constant_var = ?constant;
-
-// MACROS
-//#define ?macro ?macro_def
-
-// LOCAL CONSTANTS AND MACROS
-//const ?type ?constant_var = ?constant;
-//#define ?macro_name ?macro_def
-
-// MODULE DATA STRUCTURES
-//enum ?declaration
-//typedef ?declaration
-
-// LOCAL FUNCTION PROTOTYPES
-//?type ?function_name( ?arg_type, ?arg_type );
-
-// FORWARD DECLARATIONS
-//class ?FORWARD_CLASSNAME;
-
-// ============================= LOCAL FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// ?function_name ?description.
-// ?description
-// Returns: ?value_1: ?description
-//          ?value_n: ?description_line1
-//                    ?description_line2
-// -----------------------------------------------------------------------------
-//
-/*
-?type ?function_name(
-    ?arg_type arg,  // ?description
-    ?arg_type arg)  // ?description
-    {
-
-    ?code  // ?comment
-
-    // ?comment
-    ?code
-    }
-*/
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CThemesTest::CThemesTest
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CThemesTest::CThemesTest( 
-    CTestModuleIf& aTestModuleIf ):
-        CScriptBase( aTestModuleIf )
-	, iCallback( 0 )
-	, iAdapter( 0 )
-//	, iParams( )
-//	, iDDFParams( )
-        
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// CThemesTest::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CThemesTest::ConstructL()
-    {
-    iLog = CStifLogger::NewL( KThemesTestLogPath, 
-                          KThemesTestLogFile,
-                          CStifLogger::ETxt,
-                          CStifLogger::EFile,
-                          EFalse );
-
-    }
-
-// -----------------------------------------------------------------------------
-// CThemesTest::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CThemesTest* CThemesTest::NewL( 
-    CTestModuleIf& aTestModuleIf )
-    {
-    CThemesTest* self = new (ELeave) CThemesTest( aTestModuleIf );
-    
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop();
-
-    return self;
-    
-    }
-    
-// Destructor
-CThemesTest::~CThemesTest()
-    {
-	delete iAdapter;
-	delete iCallback;
-
-    REComSession::FinalClose();
-
-	iParams.ResetAndDestroy();
-	iDDFParams.ResetAndDestroy();
-
-    // Delete resources allocated from test methods
-    Delete();
-    
-    // Delete logger
-    delete iLog;  
-    
-    }
-    
-/*
-void CThemesTest::AddParamsL( XTestParams* aParams )
-	{
-	CleanupStack::PushL( aParams );
-	User::LeaveIfError( iParams.Append( aParams ) );
-	CleanupStack::Pop( aParams );
-	}
-
-TInt CThemesTest::CheckAllL( )
-	{
-	TInt ret = KErrNone;
-	
-	for (TInt i = 0 ; i < iParams.Count() ; i++)
-		{
-		TInt result = iParams[i]->CheckL();
-		if (result != KErrNone && ret == KErrNone)
-			{
-			ret = result;
-			}
-		}
-		
-	return ret;
-	}
-*/
-
-// ========================== OTHER EXPORTED FUNCTIONS =========================
-
-// -----------------------------------------------------------------------------
-// LibEntryL is a polymorphic Dll entry point.
-// Returns: CScriptBase: New CScriptBase derived object
-// -----------------------------------------------------------------------------
-//
-EXPORT_C CScriptBase* LibEntryL( 
-    CTestModuleIf& aTestModuleIf ) // Backpointer to STIF Test Framework
-    {
-    
-    return ( CScriptBase* ) CThemesTest::NewL( aTestModuleIf );
-        
-    }
-
-
-    
-//  End of File
--- a/customization/tsrc/tarmcustomization/src/ThemesTestBlocks.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1674 +0,0 @@
-/*
-* Copyright (c) 2002 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: Implementation of customization components
-*
-*/
-
-
-
-// INCLUDE FILES
-#include <e32svr.h>
-#include <StifItemParser.h>
-#include <Stiftestinterface.h>
-#include "ThemesTest.h"
-#include "TestDmCallback.h"
-#include "TestDmDDFObject.h"
-#include "FileCoderB64.h"
-#include "TestParams.h"
-#include "policyengineclient.h"
-//#include "TerminalControlClient.h"
-//#include "TerminalControl3rdPartyAPI.h"
-
-#include "nsmldmuri.h"
-//#include "rfsClient.h"
-
-#include <CentralRepository.h>
-//#include "DMUtilClient.h"
-
-#include "nsmlprivateapi.h"
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CThemesTest::Delete
-// Delete here all resources allocated and opened from test methods. 
-// Called from destructor. 
-// -----------------------------------------------------------------------------
-//
-void CThemesTest::Delete() 
-    {
-    
-    }
-    
-// -----------------------------------------------------------------------------
-// CThemesTest::RunMethodL
-// Run specified method. Contains also table of test mothods and their names.
-// -----------------------------------------------------------------------------
-//
-TInt CThemesTest::RunMethodL( 
-    CStifItemParser& aItem ) 
-    {
-   
-    static TStifFunctionInfo const KFunctions[] =
-        {  
-        // Copy this line for every implemented function.
-        // First string is the function name used in TestScripter script file.
-        // Second is the actual implementation member function. 
-        ENTRY( "Example", CThemesTest::ExampleL ),
-        ENTRY( "Seconda", CThemesTest::SecondaL ),
-        ENTRY( "Install", CThemesTest::InstallL ),
-
-        ENTRY( "LoadL",			CThemesTest::LoadL ),
-        ENTRY( "AddDDFCheckL",	CThemesTest::AddDDFCheckL ),
-
-        ENTRY( "DDFVersionL",	CThemesTest::DDFVersionL ),
-		ENTRY( "DDFStructureL",	CThemesTest::DDFStructureL ),
-
-		ENTRY( "UpdateLeafObjectL",	CThemesTest::UpdateLeafObjectL ),
-		ENTRY( "UpdateLeafObjectStreamL",	CThemesTest::UpdateLeafObjectStreamL ),
-		ENTRY( "DeleteObjectL",	CThemesTest::DeleteObjectL ),
-		ENTRY( "FetchLeafObjectL",	CThemesTest::FetchLeafObjectL ),
-		ENTRY( "FetchLeafObjectSizeL",	CThemesTest::FetchLeafObjectSizeL ),
-		ENTRY( "ChildURIListL",	CThemesTest::ChildURIListL ),
-
-		ENTRY( "AddNodeObjectL",	CThemesTest::AddNodeObjectL ),
-		ENTRY( "ExecuteCommandL",	CThemesTest::ExecuteCommandL ),
-		ENTRY( "ExecuteCommandStreamL",	CThemesTest::ExecuteCommandStreamL ),
-		ENTRY( "CopyCommandL",	CThemesTest::CopyCommandL ),
-		ENTRY( "StartAtomicL",	CThemesTest::StartAtomicL ),
-		ENTRY( "CommitAtomicL",	CThemesTest::CommitAtomicL ),
-		ENTRY( "RollbackAtomicL",	CThemesTest::RollbackAtomicL ),
-		ENTRY( "StreamingSupportL",	CThemesTest::StreamingSupportL ),
-		ENTRY( "StreamCommittedL",	CThemesTest::StreamCommittedL ),
-		ENTRY( "CompleteOutstandingCmdsL",	CThemesTest::CompleteOutstandingCmdsL ),
-      //all are related to TC module..So commented
-		/*ENTRY( "RRRun", CThemesTest::RRRunL ),
-		ENTRY( "CreateFile",	CThemesTest::CreateFileL ),
-		ENTRY( "RFSCommand",	CThemesTest::RFSCommandL ),		
-		ENTRY( "LoadPolicy",	CThemesTest::LoadPolicyL ),
-		ENTRY( "SetCertificate",	CThemesTest::SetCertificateL ),
-		ENTRY( "ConnectToPolicyServer",	CThemesTest::ConnectToPolicyServerL ),
-		ENTRY( "ConnectToDMUTIL",	CThemesTest::ConnectToDMUTILL ),
-		ENTRY( "ThirdPartyCommand",	CThemesTest::ThirdPartyCommandL), */
-        };
-
-    const TInt count = sizeof( KFunctions ) / 
-                        sizeof( TStifFunctionInfo );
-
-    return RunInternalL( KFunctions, count, aItem );
-
-    }    
-
-// -----------------------------------------------------------------------------
-// CThemesTest::ExampleL
-// Example test method function.
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-TInt CThemesTest::ExampleL( CStifItemParser& aItem )
-    {
-    
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("ThemesTest"), _L("In Example") );
-    // Print to log file
-    iLog->Log(_L("In Example"));
-
-    TInt i = 0;
-    TPtrC string;
-    while ( aItem.GetNextString ( string ) == KErrNone )
-        {
-        TestModuleIf().Printf( i, _L("ThemesTest"), 
-                                _L("Param[%i]: %S"), i, &string );
-        i++;
-        }
-
-    return KErrNone;
-    
-    }
-
-// -----------------------------------------------------------------------------
-// CThemesTest::SecondaL
-// Seconda test method function.
-// -----------------------------------------------------------------------------
-//
-TInt CThemesTest::SecondaL( CStifItemParser& aItem )
-    {
-    
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("ThemesTest"), _L("In Seconda") );
-    // Print to log file
-    iLog->Log(_L("In Seconda"));
-
-    TInt i = 0;
-    TPtrC string;
-    while ( aItem.GetNextString ( string ) == KErrNone )
-        {
-        TestModuleIf().Printf( i, _L("ThemesTest"), 
-                                _L("Param[%i]: %S"), i, &string );
-        i++;
-        }
-        
-        
-	// Here it starts
-	
-	const TUint KThemesAdapterImplUid = 0x0FDDEF05;
-
-	TUid iuid = 
-		{
-		KThemesAdapterImplUid
-		};
-		
-/*	Cpmatest *cb = Cpmatest::NewL( iLog );
-	CleanupStack::PushL( cb );	// 1
-*/	
-	//CSmlDmAdapter *adapter = CSmlDmAdapter::NewL( implInfo->ImplementationUid(), *this );
-//	CSmlDmAdapter *adapter = CSmlDmAdapter::NewL( iuid, *this );
-	CTestDmCallback *callback = CTestDmCallback::NewL( iLog );
-	CleanupStack::PushL( callback );
-	
-	CSmlDmAdapter *adapter = CSmlDmAdapter::NewL( iuid, *callback );
-	CleanupStack::PushL( adapter );
-	
-	CBufBase* version = CBufFlat::NewL( 16 );
-	CleanupStack::PushL( version );
-
-	adapter->DDFVersionL( *version );
-	iLog->Log( _L("Version is")) ;
-	iLog->Log( version->Ptr(0) ) ;
-
-
-	CTestDmDDFObject* ddfRoot = CTestDmDDFObject::NewLC( iLog ); //, aNodeName );
-	ddfRoot->SetNameL( _L8( "/" ) );
-
-	adapter->DDFStructureL( *ddfRoot );
-	
-	ddfRoot->DumpL( _L8(""), EFalse );
-	
-	ddfRoot->DumpL( _L8("") );
-	
-	CleanupStack::PopAndDestroy( ddfRoot );
-	ddfRoot = 0;
-	CleanupStack::PopAndDestroy( version );
-	version = 0;
-
-	CleanupStack::PopAndDestroy( adapter );
-	adapter = 0;
-	
-	CleanupStack::PopAndDestroy( callback );
-	callback = 0;
-
-	
-/*
-MSmlDmDDFObject& CTestDmDDFObject::AddChildObjectGroupL()
-	{
-	iLog->Log( _L( "AddChildObjectGroupL, ''" ) );
-	CTestDmDDFObject* child = CTestDmDDFObject::NewLC( iLog ); //, KNullDesC );
-	child->SetAsObjectGroup();
-	iChildren.AppendL( child );
-	CleanupStack::Pop( child ); // Don't destroy
-	return *child;
-	}
-*/
-
-/*
-	HBufC8 *addnodename = HBufC8::NewLC( nodename.Length() + 1 + KPolicyNode().Length() ) ;
-	addnodename->Des().Copy( KPolicyNode );
-	addnodename->Des().Append( nodename ) ;
-	adapter->AddNodeObjectL( *addnodename, KNullDesC8, 2);
-	if ( iStatus == MSmlDmAdapter::EOk )
-		{
-		
-		RFs fs ;
-		LEAVE_IF_ERROR( fs.Connect(), _L( "Could not connect fileserver: %d"  ) );
-		
-		CleanupClosePushL( fs );
-		RFile file ;
-		LEAVE_IF_ERROR( file.Open(fs,datafile,EFileRead), _L( "Could not open file: %d" ) );
-		
-		CleanupClosePushL( file );
-		TInt dataSize ;
-		LEAVE_IF_ERROR( file.Size( dataSize ), _L( "Could not get file size: %d" ) );
-		HBufC8 *nodedata = HBufC8::NewLC ( dataSize );
-		TPtr8 nodedataptr( nodedata->Des() );
-		LEAVE_IF_ERROR( file.Read( nodedataptr ), _L( "Could not read file: %d" ) );
-		HBufC8 *datanode = HBufC8::NewLC( addnodename->Des().Length() + KDataLeafEnd().Length() );
-		datanode->Des().Copy( *addnodename );
-		datanode->Des().Append( KDataLeafEnd() );
-		
-		adapter->UpdateLeafObjectL(*datanode, KNullDesC8(), nodedataptr, KPolicyMimeType(), 3);
-		if ( iStatus == MSmlDmAdapter::EOk )
-			{
-			
-			}
-		else
-			{
-			iLog->Log( _L("Add Test Adding Policy data failed! %d" ), iStatus );	
-			ret = KErrGeneral;
-			}
-		
-		CleanupStack::PopAndDestroy( datanode );
-		CleanupStack::PopAndDestroy( nodedata );
-		CleanupStack::PopAndDestroy( ); // file
-		CleanupStack::PopAndDestroy(  ); // fs
-		}
-	else
-		{
-		iLog->Log( _L("Add Test Adding Policy node! %d" ), iStatus );	
-		ret = KErrGeneral ;
-		}
-		
-	CleanupStack::PopAndDestroy( addnodename );
-	CleanupStack::PopAndDestroy( version );
-	CleanupStack::PopAndDestroy( adapter );
-//	CleanupStack::PopAndDestroy( cb );
-*/
-
-
-	iLog->Log( _L("Seconda test complete with status %d" ), 0 ); //sf-ret );	
-	        
-
-    return KErrNone;
-    }
-    
-// -----------------------------------------------------------------------------
-// CThemesTest::InstallL
-// Install test method function.
-// -----------------------------------------------------------------------------
-//
-TInt CThemesTest::InstallL( CStifItemParser& aItem )
-    {
-    
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("ThemesTest"), _L("In Install") );
-    // Print to log file
-    iLog->Log(_L("In Install"));
-
-    TInt i = 0;
-    TPtrC string;
-    while ( aItem.GetNextString ( string ) == KErrNone )
-        {
-        TestModuleIf().Printf( i, _L("ThemesTest"), 
-                                _L("Param[%i]: %S"), i, &string );
-        i++;
-        }
-        
-
-
-// Command  Leaf DataType Data
-// G = Get
-// E = Exec
-// R = Replace
-//          /Customization/Themes
-//               T = Text
-//               F = File
-//                        "Text with spaces included"
-//                        FileName.Ext
-
-	// Here it starts
-
-	const TUint KThemesAdapterImplUid = 0x0FDDEF05;
-
-	TUid iuid = 
-		{
-		KThemesAdapterImplUid
-		};
-		
-/*	Cpmatest *cb = Cpmatest::NewL( iLog );
-	CleanupStack::PushL( cb );	// 1
-*/	
-	//CSmlDmAdapter *adapter = CSmlDmAdapter::NewL( implInfo->ImplementationUid(), *this );
-//	CSmlDmAdapter *adapter = CSmlDmAdapter::NewL( iuid, *this );
-	CTestDmCallback *callback = CTestDmCallback::NewL( iLog );
-	CleanupStack::PushL( callback );
-
-	CSmlDmAdapter *adapter = CSmlDmAdapter::NewL( iuid, *callback );
-	CleanupStack::PushL( adapter );
-	
-	CBufFlat* data = CBufFlat::NewL( 16 );
-	CleanupStack::PushL( data );
-
-	adapter->DDFVersionL( *data );
-	iLog->Log( _L("Version is")) ;
-	iLog->Log( data->Ptr(0) ) ;
-
-
-	CTestDmDDFObject* ddfRoot = CTestDmDDFObject::NewLC( iLog ); //, aNodeName );
-	ddfRoot->SetNameL( _L8( "/" ) );
-
-	adapter->DDFStructureL( *ddfRoot );
-	ddfRoot->DumpL( _L8(""), EFalse );
-	
-	CleanupStack::PopAndDestroy( ddfRoot );
-	ddfRoot = 0;
-	
-// Read file to data buffer and execute DM Adapter command
-
-//xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-
-	_LIT8( KThemeFilename, "c:\\jiihaa.sis" );
-
-//sf-	CBufBase* object = CBufFlat::NewL( 1000 );
-//sf-	CleanupStack::PushL( object );
-
-	TFileCoderB64 coder;
-	User::LeaveIfError( coder.EncodeL( KThemeFilename, *data ) );
-
-	/**
-	The function implements execute command. The information about the success
-	of the command should be returned by calling SetStatusL function of
-	MSmlDmCallback callback interface. This makes it possible to buffer the
-	commands.
-	However, all the status codes for buffered commands must be returned at
-	the latest when the CompleteOutstandingCmdsL() of adapter is called.
-	@param aURI			URI of the command
-	@param aLUID			LUID of the object (if the adapter have earlier
-							returned LUID to the DM Module).   
-	@param aArgument		Argument for the command
-	@param aType			MIME type of the object 
-	@param aStatusRef		Reference to correct command, i.e. this reference
-							must be used when calling the SetStatusL of this
-							command.
-	@publishedPartner
-	@prototype
-	*/
-//	virtual void ExecuteCommandL( const TDesC8& aURI, const TDesC8& aLUID,
-//							      const TDesC8& aArgument, const TDesC8& aType,
-//								  TInt aStatusRef ) = 0;
-
-	adapter->ExecuteCommandL( _L8("/Customization/Themes/InstallTheme"),
-							  _L8(""), //callback->FindLUID(aURI)
-							  data->Ptr(0),
-							  _L8("text"),
-							  callback->GetNewStatusRefL() );
-
-//xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-
-
-
-	CleanupStack::PopAndDestroy( data );
-	data = 0;
-
-	CleanupStack::PopAndDestroy( adapter );
-	adapter = 0;
-	
-	CleanupStack::PopAndDestroy( callback );
-	callback = 0;
-
-	
-
-
-	iLog->Log( _L("Install test complete with status %d" ), 0 ); //sf-ret );
-
-    return KErrNone;
-    }
-
-// -----------------------------------------------------------------------------
-// CThemesTest::LoadL
-// Load adapter to be tested.
-// -----------------------------------------------------------------------------
-//
-TInt CThemesTest::LoadL( CStifItemParser& aItem )
-	{
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("ThemesTest"), _L("LoadL") );
-    // Print to log file
-    iLog->Log(_L("CThemesTest::LoadL()"));
-
-	TInt ret = KErrNone;
-    TUint uid = 0;
-
-	ret = aItem.GetNextInt( uid, EHex );
-
-//sf-	if (ret != KErrNone)
-//sf-		{
-//sf-//		ret = KErrGeneral ;
-//sf-		return ret;
-//sf-		}
-
-	// Here it starts
-	if (ret == KErrNone)
-		{
-		TUid iuid = 
-			{
-			uid
-			};
-
-        iLog->Log(_L("CThemesTest::LoadL() next: iCallback = CTestDmCallback::NewL( iLog );"));
-		iCallback = CTestDmCallback::NewL( iLog );
-		
-        iLog->Log(_L("CThemesTest::LoadL() next: iAdapter = CSmlDmAdapter::NewL( iuid, *iCallback );"));
-		iAdapter = CSmlDmAdapter::NewL( iuid, *iCallback );
-
-        iLog->Log(_L("CThemesTest::LoadL() Adapter loaded OK."));
-		}
-	else
-	    {
-        iLog->Log(_L("CThemesTest::LoadL() Invalid UID in test script, check LoadL parameter."));
-	    }
-
-	return ret;
-	}
-
-// -----------------------------------------------------------------------------
-// CThemesTest::AddDDFCheckL
-// Load adapter to be tested.
-// -----------------------------------------------------------------------------
-//
-TInt CThemesTest::AddDDFCheckL( CStifItemParser& aItem )
-	{
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("ThemesTest"), _L("AddDDFCheckL") );
-    // Print to log file
-    iLog->Log(_L("CThemesTest::AddDDFCheckL()"));
-
-	TInt ret = KErrNone;
-
-	CDDFTestParams *ddfParams = CDDFTestParams::NewL( iLog, aItem );
-	AddDDFParamsL( ddfParams );
-
-	return ret;
-	}
-
-// -----------------------------------------------------------------------------
-// CThemesTest::DDFVersionL
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CThemesTest::DDFVersionL( CStifItemParser& aItem )
-	{
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("ThemesTest"), _L("DDFVersionL") );
-    // Print to log file
-    iLog->Log(_L("CThemesTest::DDFVersionL()"));
-
-//	void DDFVersionL( CBufBase& aVersion );
-	TInt ret = KErrNone;
-
-	CTestParams *params = CTestParams::NewLC( iLog, aItem );
-
-/*	
-URI=
-
-File=
-Text=
-
-IT= Input (text)
-IF= Input File (filename)
-OF= Output File
-
-ET= Expected result (text)
-EF= Expected file (filename)
-*/
-
-	CBufFlat *version = CBufFlat::NewL( 16 );
-	CleanupStack::PushL( version );
-	iAdapter->DDFVersionL( *version );
-
-	ret = params->CheckDataL( *version );
-	
-	CleanupStack::PopAndDestroy( version );
-	CleanupStack::PopAndDestroy( params );
-
-	return ret;
-	}
-
-// -----------------------------------------------------------------------------
-// CThemesTest::DDFStructureL
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CThemesTest::DDFStructureL( CStifItemParser& /*aItem*/ )
-	{
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("ThemesTest"), _L("DDFStructureL") );
-    // Print to log file
-    iLog->Log(_L("CThemesTest::DDFStructureL()"));
-
-	TInt ret = KErrNone;
-
-//	void DDFStructureL( MSmlDmDDFObject& aDDF );
-	CTestDmDDFObject* ddfRoot = CTestDmDDFObject::NewLC( iLog ); //, aNodeName );
-	ddfRoot->SetNameL( _L8( "/" ) );
-
-	iAdapter->DDFStructureL( *ddfRoot );
-	ddfRoot->DumpL( _L8(""), EFalse );
-
-	ret = CheckDDFL( ddfRoot );
-
-	CleanupStack::PopAndDestroy( ddfRoot );
-	ddfRoot = 0;
-
-	return ret;
-	}
-
-	
-// -----------------------------------------------------------------------------
-// CThemesTest::UpdateLeafObjectL
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CThemesTest::UpdateLeafObjectL( CStifItemParser& aItem )
-	{
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("ThemesTest"), _L("UpdateLeafObjectL") );
-    // Print to log file
-    iLog->Log(_L("CThemesTest::UpdateLeafObjectL()"));
-
-	TInt ret = KErrNone;
-	CTestParams* params = CTestParams::NewL( iLog, aItem );
-	AddParamsL( params );
-
-	TPtrC8 uri( params->Uri() );
-	TPtrC8 object( params->Data() );
-	TPtrC8 type( params->DataType() );
-	HBufC8* luid = iCallback->GetLuidAllocL( uri );
-	CleanupStack::PushL( luid );
-	TInt statusRef = iCallback->GetNewStatusRefL( );
-//	TInt resultsRef = iCallback->GetNewResultsRefL( );
-
-	params->SetStatusRef( statusRef);
-//	params->SetResultsRef( resultsRef);
-
-	iAdapter->UpdateLeafObjectL( uri, *luid, object, type, statusRef );
-
-	ret = params->CheckL( iCallback );
-
-	// Cleanup
-	CleanupStack::PopAndDestroy( luid );
-	
-	return ret;
-	}
-
-// -----------------------------------------------------------------------------
-// CThemesTest::UpdateLeafObjectStreamL
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CThemesTest::UpdateLeafObjectStreamL( CStifItemParser& /*aItem*/ )
-	{
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("ThemesTest"), _L("UpdateLeafObjectStreamL") );
-    // Print to log file
-    iLog->Log(_L("CThemesTest::UpdateLeafObjectStreamL()"));
-
-//	void UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, RWriteStream*& aStream, const TDesC8& aType, TInt aStatusRef );
-
-	TInt ret = KErrNotSupported;
-	return ret;
-	}
-
-// -----------------------------------------------------------------------------
-// CThemesTest::DeleteObjectL
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CThemesTest::DeleteObjectL( CStifItemParser& aItem )
-	{
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("ThemesTest"), _L("DeleteObjectL") );
-    // Print to log file
-    iLog->Log(_L("CThemesTest::DeleteObjectL()"));
-
-	TInt ret = KErrNone;
-	CTestParams* params = CTestParams::NewL( iLog, aItem );
-	AddParamsL( params );
-
-	TPtrC8 uri( params->Uri() );
-	HBufC8* luid = iCallback->GetLuidAllocL( uri );
-	CleanupStack::PushL( luid );
-	TInt statusRef = iCallback->GetNewStatusRefL( );
-
-//	void DeleteObjectL( const TDesC8& aURI, const TDesC8& aLUID, TInt aStatusRef );
-	iAdapter->DeleteObjectL( uri, *luid, statusRef );
-
-	params->SetStatusRef( statusRef);
-	ret = params->CheckL( iCallback );
-
-	// Cleanup
-	CleanupStack::PopAndDestroy( luid );
-	return ret;
-	}
-
-// -----------------------------------------------------------------------------
-// CThemesTest::FetchLeafObjectL
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CThemesTest::FetchLeafObjectL( CStifItemParser& aItem )
-	{
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("ThemesTest"), _L("FetchLeafObjectL") );
-    // Print to log file
-    iLog->Log(_L("CThemesTest::FetchLeafObjectL()"));
-
-	TInt ret = KErrNone;
-	CTestParams* params = CTestParams::NewL( iLog, aItem );
-	AddParamsL( params );
-
-	TPtrC8 uri( params->Uri() );
-	TPtrC8 type( params->DataType() );
-	HBufC8* luid = iCallback->GetLuidAllocL( uri );
-	CleanupStack::PushL( luid );
-	TInt statusRef = iCallback->GetNewStatusRefL( );
-	TInt resultsRef = iCallback->GetNewResultsRefL( );
-
-	params->SetStatusRef( statusRef);
-	params->SetResultsRef( resultsRef);
-
-//	void FetchLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, const TDesC8& aType, TInt aResultsRef, TInt aStatusRef );
-	iAdapter->FetchLeafObjectL( uri, *luid, type, resultsRef, statusRef );
-
-	ret = params->CheckL( iCallback );
-
-	// Cleanup
-	CleanupStack::PopAndDestroy( luid );
-	return ret;
-	}
-
-// -----------------------------------------------------------------------------
-// CThemesTest::FetchLeafObjectSizeL
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CThemesTest::FetchLeafObjectSizeL( CStifItemParser& aItem )
-	{
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("ThemesTest"), _L("FetchLeafObjectSizeL") );
-    // Print to log file
-    iLog->Log(_L("CThemesTest::FetchLeafObjectSizeL()"));
-
-	TInt ret = KErrNone;
-	CTestParams* params = CTestParams::NewL( iLog, aItem );
-	AddParamsL( params );
-
-	TPtrC8 uri( params->Uri() );
-//	TPtrC8 object( params->Data() );
-	TPtrC8 type( params->DataType() );
-	HBufC8* luid = iCallback->GetLuidAllocL( uri );
-	CleanupStack::PushL( luid );
-	TInt statusRef = iCallback->GetNewStatusRefL( );
-	TInt resultsRef = iCallback->GetNewResultsRefL( );
-
-	params->SetStatusRef( statusRef);
-	params->SetResultsRef( resultsRef);
-
-//	void FetchLeafObjectSizeL( const TDesC8& aURI, const TDesC8& aLUID, const TDesC8& aType, TInt aResultsRef, TInt aStatusRef );
-	iAdapter->FetchLeafObjectSizeL( uri, *luid, type, resultsRef, statusRef );
-
-	ret = params->CheckL( iCallback );
-
-	// Cleanup
-	CleanupStack::PopAndDestroy( luid );
-	return ret;
-	}
-
-// -----------------------------------------------------------------------------
-// CThemesTest::ChildURIListL
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CThemesTest::ChildURIListL( CStifItemParser& aItem )
-	{
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("ThemesTest"), _L("ChildURIListL") );
-    // Print to log file
-    iLog->Log(_L("CThemesTest::ChildURIListL()"));
-
-	TInt ret = KErrNone;
-	CTestParams* params = CTestParams::NewL( iLog, aItem );
-	AddParamsL( params );
-
-	TPtrC8 uri( params->Uri() );
-//sf-	TPtrC8 object( params->Data() );
-	TPtrC8 type( params->DataType() );
-	HBufC8* luid = iCallback->GetLuidAllocL( uri );
-	CleanupStack::PushL( luid );
-	TInt statusRef = iCallback->GetNewStatusRefL( );
-	TInt resultsRef = iCallback->GetNewResultsRefL( );
-
-	params->SetStatusRef( statusRef);
-	params->SetResultsRef( resultsRef);
-
-//	CreatePreviousURISegmentList( );
-	CArrayFixFlat<TSmlDmMappingInfo>* uriSegmentList = new (ELeave) CArrayFixFlat<TSmlDmMappingInfo>( 10 );
-	CleanupStack::PushL( uriSegmentList );
-
-	TPtrC8 oldUriSegs = params->Data();
-	TInt i;
-	TInt count = 0;
-	if (oldUriSegs.Length() > 0)
-		{
-		count = NSmlDmURI::NumOfURISegs( oldUriSegs );;
-		}
-
-	for (i = 0 ; i < count ; i++)
-		{
-		TPtrC8 tmpSeg = NSmlDmURI::URISeg( oldUriSegs, i + 1 );
-//		TBuf8< uri.Length() + 1 + KSmlMaxURISegLen > tmpUri;
-		TBuf8< 256 > tmpUri;
-		tmpUri = uri;
-		tmpUri.Append( _L8("/") );
-		tmpUri.Append( tmpSeg );
-		TPtrC8 tmpLuid = iCallback->GetLuidL( tmpUri );
-
-		TSmlDmMappingInfo t; // = { seg, tmpLuid };
-		t.iURISeg = tmpSeg;
-		t.iURISegLUID.Set( tmpLuid );
-
-		uriSegmentList->AppendL( t );
-		}
-
-//	void ChildURIListL( const TDesC8& aURI, const TDesC8& aLUID, const CArrayFix<TSmlDmMappingInfo>& aPreviousURISegmentList, TInt aResultsRef, TInt aStatusRef );
-	iAdapter->ChildURIListL( uri, *luid, *uriSegmentList, resultsRef, statusRef );
-
-	ret = params->CheckL( iCallback );
-
-	// Cleanup
-	CleanupStack::PopAndDestroy( uriSegmentList );
-	CleanupStack::PopAndDestroy( luid );
-	return ret;
-	}
-
-	
-// -----------------------------------------------------------------------------
-// CThemesTest::AddNodeObjectL
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CThemesTest::AddNodeObjectL( CStifItemParser& aItem )
-	{
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("ThemesTest"), _L("AddNodeObjectL") );
-    // Print to log file
-    iLog->Log(_L("CThemesTest::AddNodeObjectL()"));
-
-	TInt ret = KErrNone;
-	CTestParams* params = CTestParams::NewL( iLog, aItem );
-	AddParamsL( params );
-
-	TPtrC8 uri( params->Uri() );
-	TPtrC8 parentUri = NSmlDmURI::ParentURI( uri );
-	TPtrC8 parentLuid = iCallback->GetLuidL( parentUri );
-
-	TInt statusRef = iCallback->GetNewStatusRefL( );
-
-	params->SetStatusRef( statusRef);
-
-//	void AddNodeObjectL( const TDesC8& aURI, const TDesC8& aParentLUID, TInt aStatusRef );
-	iAdapter->AddNodeObjectL( uri, parentLuid, statusRef );
-
-	ret = params->CheckL( iCallback );
-
-	// Cleanup
-
-	return ret;
-	}
-
-// -----------------------------------------------------------------------------
-// CThemesTest::ExecuteCommandL
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CThemesTest::ExecuteCommandL( CStifItemParser& aItem )
-	{
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("ThemesTest"), _L("ExecuteCommandL") );
-    // Print to log file
-    iLog->Log(_L("CThemesTest::ExecuteCommandL()"));
-
-	TInt ret = KErrNone;
-	CTestParams* params = CTestParams::NewL( iLog, aItem );
-	AddParamsL( params );
-
-	TPtrC8 uri( params->Uri() );
-	TPtrC8 argument( params->Data() );
-	TPtrC8 type( params->DataType() );
-	HBufC8* luid = iCallback->GetLuidAllocL( uri );
-	CleanupStack::PushL( luid );
-	TInt statusRef = iCallback->GetNewStatusRefL( );
-
-	params->SetStatusRef( statusRef);
-
-//	void ExecuteCommandL( const TDesC8& aURI, const TDesC8& aLUID, const TDesC8& aArgument, const TDesC8& aType, TInt aStatusRef );
-	iAdapter->ExecuteCommandL( uri, *luid, argument, type, statusRef );
-
-	ret = params->CheckL( iCallback );
-
-	// Cleanup
-	CleanupStack::PopAndDestroy( luid );
-	return ret;
-	}
-
-// -----------------------------------------------------------------------------
-// CThemesTest::ExecuteCommandStreamL
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CThemesTest::ExecuteCommandStreamL( CStifItemParser& /*aItem*/ )
-	{
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("ThemesTest"), _L("ExecuteCommandStreamL") );
-    // Print to log file
-    iLog->Log(_L("CThemesTest::ExecuteCommandStreamL()"));
-
-//	void ExecuteCommandL( const TDesC8& aURI, const TDesC8& aLUID, RWriteStream*& aStream, const TDesC8& aType, TInt aStatusRef );
-
-	TInt ret = KErrNotSupported;
-	return ret;
-	}
-
-// -----------------------------------------------------------------------------
-// CThemesTest::CopyCommandL
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CThemesTest::CopyCommandL( CStifItemParser& aItem )
-	{
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("ThemesTest"), _L("CopyCommandL") );
-    // Print to log file
-    iLog->Log(_L("CThemesTest::CopyCommandL()"));
-
-	TInt ret = KErrNone;
-	CTestParams* params = CTestParams::NewL( iLog, aItem );
-	AddParamsL( params );
-
-	TPtrC8 uri( params->Uri() );
-	TPtrC8 target( params->Data() );
-	TPtrC8 type( params->DataType() );
-	HBufC8* luid = iCallback->GetLuidAllocL( uri );
-	CleanupStack::PushL( luid );
-	TInt statusRef = iCallback->GetNewStatusRefL( );
-
-	params->SetStatusRef( statusRef );
-
-	TInt pos = target.Locate( ':' );
-	if (pos < 0)
-		{
-		pos = target.Length();
-		}
-	TPtrC8 targetUri = target.Left( pos );
-	
-	if (pos < target.Length())
-		{
-		pos++;
-		}
-	TPtrC8 targetLuid = target.Right( target.Length() - pos );
-
-//	void CopyCommandL( const TDesC8& aTargetURI, const TDesC8& aTargetLUID, const TDesC8& aSourceURI, const TDesC8& aSourceLUID, const TDesC8& aType, TInt aStatusRef );
-	iAdapter->CopyCommandL( targetUri, targetLuid, uri, *luid, type, statusRef );
-
-	ret = params->CheckL( iCallback );
-
-	// Cleanup
-	CleanupStack::PopAndDestroy( luid );
-	return ret;
-	}
-
-// -----------------------------------------------------------------------------
-// CThemesTest::StartAtomicL
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CThemesTest::StartAtomicL( CStifItemParser& /*aItem*/ )
-	{
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("ThemesTest"), _L("StartAtomicL") );
-    // Print to log file
-    iLog->Log(_L("CThemesTest::StartAtomicL()"));
-
-	TInt ret = KErrNone;
-//sf-	CTestParams* params = CTestParams::NewL( iLog, aItem );
-//sf-	AddParamsL( params );
-
-//	void StartAtomicL();
-	iAdapter->StartAtomicL();
-
-	// Cleanup
-	return ret;
-	}
-
-// -----------------------------------------------------------------------------
-// CThemesTest::CommitAtomicL
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CThemesTest::CommitAtomicL( CStifItemParser& /*aItem*/ )
-	{
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("ThemesTest"), _L("CommitAtomicL") );
-    // Print to log file
-    iLog->Log(_L("CThemesTest::CommitAtomicL()"));
-
-	TInt ret = KErrNone;
-//sf-	CTestParams* params = CTestParams::NewL( iLog, aItem );
-//sf-	AddParamsL( params );
-
-//	void CommitAtomicL();
-	iAdapter->CommitAtomicL();
-
-	// Cleanup
-	return ret;
-	}
-
-// -----------------------------------------------------------------------------
-// CThemesTest::RollbackAtomicL
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CThemesTest::RollbackAtomicL( CStifItemParser& /*aItem*/ )
-	{
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("ThemesTest"), _L("RollbackAtomicL") );
-    // Print to log file
-    iLog->Log(_L("CThemesTest::RollbackAtomicL()"));
-
-	TInt ret = KErrNone;
-//sf-	CTestParams* params = CTestParams::NewL( iLog, aItem );
-//sf-	AddParamsL( params );
-
-//	void RollbackAtomicL();
-	iAdapter->RollbackAtomicL();
-
-	// Cleanup
-	return ret;
-	}
-
-// -----------------------------------------------------------------------------
-// CThemesTest::StreamingSupportL
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CThemesTest::StreamingSupportL( CStifItemParser& aItem )
-	{
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("ThemesTest"), _L("StreamingSupportL") );
-    // Print to log file
-    iLog->Log(_L("CThemesTest::StreamingSupportL()"));
-
-	TInt ret = KErrNone;
-	CTestParams* params = CTestParams::NewL( iLog, aItem );
-	AddParamsL( params );
-
-	TInt itemSize = 0;
-	TBool status = iAdapter->StreamingSupport( itemSize );
-
-	TBuf8<10> statusStr;
-	TBuf8<20> itemSizeStr;
-	
-	statusStr.Format( _L8("%d"), status );
-	itemSizeStr.Format( _L8("%d"), itemSize );
-	ret = params->CheckStatusL( status );
-	ret = params->CheckDataL( itemSizeStr );
-
-	// Cleanup
-	return ret;
-	}
-
-// -----------------------------------------------------------------------------
-// CThemesTest::StreamCommittedL
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CThemesTest::StreamCommittedL( CStifItemParser& /*aItem*/ )
-	{
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("ThemesTest"), _L("StreamCommittedL") );
-    // Print to log file
-    iLog->Log(_L("CThemesTest::StreamCommittedL()"));
-
-	TInt ret = KErrNone;
-//sf-	CTestParams* params = CTestParams::NewL( iLog, aItem );
-//sf-	AddParamsL( params );
-
-//	void StreamCommittedL();
-	iAdapter->StreamCommittedL();
-
-	// Cleanup
-	return ret;
-	}
-
-// -----------------------------------------------------------------------------
-// CThemesTest::CompleteOutstandingCmdsL
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CThemesTest::CompleteOutstandingCmdsL( CStifItemParser& /*aItem*/ )
-	{
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("ThemesTest"), _L("CompleteOutstandingCmdsL") );
-    // Print to log file
-    iLog->Log(_L("CThemesTest::CompleteOutstandingCmdsL()"));
-
-	TInt ret = KErrNone;
-//sf-	CTestParams* params = CTestParams::NewL( iLog, aItem );
-//sf-	AddParamsL( params );
-
-//	void CompleteOutstandingCmdsL();
-	iAdapter->CompleteOutstandingCmdsL();
-
-	ret = CheckAllL( );
-
-	// Cleanup
-	return ret;
-	}
-#if 0
-// -----------------------------------------------------------------------------
-// CThemesTest::CreateFileL
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CThemesTest::CreateFileL( CStifItemParser& aItem )
-    {
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("ThemesTest"), _L("CreateFileL") );
-    // Print to log file
-    iLog->Log(_L("CThemesTest::CreateFileL()"));
-
-	TInt ret = KErrNone;
-	 
-	CTestParams* params = CTestParams::NewL( iLog, aItem );
-	AddParamsL( params );
-	
-	TPtrC8 filename( params->Data() );
-	
-	RFs fs; fs.Connect();
-	
-	TFileName fname; fname.Copy( filename );
-	RFile f; f.Replace(fs, fname, EFileShareExclusive|EFileWrite);
-	TPtrC8 dataType( params->DataType() );
-	if(dataType.Length() == 0)
-	    {
-	    f.Write(_L8("File created by ThemesTest"));
-	    }
-	else
-	    {
-	    f.Write( dataType );
-	    }
-	f.Close();
-	
-	fs.Close();
-
-    ret = params->CheckL( iCallback );
-	//ret = CheckAllL( );
-
-    //CleanupStack::PopAndDestroy( params );
-
-	// Cleanup
-	return ret;
-    }
-    
-// -----------------------------------------------------------------------------
-// CThemesTest::RFSCommandL
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CThemesTest::RFSCommandL( CStifItemParser& aItem )
-    {
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("ThemesTest"), _L("RFSCommandL") );
-
-    // Print to log file
-    iLog->Log(_L("CThemesTest::RFSCommandL()"));
-
-	TInt status = KErrNone;
-	 
-	CTestParams* params = CTestParams::NewL( iLog, aItem );
-	AddParamsL( params );
-	
-	TPtrC8 command( params->Data() );
-	
-    RRfsClient client;
-    
-    status = client.Connect();
-    
-    if( KErrNone == status )
-        {        
-        CleanupClosePushL( client );
-
-        HBufC* cmd = HBufC::NewLC( command.Length() );
-        if(cmd != 0)
-            {            
-            TPtr ptr( cmd->Des() );
-            ptr.Copy( command );
-            status = client.RunScriptInDescriptor(ptr);
-            if(status >= 0) status = 0;
-            }
-        CleanupStack::PopAndDestroy( cmd );
-
-        CleanupStack::PopAndDestroy( &client );
-        }
-
-    params->CheckL( iCallback );
-
-	return status;    
-    }
-
-// -----------------------------------------------------------------------------
-// CThemesTest::LoadPolicyL
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CThemesTest::LoadPolicyL( CStifItemParser& aItem )
-    {
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("ThemesTest"), _L("LoadPolicyL") );
-    // Print to log file
-    iLog->Log(_L("CThemesTest::LoadPolicyL()"));
-	TInt status = KErrNone;
-	 
-	CTestParams* params = CTestParams::NewL( iLog, aItem );
-	AddParamsL( params );
-
-	TPtrC8 data( params->Data() );
-
-	RPolicyEngine eng;
-	status = eng.Connect();
-	
-	if( KErrNone == status )
-	    {
-        iLog->Log(_L("CThemesTest::LoadPolicyL() Connected to policy engine"));
-	    RPolicyManagement man;
-	    status = man.Open( eng );
-	    if( KErrNone == status )
-	        {
-            iLog->Log(_L("CThemesTest::LoadPolicyL() Policy management session open"));
-	        TParserResponse resp;
-	        status = man.ExecuteOperation(data, resp);
-            if( KErrNone == status )
-                {
-                iLog->Log(_L("CThemesTest::LoadPolicyL() Policy added"));                
-                }
-            man.Close();
-	        }
-	    eng.Close();
-	    }
-
-    params->CheckL( iCallback );
-
-	return status;
-    }
-
-// -----------------------------------------------------------------------------
-// CThemesTest::SetCertificateL
-// 
-// -----------------------------------------------------------------------------
-//
-/*
-Test-Case for this API
-[Test]
-title SS_GetAll
-create ThemesTest ttest
-ttest LoadL 1020782E
-
-ttest SetCertificate <CentralRepositoryUid>
-[EndTest]
-*/
-
-TInt CThemesTest::SetCertificateL( CStifItemParser& aItem )
-    {
-    TInt errx = KErrNone;
-
-    RDMUtil dm;
-    if( KErrNone == dm.Connect() )
-        {
-        dm.Close();
-        }
-
-    TCertInfo info;
-    info.iSerialNo    = _L8("Lässynlää");
-    info.iFingerprint = _L8("Joopajoo");;
-
-	// Changed due to SF.
-	TInt ret = KErrNone;
-    TUint CentralRepositoryUid = 0;
-
-	ret = aItem.GetNextInt( CentralRepositoryUid, EHex );
-	
-	const TInt KCertKey = 0x01;
-	CRepository *re = NULL;
-	TRAP( errx, re = CRepository::NewL ( CentralRepositoryUid ) );
-	if (errx == KErrNone )
-		{
-		TPckg<TCertInfo> pcert( info );
-		errx = re->Create( KCertKey, pcert ) ;
-		if ( errx == KErrNone )
-			{
-			}
-		else
-			{
-			if ( errx == KErrAlreadyExists )
-				{
-				errx = re->Set( KCertKey, pcert ) ;
-				if ( errx != KErrNone )
-					{
-					// DBG_ARGS8(_S8("ERROR Failed to add reposiritry key %d"), errx );
-					}
-				}
-			else
-				{
-				// DBG_ARGS8(_S8("ERROR Failed to create reposiritry key %d"), errx );	
-				}
-			
-			}	
-		delete re ;
-		}
-	else
-		{
-		// DBG_ARGS8(_S8("ERROR Failed to open reposiritry %d"), erx );	
-		}
-
-    return errx;
-    }
-
-// -----------------------------------------------------------------------------
-// CThemesTest::ConnectToPolicyServerL
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CThemesTest::ConnectToPolicyServerL( CStifItemParser& /*aItem*/ )
-    {
-    TInt status = KErrNone;
-
-	RPolicyEngine eng;
-	status = eng.Connect();
-	
-	if( KErrNone == status )
-	    {
-        iLog->Log(_L("CThemesTest::LoadPolicyL() Connected to policy engine"));
-	    RPolicyManagement man;
-	    status = man.Open( eng );
-	    if( KErrNone == status )
-	        {
-            iLog->Log(_L("CThemesTest::LoadPolicyL() Policy management session open"));
-            man.Close();
-	        }
-	    eng.Close();
-	    }
-    
-    return status;
-    }
-
-// -----------------------------------------------------------------------------
-// CThemesTest::ConnectToDMUTILL
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CThemesTest::ConnectToDMUTILL( CStifItemParser& /*aItem*/ )
-    {
-    TInt status = KErrNone;
-
-    RDMUtil dm;
-    status = dm.Connect();
-    if( KErrNone == status )
-        {
-        dm.Close();
-        }
-
-    return status;
-    }
-
-// -----------------------------------------------------------------------------
-// CThemesTest::GetThirdPartyValueL
-// 
-// -----------------------------------------------------------------------------
-//
-HBufC8* CThemesTest::GetThirdPartyValueL( TInt aType )
-    {
-    RTerminalControl tc;
-    User::LeaveIfError( tc.Connect() );
-
-    RTerminalControl3rdPartySession ts;
-    User::LeaveIfError( ts.Open( tc ) );
-
-    TInt size = ts.GetDeviceLockParameterSize( aType );
-    if( size < 0 )
-        {
-        User::Leave( size );
-        }
-
-    HBufC8* buffer = HBufC8::NewLC( size );
-    TPtr8 ptr8( buffer->Des() );
-
-    User::LeaveIfError( ts.GetDeviceLockParameter( aType, ptr8 ) );
-
-    ts.Close();
-    tc.Close();
-
-    CleanupStack::Pop( buffer );
-    return buffer;
-    }
-
-// -----------------------------------------------------------------------------
-// CThemesTest::SetThirdPartyValueL
-// 
-// -----------------------------------------------------------------------------
-//
-void CThemesTest::SetThirdPartyValueL( TInt aType, TDesC8& aData )
-    {
-    RTerminalControl tc;
-    User::LeaveIfError( tc.Connect() );
-
-    RTerminalControl3rdPartySession ts;
-    User::LeaveIfError( ts.Open( tc ) );
-
-    User::LeaveIfError( ts.SetDeviceLockParameter( aType, aData ) );
-
-    ts.Close();
-    tc.Close();
-    }
-
-// -----------------------------------------------------------------------------
-// CThemesTest::ThirdPartyCommandL
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CThemesTest::ThirdPartyCommandL( CStifItemParser& aItem )
-    {
-    CTestDmCallback *cb = CTestDmCallback::NewL( iLog );
-    CleanupStack::PushL( cb );
-    
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("ThemesTest"), _L("ThirdP_AutolockPeriodL") );
-    // Print to log file
-    iLog->Log(_L("CThemesTest::ThirdP_AutolockPeriodL()"));
-	TInt status = KErrNone;
-
-	CTestParams* params = CTestParams::NewL( iLog, aItem );
-	AddParamsL( params );
-
-    TPtrC8 command( params->Uri() );
-    TPtrC8 direction( params->DataType() );
-    TPtrC8 value( params->Data() );
-
-/*
-    	{
-        	ETimeout = 1000,		// Autolock timeout. Values in minutes. 
-        	EMaxTimeout,	// Maximum autolock timeout value. When != 0 the lock is enabled, When = 0 the lock is off
-        	EPasscode,		// Passcode. Return value not supported
-        	EPasscodePolicy, // 0 = passcode free. When != 0 the passcode can not be changed
-        	ELock,			// Lock the terminal immediately. Return value not supported
-        	EDeviceWipe, 	// When != 0 the Device is wiped
-        	ELast = 2000
-    	};
-*/
-
-    if( direction.Compare( _L8("read") ) == 0)
-        {
-        HBufC8* data = 0;
-        if( command.Compare( _L8("ETimeout") ) == 0 )
-            {
-            data = GetThirdPartyValueL( RTerminalControl3rdPartySession::ETimeout );
-            }
-        else if( command.Compare( _L8("EMaxTimeout") ) == 0 )
-            {
-            data = GetThirdPartyValueL( RTerminalControl3rdPartySession::EMaxTimeout );
-            }
-        else if( command.Compare( _L8("EPasscode") ) == 0 )
-            {
-            data = GetThirdPartyValueL( RTerminalControl3rdPartySession::EPasscode );
-            }
-        else if( command.Compare( _L8("EPasscodePolicy") ) == 0 )
-            {
-            data = GetThirdPartyValueL( RTerminalControl3rdPartySession::EPasscodePolicy );
-            }
-        else if( command.Compare( _L8("ELock") ) == 0 )
-            {
-            data = GetThirdPartyValueL( RTerminalControl3rdPartySession::ELock );
-            }
-        else if( command.Compare( _L8("EDeviceWipe") ) == 0 )
-            {
-            data = GetThirdPartyValueL( RTerminalControl3rdPartySession::EDeviceWipe );
-            }
-
-        if( 0 == data )
-            {
-            User::Leave( KErrGeneral );
-            }
-        CleanupStack::PushL( data );
-
-    	TInt statusRef = cb->GetNewStatusRefL( );
-        TInt resultsRef = cb->GetNewResultsRefL( );
-
-    	params->SetStatusRef( statusRef);
-        params->SetResultsRef( resultsRef);
-
-        CBufFlat* buf = CBufFlat::NewL(128);
-        CleanupStack::PushL( buf );
-
-        buf->InsertL( 0, *data );
-        cb->SetResultsL( resultsRef, *buf, KNullDesC8() );
-        cb->SetStatusL( statusRef, (MSmlDmAdapter::TError)0 );
-
-        CleanupStack::PopAndDestroy( buf );
-        CleanupStack::PopAndDestroy( data );
-        }
-    else if( direction.Compare( _L8("write") ) == 0)
-        {
-        if( command.Compare( _L8("ETimeout") ) == 0 )
-            {
-            SetThirdPartyValueL( RTerminalControl3rdPartySession::ETimeout, value );
-            }
-        else if( command.Compare( _L8("EMaxTimeout") ) == 0 )
-            {
-            SetThirdPartyValueL( RTerminalControl3rdPartySession::EMaxTimeout, value );
-            }
-        else if( command.Compare( _L8("EPasscode") ) == 0 )
-            {
-            SetThirdPartyValueL( RTerminalControl3rdPartySession::EPasscode, value );
-            }
-        else if( command.Compare( _L8("EPasscodePolicy") ) == 0 )
-            {
-            SetThirdPartyValueL( RTerminalControl3rdPartySession::EPasscodePolicy, value );
-            }
-        else if( command.Compare( _L8("ELock") ) == 0 )
-            {
-            SetThirdPartyValueL( RTerminalControl3rdPartySession::ELock, value );
-            }
-        else if( command.Compare( _L8("EDeviceWipe") ) == 0 )
-            {
-            SetThirdPartyValueL( RTerminalControl3rdPartySession::EDeviceWipe, value );
-            }
-        }
-    else
-        {
-        User::Leave( KErrArgument );
-        }
-
-    params->CheckL( cb );
-
-    CleanupStack::PopAndDestroy( cb );
-
-	return status;
-    }
-
-// -----------------------------------------------------------------------------
-// CThemesTest::InitDMSessionL
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CThemesTest::InitDMSessionL( CStifItemParser& /*aItem*/ )
-    {
-    TInt status = KErrNone;
-
-	RNSmlPrivateAPI privateApi;
-				
-	privateApi.OpenL();
-
-	TBuf8<100> buf;
-	
-	buf.Append( 0x3F);
-	buf.Append( 0x4E);
-	buf.Append( 0x87);
-	buf.Append( 0xBE);
-	buf.Append( 0x50);
-	buf.Append( 0xCC);
-	buf.Append( 0x28);
-	buf.Append( 0x5E);
-	buf.Append( 0x96);
-	buf.Append( 0x87);
-	buf.Append( 0x3D);
-	buf.Append( 0x29);
-	buf.Append( 0x39);
-	buf.Append( 0xEB);
-	buf.Append( 0x78);
-	buf.Append( 0x0B);
-	buf.Append( 0x02);
-	buf.Append( 0xF8);
-	buf.Append( 0x00);
-	buf.Append( 0x00);
-	buf.Append( 0x00);
-	buf.Append( 0x00);
-	buf.Append( 0x17);
-	buf.Append( 0x06);
-	buf.Append( 0x53);
-	buf.Append( 0x79);
-	buf.Append( 0x6E);
-	buf.Append( 0x63);
-	buf.Append( 0x34);
-	buf.Append( 0x6A);
-
-	privateApi.SendL( buf, ESmlDevMan, ESmlVersion1_1_2 );
-		
-	privateApi.Close();
-
-    return status;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CThemesTest::RRRunL
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CThemesTest::RRRunL( CStifItemParser& aItem )
-	{
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("ThemesTest"), _L("RRRunL") );
-    // Print to log file
-    iLog->Log(_L("CThemesTest::RRRunL()"));
-
-//	void DDFVersionL( CBufBase& aVersion );
-	TInt ret = KErrNone;
-
-	CTestParams *params = CTestParams::NewLC( iLog, aItem );
-
-/*	
-URI=
-
-File=
-Text=
-
-IT= Input (text)
-IF= Input File (filename)
-OF= Output File
-
-ET= Expected result (text)
-EF= Expected file (filename)
-*/
-
-	CleanupStack::PopAndDestroy( params );
-
-	return ret;
-	}
-
-
-
-// -----------------------------------------------------------------------------
-// CThemesTest::?member_function
-// ?implementation_description
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-/*
-TInt CThemesTest::?member_function(
-   CItemParser& aItem )
-   {
-
-   ?code
-
-   }
-*/
-
-#endif
-void CThemesTest::AddParamsL( CTestParams* aParams )
-	{
-	CleanupStack::PushL( aParams );
-	User::LeaveIfError( iParams.Append( aParams ) );
-	CleanupStack::Pop( aParams );
-	}
-
-void CThemesTest::AddDDFParamsL( CDDFTestParams* aDDFParams )
-	{
-	CleanupStack::PushL( aDDFParams );
-	User::LeaveIfError( iDDFParams.Append( aDDFParams ) );
-	CleanupStack::Pop( aDDFParams );
-	}
-
-TInt CThemesTest::CheckAllL( )
-	{
-	TInt ret = KErrNone;
-	
-	for (TInt i = 0 ; i < iParams.Count() ; i++)
-		{
-		TInt result = iParams[i]->CheckL( iCallback );
-		if (result != KErrNone && ret == KErrNone)
-			{
-			ret = result;
-			}
-		}
-
-	return ret;
-	}
-
-TInt CThemesTest::CheckDDFL( CTestDmDDFObject* aDDFRoot )
-	{
-	TInt ret = KErrNone;
-	TInt result = 0;
-
-	if ( iDDFParams.Count() > 0 )
-		{
-		}
-
-	TInt i;
-	for ( i = 0 ; i < iDDFParams.Count() ; i++ )
-		{
-		result = iDDFParams[i]->CheckL( aDDFRoot );
-		if ( result != KErrNone && ret == KErrNone )
-			{
-			ret = result;
-			}
-		}
-
-	if ( i > 0 )
-		{
-		TInt count = aDDFRoot->SubObjectsCount();
-		if (count != i)
-			{
-			iLog->Log( _L8("Error: CheckDDFL(): DDF count mismatch: expected=%d real=%d"), iDDFParams.Count(), count );
-			if (ret == KErrNone)
-				{
-				ret = KErrGeneral;
-				}
-			}
-		}
-
-	return ret;
-	}
-
-// ========================== OTHER EXPORTED FUNCTIONS =========================
-// None
-
-//  End of File
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/devicecontrol.pro	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,25 @@
+#
+# 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:  Device update project file
+#
+TEMPLATE = subdirs
+
+SUBDIRS  += deviceupdatesui 
+
+CONFIG += ordered
+
+symbian: {
+SYMBIAN_PLATFORMS = WINSCW \
+    ARMV5
+    }
--- a/devicediagnostics/Updates/devdiagapp.pkg	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-;
-; 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:  Package file for project Device Diagnostics Application
-;
-
-;; =============================================================================
-;; GENERAL DATA ================================================================
-;; =============================================================================
-; Languages
-&EN
-;01
-
-; Package header
-#{"Device Diagnostics Patch"},(0x2001F499),1,4,0,TYPE=SP
-
-;Localised Vendor name
-%{"Nokia"}
-
-;Unique Vendor name
-:"Nokia"
-
-; Dependency for S60
-[0x102752AE], 0, 0, 0, {"Series60ProductID"} ;3.2
-
-"\EPOC32\RELEASE\ARMV5\UDEB\DiagFramework.dll"     -"!:\sys\bin\DiagFramework.dll"
--- a/devicediagnostics/Updates/devdiagapp_sis.bat	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-rem
-rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-rem All rights reserved.
-rem This component and the accompanying materials are made available
-rem under the terms of "Eclipse Public License v1.0"
-rem which accompanies this distribution, and is available
-rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
-rem
-rem Initial Contributors:
-rem Nokia Corporation - initial contribution.
-rem
-rem Contributors:
-rem
-rem Description:
-rem
-
-@echo off
-echo.
-
-:armv5
-makesis devdiagapp.pkg devdiagapp.sis
-if '%errorlevel%'=='0' goto sign
-echo.
-echo SIS creation failed.
-echo Make sure ARMv5 files and plugin CenRep SIS files were built properly.
-goto end
-
-:sign
-echo.
-echo Signing devdiagapp.sis...
-signsis devdiagapp.sis devdiagapp.sisx K:\s60\app\devicecontrol\devicediagnostics\build\s60_rnd\rd_rootca\rd.cer  K:\s60\app\devicecontrol\devicediagnostics\build\s60_rnd\rd_rootca\rd-key.pem
-if '%errorlevel%'=='0' goto done
-echo SIS signing failed.  Check the certificates.
-goto end
-
-:done
-echo Created devdiagapp.sisx
-#del /Q devdiagapp_Udeb.sis
-:end
--- a/devicediagnostics/build/cenrep/cenrep.bat	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,172 +0,0 @@
-rem
-rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-rem All rights reserved.
-rem This component and the accompanying materials are made available
-rem under the terms of "Eclipse Public License v1.0"
-rem which accompanies this distribution, and is available
-rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
-rem
-rem Initial Contributors:
-rem Nokia Corporation - initial contribution.
-rem
-rem Contributors:
-rem
-rem Description:
-rem
-
-@rd /s /q output
-
-
-
-@echo DevDiagApp
-@echo off
-set CENREP_DIR=%CD%
-\epoc32\tools\cenrep\cenrep.pl -o "%CENREP_DIR%\output" -l "%CENREP_DIR%\keys_devdiag.xls" -p 3.2
-copy "%CENREP_DIR%\output\inifiles\2000E542.txt" \epoc32\RELEASE\winscw\udeb\Z\private\10202be9\
-copy "%CENREP_DIR%\output\inifiles\2000E542.txt" \epoc32\RELEASE\winscw\urel\Z\private\10202be9\
-copy "%CENREP_DIR%\output\inifiles\2000E542.txt" \epoc32\RELEASE\armv5\udeb\Z\private\10202be9\
-copy "%CENREP_DIR%\output\inifiles\2000E542.txt" \epoc32\RELEASE\armv5\urel\Z\private\10202be9\
-copy "%CENREP_DIR%\output\inifiles\2000E542.txt" \epoc32\data\Z\private\10202be9\
-echo.
-
-
-@echo DiagBrowserPlugin
-@echo off
-set CENREP_DIR=%CD%
-\epoc32\tools\cenrep\cenrep.pl -o "%CENREP_DIR%\output" -l "%CENREP_DIR%\keys_diagbrowserplugin.xls" -p 5.0
-copy "%CENREP_DIR%\output\inifiles\2000E59A.txt" \epoc32\RELEASE\winscw\udeb\Z\private\10202be9\
-copy "%CENREP_DIR%\output\inifiles\2000E59A.txt" \epoc32\RELEASE\winscw\urel\Z\private\10202be9\
-copy "%CENREP_DIR%\output\inifiles\2000E59A.txt" \epoc32\RELEASE\armv5\udeb\Z\private\10202be9\
-copy "%CENREP_DIR%\output\inifiles\2000E59A.txt" \epoc32\RELEASE\armv5\urel\Z\private\10202be9\
-copy "%CENREP_DIR%\output\inifiles\2000E59A.txt" \epoc32\data\Z\private\10202be9\
-echo.
-
-
-@echo DiagDataNetworkPlugin
-@set XLS_FILE=keys_DiagDataNetworkTestPlugin.xls
-@set INI_FILE=2000E598.txt
-@set RELEASE=3.2
-
-@set CENREP_DIR=%CD%
-@cd \epoc32\tools\cenrep
-
-cenrep.pl -o "%CENREP_DIR%\output" -l "%CENREP_DIR%\%XLS_FILE%" -p %RELEASE%
-copy "%CENREP_DIR%\output\inifiles\%INI_FILE%" \epoc32\RELEASE\winscw\udeb\Z\private\10202be9\
-copy "%CENREP_DIR%\output\inifiles\%INI_FILE%" \epoc32\RELEASE\winscw\udeb\Z\private\10202be9\
-copy "%CENREP_DIR%\output\inifiles\%INI_FILE%" \epoc32\RELEASE\winscw\urel\Z\private\10202be9\
-copy "%CENREP_DIR%\output\inifiles\%INI_FILE%" \epoc32\RELEASE\armv5\udeb\Z\private\10202be9\
-copy "%CENREP_DIR%\output\inifiles\%INI_FILE%" \epoc32\RELEASE\armv5\urel\Z\private\10202be9\
-copy "%CENREP_DIR%\output\inifiles\%INI_FILE%" \epoc32\data\Z\private\10202be9\
-@cd "%CENREP_DIR%"
-
-
-@echo DiagEarPiecePlugin
-@set XLS_FILE=keys_DiagAudioRecorderPlugin.xls
-@set INI_FILE=2000E58C.txt
-@set RELEASE=3.2
-
-@set CENREP_DIR=%CD%
-@cd \epoc32\tools\cenrep
-
-cenrep.pl -o "%CENREP_DIR%\output" -l "%CENREP_DIR%\%XLS_FILE%" -p %RELEASE%
-copy "%CENREP_DIR%\output\inifiles\%INI_FILE%" \epoc32\RELEASE\winscw\udeb\Z\private\10202be9\
-copy "%CENREP_DIR%\output\inifiles\%INI_FILE%" \epoc32\RELEASE\winscw\udeb\Z\private\10202be9\
-copy "%CENREP_DIR%\output\inifiles\%INI_FILE%" \epoc32\RELEASE\winscw\urel\Z\private\10202be9\
-copy "%CENREP_DIR%\output\inifiles\%INI_FILE%" \epoc32\RELEASE\armv5\udeb\Z\private\10202be9\
-copy "%CENREP_DIR%\output\inifiles\%INI_FILE%" \epoc32\RELEASE\armv5\urel\Z\private\10202be9\
-copy "%CENREP_DIR%\output\inifiles\%INI_FILE%" \epoc32\data\Z\private\10202be9\
-@cd "%CENREP_DIR%"
-
-
-@echo DiagLoudspeakerPlugin
-@set XLS_FILE=keys_DiagSpeakerTestPlugin.xls
-@set INI_FILE=2000E58E.txt
-@set RELEASE=3.2
-
-@set CENREP_DIR=%CD%
-@cd \epoc32\tools\cenrep
-
-cenrep.pl -o "%CENREP_DIR%\output" -l "%CENREP_DIR%\%XLS_FILE%" -p %RELEASE%
-copy "%CENREP_DIR%\output\inifiles\%INI_FILE%" \epoc32\RELEASE\winscw\udeb\Z\private\10202be9\
-copy "%CENREP_DIR%\output\inifiles\%INI_FILE%" \epoc32\RELEASE\winscw\udeb\Z\private\10202be9\
-copy "%CENREP_DIR%\output\inifiles\%INI_FILE%" \epoc32\RELEASE\winscw\urel\Z\private\10202be9\
-copy "%CENREP_DIR%\output\inifiles\%INI_FILE%" \epoc32\RELEASE\armv5\udeb\Z\private\10202be9\
-copy "%CENREP_DIR%\output\inifiles\%INI_FILE%" \epoc32\RELEASE\armv5\urel\Z\private\10202be9\
-copy "%CENREP_DIR%\output\inifiles\%INI_FILE%" \epoc32\data\Z\private\10202be9\
-@cd "%CENREP_DIR%"
-
-
-@echo DiagNetCoveragePlugin
-@set XLS_FILE=keys_pdnetworkcoveragetest.xls
-@set INI_FILE=2000E596.txt
-@set RELEASE=3.2
-
-@set CENREP_DIR=%CD%
-@cd \epoc32\tools\cenrep
-
-cenrep.pl -o "%CENREP_DIR%\output" -l "%CENREP_DIR%\%XLS_FILE%" -p %RELEASE%
-copy "%CENREP_DIR%\output\inifiles\%INI_FILE%" \epoc32\RELEASE\winscw\udeb\Z\private\10202be9\
-copy "%CENREP_DIR%\output\inifiles\%INI_FILE%" \epoc32\RELEASE\winscw\udeb\Z\private\10202be9\
-copy "%CENREP_DIR%\output\inifiles\%INI_FILE%" \epoc32\RELEASE\winscw\urel\Z\private\10202be9\
-copy "%CENREP_DIR%\output\inifiles\%INI_FILE%" \epoc32\RELEASE\armv5\udeb\Z\private\10202be9\
-copy "%CENREP_DIR%\output\inifiles\%INI_FILE%" \epoc32\RELEASE\armv5\urel\Z\private\10202be9\
-copy "%CENREP_DIR%\output\inifiles\%INI_FILE%" \epoc32\data\Z\private\10202be9\
-@cd "%CENREP_DIR%"
-
-
-
-@echo DiagVibratePlugin
-@set XLS_FILE=keys_devdiagvibratest.xls
-@set INI_FILE=2000E586.txt
-@set RELEASE=3.2
-
-@set CENREP_DIR=%CD%
-@cd \epoc32\tools\cenrep
-
-cenrep.pl -o "%CENREP_DIR%\output" -l "%CENREP_DIR%\%XLS_FILE%" -p %RELEASE%
-copy "%CENREP_DIR%\output\inifiles\%INI_FILE%" \epoc32\RELEASE\winscw\udeb\Z\private\10202be9\
-copy "%CENREP_DIR%\output\inifiles\%INI_FILE%" \epoc32\RELEASE\winscw\udeb\Z\private\10202be9\
-copy "%CENREP_DIR%\output\inifiles\%INI_FILE%" \epoc32\RELEASE\winscw\urel\Z\private\10202be9\
-copy "%CENREP_DIR%\output\inifiles\%INI_FILE%" \epoc32\RELEASE\armv5\udeb\Z\private\10202be9\
-copy "%CENREP_DIR%\output\inifiles\%INI_FILE%" \epoc32\RELEASE\armv5\urel\Z\private\10202be9\
-copy "%CENREP_DIR%\output\inifiles\%INI_FILE%" \epoc32\data\Z\private\10202be9\
-@cd "%CENREP_DIR%"
-
-
-@echo DiagFramework
-@set XLS_FILE=keys_diagnosticsfw.xls
-@set INI_FILE=2000B16B.txt
-@set RELEASE=3.2
-
-@set CENREP_DIR=%CD%
-@cd \epoc32\tools\cenrep
-
-cenrep.pl -o "%CENREP_DIR%\output" -l "%CENREP_DIR%\%XLS_FILE%" -p %RELEASE%
-copy "%CENREP_DIR%\output\inifiles\%INI_FILE%" \epoc32\RELEASE\winscw\udeb\Z\private\10202be9\
-copy "%CENREP_DIR%\output\inifiles\%INI_FILE%" \epoc32\RELEASE\winscw\udeb\Z\private\10202be9\
-copy "%CENREP_DIR%\output\inifiles\%INI_FILE%" \epoc32\RELEASE\winscw\urel\Z\private\10202be9\
-copy "%CENREP_DIR%\output\inifiles\%INI_FILE%" \epoc32\RELEASE\armv5\udeb\Z\private\10202be9\
-copy "%CENREP_DIR%\output\inifiles\%INI_FILE%" \epoc32\RELEASE\armv5\urel\Z\private\10202be9\
-copy "%CENREP_DIR%\output\inifiles\%INI_FILE%" \epoc32\data\Z\private\10202be9\
-@cd "%CENREP_DIR%"
-
-
-@echo ResultsDatabaseServer
-@set XLS_FILE=keys_diagresultsdb.xls
-@set INI_FILE=2000B45D.txt
-@set RELEASE=3.2
-
-@set CENREP_DIR=%CD%
-@cd \epoc32\tools\cenrep
-
-cenrep.pl -o "%CENREP_DIR%\output" -l "%CENREP_DIR%\%XLS_FILE%" -p %RELEASE%
-copy "%CENREP_DIR%\output\inifiles\%INI_FILE%" \epoc32\RELEASE\winscw\udeb\Z\private\10202be9\
-copy "%CENREP_DIR%\output\inifiles\%INI_FILE%" \epoc32\RELEASE\winscw\udeb\Z\private\10202be9\
-copy "%CENREP_DIR%\output\inifiles\%INI_FILE%" \epoc32\RELEASE\winscw\urel\Z\private\10202be9\
-copy "%CENREP_DIR%\output\inifiles\%INI_FILE%" \epoc32\RELEASE\armv5\udeb\Z\private\10202be9\
-copy "%CENREP_DIR%\output\inifiles\%INI_FILE%" \epoc32\RELEASE\armv5\urel\Z\private\10202be9\
-copy "%CENREP_DIR%\output\inifiles\%INI_FILE%" \epoc32\data\Z\private\10202be9\
-@cd "%CENREP_DIR%"
-
-@echo ================= done. Hit any key to continue ==================
-@pause
\ No newline at end of file
Binary file devicediagnostics/build/cenrep/keys_devdiag.xls has changed
Binary file devicediagnostics/build/cenrep/keys_devdiagvibratest.xls has changed
Binary file devicediagnostics/build/cenrep/keys_diagaudiorecorderplugin.xls has changed
Binary file devicediagnostics/build/cenrep/keys_diagbrowserplugin.xls has changed
Binary file devicediagnostics/build/cenrep/keys_diagdatanetworktestplugin.xls has changed
Binary file devicediagnostics/build/cenrep/keys_diagnosticsfw.xls has changed
Binary file devicediagnostics/build/cenrep/keys_diagresultsdb.xls has changed
Binary file devicediagnostics/build/cenrep/keys_diagspeakertestplugin.xls has changed
Binary file devicediagnostics/build/cenrep/keys_pdnetworkcoveragetest.xls has changed
--- a/devicediagnostics/build/cenrep_sis.bat	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-rem
-rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-rem All rights reserved.
-rem This component and the accompanying materials are made available
-rem under the terms of "Eclipse Public License v1.0"
-rem which accompanies this distribution, and is available
-rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
-rem
-rem Initial Contributors:
-rem Nokia Corporation - initial contribution.
-rem
-rem Contributors:
-rem
-rem Description:
-rem
-
-@echo off
-echo.
-
-:cenrep
-makesis cenrep_sis.pkg cenrep_sis.SIS
-if '%errorlevel%'=='0' goto signcenrep
-echo CenRep SIS creation failed.  Make sure the CenRep files exist.
-goto end
-
-:signcenrep
-echo.
-echo Signing cenrep_sis.SIS...
-signsis cenrep_sis.SIS cenrep_sis.sisx s60_rnd\rd_rootca\rd.cer s60_rnd\rd_rootca\rd-key.pem
-if '%errorlevel%'=='0' goto cenrepdone
-echo CenRep SIS signing failed.  Check the certificates.
-goto end
-
-:cenrepdone
-echo Created diagbrowserplugin_cenrep.sisx
-del /Q cenrep_sis.SIS
-
-:end
-
--- a/devicediagnostics/build/cenrep_sis.pkg	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +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 "Eclipse Public License v1.0"
-; which accompanies 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
-;01
-
-; Package header
-#{"Device Diagnostics CenReps"},(0x10202BE9),0,1,0,TYPE=SP
-
-;Localised Vendor name
-%{"Nokia San Diego"}
-
-;Unique Vendor name
-:"Nokia"
-
-; Dependency for S60
-[0x101F7961],0,0,0,{"Series60ProductID"}
-
-
-;; =============================================================================
-;; REQUIRED FILES ==============================================================
-;; =============================================================================
-
-;; Phone Doctor Central Repository Files
-"\epoc32\data\Z\private\10202be9\2000E542.txt"-"!:\private\10202be9\2000E542.txt"
-
-
-;; Browser Plugin Central Repository Files
-"\epoc32\data\Z\private\10202be9\2000E59A.txt"-"!:\private\10202be9\2000E59A.txt"
-
-
-;; Data Network Plugin
-"\epoc32\data\Z\private\10202be9\2000E598.txt"-"!:\private\10202be9\2000E598.txt"
-
-
-;; Ear Piece Plugin
-"\epoc32\data\Z\private\10202be9\2000E58C.txt"-"!:\private\10202be9\2000E58C.txt"
-
-
-;; Loud Speaker Plugin
-"\epoc32\data\Z\private\10202be9\2000E58E.txt"-"!:\private\10202be9\2000E58E.txt"
-
-;; Network Coverage
-"\epoc32\data\Z\private\10202be9\2000E596.txt"-"!:\private\10202be9\2000E596.txt"
-
-;; Vibrate plugin
-"\epoc32\data\Z\private\10202be9\2000E586.txt"-"!:\private\10202be9\2000E586.txt"
-
-
-;; DiagFramework
-"\epoc32\data\Z\private\10202be9\2000B16B.txt"-"!:\private\10202be9\2000B16B.txt"
-
-
-;; Diagnostics Results Database Central Repository Files
-"\epoc32\data\Z\private\10202be9\2000B45D.txt" -"!:\private\10202be9\2000B45D.txt"
--- a/devicediagnostics/build/devdiagapp_armv5_udeb.pkg	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,223 +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 "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-; ============================================================================
-;  Name        : devdiagapp_armv5.pkg
-;  Part of     : Device Diagnostics / ARMv5 Package file for R&D
-;  Description : Package file for project Device Diagnostics Application
-;  Version     : %version: % << Don't touch! Updated by Synergy at check-out.
-;
-;  Copyright © 2007 Nokia.  All rights reserved.
-;  This material, including documentation and any related computer
-;  programs, is protected by copyright controlled by Nokia.  All
-;  rights are reserved.  Copying, including reproducing, storing,
-;  adapting or translating, any or all of this material requires the
-;  prior written consent of Nokia.  This material also contains
-;  confidential information which may not be disclosed to others
-;  without the prior written consent of Nokia.
-; ============================================================================
-;  Template version: 4.1
-
-;; =============================================================================
-;; GENERAL DATA ================================================================
-;; =============================================================================
-; Languages
-&EN
-;01
-
-; Package header
-#{"Device Diagnostics"},(0x2000E542),1,0,0,TYPE=SA
-;0xE12E55B4
-;0x2000E542
-;Localised Vendor name
-%{"Nokia"}
-
-;Unique Vendor name
-:"Nokia"
-
-; Dependency for S60
-;[0x1028315F],0,0,0,{"Series60ProductID"} 
-[0x101F7961],0,0,0,{"Series60ProductID"}
-;[0x101F6F88], 0, 0, 0, {"Series60ProductID"}
-
-@"cenrep_sis.sisx",(0x10202BE9)
-
-"\epoc32\release\armv5\udeb\DevDiagApp.exe" 								- "c:\sys\bin\DevDiagApp.exe"
-;"\epoc32\data\z\private\10003a3f\apps\DevDiagApp_reg.rsc" 	-"c:\private\10003a3f\apps\DevDiagApp_reg.rsc"
-"\epoc32\data\z\private\10003a3f\apps\DevDiagApp_reg.rsc" 	-"c:\private\10003a3f\import\apps\DevDiagApp_reg.rsc"
-"\epoc32\data\z\resource\apps\DevDiagApp_loc.rsc"						-"c:\resource\apps\DevDiagApp_loc.rsc"
-
-"\epoc32\data\z\resource\apps\DevDiagApp.rsc" 							-"c:\resource\apps\DevDiagApp.rsc"
-"\epoc32\data\z\resource\apps\devdiagapp.mif"               -"c:\resource\apps\devdiagapp.mif"
-"\epoc32\data\z\resource\apps\DevDiagApp.r01" 							-"c:\resource\apps\DevDiagApp.r01"
-;@"..\cenrep_siscomplete\devdiagapp_reg.SIS",(0x10003a3f)
-
-
-;; Diagnostics Framework Files
-;@"..\cenrep_siscomplete\DiagCenRepKeys.SIS",(0x10202BE9)
-;@"..\cenrep_siscomplete\diagresultsdb_cenrep.sisx",(0x10202BE9)
-"\epoc32\release\armv5\udeb\DiagPluginBase.dll"                     -"c:\sys\bin\DiagPluginBase.dll"
-"\epoc32\release\armv5\udeb\DiagResultsDatabase.dll"                -"c:\sys\bin\DiagResultsDatabase.dll"
-"\epoc32\release\armv5\udeb\diagresultsdatabaseserver.exe"          -"c:\sys\bin\diagresultsdatabaseserver.exe"
-"\epoc32\release\armv5\udeb\DiagFramework.dll"                      -"c:\sys\bin\DiagFramework.dll"
-
-;; Top-Level Suite Files (direct include)
-"\epoc32\release\armv5\udeb\devdiagtoplevelsuiteplugin.dll"             -"c:\sys\bin\devdiagtoplevelsuiteplugin.dll"
-"\epoc32\data\z\resource\devdiagtoplevelsuitepluginrsc.rsc"             -"c:\resource\devdiagtoplevelsuitepluginrsc.rsc"
-"\epoc32\data\z\resource\plugins\devdiagtoplevelsuiteplugin.rsc"        -"c:\resource\plugins\devdiagtoplevelsuiteplugin.rsc"
-
-;; Hardware Suite Files (direct include)
-"\epoc32\release\armv5\udeb\devdiaghardwaresuiteplugin.dll"         -"c:\sys\bin\devdiaghardwaresuiteplugin.dll"
-"\epoc32\data\z\resource\devdiaghardwaresuitepluginrsc.rsc"         -"c:\resource\devdiaghardwaresuitepluginrsc.rsc"
-"\epoc32\data\z\resource\plugins\devdiaghardwaresuiteplugin.rsc"    -"c:\resource\plugins\devdiaghardwaresuiteplugin.rsc"
-"\epoc32\data\z\resource\apps\devdiaghardwaresuiteplugin.mif"       -"c:\resource\apps\devdiaghardwaresuiteplugin.mif"
-
-;; Coverage Suite Files (direct include)
-"\epoc32\release\armv5\udeb\devdiagcoveragesuiteplugin.dll"          -"c:\sys\bin\devdiagcoveragesuiteplugin.dll"
-"\epoc32\data\z\resource\devdiagcoveragesuitepluginrsc.rsc"          -"c:\resource\devdiagcoveragesuitepluginrsc.rsc"
-"\epoc32\data\z\resource\plugins\devdiagcoveragesuiteplugin.rsc"     -"c:\resource\plugins\devdiagcoveragesuiteplugin.rsc"
-"\epoc32\data\z\resource\apps\devdiagcoveragesuiteplugin.mif"        -"c:\resource\apps\devdiagcoveragesuiteplugin.mif"
-
-;; Services Suite Files (direct include)
-"\epoc32\release\armv5\udeb\devdiagservicessuiteplugin.dll"          -"c:\sys\bin\devdiagservicessuiteplugin.dll"
-"\epoc32\data\z\resource\devdiagservicessuitepluginrsc.rsc"          -"c:\resource\devdiagservicessuitepluginrsc.rsc"
-"\epoc32\data\z\resource\plugins\devdiagservicessuiteplugin.rsc"     -"c:\resource\plugins\devdiagservicessuiteplugin.rsc"
-"\epoc32\data\z\resource\apps\devdiagservicessuiteplugin.mif"        -"c:\resource\apps\devdiagservicessuiteplugin.mif"
-
-;; Connectivity Suite Files (direct include)
-"\epoc32\release\armv5\udeb\devdiagconnectivitysuiteplugin.dll"        -"c:\sys\bin\devdiagconnectivitysuiteplugin.dll"
-"\epoc32\data\z\resource\devdiagconnectivitysuitepluginrsc.rsc"        -"c:\resource\devdiagconnectivitysuitepluginrsc.rsc"
-"\epoc32\data\z\resource\plugins\devdiagconnectivitysuiteplugin.rsc"   -"c:\resource\plugins\devdiagconnectivitysuiteplugin.rsc"
-"\epoc32\data\z\resource\apps\devdiagconnectivitysuiteplugin.mif"      -"c:\resource\apps\devdiagconnectivitysuiteplugin.mif"
-
-
-
-
-;; Earpiece Plugin (direct include)
-
-"\epoc32\data\z\resource\DevDiagAudioPluginRsc.r01" -"c:\resource\DevDiagAudioPluginRsc.r01"
-;@"..\cenrep_siscomplete\DiagAudioPluginCenrep.SIS",(0x10202BE9)
-
-"\epoc32\release\armv5\udeb\DevDiagAudioPlugin.dll"                    -"c:\sys\bin\DevDiagAudioPlugin.dll"
-"\epoc32\data\z\resource\DevDiagAudioPluginRsc.rsc"                    -"c:\resource\DevDiagAudioPluginRsc.rsc"
-"\epoc32\data\z\resource\plugins\DevDiagAudioPlugin.rsc"               -"c:\resource\plugins\DevDiagAudioPlugin.rsc"
-
-
-
-;; Charger Plugin (direct include)
-"\epoc32\data\z\resource\DevDiagBatteryChargerCableTestPluginRsc.r01" -"c:\resource\DevDiagBatteryChargerCableTestPluginRsc.r01"
-
-"\epoc32\release\armv5\udeb\DevDiagBatteryChargerCableTestPlugin.dll"          -"c:\sys\bin\DevDiagBatteryChargerCableTestPlugin.dll"
-"\epoc32\data\z\resource\DevDiagBatteryChargerCableTestPluginRsc.rsc"          -"c:\resource\DevDiagBatteryChargerCableTestPluginRsc.rsc"
-"\epoc32\data\z\resource\plugins\DevDiagBatteryChargerCableTestPlugin.rsc"     -"c:\resource\plugins\DevDiagBatteryChargerCableTestPlugin.rsc"
-
-
-;; Browser Plugin (direct include)
-"\epoc32\data\z\resource\devdiagbrowserpluginrsc.r01" -"c:\resource\devdiagbrowserpluginrsc.r01"
-;@"..\cenrep_siscomplete\diagbrowserplugin_cenrep.sisx",(0x10202BE9)
-
-"\epoc32\release\armv5\udeb\devdiagbrowserplugin.dll"                  -"c:\sys\bin\devdiagbrowserplugin.dll"
-"\epoc32\data\Z\resource\devdiagbrowserpluginrsc.rsc"                  -"c:\resource\devdiagbrowserpluginrsc.rsc"
-"\epoc32\data\Z\resource\plugins\devdiagbrowserplugin.rsc"             -"c:\resource\plugins\devdiagbrowserplugin.rsc"
-
-
-;; Data Plugin (direct include)
-"\epoc32\data\z\resource\DevDiagDataNetworkTestPluginRsc.r01" -"c:\resource\DevDiagDataNetworkTestPluginRsc.r01"
-;@"..\cenrep_siscomplete\DiagDataNetworkPluginCenrep.SIS",(0x10202BE9)
-
-"\epoc32\release\armv5\udeb\DevDiagDataNetworkTestPlugin.dll"         -"c:\sys\bin\DevDiagDataNetworkTestPlugin.dll"
-"\epoc32\data\z\resource\DevDiagDataNetworkTestPluginRsc.rsc"         -"c:\resource\DevDiagDataNetworkTestPluginRsc.rsc"
-"\epoc32\data\z\resource\plugins\DevDiagDataNetworkTestPlugin.rsc"    -"c:\resource\plugins\DevDiagDataNetworkTestPlugin.rsc"
-
-
-
-;; External Media Card Plugin (direct include)
-"\epoc32\data\z\resource\DevDiagExternalMediaCardPluginRsc.r01" -"c:\resource\DevDiagExternalMediaCardPluginRsc.r01"
-
-"\epoc32\release\armv5\udeb\DevDiagExternalMediaCardPlugin.dll"         -"c:\sys\bin\DevDiagExternalMediaCardPlugin.dll"
-"\epoc32\data\Z\resource\DevDiagExternalMediaCardPluginRsc.rsc"         -"c:\resource\DevDiagExternalMediaCardPluginRsc.rsc"
-"\epoc32\data\Z\resource\plugins\DevDiagExternalMediaCardPlugin.rsc"    -"c:\resource\plugins\DevDiagExternalMediaCardPlugin.rsc"
-
-
-;; Headset Plugin (direct include)
-"\epoc32\data\z\resource\DevDiagHeadsetCableTestPluginRsc.r01" -"c:\resource\DevDiagHeadsetCableTestPluginRsc.r01"
-
-"\epoc32\release\armv5\udeb\DevDiagHeadsetCableTestPlugin.dll"        -"c:\sys\bin\DevDiagHeadsetCableTestPlugin.dll"
-"\epoc32\data\z\resource\DevDiagHeadsetCableTestPluginRsc.rsc"        -"c:\resource\DevDiagHeadsetCableTestPluginRsc.rsc"
-"\epoc32\data\z\resource\plugins\DevDiagHeadsetCableTestPlugin.rsc"   -"c:\resource\plugins\DevDiagHeadsetCableTestPlugin.rsc"
-
-
-;; Internal Memory Plugin (direct include)
-"\epoc32\release\armv5\udeb\DevDiagInternalMemoryPlugin.dll"           -"c:\sys\bin\devdiaginternalmemoryplugin.dll"
-"\epoc32\data\z\resource\DevDiagInternalMemoryPluginRsc.rsc"           -"c:\resource\devdiaginternalmemorypluginrsc.rsc"
-"\epoc32\data\z\resource\plugins\DevDiagInternalMemoryPlugin.rsc"      -"c:\resource\plugins\devdiaginternalmemoryplugin.rsc"
-
-
-;; Network Coverage Plugin (direct include)
-"\epoc32\data\z\resource\DevDiagNetCoveragePluginRsc.r01" -"c:\resource\DevDiagNetCoveragePluginRsc.r01"
-;@"..\cenrep_siscomplete\DiagNetCoverageCRKeys.SIS",(0x10202BE9)
-
-"\epoc32\release\armv5\udeb\DevDiagNetCoveragePlugin.dll"              -"c:\sys\bin\DevDiagNetCoveragePlugin.dll"
-"\epoc32\data\Z\resource\DevDiagNetCoveragePluginRsc.rsc"              -"c:\resource\DevDiagNetCoveragePluginRsc.rsc"
-"\epoc32\data\Z\resource\plugins\DevDiagNetCoveragePlugin.rsc"         -"c:\resource\plugins\DevDiagNetCoveragePlugin.rsc"
-
-
-;; Speaker Plugin (direct include)
-"\epoc32\data\z\resource\DevDiagSpeakerPluginRsc.r01" -"c:\resource\DevDiagSpeakerPluginRsc.r01"
-;@"..\cenrep_siscomplete\DiagSpeakerPluginCenrep.SIS",(0x10202BE9)
-
-"\epoc32\release\armv5\udeb\DevDiagSpeakerPlugin.dll"                  -"c:\sys\bin\DevDiagSpeakerPlugin.dll"
-"\epoc32\data\z\resource\DevDiagSpeakerPluginRsc.rsc"                  -"c:\resource\DevDiagSpeakerPluginRsc.rsc"
-"\epoc32\data\z\resource\plugins\DevDiagSpeakerPlugin.rsc"             -"c:\resource\plugins\DevDiagSpeakerPlugin.rsc"
-
-
-;; Vibrate Plugin (direct include)
-"\epoc32\data\z\resource\DevDiagVibratePluginRsc.r01" -"c:\resource\DevDiagVibratePluginRsc.r01"
-
-;@"..\cenrep_siscomplete\DiagVibrateCRKeys.SIS",(0x10202BE9)
-
-"\epoc32\release\armv5\udeb\DevDiagVibratePlugin.dll"                  -"c:\sys\bin\DevDiagVibratePlugin.dll"
-"\epoc32\data\Z\resource\DevDiagVibratePluginRsc.rsc"                  -"c:\resource\DevDiagVibratePluginRsc.rsc"
-"\epoc32\data\Z\resource\plugins\DevDiagVibratePlugin.rsc"             -"c:\resource\plugins\DevDiagVibratePlugin.rsc"
-
-
-"\epoc32\data\z\resource\DevDiagUSBCableTestPluginRsc.r01" -"c:\resource\DevDiagUSBCableTestPluginRsc.r01"
-
-"\epoc32\release\armv5\udeb\DevDiagUSBCableTestPlugin.dll"                  -"c:\sys\bin\DevDiagUSBCableTestPlugin.dll"
-"\epoc32\data\Z\resource\DevDiagUsbCableTestPluginRsc.rsc"                  -"c:\resource\DevDiagUsbCableTestPluginRsc.rsc"
-"\epoc32\data\Z\resource\plugins\DevDiagUSBCableTestPlugin.rsc"             -"c:\resource\plugins\DevDiagUSBCableTestPlugin.rsc"
-
-
-;; Bluetooth Plugin (direct include)
-;"\epoc32\data\z\resource\DevDiagBluetoothPluginRsc.r01" -"c:\resource\DevDiagBluetoothPluginRsc.r01"
-
-;@"..\cenrep_siscomplete\DiagBluetoothCRKeys.SIS",(0x10202BE9)
-
-;"\epoc32\release\armv5\udeb\DevDiagBluetoothPlugin.dll"                  -"c:\sys\bin\DevDiagBluetoothPlugin.dll"
-;"\epoc32\data\Z\resource\DevDiagBluetoothPluginRsc.rsc"                  -"c:\resource\DevDiagBluetoothPluginRsc.rsc"
-;"\epoc32\data\Z\resource\plugins\DevDiagBluetoothPlugin.rsc"             -"c:\resource\plugins\DevDiagBluetoothPlugin.rsc"
-
-
-
-
-
-
-
-
-
-
-
-
--- a/devicediagnostics/build/devdiagapp_cenrep.pkg	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +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 "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-; ============================================================================
-;  Name        : devdiagapp_armv5.pkg
-;  Part of     : Device Diagnostics / ARMv5 Package file for R&D
-;  Description : Package file for project Device Diagnostics Application
-;  Version     : %version: % << Don't touch! Updated by Synergy at check-out.
-;
-;  Copyright © 2007-2007 Nokia.  All rights reserved.
-;  This material, including documentation and any related computer
-;  programs, is protected by copyright controlled by Nokia.  All
-;  rights are reserved.  Copying, including reproducing, storing,
-;  adapting or translating, any or all of this material requires the
-;  prior written consent of Nokia.  This material also contains
-;  confidential information which may not be disclosed to others
-;  without the prior written consent of Nokia.
-; ============================================================================
-;  Template version: 4.1
-
-;; =============================================================================
-;; GENERAL DATA ================================================================
-;; =============================================================================
-; Languages
-&EN
-;01
-
-; Package header
-#{"Device Diagnostics CenReps"},(0x10202BE9),0,1,0,TYPE=SP
-
-;Localised Vendor name
-%{"Nokia San Diego"}
-
-;Unique Vendor name
-:"Nokia"
-
-; Dependency for S60
-[0x101F7961],0,0,0,{"Series60ProductID"}
-
-
-;; =============================================================================
-;; REQUIRED FILES ==============================================================
-;; =============================================================================
-
-;; Phone Doctor Central Repository Files
-"\epoc32\data\Z\private\10202be9\2000E542.txt"-"!:\private\10202be9\2000E542.txt"
--- a/devicediagnostics/build/devdiagapp_udeb_sis.bat	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-rem
-rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-rem All rights reserved.
-rem This component and the accompanying materials are made available
-rem under the terms of "Eclipse Public License v1.0"
-rem which accompanies this distribution, and is available
-rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
-rem
-rem Initial Contributors:
-rem Nokia Corporation - initial contribution.
-rem
-rem Contributors:
-rem
-rem Description:
-rem
-
-@echo off
-echo.
-
-:armv5
-makesis devdiagapp_armv5_udeb.pkg devdiagapp_UDeb.sis
-if '%errorlevel%'=='0' goto sign
-echo.
-echo SIS creation failed.
-echo Make sure ARMv5 files and plugin CenRep SIS files were built properly.
-goto end
-
-:sign
-echo.
-echo Signing devdiagapp_UDeb.sis...
-signsis devdiagapp_UDeb.sis devdiagapp_UDeb.sisx s60_rnd\rd_rootca\rd.cer s60_rnd\rd_rootca\rd-key.pem
-if '%errorlevel%'=='0' goto done
-echo SIS signing failed.  Check the certificates.
-goto end
-
-:done
-echo Created devdiagapp_UDeb.sisx
-#del /Q devdiagapp_Udeb.sis
-
-:end
--- a/devicediagnostics/build/s60_rnd/rd_rootca/rd-key.pem	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
------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/devicediagnostics/build/s60_rnd/rd_rootca/rd.cer	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
------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/devicediagnostics/devdiagapp/cenrep_files/clean_cenrep.bat	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-rem
-rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-rem All rights reserved.
-rem This component and the accompanying materials are made available
-rem under the terms of "Eclipse Public License v1.0"
-rem which accompanies this distribution, and is available
-rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
-rem
-rem Initial Contributors:
-rem Nokia Corporation - initial contribution.
-rem
-rem Contributors:
-rem
-rem Description:
-rem
-
-@rd /s /q output
--- a/devicediagnostics/devdiagapp/cenrep_files/create_cenrep.bat	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-rem
-rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-rem All rights reserved.
-rem This component and the accompanying materials are made available
-rem under the terms of "Eclipse Public License v1.0"
-rem which accompanies this distribution, and is available
-rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
-rem
-rem Initial Contributors:
-rem Nokia Corporation - initial contribution.
-rem
-rem Contributors:
-rem
-rem Description:
-rem
-
-@echo off
-set CENREP_DIR=%CD%
-\epoc32\tools\cenrep\cenrep.pl -o "%CENREP_DIR%\output" -l "%CENREP_DIR%\keys_devdiag.xls" -p 3.2
-copy "%CENREP_DIR%\output\inifiles\2000E542.txt" \epoc32\RELEASE\winscw\udeb\Z\private\10202be9\
-copy "%CENREP_DIR%\output\inifiles\2000E542.txt" \epoc32\RELEASE\winscw\urel\Z\private\10202be9\
-copy "%CENREP_DIR%\output\inifiles\2000E542.txt" \epoc32\RELEASE\armv5\udeb\Z\private\10202be9\
-copy "%CENREP_DIR%\output\inifiles\2000E542.txt" \epoc32\RELEASE\armv5\urel\Z\private\10202be9\
-copy "%CENREP_DIR%\output\inifiles\2000E542.txt" \epoc32\data\Z\private\10202be9\
-echo.
\ No newline at end of file
Binary file devicediagnostics/devdiagapp/cenrep_files/keys_devdiag.xls has changed
Binary file devicediagnostics/devdiagapp/cenrep_files/output/inifiles/2000E542.txt has changed
Binary file devicediagnostics/devdiagapp/cenrep_files/output/key_sheets_info.storable has changed
--- a/devicediagnostics/devdiagapp/cenrep_files/output/rfs/cenrep_rfs.txt	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-ÿþ
\ No newline at end of file
Binary file devicediagnostics/devdiagapp/conf/devdiag.confml has changed
Binary file devicediagnostics/devdiagapp/conf/devdiag_2000E542.crml has changed
--- a/devicediagnostics/devdiagapp/data/devdiagapp.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,692 +0,0 @@
-/*
-* 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:  Resource file
-*
-*/
-
-
-NAME DDAP
-
-#include <eikon.rh>
-
-#include <avkon.rh>
-#include <avkon.rsg>
-
-#include <appinfo.rh>
-#include <avkon.loc>
-#include <avkon.mbg>
-#include <avkon.rsg>
-#include <AvkonIcons.hrh>
-#include <bldvariant.hrh>
-#include <avkon.hrh>
-
-#include <data_caging_paths_strings.hrh>
-#include <uikon.rh>
-
-
-#include "devdiagapp.hrh"
-#include <devdiagapp.loc>
-
-// ---------------------------------------------------------
-//   
-//    Define the resource file signature 
-//    This resource should be empty.
-//
-// ---------------------------------------------------------
-//
-RESOURCE RSS_SIGNATURE { }
-
-// ---------------------------------------------------------
-//   
-//    Default Document Name
-//
-// ---------------------------------------------------------
-//
-RESOURCE TBUF r_default_document_name { buf=""; }
-
-// ---------------------------------------------------------
-//   
-//    Define default menu and CBA key.
-//
-// ---------------------------------------------------------
-//
-RESOURCE EIK_APP_INFO
-    {
-    menubar = r_dd_menubar_diagnostics_view;
-    cba = r_dd_softkeys_options_back;
-    }
-
-RESOURCE TBUF r_gs_diagnostics_view_caption
-    {
-    buf = qtn_diag_diagnostics_title;
-    }
-
-
-
-RESOURCE TITLE_PANE r_gs_csd_view_title
-    {
-    txt = qtn_diag_diagnostics_title;
-    }
-
-
-RESOURCE CBA r_dd_softkeys_options_back_open
-    {
-    buttons =
-        {
-        CBA_BUTTON 
-            {
-            id=EAknSoftkeyOptions; 
-            txt = text_softkey_option;
-            },
-        CBA_BUTTON 
-            {
-            id=EAknSoftkeyBack; 
-            txt = text_softkey_back; 
-            },
-        CBA_BUTTON 
-            {
-            id=EDDCmdOpen; 
-            txt = qtn_msk_open;
-            }
-        };
-    }
- 
-
- RESOURCE CBA r_dd_softkeys_options_back
-    {
-    buttons =
-        {
-        CBA_BUTTON 
-            {
-            id=EAknSoftkeyOptions; 
-            txt = text_softkey_option;
-            },
-        CBA_BUTTON 
-            {
-            id=EAknSoftkeyBack; 
-            txt = text_softkey_back; 
-            },
-        CBA_BUTTON 
-            { 
-            id = EAknSoftkeyContextOptions; 
-            txt = text_softkey_option; 
-            }   
-            
-        };
-    }
-
-RESOURCE AVKON_VIEW r_gs_dd_view
-    {
-    menubar = r_dd_menubar_diagnostics_view;
-    cba = r_dd_softkeys_options_back_open;
-    }
-
-RESOURCE AVKON_VIEW r_dd_hw_plugin_view
-    {
-    menubar = r_dd_menubar_hw_plugin;
-    cba = r_dd_softkeys_options_back;
-    }
-
-RESOURCE AVKON_VIEW r_dd_connectivity_plugin_view
-    {
-    menubar = r_dd_menubar_connectivity_plugin;
-    cba = r_dd_softkeys_options_back;
-    }
-
-RESOURCE AVKON_VIEW r_dd_service_plugin_view
-    {
-    menubar = r_dd_menubar_service_plugin;
-    cba = r_dd_softkeys_options_back;
-    }
-
-RESOURCE AVKON_VIEW r_dd_coverage_plugin_view
-    {
-    menubar = r_dd_menubar_coverage_plugin;
-    cba = r_dd_softkeys_options_back;
-    }
-
-RESOURCE MENU_BAR r_dd_hw_context_menubar
-  {
-  titles =
-      {
-      MENU_TITLE { menu_pane = r_dd_menupane_hw_context;    txt = ""; }
-      };
-  }
-  
-RESOURCE MENU_BAR r_dd_connectivity_context_menubar
-  {
-  titles =
-      {
-      MENU_TITLE { menu_pane = r_dd_menupane_connectivity_context;    txt = ""; }
-      };
-  } 
-  
- RESOURCE MENU_BAR r_dd_service_context_menubar
-  {
-  titles =
-      {
-      MENU_TITLE { menu_pane = r_dd_menupane_service_context;    txt = ""; }
-      };
-  } 
-  
-  RESOURCE MENU_BAR r_dd_coverage_context_menubar
-  {
-  titles =
-      {
-      MENU_TITLE { menu_pane = r_dd_menupane_coverage_context;    txt = ""; }
-      };
-  }  
-
-RESOURCE MENU_BAR r_dd_menubar_diagnostics_view
-  {
-  titles =
-      {
-      MENU_TITLE { menu_pane = r_dd_menu_diagnostics_view;    txt = ""; }
-      };
-  }
-
-
-RESOURCE MENU_BAR r_dd_menubar_hw_plugin
-  {
-  titles =
-      {
-      MENU_TITLE { menu_pane = r_dd_menupane_plugin;    txt = ""; },
-      MENU_TITLE { menu_pane = r_dd_menupane_hw_context;    txt = ""; }
-      };
-  }
-
-RESOURCE MENU_BAR r_dd_menubar_connectivity_plugin
-  {
-  titles =
-      {     
-      MENU_TITLE { menu_pane = r_dd_menupane_plugin;     txt = ""; },
-      MENU_TITLE { menu_pane = r_dd_menupane_connectivity_context;    txt = ""; }
-      };
-  }
-
-RESOURCE MENU_BAR r_dd_menubar_service_plugin
-  {
-  titles =
-      {      
-      MENU_TITLE { menu_pane =  r_dd_menupane_plugin;    txt = ""; },
-      MENU_TITLE { menu_pane =  r_dd_menupane_service_context;    txt = ""; }
-      };
-  }
-
-RESOURCE MENU_BAR r_dd_menubar_coverage_plugin
-  {
-  titles =
-      {
-      MENU_TITLE { menu_pane = r_dd_menupane_plugin;    txt = ""; },
-      MENU_TITLE { menu_pane = r_dd_menupane_coverage_context;    txt = ""; }
-      };
-  }
-  
-  
-RESOURCE MENU_PANE r_dd_menupane_plugin	
-    {
-    items =
-        {
-    	MENU_ITEM { command = EDDMenuCmdMainHelp; 	  txt = qtn_options_help; },
-        MENU_ITEM { command = EEikCmdExit;          	  txt = qtn_options_exit; }       
-        };
-    }
-
-RESOURCE MENU_PANE r_dd_menupane_hw_context
-    {
-    items =
-        {
-        MENU_ITEM { command = EDDCmdPerformSingle;        txt = qtn_diag_options_perform_test; },
-        MENU_ITEM { command = EDDCmdPerformAllHwTests;    txt = qtn_diag_options_perform_hardware_tests; } 
-        };
-    }
-
-RESOURCE MENU_PANE r_dd_menupane_connectivity_context
-    {
-    items =
-        {
-       MENU_ITEM { command = EDDCmdPerformSingle;        txt = qtn_diag_options_perform_test; }
-      // MENU_ITEM { command = EDDCmdPerformAllConnTests;  txt = qtn_diag_options_perform_connectivity_tests; } 
-
-        };
-    }
-
-
-
-RESOURCE MENU_PANE r_dd_menupane_service_context
-    {
-    items =
-        {
-        MENU_ITEM { command = EDDCmdPerformSingle;           txt = qtn_diag_options_perform_test; }
-       // MENU_ITEM { command = EDDCmdPerformAllServiceTests;  txt = qtn_diag_options_perform_services_tests; }
-        };
-    }
-
-RESOURCE MENU_PANE r_dd_menupane_coverage_context
-    {
-    items =
-        {
-        MENU_ITEM { command = EDDCmdPerformSingle;            txt = qtn_diag_options_perform_test; },
-        MENU_ITEM { command = EDDCmdPerformAllCoverageTests;  txt = qtn_diag_options_perform_coverage_tests; }
-        };
-    }
-
-
-RESOURCE MENU_PANE r_dd_menu_diagnostics_view	
-    {
-    items =
-        {
-        MENU_ITEM { command = EDDCmdOpen;               txt = qtn_options_open; },
-        MENU_ITEM { command = EDDCmdPerformAllTests;    txt = qtn_diag_options_perform_all_tests; },
-    	MENU_ITEM { command = EDDMenuCmdMainHelp; 	txt = qtn_options_help; },
-        MENU_ITEM { command = EEikCmdExit;          	txt = qtn_options_exit; }
-       
-        };
-    }
-
-
-RESOURCE DIALOG r_message_query_perform_all_hw_tests
-   {
-   flags = EGeneralQueryFlags;
-   buttons = R_AVKON_SOFTKEYS_OK_CANCEL;
-   items=
-      {
-      DLG_LINE 
-         {
-         type = EAknCtPopupHeadingPane;
-         id = EAknMessageQueryHeaderId;
-          control = AVKON_HEADING
-           {
-           label = qtn_diag_msg_title_perform_all_hardware_tests;
-           headinglayout = 0;
-           };
-         },
-      DLG_LINE
-         {
-         type = EAknCtMessageQuery;
-         id = EAknMessageQueryContentId;
-         control = AVKON_MESSAGE_QUERY
-            {
-            message = qtn_diag_msg_perform_all_hardware_tests;
-            };
-         }
-      };
-   }
-
-RESOURCE DIALOG r_message_query_perform_all_tests
-   {
-   flags = EGeneralQueryFlags;
-   buttons = R_AVKON_SOFTKEYS_OK_CANCEL;
-   items=
-      {
-      DLG_LINE 
-         {
-         type = EAknCtPopupHeadingPane;
-         id = EAknMessageQueryHeaderId;
-          control = AVKON_HEADING
-           {
-           label = qtn_diag_msg_title_perform_all_tests;
-           headinglayout = 0;
-           };
-         },
-      DLG_LINE
-         {
-         type = EAknCtMessageQuery;
-         id = EAknMessageQueryContentId;
-         control = AVKON_MESSAGE_QUERY
-            {
-            message = qtn_diag_msg_perform_all_tests;
-            };
-         }
-      };
-   }
-
-
-RESOURCE DIALOG r_message_query_perform_all_coverage_tests
-   {
-   flags = EGeneralQueryFlags;
-   buttons = R_AVKON_SOFTKEYS_OK_CANCEL;
-   items=
-      {
-      DLG_LINE 
-         {
-         type = EAknCtPopupHeadingPane;
-         id = EAknMessageQueryHeaderId;
-          control = AVKON_HEADING
-           {
-           label = qtn_diag_msg_title_perform_all_coverage_tests;
-           headinglayout = 0;
-           };
-         },
-      DLG_LINE
-         {
-         type = EAknCtMessageQuery;
-         id = EAknMessageQueryContentId;
-         control = AVKON_MESSAGE_QUERY
-            {
-            message = qtn_diag_msg_perform_all_coverage_tests;
-            };
-         }
-      };
-   }
-
-RESOURCE DIALOG r_devdiag_execute_crashed_test_dialog
-    {
-    flags = EGeneralQueryFlags;
-    buttons = R_AVKON_SOFTKEYS_YES_NO__YES;
-    items =
-        {
-        DLG_LINE
-            {
-            type = EAknCtQuery;
-            id = EGeneralQuery;
-            control = AVKON_CONFIRMATION_QUERY
-                {                
-                layout = EConfirmationQueryLayout;
-                animation = R_QGN_NOTE_QUERY_ANIM;
-                };
-            }
-        };
-    }
-
-RESOURCE DIALOG r_devdiag_execute_crashed_test_messagequery_dialog
-   {
-   flags = EGeneralQueryFlags;
-   buttons = R_AVKON_SOFTKEYS_YES_NO__YES;
-   items=
-      {
-      DLG_LINE 
-         {
-         type = EAknCtPopupHeadingPane;
-         id = EAknMessageQueryHeaderId;
-          control = AVKON_HEADING
-           {           
-           headinglayout = 0;
-           };
-         },
-      DLG_LINE
-         {
-         type = EAknCtMessageQuery;
-         id = EAknMessageQueryContentId;
-         control = AVKON_MESSAGE_QUERY
-            {            
-            };
-         }
-      };
-   }    
-
-
-RESOURCE DIALOG r_devdiag_failed_tests_messagequery_dialog
-   {
-   flags = EGeneralQueryFlags;
-   buttons = R_AVKON_SOFTKEYS_OK_EMPTY;
-   items=
-      {
-      DLG_LINE 
-         {
-         type = EAknCtPopupHeadingPane;
-         id = EAknMessageQueryHeaderId;
-          control = AVKON_HEADING
-           {           
-           label = qtn_diag_msg_title_test_results;
-           headinglayout = 0;
-           };
-         },
-      DLG_LINE
-         {
-         type = EAknCtMessageQuery;
-         id = EAknMessageQueryContentId;
-         control = AVKON_MESSAGE_QUERY
-            {            
-            };
-         }
-      };
-   }    
-
-// ---------------------------------------------------------------------------
-// r_dev_diag_preparing_wait_note
-// The dialog to inform the user that loading of the plug-ins takes some time.
-// ---------------------------------------------------------------------------
-//
-RESOURCE DIALOG r_dev_diag_preparing_wait_note
-    {
-    flags = EAknWaitNoteFlags;
-    buttons = R_AVKON_SOFTKEYS_EMPTY;
-    items =
-        {
-        DLG_LINE
-            {
-            type = EAknCtNote;
-            id = EDevDiagApplicationWaitNote;
-            control = AVKON_NOTE
-                {
-                layout = EWaitLayout;
-                singular_label = qtn_diag_wait_note_loading_test;
-                imagefile = "\\resource\\apps\\avkon2.mbm";
-                imageid = EMbmAvkonQgn_note_progress;
-                imagemask = EMbmAvkonQgn_note_progress_mask;
-                animation = R_QGN_GRAF_WAIT_BAR_ANIM;
-                };
-            }
-        };
-    }
-    
-// ADO & Platformization Changes   
-RESOURCE DIALOG r_message_query_help_note
-   {
-   flags = EGeneralQueryFlags;
-   buttons = R_AVKON_SOFTKEYS_OK_CANCEL;
-   items=
-      {
-      DLG_LINE 
-         {
-         type = EAknCtPopupHeadingPane;
-         id = EAknMessageQueryHeaderId;
-          control = AVKON_HEADING
-           {
-           label = qtn_diag_msg_title_help;
-           headinglayout = 0;
-           };
-         },
-      DLG_LINE
-         {
-         type = EAknCtMessageQuery;
-         id = EAknMessageQueryContentId;
-         control = AVKON_MESSAGE_QUERY
-            {
-            message = qtn_diag_msg_help;
-            };
-         }
-      };
-   }
-   
- // changes ends
-
-// ---------------------------------------------------------------------------
-// r_devdiag_low_disk_dialog
-// The dialog to inform the user that they do not have enough disk space to
-// run tests at this time.
-// ---------------------------------------------------------------------------
-//
-RESOURCE DIALOG r_devdiag_low_disk_dialog
-    {
-    flags = EGeneralQueryFlags;
-    buttons = R_AVKON_SOFTKEYS_OK_EMPTY__OK;
-    items =
-        {
-        DLG_LINE
-            {
-            type = EAknCtPopupHeadingPane;
-            id = EAknMessageQueryHeaderId;
-            control = AVKON_HEADING
-                {
-                label = qtn_diag_err_title_memory_low;
-                headinglayout = 0;
-                };
-            },
-        DLG_LINE
-            {
-            type = EAknCtMessageQuery;
-            id = EAknMessageQueryContentId;
-            control = AVKON_MESSAGE_QUERY
-                {
-                message = qtn_diag_err_memory_low;
-                };
-            }
-        };
-    }
-
-// ---------------------------------------------------------------------------
-// r_devdiag_low_battery_dialog
-// The dialog to inform the user that they do not have enough battery to run
-// tests at this time.
-// ---------------------------------------------------------------------------
-//
-RESOURCE DIALOG r_devdiag_low_battery_dialog
-    {
-    flags = EGeneralQueryFlags;
-    buttons = R_AVKON_SOFTKEYS_OK_EMPTY__OK;
-    items =
-        {
-        DLG_LINE
-            {
-            type = EAknCtPopupHeadingPane;
-            id = EAknMessageQueryHeaderId;
-            control = AVKON_HEADING
-                {
-                label = qtn_diag_err_title_battery_low;
-                headinglayout = 0;
-                };
-            },
-        DLG_LINE
-            {
-            type = EAknCtMessageQuery;
-            id = EAknMessageQueryContentId;
-            control = AVKON_MESSAGE_QUERY
-                {
-                message = qtn_diag_err_battery_low;
-                };
-            }
-        };
-    }
-
-
-// ---------------------------------------------------------------------------
-// r_devdiag_cancel_list_query
-// Query cancel mode from the user. It is possible to cancel one or all tests.
-// ---------------------------------------------------------------------------
-//
-RESOURCE AVKON_LIST_QUERY r_devdiag_cancel_list_query
-    {
-    flags = EGeneralQueryFlags;
-    softkeys = R_AVKON_SOFTKEYS_OK_CANCEL;
-    items =
-        {
-        AVKON_LIST_QUERY_DLG_LINE
-            {
-            control = AVKON_LIST_QUERY_CONTROL
-                {
-                listtype = EAknCtSinglePopupMenuListBox;
-                listbox = AVKON_LIST_QUERY_LIST
-                    {
-                    array_id = r_devdiag_cancel_listquery_options;
-                    };
-                heading = qtn_diag_list_query_cancel;
-                };
-            }
-        };
-    }
-    
-
-// ---------------------------------------------------------------------------
-// r_devdiag_cancel_listquery_options
-// Cancel option texts.
-// ---------------------------------------------------------------------------
-//
-RESOURCE ARRAY r_devdiag_cancel_listquery_options
-    {
-    items =
-        {
-        LBUF {txt = qtn_diag_list_query_cancel_selected; },
-        LBUF {txt = qtn_diag_list_query_cancel_rest; }    
-        };
-    }
-
-
-// ---------------------------------------------------------------------------
-// r_devdiag_cancel_list_query
-// Query skip mode from the user. It is possible to skip one or all tests.
-// ---------------------------------------------------------------------------
-//
-RESOURCE AVKON_LIST_QUERY r_devdiag_skip_list_query
-    {
-    flags = EGeneralQueryFlags;
-    softkeys = R_AVKON_SOFTKEYS_OK_CANCEL;
-    items =
-        {
-        AVKON_LIST_QUERY_DLG_LINE
-            {
-            control = AVKON_LIST_QUERY_CONTROL
-                {
-                listtype = EAknCtSinglePopupMenuListBox;
-                listbox = AVKON_LIST_QUERY_LIST
-                    {
-                    array_id = r_devdiag_skip_listquery_options;
-                    };
-                heading = qtn_diag_list_query_skip;
-                };
-            }
-        };
-    }
-    
-
-// ---------------------------------------------------------------------------
-// r_devdiag_skip_listquery_options
-// Skip option texts.
-// ---------------------------------------------------------------------------
-//
-RESOURCE ARRAY r_devdiag_skip_listquery_options
-    {
-    items =
-        {
-        LBUF {txt = qtn_diag_list_query_skip_selected; },
-        LBUF {txt = qtn_diag_list_query_skip_rest; }    
-        };
-    }
-
-RESOURCE TBUF r_diag_title_hardware                      { buf = qtn_diag_title_hardware; }
-
-RESOURCE TBUF r_diag_title_connectivity                  { buf = qtn_diag_title_connectivity; }
-	
-RESOURCE TBUF r_diag_title_service                       { buf = qtn_diag_title_services; }
-
-RESOURCE TBUF r_diag_title_coverage                      { buf = qtn_diag_title_coverage; }
-
-RESOURCE TBUF r_diag_list_not_performed                  { buf = qtn_diag_list_not_performed; }
-
-RESOURCE TBUF r_diag_lst_test_pass                       { buf = qtn_diag_lst_test_pass; }
-
-RESOURCE TBUF r_diag_lst_test_failed                     { buf = qtn_diag_lst_test_failed; }
-
-RESOURCE TBUF r_diag_lst_test_ongoing                     { buf = qtn_diag_lst_test_ongoing; }
-
-RESOURCE TBUF r_diag_conf_test_passed                     { buf = qtn_diag_conf_test_passed; }
-
-RESOURCE TBUF r_diag_conf_test_failed                     { buf = qtn_diag_conf_test_failed; }
-
-RESOURCE TBUF r_diag_conf_query_after_crash               { buf = qtn_diag_conf_query_after_crash; }
-// ADO ,Platformization & UI Spec Changes
-RESOURCE TBUF r_diag_conf_test_passed_1                     { buf = qtn_diag_conf_test_passed_1; }
-
-RESOURCE TBUF r_diag_conf_test_failed_1                     { buf = qtn_diag_conf_test_failed_1; }
--- a/devicediagnostics/devdiagapp/data/devdiagapp_loc.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of diagnostics components
-*
-*/
-// ====================================================================
-// File: DevDiagApp_loc.rss
-// Created: 11/05/07
-// Author: 
-// ==================================================================== */
-
-#include <appinfo.rh>
-#include <devdiagapp.loc>
-
-RESOURCE LOCALISABLE_APP_INFO
-	{
-	short_caption = STRING_short_caption;
-	caption_and_icon =
-		{
-		CAPTION_AND_ICON_INFO 
-			{
-			caption=STRING_r_DevDiagApp_caption;
-			//number_of_icons=3;
-			//icon_file=STRING_r_DevDiagApp_icon_path;
-			}
-		};
-	}
-
- 
-
--- a/devicediagnostics/devdiagapp/data/devdiagapp_reg.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of diagnostics components
-*
-*/
-// ====================================================================
-// File: DevDiagApp_reg.rss
-// Created: 11/05/07
-// Author: 
-// ==================================================================== */
-
-//DevDiagApp application's registration resource file 
-
-#include <appinfo.rh>
-
-UID2 KUidAppRegistrationResourceFile
-UID3 0x2000E542
-
-RESOURCE APP_REGISTRATION_INFO 
-	{
-	app_file="DevDiagApp";
-	//
-	localisable_resource_file="\\resource\\apps\\DevDiagApp_loc";
-	//
-	hidden = KAppIsHidden;
-	embeddability = KAppEmbeddable;
-	}
--- a/devicediagnostics/devdiagapp/group/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-/*
-* 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:  This file provides the information required for building
-*                DevDiagApp
-*
-*/
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-../loc/devdiagapp.loc        MW_LAYER_LOC_EXPORT_PATH(devdiagapp.loc)
-
-../rom_files/devdiagapp_ui.iby            CORE_APP_LAYER_IBY_EXPORT_PATH(devdiagapp_ui.iby)
-../rom_files/devdiagapp_ui_resources.iby  LANGUAGE_APP_LAYER_IBY_EXPORT_PATH(devdiagapp_ui_resources.iby)
-
-// Generic configuration interface for component cenrep settings  
-../conf/devdiag.confml                    MW_LAYER_CONFML(devdiag.confml)
-../conf/devdiag_2000E542.crml	        MW_LAYER_CRML(devdiag_2000E542.crml)
-
-
-PRJ_EXTENSIONS
-#ifdef SBSV2
- 
- START EXTENSION s60/mifconv
- OPTION TARGETFILE devdiagapp.mif
- OPTION HEADERFILE devdiagapp.mbg
- OPTION SOURCES 		-c8,8 qgn_prop_cp_diag_not   -c8,8 qgn_prop_cp_diag_pass	-c8,8 qgn_prop_cp_diag_fail
- END
-#endif
-
-PRJ_MMPFILES
-//gnumakefile devdiag_icons_aif_scalable.mk
-devdiagapp.mmp
-
-#ifndef SBSV2
- gnumakefile devdiag_icons_aif_scalable.mk
-#endif
-
--- a/devicediagnostics/devdiagapp/group/devdiag_icons_aif_scalable.mk	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-#
-# Copyright © 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:
-#    This is a device diagnostics component
-
-ifeq (WINS,$(findstring WINS,$(PLATFORM)))
-//ZDIR=$(EPOCROOT)epoc32\release\$(PLATFORM)\$(CFG)\z
-ZDIR=$(EPOCROOT)epoc32\release\$(PLATFORM)\udeb\z
-else
-ZDIR=$(EPOCROOT)epoc32\data\z
-endif
-
-TARGETDIR=$(ZDIR)\resource\apps
-ICONTARGETFILENAME=$(TARGETDIR)\devdiagapp.mif
-MBGDIR=$(EPOCROOT)epoc32\include
-MBGFILENAME=$(MBGDIR)\devdiagapp.mbg
-
-MAKMAKE : 
-	mifconv $(ICONTARGETFILENAME) \
-		/h$(MBGFILENAME) \
-		/c8,8 qgn_prop_cp_diag_not.svg \
-		/c8,8 qgn_prop_cp_diag_pass.svg \
-		/c8,8 qgn_prop_cp_diag_fail.svg 
-		
-
-BLD : ;
-
-CLEAN : ;
-
-LIB : ;
-
-CLEANLIB : ;
-
-RESOURCE : ;
-
-FREEZE : ;
-
-SAVESPACE : ;
-
-RELEASABLES :
-	@echo $(ICONTARGETFILENAME) && \
-	@echo $(MBGFILENAME)
-
-FINAL : ;
--- a/devicediagnostics/devdiagapp/group/devdiagapp.mmp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,120 +0,0 @@
-/*
-* 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: Implementation of diagnostics components
-*
-*/
-
-
-#include <data_caging_paths.hrh>
-// To get the MW_LAYER_SYSTEMINCLUDE-definition
-#include <platform_paths.hrh>
-
-CAPABILITY All -TCB MULTIMEDIADD USERENVIRONMENT
-
-#ifdef __UI_FRAMEWORKS_V2__
-TARGETPATH	/sys/bin
-#if defined(EKA2) || !defined(WINS)
-TARGET          devdiagapp.exe
-TARGETTYPE exe
-#else // EKA1 WINS
-TARGET          DevDiagApp.app
-TARGETTYPE exedll
-deffile /epoc32/release/wins/DevDiagApp.def
-#endif
-#else // __UI_FRAMEWORKS_V2__
-TARGET          DevDiagApp.app
-TARGETPATH      /system/apps/DevDiagApp
-TARGETTYPE app
-#endif
-
-UID               0x100039CE 0x2000E542
-
-SOURCEPATH        ../src
-
-SOURCE            devdiagapp.cpp
-SOURCE            devdiagappapplication.cpp 
-SOURCE            devdiagsuiteview.cpp
-SOURCE            devdiagsuitecontainer.cpp
-SOURCE            devdiagappappui.cpp
-SOURCE            devdiagappdocument.cpp 
-SOURCE            devdiagengine.cpp
-SOURCE            devdiagexecutionresults.cpp
-SOURCE            devdiagruntimereqsInfo.cpp
-SOURCE            devdiagcommoncanceldialogs.cpp
-SOURCE            devdiagcommonskipdialogs.cpp
-SOURCE            devdiagpluginview.cpp
-SOURCE            devdiagplugincontainer.cpp
-SOURCE            devdiagutil.cpp
-
-SOURCEPATH        ../group
-
-USERINCLUDE       ../inc  
-USERINCLUDE       ../loc
-
-
-
-// Default system include paths for middleware layer modules.
-APP_LAYER_SYSTEMINCLUDE
-
-LIBRARY           euser.lib
-LIBRARY           apparc.lib
-LIBRARY           cone.lib 
-LIBRARY           eikcore.lib  
-LIBRARY           avkon.lib  
-LIBRARY           gdi.lib  
-LIBRARY           eikcoctl.lib 
-LIBRARY           eikctl.lib 
-LIBRARY           bafl.lib
-LIBRARY           eikdlg.lib  
-LIBRARY           featmgr.lib           // Feature manager
-LIBRARY           hlplch.lib            // for "Help" options menu
-LIBRARY           aknicon.lib
-LIBRARY           egul.lib
-
-LIBRARY           diagframework.lib
-LIBRARY           etel3rdparty.lib
-LIBRARY           diagresultsdatabase.lib
-LIBRARY           eiksrv.lib
-LIBRARY           drmserviceapi.lib
-LIBRARY           commonengine.lib  //String loader
-LIBRARY           centralrepository.lib 
-LIBRARY           efsrv.lib 
-
-DEBUGLIBRARY      flogger.lib
-
-#ifdef __UI_FRAMEWORKS_V2__
-START RESOURCE	../data/devdiagapp.rss
-HEADER
-targetpath	/resource/apps
-LANGUAGE_IDS
-end
-#else
-RESOURCE        ../data/DevDiagApp.RSS 
-#endif
-
-#ifdef __UI_FRAMEWORKS_V2__
-sourcepath		.
-START RESOURCE ../data/devdiagapp_reg.rss
-#ifdef WINSCW
-TARGETPATH	/private/10003a3f/apps
-#else
-TARGETPATH	/private/10003a3f/apps
-#endif
-END
-   
-start resource ../data/devdiagapp_loc.rss
-targetpath /resource/apps
-lang sc
-end
-#endif
--- a/devicediagnostics/devdiagapp/group/devdiagapp.xml	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2183 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!DOCTYPE PROJECT [
- <!ELEMENT PROJECT (TARGETLIST, TARGETORDER, GROUPLIST, DESIGNLIST?)>
- <!ELEMENT TARGETLIST (TARGET+)>
- <!ELEMENT TARGET (NAME, SETTINGLIST, FILELIST?, LINKORDER?, SEGMENTLIST?, OVERLAYGROUPLIST?, SUBTARGETLIST?, SUBPROJECTLIST?, FRAMEWORKLIST?, PACKAGEACTIONSLIST?)>
- <!ELEMENT NAME (#PCDATA)>
- <!ELEMENT USERSOURCETREETYPE (#PCDATA)>
- <!ELEMENT PATH (#PCDATA)>
- <!ELEMENT FILELIST (FILE*)>
- <!ELEMENT FILE (PATHTYPE, PATHROOT?, ACCESSPATH?, PATH, PATHFORMAT?, ROOTFILEREF?, FILEKIND?, FILEFLAGS?)>
- <!ELEMENT PATHTYPE (#PCDATA)>
- <!ELEMENT PATHROOT (#PCDATA)>
- <!ELEMENT ACCESSPATH (#PCDATA)>
- <!ELEMENT PATHFORMAT (#PCDATA)>
- <!ELEMENT ROOTFILEREF (PATHTYPE, PATHROOT?, ACCESSPATH?, PATH, PATHFORMAT?)>
- <!ELEMENT FILEKIND (#PCDATA)>
- <!ELEMENT FILEFLAGS (#PCDATA)>
- <!ELEMENT FILEREF (TARGETNAME?, PATHTYPE, PATHROOT?, ACCESSPATH?, PATH, PATHFORMAT?)>
- <!ELEMENT TARGETNAME (#PCDATA)>
- <!ELEMENT SETTINGLIST ((SETTING|PANELDATA)+)>
- <!ELEMENT SETTING (NAME?, (VALUE|(SETTING+)))>
- <!ELEMENT PANELDATA (NAME, VALUE)>
- <!ELEMENT VALUE (#PCDATA)>
- <!ELEMENT LINKORDER (FILEREF*)>
- <!ELEMENT SEGMENTLIST (SEGMENT+)>
- <!ELEMENT SEGMENT (NAME, ATTRIBUTES?, FILEREF*)>
- <!ELEMENT ATTRIBUTES (#PCDATA)>
- <!ELEMENT OVERLAYGROUPLIST (OVERLAYGROUP+)>
- <!ELEMENT OVERLAYGROUP (NAME, BASEADDRESS, OVERLAY*)>
- <!ELEMENT BASEADDRESS (#PCDATA)>
- <!ELEMENT OVERLAY (NAME, FILEREF*)>
- <!ELEMENT SUBTARGETLIST (SUBTARGET+)>
- <!ELEMENT SUBTARGET (TARGETNAME, ATTRIBUTES?, FILEREF?)>
- <!ELEMENT SUBPROJECTLIST (SUBPROJECT+)>
- <!ELEMENT SUBPROJECT (FILEREF, SUBPROJECTTARGETLIST)>
- <!ELEMENT SUBPROJECTTARGETLIST (SUBPROJECTTARGET*)>
- <!ELEMENT SUBPROJECTTARGET (TARGETNAME, ATTRIBUTES?, FILEREF?)>
- <!ELEMENT FRAMEWORKLIST (FRAMEWORK+)>
- <!ELEMENT FRAMEWORK (FILEREF, DYNAMICLIBRARY?, VERSION?)>
- <!ELEMENT PACKAGEACTIONSLIST (PACKAGEACTION+)>
- <!ELEMENT PACKAGEACTION (#PCDATA)>
- <!ELEMENT LIBRARYFILE (FILEREF)>
- <!ELEMENT VERSION (#PCDATA)>
- <!ELEMENT TARGETORDER (ORDEREDTARGET|ORDEREDDESIGN)*>
- <!ELEMENT ORDEREDTARGET (NAME)>
- <!ELEMENT ORDEREDDESIGN (NAME, ORDEREDTARGET+)>
- <!ELEMENT GROUPLIST (GROUP|FILEREF)*>
- <!ELEMENT GROUP (NAME, (GROUP|FILEREF)*)>
- <!ELEMENT DESIGNLIST (DESIGN+)>
- <!ELEMENT DESIGN (NAME, DESIGNDATA)>
- <!ELEMENT DESIGNDATA (#PCDATA)>
-]>
-<?codewarrior exportversion="1.0.1" ideversion="5.0" ?>
-<PROJECT>
-    <TARGETLIST>
-        <TARGET>
-            <NAME>WINSCW UDEB</NAME>
-            <SETTINGLIST>
-
-                <!-- Settings for "Source Trees" panel -->
-                <SETTING><NAME>UserSourceTrees</NAME></SETTING>
-
-                <!-- Settings for "Access Paths" panel -->
-                <SETTING><NAME>AlwaysSearchUserPaths</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>InterpretDOSAndUnixPaths</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>RequireFrameworkStyleIncludes</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>SourceRelativeIncludes</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>UserSearchPaths</NAME>
-                    <SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics_withdom\DeviceDiagnostics\DevDiagApp\inc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics_withdom\DeviceDiagnostics\DevDiagApp\loc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics_withdom\DeviceDiagnostics\DevDiagApp\group</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics_withdom\DeviceDiagnostics\DevDiagApp\src</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING></SETTING>
-                <SETTING><NAME>SystemSearchPaths</NAME>
-                    <SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\applications</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\osextensions</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\oem</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\middleware</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\middleware</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\osextensions</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\osextensions\loc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\middleware\loc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\osextensions\loc\sc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\middleware\loc\sc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\UDEB</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>Symbian_Support\Win32-x86 Support\Libraries\Win32 SDK</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>CodeWarrior</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>Symbian_Support\Runtime\Runtime_x86\Runtime_Win32\Libs</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>CodeWarrior</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING></SETTING>
-
-                <!-- Settings for "Debugger Runtime" panel -->
-                <SETTING><NAME>MWRuntimeSettings_WorkingDirectory</NAME><VALUE/></SETTING>
-                <SETTING><NAME>MWRuntimeSettings_CommandLine</NAME><VALUE/></SETTING>
-                <SETTING><NAME>MWRuntimeSettings_HostApplication</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\udeb\DevDiagApp.exe</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>MWRuntimeSettings_EnvVars</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Target Settings" panel -->
-                <SETTING><NAME>Linker</NAME><VALUE>Symbian Linker v2</VALUE></SETTING>
-                <SETTING><NAME>PreLinker</NAME><VALUE/></SETTING>
-                <SETTING><NAME>PostLinker</NAME><VALUE>Symbian Installer v2</VALUE></SETTING>
-                <SETTING><NAME>Targetname</NAME><VALUE>WINSCW UDEB</VALUE></SETTING>
-                <SETTING><NAME>OutputDirectory</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\udeb</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SaveEntriesUsingRelativePaths</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "File Mappings" panel -->
-                <SETTING><NAME>FileMappings</NAME>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>._i</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>._ii</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.c</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cc</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cfg</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cia</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cpp</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cwlink</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>XML</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cxx</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.def</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.h</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.hrh</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.i</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.iby</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.ii</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.inf</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.ini</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.inl</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.loc</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.mmpi</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.pch++</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.pkg</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.policy</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.ra</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.resources</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Resource v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>XML</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.rh</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.rls</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.rss</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.rsg</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.s</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.script</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.txt</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.a</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Object Importer v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.lib</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Object Importer v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.dso</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Object Importer v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.o</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Object Importer v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                </SETTING>
-
-                <!-- Settings for "Build Extras" panel -->
-                <SETTING><NAME>CacheModDates</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>DumpBrowserInfo</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>CacheSubprojects</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>UseThirdPartyDebugger</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>BrowserGenerator</NAME><VALUE>2</VALUE></SETTING>
-                <SETTING><NAME>DebuggerAppPath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>DebuggerCmdLineArgs</NAME><VALUE/></SETTING>
-                <SETTING><NAME>DebuggerWorkingDir</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CodeCompletionPrefixFileName</NAME><VALUE/></SETTING>
-                <SETTING><NAME>CodeCompletionMacroFileName</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Debugger Target" panel -->
-                <SETTING><NAME>ConsoleEncoding</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>LogSystemMessages</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>AutoTargetDLLsPopUp</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>StopAtWatchpoints</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>PauseWhileRunning</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>PauseInterval</NAME><VALUE>5</VALUE></SETTING>
-                <SETTING><NAME>PauseUIFlags</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>AltExePath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>StopAtTempBPOnLaunch</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>CacheSymbolics</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>TempBPFunctionName</NAME><VALUE>E32Main</VALUE></SETTING>
-                <SETTING><NAME>TempBPType</NAME><VALUE>1</VALUE></SETTING>
-
-                <!-- Settings for "Remote Debug" panel -->
-                <SETTING><NAME>Enabled</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>ConnectionName</NAME><VALUE/></SETTING>
-                <SETTING><NAME>DownloadPath</NAME><VALUE/></SETTING>
-                <SETTING><NAME>LaunchRemoteApp</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>RemoteAppPath</NAME><VALUE/></SETTING>
-                <SETTING><NAME>CoreID</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>JTAGClockSpeed</NAME><VALUE>8000</VALUE></SETTING>
-                <SETTING><NAME>IsMultiCore</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>OSDownload</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>UseGlobalOSDownload</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>OSDownloadConnectionName</NAME><VALUE/></SETTING>
-                <SETTING><NAME>OSDownloadPath</NAME><VALUE/></SETTING>
-                <SETTING><NAME>AltDownload</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>AltDownloadConnectionName</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "x86 Exceptions" panel -->
-                <SETTING><NAME>MWDebugger_X86_Exceptions</NAME>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                
-                <!-- Settings for "Auto-target" panel -->
-                <SETTING><NAME>OtherExecutables</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Analyzer Connections" panel -->
-                <SETTING><NAME>AnalyzerConnectionName</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Custom Keywords" panel -->
-                <SETTING><NAME>CustomColor1</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor2</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor3</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor4</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "ARM Debugger" panel -->
-                <SETTING><NAME>Processor</NAME><VALUE>Generic</VALUE></SETTING>
-                <SETTING><NAME>BraekPoinType_II</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>UseInitFile</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>UseConfigFile</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>IDexecutable</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>IDinitialized</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>IDuninitialized</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>IDconstant</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>SDexecutable</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>SDinitialized</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>SDuninitialized</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>SDconstant</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>VerifyMemWrites</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>ShowMPC107regs</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>InitializationFile</NAME><VALUE/></SETTING>
-                <SETTING><NAME>ConfigurationFile</NAME><VALUE/></SETTING>
-                <SETTING><NAME>BreakpointType</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>WatchpointType</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>TargetOS</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>RTOSPluginName</NAME><VALUE/></SETTING>
-                <SETTING><NAME>ByteOrderType</NAME><VALUE>0</VALUE></SETTING>
-                <PANELDATA><NAME>CodeTest SYMBIAN Instrumenter</NAME><VALUE>
-                    0200020000000100000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000433A5C0000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000637466696C657300000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000636F6465746573742E6964620000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000
-                </VALUE></PANELDATA>
-
-                <!-- Settings for "Symbian Installation" panel -->
-                <SETTING><NAME>SymbianInstallationOutputFilename</NAME><VALUE>Application.sis</VALUE></SETTING>
-                <SETTING><NAME>SymbianInstallationOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>SymbianInstallationContentSearchLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\udeb</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianInstallationPassword</NAME><VALUE/></SETTING>
-                <SETTING><NAME>SymbianInstallationCreateStubFile</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "Symbian Installer Panel v2" panel -->
-                <SETTING><NAME>SymbianInstallationOutputFilename</NAME><VALUE>Application.sis</VALUE></SETTING>
-                <SETTING><NAME>SymbianInstallationOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>SymbianInstallationContentSearchLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\udeb</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianInstallationPassword</NAME><VALUE/></SETTING>
-                <SETTING><NAME>SymbianInstallationCreateStubFile</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "Symbian Resource Panel" panel -->
-                <SETTING><NAME>SymbianResourcesMMPFileLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics_withdom\DeviceDiagnostics\DevDiagApp\group</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianResourcesBinaryOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\udeb</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianResourcesHeaderFileOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\include</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-
-                <!-- Settings for "Symbian Resources Panel v2" panel -->
-                <SETTING><NAME>SymbianResourcesMMPFileLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics_withdom\DeviceDiagnostics\DevDiagApp\group</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianResourcesBinaryOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\udeb</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianResourcesHeaderFileOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\include</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-
-                <!-- Settings for "Remote Download" panel -->
-                <SETTING><NAME>FileList</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Symbian ARM Debugger" panel -->
-                <SETTING><NAME>Processor</NAME><VALUE>Generic</VALUE></SETTING>
-                <SETTING><NAME>UseInitFile</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>UseConfigFile</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>ResetTarget</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>InitializationFile</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>ConfigurationFile</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>TargetOS</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>RTOSPluginName</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Symbian Common Panel" panel -->
-                <SETTING><NAME>ShowCommandLine</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>SymbianEpocToolsPath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE></VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-
-                <!-- Settings for "Symbian Compiler Panel" panel -->
-                <SETTING><NAME>PrefixFile</NAME><VALUE>feature_settings.hrh</VALUE></SETTING>
-                <SETTING><NAME>CompilerXMLDescriptor</NAME><VALUE>Metrowerks x86 Compiler</VALUE></SETTING>
-                <SETTING><NAME>Macros</NAME><VALUE>__SYMBIAN32__,__CW32__,__WINS__,__WINSCW__,__EXE__,_DEBUG,_UNICODE,__SUPPORT_CPP_EXCEPTIONS__,</VALUE></SETTING>
-                <SETTING><NAME>CodeTEST</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>EnableSWIC</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Arguments</NAME><VALUE>-wchar_t off -align 4 -warnings on -w nohidevirtual, nounusedexpr -msgstyle gcc -enum int -str pool -exc ms -trigraphs on -O0 -inline off -nostdinc</VALUE></SETTING>
-                <SETTING><NAME>CIAArgs</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Symbian Debugging" panel -->
-                <SETTING><NAME>Parse Log File</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Log File Path</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>Symbian SDK Folder</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>Log Unresolved Modules</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Log Unresolved Sym Files</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Debug Non-XIP Executables</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "Symbian Kernel Debugging" panel -->
-                <SETTING><NAME>Start Address</NAME><VALUE>0x00000000</VALUE></SETTING>
-                <SETTING><NAME>Run From Start Address</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Download Image</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>OS Image Path</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>Download Address</NAME><VALUE>0x00000000</VALUE></SETTING>
-                <SETTING><NAME>Ask First</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Debug Bootrom</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Bootrom Sym File</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "Symbian Linker Panel" panel -->
-                <SETTING><NAME>LinkOutputFile</NAME><VALUE>DevDiagApp.exe</VALUE></SETTING>
-                <SETTING><NAME>LinkCmdLine</NAME><VALUE/></SETTING>
-                <SETTING><NAME>SymbianImportLibrary</NAME><VALUE>DevDiagApp.lib</VALUE></SETTING>
-                <SETTING><NAME>canDebug</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>canRun</NAME><VALUE>true</VALUE></SETTING>
-
-                <!-- Settings for "Symbian RomBuild Panel" panel -->
-                <SETTING><NAME>CommandLine</NAME><VALUE>buildrom -D_DEBUG devkit lubbock techview -olubbock_gui.img</VALUE></SETTING>
-                <SETTING><NAME>OutputPath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>C:\</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>DisplayMessages</NAME><VALUE>true</VALUE></SETTING>
-
-                <!-- Settings for "Symbian Target" panel -->
-                <SETTING><NAME>TargetArchitecture</NAME><VALUE>WINSCW</VALUE></SETTING>
-                <SETTING><NAME>LogMessages</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>SuppressWarnings</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>GenerateSymbolics</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>CompilerPrefix</NAME><VALUE/></SETTING>
-                <SETTING><NAME>CompilerCmdLine</NAME><VALUE/></SETTING>
-                <SETTING><NAME>SymbianImportLibraryPath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>C:\</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "Symbian Tools" panel -->
-                <SETTING><NAME>Gnu Tools Path</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>C:\</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>Epoc32 Tools Path</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>C:\</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-            </SETTINGLIST>
-            <FILELIST>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagApp.mmp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagAppWINSCW.resources</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>EEXE.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagApp.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagAppApplication.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagSuiteView.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagSuiteContainer.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagAppAppUi.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagAppDocument.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagEngine.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagExecutionResults.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagRuntimeReqsInfo.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagCommonCancelDialogs.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagCommonSkipDialogs.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagPluginView.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagPluginContainer.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagUtil.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagApp_UID_.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>euser.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>apparc.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>cone.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>eikcore.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>avkon.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>gdi.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>eikcoctl.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>eikctl.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>bafl.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>eikdlg.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>FeatMgr.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>hlplch.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>aknicon.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>egul.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>diagframework.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>etel3rdparty.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>diagresultsdatabase.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>eiksrv.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>drmserviceapi.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>CommonEngine.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>centralrepository.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>efsrv.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>flogger.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagApp.hrh</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagAppApplication.h</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagAppAppUi.h</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagAppDocument.h</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagCommonCancelDialogs.h</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagCommonSkipDialogs.h</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagDef.h</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagEngine.h</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagEngineObserver.h</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagExecutionResults.h</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagPluginContainer.h</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagPluginView.h</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>devdiagprivatecrkeys.h</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>devdiagruntimereqsinfo.h</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagSuiteContainer.h</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagSuiteView.h</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>devdiagutil.h</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagAppWINSCWUDEB.cwlink</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-</FILELIST>
-            <LINKORDER>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagApp.mmp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagAppWINSCW.resources</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>EEXE.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagApp.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagAppApplication.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagSuiteView.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagSuiteContainer.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagAppAppUi.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagAppDocument.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagEngine.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagExecutionResults.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagRuntimeReqsInfo.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagCommonCancelDialogs.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagCommonSkipDialogs.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagPluginView.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagPluginContainer.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagUtil.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagApp_UID_.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>euser.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>apparc.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>cone.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>eikcore.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>avkon.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>gdi.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>eikcoctl.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>eikctl.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>bafl.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>eikdlg.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>FeatMgr.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>hlplch.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>aknicon.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>egul.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>diagframework.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>etel3rdparty.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>diagresultsdatabase.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>eiksrv.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>drmserviceapi.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>CommonEngine.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>centralrepository.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>efsrv.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>flogger.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagApp.hrh</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagAppApplication.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagAppAppUi.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagAppDocument.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagCommonCancelDialogs.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagCommonSkipDialogs.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagDef.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagEngine.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagEngineObserver.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagExecutionResults.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagPluginContainer.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagPluginView.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>devdiagprivatecrkeys.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>devdiagruntimereqsinfo.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagSuiteContainer.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagSuiteView.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>devdiagutil.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagAppWINSCWUDEB.cwlink</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-</LINKORDER>
-        </TARGET><TARGET>
-            <NAME>WINSCW UREL</NAME>
-            <SETTINGLIST>
-
-                <!-- Settings for "Source Trees" panel -->
-                <SETTING><NAME>UserSourceTrees</NAME></SETTING>
-
-                <!-- Settings for "Access Paths" panel -->
-                <SETTING><NAME>AlwaysSearchUserPaths</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>InterpretDOSAndUnixPaths</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>RequireFrameworkStyleIncludes</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>SourceRelativeIncludes</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>UserSearchPaths</NAME>
-                    <SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics_withdom\DeviceDiagnostics\DevDiagApp\inc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics_withdom\DeviceDiagnostics\DevDiagApp\loc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics_withdom\DeviceDiagnostics\DevDiagApp\group</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics_withdom\DeviceDiagnostics\DevDiagApp\src</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING></SETTING>
-                <SETTING><NAME>SystemSearchPaths</NAME>
-                    <SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\applications</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\osextensions</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\oem</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\middleware</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\middleware</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\osextensions</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\osextensions\loc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\middleware\loc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\osextensions\loc\sc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\middleware\loc\sc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\UREL</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\release\WINSCW\UDEB</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>Symbian_Support\Win32-x86 Support\Libraries\Win32 SDK</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>CodeWarrior</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>Symbian_Support\Runtime\Runtime_x86\Runtime_Win32\Libs</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>CodeWarrior</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING></SETTING>
-
-                <!-- Settings for "Debugger Runtime" panel -->
-                <SETTING><NAME>MWRuntimeSettings_WorkingDirectory</NAME><VALUE/></SETTING>
-                <SETTING><NAME>MWRuntimeSettings_CommandLine</NAME><VALUE/></SETTING>
-                <SETTING><NAME>MWRuntimeSettings_HostApplication</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\urel\DevDiagApp.exe</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>MWRuntimeSettings_EnvVars</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Target Settings" panel -->
-                <SETTING><NAME>Linker</NAME><VALUE>Symbian Linker v2</VALUE></SETTING>
-                <SETTING><NAME>PreLinker</NAME><VALUE/></SETTING>
-                <SETTING><NAME>PostLinker</NAME><VALUE>Symbian Installer v2</VALUE></SETTING>
-                <SETTING><NAME>Targetname</NAME><VALUE>WINSCW UREL</VALUE></SETTING>
-                <SETTING><NAME>OutputDirectory</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\urel</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SaveEntriesUsingRelativePaths</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "File Mappings" panel -->
-                <SETTING><NAME>FileMappings</NAME>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>._i</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>._ii</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.c</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cc</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cfg</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cia</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cpp</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cwlink</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>XML</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cxx</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.def</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.h</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.hrh</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.i</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.iby</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.ii</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.inf</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.ini</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.inl</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.loc</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.mmpi</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.pch++</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.pkg</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.policy</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.ra</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.resources</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Resource v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>XML</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.rh</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.rls</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.rss</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.rsg</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.s</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.script</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.txt</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.a</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Object Importer v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.lib</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Object Importer v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.dso</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Object Importer v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.o</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Object Importer v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                </SETTING>
-
-                <!-- Settings for "Build Extras" panel -->
-                <SETTING><NAME>CacheModDates</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>DumpBrowserInfo</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>CacheSubprojects</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>UseThirdPartyDebugger</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>BrowserGenerator</NAME><VALUE>2</VALUE></SETTING>
-                <SETTING><NAME>DebuggerAppPath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>DebuggerCmdLineArgs</NAME><VALUE/></SETTING>
-                <SETTING><NAME>DebuggerWorkingDir</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CodeCompletionPrefixFileName</NAME><VALUE/></SETTING>
-                <SETTING><NAME>CodeCompletionMacroFileName</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Debugger Target" panel -->
-                <SETTING><NAME>ConsoleEncoding</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>LogSystemMessages</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>AutoTargetDLLsPopUp</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>StopAtWatchpoints</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>PauseWhileRunning</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>PauseInterval</NAME><VALUE>5</VALUE></SETTING>
-                <SETTING><NAME>PauseUIFlags</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>AltExePath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>StopAtTempBPOnLaunch</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>CacheSymbolics</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>TempBPFunctionName</NAME><VALUE>E32Main</VALUE></SETTING>
-                <SETTING><NAME>TempBPType</NAME><VALUE>1</VALUE></SETTING>
-
-                <!-- Settings for "Remote Debug" panel -->
-                <SETTING><NAME>Enabled</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>ConnectionName</NAME><VALUE/></SETTING>
-                <SETTING><NAME>DownloadPath</NAME><VALUE/></SETTING>
-                <SETTING><NAME>LaunchRemoteApp</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>RemoteAppPath</NAME><VALUE/></SETTING>
-                <SETTING><NAME>CoreID</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>JTAGClockSpeed</NAME><VALUE>8000</VALUE></SETTING>
-                <SETTING><NAME>IsMultiCore</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>OSDownload</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>UseGlobalOSDownload</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>OSDownloadConnectionName</NAME><VALUE/></SETTING>
-                <SETTING><NAME>OSDownloadPath</NAME><VALUE/></SETTING>
-                <SETTING><NAME>AltDownload</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>AltDownloadConnectionName</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "x86 Exceptions" panel -->
-                <SETTING><NAME>MWDebugger_X86_Exceptions</NAME>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                
-                <!-- Settings for "Auto-target" panel -->
-                <SETTING><NAME>OtherExecutables</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Analyzer Connections" panel -->
-                <SETTING><NAME>AnalyzerConnectionName</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Custom Keywords" panel -->
-                <SETTING><NAME>CustomColor1</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor2</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor3</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor4</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "ARM Debugger" panel -->
-                <SETTING><NAME>Processor</NAME><VALUE>Generic</VALUE></SETTING>
-                <SETTING><NAME>BraekPoinType_II</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>UseInitFile</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>UseConfigFile</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>IDexecutable</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>IDinitialized</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>IDuninitialized</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>IDconstant</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>SDexecutable</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>SDinitialized</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>SDuninitialized</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>SDconstant</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>VerifyMemWrites</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>ShowMPC107regs</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>InitializationFile</NAME><VALUE/></SETTING>
-                <SETTING><NAME>ConfigurationFile</NAME><VALUE/></SETTING>
-                <SETTING><NAME>BreakpointType</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>WatchpointType</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>TargetOS</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>RTOSPluginName</NAME><VALUE/></SETTING>
-                <SETTING><NAME>ByteOrderType</NAME><VALUE>0</VALUE></SETTING>
-                <PANELDATA><NAME>CodeTest SYMBIAN Instrumenter</NAME><VALUE>
-                    0200020000000100000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000433A5C0000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000637466696C657300000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000636F6465746573742E6964620000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000
-                </VALUE></PANELDATA>
-
-                <!-- Settings for "Symbian Installation" panel -->
-                <SETTING><NAME>SymbianInstallationOutputFilename</NAME><VALUE>Application.sis</VALUE></SETTING>
-                <SETTING><NAME>SymbianInstallationOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>SymbianInstallationContentSearchLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\urel</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianInstallationPassword</NAME><VALUE/></SETTING>
-                <SETTING><NAME>SymbianInstallationCreateStubFile</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "Symbian Installer Panel v2" panel -->
-                <SETTING><NAME>SymbianInstallationOutputFilename</NAME><VALUE>Application.sis</VALUE></SETTING>
-                <SETTING><NAME>SymbianInstallationOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>SymbianInstallationContentSearchLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\urel</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianInstallationPassword</NAME><VALUE/></SETTING>
-                <SETTING><NAME>SymbianInstallationCreateStubFile</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "Symbian Resource Panel" panel -->
-                <SETTING><NAME>SymbianResourcesMMPFileLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics_withdom\DeviceDiagnostics\DevDiagApp\group</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianResourcesBinaryOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\urel</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianResourcesHeaderFileOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\include</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-
-                <!-- Settings for "Symbian Resources Panel v2" panel -->
-                <SETTING><NAME>SymbianResourcesMMPFileLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics_withdom\DeviceDiagnostics\DevDiagApp\group</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianResourcesBinaryOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\urel</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianResourcesHeaderFileOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\include</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-
-                <!-- Settings for "Remote Download" panel -->
-                <SETTING><NAME>FileList</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Symbian ARM Debugger" panel -->
-                <SETTING><NAME>Processor</NAME><VALUE>Generic</VALUE></SETTING>
-                <SETTING><NAME>UseInitFile</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>UseConfigFile</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>ResetTarget</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>InitializationFile</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>ConfigurationFile</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>TargetOS</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>RTOSPluginName</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Symbian Common Panel" panel -->
-                <SETTING><NAME>ShowCommandLine</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>SymbianEpocToolsPath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE></VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-
-                <!-- Settings for "Symbian Compiler Panel" panel -->
-                <SETTING><NAME>PrefixFile</NAME><VALUE>feature_settings.hrh</VALUE></SETTING>
-                <SETTING><NAME>CompilerXMLDescriptor</NAME><VALUE>Metrowerks x86 Compiler</VALUE></SETTING>
-                <SETTING><NAME>Macros</NAME><VALUE>__SYMBIAN32__,__CW32__,__WINS__,__WINSCW__,__EXE__,NDEBUG,_UNICODE,__SUPPORT_CPP_EXCEPTIONS__,</VALUE></SETTING>
-                <SETTING><NAME>CodeTEST</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>EnableSWIC</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Arguments</NAME><VALUE>-wchar_t off -align 4 -warnings on -w nohidevirtual, nounusedexpr -msgstyle gcc -enum int -str pool -exc ms -trigraphs on -O4,s -nostdinc</VALUE></SETTING>
-                <SETTING><NAME>CIAArgs</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Symbian Debugging" panel -->
-                <SETTING><NAME>Parse Log File</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Log File Path</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>Symbian SDK Folder</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>Log Unresolved Modules</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Log Unresolved Sym Files</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Debug Non-XIP Executables</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "Symbian Kernel Debugging" panel -->
-                <SETTING><NAME>Start Address</NAME><VALUE>0x00000000</VALUE></SETTING>
-                <SETTING><NAME>Run From Start Address</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Download Image</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>OS Image Path</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>Download Address</NAME><VALUE>0x00000000</VALUE></SETTING>
-                <SETTING><NAME>Ask First</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Debug Bootrom</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Bootrom Sym File</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "Symbian Linker Panel" panel -->
-                <SETTING><NAME>LinkOutputFile</NAME><VALUE>DevDiagApp.exe</VALUE></SETTING>
-                <SETTING><NAME>LinkCmdLine</NAME><VALUE/></SETTING>
-                <SETTING><NAME>SymbianImportLibrary</NAME><VALUE>DevDiagApp.lib</VALUE></SETTING>
-                <SETTING><NAME>canDebug</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>canRun</NAME><VALUE>true</VALUE></SETTING>
-
-                <!-- Settings for "Symbian RomBuild Panel" panel -->
-                <SETTING><NAME>CommandLine</NAME><VALUE>buildrom -D_DEBUG devkit lubbock techview -olubbock_gui.img</VALUE></SETTING>
-                <SETTING><NAME>OutputPath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>C:\</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>DisplayMessages</NAME><VALUE>true</VALUE></SETTING>
-
-                <!-- Settings for "Symbian Target" panel -->
-                <SETTING><NAME>TargetArchitecture</NAME><VALUE>WINSCW</VALUE></SETTING>
-                <SETTING><NAME>LogMessages</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>SuppressWarnings</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>GenerateSymbolics</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>CompilerPrefix</NAME><VALUE/></SETTING>
-                <SETTING><NAME>CompilerCmdLine</NAME><VALUE/></SETTING>
-                <SETTING><NAME>SymbianImportLibraryPath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>C:\</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "Symbian Tools" panel -->
-                <SETTING><NAME>Gnu Tools Path</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>C:\</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>Epoc32 Tools Path</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>C:\</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-            </SETTINGLIST>
-            <FILELIST>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagApp.mmp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagAppWINSCW.resources</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>EEXE.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagApp.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagAppApplication.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagSuiteView.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagSuiteContainer.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagAppAppUi.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagAppDocument.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagEngine.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagExecutionResults.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagRuntimeReqsInfo.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagCommonCancelDialogs.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagCommonSkipDialogs.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagPluginView.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagPluginContainer.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagUtil.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagApp_UID_.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>euser.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>apparc.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>cone.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>eikcore.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>avkon.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>gdi.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>eikcoctl.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>eikctl.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>bafl.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>eikdlg.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>FeatMgr.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>hlplch.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>aknicon.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>egul.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>diagframework.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>etel3rdparty.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>diagresultsdatabase.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>eiksrv.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>drmserviceapi.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>CommonEngine.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>centralrepository.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>efsrv.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagAppWINSCWUREL.cwlink</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-</FILELIST>
-            <LINKORDER>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagApp.mmp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagAppWINSCW.resources</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>EEXE.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagApp.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagAppApplication.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagSuiteView.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagSuiteContainer.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagAppAppUi.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagAppDocument.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagEngine.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagExecutionResults.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagRuntimeReqsInfo.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagCommonCancelDialogs.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagCommonSkipDialogs.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagPluginView.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagPluginContainer.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagUtil.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagApp_UID_.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>euser.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>apparc.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>cone.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>eikcore.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>avkon.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>gdi.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>eikcoctl.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>eikctl.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>bafl.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>eikdlg.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>FeatMgr.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>hlplch.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>aknicon.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>egul.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>diagframework.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>etel3rdparty.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>diagresultsdatabase.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>eiksrv.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>drmserviceapi.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>CommonEngine.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>centralrepository.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>efsrv.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagAppWINSCWUREL.cwlink</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-</LINKORDER>
-        </TARGET><TARGET>
-<NAME>Build All</NAME><SETTINGLIST><SETTING><NAME>Linker</NAME><VALUE>None</VALUE></SETTING>
-<SETTING><NAME>Targetname</NAME><VALUE>Build All</VALUE></SETTING>
-</SETTINGLIST>
-<FILELIST></FILELIST>
-<LINKORDER></LINKORDER>
-<SUBTARGETLIST><SUBTARGET><TARGETNAME>WINSCW UDEB</TARGETNAME></SUBTARGET>
-<SUBTARGET><TARGETNAME>WINSCW UREL</TARGETNAME></SUBTARGET>
-</SUBTARGETLIST></TARGET></TARGETLIST>
-
-    <TARGETORDER>
-<ORDEREDTARGET><NAME>WINSCW UDEB</NAME></ORDEREDTARGET>
-<ORDEREDTARGET><NAME>WINSCW UREL</NAME></ORDEREDTARGET>
-<ORDEREDTARGET><NAME>Build All</NAME></ORDEREDTARGET>
-</TARGETORDER>
-
-    <GROUPLIST><FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DevDiagApp.mmp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<GROUP><NAME>Source</NAME>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DevDiagApp.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DevDiagAppApplication.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DevDiagSuiteView.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DevDiagSuiteContainer.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DevDiagAppAppUi.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DevDiagAppDocument.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DevDiagEngine.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DevDiagExecutionResults.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DevDiagRuntimeReqsInfo.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DevDiagCommonCancelDialogs.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DevDiagCommonSkipDialogs.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DevDiagPluginView.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DevDiagPluginContainer.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DevDiagUtil.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DevDiagApp_UID_.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-</GROUP>
-<GROUP><NAME>Headers</NAME>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DevDiagApp.hrh</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DevDiagAppApplication.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DevDiagAppAppUi.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DevDiagAppDocument.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DevDiagCommonCancelDialogs.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DevDiagCommonSkipDialogs.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DevDiagDef.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DevDiagEngine.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DevDiagEngineObserver.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DevDiagExecutionResults.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DevDiagPluginContainer.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DevDiagPluginView.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>devdiagprivatecrkeys.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>devdiagruntimereqsinfo.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DevDiagSuiteContainer.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DevDiagSuiteView.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>devdiagutil.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-</GROUP>
-<GROUP><NAME>Resources</NAME>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DevDiagAppWINSCW.resources</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-</GROUP>
-<GROUP><NAME>Link</NAME>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DevDiagAppWINSCWUDEB.cwlink</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UREL</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DevDiagAppWINSCWUREL.cwlink</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-</GROUP>
-<GROUP><NAME>Libraries</NAME>
-<GROUP><NAME>WINSCW</NAME>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>EEXE.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>euser.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>apparc.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>cone.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>eikcore.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>avkon.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>gdi.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>eikcoctl.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>eikctl.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>bafl.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>eikdlg.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>FeatMgr.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>hlplch.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>aknicon.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>egul.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>diagframework.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>etel3rdparty.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>diagresultsdatabase.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>eiksrv.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>drmserviceapi.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>CommonEngine.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>centralrepository.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>efsrv.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>flogger.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UREL</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>EEXE.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-</GROUP>
-</GROUP>
-</GROUPLIST>
-
-</PROJECT>
--- a/devicediagnostics/devdiagapp/inc/devdiag.pan	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-/*
-* Copyright (c) 2007-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:  Panic functionality for the Device Diagnostics Application.
-*
-*/
-
-
-#ifndef DD_PAN
-#define DD_PAN
-
-// System Include Files
-#include <e32std.h>         // User
-
-// Data Types
-
-/** Application panic codes.  These are used to identify specific reasons why
- *  the application has panicked.
- */
-enum TDevDiagApplicationPanics
-    {
-    EDevDiagApplicationGeneral = 1,
-    EDevDiagApplicationUnhandledCommand,
-    EDevDiagApplicationRuntimeReqs,
-    EDevDiagApplicationInvalidStopMode,
-    EDevDiagApplicationInvalidEngineState,
-    EDevDiagApplicationInvalidResultIndex,
-    EDevDiagApplicationBadType,
-    EDevDiagApplicationNotInitialized,
-    EDevDiagListboxContainerModel,
-    EDevDiagListboxFindPluginFailure,
-    EDevDiagListboxModelNotUpdated,
-    EDevDiagApplicationNoExecutionResults,
-    EDevDiagContainerArrayMismatch,
-    EDevDiagCheckCrashedTest,
-    EDDApplicationUnknownSuite,
-    };
-
-// -----------------------------------------------------------------------------
-// This convenience function will cause the application to panic with the
-// specified error code.  Extended panic notes must be enabled to see this
-// information in the UI.  This may be done by creating the "c:\resource\ErrRD"
-// directory (a signed sis file is available on the S60 wiki to do this).
-// -----------------------------------------------------------------------------
-//
-inline void Panic( TDevDiagApplicationPanics aReason )
-    {
-    _LIT( applicationName,"DevDiag" );                 //lint !e1534
-    User::Panic( applicationName, aReason );
-    }
-
-#endif // DD_PAN
--- a/devicediagnostics/devdiagapp/inc/devdiagapp.hrh	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-/*
-* 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:  Contains view IDS and menu commands.
-*
-*/
-
-
-
-#ifndef DEVDIAGAPP_HRH
-#define DEVDIAGAPP_HRH
-
-#define _UID3 0x2000E542
-
-enum TDDMenuCommands
-    {
-    EAppCmdChange = 1,
-    EDDCmdOpen,
-    EDDMenuCmdMainHelp,
-    EDDCmdPerformAllTests,
-    EDDCmdPerformSingle,
-    EDDCmdPerformAllHwTests,
-    EDDCmdPerformAllCoverageTests,
-    EDDCmdPerformAllServiceTests,
-    EDDCmdPerformAllConnTests
-    };
-
-enum TDDViewId
-    {
-    EDDMainViewId = 1,
-    EDDPluginViewId
-    };
-    
- /** Dialog ids.  These are used in the application's resource file.
- */
-enum TDevDiagApplicationNoteControlIds
-    {
-    EDevDiagApplicationWaitNote = 0x100    
-    };   
-
-#endif // DEVDIAGAPP_HRH
--- a/devicediagnostics/devdiagapp/inc/devdiagappapplication.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-/*
-* 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:  Application class
-*
-*/
-
-
-
-#ifndef DEVDIAGAPP_APPLICATION_H
-#define DEVDIAGAPP_APPLICATION_H
-
-#include <aknapp.h>
-
- /** 
- * @class CDevDiagAppApplication
- * @since 5.0 
- **/
-class CDevDiagAppApplication : public CAknApplication
-    {
-public:  // from CAknApplication
-
-    /**
-    * Returns the application DLL UID value
-    *
-    * @result the UID of this Application/Dll
-    **/
-    TUid AppDllUid() const;
-
-protected: // from CAknApplication
-
-    /**     
-    * Create a CApaDocument object and return a pointer to it
-    *
-    * @return a pointer to the created document
-    **/
-    CApaDocument* CreateDocumentL();
-    
-    };
-
-#endif // DEVDIAGAPP_APPLICATION_H
--- a/devicediagnostics/devdiagapp/inc/devdiagappappui.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +0,0 @@
-/*
-* 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:  Application view UI class.
-*
-*/
-
-
-
-#ifndef DEVDIAGAPP_APPUI_H
-#define DEVDIAGAPP_APPUI_H
-
-#include <aknViewAppUi.h> 
-
-// Forward reference
-class CDevDiagSuiteView;
-
-/** 
-* An instance of class CDevDiagAppAppUi is the UserInterface part of the AVKON
-* application framework for the DevDiagApp application
-* @since 5.0
-**/
-class CDevDiagAppAppUi : public CAknViewAppUi
-    {
-public:
-
-    /**  
-    * Perform the second phase construction of a CDevDiagAppAppUi object
-    * this needs to be public due to the way the framework constructs the AppUi 
-    **/
-    void ConstructL();
-
-    /**
-    * Perform the first phase of two phase construction.
-    * This needs to be public due to the way the framework constructs the AppUi 
-    **/
-    CDevDiagAppAppUi();
-
-
-    /**
-    * Destroy the object and release all memory objects.
-    **/
-    ~CDevDiagAppAppUi();
-
-public: // from CAknAppUi
-
-    /**
-    * Handle user menu selections.
-    *
-    * @param aCommand the enumerated code for the option selected.
-    **/
-    void HandleCommandL(TInt aCommand);
-
-private:
-
-    // The application view. Own
-    CDevDiagSuiteView* iSuiteView;
-    };
-
-
-#endif // DEVDIAGAPP_APPUI_H
-
--- a/devicediagnostics/devdiagapp/inc/devdiagappdocument.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,98 +0,0 @@
-/*
-* 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:  Document of the application.
-*
-*/
-
-#ifndef DEVDIAGAPP_DOCUMENT_H
-#define DEVDIAGAPP_DOCUMENT_H
-
-
-#include <AknDoc.h>
-
-// Forward references
-class CDevDiagAppAppUi;
-class CEikApplication;
-class CDevDiagEngine;
-
-/**
-* An instance of class CDevDiagAppDocument is the Document part of the AVKON
-* application framework for the DevDiagApp.
-*/
-class CDevDiagAppDocument : public CAknDocument
-    {
-public:
-
-    /**
-    * Construct a CDevDiagAppDocument for the AVKON application aApp 
-    * using two phase construction, and return a pointer to the created object
-    *
-    * @param aApp application creating this document
-    * @return a pointer to the created instance of CDevDiagAppDocument.
-    **/
-    static CDevDiagAppDocument* NewL(CEikApplication& aApp);
-
-    /**
-    * Construct a CDevDiagAppDocument for the AVKON application aApp 
-    * using two phase construction, and return a pointer to the created object
-    *
-    * @param aApp application creating this document
-    * @return a pointer to the created instance of CDevDiagAppDocument
-    **/
-    static CDevDiagAppDocument* NewLC(CEikApplication& aApp);
-
-    /**
-    * Destroy the object and release all memory objects
-    **/
-    ~CDevDiagAppDocument();
-
-public: // from CAknDocument
-
-    /**
-    * Create a CDevDiagAppAppUi object and return a pointer to it
-    * @return a pointer to the created instance of the AppUi created
-    **/
-    CEikAppUi* CreateAppUiL();
-
-public:
-    
-    /**
-    * Return the Engine.
-    * @return DevDiagEngine.
-    **/
-    CDevDiagEngine& Engine();
-
-private:
-
-    /**
-    * Perform the second phase construction of a CDevDiagAppDocument object
-    **/
-    void ConstructL();
-
-    /**
-    * Perform the first phase of two phase construction 
-    *
-    * @param aApp application creating this document
-    **/
-    CDevDiagAppDocument(CEikApplication& aApp);
-    
-private:
-
-    // Owns.
-    CDevDiagEngine* iEngine;    
-
-    };
-
-
-#endif // DEVDIAGAPP_DOCUMENT_H
--- a/devicediagnostics/devdiagapp/inc/devdiagcommoncanceldialogs.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,104 +0,0 @@
-/*
-* 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:  These are the declarations for dialogs shared between the
-*                Device Diagnostics Application and plugins.
-*
-*/
-
-
-#ifndef DEVDIAGCOMMONCANCELDIALOGS_H
-#define DEVDIAGCOMMONCANCELDIALOGS_H
-
-// System Include Files
-#include <aknlistquerydialog.h>           // CAknQueryDialog
-
-// Forward Declarations
-class CDevDiagEngine;
-
-/**
- *  Cancel Execution Dialog Class.
- *  This dialog asks the user if they would like to cancel all test
- *  execution.  It suspends test execution while it is active, and resumes
- *  or cancels test execution when it is dismissed.
- *
- *  @lib avkon.lib
- */
-class CDevDiagCommonCancelDialogs : public CAknListQueryDialog
-    {
-
-public: // New Functions
-
-    /**
-     * Two-phased constructor.
-     */
-    static CDevDiagCommonCancelDialogs* NewLC( CDevDiagEngine& aEngine,
-                                            TBool aSuspendTestsOnExecute );
-
-
-public: // From base class CAknQueryDialog
-
-    /**
-     * From CAknQueryDialog.
-     * Runs the dialog, and returns the ID of the button used to dismiss
-     * it.
-     */
-    virtual TInt RunLD();
-
-
-private: // New Functions
-
-    /**
-     * The default constructor.
-     */
-    CDevDiagCommonCancelDialogs( CDevDiagEngine& aEngine,
-                              TBool aSuspendTestsOnExecute );
-
-    /**
-     * Two-phased constructor.
-     */
-    void ConstructL();
-
-
-private: // From base class CAknQueryDialog
-
-    /**
-     * From CAknQueryDialog.
-     * This function is called for a button press on the dialog.  It is used
-     * to determine if the dialog may be exited.
-     *
-     * @param aButtonId The id of the button that was pressed.
-     * @return ETrue, if the dialog may exit.  EFalse, otherwise.
-     */
-    virtual TBool OkToExitL( TInt aButtonId );
-
-
-private: // Data
-
-    /**
-     * The application engine, which the dialog uses to suspend and resume
-     * test execution.
-     */
-    CDevDiagEngine& iEngine;
-
-    /**
-     * Indicates if the dialog should call suspend when it is executed.  If
-     * EFalse, then only the watchdog timer is stopped.
-     */
-    TBool iSuspendTestsOnExecute;
-    
-    TInt iIndex;
-
-    };
-
-#endif // DEVDIAGCOMMONDIALOGS_H
--- a/devicediagnostics/devdiagapp/inc/devdiagcommonskipdialogs.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,104 +0,0 @@
-/*
-* 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:  These are the declarations for dialogs shared between the
-*                Device Diagnostics Application and plugins.
-*
-*/
-
-
-#ifndef DEVDIAGCOMMONSKIPDIALOGS_H
-#define DEVDIAGCOMMONSKIPDIALOGS_H
-
-// System Include Files
-#include <aknlistquerydialog.h>           // CAknQueryDialog
-
-// Forward Declarations
-class CDevDiagEngine;
-
-/**
- *  Cancel Execution Dialog Class.
- *  This dialog asks the user if they would like to cancel all test
- *  execution.  It suspends test execution while it is active, and resumes
- *  or cancels test execution when it is dismissed.
- *
- *  @lib avkon.lib
- */
-class CDevDiagCommonSkipDialogs : public CAknListQueryDialog
-    {
-
-public: // New Functions
-
-    /**
-     * Two-phased constructor.
-     */
-    static CDevDiagCommonSkipDialogs* NewLC( CDevDiagEngine& aEngine,
-                                            TBool aSuspendTestsOnExecute );
-
-
-public: // From base class CAknQueryDialog
-
-    /**
-     * From CAknQueryDialog.
-     * Runs the dialog, and returns the ID of the button used to dismiss
-     * it.
-     */
-    virtual TInt RunLD();
-
-
-private: // New Functions
-
-    /**
-     * The default constructor.
-     */
-    CDevDiagCommonSkipDialogs( CDevDiagEngine& aEngine,
-                              TBool aSuspendTestsOnExecute );
-
-    /**
-     * Two-phased constructor.
-     */
-    void ConstructL();
-
-
-private: // From base class CAknQueryDialog
-
-    /**
-     * From CAknQueryDialog.
-     * This function is called for a button press on the dialog.  It is used
-     * to determine if the dialog may be exited.
-     *
-     * @param aButtonId The id of the button that was pressed.
-     * @return ETrue, if the dialog may exit.  EFalse, otherwise.
-     */
-    virtual TBool OkToExitL( TInt aButtonId );
-
-
-private: // Data
-
-    /**
-     * The application engine, which the dialog uses to suspend and resume
-     * test execution.
-     */
-    CDevDiagEngine& iEngine;
-
-    /**
-     * Indicates if the dialog should call suspend when it is executed.  If
-     * EFalse, then only the watchdog timer is stopped.
-     */
-    TBool iSuspendTestsOnExecute;
-    
-    TInt iIndex;
-
-    };
-
-#endif // DEVDIAGCOMMONSKIPDIALOGS_H
--- a/devicediagnostics/devdiagapp/inc/devdiagdef.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-/*
-* 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:  Application definitions.
-*
-*/
-
-
-#ifndef DEVDIAGDEF_H
-#define DEVDIAGDEF_H
-
-#include <e32base.h>
-#include "devdiagapp.hrh"
-
-const TUid KDDMainViewId    =  { EDDMainViewId };
-const TUid KDDPluginViewId    = { EDDPluginViewId };
-
-const TUid KDDHardwareSuiteUid =     { 0x2000E569 };
-const TUid KDDConnectivitySuiteUid = { 0x2000E56F };
-const TUid KDDServicesSuiteUid =     { 0x2000E56D };
-const TUid KDDCoverageSuiteUid =     { 0x2000E56B };
-
-#endif // DEVDIAGDEF_H
-
-// End of file
--- a/devicediagnostics/devdiagapp/inc/devdiagengine.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,477 +0,0 @@
-/*
-* 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:  Handles most of the model related logic..
-*
-*/
-
-
-#ifndef DEVDIAGDENGINE_H
-#define DEVDIAGDENGINE_H
-
-// System Include Files
-#include <e32base.h>                // CActive
-#include <etel3rdparty.h>           // CTelephony
-#include <DiagResultsDatabase.h>    // RDiagResultsDatabase,
-                                    // RDiagResultsDatabaseRecord
-#include <DiagEngineObserver.h>     // MDiagEngineObserver
-#include <DiagPluginPoolObserver.h> // MDiagPluginPoolObserver
-#include <DiagCommonDialog.h>       // TDiagCommonDialog
-
-// Forward Declarations
-class MDevDiagEngineObserver;
-class MDiagPlugin;
-class MDiagSuitePlugin;
-class CDevDiagExecResults;
-class CDiagResultsDatabaseItem;
-class CDiagEngine;
-class RFs;
-class CDiagPluginPool;
-class CAknViewAppUi;
-class CAknDialog;
-class CIdle;
-
-/**
- *  Device Diagnostics Application Engine
- *  This class defines the engine used by the Device Diagnostics application.  The
- *  engine class handles the interfacing between UI components and diagnostics
- *  components.
- *
- *  @lib euser.lib
- *  @lib diagframework.lib
- *  @lib etel3rdparty.lib
- *  @lib diagresultsdatabase.lib
- *  @lib avkon.lib
- *  @lib eikcore.lib
- *  @lib eiksrv.lib
- *  @lib efsrv.lib
- *  @lib drmserviceapi.lib
- */
-class CDevDiagEngine : public CActive,
-                       public MDiagEngineObserver,
-                       public MDiagPluginPoolObserver
-    {
-
-public: // Data Types
-
-    /**  This enum indicates how the engine should stop tests. */
-    enum TDevDiagAppEngineStopMode
-        {
-        EStopModeSkip,
-        EStopModeCancel,
-        EStopModeSuspend,
-        EStopModeWatchdog
-        };
-
-    enum TDevDiagAppEngineResumeMode
-        {
-        EResumeModeResume,
-        EResumeModeWatchdog
-        };
-
-
-public: // New Functions
-
-    /**
-     * Two-phased constructor.
-     */
-    static CDevDiagEngine* NewL();
-
-    /**
-     * Two-phased constructor.
-     * Leaves the new engine instance on the cleanup stack.
-     */
-    static CDevDiagEngine* NewLC();
-
-    /**
-    * Destructor.
-    */
-    virtual ~CDevDiagEngine();
-
-    /**
-     * Sets the engine observer, for receiving engine events.
-     *
-     * @param aObserver A pointer to a class implementing the observer
-     *                  interface.  Ownership is not transferred.
-     */
-    void SetObserver( MDevDiagEngineObserver* aObserver );
-
-    /**
-     * Run a test or suite of tests.
-     *
-     * @param aUid The UID of the test or suite to execute.
-     * @param aAppUi The application UI which is executing tests.
-     */
-    void ExecuteTestL( TUid aUid, CAknViewAppUi& aAppUi );
-
-    /**
-     * Gets the results from test execution.  Results may be from a log or
-     * from live test execution.  The caller should check if results are
-     * available before calling this function.
-     *
-     * @return A reference to the execution results.
-     */
-    const CDevDiagExecResults& ExecutionResults() const;
-
-    /**
-     * Instructs the engine to populate the execution results information with
-     * the last set of logged data.  This may be followed by a call to
-     * ExecutionResults to retrieve the data.
-     */
-    void LoadLastLoggedResultsL();
-
-    /**
-    * Get results of the suite. Observer will be notified when
-    * results are ready (EDevDiagEngineCommandGetLastResult).
-    * 
-    * @param aParentUid UID of the plug-in whose results are needed.
-    */
-    void GetLastResultsL( TUid aParentUid );
-
-    /**
-     * Suspends, skips, or halts test execution.
-     *
-     * @param aReason The reason for stopping execution.
-     */
-    void ExecutionStopL( TDevDiagAppEngineStopMode aReason );
-
-    /**
-     * Resumes the diagnostics engine.  In the case of resuming suspended test
-     * execution, this must have been preceded by a call to ExecutionStopL
-     * with EStopModeSuspend specified.
-     *
-     * @param aReason The reason for resuming execution.
-     */
-    void ExecutionResumeL( TDevDiagAppEngineResumeMode aReason );
-
-    /**
-     * Gets the plugin pool, which is owned by the engine.
-     *
-     * @return A reference to the plugin pool.
-     */
-    const CDiagPluginPool& PluginPool() const;
-
-    /**
-     * Checks if the engine is currently running plugins.  This includes
-     * when the engine is suspended for any reason.
-     *
-     * @return ETrue if plugins are running, EFalse otherwise.
-     */
-    TBool IsRunningPlugins() const;
-
-    /**
-     * Checks if the engine is currently stopping execution.
-     *
-     * @return ETrue if execution is being cancelled, EFalse otherwise.
-     */
-    TBool IsStoppingExecution() const;
-
-    /**
-     * Checks if the engine is initialzed (it has finished loading plugins).
-     * This must be true before the runtime requirements can be checked or
-     * the reference to the plugin pool can be returned.
-     *
-     * @return ETrue if plugins are loaded, EFalse otherwise.
-     */
-    TBool ArePluginsLoaded() const;
-
-    /**
-     * Checks if the engine has execution results available.  This must be
-     * true before a reference to the results can be retrieved.
-     *
-     * @return ETrue if results are available, EFalse otherwise.
-     */
-    TBool HasExecutionResults() const;
-    
-    /**
-     * Searches Results Database for a crashed test plug-in.
-     * 
-     * @param aPluginUid Plug-in Uid that crashed.
-     * @return ETrue if crashed plug-in was found, EFalse otherwise.
-     **/
-    TBool CrashedPluginL( TUid& aPluginUid );
-
-    /**
-     * Marks the crashed test record as complete in the database.  This
-     * means that the test record is not found again when calling CrashedTestRecordL.
-     *
-     * @return KErrNone if the record was successfully completed, otherwise, a
-     *         system error code.
-     */
-    //TInt CompleteCrashedTestRecord();
-    ///@@@KSR: changes for Codescanner error val = High
-    TInt CompleteCrashedTestRecordL();
-    ///@@@KSR: changes for Codescanner error val = High
-    // ADO & Platformization Changes
-    TBool GetPluginDependencyL();
-    // GetState
-    TInt GetState();
-
-private: // Data Types
-
-    /**  This enum indicates the engine's internal state.
-     *   Any changes to this enum must be reflected with changes to the
-     *   SetState function.
-     */
-    enum TDevDiagAppEngineState
-        {
-        EStateInitial = 0,
-        EStateLoadingPlugins,
-        EStateReady,
-        EStateStartingExecution,
-        EStateRunningTests,
-        EStateStoppingExecution,
-        EStateExecutionSuspended,
-        EStateMax
-        };
-
-
-private: // New Functions
-
-    /**
-     * The default constructor.
-     */
-    CDevDiagEngine();
-
-    /**
-     * Two-phased constructor.
-     */
-    void ConstructL();
-
-    /**
-     * Handles state transitions in the application engine by validating the
-     * requested transition.
-     *
-     * @param aNextState The new state to transition to.
-     */
-    void SetState( TDevDiagAppEngineState aNextState );
-
-    /**
-     * The callback function to continue handling cancelling execution.
-     *
-     * @param aPtr A pointer to "this" object.
-     * @return Always KErrNone.
-     */
-    static TInt HandleExecutionCancelledL( TAny* aPtr );
-
-
-private: // From base class CActive
-
-    /**
-     * From CActive.
-     * This function is called when an active request completes.  For the
-     * application engine, this only happens when checking runtime
-     * requirements.
-     */
-    virtual void RunL();
-
-    /**
-     * From CActive.
-     * This function is called to cancel any outstanding asynchronous
-     * requests.
-     */
-    virtual void DoCancel();
-
-
-private: // From base class MDiagEngineObserver
-
-    /**
-     * From MDiagEngineObserver.
-     * This callback is used when test execution starts.
-     *
-     */
-    virtual void TestExecutionBeginL();
-    
-    /**
-    * Notify client of execution completion of one plug-in.
-    *   This can be either test plug-in or suite plug-in.
-    *
-    * @param aError  - KErrNone - Success.
-    *   KErrNoMemory - Out of memory.
-    *   KErrCancel   - Cancelled due to ExecutionStopL()
-    *
-    * @param aResult - Result of the test. Ownership is transferred here. 
-    *  Client must deallocate aResult to avoid memory leak. aResult is Null 
-    *  if the plug-in being executed is a suite pre/post method.
-    */
-    virtual void TestExecutionPluginExecutedL( TInt aError,
-                                               CDiagResultsDatabaseItem* aResult );
-
-    /**
-     * From MDiagEngineObserver.
-     * This callback is used to inform the application of the execution
-     * progress for the currently executing test.
-     *
-     * @param aCurrentItemStep The current step for this test.
-     * @param aCurrentItemTotalSteps The total number of steps for this test.
-     */
-    virtual void TestExecutionProgressL( TUint aCurrentItemStep,
-                                         TUint aCurrentItemTotalSteps);
-
-
-    /**
-    * From MDiagEngineObserver.
-    * Notify client of engine stopping.
-    *
-    * This indicates that engine execution has stopped. There will not be any
-    * further messages from engine. This could be called because all
-    * tests are completed, or an unrecoverable error occured during execution.
-    *
-    * Note that if cancel is called during plan creation or if plan creation
-    * fails, TestExecutionStoppedL() may be called withing first calling
-    * TestExecutionBeginL(). 
-    *
-    * @param aError - Reason for engine stopping. 
-    *   a) KErrNone - All tests are successfully completed.
-    *   b) KErrCancel - ExecutionStopL is called with ECancelAll. 
-    *       Test session cannot be resumed later.
-    *   c) KErrArgument - Parameters passed to engine are invalid.
-    *   d) Others - Other critical that could not be recovered occured during
-    *       test execution.  Test may be resumed later in this case.
-    */
-    virtual void TestExecutionCompletedL( TInt aError );
-
-    /**
-     * From MDiagEngineObserver.
-     * Notifes that execution has been suspended.
-     *
-     * @param aSuspendReason Why execution is suspended.
-     */
-    virtual void TestExecutionSuspendedL( TSuspendReason aSuspendReason );
-
-    /**
-     * From MDiagEngineObserver.
-     * Notifes that execution has been resumed.
-     *
-     * @param aResumeReason Why execution is resumed.
-     */
-    virtual void TestExecutionResumedL( TResumeReason aResumeReason );
-
-    /**
-     * From MDiagEngineObserver.
-     * Create a common dialog.
-     * @param aDialogType Type of dialog to create.
-     * @param aData Initialization parameter. Ownership is transferred.
-     * @return A pointer to newly created dialog. Ownership is passed to
-     *         caller.
-    */
-    virtual CAknDialog* CreateCommonDialogLC( TDiagCommonDialog aDialogType,
-                                              TAny* aInitData );
-                                              
-    /**
-    * From MDiagEngineObserver.
-    *
-    * Execute a command from plug-in. Parameters are identical to 
-    * MDiagEngineCommon::ExecuteAppCommandL(). 
-    * @see MDiagEngineCommon::ExecuteAppCommandL()
-    * @see TDiagAppCommand
-    */
-    virtual void ExecuteAppCommandL( TDiagAppCommand aCommand, 
-                                     TAny* aParam1,
-                                     TAny* aParam2 );                                              
-
-
-private: // From base class MDiagPluginPoolObserver
-
-       /**
-     * From MDiagPluginPoolObserver.
-     * This callback is used to inform the application about loading progress
-     * of plugins.
-     *
-     * @param aCurrentPlugin The current plugin index in the loading progress.
-     * @param aPluginCount The total number of plugins to load.
-     @ @param aLoadedPluginUid The UID of the plugin that was just loaded.
-     */
-    virtual void LoadProgressL ( TUint aCurrentPlugin,
-                                 TUint aPluginCount,
-                                 const TUid& aLoadedPluginUid );
-
-
-    /**
-    * Notify client of plug-in loading completion
-    *
-    * @param aError     KErrNone - Success
-    *                   KErrCorrupt  - One ore more plugin could not
-    *                   be loaded. 
-    *                   KErrNoMemory - Not enough memory.
-    */
-    virtual void LoadCompletedL( TInt aError );
-
-
-private: // Data
-
-    /**
-     * The application engine's current state.
-     */
-    TDevDiagAppEngineState iState;
-
-    /**
-     * The test execution results.
-     * Own.
-     */
-    CDevDiagExecResults* iResults;
-
-    /**
-     * The current observer of the application engine.
-     * Not own.
-     */
-    MDevDiagEngineObserver* iObserver;
-
-    /**
-     * The diagnostics engine.
-     * Own.
-     */
-    CDiagEngine* iDiagEngine;
-
-    /**
-     * The session with the results database server.
-     */
-    RDiagResultsDatabase iResultsDatabase;
-
-    
-    /**
-     * The plugin pool, which loads and owns plugins.
-     * Own.
-     */
-    CDiagPluginPool* iPluginPool;
-
-
-    /**
-     * Holds the number of times suspend has been called.  In nested suspend /
-     * resume scenarios, this is used to ensure we don't resume until we have
-     * matched the number of suspends.
-     */
-    TInt iSuspendCounter;
-    
-     /**
-     * A utility active object that is used to continue handling cancelling
-     * execution, because we cannot use synchronous cancelling due to the
-     * possibility of test plugins displaying the common "Cancel Execution"
-     * dialog.
-     * Own.
-     */
-    CIdle* iIdle;
-    
-    /**
-    * Get Last results UIDs. Own.
-    **/
-    CArrayFixFlat<TUid>* iUids;
-    
-    /**
-    * Buffered last results. Own.
-    **/
-    RPointerArray<CDiagResultsDatabaseItem> iLastResults;
-
-    };
-
-#endif // DEVDIAGDENGINE_H
--- a/devicediagnostics/devdiagapp/inc/devdiagengineobserver.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +0,0 @@
-/*
-* 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:  This is the observer class for the Device Diagnostics 
-*                Application's Engine class.  It is used to propagate engine 
-*                events to UI elements.
-*
-*/
-
-
-#ifndef DEVDIAGENGINEOBSERVER_H
-#define DEVDIAGENGINEOBSERVER_H
-
-/**
- *  The observer class for the application engine.
- *
- *  This class is an abstract interface which is used by the application
- *  engine to pass events from itself and the diagnostics framework to the UI
- *  components.
- */
-class MDevDiagEngineObserver
-    {
-
-public: // Data Types
-
-    /**  An enum which identifies different engine events. */
-    enum TAppEngineCommand
-        {
-        EDevDiagEngineCommandPluginLoadProgress,
-        EDevDiagEngineCommandPluginLoadComplete,
-        EDevDiagEngineCommandRunTimeReqs,
-        EDevDiagEngineCommandTestExecutionBegin,
-        EDevDiagEngineCommandProgressDataUpdated,
-        EDevDiagEngineCommandResultsDataUpdated,
-        EDevDiagEngineCommandSinglePluginExecutionDone,
-        EDevDiagEngineCommandGroupExecutionDone,
-        EDevDiagEngineCommandGroupExecutionProgress,
-        EDevDiagEngineCommandTestExecutionSuspended,
-        EDevDiagEngineCommandTestExecutionCancelled,
-        EDevDiagEngineCommandTestExecutionResumed,
-        EDevDiagEngineCommandObserverChanged,
-        EDevDiagEngineCommandGetLastResults,
-        EDevDiagEngineCommandViewSwitch,
-        EDevDiagEngineCommandExecutionStopping
-        };
-
-
-public: // Pure Virtual Functions
-
-    /**
-     * The observer interface to inform of engine events.
-     *
-     * @param aCommand The engine event.
-     * @param aError Any error code related to the event.
-     * @param aCustom Any data related to the event.  Ownership is not
-     *                transferred.  The format of the data is determined by
-     *                the event type.
-     */
-    virtual void HandleEngineCommandL( TAppEngineCommand aCommand,
-                                       TInt aError,
-                                       TAny* aCustom ) = 0;
-    };
-
-#endif // DEVDIAGENGINEOBSERVER_H
--- a/devicediagnostics/devdiagapp/inc/devdiagexecutionresults.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,516 +0,0 @@
-/*
-* 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:  This is the declaration of the execution results class used
-*                by the Device Diagnostics Application to present a common interface
-*                for results information to the application.
-*
-*/
-
-
-#ifndef DEVDIAGEXECUTIONRESULTS_H
-#define DEVDIAGEXECUTIONRESULTS_H
-
-// System Include Files
-#include <e32base.h>                // CBase
-#include <e32cmn.h>                 // RPointerArray, TUid
-
-// Forward Declarations
-class MDiagEngineCommon;
-class MDiagPlugin;
-class MPDResultsObserver;
-class CDiagResultsDatabaseItem;
-class CDiagPluginPool;
-class RDiagResultsDatabase;
-
-/**
- *  Device Diagnostics Execution Results Class.
- *  This class presents a common interface to the application for results from
- *  both live test runs as well as from the results database.
- *
- *  @lib diagresultsdatabase.lib
- *  @lib diagframework.lib
- */
-class CDevDiagExecResults : public CBase
-    {
-
-public: // Nested Classes
-
-    /**
-     *  Device Diagnostics Execution Results Information Class.
-     *  This class provides a common interface to individual results
-     *  information from either live execution or the results database.
-     */
-    class CResult : public CBase
-        {
-
-    public: // New Functions
-
-        /**
-         * Two-phased constructor.
-         *
-         * @param aPlugin The plugin that this result corresponds to.
-         * @return A pointer to the newly-created instance of CResult.
-         */
-        static CResult* NewL( const MDiagPlugin& aPlugin );
-
-        /**
-         * Two-phased constructor.
-         *
-         * @param aPlugin The plugin that this result corresponds to.
-         * @return A pointer to the newly-created instance of CResult.
-         */
-        static CResult* NewLC( const MDiagPlugin& aPlugin );
-
-        /**
-         * Destructor.
-         */
-        virtual ~CResult();
-
-        /**
-         * Returns the pointer to the test result.  This may be NULL if the
-         * item is a suite or has not been run yet.  The client must not
-         * delete this pointer.
-         *
-         * @return A pointer to the test result for this item, or NULL.
-         */
-        const CDiagResultsDatabaseItem* Result() const;
-
-        /**
-         * Returns a reference to the plugin that corresponds to this item.
-         *
-         * @return A reference to the plugin that corresponds to this item.
-         */
-        const MDiagPlugin& Plugin() const;
-
-        /**
-         * Returns the execution status (error value) for this plugin.  This
-         * will only contain meaningful data for live test executions.
-         *
-         * @return The execution status (error value) for this plugin
-         */
-        TInt ExecStatus() const;
-
-        /**
-         * Returns the current execution step for this plugin.  This will only
-         * contain meaningful data for live test executions.
-         *
-         * @return The current execution step for this plugin.
-         */
-        TUint CurrentStep() const;
-
-        /**
-         * Returns the total number of execution steps for this plugin.
-         *
-         * @return The total number of execution steps for this plugin.
-         */
-        TUint TotalSteps() const;
-
-        /**
-         * Sets the result information for this plugin.  Ownership of the
-         * result is transferred.  If the result was previously set, it will
-         * be deleted and replaced with the new data.
-         *
-         * @param aResult The test result.
-         * @param aError The execution status error value.
-         */
-        void SetResult( CDiagResultsDatabaseItem* aResult, TInt aError );
-
-        /**
-         * Sets the test progress information.
-         *
-         * @param aCurrentStep The current execution step for this plugin.
-         * @param aCurrentStep The total number of execution steps for this
-         *                     plugin.
-         */
-        void SetProgress( TUint aCurrentStep, TUint aTotalSteps );
-
-
-    private: // New Functions
-
-        /**
-         * Default constructor.
-         *
-         * @param aPlugin The plugin that this result corresponds to.
-         */
-        CResult( const MDiagPlugin& aPlugin );
-
-        /**
-         * Two-phased constructor.
-         */
-        void ConstructL();
-
-
-    private: // Data
-
-        /**
-         * The test results information.
-         * Own.
-         */
-        CDiagResultsDatabaseItem* iResult;
-
-        /**
-         * A reference to the plugin that this result corresponds to.
-         */
-        const MDiagPlugin& iPlugin;
-
-        /**
-         * The test execution status (error value).
-         */
-        TInt iExecStatus;
-
-        /**
-         * The current step in the execution of this plugin.
-         */
-        TUint iCurrentStep;
-
-        /**
-         * The total number of steps in the execution of this plugin.
-         */
-        TUint iTotalSteps;
-
-        };
-
-
-public: // New Functions
-
-    /**
-     * Two-phased constructor.  This creates an execution results object by
-     * loading test results from the Results Database (logged results).
-     *
-     * @param aRecordId The unique record identifier from the results database
-     *                  for this set of results.
-     * @param aPluginPool A reference to the plugin pool, which is used for
-     *                    getting plugin information.
-     * @param aDbSession A reference to an open session with the results
-     *                   database server.
-     * @return A pointer to the newly-created instance of CDevDiagExecResults.
-     */
-    static CDevDiagExecResults* NewL( TUid aRecordId,
-                                      CDiagPluginPool& aPluginPool,
-                                      RDiagResultsDatabase& aDbSession );
-
-    /**
-     * Two-phased constructor.  This creates an execution results object by
-     * getting test results from live execution.  The results objects are
-     * created from the diagnostics engine's execution plan, and updated as
-     * tests complete.
-     *
-     * @param aRecordId The unique record identifier from the results database
-     *                  for this set of results.
-     * @param aPluginPool A reference to the plugin pool, which is used for
-     *                    getting plugin information.
-     * @param aDbSession A reference to an open session with the results
-     *                   database server.
-     * @param aExecutedUid The uid of the plugin that was executed to produce
-     *                     these test results.
-     * @param aDiagEngine A pointer to the diagnostics engine, which is only
-     *                    used to get the execution plan during live test
-     *                    runs.
-     * @return A pointer to the newly-created instance of CDevDiagExecResults.
-     */
-    static CDevDiagExecResults* NewL( TUid aRecordId,
-                                      CDiagPluginPool& aPluginPool,
-                                      RDiagResultsDatabase& aDbSession,
-                                      TUid aExecutedUid,
-                                      MDiagEngineCommon* aDiagEngine );
-
-    /**
-     * Destructor.
-     */
-    virtual ~CDevDiagExecResults();
-
-    /**
-     * This function is used to set the result for the current execution plan
-     * index.  It is only valid for live test executions.  Ownership of the
-     * result is transferred.  If called multiple times for the same plugin,
-     * each suqsequent call deletes and overwrites the previous result data.
-     *
-     * @param aResult The test result.
-     * @param aStatus The execution status error value.
-     */
-    void AddEntryL( CDiagResultsDatabaseItem* aResult, TInt aStatus );
-
-    /**
-     * Sets the test progress information for the current execution plan
-     * index.
-     *
-     * @param aCurrentStep The current execution step for this plugin.
-     * @param aCurrentStep The total number of execution steps for this
-     *                     plugin.
-     */
-    void SetProgressL( TUint aCurrentStep, TUint aTotalSteps );
-
-    /**
-     * Retrieves the CResult reference at the specified index.
-     *
-     * @param aIndex The index of the result to retrieve.
-     * @return A reference to the CResult object at the index.
-     */
-    CResult& operator[] ( TInt aIndex );
-    const CResult& operator[] ( TInt aIndex ) const;
-
-    /**
-     * Retrieves the CResult reference at the current index.  For live
-     * execution runs, this is determined from the test execution plan.  For
-     * logged results, this is always the last item.
-     *
-     * @return A reference to the CResult object.
-     */
-    CResult& CurrentItemL();
-    const CResult& CurrentItemL() const;
-
-    /**
-     * Returns the number of result items.
-     *
-     * @return The number of result items.
-     */
-    TInt Count() const;
-
-    /**
-     * Returns the index of the current result item.  For live execution runs,
-     * this is determined from the test execution plan.  For logged results,
-     * this is always the last item.
-     *
-     * @return The index of the current execution item.
-     */
-    TUint CurrentIndexL() const;
-
-    /**
-     * Checks if the diagnostics engine has finished the last test.
-     *
-     * @return ETrue if the last test has finished and the diagnostics engine
-     *         is cleaning up.
-     */
-    TBool LastTestFinishedL() const;
-
-    /**
-     * Returns whether or not the item specified by the argument is (or was)
-     * executed as a dependency test.
-     *
-     * @param aIndex The index of the item to check for dependency execution.
-     * @return ETrue if the item is (or was) a dependency, EFalse otherwise.
-     */
-    TBool IsDependencyL( TInt aIndex ) const;
-
-    /**
-     * Returns whether or not the results are from a completed test record.
-     *
-     * @return ETrue if the results are from a completed test record, EFalse
-     *         otherwise.
-     */
-    TBool IsRecordCompleted() const;
-
-    /**
-     * Finalizes live execution results so that they may not be updated.
-     *
-     * @param aTestingComplete Indicates if all tests in the record were
-     *                         executed.
-     */
-    void Finalize( TBool aTestingComplete );
-
-    /**
-     * Returns the total number of steps for all items in the execution
-     * results.
-     *
-     * @return The total number of steps for all items in the execution
-     *         results.
-     */
-    TInt TotalExecutionSteps() const;
-
-    /**
-     * Returns the current execution step based on all items in the execution
-     * results.
-     *
-     * @return The current execution step based on all items in the execution
-     *         results.
-     */
-    TInt CurrentExecutionStep() const;
-
-    /**
-     * Returns a reference to the plugin that the engine was asked to execute.
-     * The engine must be executing plugins for this to be valid.
-     *
-     * @return A reference to the plugin that the engine was asked to execute.
-     */
-    const MDiagPlugin& ExecutedPluginL() const;
-
-    /**
-     * Returns whether or not the execution is for a single plugin.
-     *
-     * @return ETrue if the execution is for a single plugin.
-     */
-    TBool SinglePluginExecutionL() const;
-
-    /**
-     * Returns the number of failed tests in this set of results.
-     *
-     * @return The number of failed tests in this set of results.
-     */
-    TInt FailedResultsCount() const;
-    
-    /**
-     * Returns the number of passed tests in this set of results.
-     *
-     * @return The number of passed tests in this set of results.
-     */
-    TInt PassedResultsCount() const;
-
-    /**
-     * Returns whether or not the execution plan's resume index has been
-     * reached.  This value indicates if the diagnostics engine is still
-     * updating the application with cached test results.
-     *
-     * @return ETrue if the execution plan's resume index has been reached.
-     */
-    TBool ResumeIndexReachedL() const;
-
-    /**
-     * Returns the UID of the record associated with this set of results.
-     *
-     * @return The UID of the record associated with this set of results.
-     */
-    const TUid& RecordId() const;
-    
-// ADO & Platformization Changes   
-    const CDiagResultsDatabaseItem* GetSinglepluginExecutionResult() const;
-
-
-private: // Data Types
-
-    /**  Enum to indicate what type of results data this object contains. */
-    enum TResultsType
-        {
-        ETypeExecution,
-        ETypeLog
-        };
-
-
-private: // New Functions
-
-    /**
-     * Default constructor.
-     *
-     * @param aRecordId The unique record identifier from the results database
-     *                  for this set of results.
-     * @param aPluginPool A reference to the plugin pool, which is used for
-     *                    getting plugin information.
-     * @param aExecutedUid The uid of the plugin that was executed to produce
-     *                     these test results.  This is ignored for logged
-     *                     test results.
-     * @param aDiagEngine A pointer to the diagnostics engine, which is only
-     *                    used to get the execution plan during live test
-     *                    runs.  This must be NULL for logged test results.
-     */
-    CDevDiagExecResults( TUid aRecordId,
-                         CDiagPluginPool& aPluginPool,
-                         RDiagResultsDatabase& aDbSession,
-                         TUid aExecutedUid = KNullUid,
-                         MDiagEngineCommon* aDiagEngine = NULL );
-
-    /**
-     * Two-phased constructor.
-     */
-    void ConstructL();
-
-
-private: // Data
-
-    /**
-     * The type of results data contained by this object.
-     */
-    TResultsType iType;
-
-    /**
-     * The array of results data.
-     */
-    RPointerArray< CResult > iResults;
-
-    /**
-     * The results database UID that corresponds to this test record.
-     */
-    TUid iRecordId;
-
-    /**
-     * The plugin pool, used to get information about test plugins.
-     */
-    CDiagPluginPool& iPluginPool;
-
-    /**
-     * A reference to an open database session.  This object does not close
-     * the database session; it may only use it and create subsessions.
-     */
-    RDiagResultsDatabase& iDbSession;
-
-    /**
-     * A pointer to the diagnostics engine, used only to get the execution
-     * plan for live test exections.
-     * Not own.
-     */
-    MDiagEngineCommon* iDiagEngine;
-
-    /**
-     * The total number of test steps in the entire execution.
-     */
-    TInt iTotalSteps;
-
-    /**
-     * The total number of test steps in the entire execution.
-     */
-    TInt iCompletedSteps;
-
-    /**
-     * The test step that the currently-executing plugin is on.  This is not
-     * combined with "iCompletedSteps" because plugins may be suspended and
-     * restarted before they finally complete.
-     */
-    TInt iCurrentPluginStep;
-
-    /**
-     * The UID of the plugin executed to produce these results.  This is
-     * obtained from the test record during construction.
-     */
-    TUid iExecutedPlugin;
-
-    /**
-     * The status of the record that corresponds to these test results.  A
-     * record is fully completed only when all tests in it have been executed,
-     * or the user decides not to resume it after suspending it.  This data is
-     * obtained from the Finalize() function for live executions and from the
-     * database for logged results.
-     */
-    TBool iCompleted;
-
-    /**
-     * The number of failed tests in these test results.  This data is
-     * obtained from the AddEntryL() function for live executions and from the
-     * database for logged results.
-     */
-    TInt iFailedCount;
-    
-    /**
-      * The number of passed tests in these test results.  This data is
-      * obtained from the AddEntryL() function for live executions and from the
-      * database for logged results.
-      */
-     TInt iPassedCount;
-
-    /**
-     * The index value of the last test plugin in the results array.  This is
-     * used to check if the last test has finished.
-     */
-    TInt iLastTestIndex;
-
-    };
-
-#endif // PDEXECUTIONRESULTS_H
--- a/devicediagnostics/devdiagapp/inc/devdiagplugincontainer.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,297 +0,0 @@
-/*
-* Copyright (c) 2007-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:  Plug-in container. Displayes test plug-ins.
-*
-*/
-
-
-
-#ifndef CDEVDIAGPLUGINCONTAINER_H
-#define CDEVDIAGPLUGINCONTAINER_H
-
-// INCLUDES
-#include <bldvariant.hrh>
-#include <eiklbo.h>
-#include <aknlists.h>
-#include <eikdialg.h>
-#include <eikmenup.h>
-#include <e32def.h>
-#include <aknstaticnotedialog.h>
-#include <AknProgressDialog.h> 
-
-
-// FORWARD DECLARATIONS
-class CDevDiagPluginView;
-class CDevDiagEngine;
-class MDiagPlugin;
-class CDiagResultsDatabaseItem;
-class CAknDoubleLargeStyleListBox;
-
-// CLASS DECLARATION
-
-/**
-* CDevDiagPluginContainer class
-* @since S60 5.0
-* 
-*/
-class CDevDiagPluginContainer : public CCoeControl,
-                             	public MCoeControlObserver,
-                                public MEikListBoxObserver                                                  
-    {    
-  
-    // Container results
-    enum TContainerResult
-        {
-        ESuccess = 0,
-        EFailed,           
-        ENotPerformed,       
-        };
-  
-    public: // Constructors and destructor
-    
-        /**
-        * NewL.
-        *
-        * @param aView Plug-in view.
-        * @param aEngine Diagnostics Engine.
-        * @param aRect The area to draw on.
-        */
-        static CDevDiagPluginContainer* NewL( CDevDiagPluginView* aView,
-                                              CDevDiagEngine& aEngine,
-                                               const TRect& aRect );
-
-		/**
-        * Destructor.
-        */
-        ~CDevDiagPluginContainer();	
-	
-    public: // Functions from base classes
-
-		/**
-        * From MProgressDialogCallback. Gets called when the
-        * dialog is dismissed/closed.
-        * @param aButtonId Softkey Button Id
-        */
-        void DialogDismissedL( const TInt aButtonId );
-
-        /**
-        * From CoeControl Responds to size changes. 
-        * Sets the size and position of the contents of this control.
-        * @since Series 60 3.1
-        * @param None.
-        * @return None.
-        */
-        void SizeChanged();
-
-        /**
-        * From CoeControl Handles the situations where
-        * a resource (e.g. skin or layout) is changed.
-        * @since Series 60 3.1
-        * @param aType Type of resource change.
-        * @return None.
-        */
-        void HandleResourceChange( TInt aType );
-
-        /**
-        * From CoeControl Gets the number of controls contained 
-        * in a compound control.        
-        * @since Series 60 3.1
-        * @param None.
-        * @return The number of component controls contained by this control.
-        */
-        TInt CountComponentControls() const;
-
-        /**
-        * From CoeControl Gets the specified component of a compound control.
-        * @since Series 60 3.1
-        * @param aIndex The index of the control to get.
-        * @return Reference to the component control.
-        */
-        CCoeControl* ComponentControl( TInt aIndex ) const;
-
-        /**
-        * From CoeControl Draws the control.
-        * @since Series 60 3.1
-        * @param aRect The region of the control to be redrawn.
-        * @return None.
-        */
-        void Draw( const TRect& aRect ) const;
-
-        /**
-        * From CoeControl Handles key events.
-        * @since Series 60 3.1
-        * @param aKeyEvent The key event that occurred.
-        * @param aType The event type.
-        * @return Response to the key event.
-        */
-        TKeyResponse OfferKeyEventL( const TKeyEvent& aKeyEvent, TEventCode aType );       
-
-		/**
-        * Handle ListBox EventL
-        * @param CEikListBox* aListBox Pointer to used listbox
-		* @param TListBoxEvent aEventType Event type
-        * @return -
-        */
-		void HandleListBoxEventL( CEikListBox* aListBox, TListBoxEvent aEventType );
-		
-        /**
-        * From MCoeControlObserver Handles an event from an observed control.
-        * @since Series 60 3.1
-        * @param aControl The control that sent the event.
-        * @param aEventType The event type.
-        * @return None.
-        */
-        void HandleControlEventL( CCoeControl* aControl, TCoeEvent aEventType );        
-
-        /**
-        * From CoeControl Gets the control's help context.
-        * @since Series 60 3.1
-        * @param aContext The control's help context
-        * @return None.
-        */
-        void GetHelpContext( TCoeHelpContext& aContext ) const;
-        /**
-        * Handle Pointer EventL
-        * @since Series 60 3.2
-        * @param  aPointerEvent The event type
-        * @return None.
-        */
-        //void HandlePointerEventL( const TPointerEvent& aPointerEvent );
-        
-    public: //New functions       
-        
-        /**
-        * Retrieve currently selected plug-in 
-        *
-        * @param aPlugin Selected plug-in.
-        **/
-        void SelectedPlugin( MDiagPlugin*& aPlugin );
-        
-        /**
-        * Display plug-ins and their last results.
-        * Last results are retrieved from the results DB.
-        * Model provides a helper function for that.
-        *
-        * @param aArray plug-in result array.
-        **/
-        void DisplayChildrenWithResultsL(
-                        RPointerArray<CDiagResultsDatabaseItem>& aArray );
-                    
-        /**
-        * Change plug-in's text into "Testing ..."
-        * The container uses the currently selected plug-in.
-        **/                
-        void DisplayStartTestingL();
-        
-        /**
-        * Move "Testing..." to the next plug-in in the listbox.
-        **/
-        void MoveStartTestingDownL();
-        
-        /**
-        * Reset listbox index.
-        **/
-        void ResetL();
-        
-        /**
-        * Loads children of the parent suite.
-        * Container keeps model in memory.
-        * @param aParentSuiteUid UID of the parent.
-        **/
-        void UpdateModelL( TUid aParentSuiteUid );                        
-
-    protected:
-
-        /**
-		* Change of focus
-        * @param -
-		* @return -
-        */
-        void FocusChanged(TDrawNow aDrawNow);
-	
-        /**
-        * Appends icons to the contained listbox.
-        * @param None.
-        * @return None.
-        */
-        void AddIconsL();       
-
-    private:
-
-        /**
-        * C++ default constructor.
-        */
-        CDevDiagPluginContainer( CDevDiagPluginView* aView, CDevDiagEngine& aEngine );
-
-        /**
-        * By default Symbian 2nd phase constructor is private.
-        */
-        void ConstructL( const TRect& aRect );
-        
-        /**
-        * Load plug-in's test result text (localised).
-        **/
-        HBufC* GetPluginResultL( TContainerResult aResult ) const;
-        
-        /**
-        * Load plug-in's test result text (localised).
-        **/
-        HBufC* ConvertResultLC( const TDesC& aString, 
-                               TInt& aIconIndex, 
-                               CDiagResultsDatabaseItem* aResult ) const;
-        
-        /**
-        * Displays plug-in's result into the listbox.
-        *
-        * @param aListboxModel Listbox model.
-        * @param aPlugin The plug-in that is displayed.
-        * @param aItem Plug-in's test result.
-        **/
-        void DisplayLastResultL( CDesCArray& aListboxModel,
-                                 MDiagPlugin*& aPlugin,
-                                 CDiagResultsDatabaseItem& aItem ); 
-        
-        /**
-        * Display not performed.
-        *
-        * @param aListboxModel Listbox model.
-        * @param aPlugin The plug-in that is displayed.        
-        **/                         
-        void DisplayNotPerformedL( CDesCArray& aListboxModel, 
-                                  MDiagPlugin*& aPlugin );                                  
-                           
-	public:  // data
-	
-	    // The listbox. Own.
-		CAknDoubleLargeStyleListBox*   iListBox;
-	
-	    // Plug-in view. Not own.
-        CDevDiagPluginView*       iView;
-        
-        // Diagnostics engine
-        CDevDiagEngine&           iEngine;
-                      
-        // Currently displayed plug-ins
-        // Plug-ins are owned by the engine.
-        // Do not call ResetAndDestroy.
-        // This is the model
-        RPointerArray<MDiagPlugin> iChildren;
-        
-        // Is the model updated.
-        TBool iModelUpdated;			
-    };
-
-#endif  // CDEVDIAGPLUGINCONTAINER_H
-
-// End of File
--- a/devicediagnostics/devdiagapp/inc/devdiagpluginview.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,176 +0,0 @@
-/*
-* 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:  Plug-in view. Handles test plug-ins.
-*
-*/
-
-
-#ifndef DEVDIAGPLUGINVIEW_H
-#define DEVDIAGPLUGINVIEW_H
-
-// INCLUDES
-#include <aknview.h> 
-#include "devdiagengineobserver.h"
-
-// MACROS
-
-// DATA TYPES
-
-// FUNCTION PROTOTYPES
-
-// FORWARD DECLARATIONS
-class CAknView;
-class CDevDiagPluginContainer;
-class CDevDiagEngine;
-class CDevDiagExecResults;
-
-// CLASS DEFINITION
-/**
-*  CDevDiagPluginView view class 
-*  @since S60 5.0
-*
-*/
-class CDevDiagPluginView : public CAknView, public MDevDiagEngineObserver
-    {
-    
-public: // Constructors and destructor.
-
-    /**
-    * Symbian OS two-phased constructor.
-    * @return a new view.
-    */
-    static CDevDiagPluginView* NewL( CDevDiagEngine& aEngine, TUid aParentSuiteUid );
-
-    /**
-    * Destructor.
-    */
-    ~CDevDiagPluginView();
-    
-    
-public: //From CAknView
-
-    /**
-    * From CAknView Handles user commands.
-    * @since Series 60 3.1
-    * @param aCommand The command identifier.
-    * @return None.
-    */
-    void HandleCommandL( TInt aCommand );
-    
-    /**
-    * From CAknView.
-    * Returns views id.
-    **/
-    TUid Id() const;
-    
-public: // engine observer
-
-    virtual void HandleEngineCommandL( TAppEngineCommand aCommand,
-                                       TInt aError,
-                                       TAny* aCustom );    
-
-public:
-
-    /**
-    * Display confirmation dialog after successful group execution.
-    * succesful execution means that all tests have the following result:
-    * - passed
-    * - cancelled
-    * - skipped    
-    **/ 
-    void DisplayConfirmationDialogL(TInt aResourceId);
-    
-    /**
-    * Displays message query dialog. The dialog lists all tests cases that failed.
-    **/
-    void DisplayMessageQueryDialogFailedResultsL();
-
-protected:
-    /**
-    * From CAknView Activates view.
-    * @since Series 60 3.1
-    * @param aPrevViewId Id of previous view.
-    * @param aCustomMessageId Custom message id.
-    * @param aCustomMessage Custom message.
-    * @return None.
-    */
-    virtual void DoActivateL (const TVwsViewId &aPrevViewId, 
-                                    TUid aCustomMessageId, 
-                                    const TDesC8 &aCustomMessage);
-    /**
-    * From CAknView Deactivates view.        
-    * @since Series 60 3.1
-    * @param None.
-    * @return None.
-    */
-    virtual void DoDeactivate(); 
-    
-    /**
-    * Change Title.
-    *
-    * @aResourceId Title text resource.
-    **/        
-    void ChangeTitleL(TInt aResourceId);
-    
-    /**
-    * Set Context menu.
-    **/
-    void SetContextMenu();
-    
-    /**
-    * Display a message query dialog.
-    *
-    * @param aResourceId Message query resource ID.
-    **/
-    TBool MessageQueryDialogLaunchL( TInt aResourceId );
-        
-    /**
-    * Create result texts for failed test cases.
-    *
-    * @param aExecResults Execution results.
-    * @return New heap descriptor. Caller owns the descriptor.
-    **/ 
-    HBufC* CreateResultsTextsForFailedTestsLC( const CDevDiagExecResults& aExecResults );
-    
-private: //Constructors
-    
-    /**
-    * ConstructL.
-    **/
-    void ConstructL();
-    
-    /**
-    * Normal constructor.
-    *
-    * @param aEngine Diagnostics Engine.
-    * @param aParentSuiteUid UID of the parent suite.
-    **/
-    CDevDiagPluginView( CDevDiagEngine& aEngine, TUid aParentSuiteUid );    
-        
-        
-private:    
-    
-    // Container. Own.
-    CDevDiagPluginContainer* iContainer;   
-    
-    // Diagnostics Engine.
-    CDevDiagEngine& iEngine;   
-    
-    // Main view UID.
-    TUid iParentSuiteUid;   
-    };
-
-#endif //DEVDIAGPLUGINVIEW_H
-
-// End of File
--- a/devicediagnostics/devdiagapp/inc/devdiagprivatecrkeys.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-/*
-* 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:  Private Central Repository keys.
-*
-*/
-
-
-#ifndef DEVDIAGPRIVATECRKEYS_H
-#define DEVDIAGPRIVATECRKEYS_H
-
-//  INCLUDES
-#include <e32std.h>
-
-// =============================================================================
-// Phone Doctor
-// =============================================================================
-
-const TUid KCRUidDevDiag = { 0x2000E542 };
-
-/**
- *
- * The value assigned to this key is the minimum battery level required to run
- * tests.
- *
- * Available options: N/A
- * Default value: 15
-*/
-const TUint32 KDevDiagAppMinBatteryLevel = 0x00000001;
-
-/**
- *
- * The value assigned to this key is the minimum disk space that will be
- * required to run Device Diagnostics Application.
- *
- * Available options: N/A
- * Default value: 100000
-*/
-const TUint32 KDevDiagAppMinDiskSpace = 0x00000002;
-
-#endif // DEVDIAGPRIVATECRKEYS_H
--- a/devicediagnostics/devdiagapp/inc/devdiagruntimereqsinfo.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,269 +0,0 @@
-/*
-* 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:  .
-*
-*/
-
-
-#ifndef DEVDIAGRUNTIMEREQSINFO_H
-#define DEVDIAGRUNTIMEREQSINFO_H
-
-// System Include Files
-#include <e32base.h>                // CActive
-#include <e32def.h>                 // TInt, TUint, TInt64
-#include <e32std.h>                 // TTime, TCallBack
-#include <etel.h>                   // RTelServer
-#include <etel3rdparty.h>           // CTelephony Packages
-#include <etelmm.h>                 // RMobilePhone
-
-// Forward Declarations
-class RFs;
-class RDiagResultsDatabase;
-
-/**
- *  Phone Doctor Application Runtime Requirements Information
- *  This class checks the current status of diagnostics requirements,
- *  which must be satisfied before the Phone Doctor Application may run tests.
- *
- *  @lib euser.lib
- *  @lib centralrepository.lib
- */
-class CDevDiagRuntimeReqsInfo : public CActive
-    {
-
-public: // Data Types
-
-    /**
-     * Error codes indicating the results of the runtime requirements checks.
-     */
-     enum TResult
-        {
-        EResultOk = 0,       
-        EResultErrLowDisk,
-        EResultErrLowBattery,        
-        };
-
-
-public: // New Functions
-
-    /**
-     * Two-phased constructor.
-     *
-     * @param aFs A reference to a connected file system object.
-     * @param aDb A reference to a connection results database session.
-     * @param aCallback A general callback that indicates when checking the
-     *                  runtime requirements has finished.
-     * @return A pointer to a new instance of CDevDiagRuntimeReqsInfo.
-     */
-    static CDevDiagRuntimeReqsInfo* NewL( RFs& aFs,
-                                     RDiagResultsDatabase& aDb,
-                                     TCallBack aCallback );
-
-    /**
-    * Destructor.
-    */
-    virtual ~CDevDiagRuntimeReqsInfo();
-
-    /**
-     * Checks if the diagnostics runtime requirements are satisfied.  This
-     * is an asynchronous request which will complete with a callback.
-     *
-     * @param aResumingTests If ETrue, then runtime checks which do not apply
-     *                       to resumed test execution will be skipped.
-     */
-    void CheckRuntimeRequirementsL( TBool aResumingTests );
-
-    /**
-     * Returns the runtime requirements result, which indicates if the runtime
-     * requirements were satisfied.
-     *
-     * @return The runtime requirements result.
-     */
-    TResult Result() const;
-
-    /**
-     * Displays the dialog associated with the result of the runtime checks.
-     *
-     * @return The command the dialog is dismissed with.
-     */
-    TInt DisplayDialogL() const;
-
-
-private: // Data Types
-
-    /**
-     * The state of the runtime requirements.  This is used to handle
-     * completion of the asynchronous requests.
-     */
-    enum TState
-        {
-        EStateInitial = 0,
-        EStateCheckingBattery,   
-        EStateComplete
-        };
-
-
-private: // New Functions
-
-    /**
-     * C++ constructor.
-     *
-     * @param aFs A reference to a connected file system object.
-     * @param aDb A reference to a connection results database session.
-     * @param aCallback A general callback that indicates when checking the
-     *                  runtime requirements has finished.
-     */
-    CDevDiagRuntimeReqsInfo( RFs& aFs,
-                        RDiagResultsDatabase& aDb,
-                        TCallBack aCallback );
-
-    /**
-     * Two-phased constructor.
-     */
-    void ConstructL();
-
-    /**
-     * Reads the runtime requirements values from the central repository and
-     * stores them to the object.
-     */
-    void ReadCentralRepositoryValuesL();
-
-   
-    /**
-     * Checks if there is enough free estimated disk space to log test
-     * results.  Updates the member data with the disk space information.
-     */
-    void CheckDiskSpaceL();
-
-    /**
-     * Checks if the phone's battery level is adequate to run tests.  Updates
-     * the member data with the battery level information.
-     */
-    void CheckBatteryLevelL();
-    
-    /**
-     * This is a utility function to handle the common checking for completion
-     * of the runtime requirements checks.  If a runtime check failed, this
-     * will set the object active so that the runtime checking completes.
-     *
-     * @return ETrue if checking is done, EFalse if checking should continue.
-     */
-    TBool CheckCompletion();
-
-    /**
-     * Utility function to display a message dialog associated with the
-     * specified resource.
-     *
-     * @param aResource The resource of the message query dialog to display.
-     * @return The button pressed to dismiss the dialog.
-     */
-    static TInt DisplayMessageQueryDialogL( TInt aResource );
-
-    
-private: // From base class CActive
-
-    /**
-     * From CActive.
-     * This function is called when an active request completes.
-     */
-    virtual void RunL();
-
-    /**
-     * From CActive.
-     * This function is called to cancel any outstanding asynchronous
-     * requests.
-     */
-    virtual void DoCancel();
-
-
-private: // Data
-
-    /**
-     * A reference to a connected file server session, used to check the disk
-     * space.
-     */
-    RFs& iFs;
-
-    /**
-     * A reference to a connected results database session, used to get
-     * information about the maximum executions.
-     */
-    RDiagResultsDatabase& iDb;
-
-    /**
-     * A general callback that indicates when checking the runtime
-     * requirements has finished.
-     */
-    TCallBack iCallback;
-    
-     /**
-     * A telephony object used to check some of the runtime requirements
-     * checks.
-     * Own.
-     */
-    CTelephony* iTelephony;
-
-    /**
-     * A battery info object used to satisfy the runtime requirement check for
-     * minimum battery level.
-     */
-    CTelephony::TBatteryInfoV1 iBatteryInfo;
-
-    /**
-     * A package object for the battery information.
-     */
-    CTelephony::TBatteryInfoV1Pckg iBatteryInfoPackage;
-
-    /**
-     * Indicates if the runtime requirements are being checked for resumed
-     * test execution.  If ETrue, then runtime checks which do not apply to
-     * resumed test execution will be skipped.
-     */
-    TBool iResumingTests;
-
-    /**
-     * The runtime requirements status, which will contain error code values
-     * to indicate if the runtime requirements are satisfied.
-     */
-    TResult iResult;
-
-    /**
-     * The state, which is used when handling asynchronous requests.
-     */
-    TState iState;
-
-    /**
-     * The current battery level.
-     */
-    TInt iBatteryLevel;
-
-    /**
-     * The minimum required battery level.
-     */
-    TInt iMinBatteryLevel;
-
-    /**
-     * The current amount of free disk space (in bytes).
-     */
-    TInt64 iDiskSpaceFree;
-
-    /**
-     * The minimum required free disk space (in bytes).
-     */
-    TInt64 iMinDiskSpaceFree;
-
-    
-    };
-
-#endif // DEVDIAGRUNTIMEREQSINFO_H
--- a/devicediagnostics/devdiagapp/inc/devdiagsuitecontainer.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,223 +0,0 @@
-/*
-* 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:  Main container that displayes test suites.
-*
-*/
-
-
-
-#ifndef CDEVDIAGSUITECONTAINER_H
-#define CDEVDIAGSUITECONTAINER_H
-
-// SYSTEM INCLUDES
-#include <eiklbo.h>
-#include <coecntrl.h> 
-
-// FORWARD DECLARATIONS
-class CDevDiagSuiteView;
-class CDevDiagEngine;
-class MDiagPlugin;
-class CAknSingleLargeStyleListBox;
-
-// CLASS DECLARATION
-
-/**
-* CDevDiagSuiteContainer dialog class
-* 
-*/
-class CDevDiagSuiteContainer : public CCoeControl,
-                             	 public MCoeControlObserver,
-                                 public MEikListBoxObserver                                                  
-    {    
-  
-    public: // Constructors and destructor
-
-        /**
-        * Two-phased constructor.
-        *
-        * @param aView Main view.
-        * @param aEngine Model.
-        * @param aRect Area to draw on.
-        */
-        static CDevDiagSuiteContainer* NewL( CDevDiagSuiteView* aView,
-                                               CDevDiagEngine& aEngine,
-                                               const TRect& aRect );
-
-		/**
-        * Destructor.
-        */
-        ~CDevDiagSuiteContainer();	
-	
-    public: // Functions from base classes
-
-		/**
-        * From MProgressDialogCallback. Gets called when the
-        * dialog is dismissed/closed.
-        * @param aButtonId Softkey Button Id
-        */
-        void DialogDismissedL( const TInt aButtonId );
-
-        /**
-        * From CoeControl Responds to size changes. 
-        * Sets the size and position of the contents of this control.
-        * @since Series 60 3.1
-        * @param None.
-        * @return None.
-        */
-        void SizeChanged();
-
-        /**
-        * From CoeControl Handles the situations where
-        * a resource (e.g. skin or layout) is changed.
-        * @since Series 60 3.1
-        * @param aType Type of resource change.
-        * @return None.
-        */
-        void HandleResourceChange( TInt aType );
-
-        /**
-        * From CoeControl Gets the number of controls contained 
-        * in a compound control.        
-        * @since Series 60 3.1
-        * @param None.
-        * @return The number of component controls contained by this control.
-        */
-        TInt CountComponentControls() const;
-
-        /**
-        * From CoeControl Gets the specified component of a compound control.
-        * @since Series 60 3.1
-        * @param aIndex The index of the control to get.
-        * @return Reference to the component control.
-        */
-        CCoeControl* ComponentControl( TInt aIndex ) const;
-
-        /**
-        * From CoeControl Draws the control.
-        * @since Series 60 3.1
-        * @param aRect The region of the control to be redrawn.
-        * @return None.
-        */
-        void Draw( const TRect& aRect ) const;
-
-        /**
-        * From CoeControl Handles key events.
-        * @since Series 60 3.1
-        * @param aKeyEvent The key event that occurred.
-        * @param aType The event type.
-        * @return Response to the key event.
-        */
-        TKeyResponse OfferKeyEventL( const TKeyEvent& aKeyEvent, TEventCode aType );       
-
-		/**
-        * Handle ListBox EventL
-        * @param CEikListBox* aListBox Pointer to used listbox
-		* @param TListBoxEvent aEventType Event type
-        * @return -
-        */
-		void HandleListBoxEventL( CEikListBox* aListBox, TListBoxEvent aEventType );
-		
-        /**
-        * From MCoeControlObserver Handles an event from an observed control.
-        * @since Series 60 3.1
-        * @param aControl The control that sent the event.
-        * @param aEventType The event type.
-        * @return None.
-        */
-        void HandleControlEventL( CCoeControl* aControl, TCoeEvent aEventType );        
-
-        /**
-        * From CoeControl Gets the control's help context.
-        * @since Series 60 3.1
-        * @param aContext The control's help context
-        * @return None.
-        */
-        void GetHelpContext( TCoeHelpContext& aContext ) const;
-                
-        /**
-        * Display children of the parent.
-        *
-        * @param aParentUid Suite UID.
-        **/
-        void DisplayChildrenL( TUid aParentUid );
-        
-        /**
-        * Append plug-in into the listbox
-        * 
-        * @param aPlugin Plug-in to be added.
-        *
-        **/
-        void DisplayPluginL( MDiagPlugin* aPlugin );
-                
-        /**
-        * Return the plug-in that is selected 
-        * Return always a test suite.
-        *
-        * @param aPlugin The selected plug-in.
-        **/
-        void SelectedPlugin( MDiagPlugin*& aPlugin ) const;
-
-    protected:
-
-        /**
-		* Change of focus
-        * @param -
-		* @return -
-        */
-        void FocusChanged(TDrawNow aDrawNow);
-	
-        /**
-        * Appends icons to the contained listbox.
-        * @since Series 60 3.1
-        * @param None.
-        * @return None.
-        */
-        void AddIconsL();
-
-    private:
-
-        /**
-        * C++ default constructor.
-        *
-        * @param aView Main view.
-        * @param aEngine Model.
-        */
-        CDevDiagSuiteContainer( CDevDiagSuiteView* aView, CDevDiagEngine& aEngine );
-
-        /**
-        * By default Symbian 2nd phase constructor is private.
-        */
-        void ConstructL( const TRect& aRect );
-                 
-	public:  // data
-	
-	    //Listbox. Own.
-		CAknSingleLargeStyleListBox*   iListBox;
-	
-	    //Main view. 
-        CDevDiagSuiteView*       iView;
-        
-        //Model.
-        CDevDiagEngine&           iEngine;
-                
-        //Currently displayed plug-ins
-        //Plug-ins are owned by the engine.
-        //Do not call ResetAndDestroy.
-        RPointerArray<MDiagPlugin> iChildren;
-			
-    };
-
-#endif  // CDEVDIAGSUITECONTAINER_H
-
-// End of File
--- a/devicediagnostics/devdiagapp/inc/devdiagsuiteview.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,234 +0,0 @@
-/*
-* 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:  Application view class.
-*
-*/
-
-
-#ifndef DEVDIAGSUITEVIEW_H
-#define DEVDIAGSUITEVIEW_H
-
-#include "devdiagengineobserver.h"
-
-#include <aknview.h> 
-#include <vwsdef.h> //TVwsViewId
-
-class CAknViewAppUi;
-class CDevDiagSuiteContainer;
-class CDevDiagEngine;
-class CDevDiagPluginView;
-class CAknWaitDialog;
-class CDevDiagExecResults;
-
-/**
-* An instance of the Application View object for the DevDiagApp 
-* application
-* @since 5.0
-**/
-class CDevDiagSuiteView : public CAknView,
-			              public MDevDiagEngineObserver			   
-	
-    {
-public:
-
-    /**
-    * NewL
-    *  
-    * Create a CDevDiagSuiteView object.
-    * @param aEngine Diagnostics engine.
-    *  
-    * @result a pointer to the created instance of CDevDiagSuiteView
-    **/
-    static CDevDiagSuiteView* NewL( CDevDiagEngine& aEngine );
-
-    /**
-    * NewLC
-    * 
-    * Create a CDevDiagSuiteView object.
-    * @param aEngine Diagnostics engine.
-    *
-    * @result a pointer to the created instance of CDevDiagSuiteView
-    **/
-    static CDevDiagSuiteView* NewLC( CDevDiagEngine& aEngine );
-
-
-    /**
-    * Destructor.
-    *
-    * Destroy the object and release all memory objects
-    **/
-    ~CDevDiagSuiteView();
-
-    
-public: //From CAknView
-
-    /**
-    * From CAknView Handles user commands.
-    * @since Series 60 3.1
-    * @param aCommand The command identifier.
-    * @return None.
-    */
-    void HandleCommandL( TInt aCommand );
-    
-    /**
-    * From CAknView.
-    * Returns views id.
-    **/
-    TUid Id() const;
-
-
-protected:
-    /**
-    * From CAknView Activates view.
-    * @since Series 60 3.1
-    * @param aPrevViewId Id of previous view.
-    * @param aCustomMessageId Custom message id.
-    * @param aCustomMessage Custom message.
-    * @return None.
-    */
-    virtual void DoActivateL ( const TVwsViewId &aPrevViewId, 
-                               TUid aCustomMessageId, 
-                               const TDesC8 &aCustomMessage );
-    /**
-    * From CAknView Deactivates view.        
-    * @since Series 60 3.1
-    * @param None.
-    * @return None.
-    */
-    virtual void DoDeactivate();     
-        
-public: // engine observer
-
-    /**
-    * From MDevDiagEngineObserver.
-    **/
-    virtual void HandleEngineCommandL( TAppEngineCommand aCommand,
-                                       TInt aError,
-                                       TAny* aCustom );    
-  
-
-private:
-
-    /**
-    * Change the title of the application.
-    * @param aResourceId Title text ID.
-    **/
-    void ChangeTitleL(TInt aResourceId);        
-    
-    /**
-    * Perform the second phase construction of a CDevDiagSuiteView object    
-    **/
-    void ConstructL( );
-
-    /**
-    * Perform the first phase of two phase construction 
-    *
-    * @param aEngine Application model class.
-    **/
-    CDevDiagSuiteView( CDevDiagEngine& aEngine );
-    
-    /**
-    * Update command buttons.
-    * @param aResourceId Id to a new command button resource.
-    **/
-    void UpdateCbaL(TInt aResourceId);
-    
-    /**
-    * Display a message query dialog.
-    *
-    * @param aResourceId Message query resource ID.
-    **/
-    TBool MessageQueryDialogLaunchL( TInt aResourceId );
-    
-    /**
-    * Display confirmation dialog.
-    *
-    * @param aPassed ETrue if tests were passed, EFalse otherwise.
-    **/ 
-    void DisplayConfirmationDialogL( TBool aPassed );
-    
-    /**
-    * Returns ETrue if uid is one of the suite UIDs.
-    * The suites are hardware,coverage,service, and connectivity.
-    *
-    * @param aUid Unique identifier.
-    * @return ETrue if uid is one of the suite UIDs, EFalse otherwise.
-    **/
-    TBool SuiteUid( TUid aUid );
-    
-    /**
-    * Search for a test record that crashed when the device diagnostics application
-    * was running. If a crashed test record is found, figure out what test crashed and 
-    * suggest that the test could be executed again.
-    **/
-    void CheckCrashedTestL();
-    
-      /**
-    * Display confirmation dialog after successful group execution.
-    * succesful execution means that all tests have the following result:
-    * - passed
-    * - cancelled
-    * - skipped    
-    **/ 
-    void DisplayConfirmationDialogL();
-    
-    /**
-    * Displays message query dialog. The dialog lists all tests cases that failed.
-    **/
-    void DisplayMessageQueryDialogFailedResultsL();
-    
-private: // waiting dialogs
-    
-    /**
-     * Display a non-dismissable generic dialog to inform the user that the
-     * application is "preparing."          
-     */
-    void DisplayWaitDialogPreparingL();
-    
-    /**
-     * Dismisses the wait dialog        
-     */
-    void DismissWaitDialogPreparingL();        
-    
-    /**
-    * Create result texts for failed test cases.
-    *
-    * @param aExecResults Execution results.
-    * @return New heap descriptor. Caller owns the descriptor.
-    **/ 
-    HBufC* CreateResultsTextsForFailedTestsLC( const CDevDiagExecResults& aExecResults );
-    
-private:   
-
-    //Main container that displayes suites. Own.
-    CDevDiagSuiteContainer* iContainer;   
-    
-    //Plug-in view that displayes plug-ins. Own.    
-    CDevDiagPluginView* iPluginView;
-    
-    //Model.
-    CDevDiagEngine& iEngine;
-    
-    //Parent suite ID. This is HW,connectivity, service or coverage suite ID.
-    TUid iParentPlugin;
-        
-    // Wait dialog for plugin loading. Own.
-    CAknWaitDialog* iWaitDialog;          
-    
-    // Previous View ID.
-    TVwsViewId iPrevViewId;
-    };
-
-
-#endif // DEVDIAGSUITEVIEW_H
--- a/devicediagnostics/devdiagapp/inc/devdiagutil.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,78 +0,0 @@
-/*
-* Copyright (c) 2007-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:  Utility classes.
-*
-*/
-
-
-#ifndef DEVDIAGUTIL_H
-#define DEVDIAGUTIL_H
-
-// INCLUDES
-#include <e32base.h>
-
-// CLASS DECLARATION
-
-/**
-* TUtil
-* 
-* This class contains general utility functions. 
-*/
-NONSHARABLE_CLASS (TDevDiagUtil)
-	{
-
-public:
-         
-    /**
-    * Get data as text.
-    * @param aText Contains the transformed TTime in text format.
-    * @param aDateTime Time to be converted.   
-    **/        
-    static void GetDateTextL( TDes& aText, TTime aDateTime );
-        
-    /**
-    * Get time as text. 
-    * @param aText Contains the transformed TTime in text format.
-    * @param aDateTime Time to be converted.    
-    */        
-    static void GetTimeTextL( TDes& aText, TTime aDateTime );
-        
-    /**
-    * Get data and time as text.
-    * @param aText Contains the transformed TTime in text format.
-    * @param aDateTime Time to be converted.    
-    */        
-	static void GetDateTimeTextL( TDes& aText, TTime aDateTime );
-        
-    /**
-    * Check if sync has happened today.
-    * @param aTime  Time to be checked.
-    * @return Boolean ETrue if time is today, otherwise EFalse.
-    */    
-    static TBool IsToday( TTime aTime );
-        
-private:
-       
-    /**
-    * Convert time to hometime.
-    * @param aUniversalTime Time to be transformed.
-    * @return TTIme Hometime.
-    */            
-    static TTime ConvertUniversalToHomeTime( const TTime& aUniversalTime );
-
-	};
-
-#endif  // DEVDIAGUTIL_H
-
-// End of File
--- a/devicediagnostics/devdiagapp/loc/devdiagapp.loc	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,284 +0,0 @@
-/*
-* 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:  Localization strings. 
-*
-*/
-
-
-rls_string STRING_short_caption "Diagnostics"
-rls_string STRING_r_DevDiagApp_caption "Diagnostics"
-
-/**
-* DO NOT LOCALIZE. This application is not visible on the grid (launched from GS).
-**/
-#define qtn_diag_diagnostics_title "Diagnostics"
-
-// d:Options list item to perfom a single test 
-// l:list_single_pane_t1_cp2
-// r:5.0
-//
-#define qtn_diag_options_perform_test "Perform test"
-
-// d:Options list item to perfom all hardware tests
-// l:list_single_pane_t1_cp2
-// r:5.0
-//
-#define qtn_diag_options_perform_hardware_tests "Perform all hardware tests"
-
-// d:Options list item to perform all tests (HW+service+Conn+Service)
-// l:list_single_pane_t1_cp2
-// r:5.0
-//
-#define qtn_diag_options_perform_all_tests "Perform all tests"
-
-// d:Options list item to perfom all connectivity tests
-// l:list_single_pane_t1_cp2
-// r:5.0
-//
-#define qtn_diag_options_perform_connectivity_tests "Perform all connectivity tests"
-
-// d:Options list item to perfom all service tests
-// l:list_single_pane_t1_cp2
-// r:5.0
-//
-#define qtn_diag_options_perform_services_tests "Perform all service tests"
-
-// d:Options list item to perfom all coverage tests
-// l:list_single_pane_t1_cp2
-// r:5.0
-//
-#define qtn_diag_options_perform_coverage_tests "Perform all coverage tests"
-
-// d:Title of the hardware tests
-// l:title_pane_t2/opt12
-// r:5.0
-//
-#define qtn_diag_title_hardware "Hardware"
-
-// d:Title of the connectivity tests
-// l:title_pane_t2/opt12
-// r:5.0
-//
-#define qtn_diag_title_connectivity "Connectivity"
-
-// d:Title of the service tests
-// l:title_pane_t2/opt12
-// r:5.0
-//
-#define qtn_diag_title_services "Services"
-
-// d:Title of the coverage tests
-// l:title_pane_t2/opt12
-// r:5.0
-//
-#define qtn_diag_title_coverage "Coverage"
-
-// d:Indicates that a test has not been executed.
-// l:list_double_large_graphic_pane_t2
-// r:5.0
-//
-#define qtn_diag_list_not_performed "Not Performed"
-
-// d:Indicates that a test has been executed successfully.
-// %U is time when the test was passed. Either qtn_date_usual or qtn_time_usual (depending on when the test was executed).
-// l:list_double_large_graphic_pane_t2
-// r:5.0
-//
-#define qtn_diag_lst_test_pass "Passed %U"
-
-// d:Indicates that a test has been executed and the result was failed.
-// %U is time when the test was failed. Either qtn_date_usual or qtn_time_usual (depending on when the test was executed).
-// l:list_double_large_graphic_pane_t2
-// r:5.0
-//
-#define qtn_diag_lst_test_failed "Failed %U"
-
-// d:Means that we are executing this test.
-// l:list_double_large_graphic_pane_t2
-// r:5.0
-//
-#define qtn_diag_lst_test_ongoing "Testing ..."
-
-// d:Message query heading 
-// l:heading_pane_t1
-// r:5.0
-//
-#define qtn_diag_msg_title_perform_all_hardware_tests "Perform all hardware tests"
-
-// d:Message query text that is displayed when all hardware tests are performed.
-// l:popup_info_list_pane_t1
-// r:5.0
-//
-#define qtn_diag_msg_perform_all_hardware_tests "All hardware tests will be performed. In case you don't want to perform some test you can skip it."
-
-// d:Message query heading 
-// l:heading_pane_t1
-// r:5.0
-//
-#define qtn_diag_msg_title_perform_all_coverage_tests "Perform all coverage tests"
-
-// d:Message query text that is displayed when all coverage tests are performed.
-// l:popup_info_list_pane_t1
-// r:5.0
-//
-#define qtn_diag_msg_perform_all_coverage_tests "All coverage tests will be performed. In case you don't want to perform some test you can skip it."
-/* Add this as part of UI spec conformation
-// d:Message query heading 
-// l:heading_pane_t1
-// r:5.0
-//
-#define qtn_diag_msg_title_perform_all_connectivity_tests "Perform all connectivity tests"
-
-// d:Message query text that is displayed when all coverage tests are performed.
-// l:popup_info_list_pane_t1
-// r:5.0
-//
-#define qtn_diag_msg_perform_all_connectivity_tests "All connectivity tests will be performed. In case you don't want to perform some test you can skip it."
-
-/ d:Message query heading 
-// l:heading_pane_t1
-// r:5.0
-//
-#define qtn_diag_msg_title_perform_all_serivices_tests "Perform all service tests"
-
-// d:Message query text that is displayed when all coverage tests are performed.
-// l:popup_info_list_pane_t1
-// r:5.0
-//
-#define qtn_diag_msg_perform_all_services_tests "All service tests will be performed. In case you don't want to perform some test you can skip it."
-*/
-// d:Confirmation dialog is displayed after a group of tests are executed. 
-// d:This indicates that all tests have been passed (skipped /cancelled tests are not count)
-// l:popup_note_window
-// r:5.0
-//
-#define qtn_diag_conf_test_passed "Testing is complete."
-
-// d:Confirmation dialog is displayed after a group of tests are executed. 
-// d:This indicates that one or more tests have been failed.
-// l:popup_note_window
-// r:5.0
-//
-#define qtn_diag_conf_test_failed "Testing is complete. Following tests have failed: \n"
-
-// d:Message query text that is displayed when all tests are performed.
-// l:popup_info_list_pane_t1
-// r:5.0
-//
-#define qtn_diag_msg_title_perform_all_tests "Perform all tests"
-
-// d:Message query text that is displayed when all tests are performed.
-// l:popup_info_list_pane_t1
-// r:5.0
-//
-#define qtn_diag_msg_perform_all_tests "All tests will be performed. In case you don't want to perform some test you can skip it."
-
-
-// d:Waiting dialog that is displayed when plug-in loading takes some time.
-// l:popup_note_wait_window
-// r:5.0
-//
-#define qtn_diag_wait_note_loading_test "Loading..."
-
-// d:Dialog title shown when the current disk space (On C: drive) is too low to run Device Diagnostics.
-// l:heading_pane_t1
-// r:5.0
-//
-#define qtn_diag_err_title_memory_low "Device memory low"
-
-// d:Dialog text shown when the current disk space (On C: drive) is too low to run Device Diagnostics.
-// l:popup_info_list_pane_t1
-// r:5.0
-//
-#define qtn_diag_err_memory_low "There is not enough device memory.\nDelete some files from device, and run Diagnostics again."
-
-// d:Dialog title shown when the battery level required to run Device Diagnostics is too low.
-// l:heading_pane_t1
-// r:5.0
-//
-#define qtn_diag_err_title_battery_low "Battery level is low"
-
-// d:Dialog text shown when the current battery level is too low to run Device Diagnostics.
-// l:popup_info_list_pane_t1
-// r:5.0
-//
-#define qtn_diag_err_battery_low "Not enough battery to run tests.\nRecharge battery first."
-
-
-// d:List query dialog heading. This is displayed before tests are cancelled.
-// l:heading_pane_t1
-// r:5.0
-//
-#define qtn_diag_list_query_cancel "Cancel:" 
-
-
-// d:List query dialog option. 
-// l:list_single_pane_t1_cp2
-// r:5.0
-//
-#define qtn_diag_list_query_cancel_selected "Selected test"
-
-// d:List query dialog option. 
-// l:list_single_pane_t1_cp2
-// r:5.0
-//
-#define qtn_diag_list_query_cancel_rest "Rest of the tests"
-
-// d:List query dialog heading. This is displayed before tests are skipped.
-// l:heading_pane_t1
-// r:5.0
-//
-#define qtn_diag_list_query_skip "Skip:"
-
-// d:List query dialog option. 
-// l:list_single_pane_t1_cp2
-// r:5.0
-//
-#define qtn_diag_list_query_skip_selected "Selected test"
-
-// d:List query dialog option. 
-// l:list_single_pane_t1_cp2
-// r:5.0
-//
-#define qtn_diag_list_query_skip_rest "Rest of the tests"
-
-// d:Message query Dialog text. This dialog is shown when device diagnostics application is opened after a crash. %U is the name of the plug-in that crashed.
-// l:popup_info_list_pane_t1
-// r:5.0
-//
-#define qtn_diag_conf_query_after_crash "Last time Diagnostics crashed during following test:\n%U\nTest could not be completed. Do you want to perform the test again?"
-
-// d:After performing a group of tests, test results are listed (only if test cases failed).
-// l:heading_pane_t1
-// r:5.0
-//
-#define qtn_diag_msg_title_test_results "Test results"
-
-// d:Confirmation dialog is displayed after a tests is executed. 
-// d:This indicates if the test is passed.
-// l:popup_note_window
-// r:5.0
-//
-#define qtn_diag_conf_test_passed_1			"Testing is complete. The test has passed"
-
-// d:Confirmation dialog is displayed after a tests is executed.
-// d:This indicates if the test is failed.
-// l:popup_note_window
-// r:5.0
-//
-#define qtn_diag_conf_test_failed_1			"Testing is complete. The test has failed"
-
-//#define qtn_diag_msg_title_help  "Help"  // tmp imp to be removed
-
-//#define qtn_diag_msg_help       "Help for Dianostics is not ready now."  // tmp imp to be removed
--- a/devicediagnostics/devdiagapp/rom_files/devdiagapp_ui.iby	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-/*
-* 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:  Image description file for project Device Diagnostics
-*
-*/
-
-
-#ifndef _DEVICEDIAGNOSTICS_UI_IBY_
-#define _DEVICEDIAGNOSTICS_UI_IBY_
-
-#ifdef FF_DEVICE_DIAGNOSTICS_APP 
-
-#include <data_caging_paths_for_iby.hrh>
-
-// Definitions for applications with a UI
-S60_APP_EXE( devdiagapp )
-//S60_APP_AIF_RSC( devdiagapp )
-S60_UPGRADABLE_APP_REG_RSC( devdiagapp )
-data=\epoc32\data\z\APP_BITMAP_DIR\devdiagapp.mif  APP_BITMAP_DIR\devdiagapp.mif
-data=\epoc32\data\z\system\install\devdiagapp.SIS  System\Install\devdiagapp.SIS
-
-#endif
-
-#endif // _DEVICEDIAGNOSTICS_UI_IBY_
--- a/devicediagnostics/devdiagapp/rom_files/devdiagapp_ui_resources.iby	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-/*
-* 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:  Image description file for resourced of project Device Diag
-*
-*/
-
-
-#ifndef _DEVICEDIAGNOSTICS_UI_RESOURCES_IBY_
-#define _DEVICEDIAGNOSTICS_UI_RESOURCES_IBY_
-
-#ifdef FF_DEVICE_DIAGNOSTICS_APP 
-
-#include <data_caging_paths_for_iby.hrh>
-
-S60_APP_RESOURCE( devdiagapp )
-
-#endif
-
-#endif // _DEVICEDIAGNOSTICS_UI_RESOURCES_IBY_
--- a/devicediagnostics/devdiagapp/src/devdiagapp.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +0,0 @@
-/*
-* 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: Implementation of diagnostics components
-*
-*/
-
-
-#include "devdiagappapplication.h"
-#include <eikstart.h>
-
-#ifdef __UI_FRAMEWORKS_V2__
-
-// Create an application, and return a pointer to it
-CApaApplication* NewApplication()
-	{
-//	LOGSTRING("CApaApplication* NewApplication");
-	return new CDevDiagAppApplication;
-	}
-
-
-TInt E32Main()
-	{
-	return EikStart::RunApplication(NewApplication);
-	
-	}
-
-///////////////////////////////////////////////////////////////////////////////
-//
-// The following is required for wins on EKA1 (using the exedll target)
-//
-#if defined(__WINS__) && !defined(EKA2)
-EXPORT_C TInt WinsMain(TDesC* aCmdLine)
-	{
-	return EikStart::RunApplication(NewApplication, aCmdLine);
-	}
-
-TInt E32Dll(TDllReason)
-	{
-	return KErrNone;
-	}
-#endif
-
-#else // __UI_FRAMEWORKS_V2__
-
-// Create an application, and return a pointer to it
-EXPORT_C CApaApplication* NewApplication()
-  {
-  return new CDevDiagAppApplication;
-  }
-
-// DLL entry point, return that everything is ok
-GLDEF_C TInt E32Dll(TDllReason)
-  {
-  return KErrNone;
-  }
-
-#endif // __UI_FRAMEWORKS_V2__
-
--- a/devicediagnostics/devdiagapp/src/devdiagappapplication.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-/*
-* 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: Implementation of diagnostics components
-*
-*/
-
-
-#include "devdiagappdocument.h"
-#include "devdiagappapplication.h"
-
-// UID for the application, this should correspond to the uid defined in the mmp file
-static const TUid KUidDevDiagAppApp = {0x2000E542};
-
-CApaDocument* CDevDiagAppApplication::CreateDocumentL()
-    {  
-   // LOGSTRING(CDevDiagAppApplication::CreateDocumentL);
-    // Create an DevDiagApp document, and return a pointer to it
-    CApaDocument* document = CDevDiagAppDocument::NewL(*this);
-    return document;
-    }
-
-TUid CDevDiagAppApplication::AppDllUid() const
-    {
-    // Return the UID for the DevDiagApp application
-    //LOGSTRING("CDevDiagAppApplication::AppDllUid");
-    return KUidDevDiagAppApp;
-    }
-
--- a/devicediagnostics/devdiagapp/src/devdiagappappui.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,88 +0,0 @@
-/*
-* 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:  Application UI class implementation.
-*
-*/
-
-
-#include <avkon.hrh>
-#include "devdiag.pan"
-#include "devdiagappappui.h"
-#include "devdiagsuiteview.h"
-#include "devdiagapp.hrh"
-#include "devdiagappdocument.h"
-
-// ---------------------------------------------------------------------------
-// ConstructL is called by the application framework
-// ---------------------------------------------------------------------------
-void CDevDiagAppAppUi::ConstructL()
-    {
-    //LOGSTRING("CDevDiagAppAppUi::ConstructL");
-    BaseConstructL( EAknEnableSkin | EAknEnableMSK );
-    
-    // Get the document so we can access the application engine.
-    CDevDiagAppDocument* document = static_cast< CDevDiagAppDocument* > 
-                                                    ( Document() );
-    //Plugin view is created by the suite view.
-    iSuiteView = CDevDiagSuiteView::NewL( document->Engine() );  
-          
-    AddViewL( iSuiteView );
-    
-    SetDefaultViewL( *iSuiteView );
-    }
-
-// ---------------------------------------------------------------------------
-// Constructor.
-// ---------------------------------------------------------------------------
-CDevDiagAppAppUi::CDevDiagAppAppUi()                              
-    {
-
-    }
-
-// ---------------------------------------------------------------------------
-// Destructor.
-// ---------------------------------------------------------------------------
-CDevDiagAppAppUi::~CDevDiagAppAppUi()
-    {
-
-    }
-
-// ---------------------------------------------------------------------------
-// handle any menu commands.
-// ---------------------------------------------------------------------------
-
-void CDevDiagAppAppUi::HandleCommandL(TInt aCommand)
-    {
-    switch(aCommand)
-        {
-        case EAknSoftkeyBack:
-           {
-           Exit();     
-
-           break;
-           }
-        
-        case EEikCmdExit:
-        case EAknSoftkeyExit:
-            Exit();
-            break;
-
-        default:
-            Panic(EDevDiagApplicationUnhandledCommand);
-            break;
-        }
-    }
-
-
-
--- a/devicediagnostics/devdiagapp/src/devdiagappdocument.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,75 +0,0 @@
-/*
-* 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: Implementation of diagnostics components
-*
-*/
-
-
-
-#include "devdiagappappui.h"
-#include "devdiagappdocument.h"
-#include "devdiagengine.h"
-
-// Standard Symbian OS construction sequence
-CDevDiagAppDocument* CDevDiagAppDocument::NewL(CEikApplication& aApp)
-    {
-    //LOGSTRING("CDevDiagAppDocument* CDevDiagAppDocument::NewL");
-    CDevDiagAppDocument* self = NewLC(aApp);
-    CleanupStack::Pop(self);
-    return self;
-    }
-
-CDevDiagAppDocument* CDevDiagAppDocument::NewLC(CEikApplication& aApp)
-    {
-    //LOGSTRING("CDevDiagAppDocument* CDevDiagAppDocument::NewLC");
-    CDevDiagAppDocument* self = new (ELeave) CDevDiagAppDocument(aApp);
-    CleanupStack::PushL(self);
-    self->ConstructL();
-    return self;
-    }
-
-void CDevDiagAppDocument::ConstructL()
-    {
-	iEngine = CDevDiagEngine::NewL();
-    }    
-
-CDevDiagAppDocument::CDevDiagAppDocument(CEikApplication& aApp) : CAknDocument(aApp) 
-    {
-    }
-
-CDevDiagAppDocument::~CDevDiagAppDocument()
-    {
-	if ( iEngine )    
-        {
-        delete iEngine;
-        iEngine = NULL;
-        } 
-    }
-
-CEikAppUi* CDevDiagAppDocument::CreateAppUiL()
-    {
-    // Create the application user interface, and return a pointer to it,
-    // the framework takes ownership of this object
-    //LOGSTRING("CDevDiagAppDocument::CreateAppUiL");
-    CEikAppUi* appUi = new (ELeave) CDevDiagAppAppUi;
-    return appUi;
-    }
-
-
-CDevDiagEngine& CDevDiagAppDocument::Engine()
-    {
-    //LOGSTRING("CDevDiagEngine& CDevDiagAppDocument::Engine");
-    return *iEngine;
-    }
-///@@@KSR: changes for BAD Warnings - Added a new Line.
--- a/devicediagnostics/devdiagapp/src/devdiagcommoncanceldialogs.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,153 +0,0 @@
-/*
-* 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:  This is the implementation of the common dialogs, which are
-*                used by both the Device Diagnostics Application and plugins.
-*
-*/
-
-
-// System Include Files
-#include <DiagFrameworkDebug.h>     // Debugging Macros
-#include <devdiagapp.rsg>        // Resource defintions
-
-// User Include Files
-#include "devdiagcommoncanceldialogs.h"        // CDevDiagCommonCancelDialogs
-#include "devdiagengine.h"            // CDevDiagEngine
-
-
-// ============================ MEMBER FUNCTIONS =============================
-
-// ---------------------------------------------------------------------------
-// Two-phased constructor.
-// ---------------------------------------------------------------------------
-//
-CDevDiagCommonCancelDialogs* CDevDiagCommonCancelDialogs::NewLC(
-    CDevDiagEngine& aEngine,
-    TBool aSuspendTestsOnExecute )
-    {
-    LOGSTRING2( "CDevDiagCommonCancelDialogs::NewLC( %d )",
-                aSuspendTestsOnExecute )
-
-    CDevDiagCommonCancelDialogs* self =
-        new ( ELeave ) CDevDiagCommonCancelDialogs( aEngine,
-                                                 aSuspendTestsOnExecute );
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    return self;
-    }
-
-// ---------------------------------------------------------------------------
-// From CAknQueryDialog.
-// Runs the dialog, and returns the ID of the button used to dismiss it.
-// ---------------------------------------------------------------------------
-//
-TInt CDevDiagCommonCancelDialogs::RunLD()
-    {
-    LOGSTRING( "CDevDiagCommonCancelDialogs::RunLD()" )
-
-    // Tell the engine to suspend execution while we're asking the user if
-    // they really want to cancel tests.
-    if ( iSuspendTestsOnExecute )
-        {
-        iEngine.ExecutionStopL( CDevDiagEngine::EStopModeSuspend );
-        }
-
-    // Only stop the watchdog timer.
-    else
-        {
-        iEngine.ExecutionStopL( CDevDiagEngine::EStopModeWatchdog );
-        }
-
-    // Ask the user if they really want to cancel all.  Note: We cannot cancel
-    // or resume after this call, because it deletes the dialog, so that
-    // handling is done in OkToExitL.
-    return CAknListQueryDialog::RunLD();
-    }
-
-// ---------------------------------------------------------------------------
-// The default constructor.
-// ---------------------------------------------------------------------------
-//
-CDevDiagCommonCancelDialogs::CDevDiagCommonCancelDialogs(
-    CDevDiagEngine& aEngine,
-    TBool aSuspendTestsOnExecute )
-:   CAknListQueryDialog( &iIndex ),
-    iEngine( aEngine ),
-    iSuspendTestsOnExecute( aSuspendTestsOnExecute )
-    {
-    LOGSTRING( "CDevDiagCommonCancelDialogs::CDevDiagCommonCancelDialogs()" )
-
-    // Nothing to do.
-    }
-
-// ---------------------------------------------------------------------------
-// Two-phased constructor.
-// ---------------------------------------------------------------------------
-//
-void CDevDiagCommonCancelDialogs::ConstructL()
-    {
-    LOGSTRING( "CDevDiagCommonCancelDialogs::ConstructL()" )
-
-    PrepareLC( R_DEVDIAG_CANCEL_LIST_QUERY );
-    CleanupStack::Pop( this );
-    }
-
-// ---------------------------------------------------------------------------
-// From CAknQueryDialog.
-// This function is called for a button press on the dialog.  It is used to
-// determine if the dialog may be exited.
-// ---------------------------------------------------------------------------
-//
-TBool CDevDiagCommonCancelDialogs::OkToExitL( TInt aButtonId )
-    {
-    LOGSTRING2( "CDevDiagCommonCancelDialogs::OkToExitL( %d )", aButtonId )
-
-    //This must be called to update iIndex to right value.
-    TBool exit = CAknListQueryDialog::OkToExitL ( aButtonId );
-  
-    if ( aButtonId == EAknSoftkeyOk )
-        {
-        if ( iIndex == 0 ) //cancel this test
-            {                        
-            iEngine.ExecutionStopL( CDevDiagEngine::EStopModeSkip );
-            }
-        else if ( iIndex == 1 ) //cancel rest of the test
-            {
-            // Cancel all execution, as the user requested.
-            iEngine.ExecutionStopL( CDevDiagEngine::EStopModeCancel );
-            }
-        else
-            {
-            //Error
-            }
-        
-        }
-    else
-        {
-        // Resume execution because the user decided not to cancel.
-        if ( iSuspendTestsOnExecute )
-            {
-            iEngine.ExecutionResumeL( CDevDiagEngine::EResumeModeResume );
-            }
-        // Restart the watchdog timer.
-        else
-            {
-            iEngine.ExecutionResumeL( CDevDiagEngine::EResumeModeWatchdog );
-            }
-        }
-
-    return ETrue;
-    }
-
-// End of File
--- a/devicediagnostics/devdiagapp/src/devdiagcommonskipdialogs.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,153 +0,0 @@
-/*
-* 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:  This is the implementation of the common dialogs, which are
-*                used by both the Device Diagnostics Application and plugins.
-*
-*/
-
-
-// System Include Files
-#include <DiagFrameworkDebug.h>     // Debugging Macros
-#include <devdiagapp.rsg>        // Resource defintions
-
-// User Include Files
-#include "devdiagcommonskipdialogs.h"        // CDevDiagCommonSkipDialogs
-#include "devdiagengine.h"            // CDevDiagEngine
-
-
-// ============================ MEMBER FUNCTIONS =============================
-
-// ---------------------------------------------------------------------------
-// Two-phased constructor.
-// ---------------------------------------------------------------------------
-//
-CDevDiagCommonSkipDialogs* CDevDiagCommonSkipDialogs::NewLC(
-    CDevDiagEngine& aEngine,
-    TBool aSuspendTestsOnExecute )
-    {
-    LOGSTRING2( "CDevDiagCommonSkipDialogs::NewLC( %d )",
-                aSuspendTestsOnExecute )
-
-    CDevDiagCommonSkipDialogs* self =
-        new ( ELeave ) CDevDiagCommonSkipDialogs( aEngine,
-                                                 aSuspendTestsOnExecute );
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    return self;
-    }
-
-// ---------------------------------------------------------------------------
-// From CAknQueryDialog.
-// Runs the dialog, and returns the ID of the button used to dismiss it.
-// ---------------------------------------------------------------------------
-//
-TInt CDevDiagCommonSkipDialogs::RunLD()
-    {
-    LOGSTRING( "CDevDiagCommonSkipDialogs::RunLD()" )
-
-    // Tell the engine to suspend execution while we're asking the user if
-    // they really want to cancel tests.
-    if ( iSuspendTestsOnExecute )
-        {
-        iEngine.ExecutionStopL( CDevDiagEngine::EStopModeSuspend );
-        }
-
-    // Only stop the watchdog timer.
-    else
-        {
-        iEngine.ExecutionStopL( CDevDiagEngine::EStopModeWatchdog );
-        }
-
-    // Ask the user if they really want to cancel all.  Note: We cannot cancel
-    // or resume after this call, because it deletes the dialog, so that
-    // handling is done in OkToExitL.
-    return CAknListQueryDialog::RunLD();
-    }
-
-// ---------------------------------------------------------------------------
-// The default constructor.
-// ---------------------------------------------------------------------------
-//
-CDevDiagCommonSkipDialogs::CDevDiagCommonSkipDialogs(
-    CDevDiagEngine& aEngine,
-    TBool aSuspendTestsOnExecute )
-:   CAknListQueryDialog( &iIndex ),
-    iEngine( aEngine ),
-    iSuspendTestsOnExecute( aSuspendTestsOnExecute )
-    {
-    LOGSTRING( "CDevDiagCommonSkipDialogs::CDevDiagCommonSkipDialogs()" )
-
-    // Nothing to do.
-    }
-
-// ---------------------------------------------------------------------------
-// Two-phased constructor.
-// ---------------------------------------------------------------------------
-//
-void CDevDiagCommonSkipDialogs::ConstructL()
-    {
-    LOGSTRING( "CDevDiagCommonSkipDialogs::ConstructL()" )
-
-    PrepareLC( R_DEVDIAG_SKIP_LIST_QUERY );
-    CleanupStack::Pop( this );
-    }
-
-// ---------------------------------------------------------------------------
-// From CAknQueryDialog.
-// This function is called for a button press on the dialog.  It is used to
-// determine if the dialog may be exited.
-// ---------------------------------------------------------------------------
-//
-TBool CDevDiagCommonSkipDialogs::OkToExitL( TInt aButtonId )
-    {
-    LOGSTRING2( "CDevDiagCommonSkipDialogs::OkToExitL( %d )", aButtonId )
-
-    //This must be called to update iIndex to right value.
-    TBool exit = CAknListQueryDialog::OkToExitL ( aButtonId );
-  
-    if ( aButtonId == EAknSoftkeyOk )
-        {
-        if ( iIndex == 0 ) //cancel this test
-            {                        
-            iEngine.ExecutionStopL( CDevDiagEngine::EStopModeSkip );
-            }
-        else if ( iIndex == 1 ) //cancel rest of the test
-            {
-            // Cancel all execution, as the user requested.
-            iEngine.ExecutionStopL( CDevDiagEngine::EStopModeCancel );
-            }
-        else
-            {
-            //Error
-            }
-        
-        }
-    else
-        {
-        // Resume execution because the user decided not to cancel.
-        if ( iSuspendTestsOnExecute )
-            {
-            iEngine.ExecutionResumeL( CDevDiagEngine::EResumeModeResume );
-            }
-        // Restart the watchdog timer.
-        else
-            {
-            iEngine.ExecutionResumeL( CDevDiagEngine::EResumeModeWatchdog );
-            }
-        }
-
-    return ETrue;
-    }
-
-// End of File
--- a/devicediagnostics/devdiagapp/src/devdiagengine.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1188 +0,0 @@
-/*
-* 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:  Engine implementation
-*
-*/
-
-
-// System Include Files
-#include <e32std.h>                     // User
-#include <f32file.h>                    // RFs
-#include <DiagEngine.h>                 // CDiagEngine
-#include <DiagPlugin.h>                 // MDiagPlugin
-#include <DiagSuitePlugin.h>            // MDiagSuitePlugin
-#include <DiagResultsDatabaseItem.h>    // CDiagResultsDatabaseItem
-#include <DiagPluginPool.h>             // CDiagPluginPool
-#include <DiagResultsDatabaseTestRecordInfo.h>
-                                        // TDiagResultsDatabaseTestRecordInfo
-#include <drmserviceapi.h>              // CDrmServiceApi
-#include <e32property.h>                // RProperty
-#include <PSVariables.h>                // Property values
-#include <startupdomainpskeys.h>        // Property values
-#include <centralrepository.h>          // CRepository
-#include <ProfileEngineSDKCRKeys.h>     // CR Keys for Profile
-#include <DiagFrameworkDebug.h>         // Debug Logger
-#include <DiagResultsDbRecordEngineParam.h>
-
-// User Include Files
-#include "devdiagapp.hrh"               // UID definition
-#include "devdiagengine.h"              // CDevDiagEngine
-#include "devdiagengineobserver.h"      // CDevDiagEngineObserver
-#include "devdiagexecutionresults.h"    // CDevDiagExecResults
-#include "devdiag.pan"                  // Panic
-#include "devdiagcommoncanceldialogs.h"       // CDevDiagCancelExecutionDialog
-#include "devdiagcommonskipdialogs.h"
-// Local Constants
-const TInt KErrDevDiagAlreadyInitialized = ( -1 );
-const TInt KErrDevDiagAlreadyLoaded      = ( -2 );
-const TInt KErrDevDiagUninitialized      = ( -3 );
-
-///@@@KSR: changes for BAD Warnings - #177-D: variable "KErrDevDiagExecuting" was declared but never referenced
-//const TInt KErrDevDiagExecuting          = ( -4 );
-
-const TInt KErrDevDiagAlreadyRunning     = ( -5 );
-const TInt KErrDevDiagNotRunning         = ( -6 );
-const TInt KErrDevDiagSuspendResume      = ( -7 );
-const TUid KUidDevDiagApplication        = { _UID3 };
-///@@@KSR: changes for BAD Warnings - #177-D: variable "KProgressGranularity" was declared but never referenced
-//const TInt KProgressGranularity     = ( 2 );
-
-// Local Data Types
-typedef CArrayFixFlat< TDiagResultsDatabaseTestRecordInfo > CDatabaseRecordInfoArray;
-
-const TInt KArrayGranuality(50);
-
-
-// ============================ MEMBER FUNCTIONS =============================
-
-// ---------------------------------------------------------------------------
-// Static two-phase constructor.
-// ---------------------------------------------------------------------------
-//
-CDevDiagEngine* CDevDiagEngine::NewL()
-    {
-    LOGSTRING( "CDevDiagEngine::NewL()" )
-
-    CDevDiagEngine* self = CDevDiagEngine::NewLC();
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// ---------------------------------------------------------------------------
-// Static two-phase constructor.
-// ---------------------------------------------------------------------------
-//
-CDevDiagEngine* CDevDiagEngine::NewLC()
-    {
-    LOGSTRING( "CDevDiagEngine::NewLC()" )
-
-    CDevDiagEngine* self = new ( ELeave ) CDevDiagEngine();
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    return self;
-    }
-
-// ---------------------------------------------------------------------------
-// Destructor.
-// ---------------------------------------------------------------------------
-//
-CDevDiagEngine::~CDevDiagEngine()
-    {
-    LOGSTRING( "CDevDiagEngine::~CDevDiagEngine()" )
-
-    // Cancel any outstanding asynchronous requests.
-    Cancel();
-
-    // Delete the member variables.
-    delete iResults;
-    delete iDiagEngine;
-    delete iPluginPool;
-    
-    if ( iUids )
-        {
-        delete iUids;
-        iUids = NULL;
-        }
-
-    iLastResults.ResetAndDestroy();
-    iLastResults.Close();
-
-    // Close the session with the results database.
-    iResultsDatabase.Close();
-    }
-
-
-// ---------------------------------------------------------------------------
-// This function allows the UI to receive application engine callbacks by
-// implementing the MDevDiagEngineObserver interface.
-// ---------------------------------------------------------------------------
-//
-void CDevDiagEngine::SetObserver( MDevDiagEngineObserver* aObserver )
-    {
-    LOGSTRING2( "CDevDiagEngine::SetObserver( 0x%x )", aObserver )
-
-    if ( iObserver && aObserver )
-        {
-        // We have cannot leave here.
-        TRAP_IGNORE( iObserver->HandleEngineCommandL(
-            MDevDiagEngineObserver::EDevDiagEngineCommandObserverChanged,
-            KErrNone,
-            NULL ) )
-        }
-
-    iObserver = aObserver;
-    }
-
-// ---------------------------------------------------------------------------
-// This function begins test execution.  It is the responsibility of the
-// caller to check the runtime requirements prior to calling this function.
-// This is an asynchronous request.
-// ---------------------------------------------------------------------------
-//
-void CDevDiagEngine::ExecuteTestL( TUid aUid, CAknViewAppUi& aAppUi )
-    {
-    LOGSTRING2( "CDevDiagEngine::ExecuteTestL( 0x%x )", aUid.iUid )
-
-    // Reset the member variables to prepare for a new execution run.
-    delete iDiagEngine;
-    iDiagEngine = NULL;
-    delete iResults;
-    iResults = NULL;
-    iSuspendCounter = 0;
-
-    RArray< TUid > uidArray;
-    uidArray.Append( aUid );
-    CleanupClosePushL( uidArray );
-
-    // Create an engine instance and execute the test or suite.
-    iDiagEngine = CDiagEngine::NewL( aAppUi,
-                                     *this,
-                                     iResultsDatabase,
-                                     *iPluginPool,
-                                     EFalse,
-                                     uidArray );
-    CleanupStack::PopAndDestroy(); // uidArray
-    iDiagEngine->ExecuteL();
-
-    // Do the state transition now that we are successfully starting.
-    SetState( EStateStartingExecution );
-    }
-
-// ---------------------------------------------------------------------------
-// This function will provides the execution results, which may be from an
-// execution run which is ongoing, or from logged test results.
-// ---------------------------------------------------------------------------
-//
-const CDevDiagExecResults& CDevDiagEngine::ExecutionResults() const
-    {
-    LOGSTRING( "CDevDiagEngine::ExecutionResults()" )
-
-    __ASSERT_ALWAYS( HasExecutionResults(),
-                     Panic( EDevDiagApplicationNotInitialized ) );
-    return *iResults;
-    }
-
-// ---------------------------------------------------------------------------
-// This function will handle getting the results information for the most
-// recent test execution.
-// ---------------------------------------------------------------------------
-//
-void CDevDiagEngine::LoadLastLoggedResultsL()
-    {
-    LOGSTRING( "CDevDiagEngine::LoadLastLoggedResultsL()" )
-
-    // Check the state.
-    __ASSERT_ALWAYS( iState == EStateReady,
-                     Panic( EDevDiagApplicationInvalidEngineState ) );
-
-    // If there are any existing results, just use them.
-    if ( iResults )
-        {
-        return;
-        }
-
-    // Get info about the last test record.  If there are no existing records,
-    // just return -- the caller must check if there are results before they
-    // do anything.
-    TUid lastExecutionRecord;
-    if ( iResultsDatabase.GetLastRecord( lastExecutionRecord ) != KErrNone )
-        {
-        return;
-        }
-
-    // Now, load the logged results.
-    iResults = CDevDiagExecResults::NewL( lastExecutionRecord,
-                                          *iPluginPool,
-                                          iResultsDatabase );
-    }
-
-// ---------------------------------------------------------------------------
-// This function will stop test execution.  The argument specifies whether all
-// execution should be stopped, or just the currently running test.
-// ---------------------------------------------------------------------------
-//
-void CDevDiagEngine::ExecutionStopL( TDevDiagAppEngineStopMode aReason )
-    {
-   LOGSTRING2( "CDevDiagEngine::ExecutionStopL( %d )", aReason )
-
-    // Check the state.
-    __ASSERT_ALWAYS( IsRunningPlugins(),
-                     Panic( EDevDiagApplicationInvalidEngineState ) );
-
-    // Stop the execution.
-    switch ( aReason )
-        {
-        case EStopModeSkip:
-            iDiagEngine->ExecutionStopL( MDiagEngineCommon::ESkip );
-            break;
-
-        case EStopModeCancel:
-            SetState( EStateStoppingExecution );
-
-            
-            // Start an idle active object, which will handle deleting the
-            // diagnostics engine.  This cannot be done here because the
-            // engine may be executing a test which is displaying the "Cancel
-            // Execution" dialog, which calls this function.  The priority of
-            // this CIdle MUST be higher than then diagnostics engine and ALL
-            // of its active objects.
-            delete iIdle;
-            iIdle = NULL;
-            iIdle = CIdle::NewL( CActive::EPriorityHigh );
-            iIdle->Start( TCallBack( HandleExecutionCancelledL, this ) );
-
-            // Inform the observer.  In the case where the observer is
-            // displaying a dialog, this will allow the observer to cancel it.
-            if ( iObserver )
-                {
-                iObserver->HandleEngineCommandL(
-                    MDevDiagEngineObserver::EDevDiagEngineCommandExecutionStopping,
-                    KErrCancel,
-                    NULL );
-                }
-            
-            break;
-
-        case EStopModeSuspend:
-            // Increment the suspend counter and check the state.
-            LOGSTRING2( "CDevDiagEngine::ExecutionStopL, counter: %d",
-                        iSuspendCounter )
-            iSuspendCounter++;
-            if ( iState == EStateExecutionSuspended )
-                {
-                // Do nothing - we're already suspended.
-                __ASSERT_DEBUG( iSuspendCounter > 1,
-                                Panic( EDevDiagApplicationInvalidEngineState ) );
-                break;
-                }
-
-            SetState( EStateExecutionSuspended );
-            iDiagEngine->SuspendL();
-            break;
-
-        case EStopModeWatchdog:
-            iDiagEngine->StopWatchdogTemporarily();
-            break;
-
-        default:
-            __ASSERT_DEBUG( EFalse, Panic( EDevDiagApplicationInvalidStopMode ) );
-            break;
-        }
-    }
-
-
-TInt CDevDiagEngine::HandleExecutionCancelledL( TAny* aPtr )
-    {
-    LOGSTRING2( "CDevDiagEngine::HandleExecutionCancelledL( 0x%x )", aPtr )
-
-    CDevDiagEngine* myThis = static_cast< CDevDiagEngine* >( aPtr );
-    myThis->iResults->Finalize( EFalse );
-
-    delete myThis->iDiagEngine;
-    myThis->iDiagEngine = NULL;
-
-    delete myThis->iIdle;
-    myThis->iIdle = NULL;
-
-    myThis->SetState( EStateReady );
-
-    // Inform the observer object.
-    if ( myThis->iObserver )
-        {
-        
-        myThis->iObserver->HandleEngineCommandL(
-            MDevDiagEngineObserver::EDevDiagEngineCommandTestExecutionCancelled,
-            KErrCancel,
-            NULL );
-            
-        }
-
-    return KErrNone;
-    
-    }
-// ---------------------------------------------------------------------------
-// This function will resume suspended test execution.
-// ---------------------------------------------------------------------------
-//
-void CDevDiagEngine::ExecutionResumeL( TDevDiagAppEngineResumeMode aReason )
-    {
-    LOGSTRING2( "CDevDiagEngine::ExecutionResumeL( %d )", aReason )
-
-    // Check the state.
-    __ASSERT_ALWAYS( IsRunningPlugins(),
-                     Panic( EDevDiagApplicationInvalidEngineState ) );
-
-    // Resume the execution.
-    switch ( aReason )
-        {
-        case EResumeModeResume:
-            {
-            LOGSTRING2( "CDevDiagEngine::ExecutionResumeL, counter: %d",
-                        iSuspendCounter )
-            // Decrement the suspend counter and check the state.
-            --iSuspendCounter;
-            __ASSERT_DEBUG( iSuspendCounter >= 0,
-                            Panic( EDevDiagApplicationInvalidEngineState ) );
-            __ASSERT_ALWAYS( iState == EStateExecutionSuspended,
-                            Panic( EDevDiagApplicationInvalidEngineState ) );
-
-            // Resume the execution, but only if there have been enough
-            // "resume" calls to match the number of "suspend" calls.
-            if ( iSuspendCounter == 0 )
-                {
-                SetState( EStateRunningTests );
-                iDiagEngine->ResumeL();
-                }
-
-            break;
-            }
-
-        case EResumeModeWatchdog:
-           // iDiagEngine->ResetWatchdogL();
-            break;
-
-        default:
-            __ASSERT_DEBUG( EFalse,
-                            Panic( EDevDiagApplicationInvalidEngineState ) );
-            break;
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// Returns the plugin pool.
-// ---------------------------------------------------------------------------
-//
-const CDiagPluginPool& CDevDiagEngine::PluginPool() const
-    {
-    LOGSTRING( "CDevDiagEngine::PluginPool()" )
-
-    __ASSERT_ALWAYS( ArePluginsLoaded(),
-                   Panic( EDevDiagApplicationNotInitialized ) );
-    return *iPluginPool;
-    }
-
-// ---------------------------------------------------------------------------
-// Returns whether or not tests are running.
-// ---------------------------------------------------------------------------
-//
-TBool CDevDiagEngine::IsRunningPlugins() const
-    {
-    LOGSTRING( "CDevDiagEngine::IsRunningPlugins()" )
-
-    return ( iState == EStateStartingExecution ||
-             iState == EStateRunningTests ||
-             iState == EStateStoppingExecution ||
-             iState == EStateExecutionSuspended );
-    }
-
-// ---------------------------------------------------------------------------
-// Checks if the engine is currently stopping execution.
-// ---------------------------------------------------------------------------
-//
-TBool CDevDiagEngine::IsStoppingExecution() const
-    {
-    LOGSTRING( "CDevDiagEngine::IsStoppingExecution()" )
-
-    return ( iState == EStateStoppingExecution );
-    }
-
-// ---------------------------------------------------------------------------
-// Returns whether or not plugins are done loading.
-// ---------------------------------------------------------------------------
-//
-TBool CDevDiagEngine::ArePluginsLoaded() const
-    {
-    LOGSTRING( "CDevDiagEngine::ArePluginsLoaded()" )
-
-    return ( iState != EStateInitial &&
-             iState != EStateLoadingPlugins );
-    }
-
-// ---------------------------------------------------------------------------
-// Returns whether execution results are available.
-// ---------------------------------------------------------------------------
-//
-TBool CDevDiagEngine::HasExecutionResults() const
-    {
-    LOGSTRING( "CDevDiagEngine::HasExecutionResults()" )
-
-    if ( iResults )
-        {
-        return ETrue;
-        }
-
-    return EFalse;
-    }
-
-// ---------------------------------------------------------------------------
-// The default constructor.
-// ---------------------------------------------------------------------------
-//
-CDevDiagEngine::CDevDiagEngine() : CActive( EPriorityStandard ),                            
-                               iDiagEngine( NULL )
-    {
-    LOGSTRING( "CDevDiagEngine::CDevDiagEngine()" )
-
-    }
-
-// ---------------------------------------------------------------------------
-// The second phase constructor.
-// ---------------------------------------------------------------------------
-//
-void CDevDiagEngine::ConstructL()
-    {
-    LOGSTRING( "CDevDiagEngine::ConstructL()" )
-
-    // Connect to the results database.
-    User::LeaveIfError( iResultsDatabase.Connect( KUidDevDiagApplication ) );
-    LOGSTRING( "CDevDiagEngine::ResultDB connect");
-    // Load the plugins.
-    iPluginPool = CDiagPluginPool::NewL( *this );
-    LOGSTRING( "CDevDiagEngine::NewL");
-    SetState( EStateLoadingPlugins );
-    iPluginPool->LoadAsyncL( KDiagPluginInterfaceUid );
-    LOGSTRING( "CDevDiagEngine::LoadPlugin");
-    // Add the application engine to the active scheduler.
-    CActiveScheduler::Add( this );
-    }
-
-
-// ---------------------------------------------------------------------------
-// To obtain the current engine state
-// ---------------------------------------------------------------------------
-TInt CDevDiagEngine::GetState()
-	{
-	return iState;
-	}
-
-
-// ---------------------------------------------------------------------------
-// The state machine transition handler.  If there is an error in changing
-// states, then it will be returned and the state will be left unchanged.
-// ---------------------------------------------------------------------------
-//
-void CDevDiagEngine::SetState( TDevDiagAppEngineState aNextState )
-    {
-    LOGSTRING3( "CDevDiagEngine::SetState( %d ), iState = %d",
-                aNextState,
-                iState )    
-
-    // The state transition table.  Structure: State in / State to go to.
-    static const TInt KStateTable[ EStateMax ][ EStateMax ] =
-        {
-            // EStateInitial
-            {
-            KErrNone,                        // To EStateInitial
-            KErrNone,                        // To EStateLoadingPlugins
-            KErrDevDiagUninitialized,        // To EStateReady
-            KErrDevDiagUninitialized,        // To EStateStartingExecution
-            KErrDevDiagUninitialized,        // To EStateRunningTests
-            KErrDevDiagUninitialized,        // To EStateStoppingExecution
-            KErrDevDiagUninitialized         // To EStateExecutionSuspended
-            },
-
-            // EStateLoadingPlugins
-            {
-            KErrDevDiagAlreadyInitialized,   // To EStateInitial
-            KErrNone,                        // To EStateLoadingPlugins
-            KErrNone,                        // To EStateReady
-            KErrDevDiagUninitialized,        // To EStateStartingExecution
-            KErrDevDiagUninitialized,        // To EStateRunningTests
-            KErrDevDiagUninitialized,        // To EStateStoppingExecution
-            KErrDevDiagUninitialized         // To EStateExecutionSuspended
-            },
-
-            // EStateReady
-            {
-            KErrDevDiagAlreadyInitialized,   // To EStateInitial
-            KErrDevDiagAlreadyLoaded,        // To EStateLoadingPlugins
-            KErrNone,                        // To EStateReady
-            KErrNone,                        // To EStateStartingExecution
-            KErrDevDiagNotRunning,           // To EStateRunningTests
-            KErrDevDiagNotRunning,           // To EStateStoppingExecution
-            KErrDevDiagNotRunning            // To EStateExecutionSuspended
-            },
-
-            // EStateStartingExecution
-            {
-            KErrDevDiagAlreadyInitialized,   // To EStateInitial
-            KErrDevDiagAlreadyLoaded,        // To EStateLoadingPlugins
-            KErrNone,                        // To EStateReady
-            KErrNone,                        // To EStateStartingExecution
-            KErrNone,                        // To EStateRunningTests
-            KErrNone,                        // To EStateStoppingExecution
-            KErrDevDiagNotRunning            // To EStateExecutionSuspended
-            },
-
-            // EStateRunningTests
-            {
-            KErrDevDiagAlreadyInitialized,   // To EStateInitial
-            KErrDevDiagAlreadyLoaded,        // To EStateLoadingPlugins
-            KErrNone,                        // To EStateReady
-            KErrDevDiagAlreadyRunning,       // To EStateStartingExecution
-            KErrNone,                        // To EStateRunningTests
-            KErrNone,                        // To EStateStoppingExecution
-            KErrNone                         // To EStateExecutionSuspended
-            },
-
-            // EStateStoppingExecution
-            {
-            KErrDevDiagAlreadyInitialized,   // To EStateInitial
-            KErrDevDiagAlreadyLoaded,        // To EStateLoadingPlugins
-            KErrNone,                        // To EStateReady
-            KErrDevDiagAlreadyRunning,       // To EStateStartingExecution
-            KErrDevDiagAlreadyRunning,       // To EStateRunningTests
-            KErrNone,                        // To EStateStoppingExecution
-            KErrDevDiagNotRunning            // To EStateExecutionSuspended
-            },
-
-            // EStateExecutionSuspended
-            {
-            KErrDevDiagAlreadyInitialized,   // To EStateInitial
-            KErrDevDiagAlreadyLoaded,        // To EStateLoadingPlugins
-            KErrDevDiagSuspendResume,        // To EStateReady
-            KErrDevDiagAlreadyRunning,       // To EStateStartingExecution
-            KErrNone,                        // To EStateRunningTests
-            KErrNone,                        // To EStateStoppingExecution
-            KErrNone                         // To EStateExecutionSuspended
-            }
-        };
-
-    // Check if there is an invalid state.
-    __ASSERT_DEBUG( ( iState < EStateMax && aNextState < EStateMax ),
-                    Panic( EDevDiagApplicationInvalidEngineState ) );
-
-    // Change the state if there was no error, and return.
-    __ASSERT_ALWAYS( KStateTable[ iState ][ aNextState ] == KErrNone,
-                     Panic( EDevDiagApplicationInvalidEngineState ) );
-    iState = aNextState;
-    
-    }
-
-// ---------------------------------------------------------------------------
-// From class CActive.
-// The active object completion function.  This is only used for checking the
-// runtime requirements.
-// ---------------------------------------------------------------------------
-//
-void CDevDiagEngine::RunL()
-    {
-    LOGSTRING( "CDevDiagEngine::RunL()" )
-
-        if ( iStatus.Int() == KErrNone )
-            {
-            TInt error = iResultsDatabase.GetLastResults( iLastResults );
-            
-            if ( error != KErrNone )
-                {
-                LOGSTRING2( "CDevDiagEngine::RunL GetLastResults error: %d", error );
-                
-                }
-            
-            if ( iObserver )
-                {
-                iObserver->HandleEngineCommandL(
-                MDevDiagEngineObserver::EDevDiagEngineCommandGetLastResults,
-                error,
-                &iLastResults );
-                }                
-            }
-        else 
-            {
-            LOGSTRING2( "CDevDiagEngine::RunL error: %d", iStatus.Int() );
-            }
-        
-    }
-
-// ---------------------------------------------------------------------------
-// From class CActive.
-// The active object cancellation function.
-// ---------------------------------------------------------------------------
-//
-void CDevDiagEngine::DoCancel()
-    {
-    LOGSTRING( "CDevDiagEngine::DoCancel()" )
-
-    // Stop plugin loading, if it is ongoing.
-    if ( iState == EStateLoadingPlugins )
-        {
-        // Cannot leave here.
-        TRAP_IGNORE( iPluginPool->CancelLoadPluginsL() )
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// From class MDiagEngineObserver.
-// The callback to indicate that test execution is starting.
-// ---------------------------------------------------------------------------
-//
-void CDevDiagEngine::TestExecutionBeginL()
-    {
-    LOGSTRING( "CDevDiagEngine::TestExecutionBeginL()" )
-
-    SetState( EStateRunningTests );
-
-    // Get the record info, so we can get the record uid.
-    TDiagResultsDatabaseTestRecordInfo recordInfo;
-    User::LeaveIfError( iDiagEngine->DbRecord().GetRecordInfo( recordInfo ) );
-
-    // Get the engine parameters, so we can get the executed uid.
-    CDiagResultsDbRecordEngineParam* execParam;
-    User::LeaveIfError( iDiagEngine->DbRecord().GetEngineParam( execParam ) );
-    CleanupStack::PushL( execParam );
-
-    // Initialize the results data.
-    delete iResults;
-    iResults = NULL;
-    iResults = CDevDiagExecResults::NewL( recordInfo.iRecordId,
-                                          *iPluginPool,
-                                          iResultsDatabase,
-                                          execParam->ExecutionsUidArray()[ 0 ],
-                                          iDiagEngine );
-
-    CleanupStack::PopAndDestroy( execParam );
-
-    // Inform the observer object.
-    if ( iObserver )
-        {
-        iObserver->HandleEngineCommandL(
-            MDevDiagEngineObserver::EDevDiagEngineCommandTestExecutionBegin,
-            KErrNone,
-            NULL );
-        }                
-    }
-
-// ---------------------------------------------------------------------------
-// From class MDiagEngineObserver.
-// The callback to indicate test progress.
-// ---------------------------------------------------------------------------
-//
-void CDevDiagEngine::TestExecutionProgressL( TUint aCurrentItemStep,
-                                           TUint aCurrentItemTotalSteps )
-    {
-    LOGSTRING3( "CDevDiagEngine::TestExecutionProgressL( %d, %d )",
-                aCurrentItemStep,
-                aCurrentItemTotalSteps )
-
-    // Update the results data.
-    __ASSERT_ALWAYS( iResults, Panic( EDevDiagApplicationInvalidEngineState ) );
-    iResults->SetProgressL( aCurrentItemStep, aCurrentItemTotalSteps );
-
-    // Inform the observer object.
-    if ( iObserver )
-        {
-        iObserver->HandleEngineCommandL(
-            MDevDiagEngineObserver::EDevDiagEngineCommandProgressDataUpdated,
-            KErrNone,
-            NULL );
-        }
-    }
-
-
-// ---------------------------------------------------------------------------
-// From class MDiagEngineObserver.
-// The callback to indicate that a plugin has completed and provide the
-// result.  Ownership of aResult is transferred.
-// ---------------------------------------------------------------------------
-//
-void CDevDiagEngine::TestExecutionPluginExecutedL(
-    TInt aError,
-    CDiagResultsDatabaseItem* aResult )
-    {
-    LOGSTRING3( "CDevDiagEngine::TestExecutionPluginExecutedL( %d, 0x%x )",
-                aError,
-                aResult )
-
-    // Update the results data.
-    __ASSERT_ALWAYS( iResults, Panic( EDevDiagApplicationNoExecutionResults ) );
-    iResults->AddEntryL( aResult, aError );
-    
-    if ( aResult )
-        {
-        TInt result = aResult->TestResult();    
-        }    
-
-    
-    const MDiagPlugin& plugin = iResults->CurrentItemL().Plugin();
-    
-    if ( plugin.Type() == MDiagPlugin::ETypeTestPlugin  )
-        {
-         //Now we are executing a test (NULL indicates a test suite).
-        if ( aResult )
-            {
-                MDevDiagEngineObserver::TAppEngineCommand cmd = MDevDiagEngineObserver::EDevDiagEngineCommandSinglePluginExecutionDone;
-                if ( iObserver )
-                    iObserver->HandleEngineCommandL(cmd,aError,NULL );
-            }
-        }
-
-    /*
-    MDevDiagEngineObserver::TAppEngineCommand cmd;
-    
-    const MDiagPlugin& plugin = iResults->CurrentItemL().Plugin();
-    
-    if ( plugin.Type() == MDiagPlugin::ETypeTestPlugin  )
-        {
-         //Now we are executing a test (NULL indicates a test suite).
-        if ( aResult )
-            {        javascript:submitForm('CreateAccountServlet', target='/accounts/my/create_selectService.jsp', '')
-9
-            cmd = MDevDiagEngineObserver::EDevDiagEngineCommandSinglePluginExecutionDone;
-                 
-            }    
-        else 
-            {
-            //cmd = MDevDiagEngineObserver::EDevDiagEngineCommandGroupExecutionProgress;
-            }
-        
-        if ( iObserver )
-            {
-            iObserver->HandleEngineCommandL(
-                cmd,
-                aError,
-                NULL );
-            }           
-        }
-        */
-    }
-
-
-// ---------------------------------------------------------------------------
-// From class MDiagEngineObserver.
-// The callback to indicate that the diagnostics engine has finished executing
-// plugins.  This can also indicate a failure to begin executing plugins.
-// ---------------------------------------------------------------------------
-//
-void CDevDiagEngine::TestExecutionCompletedL( TInt aError )
-    {
-    LOGSTRING2( "CDevDiagEngine::TestExecutionCompletedL( %d )", aError )
-
-    SetState( EStateReady );
-    
-    TBool singleExecution = iResults->SinglePluginExecutionL();
-
-    // Clean up the execution information.
-    if ( iResults )
-        {
-        // The results are fully complete only if execution cannot be resumed,
-        // so these are the only error codes that indicate that.
-        iResults->Finalize( aError == KErrNone ||
-                            aError == KErrCancel ||
-                            aError == KErrArgument );
-        }
-        
-    delete iDiagEngine;
-    iDiagEngine = NULL;
-
-    // Inform the observer object.
-    if ( iObserver && !singleExecution )
-        {
-        
-        iObserver->HandleEngineCommandL(
-            MDevDiagEngineObserver::EDevDiagEngineCommandGroupExecutionDone,
-            aError,
-            NULL );           
-        }
-        
-    }
-
-// ---------------------------------------------------------------------------
-// From class MDiagEngineObserver.
-// The callback to indicate that test execution has been suspended.
-// ---------------------------------------------------------------------------
-//
-void CDevDiagEngine::TestExecutionSuspendedL( TSuspendReason aSuspendReason )
-    {
-    LOGSTRING2( "CDevDiagEngine::TestExecutionSuspendedL( %d )",
-                aSuspendReason )
-
-    // Don't do anything if this suspend came from the application, as this
-    // would duplicate the counter increase.
-    if ( aSuspendReason == ESuspendByClient )
-        {
-        __ASSERT_DEBUG(
-            ( iSuspendCounter > 0 && iState == EStateExecutionSuspended ),
-            Panic( EDevDiagApplicationInvalidEngineState ) );
-        return;
-        }
-
-    LOGSTRING3( "CDevDiagEngine::TestExecutionSuspendedL: counter %d, state: %d",
-                iSuspendCounter,
-                iState )
-    // Increment the suspend counter and check the state.
-    iSuspendCounter++;
-    if ( iState == EStateExecutionSuspended )
-        {
-        // If we are already suspended, then this suspend has no effect.
-        return;
-        }
-
-    // Suspend ourself and inform the user.
-    SetState( EStateExecutionSuspended );
-    if ( iObserver )
-        {
-        iObserver->HandleEngineCommandL(
-            MDevDiagEngineObserver::EDevDiagEngineCommandTestExecutionSuspended,
-            KErrNone,
-            NULL );
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// From class MDiagEngineObserver.
-// The callback to indicate that test execution has been resumed.
-// ---------------------------------------------------------------------------
-//
-void CDevDiagEngine::TestExecutionResumedL( TResumeReason aResumeReason )
-    {
-    LOGSTRING2( "CDevDiagEngine::TestExecutionResumedL( %d )", aResumeReason )
-
-    // Don't do anything if this suspend came from the application, as this
-    // would duplicate the counter decrease.
-    if ( aResumeReason == EResumedByClient )
-        {
-        return;
-        }
-
-    LOGSTRING3( "CDevDiagEngine::TestExecutionResumedL: counter %d, state: %d",
-                iSuspendCounter,
-                iState )
-    // Decrement the suspend counter and check the state.
-    --iSuspendCounter;
-    __ASSERT_DEBUG( iSuspendCounter >= 0,
-                    Panic( EDevDiagApplicationInvalidEngineState ) );
-    if ( iState != EStateExecutionSuspended )
-        {
-        // The resume was already done, so just return.
-        return;
-        }
-
-    // Resume ourself and inform the user.
-    SetState( EStateRunningTests );
-    if ( iObserver )
-        {
-        iObserver->HandleEngineCommandL(
-            MDevDiagEngineObserver::EDevDiagEngineCommandTestExecutionResumed,
-            KErrNone,
-            NULL );
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// From class MDiagEngineObserver.
-// The callback to to create a custom common-use dialog.  This may ONLY be
-// called by the Diagnostics Engine.  Any application classes must use the
-// dialog classes directly.
-// ---------------------------------------------------------------------------
-//
-CAknDialog* CDevDiagEngine::CreateCommonDialogLC( TDiagCommonDialog aDialogType,
-                                                TAny* aInitData )
-    {
-    LOGSTRING3( "CDevDiagEngine::CreateCommonDialogLC( %d, 0x%x )",
-                aDialogType,
-                aInitData )
-
-    switch ( aDialogType )
-        {
-        case EDiagCommonDialogConfirmCancelAll:
-            {
-            __ASSERT_ALWAYS( !aInitData,
-                             Panic( EDevDiagApplicationGeneral ) );
-            return CDevDiagCommonCancelDialogs::NewLC( *this, EFalse );
-            }
-           
-        case EDiagCommonDialogConfirmSkipAll:
-        	{
-            __ASSERT_ALWAYS( !aInitData,
-                             Panic( EDevDiagApplicationGeneral ) );
-            return CDevDiagCommonSkipDialogs::NewLC( *this, EFalse );        		
-        	}
-        }
-
-    __ASSERT_DEBUG( EFalse, Panic( EDevDiagApplicationBadType ) );
-    return NULL;
-    }
-
-
-
-// ---------------------------------------------------------------------------
-// From class MDiagEngineObserver.
-// The callback to to execute an application command. This may ONLY be 
-// called by the Diagnostics Engine.
-// ---------------------------------------------------------------------------
-//
-void CDevDiagEngine::ExecuteAppCommandL( TDiagAppCommand aCommand,
-                                       TAny* aParam1,
-                                       TAny* aParam2 )
-    {
-    LOGSTRING4( "CDevDiagEngine::ExecuteAppCommandL( %d, 0x%x, 0x%x )",
-                aCommand,
-                aParam1,
-                aParam2 )
-
-    switch ( aCommand )
-        {
-        case EDiagAppCommandSwitchToMainView:
-            {
-            __ASSERT_ALWAYS( ( !aParam1 && !aParam2 ),
-                             Panic( EDevDiagApplicationGeneral ) );
-            if ( iObserver )
-                {
-                iObserver->HandleEngineCommandL(
-                    MDevDiagEngineObserver::EDevDiagEngineCommandViewSwitch,
-                    KErrNone,
-                    NULL );
-                }
-            break;
-            }
-
-        default:
-            User::Leave( KErrNotSupported );
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// From class MDiagPluginPoolObserver.
-// The callback to indicate plugin loading progress.
-// ---------------------------------------------------------------------------
-//
-void CDevDiagEngine::LoadProgressL( TUint aCurrentStep,
-                                  TUint aTotalSteps,
-                                  const TUid& aLoadedPluginUid )
-    {
-   
-    LOGSTRING4( "CDevDiagEngine::LoadProgressL( %d, %d, 0x%x )",
-                aCurrentStep,
-                aTotalSteps,
-                aLoadedPluginUid.iUid )
-
-    __ASSERT_ALWAYS( iState == EStateLoadingPlugins,
-                     Panic( EDevDiagApplicationInvalidEngineState ) );
-
-    // Inform the observer with the loading information.
-    if ( iObserver )
-        {
-        MDiagPlugin* plugin = NULL;
-        iPluginPool->FindPlugin( aLoadedPluginUid, plugin );
-
-        iObserver->HandleEngineCommandL(
-            MDevDiagEngineObserver::EDevDiagEngineCommandPluginLoadProgress,
-            KErrNone,
-            plugin );
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// From class MDiagPluginPoolObserver.
-// The callback to indicate plugin loading completion.
-// ---------------------------------------------------------------------------
-//
-void CDevDiagEngine::LoadCompletedL( TInt aError )
-    {
-    LOGSTRING2( "CDevDiagEngine::LoadCompletedL( %d )", aError )
-
-    SetState( EStateReady );
-
-    // Inform the observer of the loading completion.  The observer will
-    // display error messages for loading failures.
-    if ( iObserver )
-        {
-        iObserver->HandleEngineCommandL(
-            MDevDiagEngineObserver::EDevDiagEngineCommandPluginLoadComplete,
-            aError,
-            NULL );
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// Get Last results from the Results Database.
-// ---------------------------------------------------------------------------
-//
-void CDevDiagEngine::GetLastResultsL( TUid aParentUid )
-    {
-    LOGSTRING( "CDevDiagEngine::GetLastResultsL");
-    
-    RPointerArray<MDiagPlugin> children;
-    CleanupClosePushL( children );
-    
-    MDiagPlugin* plugin;
-    ///@@@KSR: changes for BAD Warnings - #177-D: variable "formattedName" was declared but never referenced
-    //HBufC* formattedName = NULL;
-    
-    if ( PluginPool().FindPlugin( aParentUid, plugin ) == KErrNone )
-        {        
-        MDiagSuitePlugin* suite = static_cast< MDiagSuitePlugin* >( plugin );
-        suite->GetChildrenL( children, MDiagSuitePlugin::ESortByPosition );
-        }
-     else 
-        {
-        User::Leave(KErrNotFound);
-        }
-     
-    if ( iUids )
-        {
-        delete iUids;
-        iUids = NULL;
-        }
-        
-    iUids = new (ELeave) CArrayFixFlat<TUid>( KArrayGranuality );
-    
-    iLastResults.ResetAndDestroy();
-    
-    //Create UID array that is needed when results are searched from the DB.
-    for ( TInt i = 0; i < children.Count(); ++i )
-        {
-        iUids->AppendL( children[i]->Uid() );
-        }
-
-    CleanupStack::PopAndDestroy( &children );
-    
-    //Start search. This is an asynchronous call.
-    iResultsDatabase.InitiateGetLastResults( *iUids, iStatus );
-    
-    SetActive();
-    }
-
-
-// ---------------------------------------------------------------------------
-// Get last plug-in that crashed (if any). 
-//
-// CDiagResultsDatabaseItem::EQueuedToRun indicates that the test was not
-// executed properly.
-// ---------------------------------------------------------------------------
-// 
-TBool CDevDiagEngine::CrashedPluginL( TUid& aPluginUid )
-    {
-    LOGSTRING( "CDevDiagEngine::CrashedPluginL");
-    TUid recordUid;
-    TInt error = iResultsDatabase.GetLastNotCompletedRecord ( recordUid ); 
-    LOGSTRING2("crashedpluginL::dbconnect error %d",error);
-    TBool found = EFalse;
-    if ( error == KErrNone )
-        {                
-        RDiagResultsDatabaseRecord crashedRecord;
-        
-        error = crashedRecord.Connect( iResultsDatabase, recordUid, EFalse );
-        CleanupClosePushL( crashedRecord );
-        
-        if ( error != KErrNone )
-            {
-            LOGSTRING2( "CDevDiagEngine::CrashedPluginL connect error: %d", error );
-            User::Leave( error );
-            }
-        
-        //ResetAndDestroy + Close would be better
-        RPointerArray<CDiagResultsDatabaseItem> resultsArray;
-        CleanupClosePushL( resultsArray );
-        
-        error = crashedRecord.GetTestResults ( resultsArray );
-        
-        if ( error != KErrNone )
-            {
-            LOGSTRING2( "CDevDiagEngine::CrashedPluginL GetTestResults error: %d", error );
-            User::Leave( error );
-            }
-        
-        for ( TInt i = 0; i < resultsArray.Count(); ++i )
-            {
-            if ( resultsArray[i]->TestResult() == CDiagResultsDatabaseItem::EQueuedToRun )
-                {
-                aPluginUid = resultsArray[i]->TestUid();                
-                found = ETrue;
-                break;
-                }
-            }
-        
-        resultsArray.ResetAndDestroy();
-        CleanupStack::PopAndDestroy();        
-        CleanupStack::PopAndDestroy(); //crashedRecord    
-        }        
-
-    LOGSTRING( "CDevDiagEngine::CrashedPluginL end" );       
-        
-    return found;    
-    }
-
-
-// ---------------------------------------------------------------------------
-// Completes the crashed test record.
-// ---------------------------------------------------------------------------
-//    
-///@@@KSR: changes for Codescanner error val = High
-//TInt CDevDiagEngine::CompleteCrashedTestRecord()
-TInt CDevDiagEngine::CompleteCrashedTestRecordL()
-    {    
-    LOGSTRING( "CDevDiagEngine::CompleteCrashedTestRecordL");
-    TUid recordUid;
-    TInt error = iResultsDatabase.GetLastNotCompletedRecord ( recordUid );
-    
-    if ( error == KErrNone )
-        {                
-        RDiagResultsDatabaseRecord crashedRecord;
-        
-        error = crashedRecord.Connect( iResultsDatabase, recordUid, EFalse );
-        CleanupClosePushL( crashedRecord );
-        
-        if ( error != KErrNone )
-            {
-            LOGSTRING2( "CDevDiagEngine::CompleteCrashedTestRecordL connect error: %d", error );
-            return error;
-            }
-            
-        error = crashedRecord.TestCompleted( ETrue );
-        
-        if ( error != KErrNone )
-            {
-            LOGSTRING2( "CDevDiagEngine::CompleteCrashedTestRecordL TestCompleted error: %d", error );
-            return error;
-            }
-            
-        CleanupStack::PopAndDestroy(); //crashedRecord     
-        }
-
-    LOGSTRING( "CDevDiagEngine::CompleteCrashedTestRecordL end");
-                    
-    return error;   
-    }
-    
- 
-// ADO & Platformization Changes
- TBool CDevDiagEngine::GetPluginDependencyL()
- {
-     ///@@@KSR: changes for Codescanner error val = High 	
-     //return iDiagEngine->GetPluginDependency();
-     return iDiagEngine->GetPluginDependencyL();
- }
-
-// End of File
--- a/devicediagnostics/devdiagapp/src/devdiagexecutionresults.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,706 +0,0 @@
-/*
-* 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:  This class encapsulates test results from live execution runs
-*                as well as logged results and presents a common interface for
-*                both.
-*
-*/
-
-
-// System Include Files
-#include <centralrepository.h>                  // CRepository
-#include <drmserviceapi.h>                      // CDrmServiceApi
-#include <DiagEngineCommon.h>                   // MDiagEngineCommon
-#include <DiagPluginExecPlan.h>                 // CDiagPluginExecPlan
-#include <DiagExecPlanEntry.h>                  // MDiagExecPlanEntry
-#include <DiagResultsDatabaseItem.h>            // CDiagResultsDatabaseItem
-#include <DiagPlugin.h>                         // MDiagPlugin
-#include <DiagTestPlugin.h>                     // MDiagTestPlugin
-#include <DiagPluginPool.h>                     // CDiagPluginPool
-#include <DiagResultsDatabaseTestRecordInfo.h>  // TDiagResultsDatabaseTestRecordInfo
-#include <DiagResultsDbRecordEngineParam.h>     // CDiagResultsDbRecordEngineParam
-#include <DiagResultsDatabase.h>                // RDiagResultsDatabase,
-                                                // RDiagResultsDatabaseRecord
-#include <DiagFrameworkDebug.h>                 // Debugging Macros
-
-// User Include Files
-#include "devdiagexecutionresults.h"                 // CDevDiagExecResults
-#include "devdiagapp.hrh"                    // UID definition
-#include "devdiag.pan"                    // Panic
-#include "devdiagprivatecrkeys.h"           // CR Key ID Definitions
-
-// Local Constants
-///@@@KSR: changes for BAD Warnings - #177-D: variable "KRecordsArrayGranularity" was declared but never referenced
-//const TInt KRecordsArrayGranularity = ( 5 );
-
-// Local Data Types
-typedef CArrayFixFlat< TDiagResultsDatabaseTestRecordInfo > CDatabaseRecordInfoArray;
-
-
-// ============================ MEMBER FUNCTIONS =============================
-
-// ---------------------------------------------------------------------------
-// From nested class CDevDiagExecResults::CResult.
-// Static two-phase constructor.
-// ---------------------------------------------------------------------------
-//
-CDevDiagExecResults::CResult* CDevDiagExecResults::CResult::NewL(
-    const MDiagPlugin& aPlugin )
-    {
-    CResult* self = CResult::NewLC( aPlugin );
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// ---------------------------------------------------------------------------
-// From nested class CDevDiagExecResults::CResult.
-// Static two-phase constructor.
-// ---------------------------------------------------------------------------
-//
-CDevDiagExecResults::CResult* CDevDiagExecResults::CResult::NewLC(
-    const MDiagPlugin& aPlugin )
-    {
-    CResult* self = new ( ELeave ) CResult( aPlugin );
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    return self;
-    }
-
-// ---------------------------------------------------------------------------
-// From nested class CDevDiagExecResults::CResult.
-// Destructor.
-// ---------------------------------------------------------------------------
-//
-CDevDiagExecResults::CResult::~CResult()
-    {
-    delete iResult;
-    iResult = NULL;
-    }
-
-// ---------------------------------------------------------------------------
-// From nested class CDevDiagExecResults::CResult.
-// Return the test result.  This may be NULL if the test has not been run.
-// ---------------------------------------------------------------------------
-//
-const CDiagResultsDatabaseItem* CDevDiagExecResults::CResult::Result() const
-    {
-    return iResult;
-    }
-
-// ---------------------------------------------------------------------------
-// From nested class CDevDiagExecResults::CResult.
-// Return a reference to the plugin for this result.
-// ---------------------------------------------------------------------------
-//
-const MDiagPlugin& CDevDiagExecResults::CResult::Plugin() const
-    {
-    return iPlugin;
-    }
-
-// ---------------------------------------------------------------------------
-// From nested class CDevDiagExecResults::CResult.
-// Return the execution error code.
-// ---------------------------------------------------------------------------
-//
-TInt CDevDiagExecResults::CResult::ExecStatus() const
-    {
-    return iExecStatus;
-    }
-
-// ---------------------------------------------------------------------------
-// From nested class CDevDiagExecResults::CResult.
-// Return the current execution step for this result.
-// ---------------------------------------------------------------------------
-//
-TUint CDevDiagExecResults::CResult::CurrentStep() const
-    {
-    return iCurrentStep;
-    }
-
-// ---------------------------------------------------------------------------
-// From nested class CDevDiagExecResults::CResult.
-// Return the total execution steps for this result.
-// ---------------------------------------------------------------------------
-//
-TUint CDevDiagExecResults::CResult::TotalSteps() const
-    {
-    return iTotalSteps;
-    }
-
-// ---------------------------------------------------------------------------
-// From nested class CDevDiagExecResults::CResult.
-// This function takes ownership of a result object.
-// ---------------------------------------------------------------------------
-//
-void CDevDiagExecResults::CResult::SetResult(
-    CDiagResultsDatabaseItem* aResult,
-    TInt aError )
-    {
-    // Sanity check.
-    if ( iResult )
-        {
-        delete iResult;
-        }
-
-    // Set the result and error code Ownership of the result is transferred.
-    iResult = aResult;
-    iExecStatus = aError;
-    }
-
-// ---------------------------------------------------------------------------
-// From nested class CDevDiagExecResults::CResult.
-// Set the progress information for this result.
-// ---------------------------------------------------------------------------
-//
-void CDevDiagExecResults::CResult::SetProgress( TUint aCurrentStep,
-                                                TUint aTotalSteps )
-    {
-    iCurrentStep = aCurrentStep;
-    iTotalSteps = aTotalSteps;
-    }
-
-// ---------------------------------------------------------------------------
-// From nested class CDevDiagExecResults::CResult.
-// The default constructor.
-// ---------------------------------------------------------------------------
-//
-CDevDiagExecResults::CResult::CResult( const MDiagPlugin& aPlugin )
-:   iPlugin( aPlugin )
-    {
-    }
-
-// ---------------------------------------------------------------------------
-// From nested class CDevDiagExecResults::CResult.
-// The second phase constructor.
-// ---------------------------------------------------------------------------
-//
-void CDevDiagExecResults::CResult::ConstructL()
-    {
-    }
-
-
-// ============================ MEMBER FUNCTIONS =============================
-
-// ---------------------------------------------------------------------------
-// Static two-phase constructor.
-// ---------------------------------------------------------------------------
-//
-CDevDiagExecResults* CDevDiagExecResults::NewL(
-    TUid aRecordId,
-    CDiagPluginPool& aPluginPool,
-    RDiagResultsDatabase& aDbSession )
-    {
-    LOGSTRING2( "CDevDiagExecResults::NewL( %d )", aRecordId.iUid )
-
-    CDevDiagExecResults* self = new ( ELeave ) CDevDiagExecResults(
-        aRecordId,
-        aPluginPool,
-        aDbSession );
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// ---------------------------------------------------------------------------
-// Static two-phase constructor.
-// ---------------------------------------------------------------------------
-//
-CDevDiagExecResults* CDevDiagExecResults::NewL(
-    TUid aRecordId,
-    CDiagPluginPool& aPluginPool,
-    RDiagResultsDatabase& aDbSession,
-    TUid aExecutedUid,
-    MDiagEngineCommon* aDiagEngine )
-    {
-    LOGSTRING3( "CDevDiagExecResults::NewL( %d, 0x%x )",
-                aRecordId.iUid,
-                aDiagEngine )
-
-    CDevDiagExecResults* self = new ( ELeave ) CDevDiagExecResults(
-        aRecordId,
-        aPluginPool,
-        aDbSession,
-        aExecutedUid,
-        aDiagEngine );
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// ---------------------------------------------------------------------------
-// Destructor.
-// ---------------------------------------------------------------------------
-//
-CDevDiagExecResults::~CDevDiagExecResults()
-    {
-    LOGSTRING( "CDevDiagExecResults::~CDevDiagExecResults()" )
-    iResults.ResetAndDestroy();
-    }
-
-// ---------------------------------------------------------------------------
-// This function is called during live execution to transfer ownership of a
-// test result.
-// ---------------------------------------------------------------------------
-//
-void CDevDiagExecResults::AddEntryL( CDiagResultsDatabaseItem* aResult,
-                                     TInt aStatus )
-    {
-    LOGSTRING3( "CDevDiagExecResults::AddEntryL( 0x%x, %d )",
-                aResult,
-                aStatus )
-
-    // This is only valid for live executions.
-    if ( iType != ETypeExecution )
-        {
-        delete aResult;
-        User::Leave( KErrCompletion );
-        }
-
-    // Assign the result object to the corresponding item in the local array.
-    iResults[ CurrentIndexL() ]->SetResult( aResult, aStatus );
-
-    // Update the completed step counter.
-    if ( iResults[ CurrentIndexL() ]->Plugin().Type() ==
-        MDiagPlugin::ETypeTestPlugin )
-        {
-        iCompletedSteps += static_cast< const MDiagTestPlugin& >(
-            iResults[ CurrentIndexL() ]->Plugin() ).TotalSteps();
-
-        if ( aResult && ( aResult->TestResult() ==
-                            CDiagResultsDatabaseItem::EFailed ||
-                          aResult->TestResult() ==
-                            CDiagResultsDatabaseItem::EDependencyFailed ) )
-            {
-            iFailedCount++;
-            }
-        
-        if ( aResult && ( aResult->TestResult() ==
-                            CDiagResultsDatabaseItem::ESuccess) )
-            {
-            iPassedCount++;
-            }
-        }
-    iCurrentPluginStep = 0;
-    }
-
-// ---------------------------------------------------------------------------
-// This function is called during live execution to transfer ownership of a
-// test result.
-// ---------------------------------------------------------------------------
-//
-void CDevDiagExecResults::SetProgressL( TUint aCurrentStep, TUint aTotalSteps )
-    {
-    LOGSTRING3( "CDevDiagExecResults::SetProgressL( %d, %d )",
-            aCurrentStep,
-            aTotalSteps )
-
-    // This is only valid for live executions.
-    if ( iType != ETypeExecution )
-        {
-        return;
-        }
-
-    // Assign the progress to the corresponding item in the local array.
-    iResults[ CurrentIndexL() ]->SetProgress( aCurrentStep, aTotalSteps );
-
-    // Update the current step counter.
-    if ( iResults[ CurrentIndexL() ]->Plugin().Type() ==
-        MDiagPlugin::ETypeTestPlugin )
-        {
-        iCurrentPluginStep = aCurrentStep;
-        }
-    else
-        {
-        iCurrentPluginStep = 0;
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// This function returns the corresponding results item from the local array.
-// ---------------------------------------------------------------------------
-//
-CDevDiagExecResults::CResult& CDevDiagExecResults::operator[] ( TInt aIndex )
-    {
-    return *iResults[ aIndex ];
-    }
-
-// ---------------------------------------------------------------------------
-// This function returns the corresponding results item from the local array.
-// ---------------------------------------------------------------------------
-//
-const CDevDiagExecResults::CResult& CDevDiagExecResults::operator[] (
-    TInt aIndex ) const
-    {
-    return *iResults[ aIndex ];
-    }
-
-// ---------------------------------------------------------------------------
-// This function returns the current item from the local array.  For results
-// which are from execution, this is the current execution item.  For results
-// which are from the database, this is always the last item.
-// ---------------------------------------------------------------------------
-//
-CDevDiagExecResults::CResult& CDevDiagExecResults::CurrentItemL()
-    {
-    return *iResults[ CurrentIndexL() ];
-    }
-
-// ---------------------------------------------------------------------------
-// This function returns the current item from the local array.  For results
-// which are from execution, this is the current execution item.  For results
-// which are from the database, this is always the last item.
-// ---------------------------------------------------------------------------
-//
-const CDevDiagExecResults::CResult& CDevDiagExecResults::CurrentItemL() const
-    {
-    return *iResults[ CurrentIndexL() ];
-    }
-
-// ---------------------------------------------------------------------------
-// This function returns the number of items in the local array.
-// ---------------------------------------------------------------------------
-//
-TInt CDevDiagExecResults::Count() const
-    {
-    return iResults.Count();
-    }
-
-// ---------------------------------------------------------------------------
-// This function returns the index of the currently-executing item.
-// ---------------------------------------------------------------------------
-//
-TUint CDevDiagExecResults::CurrentIndexL() const
-    {
-    // For live execution, the index from the execution plan is returned.
-    if ( iType == ETypeExecution )
-        {
-        TUint index = 0;
-        index = iDiagEngine->ExecutionPlanL().CurrentIndex();
-        return index;
-        }
-
-    // For logged test results, the last index is returned.
-    return iResults.Count() - 1;
-    }
-
-// ---------------------------------------------------------------------------
-// This utility function allows the result view to check if testing is
-// complete but the diagnostics engine has not yet reported testing as
-// finished.
-// ---------------------------------------------------------------------------
-//
-TBool CDevDiagExecResults::LastTestFinishedL() const
-    {
-    if ( !iDiagEngine ||
-         ( iDiagEngine->ExecutionPlanL().IsLastTest() &&
-           ( iResults[ iLastTestIndex ] )->Result() ) )
-        {
-        return ETrue;
-        }
-
-    return EFalse;
-    }
-
-// ---------------------------------------------------------------------------
-// This utility function checks to see if a test is being executed / was
-// executed as a dependency.
-// ---------------------------------------------------------------------------
-//
-TBool CDevDiagExecResults::IsDependencyL( TInt aIndex ) const
-    {
-    //__ASSERT_ALWAYS( ( aIndex < Count() ), Panic( EDevDiagApplicationGeneral ) );
-
-    // For live execution, get the information from the execution plan.
-    if ( iType == ETypeExecution )
-        {
-        TBool dependent = EFalse;
-        dependent = iDiagEngine->ExecutionPlanL()[ aIndex ].AsDependency();
-        return dependent;
-        }
-
-    // For logged test results, get the information from the test result.  The
-    // NULL check is needed in case the plugin failed during running and did
-    // not report a result.
-    if ( iResults[ aIndex ]->Result() )
-        {
-        return iResults[ aIndex ]->Result()->WasDependency();
-        }
-    else
-        {
-        return EFalse;
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// Returns whether or not the results are from a completed test record.  This
-// information is used to determine the validity of the session's "end time."
-// ---------------------------------------------------------------------------
-//
-TBool CDevDiagExecResults::IsRecordCompleted() const
-    {
-    return iCompleted;
-    }
-
-// ---------------------------------------------------------------------------
-// This function locks "execution" style results from further changes, by
-// changing the results type and clearing the reference to the engine.
-// ---------------------------------------------------------------------------
-//
-void CDevDiagExecResults::Finalize( TBool aTestingComplete )
-    {
-    LOGSTRING( "CDevDiagExecResults::Finalize()" )
-
-    iDiagEngine = NULL;
-    iType = ETypeLog;
-    iCompletedSteps = iTotalSteps;
-    iCurrentPluginStep = 0;
-    iCompleted = aTestingComplete;
-    }
-
-// ---------------------------------------------------------------------------
-// This function returns the total number of steps for all items in the
-// execution results.
-// ---------------------------------------------------------------------------
-//
-TInt CDevDiagExecResults::TotalExecutionSteps() const
-    {
-    return iTotalSteps;
-    }
-
-// ---------------------------------------------------------------------------
-// This function returns the current execution step based on all items in the
-// execution results.
-// ---------------------------------------------------------------------------
-//
-TInt CDevDiagExecResults::CurrentExecutionStep() const
-    {
-    return iCompletedSteps + iCurrentPluginStep;
-    }
-
-
-// ---------------------------------------------------------------------------
-// Returns a reference to the plugin that execution was requested for.
-// ---------------------------------------------------------------------------
-//
-const MDiagPlugin& CDevDiagExecResults::ExecutedPluginL() const
-    {
-    LOGSTRING( "CDevDiagExecResults::ExecutedPluginL()" )
-
-    MDiagPlugin* plugin = NULL;
-    User::LeaveIfError( iPluginPool.FindPlugin( iExecutedPlugin, plugin ) );
-
-    return *plugin;
-    }
-
-// ---------------------------------------------------------------------------
-// Returns whether or not the execution is for a single plugin.
-// ---------------------------------------------------------------------------
-//
-TBool CDevDiagExecResults::SinglePluginExecutionL() const
-    {
-    if ( !iDiagEngine )
-        {
-        return EFalse;
-        }
-    
-    return ( iDiagEngine->ExecutionPlanL().TestCount( EFalse ) == 1 );
-    }
-
-// ---------------------------------------------------------------------------
-// Returns the number of failed tests in this set of results.
-// ---------------------------------------------------------------------------
-//
-TInt CDevDiagExecResults::FailedResultsCount() const
-    {
-    return iFailedCount;
-    }
-
-
-// ---------------------------------------------------------------------------
-// Returns the number of passed tests in this set of results.
-// ---------------------------------------------------------------------------
-//
-TInt CDevDiagExecResults::PassedResultsCount() const
-    {
-    return iPassedCount;
-    }
-
-// ---------------------------------------------------------------------------
-// Returns whether or not the execution plan's resume index has been reached.
-// ---------------------------------------------------------------------------
-//
-TBool CDevDiagExecResults::ResumeIndexReachedL() const
-    {
-    if ( !iDiagEngine )
-        {
-        return ETrue;
-        }
-
-    return ( iDiagEngine->ExecutionPlanL().CurrentIndex() >=
-        iDiagEngine->ExecutionPlanL().ResumeIndex() );
-    }
-
-// ---------------------------------------------------------------------------
-// Returns the UID of the record associated with this set of results.
-// ---------------------------------------------------------------------------
-//
-const TUid& CDevDiagExecResults::RecordId() const
-    {
-    return iRecordId;
-    }
-
-// ---------------------------------------------------------------------------
-// The default constructor.
-// ---------------------------------------------------------------------------
-//
-CDevDiagExecResults::CDevDiagExecResults( TUid aRecordId,
-                                          CDiagPluginPool& aPluginPool,
-                                          RDiagResultsDatabase& aDbSession,
-                                          TUid aExecutedUid,
-                                          MDiagEngineCommon* aDiagEngine )
-:   iRecordId( aRecordId ),
-    iPluginPool( aPluginPool ),
-    iDbSession( aDbSession ),
-    iDiagEngine( aDiagEngine ),
-    iExecutedPlugin( aExecutedUid )
-    {
-    LOGSTRING3( "CDevDiagExecResults::CDevDiagExecResults( %d, 0x%x )",
-                aRecordId.iUid,
-                aDiagEngine )
-
-    }
-
-// ---------------------------------------------------------------------------
-// The second phase constructor.
-// ---------------------------------------------------------------------------
-//
-void CDevDiagExecResults::ConstructL()
-    {
-    LOGSTRING( "CDevDiagExecResults::ConstructL()" )
-
-    // There are two types of results: (1) Current Execution, and (2) Logs.
-
-    // (1) If a pointer to the diagnostics engine was provided, then it is
-    // assumed that the results are from a live execution and this object will
-    // wait for the results to be assigned .
-    if ( iDiagEngine )
-        {
-        // This is the "current execution" type.
-        iType = ETypeExecution;
-        const MDiagPluginExecPlan& execPlan = iDiagEngine->ExecutionPlanL();
-
-        // Add an entry for every item in the plan.
-        TUint numItems = execPlan.Count();
-        for ( TUint i = 0; i < numItems; i++ )
-            {
-            CResult* result = CResult::NewLC( execPlan[ i ].Plugin() );
-            iResults.AppendL( result );
-            CleanupStack::Pop( result );
-
-            // Update the total step counter with this plugin's information.
-            if ( execPlan[ i ].Plugin().Type() == MDiagPlugin::ETypeTestPlugin )
-                {
-                iTotalSteps += static_cast< const MDiagTestPlugin& >(
-                    execPlan[ i ].Plugin() ).TotalSteps();
-                iLastTestIndex = i;
-                }
-            }
-        }
-    // (2) If no pointer to the diagnostics engine was provided, then all the
-    // results which correspond to the record id will be looked up from the
-    // results database.
-    else
-        {
-        // This is the "logged" type.
-        iType = ETypeLog;
-
-        // Get the record's results from the database.
-        RDiagResultsDatabaseRecord dbRecord;
-        User::LeaveIfError( dbRecord.Connect( iDbSession, iRecordId, ETrue ) );
-        CleanupClosePushL( dbRecord );
-        User::LeaveIfError( dbRecord.IsTestCompleted( iCompleted ) );
-        RPointerArray< CDiagResultsDatabaseItem > logResults;
-        CleanupClosePushL( logResults );
-        User::LeaveIfError( dbRecord.GetTestResults( logResults ) );
-
-        // Add an entry for each result item.
-        TUint numItems = logResults.Count();
-        for ( TUint i = 0; i < numItems; i++ )
-            {
-            MDiagPlugin* plugin = NULL;
-            TInt err = iPluginPool.FindPlugin( logResults[ i ]->TestUid(),
-                                               plugin );
-
-            // If a matching plugin was not found for this result, we just
-            // skip over it, because we can't do anything useful with it.
-            // This case should only occur if a plugin logged results
-            // previously, but was later removed from the phone.
-            if ( err != KErrNone )
-                {
-                continue; //lint !e960 A continue makes sense here.
-                }
-
-            CResult* result = CResult::NewLC( *plugin );
-
-            // Ownership of the results item is transferred.
-            result->SetResult( logResults[ i ], KErrNone );
-            logResults[ i ] = NULL;
-
-            // Get the test result.
-            if ( result->Result()->TestResult() ==
-                    CDiagResultsDatabaseItem::EFailed ||
-                 result->Result()->TestResult() ==
-                    CDiagResultsDatabaseItem::EDependencyFailed )
-                {
-                iFailedCount++;
-                }
-
-            iResults.AppendL( result );
-            CleanupStack::Pop( result );
-            }
-        iLastTestIndex = numItems - 1;
-
-        CleanupStack::Pop(); // logResults
-        logResults.ResetAndDestroy();
-
-        // Get the uid of the executed test.
-        CDiagResultsDbRecordEngineParam* execParam;
-        User::LeaveIfError( dbRecord.GetEngineParam( execParam ) );
-        iExecutedPlugin = execParam->ExecutionsUidArray()[ 0 ];
-        delete execParam;
-
-        CleanupStack::PopAndDestroy(); // dbRecord
-
-        // Set dummy numbers for the execution steps.
-        iTotalSteps = 1;
-        iCompletedSteps = 1;
-        }
-    }
-    
-    
-
- const CDiagResultsDatabaseItem* CDevDiagExecResults::GetSinglepluginExecutionResult() const
-    {
-    
-    	return iResults[ iLastTestIndex ]->Result();
-    	/*
-    	CDiagResultsDatabaseItem* aResult;
-    	const CDevDiagExecResults::CResult& result = CDevDiagExecResults::CurrentItemL();
-    	aResult = result.Result();
-    	return aResult;*/
-    	
-    }
-// End of File
--- a/devicediagnostics/devdiagapp/src/devdiagexecutionresults_old.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,622 +0,0 @@
-/*
-* 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:  This class encapsulates test results from live execution runs
-*                as well as logged results and presents a common interface for
-*                both.
-*
-*/
-
-
-// System Include Files
-#include <centralrepository.h>                  // CRepository
-#include <drmserviceapi.h>                      // CDrmServiceApi
-#include <diagenginecommon.h>                   // MDiagEngineCommon
-#include <diagpluginexecplan.h>                 // CDiagPluginExecPlan
-#include <diagexecplanentry.h>                  // MDiagExecPlanEntry
-#include <diagresultsdatabaseitem.h>            // CDiagResultsDatabaseItem
-#include <diagplugin.h>                         // MDiagPlugin
-#include <diagtestplugin.h>                     // MDiagTestPlugin
-#include <diagpluginpool.h>                     // CDiagPluginPool
-#include <diagresultsdatabasetestrecordinfo.h>  // TDiagResultsDatabaseTestRecordInfo
-#include <diagresultsdatabase.h>                // RDiagResultsDatabase,
-                                                // RDiagResultsDatabaseRecord
-#include <diagframeworkdebug.h>                 // Debugging Macros
-
-// User Include Files
-#include "DevDiagExecutionResults.h"            // CDevDiagExecResults
-#include "DevDiagApp.hrh"                    // UID definition
-#include "DevDiag.pan"                 // Panic
-#include "phonedoctorprivatecrkeys.h"           // CR Key ID Definitions
-
-// Local Constants
-const TInt KRecordsArrayGranularity = ( 5 );
-
-// Local Data Types
-typedef CArrayFixFlat< TDiagResultsDatabaseTestRecordInfo > CDatabaseRecordInfoArray;
-
-
-// ============================ MEMBER FUNCTIONS =============================
-
-// ---------------------------------------------------------------------------
-// From nested class CDevDiagExecResults::CResult.
-// Static two-phase constructor.
-// ---------------------------------------------------------------------------
-//
-CDevDiagExecResults::CResult* CDevDiagExecResults::CResult::NewL(
-    const MDiagPlugin& aPlugin )
-    {
-    CResult* self = CResult::NewLC( aPlugin );
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// ---------------------------------------------------------------------------
-// From nested class CDevDiagExecResults::CResult.
-// Static two-phase constructor.
-// ---------------------------------------------------------------------------
-//
-CDevDiagExecResults::CResult* CDevDiagExecResults::CResult::NewLC(
-    const MDiagPlugin& aPlugin )
-    {
-    CResult* self = new ( ELeave ) CResult( aPlugin );
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    return self;
-    }
-
-// ---------------------------------------------------------------------------
-// From nested class CDevDiagExecResults::CResult.
-// Destructor.
-// ---------------------------------------------------------------------------
-//
-CDevDiagExecResults::CResult::~CResult()
-    {
-    delete iResult;
-    iResult = NULL;
-    }
-
-// ---------------------------------------------------------------------------
-// From nested class CDevDiagExecResults::CResult.
-// Return the test result.  This may be NULL if the test has not been run.
-// ---------------------------------------------------------------------------
-//
-const CDiagResultsDatabaseItem* CDevDiagExecResults::CResult::Result() const
-    {
-    return iResult;
-    }
-
-// ---------------------------------------------------------------------------
-// From nested class CDevDiagExecResults::CResult.
-// Return a reference to the plugin for this result.
-// ---------------------------------------------------------------------------
-//
-const MDiagPlugin& CDevDiagExecResults::CResult::Plugin() const
-    {
-    return iPlugin;
-    }
-
-// ---------------------------------------------------------------------------
-// From nested class CDevDiagExecResults::CResult.
-// Return the execution error code.
-// ---------------------------------------------------------------------------
-//
-TInt CDevDiagExecResults::CResult::ExecStatus() const
-    {
-    return iExecStatus;
-    }
-
-// ---------------------------------------------------------------------------
-// From nested class CDevDiagExecResults::CResult.
-// Return the current execution step for this result.
-// ---------------------------------------------------------------------------
-//
-TUint CDevDiagExecResults::CResult::CurrentStep() const
-    {
-    return iCurrentStep;
-    }
-
-// ---------------------------------------------------------------------------
-// From nested class CDevDiagExecResults::CResult.
-// Return the total execution steps for this result.
-// ---------------------------------------------------------------------------
-//
-TUint CDevDiagExecResults::CResult::TotalSteps() const
-    {
-    return iTotalSteps;
-    }
-
-// ---------------------------------------------------------------------------
-// From nested class CDevDiagExecResults::CResult.
-// This function takes ownership of a result object.
-// ---------------------------------------------------------------------------
-//
-void CDevDiagExecResults::CResult::SetResult(
-    CDiagResultsDatabaseItem* aResult,
-    TInt aError )
-    {
-    // Sanity check.
-    if ( iResult )
-        {
-        delete iResult;
-        }
-
-    // Set the result and error code Ownership of the result is transferred.
-    iResult = aResult;
-    iExecStatus = aError;
-    }
-
-// ---------------------------------------------------------------------------
-// From nested class CDevDiagExecResults::CResult.
-// Set the progress information for this result.
-// ---------------------------------------------------------------------------
-//
-void CDevDiagExecResults::CResult::SetProgress( TUint aCurrentStep,
-                                                TUint aTotalSteps )
-    {
-    iCurrentStep = aCurrentStep;
-    iTotalSteps = aTotalSteps;
-    }
-
-// ---------------------------------------------------------------------------
-// From nested class CDevDiagExecResults::CResult.
-// The default constructor.
-// ---------------------------------------------------------------------------
-//
-CDevDiagExecResults::CResult::CResult( const MDiagPlugin& aPlugin )
-:   iPlugin( aPlugin )
-    {
-    }
-
-// ---------------------------------------------------------------------------
-// From nested class CDevDiagExecResults::CResult.
-// The second phase constructor.
-// ---------------------------------------------------------------------------
-//
-void CDevDiagExecResults::CResult::ConstructL()
-    {
-    }
-
-
-// ============================ MEMBER FUNCTIONS =============================
-
-// ---------------------------------------------------------------------------
-// Static two-phase constructor.
-// ---------------------------------------------------------------------------
-//
-CDevDiagExecResults* CDevDiagExecResults::NewL(
-    TUid aRecordId,
-    CDiagPluginPool& aPluginPool,
-    RDiagResultsDatabase& aDbSession,
-    MDiagEngineCommon* aDiagEngine )
-    {
-    LOGSTRING3( "CDevDiagExecResults::NewL( %d, 0x%x )",
-                aRecordId.iUid,
-                aDiagEngine )
-
-    CDevDiagExecResults* self = CDevDiagExecResults::NewLC( aRecordId,
-                                                            aPluginPool,
-                                                            aDbSession,
-                                                            aDiagEngine );
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// ---------------------------------------------------------------------------
-// Static two-phase constructor.
-// ---------------------------------------------------------------------------
-//
-CDevDiagExecResults* CDevDiagExecResults::NewLC(
-    TUid aRecordId,
-    CDiagPluginPool& aPluginPool,
-    RDiagResultsDatabase& aDbSession,
-    MDiagEngineCommon* aDiagEngine )
-    {
-    LOGSTRING3( "CDevDiagExecResults::NewLC( %d, 0x%x )",
-                aRecordId.iUid,
-                aDiagEngine )
-
-    CDevDiagExecResults* self = new ( ELeave ) CDevDiagExecResults(
-        aRecordId,
-        aPluginPool,
-        aDbSession,
-        aDiagEngine );
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    return self;
-    }
-
-// ---------------------------------------------------------------------------
-// Destructor.
-// ---------------------------------------------------------------------------
-//
-CDevDiagExecResults::~CDevDiagExecResults()
-    {
-    LOGSTRING( "CDevDiagExecResults::~CDevDiagExecResults()" )
-    iResults.ResetAndDestroy();
-    }
-
-// ---------------------------------------------------------------------------
-// This function is called during live execution to transfer ownership of a
-// test result.
-// ---------------------------------------------------------------------------
-//
-void CDevDiagExecResults::AddEntryL( CDiagResultsDatabaseItem* aResult,
-                                     TInt aStatus )
-    {
-    LOGSTRING3( "CDevDiagExecResults::AddEntryL( 0x%x, %d )",
-                aResult,
-                aStatus )
-
-    // This is only valid for live executions.
-    if ( iType != ETypeExecution )
-        {
-        delete aResult;
-        User::Leave( KErrCompletion );
-        }
-
-    // Assign the result object to the corresponding item in the local array.
-    iResults[ CurrentIndexL() ]->SetResult( aResult, aStatus );
-
-    // Update the completed step counter.
-    if ( iResults[ CurrentIndexL() ]->Plugin().Type() ==
-        MDiagPlugin::ETypeTestPlugin )
-        {
-        iCompletedSteps += static_cast< const MDiagTestPlugin& >(
-            iResults[ CurrentIndexL() ]->Plugin() ).TotalSteps();
-        }
-    iCurrentPluginStep = 0;
-    }
-
-// ---------------------------------------------------------------------------
-// This function is called during live execution to transfer ownership of a
-// test result.
-// ---------------------------------------------------------------------------
-//
-void CDevDiagExecResults::SetProgressL( TUint aCurrentStep, TUint aTotalSteps )
-    {
-    LOGSTRING3( "CDevDiagExecResults::SetProgressL( %d, %d )",
-            aCurrentStep,
-            aTotalSteps )
-
-    // This is only valid for live executions.
-    if ( iType != ETypeExecution )
-        {
-        return;
-        }
-
-    // Assign the progress to the corresponding item in the local array.
-    iResults[ CurrentIndexL() ]->SetProgress( aCurrentStep, aTotalSteps );
-
-    // Update the current step counter.
-    if ( iResults[ CurrentIndexL() ]->Plugin().Type() ==
-        MDiagPlugin::ETypeTestPlugin )
-        {
-        iCurrentPluginStep = aCurrentStep;
-        }
-    else
-        {
-        iCurrentPluginStep = 0;
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// This function returns the corresponding results item from the local array.
-// ---------------------------------------------------------------------------
-//
-CDevDiagExecResults::CResult& CDevDiagExecResults::operator[] ( TInt aIndex )
-    {
-    return *iResults[ aIndex ];
-    }
-
-// ---------------------------------------------------------------------------
-// This function returns the corresponding results item from the local array.
-// ---------------------------------------------------------------------------
-//
-const CDevDiagExecResults::CResult& CDevDiagExecResults::operator[] (
-    TInt aIndex ) const
-    {
-    return *iResults[ aIndex ];
-    }
-
-// ---------------------------------------------------------------------------
-// This function returns the current item from the local array.  For results
-// which are from execution, this is the current execution item.  For results
-// which are from the database, this is always the last item.
-// ---------------------------------------------------------------------------
-//
-CDevDiagExecResults::CResult& CDevDiagExecResults::CurrentItemL()
-    {
-    return *iResults[ CurrentIndexL() ];
-    }
-
-// ---------------------------------------------------------------------------
-// This function returns the current item from the local array.  For results
-// which are from execution, this is the current execution item.  For results
-// which are from the database, this is always the last item.
-// ---------------------------------------------------------------------------
-//
-const CDevDiagExecResults::CResult& CDevDiagExecResults::CurrentItemL() const
-    {
-    return *iResults[ CurrentIndexL() ];
-    }
-
-// ---------------------------------------------------------------------------
-// This function returns the number of items in the local array.
-// ---------------------------------------------------------------------------
-//
-TInt CDevDiagExecResults::Count() const
-    {
-    return iResults.Count();
-    }
-
-// ---------------------------------------------------------------------------
-// This function returns the index of the currently-executing item.
-// ---------------------------------------------------------------------------
-//
-TUint CDevDiagExecResults::CurrentIndexL() const
-    {
-    // For live execution, the index from the execution plan is returned.
-    if ( iType == ETypeExecution )
-        {
-        TUint index = 0;
-        index = iDiagEngine->ExecutionPlanL().CurrentIndex();
-        return index;
-        }
-
-    // For logged test results, the last index is returned.
-    return iResults.Count() - 1;
-    }
-
-// ---------------------------------------------------------------------------
-// This utility function allows the result view to check if testing is
-// complete so that it can cancel the progress dialog.
-// ---------------------------------------------------------------------------
-//
-TBool CDevDiagExecResults::IsLastTestL() const
-    {
-    return ( CurrentIndexL() == ( Count() - 1 ) );
-    }
-
-// ---------------------------------------------------------------------------
-// This utility function checks to see if a test is being executed / was
-// executed as a dependency.
-// ---------------------------------------------------------------------------
-//
-TBool CDevDiagExecResults::IsDependencyL( TInt aIndex ) const
-    {
-    __ASSERT_ALWAYS( ( aIndex < Count() ), Panic( EPDApplicationGeneral ) );
-
-    // For live execution, get the information from the execution plan.
-    if ( iType == ETypeExecution )
-        {
-        TBool dependent = EFalse;
-        dependent = iDiagEngine->ExecutionPlanL()[ aIndex ].AsDependency();
-        return dependent;
-        }
-
-    // For logged test results, get the information from the test result.  The
-    // NULL check is needed in case the plugin failed during running and did
-    // not report a result.
-    if ( iResults[ aIndex ]->Result() )
-        {
-        return iResults[ aIndex ]->Result()->WasDependency();
-        }
-    else
-        {
-        return EFalse;
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// This function locks "execution" style results from further changes, by
-// changing the results type and clearing the reference to the engine.
-// ---------------------------------------------------------------------------
-//
-void CDevDiagExecResults::Finalize()
-    {
-    LOGSTRING( "CDevDiagExecResults::Finalize()" )
-
-    iDiagEngine = NULL;
-    iType = ETypeLog;
-    iCompletedSteps = iTotalSteps;
-    iCurrentPluginStep = 0;
-    }
-
-// ---------------------------------------------------------------------------
-// This function returns the total number of steps for all items in the
-// execution results.
-// ---------------------------------------------------------------------------
-//
-TInt CDevDiagExecResults::TotalExecutionSteps() const
-    {
-    return iTotalSteps;
-    }
-
-// ---------------------------------------------------------------------------
-// This function returns the current execution step based on all items in the
-// execution results.
-// ---------------------------------------------------------------------------
-//
-TInt CDevDiagExecResults::CurrentExecutionStep() const
-    {
-    return iCompletedSteps + iCurrentPluginStep;
-    }
-
-// ---------------------------------------------------------------------------
-// Gets information about the test log.
-// ---------------------------------------------------------------------------
-//
-void CDevDiagExecResults::GetSessionInformationL( TInt& aSessionNumber,
-                                                  TInt& aTimeInterval,
-                                                  TTime& aStartTime,
-                                                  TTime& aEndTime ) const
-    {
-    LOGSTRING( "CDevDiagExecResults::GetSessionInformationL()" )
-
-    // Get the time interval from the Central Repository.
-    CRepository* repository = CRepository::NewLC( KCRUidPhoneDoctor );
-    User::LeaveIfError( repository->Get( KPDAppMaxUseTime, aTimeInterval ) );
-    CleanupStack::PopAndDestroy( repository );
-
-    // Get the list of database records.
-    CDatabaseRecordInfoArray* oldRecords =
-        new ( ELeave ) CDatabaseRecordInfoArray( KRecordsArrayGranularity );
-    CleanupStack::PushL( oldRecords );
-    User::LeaveIfError( iDbSession.GetAllRecordInfos( *oldRecords ) );
-
-    // Get the current DRM time.
-    TTime currentTime( TInt64( 0 ) );
-    DRM::CDrmServiceApi* drmApi = DRM::CDrmServiceApi::NewLC();
-    TInt timeZone = 0;
-    DRMClock::ESecurityLevel secLevel = DRMClock::KInsecure;
-    User::LeaveIfError( drmApi->GetSecureTime( currentTime,
-                                               timeZone,
-                                               secLevel ) );
-    CleanupStack::PopAndDestroy( drmApi );
-
-    // Go through the records list.
-    aSessionNumber = 0;
-    for ( TInt i = 0; i < oldRecords->Count(); i++ )
-        {
-        TDiagResultsDatabaseTestRecordInfo record = (*oldRecords)[ i ];
-
-        // If this record matches the one we have execution results for, store
-        // its start and end time.
-        if ( record.iRecordId == iRecordId )
-            {
-            aStartTime = record.iStartTime;
-            aEndTime = record.iFinishTime;
-            }
-
-        // Check the time interval that this record occured in.
-        TTimeIntervalSeconds timeDifference( 0 );
-        currentTime.SecondsFrom( record.iDrmStartTime, timeDifference );
-        if ( timeDifference.Int() <= aTimeInterval )
-            {
-            aSessionNumber++;
-            }
-        }
-
-    // Free the records information.
-    CleanupStack::PopAndDestroy( oldRecords );
-    }
-
-// ---------------------------------------------------------------------------
-// The default constructor.
-// ---------------------------------------------------------------------------
-//
-CDevDiagExecResults::CDevDiagExecResults( TUid aRecordId,
-                                          CDiagPluginPool& aPluginPool,
-                                          RDiagResultsDatabase& aDbSession,
-                                          MDiagEngineCommon* aDiagEngine )
-:   iRecordId( aRecordId ),
-    iPluginPool( aPluginPool ),
-    iDbSession( aDbSession ),
-    iDiagEngine( aDiagEngine )
-    {
-    LOGSTRING3( "CDevDiagExecResults::CDevDiagExecResults( %d, 0x%x )",
-                aRecordId.iUid,
-                aDiagEngine )
-
-    }
-
-// ---------------------------------------------------------------------------
-// The second phase constructor.
-// ---------------------------------------------------------------------------
-//
-void CDevDiagExecResults::ConstructL()
-    {
-    LOGSTRING( "CDevDiagExecResults::ConstructL()" )
-
-    // There are two types of results: (1) Current Execution, and (2) Logs.
-
-    // (1) If a pointer to the diagnostics engine was provided, then it is
-    // assumed that the results are from a live execution and this object will
-    // wait for the results to be assigned .
-    if ( iDiagEngine )
-        {
-        // This is the "current execution" type.
-        iType = ETypeExecution;
-        const MDiagPluginExecPlan& execPlan = iDiagEngine->ExecutionPlanL();
-
-        // Add an entry for every item in the plan.
-        TUint numItems = execPlan.Count();
-        for ( TUint i = 0; i < numItems; i++ )
-            {
-            CResult* result = CResult::NewLC( execPlan[i].Plugin() );
-            iResults.AppendL( result );
-            CleanupStack::Pop( result );
-
-            // Update the total step counter with this plugin's information.
-            if ( execPlan[i].Plugin().Type() == MDiagPlugin::ETypeTestPlugin )
-                {
-                iTotalSteps += static_cast< const MDiagTestPlugin& >(
-                    execPlan[i].Plugin() ).TotalSteps();
-                }
-            }
-        }
-    // (2) If no pointer to the diagnostics engine was provided, then all the
-    // results which correspond to the record id will be looked up from the
-    // results database.
-    else
-        {
-        // This is the "logged" type.
-        iType = ETypeLog;
-
-        // Get the record's results from the database.
-        RDiagResultsDatabaseRecord dbRecord;
-        User::LeaveIfError( dbRecord.Connect( iDbSession, iRecordId ) );
-        CleanupClosePushL( dbRecord );
-        RPointerArray< CDiagResultsDatabaseItem > logResults;
-        CleanupClosePushL( logResults );
-        User::LeaveIfError( dbRecord.GetTestResults( logResults ) );
-
-        // Add an entry for each result item.
-        TUint numItems = logResults.Count();
-        for ( TUint i = 0; i < numItems; i++ )
-            {
-            MDiagPlugin* plugin = NULL;
-            TInt err = iPluginPool.FindPlugin( logResults[i]->TestUid(),
-                                               plugin );
-
-            // If a matching plugin was not found for this result, we just
-            // skip over it, because we can't do anything useful with it.
-            // This case should only occur if a plugin logged results
-            // previously, but was later removed from the phone.
-            if ( err != KErrNone )
-                {
-                continue; //lint !e960 A continue makes sense here.
-                }
-
-            CResult* result = CResult::NewLC( *plugin );
-
-            // Ownership of the results item is transferred.
-            result->SetResult( logResults[i], KErrNone );
-            logResults[i] = NULL;
-
-            iResults.AppendL( result );
-            CleanupStack::Pop( result );
-            }
-
-        CleanupStack::Pop(); // logResults
-        CleanupStack::PopAndDestroy(); // dbRecord
-        logResults.ResetAndDestroy();
-
-        // Set dummy numbers for the execution steps.
-        iTotalSteps = 1;
-        iCompletedSteps = 1;
-        }
-    }
-
-// End of File
--- a/devicediagnostics/devdiagapp/src/devdiagplugincontainer.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,683 +0,0 @@
-/*
-* Copyright (c) 2007-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: Implementation of diagnostics components
-*
-*/
-
-
-// INCLUDE FILES
-
-#include "devdiagplugincontainer.h"
-#include "devdiagengine.h"   
-#include "devdiag.pan" 
-#include "devdiagutil.h" //Time conversion functions
-
-#include <DiagFrameworkDebug.h>   
-#include <devdiagapp.rsg>
-#include <DiagPlugin.h>  
-#include <DiagPluginPool.h> 
-#include <DiagSuitePlugin.h>   
-#include <DiagResultsDatabaseItem.h>
-#include <eikclbd.h>                // CColumnListBoxData
-#include <aknmessagequerydialog.h> 
-#include <data_caging_path_literals.hrh>
-#include <aknPopup.h>		// popup dialogs
-#include <StringLoader.h>
-#include <AknQueryDialog.h>
-#include <textresolver.h>
-#include <AknIconArray.h>
-#include <AknsUtils.h>
-#include <featmgr.h>
-#include <AknWaitDialog.h> 
-#include <devdiagapp.mbg>
-
-
-#include <AknsUtils.h>
-///@@@KSR: changes for BAD Warnings - #177-D: variable "KDiagSpace" was declared but never referenced
-//_LIT( KDiagSpace, " " );
-_LIT( KListTestElementFormatDouble,  "%d\t%S\t%S" );
-_LIT( KDevDiagAppIconFileName, "\\resource\\apps\\devdiagapp.mif");
-
-const TInt KLastResultTextLength(256);
-const TInt KIconArrayGranularity(20);
-
-//INCORRECT!
-const MDiagPlugin::TNameLayoutType KLayoutType( MDiagPlugin::ENameLayoutListSingle );
-
-
-// ========================== MEMBER FUNCTIONS =================================
-
-// -----------------------------------------------------------------------------
-// CDevDiagPluginContainer::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CDevDiagPluginContainer* CDevDiagPluginContainer::NewL( CDevDiagPluginView* aView,
-                                                         CDevDiagEngine& aEngine,
-                                                const TRect&    aRect )
-    {
-    CDevDiagPluginContainer* self = new( ELeave ) 
-                                     CDevDiagPluginContainer( aView, aEngine );
-    
-    CleanupStack::PushL( self );
-    self->ConstructL( aRect );
-    CleanupStack::Pop();
-
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// CDevDiagPluginContainer::CDevDiagPluginContainer
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CDevDiagPluginContainer::CDevDiagPluginContainer( CDevDiagPluginView* aView,
-                                                    CDevDiagEngine& aEngine )
-    : iView( aView ), iEngine(aEngine), iModelUpdated( EFalse )
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// CDevDiagPluginContainer::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CDevDiagPluginContainer::ConstructL( const TRect& aRect )
-    {
-    LOGSTRING( "CDevDiagPluginContainer::ConstructL" );
-    CreateWindowL();
-
-	iListBox = new ( ELeave ) CAknDoubleLargeStyleListBox;
-	
-	iListBox->SetContainerWindowL( *this );
-	iListBox->ConstructL( this, EAknListBoxSelectionList );
-
-	iListBox->CreateScrollBarFrameL( ETrue );
-	iListBox->ScrollBarFrame()->SetScrollBarVisibilityL( 
-	                                            CEikScrollBarFrame::EOff,
-	                                            CEikScrollBarFrame::EAuto );
-                	
-    AddIconsL();
-
-	iListBox->UpdateScrollBarsL();
-	//iListBox->ScrollBarFrame()->MoveVertThumbTo( 0 );		
-
-	iListBox->SetListBoxObserver( this );
-			
-    SetRect( aRect );
-    ActivateL();    
-    }
-
-// -----------------------------------------------------------------------------
-// CDevDiagPluginContainer::~CDevDiagPluginContainer
-// -----------------------------------------------------------------------------
-//
-CDevDiagPluginContainer::~CDevDiagPluginContainer()
-    {
-    delete iListBox;
-        
-    //Do not call ResetAndDestroy, because plug-ins are not owned.
-    iChildren.Close();
-    }
-    
-// -----------------------------------------------------------------------------
-// CDevDiagPluginContainer::SizeChanged
-// -----------------------------------------------------------------------------
-//
-void CDevDiagPluginContainer::SizeChanged()
-    {
-    iListBox->SetRect( Rect() );    // Mandatory, otherwise not drawn
-    }
-
-// -----------------------------------------------------------------------------
-// CDevDiagPluginContainer::HandleResourceChange
-// -----------------------------------------------------------------------------
-//
-void CDevDiagPluginContainer::HandleResourceChange( TInt aType )
-    {    
-    CCoeControl::HandleResourceChange( aType );
-    
-    //Handle change in layout orientation
-    if ( aType == KEikDynamicLayoutVariantSwitch || 
-         aType == KAknsMessageSkinChange )
-        {
-        if ( aType == KAknsMessageSkinChange )
-        	{
-        	// Skin changed; we'll have to reload the icon array
-            CArrayPtr<CGulIcon>* iconArray =
-                iListBox->ItemDrawer()->FormattedCellData()->IconArray();
-            if ( iconArray )
-                {
-    	        iconArray->ResetAndDestroy();
-	            delete iconArray;
-	            iconArray = NULL;
-    	        }
-    	    TRAP_IGNORE( AddIconsL() );
-        	}
-
-        TRect mainPaneRect;
-        AknLayoutUtils::LayoutMetricsRect( AknLayoutUtils::EMainPane, mainPaneRect );
-        SetRect( mainPaneRect );
-		DrawDeferred();
-		}	
-    }
-
-// -----------------------------------------------------------------------------
-// CDevDiagPluginContainer::CountComponentControls
-// -----------------------------------------------------------------------------
-//
-TInt CDevDiagPluginContainer::CountComponentControls() const
-    {
-    TInt retval( 0 );
-    if ( iListBox )
-        {
-        retval = 1;
-        }
-    return retval; // return nbr of controls inside this container
-    }
-
-// -----------------------------------------------------------------------------
-// CDevDiagPluginContainer::ComponentControl
-// -----------------------------------------------------------------------------
-//
-CCoeControl* CDevDiagPluginContainer::ComponentControl( TInt aIndex ) const
-    {
-    switch ( aIndex )
-        {
-        case 0:
-            {
-            return iListBox;
-            }
-        default:
-            {
-            return NULL;
-            }
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// CDevDiagPluginContainer::Draw
-// -----------------------------------------------------------------------------
-//
-void CDevDiagPluginContainer::Draw( const TRect& /* aRect */ ) const
-    {
-    }
-
-
-// -----------------------------------------------------------------------------
-// CDevDiagPluginContainer::HandleControlEventL
-// -----------------------------------------------------------------------------
-//
-
-void CDevDiagPluginContainer::HandleControlEventL( CCoeControl* /* aControl */,
-                                                TCoeEvent /* aEventType */ )
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// CDevDiagPluginContainer::OfferKeyEventL
-// -----------------------------------------------------------------------------
-//
-
-TKeyResponse CDevDiagPluginContainer::OfferKeyEventL( const TKeyEvent& aKeyEvent,
-                                                             TEventCode aType )
-	{
-
-	if ( iListBox && aType == EEventKey )
-		{
-		switch ( aKeyEvent.iCode )
-			{
-			case EStdKeyHome:
-				{
-			
-			    break;
-           
-				}
-				
-			case EKeyEscape:
-				{
-			
-				iAvkonAppUi->ProcessCommandL( EEikCmdExit );
-				
-		    	break;
-				}
-			case EKeyUpArrow:
-			case EKeyDownArrow:
-			    {
-			    TKeyResponse retVal =
-			        iListBox->OfferKeyEventL( aKeyEvent, aType );
-                return retVal;
-			    }
-			case EKeyLeftArrow:
-			case EKeyRightArrow:
-			    {
-			    break;  // AppUi handles the tab changes
-			    }
-			default:
-			    {
-			    return iListBox->OfferKeyEventL( aKeyEvent, aType );
-			    }
-			}
-		}
-	
-	return EKeyWasNotConsumed;
-	}
-
-
-
-
-// -----------------------------------------------------------------------------
-// CDevDiagPluginContainer::HandleListBoxEventL
-// -----------------------------------------------------------------------------
-//
-void CDevDiagPluginContainer::HandleListBoxEventL( CEikListBox* /*aListBox*/, 
-                                                 TListBoxEvent aEventType )
-	{	
-	// if the Select Key has been pressed
-	if ((aEventType == MEikListBoxObserver::EEventEnterKeyPressed) ||
-	(aEventType == MEikListBoxObserver::EEventItemClicked))
-		{ 
-		
-		}
-	}
-	
-#ifdef __SERIES60_HELP
-// -----------------------------------------------------------------------------
-// CDevDiagPluginContainer::GetHelpContext
-// -----------------------------------------------------------------------------
-//
-void CDevDiagPluginContainer::GetHelpContext( TCoeHelpContext& /*aContext */ ) const
-	{	
-	//aContext.iMajor = KUidSmlSyncApp;
-    //aContext.iContext = KDM_HLP_DIAGNOSTICS_APPLICATION;
-	}
-
-#else
-
-// -----------------------------------------------------------------------------
-// CDevDiagPluginContainer::GetHelpContext
-// -----------------------------------------------------------------------------
-//
-void CDevDiagPluginContainer::GetHelpContext( TCoeHelpContext& /*aContext*/ ) const
-	{
-	}
-#endif // __SERIES60_HELP
-
-// -----------------------------------------------------------------------------
-// CDevDiagPluginContainer::FocusChanged
-// -----------------------------------------------------------------------------
-//
-void CDevDiagPluginContainer::FocusChanged( TDrawNow /*aDrawNow*/ )
-	{
-	if ( iListBox )
-		{
-		iListBox->SetFocus( IsFocused() );
-		}
-	}
-
-
-// -----------------------------------------------------------------------------
-// Change text of the focused item into "Testing ..."
-// -----------------------------------------------------------------------------
-//
-void CDevDiagPluginContainer::DisplayStartTestingL()
-    {
-    LOGSTRING( "CDevDiagPluginContainer::DisplayStartTestingL" ); 
-    __ASSERT_ALWAYS( iModelUpdated, 
-                     Panic( EDevDiagListboxModelNotUpdated ) ); 
-    
-    // Add listbox items.
-    CDesCArray* pluginTextArray = static_cast< CDesCArray* >(
-        iListBox->Model()->ItemTextArray() );
-    
-    __ASSERT_ALWAYS( pluginTextArray->Count() == iChildren.Count(), 
-                     Panic( EDevDiagListboxContainerModel ) );
-    
-    MDiagPlugin* plugin;
-    HBufC* formattedName = NULL;
-    
-    SelectedPlugin ( plugin );
-    
-    HBufC* name = plugin->GetPluginNameL( KLayoutType );
-    CleanupStack::PushL( name );      
-     
-    HBufC* testingText = StringLoader::LoadL( R_DIAG_LST_TEST_ONGOING );
-    CleanupStack::PushL ( testingText );
-     
-    formattedName = HBufC::NewLC( name->Length() + 
-                                  KListTestElementFormatDouble().Length() + 
-                                  testingText->Length() );
-    formattedName->Des().Format( KListTestElementFormatDouble(), 0, name, testingText );
-
-    TInt index = iListBox->CurrentItemIndex();           
-    pluginTextArray->Delete( index );
-    
-    pluginTextArray->InsertL( index, *formattedName  );    
-    
-    CleanupStack::PopAndDestroy( formattedName );
-    CleanupStack::PopAndDestroy( testingText );         
-    CleanupStack::PopAndDestroy( name );
-        
-    iListBox->SetFocus( ETrue );
-    iListBox->HandleItemAdditionL();
-    iListBox->ItemDrawer()->ColumnData()->EnableMarqueeL( ETrue );
-    iListBox->DrawDeferred();
-    }
- 
-// -----------------------------------------------------------------------------
-// Move "Testing ..." one step lower. This is needed when a group of plug-ins
-// are executed.
-// -----------------------------------------------------------------------------
-//
- void CDevDiagPluginContainer::MoveStartTestingDownL()
-    {
-    if ( iListBox->CurrentItemIndex() + 1 < iChildren.Count() )
-        {
-        iListBox->SetCurrentItemIndex ( iListBox->CurrentItemIndex() +1 );
-        DisplayStartTestingL();
-        }   
-    }
-
-
-// -----------------------------------------------------------------------------
-// Set focus at the beginning of the listbox.
-// -----------------------------------------------------------------------------
-//
-void CDevDiagPluginContainer::ResetL()
-    {
-    iListBox->SetCurrentItemIndexAndDraw  ( 0 );
-    }
-
-
-// -----------------------------------------------------------------------------
-// Create the plug-in model.
-// The function needs to know the parent uid and its children are loaded.
-// -----------------------------------------------------------------------------
-// 
-void CDevDiagPluginContainer::UpdateModelL( TUid aParentSuiteUid )    
-    {
-    LOGSTRING( "CDevDiagPluginContainer::UpdateModelL" );         
-    MDiagPlugin* plugin;
-    if ( iEngine.PluginPool().FindPlugin( aParentSuiteUid, plugin ) == KErrNone )
-        {
-        iChildren.Reset(); //plug-ins are owned by the engine.
-       
-        MDiagSuitePlugin* suite = static_cast< MDiagSuitePlugin* >( plugin );
-        suite->GetChildrenL( iChildren, MDiagSuitePlugin::ESortByPosition );
-        
-        iModelUpdated = ETrue;
-        }
-    else
-        {
-        Panic( EDevDiagListboxFindPluginFailure );
-        }
-    }
-    
-
-// -----------------------------------------------------------------------------
-// The plug-in execution was not performed. Display the text on the listbox.
-// -----------------------------------------------------------------------------
-//    
-void CDevDiagPluginContainer::DisplayNotPerformedL( CDesCArray& aListboxModel, 
-                                                    MDiagPlugin*& aPlugin )    
-    {    
-    LOGSTRING( "CDevDiagPluginContainer::DisplayNotPerformedL" );                    
-    HBufC* name = aPlugin->GetPluginNameL( KLayoutType );
-                
-    CleanupStack::PushL( name );
-    
-    HBufC* result = GetPluginResultL( ENotPerformed );    
-    CleanupStack::PushL( result );
-            
-    HBufC* formattedName = HBufC::NewLC( name->Length() + 
-                                  result->Length() +
-                                  KListTestElementFormatDouble().Length() );
-    formattedName->Des().Format( KListTestElementFormatDouble(), 0, name, result);
-            
-    aListboxModel.AppendL( *formattedName );
-            
-    CleanupStack::PopAndDestroy( formattedName );
-    CleanupStack::PopAndDestroy( result );
-    
-    CleanupStack::PopAndDestroy( name );         
-    }
-    
-
-// -----------------------------------------------------------------------------
-// Display icon and test result for the plug-in.
-// -----------------------------------------------------------------------------
-//
-void CDevDiagPluginContainer::DisplayLastResultL( CDesCArray& aListboxModel,
-                                                  MDiagPlugin*& aPlugin,
-                                                  CDiagResultsDatabaseItem& aItem )    
-    {   
-    LOGSTRING( "CDevDiagPluginContainer::DisplayLastResultL" );                    
-    
-    HBufC* name = aPlugin->GetPluginNameL( KLayoutType );
-    CleanupStack::PushL( name );           
-            
-    TBuf<KLastResultTextLength> execTime;
-                                
-    TTime started = aItem.TimeStarted();
-            
-    if ( TDevDiagUtil::IsToday(started))
-        {
-        TDevDiagUtil::GetTimeTextL( execTime, started );
-        LOGTEXT( execTime );
-        }
-    else 
-        {
-        TDevDiagUtil::GetDateTextL( execTime, started );
-        LOGTEXT( execTime );
-        }
-      
-    TInt iconIndex = -1;  
-    
-    HBufC* result = ConvertResultLC( execTime, iconIndex, &aItem );          
-                                                                                                    
-    HBufC* formattedName = HBufC::NewLC( name->Length() + 
-                                  result->Length() +
-                                  KListTestElementFormatDouble().Length());
-                                 
-    // Format icon index, then the name of the plug-in and then time.                                  
-    formattedName->Des().Format( KListTestElementFormatDouble(), 
-                                 iconIndex, 
-                                 name, 
-                                 result);    
-                
-    aListboxModel.AppendL( *formattedName );
-                        
-    CleanupStack::PopAndDestroy( formattedName );
-    CleanupStack::PopAndDestroy( result );
-    CleanupStack::PopAndDestroy( name );                
-    }
-    
-
-// -----------------------------------------------------------------------------
-// Refresh the listbox with last results.
-// -----------------------------------------------------------------------------
-//    
-void CDevDiagPluginContainer::DisplayChildrenWithResultsL(
-                        RPointerArray<CDiagResultsDatabaseItem>& aArray )
-    {
-    LOGSTRING( "CDevDiagPluginContainer::DisplayChildrenWithResultsL" );
-    
-    __ASSERT_ALWAYS( iModelUpdated, 
-                     Panic( EDevDiagListboxModelNotUpdated ) ); 
-                   
-    // arrays must match                     
-    __ASSERT_ALWAYS( aArray.Count() == iChildren.Count(), 
-                     Panic( EDevDiagContainerArrayMismatch ) );                      
-    
-    iListBox->Model()->SetOwnershipType( ELbmOwnsItemArray );
-
-    // Add listbox items.
-    CDesCArray* pluginTextArray = static_cast< CDesCArray* >(
-        iListBox->Model()->ItemTextArray() );
-    pluginTextArray->Reset();
-         
-    // Go through the last result list         
-    for (TInt i = 0; i < aArray.Count(); ++i)
-        {                             
-        if ( !aArray[i] ) //Item has not been performed (last result not found)
-            {
-            LOGSTRING2("Item number: %d was null", i );                            
-            DisplayNotPerformedL( *pluginTextArray, iChildren[i] );                                   
-            }
-        else  //last result found, display a test result
-            {   
-            LOGSTRING2("Result found: %d", i );                 
-            DisplayLastResultL( *pluginTextArray, iChildren[i], *aArray[i] );                                        
-            }
-        }   
-        
-    iListBox->SetFocus( ETrue );
-    iListBox->HandleItemAdditionL();
-    iListBox->ItemDrawer()->ColumnData()->EnableMarqueeL( ETrue );
-    iListBox->DrawDeferred();
-    
-    LOGSTRING( "CDevDiagPluginContainer::DisplayChildrenWithResultsL end" );
-    }
-
-
-// -----------------------------------------------------------------------------
-// Get localised test result text.
-// -----------------------------------------------------------------------------
-// 
-HBufC* CDevDiagPluginContainer::GetPluginResultL( TContainerResult aResult ) const
-    {
-    LOGSTRING( "CDevDiagPluginContainer::GetPluginResultL" );
-    
-    switch ( aResult  )
-        {
-        case ESuccess:
-            return StringLoader::LoadL( R_DIAG_LST_TEST_PASS  );
-
-        case EFailed:
-            return StringLoader::LoadL ( R_DIAG_LST_TEST_FAILED  );
-
-        case ENotPerformed:
-            return StringLoader::LoadL( R_DIAG_LIST_NOT_PERFORMED  );
-
-        default:
-            Panic( EDevDiagApplicationInvalidResultIndex );            
-        }
-        
-    return NULL;    
-    }
-
-
-// -----------------------------------------------------------------------------
-// Get localised test result text and the icon array
-// -----------------------------------------------------------------------------
-// 
-HBufC* CDevDiagPluginContainer::ConvertResultLC( const TDesC& aString, 
-                                                TInt& aIconIndex, 
-                                                CDiagResultsDatabaseItem* aResult ) const
-    {
-    LOGSTRING( "CDevDiagPluginContainer::ConvertResultL" );
-    if ( !aResult )
-        {
-        return StringLoader::LoadLC( R_DIAG_LIST_NOT_PERFORMED  );
-        }
-    
-    switch ( aResult->TestResult() )
-        {
-        case CDiagResultsDatabaseItem::ESuccess:
-            aIconIndex = 1;
-            return StringLoader::LoadLC( R_DIAG_LST_TEST_PASS, aString );
-
-        case CDiagResultsDatabaseItem::EFailed:
-            aIconIndex = 2;
-            return StringLoader::LoadLC ( R_DIAG_LST_TEST_FAILED, aString );      
-        case CDiagResultsDatabaseItem::ESkipped:
-        case CDiagResultsDatabaseItem::ECancelled:
-        case CDiagResultsDatabaseItem::EQueuedToRun:
-            {
-            return StringLoader::LoadLC( R_DIAG_LIST_NOT_PERFORMED  );
-            }
-
-        default:
-            LOGSTRING2("PANIC: Results item had a result: %d ", aResult->TestResult() );
-            Panic( EDevDiagApplicationInvalidResultIndex );            
-        }
-        
-    return NULL;
-    }
-
-void CDevDiagPluginContainer::SelectedPlugin(MDiagPlugin*& aPlugin)
-    {
-    LOGSTRING( "CDevDiagPluginContainer::SelectedPluginL" );
-    aPlugin = iChildren[ iListBox->CurrentItemIndex() ];
-    }
-
-// -----------------------------------------------------------------------------
-// Load icons. 
-//
-// Icons are:
-// Not performed
-// Passed
-// Failed
-// -----------------------------------------------------------------------------
-//
-void CDevDiagPluginContainer::AddIconsL()
-    {   
-    LOGSTRING( "CDevDiagPluginContainer::AddIconsL" );        
-	CArrayPtr<CGulIcon>* icons = new (ELeave) CArrayPtrFlat<CGulIcon>
-	                                                (KIconArrayGranularity);
-	                                                
-	iListBox->ItemDrawer()->FormattedCellData()->SetIconArray( icons );
-    
-	CFbsBitmap* bitmap = NULL;
-    CFbsBitmap* mask = NULL;
-        
-    LOGSTRING( "CDevDiagPluginContainer::AddIconsL 1" ); 
-        
-    AknIconUtils::CreateIconL(
-        bitmap,
-        mask,
-        KDevDiagAppIconFileName(),
-        EMbmDevdiagappQgn_prop_cp_diag_not,
-        EMbmDevdiagappQgn_prop_cp_diag_not_mask );
-
-    icons->AppendL( CGulIcon::NewL( bitmap, mask ));
-    
-    LOGSTRING( "CDevDiagPluginContainer::AddIconsL 2" ); 
-    
-    AknIconUtils::CreateIconL(
-        bitmap,
-        mask,
-        KDevDiagAppIconFileName(),
-        EMbmDevdiagappQgn_prop_cp_diag_pass,
-        EMbmDevdiagappQgn_prop_cp_diag_pass_mask );
-    
-    LOGSTRING( "CDevDiagPluginContainer::AddIconsL 3" );     
-
-    icons->AppendL( CGulIcon::NewL( bitmap, mask ));
-    
-    AknIconUtils::CreateIconL(
-        bitmap,
-        mask,
-        KDevDiagAppIconFileName(),
-        EMbmDevdiagappQgn_prop_cp_diag_fail,
-        EMbmDevdiagappQgn_prop_cp_diag_fail_mask );
-
-	// Create the icon.
-    icons->AppendL( CGulIcon::NewL( bitmap, mask ));
-    
-    LOGSTRING( "CDevDiagPluginContainer::AddIconsL end" );            
-    }
-
-// End of File
--- a/devicediagnostics/devdiagapp/src/devdiagpluginview.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,686 +0,0 @@
-/*
-* 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:  Plug-in view
-*
-*/
-
-
-// INCLUDE FILES
-
-#include "devdiagapp.hrh"
-#include "devdiagplugincontainer.h"
-#include "devdiagengine.h"
-#include "devdiagpluginview.h"
-#include "devdiagdef.h"
-#include "devdiag.pan"
-#include "devdiagexecutionresults.h" 
-
-#include <DiagPlugin.h> 
-#include <devdiagapp.rsg> //resources
-#include <AknQueryDialog.h>
-#include <aknradiobuttonsettingpage.h>
-#include <aknViewAppUi.h>
-#include <featmgr.h>
-#include <StringLoader.h>
-#include <bautils.h>
-#include <coeaui.h>
-#include <eikfrlbd.h>
-#include <gulicon.h>
-#include <hlplch.h>             // For HlpLauncher
-#include <akntitle.h> 
-#include <aknmessagequerydialog.h> 
-#include <aknnotewrappers.h> 
-#include <DiagFrameworkDebug.h>         // Debug Logger
-#include <DiagResultsDatabaseItem.h> 
-
-// EXTERNAL DATA STRUCTURES
-
-// EXTERNAL FUNCTION PROTOTYPES
-
-// CONSTANTS
-
-// MACROS
-
-// LOCAL CONSTANTS AND MACROS
-_LIT(KLinefeed, "\n");
-_LIT(KTabfeed, "\t");
-const TInt KFailedTestsMaxLength(1024);
-
-// MODULE DATA STRUCTURES
-
-// LOCAL FUNCTION PROTOTYPES
-
-// FORWARD DECLARATIONS
-
-// ============================= LOCAL FUNCTIONS ==============================
-
-// ========================= MEMBER FUNCTIONS ================================
-
-// ----------------------------------------------------------------------------
-// CDevDiagPluginView::CDevDiagPluginView()
-//
-// Constructor
-// ----------------------------------------------------------------------------
-//
-CDevDiagPluginView::CDevDiagPluginView( CDevDiagEngine& aEngine, TUid aParentSuiteUid ):
-    iContainer(NULL), iEngine(aEngine), iParentSuiteUid( aParentSuiteUid )
-    {
-    }
-
-
-// ---------------------------------------------------------------------------
-// CDevDiagPluginView::NewL()
-//
-// Symbian OS default constructor
-// ---------------------------------------------------------------------------
-CDevDiagPluginView* CDevDiagPluginView::NewL( CDevDiagEngine& aEngine, 
-                                              TUid aParentSuiteUid )
-    {
-    LOGSTRING("CDevDiagPluginView* CDevDiagPluginView::NewL");
-    CDevDiagPluginView* self = new( ELeave ) 
-                     CDevDiagPluginView ( aEngine, aParentSuiteUid );
-
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop();
-
-    return self;
-    }
-
-// ---------------------------------------------------------------------------
-// CDevDiagPluginView::ConstructL()
-//
-// Symbian OS two-phased constructor
-// ---------------------------------------------------------------------------
-void CDevDiagPluginView::ConstructL()
-    {
-    if ( iParentSuiteUid == KDDHardwareSuiteUid )
-        {
-        BaseConstructL( R_DD_HW_PLUGIN_VIEW );
-        ChangeTitleL( R_DIAG_TITLE_HARDWARE ); 
-        }
-    else if ( iParentSuiteUid == KDDConnectivitySuiteUid )   
-        {
-        BaseConstructL( R_DD_CONNECTIVITY_PLUGIN_VIEW );
-        ChangeTitleL( R_DIAG_TITLE_CONNECTIVITY );
-        }
-     else if ( iParentSuiteUid == KDDServicesSuiteUid )   
-        {
-        BaseConstructL( R_DD_SERVICE_PLUGIN_VIEW );
-        ChangeTitleL( R_DIAG_TITLE_SERVICE );
-        }
-     else if ( iParentSuiteUid == KDDCoverageSuiteUid)   
-        {
-        BaseConstructL( R_DD_COVERAGE_PLUGIN_VIEW );
-        ChangeTitleL( R_DIAG_TITLE_COVERAGE );
-        }
-     else
-        {
-        Panic( EDDApplicationUnknownSuite );
-        }   
-         
-    }
-
-
-// ----------------------------------------------------------------------------
-// CDevDiagPluginView::~CDevDiagPluginView
-//
-// Destructor
-// ----------------------------------------------------------------------------
-CDevDiagPluginView::~CDevDiagPluginView()
-    {
-
-    if ( iContainer )
-        {
-        delete iContainer;
-        }
-      
-    }
-
-
-// ---------------------------------------------------------------------------
-// TUid CDevDiagPluginView::Id()
-//
-// Returns view's ID.
-// ---------------------------------------------------------------------------
-TUid CDevDiagPluginView::Id() const
-    {
-    return KDDPluginViewId;
-    }
-
-
-// ---------------------------------------------------------------------------
-// Set context menu bar according to the suite.
-// ---------------------------------------------------------------------------
-void CDevDiagPluginView::SetContextMenu() 
-    {
-    if ( iParentSuiteUid == KDDHardwareSuiteUid )
-        {
-   
-        MenuBar()->SetContextMenuTitleResourceId( R_DD_HW_CONTEXT_MENUBAR );
-        }
-    else if ( iParentSuiteUid == KDDConnectivitySuiteUid )   
-        {
-        MenuBar()->SetContextMenuTitleResourceId( R_DD_CONNECTIVITY_CONTEXT_MENUBAR );
-        }
-    else if ( iParentSuiteUid == KDDServicesSuiteUid )   
-        {
-        MenuBar()->SetContextMenuTitleResourceId( R_DD_SERVICE_CONTEXT_MENUBAR );
-        }
-    else if ( iParentSuiteUid == KDDCoverageSuiteUid)   
-        {
-        MenuBar()->SetContextMenuTitleResourceId( R_DD_COVERAGE_CONTEXT_MENUBAR );
-        }
-    else
-        {
-        Panic( EDDApplicationUnknownSuite );
-        }   
-    }
-// ---------------------------------------------------------------------------
-// CDevDiagPluginView::HandleCommandL(TInt aCommand)
-//
-// Handles commands directed to this class.
-// ---------------------------------------------------------------------------
-void CDevDiagPluginView::HandleCommandL( TInt aCommand )
-    {
-    LOGSTRING("CDevDiagPluginView::HandleCommandL");
-    switch ( aCommand )
-        {
-
-        case EDDCmdPerformSingle:
-            {
-            // State == EStateReady then run tests
-            if (iEngine.GetState()== 2)   
-	            {        
-					LOGSTRING("iState == EStateReady");
-		            iContainer->DisplayStartTestingL();
-		            
-		            MDiagPlugin* plugin = NULL;
-		            iContainer->SelectedPlugin(plugin);
-		       
-		            iEngine.ExecuteTestL( plugin->Uid(), *AppUi() );
-	            }
-	        else
-                {
-                LOGSTRING2("PluginView::iEngine::iState = %d ", iEngine.GetState());
-                LOGSTRING ("Trying to Execute Plugin @ Invalid State");
-                }
-            break;
-            }
-
-        case EAknSoftkeyBack:
-            {
-            if (iEngine.GetState()== 2)
-              {
-            LOGSTRING("Before Activate Local View for Back");
-            
-            AppUi()->ActivateLocalViewL( KDDMainViewId );
-            
-            LOGSTRING("After Activate Local View for Back");
-	            
-              }
-            
-			else
-			  {
-				LOGSTRING2("PluginView::iEngine::iState = %d ", iEngine.GetState());
-				LOGSTRING ("Trying to issue Back @ Invalid State");
-			  }
-            break;
-            }
-            
-        case EDDMenuCmdMainHelp:
-        	{
-        		MessageQueryDialogLaunchL( 
-                                R_MESSAGE_QUERY_HELP_NOTE );
-        		break;
-        	}
-            
-        case EAknCmdHelp:
-            {
-                                    
-      
-            if( FeatureManager::FeatureSupported( KFeatureIdHelp ) )
-                {
-                HlpLauncher::LaunchHelpApplicationL( iEikonEnv->WsSession(), 
-                                                AppUi()->AppHelpContextL() );
-                }
-                
-            break;
-            }
-            
-        case EDDCmdPerformAllHwTests:
-            {                        
-            //ask confirmation from the user
-            TBool ok = MessageQueryDialogLaunchL( 
-                                R_MESSAGE_QUERY_PERFORM_ALL_HW_TESTS );                                            
-            if ( ok )
-                {
-                iContainer->ResetL();
-                iContainer->DisplayStartTestingL();
-                //Engine will populate the suite 
-                iEngine.ExecuteTestL( KDDHardwareSuiteUid,  *AppUi() );                                                            
-                }
-           
-            break;
-            }
-            
-        case EDDCmdPerformAllCoverageTests:
-            {
-            
-            //ask confirmation from the user
-            TBool ok = MessageQueryDialogLaunchL( 
-                                R_MESSAGE_QUERY_PERFORM_ALL_COVERAGE_TESTS );                                            
-           if ( ok )
-                {
-                //Engine will populate the suite 
-                iEngine.ExecuteTestL( KDDCoverageSuiteUid,  *AppUi() );                                                            
-                }           
-                                            
-            break;
-            }
-            
-        //These have only one test, so performing all is not needed yet    
-        case EDDCmdPerformAllServiceTests:
-            {
-            break;            
-            }
-            
-        case EDDCmdPerformAllConnTests:
-            {
-            break;
-            } 
-        case EAknCmdTaskSwapper:
-            {
-    	/*
-    	* MSK: Active Applications
-    	* This command is actually handled by Avkon FW
-    	* Applications should not handle this
-    	*/
-    	    break;
-    	    }            
-            
-        default:
-            AppUi()->HandleCommandL( aCommand );
-            break;
-        }
-    }
-
-// ----------------------------------------------------------------------------
-// CDevDiagPluginView::DoActivateL
-//
-// First method called by the Avkon framwork to invoke a view.
-// ----------------------------------------------------------------------------
-//
-void CDevDiagPluginView::DoActivateL( const TVwsViewId& /*aPrevViewId*/,
-                                     TUid               /*aCustomMessageId*/ ,
-                                     const TDesC8&      /*aCustomMessage*/ )
-    {    
-    if( iContainer )
-        {
-        AppUi()->RemoveFromStack( iContainer );
-
-        delete iContainer;
-        iContainer = NULL;
-        }
-
-    iContainer = CDevDiagPluginContainer::NewL( this, iEngine, ClientRect() );
-    iContainer->SetMopParent( this );
-    AppUi()->AddToStackL( iContainer );
-    
-    iEngine.SetObserver( this );
-    
-    //Construct the model
-    iContainer->UpdateModelL( iParentSuiteUid );
-    
-    SetContextMenu();
-    
-    //Retrieve last test results. HandleEngineCommandL with
-    //EDevDiagEngineCommandGetLastResults is called after this.
-    iEngine.GetLastResultsL( iParentSuiteUid );
-    }
-
-// ----------------------------------------------------------------------------
-// CDevDiagPluginView::DoDeactivate
-//
-// Called by the Avkon view framework when closing.
-// ----------------------------------------------------------------------------
-//
-void CDevDiagPluginView::DoDeactivate()
-    {
-   if ( iContainer )
-        {
-        AppUi()->RemoveFromStack( iContainer );        
-        delete iContainer;
-        iContainer = NULL;
-        }    
-    }
-
-
-// ----------------------------------------------------------------------------
-// Handle CDevDiagEngine events. 
-//
-// EDevDiagEngineCommandTestExecutionDone is called when single or group 
-// execution finishes.
-//
-// MDevDiagEngineObserver::EDevDiagEngineCommandResultsDataUpdated is called
-// when a plug-in is executed.
-//
-// EDevDiagEngineCommandGetLastResults is called after 
-// iEngine.GetLastResultsL( iParentSuiteUid ) is called. It retrieves the 
-// last results.
-// ----------------------------------------------------------------------------
-//    
-void CDevDiagPluginView::HandleEngineCommandL( TAppEngineCommand aCommand,
-                                       TInt aError,
-                                       TAny* aCustom )
-    {
-    LOGSTRING("CDevDiagPluginView::HandleEngineCommandL");
-    switch ( aCommand )
-        {
-        case MDevDiagEngineObserver::EDevDiagEngineCommandGroupExecutionDone:
-            {
-            if ( aError != KErrNone )
-                {
-                LOGSTRING2("MDevDiagEngineObserver::Exec Done Error: %d: ", aError);
-                return;
-                }
-            
-            iEngine.GetLastResultsL( iParentSuiteUid );
-                                    
-            if ( iEngine.HasExecutionResults() )
-                {
-                TInt failedCount = iEngine.ExecutionResults().FailedResultsCount();
-                
-                TInt passedCount = iEngine.ExecutionResults().PassedResultsCount();
-                
-                if ( failedCount == 0 && passedCount > 0)
-                    {
-                    DisplayConfirmationDialogL(R_DIAG_CONF_TEST_PASSED);
-                    }
-                else if(failedCount > 0)
-                    {
-                    DisplayMessageQueryDialogFailedResultsL();
-                    }                
-                }
-                
-            break;
-            }        
-            
-        case MDevDiagEngineObserver::EDevDiagEngineCommandGroupExecutionProgress:
-            {     
-            if ( aError != KErrNone )
-                {
-                LOGSTRING2("MDevDiagEngineObserver::ExecutionProgress Error: %d: ", aError);
-                return;
-                }
-                      
-            iEngine.GetLastResultsL( iParentSuiteUid ); 
-            
-            iContainer->MoveStartTestingDownL();
-                 
-            break;   
-            }
-        case MDevDiagEngineObserver::EDevDiagEngineCommandGetLastResults:
-            {            
-            if ( aError != KErrNone )
-                {
-                LOGSTRING2("MDevDiagEngineObserver::GetLastResults Error: %d: ", aError);
-                return;
-                }
-            
-            RPointerArray<CDiagResultsDatabaseItem>* array = 
-                static_cast<RPointerArray<CDiagResultsDatabaseItem>*> (aCustom);
-            iContainer->DisplayChildrenWithResultsL( *array );
-           
-            
-            if ( iEngine.HasExecutionResults() && !iEngine.ExecutionResults().LastTestFinishedL())
-                {
-                iContainer->MoveStartTestingDownL();
-                }            
-           
-                                          
-            break;
-            }       
-        case MDevDiagEngineObserver::EDevDiagEngineCommandSinglePluginExecutionDone:
-            {
-			
-			if(!iEngine.GetPluginDependencyL())
-				iEngine.GetLastResultsL( iParentSuiteUid );
-            
-            if ( aError != KErrNone )
-                {
-                LOGSTRING2("MDevDiagEngineObserver::SinglePluginExecutionDone Error: %d: ", aError);
-                return;
-                }
-            
-            //iEngine.GetLastResultsL( iParentSuiteUid );  // ADO & Platformization Changes
-            
-            //  ADO & Platformization Changes
-            
-            ///@@@KSR: changes for Codescanner error val = High
-            //if(iEngine.ExecutionResults().SinglePluginExecutionL() && !iEngine.GetPluginDependency())
-            if(iEngine.ExecutionResults().SinglePluginExecutionL() && !iEngine.GetPluginDependencyL())
-	            {
-	        
-	            const CDiagResultsDatabaseItem* aResult;
-	            aResult = iEngine.ExecutionResults().GetSinglepluginExecutionResult();
-	            
-	            
-	            if(aResult->TestResult() == CDiagResultsDatabaseItem::ESuccess)
-	            	{
-	            	DisplayConfirmationDialogL(R_DIAG_CONF_TEST_PASSED_1);
-	            	LOGSTRING("The test has passed");
-	            	}
-	            else if(aResult->TestResult() == CDiagResultsDatabaseItem::EFailed)
-	            	{
-	            	DisplayConfirmationDialogL(R_DIAG_CONF_TEST_FAILED_1);	
-	            	LOGSTRING("The test has failed");
-	            	}
-	            }
-            
-	            
-	          // Changes ends
-                                                                                                     
-            break;
-            }
-            
-        case MDevDiagEngineObserver::EDevDiagEngineCommandTestExecutionCancelled:
-            {                                    
-            //Update container.
-            iEngine.GetLastResultsL( iParentSuiteUid );
-            
-            if ( iEngine.HasExecutionResults() )
-                {
-                TInt failedCount = iEngine.ExecutionResults().FailedResultsCount();
-                
-                TInt passedCount = iEngine.ExecutionResults().PassedResultsCount();
-                
-                if ( failedCount == 0 && passedCount > 0)
-                    {
-                    DisplayConfirmationDialogL(R_DIAG_CONF_TEST_PASSED);
-                    }
-                else if(failedCount > 0)
-                    {
-                    DisplayMessageQueryDialogFailedResultsL();
-                    }                
-                }                
-                            
-            break;
-            }
-        }
-    }
-
-
-// ----------------------------------------------------------------------------
-// Change the title of the application. 
-//
-// ----------------------------------------------------------------------------
-//
-void CDevDiagPluginView::ChangeTitleL(TInt aResourceId) 
-	{
-	CAknTitlePane* titlePane = 
-	    (CAknTitlePane*)(AppUi()->StatusPane())->ControlL( 
-	                                    TUid::Uid( EEikStatusPaneUidTitle ) );
-	                                    
-	HBufC* titleText = iEikonEnv->AllocReadResourceLC( aResourceId );
-	titlePane->SetTextL( titleText->Des() );
-	CleanupStack::PopAndDestroy(titleText);
-	}  
-	
-
-// ----------------------------------------------------------------------------
-// Display a message query dialog. 
-//
-// ----------------------------------------------------------------------------
-// 	
-TBool CDevDiagPluginView::MessageQueryDialogLaunchL( TInt aResourceId )
-	{	
-    CAknMessageQueryDialog* dlg = new (ELeave) CAknMessageQueryDialog(); 
-   
-    dlg->PrepareLC( aResourceId ); 
-
-    if (dlg->RunLD())
-    	{	    
-    	return ETrue;
-    	}
-    	
-	return EFalse;
-	}
-
-	
-// ----------------------------------------------------------------------------
-// This is needed after performing a group of tests succesfully.
-// ----------------------------------------------------------------------------
-// 	
-void CDevDiagPluginView::DisplayConfirmationDialogL(TInt aResourceId)
-	{	    
-    CAknConfirmationNote* note = 
-        new (ELeave) CAknConfirmationNote( ETrue ); //Waiting
-
-    HBufC* text = NULL;
-   
-    text = StringLoader::LoadLC( aResourceId );
-          
-    note->ExecuteLD( *text ); //Blocks until note dismissed
-
-    CleanupStack::PopAndDestroy();
-	}	
-	
-
-// ----------------------------------------------------------------------------
-// This is needed after performing a group of tests
-//
-// Display dialog text according to the test result.
-//
-// Message query dialog will display a list of failed test cases. 
-// ----------------------------------------------------------------------------
-// 		
-void CDevDiagPluginView::DisplayMessageQueryDialogFailedResultsL()
-	{	
-    CAknMessageQueryDialog* dlg = new (ELeave) CAknMessageQueryDialog(); 
-   
-    dlg->PrepareLC( R_DEVDIAG_FAILED_TESTS_MESSAGEQUERY_DIALOG ); 
-
-    HBufC* failText = StringLoader::LoadL( R_DIAG_CONF_TEST_FAILED  );
-    CleanupStack::PushL( failText );
-        
-    HBufC* failedTests = CreateResultsTextsForFailedTestsLC( iEngine.ExecutionResults() );
-        
-    TInt newBufLength = failText->Length() + failedTests->Length();
-        
-    HBufC* text = HBufC::NewLC( newBufLength );        
-        
-    text->Des().Append( *failText );
-    text->Des().Append( *failedTests );
-    
-    dlg->SetMessageTextL( *text );
-        
-    CleanupStack::PopAndDestroy();
-    CleanupStack::PopAndDestroy();
-    CleanupStack::PopAndDestroy();    
-
-    if (dlg->RunLD())
-    	{	    
-    	
-    	}    		
-	}
-	
-	
-// ----------------------------------------------------------------------------
-// Loads names of the tests that failed.
-// ----------------------------------------------------------------------------
-// 		
-HBufC* CDevDiagPluginView::CreateResultsTextsForFailedTestsLC( 
-                                    const CDevDiagExecResults& aExecResults )
-    {        
-    RBuf resultText;
-    CleanupClosePushL( resultText );
-    
-    resultText.CreateL( KFailedTestsMaxLength );
-    
-    TBool firstLineFeed = ETrue;
-    
-    for ( TInt i = 0; i < aExecResults.Count(); ++i )
-        {
-        const CDevDiagExecResults::CResult& result = aExecResults[i];
-        
-        //if item == NULL it is a test suite
-        const CDiagResultsDatabaseItem* item = result.Result();
-        
-        if (item && !item->WasDependency())
-            {
-            //List failed test cases
-            if ( item && item->TestResult() == CDiagResultsDatabaseItem::EFailed )
-                {
-                const MDiagPlugin& plugin = result.Plugin();
-                
-                //Note the correct layout. Name is used in the pop-up info pane.
-                HBufC* name = plugin.GetPluginNameL( MDiagPlugin::ENameLayoutPopupInfoPane );
-                CleanupStack::PushL( name );
-                
-                if ( resultText.MaxLength() < resultText.Length() + name->Length() )
-                    {
-                    HBufC* temp = resultText.AllocLC();
-                    resultText.ReAlloc( resultText.Length() + KFailedTestsMaxLength );
-                    resultText.Append( *temp );
-                    CleanupStack::PopAndDestroy();
-                    }
-                
-                if ( !firstLineFeed )
-                    {
-                    resultText.Append( KLinefeed );
-                    }
-                else 
-                    {
-                    firstLineFeed = EFalse;        
-                    }
-                                
-                resultText.Append( *name );
-                resultText.Append( KTabfeed );
-                
-                CleanupStack::PopAndDestroy();
-                }
-            }
-        }
-            
-    //contains combined result texts                
-    HBufC* result = resultText.AllocL(); 
-    
-    CleanupStack::PopAndDestroy();
-    
-    CleanupStack::PushL( result );    
-    return result;
-    }
-    
-// End of File
--- a/devicediagnostics/devdiagapp/src/devdiagruntimereqsInfo.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,377 +0,0 @@
-/*
-* 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:  This is the implementation of the runtime requirements
-*                information data class.
-*
-*/
-
-
-// System Include Files
-#include <aknmessagequerydialog.h>      // CAknMessageQueryDialog
-#include <centralrepository.h>          // CRepository
-#include <DiagFrameworkDebug.h>         // Debugging Macros
-#include <DiagResultsDatabase.h>        // RDiagResultsDatabase
-#include <DiagResultsDatabaseTestRecordInfo.h>
-#include <f32file.h>                    // RFs
-#include <StringLoader.h>               // StringLoader
-#include <devdiagapp.rsg>            // Resource defintions
-
-// User Include Files
-#include "devdiag.pan"            // Panic
-#include "devdiagruntimereqsinfo.h"          // CDevDiagRuntimeReqsInfo
-#include "devdiagprivatecrkeys.h"   // CR Key ID Definitions
-
-
-
-// ============================ MEMBER FUNCTIONS =============================
-
-// ---------------------------------------------------------------------------
-// Static two-phase constructor.
-// ---------------------------------------------------------------------------
-//
-CDevDiagRuntimeReqsInfo* CDevDiagRuntimeReqsInfo::NewL( RFs& aFs,
-                                              RDiagResultsDatabase& aDb,
-                                              TCallBack aCallback )
-    {
-    LOGSTRING( "CDevDiagRuntimeReqsInfo::NewL()" )
-
-    CDevDiagRuntimeReqsInfo* self = new ( ELeave ) CDevDiagRuntimeReqsInfo( aFs,
-                                                                  aDb,
-                                                                  aCallback );
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// ---------------------------------------------------------------------------
-// Destructor.
-// ---------------------------------------------------------------------------
-//
-CDevDiagRuntimeReqsInfo::~CDevDiagRuntimeReqsInfo()
-    {
-    LOGSTRING( "CDevDiagRuntimeReqsInfo::~CDevDiagRuntimeReqsInfo()" )
-
-    Cancel();
-    delete iTelephony;
-    
-    }
-
-// ---------------------------------------------------------------------------
-// Begins checking if the diagnostics runtime requirements are satisfied.
-// ---------------------------------------------------------------------------
-//
-void CDevDiagRuntimeReqsInfo::CheckRuntimeRequirementsL( TBool aResumingTests )
-    {
-    LOGSTRING( "CDevDiagRuntimeReqsInfo::CheckRuntimeRequirementsL()" )
-
-    // If the requirements are already being checked, start over.
-    if ( iState != EStateInitial )
-        {
-        Cancel();
-        }
-
-    iResumingTests = aResumingTests;
-
-    // (Check 1) Check the free disk space.
-    CheckDiskSpaceL();
-
-    // (Check 2) Check the battery level.
-    CheckBatteryLevelL();
-    }
-
-// ---------------------------------------------------------------------------
-// Returns the runtime requirements result, which indicates if the runtime
-// requirements were satisfied.
-// ---------------------------------------------------------------------------
-//
-CDevDiagRuntimeReqsInfo::TResult CDevDiagRuntimeReqsInfo::Result() const
-    {
-    return iResult;
-    }
-
-// ---------------------------------------------------------------------------
-// Displays the dialog associated with the result of the runtime checks.
-// ---------------------------------------------------------------------------
-//
-TInt CDevDiagRuntimeReqsInfo::DisplayDialogL() const
-    {
-    LOGSTRING( "CDevDiagRuntimeReqsInfo::DisplayDialogL()" )
-
-    // Act on the result.
-    switch ( iResult )
-        {      
-        case EResultErrLowDisk:
-            return DisplayMessageQueryDialogL( R_DEVDIAG_LOW_DISK_DIALOG );
- 
-        case EResultErrLowBattery:
-            return DisplayMessageQueryDialogL( R_DEVDIAG_LOW_BATTERY_DIALOG );      
-
-        case EResultOk:
-        default:
-            return EAknSoftkeyOk;
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// C++ constructor.
-// ---------------------------------------------------------------------------
-//
-CDevDiagRuntimeReqsInfo::CDevDiagRuntimeReqsInfo( RFs& aFs,
-                                        RDiagResultsDatabase& aDb,
-                                        TCallBack aCallback )
-:   CActive( EPriorityStandard ),
-    iFs( aFs ),
-    iDb( aDb ),
-    iCallback( aCallback ), 
-    iBatteryInfo(),
-    iBatteryInfoPackage( iBatteryInfo )
-    {
-    LOGSTRING( "CDevDiagRuntimeReqsInfo::CDevDiagRuntimeReqsInfo()" )
-
-    CActiveScheduler::Add( this );
-    }
-
-// ---------------------------------------------------------------------------
-// Two-phased constructor.
-// ---------------------------------------------------------------------------
-//
-void CDevDiagRuntimeReqsInfo::ConstructL()
-    {
-    LOGSTRING( "CDevDiagRuntimeReqsInfo::ConstructL()" )
-
-    ReadCentralRepositoryValuesL();
-    }
-
-// ---------------------------------------------------------------------------
-// Reads the runtime requirements values from the central repository and
-// stores them to the object.
-// ---------------------------------------------------------------------------
-//
-void CDevDiagRuntimeReqsInfo::ReadCentralRepositoryValuesL()
-    {
-    LOGSTRING( "CDevDiagRuntimeReqsInfo::ReadCentralRepositoryValuesL()" )
-
-    CRepository* repository = CRepository::NewLC( KCRUidDevDiag );
-
-    // The required battery level.
-    User::LeaveIfError( repository->Get( KDevDiagAppMinBatteryLevel,
-                                         iMinBatteryLevel ) );
-
-    // The required free disk space.  A local TInt is used because the data
-    // member is a TInt64, but the CR only has a getter function for TInt.
-    TInt minDiskSpaceRequired;
-    User::LeaveIfError( repository->Get( KDevDiagAppMinDiskSpace,
-                                         minDiskSpaceRequired ) );
-    iMinDiskSpaceFree = minDiskSpaceRequired;
-
- 
-    LOGSTRING3( "CDevDiagRuntimeReqsInfo::ReadCentralRepositoryValuesL() -"
-                L" iMinBatteryLevel %d, iMinDiskSpaceFree %d",
-                iMinBatteryLevel,
-                minDiskSpaceRequired )
-
-    CleanupStack::PopAndDestroy( repository );
-    }
-
-
-// ---------------------------------------------------------------------------
-// Checks if there is enough free estimated disk space to log test results.
-// ---------------------------------------------------------------------------
-//
-void CDevDiagRuntimeReqsInfo::CheckDiskSpaceL()
-    {
-    LOGSTRING( "CDevDiagRuntimeReqsInfo::CheckDiskSpaceL()" )
-
-    // If the runtime requirements have already failed, this function will
-    // set us active and complete the request.
-    if ( CheckCompletion() )
-        {
-        return;
-        }
-
-    // Set default values for this check.
-    iDiskSpaceFree = 0;
-
-    // Get the free disk space.
-    TVolumeInfo volumeData;
-    User::LeaveIfError( iFs.Volume( volumeData ) );
-    iDiskSpaceFree = volumeData.iFree;
-
-    // Check the free disk level.
-    if ( iDiskSpaceFree < iMinDiskSpaceFree )
-        {
-        iResult = EResultErrLowDisk;
-        }
-
-    return;
-    }
-
-// ---------------------------------------------------------------------------
-// Checks if the phone's battery level is adequate to run tests.
-// ---------------------------------------------------------------------------
-//
-void CDevDiagRuntimeReqsInfo::CheckBatteryLevelL()
-    {
-    LOGSTRING( "CDevDiagRuntimeReqsInfo::CheckBatteryLevelL()" )
-
-    // If the runtime requirements have already failed, this function will
-    // set us active and complete the request.
-    if ( CheckCompletion() )
-        {
-        return;
-        }
-
-    // Check the battery level.
-    switch ( iState )
-        {
-        case EStateInitial:
-            {
-            iState = EStateCheckingBattery;
-
-            // Issue the asynchronous request.
-            if ( !iTelephony )
-                {
-                iTelephony = CTelephony::NewL();
-                }
-
-            iTelephony->GetBatteryInfo( iStatus, iBatteryInfoPackage );
-            SetActive();
-            break;
-            }
-
-        case EStateCheckingBattery:
-            {
-            iState = EStateInitial;
-
-            // Check the battery level.
-            if ( iStatus != KErrNone )
-                {
-                iResult = EResultErrLowBattery;
-                break;
-                }
-
-            if ( iBatteryInfo.iChargeLevel < TUint( iMinBatteryLevel ) )
-                {
-                iResult = EResultErrLowBattery;
-                }
-
-            iBatteryLevel = iBatteryInfo.iChargeLevel;
-            break;
-            }
-
-        default:
-            {
-            __ASSERT_DEBUG( EFalse, Panic( EDevDiagApplicationRuntimeReqs) );
-            iResult = EResultErrLowBattery;
-            CheckCompletion();
-            break;
-            }
-        }
-    }
-
-
-// ---------------------------------------------------------------------------
-// This is a utility function to handle the common checking for completion
-// of the runtime requirements checks.
-// ---------------------------------------------------------------------------
-//
-TBool CDevDiagRuntimeReqsInfo::CheckCompletion()
-    {
-    LOGSTRING( "CDevDiagRuntimeReqsInfo::CheckCompletion()" )
-
-    // If there is already a failed check, complete the asynchronous request
-    // if it hasn't already been done.
-    if ( iResult != EResultOk && iState != EStateComplete )
-        {
-        LOGSTRING( "CDevDiagRuntimeReqsInfo::CheckCompletion() - completed" )
-        iState = EStateComplete;
-        TRequestStatus* status = &iStatus;
-        User::RequestComplete( status, KErrNone );
-        SetActive();
-        return ETrue;
-        }
-
-    if ( iState == EStateComplete )
-        {
-        return ETrue;
-        }
-
-    return EFalse;
-    }
-
-// ---------------------------------------------------------------------------
-// Utility function to display a message dialog associated with the specified
-// resource.
-// ---------------------------------------------------------------------------
-//
-TInt CDevDiagRuntimeReqsInfo::DisplayMessageQueryDialogL( TInt aResource )
-    {
-    LOGSTRING2( "CDevDiagRuntimeReqsInfo::DisplayMessageQueryDialogL( %d )",
-                aResource )
-    CAknMessageQueryDialog* dlg = new ( ELeave ) CAknMessageQueryDialog;
-    return dlg->ExecuteLD( aResource );
-    }
-
-
-// ---------------------------------------------------------------------------
-// From CActive.
-// This function is called when an active request completes.
-// ---------------------------------------------------------------------------
-//
-void CDevDiagRuntimeReqsInfo::RunL()
-    {
-    LOGSTRING( "CDevDiagRuntimeReqsInfo::RunL()" )
-
-    switch ( iState )
-        {
-        case EStateCheckingBattery:
-            // (Check 1) Check the battery level.
-            CheckBatteryLevelL();
-                   
-      
-        case EStateComplete:
-        default:
-            {          
-            delete iTelephony;
-            iTelephony = NULL;
-            // Inform the observer that checking is complete.
-            iCallback.CallBack();
-            }
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// From CActive.
-// This function is called to cancel any outstanding asynchronous requests.
-// ---------------------------------------------------------------------------
-//
-void CDevDiagRuntimeReqsInfo::DoCancel()
-    {
-    LOGSTRING( "CDevDiagRuntimeReqsInfo::DoCancel()" )
-   
-     // Cancel the asynchronous requests.
-    switch ( iState )
-        {
-        case EStateCheckingBattery:
-            __ASSERT_DEBUG( iTelephony, Panic( EDevDiagApplicationRuntimeReqs ) );
-            iTelephony->CancelAsync( CTelephony::EGetBatteryInfoCancel );
-            break;
-     
-        default:
-            break;
-        }
-    }
-
-// End of File
--- a/devicediagnostics/devdiagapp/src/devdiagsuitecontainer.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,442 +0,0 @@
-/*
-* Copyright (c) 2007-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:  Main container that displayes suites.
-*
-*/
-
-
-// INCLUDE FILES
-
-#include "devdiagsuitecontainer.h"
-#include "devdiagengine.h"   
-
-#include <StringLoader.h>
-#include <aknlists.h>
-#include <DiagPlugin.h>  
-#include <DiagPluginPool.h> 
-#include <DiagSuitePlugin.h>   
-#include <AknIconArray.h>           // CAknIconArray
-#include <AknIconUtils.h>           // AknIconUtils
-#include <gulicon.h>                // CGulIcon
-
-#include <eikclbd.h>                // CColumnListBoxData
-#include <AknIconArray.h>
-#include <AknsUtils.h>
-#include <textresolver.h>
-
-///@@@KSR: changes for BAD Warnings - KNSmlTab" was declared but never referenced
-//_LIT( KNSmlTab,     "\t" );
-_LIT( KListSuiteElementFormat,  "%d\t%S" );
-
-const TInt KIconArrayGranularity(5);
-
-// ========================== MEMBER FUNCTIONS =================================
-
-// -----------------------------------------------------------------------------
-// CDevDiagSuiteContainer::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CDevDiagSuiteContainer* CDevDiagSuiteContainer::NewL( CDevDiagSuiteView* aView,
-                                                         CDevDiagEngine& aEngine,
-                                                const TRect&    aRect )
-    {
-    CDevDiagSuiteContainer* self = new( ELeave ) 
-                                     CDevDiagSuiteContainer( aView, aEngine );
-    
-    CleanupStack::PushL( self );
-    self->ConstructL( aRect );
-    CleanupStack::Pop();
-
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// CDevDiagSuiteContainer::CDevDiagSuiteContainer
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CDevDiagSuiteContainer::CDevDiagSuiteContainer( CDevDiagSuiteView* aView,
-                                                    CDevDiagEngine& aEngine )
-    : iView( aView ), iEngine(aEngine)
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// CDevDiagSuiteContainer::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CDevDiagSuiteContainer::ConstructL( const TRect& aRect )
-    {
-    CreateWindowL();
-
-	iListBox = new ( ELeave ) CAknSingleLargeStyleListBox;
-	
-	iListBox->SetContainerWindowL( *this );
-	iListBox->ConstructL( this, EAknListBoxSelectionList );
-
-	iListBox->CreateScrollBarFrameL( ETrue );
-	iListBox->ScrollBarFrame()->SetScrollBarVisibilityL( 
-	                                            CEikScrollBarFrame::EOff,
-	                                            CEikScrollBarFrame::EAuto );
-       
-    CArrayPtr< CGulIcon >* icons = new ( ELeave ) CAknIconArray(
-        KIconArrayGranularity );
-   
-    iListBox->ItemDrawer()->ColumnData()->SetIconArray( icons );
-    
-	iListBox->UpdateScrollBarsL();
-	//iListBox->ScrollBarFrame()->MoveVertThumbTo( 0 );		
-
-	iListBox->SetListBoxObserver( this );
-			
-    SetRect( aRect );
-    ActivateL();    
-    }
-
-// -----------------------------------------------------------------------------
-// CDevDiagSuiteContainer::~CDevDiagSuiteContainer
-// -----------------------------------------------------------------------------
-//
-CDevDiagSuiteContainer::~CDevDiagSuiteContainer()
-    {
-    delete iListBox;
-        
-    //iChildren.ResetAndDestroy();
-    iChildren.Close();
-    }
-    
-// -----------------------------------------------------------------------------
-// CDevDiagSuiteContainer::SizeChanged
-// -----------------------------------------------------------------------------
-//
-void CDevDiagSuiteContainer::SizeChanged()
-    {
-    iListBox->SetRect( Rect() );    // Mandatory, otherwise not drawn
-    }
-
-// -----------------------------------------------------------------------------
-// CDevDiagSuiteContainer::HandleResourceChange
-// -----------------------------------------------------------------------------
-//
-void CDevDiagSuiteContainer::HandleResourceChange( TInt aType )
-    {    
-    CCoeControl::HandleResourceChange( aType );
-    
-    //Handle change in layout orientation
-    if ( aType == KEikDynamicLayoutVariantSwitch || aType == KAknsMessageSkinChange )
-        {
-        if ( aType == KAknsMessageSkinChange )
-        	{
-        	// Skin changed; we'll have to reload the icon array
-            CArrayPtr<CGulIcon>* iconArray =
-                iListBox->ItemDrawer()->ColumnData()->IconArray();
-            if ( iconArray )
-                {
-    	        iconArray->ResetAndDestroy();
-	            delete iconArray;
-	            iconArray = NULL;
-    	        }
-    	    TRAP_IGNORE( AddIconsL() );
-        	}
-
-        TRect mainPaneRect;
-        AknLayoutUtils::LayoutMetricsRect( AknLayoutUtils::EMainPane, mainPaneRect );
-        SetRect( mainPaneRect );
-		DrawDeferred();
-		}	
-    }
-
-// -----------------------------------------------------------------------------
-// CDevDiagSuiteContainer::CountComponentControls
-// -----------------------------------------------------------------------------
-//
-TInt CDevDiagSuiteContainer::CountComponentControls() const
-    {
-    TInt retval( 0 );
-    if ( iListBox )
-        {
-        retval = 1;
-        }
-    return retval; // return nbr of controls inside this container
-    }
-
-// -----------------------------------------------------------------------------
-// CDevDiagSuiteContainer::ComponentControl
-// -----------------------------------------------------------------------------
-//
-CCoeControl* CDevDiagSuiteContainer::ComponentControl( TInt aIndex ) const
-    {
-    switch ( aIndex )
-        {
-        case 0:
-            {
-            return iListBox;
-            }
-        default:
-            {
-            return NULL;
-            }
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// CDevDiagSuiteContainer::Draw
-// -----------------------------------------------------------------------------
-//
-void CDevDiagSuiteContainer::Draw( const TRect& /* aRect */ ) const
-    {
-    }
-
-
-// -----------------------------------------------------------------------------
-// CDevDiagSuiteContainer::HandleControlEventL
-// -----------------------------------------------------------------------------
-//
-
-void CDevDiagSuiteContainer::HandleControlEventL( CCoeControl* /* aControl */,
-                                                TCoeEvent /* aEventType */ )
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// CDevDiagSuiteContainer::OfferKeyEventL
-// -----------------------------------------------------------------------------
-//
-
-TKeyResponse CDevDiagSuiteContainer::OfferKeyEventL( const TKeyEvent& aKeyEvent,
-                                                             TEventCode aType )
-	{
-
-	if ( iListBox && aType == EEventKey )
-		{
-		switch ( aKeyEvent.iCode )
-			{
-			case EStdKeyHome:
-				{			
-			    break;           
-				}
-				
-			case EKeyEscape:
-				{
-			
-				iAvkonAppUi->ProcessCommandL( EEikCmdExit );
-				
-		    	break;
-				}
-			case EKeyUpArrow:
-			case EKeyDownArrow:
-			    {
-			    TKeyResponse retVal =
-			        iListBox->OfferKeyEventL( aKeyEvent, aType );
-                return retVal;
-			    }
-			case EKeyLeftArrow:
-			case EKeyRightArrow:
-			    {
-			    break;  // AppUi handles the tab changes
-			    }
-			default:
-			    {
-			    return iListBox->OfferKeyEventL( aKeyEvent, aType );
-			    }
-			}
-		}
-	
-	return EKeyWasNotConsumed;
-	}
-
-// -----------------------------------------------------------------------------
-// CDevDiagSuiteContainer::HandleListBoxEventL
-// -----------------------------------------------------------------------------
-//
-void CDevDiagSuiteContainer::HandleListBoxEventL( CEikListBox* /*aListBox*/, 
-                                                 TListBoxEvent aEventType )
-	{	
-	// if the Select Key has been pressed
-	if ((aEventType == MEikListBoxObserver::EEventEnterKeyPressed) ||
-	(aEventType == MEikListBoxObserver::EEventItemClicked))
-		{ 
-		
-		}
-	}
-
-
-#ifdef __SERIES60_HELP
-// -----------------------------------------------------------------------------
-// CDevDiagSuiteContainer::GetHelpContext
-// -----------------------------------------------------------------------------
-//
-void CDevDiagSuiteContainer::GetHelpContext( TCoeHelpContext& /*aContext*/ ) const
-	{	
-	//aContext.iMajor = KUidSmlSyncApp;
-    //aContext.iContext = KDM_HLP_DIAGNOSTICS_APPLICATION;
-	}
-
-#else
-
-// -----------------------------------------------------------------------------
-// CDevDiagSuiteContainer::GetHelpContext
-// -----------------------------------------------------------------------------
-//
-void CDevDiagSuiteContainer::GetHelpContext( TCoeHelpContext& /*aContext*/ ) const
-	{
-	}
-#endif // __SERIES60_HELP
-
-// -----------------------------------------------------------------------------
-// CDevDiagSuiteContainer::FocusChanged
-// -----------------------------------------------------------------------------
-//
-void CDevDiagSuiteContainer::FocusChanged( TDrawNow /*aDrawNow*/ )
-	{
-	if ( iListBox )
-		{
-		iListBox->SetFocus( IsFocused() );
-		}
-	}
-
-// -----------------------------------------------------------------------------
-// Display a group of plug-ins that are under the parent suite. 
-// -----------------------------------------------------------------------------
-//
-void CDevDiagSuiteContainer::DisplayChildrenL( TUid aParentUid )
-    {
-    iListBox->Model()->SetOwnershipType( ELbmOwnsItemArray );
-
-    // Add listbox items.
-    CDesCArray* pluginTextArray = static_cast< CDesCArray* >(
-        iListBox->Model()->ItemTextArray() );
-    pluginTextArray->Reset();
-
-    // Get the root suite.
-    MDiagPlugin* plugin;
-    HBufC* formattedName = NULL;
-    if ( iEngine.PluginPool().FindPlugin( aParentUid, plugin ) == KErrNone )
-        {
-
-        iChildren.Reset(); //plug-ins are owned by the engine.
-       
-        MDiagSuitePlugin* suite = static_cast< MDiagSuitePlugin* >( plugin );
-        suite->GetChildrenL( iChildren, MDiagSuitePlugin::ESortByPosition );
-        
-        AddIconsL(); //Update icon array to match texts
-     
-        for ( TInt j = 0; j < iChildren.Count(); j++ )
-            {            
-            HBufC* name = iChildren[j]->GetPluginNameL(
-                MDiagPlugin::ENameLayoutListSingle );
-            CleanupStack::PushL( name );           
-            
-            formattedName = HBufC::NewLC( name->Length() + 
-                                        KListSuiteElementFormat().Length() );
-            formattedName->Des().Format( KListSuiteElementFormat(), j ,name );    
-                
-            pluginTextArray->AppendL( *formattedName );
-            
-            CleanupStack::PopAndDestroy( formattedName );
-            CleanupStack::PopAndDestroy( name );
-            }
-                
-        iListBox->SetFocus( ETrue );
-        iListBox->HandleItemAdditionL();
-        iListBox->ItemDrawer()->ColumnData()->EnableMarqueeL( ETrue );
-        iListBox->DrawDeferred();
-        }
-    else 
-        {
-        User::Leave(KErrNotFound);
-        }
-    }
-
-
-// -----------------------------------------------------------------------------
-// Append aPlugin name onto the listbox.
-// -----------------------------------------------------------------------------
-//
-void CDevDiagSuiteContainer::DisplayPluginL( MDiagPlugin* aPlugin )
-    {
-    iListBox->Model()->SetOwnershipType( ELbmOwnsItemArray );
-
-    // Add listbox items.
-    CDesCArray* pluginTextArray = static_cast< CDesCArray* >(
-        iListBox->Model()->ItemTextArray() );
-        
-    iChildren.Append( aPlugin );
-                           
-    HBufC* name = aPlugin->GetPluginNameL(
-                MDiagPlugin::ENameLayoutListSingle );
-    CleanupStack::PushL( name );           
-    
-    CArrayPtr< CGulIcon >* icons =
-        iListBox->ItemDrawer()->ColumnData()->IconArray();
-          
-    icons->AppendL( aPlugin->CreateIconL() );
-            
-    HBufC* formattedName = HBufC::NewLC( name->Length() + 
-                                  KListSuiteElementFormat().Length() );
-    formattedName->Des().Format( KListSuiteElementFormat(), (iChildren.Count() -1), name );    
-                
-    pluginTextArray->AppendL( *formattedName );
-            
-    CleanupStack::PopAndDestroy( formattedName );
-    CleanupStack::PopAndDestroy( name );
-                                   
-    iListBox->SetFocus( ETrue );
-    iListBox->HandleItemAdditionL();
-    iListBox->ItemDrawer()->ColumnData()->EnableMarqueeL( ETrue );
-    iListBox->DrawDeferred();
-    }
-
-// -----------------------------------------------------------------------------
-// Returns currently selected plug-in.
-// -----------------------------------------------------------------------------
-//
-void CDevDiagSuiteContainer::SelectedPlugin(MDiagPlugin*& aPlugin) const
-    {
-    aPlugin = iChildren[ iListBox->CurrentItemIndex() ];
-    }
-
-// -----------------------------------------------------------------------------
-// CDevDiagSuiteContainer::AddIconsL
-// -----------------------------------------------------------------------------
-//
-void CDevDiagSuiteContainer::AddIconsL()
-    {        
-    CArrayPtr<CGulIcon>* icons = NULL;
-    
-    if ( !iListBox->ItemDrawer()->ColumnData()->IconArray() )         
-        {
-        icons = new (ELeave) CArrayPtrFlat<CGulIcon>(KIconArrayGranularity);
-        iListBox->ItemDrawer()->ColumnData()->SetIconArray( icons );
-        }
-    else 
-        {
-        icons = iListBox->ItemDrawer()->ColumnData()->IconArray();
-        }
-    if(icons)
-    	{	
-    	for ( TInt i = 0; i < iChildren.Count(); ++i )
-        {
-        icons->AppendL( iChildren[i]->CreateIconL( ));
-        }
-      }   
-    }
-
-
-
-
-// End of File
--- a/devicediagnostics/devdiagapp/src/devdiagsuiteview.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,656 +0,0 @@
-/*
-* 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:  Main view implementation. 
-*
-*/
-
-
-
-#include "devdiagsuitecontainer.h"
-#include "devdiagengine.h"
-#include "devdiagdef.h"
-#include "devdiagpluginview.h"
-#include "devdiagexecutionresults.h"
-#include "devdiag.pan"
-
-#include <DiagPlugin.h> 
-#include <akntitle.h> 
-#include <coemain.h>
-#include <devdiagapp.rsg>
-#include <aknViewAppUi.h> 
-#include <eikbtgpc.h> 			//Button group container
-#include <aknmessagequerydialog.h> 
-#include <DiagFrameworkDebug.h>         // Debug Logger
-#include <aknnotewrappers.h> 
-#include <StringLoader.h>
-#include <AknWaitDialog.h>          // CAknWaitDialog
-#include <DiagPluginPool.h> 
-
-#include <DiagPlugin.h> 
-#include <AknQueryDialog.h>
-#include <aknViewAppUi.h>
-#include <featmgr.h>
-#include <StringLoader.h>
-#include <bautils.h>
-#include <coeaui.h>
-#include <akntitle.h> 
-#include <aknmessagequerydialog.h> 
-#include <aknnotewrappers.h> 
-#include <DiagResultsDatabaseItem.h>   
-
-#ifdef __SERIES60_HELP
-#include <hlplch.h>
-#endif
-
-#include "devdiagsuiteview.h"
-
-const TInt KRootSuite = 0x2000E540; //top level suite
-
-_LIT(KLinefeed, "\n");
-_LIT(KTabfeed, "\t");
-const TInt KFailedTestsMaxLength(1024);
-
-// ----------------------------------------------------------------------------
-// Standard symbian c++ constructor
-// ----------------------------------------------------------------------------
-CDevDiagSuiteView* CDevDiagSuiteView::NewL( CDevDiagEngine& aEngine )
-    {
-    //LOGSTRING("CDevDiagSuiteView* CDevDiagSuiteView::NewL");
-    CDevDiagSuiteView* self = CDevDiagSuiteView::NewLC( aEngine );
-    CleanupStack::Pop(self);
-    return self;
-    }
-
-// ----------------------------------------------------------------------------
-// Standard symbian c++ constructor
-// ----------------------------------------------------------------------------
-// 
-CDevDiagSuiteView* CDevDiagSuiteView::NewLC( CDevDiagEngine& aEngine )
-    {
-    //LOGSTRING("CDevDiagSuiteView* CDevDiagSuiteView::NewLC");
-    CDevDiagSuiteView* self = new (ELeave) CDevDiagSuiteView(aEngine);
-    CleanupStack::PushL(self);
-    self->ConstructL();
-    return self;
-    }
-
-// ----------------------------------------------------------------------------
-// ConstructL.
-// ----------------------------------------------------------------------------
-// 
-void CDevDiagSuiteView::ConstructL()
-    {
-    BaseConstructL( R_GS_DD_VIEW );
-    ChangeTitleL ( R_GS_DIAGNOSTICS_VIEW_CAPTION );        
-    }
-
-// ----------------------------------------------------------------------------
-// Constructor.
-// ----------------------------------------------------------------------------
-// 
-CDevDiagSuiteView::CDevDiagSuiteView(CDevDiagEngine& aEngine): 
-        iContainer ( NULL ),
-        iEngine ( aEngine ),
-        iParentPlugin( TUid::Uid( KRootSuite ))      
-    {
-    aEngine.SetObserver(this);
-    }
-
-// ----------------------------------------------------------------------------
-// Destructor.
-// ----------------------------------------------------------------------------
-// 
-CDevDiagSuiteView::~CDevDiagSuiteView()
-   {
-    if ( iContainer )
-        {
-        AppUi()->RemoveFromStack( iContainer );
-        delete iContainer;
-        iContainer = NULL;
-        } 
-    }
-
-// ----------------------------------------------------------------------------
-// Engine observer.
-// ----------------------------------------------------------------------------
-// 
-void CDevDiagSuiteView::HandleEngineCommandL( TAppEngineCommand aCommand,
-                                       TInt aError,
-                                       TAny* aCustom )
-    {
-    switch ( aCommand )
-        {
-        case MDevDiagEngineObserver::EDevDiagEngineCommandPluginLoadComplete:
-            {                        
-            
-            if ( iWaitDialog )
-                {                
-                DismissWaitDialogPreparingL();
-                }
-            
-            CheckCrashedTestL();    
-                
-            break;
-            }
-        case MDevDiagEngineObserver::EDevDiagEngineCommandPluginLoadProgress:
-            {
-            MDiagPlugin* plugin = static_cast<MDiagPlugin*>(aCustom);
-            
-            if ( SuiteUid( plugin->Uid() ))
-                {
-                iContainer->DisplayPluginL( plugin );    
-                }
-            
-            break;
-            }
-            
-        case MDevDiagEngineObserver::EDevDiagEngineCommandGroupExecutionDone:
-            {
-            if ( aError != KErrNone )
-                {
-                LOGSTRING2("MDevDiagEngineObserver::Exec Done Error: %d: ", aError);
-                return;
-                }
-                                                            
-            if ( iEngine.HasExecutionResults() )
-                {
-                TInt failedCount = iEngine.ExecutionResults().FailedResultsCount();
-                
-                if ( failedCount == 0 )
-                    {
-                    DisplayConfirmationDialogL();
-                    }
-                else 
-                    {
-                    DisplayMessageQueryDialogFailedResultsL();
-                    }                        
-                }
-                
-            break;   
-            }
-        }
-    }
-    
-// ----------------------------------------------------------------------------
-// Application ID.
-// ----------------------------------------------------------------------------
-//     
-TUid CDevDiagSuiteView::Id() const
-    {
-    return KDDMainViewId;
-    }
-
-
-// ----------------------------------------------------------------------------
-// Change the title of the application.
-// ----------------------------------------------------------------------------
-//     
-void CDevDiagSuiteView::ChangeTitleL(TInt aResourceId) 
-	{
-	CAknTitlePane* titlePane = 
-	    (CAknTitlePane*)(AppUi()->StatusPane())->ControlL( 
-	    TUid::Uid( EEikStatusPaneUidTitle ) );
-	    
-	HBufC* titleText = iEikonEnv->AllocReadResourceLC( aResourceId );
-	titlePane->SetTextL( titleText->Des() );
-	CleanupStack::PopAndDestroy(titleText);
-	}    
-
-// ----------------------------------------------------------------------------
-// Handle commands.
-// ----------------------------------------------------------------------------
-// 
-void CDevDiagSuiteView::HandleCommandL( TInt aCommand )
-    {
-    LOGSTRING2("CDevDiagSuiteView::HandleCommandL %d",aCommand);
-    switch ( aCommand )
-        {
-        case EDDCmdOpen:
-            {	
-            	//Selected suite plug-in
-            	MDiagPlugin* plugin;
-            	
-            	iContainer->SelectedPlugin( plugin );
-                        
-            	if ( iPluginView )
-                   {
-                   AppUi()->RemoveView( KDDPluginViewId );                	
-                    }
-            
-                iPluginView = CDevDiagPluginView::NewL( iEngine, plugin->Uid() );
-            
-                AppUi()->AddViewL( iPluginView );
-            
-                AppUi()->ActivateLocalViewL( KDDPluginViewId );
-            
-            }
-            
-            break;
-            
-        case EDDCmdPerformAllTests:
-            {
-            	
-            
-            	TBool ok = MessageQueryDialogLaunchL( R_MESSAGE_QUERY_PERFORM_ALL_TESTS );
-            
-            	if ( ok )
-                	{                
-                	//Engine will populate the suite.
-                	//because the plug-in is root suite, all tests will be executed.
-                	iEngine.ExecuteTestL( iParentPlugin,  *AppUi() );     
-                	}
-           
-            break;
-            }
-            
-        case EDDMenuCmdMainHelp:
-        	{
-        	/*	MessageQueryDialogLaunchL( 
-                                R_MESSAGE_QUERY_HELP_NOTE );*/
-        	
-			HlpLauncher::LaunchHelpApplicationL( iEikonEnv->WsSession(), 
-			                         AppUi()->AppHelpContextL() );                                
-            break;	
-        	}
- 
-        case EAknCmdHelp:
-            {            
-            break;
-            }
-	case EAknCmdTaskSwapper:
-            {
-    	/*
-    	* MSK: Active Applications
-    	* This command is actually handled by Avkon FW
-    	* Applications should not handle this
-    	*/
-    	    break;
-    	    }
-        default:
-            AppUi()->HandleCommandL( aCommand );
-            break;
-        }
-    }
-
-
-// ----------------------------------------------------------------------------
-// Identify is it a suite or not.
-// ----------------------------------------------------------------------------
-// 
-TBool CDevDiagSuiteView::SuiteUid( TUid aUid )
-    {
-    
-    if ( aUid == KDDHardwareSuiteUid )
-        {
-        return ETrue;
-        }
-    else if ( aUid == KDDConnectivitySuiteUid )   
-        {
-        return ETrue;
-        }
-    else if ( aUid == KDDServicesSuiteUid )   
-        {
-        return ETrue;
-        }
-    else if ( aUid == KDDCoverageSuiteUid )   
-        {
-        return ETrue;
-        }
-    else
-        {
-        return EFalse;
-        }   
-    }
-
-// ----------------------------------------------------------------------------
-// First method called by the Avkon framwork to invoke a view.
-// ----------------------------------------------------------------------------
-//
-void CDevDiagSuiteView::DoActivateL( const TVwsViewId& aPrevViewId,
-                                     TUid /*aCustomMessageId*/,
-                                     const TDesC8& /*aCustomMessage*/ )
-    {
-    LOGSTRING( "CDevDiagSuiteView::DoActivateL");
-    ChangeTitleL ( R_GS_DIAGNOSTICS_VIEW_CAPTION );
-    
-    iPrevViewId = aPrevViewId;
-    
-    if( iContainer )
-        {
-        AppUi()->RemoveFromStack( iContainer );
-
-        delete iContainer;
-        iContainer = NULL;
-        }
-        
-    iContainer = CDevDiagSuiteContainer::NewL( this, iEngine, ClientRect() );
-    iContainer->SetMopParent( this );
-    AppUi()->AddToStackL( iContainer );
-    
-    iEngine.SetObserver(this);
-     
-    if ( !iEngine.ArePluginsLoaded() ) 
-        {
-        DisplayWaitDialogPreparingL();    
-        }
-    else 
-        {
-        //display children of the top level suite.
-        iContainer->DisplayChildrenL( iParentPlugin );     
-        }                
-    
-    if ( iEikonEnv->StartedAsServerApp() )
-        {
-        //UpdateCbaL( R_PROFILE_MAIN_VIEW_CBA_2 );    
-        }
-    
-    LOGSTRING( "CDevDiagSuiteView::DoActivateL end");
-    }
-
-// ----------------------------------------------------------------------------
-// Update command buttons
-// ----------------------------------------------------------------------------
-// 	
-void CDevDiagSuiteView::UpdateCbaL(TInt aResourceId)
-    {
-    CEikButtonGroupContainer* cba = Cba();
-    cba->SetCommandSetL(aResourceId);
-    cba->DrawDeferred();
-    }
-
-// ----------------------------------------------------------------------------
-// Called by the Avkon view framework when closing.
-// ----------------------------------------------------------------------------
-//
-void CDevDiagSuiteView::DoDeactivate()
-    {
-   if ( iContainer )
-        {
-        AppUi()->RemoveFromStack( iContainer );
-        delete iContainer;
-        iContainer = NULL;
-        }
-            
-    }
-
-// ----------------------------------------------------------------------------
-// Display message query dialog. 
-//
-// ----------------------------------------------------------------------------
-// 	
-TBool CDevDiagSuiteView::MessageQueryDialogLaunchL( TInt aResourceId )
-	{	
-    CAknMessageQueryDialog* dlg = new (ELeave) CAknMessageQueryDialog(); 
-   
-    dlg->PrepareLC( aResourceId ); 
-
-    if (dlg->RunLD())
-    	{	    
-    	return ETrue;
-    	}
-    	
-	return EFalse;
-	}
-
-
-// ----------------------------------------------------------------------------
-// Display a confirmation dialog.
-//
-// ----------------------------------------------------------------------------
-// 
-void CDevDiagSuiteView::DisplayConfirmationDialogL( TBool aPassed )
-	{	    
-    CAknConfirmationNote* note = 
-        new (ELeave) CAknConfirmationNote( ETrue ); //Waiting
-
-    HBufC* text = NULL;
-
-    if ( aPassed )
-        {
-        text = StringLoader::LoadL( R_DIAG_CONF_TEST_PASSED  );
-        }
-    else 
-        {
-        text = StringLoader::LoadL( R_DIAG_CONF_TEST_FAILED  );
-        }
-
-    CleanupStack::PushL( text );
-
-    note->ExecuteLD( *text ); //Blocks until note dismissed
-
-    CleanupStack::PopAndDestroy();
-	}	
-	
-
-// ---------------------------------------------------------------------------
-// Display a wait dialog to inform the user we are preparing for execution.
-// ---------------------------------------------------------------------------
-//
-void CDevDiagSuiteView::DisplayWaitDialogPreparingL()
-    {
-    LOGSTRING( "CDevDiagSuiteView::DisplayWaitDialogPreparingL()" );
-
-    __ASSERT_DEBUG( !iWaitDialog, Panic( EDevDiagApplicationGeneral ) );
- 
-    // Create the wait dialog and run it. The dialog will only display if
-    // checking runtime requirements takes more than 1.5 seconds.
-    iWaitDialog = new (ELeave) CAknWaitDialog(
-        reinterpret_cast< CEikDialog** >( &iWaitDialog ),
-        EFalse );
-    iWaitDialog->ExecuteLD( R_DEV_DIAG_PREPARING_WAIT_NOTE );
-
-    }
-	
-// ---------------------------------------------------------------------------
-// Display a confirmation dialog to inform the user there are no logged
-// results available.
-// ---------------------------------------------------------------------------
-//
-void CDevDiagSuiteView::DismissWaitDialogPreparingL()
-    {
-    LOGSTRING( "CDevDiagSuiteView::DismissWaitDialogPreparingL()" )
-
-    __ASSERT_DEBUG( iWaitDialog, Panic( EDevDiagApplicationGeneral ) );
-
-    // Stop the wait dialog.
-    iWaitDialog->ProcessFinishedL();
-    iWaitDialog = NULL;
-    
-    }
-
-// ---------------------------------------------------------------------------
-// Check and display a dialog if there is a crashed test record. Only the last
-// crashed test record is counted.
-// ---------------------------------------------------------------------------
-//
-void CDevDiagSuiteView::CheckCrashedTestL()
-    {
-    LOGSTRING("CDevDiagSuiteView::CheckCrashedTestL");
-    TUid pluginUid;
-    TBool found = EFalse;
-    TInt error = KErrNone;
-    found = iEngine.CrashedPluginL( pluginUid );
-    LOGSTRING2("CrashedPlugin Found = %d", found);
-    if ( found )
-        {        
-        //Complete the record. 
-        ///@@@KSR: changes for Codescanner error val = High 
-        //error = iEngine.CompleteCrashedTestRecord();
-        error = iEngine.CompleteCrashedTestRecordL();
-        
-        if ( error != KErrNone )
-            {
-            LOGSTRING2( "CDevDiagSuiteView::CheckCrashedTestL 1() error: %d", error );
-            Panic( EDevDiagCheckCrashedTest );
-            }
-        
-        MDiagPlugin* plugin = NULL;
-        error = iEngine.PluginPool().FindPlugin( pluginUid, plugin );
-        
-        HBufC* name = plugin->GetPluginNameL( MDiagPlugin::ENameLayoutPopupInfoPane );
-        CleanupStack::PushL( name );
-        
-        HBufC* text = StringLoader::LoadLC( R_DIAG_CONF_QUERY_AFTER_CRASH, *name );
-    	
-        CAknMessageQueryDialog* dlg = new (ELeave) CAknMessageQueryDialog;
-        
-        dlg->PrepareLC( R_DEVDIAG_EXECUTE_CRASHED_TEST_MESSAGEQUERY_DIALOG ); 
-         
-        dlg->SetMessageTextL( *text );
-        
-        HBufC* headerText = plugin->GetPluginNameL( MDiagPlugin::ENameLayoutHeadingPane );
-        CleanupStack::PushL( headerText );
-        
-        dlg->SetHeaderTextL( *headerText );
-        
-        CleanupStack::PopAndDestroy();
-
-        if (dlg->RunLD())
-    	    {	    
-    	    //Create a new test run. 
-    	    iEngine.ExecuteTestL( pluginUid,  *AppUi() );  
-    	    }
-    		                                                
-        CleanupStack::PopAndDestroy();    
-        CleanupStack::PopAndDestroy();
-        }    
-    }
-
-
-// ----------------------------------------------------------------------------
-// This is needed after performing a group of tests succesfully.
-// ----------------------------------------------------------------------------
-// 	
-void CDevDiagSuiteView::DisplayConfirmationDialogL( )
-	{	    
-    CAknConfirmationNote* note = 
-        new (ELeave) CAknConfirmationNote( ETrue ); //Waiting
-
-    HBufC* text = NULL;
-   
-    text = StringLoader::LoadLC( R_DIAG_CONF_TEST_PASSED );
-          
-    note->ExecuteLD( *text ); //Blocks until note dismissed
-
-    CleanupStack::PopAndDestroy();
-	}	
-	
-
-// ----------------------------------------------------------------------------
-// This is needed after performing a group of tests
-//
-// Display dialog text according to the test result.
-//
-// Message query dialog will display a list of failed test cases. 
-// ----------------------------------------------------------------------------
-// 		
-void CDevDiagSuiteView::DisplayMessageQueryDialogFailedResultsL()
-	{	
-    CAknMessageQueryDialog* dlg = new (ELeave) CAknMessageQueryDialog(); 
-   
-    dlg->PrepareLC( R_DEVDIAG_FAILED_TESTS_MESSAGEQUERY_DIALOG ); 
-
-    HBufC* failText = StringLoader::LoadL( R_DIAG_CONF_TEST_FAILED  );
-    CleanupStack::PushL( failText );
-        
-    HBufC* failedTests = CreateResultsTextsForFailedTestsLC( iEngine.ExecutionResults() );
-        
-    TInt newBufLength = failText->Length() + failedTests->Length();
-        
-    HBufC* text = HBufC::NewLC( newBufLength );        
-        
-    text->Des().Append( *failText );
-    text->Des().Append( *failedTests );
-    
-    dlg->SetMessageTextL( *text );
-        
-    CleanupStack::PopAndDestroy();
-    CleanupStack::PopAndDestroy();
-    CleanupStack::PopAndDestroy();    
-
-    if (dlg->RunLD())
-    	{	    
-    	
-    	}    		
-	}
-	
-	
-// ----------------------------------------------------------------------------
-// Loads names of the tests that failed.
-// ----------------------------------------------------------------------------
-// 		
-HBufC* CDevDiagSuiteView::CreateResultsTextsForFailedTestsLC( 
-                                    const CDevDiagExecResults& aExecResults )
-    {
-    LOGSTRING("CDevDiagSuiteView::CreateResultsTextsForFailedTestsLC");        
-    RBuf resultText;
-    CleanupClosePushL( resultText );
-    
-    resultText.CreateL( KFailedTestsMaxLength );
-    
-    TBool firstLineFeed = ETrue;
-    
-    for ( TInt i = 0; i < aExecResults.Count(); ++i )
-        {
-        const CDevDiagExecResults::CResult& result = aExecResults[i];
-        
-        //if item == NULL it is a test suite
-        const CDiagResultsDatabaseItem* item = result.Result();
-        
-        if (item && !item->WasDependency())
-            {
-        
-        //List failed test cases
-            if ( item && item->TestResult() == CDiagResultsDatabaseItem::EFailed )
-                {
-                const MDiagPlugin& plugin = result.Plugin();
-                
-                //Note the correct layout. Name is used in the pop-up info pane.
-                HBufC* name = plugin.GetPluginNameL( MDiagPlugin::ENameLayoutPopupInfoPane );
-                CleanupStack::PushL( name );
-                
-                if ( resultText.MaxLength() < resultText.Length() + name->Length() )
-                    {
-                    HBufC* temp = resultText.AllocLC();
-                    resultText.ReAlloc( resultText.Length() + KFailedTestsMaxLength );
-                    resultText.Append( *temp );
-                    CleanupStack::PopAndDestroy();
-                    }
-                
-                if ( !firstLineFeed )
-                    {
-                    resultText.Append( KLinefeed );
-                    }
-                else 
-                    {
-                    firstLineFeed = EFalse;        
-                    }
-                                
-                resultText.Append( *name );
-                resultText.Append(KTabfeed);
-                
-                CleanupStack::PopAndDestroy();
-                }
-            }
-        }
-            
-    //contains combined result texts                
-    HBufC* result = resultText.AllocL(); 
-    
-    CleanupStack::PopAndDestroy();
-    
-    CleanupStack::PushL( result );    
-    return result;
-    }
-//End of file
--- a/devicediagnostics/devdiagapp/src/devdiagutil.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,130 +0,0 @@
-/*
-* Copyright (c) 2007-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:  Utility classes.
-*
-*/
-
-
-
-// INCLUDES
-#include <eikenv.h>
-#include <bautils.h>
-#include <collate.h>
-#include <StringLoader.h>
-#include <avkon.rsg>
-
-
-#include "devdiagutil.h"
-
-
-
-/*****************************************************************************
- * class TDevDiagUtil
- *****************************************************************************/
-
-
-
-
-// -----------------------------------------------------------------------------
-// ConvertUniversalToHomeTime
-// -----------------------------------------------------------------------------
-//
-TTime TDevDiagUtil::ConvertUniversalToHomeTime( const TTime& aUniversalTime )
-    {
-    TTime time( aUniversalTime );   // time stores UTC time.
-
-    TLocale locale;
-    TTimeIntervalSeconds universalTimeOffset( locale.UniversalTimeOffset() );
-    
-    // Add locale's universal time offset to universal time.
-    time += universalTimeOffset;    // time stores Local Time.
-
-    // If home daylight saving in effect, add one hour offset.
-    if ( locale.QueryHomeHasDaylightSavingOn() )
-        {
-        TTimeIntervalHours daylightSaving(1);
-        time += daylightSaving;
-        }
-
-    return time;
-    }
-
-// -----------------------------------------------------------------------------
-// IsToDay
-// -----------------------------------------------------------------------------
-//
-TBool TDevDiagUtil::IsToday(TTime aTime)
-	{	
-	TTime now;
-	now.UniversalTime();
-	TInt day1 = now.DayNoInYear();
-	TInt day2 = aTime.DayNoInYear();
-	TTimeIntervalDays daysBetween = now.DaysFrom( aTime );
-	
-	if ( day1 != day2 )
-		{
-		return EFalse;
-		}
-		
-	if ( daysBetween.Int() > 0 )
-		{
-		return EFalse;
-		}
-
-	return ETrue; 
-	}
-
-
-// -----------------------------------------------------------------------------
-// TDevDiagUtil::GetDateTextL (not done today)
-// -----------------------------------------------------------------------------
-//
-void TDevDiagUtil::GetDateTextL(TDes& aText, TTime aDateTime)
-	{
-	TTime homeTime = ConvertUniversalToHomeTime( aDateTime );
-	HBufC* hBuf = StringLoader::LoadLC( R_QTN_DATE_USUAL_WITH_ZERO );
-    homeTime.FormatL( aText, *hBuf );
-    CleanupStack::PopAndDestroy( hBuf );
-	}
-
-
-// -----------------------------------------------------------------------------
-// TDevDiagUtil::GetTimeTextL (done today)
-// -----------------------------------------------------------------------------
-//
-void TDevDiagUtil::GetTimeTextL( TDes& aText, TTime aDateTime )
-	{
-	TTime homeTime = ConvertUniversalToHomeTime( aDateTime );
-	HBufC* hBuf = StringLoader::LoadLC( R_QTN_TIME_USUAL_WITH_ZERO );
-    homeTime.FormatL( aText, *hBuf );
-    CleanupStack::PopAndDestroy( hBuf );
-	}
-
-
-// -----------------------------------------------------------------------------
-// TDevDiagUtil::GetDateTimeTextL
-// -----------------------------------------------------------------------------
-//
-void TDevDiagUtil::GetDateTimeTextL( TDes& aText, TTime aDateTime )
-	{
-	TDateTime dt = aDateTime.DateTime();
-	aText.Format(_L("%02d.%02d.%04d %02d:%02d:%02d"), dt.Day()+1,
-	                                                  dt.Month()+1,
-	                                                  dt.Year(),
-	                                                  dt.Hour(),
-	                                                  dt.Minute(),
-	                                                  dt.Second() );
-	}
-
-
--- a/devicediagnostics/devdiaggsplugin/data/2000E544.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-/*
-* Copyright (c) 2000 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:  ECOM plugin resource file for Diagnostics
-*
-*/
-
-#include <registryinfo.rh>
-
-
-RESOURCE REGISTRY_INFO theInfo
-    {
-    dll_uid     = 0x2000E544;
-    interfaces  =
-        {
-        INTERFACE_INFO
-            {
-            interface_uid   = 0x10207236;
-            implementations =
-                {
-                IMPLEMENTATION_INFO
-                    {
-                    implementation_uid  = 0x2000E543;
-                    version_no          = 1;
-                    display_name        = "Diagnostics";
-                    default_data        = "0x10283317";
-                    opaque_data         = "40";//Order number
-               
-                    }
-                };
-            }
-        };
-    }
-
-
-// End of File
--- a/devicediagnostics/devdiaggsplugin/data/gsdevdiagpluginrsc.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +0,0 @@
-/*
-* Copyright (c) 2007-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:  Resource file for GSDDPlugin
-*
-*/
-
-
-
-//  RESOURCE IDENTIFIER
-NAME    GSDD // 4 letter ID
-
-//  INCLUDES
-#include    "gsdevdiagplugin.hrh"
-#include    <gsdevdiagplugin.loc>
-
-#include    <gs.loc>
-#include    <gscommon.rh>
-#include    <appinfo.rh>
-#include    <avkon.loc>
-#include    <avkon.mbg>
-#include    <avkon.rsg>
-#include    <AvkonIcons.hrh>
-#include    <bldvariant.hrh>
-#include    <data_caging_paths_strings.hrh>
-#include    <eikcore.rsg>
-#include    <eikon.rsg>
-#include    <uikon.rh>
-//#include    <GSApp.rsg>
-
-// CONSTANTS
-
-//  RESOURCE DEFINITIONS
-
-RESOURCE RSS_SIGNATURE
-    {
-    }
-
-// Common resources among GS
-//#include    "..\data\GSCommonResources.rss"
-
-
-RESOURCE TBUF
-    {
-    buf="DDAP";
-    }
-
-
-RESOURCE TBUF r_gs_diagnostics_view_caption
-    {
-    buf = qtn_diag_diagnostics_title;
-    }
-
-
-
-//End of File
--- a/devicediagnostics/devdiaggsplugin/group/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-/*
-* 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:  This file provides the information required for building
-*                GSDDPlugin.
-*
-*/
-
-
-#include <platform_paths.hrh>
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-../rom_files/gsdevdiagplugin.iby            CORE_APP_LAYER_IBY_EXPORT_PATH(gsdevdiagplugin.iby)
-../rom_files/gsdevdiagplugin_resources.iby  LANGUAGE_APP_LAYER_IBY_EXPORT_PATH(gsdevdiagplugin_resources.iby)
-../loc/gsdevdiagplugin.loc        			MW_LAYER_LOC_EXPORT_PATH(gsdevdiagplugin.loc)
-
-
-PRJ_EXTENSIONS
-#ifdef SBSV2
- START EXTENSION s60/mifconv
- OPTION TARGETFILE GSDevDiagPlugin.mif
- OPTION HEADERFILE GSDevDiagPlugin.mbg
- OPTION SOURCES 	-c8,8 qgn_prop_set_conn_data
- END
-#endif
-
-PRJ_MMPFILES
-//gnumakefile GSDevDiagPluginIcons.mk
-gsdevdiagplugin.mmp
-
-#ifndef SBSV2
- gnumakefile gsdevdiagpluginicons.mk
-#endif
-
-PRJ_TESTMMPFILES
-
-//  End of File
--- a/devicediagnostics/devdiaggsplugin/group/clean.cmd	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-rem
-rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-rem All rights reserved.
-rem This component and the accompanying materials are made available
-rem under the terms of "Eclipse Public License v1.0"
-rem which accompanies this distribution, and is available
-rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
-rem
-rem Initial Contributors:
-rem Nokia Corporation - initial contribution.
-rem
-rem Contributors:
-rem
-rem Description:
-rem
-
-del *.cwlink
-del *.mcp
-del *.xml
-del *.resources
-del *_UID_.cpp
-rd GSDDPlugin_Data /s /q
\ No newline at end of file
--- a/devicediagnostics/devdiaggsplugin/group/gsdevdiagplugin.mmp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,87 +0,0 @@
-/*
-* Copyright (c) 2007-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:  Device Diagnostics control panel plug-in
-*
-*/
-
-
-#include  <data_caging_paths.hrh>    // For RESOURCE_FILES_DIR
-// To get the MW_LAYER_SYSTEMINCLUDE-definition
-#include <platform_paths.hrh>
-
-CAPABILITY          CAP_ECOM_PLUGIN
-TARGET              gsdevdiagplugin.dll
-TARGETTYPE          PLUGIN
-UID                 0x10009D8D 0x2000E544
-VENDORID            VID_DEFAULT
-
-
-SOURCEPATH  ../src
-SOURCE      gsdevdiagpluginimplementationtable.cpp
-SOURCE      gsdevdiagplugin.cpp
-
-
-//User include paths
-USERINCLUDE     ../inc
-USERINCLUDE     ../data // For *.rh
-
-
-//System include paths
-SYSTEMINCLUDE   /epoc32/include/ecom
-SYSTEMINCLUDE   /epoc32/include/cshelp
-// Default system include paths for middleware layer modules.
-APP_LAYER_SYSTEMINCLUDE
-
-SOURCEPATH      ../data
-
-START RESOURCE  2000E544.rss
-TARGET          gsdevdiagplugin.rsc
-TARGETPATH      ECOM_RESOURCE_DIR
-END
-
-START RESOURCE  gsdevdiagpluginrsc.rss
-DEPENDS	GSApp.rsg
-HEADER
-TARGETPATH      RESOURCE_FILES_DIR
-LANGUAGE_IDS
-END
-
-
-LIBRARY   euser.lib
-LIBRARY   ecom.lib
-LIBRARY   efsrv.lib
-LIBRARY   avkon.lib
-LIBRARY   eikctl.lib 
-LIBRARY   bafl.lib
-LIBRARY   cone.lib
-LIBRARY   eikcoctl.lib
-LIBRARY   eikcore.lib
-LIBRARY   egul.lib
-LIBRARY   eikdlg.lib            // eikon dialogs
-
-LIBRARY   apparc.lib
-LIBRARY   apgrfx.lib // RApaLsSession
-LIBRARY   ws32.lib 
-
-
-LIBRARY   commonengine.lib      // For RConeResourceLoader
-LIBRARY   featmgr.lib           // Feature manager
-LIBRARY   aknskinsrv.lib        // for enhanced skinning
-LIBRARY   aknskins.lib          // for enhanced skinning
-LIBRARY   hlplch.lib            // for "Help" options menu
-LIBRARY   gsframework.lib       // For base classes
-LIBRARY   flogger.lib           // For GSLogger
-LIBRARY   gsecomplugin.lib
-
-// End of File
\ No newline at end of file
--- a/devicediagnostics/devdiaggsplugin/group/gsdevdiagpluginicons.mk	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +0,0 @@
-#
-# Copyright © 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:
-#    This is a device diagnostics component
-
-ifeq (WINS,$(findstring WINS, $(PLATFORM)))
-ZDIR=\epoc32\release\$(PLATFORM)\udeb\z
-else
-ZDIR=\epoc32\data\z
-endif
-
-# ----------------------------------------------------------------------------
-# ----------------------------------------------------------------------------
-
-TARGETDIR=$(ZDIR)\resource\apps
-HEADERDIR=\epoc32\include
-ICONTARGETFILENAME=$(TARGETDIR)\GSDevDiagPlugin.mif
-HEADERFILENAME=$(HEADERDIR)\GSDevDiagPlugin.mbg
-
-MAKMAKE : 	
-	mifconv $(ICONTARGETFILENAME) \
-	/h$(HEADERFILENAME) \
-	/c8,8 qgn_prop_set_conn_data.svg
-					
-
-
-BLD : ;
-
-CLEAN : ;
-
-LIB : ;
-
-CLEANLIB : ;
-
-# ----------------------------------------------------------------------------
-#
-# NOTE 1: DO NOT DEFINE MASK FILE NAMES! They are included automatically by
-# MifConv if the mask detph is defined.
-#
-# NOTE 2: Usually, source paths should not be included in the bitmap
-# definitions. MifConv searches for the icons in all icon directories in a
-# predefined order, which is currently \s60\icons, \s60\bitmaps2, \s60\bitmaps.
-# The directory \s60\icons is included in the search only if the feature flag
-# __SCALABLE_ICONS is defined.
-# ----------------------------------------------------------------------------
-
-RESOURCE : ;
-
-
-
-FREEZE : ;
-
-SAVESPACE : ;
-
-RELEASABLES :
-	@echo $(HEADERFILENAME)&& \
-	@echo $(ICONTARGETFILENAME)
-
-FINAL : ;
--- a/devicediagnostics/devdiaggsplugin/inc/gsdevdiagplugin.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,202 +0,0 @@
-/*
-* Copyright (c) 2007-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:  Launch Diagnostics embedded application.
-*                 (DevDiagApp.exe) The UID3 is defined below.
-*
-*/
-
-
-#ifndef GSDDPLUGIN_H
-#define GSDDPLUGIN_H
-
-// INCLUDES
-#include <gsplugininterface.h>
-#include <ConeResLoader.h>
-#include <AknServerApp.h>
-
-//CONSTANTS
-const TUid KGSDDPluginUid = { 0x2000E543 };
-const TUid KGsDiagnosticsAppUid  = { 0x2000E542 }; //app to be laucnhed 
-//_LIT( KGSDDPluginIconDirAndName, "z:GSDDPlugin.mbm"); // Use KDC_BITMAP_DIR
-_LIT( KGSDDPluginIconDirAndName, "z:GSDevDiagPlugin.mif"); // Use KDC_BITMAP_DIR or ?? KDC_APP_BITMAP_DIR
-_LIT( KGSDiagnosticsApp,    "z:\\sys\\bin\\DevDiagApp.exe" );
-
-
-// MACROS
-
-// DATA TYPES
-
-// FUNCTION PROTOTYPES
-
-// FORWARD DECLARATIONS
-class CAknNullService;
-
-
-// CLASS DEFINITION
-/**
-*  CGSDevDiagPlugin view class 
-*  @since S60 5.0
-*
-*/
-class CGSDevDiagPlugin : public CGSPluginInterface,
-                         public MAknServerAppExitObserver // Embedding
-
-    {
-    
-    /**
-    * Contains application information
-    *
-    *  @since S60 5.0
-    **/
-    class TAppInfo
-     {
-     public:
-         TAppInfo( TUid aUid, const TDesC& aFile )
-             : iUid( aUid ), iFile( aFile )
-             {}
-         TUid iUid; //Uid3
-         TFileName iFile; //full filename of the app.
-     };
-
-    
-public: // Constructors and destructor
-
-    /**
-    * Symbian OS two-phased constructor
-    * @return GS connection view.
-    */
-    static CGSDevDiagPlugin* NewL( TAny* aInitParams );
-
-    /**
-    * Destructor
-    */
-    ~CGSDevDiagPlugin();
-    
-public: // From CGSPluginInterface
-
-    /**
-    * @see CGSPluginInterface header file.
-    */
-    void GetCaptionL( TDes& aCaption ) const;
-
-    /**
-    * See base class.
-    */
-    CGulIcon* CreateIconL( const TUid aIconType );
-
-    /**
-    * @see CGSPluginInterface header file.
-    */
-    TInt PluginProviderCategory() const;
-    
-    /**
-    * GS framework calls this method when plug-in is opened.
-    * The method launches the embedded application.
-    **/
-    void HandleSelection( const TGSSelectionTypes aSelectionType );
-    
-    /**
-    * See base class.
-    */
-    TGSListboxItemTypes ItemType();
-
-    /**
-    * See base class.
-    */
-    void GetValue( const TGSPluginValueKeys aKey,
-                       TDes& aValue );
-
-public: //from MAknServerAppExitObserver
-    
-    /**
-    * Close the GS when embedded application is shutdown.
-    **/
-    virtual void HandleServerAppExit(TInt aReason);
-
-    
-public: //From CAknView
-
-    /**
-    * From CAknView.
-    * Returns views id.
-    **/
-    TUid Id() const;
-
-
-protected:
-    /**
-    * From CAknView Activates view.
-    * @since Series 60 3.1
-    * @param aPrevViewId Id of previous view.
-    * @param aCustomMessageId Custom message id.
-    * @param aCustomMessage Custom message.
-    * @return None.
-    */
-    virtual void DoActivateL (const TVwsViewId &aPrevViewId, 
-                                       TUid aCustomMessageId, 
-                                       const TDesC8 &aCustomMessage);
-    /**
-    * From CAknView Deactivates view.        
-    * @since Series 60 3.1
-    * @param None.
-    * @return None.
-    */
-    virtual void DoDeactivate();     
-    
-private:
-    
-    /**
-    * ConstructL
-    **/
-    void ConstructL();
-    
-    /**
-    * Default constructor
-    **/
-    CGSDevDiagPlugin();
-    
-    /**
-    * Open localised resource file.
-    *
-    * @aResourceFileName Full path name of the resource file.
-    * @aRsourceLoader 
-    **/
-    void OpenLocalizedResourceFileL(
-            const TDesC& aResourceFileName,
-            RConeResourceLoader& aResourceLoader );
-            
-   /**
-   * Launch DevDiagApp.exe as an embedded application 
-   **/            
-   void LaunchDiagnosticsAppL();
-         
-   /**
-   * Calls null service to launch the application.
-   *
-   * @param aApp The application to be launched.
-   **/      
-   void EmbedAppL( const TAppInfo& aApp );      
-            
-private:
-               
-     // resource loader
-    RConeResourceLoader iResourceLoader;
-    
-    // Mysterious embedded app launcher.
-    CAknNullService* iNullService;             
-    };
-
-#endif //GSDDPLUGIN_H
-
-// End of File
--- a/devicediagnostics/devdiaggsplugin/inc/gsdevdiagplugin.hrh	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-/*
-* Copyright (c) 2007-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:  Contains common definitions for menu id:s
-*
-*/
-
-
-#ifndef GSDDPLUGIN_HRH
-#define GSDDPLUGIN_HRH
-
-#define _UID3 0x2000E544
-
-// commands
-
-
-#endif //  GSDDPlugin_HRH
-
-//End of File
--- a/devicediagnostics/devdiaggsplugin/inc/gsdevdiagplugin.loc	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-/*
-* Copyright (c) 2007-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:  Localization strings for GSDDPlugin.
-*
-*/
-
-
-//  LOCALISATION STRINGS
-
-// NEW
-
-//d:Diagnostics application text in the GS listbox view.
-//l:list_single_large_graphic_pane_t1
-//r:5.0
-//
-#define qtn_diag_diagnostics_title "Diagnostics"
-
-
-           
-// End of File
-
-
--- a/devicediagnostics/devdiaggsplugin/loc/gsdevdiagplugin.loc	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-/*
-* Copyright (c) 2007-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:  Localization strings for GSDDPlugin.
-*
-*/
-
-
-//  LOCALISATION STRINGS
-
-// NEW
-
-//d:Diagnostics application text in the GS listbox view.
-//l:list_single_large_graphic_pane_t1
-//r:5.0
-//
-#define qtn_diag_diagnostics_title "Diagnostics"
-
-
-           
-// End of File
-
-
--- a/devicediagnostics/devdiaggsplugin/rom_files/gsdevdiagplugin.iby	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-/*
-* 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:  GS plug-in IBY definition.
-*
-*/
-
-
-#ifndef __GSDEVDIAGPLUGIN_IBY__
-#define __GSDEVDIAGPLUGIN_IBY__
-
-#ifdef FF_DEVICE_DIAGNOSTICS_APP 
-
-#include <data_caging_paths_for_iby.hrh>
-
-ECOM_PLUGIN( gsdevdiagplugin.dll, gsdevdiagplugin.rsc )
-data=DATAZ_\BITMAP_DIR\GSDevDiagPlugin.mif BITMAP_DIR\GSDevDiagPlugin.mif
-
-#endif
-
-#endif // __GSDEVDIAGPLUGIN_IBY__
-
-// end of file
--- a/devicediagnostics/devdiaggsplugin/rom_files/gsdevdiagplugin_resources.iby	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-/*
-* 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:  GS plug-in IBY definition.
-*
-*/
-
-
-#ifndef __GSDEVDIAGPLUGIN_RESOURCES_IBY__
-#define __GSDEVDIAGPLUGIN_RESOURCES_IBY__
-
-#ifdef FF_DEVICE_DIAGNOSTICS_APP 
-
-#include <data_caging_paths_for_iby.hrh>
-
-data=DATAZ_\RESOURCE_FILES_DIR\gsdevdiagpluginrsc.rsc RESOURCE_FILES_DIR\gsdevdiagpluginrsc.rsc
-
-#endif 
-
-#endif // __GSDEVDIAGPLUGIN_RESOURCES_IBY__
-
-// end of file
--- a/devicediagnostics/devdiaggsplugin/src/gsdevdiagplugin.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,327 +0,0 @@
-/*
-* Copyright (c) 2007-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:  General Settings plug-in that launches an embedded 
-*                 application.
-*
-*/
-
-
-// INCLUDE FILES
-#include "gsdevdiagplugin.h"
-#include "gsdevdiagplugin.hrh"
-
-#include <GSDevDiagPlugin.mbg> // Icons
-#include <gsdevdiagpluginrsc.rsg>
-#include <gsprivatepluginproviderids.h>
-
-#include <StringLoader.h>
-#include <bautils.h>
-#include <AknNullService.h>
-
-// EXTERNAL DATA STRUCTURES
-
-// EXTERNAL FUNCTION PROTOTYPES
-
-// CONSTANTS
-
-// MACROS
-
-// LOCAL CONSTANTS AND MACROS
-//const TInt KGSAutodTimeIndex = 0;
-
-_LIT( KGSDDPluginResourceFileName, "z:GSDevDiagPluginRsc.rsc" );
-
-// MODULE DATA STRUCTURES
-
-// LOCAL FUNCTION PROTOTYPES
-
-// FORWARD DECLARATIONS
-
-// ============================= LOCAL FUNCTIONS ==============================
-
-// ========================= MEMBER FUNCTIONS ================================
-
-// ----------------------------------------------------------------------------
-// CGSDevDiagPlugin::CGSDevDiagPlugin()
-//
-// Constructor
-// ----------------------------------------------------------------------------
-//
-CGSDevDiagPlugin::CGSDevDiagPlugin(): iResourceLoader( *iCoeEnv ), 
-    iNullService(NULL)
-    {
-    }
-
-
-// ---------------------------------------------------------------------------
-// CGSDevDiagPlugin::NewL()
-//
-// Symbian OS default constructor
-// ---------------------------------------------------------------------------
-CGSDevDiagPlugin* CGSDevDiagPlugin::NewL( TAny* /*aInitParams*/ )
-    {
-    CGSDevDiagPlugin* self = new( ELeave ) CGSDevDiagPlugin ();
-
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop();
-
-    return self;
-    }
-
-// ---------------------------------------------------------------------------
-// CGSDevDiagPlugin::ConstructL()
-//
-// Symbian OS two-phased constructor
-// ---------------------------------------------------------------------------
-void CGSDevDiagPlugin::ConstructL()
-    {
-    OpenLocalizedResourceFileL( KGSDDPluginResourceFileName, iResourceLoader);    
-    }
-
-
-// ----------------------------------------------------------------------------
-// CGSDevDiagPlugin::~CGSDevDiagPlugin
-//
-// Destructor
-// ----------------------------------------------------------------------------
-CGSDevDiagPlugin::~CGSDevDiagPlugin()
-    {
-    iResourceLoader.Close();
-    
-    if ( iNullService )
-    	{
-        delete iNullService;
-        }
-    }
-
-
-// ---------------------------------------------------------------------------
-// TUid CGSDevDiagPlugin::Id()
-//
-// Returns view's ID.
-// ---------------------------------------------------------------------------
-TUid CGSDevDiagPlugin::Id() const
-    {
-    return KGSDDPluginUid;
-    }
-
-// ----------------------------------------------------------------------------
-// CGSDevDiagPlugin::GetCaption
-//
-// Return application/view caption.
-// ----------------------------------------------------------------------------
-//
-void CGSDevDiagPlugin::GetCaptionL( TDes& aCaption ) const
-    {
-    // the resource file is already opened.
-    HBufC* result = StringLoader::LoadL( R_GS_DIAGNOSTICS_VIEW_CAPTION );
-
-    aCaption.Copy( *result );
-    delete result;
-    }
-
-
-// ----------------------------------------------------------------------------
-// CGSDevDiagPlugin::PluginProviderCategory
-//
-// A means to identify the location of this plug-in in the framework.
-// ----------------------------------------------------------------------------
-//
-TInt CGSDevDiagPlugin::PluginProviderCategory() const
-    {
-    //To identify internal plug-ins.
-    return KGSPluginProviderInternal;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CGSDevDiagPlugin::ItemType (from CGSPluginInterface)
-//
-// -----------------------------------------------------------------------------
-//
-TGSListboxItemTypes CGSDevDiagPlugin::ItemType()
-    {
-    return EGSItemTypeSettingDialog;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CGSDevDiagPlugin::GetValue (from CGSPluginInterface)
-//
-// -----------------------------------------------------------------------------
-//
-void CGSDevDiagPlugin::GetValue( const TGSPluginValueKeys /*aKey*/,
-                                      TDes& /*aValue*/ )
-    {
-    }
-// ---------------------------------------------------------------------------
-// CAuthtypePlugin::CreateIconL
-// ---------------------------------------------------------------------------
-//
-CGulIcon* CGSDevDiagPlugin::CreateIconL( const TUid aIconType )
-    {
-
-   //EMbm<Mbm_file_name><Bitmap_name>
-    CGulIcon* icon;
-    TParse* fp = new( ELeave ) TParse();
-    CleanupStack::PushL( fp );
-    fp->Set( KGSDDPluginIconDirAndName, &KDC_BITMAP_DIR, NULL );
-
-    if ( aIconType == KGSIconTypeLbxItem )
-        {
-        icon = AknsUtils::CreateGulIconL(
-        AknsUtils::SkinInstance(),
-        KAknsIIDDefault,
-        fp->FullName(),
-        EMbmGsdevdiagpluginQgn_prop_set_conn_data, 
-        EMbmGsdevdiagpluginQgn_prop_set_conn_data_mask );
-        }    
-    else
-        {
-        icon = CGSPluginInterface::CreateIconL( aIconType );
-        }
-        
-    CleanupStack::PopAndDestroy( fp );
-    return icon;
-	
-   }
-   
-// ----------------------------------------------------------------------------
-// CGSDevDiagPlugin::DoActivateL
-//
-// Do nothing. See HandleSelection.
-// ----------------------------------------------------------------------------
-//
-void CGSDevDiagPlugin::DoActivateL( const TVwsViewId& /*aPrevViewId*/,
-                                     TUid /*aCustomMessageId*/,
-                                     const TDesC8& /*aCustomMessage*/ )
-    {
-    }
-
-// ----------------------------------------------------------------------------
-// CGSDevDiagPlugin::DoDeactivate
-//
-// Do nothing. See HandleSelection.
-// ----------------------------------------------------------------------------
-//
-void CGSDevDiagPlugin::DoDeactivate()
-    {
-    }
-
-
-// ----------------------------------------------------------------------------
-// Opens the resource file, because it is not loaded automatically by the
-// GS framework.
-// ----------------------------------------------------------------------------
-//
-void CGSDevDiagPlugin::OpenLocalizedResourceFileL(
-    const TDesC& aResourceFileName,
-    RConeResourceLoader& aResourceLoader )
-    {
-    RFs fsSession;
-    User::LeaveIfError( fsSession.Connect() );
-
-    // Find the resource file:
-    TParse parse;
-    parse.Set( aResourceFileName, &KDC_RESOURCE_FILES_DIR, NULL );
-    TFileName fileName( parse.FullName() );
-
-    // Get language of resource file:
-    BaflUtils::NearestLanguageFile( fsSession, fileName );
-
-    // Open resource file:
-    aResourceLoader.OpenL( fileName );
-
-    // If leave occurs before this, close is called automatically when the
-    // thread exits.
-    fsSession.Close();
-    }
-    
-        
- // -----------------------------------------------------------------------------
- // GS calls this function when plug-in is opened.
- //
- // -----------------------------------------------------------------------------
- //          
-void CGSDevDiagPlugin::HandleSelection(
-     const TGSSelectionTypes /*aSelectionType*/ )
-     {
-     TRAP_IGNORE( LaunchDiagnosticsAppL() );
-     }
- 
-
- // -----------------------------------------------------------------------------
- // CGSDevDiagPlugin::LaunchDiagnosticsAppL
- //
- // Checks first is the application already running.
- // -----------------------------------------------------------------------------
- //
-void CGSDevDiagPlugin::LaunchDiagnosticsAppL()
-    {
-    // Get the correct application data
-    RWsSession ws;
-    User::LeaveIfError(ws.Connect());
-    CleanupClosePushL(ws);
- 
-    // Find the task with uid
-    TApaTaskList taskList(ws);
-    TApaTask task = taskList.FindApp( KGsDiagnosticsAppUid );
- 
-    if ( task.Exists() )
-        {
-        task.BringToForeground();
-        }
-    else
-        {
-        //Launch Diagnostics application as embedded
-        TAppInfo app( KGsDiagnosticsAppUid, KGSDiagnosticsApp );
-        EmbedAppL( app );
-        }
-    CleanupStack::PopAndDestroy(&ws);
-    }
-
-
- // -----------------------------------------------------------------------------
- // Handle Diagnostics application exit. GS should be closed down also.
- //
- // -----------------------------------------------------------------------------
- //
-void CGSDevDiagPlugin::HandleServerAppExit(TInt aReason )
-   {
-   if ( aReason != EAknSoftkeyBack )
-        {
-        TRAP_IGNORE(AppUi()->HandleCommandL( EAknSoftkeyExit ));
-        }      
-   }
-
-
- // -----------------------------------------------------------------------------
- // Use null service to launch the embedded application
- //
- // -----------------------------------------------------------------------------
- //
-void CGSDevDiagPlugin::EmbedAppL( const TAppInfo& aApp )
-    {
-    if ( iNullService )
-        {
-        delete iNullService;
-        iNullService = NULL;
-        }
-        
-    iNullService = CAknNullService::NewL( aApp.iUid, this );
-    }
- 
-
-// End of File
--- a/devicediagnostics/devdiaggsplugin/src/gsdevdiagpluginimplementationtable.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-/*
-* 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:  ECOM proxy table for GSDDPlugin
-*
-*/
-
-
-// INCLUDES
-#include "gsdevdiagplugin.h"
-
-#include <e32std.h>
-#include <implementationproxy.h>
-
-
-// CONSTANTS
-const TImplementationProxy KGSDevDiagPluginImplementationTable[] = 
-	{
-	IMPLEMENTATION_PROXY_ENTRY( 0x2000E543,	CGSDevDiagPlugin::NewL )
-	};
-
-
-// ---------------------------------------------------------------------------
-// ImplementationGroupProxy
-// 
-// Gate/factory function
-// ---------------------------------------------------------------------------
-//
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy( 
-                                                  TInt& aTableCount )
-	{
-	aTableCount = sizeof( KGSDevDiagPluginImplementationTable ) 
-        / sizeof( TImplementationProxy );
-	return KGSDevDiagPluginImplementationTable;
-	}
-
-
-
-// End of File
--- a/devicediagnostics/diagplugins/DiagInternalMemoryPlugin/data/devdiaginternalmemoryplugin.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-/*
-* 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:  ECOM plugin resource file for Internal Memory Plugin
-*
-*/
-
-#include <registryinfo.rh>
-
-
-RESOURCE REGISTRY_INFO theInfo
-    {
-    dll_uid     = 0x2000E588;
-    interfaces  =
-        {
-        INTERFACE_INFO
-            {
-            interface_uid   = 0x2000AFEB;
-            implementations =
-                {
-                IMPLEMENTATION_INFO
-                    {
-                    implementation_uid  = 0x2000E589;
-                    version_no          = 1;
-                    display_name        = "Internal Flash Memory Plugin";
-                    default_data        = "0x2000E569"; //HW suite";
-                    opaque_data         =   "<diagplugininfo>" 
-                                                "<order number=\"40\"/>"
-                                            "</diagplugininfo>";
-                    }
-                };
-            }
-        };
-    }
-
-
-// End of File
--- a/devicediagnostics/diagplugins/DiagInternalMemoryPlugin/data/devdiaginternalmemorypluginrsc.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,236 +0,0 @@
-/*
-* 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:  Resource file for DiagInternalMemoryPlugin
-*
-*/
-
-
-
-//  RESOURCE IDENTIFIER
-NAME    DGIM // 4 letter ID
-
-//  INCLUDES
-#include    "diaginternalmemoryplugin.hrh"
-#include    <diaginternalmemoryplugin.loc>
-
-#include    <avkon.loc>
-#include    <avkon.mbg>
-#include    <avkon.rsg>
-#include    <avkon.rh>
-
-#include    <AvkonIcons.hrh>
-#include    <bldvariant.hrh>
-#include    <data_caging_paths_strings.hrh>
-#include    <eikcore.rsg>
-#include    <eikon.rsg>
-#include    <uikon.rh>
-#include    <eikon.rh>
-
-// CONSTANTS
-
-//  RESOURCE DEFINITIONS
-
-RESOURCE RSS_SIGNATURE
-    {
-    }
-
-RESOURCE TBUF
-    {
-    buf="DGIM";
-    }
-
-//----------------------------------------------------
-//  r_diag_lst_internal_memory
-//
-// Internal Memory Plugin Caption 
-//----------------------------------------------------
-//
-RESOURCE TBUF r_diag_lst_internal_memory
-    {
-    buf = qtn_diag_lst_internal_memory;
-    }
-
-//----------------------------------------------------
-//  r_qtn_diag_lst_test_internal_memory
-//
-// Internal Memory Plugin Text 
-//----------------------------------------------------
-//
-RESOURCE TBUF r_qtn_diag_lst_test_internal_memory
-    {
-    buf = qtn_diag_lst_test_internal_memory;
-    }
-    
-
-//----------------------------------------------------
-//  r_qtn_diag_msg_title_internal_memory
-//
-// Internal Memory Plugin Text 
-//----------------------------------------------------
-//
-RESOURCE TBUF r_qtn_diag_msg_title_internal_memory
-    {
-    buf = qtn_diag_msg_title_internal_memory;
-    }
-
-//----------------------------------------------------
-//  r_qtn_diag_msg_info_internal_memory
-//
-// Internal Memory Plugin Text 
-//----------------------------------------------------
-//
-RESOURCE TBUF r_qtn_diag_msg_info_internal_memory
-    {
-    buf = qtn_diag_conf_test_failed_internal_memory;
-    }
-
-//----------------------------------------------------
-//  r_qtn_diag_title_test_internal_memory
-//
-// Internal Memory Plugin Text 
-//----------------------------------------------------
-//
-RESOURCE TBUF r_qtn_diag_title_test_internal_memory
-    {
-    buf = qtn_diag_title_test_internal_memory;
-    }
-
-//----------------------------------------------------
-// r_memory_softkeys_ok_skip
-//----------------------------------------------------
-//
-RESOURCE CBA r_int_memory_softkeys_ok_skip
-    {
-    buttons = 
-        {
-         CBA_BUTTON 
-            { 
-            id  = EAknSoftkeyOk; 
-            txt = text_softkey_ok;
-            },
-        CBA_BUTTON 
-            { 
-            id  = ECBACmdSkip;       // .hrh 
-            txt = qtn_diag_softk_skip;  // .rls or .loc
-            }       
-        };
-    }
-    
-
-// ADO & Platformization Changes
-//----------------------------------------------------
-// r_memory_softkeys_ok_skip
-//----------------------------------------------------
-//
-RESOURCE CBA r_int_memory_softkeys_ok_cancel
-    {
-    buttons = 
-        {
-         CBA_BUTTON 
-            { 
-            id  = EAknSoftkeyOk; 
-            txt = text_softkey_ok;
-            },
-        CBA_BUTTON 
-            { 
-            id  = ECBACmdCancel;       // .hrh 
-            txt = text_softkey_cancel;  
-            }       
-        };
-    }
-
-//----------------------------------------------------
-// r_memorytest_description
-//
-// Memory test description dialog
-//----------------------------------------------------
-//
-RESOURCE DIALOG r_messagequery_title_internalmemory // ADO & Platformization Changes
-    {
-    flags   = EGeneralQueryFlags;    
-    buttons = r_int_memory_softkeys_ok_skip; // ADO & Platformization Changes
-    items =
-        {
-        DLG_LINE
-             {
-             type = EAknCtPopupHeadingPane;
-             id   = EAknMessageQueryHeaderId;
-
-             control = AVKON_HEADING
-                 {              
-                    label = qtn_diag_msg_title_internal_memory;
-                    headinglayout = R_AVKON_WML_SIGN_QUERY_HEADING_PANE;
-                 };
-             },
-    
-        DLG_LINE
-            {
-            type = EAknCtMessageQuery;   // avkon.hrh
-            id   = EAknMessageQueryContentId; // .hrh
-            control = AVKON_MESSAGE_QUERY // avkon.hrh
-                {
-                message   = qtn_diag_msg_info_internal_memory;          // .loc
-                };
-            }
-        };
-    }
-
-	//----------------------------------------------------
-//  r_extmem_softkeys_stop__cancel
-//
-// Buttons shown during the test. Shown when the
-// test is run as a part of a suite.
-//----------------------------------------------------
-//
-RESOURCE CBA r_intmem_softkeys_cancel
-    {
-    buttons = 
-        {
-       CBA_BUTTON 
-	        { 
-            id  = EAknSoftkeyEmpty; 
-            txt = text_softkey_empty;
-	        },
-
-        CBA_BUTTON 
-	        { 
-            id  = ECBACmdCancel;      // .hrh 
-            txt = text_softkey_cancel; // .rls or .loc
-	        } 
-
-	
-        };
-    }
-	
-RESOURCE DIALOG r_intmem_plugin_wait_note
-    {
-    flags = EAknWaitNoteFlags | EEikDialogFlagNotifyEsc;
-    //buttons = R_AVKON_SOFTKEYS_EMPTY;
-	buttons = r_intmem_softkeys_cancel;
-    items =
-        {
-        DLG_LINE
-            {
-            type = EAknCtNote;
-            id = EYBWaitNoteId;
-            control= AVKON_NOTE 
-                { 
-                layout = EWaitLayout;
-                singular_label = qtn_diag_msg_testing_internal_memory;
-                animation = R_QGN_GRAF_WAIT_BAR_ANIM;
-                };
-            }
-        };
-    }
-//End of File
--- a/devicediagnostics/diagplugins/DiagInternalMemoryPlugin/group/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-/*
-* 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:  This file provides the information required for building
-*                DiagInternalMemoryPlugin
-*
-*/
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-../loc/diaginternalmemoryplugin.loc        MW_LAYER_LOC_EXPORT_PATH(diaginternalmemoryplugin.loc)
-../rom_files/diaginternalmemoryplugin.iby		CORE_MW_LAYER_IBY_EXPORT_PATH(diaginternalmemoryplugin.iby)
-../rom_files/diaginternalmemoryplugin_resources.iby		LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(diaginternalmemoryplugin_resources.iby)
-
-PRJ_MMPFILES
-diaginternalmemoryplugin.mmp
-
-
-PRJ_TESTMMPFILES
-
-//  End of File
--- a/devicediagnostics/diagplugins/DiagInternalMemoryPlugin/group/diaginternalmemoryplugin.mmp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +0,0 @@
-/*
-* 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:  Project specification file.
-*
-*/
-
-
-#include  <data_caging_paths.hrh>    // For RESOURCE_FILES_DIR
-// To get the MW_LAYER_SYSTEMINCLUDE-definition
-#include <platform_paths.hrh>
-
-CAPABILITY          CAP_ECOM_PLUGIN
-TARGET              devdiaginternalmemoryplugin.dll
-TARGETTYPE          PLUGIN
-UID                 0x10009D8D 0x2000E588
-VENDORID            VID_DEFAULT
-
-
-SOURCEPATH  ../src
-SOURCE      diaginternalmemorypluginimplementationtable.cpp
-SOURCE      diaginternalmemoryplugin.cpp
-
-//User include paths
-USERINCLUDE     ../inc
-USERINCLUDE     ../data // For *.rh
-USERINCLUDE     ../loc
-
-//System include paths
-SYSTEMINCLUDE   /epoc32/include/ecom
-
-// Default system include paths for middleware layer modules.
-APP_LAYER_SYSTEMINCLUDE
-
-SOURCEPATH      ../data
-
-START RESOURCE  devdiaginternalmemoryplugin.rss
-TARGET          devdiaginternalmemoryplugin.rsc
-TARGETPATH      ECOM_RESOURCE_DIR
-END
-
-START RESOURCE  devdiaginternalmemorypluginrsc.rss
-HEADER
-TARGETPATH      RESOURCE_FILES_DIR
-LANGUAGE_IDS
-END
-
-LIBRARY   euser.lib
-LIBRARY   efsrv.lib
-LIBRARY	  avkon.lib
-
-LIBRARY   commonengine.lib      // For RConeResourceLoader
-LIBRARY   flogger.lib           // for LOGGER
-// ADO & Platformization Changes
-LIBRARY   diagframework.lib 
-LIBRARY   diagpluginbase.lib
-
-LIBRARY   platformenv.lib 		// For MMC drive letter.
-LIBRARY	  sysutil.lib  			// for sysutil
-
-// ADO & Platformization Changes
-LIBRARY   eikcoctl.lib
-LIBRARY   eikdlg.lib
-// End of File
--- a/devicediagnostics/diagplugins/DiagInternalMemoryPlugin/group/diaginternalmemoryplugin.xml	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2036 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!DOCTYPE PROJECT [
- <!ELEMENT PROJECT (TARGETLIST, TARGETORDER, GROUPLIST, DESIGNLIST?)>
- <!ELEMENT TARGETLIST (TARGET+)>
- <!ELEMENT TARGET (NAME, SETTINGLIST, FILELIST?, LINKORDER?, SEGMENTLIST?, OVERLAYGROUPLIST?, SUBTARGETLIST?, SUBPROJECTLIST?, FRAMEWORKLIST?, PACKAGEACTIONSLIST?)>
- <!ELEMENT NAME (#PCDATA)>
- <!ELEMENT USERSOURCETREETYPE (#PCDATA)>
- <!ELEMENT PATH (#PCDATA)>
- <!ELEMENT FILELIST (FILE*)>
- <!ELEMENT FILE (PATHTYPE, PATHROOT?, ACCESSPATH?, PATH, PATHFORMAT?, ROOTFILEREF?, FILEKIND?, FILEFLAGS?)>
- <!ELEMENT PATHTYPE (#PCDATA)>
- <!ELEMENT PATHROOT (#PCDATA)>
- <!ELEMENT ACCESSPATH (#PCDATA)>
- <!ELEMENT PATHFORMAT (#PCDATA)>
- <!ELEMENT ROOTFILEREF (PATHTYPE, PATHROOT?, ACCESSPATH?, PATH, PATHFORMAT?)>
- <!ELEMENT FILEKIND (#PCDATA)>
- <!ELEMENT FILEFLAGS (#PCDATA)>
- <!ELEMENT FILEREF (TARGETNAME?, PATHTYPE, PATHROOT?, ACCESSPATH?, PATH, PATHFORMAT?)>
- <!ELEMENT TARGETNAME (#PCDATA)>
- <!ELEMENT SETTINGLIST ((SETTING|PANELDATA)+)>
- <!ELEMENT SETTING (NAME?, (VALUE|(SETTING+)))>
- <!ELEMENT PANELDATA (NAME, VALUE)>
- <!ELEMENT VALUE (#PCDATA)>
- <!ELEMENT LINKORDER (FILEREF*)>
- <!ELEMENT SEGMENTLIST (SEGMENT+)>
- <!ELEMENT SEGMENT (NAME, ATTRIBUTES?, FILEREF*)>
- <!ELEMENT ATTRIBUTES (#PCDATA)>
- <!ELEMENT OVERLAYGROUPLIST (OVERLAYGROUP+)>
- <!ELEMENT OVERLAYGROUP (NAME, BASEADDRESS, OVERLAY*)>
- <!ELEMENT BASEADDRESS (#PCDATA)>
- <!ELEMENT OVERLAY (NAME, FILEREF*)>
- <!ELEMENT SUBTARGETLIST (SUBTARGET+)>
- <!ELEMENT SUBTARGET (TARGETNAME, ATTRIBUTES?, FILEREF?)>
- <!ELEMENT SUBPROJECTLIST (SUBPROJECT+)>
- <!ELEMENT SUBPROJECT (FILEREF, SUBPROJECTTARGETLIST)>
- <!ELEMENT SUBPROJECTTARGETLIST (SUBPROJECTTARGET*)>
- <!ELEMENT SUBPROJECTTARGET (TARGETNAME, ATTRIBUTES?, FILEREF?)>
- <!ELEMENT FRAMEWORKLIST (FRAMEWORK+)>
- <!ELEMENT FRAMEWORK (FILEREF, DYNAMICLIBRARY?, VERSION?)>
- <!ELEMENT PACKAGEACTIONSLIST (PACKAGEACTION+)>
- <!ELEMENT PACKAGEACTION (#PCDATA)>
- <!ELEMENT LIBRARYFILE (FILEREF)>
- <!ELEMENT VERSION (#PCDATA)>
- <!ELEMENT TARGETORDER (ORDEREDTARGET|ORDEREDDESIGN)*>
- <!ELEMENT ORDEREDTARGET (NAME)>
- <!ELEMENT ORDEREDDESIGN (NAME, ORDEREDTARGET+)>
- <!ELEMENT GROUPLIST (GROUP|FILEREF)*>
- <!ELEMENT GROUP (NAME, (GROUP|FILEREF)*)>
- <!ELEMENT DESIGNLIST (DESIGN+)>
- <!ELEMENT DESIGN (NAME, DESIGNDATA)>
- <!ELEMENT DESIGNDATA (#PCDATA)>
-]>
-<?codewarrior exportversion="1.0.1" ideversion="5.0" ?>
-<PROJECT>
-    <TARGETLIST>
-        <TARGET>
-            <NAME>WINSCW UDEB</NAME>
-            <SETTINGLIST>
-
-                <!-- Settings for "Source Trees" panel -->
-                <SETTING><NAME>UserSourceTrees</NAME></SETTING>
-
-                <!-- Settings for "Access Paths" panel -->
-                <SETTING><NAME>AlwaysSearchUserPaths</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>InterpretDOSAndUnixPaths</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>RequireFrameworkStyleIncludes</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>SourceRelativeIncludes</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>UserSearchPaths</NAME>
-                    <SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics\GSDeviceDiagnosticsPlugin\DevDiagApp\diagplugins\diaginternalmemoryplugin\inc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics\GSDeviceDiagnosticsPlugin\DevDiagApp\diagplugins\diaginternalmemoryplugin\data</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics\GSDeviceDiagnosticsPlugin\DevDiagApp\diagplugins\diaginternalmemoryplugin\loc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics\GSDeviceDiagnosticsPlugin\DevDiagApp\diagplugins\diaginternalmemoryplugin\group</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics\GSDeviceDiagnosticsPlugin\DevDiagApp\diagplugins\diaginternalmemoryplugin\src</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING></SETTING>
-                <SETTING><NAME>SystemSearchPaths</NAME>
-                    <SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\ecom</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\oem</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\middleware</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\middleware</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\osextensions</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\osextensions</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\osextensions\loc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\middleware\loc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\osextensions\loc\sc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\middleware\loc\sc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\UDEB</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>Symbian_Support\Win32-x86 Support\Libraries\Win32 SDK</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>CodeWarrior</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>Symbian_Support\Runtime\Runtime_x86\Runtime_Win32\Libs</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>CodeWarrior</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING></SETTING>
-
-                <!-- Settings for "Debugger Runtime" panel -->
-                <SETTING><NAME>MWRuntimeSettings_WorkingDirectory</NAME><VALUE/></SETTING>
-                <SETTING><NAME>MWRuntimeSettings_CommandLine</NAME><VALUE/></SETTING>
-                <SETTING><NAME>MWRuntimeSettings_HostApplication</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\udeb\epoc.exe</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>MWRuntimeSettings_EnvVars</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Target Settings" panel -->
-                <SETTING><NAME>Linker</NAME><VALUE>Symbian Linker v2</VALUE></SETTING>
-                <SETTING><NAME>PreLinker</NAME><VALUE/></SETTING>
-                <SETTING><NAME>PostLinker</NAME><VALUE>Symbian Installer v2</VALUE></SETTING>
-                <SETTING><NAME>Targetname</NAME><VALUE>WINSCW UDEB</VALUE></SETTING>
-                <SETTING><NAME>OutputDirectory</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\udeb</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SaveEntriesUsingRelativePaths</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "File Mappings" panel -->
-                <SETTING><NAME>FileMappings</NAME>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>._i</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>._ii</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.c</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cc</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cfg</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cia</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cpp</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cwlink</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>XML</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cxx</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.def</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.h</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.hrh</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.i</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.iby</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.ii</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.inf</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.ini</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.inl</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.loc</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.mmpi</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.pch++</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.pkg</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.policy</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.ra</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.resources</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Resource v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>XML</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.rh</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.rls</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.rss</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.rsg</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.s</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.script</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.txt</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.a</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Object Importer v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.lib</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Object Importer v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.dso</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Object Importer v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.o</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Object Importer v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                </SETTING>
-
-                <!-- Settings for "Build Extras" panel -->
-                <SETTING><NAME>CacheModDates</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>DumpBrowserInfo</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>CacheSubprojects</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>UseThirdPartyDebugger</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>BrowserGenerator</NAME><VALUE>2</VALUE></SETTING>
-                <SETTING><NAME>DebuggerAppPath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>DebuggerCmdLineArgs</NAME><VALUE/></SETTING>
-                <SETTING><NAME>DebuggerWorkingDir</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CodeCompletionPrefixFileName</NAME><VALUE/></SETTING>
-                <SETTING><NAME>CodeCompletionMacroFileName</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Debugger Target" panel -->
-                <SETTING><NAME>ConsoleEncoding</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>LogSystemMessages</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>AutoTargetDLLsPopUp</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>StopAtWatchpoints</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>PauseWhileRunning</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>PauseInterval</NAME><VALUE>5</VALUE></SETTING>
-                <SETTING><NAME>PauseUIFlags</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>AltExePath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>StopAtTempBPOnLaunch</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>CacheSymbolics</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>TempBPFunctionName</NAME><VALUE>E32Main</VALUE></SETTING>
-                <SETTING><NAME>TempBPType</NAME><VALUE>1</VALUE></SETTING>
-
-                <!-- Settings for "Remote Debug" panel -->
-                <SETTING><NAME>Enabled</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>ConnectionName</NAME><VALUE/></SETTING>
-                <SETTING><NAME>DownloadPath</NAME><VALUE/></SETTING>
-                <SETTING><NAME>LaunchRemoteApp</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>RemoteAppPath</NAME><VALUE/></SETTING>
-                <SETTING><NAME>CoreID</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>JTAGClockSpeed</NAME><VALUE>8000</VALUE></SETTING>
-                <SETTING><NAME>IsMultiCore</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>OSDownload</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>UseGlobalOSDownload</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>OSDownloadConnectionName</NAME><VALUE/></SETTING>
-                <SETTING><NAME>OSDownloadPath</NAME><VALUE/></SETTING>
-                <SETTING><NAME>AltDownload</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>AltDownloadConnectionName</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "x86 Exceptions" panel -->
-                <SETTING><NAME>MWDebugger_X86_Exceptions</NAME>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                
-                <!-- Settings for "Auto-target" panel -->
-                <SETTING><NAME>OtherExecutables</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Analyzer Connections" panel -->
-                <SETTING><NAME>AnalyzerConnectionName</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Custom Keywords" panel -->
-                <SETTING><NAME>CustomColor1</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor2</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor3</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor4</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "ARM Debugger" panel -->
-                <SETTING><NAME>Processor</NAME><VALUE>Generic</VALUE></SETTING>
-                <SETTING><NAME>BraekPoinType_II</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>UseInitFile</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>UseConfigFile</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>IDexecutable</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>IDinitialized</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>IDuninitialized</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>IDconstant</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>SDexecutable</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>SDinitialized</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>SDuninitialized</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>SDconstant</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>VerifyMemWrites</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>ShowMPC107regs</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>InitializationFile</NAME><VALUE/></SETTING>
-                <SETTING><NAME>ConfigurationFile</NAME><VALUE/></SETTING>
-                <SETTING><NAME>BreakpointType</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>WatchpointType</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>TargetOS</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>RTOSPluginName</NAME><VALUE/></SETTING>
-                <SETTING><NAME>ByteOrderType</NAME><VALUE>0</VALUE></SETTING>
-                <PANELDATA><NAME>CodeTest SYMBIAN Instrumenter</NAME><VALUE>
-                    0200020000000100000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000433A5C0000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000637466696C657300000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000636F6465746573742E6964620000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000
-                </VALUE></PANELDATA>
-
-                <!-- Settings for "Symbian Installation" panel -->
-                <SETTING><NAME>SymbianInstallationOutputFilename</NAME><VALUE>Application.sis</VALUE></SETTING>
-                <SETTING><NAME>SymbianInstallationOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>SymbianInstallationContentSearchLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\udeb</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianInstallationPassword</NAME><VALUE/></SETTING>
-                <SETTING><NAME>SymbianInstallationCreateStubFile</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "Symbian Installer Panel v2" panel -->
-                <SETTING><NAME>SymbianInstallationOutputFilename</NAME><VALUE>Application.sis</VALUE></SETTING>
-                <SETTING><NAME>SymbianInstallationOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>SymbianInstallationContentSearchLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\udeb</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianInstallationPassword</NAME><VALUE/></SETTING>
-                <SETTING><NAME>SymbianInstallationCreateStubFile</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "Symbian Resource Panel" panel -->
-                <SETTING><NAME>SymbianResourcesMMPFileLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics\GSDeviceDiagnosticsPlugin\DevDiagApp\diagplugins\diaginternalmemoryplugin\group</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianResourcesBinaryOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\udeb</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianResourcesHeaderFileOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\include</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-
-                <!-- Settings for "Symbian Resources Panel v2" panel -->
-                <SETTING><NAME>SymbianResourcesMMPFileLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics\GSDeviceDiagnosticsPlugin\DevDiagApp\diagplugins\diaginternalmemoryplugin\group</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianResourcesBinaryOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\udeb</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianResourcesHeaderFileOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\include</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-
-                <!-- Settings for "Remote Download" panel -->
-                <SETTING><NAME>FileList</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Symbian ARM Debugger" panel -->
-                <SETTING><NAME>Processor</NAME><VALUE>Generic</VALUE></SETTING>
-                <SETTING><NAME>UseInitFile</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>UseConfigFile</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>ResetTarget</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>InitializationFile</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>ConfigurationFile</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>TargetOS</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>RTOSPluginName</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Symbian Common Panel" panel -->
-                <SETTING><NAME>ShowCommandLine</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>SymbianEpocToolsPath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE></VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-
-                <!-- Settings for "Symbian Compiler Panel" panel -->
-                <SETTING><NAME>PrefixFile</NAME><VALUE>feature_settings.hrh</VALUE></SETTING>
-                <SETTING><NAME>CompilerXMLDescriptor</NAME><VALUE>Metrowerks x86 Compiler</VALUE></SETTING>
-                <SETTING><NAME>Macros</NAME><VALUE>__SYMBIAN32__,__CW32__,__WINS__,__WINSCW__,__DLL__,_DEBUG,_UNICODE,__SUPPORT_CPP_EXCEPTIONS__,</VALUE></SETTING>
-                <SETTING><NAME>CodeTEST</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>EnableSWIC</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Arguments</NAME><VALUE>-wchar_t off -align 4 -warnings on -w nohidevirtual, nounusedexpr -msgstyle gcc -enum int -str pool -exc ms -trigraphs on -O0 -inline off -nostdinc</VALUE></SETTING>
-                <SETTING><NAME>CIAArgs</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Symbian Debugging" panel -->
-                <SETTING><NAME>Parse Log File</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Log File Path</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>Symbian SDK Folder</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>Log Unresolved Modules</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Log Unresolved Sym Files</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Debug Non-XIP Executables</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "Symbian Kernel Debugging" panel -->
-                <SETTING><NAME>Start Address</NAME><VALUE>0x00000000</VALUE></SETTING>
-                <SETTING><NAME>Run From Start Address</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Download Image</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>OS Image Path</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>Download Address</NAME><VALUE>0x00000000</VALUE></SETTING>
-                <SETTING><NAME>Ask First</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Debug Bootrom</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Bootrom Sym File</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "Symbian Linker Panel" panel -->
-                <SETTING><NAME>LinkOutputFile</NAME><VALUE>DevDiagInternalMemoryPlugin.dll</VALUE></SETTING>
-                <SETTING><NAME>LinkCmdLine</NAME><VALUE/></SETTING>
-                <SETTING><NAME>SymbianImportLibrary</NAME><VALUE>DevDiagInternalMemoryPlugin.lib</VALUE></SETTING>
-                <SETTING><NAME>canDebug</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>canRun</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "Symbian RomBuild Panel" panel -->
-                <SETTING><NAME>CommandLine</NAME><VALUE>buildrom -D_DEBUG devkit lubbock techview -olubbock_gui.img</VALUE></SETTING>
-                <SETTING><NAME>OutputPath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>C:\</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>DisplayMessages</NAME><VALUE>true</VALUE></SETTING>
-
-                <!-- Settings for "Symbian Target" panel -->
-                <SETTING><NAME>TargetArchitecture</NAME><VALUE>WINSCW</VALUE></SETTING>
-                <SETTING><NAME>LogMessages</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>SuppressWarnings</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>GenerateSymbolics</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>CompilerPrefix</NAME><VALUE/></SETTING>
-                <SETTING><NAME>CompilerCmdLine</NAME><VALUE/></SETTING>
-                <SETTING><NAME>SymbianImportLibraryPath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>C:\</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "Symbian Tools" panel -->
-                <SETTING><NAME>Gnu Tools Path</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>C:\</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>Epoc32 Tools Path</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>C:\</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-            </SETTINGLIST>
-            <FILELIST>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagInternalMemoryPlugin.mmp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagInternalMemoryPluginWINSCW.resources</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>EDLL.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagInternalMemoryPluginImplementationTable.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagInternalMemoryPlugin.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagInternalMemoryPlugin_UID_.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>euser.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>efsrv.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>avkon.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>CommonEngine.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>flogger.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagFramework.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagPluginBase.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>platformenv.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>sysutil.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>eikcoctl.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>eikdlg.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagInternalMemoryPlugin.h</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagInternalMemoryPlugin.hrh</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagInternalMemoryPluginWINSCWUDEB.cwlink</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-</FILELIST>
-            <LINKORDER>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagInternalMemoryPlugin.mmp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagInternalMemoryPluginWINSCW.resources</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>EDLL.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagInternalMemoryPluginImplementationTable.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagInternalMemoryPlugin.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagInternalMemoryPlugin_UID_.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>euser.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>efsrv.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>avkon.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>CommonEngine.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>flogger.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagFramework.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagPluginBase.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>platformenv.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>sysutil.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>eikcoctl.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>eikdlg.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagInternalMemoryPlugin.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagInternalMemoryPlugin.hrh</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagInternalMemoryPluginWINSCWUDEB.cwlink</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-</LINKORDER>
-        </TARGET><TARGET>
-            <NAME>WINSCW UREL</NAME>
-            <SETTINGLIST>
-
-                <!-- Settings for "Source Trees" panel -->
-                <SETTING><NAME>UserSourceTrees</NAME></SETTING>
-
-                <!-- Settings for "Access Paths" panel -->
-                <SETTING><NAME>AlwaysSearchUserPaths</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>InterpretDOSAndUnixPaths</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>RequireFrameworkStyleIncludes</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>SourceRelativeIncludes</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>UserSearchPaths</NAME>
-                    <SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics\GSDeviceDiagnosticsPlugin\DevDiagApp\diagplugins\diaginternalmemoryplugin\inc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics\GSDeviceDiagnosticsPlugin\DevDiagApp\diagplugins\diaginternalmemoryplugin\data</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics\GSDeviceDiagnosticsPlugin\DevDiagApp\diagplugins\diaginternalmemoryplugin\loc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics\GSDeviceDiagnosticsPlugin\DevDiagApp\diagplugins\diaginternalmemoryplugin\group</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics\GSDeviceDiagnosticsPlugin\DevDiagApp\diagplugins\diaginternalmemoryplugin\src</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING></SETTING>
-                <SETTING><NAME>SystemSearchPaths</NAME>
-                    <SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\ecom</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\oem</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\middleware</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\middleware</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\osextensions</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\osextensions</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\osextensions\loc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\middleware\loc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\osextensions\loc\sc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\middleware\loc\sc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\UREL</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\release\WINSCW\UDEB</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>Symbian_Support\Win32-x86 Support\Libraries\Win32 SDK</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>CodeWarrior</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>Symbian_Support\Runtime\Runtime_x86\Runtime_Win32\Libs</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>CodeWarrior</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING></SETTING>
-
-                <!-- Settings for "Debugger Runtime" panel -->
-                <SETTING><NAME>MWRuntimeSettings_WorkingDirectory</NAME><VALUE/></SETTING>
-                <SETTING><NAME>MWRuntimeSettings_CommandLine</NAME><VALUE/></SETTING>
-                <SETTING><NAME>MWRuntimeSettings_HostApplication</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\urel\epoc.exe</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>MWRuntimeSettings_EnvVars</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Target Settings" panel -->
-                <SETTING><NAME>Linker</NAME><VALUE>Symbian Linker v2</VALUE></SETTING>
-                <SETTING><NAME>PreLinker</NAME><VALUE/></SETTING>
-                <SETTING><NAME>PostLinker</NAME><VALUE>Symbian Installer v2</VALUE></SETTING>
-                <SETTING><NAME>Targetname</NAME><VALUE>WINSCW UREL</VALUE></SETTING>
-                <SETTING><NAME>OutputDirectory</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\urel</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SaveEntriesUsingRelativePaths</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "File Mappings" panel -->
-                <SETTING><NAME>FileMappings</NAME>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>._i</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>._ii</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.c</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cc</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cfg</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cia</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cpp</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cwlink</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>XML</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cxx</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.def</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.h</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.hrh</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.i</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.iby</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.ii</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.inf</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.ini</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.inl</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.loc</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.mmpi</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.pch++</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.pkg</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.policy</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.ra</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.resources</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Resource v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>XML</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.rh</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.rls</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.rss</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.rsg</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.s</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.script</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.txt</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.a</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Object Importer v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.lib</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Object Importer v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.dso</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Object Importer v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.o</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Object Importer v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                </SETTING>
-
-                <!-- Settings for "Build Extras" panel -->
-                <SETTING><NAME>CacheModDates</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>DumpBrowserInfo</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>CacheSubprojects</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>UseThirdPartyDebugger</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>BrowserGenerator</NAME><VALUE>2</VALUE></SETTING>
-                <SETTING><NAME>DebuggerAppPath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>DebuggerCmdLineArgs</NAME><VALUE/></SETTING>
-                <SETTING><NAME>DebuggerWorkingDir</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CodeCompletionPrefixFileName</NAME><VALUE/></SETTING>
-                <SETTING><NAME>CodeCompletionMacroFileName</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Debugger Target" panel -->
-                <SETTING><NAME>ConsoleEncoding</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>LogSystemMessages</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>AutoTargetDLLsPopUp</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>StopAtWatchpoints</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>PauseWhileRunning</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>PauseInterval</NAME><VALUE>5</VALUE></SETTING>
-                <SETTING><NAME>PauseUIFlags</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>AltExePath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>StopAtTempBPOnLaunch</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>CacheSymbolics</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>TempBPFunctionName</NAME><VALUE>E32Main</VALUE></SETTING>
-                <SETTING><NAME>TempBPType</NAME><VALUE>1</VALUE></SETTING>
-
-                <!-- Settings for "Remote Debug" panel -->
-                <SETTING><NAME>Enabled</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>ConnectionName</NAME><VALUE/></SETTING>
-                <SETTING><NAME>DownloadPath</NAME><VALUE/></SETTING>
-                <SETTING><NAME>LaunchRemoteApp</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>RemoteAppPath</NAME><VALUE/></SETTING>
-                <SETTING><NAME>CoreID</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>JTAGClockSpeed</NAME><VALUE>8000</VALUE></SETTING>
-                <SETTING><NAME>IsMultiCore</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>OSDownload</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>UseGlobalOSDownload</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>OSDownloadConnectionName</NAME><VALUE/></SETTING>
-                <SETTING><NAME>OSDownloadPath</NAME><VALUE/></SETTING>
-                <SETTING><NAME>AltDownload</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>AltDownloadConnectionName</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "x86 Exceptions" panel -->
-                <SETTING><NAME>MWDebugger_X86_Exceptions</NAME>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                
-                <!-- Settings for "Auto-target" panel -->
-                <SETTING><NAME>OtherExecutables</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Analyzer Connections" panel -->
-                <SETTING><NAME>AnalyzerConnectionName</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Custom Keywords" panel -->
-                <SETTING><NAME>CustomColor1</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor2</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor3</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor4</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "ARM Debugger" panel -->
-                <SETTING><NAME>Processor</NAME><VALUE>Generic</VALUE></SETTING>
-                <SETTING><NAME>BraekPoinType_II</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>UseInitFile</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>UseConfigFile</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>IDexecutable</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>IDinitialized</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>IDuninitialized</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>IDconstant</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>SDexecutable</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>SDinitialized</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>SDuninitialized</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>SDconstant</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>VerifyMemWrites</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>ShowMPC107regs</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>InitializationFile</NAME><VALUE/></SETTING>
-                <SETTING><NAME>ConfigurationFile</NAME><VALUE/></SETTING>
-                <SETTING><NAME>BreakpointType</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>WatchpointType</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>TargetOS</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>RTOSPluginName</NAME><VALUE/></SETTING>
-                <SETTING><NAME>ByteOrderType</NAME><VALUE>0</VALUE></SETTING>
-                <PANELDATA><NAME>CodeTest SYMBIAN Instrumenter</NAME><VALUE>
-                    0200020000000100000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000433A5C0000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000637466696C657300000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000636F6465746573742E6964620000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000
-                </VALUE></PANELDATA>
-
-                <!-- Settings for "Symbian Installation" panel -->
-                <SETTING><NAME>SymbianInstallationOutputFilename</NAME><VALUE>Application.sis</VALUE></SETTING>
-                <SETTING><NAME>SymbianInstallationOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>SymbianInstallationContentSearchLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\urel</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianInstallationPassword</NAME><VALUE/></SETTING>
-                <SETTING><NAME>SymbianInstallationCreateStubFile</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "Symbian Installer Panel v2" panel -->
-                <SETTING><NAME>SymbianInstallationOutputFilename</NAME><VALUE>Application.sis</VALUE></SETTING>
-                <SETTING><NAME>SymbianInstallationOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>SymbianInstallationContentSearchLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\urel</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianInstallationPassword</NAME><VALUE/></SETTING>
-                <SETTING><NAME>SymbianInstallationCreateStubFile</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "Symbian Resource Panel" panel -->
-                <SETTING><NAME>SymbianResourcesMMPFileLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics\GSDeviceDiagnosticsPlugin\DevDiagApp\diagplugins\diaginternalmemoryplugin\group</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianResourcesBinaryOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\urel</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianResourcesHeaderFileOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\include</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-
-                <!-- Settings for "Symbian Resources Panel v2" panel -->
-                <SETTING><NAME>SymbianResourcesMMPFileLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics\GSDeviceDiagnosticsPlugin\DevDiagApp\diagplugins\diaginternalmemoryplugin\group</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianResourcesBinaryOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\urel</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianResourcesHeaderFileOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\include</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-
-                <!-- Settings for "Remote Download" panel -->
-                <SETTING><NAME>FileList</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Symbian ARM Debugger" panel -->
-                <SETTING><NAME>Processor</NAME><VALUE>Generic</VALUE></SETTING>
-                <SETTING><NAME>UseInitFile</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>UseConfigFile</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>ResetTarget</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>InitializationFile</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>ConfigurationFile</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>TargetOS</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>RTOSPluginName</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Symbian Common Panel" panel -->
-                <SETTING><NAME>ShowCommandLine</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>SymbianEpocToolsPath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE></VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-
-                <!-- Settings for "Symbian Compiler Panel" panel -->
-                <SETTING><NAME>PrefixFile</NAME><VALUE>feature_settings.hrh</VALUE></SETTING>
-                <SETTING><NAME>CompilerXMLDescriptor</NAME><VALUE>Metrowerks x86 Compiler</VALUE></SETTING>
-                <SETTING><NAME>Macros</NAME><VALUE>__SYMBIAN32__,__CW32__,__WINS__,__WINSCW__,__DLL__,NDEBUG,_UNICODE,__SUPPORT_CPP_EXCEPTIONS__,</VALUE></SETTING>
-                <SETTING><NAME>CodeTEST</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>EnableSWIC</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Arguments</NAME><VALUE>-wchar_t off -align 4 -warnings on -w nohidevirtual, nounusedexpr -msgstyle gcc -enum int -str pool -exc ms -trigraphs on -O4,s -nostdinc</VALUE></SETTING>
-                <SETTING><NAME>CIAArgs</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Symbian Debugging" panel -->
-                <SETTING><NAME>Parse Log File</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Log File Path</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>Symbian SDK Folder</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>Log Unresolved Modules</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Log Unresolved Sym Files</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Debug Non-XIP Executables</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "Symbian Kernel Debugging" panel -->
-                <SETTING><NAME>Start Address</NAME><VALUE>0x00000000</VALUE></SETTING>
-                <SETTING><NAME>Run From Start Address</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Download Image</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>OS Image Path</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>Download Address</NAME><VALUE>0x00000000</VALUE></SETTING>
-                <SETTING><NAME>Ask First</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Debug Bootrom</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Bootrom Sym File</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "Symbian Linker Panel" panel -->
-                <SETTING><NAME>LinkOutputFile</NAME><VALUE>DevDiagInternalMemoryPlugin.dll</VALUE></SETTING>
-                <SETTING><NAME>LinkCmdLine</NAME><VALUE/></SETTING>
-                <SETTING><NAME>SymbianImportLibrary</NAME><VALUE>DevDiagInternalMemoryPlugin.lib</VALUE></SETTING>
-                <SETTING><NAME>canDebug</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>canRun</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "Symbian RomBuild Panel" panel -->
-                <SETTING><NAME>CommandLine</NAME><VALUE>buildrom -D_DEBUG devkit lubbock techview -olubbock_gui.img</VALUE></SETTING>
-                <SETTING><NAME>OutputPath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>C:\</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>DisplayMessages</NAME><VALUE>true</VALUE></SETTING>
-
-                <!-- Settings for "Symbian Target" panel -->
-                <SETTING><NAME>TargetArchitecture</NAME><VALUE>WINSCW</VALUE></SETTING>
-                <SETTING><NAME>LogMessages</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>SuppressWarnings</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>GenerateSymbolics</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>CompilerPrefix</NAME><VALUE/></SETTING>
-                <SETTING><NAME>CompilerCmdLine</NAME><VALUE/></SETTING>
-                <SETTING><NAME>SymbianImportLibraryPath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>C:\</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "Symbian Tools" panel -->
-                <SETTING><NAME>Gnu Tools Path</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>C:\</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>Epoc32 Tools Path</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>C:\</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-            </SETTINGLIST>
-            <FILELIST>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagInternalMemoryPlugin.mmp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagInternalMemoryPluginWINSCW.resources</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>EDLL.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagInternalMemoryPluginImplementationTable.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagInternalMemoryPlugin.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagInternalMemoryPlugin_UID_.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>euser.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>efsrv.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>avkon.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>CommonEngine.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>flogger.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagFramework.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagPluginBase.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>platformenv.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>sysutil.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>eikcoctl.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>eikdlg.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagInternalMemoryPluginWINSCWUREL.cwlink</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-</FILELIST>
-            <LINKORDER>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagInternalMemoryPlugin.mmp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagInternalMemoryPluginWINSCW.resources</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>EDLL.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagInternalMemoryPluginImplementationTable.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagInternalMemoryPlugin.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagInternalMemoryPlugin_UID_.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>euser.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>efsrv.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>avkon.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>CommonEngine.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>flogger.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagFramework.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagPluginBase.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>platformenv.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>sysutil.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>eikcoctl.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>eikdlg.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagInternalMemoryPluginWINSCWUREL.cwlink</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-</LINKORDER>
-        </TARGET><TARGET>
-<NAME>Build All</NAME><SETTINGLIST><SETTING><NAME>Linker</NAME><VALUE>None</VALUE></SETTING>
-<SETTING><NAME>Targetname</NAME><VALUE>Build All</VALUE></SETTING>
-</SETTINGLIST>
-<FILELIST></FILELIST>
-<LINKORDER></LINKORDER>
-<SUBTARGETLIST><SUBTARGET><TARGETNAME>WINSCW UDEB</TARGETNAME></SUBTARGET>
-<SUBTARGET><TARGETNAME>WINSCW UREL</TARGETNAME></SUBTARGET>
-</SUBTARGETLIST></TARGET></TARGETLIST>
-
-    <TARGETORDER>
-<ORDEREDTARGET><NAME>WINSCW UDEB</NAME></ORDEREDTARGET>
-<ORDEREDTARGET><NAME>WINSCW UREL</NAME></ORDEREDTARGET>
-<ORDEREDTARGET><NAME>Build All</NAME></ORDEREDTARGET>
-</TARGETORDER>
-
-    <GROUPLIST><FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DiagInternalMemoryPlugin.mmp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<GROUP><NAME>Source</NAME>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DiagInternalMemoryPluginImplementationTable.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DiagInternalMemoryPlugin.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DevDiagInternalMemoryPlugin_UID_.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-</GROUP>
-<GROUP><NAME>Headers</NAME>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DiagInternalMemoryPlugin.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DiagInternalMemoryPlugin.hrh</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-</GROUP>
-<GROUP><NAME>Resources</NAME>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DevDiagInternalMemoryPluginWINSCW.resources</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-</GROUP>
-<GROUP><NAME>Link</NAME>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DevDiagInternalMemoryPluginWINSCWUDEB.cwlink</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UREL</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DevDiagInternalMemoryPluginWINSCWUREL.cwlink</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-</GROUP>
-<GROUP><NAME>Libraries</NAME>
-<GROUP><NAME>WINSCW</NAME>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>EDLL.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>euser.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>efsrv.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>avkon.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>CommonEngine.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>flogger.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DiagFramework.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DiagPluginBase.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>platformenv.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>sysutil.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>eikcoctl.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>eikdlg.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UREL</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>EDLL.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-</GROUP>
-</GROUP>
-</GROUPLIST>
-
-</PROJECT>
--- a/devicediagnostics/diagplugins/DiagInternalMemoryPlugin/inc/diaginternalmemoryplugin.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,181 +0,0 @@
-/*
-* 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:  Internal Memory Plugin
-*
-*/
-
-
-#ifndef DIAGINTERNALMEMORYPLUGIN_H
-#define DIAGINTERNALMEMORYPLUGIN_H
-
-// INCLUDES
-#include <DiagTestPluginBase.h>         // CDiagTestPluginBase
-#include <DiagResultsDatabaseItem.h>    // DiagResultsDatabaseItem::TResult
-#include <f32file.h>                    // RFs, RFile
-#include <AknWaitDialog.h> 
-//CONSTANTS
-const TUid KDiagInternalMemoryPluginUid = { 0x2000E589 };
-_LIT( KDiagInternalMemoryPluginResourceFileName, "z:DevDiagInternalMemoryPluginRsc.rsc" );
-const TInt KDiagInternalMemoryBufferSize = 256;
-
-// MACROS
-
-// DATA TYPES
-
-// FUNCTION PROTOTYPES
-
-// FORWARD DECLARATIONS
-class CDiagResultsDbItemBuilder;
-
-// CLASS DEFINITION
-class CDiagInternalMemoryPlugin : public CDiagTestPluginBase,
-								  public MProgressDialogCallback
-    {
-    public: // Constructors and destructor
-		
-        enum TStates
-            {
-            EIdle,
-            EWriting,
-            EReading            
-            };
-		
-        /**
-        * Symbian OS two-phased constructor
-        * @return Timer Test Plugin
-        */
-        static MDiagPlugin* NewL( TAny* aInitParams );
-
-        /**
-        * Destructor
-        */
-        virtual ~CDiagInternalMemoryPlugin();
-
-    public: // From CDiagTestPluginBase
-
-        /**
-        * @see CDiagTestPluginBase::IsVisible()
-        */
-        virtual TBool IsVisible() const;
-        
-        /**
-        * @see CDiagTestPluginBase::IsSupported()
-        */
-        virtual TBool IsSupported() const;
-
-        /**
-        * @see CDiagTestPluginBase::RunMode()
-        */
-        virtual TRunMode RunMode() const;
-
-        /**
-        * @see CDiagTestPluginBase::TotalSteps()
-        */
-        virtual TUint TotalSteps() const;
-
-        /**
-        * @see CDiagTestPluginBase::GetPluginNameL
-        */
-        virtual HBufC* GetPluginNameL( TNameLayoutType aLayoutType ) const;
-
-        /**
-        * @see CDiagTestPluginBase::Uid
-        */
-        virtual TUid Uid() const;
-        
-        
-        TBool ShowMessageQueryL(TInt aResourceId,TInt &aButtonId);
- 
-        
-    private: // from CDiagTestPluginBase
-    
-        /**
-        * Handle plug-in execution.
-        * @see CDiagTestPluginBase::DoRunTestL
-        */
-        virtual void DoRunTestL();
-
-        /**
-        * Stop and clean up
-        * @see CDiagTestPluginBase::DoStopAndCleanupL
-        */
-        virtual void DoStopAndCleanupL();
-                        
-    private:    // from CActive
-    
-        /**
-        * Handle active object completion event
-        */
-        virtual void RunL();
-    
-        /**
-        * Handle cancel
-        */
-        virtual void DoCancel();
-    
-    private: // from MProgressDialogCallback
-        
-	    /**
-	    * Called when the progress dialog is dismissed.
-	    *
-	    * @param aButtonId - indicate which button made dialog to dismiss
-	    */
-	    virtual void DialogDismissedL( TInt aButtonId );
-	    
-		void ShowProgressNoteL();
-	
-    private:    // private functions
-        
-        /**
-        * C++ default constructor.
-        */
-        CDiagInternalMemoryPlugin( CDiagPluginConstructionParam* aInitParams  );
-
-        /**
-        * Symbian OS default constructor.
-        *
-        */
-        void ConstructL();
-        
-        /*
-        * Close file sessions
-        */
-        void Reset();
-
-        /*
-        * Set the states
-        */
-        void SetState( TStates aState );
-
-        void ReportResultToPluginL(CDiagResultsDatabaseItem::TResult aResult);
-
-    private:    // data
-     
-        TInt                        iCounter;
-        TStates                     iState;  //rw states
-        RFs                         iFs;
-        RFile                       iFile;
-        RFile                       iFile2;
-        TBuf8<KDiagInternalMemoryBufferSize >                  iBufw;
-        TBuf8<KDiagInternalMemoryBufferSize >                  iBufr;
-        TFileName                   iFileName;
-        TBool									    idialogOn;
-	    TBool										idialogDismissed;
-	    CAknWaitDialog*      						iWaitDialog;        
-
-    };
-
-#endif //DIAGINTERNALMEMORYPLUGIN_H
-
-// End of File
--- a/devicediagnostics/diagplugins/DiagInternalMemoryPlugin/inc/diaginternalmemoryplugin.hrh	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-/*
-* 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:  Internal Memory Plugin
-*
-*/
-
-
-#ifndef DIAGINTERNALMEMORYPLUGIN_HRH
-#define DIAGINTERNALMEMORYPLUGIN_HRH
-
-// commands
-
-enum TMemoryPluginCBA
-    {
-    ECBACmdSkip = 0x6300,
-    ECBACmdCancel,
-    ECBACmdNo
-    };
-
-     /** Dialog ids.  These are used in the application's resource file.
- */
-enum TIntMemNoteControlIds
-    {
-    EYBWaitNoteId = 0x100    
-    };
-    
-#endif //  DIAGINTERNALMEMORYPLUGIN_HRH
-
-//End of File
--- a/devicediagnostics/diagplugins/DiagInternalMemoryPlugin/loc/diaginternalmemoryplugin.loc	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,78 +0,0 @@
-/*
-* 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:  Localization strings for DiagInternalMemoryPlugin.
-*
-*/
-
-
-//  LOCALISATION STRINGS
-
-// NEW
-
-//d:Name of internal memory test as it appears in the plug-in list view
-//l:list_single_graphic_heading_pane_t1_cp2
-//r:3.2
-//
-#define qtn_diag_lst_internal_memory           "Memory test"
-
-
-//d:internal media card test text for suite view
-//l:list_single_graphic_pane_t1
-//w:
-//r: 3.2
-//
-//#define qtn_diag_lst_test_internal_memory    "Test Internal Device Memory" // LVT Test
-
-//d:internal media card test text for starting dialog header
-//l:heading_pane_t1
-//w:
-//r: 3.2
-//
-#define qtn_diag_msg_title_internal_memory    "Memory test"
-
-//d:internal media card test description
-//l:popup_info_list_pane_t1
-//w:
-//r: 3.2
-//
-#define qtn_diag_msg_info_internal_memory    "The following test will check device's memory."
-
-//d:internal memory test text for title pane of suite/result view
-//l:title_pane_t2/opt12
-//w:
-//r: 3.2
-//
-//#define qtn_diag_title_test_internal_memory   "Memory test" // LVT Test
-
-//d:Failed result text
-//l:popup_info_list_pane_t1
-//r:5.0
-//
-#define qtn_diag_conf_test_failed_internal_memory "Memory test"
-
-//d:Message text for wait dialog
-//l:popup_note_wait_window
-//r:3.2
-//
-#define qtn_diag_msg_testing_internal_memory "Testing memory"
-
-//d:Softkey text.
-//l:control_pane_t1/opt7 
-//r:5.0
-//
-#define qtn_diag_softk_skip "Skip"
-
-
-
-// End of File
--- a/devicediagnostics/diagplugins/DiagInternalMemoryPlugin/rom_files/diaginternalmemoryplugin.iby	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-/*
-* 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:  Image description file for project Internal Memory Plugin
-*
-*/
-
-
-#ifndef DEVDIAG_INTERNALMEMORY_PLUGIN_IBY
-#define DEVDIAG_INTERNALMEMORY_PLUGIN_IBY
-
-#ifdef FF_DEVICE_DIAGNOSTICS_APP 
-
-#include <data_caging_paths_for_iby.hrh>
-
-ECOM_PLUGIN( devdiaginternalmemoryplugin.dll, devdiaginternalmemoryplugin.rsc )
-
-#endif
-
-#endif // DEVDIAG_INTERNALMEMORY_PLUGIN_IBY
-
-// end of file
--- a/devicediagnostics/diagplugins/DiagInternalMemoryPlugin/rom_files/diaginternalmemoryplugin_resources.iby	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-/*
-* 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:  Image description file for resources of project Internal Memory Plugin
-*
-*/
-
-
-#ifndef DEVDIAG_INTERNALMEMORY_PLUGIN_RESOURCES_IBY
-#define DEVDIAG_INTERNALMEMORY_PLUGIN_RESOURCES_IBY
-
-#ifdef FF_DEVICE_DIAGNOSTICS_APP 
-
-#include <data_caging_paths_for_iby.hrh>
-
-data=DATAZ_\RESOURCE_FILES_DIR\devdiaginternalmemorypluginrsc.rsc RESOURCE_FILES_DIR\devdiaginternalmemorypluginrsc.rsc
-
-#endif
-
-#endif // DEVDIAG_INTERNALMEMORY_PLUGIN_RESOURCES_IBY
-
-// end of file
--- a/devicediagnostics/diagplugins/DiagInternalMemoryPlugin/src/diaginternalmemoryplugin.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,596 +0,0 @@
-/*
-* 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:  Internal Memory Test Plugin
-*
-*/
-
-
-// CLASS DECLARATION
-#include "diaginternalmemoryplugin.h"
-
-// SYSTME INCLUDE FILES
-#include <featmgr.h>                    // feature manager for MMC support checking
-#include <features.hrh>
-//#ifndef RD_MULTIPLE_DRIVE
-#include <pathinfo.h>                   //PathInfo
-//#endif // RD_MULTIPLE_DRIVE
-#include <sysutil.h>                    //SysUtil
-#include <StringLoader.h>               // StringLoader
-
-#include <DiagTestObserver.h>           // MDiagTestObserver
-#include <DiagTestExecParam.h>          // TDiagTestExecParam
-#include <DiagResultsDbItemBuilder.h>   // CDiagResultsDbItemBuilder
-#include <DiagResultDetailBasic.h>      // CDiagResultDetailBasic
-#include <DiagFrameworkDebug.h>         // LOGSTRING
-#include <devdiaginternalmemorypluginrsc.rsg>
-
-#include "diaginternalmemoryplugin.hrh" // ADO & Platformization Changes
-
-#include <AknDialog.h> // ADO & Platformization Changes
-#include <aknmessagequerydialog.h>  // ADO & Platformization Changes
-#include <DiagCommonDialog.h>          // for EDiagCommonDialogConfirmCancelAll 
-#include <DiagEngineCommon.h> 
- 
-
-
-// EXTERNAL DATA STRUCTURES
-
-// EXTERNAL FUNCTION PROTOTYPES
-
-// CONSTANTS 
-const TInt KDiagInternalMemoryStepsMaxCount = 3;   //total test steps
-_LIT( KText1, "PhoneDoctor Internal Memory Test" );
-
-// MACROS
-
-// LOCAL CONSTANTS AND MACROS
-
-// MODULE DATA STRUCTURES
-
-// LOCAL FUNCTION PROTOTYPES
-
-// FORWARD DECLARATIONS
-
-// ============================= LOCAL FUNCTIONS ==============================
-
-// ========================= MEMBER FUNCTIONS ================================
-
-// ----------------------------------------------------------------------------
-// CDiagInternalMemoryPlugin::CDiagInternalMemoryPlugin()
-//
-// Constructor
-// ----------------------------------------------------------------------------
-//
-CDiagInternalMemoryPlugin::CDiagInternalMemoryPlugin( CDiagPluginConstructionParam* aParam )
-    :   CDiagTestPluginBase( aParam )
-    {
-    }
-
-
-// ---------------------------------------------------------------------------
-// CDiagInternalMemoryPlugin::NewL()
-//
-// Symbian OS default constructor
-// ---------------------------------------------------------------------------
-MDiagPlugin* CDiagInternalMemoryPlugin::NewL( TAny* aInitParams )
-    {
-    ASSERT( aInitParams );
-    LOGSTRING( "CDiagInternalMemory::NewL" );
-    
-
-    CDiagPluginConstructionParam* param = 
-            static_cast<CDiagPluginConstructionParam*>( aInitParams );    
-    CleanupStack::PushL( param );    
-    CDiagInternalMemoryPlugin* self = new( ELeave ) CDiagInternalMemoryPlugin (param);
-    CleanupStack::Pop( param );
-    
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self ); // self    
-    return self;
-    }
-
-
-
-// ---------------------------------------------------------------------------
-// CDiagInternalMemoryPlugin::ConstructL()
-//
-// Symbian OS two-phased constructor
-// ---------------------------------------------------------------------------
-void CDiagInternalMemoryPlugin::ConstructL()
-    {
-    LOGSTRING("CDiagInternalMemoryPlugin::ConstructL: Plugin created.");
-    idialogOn = EFalse;
-	idialogDismissed = EFalse;
-    BaseConstructL ( KDiagInternalMemoryPluginResourceFileName );            
-    }
-
-
-// ----------------------------------------------------------------------------
-// CDiagInternalMemoryPlugin::~CDiagInternalMemoryPlugin
-//
-// Destructor
-// ----------------------------------------------------------------------------
-CDiagInternalMemoryPlugin::~CDiagInternalMemoryPlugin()
-    {        
-    
-    }
-
-
-// ---------------------------------------------------------------------------
-// From MDiagPlugin
-// CDiagInternalMemoryPlugin::IsVisible()
-// ---------------------------------------------------------------------------
-TBool CDiagInternalMemoryPlugin::IsVisible() const
-    {
-    return ETrue;
-    }
-
-
-// ---------------------------------------------------------------------------
-// From MDiagPlugin
-// CDiagInternalMemoryPlugin::IsSupported()
-// ---------------------------------------------------------------------------
-TBool CDiagInternalMemoryPlugin::IsSupported() const
-    {
-    return ETrue;
-    }    
-
-        
-// ---------------------------------------------------------------------------
-// From MDiagTestPlugin
-// CDiagInternalMemoryPlugin::RunMode()
-// ---------------------------------------------------------------------------
-MDiagTestPlugin::TRunMode CDiagInternalMemoryPlugin::RunMode() const
-    {
-    return EAutomatic;
-    }
-
-
-
-
-// ---------------------------------------------------------------------------
-// From MDiagTestPlugin
-// CDiagInternalMemoryPlugin::TotalSteps()
-// ---------------------------------------------------------------------------
-TUint CDiagInternalMemoryPlugin::TotalSteps() const
-    {
-    return KDiagInternalMemoryStepsMaxCount;
-    }
-
-
-// ---------------------------------------------------------------------------
-// From MDiagPlugin
-// CDiagInternalMemoryPlugin::GetPluginName
-// ---------------------------------------------------------------------------
-HBufC* CDiagInternalMemoryPlugin::GetPluginNameL( TNameLayoutType aLayoutType ) const
-    {
-    
-    switch ( aLayoutType )
-        {
-        case ENameLayoutListSingle:
-            return StringLoader::LoadL ( R_DIAG_LST_INTERNAL_MEMORY );
-            
-        case ENameLayoutHeadingPane:
-             return StringLoader::LoadL ( R_QTN_DIAG_MSG_TITLE_INTERNAL_MEMORY );
-        
-        case ENameLayoutPopupInfoPane:
-              return StringLoader::LoadL ( R_QTN_DIAG_MSG_INFO_INTERNAL_MEMORY );
-        
-        case ENameLayoutTitlePane:
-             return StringLoader::LoadL ( R_QTN_DIAG_TITLE_TEST_INTERNAL_MEMORY );
-        
-        case ENameLayoutListSingleGraphic:
-             return StringLoader::LoadL ( R_QTN_DIAG_LST_TEST_INTERNAL_MEMORY );            
-
-        default:
-            LOGSTRING2( "CDiagInternalMemoryPlugin::GetPluginNameL: "
-                L"ERROR: Unsupported layout type %d", aLayoutType )
-            __ASSERT_DEBUG( 0, User::Invariant() );
-            return StringLoader::LoadL ( R_DIAG_LST_INTERNAL_MEMORY );
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// From MDiagPlugin
-// CDiagInternalMemoryPlugin::Uid
-// ---------------------------------------------------------------------------
-TUid CDiagInternalMemoryPlugin::Uid() const
-    {
-    return KDiagInternalMemoryPluginUid;
-    }
-
-    
-// ---------------------------------------------------------------------------
-// From CActive
-// CDiagInternalMemoryPlugin::RunL
-// ---------------------------------------------------------------------------
-void CDiagInternalMemoryPlugin::RunL()
-    {
-    
-    //report test progress     	    
-    if ( iCounter > 0 )
-        {
-        iCounter--;    
-        ReportTestProgressL( KDiagInternalMemoryStepsMaxCount - iCounter );
-        }     
-    	
-    // handle read or write action    	
-    switch ( iState )
-        {
-        case EWriting:                            
-    		if (idialogDismissed)
-	    		{
-	    		ReportResultToPluginL( CDiagResultsDatabaseItem::ESkipped );
-	    		LOGSTRING("CDiagExternalMediaCardPlugin::RunL dialogDismissed=EWriting");
-	    		//reset the var
-	    		idialogDismissed = EFalse;
-	    		return;
-	    		}
-            //check if write is okay
-            if ( iStatus == KErrNone )
-                {
-                LOGSTRING( "CDiagInternalMemory::RunL, write ok" );
-                iFile.Close();
-					
-                // read test			
-                TInt errorCodeOpen = iFile2.Open( iFs, iFileName, EFileRead );				
-                if ( errorCodeOpen!=KErrNone )
-                    {
-                    LOGSTRING( "CDiagInternalMemory::RunL,iFile2 open fail" );				
-                    ReportResultToPluginL( CDiagResultsDatabaseItem::EFailed );	
-                    return;
-                    }			    
-                LOGSTRING( "CDiagInternalMemory::RunL, iFile2 open okay" );
-				
-                // Start read test
-                SetState( EReading ); 
-                iBufr.Zero();
-                iFile2.Read( iBufr, iStatus );
-         				
-                SetActive();                
-                
-                }
-            else   //write fail
-                {
-                LOGSTRING( "CDiagInternalMemory::RunL, write fail" );	
-                //set test result fail
-                ReportResultToPluginL( CDiagResultsDatabaseItem::EFailed );       			
-                }
-            break;
-    			
-        case EReading:        
-    		if (idialogDismissed)
-	    		{
-	    		ReportResultToPluginL( CDiagResultsDatabaseItem::ESkipped );
-	    		LOGSTRING("CDiagExternalMediaCardPlugin::RunL dialogDismissed=EReading");
-	    		//reset the var
-	    		idialogDismissed = EFalse;	    		
-	    		return;
-	    		}
-            //check if read is okay
-            if( iStatus == KErrNone )
-                {
-                LOGSTRING( "CDiagInternalMemory::RunL, read okay" );
-								
-                //compare data and set test result				
-                CDiagResultsDatabaseItem::TResult result = ( iBufr == iBufw )? 
-                                                            CDiagResultsDatabaseItem::ESuccess
-				                                            : CDiagResultsDatabaseItem::EFailed;
-                ReportResultToPluginL( result );
-                LOGSTRING2( "CDiagInternalMemory::RunL,test result %d", result );
-                }
-            else  //read fail
-                {
-                LOGSTRING( "CDiagInternalMemory::RunL, read fail" );  		
-                //set result fail
-                ReportResultToPluginL( CDiagResultsDatabaseItem::EFailed );
-                }
-            break;
-        default:
-            LOGSTRING( "CDiagInternalMemory::RunL, default case" );
-            //set result fail
-            ReportResultToPluginL( CDiagResultsDatabaseItem::EFailed );       			
-            break;
-        }           
-    }    
-
-
-// ---------------------------------------------------------------------------
-// From CActive
-// CDiagInternalMemoryPlugin::DoCancel
-// ---------------------------------------------------------------------------
-void CDiagInternalMemoryPlugin::DoCancel()
-    {     
-    switch ( iState )
-        {
-        case EReading:
-            iFile.ReadCancel(iStatus);
-            break;
-            
-        default:
-            // No action needed
-            break;
-        }    
-    }    
-
-
-// ---------------------------------------------------------------------------
-// From CDiagTestPluginBase
-// CDiagInternalMemoryPlugin::DoRunTestL()
-// ---------------------------------------------------------------------------
-void CDiagInternalMemoryPlugin::DoRunTestL()
-    {
-    TInt aButtonId; // ADO & Platformization Changes
-    iCounter = KDiagInternalMemoryStepsMaxCount;
-    // ADO & Platformization Changes
-    
-    ShowMessageQueryL(R_MESSAGEQUERY_TITLE_INTERNALMEMORY,aButtonId);
-    
-    if(aButtonId == ECBACmdCancel)
-    	{
-    	ReportResultToPluginL( CDiagResultsDatabaseItem::ESkipped );
-        return;
-    	}
-    
-    if(aButtonId == ECBACmdSkip)
-    	{
-		TInt confirmResult = 0;
-            
-        CAknDialog* dlg = ExecutionParam().Engine().
-        CreateCommonDialogLC( EDiagCommonDialogConfirmSkipAll, NULL );
-    
-        if ( !RunWaitingDialogL( dlg, confirmResult ) )
-            {
-            return;
-            }
-        
-        if ( confirmResult)
-            {
-            return;
-            }
-    	}
-    // Changes Ends
-    
-    
-    //Start my test
-    
-    ShowProgressNoteL();
-    
-    SetState( EIdle );
-        	            	  
-    //check the drive number for internal memory
-    TInt phoneMemoryDriveNum( 0 );
-    // If path length is zero, driveLetterBuf will be empty.
-    TBuf<1> driveLetterBuf = PathInfo::PhoneMemoryRootPath ().Left( 1 );
-
-    TInt errorCode( KErrNotFound );
-    if ( driveLetterBuf.Length() > 0 )
-        {
-        LOGSTRING( "CDiagInternalMemory::DoRunTestL, driveLetterBuf ok" );
-        TChar driveLetter = driveLetterBuf[0];
-        errorCode = RFs::CharToDrive( driveLetter, phoneMemoryDriveNum );
-        }
-    else
-        {
-        LOGSTRING( "CDiagInternalMemory::DoRunTestL, driveLetterBuf empty" );
-        }
-            
-    if ( errorCode != KErrNone )
-        {        
-        LOGSTRING( "CDiagInternalMemory::DoRunTestL, no drive" );               	
-        ReportResultToPluginL( CDiagResultsDatabaseItem::EFailed );
-        return;       			
-       	}
-        	                  
- 
-    User::LeaveIfError( iFs.Connect() );  // Connects a client process to the fileserver
-    LOGSTRING( "CDiagInternalMemory::DoRunTestL, iFs connect" );
-   // check disk space            		       		
-    if ( SysUtil::DiskSpaceBelowCriticalLevelL( &iFs, iBufw.MaxLength(), phoneMemoryDriveNum ) )
-        {
-        //disk is out of memory
-        LOGSTRING( "CDiagInternalMemory::DoRunTestL, out of memory" );
-        ReportResultToPluginL( CDiagResultsDatabaseItem::EFailed );	
-        return;	
-        }
-    	 
-    //Try to create a temp file for test	    		
-    TFileName filePath;
-    TDriveUnit unit( phoneMemoryDriveNum );
-    errorCode = iFs.CreatePrivatePath( unit );
-		
-    if ( ( errorCode != KErrNone ) && ( errorCode != KErrAlreadyExists ) )
-        {
-        LOGSTRING( "CDiagInternalMemory::DoRunTestL, CreatePrivatePath fail" );
-        ReportResultToPluginL( CDiagResultsDatabaseItem::EFailed );	
-        return;
-        }
-			
-    iFs.PrivatePath( filePath );
-    filePath.Insert( 0, unit.Name() );
-								    		
-    errorCode = iFile.Temp( iFs, filePath, iFileName, EFileWrite );
-    LOGSTRING2( "CDiagInternalMemory::DoRunTestL, Temp err = %d", errorCode );
-											
-    if ( errorCode != KErrNone )
-        {
-        //Temp file creation failed
-        ReportResultToPluginL( CDiagResultsDatabaseItem::EFailed );
-        return;
-        }
-    		
-    // Temp file created, start the write test					
-							
-    iBufw.Zero();
-    iBufw.Copy( KText1 );
-			
-    SetState( EWriting ); 
-		
-    iFile.Write( iBufw, iStatus );
-    SetActive();        
-    
-    //report test progress     	    
-    if ( iCounter > 0 )
-        {
-        iCounter--;    
-        ReportTestProgressL( KDiagInternalMemoryStepsMaxCount - iCounter );        
-        }  
-    }
-
-
-//---------------------------------------------------------------------------
-// CDiagInternalMemoryPlugin::DoStopAndCleanupL
-//---------------------------------------------------------------------------
-void CDiagInternalMemoryPlugin::DoStopAndCleanupL()
-    {
-    switch ( iState )
-        {
-        case EWriting: 
-            iFile.Close();
-            iFs.Delete( iFileName ); // delete the file created by Temp									
-            iFs.Close();
-            break;
-    		
-        case EReading:
-            iFile2.Close();	
-            iFs.Delete( iFileName ); // delete the file created by Temp						
-            iFs.Close();   		
-            break;
-    		 
-        case EIdle:
-            iFs.Close();
-            break;
-    	    
-        default:
-            ASSERT ( EFalse );      //this should never happen
-            break;
-        }
-        
-	if ( iWaitDialog )
-	delete iWaitDialog;   
-    idialogOn = EFalse;
-	idialogDismissed = EFalse;  
-       
-    SetState( EIdle );
-    }
-
-
-// ----------------------------------------------------------------------------
-// CDiagExternalMediaCardPlugin::ShowProgressNoteL
-//
-// Progress Note
-// ----------------------------------------------------------------------------
-
-void CDiagInternalMemoryPlugin::ShowProgressNoteL()
-    {
-		if ( iWaitDialog )
-		    {
-		    delete iWaitDialog;
-		    iWaitDialog = NULL;
-		    }
-
-		                    
-		// WAIT NOTE DIALOG
-		iWaitDialog = new (ELeave) CAknWaitDialog(
-									(REINTERPRET_CAST(CEikDialog**, &iWaitDialog)), 
-									ETrue);
-
-		iWaitDialog->PrepareLC(R_INTMEM_PLUGIN_WAIT_NOTE);
-		iWaitDialog->SetCallback(this);
-		iWaitDialog->RunLD();
-		idialogOn = ETrue;
-		LOGSTRING("CDiagInternalMemoryPlugin::ShowProgressNoteL()");
-
-    }
-
-//*********************************************************
-// CallBack from AKnWaitDialog when Cancel is pressed
-//*********************************************************
-
-void CDiagInternalMemoryPlugin::DialogDismissedL( TInt aButtonId )
-	{
-		 LOGSTRING2("CDiagInternalMemoryPlugin::DialogDismissedL() = %d",aButtonId);
-		 
-		 if (aButtonId == ECBACmdCancel && idialogOn) 
-		 {
-		 // cancel the tests based on which point the dialog is dismissed
-		 LOGSTRING2("CDiagInternalMemoryPlugin::DialogDismissed @ iState= %d",iState);
-		 if (iState == EReading)
-	     iFile.ReadCancel(iStatus);
-		
-	     iWaitDialog = NULL;
-	     idialogOn = EFalse;
-	     idialogDismissed = ETrue;      
-		 }
-	}    
-
-void CDiagInternalMemoryPlugin::ReportResultToPluginL(CDiagResultsDatabaseItem::TResult aResult)
-	{
-		// clear the dialogue only if dialog is running.    
-		if(idialogOn)    
-		iWaitDialog->ProcessFinishedL();
-		LOGSTRING("CDiagInternalMemoryPlugin::ReportResultToPluginL()");
-		CompleteTestL( aResult );
-	}
-	    
-//---------------------------------------------------------------------------
-// CDiagInternalMemoryPlugin::SetState()
-//---------------------------------------------------------------------------
-void CDiagInternalMemoryPlugin::SetState( TStates aState )
-    {
-    iState = aState;
-    }
-    
-    
-// ADO & Platformization Changes
-TBool CDiagInternalMemoryPlugin::ShowMessageQueryL( TInt aResourceId, TInt &aButtonId  )
-    {
-    LOGSTRING( "CDiagAudioPlugin::ShowMessageQueryL IN" )
-    CAknMessageQueryDialog* dlg    = NULL;
-    TBool                   result = EFalse;
-
-    // Create CAknMessageQueryDialog instance
-    dlg = new ( ELeave ) CAknMessageQueryDialog();
-
-    dlg->PrepareLC( aResourceId );
-     
-    CEikButtonGroupContainer& cba = dlg->ButtonGroupContainer();
-
-        switch ( aResourceId )
-            {
-            case R_MESSAGEQUERY_TITLE_INTERNALMEMORY: 
-         	   {
-            	if ( SinglePluginExecution() )
-        		{
-        			cba.SetCommandSetL( R_INT_MEMORY_SOFTKEYS_OK_CANCEL );		
-        		}
-        	   else 
-        	   	{	
-                	cba.SetCommandSetL( R_INT_MEMORY_SOFTKEYS_OK_SKIP );		
-                }
-        	}
-                break;
-
-            default:
-                break;
-            }
-        	
-    result = RunWaitingDialogL( dlg, aButtonId );
-
-    LOGSTRING3( "CDiagAudioPlugin::ShowMessageQueryL() OUT aButtonId=%d result=%d", aButtonId, result )
-    return result;
-    }
-    
-// End of File
--- a/devicediagnostics/diagplugins/DiagInternalMemoryPlugin/src/diaginternalmemorypluginimplementationtable.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-/*
-* 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:  ECOM proxy table for DiagInternalMemoryPlugin
-*
-*/
-
-
-// INCLUDES
-#include "diaginternalmemoryplugin.h"
-
-#include <e32std.h>
-#include <implementationproxy.h>
-
-
-// CONSTANTS
-const TImplementationProxy KDiagInternalMemoryPluginImplementationTable[] = 
-	{
-	IMPLEMENTATION_PROXY_ENTRY( 0x2000E589,	CDiagInternalMemoryPlugin::NewL ),
-	};
-
-
-// ---------------------------------------------------------------------------
-// ImplementationGroupProxy
-// 
-// Gate/factory function
-// ---------------------------------------------------------------------------
-//
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy( 
-                                                  TInt& aTableCount )
-	{
-	aTableCount = sizeof( KDiagInternalMemoryPluginImplementationTable ) 
-        / sizeof( TImplementationProxy );
-	return KDiagInternalMemoryPluginImplementationTable;
-	}
-
-
-
-// End of File
--- a/devicediagnostics/diagplugins/diagbatterychargerplugin/data/devdiagbatterychargercabletestplugin.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-/*
-* 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:  ECOM plugin resource file for Battery Charger Cable Test Plug-in
-*
-*/
-
-#include <registryinfo.rh>
-#include "diagbatterychargercabletestplugin.hrh"
-
-RESOURCE REGISTRY_INFO theInfo
-    {
-    dll_uid     = _UID3;
-    interfaces  =
-        {
-        INTERFACE_INFO
-            {
-            interface_uid   = 0x2000AFEB;
-            implementations =
-                {
-                IMPLEMENTATION_INFO
-                    {
-                    implementation_uid  = _IMPLEMENTATION_UID;
-                    version_no          = 1;
-                    display_name        = "Battery Charger Cable Test Plugin";
-                    default_data        = "0x2000E569"; //HW suite";
-                    opaque_data         =   "<diagplugininfo>" 
-                                                "<order number=\"60\"/>"
-                                            "</diagplugininfo>";
-                    }
-                };
-            }
-        };
-    }
-
-
-// End of File
--- a/devicediagnostics/diagplugins/diagbatterychargerplugin/data/devdiagbatterychargercabletestpluginrsc.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,366 +0,0 @@
-/*
-* 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:  Resource file for DiagBatteryChargerCableTestPlugin
-*
-*/
-
-
-
-//  RESOURCE IDENTIFIER
-NAME    DGBC // 4 letter ID // this has to be unique for each plugin
-
-//  INCLUDES
-
-#include    <avkon.loc>
-#include    <avkon.mbg>
-#include    <avkon.rsg>
-#include    <avkon.rh>
-#include    <AvkonIcons.hrh>
-#include    <bldvariant.hrh>
-#include    <data_caging_paths_strings.hrh>
-#include    <eikcore.rsg>
-#include    <eikon.rsg>
-#include    <uikon.rh>
-#include    <eikon.rh>
-
-#include    <diagplugincommon.loc>
-#include    "diagbatterychargercabletestplugin.hrh"
-#include    <diagbatterychargercabletestplugin.loc>
-
-
-
-// CONSTANTS
-#define     BMPFILE_NAME    "\\resource\\apps\\avkon2.mbm"
-
-
-//  RESOURCE DEFINITIONS
-
-RESOURCE RSS_SIGNATURE
-    {
-    }
-
-RESOURCE TBUF
-    {
-    buf="DGBC";
-    }
-
-// ---------------------------------------------------------------------------
-//  r_diag_battery_charger_cable_test_heading_pane
-//
-// The plugin name in the header of the dialog that is shown when starting
-// test execution.
-// ---------------------------------------------------------------------------
-//
-RESOURCE TBUF r_diag_battery_charger_cable_test_heading_pane
-    {
-    buf = qtn_diag_msg_title_battery_charger;                    
-    }
-
-// ---------------------------------------------------------------------------
-// r_diag_battery_charger_cable_test_popup_info_pane
-// The body text of the dialog that is shown when starting test execution.
-// ---------------------------------------------------------------------------
-//
-RESOURCE TBUF r_diag_battery_charger_cable_test_popup_info_pane
-    {
-    buf = qtn_diag_conf_test_failed_battery_charger;
-    }  
-
-
-// ---------------------------------------------------------------------------
-// r_diag_battery_charger_cable_test_title_pane
-// The title pane shown when Battery charger cable test is running
-// ---------------------------------------------------------------------------
-//
-RESOURCE TBUF r_diag_battery_charger_cable_test_title_pane
-    {
-    buf = qtn_diag_title_test_battery_charger;
-    }
-
-
-// ---------------------------------------------------------------------------
-// r_diag_battery_charger_cable_test_single_graphic
-// Plugin name in the suite view listbox.
-// ---------------------------------------------------------------------------
-//
-RESOURCE TBUF r_diag_battery_charger_cable_test_single_graphic
-    {
-    buf = qtn_diag_lst_test_battery_charger;
-    }
-
-//----------------------------------------------------
-//  r_diag_battery_charger_cable_test_single
-//
-// Plugin's name in results view
-//----------------------------------------------------
-//
-RESOURCE TBUF r_diag_battery_charger_cable_test_single
-    {
-    buf = qtn_diag_lst_battery_charge;          
-    }
-
-    
-//------------------------------------------------------------------------------
-//  r_cba_connect_and_press_ok
-//
-//  Command Button Array for query dialog "Connect your battery charger. 
-//  Press OK when ready." 
-//------------------------------------------------------------------------------
-//    
-RESOURCE CBA r_cba_connect_and_press_ok
-      {
-      buttons = 
-          { 
-          CBA_BUTTON { id = EBatteryTestConnectBatteryChargerSkip;
-                       txt = qtn_diag_softk_skip;   },
-                        
-          CBA_BUTTON { id = EBatteryTestConnectBatteryChargerCancel;
-                       txt = text_softkey_cancel; } ,
-                       
-          CBA_BUTTON { id = EAknSoftkeyOk;
-                       txt = text_softkey_ok;   } 
-          }; 
-      }
-      
-//------------------------------------------------------------------------------
-//  r_cba_connect_and_press_ok_single_execution
-//
-//  Command Button Array for query dialog "Connect your battery charger. 
-//  Press OK when ready." in case of single test execution
-//------------------------------------------------------------------------------
-//    
-RESOURCE CBA r_cba_connect_and_press_ok_single_execution
-      {
-      buttons = 
-          { 
-          CBA_BUTTON { id = EAknSoftkeyOk;
-                       txt = text_softkey_ok;   },
-                        
-          CBA_BUTTON { id = EBatteryTestConnectBatteryChargerCancel;
-                       txt = text_softkey_cancel; }
-          }; 
-      }    
-      
-// ADO & Platformization Changes   
-//------------------------------------------------------------------------------
-//  r_cba_connect_and_press_ok_skip_group_execution
-//
-//  Command Button Array for query dialog "Connect your battery charger. 
-//  Press OK when ready." in case of single test execution
-//------------------------------------------------------------------------------
-//    
-RESOURCE CBA r_cba_connect_and_press_ok_skip_group_execution
-      {
-      buttons = 
-          { 
-          CBA_BUTTON { id = EAknSoftkeyOk;
-                       txt = text_softkey_ok;   },
-                        
-          CBA_BUTTON { id = EBatteryTestConnectBatteryChargerSkip;
-                       txt = qtn_diag_softk_skip; }
-          }; 
-      }
-      
-        
-//------------------------------------------------------------------------------
-//  r_diag_cable_test_cba_ok_dot_empty
-//
-//  Command Button Array for query dialog "Please remove all cable." 
-//------------------------------------------------------------------------------
-//    
-RESOURCE CBA r_diag_cable_test_cba_ok_dot_empty
-      {
-      buttons = 
-          { 
-          CBA_BUTTON { id = EAknSoftkeyOk;
-                       txt = text_softkey_ok;   },
-          CBA_BUTTON { },
-          
-          CBA_BUTTON { id = EAknSoftkeyOk; }
-          }; 
-      }       
-      
-      
-// -----------------------------------------------------------------------------
-//
-// r_diag_battery_charger_cable_test_connect_and_press_ok
-// query dialog for "Connect your battery charger. Press OK when ready." 
-//
-// -----------------------------------------------------------------------------
-//
-RESOURCE DIALOG r_diag_battery_charger_cable_test_connect_and_press_ok
-    {
-    flags = EGeneralQueryFlags;
-    //buttons = r_cba_connect_and_press_ok;  // // ADO & Platformization Changes
-    buttons = r_cba_connect_and_press_ok_single_execution; // // ADO & Platformization Changes
-    items =
-        {
-        DLG_LINE
-            {
-            type = EAknCtQuery;
-            id   = EGeneralQuery;
-            control = AVKON_CONFIRMATION_QUERY
-                {
-                layout  = EConfirmationQueryLayout;
-                label   = qtn_diag_conf_battery_charger_connect;                            
-                bmpfile = BMPFILE_NAME; 
-                bmpid   = EMbmAvkonQgn_note_info;
-                bmpmask = EMbmAvkonQgn_note_info_mask;
-                };
-            }
-        };
-    }
-
-
-
-//------------------------------------------------------------------------------
-//  r_cba_battery_charger_cable_test_no_cable_detected
-//
-//  Command Button Array for query dialog 
-// "No cable detected. Press OK to continue tests or press Back to retry this test." 
-//------------------------------------------------------------------------------
-//    
-
-//  ADO & Platformization Changes
-//RESOURCE CBA r_cba_battery_charger_cable_test_no_cable_detected
-//      {
-//      buttons = 
-//          { 
-//          CBA_BUTTON { id = EAknSoftkeyOk; 
-//                       txt = text_softkey_ok; },
-//
-//          CBA_BUTTON { id = EBatteryTestConnectBatteryChargerBack;
-//                       txt = text_softkey_back; } ,
-//
-//          CBA_BUTTON { id = EAknSoftkeyOk;
-//                       txt = text_softkey_ok; }
-//          }; 
-//      }
-RESOURCE CBA r_cba_battery_charger_cable_test_no_cable_detected
-      {
-      buttons = 
-          { 
-          CBA_BUTTON { id = EBatteryTestConnectBatteryChargerYes; 
-                       txt = text_softkey_yes; },
-
-          CBA_BUTTON { id = EBatteryTestConnectBatteryChargerNo;
-                       txt = text_softkey_no; } ,
-
-          CBA_BUTTON { id = EBatteryTestConnectBatteryChargerYes;
-                       txt = text_softkey_yes; }
-          }; 
-      }
-
-
-
-//------------------------------------------------------------------------------
-//
-// r_diag_battery_charger_cable_test_no_cable_detected
-// query dialog for "No cable detected. Press OK to continue tests or press 
-// Back to retry this test." 
-//
-//------------------------------------------------------------------------------
-//
-RESOURCE DIALOG r_diag_battery_charger_cable_test_no_cable_detected
-    {
-    flags = EGeneralQueryFlags;
-    buttons = r_cba_battery_charger_cable_test_no_cable_detected;
-    items =
-        {
-        DLG_LINE
-            {
-            type = EAknCtPopupHeadingPane;
-            id = EAknMessageQueryHeaderId;
-            control = AVKON_HEADING
-                {
-                label = qtn_diag_err_title_no_battery_charger;                        
-                headinglayout = 0;
-                };
-            },
-            
-        DLG_LINE
-            {
-            type = EAknCtMessageQuery;
-            id = EAknMessageQueryContentId;
-            control = AVKON_MESSAGE_QUERY
-                {
-                message = qtn_diag_err_no_battery_charger;
-                };
-            }
-        };
-    }
-//------------------------------------------------------------------------------
-//
-// r_diag_cable_test_remove_all_cables
-// query dialog for "Please remove all cables" 
-//
-//------------------------------------------------------------------------------
-//    
-RESOURCE DIALOG r_diag_cable_test_remove_all_cables
-    {
-    flags   = EGeneralQueryFlags;
-    buttons = r_diag_cable_test_cba_ok_dot_empty;
-
-    items =
-        {
-        DLG_LINE
-            {
-            type = EAknCtQuery;
-            id   = EGeneralQuery;
-            control = AVKON_CONFIRMATION_QUERY
-                {
-                layout  = EConfirmationQueryLayout;
-                label   = qtn_diag_msg_remove_all_cables;
-                bmpfile = BMPFILE_NAME; 
-                bmpid   = EMbmAvkonQgn_note_info;
-                bmpmask = EMbmAvkonQgn_note_info_mask;
-                };
-            }
-        };
-    }            
-    
-    
-
-// ADO & Platformization Changes
-RESOURCE DIALOG r_diag_messagequery_title_battery_charger
-{
-		flags = EGeneralQueryFlags;
-		buttons = r_cba_connect_and_press_ok_single_execution;
-		
-		items =
-		{
-				DLG_LINE
-				{
-					type = EAknCtPopupHeadingPane;
-					id = EAknMessageQueryHeaderId;
-					control = AVKON_HEADING
-			 		{
-			 				label = qtn_diag_msg_title_battery_charger;
-			 				headinglayout = R_AVKON_WML_SIGN_QUERY_HEADING_PANE;
-			 		};
-				},
-				
-				DLG_LINE
-				{
-					type = EAknCtMessageQuery;
-					id = EAknMessageQueryContentId;
-					control = AVKON_MESSAGE_QUERY
-					{
-							message = qtn_diag_msg_info_battery_charger;
-					};
-				}
-		};
-}
-    
-//End of File
--- a/devicediagnostics/diagplugins/diagbatterychargerplugin/group/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-/*
-* 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:  This file provides the information required for building
-*                Battery Charge Cable Test Plug-in
-*
-*/
-
-#include <platform_paths.hrh>
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-../loc/diagbatterychargercabletestplugin.loc        MW_LAYER_LOC_EXPORT_PATH(diagbatterychargercabletestplugin.loc)
-../rom_files/devdiagbatterychargerplugin.iby    CORE_MW_LAYER_IBY_EXPORT_PATH(devdiagbatterychargerplugin.iby)
-../rom_files/devdiagbatterychargerplugin_resources.iby		LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(devdiagbatterychargerplugin_resources.iby)
-
-PRJ_MMPFILES
-diagbatterychargercabletestplugin.mmp
-
-PRJ_TESTMMPFILES
-
-//  End of File
--- a/devicediagnostics/diagplugins/diagbatterychargerplugin/group/diagbatterychargercabletestplugin.mmp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-/*
-* 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:  Project specification file.
-*
-*/
-
-
-#include  <data_caging_paths.hrh>    // For RESOURCE_FILES_DIR
-
-// To get the MW_LAYER_SYSTEMINCLUDE-definition
-#include <platform_paths.hrh>            
-
-CAPABILITY          CAP_ECOM_PLUGIN
-TARGET              devdiagbatterychargercabletestplugin.dll
-TARGETTYPE          PLUGIN
-UID                 0x10009D8D 0x2000E590                   
-VENDORID            VID_DEFAULT
-
-
-SOURCEPATH  ../src
-SOURCE      diagbatterychargerpluginimpltbl.cpp
-SOURCE      diagbatterychargercableplugin.cpp
-SOURCE      diagbatterychargercableengine.cpp
-
-//User include paths
-USERINCLUDE     ../inc
-USERINCLUDE     ../data // For *.rh
-USERINCLUDE     ../loc
-
-//System include paths
-SYSTEMINCLUDE   /epoc32/include/ecom
-
-// Default system include paths for middleware layer modules.
-APP_LAYER_SYSTEMINCLUDE
-
-SOURCEPATH      ../data
-
-// resource file for the plugin implementation
-START RESOURCE  devdiagbatterychargercabletestplugin.rss
-TARGET          devdiagbatterychargercabletestplugin.rsc
-TARGETPATH      ECOM_RESOURCE_DIR
-END
-
-// resource file for the plugin registration
-START RESOURCE  devdiagbatterychargercabletestpluginrsc.rss
-HEADER
-TARGETPATH      RESOURCE_FILES_DIR
-LANGUAGE_IDS
-END
-
-LIBRARY   euser.lib
-LIBRARY   avkon.lib
-LIBRARY   eikcoctl.lib
-LIBRARY   eikdlg.lib
-
-LIBRARY   commonengine.lib      // For StringLoader
-LIBRARY   diagpluginbase.lib
-LIBRARY   flogger.lib           // for RFileLogger
-LIBRARY   diagframework.lib 
-
-
-// End of File
--- a/devicediagnostics/diagplugins/diagbatterychargerplugin/inc/diagbatterychargercableengine.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,170 +0,0 @@
-/*
-* 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:  This is the header for the Diagnostics Battery Charger 
-*                 Cable Test Engine
-*
-*/
-
-
-#ifndef DIAGBATTERYCHARGERCABLETESTENGINE_H
-#define DIAGBATTERYCHARGERCABLETESTENGINE_H
-
-
-// INCLUDES
-
-#include <DiagResultsDatabaseItem.h>
-
-//CONSTANTS
-
-// MACROS
-
-// DATA TYPES
-
-// FUNCTION PROTOTYPES
-
-// FORWARD DECLARATIONS
-class CDiagPluginWaitingDialogWrapper;
-class MDiagBatteryChargerTestCallBackInterface;
-
-
-// CLASS DEFINITION
-/**
-* CDiagBatteryChargerCableTestEngine
-*
-* Engine class of the Battery charger cable test plug-in
-*/    
-class CDiagBatteryChargerCableTestEngine : public CActive
-    {
-    
-public: //New functions
-    static CDiagBatteryChargerCableTestEngine* NewL(
-        MDiagBatteryChargerTestCallBackInterface& aInterface,
-        TBool aIsSinglePluginExecution);
-    
-    /**
-    * C++ destructor
-    */
-    ~CDiagBatteryChargerCableTestEngine();
-    
-public: // external functions
-    /**
-    * The plug-in class uses this function to start the Battery charger test
-    */
-    void RunBatteryChargerTestL();
-
-private:
-
-    /**
-    * Standard c++ constructor
-    */
-    CDiagBatteryChargerCableTestEngine(MDiagBatteryChargerTestCallBackInterface& aInterface,
-                                       TBool aIsSinglePluginExecution);
-    
-    /**
-    * Symbian second phase constructor
-    */
-    void ConstructL();
-    
-    
-private: //internal functions
-    
-    /**
-    * To report the result to the plug-in class
-    */
-    void ReportResultToPluginL(CDiagResultsDatabaseItem::TResult aResult);
-    
-    /**
-    *   Detect the Battery charger status
-    *   @param none
-    *   @return ETrue - If the charger was detected
-    *           EFalse - If the charger was not detected
-    */    
-    TBool CheckIfChargerDetected();
-
-
-    /**
-    * Ask user to connect charger and press OK
-    *   @param aUserResponse - Dialog response will be returned via this parameter.
-    *   @return ETrue - If dialog was dismissed by end user.
-    *       EFalse - If dialog was deleted.
-    */
-    TBool ConnectAndPressOkL( TInt& aUserResponse ); 
-    
-    /**
-    * Ask user to remove all cables and press OK    
-    *   @param aUserResponse - Dialog response will be returned via this parameter.
-    *   @return ETrue  - If dialog was dismissed by end user.
-    *           EFalse - If dialog was deleted.
-    */
-    TBool RemoveAllCablesL( TInt& aUserResponse );  
-
-    /**
-    * Display "No cable detected. Try again?" prompt
-    *   @param aUserResponse - Dialog response will be returned via this parameter.
-    *   @return ETrue - If dialog was dismissed by end user.
-    *       EFalse - If dialog was deleted.
-    */
-    TBool AskIfRetryL( TInt& aUserResponse );
-
-   
-    /**
-    * Displays a query dialog with header.
-    *   @param aDialogResourceId - Resource ID of the dialog to display
-    *   @param aUserResponse - Dialog response will be returned via this parameter.
-    *   @return ETrue - If dialog was dismissed by end user.
-    *           EFalse - If dialog was deleted.
-    */    
-    TBool DisplayQueryDialogWithHeaderL( 
-        TInt aDialogResourceId,
-        TInt& aUserResponse );
-    
-private:    // from CActive
-
-    /**
-    * Handle active object completion event, used to handle internal trigger in our 
-    * plug-in
-    */
-    void RunL();
-    
-    /**
-    * Handle cancel
-    */
-    void DoCancel();
-    
-private: // data
-
-    /**
-    * Reference of the callback interface between the plug-in class
-    * and the engine class.
-    */
-    MDiagBatteryChargerTestCallBackInterface& iInterface;
-    
-    
-    /**
-    * Wrapper to display waiting dialog. This helps to identify if the dialog
-    * was dismissed by end-user or by object deletion.
-    * Ownership: This class.
-    */
-    CDiagPluginWaitingDialogWrapper* iWaitingDialogWrapper;
-    
-    /**
-    *   This flag indicates if the plugin is run in single test execution mode.
-    */
-    TBool iIsSinglePluginExecution;
-    
-    };
-
-#endif //DIAGBATTERYCHARGERCABLETESTENGINE_H
-
-// End of File
--- a/devicediagnostics/diagplugins/diagbatterychargerplugin/inc/diagbatterychargercableplugin.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,154 +0,0 @@
-/*
-* 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:  This is the header file for Diagnostics Battery Charger Cable Test Plug-in
-*
-*/
-
-
-#ifndef DIAGBATTERYCHARGERCABLETESTPLUGIN_H 
-#define DIAGBATTERYCHARGERCABLETESTPLUGIN_H
-
-// INCLUDES
-#include <DiagResultsDatabaseItem.h>
-#include <DiagTestPluginBase.h>
-#include "diagbatterychargercallbackinterface.h"
-
-//CONSTANTS
-
-// MACROS
-
-// DATA TYPES
-
-// FUNCTION PROTOTYPES
-
-// FORWARD DECLARATIONS
-class CDiagResultsDbItemBuilder;
-class CDiagBatteryChargerCableTestEngine;
-
-
-// CLASS DEFINITION
-
-/**
-* Diagnostics Battery Charger Cable Test Plug-in
-* This class is the main plug-in class for the Battery charger cable test plug-in
-*/
-class CDiagBatteryChargerCableTestPlugin : public CDiagTestPluginBase, 
-                                           public MDiagBatteryChargerTestCallBackInterface
-    {
-public: // Constructors and destructor
-
-    /**
-    * Symbian OS two-phased constructor
-    * @return DataNetwork Test Plugin
-    */
-    static MDiagPlugin* NewL( TAny* aInitParams );
-
-    /**
-    * Destructor
-    */
-    ~CDiagBatteryChargerCableTestPlugin();
-    
-private: // from MDiagBatteryChargerTestCallBackInterface
-    
-    /**
-    * The engine class uses this interface to inform the plug-in class about the test result.
-    */
-    void ReportTestResultL(CDiagResultsDatabaseItem::TResult aResult);
-    
-    /**
-    * The engine class uses this callback on the plugin class to ask the user if the entire test
-    * execution needs to be cancelled.
-    * @param aUserResponse : The user response is returned in this reference argument.
-    *                    
-    * @return ETrue     : The dialog was dismissed by the user.
-    *         EFalse    : The dialog was dismissed internally.
-    */
-    TBool AskCancelExecutionL(TInt& aUserResponse);
-    
-    // ADO & Platformization Changes
-    TBool ShowMessageQueryL( TInt aResourceId, TInt &aButtonId  );
-
-private: // From CDiagTestPluginBase
-
-    /**
-    * @see CDiagTestPluginBase::Visible()
-    */
-    TBool IsVisible() const;
-
-    /**
-    * @see CDiagTestPluginBase::RunMode()
-    */
-    TRunMode RunMode() const;
-
-    /**
-    * @see CDiagTestPluginBase::TotalSteps()
-    */
-    TUint TotalSteps() const;
-
-    /**
-    * @see CDiagTestPluginBase::GetPluginNameL
-    */
-    HBufC* GetPluginNameL( TNameLayoutType aLayoutType ) const;
-
-    /**
-    * @see CDiagTestPluginBase::Uid
-    */
-    TUid Uid() const;
-
-    /**
-    * Handle plug-in execution.
-    * @see CDiagTestPluginBase::DoRunTestL
-    */
-    void DoRunTestL();
-
-    /**
-    * Clean up
-    * @see CDiagTestPluginBase::DoStopAndCleanupL
-    */
-    void DoStopAndCleanupL();
-
-private: // New functions
-
-    /**
-    * C++ default constructor.
-    */
-    CDiagBatteryChargerCableTestPlugin( CDiagPluginConstructionParam* aInitParams );
-
-    /**
-    * Symbian OS second phase constructor.
-    *
-    */
-    void ConstructL();
-
-protected:    // from CActive
-    /**
-    * Handle active object completion event
-    */
-    void RunL();
-
-    /**
-    * Handle cancel
-    */
-    void DoCancel();
-
-private:    // data
-
-    /** Instance of the engine class for this test. Own */ 
-    CDiagBatteryChargerCableTestEngine *iEngine;
-    };
-
-#endif //DIAGBATTERYCHARGERCABLETESTPLUGIN_H
-
-// End of File
-
--- a/devicediagnostics/diagplugins/diagbatterychargerplugin/inc/diagbatterychargercabletestplugin.hrh	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-/*
-* 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:  Contains the UIDs and common definitions for menu ids
-*
-*/
-
-
-#ifndef DIAGBATTERYCHARGERCABLETESTPLUGIN_HRH
-#define DIAGBATTERYCHARGERCABLETESTPLUGIN_HRH
-
-// Definitions
-#define _UID3                 0x2000E590
-#define _IMPLEMENTATION_UID   0x2000E591
-
-
-// commands
-enum TBatteryChargerTestCmdIDs
-   {
-    EBatteryTestConnectBatteryChargerSkip = 1,          // Do not start from 0
-    EBatteryTestConnectBatteryChargerCancel,
-    EBatteryTestConnectBatteryChargerBack,
-    EBatteryTestConnectBatteryChargerNo,            // ADO & Platformization Changes
-    EBatteryTestConnectBatteryChargerYes						// ADO & Platformization Changes
-   };
-
-#endif //  DIAGBATTERYCHARGERCABLETESTPLUGIN_HRH
-
-//End of File
--- a/devicediagnostics/diagplugins/diagbatterychargerplugin/inc/diagbatterychargercallbackinterface.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-/*
-* 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:  This class is an abstract interface used by the Battery charger cable test
-*                engine class (CDiagBatteryChargerCableTestEngine) to report result to the 
-*                plug-in class (CDiagBatteryChargerCableTestPlugin)    
-*
-*/
-
-
-#ifndef DIAGBATTERYCHARGERCALLBACKINTERFACE_H
-#define DIAGBATTERYCHARGERCALLBACKINTERFACE_H
-
-// INCLUDES
-#include <DiagResultsDatabaseItem.h>
-
-// CLASS DECLARATION
-
-/**
-* MDiagBatteryChargerTestCallBackInterface
-*
-* This is an abstract interface class used by the Battery charger cable test
-* engine class (CDiagBatteryChargerCableTestEngine) to report result of the test
-* to the plug-in class (CDiagBatteryChargerCableTestPlugin).
-*/
-class MDiagBatteryChargerTestCallBackInterface
-    {
-public:
-    /**
-    * The engine class uses this interface to inform the plug-in class about the test result.
-    */
-    virtual void ReportTestResultL(CDiagResultsDatabaseItem::TResult aResult) = 0;
-    
-    /**
-    * The engine class uses this callback on the plugin class to ask the user if the entire test
-    * execution needs to be cancelled.
-    * @param aUserResponse : The user response is returned in this reference argument.
-    *      
-    * @return ETrue     : The dialog was dismissed by the user.
-    *         EFalse    : The dialog was dismissed internally.
-    */    
-    virtual TBool AskCancelExecutionL(TInt& aUserResponse) = 0;
-    };
-    
-
-#endif // DIAGBATTERYCHARGERCALLBACKINTERFACE_H
--- a/devicediagnostics/diagplugins/diagbatterychargerplugin/loc/diagbatterychargercabletestplugin.loc	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,91 +0,0 @@
-/*
-* 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:  Localization strings for Diagnostics Battery Charger Cable Test Plug-in
-*
-*/
-
-
-//  LOCALISATION STRINGS
-
-// d:Plug-in name in the header of the dialog that is shown when starting test
-// d:execution.
-// l:heading_pane_t1
-// r:3.2.1
-//
-#define qtn_diag_msg_title_battery_charger  "Battery charger test"
-
-
-// d:The body text of the dialog that is shown when starting test execution.
-// d:This provides information about running the plug-in to the user.
-// l:popup_info_list_pane_t1
-// r:3.2.1
-//
-#define qtn_diag_msg_info_battery_charger  "The following test will check battery charger."
-
-
-// d:The title pane shown when battery charger test is running
-// l:title_pane_t2/opt12
-// r:3.2.1
-//
-//#define qtn_diag_title_test_battery_charger  "Battery charger test" // LVT Change
-
-
-// d:Plugin name in the plugin view listbox.
-// l:list_single_graphic_pane_t1
-// r:3.2.1
-//
-//#define qtn_diag_lst_test_battery_charger    "Battery charger test" // LVT Change
-
-
-// d:Plugin name in the results view listbox.
-// l:list_single_graphic_heading_pane_t1_cp2
-// r:3.2.1
-//
-#define qtn_diag_lst_battery_charge  "Battery charger test"
-
-
-//d:Text of the query dialog to prompt user to connect battery charger and confirm
-//l:popup_note_window
-//r: 3.2
-//
-#define qtn_diag_conf_battery_charger_connect  "Connect the Battery Charger and plug it into the power source."
-
-
-
-
-//d:Title of message query prompt of query dialog when battery charger is not detected
-//l:heading_pane_t1
-//r:3.2
-//
-#define qtn_diag_err_title_no_battery_charger  "Battery charger not detected"
-        
-
-
-//d:Text of the query dialog when battery charger is not detected
-//l:popup_info_list_pane_t1
-//r: 3.2
-//
-// ADO & Platformization Changes
-//#define qtn_diag_err_no_battery_charger  "Press OK to continue tests, or press Back to retry this test."
-#define qtn_diag_err_no_battery_charger  "Do you want to repeat the battery charger test?"
-
-//d:Failed result text
-//l:popup_info_list_pane_t1
-//r:5.0
-//
-#define qtn_diag_conf_test_failed_battery_charger "Battery charger test"
-// ADO & Platformization Changes
-#define qtn_diag_softk_skip "Skip"
-        
-// End of File
--- a/devicediagnostics/diagplugins/diagbatterychargerplugin/rom_files/devdiagbatterychargerplugin.iby	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-/*
-* 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:  Image description file for project Battery charger Test Plugin
-*
-*/
-
-
-
-#ifndef DEVDIAGBATTERYCHARGERPLUGIN_IBY
-#define DEVDIAGBATTERYCHARGERPLUGIN_IBY
-
-#ifdef FF_DEVICE_DIAGNOSTICS_APP 
-
-#include <data_caging_paths_for_iby.hrh>
-
-ECOM_PLUGIN( devdiagbatterychargercabletestplugin.dll, devdiagbatterychargercabletestplugin.rsc )
-
-#endif
-
-#endif // DEVDIAGBATTERYCHARGERPLUGIN_IBY
-
-// end of file
--- a/devicediagnostics/diagplugins/diagbatterychargerplugin/rom_files/devdiagbatterychargerplugin_resources.iby	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-/*
-* 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:  Image description file for resources of project 
-*                Battery charger Test Plugin
-*
-*/
-
-
-
-#ifndef DEVDIAGBATTERYCHARGERPLUGIN_RESOURCES_IBY
-#define DEVDIAGBATTERYCHARGERPLUGIN_RESOURCES_IBY
-
-#ifdef FF_DEVICE_DIAGNOSTICS_APP 
-
-#include <data_caging_paths_for_iby.hrh>
-
-data=\epoc32\data\Z\resource\devdiagbatterychargercabletestpluginrsc.rsc          resource\devdiagbatterychargercabletestpluginrsc.rsc
-
-#endif 
-
-#endif // DEVDIAGBATTERYCHARGERPLUGIN_RESOURCES_IBY
-
-// end of file
--- a/devicediagnostics/diagplugins/diagbatterychargerplugin/src/diagbatterychargercableengine.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,449 +0,0 @@
-/*
-* 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:  This is the implementation class for the engine of Battery charger cable
-*                 test plug-in
-*
-*/
-
-
-// INCLUDE FILES
-// Class declaration
-#include "diagbatterychargercableengine.h"
-
-// System includes
-#include <DiagFrameworkDebug.h>                     // Debugging Macros
-#include <StringLoader.h>                           // StringLoader
-#include <e32property.h>                            // RProperty
-#include <hwrmpowerstatesdkpskeys.h>                // P&S keys of HW Resource Manager
-#include <DiagPluginWaitingDialogWrapper.h>         // CDiagPluginWaitingDialogWrapper
-#include <aknmessagequerydialog.h>                  // CAknQueryDialog
-#include <devdiagbatterychargercabletestpluginrsc.rsg> // Resource definitions
-
-
-// User includes
-#include "diagbatterychargercabletestplugin.hrh"    // command ids
-#include "diagbatterychargercallbackinterface.h"    //MDiagBatteryChargerTestCallBackInterface
-
-
-// EXTERNAL DATA STRUCTURES
-
-// EXTERNAL FUNCTION PROTOTYPES
-
-// CONSTANTS
-
-// MACROS
-
-// LOCAL CONSTANTS AND MACROS
-
-// MODULE DATA STRUCTURES
-
-// LOCAL FUNCTION PROTOTYPES
-
-// FORWARD DECLARATIONS
-
-// ============================= LOCAL FUNCTIONS ==============================
-
-// ========================= MEMBER FUNCTIONS ================================
-   
-// ---------------------------------------------------------------------------
-// CDiagBatteryChargerCableTestEngine::NewL()
-//
-// Symbian OS default constructor
-// ---------------------------------------------------------------------------   
-CDiagBatteryChargerCableTestEngine* CDiagBatteryChargerCableTestEngine::NewL(
-    MDiagBatteryChargerTestCallBackInterface& aInterface,
-    TBool aIsSinglePluginExecution)
-    {
-    CDiagBatteryChargerCableTestEngine* self = 
-        new (ELeave)CDiagBatteryChargerCableTestEngine(
-                                    aInterface, aIsSinglePluginExecution);
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );
-    return self;    
-    }
-    
-    
-// ----------------------------------------------------------------------------
-// CDiagBatteryChargerCableTestEngine::CDiagBatteryChargerCableTestEngine()
-//
-// Constructor
-// ----------------------------------------------------------------------------
-//    
-CDiagBatteryChargerCableTestEngine::CDiagBatteryChargerCableTestEngine(
-    MDiagBatteryChargerTestCallBackInterface& aInterface,
-    TBool aIsSinglePluginExecution)
-    :   CActive( EPriorityStandard ),
-        iInterface(aInterface),
-        iWaitingDialogWrapper( NULL ),
-        iIsSinglePluginExecution(aIsSinglePluginExecution)
-    {
-    CActiveScheduler::Add( this );
-    }
-    
-// ----------------------------------------------------------------------------
-// CDiagBatteryChargerCableTestEngine::~CDiagBatteryChargerCableTestEngine
-//
-// Destructor
-// ----------------------------------------------------------------------------
-CDiagBatteryChargerCableTestEngine::~CDiagBatteryChargerCableTestEngine()
-    {
-    Cancel();
-    
-    delete iWaitingDialogWrapper; //  deleting will dismiss active dialog
-    iWaitingDialogWrapper = NULL;
-    }
-    
-// ---------------------------------------------------------------------------
-// CDiagBatteryChargerCableTestEngine::ConstructL()
-//
-// Symbian OS two-phased constructor
-// ---------------------------------------------------------------------------    
-void CDiagBatteryChargerCableTestEngine::ConstructL()
-    {
-    // nothing to do here
-    }
-    
-
-// ----------------------------------------------------------------------------
-// CDiagBatteryChargerCableTestEngine::RunBatteryChargerTestL
-//
-// This function starts the Battery charger cable test
-// ----------------------------------------------------------------------------
-void CDiagBatteryChargerCableTestEngine::RunBatteryChargerTestL()
-    {    
-    TInt userResponse;
-    
-    if ( !ConnectAndPressOkL( userResponse ) )
-        {
-        // Return immediately. "this" object may have been deleted.
-        LOGSTRING( "CDiagBatteryChargerCableTestEngine : Connect Battery charger and press ok dialog was dismissed internally" )
-        return;
-        }
-
-    switch( userResponse )
-        {
-        // User selects OK "Connect charger & press ok" dialog
-        case EAknSoftkeyOk: 
-            {            
-            //TInt keySelect;
-            // check if headset cable is connected
-            if( CheckIfChargerDetected() )
-                {
-                // battery charger is detected
-                LOGSTRING( "CDiagBatteryChargerCableTestEngine : Headset detected" );
-                /*
-                if ( !RemoveAllCablesL( keySelect ) )
-                    {
-                    LOGSTRING( "CDiagBatteryChargerCableTestEngine : Remove All Cable dialog was dismissed internally pressed" )
-                    return;
-                    }
-
-                if ( keySelect != EAknSoftkeyOk )
-                    {
-                    LOGSTRING( "CDiagBatteryChargerCableTestEngine : EndKey has pressed" )
-                    return;	
-                    }
-                */ // ADO & Platformization Changes  
-
-                LOGSTRING( "CDiagBatteryChargerCableTestEngine : Report result Success" )    
-                ReportResultToPluginL( CDiagResultsDatabaseItem::ESuccess );
-                }
-            else
-                { 
-                // no cable detected
-                if ( !AskIfRetryL( userResponse ) )
-                    {
-                    // Ask for retry dialog dismissed by framework internally
-                    // Return immediately
-                    LOGSTRING( "CDiagBatteryChargerCableTestEngine Test Ask for retry dialog dismissed by framework internally" )
-                    return;
-                    }
-                
-                switch(userResponse)
-                    {
-                    
-                    //case EAknSoftkeyOk: // ADO & Platformization Changes
-                    	case EBatteryTestConnectBatteryChargerNo:
-                        {
-                        LOGSTRING( "CDiagBatteryChargerCableTestEngine : user selected OK" )
-                        ReportResultToPluginL(CDiagResultsDatabaseItem::EFailed);
-                        }
-                        break;
-                    //case EBatteryTestConnectBatteryChargerBack: //  ADO & Platformization Changes
-                    	case EBatteryTestConnectBatteryChargerYes:
-                        {
-                        LOGSTRING( "CDiagBatteryChargerCableTestEngine : user selected Back" )
-                        // user selected "Back" to retry
-                        // do a self-trigger to start again
-                        TRequestStatus* status = &iStatus;
-                        SetActive();
-                        User::RequestComplete( status, KErrNone );
-                        }
-                        break;
-                    default:
-                        {
-                        // the dialog was dismissed by cancel key
-                        LOGSTRING( "CDiagBatteryChargerCableTestEngine : user selected cancel key" )
-                        }
-                        break;
-                    };
-                }
-            }
-            break;
-        
-        // User selects SKIP  on "Connect charger & press ok" dialog
-        case EBatteryTestConnectBatteryChargerCancel: 
-        case EBatteryTestConnectBatteryChargerSkip:
-            {
-            if(iIsSinglePluginExecution)
-                {
-                LOGSTRING( "CDiagBatteryChargerCableTestEngine Test skipped by user" )
-                ReportResultToPluginL(CDiagResultsDatabaseItem::ESkipped);  
-                }
-            else
-                {
-                if( iInterface.AskCancelExecutionL(userResponse) )
-                    {
-                    // cancel dialog was dismissed by user action
-                    if(userResponse)
-                        {
-                        LOGSTRING( "CDiagBatteryChargerCableTestEngine Test cancelled by user" )
-                        return;
-                        }
-                    else
-                        {
-                        // currently no way to distinguish between "No" and "Cancel" key
-                        LOGSTRING( "CDiagBatteryChargerCableTestEngine : User selected No to Cancel dialog" )
-                        // do a self-trigger to start again
-                        TRequestStatus* status = &iStatus;
-                        SetActive();
-                        User::RequestComplete( status, KErrNone );
-                        }
-    
-                    }
-                else
-                    {
-                    // Though this should not happedn, Cancel All Test execution query dialog was dismissed internally by the framework,
-                    // not by user action. Return immediately
-                    LOGSTRING( "CDiagBatteryChargerCableTestEngine : Cancel query dialog was dismissed internally by the framework, not by user action." )
-                    return;
-                    }
-                }
-            }
-            break;
-        
-        // User selectes CANCEL command (Red Key) on "Connect charger & press ok" dialog
-        default:
-            {
-            // Do nothing
-            LOGSTRING( "CDiagBatteryChargerCableTestEngine : Connect Battery charger and press ok dialog was dismissed by end key" )
-            }
-            break;
-        };
-    }
-    
-// ----------------------------------------------------------------------------
-// CDiagBatteryChargerCableTestEngine::CheckIfChargerDetected
-//
-// This function detects the battery charger status
-// ----------------------------------------------------------------------------
-TBool CDiagBatteryChargerCableTestEngine::CheckIfChargerDetected()
-    {
-    TInt charger = -1, retval = EFalse;
-    TInt error = RProperty::Get( KPSUidHWRMPowerState, KHWRMChargingStatus, charger ) ;
-    
-    if( error == KErrNone )
-        {
-        LOGSTRING2( "CDiagBatteryChargerCableTestEngine charging status = %d", charger )
-        switch(charger)
-            {                        
-            case EChargingStatusCharging:           // Device is charging.
-            case EChargingStatusAlmostComplete:     // Charging almost completed.  
-            case EChargingStatusChargingComplete:   // Charging completed.  
-            case EChargingStatusChargingContinued : // Charging continued after brief interruption. 
-                {
-                retval = ETrue;
-                }
-                break;
-                
-                
-            case EChargingStatusError:        // Some error has occurred when charger is connected or charging.
-            case EChargingStatusNotConnected: // Charger not connected/uninitialized. 
-            case EChargingStatusNotCharging:  // Charger is connected, device not charging.
-            default:
-                {
-                retval =  EFalse;
-                }
-                    
-            }
-        }
-    else
-        {
-        LOGSTRING( "CDiagBatteryChargerCableTestEngine : Error in obtaining charger status ")
-        retval =  EFalse;
-        }
-    
-    return retval;
-    }
-
-// ----------------------------------------------------------------------------
-// CDiagBatteryChargerCableTestEngine::ReportResultToPluginL
-//
-// This function reports the result to plugin
-// ----------------------------------------------------------------------------
-void CDiagBatteryChargerCableTestEngine::ReportResultToPluginL(
-                                    CDiagResultsDatabaseItem::TResult aResult)
-    {
-    iInterface.ReportTestResultL(aResult);
-    }
-
-
-// ---------------------------------------------------------------------------------------
-// CDiagBatteryChargerCableTestPlugin::ConnectAndPressOkL
-// This function shows the query dialog : Connect your battery charger. Press OK when ready
-// --------------------------------------------------------------------------------------- 
-TBool CDiagBatteryChargerCableTestEngine::ConnectAndPressOkL( TInt& aUserResponse )
-    {
-    
-    ASSERT( iWaitingDialogWrapper == NULL );
-
-    CAknQueryDialog* dialog = CAknQueryDialog::NewL( CAknQueryDialog::ENoTone );
-    CleanupStack::PushL( dialog );
-
-    dialog->PrepareLC( R_DIAG_BATTERY_CHARGER_CABLE_TEST_CONNECT_AND_PRESS_OK );
-    
-    if( iIsSinglePluginExecution )
-        {
-        CEikButtonGroupContainer& cba = dialog->ButtonGroupContainer();
-        cba.SetCommandSetL( R_CBA_CONNECT_AND_PRESS_OK_SINGLE_EXECUTION );        
-        }       
-    
-    CleanupStack::Pop( dialog );
-
-    // dialog ownership to bepassed to iWaitingDialogWrapper
-    // CDiagPluginWaitingDialogWrapper::NewL will push dialog into clean up stack
-    iWaitingDialogWrapper = CDiagPluginWaitingDialogWrapper::NewL( dialog );
-    dialog = NULL;
-
-    TBool isDialogDismissedByUser = iWaitingDialogWrapper->RunLD( aUserResponse );
-    if ( isDialogDismissedByUser )
-        {
-        // local variable can be accessed only if it was returned due to
-        // user response. iWaitingDialogWrapper self destructs.
-        iWaitingDialogWrapper = NULL;
-        }
-
-    return isDialogDismissedByUser;
-    }  
-    
-// ---------------------------------------------------------------------------------------
-// CDiagBatteryChargerCableTestPlugin::RemoveAllCables
-// This function shows the query dialog : Please remove all cables
-// --------------------------------------------------------------------------------------- 
-TBool CDiagBatteryChargerCableTestEngine::RemoveAllCablesL( TInt& aUserResponse )
-    {
-    ASSERT( iWaitingDialogWrapper == NULL );
-
-    CAknQueryDialog* dialog = CAknQueryDialog::NewL( CAknQueryDialog::ENoTone );    
-
-    dialog->PrepareLC( R_DIAG_CABLE_TEST_REMOVE_ALL_CABLES );
-
-    // dialog ownership to bepassed to iWaitingDialogWrapper
-    // CDiagPluginWaitingDialogWrapper::NewL will push dialog into clean up stack
-    iWaitingDialogWrapper = CDiagPluginWaitingDialogWrapper::NewL( dialog );
-    dialog = NULL;
-
-    TBool isDialogDismissedByUser = iWaitingDialogWrapper->RunLD( aUserResponse );
-    if ( isDialogDismissedByUser )
-        {
-        // local variable can be accessed only if it was returned due to
-        // user response. iWaitingDialogWrapper self destructs.
-        iWaitingDialogWrapper = NULL;
-        }
-
-    return isDialogDismissedByUser;
-    }     
-    
-// ---------------------------------------------------------------------------------------
-// CDiagBatteryChargerCableTestPlugin::AskIfRetryL
-// This function shows the query dialog : No cable detected. Press OK to continue tests
-// or press Back to retry this test.
-// ---------------------------------------------------------------------------------------
-TBool CDiagBatteryChargerCableTestEngine::AskIfRetryL( TInt& aUserResponse )
-    {
-    return DisplayQueryDialogWithHeaderL(
-                                       R_DIAG_BATTERY_CHARGER_CABLE_TEST_NO_CABLE_DETECTED, 
-                                       aUserResponse);                                
-    }                  
-
-   
-// ---------------------------------------------------------------------------------------
-// CDiagBatteryChargerCableTestPlugin::DisplayQueryDialogWithHeaderL
-// This function shows the query dialog. It returns ETrue, if the dialog is dismissed by user
-// if the dialog was dismissed because of time-out, it returns EFalse. 
-// The user response (softkey) is returned in the reference argument aUserResponse
-// ---------------------------------------------------------------------------------------    
-    
-TBool CDiagBatteryChargerCableTestEngine::DisplayQueryDialogWithHeaderL( 
-        TInt aDialogResourceId,
-        TInt& aUserResponse )
-    {
-    ASSERT( iWaitingDialogWrapper == NULL );
-  
-    CAknMessageQueryDialog * dialog = new ( ELeave ) 
-									CAknMessageQueryDialog ( CAknQueryDialog::ENoTone );
-    CleanupStack::PushL( dialog );
-    dialog->PrepareLC( aDialogResourceId );
-    CleanupStack::Pop( dialog );
-
-    // dialog ownership to bepassed to iWaitingDialogWrapper
-    // CDiagPluginWaitingDialogWrapper::NewL will push dialog into clean up stack
-    iWaitingDialogWrapper = CDiagPluginWaitingDialogWrapper::NewL( dialog );
-    dialog = NULL;
-
-    TBool isDialogDismissedByUser = iWaitingDialogWrapper->RunLD( aUserResponse );
-    if ( isDialogDismissedByUser )
-        {
-        // local variable can be accessed only if it was returned due to
-        // user response. iWaitingDialogWrapper self destructs.
-        iWaitingDialogWrapper = NULL;
-        }
-
-    return isDialogDismissedByUser;
-    }    
-
-// ---------------------------------------------------------------------------------------
-// CDiagHeadsetCableTestEngine::RunL
-// RunL() function is used in this plug-in to handle internal trigger
-// ---------------------------------------------------------------------------------------    
-void CDiagBatteryChargerCableTestEngine::RunL()
-    {
-    if(iStatus == KErrNone)
-        {
-        RunBatteryChargerTestL();
-        }
-    }
-
-// ---------------------------------------------------------------------------------------
-// CDiagHeadsetCableTestEngine::DoCancel
-// Handles cancel request
-// ---------------------------------------------------------------------------------------    
-void CDiagBatteryChargerCableTestEngine::DoCancel()
-    {
-    // no implementation needed
-    }
-    
-// End of File
-
--- a/devicediagnostics/diagplugins/diagbatterychargerplugin/src/diagbatterychargercableplugin.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,327 +0,0 @@
-/*
-* 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:  This is the implementation module for the Diagnostics Battery Charger 
-*                 Cable Test plugin
-*
-*/
-
-
-// INCLUDE FILES
-
-// Class Declaration
-#include "diagbatterychargercableplugin.h"
-
-// System includes
-#include <StringLoader.h>                               // StringLoader
-#include <avkon.hrh>                                    // command definitions
-#include <DiagFrameworkDebug.h>                         // debug macros
-#include <DiagTestExecParam.h>                          // TDiagTestExecParam
-#include <DiagEngineCommon.h>                           // MDiagEngineCommon
-#include <devdiagbatterychargercabletestpluginrsc.rsg>     // resource defintions
-
-// User includes
-#include "diagbatterychargercableengine.h"              // CDiagBatteryChargerCableTestEngine
-#include "diagbatterychargercabletestplugin.hrh"        // UIDs and Command Ids
-
-
-#include <AknDialog.h> // ADO & Platformization Changes
-#include <aknmessagequerydialog.h>  // ADO & Platformization Changes
-#include <DiagCommonDialog.h>          // for EDiagCommonDialogConfirmCancelAll 
-// EXTERNAL DATA STRUCTURES
-
-// EXTERNAL FUNCTION PROTOTYPES
-
-// CONSTANTS
-const TUint KTotalNumOfSteps = 2;
-const TUid KDiagBatteryChargerCableTestPluginUid = { _IMPLEMENTATION_UID };
-_LIT( KDiagBatteryChargerCableTestPluginResourceFileName, "z:DevDiagBatteryChargerCableTestPluginRsc.rsc" );
-
-// MACROS
-
-// LOCAL CONSTANTS AND MACROS
-
-// MODULE DATA STRUCTURES
-
-// LOCAL FUNCTION PROTOTYPES
-
-// FORWARD DECLARATIONS
-
-// ============================= LOCAL FUNCTIONS ==============================
-
-// ========================= MEMBER FUNCTIONS ================================
-
-// ----------------------------------------------------------------------------
-// Standard C++ Constructor
-// ----------------------------------------------------------------------------
-//
-CDiagBatteryChargerCableTestPlugin::CDiagBatteryChargerCableTestPlugin
-                                  ( CDiagPluginConstructionParam* aParam )
-    : CDiagTestPluginBase( aParam )
-    {
-    // nothing to do here
-    }
-
-
-// ---------------------------------------------------------------------------
-// Symbian OS default constructor
-// ---------------------------------------------------------------------------
-MDiagPlugin* CDiagBatteryChargerCableTestPlugin::NewL( TAny* aInitParams )
-    {
-    CDiagPluginConstructionParam* param = 
-            static_cast<CDiagPluginConstructionParam*>(aInitParams);
-
-    CleanupStack::PushL( param );
-    CDiagBatteryChargerCableTestPlugin* self = 
-            new( ELeave ) CDiagBatteryChargerCableTestPlugin (param);
-    CleanupStack::Pop( param );
-
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop(self);
-
-    return self;
-    }
-
-
-
-// ---------------------------------------------------------------------------
-// Symbian OS second phased constructor
-// ---------------------------------------------------------------------------
-void CDiagBatteryChargerCableTestPlugin::ConstructL()
-    {
-    BaseConstructL ( KDiagBatteryChargerCableTestPluginResourceFileName );
-    }
-
-
-// ----------------------------------------------------------------------------
-// Destructor
-// ----------------------------------------------------------------------------
-CDiagBatteryChargerCableTestPlugin::~CDiagBatteryChargerCableTestPlugin()
-    {
-    // StopAndCleanupL() called by base class, whcih calls
-    //  Cancel()    -> DoCancel()
-    //  DoStopAndCleanupL()
-    // Not much to do here.
-    }
-
-
-// ---------------------------------------------------------------------------
-// From class CDiagTestPluginBase.
-// Returns whether the plugin should be displayed or not.
-// ---------------------------------------------------------------------------
-
-TBool CDiagBatteryChargerCableTestPlugin::IsVisible() const
-    {
-    return ETrue;
-    }
-   
-
-// ---------------------------------------------------------------------------
-// From class CDiagTestPluginBase.
-// Returns the plugin's level of interactivity.
-// ---------------------------------------------------------------------------
-MDiagTestPlugin::TRunMode CDiagBatteryChargerCableTestPlugin::RunMode() const
-    {
-    return EInteractiveDialog;
-    }
-
-// ---------------------------------------------------------------------------
-// From class CDiagTestPluginBase.
-// Returns the total number of execution steps for the plugin.
-// ---------------------------------------------------------------------------
-TUint CDiagBatteryChargerCableTestPlugin::TotalSteps() const
-    {
-    return KTotalNumOfSteps;
-    }
-
-// ---------------------------------------------------------------------------
-// From MDiagPlugin
-// CDiagBatteryChargerCableTestPlugin::GetPluginNameL
-// ---------------------------------------------------------------------------
-HBufC* CDiagBatteryChargerCableTestPlugin::GetPluginNameL( 
-    TNameLayoutType aLayoutType ) const
-    {
-    switch ( aLayoutType )
-        {        
-        case ENameLayoutHeadingPane:
-            return StringLoader::LoadL( R_DIAG_BATTERY_CHARGER_CABLE_TEST_HEADING_PANE );
-
-        case ENameLayoutPopupInfoPane:
-            return StringLoader::LoadL( R_DIAG_BATTERY_CHARGER_CABLE_TEST_POPUP_INFO_PANE );
-
-        case ENameLayoutTitlePane:
-            return StringLoader::LoadL( R_DIAG_BATTERY_CHARGER_CABLE_TEST_TITLE_PANE );
-                                        
-        case ENameLayoutListSingleGraphic:
-            return StringLoader::LoadL( R_DIAG_BATTERY_CHARGER_CABLE_TEST_SINGLE_GRAPHIC  );        
-        
-        case ENameLayoutListSingle:
-            return StringLoader::LoadL ( R_DIAG_BATTERY_CHARGER_CABLE_TEST_SINGLE ); 
-			
-        default:
-            {
-            LOGSTRING2( "CDiagBatteryChargerCableTestPlugin::GetPluginNameL: "
-                L"ERROR: Unsupported layout type %d", aLayoutType )
-            __ASSERT_DEBUG( 0, User::Invariant() );
-            
-            return StringLoader::LoadL ( R_DIAG_BATTERY_CHARGER_CABLE_TEST_SINGLE );
-            }
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// From class CDiagTestPluginBase.
-// Returns the plugin's UID.
-// ---------------------------------------------------------------------------
-TUid CDiagBatteryChargerCableTestPlugin::Uid() const
-    {
-    return KDiagBatteryChargerCableTestPluginUid;
-    }
-    
-   
-// ---------------------------------------------------------------------------
-// From class CActive.
-// Active object run handler.
-// ---------------------------------------------------------------------------
-void CDiagBatteryChargerCableTestPlugin::RunL()
-    {
-    }
-
-// ---------------------------------------------------------------------------
-// From class CActive.
-// Active object cancel.
-// ---------------------------------------------------------------------------
-void CDiagBatteryChargerCableTestPlugin::DoCancel()
-    {
-    }
-
-// ---------------------------------------------------------------------------
-// From class CDiagTestPluginBase.
-// Called from the base class to begin test execution.
-// ---------------------------------------------------------------------------
-void CDiagBatteryChargerCableTestPlugin::DoRunTestL()
-    {
-    LOGSTRING( "CDiagBatteryChargerCableTestPlugin Test execution begins" )
-    
-    // Run Battery Charger Cable Test
-    ASSERT( iEngine == NULL );
-
-    iEngine = CDiagBatteryChargerCableTestEngine::NewL(*this, 
-                                                SinglePluginExecution() );
-                                                
-                                                
-        // ADO & Platformization Changes
-    TInt aButtonId;
-    
-    ShowMessageQueryL(R_DIAG_MESSAGEQUERY_TITLE_BATTERY_CHARGER,aButtonId);
-      
-    if(aButtonId == EBatteryTestConnectBatteryChargerCancel)
-    	{
-    	CompleteTestL( CDiagResultsDatabaseItem::ESkipped );
-        return;
-    	}
-    
-    if(aButtonId == EBatteryTestConnectBatteryChargerSkip)
-    	{
-		TInt confirmResult = 0;
-            
-        CAknDialog* dlg = ExecutionParam().Engine().
-        CreateCommonDialogLC( EDiagCommonDialogConfirmSkipAll, NULL );
-    
-        if ( !RunWaitingDialogL( dlg, confirmResult ) )
-            {
-            return;
-            }
-        
-        if (confirmResult)
-            {
-            return;
-            }
-    	}
-    // Changes Ends
-    iEngine->RunBatteryChargerTestL();
-    }
-
-// ---------------------------------------------------------------------------
-// From CDiagTestPluginBase
-// CDiagBatteryChargerCableTestPlugin::DoStopAndCleanupL()
-// ---------------------------------------------------------------------------
-void CDiagBatteryChargerCableTestPlugin::DoStopAndCleanupL()
-    {
-    delete iEngine;
-    iEngine = NULL;
-    }
-
-// ---------------------------------------------------------------------------
-// The engine class uses this interface to inform the plug-in class about the 
-// test result.
-// ---------------------------------------------------------------------------
-void CDiagBatteryChargerCableTestPlugin::ReportTestResultL(
-                                    CDiagResultsDatabaseItem::TResult aResult)
-    {
-    CompleteTestL( aResult );
-    }  
-    
-
-// ---------------------------------------------------------------------------
-// The engine class uses this callback on the plugin class to ask the user if 
-// the entire test execution needs to be cancelled.
-// ---------------------------------------------------------------------------
-TBool CDiagBatteryChargerCableTestPlugin::AskCancelExecutionL(TInt& aUserResponse)
-    {
-    CAknDialog* cancelDialog = ExecutionParam().Engine().
-             CreateCommonDialogLC( EDiagCommonDialogConfirmCancelAll, NULL );
-             
-    return RunWaitingDialogL( cancelDialog, aUserResponse );
-    }
-// ADO & Platformization Changes
-TBool CDiagBatteryChargerCableTestPlugin::ShowMessageQueryL( TInt aResourceId, TInt &aButtonId  )
-    {
-    LOGSTRING( "CDiagAudioPlugin::ShowMessageQueryL IN" )
-    CAknMessageQueryDialog* dlg    = NULL;
-    TBool                   result = EFalse;
-
-    // Create CAknMessageQueryDialog instance
-    dlg = new ( ELeave ) CAknMessageQueryDialog();
-
-    dlg->PrepareLC( aResourceId );
-     
-    CEikButtonGroupContainer& cba = dlg->ButtonGroupContainer();
-
-        switch ( aResourceId )
-            {
-            case R_DIAG_MESSAGEQUERY_TITLE_BATTERY_CHARGER: 
-         	   {
-            	if ( SinglePluginExecution() )
-        			{
-        			cba.SetCommandSetL( R_CBA_CONNECT_AND_PRESS_OK_SINGLE_EXECUTION );		
-        			}
-        	   else 
-        	   		{	
-                	cba.SetCommandSetL( R_CBA_CONNECT_AND_PRESS_OK_SKIP_GROUP_EXECUTION );		
-                	}
-        		}
-                break;
-
-            default:
-                break;
-            }
-        	
-    result = RunWaitingDialogL( dlg, aButtonId );
-
-    LOGSTRING3( "CDiagAudioPlugin::ShowMessageQueryL() OUT aButtonId=%d result=%d", aButtonId, result );
-    return result;
-    }
-// End of File
-
--- a/devicediagnostics/diagplugins/diagbatterychargerplugin/src/diagbatterychargerpluginimpltbl.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-/*
-* 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:  ECOM proxy table for DiagDataNetworkTestPlugin
-*
-*/
-
-
-// INCLUDES
-
-#include <e32std.h>
-#include <implementationproxy.h>
-
-#include "diagbatterychargercabletestplugin.hrh"    // UIDs
-#include "diagbatterychargercableplugin.h"          //CDiagBatteryChargerCableTestPlugin
-
-// CONSTANTS 
-const TImplementationProxy KDiagBatteryChargerCableTestPluginImplementationTable[] = 
-	{
-	IMPLEMENTATION_PROXY_ENTRY( _IMPLEMENTATION_UID,	CDiagBatteryChargerCableTestPlugin::NewL ),
-	};
-
-
-// ---------------------------------------------------------------------------
-// ImplementationGroupProxy
-// 
-// Gate/factory function
-// ---------------------------------------------------------------------------
-//
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy(TInt& aTableCount )
-	{
-	aTableCount = sizeof( KDiagBatteryChargerCableTestPluginImplementationTable ) 
-        / sizeof( TImplementationProxy );
-	return KDiagBatteryChargerCableTestPluginImplementationTable;
-	}
-
-
-
-// End of File
--- a/devicediagnostics/diagplugins/diagbrowserplugin/cenrep_files/clean_cenrep.bat	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-rem
-rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-rem All rights reserved.
-rem This component and the accompanying materials are made available
-rem under the terms of "Eclipse Public License v1.0"
-rem which accompanies this distribution, and is available
-rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
-rem
-rem Initial Contributors:
-rem Nokia Corporation - initial contribution.
-rem
-rem Contributors:
-rem
-rem Description:
-rem
-
-@rd /s /q output
--- a/devicediagnostics/diagplugins/diagbrowserplugin/cenrep_files/create_cenrep.bat	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-rem
-rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-rem All rights reserved.
-rem This component and the accompanying materials are made available
-rem under the terms of "Eclipse Public License v1.0"
-rem which accompanies this distribution, and is available
-rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
-rem
-rem Initial Contributors:
-rem Nokia Corporation - initial contribution.
-rem
-rem Contributors:
-rem
-rem Description:
-rem
-
-@echo off
-set CENREP_DIR=%CD%
-\epoc32\tools\cenrep\cenrep.pl -o "%CENREP_DIR%\output" -l "%CENREP_DIR%\keys_diagbrowserplugin.xls" -p 5.0
-copy "%CENREP_DIR%\output\inifiles\2000E59A.txt" \epoc32\RELEASE\winscw\udeb\Z\private\10202be9\
-copy "%CENREP_DIR%\output\inifiles\2000E59A.txt" \epoc32\RELEASE\winscw\urel\Z\private\10202be9\
-copy "%CENREP_DIR%\output\inifiles\2000E59A.txt" \epoc32\RELEASE\armv5\udeb\Z\private\10202be9\
-copy "%CENREP_DIR%\output\inifiles\2000E59A.txt" \epoc32\RELEASE\armv5\urel\Z\private\10202be9\
-copy "%CENREP_DIR%\output\inifiles\2000E59A.txt" \epoc32\data\Z\private\10202be9\
-echo.
Binary file devicediagnostics/diagplugins/diagbrowserplugin/cenrep_files/keys_diagbrowserplugin.xls has changed
Binary file devicediagnostics/diagplugins/diagbrowserplugin/conf/diagbrowserplugin.confml has changed
Binary file devicediagnostics/diagplugins/diagbrowserplugin/conf/diagbrowserplugin_2000E59A.crml has changed
--- a/devicediagnostics/diagplugins/diagbrowserplugin/data/devdiagbrowserplugin.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-/*
-* 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:  Resource definitions for project Browser Plugin.
-*
-*/
-
-
-// Include Files
-#include <registryinfo.rh>
-#include "diagbrowserplugin.hrh"
-
-RESOURCE REGISTRY_INFO pluginInfo
-    {
-    dll_uid     = _UID3;
-    interfaces  =
-        {
-        INTERFACE_INFO
-            {
-            interface_uid   = 0x2000AFEB;
-            implementations =
-                {
-                IMPLEMENTATION_INFO
-                    {
-                    implementation_uid  = _IMPLEMENTATION_UID;
-                    version_no          = 1;
-                    display_name        = "Browser";
-                    default_data        = "0x2000E56D"; //Services suite
-                    opaque_data         =   "<diagplugininfo>" 
-                                                "<order number=\"80\"/>"
-                                                "<serviceprovided name=\"Browser\"/>"
-                                                "<servicesrequired>"
-                                                    "<service name=\"Network Coverage\"/>"													
-                                                "</servicesrequired>"
-                                            "</diagplugininfo>";
-                    }
-                };
-            }
-        };
-    }
-
-// End of File
-
--- a/devicediagnostics/diagplugins/diagbrowserplugin/data/devdiagbrowserpluginrsc.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,217 +0,0 @@
-/*
-* 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:  Resource definitions for project Browser Test.
-*
-*/
-
-
-// Resource Name Identifier
-NAME DBTP
-
-// Include Files
-#include    <AvkonIcons.hrh> // ADO & Platformization Changes
-#include <eikon.rh>
-#include <avkon.rh>
-#include <avkon.loc> // ADO & Platformization Changes
-#include <avkon.mbg>
-#include <avkon.rsg>
-
-#include    <eikcore.rsg>
-#include    <eikon.rsg>
-
-#include    <data_caging_paths_strings.hrh> // changes ends
-#include <diagbrowserplugin.loc>
-
-#include "diagbrowserplugin.hrh"   // ADO & Platformization Changes
-
-// Resource Identifiers
-RESOURCE RSS_SIGNATURE { }
-RESOURCE TBUF { buf="DBTP"; }
-
-// ========================== RESOURCE DEFINITIONS ===========================
-
-// ---------------------------------------------------------------------------
-// r_diag_browser_heading_pane
-// The test's name in the header of the dialog that is shown when starting
-// test execution.
-// ---------------------------------------------------------------------------
-//
-RESOURCE TBUF r_diag_browser_heading_pane
-    {
-    buf = qtn_diag_msg_title_browser;
-    }
-
-// ---------------------------------------------------------------------------
-// r_diag_browser_popup_info_pane
-// ---------------------------------------------------------------------------
-//
-RESOURCE TBUF r_diag_browser_popup_info_pane
-    {
-    buf = qtn_diag_conf_test_failed_browser;
-    }
-
-// ---------------------------------------------------------------------------
-// r_diag_browser_title_pane
-// The title pane shown when the browser test is running.
-// ---------------------------------------------------------------------------
-//
-RESOURCE TBUF r_diag_browser_title_pane
-    {
-    buf = qtn_diag_title_test_browser;
-    }
-
-// ---------------------------------------------------------------------------
-// r_diag_browser_list_single_graphic
-// Test name in the suite view listbox.
-// ---------------------------------------------------------------------------
-//
-RESOURCE TBUF r_diag_browser_list_single_graphic
-    {
-    buf = qtn_diag_lst_test_browser;
-    }
-
-// ---------------------------------------------------------------------------
-// r_diag_browser_list_single
-// The test's name in the results view.
-// ---------------------------------------------------------------------------
-//
-RESOURCE TBUF r_diag_browser_list_single
-    {
-    buf = qtn_diag_lst_browser;
-    }
-    
-// ADO & Platformization Changes
-
-
-RESOURCE CBA r_cba_browser_single_execution
-{
-		buttons =
-		{
-			CBA_BUTTON
-			{
-					id = EAknSoftkeyOk;
-					txt = text_softkey_ok;
-			},
-			
-			
-			CBA_BUTTON
-			{
-					id = EBrowserTestCancel;
-					txt = text_softkey_cancel;
-			}
-			
-		};
-}
-
-
-RESOURCE CBA r_cba_browser_group_execution
-{
-		buttons =
-		{
-			CBA_BUTTON
-			{
-					id = EAknSoftkeyOk;
-					txt = text_softkey_ok;
-			},
-			
-			
-			CBA_BUTTON
-			{
-					id = EBrowserTestSkip;
-					txt = qtn_diag_softk_skip;
-			}
-			
-		};
-}
-
-
-RESOURCE DIALOG r_diag_messagequery_title_browsertest
-{
-		flags = EGeneralQueryFlags;
-		buttons = r_cba_browser_single_execution;
-		items =
-		{
-			DLG_LINE 
-			{
-					type = EAknCtPopupHeadingPane;
-					id = EAknMessageQueryHeaderId;
-					control = AVKON_HEADING
-                {
-                label = qtn_diag_msg_title_browser;
-                headinglayout = 0;
-                };
-			},
-			
-			DLG_LINE
-			{
-					type = EAknCtMessageQuery;
-					id = EAknMessageQueryContentId;
-					control = AVKON_MESSAGE_QUERY
-					{
-							message = qtn_diag_msg_info_browser;
-					};
-					
-			}
-		
-		};
-
-}
-//----------------------------------------------------
-//  r_browser_softkeys_stop__cancel
-//
-// Buttons shown during the test. Shown when the
-// test is run as a part of a suite.
-//----------------------------------------------------
-//
-RESOURCE CBA r_browser_softkeys_stop__cancel
-    {
-    buttons = 
-        {
-       CBA_BUTTON 
-	        { 
-            id  = EAknSoftkeyEmpty; 
-            txt = text_softkey_empty;
-	        },
-
-        CBA_BUTTON 
-	        { 
-            id  = EBrowserTestCancel;      // .hrh 
-            txt = text_softkey_cancel; // .rls or .loc
-	        } 
-
-	
-        };
-    }
-
-RESOURCE DIALOG r_browser_plugin_wait_note
-    {
-    flags = EAknWaitNoteFlags | EEikDialogFlagNotifyEsc;
-    buttons = r_browser_softkeys_stop__cancel;
-    items =
-        {
-        DLG_LINE
-            {
-            type = EAknCtNote;
-            id = EYBWaitNoteId;
-            control= AVKON_NOTE 
-                { 
-                layout = EWaitLayout;
-                singular_label = qtn_diag_msg_testing_browser;
-                animation = R_QGN_GRAF_WAIT_BAR_ANIM;
-                };
-            }
-        };
-    }
-	
-// End of File
--- a/devicediagnostics/diagplugins/diagbrowserplugin/group/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of diagnostics components
-*
-*/
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-../loc/diagbrowserplugin.loc        MW_LAYER_LOC_EXPORT_PATH(diagbrowserplugin.loc)
-../rom_files/devdiagbrowserplugin.iby		CORE_MW_LAYER_IBY_EXPORT_PATH(devdiagbrowserplugin.iby)
-../rom_files/devdiagbrowserplugin_resources.iby		LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(devdiagbrowserplugin_resources.iby)
-
-// Generic configuration interface for component cenrep settings  
-../conf/diagbrowserplugin.confml                    MW_LAYER_CONFML(diagbrowserplugin.confml)
-../conf/diagbrowserplugin_2000E59A.crml	        MW_LAYER_CRML(diagbrowserplugin_2000E59A.crml)
-PRJ_MMPFILES
-diagbrowserplugin.mmp
-
-PRJ_TESTMMPFILES
-// None
-
-PRJ_TESTEXPORTS
-// None
-
-//  End of File
-
--- a/devicediagnostics/diagplugins/diagbrowserplugin/group/diagbrowserplugin.mmp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,71 +0,0 @@
-/*
-* 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:  Project definition file for project Browser Test.
-*
-*/
-
-
-// Include Files
-#include <data_caging_paths.hrh>                    // RESOURCE_FILES_DIR
-#include <platform_paths.hrh>   // MW_LAYER_SYSTEMINCLUDE
-
-TARGET              devdiagbrowserplugin.dll
-TARGETTYPE          PLUGIN
-UID                 0x10009D8D 0x2000E59A
-
-CAPABILITY          CAP_ECOM_PLUGIN
-VENDORID            VID_DEFAULT
-
-SOURCEPATH          ../src
-SOURCE              diagbrowserpluginimplementationtable.cpp
-SOURCE              diagbrowserplugin.cpp
-SOURCE              diagbrowserpluginmodel.cpp
-
-START RESOURCE      ../data/devdiagbrowserplugin.rss
-TARGET              devdiagbrowserplugin.rsc
-TARGETPATH          ECOM_RESOURCE_DIR
-END
-
-START RESOURCE     ../data/devdiagbrowserpluginrsc.rss
-HEADER
-TARGETPATH          RESOURCE_FILES_DIR
-LANGUAGE_IDS
-END
-
-USERINCLUDE         .
-USERINCLUDE         ../inc
-USERINCLUDE         ../data
-USERINCLUDE         ../loc
-
-APP_LAYER_SYSTEMINCLUDE
-SYSTEMINCLUDE       /epoc32/include/ecom
-
-LIBRARY				avkon.lib   // ADO & Platformization Changes
-LIBRARY   			eikcoctl.lib // ADO & Platformization Changes
-LIBRARY   			eikdlg.lib // ADO & Platformization Changes
-LIBRARY             euser.lib
-LIBRARY             commonengine.lib
-LIBRARY             centralrepository.lib
-LIBRARY             cmmanager.lib
-LIBRARY             commdb.lib
-LIBRARY             inetprotutil.lib
-LIBRARY             bafl.lib
-LIBRARY             http.lib
-LIBRARY             esock.lib
-LIBRARY             flogger.lib
-LIBRARY             diagpluginbase.lib
-LIBRARY             diagframework.lib
-LIBRARY             logcli.lib
-
-// End of File
--- a/devicediagnostics/diagplugins/diagbrowserplugin/inc/diagbrowserplugin.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,153 +0,0 @@
-/*
-* 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:  This is the declaration of the Browser Test Plugin class.
-*
-*/
-
-
-#ifndef DIAGBROWSERPLUGIN_H
-#define DIAGBROWSERPLUGIN_H
-
-// System Include Files
-#include <DiagTestPluginBase.h>             // CDiagTestPluginBase
-
-// Local Include Files
-#include "diagbrowserpluginmodelobserver.h" // MDiagBrowserPluginModelObserver
-
-// Forward Declarations
-class CDiagBrowserPluginModel;
-
-/**
- *  Diagnostics Browser Test Plugin
- *  This class defines the browser test plugin.  This plugin is used to
- *  validate end-to-end browser (HTTP) functionality.
- *
- *  @lib diagpluginbase.lib
- *  @lib diagframework.lib
- *  @lib commonengine.lib
- */
-class CDiagBrowserPlugin : public CDiagTestPluginBase,
-                           public MDiagBrowserPluginModelObserver
-    {
-
-public: // New functions
-
-    /**
-    * Two-phased constructor.
-    *
-    * @return An instance of CDiagBrowserPlugin.
-    */
-    static MDiagPlugin* NewL( TAny* aInitParams );
-
-    /**
-    * Destructor.
-    */
-    ~CDiagBrowserPlugin();
-    
-    
-    // ADO & Platformization Changes
-    TBool ShowMessageQueryL( TInt aResourceId, TInt &aButtonId  );
-
-
-
-private: // New functions
-
-    /**
-    * The default constructor.
-    */
-    CDiagBrowserPlugin( CDiagPluginConstructionParam* aInitParams );
-
-    /**
-    * Two-phased constructor.
-    */
-    void ConstructL();
-
-
-private: // From base class CDiagTestPluginBase
-
-    /**
-    * @see CDiagTestPluginBase::Visible()
-    */
-    virtual TBool IsVisible() const;
-
-    /**
-    * @see CDiagTestPluginBase::RunMode()
-    */
-    virtual TRunMode RunMode() const;
-
-    /**
-    * @see CDiagTestPluginBase::TotalSteps()
-    */
-    virtual TUint TotalSteps() const;
-
-    /**
-    * @see CDiagTestPluginBase::GetPluginNameL
-    */
-    virtual HBufC* GetPluginNameL( TNameLayoutType aLayoutType ) const;
-
-    /**
-    * @see CDiagTestPluginBase::Uid
-    */
-    virtual TUid Uid() const;
-
-    /**
-    * @see CDiagTestPluginBase::DoRunTestL
-    */
-    virtual void DoRunTestL();
-
-    /**
-    * @see CDiagTestPluginBase::DoStopAndCleanupL
-    */
-    virtual void DoStopAndCleanupL();
-
-
-private: // From base class CActive
-
-    /**
-    * Handles active object completion events.
-    */
-    virtual void RunL();
-
-    /**
-    * Handle active object cancel event.
-    */
-    virtual void DoCancel();
-
-
-private: // From base class MDiagBrowserPluginModelObserver
-
-    /**
-    * This function notifies that test execution has completed.
-    *
-    * @param aResult The test result.
-    */
-    virtual void TestEndL( CDiagResultsDatabaseItem::TResult aResult );
-
-    /**
-    * This function notifies of test progress.
-    *
-    * @param aCurrentStep The current execution step.
-    */
-    void TestProgressL( TUint aCurrentStep );
-
-
-private: // Data
-
-    /** The plugin's model class, which contains the testing logic.  Own. */
-    CDiagBrowserPluginModel* iModel;
-
-    };
-
-#endif // DIAGBROWSERPLUGIN_H
-
--- a/devicediagnostics/diagplugins/diagbrowserplugin/inc/diagbrowserplugin.hrh	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-/*
-* 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:  Resource headers for the Browser Test Plugin
-*
-*/
-
-
-#ifndef DIAGBROWSERPLUGIN_HRH
-#define DIAGBROWSERPLUGIN_HRH
-
-// Definitions
-#define _UID3                   0x2000E59A
-#define _IMPLEMENTATION_UID     0x2000E59B
-
-// Data Types
-
-enum TMyMenuCmdIDs
-   {
-    EBrowserTestSkip = 1, // do not start from 0
-    EBrowserTestCancel,
-    EBrowserTestBack,
-    EBrowserTestNo,
-    EBrowserTestYes
-   };
-
- /** Dialog ids.  These are used in the application's resource file.
- */
-enum TBrowserNoteControlIds
-    {
-    EYBWaitNoteId = 0x100    
-    };
-    
-    
-#endif // DIAGBROWSERPLUGIN_HRH
-
--- a/devicediagnostics/diagplugins/diagbrowserplugin/inc/diagbrowserplugin.pan	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-/*
-* 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:  Panic functionality for the Browser Test Plugin.
-*
-*/
-
-
-#ifndef DIAGBROWSERPLUGIN_PAN
-#define DIAGBROWSERPLUGIN_PAN
-
-// Data Types
-
-/** Browser Test Plugin panic codes.  These are used to identify specific
- *  reasons why the plugin has panicked.
- */
-enum TDiagBrowserPluginPanics
-    {
-    EDiagBrowserPluginConstruction = 1,
-    EDiagBrowserPluginName,
-    EDiagBrowserPluginBadState,
-    EDiagBrowserPluginTransaction,
-    EDiagBrowserPluginInternal
-    };
-
-inline void Panic( TDiagBrowserPluginPanics aReason )
-    {
-    _LIT( KDiagBrowserPluginName,"Browser Test" );
-    User::Panic( KDiagBrowserPluginName, aReason );
-    }
-
-#endif // DIAGBROWSERPLUGIN_PAN
-
--- a/devicediagnostics/diagplugins/diagbrowserplugin/inc/diagbrowserpluginmodel.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,357 +0,0 @@
-/*
-* 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:  This is the declaration of the Browser Test Plugin Model.
-*
-*/
-
-
-#ifndef DIAGBROWSERPLUGINMODEL_H
-#define DIAGBROWSERPLUGINMODEL_H
-
-// System Include Files
-#include <e32base.h>                        // CActive
-#include <commdbconnpref.h>                 // TCommDbConnPref
-#include <es_sock.h>                        // RSocketServ, RConnection
-#include <http/rhttpsession.h>              // RHTTPSession
-#include <http/rhttptransaction.h>          // RHTTPTransaction
-#include <http/mhttptransactioncallback.h>  // MHTTPTransactionCallback
-#include <DiagResultsDatabaseItem.h>        // CDiagResultsDatabaseItem
-#include <diaglogeventeraserobserver.h>     // MDiagLogEventEraserObserver
-#include <AknWaitDialog.h> 
-// Forward Declarations
-class MDiagBrowserPluginModelObserver;
-class CPeriodic;
-class CDiagLogEventEraser;
-class RCmConnectionMethod;
-
-// Local Constants
-const TInt KMaxStringLength = ( 512 );
-
-/**
- *  Diagnostics Browser Test Plugin Model.
- *  This class defines the model for the browser test plugin.  This class is
- *  used to validate end-to-end browser (HTTP) functionality.
- *
- *  @lib euser.lib
- *  @lib commonengine.lib
- *  @lib centralrepository.lib
- *  @lib cmmanager.lib
- *  @lib commdb.lib
- *  @lib inetprotutil.lib
- *  @lib http.lib
- *  @lib esock.lib
- *  @lib flogger.lib
- *  @lib logcli.lib
- *  @lib diagframework.lib
- */
-class CDiagBrowserPluginModel : public CActive,
-                                public MHTTPTransactionCallback,
-                                public MDiagLogEventEraserObserver,
-                                public MProgressDialogCallback
-    {
-
-public: // New functions
-
-    /**
-    * Two-phased constructor.
-    *
-    * @param aObserver The model observer to report events to.
-    * @return An instance of CDiagBrowserPluginModel.
-    */
-    static CDiagBrowserPluginModel* NewL(
-        MDiagBrowserPluginModelObserver& aObserver );
-
-    /**
-    * Destructor.
-    */
-    ~CDiagBrowserPluginModel();
-
-    /**
-    * Initiates the browser test.
-    */
-    void RunBrowserTestL();
-
-    /**
-    * Returns the total number of execution steps.
-    *
-    * @return The total number of execution steps.
-    */
-    static TUint TotalSteps();
-
-
-private: // Data types
-
-    /**
-    * Enumerates the states in the browser test.  These are also used to
-    * report test progress information.
-    */
-    enum TDiagBrowserState
-        {
-        EDiagBrowserStateInitial = 0,
-        EDiagBrowserStateConnectingBearer,
-        EDiagBrowserStateConnectingServer,
-        EDiagBrowserStateErasingLog,
-        EDiagBrowserStateMax
-        };
-
-    /**
-    * Holds information about the connection methods used in the test.
-    */
-    struct TBrowserConnectionMethodData
-        {
-        /** The access point of this connection method. */
-        TBuf< KMaxStringLength > iApn;
-
-        /** The name of this connection method. */
-        TBuf< KMaxStringLength > iMethodName;
-
-        /** The access point id of this connection method. */
-        TUint iApId;
-
-        /** Indicates if this connection method contains valid data. */
-        TBool iIsValid;
-
-        /** Indicates if this connection method was attempted. */
-        TBool iUsed;
-        };
-
-
-private: // New functions
-
-    /**
-    * The default constructor.
-    */
-    CDiagBrowserPluginModel( MDiagBrowserPluginModelObserver& aObserver );
-
-    /**
-    * Two-phased constructor.
-    */
-    void ConstructL();
-
-    /**
-    * Reads and stores the browser test's Central Repository Keys.
-    *
-    * @return ETrue if the operation succeeded, EFalse otherwise.
-    */
-    TBool ReadCenRepKeysL();
-
-    /**
-    * Finds the connection method that corresponds to the data supplied in the
-    * argument.  Updates the argument object with the connection method data.
-    *
-    * @param aData The connection method data to search with and update.
-    */
-    void GetConnectionMethodL( TBrowserConnectionMethodData& aData );
-
-    /**
-    * Checks if the connection method matches the data supplied in the
-    * argument.  Updates the argument object with the connection method data.
-    *
-    * @param aMethod The connection method to compare with.
-    * @param aData The connection method data to search with and update.
-    */
-    void CheckConnectionMatchL( const RCmConnectionMethod& aMethod,
-                                TBrowserConnectionMethodData& aData ) const;
-
-    /**
-    * Starts or resets the connection timeout timer.
-    */
-    void StartConnectionTimerL();
-
-    /**
-    * Updates the plugin's state and reports progress to the observer.
-    *
-    * @param aTargetState The new state to transition to.
-    */
-    void SetStateL( TDiagBrowserState aTargetState );
-
-    /**
-    * Callback function for handling timer events.
-    *
-    * @param aPtr A pointer to the instance of the browser test model.
-    * @return An error code for the CPeriodic framework.
-    */
-    static TInt TimerExpired( TAny* aPtr );
-
-    /**
-    * Opens the network connection.  May be called multiple times if a retry
-    * is necessary.
-    *
-    * @return ETrue if the operation succeeded, EFalse otherwise.
-    */
-    TBool OpenAndStartConnectionL();
-
-    /**
-    * Handles ending the test by deleting the logs, if necessary, and
-    * informing the observer.
-    *
-    * @param aResult The test result to complete with.
-    */
-    void HandleTestEndL( CDiagResultsDatabaseItem::TResult aResult );
-
-    /**
-    * Retries the connection on the secondary access point, if available, or
-    * fails the test.
-    */
-    void RetryConnectionL();
-    
-    /**
-    *	Wait Dialog
-    *
-    */
-    void ShowProgressNoteL();
-    void TimerCleanUp();
-
-private: // from MProgressDialogCallback
-        
-    /**
-    * Called when the progress dialog is dismissed.
-    *
-    * @param aButtonId - indicate which button made dialog to dismiss
-    */
-    virtual void DialogDismissedL( TInt aButtonId );
-
-private: // From base class CActive
-
-    /**
-    * From CActive.
-    * Handles active object completion events.
-    */
-    virtual void RunL();
-
-    /**
-    * From CActive.
-    * Handles leaves in the active object's RunL function.
-    */
-    virtual TInt RunError( TInt aError );
-
-    /**
-    * From CActive.
-    * Handle active object cancel event.
-    */
-    virtual void DoCancel();
-
-
-private: // From base class MHTTPTransactionCallback
-
-    /**
-    * From MHTTPTransactionCallback.
-    * Called when an event occurs on an HTTP transaction.
-    *
-    * @param aTransaction The transaction the event occured on.
-    * @param aEvent The event that occurred.
-    */
-    virtual void MHFRunL( RHTTPTransaction aTransaction,
-                          const THTTPEvent& aEvent );
-
-    /**
-    * From MHTTPTransactionCallback.
-    * Called when an error occurs on an HTTP transaction.
-    *
-    * @param aError The error code.
-    * @param aTransaction The transaction the error occured on.
-    * @param aEvent The event that occurred.
-    * @return An error code indicating if this error was handled.
-    */
-    virtual TInt MHFRunError( TInt aError,
-                              RHTTPTransaction aTransaction,
-                              const THTTPEvent& aEvent );
-
-
-private: // From base class MDiagLogEventEraserObserver
-
-    /**
-    * This function is called to check if the log event needs to be deleted.
-    *
-    * @param aEvent The event to check.
-    * @return ETrue if the log event should be deleted, EFalse otherwise.
-    */
-    virtual TBool IsEventToBeDeleted( const CLogEvent& aEvent );
-    
-    /**
-    * This function is called to notify that the erase operation is complete.
-    *
-    * @param aError Error code to indicate erase failure, or KErrNone.
-    */           
-    virtual void CompleteEventEraseL( TInt aError );
-
-
-private: // Data
-
-    /** The socket server session used by the test. */
-    RSocketServ iSocketServ;
-
-    /** The network connection used by the test. */
-    RConnection iConnection;
-
-    /** The HTTP session used by the test. */
-    RHTTPSession iHttpSession;
-
-    /** The HTTP transaction used by the test. */
-    RHTTPTransaction iHttpTransaction;
-
-    /** The connection preferences, used to establish the data connection. */
-    TCommDbConnPref iConnectionPrefs;
-
-    /** The timeout timer.  Own. */
-    CPeriodic* iTimer;
-
-    /** The log eraser, used to remove the data usage from the OS log. Own. */
-    CDiagLogEventEraser* iLogEraser;
-
-    /** The state of the test. */
-    TDiagBrowserState iState;
-
-    /** The time testing started.  Used to filter logs for deletion. */
-    TTime iStartTime;
-
-    /** The primary connection method's data. */
-    TBrowserConnectionMethodData iPrimaryConnection;
-
-    /** The secondary connection method's data. */
-    TBrowserConnectionMethodData iSecondaryConnection;
-
-    /** The address of the proxy server to use (from CenRep). */
-    TBuf< KMaxStringLength > iProxyAddress;
-
-    /** The port of the proxy server to use (from CenRep). */
-    TInt iProxyPort;
-
-    /** The timeout value to use (from CenRep). */
-    TInt iTimeoutValue;
-
-    /** The web page to retrieve (from CenRep). */
-    TBuf< KMaxStringLength > iUri;
-
-    /** The test result to return. Used to hold the result while deleting logs
-    * asynchronously.
-    */
-    CDiagResultsDatabaseItem::TResult iResult;
-
-    /** The model's observer, where events are reported. */
-    MDiagBrowserPluginModelObserver& iObserver;
-    // Retrycount
-    TInt iRetryCount,iTimerCalled;
-    
-    /**
-    *
-    * Wait Dialog
-    *
-    */
-    
-    CAknWaitDialog*      iWaitDialog;
-    TBool idialogOn,idialogDismissed;
-    };
-
-#endif // DIAGBROWSERPLUGINMODEL_H
--- a/devicediagnostics/diagplugins/diagbrowserplugin/inc/diagbrowserpluginmodelobserver.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-/*
-* 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:  This is the header for the Browser Test Model Observer
-*                 class, which the Browser Test plugin implements to receive
-*                 events from the model.
-*
-*/
-
-
-#ifndef DIAGBROWSERPLUGINMODELOBSERVER_H
-#define DIAGBROWSERPLUGINMODELOBSERVER_H
-
-// System Include Files
-#include <DiagResultsDatabaseItem.h>    // CDiagResultsDatabaseItem
-
-/**
-*  Browser Test Model Observer
-*   
-*   This is a pure virtual class that the Browser Test Plugin must implement
-*   to receive callbacks from the model class.
-*/
-class MDiagBrowserPluginModelObserver
-    {
-public:
-
-    /**
-    * This function notifies that test execution has completed.
-    *
-    * @param aResult The test result.
-    */
-    virtual void TestEndL( CDiagResultsDatabaseItem::TResult aResult ) = 0;
-
-    /**
-    * This function notifies of test progress.
-    *
-    * @param aCurrentStep The current execution step.
-    */
-    virtual void TestProgressL( TUint aCurrentStep ) = 0;
-
-    };
-
-#endif // DIAGBROWSERPLUGINMODELOBSERVER_H
--- a/devicediagnostics/diagplugins/diagbrowserplugin/inc/diagbrowserpluginprivatecrkeys.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,89 +0,0 @@
-/*
-* 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:  Private Central Repository keys.
-*
-*/
-
-
-#ifndef DIAGBROWSERPLUGINPRIVATECRKEYS_H
-#define DIAGBROWSERPLUGINPRIVATECRKEYS_H
-
-//  INCLUDES
-#include <e32std.h>
-
-// ===========================================================================
-// Browser Test Plugin
-// ===========================================================================
-
-const TUid KCRUidDiagBrowserTestPlugin = { 0x2000E59A };
-
-/**
- *
- * The value assigned to this key is the name of the preferred (primary)
- * access point to use for the test.
- *
- * Available options:   
-*/
-const TUint32 KDiagBrowserApnPrimary = 0x00000001;
-
-/**
- *
- * The value assigned to this key is the name of the fallback (secondary)
- * access point to use for the test.
- *
- * Available options:   
-*/
-const TUint32 KDiagBrowserApnSecondary = 0x00000002;
-
-/**
- *
- * The value assigned to this key is the address of the web page to retrieve
- * for the test.
- *
- * Available options:   
- * Default value: http://www.wireless.att.com/phone-inspector/index.html
-*/
-const TUint32 KDiagBrowserUri = 0x00000003;
-
-/**
- *
- * The value assigned to this key is the timeout value (in milliseconds) to
- * wait for the connection to the access point, and to wait for the page to be
- * retrieved.
- *
- * Available options:   
- * Default value: 30000
-*/
-const TUint32 KDiagBrowserResponseTimeout = 0x00000004;
-
-/**
- *
- * The value assigned to this key is the address of the proxy server to use
- * for the test.
- *
- * Available options:   
-*/
-const TUint32 KDiagBrowserProxyAddress = 0x00000005;
-
-/**
- *
- * The value assigned to this key is the port of the proxy server to use for
- * the test.
- *
- * Available options:   
- * Default value: 80
-*/
-const TUint32 KDiagBrowserProxyPort = 0x00000006;
-
-#endif // DIAGBROWSERPLUGINPRIVATECRKEYS_H
--- a/devicediagnostics/diagplugins/diagbrowserplugin/loc/diagbrowserplugin.loc	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +0,0 @@
-/*
-* 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:  Localization strings for project Browser Test Plugin
-*
-*/
-
-
-// d:Test name in the header of the dialog that is shown when starting test
-// d:execution.
-// l:heading_pane_t1
-// r:3.2.1
-//
-#define qtn_diag_msg_title_browser "Browser test"
-
-// d:The body text of the dialog that is shown when starting test execution.
-// d:This provides information about running the test to the user.
-// l:popup_info_list_pane_t1
-// r:3.2.1
-//
-#define qtn_diag_msg_info_browser "The following test will check browser."
-
-// d:The title pane shown when the browser test is running.
-// l:title_pane_t2/opt12
-// r:3.2.1
-//
-//#define qtn_diag_title_test_browser "Browser test" // LVT Change
-
-// d:Test name in the suite view listbox.  This text indicates that the test
-// d:will be run.
-// l:list_single_graphic_pane_t1
-// r:3.2.1
-//
-//#define qtn_diag_lst_test_browser "Browser test"  // LVT Change
-
-// d:Test name in the results view listbox.
-// l:list_single_graphic_heading_pane_t1_cp2
-// r:3.2.1
-//
-#define qtn_diag_lst_browser "Browser test"
-
-//d:Failed result text
-//l:popup_info_list_pane_t1
-//r:5.0
-//
-#define qtn_diag_conf_test_failed_browser "Browser test"
-
-//d:Message text for browser
-//l:popup_note_wait_window
-//r:3.2
-//
-#define qtn_diag_msg_testing_browser "Testing browser"
-
-#define qtn_diag_softk_skip "Skip"
-
-// End of File
--- a/devicediagnostics/diagplugins/diagbrowserplugin/rom_files/devdiagbrowserplugin.iby	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-/*
-* 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:  Image description file for project Browser Test Plugin
-*
-*/
-
-
-#ifndef DEVDIAGBROWSERPLUGIN_IBY
-#define DEVDIAGBROWSERPLUGIN_IBY
-
-#ifdef FF_DEVICE_DIAGNOSTICS_APP 
-
-#include <data_caging_paths_for_iby.hrh>
-
-ECOM_PLUGIN( devdiagbrowserplugin.dll, devdiagbrowserplugin.rsc )
-
-#endif
-
-#endif // DEVDIAGBROWSERPLUGIN_IBY
-
--- a/devicediagnostics/diagplugins/diagbrowserplugin/rom_files/devdiagbrowserplugin_resources.iby	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-/*
-* 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:  Image description file for resources of project 
-*                Browser Test Plugin
-*
-*/
-
-
-#ifndef DEVDIAGBROWSERPLUGIN_RESOURCES_IBY
-#define DEVDIAGBROWSERPLUGIN_RESOURCES_IBY
-
-#ifdef FF_DEVICE_DIAGNOSTICS_APP 
-
-#include <data_caging_paths_for_iby.hrh>
-
-data=DATAZ_\RESOURCE_FILES_DIR\devdiagbrowserpluginrsc.rsc RESOURCE_FILES_DIR\devdiagbrowserpluginrsc.rsc
-
-#endif
-
-#endif // DEVDIAGBROWSERPLUGIN_RESOURCES_IBY
-
--- a/devicediagnostics/diagplugins/diagbrowserplugin/src/diagbrowserplugin.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,314 +0,0 @@
-/*
-* 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:  This is the implementation of the Browser Test Plugin, which
-*                tests HTTP functionality.
-*
-*/
-
-
-// System Include Files
-#include <StringLoader.h>                   // StringLoader
-#include <DiagFrameworkDebug.h>             // Debugging Macros
-#include <devdiagbrowserpluginrsc.rsg>         // Resource Definitions
-
-// User Include Files
-#include "diagbrowserplugin.h"              // CDiagBrowserPlugin
-#include "diagbrowserpluginmodel.h"         // CDiagBrowserPluginModel
-#include "diagbrowserplugin.hrh"            // UID definition
-#include "diagbrowserplugin.pan"            // Panic
-
-#include <AknDialog.h> // ADO & Platformization Changes
-#include <aknmessagequerydialog.h>  // ADO & Platformization Changes
-#include <DiagCommonDialog.h>          // for EDiagCommonDialogConfirmCancelAll
-
-// ADO & Platformization Changes
-#include <DiagFrameworkDebug.h>                     // debug macros
-#include <DiagTestExecParam.h>                      // TDiagTestExecParam
-#include <DiagEngineCommon.h>                       // MDiagEngineCommon
-
-// Local Constants
-_LIT( KDiagBrowserPluginResourceFileName, "z:devdiagbrowserpluginrsc.rsc" );
-const TUid KDiagBrowserPluginUid = { _IMPLEMENTATION_UID };
-
-
-// ============================ GLOBAL FUNCTIONS =============================
-
-// ---------------------------------------------------------------------------
-// Static two-phase constructor.
-// ---------------------------------------------------------------------------
-//
-MDiagPlugin* CDiagBrowserPlugin::NewL( TAny* aInitParams )
-    {
-    LOGSTRING2( "CDiagBrowserPlugin::NewL( 0x%x )", aInitParams )
-
-    __ASSERT_ALWAYS( aInitParams,
-                     Panic( EDiagBrowserPluginConstruction ) );
-
-    // Construct the plugin.  The base class will take ownership of the
-    // initialization parameters.
-    CDiagPluginConstructionParam* param =
-            static_cast< CDiagPluginConstructionParam* >( aInitParams );
-
-    CleanupStack::PushL( param );
-    CDiagBrowserPlugin* self = new( ELeave ) CDiagBrowserPlugin( param );
-    CleanupStack::Pop( param );
-
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );
-
-    return self;
-    }
-
-// ---------------------------------------------------------------------------
-// Destructor.
-// ---------------------------------------------------------------------------
-//
-CDiagBrowserPlugin::~CDiagBrowserPlugin()
-    {
-    LOGSTRING( "CDiagBrowserPlugin::~CDiagBrowserPlugin()" )
-    delete iModel;
-    }
-
-// ---------------------------------------------------------------------------
-// The default constructor.
-// ---------------------------------------------------------------------------
-//
-CDiagBrowserPlugin::CDiagBrowserPlugin( CDiagPluginConstructionParam* aParam )
-:   CDiagTestPluginBase( aParam )
-    {
-    LOGSTRING2( "CDiagBrowserPlugin::CDiagBrowserPlugin( 0x%x )", aParam )
-
-    }
-
-// ---------------------------------------------------------------------------
-// The second phase constructor.
-// ---------------------------------------------------------------------------
-//
-void CDiagBrowserPlugin::ConstructL()
-    {
-    LOGSTRING( "CDiagBrowserPlugin::ConstructL()" )
-    BaseConstructL( KDiagBrowserPluginResourceFileName );
-    }
-
-// ---------------------------------------------------------------------------
-// From class CDiagTestPluginBase.
-// Returns whether the plugin should be displayed or not.
-// ---------------------------------------------------------------------------
-TBool CDiagBrowserPlugin::IsVisible() const
-    {
-    LOGSTRING( "CDiagBrowserPlugin::IsVisible()" )
-    return ETrue;
-    }
-
-// ---------------------------------------------------------------------------
-// From class CDiagTestPluginBase.
-// Returns the plugin's level of interactivity.
-// ---------------------------------------------------------------------------
-MDiagTestPlugin::TRunMode CDiagBrowserPlugin::RunMode() const
-    {
-    LOGSTRING( "CDiagBrowserPlugin::RunMode()" )
-    return EAutomatic;
-    }
-
-// ---------------------------------------------------------------------------
-// From class CDiagTestPluginBase.
-// Returns the total number of execution steps for the plugin.
-// ---------------------------------------------------------------------------
-TUint CDiagBrowserPlugin::TotalSteps() const
-    {
-    LOGSTRING( "CDiagBrowserPlugin::TotalSteps()" )
-    return CDiagBrowserPluginModel::TotalSteps();
-    }
-
-// ---------------------------------------------------------------------------
-// From class CDiagTestPluginBase.
-// Returns the plugin name.
-// ---------------------------------------------------------------------------
-HBufC* CDiagBrowserPlugin::GetPluginNameL( TNameLayoutType aLayoutType ) const
-    {
-    LOGSTRING2( "CDiagBrowserPlugin::GetPluginNameL( %d )", aLayoutType )
-
-    switch ( aLayoutType )
-        {
-        case ENameLayoutHeadingPane:
-            return StringLoader::LoadL( R_DIAG_BROWSER_HEADING_PANE );
-
-        case ENameLayoutPopupInfoPane:
-            return StringLoader::LoadL( R_DIAG_BROWSER_POPUP_INFO_PANE );
-
-        case ENameLayoutTitlePane:
-            return StringLoader::LoadL( R_DIAG_BROWSER_TITLE_PANE );
-
-        case ENameLayoutListSingleGraphic:
-            return StringLoader::LoadL( R_DIAG_BROWSER_LIST_SINGLE_GRAPHIC );
-
-        case ENameLayoutListSingle:
-            return StringLoader::LoadL( R_DIAG_BROWSER_LIST_SINGLE );
-
-        default:
-            __ASSERT_DEBUG( EFalse, Panic( EDiagBrowserPluginName ) );
-            return StringLoader::LoadL( R_DIAG_BROWSER_LIST_SINGLE );
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// From class CDiagTestPluginBase.
-// Returns the plugin's UID.
-// ---------------------------------------------------------------------------
-TUid CDiagBrowserPlugin::Uid() const
-    {
-    LOGSTRING( "CDiagBrowserPlugin::Uid()" )
-    return KDiagBrowserPluginUid;
-    }
-
-// ---------------------------------------------------------------------------
-// From class CDiagTestPluginBase.
-// Called from the base class to begin test execution.
-// ---------------------------------------------------------------------------
-void CDiagBrowserPlugin::DoRunTestL()
-    {
-    LOGSTRING( "CDiagBrowserPlugin::DoRunTestL()" )
-
-    __ASSERT_ALWAYS( !iModel, Panic( EDiagBrowserPluginBadState ) );
-   // ADO & Platformization Changes
-    TInt aButtonId;
-    
-    ShowMessageQueryL(R_DIAG_MESSAGEQUERY_TITLE_BROWSERTEST,aButtonId);
-      
-    if(aButtonId == EBrowserTestCancel)
-    	{
-    	CompleteTestL( CDiagResultsDatabaseItem::ESkipped );
-        return;
-    	}
-    
-    if(aButtonId == EBrowserTestSkip)
-    	{
-		TInt confirmResult = 0;
-            
-        CAknDialog* dlg = ExecutionParam().Engine().
-        CreateCommonDialogLC( EDiagCommonDialogConfirmSkipAll, NULL );
-    
-        if ( !RunWaitingDialogL( dlg, confirmResult ) )
-            {
-            return;
-            }
-        
-        if (confirmResult)
-            {
-            return;
-            }
-    	}
-    // Changes Ends
-
-    iModel = CDiagBrowserPluginModel::NewL( *this );
-    iModel->RunBrowserTestL();
-    }
-
-// ---------------------------------------------------------------------------
-// From class CDiagTestPluginBase.
-// Called when the plugin's execution is stopped.
-// ---------------------------------------------------------------------------
-//
-void CDiagBrowserPlugin::DoStopAndCleanupL()
-    {
-    LOGSTRING( "CDiagBrowserPlugin::DoStopAndCleanupL()" )
-
-    delete iModel;
-    iModel = NULL;
-    }
-
-// ---------------------------------------------------------------------------
-// From class CActive.
-// Active object run handler.
-// ---------------------------------------------------------------------------
-void CDiagBrowserPlugin::RunL()
-    {
-    LOGSTRING( "CDiagBrowserPlugin::RunL()" )
-
-    }
-
-// ---------------------------------------------------------------------------
-// From class CActive.
-// Active object cancel.
-// ---------------------------------------------------------------------------
-void CDiagBrowserPlugin::DoCancel()
-    {
-    LOGSTRING( "CDiagBrowserPlugin::DoCancel()" )
-
-    }
-
-// ---------------------------------------------------------------------------
-// From class MDiagBrowserPluginModelObserver.
-// This function notifies that test execution has completed.
-// ---------------------------------------------------------------------------
-void CDiagBrowserPlugin::TestEndL( CDiagResultsDatabaseItem::TResult aResult )
-    {
-    LOGSTRING2( "CDiagBrowserPlugin::TestEndL( %d )", aResult )
-    CompleteTestL( aResult );
-
-    delete iModel;
-    iModel = NULL;
-    }
-
-// ---------------------------------------------------------------------------
-// From class MDiagBrowserPluginModelObserver.
-// This function notifies of test progress.
-// ---------------------------------------------------------------------------
-void CDiagBrowserPlugin::TestProgressL( TUint aCurrentStep )
-    {
-    LOGSTRING2( "CDiagBrowserPlugin::TestProgressL( %d )", aCurrentStep )
-    ReportTestProgressL( aCurrentStep );
-    }
-    
-    // ADO & Platformization Changes
-TBool CDiagBrowserPlugin::ShowMessageQueryL( TInt aResourceId, TInt &aButtonId  )
-    {
-    LOGSTRING( "CDiagAudioPlugin::ShowMessageQueryL IN" )
-    CAknMessageQueryDialog* dlg    = NULL;
-    TBool                   result = EFalse;
-
-    // Create CAknMessageQueryDialog instance
-    dlg = new ( ELeave ) CAknMessageQueryDialog();
-
-    dlg->PrepareLC( aResourceId );
-     
-    CEikButtonGroupContainer& cba = dlg->ButtonGroupContainer();
-
-        switch ( aResourceId )
-            {
-            case R_DIAG_MESSAGEQUERY_TITLE_BROWSERTEST: 
-         	   {
-            	if ( SinglePluginExecution() )
-        			{
-        			cba.SetCommandSetL( R_CBA_BROWSER_SINGLE_EXECUTION );		
-        			}
-        	   else 
-        	   		{	
-                	cba.SetCommandSetL( R_CBA_BROWSER_GROUP_EXECUTION );		
-                	}
-        		}
-                break;
-
-            default:
-                break;
-            }
-        	
-    result = RunWaitingDialogL( dlg, aButtonId );
-
-    LOGSTRING3( "CDiagAudioPlugin::ShowMessageQueryL() OUT aButtonId=%d result=%d", aButtonId, result );
-    return result;
-    }
-
-// End of File
--- a/devicediagnostics/diagplugins/diagbrowserplugin/src/diagbrowserpluginimplementationtable.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-/*
-* 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:  This is the ECOM implementation table for the Browser Test
-*                Plugin.
-*
-*/
-
-
-// System Include Files
-#include <implementationproxy.h>            // TImplementationProxy
-
-// User Include Files
-#include "diagbrowserplugin.h"              // CDiagBrowserPlugin
-#include "diagbrowserplugin.hrh"            // UID Defintions
-
-// Local Constants
-const TImplementationProxy KDiagBrowserPluginImplementationTable[] =
-	{
-	IMPLEMENTATION_PROXY_ENTRY( _IMPLEMENTATION_UID,
-	                            CDiagBrowserPlugin::NewL )
-	};
-
-
-// ============================ GLOBAL FUNCTIONS =============================
-
-// ---------------------------------------------------------------------------
-// Returns the implementation table.
-// ---------------------------------------------------------------------------
-//
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy(
-    TInt& aTableCount )
-	{
-	aTableCount = sizeof( KDiagBrowserPluginImplementationTable ) /
-	    sizeof( TImplementationProxy );
-	return KDiagBrowserPluginImplementationTable;
-	}
-
-// End of File
-
--- a/devicediagnostics/diagplugins/diagbrowserplugin/src/diagbrowserpluginmodel.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,846 +0,0 @@
-/*
-* 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:  This is the model class for the Browser Test Plugin, which
-*                tests HTTP functionality.
-*
-*/
-
-
-// System Include Files
-#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
-#include <logfilterandeventconstants.hrh>
-#endif
-#include <centralrepository.h>              // CRepository
-#include <cmmanager.h>                      // RCmManager
-#include <cmdestination.h>                  // RCmDestination
-#include <cmconnectionmethod.h>             // RCmConnectionMethod
-#include <cmpluginpacketdatadef.h>          // Connection Manager Defs
-#include <cmconnectionmethoddef.h>          // Connection Manager Defs
-#include <es_sock.h>                        // RSocketServ, RConnection
-#include <stringpool.h>                     // RStringPool
-#include <httpstringconstants.h>            // HTTP Strings
-#include <http/rhttpconnectioninfo.h>       // RHTTPConnectionInfo
-#include <http/rhttpsession.h>              // RHTTPSession
-#include <http/rhttptransaction.h>          // RHTTPTransaction
-#include <http/thttpevent.h>                // THTTPEvent
-#include <uri8.h>                           // TUriParser8
-#include <logwrap.h>                        // CLogEvent
-#include <logcli.h>                         // CLogFilter
-#include <DiagResultsDatabaseItem.h>        // CDiagResultsDatabaseItem
-#include <DiagFrameworkDebug.h>             // Debugging Macros
-#include <diaglogeventeraser.h>             // CDiagLogEventEraser
-#include <commdb.h>
-// User Include Files
-#include "diagbrowserpluginmodel.h"         // CDiagBrowserPluginModel
-#include "diagbrowserpluginmodelobserver.h" // CDiagBrowserPluginModelObserver
-#include "diagbrowserpluginprivatecrkeys.h" // CenRep keys
-#include "diagbrowserplugin.pan"            // Panic
-#include "diagbrowserplugin.hrh"
-
-#include <devdiagbrowserpluginrsc.rsg>  
-// Local Constants
-const TInt KConnArrayGranularity =          ( 3 );
-const TInt KMicroSecondsInMilliseconds =    ( 1000 );
-const TInt KHttpResponseCodeOk =            ( 200 );
-#ifdef __WINS__
-const TInt KEmulatorDynamicIpApId =         ( 11 );
-#endif // __WINS__
-
-
-// ============================ GLOBAL FUNCTIONS =============================
-
-// ---------------------------------------------------------------------------
-// Static two-phase constructor.
-// ---------------------------------------------------------------------------
-//
-CDiagBrowserPluginModel* CDiagBrowserPluginModel::NewL(
-    MDiagBrowserPluginModelObserver& aObserver )
-    {
-    LOGSTRING( "CDiagBrowserPluginModel::NewL()" )
-
-    CDiagBrowserPluginModel* self = new( ELeave ) CDiagBrowserPluginModel(
-        aObserver );
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// ---------------------------------------------------------------------------
-// Destructor.
-// ---------------------------------------------------------------------------
-//
-CDiagBrowserPluginModel::~CDiagBrowserPluginModel()
-    {
-    LOGSTRING( "CDiagBrowserPluginModel::~CDiagBrowserPluginModel()" )
-
-    // Stop any outstanding requests.
-    Cancel();
-
-    // Free memory reserved by the model.
-    delete iTimer;
-    delete iLogEraser;
-	delete iWaitDialog;
-    // Close any open sessions.
-    iHttpTransaction.Close();
-    iHttpSession.Close();
-    iConnection.Close();
-    iSocketServ.Close();
-    }
-
-// ---------------------------------------------------------------------------
-// Initiates the browser test.
-// ---------------------------------------------------------------------------
-//
-void CDiagBrowserPluginModel::RunBrowserTestL()
-    {
-    LOGSTRING( "CDiagBrowserPluginModel::RunBrowserTestL()" )
-
-    // Mark the start time for removing the logs.
-    iStartTime.UniversalTime();
-    iRetryCount = 0;
-    iTimerCalled = 0;
-    // Read Central Repository keys.
-    if ( !ReadCenRepKeysL() )
-        {
-        HandleTestEndL( CDiagResultsDatabaseItem::EFailed );
-        return;
-        }
-
-    /* Read APN data.
-    GetConnectionMethodL( iPrimaryConnection );
-    GetConnectionMethodL( iSecondaryConnection );*/
-    //iTimeoutValue = 30000;
-    // Open the connection.
-    if ( !OpenAndStartConnectionL() )
-        {
-        HandleTestEndL( CDiagResultsDatabaseItem::EFailed );
-        return;
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// Returns the total number of execution steps.
-// ---------------------------------------------------------------------------
-TUint CDiagBrowserPluginModel::TotalSteps()
-    {
-    LOGSTRING( "CDiagBrowserPluginModel::TotalSteps()" )
-    return EDiagBrowserStateMax;
-    }
-
-// ---------------------------------------------------------------------------
-// The default constructor.
-// ---------------------------------------------------------------------------
-//
-CDiagBrowserPluginModel::CDiagBrowserPluginModel(
-    MDiagBrowserPluginModelObserver& aObserver )
-:   CActive( EPriorityStandard ),
-    iObserver( aObserver )
-    {
-    LOGSTRING( "CDiagBrowserPluginModel::CDiagBrowserPluginModel()" )
-    CActiveScheduler::Add( this );
-    }
-
-// ---------------------------------------------------------------------------
-// The second phase constructor.
-// ---------------------------------------------------------------------------
-//
-void CDiagBrowserPluginModel::ConstructL()
-    {
-    LOGSTRING( "CDiagBrowserPluginModel::ConstructL()" )
-
-    // Open the connection to the Socket Server.
-    User::LeaveIfError( iSocketServ.Connect() );
-    User::LeaveIfError( iConnection.Open( iSocketServ ) );
-    idialogOn = EFalse; idialogDismissed = EFalse;
-    }
-
-// ---------------------------------------------------------------------------
-// Reads and stores the browser test's Central Repository Keys.
-// ---------------------------------------------------------------------------
-//
-TBool CDiagBrowserPluginModel::ReadCenRepKeysL()
-    {
-    LOGSTRING( "CDiagBrowserPluginModel::ReadCenRepKeysL()" )
-
-    // Create a Central Repository object.
-    CRepository* repository = CRepository::NewLC(
-        KCRUidDiagBrowserTestPlugin );
-
-    // Get the data.
-   /* if ( repository->Get( KDiagBrowserApnPrimary,
-                          iPrimaryConnection.iApn ) != KErrNone ||
-         repository->Get( KDiagBrowserApnSecondary,
-                          iSecondaryConnection.iApn ) != KErrNone ||
-         repository->Get( KDiagBrowserProxyAddress,
-                          iProxyAddress ) != KErrNone ||
-         repository->Get( KDiagBrowserProxyPort,
-                          iProxyPort ) != KErrNone ||*/
-         if( repository->Get( KDiagBrowserResponseTimeout,
-                          iTimeoutValue ) != KErrNone ||
-        repository->Get( KDiagBrowserUri,
-                          iUri ) != KErrNone )
-        {
-        LOGSTRING( "CDiagBrowserPluginModel::ReadCenRepKeysL() - CenRep read"
-                   L" failed." )
-
-        CleanupStack::PopAndDestroy( repository );
-        return EFalse;
-        }
-
-   /* LOGSTRING3(
-        "CDiagBrowserPluginModel::ReadCenRepKeysL() - Primary APN '%S'"
-        L" Secondary APN '%S'",
-        &iPrimaryConnection.iApn,
-        &iSecondaryConnection.iApn )
-
-    LOGSTRING3(
-        "CDiagBrowserPluginModel::ReadCenRepKeysL() - Proxy '%S:%d'",
-        &iProxyAddress,
-        iProxyPort )*/
-
-    LOGSTRING3(
-        "CDiagBrowserPluginModel::ReadCenRepKeysL() - Timeout %d, Uri '%S'",
-        iTimeoutValue,
-        &iUri )
-
-    CleanupStack::PopAndDestroy( repository );
-    return ETrue;
-    }
-
-// ---------------------------------------------------------------------------
-// Finds the connection method that corresponds to the data supplied in the
-// argument.
-// ---------------------------------------------------------------------------
-//
-void CDiagBrowserPluginModel::GetConnectionMethodL(
-    TBrowserConnectionMethodData& aData )
-    {
-    LOGSTRING( "CDiagBrowserPluginModel::GetConnectionMethodL()" )
-
-    // Look for matching connection methods.
-    RCmManager connManager;
-    connManager.OpenLC();
-
-    // Get a list of all the destinations.
-    RArray< TUint32 > connArray = RArray< TUint32 >( KConnArrayGranularity );
-    CleanupClosePushL( connArray );
-    connManager.AllDestinationsL( connArray );
-    
-    // Look through all the destinations' connection methods and see if any of
-    // them match the CenRep data.
-    for ( TInt i = 0; i < connArray.Count() && !aData.iIsValid ; i++ )
-        {
-        RCmDestination destination = connManager.DestinationL(
-            connArray[ i ] );
-        CleanupClosePushL( destination );
-
-        LOGSTRING4( "CDiagBrowserPluginModel::GetConnectionMethodL() -"
-                    L" Destination %d / %d, %d method(s)",
-                    i + 1,
-                    connArray.Count(),
-                    destination.ConnectionMethodCount() )
-
-        // Don't use any hidden destinations, because they are not visible to
-        // the user.
-        if ( destination.IsHidden() )
-            {
-            LOGSTRING( "CDiagBrowserPluginModel::GetConnectionMethodL() -"
-                       L" Skipping hidden destination" )
-            CleanupStack::PopAndDestroy(); // destination
-            continue;
-            }
-        for ( TInt j = 0;
-              j < destination.ConnectionMethodCount() && !aData.iIsValid;
-              j++ )
-            {
-            RCmConnectionMethod method = destination.ConnectionMethodL( j );
-            CleanupClosePushL( method );
-            
-            // This call is trapped because not all connection methods support
-            // the data we're querying, and the leave should not be propagated
-            // up because that would not be a reason for test failure.
-            TRAP_IGNORE( CheckConnectionMatchL( method, aData ) )
-            CleanupStack::PopAndDestroy(); // method
-            }
-
-        CleanupStack::PopAndDestroy(); // destination
-        }
-
-    // Get a list of all the uncategorized connection methods.
-    connArray.Reset();
-    connManager.ConnectionMethodL( connArray );
-    LOGSTRING2( "CDiagBrowserPluginModel::GetConnectionMethodL() -"
-                L" Checking %d uncategorized method(s)",
-                connArray.Count() )
-
-    // Look through all the uncategorized connection methods and see if any
-    // of them match match the CenRep data.
-    for ( TInt i = 0; i < connArray.Count() && !aData.iIsValid; i++ )
-        {
-        RCmConnectionMethod method = connManager.ConnectionMethodL(
-            connArray[ i ] );
-        CleanupClosePushL( method );
-
-        // This call is trapped because not all connection methods support
-        // the data we're querying, and the leave should not be propagated
-        // up because that would not be a reason for test failure.
-        TRAP_IGNORE( CheckConnectionMatchL( method, aData ) )
-        CleanupStack::PopAndDestroy(); // method
-        }
-
-    CleanupStack::PopAndDestroy(); // connArray
-    CleanupStack::PopAndDestroy(); // connManager
-    }
-
-// ---------------------------------------------------------------------------
-// Checks if the connection method matches the data supplied in the argument.
-// ---------------------------------------------------------------------------
-//
-void CDiagBrowserPluginModel::CheckConnectionMatchL(
-    const RCmConnectionMethod& aMethod,
-    TBrowserConnectionMethodData& aData ) const
-    {
-    LOGSTRING( "CDiagBrowserPluginModel::CheckConnectionMatchL()" )
-
-    HBufC* name = aMethod.GetStringAttributeL(
-        CMManager::ECmName );
-    CleanupStack::PushL( name );
-
-#ifdef __WINS__
-    HBufC* apn = HBufC::NewL( 1 );
-#else
-    HBufC* apn = aMethod.GetStringAttributeL(
-        CMManager::EPacketDataAPName );
-#endif // __WINS__
-    CleanupStack::PushL( apn );
-
-    TInt type = aMethod.GetIntAttributeL(
-        CMManager::ECmBearerType );
-
-    TBool hidden = aMethod.GetBoolAttributeL(
-        CMManager::ECmHidden );
-
-    HBufC* proxy = aMethod.GetStringAttributeL(
-        CMManager::ECmProxyServerName );
-    CleanupStack::PushL( proxy );
-
-    TInt port = aMethod.GetIntAttributeL(
-        CMManager::ECmProxyPortNumber );
-
-    TUint apId = aMethod.GetIntAttributeL(
-        CMManager::ECmIapId );
-
-    LOGSTRING4(
-        "CDiagBrowserPluginModel::CheckConnectionMatchL() - CM"
-        L" Name '%S', Type '0x%08x', Hidden '%d'", name, type, hidden )
-
-    LOGSTRING5( "CDiagBrowserPluginModel::CheckConnectionMatchL() - CM"
-                L" APN '%S', Proxy '%S:%d', Id %d", apn, proxy, port, apId )
-
-#ifdef __WINS__
-    if ( apId == KEmulatorDynamicIpApId )
-#else
-    if ( apn->Compare( aData.iApn ) == 0 &&
-         proxy->Compare( iProxyAddress ) == 0 &&
-         port == iProxyPort &&
-         type == KUidPacketDataBearerType &&
-         !hidden )
-#endif // __WINS__
-        {
-        aData.iApId = apId;
-        aData.iMethodName.Copy( *name );
-        aData.iIsValid = ETrue;
-
-        LOGSTRING2( "CDiagBrowserPluginModel::CheckConnectionMatchL() - Found"
-                    L" AP with id %d.", aData.iApId )
-        }
-
-    CleanupStack::PopAndDestroy( proxy );
-    CleanupStack::PopAndDestroy( apn );
-    CleanupStack::PopAndDestroy( name );
-    }
-
-// ---------------------------------------------------------------------------
-// Starts or resets the connection timeout timer.
-// ---------------------------------------------------------------------------
-//
-void CDiagBrowserPluginModel::StartConnectionTimerL()
-    {
-    LOGSTRING( "CDiagBrowserPluginModel::StartConnectionTimerL()" )
-
-    // Create the timer, or cancel an existing timer.
-    if ( !iTimer )
-        {
-        iTimer = CPeriodic::NewL( EPriorityHigh );
-        }
-    else
-        {
-        iTimer->Cancel();
-        }
-
-    // Start the timer.
-    iTimer->Start(
-        TTimeIntervalMicroSeconds32(
-            iTimeoutValue * KMicroSecondsInMilliseconds ),
-        TTimeIntervalMicroSeconds32( 0 ),
-        TCallBack( TimerExpired, this ) );
-    iTimerCalled++;
-    }
-
-// ---------------------------------------------------------------------------
-// Updates the plugin's state and reports progress to the observer.
-// ---------------------------------------------------------------------------
-//
-void CDiagBrowserPluginModel::SetStateL( TDiagBrowserState aTargetState )
-    {
-    LOGSTRING3( "CDiagBrowserPluginModel::SetStateL( %d ) - iState %d",
-                aTargetState,
-                iState )
-
-    // Check for bad state transitions.
-    switch ( aTargetState )
-        {
-        case EDiagBrowserStateConnectingBearer:
-            __ASSERT_ALWAYS( iState == EDiagBrowserStateInitial,
-                             Panic( EDiagBrowserPluginBadState ) );
-            break;
-
-        case EDiagBrowserStateConnectingServer:
-            __ASSERT_ALWAYS( iState == EDiagBrowserStateConnectingBearer,
-                             Panic( EDiagBrowserPluginBadState ) );
-            break;
-
-        case EDiagBrowserStateErasingLog:
-            __ASSERT_ALWAYS( iState != EDiagBrowserStateInitial,
-                             Panic( EDiagBrowserPluginBadState ) );
-            break;
-
-        default:
-            Panic( EDiagBrowserPluginBadState );
-        }
-
-    // Update the state.  Send progress to the observer.
-    iState = aTargetState;
-    iObserver.TestProgressL( aTargetState );
-    }
-
-// ---------------------------------------------------------------------------
-// Callback function for handling timer events.
-// ---------------------------------------------------------------------------
-//
-TInt CDiagBrowserPluginModel::TimerExpired( TAny* aPtr )
-    {
-    LOGSTRING2( "CDiagBrowserPluginModel::TimerExpired( 0x%x )", aPtr )
-
-    __ASSERT_ALWAYS( aPtr, Panic( EDiagBrowserPluginInternal ) );
-
-    CDiagBrowserPluginModel* myThis =
-        static_cast< CDiagBrowserPluginModel* >( aPtr );
-
-    // Stop the timer to prevent further undesired callbacks.
-    myThis->iTimer->Cancel();
-    myThis->TimerCleanUp();
-    // Try to continue test execution by retrying the secondary connection.
-    //TRAPD( error, myThis->RetryConnectionL() );
-    return KErrNone;
-    }
-void CDiagBrowserPluginModel::TimerCleanUp()
-{
-	    
-	if (iState == EDiagBrowserStateConnectingBearer)
-	{
-		if(iTimerCalled<=1)
-		StartConnectionTimerL();
-		else
-		iConnection.Stop( RConnection::EStopAuthoritative );
-	}
-	else if (iState == EDiagBrowserStateConnectingServer)
-	iHttpTransaction.Cancel();
-	
-}
-// ---------------------------------------------------------------------------
-// Opens the network connection.  This may be called multiple times if a
-// retry is necessary.
-// ---------------------------------------------------------------------------
-TBool CDiagBrowserPluginModel::OpenAndStartConnectionL()
-    {
-    LOGSTRING( "CDiagBrowserPluginModel::OpenAndStartConnectionL()" )
-
-    // Check if there is a valid connection to use.
-    /*if ( !iPrimaryConnection.iIsValid && !iSecondaryConnection.iIsValid )
-        {
-        LOGSTRING( "CDiagBrowserPluginModel::OpenAndStartConnectionL() - No"
-                   L" valid connections." )
-        return EFalse;
-        }
-        */
-
-    // Reset the connection.
-    iHttpTransaction.Close();
-    iHttpSession.Close();
-    iConnection.Stop();
-    iState = EDiagBrowserStateInitial;
-	
-    iConnectionPrefs.SetDialogPreference(ECommDbDialogPrefPrompt);//ECommDbDialogPrefDoNotPrompt ECommDbDialogPrefPrompt
-    LOGSTRING("SetDialogPreference( ECommDbDialogPrefPrompt)");
-    iConnectionPrefs.SetDirection( ECommDbConnectionDirectionOutgoing );
-    //iConnectionPrefs.SetIapId( iapID );
-    //iConnectionPrefs.SetBearerSet(ECommDbBearerGPRS);
-    iConnection.Start( iConnectionPrefs, iStatus );
-    SetActive();
-	ShowProgressNoteL();
-    // Start the timer and set the state to notify progress.
-    StartConnectionTimerL();
-    SetStateL( EDiagBrowserStateConnectingBearer );
-    return ETrue;
-    }
-
-// ---------------------------------------------------------------------------
-// Handles ending the test by deleting the logs, if necessary, and informing
-// the observer.
-// ---------------------------------------------------------------------------
-void CDiagBrowserPluginModel::HandleTestEndL(
-    CDiagResultsDatabaseItem::TResult aResult )
-    {
-    LOGSTRING2( "CDiagBrowserPluginModel::HandleTestEndL( %d )", aResult )
-
-    // Store the result, to return when log deletion completes.
-    iResult = aResult;
-
-    // Delete the logs, if necessary.
-    if ( iState != EDiagBrowserStateInitial )
-        {
-        if ( !iLogEraser )
-            {
-            iLogEraser = CDiagLogEventEraser::NewL( *this );
-            }
-
-        // Set the filter for log erasing.
-        TUid eventType;
-        TTime now;
-        eventType.iUid = KLogPacketDataEventType;
-        now.UniversalTime();
-
-        CLogFilter& filter = iLogEraser->Filter();
-        filter.SetEventType( eventType );
-        filter.SetStartTime( iStartTime );
-        filter.SetEndTime( now );
-
-        // Erase the logs from the test, asynchronously.
-        SetStateL( EDiagBrowserStateErasingLog );
-        iLogEraser->StartAsyncEraseLogsL();
-        }
-    else
-        {
-        iObserver.TestEndL( iResult );
-        }
-	
-        
-    // clear the dialogue only if dialog is running.    
-    if(idialogOn)    
-    iWaitDialog->ProcessFinishedL();
-    }
-// ----------------------------------------------------------------------------
-// CDiagDataNetworkTestPDPEngine::ShowVibrationNoteL
-//
-// Progress Note
-// ----------------------------------------------------------------------------
-
-void CDiagBrowserPluginModel::ShowProgressNoteL()
-    {
-    if ( iWaitDialog )
-        {
-        delete iWaitDialog;
-        iWaitDialog = NULL;
-        }
-    
-                        
-    // WAIT NOTE DIALOG
-   iWaitDialog = new (ELeave) CAknWaitDialog(
-								(REINTERPRET_CAST(CEikDialog**, &iWaitDialog)), 
-								ETrue);
-    
-	iWaitDialog->PrepareLC(R_BROWSER_PLUGIN_WAIT_NOTE);
-	iWaitDialog->SetCallback(this);
-	iWaitDialog->RunLD();
-	idialogOn = ETrue;
-	LOGSTRING("CDiagBrowserPluginModel::ShowProgressNoteL()");
-
-    }
-
-//*********************************************************
-// CallBack from AKnWaitDialog when Cancel is pressed
-//*********************************************************
-
-void CDiagBrowserPluginModel::DialogDismissedL( TInt aButtonId )
-	{
-		 LOGSTRING2("CDiagBrowserPluginModel::DialogDismissedL() = %d",aButtonId);
-		 
-		 if (aButtonId == EBrowserTestCancel && idialogOn) 
-		 {
-		 // cancel the tests based on which point the dialog is dismissed
-		 LOGSTRING2("CDiagBrowserPluginModel::DialogDismissed @ iState= %d",iState);
-		 if (iState == EDiagBrowserStateConnectingBearer)
-	     iConnection.Stop( RConnection::EStopAuthoritative );
-		 else if (iState == EDiagBrowserStateConnectingServer)
-		 iHttpTransaction.Cancel();
-	     iWaitDialog = NULL;
-	     idialogOn = EFalse;
-	     idialogDismissed = ETrue;      
-		 }
-	}    
-// ---------------------------------------------------------------------------
-// Attempts to continue test execution by retrying with the secondary
-// connection.
-// ---------------------------------------------------------------------------
-void CDiagBrowserPluginModel::RetryConnectionL()
-    {
-    LOGSTRING( "CDiagBrowserPluginModel::RetryConnectionL()" );
-    
-    if (iRetryCount < 1 && !idialogDismissed)
-    {
-           if ( OpenAndStartConnectionL() )
-           {
-           iRetryCount++;
-           return;
-           }         
-    }
-    HandleTestEndL( CDiagResultsDatabaseItem::EFailed );
-    }
-
-// ---------------------------------------------------------------------------
-// From class CActive.
-// Active object run handler.
-// ---------------------------------------------------------------------------
-void CDiagBrowserPluginModel::RunL()
-    {
-    LOGSTRING( "CDiagBrowserPluginModel::RunL()" )
-
-    __ASSERT_ALWAYS( iState == EDiagBrowserStateConnectingBearer,
-                     Panic( EDiagBrowserPluginBadState ) );
-
-    // Stop the timer.
-    if ( iTimer )
-        {
-        iTimer->Cancel();
-        }
-
-	if (iStatus == KErrConnectionTerminated )
-	{
-		HandleTestEndL( CDiagResultsDatabaseItem::ESkipped );
-		return;
-	}
-    // Check if the connection succeeded.
-    if ( iStatus != KErrNone )
-        {
-        LOGSTRING2(
-            "CDiagBrowserPluginModel::RunL() - connection failed. Error %d",
-            iStatus.Int() )
-        LOGSTRING( "retry if possible()" );
-        // Retry, if possible.
-        //RetryConnectionL();
-        HandleTestEndL( CDiagResultsDatabaseItem::EFailed );
-        return;
-        }
-
-    // Open the HTTP Session.
-    iHttpSession.OpenL();
-
-    // Associate the HTTP session with the open connection.
-    RStringPool pool = iHttpSession.StringPool();
-    RHTTPConnectionInfo connInfo = iHttpSession.ConnectionInfo();
-    connInfo.SetPropertyL( pool.StringF( HTTP::EHttpSocketServ,
-                                         RHTTPSession::GetTable() ),
-                           THTTPHdrVal( iSocketServ.Handle() ) );
-    TInt connectionPtr = reinterpret_cast< TInt >( &iConnection );
-    connInfo.SetPropertyL( pool.StringF( HTTP::EHttpSocketConnection,
-                                         RHTTPSession::GetTable() ),
-                           THTTPHdrVal( connectionPtr ) );
-
-    // Copy the URI to an 8-bit descriptor.  Directly getting an 8-bit
-    // descriptor from Central Repository does not seem to work properly.
-    TBuf8< KMaxStringLength > uri8;
-    uri8.Copy( iUri );
-
-    TUriParser8 uriParser;
-    if ( uriParser.Parse( uri8 ) != KErrNone )
-        {
-        LOGSTRING2(
-            "CDiagBrowserPluginModel::RunL() - parsing the uri '%S' failed.",
-            &iUri )
-        HandleTestEndL( CDiagResultsDatabaseItem::EFailed );
-        return;
-        }
-
-    // Create an HTTP transaction, setting the model as the callback object.
-    iHttpTransaction = iHttpSession.OpenTransactionL( uriParser, *this );
-    iHttpTransaction.SubmitL();
-    LOGSTRING2( "CDiagBrowserPluginModel::RunL() - HTTP transaction submitted"
-                L" for '%S'",
-                &iUri )
-
-    // Start the timer and set the state to notify progress.
-    StartConnectionTimerL();
-    SetStateL( EDiagBrowserStateConnectingServer );
-    }
-
-// ---------------------------------------------------------------------------
-// From class CActive.
-// Handles leaves in the active object's RunL function.
-// ---------------------------------------------------------------------------
-TInt CDiagBrowserPluginModel::RunError( TInt aError )
-    {
-    LOGSTRING2( "CDiagBrowserPluginModel::RunError( %d )", aError )
-
-    // Try to continue test execution by retrying the secondary connection.
-    //TRAPD( error, RetryConnectionL() );
-    //return error;
-    HandleTestEndL( CDiagResultsDatabaseItem::EFailed );
-    return KErrNone;
-    }
-
-// ---------------------------------------------------------------------------
-// From class CActive.
-// Active object cancel.
-// ---------------------------------------------------------------------------
-void CDiagBrowserPluginModel::DoCancel()
-    {
-    LOGSTRING( "CDiagBrowserPluginModel::DoCancel()" )
-
-    // Does not have an asynchronous cancel, but this functions as Cancel.
-    iConnection.Stop( RConnection::EStopAuthoritative );
-    }
-
-// ---------------------------------------------------------------------------
-// From class MHTTPTransactionCallback.
-// Called when an event occurs on an HTTP transaction.
-// ---------------------------------------------------------------------------
-void CDiagBrowserPluginModel::MHFRunL( RHTTPTransaction aTransaction,
-                                  const THTTPEvent& aEvent )
-    {
-    LOGSTRING2( "CDiagBrowserPluginModel::MHFRunL() - aEvent.iStatus %d",
-                aEvent.iStatus )
-
-    __ASSERT_ALWAYS( iState == EDiagBrowserStateConnectingServer,
-                     Panic( EDiagBrowserPluginBadState ) );
-    __ASSERT_ALWAYS( aTransaction.Id() == iHttpTransaction.Id(),
-                     Panic( EDiagBrowserPluginTransaction ) );
-
-    // Failed status.
-    if ( aEvent == THTTPEvent::EFailed )
-        {
-        LOGSTRING( "CDiagBrowserPluginModel::MHFRunL() - Response failed." )
-        //RetryConnectionL();
-        //return;
-        HandleTestEndL( CDiagResultsDatabaseItem::EFailed );
-        }
-
-    // Skip non-success / non-failure statuses.
-    if ( aEvent != THTTPEvent::EGotResponseHeaders &&
-         aEvent != THTTPEvent::EGotResponseBodyData &&
-         aEvent != THTTPEvent::EResponseComplete &&
-         aEvent != THTTPEvent::ESucceeded &&
-         aEvent != THTTPEvent::ERequestComplete )
-        {
-        LOGSTRING( "CDiagBrowserPluginModel::MHFRunL() - Unused event." )
-        return;
-        }
-
-    // Stop the request, so we don't get any further callbacks.
-    iHttpTransaction.Cancel();
-
-    // Get the HTTP response code and check it.
-    RHTTPResponse response = aTransaction.Response();
-    if ( response.StatusCode() != KHttpResponseCodeOk )
-        {
-        LOGSTRING2( "CDiagBrowserPluginModel::MHFRunL() - status code is %d",
-                    response.StatusCode() )
-        HandleTestEndL( CDiagResultsDatabaseItem::EFailed );
-        }
-    else
-        {
-        LOGSTRING(
-            "CDiagBrowserPluginModel::MHFRunL() - connection succeeded" )
-        HandleTestEndL( CDiagResultsDatabaseItem::ESuccess );
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// From class MHTTPTransactionCallback.
-// Called when an error occurs on an HTTP transaction.
-// ---------------------------------------------------------------------------
-TInt CDiagBrowserPluginModel::MHFRunError( TInt aError,
-                                      RHTTPTransaction aTransaction,
-                                      const THTTPEvent& /* aEvent */ )
-    {
-    LOGSTRING2( "CDiagBrowserPluginModel::MHFRunError( %d )", aError )
-
-    __ASSERT_ALWAYS( iState == EDiagBrowserStateConnectingServer,
-                     Panic( EDiagBrowserPluginBadState ) );
-    __ASSERT_ALWAYS( aTransaction.Id() == iHttpTransaction.Id(),
-                     Panic( EDiagBrowserPluginTransaction ) );
-
-    // Try to continue test execution by retrying the secondary connection.
-    TRAPD( error, RetryConnectionL() );
-    return error;
-    }
-
-// ---------------------------------------------------------------------------
-// From class MDiagLogEventEraserObserver.
-// This function checks if the log event needs to be deleted.
-// ---------------------------------------------------------------------------
-TBool CDiagBrowserPluginModel::IsEventToBeDeleted( const CLogEvent& aEvent )
-    {
-    LOGSTRING( "CDiagBrowserPluginModel::IsEventToBeDeleted()" )
-
-    if ( ( iPrimaryConnection.iUsed && aEvent.RemoteParty().Compare(
-            iPrimaryConnection.iMethodName ) == 0 ) ||
-         ( iSecondaryConnection.iUsed && aEvent.RemoteParty().Compare(
-            iSecondaryConnection.iMethodName ) == 0 ) )
-        {
-        // The name matches, so delete the log entry.
-        return ETrue;
-        }
-
-    return EFalse;
-    }
-
-// ---------------------------------------------------------------------------
-// From class MDiagLogEventEraserObserver.
-// This function notifies that the erase operation is complete.
-// ---------------------------------------------------------------------------
-void CDiagBrowserPluginModel::CompleteEventEraseL( TInt aError )
-    {
-    LOGSTRING2(
-        "CDiagBrowserPluginModel::CompleteEventEraseL( %d )", aError )
-
-    __ASSERT_ALWAYS( iState == EDiagBrowserStateErasingLog,
-                     Panic( EDiagBrowserPluginBadState ) );
-
-    // The error code is ignored, because it's not part of the criteria for
-    // the test to pass.  We are deleting logs asynchronously, so the browser
-    // portion of the test has already stored a result in iResult.
-    iState = EDiagBrowserStateInitial;
-    
-    // dialog dismissed with Cancel
-    
-    if (idialogDismissed)
-    iResult = CDiagResultsDatabaseItem::ESkipped;
-    
-    LOGSTRING2( "CDiagBrowserPluginModel::dialogDismissed = %d)", idialogDismissed)
-    iObserver.TestEndL( iResult );
-    }
-
-// End of File
--- a/devicediagnostics/diagplugins/diagdatanetworkplugin/cenrep_files/clean_cenrep.bat	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-rem
-rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-rem All rights reserved.
-rem This component and the accompanying materials are made available
-rem under the terms of "Eclipse Public License v1.0"
-rem which accompanies this distribution, and is available
-rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
-rem
-rem Initial Contributors:
-rem Nokia Corporation - initial contribution.
-rem
-rem Contributors:
-rem
-rem Description:
-rem
-
-rd /s /q output
Binary file devicediagnostics/diagplugins/diagdatanetworkplugin/cenrep_files/keys_diagdatanetworktestplugin.xls has changed
--- a/devicediagnostics/diagplugins/diagdatanetworkplugin/cenrep_files/make_cenrep.bat	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-rem
-rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-rem All rights reserved.
-rem This component and the accompanying materials are made available
-rem under the terms of "Eclipse Public License v1.0"
-rem which accompanies this distribution, and is available
-rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
-rem
-rem Initial Contributors:
-rem Nokia Corporation - initial contribution.
-rem
-rem Contributors:
-rem
-rem Description:
-rem
-
-@set XLS_FILE=keys_DiagDataNetworkTestPlugin.xls
-@set INI_FILE=2000E598.txt
-@set RELEASE=3.2
-
-@set CENREP_DIR=%CD%
-@cd \epoc32\tools\cenrep
-
-cenrep.pl -o "%CENREP_DIR%\output" -l "%CENREP_DIR%\%XLS_FILE%" -p %RELEASE%
-copy "%CENREP_DIR%\output\inifiles\%INI_FILE%" \epoc32\RELEASE\winscw\udeb\Z\private\10202be9\
-copy "%CENREP_DIR%\output\inifiles\%INI_FILE%" \epoc32\RELEASE\winscw\udeb\Z\private\10202be9\
-copy "%CENREP_DIR%\output\inifiles\%INI_FILE%" \epoc32\RELEASE\winscw\urel\Z\private\10202be9\
-copy "%CENREP_DIR%\output\inifiles\%INI_FILE%" \epoc32\RELEASE\armv5\udeb\Z\private\10202be9\
-copy "%CENREP_DIR%\output\inifiles\%INI_FILE%" \epoc32\RELEASE\armv5\urel\Z\private\10202be9\
-copy "%CENREP_DIR%\output\inifiles\%INI_FILE%" \epoc32\data\Z\private\10202be9\
-@cd "%CENREP_DIR%"
-
-@echo ================= done. Hit any key to continue ==================
-@pause
Binary file devicediagnostics/diagplugins/diagdatanetworkplugin/conf/diagdatanetworktestplugin.confml has changed
Binary file devicediagnostics/diagplugins/diagdatanetworkplugin/conf/diagdatanetworktestplugin_2000E598.crml has changed
--- a/devicediagnostics/diagplugins/diagdatanetworkplugin/data/devdiagdatanetworktestplugin.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-/*
-* 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:  ECOM plugin resource file for Data Network Test Plugin
-*
-*/
-
-#include <registryinfo.rh>
-#include "diagdatanetworktestplugin.hrh" // UIDs
-
-
-RESOURCE REGISTRY_INFO theInfo
-    {
-    dll_uid     = _UID3;
-    interfaces  =
-        {
-        INTERFACE_INFO
-            {
-            interface_uid   = 0x2000AFEB;
-            implementations =
-                {
-                IMPLEMENTATION_INFO
-                    {
-                    implementation_uid  = _IMPLEMENTATION_UID;
-                    version_no          = 1;
-                    display_name        = "Data Network Test Plugin";
-                    default_data        = "0x2000E56B"; //Coverage suite
-                    opaque_data         =   "<diagplugininfo>" 
-                                                "<order number=\"90\"/>"
-												"<serviceprovided name=\"Data Coverage\"/>"
-                                                "<servicesrequired>"
-                                                    "<service name=\"Network Coverage\"/>"
-                                                "</servicesrequired>"                                              
-                                            "</diagplugininfo>";
-                    }
-                };
-            }
-        };
-    }
-
-
-// End of File
--- a/devicediagnostics/diagplugins/diagdatanetworkplugin/data/devdiagdatanetworktestpluginrsc.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,267 +0,0 @@
-/*
-* 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:  Resource file for DiagDataNetworkTestPlugin
-*
-*/
-
-
-
-//  RESOURCE IDENTIFIER
-NAME    DGDN // 4 letter ID // this has to be unique for each plugin
-
-//  INCLUDES
-#include <eikon.rh>
-#include <avkon.rh>
-#include <avkon.rsg>
-#include <avkon.mbg>
-#include <appinfo.rh>
-#include <avkon.loc>
-#include <AvkonIcons.hrh>
-#include <bldvariant.hrh>
-#include <uikon.rh>
-#include  <data_caging_paths_strings.hrh>
-
-#include    <diagdatanetworktestplugin.loc>
-#include	"diagdatanetworktestplugin.hrh"
-
-
-// CONSTANTS
-
-//  RESOURCE DEFINITIONS
-
-RESOURCE RSS_SIGNATURE
-    {
-    }
-
-RESOURCE TBUF
-    {
-    buf="DGDN";
-    }
-
-// ---------------------------------------------------------------------------
-//  r_diag_data_network_test_heading_pane
-//
-// The plugin name in the header of the dialog that 
-// is shown when starting test execution.
-// ---------------------------------------------------------------------------
-//
-RESOURCE TBUF r_diag_data_network_test_heading_pane
-    {
-    buf = qtn_diag_msg_title_data_network;
-    }
-    
-    
-// ---------------------------------------------------------------------------
-//  r_diag_data_network_test_info_pane
-//  The body text of the dialog that is shown when 
-//  starting test execution.
-// ---------------------------------------------------------------------------
-//
-RESOURCE TBUF r_diag_data_network_test_info_pane
-    {
-    buf = qtn_diag_conf_test_failed_data_coverage;
-    }
-    
-
-// ---------------------------------------------------------------------------
-//  r_diag_data_network_test_title_pane
-//  The title pane shown when Data network test is running
-// ---------------------------------------------------------------------------
-//
-RESOURCE TBUF r_diag_data_network_test_title_pane
-    {
-    buf = qtn_diag_title_test_data_network;
-    }
-
-// ---------------------------------------------------------------------------
-// r_diag_data_network_test_single_graphic
-// Plugin name in the suite view listbox.
-// ---------------------------------------------------------------------------
-//
-RESOURCE TBUF r_diag_data_network_test_single_graphic
-    {
-    buf = qtn_diag_lst_test_data_network;
-    }
-
-
-//----------------------------------------------------
-//  r_diag_data_network_test_single
-//
-// Plugin's name in results view
-//----------------------------------------------------
-//
-RESOURCE TBUF r_diag_data_network_test_single
-    {
-    buf = qtn_diag_lst_data_coverage;          
-    }
-    
-    
-// ADO & Platformization Changes
-
-
-RESOURCE CBA r_cba_datanetwork_group_execution
-{
-		buttons =
-		{
-			CBA_BUTTON
-			{
-					id = EAknSoftkeyOk;
-					txt = text_softkey_ok;
-			},
-			
-			
-			CBA_BUTTON
-			{
-					id = EDataNetworkTestSkip;
-					txt = qtn_diag_softk_skip;
-			}
-			
-		};
-}
-
-
-
-RESOURCE CBA r_cba_datanetwork_single_execution
-{
-		buttons =
-		{
-			CBA_BUTTON
-			{
-					id = EAknSoftkeyOk;
-					txt = text_softkey_ok;
-			},
-			
-			
-			CBA_BUTTON
-			{
-					id = EDataNetworkTestCancel;
-					txt = text_softkey_cancel;
-			}
-			
-		};
-}
-
-
-RESOURCE DIALOG r_diag_messagequery_title_datanetwork
-{
-		flags = EGeneralQueryFlags;
-		buttons = r_cba_datanetwork_single_execution;
-		items =
-		{
-			DLG_LINE 
-			{
-					type = EAknCtPopupHeadingPane;
-					id = EAknMessageQueryHeaderId;
-					control = AVKON_HEADING
-                {
-                label = qtn_diag_msg_title_data_network;
-                headinglayout = 0;
-                };
-			},
-			
-			DLG_LINE
-			{
-					type = EAknCtMessageQuery;
-					id = EAknMessageQueryContentId;
-					control = AVKON_MESSAGE_QUERY
-					{
-							message = qtn_diag_msg_info_data_network;
-					};
-					
-			}
-		
-		};
-
-}
-
-//----------------------------------------------------
-//  r_datanw_softkeys_stop__cancel
-//
-// Buttons shown during the test. Shown when the
-// test is run as a part of a suite.
-//----------------------------------------------------
-//
-RESOURCE CBA r_datanw_softkeys_stop__cancel
-    {
-    buttons = 
-        {
-       CBA_BUTTON 
-	        { 
-            id  = EAknSoftkeyEmpty; 
-            txt = text_softkey_empty;
-	        },
-
-        CBA_BUTTON 
-	        { 
-            id  = EDataNetworkTestCancel;      // .hrh 
-            txt = text_softkey_cancel; // .rls or .loc
-	        } 
-
-	
-        };
-    }
-	
-//----------------------------------------------------
-//  r_datanw_plugin_progress_note
-//
-//  Plugin progress note
-//----------------------------------------------------
-/*
-RESOURCE DIALOG r_datanw_plugin_progress_note
-    {
-    flags   = EAknProgressNoteFlags;
-    buttons = R_AVKON_SOFTKEYS_EMPTY;
-
-    items =
-        {
-        DLG_LINE
-            {
-            type = EAknCtNote;
-            id   = EGeneralNote;
-
-            control = AVKON_NOTE
-                {
-                layout         = EProgressLayout;
-                singular_label = qtn_diag_msg_testing_data_coverage;
-                
-                imageid = EMbmAvkonQgn_note_progress;
-                imagemask = EMbmAvkonQgn_note_progress_mask;
-                };
-            }
-        };
-    }
-*/
-
-RESOURCE DIALOG r_datanw_plugin_wait_note
-    {
-    flags = EAknWaitNoteFlags | EEikDialogFlagNotifyEsc;
-    //buttons = R_AVKON_SOFTKEYS_EMPTY;
-	buttons = r_datanw_softkeys_stop__cancel;
-    items =
-        {
-        DLG_LINE
-            {
-            type = EAknCtNote;
-            id = EYBWaitNoteId;
-            control= AVKON_NOTE 
-                { 
-                layout = EWaitLayout;
-                singular_label = qtn_diag_msg_testing_data_coverage;
-                animation = R_QGN_GRAF_WAIT_BAR_ANIM;
-                };
-            }
-        };
-    }
-	
-//End of File
--- a/devicediagnostics/diagplugins/diagdatanetworkplugin/group/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-/*
-* 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:  This file provides the information required for building
-*                Data Network Test Plugin
-*
-*/
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-../loc/diagdatanetworktestplugin.loc        MW_LAYER_LOC_EXPORT_PATH(diagdatanetworktestplugin.loc)
-../rom_files/devdiagdatanetworktestplugin.iby		CORE_MW_LAYER_IBY_EXPORT_PATH(devdiagdatanetworktestplugin.iby)
-../rom_files/devdiagdatanetworktestplugin_resources.iby		LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(devdiagdatanetworktestplugin_resources.iby)
-
-// Generic configuration interface for component cenrep settings  
-../conf/diagdatanetworktestplugin.confml                    MW_LAYER_CONFML(DiagDataNetworkTestPlugin.confml)
-../conf/diagdatanetworktestplugin_2000E598.crml	        MW_LAYER_CRML(DiagDataNetworkTestPlugin_2000E598.crml)
-PRJ_MMPFILES
-diagdatanetworktestplugin.mmp
-
-
-PRJ_TESTMMPFILES
-
-//  End of File
--- a/devicediagnostics/diagplugins/diagdatanetworkplugin/group/diagdatanetworktestplugin.mmp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,84 +0,0 @@
-/*
-* 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:  Project specification file.
-*
-*/
-
-
-#include  <data_caging_paths.hrh>    // For RESOURCE_FILES_DIR
-#include <platform_paths.hrh> // To get the MW_LAYER_SYSTEMINCLUDE-definition
-
-
-TARGET              devdiagdatanetworktestplugin.dll
-TARGETTYPE          PLUGIN
-UID                 0x10009D8D 0x2000E598                    
-VENDORID            VID_DEFAULT
-CAPABILITY          CAP_ECOM_PLUGIN
-
-SOURCEPATH  ../src
-SOURCE      diagdatanetworktestpluginimplementationtable.cpp    
-SOURCE      diagdatanetworktestplugin.cpp
-SOURCE      diagdatanetworktestpdpengine.cpp
-
-
-SOURCEPATH  ../../diagpdptestengine/src // for PDP Test Engine
-SOURCE      diagpdptestengine.cpp
-
-//User include paths
-USERINCLUDE     ../inc
-USERINCLUDE     ../../diagpdptestengine/inc // for PDP Test Engine
-USERINCLUDE     ../data // For *.rh
-USERINCLUDE     ../loc
-
-//System include paths
-SYSTEMINCLUDE   /epoc32/include/ecom
-
-// Default system include paths for middleware layer modules.
-APP_LAYER_SYSTEMINCLUDE
-
-SOURCEPATH      ../data
-
-// resource file for the plugin implementation
-START RESOURCE  devdiagdatanetworktestplugin.rss
-TARGET          devdiagdatanetworktestplugin.rsc
-TARGETPATH      ECOM_RESOURCE_DIR
-END
-
-// resource file for the plugin registration
-START RESOURCE  devdiagdatanetworktestpluginrsc.rss
-HEADER
-TARGETPATH      RESOURCE_FILES_DIR
-LANGUAGE_IDS
-END
-
-LIBRARY   euser.lib
-LIBRARY   commdb.lib
-
-LIBRARY				avkon.lib   // ADO & Platformization Changes
-LIBRARY   			eikcoctl.lib // ADO & Platformization Changes
-LIBRARY   			eikdlg.lib	// ADO & Platformization Changes
-
-LIBRARY   centralrepository.lib // for CRepository
-LIBRARY   esock.lib             // for RConnection
-
-LIBRARY   commonengine.lib      // For StringLoader
-LIBRARY   diagpluginbase.lib
-LIBRARY   flogger.lib           // for RFileLogger
-LIBRARY   diagframework.lib     // for CDiagLogEventEraser
-LIBRARY   logcli.lib            // for CLogFilter
-LIBRARY   cmmanager.lib
-LIBRARY  apengine.lib
-//LIBRARY   avkon.lib
-//LIBRARY   bafl.lib 
-// End of File
--- a/devicediagnostics/diagplugins/diagdatanetworkplugin/inc/diagdatanetworkprivatecrkeys.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-/*
-* 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:  Diagnostics Data Network Test private CenRep keys
-*
-*/
-
-
-
-#ifndef DIAGDATANETWORKTESTPLUGINCRKEYS_H
-#define DIAGDATANETWORKTESTPLUGINCRKEYS_H
-
-// UID of the CR for Data Network Test plug-in
-const TUid KCRUidDiagDataNetworkTestPlugin = { 0x2000E598 };
-
-// Key to for Primary APN
-const TUint32 KDiagDataNetworkTestPluginPrimaryAPN     = 0x00000001;
-
-// Key for Secondary APN
-const TUint32 KDiagDataNetworkTestPluginSecondaryAPN   = 0x00000002;
-
-#endif // DIAGDATANETWORKTESTPLUGINCRKEYS_H
-          
-// End of File
--- a/devicediagnostics/diagplugins/diagdatanetworkplugin/inc/diagdatanetworktestcallbackinterface.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-/*
-* 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:  This is the header for the callback interface between the 
-*                 plugin class and the engine class
-*
-*/
-
-
-#ifndef DIAGDATANETWORKTESTCALLBACKINERFACE_H
-#define DIAGDATANETWORKTESTCALLBACKINERFACE_H
-
-#include <DiagResultsDatabaseItem.h> // CDiagResultsDatabaseItem
-
-class MDiagDataNetworkTestCallBackInterface
-    {
-public:
-    /**
-    * This function is used by the engine class to report result of the test to the plug-in class
-    */  
-    virtual void ReportTestResultL(CDiagResultsDatabaseItem::TResult aResult) = 0;    
-    
-    /**
-    * This function is used by the engine class to report progress of the test to the plug-in class
-    */          
-    virtual void ReportTestProgL(TInt aStep) = 0;   
-	virtual TBool DisplayDialog(TInt & aUserResponse) = 0;
-    };
-    
-
-#endif // DIAGDATANETWORKTESTCALLBACKINERFACE_H
\ No newline at end of file
--- a/devicediagnostics/diagplugins/diagdatanetworkplugin/inc/diagdatanetworktestpdpengine.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,281 +0,0 @@
-/*
-* 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:  This is the header for the Diagnostics Data Network Test 
-*                 PDP-Engine class
-*
-*/
-
-
-#ifndef DIAGDATANETWORKTESTPDPENGINE_H 
-#define DIAGDATANETWORKTESTPDPENGINE_H
-
-// INCLUDES
-
-
-#include "diagpdptestengine.h"                      // CDiagPDPTestEngine
-#include <DiagNetworkRegStatusObserver.h>           // MDiagNetworkRegStatusObserver
-#include <diaglogeventeraserobserver.h>             // MDiagLogEventEraserObserver
-#include <AknWaitDialog.h> 
-#include "diagdatanetworktestcallbackinterface.h"   // MDiagDataNetworkTestCallBackInterface
-
-//CONSTANTS
-
-// MACROS
-
-// DATA TYPES
-
-// FUNCTION PROTOTYPES
-
-// FORWARD DECLARATIONS
-class CDiagNetworkRegStatusWatcher;
-class CDiagPluginWaitingDialogWrapper;
-class CDiagLogEventEraser;
-
-// CLASS DEFINITION  
-class CDiagDataNetworkTestPDPEngine 
-    : public CDiagPDPTestEngine,
-      public MDiagNetworkRegStatusObserver, 
-      public MDiagLogEventEraserObserver,
-      public MProgressDialogCallback
-    {    
-public: 
-    /**
-    * Symbian OS two-phased constructor
-    * @return DataNetwork Test PDP Engine
-    */       
-    static CDiagDataNetworkTestPDPEngine* NewL(
-        MDiagDataNetworkTestCallBackInterface& aInterface);
-    
-    /**
-    * Destructor
-    */        
-    ~CDiagDataNetworkTestPDPEngine();
-
-public:    
-    
-    /**
-    * The plugin calls this function of engine to start the Data Network test
-    */              
-    void RunDataNetworkTestL(); 
-    
-    /**
-    * This function return the total steps of the Data network test
-    */
-    static TUint TotalSteps();
-
-private: // private data-type
-            
-    /**
-    * States of the PDP test engine
-    */
-    enum TPDPEngineState
-        {
-        EStateUnknown,                
-        EStateWaitForInitialNetworkRegStatus,
-        EStateCheckingConnecitonParams,
-        EStateWaitForConnectionCompletion,
-        EStateWaitForLogErase,
-        EStateCancelTest,
-        EStateWaitDialogOn,
-        EStateDialogDismissed,
-        EStateMax            
-        };
-                  
-private: // private functions
-    
-    /**
-    * C++ default constructor.
-    */        
-    CDiagDataNetworkTestPDPEngine(MDiagDataNetworkTestCallBackInterface& aInterface);
-    
-    /**
-    * Symbian OS default constructor.
-    *
-    */        
-    void ConstructL(); 
-    
-    /**
-    * @see CDiagPDPTestEngine::ReadAPNsFromCenrepL()
-    */
-    void ReadAPNsFromCenrepL(TInt& aError);
-    
-    
-    /**
-    * This function is the entry point to start establishing PDP context
-    */         
-    void EstablishPDPContextL();
-            
-    
-    /**
-    * @see CDiagPDPTestEngine::ReportResultToPluginL()
-    */          
-    void ReportResultToPluginL(TBool aResult);
-    
-    
-    /**
-    * This function is the handles the process of ongoing connection request
-    */
-    void HandleOngoingConnectionRequestL();    
-    
-    /**
-    * This function starts the process of PDP establishment
-    */
-    void StartPdpEstablishmentL();
-    
-    /**
-    * This function sets the state of the engine and reports the progress of the
-    * test to the plugin class 
-    */
-    void SetStateL(TPDPEngineState aState);
-    
-    /**
-    * This function starts the process of erasing logs.
-    * 
-    */
-    void StartLogEraseOperationL(TBool aTestResult);
-    
-    /**
-    * Progress Note
-    *
-    */
-    TBool ShowProgressNoteL(TInt);
-        
-private: // from CActive
-    
-    /**
-    * Handle active object completion event
-    */
-    void RunL();
-
-    /**
-    * Handle cancel
-    */
-    void DoCancel();
-
-private: // from MProgressDialogCallback
-        
-    /**
-    * Called when the progress dialog is dismissed.
-    *
-    * @param aButtonId - indicate which button made dialog to dismiss
-    */
-    virtual void DialogDismissedL( TInt aButtonId );
-        
-private: // from MDiagNetworkRegStatusObserver
-
-    /**
-    * This function is used to inform the intial network registration status
-    *
-    * @param aRegistered. 
-    *  ETrue :The device is currently registered on the network
-    *  EFalse:The device is currently not registered on the network.
-    */
-    void InitialNetworkRegistrationStatusL( const TBool& aRegistered );
-
-    /**
-    * This interface is used to inform the clients of any changes in the network registration
-    * status
-    *
-    * @param aRegistered
-    * ETrue :The device has now changed to registered status.
-    * EFalse:The device has now lost network coverage.
-    */    
-    void NetworkRegistrationStatusChangeL( const TBool& aRegistered );            
-        
-        
-private: // from MDiagLogEventEraserObserver
-
-    /**
-    * This callback interface is used to determine if the log event is
-    * to be deleted or not.
-    * @param aEvent is the event which has to be deleted
-    * @return ETrue if the event is to be deleted and EFalse if the event is
-    * not to be deleted
-    */
-    TBool IsEventToBeDeleted( const CLogEvent& aEvent );
-    
-    /**
-    * This callback interface is used to notify that log events are erased
-    */
-    void CompleteEventEraseL( TInt aError );
-        
-        
-private: // private data
-
-
-    /**
-    * State of the Data network test engine
-    */        
-    TPDPEngineState iEngineState;       
-    TPDPEngineState iPrevState;     
-    
-    /**
-    * UTC time recorded just before starting the process of PDP connection
-    * establishment. This time is used to filter the log events for deletion
-    */
-    TTime iStartTime;
-                                  
-    /**
-    * Flag to remember the result of the test prior to erasing of logs
-    */
-    TBool iTestResult;
-        
-    /**
-    * Callback interface used by the engine class to report the progress of the test
-    * and result of the test
-    */
-    MDiagDataNetworkTestCallBackInterface& iInterface;
-    
-    
-    /**
-    * This index is used to store the current index of IAP array on which 
-    * asynchrouns RConnection::Start() has been issued.
-    */ 
-    TInt iCurrentIndex;
-    
-    /**
-    * This enum is used to store the current IAP array (primary or secondary) on which 
-    * asynchrouns RConnection::Start() has been issued.        
-    */
-    TIapArray iCurrentArray;
-    
-    /**
-    * For providing prefernce about how to set up the connection
-    */
-    TCommDbConnPref iPref;
-    
-    /**
-    * Instance of the Diagnostics network registration status watcher
-    * Owned by this class
-    */
-    CDiagNetworkRegStatusWatcher* iNetRegStatusWatcher;
-    
-    /**
-    * Instance of the Diagnostics Log event eraser    
-    * Owned by this class
-    */
-    CDiagLogEventEraser* iLogEventEraser;    
-    /**
-    *
-    * Wait Dialog
-    *
-    */
-    CAknWaitDialog*      iWaitDialog;
-    
-	TBool idialogOn, idialogDismissed;
-    };
-
-#endif //DIAGDATANETWORKTESTPDPENGINE_H
-
-// End of File
--- a/devicediagnostics/diagplugins/diagdatanetworkplugin/inc/diagdatanetworktestplugin.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,146 +0,0 @@
-/*
-* 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:  This is the header for the Diagnostics Data Network Test plugin 
-*                 class
-*
-*/
-
-
-#ifndef DIAGDATANETWORKTESTPLUGIN_H 
-#define DIAGDATANETWORKTESTPLUGIN_H
-
-// INCLUDES
-#include <DiagResultsDatabaseItem.h>
-#include <DiagTestPluginBase.h>     // CDiagTestPluginBase
-#include "diagdatanetworktestcallbackinterface.h" // MDiagDataNetworkTestCallBackInterface
-
-//CONSTANTS
-
-// MACROS
-
-// DATA TYPES
-    
-// FUNCTION PROTOTYPES
-
-// FORWARD DECLARATIONS
-class CDiagDataNetworkTestPDPEngine;
-class CDiagResultsDbItemBuilder;
-
-// CLASS DEFINITION
-class CDiagDataNetworkTestPlugin : public CDiagTestPluginBase, 
-                                   public MDiagDataNetworkTestCallBackInterface
-    {
-    public: // Constructors and destructor
-
-        /**
-        * Symbian OS two-phased constructor
-        * @return DataNetwork Test Plugin
-        */
-        static MDiagPlugin* NewL( TAny* aInitParams );
-
-        /**
-        * Destructor
-        */
-        ~CDiagDataNetworkTestPlugin();
-        
-        /**
-        *  The Data Network Test PDP Engine calls this function to provide the result of the test
-        */
-        void ReportTestResultL(CDiagResultsDatabaseItem::TResult aResult);
-        
-        /**
-        *  The Data Network Test PDP Engine calls this function to provide the progress of the test
-        */        
-        void ReportTestProgL(TInt aStep);          
-		TBool DisplayDialog(TInt &);              
-
-    public: // From CDiagTestPluginBase
-    
-   
-
-        /**
-        * @see CDiagTestPluginBase::Visible()
-        */
-        TBool IsVisible() const;
-
-        /**
-        * @see CDiagTestPluginBase::RunMode()
-        */
-        TRunMode RunMode() const;
-
-        /**
-        * @see CDiagTestPluginBase::TotalSteps()
-        */
-        TUint TotalSteps() const;
-
-        /**
-        * @see CDiagTestPluginBase::GetPluginNameL
-        */
-        HBufC* GetPluginNameL( TNameLayoutType aLayoutType ) const;
-
-        /**
-        * @see CDiagTestPluginBase::Uid
-        */
-        TUid Uid() const;
-        
-        
-        TBool ShowMessageQueryL( TInt aResourceId, TInt &aButtonId  );
-
-        
-
-    protected: // from CDiagTestPluginBase
-
-        /**
-        * C++ default constructor.
-        */
-        CDiagDataNetworkTestPlugin( CDiagPluginConstructionParam* aInitParams  );
-
-        /**
-        * Symbian OS default constructor.
-        *
-        */
-        void ConstructL();
-
-        /**
-        * Handle plug-in execution.
-        */
-        void DoRunTestL();
-
-        /**
-        * Handle stop and clean up
-        */
-        void DoStopAndCleanupL();
-
-                        
-    protected: // from CActive
-    
-        /**
-        * Handle active object completion event
-        */
-        void RunL();
-    
-        /**
-        * Handle cancel
-        */
-        void DoCancel();
-        
-    private:    // data
-
-        // pointer to Data Network test PDP Engine
-        CDiagDataNetworkTestPDPEngine *iPDPEngine;        
-    };
-
-#endif //DIAGDATANETWORKTESTPLUGIN_H
-
-// End of File
--- a/devicediagnostics/diagplugins/diagdatanetworkplugin/inc/diagdatanetworktestplugin.hrh	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-/*
-* 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:  Contains UIDs for the plugin
-*
-*/
-
-
-#ifndef DIAGDATANETWORKTESTPLUGIN_HRH
-#define DIAGDATANETWORKTESTPLUGIN_HRH
-
-
-#define _UID3 0x2000E598
-
-#define _IMPLEMENTATION_UID  0x2000E599
-
-enum TMyMenuCmdIDs
-   {
-    EDataNetworkTestSkip = 1, // do not start from 0
-    EDataNetworkTestCancel,
-    EDataNetworkTestBack,
-    EDataNetworkTestNo,
-    EDataNetworkTestYes
-   };
-   
- /** Dialog ids.  These are used in the application's resource file.
- */
-enum TDataNWNoteControlIds
-    {
-    EYBWaitNoteId = 0x100    
-    };
-    
-#endif //  DIAGDATANETWORKTESTPLUGIN_HRH
-
-//End of File
--- a/devicediagnostics/diagplugins/diagdatanetworkplugin/loc/diagdatanetworktestplugin.loc	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-/*
-* 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:  Localization strings for Diagnostics DiagDataNetworkTestPlugin.
-*
-*/
-
-
-//  LOCALISATION STRINGS
-
-// d:Plugin name in the header of the dialog that is shown when starting test
-// d:execution.
-// l:heading_pane_t1
-// r:3.2.1
-//
-#define qtn_diag_msg_title_data_network  "Data coverage test"
-
-
-// d:The body text of the dialog that is shown when starting test execution.
-// d:This provides information about running the plugin to the user.
-// l:popup_info_list_pane_t1
-// r:3.2.1
-//
-#define qtn_diag_msg_info_data_network  "The following test will check data coverage."
-
-
-// d:The title pane shown when Data network tests is running.
-// l:title_pane_t2/opt12
-// r:3.2.1
-//
-//#define qtn_diag_title_test_data_network  "Data coverage test" // LVT Change
-
-
-// d:Plugin name in the plugin view listbox.
-// l:list_single_graphic_pane_t1
-// r:3.2.1
-//
-//#define qtn_diag_lst_test_data_network  "Data coverage test" // LVT Change
-
-
-//d:Plug-in name to be displayed in test list.
-//l:list_single_graphic_heading_pane_t1_cp2
-//r:3.2.1
-//
-#define qtn_diag_lst_data_coverage  "Data coverage test"
-
-//d:Failed result text
-//l:popup_info_list_pane_t1
-//r:5.0
-//
-#define qtn_diag_conf_test_failed_data_coverage "Data coverage test"
-
-//d:Message text the phone is vibrating
-//l:popup_note_wait_window
-//r:3.2
-//
-#define qtn_diag_msg_testing_data_coverage "Testing data coverage"
-
-#define qtn_diag_softk_skip "Skip"
-        
-// End of File
-
-
--- a/devicediagnostics/diagplugins/diagdatanetworkplugin/rom_files/devdiagdatanetworktestplugin.iby	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-/*
-* 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:  Image description file for project Data network test Plugin
-*
-*/
-
-
-
-#ifndef DEVDIAGDATANETWORKTESTPLUGIN_IBY
-#define DEVDIAGDATANETWORKTESTPLUGIN_IBY
-
-#ifdef FF_DEVICE_DIAGNOSTICS_APP 
-
-#include <data_caging_paths_for_iby.hrh>
-
-ECOM_PLUGIN( devdiagdatanetworktestplugin.dll, devdiagdatanetworktestplugin.rsc )
-
-#endif
-
-#endif // DEVDIAGDATANETWORKTESTPLUGIN_IBY
--- a/devicediagnostics/diagplugins/diagdatanetworkplugin/rom_files/devdiagdatanetworktestplugin_resources.iby	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-/*
-* 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:  Image description file for resources of project Data network test Plugin
-*
-*/
-
-
-
-#ifndef DEVDIAGDATANETWORKTESTPLUGIN_RESOURCES_IBY
-#define DEVDIAGDATANETWORKTESTPLUGIN_RESOURCES_IBY
-
-#include <data_caging_paths_for_iby.hrh>
-
-data=\epoc32\data\Z\resource\devdiagdatanetworktestpluginrsc.rsc          resource\devdiagdatanetworktestpluginrsc.rsc
-
-#endif // DEVDIAGDATANETWORKTESTPLUGIN_RESOURCES_IBY
--- a/devicediagnostics/diagplugins/diagdatanetworkplugin/src/diagdatanetworktestpdpengine.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,568 +0,0 @@
-/*
-* 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:  This is the module for the Diagnostics Data Network Test PDP-Engine
-*
-*/
-
-
-// INCLUDES
-
-// Class Declaration 
-#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
-#include <logfilterandeventconstants.hrh>
-#endif
-#include "diagdatanetworktestpdpengine.h"   // CDiagDataNetworkTestPDPEngine
-
-// System includes
-#include <centralrepository.h>              // CRepository
-#include <logcli.h>                         // CLogFilter   
-#include <DiagNetworkRegStatusWatcher.h>    // CDiagNetworkRegStatusWatcher
-#include <DiagFrameworkDebug.h>             // LOGSTRING
-#include <diaglogeventeraser.h>             // CDiagLogEventEraser
-
-// User includes
-#include "diagdatanetworkprivatecrkeys.h"
-#include <devdiagdatanetworktestpluginrsc.rsg>
-#include	"diagdatanetworktestplugin.hrh"
-
-// EXTERNAL DATA STRUCTURES
-
-// EXTERNAL FUNCTION PROTOTYPES
-
-// CONSTANTS
-
-// MACROS
-
-// LOCAL CONSTANTS AND MACROS
-
-// MODULE DATA STRUCTURES
-
-// LOCAL FUNCTION PROTOTYPES
-
-// FORWARD DECLARATIONS
-
-// ============================= LOCAL FUNCTIONS ==============================
-
-// ========================= MEMBER FUNCTIONS ================================
-
-// ---------------------------------------------------------------------------
-// Symbian OS default constructor
-// ---------------------------------------------------------------------------   
-CDiagDataNetworkTestPDPEngine* CDiagDataNetworkTestPDPEngine::NewL(
-    MDiagDataNetworkTestCallBackInterface& aInterface)
-    {
-    LOGSTRING("CDiagDataNetworkTestPDPEngine::NewL()")
-    
-    CDiagDataNetworkTestPDPEngine* self = 
-                        new (ELeave) CDiagDataNetworkTestPDPEngine(aInterface);
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );
-    return self;    
-    }
-
-
-// ----------------------------------------------------------------------------
-// Standard C++ Constructor
-// NOTE that CActive(CActive::EPriorityUserInput) is called in 
-// CDiagPDPTestEngine::CDiagPDPTestEngine()
-// ----------------------------------------------------------------------------
-//
-CDiagDataNetworkTestPDPEngine::CDiagDataNetworkTestPDPEngine(
-                    MDiagDataNetworkTestCallBackInterface& aInterface) 
-    :iInterface(aInterface)
-    {
-    LOGSTRING("CDiagDataNetworkTestPDPEngine::CDiagDataNetworkTestPDPEngine()")
-    
-    // Add this object to active scheduler
-    CActiveScheduler::Add( this );         
-    }
-    
-// ---------------------------------------------------------------------------
-// Symbian OS second phase constructor
-// ---------------------------------------------------------------------------    
-void CDiagDataNetworkTestPDPEngine::ConstructL()
-    {
-    LOGSTRING("CDiagDataNetworkTestPDPEngine::ConstructL()")
-    SetStateL( EStateUnknown );
-    idialogOn = EFalse;
-	idialogDismissed = EFalse;
-    }
-    
-
-// ----------------------------------------------------------------------------
-// Destructor
-// ----------------------------------------------------------------------------    
-CDiagDataNetworkTestPDPEngine::~CDiagDataNetworkTestPDPEngine()
-    {
-    LOGSTRING("CDiagDataNetworkTestPDPEngine::~CDiagDataNetworkTestPDPEngine()")
-            
-    // call CActive::DoCancel() to stop any ongoing async request
-    Cancel();
-    
-    delete iLogEventEraser;
-    iLogEventEraser = NULL;
-    
-    delete iNetRegStatusWatcher;
-    iNetRegStatusWatcher = NULL;        
-        
-    iPrimaryAPNIapIdArray.Close();
-    iSecondaryAPNIapIdArray.Close();    
-      
-    iConnection.Close();
-    iSocketServ.Close();     
-    if ( iWaitDialog )
-    delete iWaitDialog;   
-    }
-
-
-// ----------------------------------------------------------------------------
-// This function reports the total steps of the engine class
-// ----------------------------------------------------------------------------    
-TUint CDiagDataNetworkTestPDPEngine::TotalSteps()
-    {
-    return EStateMax;
-    }    
-
-
-// ---------------------------------------------------------------------------
-// CDiagDataNetworkTestPDPEngine::RunDataNetworkTestL()
-//
-// This function is the entry point to Data Network Test.
-// --------------------------------------------------------------------------- 
-void CDiagDataNetworkTestPDPEngine::RunDataNetworkTestL()
-    {
-    LOGSTRING("CDiagDataNetworkTestPDPEngine::RunDataNetworkTestL()")
-    
-    delete iNetRegStatusWatcher;
-    iNetRegStatusWatcher = NULL;    
-    
-    iNetRegStatusWatcher = CDiagNetworkRegStatusWatcher::NewL(*this);
-    
-    // start the network registration status observer
-    // the initial network registration status wiil be obtained via
-    // callback interface InitialNetworkRegistrationStatusL()
-    SetStateL( EStateWaitForInitialNetworkRegStatus );
-    iNetRegStatusWatcher->StartObserver();
-    }
-    
-    
-// ----------------------------------------------------------------------------
-// This function is used to inform the intial network registration status
-// ----------------------------------------------------------------------------
-void CDiagDataNetworkTestPDPEngine::InitialNetworkRegistrationStatusL( 
-    const TBool& aRegistered )
-    {    
-    if( aRegistered )
-        {
-        LOGSTRING("CDiagDataNetworkTestPDPEngine::InitialNetworkRegistrationStatusL() aRegistered == ETrue")
-        
-        StartPdpEstablishmentL();
-        }
-    else
-        {
-        LOGSTRING("CDiagDataNetworkTestPDPEngine::InitialNetworkRegistrationStatusL() aRegistered == EFalse")
-        
-        // intial registration status is not registered
-        // report the test result as Failed
-        ReportResultToPluginL( EFalse );        
-        }
-    }
-    
-// ----------------------------------------------------------------------------
-// This interface is used to inform the clients of any changes in the network 
-// registration
-// ----------------------------------------------------------------------------
-void CDiagDataNetworkTestPDPEngine::NetworkRegistrationStatusChangeL( 
-    const TBool& aRegistered )
-    {
-    if(!aRegistered)
-        {
-        // device has lost network coverage, 
-        LOGSTRING("CDiagDataNetworkTestPDPEngine::NetworkRegistrationStatusChangeL() aRegistered == EFalse")
-        LOGSTRING("device has lost network coverage")
-        
-        // stop the observer and fail the test
-        iNetRegStatusWatcher->StopObserver();
-        
-        // cancel any ongoing asynchronous request
-        Cancel();
-        
-        ReportResultToPluginL(CDiagResultsDatabaseItem::EFailed);
-        }
-    else
-        {
-        // continue the test, device is still registered
-        LOGSTRING("CDiagDataNetworkTestPDPEngine::NetworkRegistrationStatusChangeL() aRegistered == ETrue")
-        }        
-    }
-    
-    
-// ----------------------------------------------------------------------------
-// This function is used to start checking if connection parameters exist
-// and then connection establishment, if necessary
-// ----------------------------------------------------------------------------  
-void CDiagDataNetworkTestPDPEngine::StartPdpEstablishmentL()
-    {
-    LOGSTRING("CDiagDataNetworkTestPDPEngine::StartPdpEstablishmentL()");
-        
-    SetStateL( EStateCheckingConnecitonParams );
-    
-    //TInt err = KErrGeneral;
-    User::LeaveIfError(iSocketServ.Connect());
-    User::LeaveIfError(iConnection.Open(iSocketServ));
-    
-    LOGSTRING("CDiagDataNetworkTestPDPEngine : socket server session opened OK ");  
-    
-    // Check for Active Connections 
-    
-    TUint connectionCount = 0;
-    TPckgBuf<TConnectionInfo> connectionInfo;
-    User::LeaveIfError(iConnection.EnumerateConnections(connectionCount));
-    LOGSTRING("iConnection.EnumerateConnections");
-    // if connection active report pass.
-    if(connectionCount > 0)
-    ReportResultToPluginL( ETrue );
-    else
-                EstablishPDPContextL();
-
-    }    
-
-// ---------------------------------------------------------------------------
-// This function is the concrete implementation of pure virtual function
-// CDiagPDPTestEngine::ReadAPNsFromCenrepL(). Here the primary and secondary APNs
-// are read from the central repository. The function sets the reference argument
-// aError as KErrNone if both APNs are found in the cenrep.
-// ---------------------------------------------------------------------------    
-    
-void CDiagDataNetworkTestPDPEngine::ReadAPNsFromCenrepL(TInt& aError)
-    {      
-    LOGSTRING("CDiagDataNetworkTestPDPEngine::ReadAPNsFromCenrepL()");
-         
-    TInt errPrimary = KErrGeneral;
-    TInt errSeondary = KErrGeneral;
-           
-    CRepository  *cenRep;
-    cenRep = CRepository::NewL( KCRUidDiagDataNetworkTestPlugin );    
-    CleanupStack::PushL( cenRep );        
-    iCenrepPrimaryAPN.Zero();
-    iCenrepSecondaryAPN.Zero();
-    errPrimary = cenRep->Get( KDiagDataNetworkTestPluginPrimaryAPN,iCenrepPrimaryAPN );
-    errSeondary = cenRep->Get( KDiagDataNetworkTestPluginSecondaryAPN,iCenrepSecondaryAPN);
-    
-    // check both APNs exist in Cenrep
-    if(errPrimary == KErrNone && errSeondary == KErrNone  )
-        {
-        aError = KErrNone;
-        }        
-    else
-        {
-        aError = KErrGeneral;
-        }
-    CleanupStack::PopAndDestroy(cenRep);  
-    cenRep = NULL; 
-    
-    
-    LOGSTRING("CDiagDataNetworkTestPDPEngine::ReadAPNsFromCenrepL()  Primary APN = ");
-    LOGTEXT(iCenrepPrimaryAPN)
-
-    LOGSTRING("CDiagDataNetworkTestPDPEngine::ReadAPNsFromCenrepL()  Secondary APN = ");
-    LOGTEXT(iCenrepSecondaryAPN)
-    }
-    
-// ----------------------------------------------------------------------------
-// CDiagDataNetworkTestPDPEngine::EstablishPDPContextL
-//
-// This the entry point to start establishing PDP context
-// ----------------------------------------------------------------------------       
-void CDiagDataNetworkTestPDPEngine::EstablishPDPContextL()
-    {   
-    LOGSTRING("CDiagDataNetworkTestPDPEngine::EstablishPDPContextL()")
- 
-        SetStateL( EStateWaitForConnectionCompletion );
-
-        iPref.SetDialogPreference(ECommDbDialogPrefPrompt);
-        //iPref.SetDialogPreference( ECommDbDialogPrefDoNotPrompt );
-        iPref.SetDirection( ECommDbConnectionDirectionOutgoing );   
-        //TConnPref iPref(TConnPref::EConnPrefCommDb);
-        iConnection.Start(iPref, iStatus);
-        SetActive();
-        TInt userResponse;
-        ShowProgressNoteL( userResponse );
-    } 
-
-
-// ----------------------------------------------------------------------------
-// CDiagDataNetworkTestPDPEngine::ShowVibrationNoteL
-//
-// Progress Note
-// ----------------------------------------------------------------------------
-
-TBool CDiagDataNetworkTestPDPEngine::ShowProgressNoteL(TInt aUserResponse)
-    {
-	if ( iWaitDialog )
-	{
-	delete iWaitDialog;
-	iWaitDialog = NULL;
-	}
-
-
-	// WAIT NOTE DIALOG
-	iWaitDialog = new (ELeave) CAknWaitDialog(
-							(REINTERPRET_CAST(CEikDialog**, &iWaitDialog)), 
-							ETrue);
-
-	iWaitDialog->PrepareLC(R_DATANW_PLUGIN_WAIT_NOTE);
-	iWaitDialog->SetCallback(this);
-	TBool isDialogDismissedByUser = iWaitDialog->RunLD();
-	idialogOn = ETrue;
-	return isDialogDismissedByUser;
-    }
-    
-    
-//*********************************************************
-//*********************************************************
-// CallBack from AKnWaitDialog when Cancel is pressed
-//*********************************************************
-//*********************************************************
-
-void CDiagDataNetworkTestPDPEngine::DialogDismissedL( TInt aButtonId )
-{
-	LOGSTRING2("CDiagDataNetworkTestPDPEngine::DialogDismissedL() = %d",aButtonId);
-
-	 
-	if(aButtonId == EDataNetworkTestCancel)
-	{
-	
-	
-	if (idialogOn)
-		{
-		iConnection.Stop(RConnection::EStopAuthoritative);
-	//	delete iWaitDilaog;
-	//	iWaitDialog = NULL;
-		idialogOn = EFalse; 
-		idialogDismissed = ETrue;
-		}
-		
-	 TInt   cancelButtonId;
-     TBool  cancelResult = EFalse;
-     iPrevState = iEngineState;
-     SetStateL(EStateWaitDialogOn);
-	 cancelResult= iInterface.DisplayDialog(cancelButtonId);
-	 
-	 iWaitDialog = NULL;
-	 
-	 if ( !cancelResult )
-	 {
-	 SetStateL(iPrevState);
-	 return;
-	 }
-	 
-	if(cancelButtonId == -2)
-		{
-		
-		SetStateL(EStateCancelTest);
-		TRequestStatus* status = &iStatus;
-		// Complete own request
-		User::RequestComplete( status, KErrNone );
-		SetActive();
-		
-		//ReportResultToPluginL( CDiagResultsDatabaseItem::ECancelled );
-		//HandleOngoingConnectionRequestL();
-		
-		}
-     else
-		{	 
-		SetStateL(EStateDialogDismissed);
-		TRequestStatus* status = &iStatus;
-		// since this is a Cancel to start the test again
-		// lets start believing that the DialogDismiss Cancel was never pressed
-		idialogDismissed = EFalse;
-		// Complete own request
-		User::RequestComplete( status, KErrNone );
-		SetActive();
-		}
-	 }
-}
-// ---------------------------------------------------------------------------
-// CDiagDataNetworkTestPDPEngine::RunL()
-//
-// Concrete implementation of CActive::DoCancel(). This function handles the asynchronous events.
-// ---------------------------------------------------------------------------     
-void CDiagDataNetworkTestPDPEngine::RunL()
-    {
-    switch(iEngineState)
-        {   
-        case EStateWaitForConnectionCompletion:
-            {
-            HandleOngoingConnectionRequestL();
-            }
-            break;
-        case EStateWaitDialogOn:
-        	break;
-        case EStateCancelTest:
-        	ReportResultToPluginL( CDiagResultsDatabaseItem::ECancelled );
-        	break;
-        case EStateDialogDismissed:
-        	EstablishPDPContextL();
-        	break;
-        default:
-            break;
-        };      
-    LOGSTRING("CDiagDataNetworkTestPDPEngine::RunL()");  
-    }   
-    
-// ---------------------------------------------------------------------------
-// CDiagDataNetworkTestPDPEngine::DoCancel()
-//
-// This function handles cancel request from CActive
-// ---------------------------------------------------------------------------     
-void CDiagDataNetworkTestPDPEngine::DoCancel()
-    {
-    if( iNetRegStatusWatcher )
-        {        
-        iNetRegStatusWatcher->StopObserver();
-        }
-    if (iEngineState != EStateCancelTest)    
-    iConnection.Stop();
-    }
-    
-  
-// ---------------------------------------------------------------------------
-// CDiagDataNetworkTestPDPEngine::HandleOngoingConnectionRequestL()
-//
-// This function handles ongoing asynchronous connection request and issues
-// new request if required.
-// ---------------------------------------------------------------------------     
-void CDiagDataNetworkTestPDPEngine::HandleOngoingConnectionRequestL()
-    {
-    LOGSTRING("CDiagDataNetworkTestPDPEngine::HandleOngoingConnectionRequestL()")
-    
-    if( iStatus == KErrNone || iStatus == KErrAlreadyExists )
-        {        
-        // connection established, report SUCCESS to the plugin        
-        LOGSTRING("Connection established")
-        LOGSTRING2("current IAP id = %d", iIAPiddefault)
-        StartLogEraseOperationL( ETrue ); // ETrue means the test has Passed
-        }
-    else
-        ReportResultToPluginL( EFalse );
-      
-    }    
-    
-// ----------------------------------------------------------------------------
-// This function starts the log event erase process
-// ----------------------------------------------------------------------------    
-void CDiagDataNetworkTestPDPEngine::StartLogEraseOperationL(TBool aTestResult)
-    {
-    LOGSTRING("CDiagDataNetworkTestPDPEngine::StartLogEraseOperationL()")
-
-    iTestResult = aTestResult;
-    SetStateL( EStateWaitForLogErase );
-    
-    TUid PacketEventType = { KLogPacketDataEventType };
-    
-    delete iLogEventEraser;
-    iLogEventEraser = NULL;
-    iLogEventEraser = CDiagLogEventEraser::NewL(*this);
-    
-    CLogFilter& LogFilter = iLogEventEraser->Filter();
-    LogFilter.SetEventType(PacketEventType);
-    LogFilter.SetStartTime(iStartTime);
-    
-    // start the log erasing process
-    iLogEventEraser->StartAsyncEraseLogsL();
-    }
-    
-// ----------------------------------------------------------------------------    
-// This callback interface is used to determine if the log event is to be 
-// deleted or not
-// ----------------------------------------------------------------------------
-TBool CDiagDataNetworkTestPDPEngine::IsEventToBeDeleted( const CLogEvent& aEvent )
-    {
-    LOGSTRING("CDiagDataNetworkTestPDPEngine::IsEventToBeDeleted()")
-    
-    TBool isEntryDeleted = EFalse;
-    
-    TBuf<KCommsDbSvrMaxFieldLength> eventAPNName;
-    eventAPNName.Zero();
-    eventAPNName.Copy(aEvent.RemoteParty()); 
-    
-    LOGSTRING("Log event APN name = ")  
-    LOGTEXT(eventAPNName)  
-    
-    if( (eventAPNName.Compare( iCenrepPrimaryAPN )==0) || 
-        (eventAPNName.Compare( iCenrepSecondaryAPN )==0) )    
-        {
-        // APN is matched, delete the log event entry
-        isEntryDeleted = ETrue;
-                 
-        }
-
-    LOGSTRING2("Log event deleted = %d", isEntryDeleted )        
-    return isEntryDeleted;      
-    }
-
-
-// ----------------------------------------------------------------------------    
-// This callback interface is used to notify that log events are erased
-// ----------------------------------------------------------------------------
-void CDiagDataNetworkTestPDPEngine::CompleteEventEraseL( TInt /*aError*/)
-    {
-    ReportResultToPluginL(iTestResult);
-    }
-
-
-// ---------------------------------------------------------------------------
-// This function is sets the state of the engine and also reports the progress
-// step
-// --------------------------------------------------------------------------- 
-void CDiagDataNetworkTestPDPEngine::SetStateL(TPDPEngineState aState)
-    {
-    LOGSTRING2("CDiagDataNetworkTestPDPEngine::SetStateL(), aState = %d", aState)
-    
-    iEngineState = aState;
-    iInterface.ReportTestProgL( iEngineState );
-    }
-
-// ---------------------------------------------------------------------------
-// This function is used to report the result of the test back to the plug-in
-// class
-// --------------------------------------------------------------------------- 
-void CDiagDataNetworkTestPDPEngine::ReportResultToPluginL(TBool aResult)
-    {
-    LOGSTRING2("CDiagDataNetworkTestPDPEngine::ReportResultToPluginL(), aResult = %d", aResult)
-    // Remove the waitDialog
-    if(idialogOn)
-    iWaitDialog->ProcessFinishedL(); 
-    
-    // Dialog dismissed by cancel
-    if (idialogDismissed)
-    {
-    	iInterface.ReportTestResultL( CDiagResultsDatabaseItem::ESkipped );
-    	return;
-    }
-    if(aResult)
-        {
-        iInterface.ReportTestResultL( CDiagResultsDatabaseItem::ESuccess );
-        }        
-    else
-        {
-        iInterface.ReportTestResultL( CDiagResultsDatabaseItem::EFailed ); 
-        }               
-    }
-
-
-// End of File
-
--- a/devicediagnostics/diagplugins/diagdatanetworkplugin/src/diagdatanetworktestplugin.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,380 +0,0 @@
-/*
-* 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:  This is the class module for the Diagnostics Data Network Test 
-*                 plug-in class.
-*
-*/
-
-
-// INCLUDE FILES
-
-// Class Declaration
-#include "diagdatanetworktestplugin.h"      // CDiagDataNetworkTestPlugin
-
-// System includes
-#include <centralrepository.h> 
-#include <StringLoader.h>                   // StringLoader
-#include <devdiagdatanetworktestpluginrsc.rsg> // Resources
-#include <DiagFrameworkDebug.h>             // LOGSTRING
-#include "diagdatanetworkprivatecrkeys.h"
-
-// User includes
-#include "diagdatanetworktestplugin.hrh"    // UIDs
-#include "diagdatanetworktestpdpengine.h"   // CDiagDataNetworkTestPDPEngine
-// ADO & Platformization Changes
-#include <DiagFrameworkDebug.h>                     // debug macros
-#include <DiagEngineCommon.h>                       // MDiagEngineCommon
-#include <DiagCommonDialog.h> 
-#include <AknDialog.h> // ADO & Platformization Changes
-#include <aknmessagequerydialog.h>  // ADO & Platformization Changes
-#include <DiagTestExecParam.h>          // TDiagTestExecParam
-#include <DiagPluginExecPlan.h>
-#include <DiagExecPlanEntry.h>
-
-// EXTERNAL DATA STRUCTURES
-
-// EXTERNAL FUNCTION PROTOTYPES
-
-// CONSTANTS
-const TUid KDiagDataNetworkTestPluginUid = { _IMPLEMENTATION_UID };
-_LIT( KDiagDataNetworkTestPluginResourceFileName, "z:DevDiagDataNetworkTestPluginRsc.rsc" );
-
-// MACROS
-
-// LOCAL CONSTANTS AND MACROS
-
-// MODULE DATA STRUCTURES
-
-// LOCAL FUNCTION PROTOTYPES
-
-// FORWARD DECLARATIONS
-
-// ============================= LOCAL FUNCTIONS ==============================
-
-// ========================= MEMBER FUNCTIONS ================================
-
-// ----------------------------------------------------------------------------
-// CDiagDataNetworkTestPlugin::CDiagDataNetworkTestPlugin()
-//
-// Constructor
-// ----------------------------------------------------------------------------
-//
-CDiagDataNetworkTestPlugin::CDiagDataNetworkTestPlugin( CDiagPluginConstructionParam* aParam )
-    :   CDiagTestPluginBase( aParam )
-    {
-    LOGSTRING("CDiagDataNetworkTestPlugin::CDiagDataNetworkTestPlugin()")
-    }
-
-
-// ---------------------------------------------------------------------------
-// CDiagDataNetworkTestPlugin::NewL()
-//
-// Symbian OS default constructor
-// ---------------------------------------------------------------------------
-MDiagPlugin* CDiagDataNetworkTestPlugin::NewL( TAny* aInitParams )
-    {
-    LOGSTRING("CDiagDataNetworkTestPlugin::NewL()")
-    
-    /*CRepository  *cRep;
-    TInt val;
-    cRep = CRepository::NewL( KCRUidDiagDataNetworkTestPlugin );    
-    CleanupStack::PushL( cRep );  
-    TInt err = cRep->Get( KDiagDataNetworkTestPluginPrimaryAPN,val );
-    CleanupStack::PopAndDestroy(cRep);
-    
-
-    return NULL;*/
-    
-    if ( !aInitParams )
-        {
-        User::Leave ( KErrArgument );
-        }
-
-    CleanupStack::PushL( aInitParams );
-    CDiagPluginConstructionParam* param = 
-            static_cast<CDiagPluginConstructionParam*>(aInitParams);
-                
-    CDiagDataNetworkTestPlugin* self = new( ELeave ) CDiagDataNetworkTestPlugin (param);
-    CleanupStack::PushL( self );
-    
-    self->ConstructL();
-    
-    CleanupStack::Pop(self);
-    CleanupStack::Pop( aInitParams );
-    return self;
-    }
-
-
-
-// ---------------------------------------------------------------------------
-// CDiagDataNetworkTestPlugin::ConstructL()
-//
-// Symbian OS two-phased constructor
-// ---------------------------------------------------------------------------
-void CDiagDataNetworkTestPlugin::ConstructL()
-    {
-    LOGSTRING("CDiagDataNetworkTestPlugin::ConstructL()")
-    BaseConstructL ( KDiagDataNetworkTestPluginResourceFileName );
-    }
-
-
-// ----------------------------------------------------------------------------
-// CDiagDataNetworkTestPlugin::~CDiagDataNetworkTestPlugin
-//
-// Destructor
-// ----------------------------------------------------------------------------
-CDiagDataNetworkTestPlugin::~CDiagDataNetworkTestPlugin()
-    {
-    LOGSTRING("CDiagDataNetworkTestPlugin::~CDiagDataNetworkTestPlugin()")
-    
-    // StopAndCleanupL() called by base class destructor, whcih calls
-    //  Cancel()    -> DoCancel()
-    //  DoStopAndCleanupL()
-    // Not much to do here.
-    }
-
-
-// ---------------------------------------------------------------------------
-// From MDiagPlugin
-// CDiagDataNetworkTestPlugin::IsVisible()
-// ---------------------------------------------------------------------------
-
-TBool CDiagDataNetworkTestPlugin::IsVisible() const
-    {
-    return ETrue;
-    }
-   
-
-// ---------------------------------------------------------------------------
-// From MDiagTestPlugin
-// CDiagDataNetworkTestPlugin::RunMode()
-// ---------------------------------------------------------------------------
-MDiagTestPlugin::TRunMode CDiagDataNetworkTestPlugin::RunMode() const
-    {
-    return EAutomatic;
-    }
-
-// ---------------------------------------------------------------------------
-// From MDiagTestPlugin
-// CDiagDataNetworkTestPlugin::DoStopAndCleanupL()
-// ---------------------------------------------------------------------------
-void CDiagDataNetworkTestPlugin::DoStopAndCleanupL() 
-    {
-    delete iPDPEngine;
-    iPDPEngine = NULL;        
-    }
-
-// ---------------------------------------------------------------------------
-// From MDiagTestPlugin
-// CDiagDataNetworkTestPlugin::TotalSteps()
-// ---------------------------------------------------------------------------
-TUint CDiagDataNetworkTestPlugin::TotalSteps() const
-    {
-    return (CDiagDataNetworkTestPDPEngine::TotalSteps());
-    }
-
-
-// ---------------------------------------------------------------------------
-// From MDiagPlugin
-// CDiagDataNetworkTestPlugin::GetPluginNameL
-// ---------------------------------------------------------------------------
-HBufC* CDiagDataNetworkTestPlugin::GetPluginNameL( TNameLayoutType aLayoutType ) const
-    {
-    switch ( aLayoutType )
-        {
-        case ENameLayoutHeadingPane:
-            return StringLoader::LoadL( R_DIAG_DATA_NETWORK_TEST_HEADING_PANE );
-            
-        case ENameLayoutPopupInfoPane:
-            return StringLoader::LoadL( R_DIAG_DATA_NETWORK_TEST_INFO_PANE );            
-
-        case ENameLayoutTitlePane:
-            return StringLoader::LoadL( R_DIAG_DATA_NETWORK_TEST_TITLE_PANE );
-            
-        case ENameLayoutListSingleGraphic:
-            return StringLoader::LoadL( R_DIAG_DATA_NETWORK_TEST_SINGLE_GRAPHIC  );  
-                    
-        case ENameLayoutListSingle:
-            return StringLoader::LoadL ( R_DIAG_DATA_NETWORK_TEST_SINGLE );
-
-        default:
-            LOGSTRING2( "CDiagDataNetworkTestPlugin::GetPluginNameL: "
-                L"ERROR: Unsupported layout type %d", aLayoutType )
-            __ASSERT_DEBUG( 0, User::Invariant() );
-            return StringLoader::LoadL ( R_DIAG_DATA_NETWORK_TEST_SINGLE );
-        }
-    }
-
-
-// ---------------------------------------------------------------------------
-// From MDiagPlugin
-// CDiagDataNetworkTestPlugin::Uid
-// ---------------------------------------------------------------------------
-TUid CDiagDataNetworkTestPlugin::Uid() const
-    {
-    return KDiagDataNetworkTestPluginUid;
-    }
-    
-   
-// ---------------------------------------------------------------------------
-// From CActive
-// CDiagDataNetworkTestPlugin::RunL
-// ---------------------------------------------------------------------------
-void CDiagDataNetworkTestPlugin::RunL()
-    {
-    // nothing to implement here
-    }    
-
-// ---------------------------------------------------------------------------
-// From CActive
-// CDiagDataNetworkTestPlugin::DoCancel
-// ---------------------------------------------------------------------------
-void CDiagDataNetworkTestPlugin::DoCancel()
-    {
-    // nothing to implement here   
-    }
-
-// ---------------------------------------------------------------------------
-// From CDiagTestPluginBase
-// CDiagDataNetworkTestPlugin::DoRunTestL()
-// ---------------------------------------------------------------------------
-void CDiagDataNetworkTestPlugin::DoRunTestL()
-    {
-    ASSERT( iPDPEngine == NULL );
-
-    delete iPDPEngine;
-    iPDPEngine = NULL;
-    
-     // ADO & Platformization Changes
-     
-    if(!(ExecutionParam().Engine().ExecutionPlanL().CurrentExecutionItem().AsDependency()))
-    {
-     
-    TInt aButtonId;
-    
-    ShowMessageQueryL(R_DIAG_MESSAGEQUERY_TITLE_DATANETWORK,aButtonId);
-      
-    if(aButtonId == EDataNetworkTestCancel)
-    	{
-    	CompleteTestL( CDiagResultsDatabaseItem::ESkipped );
-        return;
-    	}
-    
-    if(aButtonId == EDataNetworkTestSkip)
-    	{
-		TInt confirmResult = 0;
-            
-        CAknDialog* dlg = ExecutionParam().Engine().
-        CreateCommonDialogLC( EDiagCommonDialogConfirmSkipAll, NULL );
-    
-        if ( !RunWaitingDialogL( dlg, confirmResult ) )
-            {
-            return;
-            }
-        
-        if (confirmResult)
-            {
-            return;
-            }
-    	}
-    	
-    	}
-    // Changes Ends
-    iPDPEngine = CDiagDataNetworkTestPDPEngine::NewL(*this);
-       
-    // Run the Data Network Test
-    iPDPEngine->RunDataNetworkTestL();
-    }
-    
-
-TBool CDiagDataNetworkTestPlugin::DisplayDialog(TInt& aUserResponse)
-{
-
-	// set softkey for single execution
-	if ( !SinglePluginExecution() )
-	{
-		// Create common dialog by invoking Engine
-		CAknDialog* dlg = ExecutionParam().Engine().
-		CreateCommonDialogLC( EDiagCommonDialogConfirmCancelAll, NULL );
-
-		return RunWaitingDialogL( dlg, aUserResponse );
-	}	
-	else 
-	{
-		//CompleteTestL( CDiagResultsDatabaseItem::ECancelled );	 //commented for NTEI-7EZ96S
-		return EFalse;
-	}
-
-}
-// ---------------------------------------------------------------------------
-// CDiagDataNetworkTestPlugin::ReportTestResultL()
-// ---------------------------------------------------------------------------    
-void CDiagDataNetworkTestPlugin::ReportTestResultL( CDiagResultsDatabaseItem::TResult aResult )
-    {
-    // before returning the test result to the Diagnostics interface,
-    // delete the engine
-    delete iPDPEngine;
-    iPDPEngine = NULL;        
-                   
-    CompleteTestL( aResult );
-    }
-    
-// ---------------------------------------------------------------------------
-// CDiagDataNetworkTestPlugin::ReportTestProgL()
-// ---------------------------------------------------------------------------      
-void CDiagDataNetworkTestPlugin::ReportTestProgL(TInt aStep)
-    {
-    ReportTestProgressL( aStep );
-    }
-    // ADO & Platformization Changes
-TBool CDiagDataNetworkTestPlugin::ShowMessageQueryL( TInt aResourceId, TInt &aButtonId  )
-    {
-    LOGSTRING( "CDiagAudioPlugin::ShowMessageQueryL IN" )
-    CAknMessageQueryDialog* dlg    = NULL;
-    TBool                   result = EFalse;
-
-    // Create CAknMessageQueryDialog instance
-    dlg = new ( ELeave ) CAknMessageQueryDialog();
-
-    dlg->PrepareLC( aResourceId );
-     
-    CEikButtonGroupContainer& cba = dlg->ButtonGroupContainer();
-
-        switch ( aResourceId )
-            {
-            case R_DIAG_MESSAGEQUERY_TITLE_DATANETWORK: 
-         	   {
-            	if ( SinglePluginExecution() )
-        			{
-        			cba.SetCommandSetL( R_CBA_DATANETWORK_SINGLE_EXECUTION );		
-        			}
-        	   else 
-        	   		{	
-                	cba.SetCommandSetL( R_CBA_DATANETWORK_GROUP_EXECUTION );		
-                	}
-        		}
-                break;
-
-            default:
-                break;
-            }
-        	
-    result = RunWaitingDialogL( dlg, aButtonId );
-
-    LOGSTRING3( "CDiagAudioPlugin::ShowMessageQueryL() OUT aButtonId=%d result=%d", aButtonId, result );
-    return result;
-    }
-
-// End of File
-
--- a/devicediagnostics/diagplugins/diagdatanetworkplugin/src/diagdatanetworktestpluginimplementationtable.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-/*
-* 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:  ECOM proxy table for DiagDataNetworkTestPlugin
-*
-*/
-
-
-// INCLUDES
-#include <e32std.h>
-#include <implementationproxy.h>
-
-#include "diagdatanetworktestplugin.hrh"  // UIDs
-#include "diagdatanetworktestplugin.h"    // CDiagDataNetworkTestPlugin
-
-
-
-// CONSTANTS 
-const TImplementationProxy KDiagDataNetworkTestPluginImplementationTable[] = 
-	{
-	IMPLEMENTATION_PROXY_ENTRY( _IMPLEMENTATION_UID,
-	                            CDiagDataNetworkTestPlugin::NewL ),
-	};
-
-
-// ---------------------------------------------------------------------------
-// ImplementationGroupProxy
-// 
-// Gate/factory function
-// ---------------------------------------------------------------------------
-//
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy(TInt& aTableCount )
-	{
-	aTableCount = sizeof( KDiagDataNetworkTestPluginImplementationTable ) 
-        / sizeof( TImplementationProxy );
-	return KDiagDataNetworkTestPluginImplementationTable;
-	}
-
-
-
-// End of File
--- a/devicediagnostics/diagplugins/diagearpieceplugin/cenrep_files/cleanup.bat	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-rem
-rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-rem All rights reserved.
-rem This component and the accompanying materials are made available
-rem under the terms of "Eclipse Public License v1.0"
-rem which accompanies this distribution, and is available
-rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
-rem
-rem Initial Contributors:
-rem Nokia Corporation - initial contribution.
-rem
-rem Contributors:
-rem
-rem Description:
-rem
-
-rd /s /q output
--- a/devicediagnostics/diagplugins/diagearpieceplugin/cenrep_files/generate_ini.bat	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-rem
-rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-rem All rights reserved.
-rem This component and the accompanying materials are made available
-rem under the terms of "Eclipse Public License v1.0"
-rem which accompanies this distribution, and is available
-rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
-rem
-rem Initial Contributors:
-rem Nokia Corporation - initial contribution.
-rem
-rem Contributors:
-rem
-rem Description:
-rem
-
-@set XLS_FILE=keys_DiagAudioRecorderPlugin.xls
-@set INI_FILE=2000E58C.txt
-@set RELEASE=3.2
-
-@set CENREP_DIR=%CD%
-@cd \epoc32\tools\cenrep
-
-cenrep.pl -o "%CENREP_DIR%\output" -l "%CENREP_DIR%\%XLS_FILE%" -p %RELEASE%
-copy "%CENREP_DIR%\output\inifiles\%INI_FILE%" \epoc32\RELEASE\winscw\udeb\Z\private\10202be9\
-copy "%CENREP_DIR%\output\inifiles\%INI_FILE%" \epoc32\RELEASE\winscw\udeb\Z\private\10202be9\
-copy "%CENREP_DIR%\output\inifiles\%INI_FILE%" \epoc32\RELEASE\winscw\urel\Z\private\10202be9\
-copy "%CENREP_DIR%\output\inifiles\%INI_FILE%" \epoc32\RELEASE\armv5\udeb\Z\private\10202be9\
-copy "%CENREP_DIR%\output\inifiles\%INI_FILE%" \epoc32\RELEASE\armv5\urel\Z\private\10202be9\
-copy "%CENREP_DIR%\output\inifiles\%INI_FILE%" \epoc32\data\Z\private\10202be9\
-@cd "%CENREP_DIR%"
-
-@echo ================= done. Hit any key to continue ==================
-@pause
Binary file devicediagnostics/diagplugins/diagearpieceplugin/cenrep_files/keys_diagaudiorecorderplugin.xls has changed
Binary file devicediagnostics/diagplugins/diagearpieceplugin/conf/diagaudiorecorderplugin.confml has changed
Binary file devicediagnostics/diagplugins/diagearpieceplugin/conf/diagaudiorecorderplugin_2000E58C.crml has changed
--- a/devicediagnostics/diagplugins/diagearpieceplugin/data/devdiagaudioplugin.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-/*
-* 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:  ECOM plugin resource file for Audio Plugin
-*
-*/
-
-#include <registryinfo.rh>
-#include "diagaudioplugin.hrh"
-
-RESOURCE REGISTRY_INFO theInfo
-    {
-    dll_uid     = 0x2000E58C;
-    interfaces  =
-        {
-        INTERFACE_INFO
-            {
-            interface_uid   = 0x2000AFEB;
-            implementations =
-                {
-                IMPLEMENTATION_INFO
-                    {
-                    implementation_uid  = DIAG_AUDIO_PLUGIN_UID;
-                    version_no          = 1;
-                    display_name        = "Audio Plugin";
-                    default_data        = "0x2000E569"; //HW suite";
-                    opaque_data         = "<diagplugininfo>"
-                                          "<order number=\"20\"/>"
-                                          "</diagplugininfo>";
-                    }
-                };
-            }
-        };
-    }
-
-
-// End of File
--- a/devicediagnostics/diagplugins/diagearpieceplugin/data/devdiagaudiopluginrsc.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,536 +0,0 @@
-/*
-* 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:  Resource file for DiagAudioPlugin
-*
-*/
-
-
-//  RESOURCE IDENTIFIER
-NAME    ADIO // 4 letter ID
-
-//  INCLUDES
-#include    <eikon.rh>
-#include    "diagaudioplugin.hrh"
-#include    <diagaudioplugin.loc>
-#include    <diagplugincommon.loc>
-
-#include    <avkon.loc>
-#include    <avkon.mbg>
-#include    <avkon.rsg>
-#include    <avkon.rh>
-
-#include    <AvkonIcons.hrh>
-#include    <bldvariant.hrh>
-#include    <data_caging_paths_strings.hrh>
-#include    <eikcore.rsg>
-#include    <eikon.rsg>
-#include    <uikon.rh>
-
-// CONSTANTS
-
-// Camera Plugin : Bitmap File for Icons 
-#define BMPFILE_NAME    "\\resource\\apps\\avkon2.mbm"
-
-
-// ========================== RESOURCE DEFINITIONS ===========================
-// Resource Identifiers
-RESOURCE RSS_SIGNATURE { }
-RESOURCE TBUF { buf="ADIO"; }
-
-//----------------------------------------------------
-// r_diag_audio_plugin_list_single_graphic_heading_pane
-// Audio Plugin caption 
-//----------------------------------------------------
-//
-RESOURCE TBUF r_diag_audio_plugin_list_single_graphic_heading_pane
-    {
-    buf = qtn_diag_lst_earpiece;
-    }
-
-//----------------------------------------------------
-// r_diag_audio_plugin_list_single_graphic_pane
-// Audio Plugin caption 
-//----------------------------------------------------
-//
-RESOURCE TBUF r_diag_audio_plugin_list_single_graphic_pane
-    {
-    buf = qtn_diag_lst_test_earpiece;
-    }
-
-//----------------------------------------------------
-// r_diag_audio_plugin_title_pane
-// Audio Plugin caption 
-//----------------------------------------------------
-//
-RESOURCE TBUF r_diag_audio_plugin_title_pane
-    {
-    buf = qtn_diag_title_test_earpiece;
-    }
-
-//----------------------------------------------------
-// r_diag_audio_plugin_popup_info_list_pane
-// Audio Plugin caption 
-//----------------------------------------------------
-//
-RESOURCE TBUF r_diag_audio_plugin_popup_info_list_pane
-    {
-    buf = qtn_diag_conf_test_failed_earpiece;
-    }
-
-//----------------------------------------------------
-// r_diag_audio_plugin_heading_pane
-// Audio Plugin caption 
-//----------------------------------------------------
-//
-RESOURCE TBUF r_diag_audio_plugin_heading_pane
-    {
-    buf = qtn_diag_msg_title_earpiece;
-    }
-
-//----------------------------------------------------
-// r_diag_audio_softkeys_skip_cancel__ok
-// CBA for SKIP_CANCEL__OK
-//----------------------------------------------------
-//
-RESOURCE CBA r_diag_audio_softkeys_skip_cancel__ok
-{
-    buttons = 
-    {
-        CBA_BUTTON 
-        { 
-            id  = ECBACmdSkip;          // .hrh
-            txt = qtn_diag_softk_skip;  // .rls or .loc
-        },
-        CBA_BUTTON 
-        { 
-            id  = ECBACmdCancel;       // .hrh
-            txt = text_softkey_cancel; // .rls or .loc
-        }, 
-        CBA_BUTTON 
-        { 
-            id  = EAknSoftkeyOk; // in order to Exit
-            txt = text_softkey_ok;
-        }
-    };
-}
-
-//----------------------------------------------------
-// r_diag_audio_softkeys_ok_cancel
-// CBA for OK_CANCEL
-//----------------------------------------------------
-//
-RESOURCE CBA r_diag_audio_softkeys_ok_cancel
-{
-    buttons = 
-    {
-        CBA_BUTTON 
-        { 
-            id  = EAknSoftkeyOk; // in order to Exit
-            txt = text_softkey_ok;
-        },
-        CBA_BUTTON 
-        { 
-            id  = ECBACmdCancel;       // .hrh
-            txt = text_softkey_cancel; // .rls or .loc
-        } 
-
-    };
-}
-
-//----------------------------------------------------
-// r_diag_audio_softkeys_ok_skip
-// CBA for OK_CANCEL
-//----------------------------------------------------
-//
-RESOURCE CBA r_diag_audio_softkeys_ok_skip
-{
-    buttons = 
-    {
-        CBA_BUTTON 
-        { 
-            id  = EAknSoftkeyOk; // in order to Exit
-            txt = text_softkey_ok;
-        },
-        CBA_BUTTON 
-        { 
-            id  = ECBACmdSkip;       // .hrh
-            txt = qtn_diag_softk_skip; // .rls or .loc
-        } 
-
-    };
-}
-
-//----------------------------------------------------
-// r_diag_audio_softkeys_skip_cancel__start
-// CBA for SKIP_CANCEL__START
-//----------------------------------------------------
-//
-RESOURCE CBA r_diag_audio_softkeys_skip_cancel__start
-{
-    buttons = 
-    {
-        CBA_BUTTON 
-        { 
-            id  = ECBACmdSkip;          // .hrh
-            txt = qtn_diag_softk_skip;  // .rls or .loc
-        },
-        CBA_BUTTON 
-        { 
-            id  = ECBACmdCancel;       // .hrh
-            txt = text_softkey_cancel; // .rls or .loc
-        }, 
-        CBA_BUTTON 
-        { 
-            id  = EAknSoftkeyOk;
-            txt = qtn_msk_record;
-        }
-    };
-}
-
-//----------------------------------------------------
-// r_diag_audio_softkeys_start_cancel
-// CBA for SRART_CANCEL
-//----------------------------------------------------
-//
-RESOURCE CBA r_diag_audio_softkeys_start_cancel
-{
-    buttons = 
-    {
-       CBA_BUTTON 
-        { 
-            id  = EAknSoftkeyOk;
-            txt = qtn_msk_record;
-        },
-
-        CBA_BUTTON 
-        { 
-            id  = ECBACmdCancel;       // .hrh
-            txt = text_softkey_cancel; // .rls or .loc
-        }
-    };
-}
-
-//----------------------------------------------------
-// r_diag_audio_softkeys_skip_cancel__play
-// CBA for SKIP_CANCEL__PLAY
-//----------------------------------------------------
-//
-RESOURCE CBA r_diag_audio_softkeys_skip_cancel__play
-{
-    buttons = 
-    {
-        CBA_BUTTON 
-        { 
-            id  = ECBACmdSkip;          // .hrh
-            txt = qtn_diag_softk_skip;  // .rls or .loc
-	},
-        CBA_BUTTON 
-	{ 
-            id  = ECBACmdCancel;      // .hrh
-            txt = text_softkey_cancel;// .rls or .loc
-	}, 
-	CBA_BUTTON 
-	{ 
-            id  = EAknSoftkeyOk; 
-            txt = qtn_msk_play;
-	}
-    };
-}
-
-//----------------------------------------------------
-// r_diag_audio_softkeys_play_cancel
-// CBA for PLAY_CANCEL__PLAY
-//----------------------------------------------------
-//
-RESOURCE CBA r_diag_audio_softkeys_play_cancel
-{
-    buttons = 
-    {
-	CBA_BUTTON 
-	{ 
-            id  = EAknSoftkeyOk; 
-            txt = qtn_msk_play;
-	},
-
-        CBA_BUTTON 
-	{ 
-            id  = ECBACmdCancel;      // .hrh
-            txt = text_softkey_cancel;// .rls or .loc
-	}
-    };
-}
-
-//----------------------------------------------------
-// r_diag_audio_softkeys_skip_cancel__stop
-// CBA for SKIP_CANCEL__STOP
-//----------------------------------------------------
-//
-RESOURCE CBA r_diag_audio_softkeys_skip_cancel__stop
-{
-    buttons = 
-    {
-        CBA_BUTTON 
-        { 
-            id  = ECBACmdSkip;          // .hrh
-            txt = qtn_diag_softk_skip;  // .rls or .loc
-	},
-        CBA_BUTTON 
-	{ 
-            id  = ECBACmdCancel;       // .hrh
-            txt = text_softkey_cancel; // .rls or .loc
-	}, 
-	CBA_BUTTON 
-	{ 
-            id  = EAknSoftkeyOk; 
-            txt = qtn_msk_stop;
-	}
-    };
-}
-
-//----------------------------------------------------
-// r_diag_audio_softkeys_stop_cancel
-// CBA for STOP_CANCEL
-//----------------------------------------------------
-//
-RESOURCE CBA r_diag_audio_softkeys_stop_cancel
-{
-    buttons = 
-    {
-	CBA_BUTTON 
-	{ 
-            id  = EAknSoftkeyOk; 
-            txt = qtn_msk_stop;
-	},
-
-        CBA_BUTTON 
-	{ 
-            id  = EEikBidCancel; //ECBACmdCancel;       // .hrh
-            txt = text_softkey_cancel; // .rls or .loc
-	}
-    };
-}
-
-// ---------------------------------------------------------------------------
-// r_messagequery_title
-// The dialog shown when the plugin begins execution.
-// ---------------------------------------------------------------------------
-//
-RESOURCE DIALOG r_messagequery_title
-    {
-     flags   = EGeneralQueryFlags | 
-               EEikDialogFlagNoBorder |
-               EEikDialogFlagNoTitleBar;
-
-     buttons =  r_diag_audio_softkeys_ok_cancel;
-
-     items=
-         {
-         DLG_LINE
-             {
-             type    = EAknCtPopupHeadingPane;
-             id      = EAknMessageQueryHeaderId;
-             control = AVKON_HEADING
-                 {              
-                    //label         = qtn_diag_msg_title_audio;
-                    label         = qtn_diag_msg_title_earpiece;
-                    headinglayout = R_AVKON_WML_SIGN_QUERY_HEADING_PANE;
-                 };
-             },
-         DLG_LINE
-             {
-             type    = EAknCtMessageQuery;
-             id      = EAknMessageQueryContentId;
-             control = AVKON_MESSAGE_QUERY
-                 {
-                 message = qtn_diag_msg_info_earpiece;
-                 };
-             }
-         };
-     }
-
-// ---------------------------------------------------------------------------
-// r_messagequery_ask_record
-// The dialog shown before start recording
-// ---------------------------------------------------------------------------
-//
-RESOURCE DIALOG r_messagequery_ask_record
-    {
-     flags   = EGeneralQueryFlags | 
-               EEikDialogFlagNoBorder |
-               EEikDialogFlagNoTitleBar;
-
-     buttons = r_diag_audio_softkeys_skip_cancel__start;
-
-     items=
-         {
-         DLG_LINE
-             {
-             type    = EAknCtPopupHeadingPane;
-             id      = EAknMessageQueryHeaderId;
-             control = AVKON_HEADING
-                 { 
-                 label         = qtn_diag_msg_title_record_audio;
-                 headinglayout = R_AVKON_WML_SIGN_QUERY_HEADING_PANE;         
-                 };
-             },
-         DLG_LINE
-             {
-             type    = EAknCtMessageQuery;
-             id      = EAknMessageQueryContentId;
-             control = AVKON_MESSAGE_QUERY
-                 {
-                 message = qtn_diag_msg_record_audio;
-                 };
-             }
-         };
-     }
-
-// ---------------------------------------------------------------------------
-// r_progress_note_recording
-// The dialog shown during recording
-// ---------------------------------------------------------------------------
-//
-RESOURCE DIALOG r_progress_note_recording
-    {
-    flags   = EAknProgressNoteFlags;
-    buttons = r_diag_audio_softkeys_skip_cancel__stop;
-    items   =
-        {
-        DLG_LINE
-            {
-            type    = EAknCtNote;
-            id      = EGeneralNote;
-            control = AVKON_NOTE
-                {
-                layout         = EProgressLayout;
-                singular_label = qtn_diag_note_record_audio;
-                
-                imagefile = BMPFILE_NAME;
-                imageid   = EMbmAvkonQgn_note_voice;
-                imagemask = EMbmAvkonQgn_note_voice_mask;
-                };
-            }
-        };
-    }
-
-// ---------------------------------------------------------------------------
-// r_confquery_ask_play
-// The dialog shown when recording has finished and ask to play
-// ---------------------------------------------------------------------------
-//
-RESOURCE DIALOG r_confquery_ask_play
-    {
-    flags   = EGeneralQueryFlags;                 
-    buttons = r_diag_audio_softkeys_play_cancel; // custom key
-    items   =
-        {
-        DLG_LINE
-            {
-            type    = EAknCtQuery;             
-            id      = EGeneralQuery;           
-            control = AVKON_CONFIRMATION_QUERY 
-                {   
-                layout  = EConfirmationQueryLayout;      
-                label   = qtn_diag_conf_start_play_earpiece;
-		bmpfile = BMPFILE_NAME;                  
-                bmpid   = EMbmAvkonQgn_note_info;
-                bmpmask = EMbmAvkonQgn_note_info_mask;
-                };
-            }
-        };
-    }
-
-// ---------------------------------------------------------------------------
-// r_confquery_ask_heard
-// The dialog shown when ask to result of playing
-// ---------------------------------------------------------------------------
-//
-RESOURCE DIALOG r_confquery_ask_heard
-    {
-    flags   = EGeneralQueryFlags;           
-    buttons = R_AVKON_SOFTKEYS_YES_NO__YES;
-    items   =
-        {
-        DLG_LINE
-            {
-            type    = EAknCtQuery;             
-            id      = EGeneralQuery;           
-            control = AVKON_CONFIRMATION_QUERY 
-                {   
-                layout  = EConfirmationQueryLayout;
-                label   = qtn_diag_conf_earpiece;
-                bmpfile = BMPFILE_NAME;
-                bmpid   = EMbmAvkonQgn_note_query;
-                bmpmask = EMbmAvkonQgn_note_query_mask;
-                };
-            }
-        };
-    }
-
-// ---------------------------------------------------------------------------
-// r_confquery_ask_repeat
-// The dialog shown when ask to repeat test again
-// ---------------------------------------------------------------------------
-//
-RESOURCE DIALOG r_confquery_ask_repeat
-    {
-    flags   = EGeneralQueryFlags; 
-    buttons = R_AVKON_SOFTKEYS_YES_NO__YES;
-    items   =
-        {
-        DLG_LINE
-            {
-            type = EAknCtQuery;
-            id   = EGeneralQuery;
-            control = AVKON_CONFIRMATION_QUERY
-                {
-                layout  = EConfirmationQueryLayout;
-                label   = qtn_diag_conf_repeat_earpiece;
-                bmpfile = BMPFILE_NAME;
-                bmpid   = EMbmAvkonQgn_note_query;
-                bmpmask = EMbmAvkonQgn_note_query_mask;
-                };
-            }
-        };
-    }
-
-// ---------------------------------------------------------------------------
-// r_progress_note_playing
-// The dialog shown during playing
-// ---------------------------------------------------------------------------
-//
-RESOURCE DIALOG r_progress_note_playing
-    {
-    flags   = EAknProgressNoteFlags;
-    buttons = r_diag_audio_softkeys_skip_cancel__stop;
-    items   =
-        {
-        DLG_LINE
-            {
-            type    = EAknCtNote;
-            id      = EGeneralNote;
-            control = AVKON_NOTE
-                {
-                layout         = EProgressLayout;
-                singular_label = qtn_diag_note_play_earpiece;
-                plural_label   = qtn_diag_note_play_earpiece;
-                imagefile      = BMPFILE_NAME;
-                imageid        = EMbmAvkonQgn_note_voice;
-                imagemask      = EMbmAvkonQgn_note_voice_mask;
-                };
-            }
-        };
-    }
-
-//End of File
--- a/devicediagnostics/diagplugins/diagearpieceplugin/group/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-/*
-* 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:  This file provides the information required for building
-*                DiagAudioPlugin
-*
-*/
-
-#include <platform_paths.hrh>
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-../loc/diagaudioplugin.loc        MW_LAYER_LOC_EXPORT_PATH(diagaudioplugin.loc)
-../rom_files/devdiagaudioplugin.iby		CORE_MW_LAYER_IBY_EXPORT_PATH(devdiagaudioplugin.iby)
-../rom_files/devdiagaudioplugin_resources.iby		LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(devdiagaudioplugin_resources.iby)
-
-// Generic configuration interface for component cenrep settings  
-../conf/diagaudiorecorderplugin.confml                    MW_LAYER_CONFML(DiagAudioRecorderPlugin.confml)
-../conf/diagaudiorecorderplugin_2000E58C.crml	        MW_LAYER_CRML(DiagAudioRecorderPlugin_2000E58C.crml)
-PRJ_MMPFILES
-diagaudioplugin.mmp
-
-
-PRJ_TESTMMPFILES
-
-//  End of File
--- a/devicediagnostics/diagplugins/diagearpieceplugin/group/diagaudioplugin.mmp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,78 +0,0 @@
-/*
-* 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:  Project specification file.
-*
-*/
-
-
-#include  <data_caging_paths.hrh>    // For RESOURCE_FILES_DIR
-// To get the MW_LAYER_SYSTEMINCLUDE-definition
-#include <platform_paths.hrh>
-
-CAPABILITY          CAP_ECOM_PLUGIN MultimediaDD UserEnvironment
-TARGET              devdiagaudioplugin.dll
-TARGETTYPE          PLUGIN
-UID                 0x10009D8D 0x2000E58C
-VENDORID            VID_DEFAULT
-
-
-SOURCEPATH  ../src
-SOURCE      diagaudiopluginimplementationtable.cpp
-SOURCE      diagaudioplugin.cpp
-
-
-//User include paths
-USERINCLUDE     ../inc
-USERINCLUDE     ../data // For *.rh
-USERINCLUDE     ../loc
-
-//System include paths
-SYSTEMINCLUDE   /epoc32/include/ecom
-SYSTEMINCLUDE   /epoc32/include/mmf/common
-
-// Default system include paths for middleware layer modules.
-APP_LAYER_SYSTEMINCLUDE
-
-
-SOURCEPATH      ../data
-
-START RESOURCE  devdiagaudioplugin.rss
-TARGET          devdiagaudioplugin.rsc
-TARGETPATH      ECOM_RESOURCE_DIR
-END
-
-START RESOURCE  devdiagaudiopluginrsc.rss
-HEADER
-TARGETPATH      RESOURCE_FILES_DIR
-LANGUAGE_IDS
-END
-
-
-LIBRARY   euser.lib
-LIBRARY   efsrv.lib
-LIBRARY   avkon.lib
-LIBRARY   commonengine.lib      // For StringLoader
-LIBRARY   flogger.lib           // for LOGGER
-LIBRARY   diagframework.lib 
-LIBRARY   diagpluginbase.lib
-
-LIBRARY   eikctl.lib   // for Progress Dialog
-LIBRARY   eikcoctl.lib 
-LIBRARY   eikdlg.lib
-
-LIBRARY   mediaclientaudio.lib       // for AudioRecorderUtility
-LIBRARY   centralrepository.lib      // for Central Repository
-LIBRARY   telephonyaudiorouting.lib  // for AudioRouting
-
-// End of File
--- a/devicediagnostics/diagplugins/diagearpieceplugin/inc/diagaudioplugin.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,460 +0,0 @@
-/*
-* 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:  View for Data call settings.
-*
-*/
-
-
-#ifndef DIAGAUDIOPLUGIN_H
-#define DIAGAUDIOPLUGIN_H
-
-#include <AknProgressDialog.h>               // MProgressDialogCallback
-#include <DiagTestPluginBase.h>              // CDiagTestPluginBase
-#include <DiagResultsDatabaseItem.h>         // CDiagResultsDatabaseItem::TResult
-#include <mdaaudiosampleplayer.h>            // MMdaAudioPlayerCallback
-#include <AudioOutput.h>                     // TAudioOutputPreference
-#include <MTelephonyAudioRoutingObserver.h>  // MTelephonyAudioRoutingObserver
-
-// FORWARD DECLARATIONS
-class CPeriodic;
-class CDiagResultsDbItemBuilder;
-class CEikDialog;
-class CAknNoteDialog;
-class CAknProgressDialog;
-class CEikProgressInfo;
-
-// CLASS DEFINITION
-class CDiagAudioPlugin : public CDiagTestPluginBase,
-                         public MProgressDialogCallback,
-                         public MMdaObjectStateChangeObserver,
-                         public MMdaAudioPlayerCallback,
-                         public MTelephonyAudioRoutingObserver
-{
-public: // Constructors and destructor
-    /**
-    * Symbian OS two-phased constructor
-    *
-    * @return Timer Test Plugin
-    */
-    static MDiagPlugin* NewL( TAny* aInitParams );
-
-    /**
-    * Destructor
-    */
-    virtual ~CDiagAudioPlugin();
-
-
-private: // private functions
-    /**
-    * C++ default constructor.
-    */
-    CDiagAudioPlugin( CDiagPluginConstructionParam* aInitParams  );
-
-    /**
-    * Symbian OS default constructor.
-    *
-    */
-    void ConstructL();
-
-    /**
-    * Start Audio Recording with Dialogs
-    *
-    */
-    void StartRecordL();
-
-    /**
-    * Start Audio Playing with Dialogs
-    *
-    */
-    void StartPlayL();
-
-    /**
-    * Audio Recording
-    *
-    */
-    void RecordingL();
-
-    /**
-    * Audio Playing
-    *
-    */
-    void PlayingL();
-
-    /**
-    * Actions after Recording has finished
-    *
-    */
-    void AfterRecordL();
-
-    /**
-    * Actions after Playing has finished
-    *
-    */
-    void AfterPlayL();
-
-    /**
-    * Invoke CMdaAudioRecorderUtility::RecordL to start record
-    *
-    */
-    void RecordL();
-
-    /**
-    * Invoke CMdaAudioRecorderUtility::PlayL to start play
-    *
-    */
-    void PlayL();
-
-    /**
-    * Set Audio to Current Output
-    *
-    */
-    void SaveAudioOutput();
-
-    /**
-    * Set Audio to previous Output
-    *
-    */
-    void RestoreAudioOutputL();
-
-    /**
-    * Clean up instance of CPeriodic
-    *
-    */
-    void ClosePeriodic();
-
-    /**
-    * Check whether Recorded file exist
-    */
-    TBool CheckRecordFile();
-
-    /**
-    * Delete Recorded file
-    */
-    void DeleteRecordFile();
-
-    /**
-    * Check whether there are enough space to record
-    *
-    * @return ETure when there is enough free space
-    */
-    TBool EnoughFreeSpace();
-
-    /**
-    * Set Dialog has dismissed
-    *
-    * @param aDismissed - ETrue  for Dialog dismissed
-    *                   - EFalse for Dialog has not dismissed
-    */
-    void SetProgressDismissed( TBool aDismissed );
-
-    /**
-    * Check whether Dialog has dismissed
-    *
-    * @return ETure when Dialog has dismissed
-    */
-    TBool ProgressDismissed() const;
-
-    /**
-    * Ask Cancel all Test
-    *
-    * @param  aButtonId - reference of button id pressed
-    * @return ETure when current state is valid
-    */
-    TBool AskCancelExecutionL( TInt& aButtonId );
-
-    /**
-    * Display Confirmation Query
-    *
-    * @param aResourceId - Resource ID of Confimation Query
-    *
-    */
-    TBool ShowConfQueryL( TInt aResourceId, TInt &aButtonId );
-
-    /**
-    * Display Message Query
-    *
-    * @param aResourceId - Resource ID of Message Query
-    * @param aButtonId   - Reference of button id to exit
-    */
-    TBool ShowMessageQueryL( TInt aResourceId, TInt &aButtonId );
-
-    /**
-    * Display Progress Dialog
-    *
-    * @param aResourceId - Resource ID of Progress
-    * @param aFinalValue - Final value of Progress Note to display
-    */
-    void ShowProgressNoteL( TInt aResourceId, TInt aFinalValue );
-
-    /**
-    * Callback function to update Progress Dialog
-    *
-    * @param aThis - Object to receive call back
-    * @return 0 on finish
-    */
-    static TInt CallbackIncrementProgressNoteL( TAny* aThis );
-
-    /**
-    * Called from CallbackIncrementProgressNoteL
-    *  Actual Function to update Progress Dialog
-    *
-    * @return 0 on finish
-    */
-    TInt UpdateProgressNoteL();
-
-
-private: // From CDiagTestPluginBase
-
-    /**
-    * @see CDiagTestPluginBase::Visible()
-    */
-    virtual TBool IsVisible() const;
-
-    /**
-    * @see CDiagTestPluginBase::RunMode()
-    */
-    virtual TRunMode RunMode() const;
-
-    /**
-    * @see CDiagTestPluginBase::TotalSteps()
-    */
-    virtual TUint TotalSteps() const;
-
-    /**
-    * @see CDiagTestPluginBase::GetPluginNameL
-    */
-    virtual HBufC* GetPluginNameL( TNameLayoutType aLayoutType ) const;
-
-    /**
-    * @see CDiagTestPluginBase::Uid
-    */
-    virtual TUid Uid() const;
-
-    /**
-    * @see CDiagTestPluginBase::TestSessionBeginL
-    */
-    virtual void TestSessionBeginL( MDiagEngineCommon& aEngine,
-                                    TBool aSkipDependencyCheck,
-                                    TAny* aCustomParams );
-
-    /**
-    * @see CDiagTestPluginBase::TestSessionEndL
-    */
-    virtual void TestSessionEndL( MDiagEngineCommon& aEngine,
-                                  TBool aSkipDependencyCheck,
-                                  TAny* aCustomParams );
-
-    /**
-    * Handle plug-in execution.
-    *   @see CDiagTestPluginBase::DoRunTestL()
-    */
-    virtual void DoRunTestL();
-
-    /**
-    * Handle plug-in execution stop and clean up
-    *   @see CDiagTestPluginBase::DoStopAndCleanupL()
-    */
-    virtual void DoStopAndCleanupL();
-
-
-private: // from CActive
-    /**
-    * Handle active object completion event
-    */
-    virtual void RunL();
-
-    /**
-    * Handle cancel
-    */
-    virtual void DoCancel();
-    
-    enum TState
-    {
-    EStateUnknown = 0,
-    EStateFailed,
-    EStateCancelled,
-    EStateSkipped,
-    EStateIdle,
-    EStateRecorded,
-    EStatePlayed,
-    EStateUserQuery
-    };
-
-
-private: // from MProgressDialogCallback
-    /**
-    * Callback method Get's called when a dialog is dismissed
-    *
-    * @param aButtonId - indicate which button made dialog to dismiss
-    */
-    virtual void DialogDismissedL( TInt aButtonId );
-
-
-private: // from MMdaObjectStateChangeObserver
-    /**
-    * Handling the change of state of an audio data sample object
-    *
-    * @param aObject        - indicate which button made dialog to dismiss
-    * @param aPreviousState - previous state
-    * @param aCurrentState  - current state
-    * @param aErrorCode     - error code
-    */
-    virtual void MoscoStateChangeEvent(
-        CBase *aObject,
-        TInt aPreviousState,
-        TInt aCurrentState,
-        TInt aErrorCode);
-
-
-private: // MMdaAudioPlayerCallback
-     /**
-     * Defines required client behaviour when an attempt to open and initialise an audio sample has completed
-     *
-     * @param aError     - The status of the audio sample after initialisation
-     * @param aDuration  - Duration of the audio sample
-     */
-    virtual void MapcInitComplete(TInt aError, const TTimeIntervalMicroSeconds& aDuration);
-
-    /**
-     * Defines required client behaviour when an attempt to playback an audio sample has completed
-     *
-     * @param aError  - The status of playback
-     */
-    virtual void MapcPlayComplete(TInt aError);
-
-
-private: // from MTelephonyAudioRoutingObserver
-    /**
-     * Callback Available Audio Output has changed
-     *
-     * @param aTelephonyAudioRouting  - Reference of Telephony AudioRouting
-     */
-    virtual void AvailableOutputsChanged( CTelephonyAudioRouting& aTelephonyAudioRouting );
-
-    /**
-     * Callback when Routing Audio Output has chaged
-     *
-     * @param aTelephonyAudioRouting  - Reference of Telephony AudioRouting
-     */
-    virtual void OutputChanged( CTelephonyAudioRouting& aTelephonyAudioRouting );
-
-    /**
-     * Callback when Set new Telephony Audio Routing is done
-     *
-     * @param aTelephonyAudioRouting  - Reference of Telephony AudioRouting
-     * @param aError                  - The status of set AudioRouting
-     */
-    virtual void SetOutputComplete( CTelephonyAudioRouting& aTelephonyAudioRouting, TInt aError );
-    
-    
-    void SetAudioEvent(TState aState);
-
-
-private: // Data
-    /**
-     * Tells session is Valid
-     */
-    TBool iSessionValid;
-
-    /**
-     * Indicate Progress has dismissed
-     */
-    TBool iProgressDismissed;
-
-    /**
-     * AudioState for Recording/Playing
-     */
-    TInt iAudioState;
-
-    /**
-     * Recorder for Recording Audio
-     * OWN
-     */
-    CMdaAudioRecorderUtility* iRecorder;
-
-    /**
-     * Player for Playing Audio
-     * OWN
-     */
-    CMdaAudioPlayerUtility* iAudioPlayer;
-
-    /**
-     * Maxmium Size of Record File
-     */
-    TInt iRecordFileSize;
-
-    /**
-     * Path of Record File
-     */
-    TFileName iRecordFilePath;
-
-    /**
-     * Progress Dialog
-     * OWN
-     */
-    CAknProgressDialog* iProgressDialog;
-
-    /**
-     * Info for Progress Dialog
-     * OWN
-     */
-    CEikProgressInfo* iProgressInfo;
-
-    /**
-     * Timer for Update Progress
-     * OWN
-     */
-    CPeriodic* iPeriodic;
-
-    /**
-     * Duration of Audio in usec
-     */
-    TTimeIntervalMicroSeconds iMaxDurationMicroSec;
-
-    /**
-     * Position of Audio in usec
-     */
-    TTimeIntervalMicroSeconds iPositionMicroSec;
-
-    /**
-     * Maximum time(sec) to record
-     */
-    TInt iFinalValue;
-
-    /**
-     * Previous Audio Output
-     */
-    CTelephonyAudioRouting::TAudioOutput iPrevAudioOutput;
-
-    /**
-     * Current Audio Output
-     */
-    CTelephonyAudioRouting::TAudioOutput iOutput;
-
-    /**
-     * Audio Output to route
-     * OWN
-     */
-    CTelephonyAudioRouting* iRouting;
-    
-    /*
-    * State of the Audio Plugin.
-    */
-    TState iState;
-    };
-
-#endif //DIAGAUDIOPLUGIN_H
-
-// End of File
-
--- a/devicediagnostics/diagplugins/diagearpieceplugin/inc/diagaudioplugin.hrh	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-/*
-* 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:  Contains common definitions for menu id:s
-*
-*/
-
-
-#ifndef DIAGAUDIOPLUGIN_HRH
-#define DIAGAUDIOPLUGIN_HRH
-
-#define DIAG_AUDIO_PLUGIN_UID 0x2000E58D
-
-enum TAudioTestCBA
-    {
-    ECBACmdRecord = 0x6300,
-    ECBACmdCancel,
-    ECBACmdContinue,
-    ECBACmdSkip,
-    ECBACmdCustomNo
-    };
-
-#endif //  DIAGAUDIOPLUGIN_HRH
-
-//End of File
--- a/devicediagnostics/diagplugins/diagearpieceplugin/inc/diagaudiorecorderprivatecrkeys.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-/*
-* 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:  Private Central Repository keys.
-*
-*/
-
-
-#ifndef DIAGAUDIORECORDERPRIVATECRKEYS_H
-#define DIAGAUDIORECORDERPRIVATECRKEYS_H
-
-//  INCLUDES
-
-#include <e32std.h>
-
-// =============================================================================
-// Audio Recorder 
-// =============================================================================
-
-const TUid KCRUidDiagVoiceRecorderPlugin = { 0x2000E58C }; 
-	
-
-/**
- *
- * The value assigned to this key is the recording time in second
- * Available options:   
- * Default value: 5
-*/
-const TUint32 KAudioRecorderRecordingTime = 0x00000001;
-
-/**
- *
- * The value assigned to this key is the full path where the audio file is stored
- * Available options:   
- * Default value: c:\system\temp\record.wav
-*/
-const TUint32 KAudioRecorderFilePath = 0x00000002;
-
-
-
-
-#endif      // DIAGAUDIORECORDERPRIVATECRKEYS_H
-
-// End of File
-
-
-
--- a/devicediagnostics/diagplugins/diagearpieceplugin/loc/diagaudioplugin.loc	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,111 +0,0 @@
-/*
-* 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:  Localization strings for DiagAudioPlugin.
-*
-*/
-
-
-// d:Text of a list item in Application
-// l:list_single_graphic_heading_pane_t1_cp2
-// r: 3.1
-//
-#define qtn_diag_lst_earpiece "Earpiece test"
-
-// d:Message query prompt to start plugin (header) 
-// l:heading_pane_t1
-// r:3.1
-//
-//#define qtn_diag_msg_title_audio  "Audio devices" // LVT Change
-
-#define qtn_diag_msg_title_earpiece  "Earpiece test"
-
-// d:Message query prompt to start plugin (text) 
-// l:popup_info_list_pane_t1
-// r:3.1
-//
-#define qtn_diag_msg_info_earpiece "The following test will check earpiece functionality."
-
-// d:Message query prompt to start recording (header) 
-// l:heading_pane_t1
-// r:3.1
-//
-#define qtn_diag_msg_title_record_audio "Record a soundclip"
-
-// d:Message query prompt to start recording (header) 
-// l:popup_info_list_pane_t1
-// r:3.1
-//
-#define qtn_diag_msg_record_audio "Please record the following phrase 'Hello, testing, 1, 2, 3'"
-
-// d:Progress Note during recording 
-// l:popup_note_wait_window
-// r:3.1
-//
-#define qtn_diag_note_record_audio "Repeat: 'Hello, testing, 1, 2, 3'\nThen press Stop."
-
-// d:Confimation query to start playing 
-// l:popup_note_window
-// r:3.1
-//
-#define qtn_diag_conf_start_play_earpiece "Press play to listen to the recording via earpiece"
-
-// d:Progress Note during playing 
-// l:popup_note_wait_window
-// r:3.1
-//
-#define qtn_diag_note_play_earpiece "Playing recording via earpiece"
-
-// d:Confimation query to ask heard voice 
-// l:popup_note_window
-// r:3.1
-//
-#define qtn_diag_conf_earpiece "Was the recording played back correctly?"
-
-// d:Confimation query to ask repeat 
-// l:popup_note_window
-// r:3.1
-//
-#define qtn_diag_conf_repeat_earpiece "Do you want to repeat the earpiece test?"
-
-// d:List item of test
-// l:list_single_graphic_pane_t1
-// r:3.1
-//
-//#define qtn_diag_lst_test_earpiece "Test Earpiece" // LVT Change
-
-// d:Screen title of test
-// l:title_pane_t2/opt12
-// r:3.1
-//
-//#define qtn_diag_title_test_earpiece "Earpiece test" // LVT Change
-
-// d:Header for information
-// l:heading_pane_t1
-// r:3.1
-//
-//#define qtn_diag_msg_title_earpiece "Earpiece Test"
-
-//d:Failed result text
-//l:popup_info_list_pane_t1
-//r:5.0
-//
-#define qtn_diag_conf_test_failed_earpiece "Earpiece test"
-
-//d:Softkey text.
-//l:control_pane_t1/opt7 
-//r:5.0
-//
-#define qtn_diag_softk_skip "Skip"
-
-// End of File
--- a/devicediagnostics/diagplugins/diagearpieceplugin/rom_files/devdiagaudioplugin.iby	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-/*
-* 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:  Image description file for project Audio Plugin
-*
-*/
-
-
-
-#ifndef DEVDIAG_AUDIO_PLUGIN_IBY
-#define DEVDIAG_AUDIO_PLUGIN_IBY
-
-#ifdef FF_DEVICE_DIAGNOSTICS_APP 
-
-#include <data_caging_paths_for_iby.hrh>
-
-ECOM_PLUGIN( devdiagaudioplugin.dll, devdiagaudioplugin.rsc )
-
-#endif
-
-#endif // DEVDIAG_AUDIO_PLUGIN_IBY
-
-// end of file
--- a/devicediagnostics/diagplugins/diagearpieceplugin/rom_files/devdiagaudioplugin_resources.iby	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-/*
-* 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:  Image description file for resources of project Audio Plugin
-*
-*/
-
-
-
-#ifndef DEVDIAG_AUDIO_PLUGIN_RESOURCES_IBY
-#define DEVDIAG_AUDIO_PLUGIN_RESOURCES_IBY
-
-#ifdef FF_DEVICE_DIAGNOSTICS_APP 
-
-#include <data_caging_paths_for_iby.hrh>
-
-data=DATAZ_\RESOURCE_FILES_DIR\devdiagaudiopluginrsc.rsc RESOURCE_FILES_DIR\devdiagaudiopluginrsc.rsc
-
-#endif
-
-#endif // DEVDIAG_AUDIO_PLUGIN_RESOURCES_IBY
-
-// end of file
--- a/devicediagnostics/diagplugins/diagearpieceplugin/src/diagaudioplugin.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1591 +0,0 @@
-/*
-* 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:  Class Definition of CDiagAudioPlugin
-*
-*/
-
-
-// INCLUDE FILES
-
-// From System
-#include <AknQueryDialog.h>            // CAknQueryDialog
-#include <aknmessagequerydialog.h>     // CAknMessageQueryDialog
-#include <AknProgressDialog.h>         // CAknProgressDialog
-#include <eikprogi.h>                  // CEikProgressInfo
-#include <eikbtgpc.h>                  // CEikButtonGroupContainer
-#include <AudioPreference.h>           // KAudioPriorityRecording
-#include <mdaaudiosampleeditor.h>      // CMdaAudioRecorderUtility
-#include <mdaaudiosampleplayer.h>      // CMdaAudioPlayerUtility
-#include <StringLoader.h>              // StringLoader
-#include <DiagTestObserver.h>          // MDiagTestObserver
-#include <DiagTestExecParam.h>         // TDiagTestExecParam
-#include <DiagEngineCommon.h>          // MDiagEngine
-#include <DiagPluginPool.h>            // CDiagPluginPool
-#include <DiagResultsDbItemBuilder.h>  // CDiagResultsDbItemBuilder
-#include <DiagResultDetailBasic.h>     // CDiagResultDetailBasic
-#include <DiagFrameworkDebug.h>        // LOGSTRING
-#include <DiagCommonDialog.h>          // for EDiagCommonDialogConfirmCancelAll
-#include <avkon.rsg>                   // AVKON Resource Definitions
-
-// For Central Repository
-#include <centralrepository.h>
-#include "diagaudiorecorderprivatecrkeys.h"
-
-// Audio Plugin Headerfile
-#include "diagaudioplugin.h"       // CDiagAudioPlugin
-#include "diagaudioplugin.hrh"     // Button Id defined
-#include <devdiagaudiopluginrsc.rsg>  // Resource Definitions
-
-
-// Local Macro
-#define ASSERT_ALWAYS(c) __ASSERT_ALWAYS((c), User::Invariant())
-
-// Local Data Types
-enum TAudioSteps
-    {
-    EStepTestTitle,
-    EStepAskRecord,
-    EStepProgressRecord,
-    EStepAskPlay,
-    EStepProgressPlay,
-    EStepAskHeard,
-    EStepAskRepeat,
-    EAudioPluginTotalSteps
-    };
-
-// To Exit from Query it should be EAknSoftkeyOk
-// can't include in .hrh because it requires <eikon.rh>
-// leads compilation fail
-enum TAudioExitCBA
-    {
-    ECBACmdPlay  = EAknSoftkeyOk,
-    ECBACmdStop  = EAknSoftkeyOk,
-    ECBACmdStart = EAknSoftkeyOk
-    };
-
-// Local Constants
-const TInt KFinished      = 0;
-const TInt KMinFileSize   = 1024;
-const TInt KSamplingRate  = 8192;
-const TInt KStereo        = 2;
-const TInt KFive          = 5;
-const TInt KMicroSecond   = 1000*1000;
-const TInt KProgressDelay = 200000;
-const TInt KAudioServerRequestTimeoutValue = 16 * KMicroSecond;
-
-const TInt KProgressFinished    =  0;
-const TInt KProgressNotFinished =  1;
-const TUid KDiagAudioPluginUid  = { DIAG_AUDIO_PLUGIN_UID };
-
-_LIT( KDiagAudioPluginResourceFileName, "z:DevDiagAudioPluginRsc.rsc" );
-_LIT( KDiagAudioPluginCategory,"DevDiagAudioPlugin" );
-
-#ifdef __WINS__
-const CTelephonyAudioRouting::TAudioOutput KTargetOutput = CTelephonyAudioRouting::ELoudspeaker;
-#else
-const CTelephonyAudioRouting::TAudioOutput KTargetOutput = CTelephonyAudioRouting::EHandset;
-#endif
-
-
-// ========================= MEMBER FUNCTIONS ================================
-// ---------------------------------------------------------------------------
-// CDiagAudioPlugin::NewL()
-//
-// Symbian OS default constructor
-// ---------------------------------------------------------------------------
-MDiagPlugin* CDiagAudioPlugin::NewL( TAny* aInitParams )
-    {
-    CDiagAudioPlugin*             self;
-    CDiagPluginConstructionParam* param;
-
-    ASSERT_ALWAYS( aInitParams );
-
-    param = static_cast<CDiagPluginConstructionParam*>( aInitParams );
-    CleanupStack::PushL( param );
-    self  = new( ELeave ) CDiagAudioPlugin ( param );
-    CleanupStack::Pop( param );
-
-
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self ); // self
-
-    return self;
-    }
-
-// ----------------------------------------------------------------------------
-// CDiagAudioPlugin::~CDiagAudioPlugin
-//
-// Destructor
-// ----------------------------------------------------------------------------
-CDiagAudioPlugin::~CDiagAudioPlugin()
-    {
-    // Delete resources allocated during construction.
-    // Nothing to do since no new resource is allocated in constructor.
-    }
-
-// ----------------------------------------------------------------------------
-// CDiagAudioPlugin::CDiagAudioPlugin()
-//
-// Constructor
-// ----------------------------------------------------------------------------
-//
-CDiagAudioPlugin::CDiagAudioPlugin( CDiagPluginConstructionParam* aParam )
-    :    CDiagTestPluginBase( aParam )
-    {
-    }
-
-// ---------------------------------------------------------------------------
-// CDiagAudioPlugin::ConstructL()
-//
-// Symbian OS two-phased constructor
-// ---------------------------------------------------------------------------
-void CDiagAudioPlugin::ConstructL()
-    {
-    LOGSTRING( "CDiagAudioPlugin::ConstructL: Plugin created. IN" )
-
-    BaseConstructL ( KDiagAudioPluginResourceFileName );
-
-    TInt recording_time;
-
-    // Open Central Repository
-    CRepository* audioRecorderRepository;
-    audioRecorderRepository = CRepository::NewL( KCRUidDiagVoiceRecorderPlugin );
-    CleanupStack::PushL( audioRecorderRepository );
-
-    // Read File Path from CR
-    iRecordFilePath.FillZ();
-    User::LeaveIfError(
-        audioRecorderRepository->Get( KAudioRecorderFilePath, iRecordFilePath) );
-
-    // Read File Size from CR
-    User::LeaveIfError(
-        audioRecorderRepository->Get( KAudioRecorderRecordingTime , recording_time) );
-
-    iRecordFileSize = (recording_time * KSamplingRate * KStereo);
-
-    CleanupStack::PopAndDestroy( audioRecorderRepository );
-    audioRecorderRepository = NULL;
-
-    // Set Audio Output
-    iOutput = KTargetOutput;
-
-    LOGSTRING( "CDiagAudioPlugin::ConstructL: Plugin created. OUT" )
-    }
-
-// ---------------------------------------------------------------------------
-// CDiagAudioPlugin::StartRecordL
-// ---------------------------------------------------------------------------
-//
-void CDiagAudioPlugin::StartRecordL()
-    {
-    LOGSTRING( "CDiagAudioPlugin::DoRunTest() IN" )
-    TBool       goNext;
-
-    // Delete Record File
-    DeleteRecordFile();
-
-    // Check Free Space
-    if ( !EnoughFreeSpace() )
-        {
-        CompleteTestL( CDiagResultsDatabaseItem::ENotPerformed );
-        return;
-        }
-
-    // Show Init Message Query
-    do
-        {
-        goNext = ETrue;
-
-        // Check session before launch before dialog starts
-        if ( !iSessionValid )
-            {
-            LOGSTRING( "CDiagAudioPlugin::StartRecordL - !iSessionValid 1" )
-            return;
-            }
-
-        // Report current Progress to Engine
-        ReportTestProgressL( EStepTestTitle );
-
-        // Show Message Query Title
-        TInt  buttonId;
-        TBool result = EFalse;
-
-        result = ShowMessageQueryL( R_MESSAGEQUERY_TITLE, buttonId );
-
-        // Check session is valid after dialog dismissed
-        if ( !result )
-            {
-            LOGSTRING( "CDiagAudioPlugin::StartRecordL - !iSessionValid 2" )
-            return;
-            }
-
-        // 1.1 Case for press Skip
-        
-        // ADO & Platformization Changes
-        //if ( buttonId == ECBACmdSkip )
-        if ( buttonId == ECBACmdCancel )
-            {
-            LOGSTRING( "CDiagAudioPlugin::StartRecordL: Skip has pressed" )
-            CompleteTestL( CDiagResultsDatabaseItem::ESkipped );
-            return;
-            }
-
-        // 1.2 case for press Cancel
-        //else if ( buttonId == ECBACmdCancel )
-        else if ( buttonId == ECBACmdSkip )
-            {
-            LOGSTRING( "CDiagAudioPlugin::StartRecordL: Cancel has pressed" )
-
-            TInt   cancelButtonId;
-
-            //cancelResult = AskCancelExecutionL( cancelButtonId );
-			CAknDialog* dlg = ExecutionParam().Engine().
-							  CreateCommonDialogLC( EDiagCommonDialogConfirmSkipAll, NULL );
-							  
-            if ( !RunWaitingDialogL( dlg, cancelButtonId ) )
-                {
-                LOGSTRING( "CDiagAudioPlugin::StartPlayL - !iSessionValid 3" )
-                return;
-                }
-
-			if(cancelButtonId)
-			return;
-			else
-			goNext = EFalse;
-			
-            
-            /*
-            switch ( cancelButtonId )
-                {
-                case EAknSoftkeyYes:
-                	CompleteTestL( CDiagResultsDatabaseItem::ECancelled ); // Added for NTEI-7EZ9VQ
-                    return;
-                default:
-                    goNext = EFalse;
-                    break;
-                }
-            */
-            }
-        }
-    while ( goNext == EFalse );
-
-
-    // Show Record Message Query
-    do
-        {
-        goNext = ETrue;
-
-        // Check session before launch before dialog starts
-        if ( !iSessionValid )
-            {
-            LOGSTRING( "CDiagAudioPlugin::StartRecordL - !iSessionValid 4" )
-            return;
-            }
-
-        // Report current Progress to Engine
-        ReportTestProgressL( EStepAskRecord );
-
-        // Show Message Query Title
-        TInt  buttonId;
-        TBool result = EFalse;
-
-        result = ShowMessageQueryL( R_MESSAGEQUERY_ASK_RECORD, buttonId );
-
-        // Check session is valid after dialog dismissed
-        if ( !result )
-            {
-            LOGSTRING( "CDiagAudioPlugin::StartRecordL - !iSessionValid 5" )
-            return;
-            }
-
-        // 2.2 Case for press Skip
-        if ( buttonId == ECBACmdStart )
-            {
-            LOGSTRING( "CDiagAudioPlugin::StartRecordL: Start has pressed" )
-            RecordL();
-            return;
-            }
-        else if ( buttonId == ECBACmdSkip )
-            {
-            LOGSTRING( "CDiagAudioPlugin::StartRecordL: Skip has pressed" )
-            CompleteTestL( CDiagResultsDatabaseItem::ESkipped );
-            return;
-            }
-
-        // 2.3 case for press Cancel
-        else if ( buttonId == ECBACmdCancel )
-            {
-            LOGSTRING( "CDiagAudioPlugin::StartRecordL: Cancel has pressed" )
-
-            TInt  cancelButtonId;
-            TBool cancelResult = EFalse;
-
-            cancelResult = AskCancelExecutionL( cancelButtonId );
-
-            if ( !cancelResult )
-                {
-                LOGSTRING( "CDiagAudioPlugin::StartPlayL - !iSessionValid 6" )
-                return;
-                }
-
-            if(cancelButtonId == EAknSoftkeyYes)
-                {
-                CompleteTestL( CDiagResultsDatabaseItem::ECancelled );
-                return;
-                }
-            else if(cancelButtonId)
-                {
-                return;
-                }
-            else
-                {
-                goNext = EFalse;
-                }
-            
-            /*
-            switch ( cancelButtonId )
-                {
-                case EAknSoftkeyYes:
-                	CompleteTestL( CDiagResultsDatabaseItem::ECancelled ); // Added for NTEI-7EZ9VQ
-                    return;
-                default:
-                    goNext = EFalse;
-                    break;
-                }
-            */
-            }
-        }
-    while ( goNext == EFalse );
-
-    }
-
-// ---------------------------------------------------------------------------
-// CDiagAudioPlugin::StartPlayL
-// ---------------------------------------------------------------------------
-//
-void CDiagAudioPlugin::StartPlayL()
-    {
-    LOGSTRING( "CDiagAudioPlugin::StartPlayL() IN" )
-    TBool       goNext;
-
-
-    // Check Record File
-    if ( CheckRecordFile() == EFalse )
-        {
-        LOGSTRING( "CDiagAudioPlugin::StartPlayL() CheckRecordFile == EFalse" )
-        CompleteTestL( CDiagResultsDatabaseItem::ENotPerformed );
-        return;
-        }
-
-    do
-        {
-        goNext = ETrue;
-
-        // Check session before launch before dialog starts
-        if ( !iSessionValid )
-            {
-            LOGSTRING( "CDiagAudioPlugin::StartPlayL - !iSessionValid 1" )
-            return;
-            }
-
-        // Report current Progress to Engine
-        ReportTestProgressL( EStepAskPlay );
-
-        // Show ConfQuery to ask Play
-        TInt  buttonId;
-        TBool result = EFalse;
-
-        result = ShowConfQueryL( R_CONFQUERY_ASK_PLAY, buttonId );
-
-        // Check session is valid after dialog dismissed
-        if ( !result )
-            {
-            LOGSTRING( "CDiagAudioPlugin::StartPlayL - !iSessionValid 2" )
-            return;
-            }
-
-        // 1.1 Case for press Skip
-        if ( buttonId == ECBACmdSkip )
-            {
-            LOGSTRING( "CDiagAudioPlugin::StartPlayL: Skip has pressed" )
-            CompleteTestL( CDiagResultsDatabaseItem::ESkipped );
-            return;
-            }
-
-        // 1.2 case for press Cancel
-        else if ( buttonId == ECBACmdCancel )
-            {
-            LOGSTRING( "CDiagAudioPlugin::StartPlayL: Cancel has pressed" )
-            TInt  cancelButtonId;
-            TBool cancelResult = EFalse;
-
-            cancelResult = AskCancelExecutionL( cancelButtonId );
-
-            if ( !cancelResult )
-                {
-                LOGSTRING( "CDiagAudioPlugin::StartPlayL - !iSessionValid 3" )
-                return;
-                }
-
-            if(cancelButtonId == EAknSoftkeyYes)
-                {
-                CompleteTestL( CDiagResultsDatabaseItem::ECancelled );
-                return;
-                }
-            else if(cancelButtonId)
-                {
-                return;
-                }
-            else
-                {
-                goNext = EFalse;
-                }
-            /*
-            switch ( cancelButtonId )
-                {
-                case EAknSoftkeyYes:
-                	CompleteTestL( CDiagResultsDatabaseItem::ECancelled ); // Added for NTEI-7EZ9VQ
-                    return;
-                default:
-                    goNext = EFalse;
-                    break;
-                }
-               */
-            }
-        // 1.3 case for press Play
-        else if ( buttonId == ECBACmdPlay )
-            {
-            LOGSTRING( "CDiagAudioPlugin::StartPlayL: Play has pressed" )
-            iState = EStateRecorded;
-            PlayL();
-            }
-        } while ( !goNext );
-    }
-
-// ---------------------------------------------------------------------------
-// CDiagAudioPlugin::RecordingL
-// ---------------------------------------------------------------------------
-//
-void CDiagAudioPlugin::RecordingL()
-    {
-    LOGSTRING( "CDiagAudioPlugin::RecordingL IN" )
-    const TTimeIntervalMicroSeconds     position   = 0;
-
-    iFinalValue = iRecordFileSize / KSamplingRate / KStereo;
-
-    ReportTestProgressL( EStepProgressRecord );
-    ShowProgressNoteL( R_PROGRESS_NOTE_RECORDING, iFinalValue );
-
-    iRecorder->SetPriority(
-        KAudioPriorityAlarm + 1,
-        TMdaPriorityPreference( KAudioPrefVoiceRec )
-        );
-
-    iRecorder->SetPosition( position );
-    iRecorder->CropL();
-    iRecorder->SetMaxWriteLength( iRecordFileSize );
-
-    ResetWatchdog( KAudioServerRequestTimeoutValue, CDiagResultsDatabaseItem::EFailed ); 
-    iRecorder->RecordL(); // MoscoStateChangeEvent() will be called as return
-    LOGSTRING( "CDiagAudioPlugin::RecordingL OUT" )
-    }
-
-// ---------------------------------------------------------------------------
-// CDiagAudioPlugin::PlayingL
-// ---------------------------------------------------------------------------
-//
-void CDiagAudioPlugin::PlayingL()
-    {
-    LOGSTRING( "CDiagAudioPlugin::PlayingL IN" )
-
-    TInt64  interval   = 0;
-    TInt    finalValue = 0;
-
-    interval             = iMaxDurationMicroSec.Int64() / KMicroSecond;
-    finalValue           = ((I64INT(interval)));
-    iFinalValue          = finalValue;
-
-    ReportTestProgressL( EStepProgressPlay );
-    ShowProgressNoteL( R_PROGRESS_NOTE_PLAYING, iFinalValue );
-
-    iAudioPlayer->SetPosition( iPositionMicroSec );
-    iAudioPlayer->Play();
-
-    LOGSTRING( "CDiagAudioPlugin::PlayingL OUT" )
-    }
-
-// ---------------------------------------------------------------------------
-// CDiagAudioPlugin::AfterRecordL
-// ---------------------------------------------------------------------------
-//
-void CDiagAudioPlugin::AfterRecordL()
-    {
-    StartPlayL();
-    }
-
-// ---------------------------------------------------------------------------
-// CDiagAudioPlugin::AfterPlayL
-// ---------------------------------------------------------------------------
-//
-void CDiagAudioPlugin::AfterPlayL()
-    {
-    LOGSTRING( "CDiagAudioPlugin::AfterPlayL IN" )
-
-
-    // Check session before launch before dialog starts
-    if ( !iSessionValid )
-        {
-        LOGSTRING( "CDiagAudioPlugin::AfterPlayL - !iSessionValid 1.1" )
-        return;
-        }
-
-    // Report current Progress to Engine
-    ReportTestProgressL( EStepAskHeard );
-
-    // Show ConfQuery to ask Heard
-    TInt  buttonId;
-    TBool result = EFalse;
-    result = ShowConfQueryL( R_CONFQUERY_ASK_HEARD, buttonId );
-
-    // Check session is valid after dialog dismissed
-    if ( !result )
-        {
-        LOGSTRING( "CDiagAudioPlugin::AfterPlayL - !iSessionValid 1.2" )
-        return;
-        }
-
-    // Report Success on Yes
-    if ( buttonId == EAknSoftkeyYes )
-        {
-        LOGSTRING( "CDiagAudioPlugin::AfterPlayL - Yes has pressed - return ESuccess" )
-        CompleteTestL( CDiagResultsDatabaseItem::ESuccess );
-        return;
-        }
-    else if ( buttonId != ECBACmdCustomNo )
-        {
-       // return;  // ADO & Platformization Changes
-        }
-
-    // Check session before launch before dialog starts
-    if ( !iSessionValid )
-        {
-        LOGSTRING( "CDiagAudioPlugin::AfterPlayL - !iSessionValid 2.1" )
-        return;
-        }
-
-    // Report current Progress to Engine
-    ReportTestProgressL( EStepAskRepeat );
-
-    // Show ConfQuery to ask Heard
-    result = ShowConfQueryL( R_CONFQUERY_ASK_REPEAT, buttonId );
-
-   // Check session is valid after dialog dismissed
-    if ( !result )
-        {
-        LOGSTRING( "CDiagAudioPlugin::AfterPlayL - !iSessionValid 2.2" )
-        return;
-        }
-
-    // Report Success on Yes
-    if ( buttonId == EAknSoftkeyYes )
-        {
-        LOGSTRING( "CDiagAudioPlugin::AfterPlayL - Yes has pressed - Start Record Again" )
-        StartRecordL();
-        return;
-        }
-    else if ( buttonId == ECBACmdCustomNo || buttonId == EAknSoftkeyNo)
-        {
-        LOGSTRING( "CDiagAudioPlugin::AfterPlayL - No has pressed - Start Record Again" )
-        CompleteTestL( CDiagResultsDatabaseItem::EFailed );
-        }
-    else
-        {
-        CompleteTestL( CDiagResultsDatabaseItem::EFailed ); // Temp change / As button ID from Ask_Repeat resource is not known
-        return;
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// CDiagAudioPlugin::RecordL
-// ---------------------------------------------------------------------------
-//
-void CDiagAudioPlugin::RecordL()
-    {
-    LOGSTRING( "CDiagAudioPlugin::RecordL IN" )
-
-    iAudioState = CMdaAudioRecorderUtility::ERecording;
-    iState = EStateUnknown;
-
-    if ( iRecorder )
-        {
-        ResetWatchdog( KAudioServerRequestTimeoutValue, CDiagResultsDatabaseItem::EFailed );	
-        iRecorder->OpenFileL( iRecordFilePath ); // MoscoStateChangeEvent() will be called as return
-        }
-
-    LOGSTRING( "CDiagAudioPlugin::RecordL OUT" )
-    }
-
-// ---------------------------------------------------------------------------
-// CDiagAudioPlugin::PlayL
-// ---------------------------------------------------------------------------
-//
-void CDiagAudioPlugin::PlayL()
-    {
-    LOGSTRING( "CDiagAudioPlugin::PlayL IN" )
-    iAudioState = CMdaAudioRecorderUtility::EPlaying;
-
-    // Save Current Audio Output
-    LOGSTRING( "CDiagAudioPlugin::PlayL:SaveAudioOutput" )
-    SaveAudioOutput();
-
-    // Invoke Play
-    if ( iAudioPlayer )
-        {
-        LOGSTRING( "CDiagAudioPlugin::PlayL:OpenFileL(iRecordFilePath);" )
-        ResetWatchdog( KAudioServerRequestTimeoutValue, CDiagResultsDatabaseItem::EFailed );
-        iAudioPlayer->OpenFileL( iRecordFilePath ); // MapcInitComplete() will be called as return
-        }
-
-    LOGSTRING( "CDiagAudioPlugin::PlayL OUT" )
-    }
-
-// ---------------------------------------------------------------------------
-// CDiagAudioPlugin::SaveAudioOutput()
-// ---------------------------------------------------------------------------
-//
-void CDiagAudioPlugin::SaveAudioOutput()
-    {
-    LOGSTRING( "CDiagAudioPlugin::SaveAudioOutput IN" )
-
-    iPrevAudioOutput = iRouting->Output();
-
-    LOGSTRING( "CDiagAudioPlugin::SaveAudioOutput OUT" )
-    }
-
-// ---------------------------------------------------------------------------
-// CDiagAudioPlugin::RestoreAudioOutputL()
-// ---------------------------------------------------------------------------
-//
-void CDiagAudioPlugin::RestoreAudioOutputL()
-    {
-    LOGSTRING( "CDiagAudioPlugin::RestoreAudioOutputL IN" )
-
-    if ( iRouting )
-    {
-        iRouting->SetOutputL( iPrevAudioOutput );
-    }
-
-    LOGSTRING( "CDiagAudioPlugin::RestoreAudioOutputL OUT" )
-    }
-
-// ---------------------------------------------------------------------------
-// CDiagAudioPlugin::ClosePeriodic
-// ---------------------------------------------------------------------------
-//
-void CDiagAudioPlugin::ClosePeriodic()
-    {
-    LOGSTRING( "CDiagAudioPlugin::ClosePeriodic IN" )
-
-    if ( iPeriodic )
-        {
-        delete iPeriodic;
-        iPeriodic = NULL;
-        }
-
-    LOGSTRING( "CDiagAudioPlugin::ClosePeriodic OUT" )
-    }
-
-// ---------------------------------------------------------------------------
-// CDiagAudioPlugin::CheckRecordFile
-// ---------------------------------------------------------------------------
-//
-TBool CDiagAudioPlugin::CheckRecordFile()
-    {
-    LOGSTRING( "CDiagAudioPlugin::CheckRecordFile IN" )
-
-    TInt        err;
-    TEntry      entry;
-    TBool       ret = EFalse;
-
-    err  = CoeEnv().FsSession().Entry( iRecordFilePath, entry );
-
-    // Check if there was an error
-    if ( err != KErrNone)
-        {
-        ret = EFalse;
-        }
-
-    // Check File Size
-    else
-        {
-        ret = entry.iSize >= KMinFileSize;
-        }
-
-    LOGSTRING2( "CDiagAudioPlugin::CheckRecordFile OUT ret=%d", ret )
-    return ret;
-    }
-
-// ---------------------------------------------------------------------------
-// CDiagAuioPlugin::DeleteRecordFile
-// ---------------------------------------------------------------------------
-//
-void CDiagAudioPlugin::DeleteRecordFile()
-    {
-    LOGSTRING( "CDiagAudioPlugin::DeleteRecordFile IN" )
-
-    CoeEnv().FsSession().Delete( iRecordFilePath );
-
-    LOGSTRING( "CDiagAudioPlugin::DeleteRecordFile OUT" )
-    }
-
-// ---------------------------------------------------------------------------
-// CDiagAudioPlugin::EnoughFreeSpace
-// ---------------------------------------------------------------------------
-//
-TBool CDiagAudioPlugin::EnoughFreeSpace()
-    {
-    LOGSTRING( "CDiagAudioPlugin::EnoughFreeSpace IN" )
-
-    TInt64      RecordFileSize64;
-    TVolumeInfo vol_info;
-    TBool       ret;
-
-    RecordFileSize64 = iRecordFileSize;
-    CoeEnv().FsSession().Volume( vol_info, EDriveC );
-    ret = vol_info.iFree >= RecordFileSize64;
-
-    LOGSTRING2( "CDiagAudioPlugin::EnoughFreeSpace OUT ret=%d", ret )
-    return ret;
-    }
-
-// ---------------------------------------------------------------------------
-// CDiagAudioPlugin::SetProgressDismissed
-// ---------------------------------------------------------------------------
-//
-void  CDiagAudioPlugin::SetProgressDismissed( TBool aDismissed )
-    {
-    LOGSTRING2( "CDiagAudioPlugin::SetProgressDismissed aDismissed=%d", aDismissed )
-    iProgressDismissed = aDismissed;
-    }
-
-// ---------------------------------------------------------------------------
-// CDiagAudioPlugin::ProgressDismissed
-// ---------------------------------------------------------------------------
-//
-TBool CDiagAudioPlugin::ProgressDismissed() const
-    {
-    LOGSTRING2( "CDiagAudioPlugin::ProgressDismissed iProgressDismissed=%d", iProgressDismissed )
-
-    return iProgressDismissed;
-    }
-
-// ---------------------------------------------------------------------------
-// CDiagAudioPlugin::AskCancelExecutionL
-// ---------------------------------------------------------------------------
-//
-TBool CDiagAudioPlugin::AskCancelExecutionL( TInt& aButtonId )
-    {
-    LOGSTRING( "CDiagAudioPlugin::AskCancelExecutionL() IN" )
-
-    CAknDialog* dialog;
-    TBool       result;
-
-	
-	 // set softkey for single execution
-    if ( !SinglePluginExecution() )
-        {
-    	// Create common dialog by invoking Engine
-    	dialog = ExecutionParam().Engine().
-             CreateCommonDialogLC( EDiagCommonDialogConfirmCancelAll, NULL );
-
-    	// Launch dialog and get result from it
-    	result = RunWaitingDialogL( dialog, aButtonId );
-	}	
-    else 
-       {
-       //CompleteTestL( CDiagResultsDatabaseItem::ECancelled );	 //commented for NTEI-7EZ9VQ
-       aButtonId = EAknSoftkeyYes;
-       return ETrue;
-       }
-
-    LOGSTRING3( "CDiagAudioPlugin::AskCancelExecutionL() OUT aButtonId=%d result=%d", aButtonId, result )
-    return result;
-    }
-
-// ---------------------------------------------------------------------------
-// CDiagAudioPlugin::ShowConfQueryL
-// ---------------------------------------------------------------------------
-//
-TBool CDiagAudioPlugin::ShowConfQueryL( TInt aResourceId, TInt &aButtonId )
-    {
-    LOGSTRING( "CDiagAudioPlugin::ShowConfQueryL IN" )
-    CAknQueryDialog* dlg    = NULL;
-    TBool            result = EFalse;
-
-    // Create CAknQueryDialog instance
-    dlg = new ( ELeave ) CAknQueryDialog( CAknQueryDialog::ENoTone );
-
-    dlg->PrepareLC( aResourceId );
-
-    // set softkey for single execution
-    /*
-    if ( SinglePluginExecution() )
-        {  */ // ADO & Platformization Changes
-        CEikButtonGroupContainer& cba = dlg->ButtonGroupContainer();
-
-        switch ( aResourceId )
-            {
-            case R_CONFQUERY_ASK_PLAY: 
-                cba.SetCommandSetL( R_DIAG_AUDIO_SOFTKEYS_PLAY_CANCEL );
-                break;
-            default:
-                break;
-            }
-    /*    } */
-
-    result = RunWaitingDialogL( dlg, aButtonId );
-
-    LOGSTRING3( "CDiagAudioPlugin::ShowConfQueryL() OUT aButtonId=%d result=%d", aButtonId, result )
-    return result;
-    }
-
-// ---------------------------------------------------------------------------
-// CDiagAudioPlugin::ShowMessageQueryL
-// ---------------------------------------------------------------------------
-//
-TBool CDiagAudioPlugin::ShowMessageQueryL( TInt aResourceId, TInt &aButtonId  )
-    {
-    LOGSTRING( "CDiagAudioPlugin::ShowMessageQueryL IN" )
-    CAknMessageQueryDialog* dlg    = NULL;
-    TBool                   result = EFalse;
-
-    // Create CAknMessageQueryDialog instance
-    dlg = new ( ELeave ) CAknMessageQueryDialog();
-
-    dlg->PrepareLC( aResourceId );
-     
-    CEikButtonGroupContainer& cba = dlg->ButtonGroupContainer();
-
-        switch ( aResourceId )
-            {
-            case R_MESSAGEQUERY_TITLE: 
-         	   {
-            	   if ( SinglePluginExecution() )
-        		{
-        		cba.SetCommandSetL( R_DIAG_AUDIO_SOFTKEYS_OK_CANCEL );		
-        		}
-        	   else 
-        	   	{	
-                	cba.SetCommandSetL( R_DIAG_AUDIO_SOFTKEYS_OK_SKIP );		
-                }
-        	}
-                break;
-            case R_MESSAGEQUERY_ASK_RECORD:
-                cba.SetCommandSetL( R_DIAG_AUDIO_SOFTKEYS_START_CANCEL );
-                break;
-            default:
-                break;
-            }
-        	
-    result = RunWaitingDialogL( dlg, aButtonId );
-
-    LOGSTRING3( "CDiagAudioPlugin::ShowMessageQueryL() OUT aButtonId=%d result=%d", aButtonId, result )
-    return result;
-    }
-
-// ---------------------------------------------------------------------------
-// CDiagAudioPlugin::ShowProgressNoteL
-// ---------------------------------------------------------------------------
-//
-void CDiagAudioPlugin::ShowProgressNoteL( TInt aResourceId, TInt aFinalValue )
-    {
-    LOGSTRING( "CDiagAudioPlugin::ShowProgressNoteL IN" )
-
-    //CAknProgressDialog* dlg;
-
-    if ( iProgressDialog )
-        {
-        delete iProgressDialog;
-        iProgressDialog = NULL;
-        }
-
-    SetProgressDismissed( EFalse );
-
-   //G iProgressDialog = dlg = new ( ELeave ) CAknProgressDialog(
-   iProgressDialog = new ( ELeave ) CAknProgressDialog(
-        reinterpret_cast <CEikDialog**> (&iProgressDialog),
-        ETrue
-        );
-
-    //G dlg->SetCallback( this );
-    iProgressDialog->SetCallback( this );
-    //G dlg->PrepareLC( aResourceId );
-    iProgressDialog->PrepareLC( aResourceId );
-
-    // set softkey for single execution
-/*    if ( SinglePluginExecution() )
-        { */ // ADO & Platformization Changes  
-        //G CEikButtonGroupContainer& cba = dlg->ButtonGroupContainer();
-        CEikButtonGroupContainer& cba = iProgressDialog->ButtonGroupContainer();
-
-        cba.SetCommandSetL( R_DIAG_AUDIO_SOFTKEYS_STOP_CANCEL );
-   /*     } */ // ADO & Platformization Changes
-
-    //G iProgressInfo = dlg->GetProgressInfoL();
-    iProgressInfo = iProgressDialog->GetProgressInfoL();
-    iProgressInfo->SetFinalValue( aFinalValue * KFive );
-
-    //G dlg->RunLD();
-    iProgressDialog->RunLD();
-
-    // Set up Periodic
-    ClosePeriodic();
-
-    iPeriodic = CPeriodic::NewL( EPriorityNormal );
-    TCallBack callback( CallbackIncrementProgressNoteL, this );
-    iPeriodic->Start( 0, KProgressDelay, callback );
-
-    LOGSTRING( "CDiagAudioPlugin::ShowProgressNoteL OUT" )
-    }
-
-// ---------------------------------------------------------------------------
-// CDiagAudioPlugin::CallbackIncrementProgressNoteL
-// ---------------------------------------------------------------------------
-//
-TInt CDiagAudioPlugin::CallbackIncrementProgressNoteL( TAny* aThis )
-    {
-    TInt err = KErrNone;
-    CDiagAudioPlugin* myThis  = (CDiagAudioPlugin *)aThis;
-
-    TRAP( err, myThis->UpdateProgressNoteL() );
-    if ( err != KErrNone )
-        {
-        LOGSTRING( "CDiagAudioPlugin::CallbackIncrementProgressNoteL:User::Panic() on UpdateProgressNoteL()" )
-        User::Panic( KDiagAudioPluginCategory, err );
-        }
-
-    return KFinished;
-    }
-
-// ---------------------------------------------------------------------------
-// CDiagAudioPlugin::UpdateProgressNoteL
-// ---------------------------------------------------------------------------
-//
-TInt CDiagAudioPlugin::UpdateProgressNoteL()
-    {
-    TTime              intervalTime;
-    TTime              currentTime;
-
-    // Prevent from Screen Saver
-    User::ResetInactivityTime();
-
-    if ( iProgressDialog )
-        {
-        iProgressInfo->IncrementAndDraw(1);
-
-        if ( (iFinalValue * KFive) <= iProgressInfo->CurrentValue() )
-            {
-            if ( ProgressDismissed() == EFalse )
-                {
-                iProgressDialog->ProcessFinishedL();
-                }
-
-            return KProgressFinished;
-            }
-        }
-
-    return KProgressNotFinished;
-    }
-
-// ---------------------------------------------------------------------------
-// From MDiagPlugin
-// CDiagAudioPlugin::IsVisible()
-// ---------------------------------------------------------------------------
-TBool CDiagAudioPlugin::IsVisible() const
-    {
-    return ETrue;
-    }
-
-// ---------------------------------------------------------------------------
-// From MDiagTestPlugin
-// CDiagAudioPlugin::RunMode()
-// ---------------------------------------------------------------------------
-MDiagTestPlugin::TRunMode CDiagAudioPlugin::RunMode() const
-    {
-    return EInteractiveDialog;
-    }
-
-// ---------------------------------------------------------------------------
-// From MDiagTestPlugin
-// CDiagAudioPlugin::TotalSteps()
-// ---------------------------------------------------------------------------
-TUint CDiagAudioPlugin::TotalSteps() const
-    {
-    return EAudioPluginTotalSteps;
-    }
-
-// ---------------------------------------------------------------------------
-// From MDiagPlugin
-// CDiagAudioPlugin::GetPluginNameL
-// ---------------------------------------------------------------------------
-HBufC* CDiagAudioPlugin::GetPluginNameL( TNameLayoutType aLayoutType ) const
-    {
-    switch ( aLayoutType )
-        {
-        case ENameLayoutHeadingPane:
-            return StringLoader::LoadL( R_DIAG_AUDIO_PLUGIN_HEADING_PANE );
-
-        case ENameLayoutPopupInfoPane:
-            return StringLoader::LoadL( R_DIAG_AUDIO_PLUGIN_POPUP_INFO_LIST_PANE );
-
-        case ENameLayoutTitlePane:
-            return StringLoader::LoadL( R_DIAG_AUDIO_PLUGIN_TITLE_PANE );
-
-        case ENameLayoutListSingleGraphic:
-            return StringLoader::LoadL( R_DIAG_AUDIO_PLUGIN_LIST_SINGLE_GRAPHIC_PANE );
-
-        case ENameLayoutListSingle:           
-            return StringLoader::LoadL( R_DIAG_AUDIO_PLUGIN_LIST_SINGLE_GRAPHIC_HEADING_PANE );
-
-        default:
-            LOGSTRING2( "CDiagAudioPlugin::GetPluginNameL: "
-              L"ERROR: Unsupported layout type %d", aLayoutType )
-            __ASSERT_DEBUG( 0, User::Invariant() );
-            return StringLoader::LoadL ( R_DIAG_AUDIO_PLUGIN_LIST_SINGLE_GRAPHIC_HEADING_PANE );
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// From MDiagPlugin
-// CDiagAudioPlugin::Uid
-// ---------------------------------------------------------------------------
-TUid CDiagAudioPlugin::Uid() const
-    {
-    return KDiagAudioPluginUid;
-    }
-
-// ---------------------------------------------------------------------------
-// From CDiagTestPluginBase
-// CDiagAudioPlugin::InitializeL()
-// ---------------------------------------------------------------------------
-void CDiagAudioPlugin::TestSessionBeginL(
-    MDiagEngineCommon& /*aEngine*/,
-    TBool              /*aSkipDependencyCheck*/,
-    TAny*              /*aCustomParams*/)
-    {
-    LOGSTRING( "CDiagAudioPlugin::TestSessionBeginL:: Deleting record file..." )
-    DeleteRecordFile();
-    }
-
-// ---------------------------------------------------------------------------
-// From CDiagTestPluginBase
-// CDiagAudioPlugin::CleanupL()
-// ---------------------------------------------------------------------------
-void CDiagAudioPlugin::TestSessionEndL(
-    MDiagEngineCommon& /*aEngine*/,
-    TBool              /*aSkipDependencyCheck*/,
-    TAny*              /*aCustomParams*/)
-    {
-    LOGSTRING( "CDiagAudioPlugin::TestSessionEndL:: Deleting record file..." )
-    DeleteRecordFile();
-    }
-
-// ---------------------------------------------------------------------------
-// From CDiagTestPluginBase
-// CDiagAudioPlugin::DoRunTestL()
-// ---------------------------------------------------------------------------
-void CDiagAudioPlugin::DoRunTestL()
-    {
-    LOGSTRING( "CDiagAudioPlugin::DoRunTest() IN" )
-
-    // Framework should never call DoRunTestL() before previous test
-    ASSERT_ALWAYS( iRecorder    == NULL );
-    ASSERT_ALWAYS( iAudioPlayer == NULL );
-    ASSERT_ALWAYS( iRouting     == NULL );
-
-    iSessionValid = ETrue;
-
-    // Create Recorder
-    iRecorder = CMdaAudioRecorderUtility::NewL(
-        *this,
-        NULL,
-        KAudioPriorityRecording,
-        TMdaPriorityPreference( KAudioPrefRealOneLocalPlayback )
-        );
-
-    // Create Audio Player
-    iAudioPlayer = CMdaAudioPlayerUtility::NewL( *this );
-
-    // Create Audio Routing
-    iRouting  = CTelephonyAudioRouting::NewL( *this );
-
-    // Check it has been recorded
-    if ( CheckRecordFile() == EFalse )
-        {
-        LOGSTRING( "CDiagAudioPlugin::DoRunTest() Record file does not exist. StartRecordL()" )
-        StartRecordL();
-        }
-     else
-        {
-        LOGSTRING( "CDiagAudioPlugin::DoRunTest() Record file exists. StartPlayL()" )
-        StartPlayL();
-        }
-
-    LOGSTRING( "CDiagAudioPlugin::DoRunTest() OUT" )
-    }
-
-// ---------------------------------------------------------------------------
-// CDiagAudioPlugin::DoStopAndCleanupL
-// ---------------------------------------------------------------------------
-//
-void CDiagAudioPlugin::DoStopAndCleanupL()
-    {
-    LOGSTRING( "CDiagAudioPlugin::DoStopAndCleanupL IN" )
-    // All memory and resource allocated during test execution should be
-    // cleaned up here.
-
-    // Set Session
-    iSessionValid = EFalse;
-
-    // Close Recorder
-    if ( iRecorder )
-    {
-        LOGSTRING( "CDiagAudioPlugin::DoStopAndCleanupL: Stop & Close AudioPlayer" )
-        iRecorder->Stop();
-        iRecorder->Close();
-    }
-
-    // Close Audio
-    if ( iAudioPlayer )
-    {
-        LOGSTRING( "CDiagAudioPlugin::DoStopAndCleanupL: Stop & Close AudioPlayer" )
-        iAudioPlayer->Stop();
-        iAudioPlayer->Close();
-    }
-
-    // Restore AudioOutput
-    RestoreAudioOutputL();
-
-    if ( ResultsDbItemBuilder().TestResult() == CDiagResultsDatabaseItem::ESuccess )
-        {
-        // Test was successful. Do not delete the temporary file.
-        LOGSTRING( "CDiagAudioPlugin::DoStopAndCleanupL: Keep file for next test." )
-        }
-    else
-        {
-        // test was not successful. Delete recorded file.
-        LOGSTRING( "CDiagAudioPlugin::DoStopAndCleanupL:DeleteRecordFile()" )
-        DeleteRecordFile();
-        }
-
-    if ( iAudioState == CMdaAudioRecorderUtility::EPlaying )
-        {
-        LOGSTRING( "CDiagAudioPlugin::DoStopAndCleanupL:RestoreAudioOutputL" )
-        TRAP_IGNORE( RestoreAudioOutputL() );
-        }
-
-    // Call Engine to Dismiss Any Dialog
-    DismissWaitingDialog();
-
-    // Close which can be recovered by running doRunTestL()
-    ClosePeriodic();
-
-    // Clean up resources allocated during object creation.
-    delete iRecorder;
-    iRecorder = NULL;
-
-    delete iAudioPlayer;
-    iAudioPlayer = NULL;
-
-    delete iRouting;
-    iRouting = NULL;
-
-    // Cleanup Progress Dialog
-    LOGSTRING( "Cleanup Progress Dialog" )
-    if ( iProgressDialog )
-        {
-        delete iProgressDialog;
-        iProgressDialog = NULL;
-        }
-
-    SetProgressDismissed( ETrue );
-
-    LOGSTRING( "CDiagAudioPlugin::DoStopAndCleanupL OUT" )
-    }
-
-// ---------------------------------------------------------------------------
-// From CActive
-// CDiagAudioPlugin::RunL
-// ---------------------------------------------------------------------------
-void CDiagAudioPlugin::RunL()
-    {           
-    	switch(iState)
-    	{
-    	case EStateCancelled:
-        	CompleteTestL( CDiagResultsDatabaseItem::ESkipped );
-        	return;
-    	case EStateRecorded:
-    		AfterRecordL();
-    		break;
-    	case EStatePlayed:
-    		AfterPlayL();
-    		break;
-    	}
-    }
-
-// ---------------------------------------------------------------------------
-// From CActive
-// CDiagAudioPlugin::DoCancel
-// ---------------------------------------------------------------------------
-void CDiagAudioPlugin::DoCancel()
-    {
-    // Stop active request. This class does not use Async request using iStatus.
-    }
-
-// ---------------------------------------------------------------------------
-// CDiagAudioPlugin::DialogDismissedL
-// ---------------------------------------------------------------------------
-//
-void CDiagAudioPlugin::DialogDismissedL( TInt aButtonId )
-    {
-    LOGSTRING2( "CDiagAudioPlugin::DialogDismissedL: aButtonId = %d", aButtonId )
-
-    TInt        prevState;
-
-    SetProgressDismissed( ETrue );
-
-    // Restore Audio Output in case of Playing
-    if ( iAudioState == CMdaAudioRecorderUtility::EPlaying )
-        {
-        LOGSTRING( "CDiagAudioPlugin::DialogDismissedL: Calling RestoreAudioOutputL" )
-        RestoreAudioOutputL();
-        }
-
-    // Stop Recording / Playing
-    if ( iAudioState == CMdaAudioRecorderUtility::ERecording )
-        {
-        LOGSTRING( "CDiagAudioPlugin::DialogDismissedL:: Stop. Record" )
-        if ( iRecorder )
-            {
-            iRecorder->Stop();
-            iRecorder->Close();
-            }
-        }
-    else if ( iAudioState == CMdaAudioRecorderUtility::EPlaying )
-        {
-        LOGSTRING( "CDiagAudioPlugin::DialogDismissedL:: Stop. Play" )
-        if ( iAudioPlayer )
-            {
-            iAudioPlayer->Stop();
-            iAudioPlayer->Close();
-            }
-        }
-
-    // If button has not pressed
-    if ( ( aButtonId != ECBACmdSkip )   &&
-         ( aButtonId != ECBACmdCancel ) &&
-         ( aButtonId != EEikBidCancel ) &&  // for NTEI-7EZ9VQ
-         ( aButtonId != EAknSoftkeyOk ) &&
-         ( aButtonId != EAknSoftkeyDone) )
-        {
-        LOGSTRING2( "CDiagAudioPlugin::DialogDismissedL: Button not pressed. aButtonId = %d", aButtonId )
-        return;
-        }
-
-    // Skip
-    if ( aButtonId == ECBACmdSkip )
-        {
-        LOGSTRING( "CDiagAudioPlugin::DialogDismissedL:: aButtonId == ECBACmdSkip" )
-        CompleteTestL( CDiagResultsDatabaseItem::ESkipped );
-        return;
-        }
-
-    // Cancel
-    else if ( aButtonId == ECBACmdCancel || aButtonId == EEikBidCancel) // for NTEI-7EZ9VQ
-        {
-        LOGSTRING( "CDiagAudioPlugin::DialogDismissedL:: aButtonId == ECBACmdCancel" )
-
-        prevState   = iAudioState;
-        iAudioState = CMdaAudioRecorderUtility::EOpen;
-
-        TInt   cancelButtonId;
-        TBool  cancelResult = EFalse;
-
-        cancelResult = AskCancelExecutionL( cancelButtonId );
-        
-        if ( !cancelResult )
-            {
-            LOGSTRING( "CDiagAudioPlugin::StartPlayL - !iSessionValid 6" )
-            return;
-            }
-
-        switch ( cancelButtonId )  // for NTEI-7EZ9VQ
-             {
-            case EAknSoftkeyYes: 
-                LOGSTRING( "CDiagAudioPlugin::DialogDismissedL:: EAknSoftkeyYes return NOW!!" )
-                SetAudioEvent(EStateCancelled);
-            	return;
-
-            default:
-                if ( prevState == CMdaAudioRecorderUtility::ERecording )
-                    {
-                    LOGSTRING( "CDiagAudioPlugin::DialogDismissedL:: Start RecordL" )
-                    RecordL();
-                    }
-                else if ( prevState == CMdaAudioRecorderUtility::EPlaying )
-                    {
-                    LOGSTRING( "CDiagAudioPlugin::DialogDismissedL:: Start PlayL" )
-                    PlayL();
-                    }
-                break;
-            }
-        return;
-        }
-
-    // Stop
-    else
-        {
-        LOGSTRING2( "CDiagAudioPlugin::DialogDismissedL: AudioState = %d", iAudioState )
-        if ( iAudioState == CMdaAudioRecorderUtility::ERecording )
-            {
-                LOGSTRING( "CDiagAudioPlugin::DialogDismissedL:: Stop. Record" )
-                if ( iRecorder &&  iState == EStateUnknown)
-                    {
-                    LOGSTRING( "CDiagAudioPlugin::DialogDismissedL:: Stop. Call AfterRecordL()" )
-                    SetAudioEvent(EStateRecorded);
-                    }
-            }
-        else if ( iAudioState == CMdaAudioRecorderUtility::EPlaying )
-            {
-                LOGSTRING( "CDiagAudioPlugin::DialogDismissedL:: Stop. Play" )
-                if ( iAudioPlayer && iState == EStateRecorded)
-                    {
-                    LOGSTRING( "CDiagAudioPlugin::DialogDismissedL:: Stop. Call AfterPlayL()" )
-                    // Stop playback/recording
-                    SetAudioEvent(EStatePlayed);
-                    }
-            }
-        }
-    }
-
-
-void CDiagAudioPlugin::SetAudioEvent(TState aState)
-    {
-    iState = aState;
-    SetActive();
-    TRequestStatus* status = &iStatus;
-    User::RequestComplete(status, KErrNone);
-    }
-
-// ---------------------------------------------------------------------------
-// CDiagAudioPlugin::MoscoStateChangeEvent
-// ---------------------------------------------------------------------------
-//
-void CDiagAudioPlugin::MoscoStateChangeEvent(
-    CBase* /*aObject*/,
-    TInt   aPreviousState,
-    TInt   aCurrentState,
-    TInt   aErrorCode
-)
-    {
-    TInt err = KErrNone;
-
-    LOGSTRING4( "CDiagAudioPlugin::MoscoStateChangeEvent:IN (%d -> %d, %d )", aPreviousState, aCurrentState, aErrorCode )
-
-    // 1. Record reaches to the end of file
-    if ( aErrorCode == KErrEof )
-        {
-        iAudioState = CMdaAudioRecorderUtility::EOpen;
-        iState = EStateRecorded;
-        TRAP( err, AfterRecordL() );
-        }
-
-    // 2. Start - Recording
-    else if ( ( aPreviousState == CMdaAudioRecorderUtility::ENotReady)  &&
-              ( aCurrentState  == CMdaAudioRecorderUtility::EOpen    ) )
-        {
-        LOGSTRING( "CDiagAudioPlugin::MoscoStateChangeEvent: Leave on RecordingL()" )
-        TRAP( err, RecordingL() );
-        LOGSTRING2( "CDiagAudioPlugin::MoscoStateChangeEvent: RecordingL() err = %d", err )
-        }
-
-    // 3. Stopped - Recording
-    else if ( ( aPreviousState == CMdaAudioRecorderUtility::ERecording ) &&
-              ( aCurrentState  == CMdaAudioRecorderUtility::EOpen )
-            )
-        {
-        LOGSTRING( "CDiagAudioPlugin::MoscoStateChangeEvent: Leave on AfterRecordL()" )
-        iState = EStateRecorded;
-        TRAP( err, AfterRecordL() );
-        LOGSTRING2( "CDiagAudioPlugin::MoscoStateChangeEvent: AfterRecordL() err = %d", err )
-        }
-
-    // Handle for Trap
-    if (err != KErrNone)
-        {
-        LOGSTRING2( "CDiagAudioPlugin::MoscoStateChangeEvent:Call CompleteTestL with error = %d", err )
-        TRAP( err, CompleteTestL(CDiagResultsDatabaseItem::EFailed) );
-        if ( err != KErrNone )
-            {
-            LOGSTRING( "CDiagAudioPlugin::MoscoStateChangeEvent:User::Panic()" )
-            User::Panic( KDiagAudioPluginCategory, err );
-            }
-        return; // Fail Test
-        }
-    LOGSTRING( "CDiagAudioPlugin::MoscoStateChangeEvent OUT" )
-    }
-
-// ---------------------------------------------------------------------------
-// CDiagAudioPlugin::MapcInitComplete
-// ---------------------------------------------------------------------------
-//
-void CDiagAudioPlugin::MapcInitComplete(TInt aError, const TTimeIntervalMicroSeconds& aDuration)
-    {
-    LOGSTRING2( "CDiagAudioPlugin::MapcInitComplete: aError=%d", aError )
-
-    // Set Duration
-    iPositionMicroSec    = 0;
-    iMaxDurationMicroSec = aDuration;
-
-    // Set Priority of AudioPlayer
-    iAudioPlayer->SetPriority(
-        KAudioPriorityAlarm + 1,
-        TMdaPriorityPreference( KAudioPrefVoiceRec )
-        );
-    
-    TInt err = KErrNone;
-    // Set Audio Output
-    TRAP(err,iRouting->SetOutputL( iOutput ));
-    if(err != KErrNone) // Added TRAP for removing code scanner warning
-        {
-        LOGSTRING2( "CDiagAudioPlugin::MapcInitComplete:Call CompleteTestL with error = %d", err )
-        TRAP( err, CompleteTestL(CDiagResultsDatabaseItem::EFailed) );
-        
-        if ( err != KErrNone )
-            {
-            LOGSTRING( "CDiagAudioPlugin::MapcInitComplete:User::Panic()" )
-            User::Panic( KDiagAudioPluginCategory, err );
-            }
-        return;
-        }
-
-    // Start Playing
-    TRAP( err, PlayingL() );
-
-    // Handle for Trap
-    if ( err != KErrNone )
-        {
-        LOGSTRING2( "CDiagAudioPlugin::MapcInitComplete:Call CompleteTestL with error = %d", err )
-        TRAP( err, CompleteTestL(CDiagResultsDatabaseItem::EFailed) );
-
-        if ( err != KErrNone )
-            {
-            LOGSTRING( "CDiagAudioPlugin::MapcInitComplete:User::Panic()" )
-            User::Panic( KDiagAudioPluginCategory, err );
-            }
-
-        return; // Fail Test
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// CDiagAudioPlugin::MapcPlayComplete
-// ---------------------------------------------------------------------------
-//
-void CDiagAudioPlugin::MapcPlayComplete(TInt aError)
-    {
-    TInt err = KErrNone;
-    LOGSTRING2( "CDiagAudioPlugin::MapcPlayComplete: aError=%d", aError )
-
-    if ( aError == KErrNone)
-        {
-        LOGSTRING( "CDiagAudioPlugin::MapcPlayComplete KErrNone" )
-        TRAP(err,RestoreAudioOutputL());
-        
-        if ( err != KErrNone )
-	        {
-	        LOGSTRING2( "CDiagAudioPlugin::MapcInitComplete:Call CompleteTestL with error = %d", err )
-	        TRAP( err, CompleteTestL(CDiagResultsDatabaseItem::EFailed) );
-	
-	        if ( err != KErrNone )
-	            {
-	            LOGSTRING( "CDiagAudioPlugin::MapcInitComplete:User::Panic()" )
-	            User::Panic( KDiagAudioPluginCategory, err );
-	            }
-	
-	        return; // Fail Test
-	        }
-        
-        if(iState == EStateRecorded)
-            {
-        // Stop and Close Audio Player
-        if ( iAudioPlayer )
-            {
-            iAudioPlayer->Stop();
-            iAudioPlayer->Close();
-                iState = EStatePlayed;
-            }
-
-        TRAP(err,AfterPlayL());
-        
-        if ( err != KErrNone )
-	        {
-	        LOGSTRING2( "CDiagAudioPlugin::MapcInitComplete:Call CompleteTestL with error = %d", err )
-	        TRAP( err, CompleteTestL(CDiagResultsDatabaseItem::EFailed) );
-	
-	        if ( err != KErrNone )
-	            {
-	            LOGSTRING( "CDiagAudioPlugin::MapcInitComplete:User::Panic()" )
-	            User::Panic( KDiagAudioPluginCategory, err );
-	            }
-	
-	        return; // Fail Test
-	        }
-        
-            }
-        return;
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// CDiagAudioPlugin::AvailableOutputsChanged
-// ---------------------------------------------------------------------------
-//
-void CDiagAudioPlugin::AvailableOutputsChanged( CTelephonyAudioRouting& /*aTelephonyAudioRouting */ )
-    {
-    LOGSTRING( "CDiagAudioPlugin::AvailableOutputsChanged" )
-    }
-
-// ---------------------------------------------------------------------------
-// CDiagAudioPlugin::OutputChanged
-// ---------------------------------------------------------------------------
-//
-void CDiagAudioPlugin::OutputChanged( CTelephonyAudioRouting& /* aTelephonyAudioRouting */)
-    {
-    LOGSTRING( "CDiagAudioPlugin::OutputChanged" )
-    }
-
-// ---------------------------------------------------------------------------
-// CDiagAudioPlugin::SetOutputComplete
-// ---------------------------------------------------------------------------
-//
-void CDiagAudioPlugin::SetOutputComplete(
-    CTelephonyAudioRouting&    /*aTelephonyAudioRouting */,
-    TInt                       aError
-    )
-    {
-    LOGSTRING2( "CDiagAudioPlugin::SetOutputComplete aError=%d", aError )
-    }
-// End of File
--- a/devicediagnostics/diagplugins/diagearpieceplugin/src/diagaudiopluginimplementationtable.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-/*
-* 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:  ECOM proxy table for DiagTimerTestPlugin
-*
-*/
-
-
-// INCLUDES
-#include "diagaudioplugin.hrh"
-#include "diagaudioplugin.h"
-#include <implementationproxy.h>
-
-
-// CONSTANTS
-const TImplementationProxy KDiagAudioPluginImplementationTable[] =
-	{
-	IMPLEMENTATION_PROXY_ENTRY( DIAG_AUDIO_PLUGIN_UID, CDiagAudioPlugin::NewL )
-	};
-
-// ---------------------------------------------------------------------------
-// ImplementationGroupProxy
-//
-// Gate/factory function
-// ---------------------------------------------------------------------------
-//
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy(
-                                                  TInt& aTableCount )
-	{
-	aTableCount = sizeof( KDiagAudioPluginImplementationTable )
-        / sizeof( TImplementationProxy );
-	return KDiagAudioPluginImplementationTable;
-	}
-
-// End of File
-
--- a/devicediagnostics/diagplugins/diagexternalmediacardplugin/data/devdiagexternalmediacardplugin.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-/*
-* 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:  ECOM plugin resource file for External Media Card Plugin
-*
-*/
-
-#include <registryinfo.rh>
-
-
-RESOURCE REGISTRY_INFO theInfo
-    {
-    dll_uid     = 0x2000E58A;
-    interfaces  =
-        {
-        INTERFACE_INFO
-            {
-            interface_uid   = 0x2000AFEB;
-            implementations =
-                {
-                IMPLEMENTATION_INFO
-                    {
-                    implementation_uid  = 0x2000E58B;
-                    version_no          = 1;
-                    display_name        = "External Media Card Plugin";
-                    default_data        = "0x2000E569"; //HW suite";
-                    opaque_data         =   "<diagplugininfo>" 
-                                                "<order number=\"50\"/>"
-                                            "</diagplugininfo>";
-                    }
-                };
-            }
-        };
-    }
-
-
-// End of File
--- a/devicediagnostics/diagplugins/diagexternalmediacardplugin/data/devdiagexternalmediacardpluginrsc.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,284 +0,0 @@
-/*
-* 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:  Resource file for DiagExternalMediaCardPlugin
-*
-*/
-
-
-//  RESOURCE IDENTIFIER
-NAME    DGMT // 4 letter ID
-
-//  INCLUDES
-#include    "diagexternalmediacardplugin.hrh"
-#include    <diagexternalmediacardplugin.loc>
-
-#include    <avkon.loc>
-#include    <avkon.mbg>
-#include    <avkon.rsg>
-#include    <avkon.rh> // ADO & Platformization Changes
-#include    <AvkonIcons.hrh>
-#include    <bldvariant.hrh>
-#include    <data_caging_paths_strings.hrh>
-#include    <eikcore.rsg>
-#include    <eikon.rsg>
-#include    <uikon.rh>
-#include    <eikon.rh>
-
-// CONSTANTS
-
-//  RESOURCE DEFINITIONS
-
-RESOURCE RSS_SIGNATURE
-    {
-    }
-
-RESOURCE TBUF
-    {
-    buf="DGMT";
-    }
-
-//----------------------------------------------------
-//  r_diag_external_media_card_plugin_name
-//
-// Timer Test Plugin caption 
-//----------------------------------------------------
-//
-RESOURCE TBUF r_diag_external_media_card_plugin_name
-    {
-    buf = qtn_diag_lst_external_memory;
-    }
-
-//----------------------------------------------------
-//  qtn_diag_lst_test_mmc
-//
-// External Media Card Plugin Text 
-//----------------------------------------------------
-//
-RESOURCE TBUF r_qtn_diag_lst_test_mmc
-    {
-    buf = qtn_diag_lst_test_mmc;
-    }
-    
-
-//----------------------------------------------------
-//  r_qtn_diag_msg_title_mmc
-//
-// External Media Card Plugin Text 
-//----------------------------------------------------
-//
-RESOURCE TBUF r_qtn_diag_msg_title_mmc
-    {
-    buf = qtn_diag_msg_title_mmc;
-    }
-
-//----------------------------------------------------
-//  r_qtn_diag_msg_info_mmc
-//
-// External Media Card Plugin Text 
-//----------------------------------------------------
-//
-RESOURCE TBUF r_qtn_diag_msg_info_mmc
-    {
-    buf = qtn_diag_msg_info_mmc;
-    }
-
-//----------------------------------------------------
-//  r_qtn_diag_title_test_external_memory
-//
-// External Media Card Plugin Text 
-//----------------------------------------------------
-//
-RESOURCE TBUF r_qtn_diag_title_test_external_memory
-    {
-    buf = qtn_diag_title_test_external_memory;
-    }
-  
-// ADO & Platformization Changes  
-
-RESOURCE CBA r_ext_memory_softkeys_ok_skip
-{
-		buttons = 
-		{
-				CBA_BUTTON
-				{
-						id  = EAknSoftkeyOk; 
-						txt = text_softkey_ok; 
-				},
-				
-				CBA_BUTTON
-				{
-						id 	= ECBACmdSkip;
-						txt = qtn_diag_softk_skip;
-				}
-		};
-}
-
-
-//----------------------------------------------------
-// r_ext_memory_softkeys_ok_cancel
-// CBA for OK_CANCEL
-//----------------------------------------------------
-//
-
-RESOURCE CBA r_ext_memory_softkeys_ok_cancel
-{
-		buttons =
-		{
-				CBA_BUTTON
-				{
-						id 	= EAknSoftkeyOk;
-						txt = text_softkey_ok;
-				},
-				
-				CBA_BUTTON
-				{
-						id  = ECBACmdCancel;
-						txt = text_softkey_cancel;
-				}
-		};
-}
-
-
-RESOURCE CBA r_ext_memory_softkeys_yes_no
-{
-        buttons =
-        {
-                CBA_BUTTON
-                {
-                        id  = EAknSoftkeyYes;
-                        txt = text_softkey_yes;
-                },
-                
-                CBA_BUTTON
-                {
-                        id  = ECBACmdNo ;
-                        txt = text_softkey_no;
-                }
-        };
-}
-
-
-RESOURCE DIALOG r_messagequery_title_externalmemory
-{
-		flags = EGeneralQueryFlags;
-		buttons = r_ext_memory_softkeys_ok_cancel;
-		items =
-		{
-				DLG_LINE
-				{
-						type = EAknCtPopupHeadingPane;
-						id = EAknMessageQueryHeaderId;
-						
-						control = AVKON_HEADING
-						{
-								label = qtn_diag_msg_title_mmc;
-								headinglayout = R_AVKON_WML_SIGN_QUERY_HEADING_PANE;
-						};
-				},
-				
-			 DLG_LINE
-			 {
-			 		type = EAknCtMessageQuery;
-			 		id = EAknMessageQueryContentId;
-			 		control = AVKON_MESSAGE_QUERY
-			 		{
-			 				message = qtn_diag_msg_info_mmc;
-			 		};
-			 }
-		};
-}
-
-
-
-
-RESOURCE DIALOG r_messagequery_no_externalmemory
-{
-		flags = EGeneralQueryFlags;
-		buttons = r_ext_memory_softkeys_yes_no;
-		items =
-		{
-				DLG_LINE
-				{
-						type = EAknCtPopupHeadingPane;
-						id = EAknMessageQueryHeaderId;
-						
-						control = AVKON_HEADING
-						{
-								label = qtn_diag_msg_title_mmc;
-								headinglayout = R_AVKON_WML_SIGN_QUERY_HEADING_PANE;
-						};
-				},
-				
-			 DLG_LINE
-			 {
-			 		type = EAknCtMessageQuery;
-			 		id = EAknMessageQueryContentId;
-			 		control = AVKON_MESSAGE_QUERY
-			 		{
-			 				message = qtn_diag_msg_no_mmc;
-			 		};
-			 }
-		};
-}
-
-//----------------------------------------------------
-//  r_extmem_softkeys_stop__cancel
-//
-// Buttons shown during the test. Shown when the
-// test is run as a part of a suite.
-//----------------------------------------------------
-//
-RESOURCE CBA r_extmem_softkeys_cancel
-    {
-    buttons = 
-        {
-       CBA_BUTTON 
-	        { 
-            id  = EAknSoftkeyEmpty; 
-            txt = text_softkey_empty;
-	        },
-
-        CBA_BUTTON 
-	        { 
-            id  = ECBACmdCancel;      // .hrh 
-            txt = text_softkey_cancel; // .rls or .loc
-	        } 
-
-	
-        };
-    }
-	
-RESOURCE DIALOG r_extmem_plugin_wait_note
-    {
-    flags = EAknWaitNoteFlags | EEikDialogFlagNotifyEsc;
-    //buttons = R_AVKON_SOFTKEYS_EMPTY;
-	buttons = r_extmem_softkeys_cancel;
-    items =
-        {
-        DLG_LINE
-            {
-            type = EAknCtNote;
-            id = EYBWaitNoteId;
-            control= AVKON_NOTE 
-                { 
-                layout = EWaitLayout;
-                singular_label = qtn_diag_msg_testing_memory_card;
-                animation = R_QGN_GRAF_WAIT_BAR_ANIM;
-                };
-            }
-        };
-    }
-	
-// changes ends
-//End of File
--- a/devicediagnostics/diagplugins/diagexternalmediacardplugin/group/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-/*
-* 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:  This file provides the information required for building
-*                DiagExternalMediaCardPlugin
-*
-*/
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-../loc/diagexternalmediacardplugin.loc        MW_LAYER_LOC_EXPORT_PATH(diagexternalmediacardplugin.loc)
-../rom_files/devdiagextmediacardplugin.iby		CORE_MW_LAYER_IBY_EXPORT_PATH(devdiagextmediacardplugin.iby)
-../rom_files/devdiagextmediacardplugin_resources.iby		LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(devdiagextmediacardplugin_resources.iby)
-
-PRJ_MMPFILES
-diagexternalmediacardplugin.mmp
-
-
-PRJ_TESTMMPFILES
-
-//  End of File
--- a/devicediagnostics/diagplugins/diagexternalmediacardplugin/group/diagexternalmediacardplugin.mmp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-/*
-* 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:  Project specification file.
-*
-*/
-
-
-#include  <data_caging_paths.hrh>    // For RESOURCE_FILES_DIR
-// To get the MW_LAYER_SYSTEMINCLUDE-definition
-#include <platform_paths.hrh>
-
-CAPABILITY          CAP_ECOM_PLUGIN
-TARGET              devdiagexternalmediacardplugin.dll
-TARGETTYPE          PLUGIN
-UID                 0x10009D8D 0x2000E58A
-VENDORID            VID_DEFAULT
-
-
-SOURCEPATH  ../src
-SOURCE      diagexternalmediacardpluginimplementationtable.cpp
-SOURCE      diagexternalmediacardplugin.cpp
-
-//User include paths
-USERINCLUDE     ../inc
-USERINCLUDE     ../data // For *.rh
-USERINCLUDE     ../loc
-
-//System include paths
-SYSTEMINCLUDE   /epoc32/include/ecom
-
-// Default system include paths for middleware layer modules.
-APP_LAYER_SYSTEMINCLUDE
-
-SOURCEPATH      ../data
-
-START RESOURCE  devdiagexternalmediacardplugin.rss
-TARGET          devdiagexternalmediacardplugin.rsc
-TARGETPATH      ECOM_RESOURCE_DIR
-END
-
-START RESOURCE  devdiagexternalmediacardpluginrsc.rss
-HEADER
-TARGETPATH      RESOURCE_FILES_DIR
-LANGUAGE_IDS
-END
-
-LIBRARY   euser.lib
-LIBRARY   efsrv.lib
-LIBRARY	  avkon.lib				// ADO & Platformization Changes
-
-LIBRARY   commonengine.lib      // For RConeResourceLoader
-LIBRARY   featmgr.lib           // Feature manager
-LIBRARY   flogger.lib           // for LOGGER
-LIBRARY   diagframework.lib  	// ADO & Platformization Changes
-LIBRARY   diagpluginbase.lib
-
-LIBRARY   platformenv.lib 		// For MMC drive letter.
-LIBRARY	  sysutil.lib  			// for sysutil
-// ADO & Platformization Changes
-LIBRARY   eikcoctl.lib
-LIBRARY   eikdlg.lib
-// End of File
--- a/devicediagnostics/diagplugins/diagexternalmediacardplugin/group/diagexternalmediacardplugin.xml	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2041 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!DOCTYPE PROJECT [
- <!ELEMENT PROJECT (TARGETLIST, TARGETORDER, GROUPLIST, DESIGNLIST?)>
- <!ELEMENT TARGETLIST (TARGET+)>
- <!ELEMENT TARGET (NAME, SETTINGLIST, FILELIST?, LINKORDER?, SEGMENTLIST?, OVERLAYGROUPLIST?, SUBTARGETLIST?, SUBPROJECTLIST?, FRAMEWORKLIST?, PACKAGEACTIONSLIST?)>
- <!ELEMENT NAME (#PCDATA)>
- <!ELEMENT USERSOURCETREETYPE (#PCDATA)>
- <!ELEMENT PATH (#PCDATA)>
- <!ELEMENT FILELIST (FILE*)>
- <!ELEMENT FILE (PATHTYPE, PATHROOT?, ACCESSPATH?, PATH, PATHFORMAT?, ROOTFILEREF?, FILEKIND?, FILEFLAGS?)>
- <!ELEMENT PATHTYPE (#PCDATA)>
- <!ELEMENT PATHROOT (#PCDATA)>
- <!ELEMENT ACCESSPATH (#PCDATA)>
- <!ELEMENT PATHFORMAT (#PCDATA)>
- <!ELEMENT ROOTFILEREF (PATHTYPE, PATHROOT?, ACCESSPATH?, PATH, PATHFORMAT?)>
- <!ELEMENT FILEKIND (#PCDATA)>
- <!ELEMENT FILEFLAGS (#PCDATA)>
- <!ELEMENT FILEREF (TARGETNAME?, PATHTYPE, PATHROOT?, ACCESSPATH?, PATH, PATHFORMAT?)>
- <!ELEMENT TARGETNAME (#PCDATA)>
- <!ELEMENT SETTINGLIST ((SETTING|PANELDATA)+)>
- <!ELEMENT SETTING (NAME?, (VALUE|(SETTING+)))>
- <!ELEMENT PANELDATA (NAME, VALUE)>
- <!ELEMENT VALUE (#PCDATA)>
- <!ELEMENT LINKORDER (FILEREF*)>
- <!ELEMENT SEGMENTLIST (SEGMENT+)>
- <!ELEMENT SEGMENT (NAME, ATTRIBUTES?, FILEREF*)>
- <!ELEMENT ATTRIBUTES (#PCDATA)>
- <!ELEMENT OVERLAYGROUPLIST (OVERLAYGROUP+)>
- <!ELEMENT OVERLAYGROUP (NAME, BASEADDRESS, OVERLAY*)>
- <!ELEMENT BASEADDRESS (#PCDATA)>
- <!ELEMENT OVERLAY (NAME, FILEREF*)>
- <!ELEMENT SUBTARGETLIST (SUBTARGET+)>
- <!ELEMENT SUBTARGET (TARGETNAME, ATTRIBUTES?, FILEREF?)>
- <!ELEMENT SUBPROJECTLIST (SUBPROJECT+)>
- <!ELEMENT SUBPROJECT (FILEREF, SUBPROJECTTARGETLIST)>
- <!ELEMENT SUBPROJECTTARGETLIST (SUBPROJECTTARGET*)>
- <!ELEMENT SUBPROJECTTARGET (TARGETNAME, ATTRIBUTES?, FILEREF?)>
- <!ELEMENT FRAMEWORKLIST (FRAMEWORK+)>
- <!ELEMENT FRAMEWORK (FILEREF, DYNAMICLIBRARY?, VERSION?)>
- <!ELEMENT PACKAGEACTIONSLIST (PACKAGEACTION+)>
- <!ELEMENT PACKAGEACTION (#PCDATA)>
- <!ELEMENT LIBRARYFILE (FILEREF)>
- <!ELEMENT VERSION (#PCDATA)>
- <!ELEMENT TARGETORDER (ORDEREDTARGET|ORDEREDDESIGN)*>
- <!ELEMENT ORDEREDTARGET (NAME)>
- <!ELEMENT ORDEREDDESIGN (NAME, ORDEREDTARGET+)>
- <!ELEMENT GROUPLIST (GROUP|FILEREF)*>
- <!ELEMENT GROUP (NAME, (GROUP|FILEREF)*)>
- <!ELEMENT DESIGNLIST (DESIGN+)>
- <!ELEMENT DESIGN (NAME, DESIGNDATA)>
- <!ELEMENT DESIGNDATA (#PCDATA)>
-]>
-<?codewarrior exportversion="1.0.1" ideversion="5.0" ?>
-<PROJECT>
-    <TARGETLIST>
-        <TARGET>
-            <NAME>WINSCW UDEB</NAME>
-            <SETTINGLIST>
-
-                <!-- Settings for "Source Trees" panel -->
-                <SETTING><NAME>UserSourceTrees</NAME></SETTING>
-
-                <!-- Settings for "Access Paths" panel -->
-                <SETTING><NAME>AlwaysSearchUserPaths</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>InterpretDOSAndUnixPaths</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>RequireFrameworkStyleIncludes</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>SourceRelativeIncludes</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>UserSearchPaths</NAME>
-                    <SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics\GSDeviceDiagnosticsPlugin\DevDiagApp\diagplugins\diagexternalmediacardplugin\inc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics\GSDeviceDiagnosticsPlugin\DevDiagApp\diagplugins\diagexternalmediacardplugin\data</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics\GSDeviceDiagnosticsPlugin\DevDiagApp\diagplugins\diagexternalmediacardplugin\loc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics\GSDeviceDiagnosticsPlugin\DevDiagApp\diagplugins\diagexternalmediacardplugin\group</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics\GSDeviceDiagnosticsPlugin\DevDiagApp\diagplugins\diagexternalmediacardplugin\src</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING></SETTING>
-                <SETTING><NAME>SystemSearchPaths</NAME>
-                    <SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\ecom</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\oem</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\middleware</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\middleware</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\osextensions</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\osextensions</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\osextensions\loc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\middleware\loc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\osextensions\loc\sc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\middleware\loc\sc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\UDEB</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>Symbian_Support\Win32-x86 Support\Libraries\Win32 SDK</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>CodeWarrior</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>Symbian_Support\Runtime\Runtime_x86\Runtime_Win32\Libs</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>CodeWarrior</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING></SETTING>
-
-                <!-- Settings for "Debugger Runtime" panel -->
-                <SETTING><NAME>MWRuntimeSettings_WorkingDirectory</NAME><VALUE/></SETTING>
-                <SETTING><NAME>MWRuntimeSettings_CommandLine</NAME><VALUE/></SETTING>
-                <SETTING><NAME>MWRuntimeSettings_HostApplication</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\udeb\epoc.exe</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>MWRuntimeSettings_EnvVars</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Target Settings" panel -->
-                <SETTING><NAME>Linker</NAME><VALUE>Symbian Linker v2</VALUE></SETTING>
-                <SETTING><NAME>PreLinker</NAME><VALUE/></SETTING>
-                <SETTING><NAME>PostLinker</NAME><VALUE>Symbian Installer v2</VALUE></SETTING>
-                <SETTING><NAME>Targetname</NAME><VALUE>WINSCW UDEB</VALUE></SETTING>
-                <SETTING><NAME>OutputDirectory</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\udeb</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SaveEntriesUsingRelativePaths</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "File Mappings" panel -->
-                <SETTING><NAME>FileMappings</NAME>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>._i</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>._ii</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.c</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cc</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cfg</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cia</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cpp</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cwlink</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>XML</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cxx</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.def</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.h</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.hrh</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.i</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.iby</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.ii</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.inf</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.ini</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.inl</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.loc</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.mmpi</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.pch++</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.pkg</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.policy</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.ra</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.resources</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Resource v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>XML</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.rh</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.rls</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.rss</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.rsg</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.s</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.script</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.txt</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.a</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Object Importer v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.lib</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Object Importer v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.dso</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Object Importer v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.o</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Object Importer v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                </SETTING>
-
-                <!-- Settings for "Build Extras" panel -->
-                <SETTING><NAME>CacheModDates</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>DumpBrowserInfo</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>CacheSubprojects</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>UseThirdPartyDebugger</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>BrowserGenerator</NAME><VALUE>2</VALUE></SETTING>
-                <SETTING><NAME>DebuggerAppPath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>DebuggerCmdLineArgs</NAME><VALUE/></SETTING>
-                <SETTING><NAME>DebuggerWorkingDir</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CodeCompletionPrefixFileName</NAME><VALUE/></SETTING>
-                <SETTING><NAME>CodeCompletionMacroFileName</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Debugger Target" panel -->
-                <SETTING><NAME>ConsoleEncoding</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>LogSystemMessages</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>AutoTargetDLLsPopUp</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>StopAtWatchpoints</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>PauseWhileRunning</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>PauseInterval</NAME><VALUE>5</VALUE></SETTING>
-                <SETTING><NAME>PauseUIFlags</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>AltExePath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>StopAtTempBPOnLaunch</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>CacheSymbolics</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>TempBPFunctionName</NAME><VALUE>E32Main</VALUE></SETTING>
-                <SETTING><NAME>TempBPType</NAME><VALUE>1</VALUE></SETTING>
-
-                <!-- Settings for "Remote Debug" panel -->
-                <SETTING><NAME>Enabled</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>ConnectionName</NAME><VALUE/></SETTING>
-                <SETTING><NAME>DownloadPath</NAME><VALUE/></SETTING>
-                <SETTING><NAME>LaunchRemoteApp</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>RemoteAppPath</NAME><VALUE/></SETTING>
-                <SETTING><NAME>CoreID</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>JTAGClockSpeed</NAME><VALUE>8000</VALUE></SETTING>
-                <SETTING><NAME>IsMultiCore</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>OSDownload</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>UseGlobalOSDownload</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>OSDownloadConnectionName</NAME><VALUE/></SETTING>
-                <SETTING><NAME>OSDownloadPath</NAME><VALUE/></SETTING>
-                <SETTING><NAME>AltDownload</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>AltDownloadConnectionName</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "x86 Exceptions" panel -->
-                <SETTING><NAME>MWDebugger_X86_Exceptions</NAME>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                
-                <!-- Settings for "Auto-target" panel -->
-                <SETTING><NAME>OtherExecutables</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Analyzer Connections" panel -->
-                <SETTING><NAME>AnalyzerConnectionName</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Custom Keywords" panel -->
-                <SETTING><NAME>CustomColor1</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor2</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor3</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor4</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "ARM Debugger" panel -->
-                <SETTING><NAME>Processor</NAME><VALUE>Generic</VALUE></SETTING>
-                <SETTING><NAME>BraekPoinType_II</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>UseInitFile</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>UseConfigFile</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>IDexecutable</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>IDinitialized</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>IDuninitialized</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>IDconstant</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>SDexecutable</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>SDinitialized</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>SDuninitialized</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>SDconstant</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>VerifyMemWrites</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>ShowMPC107regs</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>InitializationFile</NAME><VALUE/></SETTING>
-                <SETTING><NAME>ConfigurationFile</NAME><VALUE/></SETTING>
-                <SETTING><NAME>BreakpointType</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>WatchpointType</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>TargetOS</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>RTOSPluginName</NAME><VALUE/></SETTING>
-                <SETTING><NAME>ByteOrderType</NAME><VALUE>0</VALUE></SETTING>
-                <PANELDATA><NAME>CodeTest SYMBIAN Instrumenter</NAME><VALUE>
-                    0200020000000100000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000433A5C0000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000637466696C657300000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000636F6465746573742E6964620000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000
-                </VALUE></PANELDATA>
-
-                <!-- Settings for "Symbian Installation" panel -->
-                <SETTING><NAME>SymbianInstallationOutputFilename</NAME><VALUE>Application.sis</VALUE></SETTING>
-                <SETTING><NAME>SymbianInstallationOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>SymbianInstallationContentSearchLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\udeb</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianInstallationPassword</NAME><VALUE/></SETTING>
-                <SETTING><NAME>SymbianInstallationCreateStubFile</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "Symbian Installer Panel v2" panel -->
-                <SETTING><NAME>SymbianInstallationOutputFilename</NAME><VALUE>Application.sis</VALUE></SETTING>
-                <SETTING><NAME>SymbianInstallationOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>SymbianInstallationContentSearchLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\udeb</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianInstallationPassword</NAME><VALUE/></SETTING>
-                <SETTING><NAME>SymbianInstallationCreateStubFile</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "Symbian Resource Panel" panel -->
-                <SETTING><NAME>SymbianResourcesMMPFileLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics\GSDeviceDiagnosticsPlugin\DevDiagApp\diagplugins\diagexternalmediacardplugin\group</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianResourcesBinaryOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\udeb</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianResourcesHeaderFileOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\include</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-
-                <!-- Settings for "Symbian Resources Panel v2" panel -->
-                <SETTING><NAME>SymbianResourcesMMPFileLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics\GSDeviceDiagnosticsPlugin\DevDiagApp\diagplugins\diagexternalmediacardplugin\group</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianResourcesBinaryOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\udeb</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianResourcesHeaderFileOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\include</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-
-                <!-- Settings for "Remote Download" panel -->
-                <SETTING><NAME>FileList</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Symbian ARM Debugger" panel -->
-                <SETTING><NAME>Processor</NAME><VALUE>Generic</VALUE></SETTING>
-                <SETTING><NAME>UseInitFile</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>UseConfigFile</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>ResetTarget</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>InitializationFile</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>ConfigurationFile</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>TargetOS</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>RTOSPluginName</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Symbian Common Panel" panel -->
-                <SETTING><NAME>ShowCommandLine</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>SymbianEpocToolsPath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE></VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-
-                <!-- Settings for "Symbian Compiler Panel" panel -->
-                <SETTING><NAME>PrefixFile</NAME><VALUE>feature_settings.hrh</VALUE></SETTING>
-                <SETTING><NAME>CompilerXMLDescriptor</NAME><VALUE>Metrowerks x86 Compiler</VALUE></SETTING>
-                <SETTING><NAME>Macros</NAME><VALUE>__SYMBIAN32__,__CW32__,__WINS__,__WINSCW__,__DLL__,_DEBUG,_UNICODE,__SUPPORT_CPP_EXCEPTIONS__,</VALUE></SETTING>
-                <SETTING><NAME>CodeTEST</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>EnableSWIC</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Arguments</NAME><VALUE>-wchar_t off -align 4 -warnings on -w nohidevirtual, nounusedexpr -msgstyle gcc -enum int -str pool -exc ms -trigraphs on -O0 -inline off -nostdinc</VALUE></SETTING>
-                <SETTING><NAME>CIAArgs</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Symbian Debugging" panel -->
-                <SETTING><NAME>Parse Log File</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Log File Path</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>Symbian SDK Folder</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>Log Unresolved Modules</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Log Unresolved Sym Files</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Debug Non-XIP Executables</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "Symbian Kernel Debugging" panel -->
-                <SETTING><NAME>Start Address</NAME><VALUE>0x00000000</VALUE></SETTING>
-                <SETTING><NAME>Run From Start Address</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Download Image</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>OS Image Path</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>Download Address</NAME><VALUE>0x00000000</VALUE></SETTING>
-                <SETTING><NAME>Ask First</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Debug Bootrom</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Bootrom Sym File</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "Symbian Linker Panel" panel -->
-                <SETTING><NAME>LinkOutputFile</NAME><VALUE>DevDiagExternalMediaCardPlugin.dll</VALUE></SETTING>
-                <SETTING><NAME>LinkCmdLine</NAME><VALUE/></SETTING>
-                <SETTING><NAME>SymbianImportLibrary</NAME><VALUE>DevDiagExternalMediaCardPlugin.lib</VALUE></SETTING>
-                <SETTING><NAME>canDebug</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>canRun</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "Symbian RomBuild Panel" panel -->
-                <SETTING><NAME>CommandLine</NAME><VALUE>buildrom -D_DEBUG devkit lubbock techview -olubbock_gui.img</VALUE></SETTING>
-                <SETTING><NAME>OutputPath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>C:\</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>DisplayMessages</NAME><VALUE>true</VALUE></SETTING>
-
-                <!-- Settings for "Symbian Target" panel -->
-                <SETTING><NAME>TargetArchitecture</NAME><VALUE>WINSCW</VALUE></SETTING>
-                <SETTING><NAME>LogMessages</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>SuppressWarnings</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>GenerateSymbolics</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>CompilerPrefix</NAME><VALUE/></SETTING>
-                <SETTING><NAME>CompilerCmdLine</NAME><VALUE/></SETTING>
-                <SETTING><NAME>SymbianImportLibraryPath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>C:\</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "Symbian Tools" panel -->
-                <SETTING><NAME>Gnu Tools Path</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>C:\</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>Epoc32 Tools Path</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>C:\</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-            </SETTINGLIST>
-            <FILELIST>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagExternalMediaCardPlugin.mmp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagExternalMediaCardPluginWINSCW.resources</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>EDLL.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagExternalMediaCardPluginImplementationTable.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagExternalMediaCardPlugin.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagExternalMediaCardPlugin_UID_.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>euser.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>efsrv.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>avkon.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>CommonEngine.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>FeatMgr.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>flogger.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagFramework.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagPluginBase.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>platformenv.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>sysutil.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>eikcoctl.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>eikdlg.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagExternalMediaCardPlugin.h</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagExternalMediaCardPlugin.hrh</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagExternalMediaCardPluginWINSCWUDEB.cwlink</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-</FILELIST>
-            <LINKORDER>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagExternalMediaCardPlugin.mmp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagExternalMediaCardPluginWINSCW.resources</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>EDLL.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagExternalMediaCardPluginImplementationTable.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagExternalMediaCardPlugin.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagExternalMediaCardPlugin_UID_.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>euser.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>efsrv.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>avkon.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>CommonEngine.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>FeatMgr.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>flogger.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagFramework.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagPluginBase.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>platformenv.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>sysutil.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>eikcoctl.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>eikdlg.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagExternalMediaCardPlugin.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagExternalMediaCardPlugin.hrh</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagExternalMediaCardPluginWINSCWUDEB.cwlink</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-</LINKORDER>
-        </TARGET><TARGET>
-            <NAME>WINSCW UREL</NAME>
-            <SETTINGLIST>
-
-                <!-- Settings for "Source Trees" panel -->
-                <SETTING><NAME>UserSourceTrees</NAME></SETTING>
-
-                <!-- Settings for "Access Paths" panel -->
-                <SETTING><NAME>AlwaysSearchUserPaths</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>InterpretDOSAndUnixPaths</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>RequireFrameworkStyleIncludes</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>SourceRelativeIncludes</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>UserSearchPaths</NAME>
-                    <SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics\GSDeviceDiagnosticsPlugin\DevDiagApp\diagplugins\diagexternalmediacardplugin\inc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics\GSDeviceDiagnosticsPlugin\DevDiagApp\diagplugins\diagexternalmediacardplugin\data</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics\GSDeviceDiagnosticsPlugin\DevDiagApp\diagplugins\diagexternalmediacardplugin\loc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics\GSDeviceDiagnosticsPlugin\DevDiagApp\diagplugins\diagexternalmediacardplugin\group</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics\GSDeviceDiagnosticsPlugin\DevDiagApp\diagplugins\diagexternalmediacardplugin\src</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING></SETTING>
-                <SETTING><NAME>SystemSearchPaths</NAME>
-                    <SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\ecom</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\oem</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\middleware</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\middleware</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\osextensions</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\osextensions</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\osextensions\loc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\middleware\loc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\osextensions\loc\sc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\middleware\loc\sc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\UREL</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\release\WINSCW\UDEB</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>Symbian_Support\Win32-x86 Support\Libraries\Win32 SDK</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>CodeWarrior</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>Symbian_Support\Runtime\Runtime_x86\Runtime_Win32\Libs</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>CodeWarrior</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING></SETTING>
-
-                <!-- Settings for "Debugger Runtime" panel -->
-                <SETTING><NAME>MWRuntimeSettings_WorkingDirectory</NAME><VALUE/></SETTING>
-                <SETTING><NAME>MWRuntimeSettings_CommandLine</NAME><VALUE/></SETTING>
-                <SETTING><NAME>MWRuntimeSettings_HostApplication</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\urel\epoc.exe</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>MWRuntimeSettings_EnvVars</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Target Settings" panel -->
-                <SETTING><NAME>Linker</NAME><VALUE>Symbian Linker v2</VALUE></SETTING>
-                <SETTING><NAME>PreLinker</NAME><VALUE/></SETTING>
-                <SETTING><NAME>PostLinker</NAME><VALUE>Symbian Installer v2</VALUE></SETTING>
-                <SETTING><NAME>Targetname</NAME><VALUE>WINSCW UREL</VALUE></SETTING>
-                <SETTING><NAME>OutputDirectory</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\urel</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SaveEntriesUsingRelativePaths</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "File Mappings" panel -->
-                <SETTING><NAME>FileMappings</NAME>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>._i</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>._ii</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.c</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cc</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cfg</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cia</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cpp</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cwlink</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>XML</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cxx</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.def</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.h</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.hrh</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.i</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.iby</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.ii</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.inf</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.ini</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.inl</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.loc</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.mmpi</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.pch++</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.pkg</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.policy</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.ra</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.resources</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Resource v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>XML</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.rh</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.rls</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.rss</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.rsg</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.s</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.script</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.txt</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.a</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Object Importer v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.lib</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Object Importer v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.dso</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Object Importer v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.o</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Object Importer v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                </SETTING>
-
-                <!-- Settings for "Build Extras" panel -->
-                <SETTING><NAME>CacheModDates</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>DumpBrowserInfo</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>CacheSubprojects</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>UseThirdPartyDebugger</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>BrowserGenerator</NAME><VALUE>2</VALUE></SETTING>
-                <SETTING><NAME>DebuggerAppPath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>DebuggerCmdLineArgs</NAME><VALUE/></SETTING>
-                <SETTING><NAME>DebuggerWorkingDir</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CodeCompletionPrefixFileName</NAME><VALUE/></SETTING>
-                <SETTING><NAME>CodeCompletionMacroFileName</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Debugger Target" panel -->
-                <SETTING><NAME>ConsoleEncoding</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>LogSystemMessages</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>AutoTargetDLLsPopUp</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>StopAtWatchpoints</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>PauseWhileRunning</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>PauseInterval</NAME><VALUE>5</VALUE></SETTING>
-                <SETTING><NAME>PauseUIFlags</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>AltExePath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>StopAtTempBPOnLaunch</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>CacheSymbolics</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>TempBPFunctionName</NAME><VALUE>E32Main</VALUE></SETTING>
-                <SETTING><NAME>TempBPType</NAME><VALUE>1</VALUE></SETTING>
-
-                <!-- Settings for "Remote Debug" panel -->
-                <SETTING><NAME>Enabled</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>ConnectionName</NAME><VALUE/></SETTING>
-                <SETTING><NAME>DownloadPath</NAME><VALUE/></SETTING>
-                <SETTING><NAME>LaunchRemoteApp</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>RemoteAppPath</NAME><VALUE/></SETTING>
-                <SETTING><NAME>CoreID</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>JTAGClockSpeed</NAME><VALUE>8000</VALUE></SETTING>
-                <SETTING><NAME>IsMultiCore</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>OSDownload</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>UseGlobalOSDownload</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>OSDownloadConnectionName</NAME><VALUE/></SETTING>
-                <SETTING><NAME>OSDownloadPath</NAME><VALUE/></SETTING>
-                <SETTING><NAME>AltDownload</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>AltDownloadConnectionName</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "x86 Exceptions" panel -->
-                <SETTING><NAME>MWDebugger_X86_Exceptions</NAME>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                
-                <!-- Settings for "Auto-target" panel -->
-                <SETTING><NAME>OtherExecutables</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Analyzer Connections" panel -->
-                <SETTING><NAME>AnalyzerConnectionName</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Custom Keywords" panel -->
-                <SETTING><NAME>CustomColor1</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor2</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor3</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor4</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "ARM Debugger" panel -->
-                <SETTING><NAME>Processor</NAME><VALUE>Generic</VALUE></SETTING>
-                <SETTING><NAME>BraekPoinType_II</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>UseInitFile</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>UseConfigFile</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>IDexecutable</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>IDinitialized</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>IDuninitialized</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>IDconstant</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>SDexecutable</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>SDinitialized</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>SDuninitialized</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>SDconstant</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>VerifyMemWrites</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>ShowMPC107regs</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>InitializationFile</NAME><VALUE/></SETTING>
-                <SETTING><NAME>ConfigurationFile</NAME><VALUE/></SETTING>
-                <SETTING><NAME>BreakpointType</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>WatchpointType</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>TargetOS</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>RTOSPluginName</NAME><VALUE/></SETTING>
-                <SETTING><NAME>ByteOrderType</NAME><VALUE>0</VALUE></SETTING>
-                <PANELDATA><NAME>CodeTest SYMBIAN Instrumenter</NAME><VALUE>
-                    0200020000000100000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000433A5C0000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000637466696C657300000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000636F6465746573742E6964620000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000
-                </VALUE></PANELDATA>
-
-                <!-- Settings for "Symbian Installation" panel -->
-                <SETTING><NAME>SymbianInstallationOutputFilename</NAME><VALUE>Application.sis</VALUE></SETTING>
-                <SETTING><NAME>SymbianInstallationOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>SymbianInstallationContentSearchLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\urel</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianInstallationPassword</NAME><VALUE/></SETTING>
-                <SETTING><NAME>SymbianInstallationCreateStubFile</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "Symbian Installer Panel v2" panel -->
-                <SETTING><NAME>SymbianInstallationOutputFilename</NAME><VALUE>Application.sis</VALUE></SETTING>
-                <SETTING><NAME>SymbianInstallationOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>SymbianInstallationContentSearchLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\urel</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianInstallationPassword</NAME><VALUE/></SETTING>
-                <SETTING><NAME>SymbianInstallationCreateStubFile</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "Symbian Resource Panel" panel -->
-                <SETTING><NAME>SymbianResourcesMMPFileLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics\GSDeviceDiagnosticsPlugin\DevDiagApp\diagplugins\diagexternalmediacardplugin\group</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianResourcesBinaryOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\urel</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianResourcesHeaderFileOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\include</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-
-                <!-- Settings for "Symbian Resources Panel v2" panel -->
-                <SETTING><NAME>SymbianResourcesMMPFileLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics\GSDeviceDiagnosticsPlugin\DevDiagApp\diagplugins\diagexternalmediacardplugin\group</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianResourcesBinaryOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\urel</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianResourcesHeaderFileOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\include</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-
-                <!-- Settings for "Remote Download" panel -->
-                <SETTING><NAME>FileList</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Symbian ARM Debugger" panel -->
-                <SETTING><NAME>Processor</NAME><VALUE>Generic</VALUE></SETTING>
-                <SETTING><NAME>UseInitFile</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>UseConfigFile</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>ResetTarget</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>InitializationFile</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>ConfigurationFile</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>TargetOS</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>RTOSPluginName</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Symbian Common Panel" panel -->
-                <SETTING><NAME>ShowCommandLine</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>SymbianEpocToolsPath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE></VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-
-                <!-- Settings for "Symbian Compiler Panel" panel -->
-                <SETTING><NAME>PrefixFile</NAME><VALUE>feature_settings.hrh</VALUE></SETTING>
-                <SETTING><NAME>CompilerXMLDescriptor</NAME><VALUE>Metrowerks x86 Compiler</VALUE></SETTING>
-                <SETTING><NAME>Macros</NAME><VALUE>__SYMBIAN32__,__CW32__,__WINS__,__WINSCW__,__DLL__,NDEBUG,_UNICODE,__SUPPORT_CPP_EXCEPTIONS__,</VALUE></SETTING>
-                <SETTING><NAME>CodeTEST</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>EnableSWIC</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Arguments</NAME><VALUE>-wchar_t off -align 4 -warnings on -w nohidevirtual, nounusedexpr -msgstyle gcc -enum int -str pool -exc ms -trigraphs on -O4,s -nostdinc</VALUE></SETTING>
-                <SETTING><NAME>CIAArgs</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Symbian Debugging" panel -->
-                <SETTING><NAME>Parse Log File</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Log File Path</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>Symbian SDK Folder</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>Log Unresolved Modules</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Log Unresolved Sym Files</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Debug Non-XIP Executables</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "Symbian Kernel Debugging" panel -->
-                <SETTING><NAME>Start Address</NAME><VALUE>0x00000000</VALUE></SETTING>
-                <SETTING><NAME>Run From Start Address</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Download Image</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>OS Image Path</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>Download Address</NAME><VALUE>0x00000000</VALUE></SETTING>
-                <SETTING><NAME>Ask First</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Debug Bootrom</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Bootrom Sym File</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "Symbian Linker Panel" panel -->
-                <SETTING><NAME>LinkOutputFile</NAME><VALUE>DevDiagExternalMediaCardPlugin.dll</VALUE></SETTING>
-                <SETTING><NAME>LinkCmdLine</NAME><VALUE/></SETTING>
-                <SETTING><NAME>SymbianImportLibrary</NAME><VALUE>DevDiagExternalMediaCardPlugin.lib</VALUE></SETTING>
-                <SETTING><NAME>canDebug</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>canRun</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "Symbian RomBuild Panel" panel -->
-                <SETTING><NAME>CommandLine</NAME><VALUE>buildrom -D_DEBUG devkit lubbock techview -olubbock_gui.img</VALUE></SETTING>
-                <SETTING><NAME>OutputPath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>C:\</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>DisplayMessages</NAME><VALUE>true</VALUE></SETTING>
-
-                <!-- Settings for "Symbian Target" panel -->
-                <SETTING><NAME>TargetArchitecture</NAME><VALUE>WINSCW</VALUE></SETTING>
-                <SETTING><NAME>LogMessages</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>SuppressWarnings</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>GenerateSymbolics</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>CompilerPrefix</NAME><VALUE/></SETTING>
-                <SETTING><NAME>CompilerCmdLine</NAME><VALUE/></SETTING>
-                <SETTING><NAME>SymbianImportLibraryPath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>C:\</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "Symbian Tools" panel -->
-                <SETTING><NAME>Gnu Tools Path</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>C:\</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>Epoc32 Tools Path</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>C:\</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-            </SETTINGLIST>
-            <FILELIST>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagExternalMediaCardPlugin.mmp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagExternalMediaCardPluginWINSCW.resources</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>EDLL.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagExternalMediaCardPluginImplementationTable.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagExternalMediaCardPlugin.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagExternalMediaCardPlugin_UID_.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>euser.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>efsrv.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>avkon.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>CommonEngine.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>FeatMgr.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>flogger.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagFramework.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagPluginBase.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>platformenv.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>sysutil.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>eikcoctl.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>eikdlg.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagExternalMediaCardPluginWINSCWUREL.cwlink</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-</FILELIST>
-            <LINKORDER>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagExternalMediaCardPlugin.mmp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagExternalMediaCardPluginWINSCW.resources</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>EDLL.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagExternalMediaCardPluginImplementationTable.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagExternalMediaCardPlugin.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagExternalMediaCardPlugin_UID_.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>euser.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>efsrv.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>avkon.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>CommonEngine.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>FeatMgr.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>flogger.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagFramework.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagPluginBase.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>platformenv.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>sysutil.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>eikcoctl.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>eikdlg.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagExternalMediaCardPluginWINSCWUREL.cwlink</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-</LINKORDER>
-        </TARGET><TARGET>
-<NAME>Build All</NAME><SETTINGLIST><SETTING><NAME>Linker</NAME><VALUE>None</VALUE></SETTING>
-<SETTING><NAME>Targetname</NAME><VALUE>Build All</VALUE></SETTING>
-</SETTINGLIST>
-<FILELIST></FILELIST>
-<LINKORDER></LINKORDER>
-<SUBTARGETLIST><SUBTARGET><TARGETNAME>WINSCW UDEB</TARGETNAME></SUBTARGET>
-<SUBTARGET><TARGETNAME>WINSCW UREL</TARGETNAME></SUBTARGET>
-</SUBTARGETLIST></TARGET></TARGETLIST>
-
-    <TARGETORDER>
-<ORDEREDTARGET><NAME>WINSCW UDEB</NAME></ORDEREDTARGET>
-<ORDEREDTARGET><NAME>WINSCW UREL</NAME></ORDEREDTARGET>
-<ORDEREDTARGET><NAME>Build All</NAME></ORDEREDTARGET>
-</TARGETORDER>
-
-    <GROUPLIST><FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DiagExternalMediaCardPlugin.mmp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<GROUP><NAME>Source</NAME>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DiagExternalMediaCardPluginImplementationTable.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DiagExternalMediaCardPlugin.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DevDiagExternalMediaCardPlugin_UID_.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-</GROUP>
-<GROUP><NAME>Headers</NAME>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DiagExternalMediaCardPlugin.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DiagExternalMediaCardPlugin.hrh</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-</GROUP>
-<GROUP><NAME>Resources</NAME>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DevDiagExternalMediaCardPluginWINSCW.resources</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-</GROUP>
-<GROUP><NAME>Link</NAME>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DevDiagExternalMediaCardPluginWINSCWUDEB.cwlink</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UREL</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DevDiagExternalMediaCardPluginWINSCWUREL.cwlink</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-</GROUP>
-<GROUP><NAME>Libraries</NAME>
-<GROUP><NAME>WINSCW</NAME>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>EDLL.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>euser.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>efsrv.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>avkon.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>CommonEngine.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>FeatMgr.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>flogger.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DiagFramework.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DiagPluginBase.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>platformenv.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>sysutil.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>eikcoctl.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>eikdlg.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UREL</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>EDLL.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-</GROUP>
-</GROUP>
-</GROUPLIST>
-
-</PROJECT>
--- a/devicediagnostics/diagplugins/diagexternalmediacardplugin/inc/diagexternalmediacardplugin.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,177 +0,0 @@
-/*
-* 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:  External Media Card Plugin
-*
-*/
-
-
-#ifndef DIAGEXTERNALMEDIACARDPLUGIN_H
-#define DIAGEXTERNALMEDIACARDPLUGIN_H
-
-// INCLUDES
-#include <DiagTestPluginBase.h>         // CDiagTestPluginBase
-#include <DiagResultsDatabaseItem.h>    // DiagResultsDatabaseItem::TResult
-#include <f32file.h>                    // RFs, RFile
-#include <AknWaitDialog.h> 
-//CONSTANTS
-const TUid KDiagExternalMediaCardPluginUid = { 0x2000E58B };
-_LIT( KDiagExternalMediaCardPluginResourceFileName, "z:DevDiagExternalMediaCardPluginRsc.rsc" );
-const TInt KDiagExternalMediaCardBufferSize = 256;
-
-// MACROS
-
-// DATA TYPES
-
-// FUNCTION PROTOTYPES
-
-// FORWARD DECLARATIONS
-class CDiagResultsDbItemBuilder;
-
-// CLASS DEFINITION
-class CDiagExternalMediaCardPlugin : public CDiagTestPluginBase,
-									 public MProgressDialogCallback
-    {
-    public: // Constructors and destructor
-		
-        enum TStates
-            {
-            EIdle,
-            EWriting,
-            EReading
-            };
-		
-        /**
-        * Symbian OS two-phased constructor
-        * @return Timer Test Plugin
-        */
-        static MDiagPlugin* NewL( TAny* aInitParams );
-
-        /**
-        * Destructor
-        */
-        virtual ~CDiagExternalMediaCardPlugin();
-
-    public: // From CDiagTestPluginBase
-
-        /**
-        * @see CDiagTestPluginBase::IsVisible()
-        */
-        virtual TBool IsVisible() const;
-        
-        /**
-        * @see CDiagTestPluginBase::IsSupported()
-        */
-        virtual TBool IsSupported() const;
-
-        /**
-        * @see CDiagTestPluginBase::RunMode()
-        */
-        virtual TRunMode RunMode() const;
-
-        /**
-        * @see CDiagTestPluginBase::TotalSteps()
-        */
-        virtual TUint TotalSteps() const;
-
-        /**
-        * @see CDiagTestPluginBase::GetPluginNameL
-        */
-        virtual HBufC* GetPluginNameL( TNameLayoutType aLayoutType ) const;
-
-        /**
-        * @see CDiagTestPluginBase::Uid
-        */
-        virtual TUid Uid() const;
- 
-        
-    private: // from CDiagTestPluginBase
-    
-        /**
-        * Handle plug-in execution.
-        * @see CDiagTestPluginBaseExtended::DoRunTestL
-        */
-        virtual void DoRunTestL();
-
-        /**
-        * Stop and clean up
-        * @see CDiagTestPluginBaseExtended::DoStopAndCleanupL
-        */
-        virtual void DoStopAndCleanupL();
-                        
-    private:    // from CActive
-    
-        /**
-        * Handle active object completion event
-        */
-        virtual void RunL();
-    
-        /**
-        * Handle cancel
-        */
-        virtual void DoCancel();
-    
-    private: // from MProgressDialogCallback
-        
-    /**
-    * Called when the progress dialog is dismissed.
-    *
-    * @param aButtonId - indicate which button made dialog to dismiss
-    */
-    virtual void DialogDismissedL( TInt aButtonId );
-    
-	void ShowProgressNoteL();
-
-    private:    // private functions
-        
-        /**
-        * C++ default constructor.
-        */
-        CDiagExternalMediaCardPlugin( CDiagPluginConstructionParam* aInitParams );
-
-        /**
-        * Symbian OS default constructor.
-        *
-        */
-        void ConstructL();
-        
-        /*
-        * Set the states
-        */
-        void SetState( TStates aState );
-        
-        // ADO & Platformization Changes
-        TBool ShowMessageQueryL( TInt aResourceId, TInt &aButtonId  );
-        
-        void ReportResultToPluginL(CDiagResultsDatabaseItem::TResult aResult);
-        
-        TBool ShowTitleMessageL();
-
-    private:    // data
-        TInt                                        iCounter;
-        TStates                                     iState;  //rw states
-        RFs                                         iFs;
-        RFile                                       iFile;
-        RFile                                       iFile2;
-        TBuf8<KDiagExternalMediaCardBufferSize>     iBufw;
-        TBuf8<KDiagExternalMediaCardBufferSize>     iBufr;
-        TFileName                                   iFileName;
-        TBool									    idialogOn;
-	    TBool										idialogDismissed;
-	    CAknWaitDialog*      						iWaitDialog;
-
-    };
-
-#endif //DIAGEXTERNALMEDIACARDPLUGIN_H
-
-// End of File
--- a/devicediagnostics/diagplugins/diagexternalmediacardplugin/inc/diagexternalmediacardplugin.hrh	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-/*
-* 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:  External Media Card Plugin
-*
-*/
-
-
-#ifndef DIAGEXTERNALMEDIACARDPLUGIN_HRH
-#define DIAGEXTERNALMEDIACARDPLUGIN_HRH
-
-// commands
-
-enum TMemoryPluginCBA
-    {
-    ECBACmdSkip = 0x6300,
-    ECBACmdCancel,
-    ECBACmdNo
-    };
-    
-     /** Dialog ids.  These are used in the application's resource file.
- */
-enum TExtMemNoteControlIds
-    {
-    EYBWaitNoteId = 0x100    
-    };
-    
-#endif //  DIAGEXTERNALMEDIACARDPLUGIN_HRH
-
-//End of File
--- a/devicediagnostics/diagplugins/diagexternalmediacardplugin/loc/diagexternalmediacardplugin.loc	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,78 +0,0 @@
-/*
-* 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:  Localization strings for DiagExternalMediaCardPlugin.
-*
-*/
-
-
-//  LOCALISATION STRINGS
-
-// NEW
-
-//d:Text of a list item in Connection view's folder list
-//d:Item opens Data Call folder
-//l:list_single_graphic_heading_pane_t1_cp2
-//w:
-//r: 3.2
-//
-#define qtn_diag_lst_external_memory    "Memory card test"
-
-//d:External media card test text for suite view
-//l:list_single_graphic_pane_t1
-//w:
-//r: 3.2
-//
-//#define qtn_diag_lst_test_mmc    "Test Memory card test" // LVT Change
-
-//d:External media card test text for starting dialog header
-//l:heading_pane_t1
-//w:
-//r: 3.2
-//
-#define qtn_diag_msg_title_mmc    "Memory Card test"
-
-//d:External media card test description
-//l:popup_info_list_pane_t1
-//w:
-//r: 3.2
-//
-#define qtn_diag_msg_info_mmc    "The following test will check memory card."
-
-#define qtn_diag_msg_no_mmc    "Insert memory card."
-//d:External memory test text for title pane of suite/result view
-//l:title_pane_t2/opt12
-//w:
-//r: 3.2
-//
-//#define qtn_diag_title_test_external_memory   "Memory card test" // LVT Change
-
-//d:Failed result text
-//l:popup_info_list_pane_t1
-//r:5.0
-//
-#define qtn_diag_conf_test_failed_memory_card "Memory card test"
-
-//d:Message text for wait dialog
-//l:popup_note_wait_window
-//r:3.2
-//
-#define qtn_diag_msg_testing_memory_card "Testing memory card"
-
-#define qtn_diag_softk_skip "Skip"
-
-
-
-// End of File
-
-
--- a/devicediagnostics/diagplugins/diagexternalmediacardplugin/rom_files/devdiagextmediacardplugin.iby	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-/*
-* 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:  Image description file for project External Media Card Plug-in
-*
-*/
-
-
-#ifndef DEVDIAG_EXTMEDIACARD_PLUGIN_IBY
-#define DEVDIAG_EXTMEDIACARD_PLUGIN_IBY
-
-#ifdef FF_DEVICE_DIAGNOSTICS_APP 
-
-#include <data_caging_paths_for_iby.hrh>
-
-ECOM_PLUGIN( devdiagexternalmediacardplugin.dll, devdiagexternalmediacardplugin.rsc )
-
-#endif
-
-#endif // DEVDIAG_EXTMEDIACARD_PLUGIN_IBY
-
-// end of file
--- a/devicediagnostics/diagplugins/diagexternalmediacardplugin/rom_files/devdiagextmediacardplugin_resources.iby	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-/*
-* 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:  Image description file for resources of project 
-*	         External Media Card Plug-in
-*
-*/
-
-
-#ifndef DEVDIAG_EXTMEDIACARD_PLUGIN_RESOURCES_IBY
-#define DEVDIAG_EXTMEDIACARD_PLUGIN_RESOURCES_IBY
-
-#ifdef FF_DEVICE_DIAGNOSTICS_APP 
-
-#include <data_caging_paths_for_iby.hrh>
-
-data=DATAZ_\RESOURCE_FILES_DIR\devdiagexternalmediacardpluginrsc.rsc          RESOURCE_FILES_DIR\devdiagexternalmediacardpluginrsc.rsc
-
-#endif
-
-#endif // DEVDIAG_EXTMEDIACARD_PLUGIN_RESOURCES_IBY
-
-// end of file
--- a/devicediagnostics/diagplugins/diagexternalmediacardplugin/src/diagexternalmediacardplugin.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,690 +0,0 @@
-/*
-* 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:  External Media Card Test Plugin
-*
-*/
-
-
-// CLASS DECLARATION
-#include "diagexternalmediacardplugin.hrh" // ADO & Platformization Changes
-#include "diagexternalmediacardplugin.h"
-
-// SYSTME INCLUDE FILES
-#include <featmgr.h>                    // feature manager for MMC support checking
-#include <features.hrh>
-//#ifndef RD_MULTIPLE_DRIVE
-#include <pathinfo.h>                   //PathInfo
-//#endif // RD_MULTIPLE_DRIVE
-#include <sysutil.h>                    //SysUtil
-#include <StringLoader.h>               // StringLoader
-
-#include <DiagTestObserver.h>           // MDiagTestObserver
-#include <DiagTestExecParam.h>          // TDiagTestExecParam
-#include <DiagResultsDbItemBuilder.h>   // CDiagResultsDbItemBuilder
-#include <DiagResultDetailBasic.h>      // CDiagResultDetailBasic
-#include <DiagFrameworkDebug.h>         // LOGSTRING
-#include <devdiagexternalmediacardpluginrsc.rsg>
-#include <AknDialog.h> // ADO & Platformization Changes
-#include <aknmessagequerydialog.h>  // ADO & Platformization Changes
-#include <DiagCommonDialog.h>          // for EDiagCommonDialogConfirmCancelAll 
-#include <DiagEngineCommon.h> 
-
-
-#include <AknQueryDialog.h>
-#include <avkon.hrh>
-// EXTERNAL DATA STRUCTURES
-
-// EXTERNAL FUNCTION PROTOTYPES
-
-// CONSTANTS 
-const TInt KDiagExternalMediaCardStepsMaxCount = 2;   //total test steps
-_LIT( KText1, "PhoneDoctor External Memory Test" );
-
-// MACROS
-
-// LOCAL CONSTANTS AND MACROS
-
-// MODULE DATA STRUCTURES
-
-// LOCAL FUNCTION PROTOTYPES
-
-// FORWARD DECLARATIONS
-
-// ============================= LOCAL FUNCTIONS ==============================
-
-// ========================= MEMBER FUNCTIONS ================================
-
-// ----------------------------------------------------------------------------
-// CDiagExternalMediaCardPlugin::CDiagExternalMediaCardPlugin()
-//
-// Constructor
-// ----------------------------------------------------------------------------
-//
-CDiagExternalMediaCardPlugin::CDiagExternalMediaCardPlugin( 
-        CDiagPluginConstructionParam* aParam )
-    :   CDiagTestPluginBase( aParam )
-    {
-    }
-
-
-// ---------------------------------------------------------------------------
-// CDiagExternalMediaCardPlugin::NewL()
-//
-// Symbian OS default constructor
-// ---------------------------------------------------------------------------
-MDiagPlugin* CDiagExternalMediaCardPlugin::NewL( TAny* aInitParams )
-    {
-    ASSERT( aInitParams );
-    LOGSTRING( "CDiagExternalMediaCard::NewL" );
-    
-    CDiagPluginConstructionParam* param = 
-            static_cast<CDiagPluginConstructionParam*>( aInitParams );    
-
-    CleanupStack::PushL( param );    
-    CDiagExternalMediaCardPlugin* self = new( ELeave ) CDiagExternalMediaCardPlugin (param);
-    CleanupStack::Pop( param );
-    
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self ); // self    
-
-    return self;
-    }
-
-
-// ---------------------------------------------------------------------------
-// CDiagExternalMediaCardPlugin::ConstructL()
-//
-// Symbian OS two-phased constructor
-// ---------------------------------------------------------------------------
-void CDiagExternalMediaCardPlugin::ConstructL()
-    {
-    LOGSTRING("CDiagExternalMediaCardPlugin::ConstructL: Plugin created.");
-    BaseConstructL ( KDiagExternalMediaCardPluginResourceFileName );
-    
-    FeatureManager::InitializeLibL();
-	idialogOn = EFalse;
-	idialogDismissed = EFalse;
-    }
-
-
-// ----------------------------------------------------------------------------
-// CDiagExternalMediaCardPlugin::~CDiagExternalMediaCardPlugin
-//
-// Destructor
-// ----------------------------------------------------------------------------
-CDiagExternalMediaCardPlugin::~CDiagExternalMediaCardPlugin()
-    {
-    FeatureManager::UnInitializeLib();    
-    }
-
-
-// ---------------------------------------------------------------------------
-// From MDiagPlugin
-// CDiagExternalMediaCardPlugin::IsVisible()
-// ---------------------------------------------------------------------------
-TBool CDiagExternalMediaCardPlugin::IsVisible() const
-    {
-    return ( FeatureManager::FeatureSupported( KFeatureIdMmc ) );
-    }
-
-
-// ---------------------------------------------------------------------------
-// From MDiagPlugin
-// CDiagExternalMediaCardPlugin::IsSupported()
-// ---------------------------------------------------------------------------
-TBool CDiagExternalMediaCardPlugin::IsSupported() const
-    {
-    return ( FeatureManager::FeatureSupported( KFeatureIdMmc ) );
-    }    
-
-        
-// ---------------------------------------------------------------------------
-// From MDiagTestPlugin
-// CDiagExternalMediaCardPlugin::RunMode()
-// ---------------------------------------------------------------------------
-MDiagTestPlugin::TRunMode CDiagExternalMediaCardPlugin::RunMode() const
-    {
-    return EAutomatic;
-    }
-
-
-// ---------------------------------------------------------------------------
-// From MDiagTestPlugin
-// CDiagExternalMediaCardPlugin::TotalSteps()
-// ---------------------------------------------------------------------------
-TUint CDiagExternalMediaCardPlugin::TotalSteps() const
-    {
-    return KDiagExternalMediaCardStepsMaxCount;
-    }
-
-
-// ---------------------------------------------------------------------------
-// From MDiagPlugin
-// CDiagExternalMediaCardPlugin::GetPluginNameL
-// ---------------------------------------------------------------------------
-HBufC* CDiagExternalMediaCardPlugin::GetPluginNameL( TNameLayoutType aLayoutType ) const
-    {
-    switch ( aLayoutType )
-        {
-        case ENameLayoutListSingle:
-            return StringLoader::LoadL ( R_DIAG_EXTERNAL_MEDIA_CARD_PLUGIN_NAME );
-                        
-        case ENameLayoutHeadingPane:
-             return StringLoader::LoadL ( R_QTN_DIAG_MSG_TITLE_MMC );
-        
-        case ENameLayoutPopupInfoPane:
-              //return StringLoader::LoadL ( R_QTN_DIAG_MSG_INFO_MMC );
-              //Return test name for dispalyin TEST REsults in case of Perform All test
-              //Ravi
-              return StringLoader::LoadL ( R_DIAG_EXTERNAL_MEDIA_CARD_PLUGIN_NAME );
-        
-        case ENameLayoutTitlePane:
-             return StringLoader::LoadL ( R_QTN_DIAG_TITLE_TEST_EXTERNAL_MEMORY );
-        
-        case ENameLayoutListSingleGraphic:
-             return StringLoader::LoadL ( R_QTN_DIAG_LST_TEST_MMC );            
-            
-
-        default:
-            LOGSTRING2( "CDiagExternalMediaCardPlugin::GetPluginNameL: "
-                L"ERROR: Unsupported layout type %d", aLayoutType )
-            __ASSERT_DEBUG( 0, User::Invariant() );
-            return StringLoader::LoadL ( R_DIAG_EXTERNAL_MEDIA_CARD_PLUGIN_NAME );
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// From MDiagPlugin
-// CDiagExternalMediaCardPlugin::Uid
-// ---------------------------------------------------------------------------
-TUid CDiagExternalMediaCardPlugin::Uid() const
-    {
-    return KDiagExternalMediaCardPluginUid;
-    }
-
-    
-// ---------------------------------------------------------------------------
-// From CActive
-// CDiagExternalMediaCardPlugin::RunL
-// ---------------------------------------------------------------------------
-void CDiagExternalMediaCardPlugin::RunL()
-    {    	
-    switch ( iState )
-        {
-        case EWriting:
-            //report test progress     	
-            iCounter--;    
-            if ( iCounter > 0 )
-                {
-                ReportTestProgressL( KDiagExternalMediaCardStepsMaxCount - iCounter );
-                }
-    		
-    		if (idialogDismissed)
-	    		{
-	    		ReportResultToPluginL( CDiagResultsDatabaseItem::ESkipped );
-	    		LOGSTRING("CDiagExternalMediaCardPlugin::RunL dialogDismissed=EWriting");
-	    		return;
-	    		}
-            //check if write is okay
-            if ( iStatus == KErrNone )
-                {
-                LOGSTRING( "CDiagExternalMediaCard::RunL, write ok" );
-                iFile.Close();
-					
-                // read test			
-                TInt errorCodeOpen = iFile2.Open( iFs, iFileName, EFileRead );				
-                if ( errorCodeOpen!=KErrNone )
-                    {
-                    LOGSTRING( "CDiagExternalMediaCard::RunL,iFile2 open fail" );				
-                    ReportResultToPluginL( CDiagResultsDatabaseItem::EFailed );	
-                    return;
-                    }			    
-                LOGSTRING( "CDiagExternalMediaCard::RunL, iFile2 open okay" );
-				
-                // Start read test
-                SetState( EReading ); 
-                iBufr.Zero();
-                iFile2.Read( iBufr, iStatus );
-         				
-                SetActive();                                
-                }
-            else   //write fail
-                {
-                LOGSTRING( "CDiagExternalMediaCard::RunL, write fail" );	
-                //set test result fail
-                ReportResultToPluginL( CDiagResultsDatabaseItem::EFailed );       			
-                }
-            break;
-    			
-        case EReading:
-        
-        	if (idialogDismissed)
-	    		{
-	    		ReportResultToPluginL( CDiagResultsDatabaseItem::ESkipped );
-	    		LOGSTRING("CDiagExternalMediaCardPlugin::RunL dialogDismissed=EReading");
-	    		return;
-	    		}
-            //check if read is okay
-            if( iStatus == KErrNone )
-                {
-                LOGSTRING( "CDiagExternalMediaCard::RunL, read okay" );
-								
-                //compare data and set test result				
-                CDiagResultsDatabaseItem::TResult result = ( iBufr == iBufw )? 
-                                                            CDiagResultsDatabaseItem::ESuccess
-				                                            : CDiagResultsDatabaseItem::EFailed;
-                ReportResultToPluginL( result );
-                LOGSTRING2( "CDiagExternalMediaCard::RunL,test result %d", result );
-                }
-            else  //read fail
-                {
-                LOGSTRING( "CDiagExternalMediaCard::RunL, read fail" );  		
-                //set result fail
-                ReportResultToPluginL( CDiagResultsDatabaseItem::EFailed );
-                }
-            break;
-    		
-        default:
-            LOGSTRING( "CDiagExternalMediaCard::RunL, default case" );
-            //set result fail
-            ReportResultToPluginL( CDiagResultsDatabaseItem::EFailed );       			
-            break;
-        }
-    }    
-
-
-// ---------------------------------------------------------------------------
-// From CActive
-// CDiagExternalMediaCardPlugin::DoCancel
-// ---------------------------------------------------------------------------
-void CDiagExternalMediaCardPlugin::DoCancel()
-    { 
-    switch ( iState )
-        {
-        case EReading:
-            iFile.ReadCancel(iStatus);
-            break;
-            
-        default:
-            // No action needed
-            break;
-        }    
-    // RFile.Write() does not support cancel. 
-    // See Symbian FAQ 1409 at
-    // http://www3.symbian.com/faq.nsf/0/C3248753E9B33398802571C3006037CA?OpenDocument
-    // So no cancel is necessary for EWriting
-    
-    }    
-
-
-// ---------------------------------------------------------------------------
-// From CDiagTestPluginBase
-// CDiagExternalMediaCardPlugin::ShowTitleMessageL()
-// ---------------------------------------------------------------------------
-TBool CDiagExternalMediaCardPlugin::ShowTitleMessageL()
-    {
-    TInt aButtonId;
-    ShowMessageQueryL(R_MESSAGEQUERY_TITLE_EXTERNALMEMORY,aButtonId);
-    
-    if(aButtonId == ECBACmdCancel)
-        {
-        ReportResultToPluginL( CDiagResultsDatabaseItem::ESkipped );
-        return EFalse;
-        }
-    
-    if(aButtonId == ECBACmdSkip)
-        {
-        TInt confirmResult = 0;
-            
-        CAknDialog* dlg = ExecutionParam().Engine().
-        CreateCommonDialogLC( EDiagCommonDialogConfirmSkipAll, NULL );
-    
-        if ( !RunWaitingDialogL( dlg, confirmResult ) )
-            {
-            return EFalse;
-            }
-        
-        if ( confirmResult)
-            {
-            return EFalse;
-            }
-        }
-    return ETrue;
-    }
-
-// ---------------------------------------------------------------------------
-// From CDiagTestPluginBase
-// CDiagExternalMediaCardPlugin::DoRunTestL()
-// ---------------------------------------------------------------------------
-void CDiagExternalMediaCardPlugin::DoRunTestL()
-    {
-    //TInt aButtonId; // ADO & Platformization Changes
-    iCounter = KDiagExternalMediaCardStepsMaxCount;
-    // ADO & Platformization Changes
-    if(!ShowTitleMessageL())
-        return;
-    // Changes Ends
-    
-    //Start my test
-    ShowProgressNoteL();
-        
-    SetState( EIdle );
-    
-    //test should not be performed if external media card is not supported
-    ASSERT( FeatureManager::FeatureSupported( KFeatureIdMmc ) );
-    
-    TInt errorCode( KErrNotFound );
-    
-        //check the drive number for external card
-    TInt mmcDriveNum( 0 );
-    
-        // If path length is zero, driveLetterBuf will be empty.
-    TBuf<1> driveLetterBuf;
-    
-    
-    
-
-        
- 	driveLetterBuf = PathInfo::MemoryCardRootPath().Left( 1 );
-
-    if ( driveLetterBuf.Length() > 0 )
-        {
-        LOGSTRING( "CDiagExternalMediaCard::DoRunTestL, driveLetterBuf ok" );
-        TChar driveLetter = driveLetterBuf[0];
-        errorCode = RFs::CharToDrive( driveLetter, mmcDriveNum );
-        }
-    else
-        {
-        LOGSTRING( "CDiagExternalMediaCard::DoRunTestL, driveLetterBuf empty" );
-        }
-            
-    if ( errorCode != KErrNone )
-        {
-        //no such drive exists,act as feature not supported
-        LOGSTRING( "CDiagExternalMediaCard::DoRunTestL, no drive" );               	
-        ReportResultToPluginL( CDiagResultsDatabaseItem::EFailed );
-        return;       			
-       	}
-       	
-       	
-    TVolumeInfo volumeinfo;
-    TDriveInfo driveInfo;
-    TInt errorCode2;
-        	
-    do
-    {
-    User::LeaveIfError( iFs.Connect() );  // Connects a client process to the fileserver
-    LOGSTRING( "CDiagExternalMediaCard::DoRunTestL, iFs connect" );
-    
-    errorCode = iFs.Volume( volumeinfo, mmcDriveNum );
-    LOGSTRING( "CDiagExternalMediaCard::DoRunTestL, Volume" );
-    
-    errorCode2 = iFs.Drive( driveInfo, mmcDriveNum );
-    LOGSTRING( "CDiagExternalMediaCard::DoRunTestL, Drive" );
-    
-    if ( errorCode != KErrNone || errorCode2 != KErrNone )
-        {
-        //no such drive exists,act as feature not supported
-        LOGSTRING( "CDiagExternalMediaCard::DoRunTestL, no drive" );               		
-	        TInt  buttonId;
-		    TBool result = EFalse;
-		    result = ShowMessageQueryL( R_MESSAGEQUERY_NO_EXTERNALMEMORY, buttonId );
-
-		    // Check session is valid after dialog dismissed
-		    if ( !result )
-		        {
-		        LOGSTRING( "CDiagExternalMediaCardPlugin::AfterPlayL - !iSessionValid 1.2" )
-		        return;
-		        }
-
-		    // Report Success on Yes
-		    if ( (buttonId == EAknSoftkeyYes) ||  (buttonId == EAknSoftkeyOk))
-		        {
-		        LOGSTRING( "CDiagExternalMediaCardPlugin::EAknSoftkeyOk has pressed - return ESuccess" )
-		        }
-		    else if ( buttonId == ECBACmdSkip )
-		        {
-       			ReportResultToPluginL( CDiagResultsDatabaseItem::ESkipped );
-		        return;
-		        }
-	    	else if ( (buttonId == EAknSoftkeyNo) || (buttonId == ECBACmdNo) )
-		        {
-		        		if(SinglePluginExecution())
-		        		{	
-		        		ReportResultToPluginL( CDiagResultsDatabaseItem::EFailed);
-		        		return;
-		        		}
-		        		else
-		        		{
-		            TInt confirmResult = 0;
-                
-                    CAknDialog* dlg = ExecutionParam().Engine().
-                    CreateCommonDialogLC( EDiagCommonDialogConfirmCancelAll, NULL );
-                
-                    if ( !RunWaitingDialogL( dlg, confirmResult ) )
-                        {
-                        return;
-                        }
-                    
-                    if ( confirmResult)
-                        {
-                        //CompleteTestL( CDiagResultsDatabaseItem::ECancelled );	
-                        return;
-                        }
-                 }
-
-		        }		   
-        }
-    
-      } while(errorCode != KErrNone || errorCode2 != KErrNone);
-        
-        	                  
-    //check status of external media card
-        
-    if ( ( driveInfo.iMediaAtt & KMediaAttLocked ) ||
-         ( driveInfo.iMediaAtt & KMediaAttWriteProtected ) )
-        {
-        //card is locked or read only
-        LOGSTRING( "CDiagExternalMediaCard::DoRunTestL, card locked or read only" );		     		
-        ReportResultToPluginL( CDiagResultsDatabaseItem::EFailed ); 
-        return;       		       		    			
-        }
-            		       		
-    if ( SysUtil::DiskSpaceBelowCriticalLevelL( &iFs, iBufw.MaxLength(), mmcDriveNum ) )
-        {
-        //card is out of memory
-        LOGSTRING( "CDiagExternalMediaCard::DoRunTestL, out of memory" );
-        ReportResultToPluginL( CDiagResultsDatabaseItem::EFailed );	
-        return;	
-        }
-    	 
-    //Try to create a temp file for test	    		
-    TFileName FilePath;
-    TDriveUnit unit( mmcDriveNum );
-    errorCode = iFs.CreatePrivatePath( unit );
-		
-    if ( ( errorCode != KErrNone ) && ( errorCode != KErrAlreadyExists ) )
-        {
-        LOGSTRING( "CDiagExternalMediaCard::DoRunTestL, CreatePrivatePath fail" );
-        ReportResultToPluginL( CDiagResultsDatabaseItem::EFailed );	
-        return;
-        }
-			
-    iFs.PrivatePath( FilePath );
-    FilePath.Insert( 0, unit.Name() );
-								    		
-    errorCode = iFile.Temp( iFs, FilePath, iFileName, EFileWrite );
-    LOGSTRING2( "CDiagExternalMediaCard::DoRunTestL, Temp err = %d", errorCode );
-											
-    if ( errorCode != KErrNone )
-        {
-        //Temp file creation failed
-        ReportResultToPluginL( CDiagResultsDatabaseItem::EFailed );
-        return;
-        }
-    		
-    // Temp file created, start the write test					
-							
-    iBufw.Zero();
-    iBufw.Copy( KText1 );
-			
-    SetState( EWriting ); 
-		
-    iFile.Write( iBufw, iStatus );
-    SetActive();    
-    }
-
-// ----------------------------------------------------------------------------
-// CDiagExternalMediaCardPlugin::ShowProgressNoteL
-//
-// Progress Note
-// ----------------------------------------------------------------------------
-
-void CDiagExternalMediaCardPlugin::ShowProgressNoteL()
-    {
-		if ( iWaitDialog )
-		    {
-		    delete iWaitDialog;
-		    iWaitDialog = NULL;
-		    }
-
-		                    
-		// WAIT NOTE DIALOG
-		iWaitDialog = new (ELeave) CAknWaitDialog(
-									(REINTERPRET_CAST(CEikDialog**, &iWaitDialog)), 
-									ETrue);
-
-		iWaitDialog->PrepareLC(R_EXTMEM_PLUGIN_WAIT_NOTE);
-		iWaitDialog->SetCallback(this);
-		iWaitDialog->RunLD();
-		idialogOn = ETrue;
-		LOGSTRING("CDiagExternalMediaCardPlugin::ShowProgressNoteL()");
-
-    }
-
-//*********************************************************
-// CallBack from AKnWaitDialog when Cancel is pressed
-//*********************************************************
-
-void CDiagExternalMediaCardPlugin::DialogDismissedL( TInt aButtonId )
-	{
-		 LOGSTRING2("CDiagExternalMediaCardPlugin::DialogDismissedL() = %d",aButtonId);
-		 
-		 if (aButtonId == ECBACmdCancel && idialogOn) 
-		 {
-		 // cancel the tests based on which point the dialog is dismissed
-		 LOGSTRING2("CDiagExternalMediaCardPlugin::DialogDismissed @ iState= %d",iState);
-		 if (iState == EReading)
-	     iFile.ReadCancel(iStatus);
-		
-	     iWaitDialog = NULL;
-	     idialogOn = EFalse;
-	     idialogDismissed = ETrue;      
-		 }
-	}    
-
-void CDiagExternalMediaCardPlugin::ReportResultToPluginL(CDiagResultsDatabaseItem::TResult aResult)
-	{
-		// clear the dialogue only if dialog is running.    
-		if(idialogOn)    
-		iWaitDialog->ProcessFinishedL();
-
-		CompleteTestL( aResult );
-	}
-	
-//---------------------------------------------------------------------------
-// CDiagExternalMediaCardPlugin::DoStopAndCleanupL
-//---------------------------------------------------------------------------
-void CDiagExternalMediaCardPlugin::DoStopAndCleanupL()
-    {
-    switch ( iState )
-        {
-        case EWriting: 
-            iFile.Close();
-            iFs.Delete( iFileName ); // delete the file created by Temp									
-            iFs.Close();
-            break;
-    		
-        case EReading:
-            iFile2.Close();	
-            iFs.Delete( iFileName ); // delete the file created by Temp						
-            iFs.Close();   		
-            break;
-    		 
-        case EIdle:
-            iFs.Close();
-            break;
-    	    
-        default:
-            ASSERT ( EFalse );      //this should never happen
-            break;
-        }
-	if ( iWaitDialog )
-	delete iWaitDialog;   
-	idialogOn = EFalse;
-	idialogDismissed = EFalse;
-    SetState( EIdle );
-    }
-
-    
-//---------------------------------------------------------------------------
-// CDiagExternalMediaCardPlugin::SetState()
-//---------------------------------------------------------------------------
-void CDiagExternalMediaCardPlugin::SetState( TStates aState )
-    {
-    iState = aState;
-    }
-    
-// ADO & Platformization Changes
-TBool CDiagExternalMediaCardPlugin::ShowMessageQueryL( TInt aResourceId, TInt &aButtonId  )
-    {
-    LOGSTRING( "CDiagAudioPlugin::ShowMessageQueryL IN" )
-    CAknMessageQueryDialog* dlg    = NULL;
-    TBool                   result = EFalse;
-
-    // Create CAknMessageQueryDialog instance
-    dlg = new ( ELeave ) CAknMessageQueryDialog();
-
-    dlg->PrepareLC( aResourceId );
-     
-    CEikButtonGroupContainer& cba = dlg->ButtonGroupContainer();
-
-        switch ( aResourceId )
-            {
-            case R_MESSAGEQUERY_TITLE_EXTERNALMEMORY: 
-         	   {
-            	if ( SinglePluginExecution() )
-        			{
-        			cba.SetCommandSetL( R_EXT_MEMORY_SOFTKEYS_OK_CANCEL );		
-        			}
-        	   else 
-        	   		{	
-                	cba.SetCommandSetL( R_EXT_MEMORY_SOFTKEYS_OK_SKIP );		
-                	}
-        		}
-                break;
-
-            default:
-                break;
-            }
-        	
-    result = RunWaitingDialogL( dlg, aButtonId );
-
-    LOGSTRING3( "CDiagAudioPlugin::ShowMessageQueryL() OUT aButtonId=%d result=%d", aButtonId, result );
-    return result;
-    }
-    
-// End of File
-
--- a/devicediagnostics/diagplugins/diagexternalmediacardplugin/src/diagexternalmediacardpluginimplementationtable.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-/*
-* 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:  ECOM proxy table for DiagExternalMediaCardPlugin
-*
-*/
-
-
-// INCLUDES
-#include "diagexternalmediacardplugin.h"
-
-#include <e32std.h>
-#include <implementationproxy.h>
-
-
-// CONSTANTS
-const TImplementationProxy KDiagExternalMediaCardPluginImplementationTable[] = 
-	{
-	IMPLEMENTATION_PROXY_ENTRY( 0x2000E58B,	CDiagExternalMediaCardPlugin::NewL ),
-	};
-
-
-// ---------------------------------------------------------------------------
-// ImplementationGroupProxy
-// 
-// Gate/factory function
-// ---------------------------------------------------------------------------
-//
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy( 
-                                                  TInt& aTableCount )
-	{
-	aTableCount = sizeof( KDiagExternalMediaCardPluginImplementationTable ) 
-        / sizeof( TImplementationProxy );
-	return KDiagExternalMediaCardPluginImplementationTable;
-	}
-
-
-
-// End of File
--- a/devicediagnostics/diagplugins/diagheadsetcableplugin/data/devdiagheadsetcabletestplugin.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-/*
-* 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:  ECOM plugin resource file for Headset Cable Test Plug-in
-*
-*/
-
-#include <registryinfo.rh>
-#include "diagheadsetcabletestplugin.hrh" //UIds
-
-RESOURCE REGISTRY_INFO theInfo
-    {
-    dll_uid     = _UID3;
-    interfaces  =
-        {
-        INTERFACE_INFO
-            {
-            interface_uid   = 0x2000AFEB;
-            implementations =
-                {
-                IMPLEMENTATION_INFO
-                    {
-                    implementation_uid  = _IMPLEMENTATION_UID;
-                    version_no          = 1;
-                    display_name        = "Headset Cable Test Plugin";
-                    default_data        = "0x2000E569"; //HW suite";
-                    opaque_data         =   "<diagplugininfo>" 
-                                                "<order number=\"70\"/>"
-                                            "</diagplugininfo>";
-                    }
-                };
-            }
-        };
-    }
-
-
-// End of File
--- a/devicediagnostics/diagplugins/diagheadsetcableplugin/data/devdiagheadsetcabletestpluginrsc.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,366 +0,0 @@
-/*
-* 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:  Resource file for DiagHeadsetCableTestPlugin
-*
-*/
-
-
-
-//  RESOURCE IDENTIFIER
-NAME    DGHS // 4 letter ID // this has to be unique for each plugin
-
-//  INCLUDES
-
-#include    <avkon.loc>
-#include    <avkon.mbg>
-#include    <avkon.rsg>
-#include    <avkon.rh>
-#include    <AvkonIcons.hrh>
-#include    <bldvariant.hrh>
-#include    <data_caging_paths_strings.hrh>
-#include    <eikcore.rsg>
-#include    <eikon.rsg>
-#include    <uikon.rh>
-#include    <eikon.rh>
-
-#include    <diagplugincommon.loc>
-#include    "diagheadsetcabletestplugin.hrh"
-#include    <diagheadsetcabletestplugin.loc>
-
-
-// CONSTANTS
-#define     BMPFILE_NAME    "\\resource\\apps\\avkon2.mbm"
-
-
-//  RESOURCE DEFINITIONS
-
-RESOURCE RSS_SIGNATURE
-    {
-    }
-
-RESOURCE TBUF
-    {
-    buf="DGHS";
-    }
-
-
-// ---------------------------------------------------------------------------
-//  r_diag_headset_cable_test_heading_pane
-//
-// The plugin name in the header of the dialog that
-// is shown when starting test execution.
-// ---------------------------------------------------------------------------
-//
-RESOURCE TBUF r_diag_headset_cable_test_heading_pane
-    {
-    buf = qtn_diag_msg_title_headset;                    
-    }
-
-// ---------------------------------------------------------------------------
-// r_diag_headset_cable_test_info_pane
-// ---------------------------------------------------------------------------
-//
-RESOURCE TBUF r_diag_headset_cable_test_info_pane
-    {
-    buf = qtn_diag_conf_test_failed_headset_cable;
-    }
-
-
-
-// ---------------------------------------------------------------------------
-// r_diag_headset_cable_test_title_pane
-// The title pane shown when Headset cable test is running
-// ---------------------------------------------------------------------------
-//
-RESOURCE TBUF r_diag_headset_cable_test_title_pane
-    {
-    buf = qtn_diag_title_test_headset;
-    }
-
-// ---------------------------------------------------------------------------
-// r_diag_headset_cable_test_single_graphic
-// Plugin name in the suite view listbox.
-// ---------------------------------------------------------------------------
-//
-RESOURCE TBUF r_diag_headset_cable_test_single_graphic
-    {
-    buf = qtn_diag_lst_test_headset;
-    }
-
-
-//----------------------------------------------------
-//  r_diag_headset_cable_test_single
-//
-// Plugin's name in results view
-//----------------------------------------------------
-//
-RESOURCE TBUF r_diag_headset_cable_test_single
-    {
-    buf = qtn_diag_lst_headset;          
-    }
-  
-    
-// ADO & Platformization Changes
-//------------------------------------------------------------------------------
-//  r_cba_connect_and_press_ok
-//
-//  Command Button Array for query dialog "Connect your Headset. Press OK when ready." 
-//------------------------------------------------------------------------------
-//    
-//RESOURCE CBA r_cba_connect_and_press_ok
-//      {
-//      buttons = 
-//          { 
-//          CBA_BUTTON { id = EHeadsetTestConnectHeadsetSkip;      txt = qtn_diag_softk_skip;   }, 
-//          CBA_BUTTON { id = EHeadsetTestConnectHeadsetCancel;    txt = text_softkey_cancel; } ,
-//          CBA_BUTTON { id = EAknSoftkeyOk;                       txt = text_softkey_ok;   } 
-//          }; 
-//      }
-      
-      
-//------------------------------------------------------------------------------
-//  r_cba_connect_and_press_ok
-//
-//  Command Button Array for query dialog "Connect your Headset. Press OK when ready." 
-//------------------------------------------------------------------------------
-//    
-RESOURCE CBA r_cba_connect_and_press_ok
-      {
-      buttons = 
-          { 
-          CBA_BUTTON { id = EAknSoftkeyOk;                       txt = text_softkey_ok;   } ,
-          CBA_BUTTON { id = EHeadsetTestConnectHeadsetCancel;    txt = text_softkey_cancel; } ,
-          CBA_BUTTON { id = EAknSoftkeyOk;                       txt = text_softkey_ok;   } 
-          }; 
-      }
-      
-//------------------------------------------------------------------------------
-//  r_cba_connect_and_press_ok_single_execution
-//
-//  Command Button Array for query dialog 
-// "Connect your Headset. Press OK when ready." in case of single plugin execution
-//------------------------------------------------------------------------------
-//    
-RESOURCE CBA r_cba_connect_and_press_ok_single_execution
-      {
-      buttons = 
-          { 
-          CBA_BUTTON { id = EAknSoftkeyOk;                       txt = text_softkey_ok;   } ,
-          CBA_BUTTON { id = EHeadsetTestConnectHeadsetCancel;    txt = text_softkey_cancel; }          
-          }; 
-      }     
-// ADO & Platformization Changes
-//------------------------------------------------------------------------------
-//  r_cba_connect_and_press_ok_Group_execution
-//
-//  Command Button Array for query dialog 
-// "Connect your Headset. Press OK when ready." in case of single plugin execution
-//------------------------------------------------------------------------------
-//    
-RESOURCE CBA r_cba_connect_and_press_ok_group_execution
-      {
-      buttons = 
-          { 
-          CBA_BUTTON { id = EAknSoftkeyOk;                       txt = text_softkey_ok;   } ,
-          CBA_BUTTON { id = EHeadsetTestConnectHeadsetSkip;    	txt = qtn_diag_softk_skip; }          
-          }; 
-      }    
-      
-//------------------------------------------------------------------------------
-//  r_diag_cable_test_cba_ok_dot_empty
-//
-//  Command Button Array for query dialog "Please remove all cable." 
-//------------------------------------------------------------------------------
-//    
-RESOURCE CBA r_diag_cable_test_cba_ok_dot_empty
-      {
-      buttons = 
-          { 
-          CBA_BUTTON { id = EAknSoftkeyOk;
-                       txt = text_softkey_ok;   },
-          CBA_BUTTON { },
-          
-          CBA_BUTTON { id = EAknSoftkeyOk; }
-          }; 
-      }      
-      
-// -----------------------------------------------------------------------------
-//
-// r_diag_headset_cable_test_connect_and_press_ok
-// query dialog for "Connect your Headset. Press OK when ready." 
-//
-// -----------------------------------------------------------------------------
-//
-RESOURCE DIALOG r_diag_headset_cable_test_connect_and_press_ok
-    {
-    flags = EGeneralQueryFlags;
-    buttons = r_cba_connect_and_press_ok;
-    items =
-        {
-        DLG_LINE
-            {
-            type = EAknCtQuery;
-            id   = EGeneralQuery;
-            control = AVKON_CONFIRMATION_QUERY
-                {
-                layout  = EConfirmationQueryLayout;
-                label   = qtn_diag_conf_headset_connect;
-                bmpfile = BMPFILE_NAME; 
-                bmpid   = EMbmAvkonQgn_note_info;
-                bmpmask = EMbmAvkonQgn_note_info_mask;
-                };
-            }
-        };
-    }     
-
-
-// ADO & Platformization Changes
-//------------------------------------------------------------------------------
-//  r_cba_headset_cable_test_no_cable_detected
-//
-//  Command Button Array for query dialog 
-// "No cable detected. Press OK to continue tests or press Back to retry this test."
-//------------------------------------------------------------------------------
-//    
-//RESOURCE CBA r_cba_headset_cable_test_no_cable_detected
-//      {
-//      buttons = 
-//          { 
-//          CBA_BUTTON { id = EAknSoftkeyOk; 
-//                       txt = text_softkey_ok; },
-
-//          CBA_BUTTON { id = EHeadsetTestConnectHeadsetBack;
-//                       txt = text_softkey_back; } ,
-//
-//          CBA_BUTTON { id = EAknSoftkeyOk;
-//                       txt = text_softkey_ok; }
-//          }; 
-//      }
-RESOURCE CBA r_cba_headset_cable_test_no_cable_detected
-      {
-      buttons = 
-          { 
-          CBA_BUTTON { id = EHeadsetTestConnectHeadsetYes; 
-                       txt = text_softkey_yes; },
-
-          CBA_BUTTON { id = EHeadsetTestConnectHeadsetNo;
-                       txt = text_softkey_no; } ,
-
-          CBA_BUTTON { id = EHeadsetTestConnectHeadsetYes;
-                       txt = text_softkey_yes; }
-          }; 
-      }
-
-
-//------------------------------------------------------------------------------
-//
-// r_diag_headset_cable_test_no_cable_detected
-// query dialog for "No cable detected. Press OK to continue tests or press 
-// Back to retry this test." 
-//
-//------------------------------------------------------------------------------
-//
- 
-RESOURCE DIALOG r_diag_headset_cable_test_no_cable_detected
-    {
-    flags = EGeneralQueryFlags;
-    buttons = r_cba_headset_cable_test_no_cable_detected;
-    items =
-        {
-        DLG_LINE
-            {
-            type = EAknCtPopupHeadingPane;
-            id = EAknMessageQueryHeaderId;
-            control = AVKON_HEADING
-                {
-                label = qtn_diag_err_title_no_headset;
-                headinglayout = 0;
-                };
-            },
-            
-        DLG_LINE
-            {
-            type = EAknCtMessageQuery;
-            id = EAknMessageQueryContentId;
-            control = AVKON_MESSAGE_QUERY
-                {
-                message = qtn_diag_err_no_headset;
-                };
-            }
-        };
-    }
-
-//------------------------------------------------------------------------------
-//
-// r_diag_cable_test_remove_all_cables
-// query dialog for "Please remove all cables" 
-//
-//------------------------------------------------------------------------------
-//    
-RESOURCE DIALOG r_diag_cable_test_remove_all_cables
-    {
-    flags   = EGeneralQueryFlags;
-    buttons = r_diag_cable_test_cba_ok_dot_empty;
-
-    items =
-        {
-        DLG_LINE
-            {
-            type = EAknCtQuery;
-            id   = EGeneralQuery;
-            control = AVKON_CONFIRMATION_QUERY
-                {
-                layout  = EConfirmationQueryLayout;
-                label   = qtn_diag_msg_remove_all_cables;
-                bmpfile = BMPFILE_NAME; 
-                bmpid   = EMbmAvkonQgn_note_info;
-                bmpmask = EMbmAvkonQgn_note_info_mask;
-                };
-            }
-        };
-    }
-    
-    
-// ADO & Platformization Changes
-
-RESOURCE DIALOG r_diag_messagequery_title_headset
-{
-	flags = EGeneralQueryFlags;
-	buttons = r_cba_connect_and_press_ok_single_execution;
-	items =
-	{
-			DLG_LINE
-			{
-				type = EAknCtPopupHeadingPane;
-				id = EAknMessageQueryHeaderId;
-				control = AVKON_HEADING
-				{
-							label = qtn_diag_msg_title_headset;
-			 				headinglayout = R_AVKON_WML_SIGN_QUERY_HEADING_PANE;
-				};
-			},
-			
-			DLG_LINE
-			{
-					type = EAknCtMessageQuery;
-					id = EAknMessageQueryContentId;
-					control = AVKON_MESSAGE_QUERY
-					{
-							message = qtn_diag_msg_info_headset;
-					};
-			}
-			
-	};
-}
-//End of File
--- a/devicediagnostics/diagplugins/diagheadsetcableplugin/group/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-/*
-* 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:  This file provides the information required for building
-*                Headset Cable Test Plug-in
-*
-*/
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-../loc/diagheadsetcabletestplugin.loc       MW_LAYER_LOC_EXPORT_PATH(diagheadsetcabletestplugin.loc)
-../rom_files/devdiagheadsetcableplugin.iby		CORE_MW_LAYER_IBY_EXPORT_PATH(devdiagheadsetcableplugin.iby)
-../rom_files/devdiagheadsetcableplugin_resources.iby		LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(devdiagheadsetcableplugin_resources.iby)
-
-PRJ_MMPFILES
-diagheadsetcabletestplugin.mmp
-
-PRJ_TESTMMPFILES
-
-//  End of File
--- a/devicediagnostics/diagplugins/diagheadsetcableplugin/group/diagheadsetcabletestplugin.mmp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-/*
-* 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:  Project specification file.
-*
-*/
-
-
-#include  <data_caging_paths.hrh>    // For RESOURCE_FILES_DIR
-
-// To get the MW_LAYER_SYSTEMINCLUDE-definition
-#include <platform_paths.hrh>            
-
-CAPABILITY          CAP_ECOM_PLUGIN
-TARGET              devdiagheadsetcabletestplugin.dll
-TARGETTYPE          PLUGIN
-UID                 0x10009D8D 0x2000E592                   
-VENDORID            VID_DEFAULT
-
-
-SOURCEPATH  ../src
-SOURCE      diagheadsetpluginImplementationtable.cpp 
-SOURCE      diagheadsetcableplugin.cpp
-SOURCE      diagheadsetcableengine.cpp
-
-//User include paths
-USERINCLUDE     ../inc
-USERINCLUDE     ../data // For *.rh
-USERINCLUDE     ../loc
-
-//System include paths
-SYSTEMINCLUDE   /epoc32/include/ecom
-
-// Default system include paths for middleware layer modules.
-APP_LAYER_SYSTEMINCLUDE
-
-SOURCEPATH      ../data
-
-// resource file for the plugin implementation
-START RESOURCE  devdiagheadsetcabletestplugin.rss
-TARGET          devdiagheadsetcabletestplugin.rsc
-TARGETPATH      ECOM_RESOURCE_DIR
-END
-
-// resource file for the plugin registration
-START RESOURCE  devdiagheadsetcabletestpluginrsc.rss
-HEADER
-TARGETPATH      RESOURCE_FILES_DIR
-LANGUAGE_IDS
-END
-
-LIBRARY   euser.lib
-LIBRARY   avkon.lib
-LIBRARY   commonengine.lib      // For RConeResourceLoader
-LIBRARY   diagframework.lib
-LIBRARY   eikcoctl.lib
-LIBRARY   eikdlg.lib
-LIBRARY   diagpluginbase.lib
-LIBRARY   headsetstatus.lib //for CHeadsetStatus
-LIBRARY   flogger.lib           // for RFileLogger
-
-// End of File
-
--- a/devicediagnostics/diagplugins/diagheadsetcableplugin/group/diagheadsetcabletestplugin.xml	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2037 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!DOCTYPE PROJECT [
- <!ELEMENT PROJECT (TARGETLIST, TARGETORDER, GROUPLIST, DESIGNLIST?)>
- <!ELEMENT TARGETLIST (TARGET+)>
- <!ELEMENT TARGET (NAME, SETTINGLIST, FILELIST?, LINKORDER?, SEGMENTLIST?, OVERLAYGROUPLIST?, SUBTARGETLIST?, SUBPROJECTLIST?, FRAMEWORKLIST?, PACKAGEACTIONSLIST?)>
- <!ELEMENT NAME (#PCDATA)>
- <!ELEMENT USERSOURCETREETYPE (#PCDATA)>
- <!ELEMENT PATH (#PCDATA)>
- <!ELEMENT FILELIST (FILE*)>
- <!ELEMENT FILE (PATHTYPE, PATHROOT?, ACCESSPATH?, PATH, PATHFORMAT?, ROOTFILEREF?, FILEKIND?, FILEFLAGS?)>
- <!ELEMENT PATHTYPE (#PCDATA)>
- <!ELEMENT PATHROOT (#PCDATA)>
- <!ELEMENT ACCESSPATH (#PCDATA)>
- <!ELEMENT PATHFORMAT (#PCDATA)>
- <!ELEMENT ROOTFILEREF (PATHTYPE, PATHROOT?, ACCESSPATH?, PATH, PATHFORMAT?)>
- <!ELEMENT FILEKIND (#PCDATA)>
- <!ELEMENT FILEFLAGS (#PCDATA)>
- <!ELEMENT FILEREF (TARGETNAME?, PATHTYPE, PATHROOT?, ACCESSPATH?, PATH, PATHFORMAT?)>
- <!ELEMENT TARGETNAME (#PCDATA)>
- <!ELEMENT SETTINGLIST ((SETTING|PANELDATA)+)>
- <!ELEMENT SETTING (NAME?, (VALUE|(SETTING+)))>
- <!ELEMENT PANELDATA (NAME, VALUE)>
- <!ELEMENT VALUE (#PCDATA)>
- <!ELEMENT LINKORDER (FILEREF*)>
- <!ELEMENT SEGMENTLIST (SEGMENT+)>
- <!ELEMENT SEGMENT (NAME, ATTRIBUTES?, FILEREF*)>
- <!ELEMENT ATTRIBUTES (#PCDATA)>
- <!ELEMENT OVERLAYGROUPLIST (OVERLAYGROUP+)>
- <!ELEMENT OVERLAYGROUP (NAME, BASEADDRESS, OVERLAY*)>
- <!ELEMENT BASEADDRESS (#PCDATA)>
- <!ELEMENT OVERLAY (NAME, FILEREF*)>
- <!ELEMENT SUBTARGETLIST (SUBTARGET+)>
- <!ELEMENT SUBTARGET (TARGETNAME, ATTRIBUTES?, FILEREF?)>
- <!ELEMENT SUBPROJECTLIST (SUBPROJECT+)>
- <!ELEMENT SUBPROJECT (FILEREF, SUBPROJECTTARGETLIST)>
- <!ELEMENT SUBPROJECTTARGETLIST (SUBPROJECTTARGET*)>
- <!ELEMENT SUBPROJECTTARGET (TARGETNAME, ATTRIBUTES?, FILEREF?)>
- <!ELEMENT FRAMEWORKLIST (FRAMEWORK+)>
- <!ELEMENT FRAMEWORK (FILEREF, DYNAMICLIBRARY?, VERSION?)>
- <!ELEMENT PACKAGEACTIONSLIST (PACKAGEACTION+)>
- <!ELEMENT PACKAGEACTION (#PCDATA)>
- <!ELEMENT LIBRARYFILE (FILEREF)>
- <!ELEMENT VERSION (#PCDATA)>
- <!ELEMENT TARGETORDER (ORDEREDTARGET|ORDEREDDESIGN)*>
- <!ELEMENT ORDEREDTARGET (NAME)>
- <!ELEMENT ORDEREDDESIGN (NAME, ORDEREDTARGET+)>
- <!ELEMENT GROUPLIST (GROUP|FILEREF)*>
- <!ELEMENT GROUP (NAME, (GROUP|FILEREF)*)>
- <!ELEMENT DESIGNLIST (DESIGN+)>
- <!ELEMENT DESIGN (NAME, DESIGNDATA)>
- <!ELEMENT DESIGNDATA (#PCDATA)>
-]>
-<?codewarrior exportversion="1.0.1" ideversion="5.0" ?>
-<PROJECT>
-    <TARGETLIST>
-        <TARGET>
-            <NAME>WINSCW UDEB</NAME>
-            <SETTINGLIST>
-
-                <!-- Settings for "Source Trees" panel -->
-                <SETTING><NAME>UserSourceTrees</NAME></SETTING>
-
-                <!-- Settings for "Access Paths" panel -->
-                <SETTING><NAME>AlwaysSearchUserPaths</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>InterpretDOSAndUnixPaths</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>RequireFrameworkStyleIncludes</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>SourceRelativeIncludes</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>UserSearchPaths</NAME>
-                    <SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics_withdom\DeviceDiagnostics\diagplugins\diagheadsetcableplugin\inc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics_withdom\DeviceDiagnostics\diagplugins\diagheadsetcableplugin\data</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics_withdom\DeviceDiagnostics\diagplugins\diagheadsetcableplugin\loc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics_withdom\DeviceDiagnostics\diagplugins\diagheadsetcableplugin\group</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics_withdom\DeviceDiagnostics\diagplugins\diagheadsetcableplugin\src</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING></SETTING>
-                <SETTING><NAME>SystemSearchPaths</NAME>
-                    <SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\ecom</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\oem</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\middleware</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\middleware</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\osextensions</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\osextensions</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\osextensions\loc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\middleware\loc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\osextensions\loc\sc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\middleware\loc\sc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\UDEB</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>Symbian_Support\Win32-x86 Support\Libraries\Win32 SDK</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>CodeWarrior</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>Symbian_Support\Runtime\Runtime_x86\Runtime_Win32\Libs</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>CodeWarrior</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING></SETTING>
-
-                <!-- Settings for "Debugger Runtime" panel -->
-                <SETTING><NAME>MWRuntimeSettings_WorkingDirectory</NAME><VALUE/></SETTING>
-                <SETTING><NAME>MWRuntimeSettings_CommandLine</NAME><VALUE/></SETTING>
-                <SETTING><NAME>MWRuntimeSettings_HostApplication</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\udeb\epoc.exe</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>MWRuntimeSettings_EnvVars</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Target Settings" panel -->
-                <SETTING><NAME>Linker</NAME><VALUE>Symbian Linker v2</VALUE></SETTING>
-                <SETTING><NAME>PreLinker</NAME><VALUE/></SETTING>
-                <SETTING><NAME>PostLinker</NAME><VALUE>Symbian Installer v2</VALUE></SETTING>
-                <SETTING><NAME>Targetname</NAME><VALUE>WINSCW UDEB</VALUE></SETTING>
-                <SETTING><NAME>OutputDirectory</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\udeb</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SaveEntriesUsingRelativePaths</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "File Mappings" panel -->
-                <SETTING><NAME>FileMappings</NAME>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>._i</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>._ii</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.c</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cc</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cfg</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cia</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cpp</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cwlink</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>XML</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cxx</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.def</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.h</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.hrh</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.i</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.iby</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.ii</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.inf</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.ini</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.inl</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.loc</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.mmpi</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.pch++</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.pkg</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.policy</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.ra</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.resources</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Resource v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>XML</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.rh</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.rls</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.rss</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.rsg</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.s</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.script</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.txt</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.a</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Object Importer v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.lib</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Object Importer v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.dso</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Object Importer v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.o</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Object Importer v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                </SETTING>
-
-                <!-- Settings for "Build Extras" panel -->
-                <SETTING><NAME>CacheModDates</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>DumpBrowserInfo</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>CacheSubprojects</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>UseThirdPartyDebugger</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>BrowserGenerator</NAME><VALUE>2</VALUE></SETTING>
-                <SETTING><NAME>DebuggerAppPath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>DebuggerCmdLineArgs</NAME><VALUE/></SETTING>
-                <SETTING><NAME>DebuggerWorkingDir</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CodeCompletionPrefixFileName</NAME><VALUE/></SETTING>
-                <SETTING><NAME>CodeCompletionMacroFileName</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Debugger Target" panel -->
-                <SETTING><NAME>ConsoleEncoding</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>LogSystemMessages</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>AutoTargetDLLsPopUp</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>StopAtWatchpoints</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>PauseWhileRunning</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>PauseInterval</NAME><VALUE>5</VALUE></SETTING>
-                <SETTING><NAME>PauseUIFlags</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>AltExePath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>StopAtTempBPOnLaunch</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>CacheSymbolics</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>TempBPFunctionName</NAME><VALUE>E32Main</VALUE></SETTING>
-                <SETTING><NAME>TempBPType</NAME><VALUE>1</VALUE></SETTING>
-
-                <!-- Settings for "Remote Debug" panel -->
-                <SETTING><NAME>Enabled</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>ConnectionName</NAME><VALUE/></SETTING>
-                <SETTING><NAME>DownloadPath</NAME><VALUE/></SETTING>
-                <SETTING><NAME>LaunchRemoteApp</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>RemoteAppPath</NAME><VALUE/></SETTING>
-                <SETTING><NAME>CoreID</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>JTAGClockSpeed</NAME><VALUE>8000</VALUE></SETTING>
-                <SETTING><NAME>IsMultiCore</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>OSDownload</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>UseGlobalOSDownload</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>OSDownloadConnectionName</NAME><VALUE/></SETTING>
-                <SETTING><NAME>OSDownloadPath</NAME><VALUE/></SETTING>
-                <SETTING><NAME>AltDownload</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>AltDownloadConnectionName</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "x86 Exceptions" panel -->
-                <SETTING><NAME>MWDebugger_X86_Exceptions</NAME>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                
-                <!-- Settings for "Auto-target" panel -->
-                <SETTING><NAME>OtherExecutables</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Analyzer Connections" panel -->
-                <SETTING><NAME>AnalyzerConnectionName</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Custom Keywords" panel -->
-                <SETTING><NAME>CustomColor1</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor2</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor3</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor4</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "ARM Debugger" panel -->
-                <SETTING><NAME>Processor</NAME><VALUE>Generic</VALUE></SETTING>
-                <SETTING><NAME>BraekPoinType_II</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>UseInitFile</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>UseConfigFile</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>IDexecutable</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>IDinitialized</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>IDuninitialized</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>IDconstant</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>SDexecutable</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>SDinitialized</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>SDuninitialized</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>SDconstant</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>VerifyMemWrites</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>ShowMPC107regs</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>InitializationFile</NAME><VALUE/></SETTING>
-                <SETTING><NAME>ConfigurationFile</NAME><VALUE/></SETTING>
-                <SETTING><NAME>BreakpointType</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>WatchpointType</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>TargetOS</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>RTOSPluginName</NAME><VALUE/></SETTING>
-                <SETTING><NAME>ByteOrderType</NAME><VALUE>0</VALUE></SETTING>
-                <PANELDATA><NAME>CodeTest SYMBIAN Instrumenter</NAME><VALUE>
-                    0200020000000100000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000433A5C0000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000637466696C657300000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000636F6465746573742E6964620000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000
-                </VALUE></PANELDATA>
-
-                <!-- Settings for "Symbian Installation" panel -->
-                <SETTING><NAME>SymbianInstallationOutputFilename</NAME><VALUE>Application.sis</VALUE></SETTING>
-                <SETTING><NAME>SymbianInstallationOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>SymbianInstallationContentSearchLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\udeb</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianInstallationPassword</NAME><VALUE/></SETTING>
-                <SETTING><NAME>SymbianInstallationCreateStubFile</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "Symbian Installer Panel v2" panel -->
-                <SETTING><NAME>SymbianInstallationOutputFilename</NAME><VALUE>Application.sis</VALUE></SETTING>
-                <SETTING><NAME>SymbianInstallationOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>SymbianInstallationContentSearchLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\udeb</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianInstallationPassword</NAME><VALUE/></SETTING>
-                <SETTING><NAME>SymbianInstallationCreateStubFile</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "Symbian Resource Panel" panel -->
-                <SETTING><NAME>SymbianResourcesMMPFileLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics_withdom\DeviceDiagnostics\diagplugins\diagheadsetcableplugin\group</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianResourcesBinaryOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\udeb</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianResourcesHeaderFileOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\include</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-
-                <!-- Settings for "Symbian Resources Panel v2" panel -->
-                <SETTING><NAME>SymbianResourcesMMPFileLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics_withdom\DeviceDiagnostics\diagplugins\diagheadsetcableplugin\group</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianResourcesBinaryOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\udeb</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianResourcesHeaderFileOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\include</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-
-                <!-- Settings for "Remote Download" panel -->
-                <SETTING><NAME>FileList</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Symbian ARM Debugger" panel -->
-                <SETTING><NAME>Processor</NAME><VALUE>Generic</VALUE></SETTING>
-                <SETTING><NAME>UseInitFile</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>UseConfigFile</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>ResetTarget</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>InitializationFile</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>ConfigurationFile</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>TargetOS</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>RTOSPluginName</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Symbian Common Panel" panel -->
-                <SETTING><NAME>ShowCommandLine</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>SymbianEpocToolsPath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE></VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-
-                <!-- Settings for "Symbian Compiler Panel" panel -->
-                <SETTING><NAME>PrefixFile</NAME><VALUE>feature_settings.hrh</VALUE></SETTING>
-                <SETTING><NAME>CompilerXMLDescriptor</NAME><VALUE>Metrowerks x86 Compiler</VALUE></SETTING>
-                <SETTING><NAME>Macros</NAME><VALUE>__SYMBIAN32__,__CW32__,__WINS__,__WINSCW__,__DLL__,_DEBUG,_UNICODE,__SUPPORT_CPP_EXCEPTIONS__,</VALUE></SETTING>
-                <SETTING><NAME>CodeTEST</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>EnableSWIC</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Arguments</NAME><VALUE>-wchar_t off -align 4 -warnings on -w nohidevirtual, nounusedexpr -msgstyle gcc -enum int -str pool -exc ms -trigraphs on -O0 -inline off -nostdinc</VALUE></SETTING>
-                <SETTING><NAME>CIAArgs</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Symbian Debugging" panel -->
-                <SETTING><NAME>Parse Log File</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Log File Path</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>Symbian SDK Folder</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>Log Unresolved Modules</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Log Unresolved Sym Files</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Debug Non-XIP Executables</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "Symbian Kernel Debugging" panel -->
-                <SETTING><NAME>Start Address</NAME><VALUE>0x00000000</VALUE></SETTING>
-                <SETTING><NAME>Run From Start Address</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Download Image</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>OS Image Path</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>Download Address</NAME><VALUE>0x00000000</VALUE></SETTING>
-                <SETTING><NAME>Ask First</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Debug Bootrom</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Bootrom Sym File</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "Symbian Linker Panel" panel -->
-                <SETTING><NAME>LinkOutputFile</NAME><VALUE>DevDiagHeadsetCableTestPlugin.dll</VALUE></SETTING>
-                <SETTING><NAME>LinkCmdLine</NAME><VALUE/></SETTING>
-                <SETTING><NAME>SymbianImportLibrary</NAME><VALUE>DevDiagHeadsetCableTestPlugin.lib</VALUE></SETTING>
-                <SETTING><NAME>canDebug</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>canRun</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "Symbian RomBuild Panel" panel -->
-                <SETTING><NAME>CommandLine</NAME><VALUE>buildrom -D_DEBUG devkit lubbock techview -olubbock_gui.img</VALUE></SETTING>
-                <SETTING><NAME>OutputPath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>C:\</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>DisplayMessages</NAME><VALUE>true</VALUE></SETTING>
-
-                <!-- Settings for "Symbian Target" panel -->
-                <SETTING><NAME>TargetArchitecture</NAME><VALUE>WINSCW</VALUE></SETTING>
-                <SETTING><NAME>LogMessages</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>SuppressWarnings</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>GenerateSymbolics</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>CompilerPrefix</NAME><VALUE/></SETTING>
-                <SETTING><NAME>CompilerCmdLine</NAME><VALUE/></SETTING>
-                <SETTING><NAME>SymbianImportLibraryPath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>C:\</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "Symbian Tools" panel -->
-                <SETTING><NAME>Gnu Tools Path</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>C:\</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>Epoc32 Tools Path</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>C:\</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-            </SETTINGLIST>
-            <FILELIST>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagHeadsetCableTestPlugin.mmp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagHeadsetCableTestPluginWINSCW.resources</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>EDLL.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagHeadsetPluginImplementationTable.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagHeadsetCablePlugin.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagHeadsetCableEngine.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagHeadsetCableTestPlugin_UID_.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>euser.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>avkon.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>CommonEngine.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagFramework.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>eikcoctl.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>eikdlg.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagPluginBase.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>HeadsetStatus.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>flogger.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagHeadsetCableEngine.h</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagHeadsetCablePlugin.h</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagHeadsetCableTestCallBackInterface.h</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagHeadsetCableTestPlugin.hrh</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagHeadsetCableTestPluginWINSCWUDEB.cwlink</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-</FILELIST>
-            <LINKORDER>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagHeadsetCableTestPlugin.mmp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagHeadsetCableTestPluginWINSCW.resources</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>EDLL.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagHeadsetPluginImplementationTable.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagHeadsetCablePlugin.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagHeadsetCableEngine.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagHeadsetCableTestPlugin_UID_.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>euser.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>avkon.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>CommonEngine.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagFramework.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>eikcoctl.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>eikdlg.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagPluginBase.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>HeadsetStatus.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>flogger.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagHeadsetCableEngine.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagHeadsetCablePlugin.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagHeadsetCableTestCallBackInterface.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagHeadsetCableTestPlugin.hrh</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagHeadsetCableTestPluginWINSCWUDEB.cwlink</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-</LINKORDER>
-        </TARGET><TARGET>
-            <NAME>WINSCW UREL</NAME>
-            <SETTINGLIST>
-
-                <!-- Settings for "Source Trees" panel -->
-                <SETTING><NAME>UserSourceTrees</NAME></SETTING>
-
-                <!-- Settings for "Access Paths" panel -->
-                <SETTING><NAME>AlwaysSearchUserPaths</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>InterpretDOSAndUnixPaths</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>RequireFrameworkStyleIncludes</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>SourceRelativeIncludes</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>UserSearchPaths</NAME>
-                    <SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics_withdom\DeviceDiagnostics\diagplugins\diagheadsetcableplugin\inc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics_withdom\DeviceDiagnostics\diagplugins\diagheadsetcableplugin\data</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics_withdom\DeviceDiagnostics\diagplugins\diagheadsetcableplugin\loc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics_withdom\DeviceDiagnostics\diagplugins\diagheadsetcableplugin\group</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics_withdom\DeviceDiagnostics\diagplugins\diagheadsetcableplugin\src</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING></SETTING>
-                <SETTING><NAME>SystemSearchPaths</NAME>
-                    <SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\ecom</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\oem</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\middleware</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\middleware</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\osextensions</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\osextensions</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\osextensions\loc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\middleware\loc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\osextensions\loc\sc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\middleware\loc\sc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\UREL</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\release\WINSCW\UDEB</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>Symbian_Support\Win32-x86 Support\Libraries\Win32 SDK</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>CodeWarrior</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>Symbian_Support\Runtime\Runtime_x86\Runtime_Win32\Libs</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>CodeWarrior</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING></SETTING>
-
-                <!-- Settings for "Debugger Runtime" panel -->
-                <SETTING><NAME>MWRuntimeSettings_WorkingDirectory</NAME><VALUE/></SETTING>
-                <SETTING><NAME>MWRuntimeSettings_CommandLine</NAME><VALUE/></SETTING>
-                <SETTING><NAME>MWRuntimeSettings_HostApplication</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\urel\epoc.exe</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>MWRuntimeSettings_EnvVars</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Target Settings" panel -->
-                <SETTING><NAME>Linker</NAME><VALUE>Symbian Linker v2</VALUE></SETTING>
-                <SETTING><NAME>PreLinker</NAME><VALUE/></SETTING>
-                <SETTING><NAME>PostLinker</NAME><VALUE>Symbian Installer v2</VALUE></SETTING>
-                <SETTING><NAME>Targetname</NAME><VALUE>WINSCW UREL</VALUE></SETTING>
-                <SETTING><NAME>OutputDirectory</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\urel</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SaveEntriesUsingRelativePaths</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "File Mappings" panel -->
-                <SETTING><NAME>FileMappings</NAME>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>._i</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>._ii</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.c</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cc</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cfg</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cia</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cpp</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cwlink</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>XML</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cxx</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.def</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.h</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.hrh</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.i</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.iby</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.ii</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.inf</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.ini</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.inl</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.loc</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.mmpi</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.pch++</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.pkg</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.policy</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.ra</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.resources</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Resource v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>XML</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.rh</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.rls</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.rss</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.rsg</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.s</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.script</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.txt</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.a</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Object Importer v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.lib</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Object Importer v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.dso</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Object Importer v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.o</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Object Importer v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                </SETTING>
-
-                <!-- Settings for "Build Extras" panel -->
-                <SETTING><NAME>CacheModDates</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>DumpBrowserInfo</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>CacheSubprojects</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>UseThirdPartyDebugger</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>BrowserGenerator</NAME><VALUE>2</VALUE></SETTING>
-                <SETTING><NAME>DebuggerAppPath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>DebuggerCmdLineArgs</NAME><VALUE/></SETTING>
-                <SETTING><NAME>DebuggerWorkingDir</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CodeCompletionPrefixFileName</NAME><VALUE/></SETTING>
-                <SETTING><NAME>CodeCompletionMacroFileName</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Debugger Target" panel -->
-                <SETTING><NAME>ConsoleEncoding</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>LogSystemMessages</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>AutoTargetDLLsPopUp</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>StopAtWatchpoints</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>PauseWhileRunning</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>PauseInterval</NAME><VALUE>5</VALUE></SETTING>
-                <SETTING><NAME>PauseUIFlags</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>AltExePath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>StopAtTempBPOnLaunch</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>CacheSymbolics</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>TempBPFunctionName</NAME><VALUE>E32Main</VALUE></SETTING>
-                <SETTING><NAME>TempBPType</NAME><VALUE>1</VALUE></SETTING>
-
-                <!-- Settings for "Remote Debug" panel -->
-                <SETTING><NAME>Enabled</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>ConnectionName</NAME><VALUE/></SETTING>
-                <SETTING><NAME>DownloadPath</NAME><VALUE/></SETTING>
-                <SETTING><NAME>LaunchRemoteApp</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>RemoteAppPath</NAME><VALUE/></SETTING>
-                <SETTING><NAME>CoreID</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>JTAGClockSpeed</NAME><VALUE>8000</VALUE></SETTING>
-                <SETTING><NAME>IsMultiCore</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>OSDownload</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>UseGlobalOSDownload</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>OSDownloadConnectionName</NAME><VALUE/></SETTING>
-                <SETTING><NAME>OSDownloadPath</NAME><VALUE/></SETTING>
-                <SETTING><NAME>AltDownload</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>AltDownloadConnectionName</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "x86 Exceptions" panel -->
-                <SETTING><NAME>MWDebugger_X86_Exceptions</NAME>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                
-                <!-- Settings for "Auto-target" panel -->
-                <SETTING><NAME>OtherExecutables</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Analyzer Connections" panel -->
-                <SETTING><NAME>AnalyzerConnectionName</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Custom Keywords" panel -->
-                <SETTING><NAME>CustomColor1</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor2</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor3</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor4</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "ARM Debugger" panel -->
-                <SETTING><NAME>Processor</NAME><VALUE>Generic</VALUE></SETTING>
-                <SETTING><NAME>BraekPoinType_II</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>UseInitFile</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>UseConfigFile</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>IDexecutable</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>IDinitialized</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>IDuninitialized</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>IDconstant</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>SDexecutable</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>SDinitialized</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>SDuninitialized</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>SDconstant</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>VerifyMemWrites</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>ShowMPC107regs</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>InitializationFile</NAME><VALUE/></SETTING>
-                <SETTING><NAME>ConfigurationFile</NAME><VALUE/></SETTING>
-                <SETTING><NAME>BreakpointType</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>WatchpointType</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>TargetOS</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>RTOSPluginName</NAME><VALUE/></SETTING>
-                <SETTING><NAME>ByteOrderType</NAME><VALUE>0</VALUE></SETTING>
-                <PANELDATA><NAME>CodeTest SYMBIAN Instrumenter</NAME><VALUE>
-                    0200020000000100000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000433A5C0000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000637466696C657300000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000636F6465746573742E6964620000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000
-                </VALUE></PANELDATA>
-
-                <!-- Settings for "Symbian Installation" panel -->
-                <SETTING><NAME>SymbianInstallationOutputFilename</NAME><VALUE>Application.sis</VALUE></SETTING>
-                <SETTING><NAME>SymbianInstallationOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>SymbianInstallationContentSearchLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\urel</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianInstallationPassword</NAME><VALUE/></SETTING>
-                <SETTING><NAME>SymbianInstallationCreateStubFile</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "Symbian Installer Panel v2" panel -->
-                <SETTING><NAME>SymbianInstallationOutputFilename</NAME><VALUE>Application.sis</VALUE></SETTING>
-                <SETTING><NAME>SymbianInstallationOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>SymbianInstallationContentSearchLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\urel</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianInstallationPassword</NAME><VALUE/></SETTING>
-                <SETTING><NAME>SymbianInstallationCreateStubFile</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "Symbian Resource Panel" panel -->
-                <SETTING><NAME>SymbianResourcesMMPFileLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics_withdom\DeviceDiagnostics\diagplugins\diagheadsetcableplugin\group</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianResourcesBinaryOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\urel</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianResourcesHeaderFileOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\include</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-
-                <!-- Settings for "Symbian Resources Panel v2" panel -->
-                <SETTING><NAME>SymbianResourcesMMPFileLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics_withdom\DeviceDiagnostics\diagplugins\diagheadsetcableplugin\group</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianResourcesBinaryOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\urel</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianResourcesHeaderFileOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\include</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-
-                <!-- Settings for "Remote Download" panel -->
-                <SETTING><NAME>FileList</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Symbian ARM Debugger" panel -->
-                <SETTING><NAME>Processor</NAME><VALUE>Generic</VALUE></SETTING>
-                <SETTING><NAME>UseInitFile</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>UseConfigFile</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>ResetTarget</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>InitializationFile</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>ConfigurationFile</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>TargetOS</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>RTOSPluginName</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Symbian Common Panel" panel -->
-                <SETTING><NAME>ShowCommandLine</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>SymbianEpocToolsPath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE></VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-
-                <!-- Settings for "Symbian Compiler Panel" panel -->
-                <SETTING><NAME>PrefixFile</NAME><VALUE>feature_settings.hrh</VALUE></SETTING>
-                <SETTING><NAME>CompilerXMLDescriptor</NAME><VALUE>Metrowerks x86 Compiler</VALUE></SETTING>
-                <SETTING><NAME>Macros</NAME><VALUE>__SYMBIAN32__,__CW32__,__WINS__,__WINSCW__,__DLL__,NDEBUG,_UNICODE,__SUPPORT_CPP_EXCEPTIONS__,</VALUE></SETTING>
-                <SETTING><NAME>CodeTEST</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>EnableSWIC</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Arguments</NAME><VALUE>-wchar_t off -align 4 -warnings on -w nohidevirtual, nounusedexpr -msgstyle gcc -enum int -str pool -exc ms -trigraphs on -O4,s -nostdinc</VALUE></SETTING>
-                <SETTING><NAME>CIAArgs</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Symbian Debugging" panel -->
-                <SETTING><NAME>Parse Log File</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Log File Path</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>Symbian SDK Folder</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>Log Unresolved Modules</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Log Unresolved Sym Files</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Debug Non-XIP Executables</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "Symbian Kernel Debugging" panel -->
-                <SETTING><NAME>Start Address</NAME><VALUE>0x00000000</VALUE></SETTING>
-                <SETTING><NAME>Run From Start Address</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Download Image</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>OS Image Path</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>Download Address</NAME><VALUE>0x00000000</VALUE></SETTING>
-                <SETTING><NAME>Ask First</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Debug Bootrom</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Bootrom Sym File</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "Symbian Linker Panel" panel -->
-                <SETTING><NAME>LinkOutputFile</NAME><VALUE>DevDiagHeadsetCableTestPlugin.dll</VALUE></SETTING>
-                <SETTING><NAME>LinkCmdLine</NAME><VALUE/></SETTING>
-                <SETTING><NAME>SymbianImportLibrary</NAME><VALUE>DevDiagHeadsetCableTestPlugin.lib</VALUE></SETTING>
-                <SETTING><NAME>canDebug</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>canRun</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "Symbian RomBuild Panel" panel -->
-                <SETTING><NAME>CommandLine</NAME><VALUE>buildrom -D_DEBUG devkit lubbock techview -olubbock_gui.img</VALUE></SETTING>
-                <SETTING><NAME>OutputPath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>C:\</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>DisplayMessages</NAME><VALUE>true</VALUE></SETTING>
-
-                <!-- Settings for "Symbian Target" panel -->
-                <SETTING><NAME>TargetArchitecture</NAME><VALUE>WINSCW</VALUE></SETTING>
-                <SETTING><NAME>LogMessages</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>SuppressWarnings</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>GenerateSymbolics</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>CompilerPrefix</NAME><VALUE/></SETTING>
-                <SETTING><NAME>CompilerCmdLine</NAME><VALUE/></SETTING>
-                <SETTING><NAME>SymbianImportLibraryPath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>C:\</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "Symbian Tools" panel -->
-                <SETTING><NAME>Gnu Tools Path</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>C:\</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>Epoc32 Tools Path</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>C:\</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-            </SETTINGLIST>
-            <FILELIST>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagHeadsetCableTestPlugin.mmp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagHeadsetCableTestPluginWINSCW.resources</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>EDLL.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagHeadsetPluginImplementationTable.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagHeadsetCablePlugin.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagHeadsetCableEngine.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagHeadsetCableTestPlugin_UID_.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>euser.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>avkon.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>CommonEngine.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagFramework.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>eikcoctl.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>eikdlg.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagPluginBase.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>HeadsetStatus.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>flogger.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagHeadsetCableTestPluginWINSCWUREL.cwlink</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-</FILELIST>
-            <LINKORDER>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagHeadsetCableTestPlugin.mmp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagHeadsetCableTestPluginWINSCW.resources</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>EDLL.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagHeadsetPluginImplementationTable.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagHeadsetCablePlugin.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagHeadsetCableEngine.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagHeadsetCableTestPlugin_UID_.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>euser.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>avkon.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>CommonEngine.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagFramework.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>eikcoctl.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>eikdlg.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagPluginBase.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>HeadsetStatus.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>flogger.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagHeadsetCableTestPluginWINSCWUREL.cwlink</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-</LINKORDER>
-        </TARGET><TARGET>
-<NAME>Build All</NAME><SETTINGLIST><SETTING><NAME>Linker</NAME><VALUE>None</VALUE></SETTING>
-<SETTING><NAME>Targetname</NAME><VALUE>Build All</VALUE></SETTING>
-</SETTINGLIST>
-<FILELIST></FILELIST>
-<LINKORDER></LINKORDER>
-<SUBTARGETLIST><SUBTARGET><TARGETNAME>WINSCW UDEB</TARGETNAME></SUBTARGET>
-<SUBTARGET><TARGETNAME>WINSCW UREL</TARGETNAME></SUBTARGET>
-</SUBTARGETLIST></TARGET></TARGETLIST>
-
-    <TARGETORDER>
-<ORDEREDTARGET><NAME>WINSCW UDEB</NAME></ORDEREDTARGET>
-<ORDEREDTARGET><NAME>WINSCW UREL</NAME></ORDEREDTARGET>
-<ORDEREDTARGET><NAME>Build All</NAME></ORDEREDTARGET>
-</TARGETORDER>
-
-    <GROUPLIST><FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DiagHeadsetCableTestPlugin.mmp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<GROUP><NAME>Source</NAME>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DiagHeadsetPluginImplementationTable.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DiagHeadsetCablePlugin.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DiagHeadsetCableEngine.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DevDiagHeadsetCableTestPlugin_UID_.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-</GROUP>
-<GROUP><NAME>Headers</NAME>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DiagHeadsetCableEngine.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DiagHeadsetCablePlugin.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DiagHeadsetCableTestCallBackInterface.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DiagHeadsetCableTestPlugin.hrh</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-</GROUP>
-<GROUP><NAME>Resources</NAME>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DevDiagHeadsetCableTestPluginWINSCW.resources</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-</GROUP>
-<GROUP><NAME>Link</NAME>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DevDiagHeadsetCableTestPluginWINSCWUDEB.cwlink</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UREL</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DevDiagHeadsetCableTestPluginWINSCWUREL.cwlink</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-</GROUP>
-<GROUP><NAME>Libraries</NAME>
-<GROUP><NAME>WINSCW</NAME>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>EDLL.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>euser.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>avkon.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>CommonEngine.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DiagFramework.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>eikcoctl.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>eikdlg.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DiagPluginBase.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>HeadsetStatus.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>flogger.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UREL</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>EDLL.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-</GROUP>
-</GROUP>
-</GROUPLIST>
-
-</PROJECT>
--- a/devicediagnostics/diagplugins/diagheadsetcableplugin/inc/diagheadsetcableengine.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,157 +0,0 @@
-/*
-* 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:  This is the header for the Diag Headset Cable Test Engine
-*
-*/
-
-
-#ifndef DIAGHEADSETCABLETESTENGINE_H 
-#define DIAGHEADSETCABLETESTENGINE_H
-
-// INCLUDES
-#include <DiagResultsDatabaseItem.h>                    // CDiagResultsDatabaseItem
-#include "diagheadsetcabletestcallbackinterface.h"      // MDiagHeadsetTestCallBackInterface
-
-
-//CONSTANTS
-
-// MACROS
-
-// DATA TYPES
-
-// FUNCTION PROTOTYPES
-
-// FORWARD DECLARATIONS
-class CDiagPluginWaitingDialogWrapper;
-
-// CLASS DEFINITION    
-class CDiagHeadsetCableTestEngine : public CActive
-    {
-public: //constructor and destructor
-    /**
-    * Symbian OS two phase constructor
-    */
-    static CDiagHeadsetCableTestEngine* NewL(MDiagHeadsetTestCallBackInterface& aInterface,
-                                            TBool aIsSinglePluginExecution);
-    
-    /**
-    * Virtual
-    */
-    ~CDiagHeadsetCableTestEngine();
-    
-public: // external interfaces
-    
-    /**
-    * The plug-in class starts the Headset cable test through this function
-    */
-    void RunHeadsetCableTestL();
-
-private: // private constructor
-    
-    /**
-    * C++ constructor
-    **/
-    CDiagHeadsetCableTestEngine(MDiagHeadsetTestCallBackInterface& aInterface,
-                                TBool aIsSinglePluginExecution);
-    
-    /**
-    * Symbian second phase constructor
-    */
-    void ConstructL();
-
-private: // internal functions
-    
-    /**
-    * This is an internal function to end test execution and report result
-    * to the plug-in class
-    */
-    void ReportResultToPluginL(CDiagResultsDatabaseItem::TResult aResult);
-    
-    
-    /**
-    * This function is used to detect the Headset cable status
-    * @return ETrue : The Headset cable is detected, EFalse otherwise
-    */
-    TBool CheckIfHeadsetDetectedL();
-
-
-    /**
-    *   Ask user to connect charger and press OK
-    *   @param aUserResponse - Dialog response will be returned via this parameter.
-    *   @return ETrue - If dialog was dismissed by end user.
-    *       EFalse - If dialog was deleted.
-    */
-    TBool ConnectAndPressOkL( TInt& aUserResponse ); 
-
-    /**
-    * Ask user to remove all cables and press OK    
-    *   @param aUserResponse - Dialog response will be returned via this parameter.
-    *   @return ETrue  - If dialog was dismissed by end user.
-    *           EFalse - If dialog was deleted.
-    */
-    TBool RemoveAllCablesL( TInt& aUserResponse ); 
-    /**
-    * Display "No cable detected. Try again?" prompt
-    *   @param aUserResponse - Dialog response will be returned via this parameter.
-    *   @return ETrue - If dialog was dismissed by end user.
-    *       EFalse - If dialog was deleted.
-    */
-    TBool AskIfRetryL( TInt& aUserResponse );
-
-    /**
-    *   Displays a query dialog with header.
-    *   @param aDialogResourceId - Resource ID of the dialog to display
-    *   @param aQueryResourceId - Resource ID of the text query.
-    *   @param aUserResponse - Dialog response will be returned via this parameter.
-    *   @return ETrue - If dialog was dismissed by end user.
-    *       EFalse - If dialog was deleted.
-    */
-    TBool CDiagHeadsetCableTestEngine::DisplayQueryDialogWithHeaderL( 
-            TInt aDialogResourceId,
-            TInt& aUserResponse );                               
-    
-protected:    // from CActive
-        /**
-        * Handle active object completion event, used to handle internal trigger in our plug-in
-        */
-        void RunL();
-    
-        /**
-        * Handle cancel
-        */
-        void DoCancel();
-        
-private: // private data
-
-    /**
-    * A reference to the callback interface between the plug-in class and the engine class.
-    */
-    MDiagHeadsetTestCallBackInterface& iInterface;
-    
-    /**
-    * Wrapper to display waiting dialog. This helps to identify if the dialog
-    * was dismissed by end-user or by object deletion.
-    * Ownership: This class.
-    */
-    CDiagPluginWaitingDialogWrapper* iWaitingDialogWrapper;
-    
-    /**
-    *   This flag indicates if the plugin is run in single test execution mode.
-    */
-    TBool iIsSinglePluginExecution;
-    };
-
-#endif //DIAGHEADSETCABLETESTENGINE_H
-
-// End of File
--- a/devicediagnostics/diagplugins/diagheadsetcableplugin/inc/diagheadsetcableplugin.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,155 +0,0 @@
-/*
-* 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:  This is the header for the Diag Headset Cable Test Plug-in
-*
-*/
-
-
-#ifndef DIAGHEADSETCABLETESTPLUGIN_H 
-#define DIAGHEADSETCABLETESTPLUGIN_H
-
-// INCLUDES
-#include <DiagResultsDatabaseItem.h>
-#include <DiagTestPluginBase.h>     // CDiagTestPluginBase
-#include "diagheadsetcabletestcallbackinterface.h"
-#include "diagheadsetcableengine.h"
-
-//CONSTANTS
-
-
-// MACROS
-
-// DATA TYPES
-
-// FUNCTION PROTOTYPES
-
-// FORWARD DECLARATIONS
-
-class CDiagResultsDbItemBuilder;
-class CDiagHeadsetCableTestEngine;
-
-// CLASS DEFINITION
-class CDiagHeadsetCableTestPlugin : public CDiagTestPluginBase, 
-                                    public MDiagHeadsetTestCallBackInterface
-    {
-public: // Constructors and destructor
-
-    /**
-    * Symbian OS two-phased constructor
-    * @return DataNetwork Test Plugin
-    */
-    static MDiagPlugin* NewL( TAny* aInitParams );
-
-    /**
-    * Destructor
-    */
-    ~CDiagHeadsetCableTestPlugin();
-        
-        
-private: // from MDiagHeadsetTestCallBackInterface        
-
-    /**
-    *  The Headset Cable Test PDP Engine calls this function to provide the result of the test
-    */
-    void ReportTestResultL(CDiagResultsDatabaseItem::TResult aResult); 
-    
-    /**
-    * The engine class uses this callback on the plugin class to ask the user if the entire test
-    * execution needs to be cancelled.
-    * @param aUserResponse : The user response is returned in this reference argument.
-    *      
-    * @return ETrue     : The dialog was dismissed by the user.
-    *         EFalse    : The dialog was dismissed internally.
-    */    
-    TBool AskCancelExecutionL(TInt& aUserResponse);     
-
-public: // From CDiagTestPluginBase
-
-    /**
-    * @see CDiagTestPluginBase::Visible()
-    */
-    TBool IsVisible() const;
-
-    /**
-    * @see CDiagTestPluginBase::RunMode()
-    */
-    TRunMode RunMode() const;
-
-    /**
-    * @see CDiagTestPluginBase::TotalSteps()
-    */
-    TUint TotalSteps() const;
-
-    /**
-    * @see CDiagTestPluginBase::GetPluginNameL
-    */
-    HBufC* GetPluginNameL( TNameLayoutType aLayoutType ) const;
-
-    /**
-    * @see CDiagTestPluginBase::Uid
-    */
-    TUid Uid() const;
-    
-    
-    // ADO & Platformization Changes
-    TBool ShowMessageQueryL( TInt aResourceId, TInt &aButtonId  );
-        
-
-
-
-protected: // from CDiagTestPluginBase
-
-    /**
-    * C++ default constructor.
-    */
-    CDiagHeadsetCableTestPlugin( CDiagPluginConstructionParam* aInitParams  );
-
-    /**
-    * Symbian OS default constructor.
-    *
-    */
-    void ConstructL();
-
-    /**
-    * Handle plug-in execution.
-    *   @see CDiagTestPluginBase::DoRunTestL
-    */
-    void DoRunTestL();
-
-    /**
-    * Handle clean up.
-    *   @see CDiagTestPluginBase::DoStopAndCleanupL
-    */
-    void DoStopAndCleanupL();
-
-                        
-protected:    // from CActive
-    /**
-    * Handle active object completion event
-    */
-    void RunL();
-
-    /**
-    * Handle cancel
-    */
-    void DoCancel();
-
-    
-private:    // data
-    CDiagHeadsetCableTestEngine *iEngine;
-    };
-
-#endif //DIAGHEADSETCABLETESTPLUGIN_H
-
-// End of File
--- a/devicediagnostics/diagplugins/diagheadsetcableplugin/inc/diagheadsetcabletestcallbackinterface.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-/*
-* 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:  This class is an abstract interface used by the Headset cable test
-*                engine class (CDiagHeadsetCableTestEngine) to report result to the 
-*                plug-in class (CDiagHeadsetCableTestPlugin)    
-*
-*/
-
-
-#ifndef DIAGHEADSETCALLBACKINTERFACE_H
-#define DIAGHEADSETCALLBACKINTERFACE_H
-
-// INCLUDES
-#include <DiagResultsDatabaseItem.h>
-
-// CLASS DECLARATION
-
-/**
-* MDiagHeadsetTestCallBackInterface
-*
-* This is an abstract interface class used by the Headset cable test
-* engine class (CDiagHeadsetCableTestEngine) to report result of the test
-* to the plug-in class (CDiagHeadsetCableTestPlugin).
-*/
-class MDiagHeadsetTestCallBackInterface
-    {
-public:
-    /**
-    * This is a callback from the engine class to report the result of the test
-    * to the plug-in class
-    */
-    virtual void ReportTestResultL(CDiagResultsDatabaseItem::TResult aResult) = 0;
-    
-    /**
-    * The engine class uses this callback on the plugin class to ask the user if the entire test
-    * execution needs to be cancelled.
-    * @param aUserResponse : The user response is returned in this reference argument.
-    *      
-    * @return ETrue     : The dialog was dismissed by the user.
-    *         EFalse    : The dialog was dismissed internally.
-    */    
-    virtual TBool AskCancelExecutionL(TInt& aUserResponse) = 0;    
-    };
-
-#endif // DIAGHEADSETCALLBACKINTERFACE_H
--- a/devicediagnostics/diagplugins/diagheadsetcableplugin/inc/diagheadsetcabletestplugin.hrh	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-/*
-* 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:  Contains common definitions for menu ids
-*
-*/
-
-
-#ifndef DIAGHEADSETCABLETESTPLUGIN_HRH
-#define DIAGHEADSETCABLETESTPLUGIN_HRH
-
-// Uids
-#define _UID3                   0x2000E592
-#define _IMPLEMENTATION_UID     0x2000E593
-
-
-// Commands
-enum TMyMenuCmdIDs
-   {
-    EHeadsetTestConnectHeadsetSkip = 1, // do not start from 0
-    EHeadsetTestConnectHeadsetCancel,
-    EHeadsetTestConnectHeadsetBack,
-    EHeadsetTestConnectHeadsetNo,
-    EHeadsetTestConnectHeadsetYes
-   };
-
-#endif //  DIAGHEADSETCABLETESTPLUGIN_HRH
-
-//End of File
--- a/devicediagnostics/diagplugins/diagheadsetcableplugin/loc/diagheadsetcabletestplugin.loc	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,92 +0,0 @@
-/*
-* 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:  Localization strings for DiagHeadsetCableTestPlugin.
-*
-*/
-
-
-//  LOCALISATION STRINGS
-
-// d:Plug-in name in the header of the dialog that is shown when starting test
-// d:execution.
-// l:heading_pane_t1
-// r:3.2.1
-//
-#define qtn_diag_msg_title_headset "Headset test"
-
-
-// d:The body text of the dialog that is shown when starting test execution.
-// d:This provides information about running the plug-in to the user.
-// l:popup_info_list_pane_t1
-// r:3.2.1
-//
-#define qtn_diag_msg_info_headset "The following test will check headset."
-
-
-// d:The title pane shown when Headset cable test is running
-// l:title_pane_t2/opt12
-// r:3.2.1
-//
-//#define qtn_diag_title_test_headset  "Headset test" // LVT Test
-
-
-
-// d:Plugin name in the plugin view listbox.
-// l:list_single_graphic_pane_t1
-// r:3.2.1
-//
-//#define qtn_diag_lst_test_headset  "Headset test" // LVT Test
-
-
-// d:Plugin name in the results view listbox.
-// l:list_single_graphic_heading_pane_t1_cp2
-// r:3.2.1
-//
-#define qtn_diag_lst_headset  "Headset test"
-
-
-//d:Text of the query dialog to prompt user to connect Headset Cable and press OK
-//l:popup_note_window
-//r: 3.2
-//
-#define qtn_diag_conf_headset_connect  "Connect Headset."
-
-
-//d:Title of the query dialog when Headset cable is not detected
-//l:heading_pane_t1
-//r: 3.2
-//
-#define qtn_diag_err_title_no_headset  "Headset not detected"
-            
-
-//d:Text of the query dialog when Headset cable is not detected
-//l:popup_info_list_pane_t1
-//r: 3.2
-//
-
-#define qtn_diag_err_no_headset  "Do you want to repeat the headset test?"
-
-//d:Failed result text
-//l:popup_info_list_pane_t1
-//r:5.0
-//
-#define qtn_diag_conf_test_failed_headset_cable "Headset test"
-
-
-#define qtn_diag_softk_skip "Skip"
-
-
-// End of File
-
-
--- a/devicediagnostics/diagplugins/diagheadsetcableplugin/rom_files/devdiagheadsetcableplugin.iby	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-/*
-* 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:  Image description file for project Headset cable test plug-in
-*
-*/
-
-
-
-#ifndef DEVDIAGHEADSETCABLEPLUGIN_IBY
-#define DEVDIAGHEADSETCABLEPLUGIN_IBY
-
-#ifdef FF_DEVICE_DIAGNOSTICS_APP 
-
-#include <data_caging_paths_for_iby.hrh>
-
-ECOM_PLUGIN( devdiagheadsetcabletestplugin.dll, devdiagheadsetcabletestplugin.rsc )
-
-#endif
-
-#endif // DEVDIAGHEADSETCABLEPLUGIN_IBY
\ No newline at end of file
--- a/devicediagnostics/diagplugins/diagheadsetcableplugin/rom_files/devdiagheadsetcableplugin_resources.iby	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-/*
-* 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:  Image description file for resources of project Headset cable test plug-in
-*
-*/
-
-
-
-#ifndef DEVDIAGHEADSETCABLEPLUGIN_RESOURCES_IBY
-#define DEVDIAGHEADSETCABLEPLUGIN_RESOURCES_IBY
-
-#ifdef FF_DEVICE_DIAGNOSTICS_APP 
-
-#include <data_caging_paths_for_iby.hrh>
-
-data=\epoc32\data\Z\resource\devdiagheadsetcabletestpluginrsc.rsc          resource\devdiagheadsetcabletestpluginrsc.rsc
-
-#endif
-
-#endif // DEVDIAGHEADSETCABLEPLUGIN_RESOURCES_IBY
\ No newline at end of file
--- a/devicediagnostics/diagplugins/diagheadsetcableplugin/src/diagheadsetcableengine.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,416 +0,0 @@
-/*
-* 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:  This is the class module for the Diag Headset Cable Test Engine
-*
-*/
-
-
-// INCLUDE FILES
-
-// Class Declaration
-#include "diagheadsetcableengine.h"
-
-#include <StringLoader.h>                           // StringLoader
-#include <HeadsetStatus.h>                          // CHeadsetStatus
-#include <aknmessagequerydialog.h>                  // CAknMessageQueryDialog
-#include <DiagFrameworkDebug.h>                     // debug macros
-#include <devdiagheadsetcabletestpluginrsc.rsg>        // resources
-#include <DiagPluginWaitingDialogWrapper.h>         // CDiagPluginWaitingDialogWrapper
-
-#include "diagheadsetcabletestplugin.hrh"           // command ids
-
-// EXTERNAL DATA STRUCTURES
-
-// EXTERNAL FUNCTION PROTOTYPES
-
-// CONSTANTS
-
-// MACROS
-
-// LOCAL CONSTANTS AND MACROS
-
-// MODULE DATA STRUCTURES
-
-// LOCAL FUNCTION PROTOTYPES
-
-// FORWARD DECLARATIONS
-
-// ============================= LOCAL FUNCTIONS ==============================
-
-// ========================= MEMBER FUNCTIONS ================================
-   
-// ---------------------------------------------------------------------------
-// Symbian OS default constructor
-// ---------------------------------------------------------------------------
-//
-CDiagHeadsetCableTestEngine* CDiagHeadsetCableTestEngine::NewL(
-                            MDiagHeadsetTestCallBackInterface& aInterface,
-                            TBool aIsSinglePluginExecution)
-    {
-    LOGSTRING( "CDiagHeadsetCableTestEngine instance created" )
-    CDiagHeadsetCableTestEngine* self = new (ELeave)
-            CDiagHeadsetCableTestEngine(aInterface, aIsSinglePluginExecution);
-    
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );
-    return self;    
-    }
-    
-    
-// ----------------------------------------------------------------------------
-// Constructor
-// ----------------------------------------------------------------------------
-//
-CDiagHeadsetCableTestEngine::CDiagHeadsetCableTestEngine(
-                            MDiagHeadsetTestCallBackInterface& aInterface,
-                            TBool aIsSinglePluginExecution)
-    :   CActive( EPriorityStandard ),
-        iInterface(aInterface),
-        iWaitingDialogWrapper( NULL ),
-        iIsSinglePluginExecution(aIsSinglePluginExecution)
-    {
-    CActiveScheduler::Add( this );
-    }
-    
-// ----------------------------------------------------------------------------
-// Destructor
-// ----------------------------------------------------------------------------
-//
-CDiagHeadsetCableTestEngine::~CDiagHeadsetCableTestEngine()
-    {
-    LOGSTRING( "CDiagHeadsetCableTestEngine instance destroyed" )
-    Cancel();
-    
-    delete iWaitingDialogWrapper; //  deleting will dismiss active dialog
-    iWaitingDialogWrapper = NULL;
-    }
-    
-// ---------------------------------------------------------------------------
-// Symbian OS second phase constructor
-// ---------------------------------------------------------------------------    
-void CDiagHeadsetCableTestEngine::ConstructL()
-    {
-    // nothting needed here
-    }
-
-// ----------------------------------------------------------------------------
-// This function starts the Headset cable test
-// ----------------------------------------------------------------------------
-void CDiagHeadsetCableTestEngine::RunHeadsetCableTestL()
-    {
-    TInt userResponse;
-    if ( !ConnectAndPressOkL( userResponse ) )
-        {
-        // "Connect Headset and Press OK" dialog was dismisses internally by framework
-        // return immediately
-        LOGSTRING( "CDiagHeadsetCableTestEngine : Connect Headset and press ok dialog dismissed internally" )
-        return;
-        }
-
-    switch( userResponse )
-        {
-            // User select OK for "Connect Headset and Press OK" dialog
-            case EAknSoftkeyOk:
-                {
-                //TInt keySelect;
-                // check if headset cable is connected
-                if( CheckIfHeadsetDetectedL() )
-                    {
-                    // Headset cable is detected.
-                    LOGSTRING( "CDiagHeadsetCableTestEngine : Headset detected" )
-                //    if ( !RemoveAllCablesL( keySelect ) )
-                //        {
-                //        LOGSTRING( "CDiagHeadsetCableTestEngine : Remove All Cable dialog was dismissed internally pressed" )
-                //        return;
-                //        }
-
-                //    if ( keySelect != EAknSoftkeyOk )
-                //        {
-                //        LOGSTRING( "CDiagHeadsetCableTestEngine : EndKey has pressed" )
-                //        return;	
-                //        }  
-                    LOGSTRING( "CDiagHeadsetCableTestEngine : Report result Success" )    
-                    ReportResultToPluginL(CDiagResultsDatabaseItem::ESuccess);
-                    }
-                else
-                    { 
-                    // Headset cable is not detected
-                    if ( !AskIfRetryL( userResponse ) )
-                        {
-                        // Retry Back dialog was dismissed internally by framework internally
-                        LOGSTRING( "CDiagHeadsetCableTestEngine : Ask for retry dialog dismissed internally" )
-                        return;
-                        }
-
-                    //if( userResponse == EAknSoftkeyOk )  // ADO & Platformization Changes
-                    if( userResponse == EHeadsetTestConnectHeadsetNo )
-                        {
-                        // User selects Ok to confirm, Test fails
-                        ReportResultToPluginL(CDiagResultsDatabaseItem::EFailed);
-                        }
-                   // else if( userResponse == EHeadsetTestConnectHeadsetBack ) // ADO & Platformization Changes
-                   	  else if( userResponse == EHeadsetTestConnectHeadsetYes )
-                        {
-                        // User selectes Back to retry the test
-                        TRequestStatus* status = &iStatus;
-                        SetActive();
-                        User::RequestComplete( status, KErrNone );
-                        }
-                    else
-                        {
-                        // User cancels the test using Canceld end key, return immediately
-                        return;
-                        }
-                    }
-                }
-                break;
-            // User select CANCEL softkey for "Connect Headset and Press OK" dialog
-            case EHeadsetTestConnectHeadsetSkip:
-            case EHeadsetTestConnectHeadsetCancel:
-                {
-                    if(!iIsSinglePluginExecution)
-                        {
-                         if( iInterface.AskCancelExecutionL(userResponse) )
-                                {
-                                switch(userResponse)
-                                    {
-                                        case EAknSoftkeyOk:
-                                            {
-                                            //CompleteTestL( CDiagResultsDatabaseItem::ECancelled );
-                                            LOGSTRING( "CDiagHeadsetCableTestEngine User cancelled the test" )
-                                            return;
-                                            }
-                                            
-                                        default:
-                                            {
-                                            // currently no way distinguish between Cancel and No key
-                                            
-                                            // user selected "No" to cancel
-                                            // do a self-trigger to start again
-                                            TRequestStatus* status = &iStatus;
-                                            SetActive();
-                                            User::RequestComplete( status, KErrNone );
-                                            
-                                            // this trigger for Cancel key is cancelled by CActive::Cancel() in destructor
-                                            }
-                                            break;
-                                    }
-                                }
-                            else
-                                {
-                                // though cancel dialog should not be dismissed internally by the framework
-                                // this is just a safeguard to make sure we dont do anything
-                                LOGSTRING( "CDiagHeadsetCableTestEngine Cancel dialog was dismissed internally" )
-                                return;
-                                }
-                        }
-                    else
-                        {
-                            ReportResultToPluginL( CDiagResultsDatabaseItem::ESkipped );
-                            return;
-                        }
-                }
-                break;
-            
-            // User select CANCEL (RED End KEY) for "Connect Headset and Press OK" dialog
-            default:
-                {
-                LOGSTRING( "CDiagHeadsetCableTestEngine Connect Headset and press OK dialog was cancelled by end key." )
-                }
-                break;
-        };
-
-    }
-    
-// ----------------------------------------------------------------------------
-// CDiagHeadsetCableTestEngine::CheckIfHeadsetDetectedL
-//
-// This function reports the result to plugin
-// ----------------------------------------------------------------------------
-TBool CDiagHeadsetCableTestEngine::CheckIfHeadsetDetectedL()
-    {
-    TBool retval = EFalse;
-    TBool isConnected = EFalse;
-    CHeadsetStatus* aHeadsetStatus = CHeadsetStatus::NewL();
-
-    CleanupStack::PushL( aHeadsetStatus );
-    TInt err( aHeadsetStatus->HeadsetConnectedL( isConnected ) ); 
-    CleanupStack::PopAndDestroy( aHeadsetStatus );
-    
-    if(err == KErrNone)
-        {        
-        if( isConnected )
-            {
-            LOGSTRING( "CDiagHeadsetCableTestEngine Headset cable is connected" )
-            retval = ETrue; // headset is connected
-            }
-        else
-            {
-            LOGSTRING( "CDiagHeadsetCableTestEngine Headset cable is not connected" )
-            retval = EFalse; // headset is not connected
-            }
-        }
-    else
-        {
-        LOGSTRING( "CDiagHeadsetCableTestEngine some error occurred in detecting Headset cable" )
-        retval = EFalse; // some error occurred
-        }    
-    
-    return retval;            
-    }   
-    
-    
-
-// ----------------------------------------------------------------------------
-// CDiagHeadsetCableTestEngine::ReportResultToPluginL
-//
-// This function reports the result to plugin
-// ----------------------------------------------------------------------------       
-void CDiagHeadsetCableTestEngine::ReportResultToPluginL(CDiagResultsDatabaseItem::TResult aResult)
-    {
-    iInterface.ReportTestResultL( aResult );
-    }
-    
-// ---------------------------------------------------------------------------------------
-// CDiagHeadsetCableTestEngine::ConnectAndPressOkL
-// This function shows the query dialog "Connect your Headset charger. Press OK when ready."
-// ---------------------------------------------------------------------------------------    
-TBool CDiagHeadsetCableTestEngine::ConnectAndPressOkL( TInt& aUserResponse )
-    {
-    ASSERT( iWaitingDialogWrapper == NULL );
-
-    CAknQueryDialog* dialog = CAknQueryDialog::NewL( CAknQueryDialog::ENoTone );
-    CleanupStack::PushL( dialog );
-    dialog->PrepareLC( R_DIAG_HEADSET_CABLE_TEST_CONNECT_AND_PRESS_OK );
-    if( iIsSinglePluginExecution )
-        {
-        CEikButtonGroupContainer& cba = dialog->ButtonGroupContainer();
-        cba.SetCommandSetL( R_CBA_CONNECT_AND_PRESS_OK_SINGLE_EXECUTION );        
-        }    
-    CleanupStack::Pop( dialog );
-
-    // dialog ownership to bepassed to iWaitingDialogWrapper
-    // CDiagPluginWaitingDialogWrapper::NewL will push dialog into clean up stack
-    iWaitingDialogWrapper = CDiagPluginWaitingDialogWrapper::NewL( dialog );
-    dialog = NULL;
-
-    TBool isDialogDismissedByUser = iWaitingDialogWrapper->RunLD( aUserResponse );
-    if ( isDialogDismissedByUser )
-        {
-        // local variable can be accessed only if it was returned due to
-        // user response. iWaitingDialogWrapper self destructs.
-        iWaitingDialogWrapper = NULL;
-        }
-
-    return isDialogDismissedByUser;    
-    }
-
-// ---------------------------------------------------------------------------------------
-// CDiagHeadsetCableTestEngine::RemoveAllCables
-// This function shows the query dialog : Please remove all cables
-// --------------------------------------------------------------------------------------- 
-TBool CDiagHeadsetCableTestEngine::RemoveAllCablesL( TInt& aUserResponse )
-    {
-    ASSERT( iWaitingDialogWrapper == NULL );
-
-    CAknQueryDialog* dialog = CAknQueryDialog::NewL( CAknQueryDialog::ENoTone );
-
-    dialog->PrepareLC( R_DIAG_CABLE_TEST_REMOVE_ALL_CABLES );                 
-
-    // dialog ownership to bepassed to iWaitingDialogWrapper
-    // CDiagPluginWaitingDialogWrapper::NewL will push dialog into clean up stack
-    iWaitingDialogWrapper = CDiagPluginWaitingDialogWrapper::NewL( dialog );
-    dialog = NULL;
-
-    TBool isDialogDismissedByUser = iWaitingDialogWrapper->RunLD( aUserResponse );
-    if ( isDialogDismissedByUser )
-        {
-        // local variable can be accessed only if it was returned due to
-        // user response. iWaitingDialogWrapper self destructs.
-        iWaitingDialogWrapper = NULL;
-        }
-
-    return isDialogDismissedByUser;
-    }     
-    
-// ----------------------------------------------------------------------------
-// CDiagHeadsetCableTestEngine::AskIfRetryL
-// This function shows the query dialog "No cable detected. Press OK to continue 
-// tests or press Back to retry this test." 
-// ----------------------------------------------------------------------------
-TBool CDiagHeadsetCableTestEngine::AskIfRetryL( TInt& aUserResponse )
-    {
-    return DisplayQueryDialogWithHeaderL( R_DIAG_HEADSET_CABLE_TEST_NO_CABLE_DETECTED,
-                                aUserResponse );
-    }   
-    
-// ---------------------------------------------------------------------------------------
-// CDiagHeadsetCableTestEngine::DisplayQueryDialogWithHeaderL
-// This function shows the query dialog with header. It returns ETrue, 
-// if the dialog is dismissed by user. If the dialog was dismissed because of time-out, 
-// it returns EFalse. The user response (softkey) is returned in the reference 
-// argument aUserResponse
-// --------------------------------------------------------------------------------------- 
-TBool CDiagHeadsetCableTestEngine::DisplayQueryDialogWithHeaderL( 
-        TInt aDialogResourceId,
-        TInt& aUserResponse )
-    {
-    ASSERT( iWaitingDialogWrapper == NULL );
-
-    CAknMessageQueryDialog * dialog = new ( ELeave ) 
-                        CAknMessageQueryDialog ( CAknQueryDialog::ENoTone );
-    CleanupStack::PushL( dialog );
-    dialog->PrepareLC( aDialogResourceId );
-    CleanupStack::Pop( dialog );
-
-    // dialog ownership to bepassed to iWaitingDialogWrapper
-    // CDiagPluginWaitingDialogWrapper::NewL will push dialog into clean up stack
-    iWaitingDialogWrapper = CDiagPluginWaitingDialogWrapper::NewL( dialog );
-    dialog = NULL;
-
-    TBool isDialogDismissedByUser = iWaitingDialogWrapper->RunLD( aUserResponse );
-    if ( isDialogDismissedByUser )
-        {
-        // local variable can be accessed only if it was returned due to
-        // user response. iWaitingDialogWrapper self destructs.
-        iWaitingDialogWrapper = NULL;
-        }
-
-    return isDialogDismissedByUser;
-    }    
-
-
-// ---------------------------------------------------------------------------------------
-// CDiagHeadsetCableTestEngine::RunL
-// RunL() function is used in this plug-in to handle internal trigger
-// ---------------------------------------------------------------------------------------    
-void CDiagHeadsetCableTestEngine::RunL()
-    {
-    if(iStatus == KErrNone)
-        {
-        RunHeadsetCableTestL();
-        }
-    }
-
-// ---------------------------------------------------------------------------------------
-// CDiagHeadsetCableTestEngine::DoCancel
-// Handles cancel request
-// ---------------------------------------------------------------------------------------    
-void CDiagHeadsetCableTestEngine::DoCancel()
-    {
-    // no implementation needed
-    }
-    
-// End of File
--- a/devicediagnostics/diagplugins/diagheadsetcableplugin/src/diagheadsetcableplugin.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,322 +0,0 @@
-/*
-* 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:  This is the class module for the Diag Headset Cable Test plugin
-*
-*/
-
-
-// INCLUDE FILES
-
-// Class Declaration
-#include "diagheadsetcableplugin.h"
-
-// System includes
-#include <StringLoader.h>                           // StringLoader
-#include <avkon.hrh>                                // command ids
-#include <DiagFrameworkDebug.h>                     // debug macros
-#include <DiagTestExecParam.h>                      // TDiagTestExecParam
-#include <DiagEngineCommon.h>                       // MDiagEngineCommon
-#include <devdiagheadsetcabletestpluginrsc.rsg>        // resources
-
-// User includes
-#include "diagheadsetcabletestplugin.hrh"           // UIDs
-#include "diagheadsetcableengine.h"                 // CDiagHeadsetCableTestEngine
-
-
-#include <AknDialog.h> // ADO & Platformization Changes
-#include <aknmessagequerydialog.h>  // ADO & Platformization Changes
-#include <DiagCommonDialog.h>          // for EDiagCommonDialogConfirmCancelAll
-
-// EXTERNAL DATA STRUCTURES
-
-// EXTERNAL FUNCTION PROTOTYPES
-
-// CONSTANTS
-const TUint KTotalNumOfSteps = 2;
-const TUid KDiagHeadsetCableTestPluginUid = { _IMPLEMENTATION_UID };
-_LIT( KDiagHeadsetCableTestPluginResourceFileName, "z:DevDiagHeadsetCableTestPluginRsc.rsc" );
-
-
-// MACROS
-
-// LOCAL CONSTANTS AND MACROS
-
-// MODULE DATA STRUCTURES
-
-// LOCAL FUNCTION PROTOTYPES
-
-// FORWARD DECLARATIONS
-
-// ============================= LOCAL FUNCTIONS ==============================
-
-// ========================= MEMBER FUNCTIONS ================================
-
-// ----------------------------------------------------------------------------
-// Constructor
-// ----------------------------------------------------------------------------
-//
-CDiagHeadsetCableTestPlugin::CDiagHeadsetCableTestPlugin( 
-    CDiagPluginConstructionParam* aParam )
-    :   CDiagTestPluginBase( aParam )
-    {
-    LOGSTRING( "CDiagHeadsetCableTestPlugin instance created" )
-    }
-
-
-// ---------------------------------------------------------------------------
-// Static two-phase constructor.
-// ---------------------------------------------------------------------------
-MDiagPlugin* CDiagHeadsetCableTestPlugin::NewL( TAny* aInitParams )
-    {
-    LOGSTRING( "CDiagHeadsetCableTestPlugin::NewL() " )
-    ASSERT( aInitParams );
-
-    CDiagPluginConstructionParam* param = 
-            static_cast<CDiagPluginConstructionParam*>(aInitParams);    
-
-    CleanupStack::PushL( param );
-    CDiagHeadsetCableTestPlugin* self = new( ELeave ) CDiagHeadsetCableTestPlugin (param);
-    CleanupStack::Pop( param );
-
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop(self);
-
-    return self;
-    }
-
-// ---------------------------------------------------------------------------
-// The second phase constructor.
-// ---------------------------------------------------------------------------
-void CDiagHeadsetCableTestPlugin::ConstructL()
-    {
-    LOGSTRING( "CDiagHeadsetCableTestPlugin::ConstructL() " )
-    BaseConstructL ( KDiagHeadsetCableTestPluginResourceFileName );
-    }
-
-// ----------------------------------------------------------------------------
-// Destructor
-// ----------------------------------------------------------------------------
-CDiagHeadsetCableTestPlugin::~CDiagHeadsetCableTestPlugin()
-    {
-    LOGSTRING( "CDiagHeadsetCableTestPlugin::~CDiagHeadsetCableTestPlugin()" )
-    // StopAndCleanupL() called by base class, whcih calls
-    //  Cancel()    -> DoCancel()
-    //  DoStopAndCleanupL()
-    // Not much to do here.
-    }
-
-// ---------------------------------------------------------------------------
-// From MDiagPlugin
-// CDiagHeadsetCableTestPlugin::IsVisible()
-// ---------------------------------------------------------------------------
-
-TBool CDiagHeadsetCableTestPlugin::IsVisible() const
-    {
-    return ETrue;
-    }
-   
-
-// ---------------------------------------------------------------------------
-// From MDiagTestPlugin
-// CDiagHeadsetCableTestPlugin::RunMode()
-// ---------------------------------------------------------------------------
-MDiagTestPlugin::TRunMode CDiagHeadsetCableTestPlugin::RunMode() const
-    {
-    return EInteractiveDialog;
-    }
-
-// ---------------------------------------------------------------------------
-// From MDiagTestPlugin
-// CDiagHeadsetCableTestPlugin::DoStopAndCleanupL()
-// ---------------------------------------------------------------------------
-void CDiagHeadsetCableTestPlugin::DoStopAndCleanupL()
-    {
-    delete iEngine;
-    iEngine = NULL;
-    }
-
-// ---------------------------------------------------------------------------
-// From MDiagTestPlugin
-// CDiagHeadsetCableTestPlugin::TotalSteps()
-// ---------------------------------------------------------------------------
-TUint CDiagHeadsetCableTestPlugin::TotalSteps() const
-    {
-    return KTotalNumOfSteps;
-    }
-
-// ---------------------------------------------------------------------------
-// From MDiagPlugin
-// CDiagHeadsetCableTestPlugin::GetPluginNameL
-// ---------------------------------------------------------------------------
-HBufC* CDiagHeadsetCableTestPlugin::GetPluginNameL( TNameLayoutType aLayoutType ) const
-    {
-    switch ( aLayoutType )
-        {
-        case ENameLayoutHeadingPane:
-            return StringLoader::LoadL( R_DIAG_HEADSET_CABLE_TEST_HEADING_PANE ); 
-            
-        case ENameLayoutPopupInfoPane:
-            return StringLoader::LoadL( R_DIAG_HEADSET_CABLE_TEST_INFO_PANE );
-            
-        case ENameLayoutTitlePane:
-            return StringLoader::LoadL( R_DIAG_HEADSET_CABLE_TEST_TITLE_PANE );                               
-        
-        case ENameLayoutListSingleGraphic:
-            return StringLoader::LoadL( R_DIAG_HEADSET_CABLE_TEST_SINGLE_GRAPHIC  );             
-
-        case ENameLayoutListSingle:
-            return StringLoader::LoadL ( R_DIAG_HEADSET_CABLE_TEST_SINGLE ); 
-
-        default:
-            LOGSTRING2( "CDiagHeadsetCableTestPlugin::GetPluginNameL: "
-                L"ERROR: Unsupported layout type %d", aLayoutType )
-            __ASSERT_DEBUG( 0, User::Invariant() );
-            return StringLoader::LoadL ( R_DIAG_HEADSET_CABLE_TEST_SINGLE );
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// From MDiagPlugin
-// CDiagHeadsetCableTestPlugin::Uid
-// ---------------------------------------------------------------------------
-TUid CDiagHeadsetCableTestPlugin::Uid() const
-    {
-    return KDiagHeadsetCableTestPluginUid;
-    }
-
-// ---------------------------------------------------------------------------
-// From CActive
-// CDiagHeadsetCableTestPlugin::RunL
-// ---------------------------------------------------------------------------
-void CDiagHeadsetCableTestPlugin::RunL()
-    {
-    }
-
-// ---------------------------------------------------------------------------
-// From CActive
-// CDiagHeadsetCableTestPlugin::DoCancel
-// ---------------------------------------------------------------------------
-void CDiagHeadsetCableTestPlugin::DoCancel()
-    {
-    }
-
-// ---------------------------------------------------------------------------
-// From CDiagTestPluginBase
-// CDiagHeadsetCableTestPlugin::DoRunTestL()
-// ---------------------------------------------------------------------------
-void CDiagHeadsetCableTestPlugin::DoRunTestL()
-    {
-    LOGSTRING( "CDiagHeadsetCableTestPlugin::DoRunTestL() Test execution begins" )
-    ASSERT( iEngine == NULL );
-
-    // Run Battery Charger Cable Test
-    delete iEngine;
-    iEngine = NULL;
-
-    iEngine = CDiagHeadsetCableTestEngine::NewL( *this, SinglePluginExecution() );
-    // ADO & Platformization Changes
-    TInt aButtonId;
-    
-    ShowMessageQueryL(R_DIAG_MESSAGEQUERY_TITLE_HEADSET,aButtonId);
-      
-    if(aButtonId == EHeadsetTestConnectHeadsetCancel)
-    	{
-    	CompleteTestL( CDiagResultsDatabaseItem::ESkipped );
-        return;
-    	}
-    
-    if(aButtonId == EHeadsetTestConnectHeadsetSkip)
-    	{
-		TInt confirmResult = 0;
-            
-        CAknDialog* dlg = ExecutionParam().Engine().
-        CreateCommonDialogLC( EDiagCommonDialogConfirmSkipAll, NULL );
-    
-        if ( !RunWaitingDialogL( dlg, confirmResult ) )
-            {
-            return;
-            }
-        
-        if ( confirmResult)
-            {
-            return;
-            }
-    	}
-    // Changes Ends
-    iEngine->RunHeadsetCableTestL();        
-    }
-
-// ---------------------------------------------------------------------------
-// This is a callback from the engine class to report the result of the test
-// ---------------------------------------------------------------------------
-void CDiagHeadsetCableTestPlugin::ReportTestResultL(
-    CDiagResultsDatabaseItem::TResult aResult)
-    {
-    CompleteTestL( aResult );
-    }
-
-// ---------------------------------------------------------------------------
-// The engine class uses this callback on the plugin class to ask the user if 
-// the entire test execution needs to be cancelled.
-// ---------------------------------------------------------------------------
-TBool CDiagHeadsetCableTestPlugin::AskCancelExecutionL(TInt& aUserResponse)
-    {
-    CAknDialog* cancelDialog = ExecutionParam().Engine().
-             CreateCommonDialogLC( EDiagCommonDialogConfirmCancelAll, NULL );
-             
-    return RunWaitingDialogL( cancelDialog, aUserResponse );
-    }    
-    
-    // ADO & Platformization Changes
-TBool CDiagHeadsetCableTestPlugin::ShowMessageQueryL( TInt aResourceId, TInt &aButtonId  )
-    {
-    LOGSTRING( "CDiagAudioPlugin::ShowMessageQueryL IN" )
-    CAknMessageQueryDialog* dlg    = NULL;
-    TBool                   result = EFalse;
-
-    // Create CAknMessageQueryDialog instance
-    dlg = new ( ELeave ) CAknMessageQueryDialog();
-
-    dlg->PrepareLC( aResourceId );
-     
-    CEikButtonGroupContainer& cba = dlg->ButtonGroupContainer();
-
-        switch ( aResourceId )
-            {
-            case R_DIAG_MESSAGEQUERY_TITLE_HEADSET: 
-         	   {
-            	if ( SinglePluginExecution() )
-        			{
-        			cba.SetCommandSetL( R_CBA_CONNECT_AND_PRESS_OK_SINGLE_EXECUTION );		
-        			}
-        	   else 
-        	   		{	
-                	cba.SetCommandSetL( R_CBA_CONNECT_AND_PRESS_OK_GROUP_EXECUTION );		
-                	}
-        		}
-                break;
-
-            default:
-                break;
-            }
-        	
-    result = RunWaitingDialogL( dlg, aButtonId );
-
-    LOGSTRING3( "CDiagAudioPlugin::ShowMessageQueryL() OUT aButtonId=%d result=%d", aButtonId, result );
-    return result;
-    }
-
-// End of File
-
--- a/devicediagnostics/diagplugins/diagheadsetcableplugin/src/diagheadsetpluginImplementationtable.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-/*
-* 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:  ECOM proxy table for DiagHeadsetCableTestPlugin
-*
-*/
-
-
-// INCLUDES
-#include <e32std.h>
-#include <implementationproxy.h>
-
-#include "diagheadsetcabletestplugin.hrh"   // UIDs
-#include "diagheadsetcableplugin.h"         // CDiagHeadsetCableTestPlugin
-
-// CONSTANTS 
-const TImplementationProxy KDiagHeadsetCableTestPluginImplementationTable[] = 
-    {
-    IMPLEMENTATION_PROXY_ENTRY( _IMPLEMENTATION_UID, 
-                                CDiagHeadsetCableTestPlugin::NewL )
-    };
-
-
-// ---------------------------------------------------------------------------
-// ImplementationGroupProxy
-// 
-// Gate/factory function
-// ---------------------------------------------------------------------------
-//
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy(TInt& aTableCount )
-    {
-    aTableCount = sizeof( KDiagHeadsetCableTestPluginImplementationTable ) 
-        / sizeof( TImplementationProxy );
-
-    return KDiagHeadsetCableTestPluginImplementationTable;
-    }
-    
-// End of File
--- a/devicediagnostics/diagplugins/diagloudspeakerplugin/cenrep_files/cleanup.bat	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-rem
-rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-rem All rights reserved.
-rem This component and the accompanying materials are made available
-rem under the terms of "Eclipse Public License v1.0"
-rem which accompanies this distribution, and is available
-rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
-rem
-rem Initial Contributors:
-rem Nokia Corporation - initial contribution.
-rem
-rem Contributors:
-rem
-rem Description:
-rem
-
-rd /s /q output
\ No newline at end of file
--- a/devicediagnostics/diagplugins/diagloudspeakerplugin/cenrep_files/generate_ini.bat	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-rem
-rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-rem All rights reserved.
-rem This component and the accompanying materials are made available
-rem under the terms of "Eclipse Public License v1.0"
-rem which accompanies this distribution, and is available
-rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
-rem
-rem Initial Contributors:
-rem Nokia Corporation - initial contribution.
-rem
-rem Contributors:
-rem
-rem Description:
-rem
-
-@set XLS_FILE=keys_DiagSpeakerTestPlugin.xls
-@set INI_FILE=2000E58E.txt
-@set RELEASE=3.2
-
-@set CENREP_DIR=%CD%
-@cd \epoc32\tools\cenrep
-
-cenrep.pl -o "%CENREP_DIR%\output" -l "%CENREP_DIR%\%XLS_FILE%" -p %RELEASE%
-copy "%CENREP_DIR%\output\inifiles\%INI_FILE%" \epoc32\RELEASE\winscw\udeb\Z\private\10202be9\
-copy "%CENREP_DIR%\output\inifiles\%INI_FILE%" \epoc32\RELEASE\winscw\udeb\Z\private\10202be9\
-copy "%CENREP_DIR%\output\inifiles\%INI_FILE%" \epoc32\RELEASE\winscw\urel\Z\private\10202be9\
-copy "%CENREP_DIR%\output\inifiles\%INI_FILE%" \epoc32\RELEASE\armv5\udeb\Z\private\10202be9\
-copy "%CENREP_DIR%\output\inifiles\%INI_FILE%" \epoc32\RELEASE\armv5\urel\Z\private\10202be9\
-copy "%CENREP_DIR%\output\inifiles\%INI_FILE%" \epoc32\data\Z\private\10202be9\
-@cd "%CENREP_DIR%"
-
-@echo ================= done. Hit any key to continue ==================
-@pause
Binary file devicediagnostics/diagplugins/diagloudspeakerplugin/cenrep_files/keys_diagspeakertestplugin.xls has changed
Binary file devicediagnostics/diagplugins/diagloudspeakerplugin/conf/diagspeakertestplugin.confml has changed
Binary file devicediagnostics/diagplugins/diagloudspeakerplugin/conf/diagspeakertestplugin_2000E58E.crml has changed
--- a/devicediagnostics/diagplugins/diagloudspeakerplugin/data/devdiagspeakerplugin.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-/*
-* 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:  ECOM plugin resource file for Speaker Plugin
-*
-*/
-
-#include <registryinfo.rh>
-#include "diagspeakerplugin.hrh"
-
-RESOURCE REGISTRY_INFO theInfo
-    {
-    dll_uid     = 0x2000E58E;
-    interfaces  =
-        {
-        INTERFACE_INFO
-            {
-            interface_uid   = 0x2000AFEB;
-            implementations =
-                {
-                IMPLEMENTATION_INFO
-                    {
-                    implementation_uid  = DIAG_SPEAKER_PLUGIN_UID;
-                    version_no          = 1;
-                    display_name        = "Speaker Plugin";
-                    default_data        = "0x2000E569"; //HW suite";
-                    opaque_data         = "<diagplugininfo>"
-                                          "<order number=\"30\"/>"
-                                          "</diagplugininfo>";
-                    }
-                };
-            }
-        };
-    }
-
-// End of File
--- a/devicediagnostics/diagplugins/diagloudspeakerplugin/data/devdiagspeakerpluginrsc.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,539 +0,0 @@
-/*
-* 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:  Resource file for DiagSpeakerPlugin
-*
-*/
-
-
-
-//  RESOURCE IDENTIFIER
-NAME    SPEK // 4 letter ID
-
-//  INCLUDES
-#include    <eikon.rh>
-#include    "diagspeakerplugin.hrh"
-#include    <diagspeakerplugin.loc>
-#include    <diagplugincommon.loc>
-
-#include    <avkon.loc>
-#include    <avkon.mbg>
-#include    <avkon.rsg>
-#include    <avkon.rh>
-
-#include    <AvkonIcons.hrh>
-#include    <bldvariant.hrh>
-#include    <data_caging_paths_strings.hrh>
-#include    <eikcore.rsg>
-#include    <eikon.rsg>
-#include    <uikon.rh>
-
-// CONSTANTS
-
-// Camera Plugin : Bitmap File for Icons 
-#define BMPFILE_NAME    "\\resource\\apps\\avkon2.mbm"
-
-
-// ========================== RESOURCE DEFINITIONS ===========================
-// Resource Identifiers
-RESOURCE RSS_SIGNATURE { }
-RESOURCE TBUF { buf="SPEK"; }
-
-//----------------------------------------------------
-// r_diag_speaker_plugin_list_single_graphic_heading_pane
-// Speaker Plugin caption 
-//----------------------------------------------------
-//
-RESOURCE TBUF r_diag_speaker_plugin_list_single_graphic_heading_pane
-    {
-    buf = qtn_diag_lst_speakerphone;
-    }
-
-//----------------------------------------------------
-// r_diag_speaker_plugin_list_single_graphic_pane
-// Speaker Plugin caption 
-//----------------------------------------------------
-//
-RESOURCE TBUF r_diag_speaker_plugin_list_single_graphic_pane
-    {
-    buf = qtn_diag_lst_test_speakerphone;
-    }
-
-//----------------------------------------------------
-// r_diag_speaker_plugin_title_pane
-// Speaker Plugin caption 
-//----------------------------------------------------
-//
-RESOURCE TBUF r_diag_speaker_plugin_title_pane
-    {
-    buf = qtn_diag_title_test_speakerphone;
-    }
-
-//----------------------------------------------------
-// r_diag_speaker_plugin_popup_info_list_pane
-// Speaker Plugin caption 
-//----------------------------------------------------
-//
-RESOURCE TBUF r_diag_speaker_plugin_popup_info_list_pane
-    {
-    buf = qtn_diag_conf_test_failed_speakerphone;
-    }
-
-//----------------------------------------------------
-// r_diag_speaker_plugin_heading_pane
-// Speaker Plugin caption 
-//----------------------------------------------------
-//
-RESOURCE TBUF r_diag_speaker_plugin_heading_pane
-    {
-    buf = qtn_diag_msg_title_speakerphone;
-    }
-
-//----------------------------------------------------
-// r_diag_speaker_softkeys_ok_cancel
-// CBA for OK_CANCEL
-//----------------------------------------------------
-//
-RESOURCE CBA r_diag_speaker_softkeys_ok_cancel
-{
-    buttons = 
-    {
-        CBA_BUTTON 
-        { 
-            id  = EAknSoftkeyOk; // in order to Exit
-            txt = text_softkey_ok;
-        },
-        CBA_BUTTON 
-        { 
-            id  = ECBACmdCancel;       // .hrh
-            txt = text_softkey_cancel; // .rls or .loc
-        } 
-
-    };
-}
-
-
-//----------------------------------------------------
-// r_diag_speaker_softkeys_ok_cancel
-// CBA for OK_CANCEL
-//----------------------------------------------------
-//
-RESOURCE CBA r_diag_speaker_softkeys_ok_skip
-{
-    buttons = 
-    {
-        CBA_BUTTON 
-        { 
-            id  = EAknSoftkeyOk; // in order to Exit
-            txt = text_softkey_ok;
-        },
-        CBA_BUTTON
-        { 
-            id  = ECBACmdSkip;          // .hrh
-            txt = qtn_diag_softk_skip;  // .rls or .loc
-        }
-
-    };
-}
-
-
-
-//----------------------------------------------------
-// r_diag_speaker_softkeys_skip_cancel__ok
-// CBA for SKIP_CANCEL__OK
-//----------------------------------------------------
-//
-RESOURCE CBA r_diag_speaker_softkeys_skip_cancel__ok
-{
-    buttons = 
-    {
-        CBA_BUTTON 
-        { 
-            id  = ECBACmdSkip;          // .hrh
-            txt = qtn_diag_softk_skip;  // .rls or .loc
-        },
-        CBA_BUTTON 
-        { 
-            id  = ECBACmdCancel;       // .hrh
-            txt = text_softkey_cancel; // .rls or .loc
-        }, 
-        CBA_BUTTON 
-        { 
-            id  = EAknSoftkeyOk; // in order to Exit
-            txt = text_softkey_ok;
-        }
-    };
-}
-
-//----------------------------------------------------
-// r_diag_speaker_softkeys_skip_cancel__start
-// CBA for SKIP_CANCEL__START
-//----------------------------------------------------
-//
-RESOURCE CBA r_diag_speaker_softkeys_skip_cancel__start
-{
-    buttons = 
-    {
-        CBA_BUTTON 
-        { 
-            id  = ECBACmdSkip;          // .hrh
-            txt = qtn_diag_softk_skip;  // .rls or .loc
-        },
-        CBA_BUTTON 
-        { 
-            id  = ECBACmdCancel;       // .hrh
-            txt = text_softkey_cancel; // .rls or .loc
-        }, 
-        CBA_BUTTON 
-        { 
-            id  = EAknSoftkeyOk;
-            txt = qtn_msk_record;
-        }
-    };
-}
-
-//----------------------------------------------------
-// r_diag_speaker_softkeys_start_cancel
-// CBA for SRART_CANCEL
-//----------------------------------------------------
-//
-RESOURCE CBA r_diag_speaker_softkeys_start_cancel
-{
-    buttons = 
-    {
-       CBA_BUTTON 
-        { 
-            id  = EAknSoftkeyOk;
-            txt = qtn_msk_record;
-        },
-
-        CBA_BUTTON 
-        { 
-            id  = ECBACmdCancel;       // .hrh
-            txt = text_softkey_cancel; // .rls or .loc
-        }
-    };
-}
-
-//----------------------------------------------------
-// r_diag_speaker_softkeys_skip_cancel__play
-// CBA for SKIP_CANCEL__PLAY
-//----------------------------------------------------
-//
-RESOURCE CBA r_diag_speaker_softkeys_skip_cancel__play
-{
-    buttons = 
-    {
-        CBA_BUTTON 
-        { 
-            id  = ECBACmdSkip;          // .hrh
-            txt = qtn_diag_softk_skip;  // .rls or .loc
-	},
-        CBA_BUTTON 
-	{ 
-            id  = ECBACmdCancel;      // .hrh
-            txt = text_softkey_cancel;// .rls or .loc
-	}, 
-	CBA_BUTTON 
-	{ 
-            id  = EAknSoftkeyOk; 
-            txt = qtn_msk_play;
-	}
-    };
-}
-
-//----------------------------------------------------
-// r_diag_speaker_softkeys_play_cancel
-// CBA for PLAY_CANCEL__PLAY
-//----------------------------------------------------
-//
-RESOURCE CBA r_diag_speaker_softkeys_play_cancel
-{
-    buttons = 
-    {
-	CBA_BUTTON 
-	{ 
-            id  = EAknSoftkeyOk; 
-            txt = qtn_msk_play;
-	},
-
-        CBA_BUTTON 
-	{ 
-            id  = ECBACmdCancel;      // .hrh
-            txt = text_softkey_cancel;// .rls or .loc
-	}
-    };
-}
-
-//----------------------------------------------------
-// r_diag_speaker_softkeys_skip_cancel__stop
-// CBA for SKIP_CANCEL__STOP
-//----------------------------------------------------
-//
-RESOURCE CBA r_diag_speaker_softkeys_skip_cancel__stop
-{
-    buttons = 
-    {
-        CBA_BUTTON 
-        { 
-            id  = ECBACmdSkip;          // .hrh
-            txt = qtn_diag_softk_skip;  // .rls or .loc
-	},
-        CBA_BUTTON 
-	{ 
-            id  = ECBACmdCancel;       // .hrh
-            txt = text_softkey_cancel; // .rls or .loc
-	}, 
-	CBA_BUTTON 
-	{ 
-            id  = EAknSoftkeyOk; 
-            txt = qtn_msk_stop;
-	}
-    };
-}
-
-//----------------------------------------------------
-// r_diag_speaker_softkeys_stop_cancel
-// CBA for STOP_CANCEL
-//----------------------------------------------------
-//
-RESOURCE CBA r_diag_speaker_softkeys_stop_cancel
-{
-    buttons = 
-    {
-	CBA_BUTTON 
-	{ 
-            id  = EAknSoftkeyOk; 
-            txt = qtn_msk_stop;
-	},
-
-        CBA_BUTTON 
-	{ 
-            id  = EEikBidCancel;       // .hrh
-            txt = text_softkey_cancel; // .rls or .loc
-	}
-    };
-}
-
-// ---------------------------------------------------------------------------
-// r_messagequery_title
-// The dialog shown when the plugin begins execution.
-// ---------------------------------------------------------------------------
-//
-RESOURCE DIALOG r_messagequery_title
-    {
-     flags   = EGeneralQueryFlags | 
-               EEikDialogFlagNoBorder |
-               EEikDialogFlagNoTitleBar;
-
-     buttons = r_diag_speaker_softkeys_skip_cancel__ok;
-
-     items=
-         {
-         DLG_LINE
-             {
-             type    = EAknCtPopupHeadingPane;
-             id      = EAknMessageQueryHeaderId;
-             control = AVKON_HEADING
-                 {              
-                    label         = qtn_diag_msg_title_speakerphone;
-                    headinglayout = R_AVKON_WML_SIGN_QUERY_HEADING_PANE;
-                 };
-             },
-         DLG_LINE
-             {
-             type    = EAknCtMessageQuery;
-             id      = EAknMessageQueryContentId;
-             control = AVKON_MESSAGE_QUERY
-                 {
-                 message = qtn_diag_msg_speakerphone;
-                 };
-             }
-         };
-     }
-
-// ---------------------------------------------------------------------------
-// r_messagequery_ask_record
-// The dialog shown before start recording
-// ---------------------------------------------------------------------------
-//
-RESOURCE DIALOG r_messagequery_ask_record
-    {
-     flags   = EGeneralQueryFlags | 
-               EEikDialogFlagNoBorder |
-               EEikDialogFlagNoTitleBar;
-
-     buttons = r_diag_speaker_softkeys_skip_cancel__start;
-
-     items=
-         {
-         DLG_LINE
-             {
-             type    = EAknCtPopupHeadingPane;
-             id      = EAknMessageQueryHeaderId;
-             control = AVKON_HEADING
-                 { 
-                 label         = qtn_diag_msg_title_record_speakerphone;
-                 headinglayout = R_AVKON_WML_SIGN_QUERY_HEADING_PANE;         
-                 };
-             },
-         DLG_LINE
-             {
-             type    = EAknCtMessageQuery;
-             id      = EAknMessageQueryContentId;
-             control = AVKON_MESSAGE_QUERY
-                 {
-                 message = qtn_diag_msg_record_speakerphone;
-                 };
-             }
-         };
-     }
-
-// ---------------------------------------------------------------------------
-// r_progress_note_recording
-// The dialog shown during recording
-// ---------------------------------------------------------------------------
-//
-RESOURCE DIALOG r_progress_note_recording
-    {
-    flags   = EAknProgressNoteFlags;
-    buttons = r_diag_speaker_softkeys_stop_cancel;
-    items   =
-        {
-        DLG_LINE
-            {
-            type    = EAknCtNote;
-            id      = EGeneralNote;
-            control = AVKON_NOTE
-                {
-                layout         = EProgressLayout;
-                singular_label = qtn_diag_note_record_speakerphone;
-                
-                imagefile = BMPFILE_NAME;
-                imageid   = EMbmAvkonQgn_note_voice;
-                imagemask = EMbmAvkonQgn_note_voice_mask;
-                };
-            }
-        };
-    }
-
-// ---------------------------------------------------------------------------
-// r_confquery_ask_play
-// The dialog shown when recording has finished and ask to play
-// ---------------------------------------------------------------------------
-//
-RESOURCE DIALOG r_confquery_ask_play
-    {
-    flags   = EGeneralQueryFlags;                 
-    buttons = r_diag_speaker_softkeys_play_cancel; // custom key
-    items   =
-        {
-        DLG_LINE
-            {
-            type    = EAknCtQuery;             
-            id      = EGeneralQuery;           
-            control = AVKON_CONFIRMATION_QUERY 
-                {   
-                layout  = EConfirmationQueryLayout;      
-                label   = qtn_diag_conf_start_play_speakerphone;
-		bmpfile = BMPFILE_NAME;                  
-                bmpid   = EMbmAvkonQgn_note_info;
-                bmpmask = EMbmAvkonQgn_note_info_mask;
-                };
-            }
-        };
-    }
-
-// ---------------------------------------------------------------------------
-// r_confquery_ask_heard
-// The dialog shown when ask to result of playing
-// ---------------------------------------------------------------------------
-//
-RESOURCE DIALOG r_confquery_ask_heard
-    {
-    flags   = EGeneralQueryFlags;           
-    buttons = R_AVKON_SOFTKEYS_YES_NO__YES;
-    items   =
-        {
-        DLG_LINE
-            {
-            type    = EAknCtQuery;             
-            id      = EGeneralQuery;           
-            control = AVKON_CONFIRMATION_QUERY 
-                {   
-                layout  = EConfirmationQueryLayout;
-                label   = qtn_diag_conf_speakerphone;
-                bmpfile = BMPFILE_NAME;
-                bmpid   = EMbmAvkonQgn_note_query;
-                bmpmask = EMbmAvkonQgn_note_query_mask;
-                };
-            }
-        };
-    }
-
-// ---------------------------------------------------------------------------
-// r_confquery_ask_repeat
-// The dialog shown when ask to repeat test again
-// ---------------------------------------------------------------------------
-//
-RESOURCE DIALOG r_confquery_ask_repeat
-    {
-    flags   = EGeneralQueryFlags; 
-    buttons = R_AVKON_SOFTKEYS_YES_NO__YES;
-    items   =
-        {
-        DLG_LINE
-            {
-            type = EAknCtQuery;
-            id   = EGeneralQuery;
-            control = AVKON_CONFIRMATION_QUERY
-                {
-                layout  = EConfirmationQueryLayout;
-                label   = qtn_diag_conf_repeat_speakerphone;
-                bmpfile = BMPFILE_NAME;
-                bmpid   = EMbmAvkonQgn_note_query;
-                bmpmask = EMbmAvkonQgn_note_query_mask;
-                };
-            }
-        };
-    }
-
-// ---------------------------------------------------------------------------
-// r_progress_note_playing
-// The dialog shown during playing
-// ---------------------------------------------------------------------------
-//
-RESOURCE DIALOG r_progress_note_playing
-    {
-    flags   = EAknProgressNoteFlags;
-    buttons = r_diag_speaker_softkeys_skip_cancel__stop;
-    items   =
-        {
-        DLG_LINE
-            {
-            type    = EAknCtNote;
-            id      = EGeneralNote;
-            control = AVKON_NOTE
-                {
-                layout         = EProgressLayout;
-                singular_label = qtn_diag_note_play_speakerphone;
-                plural_label   = qtn_diag_note_play_speakerphone;
-                imagefile      = BMPFILE_NAME;
-                imageid        = EMbmAvkonQgn_note_voice;
-                imagemask      = EMbmAvkonQgn_note_voice_mask;
-                };
-            }
-        };
-    }
-
-//End of File
--- a/devicediagnostics/diagplugins/diagloudspeakerplugin/group/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-/*
-* 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:  This file provides the information required for building
-*                DiagSpeakerPlugin
-*
-*/
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-../loc/diagspeakerplugin.loc        MW_LAYER_LOC_EXPORT_PATH(diagspeakerplugin.loc)
-../rom_files/devdiagspeakerplugin.iby		CORE_MW_LAYER_IBY_EXPORT_PATH(devdiagspeakerplugin.iby)
-../rom_files/devdiagspeakerplugin_resources.iby		LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(devdiagspeakerplugin_resources.iby)
-
-// Generic configuration interface for component cenrep settings  
-../conf/diagspeakertestplugin.confml                    MW_LAYER_CONFML(DiagSpeakerTestPlugin.confml)
-../conf/diagspeakertestplugin_2000E58E.crml	        MW_LAYER_CRML(DiagSpeakerTestPlugin_2000E58E.crml)
-PRJ_MMPFILES
-diagspeakerplugin.mmp
-
-
-PRJ_TESTMMPFILES
-
-//  End of File
--- a/devicediagnostics/diagplugins/diagloudspeakerplugin/group/diagspeakerplugin.mmp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,78 +0,0 @@
-/*
-* 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:  Project specification file.
-*
-*/
-
-
-#include  <data_caging_paths.hrh>    // For RESOURCE_FILES_DIR
-// To get the MW_LAYER_SYSTEMINCLUDE-definition
-#include <platform_paths.hrh>
-
-CAPABILITY          CAP_ECOM_PLUGIN MultimediaDD UserEnvironment 
-TARGET              devdiagspeakerplugin.dll
-TARGETTYPE          PLUGIN
-UID                 0x10009D8D 0x2000E58E
-VENDORID            VID_DEFAULT
-
-
-SOURCEPATH  ../src
-SOURCE      diagspeakerpluginimplementationtable.cpp
-SOURCE      diagspeakerplugin.cpp
-
-
-//User include paths
-USERINCLUDE     ../inc
-USERINCLUDE     ../data // For *.rh
-USERINCLUDE     ../loc
-
-//System include paths
-SYSTEMINCLUDE   /epoc32/include/ecom
-SYSTEMINCLUDE   /epoc32/include/mmf/common
-
-// Default system include paths for middleware layer modules.
-APP_LAYER_SYSTEMINCLUDE
-
-
-SOURCEPATH      ../data
-
-START RESOURCE  devdiagspeakerplugin.rss
-TARGET          devdiagspeakerplugin.rsc
-TARGETPATH      ECOM_RESOURCE_DIR
-END
-
-START RESOURCE  devdiagspeakerpluginrsc.rss
-HEADER
-TARGETPATH      RESOURCE_FILES_DIR
-LANGUAGE_IDS
-END
-
-
-LIBRARY   euser.lib
-LIBRARY   efsrv.lib
-LIBRARY   avkon.lib
-LIBRARY   commonengine.lib  // For RConeResourceLoader
-LIBRARY   flogger.lib       // for LOGGER
-LIBRARY   diagframework.lib 
-LIBRARY   diagpluginbase.lib
-
-LIBRARY   eikctl.lib   // for Progress Dialog
-LIBRARY   eikcoctl.lib 
-LIBRARY   eikdlg.lib
-
-LIBRARY   mediaclientaudio.lib    // for AudioRecorderUtility
-LIBRARY   centralrepository.lib   // for Central Repository
-LIBRARY   audiooutputrouting.lib  // for CAudioOutput
-// End of File
-
--- a/devicediagnostics/diagplugins/diagloudspeakerplugin/group/diagspeakerplugin.xml	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2049 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!DOCTYPE PROJECT [
- <!ELEMENT PROJECT (TARGETLIST, TARGETORDER, GROUPLIST, DESIGNLIST?)>
- <!ELEMENT TARGETLIST (TARGET+)>
- <!ELEMENT TARGET (NAME, SETTINGLIST, FILELIST?, LINKORDER?, SEGMENTLIST?, OVERLAYGROUPLIST?, SUBTARGETLIST?, SUBPROJECTLIST?, FRAMEWORKLIST?, PACKAGEACTIONSLIST?)>
- <!ELEMENT NAME (#PCDATA)>
- <!ELEMENT USERSOURCETREETYPE (#PCDATA)>
- <!ELEMENT PATH (#PCDATA)>
- <!ELEMENT FILELIST (FILE*)>
- <!ELEMENT FILE (PATHTYPE, PATHROOT?, ACCESSPATH?, PATH, PATHFORMAT?, ROOTFILEREF?, FILEKIND?, FILEFLAGS?)>
- <!ELEMENT PATHTYPE (#PCDATA)>
- <!ELEMENT PATHROOT (#PCDATA)>
- <!ELEMENT ACCESSPATH (#PCDATA)>
- <!ELEMENT PATHFORMAT (#PCDATA)>
- <!ELEMENT ROOTFILEREF (PATHTYPE, PATHROOT?, ACCESSPATH?, PATH, PATHFORMAT?)>
- <!ELEMENT FILEKIND (#PCDATA)>
- <!ELEMENT FILEFLAGS (#PCDATA)>
- <!ELEMENT FILEREF (TARGETNAME?, PATHTYPE, PATHROOT?, ACCESSPATH?, PATH, PATHFORMAT?)>
- <!ELEMENT TARGETNAME (#PCDATA)>
- <!ELEMENT SETTINGLIST ((SETTING|PANELDATA)+)>
- <!ELEMENT SETTING (NAME?, (VALUE|(SETTING+)))>
- <!ELEMENT PANELDATA (NAME, VALUE)>
- <!ELEMENT VALUE (#PCDATA)>
- <!ELEMENT LINKORDER (FILEREF*)>
- <!ELEMENT SEGMENTLIST (SEGMENT+)>
- <!ELEMENT SEGMENT (NAME, ATTRIBUTES?, FILEREF*)>
- <!ELEMENT ATTRIBUTES (#PCDATA)>
- <!ELEMENT OVERLAYGROUPLIST (OVERLAYGROUP+)>
- <!ELEMENT OVERLAYGROUP (NAME, BASEADDRESS, OVERLAY*)>
- <!ELEMENT BASEADDRESS (#PCDATA)>
- <!ELEMENT OVERLAY (NAME, FILEREF*)>
- <!ELEMENT SUBTARGETLIST (SUBTARGET+)>
- <!ELEMENT SUBTARGET (TARGETNAME, ATTRIBUTES?, FILEREF?)>
- <!ELEMENT SUBPROJECTLIST (SUBPROJECT+)>
- <!ELEMENT SUBPROJECT (FILEREF, SUBPROJECTTARGETLIST)>
- <!ELEMENT SUBPROJECTTARGETLIST (SUBPROJECTTARGET*)>
- <!ELEMENT SUBPROJECTTARGET (TARGETNAME, ATTRIBUTES?, FILEREF?)>
- <!ELEMENT FRAMEWORKLIST (FRAMEWORK+)>
- <!ELEMENT FRAMEWORK (FILEREF, DYNAMICLIBRARY?, VERSION?)>
- <!ELEMENT PACKAGEACTIONSLIST (PACKAGEACTION+)>
- <!ELEMENT PACKAGEACTION (#PCDATA)>
- <!ELEMENT LIBRARYFILE (FILEREF)>
- <!ELEMENT VERSION (#PCDATA)>
- <!ELEMENT TARGETORDER (ORDEREDTARGET|ORDEREDDESIGN)*>
- <!ELEMENT ORDEREDTARGET (NAME)>
- <!ELEMENT ORDEREDDESIGN (NAME, ORDEREDTARGET+)>
- <!ELEMENT GROUPLIST (GROUP|FILEREF)*>
- <!ELEMENT GROUP (NAME, (GROUP|FILEREF)*)>
- <!ELEMENT DESIGNLIST (DESIGN+)>
- <!ELEMENT DESIGN (NAME, DESIGNDATA)>
- <!ELEMENT DESIGNDATA (#PCDATA)>
-]>
-<?codewarrior exportversion="1.0.1" ideversion="5.0" ?>
-<PROJECT>
-    <TARGETLIST>
-        <TARGET>
-            <NAME>WINSCW UDEB</NAME>
-            <SETTINGLIST>
-
-                <!-- Settings for "Source Trees" panel -->
-                <SETTING><NAME>UserSourceTrees</NAME></SETTING>
-
-                <!-- Settings for "Access Paths" panel -->
-                <SETTING><NAME>AlwaysSearchUserPaths</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>InterpretDOSAndUnixPaths</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>RequireFrameworkStyleIncludes</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>SourceRelativeIncludes</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>UserSearchPaths</NAME>
-                    <SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics_withdom\DeviceDiagnostics\diagplugins\diagloudspeakerplugin\inc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics_withdom\DeviceDiagnostics\diagplugins\diagloudspeakerplugin\data</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics_withdom\DeviceDiagnostics\diagplugins\diagloudspeakerplugin\loc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics_withdom\DeviceDiagnostics\diagplugins\diagloudspeakerplugin\group</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics_withdom\DeviceDiagnostics\diagplugins\diagloudspeakerplugin\src</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING></SETTING>
-                <SETTING><NAME>SystemSearchPaths</NAME>
-                    <SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\ecom</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\oem</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\middleware</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\middleware</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\osextensions</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\osextensions</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\osextensions\loc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\middleware\loc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\osextensions\loc\sc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\middleware\loc\sc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\UDEB</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>Symbian_Support\Win32-x86 Support\Libraries\Win32 SDK</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>CodeWarrior</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>Symbian_Support\Runtime\Runtime_x86\Runtime_Win32\Libs</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>CodeWarrior</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING></SETTING>
-
-                <!-- Settings for "Debugger Runtime" panel -->
-                <SETTING><NAME>MWRuntimeSettings_WorkingDirectory</NAME><VALUE/></SETTING>
-                <SETTING><NAME>MWRuntimeSettings_CommandLine</NAME><VALUE/></SETTING>
-                <SETTING><NAME>MWRuntimeSettings_HostApplication</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\udeb\epoc.exe</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>MWRuntimeSettings_EnvVars</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Target Settings" panel -->
-                <SETTING><NAME>Linker</NAME><VALUE>Symbian Linker v2</VALUE></SETTING>
-                <SETTING><NAME>PreLinker</NAME><VALUE/></SETTING>
-                <SETTING><NAME>PostLinker</NAME><VALUE>Symbian Installer v2</VALUE></SETTING>
-                <SETTING><NAME>Targetname</NAME><VALUE>WINSCW UDEB</VALUE></SETTING>
-                <SETTING><NAME>OutputDirectory</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\udeb</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SaveEntriesUsingRelativePaths</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "File Mappings" panel -->
-                <SETTING><NAME>FileMappings</NAME>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>._i</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>._ii</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.c</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cc</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cfg</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cia</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cpp</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cwlink</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>XML</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cxx</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.def</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.h</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.hrh</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.i</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.iby</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.ii</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.inf</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.ini</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.inl</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.loc</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.mmpi</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.pch++</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.pkg</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.policy</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.ra</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.resources</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Resource v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>XML</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.rh</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.rls</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.rss</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.rsg</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.s</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.script</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.txt</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.a</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Object Importer v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.lib</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Object Importer v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.dso</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Object Importer v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.o</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Object Importer v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                </SETTING>
-
-                <!-- Settings for "Build Extras" panel -->
-                <SETTING><NAME>CacheModDates</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>DumpBrowserInfo</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>CacheSubprojects</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>UseThirdPartyDebugger</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>BrowserGenerator</NAME><VALUE>2</VALUE></SETTING>
-                <SETTING><NAME>DebuggerAppPath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>DebuggerCmdLineArgs</NAME><VALUE/></SETTING>
-                <SETTING><NAME>DebuggerWorkingDir</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CodeCompletionPrefixFileName</NAME><VALUE/></SETTING>
-                <SETTING><NAME>CodeCompletionMacroFileName</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Debugger Target" panel -->
-                <SETTING><NAME>ConsoleEncoding</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>LogSystemMessages</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>AutoTargetDLLsPopUp</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>StopAtWatchpoints</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>PauseWhileRunning</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>PauseInterval</NAME><VALUE>5</VALUE></SETTING>
-                <SETTING><NAME>PauseUIFlags</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>AltExePath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>StopAtTempBPOnLaunch</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>CacheSymbolics</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>TempBPFunctionName</NAME><VALUE>E32Main</VALUE></SETTING>
-                <SETTING><NAME>TempBPType</NAME><VALUE>1</VALUE></SETTING>
-
-                <!-- Settings for "Remote Debug" panel -->
-                <SETTING><NAME>Enabled</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>ConnectionName</NAME><VALUE/></SETTING>
-                <SETTING><NAME>DownloadPath</NAME><VALUE/></SETTING>
-                <SETTING><NAME>LaunchRemoteApp</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>RemoteAppPath</NAME><VALUE/></SETTING>
-                <SETTING><NAME>CoreID</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>JTAGClockSpeed</NAME><VALUE>8000</VALUE></SETTING>
-                <SETTING><NAME>IsMultiCore</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>OSDownload</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>UseGlobalOSDownload</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>OSDownloadConnectionName</NAME><VALUE/></SETTING>
-                <SETTING><NAME>OSDownloadPath</NAME><VALUE/></SETTING>
-                <SETTING><NAME>AltDownload</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>AltDownloadConnectionName</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "x86 Exceptions" panel -->
-                <SETTING><NAME>MWDebugger_X86_Exceptions</NAME>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                
-                <!-- Settings for "Auto-target" panel -->
-                <SETTING><NAME>OtherExecutables</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Analyzer Connections" panel -->
-                <SETTING><NAME>AnalyzerConnectionName</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Custom Keywords" panel -->
-                <SETTING><NAME>CustomColor1</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor2</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor3</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor4</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "ARM Debugger" panel -->
-                <SETTING><NAME>Processor</NAME><VALUE>Generic</VALUE></SETTING>
-                <SETTING><NAME>BraekPoinType_II</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>UseInitFile</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>UseConfigFile</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>IDexecutable</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>IDinitialized</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>IDuninitialized</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>IDconstant</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>SDexecutable</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>SDinitialized</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>SDuninitialized</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>SDconstant</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>VerifyMemWrites</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>ShowMPC107regs</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>InitializationFile</NAME><VALUE/></SETTING>
-                <SETTING><NAME>ConfigurationFile</NAME><VALUE/></SETTING>
-                <SETTING><NAME>BreakpointType</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>WatchpointType</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>TargetOS</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>RTOSPluginName</NAME><VALUE/></SETTING>
-                <SETTING><NAME>ByteOrderType</NAME><VALUE>0</VALUE></SETTING>
-                <PANELDATA><NAME>CodeTest SYMBIAN Instrumenter</NAME><VALUE>
-                    0200020000000100000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000433A5C0000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000637466696C657300000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000636F6465746573742E6964620000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000
-                </VALUE></PANELDATA>
-
-                <!-- Settings for "Symbian Installation" panel -->
-                <SETTING><NAME>SymbianInstallationOutputFilename</NAME><VALUE>Application.sis</VALUE></SETTING>
-                <SETTING><NAME>SymbianInstallationOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>SymbianInstallationContentSearchLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\udeb</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianInstallationPassword</NAME><VALUE/></SETTING>
-                <SETTING><NAME>SymbianInstallationCreateStubFile</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "Symbian Installer Panel v2" panel -->
-                <SETTING><NAME>SymbianInstallationOutputFilename</NAME><VALUE>Application.sis</VALUE></SETTING>
-                <SETTING><NAME>SymbianInstallationOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>SymbianInstallationContentSearchLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\udeb</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianInstallationPassword</NAME><VALUE/></SETTING>
-                <SETTING><NAME>SymbianInstallationCreateStubFile</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "Symbian Resource Panel" panel -->
-                <SETTING><NAME>SymbianResourcesMMPFileLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics_withdom\DeviceDiagnostics\diagplugins\diagloudspeakerplugin\group</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianResourcesBinaryOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\udeb</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianResourcesHeaderFileOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\include</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-
-                <!-- Settings for "Symbian Resources Panel v2" panel -->
-                <SETTING><NAME>SymbianResourcesMMPFileLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics_withdom\DeviceDiagnostics\diagplugins\diagloudspeakerplugin\group</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianResourcesBinaryOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\udeb</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianResourcesHeaderFileOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\include</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-
-                <!-- Settings for "Remote Download" panel -->
-                <SETTING><NAME>FileList</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Symbian ARM Debugger" panel -->
-                <SETTING><NAME>Processor</NAME><VALUE>Generic</VALUE></SETTING>
-                <SETTING><NAME>UseInitFile</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>UseConfigFile</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>ResetTarget</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>InitializationFile</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>ConfigurationFile</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>TargetOS</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>RTOSPluginName</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Symbian Common Panel" panel -->
-                <SETTING><NAME>ShowCommandLine</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>SymbianEpocToolsPath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE></VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-
-                <!-- Settings for "Symbian Compiler Panel" panel -->
-                <SETTING><NAME>PrefixFile</NAME><VALUE>feature_settings.hrh</VALUE></SETTING>
-                <SETTING><NAME>CompilerXMLDescriptor</NAME><VALUE>Metrowerks x86 Compiler</VALUE></SETTING>
-                <SETTING><NAME>Macros</NAME><VALUE>__SYMBIAN32__,__CW32__,__WINS__,__WINSCW__,__DLL__,_DEBUG,_UNICODE,__SUPPORT_CPP_EXCEPTIONS__,</VALUE></SETTING>
-                <SETTING><NAME>CodeTEST</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>EnableSWIC</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Arguments</NAME><VALUE>-wchar_t off -align 4 -warnings on -w nohidevirtual, nounusedexpr -msgstyle gcc -enum int -str pool -exc ms -trigraphs on -O0 -inline off -nostdinc</VALUE></SETTING>
-                <SETTING><NAME>CIAArgs</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Symbian Debugging" panel -->
-                <SETTING><NAME>Parse Log File</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Log File Path</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>Symbian SDK Folder</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>Log Unresolved Modules</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Log Unresolved Sym Files</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Debug Non-XIP Executables</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "Symbian Kernel Debugging" panel -->
-                <SETTING><NAME>Start Address</NAME><VALUE>0x00000000</VALUE></SETTING>
-                <SETTING><NAME>Run From Start Address</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Download Image</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>OS Image Path</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>Download Address</NAME><VALUE>0x00000000</VALUE></SETTING>
-                <SETTING><NAME>Ask First</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Debug Bootrom</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Bootrom Sym File</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "Symbian Linker Panel" panel -->
-                <SETTING><NAME>LinkOutputFile</NAME><VALUE>DevDiagSpeakerPlugin.dll</VALUE></SETTING>
-                <SETTING><NAME>LinkCmdLine</NAME><VALUE/></SETTING>
-                <SETTING><NAME>SymbianImportLibrary</NAME><VALUE>DevDiagSpeakerPlugin.lib</VALUE></SETTING>
-                <SETTING><NAME>canDebug</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>canRun</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "Symbian RomBuild Panel" panel -->
-                <SETTING><NAME>CommandLine</NAME><VALUE>buildrom -D_DEBUG devkit lubbock techview -olubbock_gui.img</VALUE></SETTING>
-                <SETTING><NAME>OutputPath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>C:\</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>DisplayMessages</NAME><VALUE>true</VALUE></SETTING>
-
-                <!-- Settings for "Symbian Target" panel -->
-                <SETTING><NAME>TargetArchitecture</NAME><VALUE>WINSCW</VALUE></SETTING>
-                <SETTING><NAME>LogMessages</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>SuppressWarnings</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>GenerateSymbolics</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>CompilerPrefix</NAME><VALUE/></SETTING>
-                <SETTING><NAME>CompilerCmdLine</NAME><VALUE/></SETTING>
-                <SETTING><NAME>SymbianImportLibraryPath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>C:\</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "Symbian Tools" panel -->
-                <SETTING><NAME>Gnu Tools Path</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>C:\</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>Epoc32 Tools Path</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>C:\</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-            </SETTINGLIST>
-            <FILELIST>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagSpeakerPlugin.mmp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagSpeakerPluginWINSCW.resources</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>EDLL.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagSpeakerPluginImplementationTable.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagSpeakerPlugin.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagSpeakerPlugin_UID_.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>euser.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>efsrv.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>avkon.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>CommonEngine.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>flogger.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagFramework.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagPluginBase.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>eikctl.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>eikcoctl.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>eikdlg.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>MediaClientAudio.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>CentralRepository.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>AudioOutputRouting.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagSpeakerPlugin.h</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagSpeakerPlugin.hrh</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagSpeakerTestPrivateCRKeys.h</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagSpeakerPluginWINSCWUDEB.cwlink</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-</FILELIST>
-            <LINKORDER>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagSpeakerPlugin.mmp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagSpeakerPluginWINSCW.resources</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>EDLL.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagSpeakerPluginImplementationTable.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagSpeakerPlugin.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagSpeakerPlugin_UID_.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>euser.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>efsrv.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>avkon.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>CommonEngine.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>flogger.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagFramework.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagPluginBase.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>eikctl.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>eikcoctl.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>eikdlg.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>MediaClientAudio.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>CentralRepository.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>AudioOutputRouting.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagSpeakerPlugin.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagSpeakerPlugin.hrh</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagSpeakerTestPrivateCRKeys.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagSpeakerPluginWINSCWUDEB.cwlink</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-</LINKORDER>
-        </TARGET><TARGET>
-            <NAME>WINSCW UREL</NAME>
-            <SETTINGLIST>
-
-                <!-- Settings for "Source Trees" panel -->
-                <SETTING><NAME>UserSourceTrees</NAME></SETTING>
-
-                <!-- Settings for "Access Paths" panel -->
-                <SETTING><NAME>AlwaysSearchUserPaths</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>InterpretDOSAndUnixPaths</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>RequireFrameworkStyleIncludes</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>SourceRelativeIncludes</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>UserSearchPaths</NAME>
-                    <SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics_withdom\DeviceDiagnostics\diagplugins\diagloudspeakerplugin\inc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics_withdom\DeviceDiagnostics\diagplugins\diagloudspeakerplugin\data</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics_withdom\DeviceDiagnostics\diagplugins\diagloudspeakerplugin\loc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics_withdom\DeviceDiagnostics\diagplugins\diagloudspeakerplugin\group</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics_withdom\DeviceDiagnostics\diagplugins\diagloudspeakerplugin\src</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING></SETTING>
-                <SETTING><NAME>SystemSearchPaths</NAME>
-                    <SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\ecom</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\oem</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\middleware</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\middleware</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\osextensions</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\osextensions</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\osextensions\loc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\middleware\loc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\osextensions\loc\sc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\middleware\loc\sc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\UREL</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\release\WINSCW\UDEB</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>Symbian_Support\Win32-x86 Support\Libraries\Win32 SDK</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>CodeWarrior</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>Symbian_Support\Runtime\Runtime_x86\Runtime_Win32\Libs</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>CodeWarrior</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING></SETTING>
-
-                <!-- Settings for "Debugger Runtime" panel -->
-                <SETTING><NAME>MWRuntimeSettings_WorkingDirectory</NAME><VALUE/></SETTING>
-                <SETTING><NAME>MWRuntimeSettings_CommandLine</NAME><VALUE/></SETTING>
-                <SETTING><NAME>MWRuntimeSettings_HostApplication</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\urel\epoc.exe</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>MWRuntimeSettings_EnvVars</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Target Settings" panel -->
-                <SETTING><NAME>Linker</NAME><VALUE>Symbian Linker v2</VALUE></SETTING>
-                <SETTING><NAME>PreLinker</NAME><VALUE/></SETTING>
-                <SETTING><NAME>PostLinker</NAME><VALUE>Symbian Installer v2</VALUE></SETTING>
-                <SETTING><NAME>Targetname</NAME><VALUE>WINSCW UREL</VALUE></SETTING>
-                <SETTING><NAME>OutputDirectory</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\urel</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SaveEntriesUsingRelativePaths</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "File Mappings" panel -->
-                <SETTING><NAME>FileMappings</NAME>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>._i</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>._ii</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.c</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cc</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cfg</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cia</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cpp</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cwlink</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>XML</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cxx</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.def</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.h</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.hrh</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.i</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.iby</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.ii</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.inf</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.ini</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.inl</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.loc</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.mmpi</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.pch++</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.pkg</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.policy</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.ra</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.resources</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Resource v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>XML</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.rh</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.rls</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.rss</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.rsg</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.s</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.script</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.txt</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.a</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Object Importer v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.lib</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Object Importer v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.dso</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Object Importer v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.o</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Object Importer v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                </SETTING>
-
-                <!-- Settings for "Build Extras" panel -->
-                <SETTING><NAME>CacheModDates</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>DumpBrowserInfo</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>CacheSubprojects</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>UseThirdPartyDebugger</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>BrowserGenerator</NAME><VALUE>2</VALUE></SETTING>
-                <SETTING><NAME>DebuggerAppPath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>DebuggerCmdLineArgs</NAME><VALUE/></SETTING>
-                <SETTING><NAME>DebuggerWorkingDir</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CodeCompletionPrefixFileName</NAME><VALUE/></SETTING>
-                <SETTING><NAME>CodeCompletionMacroFileName</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Debugger Target" panel -->
-                <SETTING><NAME>ConsoleEncoding</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>LogSystemMessages</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>AutoTargetDLLsPopUp</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>StopAtWatchpoints</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>PauseWhileRunning</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>PauseInterval</NAME><VALUE>5</VALUE></SETTING>
-                <SETTING><NAME>PauseUIFlags</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>AltExePath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>StopAtTempBPOnLaunch</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>CacheSymbolics</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>TempBPFunctionName</NAME><VALUE>E32Main</VALUE></SETTING>
-                <SETTING><NAME>TempBPType</NAME><VALUE>1</VALUE></SETTING>
-
-                <!-- Settings for "Remote Debug" panel -->
-                <SETTING><NAME>Enabled</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>ConnectionName</NAME><VALUE/></SETTING>
-                <SETTING><NAME>DownloadPath</NAME><VALUE/></SETTING>
-                <SETTING><NAME>LaunchRemoteApp</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>RemoteAppPath</NAME><VALUE/></SETTING>
-                <SETTING><NAME>CoreID</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>JTAGClockSpeed</NAME><VALUE>8000</VALUE></SETTING>
-                <SETTING><NAME>IsMultiCore</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>OSDownload</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>UseGlobalOSDownload</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>OSDownloadConnectionName</NAME><VALUE/></SETTING>
-                <SETTING><NAME>OSDownloadPath</NAME><VALUE/></SETTING>
-                <SETTING><NAME>AltDownload</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>AltDownloadConnectionName</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "x86 Exceptions" panel -->
-                <SETTING><NAME>MWDebugger_X86_Exceptions</NAME>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                
-                <!-- Settings for "Auto-target" panel -->
-                <SETTING><NAME>OtherExecutables</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Analyzer Connections" panel -->
-                <SETTING><NAME>AnalyzerConnectionName</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Custom Keywords" panel -->
-                <SETTING><NAME>CustomColor1</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor2</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor3</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor4</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "ARM Debugger" panel -->
-                <SETTING><NAME>Processor</NAME><VALUE>Generic</VALUE></SETTING>
-                <SETTING><NAME>BraekPoinType_II</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>UseInitFile</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>UseConfigFile</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>IDexecutable</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>IDinitialized</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>IDuninitialized</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>IDconstant</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>SDexecutable</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>SDinitialized</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>SDuninitialized</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>SDconstant</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>VerifyMemWrites</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>ShowMPC107regs</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>InitializationFile</NAME><VALUE/></SETTING>
-                <SETTING><NAME>ConfigurationFile</NAME><VALUE/></SETTING>
-                <SETTING><NAME>BreakpointType</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>WatchpointType</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>TargetOS</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>RTOSPluginName</NAME><VALUE/></SETTING>
-                <SETTING><NAME>ByteOrderType</NAME><VALUE>0</VALUE></SETTING>
-                <PANELDATA><NAME>CodeTest SYMBIAN Instrumenter</NAME><VALUE>
-                    0200020000000100000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000433A5C0000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000637466696C657300000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000636F6465746573742E6964620000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000
-                </VALUE></PANELDATA>
-
-                <!-- Settings for "Symbian Installation" panel -->
-                <SETTING><NAME>SymbianInstallationOutputFilename</NAME><VALUE>Application.sis</VALUE></SETTING>
-                <SETTING><NAME>SymbianInstallationOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>SymbianInstallationContentSearchLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\urel</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianInstallationPassword</NAME><VALUE/></SETTING>
-                <SETTING><NAME>SymbianInstallationCreateStubFile</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "Symbian Installer Panel v2" panel -->
-                <SETTING><NAME>SymbianInstallationOutputFilename</NAME><VALUE>Application.sis</VALUE></SETTING>
-                <SETTING><NAME>SymbianInstallationOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>SymbianInstallationContentSearchLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\urel</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianInstallationPassword</NAME><VALUE/></SETTING>
-                <SETTING><NAME>SymbianInstallationCreateStubFile</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "Symbian Resource Panel" panel -->
-                <SETTING><NAME>SymbianResourcesMMPFileLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics_withdom\DeviceDiagnostics\diagplugins\diagloudspeakerplugin\group</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianResourcesBinaryOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\urel</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianResourcesHeaderFileOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\include</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-
-                <!-- Settings for "Symbian Resources Panel v2" panel -->
-                <SETTING><NAME>SymbianResourcesMMPFileLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics_withdom\DeviceDiagnostics\diagplugins\diagloudspeakerplugin\group</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianResourcesBinaryOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\urel</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianResourcesHeaderFileOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\include</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-
-                <!-- Settings for "Remote Download" panel -->
-                <SETTING><NAME>FileList</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Symbian ARM Debugger" panel -->
-                <SETTING><NAME>Processor</NAME><VALUE>Generic</VALUE></SETTING>
-                <SETTING><NAME>UseInitFile</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>UseConfigFile</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>ResetTarget</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>InitializationFile</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>ConfigurationFile</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>TargetOS</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>RTOSPluginName</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Symbian Common Panel" panel -->
-                <SETTING><NAME>ShowCommandLine</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>SymbianEpocToolsPath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE></VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-
-                <!-- Settings for "Symbian Compiler Panel" panel -->
-                <SETTING><NAME>PrefixFile</NAME><VALUE>feature_settings.hrh</VALUE></SETTING>
-                <SETTING><NAME>CompilerXMLDescriptor</NAME><VALUE>Metrowerks x86 Compiler</VALUE></SETTING>
-                <SETTING><NAME>Macros</NAME><VALUE>__SYMBIAN32__,__CW32__,__WINS__,__WINSCW__,__DLL__,NDEBUG,_UNICODE,__SUPPORT_CPP_EXCEPTIONS__,</VALUE></SETTING>
-                <SETTING><NAME>CodeTEST</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>EnableSWIC</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Arguments</NAME><VALUE>-wchar_t off -align 4 -warnings on -w nohidevirtual, nounusedexpr -msgstyle gcc -enum int -str pool -exc ms -trigraphs on -O4,s -nostdinc</VALUE></SETTING>
-                <SETTING><NAME>CIAArgs</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Symbian Debugging" panel -->
-                <SETTING><NAME>Parse Log File</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Log File Path</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>Symbian SDK Folder</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>Log Unresolved Modules</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Log Unresolved Sym Files</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Debug Non-XIP Executables</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "Symbian Kernel Debugging" panel -->
-                <SETTING><NAME>Start Address</NAME><VALUE>0x00000000</VALUE></SETTING>
-                <SETTING><NAME>Run From Start Address</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Download Image</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>OS Image Path</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>Download Address</NAME><VALUE>0x00000000</VALUE></SETTING>
-                <SETTING><NAME>Ask First</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Debug Bootrom</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Bootrom Sym File</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "Symbian Linker Panel" panel -->
-                <SETTING><NAME>LinkOutputFile</NAME><VALUE>DevDiagSpeakerPlugin.dll</VALUE></SETTING>
-                <SETTING><NAME>LinkCmdLine</NAME><VALUE/></SETTING>
-                <SETTING><NAME>SymbianImportLibrary</NAME><VALUE>DevDiagSpeakerPlugin.lib</VALUE></SETTING>
-                <SETTING><NAME>canDebug</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>canRun</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "Symbian RomBuild Panel" panel -->
-                <SETTING><NAME>CommandLine</NAME><VALUE>buildrom -D_DEBUG devkit lubbock techview -olubbock_gui.img</VALUE></SETTING>
-                <SETTING><NAME>OutputPath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>C:\</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>DisplayMessages</NAME><VALUE>true</VALUE></SETTING>
-
-                <!-- Settings for "Symbian Target" panel -->
-                <SETTING><NAME>TargetArchitecture</NAME><VALUE>WINSCW</VALUE></SETTING>
-                <SETTING><NAME>LogMessages</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>SuppressWarnings</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>GenerateSymbolics</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>CompilerPrefix</NAME><VALUE/></SETTING>
-                <SETTING><NAME>CompilerCmdLine</NAME><VALUE/></SETTING>
-                <SETTING><NAME>SymbianImportLibraryPath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>C:\</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "Symbian Tools" panel -->
-                <SETTING><NAME>Gnu Tools Path</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>C:\</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>Epoc32 Tools Path</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>C:\</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-            </SETTINGLIST>
-            <FILELIST>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagSpeakerPlugin.mmp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagSpeakerPluginWINSCW.resources</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>EDLL.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagSpeakerPluginImplementationTable.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagSpeakerPlugin.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagSpeakerPlugin_UID_.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>euser.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>efsrv.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>avkon.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>CommonEngine.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>flogger.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagFramework.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagPluginBase.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>eikctl.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>eikcoctl.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>eikdlg.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>MediaClientAudio.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>CentralRepository.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>AudioOutputRouting.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagSpeakerPluginWINSCWUREL.cwlink</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-</FILELIST>
-            <LINKORDER>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagSpeakerPlugin.mmp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagSpeakerPluginWINSCW.resources</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>EDLL.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagSpeakerPluginImplementationTable.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagSpeakerPlugin.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagSpeakerPlugin_UID_.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>euser.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>efsrv.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>avkon.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>CommonEngine.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>flogger.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagFramework.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagPluginBase.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>eikctl.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>eikcoctl.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>eikdlg.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>MediaClientAudio.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>CentralRepository.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>AudioOutputRouting.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagSpeakerPluginWINSCWUREL.cwlink</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-</LINKORDER>
-        </TARGET><TARGET>
-<NAME>Build All</NAME><SETTINGLIST><SETTING><NAME>Linker</NAME><VALUE>None</VALUE></SETTING>
-<SETTING><NAME>Targetname</NAME><VALUE>Build All</VALUE></SETTING>
-</SETTINGLIST>
-<FILELIST></FILELIST>
-<LINKORDER></LINKORDER>
-<SUBTARGETLIST><SUBTARGET><TARGETNAME>WINSCW UDEB</TARGETNAME></SUBTARGET>
-<SUBTARGET><TARGETNAME>WINSCW UREL</TARGETNAME></SUBTARGET>
-</SUBTARGETLIST></TARGET></TARGETLIST>
-
-    <TARGETORDER>
-<ORDEREDTARGET><NAME>WINSCW UDEB</NAME></ORDEREDTARGET>
-<ORDEREDTARGET><NAME>WINSCW UREL</NAME></ORDEREDTARGET>
-<ORDEREDTARGET><NAME>Build All</NAME></ORDEREDTARGET>
-</TARGETORDER>
-
-    <GROUPLIST><FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DiagSpeakerPlugin.mmp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<GROUP><NAME>Source</NAME>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DiagSpeakerPluginImplementationTable.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DiagSpeakerPlugin.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DevDiagSpeakerPlugin_UID_.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-</GROUP>
-<GROUP><NAME>Headers</NAME>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DiagSpeakerPlugin.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DiagSpeakerPlugin.hrh</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DiagSpeakerTestPrivateCRKeys.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-</GROUP>
-<GROUP><NAME>Resources</NAME>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DevDiagSpeakerPluginWINSCW.resources</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-</GROUP>
-<GROUP><NAME>Link</NAME>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DevDiagSpeakerPluginWINSCWUDEB.cwlink</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UREL</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DevDiagSpeakerPluginWINSCWUREL.cwlink</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-</GROUP>
-<GROUP><NAME>Libraries</NAME>
-<GROUP><NAME>WINSCW</NAME>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>EDLL.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>euser.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>efsrv.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>avkon.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>CommonEngine.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>flogger.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DiagFramework.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DiagPluginBase.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>eikctl.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>eikcoctl.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>eikdlg.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>MediaClientAudio.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>CentralRepository.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>AudioOutputRouting.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UREL</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>EDLL.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-</GROUP>
-</GROUP>
-</GROUPLIST>
-
-</PROJECT>
--- a/devicediagnostics/diagplugins/diagloudspeakerplugin/group/log.txt	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +0,0 @@
-  make -r  -f "\EPOC32\BUILD\s60\mw\devicecontentservices\devicediagnostics\GSDeviceDiagnosticsPlugin\DevDiagApp\diagplugins\diagloudspeakerplugin\group\EXPORT.make" EXPORT VERBOSE=-s
-copy "\s60\mw\devicecontentservices\devicediagnostics\GSDeviceDiagnosticsPlugin\DevDiagApp\diagplugins\diagloudspeakerplugin\loc\DiagSpeakerPlugin.loc" "\epoc32\include\domain\middleware\loc\sc\DiagSpeakerPlugin.loc"
-        1 file(s) copied.
-copy "\s60\mw\devicecontentservices\devicediagnostics\GSDeviceDiagnosticsPlugin\DevDiagApp\diagplugins\diagloudspeakerplugin\rom_files\devdiagspeakerplugin.iby" "\epoc32\rom\include\core\mw\devdiagspeakerplugin.iby"
-        1 file(s) copied.
-copy "\s60\mw\devicecontentservices\devicediagnostics\GSDeviceDiagnosticsPlugin\DevDiagApp\diagplugins\diagloudspeakerplugin\rom_files\devdiagspeakerplugin_resources.iby" "\epoc32\rom\include\language\mw\devdiagspeakerplugin_resources.iby"
-        1 file(s) copied.
-  make -r  -f "\EPOC32\BUILD\s60\mw\devicecontentservices\devicediagnostics\GSDeviceDiagnosticsPlugin\DevDiagApp\diagplugins\diagloudspeakerplugin\group\WINSCW.make" MAKEFILE VERBOSE=-s
-perl -S makmake.pl  -D \s60\mw\devicecontentservices\devicediagnostics\GSDeviceDiagnosticsPlugin\DevDiagApp\diagplugins\diagloudspeakerplugin\group\DIAGSPEAKERPLUGIN WINSCW   
-  make -r  -f "\EPOC32\BUILD\s60\mw\devicecontentservices\devicediagnostics\GSDeviceDiagnosticsPlugin\DevDiagApp\diagplugins\diagloudspeakerplugin\group\ARMV5.make" MAKEFILE VERBOSE=-s
-perl -S makmake.pl  -D \s60\mw\devicecontentservices\devicediagnostics\GSDeviceDiagnosticsPlugin\DevDiagApp\diagplugins\diagloudspeakerplugin\group\DIAGSPEAKERPLUGIN ARMV5   
-  make -r  -f "\EPOC32\BUILD\s60\mw\devicecontentservices\devicediagnostics\GSDeviceDiagnosticsPlugin\DevDiagApp\diagplugins\diagloudspeakerplugin\group\WINSCW.make" LIBRARY VERBOSE=-s
-make -s  -r -f "\EPOC32\BUILD\s60\mw\devicecontentservices\devicediagnostics\GSDeviceDiagnosticsPlugin\DevDiagApp\diagplugins\diagloudspeakerplugin\group\DIAGSPEAKERPLUGIN\WINSCW\DIAGSPEAKERPLUGIN.WINSCW" LIBRARY
-  make -r  -f "\EPOC32\BUILD\s60\mw\devicecontentservices\devicediagnostics\GSDeviceDiagnosticsPlugin\DevDiagApp\diagplugins\diagloudspeakerplugin\group\ARMV5.make" LIBRARY VERBOSE=-s
-make -s  -r -f "\EPOC32\BUILD\s60\mw\devicecontentservices\devicediagnostics\GSDeviceDiagnosticsPlugin\DevDiagApp\diagplugins\diagloudspeakerplugin\group\DIAGSPEAKERPLUGIN\ARMV5\DIAGSPEAKERPLUGIN.ARMV5" LIBRARY
-  make -r  -f "\EPOC32\BUILD\s60\mw\devicecontentservices\devicediagnostics\GSDeviceDiagnosticsPlugin\DevDiagApp\diagplugins\diagloudspeakerplugin\group\WINSCW.make" RESOURCE CFG=UDEB VERBOSE=-s
-make -s  -r -f "\EPOC32\BUILD\s60\mw\devicecontentservices\devicediagnostics\GSDeviceDiagnosticsPlugin\DevDiagApp\diagplugins\diagloudspeakerplugin\group\DIAGSPEAKERPLUGIN\WINSCW\DIAGSPEAKERPLUGIN.WINSCW" RESOURCEUDEB
-
-
-Creating \epoc32\build\s60\mw\devicecontentservices\devicediagnostics\gsdevicediagnosticsplugin\devdiagapp\diagplugins\diagloudspeakerplugin\group\diagspeakerplugin\winscw\udeb
-  make -r  -f "\EPOC32\BUILD\s60\mw\devicecontentservices\devicediagnostics\GSDeviceDiagnosticsPlugin\DevDiagApp\diagplugins\diagloudspeakerplugin\group\WINSCW.make" RESOURCE CFG=UREL VERBOSE=-s
-make -s  -r -f "\EPOC32\BUILD\s60\mw\devicecontentservices\devicediagnostics\GSDeviceDiagnosticsPlugin\DevDiagApp\diagplugins\diagloudspeakerplugin\group\DIAGSPEAKERPLUGIN\WINSCW\DIAGSPEAKERPLUGIN.WINSCW" RESOURCEUREL
-Creating \epoc32\build\s60\mw\devicecontentservices\devicediagnostics\gsdevicediagnosticsplugin\devdiagapp\diagplugins\diagloudspeakerplugin\group\diagspeakerplugin\winscw\urel
-  make -r  -f "\EPOC32\BUILD\s60\mw\devicecontentservices\devicediagnostics\GSDeviceDiagnosticsPlugin\DevDiagApp\diagplugins\diagloudspeakerplugin\group\ARMV5.make" RESOURCE CFG=UDEB VERBOSE=-s
-make -s  -r -f "\EPOC32\BUILD\s60\mw\devicecontentservices\devicediagnostics\GSDeviceDiagnosticsPlugin\DevDiagApp\diagplugins\diagloudspeakerplugin\group\DIAGSPEAKERPLUGIN\ARMV5\DIAGSPEAKERPLUGIN.ARMV5" RESOURCEUDEB
-Creating \epoc32\build\s60\mw\devicecontentservices\devicediagnostics\gsdevicediagnosticsplugin\devdiagapp\diagplugins\diagloudspeakerplugin\group\diagspeakerplugin\armv5\udeb
-  make -r  -f "\EPOC32\BUILD\s60\mw\devicecontentservices\devicediagnostics\GSDeviceDiagnosticsPlugin\DevDiagApp\diagplugins\diagloudspeakerplugin\group\ARMV5.make" RESOURCE CFG=UREL VERBOSE=-s
-make -s  -r -f "\EPOC32\BUILD\s60\mw\devicecontentservices\devicediagnostics\GSDeviceDiagnosticsPlugin\DevDiagApp\diagplugins\diagloudspeakerplugin\group\DIAGSPEAKERPLUGIN\ARMV5\DIAGSPEAKERPLUGIN.ARMV5" RESOURCEUREL
-Creating \epoc32\build\s60\mw\devicecontentservices\devicediagnostics\gsdevicediagnosticsplugin\devdiagapp\diagplugins\diagloudspeakerplugin\group\diagspeakerplugin\armv5\urel
-  make -r  -f "\EPOC32\BUILD\s60\mw\devicecontentservices\devicediagnostics\GSDeviceDiagnosticsPlugin\DevDiagApp\diagplugins\diagloudspeakerplugin\group\WINSCW.make" TARGET CFG=UDEB VERBOSE=-s
-make -s  -r -f "\EPOC32\BUILD\s60\mw\devicecontentservices\devicediagnostics\GSDeviceDiagnosticsPlugin\DevDiagApp\diagplugins\diagloudspeakerplugin\group\DIAGSPEAKERPLUGIN\WINSCW\DIAGSPEAKERPLUGIN.WINSCW" UDEB
-DiagSpeakerPluginImplementationTable.cpp
-DiagSpeakerPlugin.cpp
-DevDiagSpeakerPlugin.UID.CPP
-mwldsym2.exe: warning: Cannot locate library "MSL_All_Static_MSE_Symbian_D" specified in #pragma comment(lib,...)
-mwldsym2.exe: warning: referenced from uc_dll.obj
-mwldsym2.exe: warning: Option 'Use default libraries' is enabled but linker used
-mwldsym2.exe: warning: runtime library from MW[...]LibraryFiles (MSL_ALL_MSE_Symbian_D.lib);
-mwldsym2.exe: warning: this indicates a potential settings/libraries mismatch
-mwldsym2.exe: warning: Multiply defined symbol: ___get_MSL_init_count in
-mwldsym2.exe: warning: files uc_cwhelp.obj (EDLL.LIB), startup.win32.c.obj (MSL_ALL_MSE_Symbian_D.lib),
-mwldsym2.exe: warning: keeping definition in startup.win32.c.obj
-mwldsym2.exe: warning: Multiply defined symbol: __CleanUpMSL in
-mwldsym2.exe: warning: files uc_cwhelp.obj (EDLL.LIB), startup.win32.c.obj (MSL_ALL_MSE_Symbian_D.lib),
-mwldsym2.exe: warning: keeping definition in startup.win32.c.obj
-mwldsym2.exe: Error creating file: DevDiagSpeakerPlugin.dll
-mwldsym2.exe: The process cannot access the file because it is being used by another process.
-  make -r  -f "\EPOC32\BUILD\s60\mw\devicecontentservices\devicediagnostics\GSDeviceDiagnosticsPlugin\DevDiagApp\diagplugins\diagloudspeakerplugin\group\WINSCW.make" TARGET CFG=UREL VERBOSE=-s
-make -s  -r -f "\EPOC32\BUILD\s60\mw\devicecontentservices\devicediagnostics\GSDeviceDiagnosticsPlugin\DevDiagApp\diagplugins\diagloudspeakerplugin\group\DIAGSPEAKERPLUGIN\WINSCW\DIAGSPEAKERPLUGIN.WINSCW" UREL
-DiagSpeakerPluginImplementationTable.cpp
-DiagSpeakerPlugin.cpp
-..\src\DiagSpeakerPlugin.cpp:1381: warning: variable / argument 'aError' is not used in function
-DevDiagSpeakerPlugin.UID.CPP
-mwldsym2.exe: warning: Cannot locate library "MSL_All_Static_MSE_Symbian" specified in #pragma comment(lib,...)
-mwldsym2.exe: warning: referenced from uc_dll.obj
-mwldsym2.exe: warning: Option 'Use default libraries' is enabled but linker used
-mwldsym2.exe: warning: runtime library from MW[...]LibraryFiles (MSL_ALL_MSE_Symbian_D.lib);
-mwldsym2.exe: warning: this indicates a potential settings/libraries mismatch
-mwldsym2.exe: warning: Multiply defined symbol: ___get_MSL_init_count in
-mwldsym2.exe: warning: files uc_cwhelp.obj (EDLL.LIB), startup.win32.c.obj (MSL_ALL_MSE_Symbian_D.lib),
-mwldsym2.exe: warning: keeping definition in startup.win32.c.obj
-mwldsym2.exe: warning: Multiply defined symbol: __CleanUpMSL in
-mwldsym2.exe: warning: files uc_cwhelp.obj (EDLL.LIB), startup.win32.c.obj (MSL_ALL_MSE_Symbian_D.lib),
-mwldsym2.exe: warning: keeping definition in startup.win32.c.obj
-  make -r  -f "\EPOC32\BUILD\s60\mw\devicecontentservices\devicediagnostics\GSDeviceDiagnosticsPlugin\DevDiagApp\diagplugins\diagloudspeakerplugin\group\ARMV5.make" TARGET CFG=UDEB VERBOSE=-s
-make -s  -r -f "\EPOC32\BUILD\s60\mw\devicecontentservices\devicediagnostics\GSDeviceDiagnosticsPlugin\DevDiagApp\diagplugins\diagloudspeakerplugin\group\DIAGSPEAKERPLUGIN\ARMV5\DIAGSPEAKERPLUGIN.ARMV5" UDEB
-diagspeakerpluginimplementationtable.cpp
-diagspeakerplugin.cpp
-Terminate batch job (Y/N)? Terminate batch job (Y/N)? 
--- a/devicediagnostics/diagplugins/diagloudspeakerplugin/inc/diagspeakerplugin.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,430 +0,0 @@
-/*
-* 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: Implementation of diagnostics components
-*
-*/
-
-
-#ifndef DIAGSPEAKERPLUGIN_H
-#define DIAGSPEAKERPLUGIN_H
-
-#include <AknProgressDialog.h>       // MProgressDialogCallback
-#include <DiagTestPluginBase.h>      // CDiagTestPluginBase
-#include <DiagResultsDatabaseItem.h> // CDiagResultsDatabaseItem::TResult
-#include <mdaaudiosampleplayer.h>    // MMdaAudioPlayerCallback
-#include <AudioOutput.h>             // TAudioOutputPreference
-
-// FORWARD DECLARATIONS
-class CPeriodic;
-class CDiagResultsDbItemBuilder;
-class CEikDialog;
-class CAknNoteDialog;
-class CAknProgressDialog;
-class CEikProgressInfo;
-
-// CLASS DEFINITION
-class CDiagSpeakerPlugin : public CDiagTestPluginBase,
-                           public MProgressDialogCallback,
-                           public MMdaObjectStateChangeObserver,
-                           public MMdaAudioPlayerCallback
-{
-public: // Constructors and destructor
-    /**
-    * Symbian OS two-phased constructor
-    *
-    * @return Timer Test Plugin
-    */
-    static MDiagPlugin* NewL( TAny* aInitParams );
-
-    /**
-    * Destructor
-    */
-    virtual ~CDiagSpeakerPlugin();
-
-
-private: // private functions
-    /**
-    * C++ default constructor.
-    */
-    CDiagSpeakerPlugin( CDiagPluginConstructionParam* aInitParams  );
-
-    /**
-    * Symbian OS default constructor.
-    *
-    */
-    void ConstructL();
-
-    /**
-    * Start Audio Recording with Dialogs
-    *
-    */
-    void StartRecordL();
-
-    /**
-    * Start Audio Playing with Dialogs
-    *
-    */
-    void StartPlayL();
-
-    /**
-    * Audio Recording
-    *
-    */
-    void RecordingL();
-
-    /**
-    * Audio Playing
-    *
-    */
-    void PlayingL();
-
-    /**
-    * Actions after Recording has finished
-    *
-    */
-    void AfterRecordL();
-
-    /**
-    * Actions after Playing has finished
-    *
-    */
-    void AfterPlayL();
-
-    /**
-    * Invoke CMdaAudioRecorderUtility::RecordL to start record
-    *
-    */
-    void RecordL();
-
-    /**
-    * Invoke CMdaAudioRecorderUtility::PlayL to start play
-    *
-    */
-    void PlayL();
-
-    /**
-    * Set Audio to Current Output
-    *
-    */
-    void SaveAudioOutput();
-
-    /**
-    * Set Audio to previous Output
-    *
-    */
-    void RestoreAudioOutputL();
-
-    /**
-    * Clean up instance of CPeriodic
-    *
-    */
-    void ClosePeriodic();
-
-    /**
-    * Check whether Recorded file exist
-    */
-    TBool CheckRecordFile();
-
-    /**
-    * Delete Recorded file
-    */
-    void DeleteRecordFile();
-
-    /**
-    * Check whether there are enough space to record
-    *
-    * @return ETure when there is enough free space
-    */
-    TBool EnoughFreeSpace();
-
-    /**
-    * Set Dialog has dismissed
-    *
-    * @param aDismissed - ETrue  for Dialog dismissed
-    *                   - EFalse for Dialog has not dismissed
-    */
-    void SetProgressDismissed( TBool aDismissed );
-
-    /**
-    * Check whether Dialog has dismissed
-    *
-    * @return ETure when Dialog has dismissed
-    */
-    TBool ProgressDismissed() const;
-
-    /**
-    * Ask Cancel all Test
-    *
-    * @param  aButtonId - reference of button id pressed
-    * @return ETure when current state is valid
-    */
-    TBool AskCancelExecutionL( TInt& aButtonId );
-
-    /**
-    * Display Confirmation Query
-    *
-    * @param aResourceId - Resource ID of Confimation Query
-    *
-    */
-    TBool ShowConfQueryL( TInt aResourceId, TInt &aButtonId );
-
-    /**
-    * Display Message Query
-    *
-    * @param aResourceId - Resource ID of Message Query
-    * @param aButtonId   - Reference of button id to exit
-    */
-    TBool ShowMessageQueryL( TInt aResourceId, TInt &aButtonId );
-
-    /**
-    * Display Progress Dialog
-    *
-    * @param aResourceId - Resource ID of Progress
-    * @param aFinalValue - Final value of Progress Note to display
-    */
-    void ShowProgressNoteL( TInt aResourceId, TInt aFinalValue );
-
-    /**
-    * Callback function to update Progress Dialog
-    *
-    * @param aThis - Object to receive call back
-    * @return 0 on finish
-    */
-    static TInt CallbackIncrementProgressNoteL( TAny* aThis );
-
-    /**
-    * Called from CallbackIncrementProgressNoteL
-    *  Actual Function to update Progress Dialog
-    *
-    * @return 0 on finish
-    */
-    TInt UpdateProgressNoteL();
-
-
-private: // From CDiagTestPluginBase
-
-    /**
-    * @see CDiagTestPluginBase::Visible()
-    */
-    virtual TBool IsVisible() const;
-
-    /**
-    * @see CDiagTestPluginBase::RunMode()
-    */
-    virtual TRunMode RunMode() const;
-
-    /**
-    * @see CDiagTestPluginBase::TotalSteps()
-    */
-    virtual TUint TotalSteps() const;
-
-    /**
-    * @see CDiagTestPluginBase::GetPluginNameL
-    */
-    virtual HBufC* GetPluginNameL( TNameLayoutType aLayoutType ) const;
-
-    /**
-    * @see CDiagTestPluginBase::Uid
-    */
-    virtual TUid Uid() const;
-
-    /**
-    * @see CDiagTestPluginBase::TestSessionBeginL
-    */
-    virtual void TestSessionBeginL( MDiagEngineCommon& aEngine,
-                                    TBool aSkipDependencyCheck,
-                                    TAny* aCustomParams );
-
-    /**
-    * @see CDiagTestPluginBase::TestSessionEndL
-    */
-    virtual void TestSessionEndL( MDiagEngineCommon& aEngine,
-                                  TBool aSkipDependencyCheck,
-                                  TAny* aCustomParams );
-
-    /**
-    * Handle plug-in execution.
-    *   @see CDiagTestPluginBase::DoRunTestL()
-    */
-    virtual void DoRunTestL();
-
-    /**
-    * Handle plug-in execution stop and clean up
-    *   @see CDiagTestPluginBase::DoStopAndCleanupL()
-    */
-    void DoStopAndCleanupL();
-
-
-private: // from CActive
-    /**
-    * Handle active object completion event
-    */
-    virtual void RunL();
-
-    /**
-    * Handle cancel
-    */
-    virtual void DoCancel();
-    
-    enum TState
-    {
-    EStateUnknown = 0,
-    EStateFailed,
-    EStateCancelled,
-    EStateSkipped,
-    EStateIdle,
-    EStateRecorded,
-    EStatePlayed,
-    EStateUserQuery
-    };
-
-
-private: // from MProgressDialogCallback
-    /**
-    * Callback method Get's called when a dialog is dismissed
-    *
-    * @param aButtonId - indicate which button made dialog to dismiss
-    */
-    virtual void DialogDismissedL( TInt aButtonId );
-
-
-private: // from MMdaObjectStateChangeObserver
-    /**
-    * Handling the change of state of an audio data sample object
-    *
-    * @param aObject        - indicate which button made dialog to dismiss
-    * @param aPreviousState - previous state
-    * @param aCurrentState  - current state
-    * @param aErrorCode     - error code
-    */
-    virtual void MoscoStateChangeEvent(
-        CBase *aObject,
-        TInt aPreviousState,
-        TInt aCurrentState,
-        TInt aErrorCode);
-
-private: // MMdaAudioPlayerCallback
-     /**
-     * Defines required client behaviour when an attempt to open and initialise an audio sample has completed
-     *
-     * @param aError     - The status of the audio sample after initialisation
-     * @param aDuration  - Duration of the audio sample
-     */
-    virtual void MapcInitComplete(TInt aError, const TTimeIntervalMicroSeconds& aDuration);
-
-    /**
-     * Defines required client behaviour when an attempt to playback an audio sample has completed
-     *
-     * @param aError  - The status of playback
-     */
-    virtual void MapcPlayComplete(TInt aError);
-    
-    void SetAudioEvent(TState aState);
-
-private: // Data
-    /**
-     * Tells session is Valid
-     */
-    TBool iSessionValid;
-
-    /**
-     * Indicate Progress has dismissed
-     */
-    TBool iProgressDismissed;
-
-    /**
-     * AudioState for Recording/Playing
-     */
-    TInt iAudioState;
-
-    /**
-     * Recorder for Recording Audio
-     * OWN
-     */
-    CMdaAudioRecorderUtility* iRecorder;
-
-    /**
-     * Player for Playing Audio
-     * OWN
-     */
-    CMdaAudioPlayerUtility* iAudioPlayer;
-
-    /**
-     * Maxmium Size of Record File
-     */
-    TInt iRecordFileSize;
-
-    /**
-     * Path of Record File
-     */
-    TFileName iRecordFilePath;
-
-    /**
-     * Progress Dialog
-     * OWN
-     */
-    CAknProgressDialog* iProgressDialog;
-
-    /**
-     * Info for Progress Dialog
-     * OWN
-     */
-    CEikProgressInfo* iProgressInfo;
-
-    /**
-     * Timer for Update Progress
-     * OWN
-     */
-    CPeriodic* iPeriodic;
-
-    /**
-     * Duration of Audio in usec
-     */
-    TTimeIntervalMicroSeconds iMaxDurationMicroSec;
-
-    /**
-     * Position of Audio in usec
-     */
-    TTimeIntervalMicroSeconds iPositionMicroSec;
-
-    /**
-     * Maximum time(sec) to record
-     */
-    TInt iFinalValue;
-
-    /**
-     * Previous Audio Output
-     */
-    CAudioOutput::TAudioOutputPreference iPrevAudioOutput;
-
-    /**
-     * Current Audio Output
-     */
-    CAudioOutput::TAudioOutputPreference iOutput;
-
-    /**
-     * Audio Output to route
-     * OWN
-     */
-    CAudioOutput* iAudioOutput;
-    
-    /*
-    * State of the Audio Plugin.
-    */
-    TState iState;
-    };
-
-#endif //DIAGSPEAKERPLUGIN_H
-
-// End of File
--- a/devicediagnostics/diagplugins/diagloudspeakerplugin/inc/diagspeakerplugin.hrh	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-/*
-* 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:  Contains common definitions for menu id:s
-*
-*/
-
-
-#ifndef DIAGSPEAKERPLUGIN_HRH
-#define DIAGSPEAKERPLUGIN_HRH
-
-#define DIAG_SPEAKER_PLUGIN_UID 0x2000E58F
-
-enum TSpeakerTestCBA
-    {
-    ECBACmdRecord = 0x6300,
-    ECBACmdCancel,
-    ECBACmdContinue,
-    ECBACmdSkip,
-    ECBACmdCustomNo
-    };
-
-#endif //  DIAGSPEAKERPLUGIN_HRH
-
-//End of File
--- a/devicediagnostics/diagplugins/diagloudspeakerplugin/inc/diagspeakertestprivatecrkeys.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-/*
-* 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:  Private Central Repository keys.
-*
-*/
-
-
-#ifndef DIAGSPEAKERTESTPRIVATECRKEYS_H
-#define DIAGSPEAKERTESTPRIVATECRKEYS_H
-
-//  INCLUDES
-
-#include <e32std.h>
-
-// =============================================================================
-// Audio Recorder 
-// =============================================================================
-
-const TUid KCRUidDiagSpeakerTestPlugin = { 0x2000E58E };
-	
-
-/**
- *
- * The value assigned to this key is the recording time in second
- * Available options:   
- * Default value: 5
-*/
-const TUint32 KAudioRecorderRecordingTime = 0x00000001;
-
-/**
- *
- * The value assigned to this key is the full path where the audio file is stored
- * Available options:   
- * Default value: c:\system\temp\record.wav
-*/
-const TUint32 KAudioRecorderFilePath = 0x00000002;
-
-
-
-
-#endif      // DIAGSPEAKERTESTPRIVATECRKEYS_H
-
-// End of File
-
-
-
--- a/devicediagnostics/diagplugins/diagloudspeakerplugin/loc/diagspeakerplugin.loc	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,112 +0,0 @@
-/*
-* 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:  Localization strings for DiagSpeakerPlugin.
-*
-*/
-
-
-// d:Text of a list item in Application
-// l:list_single_graphic_heading_pane_t1_cp2
-// r:3.1
-//
-#define qtn_diag_lst_speakerphone "Loudspeaker test"
-
-// d:Text of a list item in Application
-// l:title_pane_t2/opt12
-// r:3.1
-//
-//#define qtn_diag_title_test_speakerphone "Loudspeaker test" // LVT Change
-
-// d:Message query prompt to start plugin (text) 
-// l:popup_info_list_pane_t1
-// r:3.1
-//
-#define qtn_diag_msg_speakerphone "The following test will check loudspeaker functionality"
-
-// d:Message query prompt to start recording (header) 
-// l:heading_pane_t1
-// r:3.1
-//
-#define qtn_diag_msg_title_record_speakerphone "Record a soundclip"
-
-// d:Message query prompt to start recording (header) 
-// l:popup_info_list_pane_t1
-// r:3.1
-//
-#define qtn_diag_msg_record_speakerphone "Please record the following phrase 'Hello, testing, 1, 2, 3'"
-
-// d:Progress Note during recording 
-// l:popup_note_wait_window
-// r:3.1
-//
-#define qtn_diag_note_record_speakerphone "Repeat: 'Hello, testing, 1,2,3'\nThen press Stop."
-
-// d:Confimation query to start playing 
-// l:popup_note_window
-// r:3.1
-//
-#define qtn_diag_conf_start_play_speakerphone "Press play to listen to the recording via the loudspeaker"
-
-
-// d:Progress Note during playing 
-// l:popup_note_wait_window
-// r:3.1
-//
-
-#define qtn_diag_note_play_speakerphone "Playing recording via loudspeaker"
-
-// d:Confimation query to ask heard voice 
-// l:popup_note_window
-// r:3.1
-//
-#define qtn_diag_conf_speakerphone "Was the recording played back correctly?"
-
-// d:Confimation query to ask repeat 
-// l:popup_note_window
-// r:3.1
-//
-#define qtn_diag_conf_repeat_speakerphone "Do you want to repeat the loudspeaker test?"
-
-
-// d:List item of test
-// l:list_single_graphic_pane_t1
-// r:3.1
-//
-//#define qtn_diag_lst_test_speakerphone  "Test Speakerphone"  // LVT Change
-
-// d:Screen title of test 
-// l:list_single_graphic_pane_t1
-// r:3.1
-//
-//#define qtn_diag_title_test_speakerphone "Loudspeaker test"  // LVT Change
-
-// d:Header for information
-// l:heading_pane_t1
-// r:3.1
-//
-#define qtn_diag_msg_title_speakerphone "Loudspeaker test"
-
-//d:Failed result text
-//l:popup_info_list_pane_t1
-//r:5.0
-//
-#define qtn_diag_conf_test_failed_speakerphone "Loudspeaker test"
-
-//d:Softkey text.
-//l:control_pane_t1/opt7 
-//r:5.0
-//
-#define qtn_diag_softk_skip "Skip"
-
-// End of File
--- a/devicediagnostics/diagplugins/diagloudspeakerplugin/rom_files/devdiagspeakerplugin.iby	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-/*
-* 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:  Image description file for project Audio Plugin
-*
-*/
-
-
-#ifndef DEVDIAG_SPEAKER_PLUGIN_IBY
-#define DEVDIAG_SPEAKER_PLUGIN_IBY
-
-#ifdef FF_DEVICE_DIAGNOSTICS_APP 
-
-#include <data_caging_paths_for_iby.hrh>
-
-ECOM_PLUGIN( devdiagspeakerplugin.dll, devdiagspeakerplugin.rsc )
-
-#endif
-
-#endif // DEVDIAG_SPEAKER_PLUGIN_IBY
-
-// end of file
--- a/devicediagnostics/diagplugins/diagloudspeakerplugin/rom_files/devdiagspeakerplugin_resources.iby	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-/*
-* 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:  Image description file for resources project Audio Plugin
-*
-*/
-
-
-#ifndef DEVDIAG_SPEAKER_PLUGIN_RESOURCES_IBY
-#define DEVDIAG_SPEAKER_PLUGIN_RESOURCES_IBY
-
-#ifdef FF_DEVICE_DIAGNOSTICS_APP 
-
-#include <data_caging_paths_for_iby.hrh>
-
-data=DATAZ_\RESOURCE_FILES_DIR\devdiagspeakerpluginrsc.rsc RESOURCE_FILES_DIR\devdiagspeakerpluginrsc.rsc
-
-#endif
-
-#endif // DEVDIAG_SPEAKER_PLUGIN_RESOURCES_IBY
-
-// end of file
--- a/devicediagnostics/diagplugins/diagloudspeakerplugin/src/diagspeakerplugin.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1578 +0,0 @@
-/*
-* 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:  Class Definition of CDiagSpeakerPlugin
-*
-*/
-
-
-// INCLUDE FILES
-
-// From System
-#include <AknQueryDialog.h>            // CAknQueryDialog
-#include <aknmessagequerydialog.h>     // CAknMessageQueryDialog
-#include <AknProgressDialog.h>         // CAknProgressDialog
-#include <eikprogi.h>                  // CEikProgressInfo
-#include <eikbtgpc.h>                  // CEikButtonGroupContainer
-#include <AudioPreference.h>           // KAudioPriorityRecording
-#include <mdaaudiosampleeditor.h>      // CMdaAudioRecorderUtility
-#include <mdaaudiosampleplayer.h>      // CMdaAudioPlayerUtility
-#include <StringLoader.h>              // StringLoader
-#include <DiagTestObserver.h>          // MDiagTestObserver
-#include <DiagTestExecParam.h>         // TDiagTestExecParam
-#include <DiagEngineCommon.h>          // MDiagEngine
-#include <DiagPluginPool.h>            // CDiagPluginPool
-#include <DiagResultsDbItemBuilder.h>  // CDiagResultsDbItemBuilder
-#include <DiagResultDetailBasic.h>     // CDiagResultDetailBasic
-#include <DiagFrameworkDebug.h>        // LOGSTRING
-#include <DiagCommonDialog.h>          // for EDiagCommonDialogConfirmCancelAll
-
-// For Central Repository
-#include <centralrepository.h>
-#include "diagspeakertestprivatecrkeys.h"
-
-// Speaker Plugin Headerfile
-#include "diagspeakerplugin.h"       // CDiagSpeakerPlugin
-#include "diagspeakerplugin.hrh"     // Button Id defined
-#include <devdiagspeakerpluginrsc.rsg>  // Resource Definitions
-#include <avkon.hrh>
-
-
-// Local Macro
-#define ASSERT_ALWAYS(c) __ASSERT_ALWAYS((c), User::Invariant())
-
-// Local Data Types
-enum TSpeakerSteps
-    {
-    EStepTestTitle,
-    EStepAskRecord,
-    EStepProgressRecord,
-    EStepAskPlay,
-    EStepProgressPlay,
-    EStepAskHeard,
-    EStepAskRepeat,
-    ESpeakerPluginTotalSteps
-    };
-
-// To Exit from Query it should be EAknSoftkeyOk
-// can't include in .hrh because it requires <eikon.rh>
-// leads compilation fail
-enum TSpeakerExitCBA
-    {
-    ECBACmdPlay  = EAknSoftkeyOk,
-    ECBACmdStop  = EAknSoftkeyOk,
-    ECBACmdStart = EAknSoftkeyOk
-    };
-
-// Local Constants
-const TInt KFinished      = 0;
-const TInt KMinFileSize   = 1024;
-const TInt KSamplingRate  = 8192;
-const TInt KStereo        = 2;
-const TInt KFive          = 5;
-const TInt KMicroSecond   = 1000*1000;
-const TInt KProgressDelay = 200000;
-const TInt KAudioServerRequestTimeoutValue = 16 * KMicroSecond;
-
-const TInt KProgressFinished    =  0;
-const TInt KProgressNotFinished =  1;
-const TUid KDiagSpeakerPluginUid  = { DIAG_SPEAKER_PLUGIN_UID };
-
-_LIT( KDiagSpeakerPluginResourceFileName, "z:DevDiagSpeakerPluginRsc.rsc" );
-_LIT( KDiagSpeakerPluginCategory,"DevDiagSpeakerPlugin" );
-
-const CAudioOutput::TAudioOutputPreference KTargetOutput = CAudioOutput::EPublic;
-
-
-// ========================= MEMBER FUNCTIONS ================================
-// ---------------------------------------------------------------------------
-// CDiagSpeakerPlugin::NewL()
-//
-// Symbian OS default constructor
-// ---------------------------------------------------------------------------
-MDiagPlugin* CDiagSpeakerPlugin::NewL( TAny* aInitParams )
-    {
-    CDiagSpeakerPlugin* self;
-    CDiagPluginConstructionParam* param;
-
-    ASSERT_ALWAYS( aInitParams );
-
-    param = static_cast<CDiagPluginConstructionParam*>( aInitParams );
-    CleanupStack::PushL( param );
-    self  = new( ELeave ) CDiagSpeakerPlugin ( param );
-    CleanupStack::Pop( param );
-
-
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self ); // self
-
-    return self;
-    }
-
-// ----------------------------------------------------------------------------
-// CDiagSpeakerPlugin::~CDiagSpeakerPlugin
-//
-// Destructor
-// ----------------------------------------------------------------------------
-CDiagSpeakerPlugin::~CDiagSpeakerPlugin()
-    {
-    // Delete resources allocated during construction.
-    // Nothing to do since no new resource is allocated in constructor.
-    }
-
-// ----------------------------------------------------------------------------
-// CDiagSpeakerPlugin::CDiagSpeakerPlugin()
-//
-// Constructor
-// ----------------------------------------------------------------------------
-//
-CDiagSpeakerPlugin::CDiagSpeakerPlugin( CDiagPluginConstructionParam* aParam )
-    :    CDiagTestPluginBase( aParam )
-    {
-    }
-
-// ---------------------------------------------------------------------------
-// CDiagSpeakerPlugin::ConstructL()
-//
-// Symbian OS two-phased constructor
-// ---------------------------------------------------------------------------
-void CDiagSpeakerPlugin::ConstructL()
-    {
-    LOGSTRING( "CDiagSpeakerPlugin::ConstructL: Plugin created. IN" )
-
-    BaseConstructL ( KDiagSpeakerPluginResourceFileName );
-
-    TInt recording_time;
-
-    // Open Central Repository
-    CRepository* audioRecorderRepository = CRepository::NewL( KCRUidDiagSpeakerTestPlugin );
-    CleanupStack::PushL( audioRecorderRepository );
-
-    // Read File Path from CR
-    iRecordFilePath.FillZ();
-    User::LeaveIfError(
-        audioRecorderRepository->Get( KAudioRecorderFilePath, iRecordFilePath) );
-
-    // Read File Size from CR
-    User::LeaveIfError(
-        audioRecorderRepository->Get( KAudioRecorderRecordingTime , recording_time) );
-
-    iRecordFileSize = (recording_time * KSamplingRate * KStereo);    
-
-    CleanupStack::PopAndDestroy( audioRecorderRepository );
-    audioRecorderRepository = NULL;
-
-    // Set Audio Output
-    iOutput = KTargetOutput;
-
-    LOGSTRING( "CDiagSpeakerPlugin::ConstructL: Plugin created. OUT" )
-    }
-
-// ---------------------------------------------------------------------------
-// CDiagSpeakerPlugin::StartRecordL
-// ---------------------------------------------------------------------------
-//
-void CDiagSpeakerPlugin::StartRecordL()
-    {
-    LOGSTRING( "CDiagSpeakerPlugin::DoRunTest() IN" )
-    TBool       goNext;
-
-    // Delete Record File
-    DeleteRecordFile();
-
-    // Check Free Space
-    if ( !EnoughFreeSpace() )
-        {
-        CompleteTestL( CDiagResultsDatabaseItem::ENotPerformed );
-        return;
-        }
-
-    // Show Init Message Query
-    do
-        {
-        goNext = ETrue;
-
-        // Check session before launch before dialog starts
-        if ( !iSessionValid )
-            {
-            LOGSTRING( "CDiagSpeakerPlugin::StartRecordL - !iSessionValid 1" )
-            return;
-            }
-
-        // Report current Progress to Engine
-        ReportTestProgressL( EStepTestTitle );
-
-        // Show Message Query Title
-        TInt  buttonId;
-        TBool result = EFalse;
-
-        result = ShowMessageQueryL( R_MESSAGEQUERY_TITLE, buttonId );
-
-        // Check session is valid after dialog dismissed
-        if ( !result )
-            {
-            LOGSTRING( "CDiagSpeakerPlugin::StartRecordL - !iSessionValid 2" )
-            return;
-            }
-
-        // 1.1 Case for press Skip
-        if ( buttonId == ECBACmdSkip )
-            {
-            LOGSTRING( "CDiagSpeakerPlugin::StartRecordL: Skip has pressed" );
-            // ADO & Platformization Changes
-            TInt   cancelButtonId;
-
-            //cancelResult = AskCancelExecutionL( cancelButtonId );
-			CAknDialog* dlg = ExecutionParam().Engine().
-							  CreateCommonDialogLC( EDiagCommonDialogConfirmSkipAll, NULL );
-							  
-            if ( !RunWaitingDialogL( dlg, cancelButtonId ) )
-                {
-                LOGSTRING( "CDiagSpeakerPlugin::StartPlayL - !iSessionValid 3" )
-                return;
-                }
-
-			if(cancelButtonId)
-			return;
-			else
-			goNext = EFalse;          
-            
-
-			// ADO & Platformization Changes
-            //CompleteTestL( CDiagResultsDatabaseItem::ESkipped );
-            //return;
-            }
-
-        // 1.2 case for press Cancel
-        else if ( buttonId == ECBACmdCancel )
-            {
-            LOGSTRING( "CDiagSpeakerPlugin::StartRecordL: Cancel has pressed" )
-            CompleteTestL( CDiagResultsDatabaseItem::ESkipped );
-            return;
-            }
-        }
-    while ( goNext == EFalse );
-
-
-    // Show Record Message Query
-    do
-        {
-        goNext = ETrue;
-
-        // Check session before launch before dialog starts
-        if ( !iSessionValid )
-            {
-            LOGSTRING( "CDiagSpeakerPlugin::StartRecordL - !iSessionValid 4" )
-            return;
-            }
-
-        // Report current Progress to Engine
-        ReportTestProgressL( EStepAskRecord );
-
-        // Show Message Query Title
-        TInt  buttonId;
-        TBool result = EFalse;
-
-        result = ShowMessageQueryL( R_MESSAGEQUERY_ASK_RECORD, buttonId );
-
-        // Check session is valid after dialog dismissed
-        if ( !result )
-            {
-            LOGSTRING( "CDiagSpeakerPlugin::StartRecordL - !iSessionValid 5" )
-            return;
-            }
-
-        // 2.2 Case for press Skip
-        if ( buttonId == ECBACmdStart )
-            {
-            LOGSTRING( "CDiagSpeakerPlugin::StartRecordL: Start has pressed" )
-            RecordL();
-            return;
-            }
-        else if ( buttonId == ECBACmdSkip )
-            {
-            LOGSTRING( "CDiagSpeakerPlugin::StartRecordL: Skip has pressed" )
-            CompleteTestL( CDiagResultsDatabaseItem::ESkipped );
-            return;
-            }
-
-        // 2.3 case for press Cancel
-        else if ( buttonId == ECBACmdCancel )
-            {
-            LOGSTRING( "CDiagSpeakerPlugin::StartRecordL: Cancel has pressed" )
-
-            TInt  cancelButtonId;
-            TBool cancelResult = EFalse;
-
-            cancelResult = AskCancelExecutionL( cancelButtonId );
-
-            if ( !cancelResult )
-                {
-                LOGSTRING( "CDiagSpeakerPlugin::StartPlayL - !iSessionValid 6" )
-                return;
-                }
-            
-            if(cancelButtonId == EAknSoftkeyYes)
-                {
-                CompleteTestL( CDiagResultsDatabaseItem::ECancelled );
-                return;
-                }
-            else if(cancelButtonId)
-                {
-                return;
-                }
-            else
-                {
-                goNext = EFalse;
-                }
-            /*
-            switch ( cancelButtonId )
-                {
-                case EAknSoftkeyYes:
-                	CompleteTestL( CDiagResultsDatabaseItem::ECancelled );	 //Added for NTEI-7EZ96S
-                    return;
-                default:
-                    goNext = EFalse;
-                    break;
-                }
-                */
-            }
-        }
-    while ( goNext == EFalse );
-
-    }
-
-// ---------------------------------------------------------------------------
-// CDiagSpeakerPlugin::StartPlayL
-// ---------------------------------------------------------------------------
-//
-void CDiagSpeakerPlugin::StartPlayL()
-    {
-    LOGSTRING( "CDiagSpeakerPlugin::StartPlayL() IN" )
-    TBool goNext;
-
-
-    // Check Record File
-    if ( CheckRecordFile() == EFalse )
-        {
-        LOGSTRING( "CDiagSpeakerPlugin::StartPlayL() CheckRecordFile == EFalse" )
-        CompleteTestL( CDiagResultsDatabaseItem::ENotPerformed );
-        return;
-        }
-
-    do
-        {
-        goNext = ETrue;
-
-        // Check session before launch before dialog starts
-        if ( !iSessionValid )
-            {
-            LOGSTRING( "CDiagSpeakerPlugin::StartPlayL - !iSessionValid 1" )
-            return;
-            }
-
-        // Report current Progress to Engine
-        ReportTestProgressL( EStepAskPlay );
-
-        // Show ConfQuery to ask Play
-        TInt  buttonId;
-        TBool result = EFalse;
-
-        result = ShowConfQueryL( R_CONFQUERY_ASK_PLAY, buttonId );
-
-        // Check session is valid after dialog dismissed
-        if ( !result )
-            {
-            LOGSTRING( "CDiagSpeakerPlugin::StartPlayL - !iSessionValid 2" )
-            return;
-            }
-
-        // 1.1 Case for press Skip
-        if ( buttonId == ECBACmdSkip )
-            {
-            LOGSTRING( "CDiagSpeakerPlugin::StartPlayL: Skip has pressed" )
-            CompleteTestL( CDiagResultsDatabaseItem::ESkipped );
-            return;
-            }
-
-        // 1.2 case for press Cancel
-        else if ( buttonId == ECBACmdCancel )
-            {
-            LOGSTRING( "CDiagSpeakerPlugin::StartPlayL: Cancel has pressed" )
-            TInt  cancelButtonId;
-            TBool cancelResult = EFalse;
-
-            cancelResult = AskCancelExecutionL( cancelButtonId );
-
-            if ( !cancelResult )
-                {
-                LOGSTRING( "CDiagSpeakerPlugin::StartPlayL - !iSessionValid 3" )
-                return;
-                }
-            
-            
-            if(cancelButtonId == EAknSoftkeyYes)
-                {
-                CompleteTestL( CDiagResultsDatabaseItem::ECancelled );
-                return;
-                }
-            else if(cancelButtonId)
-                {
-                return;
-                }
-            else
-                {
-                goNext = EFalse;
-                }
-            /*
-
-            switch ( cancelButtonId )
-                {
-                case EAknSoftkeyYes:
-                    iState = EStateCancelled;
-                    SetActive();
-            		TRequestStatus* status = &iStatus;
-            		User::RequestComplete(status, KErrNone);
-                	//CompleteTestL( CDiagResultsDatabaseItem::ECancelled );	 //Commented by Ganesh
-                    return;
-                default:
-                    goNext = EFalse;
-                    break;
-                }
-             */
-            }
-        // 1.3 case for press Play
-        else if ( buttonId == ECBACmdPlay )
-            {
-            LOGSTRING( "CDiagSpeakerPlugin::StartPlayL: Play has pressed" )
-            iState = EStateRecorded;
-            PlayL();
-            }
-        } while ( !goNext );
-    }
-
-// ---------------------------------------------------------------------------
-// CDiagSpeakerPlugin::RecordingL
-// ---------------------------------------------------------------------------
-//
-void CDiagSpeakerPlugin::RecordingL()
-    {
-    LOGSTRING( "CDiagSpeakerPlugin::RecordingL IN" )
-    const TTimeIntervalMicroSeconds     position   = 0;
-
-    iFinalValue = iRecordFileSize / KSamplingRate / KStereo;
-
-    ReportTestProgressL( EStepProgressRecord );
-    ShowProgressNoteL( R_PROGRESS_NOTE_RECORDING, iFinalValue );
-
-    iRecorder->SetPriority(
-        KAudioPriorityAlarm + 1,
-        TMdaPriorityPreference( KAudioPrefVoiceRec )
-        );
-
-    iRecorder->SetPosition( position );
-    iRecorder->CropL();
-    iRecorder->SetMaxWriteLength( iRecordFileSize );
-
-    ResetWatchdog( KAudioServerRequestTimeoutValue, CDiagResultsDatabaseItem::EFailed ); 
-    iRecorder->RecordL(); // MoscoStateChangeEvent() will be called as return
-    LOGSTRING( "CDiagSpeakerPlugin::RecordingL OUT" )
-    }
-
-// ---------------------------------------------------------------------------
-// CDiagSpeakerPlugin::PlayingL
-// ---------------------------------------------------------------------------
-//
-void CDiagSpeakerPlugin::PlayingL()
-    {
-    LOGSTRING( "CDiagSpeakerPlugin::PlayingL IN" )
-
-    TInt64  interval   = 0;
-    TInt    finalValue = 0;
-
-    interval             = iMaxDurationMicroSec.Int64() / KMicroSecond;
-    finalValue           = ((I64INT(interval)));
-    iFinalValue          = finalValue;
-
-    // Save Audio Output
-    SaveAudioOutput();
-
-    ReportTestProgressL( EStepProgressPlay );
-    ShowProgressNoteL( R_PROGRESS_NOTE_PLAYING, iFinalValue );
-
-    iAudioPlayer->SetPosition( iPositionMicroSec );
-    iAudioPlayer->Play();
-
-    LOGSTRING( "CDiagSpeakerPlugin::PlayingL OUT" )
-    }
-
-// ---------------------------------------------------------------------------
-// CDiagSpeakerPlugin::AfterRecordL
-// ---------------------------------------------------------------------------
-//
-void CDiagSpeakerPlugin::AfterRecordL()
-    {
-    StartPlayL();
-    }
-
-// ---------------------------------------------------------------------------
-// CDiagSpeakerPlugin::AfterPlayL
-// ---------------------------------------------------------------------------
-//
-void CDiagSpeakerPlugin::AfterPlayL()
-    {
-    LOGSTRING( "CDiagSpeakerPlugin::AfterPlayL IN" )
-
-
-    // Check session before launch before dialog starts
-    if ( !iSessionValid )
-        {
-        LOGSTRING( "CDiagSpeakerPlugin::AfterPlayL - !iSessionValid 1.1" )
-        return;
-        }
-
-    // Report current Progress to Engine
-    ReportTestProgressL( EStepAskHeard );
-
-    // Show ConfQuery to ask Heard
-    TInt  buttonId;
-    TBool result = EFalse;
-    result = ShowConfQueryL( R_CONFQUERY_ASK_HEARD, buttonId );
-
-    // Check session is valid after dialog dismissed
-    if ( !result )
-        {
-        LOGSTRING( "CDiagSpeakerPlugin::AfterPlayL - !iSessionValid 1.2" )
-        return;
-        }
-
-    // Report Success on Yes
-    if ( buttonId == EAknSoftkeyYes )
-        {
-        LOGSTRING( "CDiagSpeakerPlugin::AfterPlayL - Yes has pressed - return ESuccess" )
-        CompleteTestL( CDiagResultsDatabaseItem::ESuccess );
-        return;
-        }
-    else if ( buttonId != ECBACmdCustomNo )
-        {
-        //return;  // ADO & Platformization Changes
-        }
-
-    // Check session before launch before dialog starts
-    if ( !iSessionValid )
-        {
-        LOGSTRING( "CDiagSpeakerPlugin::AfterPlayL - !iSessionValid 2.1" )
-        return;
-        }
-
-    // Report current Progress to Engine
-    ReportTestProgressL( EStepAskRepeat );
-
-    // Show ConfQuery to ask Heard
-    result = ShowConfQueryL( R_CONFQUERY_ASK_REPEAT, buttonId );
-
-   // Check session is valid after dialog dismissed
-    if ( !result )
-        {
-        LOGSTRING( "CDiagSpeakerPlugin::AfterPlayL - !iSessionValid 2.2" )
-        return;
-        }
-
-    // Report Success on Yes
-    if ( buttonId == EAknSoftkeyYes )
-        {
-        LOGSTRING( "CDiagSpeakerPlugin::AfterPlayL - Yes has pressed - Start Record Again" )
-
-        StartRecordL();
-        return;
-        }
-    else if ( buttonId == ECBACmdCustomNo || buttonId == EAknSoftkeyNo )
-        {
-        LOGSTRING( "CDiagSpeakerPlugin::AfterPlayL - No has pressed - Start Record Again" )
-        CompleteTestL( CDiagResultsDatabaseItem::EFailed );
-        }
-    else
-        {
-        CompleteTestL( CDiagResultsDatabaseItem::EFailed );
-        return;
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// CDiagSpeakerPlugin::RecordL
-// ---------------------------------------------------------------------------
-//
-void CDiagSpeakerPlugin::RecordL()
-    {
-    LOGSTRING( "CDiagSpeakerPlugin::RecordL IN" )
-
-    iAudioState = CMdaAudioRecorderUtility::ERecording;
-    
-    iState = EStateUnknown;
-
-    if ( iRecorder )
-        {
-        ResetWatchdog( KAudioServerRequestTimeoutValue, CDiagResultsDatabaseItem::EFailed );  
-        iRecorder->OpenFileL( iRecordFilePath ); // MoscoStateChangeEvent() will be called as return
-        }
-
-    LOGSTRING( "CDiagSpeakerPlugin::RecordL OUT" )
-    }
-
-// ---------------------------------------------------------------------------
-// CDiagSpeakerPlugin::PlayL
-// ---------------------------------------------------------------------------
-//
-void CDiagSpeakerPlugin::PlayL()
-    {
-    LOGSTRING( "CDiagSpeakerPlugin::PlayL IN" )
-    iAudioState = CMdaAudioRecorderUtility::EPlaying;
-
-    // Save Current Audio Output
-    LOGSTRING( "CDiagSpeakerPlugin::PlayL:SaveAudioOutput" )
-
-    // Invoke Play
-    if ( iAudioPlayer )
-        {
-        LOGSTRING( "CDiagSpeakerPlugin::PlayL:OpenFileL(iRecordFilePath);" )
-        ResetWatchdog( KAudioServerRequestTimeoutValue, CDiagResultsDatabaseItem::EFailed ); 
-        iAudioPlayer->OpenFileL( iRecordFilePath ); // MapcInitComplete() will be called as return
-        }
-
-    LOGSTRING( "CDiagSpeakerPlugin::PlayL OUT" )
-    }
-
-// ---------------------------------------------------------------------------
-// CDiagSpeakerPlugin::SaveAudioOutput()
-// ---------------------------------------------------------------------------
-//
-void CDiagSpeakerPlugin::SaveAudioOutput()
-    {
-    LOGSTRING( "CDiagSpeakerPlugin::SaveAudioOutput IN" )
-
-    if ( iAudioOutput )
-        {
-        iPrevAudioOutput = iAudioOutput->AudioOutput();
-        }
-
-    LOGSTRING( "CDiagSpeakerPlugin::SaveAudioOutput OUT" )
-    }
-
-// ---------------------------------------------------------------------------
-// CDiagSpeakerPlugin::RestoreAudioOutputL()
-// ---------------------------------------------------------------------------
-//
-void CDiagSpeakerPlugin::RestoreAudioOutputL()
-    {
-    LOGSTRING( "CDiagSpeakerPlugin::RestoreAudioOutputL IN" )
-
-    if ( iAudioOutput )
-        {
-        iAudioOutput->SetAudioOutputL( iPrevAudioOutput );
-        }
-
-    LOGSTRING( "CDiagSpeakerPlugin::RestoreAudioOutputL OUT" )
-    }
-
-// ---------------------------------------------------------------------------
-// CDiagSpeakerPlugin::ClosePeriodic
-// ---------------------------------------------------------------------------
-//
-void CDiagSpeakerPlugin::ClosePeriodic()
-    {
-    LOGSTRING( "CDiagSpeakerPlugin::ClosePeriodic IN" )
-
-    if ( iPeriodic )
-        {
-        delete iPeriodic;
-        iPeriodic = NULL;
-        }
-
-    LOGSTRING( "CDiagSpeakerPlugin::ClosePeriodic OUT" )
-    }
-
-// ---------------------------------------------------------------------------
-// CDiagSpeakerPlugin::CheckRecordFile
-// ---------------------------------------------------------------------------
-//
-TBool CDiagSpeakerPlugin::CheckRecordFile()
-    {
-    LOGSTRING( "CDiagSpeakerPlugin::CheckRecordFile IN" )
-
-    TInt        err;
-    TEntry      entry;
-    TBool       ret = EFalse;
-
-    err  = CoeEnv().FsSession().Entry( iRecordFilePath, entry );
-
-    // Check if there was an error
-    if ( err != KErrNone)
-        {
-        ret = EFalse;
-        }
-
-    // Check File Size
-    else
-        {
-        ret = entry.iSize >= KMinFileSize;
-        }
-
-    LOGSTRING2( "CDiagSpeakerPlugin::CheckRecordFile OUT ret=%d", ret )
-    return ret;
-    }
-
-// ---------------------------------------------------------------------------
-// CDiagAuioPlugin::DeleteRecordFile
-// ---------------------------------------------------------------------------
-//
-void CDiagSpeakerPlugin::DeleteRecordFile()
-    {
-    LOGSTRING( "CDiagSpeakerPlugin::DeleteRecordFile IN" )
-
-    CoeEnv().FsSession().Delete( iRecordFilePath );
-
-    LOGSTRING( "CDiagSpeakerPlugin::DeleteRecordFile OUT" )
-    }
-
-// ---------------------------------------------------------------------------
-// CDiagSpeakerPlugin::EnoughFreeSpace
-// ---------------------------------------------------------------------------
-//
-TBool CDiagSpeakerPlugin::EnoughFreeSpace()
-    {
-    LOGSTRING( "CDiagSpeakerPlugin::EnoughFreeSpace IN" )
-
-    TInt64      RecordFileSize64;
-    TVolumeInfo vol_info;
-    TBool       ret;
-
-    RecordFileSize64 = iRecordFileSize;
-    CoeEnv().FsSession().Volume( vol_info, EDriveC );
-    ret = vol_info.iFree >= RecordFileSize64;
-
-    LOGSTRING2( "CDiagSpeakerPlugin::EnoughFreeSpace OUT ret=%d", ret )
-    return ret;
-    }
-
-// ---------------------------------------------------------------------------
-// CDiagSpeakerPlugin::SetProgressDismissed
-// ---------------------------------------------------------------------------
-//
-void  CDiagSpeakerPlugin::SetProgressDismissed( TBool aDismissed )
-    {
-    LOGSTRING2( "CDiagSpeakerPlugin::SetProgressDismissed aDismissed=%d", aDismissed )
-    iProgressDismissed = aDismissed;
-    }
-
-// ---------------------------------------------------------------------------
-// CDiagSpeakerPlugin::ProgressDismissed
-// ---------------------------------------------------------------------------
-//
-TBool CDiagSpeakerPlugin::ProgressDismissed() const
-    {
-    LOGSTRING2( "CDiagSpeakerPlugin::ProgressDismissed iProgressDismissed=%d", iProgressDismissed )
-
-    return iProgressDismissed;
-    }
-
-// ---------------------------------------------------------------------------
-// CDiagSpeakerPlugin::AskCancelExecutionL
-// ---------------------------------------------------------------------------
-//
-TBool CDiagSpeakerPlugin::AskCancelExecutionL( TInt& aButtonId )
-    {
-    LOGSTRING( "CDiagSpeakerPlugin::AskCancelExecutionL() IN" )
-
-    CAknDialog* dialog;
-    TBool       result;
-
-    // set softkey for single execution
-    if ( !SinglePluginExecution() )
-        {
-    	// Create common dialog by invoking Engine
-    	dialog = ExecutionParam().Engine().
-             CreateCommonDialogLC( EDiagCommonDialogConfirmCancelAll, NULL );
-
-    	// Launch dialog and get result from it
-    	result = RunWaitingDialogL( dialog, aButtonId );
-	}	
-    else 
-       {
-       //CompleteTestL( CDiagResultsDatabaseItem::ECancelled );	 //commented for NTEI-7EZ96S
-       aButtonId = EAknSoftkeyYes;
-       return ETrue;
-       }
-    
-    LOGSTRING3( "CDiagSpeakerPlugin::AskCancelExecutionL() OUT aButtonId=%d result=%d", aButtonId, result )
-    return result;
-    }
-
-// ---------------------------------------------------------------------------
-// CDiagSpeakerPlugin::ShowConfQueryL
-// ---------------------------------------------------------------------------
-//
-TBool CDiagSpeakerPlugin::ShowConfQueryL( TInt aResourceId, TInt &aButtonId )
-    {
-    LOGSTRING( "CDiagSpeakerPlugin::ShowConfQueryL IN" )
-    CAknQueryDialog* dlg    = NULL;
-    TBool            result = EFalse;
-
-    // Create CAknQueryDialog instance
-    dlg = new ( ELeave ) CAknQueryDialog( CAknQueryDialog::ENoTone );
-
-    dlg->PrepareLC( aResourceId );
-
-    // set softkey for single execution
-    /*
-    if ( SinglePluginExecution() )
-        { */  // ADO & Platformization Changes
-        CEikButtonGroupContainer& cba = dlg->ButtonGroupContainer();
-
-        switch ( aResourceId )
-            {
-            case R_CONFQUERY_ASK_PLAY: 
-                cba.SetCommandSetL( R_DIAG_SPEAKER_SOFTKEYS_PLAY_CANCEL );
-                break;
-            default:
-                break;
-            }
-      /*  } */
-
-    result = RunWaitingDialogL( dlg, aButtonId );
-
-    LOGSTRING3( "CDiagSpeakerPlugin::ShowConfQueryL() OUT aButtonId=%d result=%d", aButtonId, result )
-    return result;
-    }
-
-// ---------------------------------------------------------------------------
-// CDiagSpeakerPlugin::ShowMessageQueryL
-// ---------------------------------------------------------------------------
-//
-TBool CDiagSpeakerPlugin::ShowMessageQueryL( TInt aResourceId, TInt &aButtonId  )
-    {
-    LOGSTRING( "CDiagSpeakerPlugin::ShowMessageQueryL IN" )
-    CAknMessageQueryDialog* dlg    = NULL;
-    TBool                   result = EFalse;
-
-    // Create CAknMessageQueryDialog instance
-    dlg = new ( ELeave ) CAknMessageQueryDialog();
-
-    dlg->PrepareLC( aResourceId );
-
-    // set softkey for single execution
-    
-    
-        CEikButtonGroupContainer& cba = dlg->ButtonGroupContainer();
-
-        switch ( aResourceId )
-            {
-            case R_MESSAGEQUERY_TITLE: 
-        	if ( SinglePluginExecution() )
-        		{
-                cba.SetCommandSetL( R_DIAG_SPEAKER_SOFTKEYS_OK_CANCEL );
-        		}
-        	else
-        		{
-        		cba.SetCommandSetL( R_DIAG_SPEAKER_SOFTKEYS_OK_SKIP );	
-        		}
-                break;
-            case R_MESSAGEQUERY_ASK_RECORD:
-                cba.SetCommandSetL( R_DIAG_SPEAKER_SOFTKEYS_START_CANCEL );
-                break;
-            default:
-                break;
-            }
-            
-    	
-
-    result = RunWaitingDialogL( dlg, aButtonId );
-
-    LOGSTRING3( "CDiagSpeakerPlugin::ShowMessageQueryL() OUT aButtonId=%d result=%d", aButtonId, result )
-    return result;
-    }
-
-// ---------------------------------------------------------------------------
-// CDiagSpeakerPlugin::ShowProgressNoteL
-// ---------------------------------------------------------------------------
-//
-void CDiagSpeakerPlugin::ShowProgressNoteL( TInt aResourceId, TInt aFinalValue )
-    {
-    LOGSTRING( "CDiagSpeakerPlugin::ShowProgressNoteL IN" )
-
-    CAknProgressDialog* dlg;
-
-    if ( iProgressDialog )
-        {
-        delete iProgressDialog;
-        iProgressDialog = NULL;
-        }
-
-    SetProgressDismissed( EFalse );
-
-    iProgressDialog = dlg = new ( ELeave ) CAknProgressDialog(
-        reinterpret_cast <CEikDialog**> (&iProgressDialog),
-        ETrue
-        );
-
-    dlg->SetCallback( this );
-    dlg->PrepareLC( aResourceId );
-
-    // set softkey for single execution
-  /*  if ( SinglePluginExecution() ) 
-        { */ // ADO & Platformization Changes
-        CEikButtonGroupContainer& cba = dlg->ButtonGroupContainer();
-        cba.SetCommandSetL( R_DIAG_SPEAKER_SOFTKEYS_STOP_CANCEL );
-      /*  } */ // ADO & Platformization Changes
-
-    iProgressInfo = dlg->GetProgressInfoL();
-    iProgressInfo->SetFinalValue( aFinalValue * KFive );
-
-    dlg->RunLD();
-
-    // Set up Periodic
-    ClosePeriodic();
-
-    iPeriodic = CPeriodic::NewL( EPriorityNormal );
-    TCallBack callback( CallbackIncrementProgressNoteL, this );
-    iPeriodic->Start( 0, KProgressDelay, callback );
-
-    LOGSTRING( "CDiagSpeakerPlugin::ShowProgressNoteL OUT" )
-    }
-
-// ---------------------------------------------------------------------------
-// CDiagSpeakerPlugin::CallbackIncrementProgressNoteL
-// ---------------------------------------------------------------------------
-//
-TInt CDiagSpeakerPlugin::CallbackIncrementProgressNoteL( TAny* aThis )
-    {
-    TInt err = KErrNone;
-    CDiagSpeakerPlugin* myThis  = (CDiagSpeakerPlugin *)aThis;
-
-    TRAP( err, myThis->UpdateProgressNoteL() );
-    if ( err != KErrNone )
-        {
-        LOGSTRING( "CDiagSpeakerPlugin::CallbackIncrementProgressNoteL:User::Panic() on UpdateProgressNoteL()" )
-        User::Panic( KDiagSpeakerPluginCategory, err );
-        }
-
-    return KFinished;
-    }
-
-// ---------------------------------------------------------------------------
-// CDiagSpeakerPlugin::UpdateProgressNoteL
-// ---------------------------------------------------------------------------
-//
-TInt CDiagSpeakerPlugin::UpdateProgressNoteL()
-    {
-    TTime              intervalTime;
-    TTime              currentTime;
-
-    // Prevent from Screen Saver
-    User::ResetInactivityTime();
-
-    if ( iProgressDialog )
-        {
-        iProgressInfo->IncrementAndDraw(1);
-
-        if ( (iFinalValue * KFive) <= iProgressInfo->CurrentValue() )
-            {
-            if ( ProgressDismissed() == EFalse )
-                {
-                iProgressDialog->ProcessFinishedL();
-                }
-
-            return KProgressFinished;
-            }
-        }
-
-    return KProgressNotFinished;
-    }
-
-// ---------------------------------------------------------------------------
-// From MDiagPlugin
-// CDiagSpeakerPlugin::IsVisible()
-// ---------------------------------------------------------------------------
-TBool CDiagSpeakerPlugin::IsVisible() const
-    {
-    return ETrue;
-    }
-
-// ---------------------------------------------------------------------------
-// From MDiagTestPlugin
-// CDiagSpeakerPlugin::RunMode()
-// ---------------------------------------------------------------------------
-MDiagTestPlugin::TRunMode CDiagSpeakerPlugin::RunMode() const
-    {
-    return EInteractiveDialog;
-    }
-
-// ---------------------------------------------------------------------------
-// From MDiagTestPlugin
-// CDiagSpeakerPlugin::TotalSteps()
-// ---------------------------------------------------------------------------
-TUint CDiagSpeakerPlugin::TotalSteps() const
-    {
-    return ESpeakerPluginTotalSteps;
-    }
-
-// ---------------------------------------------------------------------------
-// From MDiagPlugin
-// CDiagSpeakerPlugin::GetPluginNameL
-// ---------------------------------------------------------------------------
-HBufC* CDiagSpeakerPlugin::GetPluginNameL( TNameLayoutType aLayoutType ) const
-    {
-    switch ( aLayoutType )
-        {
-        case ENameLayoutHeadingPane:
-            return StringLoader::LoadL( R_DIAG_SPEAKER_PLUGIN_HEADING_PANE );
-
-        case ENameLayoutPopupInfoPane:
-            return StringLoader::LoadL( R_DIAG_SPEAKER_PLUGIN_POPUP_INFO_LIST_PANE );
-
-        case ENameLayoutTitlePane:
-            return StringLoader::LoadL( R_DIAG_SPEAKER_PLUGIN_TITLE_PANE );
-
-        case ENameLayoutListSingleGraphic:
-            return StringLoader::LoadL( R_DIAG_SPEAKER_PLUGIN_LIST_SINGLE_GRAPHIC_PANE );
-
-        case ENameLayoutListSingle:           
-            return StringLoader::LoadL( R_DIAG_SPEAKER_PLUGIN_LIST_SINGLE_GRAPHIC_HEADING_PANE );
-
-        default:
-            LOGSTRING2( "CDiagSpeakerPlugin::GetPluginNameL: "
-                L"ERROR: Unsupported layout type %d", aLayoutType )
-            __ASSERT_DEBUG( 0, User::Invariant() );
-            return StringLoader::LoadL ( R_DIAG_SPEAKER_PLUGIN_LIST_SINGLE_GRAPHIC_HEADING_PANE );
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// From MDiagPlugin
-// CDiagSpeakerPlugin::Uid
-// ---------------------------------------------------------------------------
-TUid CDiagSpeakerPlugin::Uid() const
-    {
-    return KDiagSpeakerPluginUid;
-    }
-
-// ---------------------------------------------------------------------------
-// From CDiagTestPluginBase
-// CDiagSpeakerPlugin::InitializeL()
-// ---------------------------------------------------------------------------
-void CDiagSpeakerPlugin::TestSessionBeginL(
-    MDiagEngineCommon& /*aEngine*/,
-    TBool              /*aSkipDependencyCheck*/,
-    TAny*              /*aCustomParams*/)
-    {
-    LOGSTRING( "CDiagSpeakerPlugin::TestSessionBeginL:: Deleting record file..." )
-    DeleteRecordFile();
-    }
-
-// ---------------------------------------------------------------------------
-// From CDiagTestPluginBase
-// CDiagSpeakerPlugin::CleanupL()
-// ---------------------------------------------------------------------------
-void CDiagSpeakerPlugin::TestSessionEndL(
-    MDiagEngineCommon& /*aEngine*/,
-    TBool              /*aSkipDependencyCheck*/,
-    TAny*              /*aCustomParams*/)
-    {
-    LOGSTRING( "CDiagSpeakerPlugin::TestSessionEndL:: Deleting record file..." )
-    DeleteRecordFile();
-    }
-
-// ---------------------------------------------------------------------------
-// From CDiagTestPluginBase
-// CDiagSpeakerPlugin::DoRunTestL()
-// ---------------------------------------------------------------------------
-void CDiagSpeakerPlugin::DoRunTestL()
-    {
-    LOGSTRING( "CDiagSpeakerPlugin::DoRunTest() IN" )
-
-    // Framework should never call DoRunTestL() before previous test
-    ASSERT_ALWAYS( iRecorder == NULL );
-    ASSERT_ALWAYS( iAudioPlayer == NULL );
-    iSessionValid = ETrue;
-
-    // Create Recorder
-    iRecorder = CMdaAudioRecorderUtility::NewL(
-        *this,
-        NULL,
-        KAudioPriorityRecording,
-        TMdaPriorityPreference( KAudioPrefRealOneLocalPlayback )
-        );
-
-    // Create Audio Player
-    iAudioPlayer = CMdaAudioPlayerUtility::NewL( *this );
-
-    // Check it has been recorded
-    if ( CheckRecordFile() == EFalse )
-        {
-        LOGSTRING( "CDiagSpeakerPlugin::DoRunTest() Record file does not exist. StartRecordL()" )
-        StartRecordL();
-        }
-     else
-        {
-        LOGSTRING( "CDiagSpeakerPlugin::DoRunTest() Record file exists. StartPlayL()" )
-        StartPlayL();
-        }
-
-    LOGSTRING( "CDiagSpeakerPlugin::DoRunTest() OUT" )
-    }
-
-// ---------------------------------------------------------------------------
-// CDiagSpeakerPlugin::DoStopAndCleanupL
-// ---------------------------------------------------------------------------
-//
-void CDiagSpeakerPlugin::DoStopAndCleanupL()
-    {
-    LOGSTRING( "CDiagSpeakerPlugin::DoStopAndCleanupL IN" )
-    // All memory and resource allocated during test execution should be
-    // cleaned up here.
-
-    // Set Session
-    iSessionValid = EFalse;
-
-    // Close Recorder
-    if ( iRecorder )
-    {
-        LOGSTRING( "CDiagAudioPlugin::DoStopAndCleanupL: Stop & Close AudioPlayer" )
-        iRecorder->Stop();
-        iRecorder->Close();
-    }
-
-    // Close Audio
-    if ( iAudioPlayer )
-    {
-        LOGSTRING( "CDiagSpeakerPlugin::DoStopAndCleanupL: Stop & Close AudioPlayer" )
-        iAudioPlayer->Stop();
-        iAudioPlayer->Close();
-    }
-
-    // Restore AudioOutput
-   RestoreAudioOutputL();
-
-    if ( ResultsDbItemBuilder().TestResult() == CDiagResultsDatabaseItem::ESuccess )
-        {
-        // Test was successful. Do not delete the temporary file.
-        LOGSTRING( "CDiagSpeakerPlugin::DoStopAndCleanupL: Keep file for next test." )
-        }
-    else
-        {
-        // test was not successful. Delete recorded file.
-        LOGSTRING( "CDiagSpeakerPlugin::DoStopAndCleanupL:DeleteRecordFile()" )
-        DeleteRecordFile();
-        }
-
-    if ( iAudioState == CMdaAudioRecorderUtility::EPlaying )
-        {
-        LOGSTRING( "CDiagSpeakerPlugin::DoStopAndCleanupL:RestoreAudioOutputL" )
-        TRAP_IGNORE( RestoreAudioOutputL() );
-        }
-
-    // Call Engine to Dismiss Any Dialog
-    DismissWaitingDialog();
-
-    // Close which can be recovered by running doRunTestL()
-    ClosePeriodic();
-
-    // Clean up resources allocated during object creation.
-    delete iRecorder;
-    iRecorder = NULL;
-
-    delete iAudioPlayer;
-    iAudioPlayer = NULL;
-
-    delete iAudioOutput;
-    iAudioOutput = NULL;
-
-    // Cleanup Progress Dialog
-    LOGSTRING( "Cleanup Progress Dialog" )
-    if ( iProgressDialog )
-        {
-        delete iProgressDialog;
-        iProgressDialog = NULL;
-        }
-
-    SetProgressDismissed( ETrue );
-
-    LOGSTRING( "CDiagSpeakerPlugin::DoStopAndCleanupL OUT" )
-    }
-
-// ---------------------------------------------------------------------------
-// From CActive
-// CDiagSpeakerPlugin::RunL
-// ---------------------------------------------------------------------------
-void CDiagSpeakerPlugin::RunL()
-    {
-    switch(iState)
-        {
-        case EStateCancelled:
-            CompleteTestL( CDiagResultsDatabaseItem::ESkipped );
-            return;
-        case EStateRecorded:
-            AfterRecordL();
-            break;
-        case EStatePlayed:
-            AfterPlayL();
-            break;
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// From CActive
-// CDiagSpeakerPlugin::DoCancel
-// ---------------------------------------------------------------------------
-void CDiagSpeakerPlugin::DoCancel()
-    {
-    // Stop active request. This class does not use Async request using iStatus.
-    }
-
-// ---------------------------------------------------------------------------
-// CDiagSpeakerPlugin::DialogDismissedL
-// ---------------------------------------------------------------------------
-//
-void CDiagSpeakerPlugin::DialogDismissedL( TInt aButtonId )
-    {
-    LOGSTRING2( "CDiagSpeakerPlugin::DialogDismissedL: aButtonId = %d", aButtonId )
-
-    TInt        prevState;
-
-    SetProgressDismissed( ETrue );
-
-    // Restore Audio Output in case of Playing
-    if ( iAudioState == CMdaAudioRecorderUtility::EPlaying )
-        {
-        LOGSTRING( "CDiagSpeakerPlugin::DialogDismissedL: Calling RestoreAudioOutputL" )
-        if ( iAudioOutput )
-        {
-            delete iAudioOutput;
-            iAudioOutput = NULL;
-        }
-
-        //RestoreAudioOutputL();
-        }
-
-    // Stop Recording / Playing
-    if ( iAudioState == CMdaAudioRecorderUtility::ERecording )
-        {
-        LOGSTRING( "CDiagSpeakerPlugin::DialogDismissedL:: Stop. Record" )
-        if ( iRecorder )
-            {
-            iRecorder->Stop();
-            iRecorder->Close();
-            }
-        }
-    else if ( iAudioState == CMdaAudioRecorderUtility::EPlaying )
-        {
-        LOGSTRING( "CDiagSpeakerPlugin::DialogDismissedL:: Stop. Play" )
-        if ( iAudioPlayer )
-            {
-            iAudioPlayer->Stop();
-            iAudioPlayer->Close();
-            }
-        }
-
-    // If button has not pressed
-    if ( ( aButtonId != ECBACmdSkip )   &&
-         ( aButtonId != EEikBidCancel ) &&   // ADO & Platformization Changes
-         ( aButtonId != EAknSoftkeyOk ) &&
-         ( aButtonId != EAknSoftkeyDone) &&
-         ( aButtonId != ECBACmdCancel )
-       )
-        {
-        LOGSTRING2( "CDiagAudioPlugin::DialogDismissedL: Button not pressed. aButtonId = %d", aButtonId )
-        return;
-        }
-
-    // Skip
-    if ( aButtonId == ECBACmdSkip )
-        {
-        LOGSTRING( "CDiagSpeakerPlugin::DialogDismissedL:: aButtonId == ECBACmdSkip" )
-        CompleteTestL( CDiagResultsDatabaseItem::ESkipped );
-        return;
-        }
-
-    // Cancel
-    else if ( aButtonId == EEikBidCancel ) // ADO & Platformization Changes
-        {
-        LOGSTRING( "CDiagSpeakerPlugin::DialogDismissedL:: aButtonId == ECBACmdCancel" )
-
-        prevState = iAudioState;
-        iAudioState    = CMdaAudioRecorderUtility::EOpen;
-
-        TInt   cancelButtonId;
-        TBool  cancelResult = EFalse;
-
-        cancelResult = AskCancelExecutionL( cancelButtonId );
-        
-        if ( !cancelResult )
-            {
-            LOGSTRING( "CDiagSpeakerPlugin::StartPlayL - !iSessionValid 3" )
-            return;
-            }
-
-        switch ( cancelButtonId )
-            {
-            case EAknSoftkeyYes:
-                SetAudioEvent(EStateCancelled);
-                LOGSTRING( "CDiagSpeakerPlugin::DialogDismissedL:: EAknSoftkeyYes return NOW!!" )
-                return;
-
-            default:
-                if ( prevState == CMdaAudioRecorderUtility::ERecording )
-                    {
-                    LOGSTRING( "CDiagSpeakerPlugin::DialogDismissedL:: Start RecordL" )
-                    RecordL();
-                    }
-                else if ( prevState == CMdaAudioRecorderUtility::EPlaying )
-                    {
-                    LOGSTRING( "CDiagSpeakerPlugin::DialogDismissedL:: Start PlayL" )
-                    PlayL();
-                    }
-                break;
-            }
-        return;
-        }
-
-    // Stop
-    else
-        {
-        LOGSTRING2( "CDiagSpeakerPlugin::DialogDismissedL: State = %d", iAudioState )
-        if ( iAudioState == CMdaAudioRecorderUtility::ERecording )
-            {
-            LOGSTRING( "CDiagAudioPlugin::DialogDismissedL:: Stop. Record" )
-            if ( iRecorder &&  iState == EStateUnknown)
-                {
-                LOGSTRING( "CDiagAudioPlugin::DialogDismissedL:: Stop. Call AfterRecordL()" )
-                SetAudioEvent(EStateRecorded);
-                }
-            /*
-            LOGSTRING( "CDiagSpeakerPlugin::DialogDismissedL:: Stop. Call AfterRecordL()" )
-            // Stop playback/recording
-            AfterRecordL(); */
-            }
-        else if ( iAudioState == CMdaAudioRecorderUtility::EPlaying )
-            {  
-            LOGSTRING( "CDiagAudioPlugin::DialogDismissedL:: Stop. Play" )
-            if ( iAudioPlayer && iState == EStateRecorded)
-                {
-                LOGSTRING( "CDiagAudioPlugin::DialogDismissedL:: Stop. Call AfterPlayL()" )
-                SetAudioEvent(EStatePlayed);
-                }
-            /*
-            LOGSTRING( "CDiagSpeakerPlugin::DialogDismissedL:: Stop. Call AfterPlayL()" )
-            // Stop playback/recording
-            AfterPlayL(); */
-            }
-        }
-    }
-
-
-void CDiagSpeakerPlugin::SetAudioEvent(TState aState)
-    {
-    iState = aState;
-    SetActive();
-    TRequestStatus* status = &iStatus;
-    User::RequestComplete(status, KErrNone);
-    }
-
-// ---------------------------------------------------------------------------
-// CDiagSpeakerPlugin::MoscoStateChangeEvent
-// ---------------------------------------------------------------------------
-//
-void CDiagSpeakerPlugin::MoscoStateChangeEvent(
-    CBase* /*aObject*/,
-    TInt   aPreviousState,
-    TInt   aCurrentState,
-    TInt   aErrorCode
-)
-    {
-    TInt err = KErrNone;
-
-    LOGSTRING4( "CDiagSpeakerPlugin::MoscoStateChangeEvent:IN (%d -> %d, %d )", aPreviousState, aCurrentState, aErrorCode )
-
-    // 1. Record reaches to the end of file
-    if ( aErrorCode == KErrEof )
-        {
-        iState = EStateRecorded;
-        iAudioState = CMdaAudioRecorderUtility::EOpen;
-        TRAP( err, AfterRecordL() );
-        }
-
-    // 2. Start - Recording
-    else if ( ( aPreviousState == CMdaAudioRecorderUtility::ENotReady)  &&
-              ( aCurrentState  == CMdaAudioRecorderUtility::EOpen    ) )
-        {
-        LOGSTRING( "CDiagSpeakerPlugin::MoscoStateChangeEvent: Leave on RecordingL()" )
-        TRAP( err, RecordingL() );
-        LOGSTRING2( "CDiagSpeakerPlugin::MoscoStateChangeEvent: RecordingL() err = %d", err )
-        }
-
-    // 3. Stopped - Recording
-    else if ( ( aPreviousState == CMdaAudioRecorderUtility::ERecording ) &&
-              ( aCurrentState  == CMdaAudioRecorderUtility::EOpen )
-            )
-        {
-        iState = EStateRecorded;
-        LOGSTRING( "CDiagSpeakerPlugin::MoscoStateChangeEvent: Leave on AfterRecordL()" )
-        TRAP( err, AfterRecordL() );
-        LOGSTRING2( "CDiagSpeakerPlugin::MoscoStateChangeEvent: AfterRecordL() err = %d", err )
-        }
-
-    // Handle for Trap
-    if (err != KErrNone)
-        {
-        LOGSTRING2( "CDiagSpeakerPlugin::MoscoStateChangeEvent:Call CompleteTestL with error = %d", err )
-        TRAP( err, CompleteTestL(CDiagResultsDatabaseItem::EFailed) );
-        if ( err != KErrNone )
-            {
-            LOGSTRING( "CDiagSpeakerPlugin::MoscoStateChangeEvent:User::Panic()" )
-            User::Panic( KDiagSpeakerPluginCategory, err );
-            }
-        return; // Fail Test
-        }
-    LOGSTRING( "CDiagSpeakerPlugin::MoscoStateChangeEvent OUT" )
-    }
-
-// ---------------------------------------------------------------------------
-// CDiagSpeakerPlugin::MapcInitComplete
-// ---------------------------------------------------------------------------
-//
-void CDiagSpeakerPlugin::MapcInitComplete(TInt aError, const TTimeIntervalMicroSeconds& aDuration)
-    {
-    LOGSTRING2( "CDiagSpeakerPlugin::MapcInitComplete: aError=%d", aError )
-    TInt err = KErrNone;
-
-    // Set Duration
-    iPositionMicroSec    = 0;
-    iMaxDurationMicroSec = aDuration;
-
-    // Set Priority of AudioPlayer
-    iAudioPlayer->SetPriority(
-        KAudioPriorityAlarm + 1,
-        TMdaPriorityPreference( KAudioPrefVoiceRec )
-        );
-
-    // Set Audio Output
-    if ( iAudioOutput )
-    {
-        delete iAudioOutput;
-        iAudioOutput = NULL;
-    }
-
-    // Create AudioOutput
-    TRAP(err,iAudioOutput = CAudioOutput::NewL( *iAudioPlayer ));
-    if ( err != KErrNone ) // Added for removing code scanner warning
-        {
-        LOGSTRING2( "CDiagSpeakerPlugin::MapcInitComplete:Call CompleteTestL with error = %d", err )
-        TRAP( err, CompleteTestL(CDiagResultsDatabaseItem::EFailed) );
-
-        if ( err != KErrNone )
-            {
-            LOGSTRING( "CDiagSpeakerPlugin::MapcInitComplete:User::Panic()" )
-            User::Panic( KDiagSpeakerPluginCategory, err );
-            }
-
-        return; // Fail Test
-        } 
-    
-    TRAP(err,iAudioOutput->SetAudioOutputL( iOutput ));
-    
-    if ( err != KErrNone ) // Added for removing code scanner warning
-        {
-        LOGSTRING2( "CDiagSpeakerPlugin::MapcInitComplete:Call CompleteTestL with error = %d", err )
-        TRAP( err, CompleteTestL(CDiagResultsDatabaseItem::EFailed) );
-
-        if ( err != KErrNone )
-            {
-            LOGSTRING( "CDiagSpeakerPlugin::MapcInitComplete:User::Panic()" )
-            User::Panic( KDiagSpeakerPluginCategory, err );
-            }
-
-        return; // Fail Test
-        } 
-
-    // Start Playing
-    TRAP( err, PlayingL() );
-
-    // Handle for Trap
-    if ( err != KErrNone )
-        {
-        LOGSTRING2( "CDiagSpeakerPlugin::MapcInitComplete:Call CompleteTestL with error = %d", err )
-        TRAP( err, CompleteTestL(CDiagResultsDatabaseItem::EFailed) );
-
-        if ( err != KErrNone )
-            {
-            LOGSTRING( "CDiagSpeakerPlugin::MapcInitComplete:User::Panic()" )
-            User::Panic( KDiagSpeakerPluginCategory, err );
-            }
-
-        return; // Fail Test
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// CDiagSpeakerPlugin::MapcPlayComplete
-// ---------------------------------------------------------------------------
-//
-void CDiagSpeakerPlugin::MapcPlayComplete(TInt aError)
-    {
-    LOGSTRING2( "CDiagSpeakerPlugin::MapcPlayComplete: aError=%d", aError )
-
-    if ( aError == KErrNone)
-        {
-        LOGSTRING( "CDiagSpeakerPlugin::MapcPlayComplete KErrNone" )
-        
-        if ( iAudioOutput )
-        {
-            delete iAudioOutput;
-            iAudioOutput = NULL;
-        }
-
-       // RestoreAudioOutputL();
-
-        
-        if(iState == EStateRecorded)
-            {
-        // Stop and Close Audio Player
-            if ( iAudioPlayer )
-                {
-                iAudioPlayer->Stop();
-                iAudioPlayer->Close();
-                iState = EStatePlayed;
-                }
-    
-            TRAPD(err,AfterPlayL());
-            
-            // Handle for Trap
-				    if ( err != KErrNone )
-				        {
-				        LOGSTRING2( "CDiagSpeakerPlugin::MapcInitComplete:Call CompleteTestL with error = %d", err )
-				        TRAP( err, CompleteTestL(CDiagResultsDatabaseItem::EFailed) );
-				
-				        if ( err != KErrNone )
-				            {
-				            LOGSTRING( "CDiagSpeakerPlugin::MapcInitComplete:User::Panic()" )
-				            User::Panic( KDiagSpeakerPluginCategory, err );
-				            }
-				
-				        return; // Fail Test
-				        }
-            }
-        return;
-        }
-    }
-// End of File
-
--- a/devicediagnostics/diagplugins/diagloudspeakerplugin/src/diagspeakerpluginimplementationtable.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-/*
-* 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:  ECOM proxy table for DiagTimerTestPlugin
-*
-*/
-
-
-// INCLUDES
-#include "diagspeakerplugin.hrh"
-#include "diagspeakerplugin.h"
-#include <implementationproxy.h>
-
-
-// CONSTANTS
-const TImplementationProxy KDiagSpeakerPluginImplementationTable[] =
-	{
-	IMPLEMENTATION_PROXY_ENTRY( DIAG_SPEAKER_PLUGIN_UID, CDiagSpeakerPlugin::NewL )
-	};
-
-// ---------------------------------------------------------------------------
-// ImplementationGroupProxy
-//
-// Gate/factory function
-// ---------------------------------------------------------------------------
-//
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy(
-                                                  TInt& aTableCount )
-	{
-	aTableCount = sizeof( KDiagSpeakerPluginImplementationTable )
-        / sizeof( TImplementationProxy );
-	return KDiagSpeakerPluginImplementationTable;
-	}
-
-// End of File
-
--- a/devicediagnostics/diagplugins/diagnetcoverageplugin/cenrep_files/clean_cenrep.bat	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-rem
-rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-rem All rights reserved.
-rem This component and the accompanying materials are made available
-rem under the terms of "Eclipse Public License v1.0"
-rem which accompanies this distribution, and is available
-rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
-rem
-rem Initial Contributors:
-rem Nokia Corporation - initial contribution.
-rem
-rem Contributors:
-rem
-rem Description:
-rem
-
-rd /s /q output
--- a/devicediagnostics/diagplugins/diagnetcoverageplugin/cenrep_files/create_cenrep.bat	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-rem
-rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-rem All rights reserved.
-rem This component and the accompanying materials are made available
-rem under the terms of "Eclipse Public License v1.0"
-rem which accompanies this distribution, and is available
-rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
-rem
-rem Initial Contributors:
-rem Nokia Corporation - initial contribution.
-rem
-rem Contributors:
-rem
-rem Description:
-rem
-
-@set XLS_FILE=keys_pdnetworkcoveragetest.xls
-@set INI_FILE=2000E596.txt
-@set RELEASE=3.2
-
-@set CENREP_DIR=%CD%
-@cd \epoc32\tools\cenrep
-
-cenrep.pl -o "%CENREP_DIR%\output" -l "%CENREP_DIR%\%XLS_FILE%" -p %RELEASE%
-copy "%CENREP_DIR%\output\inifiles\%INI_FILE%" \epoc32\RELEASE\winscw\udeb\Z\private\10202be9\
-copy "%CENREP_DIR%\output\inifiles\%INI_FILE%" \epoc32\RELEASE\winscw\udeb\Z\private\10202be9\
-copy "%CENREP_DIR%\output\inifiles\%INI_FILE%" \epoc32\RELEASE\winscw\urel\Z\private\10202be9\
-copy "%CENREP_DIR%\output\inifiles\%INI_FILE%" \epoc32\RELEASE\armv5\udeb\Z\private\10202be9\
-copy "%CENREP_DIR%\output\inifiles\%INI_FILE%" \epoc32\RELEASE\armv5\urel\Z\private\10202be9\
-copy "%CENREP_DIR%\output\inifiles\%INI_FILE%" \epoc32\data\Z\private\10202be9\
-@cd "%CENREP_DIR%"
-
-@echo ================= done. Hit any key to continue ==================
-@pause
-
Binary file devicediagnostics/diagplugins/diagnetcoverageplugin/cenrep_files/keys_pdnetworkcoveragetest.xls has changed
Binary file devicediagnostics/diagplugins/diagnetcoverageplugin/conf/pdnetworkcoveragetest.confml has changed
Binary file devicediagnostics/diagplugins/diagnetcoverageplugin/conf/pdnetworkcoveragetest_2000E596.crml has changed
--- a/devicediagnostics/diagplugins/diagnetcoverageplugin/data/devdiagnetcoverageplugin.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-/*
-* 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:  ECOM plugin resource file for Network Coverage Plug-in
-*
-*/
-
-#include <registryinfo.rh>
-
-
-RESOURCE REGISTRY_INFO theInfo
-    {
-    dll_uid     = 0x2000E596;
-    interfaces  =
-        {
-        INTERFACE_INFO
-            {
-            interface_uid   = 0x2000AFEB;
-            implementations =
-                {
-                IMPLEMENTATION_INFO
-                    {
-                    implementation_uid  = 0x2000E597;
-                    version_no          = 1;
-                    display_name        = "Network Coverage Plug-in";
-                    default_data        = "0x2000E56B"; //Coverage suite
-                    opaque_data         =   "<diagplugininfo>" 
-                                                "<order number=\"85\"/>"
-                                                "<serviceprovided name=\"Network Coverage\"/>"
-                                            "</diagplugininfo>";
-                    }
-                };
-            }
-        };
-    }
-
-
-// End of File
--- a/devicediagnostics/diagplugins/diagnetcoverageplugin/data/devdiagnetcoveragepluginrsc.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,233 +0,0 @@
-/*
-* 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:  Resource file for DiagNetCoveragePlugin
-*
-*/
-
-
-
-//  RESOURCE IDENTIFIER
-NAME    DGNC // 4 letter ID
-
-//  INCLUDES
-#include    "diagnetcoverageplugin.hrh"
-#include    <diagnetcoverageplugin.loc>
-
-#include    <avkon.loc>
-#include    <avkon.mbg>
-#include    <avkon.rsg>
-#include    <AvkonIcons.hrh>
-#include    <bldvariant.hrh>
-#include    <data_caging_paths_strings.hrh>
-#include    <eikcore.rsg>
-#include    <eikon.rsg>
-#include    <uikon.rh>
-// ADO & Platformization Changes
-#include <eikon.rh>
-#include <avkon.rh>
-
-// CONSTANTS
-
-//  RESOURCE DEFINITIONS
-
-RESOURCE RSS_SIGNATURE
-    {
-    }
-
-RESOURCE TBUF
-    {
-    buf="DGNC";
-    }
-
-//----------------------------------------------------
-//  r_diag_net_coverage_plugin_name
-//
-// Network Coverage Plugin caption 
-//----------------------------------------------------
-//
-RESOURCE TBUF r_diag_net_coverage_plugin_name
-    {
-    buf = qtn_diag_lst_network_coverage;
-    }
-
-//----------------------------------------------------
-//  r_qtn_diag_lst_test_voice_network
-//
-// Network Coverage Plugin caption 
-//----------------------------------------------------
-//
-RESOURCE TBUF r_qtn_diag_lst_test_voice_network
-    {
-    buf = qtn_diag_lst_test_voice_network;
-    }
-
-//----------------------------------------------------
-//  r_qtn_diag_msg_title_voice_network
-//
-// Network Coverage Plugin caption 
-//----------------------------------------------------
-//    
-RESOURCE TBUF r_qtn_diag_msg_title_voice_network
-    {
-    buf = qtn_diag_msg_title_network_coverage;
-    }
-
-//----------------------------------------------------
-//  r_qtn_diag_msg_info_voice_network
-//
-// Network Coverage Plugin caption 
-//----------------------------------------------------
-//
-RESOURCE TBUF r_qtn_diag_msg_info_voice_network
-    {
-    buf = qtn_diag_conf_test_failed_network_coverage;
-    }
-
-//----------------------------------------------------
-//  r_qtn_diag_title_test_voice_network
-//
-// Network Coverage Plugin caption 
-//----------------------------------------------------
-//
-RESOURCE TBUF r_qtn_diag_title_test_voice_network
-    {
-    buf = qtn_diag_title_test_voice_network;
-    }
-    
-
-// ADO & Platformization Changes
-
-RESOURCE DIALOG r_diag_messagequery_title_netcoverage
-{
-		flags = EGeneralQueryFlags;
-		buttons = r_cba_netcoverage_single_execution;
-		items =
-		{
-			DLG_LINE 
-			{
-					type = EAknCtPopupHeadingPane;
-					id = EAknMessageQueryHeaderId;
-					control = AVKON_HEADING
-                {
-                label = qtn_diag_msg_title_network_coverage;
-                headinglayout = 0;
-                };
-			},
-			
-			DLG_LINE
-			{
-					type = EAknCtMessageQuery;
-					id = EAknMessageQueryContentId;
-					control = AVKON_MESSAGE_QUERY
-					{
-							message = qtn_diag_msg_info_network_coverage;
-					};
-					
-			}
-		
-		};
-
-}
-
-
-RESOURCE CBA r_cba_netcoverage_group_execution
-{
-		buttons =
-		{
-			CBA_BUTTON
-			{
-					id = EAknSoftkeyOk;
-					txt = text_softkey_ok;
-			},
-			
-			
-			CBA_BUTTON
-			{
-					id = ENetcoverageTestSkip;
-					txt = qtn_diag_softk_skip;
-			}
-			
-		};
-}
-
-
-
-RESOURCE CBA r_cba_netcoverage_single_execution
-{
-		buttons =
-		{
-			CBA_BUTTON
-			{
-					id = EAknSoftkeyOk;
-					txt = text_softkey_ok;
-			},
-			
-			
-			CBA_BUTTON
-			{
-					id = ENetcoverageTestCancel;
-					txt = text_softkey_cancel;
-			}
-			
-		};
-}
-
-//----------------------------------------------------
-//  r_network_softkeys_empty__cancel
-//
-// Buttons shown during the test. Shown when the
-// test is run as a part of a suite.
-//----------------------------------------------------
-//
-RESOURCE CBA r_network_softkeys_empty__cancel
-    {
-    buttons = 
-        {
-       CBA_BUTTON 
-	        { 
-            id  = EAknSoftkeyEmpty; 
-            txt = text_softkey_empty;
-	        },
-
-        CBA_BUTTON 
-	        { 
-            id  = ENetcoverageTestCancel;      // .hrh 
-            txt = text_softkey_cancel; // .rls or .loc
-	        } 
-
-	
-        };
-    }
-	
-RESOURCE DIALOG r_network_plugin_wait_note
-    {
-    flags = EAknWaitNoteFlags | EEikDialogFlagNotifyEsc;
-    buttons = r_network_softkeys_empty__cancel;
-    items =
-        {
-        DLG_LINE
-            {
-            type = EAknCtNote;
-            id = EYBWaitNoteId;
-            control= AVKON_NOTE 
-                { 
-                layout = EWaitLayout;
-                singular_label = qtn_diag_msg_testing_network_coverage;
-                animation = R_QGN_GRAF_WAIT_BAR_ANIM;
-                };
-            }
-        };
-    }
-	
-//End of File
--- a/devicediagnostics/diagplugins/diagnetcoverageplugin/group/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-/*
-* 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:  This file provides the information required for building
-*                DiagNetCoveragePlugin
-*
-*/
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-../loc/diagnetcoverageplugin.loc        MW_LAYER_LOC_EXPORT_PATH(diagnetcoverageplugin.loc)
-../rom_files/devdiagnetcoverageplugin.iby		CORE_MW_LAYER_IBY_EXPORT_PATH(devdiagnetcoverageplugin.iby)
-../rom_files/devdiagnetcoverageplugin_resources.iby		LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(devdiagnetcoverageplugin_resources.iby)
-
-// Generic configuration interface for component cenrep settings  
-../conf/pdnetworkcoveragetest.confml                    MW_LAYER_CONFML(pdnetworkcoveragetest.confml)
-../conf/pdnetworkcoveragetest_2000E596.crml	        MW_LAYER_CRML(pdnetworkcoveragetest_2000E596.crml)
-
-PRJ_MMPFILES
-diagnetcoverageplugin.mmp
-
-
-PRJ_TESTMMPFILES
-
-//  End of File
--- a/devicediagnostics/diagplugins/diagnetcoverageplugin/group/diagnetcoverageplugin.mmp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,75 +0,0 @@
-/*
-* 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:  Project specification file.
-*
-*/
-
-
-#include  <data_caging_paths.hrh>    // For RESOURCE_FILES_DIR
-// To get the MW_LAYER_SYSTEMINCLUDE-definition
-#include <platform_paths.hrh>
-
-CAPABILITY          CAP_ECOM_PLUGIN
-TARGET              devdiagnetcoverageplugin.dll
-TARGETTYPE          PLUGIN
-UID                 0x10009D8D 0x2000E596
-VENDORID            VID_DEFAULT
-
-
-SOURCEPATH          ../src
-SOURCE              diagnetcoveragepluginimplementationtable.cpp
-SOURCE              diagnetcoverageplugin.cpp
-
-
-//User include paths
-USERINCLUDE         ../inc
-USERINCLUDE         ../data                         // For *.rh
-USERINCLUDE         ../loc
-
-//System include paths
-SYSTEMINCLUDE       /epoc32/include/ecom
-
-
-// Default system include paths for middleware layer modules.
-APP_LAYER_SYSTEMINCLUDE
-
-SOURCEPATH          ../data
-
-START RESOURCE      devdiagnetcoverageplugin.rss
-TARGET              devdiagnetcoverageplugin.rsc
-TARGETPATH          ECOM_RESOURCE_DIR
-END
-
-START RESOURCE      devdiagnetcoveragepluginrsc.rss
-HEADER
-TARGETPATH          RESOURCE_FILES_DIR
-LANGUAGE_IDS
-END
-
-LIBRARY				avkon.lib   // ADO & Platformization Changes
-LIBRARY   			eikcoctl.lib // ADO & Platformization Changes
-LIBRARY             diagframework.lib  // ADO & Platformization Changes
-LIBRARY   			eikdlg.lib	// ADO & Platformization Changes
-LIBRARY             euser.lib
-LIBRARY             commonengine.lib      // For StringLoader
-LIBRARY             flogger.lib           // for LOGGER
-LIBRARY             diagpluginbase.lib
-LIBRARY             etel3rdparty.lib      // for CTelephony
-LIBRARY             centralrepository.lib // for CRepository
-//LIBRARY discontinued from platform
-//#if !defined(WINSCW)                      // No ISC In WINSCW
-//LIBRARY             iscapi.lib            // for RISCApi
-//#endif
-
-// End of File
--- a/devicediagnostics/diagplugins/diagnetcoverageplugin/group/diagnetcoverageplugin.xml	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2050 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!DOCTYPE PROJECT [
- <!ELEMENT PROJECT (TARGETLIST, TARGETORDER, GROUPLIST, DESIGNLIST?)>
- <!ELEMENT TARGETLIST (TARGET+)>
- <!ELEMENT TARGET (NAME, SETTINGLIST, FILELIST?, LINKORDER?, SEGMENTLIST?, OVERLAYGROUPLIST?, SUBTARGETLIST?, SUBPROJECTLIST?, FRAMEWORKLIST?, PACKAGEACTIONSLIST?)>
- <!ELEMENT NAME (#PCDATA)>
- <!ELEMENT USERSOURCETREETYPE (#PCDATA)>
- <!ELEMENT PATH (#PCDATA)>
- <!ELEMENT FILELIST (FILE*)>
- <!ELEMENT FILE (PATHTYPE, PATHROOT?, ACCESSPATH?, PATH, PATHFORMAT?, ROOTFILEREF?, FILEKIND?, FILEFLAGS?)>
- <!ELEMENT PATHTYPE (#PCDATA)>
- <!ELEMENT PATHROOT (#PCDATA)>
- <!ELEMENT ACCESSPATH (#PCDATA)>
- <!ELEMENT PATHFORMAT (#PCDATA)>
- <!ELEMENT ROOTFILEREF (PATHTYPE, PATHROOT?, ACCESSPATH?, PATH, PATHFORMAT?)>
- <!ELEMENT FILEKIND (#PCDATA)>
- <!ELEMENT FILEFLAGS (#PCDATA)>
- <!ELEMENT FILEREF (TARGETNAME?, PATHTYPE, PATHROOT?, ACCESSPATH?, PATH, PATHFORMAT?)>
- <!ELEMENT TARGETNAME (#PCDATA)>
- <!ELEMENT SETTINGLIST ((SETTING|PANELDATA)+)>
- <!ELEMENT SETTING (NAME?, (VALUE|(SETTING+)))>
- <!ELEMENT PANELDATA (NAME, VALUE)>
- <!ELEMENT VALUE (#PCDATA)>
- <!ELEMENT LINKORDER (FILEREF*)>
- <!ELEMENT SEGMENTLIST (SEGMENT+)>
- <!ELEMENT SEGMENT (NAME, ATTRIBUTES?, FILEREF*)>
- <!ELEMENT ATTRIBUTES (#PCDATA)>
- <!ELEMENT OVERLAYGROUPLIST (OVERLAYGROUP+)>
- <!ELEMENT OVERLAYGROUP (NAME, BASEADDRESS, OVERLAY*)>
- <!ELEMENT BASEADDRESS (#PCDATA)>
- <!ELEMENT OVERLAY (NAME, FILEREF*)>
- <!ELEMENT SUBTARGETLIST (SUBTARGET+)>
- <!ELEMENT SUBTARGET (TARGETNAME, ATTRIBUTES?, FILEREF?)>
- <!ELEMENT SUBPROJECTLIST (SUBPROJECT+)>
- <!ELEMENT SUBPROJECT (FILEREF, SUBPROJECTTARGETLIST)>
- <!ELEMENT SUBPROJECTTARGETLIST (SUBPROJECTTARGET*)>
- <!ELEMENT SUBPROJECTTARGET (TARGETNAME, ATTRIBUTES?, FILEREF?)>
- <!ELEMENT FRAMEWORKLIST (FRAMEWORK+)>
- <!ELEMENT FRAMEWORK (FILEREF, DYNAMICLIBRARY?, VERSION?)>
- <!ELEMENT PACKAGEACTIONSLIST (PACKAGEACTION+)>
- <!ELEMENT PACKAGEACTION (#PCDATA)>
- <!ELEMENT LIBRARYFILE (FILEREF)>
- <!ELEMENT VERSION (#PCDATA)>
- <!ELEMENT TARGETORDER (ORDEREDTARGET|ORDEREDDESIGN)*>
- <!ELEMENT ORDEREDTARGET (NAME)>
- <!ELEMENT ORDEREDDESIGN (NAME, ORDEREDTARGET+)>
- <!ELEMENT GROUPLIST (GROUP|FILEREF)*>
- <!ELEMENT GROUP (NAME, (GROUP|FILEREF)*)>
- <!ELEMENT DESIGNLIST (DESIGN+)>
- <!ELEMENT DESIGN (NAME, DESIGNDATA)>
- <!ELEMENT DESIGNDATA (#PCDATA)>
-]>
-<?codewarrior exportversion="1.0.1" ideversion="5.0" ?>
-<PROJECT>
-    <TARGETLIST>
-        <TARGET>
-            <NAME>WINSCW UDEB</NAME>
-            <SETTINGLIST>
-
-                <!-- Settings for "Source Trees" panel -->
-                <SETTING><NAME>UserSourceTrees</NAME></SETTING>
-
-                <!-- Settings for "Access Paths" panel -->
-                <SETTING><NAME>AlwaysSearchUserPaths</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>InterpretDOSAndUnixPaths</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>RequireFrameworkStyleIncludes</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>SourceRelativeIncludes</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>UserSearchPaths</NAME>
-                    <SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics_withdom\DeviceDiagnostics\diagplugins\diagnetcoverageplugin\inc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics_withdom\DeviceDiagnostics\diagplugins\diagnetcoverageplugin\data</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics_withdom\DeviceDiagnostics\diagplugins\diagnetcoverageplugin\loc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics_withdom\DeviceDiagnostics\diagplugins\diagnetcoverageplugin\group</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics_withdom\DeviceDiagnostics\diagplugins\diagnetcoverageplugin\src</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING></SETTING>
-                <SETTING><NAME>SystemSearchPaths</NAME>
-                    <SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\ecom</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\internal</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\oem</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\middleware</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\middleware</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\osextensions</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\osextensions</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\osextensions\loc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\middleware\loc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\osextensions\loc\sc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\middleware\loc\sc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\UDEB</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>Symbian_Support\Win32-x86 Support\Libraries\Win32 SDK</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>CodeWarrior</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>Symbian_Support\Runtime\Runtime_x86\Runtime_Win32\Libs</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>CodeWarrior</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING></SETTING>
-
-                <!-- Settings for "Debugger Runtime" panel -->
-                <SETTING><NAME>MWRuntimeSettings_WorkingDirectory</NAME><VALUE/></SETTING>
-                <SETTING><NAME>MWRuntimeSettings_CommandLine</NAME><VALUE/></SETTING>
-                <SETTING><NAME>MWRuntimeSettings_HostApplication</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\udeb\epoc.exe</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>MWRuntimeSettings_EnvVars</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Target Settings" panel -->
-                <SETTING><NAME>Linker</NAME><VALUE>Symbian Linker v2</VALUE></SETTING>
-                <SETTING><NAME>PreLinker</NAME><VALUE/></SETTING>
-                <SETTING><NAME>PostLinker</NAME><VALUE>Symbian Installer v2</VALUE></SETTING>
-                <SETTING><NAME>Targetname</NAME><VALUE>WINSCW UDEB</VALUE></SETTING>
-                <SETTING><NAME>OutputDirectory</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\udeb</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SaveEntriesUsingRelativePaths</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "File Mappings" panel -->
-                <SETTING><NAME>FileMappings</NAME>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>._i</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>._ii</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.c</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cc</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cfg</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cia</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cpp</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cwlink</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>XML</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cxx</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.def</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.h</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.hrh</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.i</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.iby</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.ii</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.inf</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.ini</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.inl</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.loc</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.mmpi</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.pch++</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.pkg</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.policy</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.ra</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.resources</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Resource v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>XML</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.rh</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.rls</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.rss</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.rsg</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.s</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.script</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.txt</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.a</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Object Importer v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.lib</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Object Importer v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.dso</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Object Importer v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.o</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Object Importer v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                </SETTING>
-
-                <!-- Settings for "Build Extras" panel -->
-                <SETTING><NAME>CacheModDates</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>DumpBrowserInfo</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>CacheSubprojects</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>UseThirdPartyDebugger</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>BrowserGenerator</NAME><VALUE>2</VALUE></SETTING>
-                <SETTING><NAME>DebuggerAppPath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>DebuggerCmdLineArgs</NAME><VALUE/></SETTING>
-                <SETTING><NAME>DebuggerWorkingDir</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CodeCompletionPrefixFileName</NAME><VALUE/></SETTING>
-                <SETTING><NAME>CodeCompletionMacroFileName</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Debugger Target" panel -->
-                <SETTING><NAME>ConsoleEncoding</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>LogSystemMessages</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>AutoTargetDLLsPopUp</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>StopAtWatchpoints</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>PauseWhileRunning</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>PauseInterval</NAME><VALUE>5</VALUE></SETTING>
-                <SETTING><NAME>PauseUIFlags</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>AltExePath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>StopAtTempBPOnLaunch</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>CacheSymbolics</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>TempBPFunctionName</NAME><VALUE>E32Main</VALUE></SETTING>
-                <SETTING><NAME>TempBPType</NAME><VALUE>1</VALUE></SETTING>
-
-                <!-- Settings for "Remote Debug" panel -->
-                <SETTING><NAME>Enabled</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>ConnectionName</NAME><VALUE/></SETTING>
-                <SETTING><NAME>DownloadPath</NAME><VALUE/></SETTING>
-                <SETTING><NAME>LaunchRemoteApp</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>RemoteAppPath</NAME><VALUE/></SETTING>
-                <SETTING><NAME>CoreID</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>JTAGClockSpeed</NAME><VALUE>8000</VALUE></SETTING>
-                <SETTING><NAME>IsMultiCore</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>OSDownload</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>UseGlobalOSDownload</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>OSDownloadConnectionName</NAME><VALUE/></SETTING>
-                <SETTING><NAME>OSDownloadPath</NAME><VALUE/></SETTING>
-                <SETTING><NAME>AltDownload</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>AltDownloadConnectionName</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "x86 Exceptions" panel -->
-                <SETTING><NAME>MWDebugger_X86_Exceptions</NAME>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                
-                <!-- Settings for "Auto-target" panel -->
-                <SETTING><NAME>OtherExecutables</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Analyzer Connections" panel -->
-                <SETTING><NAME>AnalyzerConnectionName</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Custom Keywords" panel -->
-                <SETTING><NAME>CustomColor1</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor2</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor3</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor4</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "ARM Debugger" panel -->
-                <SETTING><NAME>Processor</NAME><VALUE>Generic</VALUE></SETTING>
-                <SETTING><NAME>BraekPoinType_II</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>UseInitFile</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>UseConfigFile</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>IDexecutable</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>IDinitialized</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>IDuninitialized</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>IDconstant</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>SDexecutable</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>SDinitialized</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>SDuninitialized</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>SDconstant</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>VerifyMemWrites</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>ShowMPC107regs</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>InitializationFile</NAME><VALUE/></SETTING>
-                <SETTING><NAME>ConfigurationFile</NAME><VALUE/></SETTING>
-                <SETTING><NAME>BreakpointType</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>WatchpointType</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>TargetOS</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>RTOSPluginName</NAME><VALUE/></SETTING>
-                <SETTING><NAME>ByteOrderType</NAME><VALUE>0</VALUE></SETTING>
-                <PANELDATA><NAME>CodeTest SYMBIAN Instrumenter</NAME><VALUE>
-                    0200020000000100000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000433A5C0000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000637466696C657300000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000636F6465746573742E6964620000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000
-                </VALUE></PANELDATA>
-
-                <!-- Settings for "Symbian Installation" panel -->
-                <SETTING><NAME>SymbianInstallationOutputFilename</NAME><VALUE>Application.sis</VALUE></SETTING>
-                <SETTING><NAME>SymbianInstallationOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>SymbianInstallationContentSearchLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\udeb</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianInstallationPassword</NAME><VALUE/></SETTING>
-                <SETTING><NAME>SymbianInstallationCreateStubFile</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "Symbian Installer Panel v2" panel -->
-                <SETTING><NAME>SymbianInstallationOutputFilename</NAME><VALUE>Application.sis</VALUE></SETTING>
-                <SETTING><NAME>SymbianInstallationOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>SymbianInstallationContentSearchLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\udeb</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianInstallationPassword</NAME><VALUE/></SETTING>
-                <SETTING><NAME>SymbianInstallationCreateStubFile</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "Symbian Resource Panel" panel -->
-                <SETTING><NAME>SymbianResourcesMMPFileLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics_withdom\DeviceDiagnostics\diagplugins\diagnetcoverageplugin\group</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianResourcesBinaryOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\udeb</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianResourcesHeaderFileOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\include</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-
-                <!-- Settings for "Symbian Resources Panel v2" panel -->
-                <SETTING><NAME>SymbianResourcesMMPFileLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics_withdom\DeviceDiagnostics\diagplugins\diagnetcoverageplugin\group</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianResourcesBinaryOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\udeb</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianResourcesHeaderFileOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\include</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-
-                <!-- Settings for "Remote Download" panel -->
-                <SETTING><NAME>FileList</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Symbian ARM Debugger" panel -->
-                <SETTING><NAME>Processor</NAME><VALUE>Generic</VALUE></SETTING>
-                <SETTING><NAME>UseInitFile</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>UseConfigFile</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>ResetTarget</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>InitializationFile</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>ConfigurationFile</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>TargetOS</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>RTOSPluginName</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Symbian Common Panel" panel -->
-                <SETTING><NAME>ShowCommandLine</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>SymbianEpocToolsPath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE></VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-
-                <!-- Settings for "Symbian Compiler Panel" panel -->
-                <SETTING><NAME>PrefixFile</NAME><VALUE>feature_settings.hrh</VALUE></SETTING>
-                <SETTING><NAME>CompilerXMLDescriptor</NAME><VALUE>Metrowerks x86 Compiler</VALUE></SETTING>
-                <SETTING><NAME>Macros</NAME><VALUE>__SYMBIAN32__,__CW32__,__WINS__,__WINSCW__,__DLL__,_DEBUG,_UNICODE,__SUPPORT_CPP_EXCEPTIONS__,</VALUE></SETTING>
-                <SETTING><NAME>CodeTEST</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>EnableSWIC</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Arguments</NAME><VALUE>-wchar_t off -align 4 -warnings on -w nohidevirtual, nounusedexpr -msgstyle gcc -enum int -str pool -exc ms -trigraphs on -O0 -inline off -nostdinc</VALUE></SETTING>
-                <SETTING><NAME>CIAArgs</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Symbian Debugging" panel -->
-                <SETTING><NAME>Parse Log File</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Log File Path</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>Symbian SDK Folder</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>Log Unresolved Modules</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Log Unresolved Sym Files</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Debug Non-XIP Executables</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "Symbian Kernel Debugging" panel -->
-                <SETTING><NAME>Start Address</NAME><VALUE>0x00000000</VALUE></SETTING>
-                <SETTING><NAME>Run From Start Address</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Download Image</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>OS Image Path</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>Download Address</NAME><VALUE>0x00000000</VALUE></SETTING>
-                <SETTING><NAME>Ask First</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Debug Bootrom</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Bootrom Sym File</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "Symbian Linker Panel" panel -->
-                <SETTING><NAME>LinkOutputFile</NAME><VALUE>DevDiagNetCoveragePlugin.dll</VALUE></SETTING>
-                <SETTING><NAME>LinkCmdLine</NAME><VALUE/></SETTING>
-                <SETTING><NAME>SymbianImportLibrary</NAME><VALUE>DevDiagNetCoveragePlugin.lib</VALUE></SETTING>
-                <SETTING><NAME>canDebug</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>canRun</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "Symbian RomBuild Panel" panel -->
-                <SETTING><NAME>CommandLine</NAME><VALUE>buildrom -D_DEBUG devkit lubbock techview -olubbock_gui.img</VALUE></SETTING>
-                <SETTING><NAME>OutputPath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>C:\</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>DisplayMessages</NAME><VALUE>true</VALUE></SETTING>
-
-                <!-- Settings for "Symbian Target" panel -->
-                <SETTING><NAME>TargetArchitecture</NAME><VALUE>WINSCW</VALUE></SETTING>
-                <SETTING><NAME>LogMessages</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>SuppressWarnings</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>GenerateSymbolics</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>CompilerPrefix</NAME><VALUE/></SETTING>
-                <SETTING><NAME>CompilerCmdLine</NAME><VALUE/></SETTING>
-                <SETTING><NAME>SymbianImportLibraryPath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>C:\</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "Symbian Tools" panel -->
-                <SETTING><NAME>Gnu Tools Path</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>C:\</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>Epoc32 Tools Path</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>C:\</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-            </SETTINGLIST>
-            <FILELIST>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagNetCoveragePlugin.mmp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagNetCoveragePluginWINSCW.resources</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>EDLL.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagNetCoveragePluginImplementationTable.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagNetCoveragePlugin.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagNetCoveragePlugin_UID_.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>avkon.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>eikcoctl.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>diagframework.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>eikdlg.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>euser.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>CommonEngine.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>flogger.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagPluginBase.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>etel3rdparty.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>centralrepository.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagNetCoveragePlugin.h</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagNetCoveragePlugin.hrh</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagNetCoveragePluginPrivateCRKeys.h</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagNetCoveragePluginWINSCWUDEB.cwlink</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-</FILELIST>
-            <LINKORDER>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagNetCoveragePlugin.mmp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagNetCoveragePluginWINSCW.resources</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>EDLL.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagNetCoveragePluginImplementationTable.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagNetCoveragePlugin.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagNetCoveragePlugin_UID_.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>avkon.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>eikcoctl.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>diagframework.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>eikdlg.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>euser.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>CommonEngine.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>flogger.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagPluginBase.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>etel3rdparty.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>centralrepository.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagNetCoveragePlugin.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagNetCoveragePlugin.hrh</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagNetCoveragePluginPrivateCRKeys.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagNetCoveragePluginWINSCWUDEB.cwlink</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-</LINKORDER>
-        </TARGET><TARGET>
-            <NAME>WINSCW UREL</NAME>
-            <SETTINGLIST>
-
-                <!-- Settings for "Source Trees" panel -->
-                <SETTING><NAME>UserSourceTrees</NAME></SETTING>
-
-                <!-- Settings for "Access Paths" panel -->
-                <SETTING><NAME>AlwaysSearchUserPaths</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>InterpretDOSAndUnixPaths</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>RequireFrameworkStyleIncludes</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>SourceRelativeIncludes</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>UserSearchPaths</NAME>
-                    <SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics_withdom\DeviceDiagnostics\diagplugins\diagnetcoverageplugin\inc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics_withdom\DeviceDiagnostics\diagplugins\diagnetcoverageplugin\data</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics_withdom\DeviceDiagnostics\diagplugins\diagnetcoverageplugin\loc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics_withdom\DeviceDiagnostics\diagplugins\diagnetcoverageplugin\group</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics_withdom\DeviceDiagnostics\diagplugins\diagnetcoverageplugin\src</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING></SETTING>
-                <SETTING><NAME>SystemSearchPaths</NAME>
-                    <SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\ecom</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\internal</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\oem</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\middleware</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\middleware</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\osextensions</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\osextensions</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\osextensions\loc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\middleware\loc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\osextensions\loc\sc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\middleware\loc\sc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\UREL</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\release\WINSCW\UDEB</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>Symbian_Support\Win32-x86 Support\Libraries\Win32 SDK</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>CodeWarrior</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>Symbian_Support\Runtime\Runtime_x86\Runtime_Win32\Libs</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>CodeWarrior</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING></SETTING>
-
-                <!-- Settings for "Debugger Runtime" panel -->
-                <SETTING><NAME>MWRuntimeSettings_WorkingDirectory</NAME><VALUE/></SETTING>
-                <SETTING><NAME>MWRuntimeSettings_CommandLine</NAME><VALUE/></SETTING>
-                <SETTING><NAME>MWRuntimeSettings_HostApplication</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\urel\epoc.exe</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>MWRuntimeSettings_EnvVars</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Target Settings" panel -->
-                <SETTING><NAME>Linker</NAME><VALUE>Symbian Linker v2</VALUE></SETTING>
-                <SETTING><NAME>PreLinker</NAME><VALUE/></SETTING>
-                <SETTING><NAME>PostLinker</NAME><VALUE>Symbian Installer v2</VALUE></SETTING>
-                <SETTING><NAME>Targetname</NAME><VALUE>WINSCW UREL</VALUE></SETTING>
-                <SETTING><NAME>OutputDirectory</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\urel</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SaveEntriesUsingRelativePaths</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "File Mappings" panel -->
-                <SETTING><NAME>FileMappings</NAME>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>._i</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>._ii</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.c</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cc</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cfg</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cia</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cpp</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cwlink</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>XML</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cxx</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.def</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.h</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.hrh</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.i</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.iby</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.ii</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.inf</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.ini</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.inl</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.loc</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.mmpi</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.pch++</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.pkg</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.policy</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.ra</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.resources</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Resource v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>XML</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.rh</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.rls</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.rss</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.rsg</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.s</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.script</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.txt</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.a</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Object Importer v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.lib</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Object Importer v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.dso</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Object Importer v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.o</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Object Importer v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                </SETTING>
-
-                <!-- Settings for "Build Extras" panel -->
-                <SETTING><NAME>CacheModDates</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>DumpBrowserInfo</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>CacheSubprojects</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>UseThirdPartyDebugger</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>BrowserGenerator</NAME><VALUE>2</VALUE></SETTING>
-                <SETTING><NAME>DebuggerAppPath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>DebuggerCmdLineArgs</NAME><VALUE/></SETTING>
-                <SETTING><NAME>DebuggerWorkingDir</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CodeCompletionPrefixFileName</NAME><VALUE/></SETTING>
-                <SETTING><NAME>CodeCompletionMacroFileName</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Debugger Target" panel -->
-                <SETTING><NAME>ConsoleEncoding</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>LogSystemMessages</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>AutoTargetDLLsPopUp</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>StopAtWatchpoints</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>PauseWhileRunning</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>PauseInterval</NAME><VALUE>5</VALUE></SETTING>
-                <SETTING><NAME>PauseUIFlags</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>AltExePath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>StopAtTempBPOnLaunch</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>CacheSymbolics</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>TempBPFunctionName</NAME><VALUE>E32Main</VALUE></SETTING>
-                <SETTING><NAME>TempBPType</NAME><VALUE>1</VALUE></SETTING>
-
-                <!-- Settings for "Remote Debug" panel -->
-                <SETTING><NAME>Enabled</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>ConnectionName</NAME><VALUE/></SETTING>
-                <SETTING><NAME>DownloadPath</NAME><VALUE/></SETTING>
-                <SETTING><NAME>LaunchRemoteApp</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>RemoteAppPath</NAME><VALUE/></SETTING>
-                <SETTING><NAME>CoreID</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>JTAGClockSpeed</NAME><VALUE>8000</VALUE></SETTING>
-                <SETTING><NAME>IsMultiCore</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>OSDownload</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>UseGlobalOSDownload</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>OSDownloadConnectionName</NAME><VALUE/></SETTING>
-                <SETTING><NAME>OSDownloadPath</NAME><VALUE/></SETTING>
-                <SETTING><NAME>AltDownload</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>AltDownloadConnectionName</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "x86 Exceptions" panel -->
-                <SETTING><NAME>MWDebugger_X86_Exceptions</NAME>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                
-                <!-- Settings for "Auto-target" panel -->
-                <SETTING><NAME>OtherExecutables</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Analyzer Connections" panel -->
-                <SETTING><NAME>AnalyzerConnectionName</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Custom Keywords" panel -->
-                <SETTING><NAME>CustomColor1</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor2</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor3</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor4</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "ARM Debugger" panel -->
-                <SETTING><NAME>Processor</NAME><VALUE>Generic</VALUE></SETTING>
-                <SETTING><NAME>BraekPoinType_II</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>UseInitFile</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>UseConfigFile</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>IDexecutable</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>IDinitialized</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>IDuninitialized</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>IDconstant</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>SDexecutable</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>SDinitialized</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>SDuninitialized</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>SDconstant</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>VerifyMemWrites</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>ShowMPC107regs</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>InitializationFile</NAME><VALUE/></SETTING>
-                <SETTING><NAME>ConfigurationFile</NAME><VALUE/></SETTING>
-                <SETTING><NAME>BreakpointType</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>WatchpointType</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>TargetOS</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>RTOSPluginName</NAME><VALUE/></SETTING>
-                <SETTING><NAME>ByteOrderType</NAME><VALUE>0</VALUE></SETTING>
-                <PANELDATA><NAME>CodeTest SYMBIAN Instrumenter</NAME><VALUE>
-                    0200020000000100000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000433A5C0000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000637466696C657300000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000636F6465746573742E6964620000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000
-                </VALUE></PANELDATA>
-
-                <!-- Settings for "Symbian Installation" panel -->
-                <SETTING><NAME>SymbianInstallationOutputFilename</NAME><VALUE>Application.sis</VALUE></SETTING>
-                <SETTING><NAME>SymbianInstallationOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>SymbianInstallationContentSearchLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\urel</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianInstallationPassword</NAME><VALUE/></SETTING>
-                <SETTING><NAME>SymbianInstallationCreateStubFile</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "Symbian Installer Panel v2" panel -->
-                <SETTING><NAME>SymbianInstallationOutputFilename</NAME><VALUE>Application.sis</VALUE></SETTING>
-                <SETTING><NAME>SymbianInstallationOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>SymbianInstallationContentSearchLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\urel</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianInstallationPassword</NAME><VALUE/></SETTING>
-                <SETTING><NAME>SymbianInstallationCreateStubFile</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "Symbian Resource Panel" panel -->
-                <SETTING><NAME>SymbianResourcesMMPFileLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics_withdom\DeviceDiagnostics\diagplugins\diagnetcoverageplugin\group</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianResourcesBinaryOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\urel</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianResourcesHeaderFileOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\include</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-
-                <!-- Settings for "Symbian Resources Panel v2" panel -->
-                <SETTING><NAME>SymbianResourcesMMPFileLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics_withdom\DeviceDiagnostics\diagplugins\diagnetcoverageplugin\group</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianResourcesBinaryOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\urel</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianResourcesHeaderFileOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\include</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-
-                <!-- Settings for "Remote Download" panel -->
-                <SETTING><NAME>FileList</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Symbian ARM Debugger" panel -->
-                <SETTING><NAME>Processor</NAME><VALUE>Generic</VALUE></SETTING>
-                <SETTING><NAME>UseInitFile</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>UseConfigFile</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>ResetTarget</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>InitializationFile</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>ConfigurationFile</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>TargetOS</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>RTOSPluginName</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Symbian Common Panel" panel -->
-                <SETTING><NAME>ShowCommandLine</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>SymbianEpocToolsPath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE></VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-
-                <!-- Settings for "Symbian Compiler Panel" panel -->
-                <SETTING><NAME>PrefixFile</NAME><VALUE>feature_settings.hrh</VALUE></SETTING>
-                <SETTING><NAME>CompilerXMLDescriptor</NAME><VALUE>Metrowerks x86 Compiler</VALUE></SETTING>
-                <SETTING><NAME>Macros</NAME><VALUE>__SYMBIAN32__,__CW32__,__WINS__,__WINSCW__,__DLL__,NDEBUG,_UNICODE,__SUPPORT_CPP_EXCEPTIONS__,</VALUE></SETTING>
-                <SETTING><NAME>CodeTEST</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>EnableSWIC</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Arguments</NAME><VALUE>-wchar_t off -align 4 -warnings on -w nohidevirtual, nounusedexpr -msgstyle gcc -enum int -str pool -exc ms -trigraphs on -O4,s -nostdinc</VALUE></SETTING>
-                <SETTING><NAME>CIAArgs</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Symbian Debugging" panel -->
-                <SETTING><NAME>Parse Log File</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Log File Path</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>Symbian SDK Folder</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>Log Unresolved Modules</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Log Unresolved Sym Files</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Debug Non-XIP Executables</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "Symbian Kernel Debugging" panel -->
-                <SETTING><NAME>Start Address</NAME><VALUE>0x00000000</VALUE></SETTING>
-                <SETTING><NAME>Run From Start Address</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Download Image</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>OS Image Path</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>Download Address</NAME><VALUE>0x00000000</VALUE></SETTING>
-                <SETTING><NAME>Ask First</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Debug Bootrom</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Bootrom Sym File</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "Symbian Linker Panel" panel -->
-                <SETTING><NAME>LinkOutputFile</NAME><VALUE>DevDiagNetCoveragePlugin.dll</VALUE></SETTING>
-                <SETTING><NAME>LinkCmdLine</NAME><VALUE/></SETTING>
-                <SETTING><NAME>SymbianImportLibrary</NAME><VALUE>DevDiagNetCoveragePlugin.lib</VALUE></SETTING>
-                <SETTING><NAME>canDebug</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>canRun</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "Symbian RomBuild Panel" panel -->
-                <SETTING><NAME>CommandLine</NAME><VALUE>buildrom -D_DEBUG devkit lubbock techview -olubbock_gui.img</VALUE></SETTING>
-                <SETTING><NAME>OutputPath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>C:\</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>DisplayMessages</NAME><VALUE>true</VALUE></SETTING>
-
-                <!-- Settings for "Symbian Target" panel -->
-                <SETTING><NAME>TargetArchitecture</NAME><VALUE>WINSCW</VALUE></SETTING>
-                <SETTING><NAME>LogMessages</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>SuppressWarnings</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>GenerateSymbolics</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>CompilerPrefix</NAME><VALUE/></SETTING>
-                <SETTING><NAME>CompilerCmdLine</NAME><VALUE/></SETTING>
-                <SETTING><NAME>SymbianImportLibraryPath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>C:\</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "Symbian Tools" panel -->
-                <SETTING><NAME>Gnu Tools Path</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>C:\</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>Epoc32 Tools Path</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>C:\</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-            </SETTINGLIST>
-            <FILELIST>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagNetCoveragePlugin.mmp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagNetCoveragePluginWINSCW.resources</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>EDLL.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagNetCoveragePluginImplementationTable.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagNetCoveragePlugin.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagNetCoveragePlugin_UID_.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>avkon.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>eikcoctl.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>diagframework.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>eikdlg.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>euser.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>CommonEngine.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>flogger.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagPluginBase.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>etel3rdparty.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>centralrepository.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagNetCoveragePluginWINSCWUREL.cwlink</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-</FILELIST>
-            <LINKORDER>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagNetCoveragePlugin.mmp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagNetCoveragePluginWINSCW.resources</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>EDLL.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagNetCoveragePluginImplementationTable.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagNetCoveragePlugin.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagNetCoveragePlugin_UID_.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>avkon.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>eikcoctl.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>diagframework.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>eikdlg.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>euser.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>CommonEngine.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>flogger.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagPluginBase.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>etel3rdparty.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>centralrepository.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagNetCoveragePluginWINSCWUREL.cwlink</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-</LINKORDER>
-        </TARGET><TARGET>
-<NAME>Build All</NAME><SETTINGLIST><SETTING><NAME>Linker</NAME><VALUE>None</VALUE></SETTING>
-<SETTING><NAME>Targetname</NAME><VALUE>Build All</VALUE></SETTING>
-</SETTINGLIST>
-<FILELIST></FILELIST>
-<LINKORDER></LINKORDER>
-<SUBTARGETLIST><SUBTARGET><TARGETNAME>WINSCW UDEB</TARGETNAME></SUBTARGET>
-<SUBTARGET><TARGETNAME>WINSCW UREL</TARGETNAME></SUBTARGET>
-</SUBTARGETLIST></TARGET></TARGETLIST>
-
-    <TARGETORDER>
-<ORDEREDTARGET><NAME>WINSCW UDEB</NAME></ORDEREDTARGET>
-<ORDEREDTARGET><NAME>WINSCW UREL</NAME></ORDEREDTARGET>
-<ORDEREDTARGET><NAME>Build All</NAME></ORDEREDTARGET>
-</TARGETORDER>
-
-    <GROUPLIST><FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DiagNetCoveragePlugin.mmp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<GROUP><NAME>Source</NAME>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DiagNetCoveragePluginImplementationTable.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DiagNetCoveragePlugin.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DevDiagNetCoveragePlugin_UID_.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-</GROUP>
-<GROUP><NAME>Headers</NAME>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DiagNetCoveragePlugin.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DiagNetCoveragePlugin.hrh</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DiagNetCoveragePluginPrivateCRKeys.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-</GROUP>
-<GROUP><NAME>Resources</NAME>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DevDiagNetCoveragePluginWINSCW.resources</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-</GROUP>
-<GROUP><NAME>Link</NAME>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DevDiagNetCoveragePluginWINSCWUDEB.cwlink</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UREL</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DevDiagNetCoveragePluginWINSCWUREL.cwlink</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-</GROUP>
-<GROUP><NAME>Libraries</NAME>
-<GROUP><NAME>WINSCW</NAME>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>EDLL.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>avkon.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>eikcoctl.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>diagframework.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>eikdlg.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>euser.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>CommonEngine.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>flogger.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DiagPluginBase.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>etel3rdparty.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>centralrepository.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UREL</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>EDLL.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-</GROUP>
-</GROUP>
-</GROUPLIST>
-
-</PROJECT>
--- a/devicediagnostics/diagplugins/diagnetcoverageplugin/inc/diagnetcoverageplugin.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,241 +0,0 @@
-/*
-* 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:  Network coverage plug-in.
-*
-*/
-
-
-#ifndef DIAGNETCOVERAGEPLUGIN_H
-#define DIAGNETCOVERAGEPLUGIN_H
-
-// INCLUDES
-#include <etel3rdparty.h>            // CTelephony
-
-#include <DiagTestPluginBase.h>      // CDiagTestPluginBase
-#include <DiagResultsDatabaseItem.h> // CDiagResultsDatabaseItem::TResult
-#include "diagnetcoverageplugin.hrh" // DIAG_NET_COVERAGE_PLUGIN_UID
-#include <AknWaitDialog.h> 
-//CONSTANTS
-
-const TUid KDiagNetCoveragePluginUid = { DIAG_NET_COVERAGE_PLUGIN_UID };
-
-// MACROS
-
-// DATA TYPES
-
-// FUNCTION PROTOTYPES
-
-// FORWARD DECLARATIONS
-class CPeriodic;
-class CDiagResultsDbItemBuilder;
-
-
-// CLASS DEFINITION
-class CDiagNetCoveragePlugin : public CDiagTestPluginBase,
-                               public MProgressDialogCallback
-    {
-    public: // Constructors and destructor
-        /**
-        * Symbian OS two-phased constructor
-        * @return Net Coverage Plugin
-        */
-        static MDiagPlugin* NewL( TAny* aInitParams );
-
-        /**
-        * Destructor
-        */
-        virtual ~CDiagNetCoveragePlugin();
-        
-    private: // Constructors
-
-        /**
-        * C++ default constructor.
-        */
-        CDiagNetCoveragePlugin( CDiagPluginConstructionParam* aInitParams );
-
-        /**
-        * Symbian OS default constructor.
-        *
-        */
-        void ConstructL();        
-
-    private: // from CActive
-        /**
-        * Handle active object completion event
-        * @see CActive
-        */
-        void RunL();
-    
-        /**
-        * Handle cancel
-        * @see CActive
-        */
-        void DoCancel();
-
-    private: // From CDiagTestPluginBase
-        
-        /**
-        * @see CDiagTestPluginBase::Visible()
-        */
-        virtual TBool IsVisible() const;
-
-        /**
-        * @see CDiagTestPluginBase::RunMode()
-        */
-        virtual TRunMode RunMode() const;
-
-        /**
-        * @see CDiagTestPluginBase::TotalSteps()
-        */
-        virtual TUint TotalSteps() const;
-
-        /**
-        * @see CDiagTestPluginBase::GetPluginNameL
-        */
-        virtual HBufC* GetPluginNameL( TNameLayoutType aLayoutType ) const;
-
-        /**
-        * @see CDiagTestPluginBase::Uid
-        */
-        virtual TUid Uid() const;                   
-
-        /**
-        * Handle plug-in execution.
-        * @see CDiagTestPluginBase::DoRunTestL
-        */
-        void DoRunTestL();
-
-        /**
-        * Clean up after test is completed or stopped.
-        * @see CDiagTestPluginBase::DoStopAndCleanupL
-        */
-        virtual void DoStopAndCleanupL();
-        
-        // ADO & Platformization Changes
-        TBool ShowMessageQueryL( TInt aResourceId, TInt &aButtonId  );
-
-    private:    // private data types
-    
-        // Internal asynchronous state
-        enum TState
-            {
-            EStateUninitialized = 0,
-            EStateOpeningIsc,
-            EStateWaitForSendBandInfoRequest,
-            EStateWaitForReceivebandInfoResponse,
-            EStateWaitForBandType,
-            EStateWaitForSignalStrength,
-            EStateTestCancel,
-            EStateTestCompleted
-            };
-            
-        // Possible network types for signal strength measurement
-        enum TNetworkType
-            {
-            //Type
-            ETypeUnknown = -1,
-            ETypeGSM,
-            ETypeUMTS,
-            ETypeBandCount
-            };
-            
-        // Possible network bands for signal strength measurement            
-        enum TNetworkBand
-            {
-            EBandUnknown = -1,
-            EBand900_850,
-            EBand1800_1900_2100
-            }; 
-            
-        enum TNetworkCoveragePanicCodes
-            {
-            EPanicUnhandledLeave = 0
-            };                                    
-
-    private:    // internal API
-        /**
-        * Initiate asynchronous request to obtain band type
-        */        
-        void ObtainBandTypeAsyncL();
-        
-        /**
-        * Read and store threshold values
-        */              
-        void ReadThresholdValuesL();  
-                
-        /**
-        * Get network access from ETel 3rd party API
-        */                              
-        void CheckNetworkAccessL();
-        
-        /**
-        * Get signal strength from ETel 3rd party API
-        */                   
-        void CheckSignalStrengthL();
-        
-        /**
-        * Panic with string indicating net coverage plug-in and <aPanicCode> as
-        * the panic code
-        */                   
-        void Panic(TInt aPanicCode);
-
-		/**
-		/* Wait Note
-		/*
-		*/
-		void ShowProgressNoteL();
-		
-		void DialogDismissedL( TInt aButtonId );
-		
-    private:    // data
-        // Current state of plug-in execution
-        TState                              iState;
-        
-        // Interface to ETel 3rd Party Telephony lib
-        CTelephony*                         iTelephony;        	
-        
-        // Network information from ETel (contains network access type)
-		CTelephony::TNetworkInfoV1          iNetworkInfoV1;
-		
-		// Signal strength information from ETel
-		CTelephony::TSignalStrengthV1       iSignalStrengthV1;
-		
-		// TPckg object for iNetworkInfoV1
-		CTelephony::TNetworkInfoV1Pckg      iNetworkInfoV1Pckg;		
-		
-		// TPckg object for iSignalStrengthV1
-		CTelephony::TSignalStrengthV1Pckg   iSignalStrengthV1Pckg;		
-		
-		// Network type (UMTS vs. GSM)
-		TNetworkType                        iNetworkType;
-		
-		// Network band class
-		TNetworkBand                        iNetworkBand;
-		
-		// Threshold values for network coverage are read from CR key
-		TReal                               iThresholdValues[2][2];		
-		
-		// Counter to keep track of test progress
-		TInt                                iProgressCounter;
-		
-		//Wait Dialog
-		CAknWaitDialog*      iWaitDialog;
-		
-		TBool idialogOn;
-    };
-
-#endif //DIAGNETCOVERAGEPLUGIN_H
-
-// End of File
-
--- a/devicediagnostics/diagplugins/diagnetcoverageplugin/inc/diagnetcoverageplugin.hrh	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-/*
-* 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:  Contains common definitions for menu ids
-*
-*/
-
-
-#ifndef DIAGNETCOVERAGEPLUGIN_HRH
-#define DIAGNETCOVERAGEPLUGIN_HRH
-
-// ECOM Plug-in UID
-#define DIAG_NET_COVERAGE_PLUGIN_UID 0x2000E597
-
-// commands
-
-enum TMyMenuCmdIDs
-   {
-    ENetcoverageTestSkip = 1, // do not start from 0
-    ENetcoverageTestCancel,
-    ENetcoverageTestBack,
-    ENetcoverageTestNo,
-    ENetcoverageTestYes
-   };
-
- /** Dialog ids.  These are used in the application's resource file.
- */
-enum TNetworkNoteControlIds
-    {
-    EYBWaitNoteId = 0x100    
-    };
-    
-#endif //  DIAGNETCOVERAGEPLUGIN_HRH
-
-//End of File
--- a/devicediagnostics/diagplugins/diagnetcoverageplugin/inc/diagnetcoveragepluginprivatecrkeys.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-/*
-* 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:  Private Central Repository keys.
-*
-*/
-
-
-#ifndef DIAGNETCOVERAGEPRIVATECRKEYS_H
-#define DIAGNETCOVERAGEPRIVATECRKEYS_H
-
-//  INCLUDES
-
-#include <e32std.h>
-
-// =============================================================================
-// Network Coverage Plug-in
-// =============================================================================
-
-const TUid KCRUidNetworkCoverage = { 0x2000E596 };
-
-// Minimum threshold for signal strength on the GSM 850 band
-const TUint32 KPhoneDoctorGSM850SigStrThreshold     = 0x00000001;
-	
-// Minimum threshold for signal strength on the GSM 1900 band	
-const TUint32 KPhoneDoctorGSM1900SigStrThreshold	= 0x00000002;
-
-// Minimum threshold for signal strength on the UMTS 850 band
-const TUint32 KPhoneDoctorUMTS850SigStrThreshold	= 0x00000003;
-	
-// Minimum threshold for signal strength on the UMTS 1900 band	
-const TUint32 KPhoneDoctorUMTS1900SigStrThreshold	= 0x00000004;
-
-
-#endif      // DIAGNETCOVERAGEPRIVATECRKEYS_H
-
-// End of File
-
-
-
--- a/devicediagnostics/diagplugins/diagnetcoverageplugin/loc/diagnetcoverageplugin.loc	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,75 +0,0 @@
-/*
-* 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:  Localization strings for Network Coverage Plugin.
-*
-*/
-
-
-//  LOCALISATION STRINGS
-
-// NEW
-
-//d:Voice network test text for results view
-//l:list_single_graphic_heading_pane_t1_cp2
-//w:
-//r: 3.2
-//
-#define qtn_diag_lst_network_coverage    "Network coverage test"
-
-//d:Voice network test text for suite view
-//l:list_single_graphic_pane_t1
-//w:
-//r: 3.2
-//
-//#define qtn_diag_lst_test_voice_network    "Network coverage test" // LVT Change
-
-//d:Voice network test text for starting dialog header
-//l:heading_pane_t1
-//w:
-//r: 3.2
-//
-#define qtn_diag_msg_title_network_coverage   "Network coverage test"
-
-//d:Voice network test descriptiong
-//l:popup_info_list_pane_t1
-//w:
-//r: 3.2
-//
-#define qtn_diag_msg_info_network_coverage   "The following test will check network coverage."
-
-//d:Voice network test text for title pane of suite/result view
-//l:title_pane_t2/opt12
-//w:
-//r: 3.2
-//
-//#define qtn_diag_title_test_voice_network    "Network coverage test" // LVT Change
-
-//d:Failed result text
-//l:popup_info_list_pane_t1
-//r:5.0
-//
-#define qtn_diag_conf_test_failed_network_coverage "Network coverage test"
-
-//d:Message text nw coverage wait
-//l:popup_note_wait_window
-//r:3.2
-//
-#define qtn_diag_msg_testing_network_coverage "Testing network coverage"
-
-#define qtn_diag_softk_skip "Skip"
-
-
-// End of File
-
-
--- a/devicediagnostics/diagplugins/diagnetcoverageplugin/rom_files/devdiagnetcoverageplugin.iby	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-/*
-* 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:  Image description file for project Network Coverage Plugin
-*
-*/
-
-
-#ifndef DEVDIAG_NETCOVERAGE_PLUGIN_IBY
-#define DEVDIAG_NETCOVERAGE_PLUGIN_IBY
-
-#ifdef FF_DEVICE_DIAGNOSTICS_APP 
-
-#include <data_caging_paths_for_iby.hrh>
-
-ECOM_PLUGIN( devdiagnetcoverageplugin.dll, devdiagnetcoverageplugin.rsc )
-
-#endif
-
-#endif // DEVDIAG_NETCOVERAGE_PLUGIN_IBY
-
-// end of file
--- a/devicediagnostics/diagplugins/diagnetcoverageplugin/rom_files/devdiagnetcoverageplugin_resources.iby	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-/*
-* 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:  Image description file for resources of project Network Coverage Plugin
-*
-*/
-
-
-#ifndef DEVDIAG_NETCOVERAGE_PLUGIN_RESOURCES_IBY
-#define DEVDIAG_NETCOVERAGE_PLUGIN_RESOURCES_IBY
-
-#ifdef FF_DEVICE_DIAGNOSTICS_APP 
-
-#include <data_caging_paths_for_iby.hrh>
-
-data=DATAZ_\RESOURCE_FILES_DIR\devdiagnetcoveragepluginrsc.rsc RESOURCE_FILES_DIR\devdiagnetcoveragepluginrsc.rsc
-
-#endif
-
-#endif // DEVDIAG_NETCOVERAGE_PLUGIN_RESOURCES_IBY
-
-// end of file
--- a/devicediagnostics/diagplugins/diagnetcoverageplugin/src/diagnetcoverageplugin.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,599 +0,0 @@
-/*
-* 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:  Diagnostics Framework Plug-in to test network coverage on
-                  the currently locked channel.
-*
-*/
-
-
-// CLASS DECLARATION
-#include "diagnetcoverageplugin.h"
-
-// SYSTEM INCLUDE FILES
-#include <centralrepository.h>
-#include <StringLoader.h>               // StringLoader
-
-#include <DiagTestObserver.h>           // MDiagTestObserver
-#include <DiagTestExecParam.h>          // TDiagTestExecParam
-#include <DiagResultsDbItemBuilder.h>   // CDiagResultsDbItemBuilder
-#include <DiagResultDetailBasic.h>      // CDiagResultDetailBasic
-#include <DiagFrameworkDebug.h>         // LOGSTRING
-#include <devdiagnetcoveragepluginrsc.rsg>
-
-// USER INCLUDE FILES
-#include "diagnetcoveragepluginprivatecrkeys.h"
-
-
-// ADO & Platformization Changes
-#include <DiagFrameworkDebug.h>                     // debug macros
-#include <DiagEngineCommon.h>                       // MDiagEngineCommon
-#include <DiagCommonDialog.h> 
-#include <AknDialog.h> // ADO & Platformization Changes
-#include <aknmessagequerydialog.h>  // ADO & Platformization Changes
-#include <DiagPluginExecPlan.h>
-#include <DiagExecPlanEntry.h>
-
-
-// EXTERNAL DATA STRUCTURES
-
-// EXTERNAL FUNCTION PROTOTYPES
-
-// CONSTANTS
-
-static const TInt KTotalTestSteps = 2;
-_LIT( KDiagNetCoveragePluginResourceFileName, "z:DevDiagNetCoveragePluginRsc.rsc" );
-
-// MACROS
-
-// LOCAL CONSTANTS AND MACROS
-
-// MODULE DATA STRUCTURES
-
-// LOCAL FUNCTION PROTOTYPES
-
-// FORWARD DECLARATIONS
-
-// ============================= LOCAL FUNCTIONS ==============================
-
-// ========================= MEMBER FUNCTIONS ================================
-
-// ----------------------------------------------------------------------------
-// CDiagNetCoveragePlugin::CDiagNetCoveragePlugin()
-//
-// Constructor
-// ----------------------------------------------------------------------------
-//
-CDiagNetCoveragePlugin::CDiagNetCoveragePlugin( CDiagPluginConstructionParam* aParam )
-    :   CDiagTestPluginBase( aParam ),
-        iNetworkInfoV1(),
-        iSignalStrengthV1(),
-        iNetworkInfoV1Pckg( iNetworkInfoV1 ),
-        iSignalStrengthV1Pckg( iSignalStrengthV1 )
-    {
-    }
-
-
-// ---------------------------------------------------------------------------
-// CDiagNetCoveragePlugin::NewL()
-//
-// Symbian OS default constructor
-// ---------------------------------------------------------------------------
-MDiagPlugin* CDiagNetCoveragePlugin::NewL( TAny* aInitParams )
-    {
-    
-    LOGSTRING( "CDiagNetCoveragePlugin::NewL" )
-
-    ASSERT( aInitParams != NULL );
-            
-    CDiagPluginConstructionParam* param = 
-            static_cast<CDiagPluginConstructionParam*>( aInitParams );
-
-    CleanupStack::PushL( param );
-    CDiagNetCoveragePlugin* self = new( ELeave ) CDiagNetCoveragePlugin( param );
-    CleanupStack::Pop( param );
-
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );
-
-    return self;
-    }
-
-
-
-// ---------------------------------------------------------------------------
-// CDiagNetCoveragePlugin::ConstructL()
-//
-// Symbian OS two-phased constructor
-// ---------------------------------------------------------------------------
-void CDiagNetCoveragePlugin::ConstructL()
-    {
-    LOGSTRING("CDiagNetCoveragePlugin::ConstructL");        
-    
-    BaseConstructL( KDiagNetCoveragePluginResourceFileName );
-    
-    ReadThresholdValuesL();                
-    idialogOn = EFalse;              
-    }
-
-
-// ----------------------------------------------------------------------------
-// CDiagNetCoveragePlugin::~CDiagNetCoveragePlugin
-//
-// Destructor
-// ----------------------------------------------------------------------------
-CDiagNetCoveragePlugin::~CDiagNetCoveragePlugin()
-    {
-    // Base class will call StopAndCleanup(), which callso
-    //  Cancel() -> DoCancel()
-    //  DoStopAndCleanupL()
-    if ( iWaitDialog )
-    delete iWaitDialog;
-    }
-
-
-// ---------------------------------------------------------------------------
-// From MDiagPlugin
-// CDiagNetCoveragePlugin::IsVisible()
-// ---------------------------------------------------------------------------
-TBool CDiagNetCoveragePlugin::IsVisible() const
-    {
-    return ETrue;
-    }
-
-// ---------------------------------------------------------------------------
-// From MDiagTestPlugin
-// CDiagNetCoveragePlugin::RunMode()
-// ---------------------------------------------------------------------------
-MDiagTestPlugin::TRunMode CDiagNetCoveragePlugin::RunMode() const
-    {
-    return EAutomatic;
-    }
-
-// ---------------------------------------------------------------------------
-// From MDiagTestPlugin
-// CDiagNetCoveragePlugin::TotalSteps()
-// ---------------------------------------------------------------------------
-TUint CDiagNetCoveragePlugin::TotalSteps() const
-    {
-    return KTotalTestSteps;
-    }
-
-// ---------------------------------------------------------------------------
-// From MDiagPlugin
-// CDiagNetCoveragePlugin::GetPluginNameL
-// ---------------------------------------------------------------------------
-HBufC* CDiagNetCoveragePlugin::GetPluginNameL( TNameLayoutType aLayoutType ) const
-    {
-    switch ( aLayoutType )
-        {
-        case ENameLayoutListSingle:
-            return StringLoader::LoadL ( R_DIAG_NET_COVERAGE_PLUGIN_NAME );       
-        
-        case ENameLayoutHeadingPane:
-             return StringLoader::LoadL ( R_QTN_DIAG_MSG_TITLE_VOICE_NETWORK );
-        
-        case ENameLayoutPopupInfoPane:
-              return StringLoader::LoadL ( R_QTN_DIAG_MSG_INFO_VOICE_NETWORK );
-        
-        case ENameLayoutTitlePane:
-             return StringLoader::LoadL ( R_QTN_DIAG_TITLE_TEST_VOICE_NETWORK );
-        
-        case ENameLayoutListSingleGraphic:
-             return StringLoader::LoadL ( R_QTN_DIAG_LST_TEST_VOICE_NETWORK );
-
-        default:
-            LOGSTRING2( "CDiagNetCoveragePlugin::GetPluginNameL: "
-                L"ERROR: Unsupported layout type %d", aLayoutType )
-            __ASSERT_DEBUG( 0, User::Invariant() );
-            return StringLoader::LoadL ( R_DIAG_NET_COVERAGE_PLUGIN_NAME );
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// From MDiagPlugin
-// CDiagNetCoveragePlugin::Uid
-// ---------------------------------------------------------------------------
-TUid CDiagNetCoveragePlugin::Uid() const
-    {
-    return KDiagNetCoveragePluginUid;
-    }
-    
-
-// ---------------------------------------------------------------------------
-// From CActive
-// CDiagNetCoveragePlugin::RunL
-// ---------------------------------------------------------------------------
-void CDiagNetCoveragePlugin::RunL()
-    {
-    ReportTestProgressL( iProgressCounter++ );
-    
-    switch (iState)
-        {
-        case EStateWaitForBandType:                    
-            CheckNetworkAccessL();
-            break;
-            
-        case EStateWaitForSignalStrength:
-            CheckSignalStrengthL();                      
-            break;
-		
-		case EStateTestCancel:
-			 CompleteTestL( CDiagResultsDatabaseItem::ESkipped );
-			 break;
-        default:
-            // Unsupported state
-            ASSERT(0);
-            break;
-        }
-        
-    }  
-    
-// ---------------------------------------------------------------------------
-// From CActive
-// CDiagNetCoveragePlugin::DoCancel
-// ---------------------------------------------------------------------------
-void CDiagNetCoveragePlugin::DoCancel()
-    {   
-    LOGSTRING("CDiagNetCoveragePlugin::DoCancel");
-            
-    TInt result;
-    
-    // Cancel request to CTelephony
-    switch ( iState )    
-        {
-        case EStateWaitForBandType:                                
-            result = iTelephony->CancelAsync( CTelephony::EGetCurrentNetworkInfoCancel );
-            ASSERT( result == KErrNone );
-            break;
-            
-        case EStateWaitForSignalStrength:
-            result = iTelephony->CancelAsync( CTelephony::EGetSignalStrengthCancel );
-            ASSERT( result == KErrNone );
-            break;
-            
-        default:
-            // No cancel needed
-            if (result == KErrNone)
-            LOGSTRING("docancel() result");
-            break;
-        }                             
-            
-    }    
-
-// ---------------------------------------------------------------------------
-// From CDiagTestPluginBase
-// CDiagNetCoveragePlugin::DoRunTestL()
-// ---------------------------------------------------------------------------
-void CDiagNetCoveragePlugin::DoRunTestL()
-    {
-    LOGSTRING("CDiagNetCoveragePlugin::DoRunTestL");
-    
-     // ADO & Platformization Changes
-    if(!(ExecutionParam().Engine().ExecutionPlanL().CurrentExecutionItem().AsDependency()))
-    {
-    	
-     
-    TInt aButtonId;
-    
-    ShowMessageQueryL(R_DIAG_MESSAGEQUERY_TITLE_NETCOVERAGE,aButtonId);
-      
-    if(aButtonId == ENetcoverageTestCancel)
-    	{
-    	CompleteTestL( CDiagResultsDatabaseItem::ESkipped );
-        return;
-    	}
-    
-    if(aButtonId == ENetcoverageTestSkip)
-    	{
-		TInt confirmResult = 0;
-            
-        CAknDialog* dlg = ExecutionParam().Engine().
-        CreateCommonDialogLC( EDiagCommonDialogConfirmSkipAll, NULL );
-    
-        if ( !RunWaitingDialogL(dlg, confirmResult ) )
-            {
-            return;
-            }
-        
-        if (confirmResult)
-            {
-            return;
-            }
-    	}
-    }
-    // Changes Ends
-    
-    iProgressCounter = 1;
-    iNetworkType = ETypeUnknown;
-    iNetworkBand = EBandUnknown;
-    
-    // ones to use because they are less strict
-    iNetworkBand = EBand1800_1900_2100;
-    ObtainBandTypeAsyncL();
-    // Wait note display only if itz not a dependency execution.
-    if(!(ExecutionParam().Engine().ExecutionPlanL().CurrentExecutionItem().AsDependency()))
-    ShowProgressNoteL();
-    }     
-    
-// ---------------------------------------------------------------------------
-// CDiagNetCoveragePlugin::DoStopAndCleanupL()
-// ---------------------------------------------------------------------------    
-void CDiagNetCoveragePlugin::DoStopAndCleanupL()
-    {    
-    LOGSTRING("CDiagNetCoveragePlugin::DoStopAndCleanupL");
-    
-    delete iTelephony;
-    iTelephony = NULL;
-    idialogOn = EFalse;   
-    iState = EStateTestCompleted;            
-    }
-    
-// ---------------------------------------------------------------------------
-// CDiagNetCoveragePlugin::ObtainBandTypeAsyncL()
-// ---------------------------------------------------------------------------     
-void CDiagNetCoveragePlugin::ObtainBandTypeAsyncL()
-    {    
-    LOGSTRING("CDiagNetCoveragePlugin::ObtainBandTypeAsyncL");
-    
-    ASSERT( iTelephony == NULL );
-    
-    iTelephony = CTelephony::NewL();    
-    iTelephony->GetCurrentNetworkInfo( iStatus, iNetworkInfoV1Pckg );
-    iState = EStateWaitForBandType;
-        
-    SetActive();    
-    }
-
-// ---------------------------------------------------------------------------
-// CDiagNetCoveragePlugin::ReadThresholdValuesL()
-// ---------------------------------------------------------------------------  
-void CDiagNetCoveragePlugin::ReadThresholdValuesL()
-    {
-    LOGSTRING("CDiagNetCoveragePlugin::ReadThresholdValuesL");
-    
-    CRepository* repository = CRepository::NewLC( KCRUidNetworkCoverage );       
-
-    LOGSTRING("CDiagNetCoveragePlugin::ReadThresholdValuesL:");
-    User::LeaveIfError( repository->Get(KPhoneDoctorGSM850SigStrThreshold, 
-                            iThresholdValues[ETypeGSM][EBand900_850]) );
-    LOGSTRING2("\tKPhoneDoctorGSM850SigStrThreshold=%.2f",iThresholdValues[ETypeGSM][EBand900_850]);
-    User::LeaveIfError( repository->Get(KPhoneDoctorGSM1900SigStrThreshold, 
-                            iThresholdValues[ETypeGSM][EBand1800_1900_2100]) );
-    LOGSTRING2("\tKPhoneDoctorGSM1900SigStrThreshold=%.2f",iThresholdValues[ETypeGSM][EBand1800_1900_2100]);
-    User::LeaveIfError( repository->Get(KPhoneDoctorUMTS850SigStrThreshold, 
-                            iThresholdValues[ETypeUMTS][EBand900_850]) );
-    LOGSTRING2("\tKPhoneDoctorUMTS850SigStrThreshold=%.2f",iThresholdValues[ETypeUMTS][EBand900_850]);
-    User::LeaveIfError( repository->Get(KPhoneDoctorUMTS1900SigStrThreshold, 
-                            iThresholdValues[ETypeUMTS][EBand1800_1900_2100]) );
-    LOGSTRING2("\tKPhoneDoctorUMTS1900SigStrThreshold=%.2f",iThresholdValues[ETypeUMTS][EBand1800_1900_2100]);
-    
-    CleanupStack::PopAndDestroy(repository);
-    }
-
-    
-// ---------------------------------------------------------------------------
-// From CActive
-// CDiagNetCoveragePlugin::CheckNetworkAccessL
-// ---------------------------------------------------------------------------    
-void CDiagNetCoveragePlugin::CheckNetworkAccessL()
-    {        
-    if ( iStatus != KErrNone)
-        {                                                 
-        LOGSTRING2("CDiagNetCoveragePlugin::CheckNetworkAccessL: "
-            L"Error obtaining network access type %d", iStatus.Int() );
-        if (idialogOn)
-        iWaitDialog->ProcessFinishedL();
-        CompleteTestL( CDiagResultsDatabaseItem::EFailed );
-        }
-    else
-        {
-        LOGSTRING("CDiagNetCoveragePlugin::CheckNetworkAccessL: Got Network Access Type");                
-        // Set network band
-        switch (iNetworkInfoV1.iAccess)
-            {
-            // This is used when there is no network activity and therefore no RAT active.
-            case CTelephony::ENetworkAccessUnknown:
-                LOGSTRING("  ENetworkAccessUnknown"); 
-            
-#ifdef __WINS__
-                // Fake network type for testing purposes
-                iNetworkType = ETypeGSM;
-#else               
-                if (idialogOn)
-                iWaitDialog->ProcessFinishedL();
-                CompleteTestL( CDiagResultsDatabaseItem::EFailed );
-#endif
-                break;
-
-            // The access technology is GSM.
-            case CTelephony::ENetworkAccessGsm: 
-                // FALL THROUGH
-                
-            // The access technology is GSM COMPACT. However GSM COMPACT systems 
-            // which use GSM frequency bands but with the CBPCCH broadcast channel
-            // are considered as a separate access technology from GSM.
-            case CTelephony::ENetworkAccessGsmCompact:
-            
-                LOGSTRING("  ENetworkAccessGsm");                 
-                iNetworkType = ETypeGSM;
-                break;
-            
-            // The access technology is UTRAN (UMTS Network).
-            case CTelephony::ENetworkAccessUtran:
-            
-                LOGSTRING("  ENetworkAccessUtran");                 
-                iNetworkType = ETypeUMTS;
-                break;
-
-            default: // Unexpected
-                ASSERT(0);
-                break;
-
-            }
-        
-        // If test did not fail, obtain signal strength
-        if ( iState == EStateWaitForBandType )
-            {                
-            iTelephony->GetSignalStrength(iStatus,iSignalStrengthV1Pckg);
-            iState = EStateWaitForSignalStrength;
-            SetActive();            
-            }
-        }                                                         
-    }
-    
-// ---------------------------------------------------------------------------
-// CDiagNetCoveragePlugin::CheckSignalStrengthL
-// ---------------------------------------------------------------------------     
-void CDiagNetCoveragePlugin::CheckSignalStrengthL()
-    {
-    CDiagResultsDatabaseItem::TResult result = CDiagResultsDatabaseItem::EFailed;
-    
-    LOGSTRING2("CDiagNetCoveragePlugin::CheckSignalStrengthL Status %d",iStatus.Int());   
-             
-    if (iStatus.Int() == KErrNone)  
-        {
-        
-        TReal sigStrength = -iSignalStrengthV1.iSignalStrength;           
-                                            
-        LOGSTRING3("CDiagNetCoveragePlugin::CheckSignalStrengthL: Got Signal Strength=%d bars, %.2f DBm",
-                (TInt)iSignalStrengthV1.iBar,
-                sigStrength);
-        LOGSTRING3("CDiagNetCoveragePlugin::CheckSignalStrengthL: Network type = %d, band = %d",iNetworkType,iNetworkBand);                            
-                
-        TReal threshold = iThresholdValues[iNetworkType][iNetworkBand];
-        LOGSTRING2("CDiagNetCoveragePlugin::CheckSignalStrengthL: Threshold is %.2f",threshold);
-                                      
-        // Use band/type to index into threshold array and check
-        // signal strength.  If there is no signal, Dbm will be 0, which is actually
-        // quite high, so check bars to cover this scenario.
-        if ( ( sigStrength >= threshold ) && ( iSignalStrengthV1.iBar ) )
-            {                        
-            result = CDiagResultsDatabaseItem::ESuccess;
-            }          
-        }
-        else
-        {            
-            LOGSTRING2("CDiagNetCoveragePlugin::CheckSignalStrengthL: Signal strength error %d",iStatus.Int());
-        }      
-
-    
-    if (idialogOn)                       
-    iWaitDialog->ProcessFinishedL();
-    
-    CompleteTestL( result );
-   
-    // End of Test
-    }      
- 
-// ---------------------------------------------------------------------------
-// CDiagNetCoveragePlugin::Panic
-// ---------------------------------------------------------------------------     
-void CDiagNetCoveragePlugin::Panic(TInt aPanicCode)
-    {
-    _LIT(KDiagNetCoverageCategory,"Diag-NetCoverage");
-    User::Panic(KDiagNetCoverageCategory, aPanicCode);
-    }
-    
-
-// ----------------------------------------------------------------------------
-// CDiagNetCoveragePlugin::ShowProgressNoteL
-//
-// wait Note
-// ----------------------------------------------------------------------------
-
-void CDiagNetCoveragePlugin::ShowProgressNoteL()
-    {
-	if ( iWaitDialog )
-	{
-	delete iWaitDialog;
-	iWaitDialog = NULL;
-	}
-	                
-	// WAIT NOTE DIALOG
-	iWaitDialog = new (ELeave) CAknWaitDialog(
-							(REINTERPRET_CAST(CEikDialog**, &iWaitDialog)), 
-							ETrue);
-	iWaitDialog->PrepareLC(R_NETWORK_PLUGIN_WAIT_NOTE);
-	iWaitDialog->SetCallback(this);
-	iWaitDialog->RunLD();
-	idialogOn = ETrue;
-	LOGSTRING("CDiagNetCoveragePlugin::ShowProgressNoteL()");
-    }
-    
-void CDiagNetCoveragePlugin::DialogDismissedL( TInt aButtonId )
-	{
-		 LOGSTRING2("CDiagNetCoveragePlugin::DialogDismissedL() = %d",aButtonId);
-		 
-		 if (aButtonId == ENetcoverageTestCancel && idialogOn) 
-		 {
-		 // cancel the tests based on which Async Call the dialog is dismissed
-		 
-		 LOGSTRING2("CDiagNetCoveragePlugin::DialogDismissed @ iState= %d",iState);
-		 if (iState == EStateWaitForBandType)
-	     iTelephony->CancelAsync(CTelephony::EGetCurrentNetworkInfoCancel);
-		 else if (iState == EStateWaitForSignalStrength)
-		 iTelephony->CancelAsync(CTelephony::EGetSignalStrengthCancel);
-		 iState = EStateTestCancel;	 
-	  	 idialogOn = EFalse; 
-	     iWaitDialog = NULL;
-	     
-		 }
-	} 
-	
-// ----------------------------------------------------------------------------
-// ----------------------------------------------------------------------------
-// ----------------------------------------------------------------------------
-        
-TBool CDiagNetCoveragePlugin::ShowMessageQueryL( TInt aResourceId, TInt &aButtonId  )
-    {
-    LOGSTRING( "CDiagNetCoveragePlugin::ShowMessageQueryL IN" )
-    CAknMessageQueryDialog* dlg    = NULL;
-    TBool                   result = EFalse;
-
-    // Create CAknMessageQueryDialog instance
-    dlg = new ( ELeave ) CAknMessageQueryDialog();
-
-    dlg->PrepareLC( aResourceId );
-     
-    CEikButtonGroupContainer& cba = dlg->ButtonGroupContainer();
-
-        switch ( aResourceId )
-            {
-            case R_DIAG_MESSAGEQUERY_TITLE_NETCOVERAGE: 
-         	   {
-            	if ( SinglePluginExecution() )
-        			{
-        			cba.SetCommandSetL( R_CBA_NETCOVERAGE_SINGLE_EXECUTION );		
-        			}
-        	   else 
-        	   		{	
-                	cba.SetCommandSetL( R_CBA_NETCOVERAGE_GROUP_EXECUTION );		
-                	}
-        		}
-                break;
-
-            default:
-                break;
-            }
-        	
-    result = RunWaitingDialogL( dlg, aButtonId );
-
-    LOGSTRING3( "CDiagNetCoveragePlugin::ShowMessageQueryL() OUT aButtonId=%d result=%d", aButtonId, result );
-    return result;
-    }
-
-    
-// End of File
-
--- a/devicediagnostics/diagplugins/diagnetcoverageplugin/src/diagnetcoveragepluginimplementationtable.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-/*
-* 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:  ECOM proxy table for DiagNetCoveragePlugin
-*
-*/
-
-
-// INCLUDES
-#include "diagnetcoverageplugin.h"
-
-#include <e32std.h>
-#include <implementationproxy.h>
-
-
-// CONSTANTS
-const TImplementationProxy KDiagNetCoveragePluginImplementationTable[] = 
-	{	
-	IMPLEMENTATION_PROXY_ENTRY( DIAG_NET_COVERAGE_PLUGIN_UID,	CDiagNetCoveragePlugin::NewL ),
-	};
-
-
-// ---------------------------------------------------------------------------
-// ImplementationGroupProxy
-// 
-// Gate/factory function
-// ---------------------------------------------------------------------------
-//
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy( 
-                                                  TInt& aTableCount )
-	{
-	aTableCount = sizeof( KDiagNetCoveragePluginImplementationTable ) 
-        / sizeof( TImplementationProxy );
-	return KDiagNetCoveragePluginImplementationTable;
-	}
-
-
-
-// End of File
--- a/devicediagnostics/diagplugins/diagpdptestengine/inc/diagpdptestengine.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,127 +0,0 @@
-/*
-* 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:  This is the header for the PDP Test Engine
-*
-*/
-
-
-#ifndef DIAGPDPTESTENGINE_H 
-#define DIAGPDPTESTENGINE_H
-
-// INCLUDES
-#include <e32base.h>
-#include <commdb.h>
-#include <cmmanager.h>                      // RCmManager
-#include <cmdestination.h>                  // RCmDestination
-#include <cmconnectionmethod.h>             // RCmConnectionMethod
-#include <es_sock.h> // for RSocketServ
-#include <es_enum.h> //for TConnectionInfoV2
-#include <commdbconnpref.h> //for TCommDbConnPref 
-#include <ApDataHandler.h> 
-
-//CONSTANTS
-
-// MACROS
-
-// DATA TYPES
-
-// FUNCTION PROTOTYPES
-
-// FORWARD DECLARATIONS
-
-
-// CLASS DEFINITION
-class CDiagPDPTestEngine : public CActive
-    {
-    protected:
-
-        // Enumerations
-            
-        /**
-        * This enum is used to identify primary IAP array or secondary IAP array
-        */    
-        enum TIapArray
-            {
-            EPrimaryAPNIapArray,
-            ESecondaryAPNIapArray        
-            };
-            
-        /**
-        * C++ default constructor.
-        */    
-        CDiagPDPTestEngine();
-        
-        /**
-        * C++ default virtual destructor.
-        */    
-        virtual ~CDiagPDPTestEngine();        
-        
-        /**
-        * Any derived PDP engine must provide a concrete implementation of this function
-        * and read the APNs from the cenrep in this function.
-        * If function is able to read APNs successfully, argument aError is set as KErrNone
-        */       
-        virtual void ReadAPNsFromCenrepL(TInt& aError) = 0;
-        
-        /**
-        * This function checks if the APNs read from the cenrep are visible and available to the 
-        * Connection manager. After calling this function, the arrays iPrimaryAPNIapIdArray and
-        * iSecondaryAPNIapIdArray contain the IAP Ids of Access Points which match the primary and
-        * secondary APNs. It returns EFalse, if both the arrays are still empty, else it returns ETrue.
-        */ 
-        TBool CheckAPNsInConnectionManagerL();
-        
-        /**
-        * This function checks the provided connection methods and checks if it matches the primary or
-        * secondary APN. If so it adds the IAP ids of the connection method to the Primary or secondary 
-        * IAP array.
-        */
-        void  CheckConnectionMatchL( const RCmConnectionMethod& aMethod);
-        
-        /**
-        * This function returns ETrue if an already active connection is found using the IAP ids which
-        * match with the APNs in primary or secondary IAP array, else return EFalse
-        */
-        TBool FindActiveConnectionsL();
-    
-    protected:    // from CActive
-        /**
-        * Handle active object completion event
-        */
-        void RunL();
-    
-        /**
-        * Handle cancel
-        */
-        void DoCancel();
-            
-    protected:               
-               
-        // buffer to read the APNs from cenrep
-        TBuf<KCommsDbSvrMaxFieldLength> iCenrepPrimaryAPN;
-        TBuf<KCommsDbSvrMaxFieldLength> iCenrepSecondaryAPN;
-        
-        // arrays to hold the IAP Ids which have APNs as specified in the cenrep
-        RArray<TUint32> iPrimaryAPNIapIdArray;
-        RArray<TUint32> iSecondaryAPNIapIdArray;
-        TUint32 iIAPiddefault;
-        // used for iterating through active connections and establishing PDP context
-        RSocketServ iSocketServ;
-        RConnection iConnection;
-    
-    };
-
-#endif //DIAGPDPTESTENGINE_H
-
-// End of File
--- a/devicediagnostics/diagplugins/diagpdptestengine/src/diagpdptestengine.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,388 +0,0 @@
-/*
-* 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:  This is the class module for the PDP Test Engine
-*
-*/
-
-
-// INCLUDE FILES
-#include <DiagFrameworkDebug.h>                 // debug macros
-#include "diagpdptestengine.h"
-#include <cmpluginpacketdatadef.h>
-//#include <AknLists.h>
-//#include <BADESCA.H >
-//#include <aknPopup.h> 
-// EXTERNAL DATA STRUCTURES
-
-// EXTERNAL FUNCTION PROTOTYPES
-
-// CONSTANTS
-//const TInt KConnArrayGranularity = ( 3 );
-
-// MACROS
-
-// LOCAL CONSTANTS AND MACROS
-
-// MODULE DATA STRUCTURES
-
-// LOCAL FUNCTION PROTOTYPES
-
-// FORWARD DECLARATIONS
-
-// ============================= LOCAL FUNCTIONS ==============================
-
-// ========================= MEMBER FUNCTIONS ================================
-  
- 
-// ----------------------------------------------------------------------------
-// CDiagPDPTestEngine::CDiagPDPTestEngine()
-//
-// C++ default constructor
-// ----------------------------------------------------------------------------    
-CDiagPDPTestEngine::CDiagPDPTestEngine() 
-    : CActive(CActive::EPriorityUserInput)
-    {
-    // no implementation needed 
-    }
-   
-// ----------------------------------------------------------------------------
-// CDiagPDPTestEngine::~CDiagPDPTestEngine()
-//
-// C++ default destructor
-// ----------------------------------------------------------------------------    
-CDiagPDPTestEngine::~CDiagPDPTestEngine()
-    {
-    // no implementation needed
-    }   
-   
-// ----------------------------------------------------------------------------
-// CDiagPDPTestEngine::RunL()
-//
-// Handle asynchronous requests
-// ----------------------------------------------------------------------------     
-void CDiagPDPTestEngine::RunL()
-    {
-    // no implementation needed 
-    } 
-    
-    
-// ----------------------------------------------------------------------------
-// CDiagPDPTestEngine::DoCancel()
-//
-// Handle cancellation of asynchronous requests
-// ----------------------------------------------------------------------------    
-void CDiagPDPTestEngine::DoCancel()
-    {
-    // no implementation needed 
-    }
-    
-// ----------------------------------------------------------------------------
-// CDiagPDPTestEngine::CheckAPNsInConnectionManagerL()
-//
-// 
-// ----------------------------------------------------------------------------    
-TBool CDiagPDPTestEngine::CheckAPNsInConnectionManagerL()
-    {
-    LOGSTRING( "CDiagPDPTestEngine::CheckAPNsInConnectionManagerL()" );
-    /*RArray<TUint32> idArray;
-    CleanupClosePushL( idArray );
-
-    CDesCArrayFlat* nameArray = new (ELeave) CDesCArrayFlat(16);
-    CleanupStack::PushL( nameArray );
-    
-    // Get IAP names and ids from the database
-    CCommsDatabase* TheDb = CCommsDatabase::NewL( EDatabaseTypeIAP );
-    CleanupStack::PushL( TheDb );
-
-    TheDb->ShowHiddenRecords();
-
-    CCommsDbTableView* view = TheDb->OpenTableLC( TPtrC(IAP) );
-
-    TBuf<40> name;
-    TUint32 id,aId;
-    TInt res = view->GotoFirstRecord();
-    while( res == KErrNone )
-    {
-        view->ReadTextL( TPtrC(COMMDB_NAME), name );
-        view->ReadUintL( TPtrC(COMMDB_ID), id );
-        
-        idArray.Insert( id, 0 );
-        nameArray->InsertL( 0, name );
-
-        res = view->GotoNextRecord();
-        RDebug::Print(_L("IAP name, id: %S, %d"), &name, id);
-    }
-    
-    CleanupStack::PopAndDestroy( view ); // view
-    CleanupStack::PopAndDestroy( TheDb ); // TheDb
-    
-    // Create listbox and PUSH it.
-    CEikTextListBox* list = new(ELeave) CAknSinglePopupMenuStyleListBox;
-    CleanupStack::PushL( list );
-    
-    // Create popup list and PUSH it.
-    CAknPopupList* popupList = CAknPopupList::NewL(
-        list, R_AVKON_SOFTKEYS_OK_CANCEL,
-        AknPopupLayouts::EMenuWindow);
-    CleanupStack::PushL( popupList );
-    
-    // initialize listbox.
-    list->ConstructL( popupList, CEikListBox::ELeftDownInViewRect );
-    list->CreateScrollBarFrameL( ETrue );
-    list->ScrollBarFrame()->SetScrollBarVisibilityL(
-        CEikScrollBarFrame::EOff,
-        CEikScrollBarFrame::EAuto );
-    
-    // Set listitems.
-    CTextListBoxModel* model = list->Model();
-    model->SetItemTextArray( nameArray );
-    model->SetOwnershipType( ELbmDoesNotOwnItemArray );
-    
-    // Set title
-    popupList->SetTitleL( _L("Select IAP:") );
-    
-    // Show popup list.
-    TInt popupOk = popupList->ExecuteLD();
-    CleanupStack::Pop( popupList ); // popupList
-    if ( popupOk )
-        {
-        TInt index = list->CurrentItemIndex();
-        aId = idArray[index];
-        }
-    
-    CleanupStack::PopAndDestroy( 3, &idArray );  // list, nameArray, idArray
-    
-    if(popupOk != EFalse)
-					{
-					iIAPiddefault = aId;
-					}
-		return popupOk;*/
-		
-		
-       /*CCommsDatabase* cdb = CCommsDatabase::NewL(EDatabaseTypeIAP);
-       CleanupStack::PushL(cdb);
-       LOGSTRING("CCommsDatabase::NewL");
-       CApDataHandler* apDataHandler = CApDataHandler::NewLC(*cdb);
-       LOGSTRING("CApDataHandler::NewLC");
-       iIAPiddefault = apDataHandler->DefaultL(EFalse);
-       LOGSTRING2( "CApDataHandler->Default %d",iIAPiddefault );
-       CleanupStack::PopAndDestroy(2);
-       LOGSTRING( "pop/destroy 2");
-       return ETrue;*/
-/*    LOGSTRING( "CDiagPDPTestEngine::CheckAPNsInConnectionManagerL()" )
-
-    // Reset the arrays to hold valid IAP Ids
-    iPrimaryAPNIapIdArray.Reset();;
-    iSecondaryAPNIapIdArray.Reset();    
-    
-    // Opens a session with the connection manager
-    RCmManager connManager; 
-    connManager.OpenLC();
-    LOGSTRING( "CDiagPDPTestEngine session with connection manager opened." )
-
-    // create a conneciton array to hold the Ids of connections    
-    RArray< TUint32 > connArray = RArray< TUint32 >( KConnArrayGranularity );
-    CleanupClosePushL( connArray );
-    
-    // Get a list of all the destinations
-    LOGSTRING( "CDiagPDPTestEngine Get a list of all the destinations." )
-    connManager.AllDestinationsL( connArray );    
-    TInt numberOfDestinations = connArray.Count();    
-    LOGSTRING2( "CDiagPDPTestEngine number of destinations = %d", numberOfDestinations )
-    
-      
-    // Look through all the destinations' connection methods and see if any of
-    // them match the CenRep data.
-    for ( TInt i = 0; i < numberOfDestinations; i++ )
-        {
-        RCmDestination destination = connManager.DestinationL( connArray[ i ] );
-        CleanupClosePushL( destination );
-
-        // Don't use any hidden destinations, because they are not visible to
-        // the user.
-        if ( destination.IsHidden() )
-            {
-            LOGSTRING2( "CDiagPDPTestEngine: Destination number %d is hidden, hence ignoring it", i)
-            CleanupStack::PopAndDestroy(); // destination
-            continue;
-            }
-
-        // get the number of connection methods with this destination
-        TInt numberOfConnectionMethods = destination.ConnectionMethodCount();
-        LOGSTRING3( "CDiagPDPTestEngine For destination %d, number of connection methods are %d", i, numberOfConnectionMethods )
-        
-        for ( TInt j = 0; j < numberOfConnectionMethods; j++ )
-            {
-            RCmConnectionMethod method = destination.ConnectionMethodL( j );
-            CleanupClosePushL( method );
-            
-            // This call is trapped because not all connection methods support
-            // the data we're querying, and the leave should not be propagated
-            // up because that would not be a reason for test failure.
-            TRAP_IGNORE( CheckConnectionMatchL( method ) )
-            CleanupStack::PopAndDestroy(); // method
-            }
-
-        CleanupStack::PopAndDestroy(); // destination
-        }        
-
-
-    // Get a list of all the uncategorized connection methods.
-    LOGSTRING( "CDiagPDPTestEngine : Get a list of all the uncategorized connection methods." )
-    connArray.Reset();
-    connManager.ConnectionMethodL( connArray );
-    
-    TInt numberOfUncategorizedConnectionMethods = connArray.Count();    
-    LOGSTRING2( "CDiagPDPTestEngine : number of uncategorized connection methods = %d", numberOfUncategorizedConnectionMethods)
-
-    // Look through all the uncategorized connection methods and see if any
-    // of them match match the CenRep data.
-    for ( TInt i = 0; i < numberOfUncategorizedConnectionMethods; i++ )
-        {
-        RCmConnectionMethod method = connManager.ConnectionMethodL( connArray[ i ] );
-        CleanupClosePushL( method );
-
-        // This call is trapped because not all connection methods support
-        // the data we're querying, and the leave should not be propagated
-        // up because that would not be a reason for test failure.
-        TRAP_IGNORE( CheckConnectionMatchL( method) )
-        CleanupStack::PopAndDestroy(); // method
-        }
-
-    CleanupStack::PopAndDestroy(); // connArray
-    CleanupStack::PopAndDestroy(); // connManager
-    
-    // check if atleast one occurrence each of the primary APN or the secondary APN was found in CommsDB
-    if( (iPrimaryAPNIapIdArray.Count() > 0) || (iSecondaryAPNIapIdArray.Count() > 0) )
-        {
-        return ETrue;
-        }
-    else
-        {
-        return EFalse;
-        }
-    */
-    return ETrue; //compiler warning
-    }
-
-
-// ----------------------------------------------------------------------------
-// CDiagPDPTestEngine::CheckConnectionMatchL()
-//
-//
-// ----------------------------------------------------------------------------  
-
-void CDiagPDPTestEngine::CheckConnectionMatchL(const RCmConnectionMethod& aMethod)
-    {
-    LOGSTRING( "CDiagBrowserPluginModel::CheckConnectionMatchL()" )
-
-    HBufC* name = aMethod.GetStringAttributeL(
-        CMManager::ECmName );
-    CleanupStack::PushL( name );
-
-    HBufC* apn = aMethod.GetStringAttributeL(
-        CMManager::EPacketDataAPName );
-
-    CleanupStack::PushL( apn );
-
-    TInt type = aMethod.GetIntAttributeL(
-        CMManager::ECmBearerType );
-
-    TBool hidden = aMethod.GetBoolAttributeL(
-        CMManager::ECmHidden );
-
-    TUint32 apId = aMethod.GetIntAttributeL(
-        CMManager::ECmIapId );   
-
-    LOGSTRING5(
-        "CDiagBrowserPluginModel::CheckConnectionMatchL() "
-        L" Name '%S', APN '%S' ,Type '0x%08x', Hidden '%d'", name, apn, type, hidden )
-
-
-    if ( ( apn->Compare( iCenrepPrimaryAPN ) == 0 ) && 
-         type == KUidPacketDataBearerType &&
-         !hidden )
-        {
-        LOGSTRING( "CDiagBrowserPluginModel connection matches primary APN, adding to primary IAP array" )
-        iPrimaryAPNIapIdArray.Append(apId);
-        }
-        
-    if ( ( apn->Compare( iCenrepSecondaryAPN ) == 0 ) && 
-         type == KUidPacketDataBearerType &&
-         !hidden )
-        {
-        LOGSTRING( "CDiagBrowserPluginModel connection matches secondary APN, adding to secondary IAP array" )
-        iSecondaryAPNIapIdArray.Append(apId);
-        }        
-
-    CleanupStack::PopAndDestroy( apn );
-    CleanupStack::PopAndDestroy( name );
-    }
-
-    
-// ----------------------------------------------------------------------------
-// CDiagPDPTestEngine::FindActiveConnectionsL()
-//
-// this function returns ETrue if an already active connection is found using 
-// the IAP ids which match with the specified APNs, else it returns EFalse
-// ----------------------------------------------------------------------------       
-TBool CDiagPDPTestEngine::FindActiveConnectionsL() 
-    {
-    LOGSTRING( "CDiagPDPTestEngine::FindActiveConnectionsL");
-    TBool result = EFalse;   
-    TUint connectionCount = 0;
-    TPckgBuf<TConnectionInfo> connectionInfo;
-    User::LeaveIfError(
-        iConnection.EnumerateConnections(connectionCount));
-    LOGSTRING("iConnection.EnumerateConnections");
-    if(connectionCount > 0)
-        {
-        // there is atleast one active connection
-
-        // iterate through each active connection
-        for(TUint count = 1 ; count <= connectionCount; count++)
-            {
-            User::LeaveIfError(
-                iConnection.GetConnectionInfo(count, connectionInfo));               
-            
-            // test if the IAP Id of this active connection matches with one of the IAP ids in 
-            // primary array or secondary array
-            /*if( ((iPrimaryAPNIapIdArray.Find( connectionInfo().iIapId)) != KErrNotFound ) || 
-                ((iSecondaryAPNIapIdArray.Find( connectionInfo().iIapId)) != KErrNotFound ) )*/
-	        if (iIAPiddefault == connectionInfo().iIapId)
-                {
-                // the IAP ID of the current active connection has matched with the one of the IAPs in primary array or secondary array
-                // data connection has PASSED
-                LOGSTRING("IAP ID of the current active connection has matched");
-                result = ETrue;
-                break; //break from the for loop
-                }
-                else
-                {
-                // do nothing, look for next active connection
-                }
-            }
-        }
-    else
-        {
-        // no active connection found
-        result = EFalse;        
-        }
-
-    return result;
-    }
-    
-    
-
-// End of File
--- a/devicediagnostics/diagplugins/diagusbcableplugin/data/devdiagusbcabletestplugin.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-/*
-* 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:  ECOM plugin resource file for USB Cable Test Plug-in
-*
-*/
-
-#include <registryinfo.rh>
-#include "diagusbcabletestplugin.hrh" // UIDs
-
-RESOURCE REGISTRY_INFO theInfo
-    {
-    dll_uid     = _UID3;
-    interfaces  =
-        {
-        INTERFACE_INFO
-            {
-            interface_uid   = 0x2000AFEB;
-            implementations =
-                {
-                IMPLEMENTATION_INFO
-                    {
-                    implementation_uid  = _IMPLEMENTATION_UID;
-                    version_no          = 1;
-                    display_name        = "USB Cable Test Plugin";
-                    default_data        = "0x2000E56F"; //Connectivity suite
-                    opaque_data         =   "<diagplugininfo>" 
-                                                "<order number=\"75\"/>"
-                                            "</diagplugininfo>";
-                    }
-                };
-            }
-        };
-    }
-
-
-// End of File
--- a/devicediagnostics/diagplugins/diagusbcableplugin/data/devdiagusbcabletestpluginrsc.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,402 +0,0 @@
-/*
-* 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:  Resource file for DiagUSBCableTestPlugin
-*
-*/
-
-
-
-//  RESOURCE IDENTIFIER
-NAME    DGUC // 4 letter ID // this has to be unique for each plugin
-
-//  INCLUDES
-#include    <avkon.loc>
-#include    <avkon.mbg>
-#include    <avkon.rsg>
-#include    <avkon.rh>
-#include    <AvkonIcons.hrh>
-#include    <bldvariant.hrh>
-#include    <data_caging_paths_strings.hrh>
-#include    <eikcore.rsg>
-#include    <eikon.rsg>
-#include    <uikon.rh>
-#include    <eikon.rh>
-
-#include    <diagplugincommon.loc>
-
-#include    "diagusbcabletestplugin.hrh"
-#include    <diagusbcabletestplugin.loc>
-
-// CONSTANTS
-#define     BMPFILE_NAME    "\\resource\\apps\\avkon2.mbm"
-
-
-//  RESOURCE DEFINITIONS
-
-RESOURCE RSS_SIGNATURE
-    {
-    }
-
-RESOURCE TBUF
-    {
-    buf="DGUC";
-    }
-
-
-// ---------------------------------------------------------------------------
-//  r_diag_usb_cable_test_heading_pane
-//
-// The plugin name in the header of the dialog that is
-// shown when starting test execution.
-// ---------------------------------------------------------------------------
-//
-RESOURCE TBUF r_diag_usb_cable_test_heading_pane
-    {
-    buf = qtn_diag_msg_title_usb_cable;                    
-    }
-
-
-
-// ---------------------------------------------------------------------------
-// r_diag_usb_cable_test_popup_info_pane
-// ---------------------------------------------------------------------------
-//
-RESOURCE TBUF r_diag_usb_cable_test_popup_info_pane
-    {
-    buf = qtn_diag_conf_test_failed_usb_cable;
-    }
-    
-
-// ---------------------------------------------------------------------------
-// r_diag_usb_cable_test_title_pane
-// The title pane shown when USB cable test is running
-// ---------------------------------------------------------------------------
-//
-RESOURCE TBUF r_diag_usb_cable_test_title_pane
-    {
-    buf = qtn_diag_title_test_usb_cable;
-    }
-
-// ADO & Platformization Changes
-//------------------------------------------------------------------------------
-//  r_cba_connect_and_press_ok_single_execution
-//
-//  Command Button Array for query dialog 
-// "Connect your USB cable. Press OK when ready." in case of single plugin execution
-//------------------------------------------------------------------------------
-//    
-
-RESOURCE CBA r_diag_usb_softkeys_cancel__ok
-			{
-			buttons =
-					{
-					CBA_BUTTON { id = EUsbTestConnectUSBOK;
-											 txt = text_softkey_ok;	} ,
-											 
-					CBA_BUTTON { id = EUsbTestConnectUSBCancel;
-											 txt = text_softkey_cancel; }
-					};
-			}
-
-
-// ADO & Platformization Changes
-//------------------------------------------------------------------------------
-//  r_cba_connect_and_press_ok_single_execution
-//
-//  Command Button Array for query dialog 
-// "Connect your USB cable. Press OK when ready." in case of single plugin execution
-//------------------------------------------------------------------------------
-//    
-
-RESOURCE CBA r_diag_usb_softkeys_skip__ok
-            {
-            buttons =
-                    {
-                    CBA_BUTTON { id = EUsbTestConnectUSBOK;
-                                             txt = text_softkey_ok; } ,
-                                             
-                    CBA_BUTTON { id = EUsbTestConnectUSBSkip;
-                                             txt = qtn_diag_softk_skip; }
-                    };
-            }
-
-      
-
-
-
-// ADO & Platformization Changes
-// ---------------------------------------------------------------------------
-// r_messagequery_title
-// The dialog shown when the plugin begins execution.
-// ---------------------------------------------------------------------------
-//
-RESOURCE DIALOG r_messagequery_title
-    {
-     flags   = EGeneralQueryFlags | 
-               EEikDialogFlagNoBorder |
-               EEikDialogFlagNoTitleBar;
-
-     //buttons = r_diag_usb_softkeys_cancel__ok;
-     buttons = r_diag_usb_softkeys_skip__ok;  // ADO & Platformization Changes
-
-     items=
-         {
-         DLG_LINE
-             {
-             type    = EAknCtPopupHeadingPane;
-             id      = EAknMessageQueryHeaderId;
-             control = AVKON_HEADING
-                 {              
-                    label         = qtn_diag_msg_title_usb_cable;
-                    headinglayout = R_AVKON_WML_SIGN_QUERY_HEADING_PANE;
-                 };
-             },
-         DLG_LINE
-             {
-             type    = EAknCtMessageQuery;
-             id      = EAknMessageQueryContentId;
-             control = AVKON_MESSAGE_QUERY
-                 {
-                 message = qtn_diag_msg_info_usb_cable;
-                 };
-             }
-         };
-     }
-
-
-
-// ---------------------------------------------------------------------------
-// r_diag_usb_cable_test_single_graphic
-// Plugin name in the suite view listbox.
-// ---------------------------------------------------------------------------
-//
-RESOURCE TBUF r_diag_usb_cable_test_single_graphic
-    {
-    buf = qtn_diag_lst_test_usb_cable;
-    }
-
-//----------------------------------------------------
-//  r_diag_usb_cable_test_single
-//
-// Plugin's name in results view
-//----------------------------------------------------
-//
-RESOURCE TBUF r_diag_usb_cable_test_single
-    {
-    buf = qtn_diag_lst_usb_cable;          
-    }
-
-
-//------------------------------------------------------------------------------
-//  r_cba_connect_and_press_ok
-//
-//  Command Button Array for query dialog "Connect your USB cable. Press OK when ready." 
-//------------------------------------------------------------------------------
-//    
-RESOURCE CBA r_cba_connect_and_press_ok
-      {
-      buttons = 
-          { 
-          CBA_BUTTON { id = EUsbTestConnectUSBSkip;      
-                       txt = qtn_diag_softk_skip;   },
-                        
-          CBA_BUTTON { id = EUsbTestConnectUSBCancel;    
-                       txt = text_softkey_cancel; } ,
-                       
-          CBA_BUTTON { id = EAknSoftkeyOk;                              
-                       txt = text_softkey_ok;   } 
-          }; 
-      }  
-//------------------------------------------------------------------------------
-//  r_cba_connect_and_press_ok_single_execution
-//
-//  Command Button Array for query dialog 
-// "Connect your USB cable. Press OK when ready." in case of single plugin execution
-//------------------------------------------------------------------------------
-//    
-RESOURCE CBA r_cba_single_execution
-      {
-      buttons = 
-          {                       
-          CBA_BUTTON { id = EAknSoftkeyOk;                              
-                       txt = text_softkey_ok;   } ,          
-                        
-          CBA_BUTTON { id = EUsbTestConnectUSBCancel;    
-                       txt = text_softkey_cancel; }
-          }; 
-      }  
-
-
-//------------------------------------------------------------------------------
-//  r_cba_connect_and_press_ok_single_execution
-//
-//  Command Button Array for query dialog 
-// "Connect your USB cable. Press OK when ready." in case of single plugin execution
-//------------------------------------------------------------------------------
-//    
-RESOURCE CBA r_cba_group_execution
-      {
-      buttons = 
-          {                       
-          CBA_BUTTON { id = EAknSoftkeyOk;                              
-                       txt = text_softkey_ok;   } ,          
-                        
-          CBA_BUTTON { id = EUsbTestConnectUSBSkip;    
-                       txt = qtn_diag_softk_skip; }
-          }; 
-      }  
-      
-      
-// -----------------------------------------------------------------------------
-//
-// r_diag_usb_cable_test_connect_and_press_ok
-// query dialog for "Connect your USB cable. Press OK when ready." 
-//
-// -----------------------------------------------------------------------------
-//
-RESOURCE DIALOG r_diag_usb_cable_test_connect_and_press_ok
-    {
-    flags = EGeneralQueryFlags;
-    buttons = r_cba_single_execution;
-    items =
-        {
-        DLG_LINE
-            {
-            type = EAknCtQuery;
-            id   = EGeneralQuery;
-            control = AVKON_CONFIRMATION_QUERY
-                {
-                layout  = EConfirmationQueryLayout;
-                label   = qtn_diag_conf_usb_connect;
-                bmpfile = BMPFILE_NAME; 
-                //bmpid   = EMbmAvkonQgn_prop_usb;        // set correct bmp id when available
-                //bmpmask = EMbmAvkonQgn_prop_usb_mask;   // set correct bmp id when available
-                bmpid   = EMbmAvkonQgn_note_info;
-                bmpmask = EMbmAvkonQgn_note_info_mask;
-                };
-            }
-        };
-    }
-
-
-
-//------------------------------------------------------------------------------
-//  r_cba_usb_cable_test_no_cable_detected
-//
-//  Command Button Array for query dialog 
-// "No cable detected. Press OK to continue tests or press Back to retry this test."
-//------------------------------------------------------------------------------
-//    
-RESOURCE CBA r_cba_usb_cable_test_no_cable_detected
-      {
-      buttons = 
-          { 
-          CBA_BUTTON { id = EAknSoftkeyOk; 
-                       txt = text_softkey_ok; },
-
-          CBA_BUTTON { id = EUsbTestConnectUSBBack;
-                       txt = text_softkey_back; } ,
-
-          CBA_BUTTON { id = EAknSoftkeyOk;
-                       txt = text_softkey_ok; }
-          }; 
-      }
-
-//------------------------------------------------------------------------------
-//  r_diag_cable_test_cba_ok_dot_empty
-//
-//  Command Button Array for query dialog "Please remove all cable." 
-//------------------------------------------------------------------------------
-//    
-RESOURCE CBA r_diag_cable_test_cba_ok_dot_empty
-      {
-      buttons = 
-          { 
-          CBA_BUTTON { id = EAknSoftkeyOk;
-                       txt = text_softkey_ok;   },
-          CBA_BUTTON { },
-          
-          CBA_BUTTON { id = EAknSoftkeyOk; }
-          }; 
-      } 
-
-
-// ---------------------------------------------------------------------------
-//
-// r_diag_usb_cable_test_no_cable_detected
-// query dialog for "USB data cable not detected. Press OK to continue or 
-// press Back to retry this test."
-//
-// ---------------------------------------------------------------------------
-//    
-RESOURCE DIALOG r_diag_usb_cable_test_no_cable_detected
-    {
-    flags = EGeneralQueryFlags;
-    buttons = R_AVKON_SOFTKEYS_YES_NO__YES;
-    items =
-        {
-        DLG_LINE
-            {
-            type = EAknCtPopupHeadingPane;
-            id = EAknMessageQueryHeaderId;
-            control = AVKON_HEADING
-                {
-                label = qtn_diag_err_title_no_usb;
-                headinglayout = 0;
-                };
-            },
-            
-        DLG_LINE
-            {
-            type = EAknCtMessageQuery;
-            id = EAknMessageQueryContentId;
-            control = AVKON_MESSAGE_QUERY
-                {
-                message = qtn_diag_err_no_usb;
-                };
-            }
-        };
-    }
-    
-//------------------------------------------------------------------------------
-//
-// r_diag_cable_test_remove_all_cables
-// query dialog for "Please remove all cables" 
-//
-//------------------------------------------------------------------------------
-//    
-RESOURCE DIALOG r_diag_cable_test_remove_all_cables
-    {
-    flags   = EGeneralQueryFlags;
-    buttons = r_diag_cable_test_cba_ok_dot_empty;
-
-    items =
-        {
-        DLG_LINE
-            {
-            type = EAknCtQuery;
-            id   = EGeneralQuery;
-            control = AVKON_CONFIRMATION_QUERY
-                {
-                layout  = EConfirmationQueryLayout;
-                label   = qtn_diag_msg_remove_all_cables;
-                bmpfile = BMPFILE_NAME; 
-                bmpid   = EMbmAvkonQgn_note_info;
-                bmpmask = EMbmAvkonQgn_note_info_mask;
-                };
-            }
-        };
-    }
-    
-//End of File
--- a/devicediagnostics/diagplugins/diagusbcableplugin/group/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-/*
-* 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:  This file provides the information required for building
-*                USB Cable Test Plug-in
-*
-*/
-
-#include <platform_paths.hrh>
-
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-../loc/diagusbcabletestplugin.loc        MW_LAYER_LOC_EXPORT_PATH(diagusbcabletestplugin.loc)
-../rom_files/devdiagusbcableplugin.iby		CORE_MW_LAYER_IBY_EXPORT_PATH(devdiagusbcableplugin.iby)
-../rom_files/devdiagusbcableplugin_resources.iby		LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(devdiagusbcableplugin_resources.iby)
-
-
-PRJ_MMPFILES
-diagusbcabletestplugin.mmp
-
-
-PRJ_TESTMMPFILES
-
-//  End of File
--- a/devicediagnostics/diagplugins/diagusbcableplugin/group/diagusbcabletestplugin.mmp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-/*
-* 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:  Project specification file.
-*
-*/
-
-
-#include  <data_caging_paths.hrh>    // For RESOURCE_FILES_DIR
-
-// To get the MW_LAYER_SYSTEMINCLUDE-definition
-#include <platform_paths.hrh>            
-
-CAPABILITY          CAP_ECOM_PLUGIN
-TARGET              devdiagusbcabletestplugin.dll
-TARGETTYPE          PLUGIN
-UID                 0x10009D8D 0x2000E594  
-VENDORID            VID_DEFAULT
-
-
-SOURCEPATH  ../src
-SOURCE      diagusbpluginimplementationtable.cpp 
-SOURCE      diagusbcabletestplugin.cpp
-SOURCE      diagusbcabletestengine.cpp
-
-//User include paths
-USERINCLUDE     ../inc
-USERINCLUDE     ../data // For *.rh
-USERINCLUDE     ../loc
-
-//System include paths
-SYSTEMINCLUDE   /epoc32/include/ecom
-
-// Default system include paths for middleware layer modules.
-APP_LAYER_SYSTEMINCLUDE
-
-SOURCEPATH      ../data
-
-// resource file for the plugin implementation
-START RESOURCE  devdiagusbcabletestplugin.rss
-TARGET          devdiagusbcabletestplugin.rss
-TARGETPATH      ECOM_RESOURCE_DIR
-END
-
-// resource file for the plugin registration
-START RESOURCE  devdiagusbcabletestpluginrsc.rss
-HEADER
-TARGETPATH      RESOURCE_FILES_DIR
-LANGUAGE_IDS
-END
-
-LIBRARY   euser.lib
-LIBRARY   avkon.lib
-
-LIBRARY   commonengine.lib      // For StringLoader
-LIBRARY   diagframework.lib
-LIBRARY   eikcoctl.lib
-LIBRARY   eikdlg.lib
-LIBRARY   diagpluginbase.lib
-LIBRARY   usbman.lib 
-LIBRARY   centralrepository.lib 
-LIBRARY   flogger.lib           // for RFileLogger
-// End of File
--- a/devicediagnostics/diagplugins/diagusbcableplugin/group/diagusbcabletestplugin.xml	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2042 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!DOCTYPE PROJECT [
- <!ELEMENT PROJECT (TARGETLIST, TARGETORDER, GROUPLIST, DESIGNLIST?)>
- <!ELEMENT TARGETLIST (TARGET+)>
- <!ELEMENT TARGET (NAME, SETTINGLIST, FILELIST?, LINKORDER?, SEGMENTLIST?, OVERLAYGROUPLIST?, SUBTARGETLIST?, SUBPROJECTLIST?, FRAMEWORKLIST?, PACKAGEACTIONSLIST?)>
- <!ELEMENT NAME (#PCDATA)>
- <!ELEMENT USERSOURCETREETYPE (#PCDATA)>
- <!ELEMENT PATH (#PCDATA)>
- <!ELEMENT FILELIST (FILE*)>
- <!ELEMENT FILE (PATHTYPE, PATHROOT?, ACCESSPATH?, PATH, PATHFORMAT?, ROOTFILEREF?, FILEKIND?, FILEFLAGS?)>
- <!ELEMENT PATHTYPE (#PCDATA)>
- <!ELEMENT PATHROOT (#PCDATA)>
- <!ELEMENT ACCESSPATH (#PCDATA)>
- <!ELEMENT PATHFORMAT (#PCDATA)>
- <!ELEMENT ROOTFILEREF (PATHTYPE, PATHROOT?, ACCESSPATH?, PATH, PATHFORMAT?)>
- <!ELEMENT FILEKIND (#PCDATA)>
- <!ELEMENT FILEFLAGS (#PCDATA)>
- <!ELEMENT FILEREF (TARGETNAME?, PATHTYPE, PATHROOT?, ACCESSPATH?, PATH, PATHFORMAT?)>
- <!ELEMENT TARGETNAME (#PCDATA)>
- <!ELEMENT SETTINGLIST ((SETTING|PANELDATA)+)>
- <!ELEMENT SETTING (NAME?, (VALUE|(SETTING+)))>
- <!ELEMENT PANELDATA (NAME, VALUE)>
- <!ELEMENT VALUE (#PCDATA)>
- <!ELEMENT LINKORDER (FILEREF*)>
- <!ELEMENT SEGMENTLIST (SEGMENT+)>
- <!ELEMENT SEGMENT (NAME, ATTRIBUTES?, FILEREF*)>
- <!ELEMENT ATTRIBUTES (#PCDATA)>
- <!ELEMENT OVERLAYGROUPLIST (OVERLAYGROUP+)>
- <!ELEMENT OVERLAYGROUP (NAME, BASEADDRESS, OVERLAY*)>
- <!ELEMENT BASEADDRESS (#PCDATA)>
- <!ELEMENT OVERLAY (NAME, FILEREF*)>
- <!ELEMENT SUBTARGETLIST (SUBTARGET+)>
- <!ELEMENT SUBTARGET (TARGETNAME, ATTRIBUTES?, FILEREF?)>
- <!ELEMENT SUBPROJECTLIST (SUBPROJECT+)>
- <!ELEMENT SUBPROJECT (FILEREF, SUBPROJECTTARGETLIST)>
- <!ELEMENT SUBPROJECTTARGETLIST (SUBPROJECTTARGET*)>
- <!ELEMENT SUBPROJECTTARGET (TARGETNAME, ATTRIBUTES?, FILEREF?)>
- <!ELEMENT FRAMEWORKLIST (FRAMEWORK+)>
- <!ELEMENT FRAMEWORK (FILEREF, DYNAMICLIBRARY?, VERSION?)>
- <!ELEMENT PACKAGEACTIONSLIST (PACKAGEACTION+)>
- <!ELEMENT PACKAGEACTION (#PCDATA)>
- <!ELEMENT LIBRARYFILE (FILEREF)>
- <!ELEMENT VERSION (#PCDATA)>
- <!ELEMENT TARGETORDER (ORDEREDTARGET|ORDEREDDESIGN)*>
- <!ELEMENT ORDEREDTARGET (NAME)>
- <!ELEMENT ORDEREDDESIGN (NAME, ORDEREDTARGET+)>
- <!ELEMENT GROUPLIST (GROUP|FILEREF)*>
- <!ELEMENT GROUP (NAME, (GROUP|FILEREF)*)>
- <!ELEMENT DESIGNLIST (DESIGN+)>
- <!ELEMENT DESIGN (NAME, DESIGNDATA)>
- <!ELEMENT DESIGNDATA (#PCDATA)>
-]>
-<?codewarrior exportversion="1.0.1" ideversion="5.0" ?>
-<PROJECT>
-    <TARGETLIST>
-        <TARGET>
-            <NAME>WINSCW UDEB</NAME>
-            <SETTINGLIST>
-
-                <!-- Settings for "Source Trees" panel -->
-                <SETTING><NAME>UserSourceTrees</NAME></SETTING>
-
-                <!-- Settings for "Access Paths" panel -->
-                <SETTING><NAME>AlwaysSearchUserPaths</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>InterpretDOSAndUnixPaths</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>RequireFrameworkStyleIncludes</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>SourceRelativeIncludes</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>UserSearchPaths</NAME>
-                    <SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics\GSDeviceDiagnosticsPlugin\DevDiagApp\diagplugins\diagusbcableplugin\inc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics\GSDeviceDiagnosticsPlugin\DevDiagApp\diagplugins\diagusbcableplugin\data</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics\GSDeviceDiagnosticsPlugin\DevDiagApp\diagplugins\diagusbcableplugin\loc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics\GSDeviceDiagnosticsPlugin\DevDiagApp\diagplugins\diagusbcableplugin\group</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics\GSDeviceDiagnosticsPlugin\DevDiagApp\diagplugins\diagusbcableplugin\src</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING></SETTING>
-                <SETTING><NAME>SystemSearchPaths</NAME>
-                    <SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\ecom</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\oem</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\middleware</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\middleware</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\osextensions</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\osextensions</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\osextensions\loc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\middleware\loc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\osextensions\loc\sc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\middleware\loc\sc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\UDEB</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>Symbian_Support\Win32-x86 Support\Libraries\Win32 SDK</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>CodeWarrior</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>Symbian_Support\Runtime\Runtime_x86\Runtime_Win32\Libs</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>CodeWarrior</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING></SETTING>
-
-                <!-- Settings for "Debugger Runtime" panel -->
-                <SETTING><NAME>MWRuntimeSettings_WorkingDirectory</NAME><VALUE/></SETTING>
-                <SETTING><NAME>MWRuntimeSettings_CommandLine</NAME><VALUE/></SETTING>
-                <SETTING><NAME>MWRuntimeSettings_HostApplication</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\udeb\epoc.exe</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>MWRuntimeSettings_EnvVars</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Target Settings" panel -->
-                <SETTING><NAME>Linker</NAME><VALUE>Symbian Linker v2</VALUE></SETTING>
-                <SETTING><NAME>PreLinker</NAME><VALUE/></SETTING>
-                <SETTING><NAME>PostLinker</NAME><VALUE>Symbian Installer v2</VALUE></SETTING>
-                <SETTING><NAME>Targetname</NAME><VALUE>WINSCW UDEB</VALUE></SETTING>
-                <SETTING><NAME>OutputDirectory</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\udeb</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SaveEntriesUsingRelativePaths</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "File Mappings" panel -->
-                <SETTING><NAME>FileMappings</NAME>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>._i</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>._ii</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.c</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cc</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cfg</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cia</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cpp</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cwlink</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>XML</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cxx</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.def</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.h</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.hrh</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.i</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.iby</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.ii</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.inf</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.ini</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.inl</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.loc</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.mmpi</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.pch++</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.pkg</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.policy</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.ra</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.resources</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Resource v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>XML</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.rh</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.rls</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.rss</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.rsg</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.s</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.script</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.txt</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.a</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Object Importer v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.lib</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Object Importer v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.dso</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Object Importer v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.o</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Object Importer v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                </SETTING>
-
-                <!-- Settings for "Build Extras" panel -->
-                <SETTING><NAME>CacheModDates</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>DumpBrowserInfo</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>CacheSubprojects</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>UseThirdPartyDebugger</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>BrowserGenerator</NAME><VALUE>2</VALUE></SETTING>
-                <SETTING><NAME>DebuggerAppPath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>DebuggerCmdLineArgs</NAME><VALUE/></SETTING>
-                <SETTING><NAME>DebuggerWorkingDir</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CodeCompletionPrefixFileName</NAME><VALUE/></SETTING>
-                <SETTING><NAME>CodeCompletionMacroFileName</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Debugger Target" panel -->
-                <SETTING><NAME>ConsoleEncoding</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>LogSystemMessages</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>AutoTargetDLLsPopUp</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>StopAtWatchpoints</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>PauseWhileRunning</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>PauseInterval</NAME><VALUE>5</VALUE></SETTING>
-                <SETTING><NAME>PauseUIFlags</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>AltExePath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>StopAtTempBPOnLaunch</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>CacheSymbolics</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>TempBPFunctionName</NAME><VALUE>E32Main</VALUE></SETTING>
-                <SETTING><NAME>TempBPType</NAME><VALUE>1</VALUE></SETTING>
-
-                <!-- Settings for "Remote Debug" panel -->
-                <SETTING><NAME>Enabled</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>ConnectionName</NAME><VALUE/></SETTING>
-                <SETTING><NAME>DownloadPath</NAME><VALUE/></SETTING>
-                <SETTING><NAME>LaunchRemoteApp</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>RemoteAppPath</NAME><VALUE/></SETTING>
-                <SETTING><NAME>CoreID</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>JTAGClockSpeed</NAME><VALUE>8000</VALUE></SETTING>
-                <SETTING><NAME>IsMultiCore</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>OSDownload</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>UseGlobalOSDownload</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>OSDownloadConnectionName</NAME><VALUE/></SETTING>
-                <SETTING><NAME>OSDownloadPath</NAME><VALUE/></SETTING>
-                <SETTING><NAME>AltDownload</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>AltDownloadConnectionName</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "x86 Exceptions" panel -->
-                <SETTING><NAME>MWDebugger_X86_Exceptions</NAME>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                
-                <!-- Settings for "Auto-target" panel -->
-                <SETTING><NAME>OtherExecutables</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Analyzer Connections" panel -->
-                <SETTING><NAME>AnalyzerConnectionName</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Custom Keywords" panel -->
-                <SETTING><NAME>CustomColor1</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor2</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor3</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor4</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "ARM Debugger" panel -->
-                <SETTING><NAME>Processor</NAME><VALUE>Generic</VALUE></SETTING>
-                <SETTING><NAME>BraekPoinType_II</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>UseInitFile</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>UseConfigFile</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>IDexecutable</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>IDinitialized</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>IDuninitialized</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>IDconstant</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>SDexecutable</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>SDinitialized</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>SDuninitialized</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>SDconstant</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>VerifyMemWrites</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>ShowMPC107regs</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>InitializationFile</NAME><VALUE/></SETTING>
-                <SETTING><NAME>ConfigurationFile</NAME><VALUE/></SETTING>
-                <SETTING><NAME>BreakpointType</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>WatchpointType</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>TargetOS</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>RTOSPluginName</NAME><VALUE/></SETTING>
-                <SETTING><NAME>ByteOrderType</NAME><VALUE>0</VALUE></SETTING>
-                <PANELDATA><NAME>CodeTest SYMBIAN Instrumenter</NAME><VALUE>
-                    0200020000000100000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000433A5C0000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000637466696C657300000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000636F6465746573742E6964620000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000
-                </VALUE></PANELDATA>
-
-                <!-- Settings for "Symbian Installation" panel -->
-                <SETTING><NAME>SymbianInstallationOutputFilename</NAME><VALUE>Application.sis</VALUE></SETTING>
-                <SETTING><NAME>SymbianInstallationOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>SymbianInstallationContentSearchLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\udeb</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianInstallationPassword</NAME><VALUE/></SETTING>
-                <SETTING><NAME>SymbianInstallationCreateStubFile</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "Symbian Installer Panel v2" panel -->
-                <SETTING><NAME>SymbianInstallationOutputFilename</NAME><VALUE>Application.sis</VALUE></SETTING>
-                <SETTING><NAME>SymbianInstallationOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>SymbianInstallationContentSearchLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\udeb</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianInstallationPassword</NAME><VALUE/></SETTING>
-                <SETTING><NAME>SymbianInstallationCreateStubFile</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "Symbian Resource Panel" panel -->
-                <SETTING><NAME>SymbianResourcesMMPFileLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics\GSDeviceDiagnosticsPlugin\DevDiagApp\diagplugins\diagusbcableplugin\group</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianResourcesBinaryOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\udeb</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianResourcesHeaderFileOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\include</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-
-                <!-- Settings for "Symbian Resources Panel v2" panel -->
-                <SETTING><NAME>SymbianResourcesMMPFileLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics\GSDeviceDiagnosticsPlugin\DevDiagApp\diagplugins\diagusbcableplugin\group</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianResourcesBinaryOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\udeb</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianResourcesHeaderFileOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\include</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-
-                <!-- Settings for "Remote Download" panel -->
-                <SETTING><NAME>FileList</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Symbian ARM Debugger" panel -->
-                <SETTING><NAME>Processor</NAME><VALUE>Generic</VALUE></SETTING>
-                <SETTING><NAME>UseInitFile</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>UseConfigFile</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>ResetTarget</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>InitializationFile</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>ConfigurationFile</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>TargetOS</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>RTOSPluginName</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Symbian Common Panel" panel -->
-                <SETTING><NAME>ShowCommandLine</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>SymbianEpocToolsPath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE></VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-
-                <!-- Settings for "Symbian Compiler Panel" panel -->
-                <SETTING><NAME>PrefixFile</NAME><VALUE>feature_settings.hrh</VALUE></SETTING>
-                <SETTING><NAME>CompilerXMLDescriptor</NAME><VALUE>Metrowerks x86 Compiler</VALUE></SETTING>
-                <SETTING><NAME>Macros</NAME><VALUE>__SYMBIAN32__,__CW32__,__WINS__,__WINSCW__,__DLL__,_DEBUG,_UNICODE,__SUPPORT_CPP_EXCEPTIONS__,</VALUE></SETTING>
-                <SETTING><NAME>CodeTEST</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>EnableSWIC</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Arguments</NAME><VALUE>-wchar_t off -align 4 -warnings on -w nohidevirtual, nounusedexpr -msgstyle gcc -enum int -str pool -exc ms -trigraphs on -O0 -inline off -nostdinc</VALUE></SETTING>
-                <SETTING><NAME>CIAArgs</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Symbian Debugging" panel -->
-                <SETTING><NAME>Parse Log File</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Log File Path</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>Symbian SDK Folder</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>Log Unresolved Modules</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Log Unresolved Sym Files</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Debug Non-XIP Executables</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "Symbian Kernel Debugging" panel -->
-                <SETTING><NAME>Start Address</NAME><VALUE>0x00000000</VALUE></SETTING>
-                <SETTING><NAME>Run From Start Address</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Download Image</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>OS Image Path</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>Download Address</NAME><VALUE>0x00000000</VALUE></SETTING>
-                <SETTING><NAME>Ask First</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Debug Bootrom</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Bootrom Sym File</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "Symbian Linker Panel" panel -->
-                <SETTING><NAME>LinkOutputFile</NAME><VALUE>DevDiagUSBCableTestPlugin.dll</VALUE></SETTING>
-                <SETTING><NAME>LinkCmdLine</NAME><VALUE/></SETTING>
-                <SETTING><NAME>SymbianImportLibrary</NAME><VALUE>DevDiagUSBCableTestPlugin.lib</VALUE></SETTING>
-                <SETTING><NAME>canDebug</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>canRun</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "Symbian RomBuild Panel" panel -->
-                <SETTING><NAME>CommandLine</NAME><VALUE>buildrom -D_DEBUG devkit lubbock techview -olubbock_gui.img</VALUE></SETTING>
-                <SETTING><NAME>OutputPath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>C:\</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>DisplayMessages</NAME><VALUE>true</VALUE></SETTING>
-
-                <!-- Settings for "Symbian Target" panel -->
-                <SETTING><NAME>TargetArchitecture</NAME><VALUE>WINSCW</VALUE></SETTING>
-                <SETTING><NAME>LogMessages</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>SuppressWarnings</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>GenerateSymbolics</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>CompilerPrefix</NAME><VALUE/></SETTING>
-                <SETTING><NAME>CompilerCmdLine</NAME><VALUE/></SETTING>
-                <SETTING><NAME>SymbianImportLibraryPath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>C:\</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "Symbian Tools" panel -->
-                <SETTING><NAME>Gnu Tools Path</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>C:\</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>Epoc32 Tools Path</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>C:\</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-            </SETTINGLIST>
-            <FILELIST>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagUSBCableTestPlugin.mmp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagUSBCableTestPluginWINSCW.resources</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>EDLL.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagUSBPluginImplementationTable.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagUSBCableTestPlugin.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagUSBCableTestEngine.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagUSBCableTestPlugin_UID_.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>euser.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>avkon.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>CommonEngine.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagFramework.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>eikcoctl.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>eikdlg.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagPluginBase.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>usbman.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>centralrepository.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>flogger.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagUSBCableTestCallBackInterface.h</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagUSBCableTestEngine.h</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagUSBCableTestPlugin.h</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagUSBCableTestPlugin.hrh</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagUSBCableTestPluginWINSCWUDEB.cwlink</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-</FILELIST>
-            <LINKORDER>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagUSBCableTestPlugin.mmp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagUSBCableTestPluginWINSCW.resources</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>EDLL.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagUSBPluginImplementationTable.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagUSBCableTestPlugin.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagUSBCableTestEngine.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagUSBCableTestPlugin_UID_.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>euser.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>avkon.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>CommonEngine.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagFramework.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>eikcoctl.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>eikdlg.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagPluginBase.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>usbman.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>centralrepository.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>flogger.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagUSBCableTestCallBackInterface.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagUSBCableTestEngine.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagUSBCableTestPlugin.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagUSBCableTestPlugin.hrh</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagUSBCableTestPluginWINSCWUDEB.cwlink</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-</LINKORDER>
-        </TARGET><TARGET>
-            <NAME>WINSCW UREL</NAME>
-            <SETTINGLIST>
-
-                <!-- Settings for "Source Trees" panel -->
-                <SETTING><NAME>UserSourceTrees</NAME></SETTING>
-
-                <!-- Settings for "Access Paths" panel -->
-                <SETTING><NAME>AlwaysSearchUserPaths</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>InterpretDOSAndUnixPaths</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>RequireFrameworkStyleIncludes</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>SourceRelativeIncludes</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>UserSearchPaths</NAME>
-                    <SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics\GSDeviceDiagnosticsPlugin\DevDiagApp\diagplugins\diagusbcableplugin\inc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics\GSDeviceDiagnosticsPlugin\DevDiagApp\diagplugins\diagusbcableplugin\data</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics\GSDeviceDiagnosticsPlugin\DevDiagApp\diagplugins\diagusbcableplugin\loc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics\GSDeviceDiagnosticsPlugin\DevDiagApp\diagplugins\diagusbcableplugin\group</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics\GSDeviceDiagnosticsPlugin\DevDiagApp\diagplugins\diagusbcableplugin\src</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING></SETTING>
-                <SETTING><NAME>SystemSearchPaths</NAME>
-                    <SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\ecom</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\oem</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\middleware</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\middleware</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\osextensions</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\osextensions</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\osextensions\loc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\middleware\loc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\osextensions\loc\sc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\middleware\loc\sc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\UREL</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\release\WINSCW\UDEB</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>Symbian_Support\Win32-x86 Support\Libraries\Win32 SDK</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>CodeWarrior</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>Symbian_Support\Runtime\Runtime_x86\Runtime_Win32\Libs</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>CodeWarrior</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING></SETTING>
-
-                <!-- Settings for "Debugger Runtime" panel -->
-                <SETTING><NAME>MWRuntimeSettings_WorkingDirectory</NAME><VALUE/></SETTING>
-                <SETTING><NAME>MWRuntimeSettings_CommandLine</NAME><VALUE/></SETTING>
-                <SETTING><NAME>MWRuntimeSettings_HostApplication</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\urel\epoc.exe</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>MWRuntimeSettings_EnvVars</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Target Settings" panel -->
-                <SETTING><NAME>Linker</NAME><VALUE>Symbian Linker v2</VALUE></SETTING>
-                <SETTING><NAME>PreLinker</NAME><VALUE/></SETTING>
-                <SETTING><NAME>PostLinker</NAME><VALUE>Symbian Installer v2</VALUE></SETTING>
-                <SETTING><NAME>Targetname</NAME><VALUE>WINSCW UREL</VALUE></SETTING>
-                <SETTING><NAME>OutputDirectory</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\urel</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SaveEntriesUsingRelativePaths</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "File Mappings" panel -->
-                <SETTING><NAME>FileMappings</NAME>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>._i</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>._ii</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.c</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cc</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cfg</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cia</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cpp</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cwlink</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>XML</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cxx</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.def</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.h</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.hrh</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.i</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.iby</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.ii</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.inf</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.ini</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.inl</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.loc</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.mmpi</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.pch++</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.pkg</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.policy</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.ra</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.resources</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Resource v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>XML</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.rh</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.rls</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.rss</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.rsg</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.s</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.script</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.txt</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.a</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Object Importer v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.lib</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Object Importer v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.dso</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Object Importer v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.o</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Object Importer v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                </SETTING>
-
-                <!-- Settings for "Build Extras" panel -->
-                <SETTING><NAME>CacheModDates</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>DumpBrowserInfo</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>CacheSubprojects</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>UseThirdPartyDebugger</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>BrowserGenerator</NAME><VALUE>2</VALUE></SETTING>
-                <SETTING><NAME>DebuggerAppPath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>DebuggerCmdLineArgs</NAME><VALUE/></SETTING>
-                <SETTING><NAME>DebuggerWorkingDir</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CodeCompletionPrefixFileName</NAME><VALUE/></SETTING>
-                <SETTING><NAME>CodeCompletionMacroFileName</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Debugger Target" panel -->
-                <SETTING><NAME>ConsoleEncoding</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>LogSystemMessages</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>AutoTargetDLLsPopUp</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>StopAtWatchpoints</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>PauseWhileRunning</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>PauseInterval</NAME><VALUE>5</VALUE></SETTING>
-                <SETTING><NAME>PauseUIFlags</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>AltExePath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>StopAtTempBPOnLaunch</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>CacheSymbolics</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>TempBPFunctionName</NAME><VALUE>E32Main</VALUE></SETTING>
-                <SETTING><NAME>TempBPType</NAME><VALUE>1</VALUE></SETTING>
-
-                <!-- Settings for "Remote Debug" panel -->
-                <SETTING><NAME>Enabled</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>ConnectionName</NAME><VALUE/></SETTING>
-                <SETTING><NAME>DownloadPath</NAME><VALUE/></SETTING>
-                <SETTING><NAME>LaunchRemoteApp</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>RemoteAppPath</NAME><VALUE/></SETTING>
-                <SETTING><NAME>CoreID</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>JTAGClockSpeed</NAME><VALUE>8000</VALUE></SETTING>
-                <SETTING><NAME>IsMultiCore</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>OSDownload</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>UseGlobalOSDownload</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>OSDownloadConnectionName</NAME><VALUE/></SETTING>
-                <SETTING><NAME>OSDownloadPath</NAME><VALUE/></SETTING>
-                <SETTING><NAME>AltDownload</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>AltDownloadConnectionName</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "x86 Exceptions" panel -->
-                <SETTING><NAME>MWDebugger_X86_Exceptions</NAME>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                
-                <!-- Settings for "Auto-target" panel -->
-                <SETTING><NAME>OtherExecutables</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Analyzer Connections" panel -->
-                <SETTING><NAME>AnalyzerConnectionName</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Custom Keywords" panel -->
-                <SETTING><NAME>CustomColor1</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor2</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor3</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor4</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "ARM Debugger" panel -->
-                <SETTING><NAME>Processor</NAME><VALUE>Generic</VALUE></SETTING>
-                <SETTING><NAME>BraekPoinType_II</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>UseInitFile</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>UseConfigFile</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>IDexecutable</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>IDinitialized</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>IDuninitialized</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>IDconstant</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>SDexecutable</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>SDinitialized</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>SDuninitialized</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>SDconstant</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>VerifyMemWrites</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>ShowMPC107regs</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>InitializationFile</NAME><VALUE/></SETTING>
-                <SETTING><NAME>ConfigurationFile</NAME><VALUE/></SETTING>
-                <SETTING><NAME>BreakpointType</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>WatchpointType</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>TargetOS</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>RTOSPluginName</NAME><VALUE/></SETTING>
-                <SETTING><NAME>ByteOrderType</NAME><VALUE>0</VALUE></SETTING>
-                <PANELDATA><NAME>CodeTest SYMBIAN Instrumenter</NAME><VALUE>
-                    0200020000000100000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000433A5C0000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000637466696C657300000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000636F6465746573742E6964620000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000
-                </VALUE></PANELDATA>
-
-                <!-- Settings for "Symbian Installation" panel -->
-                <SETTING><NAME>SymbianInstallationOutputFilename</NAME><VALUE>Application.sis</VALUE></SETTING>
-                <SETTING><NAME>SymbianInstallationOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>SymbianInstallationContentSearchLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\urel</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianInstallationPassword</NAME><VALUE/></SETTING>
-                <SETTING><NAME>SymbianInstallationCreateStubFile</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "Symbian Installer Panel v2" panel -->
-                <SETTING><NAME>SymbianInstallationOutputFilename</NAME><VALUE>Application.sis</VALUE></SETTING>
-                <SETTING><NAME>SymbianInstallationOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>SymbianInstallationContentSearchLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\urel</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianInstallationPassword</NAME><VALUE/></SETTING>
-                <SETTING><NAME>SymbianInstallationCreateStubFile</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "Symbian Resource Panel" panel -->
-                <SETTING><NAME>SymbianResourcesMMPFileLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics\GSDeviceDiagnosticsPlugin\DevDiagApp\diagplugins\diagusbcableplugin\group</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianResourcesBinaryOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\urel</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianResourcesHeaderFileOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\include</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-
-                <!-- Settings for "Symbian Resources Panel v2" panel -->
-                <SETTING><NAME>SymbianResourcesMMPFileLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics\GSDeviceDiagnosticsPlugin\DevDiagApp\diagplugins\diagusbcableplugin\group</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianResourcesBinaryOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\urel</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianResourcesHeaderFileOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\include</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-
-                <!-- Settings for "Remote Download" panel -->
-                <SETTING><NAME>FileList</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Symbian ARM Debugger" panel -->
-                <SETTING><NAME>Processor</NAME><VALUE>Generic</VALUE></SETTING>
-                <SETTING><NAME>UseInitFile</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>UseConfigFile</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>ResetTarget</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>InitializationFile</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>ConfigurationFile</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>TargetOS</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>RTOSPluginName</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Symbian Common Panel" panel -->
-                <SETTING><NAME>ShowCommandLine</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>SymbianEpocToolsPath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE></VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-
-                <!-- Settings for "Symbian Compiler Panel" panel -->
-                <SETTING><NAME>PrefixFile</NAME><VALUE>feature_settings.hrh</VALUE></SETTING>
-                <SETTING><NAME>CompilerXMLDescriptor</NAME><VALUE>Metrowerks x86 Compiler</VALUE></SETTING>
-                <SETTING><NAME>Macros</NAME><VALUE>__SYMBIAN32__,__CW32__,__WINS__,__WINSCW__,__DLL__,NDEBUG,_UNICODE,__SUPPORT_CPP_EXCEPTIONS__,</VALUE></SETTING>
-                <SETTING><NAME>CodeTEST</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>EnableSWIC</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Arguments</NAME><VALUE>-wchar_t off -align 4 -warnings on -w nohidevirtual, nounusedexpr -msgstyle gcc -enum int -str pool -exc ms -trigraphs on -O4,s -nostdinc</VALUE></SETTING>
-                <SETTING><NAME>CIAArgs</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Symbian Debugging" panel -->
-                <SETTING><NAME>Parse Log File</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Log File Path</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>Symbian SDK Folder</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>Log Unresolved Modules</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Log Unresolved Sym Files</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Debug Non-XIP Executables</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "Symbian Kernel Debugging" panel -->
-                <SETTING><NAME>Start Address</NAME><VALUE>0x00000000</VALUE></SETTING>
-                <SETTING><NAME>Run From Start Address</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Download Image</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>OS Image Path</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>Download Address</NAME><VALUE>0x00000000</VALUE></SETTING>
-                <SETTING><NAME>Ask First</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Debug Bootrom</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Bootrom Sym File</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "Symbian Linker Panel" panel -->
-                <SETTING><NAME>LinkOutputFile</NAME><VALUE>DevDiagUSBCableTestPlugin.dll</VALUE></SETTING>
-                <SETTING><NAME>LinkCmdLine</NAME><VALUE/></SETTING>
-                <SETTING><NAME>SymbianImportLibrary</NAME><VALUE>DevDiagUSBCableTestPlugin.lib</VALUE></SETTING>
-                <SETTING><NAME>canDebug</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>canRun</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "Symbian RomBuild Panel" panel -->
-                <SETTING><NAME>CommandLine</NAME><VALUE>buildrom -D_DEBUG devkit lubbock techview -olubbock_gui.img</VALUE></SETTING>
-                <SETTING><NAME>OutputPath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>C:\</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>DisplayMessages</NAME><VALUE>true</VALUE></SETTING>
-
-                <!-- Settings for "Symbian Target" panel -->
-                <SETTING><NAME>TargetArchitecture</NAME><VALUE>WINSCW</VALUE></SETTING>
-                <SETTING><NAME>LogMessages</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>SuppressWarnings</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>GenerateSymbolics</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>CompilerPrefix</NAME><VALUE/></SETTING>
-                <SETTING><NAME>CompilerCmdLine</NAME><VALUE/></SETTING>
-                <SETTING><NAME>SymbianImportLibraryPath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>C:\</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "Symbian Tools" panel -->
-                <SETTING><NAME>Gnu Tools Path</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>C:\</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>Epoc32 Tools Path</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>C:\</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-            </SETTINGLIST>
-            <FILELIST>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagUSBCableTestPlugin.mmp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagUSBCableTestPluginWINSCW.resources</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>EDLL.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagUSBPluginImplementationTable.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagUSBCableTestPlugin.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagUSBCableTestEngine.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagUSBCableTestPlugin_UID_.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>euser.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>avkon.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>CommonEngine.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagFramework.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>eikcoctl.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>eikdlg.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagPluginBase.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>usbman.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>centralrepository.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>flogger.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagUSBCableTestPluginWINSCWUREL.cwlink</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-</FILELIST>
-            <LINKORDER>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagUSBCableTestPlugin.mmp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagUSBCableTestPluginWINSCW.resources</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>EDLL.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagUSBPluginImplementationTable.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagUSBCableTestPlugin.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagUSBCableTestEngine.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagUSBCableTestPlugin_UID_.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>euser.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>avkon.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>CommonEngine.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagFramework.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>eikcoctl.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>eikdlg.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagPluginBase.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>usbman.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>centralrepository.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>flogger.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagUSBCableTestPluginWINSCWUREL.cwlink</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-</LINKORDER>
-        </TARGET><TARGET>
-<NAME>Build All</NAME><SETTINGLIST><SETTING><NAME>Linker</NAME><VALUE>None</VALUE></SETTING>
-<SETTING><NAME>Targetname</NAME><VALUE>Build All</VALUE></SETTING>
-</SETTINGLIST>
-<FILELIST></FILELIST>
-<LINKORDER></LINKORDER>
-<SUBTARGETLIST><SUBTARGET><TARGETNAME>WINSCW UDEB</TARGETNAME></SUBTARGET>
-<SUBTARGET><TARGETNAME>WINSCW UREL</TARGETNAME></SUBTARGET>
-</SUBTARGETLIST></TARGET></TARGETLIST>
-
-    <TARGETORDER>
-<ORDEREDTARGET><NAME>WINSCW UDEB</NAME></ORDEREDTARGET>
-<ORDEREDTARGET><NAME>WINSCW UREL</NAME></ORDEREDTARGET>
-<ORDEREDTARGET><NAME>Build All</NAME></ORDEREDTARGET>
-</TARGETORDER>
-
-    <GROUPLIST><FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DiagUSBCableTestPlugin.mmp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<GROUP><NAME>Source</NAME>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DiagUSBPluginImplementationTable.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DiagUSBCableTestPlugin.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DiagUSBCableTestEngine.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DevDiagUSBCableTestPlugin_UID_.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-</GROUP>
-<GROUP><NAME>Headers</NAME>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DiagUSBCableTestCallBackInterface.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DiagUSBCableTestEngine.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DiagUSBCableTestPlugin.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DiagUSBCableTestPlugin.hrh</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-</GROUP>
-<GROUP><NAME>Resources</NAME>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DevDiagUSBCableTestPluginWINSCW.resources</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-</GROUP>
-<GROUP><NAME>Link</NAME>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DevDiagUSBCableTestPluginWINSCWUDEB.cwlink</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UREL</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DevDiagUSBCableTestPluginWINSCWUREL.cwlink</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-</GROUP>
-<GROUP><NAME>Libraries</NAME>
-<GROUP><NAME>WINSCW</NAME>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>EDLL.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>euser.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>avkon.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>CommonEngine.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DiagFramework.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>eikcoctl.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>eikdlg.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DiagPluginBase.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>usbman.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>centralrepository.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>flogger.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UREL</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>EDLL.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-</GROUP>
-</GROUP>
-</GROUPLIST>
-
-</PROJECT>
--- a/devicediagnostics/diagplugins/diagusbcableplugin/inc/diagusbcabletestcallbackinterface.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-/*
-* 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:  This class is an abstract interface used by the USB cable test
-*                engine class (CDiagUSBCableTestEngine) to report result to the 
-*                plug-in class (CDiagUSBCableTestPlugin)    
-*
-*/
-
-
-#ifndef DIAGUSBCALLBACKINTERFACE_H
-#define DIAGUSBCALLBACKINTERFACE_H
-
-// INCLUDES
-#include <DiagResultsDatabaseItem.h>
-
-// CLASS DECLARATION
-
-/**
-* MDiagUSBTestCallBackInterface
-*
-* This is an abstract interface class used by the USB cable test
-* engine class (CDiagUSBCableTestEngine) to report result of the test
-* to the plug-in class (CDiagUSBCableTestPlugin) and invoke few other callback functions
-*/
- 
-class MDiagUSBTestCallBackInterface
-    {
-public:
-    /**
-    * The engine class uses this callback interface to report result back to the plugin
-    * class
-    */
-    virtual void ReportTestResultL(CDiagResultsDatabaseItem::TResult aResult) = 0;
-    
-    /**
-    * The engine class uses this callback on the plugin class to ask the user if the entire test
-    * execution needs to be cancelled.
-    * @param aUserResponse : The user response is returned in this reference argument.
-    *      
-    * @return ETrue     : The dialog was dismissed by the user.
-    *         EFalse    : The dialog was dismissed internally.
-    */    
-    virtual TBool AskCancelExecutionL(TInt& aUserResponse,TInt aOption) = 0;  
-     
-    };    
-
-#endif // DIAGUSBCALLBACKINTERFACE_H
--- a/devicediagnostics/diagplugins/diagusbcableplugin/inc/diagusbcabletestengine.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,178 +0,0 @@
-/*
-* 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:  This is the header for the Diagnostics USB Cable Test Engine
-*
-*/
-
-
-#ifndef DIAGUSBCABLETESTENGINE_H 
-#define DIAGUSBCABLETESTENGINE_H
-
-
-// INCLUDES
-#include <DiagResultsDatabaseItem.h>                // CDiagResultsDatabaseItem
-#include <usbman.h>                                 // RUsb
-
-#include "diagusbcabletestcallbackinterface.h"      // MDiagUSBTestCallBackInterface
-
-//CONSTANTS
-
-// MACROS
-
-// DATA TYPES
-
-// FUNCTION PROTOTYPES
-
-// FORWARD DECLARATIONS
-class CDiagPluginWaitingDialogWrapper;
-class CRepository;
-
-// CLASS DEFINITION
-
-/**
-* This is the engine class of the USB cable test plugin.
-*/
-class CDiagUSBCableTestEngine : public CActive
-    {
-public: //public constructor and destructor.
-
-    /**
-    * Symbian two phase constructor
-    */
-    static CDiagUSBCableTestEngine* NewL(MDiagUSBTestCallBackInterface& aInterface,
-                                        TBool aIsSinglePluginExecution);
-    
-    /**
-    * Destructor
-    */
-    ~CDiagUSBCableTestEngine();
-    
-public: // public interfaces
-
-    /**
-    * The plugin class starts the USB cable test using this function
-    */
-    void RunUSBCableTestL();
-
-private: // private constructors
-    
-    /**
-    * C++ constructor
-    */
-    CDiagUSBCableTestEngine(MDiagUSBTestCallBackInterface& aInterface,
-                            TBool aIsSinglePluginExecution);
-    
-    /**
-    * Symbian second phase constructor.
-    */
-    void ConstructL();
-
-private: // private internal functions
-
-    /**
-    * This is an internal function to end the test execution and report result to the 
-    * plug-in class.
-    */
-    void ReportResultToPluginL(CDiagResultsDatabaseItem::TResult aResult);
-    
-    /**
-    * This function detects the USB cable status.
-    */
-    TBool CheckIfUSBCableDetectedL();
-
-    /**
-    * Ask user to connect charger and press OK
-    *   @param aUserResponse - Dialog response will be returned via this parameter.
-    *   @return ETrue - If dialog was dismissed by end user.
-    *       EFalse - If dialog was deleted.
-    */
-    TBool ConnectAndPressOkL( TInt& aUserResponse ); 
-
-    /**
-    * Ask user to remove all cables and press OK    
-    *   @param aUserResponse - Dialog response will be returned via this parameter.
-    *   @return ETrue  - If dialog was dismissed by end user.
-    *           EFalse - If dialog was deleted.
-    */
-    TBool RemoveAllCablesL( TInt& aUserResponse ); 
-    
-    /**
-    * Display "No cable detected. Try again?" prompt
-    *   @param aUserResponse - Dialog response will be returned via this parameter.
-    *   @return ETrue - If dialog was dismissed by end user.
-    *       EFalse - If dialog was deleted.
-    */
-    TBool AskIfRetryL( TInt& aUserResponse );
-
-    /**
-    *   Displays a query dialog with header
-    *   @param aDialogResourceId - Resource ID of the dialog to display
-    *   @param aUserResponse - Dialog response will be returned via this parameter.
-    *   @return ETrue - If dialog was dismissed by end user.
-    *           EFalse - If dialog was deleted.
-    */
-    TBool DisplayQueryDialogWithHeaderL( TInt aDialogResourceId, 
-                               TInt& aUserResponse );
-    
-protected:    // from CActive
-        /**
-        * Handle active object completion event, used to handle internal trigger in our plug-in
-        */
-        void RunL();
-    
-        /**
-        * Handle cancel
-        */
-        void DoCancel();
-    
-        
-private: // Data
-
-    /**
-    * Reference to the callback interface between the engine class and plugin class
-    */
-    MDiagUSBTestCallBackInterface& iInterface;
-    
-    /**
-    * Wrapper to display waiting dialog. This helps to identify if the dialog
-    * was dismissed by end-user or by object deletion.
-    * Ownership: This class.
-    */
-    CDiagPluginWaitingDialogWrapper* iWaitingDialogWrapper;
-
-    /**
-    * Instance of the session to the USB manager.
-    */
-    RUsb iUsbManager;
-    
-    /**
-    * Instance of the central repository handle. Own
-    */
-    CRepository  *iCenRep;
-    
-    /**
-    * Boolean flag to remember if the cenrep is modified by the test plugin.
-    */
-    TBool iCenrepModified;
-    
-    /**
-    *   This flag indicates if the plugin is run in single test execution mode.
-    */
-    TBool iIsSinglePluginExecution;    
-    
-    };
-
-#endif //DIAGUSBCABLETESTENGINE_H
-
-// End of File
--- a/devicediagnostics/diagplugins/diagusbcableplugin/inc/diagusbcabletestplugin.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,158 +0,0 @@
-/*
-* 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:  This is the header for the Diagnostics USB Cable Test Plug-in
-*
-*/
-
-
-
-
-#ifndef DIAGUSBCABLETESTPLUGIN_H 
-#define DIAGUSBCABLETESTPLUGIN_H
-
-// INCLUDES
-
-// System includes
-#include <DiagResultsDatabaseItem.h>            // CDiagResultsDatabaseItem
-#include <DiagTestPluginBase.h>                 // CDiagTestPluginBase
-
-// User includes
-#include "diagusbcabletestcallbackinterface.h"  // MDiagUSBTestCallBackInterface
-
-
-//CONSTANTS
-
-// MACROS
-
-// DATA TYPES
-
-// FUNCTION PROTOTYPES
-
-// FORWARD DECLARATIONS
-class CDiagResultsDbItemBuilder;
-class CDiagUSBCableTestEngine;
-
-// CLASS DEFINITION
-class CDiagUSBCableTestPlugin : public CDiagTestPluginBase, 
-                                public MDiagUSBTestCallBackInterface
-    {
-    
-public: // Constructors and destructor
-
-        /**
-        * Symbian OS two-phased constructor
-        * @return USB CableTest Test Plugin
-        */
-        static MDiagPlugin* NewL( TAny* aInitParams );
-
-        /**
-        * Destructor
-        */
-        ~CDiagUSBCableTestPlugin();
-
-private: // from MDiagUSBTestCallBackInterface
-
-        /**
-        *  The USB Cable Test Engine calls this callback to provide the result of the test
-        */
-        void ReportTestResultL(CDiagResultsDatabaseItem::TResult aResult);
-        
-        /**
-        * The engine class uses this callback on the plugin class to ask the user if the entire test
-        * execution needs to be cancelled.
-        * @param aUserResponse : The user response is returned in this reference argument.
-        *      
-        * @return ETrue     : The dialog was dismissed by the user.
-        *         EFalse    : The dialog was dismissed internally.
-        */    
-        TBool AskCancelExecutionL(TInt& aUserResponse, TInt aOption);  
-
-private: // From CDiagTestPluginBase
-
-        /**
-        * @see CDiagTestPluginBase::Visible()
-        */
-        TBool IsVisible() const;
-
-        /**
-        * @see CDiagTestPluginBase::RunMode()
-        */
-        TRunMode RunMode() const;
-
-        /**
-        * @see CDiagTestPluginBase::TotalSteps()
-        */
-        TUint TotalSteps() const;
-
-        /**
-        * @see CDiagTestPluginBase::GetPluginNameL
-        */
-        HBufC* GetPluginNameL( TNameLayoutType aLayoutType ) const;
-
-
-        /**
-        * @see CDiagTestPluginBase::Uid
-        */
-        TUid Uid() const;
-        
-        /**
-        * Handle plug-in execution.
-        * @see CDiagTestPluginBase::DoRunTestL
-        */
-        void DoRunTestL();
-
-        /**
-        * Clean up
-        * @see CDiagTestPluginBase::DoStopAndCleanupL
-        */
-        void DoStopAndCleanupL();
-
-private:    // private constructors
-
-        /**
-        * C++ default constructor.
-        */
-        CDiagUSBCableTestPlugin( CDiagPluginConstructionParam* aInitParams );
-
-        /**
-        * Symbian OS default constructor.
-        *
-        */
-        void ConstructL();
-
-
-
-private:    // from CActive
-        /**
-        * Handle active object completion event
-        */
-        void RunL();
-
-        /**
-        * Handle cancel
-        */
-        void DoCancel();
-
-    private:    // private data
-        
-        /**
-        * An instance of the engine class. Own
-        */
-        CDiagUSBCableTestEngine *iEngine;
-    };
-
-#endif //DIAGUSBCABLETESTPLUGIN_H
-
-// End of File
-
--- a/devicediagnostics/diagplugins/diagusbcableplugin/inc/diagusbcabletestplugin.hrh	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-/*
-* 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:  Contains UIDs and Common definitions for menu ids
-*
-*/
-
-
-#ifndef DIAGUSBCABLETESTPLUGIN_HRH
-#define DIAGUSBCABLETESTPLUGIN_HRH
-
-// Definitions
-#define _UID3                   0x2000E594
-#define _IMPLEMENTATION_UID     0x2000E595
-
-// commands
-enum TMyMenuCmdIDs
-   {
-    EUsbTestConnectUSBSkip = 1, // donot start from 0
-    EUsbTestConnectUSBCancel,
-    EUsbTestConnectUSBBack,
-    EUsbTestConnectUSBOK
-   };
-
-#endif //  DIAGUSBCABLETESTPLUGIN_HRH
-
-//End of File
--- a/devicediagnostics/diagplugins/diagusbcableplugin/loc/diagusbcabletestplugin.loc	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,90 +0,0 @@
-/*
-* 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:  Localization strings for DiagUSBCableTestPlugin.
-*
-*/
-
-
-//  LOCALISATION STRINGS
-
-// d:Plug-in name in the header of the dialog that is shown when starting test
-// d:execution.
-// l:heading_pane_t1
-// r:3.2.1
-//
-#define qtn_diag_msg_title_usb_cable  "USB cable test"
-
-
-// d:The body text of the dialog that is shown when starting test execution.
-// d:This provides information about running the plug-in to the user.
-// l:popup_info_list_pane_t1
-// r:3.2.1
-//
-#define qtn_diag_msg_info_usb_cable  "The following test will check USB cable."
-
-
-// d:The title pane shown when USB cable test is running
-// l:title_pane_t2/opt12
-// r:3.2.1
-//
-//#define qtn_diag_title_test_usb_cable  "USB cable test"
-
-
-
-// d:Plugin name in the plugin view listbox.
-// l:list_single_graphic_pane_t1
-// r:3.2.1
-//
-//#define qtn_diag_lst_test_usb_cable  "USB cable test"
-
-
-
-//d:Plugin name in the results view listbox.
-//l:list_single_graphic_heading_pane_t1_cp2
-//r:3.2.1
-//
-#define qtn_diag_lst_usb_cable  "USB cable test"    
-
-//d:Text of the query dialog to prompt user to connect USB cable and confirm
-//l:popup_note_window
-//r: 3.2
-//
-#define qtn_diag_conf_usb_connect  "Connect USB Cable and plug it into your PC. To run this test your PC needs to be turned on."     
-        
-
-
-//d:Title of the query dialog when USB cable is not detected
-//l:heading_pane_t1
-//r: 3.2
-//
-#define qtn_diag_err_title_no_usb  "USB cable not detected" 
-        
-
-//d:Text of the query dialog when USB cable is not detected
-//l:popup_info_list_pane_t1
-//r: 3.2
-//
-#define qtn_diag_err_no_usb  "Do you want to repeat the USB Cable test?"
-
-
-
-//d:Failed result text
-//l:popup_info_list_pane_t1
-//r:5.0
-//
-#define qtn_diag_conf_test_failed_usb_cable "USB cable test"
-        
-#define qtn_diag_softk_skip "Skip"
-
-// End of File
--- a/devicediagnostics/diagplugins/diagusbcableplugin/rom_files/devdiagusbcableplugin.iby	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-/*
-* 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:  Image description file for project USB cable test plug-in
-*
-*/
-
-
-#ifndef DEVDIAGUSBCABLEPLUGIN_IBY
-#define DEVDIAGUSBCABLEPLUGIN_IBY
-
-#ifdef FF_DEVICE_DIAGNOSTICS_APP 
-
-#include <data_caging_paths_for_iby.hrh>
-
-ECOM_PLUGIN( DevDiagUSBCableTestPlugin.dll, DevDiagUSBCableTestPlugin.rsc )
-
-#endif
-
-#endif // DEVDIAGUSBCABLEPLUGIN_IBY
-
-// end of file
--- a/devicediagnostics/diagplugins/diagusbcableplugin/rom_files/devdiagusbcableplugin_resources.iby	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-/*
-* 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:  Image description file for resources of project USB cable test plug-in
-*
-*/
-
-
-#ifndef DEVDIAGUSBCABLEPLUGIN_RESOURCES_IBY
-#define DEVDIAGUSBCABLEPLUGIN_RESOURCES_IBY
-
-#ifdef FF_DEVICE_DIAGNOSTICS_APP 
-
-#include <data_caging_paths_for_iby.hrh>
-
-data=\epoc32\data\Z\resource\DevDiagUSBCableTestPluginRsc.rsc          resource\DevDiagUSBCableTestPluginRsc.rsc
-
-#endif
-
-#endif // DEVDIAGUSBCABLEPLUGIN_RESOURCES_IBY
-
-// end of file
--- a/devicediagnostics/diagplugins/diagusbcableplugin/src/diagusbcabletestengine.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,490 +0,0 @@
-/*
-* 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:  This is the class module for the Diag USB Cable Test Engine
-*
-*/
-
-
-// INCLUDE FILES
-
-// Class Declaration
-#include "diagusbcabletestengine.h"
-
-// System includes
-#include <DiagFrameworkDebug.h>                 // LOGSTRING
-#include <DiagPluginWaitingDialogWrapper.h>     // CDiagPluginWaitingDialogWrapper
-#include <devdiagusbcabletestpluginrsc.rsg>        // resources
-#include <UsbWatcherInternalCRKeys.h>           // KUsbWatcherChangeOnConnectionSetting
-#include <aknmessagequerydialog.h>              // CAknQueryDialog
-#include <centralrepository.h>                  // CRepository
-
-
-// User includes
-#include "diagusbcabletestplugin.hrh"           // command ids
-#include "avkon.hrh" // ADO & Platformization Changes
-
-// EXTERNAL DATA STRUCTURES
-
-// EXTERNAL FUNCTION PROTOTYPES
-
-// CONSTANTS
-
-// MACROS
-
-// LOCAL CONSTANTS AND MACROS
-
-// MODULE DATA STRUCTURES
-
-// LOCAL FUNCTION PROTOTYPES
-
-// FORWARD DECLARATIONS
-
-// ============================= LOCAL FUNCTIONS ==============================
-
-// ========================= MEMBER FUNCTIONS ================================
-   
-// ---------------------------------------------------------------------------
-// CDiagUSBCableTestEngine::NewL()
-//
-// Symbian OS default constructor
-// ---------------------------------------------------------------------------   
-CDiagUSBCableTestEngine* CDiagUSBCableTestEngine::NewL(
-    MDiagUSBTestCallBackInterface& aInterface,
-    TBool aIsSinglePluginExecution)
-    {
-    LOGSTRING( "CDiagUSBCableTestEngine::NewL()" )
-    
-    CDiagUSBCableTestEngine* self = 
-        new (ELeave)CDiagUSBCableTestEngine(aInterface, aIsSinglePluginExecution);
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );
-    return self;    
-    }
-    
-    
-// ----------------------------------------------------------------------------
-// CDiagUSBCableTestEngine::CDiagUSBCableTestEngine()
-//
-// Constructor
-// ----------------------------------------------------------------------------
-//    
-CDiagUSBCableTestEngine::CDiagUSBCableTestEngine(
-    MDiagUSBTestCallBackInterface& aInterface,
-    TBool aIsSinglePluginExecution)
-    :   CActive( EPriorityStandard ),
-        iInterface(aInterface),
-        iWaitingDialogWrapper( NULL ),
-        iIsSinglePluginExecution(aIsSinglePluginExecution)
-    {
-    LOGSTRING( "CDiagUSBCableTestEngine::CDiagUSBCableTestEngine()" )
-    CActiveScheduler::Add( this );
-    }
-    
-// ----------------------------------------------------------------------------
-// CDiagUSBCableTestEngine::~CDiagUSBCableTestEngine
-//
-// Destructor
-// ----------------------------------------------------------------------------       
-CDiagUSBCableTestEngine::~CDiagUSBCableTestEngine()
-    {
-    LOGSTRING( "CDiagUSBCableTestEngine::~CDiagUSBCableTestEngine()" )
-    
-    Cancel();
-    
-    if(iCenRep)
-        {
-        // if the cenrep was modified by us , restore the settings
-        if(iCenrepModified)
-            {
-            TInt error = iCenRep->Set( KUsbWatcherChangeOnConnectionSetting, 1);
-            iCenrepModified = EFalse;
-            }
-                
-        delete iCenRep;
-        iCenRep = NULL;
-        }
-    
-    if(iWaitingDialogWrapper)
-        {
-        delete iWaitingDialogWrapper; //  deleting will dismiss active dialog
-        iWaitingDialogWrapper = NULL;        
-        }
-
-    }
-    
-// ---------------------------------------------------------------------------
-// CDiagUSBCableTestEngine::ConstructL()
-//
-// Symbian OS two-phased constructor
-// ---------------------------------------------------------------------------    
-void CDiagUSBCableTestEngine::ConstructL()
-    {
-    LOGSTRING( "CDiagUSBCableTestEngine::ConstructL()" )
-    
-    // check if USB's "Ask on Connection" is on
-    // if ON, set if OFF, remember to turn in ON again at the end of test
-        
-    TInt retval;
-    iCenRep = CRepository::NewL( KCRUidUsbWatcher );
-    iCenrepModified = EFalse;
-    iCenRep->Get( KUsbWatcherChangeOnConnectionSetting, retval);
-    if(retval)
-        {
-         //if setting is 1,set it to 0, and remember to reset it back when application exits.
-        iCenrepModified = ETrue;
-        TInt error = iCenRep->Set( KUsbWatcherChangeOnConnectionSetting, 0);
-        }        
-    }
-    
-
-// ----------------------------------------------------------------------------
-// CDiagUSBCableTestEngine::RunUSBCableTestL
-//
-// This function starts the USB cable test
-// ----------------------------------------------------------------------------           
-void CDiagUSBCableTestEngine::RunUSBCableTestL()
-    {
-    TInt userResponse;
-
-    if ( !ConnectAndPressOkL( userResponse ) )
-        {
-        //"Connect and Press OK" dialog was dismissed internally by the framework
-        // return immediately
-        LOGSTRING( "CDiagUSBCableTestEngine Connect USB and confirm dialog was dismissed internally" )
-        return;
-        }
-
-    switch( userResponse )
-        {
-        // user selects OK for "Connect and Press OK" dialog
-        case EAknSoftkeyOk:
-            {
-            //TInt keySelect;
-            // check if cable is connected
-            if( CheckIfUSBCableDetectedL() )
-                {
-                // USB cable is detected
-                /*
-                if ( !RemoveAllCablesL( keySelect ) )
-                    {
-                    LOGSTRING( "CDiagUSBCableTestEngine : Remove All Cable dialog was dismissed internally pressed" )
-                    return;
-                    }
-
-                if ( keySelect != EAknSoftkeyOk )
-                    {
-                    LOGSTRING( "CDiagUSBCableTestEngine : EndKey has pressed" )
-                    return;	
-                    }
-                 */ // ADO & Platformization Changes   
-
-                LOGSTRING( "CDiagUSBCableTestEngine : Report result Success" )
-                ReportResultToPluginL( CDiagResultsDatabaseItem::ESuccess );
-                }
-            else
-                { 
-                // no cable detected
-                if ( !AskIfRetryL( userResponse ) )
-                    {
-                    // Retry dialog was dimissed internally by the framework
-                    // return immediately
-                    LOGSTRING( "CDiagUSBCableTestEngine Ask for retry dialog was dismissed internally" )
-                    return;
-                    }
-
-
-                
-               if( userResponse == EAknSoftkeyYes )
-                    {
-                    // User selects Back to retry the test
-                    // will come here in case of Back or Cancel key
-                    TRequestStatus* status = &iStatus;
-                    SetActive();
-                    User::RequestComplete( status, KErrNone );
-                    }
-                else
-                    {
-                    //Retry dialog was dismissed by Cancel / End key
-                    ReportResultToPluginL(CDiagResultsDatabaseItem::EFailed);
-                    LOGSTRING( "CDiagUSBCableTestEngine Retry dialog was dismissed by Cancel / End key" )
-                    return;
-                    }
-                }
-            }
-            break;
-        
-        // user selects CANCEL softkey for "Connect and Press OK" dialog
-        case EUsbTestConnectUSBSkip:
-        case EUsbTestConnectUSBCancel:
-	            {
-    	        LOGSTRING( "CDiagUSBCableTestEngine User Cancelled the test execution" )
-    	        if(iIsSinglePluginExecution)
-    	            {
-    	            LOGSTRING( "CDiagUSBCableTestEngine User skipped the test execution" )
-    	            ReportResultToPluginL(CDiagResultsDatabaseItem::ESkipped);
-    	            }
-    	        else
-    	            {
-    	            TInt aOption = 1;
-                    if(iInterface.AskCancelExecutionL(userResponse,aOption))
-                        {
-                        if(userResponse)
-                            {
-                            LOGSTRING( "CDiagUSBCableTestEngine Test cancelled by user" )
-                            return;
-                            }
-                        else
-                            {
-                            // currently no way to distinguish between "No" and "Cancel" key
-                            LOGSTRING( "CDiagUSBCableTestEngine : User selected No to Cancel dialog" )
-                            // do a self-trigger to start again
-                            TRequestStatus* status = &iStatus;
-                            SetActive();
-                            User::RequestComplete( status, KErrNone );
-                            }
-                        }
-                    else
-                        {
-                        // though the cancel dialog should not be dismissed internally, this is
-                        // just a safeguard to be sure we dont do anything
-                        LOGSTRING( "CDiagUSBCableTestEngine Test cancel dialog dismissed internally" )
-                        break;
-                        }
-    	            }
-
-	            }
-            break;
-        
-        // user selects CANCEL End Key for "Connect and Press OK" dialog
-        default:
-            {
-            LOGSTRING( "CDiagUSBCableTestEngine Connect USB and confirm dialog was cancelled by the end key" )
-            }
-            break;
-        };
-    }
-    
-// ----------------------------------------------------------------------------
-// CDiagUSBCableTestEngine::CheckIfUSBCableDetectedL
-//
-// This function reports the result to plugin
-// ----------------------------------------------------------------------------
-TBool CDiagUSBCableTestEngine::CheckIfUSBCableDetectedL()
-    {
-    TBool bCableDetected = EFalse;
-    TInt err = iUsbManager.Connect();
-    if(err == KErrNone)
-        {
-        // get the USB service state
-        TUsbServiceState UsbServiceState;
-        err = iUsbManager.GetServiceState(UsbServiceState);
-        LOGSTRING2( "CDiagUSBCableTestEngine::USB service state: %d", UsbServiceState)
-        
-        if(err == KErrNone)
-            {
-            switch(UsbServiceState)
-                {
-                    case EUsbServiceStarting:
-                    case EUsbServiceStarted:
-                        {            
-                        // get the USB device state
-                        TUsbDeviceState UsbDeviceState;
-                        err = iUsbManager.GetDeviceState(UsbDeviceState);
-                        LOGSTRING2( "CDiagUSBCableTestEngine::USB Device state: %d", UsbDeviceState)
-                        if(err == KErrNone)
-                            {
-                            if(UsbDeviceState > EUsbDeviceStatePowered)
-                                {
-                                bCableDetected = ETrue;
-                                }
-                            else
-                                {
-                                bCableDetected = EFalse;
-                                }
-                            }
-                        else
-                            {
-                            LOGSTRING( "CDiagUSBCableTestEngine Error in obtaining USB Device state")
-                            bCableDetected = EFalse;
-                            }
-                        }
-                        break;
-                        
-                    case EUsbServiceIdle:
-                    case EUsbServiceStopping:
-                    case EUsbServiceFatalError:
-                    default:
-                        {
-                        bCableDetected = EFalse;
-                        }
-                        break;
-                };
-            }
-        else
-            {
-            LOGSTRING( "CDiagUSBCableTestEngine Error in obtaining USB Service state")
-            bCableDetected = EFalse;
-            }
-        
-        iUsbManager.Close();
-        }
-    else
-        {
-         LOGSTRING( "CDiagUSBCableTestEngine::iUsbManager.Connect() failed" )
-        bCableDetected = EFalse;
-        }
-    
-    return bCableDetected;
-    }  
-
-// ----------------------------------------------------------------------------
-// CDiagUSBCableTestEngine::ReportResultToPluginL
-//
-// This function reports the result to plugin
-// ----------------------------------------------------------------------------       
-void CDiagUSBCableTestEngine::ReportResultToPluginL(
-                                            CDiagResultsDatabaseItem::TResult aResult)
-    {
-    iInterface.ReportTestResultL(aResult);
-    }
-
-// --------------------------------------------------------------------------------------------------------------
-// CDiagUSBCableTestPlugin::ConnectAndPressOkL
-// This function shows the query dialog : "Connect an USB data cable from phone to the PC. Press OK when ready."
-// --------------------------------------------------------------------------------------------------------------    
-TBool CDiagUSBCableTestEngine::ConnectAndPressOkL( TInt& aUserResponse )
-    {
-    ASSERT( iWaitingDialogWrapper == NULL );
-
-    CAknQueryDialog* dialog = CAknQueryDialog::NewL( CAknQueryDialog::ENoTone );
-    CleanupStack::PushL( dialog );
-    dialog->PrepareLC( R_DIAG_USB_CABLE_TEST_CONNECT_AND_PRESS_OK );
-    if( iIsSinglePluginExecution )
-        {
-        CEikButtonGroupContainer& cba = dialog->ButtonGroupContainer();
-        cba.SetCommandSetL( R_CBA_SINGLE_EXECUTION );        
-        }        
-    CleanupStack::Pop( dialog );
-
-    // dialog ownership to bepassed to iWaitingDialogWrapper
-    // CDiagPluginWaitingDialogWrapper::NewL will push dialog into clean up stack
-    iWaitingDialogWrapper = CDiagPluginWaitingDialogWrapper::NewL( dialog );
-    dialog = NULL;
-
-    TBool isDialogDismissedByUser = iWaitingDialogWrapper->RunLD( aUserResponse );
-    if ( isDialogDismissedByUser )
-        {
-        // local variable can be accessed only if it was returned due to
-        // user response. iWaitingDialogWrapper self destructs.
-        iWaitingDialogWrapper = NULL;
-        }
-
-    return isDialogDismissedByUser;    
-    }
-
-// ---------------------------------------------------------------------------------------
-// CDiagUSBCableTestPlugin::RemoveAllCables
-// This function shows the query dialog : Please remove all cables
-// --------------------------------------------------------------------------------------- 
-TBool CDiagUSBCableTestEngine::RemoveAllCablesL( TInt& aUserResponse )
-    {
-    ASSERT( iWaitingDialogWrapper == NULL );
-
-    CAknQueryDialog* dialog = CAknQueryDialog::NewL( CAknQueryDialog::ENoTone );
-
-    dialog->PrepareLC( R_DIAG_CABLE_TEST_REMOVE_ALL_CABLES );
-
-    // dialog ownership to bepassed to iWaitingDialogWrapper
-    // CDiagPluginWaitingDialogWrapper::NewL will push dialog into clean up stack
-    iWaitingDialogWrapper = CDiagPluginWaitingDialogWrapper::NewL( dialog );
-    dialog = NULL;
-
-    TBool isDialogDismissedByUser = iWaitingDialogWrapper->RunLD( aUserResponse );
-    if ( isDialogDismissedByUser )
-        {
-        // local variable can be accessed only if it was returned due to
-        // user response. iWaitingDialogWrapper self destructs.
-        iWaitingDialogWrapper = NULL;
-        }
-
-    return isDialogDismissedByUser;
-    }     
-    
-// --------------------------------------------------------------------------------------------------------------------------
-// CDiagUSBCableTestPlugin::AskIfRetryL
-// This function shows the query dialog : "USB data cable not detected. Press OK to continue or press Back to retry this test."
-// ---------------------------------------------------------------------------------------------------------------------------
-TBool CDiagUSBCableTestEngine::AskIfRetryL( TInt& aUserResponse )
-    {    
-    return DisplayQueryDialogWithHeaderL( R_DIAG_USB_CABLE_TEST_NO_CABLE_DETECTED,
-                                aUserResponse );
-    }
-
-// ---------------------------------------------------------------------------------------
-// CDiagUSBCableTestPlugin::DisplayQueryDialogWithHeaderL
-// This function shows the query dialog. It returns ETrue, if the dialog is dismissed by user
-// if the dialog was dismissed because of time-out, it returns EFalse. The user response (softkey)
-// is returned in the reference argument aUserResponse
-// ---------------------------------------------------------------------------------------    
-TBool CDiagUSBCableTestEngine::DisplayQueryDialogWithHeaderL( 
-        TInt aDialogResourceId,
-        TInt& aUserResponse )
-    {
-    ASSERT( iWaitingDialogWrapper == NULL );
-
-    CAknMessageQueryDialog * dialog = new ( ELeave ) CAknMessageQueryDialog ( CAknQueryDialog::ENoTone );
-    CleanupStack::PushL( dialog );
-    dialog->PrepareLC( aDialogResourceId );
-    CleanupStack::Pop( dialog );
-
-    // dialog ownership to bepassed to iWaitingDialogWrapper
-    // CDiagPluginWaitingDialogWrapper::NewL will push dialog into clean up stack
-    iWaitingDialogWrapper = CDiagPluginWaitingDialogWrapper::NewL( dialog );
-    dialog = NULL;
-
-    TBool isDialogDismissedByUser = iWaitingDialogWrapper->RunLD( aUserResponse );
-    if ( isDialogDismissedByUser )
-        {
-        // local variable can be accessed only if it was returned due to
-        // user response. iWaitingDialogWrapper self destructs.
-        iWaitingDialogWrapper = NULL;
-        }
-
-    return isDialogDismissedByUser;
-    }
-
-// ---------------------------------------------------------------------------------------
-// CDiagHeadsetCableTestEngine::RunL
-// RunL() function is used in this plug-in to handle internal trigger
-// ---------------------------------------------------------------------------------------    
-void CDiagUSBCableTestEngine::RunL()
-    {
-    if(iStatus == KErrNone)
-        {
-        RunUSBCableTestL();
-        }
-    }
-    
-// ---------------------------------------------------------------------------------------
-// CDiagHeadsetCableTestEngine::DoCancel
-// Handles cancel request
-// ---------------------------------------------------------------------------------------    
-void CDiagUSBCableTestEngine::DoCancel()
-    {
-    // no implementation needed
-    }
-    
-// End of File
-
--- a/devicediagnostics/diagplugins/diagusbcableplugin/src/diagusbcabletestplugin.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,314 +0,0 @@
-/*
-* 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:  This is the class module for the Diagnostics USB Cable Test plugin
-*
-*/
-
-
-// INCLUDE FILES
-
-// Class Declaration
-#include "diagusbcabletestplugin.h"
-
-// System includes
-#include <avkon.hrh>                        // command definitions
-#include <StringLoader.h>                   // StringLoader
-#include <aknmessagequerydialog.h>     		// CAknMessageQueryDialog
-#include <DiagFrameworkDebug.h>             // Debug macros
-#include <DiagTestExecParam.h>              // TDiagTestExecParam
-#include <DiagEngineCommon.h>               // MDiagEngineCommon
-#include <devdiagusbcabletestpluginrsc.rsg>    // resources
-
-// User includes
-#include "diagusbcabletestengine.h"         // CDiagUSBCableTestEngine
-#include "diagusbcabletestplugin.hrh"       // UIDs and command ids
-
-// EXTERNAL DATA STRUCTURES
-
-// EXTERNAL FUNCTION PROTOTYPES
-
-// CONSTANTS
-const TUint KTotalNumOfSteps = 2;
-const TUid KDiagUSBCableTestPluginUid = { _IMPLEMENTATION_UID };
-_LIT( KDiagUSBCableTestPluginResourceFileName, "z:DevDiagUSBCableTestPluginRsc.rsc" );
-
-// MACROS
-
-// LOCAL CONSTANTS AND MACROS
-
-// MODULE DATA STRUCTURES
-
-// LOCAL FUNCTION PROTOTYPES
-
-// FORWARD DECLARATIONS
-
-// ============================= LOCAL FUNCTIONS ==============================
-
-// ========================= MEMBER FUNCTIONS ================================
-
-// ----------------------------------------------------------------------------
-// Constructor
-// ----------------------------------------------------------------------------
-//
-CDiagUSBCableTestPlugin::CDiagUSBCableTestPlugin
-                                  ( CDiagPluginConstructionParam* aParam )
-    : CDiagTestPluginBase( aParam )
-    {
-    LOGSTRING( "CDiagUSBCableTestPlugin::CDiagUSBCableTestPlugin()" )
-    }
-
-
-// ---------------------------------------------------------------------------
-// Symbian OS default constructor
-// ---------------------------------------------------------------------------
-MDiagPlugin* CDiagUSBCableTestPlugin::NewL( TAny* aInitParams )
-    {
-    LOGSTRING( "CDiagUSBCableTestPlugin::NewL()" )
-    CDiagPluginConstructionParam* param = 
-            static_cast<CDiagPluginConstructionParam*>(aInitParams);
-
-    CleanupStack::PushL( param );
-    CDiagUSBCableTestPlugin* self = 
-            new( ELeave ) CDiagUSBCableTestPlugin (param);
-    CleanupStack::Pop( param );
-
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop(self);
-
-    return self;
-    }
-
-
-
-// ---------------------------------------------------------------------------
-// Symbian OS second phase constructor
-// ---------------------------------------------------------------------------
-void CDiagUSBCableTestPlugin::ConstructL()
-    {
-    LOGSTRING( "CDiagUSBCableTestPlugin::ConstructL()" )
-    BaseConstructL ( KDiagUSBCableTestPluginResourceFileName );
-    }
-
-
-// ----------------------------------------------------------------------------
-// Destructor
-// ----------------------------------------------------------------------------
-CDiagUSBCableTestPlugin::~CDiagUSBCableTestPlugin()
-    {
-    LOGSTRING( "CDiagUSBCableTestPlugin::~CDiagUSBCableTestPlugin()" )
-    // StopAndCleanupL() called by base class, whcih calls
-    //  Cancel()    -> DoCancel()
-    //  DoStopAndCleanupL()
-    // Not much to do here.
-    }
-
-
-// ---------------------------------------------------------------------------
-// From MDiagPlugin
-// CDiagUSBCableTestPlugin::IsVisible()
-// ---------------------------------------------------------------------------
-
-TBool CDiagUSBCableTestPlugin::IsVisible() const
-    {
-    return ETrue;
-    }
-   
-
-// ---------------------------------------------------------------------------
-// From MDiagTestPlugin
-// CDiagUSBCableTestPlugin::RunMode()
-// ---------------------------------------------------------------------------
-MDiagTestPlugin::TRunMode CDiagUSBCableTestPlugin::RunMode() const
-    {
-    return EInteractiveDialog;
-    }
-
-// ---------------------------------------------------------------------------
-// From MDiagTestPlugin
-// CDiagUSBCableTestPlugin::TotalSteps()
-// ---------------------------------------------------------------------------
-TUint CDiagUSBCableTestPlugin::TotalSteps() const
-    {
-    return KTotalNumOfSteps;
-    }
-
-// ---------------------------------------------------------------------------
-// From MDiagPlugin
-// CDiagUSBCableTestPlugin::GetPluginName
-// ---------------------------------------------------------------------------
-HBufC* CDiagUSBCableTestPlugin::GetPluginNameL( TNameLayoutType aLayoutType ) const
-    {
-    switch ( aLayoutType )
-        {
-        
-        case ENameLayoutHeadingPane:
-            return StringLoader::LoadL( R_DIAG_USB_CABLE_TEST_HEADING_PANE );
-
-        case ENameLayoutPopupInfoPane:
-            return StringLoader::LoadL( R_DIAG_USB_CABLE_TEST_POPUP_INFO_PANE );
-
-        case ENameLayoutTitlePane:
-            return StringLoader::LoadL( R_DIAG_USB_CABLE_TEST_TITLE_PANE );
-                                                                           
-        case ENameLayoutListSingleGraphic:
-            return StringLoader::LoadL( R_DIAG_USB_CABLE_TEST_SINGLE_GRAPHIC  );        
-        
-        case ENameLayoutListSingle:
-            return StringLoader::LoadL ( R_DIAG_USB_CABLE_TEST_SINGLE ); 
-
-        default:
-            LOGSTRING2( "CDiagUSBCableTestPlugin::GetPluginNameL: "
-                L"ERROR: Unsupported layout type %d", aLayoutType )
-            __ASSERT_DEBUG( 0, User::Invariant() );
-            return StringLoader::LoadL ( R_DIAG_USB_CABLE_TEST_SINGLE );
-        }
-    }
-    
-
-
-
-// ---------------------------------------------------------------------------
-// From MDiagPlugin
-// CDiagUSBCableTestPlugin::Uid
-// ---------------------------------------------------------------------------
-TUid CDiagUSBCableTestPlugin::Uid() const
-    {
-    return KDiagUSBCableTestPluginUid;
-    }
-    
-   
-// ---------------------------------------------------------------------------
-// From CActive
-// CDiagUSBCableTestPlugin::RunL
-// ---------------------------------------------------------------------------
-void CDiagUSBCableTestPlugin::RunL()
-    {
-    // nothing to do here
-    }
-
-// ---------------------------------------------------------------------------
-// From CActive
-// CDiagUSBCableTestPlugin::DoCancel
-// ---------------------------------------------------------------------------
-void CDiagUSBCableTestPlugin::DoCancel()
-    {
-    // nothing to do here
-    }
-
-// ---------------------------------------------------------------------------
-// From CDiagTestPluginBase
-// CDiagUSBCableTestPlugin::DoRunTestL()
-// ---------------------------------------------------------------------------
-void CDiagUSBCableTestPlugin::DoRunTestL()
-    {
-    LOGSTRING( "CDiagUSBCableTestPlugin::DoRunTestL() Test execution begins here." )
-    // ADO & Platformization Changes
-    CAknMessageQueryDialog* dlg    = NULL;
-    TInt aButtonId,result;
-    // code ends
-
-    // Run USB Cable Test
-    ASSERT( iEngine == NULL );
-    
-    // ADO & Platformization Changes
-	dlg = new ( ELeave ) CAknMessageQueryDialog();
-
-    dlg->PrepareLC(R_MESSAGEQUERY_TITLE );
-    
-    if(SinglePluginExecution())
-        {
-        CEikButtonGroupContainer& cba = dlg->ButtonGroupContainer();
-        cba.SetCommandSetL(R_DIAG_USB_SOFTKEYS_CANCEL__OK);
-        }
-
-	result = RunWaitingDialogL( dlg, aButtonId );
-	
-	if (result == KErrNone)
-	{
-	LOGSTRING("RunWaitingDialogL return = true");
-	}
-	
-	if(aButtonId == EUsbTestConnectUSBCancel )
-		{
-		CompleteTestL( CDiagResultsDatabaseItem::ECancelled );
-		return;	
-		}
-	
-   if(aButtonId == EUsbTestConnectUSBSkip )
-        {
-        TInt aUserResponse;
-        TInt aResponseType;
-        TInt aOption = 0;
-        aResponseType = AskCancelExecutionL(aUserResponse,aOption);
-        
-        if(!aResponseType)
-            return;
-        
-        if (aUserResponse)
-               { 
-               return;
-               }
-        }
-		
-	// ADO & Platformization Changes
-
-    iEngine = CDiagUSBCableTestEngine::NewL(*this, SinglePluginExecution() );
-    iEngine->RunUSBCableTestL();
-    }
-
-// ---------------------------------------------------------------------------
-// From CDiagTestPluginBase
-// CDiagUSBCableTestPlugin::DoStopAndCleanupL()
-// ---------------------------------------------------------------------------
-void CDiagUSBCableTestPlugin::DoStopAndCleanupL()
-    {
-    LOGSTRING( "CDiagUSBCableTestPlugin::DoStopAndCleanupL()." )
-    delete iEngine;
-    iEngine = NULL;
-    }
-
-// ---------------------------------------------------------------------------
-// From MDiagUSBTestReportResultInterface
-// CDiagUSBCableTestPlugin::ReportTestResultL()
-// ---------------------------------------------------------------------------
-void CDiagUSBCableTestPlugin::ReportTestResultL(
-                                    CDiagResultsDatabaseItem::TResult aResult)
-    {
-    CompleteTestL( aResult );
-    }
-
-// ---------------------------------------------------------------------------
-// The engine class uses this callback on the plugin class to ask the user if 
-// the entire test execution needs to be cancelled.
-// ---------------------------------------------------------------------------
-TBool CDiagUSBCableTestPlugin::AskCancelExecutionL(TInt& aUserResponse, TInt aOption)
-    {
-    CAknDialog* cancelDialog = NULL;
-    if(aOption == 0)
-        {
-        cancelDialog = ExecutionParam().Engine().
-                   CreateCommonDialogLC( EDiagCommonDialogConfirmSkipAll, NULL );
-        }
-    else
-        {
-        cancelDialog = ExecutionParam().Engine().
-                           CreateCommonDialogLC( EDiagCommonDialogConfirmCancelAll, NULL);
-        }
-          
-    return RunWaitingDialogL( cancelDialog, aUserResponse );
-    }    
-
-// End of File
-
--- a/devicediagnostics/diagplugins/diagusbcableplugin/src/diagusbpluginimplementationtable.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-/*
-* 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:  ECOM proxy table for DiagUSBCableTestPlugin
-*
-*/
-
-
-// INCLUDES
-#include <e32std.h>
-#include <implementationproxy.h>
-
-#include "diagusbcabletestplugin.hrh"   // UIDs
-#include "diagusbcabletestplugin.h"     // CDiagUSBCableTestPlugin
-
-// CONSTANTS 
-const TImplementationProxy KDiagUSBCableTestPluginImplementationTable[] = 
-    {
-    IMPLEMENTATION_PROXY_ENTRY( _IMPLEMENTATION_UID, 
-                                CDiagUSBCableTestPlugin::NewL )
-    };
-
-
-// ---------------------------------------------------------------------------
-// ImplementationGroupProxy
-// 
-// Gate/factory function
-// ---------------------------------------------------------------------------
-//
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy(TInt& aTableCount )
-    {
-    aTableCount = sizeof( KDiagUSBCableTestPluginImplementationTable ) 
-        / sizeof( TImplementationProxy );
-    return KDiagUSBCableTestPluginImplementationTable;
-    }
-
-// End of File
--- a/devicediagnostics/diagplugins/diagvibrateplugin/cenrep_files/clean_cenrep.bat	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-rem
-rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-rem All rights reserved.
-rem This component and the accompanying materials are made available
-rem under the terms of "Eclipse Public License v1.0"
-rem which accompanies this distribution, and is available
-rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
-rem
-rem Initial Contributors:
-rem Nokia Corporation - initial contribution.
-rem
-rem Contributors:
-rem
-rem Description:
-rem
-
-rd /s /q output
--- a/devicediagnostics/diagplugins/diagvibrateplugin/cenrep_files/create_cenrep.bat	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-rem
-rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-rem All rights reserved.
-rem This component and the accompanying materials are made available
-rem under the terms of "Eclipse Public License v1.0"
-rem which accompanies this distribution, and is available
-rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
-rem
-rem Initial Contributors:
-rem Nokia Corporation - initial contribution.
-rem
-rem Contributors:
-rem
-rem Description:
-rem
-
-@set XLS_FILE=keys_devdiagvibratest.xls
-@set INI_FILE=2000E586.txt
-@set RELEASE=3.2
-
-@set CENREP_DIR=%CD%
-@cd \epoc32\tools\cenrep
-
-cenrep.pl -o "%CENREP_DIR%\output" -l "%CENREP_DIR%\%XLS_FILE%" -p %RELEASE%
-copy "%CENREP_DIR%\output\inifiles\%INI_FILE%" \epoc32\RELEASE\winscw\udeb\Z\private\10202be9\
-copy "%CENREP_DIR%\output\inifiles\%INI_FILE%" \epoc32\RELEASE\winscw\udeb\Z\private\10202be9\
-copy "%CENREP_DIR%\output\inifiles\%INI_FILE%" \epoc32\RELEASE\winscw\urel\Z\private\10202be9\
-copy "%CENREP_DIR%\output\inifiles\%INI_FILE%" \epoc32\RELEASE\armv5\udeb\Z\private\10202be9\
-copy "%CENREP_DIR%\output\inifiles\%INI_FILE%" \epoc32\RELEASE\armv5\urel\Z\private\10202be9\
-copy "%CENREP_DIR%\output\inifiles\%INI_FILE%" \epoc32\data\Z\private\10202be9\
-@cd "%CENREP_DIR%"
-
-@echo ================= done. Hit any key to continue ==================
-@pause
Binary file devicediagnostics/diagplugins/diagvibrateplugin/cenrep_files/keys_devdiagvibratest.xls has changed
Binary file devicediagnostics/diagplugins/diagvibrateplugin/conf/devdiagvibratest.confml has changed
Binary file devicediagnostics/diagplugins/diagvibrateplugin/conf/devdiagvibratest_2000E586.crml has changed
--- a/devicediagnostics/diagplugins/diagvibrateplugin/data/devdiagvibrateplugin.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-/*
-* 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:  ECOM plugin resource file for Vibrate Plugin
-*
-*/
-
-#include <registryinfo.rh>
-
-
-RESOURCE REGISTRY_INFO theInfo
-    {
-    dll_uid     = 0x2000E586;
-    interfaces  =
-        {
-        INTERFACE_INFO
-            {
-            interface_uid   = 0x2000AFEB;
-            implementations =
-                {
-                IMPLEMENTATION_INFO
-                    {
-                    implementation_uid  = 0x2000E587;
-                    version_no          = 1;
-                    display_name        = "Vibrate Plugin";
-                    default_data        = "0x2000E569"; //HW suite
-                    opaque_data         = "<diagplugininfo>"
-                                          "<order number=\"10\"/>"
-                                          "</diagplugininfo>";
-                    }
-                };
-            }
-        };
-    }
-
-
-// End of File
--- a/devicediagnostics/diagplugins/diagvibrateplugin/data/devdiagvibratepluginrsc.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,402 +0,0 @@
-/*
-* 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:  Resource file for DiagVibratePlugin
-*
-*/
-
-
-
-//  RESOURCE IDENTIFIER
-NAME    VIBR // 4 letter ID
-
-//  INCLUDES
-#include    <eikon.rh>
-#include    "diagvibrateplugin.hrh"
-#include    <devdiagvibrateplugin.loc>
-#include    <diagplugincommon.loc>
-
-#include    <avkon.loc>
-#include    <avkon.mbg>
-#include    <avkon.rsg>
-#include    <avkon.rh>
-
-#include    <AvkonIcons.hrh>
-#include    <bldvariant.hrh>
-#include    <data_caging_paths_strings.hrh>
-#include    <eikcore.rsg>
-#include    <eikon.rsg>
-#include    <uikon.rh>
-
-// CONSTANTS
-#define BMPFILE_NAME    "\\resource\\apps\\avkon2.mbm"
-
-//  RESOURCE DEFINITIONS
-
-RESOURCE RSS_SIGNATURE
-    {
-    }
-
-RESOURCE TBUF
-    {
-    buf="VIBR";
-    }
-
-//----------------------------------------------------
-//  r_diag_lst_vibrate
-//
-// Vibrate Plugin caption 
-//----------------------------------------------------
-//
-RESOURCE TBUF r_diag_lst_vibrate
-    {
-    buf = qtn_diag_lst_vibrate;
-    }
-
-//----------------------------------------------------
-//  r_diag_msg_vibrating
-//
-// Message text the phone is vibrating
-//----------------------------------------------------
-//
-RESOURCE TBUF r_diag_msg_vibrating
-    {
-    buf = qtn_diag_msg_vibrating;
-    }
-
-//----------------------------------------------------
-//  r_diag_lst_test_vibrate
-//
-// Vibrate text for the suite view
-//----------------------------------------------------
-//
-RESOURCE TBUF r_diag_lst_test_vibrate
-    {
-    buf = qtn_diag_lst_test_vibrate;
-    }
-
-//----------------------------------------------------
-//  r_diag_msg_info_vibrate
-//
-// Vibrate test information message
-//----------------------------------------------------
-//
-RESOURCE TBUF r_diag_msg_info_vibrate
-    {
-    buf = qtn_diag_conf_test_failed_vibrate;
-    }
-
-//----------------------------------------------------
-//  r_diag_title_test_vibrate
-//
-// Vibrate title text for suite and result views
-//----------------------------------------------------
-//
-RESOURCE TBUF r_diag_title_test_vibrate
-    {
-    buf = qtn_diag_title_test_vibrate;
-    }
-
-//----------------------------------------------------
-//  r_diag_msg_title_vibrate
-//
-// Vibrate title text for start query
-//----------------------------------------------------
-//
-RESOURCE TBUF r_diag_msg_title_vibrate
-    {
-    buf = qtn_diag_msg_title_vibrate;
-    }
-
-//----------------------------------------------------
-//  r_vibrate_softkeys_ok__cancel
-//
-// Buttons shown when the user is asked to confirm that
-// the test should be executed. Shown when the test is
-// run as a single test.
-//----------------------------------------------------
-//
-RESOURCE CBA r_vibrate_softkeys_ok__cancel
-    {
-    buttons = 
-        {
-        CBA_BUTTON 
-            { 
-            id  = EAknSoftkeyOk; 
-            txt = text_softkey_ok;
-            },
-
-        CBA_BUTTON 
-            { 
-            id  = ECBACmdCancel;      // .hrh 
-            txt = text_softkey_cancel; // .rls or .loc
-            }
-        };
-    }
-
-
-//----------------------------------------------------
-//  r_vibrate_softkeys_skip_ok_cancel
-//
-// Buttons shown when the user is asked to confirm 
-// that the test should be executed. Shown when the 
-// test is run as a part of a suite.
-//----------------------------------------------------
-//
-RESOURCE CBA r_vibrate_softkeys_ok_skip
-    {
-    buttons = 
-        {
-         CBA_BUTTON 
-            { 
-            id  = EAknSoftkeyOk; 
-            txt = text_softkey_ok;
-            },
-        CBA_BUTTON 
-            { 
-            id  = ECBACmdSkip;       // .hrh 
-            txt = qtn_diag_softk_skip;  // .rls or .loc
-            }       
-        };
-    }
-
-//----------------------------------------------------
-//  r_vibrate_softkeys_stop__cancel
-//
-// Buttons shown during the vibration. These buttons are
-// shown when the test is run as a single test.
-//----------------------------------------------------
-//
-RESOURCE CBA r_vibrate_softkeys_stop__cancel
-    {
-    buttons = 
-        {
-	    CBA_BUTTON 
-	        { 
-            id  = EAknSoftkeyOk; 
-            txt = qtn_msk_stop;
-	        },
-
-        CBA_BUTTON 
-	        { 
-            id  = ECBACmdCancel;      // .hrh 
-            txt = text_softkey_cancel; // .rls or .loc
-	        }
-        };
-    }
-
-//----------------------------------------------------
-//  r_vibrate_softkeys_skip_stop__cancel
-//
-// Buttons shown during the vibration. Shown when the
-// test is run as a part of a suite.
-//----------------------------------------------------
-//
-RESOURCE CBA r_vibrate_softkeys_stop_cancel
-    {
-    buttons = 
-        {
-       CBA_BUTTON 
-	        { 
-            id  = EAknSoftkeyOk; 
-            txt = qtn_msk_stop;
-	        },
-
-        CBA_BUTTON 
-	        { 
-            id  = ECBACmdCancel;      // .hrh 
-            txt = text_softkey_cancel; // .rls or .loc
-	        } 
-
-	
-        };
-    }
-
-
-RESOURCE CBA r_vibrate_softkeys_yes_no
-    {
-    buttons = 
-        {
-       CBA_BUTTON 
-	        { 
-            id  = EAknSoftkeyYes; 
-            txt = text_softkey_yes;
-	        },
-
-        CBA_BUTTON 
-	        { 
-            id  = ECBACmdNo;      // .hrh 
-            txt = text_softkey_no; // .rls or .loc
-	        } 
-
-	
-        };
-    }
-
-//----------------------------------------------------
-//  r_vibrateplugin_confquery_dlg
-//
-// Vibrate Plugin confirmation query dialog
-//----------------------------------------------------
-//
-RESOURCE DIALOG r_vibrateplugin_confquery_dlg
-    {
-    flags = EGeneralQueryFlags;
-    buttons = r_vibrate_softkeys_yes_no;
-    items =
-        {
-        DLG_LINE
-            {
-            type = EAknCtQuery;
-            id = EGeneralQuery;
-            control = AVKON_CONFIRMATION_QUERY
-                {
-                layout = EConfirmationQueryLayout;
-                label = qtn_diag_conf_vibrate;
-                bmpfile = BMPFILE_NAME;
-                bmpid = EMbmAvkonQgn_note_query;
-                bmpmask = EMbmAvkonQgn_note_query_mask;
-                };
-            }
-        };
-    }
-    
-//----------------------------------------------------
-//  r_vibrateplugin_disconnect_charger_dlg
-//
-// Vibrate Plugin discoonect charger note
-//----------------------------------------------------
-//
-RESOURCE DIALOG r_vibrateplugin_disconnect_charger_dlg
-    {
-    flags = EGeneralQueryFlags;
-    buttons = r_vibrate_softkeys_ok__cancel;
-    items =
-        {
-        DLG_LINE
-            {
-            type = EAknCtQuery;
-            id = EGeneralQuery;
-            control = AVKON_CONFIRMATION_QUERY
-                {
-                layout = EConfirmationQueryLayout;
-                label = qtn_diag_conf_battery_charger_disconnect;
-                bmpfile = BMPFILE_NAME;
-                bmpid = EMbmAvkonQgn_note_empty;
-                bmpmask = EMbmAvkonQgn_note_empty_mask;
-                };
-            }
-        };
-    }
-
-
-//----------------------------------------------------
-//  r_vibrateplugin_startquery
-//
-// Vibrate Plugin start query dialog
-//----------------------------------------------------
-//
-RESOURCE DIALOG r_vibrateplugin_startquery
-    {
-    flags   = EGeneralQueryFlags | 
-              EEikDialogFlagNoBorder |
-              EEikDialogFlagNoTitleBar;    
-    buttons = r_vibrate_softkeys_ok_skip;
-    items =
-        {
-        DLG_LINE
-             {
-             type = EAknCtPopupHeadingPane;
-             id   = EAknMessageQueryHeaderId;
-
-             control = AVKON_HEADING
-                 {              
-                    label = qtn_diag_msg_title_vibrate;
-                    headinglayout = R_AVKON_WML_SIGN_QUERY_HEADING_PANE;
-                 };
-             },
-    
-        DLG_LINE
-            {
-            type = EAknCtMessageQuery;   // avkon.hrh
-            id   = EAknMessageQueryContentId; // .hrh
-            control = AVKON_MESSAGE_QUERY // avkon.hrh
-                {
-                message   = qtn_diag_msg_vibrate;          // .loc
-                };
-            }
-        };
-    }
-
-
-//----------------------------------------------------
-//  r_vibrateplugin_progress_note_vibrating
-//
-// Vibrate Plugin vibration progress note
-//----------------------------------------------------
-//
-RESOURCE DIALOG r_vibrateplugin_progress_note_vibrating
-    {
-    flags   = EAknProgressNoteFlags;
-    buttons = r_vibrate_softkeys_stop_cancel;
-
-    items =
-        {
-        DLG_LINE
-            {
-            type = EAknCtNote;
-            id   = EGeneralNote;
-
-            control = AVKON_NOTE
-                {
-                layout         = EProgressLayout;
-                singular_label = qtn_diag_msg_vibrating;
-                
-                imageid = EMbmAvkonQgn_note_progress;
-                imagemask = EMbmAvkonQgn_note_progress_mask;
-                };
-            }
-        };
-    }
-    
-    
-    
-    //----------------------------------------------------
-//  r_vibrateplugin_disconnect_charger_dlg
-//
-// Vibrate Plugin discoonect charger note
-//----------------------------------------------------
-//
-RESOURCE DIALOG r_vibrateplugin_vibrate_activate_dlg
-    {
-    flags = EGeneralQueryFlags;
-    buttons = r_vibrate_softkeys_yes_no;
-    items =
-        {
-        DLG_LINE
-            {
-            type = EAknCtQuery;
-            id = EGeneralQuery;
-            control = AVKON_CONFIRMATION_QUERY
-                {
-                layout = EConfirmationQueryLayout;
-                label = qtn_diag_conf_vibrate_activate;
-                bmpfile = BMPFILE_NAME;
-                bmpid = EMbmAvkonQgn_note_empty;
-                bmpmask = EMbmAvkonQgn_note_empty_mask;
-                };
-            }
-        };
-    }
-
-//End of File
--- a/devicediagnostics/diagplugins/diagvibrateplugin/group/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-/*
-* 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:  This file provides the information required for building
-*                DiagVibratePlugin
-*
-*/
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-../loc/devdiagvibrateplugin.loc        MW_LAYER_LOC_EXPORT_PATH(devdiagvibrateplugin.loc)
-../rom_files/devdiagvibrateplugin.iby		CORE_MW_LAYER_IBY_EXPORT_PATH(devdiagvibrateplugin.iby)
-../rom_files/devdiagvibrateplugin_resources.iby		LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(devdiagvibrateplugin_resources.iby)
-
-// Generic configuration interface for component cenrep settings  
-../conf/devdiagvibratest.confml                    MW_LAYER_CONFML(devdiagvibratest.confml)
-../conf/devdiagvibratest_2000E586.crml	        MW_LAYER_CRML(devdiagvibratest_2000E586.crml)
-
-PRJ_MMPFILES
-diagvibrateplugin.mmp
-
-
-PRJ_TESTMMPFILES
-
-//  End of File
--- a/devicediagnostics/diagplugins/diagvibrateplugin/group/diagvibrateplugin.mmp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,76 +0,0 @@
-/*
-* 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:  Project specification file.
-*
-*/
-
-
-#include  <data_caging_paths.hrh>    // For RESOURCE_FILES_DIR
-// To get the MW_LAYER_SYSTEMINCLUDE-definition
-#include <platform_paths.hrh>
-
-CAPABILITY          CAP_ECOM_PLUGIN ReadDeviceData WriteDeviceData
-TARGET              devdiagvibrateplugin.dll
-TARGETTYPE          PLUGIN
-UID                 0x10009D8D 0x2000E586
-VENDORID            VID_DEFAULT
-
-
-SOURCEPATH ../src
-SOURCE    diagvibratepluginImplementationtable.cpp
-SOURCE    diagvibrateplugin.cpp
-SOURCE    diagvibratepluginengine.cpp
-
-//User include paths
-USERINCLUDE     ../inc
-USERINCLUDE     ../data // For *.rh
-USERINCLUDE     ../loc
-
-//System include paths
-SYSTEMINCLUDE   /epoc32/include/ecom
-// ADO & Platformization Changes
-
-
-// Default system include paths for middleware layer modules.
-APP_LAYER_SYSTEMINCLUDE
-
-SOURCEPATH      ../data
-
-START RESOURCE  devdiagvibrateplugin.rss
-TARGET          devdiagvibrateplugin.rsc
-TARGETPATH      ECOM_RESOURCE_DIR
-END
-
-START RESOURCE  devdiagvibratepluginrsc.rss
-HEADER
-TARGETPATH      RESOURCE_FILES_DIR
-LANGUAGE_IDS
-END
-
-LIBRARY   euser.lib
-LIBRARY   avkon.lib
-
-LIBRARY   commonengine.lib      
-LIBRARY   featmgr.lib           
-LIBRARY   flogger.lib           
-LIBRARY   diagframework.lib 
-LIBRARY   diagpluginbase.lib
-LIBRARY   centralrepository.lib // for CRepository
-LIBRARY   hwrmvibraclient.lib
-LIBRARY   profileengine.lib 
-LIBRARY   eikcoctl.lib
-LIBRARY   eikdlg.lib
-
-
-// End of File
--- a/devicediagnostics/diagplugins/diagvibrateplugin/group/diagvibrateplugin.xml	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2071 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!DOCTYPE PROJECT [
- <!ELEMENT PROJECT (TARGETLIST, TARGETORDER, GROUPLIST, DESIGNLIST?)>
- <!ELEMENT TARGETLIST (TARGET+)>
- <!ELEMENT TARGET (NAME, SETTINGLIST, FILELIST?, LINKORDER?, SEGMENTLIST?, OVERLAYGROUPLIST?, SUBTARGETLIST?, SUBPROJECTLIST?, FRAMEWORKLIST?, PACKAGEACTIONSLIST?)>
- <!ELEMENT NAME (#PCDATA)>
- <!ELEMENT USERSOURCETREETYPE (#PCDATA)>
- <!ELEMENT PATH (#PCDATA)>
- <!ELEMENT FILELIST (FILE*)>
- <!ELEMENT FILE (PATHTYPE, PATHROOT?, ACCESSPATH?, PATH, PATHFORMAT?, ROOTFILEREF?, FILEKIND?, FILEFLAGS?)>
- <!ELEMENT PATHTYPE (#PCDATA)>
- <!ELEMENT PATHROOT (#PCDATA)>
- <!ELEMENT ACCESSPATH (#PCDATA)>
- <!ELEMENT PATHFORMAT (#PCDATA)>
- <!ELEMENT ROOTFILEREF (PATHTYPE, PATHROOT?, ACCESSPATH?, PATH, PATHFORMAT?)>
- <!ELEMENT FILEKIND (#PCDATA)>
- <!ELEMENT FILEFLAGS (#PCDATA)>
- <!ELEMENT FILEREF (TARGETNAME?, PATHTYPE, PATHROOT?, ACCESSPATH?, PATH, PATHFORMAT?)>
- <!ELEMENT TARGETNAME (#PCDATA)>
- <!ELEMENT SETTINGLIST ((SETTING|PANELDATA)+)>
- <!ELEMENT SETTING (NAME?, (VALUE|(SETTING+)))>
- <!ELEMENT PANELDATA (NAME, VALUE)>
- <!ELEMENT VALUE (#PCDATA)>
- <!ELEMENT LINKORDER (FILEREF*)>
- <!ELEMENT SEGMENTLIST (SEGMENT+)>
- <!ELEMENT SEGMENT (NAME, ATTRIBUTES?, FILEREF*)>
- <!ELEMENT ATTRIBUTES (#PCDATA)>
- <!ELEMENT OVERLAYGROUPLIST (OVERLAYGROUP+)>
- <!ELEMENT OVERLAYGROUP (NAME, BASEADDRESS, OVERLAY*)>
- <!ELEMENT BASEADDRESS (#PCDATA)>
- <!ELEMENT OVERLAY (NAME, FILEREF*)>
- <!ELEMENT SUBTARGETLIST (SUBTARGET+)>
- <!ELEMENT SUBTARGET (TARGETNAME, ATTRIBUTES?, FILEREF?)>
- <!ELEMENT SUBPROJECTLIST (SUBPROJECT+)>
- <!ELEMENT SUBPROJECT (FILEREF, SUBPROJECTTARGETLIST)>
- <!ELEMENT SUBPROJECTTARGETLIST (SUBPROJECTTARGET*)>
- <!ELEMENT SUBPROJECTTARGET (TARGETNAME, ATTRIBUTES?, FILEREF?)>
- <!ELEMENT FRAMEWORKLIST (FRAMEWORK+)>
- <!ELEMENT FRAMEWORK (FILEREF, DYNAMICLIBRARY?, VERSION?)>
- <!ELEMENT PACKAGEACTIONSLIST (PACKAGEACTION+)>
- <!ELEMENT PACKAGEACTION (#PCDATA)>
- <!ELEMENT LIBRARYFILE (FILEREF)>
- <!ELEMENT VERSION (#PCDATA)>
- <!ELEMENT TARGETORDER (ORDEREDTARGET|ORDEREDDESIGN)*>
- <!ELEMENT ORDEREDTARGET (NAME)>
- <!ELEMENT ORDEREDDESIGN (NAME, ORDEREDTARGET+)>
- <!ELEMENT GROUPLIST (GROUP|FILEREF)*>
- <!ELEMENT GROUP (NAME, (GROUP|FILEREF)*)>
- <!ELEMENT DESIGNLIST (DESIGN+)>
- <!ELEMENT DESIGN (NAME, DESIGNDATA)>
- <!ELEMENT DESIGNDATA (#PCDATA)>
-]>
-<?codewarrior exportversion="1.0.1" ideversion="5.0" ?>
-<PROJECT>
-    <TARGETLIST>
-        <TARGET>
-            <NAME>WINSCW UDEB</NAME>
-            <SETTINGLIST>
-
-                <!-- Settings for "Source Trees" panel -->
-                <SETTING><NAME>UserSourceTrees</NAME></SETTING>
-
-                <!-- Settings for "Access Paths" panel -->
-                <SETTING><NAME>AlwaysSearchUserPaths</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>InterpretDOSAndUnixPaths</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>RequireFrameworkStyleIncludes</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>SourceRelativeIncludes</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>UserSearchPaths</NAME>
-                    <SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics_withdom\DeviceDiagnostics\diagplugins\diagvibrateplugin\inc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics_withdom\DeviceDiagnostics\diagplugins\diagvibrateplugin\data</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics_withdom\DeviceDiagnostics\diagplugins\diagvibrateplugin\loc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics_withdom\DeviceDiagnostics\diagplugins\diagvibrateplugin\group</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics_withdom\DeviceDiagnostics\diagplugins\diagvibrateplugin\src</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING></SETTING>
-                <SETTING><NAME>SystemSearchPaths</NAME>
-                    <SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\ecom</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\applications</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\osextensions</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\oem</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\middleware</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\middleware</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\osextensions</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\osextensions\loc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\middleware\loc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\osextensions\loc\sc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\middleware\loc\sc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\UDEB</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>Symbian_Support\Win32-x86 Support\Libraries\Win32 SDK</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>CodeWarrior</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>Symbian_Support\Runtime\Runtime_x86\Runtime_Win32\Libs</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>CodeWarrior</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING></SETTING>
-
-                <!-- Settings for "Debugger Runtime" panel -->
-                <SETTING><NAME>MWRuntimeSettings_WorkingDirectory</NAME><VALUE/></SETTING>
-                <SETTING><NAME>MWRuntimeSettings_CommandLine</NAME><VALUE/></SETTING>
-                <SETTING><NAME>MWRuntimeSettings_HostApplication</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\udeb\epoc.exe</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>MWRuntimeSettings_EnvVars</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Target Settings" panel -->
-                <SETTING><NAME>Linker</NAME><VALUE>Symbian Linker v2</VALUE></SETTING>
-                <SETTING><NAME>PreLinker</NAME><VALUE/></SETTING>
-                <SETTING><NAME>PostLinker</NAME><VALUE>Symbian Installer v2</VALUE></SETTING>
-                <SETTING><NAME>Targetname</NAME><VALUE>WINSCW UDEB</VALUE></SETTING>
-                <SETTING><NAME>OutputDirectory</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\udeb</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SaveEntriesUsingRelativePaths</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "File Mappings" panel -->
-                <SETTING><NAME>FileMappings</NAME>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>._i</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>._ii</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.c</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cc</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cfg</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cia</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cpp</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cwlink</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>XML</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cxx</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.def</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.h</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.hrh</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.i</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.iby</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.ii</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.inf</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.ini</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.inl</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.loc</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.mmpi</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.pch++</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.pkg</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.policy</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.ra</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.resources</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Resource v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>XML</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.rh</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.rls</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.rss</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.rsg</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.s</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.script</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.txt</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.a</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Object Importer v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.lib</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Object Importer v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.dso</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Object Importer v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.o</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Object Importer v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                </SETTING>
-
-                <!-- Settings for "Build Extras" panel -->
-                <SETTING><NAME>CacheModDates</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>DumpBrowserInfo</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>CacheSubprojects</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>UseThirdPartyDebugger</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>BrowserGenerator</NAME><VALUE>2</VALUE></SETTING>
-                <SETTING><NAME>DebuggerAppPath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>DebuggerCmdLineArgs</NAME><VALUE/></SETTING>
-                <SETTING><NAME>DebuggerWorkingDir</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CodeCompletionPrefixFileName</NAME><VALUE/></SETTING>
-                <SETTING><NAME>CodeCompletionMacroFileName</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Debugger Target" panel -->
-                <SETTING><NAME>ConsoleEncoding</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>LogSystemMessages</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>AutoTargetDLLsPopUp</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>StopAtWatchpoints</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>PauseWhileRunning</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>PauseInterval</NAME><VALUE>5</VALUE></SETTING>
-                <SETTING><NAME>PauseUIFlags</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>AltExePath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>StopAtTempBPOnLaunch</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>CacheSymbolics</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>TempBPFunctionName</NAME><VALUE>E32Main</VALUE></SETTING>
-                <SETTING><NAME>TempBPType</NAME><VALUE>1</VALUE></SETTING>
-
-                <!-- Settings for "Remote Debug" panel -->
-                <SETTING><NAME>Enabled</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>ConnectionName</NAME><VALUE/></SETTING>
-                <SETTING><NAME>DownloadPath</NAME><VALUE/></SETTING>
-                <SETTING><NAME>LaunchRemoteApp</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>RemoteAppPath</NAME><VALUE/></SETTING>
-                <SETTING><NAME>CoreID</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>JTAGClockSpeed</NAME><VALUE>8000</VALUE></SETTING>
-                <SETTING><NAME>IsMultiCore</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>OSDownload</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>UseGlobalOSDownload</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>OSDownloadConnectionName</NAME><VALUE/></SETTING>
-                <SETTING><NAME>OSDownloadPath</NAME><VALUE/></SETTING>
-                <SETTING><NAME>AltDownload</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>AltDownloadConnectionName</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "x86 Exceptions" panel -->
-                <SETTING><NAME>MWDebugger_X86_Exceptions</NAME>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                
-                <!-- Settings for "Auto-target" panel -->
-                <SETTING><NAME>OtherExecutables</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Analyzer Connections" panel -->
-                <SETTING><NAME>AnalyzerConnectionName</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Custom Keywords" panel -->
-                <SETTING><NAME>CustomColor1</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor2</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor3</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor4</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "ARM Debugger" panel -->
-                <SETTING><NAME>Processor</NAME><VALUE>Generic</VALUE></SETTING>
-                <SETTING><NAME>BraekPoinType_II</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>UseInitFile</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>UseConfigFile</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>IDexecutable</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>IDinitialized</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>IDuninitialized</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>IDconstant</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>SDexecutable</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>SDinitialized</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>SDuninitialized</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>SDconstant</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>VerifyMemWrites</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>ShowMPC107regs</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>InitializationFile</NAME><VALUE/></SETTING>
-                <SETTING><NAME>ConfigurationFile</NAME><VALUE/></SETTING>
-                <SETTING><NAME>BreakpointType</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>WatchpointType</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>TargetOS</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>RTOSPluginName</NAME><VALUE/></SETTING>
-                <SETTING><NAME>ByteOrderType</NAME><VALUE>0</VALUE></SETTING>
-                <PANELDATA><NAME>CodeTest SYMBIAN Instrumenter</NAME><VALUE>
-                    0200020000000100000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000433A5C0000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000637466696C657300000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000636F6465746573742E6964620000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000
-                </VALUE></PANELDATA>
-
-                <!-- Settings for "Symbian Installation" panel -->
-                <SETTING><NAME>SymbianInstallationOutputFilename</NAME><VALUE>Application.sis</VALUE></SETTING>
-                <SETTING><NAME>SymbianInstallationOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>SymbianInstallationContentSearchLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\udeb</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianInstallationPassword</NAME><VALUE/></SETTING>
-                <SETTING><NAME>SymbianInstallationCreateStubFile</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "Symbian Installer Panel v2" panel -->
-                <SETTING><NAME>SymbianInstallationOutputFilename</NAME><VALUE>Application.sis</VALUE></SETTING>
-                <SETTING><NAME>SymbianInstallationOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>SymbianInstallationContentSearchLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\udeb</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianInstallationPassword</NAME><VALUE/></SETTING>
-                <SETTING><NAME>SymbianInstallationCreateStubFile</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "Symbian Resource Panel" panel -->
-                <SETTING><NAME>SymbianResourcesMMPFileLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics_withdom\DeviceDiagnostics\diagplugins\diagvibrateplugin\group</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianResourcesBinaryOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\udeb</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianResourcesHeaderFileOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\include</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-
-                <!-- Settings for "Symbian Resources Panel v2" panel -->
-                <SETTING><NAME>SymbianResourcesMMPFileLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics_withdom\DeviceDiagnostics\diagplugins\diagvibrateplugin\group</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianResourcesBinaryOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\udeb</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianResourcesHeaderFileOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\include</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-
-                <!-- Settings for "Remote Download" panel -->
-                <SETTING><NAME>FileList</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Symbian ARM Debugger" panel -->
-                <SETTING><NAME>Processor</NAME><VALUE>Generic</VALUE></SETTING>
-                <SETTING><NAME>UseInitFile</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>UseConfigFile</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>ResetTarget</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>InitializationFile</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>ConfigurationFile</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>TargetOS</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>RTOSPluginName</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Symbian Common Panel" panel -->
-                <SETTING><NAME>ShowCommandLine</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>SymbianEpocToolsPath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE></VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-
-                <!-- Settings for "Symbian Compiler Panel" panel -->
-                <SETTING><NAME>PrefixFile</NAME><VALUE>feature_settings.hrh</VALUE></SETTING>
-                <SETTING><NAME>CompilerXMLDescriptor</NAME><VALUE>Metrowerks x86 Compiler</VALUE></SETTING>
-                <SETTING><NAME>Macros</NAME><VALUE>__SYMBIAN32__,__CW32__,__WINS__,__WINSCW__,__DLL__,_DEBUG,_UNICODE,__SUPPORT_CPP_EXCEPTIONS__,</VALUE></SETTING>
-                <SETTING><NAME>CodeTEST</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>EnableSWIC</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Arguments</NAME><VALUE>-wchar_t off -align 4 -warnings on -w nohidevirtual, nounusedexpr -msgstyle gcc -enum int -str pool -exc ms -trigraphs on -O0 -inline off -nostdinc</VALUE></SETTING>
-                <SETTING><NAME>CIAArgs</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Symbian Debugging" panel -->
-                <SETTING><NAME>Parse Log File</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Log File Path</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>Symbian SDK Folder</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>Log Unresolved Modules</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Log Unresolved Sym Files</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Debug Non-XIP Executables</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "Symbian Kernel Debugging" panel -->
-                <SETTING><NAME>Start Address</NAME><VALUE>0x00000000</VALUE></SETTING>
-                <SETTING><NAME>Run From Start Address</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Download Image</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>OS Image Path</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>Download Address</NAME><VALUE>0x00000000</VALUE></SETTING>
-                <SETTING><NAME>Ask First</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Debug Bootrom</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Bootrom Sym File</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "Symbian Linker Panel" panel -->
-                <SETTING><NAME>LinkOutputFile</NAME><VALUE>DevDiagVibratePlugin.dll</VALUE></SETTING>
-                <SETTING><NAME>LinkCmdLine</NAME><VALUE/></SETTING>
-                <SETTING><NAME>SymbianImportLibrary</NAME><VALUE>DevDiagVibratePlugin.lib</VALUE></SETTING>
-                <SETTING><NAME>canDebug</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>canRun</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "Symbian RomBuild Panel" panel -->
-                <SETTING><NAME>CommandLine</NAME><VALUE>buildrom -D_DEBUG devkit lubbock techview -olubbock_gui.img</VALUE></SETTING>
-                <SETTING><NAME>OutputPath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>C:\</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>DisplayMessages</NAME><VALUE>true</VALUE></SETTING>
-
-                <!-- Settings for "Symbian Target" panel -->
-                <SETTING><NAME>TargetArchitecture</NAME><VALUE>WINSCW</VALUE></SETTING>
-                <SETTING><NAME>LogMessages</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>SuppressWarnings</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>GenerateSymbolics</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>CompilerPrefix</NAME><VALUE/></SETTING>
-                <SETTING><NAME>CompilerCmdLine</NAME><VALUE/></SETTING>
-                <SETTING><NAME>SymbianImportLibraryPath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>C:\</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "Symbian Tools" panel -->
-                <SETTING><NAME>Gnu Tools Path</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>C:\</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>Epoc32 Tools Path</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>C:\</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-            </SETTINGLIST>
-            <FILELIST>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagVibratePlugin.mmp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagVibratePluginWINSCW.resources</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>EDLL.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagVibratePluginImplementationTable.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagVibratePlugin.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagVibratePluginEngine.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagVibratePlugin_UID_.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>euser.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>avkon.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>CommonEngine.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>FeatMgr.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>flogger.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagFramework.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagPluginBase.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>centralrepository.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>HWRMVibraClient.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>ProfileEngine.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>eikcoctl.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>eikdlg.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND><FILEFLAGS>Debug</FILEFLAGS></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagVibratePlugin.h</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagVibratePlugin.hrh</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagVibratePluginEngine.h</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagVibratePluginObserver.h</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagVibratePluginPrivateCRKeys.h</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagVibratePluginWINSCWUDEB.cwlink</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-</FILELIST>
-            <LINKORDER>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagVibratePlugin.mmp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagVibratePluginWINSCW.resources</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>EDLL.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagVibratePluginImplementationTable.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagVibratePlugin.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagVibratePluginEngine.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagVibratePlugin_UID_.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>euser.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>avkon.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>CommonEngine.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>FeatMgr.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>flogger.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagFramework.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagPluginBase.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>centralrepository.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>HWRMVibraClient.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>ProfileEngine.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>eikcoctl.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>eikdlg.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagVibratePlugin.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagVibratePlugin.hrh</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagVibratePluginEngine.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagVibratePluginObserver.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagVibratePluginPrivateCRKeys.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagVibratePluginWINSCWUDEB.cwlink</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-</LINKORDER>
-        </TARGET><TARGET>
-            <NAME>WINSCW UREL</NAME>
-            <SETTINGLIST>
-
-                <!-- Settings for "Source Trees" panel -->
-                <SETTING><NAME>UserSourceTrees</NAME></SETTING>
-
-                <!-- Settings for "Access Paths" panel -->
-                <SETTING><NAME>AlwaysSearchUserPaths</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>InterpretDOSAndUnixPaths</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>RequireFrameworkStyleIncludes</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>SourceRelativeIncludes</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>UserSearchPaths</NAME>
-                    <SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics_withdom\DeviceDiagnostics\diagplugins\diagvibrateplugin\inc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics_withdom\DeviceDiagnostics\diagplugins\diagvibrateplugin\data</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics_withdom\DeviceDiagnostics\diagplugins\diagvibrateplugin\loc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics_withdom\DeviceDiagnostics\diagplugins\diagvibrateplugin\group</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics_withdom\DeviceDiagnostics\diagplugins\diagvibrateplugin\src</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING></SETTING>
-                <SETTING><NAME>SystemSearchPaths</NAME>
-                    <SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\ecom</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\applications</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\osextensions</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\oem</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\middleware</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\middleware</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\osextensions</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\osextensions\loc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\middleware\loc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\osextensions\loc\sc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\include\domain\middleware\loc\sc</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\UREL</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>epoc32\release\WINSCW\UDEB</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>Symbian_Support\Win32-x86 Support\Libraries\Win32 SDK</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>CodeWarrior</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING><SETTING>
-<SETTING><NAME>SearchPath</NAME>
-<SETTING><NAME>Path</NAME><VALUE>Symbian_Support\Runtime\Runtime_x86\Runtime_Win32\Libs</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>CodeWarrior</VALUE></SETTING>
-</SETTING><SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-</SETTING></SETTING>
-
-                <!-- Settings for "Debugger Runtime" panel -->
-                <SETTING><NAME>MWRuntimeSettings_WorkingDirectory</NAME><VALUE/></SETTING>
-                <SETTING><NAME>MWRuntimeSettings_CommandLine</NAME><VALUE/></SETTING>
-                <SETTING><NAME>MWRuntimeSettings_HostApplication</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\urel\epoc.exe</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>MWRuntimeSettings_EnvVars</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Target Settings" panel -->
-                <SETTING><NAME>Linker</NAME><VALUE>Symbian Linker v2</VALUE></SETTING>
-                <SETTING><NAME>PreLinker</NAME><VALUE/></SETTING>
-                <SETTING><NAME>PostLinker</NAME><VALUE>Symbian Installer v2</VALUE></SETTING>
-                <SETTING><NAME>Targetname</NAME><VALUE>WINSCW UREL</VALUE></SETTING>
-                <SETTING><NAME>OutputDirectory</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\urel</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SaveEntriesUsingRelativePaths</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "File Mappings" panel -->
-                <SETTING><NAME>FileMappings</NAME>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>._i</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>._ii</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.c</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cc</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cfg</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cia</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cpp</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cwlink</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>XML</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cxx</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.def</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.h</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.hrh</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.i</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.iby</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.ii</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.inf</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.ini</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.inl</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.loc</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.mmpi</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.pch++</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.pkg</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.policy</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.ra</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.resources</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Resource v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>XML</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.rh</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.rls</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.rss</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.rsg</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.s</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Compiler v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.script</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.txt</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.a</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Object Importer v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.lib</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Object Importer v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.dso</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Object Importer v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.o</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Symbian Object Importer v2</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE/></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                </SETTING>
-
-                <!-- Settings for "Build Extras" panel -->
-                <SETTING><NAME>CacheModDates</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>DumpBrowserInfo</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>CacheSubprojects</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>UseThirdPartyDebugger</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>BrowserGenerator</NAME><VALUE>2</VALUE></SETTING>
-                <SETTING><NAME>DebuggerAppPath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>DebuggerCmdLineArgs</NAME><VALUE/></SETTING>
-                <SETTING><NAME>DebuggerWorkingDir</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CodeCompletionPrefixFileName</NAME><VALUE/></SETTING>
-                <SETTING><NAME>CodeCompletionMacroFileName</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Debugger Target" panel -->
-                <SETTING><NAME>ConsoleEncoding</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>LogSystemMessages</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>AutoTargetDLLsPopUp</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>StopAtWatchpoints</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>PauseWhileRunning</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>PauseInterval</NAME><VALUE>5</VALUE></SETTING>
-                <SETTING><NAME>PauseUIFlags</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>AltExePath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>StopAtTempBPOnLaunch</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>CacheSymbolics</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>TempBPFunctionName</NAME><VALUE>E32Main</VALUE></SETTING>
-                <SETTING><NAME>TempBPType</NAME><VALUE>1</VALUE></SETTING>
-
-                <!-- Settings for "Remote Debug" panel -->
-                <SETTING><NAME>Enabled</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>ConnectionName</NAME><VALUE/></SETTING>
-                <SETTING><NAME>DownloadPath</NAME><VALUE/></SETTING>
-                <SETTING><NAME>LaunchRemoteApp</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>RemoteAppPath</NAME><VALUE/></SETTING>
-                <SETTING><NAME>CoreID</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>JTAGClockSpeed</NAME><VALUE>8000</VALUE></SETTING>
-                <SETTING><NAME>IsMultiCore</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>OSDownload</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>UseGlobalOSDownload</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>OSDownloadConnectionName</NAME><VALUE/></SETTING>
-                <SETTING><NAME>OSDownloadPath</NAME><VALUE/></SETTING>
-                <SETTING><NAME>AltDownload</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>AltDownloadConnectionName</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "x86 Exceptions" panel -->
-                <SETTING><NAME>MWDebugger_X86_Exceptions</NAME>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                
-                <!-- Settings for "Auto-target" panel -->
-                <SETTING><NAME>OtherExecutables</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Analyzer Connections" panel -->
-                <SETTING><NAME>AnalyzerConnectionName</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Custom Keywords" panel -->
-                <SETTING><NAME>CustomColor1</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor2</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor3</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor4</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "ARM Debugger" panel -->
-                <SETTING><NAME>Processor</NAME><VALUE>Generic</VALUE></SETTING>
-                <SETTING><NAME>BraekPoinType_II</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>UseInitFile</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>UseConfigFile</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>IDexecutable</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>IDinitialized</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>IDuninitialized</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>IDconstant</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>SDexecutable</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>SDinitialized</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>SDuninitialized</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>SDconstant</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>VerifyMemWrites</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>ShowMPC107regs</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>InitializationFile</NAME><VALUE/></SETTING>
-                <SETTING><NAME>ConfigurationFile</NAME><VALUE/></SETTING>
-                <SETTING><NAME>BreakpointType</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>WatchpointType</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>TargetOS</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>RTOSPluginName</NAME><VALUE/></SETTING>
-                <SETTING><NAME>ByteOrderType</NAME><VALUE>0</VALUE></SETTING>
-                <PANELDATA><NAME>CodeTest SYMBIAN Instrumenter</NAME><VALUE>
-                    0200020000000100000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000433A5C0000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000637466696C657300000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000636F6465746573742E6964620000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000
-                </VALUE></PANELDATA>
-
-                <!-- Settings for "Symbian Installation" panel -->
-                <SETTING><NAME>SymbianInstallationOutputFilename</NAME><VALUE>Application.sis</VALUE></SETTING>
-                <SETTING><NAME>SymbianInstallationOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>SymbianInstallationContentSearchLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\urel</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianInstallationPassword</NAME><VALUE/></SETTING>
-                <SETTING><NAME>SymbianInstallationCreateStubFile</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "Symbian Installer Panel v2" panel -->
-                <SETTING><NAME>SymbianInstallationOutputFilename</NAME><VALUE>Application.sis</VALUE></SETTING>
-                <SETTING><NAME>SymbianInstallationOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>SymbianInstallationContentSearchLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\urel</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianInstallationPassword</NAME><VALUE/></SETTING>
-                <SETTING><NAME>SymbianInstallationCreateStubFile</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "Symbian Resource Panel" panel -->
-                <SETTING><NAME>SymbianResourcesMMPFileLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics_withdom\DeviceDiagnostics\diagplugins\diagvibrateplugin\group</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianResourcesBinaryOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\urel</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianResourcesHeaderFileOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\include</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-
-                <!-- Settings for "Symbian Resources Panel v2" panel -->
-                <SETTING><NAME>SymbianResourcesMMPFileLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>s60\mw\devicecontentservices\devicediagnostics_withdom\DeviceDiagnostics\diagplugins\diagvibrateplugin\group</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianResourcesBinaryOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\release\winscw\urel</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-                <SETTING><NAME>SymbianResourcesHeaderFileOutputLocation</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>epoc32\include</VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-
-                <!-- Settings for "Remote Download" panel -->
-                <SETTING><NAME>FileList</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Symbian ARM Debugger" panel -->
-                <SETTING><NAME>Processor</NAME><VALUE>Generic</VALUE></SETTING>
-                <SETTING><NAME>UseInitFile</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>UseConfigFile</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>ResetTarget</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>InitializationFile</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>ConfigurationFile</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>TargetOS</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>RTOSPluginName</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Symbian Common Panel" panel -->
-                <SETTING><NAME>ShowCommandLine</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>SymbianEpocToolsPath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE></VALUE></SETTING>
-<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-<SETTING><NAME>PathRoot</NAME><VALUE>2 SDKTube</VALUE></SETTING>
-</SETTING>
-
-                <!-- Settings for "Symbian Compiler Panel" panel -->
-                <SETTING><NAME>PrefixFile</NAME><VALUE>feature_settings.hrh</VALUE></SETTING>
-                <SETTING><NAME>CompilerXMLDescriptor</NAME><VALUE>Metrowerks x86 Compiler</VALUE></SETTING>
-                <SETTING><NAME>Macros</NAME><VALUE>__SYMBIAN32__,__CW32__,__WINS__,__WINSCW__,__DLL__,NDEBUG,_UNICODE,__SUPPORT_CPP_EXCEPTIONS__,</VALUE></SETTING>
-                <SETTING><NAME>CodeTEST</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>EnableSWIC</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Arguments</NAME><VALUE>-wchar_t off -align 4 -warnings on -w nohidevirtual, nounusedexpr -msgstyle gcc -enum int -str pool -exc ms -trigraphs on -O4,s -nostdinc</VALUE></SETTING>
-                <SETTING><NAME>CIAArgs</NAME><VALUE/></SETTING>
-
-                <!-- Settings for "Symbian Debugging" panel -->
-                <SETTING><NAME>Parse Log File</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Log File Path</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>Symbian SDK Folder</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>Log Unresolved Modules</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Log Unresolved Sym Files</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Debug Non-XIP Executables</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "Symbian Kernel Debugging" panel -->
-                <SETTING><NAME>Start Address</NAME><VALUE>0x00000000</VALUE></SETTING>
-                <SETTING><NAME>Run From Start Address</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Download Image</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>OS Image Path</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>Download Address</NAME><VALUE>0x00000000</VALUE></SETTING>
-                <SETTING><NAME>Ask First</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Debug Bootrom</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Bootrom Sym File</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE/></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "Symbian Linker Panel" panel -->
-                <SETTING><NAME>LinkOutputFile</NAME><VALUE>DevDiagVibratePlugin.dll</VALUE></SETTING>
-                <SETTING><NAME>LinkCmdLine</NAME><VALUE/></SETTING>
-                <SETTING><NAME>SymbianImportLibrary</NAME><VALUE>DevDiagVibratePlugin.lib</VALUE></SETTING>
-                <SETTING><NAME>canDebug</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>canRun</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "Symbian RomBuild Panel" panel -->
-                <SETTING><NAME>CommandLine</NAME><VALUE>buildrom -D_DEBUG devkit lubbock techview -olubbock_gui.img</VALUE></SETTING>
-                <SETTING><NAME>OutputPath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>C:\</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>DisplayMessages</NAME><VALUE>true</VALUE></SETTING>
-
-                <!-- Settings for "Symbian Target" panel -->
-                <SETTING><NAME>TargetArchitecture</NAME><VALUE>WINSCW</VALUE></SETTING>
-                <SETTING><NAME>LogMessages</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>SuppressWarnings</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>GenerateSymbolics</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>CompilerPrefix</NAME><VALUE/></SETTING>
-                <SETTING><NAME>CompilerCmdLine</NAME><VALUE/></SETTING>
-                <SETTING><NAME>SymbianImportLibraryPath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>C:\</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "Symbian Tools" panel -->
-                <SETTING><NAME>Gnu Tools Path</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>C:\</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>Epoc32 Tools Path</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>C:\</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-            </SETTINGLIST>
-            <FILELIST>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagVibratePlugin.mmp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagVibratePluginWINSCW.resources</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>EDLL.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagVibratePluginImplementationTable.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagVibratePlugin.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagVibratePluginEngine.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagVibratePlugin_UID_.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>euser.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>avkon.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>CommonEngine.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>FeatMgr.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>flogger.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagFramework.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DiagPluginBase.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>centralrepository.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>HWRMVibraClient.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>ProfileEngine.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>eikcoctl.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>eikdlg.lib</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Library</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>DevDiagVibratePluginWINSCWUREL.cwlink</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-</FILELIST>
-            <LINKORDER>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagVibratePlugin.mmp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagVibratePluginWINSCW.resources</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>EDLL.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagVibratePluginImplementationTable.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagVibratePlugin.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagVibratePluginEngine.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagVibratePlugin_UID_.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>euser.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>avkon.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>CommonEngine.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>FeatMgr.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>flogger.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagFramework.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DiagPluginBase.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>centralrepository.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>HWRMVibraClient.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>ProfileEngine.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>eikcoctl.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>eikdlg.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>DevDiagVibratePluginWINSCWUREL.cwlink</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-</LINKORDER>
-        </TARGET><TARGET>
-<NAME>Build All</NAME><SETTINGLIST><SETTING><NAME>Linker</NAME><VALUE>None</VALUE></SETTING>
-<SETTING><NAME>Targetname</NAME><VALUE>Build All</VALUE></SETTING>
-</SETTINGLIST>
-<FILELIST></FILELIST>
-<LINKORDER></LINKORDER>
-<SUBTARGETLIST><SUBTARGET><TARGETNAME>WINSCW UDEB</TARGETNAME></SUBTARGET>
-<SUBTARGET><TARGETNAME>WINSCW UREL</TARGETNAME></SUBTARGET>
-</SUBTARGETLIST></TARGET></TARGETLIST>
-
-    <TARGETORDER>
-<ORDEREDTARGET><NAME>WINSCW UDEB</NAME></ORDEREDTARGET>
-<ORDEREDTARGET><NAME>WINSCW UREL</NAME></ORDEREDTARGET>
-<ORDEREDTARGET><NAME>Build All</NAME></ORDEREDTARGET>
-</TARGETORDER>
-
-    <GROUPLIST><FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DiagVibratePlugin.mmp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<GROUP><NAME>Source</NAME>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DiagVibratePluginImplementationTable.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DiagVibratePlugin.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DiagVibratePluginEngine.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DevDiagVibratePlugin_UID_.cpp</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-</GROUP>
-<GROUP><NAME>Headers</NAME>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DiagVibratePlugin.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DiagVibratePlugin.hrh</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DiagVibratePluginEngine.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DiagVibratePluginObserver.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DiagVibratePluginPrivateCRKeys.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-</GROUP>
-<GROUP><NAME>Resources</NAME>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DevDiagVibratePluginWINSCW.resources</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-</GROUP>
-<GROUP><NAME>Link</NAME>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DevDiagVibratePluginWINSCWUDEB.cwlink</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UREL</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DevDiagVibratePluginWINSCWUREL.cwlink</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-</GROUP>
-<GROUP><NAME>Libraries</NAME>
-<GROUP><NAME>WINSCW</NAME>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>EDLL.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>euser.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>avkon.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>CommonEngine.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>FeatMgr.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>flogger.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DiagFramework.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>DiagPluginBase.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>centralrepository.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>HWRMVibraClient.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>ProfileEngine.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>eikcoctl.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>eikdlg.lib</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UREL</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>EDLL.LIB</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-</GROUP>
-</GROUP>
-</GROUPLIST>
-
-</PROJECT>
--- a/devicediagnostics/diagplugins/diagvibrateplugin/inc/diagvibrateplugin.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,242 +0,0 @@
-/*
-* 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:  CDiagVibratePugin derives from CDiagTestPluginBase and 
-*                  is the access point to run the vibrate test.
-*
-*/
-
-
-#ifndef __DIAGVIBRATEPLUGIN_H__
-#define __DIAGVIBRATEPLUGIN_H__
-
-// INCLUDES
-#include <DiagTestPluginBase.h>         //CDiagTestPluginBase
-#include <AknProgressDialog.h>          //MProgressDialogCallback
-
-#include "diagvibratepluginobserver.h"  //MDiagVibratePluginObserver
-
-// CONSTANTS
-
-// MACROS
-
-// DATA TYPES
-
-// FUNCTION PROTOTYPES
-
-// FORWARD DECLARATIONS
-class CDiagVibratePluginEngine;
-
-// CLASS DEFINITION
-class CDiagVibratePlugin : public CDiagTestPluginBase, 
-                           public MDiagVibratePluginObserver,
-                           public MProgressDialogCallback
-
-    {
-    public: // Constructors and destructor
-
-        /**
-        * Symbian OS two-phased constructor
-        * @return MDiagPlugin*
-        */
-        static MDiagPlugin* NewL( TAny* aInitParams );
-
-        /**
-        * Destructor
-        */
-        virtual ~CDiagVibratePlugin();
-
-    public: // From CDiagTestPluginBase
-
-        /**
-        * @see CDiagTestPluginBase::Visible()
-        */
-        virtual TBool IsVisible() const;
-
-        /**
-        * @see CDiagTestPluginBase::RunMode()
-        */
-        virtual TRunMode RunMode() const;
-
-        /**
-        * @see CDiagTestPluginBase::TotalSteps()
-        */
-        virtual TUint TotalSteps() const;
-
-        /**
-        * @see CDiagTestPluginBase::GetPluginNameL
-        */
-        virtual HBufC* GetPluginNameL( TNameLayoutType aLayoutType ) const;
-
-        /**
-        * @see CDiagTestPluginBase::Uid
-        */
-        virtual TUid Uid() const;
-
-    public: // from MDiagVibratePluginObserver
-
-        /**
-         * Inform vibrate status changes
-         *
-         * @param aStatus Status of the vibrate engine
-         */
-        virtual void VibraStatusChanged( TVibrateStatus aStatus );
-
-    private: // from CDiagTestPluginBase
-
-        /**
-        * Handle plug-in execution.
-        * @see CDiagTestPluginBase::DoRunTestL
-        */
-        void DoRunTestL();
-
-        /**
-        * Clean up
-        * @see CDiagTestPluginBase::DoStopAndCleanupL
-        */
-        void DoStopAndCleanupL();
-
-    private: // from CActive
-    
-        /**
-        * Handle active object completion event
-        */
-        virtual void RunL();
-    
-        /**
-        * Handle cancel
-        */
-        virtual void DoCancel();
-    
-    private: // from MProgressDialogCallback
-        
-        /**
-        * Called when the progress dialog is dismissed.
-        *
-        * @param aButtonId - indicate which button made dialog to dismiss
-        */
-        virtual void DialogDismissedL( TInt aButtonId );
-    
-    private: 
-
-        /**
-        * C++ default constructor.
-        */
-        CDiagVibratePlugin( CDiagPluginConstructionParam* aInitParams  );
-
-        /**
-        * Symbian OS default constructor.
-        *
-        */
-        void ConstructL();
-
-   private:    // data
-    
-        /**  enum for the vibrate plugin internal state */
-        enum TState
-            {
-            EStateUnknown = 0,
-            EStateFailed,
-            EStateCancelled,
-            EStateSkipped,
-            EStateIdle,
-            EStateVibrating,
-            EStateUserQuery,
-            EStateBlocked,
-            EStateRestart
-            };
-
-    private:    // private functions
-    
-        /**
-        * Makes sure vibrate is enabled in the profile
-        */
-        TInt SetVibrateSettingOnL();
-
-        /**
-        * Sets the vibration setting to its original value
-        */
-        void SetVibrateSettingToOriginalValueL();
-
-        /**
-        * Checks if the charger is connected
-        */
-        TBool IsChargerConnected() const;
-
-        /**
-        * Sets the state
-        * @param aState State to be set
-        */
-        void SetState( CDiagVibratePlugin::TState aState );
-        
-        /**
-        * Displays disconnect charger dlg
-        * @return TBool
-        */
-        TBool DisplayDisconnectChargerQueryL();
-        
-        /**
-        * Displays vibrating progress dialog
-        */
-        void ShowVibratingNoteL();
-        
-        /**
-        * Gets vibration time in seconds from CR
-        */
-        void ReadVibrationTimeL();
-        
-        /*
-        * confirmation query for activating the vibration in profile.
-        */
-        TInt ShowActivateConfNoteL();
-       
-    private: // data
-
-        /**
-        * Vibrate plugin engine
-        * own
-        */
-        CDiagVibratePluginEngine* iEngine;
-
-        /**
-        * Progress Dialog
-        * own
-        */
-        CAknProgressDialog* iProgressDialog;
-
-        /**
-        * State of the vibrate plugin
-        */
-        TState iState;
-        
-        /**
-        * Indicates if the profile vibrate setting was 
-        * temporalily set active 
-        */
-        TBool iVibrateSettingUpdated;
-        
-        /**
-        * Original profile vibrate setting
-        */
-        TBool iOrigVibrateSetting;
-        
-        /**
-        * Vibration time in seconds
-        */
-        TInt iVibrationTime;        
-        
-    };
-
-#endif // __DIAGVIBRATEPLUGIN_H__
-
-// End of File
--- a/devicediagnostics/diagplugins/diagvibrateplugin/inc/diagvibrateplugin.hrh	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-/*
-* 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:  Contains common definitions for menu id:s
-*
-*/
-
-
-#ifndef DIAGVIBRATEPLUGINHRH_H
-#define DIAGVIBRATEPLUGINHRH_H
-
-// ECOM Plug-in UID
-#define DIAG_VIBRATE_PLUGIN_UID 0x2000E587
-
-// commands
-
-/////////////////////////////
-//
-// VibratePlugin: CBA
-//
-/////////////////////////////
-enum TVibratePluginCBA
-    {
-    ECBACmdSkip = 0x6300,
-    ECBACmdCancel,
-    ECBACmdNo
-    };
-
-#endif //  DIAGVIBRATEPLUGINHRH_H
-
-//End of File
--- a/devicediagnostics/diagplugins/diagvibrateplugin/inc/diagvibratepluginengine.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,117 +0,0 @@
-/*
-* 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:  Engine to handle the vibration. Uses MDiagVibratePluginObserver
-*                 to inform the vibrate status changes to the client.   
-*
-*/
-
-
-#ifndef __DIAGVIBRATEPLUGINENGINE_H__
-#define __DIAGVIBRATEPLUGINENGINE_H__
-
-// INCLUDES
-#include <hwrmvibra.h>
-
-// CONSTANTS
-
-// MACROS
-
-// DATA TYPES
-
-// FUNCTION PROTOTYPES
-
-// FORWARD DECLARATIONS
-
-class MDiagVibratePluginObserver;
-
-// CLASS DECLARATION
-class CDiagVibratePluginEngine : public CBase, 
-                                 public MHWRMVibraObserver
-    {
-    public: // Constructors and destructor
-        /**
-        * Symbian OS two-phased constructor
-        * @return CDiagVibratePluginEngine*
-        */
-        static CDiagVibratePluginEngine* NewL( MDiagVibratePluginObserver& aObserver );
-
-        /**
-        * Symbian OS two-phased constructor
-        * @return CDiagVibratePluginEngine*
-        */
-        static CDiagVibratePluginEngine* NewLC( MDiagVibratePluginObserver& aObserver );
-
-        /**
-        * Destructor
-        */
-        virtual ~CDiagVibratePluginEngine();
-
-
-    public:
-
-        /**
-        * Starts the vibration
-        * aVibrationTime Vibration time in seconds
-        */
-        void StartVibraL( TInt aVibrationTime );
-
-        /**
-        * Stops the vibration
-        */
-        void StopVibra();
-
-
-    private: // From MHWRMVibraObserver
-
-        /**
-        * @see MHWRMVibraObserver::VibraStatusChanged
-        */
-        virtual void VibraStatusChanged( CHWRMVibra::TVibraStatus aStatus );
-
-        /**
-        * @see MHWRMVibraObserver::VibraModeChanged
-        */
-        virtual void VibraModeChanged( CHWRMVibra::TVibraModeState aStatus );
-
-
-    private: // Constructors
-
-        /**
-        * Private first phase constructor used by NewL and NewLC
-        */
-        CDiagVibratePluginEngine( MDiagVibratePluginObserver& aObserver );
-
-        /**
-        * Second phase constructor.
-        */    
-        void ConstructL();
-
-    private: //data members
-        
-        /**
-        * Observer for the vibration events
-        */
-        MDiagVibratePluginObserver& iObserver;
-
-        /**
-        * Vibra hw resource manager
-        * own.
-        */
-        CHWRMVibra*                 iVibra;     
-
-    };
-
-#endif // __DIAGVIBRATEPLUGINENGINE_H__
-
-// End of File
--- a/devicediagnostics/diagplugins/diagvibrateplugin/inc/diagvibratepluginobserver.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-/*
-* 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:  Callback IF to inform vibrate status changes
-*
-*/
-
-
-#ifndef __DIAGVIBRATEPLUGINOBSERVER_H__
-#define __DIAGVIBRATEPLUGINOBSERVER_H__
-
-// INCLUDES
-
-// CONSTANTS
-
-// MACROS
-
-// DATA TYPES
-enum TVibrateStatus 
-    {
-    EVibrateStarted,
-    EVibrateEnded,
-    EVibrateFailed,
-    EVibrateBlocked
-    };
-
-// FUNCTION PROTOTYPES
-
-// FORWARD DECLARATIONS
-
-// CLASS DECLARATION
-class MDiagVibratePluginObserver 
-    {
-    public: 
-    
-        /**
-        * Inform vibrate status changes
-        *
-        * @param aStatus Status of the vibrate engine
-        */
-        virtual void VibraStatusChanged( TVibrateStatus aStatus ) = 0;
-    };
-
-#endif // __DIAGVIBRATEPLUGINOBSERVER_H__
-
-//End of File
--- a/devicediagnostics/diagplugins/diagvibrateplugin/inc/diagvibratepluginprivatecrkeys.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-/*
-* 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:  Vibrate plugin private Central Repository keys.
-*
-*/
-
-
-#ifndef __DIAGVIBRATEPLUGINPRIVATECRKEYS_H__
-#define __DIAGVIBRATEPLUGINPRIVATECRKEYS_H__
-
-//  INCLUDES
-
-#include <e32std.h>
-
-// =============================================================================
-// Vibra Test 
-// =============================================================================
-
-const TUid KCRUidDevDiagVibraTestPlugin = { 0x2000E586 };
-
-
-/**
- *
- * The value assigned to this key is the time in second for the vibra to vibrate
- * Available options:   
- * Default value: 3
-*/
-const TUint32 KDevDiagVibraTestVibrateTime = 0x00000001;
-
-#endif // __DIAGVIBRATEPLUGINPRIVATECRKEYS_H__
-
-// End of File
\ No newline at end of file
--- a/devicediagnostics/diagplugins/diagvibrateplugin/loc/devdiagvibrateplugin.loc	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,90 +0,0 @@
-/*
-* 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:  Localization strings for DiagVibratePlugin.
-*
-*/
-
-
-//  LOCALISATION STRINGS
-
-// NEW
-
-//d:Text of vibrate test list item in device diagnostics application
-//l:list_single_graphic_heading_pane_t1_cp2
-//r: 3.2
-//
-#define qtn_diag_lst_vibrate "Vibrate test"
-
-//d:Title of vibrate plugin
-//l:heading_pane_t1
-//r: 3.2
-//
-#define qtn_diag_msg_title_vibrate "Vibrate test"
-
-//d:Message query prompt to start vibrate test
-//l:popup_info_list_pane_t1
-//r:3.2
-//
-#define qtn_diag_msg_vibrate "The following test will check vibrate functionality of the device"
-
-//d:Confimation query to the user if the phone vibrated
-//l:popup_note_window
-//r:3.2
-//
-
-#define qtn_diag_conf_vibrate "Did the Device vibrate?"
-
-//d:Prompt text to disconnect the charger before running the test
-//l:popup_note_window
-//r:3.2
-//
-#define qtn_diag_conf_battery_charger_disconnect "Disconnect your battery charger. Vibra does not work when battery charger is connected."
-
-//d:Message text the phone is vibrating
-//l:popup_note_wait_window
-//r:3.2
-//
-
-#define qtn_diag_msg_vibrating "Vibrating Device"
-
-//d:Vibrate text used by the suite view
-//l:list_single_graphic_pane_t1
-//r:3.2
-//
-//#define qtn_diag_lst_test_vibrate "Test Vibrate"  // LVT Change
-
-//d:Vibrate title text used by suite and result views
-//l:title_pane_t2/opt12
-//r:3.2
-//
-//#define qtn_diag_title_test_vibrate "Vibrate test" // LVT Change
-
-//d:Softkey text.
-//l:control_pane_t1/opt7 
-//r:5.0
-//
-#define qtn_diag_softk_skip "Skip"
-
-//d:Failed result text
-//l:popup_info_list_pane_t1
-//r:5.0
-//
-#define qtn_diag_conf_test_failed_vibrate "Vibrate test"
-
-//d: UserQuery
-//l:popup_info_list_pane_t1
-//r:5.0
-#define qtn_diag_conf_vibrate_activate "Vibrating alert is turned off in current active profile. Do you want to turn it on?"
-
-// End of File
--- a/devicediagnostics/diagplugins/diagvibrateplugin/rom_files/devdiagvibrateplugin.iby	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-/*
-* 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:  Image description file for Vibrate plugin
-*
-*/
-
-
-#ifndef __DEVDIAG_VIBRATE_PLUGIN_IBY__
-#define __DEVDIAG_VIBRATE_PLUGIN_IBY__
-
-#ifdef FF_DEVICE_DIAGNOSTICS_APP 
-
-#include <data_caging_paths_for_iby.hrh>
-
-ECOM_PLUGIN( devdiagvibrateplugin.dll, devdiagvibrateplugin.rsc )
-
-#endif
-
-#endif // __DEVDIAG_VIBRATE_PLUGIN_IBY__
-
-// end of file
--- a/devicediagnostics/diagplugins/diagvibrateplugin/rom_files/devdiagvibrateplugin_resources.iby	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-/*
-* 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:  Image description file for resources of Vibrate plugin
-*
-*/
-
-
-#ifndef __DEVDIAG_VIBRATE_PLUGIN_RESOURCES_IBY__
-#define __DEVDIAG_VIBRATE_PLUGIN_RESOURCES_IBY__
-
-#ifdef FF_DEVICE_DIAGNOSTICS_APP 
-
-#include <data_caging_paths_for_iby.hrh>
-
-data=DATAZ_\RESOURCE_FILES_DIR\devdiagvibratepluginrsc.rsc RESOURCE_FILES_DIR\devdiagvibratepluginrsc.rsc
-
-#endif
-
-#endif // __DEVDIAG_VIBRATE_PLUGIN_RESOURCES_IBY__
-
-// end of file
--- a/devicediagnostics/diagplugins/diagvibrateplugin/src/diagvibrateplugin.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,865 +0,0 @@
-/*
-* 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:  Vibrate plugin interface implementation
-*
-*/
-
-
-// INCLUDE FILES
-#include <avkon.hrh>
-#include <AknQueryDialog.h>
-#include <aknmessagequerydialog.h>
-#include <DiagFrameworkDebug.h>         
-#include <DiagTestExecParam.h>      
-#include <DiagTestObserver.h>       
-#include <devdiagvibratepluginrsc.rsg>
-#include <hal.h>
-#include <hwrmpowerstatesdkpskeys.h>
-#include <MProEngEngine.h>
-#include <MProEngProfile.h>
-#include <MProEngToneSettings.h>
-#include <ProEngFactory.h> 
-#include <DiagEngineCommon.h>    
-#include <DiagCommonDialog.h>    
-#include <StringLoader.h>           
-#include <centralrepository.h>
-
-#include "diagvibrateplugin.h"
-#include "diagvibrateplugin.hrh"
-#include "diagvibratepluginengine.h"
-#include "diagvibratepluginprivatecrkeys.h"
-
-// EXTERNAL DATA STRUCTURES
-
-// EXTERNAL FUNCTION PROTOTYPES
-
-// CONSTANTS
-const TUid KDiagVibratePluginUid = { DIAG_VIBRATE_PLUGIN_UID };
-static const TInt KProgressDialogIncrementSize = 10;
-static const TInt KProgressDialogFinalValue = 100;
-static const TInt KHundredthsInSecond = 100;
-
-static const TInt KVibratePluginTotalStep = 1;
-
-// MACROS
-_LIT( KDiagVibratePluginResourceFileName, "z:DevDiagVibratePluginRsc.rsc" );
-
-// LOCAL CONSTANTS AND MACROS
-#ifdef _DEBUG
-    enum TVibratePluginPanic
-        {
-        EPanicUnknownVibraState= 900,
-        EPanicInitParamsNull,
-        EPanicStateRepeated
-        };
-
-    _LIT( KVibratePluginErrorUnknownVibraStateText, "VibraStatusChanged: Unknown vibra state" );
-    _LIT( KVibratePluginErrorInitParamsNullText, "NewL: InitParams NULL" );
-    _LIT( KVibratePluginErrorStateRepeatedText, "State change not effective" );
-#endif
-
-// MODULE DATA STRUCTURES
-
-// LOCAL FUNCTION PROTOTYPES
-
-// FORWARD DECLARATIONS
-
-// ============================= LOCAL FUNCTIONS ==============================
-
-// ========================= MEMBER FUNCTIONS ================================
-
-// ---------------------------------------------------------------------------
-// CDiagVibratePlugin::NewL()
-//
-// Symbian OS default constructor
-// ---------------------------------------------------------------------------
-//
-MDiagPlugin* CDiagVibratePlugin::NewL( TAny* aInitParams )
-    {
-    __ASSERT_DEBUG( aInitParams, User::Panic ( KVibratePluginErrorInitParamsNullText, 
-        EPanicInitParamsNull ));
-
-    CDiagPluginConstructionParam* param = NULL;
-    param = static_cast<CDiagPluginConstructionParam*>( aInitParams );    
-
-    CleanupStack::PushL( param );    
-    CDiagVibratePlugin* self = new( ELeave ) CDiagVibratePlugin ( param );
-    CleanupStack::Pop( param );
-
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    
-    CleanupStack::Pop( self ); // self
-    return self;
-    }
-
-
-// ----------------------------------------------------------------------------
-// CDiagVibratePlugin::~CDiagVibratePlugin
-//
-// Destructor
-// ----------------------------------------------------------------------------
-//
-CDiagVibratePlugin::~CDiagVibratePlugin()
-    {
-    Cancel();
-    delete iProgressDialog;
-    delete iEngine;
-    }
-
-
-// ---------------------------------------------------------------------------
-// From MDiagPlugin
-// CDiagVibratePlugin::IsVisible()
-// ---------------------------------------------------------------------------
-//
-TBool CDiagVibratePlugin::IsVisible() const
-    {
-    return ETrue;
-    }
-
-
-// ---------------------------------------------------------------------------
-// From MDiagTestPlugin
-// CDiagVibratePlugin::RunMode()
-// ---------------------------------------------------------------------------
-//
-MDiagTestPlugin::TRunMode CDiagVibratePlugin::RunMode() const
-    {
-    return EInteractiveDialog;
-    }
-
-
-// ---------------------------------------------------------------------------
-// From MDiagTestPlugin
-// CDiagVibratePlugin::TotalSteps()
-// ---------------------------------------------------------------------------
-//
-TUint CDiagVibratePlugin::TotalSteps() const
-    {
-    return KVibratePluginTotalStep;
-    }
-
-
-// ---------------------------------------------------------------------------
-// From MDiagPlugin
-// CDiagVibratePlugin::GetPluginNameL
-// ---------------------------------------------------------------------------
-//
-HBufC* CDiagVibratePlugin::GetPluginNameL( TNameLayoutType aLayoutType ) const
-    {
-    switch ( aLayoutType )
-        {
-        case ENameLayoutHeadingPane:
-            return StringLoader::LoadL( R_DIAG_MSG_TITLE_VIBRATE );
-
-        case ENameLayoutPopupInfoPane:
-            return StringLoader::LoadL ( R_DIAG_MSG_INFO_VIBRATE );
-
-        case ENameLayoutTitlePane:
-            return StringLoader::LoadL( R_DIAG_TITLE_TEST_VIBRATE );
-
-        case ENameLayoutListSingleGraphic:
-            return StringLoader::LoadL( R_DIAG_LST_TEST_VIBRATE );
-
-        case ENameLayoutListSingle:
-            return StringLoader::LoadL ( R_DIAG_LST_VIBRATE );
-
-        default:
-            LOGSTRING2( "CDiagVibratePlugin::GetPluginNameL: "
-                L"ERROR: Unsupported layout type %d", aLayoutType )
-            __ASSERT_DEBUG( 0, User::Invariant() );
-            return StringLoader::LoadL( R_DIAG_LST_VIBRATE );
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// From MDiagPlugin
-// CDiagVibratePlugin::Uid
-// ---------------------------------------------------------------------------
-//
-TUid CDiagVibratePlugin::Uid() const
-    {
-    return KDiagVibratePluginUid;
-    }
-
-
-// ---------------------------------------------------------------------------
-// From MDiagVibratePluginObserver
-// MDiagVibratePluginObserver::VibraStatusChanged
-// ---------------------------------------------------------------------------
-//
-void CDiagVibratePlugin::VibraStatusChanged( TVibrateStatus aStatus )
-    {
-    CDiagVibratePlugin::TState newState = EStateUnknown; 
-    
-    switch ( aStatus )
-        {
-        case EVibrateStarted:
-            //The vibra can be started only from the idle state
-            newState = ( iState == EStateIdle || iState == EStateRestart) ? EStateVibrating : EStateUnknown;
-            break;
-             
-        case EVibrateEnded:
-            //Vibra should not be stopped before it is started
-            newState = ( iState == EStateVibrating ) ? EStateUserQuery : EStateUnknown;
-            break;
-            
-        case EVibrateFailed:
-            //check if already failed, cancelled or skipped
-            newState = ( iState != EStateFailed && iState != EStateCancelled &&
-                         iState != EStateSkipped ) ? EStateFailed : EStateUnknown;
-            break;        
-                
-        case EVibrateBlocked:
-			newState = ( iState == EStateVibrating ) ? EStateBlocked : EStateUnknown;
-			break;
-        default: //should never happen..
-            __ASSERT_DEBUG( 0, User::Panic( KVibratePluginErrorUnknownVibraStateText,
-                EPanicUnknownVibraState ) );
-            return;
-        }
-        
-    if ( newState != EStateUnknown) // Check if new state is available
-        {
-        SetState( newState );
-        SetActive();
-        TRequestStatus* status = &iStatus;
-        User::RequestComplete(status, KErrNone);
-        }
-        
-    }
-
-// ----------------------------------------------------------------------------
-// From MProgressDialogCallback
-// Progress dialog has been dismissed
-// ----------------------------------------------------------------------------
-//
-void CDiagVibratePlugin::DialogDismissedL( TInt aButtonId )
-    {
-    //Processing the user input only if the state is still vibrating
-    if ( iState == EStateVibrating )
-        {
-        iEngine->StopVibra();
-
-        CDiagVibratePlugin::TState newState = EStateUnknown; 
-        
-        switch ( aButtonId )
-            {
-            case ECBACmdSkip:
-                newState = EStateSkipped;
-                break;
-
-            case ECBACmdCancel:
-                newState = EStateCancelled;
-                break;
-                
-            default:
-                break;
-            }
-        
-        if ( newState != EStateUnknown )
-            {
-            SetState( newState );
-            SetActive();
-            TRequestStatus* status = &iStatus;
-            User::RequestComplete(status, KErrNone);
-            }
-        }
-    else if(aButtonId == EAknSoftkeyOk)
-        {
-        CDiagVibratePlugin::TState newState = EStateUserQuery;
-        SetState( newState );
-        SetActive();
-        TRequestStatus* status = &iStatus;
-        User::RequestComplete(status, KErrNone);
-        }
-     
-    }
-
-// ----------------------------------------------------------------------------
-// CDiagVibratePlugin::CDiagVibratePlugin()
-//
-// Constructor
-// ----------------------------------------------------------------------------
-//
-CDiagVibratePlugin::CDiagVibratePlugin( CDiagPluginConstructionParam* aParam )
-    :   CDiagTestPluginBase( aParam ),
-        iState( EStateCancelled )
-    {
-    }
-
-
-// ---------------------------------------------------------------------------
-// CDiagVibratePlugin::ConstructL()
-//
-// Symbian OS two-phased constructor
-// ---------------------------------------------------------------------------
-//
-void CDiagVibratePlugin::ConstructL()
-    {
-    BaseConstructL ( KDiagVibratePluginResourceFileName );
-    ReadVibrationTimeL();
-    }
-
-
-// ---------------------------------------------------------------------------
-// From CDiagTestPluginBase
-// CDiagVibratePlugin::DoRunTestL()
-// ---------------------------------------------------------------------------
-//
-void CDiagVibratePlugin::DoRunTestL()
-    {
-    SetState( EStateIdle );
-
-    //Let's confirm from the user that the test should be run
-    FOREVER
-        {
-        CAknMessageQueryDialog* dialog = new ( ELeave ) CAknMessageQueryDialog();
-        dialog->PrepareLC( R_VIBRATEPLUGIN_STARTQUERY );
-        
-        // If the test is run as a single test removing skip button
-        if ( SinglePluginExecution() )
-            {
-            CEikButtonGroupContainer& cba = dialog->ButtonGroupContainer();
-            cba.SetCommandSetL( R_VIBRATE_SOFTKEYS_OK__CANCEL );
-            }
-
-        TInt queryResult;
-        
-        if ( !RunWaitingDialogL( dialog, queryResult ) )
-            {
-            // Dialog is dismissed by deletion. Exit immediately without
-            // accessing member variable, to prevent crash
-            return;
-            }
-
-        //Let's check the user answer
-        switch ( queryResult )
-            {
-            
-            // ADO & Platformization Changes
-            //case ECBACmdSkip:
-            case ECBACmdCancel:
-                CompleteTestL( CDiagResultsDatabaseItem::ESkipped );
-                return;
-
-			case ECBACmdSkip:
-			
-            //case ECBACmdCancel:
-                {
-                //if ( SinglePluginExecution() )
-                  //  {
-                   // CompleteTestL( CDiagResultsDatabaseItem::ECancelled );
-                   // return;
-                   // }
-               // else 
-                 //   {
-                      // See if the user really wants to cancel tests.
-                    TInt confirmResult = 0;
-                
-                    CAknDialog* dlg = ExecutionParam().Engine().
-                    CreateCommonDialogLC( EDiagCommonDialogConfirmSkipAll, NULL );
-                
-                    if ( !RunWaitingDialogL( dlg, confirmResult ) )
-                        {
-                        return;
-                        }
-                    /*
-                    if ( confirmResult != EAknSoftkeyNo )
-                        {
-                       CompleteTestL( CDiagResultsDatabaseItem::ECancelled ); 
-                        return;
-                        }
-                    */
-                    if (confirmResult)
-                           {
-                           //CompleteTestL( CDiagResultsDatabaseItem::ECancelled ); 
-                           return;
-                           }
-                    
-                 //   }
-              
-                // Break and display the dialog again.
-                }
-                break;
-                // Changes ends
-                
-            case EAknSoftkeyOk:
-                {
-                //Let's check that the charger is not connected
-                
-                if ( IsChargerConnected() && !DisplayDisconnectChargerQueryL() )
-                    {
-                    return;
-                    }
-                //Let's start the test by activating active object
-                SetActive();
-                TRequestStatus* status = &iStatus;
-                User::RequestComplete(status, KErrNone);
-                return;
-                }
-            default:
-                return;
-            }
-        }
-    }
-
-
-// ---------------------------------------------------------------------------
-// From CActive
-// CDiagVibratePlugin::RunL
-// ---------------------------------------------------------------------------
-//
-void CDiagVibratePlugin::RunL()
-    {
-
-	// ravi - badwarning #546-D    
-    TRequestStatus* status = &iStatus;
-    
-    switch (iState) 
-        {
-        case EStateRestart:
-        	{
-        	iEngine->StopVibra();
-        	LOGSTRING( "In RunL, EStateRestart");
-            ShowVibratingNoteL();
-            iEngine = CDiagVibratePluginEngine::NewL( *this );    
-            TRAPD(Err,iEngine->StartVibraL( iVibrationTime ));
-            if (Err == KErrNone)
-            LOGSTRING("Leave code for restart = Kerrnone");
-            LOGSTRING2( "Leave Code for in Restart StartVibra in Hex( 0x%x )", Err );
-            break;
-        	}
-        case EStateIdle:
-            if(!SetVibrateSettingOnL())
-            	break;
-            ShowVibratingNoteL();
-            iEngine = CDiagVibratePluginEngine::NewL( *this );    
-            iEngine->StartVibraL( iVibrationTime );
-            break;
-            
-        case EStateVibrating:
-            //Vibration started -> no action needed
-            break;
-            
-        case EStateUserQuery: 
-            {
-            delete iEngine;
-            iEngine = NULL;
-            
-            if ( iProgressDialog )
-                {
-                iProgressDialog->ProcessFinishedL();
-                }
- 
-            SetVibrateSettingToOriginalValueL();
-            //displaying user query: did the phone vibrate
-
-            CAknQueryDialog* dialog = new ( ELeave ) CAknQueryDialog( CAknQueryDialog::ENoTone );
-            dialog->PrepareLC( R_VIBRATEPLUGIN_CONFQUERY_DLG );
-
-            TInt queryResult;
-            if ( RunWaitingDialogL( dialog, queryResult ) )
-                {
-                //Let's check the user answer    
-                switch ( queryResult )
-                    {
-                    case EAknSoftkeyYes:
-                        LOGSTRING("CDiagVibratePlugin-EAknSoftkeyYes")
-                        CompleteTestL( CDiagResultsDatabaseItem::ESuccess );
-                        break;
-                        
-                    case ECBACmdNo:
-                        LOGSTRING("CDiagVibratePlugin-EAknSoftkeyNo")
-                        CompleteTestL( CDiagResultsDatabaseItem::EFailed );
-                        break;
-                    
-                    default:
-                        LOGSTRING("CDiagVibratePlugin-Default")
-                        break;
-                    }
-                }
-            }
-            break;
-            
-        case EStateCancelled:
-            {
-             if ( SinglePluginExecution() )
-                {
-                CompleteTestL( CDiagResultsDatabaseItem::ECancelled );
-                return;
-                }
-             else 
-                {                                                    
-                TInt confirmResult = 0;
-                CAknDialog* dlg = ExecutionParam().Engine().
-                CreateCommonDialogLC( EDiagCommonDialogConfirmCancelAll, NULL );
-                
-                if ( !RunWaitingDialogL( dlg, confirmResult ) )
-                    {
-                    //the dialog got deleted, returning right away
-                    return;
-                    }                    
-                    
-                if ( confirmResult == EAknSoftkeyYes )
-                    {
-                    //test is cancelled
-                    CompleteTestL( CDiagResultsDatabaseItem::ECancelled );
-                    }
-                else //EAknSoftKeyNo
-                    {
-                    //let's rerun the test
-                    DoStopAndCleanupL();
-                    DoRunTestL();
-                    }
-                }
-            }
-            break; 
-        
-        case EStateSkipped:
-            CompleteTestL( CDiagResultsDatabaseItem::ESkipped );
-            break;
-       
-        case EStateFailed:
-            CompleteTestL( CDiagResultsDatabaseItem::EFailed );
-            break;
-        
-        case EStateBlocked:
-        	LOGSTRING( "In RunL, EStateBlocked");
-        	if ( iProgressDialog )
-        		{
-        		iProgressDialog->ProcessFinishedL();       
-        		}
-        	if (!DisplayDisconnectChargerQueryL() )
-               {
-                return;
-               }
-                //Let's start the test by activating active object
-            SetState( EStateRestart );
-            SetActive();
-            User::RequestComplete(status, KErrNone);
-
-        	break;
-            
-        default:
-            __ASSERT_DEBUG( 0, User::Panic( KVibratePluginErrorUnknownVibraStateText,
-                EPanicUnknownVibraState ) );
-            break;    
-        }
-    }    
-
-
-// ---------------------------------------------------------------------------
-// From CActive
-// CDiagVibratePlugin::DoCancel
-// ---------------------------------------------------------------------------
-//
-void CDiagVibratePlugin::DoCancel()
-    {
-    }    
-
-
-// ---------------------------------------------------------------------------
-// Cleanup the created resources
-// CDiagVibratePlugin::DoStopAndCleanupL
-// ---------------------------------------------------------------------------
-//
-void CDiagVibratePlugin::DoStopAndCleanupL()
-    {
-    delete iEngine;    
-    iEngine = NULL;
-    if ( iProgressDialog )
-        {
-        iProgressDialog->ProcessFinishedL();       
-        }
-    SetVibrateSettingToOriginalValueL();
-    iVibrateSettingUpdated = EFalse;
-    if ( iState != EStateCancelled )
-        {
-        SetState( EStateCancelled );
-        }
-    }
-
-    
-// ---------------------------------------------------------------------------
-// Makes sure vibrate is enabled in the profile
-// CDiagVibratePlugin::SetVibrateSettingOnL
-// ---------------------------------------------------------------------------
-//
-TInt CDiagVibratePlugin::SetVibrateSettingOnL()
-    {
-    MProEngEngine* profileEng = ProEngFactory::NewEngineL();
-    CleanupDeletePushL(profileEng);
-
-    MProEngProfile* profile = profileEng->ActiveProfileL();
-    MProEngToneSettings& profileToneSettings = profile->ToneSettings();
-    iOrigVibrateSetting = profileToneSettings.VibratingAlert();
-   
-   //set the vibration setting on if it is not on already
-    if (!iOrigVibrateSetting)
-        {
-        if(!ShowActivateConfNoteL())
-        {
-        		profile->Release();    
-    			CleanupStack::PopAndDestroy(profileEng);
-    			return EFalse;
-    	}
-        profileToneSettings.SetVibratingAlert(ETrue);
-        profile->CommitChangeL();
-        iVibrateSettingUpdated = ETrue;
-        }
-    
-    profile->Release();    
-    CleanupStack::PopAndDestroy(profileEng);
-    return ETrue;
-    }
-    
-    
-TInt CDiagVibratePlugin::ShowActivateConfNoteL()
-{
-	CAknQueryDialog * dialog = new (ELeave) CAknQueryDialog();
-    dialog->PrepareLC( R_VIBRATEPLUGIN_VIBRATE_ACTIVATE_DLG );
-    
-    
-    TInt queryResult;
-        
-    if ( !RunWaitingDialogL( dialog, queryResult ) )
-         {
-         // Dialog is dismissed by deletion. Exit immediately without
-         // accessing member variable, to prevent crash
-         return EFalse;
-         }
-
-        //Let's check the user answer
-        switch ( queryResult )
-            {
-            
-            case ECBACmdNo:
-                CompleteTestL( CDiagResultsDatabaseItem::ESkipped );
-                return EFalse;
-
-            case EAknSoftkeyYes:
-            	return ETrue;
-
-            default:
-                return EFalse;
-            }	
-	
-}
-
-    
-// ---------------------------------------------------------------------------
-// Sets the vibration setting to its original value
-// CDiagVibratePlugin::SetVibrateSettingToOriginalValueL
-// ---------------------------------------------------------------------------
-//
-void CDiagVibratePlugin::SetVibrateSettingToOriginalValueL()
-    {
-    if ( !iVibrateSettingUpdated )
-        {
-        return;
-        }
-        
-    MProEngEngine* profileEng = ProEngFactory::NewEngineL();
-    MProEngProfile* profile = profileEng->ActiveProfileL();
-    MProEngToneSettings& profileToneSettings = profile->ToneSettings();
-    
-    //Check if vibrate setting need to be turned off again
-    if ( !iOrigVibrateSetting )
-        {
-        profileToneSettings.SetVibratingAlert( EFalse );
-        profile->CommitChangeL();
-        }
-        
-    profile->Release();
-    profileEng->Release();                
-
-    iVibrateSettingUpdated = EFalse;
-    }    
-
-
-// ---------------------------------------------------------------------------
-// Checks if the charger is connected if yes the user is asked to removed it.
-// CDiagVibratePlugin::IsChargerConnected
-// ---------------------------------------------------------------------------
-//
-TBool CDiagVibratePlugin::IsChargerConnected() const
-    {
-    TInt charger;
-    TBool result = EFalse;
-    
-    if( RProperty::Get( KPSUidHWRMPowerState, KHWRMChargingStatus, charger ) == KErrNone )
-        {
-        switch( charger )
-            {
-            case EChargingStatusCharging:
-            case EChargingStatusNotCharging:
-            case EChargingStatusChargingComplete:
-            case EChargingStatusAlmostComplete:
-            case EChargingStatusChargingContinued:
-                result = ETrue;
-                break;
-                
-            case EChargingStatusNotConnected:
-            default:
-                break;
-            }
-        }
-        
-    return( result );
-    }
-
-
-// ---------------------------------------------------------------------------
-// Sets the internal state
-// CDiagVibratePlugin::SetState
-// ---------------------------------------------------------------------------
-//
-void CDiagVibratePlugin::SetState( CDiagVibratePlugin::TState aState )
-    {
-    __ASSERT_DEBUG( iState != aState, User::Panic( KVibratePluginErrorStateRepeatedText,
-                EPanicStateRepeated ) );
-
-    iState = aState;
-    }
-
-// ---------------------------------------------------------------------------
-// Displays disconnect charger query
-// CDiagVibratePlugin::DisplayDisconnectChargerQuery
-// ---------------------------------------------------------------------------
-//
-TBool CDiagVibratePlugin::DisplayDisconnectChargerQueryL()
-    {
-    FOREVER
-        {
-        CAknQueryDialog* dialog = new ( ELeave ) CAknQueryDialog( CAknQueryDialog::ENoTone );
-        dialog->PrepareLC( R_VIBRATEPLUGIN_DISCONNECT_CHARGER_DLG );
-
-
-        TInt queryResult;
-        
-        if ( !RunWaitingDialogL( dialog, queryResult ) )
-            {
-            // Dialog is dismissed by deletion. Exit immediately without
-            // accessing member variable, to prevent crash
-            return EFalse;
-            }
-
-        //Let's check the user answer
-        switch ( queryResult )
-            {
-            
-            case ECBACmdCancel:
-                {
-                if ( SinglePluginExecution() )
-                    {
-                    CompleteTestL( CDiagResultsDatabaseItem::ESkipped );
-                    return EFalse;
-                    }
-                else
-                    {
-                    // See if the user really wants to cancel tests.
-                    TInt confirmResult = 0;
-                    
-                    CAknDialog* dlg = ExecutionParam().Engine().
-                        CreateCommonDialogLC( EDiagCommonDialogConfirmCancelAll, NULL );
-                    
-                    if ( !RunWaitingDialogL( dlg, confirmResult ) )
-                        {
-                        return EFalse;
-                        }
-                        
-                    if ( confirmResult)
-                        {
-                        return EFalse;
-                        }
-                    else
-                        {
-                        continue;
-                        }
-                    }
-
-                // Break and display the dialog again.
-                }
-                
-            case EAknSoftkeyOk:
-                if ( !IsChargerConnected() )
-                    {
-                    return ETrue;   
-                    }
-                break;
-            default:
-                return EFalse;
-            }
-        }
-    }
-
-
-// ---------------------------------------------------------------------------
-// Displays vibrating progress dialog
-// ---------------------------------------------------------------------------
-//
-void CDiagVibratePlugin::ShowVibratingNoteL()
-    {
-    if ( iProgressDialog )
-        {
-        delete iProgressDialog;
-        iProgressDialog = NULL;
-        }
-    
-    //Calculate progress bar update interval in hundredths of seconds
-    TInt interval = KHundredthsInSecond * iVibrationTime *
-                    ( ( TReal ) KProgressDialogIncrementSize / 
-                    KProgressDialogFinalValue );
-                    
-    iProgressDialog = new ( ELeave ) CAknProgressDialog( 
-                        KProgressDialogFinalValue, 
-                        KProgressDialogIncrementSize,
-                        interval,
-                        reinterpret_cast <CEikDialog**> ( &iProgressDialog ) );
-
-    iProgressDialog->SetCallback( this );
-    iProgressDialog->PrepareLC( R_VIBRATEPLUGIN_PROGRESS_NOTE_VIBRATING );
-    
-    // If the test is run as a single test removing skip button
-    if ( SinglePluginExecution() )
-        {
-        CEikButtonGroupContainer& cba = iProgressDialog->ButtonGroupContainer();
-        cba.SetCommandSetL( R_VIBRATE_SOFTKEYS_STOP__CANCEL );
-        }
-
-    iProgressDialog->RunLD();
-    }
-
-
-// ---------------------------------------------------------------------------
-// Reads vibration time from central repository
-// ---------------------------------------------------------------------------
-//
-void CDiagVibratePlugin::ReadVibrationTimeL()
-    {
-    LOGSTRING( "CDiagVibratePlugin::ReadVibrationTimeL begin" );
-                
-    CRepository* repository = CRepository::NewLC( KCRUidDevDiagVibraTestPlugin );  
-         
-    User::LeaveIfError( repository->Get( KDevDiagVibraTestVibrateTime, iVibrationTime ) );
-    
-    CleanupStack::PopAndDestroy( repository );
-    
-    LOGSTRING( "CDiagVibratePlugin::ReadVibrationTimeL end" );
-    }
-    
-
-// End of File
--- a/devicediagnostics/diagplugins/diagvibrateplugin/src/diagvibratepluginImplementationtable.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-/*
-* 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:  ECOM proxy table for DiagVibratePlugin
-*
-*/
-
-
-// INCLUDES
-#include <e32std.h>
-#include <implementationproxy.h>
-
-#include "diagvibrateplugin.h"
-
-// CONSTANTS
-const TImplementationProxy KDiagVibratePluginImplementationTable[] = 
-    {
-    IMPLEMENTATION_PROXY_ENTRY( 0x2000E587, CDiagVibratePlugin::NewL )
-    };
-
-
-// ---------------------------------------------------------------------------
-// ImplementationGroupProxy
-// 
-// Gate/factory function
-// ---------------------------------------------------------------------------
-//
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy( 
-                                                  TInt& aTableCount )
-    {
-    aTableCount = sizeof( KDiagVibratePluginImplementationTable ) 
-        / sizeof( TImplementationProxy );
-        
-    return KDiagVibratePluginImplementationTable;
-    }
-
-// End of File
--- a/devicediagnostics/diagplugins/diagvibrateplugin/src/diagvibratepluginengine.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,187 +0,0 @@
-/*
-* 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:  Implements the vibration using CHWRMVibra
-*
-*/
-
-
-// INCLUDE FILES
-#include "diagvibratepluginengine.h"
-#include "diagvibratepluginobserver.h"
-
-#include <DiagFrameworkDebug.h> 
-// EXTERNAL DATA STRUCTURES
-
-// EXTERNAL FUNCTION PROTOTYPES
-
-// CONSTANTS
-static const TInt KMilliseconds = 1000;
-
-// MACROS
-
-// LOCAL CONSTANTS AND MACROS
-
-// MODULE DATA STRUCTURES
-
-// LOCAL FUNCTION PROTOTYPES
-
-// FORWARD DECLARATIONS
-
-// ============================= LOCAL FUNCTIONS ==============================
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// ----------------------------------------------------------------------------
-// CDiagVibratePluginEngine::CDiagVibratePluginEngine()
-//
-// Constructor
-// ----------------------------------------------------------------------------
-//
-CDiagVibratePluginEngine::CDiagVibratePluginEngine( MDiagVibratePluginObserver& aObserver )
-    : iObserver( aObserver )
-    {
-    }
-
-// ---------------------------------------------------------------------------
-// CDiagVibratePluginEngine::NewL()
-//
-// Symbian OS default constructor
-// ---------------------------------------------------------------------------
-//
-CDiagVibratePluginEngine* CDiagVibratePluginEngine::NewL( MDiagVibratePluginObserver& aObserver )
-    {
-    CDiagVibratePluginEngine* self = CDiagVibratePluginEngine::NewLC( aObserver );
-    CleanupStack::Pop( self );
-    return self;
-    }
-    
-
-// ---------------------------------------------------------------------------
-// CDiagVibratePluginEngine::NewLC()
-//
-// Symbian OS default constructor
-// ---------------------------------------------------------------------------
-//
-CDiagVibratePluginEngine* CDiagVibratePluginEngine::NewLC( MDiagVibratePluginObserver& aObserver )
-    {
-    CDiagVibratePluginEngine* self = new ( ELeave ) CDiagVibratePluginEngine( aObserver );
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    
-    return self;
-    }
-    
-
-// ---------------------------------------------------------------------------
-// CDiagVibratePluginEngine::ConstructL()
-//
-// Symbian OS two-phased constructor
-// ---------------------------------------------------------------------------
-//
-void CDiagVibratePluginEngine::ConstructL()
-    {
-    iVibra = CHWRMVibra::NewL(this);
-    }
-    
-
-// ----------------------------------------------------------------------------
-// CDiagVibratePluginEngine::~CDiagVibratePluginEngine
-//
-// Destructor
-// ----------------------------------------------------------------------------
-//    
-CDiagVibratePluginEngine::~CDiagVibratePluginEngine()
-    {
-    if (iVibra)
-        {    
-        iVibra->ReleaseVibra();
-        delete iVibra;
-        }    
-    }    
-
-
-// ---------------------------------------------------------------------------
-// From MHWRMVibraObserver
-// CDiagVibratePluginEngine::VibraStatusChanged()
-// ---------------------------------------------------------------------------
-//    
-void CDiagVibratePluginEngine::VibraStatusChanged(CHWRMVibra::TVibraStatus aStatus)
-    {
-    TVibrateStatus vibrateStatus = EVibrateFailed;
-    
-    switch(aStatus)
-        {
-        case CHWRMVibra::EVibraStatusOn:
-            vibrateStatus = EVibrateStarted;
-            break;
-
-        case CHWRMVibra::EVibraStatusStopped:
-            vibrateStatus = EVibrateEnded;
-            break;
-
-        case CHWRMVibra::EVibraStatusNotAllowed:
-            vibrateStatus = EVibrateBlocked;
-            break;
-        
-        case CHWRMVibra::EVibraStatusUnknown:
-        default:
-            break;
-        }
-        
-    iObserver.VibraStatusChanged( vibrateStatus );
-    }
-
-// ---------------------------------------------------------------------------
-// From MHWRMVibraObserver
-// CDiagVibratePluginEngine::VibraModeChanged()
-// ---------------------------------------------------------------------------
-//    
-void CDiagVibratePluginEngine::VibraModeChanged( CHWRMVibra::TVibraModeState aStatus )
-    {
-    switch (aStatus)
-        {
-        case CHWRMVibra::EVibraModeON:
-            break; //no need to do anything
-            
-        case CHWRMVibra::EVibraModeOFF:
-        case CHWRMVibra::EVibraModeUnknown: 
-        default: 
-            iObserver.VibraStatusChanged(EVibrateFailed);    
-            break;
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// Method to start the vibra
-// CDiagVibratePluginEngine::StartVibraL()
-// ---------------------------------------------------------------------------
-//    
-void CDiagVibratePluginEngine::StartVibraL( TInt aVibrationTime )
-    {
-    iVibra->ReserveVibraL();
-    iVibra->StartVibraL( aVibrationTime * KMilliseconds, KHWRMVibraMaxIntensity );
-    }
-
-
-// ---------------------------------------------------------------------------
-// Method to stop the vibra
-// CDiagVibratePluginEngine::StopVibra()
-// ---------------------------------------------------------------------------
-//    
-void CDiagVibratePluginEngine::StopVibra()
-    {
-    iVibra->ReleaseVibra();
-    }    
-
-// End of File
--- a/devicediagnostics/diagplugins/group/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-/*
-* 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:  Build information of all test suites.
-*
-*/
-
-#include "../diagbatterychargerplugin/group/bld.inf"
-#include "../diagbrowserplugin/group/bld.inf"
-#include "../diagdatanetworkplugin/group/bld.inf"
-#include "../diagearpieceplugin/group/bld.inf"
-#include "../diagexternalmediacardplugin/group/bld.inf"
-#include "../diagheadsetcableplugin/group/bld.inf"
-#include "../DiagInternalMemoryPlugin/group/bld.inf"
-#include "../diagloudspeakerplugin/group/bld.inf"
-#include "../diagnetcoverageplugin/group/bld.inf"
-#include "../diagusbcableplugin/group/bld.inf"
-#include "../diagvibrateplugin/group/bld.inf"
-//#include "../diagcameraplugin/group/bld.inf"
-//#include "../diaginternaldisplayplugin/group/bld.inf" // ADO & Platformization Changes
-//#include "../diagsmsussdwatcherplugins/group/bld.inf"
-
-// ADO & Platformization Changes
-//#include "../diagvideoshareplugin/group/bld.inf"
-//#include "../diagvoiceplugin/group/bld.inf"
-
-PRJ_PLATFORMS
-DEFAULT
-
-//  End of File
-
--- a/devicediagnostics/diagsuites/diagconnectivitysuiteplugin/data/devdiagconnectivitysuiteplugin.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-/*
-* 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:  Resource definitions for project Diagnostics Connectivity Suite. 
-*		 This rss file which contains the interface implementation information.
-*
-*/
-
-
-// Include Files
-#include <registryinfo.rh>
-#include "diagconnectivitysuiteplugin.hrh"
-
-RESOURCE REGISTRY_INFO pluginInfo
-    {
-    dll_uid     = _UID3;
-    interfaces  =
-        {
-        INTERFACE_INFO
-            {
-            interface_uid   = 0x2000AFEB;
-            implementations =
-                {
-                IMPLEMENTATION_INFO
-                    {
-                    implementation_uid  = _IMPLEMENTATION_UID;
-                    version_no          = 1;
-                    display_name        = "Connectivity Suite";
-                    default_data        = "0x2000E540";
-                    opaque_data         =   "<diagplugininfo>" 
-                                                "<order number=\"1\"/>"
-                                                "<serviceprovided name=\"Connectivity\"/>"
-                                            "</diagplugininfo>";
-                    }
-                };
-            }
-        };
-    }
-
-// End of File
--- a/devicediagnostics/diagsuites/diagconnectivitysuiteplugin/data/devdiagconnectivitysuitepluginrsc.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,97 +0,0 @@
-/*
-* 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:  Resource definitions for project Diagnostics Connectivity Suite.
-*
-*/
-
-
-// Resource Name Identifier
-NAME DCOS
-
-// Include Files
-#include <eikon.rh>
-#include <avkon.rh>
-#include <avkon.loc>
-#include <avkon.rsg>
-#include <diagconnectivitysuiteplugin.loc>
-#include "diagconnectivitysuiteplugin.hrh"
-
-// Resource Identifiers
-RESOURCE RSS_SIGNATURE { }
-RESOURCE TBUF { buf="DCOS"; }
-
-// ========================== RESOURCE DEFINITIONS ===========================
-
-// ---------------------------------------------------------------------------
-// r_diag_connectivity_suite_list_large_graphic
-// The suite's name in the main view listbox.
-// ---------------------------------------------------------------------------
-//
-RESOURCE TBUF r_diag_connectivity_suite_list_large_graphic
-    {
-    buf = qtn_diag_lst_view_my_hw;
-    }
-
-// ---------------------------------------------------------------------------
-// r_diag_connectivity_suite_heading_pane
-// The suite's name in the header of the dialog that is shown when starting
-// test execution.
-// ---------------------------------------------------------------------------
-//
-RESOURCE TBUF r_diag_connectivity_suite_heading_pane
-    {
-    buf = qtn_diag_msg_title_all_my_hw;
-    }
-
-// ---------------------------------------------------------------------------
-// r_diag_connectivity_suite_popup_info_pane
-// The body text of the dialog that is shown when starting test execution.
-// ---------------------------------------------------------------------------
-//
-RESOURCE TBUF r_diag_connectivity_suite_popup_info_pane
-    {
-    buf = qtn_diag_msg_all_my_hw;
-    }
-
-// ---------------------------------------------------------------------------
-// r_diag_connectivity_suite_title_pane
-// The title pane shown when hardware tests are running.
-// ---------------------------------------------------------------------------
-//
-RESOURCE TBUF r_diag_connectivity_suite_title_pane
-    {
-    buf = qtn_diag_title_connectivity;
-    }
-
-// ---------------------------------------------------------------------------
-// r_diag_connectivity_suite_list_single_graphic
-// Suite name in the suite view listbox.
-// ---------------------------------------------------------------------------
-//
-RESOURCE TBUF r_diag_connectivity_suite_list_single_graphic
-    {
-    buf = qtn_diag_folder_connectivity;
-    }
-
-// ---------------------------------------------------------------------------
-// r_diag_connectivity_suite_list_single
-// The suite's name in the results view.
-// ---------------------------------------------------------------------------
-//
-RESOURCE TBUF r_diag_connectivity_suite_list_single
-    {
-    buf = qtn_diag_folder_connectivity;
-    }
-
-// End of File
--- a/devicediagnostics/diagsuites/diagconnectivitysuiteplugin/group/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-/*
-* 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:  Build information file for project Diagnostics Connectivity Suite.
-*
-*/
-
-#include <platform_paths.hrh>
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-../loc/diagconnectivitysuiteplugin.loc        MW_LAYER_LOC_EXPORT_PATH(diagconnectivitysuiteplugin.loc)
-../rom_files/devdiagconnectivitysuiteplugin.iby   CORE_MW_LAYER_IBY_EXPORT_PATH(devdiagconnectivitysuiteplugin.iby)
-
-
-PRJ_EXTENSIONS
-#ifdef SBSV2
- 
- START EXTENSION s60/mifconv
- OPTION TARGETFILE devdiagconnectivitysuiteplugin.mif
- OPTION HEADERFILE devdiagconnectivitysuiteplugin.mbg
- OPTION SOURCES -c8,8 qgn_prop_cp_diag_conn
- END
-#endif
-
-PRJ_MMPFILES
-//gnumakefile diagconnectivitysuiteplugin_icons.mk
-diagconnectivitysuiteplugin.mmp
-
-#ifndef SBSV2
- 
- gnumakefile diagconnectivitysuiteplugin_icons.mk
- 
-#endif
-
-PRJ_TESTMMPFILES
-// None
-
-PRJ_TESTEXPORTS
-// None
-
-//  End of File
-
--- a/devicediagnostics/diagsuites/diagconnectivitysuiteplugin/group/diagconnectivitysuiteplugin.mmp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-/*
-* 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:  Project definition file for project connectivity Suite.
-*
-*/
-
-
-
-#include <platform_paths.hrh>
-#include  <data_caging_paths.hrh>
-
-TARGET                  devdiagconnectivitysuiteplugin.dll
-TARGETTYPE              PLUGIN
-UID                     0x10009D8D 0x2000E56F
-
-CAPABILITY              CAP_ECOM_PLUGIN
-VENDORID                VID_DEFAULT
-
-SOURCEPATH              ../src
-SOURCE                  diagconnectivitysuitepluginimplementationtable.cpp
-SOURCE                  diagconnectivitysuiteplugin.cpp
-
-START RESOURCE          ../data/devdiagconnectivitysuiteplugin.rss
-TARGET                  devdiagconnectivitysuiteplugin.rsc
-TARGETPATH              ECOM_RESOURCE_DIR
-END // RESOURCE
-
-START RESOURCE          ../data/devdiagconnectivitysuitepluginrsc.rss
-HEADER
-TARGETPATH              RESOURCE_FILES_DIR
-LANGUAGE_IDS
-END // RESOURCE
-
-USERINCLUDE             .
-USERINCLUDE             ../inc
-USERINCLUDE             ../data
-USERINCLUDE             ../loc
-
-APP_LAYER_SYSTEMINCLUDE
-SYSTEMINCLUDE           /epoc32/include/ecom
-
-LIBRARY                 euser.lib
-LIBRARY                 ecom.lib
-LIBRARY                 commonengine.lib
-LIBRARY                 aknicon.lib
-LIBRARY                 egul.lib
-LIBRARY                 flogger.lib
-LIBRARY                 diagframework.lib
-LIBRARY                 diagpluginbase.lib
-
-// End of File
-
--- a/devicediagnostics/diagsuites/diagconnectivitysuiteplugin/group/diagconnectivitysuiteplugin_icons.mk	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-#
-# Copyright © 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:
-#    This is a device diagnostics component
-
-ifeq (WINS,$(findstring WINS,$(PLATFORM)))
-ZDIR=\epoc32\release\$(PLATFORM)\udeb\z
-else
-ZDIR=\epoc32\data\z
-endif
-
-TARGETDIR=$(ZDIR)\resource\apps
-HEADERDIR=\epoc32\include
-ICONTARGETFILENAME=$(TARGETDIR)\devdiagconnectivitysuiteplugin.mif
-HEADERFILENAME=$(HEADERDIR)\devdiagconnectivitysuiteplugin.mbg
-
-MAKMAKE : 
-	mifconv $(ICONTARGETFILENAME) /h$(HEADERFILENAME) \
-		/c8,8 qgn_prop_cp_diag_conn.svg
-
-BLD : ;
-
-CLEAN : ;
-
-LIB : ;
-
-CLEANLIB : ;
-
-RESOURCE : ;
-
-FREEZE : ;
-
-SAVESPACE : ;
-
-RELEASABLES :
-	@echo $(ICONTARGETFILENAME) && \
-	@echo $(HEADERFILENAME)
-
-FINAL : ;
--- a/devicediagnostics/diagsuites/diagconnectivitysuiteplugin/inc/diagconnectivitysuiteplugin.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,103 +0,0 @@
-/*
-* 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:  This is the declaration of the Connectivity Suite Plugin class.
-*
-*/
-
-
-#ifndef DIAGCONNECTIVITYSUITEPLUGIN_H
-#define DIAGCONNECTIVITYSUITEPLUGIN_H
-
-// System Include Files
-#include <DiagSuitePluginBase.h>            // CDiagSuitePluginBase
-
-/**
- *  Diagnostics Connectivity Suite Plugin
- *  This class defines the Connectivity suite plugin.  This plugin is the container
- *  for all test plugins which test connectivity functionality.
- *
- *  @lib diagpluginbase.lib
- *  @lib diagframework.lib
- *  @lib commonengine.lib
- *  @lib aknicon.lib
- *  @lib egul.lib
- */
-class CDiagConnectivitySuitePlugin : public CDiagSuitePluginBase
-    {
-
-public: // New functions
-
-    /**
-     * Two-phased constructor.
-     *
-     * @return An instance of CDiagConnectivitySuitePlugin.
-     */
-    static MDiagPlugin* NewL( TAny* aInitParams );
-
-    /**
-    * Destructor.
-    */
-    ~CDiagConnectivitySuitePlugin();
-
-
-private: // New functions
-
-    /**
-     * The default constructor.
-     */
-    CDiagConnectivitySuitePlugin( CDiagPluginConstructionParam* aInitParams  );
-
-    /**
-     * Two-phased constructor.
-     */
-    void ConstructL();
-
-
-private: // From base class CDiagSuitePluginBase
-
-    /**
-    * @see CDiagSuitePluginBase::Visible()
-    */
-    virtual TBool IsVisible() const;
-
-    /**
-    * @see CDiagSuitePluginBase::GetPluginNameL
-    */
-    virtual HBufC* GetPluginNameL( TNameLayoutType aLayoutType ) const;
-
-    /**
-    * @see CDiagSuitePluginBase::Uid
-    */
-    virtual TUid Uid() const;
-
-    /**
-    * @see CDiagSuitePluginBase::CreateIconL
-    */
-    virtual CGulIcon* CreateIconL() const;
-
-
-private: // From base class CActive
-    /**
-    * Handle active object completion event
-    */
-    virtual void RunL();
-
-    /**
-    * Handle cancel
-    */
-    virtual void DoCancel();
-
-    };
-
-#endif // DIAGCONNECTIVITYSUITEPLUGIN_H
--- a/devicediagnostics/diagsuites/diagconnectivitysuiteplugin/inc/diagconnectivitysuiteplugin.hrh	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-/*
-* 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:  Resource headers for the Diagnostics Connectivity Suite
-*
-*/
-
-
-#ifndef DIAGCONNECTIVITYSUITEPLUGIN_HRH
-#define DIAGCONNECTIVITYSUITEPLUGIN_HRH
-
-// Definitions
-#define _UID3                   0x2000E56F
-#define _IMPLEMENTATION_UID     0x2000E570
-
-#endif // DIAGCONNECTIVITYSUITEPLUGIN_HRH
--- a/devicediagnostics/diagsuites/diagconnectivitysuiteplugin/inc/diagconnectivitysuiteplugin.pan	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-/*
-* 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:  Panic functionality for the Hardware Suite Plugin.
-*
-*/
-
-
-#ifndef DIAGCONNECTIVITYSUITEPLUGIN_PAN
-#define DIAGCONNECTIVITYSUITEPLUGIN_PAN
-
-// Data Types
-
-/** Hardware Suite panic codes.  These are used to identify specific reasons
- *  why the suite has panicked.
- */
-enum TDiagConnectivitySuitePluginPanics
-    {
-    EDiagConnectivitySuitePluginConstruction = 1,
-    EDiagConnectivitySuitePluginBadArgument
-    };
-
-inline void Panic( TDiagConnectivitySuitePluginPanics aReason )
-    {
-    _LIT( KDiagConnectivitySuiteName,"Connectivity Suite" );
-    User::Panic( KDiagConnectivitySuiteName, aReason );
-    }
-
-#endif // DIAGCONNECTIVITYSUITEPLUGIN_PAN
--- a/devicediagnostics/diagsuites/diagconnectivitysuiteplugin/loc/diagconnectivitysuiteplugin.loc	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-/*
-* 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:  Localization strings for project Diagnostics Connectivity Suite
-*
-*/
-
-
-
-//d:Suite name in the main view listbox.  This text indicate that the suite
-//d:will be opened so that its children may be viewed and executed.
-//l:title_pane_t2/opt12
-//r:3.2.1
-//
-
-#define qtn_diag_title_connectivity "Connectivity"
-
-
-//d:Suite name in the results view listbox.
-//l:list_single_large_graphic_pane_t1
-//r:3.2.1
-//
-
-#define qtn_diag_folder_connectivity "Connectivity"
-
-// End of File
--- a/devicediagnostics/diagsuites/diagconnectivitysuiteplugin/rom_files/devdiagconnectivitysuiteplugin.iby	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-/*
-* 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:  Image description file for project Connectivity Suite Plugin
-*
-*/
-
-
-#ifndef DIAGCONNECTIVITYUITEPLUGIN_IBY
-#define DIAGCONNECTIVITYUITEPLUGIN_IBY
-#ifdef FF_DEVICE_DIAGNOSTICS_APP 
-
-#include <data_caging_paths_for_iby.hrh>
-
-ECOM_PLUGIN( devdiagconnectivitysuiteplugin.dll, devdiagconnectivitysuiteplugin.rsc )
-data=\epoc32\data\Z\resource\devdiagconnectivitysuitepluginrsc.rsc 		  RESOURCE_FILES_DIR\devdiagconnectivitysuitepluginrsc.rsc
-data=\epoc32\data\Z\resource\apps\devdiagconnectivitysuiteplugin.mif      APP_RESOURCE_DIR\devdiagconnectivitysuiteplugin.mif
-
-#endif
-
-#endif // DIAGCONNECTIVITYUITEPLUGIN_IBY
-
--- a/devicediagnostics/diagsuites/diagconnectivitysuiteplugin/src/diagconnectivitysuiteplugin.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,197 +0,0 @@
-/*
-* 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:  This is the implementation of the Connectivity Diagnostics
-*                Suite, which is used to contain all tests and suites.
-*
-*/
-
-
-// System Include Files
-#include <DiagFrameworkDebug.h>             // Debugging Macros
-#include <StringLoader.h>                   // StringLoader
-#include <gulicon.h>                        // CGulIcon
-#include <AknIconUtils.h>                   // AknIconUtils
-#include <devdiagconnectivitysuitepluginrsc.rsg>   // Resource Definitions
-#include <devdiagconnectivitysuiteplugin.mbg>      // Icon Indices
-
-// User Include Files
-#include "diagconnectivitysuiteplugin.h"        // CDiagConnectivitySuitePlugin
-#include "diagconnectivitysuiteplugin.hrh"      // UID definition
-#include "diagconnectivitysuiteplugin.pan"      // Panic
-
-// Local Constants
-_LIT( KDiagConnectivitySuitePluginResourceFileName,
-      "z:devdiagconnectivitysuitepluginrsc.rsc" );
-const TUid KDiagConnectivitySuitePluginUid = { _UID3 };
-
-
-// ============================ GLOBAL FUNCTIONS =============================
-
-// ---------------------------------------------------------------------------
-// Static two-phase constructor.
-// ---------------------------------------------------------------------------
-//
-MDiagPlugin* CDiagConnectivitySuitePlugin::NewL( TAny* aInitParams )
-    {
-    LOGSTRING2( "CDiagConnectivitySuitePlugin::NewL( 0x%x )", aInitParams )
-
-    __ASSERT_ALWAYS( aInitParams,
-                     Panic( EDiagConnectivitySuitePluginConstruction ) );
-
-    // Construct the plugin.  The base class will take ownership of the
-    // initialization parameters.
-    CDiagPluginConstructionParam* param =
-            static_cast< CDiagPluginConstructionParam* >( aInitParams );
-
-    CleanupStack::PushL( param );
-    CDiagConnectivitySuitePlugin* self =
-        new( ELeave ) CDiagConnectivitySuitePlugin( param );
-    CleanupStack::Pop( param );
-
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );
-
-    return self;
-    }
-
-// ---------------------------------------------------------------------------
-// Destructor.
-// ---------------------------------------------------------------------------
-//
-CDiagConnectivitySuitePlugin::~CDiagConnectivitySuitePlugin()
-    {
-    LOGSTRING( "CDiagConnectivitySuitePlugin::~CDiagConnectivitySuitePlugin()" )
-
-    }
-
-// ---------------------------------------------------------------------------
-// The default constructor.
-// ---------------------------------------------------------------------------
-//
-CDiagConnectivitySuitePlugin::CDiagConnectivitySuitePlugin(
-    CDiagPluginConstructionParam* aParam )
-:   CDiagSuitePluginBase( aParam )
-    {
-    LOGSTRING2(
-        "CDiagConnectivitySuitePlugin::CDiagConnectivitySuitePlugin( 0x%x )",
-        aParam )
-
-    }
-
-// ---------------------------------------------------------------------------
-// The second phase constructor.
-// ---------------------------------------------------------------------------
-//
-void CDiagConnectivitySuitePlugin::ConstructL()
-    {
-    LOGSTRING( "CDiagConnectivitySuitePlugin::ConstructL()" );
-    BaseConstructL ( KDiagConnectivitySuitePluginResourceFileName );
-    }
-
-// ---------------------------------------------------------------------------
-// From class MDiagPlugin.
-// Returns whether the plugin should be displayed or not.
-// ---------------------------------------------------------------------------
-TBool CDiagConnectivitySuitePlugin::IsVisible() const
-    {
-    return ETrue;
-    }
-
-// ---------------------------------------------------------------------------
-// From class MDiagPlugin.
-// Returns the plugin name.
-// ---------------------------------------------------------------------------
-HBufC* CDiagConnectivitySuitePlugin::GetPluginNameL(
-    TNameLayoutType aLayoutType ) const
-    {
-    switch ( aLayoutType )
-        {
-        case ENameLayoutListLargeGraphic:
-            return StringLoader::LoadL( R_DIAG_CONNECTIVITY_SUITE_LIST_LARGE_GRAPHIC );
-
-        case ENameLayoutHeadingPane:
-            return StringLoader::LoadL( R_DIAG_CONNECTIVITY_SUITE_HEADING_PANE );
-
-        case ENameLayoutPopupInfoPane:
-            return StringLoader::LoadL( R_DIAG_CONNECTIVITY_SUITE_POPUP_INFO_PANE );
-
-        case ENameLayoutTitlePane:
-            return StringLoader::LoadL( R_DIAG_CONNECTIVITY_SUITE_TITLE_PANE );
-
-        case ENameLayoutListSingleGraphic:
-            return StringLoader::LoadL( R_DIAG_CONNECTIVITY_SUITE_LIST_SINGLE_GRAPHIC );
-
-        case ENameLayoutListSingle:
-            return StringLoader::LoadL( R_DIAG_CONNECTIVITY_SUITE_LIST_SINGLE );
-
-        default:
-            __ASSERT_DEBUG( EFalse,
-                            Panic( EDiagConnectivitySuitePluginBadArgument ) );
-            return StringLoader::LoadL( R_DIAG_CONNECTIVITY_SUITE_LIST_LARGE_GRAPHIC );
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// From class MDiagPlugin.
-// Returns the plugin's UID.
-// ---------------------------------------------------------------------------
-TUid CDiagConnectivitySuitePlugin::Uid() const
-    {
-    return KDiagConnectivitySuitePluginUid;
-    }
-
-// ---------------------------------------------------------------------------
-// From class MDiagPlugin.
-// Load the plugin's icon.
-// ---------------------------------------------------------------------------
-//
-CGulIcon* CDiagConnectivitySuitePlugin::CreateIconL() const
-    {
-    LOGSTRING( "CDiagConnectivitySuitePlugin::CreateIconL()" )
-
-    _LIT( KDiagConnectivitySuitePluginIconFile,
-          "\\resource\\apps\\devdiagconnectivitysuiteplugin.mif" );
-
-    // Load the icon.
-    CFbsBitmap* bitmap;
-    CFbsBitmap* mask;
-    AknIconUtils::CreateIconL(
-        bitmap,
-        mask,
-        KDiagConnectivitySuitePluginIconFile(),
-        EMbmDevdiagconnectivitysuitepluginQgn_prop_cp_diag_conn,
-        EMbmDevdiagconnectivitysuitepluginQgn_prop_cp_diag_conn_mask );
-
-    // Create the icon.
-    return CGulIcon::NewL( bitmap, mask );
-    }
-
-// ---------------------------------------------------------------------------
-// From class CActive.
-// Active object run handler.
-// ---------------------------------------------------------------------------
-void CDiagConnectivitySuitePlugin::RunL()
-    {
-    }
-
-// ---------------------------------------------------------------------------
-// From class CActive.
-// Active object cancel.
-// ---------------------------------------------------------------------------
-void CDiagConnectivitySuitePlugin::DoCancel()
-    {
-    }
-
-// End of File
--- a/devicediagnostics/diagsuites/diagconnectivitysuiteplugin/src/diagconnectivitysuitepluginimplementationtable.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-/*
-* 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:  This is the ECOM implementation table for the Hardware Suite
-*                Plugin.
-*
-*/
-
-
-// System Include Files
-#include <implementationproxy.h>            // TImplementationProxy
-
-// User Include Files
-#include "diagconnectivitysuiteplugin.h"        // CDiagConnectivitySuitePlugin
-#include "diagconnectivitysuiteplugin.hrh"      // UID Defintions
-
-// Local Constants
-const TImplementationProxy KDiagConnectivitySuitePluginImplementationTable[] =
-	{
-	IMPLEMENTATION_PROXY_ENTRY(
-	    _IMPLEMENTATION_UID,
-	    CDiagConnectivitySuitePlugin::NewL )
-	};
-
-
-// ============================ GLOBAL FUNCTIONS =============================
-
-// ---------------------------------------------------------------------------
-// Returns the implementation table.
-// ---------------------------------------------------------------------------
-//
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy(
-    TInt& aTableCount )
-	{
-	aTableCount = sizeof( KDiagConnectivitySuitePluginImplementationTable ) /
-	    sizeof( TImplementationProxy );
-	return KDiagConnectivitySuitePluginImplementationTable;
-	}
-
-// End of File
--- a/devicediagnostics/diagsuites/diagcoveragesuiteplugin/data/devdiagcoveragesuiteplugin.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-/*
-* 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:  Resource definitions for project Diagnostics Coverage Suite.
-*
-*/
-
-
-// Include Files
-#include <registryinfo.rh>
-#include "diagcoveragesuiteplugin.hrh"
-
-RESOURCE REGISTRY_INFO pluginInfo
-    {
-    dll_uid     = _UID3;
-    interfaces  =
-        {
-        INTERFACE_INFO
-            {
-            interface_uid   = 0x2000AFEB;
-            implementations =
-                {
-                IMPLEMENTATION_INFO
-                    {
-                    implementation_uid  = _IMPLEMENTATION_UID;
-                    version_no          = 1;
-                    display_name        = "Coverage Suite";
-                    default_data        = "0x2000E540";
-                    opaque_data         =   "<diagplugininfo>" 
-                                                "<order number=\"3\"/>"
-                                                "<serviceprovided name=\"Coverage Suite\"/>"
-                                            "</diagplugininfo>";
-                    }
-                };
-            }
-        };
-    }
-
-// End of File
-
--- a/devicediagnostics/diagsuites/diagcoveragesuiteplugin/data/devdiagcoveragesuitepluginrsc.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,97 +0,0 @@
-/*
-* 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:  Resource definitions for project Diagnostics Coverage Suite.
-*
-*/
-
-
-// Resource Name Identifier
-NAME DCVS
-
-// Include Files
-#include <eikon.rh>
-#include <avkon.rh>
-#include <avkon.loc>
-#include <avkon.rsg>
-#include <diagcoveragesuiteplugin.loc>
-#include "diagcoveragesuiteplugin.hrh"
-
-// Resource Identifiers
-RESOURCE RSS_SIGNATURE { }
-RESOURCE TBUF { buf="DCVS"; }
-
-// ========================== RESOURCE DEFINITIONS ===========================
-
-// ---------------------------------------------------------------------------
-// r_diag_coverage_suite_list_large_graphic
-// The suite's name in the main view listbox.
-// ---------------------------------------------------------------------------
-//
-RESOURCE TBUF r_diag_coverage_suite_list_large_graphic
-    {
-    buf = qtn_diag_lst_view_my_coverage;
-    }
-
-// ---------------------------------------------------------------------------
-// r_diag_coverage_suite_heading_pane
-// The suite's name in the header of the dialog that is shown when starting
-// test execution.
-// ---------------------------------------------------------------------------
-//
-RESOURCE TBUF r_diag_coverage_suite_heading_pane
-    {
-    buf = qtn_diag_msg_title_all_my_coverage;
-    }
-
-// ---------------------------------------------------------------------------
-// r_diag_coverage_suite_popup_info_pane
-// The body text of the dialog that is shown when starting test execution.
-// ---------------------------------------------------------------------------
-//
-RESOURCE TBUF r_diag_coverage_suite_popup_info_pane
-    {
-    buf = qtn_diag_msg_all_my_coverage;
-    }
-
-// ---------------------------------------------------------------------------
-// r_diag_coverage_suite_title_pane
-// The title pane shown when coverage tests are running.
-// ---------------------------------------------------------------------------
-//
-RESOURCE TBUF r_diag_coverage_suite_title_pane
-    {
-    buf = qtn_diag_title_coverage;
-    }
-
-// ---------------------------------------------------------------------------
-// r_diag_coverage_suite_list_single_graphic
-// Suite name in the suite view listbox.
-// ---------------------------------------------------------------------------
-//
-RESOURCE TBUF r_diag_coverage_suite_list_single_graphic
-    {
-    buf = qtn_diag_folder_coverage;
-    }
-
-// ---------------------------------------------------------------------------
-// r_diag_coverage_suite_list_single
-// The suite's name in the results view.
-// ---------------------------------------------------------------------------
-//
-RESOURCE TBUF r_diag_coverage_suite_list_single
-    {
-    buf = qtn_diag_folder_coverage;
-    }
-
-// End of File
--- a/devicediagnostics/diagsuites/diagcoveragesuiteplugin/group/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-/*
-* 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:  Build information file for project Diagnostics Coverage Suite.
-*
-*/
-
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-../loc/diagcoveragesuiteplugin.loc        MW_LAYER_LOC_EXPORT_PATH(diagcoveragesuiteplugin.loc)
-../rom_files/devdiagcoveragesuiteplugin.iby   CORE_MW_LAYER_IBY_EXPORT_PATH(devdiagcoveragesuiteplugin.iby)
-
-
-PRJ_EXTENSIONS
-#ifdef SBSV2
- 
- START EXTENSION s60/mifconv
- OPTION TARGETFILE devdiagcoveragesuiteplugin.mif
- OPTION HEADERFILE devdiagcoveragesuiteplugin.mbg
- OPTION SOURCES -c8,8 qgn_prop_cp_diag_coverage
- END
-
-#endif
-
-PRJ_MMPFILES
-//gnumakefile diagcoveragesuiteplugin_icons.mk
-diagcoveragesuiteplugin.mmp
-
-#ifndef SBSV2
- gnumakefile diagcoveragesuiteplugin_icons.mk
-#endif
-
-PRJ_TESTMMPFILES
-// None
-
-PRJ_TESTEXPORTS
-// None
-
-//  End of File
-
--- a/devicediagnostics/diagsuites/diagcoveragesuiteplugin/group/diagcoveragesuiteplugin.mmp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-/*
-* 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:  Project definition file for project Diagnostics Coverage Suite.
-*
-*/
-
-
-#include <platform_paths.hrh>
-#include <data_caging_paths.hrh>
-
-TARGET                  devdiagcoveragesuiteplugin.dll
-TARGETTYPE              PLUGIN
-UID                     0x10009D8D 0x2000E56B
-
-CAPABILITY              CAP_ECOM_PLUGIN
-VENDORID                VID_DEFAULT
-
-SOURCEPATH              ../src
-SOURCE                  diagcoveragesuitepluginimplementationtable.cpp
-SOURCE                  diagcoveragesuiteplugin.cpp
-
-START RESOURCE          ../data/devdiagcoveragesuiteplugin.rss
-TARGET                  devdiagcoveragesuiteplugin.rsc
-TARGETPATH              ECOM_RESOURCE_DIR
-END // RESOURCE
-
-START RESOURCE          ../data/devdiagcoveragesuitepluginrsc.rss
-HEADER
-TARGETPATH              RESOURCE_FILES_DIR
-LANGUAGE_IDS
-END // RESOURCE
-
-USERINCLUDE             .
-USERINCLUDE             ../inc
-USERINCLUDE             ../data
-USERINCLUDE             ../loc
-
-APP_LAYER_SYSTEMINCLUDE
-SYSTEMINCLUDE           /epoc32/include/ecom
-
-LIBRARY                 euser.lib
-LIBRARY                 ecom.lib
-LIBRARY                 commonengine.lib
-LIBRARY                 aknicon.lib
-LIBRARY                 egul.lib
-LIBRARY                 flogger.lib
-LIBRARY                 diagframework.lib
-LIBRARY                 diagpluginbase.lib
-
-// End of File
-
--- a/devicediagnostics/diagsuites/diagcoveragesuiteplugin/group/diagcoveragesuiteplugin_icons.mk	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-#
-# Copyright © 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:
-#    This is a device diagnostics component
-
-ifeq (WINS,$(findstring WINS,$(PLATFORM)))
-ZDIR=\epoc32\release\$(PLATFORM)\udeb\z
-else
-ZDIR=\epoc32\data\z
-endif
-
-TARGETDIR=$(ZDIR)\resource\apps
-HEADERDIR=\epoc32\include
-ICONTARGETFILENAME=$(TARGETDIR)\devdiagcoveragesuiteplugin.mif
-HEADERFILENAME=$(HEADERDIR)\devdiagcoveragesuiteplugin.mbg
-
-MAKMAKE : 
-	mifconv $(ICONTARGETFILENAME) /h$(HEADERFILENAME) \
-		/c8,8 qgn_prop_cp_diag_coverage.svg
-
-BLD : ;
-
-CLEAN : ;
-
-LIB : ;
-
-CLEANLIB : ;
-
-RESOURCE : ;
-
-FREEZE : ;
-
-SAVESPACE : ;
-
-RELEASABLES :
-	@echo $(ICONTARGETFILENAME) && \
-	@echo $(HEADERFILENAME)
-
-FINAL : ;
--- a/devicediagnostics/diagsuites/diagcoveragesuiteplugin/inc/diagcoveragesuiteplugin.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,104 +0,0 @@
-/*
-* 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:  This is the declaration of the Coverage Suite Plugin class.
-*
-*/
-
-
-#ifndef DIAGCOVERAGESUITEPLUGIN_H
-#define DIAGCOVERAGESUITEPLUGIN_H
-
-// System Include Files
-#include <DiagSuitePluginBase.h>            // CDiagSuitePluginBase
-
-/**
- *  Diagnostics Coverage Suite Plugin
- *  This class defines the coverage suite plugin.  This plugin is the container
- *  for all test plugins which test coverage functionality.
- *
- *  @lib diagpluginbase.lib
- *  @lib diagframework.lib
- *  @lib commonengine.lib
- *  @lib aknicon.lib
- *  @lib egul.lib
- */
-class CDiagCoverageSuitePlugin : public CDiagSuitePluginBase
-    {
-
-public: // New functions
-
-    /**
-     * Two-phased constructor.
-     *
-     * @return An instance of CDiagCoverageSuitePlugin.
-     */
-    static MDiagPlugin* NewL( TAny* aInitParams );
-
-    /**
-    * Destructor.
-    */
-    ~CDiagCoverageSuitePlugin();
-
-
-private: // New functions
-
-    /**
-     * The default constructor.
-     */
-    CDiagCoverageSuitePlugin( CDiagPluginConstructionParam* aInitParams  );
-
-    /**
-     * Two-phased constructor.
-     */
-    void ConstructL();
-
-
-private: // From base class CDiagSuitePluginBase
-
-    /**
-    * @see CDiagSuitePluginBase::Visible()
-    */
-    virtual TBool IsVisible() const;
-
-    /**
-    * @see CDiagSuitePluginBase::GetPluginNameL
-    */
-    virtual HBufC* GetPluginNameL( TNameLayoutType aLayoutType ) const;
-
-    /**
-    * @see CDiagSuitePluginBase::Uid
-    */
-    virtual TUid Uid() const;
-
-    /**
-    * @see CDiagSuitePluginBase::CreateIconL
-    */
-    virtual CGulIcon* CreateIconL() const;
-
-
-private: // From base class CActive
-    /**
-    * Handle active object completion event
-    */
-    virtual void RunL();
-
-    /**
-    * Handle cancel
-    */
-    virtual void DoCancel();
-
-    };
-
-#endif // DIAGCOVERAGESUITEPLUGIN_H
-
--- a/devicediagnostics/diagsuites/diagcoveragesuiteplugin/inc/diagcoveragesuiteplugin.hrh	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-/*
-* 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:  Resource headers for the Diagnostics Coverage Suite
-*
-*/
-
-
-#ifndef DIAGCOVERAGESUITEPLUGIN_HRH
-#define DIAGCOVERAGESUITEPLUGIN_HRH
-
-// Definitions
-#define _UID3                   0x2000E56B
-#define _IMPLEMENTATION_UID     0x2000E56C
-
-#endif // DIAGCOVERAGESUITEPLUGIN_HRH
--- a/devicediagnostics/diagsuites/diagcoveragesuiteplugin/inc/diagcoveragesuiteplugin.pan	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-/*
-* 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:  Panic functionality for the Coverage Suite Plugin.
-*
-*/
-
-
-#ifndef DIAGCOVERAGESUITEPLUGIN_PAN
-#define DIAGCOVERAGESUITEPLUGIN_PAN
-
-// Data Types
-
-/** Coverage Suite panic codes.  These are used to identify specific reasons
- *  why the suite has panicked.
- */
-enum TDiagCoverageSuitePluginPanics
-    {
-    EDiagCoverageSuitePluginConstruction = 1,
-    EDiagCoverageSuitePluginBadArgument
-    };
-
-inline void Panic( TDiagCoverageSuitePluginPanics aReason )
-    {
-    _LIT( KDiagCoverageSuiteName,"Coverage Suite" );
-    User::Panic( KDiagCoverageSuiteName, aReason );
-    }
-
-#endif // DIAGCOVERAGESUITEPLUGIN_PAN
-
--- a/devicediagnostics/diagsuites/diagcoveragesuiteplugin/loc/diagcoveragesuiteplugin.loc	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-/*
-* 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:  Localization strings for project Diagnostics Coverage Suite
-*
-*/
-
-//d:Suite name in the main view listbox.  This text indicate that the suite
-//d:will be opened so that its children may be viewed and executed.
-//l:title_pane_t2/opt12
-//r:3.2.1
-//
-
-#define qtn_diag_title_coverage "Coverage"
-
-//d:Suite name in the results view listbox.
-//l:list_single_large_graphic_pane_t1
-//r:3.2.1
-//
-
-#define qtn_diag_folder_coverage "Coverage"
-
-// End of File
--- a/devicediagnostics/diagsuites/diagcoveragesuiteplugin/rom_files/devdiagcoveragesuiteplugin.iby	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-/*
-* 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:  Image description file for project Coverage Suite Plugin
-*
-*/
-
-
-#ifndef DEVDIAGCOVERAGESUITEPLUGIN_IBY
-#define DEVDIAGCOVERAGESUITEPLUGIN_IBY
-
-#ifdef FF_DEVICE_DIAGNOSTICS_APP 
-
-#include <data_caging_paths_for_iby.hrh>
-
-ECOM_PLUGIN( devdiagcoveragesuiteplugin.dll, devdiagcoveragesuiteplugin.rsc )
-data=\epoc32\data\Z\resource\devdiagcoveragesuitepluginrsc.rsc RESOURCE_FILES_DIR\devdiagcoveragesuitepluginrsc.rsc
-data=\epoc32\data\Z\resource\apps\devdiagcoveragesuiteplugin.mif      APP_RESOURCE_DIR\devdiagcoveragesuiteplugin.mif
-
-#endif
-
-#endif // DEVDIAGCOVERAGESUITEPLUGIN_IBY
-
--- a/devicediagnostics/diagsuites/diagcoveragesuiteplugin/src/diagcoveragesuiteplugin.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,197 +0,0 @@
-/*
-* 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:  This is the implementation of the Coverage Diagnostics
-*                Suite, which is used to contain all tests and suites.
-*
-*/
-
-
-// System Include Files
-#include <DiagFrameworkDebug.h>             // Debugging Macros
-#include <StringLoader.h>                   // StringLoader
-#include <gulicon.h>                        // CGulIcon
-#include <AknIconUtils.h>                   // AknIconUtils
-#include <devdiagcoveragesuitepluginrsc.rsg>   // Resource Definitions
-#include <devdiagcoveragesuiteplugin.mbg>      // Icon Indices
-
-// User Include Files
-#include "diagcoveragesuiteplugin.h"        // CDiagCoverageSuitePlugin
-#include "diagcoveragesuiteplugin.hrh"      // UID definition
-#include "diagcoveragesuiteplugin.pan"      // Panic
-
-// Local Constants
-_LIT( KDiagCoverageSuitePluginResourceFileName,
-      "z:devdiagcoveragesuitepluginrsc.rsc" );
-const TUid KDiagCoverageSuitePluginUid = { _UID3 };
-
-
-// ============================ GLOBAL FUNCTIONS =============================
-
-// ---------------------------------------------------------------------------
-// Static two-phase constructor.
-// ---------------------------------------------------------------------------
-//
-MDiagPlugin* CDiagCoverageSuitePlugin::NewL( TAny* aInitParams )
-    {
-    LOGSTRING2( "CDiagCoverageSuitePlugin::NewL( 0x%x )", aInitParams )
-
-    __ASSERT_ALWAYS( aInitParams,
-                     Panic( EDiagCoverageSuitePluginConstruction ) );
-
-    // Construct the plugin.  The base class will take ownership of the
-    // initialization parameters.
-    CDiagPluginConstructionParam* param =
-            static_cast< CDiagPluginConstructionParam* >( aInitParams );
-
-    CleanupStack::PushL( param );
-    CDiagCoverageSuitePlugin* self =
-        new( ELeave ) CDiagCoverageSuitePlugin( param );
-    CleanupStack::Pop( param );
-
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );
-
-    return self;
-    }
-
-// ---------------------------------------------------------------------------
-// Destructor.
-// ---------------------------------------------------------------------------
-//
-CDiagCoverageSuitePlugin::~CDiagCoverageSuitePlugin()
-    {
-    LOGSTRING( "CDiagCoverageSuitePlugin::~CDiagCoverageSuitePlugin()" )
-
-    }
-
-// ---------------------------------------------------------------------------
-// The default constructor.
-// ---------------------------------------------------------------------------
-//
-CDiagCoverageSuitePlugin::CDiagCoverageSuitePlugin(
-    CDiagPluginConstructionParam* aParam )
-:   CDiagSuitePluginBase( aParam )
-    {
-    LOGSTRING2(
-        "CDiagCoverageSuitePlugin::CDiagCoverageSuitePlugin( 0x%x )",
-        aParam )
-
-    }
-
-// ---------------------------------------------------------------------------
-// The second phase constructor.
-// ---------------------------------------------------------------------------
-//
-void CDiagCoverageSuitePlugin::ConstructL()
-    {
-    LOGSTRING( "CDiagCoverageSuitePlugin::ConstructL()" );
-    BaseConstructL ( KDiagCoverageSuitePluginResourceFileName );
-    }
-
-// ---------------------------------------------------------------------------
-// From class MDiagPlugin.
-// Returns whether the plugin should be displayed or not.
-// ---------------------------------------------------------------------------
-TBool CDiagCoverageSuitePlugin::IsVisible() const
-    {
-    return ETrue;
-    }
-
-// ---------------------------------------------------------------------------
-// From class MDiagPlugin.
-// Returns the plugin name.
-// ---------------------------------------------------------------------------
-HBufC* CDiagCoverageSuitePlugin::GetPluginNameL(
-    TNameLayoutType aLayoutType ) const
-    {
-    switch ( aLayoutType )
-        {
-        case ENameLayoutListLargeGraphic:
-            return StringLoader::LoadL( R_DIAG_COVERAGE_SUITE_LIST_LARGE_GRAPHIC );
-
-        case ENameLayoutHeadingPane:
-            return StringLoader::LoadL( R_DIAG_COVERAGE_SUITE_HEADING_PANE );
-
-        case ENameLayoutPopupInfoPane:
-            return StringLoader::LoadL( R_DIAG_COVERAGE_SUITE_POPUP_INFO_PANE );
-
-        case ENameLayoutTitlePane:
-            return StringLoader::LoadL( R_DIAG_COVERAGE_SUITE_TITLE_PANE );
-
-        case ENameLayoutListSingleGraphic:
-            return StringLoader::LoadL( R_DIAG_COVERAGE_SUITE_LIST_SINGLE_GRAPHIC );
-
-        case ENameLayoutListSingle:
-            return StringLoader::LoadL( R_DIAG_COVERAGE_SUITE_LIST_SINGLE );
-
-        default:
-            __ASSERT_DEBUG( EFalse,
-                            Panic( EDiagCoverageSuitePluginBadArgument ) );
-            return StringLoader::LoadL( R_DIAG_COVERAGE_SUITE_LIST_LARGE_GRAPHIC );
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// From class MDiagPlugin.
-// Returns the plugin's UID.
-// ---------------------------------------------------------------------------
-TUid CDiagCoverageSuitePlugin::Uid() const
-    {
-    return KDiagCoverageSuitePluginUid;
-    }
-
-// ---------------------------------------------------------------------------
-// From class MDiagPlugin.
-// Load the plugin's icon.
-// ---------------------------------------------------------------------------
-//
-CGulIcon* CDiagCoverageSuitePlugin::CreateIconL() const
-    {
-    LOGSTRING( "CDiagCoverageSuitePlugin::CreateIconL()" )
-
-    _LIT( KDiagCoverageSuitePluginIconFile,
-          "\\resource\\apps\\devdiagcoveragesuiteplugin.mif" );
-
-    // Load the icon.
-    CFbsBitmap* bitmap;
-    CFbsBitmap* mask;
-    AknIconUtils::CreateIconL(
-        bitmap,
-        mask,
-        KDiagCoverageSuitePluginIconFile(),
-        EMbmDevdiagcoveragesuitepluginQgn_prop_cp_diag_coverage,
-        EMbmDevdiagcoveragesuitepluginQgn_prop_cp_diag_coverage_mask );
-
-    // Create the icon.
-    return CGulIcon::NewL( bitmap, mask );
-    }
-
-// ---------------------------------------------------------------------------
-// From class CActive.
-// Active object run handler.
-// ---------------------------------------------------------------------------
-void CDiagCoverageSuitePlugin::RunL()
-    {
-    }
-
-// ---------------------------------------------------------------------------
-// From class CActive.
-// Active object cancel.
-// ---------------------------------------------------------------------------
-void CDiagCoverageSuitePlugin::DoCancel()
-    {
-    }
-
-// End of File
--- a/devicediagnostics/diagsuites/diagcoveragesuiteplugin/src/diagcoveragesuitepluginimplementationtable.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-/*
-* 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:  This is the ECOM implementation table for the Coverage Suite
-*                Plugin.
-*
-*/
-
-
-// System Include Files
-#include <implementationproxy.h>            // TImplementationProxy
-
-// User Include Files
-#include "diagcoveragesuiteplugin.h"        // CDiagCoverageSuitePlugin
-#include "diagcoveragesuiteplugin.hrh"      // UID Defintions
-
-// Local Constants
-const TImplementationProxy KDiagCoverageSuitePluginImplementationTable[] =
-	{
-	IMPLEMENTATION_PROXY_ENTRY(
-	    _IMPLEMENTATION_UID,
-	    CDiagCoverageSuitePlugin::NewL )
-	};
-
-
-// ============================ GLOBAL FUNCTIONS =============================
-
-// ---------------------------------------------------------------------------
-// Returns the implementation table.
-// ---------------------------------------------------------------------------
-//
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy(
-    TInt& aTableCount )
-	{
-	aTableCount = sizeof( KDiagCoverageSuitePluginImplementationTable ) /
-	    sizeof( TImplementationProxy );
-	return KDiagCoverageSuitePluginImplementationTable;
-	}
-
-// End of File
--- a/devicediagnostics/diagsuites/diaghardwaresuiteplugin/data/devdiaghardwaresuiteplugin.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-/*
-* 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:  Resource definitions for project Diagnostics Hardware Suite.
-*
-*/
-
-
-// Include Files
-#include <registryinfo.rh>
-#include "diaghardwaresuiteplugin.hrh"
-
-RESOURCE REGISTRY_INFO pluginInfo
-    {
-    dll_uid     = _UID3;
-    interfaces  =
-        {
-        INTERFACE_INFO
-            {
-            interface_uid   = 0x2000AFEB;
-            implementations =
-                {
-                IMPLEMENTATION_INFO
-                    {
-                    implementation_uid  = _IMPLEMENTATION_UID;
-                    version_no          = 1;
-                    display_name        = "Hardware Suite";
-                    default_data        = "0x2000E540";
-                    opaque_data         =   "<diagplugininfo>" 
-                                                "<order number=\"0\"/>"
-                                                "<serviceprovided name=\"Hardware\"/>"
-                                            "</diagplugininfo>";
-                    }
-                };
-            }
-        };
-    }
-
-// End of File
--- a/devicediagnostics/diagsuites/diaghardwaresuiteplugin/data/devdiaghardwaresuitepluginrsc.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,97 +0,0 @@
-/*
-* 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:  Resource definitions for project Diagnostics Hardware Suite.
-*
-*/
-
-
-// Resource Name Identifier
-NAME DHWS
-
-// Include Files
-#include <eikon.rh>
-#include <avkon.rh>
-#include <avkon.loc>
-#include <avkon.rsg>
-#include <diaghardwaresuiteplugin.loc>
-#include "diaghardwaresuiteplugin.hrh"
-
-// Resource Identifiers
-RESOURCE RSS_SIGNATURE { }
-RESOURCE TBUF { buf="DHWS"; }
-
-// ========================== RESOURCE DEFINITIONS ===========================
-
-// ---------------------------------------------------------------------------
-// r_diag_hardware_suite_list_large_graphic
-// The suite's name in the main view listbox.
-// ---------------------------------------------------------------------------
-//
-RESOURCE TBUF r_diag_hardware_suite_list_large_graphic
-    {
-    buf = qtn_diag_lst_view_my_hw;
-    }
-
-// ---------------------------------------------------------------------------
-// r_diag_hardware_suite_heading_pane
-// The suite's name in the header of the dialog that is shown when starting
-// test execution.
-// ---------------------------------------------------------------------------
-//
-RESOURCE TBUF r_diag_hardware_suite_heading_pane
-    {
-    buf = qtn_diag_msg_title_all_my_hw;
-    }
-
-// ---------------------------------------------------------------------------
-// r_diag_hardware_suite_popup_info_pane
-// The body text of the dialog that is shown when starting test execution.
-// ---------------------------------------------------------------------------
-//
-RESOURCE TBUF r_diag_hardware_suite_popup_info_pane
-    {
-    buf = qtn_diag_msg_all_my_hw;
-    }
-
-// ---------------------------------------------------------------------------
-// r_diag_hardware_suite_title_pane
-// The title pane shown when hardware tests are running.
-// ---------------------------------------------------------------------------
-//
-RESOURCE TBUF r_diag_hardware_suite_title_pane
-    {
-    buf = qtn_diag_title_hardware;
-    }
-
-// ---------------------------------------------------------------------------
-// r_diag_hardware_suite_list_single_graphic
-// Suite name in the suite view listbox.
-// ---------------------------------------------------------------------------
-//
-RESOURCE TBUF r_diag_hardware_suite_list_single_graphic
-    {
-    buf = qtn_diag_folder_hardware;
-    }
-
-// ---------------------------------------------------------------------------
-// r_diag_hardware_suite_list_single
-// The suite's name in the results view.
-// ---------------------------------------------------------------------------
-//
-RESOURCE TBUF r_diag_hardware_suite_list_single
-    {
-    buf = qtn_diag_folder_hardware;
-    }
-
-// End of File
--- a/devicediagnostics/diagsuites/diaghardwaresuiteplugin/group/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-/*
-* 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:  Build information file for project Diagnostics Hardware Suite.
-*
-*/
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-../loc/diaghardwaresuiteplugin.loc        MW_LAYER_LOC_EXPORT_PATH(diaghardwaresuiteplugin.loc)
-../rom_files/devdiaghardwaresuiteplugin.iby   CORE_MW_LAYER_IBY_EXPORT_PATH(devdiaghardwaresuiteplugin.iby)
-
-PRJ_EXTENSIONS
-#ifdef SBSV2
- START EXTENSION s60/mifconv
- OPTION TARGETFILE devdiaghardwaresuiteplugin.mif
- OPTION HEADERFILE devdiaghardwaresuiteplugin.mbg
- OPTION SOURCES -c8,8 qgn_prop_cp_diag_hw
- END
-#endif
-
-PRJ_MMPFILES
-diaghardwaresuiteplugin.mmp
-
-#ifndef SBSV2
- gnumakefile diaghardwaresuiteplugin_icons.mk
-#endif
-
-PRJ_TESTMMPFILES
-// None
-
-PRJ_TESTEXPORTS
-// None
-
-//  End of File
-
--- a/devicediagnostics/diagsuites/diaghardwaresuiteplugin/group/diaghardwaresuiteplugin.mmp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-/*
-* 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:  Project definition file for project Diagnostics Hardware Suite.
-*
-*/
-
-
-#include <platform_paths.hrh>
-#include  <data_caging_paths.hrh>
-
-TARGET                  devdiaghardwaresuiteplugin.dll
-TARGETTYPE              PLUGIN
-UID                     0x10009D8D 0x2000E569
-
-CAPABILITY              CAP_ECOM_PLUGIN
-VENDORID                VID_DEFAULT
-
-SOURCEPATH              ../src
-SOURCE                  diaghardwaresuitepluginimplementationtable.cpp
-SOURCE                  diaghardwaresuiteplugin.cpp
-
-START RESOURCE          ../data/devdiaghardwaresuiteplugin.rss
-TARGET                  devdiaghardwaresuiteplugin.rsc
-TARGETPATH              ECOM_RESOURCE_DIR
-END // RESOURCE
-
-START RESOURCE          ../data/devdiaghardwaresuitepluginrsc.rss
-HEADER
-TARGETPATH              RESOURCE_FILES_DIR
-LANGUAGE_IDS
-END // RESOURCE
-
-USERINCLUDE             .
-USERINCLUDE             ../inc
-USERINCLUDE             ../data
-USERINCLUDE             ../loc
-
-APP_LAYER_SYSTEMINCLUDE
-SYSTEMINCLUDE           /epoc32/include/ecom
-
-LIBRARY                 euser.lib
-LIBRARY                 ecom.lib
-LIBRARY                 commonengine.lib
-LIBRARY                 aknicon.lib
-LIBRARY                 egul.lib
-LIBRARY                 flogger.lib
-LIBRARY                 diagframework.lib
-LIBRARY                 diagpluginbase.lib
-
-// End of File
-
--- a/devicediagnostics/diagsuites/diaghardwaresuiteplugin/group/diaghardwaresuiteplugin_icons.mk	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-#
-# Copyright © 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:
-#    This is a device diagnostics component
-
-ifeq (WINS,$(findstring WINS,$(PLATFORM)))
-ZDIR=\epoc32\release\$(PLATFORM)\udeb\z
-else
-ZDIR=\epoc32\data\z
-endif
-
-TARGETDIR=$(ZDIR)\resource\apps
-HEADERDIR=\epoc32\include
-ICONTARGETFILENAME=$(TARGETDIR)\devdiaghardwaresuiteplugin.mif
-HEADERFILENAME=$(HEADERDIR)\devdiaghardwaresuiteplugin.mbg
-
-MAKMAKE : 
-	mifconv $(ICONTARGETFILENAME) /h$(HEADERFILENAME) \
-		/c8,8 qgn_prop_cp_diag_hw.svg
-
-BLD : ;
-
-CLEAN : ;
-
-LIB : ;
-
-CLEANLIB : ;
-
-RESOURCE : ;
-
-FREEZE : ;
-
-SAVESPACE : ;
-
-RELEASABLES :
-	@echo $(ICONTARGETFILENAME) && \
-	@echo $(HEADERFILENAME)
-
-FINAL : ;
--- a/devicediagnostics/diagsuites/diaghardwaresuiteplugin/inc/diaghardwaresuiteplugin.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,103 +0,0 @@
-/*
-* 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:  This is the declaration of the Hardware Suite Plugin class.
-*
-*/
-
-
-#ifndef DIAGHARDWARESUITEPLUGIN_H
-#define DIAGHARDWARESUITEPLUGIN_H
-
-// System Include Files
-#include <DiagSuitePluginBase.h>            // CDiagSuitePluginBase
-
-/**
- *  Diagnostics Hardware Suite Plugin
- *  This class defines the hardware suite plugin.  This plugin is the container
- *  for all test plugins which test hardware functionality.
- *
- *  @lib diagpluginbase.lib
- *  @lib diagframework.lib
- *  @lib commonengine.lib
- *  @lib aknicon.lib
- *  @lib egul.lib
- */
-class CDiagHardwareSuitePlugin : public CDiagSuitePluginBase
-    {
-
-public: // New functions
-
-    /**
-     * Two-phased constructor.
-     *
-     * @return An instance of CDiagHardwareSuitePlugin.
-     */
-    static MDiagPlugin* NewL( TAny* aInitParams );
-
-    /**
-    * Destructor.
-    */
-    ~CDiagHardwareSuitePlugin();
-
-
-private: // New functions
-
-    /**
-     * The default constructor.
-     */
-    CDiagHardwareSuitePlugin( CDiagPluginConstructionParam* aInitParams  );
-
-    /**
-     * Two-phased constructor.
-     */
-    void ConstructL();
-
-
-private: // From base class CDiagSuitePluginBase
-
-    /**
-    * @see CDiagSuitePluginBase::Visible()
-    */
-    virtual TBool IsVisible() const;
-
-    /**
-    * @see CDiagSuitePluginBase::GetPluginNameL
-    */
-    virtual HBufC* GetPluginNameL( TNameLayoutType aLayoutType ) const;
-
-    /**
-    * @see CDiagSuitePluginBase::Uid
-    */
-    virtual TUid Uid() const;
-
-    /**
-    * @see CDiagSuitePluginBase::CreateIconL
-    */
-    virtual CGulIcon* CreateIconL() const;
-
-
-private: // From base class CActive
-    /**
-    * Handle active object completion event
-    */
-    virtual void RunL();
-
-    /**
-    * Handle cancel
-    */
-    virtual void DoCancel();
-
-    };
-
-#endif // DIAGHARDWARESUITEPLUGIN_H
--- a/devicediagnostics/diagsuites/diaghardwaresuiteplugin/inc/diaghardwaresuiteplugin.hrh	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-/*
-* 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:  Resource headers for the Diagnostics Hardware Suite
-*
-*/
-
-
-#ifndef DIAGHARDWARESUITEPLUGIN_HRH
-#define DIAGHARDWARESUITEPLUGIN_HRH
-
-// Definitions
-#define _UID3                   0x2000E569
-#define _IMPLEMENTATION_UID     0x2000E56A
-
-#endif // DIAGHARDWARESUITEPLUGIN_HRH
--- a/devicediagnostics/diagsuites/diaghardwaresuiteplugin/inc/diaghardwaresuiteplugin.pan	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-/*
-* 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:  Panic functionality for the Hardware Suite Plugin.
-*
-*/
-
-
-#ifndef DIAGHARDWARESUITEPLUGIN_PAN
-#define DIAGHARDWARESUITEPLUGIN_PAN
-
-// Data Types
-
-/** Hardware Suite panic codes.  These are used to identify specific reasons
- *  why the suite has panicked.
- */
-enum TDiagHardwareSuitePluginPanics
-    {
-    EDiagHardwareSuitePluginConstruction = 1,
-    EDiagHardwareSuitePluginBadArgument
-    };
-
-inline void Panic( TDiagHardwareSuitePluginPanics aReason )
-    {
-    _LIT( KDiagHardwareSuiteName,"Hardware Suite" );
-    User::Panic( KDiagHardwareSuiteName, aReason );
-    }
-
-#endif // DIAGHARDWARESUITEPLUGIN_PAN
--- a/devicediagnostics/diagsuites/diaghardwaresuiteplugin/loc/diaghardwaresuiteplugin.loc	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-/*
-* 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:  Localization strings for project Diagnostics Hardware Suite
-*
-*/
-
-//d:Suite name in the main view listbox.  This text indicate that the suite
-//d:will be opened so that its children may be viewed and executed.
-//l:title_pane_t2/opt12
-//r:3.2.1
-//
-
-#define qtn_diag_title_hardware "Hardware"
-
-//d:Suite name in the results view listbox.
-//l:list_single_large_graphic_pane_t1
-//r:3.2.1
-//
-
-#define qtn_diag_folder_hardware "Hardware"
-
-// End of File
--- a/devicediagnostics/diagsuites/diaghardwaresuiteplugin/rom_files/devdiaghardwaresuiteplugin.iby	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-/*
-* 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:  Image description file for project Hardware Suite Plugin
-*
-*/
-
-
-#ifndef DEVDIAGHARDWARESUITEPLUGIN_IBY
-#define DEVDIAGHARDWARESUITEPLUGIN_IBY
-
-#ifdef FF_DEVICE_DIAGNOSTICS_APP 
-
-#include <data_caging_paths_for_iby.hrh>
-
-ECOM_PLUGIN( devdiaghardwaresuiteplugin.dll, devdiaghardwaresuiteplugin.rsc )
-data=\epoc32\data\Z\resource\devdiaghardwaresuitepluginrsc.rsc RESOURCE_FILES_DIR\devdiaghardwaresuitepluginrsc.rsc
-data=\epoc32\data\Z\resource\apps\devdiaghardwaresuiteplugin.mif      APP_RESOURCE_DIR\devdiaghardwaresuiteplugin.mif
-
-#endif
-
-#endif // DEVDIAGHARDWARESUITEPLUGIN_IBY
-
--- a/devicediagnostics/diagsuites/diaghardwaresuiteplugin/src/diaghardwaresuiteplugin.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,197 +0,0 @@
-/*
-* 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:  This is the implementation of the Hardware Diagnostics
-*                Suite, which is used to contain all tests and suites.
-*
-*/
-
-
-// System Include Files
-#include <DiagFrameworkDebug.h>             // Debugging Macros
-#include <StringLoader.h>                   // StringLoader
-#include <gulicon.h>                        // CGulIcon
-#include <AknIconUtils.h>                   // AknIconUtils
-#include <devdiaghardwaresuitepluginrsc.rsg>   // Resource Definitions
-#include <devdiaghardwaresuiteplugin.mbg>      // Icon Indices
-
-// User Include Files
-#include "diaghardwaresuiteplugin.h"        // CDiagHardwareSuitePlugin
-#include "diaghardwaresuiteplugin.hrh"      // UID definition
-#include "diaghardwaresuiteplugin.pan"      // Panic
-
-// Local Constants
-_LIT( KDiagHardwareSuitePluginResourceFileName,
-      "z:devdiaghardwaresuitepluginrsc.rsc" );
-const TUid KDiagHardwareSuitePluginUid = { _UID3 };
-
-
-// ============================ GLOBAL FUNCTIONS =============================
-
-// ---------------------------------------------------------------------------
-// Static two-phase constructor.
-// ---------------------------------------------------------------------------
-//
-MDiagPlugin* CDiagHardwareSuitePlugin::NewL( TAny* aInitParams )
-    {
-    LOGSTRING2( "CDiagHardwareSuitePlugin::NewL( 0x%x )", aInitParams )
-
-    __ASSERT_ALWAYS( aInitParams,
-                     Panic( EDiagHardwareSuitePluginConstruction ) );
-
-    // Construct the plugin.  The base class will take ownership of the
-    // initialization parameters.
-    CDiagPluginConstructionParam* param =
-            static_cast< CDiagPluginConstructionParam* >( aInitParams );
-
-    CleanupStack::PushL( param );
-    CDiagHardwareSuitePlugin* self =
-        new( ELeave ) CDiagHardwareSuitePlugin( param );
-    CleanupStack::Pop( param );
-
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );
-
-    return self;
-    }
-
-// ---------------------------------------------------------------------------
-// Destructor.
-// ---------------------------------------------------------------------------
-//
-CDiagHardwareSuitePlugin::~CDiagHardwareSuitePlugin()
-    {
-    LOGSTRING( "CDiagHardwareSuitePlugin::~CDiagHardwareSuitePlugin()" )
-
-    }
-
-// ---------------------------------------------------------------------------
-// The default constructor.
-// ---------------------------------------------------------------------------
-//
-CDiagHardwareSuitePlugin::CDiagHardwareSuitePlugin(
-    CDiagPluginConstructionParam* aParam )
-:   CDiagSuitePluginBase( aParam )
-    {
-    LOGSTRING2(
-        "CDiagHardwareSuitePlugin::CDiagHardwareSuitePlugin( 0x%x )",
-        aParam )
-
-    }
-
-// ---------------------------------------------------------------------------
-// The second phase constructor.
-// ---------------------------------------------------------------------------
-//
-void CDiagHardwareSuitePlugin::ConstructL()
-    {
-    LOGSTRING( "CDiagHardwareSuitePlugin::ConstructL()" );
-    BaseConstructL ( KDiagHardwareSuitePluginResourceFileName );
-    }
-
-// ---------------------------------------------------------------------------
-// From class MDiagPlugin.
-// Returns whether the plugin should be displayed or not.
-// ---------------------------------------------------------------------------
-TBool CDiagHardwareSuitePlugin::IsVisible() const
-    {
-    return ETrue;
-    }
-
-// ---------------------------------------------------------------------------
-// From class MDiagPlugin.
-// Returns the plugin name.
-// ---------------------------------------------------------------------------
-HBufC* CDiagHardwareSuitePlugin::GetPluginNameL(
-    TNameLayoutType aLayoutType ) const
-    {
-    switch ( aLayoutType )
-        {
-        case ENameLayoutListLargeGraphic:
-            return StringLoader::LoadL( R_DIAG_HARDWARE_SUITE_LIST_LARGE_GRAPHIC );
-
-        case ENameLayoutHeadingPane:
-            return StringLoader::LoadL( R_DIAG_HARDWARE_SUITE_HEADING_PANE );
-
-        case ENameLayoutPopupInfoPane:
-            return StringLoader::LoadL( R_DIAG_HARDWARE_SUITE_POPUP_INFO_PANE );
-
-        case ENameLayoutTitlePane:
-            return StringLoader::LoadL( R_DIAG_HARDWARE_SUITE_TITLE_PANE );
-
-        case ENameLayoutListSingleGraphic:
-            return StringLoader::LoadL( R_DIAG_HARDWARE_SUITE_LIST_SINGLE_GRAPHIC );
-
-        case ENameLayoutListSingle:
-            return StringLoader::LoadL( R_DIAG_HARDWARE_SUITE_LIST_SINGLE );
-
-        default:
-            __ASSERT_DEBUG( EFalse,
-                            Panic( EDiagHardwareSuitePluginBadArgument ) );
-            return StringLoader::LoadL( R_DIAG_HARDWARE_SUITE_LIST_LARGE_GRAPHIC );
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// From class MDiagPlugin.
-// Returns the plugin's UID.
-// ---------------------------------------------------------------------------
-TUid CDiagHardwareSuitePlugin::Uid() const
-    {
-    return KDiagHardwareSuitePluginUid;
-    }
-
-// ---------------------------------------------------------------------------
-// From class MDiagPlugin.
-// Load the plugin's icon.
-// ---------------------------------------------------------------------------
-//
-CGulIcon* CDiagHardwareSuitePlugin::CreateIconL() const
-    {
-    LOGSTRING( "CDiagHardwareSuitePlugin::CreateIconL()" )
-
-    _LIT( KDiagHardwareSuitePluginIconFile,
-          "\\resource\\apps\\devdiaghardwaresuiteplugin.mif" );
-
-    // Load the icon.
-    CFbsBitmap* bitmap;
-    CFbsBitmap* mask;
-    AknIconUtils::CreateIconL(
-        bitmap,
-        mask,
-        KDiagHardwareSuitePluginIconFile(),
-        EMbmDevdiaghardwaresuitepluginQgn_prop_cp_diag_hw,
-        EMbmDevdiaghardwaresuitepluginQgn_prop_cp_diag_hw_mask );
-
-    // Create the icon.
-    return CGulIcon::NewL( bitmap, mask );
-    }
-
-// ---------------------------------------------------------------------------
-// From class CActive.
-// Active object run handler.
-// ---------------------------------------------------------------------------
-void CDiagHardwareSuitePlugin::RunL()
-    {
-    }
-
-// ---------------------------------------------------------------------------
-// From class CActive.
-// Active object cancel.
-// ---------------------------------------------------------------------------
-void CDiagHardwareSuitePlugin::DoCancel()
-    {
-    }
-
-// End of File
--- a/devicediagnostics/diagsuites/diaghardwaresuiteplugin/src/diaghardwaresuitepluginimplementationtable.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-/*
-* 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:  This is the ECOM implementation table for the Hardware Suite
-*                Plugin.
-*
-*/
-
-
-// System Include Files
-#include <implementationproxy.h>            // TImplementationProxy
-
-// User Include Files
-#include "diaghardwaresuiteplugin.h"        // CDiagHardwareSuitePlugin
-#include "diaghardwaresuiteplugin.hrh"      // UID Defintions
-
-// Local Constants
-const TImplementationProxy KDiagHardwareSuitePluginImplementationTable[] =
-	{
-	IMPLEMENTATION_PROXY_ENTRY(
-	    _IMPLEMENTATION_UID,
-	    CDiagHardwareSuitePlugin::NewL )
-	};
-
-
-// ============================ GLOBAL FUNCTIONS =============================
-
-// ---------------------------------------------------------------------------
-// Returns the implementation table.
-// ---------------------------------------------------------------------------
-//
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy(
-    TInt& aTableCount )
-	{
-	aTableCount = sizeof( KDiagHardwareSuitePluginImplementationTable ) /
-	    sizeof( TImplementationProxy );
-	return KDiagHardwareSuitePluginImplementationTable;
-	}
-
-// End of File
--- a/devicediagnostics/diagsuites/diagservicessuiteplugin/data/devdiagservicessuiteplugin.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-/*
-* 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:  Resource definitions for project Diagnostics Services Suite.
-*
-*/
-
-
-// Include Files
-#include <registryinfo.rh>
-#include "diagservicessuiteplugin.hrh"
-
-RESOURCE REGISTRY_INFO pluginInfo
-    {
-    dll_uid     = _UID3;
-    interfaces  =
-        {
-        INTERFACE_INFO
-            {
-            interface_uid   = 0x2000AFEB;
-            implementations =
-                {
-                IMPLEMENTATION_INFO
-                    {
-                    implementation_uid  = _IMPLEMENTATION_UID;
-                    version_no          = 1;
-                    display_name        = "Services Suite";
-                    default_data        = "0x2000E540";
-                    opaque_data         =   "<diagplugininfo>" 
-                                                "<order number=\"2\"/>"
-                                                "<serviceprovided name=\"Services Suite\"/>"
-                                                "<servicesrequired>"
-                                                    "<service name=\"Network Coverage\"/>"													
-                                                "</servicesrequired>"
-                                            "</diagplugininfo>";
-                    }
-                };
-            }
-        };
-    }
-
-// End of File
-
--- a/devicediagnostics/diagsuites/diagservicessuiteplugin/data/devdiagservicessuitepluginrsc.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,97 +0,0 @@
-/*
-* 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:  Resource definitions for project Diagnostics Services Suite.
-*
-*/
-
-
-// Resource Name Identifier
-NAME DSRS
-
-// Include Files
-#include <eikon.rh>
-#include <avkon.rh>
-#include <avkon.loc>
-#include <avkon.rsg>
-#include <diagservicessuiteplugin.loc>
-#include "diagservicessuiteplugin.hrh"
-
-// Resource Identifiers
-RESOURCE RSS_SIGNATURE { }
-RESOURCE TBUF { buf="DSRS"; }
-
-// ========================== RESOURCE DEFINITIONS ===========================
-
-// ---------------------------------------------------------------------------
-// r_diag_services_suite_list_large_graphic
-// The suite's name in the main view listbox.
-// ---------------------------------------------------------------------------
-//
-RESOURCE TBUF r_diag_services_suite_list_large_graphic
-    {
-    buf = qtn_diag_lst_view_my_services;
-    }
-
-// ---------------------------------------------------------------------------
-// r_diag_services_suite_heading_pane
-// The suite's name in the header of the dialog that is shown when starting
-// test execution.
-// ---------------------------------------------------------------------------
-//
-RESOURCE TBUF r_diag_services_suite_heading_pane
-    {
-    buf = qtn_diag_msg_title_all_my_services;
-    }
-
-// ---------------------------------------------------------------------------
-// r_diag_services_suite_popup_info_pane
-// The body text of the dialog that is shown when starting test execution.
-// ---------------------------------------------------------------------------
-//
-RESOURCE TBUF r_diag_services_suite_popup_info_pane
-    {
-    buf = qtn_diag_msg_all_my_services;
-    }
-
-// ---------------------------------------------------------------------------
-// r_diag_services_suite_title_pane
-// The title pane shown when services tests are running.
-// ---------------------------------------------------------------------------
-//
-RESOURCE TBUF r_diag_services_suite_title_pane
-    {
-    buf = qtn_diag_title_coverage;
-    }
-
-// ---------------------------------------------------------------------------
-// r_diag_services_suite_list_single_graphic
-// Suite name in the suite view listbox.
-// ---------------------------------------------------------------------------
-//
-RESOURCE TBUF r_diag_services_suite_list_single_graphic
-    {
-    buf = qtn_diag_folder_coverage;
-    }
-
-// ---------------------------------------------------------------------------
-// r_diag_services_suite_list_single
-// The suite's name in the results view.
-// ---------------------------------------------------------------------------
-//
-RESOURCE TBUF r_diag_services_suite_list_single
-    {
-    buf = qtn_diag_folder_coverage;
-    }
-
-// End of File
--- a/devicediagnostics/diagsuites/diagservicessuiteplugin/group/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-/*
-* 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:  Build information file for project Diagnostics Services Suite.
-*
-*/
-
-#include <platform_paths.hrh>
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-../loc/diagservicessuiteplugin.loc        MW_LAYER_LOC_EXPORT_PATH(diagservicessuiteplugin.loc)
-../rom_files/devdiagservicessuiteplugin.iby   CORE_MW_LAYER_IBY_EXPORT_PATH(devdiagservicessuiteplugin.iby)
-
-
-PRJ_EXTENSIONS
-
-#ifdef SBSV2
- 
- START EXTENSION s60/mifconv
- OPTION TARGETFILE devdiagservicessuiteplugin.mif
- OPTION HEADERFILE devdiagservicessuiteplugin.mbg
- OPTION SOURCES -c8,8 qgn_prop_cp_diag_service
- END
-
-#endif
-
-PRJ_MMPFILES
-//gnumakefile diagservicessuiteplugin_icons.mk
-diagservicessuiteplugin.mmp
-
-#ifndef SBSV2
- gnumakefile diagservicessuiteplugin_icons.mk
-#endif
-
-PRJ_TESTMMPFILES
-// None
-
-PRJ_TESTEXPORTS
-// None
-
-//  End of File
-
--- a/devicediagnostics/diagsuites/diagservicessuiteplugin/group/diagservicessuiteplugin.mmp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-/*
-* 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:  Project definition file for project Diagnostics Services Suite.
-*
-*/
-
-
-#include <platform_paths.hrh>
-#include <data_caging_paths.hrh>
-
-TARGET                  devdiagservicessuiteplugin.dll
-TARGETTYPE              PLUGIN
-UID                     0x10009D8D 0x2000E56D
-
-CAPABILITY              CAP_ECOM_PLUGIN
-VENDORID                VID_DEFAULT
-
-SOURCEPATH              ../src
-SOURCE                  diagservicessuitepluginimplementationtable.cpp
-SOURCE                  diagservicessuiteplugin.cpp
-
-START RESOURCE          ../data/devdiagservicessuiteplugin.rss
-TARGET                  devdiagservicessuiteplugin.rsc
-TARGETPATH              ECOM_RESOURCE_DIR
-END // RESOURCE
-
-START RESOURCE          ../data/devdiagservicessuitepluginrsc.rss
-HEADER
-TARGETPATH              RESOURCE_FILES_DIR
-LANGUAGE_IDS
-END // RESOURCE
-
-USERINCLUDE             .
-USERINCLUDE             ../inc
-USERINCLUDE             ../data
-USERINCLUDE             ../loc
-
-APP_LAYER_SYSTEMINCLUDE
-SYSTEMINCLUDE           /epoc32/include/ecom
-
-LIBRARY                 euser.lib
-LIBRARY                 ecom.lib
-LIBRARY                 commonengine.lib
-LIBRARY                 aknicon.lib
-LIBRARY                 egul.lib
-LIBRARY                 flogger.lib
-LIBRARY                 diagframework.lib
-LIBRARY                 diagpluginbase.lib
-
-// End of File
-
--- a/devicediagnostics/diagsuites/diagservicessuiteplugin/group/diagservicessuiteplugin_icons.mk	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-#
-# Copyright © 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:
-#    This is a device diagnostics component
-
-ifeq (WINS,$(findstring WINS,$(PLATFORM)))
-ZDIR=\epoc32\release\$(PLATFORM)\udeb\z
-else
-ZDIR=\epoc32\data\z
-endif
-
-TARGETDIR=$(ZDIR)\resource\apps
-HEADERDIR=\epoc32\include
-ICONTARGETFILENAME=$(TARGETDIR)\devdiagservicessuiteplugin.mif
-HEADERFILENAME=$(HEADERDIR)\devdiagservicessuiteplugin.mbg
-
-MAKMAKE : 
-	mifconv $(ICONTARGETFILENAME) /h$(HEADERFILENAME) \
-		/c8,8 qgn_prop_cp_diag_service.svg
-
-BLD : ;
-
-CLEAN : ;
-
-LIB : ;
-
-CLEANLIB : ;
-
-RESOURCE : ;
-
-FREEZE : ;
-
-SAVESPACE : ;
-
-RELEASABLES :
-	@echo $(ICONTARGETFILENAME) && \
-	@echo $(HEADERFILENAME)
-
-FINAL : ;
--- a/devicediagnostics/diagsuites/diagservicessuiteplugin/inc/diagservicessuiteplugin.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,104 +0,0 @@
-/*
-* 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:  This is the declaration of the Services Suite Plugin class.
-*
-*/
-
-
-#ifndef DIAGSERVICESSUITEPLUGIN_H
-#define DIAGSERVICESSUITEPLUGIN_H
-
-// System Include Files
-#include <DiagSuitePluginBase.h>            // CDiagSuitePluginBase
-
-/**
- *  Diagnostics Services Suite Plugin
- *  This class defines the services suite plugin.  This plugin is the container
- *  for all test plugins which test network services functionality.
- *
- *  @lib diagpluginbase.lib
- *  @lib diagframework.lib
- *  @lib commonengine.lib
- *  @lib aknicon.lib
- *  @lib egul.lib
- */
-class CDiagServicesSuitePlugin : public CDiagSuitePluginBase
-    {
-
-public: // New functions
-
-    /**
-     * Two-phased constructor.
-     *
-     * @return An instance of CDiagServicesSuitePlugin.
-     */
-    static MDiagPlugin* NewL( TAny* aInitParams );
-
-    /**
-    * Destructor.
-    */
-    ~CDiagServicesSuitePlugin();
-
-
-private: // New functions
-
-    /**
-     * The default constructor.
-     */
-    CDiagServicesSuitePlugin( CDiagPluginConstructionParam* aInitParams  );
-
-    /**
-     * Two-phased constructor.
-     */
-    void ConstructL();
-
-
-private: // From base class CDiagSuitePluginBase
-
-    /**
-    * @see CDiagSuitePluginBase::Visible()
-    */
-    virtual TBool IsVisible() const;
-
-    /**
-    * @see CDiagSuitePluginBase::GetPluginNameL
-    */
-    virtual HBufC* GetPluginNameL( TNameLayoutType aLayoutType ) const;
-
-    /**
-    * @see CDiagSuitePluginBase::Uid
-    */
-    virtual TUid Uid() const;
-
-    /**
-    * @see CDiagSuitePluginBase::CreateIconL
-    */
-    virtual CGulIcon* CreateIconL() const;
-
-
-private: // From base class CActive
-    /**
-    * Handle active object completion event
-    */
-    virtual void RunL();
-
-    /**
-    * Handle cancel
-    */
-    virtual void DoCancel();
-
-    };
-
-#endif // DIAGSERVICESSUITEPLUGIN_H
-
--- a/devicediagnostics/diagsuites/diagservicessuiteplugin/inc/diagservicessuiteplugin.hrh	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-/*
-* 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:  Resource headers for the Diagnostics Services Suite
-*
-*/
-
-
-#ifndef DIAGSERVICESSUITEPLUGIN_HRH
-#define DIAGSERVICESSUITEPLUGIN_HRH
-
-// Definitions
-#define _UID3                   0x2000E56D
-#define _IMPLEMENTATION_UID     0x2000E56E
-
-#endif // DIAGSERVICESSUITEPLUGIN_HRH
--- a/devicediagnostics/diagsuites/diagservicessuiteplugin/inc/diagservicessuiteplugin.pan	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-/*
-* 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:  Panic functionality for the Services Suite Plugin.
-*
-*/
-
-
-#ifndef DIAGSERVICESSUITEPLUGIN_PAN
-#define DIAGSERVICESSUITEPLUGIN_PAN
-
-// Data Types
-
-/** Services Suite panic codes.  These are used to identify specific reasons
- *  why the suite has panicked.
- */
-enum TDiagServicesSuitePluginPanics
-    {
-    EDiagServicesSuitePluginConstruction = 1,
-    EDiagServicesSuitePluginBadArgument
-    };
-
-inline void Panic( TDiagServicesSuitePluginPanics aReason )
-    {
-    _LIT( KDiagServicesSuiteName,"Services Suite" );
-    User::Panic( KDiagServicesSuiteName, aReason );
-    }
-
-#endif // DIAGSERVICESSUITEPLUGIN_PAN
-
--- a/devicediagnostics/diagsuites/diagservicessuiteplugin/loc/diagservicessuiteplugin.loc	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-/*
-* 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:  Localization strings for project Diagnostics Services Suite
-*
-*/
-
-//d:Suite name in the main view listbox.  This text indicate that the suite
-//d:will be opened so that its children may be viewed and executed.
-//l:title_pane_t2/opt12
-//r:3.2.1
-//
-
-#define qtn_diag_title_services "Services"
-
-//d:Suite name in the results view listbox.
-//l:list_single_large_graphic_pane_t1
-//r:3.2.1
-//
-
-#define qtn_diag_folder_services "Services"
-
-// End of File
--- a/devicediagnostics/diagsuites/diagservicessuiteplugin/rom_files/devdiagservicessuiteplugin.iby	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-/*
-* 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:  Image description file for project Services Suite Plugin
-*
-*/
-
-
-#ifndef DEVDIAGSERVICESSUITEPLUGIN_IBY
-#define DEVDIAGSERVICESSUITEPLUGIN_IBY
-
-#ifdef FF_DEVICE_DIAGNOSTICS_APP
-
-#include <data_caging_paths_for_iby.hrh>
-
-ECOM_PLUGIN( devdiagservicessuiteplugin.dll, devdiagservicessuiteplugin.rsc )
-data=\epoc32\data\Z\resource\devdiagservicessuitepluginrsc.rsc RESOURCE_FILES_DIR\devdiagservicessuitepluginrsc.rsc
-data=\epoc32\data\Z\resource\apps\devdiagservicessuiteplugin.mif      APP_RESOURCE_DIR\devdiagservicessuiteplugin.mif
-
-#endif
-
-#endif // DEVDIAGSERVICESSUITEPLUGIN_IBY
-
--- a/devicediagnostics/diagsuites/diagservicessuiteplugin/src/diagservicessuiteplugin.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,198 +0,0 @@
-/*
-* 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:  This is the implementation of the Services Diagnostics
-*                Suite, which is used to contain all tests and suites.
-*
-*/
-
-
-// System Include Files
-#include <DiagFrameworkDebug.h>             // Debugging Macros
-#include <StringLoader.h>                   // StringLoader
-#include <gulicon.h>                        // CGulIcon
-#include <AknIconUtils.h>                   // AknIconUtils
-#include <devdiagservicessuitepluginrsc.rsg>   // Resource Definitions
-#include <devdiagservicessuiteplugin.mbg>      // Icon Indices
-
-// User Include Files
-#include "diagservicessuiteplugin.h"        // CDiagServicesSuitePlugin
-#include "diagservicessuiteplugin.hrh"      // UID definition
-#include "diagservicessuiteplugin.pan"      // Panic
-
-// Local Constants
-_LIT( KDiagServicesSuitePluginResourceFileName,
-      "z:devdiagservicessuitepluginrsc.rsc" );
-const TUid KDiagServicesSuitePluginUid = { _UID3 };
-
-
-// ============================ GLOBAL FUNCTIONS =============================
-
-// ---------------------------------------------------------------------------
-// Static two-phase constructor.
-// ---------------------------------------------------------------------------
-//
-MDiagPlugin* CDiagServicesSuitePlugin::NewL( TAny* aInitParams )
-    {
-    LOGSTRING2( "CDiagServicesSuitePlugin::NewL( 0x%x )", aInitParams )
-
-    __ASSERT_ALWAYS( aInitParams,
-                     Panic( EDiagServicesSuitePluginConstruction ) );
-
-    // Construct the plugin.  The base class will take ownership of the
-    // initialization parameters.
-    CDiagPluginConstructionParam* param =
-            static_cast< CDiagPluginConstructionParam* >( aInitParams );
-
-    CleanupStack::PushL( param );
-    CDiagServicesSuitePlugin* self =
-        new( ELeave ) CDiagServicesSuitePlugin( param );
-    CleanupStack::Pop( param );
-
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );
-
-    return self;
-    }
-
-// ---------------------------------------------------------------------------
-// Destructor.
-// ---------------------------------------------------------------------------
-//
-CDiagServicesSuitePlugin::~CDiagServicesSuitePlugin()
-    {
-    LOGSTRING( "CDiagServicesSuitePlugin::~CDiagServicesSuitePlugin()" )
-
-    }
-
-// ---------------------------------------------------------------------------
-// The default constructor.
-// ---------------------------------------------------------------------------
-//
-CDiagServicesSuitePlugin::CDiagServicesSuitePlugin(
-    CDiagPluginConstructionParam* aParam )
-:   CDiagSuitePluginBase( aParam )
-    {
-    LOGSTRING2(
-        "CDiagServicesSuitePlugin::CDiagServicesSuitePlugin( 0x%x )",
-        aParam )
-
-    }
-
-// ---------------------------------------------------------------------------
-// The second phase constructor.
-// ---------------------------------------------------------------------------
-//
-void CDiagServicesSuitePlugin::ConstructL()
-    {
-    LOGSTRING( "CDiagServicesSuitePlugin::ConstructL()" );
-    BaseConstructL ( KDiagServicesSuitePluginResourceFileName );
-    }
-
-// ---------------------------------------------------------------------------
-// From class MDiagPlugin.
-// Returns whether the plugin should be displayed or not.
-// ---------------------------------------------------------------------------
-TBool CDiagServicesSuitePlugin::IsVisible() const
-    {
-    return ETrue;
-    }
-
-// ---------------------------------------------------------------------------
-// From class MDiagPlugin.
-// Returns the plugin name.
-// ---------------------------------------------------------------------------
-HBufC* CDiagServicesSuitePlugin::GetPluginNameL(
-    TNameLayoutType aLayoutType ) const
-    {
-    switch ( aLayoutType )
-        {
-        case ENameLayoutListLargeGraphic:
-            return StringLoader::LoadL( R_DIAG_SERVICES_SUITE_LIST_LARGE_GRAPHIC );
-
-        case ENameLayoutHeadingPane:
-            return StringLoader::LoadL( R_DIAG_SERVICES_SUITE_HEADING_PANE );
-
-        case ENameLayoutPopupInfoPane:
-            return StringLoader::LoadL( R_DIAG_SERVICES_SUITE_POPUP_INFO_PANE );
-
-        case ENameLayoutTitlePane:
-            return StringLoader::LoadL( R_DIAG_SERVICES_SUITE_TITLE_PANE );
-
-        case ENameLayoutListSingleGraphic:
-            return StringLoader::LoadL( R_DIAG_SERVICES_SUITE_LIST_SINGLE_GRAPHIC );
-
-        case ENameLayoutListSingle:
-            return StringLoader::LoadL( R_DIAG_SERVICES_SUITE_LIST_SINGLE );
-
-        default:
-            __ASSERT_DEBUG( EFalse,
-                            Panic( EDiagServicesSuitePluginBadArgument ) );
-            return StringLoader::LoadL( R_DIAG_SERVICES_SUITE_LIST_LARGE_GRAPHIC );
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// From class MDiagPlugin.
-// Returns the plugin's UID.
-// ---------------------------------------------------------------------------
-TUid CDiagServicesSuitePlugin::Uid() const
-    {
-    return KDiagServicesSuitePluginUid;
-    }
-
-// ---------------------------------------------------------------------------
-// From class MDiagPlugin.
-// Load the plugin's icon.
-// ---------------------------------------------------------------------------
-//
-CGulIcon* CDiagServicesSuitePlugin::CreateIconL() const
-    {
-    LOGSTRING( "CDiagServicesSuitePlugin::CreateIconL()" )
-
-    _LIT( KDiagServicesSuitePluginIconFile,
-          "\\resource\\apps\\devdiagservicessuiteplugin.mif" );
-
-    // Load the icon.
-    CFbsBitmap* bitmap;
-    CFbsBitmap* mask;
-    AknIconUtils::CreateIconL(
-        bitmap,
-        mask,
-        KDiagServicesSuitePluginIconFile(),
-        EMbmDevdiagservicessuitepluginQgn_prop_cp_diag_service,
-        EMbmDevdiagservicessuitepluginQgn_prop_cp_diag_service_mask );
-
-    // Create the icon.
-    return CGulIcon::NewL( bitmap, mask );
-    }
-
-// ---------------------------------------------------------------------------
-// From class CActive.
-// Active object run handler.
-// ---------------------------------------------------------------------------
-void CDiagServicesSuitePlugin::RunL()
-    {
-    }
-
-// ---------------------------------------------------------------------------
-// From class CActive.
-// Active object cancel.
-// ---------------------------------------------------------------------------
-void CDiagServicesSuitePlugin::DoCancel()
-    {
-    }
-
-// End of File
-
--- a/devicediagnostics/diagsuites/diagservicessuiteplugin/src/diagservicessuitepluginimplementationtable.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-/*
-* 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:  This is the ECOM implementation table for the Services Suite
-*                Plugin.
-*
-*/
-
-
-// System Include Files
-#include <implementationproxy.h>            // TImplementationProxy
-
-// User Include Files
-#include "diagservicessuiteplugin.h"        // CDiagServicesSuitePlugin
-#include "diagservicessuiteplugin.hrh"      // UID Defintions
-
-// Local Constants
-const TImplementationProxy KDiagServicesSuitePluginImplementationTable[] =
-	{
-	IMPLEMENTATION_PROXY_ENTRY(
-	    _IMPLEMENTATION_UID,
-	    CDiagServicesSuitePlugin::NewL )
-	};
-
-
-// ============================ GLOBAL FUNCTIONS =============================
-
-// ---------------------------------------------------------------------------
-// Returns the implementation table.
-// ---------------------------------------------------------------------------
-//
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy(
-    TInt& aTableCount )
-	{
-	aTableCount = sizeof( KDiagServicesSuitePluginImplementationTable ) /
-	    sizeof( TImplementationProxy );
-	return KDiagServicesSuitePluginImplementationTable;
-	}
-
-// End of File
-
--- a/devicediagnostics/diagsuites/diagtoplevelsuiteplugin/data/devdiagtoplevelsuiteplugin.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-/*
-* 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:  Resource definitions for project Diagnostics Top-Level Suite.
-*
-*/
-
-
-// Include Files
-#include <registryinfo.rh>
-#include "diagtoplevelsuiteplugin.hrh"
-
-RESOURCE REGISTRY_INFO pluginInfo
-    {
-    dll_uid     = _UID3;
-    interfaces  =
-        {
-        INTERFACE_INFO
-            {
-            interface_uid   = 0x2000AFEB;
-            implementations =
-                {
-                IMPLEMENTATION_INFO
-                    {
-                    implementation_uid  = _IMPLEMENTATION_UID;
-                    version_no          = 1;
-                    display_name        = "Root Suite";
-                    default_data        = "0x00000000";
-                    opaque_data         =   "<diagplugininfo>" 
-                                                "<order number=\"0\"/>"
-                                                "<serviceprovided name=\"Root Suite\"/>"
-                                            "</diagplugininfo>";
-                    }
-                };
-            }
-        };
-    }
-
-// End of File
--- a/devicediagnostics/diagsuites/diagtoplevelsuiteplugin/data/devdiagtoplevelsuitepluginrsc.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,94 +0,0 @@
-/*
-* 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:  Resource definitions for project Diagnostics Top-Level Suite.
-*
-*/
-
-
-// Resource Name Identifier
-NAME DTLS
-
-// Include Files
-#include <eikon.rh>
-
-// Resource Identifiers
-RESOURCE RSS_SIGNATURE { }
-RESOURCE TBUF { buf="DTLS"; }
-
-// ========================== RESOURCE DEFINITIONS ===========================
-
-// ---------------------------------------------------------------------------
-// r_diag_top_level_suite_list_large_graphic
-// The suite's name in the main view listbox.
-// ---------------------------------------------------------------------------
-//
-RESOURCE TBUF r_diag_top_level_suite_list_large_graphic
-    {
-    buf = qtn_diag_lst_run_tests;
-    }
-
-// ---------------------------------------------------------------------------
-// r_diag_top_level_suite_heading_pane
-// The suite's name in the header of the dialog that is shown when starting
-// test execution.
-// ---------------------------------------------------------------------------
-//
-RESOURCE TBUF r_diag_top_level_suite_heading_pane
-    {
-    buf = qtn_diag_msg_title_all_tests;
-    }
-
-// ---------------------------------------------------------------------------
-// r_diag_top_level_suite_popup_info_pane
-// The body text of the dialog that is shown when starting test execution.
-// ---------------------------------------------------------------------------
-//
-RESOURCE TBUF r_diag_top_level_suite_popup_info_pane
-    {
-    buf = qtn_diag_msg_start_all;
-    }
-
-// ---------------------------------------------------------------------------
-// r_diag_top_level_suite_title_pane
-// The title pane shown when all tests are running.
-// ---------------------------------------------------------------------------
-//
-RESOURCE TBUF r_diag_top_level_suite_title_pane
-    {
-    buf = qtn_diag_title_test_all_tests;
-    }
-
-// ---------------------------------------------------------------------------
-// r_diag_top_level_suite_list_single_graphic
-// The suite's name in the suite view.
-// For the top-level suite, this is only used for debugging purposes!
-// ---------------------------------------------------------------------------
-//
-RESOURCE TBUF r_diag_top_level_suite_list_single_graphic
-    {
-    buf = qtn_diag_lst_run_tests;
-    }
-
-// ---------------------------------------------------------------------------
-// r_diag_top_level_suite_list_single
-// The suite's name in the results view.
-// For the top-level suite, this is only used for debugging purposes!
-// ---------------------------------------------------------------------------
-//
-RESOURCE TBUF r_diag_top_level_suite_list_single
-    {
-    buf = qtn_diag_lst_run_tests;
-    }
-
-// End of File
--- a/devicediagnostics/diagsuites/diagtoplevelsuiteplugin/group/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-/*
-* 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:  Build information file for project Diagnostics Top-Level Suite.
-*
-*/
-
-#include <platform_paths.hrh>
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-//../loc/diagtoplevelsuiteplugin.loc        MW_LAYER_LOC_EXPORT_PATH(diagtoplevelsuiteplugin.loc)
-../rom_files/devdiagtoplevelsuiteplugin.iby   CORE_MW_LAYER_IBY_EXPORT_PATH(devdiagtoplevelsuiteplugin.iby)
-
-PRJ_MMPFILES
-diagtoplevelsuiteplugin.mmp
-
-PRJ_TESTMMPFILES
-// None
-
-PRJ_TESTEXPORTS
-// None
-
-//  End of File
-
--- a/devicediagnostics/diagsuites/diagtoplevelsuiteplugin/group/diagtoplevelsuiteplugin.mmp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-/*
-* 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:  Project definition file for project Diagnostics Top-Level Suite.
-*
-*/
-
-
-#include <platform_paths.hrh>
-#include  <data_caging_paths.hrh>
-
-TARGET                  devdiagtoplevelsuiteplugin.dll
-TARGETTYPE              PLUGIN
-UID                     0x10009D8D 0x2000E540
-
-CAPABILITY              CAP_ECOM_PLUGIN
-VENDORID                VID_DEFAULT
-
-SOURCEPATH              ../src
-SOURCE                  diagtoplevelsuitepluginimplementationtable.cpp
-SOURCE                  diagtoplevelsuiteplugin.cpp
-
-START RESOURCE          ../data/devdiagtoplevelsuiteplugin.rss
-TARGET                  devdiagtoplevelsuiteplugin.rsc
-TARGETPATH              ECOM_RESOURCE_DIR
-END // RESOURCE
-
-START RESOURCE          ../data/devdiagtoplevelsuitepluginrsc.rss
-HEADER
-TARGETPATH              RESOURCE_FILES_DIR
-//LANGUAGE_sc
-LANGUAGE_IDS
-END // RESOURCE
-
-USERINCLUDE             .
-USERINCLUDE             ../inc
-USERINCLUDE             ../data
-
-APP_LAYER_SYSTEMINCLUDE
-SYSTEMINCLUDE           /epoc32/include/ecom
-
-LIBRARY                 euser.lib
-LIBRARY                 ecom.lib
-LIBRARY                 commonengine.lib
-LIBRARY                 flogger.lib
-LIBRARY                 diagframework.lib
-LIBRARY                 diagpluginbase.lib
-
-// End of File
-
--- a/devicediagnostics/diagsuites/diagtoplevelsuiteplugin/inc/diagtoplevelsuiteplugin.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,97 +0,0 @@
-/*
-* 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:  This is the declaration of the Top-Level Suite Plugin class.
-*
-*/
-
-
-#ifndef DIAGTOPLEVELSUITEPLUGIN_H
-#define DIAGTOPLEVELSUITEPLUGIN_H
-
-// System Include Files
-#include <DiagSuitePluginBase.h>            // CDiagSuitePluginBase
-
-/**
- *  Diagnostics Top-Level Suite Plugin
- *  This class defines the top-level suite plugin.  This plugin is container for
- *  all of the suites and plugins which belong to the highest level in the test
- *  hierarchy.
- *
- *  @lib diagpluginbase.lib
- *  @lib diagframework.lib
- *  @lib commonengine.lib
- */
-class CDiagTopLevelSuitePlugin : public CDiagSuitePluginBase
-    {
-
-public: // New functions
-
-    /**
-     * Two-phased constructor.
-     *
-     * @return An instance of CDiagTopLevelSuitePlugin.
-     */
-    static MDiagPlugin* NewL( TAny* aInitParams );
-
-    /**
-    * Destructor.
-    */
-    ~CDiagTopLevelSuitePlugin();
-
-
-private: // New functions
-
-    /**
-     * The default constructor.
-     */
-    CDiagTopLevelSuitePlugin( CDiagPluginConstructionParam* aInitParams  );
-
-    /**
-     * Two-phased constructor.
-     */
-    void ConstructL();
-
-
-private: // From base class CDiagSuitePluginBase
-
-    /**
-    * @see CDiagSuitePluginBase::Visible()
-    */
-    virtual TBool IsVisible() const;
-
-    /**
-    * @see CDiagSuitePluginBase::GetPluginNameL
-    */
-    virtual HBufC* GetPluginNameL( TNameLayoutType aLayoutType ) const;
-
-    /**
-    * @see CDiagSuitePluginBase::Uid
-    */
-    virtual TUid Uid() const;
-
-
-private: // From base class CActive
-    /**
-    * Handle active object completion event
-    */
-    virtual void RunL();
-
-    /**
-    * Handle cancel
-    */
-    virtual void DoCancel();
-
-    };
-
-#endif // DIAGTOPLEVELSUITEPLUGIN_H
--- a/devicediagnostics/diagsuites/diagtoplevelsuiteplugin/inc/diagtoplevelsuiteplugin.hrh	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-/*
-* 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:  Resource headers for the Diagnostics Top-Level Suite
-*
-*/
-
-
-#ifndef DIAGTOPLEVELSUITEPLUGIN_HRH
-#define DIAGTOPLEVELSUITEPLUGIN_HRH
-
-// Definitions
-#define _UID3                   0x2000E540
-#define _IMPLEMENTATION_UID     0x2000E541
-
-// Data Types
-
-#endif // DIAGTOPLEVELSUITEPLUGIN_HRH
--- a/devicediagnostics/diagsuites/diagtoplevelsuiteplugin/inc/diagtoplevelsuiteplugin.pan	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-/*
-* Copyright (c) 2007-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:  Panic functionality for the Top-Level Suite Plugin.
-*
-*/
-
-
-#ifndef DIAGTOPLEVELSUITEPLUGIN_PAN
-#define DIAGTOPLEVELSUITEPLUGIN_PAN
-
-// Data Types
-
-/** Top-Level Suite panic codes.  These are used to identify specific reasons
- *  why the suite has panicked.
- */
-enum TDiagTopLevelSuitePluginPanics
-    {
-    EDiagTopLevelSuitePluginConstruction = 1,
-    EDiagTopLevelSuitePluginBadArgument
-    };
-
-
-/** The panic category for the Top-Level Suite. */
-_LIT( KDiagTopLevelSuiteName,"Top-Level Suite" );
-
-
-/** The inline panic function. */
-inline void Panic( TDiagTopLevelSuitePluginPanics aReason )
-    {
-    User::Panic( KDiagTopLevelSuiteName, aReason );
-    }
-
-#endif // DIAGTOPLEVELSUITEPLUGIN_PAN
--- a/devicediagnostics/diagsuites/diagtoplevelsuiteplugin/rom_files/devdiagtoplevelsuiteplugin.iby	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-/*
-* 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:  Image description file for project Top-Level Suite Plugin
-*
-*/
-
-
-#ifndef DEVDIAGTOPLEVELSUITEPLUGIN_IBY
-#define DEVDIAGTOPLEVELSUITEPLUGIN_IBY
-
-#ifdef FF_DEVICE_DIAGNOSTICS_APP 
-
-#include <data_caging_paths_for_iby.hrh>
-
-ECOM_PLUGIN( devdiagtoplevelsuiteplugin.dll, devdiagtoplevelsuiteplugin.rsc )
-/*
-* .rsc file not taken up durin rom image creation, some issue with iby file here
-*/
-data=\epoc32\data\Z\resource\devdiagtoplevelsuitepluginrsc.rsc RESOURCE_FILES_DIR\devdiagtoplevelsuitepluginrsc.rsc
-
-#endif
-
-#endif // DEVDIAGTOPLEVELSUITEPLUGIN_IBY
-
--- a/devicediagnostics/diagsuites/diagtoplevelsuiteplugin/src/diagtoplevelsuiteplugin.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,172 +0,0 @@
-/*
-* 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:  This is the implementation of the Top-Level Diagnostics
-*                Suite, which is used to contain all tests and suites.
-*
-*/
-
-
-// System Include Files
-#include <DiagSuiteObserver.h>              // MDiagSuiteObserver
-#include <DiagSuiteExecParam.h>             // TDiagSuiteExecParam
-#include <DiagFrameworkDebug.h>             // Debugging Macros
-#include <DiagEngineCommon.h>               // MDiagEngineCommon
-#include <StringLoader.h>                   // StringLoader
-#include <devdiagtoplevelsuitepluginrsc.rsg>    // Resource Definitions
-
-// User Include Files
-#include "diagtoplevelsuiteplugin.h"        // CDiagTopLevelSuitePlugin
-#include "diagtoplevelsuiteplugin.hrh"      // UID definition
-#include "diagtoplevelsuiteplugin.pan"      // Panic
-
-// Local Constants
-_LIT( KDiagTopLevelSuitePluginResourceFileName,
-      "z:devdiagtoplevelsuitepluginrsc.rsc" );
-const TUid KDiagTopLevelSuitePluginUid = { _UID3 };
-
-
-// ============================ GLOBAL FUNCTIONS =============================
-
-// ---------------------------------------------------------------------------
-// Static two-phase constructor.
-// ---------------------------------------------------------------------------
-//
-MDiagPlugin* CDiagTopLevelSuitePlugin::NewL( TAny* aInitParams )
-    {
-    __ASSERT_ALWAYS( aInitParams,
-                     Panic( EDiagTopLevelSuitePluginConstruction ) );
-
-    // Construct the plugin.  The base class will take ownership of the
-    // initialization parameters.
-    CDiagPluginConstructionParam* param =
-            static_cast< CDiagPluginConstructionParam* >( aInitParams );
-
-    CleanupStack::PushL( param );
-    CDiagTopLevelSuitePlugin* self =
-        new( ELeave ) CDiagTopLevelSuitePlugin( param );
-    CleanupStack::Pop( param );
-
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );
-
-    return self;
-    }
-
-// ---------------------------------------------------------------------------
-// Destructor.
-// ---------------------------------------------------------------------------
-//
-CDiagTopLevelSuitePlugin::~CDiagTopLevelSuitePlugin()
-    {
-    }
-
-// ---------------------------------------------------------------------------
-// The default constructor.
-// ---------------------------------------------------------------------------
-//
-CDiagTopLevelSuitePlugin::CDiagTopLevelSuitePlugin(
-    CDiagPluginConstructionParam* aParam )
-:   CDiagSuitePluginBase( aParam )
-    {
-    }
-
-// ---------------------------------------------------------------------------
-// The second phase constructor.
-// ---------------------------------------------------------------------------
-//
-void CDiagTopLevelSuitePlugin::ConstructL()
-    {
-    LOGSTRING( "CDiagTopLevelSuitePlugin::ConstructL");
-    BaseConstructL ( KDiagTopLevelSuitePluginResourceFileName );
-    }
-
-// ---------------------------------------------------------------------------
-// From class MDiagPlugin.
-// Returns whether the plugin should be displayed or not.
-// ---------------------------------------------------------------------------
-TBool CDiagTopLevelSuitePlugin::IsVisible() const
-    {
-    return EFalse;
-    }
-
-// ---------------------------------------------------------------------------
-// From class MDiagPlugin.
-// Returns the plugin name.
-// ---------------------------------------------------------------------------
-HBufC* CDiagTopLevelSuitePlugin::GetPluginNameL(
-    TNameLayoutType aLayoutType ) const
-    {
-    switch ( aLayoutType )
-        {
-        case ENameLayoutListLargeGraphic:
-            return StringLoader::LoadL( R_DIAG_TOP_LEVEL_SUITE_LIST_LARGE_GRAPHIC );
-
-        case ENameLayoutHeadingPane:
-            return StringLoader::LoadL( R_DIAG_TOP_LEVEL_SUITE_HEADING_PANE );
-
-        case ENameLayoutPopupInfoPane:
-            return StringLoader::LoadL( R_DIAG_TOP_LEVEL_SUITE_POPUP_INFO_PANE );
-
-        case ENameLayoutTitlePane:
-            return StringLoader::LoadL( R_DIAG_TOP_LEVEL_SUITE_TITLE_PANE );
-
-#if _DEBUG
-        /* These two layouts are only available in debug builds, to allow for
-         * tracing the plugin's name.  The top-level suite does not support
-         * them for released builds, because it should not be used in either
-         * of these layouts.
-         */
-
-        case ENameLayoutListSingleGraphic:
-            return StringLoader::LoadL( R_DIAG_TOP_LEVEL_SUITE_LIST_SINGLE_GRAPHIC );
-
-        case ENameLayoutListSingle:
-            return StringLoader::LoadL( R_DIAG_TOP_LEVEL_SUITE_LIST_SINGLE );
-
-#endif // _DEBUG
-
-        default:
-            __ASSERT_DEBUG( EFalse,
-                            Panic( EDiagTopLevelSuitePluginBadArgument ) );
-            return StringLoader::LoadL( R_DIAG_TOP_LEVEL_SUITE_LIST_LARGE_GRAPHIC );
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// From class MDiagPlugin.
-// Returns the plugin's UID.
-// ---------------------------------------------------------------------------
-TUid CDiagTopLevelSuitePlugin::Uid() const
-    {
-    return KDiagTopLevelSuitePluginUid;
-    }
-
-// ---------------------------------------------------------------------------
-// From class CActive.
-// Active object run handler.
-// ---------------------------------------------------------------------------
-void CDiagTopLevelSuitePlugin::RunL()
-    {
-    }
-
-// ---------------------------------------------------------------------------
-// From class CActive.
-// Active object cancel.
-// ---------------------------------------------------------------------------
-void CDiagTopLevelSuitePlugin::DoCancel()
-    {
-    }
-
-// End of File
--- a/devicediagnostics/diagsuites/diagtoplevelsuiteplugin/src/diagtoplevelsuitepluginimplementationtable.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-/*
-* 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:  This is the ECOM implementation table for the Top-Level Suite
-*                Plugin.
-*
-*/
-
-
-// System Include Files
-#include <implementationproxy.h>            // TImplementationProxy
-
-// User Include Files
-#include "diagtoplevelsuiteplugin.h"        // CDiagTopLevelSuitePlugin
-#include "diagtoplevelsuiteplugin.hrh"      // UID Defintions
-
-// Local Constants
-const TImplementationProxy KDiagTopLevelSuitePluginImplementationTable[] =
-	{
-	IMPLEMENTATION_PROXY_ENTRY(
-	    _IMPLEMENTATION_UID,
-	    CDiagTopLevelSuitePlugin::NewL )
-	};
-
-
-// ============================ GLOBAL FUNCTIONS =============================
-
-// ---------------------------------------------------------------------------
-// Returns the implementation table.
-// ---------------------------------------------------------------------------
-//
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy(
-    TInt& aTableCount )
-	{
-	aTableCount = sizeof( KDiagTopLevelSuitePluginImplementationTable ) /
-	    sizeof( TImplementationProxy );
-	return KDiagTopLevelSuitePluginImplementationTable;
-	}
-
-// End of File
--- a/devicediagnostics/diagsuites/group/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-/*
-* 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:  Build information of all test suites.
-*
-*/
-
-
-
-#include "../diagconnectivitysuiteplugin/group/bld.inf"
-#include "../diagcoveragesuiteplugin/group/bld.inf"
-#include "../diaghardwaresuiteplugin/group/bld.inf"
-#include "../diagservicessuiteplugin/group/bld.inf"
-#include "../diagtoplevelsuiteplugin/group/bld.inf"
-
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-// None
-
-PRJ_MMPFILES
-
-PRJ_TESTMMPFILES
-// None
-
-PRJ_TESTEXPORTS
-// None
-
-//  End of File
-
--- a/devicediagnostics/group/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-/*
-* 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:  Bldmake file
-*
-*/
-
-
-	#include "../devdiagapp/group/bld.inf"
-	#include "../devdiaggsplugin/group/bld.inf"
-	#include "../diagplugins/group/bld.inf"
-	#include "../diagsuites/group/bld.inf"
-
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-../sis/devdiagapp.sis			/epoc32/data/z/system/install/devdiagapp.sis
-
-
--- a/devicediagnostics/group/build.bat	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-rem
-rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-rem All rights reserved.
-rem This component and the accompanying materials are made available
-rem under the terms of "Eclipse Public License v1.0"
-rem which accompanies this distribution, and is available
-rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
-rem
-rem Initial Contributors:
-rem Nokia Corporation - initial contribution.
-rem
-rem Contributors:
-rem
-rem Description:
-rem
-
-call bldmake clean
-call bldmake bldfiles
-call abld reallyclean
-call abld build armv5 > warnings.txt 2>&1 
-call abld build -c
\ No newline at end of file
--- a/devicediagnostics/group/parse_build_warnings.pl	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,140 +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 "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description:
-#
-######################################################################
-# ****************************************Script info : See footer.****************************************
-######################################################################
-
-use strict;
-use Getopt::Long;
-
-my($log_file,$warning_file,$help,$line,%warnings,$comp_path,%type_by_comp);
-
-GetOptions (
-            'log_file=s' => \$log_file,
-			'warning_file=s' => \$warning_file,
-            'help' => \$help
-            );
-
-usage() if($help);
-
-if(!$log_file){
-    print "ERROR : No log file parse! Exiting...\n";
-    usage();
-} #if
-
-$warning_file=$log_file.".warnings.csv" if(!$warning_file);
-
-open(IN,$log_file) || die "Cannot open $log_file\n";
-while($line=<IN>){
-	my $key="";
-	my $val="";
-	chomp($line);
-	if($line =~ /^Chdir\s+(.*)/i){
-		$comp_path=$1;
-		$comp_path=~ s/\\group$//i;
-		#$type_by_comp{$comp_path};
-	}#if
-	if($line =~ /\bwarning\b/ig){
-		if($line =~ /\bwarning\s+(\w+\d+)\:/i || $line =~ /\bwarning\:\s+(\#\d+\-\w+)\:/i || $line =~ /\bwarning\:\s+(\w+\d+\w+)\:/i){
-			$key=$1;
-			if(exists $warnings{$key}){
-				$warnings{$key}++;
-			}
-			else{
-				$warnings{$key}=1;
-			}#if
-		# }
-		# else{
-			# push @other_warnings,($val);
-		}#if
-		if ($key ne ""){
-			if(exists $type_by_comp{$comp_path}{$key}){
-				$type_by_comp{$comp_path}{$key}++;
-			}
-			else{
-				$type_by_comp{$comp_path}{$key}=1;
-			}#if
-		}#if
-	}#if
-
-}#while
-close(IN);
-
-open(OUT,">".$warning_file) || die "Cannot open $warning_file\n";
-
-print OUT "\nCOUNTING WARNINGS BY TYPE\n\n";
-print OUT "Warning,Count\n";
-for my $w ( sort keys %warnings ) {
-	print OUT "$w,$warnings{$w}\n";
-}#for
-print OUT "\n";
-
-print OUT "\nSHOWING SPECIFIC WARNINGS BY COMPONENT AND TYPE\n\n";
-print OUT "Component,Total warnings by component,Warnings\n";
-
-for my $co ( sort keys %type_by_comp ) {
-    print OUT "\n$co,";
-    my @ctvals=values %{ $type_by_comp{$co} };
-    my $ctsum=0;
-    foreach my $cval(@ctvals){
-    	$ctsum+=$cval;
-    }#foreach
-    print OUT "$ctsum,";
-    for my $ty ( sort keys %{ $type_by_comp{$co} } ) {
-         print OUT " $ty=$type_by_comp{$co}{$ty} ";
-	}#for
-}#for
-print OUT "\n\n";
-
-close(OUT);
-
-#--------------------------------------------------------------#
-
-sub usage{
-	while(<DATA>){
-		print;
-	} #while
-	exit;
-} #sub
-
-__DATA__
-
-#--------------------------------------------------------------#
-#-------------------------- USAGE -----------------------------#
-#--------------------------------------------------------------#
- Script name:	parse_build_warnings.pl
-
- Copyright (c) 2007-2008 Nokia. All rights reserved.
-
- Purpose:
-
-	To parse warning messages from s60 platform build log.
-
- Revision History:
-
-	v0.1.0 19.09.2007 Qvist Heikki 	Initial version.
-	v0.1.1 20.09.2007 Qvist Heikki 	Count warnings.
-	v0.1.2 10.10.2007 Qvist Heikki 	Count warnings per a component.
-	v0.2.0 10.01.2008 Qvist Heikki 	Clean useless output. Fix counters (0 -> 1).
-	v0.3.0 10.01.2008 Qvist Heikki 	Output to CSV-file for Excel reading.
-    
-    Commandline options:
-    
-        -h show this info.
-        -l log file to parse out.
-        -w output file contain warnings.
-        	If not given, <logfile>.warnings.txt is generated.
-#--------------------------------------------------------------#
--- a/devicediagnostics/sis/devdiagapp.pkg	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,143 +0,0 @@
-;
-; 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:  Package file for project Device Diagnostics Application
-;
-
-;; =============================================================================
-;; GENERAL DATA ================================================================
-;; =============================================================================
-; Languages
-&EN
-;01
-
-; Package header
-#{"Device Diagnostics"},(0x2001F499),1,0,0,TYPE=SA
-
-;Localised Vendor name
-%{"Nokia"}
-
-;Unique Vendor name
-:"Nokia"
-
-; Dependency for S60
-;[0x102752AE], 0, 0, 0, {"Series60ProductID"} ;3.2
-
-""-"Z:\sys\bin\DevDiagApp.exe"
-""-"Z:\private\10003a3f\import\apps\DevDiagApp_reg.rsc"
-""-"Z:\resource\apps\DevDiagApp_loc.rsc"
-""-"Z:\resource\apps\DevDiagApp.rsc"
-""-"Z:\resource\apps\devdiagapp.mif"
-""-"Z:\resource\apps\DevDiagApp.rsc"
-
-
-;; Diagnostics Framework Files
-""-"Z:\sys\bin\DiagPluginBase.dll"
-""-"Z:\sys\bin\DiagResultsDatabase.dll"
-""-"Z:\sys\bin\diagresultsdatabaseserver.exe"
-""-"Z:\sys\bin\DiagFramework.dll"
-
-;; Top-Level Suite Files (direct include)
-""-"Z:\sys\bin\devdiagtoplevelsuiteplugin.dll"
-""-"Z:\resource\devdiagtoplevelsuitepluginrsc.rsc"
-""-"Z:\resource\plugins\devdiagtoplevelsuiteplugin.rsc"
-
-;; Hardware Suite Files (direct include)
-""-"Z:\sys\bin\devdiaghardwaresuiteplugin.dll"
-""-"Z:\resource\devdiaghardwaresuitepluginrsc.rsc"
-""-"Z:\resource\plugins\devdiaghardwaresuiteplugin.rsc"
-""-"Z:\resource\apps\devdiaghardwaresuiteplugin.mif"
-
-;; Coverage Suite Files (direct include)
-""-"Z:\sys\bin\devdiagcoveragesuiteplugin.dll"
-""-"Z:\resource\devdiagcoveragesuitepluginrsc.rsc"
-""-"Z:\resource\plugins\devdiagcoveragesuiteplugin.rsc"
-""-"Z:\resource\apps\devdiagcoveragesuiteplugin.mif"
-
-;; Services Suite Files (direct include)
-""-"Z:\sys\bin\devdiagservicessuiteplugin.dll"
-""-"Z:\resource\devdiagservicessuitepluginrsc.rsc"
-""-"Z:\resource\plugins\devdiagservicessuiteplugin.rsc"
-""-"Z:\resource\apps\devdiagservicessuiteplugin.mif"
-
-;; Connectivity Suite Files (direct include)
-""-"Z:\sys\bin\devdiagconnectivitysuiteplugin.dll"
-""-"Z:\resource\devdiagconnectivitysuitepluginrsc.rsc"
-""-"Z:\resource\plugins\devdiagconnectivitysuiteplugin.rsc"
-""-"Z:\resource\apps\devdiagconnectivitysuiteplugin.mif"
-
-;; Earpiece Plugin (direct include)
-""-"Z:\resource\DevDiagAudioPluginRsc.rsc"
-""-"Z:\sys\bin\DevDiagAudioPlugin.dll"
-""-"Z:\resource\DevDiagAudioPluginRsc.rsc"
-""-"Z:\resource\plugins\DevDiagAudioPlugin.rsc"
-
-;; Charger Plugin (direct include)
-""-"Z:\resource\DevDiagBatteryChargerCableTestPluginRsc.rsc"
-""-"Z:\sys\bin\DevDiagBatteryChargerCableTestPlugin.dll"
-""-"Z:\resource\DevDiagBatteryChargerCableTestPluginRsc.rsc"
-""-"Z:\resource\plugins\DevDiagBatteryChargerCableTestPlugin.rsc"
-
-;; Browser Plugin (direct include)
-""-"Z:\resource\devdiagbrowserpluginrsc.rsc"
-""-"Z:\sys\bin\devdiagbrowserplugin.dll"
-""-"Z:\resource\devdiagbrowserpluginrsc.rsc"
-""-"Z:\resource\plugins\devdiagbrowserplugin.rsc"
-
-;; Data Plugin (direct include)
-""-"Z:\resource\DevDiagDataNetworkTestPluginRsc.rsc"
-""-"Z:\sys\bin\DevDiagDataNetworkTestPlugin.dll"
-""-"Z:\resource\DevDiagDataNetworkTestPluginRsc.rsc"
-""-"Z:\resource\plugins\DevDiagDataNetworkTestPlugin.rsc"
-
-;; External Media Card Plugin (direct include)
-""-"Z:\resource\DevDiagExternalMediaCardPluginRsc.rsc"
-""-"Z:\sys\bin\DevDiagExternalMediaCardPlugin.dll"
-""-"Z:\resource\DevDiagExternalMediaCardPluginRsc.rsc"
-""-"Z:\resource\plugins\DevDiagExternalMediaCardPlugin.rsc"
-
-;; Headset Plugin (direct include)
-""-"Z:\resource\DevDiagHeadsetCableTestPluginRsc.rsc"
-""-"Z:\sys\bin\DevDiagHeadsetCableTestPlugin.dll"
-""-"Z:\resource\DevDiagHeadsetCableTestPluginRsc.rsc"
-""-"Z:\resource\plugins\DevDiagHeadsetCableTestPlugin.rsc"
-
-;; Internal Memory Plugin (direct include)
-""-"Z:\sys\bin\devdiaginternalmemoryplugin.dll"
-""-"Z:\resource\devdiaginternalmemorypluginrsc.rsc"
-""-"Z:\resource\plugins\devdiaginternalmemoryplugin.rsc"
-
-;; Network Coverage Plugin (direct include)
-""-"Z:\resource\DevDiagNetCoveragePluginRsc.rsc"
-""-"Z:\sys\bin\DevDiagNetCoveragePlugin.dll"
-""-"Z:\resource\DevDiagNetCoveragePluginRsc.rsc"
-""-"Z:\resource\plugins\DevDiagNetCoveragePlugin.rsc"
-
-;; Speaker Plugin (direct include)
-""-"Z:\resource\DevDiagSpeakerPluginRsc.rsc"
-""-"Z:\sys\bin\DevDiagSpeakerPlugin.dll"
-""-"Z:\resource\DevDiagSpeakerPluginRsc.rsc"
-""-"Z:\resource\plugins\DevDiagSpeakerPlugin.rsc"
-
-;; Vibrate Plugin (direct include)
-""-"Z:\resource\DevDiagVibratePluginRsc.rsc"
-""-"Z:\sys\bin\DevDiagVibratePlugin.dll"
-""-"Z:\resource\DevDiagVibratePluginRsc.rsc"
-""-"Z:\resource\plugins\DevDiagVibratePlugin.rsc"
-
-
-""-"Z:\resource\DevDiagUSBCableTestPluginRsc.rsc"
-""-"Z:\sys\bin\DevDiagUSBCableTestPlugin.dll"
-""-"Z:\resource\DevDiagUsbCableTestPluginRsc.rsc"
-""-"Z:\resource\plugins\DevDiagUSBCableTestPlugin.rsc"
-
Binary file devicediagnostics/sis/devdiagapp.sis has changed
--- a/devicediagnostics/sis/devdiagapp_sis.bat	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-rem
-rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-rem All rights reserved.
-rem This component and the accompanying materials are made available
-rem under the terms of "Eclipse Public License v1.0"
-rem which accompanies this distribution, and is available
-rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
-rem
-rem Initial Contributors:
-rem Nokia Corporation - initial contribution.
-rem
-rem Contributors:
-rem
-rem Description:
-rem
-
-@echo off
-echo.
-
-:armv5
-makesis devdiagapp.pkg devdiagapp.sis
-if '%errorlevel%'=='0' goto sign
-echo.
-echo SIS creation failed.
-echo Make sure ARMv5 files and plugin CenRep SIS files were built properly.
-goto end
-
-:sign
-echo.
-echo Signing devdiagapp.sis...
-signsis devdiagapp.sis devdiagapp.sisx L:\s60\mw\securityservices\appinstaller\AppinstUi\internal\RD_RootCA\rd.cer  L:\s60\mw\securityservices\appinstaller\AppinstUi\internal\RD_RootCA\rd-key.pem
-if '%errorlevel%'=='0' goto done
-echo SIS signing failed.  Check the certificates.
-goto end
-
-:done
-echo Created devdiagapp.sisx
-#del /Q devdiagapp_Udeb.sis
-:end
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/adapters/bld/bld.inf	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,25 @@
+/*
+* Copyright (c) 2002 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:    for building DM adapters
+*
+*/
+
+
+
+
+
+#include "../devinfo/bld/bld.inf"
+#include "../devdetail/bld/bld.inf"
+#include "../syncmldm12/bld/bld.inf"
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/adapters/devdetail/bld/DevDetail_HwV.txt	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,1 @@
+0000
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/adapters/devdetail/bld/DevDetail_SwV.txt	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,1 @@
+xxx-xxx 0.00 00
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/adapters/devdetail/bld/bld.inf	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,32 @@
+/*
+* Copyright (c) 2002 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:    build info file for DevDetail adapter
+*
+*/
+
+
+
+
+PRJ_EXPORTS
+./DevDetail_SwV.txt /epoc32/release/winscw/udeb/z/resource/devman/devdetail_swv.txt
+./DevDetail_SwV.txt /epoc32/release/winscw/urel/z/resource/devman/devdetail_swv.txt
+./DevDetail_HwV.txt /epoc32/release/winscw/udeb/z/resource/devman/devdetail_hwv.txt
+./DevDetail_HwV.txt /epoc32/release/winscw/urel/z/resource/devman/devdetail_hwv.txt
+
+PRJ_MMPFILES
+./nsmldmdevdetailadapter.mmp
+
+
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/adapters/devdetail/bld/nsmldmdevdetailadapter.mmp	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,70 @@
+/*
+* Copyright (c) 2004 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 devdetail adapter
+*
+*/
+
+
+
+
+#include "defaultcaps.hrh"
+#include  <platform_paths.hrh>
+
+//This flag is used for enabling Fota Multi-ROFS Support
+MACRO	_ENABLE_MULTIROFS_SUPPORT
+
+TARGET          nsmldmdevdetailadapter.dll
+TARGETTYPE      PLUGIN
+UID             0x10009D8D 0x101F6DE9
+VENDORID        VID_DEFAULT
+CAPABILITY  CAP_GENERAL_DLL
+
+APP_LAYER_SYSTEMINCLUDE
+SYSTEMINCLUDE   /epoc32/include/ecom
+
+SOURCEPATH      ../src
+USERINCLUDE     ../inc
+USERINCLUDE     ../../inc
+SOURCE          nsmldmdevdetailadapter.cpp
+
+//#if defined(ARMCC)
+SOURCE          nsmldmdevdetailutils_ARM.cpp
+//#elif defined(WINSCW)
+//SOURCE          nsmldmdevdetailutils_WINSCW.cpp
+//#endif
+
+START RESOURCE nsmldmdevdetailadapter.rss
+LANGUAGE_IDS
+END
+
+
+
+
+//#if defined(ARMCC)
+LIBRARY sysutil.lib
+//#elif defined(WINSCW)
+//LIBRARY efsrv.lib
+//#endif
+
+
+LIBRARY         euser.lib 
+LIBRARY         ecom.lib 
+LIBRARY         nsmldebug.lib
+LIBRARY         nsmlagentcommon.lib
+
+//For Multi-ROFS Support
+LIBRARY			  sysversioninfo.lib
+
+
+SMPSAFE
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/adapters/devdetail/inc/nsmldmdevdetailadapter.h	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,164 @@
+/*
+* Copyright (c) 2004 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:    DM DevDetail Adapter
+*
+*/
+
+
+
+
+#ifndef __NSMLDMDEVDETAILADAPTER_H__
+#define __NSMLDMDEVDETAILADAPTER_H__
+
+// INCLUDES
+
+#include <e32base.h>
+#include <smldmadapter.h>
+#include "nsmldmconstants.h"
+
+// the DDF version must be changed if any changes in DDF structure 
+// ( built in DDFStructureL() function )
+_LIT8( KNSmlDMDevDetailDDFVersion, "1.0" ); 
+
+_LIT8( KNSmlDMDevDetailTextPlain, "text/plain" );
+_LIT8( KNSmlDMDevDetailNodeName, "DevDetail" );
+_LIT8( KNSmlDMDevDetailDescription, "The interior object holds all DevDetail objects" );
+
+_LIT8( KNSmlDMDevDetailDevTypNodeName, "DevTyp" );
+_LIT8( KNSmlDMDevDetailDevTypDescription, "The type of the device" );
+_LIT8( KNSmlDMDevDetailDevTypValue, "smartphone" );
+
+_LIT8( KNSmlDMDevDetailOEMNodeName, "OEM" );
+_LIT8( KNSmlDMDevDetailOEMDescription, "Original Equipment Manufacturer" );
+
+_LIT8( KNSmlDMDevDetailFwVNodeName, "FwV" );
+_LIT8( KNSmlDMDevDetailFwVDescription, "The firmware revision of the device" );
+
+_LIT8( KNSmlDMDevDetailSwVNodeName, "SwV" );
+_LIT8( KNSmlDMDevDetailSwVDescription, "The software revision of the device" );
+
+_LIT8( KNSmlDMDevDetailHwVNodeName, "HwV" );
+_LIT8( KNSmlDMDevDetailHwVDescription, "The hardware revision of the device" );
+
+_LIT8( KNSmlDMDevDetailLrgObjNodeName, "LrgObj" );
+_LIT8( KNSmlDMDevDetailLrgObjDescription, "Large object handling supported if value is true" );
+_LIT8( KNSmlDMDevDetailLrgObjValue, "true" );
+
+_LIT8( KNSmlDMDevDetailURINodeName, "URI" );
+_LIT8( KNSmlDMDevDetailURIDescription, "The tree limitations branch" );
+
+_LIT8( KNSmlDMDevDetailMaxDepthNodeName, "MaxDepth" );
+_LIT8( KNSmlDMDevDetailMaxDepthDescription, "Maximum tree depth" );
+_LIT8( KNSmlDMDevDetailMaxDepthValue, "0" );
+
+_LIT8( KNSmlDMDevDetailMaxTotLenNodeName, "MaxTotLen" );
+_LIT8( KNSmlDMDevDetailMaxTotLenDescription, "Maximum URI length" );
+_LIT8( KNSmlDMDevDetailMaxTotLenValue, "0" );
+
+_LIT8( KNSmlDMDevDetailMaxSegLenNodeName, "MaxSegLen" );
+_LIT8( KNSmlDMDevDetailMaxSegLenDescription, "Maximum URI segment length" );
+_LIT8( KNSmlDMDevDetailMaxSegLenValue, "9" );
+
+_LIT8( KNSmlDMDevDetailSeparator, "/" );
+
+const TInt KNSmlMaxRequestBufferLength = 128;
+const TInt KNSmlMaxSizeBufferLength = 4;
+
+_LIT( KNSmlDevDetailPanic,      "DevDetail" );
+
+// CLASS DECLARATION
+class CNSmlDmDevDetailAdapter : public CSmlDmAdapter
+    {
+public:  // contructors and destructor
+    static CNSmlDmDevDetailAdapter* NewL(MSmlDmCallback* aDmCallback );
+    static CNSmlDmDevDetailAdapter* NewLC(MSmlDmCallback* aDmCallback );
+
+    virtual ~CNSmlDmDevDetailAdapter();
+    virtual TInt DevDetailValueCrcL();
+
+private: // new functions
+    CNSmlDmDevDetailAdapter(TAny* aEcomArguments);
+    void AddObjectToBufferL( CBufBase& aCrcBuf, const TDesC8& aURI ); 
+    CSmlDmAdapter::TError FetchLeafObjectL( const TDesC8& aURI, CBufBase& aObject ); 
+    void SetLeafPropertiesL( MSmlDmDDFObject& aObject, 
+                             const TSmlDmAccessTypes& aAccessTypes, 
+                             const TDesC8& aDescription ) const;
+            
+private: // functions from base classes
+    // from CSmlDmAdapter
+    void DDFVersionL( CBufBase& aVersion );
+    void DDFStructureL( MSmlDmDDFObject& aDDF );
+    void UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, 
+                            const TDesC8& aObject, const TDesC8& aType, 
+                            const TInt aStatusRef );
+    void DeleteObjectL( const TDesC8& aURI, const TDesC8& aLUID, const TInt aStatusRef ); 
+    void FetchLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, 
+                           const TDesC8& aType, const TInt aResultsRef, 
+                           const TInt aStatusRef ); 
+    void ChildURIListL( const TDesC8& aURI, const TDesC8& aLUID, 
+                        const CArrayFix<TSmlDmMappingInfo>& aPreviousURISegmentList, 
+                        const TInt aResultsRef, const TInt aStatusRef );  
+    void AddNodeObjectL( const TDesC8& aURI, const TDesC8& aParentLUID, 
+                         const TInt aStatusRef );
+    void UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, 
+                            RWriteStream*& aStream, const TDesC8& aType, 
+                            const TInt aStatusRef );
+    void FetchLeafObjectSizeL( const TDesC8& aURI, const TDesC8& aLUID, 
+                               const TDesC8& aType, const TInt aResultsRef, 
+                               const TInt aStatusRef );
+    void ExecuteCommandL( const TDesC8& aURI, const TDesC8& aLUID, const TDesC8& aArgument, 
+                          const TDesC8& aType, const TInt aStatusRef );
+    void ExecuteCommandL( const TDesC8& aURI, const TDesC8& aLUID, RWriteStream*& aStream, 
+                          const TDesC8& aType, const TInt aStatusRef );
+    void CopyCommandL( const TDesC8& aTargetURI, const TDesC8& aTargetLUID, 
+                       const TDesC8& aSourceURI, const TDesC8& aSourceLUID, 
+                       const TDesC8& aType, TInt aStatusRef );
+    void StartAtomicL();
+    void CommitAtomicL();
+    void RollbackAtomicL();
+    TBool StreamingSupport( TInt& aItemSize );
+    void StreamCommittedL();
+    void CompleteOutstandingCmdsL();
+
+// FOTA
+private:
+
+    /**
+    * Enumeration specifies the data that can be fetched using
+    * GetDevDetailDataL().
+    */
+    enum TNSmlDevDetailData
+        {
+        ESwVersion,
+        EHwVersion
+        };
+
+    /**
+    * Fetches and/or forms DevDetail data specified by aElement.
+    * In WINSCW this data is read from file. In ARM builds the 
+    * data is fetched from EInfo.
+    * @param aObject The buffer where fetched data is inserted.
+    * @param aElement Specifies the data that should be fetched.
+    */
+    void GetDevDetailDataL( CBufBase& aObject, TNSmlDevDetailData aElement ) const;
+	
+// FOTA end
+
+private:
+
+    MSmlDmCallback* iDmCallback;
+    
+    };
+
+#endif // __NSMLDMDEVDETAILADAPTER_H__
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/adapters/devdetail/src/nsmldmdevdetailadapter.cpp	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,561 @@
+/*
+* Copyright (c) 2004 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:    DM DevDetail Adapter Source Code
+*
+*/
+
+
+
+
+// INCLUDE FILES
+#include <implementationproxy.h> // For TImplementationProxy definition
+
+#include "nsmldmimpluids.h"
+#include "nsmldmdevdetailadapter.h"
+#include "nsmldebug.h"
+#include "nsmlphoneinfo.h"
+#include "nsmlunicodeconverter.h"
+#include "nsmlconstants.h"
+
+
+// ------------------------------------------------------------------------------------------------
+// CNSmlDmDevDetailAdapter::NewL( )
+// ------------------------------------------------------------------------------------------------
+CNSmlDmDevDetailAdapter* CNSmlDmDevDetailAdapter::NewL(MSmlDmCallback* aDmCallback )
+    {
+    _DBG_FILE("CNSmlDmDevDetailAdapter::NewL(): begin");
+    CNSmlDmDevDetailAdapter* self = NewLC( aDmCallback );
+    CleanupStack::Pop();
+    _DBG_FILE("CNSmlDmDevDetailAdapter::NewL(): end");
+    return self;
+    }
+
+// ------------------------------------------------------------------------------------------------
+// CNSmlDmDevDetailAdapter::NewLC( )
+// ------------------------------------------------------------------------------------------------
+CNSmlDmDevDetailAdapter* CNSmlDmDevDetailAdapter::NewLC(MSmlDmCallback* aDmCallback )
+    {
+    _DBG_FILE("CNSmlDmDevDetailAdapter::NewLC(): begin");
+    CNSmlDmDevDetailAdapter* self = new (ELeave) CNSmlDmDevDetailAdapter(aDmCallback);
+    CleanupStack::PushL(self);
+    self->iDmCallback=aDmCallback;
+    _DBG_FILE("CNSmlDmDevDetailAdapter::NewLC(): end");
+    return self;
+    }
+
+    
+// ------------------------------------------------------------------------------------------------
+// CNSmlDmDevDetailAdapter::CNSmlDmDevDetailAdapter(TAny* aEcomArguments)
+// ------------------------------------------------------------------------------------------------
+CNSmlDmDevDetailAdapter::CNSmlDmDevDetailAdapter(TAny* aEcomArguments):CSmlDmAdapter(aEcomArguments)
+    {
+    _DBG_FILE("CNSmlDmDevDetailAdapter::CNSmlDmDevDetailAdapter(): begin");
+    _DBG_FILE("CNSmlDmDevDetailAdapter::CNSmlDmDevDetailAdapter(): end");
+    }
+
+// -----------------------------------------------------------------------------
+// CNSmlDmDevDetailAdapter::~CNSmlDmDevDetailAdapter()
+// -----------------------------------------------------------------------------
+CNSmlDmDevDetailAdapter::~CNSmlDmDevDetailAdapter()
+    {
+    _DBG_FILE("CNSmlDmDevDetailAdapter::~CNSmlDmDevDetailAdapter(): begin");
+    _DBG_FILE("CNSmlDmDevDetailAdapter::~CNSmlDmDevDetailAdapter(): end");
+    }
+
+// -----------------------------------------------------------------------------
+// CNSmlDmDevDetailAdapter::DevDetailValueCrcL()
+// -----------------------------------------------------------------------------
+TInt CNSmlDmDevDetailAdapter::DevDetailValueCrcL()
+    {
+    CBufBase* crcBuf = CBufFlat::NewL( 1 );
+    CleanupStack::PushL( crcBuf );
+    
+    AddObjectToBufferL( *crcBuf, KNSmlDMDevDetailDevTypNodeName() );
+    AddObjectToBufferL( *crcBuf, KNSmlDMDevDetailOEMNodeName() );
+    AddObjectToBufferL( *crcBuf, KNSmlDMDevDetailFwVNodeName() );
+    AddObjectToBufferL( *crcBuf, KNSmlDMDevDetailSwVNodeName() );
+    AddObjectToBufferL( *crcBuf, KNSmlDMDevDetailHwVNodeName() );
+    AddObjectToBufferL( *crcBuf, KNSmlDMDevDetailLrgObjNodeName() );
+    AddObjectToBufferL( *crcBuf, KNSmlDMDevDetailMaxDepthNodeName() );
+    AddObjectToBufferL( *crcBuf, KNSmlDMDevDetailMaxTotLenNodeName() );
+    AddObjectToBufferL( *crcBuf, KNSmlDMDevDetailMaxSegLenNodeName() );
+    
+    TUint16 crc = 0;
+    Mem::Crc( crc, crcBuf->Ptr(0).Ptr(), crcBuf->Size() );
+    CleanupStack::PopAndDestroy();  // crcBuf
+    return crc;
+    }
+
+// -----------------------------------------------------------------------------
+// CNSmlDmDevDetailAdapter::AddObjectToBufferL()
+// -----------------------------------------------------------------------------
+void CNSmlDmDevDetailAdapter::AddObjectToBufferL( CBufBase& aCrcBuf, 
+                                                  const TDesC8& aURI )
+    {
+    CBufBase* buf = CBufFlat::NewL( 1 );
+    CleanupStack::PushL( buf );
+    FetchLeafObjectL( aURI, *buf );
+    aCrcBuf.InsertL( aCrcBuf.Size(), buf->Ptr(0) );
+    _LIT8( KNSmlDmSeparator, ";" );
+    aCrcBuf.InsertL( aCrcBuf.Size(), KNSmlDmSeparator );
+    CleanupStack::PopAndDestroy(); //buf    
+    }
+
+// -----------------------------------------------------------------------------
+// CNSmlDmDevDetailAdapter::FetchLeafObjectL()
+// -----------------------------------------------------------------------------
+CSmlDmAdapter::TError CNSmlDmDevDetailAdapter::FetchLeafObjectL( const TDesC8& aURI, 
+                                                                 CBufBase& aObject )
+    {
+    _DBG_FILE("CNSmlDmDevDetailAdapter::FetchLeafObjectL(): begin");
+    CSmlDmAdapter::TError retValue = CSmlDmAdapter::EOk;
+
+    TInt ret = aURI.LocateReverse(KNSmlDMDevDetailSeparator()[0]);
+    if ( ret == KErrNotFound ) 
+        {
+        ret = -1;
+        }
+    TInt len = aURI.Length() - ( ret + 1 );
+    TPtrC8 segment = aURI.Right( len );
+    if ( segment == KNSmlDMDevDetailDevTypNodeName )
+        {
+        aObject.InsertL( 0, KNSmlDMDevDetailDevTypValue );
+        }
+    else
+    if ( segment == KNSmlDMDevDetailOEMNodeName )
+        {
+        CNSmlPhoneInfo* phoneInfo = CNSmlPhoneInfo::NewLC();
+        HBufC* manufacturer = HBufC::NewLC( 50 );
+        TPtr manufacturerPtr = manufacturer->Des();  
+        phoneInfo->PhoneDataL( CNSmlPhoneInfo::EPhoneManufacturer, manufacturerPtr );
+        HBufC8* manufacturerInUTF8 = NULL;
+        NSmlUnicodeConverter::HBufC8InUTF8LC( *manufacturer, manufacturerInUTF8 );
+        aObject.InsertL( 0, *manufacturerInUTF8 );
+        CleanupStack::PopAndDestroy( 3 ); //manufacturerInUTF8, manufacturer, phoneInfo
+        }
+    else
+    if ( segment == KNSmlDMDevDetailSwVNodeName )
+        {
+        // fetch software version
+        GetDevDetailDataL( aObject, ESwVersion );
+        }
+    else
+    if ( segment == KNSmlDMDevDetailHwVNodeName )
+        {
+        // fetch hardware version
+        GetDevDetailDataL( aObject, EHwVersion );
+        }
+    else
+    if ( segment == KNSmlDMDevDetailLrgObjNodeName )
+        {
+        aObject.InsertL( 0, KNSmlDMDevDetailLrgObjValue );
+        }
+    else
+    if ( segment == KNSmlDMDevDetailMaxDepthNodeName )
+        {
+        aObject.InsertL( 0, KNSmlDMDevDetailMaxDepthValue );
+        }
+    else
+    if ( segment == KNSmlDMDevDetailMaxTotLenNodeName )
+        {
+        aObject.InsertL( 0, KNSmlDMDevDetailMaxTotLenValue );
+        }
+    else
+    if ( segment == KNSmlDMDevDetailMaxSegLenNodeName )
+        {
+        aObject.InsertL( 0, KNSmlDMDevDetailMaxSegLenValue );
+        }
+    else
+    if ( segment != KNSmlDMDevDetailFwVNodeName )
+        {
+        retValue = CSmlDmAdapter::EError;
+        }
+        
+    _DBG_FILE("CNSmlDmDevDetailAdapter::FetchLeafObjectL(): end");
+    return retValue;
+    }
+// -----------------------------------------------------------------------------
+// CNSmlDmDevDetailAdapter::SetLeafPropertiesL()
+// -----------------------------------------------------------------------------
+void CNSmlDmDevDetailAdapter::SetLeafPropertiesL( MSmlDmDDFObject& aObject, 
+                                                  const TSmlDmAccessTypes& aAccessTypes,  
+                                                  const TDesC8& aDescription ) const
+    {
+    aObject.SetAccessTypesL( aAccessTypes );
+    aObject.SetScopeL( MSmlDmDDFObject::EPermanent );
+    aObject.SetDFFormatL( MSmlDmDDFObject::EChr );
+    aObject.AddDFTypeMimeTypeL( KNSmlDMDevDetailTextPlain );
+    aObject.SetDescriptionL( aDescription );
+    }
+
+
+
+// -----------------------------------------------------------------------------
+// CNSmlDmDevDetailAdapter::DDFVersionL()
+// -----------------------------------------------------------------------------
+void CNSmlDmDevDetailAdapter::DDFVersionL(CBufBase& aDDFVersion)
+    {
+    _DBG_FILE("CNSmlDmDevDetailAdapter::DDFVersionL(TDes& aDDFVersion): begin");
+    aDDFVersion.InsertL(0,KNSmlDMDevDetailDDFVersion);
+    _DBG_FILE("CNSmlDmDevDetailAdapter::DDFVersionL(TDes& aDDFVersion): end");
+    }
+
+
+// -----------------------------------------------------------------------------
+// void CNSmlDmDevDetailAdapter::DDFStructureL()
+//
+// -----------------------------------------------------------------------------
+void CNSmlDmDevDetailAdapter::DDFStructureL( MSmlDmDDFObject& aDDF )
+    {
+    _DBG_FILE("CNSmlDmDevDetailAdapter::DDFStructureL(): begin");
+    
+    TSmlDmAccessTypes accessTypes;
+    
+    accessTypes.SetGet();
+    // DevDetail
+    MSmlDmDDFObject& devDetail = aDDF.AddChildObjectL( KNSmlDMDevDetailNodeName );
+    devDetail.SetAccessTypesL( accessTypes ); 
+    devDetail.SetScopeL( MSmlDmDDFObject::EPermanent );
+    devDetail.SetDescriptionL( KNSmlDMDevDetailDescription );
+
+    // DevTyp   
+    MSmlDmDDFObject& devTyp = devDetail.AddChildObjectL(KNSmlDMDevDetailDevTypNodeName );
+    SetLeafPropertiesL( devTyp, accessTypes, KNSmlDMDevDetailDevTypDescription );
+    // OEM  
+    MSmlDmDDFObject& oem = devDetail.AddChildObjectL(KNSmlDMDevDetailOEMNodeName);
+    SetLeafPropertiesL( oem, accessTypes, KNSmlDMDevDetailOEMDescription );
+    // FwV  
+    MSmlDmDDFObject& fwv = devDetail.AddChildObjectL(KNSmlDMDevDetailFwVNodeName);
+    SetLeafPropertiesL( fwv, accessTypes, KNSmlDMDevDetailFwVDescription );
+    // SwV  
+    MSmlDmDDFObject& swv = devDetail.AddChildObjectL( KNSmlDMDevDetailSwVNodeName );
+    SetLeafPropertiesL( swv, accessTypes, KNSmlDMDevDetailSwVDescription );
+    // HwV  
+    MSmlDmDDFObject& hwv = devDetail.AddChildObjectL(KNSmlDMDevDetailHwVNodeName );
+    SetLeafPropertiesL( hwv, accessTypes, KNSmlDMDevDetailHwVDescription );
+    // LrgObj   
+    MSmlDmDDFObject& lrgObj = devDetail.AddChildObjectL(KNSmlDMDevDetailLrgObjNodeName );
+    SetLeafPropertiesL( lrgObj, accessTypes, KNSmlDMDevDetailLrgObjDescription );
+    lrgObj.SetDFFormatL( MSmlDmDDFObject::EBool );
+    // URI
+    MSmlDmDDFObject& uri = devDetail.AddChildObjectL(KNSmlDMDevDetailURINodeName);
+    uri.SetAccessTypesL( accessTypes );
+    uri.SetScopeL( MSmlDmDDFObject::EPermanent );
+    uri.SetDescriptionL( KNSmlDMDevDetailURIDescription );
+    // MaxDepth
+    MSmlDmDDFObject& maxDepth = uri.AddChildObjectL( KNSmlDMDevDetailMaxDepthNodeName);
+    SetLeafPropertiesL( maxDepth, accessTypes, KNSmlDMDevDetailMaxDepthDescription );
+    // MaxTotLen
+    MSmlDmDDFObject& maxTotLen = uri.AddChildObjectL( KNSmlDMDevDetailMaxTotLenNodeName );
+    SetLeafPropertiesL( maxTotLen, accessTypes, KNSmlDMDevDetailMaxTotLenDescription );
+    // MaxSegLen
+    MSmlDmDDFObject& maxSegLen = uri.AddChildObjectL( KNSmlDMDevDetailMaxSegLenNodeName);
+    SetLeafPropertiesL( maxSegLen, accessTypes, KNSmlDMDevDetailMaxSegLenDescription );
+        
+    _DBG_FILE("CNSmlDmDevDetailAdapter::DDFStructureL(): end");
+    }
+
+// -----------------------------------------------------------------------------
+// CNSmlDmDevDetailAdapter::UpdateLeafObjectL()
+// -----------------------------------------------------------------------------
+void  CNSmlDmDevDetailAdapter::UpdateLeafObjectL( const TDesC8& /*aURI*/, 
+                                                  const TDesC8& /*aLUID*/, 
+                                                  const TDesC8& /*aObject*/, 
+                                                  const TDesC8& /*aType*/,
+                                                  const TInt aStatusRef )
+    {
+    _DBG_FILE("CNSmlDmDevDetailAdapter::UpdateLeafObjectL(): begin");
+    _DBG_FILE("CNSmlDmDevDetailAdapter::UpdateLeafObjectL(): end");
+    iDmCallback->SetStatusL(aStatusRef,CSmlDmAdapter::EError);
+    }
+
+
+// -----------------------------------------------------------------------------
+//  CNSmlDmDevDetailAdapter::DeleteObjectL()
+// -----------------------------------------------------------------------------
+void  CNSmlDmDevDetailAdapter::DeleteObjectL( const TDesC8& /*aURI*/, 
+                                              const TDesC8& /*aLUID*/,
+                                              const TInt aStatusRef )
+    {
+    _DBG_FILE("CNSmlDmDevDetailAdapter::DeleteLeafObjectL( ): begin");
+    _DBG_FILE("CNSmlDmDevDetailAdapter::DeleteLeafObjectL( ): end");
+    iDmCallback->SetStatusL(aStatusRef,CSmlDmAdapter::EError);
+    }
+
+
+// -----------------------------------------------------------------------------
+// CNSmlDmDevDetailAdapter::FetchLeafObjectL()
+// -----------------------------------------------------------------------------
+void  CNSmlDmDevDetailAdapter::FetchLeafObjectL( const TDesC8& aURI, 
+                                                 const TDesC8& /*aLUID*/, 
+                                                 const TDesC8& aType, 
+                                                 const TInt aResultsRef, 
+                                                 const TInt aStatusRef )
+    {
+    _DBG_FILE("CNSmlDmDevDetailAdapter::FetchLeafObjectL(): begin");
+    CBufBase *object = CBufFlat::NewL( 1 );
+    CleanupStack::PushL( object );
+    CSmlDmAdapter::TError retValue = FetchLeafObjectL( aURI, *object );
+
+    iDmCallback->SetStatusL( aStatusRef, retValue );
+    iDmCallback->SetResultsL( aResultsRef, *object, aType);
+    CleanupStack::PopAndDestroy(); //object
+        
+    _DBG_FILE("CNSmlDmDevDetailAdapter::FetchLeafObjectL(): end");
+    }
+
+
+// -----------------------------------------------------------------------------
+// CSmlDmAdapter::TError CNSmlDmDevDetailAdapter::ChildURIListL()
+// -----------------------------------------------------------------------------
+
+void  CNSmlDmDevDetailAdapter::ChildURIListL( const TDesC8& aURI, 
+                                              const TDesC8& /*aLUID*/, 
+                                              const CArrayFix<TSmlDmMappingInfo>& /*aPreviousURISegmentList*/, 
+                                              const TInt aResultsRef, 
+                                              const TInt aStatusRef )
+    {
+    _DBG_FILE("CNSmlDmDevDetailAdapter::ChildURIListL(): begin");
+    CSmlDmAdapter::TError retValue = CSmlDmAdapter::EOk;
+    CBufBase *currentURISegmentList = CBufFlat::NewL(64);
+    CleanupStack::PushL(currentURISegmentList);
+
+    TInt ret = aURI.LocateReverse(KNSmlDMDevDetailSeparator()[0]);
+    if ( ret == KErrNotFound ) 
+        {
+        ret = -1;
+        }
+    TInt len = aURI.Length() - ( ret + 1 );
+    TPtrC8 segment = aURI.Right( len );
+
+    if ( segment == KNSmlDMDevDetailNodeName )
+        {
+        currentURISegmentList->InsertL( currentURISegmentList->Size(), KNSmlDMDevDetailDevTypNodeName() );
+        currentURISegmentList->InsertL( currentURISegmentList->Size(), KNSmlDMDevDetailSeparator() );
+        currentURISegmentList->InsertL( currentURISegmentList->Size(), KNSmlDMDevDetailOEMNodeName() );
+        currentURISegmentList->InsertL( currentURISegmentList->Size(), KNSmlDMDevDetailSeparator() );
+        currentURISegmentList->InsertL( currentURISegmentList->Size(), KNSmlDMDevDetailFwVNodeName() );
+        currentURISegmentList->InsertL( currentURISegmentList->Size(), KNSmlDMDevDetailSeparator() );
+        currentURISegmentList->InsertL( currentURISegmentList->Size(), KNSmlDMDevDetailSwVNodeName() );
+        currentURISegmentList->InsertL( currentURISegmentList->Size(), KNSmlDMDevDetailSeparator() );
+         currentURISegmentList->InsertL( currentURISegmentList->Size(), KNSmlDMDevDetailHwVNodeName() );
+        currentURISegmentList->InsertL( currentURISegmentList->Size(), KNSmlDMDevDetailSeparator() );
+        currentURISegmentList->InsertL( currentURISegmentList->Size(), KNSmlDMDevDetailLrgObjNodeName() );
+        currentURISegmentList->InsertL( currentURISegmentList->Size(), KNSmlDMDevDetailSeparator() );
+         currentURISegmentList->InsertL( currentURISegmentList->Size(), KNSmlDMDevDetailURINodeName() );
+        }
+    else
+    if ( segment == KNSmlDMDevDetailURINodeName )
+        {
+        currentURISegmentList->InsertL( currentURISegmentList->Size(), KNSmlDMDevDetailMaxDepthNodeName() );
+        currentURISegmentList->InsertL( currentURISegmentList->Size(), KNSmlDMDevDetailSeparator() );
+        currentURISegmentList->InsertL( currentURISegmentList->Size(), KNSmlDMDevDetailMaxTotLenNodeName() );
+        currentURISegmentList->InsertL( currentURISegmentList->Size(), KNSmlDMDevDetailSeparator() );
+        currentURISegmentList->InsertL( currentURISegmentList->Size(), KNSmlDMDevDetailMaxSegLenNodeName() );
+        }
+    else
+        {
+        retValue = CSmlDmAdapter::EError;
+        }
+
+    iDmCallback->SetStatusL(aStatusRef,retValue);
+    iDmCallback->SetResultsL(aResultsRef,*currentURISegmentList,KNullDesC8);
+    CleanupStack::PopAndDestroy(); //currentURISegmentList;
+    _DBG_FILE("CNSmlDmDevDetailAdapter::ChildURIListL(): end");
+    }
+
+// -----------------------------------------------------------------------------
+// CNSmlDmDevDetailAdapter::AddNodeObjectL()
+// -----------------------------------------------------------------------------
+void  CNSmlDmDevDetailAdapter::AddNodeObjectL( const TDesC8& /*aURI*/, 
+                                               const TDesC8& /*aParentLUID*/,
+                                               const TInt aStatusRef )
+    {
+    _DBG_FILE("CNSmlDmDevDetailAdapter::AddNodeObjectL(): begin");
+    _DBG_FILE("CNSmlDmDevDetailAdapter::AddNodeObjectL(): end");
+    iDmCallback->SetStatusL(aStatusRef,CSmlDmAdapter::EError);
+    }
+
+// -----------------------------------------------------------------------------
+//  CNSmlDmDevDetailAdapter::UpdateLeafObjectL(const TDesC8& aURI, 
+// const TDesC8& aLUID, RWriteStream*& aStream, const TDesC8& aType, 
+// const TInt aStatusRef)
+// -----------------------------------------------------------------------------
+void CNSmlDmDevDetailAdapter::UpdateLeafObjectL( const TDesC8& /*aURI*/, 
+                                                 const TDesC8& /*aLUID*/, 
+                                                 RWriteStream*& /*aStream*/, 
+                                                 const TDesC8& /*aType*/, 
+                                                 const TInt aStatusRef )
+    {
+    _DBG_FILE("CNSmlDmDevInfoAdapter::UpdateLeafObjectL(): stream: begin");
+    iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
+    _DBG_FILE("CNSmlDmDevInfoAdapter::UpdateLeafObjectL(): stream: end");
+    }
+
+// -----------------------------------------------------------------------------
+//  CNSmlDmDevDetailAdapter::FetchLeafObjectSizeL( const TDesC8& aURI, 
+// const TDesC8& aLUID, const TDesC8& aType, const TInt aResultsRef, 
+// const TInt aStatusRef )
+// -----------------------------------------------------------------------------
+void CNSmlDmDevDetailAdapter::FetchLeafObjectSizeL( const TDesC8& aURI, 
+                                                    const TDesC8& /*aLUID*/, 
+                                                    const TDesC8& aType, 
+                                                    const TInt aResultsRef, 
+                                                    const TInt aStatusRef )
+    {
+    _DBG_FILE("CNSmlDmDevDetailAdapter::FetchLeafObjectSizeL(): begin");
+
+    CBufBase *object = CBufFlat::NewL( 1 );
+    CleanupStack::PushL( object );
+    CSmlDmAdapter::TError retValue = FetchLeafObjectL( aURI, *object );
+
+    TInt objSizeInBytes = object->Size();
+    TBuf8<KNSmlMaxSizeBufferLength> stringObjSizeInBytes;
+    stringObjSizeInBytes.Num( objSizeInBytes );
+    object->Reset();
+    object->InsertL( 0, stringObjSizeInBytes );
+    
+    iDmCallback->SetStatusL( aStatusRef, retValue );
+    iDmCallback->SetResultsL( aResultsRef, *object, aType);
+    CleanupStack::PopAndDestroy(); //object 
+
+            
+    _DBG_FILE("CNSmlDmDevDetailAdapter::FetchLeafObjectSizeL(): end");
+    }
+    
+// -----------------------------------------------------------------------------
+//  CNSmlDmDevDetailAdapter::ExecuteCommandL( const TDesC8& aURI, 
+//  const TDesC8& aParentLUID, TDesC8& aArgument, const TDesC8& aType, 
+//  TInt aStatusRef )
+// -----------------------------------------------------------------------------
+void CNSmlDmDevDetailAdapter::ExecuteCommandL( const TDesC8& /*aURI*/, const TDesC8& /*aLUID*/, const TDesC8& /*aArgument*/, const TDesC8& /*aType*/, const TInt aStatusRef )
+    {
+    _DBG_FILE("CNSmlDmDevInfoAdapter::ExecuteCommandL(): begin");
+    iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
+    _DBG_FILE("CNSmlDmDevInfoAdapter::ExecuteCommandL(): end");
+    }
+
+// -----------------------------------------------------------------------------
+//  CNSmlDmDevDetailAdapter::ExecuteCommandL( const TDesC8& aURI, 
+//  const TDesC8& aParentLUID, RWriteStream*& aStream, const TDesC8& aType, 
+//  const TInt aStatusRef )
+// -----------------------------------------------------------------------------
+void CNSmlDmDevDetailAdapter::ExecuteCommandL( const TDesC8& /*aURI*/, 
+                                               const TDesC8& /*aParentLUID*/, 
+                                               RWriteStream*& /*aStream*/, 
+                                               const TDesC8& /*aType*/, 
+                                               const TInt aStatusRef )
+    {
+    _DBG_FILE("CNSmlDmDevInfoAdapter::ExecuteCommandL(): stream: begin");
+    iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
+    _DBG_FILE("CNSmlDmDevInfoAdapter::ExecuteCommandL(): stream: end");
+    }
+// -----------------------------------------------------------------------------
+//  CNSmlDmDevDetailAdapter::CopyCommandL( const TDesC8& aTargetURI, 
+//  const TDesC8& aSourceURI, const TDesC8& aSourceLUID, const TDesC8& aType, 
+//  const TInt aStatusRef )
+// -----------------------------------------------------------------------------
+void CNSmlDmDevDetailAdapter::CopyCommandL( const TDesC8& /*aTargetURI*/, 
+                                            const TDesC8& /*aTargetLUID*/, 
+                                            const TDesC8& /*aSourceURI*/, 
+                                            const TDesC8& /*aSourceLUID*/, 
+                                            const TDesC8& /*aType*/, 
+                                            TInt aStatusRef )
+    {
+    _DBG_FILE("CNSmlDmDevInfoAdapter::CopyCommandL(): begin");
+    iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
+    _DBG_FILE("CNSmlDmDevInfoAdapter::CopyCommandL(): end");
+    }
+
+// ----------------------------------------
+//  CNSmlDmDevDetailAdapter::StartAtomicL()
+// ----------------------------------------
+void CNSmlDmDevDetailAdapter::StartAtomicL()
+    {
+    _DBG_FILE("CNSmlDmDevInfoAdapter::StartAtomicL(): begin");
+    _DBG_FILE("CNSmlDmDevInfoAdapter::StartAtomicL(): end");
+    }
+    
+// -----------------------------------------
+//  CNSmlDmDevDetailAdapter::CommitAtomicL()
+// -----------------------------------------
+void CNSmlDmDevDetailAdapter::CommitAtomicL()
+    {
+    _DBG_FILE("CNSmlDmDevInfoAdapter::CommitAtomicL(): begin");
+    _DBG_FILE("CNSmlDmDevInfoAdapter::CommitAtomicL(): end");
+    }
+
+// -------------------------------------------
+//  CNSmlDmDevDetailAdapter::RollbackAtomicL()
+// -------------------------------------------
+void CNSmlDmDevDetailAdapter::RollbackAtomicL()
+    {
+    _DBG_FILE("CNSmlDmDevInfoAdapter::RollbackAtomicL(): begin");
+    _DBG_FILE("CNSmlDmDevInfoAdapter::RollbackAtomicL(): end");
+    }
+
+// -------------------------------------------------------------
+//  CNSmlDmDevDetailAdapter::StreamingSupport( TInt& aItemSize )
+// -------------------------------------------------------------    
+TBool CNSmlDmDevDetailAdapter::StreamingSupport( TInt& /*aItemSize*/ )
+    {
+    _DBG_FILE("CNSmlDmDevInfoAdapter::StreamingSupport(): begin");
+    _DBG_FILE("CNSmlDmDevInfoAdapter::StreamingSupport(): end");
+    return EFalse;
+    }
+
+// --------------------------------------------
+//  CNSmlDmDevDetailAdapter::StreamCommittedL()
+// --------------------------------------------
+void CNSmlDmDevDetailAdapter::StreamCommittedL()
+    {
+    _DBG_FILE("CNSmlDmDevInfoAdapter::StreamCommittedL(): begin");
+    _DBG_FILE("CNSmlDmDevInfoAdapter::StreamCommittedL(): end");
+    }
+
+// ----------------------------------------------------
+//  CNSmlDmDevDetailAdapter::CompleteOutstandingCmdsL()
+// ---------------------------------------------------- 
+void CNSmlDmDevDetailAdapter::CompleteOutstandingCmdsL()
+    {
+    _DBG_FILE("CNSmlDmDevInfoAdapter::CompleteOutstandingCmdsL(): begin");
+    _DBG_FILE("CNSmlDmDevInfoAdapter::CompleteOutstandingCmdsL(): end");
+    }
+
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+
+#ifndef IMPLEMENTATION_PROXY_ENTRY
+#define IMPLEMENTATION_PROXY_ENTRY(aUid, aFuncPtr)  {{aUid},(aFuncPtr)}
+#endif
+
+const TImplementationProxy ImplementationTable[] = 
+    {
+        IMPLEMENTATION_PROXY_ENTRY(KNSmlDMDevDetailAdapterImplUid, 
+                                   CNSmlDmDevDetailAdapter::NewL)
+    };
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+EXPORT_C const TImplementationProxy* ImplementationGroupProxy( TInt& aTableCount )
+    {
+    _DBG_FILE("ImplementationGroupProxy() for CNSmlDmDevDetailAdapter: begin");
+    aTableCount = sizeof(ImplementationTable) / sizeof(TImplementationProxy);
+    _DBG_FILE("ImplementationGroupProxy() for CNSmlDmDevDetailAdapter: end");
+    return ImplementationTable;
+    }
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/adapters/devdetail/src/nsmldmdevdetailadapter.rss	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,66 @@
+/*
+* 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: Implementation of dm adapters
+* 	This is part of omadmextensions.
+*
+*/
+
+
+CHARACTER_SET UTF8
+
+/*
+* ============================================================================
+*  Name     : 101f6de9.rss
+*  Part of  : SyncMl
+*  Origin   : SyncML Phase 2 
+*  Created  : 06.03.2003
+*  Implementation notes:
+*     
+*  Version  : 0.1
+*   $Revision: 2 $, $Modtime: 10.05.05 11:04 $ by $Author: Kollasep $
+*  ---------------------------------------------------------------------------
+*  Version history:
+*  Template version: 1.02, 21.6.2000 by maparnan
+*  <ccm_history>
+*  </ccm_history>
+* ============================================================================
+*/
+
+
+
+#include <registryinfo.rh>
+#include <nsmldmconstants.h>
+
+RESOURCE REGISTRY_INFO theRegistryInfo
+  {
+  dll_uid = 0x101F6DE9; //The DLL's 3rd UID.
+  interfaces = 
+      {
+      INTERFACE_INFO
+          {
+          interface_uid = KNSmlDMInterfaceUid; // DM interface UID
+          implementations = 
+            {
+            IMPLEMENTATION_INFO
+                {
+                implementation_uid = 0x101F6DEF; // DM devdetail implementation UID
+                version_no = 1; 
+                display_name = "";
+                default_data = "";
+                opaque_data = "";
+                }
+            };
+          }
+      };
+    }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/adapters/devdetail/src/nsmldmdevdetailutils_ARM.cpp	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,132 @@
+/*
+* Copyright (c) 2004 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:    DM DevDetail Adapter Source Code, ARM implementation
+*
+*/
+
+
+
+
+// INCLUDES
+#include <sysutil.h>
+#include "nsmldmdevdetailadapter.h"
+#include "nsmldebug.h"
+
+#if defined (_ENABLE_MULTIROFS_SUPPORT)
+#include <sysversioninfo.h>
+#else
+// CONSTANTS
+_LIT8( KNSmlSwVersionSeparator, " " );
+#endif
+
+// ---------------------------------------------------------------------------
+// CNSmlDmDevDetailAdapter::GetDevDetailDataL( )
+// Fetches device specific data using EInfo interface.
+// ---------------------------------------------------------------------------
+void CNSmlDmDevDetailAdapter::GetDevDetailDataL( 
+                                CBufBase& aObject, 
+                                TNSmlDevDetailData aElement ) const
+    {
+    _DBG_FILE("CNSmlDmDevDetailAdapter::GetDevDetailDataL(): begin (MARM)");
+    
+    aObject.Reset();
+    
+    switch( aElement )
+        {
+        case ESwVersion:
+            {
+            // buffers for data fetched from sysutil
+#if defined (_ENABLE_MULTIROFS_SUPPORT)
+
+            TBuf16<KSysVersionInfoTextLength> temp;
+			TBuf8<KSysVersionInfoTextLength> temp8;
+			temp.Zero();
+			temp8.Zero();
+            SysVersionInfo::TVersionInfoType what = SysVersionInfo::EFWVersion;
+            TInt error = SysVersionInfo::GetVersionInfo(what,temp);
+			
+			User::LeaveIfError(error);
+
+			//Ascii copy which is required
+			temp8.Copy(temp);
+			aObject.InsertL(0,temp8);
+			//Unicode copy if required
+			//aObject.InsertL(0,temp.Ptr(),temp.Length());
+#else
+            HBufC* verBuf = HBufC::NewLC( KSysUtilVersionTextLength );
+            HBufC8* verBuf8 = HBufC8::NewLC( KSysUtilVersionTextLength );
+            
+            TPtr ver = verBuf->Des();
+            TPtr8 ver8 = verBuf8->Des();
+            // fetch software version (sw.txt) from sysutil
+        	SysUtil::GetSWVersion( ver );
+        	ver8.Copy( ver );
+        	
+            // parse sw fields and append to aObject
+        	TChar separator('\n');
+        	TInt pos = ver8.Locate( separator );
+
+            if ( pos == KErrNotFound )
+                {
+                User::Leave( KErrNotFound );
+                }
+
+            // insert version (1st field) and separator to beginning
+        	aObject.InsertL( 0, ver8.Mid( 0, pos ) );
+        	aObject.InsertL( 0, KNSmlSwVersionSeparator );
+        	
+        	// locate type designator (3rd field)
+        	ver8 = ver8.Mid( pos + 1 );
+        	pos = ver8.Locate( separator );
+        	ver8 = ver8.Mid( pos + 1 );
+        	pos = ver8.Locate( separator );
+        	
+        	if ( pos == KErrNotFound )
+        	    {
+                // type designator (the rest of the string, since there was no \n found) 
+            	aObject.InsertL( 0, ver8 );
+        	    }
+        	else
+        	    {
+                // type designator to beginning
+            	aObject.InsertL( 0, ver8.Mid( 0, pos ) );
+        	    }
+        	
+        	// fetch variant (lang.txt) from sysutil
+        	ver.Zero();
+        	SysUtil::GetLangVersion( ver );
+        	ver8.Copy( ver );
+        	
+            // insert separator and variant to the end
+        	aObject.InsertL( aObject.Size(), KNSmlSwVersionSeparator );
+        	aObject.InsertL( aObject.Size(), ver8 );
+            
+            CleanupStack::PopAndDestroy( verBuf8 );
+            CleanupStack::PopAndDestroy( verBuf );
+#endif //_ENABLE_MULTIROFS_SUPPORT
+            break;
+            }
+        case EHwVersion:
+            {
+            break;
+            }
+        default:
+            User::Panic( KNSmlDevDetailPanic, KErrArgument );
+            break;
+        }
+
+    _DBG_FILE("CNSmlDmDevDetailAdapter::GetDevDetailDataL(): end (MARM)");
+    }
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/adapters/devdetail/src/nsmldmdevdetailutils_WINSCW.cpp	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,94 @@
+/*
+* Copyright (c) 2004 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:    DM DevDetail Adapter Source Code, WINSCW implementation
+*
+*/
+
+
+
+
+// INCLUDES
+#include "nsmldmdevdetailadapter.h"
+#include "nsmldebug.h"
+
+// CONSTANTS
+_LIT( KNSmlDevDetailSwVFile,    "z:\\Resource\\DevMan\\DevDetail_SwV.txt" );
+_LIT( KNSmlDevDetailHwVFile,    "z:\\Resource\\DevMan\\DevDetail_HwV.txt" );
+
+const TInt KNSmlDevDetailMaxDataSize = 2048;
+
+// ---------------------------------------------------------------------------
+// CNSmlDmDevDetailAdapter::GetDevDetailDataL( )
+// ---------------------------------------------------------------------------
+void CNSmlDmDevDetailAdapter::GetDevDetailDataL( 
+                                CBufBase& aObject, 
+                                TNSmlDevDetailData aElement ) const
+    {
+    _DBG_FILE("CNSmlDmDevDetailAdapter::GetDevDetailDataL(): begin (WINSCW)");
+    
+    // Select file according to aElement
+    HBufC* name = NULL;
+    
+    switch( aElement )
+        {
+        case ESwVersion:
+            name = KNSmlDevDetailSwVFile().AllocLC();
+            break;
+        case EHwVersion:
+            name = KNSmlDevDetailHwVFile().AllocLC();
+            break;
+        default:
+            User::Panic( KNSmlDevDetailPanic, KErrArgument );
+        }
+    
+    // open file server session
+    RFs fileSession;
+    User::LeaveIfError( fileSession.Connect() );
+    CleanupClosePushL( fileSession );
+    
+    // open file
+    RFile file;
+    TInt err = file.Open( fileSession, *name, EFileRead|EFileShareReadersOnly );
+    
+    // if opening file succeeded, read the contents of the file
+    if ( err == KErrNone )
+        {
+        CleanupClosePushL( file );
+        
+        // read only if data size is not too large
+        TInt fileSize = 0;
+        User::LeaveIfError( file.Size( fileSize ) );
+        if ( fileSize <= KNSmlDevDetailMaxDataSize )
+            {
+            // read data
+            HBufC8* data = HBufC8::NewLC( fileSize );
+            TPtr8 dataPtr = data->Des();
+            file.Read( dataPtr, fileSize );
+            
+            // insert data to result buffer
+            aObject.Reset();
+            aObject.InsertL( 0, *data );
+            
+            CleanupStack::PopAndDestroy( data );
+            }
+        
+        CleanupStack::PopAndDestroy( &file );
+        }
+    
+    CleanupStack::PopAndDestroy( &fileSession );
+    CleanupStack::PopAndDestroy( name );
+    
+    _DBG_FILE("CNSmlDmDevDetailAdapter::GetDevDetailDataL(): end (WINSCW)");
+    }
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/adapters/devinfo/bld/bld.inf	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,26 @@
+/*
+* Copyright (c) 2002 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:    build info file for DevInfo adapter
+*
+*/
+
+
+
+
+PRJ_MMPFILES
+./nsmldmdevinfoadapter.mmp
+
+
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/adapters/devinfo/bld/nsmldmdevinfoadapter.mmp	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,52 @@
+/*
+* Copyright (c) 2002 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: Implementation of dm adapters
+* 	This is part of omadmextensions.
+*
+*/
+
+
+
+
+
+#include "defaultcaps.hrh"
+#include  <platform_paths.hrh>
+
+CAPABILITY      CAP_ECOM_PLUGIN
+TARGET          nsmldmdevinfoadapter.dll
+TARGETTYPE      PLUGIN
+UID             0x10009D8D 0x101F6DE8
+VENDORID        VID_DEFAULT
+
+APP_LAYER_SYSTEMINCLUDE
+SYSTEMINCLUDE 	/epoc32/include/ecom
+SOURCEPATH      ../src
+
+USERINCLUDE     ../inc ../../inc
+USERINCLUDE     ../../devdetail/inc
+SOURCE          nsmldmdevinfoadapter.cpp
+
+START RESOURCE nsmldmdevinfoadapter.rss
+LANGUAGE_IDS
+END
+
+
+
+LIBRARY         euser.lib 
+LIBRARY         ecom.lib 
+LIBRARY         nsmldebug.lib
+LIBRARY         nsmlagentcommon.lib
+LIBRARY     	featmgr.lib
+
+SMPSAFE
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/adapters/devinfo/inc/nsmldmdevinfoadapter.h	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,210 @@
+/*
+* Copyright (c) 2004 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:    DM DevInfo Adapter
+*
+*/
+
+
+
+
+
+
+#ifndef __NSMLDMDEVINFOADAPTER_H__
+#define __NSMLDMDEVINFOADAPTER_H__
+
+// INCLUDES
+#include <e32base.h>
+#include <smldmadapter.h>
+#include "nsmldmconstants.h"
+
+// MACROS
+
+// the DDF version must be changed if any changes in DDF structure 
+// ( built in DDFStructureL() function )
+_LIT8( KNSmlDMDevInfoDDFVersion, "1.0" ); 
+
+_LIT8( KNSmlDMDevInfoTextPlain, "text/plain" );
+_LIT8( KNSmlDMDevInfoNodeName, "DevInfo" );
+_LIT8( KNSmlDMDevInfoDescription, "The interior object holds all DevInfo objects" );
+
+_LIT8( KNSmlDMDevInfoManNodeName, "Man" );
+_LIT8( KNSmlDMDevInfoManDescription, "The name of the device manufacturer" );
+
+_LIT8( KNSmlDMDevInfoModNodeName, "Mod" );
+_LIT8( KNSmlDMDevInfoModDescription, "The name of the device model" );
+
+_LIT8( KNSmlDMDevInfoDevIdNodeName, "DevId" );
+_LIT8( KNSmlDMDevInfoDevIdDescription, "The unique device identifier" );
+
+_LIT8( KNSmlDMDevInfoLangNodeName, "Lang" );
+_LIT8( KNSmlDMDevInfoLangDescription, "The current language setting of the device" );
+
+_LIT8( KNSmlDMDevInfoDmVNodeName, "DmV" );
+_LIT8( KNSmlDMDevInfoDmVDescription, "The current DM client revision of the device" );
+
+_LIT8( KNSmlDMDevInfoExtNodeName, "Ext" );
+_LIT8( KNSmlDMDevInfoExtDescription, "The extendable DevInfo branch" );
+
+_LIT8( KNSmlDMDevInfoModDDFNodeName, "ModDDF" );
+_LIT8( KNSmlDMDevInfoModDDFDescription, "The checksum counted from DDF" );
+
+_LIT8( KNSmlDMDevInfoModDevDetNodeName, "ModDevDet" );
+_LIT8( KNSmlDMDevInfoModDevDetDescription, "The checksum counted from DevDetail values" );
+
+_LIT8( KNSmlDmDDFChangeUri, "DDFCHANGE" );
+
+_LIT8( KNSmlDMDevInfoSeparator, "/" );
+
+_LIT8( KNSmlDMEnglish, "en" );
+_LIT8( KNSmlDMFrench, "fr" );
+_LIT8( KNSmlDMGerman, "de" );
+_LIT8( KNSmlDMSpanish, "es" );
+_LIT8( KNSmlDMItalian, "it" );
+_LIT8( KNSmlDMSwedish, "sv" );
+_LIT8( KNSmlDMDanish, "da" );
+_LIT8( KNSmlDMNorwegian, "no" ); 
+_LIT8( KNSmlDMFinnish, "fi" );
+_LIT8( KNSmlDMPortuguese, "pt" );
+_LIT8( KNSmlDMTurkish, "tr" );
+_LIT8( KNSmlDMIcelandic, "is" );
+_LIT8( KNSmlDMRussian, "ru" );
+_LIT8( KNSmlDMHungarian, "hu" );
+_LIT8( KNSmlDMDutch, "nl" );
+_LIT8( KNSmlDMCzech, "cs" );
+_LIT8( KNSmlDMSlovak, "sk" );
+_LIT8( KNSmlDMPolish, "pl" );
+_LIT8( KNSmlDMSlovenian, "sl" );
+_LIT8( KNSmlDMChinese, "ch" );
+_LIT8( KNSmlDMJapanese, "ja" );
+_LIT8( KNSmlDMThai, "th" );
+_LIT8( KNSmlDMAfrikaans, "af" );
+_LIT8( KNSmlDMAlbanian, "sq" );
+_LIT8( KNSmlDMAmharic, "am" );
+_LIT8( KNSmlDMArabic, "ar" );
+_LIT8( KNSmlDMArmenian, "hy" );
+_LIT8( KNSmlDMTagalog, "tl" );
+_LIT8( KNSmlDMBelarussian, "be" );
+_LIT8( KNSmlDMBengali, "bn" );
+_LIT8( KNSmlDMBulgarian, "bg" );
+_LIT8( KNSmlDMBurmese, "my" );
+_LIT8( KNSmlDMCatalan, "ca" );
+_LIT8( KNSmlDMCroatian, "hr" );
+_LIT8( KNSmlDMEstonian, "et" );
+_LIT8( KNSmlDMFarsi, "fo" );
+_LIT8( KNSmlDMScotsGaelic, "gl" );
+_LIT8( KNSmlDMGeorgian, "ka" );
+_LIT8( KNSmlDMGreek, "el" );
+_LIT8( KNSmlDMGujarati, "gu" );
+_LIT8( KNSmlDMHebrew, "he" );
+_LIT8( KNSmlDMHindi, "hi" );
+_LIT8( KNSmlDMIndonesian, "id" );
+_LIT8( KNSmlDMIrish, "ga" );
+_LIT8( KNSmlDMKannada, "kn" );
+_LIT8( KNSmlDMKazakh, "kk" );
+_LIT8( KNSmlDMKorean, "ko" );
+_LIT8( KNSmlDMLao, "lo" );
+_LIT8( KNSmlDMLatvian, "lv" );
+_LIT8( KNSmlDMLithuanian, "lt" );
+_LIT8( KNSmlDMMacedonian, "mk" );
+_LIT8( KNSmlDMMalay, "ms" );
+_LIT8( KNSmlDMMalayalam, "ml" );
+_LIT8( KNSmlDMMarathi, "mr" );
+_LIT8( KNSmlDMMoldavian, "mo" );
+_LIT8( KNSmlDMMongolian, "mn" );
+_LIT8( KNSmlDMPunjabi, "pa" );
+_LIT8( KNSmlDMRomanian, "ro" );
+_LIT8( KNSmlDMSerbian, "sr" );
+_LIT8( KNSmlDMSinhalese, "si" );                
+_LIT8( KNSmlDMSomali, "so" );
+_LIT8( KNSmlDMSwahili, "sw" );
+_LIT8( KNSmlDMTamil, "ta" );
+_LIT8( KNSmlDMTelugu, "te" );
+_LIT8( KNSmlDMTibetan, "bo" );
+_LIT8( KNSmlDMTigrinya, "ti" );
+_LIT8( KNSmlDMTurkmen, "tk" );
+_LIT8( KNSmlDMUkrainian, "uk" );
+_LIT8( KNSmlDMUrdu, "ur" ); 
+_LIT8( KNSmlDMVietnamese, "vi" );
+_LIT8( KNSmlDMWelsh, "cy" );
+_LIT8( KNSmlDMZulu, "zu" );
+
+
+// CLASS DECLARATION
+class CNSmlDmDevInfoAdapter : public CSmlDmAdapter
+    {
+public: // constructors and destructor
+    static CNSmlDmDevInfoAdapter* NewL(MSmlDmCallback* aDmCallback );
+    static CNSmlDmDevInfoAdapter* NewLC(MSmlDmCallback* aDmCallback );
+
+    virtual ~CNSmlDmDevInfoAdapter();
+
+private: ///new functions
+
+    void SetLeafPropertiesL( MSmlDmDDFObject& aObject, 
+                 const TSmlDmAccessTypes& aAccessTypes, 
+                 const TDesC8& aDescription ) const;
+    CNSmlDmDevInfoAdapter(TAny* aEcomArguments);
+    CSmlDmAdapter::TError FetchLeafObjectL( const TDesC8& aURI, CBufBase& aObject );
+    
+private: // from base classes
+    // Adapter interface from CSmlDmAdapter
+    void DDFVersionL( CBufBase& aDDFVersion );
+    void DDFStructureL( MSmlDmDDFObject& aDDF );
+    void UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, 
+                const TDesC8& aObject, const TDesC8& aType, 
+                const TInt aStatusRef );
+    void DeleteObjectL( const TDesC8& aURI, const TDesC8& aLUID, TInt aStatusRef ); 
+    void FetchLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, 
+                   const TDesC8& aType, const TInt aResultsRef, 
+                   const TInt aStatusRef ); 
+    void ChildURIListL( const TDesC8& aURI, const TDesC8& aLUID, 
+                const CArrayFix<TSmlDmMappingInfo>& aPreviousURISegmentList, 
+                const TInt aResultsRef, const TInt aStatusRef );  
+    void AddNodeObjectL( const TDesC8& aURI, const TDesC8& aParentLUID, 
+                 const TInt aStatusRef );
+    
+    void UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, 
+                RWriteStream*& aStream, const TDesC8& aType, 
+                const TInt aStatusRef );
+    void FetchLeafObjectSizeL( const TDesC8& aURI, const TDesC8& aLUID, 
+                   const TDesC8& aType, const TInt aResultsRef, 
+                   const TInt aStatusRef );
+     
+    void ExecuteCommandL( const TDesC8& aURI, const TDesC8& aLUID,
+                          const TDesC8& aArgument, 
+                          const TDesC8& aType,
+                          const TInt aStatusRef );
+                                  
+    void ExecuteCommandL( const TDesC8& aURI, const TDesC8& aLUID,
+                          RWriteStream*& aStream, 
+                          const TDesC8& aType,
+                          const TInt aStatusRef );
+    
+    void CopyCommandL( const TDesC8& aTargetURI, const TDesC8& aTargetLUID,
+                       const TDesC8& aSourceURI, 
+                       const TDesC8& aSourceLUID,
+                       const TDesC8& aType, TInt aStatusRef );
+    void StartAtomicL();
+    void CommitAtomicL();
+    void RollbackAtomicL();
+    TBool StreamingSupport( TInt& aItemSize );
+    void StreamCommittedL();
+    void CompleteOutstandingCmdsL();
+    
+    
+private:
+    MSmlDmCallback* iDmCallback;
+    };
+
+#endif // __NSMLDMDEVINFOADAPTER_H__
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/adapters/devinfo/src/nsmldmdevinfoadapter.cpp	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,770 @@
+/*
+* Copyright (c) 2004 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:    DM DevInfo Adapter
+*
+*/
+
+
+
+
+
+//INCLUDE FILES
+#include <implementationproxy.h> // For TImplementationProxy definition
+#include "nsmldmimpluids.h"
+#include <featmgr.h>
+
+#include "nsmldmdevinfoadapter.h"
+#include "nsmldebug.h"
+#include "nsmlphoneinfo.h"
+#include "nsmlunicodeconverter.h"
+#include "nsmlconstants.h"
+#include "nsmldmconst.h"
+#include "nsmldmdevdetailadapter.h"
+
+
+// -----------------------------------------------------------------------------
+// CNSmlDmDevInfoAdapter* CNSmlDmDevInfoAdapter::NewL( )
+// -----------------------------------------------------------------------------
+CNSmlDmDevInfoAdapter* CNSmlDmDevInfoAdapter::NewL(MSmlDmCallback* aDmCallback )
+    {
+    _DBG_FILE("CNSmlDmDevInfoAdapter::NewL(): begin");
+    CNSmlDmDevInfoAdapter* self = NewLC( aDmCallback );
+    CleanupStack::Pop();
+    _DBG_FILE("CNSmlDmDevInfoAdapter::NewL(): end");
+    return self;
+    }
+
+// -----------------------------------------------------------------------------
+// CNSmlDmDevInfoAdapter* CNSmlDmDevInfoAdapter::NewLC( )
+// -----------------------------------------------------------------------------
+CNSmlDmDevInfoAdapter* CNSmlDmDevInfoAdapter::NewLC(MSmlDmCallback* aDmCallback )
+    {
+    _DBG_FILE("CNSmlDmDevInfoAdapter::NewLC(): begin");
+    CNSmlDmDevInfoAdapter* self = new (ELeave) CNSmlDmDevInfoAdapter(aDmCallback);
+    CleanupStack::PushL(self);
+    self->iDmCallback = aDmCallback;
+    FeatureManager::InitializeLibL();
+    _DBG_FILE("CNSmlDmDevInfoAdapter::NewLC(): end");
+    return self;
+    }
+
+
+
+// -----------------------------------------------------------------------------
+// CNSmlDmDevInfoAdapter::~CNSmlDmDevInfoAdapter()
+// -----------------------------------------------------------------------------
+CNSmlDmDevInfoAdapter::~CNSmlDmDevInfoAdapter()
+    {
+    _DBG_FILE("CNSmlDmDevInfoAdapter::~CNSmlDmDevInfoAdapter(): begin");
+    FeatureManager::UnInitializeLib();
+    _DBG_FILE("CNSmlDmDevInfoAdapter::~CNSmlDmDevInfoAdapter(): end");
+    }
+    
+// -----------------------------------------------------------------------------
+// CNSmlDmDevInfoAdapter::CNSmlDmDevInfoAdapter()
+// -----------------------------------------------------------------------------
+
+CNSmlDmDevInfoAdapter::CNSmlDmDevInfoAdapter(TAny* aEcomArguments):CSmlDmAdapter(aEcomArguments)
+    {
+    _DBG_FILE("CNSmlDmDevInfoAdapter::CNSmlDmDevInfoAdapter(aEcomArguments): begin");
+    _DBG_FILE("CNSmlDmDevInfoAdapter::CNSmlDmDevInfoAdapter(aEcomArguments): end"); 
+    }
+
+// -----------------------------------------------------------------------------
+// CNSmlDmDevInfoAdapter::SetLeafPropertiesL()
+// -----------------------------------------------------------------------------
+void CNSmlDmDevInfoAdapter::SetLeafPropertiesL( MSmlDmDDFObject& aObject, 
+                                                const TSmlDmAccessTypes& aAccessTypes, 
+                                                const TDesC8& aDescription ) const
+    {
+    aObject.SetAccessTypesL( aAccessTypes );
+    aObject.SetScopeL( MSmlDmDDFObject::EPermanent );
+    aObject.SetDFFormatL( MSmlDmDDFObject::EChr );
+    aObject.AddDFTypeMimeTypeL( KNSmlDMDevInfoTextPlain );
+    aObject.SetDescriptionL( aDescription );
+    }
+
+
+// -----------------------------------------------------------------------------
+//  CNSmlDmDevInfoAdapter::DDFVersionL()
+// -----------------------------------------------------------------------------
+void CNSmlDmDevInfoAdapter::DDFVersionL(CBufBase& aDDFVersion)
+    {
+    _DBG_FILE("CNSmlDmDevInfoAdapter::DDFVersionL(TDes& aDDFVersion): begin");
+    aDDFVersion.InsertL(0,KNSmlDMDevInfoDDFVersion);
+    _DBG_FILE("CNSmlDmDevInfoAdapter::DDFVersionL(TDes& aDDFVersion): end");
+    }
+
+
+// -----------------------------------------------------------------------------
+//  CNSmlDmDevInfoAdapter::DDFStructureL()
+//
+// -----------------------------------------------------------------------------
+void CNSmlDmDevInfoAdapter::DDFStructureL( MSmlDmDDFObject& aDDF )
+    {
+    _DBG_FILE("CNSmlDmDevInfoAdapter::DDFStructureL(): begin");
+    
+    TSmlDmAccessTypes accessTypes;
+    accessTypes.SetGet();
+    // DevInfo
+    MSmlDmDDFObject& devInfo = aDDF.AddChildObjectL( KNSmlDMDevInfoNodeName );
+    devInfo.SetAccessTypesL( accessTypes ); 
+    devInfo.SetScopeL( MSmlDmDDFObject::EPermanent );
+    devInfo.SetDescriptionL( KNSmlDMDevInfoDescription );
+    // Man  
+    MSmlDmDDFObject& man = devInfo.AddChildObjectL(KNSmlDMDevInfoManNodeName);
+    SetLeafPropertiesL( man, accessTypes, KNSmlDMDevInfoManDescription );
+    // Mod  
+    MSmlDmDDFObject& mod = devInfo.AddChildObjectL(KNSmlDMDevInfoModNodeName );
+    SetLeafPropertiesL( mod, accessTypes, KNSmlDMDevInfoModDescription );
+    // DevId    
+    MSmlDmDDFObject& devid = devInfo.AddChildObjectL( KNSmlDMDevInfoDevIdNodeName);
+    SetLeafPropertiesL( devid, accessTypes, KNSmlDMDevInfoDevIdDescription ); 
+    // Lang 
+    MSmlDmDDFObject& lang = devInfo.AddChildObjectL(KNSmlDMDevInfoLangNodeName );
+    SetLeafPropertiesL( lang, accessTypes, KNSmlDMDevInfoLangDescription ); 
+    // DmV  
+    MSmlDmDDFObject& dmv = devInfo.AddChildObjectL(KNSmlDMDevInfoDmVNodeName);
+    SetLeafPropertiesL( dmv, accessTypes, KNSmlDMDevInfoDmVDescription );
+    // Ext
+    MSmlDmDDFObject& ext = devInfo.AddChildObjectL(KNSmlDMDevInfoExtNodeName );
+    ext.SetAccessTypesL( accessTypes );
+    ext.SetScopeL( MSmlDmDDFObject::EPermanent );
+    ext.SetDescriptionL( KNSmlDMDevInfoExtDescription );
+    // ModDDF   
+    MSmlDmDDFObject& modDDF = ext.AddChildObjectL( KNSmlDMDevInfoModDDFNodeName);
+    SetLeafPropertiesL( modDDF, accessTypes, KNSmlDMDevInfoModDDFDescription );
+    // ModDevDet    
+    MSmlDmDDFObject& modDevDet = ext.AddChildObjectL(KNSmlDMDevInfoModDevDetNodeName );
+    SetLeafPropertiesL( modDevDet, accessTypes, KNSmlDMDevInfoModDevDetDescription );
+    _DBG_FILE("CNSmlDmDevInfoAdapter::DDFStructureL(): end");
+    }
+
+// -----------------------------------------------------------------------------
+//  CNSmlDmDevInfoAdapter::UpdateLeafObjectL()
+// -----------------------------------------------------------------------------
+void CNSmlDmDevInfoAdapter::UpdateLeafObjectL( const TDesC8& /*aURI*/, 
+                                               const TDesC8& /*aLUID*/, 
+                                               const TDesC8& /*aObject*/, 
+                                               const TDesC8& /*aType*/, 
+                                               const TInt aStatusRef )
+    {
+    _DBG_FILE("CNSmlDmDevInfoAdapter::UpdateLeafObjectL(): begin");
+    _DBG_FILE("CNSmlDmDevInfoAdapter::UpdateLeafObjectL(): end");
+    iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
+    }
+
+
+// -----------------------------------------------------------------------------
+// CNSmlDmDevInfoAdapter::DeleteObjectL()
+// -----------------------------------------------------------------------------
+void CNSmlDmDevInfoAdapter::DeleteObjectL( const TDesC8& /*aURI*/, 
+                                           const TDesC8& /*aLUID*/, 
+                                           const TInt aStatusRef )
+    {
+    _DBG_FILE("CNSmlDmDevInfoAdapter::DeleteLeafObjectL( ): begin");
+    _DBG_FILE("CNSmlDmDevInfoAdapter::DeleteLeafObjectL( ): end");
+    iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
+    }
+
+
+// -----------------------------------------------------------------------------
+//  CNSmlDmDevInfoAdapter::FetchLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, 
+// const TDesC8& aType, const TInt aResultsRef, const TInt aStatusRef )
+// -----------------------------------------------------------------------------
+void CNSmlDmDevInfoAdapter::FetchLeafObjectL( const TDesC8& aURI, 
+                                              const TDesC8& /*aLUID*/, 
+                                              const TDesC8& aType, 
+                                              const TInt aResultsRef, 
+                                              const TInt aStatusRef )
+    {
+    _DBG_FILE("CNSmlDmDevInfoAdapter::FetchLeafObjectL(): begin");
+    
+    CBufBase *object = CBufFlat::NewL( 1 );
+    CleanupStack::PushL( object );
+    
+    CSmlDmAdapter::TError retValue = FetchLeafObjectL( aURI, *object );
+    
+    iDmCallback->SetStatusL( aStatusRef, retValue );
+    iDmCallback->SetResultsL( aResultsRef, *object, aType );
+    CleanupStack::PopAndDestroy(); //object
+    _DBG_FILE("CNSmlDmDevInfoAdapt+er::FetchLeafObjectL(): end");
+    }
+
+
+// -----------------------------------------------------------------------------
+//  CNSmlDmDevInfoAdapter::ChildURIListL( const TDesC& aURI, 
+// const TDesC& aParentLUID, const CArrayFix<TSmlDmMappingInfo>& aPreviousURISegmentList, 
+// const TInt aResultsRef, const TInt aStatusRef )
+// -----------------------------------------------------------------------------
+void CNSmlDmDevInfoAdapter::ChildURIListL( const TDesC8& aURI, 
+                                           const TDesC8& /*aParentLUID*/, 
+                                           const CArrayFix<TSmlDmMappingInfo>& /*aPreviousURISegmentList*/, 
+                                           const TInt aResultsRef, 
+                                           const TInt aStatusRef )
+    {
+    _DBG_FILE("CNSmlDmDevInfoAdapter::ChildURIListL(): begin");
+    CSmlDmAdapter::TError retValue = CSmlDmAdapter::EOk;
+    CBufBase* currentURISegmentList = CBufFlat::NewL( 1 );
+    CleanupStack::PushL( currentURISegmentList );
+    TInt ret = aURI.LocateReverse(KNSmlDMDevInfoSeparator()[0]);
+    if ( ret == KErrNotFound ) 
+        {
+        ret = -1;
+        }
+    TInt len = aURI.Length() - ( ret + 1 );
+    TPtrC8 segment = aURI.Right( len );
+
+    if ( segment == KNSmlDMDevInfoNodeName )
+        {
+        currentURISegmentList->InsertL( currentURISegmentList->Size(), KNSmlDMDevInfoManNodeName() );
+        currentURISegmentList->InsertL( currentURISegmentList->Size(), KNSmlDMDevInfoSeparator() );
+        currentURISegmentList->InsertL( currentURISegmentList->Size(), KNSmlDMDevInfoModNodeName() );
+        currentURISegmentList->InsertL( currentURISegmentList->Size(), KNSmlDMDevInfoSeparator() );
+        currentURISegmentList->InsertL( currentURISegmentList->Size(), KNSmlDMDevInfoDevIdNodeName() );
+        currentURISegmentList->InsertL( currentURISegmentList->Size(), KNSmlDMDevInfoSeparator() );
+        currentURISegmentList->InsertL( currentURISegmentList->Size(), KNSmlDMDevInfoLangNodeName() );
+        currentURISegmentList->InsertL( currentURISegmentList->Size(), KNSmlDMDevInfoSeparator() );
+        currentURISegmentList->InsertL( currentURISegmentList->Size(), KNSmlDMDevInfoDmVNodeName() );
+        currentURISegmentList->InsertL( currentURISegmentList->Size(), KNSmlDMDevInfoSeparator() );
+        currentURISegmentList->InsertL( currentURISegmentList->Size(), KNSmlDMDevInfoExtNodeName() );
+        }
+    else
+    if ( segment == KNSmlDMDevInfoExtNodeName )
+        {
+        currentURISegmentList->InsertL( currentURISegmentList->Size(), KNSmlDMDevInfoModDDFNodeName() );
+        currentURISegmentList->InsertL( currentURISegmentList->Size(), KNSmlDMDevInfoSeparator() );
+        currentURISegmentList->InsertL( currentURISegmentList->Size(), KNSmlDMDevInfoModDevDetNodeName() );
+        }
+    else
+        {
+        retValue = CSmlDmAdapter::EError;
+        }
+    iDmCallback->SetStatusL( aStatusRef, retValue );
+    iDmCallback->SetResultsL( aResultsRef, *currentURISegmentList, KNullDesC8 );
+    CleanupStack::PopAndDestroy(); //currentURISegmentList
+    _DBG_FILE("CNSmlDmDevInfoAdapter::ChildURIListL(): end");
+    }
+
+
+// -----------------------------------------------------------------------------
+// CNSmlDmDevInfoAdapter::AddNodeObjectL( const TDesC8& aURI, 
+// const TDesC8& aParentLUID, const TInt aStatusRef )
+// -----------------------------------------------------------------------------
+void CNSmlDmDevInfoAdapter::AddNodeObjectL( const TDesC8& /*aURI*/, 
+                                            const TDesC8& /*aParentLUID*/, 
+                                            const TInt aStatusRef )
+    {
+    _DBG_FILE("CNSmlDmDevInfoAdapter::AddNodeObjectL(): begin");
+    iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
+    _DBG_FILE("CNSmlDmDevInfoAdapter::AddNodeObjectL(): end");
+    }
+
+// -----------------------------------------------------------------------------
+//  CNSmlDmDevInfoAdapter::UpdateLeafObjectL()
+// -----------------------------------------------------------------------------
+void CNSmlDmDevInfoAdapter::UpdateLeafObjectL( const TDesC8& /*aURI*/, 
+                                               const TDesC8& /*aLUID*/, 
+                                               RWriteStream*& /*aStream*/, 
+                                               const TDesC8& /*aType*/, 
+                                               const TInt aStatusRef )
+    {
+    _DBG_FILE("CNSmlDmDevInfoAdapter::UpdateLeafObjectL(): stream: begin");
+    _DBG_FILE("CNSmlDmDevInfoAdapter::UpdateLeafObjectL(): stream: end");
+    iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
+    }
+
+
+// -----------------------------------------------------------------------------
+//  CNSmlDmDevInfoAdapter::FetchLeafObjectSizeL( const TDesC8& aURI, 
+//  const TDesC8& aLUID, const TDesC8& aType, TInt aResultsRef, TInt aStatusRef )
+// -----------------------------------------------------------------------------
+void CNSmlDmDevInfoAdapter::FetchLeafObjectSizeL( const TDesC8& aURI, 
+                                                  const TDesC8& /*aLUID*/, 
+                                                  const TDesC8& aType, 
+                                                  const TInt aResultsRef, 
+                                                  const TInt aStatusRef )
+    {
+
+    _DBG_FILE("CNSmlDmDevInfoAdapter::FetchLeafObjectSizeL(): begin");
+    
+    CBufBase *object = CBufFlat::NewL( 1 );
+    CleanupStack::PushL( object );
+    CSmlDmAdapter::TError retValue = FetchLeafObjectL( aURI, *object );
+        
+    TInt objSizeInBytes = object->Size();
+    TBuf8<2> stringObjSizeInBytes;
+    stringObjSizeInBytes.Num( objSizeInBytes );
+    object->Reset();
+    object->InsertL( 0, stringObjSizeInBytes );
+    
+    iDmCallback->SetStatusL( aStatusRef, retValue );
+    iDmCallback->SetResultsL( aResultsRef, *object, aType );
+    CleanupStack::PopAndDestroy(); //object
+    _DBG_FILE("CNSmlDmDevInfoAdapter::FetchLeafObjectSizeL(): end");
+    }
+    
+
+// -----------------------------------------------------------------------------
+//  CNSmlDmDevInfoAdapter::ExecuteCommandL( const TDesC8& aURI, 
+//  const TDesC8& aParentLUID, TDesC8& aArgument, const TDesC8& aType, TInt aStatusRef )
+// -----------------------------------------------------------------------------
+void CNSmlDmDevInfoAdapter::ExecuteCommandL( const TDesC8& /*aURI*/, const TDesC8& /*aLUID*/, const TDesC8& /*aArgument*/, const TDesC8& /*aType*/, const TInt aStatusRef )
+    {
+    _DBG_FILE("CNSmlDmDevInfoAdapter::ExecuteCommandL(): begin");
+    iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
+    _DBG_FILE("CNSmlDmDevInfoAdapter::ExecuteCommandL(): end");
+    }
+
+// -----------------------------------------------------------------------------
+//  CNSmlDmDevInfoAdapter::ExecuteCommandL( const TDesC8& aURI, 
+//  const TDesC8& aParentLUID, RWriteStream*& aStream, const TDesC8& aType, 
+//  TInt aStatusRef )
+// -----------------------------------------------------------------------------
+void CNSmlDmDevInfoAdapter::ExecuteCommandL( const TDesC8& /*aURI*/, 
+                                             const TDesC8& /*aParentLUID*/, 
+                                             RWriteStream*& /*aStream*/, 
+                                             const TDesC8& /*aType*/, 
+                                             const TInt aStatusRef )
+    {
+    _DBG_FILE("CNSmlDmDevInfoAdapter::ExecuteCommandL(): stream: begin");
+    iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
+    _DBG_FILE("CNSmlDmDevInfoAdapter::ExecuteCommandL(): stream: end");
+    }
+
+// -----------------------------------------------------------------------------
+//  CNSmlDmDevInfoAdapter::CopyCommandL( const TDesC8& aTargetURI, const TDesC8& 
+//  aSourceURI, const TDesC8& aSourceLUID, const TDesC8& /*aType*/, TInt aStatusRef )
+// -----------------------------------------------------------------------------
+void CNSmlDmDevInfoAdapter::CopyCommandL( const TDesC8& /*aTargetURI*/, const TDesC8& 
+                                          /*aTargetLUID*/, const TDesC8& /*aSourceURI*/, 
+                                          const TDesC8& /*aSourceLUID*/, 
+                                          const TDesC8& /*aType*/, TInt aStatusRef )
+    {
+    _DBG_FILE("CNSmlDmDevInfoAdapter::CopyCommandL(): begin");
+    iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
+    _DBG_FILE("CNSmlDmDevInfoAdapter::CopyCommandL(): end");
+    }
+
+// --------------------------------------
+//  CNSmlDmDevInfoAdapter::StartAtomicL()
+// --------------------------------------
+void CNSmlDmDevInfoAdapter::StartAtomicL()
+    {
+    _DBG_FILE("CNSmlDmDevInfoAdapter::StartAtomicL(): begin");
+    _DBG_FILE("CNSmlDmDevInfoAdapter::StartAtomicL(): end");
+    }
+    
+// ---------------------------------------
+//  CNSmlDmDevInfoAdapter::CommitAtomicL()
+// ---------------------------------------
+void CNSmlDmDevInfoAdapter::CommitAtomicL()
+    {
+    _DBG_FILE("CNSmlDmDevInfoAdapter::CommitAtomicL(): begin");
+    _DBG_FILE("CNSmlDmDevInfoAdapter::CommitAtomicL(): end");
+    }
+
+// -----------------------------------------
+//  CNSmlDmDevInfoAdapter::RollbackAtomicL()
+// -----------------------------------------
+void CNSmlDmDevInfoAdapter::RollbackAtomicL()
+    {
+    _DBG_FILE("CNSmlDmDevInfoAdapter::RollbackAtomicL(): begin");
+    _DBG_FILE("CNSmlDmDevInfoAdapter::RollbackAtomicL(): end");
+    }
+
+// -----------------------------------------------------------
+//  CNSmlDmDevInfoAdapter::StreamingSupport( TInt& aItemSize )
+// -----------------------------------------------------------  
+TBool CNSmlDmDevInfoAdapter::StreamingSupport( TInt& /*aItemSize*/ )
+    {
+    _DBG_FILE("CNSmlDmDevInfoAdapter::StreamingSupport(): begin");
+    _DBG_FILE("CNSmlDmDevInfoAdapter::StreamingSupport(): end");
+    return EFalse;
+    }
+
+// ------------------------------------------
+//  CNSmlDmDevInfoAdapter::StreamCommittedL()
+// ------------------------------------------
+void CNSmlDmDevInfoAdapter::StreamCommittedL()
+    {
+    _DBG_FILE("CNSmlDmDevInfoAdapter::StreamCommittedL(): begin");
+    _DBG_FILE("CNSmlDmDevInfoAdapter::StreamCommittedL(): end");
+    }
+
+// --------------------------------------------------
+//  CNSmlDmDevInfoAdapter::CompleteOutstandingCmdsL()
+// --------------------------------------------------   
+void CNSmlDmDevInfoAdapter::CompleteOutstandingCmdsL()
+    {
+    _DBG_FILE("CNSmlDmDevInfoAdapter::CompleteOutstandingCmdsL(): begin");
+    _DBG_FILE("CNSmlDmDevInfoAdapter::CompleteOutstandingCmdsL(): end");    
+    }
+
+// -----------------------------------------------------------------------------
+// CNSmlDmDevDetailAdapter::FetchLeafObjectL()
+// -----------------------------------------------------------------------------
+CSmlDmAdapter::TError CNSmlDmDevInfoAdapter::FetchLeafObjectL( const TDesC8& aURI, 
+                                                               CBufBase& aObject )
+    {
+    _DBG_FILE("CNSmlDmInfoAdapter::FetchLeafObjectL(): begin");
+    CSmlDmAdapter::TError retValue = CSmlDmAdapter::EOk;
+    TInt ret = aURI.LocateReverse(KNSmlDMDevInfoSeparator()[0]);
+    if ( ret == KErrNotFound ) 
+        {
+        retValue = CSmlDmAdapter::EError;
+        }
+    else
+        {
+        TInt len = aURI.Length() - (ret + 1);
+        TPtrC8 segment = aURI.Right( len );
+        if ( segment == KNSmlDMDevInfoManNodeName ||
+             segment == KNSmlDMDevInfoModNodeName ||
+             segment == KNSmlDMDevInfoDevIdNodeName )
+            {
+            CNSmlPhoneInfo* phoneInfo = CNSmlPhoneInfo::NewLC();
+            HBufC* phonedata = HBufC::NewLC( 50 );
+            TPtr phonedataPtr = phonedata->Des();  
+            if ( segment == KNSmlDMDevInfoManNodeName )
+                {
+                phoneInfo->PhoneDataL( CNSmlPhoneInfo::EPhoneManufacturer, phonedataPtr );
+                }
+            if ( segment == KNSmlDMDevInfoModNodeName )
+                {
+                phoneInfo->PhoneDataL( CNSmlPhoneInfo::EPhoneModelId, phonedataPtr );
+                }
+            if ( segment == KNSmlDMDevInfoDevIdNodeName )
+                {
+                phoneInfo->PhoneDataL( CNSmlPhoneInfo::EPhoneSerialNumber, phonedataPtr );
+                }
+            HBufC8* phonedataInUTF8 = NULL;
+            NSmlUnicodeConverter::HBufC8InUTF8LC( *phonedata, phonedataInUTF8 );
+            aObject.InsertL( 0, *phonedataInUTF8 );
+            CleanupStack::PopAndDestroy( 3 ); //phonedataInUTF8, phonedata, phoneInfo
+            }
+        else
+        if ( segment == KNSmlDMDevInfoLangNodeName )
+            { 
+            TLanguage language = User::Language();
+            TBuf8<2> langCode;
+            switch ( language )
+                {
+                case ELangEnglish: 
+                case ELangAmerican:
+                case ELangAustralian:
+                case ELangNewZealand:
+                case ELangCanadianEnglish:
+                case ELangInternationalEnglish:
+                case ELangSouthAfricanEnglish:
+                    langCode = KNSmlDMEnglish;
+                    break; 
+                case ELangFrench:
+                case ELangSwissFrench:
+                case ELangBelgianFrench:
+                case ELangInternationalFrench:
+                case ELangCanadianFrench:
+                    langCode = KNSmlDMFrench;
+                    break;
+                case ELangGerman:
+                case ELangSwissGerman:
+                case ELangAustrian:
+                    langCode = KNSmlDMGerman;
+                    break;
+                case ELangSpanish:
+                case ELangInternationalSpanish:
+                case ELangLatinAmericanSpanish:
+                    langCode = KNSmlDMSpanish;
+                    break;
+                case ELangItalian:
+                case ELangSwissItalian:
+                    langCode = KNSmlDMItalian;
+                    break;
+                case ELangSwedish:
+                case ELangFinlandSwedish:
+                    langCode = KNSmlDMSwedish;
+                    break;
+                case ELangDanish:
+                    langCode = KNSmlDMDanish;
+                    break;
+                case ELangNorwegian:
+                case ELangNorwegianNynorsk:
+                    langCode = KNSmlDMNorwegian;
+                    break;
+                case ELangFinnish:
+                    langCode = KNSmlDMFinnish;
+                    break;
+                case ELangPortuguese:
+                case ELangBrazilianPortuguese:
+                    langCode = KNSmlDMPortuguese;
+                    break;
+                case ELangTurkish:
+                case ELangCyprusTurkish:
+                    langCode = KNSmlDMTurkish;
+                    break;
+                case ELangIcelandic:
+                    langCode = KNSmlDMIcelandic;
+                    break;
+                case ELangRussian:
+                    langCode = KNSmlDMRussian;
+                    break;
+                case ELangHungarian:
+                    langCode = KNSmlDMHungarian;
+                    break;
+                case ELangDutch:
+                case ELangBelgianFlemish:
+                    langCode = KNSmlDMDutch;
+                    break;
+                case ELangCzech:
+                    langCode = KNSmlDMCzech;
+                    break;
+                case ELangSlovak:
+                    langCode = KNSmlDMSlovak;
+                    break;
+                case ELangPolish:
+                    langCode = KNSmlDMPolish;
+                    break;
+                case ELangSlovenian:
+                    langCode = KNSmlDMSlovenian;
+                    break;
+                case ELangTaiwanChinese:
+                case ELangHongKongChinese:
+                case ELangPrcChinese:
+                    langCode = KNSmlDMChinese;
+                    break;
+                case ELangJapanese:
+                    langCode = KNSmlDMJapanese;
+                    break;
+                case ELangThai:
+                    langCode = KNSmlDMThai;
+                    break;
+                case ELangAfrikaans:
+                    langCode = KNSmlDMAfrikaans;
+                    break;
+                case ELangAlbanian:
+                    langCode = KNSmlDMAlbanian;
+                    break;
+                case ELangAmharic:
+                    langCode = KNSmlDMAmharic;
+                    break;
+                case ELangArabic:
+                    langCode = KNSmlDMArabic;
+                    break;
+                case ELangArmenian:
+                    langCode = KNSmlDMArmenian;
+                    break;
+                case ELangTagalog:
+                    langCode = KNSmlDMTagalog;
+                    break;
+                case ELangBelarussian:
+                    langCode = KNSmlDMBelarussian;
+                    break;
+                case ELangBengali:
+                    langCode = KNSmlDMBengali;
+                    break;
+                case ELangBulgarian:
+                    langCode = KNSmlDMBulgarian;
+                    break;
+                case ELangBurmese:
+                    langCode = KNSmlDMBurmese;
+                    break;
+                case ELangCatalan:
+                    langCode = KNSmlDMCatalan;
+                    break;
+                case ELangCroatian:
+                    langCode = KNSmlDMCroatian;
+                    break;
+                case ELangEstonian:
+                    langCode = KNSmlDMEstonian;
+                    break;
+                case ELangFarsi:
+                    langCode = KNSmlDMFarsi;
+                    break;
+                case ELangScotsGaelic:
+                    langCode = KNSmlDMScotsGaelic;
+                    break;
+                case ELangGeorgian:
+                    langCode = KNSmlDMGeorgian;
+                    break;
+                case ELangGreek:
+                case ELangCyprusGreek:
+                    langCode = KNSmlDMGreek;
+                    break;
+                case ELangGujarati:
+                    langCode = KNSmlDMGujarati;
+                    break;
+                case ELangHebrew:
+                    langCode = KNSmlDMHebrew;
+                    break;
+                case ELangHindi:
+                    langCode = KNSmlDMHindi;
+                    break;
+                case ELangIndonesian:
+                    langCode = KNSmlDMIndonesian;
+                    break;
+                case ELangIrish:
+                    langCode = KNSmlDMIrish;
+                    break;
+                case ELangKannada:
+                    langCode = KNSmlDMKannada;
+                    break;
+                case ELangKazakh:
+                    langCode = KNSmlDMKazakh;
+                    break;
+                case ELangKorean:
+                    langCode = KNSmlDMKorean;
+                    break;
+                case ELangLao:
+                    langCode = KNSmlDMLao;
+                    break;
+                case ELangLatvian:
+                    langCode = KNSmlDMLatvian;
+                    break;
+                case ELangLithuanian:
+                    langCode = KNSmlDMLithuanian;
+                    break;
+                case ELangMacedonian:
+                    langCode = KNSmlDMMacedonian;
+                    break;
+                case ELangMalay:
+                    langCode = KNSmlDMMalay;
+                    break;
+                case ELangMalayalam:
+                    langCode = KNSmlDMMalayalam;
+                    break;
+                case ELangMarathi:
+                    langCode = KNSmlDMMarathi;
+                    break;
+                case ELangMoldavian:
+                    langCode = KNSmlDMMoldavian;
+                    break;
+                case ELangMongolian:
+                    langCode = KNSmlDMMongolian;
+                    break;
+                case ELangPunjabi:
+                    langCode = KNSmlDMPunjabi;
+                    break;
+                case ELangRomanian:
+                    langCode = KNSmlDMRomanian;
+                    break;
+                case ELangSerbian:
+                    langCode = KNSmlDMSerbian;
+                    break;
+                case ELangSinhalese:
+                    langCode = KNSmlDMSinhalese;
+                    break;
+                case ELangSomali:
+                    langCode = KNSmlDMSomali;
+                    break;
+                case ELangSwahili:
+                    langCode = KNSmlDMSwahili;
+                    break;
+                case ELangTamil:
+                    langCode = KNSmlDMTamil;
+                    break;
+                case ELangTelugu:
+                    langCode = KNSmlDMTelugu;
+                    break;
+                case ELangTibetan:
+                    langCode = KNSmlDMTibetan;
+                    break;
+                case ELangTigrinya:
+                    langCode = KNSmlDMTigrinya;
+                    break;
+                case ELangTurkmen:
+                    langCode = KNSmlDMTurkmen;
+                    break;
+                case ELangUkrainian:
+                    langCode = KNSmlDMUkrainian;
+                    break;
+                case ELangUrdu:
+                    langCode = KNSmlDMUrdu;
+                    break;
+                case ELangVietnamese:
+                    langCode = KNSmlDMVietnamese;
+                    break;
+                case ELangWelsh:
+                    langCode = KNSmlDMWelsh;
+                    break;
+                case ELangZulu:
+                    langCode = KNSmlDMZulu;
+                    break;
+                default:
+                    langCode = KNSmlDMEnglish;
+                }
+            aObject.InsertL( 0, langCode );
+            }
+        else
+        if ( segment == KNSmlDMDevInfoDmVNodeName )
+            {
+            if(!FeatureManager::FeatureSupported( KFeatureIdSyncMlDm112  ))
+                aObject.InsertL( 0, KNSmlDMDmV12 );
+            else
+            aObject.InsertL( 0, KNSmlDMDmV );
+            }
+        else
+        if ( segment == KNSmlDMDevInfoModDDFNodeName )
+            {
+
+            }
+        else
+        if ( segment == KNSmlDMDevInfoModDevDetNodeName )
+            {
+            TUid implUID;
+            implUID.iUid = KNSmlDMDevDetailAdapterImplUid;
+            
+            TAny* nPtr = NULL;
+            MSmlDmCallback& aDmNull = reinterpret_cast<MSmlDmCallback&>(nPtr);
+            CNSmlDmDevDetailAdapter* devDetAdapter = 
+                reinterpret_cast<CNSmlDmDevDetailAdapter*>(CSmlDmAdapter::NewL( implUID, aDmNull ) );
+            CleanupStack::PushL(devDetAdapter);
+            TInt checkSumDevDet = devDetAdapter->DevDetailValueCrcL();
+            TBuf8<16> stringCheckSumDevDet; 
+            stringCheckSumDevDet.Num( checkSumDevDet );
+            aObject.InsertL( 0, stringCheckSumDevDet );
+            CleanupStack::PopAndDestroy(); // devDetAdapter
+            }
+        else
+            {
+            retValue = CSmlDmAdapter::EError;
+            }
+        }
+    _DBG_FILE("CNSmlDmInfoAdapter::FetchLeafObjectL(): end");
+    return retValue;
+    }
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+#ifndef IMPLEMENTATION_PROXY_ENTRY
+#define IMPLEMENTATION_PROXY_ENTRY(aUid, aFuncPtr)  {{aUid},(aFuncPtr)}
+#endif
+
+const TImplementationProxy ImplementationTable[] = 
+    {
+        IMPLEMENTATION_PROXY_ENTRY(KNSmlDMDevInfoAdapterImplUid, CNSmlDmDevInfoAdapter::NewL)
+    };
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+EXPORT_C const TImplementationProxy* ImplementationGroupProxy( TInt& aTableCount )
+    {
+    _DBG_FILE("ImplementationGroupProxy() for CNSmlDmDevInfoAdapter: begin");
+    aTableCount = sizeof(ImplementationTable) / sizeof(TImplementationProxy);
+    _DBG_FILE("ImplementationGroupProxy() for CNSmlDmDevInfoAdapter: end");
+    return ImplementationTable;
+    }
+
+// End of file
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/adapters/devinfo/src/nsmldmdevinfoadapter.rss	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,66 @@
+/*
+* 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: Implementation of dm adapters
+* 	This is part of omadmextensions.
+*
+*/
+
+
+CHARACTER_SET UTF8
+
+/*
+* ============================================================================
+*  Name     : 101f6de8.rss
+*  Part of  : SyncMl
+*  Origin   : SyncML Phase 2 
+*  Created  : 06.03.2003
+*  Implementation notes:
+*     
+*  Version  : 0.1
+*   $Revision: 2 $, $Modtime: 10.05.05 11:06 $ by $Author: Kollasep $
+*  ---------------------------------------------------------------------------
+*  Version history:
+*  Template version: 1.02, 21.6.2000 by maparnan
+*  <ccm_history>
+*  </ccm_history>
+* ============================================================================
+*/
+
+
+
+#include <registryinfo.rh>
+#include <nsmldmconstants.h>
+
+RESOURCE REGISTRY_INFO theRegistryInfo
+  {
+  dll_uid = 0x101F6DE8; //The DLL's 3rd UID.
+  interfaces = 
+      {
+      INTERFACE_INFO
+          {
+          interface_uid = KNSmlDMInterfaceUid; // DM interface UID
+          implementations = 
+            {
+            IMPLEMENTATION_INFO
+                {
+                implementation_uid = 0x101F6DEE; // DM devinfo implementation UID
+                version_no = 1; 
+                display_name = "";
+                default_data = "";
+                opaque_data = "";
+                }
+            };
+          }
+      };
+    }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/adapters/inc/nsmldmimpluids.h	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,42 @@
+/*
+* Copyright (c) 2002 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:    DM tree etc.
+*
+*/
+
+
+
+
+#ifndef __NSMLDMIMPLUIDS_H__
+#define __NSMLDMIMPLUIDS_H__
+
+// ------------------------------------------------------------------------------------------------
+// Includes
+// ------------------------------------------------------------------------------------------------
+#include <e32base.h>
+
+// ------------------------------------------------------------------------------------------------
+//
+// ------------------------------------------------------------------------------------------------
+
+// Implementation UIDs for DS adapters
+const TUint KNSmlDMSettingsAdapterImplUid = 0x101F6DEC;
+const TUint KNSmlDSSettingsAdapterImplUid = 0x101F6DED;
+const TUint KNSmlDMDevInfoAdapterImplUid = 0x101F6DEE;
+const TUint KNSmlDMDevDetailAdapterImplUid = 0x101F6DEF;
+const TUint KNSmlInternetAdapterImplUid = 0x101F6DE2;
+const TUint KNSmlDMEmailAdapterImplUid = 0x101F6E35;
+const TUint KNSmlDMMMSAdapterImplUid = 0x101F6E37;
+const TUint KNSmlDMFotaAdapterImplUid = 0x101F9A09;
+#endif // __CNSMLDMIMPLUIDS_H__
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/adapters/syncmldm12/bld/bld.inf	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,26 @@
+/*
+* Copyright (c) 2002 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:    build info file for SyncML DM settings adapter
+*
+*/
+
+
+
+
+PRJ_MMPFILES
+./nsmldmsettingsadapter12.mmp
+
+
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/adapters/syncmldm12/bld/nsmldmsettingsadapter12.mmp	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,51 @@
+/*
+* 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:    DM-settings adapter
+*
+*/
+
+
+
+
+#include "defaultcaps.hrh"
+#include  <platform_paths.hrh>
+
+TARGET          nsmldmsettingsadapter12.dll
+TARGETTYPE      PLUGIN
+UID             0x10009D8D 0x10282CE7
+VENDORID        VID_DEFAULT
+CAPABILITY      CAP_ECOM_PLUGIN
+
+APP_LAYER_SYSTEMINCLUDE
+SYSTEMINCLUDE 	/epoc32/include/ecom
+
+SOURCEPATH      ../src
+USERINCLUDE     ../inc ../../inc
+
+SOURCE          NSmlDmSettingsAdapter12.cpp
+
+
+START RESOURCE 	nsmldmsettingsadapter12.rss
+END
+
+LIBRARY         euser.lib ecom.lib charconv.lib nsmldebug.lib
+LIBRARY         nsmldmiapmatcher.lib
+LIBRARY         syncmlclientapi.lib
+LIBRARY         nsmltransporthandler.lib
+LIBRARY         nsmlprivateapi.lib
+LIBRARY			featmgr.lib
+
+
+SMPSAFE
+// End of File
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/adapters/syncmldm12/inc/NSmlDMSettingsAdapter12.h	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,1021 @@
+/*
+* 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:    DM Settings adapter header file
+*
+*/
+
+
+
+
+#ifndef __NSMLDMSETTINGSADAPTER12_H__
+#define __NSMLDMSETTINGSADAPTER12_H__
+
+
+// INCLUDES
+#include <utf.h>
+#include <smldmadapter.h>
+#include <SyncMLClientDM.h>
+#include "NSmlPrivateAPI.h"
+
+// CONSTANTS
+const TInt KNSmlDMGranularity = 4;
+const TUint8 KNSmlDMColon = ':';
+const TUint8 KNSmlDMUriSeparator = '/';
+const TInt KPortMaxSize = 65535;
+const TInt KPortMinSize = 0;
+//Dynamic Node Posn Const --> DMAcc/DMIDxxx
+const TInt KDynNodePosn = 2;
+
+_LIT8( KNSmlTrueVal, "1" );
+_LIT8( KNSmlFalseVal, "0" );
+_LIT8( KNSmlHTTPAuth, 		"NSmlHTTPAuth" );
+_LIT8( KNSmlHTTPUsername,	"NSmlHTTPUsername" );
+_LIT8( KNSmlHTTPPassword, 	"NSmlHTTPPassword" );
+
+
+//DDF accepted DM-fieldnames
+_LIT8( KNSmlDdfId,				"Id" );
+_LIT8( KNSmlDdfAppId,				"AppID" );
+_LIT8( KNSmlDdfServerId,		"ServerID" );
+_LIT8( KNSmlDdfName,			"Name" );
+_LIT8( KNSmlDdfPrefConRef,			"PrefConRef" );
+_LIT8( KNSmlDdfToConRef,			"ToConRef" );
+_LIT8( KNSmlDdfConRef,			"ConRef" );
+_LIT8( KNSmlDdfAppAddr,			"AppAddr" );
+_LIT8( KNSmlDdfAddr,			"Addr" );
+_LIT8( KNSmlDdfAddrType,		"AddrType" );
+_LIT8( KNSmlDdfPort,			"Port" );
+_LIT8( KNSmlDdfPortNbr,			"PortNbr" );
+_LIT8( KNSmlDdfAuthScheme,		"AAuthPref" ); 
+_LIT8( KNSmlDdfAppAuth,		"AppAuth" );
+_LIT8( KNSmlDdfAAuthLevel,		"AAuthLevel" );
+_LIT8( KNSmlDdfAAuthType,		"AAuthType" );
+_LIT8( KNSmlDdfAAuthName,		"AAuthName" );
+_LIT8( KNSmlDdfAAuthSecret,		"AAuthSecret" );
+_LIT8( KNSmlDdfAAuthData,		"AAuthData" );
+_LIT8( KNSmlDdfExt,		"Ext" );
+_LIT8( KNSmlDdfServerPW,		"ServerPW" );
+_LIT8( KNSmlDdfServerNonce,		"ServerNonce" );
+_LIT8( KNSmlDdfClientUserName,	"UserName" );
+_LIT8( KNSmlDdfClientPW,		"ClientPW" );
+_LIT8( KNSmlDdfClientNonce,		"ClientNonce" );
+_LIT8( KNSmlDdfLocked,		"ProfileLock" );
+
+
+
+_LIT( KNSmlDdfMConRef,			"MConRef" );
+
+//Constant strings 
+
+
+_LIT8( KNSmlDdfAppIdValue,				"w7" );
+
+
+//DDF DM-field descriptions
+_LIT8( KNSmlDdfAppIdDescription,				"AppID of DMSettings " );
+_LIT8( KNSmlDdfAddrDescription,				"Host address of the SyncML server, IP or URL" );
+_LIT8( KNSmlDdfAddrTypeDescription,			"The type of address specified in the Addr node" );
+_LIT8( KNSmlDdfPortNbrDescription,			"SyncML Server port" );
+_LIT8( KNSmlDdfAuthSchemeDescription,		"Scheme of authentication" );
+_LIT8( KNSmlDdfServerIdDescription,			"The ServerId value for this server" );
+_LIT8( KNSmlDdfNameDescription,				"Displayable name for the SyncML setings" );
+_LIT8( KNSmlDdfConRefDescription,			"Logical reference to a connectivity node" );
+_LIT8( KNSmlDdfAuthLevelDescription ,       "AuthLevel of the AppAuth node " );
+_LIT8( KNSmlDdfAuthNameDescription ,       "AuthName of the AppAuth node " );
+_LIT8( KNSmlDdfAuthSecretDescription ,       "AuthSecret of the AppAuth node " );
+_LIT8( KNSmlDdfAuthDataDescription ,       "AuthData of the AppAuth node " );
+_LIT( KNSmlDdfMConRefDescription,			"Parent to Multiple Connection Reference objects" );
+
+
+//Default data values
+_LIT( KNSmlDefName,				"DMAdapterIns" );
+_LIT8( KNSmlDefDMAcc,			"DMAcc" );
+_LIT8( KNSmlDMStart,			"DMAcc/DMId" );
+_LIT( KNSmlDefDMIAP,			"AP" );
+_LIT8( KNSmlDMUriDotSlash,      "./");
+_LIT8( KNSmlDMNullDesc8,        "");
+_LIT8(KNSmlIAPId,               "NSmlIapId");
+
+_LIT8(KNSmlAddrtype,               "URI");
+
+
+// AuthPref text values
+_LIT8( KNSmlDMAuthPrefNoAuth,"syncml:auth-none");
+_LIT8( KNSmlDMAuthPrefBasic, "syncml:auth-basic");
+_LIT8( KNSmlDMAuthPrefMD5,	 "syncml:auth-md5");
+_LIT8( KNSmlDMAuthPrefTransport,	 "transport");
+
+_LIT8( KNSmlDMAuthTypeBasic, "BASIC");
+_LIT8( KNSmlDMAuthTypeMD5,	 "DIGEST");
+_LIT8( KNSmlDMAuthTypeTransport,	 "TRANSPORT");
+_LIT8( KNSmlDMSettingsHTTP,  "http://" );
+_LIT8( KNSmlDMSettingsHTTPS, "https://" );
+
+_LIT8( KIAPid, "IAPid" );
+_LIT8( KSegmDMAcc,"AppID/ServerID/Name/PrefConRef/AppAddr/AAuthPref/AppAuth/Ext");
+_LIT8( KSegmDMAccAppAddr,"Addr/AddrType/Port");
+_LIT8( KSegmDMAccPortRT,"Port001");
+_LIT8( KSegmDMAccport,"PortNbr");
+_LIT8( KSegmDMAccAppAuth,"AAuthLevel/AAuthType/AAuthName/AAuthSecret/AAuthData");
+_LIT8( KSegmDMAccLocked,"ProfileLock");
+_LIT8( KSmlDmSlash, "/");
+_LIT8( KVersion,"1.1" );
+_LIT8( KMimeType, "text/plain" );
+_LIT8( KSyncMLText, "SyncML" );
+_LIT8( KNSmlDMadapterDesc, "DM-Settings DDF description" );
+_LIT8( KNSmlDMadapterTitle,"DM-Settings title" );
+
+_LIT8( KDmAccMatch, "DMAcc/*" );
+_LIT8( KDmAccMatch3, "DMAcc/*/*" );
+
+_LIT8( KDmAccMatch2, "DMAcc" );
+_LIT8 (KDmAccToConRefMatch, "DMAcc/*/ToConRef");
+_LIT8 (KDmAccToConRefId, "ConRef001");
+_LIT8 (KDmAccToConRefFullMatch, "DMAcc/*/ToConRef/ConRef001");
+_LIT8 (KDmAccAppAddrMatch, "DMAcc/*/AppAddr");
+_LIT8 (KDmAccAppAddrFullMatch, "DMAcc/*/AppAddr/*");
+_LIT8 (KDmAccPortMatch, "DMAcc/*/AppAddr/*/Port");
+_LIT8 (KDmAccExtMatch, "DMAcc/*/Ext");
+//_LIT8 (KDmAccExtFullMatch, "DMAcc/*/Ext/*");
+_LIT8 (KDmAccPortFullMatch, "DMAcc/*/AppAddr/*/Port/Port001");
+_LIT8 (KDmAccAppAuthMatch, "DMAcc/*/AppAuth");
+_LIT8 (KDmAccAppAuthFullMatch, "DMAcc/*/AppAuth/*");
+_LIT8 (KDmAccAppAuthSrvMatch, "DMAcc/*/AppAuth/AppAuthSrv");
+_LIT8 (KDmAccAppAuthCliMatch, "DMAcc/*/AppAuth/AppAuthCli");
+_LIT8 (KDmAccAppAuthObexMatch, "DMAcc/*/AppAuth/AppAuthObex");
+_LIT8 (KDmAccAppAuthHttpMatch, "DMAcc/*/AppAuth/AppAuthHttp");
+_LIT8 (KDmAccAppAuthTransMatch, "DMAcc/*/AppAuth/AppAuthTransport");
+
+
+
+//_LIT8 (KDmAccAppAuthNodes, "AppAuthSrv/AppAuthCli/AppAuthObex/AppAuthHttp");
+_LIT8 (KDmAccAppAuthNodes, "AppAuthSrv/AppAuthCli/AppAuthTransport");
+_LIT8 (KDmAccAppAuthDyn1, "AppAuthSrv"); // serv
+_LIT8 (KDmAccAppAuthDyn2, "AppAuthCli"); //client
+_LIT8 (KDmAccAppAuthDyn3, "AppAuthObex"); //obex
+_LIT8 (KDmAccAppAuthDyn4, "AppAuthHttp");
+
+_LIT8 (KDmAccAppAuthTransport, "AppAuthTransport");
+
+_LIT8 (KDmAccAppAuthDyn1LUid, "SRVCRED");
+_LIT8 (KDmAccAppAuthDyn2LUid, "CLCRED");
+_LIT8 (KDmAccAppAuthDyn3LUid, "OBEX");
+_LIT8 (KDmAccAppAuthDyn4LUid, "HTTP");
+
+_LIT8 (KDmAccAppAuthLevelSrv, "SRVCRED");
+_LIT8 (KDmAccAppAuthLevelCli, "CLCRED");
+_LIT8 (KDmAccAppAuthLevelObx, "OBEX");
+_LIT8 (KDmAccAppAuthLevelHttp, "HTTP");
+_LIT8(KDmProfileLocked, "Locked");
+_LIT8(KDmProfileUnLocked, "Unlocked");
+const TInt KHttpUsed  = 1;
+const TInt KHttpNotUsed  = 0;
+
+
+// temporary
+
+_LIT8 (KDmAccAppAddrId, "Addr001");
+
+// NOTE: this enum must match with property array described in 
+// SyncML_Sync_Agent_Client_API_Specification.doc.
+enum TNSmlSyncTransportProperties
+	{
+	EPropertyIntenetAccessPoint = 0,
+	EPropertyHttpUsed = 5,
+	EPropertyHttpUserName = 6,
+	EPropertyHttpPassword = 7
+	};
+
+
+// DATA TYPES
+enum TNSmlDMFieldType
+	{
+	EStr,
+	EInt,
+	EBin,
+	EWrong
+	};
+
+enum TNSmlDMLeafType
+	{
+	EDMUpdate,
+	EDMDelete,
+	EDMUnset
+	};
+
+enum TNSmlDMProfileData
+	{
+	EProfileId,
+	EProfileName,
+	EProfileIAPId,
+	EProfileMediumType,
+	EProfileDMServerUsername,
+	EProfileDMServerPassword,
+	EServerNonce,
+	ESharedSecret,
+	EClientNonce,
+	EProfileURL,
+	EProfilePort,
+	EServerId,
+	EAuthenticationRequired,
+	ESyncAccepted,
+	EProfileAddrType,
+	EPRofileServerCred,
+	EPRofileClientCred,
+	EProfileHttpUsername,
+	EProfileHttpPassword,
+	EProfileAAuthType,
+	EProfileTransport,
+	EProfileObexUsername,
+	EProfileObexPassword,
+	ETransportAuthName,
+	EProfileTransportPassword,
+	EProfileTransportAuthData,
+	EProfileLock
+	};
+
+enum TAuthenticationType
+	{
+	ENoAuth,    //"syncml:auth-none"
+	EBasic,     //"syncml:auth-basic"
+	EMD5        //"syncml:auth-md5"
+	};
+
+enum TNSmlDMMediumType
+	{
+	ENone,
+    EHttp,
+	EWsp,
+    EObex
+	};
+
+struct TNSmlDMLeafElement
+	{
+	HBufC8 *iUri;
+	HBufC8 *iData;
+	TInt iStatusRef;
+	HBufC8* iLuid;
+	};
+
+struct TNSmlDMBufferElement
+	{
+	CArrayFixFlat<TNSmlDMLeafElement> *iLeafBuf;
+	HBufC8* iMappingName; //Holds the Dyn.Node URI       
+	TBool iExecuted; //Node updated to dB or not       
+	TInt iDMBuffStatusref; //Statusref for callback       
+	TBool iAddr;
+	TBool iServerId; //Bools for Mandatory fields       
+	TBool iUName;
+	TBool iServerName;
+	};
+
+// CLASS DECLARATION
+/**
+*  CNSmlDMSettingsAdapter12 class 
+*  Contains the whole implementation of the DM settings adapter.
+*
+*  @lib nsmldmsettingsadapter.dll
+*  @since Series 60 Series60_3.0
+*/
+class CNSmlDMSettingsAdapter12 : public CSmlDmAdapter
+	{
+    public: // Constructors and destructor
+        
+        /**
+        * Two-phased constructor.
+        */
+	    static CNSmlDMSettingsAdapter12* NewL(MSmlDmCallback* aDmCallback );
+	    static CNSmlDMSettingsAdapter12* NewLC(MSmlDmCallback* aDmCallback );
+
+	    void ConstructL();
+
+        /**
+        * Destructor.
+        */
+	    virtual ~CNSmlDMSettingsAdapter12();
+
+    public: // Functions from base classes
+
+	    /**
+        * From      CSmlDmAdapter   DDFVersionL returns current version of the DDF.
+        * @since    Series60_3.0
+        * @param    aVersion        DDF version of the adapter.
+        * @return   none
+        */
+	    void DDFVersionL( CBufBase& aVersion );
+
+        /**
+        * From      CSmlDmAdapter   DDFStructureL for filling the DDF structure of the adapter.
+        * @since    Series60_3.0
+        * @param    aDDF            Reference to root object.
+        * @return   none
+        */
+	    void DDFStructureL( MSmlDmDDFObject& aDDF );
+
+        /**
+        * From      CSmlDmAdapter   UpdateLeafObjectL creates new leaf objects, or replaces 
+        *                           data in existing leaf objects.
+        * @since    Series60_3.0
+        * @param    aURI            URI of the object
+        * @param    aLUID           LUID of the object
+        * @param    aObject         Data of the object
+        * @param    aType           MIME type of the object
+        * @param    aStatusRef      Reference to correct command
+        * @return   none
+        */
+	    void UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, 
+                            const TDesC8& aObject, const TDesC8& aType, 
+                            TInt aStatusRef );
+        
+        /**
+        * From      CSmlDmAdapter   DeleteObjectL deletes an object and its child objects.
+        * @since    Series60_3.0
+        * @param    aURI            URI of the object
+        * @param    aLUID           LUID of the object
+        * @param    aStatusRef      Reference to correct command
+        * @return   none
+        */
+	    void DeleteObjectL( const TDesC8& aURI, const TDesC8& aLUID, 
+                        const TInt aStatusRef );
+        
+        /**
+        * From      CSmlDmAdapter   FetchLeafObjectL fetches data of a leaf object.
+        * @since    Series60_3.0
+        * @param    aURI            URI of the object
+        * @param    aLUID           LUID of the object
+        * @param    aType           MIME type of the object
+        * @param    aResultsRef    	Reference to correct results
+        * @param    aStatusRef      Reference to correct command
+        * @return   none
+        */
+	    void FetchLeafObjectL(  const TDesC8& aURI, 
+                            const TDesC8& aLUID, 
+                            const TDesC8& aType, 
+                            const TInt aResultsRef, 
+                            const TInt aStatusRef ); 
+        /**
+        * From      CSmlDmAdapter   ChildURIListL fetches URI list.
+        * @since    Series60_3.0
+        * @param    aURI                    URI of the object
+        * @param    aLUID                   LUID of the object
+        * @param    aPreviousURISegmentList URI list with mapping LUID information
+        * @param    aResultsRef    	        Reference to correct results
+        * @param    aStatusRef              Reference to correct command
+        * @return   none
+        */
+	    void ChildURIListL( const TDesC8& aURI, const TDesC8& aLUID, 
+                        const CArrayFix<TSmlDmMappingInfo>& aPreviousURISegmentList, 
+                        const TInt aResultsRef, const TInt aStatusRef );
+        
+        /**
+        * From      CSmlDmAdapter   AddNodeObjectL adds node object.
+        * @since    Series60_3.0
+        * @param    aURI            URI of the object
+        * @param    aParentLUID     LUID of the parent object
+        * @param    aStatusRef      Reference to correct command
+        * @return   none
+        */
+	    void AddNodeObjectL( const TDesC8& aURI, const TDesC8& aParentLUID, 
+                            const TInt aStatusRef );
+
+        /**
+        * From      CSmlDmAdapter   UpdateLeafObjectL creates new leaf objects, or replaces 
+        *                           data in existing leaf objects.
+        * @since    Series60_3.0
+        * @param    aURI            URI of the object
+        * @param    aLUID           LUID of the object
+        * @param    aStream         Data of the object
+        * @param    aType           MIME type of the object
+        * @param    aStatusRef      Reference to correct command
+        * @return   none
+        */
+        void UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, 
+                            RWriteStream*& aStream, const TDesC8& aType, 
+                            const TInt aStatusRef );
+        
+        /**
+        * From      CSmlDmAdapter   FetchLeafObjectSizeL fetches the size of a leaf object.
+        * @since    Series60_3.0
+        * @param    aURI            URI of the object
+        * @param    aLUID           LUID of the object
+        * @param    aType           MIME type of the object
+        * @param    aResultsRef    	Reference to correct results
+        * @param    aStatusRef      Reference to correct command
+        * @return   none
+        */
+	    void FetchLeafObjectSizeL( const TDesC8& aURI, const TDesC8& aLUID, 
+                                const TDesC8& aType, const TInt aResultsRef, 
+                                const TInt aStatusRef );
+
+        /**
+        * From      CSmlDmAdapter   The function implements execute command.
+        * @since    Series60_3.0
+        * @param    aURI            URI of the object
+        * @param    aLUID           LUID of the object
+        * @param    aArgument       Argument for the command
+        * @param    aType       	MIME type of the object
+        * @param    aStatusRef      Reference to correct command
+        * @return   none
+        */
+	    void ExecuteCommandL( const TDesC8& aURI, const TDesC8& aLUID, 
+                            const TDesC8& aArgument, const TDesC8& aType, 
+                            const TInt aStatusRef );
+
+        /**
+        * From      CSmlDmAdapter   The function implements execute command.
+        * @since    Series60_3.0
+        * @param    aURI            URI of the object
+        * @param    aLUID           LUID of the object
+        * @param    aStream         Argument for the command
+        * @param    aType       	MIME type of the object
+        * @param    aStatusRef      Reference to correct command
+        * @return   none
+        */
+	    void ExecuteCommandL( const TDesC8& aURI, const TDesC8& aLUID, 
+                            RWriteStream*& aStream, const TDesC8& aType, 
+                            const TInt aStatusRef );
+        
+        /**
+        * From      CSmlDmAdapter   The function implements execute command.
+        * @since    Series60_3.0
+        * @param    aTargetURI      Target URI for the command
+        * @param    aTargetLUID     LUID of the target object
+        * @param    aSourceURI      Source URI for the command
+        * @param    aSourceLUID    	LUID of the source object
+        * @param    aType           MIME type of the object
+        * @param    aStatusRef      Reference to correct command
+        * @return   none
+        */
+	    void CopyCommandL( const TDesC8& aTargetURI, const TDesC8& aTargetLUID, 
+                        const TDesC8& aSourceURI, const TDesC8& aSourceLUID, 
+                        const TDesC8& aType, TInt aStatusRef );
+	
+        /**
+        * From      CSmlDmAdapter   The function indicates start of Atomic command.
+        * @since    Series60_3.0
+        * @param    none
+        * @return   none
+        */
+        void StartAtomicL();
+
+        /**
+        * From      CSmlDmAdapter   The function indicates successful end of Atomic command.
+        * @since    Series60_3.0
+        * @param    none
+        * @return   none
+        */
+	    void CommitAtomicL();
+    
+        /**
+        * From      CSmlDmAdapter   The function indicates unsuccessful end of Atomic command.
+        * @since    Series60_3.0
+        * @param    none
+        * @return   none
+        */
+	    void RollbackAtomicL();
+
+        /**
+        * From      CSmlDmAdapter   Returns ETrue if adapter supports streaming otherwise EFalse.
+        * @since    Series60_3.0
+        * @param    aItemSize       Size limit for stream usage.
+        * @return   ETrue or EFalse
+        */
+	    TBool StreamingSupport( TInt& aItemSize );
+        
+        /**
+        * From      CSmlDmAdapter   Called when stream returned from UpdateLeafObjectL or 
+        *                           ExecuteCommandL has been written to and committed.
+        * @since    Series60_3.0
+        * @param    none
+        * @return   none
+        */
+	    void StreamCommittedL();
+
+        /**
+        * From      CSmlDmAdapter   The function tells the adapter that all the commands of the message that
+	    *                           can be passed to the adapter have now been passed.
+        * @since    Series60_3.0
+        * @param    none
+        * @return   none
+        */
+	    void CompleteOutstandingCmdsL();
+	    
+	     /**
+        * From      CSmlDmAdapter   The function to set profile lock
+        * @since    Series60_3.0
+        * @param    profileId  lockvalue
+        * @return   TInt
+        */
+	    TInt SetProfileLockL(const TInt aPID, TInt aLockValue);
+	
+    private:
+	    
+        /**
+        * C++ default constructor.
+        */
+        CNSmlDMSettingsAdapter12();
+        CNSmlDMSettingsAdapter12( TAny* aEcomArguments );
+	    
+        /**
+        * The function stores integer value to buffer and returns reference to it.
+        * @param    aObject     data to be stored to buffer.
+        * @return   reference to data buffer.
+        */
+        TDesC8& SetIntObjectLC( const TInt& aObject );
+        
+        /**
+        * The function finds out the last element of the uri.
+        * @param    aSource     Uri object that contains all elements.
+        * @return   KErrNone if successful.
+        */
+	    TInt SetField( const TDesC8& aSource );
+	    
+	    /**
+        * The function sets the uri being set ot get
+        * @param    aSource     Uri object that contains all elements.
+        * @return   KErrNone if successful.
+        */
+	    TInt SetURIInProcessL( const TDesC8& aSource );
+	    
+
+        /**
+        * The function converts data to integer and returns it.
+        * @param    aObject     Data object to be converted.
+        * @return   Integer value for an object.
+        */
+	    TInt GetIntObject( const TDesC8& aObject );
+
+        /**
+        * The function converts data to integer and returns it.
+        * @param    aObject     Data object to be converted.
+        * @return   16-bit integer value for an object.
+        */
+	    TInt GetIntObject16( const TDesC& aObject );
+
+        /**
+        * The function converts LUID to integer.
+        * @param    aLUID     LUID data to be converted.
+        * @return   Integer value for a LUID.
+        */    
+	    TInt IntLUID( const TDesC8& aLUID );
+
+        /**
+        * The function sets the IAP value acording the given URI.
+        * @param    aLUID     LUID for a profile.
+        * @param    aObject   Data object containing the URI.
+        * @return   KErrNone if successfull.
+        */    
+	    TInt  SetConRefL( const TInt aLUID, const TDesC8& aObject );
+    
+        /**
+        * The function gets the URI for profile IAP.
+        * @param    aObject   Object where the result will be stored.
+        * @return   KErrNone if successfull.
+        */    
+	    TInt GetConRefL( CBufBase& aObject );
+	
+        /**
+        * The function checks if field to be handled is valid.
+        * @param    none
+        * @return   ETrue if valid field otherwise EFalse.
+        */    
+    	TBool AcceptDMField();
+
+        /**
+        * The function checks if field type to be handled is valid.
+        * @param    none
+        * @return   enum value for a field type.
+        */ 
+	    TNSmlDMFieldType   GetDMFieldType() const;
+
+        /**
+        * The function returns enum value for a field to be handled.
+        * @param    none
+        * @return   enum value for a field to be handled.
+        */ 
+	    TNSmlDMProfileData GetDMField() ;
+
+        /**
+        * The function checks if data length is valid.
+        * @param    aProfileItem    Field / Leaf ID to be handled.
+        * @param    aSource         Data to be handled.
+        * @return   ETrue if data length is valid otherwise EFalse.
+        */ 
+	    TBool NotValidStrLenght( const TNSmlDMProfileData& aProfileItem, 
+                            const TDesC8& aSource );
+        
+        /**
+        * The function converts 16-bit data to 8-bit and returns reference to it.
+        * @param    aSource    Reference data to be converted.
+        * @return   Reference to 8-bit data buffer.
+        */ 
+	    TDesC8&  ConvertTo8LC( const TDesC& aSource );
+
+        /**
+        * The function converts 8-bit data to 16-bit and returns reference to it.
+        * @param    aSource    Reference data to be converted.
+        * @return   Reference to 16-bit data buffer.
+        */ 
+	    TDesC16& ConvertTo16LC( const TDesC8& aSource );
+
+        /**
+        * The function find out the port number from URL and stores it to aPort.
+        * @param    aRealURI    Reference data to be containing the whole URI.
+        * @param    aPort       Reference variable where port number will be stored.
+        * @return   KErrNone if successful otherwise KErrNotFound.
+        */ 
+	    TInt ParseUri( const TDesC8& aRealURI, TInt& aPort );
+
+        /**
+        * The function opens the server session and profile via client API.
+        * @param    aIntLUID    Integer value for a LUID of the profile.
+        * @param    aMode       Read or Read and Write mode for a profile data.
+        * @return   KErrNone if successful otherwise KErrNotFound.
+        */ 
+        TInt OpenSyncSessionAndProfileL( const TInt aIntLUID, TSmlOpenMode aMode );
+
+        /**
+        * The function checks if requested profile ID exits.
+        * @param    aIntLUID    Integer value for a LUID of the profile.
+        * @return   ETrue if profile exits otherwise EFalse.
+        */ 
+	    TBool FindProfileIdL( const TInt aIntLUID );
+
+        /**
+        * The function creates new DM profile.
+        * @param    aPID    Reference to variable where new profile will be stored.
+        * @return   KErrNone if successful otherwise error code.
+        */ 
+        TInt CreateNewProfileL( TInt& aPID );
+
+        /**
+        * The function stores the server URL for a profile.
+        * @param    aPID    Profile ID.
+        * @param    aObj    Reference to server URL data.
+        * @return   KErrNone if successful otherwise error code.
+        */ 
+        TInt SetProfileServerURIL( const TInt aPID, const TDesC8& aObj );
+
+        /**
+        * The function stores the display name for a profile.
+        * @param    aPID    Profile ID.
+        * @param    aObj    Reference to data.
+        * @return   KErrNone if successful otherwise error code.
+        */ 
+        TInt SetProfileDisplayNameL( const TInt aPID, const TDesC8& aObj );
+
+        /**
+        * The function stores the user name for a profile.
+        * @param    aPID    Profile ID.
+        * @param    aObj    Reference to data.
+        * @return   KErrNone if successful otherwise error code.
+        */ 
+        TInt SetProfileUserNameL( const TInt aPID, const TDesC8& aObj );
+        
+        /**
+        * The function stores the profile http user name for a profile.
+        * @param    aPID    Profile ID.
+        * @param    aObj    Reference to data.
+        * @return   KErrNone if successful otherwise error code.
+        */ 
+        TInt SetProfileHttpUserNameL( const TInt aPID, const TDesC8& aObj );
+        
+
+        /**
+        * The function stores the protocol version for a profile.
+        * @param    aPID    Profile ID.
+        * @param    aObj    Reference to data.
+        * @return   KErrNone if successful otherwise error code.
+        */ 
+        TInt SetProfileProtocolVersionL( const TInt aPID, const TDesC8& aObj );
+
+        /**
+        * The function stores the ServerId value for a profile.
+        * @param    aPID    Profile ID.
+        * @param    aObj    Reference to data.
+        * @return   KErrNone if successful otherwise error code.
+        */ 
+        TInt SetProfileServerIdL( const TInt aPID, const TDesC8& aObj );
+
+        /**
+        * The function stores the Server password for a profile.
+        * @param    aPID    Profile ID.
+        * @param    aObj    Reference to data.
+        * @return   KErrNone if successful otherwise error code.
+        */ 
+        TInt SetProfileServerPasswordL( const TInt aPID, const TDesC8& aObj );
+        
+        /**
+        * The function stores the network/http password for a profile.
+        * @param    aPID    Profile ID.
+        * @param    aObj    Reference to data.
+        * @return   KErrNone if successful otherwise error code.
+        */ 
+        TInt SetProfileHttpPasswordL( const TInt aPID, const TDesC8& aObj );
+        
+
+        /**
+        * The function stores the password value for a profile.
+        * @param    aPID    Profile ID.
+        * @param    aObj    Reference to data.
+        * @return   KErrNone if successful otherwise error code.
+        */ 
+        TInt SetProfilePasswordL( const TInt aPID, const TDesC8& aObj );
+
+        /**
+        * The function stores the IAP id value for a profile.
+        * @param    aLUID   Profile ID.
+        * @param    aIAPid  Reference to data.
+        * @return   KErrNone if successful otherwise error code.
+        */ 
+        TInt SetProfileConnectionPropertyL( const TInt aLUID, const TInt aIAPid );
+
+        /**
+        * The function deleted the profile data.
+        * @param    aPID    Profile ID.
+        * @return   KErrNone if successful otherwise error code.
+        */ 
+        TInt DeleteProfileL( const TInt aPID );
+        
+        /**
+        * The function to tell whether the profile is locked.
+        * @param    aPID   
+        * @return   1 if locked otherwise 0
+        */ 
+        TBool IsProfileLockedL(const TInt aPID);
+        
+        /**
+        * The function gets the profile data acoeding to aDMField.
+        * @param    aLUID       Profile ID.
+        * @param    aDMField    Data field ID to be handled.
+        * @param    aObject     Reference where fetched data to be stored.
+        * @return   KErrNone if successful otherwise error code.
+        */ 
+        TInt GetObjectL( TInt aLUID, TNSmlDMProfileData aDMField, 
+                        CBufBase& aObject );
+
+        /**
+        * The function adds port number to address URL.
+        * @param    aLUID       Profile ID.
+        * @param    aPort       Reference to port number data.
+        * @return   KErrNone if successful otherwise error code.
+        */ 
+        TInt SetProfileConnectionPortNrL( const TInt aLUID, const TDesC8& aPort );
+        
+        /**
+        * The function adds port number to address URL.
+        * @param    aSrvURI     Original address URI.
+        * @param    aNewURI     New URI when port number has been added or deleted.
+        * @param    aPort       Reference to port number data.
+        * @return   KErrNone if successful otherwise error code.
+        */ 
+        void SetPortNrToAddrStr( const TDesC8& aSrvURI, HBufC8* aNewURI, 
+                                const TDesC8& aPort );
+
+        /**
+        * General function which selects which leaf to be handled.
+        * @param    aLUID       Profile LUID.
+        * @param    aObject     Data to be stored.
+        * @param    aField      Leaf of field ID to be handled.
+        * @return   KErrNone if successful otherwise error code.
+        */ 
+        TInt SetDMFieldDataL( const TInt aLUID, const TDesC8& aObject, 
+                            const TNSmlDMProfileData aField );
+        /**
+        * The function fills the node info.
+        * @param    aNode           Reference to node or leaf which info to be filled.
+        * @param    aAccTypes       Access rights for a leaf / node.
+        * @param    aOccurrence     Occurance of the node / leaf.
+        * @param    aScope          Scope (dynamic / permanent) of the leaf / node.
+        * @param    aFormat         Data format of the leaf / node.
+        * @param    aDescription    Description of the node / leaf.
+        * @param    aDefaultValue   Default value for a leaf or node.
+        * @param    aMimeType       MIME type for a leaf / node.
+        * @return   none
+        */ 
+        void FillNodeInfoL( MSmlDmDDFObject& aNode, TSmlDmAccessTypes aAccTypes, 
+                        MSmlDmDDFObject::TOccurence aOccurrence, 
+                        MSmlDmDDFObject::TScope aScope, 
+                        MSmlDmDDFObject::TDFFormat aFormat, 
+                        const TDesC8& aDescription, 
+                        const TDesC8& aDefaultValue, const TDesC8& aMimeType );
+        
+        /**
+        * The function reads the authentication data via private API.
+        * @param    aLUID       LUID for a profile.
+        * @param    aField      Leaf id to be handled.
+        * @param    aObject     Reference where to store the data.
+        * @return   KErrNone if successful otherwise error code.
+        */ 
+        TInt GetDMAuthInfoL( const TInt aLUID, const TNSmlDMProfileData aField, 
+                            CBufBase& aObject );
+
+        /**
+        * The function delete's the authentication data via private API.
+        * @param    aLUID       LUID for a profile.
+        * @param    aField      Leaf id to be handled.
+        * @return   KErrNone if successful otherwise error code.
+        */ 
+        TInt DeleteDMAuthInfoL( const TInt aLUID, const TNSmlDMProfileData aField );
+        
+        /**
+        * The function set's the address type / medium type value for a profile.
+        * @param    aLUID       LUID for a profile.
+        * @param    aIntObj     Address type value.
+        * @return   KErrNone if successful otherwise error code.
+        */ 
+        TInt SetProfileAddrTypeL( const TInt aLUID, const TInt aIntObj );
+
+        /**
+        * The function gets the profile medium type value.
+        * @param    aObject     Reference where data to be stored.
+        * @return   KErrNone if successful otherwise error code.
+        */ 
+        TInt GetProfileConnectiontypeL( TInt& aMediumTYpe );
+        
+        /**
+        * The function gets the profile http user name of value.
+        * @param    aObject     Reference where data to be stored.
+        * @return   KErrNone if successful otherwise error code.
+        */ 
+        TInt GetHttpUsernameL( CBufBase& aObject );
+        
+       
+        /**
+        * The function gets the profile IAP value.
+        * @param    aIAPid     Reference where data to be stored.
+        * @return   KErrNone if successful otherwise error code.
+        */ 
+        TInt GetProfileIAPIdL( TInt& aIAPid );
+
+        /**
+        * The function gets the profile Server URL value.
+        * @param    aURL     Reference where data to be stored.
+        * @return   KErrNone if successful otherwise error code.
+        */ 
+        void GetProfileServerURLL( CBufBase& aURL );
+
+        /**
+        * The function checks the requested medium type if supported.
+        * @param    aIntObj         Medium type.
+        * @param    aMediumType     UID for medium type.
+        * @return   none
+        */         
+        void GetMediumTypeL( const TInt aIntObj, TInt& aMediumType );
+
+        /**
+        * The function gets the server id value.
+        * @param    aObject     Reference where data to be stored.
+        * @return   none
+        */       
+        void GetServerIdL( CBufBase& aObject );
+
+        /**
+        * The function gets the profile name value.
+        * @param    aObject     Reference where data to be stored.
+        * @return   none
+        */       
+        void GetProfileNameL( CBufBase& aObject );
+
+        /**
+        * The function gets the user name value.
+        * @param    aObject     Reference where data to be stored.
+        * @return   none
+        */ 
+        void GetProfileUserNameL( CBufBase& aObject );
+
+        /**
+        * The function gets the profile port number value.
+        * @param    aObject     Reference where data to be stored.
+        * @return   none
+        */ 
+        void GetProfilePortNumberL( CBufBase& aObject );
+
+        /**
+        * The function sets the profile authentication info via private API.
+        * @param    aLUID       Profile LUID.
+        * @param    aField      Leaf ID to be handled.
+        * @param    aObject     Data to be stored.
+        * @param    aStatus     Status of the function, KErrNone if successful.
+        * @return   none
+        */         
+        void SetAuthInfoL( const TInt aLUID, const TNSmlDMProfileData aField, 
+                        const TDesC8& aObject, TInt& aStatus );
+	//Buffers Node Object <>     
+	void AddNodeBufferL( const TDesC8& aURI, const TInt aStatusRef);
+
+	//Buffers Leaf Object       
+	void AddLeafBufferL( const TDesC8& aURI, const TDesC8& aObject,
+			const TInt aStatusRef);
+	// Executes Buffer       
+	void ExecuteBufferL();
+	//Extracts the ParentURI       
+	TPtrC8 ParentURI(const TDesC8& aURI);
+	// Clears the elements of the passed in LeafElement Structure
+	void ClearBuffer( CArrayFixFlat<TNSmlDMLeafElement>* aBuffer);
+	/**
+        * The function checks if requested ServerID ID exits.
+        * @param    aServerid    ServerID.
+        * @return   ETrue if ServerID exits otherwise EFalse.
+  */ 
+	TBool IsServerIDExistL( const TDesC8& aServerid );
+	
+	/**
+        * The function checks if the URI is of format ./DMAcc/DMId<num>
+        * Example ./DMAcc/DMId000 
+        * @param    aURI       aURI.
+        * @return   true/false
+  */                          
+  TBool IsDMAccUriFormatMatchPredefined(const TDesC8 & aURI);
+        
+  /**
+        * The function constructs ./DMAcc/x nodes and
+        * returns the profile ID matching the aURI.
+        * @param    aURI       aURI.
+        * @return   KErrNotFound/ProfileID
+  */  
+        
+  TInt ConstructTreeL(const TDesC8& aURI);
+  
+    /**
+        * The function extracts DMAcc/x node from aURI		        
+        * @param    aURI     DMAcc aURI.
+        * @return   DMAcc/x node.
+    */ 
+  TPtrC8 GetDynamicDMNodeUri(const TDesC8& aURI);
+
+    private:    // Data
+	
+        // Client API session class 
+        RSyncMLSession iSyncSession;
+        // Client API Device Management profile handling
+        RSyncMLDevManProfile iProfile;
+        // Callback interface for returning result or status
+	    MSmlDmCallback* iCallBack;
+	    
+	    TInt iCurrentProfile;
+	    
+        // Profile LUID
+        TInt iLUID;
+        // Parent LUID
+	    TInt iParentLUID;
+        // For handling profile medium type 
+	    TInt iObject;
+                  
+        // Buffer for URI leaf element
+	    HBufC8* iField;
+	    
+        HBufC8* iURIField;
+        TBool iNewProfile;
+        // Information about data type
+	    TNSmlDMFieldType  iFieldType;
+        // Information about leaf command
+	    TNSmlDMLeafType	  iLeafType;
+        // Status information if session allready opened
+        TBool iSyncSessionOpen;
+
+        // Buffer for storing port number
+        HBufC8* iPortNbr;
+    
+        // Private API interface for handling authebtication data
+        RNSmlPrivateAPI iPrivateApi;
+        
+        struct TPortBuffer
+            {
+            // buffered data for updating port number
+            TBufC8<5> iPortBuf;
+            TInt iPortBufLUID;
+            TInt iPortBufStatusRef;
+            };
+        RArray<TPortBuffer> iPortBuffer;
+        
+        struct TLockBuffer
+            {
+            // buffered data for profile lock
+            TInt iProfileLock;
+            TInt iProfileLockLUID;
+            TInt iProfileLockStatusRef;
+            };   
+        RArray<TLockBuffer> iProfileLockBuffer; 
+            
+	TBool iBufOn;
+	TBool iComplete;
+	TInt iExecutionIndex;
+	CArrayFixFlat<TNSmlDMBufferElement> *iBuffer;
+    };
+
+#endif // __NSMLDMSETTINGSADAPTER12_H__
+
+// End of File
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/adapters/syncmldm12/src/NSmlDmSettingsAdapter12.cpp	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,4002 @@
+/*
+* 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:    DM-settings adapter
+*
+*/
+
+
+
+
+// INCLUDE FILES
+#include "NSmlDMSettingsAdapter12.h"
+#include "nsmldebug.h"
+#include "nsmlconstants.h"
+#include "nsmldmconstants.h"
+#include "nsmldmiapmatcher.h"
+#include "nsmldmauthinfo.h"
+#include <featmgr.h>
+#include <implementationproxy.h>
+#include <SyncMLClientDM.h>
+#include <SyncMLTransportProperties.h>
+#include <e32base.h>
+#include <DevManInternalCRKeys.h>
+#include <centralrepository.h>
+#ifndef __WINS__
+// This lowers the unnecessary compiler warning (armv5) to remark.
+// "Warning:  #174-D: expression has no effect..." is caused by 
+// DBG_ARGS8 macro in no-debug builds.
+#pragma diag_remark 174
+#endif
+
+const TUint KNSmlDMSettingsAdapterImplUid = 0x10282CE8;
+
+const TInt KBufSize32   = 32;
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+//  CNSmlDMSettingsAdapter12::NewL
+//  Two-phased constructor.
+// -----------------------------------------------------------------------------
+CNSmlDMSettingsAdapter12* CNSmlDMSettingsAdapter12::NewL( MSmlDmCallback* aDmCallback )
+	{
+	_DBG_FILE("CNSmlDMSettingsAdapter12::NewL(): begin");
+
+	CNSmlDMSettingsAdapter12* self = NewLC( aDmCallback );
+	CleanupStack::Pop();
+
+	_DBG_FILE("CNSmlDMSettingsAdapter12::NewL(): end");
+	return self;
+	}
+
+// -----------------------------------------------------------------------------
+//  CNSmlDMSettingsAdapter12::NewLC( )
+//  Loads the CNSmlDMSettingsAdapter12 class and pushes it to clenupstack.
+// -----------------------------------------------------------------------------
+CNSmlDMSettingsAdapter12* CNSmlDMSettingsAdapter12::NewLC( MSmlDmCallback* aDmCallback )
+	{
+	_DBG_FILE( "CNSmlDMSettingsAdapter12::NewLC(): begin" );
+	CNSmlDMSettingsAdapter12* self = new ( ELeave ) CNSmlDMSettingsAdapter12( aDmCallback );
+	CleanupStack::PushL( self );
+    self->iCallBack = aDmCallback;
+	self->ConstructL();
+	self->iLeafType = EDMUnset;
+
+	_DBG_FILE( "CNSmlDMSettingsAdapter12::NewLC(): end" );
+	return self;
+	}
+
+// -----------------------------------------------------------------------------
+//  CNSmlDMSettingsAdapter12::CNSmlDMSettingsAdapter()
+//  Default constructor.
+// -----------------------------------------------------------------------------
+CNSmlDMSettingsAdapter12::CNSmlDMSettingsAdapter12( TAny* aEcomArguments) : 
+                                                CSmlDmAdapter(aEcomArguments )
+	{
+	_DBG_FILE( "CNSmlDMSettingsAdapter12::CNSmlDMSettingsAdapter(): begin" );
+	_DBG_FILE( "CNSmlDMSettingsAdapter12::CNSmlDMSettingsAdapter(): end" );
+	}
+
+// -----------------------------------------------------------------------------
+//  CNSmlDMSettingsAdapter12::~CNSmlDMSettingsAdapter()
+//  Destructor.
+// -----------------------------------------------------------------------------
+CNSmlDMSettingsAdapter12::~CNSmlDMSettingsAdapter12()
+	{
+	_DBG_FILE( "CNSmlDMSettingsAdapter12::~CNSmlDMSettingsAdapter(): begin" );
+
+    delete iField;
+	delete iURIField;
+    // Client API Session & Profile
+    iProfile.Close();
+	iSyncSession.Close();
+    iSyncSessionOpen = EFalse;
+	// In Case the Buffer isnt cleared
+	if ( iBuffer)
+		{
+		for (TInt val =0; val<iBuffer->Count ();val++)
+			{
+			delete iBuffer->At(val).iMappingName;
+
+			ClearBuffer ( iBuffer->At(val).iLeafBuf);
+			delete iBuffer->At(val).iLeafBuf;
+			}
+
+		iBuffer->Reset ();
+		delete iBuffer;
+		}
+    delete iPortNbr;
+    iPortBuffer.Reset();
+    iPortBuffer.Close();
+    iProfileLockBuffer.Reset();
+    iProfileLockBuffer.Close();
+        
+    iPrivateApi.Close();
+    
+    iCallBack = 0; 
+    FeatureManager::UnInitializeLib();            
+	_DBG_FILE( "CNSmlDMSettingsAdapter12::~CNSmlDMSettingsAdapter(): end" );
+	}
+
+// -----------------------------------------------------------------------------
+//		CNSmlDMSettingsAdapter12::ConstructL()
+//		Second phase constructor.
+// -----------------------------------------------------------------------------
+void CNSmlDMSettingsAdapter12::ConstructL()
+	{
+	iField = HBufC8::NewL( KNSmlMaxURLLength );
+	iURIField = NULL;	
+    iSyncSessionOpen = EFalse;
+	FeatureManager::InitializeLibL();
+	// variables used for Buffering
+	iBufOn = EFalse;
+	iComplete = EFalse;
+	iExecutionIndex = -1;
+	iNewProfile = EFalse;
+	// initialising iBuffer
+	iBuffer = new (ELeave) CArrayFixFlat <TNSmlDMBufferElement> (KNSmlDMGranularity);
+    }
+
+// -----------------------------------------------------------------------------
+//  CNSmlDMSettingsAdapter12::DDFVersionL()
+//  Returns the DDF version number.
+// -----------------------------------------------------------------------------
+void CNSmlDMSettingsAdapter12::DDFVersionL( CBufBase& aVersion )
+	{
+	_DBG_FILE(
+            "CNSmlDMSettingsAdapter12::DDFVersionL(CBufBase& aDDFVersion): begin" );
+	aVersion.InsertL( 0, KVersion );
+	_DBG_FILE(
+            "CNSmlDMSettingsAdapter12::DDFVersionL(CBufBase& aDDFVersion): end" );
+	}
+
+// -----------------------------------------------------------------------------
+//  CNSmlDMSettingsAdapter12::DDFStructureL()
+//  Fills the DDF structure of the adapter.
+// -----------------------------------------------------------------------------
+void CNSmlDMSettingsAdapter12::DDFStructureL( MSmlDmDDFObject& aDDF )
+	{
+	_DBG_FILE( "CNSmlDMSettingsAdapter12::DDFStructureL(): begin" );
+      
+    //Making DMAcc as root 
+    
+	MSmlDmDDFObject* ddfRoot = &aDDF;
+	MSmlDmDDFObject& nDmDDF = ddfRoot->AddChildObjectL( KNSmlDefDMAcc );
+
+	TSmlDmAccessTypes *aclTypes = new ( ELeave ) TSmlDmAccessTypes();
+	CleanupStack::PushL( aclTypes );
+    
+    // Set Get as acceptable operations
+    aclTypes->SetGet();
+	
+	nDmDDF.SetDFTitleL( KNSmlDMadapterTitle );
+	
+    FillNodeInfoL( nDmDDF, *aclTypes, MSmlDmDDFObject::EOne, 
+                    MSmlDmDDFObject::EPermanent, MSmlDmDDFObject::ENode, 
+                    KNullDesC8, KNullDesC8, KNullDesC8 );
+    
+	aclTypes->SetAdd();
+	// Set rest acceptable operations for data itself
+	aclTypes->SetReplace();
+	aclTypes->SetDelete();
+
+	TSmlDmAccessTypes aclTypesNoGet;
+	aclTypesNoGet.SetReplace();
+	aclTypesNoGet.SetAdd();
+	aclTypesNoGet.SetDelete();
+
+	TSmlDmAccessTypes aclTypesAR;
+	aclTypesAR.SetReplace();
+	aclTypesAR.SetAdd();
+
+    TSmlDmAccessTypes aclTypesARG;
+	aclTypesARG.SetReplace();
+	aclTypesARG.SetAdd();
+    aclTypesARG.SetGet();
+
+    TSmlDmAccessTypes aclTypesG;
+    aclTypesG.SetGet();
+    
+    TSmlDmAccessTypes aclTypesAG;
+    aclTypesAG.SetGet();
+    aclTypesAG.SetAdd();
+    
+    TSmlDmAccessTypes aclTypesAGD;
+    aclTypesAGD.SetGet();
+    aclTypesAGD.SetAdd();
+    aclTypesAGD.SetDelete();
+    
+        
+	MSmlDmDDFObject& nProDDF = nDmDDF.AddChildObjectGroupL();
+    FillNodeInfoL( nProDDF, *aclTypes, MSmlDmDDFObject::EZeroOrMore, 
+                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::ENode, 
+                    KNullDesC8, KNullDesC8, KMimeType );
+
+    MSmlDmDDFObject& nAppIdDDF = nProDDF.AddChildObjectL( KNSmlDdfAppId );			// Addr
+    FillNodeInfoL( nAppIdDDF, aclTypesG, MSmlDmDDFObject::EOne, 
+                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::EChr, 
+                    KNSmlDdfAppIdDescription, KNullDesC8, KMimeType );
+
+      //PrefConRef 
+    MSmlDmDDFObject& nPrefConRefDDF = nProDDF.AddChildObjectL( KNSmlDdfPrefConRef );	// PrefConRef
+    FillNodeInfoL( nPrefConRefDDF, aclTypesARG, MSmlDmDDFObject::EOne, 
+                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::EChr, 
+                    KNSmlDdfConRefDescription, KNullDesC8, KMimeType );
+
+           
+                    
+   // App Address nodes 
+    MSmlDmDDFObject& nAppAddrDDF = nProDDF.AddChildObjectL( KNSmlDdfAppAddr );	// AppAddr
+    FillNodeInfoL( nAppAddrDDF, aclTypesG, MSmlDmDDFObject::EOne, 
+                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::ENode, 
+                    KNSmlDdfAddrDescription, KNullDesC8, KMimeType );
+   
+    MSmlDmDDFObject& rtToAppAddrRef = nAppAddrDDF.AddChildObjectGroupL();  //AppAddr/<X>
+    FillNodeInfoL(rtToAppAddrRef,aclTypesG,MSmlDmDDFObject::EOneOrMore,
+                  MSmlDmDDFObject::EDynamic,MSmlDmDDFObject::ENode,
+                  KNSmlDdfAddrDescription,KNullDesC8, KMimeType );
+
+
+    MSmlDmDDFObject& nAddrForAppAddrDDF = rtToAppAddrRef.AddChildObjectL( KNSmlDdfAddr );			// Addr
+    FillNodeInfoL( nAddrForAppAddrDDF, aclTypesARG, MSmlDmDDFObject::EOne, 
+                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::EChr, 
+                    KNSmlDdfAddrDescription, KNullDesC8, KMimeType );
+
+	MSmlDmDDFObject& nAddrTypeForAppAddrDDF = rtToAppAddrRef.AddChildObjectL( KNSmlDdfAddrType );	// AddrType
+    FillNodeInfoL( nAddrTypeForAppAddrDDF, aclTypesG, MSmlDmDDFObject::EOne, 
+                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::EChr, 
+                    KNSmlDdfAddrTypeDescription, KNullDesC8, KMimeType );
+
+	MSmlDmDDFObject& nPortForAppAddrDDF = rtToAppAddrRef.AddChildObjectL( KNSmlDdfPort );	// PortNbr
+    FillNodeInfoL( nPortForAppAddrDDF, aclTypesG, MSmlDmDDFObject::EOne, 
+                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::ENode, 
+                    KNSmlDdfPortNbrDescription, KNullDesC8, KMimeType );
+
+    //Runtime port address
+    MSmlDmDDFObject& nrtToPortDDF = nPortForAppAddrDDF.AddChildObjectGroupL();	// PortNbr
+    FillNodeInfoL( nrtToPortDDF, aclTypesG, MSmlDmDDFObject::EOneOrMore, 
+                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::ENode, 
+                    KNSmlDdfPortNbrDescription, KNullDesC8, KMimeType );
+    
+    MSmlDmDDFObject& nPortNbrToPortDDF = nrtToPortDDF.AddChildObjectL( KNSmlDdfPortNbr );	// PortNbr
+    FillNodeInfoL( nPortNbrToPortDDF, aclTypesARG, MSmlDmDDFObject::EZeroOrOne, 
+                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::EInt, 
+                    KNSmlDdfPortNbrDescription, KNullDesC8, KMimeType );
+                    
+
+    MSmlDmDDFObject& nAuthSchemeDDF = nProDDF.AddChildObjectL( KNSmlDdfAuthScheme );	// AuthPref
+    FillNodeInfoL( nAuthSchemeDDF, aclTypesARG, MSmlDmDDFObject::EOne, 
+                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::EChr, 
+                    KNSmlDdfAuthSchemeDescription, KNullDesC8, KMimeType );                     
+   //APPAUthNodes 
+   
+   MSmlDmDDFObject& nAppAuthDDF = nProDDF.AddChildObjectL( KNSmlDdfAppAuth );	// AppAuth
+    FillNodeInfoL( nAppAuthDDF, aclTypesG, MSmlDmDDFObject::EOne, 
+                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::ENode, 
+                    KNSmlDdfAuthSchemeDescription, KNullDesC8, KMimeType ); 
+                    
+   
+   MSmlDmDDFObject& nrtToAppAuthDDF = nAppAuthDDF.AddChildObjectGroupL();	// appauth/<x>
+    FillNodeInfoL( nrtToAppAuthDDF, aclTypesG, MSmlDmDDFObject::EOne, 
+                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::ENode, 
+                    KNSmlDdfAuthSchemeDescription, KNullDesC8, KMimeType ); 
+
+
+   MSmlDmDDFObject& nAauthLevelDDF = nrtToAppAuthDDF.AddChildObjectL( KNSmlDdfAAuthLevel );	// AAuthLevel
+    FillNodeInfoL( nAauthLevelDDF, aclTypesARG, MSmlDmDDFObject::EOne, 
+                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::EChr, 
+                    KNSmlDdfAuthLevelDescription, KNullDesC8, KMimeType );
+                    
+    
+   MSmlDmDDFObject& nAauthtypeDDF = nrtToAppAuthDDF.AddChildObjectL( KNSmlDdfAAuthType );	// AAuthType
+    FillNodeInfoL( nAauthtypeDDF, aclTypesG, MSmlDmDDFObject::EOne, 
+                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::EChr, 
+                    KNSmlDdfAddrTypeDescription, KNullDesC8, KMimeType );
+                    
+
+   MSmlDmDDFObject& nAauthNameDDF = nrtToAppAuthDDF.AddChildObjectL( KNSmlDdfAAuthName );	// AddrType
+    FillNodeInfoL( nAauthNameDDF, aclTypesARG, MSmlDmDDFObject::EOne, 
+                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::EChr, 
+                    KNSmlDdfAuthNameDescription, KNullDesC8, KMimeType );
+                    
+
+   MSmlDmDDFObject& nAauthSecretDDF = nrtToAppAuthDDF.AddChildObjectL( KNSmlDdfAAuthSecret );	// AddrType
+    FillNodeInfoL( nAauthSecretDDF, aclTypesAR, MSmlDmDDFObject::EOne, 
+                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::EChr, 
+                    KNSmlDdfAuthSecretDescription, KNullDesC8, KMimeType );                     
+
+    MSmlDmDDFObject& nAauthDataDDF = nrtToAppAuthDDF.AddChildObjectL( KNSmlDdfAAuthData );	// AddrType
+    FillNodeInfoL( nAauthDataDDF, aclTypesAR, MSmlDmDDFObject::EOne, 
+                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::EChr, 
+                    KNSmlDdfAuthDataDescription, KNullDesC8, KMimeType ); 
+                    
+
+	MSmlDmDDFObject& nNameDDF = nProDDF.AddChildObjectL( KNSmlDdfName );	// Name
+    FillNodeInfoL( nNameDDF, aclTypesARG, MSmlDmDDFObject::EZeroOrOne, 
+                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::EChr, 
+                    KNSmlDdfNameDescription, KNullDesC8, KMimeType );
+                    
+	
+
+	MSmlDmDDFObject& nServerIdDDF = nProDDF.AddChildObjectL( KNSmlDdfServerId );	// ServerId
+    FillNodeInfoL( nServerIdDDF, aclTypesAG, MSmlDmDDFObject::EOne, 
+                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::EChr, 
+                    KNSmlDdfServerIdDescription, KNullDesC8, KMimeType );
+
+   	MSmlDmDDFObject& nextDDF = nProDDF.AddChildObjectL( KNSmlDdfExt );	// Ext
+    FillNodeInfoL( nextDDF, aclTypesG, MSmlDmDDFObject::EOne, 
+                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::ENode, 
+                    KNSmlDdfServerIdDescription, KNullDesC8, KMimeType );
+                    
+   MSmlDmDDFObject& nlockedDDF = nextDDF.AddChildObjectL( KNSmlDdfLocked );	// locked
+    FillNodeInfoL( nlockedDDF, aclTypesARG, MSmlDmDDFObject::EOne, 
+                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::EChr, 
+                    KNSmlDdfServerIdDescription, KNullDesC8, KMimeType );                 
+
+	CleanupStack::PopAndDestroy(); //aclTypes
+	
+	_DBG_FILE("CNSmlDMSettingsAdapter12::DDFStructureL(): end");
+	}
+
+// -----------------------------------------------------------------------------
+//  CNSmlDMSettingsAdapter12::UpdateLeafObjectL
+//  Updates profile leaf object data based on URI.
+// -----------------------------------------------------------------------------
+void CNSmlDMSettingsAdapter12::UpdateLeafObjectL( const TDesC8& aURI,
+                                                const TDesC8& aLUID, 
+                                                const TDesC8& aObject, 
+                                                const TDesC8& /*aType*/, 
+                                                const TInt aStatusRef )
+	{
+	_DBG_FILE("CNSmlDMSettingsAdapter12::UpdateLeafObjectL(): begin");
+	TInt index = -1;
+	if ( !iBufOn)
+		{
+		for (TInt val = 0; val<iBuffer->Count (); val++)
+			{
+			TPtrC8 firstUri = ParentURI (aURI);
+			if ( iBuffer->At(val).iMappingName->Compare (firstUri)== 0)
+				{
+				index = iExecutionIndex = val;
+				break;
+				}
+			}
+		}
+	if ( index >= 0)
+		AddLeafBufferL (aURI, aObject, aStatusRef);
+	else
+		{
+			TInt parentLUID = GetIntObject( aLUID ); 
+			if( parentLUID < 0 )
+			{
+				if( IsDMAccUriFormatMatchPredefined(aURI) )
+    		{
+    			parentLUID = ConstructTreeL(aURI);
+    		}
+    		}
+		if( parentLUID < 0 )
+		{
+		_DBG_FILE( "CNSmlDMSettingsAdapter12::UpdateLeafObjectL( ): ENotFound end" );
+		iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
+		return;
+		}
+
+	if( parentLUID != iParentLUID )
+		{
+		if( FindProfileIdL( parentLUID ) != EFalse )
+			{
+			iParentLUID = parentLUID;
+			}
+		else
+			{
+			iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
+			return;
+			}
+		}
+	SetField( aURI );
+	SetURIInProcessL( aURI);
+	if( !AcceptDMField() )
+		{
+		_DBG_FILE( "CNSmlDMSettingsAdapter12::AddLeafObjectL(): KErr field end" );
+		iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EInvalidObject );
+		return;
+		}
+
+    //	Get Database field type 
+	TNSmlDMFieldType fType = GetDMFieldType();
+	if ( fType == EWrong )
+		{
+		_DBG_FILE( "CNSmlDMSettingsAdapter12::AddLeafObjectL(): EError end" );
+		iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
+		return;
+		}
+ 	
+    TNSmlDMProfileData fData = GetDMField();
+    if( fData == ESyncAccepted )
+        {
+        _DBG_FILE( "CNSmlDMSettingsAdapter12::AddLeafObjectL(): EError end" );
+		iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
+		return;
+        }
+    if( NotValidStrLenght( fData, aObject ) )
+	    {
+		_DBG_FILE( "CNSmlDMSettingsAdapter12::AddLeafObjectL(): KErr length end" );
+		iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ETooLargeObject );
+		return;
+		}
+    //Authentication data leafs to be handled
+    if ( fData == EAuthenticationRequired || fData == EClientNonce 
+        || fData == EServerNonce )
+        {
+        //Check if replace command and replace data as defined
+        
+        TInt replaceStatus = KErrGeneral; 
+        SetAuthInfoL( iParentLUID + KMaxDataSyncID, fData, aObject, replaceStatus );
+        if ( replaceStatus == KErrNone )
+            {
+            iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
+            }
+        else if ( replaceStatus == KErrNotFound )
+            {
+            iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
+            }
+        else
+            {
+            iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
+            }
+       
+        _DBG_FILE( "CNSmlDMSettingsAdapter12::UpdateLeafObjectL():end" );
+        return;
+        }
+        
+    TInt rValue = SetDMFieldDataL( iParentLUID, aObject, fData );
+    if ( fData == EProfilePort )
+        {
+        // in case port is updated, save status ref to be used in 
+        // CompleteOutstandingCmdsL
+        if(rValue==KErrNone)
+            {
+            iPortBuffer[iPortBuffer.Count()-1].iPortBufStatusRef = aStatusRef; 
+            }
+        else if( rValue == KErrOverflow)
+        {
+        	iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ETooLargeObject );
+        }
+        else
+        {
+        	iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
+        }
+        }
+    else if ( fData == EProfileLock && iNewProfile )
+    {
+        if(rValue == KErrNone)
+         iProfileLockBuffer[iProfileLockBuffer.Count()-1].iProfileLockStatusRef = aStatusRef; 	
+        else
+         iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotAllowed);
+    }
+    else
+        {
+        if( rValue != KErrNone )
+            {
+            if( rValue == KErrNotFound )
+                {
+                iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
+                }
+            else if( rValue == KErrInUse )
+                {
+                iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EObjectInUse );
+                }
+            else if( rValue == KErrNoMemory )
+                {
+                iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENoMemory );
+                }
+            else if(rValue == KErrAccessDenied) 
+               {
+                iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotAllowed);
+
+               }
+            else if (  rValue == KErrArgument)
+             {
+             	iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EInvalidObject);
+             	
+             } 
+            else
+                {
+                iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
+                }
+            }
+        else
+            {
+            iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
+            }
+        }
+      }        
+	_DBG_FILE( "CNSmlDMSettingsAdapter12::UpdateLeafObjectL():end" );
+    return;
+	}
+
+// -----------------------------------------------------------------------------
+//  CNSmlDMSettingsAdapter12::DeleteObjectL
+//  Deletes whole profile or leaf object data acording to aURI.
+// -----------------------------------------------------------------------------
+void CNSmlDMSettingsAdapter12::DeleteObjectL( const TDesC8& aURI, 
+                                            const TDesC8& aLUID, 
+                                            const TInt aStatusRef )
+	{
+	_DBG_FILE( "CNSmlDMSettingsAdapter12::DeleteObjectL( ): begin" );
+
+	if( aURI.Find( KNSmlDdfConRef ) != KErrNotFound )
+		{	
+		_DBG_FILE( "CNSmlDMSettingsAdapter12::DeleteObjectL(): NOT ALLOWED end" );
+		iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
+		return;
+		}
+	iLUID = IntLUID( aLUID );
+	if(IsProfileLockedL(iLUID))
+	{
+	  _DBG_FILE( "CNSmlDMSettingsAdapter12::DeleteObjectL(): NOT ALLOWED end" );
+	  
+		iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotAllowed );
+		return;	
+	}
+		
+
+    //	Check which field going to be handled
+	SetField( aURI );
+	SetURIInProcessL(aURI);
+
+    //	Check if valid field
+	if( !AcceptDMField() )
+		{
+
+        // Delete whole profile if aURI called for node
+		TInt last = aURI.LocateReverse( '/' );
+		TInt pos  = aURI.Find( KNSmlDefDMAcc );
+		if( last - 5 == pos )
+			{
+
+            //	If called for node means that profile will deleted from database
+			iLUID = IntLUID( aLUID );
+			DBG_ARGS8( _S8("DeleteObjectL: URI %S LUID = %d"), &aURI, iLUID );
+
+			if( FindProfileIdL( iLUID ) == EFalse )
+				{
+				_DBG_FILE(
+                    "CNSmlDMSettingsAdapter12::DeleteObjectL( ): notfound end");
+				
+                iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
+				return;
+				}
+			else
+				{
+				TInt sRet = DeleteProfileL( iLUID + KMaxDataSyncID );
+				if ( sRet != KErrNone )
+					{
+                    if( sRet == KErrNotFound )
+                        {
+                        iCallBack->SetStatusL( aStatusRef,
+                                                CSmlDmAdapter::ENotFound );
+                        }
+                    else if( sRet == KErrInUse )
+                        {
+                        iCallBack->SetStatusL( aStatusRef,
+                                                CSmlDmAdapter::EObjectInUse );
+                        }
+                    else
+                        {
+                        iCallBack->SetStatusL( aStatusRef, 
+                                                CSmlDmAdapter::EError );
+					    }
+					return;
+					}
+				else
+					{
+					_DBG_FILE( "CNSmlDMSettingsAdapter12::DeleteObjectL( ): EOk end" );
+					iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
+					return;
+					}
+				}
+			}
+		else
+			{
+			_DBG_FILE(
+                "CNSmlDMSettingsAdapter12::DeleteObjectL( ): EInvalidObject end" );
+			iCallBack->SetStatusL( aStatusRef,CSmlDmAdapter::EInvalidObject );
+			return;
+			}
+		}//Delete whole Profile
+
+	iLUID = IntLUID( aLUID );
+	if ( iLUID != iParentLUID )
+		{
+		if( FindProfileIdL( iLUID ) == EFalse )
+			{
+			_DBG_FILE( "CNSmlDMSettingsAdapter12::DeleteObjectL( ): end" );
+			iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
+			return;
+			}
+		iParentLUID = iLUID;
+		}
+	
+	if ( iField->Compare( KNSmlDdfAuthScheme ) == 0 )
+    	{
+		DeleteDMAuthInfoL( iLUID, EAuthenticationRequired );
+        iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
+        return;
+		}
+    else if( iField->Compare( KNSmlDdfClientNonce ) == 0 )
+    	{
+		DeleteDMAuthInfoL( iLUID, EClientNonce );
+        iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
+        return;
+		}
+    else if( iField->Compare(KNSmlDdfServerNonce) == 0 )
+		{
+		DeleteDMAuthInfoL( iLUID, EServerNonce );
+        iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
+        return;
+		}
+
+    // Sets default value if not null field
+	HBufC8* dataObject = HBufC8::NewLC( 15 );
+	dataObject->Des().Format( KNullDesC8 );
+
+	_LIT8(aType,		"text/plain");
+	iLeafType = EDMDelete;
+	UpdateLeafObjectL( aURI, aLUID, *dataObject, aType, aStatusRef );
+    CleanupStack::PopAndDestroy(); //dataObject
+	iLeafType = EDMUnset;
+
+	_DBG_FILE( "CNSmlDMSettingsAdapter12::DeleteObjectL( ): end" );
+	return;
+	}
+
+// -----------------------------------------------------------------------------
+//  CNSmlDMSettingsAdapter12::FetchLeafObjectL
+//  Fetches profile leaf object data acordint to aURI.
+// -----------------------------------------------------------------------------
+void CNSmlDMSettingsAdapter12::FetchLeafObjectL( const TDesC8& aURI, 
+                                                const TDesC8& aLUID, 
+                                                const TDesC8& aType, 
+                                                const TInt aResultsRef, 
+                                                const TInt aStatusRef )
+	{
+
+	_DBG_FILE( "CNSmlDMSettingsAdapter12::FetchLeafObjectL(): begin" );
+	DBG_ARGS(_S16( "DM:Fetch aURI    - %S - %S"), &aURI, &aLUID );
+		
+	iLUID = IntLUID( aLUID );
+	if ( iLUID >= 0 )
+		{
+		if( FindProfileIdL( iLUID ) == EFalse )
+			{
+			_DBG_FILE( "CNSmlDMSettingsAdapter12::FetchLeafObjectL(): ENotFound end" );
+			iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
+			return;
+			}
+		}
+	else
+		{
+		
+		// Static node feature start
+		iLUID = -1;
+		if( IsDMAccUriFormatMatchPredefined(aURI) )
+    	{
+    		iLUID = ConstructTreeL(aURI);
+    	}
+    	
+    	if (iLUID == -1) 
+    	{
+    			_DBG_FILE( "CNSmlDMSettingsAdapter::FetchLeafObjectL(): ENotFound end" );
+				iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
+				return;
+    	}
+		// Static node feature end
+		}
+
+    //	Check which field going to be handled
+	SetField(aURI);
+	SetURIInProcessL(aURI);
+
+    //	Check if valid field
+	if( !AcceptDMField() )
+		{
+		_DBG_FILE( "CNSmlDMSettingsAdapter12::FetchLeafObjectL(): EInvalidObject end" );
+		iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EInvalidObject );
+		return;
+		}
+    /*if(iField->Compare(KNSmlDdfExt) == 0)
+        {
+        iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
+        CBufBase* extNode = CBufFlat::NewL(128);
+        CleanupStack::PushL(extNode);
+        iCallBack->SetResultsL( aResultsRef, *extNode, KNullDesC8 );
+        CleanupStack::PopAndDestroy(extNode);
+        return;
+        }*/
+         
+    //	Get Database field type 
+	TInt fType = GetDMFieldType();
+	if ( fType == EWrong )
+		{
+		_DBG_FILE( "CNSmlDMSettingsAdapter12::FetchLeafObjectL(): EError end" );
+		iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
+		return;
+		}
+
+    TNSmlDMProfileData fieldId = GetDMField();
+    if( fieldId == ESyncAccepted )
+        {
+        _DBG_FILE( "CNSmlDMSettingsAdapter12::AddLeafObjectL(): EError end" );
+		iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
+		return;
+        }
+    CBufBase *lObject = CBufFlat::NewL( 128 );
+    CleanupStack::PushL( lObject );
+    lObject->Reset();
+    
+    CSmlDmAdapter::TError status;
+
+    if ( fType == EStr || fType == EInt || fType == EBin )
+		{ 
+		//  Check for APPId and return w7 
+		TInt rValue = KErrNone;
+       /* if( iField->Compare(KNSmlDdfAppId ) ==0 )
+        {
+        	status = CSmlDmAdapter::EOk;
+        	lObject->InsertL(lObject->Size(),KNSmlDdfAppIdValue);
+        	
+        }*/
+        
+        rValue = GetObjectL( iLUID, fieldId, *lObject );
+		if( rValue != KErrNone )
+		    {
+            if( rValue == KErrNotFound )
+                {
+                status = CSmlDmAdapter::ENotFound;
+                }
+            else if( rValue == KErrInUse )
+                {
+                status = CSmlDmAdapter::EObjectInUse;
+                }
+            else if( rValue == KErrNoMemory )
+                {
+                status = CSmlDmAdapter::ENoMemory;
+                }
+            else
+                {
+                status = CSmlDmAdapter::EError;
+                }
+		    }
+        else
+            {
+            status = CSmlDmAdapter::EOk;
+            }
+		}
+	else 
+		{
+		CleanupStack::PopAndDestroy(); //lObject 
+        _DBG_FILE( "CNSmlDMSettingsAdapter12::FetchLeafObjectL(): ENotFound end" );
+		iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
+		iProfile.Close();
+        iSyncSession.Close();
+        iSyncSessionOpen = EFalse;
+		return;
+		}
+    iCallBack->SetStatusL( aStatusRef, status );
+    
+    if(status==CSmlDmAdapter::EOk)
+    	{
+		iCallBack->SetResultsL( aResultsRef, *lObject, aType );
+    	}
+  	
+    CleanupStack::PopAndDestroy(); //lObject 
+	iProfile.Close();
+    iSyncSession.Close();
+    iSyncSessionOpen = EFalse;
+	_DBG_FILE( "CNSmlDMSettingsAdapter12::FetchLeafObjectL(): end" );
+	return;
+	}
+
+// -----------------------------------------------------------------------------
+//  CSmlDmSettingsAdapter::ChildURIListL
+//  Function returns the list of profiles or leafs of the profile 
+//  acording to aURI.
+// -----------------------------------------------------------------------------
+void CNSmlDMSettingsAdapter12::ChildURIListL( const TDesC8& aURI, 
+                                            const TDesC8& aLUID, 
+                                            const CArrayFix<TSmlDmMappingInfo>& aPreviousURISegmentList, 
+                                            const TInt aResultsRef, 
+                                            const TInt aStatusRef  )
+	{
+	_DBG_FILE( "CNSmlDMSettingsAdapter12::ChildURIListL(): begin" );
+	CBufBase *currentURISegmentList = CBufFlat::NewL( 128 );
+	CleanupStack::PushL( currentURISegmentList );
+ 
+	if(( aURI.Match( KDmAccMatch ) != KErrNotFound ) &&
+	 (aURI.Match( KDmAccMatch3 ) == KErrNotFound ))
+		{
+		//	Check if Profile exists
+        TInt checkLUID = GetIntObject( aLUID );
+        if( FindProfileIdL( checkLUID ) )
+        	{
+            currentURISegmentList->InsertL( currentURISegmentList->Size(), KSegmDMAcc );
+			iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
+		    iCallBack->SetResultsL( aResultsRef, *currentURISegmentList, KNullDesC8 );
+        	}
+        else
+        	{
+        		// Static node feature start
+				checkLUID = -1;
+				if( IsDMAccUriFormatMatchPredefined(aURI) )
+		    	{
+		    		checkLUID = ConstructTreeL(aURI);
+		    	}
+		    	
+		    	if (checkLUID == -1) 
+		    	{
+		    			_DBG_FILE( "CNSmlDMSettingsAdapter::childURI(): ENotFound end" );
+						iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
+						 CleanupStack::PopAndDestroy(  ); // currentURISegmentList
+        			_DBG_FILE( "CNSmlDMSettingsAdapter::ChildURIListL(): end" );
+						return;
+		    	}
+		    	else
+		    	{
+		    		currentURISegmentList->InsertL( currentURISegmentList->Size(), KSegmDMAcc );
+				iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
+			    iCallBack->SetResultsL( aResultsRef, *currentURISegmentList, KNullDesC8 );
+		    
+		    	}
+    	
+    	
+		//	iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
+		// Static node feature start end
+        	}
+
+        CleanupStack::PopAndDestroy(  ); // currentURISegmentList
+        _DBG_FILE( "CNSmlDMSettingsAdapter12::ChildURIListL(): end" );
+		return;
+		}
+    else if(( aURI.Match( KDmAccMatch2 ) != KErrNotFound ) &&
+              (aURI.Match( KDmAccMatch ) == KErrNotFound ))
+        {   
+        if( iSyncSessionOpen == EFalse )
+            {
+            iSyncSession.OpenL();
+            iSyncSessionOpen = ETrue;
+            }
+        RArray<TSmlProfileId> profileIdArray;
+        CleanupClosePushL( profileIdArray );
+        TSmlUsageType usageType = ESmlDevMan;
+        iSyncSession.ListProfilesL( profileIdArray, usageType );
+	    
+        for( TInt p = 0; p < profileIdArray.Count(); p++ )
+		    {
+		    TBool notInList = ETrue;
+		    TInt newline = 0;
+            TInt ddId = profileIdArray[p] - KMaxDataSyncID;
+            
+		    while( notInList && newline < aPreviousURISegmentList.Count() )
+			    {
+				TInt ppId = GetIntObject( aPreviousURISegmentList.At(newline).iURISegLUID );
+				if( ppId == ddId ) 
+				    {
+					notInList = EFalse;
+					break;
+					}
+				newline++;
+			    }
+		    if( notInList )
+			    {
+			    _LIT8( Kprev, "DMId" );
+			    TBuf8<7> addNAME(Kprev); // DMIdnnn , nnn = profileid
+                TInt fixedProfId = profileIdArray[p] - KMaxDataSyncID; //fit to 3 decimal
+			    addNAME.AppendNumFixedWidth( fixedProfId, EDecimal, 3 ); 
+
+    			currentURISegmentList->InsertL( currentURISegmentList->Size(), addNAME );
+	    		currentURISegmentList->InsertL( currentURISegmentList->Size(), KSmlDmSlash );
+		    	DBG_ARGS8( _S8("notInList: Id = %d Name %S"), p, &addNAME );
+
+			    // KNSmlDMStart includes start text for URISeg
+			    TBuf8<20> addURI; // SyncML/DMAcc/DMIdnnn , nnn = profileid
+			    addURI.Append( KNSmlDMStart );
+			    addURI.AppendNumFixedWidth( fixedProfId, EDecimal, 3 ); 
+
+    			TBuf8<3> addLUID;
+	    		addLUID.Num( fixedProfId );
+
+		    	// Also added to mapping
+			    iCallBack->SetMappingL( addURI, addLUID );
+    			}
+	    	else
+		    	{ // Add those in PreviousList which are on database
+			    currentURISegmentList->InsertL( currentURISegmentList->Size(),
+                                                aPreviousURISegmentList.At(newline).iURISeg );
+    			currentURISegmentList->InsertL( currentURISegmentList->Size(), KSmlDmSlash );
+//	    		DBG_ARGS8( _S8("InList: Id = %d Name %S"), newline, 
+//                          aPreviousURISegmentList.At(newline).iURISeg );
+		    	}
+		    }
+        CleanupStack::PopAndDestroy( 1 );//profileIdArray
+        }
+        
+    // AppAddr subtree
+    else if( ( aURI.Match( KDmAccAppAddrMatch ) != KErrNotFound ) && (aURI.Match( KDmAccPortMatch ) == KErrNotFound ) && (aURI.Match( KDmAccPortFullMatch ) == KErrNotFound ))
+        {
+          currentURISegmentList->InsertL( currentURISegmentList->Size(), KDmAccAppAddrId );
+        }
+    else if(( aURI.Match( KDmAccAppAddrFullMatch ) != KErrNotFound ) && (aURI.Match( KDmAccPortMatch ) == KErrNotFound ) && (aURI.Match( KDmAccPortFullMatch ) == KErrNotFound ))
+        {
+          currentURISegmentList->InsertL( currentURISegmentList->Size(), KSegmDMAccAppAddr );
+        }   
+    else if(( aURI.Match( KDmAccPortMatch ) != KErrNotFound ) && (aURI.Match( KDmAccPortFullMatch ) == KErrNotFound ))
+        {
+          currentURISegmentList->InsertL( currentURISegmentList->Size(), KSegmDMAccPortRT );
+        } 
+   else if( aURI.Match( KDmAccPortFullMatch ) != KErrNotFound )
+        {
+          currentURISegmentList->InsertL( currentURISegmentList->Size(), KSegmDMAccport );
+        } 
+          
+   else if(( aURI.Match( KDmAccAppAuthMatch ) != KErrNotFound ) && (aURI.Match( KDmAccAppAuthFullMatch ) == KErrNotFound ))
+        {
+          currentURISegmentList->InsertL( currentURISegmentList->Size(), KDmAccAppAuthNodes );
+        } 
+    else if((aURI.Match(KDmAccAppAuthSrvMatch) != KErrNotFound) || (aURI.Match(KDmAccAppAuthCliMatch) != KErrNotFound) || (aURI.Match(KDmAccAppAuthTransMatch) != KErrNotFound)) //|| (aURI.Match(KDmAccAppAuthObexMatch) != KErrNotFound) || (aURI.Match(KDmAccAppAuthHttpMatch) != KErrNotFound))
+        {
+           currentURISegmentList->InsertL( currentURISegmentList->Size(), KSegmDMAccAppAuth );
+        }
+    else if(( aURI.Match( KDmAccAppAuthFullMatch ) != KErrNotFound ) && (aURI.Find( KDmAccAppAuthNodes ) != KErrNotFound))
+        {
+          currentURISegmentList->InsertL( currentURISegmentList->Size(), KSegmDMAccAppAuth );
+        } 
+                         
+    else if( aURI.Match( KDmAccExtMatch ) != KErrNotFound )
+        {
+          currentURISegmentList->InsertL( currentURISegmentList->Size(), KSegmDMAccLocked );
+        }                      
+    else
+        {
+        iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EInvalidObject );
+        CleanupStack::PopAndDestroy( 1 ); // currentURISegmentList
+        return;
+        }
+
+	iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
+	iCallBack->SetResultsL( aResultsRef, *currentURISegmentList, KNullDesC8 );
+	CleanupStack::PopAndDestroy(); // currentURISegmentList
+	_DBG_FILE( "CNSmlDMSettingsAdapter12::ChildURIListL(): end" );
+	return;
+	}
+
+// -----------------------------------------------------------------------------
+//  CNSmlDMSettingsAdapter12::AddNodeObjectL
+//  Adds new DM-settings profile to database
+// -----------------------------------------------------------------------------
+void CNSmlDMSettingsAdapter12::AddNodeObjectL( const TDesC8& aURI, 
+                                            const TDesC8& aParentLUID, 
+                                            const TInt aStatusRef )
+	{
+	_DBG_FILE( "CNSmlDMSettingsAdapter12::AddNodeObjectL(): begin" );
+
+	if( aParentLUID.Length() > 0 )
+		{
+		iParentLUID = GetIntObject( aParentLUID );
+        if( FindProfileIdL( iParentLUID ) != EFalse )// iProfile != NULL)
+		    {
+		    _DBG_FILE( "CNSmlDMSettingsAdapter12::AddNodeObjectL(): EAlreadyExists end" );
+		    iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EAlreadyExists );
+		    return;
+		    }
+		else
+			{						
+			TInt ret = iCallBack->RemoveMappingL(KNSmlDMSettingsAdapterImplUid,
+							GetDynamicDMNodeUri( aURI ), ETrue );
+			if(ret != KErrNone)
+				{
+			    iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
+		    	return;
+				}			
+			}		
+		}
+	iNewProfile = ETrue; 
+	AddNodeBufferL (aURI, aStatusRef);
+	_DBG_FILE( "CNSmlDMSettingsAdapter12::AddNodeObjectL(): end" );
+	return;
+	}
+
+// -----------------------------------------------------------------------------
+//  CNSmlDMSettingsAdapter12::UpdateLeafObjectL()
+// -----------------------------------------------------------------------------
+void CNSmlDMSettingsAdapter12::UpdateLeafObjectL( const TDesC8&, const TDesC8&, 
+                                                RWriteStream*&, const TDesC8&, 
+                                                const TInt )
+	{
+	//Not supported because data streaming is not supported by this adapter.
+	}
+	
+// -----------------------------------------------------------------------------
+//  CNSmlDMSettingsAdapter12::FetchLeafObjectSizeL
+//  This function fetches leaf object and returns its size.
+// -----------------------------------------------------------------------------
+void CNSmlDMSettingsAdapter12::FetchLeafObjectSizeL( const TDesC8& aURI, 
+                                                    const TDesC8& aLUID, 
+                                                    const TDesC8& aType, 
+                                                    const TInt aResultsRef, 
+                                                    const TInt aStatusRef )
+	{
+	_DBG_FILE( "CNSmlDMSettingsAdapter12::FetchLeafObjectSizeL() : begin" );
+    DBG_ARGS( _S16("DM:Fetch aURI    - %S - %S"), &aURI, &aLUID );
+	
+	iLUID = IntLUID( aLUID );
+	if ( iLUID >= 0 )
+		{
+		if( FindProfileIdL( iLUID ) == EFalse )
+			{
+			_DBG_FILE( "CNSmlDMSettingsAdapter12::FetchLeafObjectL(): ENotFound end" );
+			iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
+			return;
+			}
+		}
+	else
+		{
+		_DBG_FILE( "CNSmlDMSettingsAdapter12::FetchLeafObjectL(): ENotFound end" );
+		iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
+		return;
+		}
+
+    //	Check which field going to be handled
+	SetField( aURI );
+	SetURIInProcessL (aURI);
+     
+    //	Check if valid field
+	if( !AcceptDMField() )
+		{
+		_DBG_FILE( "CNSmlDMSettingsAdapter12::FetchLeafObjectL(): EInvalidObject end" );
+		iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EInvalidObject );
+		return;
+		}
+    /*if(aURI.Find( KNSmlDdfExt ) != KErrNotFound)
+        {
+        return;
+        }*/
+    
+    //	Get Database field type 
+	TInt fType = GetDMFieldType();
+	if ( fType == EWrong )
+		{
+		_DBG_FILE( "CNSmlDMSettingsAdapter12::FetchLeafObjectL(): EError end" );
+		iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
+		return;
+		}
+
+    CBufBase *lObject = CBufFlat::NewL( 128 );
+	CleanupStack::PushL( lObject );
+    lObject->Reset();
+
+	if ( fType == EStr || fType == EInt || fType == EBin )
+		{ 
+        TInt rValue = GetObjectL( iLUID, GetDMField(), *lObject );
+		if( lObject->Size() == 0 || rValue != KErrNone )
+		    {
+            if( rValue == KErrNotFound )
+                {
+                iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
+                }
+            else if( rValue == KErrInUse )
+                {
+                iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EObjectInUse );
+                }
+            else if( rValue == KErrNoMemory )
+                {
+                iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENoMemory );
+                }
+            else
+                {
+                iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
+                }
+		    }
+		}
+	else 
+		{
+		CleanupStack::PopAndDestroy();//lObject 
+		_DBG_FILE( "CNSmlDMSettingsAdapter12::FetchLeafObjectL(): ENotFound end" );
+		iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
+		return;
+		}
+    TInt objSizeInBytes = lObject->Size();
+	TBuf8<16> stringObjSizeInBytes;
+	stringObjSizeInBytes.Num( objSizeInBytes );
+
+	lObject->Reset();
+	lObject->InsertL( 0, stringObjSizeInBytes );
+    iCallBack->SetResultsL( aResultsRef, *lObject, aType );
+	iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EOk);
+
+	CleanupStack::PopAndDestroy( 1 ); //lObject
+	_DBG_FILE( "CNSmlDMSettingsAdapter12::FetchLeafObjectSizeL(): end" );
+	return;
+    }
+
+// -----------------------------------------------------------------------------
+// CNSmlDMSettingsAdapter12::ExecuteCommandL()
+// -----------------------------------------------------------------------------
+void CNSmlDMSettingsAdapter12::ExecuteCommandL( const TDesC8&, const TDesC8&,
+                                                const TDesC8&, const TDesC8&, 
+                                                const TInt )
+	{
+	//Not supported. Command execution via DM settings adapter not possible.	
+	}
+
+// -----------------------------------------------------------------------------
+// CNSmlDMSettingsAdapter12::ExecuteCommandL()
+// -----------------------------------------------------------------------------
+void CNSmlDMSettingsAdapter12::ExecuteCommandL( const TDesC8&, const TDesC8&, 
+                                                RWriteStream*&, const TDesC8&, 
+                                                const TInt )
+	{
+	//Not supported. Command execution via DM settings adapter not possible.
+	}
+
+// -----------------------------------------------------------------------------
+// CNSmlDMSettingsAdapter12::CopyCommandL()
+// -----------------------------------------------------------------------------
+void CNSmlDMSettingsAdapter12::CopyCommandL( const TDesC8&, const TDesC8&, 
+                                            const TDesC8&, const TDesC8&, 
+                                            const TDesC8&, TInt )
+	{
+	//Not supported.
+	}
+
+// -----------------------------------------------------------------------------
+// CNSmlDMSettingsAdapter12::StartAtomicL()
+// -----------------------------------------------------------------------------
+void CNSmlDMSettingsAdapter12::StartAtomicL()
+	{
+	//Not supported. Handling Atomic command cycles not supported by the adapter.
+	}
+
+// -----------------------------------------------------------------------------
+// CNSmlDMSettingsAdapter12::CommitAtomicL()
+// -----------------------------------------------------------------------------
+void CNSmlDMSettingsAdapter12::CommitAtomicL()
+	{
+	//Not supported. Handling Atomic command cycles not supported by the adapter.
+	}
+
+// -----------------------------------------------------------------------------
+// CNSmlDMSettingsAdapter12::RollbackAtomicL()
+// -----------------------------------------------------------------------------
+void CNSmlDMSettingsAdapter12::RollbackAtomicL()
+	{
+	//Not supported. Handling Atomic command cycles not supported by the adapter.
+	}
+
+// -----------------------------------------------------------------------------
+//  CNSmlDMSettingsAdapter12::StreamingSupport()
+//  Indicates if streaming is supported.
+// -----------------------------------------------------------------------------
+TBool CNSmlDMSettingsAdapter12::StreamingSupport( TInt& /*aItemSize*/ )
+	{
+	return EFalse;
+	}
+
+// -----------------------------------------------------------------------------
+// CNSmlDMSettingsAdapter12::StreamCommittedL()
+// -----------------------------------------------------------------------------
+void CNSmlDMSettingsAdapter12::StreamCommittedL()
+	{
+	//Not supported. Streaming not supported by the DM settings adapter.
+	}
+// -----------------------------------------------------------------------------
+// CNSmlDMSettingsAdapter12::CompleteOutstandingCmdsL()
+// If buffering used, commands must be executed before returning this function.
+// -----------------------------------------------------------------------------
+void CNSmlDMSettingsAdapter12::CompleteOutstandingCmdsL()
+	{
+	// Check if Buffered
+	for (int val=0; val<iBuffer->Count ();val++)
+		{
+		if ( !iBuffer->At(val).iExecuted)
+			{
+			TInt count = iBuffer->At(val).iLeafBuf->Count ()-1;
+			iExecutionIndex = val;
+			iComplete = ETrue;
+			ExecuteBufferL ();
+			}
+		}
+ for (TInt i = 0;i<iProfileLockBuffer.Count(); i++)
+	    {
+	       TInt err = SetProfileLockL(iProfileLockBuffer[i].iProfileLockLUID, iProfileLockBuffer[i].iProfileLock) ;
+   
+	    }
+
+	// if port was updated, set it
+	for (TInt i = 0;i<iPortBuffer.Count(); i++)
+	    {
+        TInt err = SetProfileConnectionPortNrL( iPortBuffer[i].iPortBufLUID, iPortBuffer[i].iPortBuf );
+        
+        // set status
+        if ( err != KErrNone )
+            {
+            iCallBack->SetStatusL( iPortBuffer[i].iPortBufStatusRef, CSmlDmAdapter::EError );
+            }
+        else
+            {
+            iCallBack->SetStatusL( iPortBuffer[i].iPortBufStatusRef, CSmlDmAdapter::EOk );
+            }
+	    
+	    }
+    iPortBuffer.Reset();	
+	}
+
+// -----------------------------------------------------------------------------
+//  CNSmlDMSettingsAdapter12::AcceptDMField
+//  This function checks if field to be handled is valid.
+// -----------------------------------------------------------------------------
+TBool CNSmlDMSettingsAdapter12::AcceptDMField()
+	{
+	_DBG_FILE("CNSmlDMSettingsAdapter12::AcceptDMField(): begin");
+
+	if ( iField->Compare( KNSmlDdfAddrType ) == 0 )
+		{
+		return ETrue;
+		}
+	else if ( iField->Compare( KNSmlDdfAddr ) == 0 )
+		{
+		return ETrue;
+		}
+	else if ( iField->Compare( KNSmlDdfPortNbr ) == 0 )
+		{
+		return ETrue;
+		}
+	else if ( iField->Compare( KNSmlDdfAuthScheme ) == 0 )
+		{
+		return ETrue;
+		}
+	else if ( iField->Compare( KNSmlDdfServerId ) == 0 )
+		{
+		return ETrue;
+		}
+	else if ( iField->Compare( KNSmlDdfServerPW ) == 0 )
+		{
+		return ETrue;
+		}
+	else if ( iField->Compare( KNSmlDdfServerNonce ) == 0 )
+		{
+		return ETrue;
+		}
+	else if ( iField->Compare( KNSmlDdfClientUserName ) == 0 )
+		{
+		return ETrue;
+		}
+	else if ( iField->Compare( KNSmlDdfClientPW ) == 0 )
+		{
+		return ETrue;
+		}
+	else if ( iField->Compare( KNSmlDdfClientNonce ) == 0 )
+		{
+		return ETrue;
+		}
+	else if ( iField->Compare( KNSmlDdfName ) == 0 )
+		{
+		return ETrue;
+		}
+		
+	else if ( iField->Compare( KNSmlDdfId ) == 0 )
+		{
+		return ETrue;
+		}
+	else if ( iField->Compare(KNSmlDdfAppId) == 0 )
+	    {
+	    return ETrue;
+	    }
+	else if ( iField->Compare(KNSmlDdfPrefConRef) == 0 )
+	    {
+	    return ETrue;
+	    }
+	else if (iField->Compare(KNSmlDdfAAuthLevel) == 0 )
+	    {
+	    return ETrue;
+	    }
+  	    
+    else if (iField->Compare(KNSmlDdfAAuthType) == 0 )
+        {
+        return ETrue;
+        }
+    else if (iField->Compare(KNSmlDdfAAuthName) == 0 )
+        {
+        return ETrue;
+        }
+        
+    else if (iField->Compare(KNSmlDdfAAuthSecret) == 0 )
+        {
+        return ETrue;
+        }
+    else if (iField->Compare(KNSmlDdfAAuthData) == 0 )
+        {
+        return ETrue;
+        }
+    else if (iField->Compare(KNSmlDdfLocked) == 0 )
+        {
+        return ETrue;
+        }    
+
+	_DBG_FILE( "CNSmlDMSettingsAdapter12::AcceptDMField(): end" );
+	return EFalse; // Not a valid Type
+	}
+
+// -----------------------------------------------------------------------------
+//  CNSmlDMSettingsAdapter12::GetDMField
+//	Matches URI fieldname to DM-database. 
+// -----------------------------------------------------------------------------
+TNSmlDMProfileData CNSmlDMSettingsAdapter12::GetDMField() 
+	{
+
+	if ( iField->Compare( KNSmlDdfAddrType ) == 0 )
+		{
+	
+	     return EProfileAddrType;
+	      
+		}
+	else if ( iField->Compare( KNSmlDdfAddr ) == 0 )
+		{
+		return EProfileURL;
+		}
+	else if ( iField->Compare( KNSmlDdfPortNbr ) == 0 )
+		{
+		return EProfilePort;
+		}
+	else if ( iField->Compare( KNSmlDdfAuthScheme ) == 0 )
+		{
+		return EAuthenticationRequired;
+		}
+	else if ( iField->Compare( KNSmlDdfServerId ) == 0 )
+		{
+		return EServerId;
+		}
+	else if ( iField->Compare( KNSmlDdfServerPW ) == 0 )
+		{
+		return ESharedSecret;
+		}
+	else if ( iField->Compare( KNSmlDdfServerNonce ) == 0 )
+		{
+		return EServerNonce;
+		}
+	else if ( iField->Compare( KNSmlDdfClientUserName ) == 0 )
+		{
+		return EProfileDMServerUsername;
+		}
+	else if ( iField->Compare( KNSmlDdfClientPW ) == 0 )
+		{
+		return EProfileDMServerPassword;
+		}
+	else if ( iField->Compare( KNSmlDdfClientNonce ) == 0 )
+		{
+		return EClientNonce;
+		}
+	else if ( iField->Compare( KNSmlDdfName ) == 0 )
+		{
+		return EProfileName;
+		}
+	else if ( iField->Compare( KNSmlDdfId ) == 0 )
+		{
+		return EProfileId;
+		}
+	
+	else if ( iField->Compare( KNSmlDdfPrefConRef ) == 0 )
+		{
+		return EProfileIAPId;
+		}
+	
+    else if ( iField->Compare( KNSmlDdfAppId ) == 0 )
+		{
+		return EProfileIAPId;
+		}
+    else if ( iField->Compare( KNSmlDdfLocked) == 0 )
+		{
+		return EProfileLock;
+		}
+
+    else if (iField->Compare(KNSmlDdfAAuthLevel) == 0 )
+	    {
+	     if(iURIField->Find(KDmAccAppAuthDyn1) != KErrNotFound)
+	    return EPRofileServerCred;
+	     else if (iURIField->Find(KDmAccAppAuthDyn2)!= KErrNotFound)
+	    return EPRofileClientCred;
+		else if (iURIField->Find(KDmAccAppAuthTransport)!= KErrNotFound)
+	    return EProfileTransport;		     
+	    }
+  	    
+    else if (iField->Compare(KNSmlDdfAAuthType) == 0 )
+        {
+        return EProfileAAuthType;
+        }
+    else if (iField->Compare(KNSmlDdfAAuthName) == 0 )
+        {
+        if(iURIField->Find(KDmAccAppAuthDyn1) != KErrNotFound)
+	    return EProfileName;
+	    else if (iURIField->Find(KDmAccAppAuthDyn2)!= KErrNotFound)
+	    return EProfileDMServerUsername;
+	    else if (iURIField->Find(KDmAccAppAuthTransport)!= KErrNotFound)
+	    {
+	       return ETransportAuthName;
+	    }
+	    
+        // return ETrue;
+        }
+        
+    else if (iField->Compare(KNSmlDdfAAuthSecret) == 0 )
+        {
+         if(iURIField->Find(KDmAccAppAuthDyn1) != KErrNotFound)
+	    return ESharedSecret;
+	        else if (iURIField->Find(KDmAccAppAuthDyn2)!= KErrNotFound)
+	    return EProfileDMServerPassword;
+		else if (iURIField->Find(KDmAccAppAuthTransport)!= KErrNotFound)
+	    {
+	       return EProfileTransportPassword;
+	    }
+        }
+    else if (iField->Compare(KNSmlDdfAAuthData) == 0 )
+        {
+          if(iURIField->Find(KDmAccAppAuthDyn1) != KErrNotFound)
+	    return EServerNonce;
+	     else if (iURIField->Find(KDmAccAppAuthDyn2)!= KErrNotFound)
+	    return EClientNonce;
+	    else if (iURIField->Find(KDmAccAppAuthTransport)!= KErrNotFound)
+	     return EProfileTransportAuthData;
+        }
+        		
+	
+	_DBG_FILE( "CNSmlDMSettingsAdapter12::GetDMField(): Error" );
+	return ESyncAccepted;
+	}
+
+// -----------------------------------------------------------------------------
+//  CNSmlDMSettingsAdapter12::GetDMFieldType
+//	Gets field data type. 
+// -----------------------------------------------------------------------------
+TNSmlDMFieldType CNSmlDMSettingsAdapter12::GetDMFieldType() const
+	{
+	if ( iField->Compare( KNSmlDdfAddrType ) == 0 )
+		{
+		return EInt;
+		}
+	else if ( iField->Compare( KNSmlDdfAddr ) == 0 )
+		{
+		return EStr;
+		}
+	else if ( iField->Compare( KNSmlDdfPortNbr ) == 0 )
+		{
+		return EInt;
+		}
+	else if ( iField->Compare( KNSmlDdfAuthScheme ) == 0 )
+		{
+		return EInt;
+		}
+	else if ( iField->Compare( KNSmlDdfServerId ) == 0 )
+		{
+		return EStr;
+		}
+	else if ( iField->Compare( KNSmlDdfServerPW ) == 0 )
+		{
+		return EStr;
+		}
+	else if ( iField->Compare( KNSmlDdfServerNonce ) == 0 )
+		{
+		return EBin;
+		}
+	else if ( iField->Compare( KNSmlDdfClientUserName ) == 0 )
+		{
+		return EStr;
+		}
+	else if ( iField->Compare( KNSmlDdfClientPW ) == 0 )
+		{
+		return EStr;
+		}
+	else if (iField->Compare(KNSmlDdfClientNonce) == 0)
+		{
+		return EBin;
+		}
+	else if ( iField->Compare( KNSmlDdfName ) == 0 )
+		{
+		return EStr;
+		}
+		
+	else if ( iField->Compare( KNSmlDdfId ) == 0 )
+		{
+		return EInt;
+		}
+    else if( iField->Compare(KNSmlDdfAppId ) ==0 ) 
+        {
+        	return EStr;
+        }
+	else if ( iField->Compare( KNSmlDdfPrefConRef ) == 0 )
+		{
+		return EInt;
+		}
+	else if (iField->Compare(KNSmlDdfAAuthLevel) == 0 )
+	    {
+	    return EStr;
+	    }
+  	    
+    else if (iField->Compare(KNSmlDdfAAuthType) == 0 )
+        {
+        return EStr;
+        }
+    else if (iField->Compare(KNSmlDdfAAuthName) == 0 )
+        {
+        return EStr;
+        }
+        
+    else if (iField->Compare(KNSmlDdfAAuthSecret) == 0 )
+        {
+        return EStr;
+        }
+    else if (iField->Compare(KNSmlDdfAAuthData) == 0 )
+        {
+        return EBin;
+        }
+        
+	else if(iField->Compare(KNSmlDdfLocked)==0)
+	    {
+	    return EStr;
+	    }
+		        
+
+	_DBG_FILE( "CNSmlDMSettingsAdapter12::GetDMFieldType(): Error" );
+	return EWrong;
+	}
+
+// -----------------------------------------------------------------------------
+//  CNSmlDMSettingsAdapter12::IntLUID
+//	Returns integer value for a profile LUID.
+// -----------------------------------------------------------------------------
+TInt CNSmlDMSettingsAdapter12::IntLUID( const TDesC8& aLUID )
+	{
+	TLex8 lLex( aLUID );
+
+	if( lLex.Val( iLUID ) == KErrNone )
+	    {
+	    return iLUID;
+	    }
+	else
+        {
+        return -1;
+        }
+	}
+
+// -----------------------------------------------------------------------------
+//  CNSmlDMSettingsAdapter12::GetIntObject
+//	Returns integer value for a aObject.
+// -----------------------------------------------------------------------------
+TInt CNSmlDMSettingsAdapter12::GetIntObject( const TDesC8& aObject )
+	{
+	TLex8 lLex( aObject );
+
+	TInt value = 0;
+
+	if( lLex.Val( value ) != KErrNone )
+	    {
+	    return KErrNotFound;
+	    }
+	else
+        {
+        return value;
+        }
+	}
+
+// -----------------------------------------------------------------------------
+//	CNSmlDMSettingsAdapter12::GetIntObject16()
+//	Returns Integer Value for a 16 bit data object.
+// -----------------------------------------------------------------------------
+TInt CNSmlDMSettingsAdapter12::GetIntObject16( const TDesC& aObject )
+	{
+	TLex16 lLex( aObject );
+
+	TInt value = 0;
+
+	if( lLex.Val( value ) == KErrNone )
+	    {
+	    return value;
+	    }
+	else
+        {
+        return value;
+        }
+	}
+
+// -----------------------------------------------------------------------------
+//  CNSmlDMSettingsAdapter12::SetIntObjectLC
+//	Converts integer to HBufC8 type buffer and returns reference to it.
+// -----------------------------------------------------------------------------
+TDesC8& CNSmlDMSettingsAdapter12::SetIntObjectLC( const TInt& aObject )
+	{
+	HBufC8* buf = HBufC8::NewLC( 8 );
+	TPtr8 ptrBuf = buf->Des();
+
+	ptrBuf.Num( aObject );
+    return *buf;
+	}
+
+// -----------------------------------------------------------------------------
+//	CNSmlDMSettingsAdapter12::NotValidStrLenght
+//	Checks if data length is valid.
+// -----------------------------------------------------------------------------
+TBool CNSmlDMSettingsAdapter12::NotValidStrLenght( const TNSmlDMProfileData& aProfileItem, 
+                                                const TDesC8& aSource )
+	{
+	TInt lLen = aSource.Length();
+	TBool lBool = EFalse;
+
+	switch ( aProfileItem )
+		{
+		case ( EProfileName ) :
+			{
+			if( lLen > KNSmlMaxProfileNameLength )
+			    {
+			    lBool = ETrue;	
+			    }
+			}
+		break;
+		
+		case ( EProfileDMServerUsername ) :
+			{
+			if( lLen > KNSmlMaxUsernameLength )
+			    {
+			    lBool = ETrue;
+			    }
+			}
+		break;
+        
+		case ( EProfileHttpUsername ) :
+		case (ETransportAuthName):
+			{
+				if( lLen > KNSmlDmMaxHttpAuthUsernameLength )
+			    {
+			    lBool = ETrue;
+			    }
+			}
+		break;
+		case ( EProfileHttpPassword ) :
+		case (EProfileTransportPassword):
+			{
+				if( lLen > KNSmlDmMaxHttpAuthPasswordLength )
+			    {
+			    lBool = ETrue;
+			    }
+			}
+		break;
+		case ( EProfileDMServerPassword ) :
+			{
+			if( lLen > KNSmlMaxPasswordLength )
+			    {
+			    lBool = ETrue;	
+			    }
+			}
+		break;
+
+		case ( ESharedSecret ) :
+			{
+			if( lLen > KNSmlDmSharedSecretMaxLength )
+			    {
+			    lBool = ETrue;	
+			    }
+			}
+		break;
+
+		case ( EProfileURL ) :
+			{
+			if( lLen > KNSmlMaxURLLength )
+			    {
+			    lBool = ETrue;	
+			    }
+			}
+		break;
+
+		case ( EServerId ) :
+			{
+			if( lLen > KNSmlDmServerIdMaxLength )
+			    {
+			    lBool = ETrue;	
+			    }
+			}
+		break;
+
+		case ( EProfileIAPId ) :
+			{
+			if( lLen > KNSmlMaxURLLength )
+			    {
+			    lBool = ETrue;	
+			    }
+			}
+		break;
+
+		case ( EAuthenticationRequired ) :
+		case ( EProfileAAuthType ) :
+			{
+			if( lLen > 20 ) 
+			    {
+			    lBool = ETrue;	
+			    }
+			}
+		break;
+
+		case ( EProfileId ) :
+		case ( EProfilePort ) :
+		case ( EProfileMediumType ) :
+		case ( EProfileAddrType ) :
+	
+			{
+			if( lLen > 8 )
+			    {
+			    lBool = ETrue;	
+			    }
+			}
+		break;
+		
+        case ( EServerNonce ) :
+	    case ( EClientNonce ) :
+		case (EProfileTransportAuthData):
+	        {
+            lBool = EFalse;
+	        }
+        break;
+		case ( EProfileTransport ):
+		{
+			lBool = EFalse;
+		}
+		break;
+		case EProfileLock :
+		 {
+		 	if(lLen > 6 )
+		 	{
+			    lBool = ETrue;	
+			}
+		 	
+		 }
+		  break;
+		default:
+			{
+			lBool = ETrue;
+			}
+		}
+
+	return lBool;
+	}
+
+// -----------------------------------------------------------------------------
+//	CNSmlDMSettingsAdapter12::SetField
+//	Last element of the URI (after last '/') is returned.
+// -----------------------------------------------------------------------------
+TInt CNSmlDMSettingsAdapter12::SetField( const TDesC8& aSource )
+	{
+	if ( aSource.LocateReverse( KNSmlDMUriSeparator ) == KErrNotFound )
+	    {
+	    iField->Des().Format( aSource );
+	    }
+	else
+        {
+        iField->Des().Format( aSource.Mid( aSource.LocateReverse( KNSmlDMUriSeparator ) + 1 ) );
+        }
+
+    return KErrNone;
+	}
+
+// -----------------------------------------------------------------------------
+//	CNSmlDMSettingsAdapter12::SetField
+//	Last element of the URI (after last '/') is returned.
+// -----------------------------------------------------------------------------
+TInt CNSmlDMSettingsAdapter12::SetURIInProcessL( const TDesC8& aSource )
+	{
+    
+    if( iURIField )
+    {
+    	delete iURIField;
+    	iURIField = NULL;
+    }
+    iURIField = HBufC8::NewL( aSource.Length() );
+    TPtr8 newPortNbr = iURIField->Des();
+    newPortNbr.Append( aSource );          
+
+    return KErrNone;
+	}
+	
+
+
+
+// -----------------------------------------------------------------------------
+//  CNSmlDMSettingsAdapter12::ConvertTo8LC
+//	Converts string value to 8-bit and returns reference.
+// -----------------------------------------------------------------------------
+TDesC8& CNSmlDMSettingsAdapter12::ConvertTo8LC( const TDesC& aSource )
+	{
+	HBufC8* buf = HBufC8::NewLC( aSource.Length() * 2 );
+	TPtr8 bufPtr = buf->Des();
+	CnvUtfConverter::ConvertFromUnicodeToUtf8( bufPtr, aSource );
+
+    return *buf;
+	}
+
+// -----------------------------------------------------------------------------
+//	CNSmlDMSettingsAdapter12::ConvertTo16LC
+//	Converts string value to 16-bit and returns reference.
+// -----------------------------------------------------------------------------
+TDesC16& CNSmlDMSettingsAdapter12::ConvertTo16LC( const TDesC8& aSource)
+	{
+	HBufC16* buf16 = HBufC16::NewLC( aSource.Length() );
+	TPtr16 bufPtr16 = buf16->Des();
+
+	CnvUtfConverter::ConvertToUnicodeFromUtf8( bufPtr16, aSource );
+
+    return *buf16; 
+	}
+
+// -------------------------------------------------------------------------------------
+//  CNSmlDMSettingsAdapter12::GetConRefL
+//	Gets the URI for given aObject (IAP ID).
+// -------------------------------------------------------------------------------------
+TInt CNSmlDMSettingsAdapter12::GetConRefL( CBufBase& aObject )
+	{
+	_DBG_FILE( "CNSmlDMSettingsAdapter12::GetConRefL() : begin" );
+	TInt profIAPid = -1;
+    TInt apIdResponse = GetProfileIAPIdL( profIAPid );
+    if( profIAPid < 0 )
+    {
+    	return KErrNone;
+    }    
+    if( apIdResponse != KErrNone )
+    {
+    	return KErrNotFound;
+    }
+    CNSmlDMIAPMatcher* apmatch = CNSmlDMIAPMatcher::NewL( iCallBack );
+    CleanupStack::PushL( apmatch );
+    HBufC8* uri8 = apmatch->URIFromIAPIdL( profIAPid );
+    if( uri8 )
+        {
+        CleanupStack::PushL( uri8 );
+        aObject.InsertL( aObject.Size(), uri8->Des() );
+        CleanupStack::PopAndDestroy(); // uri8
+        }
+    else
+        {
+        CleanupStack::PopAndDestroy(); // apMatch
+        return KErrGeneral;    
+        }
+    CleanupStack::PopAndDestroy(); // iapMatch
+	_DBG_FILE( "CNSmlDSSettingsAdapter::GetToNAPIDL() : end" );
+	return KErrNone;
+	}
+
+// -------------------------------------------------------------------------------------
+//  CNSmlDMSettingsAdapter12::SetConRefL()
+//	Set the profile IAP Id value according to given URI.
+// -------------------------------------------------------------------------------------
+TInt CNSmlDMSettingsAdapter12::SetConRefL( const TInt aLUID, const TDesC8& aObject )
+	{
+    _DBG_FILE( "CNSmlDMSettingsAdapter12::SetConRefL() : begin" );
+    CNSmlDMIAPMatcher* apmatch = CNSmlDMIAPMatcher::NewL( iCallBack );
+    CleanupStack::PushL( apmatch );
+    TInt lIAPid = apmatch->IAPIdFromURIL( aObject );
+    CleanupStack::PopAndDestroy(); // iapmatch
+    if(aObject.Length() >0 && lIAPid == KErrNotFound) 
+    {
+    	return KErrGeneral;
+    }
+    TInt apIdResponse = SetProfileConnectionPropertyL( aLUID, lIAPid );    
+    _DBG_FILE( "CNSmlDMSettingsAdapter12::SetConRefL() : end" );
+	return apIdResponse;
+	}
+
+// ------------------------------------------------------------------------------------------------
+//  CNSmlDMSettingsAdapter12::ParseUri
+//  Resolves portnbr (separated with ':') as integer from Uri. 
+// ------------------------------------------------------------------------------------------------
+TInt CNSmlDMSettingsAdapter12::ParseUri( const TDesC8& aRealURI, TInt& aPort )
+	{
+	TInt offset=0;
+    //http:
+	if( aRealURI.Find( KNSmlDMSettingsHTTP )==0 )//http:
+		{
+		offset = KNSmlDMSettingsHTTP().Length();
+		}
+	else if( aRealURI.Find( KNSmlDMSettingsHTTPS )==0 )//https:
+		{
+		offset = KNSmlDMSettingsHTTPS().Length();
+		}
+
+	TBool portFound=EFalse;
+    ////123.234.345.456:80/syncml
+	for( TInt i = offset; i < aRealURI.Length(); i++ )
+		{
+		if( aRealURI[i] == KNSmlDMColon )// ':'
+			{
+			portFound = ETrue;
+			offset=i;
+			}
+		if( portFound && aRealURI[i] == KNSmlDMUriSeparator ) // '/'
+			{
+			aPort = GetIntObject( aRealURI.Mid( (offset + 1), (i - offset-1) ) );
+			}
+		else if ( portFound && i == aRealURI.Length() - 1 ) // last char
+		    {
+		    // port is from offset to the end
+		    aPort = GetIntObject( aRealURI.Right( aRealURI.Length() - offset - 1 ) );
+		    }
+		}
+	
+	if( aPort != 0 )
+		{
+		return KErrNone;
+		}
+	else
+		{
+		return KErrNotFound;
+		}
+	}
+// -----------------------------------------------------------------------------
+//  CNSmlDMSettingsAdapter12::OpenSyncSessionAndDSProfileL
+//  The function opens the server session and DM profile.
+// -----------------------------------------------------------------------------
+TInt CNSmlDMSettingsAdapter12::OpenSyncSessionAndProfileL( const TInt aIntLUID, 
+                                                        TSmlOpenMode aMode )
+    {
+    _DBG_FILE( "CNSmlDMSettingsAdapter12::OpenSyncSessionAndProfileL(): begin" );
+    if( iSyncSessionOpen == EFalse )
+        {
+        iSyncSession.OpenL();
+        iSyncSessionOpen = ETrue;
+        }
+    TInt trueLuid = aIntLUID + KMaxDataSyncID;
+    TInt rValue(KErrNone);
+    
+    if(trueLuid!=iCurrentProfile)
+	    {
+	    RArray<TSmlProfileId> profileIdArray;
+	    CleanupClosePushL( profileIdArray );
+	    TSmlUsageType usageType = ESmlDevMan;
+	    iSyncSession.ListProfilesL( profileIdArray, usageType );
+	    TInt index = profileIdArray.Find( trueLuid );
+	    CleanupStack::PopAndDestroy(); //profileIdArray
+	    if( index == KErrNotFound )
+	        {
+	        return KErrNotFound;
+	        }
+	    TRAP( rValue, iProfile.OpenL( iSyncSession, trueLuid, aMode ) );
+	    iCurrentProfile = trueLuid;
+	    if( rValue != KErrNone )
+	        {
+	        iCurrentProfile = 0;
+	        iProfile.Close();
+			iSyncSession.Close();
+	        iSyncSessionOpen = EFalse;
+	        }
+    	}
+    _DBG_FILE( "CNSmlDMSettingsAdapter12::OpenSyncSessionAndProfileL(): end" );
+    return rValue;
+    }
+
+// -----------------------------------------------------------------------------
+//  CNSmlDMSettingsAdapter12::FindProfileId
+//  Function checks if profile can be found.
+// -----------------------------------------------------------------------------
+TBool CNSmlDMSettingsAdapter12::FindProfileIdL( const TInt aIntLUID )
+	{
+    _DBG_FILE( "CNSmlDMSettingsAdapter12::FindProfileIdL(): begin" );
+	if( iSyncSessionOpen == EFalse )
+	    {
+        iSyncSession.OpenL();
+        iSyncSessionOpen = ETrue;
+	    }
+    
+	RArray <TSmlProfileId> profileList;
+    CleanupClosePushL( profileList );
+	TSmlUsageType usageType = ESmlDevMan;		
+	iSyncSession.ListProfilesL( profileList, usageType );
+	if( profileList.Count() == 0 ) 
+	    {
+        CleanupStack::PopAndDestroy(); //profileList
+        return EFalse;
+	    }		
+    TInt item = profileList.Find( aIntLUID + KMaxDataSyncID );
+    CleanupStack::PopAndDestroy(); //profileList
+    if( item != KErrNotFound )
+		{
+		_DBG_FILE( "CNSmlDMSettingsAdapter12::FindProfileIdL(): end" );
+        return ETrue;
+		}
+    _DBG_FILE( "CNSmlDMSettingsAdapter12::FindProfileIdL(): end" );
+	return EFalse;
+	}
+// -----------------------------------------------------------------------------
+//  CNSmlDMSettingsAdapter12::IsServerIDExistL
+//  Function checks if serverid exist.
+// -----------------------------------------------------------------------------
+TBool CNSmlDMSettingsAdapter12::IsServerIDExistL( const TDesC8& aServerid )
+{
+	_DBG_FILE( "CNSmlDMSettingsAdapter12::IsServerIDExistL(): begin" );
+	if( iSyncSessionOpen == EFalse )
+	{
+       	iSyncSession.OpenL();
+       	iSyncSessionOpen = ETrue;
+	}
+    TBool ret(EFalse);
+	RArray <TSmlProfileId> profileList;
+    CleanupClosePushL( profileList );
+	TSmlUsageType usageType = ESmlDevMan;		
+	iSyncSession.ListProfilesL( profileList, usageType );
+	TInt count = profileList.Count();
+	if( count > 0 ) 
+	{
+		for(TInt i =0; i< count; i++)
+		{
+			TInt pid = i + KMaxDataSyncID;
+			TInt index = profileList.Find(pid );
+			if( index >= i  )
+			{	    		
+	        	TInt rValue(KErrNone);
+	        	RSyncMLDevManProfile profile;
+	    		TRAP( rValue, profile.OpenL( iSyncSession, pid, ESmlOpenRead ) );
+	    		if( rValue == KErrNone )
+	        	{
+			        CleanupClosePushL(profile);
+	        		if(((aServerid.Compare(profile.ServerId())) == 0) &&
+						((profile.ServerId()).Length() == aServerid.Length()))
+	        		{
+	        			ret = ETrue;
+			            CleanupStack::PopAndDestroy(&profile);//profile
+						break;	        			
+	        		}						
+			        CleanupStack::PopAndDestroy(&profile);//profile
+				}				
+			}	
+		}        
+	}		
+    CleanupStack::PopAndDestroy(); //profileList
+    _DBG_FILE( "CNSmlDMSettingsAdapter12::IsServerIDExistL(): end" );
+	return ret;
+	}
+// -----------------------------------------------------------------------------
+//  CNSmlDMSettingsAdapter12::CreateNewProfileL
+//  The function creates new DM profile via client API.
+// -----------------------------------------------------------------------------
+TInt CNSmlDMSettingsAdapter12::CreateNewProfileL( TInt& aPID )
+	{
+    _DBG_FILE("CNSmlDMSettingsAdapter12::CreateNewProfileL(): begin");
+	if( iSyncSessionOpen == EFalse )
+	    {
+        iSyncSession.OpenL();
+        iSyncSessionOpen = ETrue;
+	    }
+    TRAPD( value1, iProfile.CreateL( iSyncSession ) );
+    if( value1 != KErrNone )
+        {
+   	    iCurrentProfile = 0;
+        iProfile.Close();
+        iSyncSession.Close();
+        iSyncSessionOpen = EFalse;
+        return value1;
+        }
+    
+    TRAPD( value2, iProfile.UpdateL() );
+    if( value2 != KErrNone )
+        {
+   	    iCurrentProfile = 0;
+        iProfile.Close();
+        iSyncSession.Close();
+        iSyncSessionOpen = EFalse;
+        return value2;
+        }
+    
+    aPID = iProfile.Identifier();
+    iCurrentProfile = 0;
+    iProfile.Close();
+    _DBG_FILE( "CNSmlDMSettingsAdapter12::CreateNewProfileL(): end" );
+    return KErrNone;
+	}
+// -----------------------------------------------------------------------------
+//  CNSmlDMSettingsAdapter12::SetProfileServerURIL()
+//  The function sets the server URL for a profile.
+// -----------------------------------------------------------------------------
+TInt CNSmlDMSettingsAdapter12::SetProfileServerURIL( const TInt aPID, 
+                                                    const TDesC8& aObj )
+	{
+    _DBG_FILE( "CNSmlDMSettingsAdapter12::SetProfileServerURIL(): begin" );
+	TInt retVal = KErrNone;
+    retVal = OpenSyncSessionAndProfileL( aPID, ESmlOpenReadWrite );
+    if( retVal != KErrNone )
+		{
+	    iCurrentProfile = 0;
+	    iProfile.Close();
+        return retVal;	
+		}
+	RArray<TSmlTransportId> transportIdArray;
+    CleanupClosePushL( transportIdArray );
+	iProfile.ListConnectionsL( transportIdArray );
+    if( transportIdArray.Count() == 0 )
+	    {
+        CleanupStack::PopAndDestroy();//transportIdArray
+	    iCurrentProfile = 0;
+        iProfile.Close();
+        return KErrGeneral;
+	    }
+	    
+	TInt newPort(0);
+    
+    RSyncMLConnection conn;
+    CleanupClosePushL( conn );
+    conn.OpenL( iProfile, transportIdArray[0] );
+
+    if(ParseUri(aObj,newPort)==KErrNotFound)
+        {
+        TInt port = 0;
+        ParseUri(conn.ServerURI(),port);
+        if(port==0)
+        	{
+        	port = 80;
+        	}
+           	
+       	TBuf8<5> buf;
+    	buf.Num( port );
+        	
+        TInt totalSize = aObj.Length() + buf.Length() + 1;
+        HBufC8* newServerURI = HBufC8::NewLC( totalSize );
+        SetPortNrToAddrStr( aObj, newServerURI, buf );
+        conn.SetServerURIL( *newServerURI );
+        conn.UpdateL();
+    	CleanupStack::PopAndDestroy( newServerURI ); 
+        }
+    else
+        {
+        conn.SetServerURIL( aObj );
+        conn.UpdateL();
+        }
+	
+
+	iProfile.UpdateL();
+	
+	CleanupStack::PopAndDestroy( 2 ); //transportIdArray, conn
+    iCurrentProfile = 0;
+	iProfile.Close();
+    _DBG_FILE( "CNSmlDMSettingsAdapter12::SetProfileServerURIL(): end" );
+	return KErrNone;
+	}
+// -----------------------------------------------------------------------------
+//  CNSmlDMSettingsAdapter12::SetProfileDisplayNameL()
+//  The function sets the display name for a profile.
+// -----------------------------------------------------------------------------
+TInt CNSmlDMSettingsAdapter12::SetProfileDisplayNameL( const TInt aPID, 
+                                                        const TDesC8& aObj )
+	{
+    _DBG_FILE( "CNSmlDMSettingsAdapter12::SetProfileDisplayNameL(): begin" );
+	TInt retVal = KErrNone;
+    retVal = OpenSyncSessionAndProfileL( aPID, ESmlOpenReadWrite );
+    if( retVal != KErrNone )
+		{
+	    iCurrentProfile = 0;
+		iProfile.Close();
+        return retVal;	
+		}
+    iProfile.SetDisplayNameL( ConvertTo16LC( aObj ) );
+    iProfile.UpdateL();
+	CleanupStack::PopAndDestroy(); //ConvertTo16LC
+    iCurrentProfile = 0;
+    iProfile.Close();
+    _DBG_FILE( "CNSmlDMSettingsAdapter12::SetProfileDisplayNameL(): end" );
+	return KErrNone;
+	}
+// -----------------------------------------------------------------------------
+//  CNSmlDMSettingsAdapter12::IsProfileLockedL()
+//  The function to tell whether the profile is locked
+// -----------------------------------------------------------------------------
+TInt CNSmlDMSettingsAdapter12::IsProfileLockedL(const TInt aPID)
+{
+   _DBG_FILE( "CNSmlDMSettingsAdapter12::SetProfileDisplayNameL(): begin" );
+	TInt retVal = KErrNone;
+    retVal = OpenSyncSessionAndProfileL( aPID, ESmlOpenRead );
+     if( retVal != KErrNone )
+		{
+	    iCurrentProfile = 0;
+		iProfile.Close();
+        return retVal;	
+		}
+		
+	retVal=iProfile.ProfileLocked(EFalse, EFalse);
+	iCurrentProfile = 0;
+    iProfile.Close();
+    if(retVal)
+      {
+      /* CRepository* centrep = NULL;
+       TRAPD( err, centrep = CRepository::NewL( KCRUidDeviceManagementInternalKeys) );    
+       TInt IsPrfoileEditable = 0;
+       if(!err)
+         centrep->Get( KDevOverrideProfileLock, IsPrfoileEditable );
+       delete centrep;
+       if (!IsPrfoileEditable)
+          retVal=  KErrAccessDenied;
+       else
+         retVal= KErrNone;*/
+       retVal=  KErrAccessDenied;
+      }
+      
+      
+       
+    return retVal;
+    
+}
+
+
+
+// -----------------------------------------------------------------------------
+//  CNSmlDMSettingsAdapter12::SetProfileLockL()
+//  The function to setor reset the profile lock.
+// -----------------------------------------------------------------------------
+
+TInt CNSmlDMSettingsAdapter12::SetProfileLockL( const TInt aPID, TInt aLockValue)
+	{
+    _DBG_FILE( "CNSmlDMSettingsAdapter12::SetProfileLockL(): begin" );
+	TInt retVal = KErrNone;
+    retVal = OpenSyncSessionAndProfileL( aPID, ESmlOpenReadWrite );
+    if( retVal != KErrNone )
+		{
+	    iCurrentProfile = 0;
+		iProfile.Close();
+        return retVal;	
+		}
+		 
+		iProfile.ProfileLocked(ETrue, aLockValue );
+    iProfile.UpdateL();
+	  iCurrentProfile = 0;
+    iProfile.Close();
+    _DBG_FILE( "CNSmlDMSettingsAdapter12::SetProfileLockL(): end" );
+	return KErrNone;
+	}
+
+
+
+
+
+
+
+// -----------------------------------------------------------------------------
+//  CNSmlDMSettingsAdapter12::SetProfileHttpUserNameL
+//  The function sets the profile http/network name.
+// -----------------------------------------------------------------------------
+
+TInt CNSmlDMSettingsAdapter12::SetProfileHttpUserNameL( const TInt aPID, const TDesC8& aObj )
+{
+	TInt retVal = KErrNone;
+	 retVal = OpenSyncSessionAndProfileL( aPID, ESmlOpenReadWrite );
+    if( retVal != KErrNone )
+		{
+	    iCurrentProfile = 0;
+		iProfile.Close();
+        return KErrGeneral;	
+		}
+        
+	  RSyncMLConnection connection;
+	  TBuf8<KBufSize32> key; 
+      RArray<TSmlTransportId> connIdArray;
+      CleanupClosePushL( connIdArray );
+	  iProfile.ListConnectionsL( connIdArray );
+      if( connIdArray.Count() == 1 )
+        {
+        
+		connection.OpenL( iProfile, KUidNSmlMediumTypeInternet.iUid );
+		CleanupClosePushL( connection );
+		
+		connection.SetPropertyL( KNSmlHTTPAuth, KNSmlTrueVal );
+		connection.SetPropertyL( KNSmlHTTPUsername, aObj );
+		connection.UpdateL();
+		CleanupStack::PopAndDestroy(  );
+		}
+	  else
+		{
+		connection.SetPropertyL( KNSmlHTTPAuth, KNSmlFalseVal );
+		connection.UpdateL();
+		}
+		
+		       
+        CleanupStack::PopAndDestroy(   );
+    
+	return retVal;
+	
+}
+    
+// -----------------------------------------------------------------------------
+//  CNSmlDMSettingsAdapter12::SetProfileUserNameL
+//  The function sets the profile user name.
+// -----------------------------------------------------------------------------
+TInt CNSmlDMSettingsAdapter12::SetProfileUserNameL( const TInt aPID, 
+                                                    const TDesC8& aObj )
+	{
+    _DBG_FILE( "CNSmlDMSettingsAdapter12::SetProfileUserNameL(): begin" );
+	TInt retVal = OpenSyncSessionAndProfileL( aPID, ESmlOpenReadWrite );
+    if( retVal != KErrNone )
+		{
+	    iCurrentProfile = 0;
+		iProfile.Close();
+        return KErrGeneral;	
+		}
+    iProfile.SetUserNameL( aObj );
+    iProfile.UpdateL();
+    iCurrentProfile = 0;
+    iProfile.Close();
+    _DBG_FILE( "CNSmlDMSettingsAdapter12::SetProfileUserNameL(): end" );
+	return KErrNone;
+	}
+
+// -----------------------------------------------------------------------------
+//  CNSmlDMSettingsAdapter12::SetProfileProtocolVersionL
+//  The function sets the protocol version to be supported.
+// -----------------------------------------------------------------------------
+TInt CNSmlDMSettingsAdapter12::SetProfileProtocolVersionL( const TInt aPID, 
+                                                            const TDesC8& )
+	{
+    _DBG_FILE( "CNSmlDMSettingsAdapter12::SetProfileProtocolVersionL(): begin" );
+	TInt retVal = KErrNone;
+    retVal = OpenSyncSessionAndProfileL( aPID, ESmlOpenReadWrite );
+    if( retVal != KErrNone )
+		{
+	    iCurrentProfile = 0;
+		iProfile.Close();
+        return retVal;	
+		}
+	//The syncSession to Sync server is open.
+    TSmlProtocolVersion protocol = ESmlVersion1_2;
+    iProfile.SetProtocolVersionL( protocol );
+	TRAPD( iError, iProfile.UpdateL() );
+    iCurrentProfile = 0;
+    iProfile.Close();
+    _DBG_FILE( "CNSmlDMSettingsAdapter12::SetProfileProtocolVersionL(): begin" );
+	return iError;
+	}
+
+// -----------------------------------------------------------------------------
+//  CNSmlDMSettingsAdapter12::SetProfileServerIdL
+//  The function sets the profile ServerId value.
+// -----------------------------------------------------------------------------
+TInt CNSmlDMSettingsAdapter12::SetProfileServerIdL( const TInt aPID, 
+                                                    const TDesC8& aObj )
+	{
+    _DBG_FILE("CNSmlDMSettingsAdapter12::SetProfileServerIdL(): begin");
+	TInt retVal = OpenSyncSessionAndProfileL( aPID, ESmlOpenReadWrite );
+    if( retVal != KErrNone )
+		{
+	    iCurrentProfile = 0;
+		iProfile.Close();
+        return KErrGeneral;	
+		}
+	iProfile.SetServerIdL( aObj );
+    TRAP(retVal,iProfile.UpdateL() );
+    iCurrentProfile = 0;
+    iProfile.Close();
+    _DBG_FILE( "CNSmlDMSettingsAdapter12::SetProfileServerIdL(): end" );
+	return retVal;
+	}
+
+// -----------------------------------------------------------------------------
+//  CNSmlDMSettingsAdapter12::SetProfileServerPasswordL
+//  The function sets the profile server password.
+// -----------------------------------------------------------------------------
+TInt CNSmlDMSettingsAdapter12::SetProfileServerPasswordL( const TInt aPID, 
+                                                        const TDesC8& aObj )
+	{
+    _DBG_FILE( "CNSmlDMSettingsAdapter12::SetProfileServerPasswordL(): begin" );
+	TInt retVal = OpenSyncSessionAndProfileL( aPID, ESmlOpenReadWrite );
+    if( retVal != KErrNone )
+		{
+	    iCurrentProfile = 0;
+		iProfile.Close();
+        return KErrGeneral;
+		}
+	iProfile.SetServerPasswordL( aObj );
+    iProfile.UpdateL();
+    iCurrentProfile = 0;
+    iProfile.Close();
+    _DBG_FILE( "CNSmlDMSettingsAdapter12::SetProfileServerPasswordL(): end" );
+	return KErrNone;
+	}
+
+// -----------------------------------------------------------------------------
+//  CNSmlDMSettingsAdapter12::SetProfileHttpPasswordL
+//  The function sets the profile network/http password.
+// -----------------------------------------------------------------------------
+
+
+  TInt CNSmlDMSettingsAdapter12::SetProfileHttpPasswordL( const TInt aPID, const TDesC8& aObj )
+  {
+ TInt retVal = KErrNone;
+	 retVal = OpenSyncSessionAndProfileL( aPID, ESmlOpenReadWrite );
+    if( retVal != KErrNone )
+		{
+	    iCurrentProfile = 0;
+		iProfile.Close();
+        return KErrGeneral;	
+		}
+        
+	  RSyncMLConnection connection;
+	  TBuf8<KBufSize32> key; 
+      RArray<TSmlTransportId> connIdArray;
+      CleanupClosePushL( connIdArray );
+	  iProfile.ListConnectionsL( connIdArray );
+      if( connIdArray.Count() == 1 )
+        {
+        
+		connection.OpenL( iProfile, KUidNSmlMediumTypeInternet.iUid );
+		CleanupClosePushL( connection );
+		
+		connection.SetPropertyL( KNSmlHTTPAuth, KNSmlTrueVal );
+		connection.SetPropertyL( KNSmlHTTPPassword, aObj );
+		connection.UpdateL();
+		CleanupStack::PopAndDestroy(  );
+		}
+	  else
+		{
+	//	connection.SetPropertyL( KNSmlHTTPAuth, KNSmlFalseVal );
+		connection.UpdateL();
+		}
+		
+		       
+        CleanupStack::PopAndDestroy(   );
+    
+	return retVal;
+	
+	
+  	
+  }
+  
+  
+// -----------------------------------------------------------------------------
+//  CNSmlDMSettingsAdapter12::SetProfilePasswordL
+//  The function sets the profile password.
+// -----------------------------------------------------------------------------
+TInt CNSmlDMSettingsAdapter12::SetProfilePasswordL( const TInt aPID, 
+                                                    const TDesC8& aObj )
+	{
+    _DBG_FILE( "CNSmlDMSettingsAdapter12::SetProfilePasswordL(): begin" );
+	TInt retVal = KErrNone;
+    retVal = OpenSyncSessionAndProfileL( aPID, ESmlOpenReadWrite );
+    if( retVal != KErrNone )
+		{
+	    iCurrentProfile = 0;
+		iProfile.Close();
+        return retVal;	
+		}
+	iProfile.SetPasswordL( aObj );
+    iProfile.UpdateL();
+    iCurrentProfile = 0;
+    iProfile.Close();
+    _DBG_FILE( "CNSmlDMSettingsAdapter12::SetProfilePasswordL(): begin" );
+	return KErrNone;
+	}
+
+// -----------------------------------------------------------------------------
+//  CNSmlDMSettingsAdapter12::SetProfileConnectionPropertyL
+//  This function sets the profile IAP id.
+// -----------------------------------------------------------------------------
+TInt CNSmlDMSettingsAdapter12::SetProfileConnectionPropertyL( const TInt aLUID, 
+                                                            const TInt aIAPid )
+	{
+    TInt retVal = OpenSyncSessionAndProfileL( aLUID, ESmlOpenReadWrite );
+    if( retVal != KErrNone )
+		{
+	    iCurrentProfile = 0;
+		iProfile.Close();
+        return retVal;	
+		}
+    RArray<TSmlTransportId> connIdArray;
+    CleanupClosePushL( connIdArray );
+    iProfile.ListConnectionsL( connIdArray );
+    if( connIdArray.Count() == 1 )
+        {
+        RSyncMLTransport transport;
+        CleanupClosePushL( transport );
+	    transport.OpenL( iSyncSession, connIdArray[0] );
+	    const CSyncMLTransportPropertiesArray& props = transport.Properties();
+	    TInt index = props.Find( KNSmlIAPId );
+        if( index > 0 )
+            {
+            RSyncMLConnection conn;
+            CleanupClosePushL( conn );
+	        conn.OpenL( iProfile, connIdArray[0] );
+            HBufC8* apIdBuffer = HBufC8::NewLC( 4 );
+	        TPtr8 ptrIapIdBuf = apIdBuffer->Des();
+        	ptrIapIdBuf.Num( aIAPid );
+            conn.SetPropertyL( KNSmlIAPId, ptrIapIdBuf );
+            conn.UpdateL();
+            CleanupStack::PopAndDestroy( 2 ); //conn, apIdBuffer
+            retVal = KErrNone;
+            }
+        else
+            {
+            retVal = KErrNotFound;
+            }
+        CleanupStack::PopAndDestroy( 1 ); //transport
+        }
+    else
+        {
+        retVal = KErrNotFound;
+        }
+    iCurrentProfile = 0;
+    iProfile.Close();
+    CleanupStack::PopAndDestroy(); //connIdArray
+    return retVal;
+	}
+
+// -----------------------------------------------------------------------------
+//  CNSmlDMSettingsAdapter12::DeleteProfileL
+//  The function deleted the profile from DM database.
+// -----------------------------------------------------------------------------
+TInt CNSmlDMSettingsAdapter12::DeleteProfileL( const TInt aPID )
+	{
+    _DBG_FILE( "CNSmlDMSettingsAdapter12::DeleteProfileL(): begin" );
+	if( iSyncSessionOpen == EFalse )
+	    {
+        iSyncSession.OpenL();
+        iSyncSessionOpen = ETrue;
+	    }
+    
+	RArray<TSmlProfileId> profileIdArray;
+    CleanupClosePushL( profileIdArray );
+	TSmlUsageType usageType = ESmlDevMan;
+	iSyncSession.ListProfilesL( profileIdArray, usageType );
+	TInt index = profileIdArray.Find( aPID );
+	if ( index == KErrNotFound )
+		{
+        //No match
+        CleanupStack::PopAndDestroy();//profileIdArray
+		return KErrNotFound;		
+		}
+    iSyncSession.DeleteProfileL( aPID );
+    iSyncSession.Close();
+    iSyncSessionOpen = EFalse;
+    CleanupStack::PopAndDestroy();//profileIdArray
+    _DBG_FILE( "CNSmlDMSettingsAdapter12::DeleteProfileL(): end" );
+	return KErrNone;
+	}
+
+// -----------------------------------------------------------------------------
+//  CNSmlDMSettingsAdapter12::GetObjectL
+//  The function checks which leaf data to be fetched.
+// -----------------------------------------------------------------------------
+TInt CNSmlDMSettingsAdapter12::GetObjectL( TInt aLUID, TNSmlDMProfileData aDMField, 
+                                            CBufBase& aObject )
+    {
+    TInt retVal = KErrNone;
+    if( iField->Compare(KNSmlDdfAppId ) ==0 )
+        {
+         	aObject.InsertL(aObject.Size(),KNSmlDdfAppIdValue);
+         	return retVal;
+        	
+        }
+        
+    retVal = OpenSyncSessionAndProfileL( aLUID, ESmlOpenRead );
+    if( retVal != KErrNone )
+		{
+	    iCurrentProfile = 0;
+		iProfile.Close();
+        return retVal;	
+		}
+    switch ( aDMField )
+		{
+		case ( EProfileName ) :
+			{
+            GetProfileNameL( aObject );
+            }
+		break;
+		
+		case ( EProfileDMServerUsername ) :
+			{
+			GetProfileUserNameL( aObject );
+            }
+		break;
+
+		case ( EProfileURL ) :
+			{
+			GetProfileServerURLL( aObject );
+			TInt port(0);
+			if(ParseUri(aObject.Ptr(0),port)==KErrNone)
+			    {
+			    HBufC8* addr = aObject.Ptr(0).AllocLC();
+			    aObject.Reset();
+			    TInt portStart = addr->LocateReverse(KNSmlDMColon);
+			    aObject.InsertL(aObject.Size(),addr->Left(portStart));
+			    
+			    TInt portLen=addr->Mid(portStart).Locate(KNSmlDMUriSeparator);
+			    if(portLen!=KErrNotFound)
+			        {
+			        aObject.InsertL(aObject.Size(),addr->Mid(portStart+portLen));
+			        }
+			    	    			    
+			    CleanupStack::PopAndDestroy(); //addr
+			    }
+            }
+		break;
+
+		case ( EServerId ) :
+			{
+            GetServerIdL( aObject );
+            }
+		break;
+
+		case ( EProfileIAPId ) :
+			{
+		    retVal = GetConRefL( aObject );
+            }
+		break;
+
+		case ( EProfilePort ) :
+            {
+            GetProfileServerURLL( aObject );
+            if ( aObject.Size() == 0 )
+                {
+                retVal = KErrNone;
+                break;
+                }
+            GetProfilePortNumberL ( aObject );
+            }
+        break;
+        
+   		case ( EProfileDMServerPassword ) :
+			{
+			retVal = EInvalidObject;
+            }
+		break;
+
+		case ( ESharedSecret ) :
+            {//ServerPW
+            retVal = EInvalidObject;
+            }
+        break;
+        case ( EProfileId ) :
+        break;
+		case ( EProfileAddrType ) :
+		    {
+		    aObject.InsertL(aObject.Size(),KNSmlAddrtype);
+		    }
+		   break;
+		case (EProfileHttpUsername ):
+		    {
+		       retVal = GetHttpUsernameL(aObject);
+		    }
+		break;
+		case (EPRofileServerCred) :
+		    {
+		    aObject.InsertL(aObject.Size(),KDmAccAppAuthLevelSrv);
+		    
+		    }
+		  break;
+        case (EPRofileClientCred) :
+		    {
+		    aObject.InsertL(aObject.Size(),KDmAccAppAuthLevelCli);
+		    }
+		  break;
+		  
+		case (ETransportAuthName) :
+		    {
+    			TInt mediumType= ENone;
+    			GetProfileConnectiontypeL( mediumType );
+    			if( mediumType == EHttp)
+    			{
+    		    retVal = GetHttpUsernameL(aObject);
+    		    }
+    		    else if(mediumType == EObex)
+    		    {
+    		      aObject.InsertL(aObject.Size(),KNSmlDMNullDesc8);
+    		    }
+		    
+		    }
+		break;
+		
+		
+		case (EProfileTransport) :
+		{
+			TInt mediumType= ENone;
+			GetProfileConnectiontypeL( mediumType );
+			if( mediumType == EHttp)
+			{
+		    aObject.InsertL(aObject.Size(),KDmAccAppAuthLevelHttp);
+		    }
+		    else if(mediumType == EObex)
+		    {
+		      aObject.InsertL(aObject.Size(),KDmAccAppAuthLevelObx);
+		    }
+            
+		}
+
+       break;
+        case ( EAuthenticationRequired ) :
+		case ( EProfileAAuthType ):
+        case ( EServerNonce ) :
+        case ( EClientNonce ) :
+            {
+            retVal = GetDMAuthInfoL( aLUID, aDMField, aObject );
+            }
+        break;
+        
+     case EProfileLock :
+      {
+        	
+       TBool isProfileLocked = iProfile.ProfileLocked(EFalse, EFalse);
+       if(isProfileLocked)
+       {
+       	aObject.InsertL(aObject.Size(),KDmProfileLocked);
+       }
+       else
+       {
+       	aObject.InsertL(aObject.Size(),KDmProfileUnLocked);
+       }
+       
+      }   
+     break;		
+		default:
+			{
+			User::Panic( KNSmlIndexOutOfBoundStr, KNSmlPanicIndexOutOfBound );
+			}
+		}
+    iCurrentProfile = 0;
+    iProfile.Close();
+    return retVal;
+    }
+
+// -----------------------------------------------------------------------------
+//  CNSmlDMSettingsAdapter12::SetProfileConnectionPortNrL()
+//  The function sets the profile port number.
+// -----------------------------------------------------------------------------
+TInt CNSmlDMSettingsAdapter12::SetProfileConnectionPortNrL( const TInt aLUID, 
+                                                            const TDesC8& aPort )
+    {
+    _DBG_FILE( "CNSmlDMSettingsAdapter12::SetProfileConnectionPortNrL(): begin" );
+    TInt retVal = KErrNone;
+    
+    if( iPortNbr )
+        {
+        delete iPortNbr;
+        iPortNbr = NULL;
+        }
+    iPortNbr = HBufC8::NewL( aPort.Length() );
+    TPtr8 newPortNbr = iPortNbr->Des();
+    newPortNbr.Append( aPort );
+        
+    retVal = OpenSyncSessionAndProfileL( aLUID, ESmlOpenReadWrite );
+    if( retVal != KErrNone )
+		{
+	    iCurrentProfile = 0;
+		iProfile.Close();
+        _DBG_FILE( "CNSmlDMSettingsAdapter12::SetProfileConnectionPortNrL(): end" );
+        return retVal;	
+		}
+    
+    RArray<TSmlTransportId> transportIdArray;
+    CleanupClosePushL( transportIdArray );
+    iProfile.ListConnectionsL( transportIdArray );
+    
+    RSyncMLConnection conn;
+    CleanupClosePushL( conn );
+    conn.OpenL( iProfile, transportIdArray[0] );
+        
+    HBufC8* serverURI = conn.ServerURI().AllocLC();
+    if( serverURI->Length() == 0 )
+        {
+	    iCurrentProfile = 0;
+        iProfile.Close();
+        CleanupStack::PopAndDestroy( 3 ); //transportIdArray, conn, serverURI
+        _DBG_FILE( "CNSmlDMSettingsAdapter12::SetProfileConnectionPortNrL(): end" );
+        return retVal;
+	    }
+    TInt totalSize = serverURI->Size() + newPortNbr.Size() + 1;
+    HBufC8* newServerURI = HBufC8::NewL( totalSize );
+    CleanupStack::PushL( newServerURI );
+    SetPortNrToAddrStr( *serverURI, newServerURI, newPortNbr );
+    
+    conn.SetServerURIL( *newServerURI );
+    conn.UpdateL();
+    
+    CleanupStack::PopAndDestroy( 4 ); //transportIdArray, conn, serverURI, newServerURI
+    iCurrentProfile = 0;
+	iProfile.Close();
+    _DBG_FILE( "CNSmlDMSettingsAdapter12::SetProfileConnectionPortNrL(): end" );
+    return retVal;	
+    }
+
+// ------------------------------------------------------------------------------------------------
+//  CNSmlDMSettingsAdapter12::SetPortNrToAddrStr
+//  Sets a portnbr (separated with ':') to profile server URI. 
+// ------------------------------------------------------------------------------------------------
+void CNSmlDMSettingsAdapter12::SetPortNrToAddrStr( const TDesC8& aSrvURI, HBufC8* aNewURI, 
+                                                    const TDesC8& aPort )
+	{
+	TInt offset=0;
+    if( aSrvURI.Find( KNSmlDMSettingsHTTP ) == 0 )//http://
+		{
+		offset = KNSmlDMSettingsHTTP().Length();
+		}
+	else if( aSrvURI.Find( KNSmlDMSettingsHTTPS ) == 0 )//https://
+		{
+		offset = KNSmlDMSettingsHTTPS().Length();
+		}
+	TInt portStart = -1;
+    TInt separatorPos = aSrvURI.Length();
+    TInt i = 0;
+    for( i = offset; i < aSrvURI.Length(); i++ )
+		{
+		if( aSrvURI[i] == KNSmlDMColon )// ':'
+			{
+			portStart = i;
+			}
+		if( aSrvURI[i] == KNSmlDMUriSeparator )// '/'
+			{
+            separatorPos = i;
+			break;
+			}
+		}
+	
+    TPtr8 ptrNewSrvURI = aNewURI->Des();
+    if( portStart < 0 && separatorPos > 0 && iLeafType != EDMDelete )
+        {
+        ptrNewSrvURI.Append( aSrvURI.Left( separatorPos ) );//http://123.234.345.456
+        ptrNewSrvURI.Append( KNSmlDMColon );
+        ptrNewSrvURI.Append( aPort );
+        ptrNewSrvURI.Append( aSrvURI.Right( aSrvURI.Length() - separatorPos ) );
+        }
+    else if ( portStart > 0 && separatorPos > 0 && iLeafType != EDMDelete )
+        {
+        ptrNewSrvURI.Append( aSrvURI.Left( portStart + 1 ) );//123.234.345.456:
+        ptrNewSrvURI.Append( aPort );//123.234.345.456:xx(x)
+        ptrNewSrvURI.Append( aSrvURI.Right( aSrvURI.Length() - separatorPos ) );
+        }
+    else if ( portStart > 0 &&  iLeafType == EDMDelete ) //delete port number from uri
+        {
+        ptrNewSrvURI.Append( aSrvURI.Left( portStart ) );//123.234.345.456
+        ptrNewSrvURI.Append( aSrvURI.Right( aSrvURI.Length() - separatorPos ) );
+        }
+    else
+        {
+        ptrNewSrvURI.Append( aSrvURI );
+        }
+    return;
+	}
+
+// ------------------------------------------------------------------------------------------------
+//  CNSmlDMSettingsAdapter12::SetDMFieldDataL
+//  Selects and Sets value to a field based on field id got from URI.
+// ------------------------------------------------------------------------------------------------
+TInt CNSmlDMSettingsAdapter12::SetDMFieldDataL( const TInt aLUID, const TDesC8& aObject, 
+                                                const TNSmlDMProfileData aField )
+    {
+    TInt rValue = KErrGeneral;
+    TInt lockvalue =0;
+     if(aField != EProfileLock)
+    {
+      rValue=IsProfileLockedL(aLUID);	
+      if (rValue!= KErrNone)
+      {
+       return rValue;
+      }
+         
+     }
+     else if (aField == EProfileLock)
+     {
+     	 if (! iNewProfile)
+     	  {
+     	  	 lockvalue =0;
+     	  	  if(aObject.Length()> 1)
+     	  	  {
+     	  	    rValue = KErrArgument;
+              	 return rValue;
+     	  	  }
+           lockvalue = GetIntObject(aObject);
+           if(lockvalue != 0 && lockvalue != 1)
+               {
+               	  //lockvalue = 0; 
+               	  rValue = KErrArgument;
+               	 return rValue;
+               }  
+     	  	 rValue  = SetProfileLockL(aLUID , lockvalue);
+     	  	 return rValue;
+     	  }
+      
+     }
+      
+    switch ( aField )
+		{
+		case ( EProfileURL ) :
+			{
+		    rValue = SetProfileServerURIL( aLUID, aObject );    
+			}
+		break;
+		case ( EServerId ) :
+			{
+		    rValue = SetProfileServerIdL( aLUID, aObject );
+			}
+		break;
+        case ( ESharedSecret ) :
+			{
+		    rValue = SetProfileServerPasswordL( aLUID, aObject );
+			}
+		break;
+        case ( EProfileDMServerUsername ) :
+			{
+		    rValue = SetProfileUserNameL( aLUID, aObject );
+			}
+		break;
+        case ( EProfileDMServerPassword ) :
+			{
+		    rValue = SetProfilePasswordL( aLUID, aObject );
+			}
+		break;
+        case ( EProfileName ) :
+			{
+		    rValue = SetProfileDisplayNameL( aLUID, aObject );
+			}
+		break;
+        case ( EProfileIAPId ) :
+			{
+            rValue = SetConRefL( aLUID, aObject );
+		    }
+		break;
+		case ( ETransportAuthName ):
+		{
+		    OpenSyncSessionAndProfileL( aLUID, ESmlOpenReadWrite );
+		  	TInt mediumType = ENone;
+	    	GetProfileConnectiontypeL( mediumType );
+			if( mediumType == EHttp)
+			{
+		    rValue = SetProfileHttpUserNameL ( aLUID, aObject );
+		    }
+		    else if(mediumType == EObex)
+		    {
+		      rValue = KErrNone;
+		      
+		    }
+			
+	
+		//break;
+		}
+		break;
+		case ( EProfileTransportPassword ):
+		{
+		 TInt mediumType = ENone;
+		  OpenSyncSessionAndProfileL( aLUID, ESmlOpenReadWrite );
+	    	GetProfileConnectiontypeL( mediumType );
+			if( mediumType == EHttp)
+			{
+		    rValue = SetProfileHttpPasswordL ( aLUID, aObject );
+		    }
+		    else if(mediumType == EObex)
+		    {
+		      rValue = KErrNone;
+		      
+		    }		
+		}
+		break;
+		case (EProfileTransportAuthData) :
+			{
+				rValue = KErrNone;
+			}
+		break;
+		
+		case ( EProfileHttpUsername ) :
+		{
+			rValue = SetProfileHttpUserNameL ( aLUID, aObject );
+		}
+		break;
+		case ( EProfileHttpPassword ) :
+		{
+			rValue = SetProfileHttpPasswordL ( aLUID, aObject );
+		}
+		break;
+        case ( EProfileId ) :
+			{
+		    }
+		break;
+        case ( EProfilePort ) :
+			{
+			if(aObject.Size()<=5)
+			{
+			TInt port = GetIntObject(aObject);
+	        if( port > KPortMinSize && port < KPortMaxSize )
+		         {
+	    			TPortBuffer element;
+	    			element.iPortBuf=aObject;
+	    			element.iPortBufLUID = aLUID;
+	    			iPortBuffer.Append(element);
+	    			rValue=KErrNone;
+                 }
+                else
+                {
+				if (port <= KPortMinSize )
+				   rValue = KErrUnderflow;
+                	else
+                   rValue=KErrOverflow;
+                }
+			}
+			else
+			{
+					rValue=KErrOverflow;
+			}
+			// save information of the port
+		    }
+		break;
+		
+		case ( EProfileAddrType ) :
+			{
+			  if (aObject.Match(KNSmlAddrtype)!=KErrNotFound)
+			  rValue=KErrNone;
+			  
+			}
+		break;
+		
+		
+        case ( EProfileMediumType ) :
+			{
+            if ( iLeafType == EDMDelete )
+			    {
+                return KErrNone;
+			    }
+            iObject = GetIntObject( aObject );
+            if(iObject<0)
+                {
+                iObject = EHttp;
+                }
+            rValue = SetProfileAddrTypeL( aLUID, iObject );
+		    }
+		break;
+		case ( EProfileTransport) :
+		{
+			if (aObject.Match(KDmAccAppAuthLevelHttp)!=KErrNotFound)
+			{
+				iObject = EHttp;
+			}
+			else if (aObject.Match(KDmAccAppAuthLevelObx)!=KErrNotFound)
+			{
+				iObject = EObex;
+			}
+		 rValue = SetProfileAddrTypeL( aLUID, iObject );	
+		}
+		break;
+        case ( EAuthenticationRequired ) :
+        case ( EClientNonce ) :
+        case ( EServerNonce ) :
+		break;
+     case ( EProfileLock ) :
+              lockvalue =0;
+              lockvalue = GetIntObject(aObject);
+             if(lockvalue != 0 && lockvalue != 1)
+                   lockvalue = 0; 
+            
+            TLockBuffer element;
+	    	element.iProfileLock=lockvalue;
+	    	element.iProfileLockLUID = aLUID;
+	    	iProfileLockBuffer.Append(element);
+	    	rValue=KErrNone;
+           
+             
+          // rValue  = SetProfileLock(aLUID , lockvalue);
+     break;               
+        default:
+            rValue = KErrNotSupported;
+        }
+    return rValue;
+    }
+
+// -----------------------------------------------------------------------------
+//  CNSmlDMSettingsAdapter12::FillNodeInfoL
+//  The function fills the node or leaf information.
+// -----------------------------------------------------------------------------
+void CNSmlDMSettingsAdapter12::FillNodeInfoL( MSmlDmDDFObject& aNode, 
+                                            TSmlDmAccessTypes aAccTypes, 
+                                            MSmlDmDDFObject::TOccurence aOccurrence, 
+                                            MSmlDmDDFObject::TScope aScope, 
+                                            MSmlDmDDFObject::TDFFormat aFormat, 
+                                            const TDesC8& aDescription, 
+                                            const TDesC8& aDefaultValue, 
+                                            const TDesC8& aMimeType )
+    {
+    aNode.AddDFTypeMimeTypeL( aMimeType );
+    aNode.SetAccessTypesL( aAccTypes );
+	aNode.SetDescriptionL( aDescription );
+	aNode.SetOccurenceL( aOccurrence );
+	aNode.SetDefaultValueL( aDefaultValue );
+	aNode.SetScopeL( aScope );
+	aNode.SetDFFormatL( aFormat );
+    return;
+    }
+
+// -----------------------------------------------------------------------------
+//  CNSmlDMSettingsAdapter12::GetDMAuthInfoL
+//  This function gets authentication data from private API.
+// -----------------------------------------------------------------------------
+TInt CNSmlDMSettingsAdapter12::GetDMAuthInfoL( const TInt aLUID, 
+                                                const TNSmlDMProfileData aField, 
+                                                CBufBase& aObject )
+    {
+    _DBG_FILE( "CNSmlDMSettingsAdapter12::GetDMAuthInfoL(): begin" );
+   
+    CNSmlDMAuthInfo* authInfo = new (ELeave) CNSmlDMAuthInfo;
+    CleanupStack::PushL( authInfo );
+    
+    authInfo->iProfileId = aLUID + KMaxDataSyncID;
+    iPrivateApi.OpenL();
+    TInt ret = KErrNone;
+    
+    TRAPD(err,iPrivateApi.GetDMAuthInfoL( *authInfo ));
+
+    if(err==KErrNone)
+    	{
+	    if ( aField == EServerNonce )
+	        {
+	        aObject.InsertL( aObject.Size(), *authInfo->iServerNonce );
+	        }
+	    else if ( aField == EClientNonce )
+	        {
+	        aObject.InsertL( aObject.Size(), *authInfo->iClientNonce );
+	        }
+	    else if (( aField == EAuthenticationRequired ) || (aField == EProfileAAuthType))
+	        {
+	        TUint authPref = authInfo->iAuthPref;
+	        /*if( authPref == ENoAuth )
+	            {
+	            aObject.InsertL( aObject.Size(), KNSmlDMAuthPrefNoAuth ); 
+	            }*/
+	         if( authPref == EBasic )
+	            {
+	            if(aField == EAuthenticationRequired)
+	            {
+	            aObject.InsertL( aObject.Size(), KNSmlDMAuthPrefBasic );	
+	            }
+	            else
+	            {
+	            aObject.InsertL( aObject.Size(), KNSmlDMAuthTypeBasic );	
+	            }
+	            
+	            }
+	        else if( authPref == EMD5 )
+	            {
+	            if(aField == EAuthenticationRequired)
+	            {
+	            aObject.InsertL( aObject.Size(), KNSmlDMAuthPrefMD5 );	
+	            }
+	            else
+	            {
+				aObject.InsertL( aObject.Size(), KNSmlDMAuthTypeMD5 );
+	            }
+	            
+	            }
+	        else
+	            {
+	            aObject.InsertL( aObject.Size(), KNullDesC8 );
+	            }
+	        }
+    	}
+    iPrivateApi.Close();
+    CleanupStack::PopAndDestroy(authInfo);
+    _DBG_FILE( "CNSmlDMSettingsAdapter12::GetDMAuthInfoL(): end" );
+    return ret;
+    }
+
+// -----------------------------------------------------------------------------
+//  CNSmlDMSettingsAdapter12::DeleteDMAuthInfoL
+//  This function resets the authentication data.
+// -----------------------------------------------------------------------------
+TInt CNSmlDMSettingsAdapter12::DeleteDMAuthInfoL( const TInt aLUID, 
+                                                const TNSmlDMProfileData aField )
+    {
+    _DBG_FILE( "CNSmlDMSettingsAdapter12::DeleteDMAuthInfoL(): begin" );
+    CNSmlDMAuthInfo* authInfo = new (ELeave) CNSmlDMAuthInfo;;
+    CleanupStack::PushL( authInfo );
+    authInfo->iProfileId = aLUID;
+    iPrivateApi.OpenL();
+    iPrivateApi.GetDMAuthInfoL( *authInfo );
+    if( aField == EServerNonce )
+        {
+        authInfo->iServerNonce->Des().Delete( 0, authInfo->iServerNonce->Des().Size() );
+        authInfo->iServerNonce->Des().Insert( 0, KNullDesC8 );
+        }
+    else if( aField == EClientNonce )
+        {
+        authInfo->iClientNonce->Des().Delete( 0, authInfo->iClientNonce->Des().Size() );
+        authInfo->iClientNonce->Des().Insert( 0, KNullDesC8 );
+        }
+    else if( aField == EAuthenticationRequired )
+        {
+        authInfo->iAuthPref = 0;
+        }
+    iPrivateApi.SetDMAuthInfoL( *authInfo );
+    iPrivateApi.Close();
+    CleanupStack::PopAndDestroy(authInfo);
+	_DBG_FILE( "CNSmlDMSettingsAdapter12::DeleteDMAuthInfoL(): end" );
+    return KErrNone;
+    }
+
+// -----------------------------------------------------------------------------
+// CNSmlDMSettingsAdapter12::SetProfileAddrTypeL
+// This function sets the AddrType value.    
+// -----------------------------------------------------------------------------
+TInt CNSmlDMSettingsAdapter12::SetProfileAddrTypeL( const TInt aLUID, 
+                                                    const TInt aIntObj )
+    {
+    _DBG_FILE( "CNSmlDMSettingsAdapter12::SetProfileAddrTypeL(): begin" );
+    TInt retVal = OpenSyncSessionAndProfileL( aLUID, ESmlOpenReadWrite );
+    if( retVal != KErrNone )
+		{
+	    iCurrentProfile = 0;
+		iProfile.Close();
+        _DBG_FILE( "CNSmlDMSettingsAdapter12::SetProfileAddrTypeL(): end" );
+        return retVal;	
+		}
+    TInt mediumType = ENone;
+    GetMediumTypeL( aIntObj, mediumType );
+    if( mediumType == ENone )
+        {
+	    iCurrentProfile = 0;
+        iProfile.Close();    
+        return KErrGeneral;
+        }
+    RArray<TSmlTransportId> transportIdArray;
+    CleanupClosePushL( transportIdArray );
+    iProfile.ListConnectionsL( transportIdArray );
+    RSyncMLConnection conn;
+    CleanupClosePushL( conn );
+    conn.OpenL( iProfile, transportIdArray[0] );
+    HBufC8* sURI = conn.ServerURI().AllocLC();
+    if(mediumType!=transportIdArray[0])
+        {
+        if ( !FeatureManager::FeatureSupported( KFeatureIdSyncMlDmObex  ) )
+            {
+            CleanupStack::PopAndDestroy( 3 );//transportIdArray, conn, sURI
+            return EInvalidObject;
+            }
+        else
+            {
+            conn.CreateL(iProfile,mediumType);
+            }
+        }
+    conn.SetServerURIL( *sURI );
+    conn.UpdateL(); 	                    
+    CleanupStack::PopAndDestroy( 3 );//transportIdArray, conn, sURI
+    iCurrentProfile = 0;
+    iProfile.Close();
+    _DBG_FILE( "CNSmlDMSettingsAdapter12::SetProfileAddrTypeL(): end" );
+    return KErrNone;
+    }
+
+// -----------------------------------------------------------------------------
+// CNSmlDMSettingsAdapter12::GetHttpUsernameL
+// This function gets the httpuser value.    
+// -----------------------------------------------------------------------------
+	
+
+TInt CNSmlDMSettingsAdapter12::GetHttpUsernameL( CBufBase& aObject )
+	{
+	
+	  TInt retVal = KErrNone;
+      TBuf8<KBufSize32> key; 
+      TInt intValue;
+      
+      RArray<TSmlTransportId> connIdArray;
+      CleanupClosePushL( connIdArray );
+	  iProfile.ListConnectionsL( connIdArray );
+      if( connIdArray.Count() == 1 )
+        {
+        RSyncMLTransport transport;
+        CleanupClosePushL( transport );
+	    transport.OpenL( iSyncSession, connIdArray[0] );
+    	const CSyncMLTransportPropertiesArray&  arr = transport.Properties();
+		const TSyncMLTransportPropertyInfo& info = arr.At( EPropertyHttpUsed );
+		key = info.iName;
+		RSyncMLConnection conn;
+        CleanupClosePushL( conn );
+	    conn.OpenL( iProfile, connIdArray[0] );
+       	HBufC8* value = conn.GetPropertyL( key ).AllocLC();
+        intValue = GetIntObject( *value );
+        CleanupStack::PopAndDestroy(  ); //value
+        if ( intValue == 1 )
+        	{
+                retVal = KErrNone;
+                const TSyncMLTransportPropertyInfo& info2 = arr.At( EPropertyHttpUserName );
+                key= info2.iName;
+                HBufC8* value = conn.GetPropertyL( key ).AllocLC();
+                aObject.InsertL(aObject.Size(),value->Des());
+                CleanupStack::PopAndDestroy(  ); //value
+                }
+                else
+                    {
+                    retVal = KErrNotFound;
+                    }
+               CleanupStack::PopAndDestroy( 2 ); //  conn, transport
+        }
+        CleanupStack::PopAndDestroy(  ); //connIdArray
+    
+	return retVal;
+	}
+
+// -----------------------------------------------------------------------------
+//  CNSmlDMSettingsAdapter12::GetProfileConnectiontypeL
+//  The function gets the profile medium type.
+// -----------------------------------------------------------------------------
+TInt CNSmlDMSettingsAdapter12::GetProfileConnectiontypeL( TInt& aMediumTYpe )
+	{
+    _DBG_FILE( "CNSmlDMSettingsAdapter12::GetProfileConnectiontypeL(): begin" );
+	RArray<TSmlTransportId> transportIdArray;
+    CleanupClosePushL( transportIdArray );
+	iProfile.ListConnectionsL( transportIdArray );
+	TInt transportItems = transportIdArray.Count();
+    if( transportItems == 0 )
+		{
+		//No matching items
+        CleanupStack::PopAndDestroy(); //transportIdArray	
+		return KErrGeneral;
+		}
+	else if( transportItems > 1 )
+		{
+		//Error case : against specification
+        CleanupStack::PopAndDestroy(); //transportIdArray	
+		return KErrGeneral;
+		}
+	aMediumTYpe = 0;
+    if ( transportIdArray[0] == KUidNSmlMediumTypeInternet.iUid )
+        {
+        aMediumTYpe = 1; //EHttp;
+        }
+    else if ( transportIdArray[0] == KUidNSmlMediumTypeBluetooth.iUid ||
+              transportIdArray[0] == KUidNSmlMediumTypeUSB.iUid ||   
+              transportIdArray[0] == KUidNSmlMediumTypeIrDA.iUid  )
+        {
+        aMediumTYpe = 3; //EObex;
+        }
+    CleanupStack::PopAndDestroy( 1 ); //transportIdArray, SetIntObjectLC
+	return KErrNone;
+	}
+
+// -----------------------------------------------------------------------------
+//  CNSmlDMSettingsAdapter12::GetProfileIAPIdL
+//  The function gets the profile IAP Id.
+// -----------------------------------------------------------------------------
+TInt CNSmlDMSettingsAdapter12::GetProfileIAPIdL( TInt& aIAPid )
+	{
+    _DBG_FILE( "CNSmlDMSettingsAdapter12::GetProfileIAPIdL(): begin" );
+    TInt retVal = KErrGeneral;
+    aIAPid = -1;
+    RArray<TSmlTransportId> connIdArray;
+    CleanupClosePushL( connIdArray );
+    iProfile.ListConnectionsL( connIdArray );
+    if( connIdArray.Count() == 1 )
+        {
+        RSyncMLTransport transport;
+        CleanupClosePushL( transport );
+	    transport.OpenL( iSyncSession, connIdArray[0] );
+	    const CSyncMLTransportPropertiesArray& props = transport.Properties();
+	    TInt index = props.Find( KNSmlIAPId );
+        if( index > 0 )
+            {
+            RSyncMLConnection conn;
+            CleanupClosePushL( conn );
+	        conn.OpenL( iProfile, connIdArray[0] );
+            HBufC8* apId = conn.GetPropertyL( KNSmlIAPId ).AllocLC();
+            aIAPid = GetIntObject( *apId );
+            CleanupStack::PopAndDestroy( 2 ); //conn, apId
+            retVal = KErrNone;
+            }
+        else
+            {
+            retVal = KErrNotFound;
+            }
+        CleanupStack::PopAndDestroy( 1 ); //transport
+	    iCurrentProfile = 0;
+        iProfile.Close();
+        }
+    else
+        {
+        retVal = KErrNotFound;
+        }
+    CleanupStack::PopAndDestroy(); //connIdArray
+    _DBG_FILE( "CNSmlDMSettingsAdapter12::GetProfileIAPIdL(): end" );
+    return retVal;
+    }
+
+// -----------------------------------------------------------------------------
+//  CNSmlDMSettingsAdapter12::GetProfileServerURLL
+//  The function gets the profile Server URI.
+// -----------------------------------------------------------------------------
+void CNSmlDMSettingsAdapter12::GetProfileServerURLL( CBufBase& aURL )
+	{
+    _DBG_FILE( "CNSmlDMSettingsAdapter12::GetProfileServerURLL(): begin" );
+    RArray<TSmlTransportId> transportIdArray;
+    CleanupClosePushL( transportIdArray );
+	iProfile.ListConnectionsL( transportIdArray );
+    if( transportIdArray.Count() > 0 )
+        {
+        RSyncMLConnection profConn;
+        CleanupClosePushL( profConn );
+	    profConn.OpenL( iProfile, transportIdArray[0] );
+	    HBufC8* sURI = profConn.ServerURI().AllocL();
+        CleanupStack::PushL( sURI );
+        TPtr8 uriPtr = sURI->Des();
+        if( uriPtr.Length() > 0 )
+            {
+            aURL.InsertL( aURL.Size(),uriPtr );
+            }
+        else
+            {
+            aURL.InsertL( aURL.Size(), KNullDesC8 );
+            }
+        CleanupStack::PopAndDestroy( 2 );//profConn, sURI
+        }
+    CleanupStack::PopAndDestroy(); //transportIdArray
+    _DBG_FILE( "CNSmlDMSettingsAdapter12::GetProfileServerURLL(): end" );
+    return;
+	}
+
+// -----------------------------------------------------------------------------
+//	CNSmlDMSettingsAdapter12::GetMediumTypeL
+//	Checks the requested medium type.
+// -----------------------------------------------------------------------------
+void CNSmlDMSettingsAdapter12::GetMediumTypeL( const TInt aIntObj, 
+                                            TInt& aMediumType )
+    {
+    _DBG_FILE( "CNSmlDMSettingsAdapter12::GetMediumTypeL(): begin" );
+    if( aIntObj == EHttp || aIntObj == EWsp )
+        {
+        aMediumType = KUidNSmlMediumTypeInternet.iUid;
+        return;
+        }
+    RArray<TSmlTransportId> transportIdArray;
+    CleanupClosePushL( transportIdArray );
+    iSyncSession.ListTransportsL( transportIdArray );
+    
+    if ( transportIdArray.Find( KUidNSmlMediumTypeBluetooth.iUid ) != KErrNotFound )
+        {
+        aMediumType = KUidNSmlMediumTypeBluetooth.iUid;
+        }
+    else if ( transportIdArray.Find( KUidNSmlMediumTypeUSB.iUid ) != KErrNotFound )
+        {
+        aMediumType = KUidNSmlMediumTypeUSB.iUid;
+        }
+    else if ( transportIdArray.Find( KUidNSmlMediumTypeIrDA.iUid ) != KErrNotFound )
+        {
+        aMediumType = KUidNSmlMediumTypeIrDA.iUid;
+        }
+    CleanupStack::PopAndDestroy(); //transportIdArray
+    _DBG_FILE( "CNSmlDMSettingsAdapter12::GetMediumTypeL(): end" );
+    return;    
+    }
+
+// -----------------------------------------------------------------------------
+//	CNSmlDMSettingsAdapter12::GetServerIdL
+//	Gets the server id value.
+// -----------------------------------------------------------------------------
+void CNSmlDMSettingsAdapter12::GetServerIdL( CBufBase& aObject )
+    {
+    _DBG_FILE( "CNSmlDMSettingsAdapter12::GetServerIdL(): begin" );
+    HBufC8* serverId = iProfile.ServerId().AllocL();
+    CleanupStack::PushL( serverId );
+    aObject.InsertL( aObject.Size(), *serverId );
+    CleanupStack::PopAndDestroy( 1 ); //serverId
+    _DBG_FILE( "CNSmlDMSettingsAdapter12::GetServerIdL(): end" );
+    return;
+    }
+
+// -----------------------------------------------------------------------------
+//	CNSmlDMSettingsAdapter12::GetProfileNameL
+//	Gets the display name value.
+// -----------------------------------------------------------------------------
+void CNSmlDMSettingsAdapter12::GetProfileNameL( CBufBase& aObject )
+    {
+    _DBG_FILE( "CNSmlDMSettingsAdapter12::GetProfileNameL(): begin" );
+    HBufC16* dataBuf = iProfile.DisplayName().AllocL();
+    CleanupStack::PushL( dataBuf );
+    TPtr16 ptrDisplayName = dataBuf->Des();
+    HBufC8* dataBuf8 = HBufC8::NewL( ptrDisplayName.Length() * 2 );
+    CleanupStack::PushL( dataBuf8 );
+
+    TPtr8 ptrDisplayName8 = dataBuf8->Des();
+    ptrDisplayName8 = ConvertTo8LC( ptrDisplayName );
+    aObject.InsertL( aObject.Size(), ptrDisplayName8 );
+    CleanupStack::PopAndDestroy( 3 );//dataBuf, ConvertTo8LC
+    _DBG_FILE("CNSmlDMSettingsAdapter12::GetProfileNameL(): end");
+    return;
+    }
+
+// -----------------------------------------------------------------------------
+//	CNSmlDMSettingsAdapter12::GetProfileUserNameL
+//	Gets the profile user name value.
+// -----------------------------------------------------------------------------
+void CNSmlDMSettingsAdapter12::GetProfileUserNameL( CBufBase& aObject )
+    {
+    _DBG_FILE( "CNSmlDMSettingsAdapter12::GetProfileUserNameL(): begin" );
+    HBufC8* dataBuf = iProfile.UserName().AllocL();
+    CleanupStack::PushL( dataBuf );
+    TPtr8 ptrUserName = dataBuf->Des();
+    aObject.InsertL( aObject.Size(), ptrUserName );
+    CleanupStack::PopAndDestroy();//dataBuf
+    _DBG_FILE( "CNSmlDMSettingsAdapter12::GetProfileUserNameL(): end" );
+    return;
+    }
+
+// -----------------------------------------------------------------------------
+//	CNSmlDMSettingsAdapter12::GetProfilePortNumberL
+//	Gets the port number value.
+// -----------------------------------------------------------------------------
+void CNSmlDMSettingsAdapter12::GetProfilePortNumberL( CBufBase& aObject )
+    {
+    _DBG_FILE( "CNSmlDMSettingsAdapter12::GetProfilePortNumberL(): begin" );
+    TInt bSize = aObject.Size();
+    TInt portNum = 0;
+    HBufC8* bufStorage = HBufC8::NewLC( bSize );
+	TPtr8 bufStoragePtr = bufStorage->Des();
+	aObject.Read( 0, bufStoragePtr, aObject.Size() );
+	aObject.Reset();
+	
+    //find out the port number
+    ParseUri( *bufStorage, portNum );
+	aObject.InsertL( aObject.Size(), SetIntObjectLC( portNum ) );
+
+    CleanupStack::PopAndDestroy( 2 ); //bufStorage, SetIntObjectLC()
+    _DBG_FILE( "CNSmlDMSettingsAdapter12::GetProfilePortNumberL(): end" );
+    return;
+    }
+
+// -----------------------------------------------------------------------------
+//  CNSmlDMSettingsAdapter12::SetAuthInfoL
+//  The function checks if authinfo already exits. If exits command is replace.
+// -----------------------------------------------------------------------------
+void CNSmlDMSettingsAdapter12::SetAuthInfoL( const TInt aLUID, 
+                                            const TNSmlDMProfileData aField, 
+                                            const TDesC8& aObject, TInt& aStatus )
+    {
+    _DBG_FILE( "CNSmlDMSettingsAdapter12::SetAuthInfoL(): begin" );
+    
+    CNSmlDMAuthInfo* authInfo = new (ELeave) CNSmlDMAuthInfo();
+    CleanupStack::PushL( authInfo );
+    authInfo->iProfileId = aLUID;
+    
+    iPrivateApi.OpenL();
+    TRAPD( err, iPrivateApi.GetDMAuthInfoL( *authInfo ) );
+    
+    if ( err )
+        {
+        CleanupStack::PopAndDestroy( authInfo );
+        iPrivateApi.Close();
+        aStatus = err;
+        return;
+        }
+    
+    CNSmlDMAuthInfo* newAuthInfo = new (ELeave) CNSmlDMAuthInfo();
+    CleanupStack::PushL( newAuthInfo );
+    newAuthInfo->iProfileId = aLUID;
+
+    if ( aField == EServerNonce )
+        {
+        newAuthInfo->iServerNonce = aObject.Alloc();
+        newAuthInfo->iClientNonce = authInfo->iClientNonce->Des().Alloc();
+        newAuthInfo->iAuthPref = authInfo->iAuthPref;
+        
+        iPrivateApi.SetDMAuthInfoL( *newAuthInfo );
+        }
+    else if ( aField == EClientNonce )
+        {
+        newAuthInfo->iServerNonce = authInfo->iServerNonce->Des().Alloc();
+        newAuthInfo->iClientNonce = aObject.Alloc();
+        newAuthInfo->iAuthPref = authInfo->iAuthPref;
+        
+        iPrivateApi.SetDMAuthInfoL( *newAuthInfo );
+        }
+    else if ( aField == EAuthenticationRequired )
+        {
+        if ( aObject.Match( KNSmlDMAuthPrefNoAuth ) !=  KErrNotFound )
+            {
+            newAuthInfo->iAuthPref = ENoAuth;
+            }
+        else if ( aObject.Match( KNSmlDMAuthPrefBasic ) !=  KErrNotFound )
+            {
+            newAuthInfo->iAuthPref = EBasic;
+            }
+        else if ( aObject.Match( KNSmlDMAuthPrefMD5 ) !=  KErrNotFound )
+            {
+            newAuthInfo->iAuthPref = EMD5;
+            }
+        newAuthInfo->iServerNonce = authInfo->iServerNonce->Des().Alloc();
+        newAuthInfo->iClientNonce = authInfo->iClientNonce->Des().Alloc();
+        
+        iPrivateApi.SetDMAuthInfoL( *newAuthInfo );
+        }
+    
+    CleanupStack::PopAndDestroy( newAuthInfo );
+    CleanupStack::PopAndDestroy( authInfo );
+    
+    iPrivateApi.Close();
+    aStatus = KErrNone;
+    _DBG_FILE( "CNSmlDMSettingsAdapter12::SetAuthInfoL(): end" );
+    return;
+	}
+
+//------------------------------------------------------------------------------
+// CNSmlDMSettingsAdapter12::AddNodeBufferL()
+// Buffers Node Object
+//------------------------------------------------------------------------------
+void CNSmlDMSettingsAdapter12::AddNodeBufferL( const TDesC8& aURI,
+		const TInt aStatusRef)
+	{
+	_DBG_FILE( "CNSmlDMSettingsAdapter12::AddNodeBufferL(): begin" );
+	TInt index = -1;
+
+	for (TInt i = 0; i<iBuffer->Count (); i++)
+		{
+		if ( iBuffer->At(i).iMappingName->Compare (aURI)== 0)
+			{
+			index = i;
+			//CallBack for duplicate
+			_DBG_FILE( "CNSmlDMSettingsAdapter12::AddNodeBufferL(): EAlreadyExists end" );
+			iCallBack->SetStatusL ( aStatusRef, CSmlDmAdapter::EAlreadyExists);
+			break;
+			}
+		}
+
+	if ( index<0)
+		{
+		TNSmlDMBufferElement newNode;
+		newNode.iMappingName = aURI.AllocLC ();
+		newNode.iLeafBuf = new (ELeave) CArrayFixFlat <TNSmlDMLeafElement> (4);
+		newNode.iExecuted = EFalse;
+		newNode.iDMBuffStatusref = aStatusRef;
+		newNode.iAddr = EFalse;
+		newNode.iServerId = EFalse;
+		newNode.iUName = EFalse;
+		newNode.iServerName = EFalse;
+
+		iBuffer->AppendL (newNode);
+		//newNode.iMappingName
+		CleanupStack::Pop ();
+		}
+	_DBG_FILE( "CNSmlDMSettingsAdapter12::AddNodeBufferL(): end" );
+	}
+
+//------------------------------------------------------------------------------
+// CNSmlDMSettingsAdapter12::AddLeafBufferL()
+// Buffers Leaf Obj & checks for Mandatory fields
+//------------------------------------------------------------------------------
+void CNSmlDMSettingsAdapter12::AddLeafBufferL( const TDesC8& aURI,
+		const TDesC8& aObject, const TInt aStatusRef)
+	{
+	_DBG_FILE( "CNSmlDMSettingsAdapter12::AddLeafBufferL(): begin" );
+	TNSmlDMLeafElement newCommand;
+
+	newCommand.iUri = aURI.AllocLC ();
+	newCommand.iData = aObject.AllocLC ();
+	newCommand.iLuid = HBufC8::NewLC (8); //Allocate Mem. for iLUID
+	newCommand.iStatusRef = aStatusRef;
+	//Add Leaf to the index updated by UpdateLeafObj
+	iBuffer->At(iExecutionIndex).iLeafBuf->AppendL (newCommand);
+	// iUri, iData, ILuid
+	CleanupStack::Pop (3);
+	SetField ( aURI);
+	SetURIInProcessL ( aURI);
+	if ( iField->Compare (KNSmlDdfAddr)== 0)
+		{
+		iBuffer->At(iExecutionIndex).iAddr = ETrue;
+		}
+	else
+		if ( iField->Compare (KNSmlDdfServerId)== 0)
+			{
+			if(!IsServerIDExistL(aObject))
+				iBuffer->At(iExecutionIndex).iServerId = ETrue;
+			}
+		else
+			if ( iField->Compare (KNSmlDdfAAuthName)== 0)
+				{
+				//AAuthName under AppAuthCli
+				if ( iURIField->Find (KDmAccAppAuthDyn2)!= KErrNotFound)
+					iBuffer->At(iExecutionIndex).iUName = ETrue;
+				}
+			else
+				if ( iField->Compare (KNSmlDdfName)== 0)
+					{
+					iBuffer->At(iExecutionIndex).iServerName = ETrue;
+					}
+
+	//  If Address,ServerId,ServerName,UserName then Add
+
+	if ( iBuffer->At(iExecutionIndex).iAddr && iBuffer->At(iExecutionIndex).iServerId &&iBuffer->At(iExecutionIndex).iUName && iBuffer->At(iExecutionIndex).iServerName)
+		{
+		ExecuteBufferL ();
+		iExecutionIndex = -1;
+		}
+	_DBG_FILE( "CNSmlDMSettingsAdapter12::AddLeafBufferL(): end" );
+	return;
+	}
+
+//------------------------------------------------------------------------------
+// CNSmlDMSettingsAdapter12::ExecuteBufferL()
+// Adds the Node/Leaf obj to the db
+//------------------------------------------------------------------------------
+void CNSmlDMSettingsAdapter12::ExecuteBufferL()
+	{
+	_DBG_FILE( "CNSmlDMSettingsAdapter12::ExecuteBufferL(): begin" );
+	TBuf8<8> newLUID;
+	TInt rValue;
+	//Buffer is being Executed
+	iBufOn = ETrue;
+
+	// Robustness check for Execution Index
+	if ( iExecutionIndex<0)
+		{
+		return;
+		}
+
+	//Execute BufferL is called from CompleteOutstandingCmdsL only when -
+	//mandatory fields are not set. Dont update Node/Leaf to the db, return a failure
+
+	if ( !iComplete)
+		rValue = CreateNewProfileL (iLUID);
+	else
+		rValue = CSmlDmAdapter::EError;
+
+	iBuffer->At(iExecutionIndex).iExecuted = ETrue;
+
+	if ( rValue != KErrNone)
+		{
+		if ( rValue == KErrNoMemory)
+			{
+			iCallBack->SetStatusL ( iBuffer->At(iExecutionIndex).iDMBuffStatusref, CSmlDmAdapter::ENoMemory);
+			}
+		else
+			if ( rValue == KErrNotSupported)
+				{
+				iCallBack->SetStatusL ( iBuffer->At(iExecutionIndex).iDMBuffStatusref,
+						CSmlDmAdapter::EInvalidObject);
+				}
+			else
+				if ( rValue == KErrInUse)
+					{
+					iCallBack->SetStatusL ( iBuffer->At(iExecutionIndex).iDMBuffStatusref,
+							CSmlDmAdapter::EObjectInUse);
+					}
+				else
+					if ( rValue == KErrDiskFull)
+						{
+						iCallBack->SetStatusL ( iBuffer->At(iExecutionIndex).iDMBuffStatusref,
+								CSmlDmAdapter::EDiskFull);
+						}
+					else
+						{
+						iCallBack->SetStatusL ( iBuffer->At(iExecutionIndex).iDMBuffStatusref,
+								CSmlDmAdapter::EError);
+						}
+		// dont return, UpdateLeafObjectL will update the callback status for leaf Nodes 
+		}
+	else
+		{
+		if ( iLUID >= KMaxDataSyncID)
+			{
+			newLUID.Num ( iLUID - KMaxDataSyncID);
+			}
+		else
+			{
+			newLUID.Num ( iLUID);
+			}
+
+		iCallBack->SetMappingL ( *iBuffer->At(iExecutionIndex).iMappingName, newLUID);
+
+		iCallBack->SetStatusL (iBuffer->At(iExecutionIndex).iDMBuffStatusref, CSmlDmAdapter::EOk);
+		}
+
+	for (TInt val= 0; val < iBuffer->At(iExecutionIndex).iLeafBuf->Count ();val++)
+		{
+		//Update the LUID data in the Leaf structure with the Profile LUID before calling UpdateLeafObj
+		TPtr8 tempLUID(iBuffer->At(iExecutionIndex).iLeafBuf->At(val).iLuid->Des ());
+		tempLUID.Append (newLUID);
+		UpdateLeafObjectL (*iBuffer->At(iExecutionIndex).iLeafBuf->At(val).iUri, *iBuffer->At(iExecutionIndex).iLeafBuf->At(val).iLuid, *iBuffer->At(iExecutionIndex).iLeafBuf->At(val).iData, *iBuffer->At(iExecutionIndex).iMappingName, iBuffer->At(iExecutionIndex).iLeafBuf->At(val).iStatusRef);
+
+		}
+
+	// Delete the dynamically allocated buffers (Node/Leaf obj)
+
+	ClearBuffer ( iBuffer->At(iExecutionIndex).iLeafBuf);
+
+	delete iBuffer->At(iExecutionIndex).iLeafBuf;
+
+	if ( iBuffer->At(iExecutionIndex).iMappingName)
+		{
+		delete iBuffer->At(iExecutionIndex).iMappingName;
+		iBuffer->At(iExecutionIndex).iMappingName = NULL;
+		}
+
+	iBuffer->Delete (iExecutionIndex);
+	iBuffer->Compress ();
+	//Buffer Execution Complete
+	iBufOn = EFalse;
+    _DBG_FILE( "CNSmlDMSettingsAdapter12::ExecuteBufferL(): end" );
+	}
+
+//------------------------------------------------------------------------------
+// TPtrC8 CNSmlDMSettingsAdapter12::ParentURI(const TDesC8& aURI)
+// returns parent uri 
+// Searches till the 2nd "/" is reached
+//------------------------------------------------------------------------------
+TPtrC8 CNSmlDMSettingsAdapter12::ParentURI(const TDesC8& aURI)
+	{
+	_DBG_FILE( "CNSmlDMSettingsAdapter12::ParentURI(): begin" );
+	TInt count;
+	TInt flag = 0;
+	for (count=0; count<=aURI.Length ()-1;count++)
+		{
+
+		if ( aURI[count]=='/')
+			{
+			flag++;
+			if ( flag == KDynNodePosn)   // KDynNodePosn =2 --> DMAcc/DMIDxxx
+				break;
+			}
+		}
+        _DBG_FILE( "CNSmlDMSettingsAdapter12::ParentURI(): end" ); 
+	return aURI.Left (count);
+	}
+
+//-----------------------------------------------------------------------------------------    
+// Clears the elements of the passed in LeafElement Structure
+//-----------------------------------------------------------------------------------------
+void CNSmlDMSettingsAdapter12::ClearBuffer(
+		CArrayFixFlat<TNSmlDMLeafElement>* aBuffer)
+	{
+	_DBG_FILE( "CNSmlDMSettingsAdapter12::ClearBuffer(): begin" );
+	for (TInt i = 0; i < aBuffer->Count (); i++)
+		{
+		delete aBuffer->At(i).iUri;
+		aBuffer->At(i).iUri = NULL;
+
+		delete aBuffer->At(i).iData;
+		aBuffer->At(i).iData = NULL;
+
+		delete aBuffer->At(i).iLuid;
+		aBuffer->At(i).iLuid = NULL;
+		}
+
+	aBuffer->Reset ();
+	_DBG_FILE( "CNSmlDMSettingsAdapter12::ClearBuffer(): end" );
+	}
+
+//--------------------------------------------------------------------
+//TInt CNSmlDMSettingsAdapter::IsDMAccUriFormatMatchPredefined(const TDesC8 & aURI)
+//
+//-------------------------------------------------------------------
+
+
+TBool CNSmlDMSettingsAdapter12::IsDMAccUriFormatMatchPredefined(const TDesC8 & aURI)
+{
+	
+	// include strings for  tree for Bearer , DNS related Dynamic nodes . 
+	
+	if(aURI.Match(_L8("DMAcc/DMId*"))   != KErrNotFound )
+	{
+		return ETrue;
+	}
+	else
+	{
+		return EFalse;
+	}
+	
+	
+}
+
+//--------------------------------------------------------------------
+//TInt CNSmlDMSettingsAdapter::ConstructTreeL(const TDesC8& aURI)
+//
+//-------------------------------------------------------------------
+
+TInt CNSmlDMSettingsAdapter12::ConstructTreeL(const TDesC8& aURI)
+{
+		TInt profileID = KErrNotFound;
+		_LIT8( KNSmlDMIdZero,			"DMAcc/DMId000" );
+		TBuf8<20> zeroURI; // DMAcc/DMIdnnn , nnn = profileid
+		zeroURI.Append( KNSmlDMIdZero );
+		HBufC8* ismapInfo = iCallBack->GetLuidAllocL(zeroURI);
+		if (ismapInfo->Length() != 0) // Tree is already constructrd, no need to proceed.
+		{
+			delete ismapInfo;
+			return profileID;
+		}
+	  if( iSyncSessionOpen == EFalse )
+    {
+    	iSyncSession.OpenL();
+      iSyncSessionOpen = ETrue;
+    }
+    RArray<TSmlProfileId> profileIdArray;
+    CleanupClosePushL( profileIdArray );
+    TSmlUsageType usageType = ESmlDevMan;
+    iSyncSession.ListProfilesL( profileIdArray, usageType );
+	   
+    for( TInt p = 0; p < profileIdArray.Count(); p++ )
+		{
+      TInt ddId = profileIdArray[p] - KMaxDataSyncID;
+           
+		  _LIT8( Kprev, "DMId" );
+		  TBuf8<7> addNAME(Kprev); // DMIdnnn , nnn = profileid
+      TInt fixedProfId = profileIdArray[p] - KMaxDataSyncID; //fit to 3 decimal
+		  addNAME.AppendNumFixedWidth( fixedProfId, EDecimal, 3 ); 
+   		DBG_ARGS8( _S8("notInList: Id = %d Name %S"), p, &addNAME );
+		  // KNSmlDMStart includes start text for URISeg
+			TBuf8<20> addURI; // DMAcc/DMIdnnn , nnn = profileid
+			addURI.Append( KNSmlDMStart );
+			addURI.AppendNumFixedWidth( fixedProfId, EDecimal, 3 ); 
+			TBuf8<3> addLUID;
+	    addLUID.Num( fixedProfId );
+
+			HBufC8* mapInfo = iCallBack->GetLuidAllocL(addURI);
+					
+			if (mapInfo->Length() == 0)
+			{
+				iCallBack->SetMappingL(addURI,addLUID);
+				if( aURI.Find(addURI) >= 0 )
+        { 
+         	profileID = fixedProfId;
+        }
+			}
+			else
+			{
+				delete mapInfo;
+			}
+ 		}
+	    	
+    CleanupStack::PopAndDestroy( 1 );//profileIdArray
+    return profileID;
+}
+
+// ========================== OTHER EXPORTED FUNCTIONS =========================
+
+#ifndef IMPLEMENTATION_PROXY_ENTRY
+#define IMPLEMENTATION_PROXY_ENTRY(aUid, aFuncPtr)	{{aUid},(aFuncPtr)}
+#endif
+
+const TImplementationProxy ImplementationTable[] = 
+    {
+		IMPLEMENTATION_PROXY_ENTRY( KNSmlDMSettingsAdapterImplUid, CNSmlDMSettingsAdapter12::NewL )
+    };
+
+
+// -----------------------------------------------------------------------------
+// TImplementationProxy* ImplementationGroupProxy()
+// -----------------------------------------------------------------------------
+EXPORT_C const TImplementationProxy* ImplementationGroupProxy( TInt& aTableCount )
+    {
+	_DBG_FILE( "ImplementationGroupProxy() for CNSmlDMSettingsAdapter: begin" );
+
+    aTableCount = sizeof(ImplementationTable) / sizeof(TImplementationProxy);
+
+	_DBG_FILE( "ImplementationGroupProxy() for CNSmlDMSettingsAdapter: end" );
+    return ImplementationTable;
+	}
+
+//------------------------------------------------------------------------------
+// TPtrC8 CNSmlDMSettingsAdapter12::GetDynamicDMNodeUri( const TDesC8& aURI )
+// returns DM/xxx URI
+//------------------------------------------------------------------------------
+TPtrC8 CNSmlDMSettingsAdapter12::GetDynamicDMNodeUri(const TDesC8& aURI)
+    {    
+    TInt i= 0;
+	TBuf8<50> DmAccRoot(KNSmlDefDMAcc);
+    for ( i = aURI.Find( KNSmlDefDMAcc ) + DmAccRoot.Length() + 1; i < aURI.Length(); i++ )
+        {
+        if( aURI[i] == '/' )
+            {
+            break;
+            }
+        }
+    
+    return aURI.Left( i );
+    }
+// End of File
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/adapters/syncmldm12/src/nsmldmsettingsadapter12.rss	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,48 @@
+CHARACTER_SET UTF8/*
+* 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:    Resource data for Device Management Settings Adapter
+*
+*/
+
+
+
+
+
+#include <registryinfo.rh>
+#include "nsmldmconstants.h"
+
+RESOURCE REGISTRY_INFO theRegistryInfo
+  {
+  dll_uid = 0x10282CE7; //The DLL's 3rd UID.
+  interfaces = 
+      {
+      INTERFACE_INFO
+          {
+          interface_uid = KNSmlDMInterfaceUid; // DM interface UID
+          implementations = 
+            {
+            IMPLEMENTATION_INFO
+                {
+                implementation_uid = 0x10282CE8; // DM interface implementation UID
+                version_no = 1; 
+                display_name = "";
+                default_data = "";
+                opaque_data = "";
+                }
+            };
+          }
+      };
+    }
+
+// End of File
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/adapters/syncmldm12/tsrc/bwins/syncmldm12testu.def	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,3 @@
+EXPORTS
+	?LibEntryL@@YAPAVCScriptBase@@AAVCTestModuleIf@@@Z @ 1 NONAME ; class CScriptBase * LibEntryL(class CTestModuleIf &)
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/adapters/syncmldm12/tsrc/conf/syncmldm12test.cfg	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,125 @@
+[Test]
+title DDF
+create syncmldm12test foobar jee
+foobar DDFStructure
+delete foobar
+[Endtest] 
+
+[Test]
+title StartAtomic
+create syncmldm12test foobar
+foobar StartAtomic
+delete foobar
+[Endtest]
+
+[Test]
+title CommitAtomic
+create syncmldm12test foobar
+foobar CommitAtomic
+delete foobar
+[Endtest]
+
+[Test]
+title RollbackAtomic
+create syncmldm12test foobar
+foobar RollbackAtomic
+delete foobar
+[Endtest]
+
+[Test]
+title AddDmAcc
+create syncmldm12test foobar
+foobar AddNode DMAcc/DMId099
+foobar UpdateLeaf DMAcc/DMId099/Name name99
+foobar UpdateLeaf DMAcc/DMId099/ServerID server99
+foobar UpdateLeaf DMAcc/DMId099/AppAddr/Addr001/Addr http://a.com
+foobar UpdateLeaf DMAcc/DMId099/AppAuth/AppAuthCli/AAuthName user99
+foobar CompleteCommands
+delete foobar
+[Endtest]
+
+[Test]
+title UpdateLeafDmAcc
+create syncmldm12test foobar
+foobar UpdateLeaf DMAcc/DMId099/Name newname99
+delete foobar
+[Endtest]
+
+[Test]
+title FetchNodeDmAcc
+create syncmldm12test foobar
+foobar FetchNode DMAcc/DMId099
+delete foobar
+[Endtest]
+
+[Test]
+title FetchLeafDmAcc
+create syncmldm12test foobar
+foobar FetchLeaf DMAcc/DMId099/Name
+delete foobar
+[Endtest]
+
+[Test]
+title DeleteDmAcc
+create syncmldm12test foobar
+foobar DeleteNode DMAcc/DMId099
+delete foobar
+[Endtest]
+
+[Test]
+title AddDmAccAllInfo
+create syncmldm12test foobar
+foobar AddNode DMAcc/DMId090  	 
+foobar AddNode DMAcc/DMId090/AAuthPref 	 
+foobar AddNode DMAcc/DMId090/AppAddr 	 
+foobar AddNode DMAcc/DMId090/AppAddr/Addr001 	 
+foobar UpdateLeaf DMAcc/DMId090/AppAddr/Addr001/Addr 	https://b.com/abc
+foobar UpdateLeaf DMAcc/DMId090/AppAddr/Addr001/AddrType 	URI
+foobar AddNode DMAcc/DMId090/AppAddr/Addr001/Port 	 
+foobar AddNode DMAcc/DMId090/AppAddr/Addr001/Port/Port001 	 
+foobar UpdateLeaf DMAcc/DMId090/AppAddr/Addr001/Port/Port001/PortNbr 	443
+foobar AddNode DMAcc/DMId090/AppAuth 	 
+foobar AddNode DMAcc/DMId090/AppAuth/AppAuthCli 	 
+foobar AddNode DMAcc/DMId090/AppAuth/AppAuthCli/AAuthData 	 
+foobar UpdateLeaf DMAcc/DMId090/AppAuth/AppAuthCli/AAuthLevel 	CLCRED
+foobar UpdateLeaf DMAcc/DMId090/AppAuth/AppAuthCli/AAuthName 	userx
+foobar AddNode DMAcc/DMId090/AppAuth/AppAuthSrv 	 
+foobar AddNode DMAcc/DMId090/AppAuth/AppAuthSrv/AAuthData 	 
+foobar UpdateLeaf DMAcc/DMId090/AppAuth/AppAuthSrv/AAuthLevel 	SRVCRED
+foobar UpdateLeaf DMAcc/DMId090/AppAuth/AppAuthSrv/AAuthName 	userx
+foobar AddNode DMAcc/DMId090/AppAuth/AppAuthTransport 	 
+foobar AddNode DMAcc/DMId090/AppAuth/AppAuthTransport/AAuthData 	 
+foobar UpdateLeaf DMAcc/DMId090/AppAuth/AppAuthTransport/AAuthLevel 	HTTP
+foobar UpdateLeaf DMAcc/DMId090/AppAuth/AppAuthTransport/AAuthName 		user
+foobar UpdateLeaf DMAcc/DMId090/AppID 	w7
+foobar UpdateLeaf DMAcc/DMId090/Name 	InteliSync
+foobar UpdateLeaf DMAcc/DMId090/PrefConRef 	AP/APId000 
+foobar UpdateLeaf DMAcc/DMId090/ServerID 	userx
+foobar CompleteCommands
+delete foobar
+[Endtest]
+
+[Test]
+title FetchAllLeafDmAcc
+create syncmldm12test foobarfoobar FetchLeaf DMAcc/DMId090/AppAddr/Addr001/Addr
+foobar FetchLeaf DMAcc/DMId090/AppAddr/Addr001/AddrType
+foobar FetchLeaf DMAcc/DMId090/AppAddr/Addr001/Port/Port001/PortNbr
+foobar FetchLeaf DMAcc/DMId090/AppAuth/AppAuthCli/AAuthLevel
+foobar FetchLeaf DMAcc/DMId090/AppAuth/AppAuthCli/AAuthName 
+foobar FetchLeaf DMAcc/DMId090/AppAuth/AppAuthSrv/AAuthLevel
+foobar FetchLeaf DMAcc/DMId090/AppAuth/AppAuthSrv/AAuthName 
+foobar FetchLeaf DMAcc/DMId090/AppAuth/AppAuthTransport/AAuthLevel 
+foobar FetchLeaf DMAcc/DMId090/AppAuth/AppAuthTransport/AAuthName 
+foobar FetchLeaf DMAcc/DMId090/AppID 
+foobar FetchLeaf DMAcc/DMId090/Name 
+foobar FetchLeaf DMAcc/DMId090/PrefConRef 
+foobar FetchLeaf DMAcc/DMId090/ServerID 
+delete foobar
+[Endtest]
+
+[Test]
+title DeleteDmAcc
+create syncmldm12test foobar
+foobar DeleteNode DMAcc/DMId090
+delete foobar
+[Endtest]
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/adapters/syncmldm12/tsrc/eabi/syncmldm12testu.def	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,9 @@
+EXPORTS
+	_Z9LibEntryLR13CTestModuleIf @ 1 NONAME
+	_ZTI15Csyncmldm12Test @ 2 NONAME ; #<TI>#
+	_ZTI16CTestDmDDFObject @ 3 NONAME ; #<TI>#
+	_ZTI8Cdmatest @ 4 NONAME ; #<TI>#
+	_ZTV15Csyncmldm12Test @ 5 NONAME ; #<VT>#
+	_ZTV16CTestDmDDFObject @ 6 NONAME ; #<VT>#
+	_ZTV8Cdmatest @ 7 NONAME ; #<VT>#
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/adapters/syncmldm12/tsrc/group/bld.inf	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,55 @@
+/*
+* Copyright (c) 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:  Implementation of DM adapter test component
+* 	This is part of omadmextensions/adapter test application.
+*
+*/
+
+
+
+
+
+
+PRJ_PLATFORMS
+// specify the platforms your component needs to be built for here
+// defaults to WINS MARM so you can ignore this if you just build these
+DEFAULT
+
+PRJ_TESTEXPORTS
+// NOTE: If using ARS requirements all export operations should be done under this.
+// 'abld test export'
+
+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
+// Example: 
+
+
+PRJ_TESTMMPFILES
+// NOTE: If using ARS requirements .mmp file operation should be done under this.
+// 'abld test build'
+syncmldm12test.mmp
+
+PRJ_MMPFILES
+// Specify the .mmp files required for building the important component
+// releasables.
+//
+// Specify "tidy" if the component you need to build doesn't need to be
+// released. Specify "ignore" if the MMP file exists but should be
+// ignored.
+// Example:
+
+//  End of File
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/adapters/syncmldm12/tsrc/group/syncmldm12test.mmp	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,65 @@
+/*
+* Copyright (c) 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:  Implementation of DM adapter test component
+* 	This is part of omadmextensions/adapter test application.
+*
+*/
+
+
+
+
+#include <platform_paths.hrh>
+
+TARGET          syncmldm12test.dll
+TARGETTYPE      dll
+UID             0x1000008D 0x101FB3E3
+
+CAPABILITY	ALL -TCB
+/* Remove comments and replace 0x00000000 with correct vendor id */
+// VENDORID 	0x00000000
+
+//TARGETPATH      ?target_path
+DEFFILE         syncmldm12test.def
+
+SOURCEPATH      ../src
+SOURCE          dmatest.cpp
+SOURCE          TestDmDDFObject.cpp
+SOURCE          syncmldm12test.cpp
+SOURCE          syncmldm12testBlocks.cpp
+
+
+USERINCLUDE     ../inc 
+USERINCLUDE		  ../../inc
+
+APP_LAYER_SYSTEMINCLUDE
+SYSTEMINCLUDE   /epoc32/include/ecom
+
+
+ 
+
+LIBRARY         apgrfx.lib apmime.lib
+LIBRARY         euser.lib ecom.lib
+LIBRARY         stiftestinterface.lib
+LIBRARY         stiftestengine.lib
+LIBRARY         efsrv.lib
+LIBRARY         estor.lib 
+LIBRARY         SWInstCli.lib
+
+LANG			SC
+
+
+
+SMPSAFE
+// End of File
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/adapters/syncmldm12/tsrc/group/syncmldm12test.pkg	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,38 @@
+;
+; Copyright (c) 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:  Implementation of DM adapter test component
+; 	This is part of omadmextensions/adapter test application.
+;
+
+;*Languages
+&EN
+;
+;*Standard SIS file header. This section specifies the package name,
+;application UID, and version/build numbers. Add the package TYPE here if needed.
+#{"syncmldm12test"},(0x101FB3E8),1,0,1;
+;
+
+;*Unique (Non-Localised) Vendor name
+;This is used in combination with signing to prevent the unauthroized
+;upgrade ofa a package by someone other than the rightful vendor.
+:"Nokia"
+
+;*Localized Vendor Name
+;This specifies the localised vendor name(s) correspodning to language(s).
+%{"Nokia Test EN"}
+
+;*Files To Copy...<src> <destination>
+"\epoc32\release\armv5\urel\syncmldm12test.dll" -"C:\sys\bin\syncmldm12test.dll"
+"..\conf\syncmldm12test.cfg"-"C:\TestFramework\syncmldm12test.cfg"
+"..\init\syncmldm12test.ini"-"C:\TestFramework\syncmldm12test.ini"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/adapters/syncmldm12/tsrc/inc/TestDmDDFObject.h	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,203 @@
+/*
+* Copyright (c) 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:  Implementation of DM adapter test component
+* 	This is part of omadmextensions/adapter test application.
+*
+*/
+
+
+
+
+
+
+#ifndef __TESTDMDDFOBJECT_H
+#define __TESTDMDDFOBJECT_H
+
+//  INCLUDES
+//#include <?include_file>
+#include <smldmadapter.h>
+
+// CONSTANTS
+//const ?type ?constant_var = ?constant;
+
+// MACROS
+//#define ?macro ?macro_def
+
+// DATA TYPES
+//enum ?declaration
+//typedef ?declaration
+//extern ?data_type;
+
+// FUNCTION PROTOTYPES
+//?type ?function_name(?arg_list);
+
+// FORWARD DECLARATIONS
+class CStifLogger;
+
+// CLASS DECLARATION
+
+/**
+*  ?one_line_short_description.
+*  ?other_description_lines
+*
+*  @lib ?library
+*  @since Series ?XX ?SeriesXX_version
+*/
+class CTestDmDDFObject : public CBase, public MSmlDmDDFObject
+    {
+    public:  // Constructors and destructor
+        
+        /**
+        * Two-phased constructor.
+        */
+        static CTestDmDDFObject* NewL( CStifLogger *aLog );
+        static CTestDmDDFObject* NewLC( CStifLogger *aLog );
+        
+        /**
+        * Destructor.
+        */
+        virtual ~CTestDmDDFObject();
+
+    public: // New functions
+        
+        /**
+        * ?member_description.
+        * @since Series ?XX ?SeriesXX_version
+        * @param ?arg1 ?description
+        * @return ?description
+        */
+        //?type ?member_function( ?type ?arg1 );
+
+		virtual void SetNameL( const TDesC8& aName );
+		
+		void DumpL( const TDesC8& aParentName, TBool aFullDump = ETrue );
+		void ExternalizeL(RWriteStream& aStream) const;
+		
+		
+
+    public: // Functions from base classes
+    
+//sf-    *********************************
+    
+		void SetAccessTypesL( TSmlDmAccessTypes aAccessTypes );
+		void SetDefaultValueL( const TDesC8& aDefaultValue );
+		void SetDescriptionL( const TDesC8& aDescription );
+		void SetDFFormatL( TDFFormat aFormat );
+		void SetOccurenceL( TOccurence aOccurence );
+		void SetScopeL( TScope aScope );
+		void SetDFTitleL( const TDesC8& aTitle );
+		void AddDFTypeMimeTypeL( const TDesC8& aMimeType );
+		void SetAsObjectGroup();
+		MSmlDmDDFObject& AddChildObjectL(const TDesC8& aNodeName);
+		MSmlDmDDFObject& AddChildObjectGroupL();
+
+//sf-    #############################
+
+		const TDesC8& Name();
+		TSmlDmAccessTypes  AccessTypes();
+		const TDesC8& DefaultValue();
+		const TDesC8& Description();
+		TDFFormat DFFormat();
+		TOccurence Occurence();
+		TScope Scope();
+		const TDesC8& DFTitle();
+		const TDesC8& DFTypeMimeType();
+		TBool ObjectGroup();
+		
+		TInt ChildObjectCount();
+		CTestDmDDFObject& ChildObject( TInt aIndex );
+
+		CTestDmDDFObject* FindChildObject( const TDesC8& aName );
+		TInt SubObjectsCount();
+
+
+    protected:  // New functions
+        
+        /**
+        * ?member_description.
+        * @since Series ?XX ?SeriesXX_version
+        * @param ?arg1 ?description
+        * @return ?description
+        */
+        //?type ?member_function( ?type ?arg1 );
+
+    protected:  // Functions from base classes
+        
+        /**
+        * From ?base_class ?member_description
+        */
+        //?type ?member_function();
+
+    private:
+
+        /**
+        * C++ default constructor.
+        */
+        CTestDmDDFObject( CStifLogger *aLog );
+
+        /**
+        * By default Symbian 2nd phase constructor is private.
+        */
+        void ConstructL();
+
+        // Prohibit copy constructor if not deriving from CBase.
+        // CTestDmDDFObject( const CTestDmDDFObject& );
+        // Prohibit assigment operator if not deriving from CBase.
+        // CTestDmDDFObject& operator=( const CTestDmDDFObject& );
+
+    public:     // Data
+        // ?one_line_short_description_of_data
+        //?data_declaration;
+    
+    protected:  // Data
+        // ?one_line_short_description_of_data
+        //?data_declaration;
+
+    private:    // Data
+        // ?one_line_short_description_of_data
+        //?data_declaration;
+		HBufC8* iName;
+
+		TSmlDmAccessTypes iAccessTypes;
+		HBufC8* iDefaultValue;
+		HBufC8* iDescription;
+		TDFFormat iFormat;
+		TOccurence iOccurence;
+		TScope iScope;
+		HBufC8* iTitle;
+		HBufC8* iMimeType;
+		TBool iObjectGroup;
+		
+		RPointerArray<CTestDmDDFObject> iChildren;
+
+         
+        // Reserved pointer for future extension
+        //TAny* iReserved;
+
+    public:     // Friend classes
+        //?friend_class_declaration;
+    protected:  // Friend classes
+        //?friend_class_declaration;
+    private:    // Friend classes
+        //?friend_class_declaration;
+        /**
+        * Logger.
+        */
+        CStifLogger*    iLog;
+
+    };
+
+#endif      // __TESTDMDDFOBJECT_H
+            
+// End of File
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/adapters/syncmldm12/tsrc/inc/dmatest.h	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,277 @@
+/*
+* Copyright (c) 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:  Implementation of DM adapter test component
+* 	This is part of omadmextensions/adapter test application.
+*
+*/
+
+
+
+
+
+
+#ifndef __DMA_TEST_H__
+#define __DMA_TEST_H__
+
+//  INCLUDES
+#include <StifLogger.h>
+#include <TestScripterInternal.h>
+#include <StifTestModule.h>
+#include <apmstd.h>
+#include <smldmadapter.h>
+#include "NSmlDMSettingsAdapter12.h"
+
+class Cdmatest;
+
+
+struct TMapping
+	{
+	TBuf8<256> iURI;
+	TBuf8<64> iLuid;
+	TMapping( const TDesC8 &aURI, const TDesC8 &aLuid )  : iURI( aURI ), iLuid( aLuid )
+	{
+		
+		}
+	};
+	
+typedef RArray<TMapping> RMappingArray;
+
+typedef void (Cdmatest::* ResultsFunction)( TInt , CBufBase& , const TDesC8&  ) ; 
+
+
+// CLASS DECLARATION
+
+/**
+*  ?one_line_short_description.
+*  ?other_description_lines
+*
+*  @lib ?library
+*  @since Series ?XX ?SeriesXX_version
+*/
+class Cdmatest : public CScriptBase, public MSmlDmCallback
+    {
+    
+    public:  // Constructors and destructor
+        
+        /**
+        * Destructor.
+        */
+        virtual ~Cdmatest();
+
+    public: // Functions from base classes
+
+        /**
+        * From CScriptBase Runs a script line.
+        * @since ?Series60_version
+        * @param aItem Script line containing method name and parameters
+        * @return Symbian OS error code
+        */
+        virtual TInt RunMethodL( CStifItemParser& aItem ) = 0;
+    
+
+	public:
+		/**
+		The function is used to return the data in case of FetchLeafObjectL(),
+		FetchLeafObjectSizeL() and ChildURIListL() functions. It should not be
+		called where the DM command has failed, i.e. the error code returned in
+		SetStatusL is something other than EOk.
+		@param aResultsRef	Reference to correct command
+		@param aObject		The data which should be returned
+		@param aType			MIME type of the object
+		@publishedPartner
+		@prototype
+		*/
+		void SetResultsL( TInt aResultsRef, CBufBase& aObject,
+								  const TDesC8& aType );
+		
+		/**
+		The function is used to return the data in case of FetchLeafObjectL() and
+		ChildURIListL() functions, where the size of the data being returned is
+		large enough for the Adapter to stream it. This function should not be
+		called when command was failed, i.e. the error code returned in SetStatusL
+		is something other than EOk.
+		@param aResultsRef	Reference to correct command
+		@param aStream		Large data which should be returned, DM engine
+								closes stream when it has read all the data
+		@param aType			MIME type of the object
+		@publishedPartner
+		@prototype
+		*/
+		void SetResultsL( TInt /*aResultsRef*/, RReadStream*& /*aStream*/,
+								  const TDesC8& /*aType*/ ) 
+		{
+			
+		}
+
+		/**
+		The function returns information about the Add,Update,Delete and Fetch
+		commands success to DM engine. The reference to correct command must be
+		used when calling the SetStatusL function, the reference is got from the
+		argument of the command functions. The SetStatusL function must be called
+		separately for every single command.
+		@param aStatusRef	Reference to correct command
+		@param aErrorCode	Information about the command success
+		@publishedPartner
+		@prototype
+		*/
+		void SetStatusL( TInt aStatusRef,
+								 MSmlDmAdapter::TError aErrorCode ) ;
+
+		/**
+		The function passes map information to DM Module. This function is called
+		for a new management object, both for node objects and for leaf objects.
+		In addition if ChildURIListL() function has returned new objects a mapping
+		information of the new objects must be passed. A mapping is treated as
+		inheritable. If the mapping is not set with this function, the mapping
+		LUID of the parent object is passed in following commands to the object.
+		@param aURI	URI of the object. 
+		@param aLUID	LUID of the object. LUID must contain the all information,
+						which is needed for retrieve the invidual object from the
+						database. Typically it is ID for the database table. In
+						more complicated structures it can be combination of IDs,
+						which represent path to the object.
+		@publishedPartner
+		@prototype
+		*/
+		void SetMappingL( const TDesC8& aURI, const TDesC8& aLUID );
+
+		/**
+		The function is used to make a fetch to other adapters. The most common
+		use is to make a fetch to the AP adapter, because when managing the access
+		points, the data comes as URI. For example, there are ToNAPId field in
+		some adapters, and data to it can be something like AP/IAPidx, and then
+		the link to AP adapter is needed.
+		Using FetchLinkL causes the DM Framework to make a Get request to the
+		appropriate DM adapter.  The receiving adapter MUST complete the Get
+		request synchronously.
+		@param aURI		URI of the object. 
+		@param aData		Reference to data, i.e. data is returned here
+		@param aStatus	The status of fetch command is returned here
+		@publishedPartner
+		@prototype
+		*/
+		void FetchLinkL( const TDesC8& /*aURI*/, CBufBase& /*aData*/,
+								 MSmlDmAdapter::TError& /*aStatus*/ ) 
+			{
+				
+			}
+
+		/**
+		The function returns the LUID which is mapped to aURI. If LUID is not
+		found, the function allocates a null length string, i.e. the function
+		allocates memory in every case.
+		@param aURI	URI of the object. 
+		@publishedPartner
+		@prototype
+		*/
+		HBufC8* GetLuidAllocL( const TDesC8& aURI ) ;
+
+#ifdef __TARM_SYMBIAN_CONVERGENCY
+    
+    void GetMappingInfoListL( const TDesC8& aURI,
+								CArrayFix<TSmlDmMappingInfo>& aSegmentList );
+
+#else
+// nothing
+#endif
+		        
+    protected:  // New functions
+
+        
+		void FetchNodeResultsL( TInt aResultsRef, CBufBase& aObject,
+							  const TDesC8& aType );
+		void SaveDataL( TInt aResultsRef, CBufBase& aObject,
+							  const TDesC8& aType ) ;
+							  
+		TPtrC8 LastURISeg( const TDesC8& aURI );
+		TPtrC8 RemoveLastURISeg( const TDesC8& aURI );
+		TPtrC RemoveLastURISeg( const TDesC& aURI );
+		void SetURIL( const TDesC& aURI );
+		void SetURIL( const TDesC8& aURI );
+		void SetURIL( HBufC8* aURI );		
+		HBufC8 *LoadFileLC( const TDesC &aFileName, TDataType &aType );
+		HBufC8 *LoadFileLC( const TDesC8 &aFileName, TDataType &aType );
+		HBufC8 *GetNextStringLC ( CStifItemParser& aItem, const TDesC &aName );
+		HBufC8* GetLuidAllocLC( const TDesC8& aURI ) ;
+		TPtrC8 RemoveLastSeg(const TDesC8& aURI);
+		
+		TInt FetchNodeL( CStifItemParser& aItem ) ;
+		TInt FetchLeafL( CStifItemParser& aItem ) ;
+		TInt AddNodeL( CStifItemParser& aItem );
+		TInt DeleteObjectL( CStifItemParser& aItem );	
+		TInt UpdateLeafL( CStifItemParser& aItem )	;
+		TInt UpdateLeafDataL( CStifItemParser& aItem ) ;
+		TInt UpdateLeafDataURLL( CStifItemParser& aItem ) ;
+		
+		TInt ExecuteLeafL ( CStifItemParser& aItem ) ;
+		TInt ExecuteLeafDataL ( CStifItemParser& aItem ) ;
+		TInt StartAtomicL( CStifItemParser& aItem )	;
+		TInt CommitAtomicL( CStifItemParser& aItem )	;
+		TInt RollbackAtomicL( CStifItemParser& aItem )	;
+		TInt CompleteCommandsL( CStifItemParser& aItem );
+		TInt DDFStructureL( CStifItemParser& aItem )	;
+//        TInt DeliverL( CStifItemParser& aItem ) ;
+//        TInt DetailsL( CStifItemParser& aItem ) ;
+//		TInt InstallL( CStifItemParser& aItem ) ;
+//		TInt BareInstallL( CStifItemParser& aItem ) ;		
+
+    protected:
+
+        /**
+        * C++ default constructor.
+        */
+        Cdmatest( CTestModuleIf& aTestModuleIf, TUid aUid );
+
+        /**
+        * By default Symbian 2nd phase constructor is private.
+        */
+        void ConstructL();
+
+        // Prohibit copy constructor if not deriving from CBase.
+        // Cdmatest( const Cdmatest& );
+        // Prohibit assigment operator if not deriving from CBase.
+        // Cdmatest& operator=( const Cdmatest& );
+
+		/**
+        * Frees all resources allocated from test methods.
+        * @since ?Series60_version
+        */
+        virtual void Delete();
+        void LoadMappingsL();
+        void SaveMappingsL();
+    public:     // Data
+        // ?one_line_short_description_of_data
+        //?data_declaration;
+    
+    protected:  // Data
+        // ?one_line_short_description_of_data
+        //?data_declaration;
+		MSmlDmAdapter::TError iStatus ;
+        ResultsFunction iResultsFunction;
+        //CSmlDmAdapter *iAdapter ;
+        CNSmlDMSettingsAdapter12 *iAdapter ;
+        HBufC8 *iURI; 
+        CArrayFix<TSmlDmMappingInfo> *iEmptyMappingInfoArray;
+		TFileName iSaveFileName;
+		RMappingArray iMappingTable;
+		TUid iUid;
+		TInt iCounter;
+		//class CNSmlDmMgmtTree* iMgmtTree;
+		class CNSmlDmMgmtTree* iMgmtTree;
+		CNSmlDMSettingsAdapter12 *Adapter() ;
+    };
+
+#endif      // __DMA_TEST_H__
+            
+// End of File
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/adapters/syncmldm12/tsrc/inc/syncmldm12test.h	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,133 @@
+/*
+* Copyright (c) 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:  Implementation of DM adapter test component
+* 	This is part of omadmextensions/adapter test application.
+*
+*/
+
+
+
+
+
+
+#ifndef TCTEST_H
+#define TCTEST_H
+
+//  INCLUDES
+#include <StifLogger.h>
+#include <TestScripterInternal.h>
+#include <StifTestModule.h>
+#include <smldmadapter.h>
+#include "dmatest.h"
+
+const TUint KNSmlDMSettings12AdapterImplUid = 0x10282CE8;
+	
+
+const TUid KAdapterUid = 
+		{
+		KNSmlDMSettings12AdapterImplUid
+		};
+// Logging path
+_LIT( KamtestLogPath, "\\logs\\testframework\\tctest\\" ); 
+// Log file
+_LIT( KamtestLogFile, "tctest.txt" ); 
+
+
+// FORWARD DECLARATIONS
+class Csyncmldm12Test;
+
+
+// CLASS DECLARATION
+
+/**
+*  Csyncmldm12Test test class for STIF Test Framework TestScripter.
+*  ?other_description_lines
+*
+*  @lib ?library
+*  @since ?Series60_version
+*/
+class Csyncmldm12Test : public Cdmatest
+    {
+    public:  // Constructors and destructor
+        
+        /**
+        * Two-phased constructor.
+        */
+        static Csyncmldm12Test* NewL( CTestModuleIf& aTestModuleIf );
+        
+        /**
+        * Destructor.
+        */
+        virtual ~Csyncmldm12Test();
+
+    public: // Functions from base classes
+
+        /**
+        * From CScriptBase Runs a script line.
+        * @since ?Series60_version
+        * @param aItem Script line containing method name and parameters
+        * @return Symbian OS error code
+        */
+        virtual TInt RunMethodL( CStifItemParser& aItem );
+                
+
+    private:
+
+        /**
+        * C++ default constructor.
+        */
+        Csyncmldm12Test( CTestModuleIf& aTestModuleIf );
+
+        /**
+        * By default Symbian 2nd phase constructor is private.
+        */
+        void ConstructL();
+
+        // Prohibit copy constructor if not deriving from CBase.
+        // ?classname( const ?classname& );
+        // Prohibit assigment operator if not deriving from CBase.
+        // ?classname& operator=( const ?classname& );
+    
+        /**
+        * Frees all resources allocated from test methods.
+        * @since ?Series60_version
+        */
+        virtual void Delete();
+        
+        /**
+        * Test methods are listed below. 
+        */
+        
+        /**
+        * Example test method.
+        * @since ?Series60_version
+        * @param aItem Script line containing parameters.
+        * @return Symbian OS error code.
+        */
+/*        virtual TInt ExampleL( CStifItemParser& aItem ) ;
+        virtual TInt DeliverL( CStifItemParser& aItem ) ;
+        virtual TInt DetailsL( CStifItemParser& aItem ) ;
+		    virtual TInt InstallL( CStifItemParser& aItem ) ;
+		    virtual TInt BareInstallL( CStifItemParser& aItem ) ;*/
+		
+
+    private:    // Data
+        HBufC8 *GetNextStringLC ( CStifItemParser& aItem, const TDesC &aName );
+
+
+    };
+
+#endif      // TCTEST_H
+            
+// End of File
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/adapters/syncmldm12/tsrc/init/syncmldm12test.ini	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,204 @@
+#
+# This is STIF initialization file
+# Comment lines start with '#'-character.
+# See STIF TestFramework users guide.doc for instructions
+
+# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
+# Set following test engine settings:
+#	- Set Test Reporting mode. TestReportMode's possible values are:
+#		+ 'Summary': Summary of the tested test cases.
+#		+ 'Environment': Hardware and software info.
+#		+ 'TestCases': Test case report.
+#		+ 'FullReport': Set of all above ones.
+#		+ Example 'TestReportMode= Summary TestCases'
+#
+# 	- CreateTestReport setting controls report creation mode
+#		+ YES, Test report will created.
+#		+ NO, No Test report.
+#
+# 	- File path indicates the base path of the test report.
+# 	- File name indicates the name of the test report.
+#
+# 	- File format indicates the type of the test report.
+#		+ TXT, Test report file will be txt type, for example 'TestReport.txt'.
+#		+ HTML, Test report will be html type, for example 'TestReport.html'.
+#
+# 	- File output indicates output source of the test report.
+#		+ FILE, Test report logging to file.
+#		+ RDEBUG, Test report logging to using rdebug.
+#
+# 	- File Creation Mode indicates test report overwriting if file exist.
+#		+ OVERWRITE, Overwrites if the Test report file exist.
+#		+ APPEND, Continue logging after the old Test report information if
+#                 report exist.
+# 	- Sets a device reset module's dll name(Reboot).
+#		+ If Nokia specific reset module is not available or it is not correct one
+#		  StifHWResetStub module may use as a template for user specific reset
+#		  module.
+# 	- Sets STIF test measurement disable options. e.g. pluging1 and pluging2 disablation
+#		DisableMeasurement= stifmeasurementplugin01 stifmeasurementplugin02
+#
+
+[Engine_Defaults]
+
+TestReportMode= FullReport    # Possible values are: 'Empty', 'Summary', 'Environment',
+                                                     'TestCases' or 'FullReport'
+
+CreateTestReport= YES         # Possible values: YES or NO
+
+TestReportFilePath= C:\LOGS\TestFramework\
+TestReportFileName= TestReport
+
+TestReportFormat= TXT         # Possible values: TXT or HTML
+TestReportOutput= FILE        # Possible values: FILE or RDEBUG
+TestReportFileCreationMode= OVERWRITE # Possible values: OVERWRITE or APPEND
+
+DeviceResetDllName= StifResetForNokia.dll # e.g. 'StifHWResetStub.dll' for user specific reseting
+
+DisableMeasurement= stifmeasurementdisablenone  # Possible values are:
+              # 'stifmeasurementdisablenone', 'stifmeasurementdisableall'
+              # 'stifmeasurementplugin01', 'stifmeasurementplugin02',
+              # 'stifmeasurementplugin03', 'stifmeasurementplugin04',
+              # 'stifmeasurementplugin05' or 'stifbappeaprofiler'
+
+Timeout= 0                    # Default timeout value for each test case. In milliseconds
+#UITestingSupport= YES        # Possible values: YES or NO
+#SeparateProcesses= YES       # Possible values: YES or NO (default: NO)
+[End_Defaults]
+# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
+
+
+
+# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
+# Module configurations start
+# Modules are added between module tags
+# tags. Module name is specified after ModuleName= tag, like
+# ModuleName= XXXXXXXXX
+# Modules might have initialisation file, specified as
+# IniFile= c:\testframework\YYYYYY
+# Modules might have several configuration files, like
+# TestCaseFile= c:\testframework\NormalCases.txt
+# TestCaseFile= c:\testframework\SmokeCases.txt
+# TestCaseFile= c:\testframework\ManualCases.txt
+
+# (TestCaseFile is synonym for old term ConfigFile)
+
+# Following case specifies demo module settings. Demo module
+# does not read any settings from file, so tags 
+# IniFile and TestCaseFile are not used.
+# In the simplest case it is enough to specify only the
+# name of the test module when adding new test module
+
+#[New_Module]
+#ModuleName= demomodule
+#[End_Module]
+
+
+[New_Module]
+ModuleName= testscripter
+#DM
+TestCaseFile= c:\testframework\syncmldm12test.cfg
+[End_Module]
+
+
+# Load testmoduleXXX, optionally with initialization file and/or test case files
+#[New_Module]
+#ModuleName= testmodulexxx
+
+#TestModuleXXX used initialization file
+#IniFile= c:\testframework\init.txt
+
+#TestModuleXXX used configuration file(s)
+#TestCaseFile= c:\testframework\testcases1.cfg
+#TestCaseFile= c:\testframework\testcases2.cfg
+#TestCaseFile= c:\testframework\manualtestcases.cfg
+
+#[End_Module]
+# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
+
+
+
+# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
+# Set STIF logging overwrite parameters for Logger.
+# 	Hardware and emulator environment logging path and styles can
+# 	be configured from here to overwrite the Logger's implemented values.
+#	
+#	Settings description:
+#	- Indicates option for creation log directory/directories. If log directory/directories
+#         is/are not created by user they will make by software.
+#		+ YES, Create log directory/directories if not allready exist.
+#		+ NO, Log directory/directories not created. Only created one is used.
+#
+#	- Overwrite emulator path setting.
+#		+ Example: If 'EmulatorBasePath= C:\LOGS\TestFramework\' and in code is defined 
+#		           Logger's path 'D:\\LOGS\\Module\\' with those definition the path
+#		           will be 'C:\LOGS\TestFramework\LOGS\Module\'
+#
+#	- Overwrite emulator's logging format.
+#		+ TXT, Log file(s) will be txt type(s), for example 'Module.txt'.
+#		+ HTML, Log file(s) will be html type(s), for example 'Module.html'.
+#
+#	- Overwrited emulator logging output source.
+#		+ FILE, Logging to file(s).
+#		+ RDEBUG, Logging to using rdebug(s).
+#
+#	- Overwrite hardware path setting (Same description as above in emulator path).
+#	- Overwrite hardware's logging format(Same description as above in emulator format).
+#	- Overwrite hardware's logging output source(Same description as above in emulator output).
+#
+#	- File Creation Mode indicates file overwriting if file exist.
+#		+ OVERWRITE, Overwrites if file(s) exist.
+#		+ APPEND, Continue logging after the old logging information if file(s) exist.
+#
+#	- Will thread id include to the log filename.
+#		+ YES, Thread id to log file(s) name, Example filename 'Module_b9.txt'.
+#		+ NO, No thread id to log file(s), Example filename 'Module.txt'.
+#
+#	- Will time stamps include the to log file.
+#		+ YES, Time stamp added to each line in log file(s). Time stamp is 
+#                 for example'12.Nov.2003 115958    LOGGING INFO'
+#		+ NO, No time stamp(s).
+#
+#	- Will line breaks include to the log file.
+#		+ YES, Each logging event includes line break and next log event is in own line.
+#		+ NO, No line break(s).
+#
+#	- Will event ranking include to the log file.
+#		+ YES, Event ranking number added to each line in log file(s). Ranking number
+#                 depends on environment's tics, for example(includes time stamp also)
+#                 '012   12.Nov.2003 115958    LOGGING INFO'
+#		+ NO, No event ranking.
+#
+#	- Will write log file in unicode format.
+#		+ YES, Log file will be written in unicode format
+#		+ NO, Log will be written as normal, not unicode, file.
+#
+
+[Logger_Defaults]
+
+#NOTE: If you want to set Logger using next setting(s) remove comment(s)'#'
+#NOTE: TestEngine and TestServer logging settings cannot change here
+
+#CreateLogDirectories= YES    # Possible values: YES or NO
+
+#EmulatorBasePath= C:\LOGS\TestFramework\
+#EmulatorFormat= HTML         # Possible values: TXT or HTML
+#EmulatorOutput= FILE         # Possible values: FILE or RDEBUG
+
+#HardwareBasePath= D:\LOGS\TestFramework\
+#HardwareFormat= HTML         # Possible values: TXT or HTML
+#HardwareOutput= FILE         # Possible values: FILE or RDEBUG
+
+#FileCreationMode= OVERWRITE  # Possible values: OVERWRITE or APPEND
+
+#ThreadIdToLogFile= YES       # Possible values: YES or NO
+#WithTimeStamp= YES           # Possible values: YES or NO
+#WithLineBreak= YES           # Possible values: YES or NO
+#WithEventRanking= YES        # Possible values: YES or NO
+
+#FileUnicode= YES             # Possible values: YES or NO
+#AddTestCaseTitle= YES        # Possible values: YES or NO
+[End_Logger_Defaults]
+# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
+
+# End of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/adapters/syncmldm12/tsrc/src/TestDmDDFObject.cpp	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,516 @@
+/*
+* Copyright (c) 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:  Implementation of DM adapter test component
+* 	This is part of omadmextensions/adapter test application.
+*
+*/
+
+
+
+
+
+
+// INCLUDE FILES
+
+#include "TestDmDDFObject.h"
+#include "StifLogger.h"
+
+// EXTERNAL DATA STRUCTURES
+//extern  ?external_data;
+
+// EXTERNAL FUNCTION PROTOTYPES  
+//extern ?external_function( ?arg_type,?arg_type );
+
+// CONSTANTS
+//const ?type ?constant_var = ?constant;
+
+// MACROS
+//#define ?macro ?macro_def
+
+// LOCAL CONSTANTS AND MACROS
+//const ?type ?constant_var = ?constant;
+//#define ?macro_name ?macro_def
+
+// MODULE DATA STRUCTURES
+//enum ?declaration
+//typedef ?declaration
+
+// LOCAL FUNCTION PROTOTYPES
+//?type ?function_name( ?arg_type, ?arg_type );
+
+// FORWARD DECLARATIONS
+//class ?FORWARD_CLASSNAME;
+
+// ============================= LOCAL FUNCTIONS ===============================
+
+
+
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// CTestDmDDFObject::CTestDmDDFObject
+// C++ default constructor can NOT contain any code, that
+// might leave.
+// -----------------------------------------------------------------------------
+//
+CTestDmDDFObject::CTestDmDDFObject( CStifLogger *aLog )
+	: iName( 0 )
+	, iAccessTypes()
+	, iDefaultValue( 0 )
+	, iDescription( 0 )
+	, iFormat( (TDFFormat)0 )
+	, iOccurence( (TOccurence)0 )
+	, iScope( (TScope)0 )
+	, iTitle ( 0 )
+	, iMimeType( 0 )
+	, iObjectGroup( EFalse )
+	, iLog( aLog )
+//	RPointerArray<CTestDmDDFObject> iChildren;
+    {
+    }
+
+// -----------------------------------------------------------------------------
+// CTestDmDDFObject::ConstructL
+// Symbian 2nd phase constructor can leave.
+// -----------------------------------------------------------------------------
+//
+void CTestDmDDFObject::ConstructL()
+    {
+    }
+
+// -----------------------------------------------------------------------------
+// CTestDmDDFObject::NewL
+// Two-phased constructor.
+// -----------------------------------------------------------------------------
+//
+CTestDmDDFObject* CTestDmDDFObject::NewL( CStifLogger *aLog )
+    {
+    CTestDmDDFObject* self = CTestDmDDFObject::NewLC( aLog );
+    CleanupStack::Pop( self );
+
+    return self;
+    }
+
+CTestDmDDFObject* CTestDmDDFObject::NewLC( CStifLogger *aLog )
+    {
+    CTestDmDDFObject* self = new( ELeave ) CTestDmDDFObject( aLog );
+    
+    CleanupStack::PushL( self );
+    self->ConstructL();
+
+    return self;
+    }
+
+    
+// Destructor
+CTestDmDDFObject::~CTestDmDDFObject()
+    {
+	delete iName;
+	delete iDefaultValue;
+	delete iDescription;
+	delete iTitle;
+	delete iMimeType;
+	iChildren.ResetAndDestroy();
+    }
+
+
+// -----------------------------------------------------------------------------
+// CTestDmDDFObject::?member_function
+// ?implementation_description
+// (other items were commented in a header).
+// -----------------------------------------------------------------------------
+//
+/*?type CTestDmDDFObject::?member_function(
+    ?arg_type arg,
+    ?arg_type arg )
+    {
+    
+    ?code
+    
+    }
+*/
+
+void CTestDmDDFObject::SetAccessTypesL( TSmlDmAccessTypes aAccessTypes )
+	{
+	iLog->Log( _L8( "SetAccessTypesL, aAccessTypes=%d" ), aAccessTypes.GetACL() );
+	iAccessTypes = aAccessTypes;
+	}
+
+void CTestDmDDFObject::SetDefaultValueL( const TDesC8& aDefaultValue )
+	{
+	iLog->Log( _L8( "SetDefaultValueL, aDefaultValue='%S'" ), &aDefaultValue );
+	delete iDefaultValue;
+	iDefaultValue = 0;
+	iDefaultValue = aDefaultValue.AllocL();
+	}
+
+void CTestDmDDFObject::SetDescriptionL( const TDesC8& aDescription )
+	{
+	iLog->Log( _L8( "SetDescriptionL, aDescription='%S'" ), &aDescription );
+	delete iDescription;
+	iDescription = 0;
+	iDescription = aDescription.AllocL();
+	}
+	
+void CTestDmDDFObject::SetDFFormatL( TDFFormat aFormat )
+	{
+	iLog->Log( _L8( "SetDFFormatL, aFormat=%d" ), aFormat );
+	iFormat = aFormat;
+	}
+	
+void CTestDmDDFObject::SetOccurenceL( TOccurence aOccurence )
+	{
+	iLog->Log( _L8( "SetOccurenceL, aOccurence=%d" ), aOccurence );
+	iOccurence = aOccurence;
+	}
+	
+void CTestDmDDFObject::SetScopeL( TScope aScope )
+	{
+	iLog->Log( _L8( "SetScopeL, aScope=%d" ), aScope );
+	iScope = aScope;
+	}
+	
+void CTestDmDDFObject::SetDFTitleL( const TDesC8& aTitle )
+	{
+	iLog->Log( _L8( "SetDFTitleL, aTitle='%S'" ), &aTitle );
+	delete iTitle;
+	iTitle = 0;
+	iTitle = aTitle.AllocL();
+	}
+	
+void CTestDmDDFObject::AddDFTypeMimeTypeL( const TDesC8& aMimeType )
+	{
+	iLog->Log( _L8( "AddDFTypeMimeTypeL, aMimeType='%S'" ), &aMimeType );
+	delete iMimeType;
+	iMimeType = 0;
+	iMimeType = aMimeType.AllocL();
+	}
+	
+void CTestDmDDFObject::SetAsObjectGroup()
+	{
+	iLog->Log( _L8( "SetAsObjectGroup, true" ) );
+	iObjectGroup = ETrue;
+	}
+	
+MSmlDmDDFObject& CTestDmDDFObject::AddChildObjectL(const TDesC8& aNodeName)
+	{
+	iLog->Log( _L8( "AddChildObjectL, aNodeName='%S'" ), &aNodeName );
+	CTestDmDDFObject* child = CTestDmDDFObject::NewLC( iLog ); //, aNodeName );
+	child->SetNameL( aNodeName );
+	iChildren.AppendL( child );
+	CleanupStack::Pop( child ); // Don't destroy
+	return *child;
+	}
+
+MSmlDmDDFObject& CTestDmDDFObject::AddChildObjectGroupL()
+	{
+	iLog->Log( _L8( "AddChildObjectGroupL, ''" ) );
+	CTestDmDDFObject* child = CTestDmDDFObject::NewLC( iLog ); //, KNullDesC );
+	child->SetAsObjectGroup();
+	iChildren.AppendL( child );
+	CleanupStack::Pop( child ); // Don't destroy
+	return *child;
+	}
+
+// Own functions
+
+void CTestDmDDFObject::SetNameL( const TDesC8& aName )
+	{
+	delete iName;
+	iName = 0;
+	iName = aName.AllocL();
+	}
+
+void CTestDmDDFObject::DumpL( const TDesC8& aParentName, TBool aFullDump )
+	{
+	TPtrC8 name( _L8("<X>") );
+	if (iName && iName->Length() > 0)
+		{
+		name.Set( *iName );
+		}
+
+	HBufC8* fullName = HBufC8::NewLC( aParentName.Length() + name.Length() + 1 );
+	*fullName = aParentName;
+	if (aParentName.Length() > 0 && aParentName[ aParentName.Length() - 1 ] != '/')
+		{
+		fullName->Des().Append( _L8("/"));
+		}
+	fullName->Des().Append( name );
+
+	/* Translate some members to text for dumping */
+	TBuf8<20> strAccessTypes;
+	TUint8 accessTypes = iAccessTypes.GetACL();
+	if ((accessTypes & iAccessTypes.EAccessType_Add) != 0)
+		{
+		strAccessTypes.Append( _L8("A") );
+		}
+	if ((accessTypes & iAccessTypes.EAccessType_Copy) != 0)
+		{
+		strAccessTypes.Append( _L8("C") );
+		}
+	if ((accessTypes & iAccessTypes.EAccessType_Delete) != 0)
+		{
+		strAccessTypes.Append( _L8("D") );
+		}
+	if ((accessTypes & iAccessTypes.EAccessType_Exec) != 0)
+		{
+		strAccessTypes.Append( _L8("E") );
+		}
+	if ((accessTypes & iAccessTypes.EAccessType_Get) != 0)
+		{
+		strAccessTypes.Append( _L8("G") );
+		}
+	if ((accessTypes & iAccessTypes.EAccessType_Replace) != 0)
+		{
+		strAccessTypes.Append( _L8("R") );
+		}
+	
+	TBuf8<20> strFormat;
+	switch( iFormat )
+		{
+	case EB64:
+		strFormat = _L8("Base64");
+		break;
+	case EBool:
+		strFormat = _L8("Bool");
+		break;
+	case EChr:
+		strFormat = _L8("Chr");
+		break;
+	case EInt:
+		strFormat = _L8("Int");
+		break;
+	case ENode:
+		strFormat = _L8("Node");
+		break;
+	case ENull:
+		strFormat = _L8("Null");
+		break;
+	case EXml:
+		strFormat = _L8("Xml");
+		break;
+	case EBin:
+		strFormat = _L8("Bin");
+		break;
+	default:
+		break;
+		}
+
+
+	TBuf8<20> strOccurence;
+	switch( iOccurence )
+		{
+	case EOne:
+		/** The node appears exactly once */
+		strOccurence = _L8("M:1");
+		break;
+	case EZeroOrOne:
+		/** The node is optional and may appear zero or once */
+		strOccurence = _L8("O:0-1");
+		break;
+	case EZeroOrMore:
+		/** The node is optional and may appear zero or more times */
+		strOccurence = _L8("O:0-*");
+		break;
+	case EOneOrMore:
+		/** The node is mandatory and may appear once or more times */
+		strOccurence = _L8("M:1-*");
+		break;
+	case EZeroOrN:
+		/** The node is optional and may appear between once and 'N' times */
+		strOccurence = _L8("O:1-N");
+		break;
+	case EOneOrN:
+		/** The node is mandatory and may appear between once and 'N' times */
+		strOccurence = _L8("M:1-N");
+		break;
+	default:
+		break;
+		}
+	
+	
+	TBuf8<20> strScope;
+	switch( iScope)
+		{
+	case EPermanent:
+		/** The node appears exactly once */
+		strScope = _L8("Permanent");
+		break;
+	case EDynamic:
+		/** The node is optional and may appear zero or once */
+		strScope = _L8("O:Dynamic");
+		break;
+	default:
+		break;
+		}
+
+	
+	/* Dump main data */
+	if (aFullDump)
+		{
+		iLog->Log( _L8( "DDFObject: '%S'" ), fullName );
+		}
+		else
+		{
+		iLog->Log( _L8( "DDFObject: '%S'   (%S), %S, %S, %S" ),
+					fullName, &strAccessTypes, &strFormat, &strOccurence, &strScope );
+		}
+	
+	/* Dump members */
+	if (aFullDump)
+		{
+		TPtrC8 empty( _L8( "<null>" ) );
+		#define CHK_NULL(a) ((a)==0?(TDesC8*)(&empty):(TDesC8*)(a))
+
+		iLog->Log( _L8( "    iName=='%S'" ), iName );
+		iLog->Log( _L8( "    iAccessTypes=%d (%S)" ), iAccessTypes.GetACL(), &strAccessTypes );
+		iLog->Log( _L8( "    iDefaultValue='%S'" ), CHK_NULL(iDefaultValue));
+		iLog->Log( _L8( "    iDescription='%S'" ), CHK_NULL(iDescription ));
+		iLog->Log( _L8( "    iFormat=%d (%S)" ), iFormat, &strFormat );
+		iLog->Log( _L8( "    iOccurence=%d (%S)" ), iOccurence, &strOccurence );
+		iLog->Log( _L8( "    iScope=%d (%S)" ), iScope, &strScope );
+		iLog->Log( _L8( "    iTitle='%S'" ), CHK_NULL(iTitle ));
+		iLog->Log( _L8( "    iMimeType='%S'" ), CHK_NULL(iMimeType ));
+		iLog->Log( _L8( "----------------------------------" ) );
+		}
+	
+	/* Dump children */
+	for (TInt i = 0 ; i < iChildren.Count() ; i++)
+		{
+		iChildren[i]->DumpL( *fullName, aFullDump );
+		}
+
+	CleanupStack::PopAndDestroy( fullName );
+	}
+
+/*
+void CTestDmDDFObject::ExternalizeL(RWriteStream& aStream) const
+	{
+	X;
+	aStream << *iName << eol;
+	}
+*/
+
+const TDesC8& CTestDmDDFObject::Name()
+	{
+	return (iName != 0) ? *iName : KNullDesC8();
+	}
+
+TSmlDmAccessTypes  CTestDmDDFObject::AccessTypes()
+	{
+	return iAccessTypes;
+	}
+
+const TDesC8& CTestDmDDFObject::DefaultValue()
+	{
+	return (iDefaultValue != 0) ? *iDefaultValue : KNullDesC8();
+	}
+
+const TDesC8& CTestDmDDFObject::Description()
+	{
+	return (iDescription != 0) ? *iDescription : KNullDesC8();
+	}
+
+CTestDmDDFObject::TDFFormat CTestDmDDFObject::DFFormat()
+	{
+	return iFormat;
+	}
+
+CTestDmDDFObject::TOccurence CTestDmDDFObject::Occurence()
+	{
+	return iOccurence;
+	}
+
+CTestDmDDFObject::TScope CTestDmDDFObject::Scope()
+	{
+	return iScope;
+	}
+
+const TDesC8& CTestDmDDFObject::DFTitle()
+	{
+	return (iTitle != 0) ? *iTitle : KNullDesC8();
+	}
+
+const TDesC8& CTestDmDDFObject::DFTypeMimeType()
+	{
+	return (iMimeType != 0) ? *iMimeType : KNullDesC8();
+	}
+
+TBool CTestDmDDFObject::ObjectGroup()
+	{
+	return iObjectGroup;
+	}
+
+TInt CTestDmDDFObject::ChildObjectCount()
+	{
+	return iChildren.Count();
+	}
+
+CTestDmDDFObject& CTestDmDDFObject::ChildObject( TInt aIndex )
+	{
+	return *iChildren[aIndex];
+	}
+
+CTestDmDDFObject* CTestDmDDFObject::FindChildObject( const TDesC8& aName )
+	{
+	CTestDmDDFObject* foundObject = 0;
+
+	for (TInt i = 0 ; i < iChildren.Count() ; i++)
+		{
+		if ( aName.CompareC( iChildren[i]->Name() ) == 0 )
+			{
+			foundObject = iChildren[i];
+			break;
+			}
+		}
+
+	return foundObject;
+	}
+
+TInt CTestDmDDFObject::SubObjectsCount()
+	{
+	TInt count = 0;
+
+	TInt i;
+	for (i = 0 ; i < iChildren.Count() ; i++)
+		{
+		count += iChildren[i]->SubObjectsCount();
+		}
+	count += i;
+
+	return count;
+	}
+
+/*
+// ========================== OTHER EXPORTED FUNCTIONS =========================
+
+// -----------------------------------------------------------------------------
+// ?function_name implements...
+// ?implementation_description.
+// Returns: ?value_1: ?description
+//          ?value_n: ?description
+//                    ?description
+// -----------------------------------------------------------------------------
+//
+?type  ?function_name(
+    ?arg_type arg,  // ?description
+    ?arg_type arg )  // ?description
+    {
+
+    ?code
+
+    }
+*/
+//  End of File  
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/adapters/syncmldm12/tsrc/src/dmatest.cpp	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,954 @@
+/*
+* Copyright (c) 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:  Implementation of DM adapter test component
+* 	This is part of omadmextensions/adapter test application.
+*
+*/
+
+
+
+
+
+
+// INCLUDE FILES
+#include "dmatest.h"
+
+#include <StifParser.h>
+#include <Stiftestinterface.h>
+#include <S32FILE.H>
+#include <s32mem.h>
+#include <apgcli.h>
+#include <e32svr.h>
+#include <e32math.h>
+#include <f32file.h>
+#include <swinstapi.h>
+
+#include "TestDmDDFObject.h"
+
+_LIT8( KEmptyType, "" );
+_LIT8( KDefaultType, "text/plain" );
+_LIT( KMappingTableFile, "\\dmtestmappings.txt" );
+//_LIT8( KNSmlDMSeparator8, "/" );
+//const TUint8 KNSmlDMUriSeparator = 0x2f; //forward slash
+
+#define LEAVE_IF_ERROR(x,msg) \
+	{ TInt __xres = (x); if ( __xres < 0 ) { if ( iLog ) iLog->Log( (msg), __xres ); User::Leave( __xres );	} }
+
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// Cdmatest::Cdmatest
+// C++ default constructor can NOT contain any code, that
+// leave.
+// -----------------------------------------------------------------------------
+//
+Cdmatest::Cdmatest(CTestModuleIf& aTestModuleIf, TUid aUid ):
+        CScriptBase( aTestModuleIf ), iMappingTable(2), iUid( aUid )
+    {
+    
+    }
+
+// -----------------------------------------------------------------------------
+// Cdmatest::ConstructL
+// Symbian 2nd phase constructor can leave.
+// -----------------------------------------------------------------------------
+//
+void Cdmatest::ConstructL()
+    {    
+    Adapter();
+	iEmptyMappingInfoArray = new ( ELeave ) CArrayFixFlat<TSmlDmMappingInfo>(1);
+	
+	TRAPD( err, LoadMappingsL() );
+	if (err != KErrEof && err != KErrNone && err != KErrNotFound)
+		{
+		User::Leave( err );
+		}
+    }
+    
+CNSmlDMSettingsAdapter12 *Cdmatest::Adapter()  
+	{
+	if ( iAdapter == NULL )
+		{
+		if ( iLog )
+			{
+			iLog->Log( _L( "Loading Adapter" ) );
+			}
+  		
+  		TRAPD( err, iAdapter = (CNSmlDMSettingsAdapter12*) CSmlDmAdapter::NewL( iUid,*this ) );
+	if ( err == KErrNone )
+		{
+		if (iLog )
+			{
+			iLog->Log( _L( "Loaded" ) );	
+			}
+		}
+	else
+		{
+		if (iLog)
+			{
+			iLog->Log( _L( "Failed to load adapter: %d" ), err );
+			}
+		}
+		}
+	return iAdapter;
+	}
+    
+    
+void Cdmatest::LoadMappingsL()
+	{
+	TDataType type; 
+	HBufC8 *data = LoadFileLC( KMappingTableFile,  type );
+	RDesReadStream buf( *data );
+	CleanupClosePushL( buf );
+
+	TInt len( data->Length() );
+	while (buf.Source()->TellL( MStreamBuf::ERead ).Offset() < len)
+		{
+		TUint32 val = buf.ReadUint32L();
+		TBuf8<256> uri;
+		TBuf8<64> luid;
+		buf.ReadL(uri, val);
+		val = buf.ReadUint32L();
+		buf.ReadL(luid, val);
+		TMapping m( uri, luid ) ;
+		TInt err( iMappingTable.Append( m )	);
+		if ( err == KErrNone )
+			{
+			iLog->Log( _L8( "Loaded mapping: '%S' : '%S'"), &m.iURI, &m.iLuid );
+			}
+		else
+			{
+			iLog->Log( _L8( "FAILED TO Load mapping: '%d' "), err );
+			}
+		}
+	CleanupStack::PopAndDestroy( &buf); // buf
+	CleanupStack::PopAndDestroy( data ); // data
+	}
+    	
+	
+
+void Cdmatest::SaveMappingsL()
+    {
+	TInt c( iMappingTable.Count() );
+	if ( c > 0 )
+	{
+    	RFs fs;
+    	User::LeaveIfError( fs.Connect() );
+    	CleanupClosePushL( fs );
+    	RFileWriteStream buf;
+    	User::LeaveIfError( buf.Replace( fs, KMappingTableFile, EFileWrite ) );
+    	CleanupClosePushL( buf );
+		
+		TInt i( 0 ) ;
+		do 
+			{
+			buf.WriteUint32L( iMappingTable[i].iURI.Length() );
+			buf.WriteL( iMappingTable[i].iURI );
+			buf.WriteUint32L( iMappingTable[i].iLuid.Length() );
+			buf.WriteL( iMappingTable[i].iLuid );
+			}
+		while ( ++i < c )	;
+		buf.CommitL();
+		buf.Close();
+	
+		CleanupStack::PopAndDestroy(); // buf
+		CleanupStack::PopAndDestroy(); // fs
+		}
+    }
+    	
+    
+// Destructor
+Cdmatest::~Cdmatest()
+    {
+    // Delete resources allocated from test methods
+    TRAPD(err, SaveMappingsL() );
+    if ( err != KErrNone )
+    	{
+    	if(iLog)
+    			iLog->Log( _L8( "Failed to save mappings!: %d"), err );
+    	}
+    Delete();
+    
+    // Delete logger
+    delete iLog;  
+    delete iEmptyMappingInfoArray;
+    delete iAdapter;
+    delete iURI;
+    iMappingTable.Reset();
+    REComSession::FinalClose();
+    }
+
+
+// -----------------------------------------------------------------------------
+// Camatest::Delete
+// Delete here all resources allocated and opened from test methods. 
+// Called from destructor. 
+// -----------------------------------------------------------------------------
+//
+void Cdmatest::Delete() 
+    {
+    
+    }
+
+// -----------------------------------------------------------------------------
+// Cdmatest::?member_function
+// ?implementation_description
+// (other items were commented in a header).
+// -----------------------------------------------------------------------------
+
+
+        
+HBufC8 *Cdmatest::GetNextStringLC ( CStifItemParser& aItem, const TDesC &aName )
+	{
+	TPtrC nodename( KNullDesC );
+
+    TInt i( aItem.GetNextString ( nodename ) );
+    if ( i != KErrNone ) 
+	    {
+	    iLog->Log( _L( "ERROR Reading '%S' argument: 0x%X" ), &aName, i );
+	    }
+	else
+		{
+		iLog->Log( _L("%S: %S"), &aName, &nodename);
+		}
+	
+	HBufC8 *buf = HBufC8::NewLC( nodename.Length() ) ;
+	buf->Des().Copy( nodename );
+	return buf;
+	}
+	
+TInt Cdmatest::FetchNodeL( CStifItemParser& aItem )	
+	{
+
+    TInt ret( KErrNone );
+    // Print to UI
+    TestModuleIf().Printf( 0, _L("Cdmatest"), _L("FetchNodeL") );
+
+	iResultsFunction = FetchNodeResultsL;
+	
+    TPtrC8 nodename( GetNextStringLC( aItem, _L(" nodename" ) )->Des() ) ;
+		
+	SetURIL(nodename) ;//
+	HBufC8 *luid = GetLuidAllocLC( *iURI );
+
+	Adapter()->ChildURIListL( *iURI, *luid, *iEmptyMappingInfoArray, 4, 5) ;
+
+	if ( iStatus == MSmlDmAdapter::EOk )
+		{
+		}
+	else
+		{
+		iLog->Log( _L("FetchNodeL: ChildUriList Error ! %d" ), iStatus );	
+		ret = KErrGeneral ;
+		}
+	CleanupStack::PopAndDestroy( luid ) ; 
+	CleanupStack::PopAndDestroy() ; // nodename
+	iLog->Log( _L("FetchNodeL: Test Complete with status %d" ), ret );	
+
+    return ret;
+	}
+	
+TInt Cdmatest::StartAtomicL( CStifItemParser& /*aItem*/ )	
+	{
+	TRAPD( err, Adapter()->StartAtomicL() ) ;
+	iLog->Log( _L("StartAtomicL: Atomic started resulting error %d" ), err );	
+    return err;
+	}
+
+TInt Cdmatest::RollbackAtomicL( CStifItemParser& /*aItem*/ )	
+	{
+	TRAPD( err, Adapter()->RollbackAtomicL() ) ;
+	iLog->Log( _L("RollbackAtomicL: Atomic rolled back resulting error %d" ), err );	
+    return err;
+	}
+	
+TInt Cdmatest::CommitAtomicL( CStifItemParser& /*aItem*/ )	
+	{
+	TRAPD( err, Adapter()->CommitAtomicL() ) ;
+	iLog->Log( _L("RollbackAtomicL: Atomic commited resulting error %d" ), err );	
+    return err;
+	}
+	
+
+TInt Cdmatest::DDFStructureL( CStifItemParser& /*aItem*/ )	
+	{
+	CTestDmDDFObject* ddfRoot = CTestDmDDFObject::NewLC( iLog ); //, aNodeName );
+
+	TRAPD( err, iAdapter->DDFStructureL( *ddfRoot ) ) ;
+	CleanupStack::PopAndDestroy( ddfRoot );
+	iLog->Log( _L("DDFStructureL: method called resulting error %d" ), err );	
+    return err;
+	}
+		
+		
+TInt Cdmatest::AddNodeL( CStifItemParser& aItem )	
+	{
+
+    TInt ret( KErrNone );
+    // Print to UI
+    TestModuleIf().Printf( 0, _L("Cdmatest"), _L("AddNodeL") );
+
+    
+    TPtrC8 nodename( GetNextStringLC ( aItem, _L("nodename" ) )->Des() ) ;
+    SetURIL( nodename );
+
+	Adapter()->AddNodeObjectL( *iURI, KEmptyType, 8 ) ;
+	
+	if ( iStatus == MSmlDmAdapter::EOk )
+		{
+		iLog->Log( _L("AddNodeL: AddNodeObjectL Successful! %d" ), iStatus );	
+		}
+	else
+		{
+		iLog->Log( _L("AddNodeL: AddNodeObjectL Error ! %d" ), iStatus );	
+		ret = KErrGeneral ;
+		}
+		
+	CleanupStack::PopAndDestroy() ; // nodename
+	iLog->Log( _L("AddNodeL Test Complete with status %d" ), ret );	
+
+    return ret;
+	}	
+		
+TInt Cdmatest::UpdateLeafL( CStifItemParser& aItem )	
+	{
+
+    TInt ret( KErrNone );
+    // Print to UI
+    TestModuleIf().Printf( 0, _L("Cdmatest"), _L("UpdateLeafL") );
+
+    TPtrC8 nodename( GetNextStringLC ( aItem, _L("Node name") )->Des() ) ;
+    TPtrC8 data (GetNextStringLC( aItem, _L("datafile"))->Des() );
+    
+	HBufC8 *mime = GetNextStringLC( aItem, _L("mime") ) ;
+    SetURIL( nodename );
+    
+    TPtrC8 parentURI(RemoveLastSeg(nodename));
+    HBufC8 *luid = GetLuidAllocLC( parentURI );
+    
+    TDataType type; 
+
+	TPtrC8 mimePtr( *mime == KNullDesC8 ? type.Des8() : mime->Des() );
+
+    /**
+    virtual void UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID,
+									const TDesC8& aObject, const TDesC8& aType,
+									TInt aStatusRef ) = 0;
+    */
+    
+	Adapter()->UpdateLeafObjectL( *iURI , *luid, data, mimePtr, 3);
+
+	if ( iStatus == MSmlDmAdapter::EOk )
+	{
+		iLog->Log( _L("UpdateLeafL: UpdateLeafObjectL Successful! %d" ), iStatus );	
+	}
+	else
+	{
+		iLog->Log( _L("UpdateLeafL UpdateLeafObjectL Error ! %d" ), iStatus );	
+		ret = KErrGeneral ;
+	}
+
+	CleanupStack::PopAndDestroy(); // loadfile
+	CleanupStack::PopAndDestroy(); // luid
+	CleanupStack::PopAndDestroy(); // mime
+	CleanupStack::PopAndDestroy(); // nodename
+
+	iLog->Log( _L("UpdateLeafL Test Complete with status %d" ), ret );	
+
+    return ret;
+	}	
+	
+
+TInt Cdmatest::UpdateLeafDataURLL( CStifItemParser& aItem )	
+	{
+
+    TInt ret( KErrNone );
+    // Print to UI
+    TestModuleIf().Printf( 0, _L("Cdmatest"), _L("UpdateLeafDataL") );
+
+    TPtrC8 nodename( GetNextStringLC ( aItem, _L("Node name") )->Des() ) ;
+    TPtrC8 http (GetNextStringLC( aItem, _L("http"))->Des() );
+    TPtrC8 url (GetNextStringLC( aItem, _L("rest of url"))->Des() );
+	HBufC8 *mime = GetNextStringLC( aItem, _L("mime") ) ;
+    SetURIL( nodename );
+    
+    _LIT8( KTag, "://" );
+    
+    HBufC8 *fullurl = HBufC8::NewLC( http.Length() + KTag().Length() + url.Length() );
+    TPtr8 pfullurl( fullurl->Des() );
+    pfullurl.Copy( http ) ;
+    pfullurl.Append( KTag );
+    pfullurl.Append( url );
+    TPtrC8 mimePtr( *mime == KNullDesC8 ? KDefaultType() : mime->Des() );
+    
+    HBufC8 *luid = GetLuidAllocLC( *iURI );
+    /**
+    virtual void UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID,
+									const TDesC8& aObject, const TDesC8& aType,
+									TInt aStatusRef ) = 0;
+    */
+	Adapter()->UpdateLeafObjectL( *iURI , *luid, pfullurl, mimePtr, 3);
+	if ( iStatus == MSmlDmAdapter::EOk )
+		{
+		iLog->Log( _L("UpdateLeafDataL: UpdateLeafObjectL Successful! %d" ), iStatus );	
+		}
+	else
+		{
+		iLog->Log( _L("UpdateLeafDataL UpdateLeafObjectL Error ! %d" ), iStatus );	
+		ret = KErrGeneral ;
+		}
+	CleanupStack::PopAndDestroy( luid ); // 
+	CleanupStack::PopAndDestroy( mime ); // mime
+	CleanupStack::PopAndDestroy(); // url
+	CleanupStack::PopAndDestroy(); // http
+	CleanupStack::PopAndDestroy(); // nodename
+	iLog->Log( _L("UpdateLeafDataL Test Complete with status %d" ), ret );	
+
+    return ret;
+	}
+    
+TInt Cdmatest::UpdateLeafDataL( CStifItemParser& aItem )	
+	{
+
+    TInt ret( KErrNone );
+    // Print to UI
+   TestModuleIf().Printf( 0, _L("Camtest"), _L("UpdateLeafDataL") );
+
+    TPtrC8 nodename( GetNextStringLC ( aItem, _L("Node name") )->Des() ) ;
+    TPtrC8 data (GetNextStringLC( aItem, _L("data"))->Des() );
+	HBufC8 *mime = GetNextStringLC( aItem, _L("mime") ) ;
+	
+    SetURIL( nodename );
+    
+        
+    TPtrC8 mimePtr( *mime == KNullDesC8 ? KDefaultType() : mime->Des() );
+    
+    TPtrC8 parentURI(RemoveLastSeg(nodename));
+    HBufC8 *luid = GetLuidAllocLC( parentURI );
+     
+//    
+//    virtual void UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID,
+//									const TDesC8& aObject, const TDesC8& aType,
+//									TInt aStatusRef ) = 0;
+//   
+	Adapter()->UpdateLeafObjectL( *iURI , *luid, data, mimePtr, 3);
+	if ( iStatus == MSmlDmAdapter::EOk )
+		{
+		iLog->Log( _L("UpdateLeafDataL: UpdateLeafObjectL Successful! %d" ), iStatus );	
+		}
+	else
+		{
+		iLog->Log( _L("UpdateLeafDataL UpdateLeafObjectL Error ! %d" ), iStatus );	
+		ret = KErrGeneral ;
+		}
+	
+	CleanupStack::PopAndDestroy(); // mime
+	CleanupStack::PopAndDestroy(); // luid
+	CleanupStack::PopAndDestroy(); // data
+	CleanupStack::PopAndDestroy(); // nodename
+	iLog->Log( _L("UpdateLeafDataL Test Complete with status %d" ), ret );	
+
+    return ret;
+	}	
+			
+TInt Cdmatest::FetchLeafL( CStifItemParser& aItem )	
+	{
+
+    TInt ret( KErrNone );
+    // Print to UI
+    TestModuleIf().Printf( 0, _L("Camtest"), _L("FetchLeafL") );
+
+	iResultsFunction = NULL;
+	
+    TInt i( 0 );
+    TPtrC8 nodename ( GetNextStringLC( aItem, _L( "nodename" ) )->Des() ) ;
+    
+    //TPtrC datafile;
+    TPtrC datafile( KNullDesC );
+    i = aItem.GetNextString ( datafile ) ;
+    if ( i != KErrNone ) 
+	    {
+	    iLog->Log(_L("FetchLeafL: ERROR Reading outfile argument: 0x%X"), i );
+	    //return i;
+	    }
+	else
+		{
+		iSaveFileName = datafile;
+		iLog->Log( _L( " Save file nameis '%S'" ), &iSaveFileName );
+		iResultsFunction = SaveDataL;
+		}
+    
+	SetURIL(nodename) ;
+		
+		/*
+			void FetchLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID,
+								   const TDesC8& aType, TInt aResultsRef,
+								   TInt aStatusRef );
+		*/
+    TPtrC8 parentURI(RemoveLastSeg(nodename));
+    HBufC8 *luid = GetLuidAllocLC( parentURI );
+
+	Adapter()->FetchLeafObjectL( *iURI, *luid, KEmptyType, 7, 8 ) ;
+	if ( iStatus == MSmlDmAdapter::EOk )
+		{
+		iLog->Log( _L("FetchLeafL: FetchLeafObjectL Successful! %d" ), iStatus );	
+		}
+	else
+		{
+		iLog->Log( _L("FetchLeafL: FetchLeafObjectL Error ! %d" ), iStatus );	
+		ret = KErrGeneral ;
+		}
+	CleanupStack::PopAndDestroy( luid );
+	CleanupStack::PopAndDestroy(  ); // nodename
+	iLog->Log( _L("FetchLeafL Test Complete with status %d" ), ret );	
+    return ret;
+	}	
+
+
+TInt Cdmatest::ExecuteLeafL( CStifItemParser& aItem )		
+	{
+	TInt ret( KErrNone );
+    // Print to UI
+    TestModuleIf().Printf( 0, _L("Camtest"), _L("ExecuteLeafL") );
+
+	iResultsFunction = NULL;
+	
+    TPtrC8 nodename( GetNextStringLC ( aItem, _L("Nodename") )->Des() ) ;
+    TPtrC8 data( GetNextStringLC ( aItem, _L("Input file") )->Des() ) ;
+	
+	SetURIL(nodename) ;
+
+		/*
+			virtual void ExecuteCommandL( const TDesC8& aURI, const TDesC8& aLUID,
+							      const TDesC8& aArgument, const TDesC8& aType,
+								  TInt aStatusRef ) = 0;
+		*/
+	TDataType type;
+	
+    TPtrC8 parentURI(RemoveLastSeg(nodename));
+    HBufC8 *luid = GetLuidAllocLC( parentURI );
+
+	Adapter()->ExecuteCommandL( *iURI, *luid, data, KEmptyType, 11 ) ;
+	if ( iStatus == MSmlDmAdapter::EOk )
+		{
+		iLog->Log( _L("ExecuteLeafL: ExecuteCommandL Successful! %d" ), iStatus );	
+		}
+	else
+		{
+		iLog->Log( _L("ExecuteLeafL: ExecuteCommandL FetchLeafObjectL Error ! %d" ), iStatus );	
+		ret = KErrGeneral ;
+		}
+	CleanupStack::PopAndDestroy( luid ); // luid
+	CleanupStack::PopAndDestroy(); // data
+	CleanupStack::PopAndDestroy(); // nodename
+	
+	iLog->Log( _L("ExecuteLeafL: Test Complete with status %d" ), ret );	
+
+    return ret;
+	}
+	
+TInt Cdmatest::CompleteCommandsL( CStifItemParser& /*aItem*/ )
+	{
+	TRAPD( err, Adapter()->CompleteOutstandingCmdsL() );
+	delete iAdapter;
+	iAdapter = NULL;
+	return err;
+	}
+TInt Cdmatest::DeleteObjectL( CStifItemParser& aItem )
+{
+	TInt ret( KErrNone );
+    // Print to UI
+    TestModuleIf().Printf( 0, _L("Camtest"), _L("DeleteObjectL") );
+
+    TPtrC8 nodename( GetNextStringLC ( aItem, _L("Nodename") )->Des() ) ;
+
+	SetURIL(nodename) ;
+
+	HBufC8 *luid = GetLuidAllocLC( *iURI );
+	Adapter()->DeleteObjectL( *iURI, *luid, 11 ) ;
+	if ( iStatus == MSmlDmAdapter::EOk )
+		{
+		iLog->Log( _L("DeleteNode: DeleteObjectL Successful! %d" ), iStatus );	
+		}
+	else
+		{
+		iLog->Log( _L("DeleteNode: DeleteObjectL FetchLeafObjectL Error ! %d" ), iStatus );	
+		ret = KErrGeneral ;
+		}
+	CleanupStack::PopAndDestroy( luid ); // luid
+	CleanupStack::PopAndDestroy(); // nodename	
+	iLog->Log( _L("ExecuteLeafDataL Test Complete with status %d" ), ret );	
+
+    return ret;	
+}
+	
+TInt Cdmatest::ExecuteLeafDataL( CStifItemParser& aItem )		
+	{
+	TInt ret( KErrNone );
+
+    // Print to UI
+    TestModuleIf().Printf( 0, _L("Camtest"), _L("ExecuteLeafL") );
+
+	iResultsFunction = NULL;
+	
+    TPtrC8 nodename( GetNextStringLC ( aItem, _L("Nodename") )->Des() ) ;
+    TPtrC8 data( GetNextStringLC ( aItem, _L("Input data") )->Des() ) ;
+    
+	SetURIL(nodename) ;
+
+		/*
+			virtual void ExecuteCommandL( const TDesC8& aURI, const TDesC8& aLUID,
+							      const TDesC8& aArgument, const TDesC8& aType,
+								  TInt aStatusRef ) = 0;
+		*/
+	HBufC8 *luid = GetLuidAllocLC( *iURI );
+	Adapter()->ExecuteCommandL( *iURI, *luid, data, KEmptyType, 11 ) ;
+	if ( iStatus == MSmlDmAdapter::EOk )
+		{
+		iLog->Log( _L("ExecuteLeafDataL: ExecuteCommandL Successful! %d" ), iStatus );	
+		}
+	else
+		{
+		iLog->Log( _L("ExecuteLeafDataL: ExecuteCommandL FetchLeafObjectL Error ! %d" ), iStatus );	
+		ret = KErrGeneral ;
+		}
+	CleanupStack::PopAndDestroy(); // luid
+	CleanupStack::PopAndDestroy(); // data		
+	CleanupStack::PopAndDestroy(); // nodename	
+	iLog->Log( _L("ExecuteLeafDataL Test Complete with status %d" ), ret );	
+
+    return ret;
+	}
+
+
+HBufC8 *Cdmatest::LoadFileLC( const TDesC &aFileName, TDataType &aType )	
+	{
+	RFs fs ;
+	LEAVE_IF_ERROR( fs.Connect(), _L( "Could not connect fileserver: %d"  ) );
+	
+	CleanupClosePushL( fs );
+	RFile file ;
+	LEAVE_IF_ERROR( file.Open(fs,aFileName,EFileRead), _L( "Could not open file: %d" ) );
+	
+	
+	
+	CleanupClosePushL( file );
+	TInt dataSize ;
+	LEAVE_IF_ERROR( file.Size( dataSize ), _L( "Could not get file size: %d" ) );
+	HBufC8 *nodedata = HBufC8::NewL ( dataSize );
+	CleanupStack::PushL( nodedata );
+	TPtr8 nodedataptr( nodedata->Des() );
+	LEAVE_IF_ERROR( file.Read( nodedataptr ), _L( "Could not read file: %d" ) );
+	TDataRecognitionResult aDataType;
+	RApaLsSession ls ;
+	TInt err( ls.Connect() );
+	if ( err == KErrNone )
+		{
+		CleanupClosePushL( ls );
+		err = ls.RecognizeData(aFileName, nodedataptr, aDataType)  ;
+		if ( err == KErrNone )
+			{
+			aType = aDataType.iDataType;
+			}
+		else
+			{
+			iLog->Log( _L("LoadFileLC: WARNING Failed to get type: %d" ), err );
+			aType = TDataType( KDefaultType );
+			}	
+		CleanupStack::PopAndDestroy( &ls ); 
+		}
+	else
+		{
+		iLog->Log( _L("LoadFileLC: WARNING Failed to connect rapalssession: %d" ), err );
+		}	
+	CleanupStack::Pop( nodedata );
+	CleanupStack::PopAndDestroy( &file ); 
+	CleanupStack::PopAndDestroy( &fs ); 
+	CleanupStack::PushL( nodedata );
+	return nodedata ;
+	}
+
+HBufC8 *Cdmatest::LoadFileLC( const TDesC8 &aFileName, TDataType &aType )	
+	{
+	TFileName fn ;
+	fn.Copy( aFileName );
+	return LoadFileLC( fn, aType );
+	}
+	
+
+void Cdmatest::SaveDataL( TInt /*aResultsRef*/, CBufBase& aObject,
+							  const TDesC8& aType ) 
+	{
+	iLog->Log( _L8( "Saving data of type: '%S'" ), &aType );
+	RFs fs;
+	User::LeaveIfError( fs.Connect() );
+	CleanupClosePushL( fs );
+	RFile file;
+	User::LeaveIfError( file.Replace ( fs, iSaveFileName, EFileWrite ) );
+	CleanupClosePushL( file );
+	TPtrC8 p( aObject.Ptr( 0 ) );
+	User::LeaveIfError( file.Write( p ) );
+	CleanupStack::PopAndDestroy( 2 ); // file, fs
+	}
+							  
+		
+	
+void Cdmatest::FetchNodeResultsL( TInt /*aResultsRef*/, CBufBase& aObject,
+							  const TDesC8& /*aType*/ )
+	{
+	TPtrC8 ptr( aObject.Ptr( 0 ) );	
+	iLog->Log( _L8("FetchNodeResultsL for '%S': '%S'" ), iURI, &ptr );
+	
+	if ( ptr.Length() > 0 )
+		{
+		TPtrC8 last( LastURISeg( ptr ) );
+		HBufC8 *oldUri = HBufC8::NewL( iURI->Length() );
+		(*oldUri) = *iURI; 
+		do 
+			{
+			iLog->Log ( _L8( " Node: '%S' "), &last );
+			HBufC8 *nUri = HBufC8::NewLC( oldUri->Length() + 1 + last.Length() );
+			nUri->Des().Copy( *oldUri ) ;
+			nUri->Des().Append( '/' );
+			nUri->Des().Append( last );
+			
+			SetURIL( nUri );
+			//iResultsFunction = FetchNodeResultsL;
+			
+		    //TPtrC8 parentURI(RemoveLastSeg(*nUri));
+		    //HBufC8 *luid = GetLuidAllocLC( parentURI );
+		    CleanupStack::Pop( nUri );
+			
+			HBufC8 *luid = GetLuidAllocLC( *iURI );
+			
+			Adapter()->ChildURIListL( *nUri, KNullDesC8, *iEmptyMappingInfoArray, 4, 5 );//Dipak
+			
+			CleanupStack::PopAndDestroy( luid ); 			
+			
+			ptr.Set( RemoveLastURISeg( ptr ) );
+			last.Set( LastURISeg( ptr ) );
+			
+			}
+		while (last != KNullDesC8);	
+		}
+	
+	}
+	
+
+	
+TPtrC8 Cdmatest::LastURISeg( const TDesC8& aURI )
+	{
+	TInt i;
+	for( i = aURI.Length() - 1; i >= 0; i-- ) 
+		{
+		if( aURI[i] == '/' )
+			{
+			break;
+			}
+		}
+
+	if( i == 0 )
+		{
+		return aURI;
+		}
+	else
+		{
+		return aURI.Mid( i+1 );
+		}
+	}
+TPtrC8 Cdmatest::RemoveLastSeg(const TDesC8& aURI)
+	{
+	TInt i;
+	for(i=aURI.Length()-1;i>=0;i--)
+		{
+		if(aURI[i]==KNSmlDMUriSeparator)
+			{
+			break;
+			}
+		}
+
+	if(i>0)
+		{
+		return aURI.Left(i);
+		}
+	else
+		{
+		return KNullDesC8();
+		}
+	}
+
+// ------------------------------------------------------------------------------------------------
+// TPtrC8 Cdmatest::RemoveLastURISeg(const TDesC8& aURI)
+// returns parent uri, i.e. removes last uri segment
+// ------------------------------------------------------------------------------------------------
+TPtrC8 Cdmatest::RemoveLastURISeg( const TDesC8& aURI )
+	{
+	TInt i;
+	for ( i = aURI.Length() - 1; i >= 0 ; i-- )
+		{
+		if( aURI[i] == '/' )
+			{
+			break;
+			}
+		}
+	if ( i > -1 )
+		{
+		return aURI.Left( i );	
+		}
+	else
+		{
+		return KNullDesC8();
+		}
+	}	
+	
+TPtrC Cdmatest::RemoveLastURISeg( const TDesC& aURI )
+	{
+	TInt i;
+	for ( i = aURI.Length() - 1; i >= 0 ; i-- )
+		{
+		if( aURI[i] == '/' )
+			{
+			break;
+			}
+		}
+	if ( i > -1 )
+		{
+		return aURI.Left( i );	
+		}
+	else
+
+		{
+		return KNullDesC();
+		}
+	}		
+	
+void Cdmatest::SetURIL( const TDesC& aURI )
+	{
+	if ( iURI != NULL )
+		{
+		delete iURI ;
+		iURI = NULL;
+		}
+	iURI = HBufC8::NewL( aURI.Length() ) ;
+	iURI->Des().Copy( aURI );
+	}
+	
+void Cdmatest::SetURIL( const TDesC8& aURI )
+	{
+	if ( iURI != NULL )
+		{
+		delete iURI ;
+		iURI = NULL;
+		}
+	iURI = HBufC8::NewL( aURI.Length() ) ;
+	iURI->Des().Copy( aURI );
+	}	
+
+void Cdmatest::SetURIL( HBufC8* aURI )
+	{
+	if ( iURI != NULL )
+		{
+		delete iURI ;
+		iURI = NULL;
+		}
+	iURI = aURI ;
+	}
+		
+		
+		
+void Cdmatest::SetResultsL( 
+	TInt aResultsRef, 
+	CBufBase& aObject,
+	const TDesC8& aType )
+	{
+	TPtrC8 ptr( aObject.Ptr(0) );
+	iLog->Log( _L8( "SetResults, ref=%d, object='%S', type='%S'" ), aResultsRef, &ptr, &aType );
+	if ( iResultsFunction )
+		{
+		(this->*iResultsFunction)( aResultsRef, aObject, aType );
+		iResultsFunction = NULL ;
+		}
+	
+	}
+
+
+void Cdmatest::SetStatusL( TInt aStatusRef,
+							 MSmlDmAdapter::TError aErrorCode ) 
+	{
+	iStatus = aErrorCode ;
+	iLog->Log( _L( "SetStatusL, ref=%d, code=%d" ), aStatusRef, aErrorCode );
+	
+	
+	}
+	
+void Cdmatest::SetMappingL( const TDesC8& aURI, const TDesC8& aLUID ) 
+	{
+	iLog->Log( _L8( "SetMappingL, aURI='%s', aLUID='%s'" ), aURI.Ptr(), aLUID.Ptr() );	
+	
+	iMappingTable.Append(TMapping( aURI, aLUID ) )	;
+	}
+	
+HBufC8* Cdmatest::GetLuidAllocL( const TDesC8& aURI ) 
+	{
+	iLog->Log( _L8( "GetLuidAllocL, aURI='%S'" ), &aURI );		
+	HBufC8 *res = NULL;		
+	for( TInt i(0); i < iMappingTable.Count(); i++ )	
+		{
+		if ( aURI == iMappingTable[i].iURI )
+			{
+			res = iMappingTable[i].iLuid.AllocL();
+			}
+		}
+	if ( res == NULL )
+		{
+		res = HBufC8::NewL( 0 );
+		}
+	iLog->Log( _L8( "GetLuidAllocL, response='%S'" ), res );
+	return res;
+	}	    
+    
+HBufC8* Cdmatest::GetLuidAllocLC( const TDesC8& aURI ) 
+	{
+	iLog->Log( _L8( "GetLuidAllocL, aURI='%S'" ), &aURI );
+	HBufC8 *res = NULL;		
+	for( TInt i(0); i < iMappingTable.Count(); i++ )	
+		{
+		if ( aURI == iMappingTable[i].iURI )
+			{
+			res = iMappingTable[i].iLuid.AllocLC();
+			break;
+			}
+		}
+	if ( res == NULL )
+		{
+		res = HBufC8::NewLC( 0 );
+		}
+	iLog->Log( _L8( "GetLuidAllocLC, response='%S'" ), res );
+	return res ;
+	}	
+    	
+#ifdef __TARM_SYMBIAN_CONVERGENCY
+    
+void Cdmatest::GetMappingInfoListL( const TDesC8& /*aURI*/,
+								CArrayFix<TSmlDmMappingInfo>& /*aSegmentList*/ )
+	{
+	// do nothing
+	}								
+
+#else
+// nothing
+#endif
+//***************************************************************************
+//  End of File
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/adapters/syncmldm12/tsrc/src/syncmldm12test.cpp	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,117 @@
+/*
+* Copyright (c) 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:  Implementation of DM adapter test component
+* 	This is part of omadmextensions/adapter test application.
+*
+*/
+
+
+
+
+
+
+// INCLUDE FILES
+#include <Stiftestinterface.h>
+#include "syncmldm12Test.h"
+#include <stiflogger.h>
+
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// Csyncmldm12Test::Csyncmldm12Test
+// C++ default constructor can NOT contain any code, that
+// might leave.
+// -----------------------------------------------------------------------------
+//
+/*Csyncmldm12Test::Csyncmldm12Test( 
+    CTestModuleIf& aTestModuleIf ):
+        CScriptBase( aTestModuleIf )
+    {
+    }*/
+Csyncmldm12Test::Csyncmldm12Test( CTestModuleIf& aTestModuleIf )
+		: Cdmatest( aTestModuleIf, KAdapterUid )
+    {
+    }
+// -----------------------------------------------------------------------------
+// Csyncmldm12Test::ConstructL
+// Symbian 2nd phase constructor can leave.
+// -----------------------------------------------------------------------------
+//
+void Csyncmldm12Test::ConstructL()
+    {
+/*    iLog = CStifLogger::NewL( KamtestLogPath, 
+                          KamtestLogFile,
+                          CStifLogger::ETxt,
+                          CStifLogger::EFile,
+                          EFalse );*///Commented the Part for syncmldm12Test Dipak
+    iLog = CStifLogger::NewL( KamtestLogPath, 
+                          KamtestLogFile,
+                          CStifLogger::ETxt,
+                          CStifLogger::EFile );
+                          
+    iLog->Log( _L( "Loading Adapter" ) );
+    
+	Cdmatest::ConstructL();                         	
+
+    }
+
+// -----------------------------------------------------------------------------
+// Csyncmldm12Test::NewL
+// Two-phased constructor.
+// -----------------------------------------------------------------------------
+//
+Csyncmldm12Test* Csyncmldm12Test::NewL( 
+    CTestModuleIf& aTestModuleIf )
+    {
+    Csyncmldm12Test* self = new (ELeave) Csyncmldm12Test( aTestModuleIf );
+    
+    CleanupStack::PushL( self );
+    self->ConstructL();
+    CleanupStack::Pop();
+
+    return self;
+    
+    }
+    
+// Destructor
+Csyncmldm12Test::~Csyncmldm12Test()
+    { 
+    
+    // Delete resources allocated from test methods
+//    Delete();
+    
+    // Delete logger
+//    delete iLog;  
+    
+    }
+
+// ========================== OTHER EXPORTED FUNCTIONS =========================
+
+// -----------------------------------------------------------------------------
+// LibEntryL is a polymorphic Dll entry point.
+// Returns: CScriptBase: New CScriptBase derived object
+// -----------------------------------------------------------------------------
+//
+EXPORT_C CScriptBase* LibEntryL( 
+    CTestModuleIf& aTestModuleIf ) // Backpointer to STIF Test Framework
+    {
+    
+    return ( CScriptBase* ) Csyncmldm12Test::NewL( aTestModuleIf );
+        
+    }
+
+
+    
+//  End of File
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/adapters/syncmldm12/tsrc/src/syncmldm12testBlocks.cpp	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,108 @@
+/*
+* Copyright (c) 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:  Implementation of DM adapter test component
+* 	This is part of omadmextensions/adapter test application.
+*
+*/
+
+
+
+
+
+
+// INCLUDE FILES
+#include <e32svr.h>
+#include <StifParser.h>
+#include <Stiftestinterface.h>
+#include "syncmldm12Test.h"
+#include <e32math.h>
+#include <f32file.h>
+#include <swinstapi.h>
+
+
+//using namespace NApplicationManagement;//Dipak
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// Csyncmldm12Test::Delete
+// Delete here all resources allocated and opened from test methods. 
+// Called from destructor. 
+// -----------------------------------------------------------------------------
+//
+void Csyncmldm12Test::Delete() 
+    {
+    
+    }
+    
+// -----------------------------------------------------------------------------
+// Csyncmldm12Test::RunMethodL
+// Run specified method. Contains also table of test mothods and their names.
+// -----------------------------------------------------------------------------
+//
+TInt Csyncmldm12Test::RunMethodL( 
+    CStifItemParser& aItem ) 
+    {
+   
+    TStifFunctionInfo const KFunctions[] =
+        {  
+        // Copy this line for every implemented function.
+        // First string is the function name used in TestScripter script file.
+        // Second is the actual implementation member function. 
+        ENTRY( "DDFStructure", Csyncmldm12Test::DDFStructureL),
+        ENTRY( "FetchNode", Csyncmldm12Test::FetchNodeL ),
+        ENTRY( "FetchLeaf", Csyncmldm12Test::FetchLeafL ),
+        ENTRY( "AddNode", Csyncmldm12Test::AddNodeL ),
+        ENTRY( "UpdateLeaf", Csyncmldm12Test::UpdateLeafL ),
+        ENTRY( "UpdateLeafData", Csyncmldm12Test::UpdateLeafDataL ),
+        ENTRY( "Execute", Csyncmldm12Test::ExecuteLeafL ),
+        ENTRY( "ExecuteData", Csyncmldm12Test::ExecuteLeafDataL ),
+        ENTRY( "DeleteNode", Csyncmldm12Test::DeleteObjectL ),
+        ENTRY( "StartAtomic", Csyncmldm12Test::StartAtomicL),
+	    ENTRY( "CommitAtomic", Csyncmldm12Test::CommitAtomicL),
+	    ENTRY( "RollbackAtomic", Csyncmldm12Test::RollbackAtomicL),
+	    ENTRY( "CompleteCommands", Csyncmldm12Test::CompleteCommandsL),
+        };
+
+    const TInt count = sizeof( KFunctions ) / 
+                        sizeof( TStifFunctionInfo );
+
+    return RunInternalL( KFunctions, count, aItem );
+
+    }    
+
+        
+        
+HBufC8 *Csyncmldm12Test::GetNextStringLC ( CStifItemParser& aItem, const TDesC &aName )
+	{
+	TPtrC nodename;
+	nodename.Set( KNullDesC );
+
+    TInt i( aItem.GetNextString ( nodename ) );
+    if ( i != KErrNone ) 
+	    {
+	    iLog->Log( _L( "ERROR Reading '%S' argument: 0x%X" ), &aName, i );
+	    }
+	else
+		{
+		iLog->Log( _L("%S: %S"), &aName, &nodename);
+		}
+	
+	HBufC8 *buf = HBufC8::NewLC( nodename.Length() ) ;
+	buf->Des().Copy( nodename );
+	
+	return buf;
+	}
+	
+//  End of File
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/cpqtsp/Cpqtsp.pri	Fri Apr 16 14:53:31 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 "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description: 
+#
+
+SOURCES = \
+    src/main.cpp \
+    src/CpQtSpMainWindow.cpp \
+    src/CpQtSpView.cpp \
+    src/CWPBioControl.cpp \
+    src/CWPNameValue.cpp \
+    src/CWPStringPair.cpp 
+    
+HEADERS = \
+    inc/CpQtSpMainWindow.h \
+    inc/CpQtSpView.h \
+    inc/CWPBioControl.h \
+    inc/CWPNameValue.h \
+    inc/CWPStringPair.h \
+    inc/ProvisioningUIDs.h \
+    inc/ProvisioningDebug.h \
+    ../../../../mw/remotemgmt/omaprovisioning/provisioning/ProvisioningEngine/Inc 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/cpqtsp/cpqtsp.pro	Fri Apr 16 14:53:31 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 "Eclipse Public License v1.0"
+# which accompanies 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=app
+TARGET=Cpqtsp
+
+symbian: {
+	TARGET.CAPABILITY = CAP_APPLICATION 
+  TARGET.EPOCALLOWDLLDATA = 1  
+  TARGET.UID3 = 0x2002DD2B	
+	BLD_INF_RULES.prj_exports += "$${LITERAL_HASH}include <platform_paths.hrh>"
+	BLD_INF_RULES.prj_exports += "rom/cpqtsp.iby CORE_APP_LAYER_IBY_EXPORT_PATH(cpqtsp.iby)"
+	BLD_INF_RULES.prj_exports += "rom/cpsqtsp_resources.iby LANGUAGE_APP_LAYER_IBY_EXPORT_PATH(cpsqtsp_resources.iby)"
+}
+
+CONFIG += hb service
+include(Cpqtsp.pri)
+LIBS+=-lxqservice -lxqserviceutil -lflogger
+MMP_RULES += "LIBRARY msgs.lib centralrepository.lib provisioningengine.lib featmgr.lib"
+
+#TRANSLATIONS += deviceupdates.ts
+
+SERVICE.FILE = resources/service_conf.xml
+SERVICE.OPTIONS = embeddable
+SERVICE.OPTIONS += hidden
+
+libFiles.sources = xqservice.dll
+libFiles.path = "!:\sys\bin"
+DEPLOYMENT += libFiles
+
+MOC_DIR = moc
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/cpqtsp/inc/CWPBioControl.h	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,105 @@
+/*
+* Copyright (c) 2002 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: 
+*     Bio control for Provisioning documents.
+*
+*/
+
+
+#ifndef CWPBIOCONTROL_H
+#define CWPBIOCONTROL_H
+
+// INCLUDES
+#include <e32cmn.h>
+#include <msvapi.h>
+#include "CWPBootstrap.h"
+
+class CWPEngine;
+class CWPNameValue;
+class CWPPushMessage;
+class CWPBootstarp;
+
+// CLASS DECLARATION
+
+/**
+ * Bio control for OMA Provisioning messages.
+ * @since 2.0
+ */
+ 
+ class CDummyObserver : public CBase, public MMsvSessionObserver
+{
+public:
+        void HandleSessionEventL(TMsvSessionEvent, TAny*, TAny*, TAny*) {};
+};
+
+
+class CWPBioControl//: public CMsgBioControl
+    {
+    public:  // Constructor and destructor
+
+        /**
+        * Two-phased constructor.
+        * @param aObserver Reference to the Bio control observer.
+        * @param aSession Reference to Message Server session.
+        * @param aId Id of the message.
+        * @param aEditorOrViewerMode Enum for the mode, is it as editor or viewer.
+        * @param aFileName The newly created object.
+        * @param aFile file handle to provisioning content.
+        */
+        IMPORT_C static CWPBioControl* NewL( CMsvSession* aSession,TMsvId aId);
+       ~CWPBioControl();
+        RPointerArray<CWPNameValue>* CollectItemsLC() const;        
+	    CWPEngine* returnEngine();	       
+	    
+    private: // Constructors
+
+        /**
+        * Constructor is prohibited.
+        * @param aObserver Reference to the Bio control observer.
+        * @param aSession Reference to Message Server session.
+        * @param aId Id of the message in Message Server.
+        * @param aEditorOrViewerMode Enum for the mode, is it as editor or viewer.
+        * @param aFileName The newly created object.
+        * @param aFile file handle to provisioning content.
+        */
+        CWPBioControl( CMsvSession* aSession,TMsvId aId);
+        void ConstructL(CMsvSession* aSession,TMsvId aId);
+	
+    private: 
+        
+        void AddItemsL();
+        void CollateAndAddItemsL( RPointerArray<CWPNameValue>& aItems );        
+        void DoSaveL();
+        void AuthenticateL( CWPPushMessage& aMessage );
+        void RestoreMsgL();
+        static TInt Compare( const CWPNameValue& aImpl1,const CWPNameValue& aImpl2 );
+        void SaveSettingsL();
+        void SetCenrepKeyL(const TDesC8& aValue);
+        void SaveMessageL();
+        static void Cleanup( TAny* aAny );
+        
+    private: 
+        CWPEngine*      iEngine;
+        CWPPushMessage* iMessage;
+        CDummyObserver* iObserver;
+        CMsvSession* iSession;
+        TMsvId iId;   
+        TMsvEntry iEntry;
+    };
+
+
+
+#endif // CWPBIOCONTROL_H
+
+// End of File
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/cpqtsp/inc/CWPNameValue.h	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,98 @@
+/*
+* Copyright (c) 2002 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 class encapsulates a name and value pair.
+*
+*/
+
+
+
+#ifndef _CWPNameValue_H_
+#define _CWPNameValue_H_
+
+// INCLUDES
+
+#include <e32base.h>                    // CBase
+
+// CLASS DECLARATION
+
+/**
+ * Class holds name and value text pairs.
+ */
+class CWPNameValue : public CBase
+    {
+    public: // construction
+
+         /**
+         * Two phased constructor.
+         * @param aName The field name.
+         * @param aValue The field value.
+         * @return The newly constructed object.
+         */
+        IMPORT_C static CWPNameValue* NewL( HBufC* aName, HBufC* aValue );
+        IMPORT_C static CWPNameValue* NewL(const TDesC& aName, const TDesC& aValue);
+        IMPORT_C static CWPNameValue* NewLC(const TDesC& aName, const TDesC& aValue);
+
+        /// Destructor
+        ~CWPNameValue();
+    
+    public: // new functions
+
+        /// @return Name or KNullDesC
+        IMPORT_C const TDesC& Name() const;
+        /// @return Value or KNullDesC
+        IMPORT_C const TDesC& Value() const;
+
+    private: // construction
+
+        /**
+         * Second phase constructor.
+         * @param aName The field name.
+         * @param aValue The field value.
+         */
+        void ConstructL( const TDesC& aName, const TDesC& aValue );
+
+        /**
+         * Second phase constructor.
+         * @param aName The field name.
+         * @param aValue The field value.
+         */
+        void ConstructL( HBufC* aName, HBufC* aValue );
+
+    private: // hidden	
+
+        /// Default constructor.
+        CWPNameValue();
+
+        /// Another constructor
+        CWPNameValue( HBufC* aName, HBufC* aValue );
+
+        /// Copy contructor prohibited.
+        CWPNameValue(const CWPNameValue& aSource);
+
+        /// Assignment operator prohibited.
+        const CWPNameValue& operator=(const CWPNameValue& aSource);
+
+    private:
+    
+        /// Own. Pointer to the name.
+        HBufC* iName;
+
+        /// Own. Pointer to the value.
+        HBufC* iValue;
+    };
+
+#endif // _CWPNameValue_H_
+
+// End of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/cpqtsp/inc/CWPStringPair.h	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,69 @@
+/*
+* Copyright (c) 2002 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: 
+*     Sortable string pair.
+*
+*/
+
+
+#ifndef CWPSTRINGPAIR_H
+#define CWPSTRINGPAIR_H
+
+// INCLUDES
+#include <e32base.h>
+
+// CLASS DECLARATION
+
+/**
+ * Sortable string pair
+ */
+class CWPStringPair : public CBase
+	{
+	public:
+        /**
+        * C++ default constructor.
+        */
+		CWPStringPair();
+
+        /**
+        * Destructor.
+        */
+		~CWPStringPair();
+
+	public:
+		/**
+		* Sets the values for string pair.
+		* @param aName The name of the string
+		* @param aValue The value of the string
+		*/
+		void SetL( const TDesC& aName, const TDesC& aValue );
+
+	public:
+		// Points to iName. Use for constructing TKeyArrayFixPtr.
+		TPtrC iNamePtr;
+
+		// Points to iValue. Use for constructing TKeyArrayFixPtr.
+		TPtrC iValuePtr;
+
+	private:
+		// The name of the pair. Owns.
+		HBufC* iName;
+
+		// The value of the pair. Owns.
+		HBufC* iValue;
+	};
+
+#endif // CWPSTRINGPAIR_H
+
+// End of File
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/cpqtsp/inc/CpQtSpMainWindow.h	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,42 @@
+/*
+* Copyright (c) 2002 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 CPQTSPMAINWINDOW_H
+#define CPQTSPMAINWINDOW_H
+
+#include <hbmainwindow.h>
+
+class CpQtSpView;
+class CpQtSp;
+
+class CpQtSpMainWindow : public HbMainWindow
+{
+    Q_OBJECT
+    
+public:
+     CpQtSpMainWindow(QWidget *parent=0);
+     ~CpQtSpMainWindow();   
+public slots:
+    void showView();
+    
+private:
+    CpQtSp* iServiceProvider;
+    CpQtSpView* iView;  
+};
+
+#endif // CPQTSPMAINWINDOW_H
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/cpqtsp/inc/CpQtSpView.h	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,83 @@
+/*
+* Copyright (c) 2002 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 CPQTSPVIEW_H
+#define CPQTSPVIEW_H
+
+#include <hbview.h>
+#include <xqserviceprovider.h>
+#include <QGraphicsLinearLayout>
+#include <CWPNameValue.h>
+#include <CWPBioControl.h>
+#include <msvapi.h>
+#include <hbscrollarea.h>
+
+class CObserver : public CBase, public MMsvSessionObserver
+{
+public:
+        void HandleSessionEventL(TMsvSessionEvent, TAny*, TAny*, TAny*) {};
+};
+
+
+class CpQtSp;
+class XQServiceRequest;
+
+class CpQtSpView : public HbView
+{
+    Q_OBJECT
+
+public:
+    CpQtSpView(CpQtSp* service,QGraphicsItem *parent = 0);
+    ~CpQtSpView();
+    void constructView();
+
+public slots:
+    void requestCompleted(const QVariant& value);
+    void saveProvisoningMessage();
+private:
+    CpQtSp* iServiceProvider; 
+    QGraphicsLinearLayout *layout;
+    HbFontSpec *iPrimaryFont;
+    HbFontSpec *iSecondaryFont;
+    RPointerArray<CWPNameValue>* iArray;
+    CWPBioControl* iBio;   
+};
+
+class CpQtSp : public XQServiceProvider
+{
+    Q_OBJECT
+public:
+    CpQtSp( QObject *parent = 0 );
+    ~CpQtSp();
+    void complete();    
+		TMsvId returnId();
+		CMsvSession* returnSession();
+	
+Q_SIGNALS:	
+    void showView();
+    
+public slots:
+    QString ProcessMessage(const QString& number);
+    
+private:
+    TMsvId iId;
+    CObserver* iObserver;
+    CMsvSession* iSession;    
+};
+
+#endif // CPQTSPVIEW_H
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/cpqtsp/inc/ProvisioningDebug.h	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,131 @@
+/*
+* 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:  This file defines logging macros for Provisioning
+*
+*/
+
+
+
+#ifndef PROVISIONINGDEBUG_H
+#define PROVISIONINGDEBUG_H
+
+#include <e32debug.h> 
+
+//Examples
+//FLOG( _L( "[Provisioning] ProvisioningEngine::ConstructL:" ) );
+//FTRACE(RDebug::Print(_L("[Provisioning] ProvisioningEngine::ConstructL: err (%d)"), err));
+#ifdef _DEBUG
+
+const TInt KBTHexDumpWidth=16;
+const TInt KBTLogBufferSize=100;
+const TText KFullStopChar='.';
+
+_LIT(KBTFirstFormatString,"%04x: ");
+_LIT(KBTSecondFormatString,"%02x ");
+_LIT(KBTThirdFormatString,"%c");
+_LIT(KBTThreeSpaces,"   ");
+_LIT(KBTSeparator," ");
+
+inline void HexDump(const TUint8* aPtr, TInt aLen)
+    {
+	if( aPtr != NULL )
+	    {
+    	TBuf<KBTLogBufferSize> line;
+	    TInt i = 0;
+
+    	while (aLen>0)
+    		{
+    		TInt n = (aLen>KBTHexDumpWidth ? KBTHexDumpWidth : aLen);
+    		line.AppendFormat(KBTFirstFormatString,i);
+    		TInt j;
+    		for (j=0; j<n; j++)
+    			line.AppendFormat(KBTSecondFormatString,aPtr[i+j]);
+    		while (j++<KBTHexDumpWidth)
+    			line.Append(KBTThreeSpaces);
+    		line.Append(KBTSeparator);
+    		for (j=0; j<n; j++)
+    			line.AppendFormat(KBTThirdFormatString,(aPtr[i+j]<32 || aPtr[i+j]>126 || aPtr[i+j]==37) ? KFullStopChar : aPtr[i+j]);
+
+    		RDebug::Print(line);
+
+            line.Zero();
+    		aLen-=n;
+    		i+=n;
+    	    }
+        }
+    }
+
+
+// ------------------------------------------
+
+inline void FHex(const TUint8* aPtr, TInt aLen)
+    {
+    HexDump( aPtr, aLen );
+    }
+
+// ------------------------------------------
+
+inline void FHex(const TDesC8& aDes)
+    {
+    HexDump(aDes.Ptr(), aDes.Length());
+    }
+
+// ===========================================================================
+#ifdef __WINS__     // File logging for WINS
+// ===========================================================================
+#include <e32std.h>
+#include <f32file.h>
+#include <flogger.h>
+
+_LIT( KLogFile, "Provisioning.log" );
+_LIT( KLogDirFullName, "c:\\logs\\" );
+_LIT( KLogDir, "Provisioning" );
+
+#define FLOG( a )   { FPrint(a); }
+#define FTRACE( a ) { a; }
+
+// Declare the FPrint function
+//
+inline void FPrint( const TRefByValue<const TDesC> aFmt, ... )
+    {
+    VA_LIST list;
+    VA_START( list, aFmt );
+    RFileLogger::WriteFormat( KLogDir,
+                              KLogFile,
+                              EFileLoggingModeAppend,
+                              aFmt,
+                              list );
+    }
+
+// ===========================================================================
+#else               // RDebug logging for target HW
+// ===========================================================================
+#include <e32svr.h>
+
+#define FLOG( a )   { RDebug::Print( a ); }
+#define FTRACE( a ) { a; }
+
+#endif //__WINS__
+
+// ===========================================================================
+#else // // No loggings --> Reduced binary size
+// ===========================================================================
+#define FLOG( a )
+#define FTRACE( a )
+
+#endif // _DEBUG
+
+#endif      // PROVISIONINGDEBUG_H
+            
+// End of File
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/cpqtsp/inc/ProvisioningUIDs.h	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,147 @@
+/*
+* Copyright (c) 2002 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 for project Provisioning
+*
+*/
+
+
+
+#ifndef PROVISIONINGUID_H
+#define PROVISIONINGUID_H
+
+//  CONSTANTS  
+
+/// ECOM plugin
+#define KECOMUid2 0x10009D8D
+
+/// Normal Symbian OS DLL
+#define KSymbianDLLUid2 0x1000008d
+
+/// UID2 for Provisioning BIO control
+#define KProvisioningBCUid2 0x10005F5F
+
+/// UID3 for Provisioning BIO control
+#define KProvisioningBCUid3 0x101F84D3
+
+/// UID for the Provisioning Message type for BIO database
+#define KProvisioningMessageTypeUid 0x101F84D1
+
+/// UID2 for the handler plugin for WAP Provisioning documents
+#define KProvisioningHandlerUid2 KECOMUid2
+
+/// UID3 for the handler plugin DLL for WAP Provisioning documents
+#define KProvisioningHandlerUid3 0x101F84D2
+
+/// UID for the handler plugin implementation
+#define KProvisioningHandlerImplUid 0x101F84D3
+
+/// UID of the Content Type Handler plugin interface
+#define KProvisioningHandlerInterface 0x101F3E5E
+
+/// UID2 of the Provisioning Parser DLL
+#define KProvisioningParserUid2 KSymbianDLLUid2
+
+/// UID3 of the Provisioning Parser DLL
+#define KProvisioningParserUid3 0x101F84D4
+
+/// UID of the Provisisioning Adapter plugin interface
+#define KProvisioningAdapterInterface 0x101F84D5
+
+/// UID2 of the Provisioning Engine DLL
+#define KProvisioningEngineUid2 KSymbianDLLUid2
+
+/// UID3 of the Provisioning Engine DLL
+#define KProvisioningEngineUid3 0x101F84D6
+
+/// UID for HTTPHeader stream in WAP Provisioning message
+#define KProvisioningMessageStreamUid 0x101F84D7
+
+/// UID2 for the APAdapter DLL
+#define KProvisioningAPAdapterDllUid2 KECOMUid2
+
+/// UID3 for the APAdapter DLL
+#define KProvisioningAPAdapterDllUid3 0x101F84D8
+
+/// UID for the APAdapter
+#define KProvisioningAPAdapterUid 0x101F84D9
+
+/// UID2 for the Browser+MMSAdapter DLL
+#define KProvisioningWAPAdapterDllUid2 KECOMUid2
+
+/// UID3 for the Browser+MMSAdapter DLL
+#define KProvisioningWAPAdapterDllUid3 0x101F84DC
+
+/// UID for the BrowserAdapter
+#define KProvisioningBrowserAdapterUid 0x101F84DB
+
+/// UID for the MMSAdapter
+#define KProvisioningMMSAdapterUid 0x101F84DD
+
+/// UID2 for the DataSyncAdapter DLL
+#define KProvisioningDataSyncAdapterDllUid2 KECOMUid2
+
+/// UID3 for the DataSyncAdapter DLL
+#define KProvisioningDataSyncAdapterDllUid3 0x101F84DE
+
+/// UID for the DataSyncAdapter
+#define KProvisioningDataSyncAdapterUid 0x101F84DF
+
+/// UID2 for the DeviceManagementAdapter DLL
+#define KProvisioningDeviceManagementAdapterDllUid2 KECOMUid2
+
+/// UID3 for the DeviceManagementAdapter DLL
+#define KProvisioningDeviceManagementAdapterDllUid3 0x101F84E0
+
+/// UID for the DeviceManagementAdapter
+#define KProvisioningDeviceManagementAdapterUid 0x101F84E1
+
+/// UID2 for the IMAdapter DLL
+#define KProvisioningIMAdapterDllUid2 KECOMUid2
+
+/// UID3 for the IMAdapter DLL
+#define KProvisioningIMAdapterDllUid3 0x101F84E2
+
+/// UID for the IMAdapter
+#define KProvisioningIMAdapterUid 0x101F84E3
+
+/// UID2 for the StreamingAdapter DLL
+#define KProvisioningStreamingAdapterUid2 KECOMUid2
+
+/// UID3 for the StreamingAdapter DLL
+#define KProvisioningStreamingAdapterDllUid3 0x101F84E6
+
+/// UID for the StreamingAdapter
+#define KProvisioningStreamingAdapterUid 0x101F84E7
+
+/// UID2 for the JavaAdapter DLL
+#define KProvisioningJavaAdapterUid2 KECOMUid2
+
+/// UID3 for the JavaAdapter DLL
+#define KProvisioningJavaAdapterDllUid3 0x101F84E8
+
+/// UID for the JavaAdapter
+#define KProvisioningJavaAdapterUid 0x101F84E9
+
+/// UID2 for Symbian application
+#define KProvisioningCxUID2 0x100039CE
+
+/// UID3 for ProvisioningCx application
+#define KProvisioningCxUID3 0x101F8597
+
+/// UID for the PresenceAdapter
+#define KProvisioningPecAdapterUid 0x102072D3
+
+#endif      //  PROVISIONINGUID_H
+            
+// End of File
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/cpqtsp/resources/service_conf.xml	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<service name="com.nokia.services.MDM" filepath="must-not-be-empty">
+  <description>OMA CP Service</description>
+  <interface name="Provisioning" version="1.0" capabilities="">
+    <description>OMA CP Service Provider</description>
+  </interface>
+</service>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/cpqtsp/rom/cpqtsp.iby	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,30 @@
+/*
+* 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:     cpqtsp.iby
+*
+*/
+
+#ifndef __CPQTSP_IBY__
+#define __CPQTSP_IBY__
+
+#include <bldvariant.hrh>
+#include <data_caging_paths_for_iby.hrh> 
+
+file = ABI_DIR/BUILD_DIR/Cpqtsp.exe PROGRAMS_DIR/Cpqtsp.exe
+data = DATAZ_/private/10003a3f/import/apps/Cpqtsp_reg.rsc private/10003a3f/import/apps/Cpqtsp_reg.rsc
+
+data=/epoc32/data/z/resource/plugins/devicedialogs/devicemanagementnotifiersplugin.qtplugin		resource/plugins/devicedialogs/devicemanagementnotifiersplugin.qtplugin
+file=ABI_DIR/BUILD_DIR/devicemanagementnotifiersplugin.dll		SHARED_LIB_DIR/devicemanagementnotifiersplugin.dll
+
+#endif
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/cpqtsp/rom/cpsqtsp_resources.iby	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,27 @@
+/*
+* 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:     cpqtspresources.iby
+*
+*/
+
+#ifndef __CPQTSP_RESORCES_IBY__
+#define __CPQTSP_RESORCES_IBY__
+
+#include <data_caging_paths_for_iby.hrh> 
+
+
+data=DATAZ_/resource/apps/Cpqtsp.rsc /resource/apps/Cpqtsp.rsc
+
+
+#endif
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/cpqtsp/src/CWPBioControl.cpp	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,312 @@
+/*
+* Copyright (c) 2002 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: 
+*     Bio control for Provisioning documents.
+*
+*/
+
+// INCLUDE FILES
+#include "CWPBioControl.h"
+#include <msvapi.h>
+#include <bldvariant.hrh>
+#include <msvids.h>
+#include <featmgr.h>
+#include <sysutil.h>
+#include "CWPEngine.h"
+#include "CWPAdapter.h"
+#include "MWPPhone.h"
+#include "WPPhoneFactory.h"
+#include "CWPPushMessage.h"
+#include "ProvisioningUIDs.h"
+#include "MWPContextManager.h"
+#include "ProvisioningDebug.h"
+#include "CWPNameValue.h"
+#include <aknmessagequerydialog.h> 
+#include "ProvisioningInternalCRKeys.h"
+
+// CONSTANTS
+/// Maximum length of PIN code
+const TInt KMaxPinSize = 20;
+/// Number of retries for PIN
+// const TInt KPinRetries = 3; // Removed, because iMtmData1 data member of TMsvEntry in CWPMessage.cpp contains Max tries, default=3.
+///NONE
+_LIT(KNone,"");
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// Constructor.
+// -----------------------------------------------------------------------------
+//
+CWPBioControl::CWPBioControl(CMsvSession* aSession,TMsvId aId)
+                          
+    {
+    }
+
+// -----------------------------------------------------------------------------
+// CWPBioControl::ConstructL
+// Symbian 2nd phase constructor can leave.
+// -----------------------------------------------------------------------------
+//
+void CWPBioControl::ConstructL(CMsvSession* aSession,TMsvId aId)
+    {
+    FLOG( _L( "[ProvisioningBC] CWPBioControl::ConstructL:" ) );  
+    FeatureManager::InitializeLibL();
+    iSession = aSession;
+    iId = aId;
+    iEngine = CWPEngine::NewL();
+    RestoreMsgL();
+    FLOG( _L( "[ProvisioningBC] CWPBioControl::ConstructL: done" ) );
+    }
+
+// -----------------------------------------------------------------------------
+// CWPBioControl::NewL
+// Two-phased constructor.
+// -----------------------------------------------------------------------------
+//
+EXPORT_C CWPBioControl* CWPBioControl::NewL(CMsvSession* aSession,TMsvId aId)
+     {
+    CWPBioControl* self = new( ELeave ) CWPBioControl(aSession,aId);                                                       
+    CleanupStack::PushL( self );
+    self->ConstructL(aSession,aId);
+    CleanupStack::Pop();
+    return self;
+    }
+// -----------------------------------------------------------------------------
+// CWPBioControl::returnEngine
+// Return CWPEngine pointer
+// -----------------------------------------------------------------------------
+//    
+EXPORT_C CWPEngine* CWPBioControl::returnEngine()
+    {
+    return iEngine;
+    }
+
+// -----------------------------------------------------------------------------
+// Destructor
+// -----------------------------------------------------------------------------
+CWPBioControl::~CWPBioControl()
+    {
+    delete iEngine;
+    delete iMessage;
+    FeatureManager::UnInitializeLib();
+    }
+// ----------------------------------------------------------------------------
+// CWPBioControl ::RestoreMsgL
+// ----------------------------------------------------------------------------
+//
+void CWPBioControl::RestoreMsgL()
+    {                    
+    CMsvEntry* entry = iSession->GetEntryL(iId);   
+    CleanupStack::PushL( entry );
+    TMsvEntry tentry( entry->Entry() );
+    iMessage = CWPPushMessage::NewL();
+    CMsvStore* readStore = entry->ReadStoreL();
+    CleanupStack::PushL( readStore );
+    iMessage->RestoreL( *readStore );
+    CleanupStack::PopAndDestroy(); // readStore
+ 
+    TRAPD( result, iEngine->ImportDocumentL( iMessage->Body() ) );
+    if( result == KErrCorrupt )
+        {
+        //result = KErrMsgBioMessageNotValid;
+        }
+    FTRACE(RDebug::Print(_L("[ProvisioningBC] CWPBioControl::RestoreMsgL result (%d)"), result));
+    User::LeaveIfError( result );
+    
+    TBool preAuthenticated( iMessage->Authenticated() );
+    // If the message was not authenticated, give a warning
+    AuthenticateL( *iMessage );
+    if( !tentry.ReadOnly() && preAuthenticated != iMessage->Authenticated() )
+        {
+        // If the entry can be written to, get its edit store and save
+        // authentication flag. Failing is not dangerous, as the only
+        // effect is that the user has to re-enter the PIN.
+        // FLOG( _L( "[ProvisioningBC] CWPBioControl::RestoreMsgL 4 " ) );
+        TRAPD( ignoreError, SaveMessageL() );
+        if ( ignoreError ) ignoreError = 0; // prevent compiler warning 
+        }
+    
+    iEngine->PopulateL();
+    if( iEngine->ItemCount() == 0 )
+        {
+        FLOG( _L( "[ProvisioningBC] CWPBioControl::RestoreMsgL 7 " ) );
+        }
+
+    TPtrC8 orig8( iMessage->Originator() );
+    HBufC* orig16 = HBufC::NewLC( orig8.Length() );
+    orig16->Des().Copy( orig8 );
+    FLOG( _L( "[ProvisioningBC] CWPBioControl::RestoreMsgL 8 " ) );
+    if( iMessage->Authenticated() 
+        && iEngine->ContextExistsL( *orig16 ) )
+        {
+        TUint32 context( iEngine->ContextL( *orig16 ) );
+        iEngine->SetCurrentContextL( context );
+        }
+    else
+        {
+        iEngine->SetCurrentContextL( KWPMgrUidNoContext );
+        }
+        
+    
+    CleanupStack::PopAndDestroy(2);
+    FLOG( _L( "[ProvisioningBC] CWPBioControl::RestoreMsgL done" ) );
+    }
+
+// ----------------------------------------------------------------------------
+// CWPBioControl ::AuthenticateL
+// ----------------------------------------------------------------------------
+//
+void CWPBioControl::AuthenticateL( CWPPushMessage& aMessage )
+    {
+    if( !aMessage.Authenticated() )
+        {
+         MWPPhone* phone = NULL;
+         TBuf<KMaxPinSize> imsi;
+         TRAPD(err, phone = WPPhoneFactory::CreateL());
+         if(err!=KErrNone)
+             {
+             imsi = KNone;
+             }
+         else
+             {
+             imsi = phone->SubscriberId();
+             }
+        CWPBootstrap* bootstrap = CWPBootstrap::NewL( imsi );
+        if(phone)
+        delete phone;
+
+        CleanupStack::PushL( bootstrap );
+        CWPBootstrap::TBootstrapResult result( bootstrap->BootstrapL(aMessage,*iEngine,KNullDesC ) );
+        if( result == CWPBootstrap::EPinRequired )
+         {
+            CMsvEntry* entry = iSession->GetEntryL(iId);
+            TInt count = (entry->Entry()).MtmData1();
+            TInt ipin = 1234;
+            TBuf<KMaxPinSize> pin;
+            pin.AppendNum(ipin);
+            result = bootstrap->BootstrapL( aMessage, *iEngine, pin );
+            CleanupStack::PopAndDestroy( bootstrap );
+          }
+      }
+    if (aMessage.Authenticated() )
+        {
+        //update Cenrep key
+        TBuf8<100> orig;
+        orig.Copy(aMessage.Originator());
+        TRAPD(err, SetCenrepKeyL(orig));
+        User::LeaveIfError(err);
+
+        }
+    }
+// ----------------------------------------------------------------------------
+// CWPBioControl ::SaveMessageL
+// ----------------------------------------------------------------------------
+//
+void CWPBioControl::SaveMessageL()
+    {
+    CMsvEntry* entry = iSession->GetEntryL(iId);
+    CleanupStack::PushL( entry );
+
+    CMsvStore* editStore = entry->EditStoreL();
+    CleanupStack::PushL( editStore );
+    iMessage->StoreL( *editStore );
+    editStore->CommitL();
+    CleanupStack::PopAndDestroy(2); // editStore, entry
+    }
+
+// ----------------------------------------------------------------------------
+// CWPBioControl ::CollectItemsL
+// ----------------------------------------------------------------------------
+//
+EXPORT_C RPointerArray<CWPNameValue>* CWPBioControl::CollectItemsLC() const
+    {
+    RPointerArray<CWPNameValue>* array = new(ELeave) RPointerArray<CWPNameValue>;
+    CleanupStack::PushL( TCleanupItem( Cleanup, array ) );
+
+    TInt count( iEngine->ItemCount() );
+    FLOG( _L( "[ProvisioningBC] CWPBioControl::RestoreMsgL 83 " ) );
+    for( TInt index = 0; index < count; index++ )
+        {
+        const TDesC& text = iEngine->SummaryText( index );
+        const TDesC& title = iEngine->SummaryTitle( index );
+
+        CWPNameValue* pair = CWPNameValue::NewLC( title, text );
+        User::LeaveIfError( array->Append( pair ) );
+        CleanupStack::Pop( pair );
+        }
+    array->Sort( TLinearOrder<CWPNameValue>( CWPBioControl::Compare ) );
+    return array;
+    }
+
+// -----------------------------------------------------------------------------
+// CWPBioControl::Cleanup
+// -----------------------------------------------------------------------------
+//
+void CWPBioControl::Cleanup( TAny* aAny )
+    {
+    RPointerArray<CWPNameValue>* array = reinterpret_cast<RPointerArray<CWPNameValue>*>( aAny );
+    array->ResetAndDestroy();
+    array->Close();
+    delete array;
+    }
+
+// -----------------------------------------------------------------------------
+// CWPBioControl::Compare
+// -----------------------------------------------------------------------------
+//
+TInt CWPBioControl::Compare( const CWPNameValue& aItem1,
+                             const CWPNameValue& aItem2 )
+    {
+    return aItem1.Name().Compare( aItem2.Name() );
+    }
+
+// ----------------------------------------------------------------------------
+// CWPBioControl ::SetCenrepKey
+// ----------------------------------------------------------------------------
+//
+void CWPBioControl::SetCenrepKeyL(const TDesC8& aValue)
+    {
+
+    FLOG( _L( "[ProvisioningBC] CWPBioControl::SetCenrepKeyL" ) );
+
+    CRepository* rep= NULL;
+    TInt errorStatus = KErrNone;
+
+    TRAPD( errVal, rep = CRepository::NewL( KCRUidOMAProvisioningLV ))
+    ;
+
+    if (errVal == KErrNone)
+        {
+        errorStatus = rep->Set(KOMAProvOriginatorContent, aValue);
+        }
+    else
+        {
+        errorStatus = errVal;
+        }
+
+    if (rep)
+        {
+        delete rep;
+        }
+
+    if (errorStatus != KErrNone)
+        {
+        User::Leave(errorStatus);
+        }
+
+    FLOG( _L( "[ProvisioningBC] CWPBioControl::SetCenrepKeyL done" ) );
+
+    }
+//  End of File
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/cpqtsp/src/CWPNameValue.cpp	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,87 @@
+/*
+* Copyright (c) 2002 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 class encapsulates a name and value pair
+*
+*/
+
+
+// INCLUDE FILES
+
+#include "CWPNameValue.h"
+
+//  MEMBER FUNCTIONS
+
+EXPORT_C CWPNameValue* CWPNameValue::NewL( HBufC* aName, HBufC* aValue)
+    {
+    CWPNameValue* self = new (ELeave) CWPNameValue(aName, aValue);
+    return self;
+    }
+
+EXPORT_C CWPNameValue* CWPNameValue::NewL(const TDesC& aName, const TDesC& aValue)
+    {
+    CWPNameValue* self = CWPNameValue::NewLC( aName, aValue );
+    CleanupStack::Pop( self );
+    return self;
+    }
+
+EXPORT_C CWPNameValue* CWPNameValue::NewLC(const TDesC& aName, const TDesC& aValue)
+    {
+    CWPNameValue* self = new (ELeave) CWPNameValue;
+    CleanupStack::PushL(self);
+    self->ConstructL(aName, aValue);
+    return self;
+    }
+
+CWPNameValue::~CWPNameValue()
+    {
+    delete iName;
+    delete iValue;
+    }
+
+EXPORT_C const TDesC& CWPNameValue::Name() const
+    {
+    if (iName)
+        {
+        return *iName;
+        }
+    return KNullDesC;
+    }
+
+EXPORT_C const TDesC& CWPNameValue::Value() const
+    {
+    if (iValue)
+        {
+        return *iValue;
+        }
+    return KNullDesC;
+    }
+
+void CWPNameValue::ConstructL(const TDesC& aName, const TDesC& aValue)
+    {
+	aName.Length()==0 ? iName=KNullDesC().AllocL() : iName = aName.AllocL();
+	aValue.Length()==0 ? iValue=KNullDesC().AllocL() : iValue = aValue.AllocL();
+    }
+
+CWPNameValue::CWPNameValue()
+    {
+    }
+
+CWPNameValue::CWPNameValue( HBufC* aName, HBufC* aValue ) :
+    iName(aName),
+    iValue(aValue)
+    {
+    }
+
+// end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/cpqtsp/src/CWPStringPair.cpp	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,56 @@
+/*
+* Copyright (c) 2002 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: 
+*     Sortable pair of strings.
+*
+*/
+
+
+// INCLUDE FILES
+#include "CWPStringPair.h"
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// C++ default constructor.
+CWPStringPair::CWPStringPair()
+	{
+	}
+
+// Destructor
+CWPStringPair::~CWPStringPair()
+	{
+	delete iName;
+	delete iValue;
+	}
+
+// ---------------------------------------------------------
+// CWPStringPair::SetL
+// ---------------------------------------------------------
+//
+void CWPStringPair::SetL( const TDesC& aName, const TDesC& aValue )
+	{
+	HBufC* name = aName.AllocLC();
+	HBufC* value = aValue.AllocL();
+	CleanupStack::Pop(); // name
+
+	delete iName;
+	iName = name;
+	iNamePtr.Set( *iName );
+
+	delete iValue;
+	iValue = value;
+	iValuePtr.Set( *iValue );
+	}
+
+//  End of File
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/cpqtsp/src/CpQtSpMainWindow.cpp	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,42 @@
+/*
+* Copyright (c) 2002 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: 
+*     Bio control for Provisioning documents.
+*
+*/
+
+#include <hbmainwindow.h>
+#include <CpQtSpMainWindow.h>
+#include <CpQtSpView.h>
+
+
+CpQtSpMainWindow::CpQtSpMainWindow(QWidget *parent)
+    : HbMainWindow(parent)
+{
+    iServiceProvider = new CpQtSp();
+    connect(iServiceProvider,SIGNAL(showView()),this, SLOT(showView()));    
+    iView = new CpQtSpView(iServiceProvider);    
+    }
+
+CpQtSpMainWindow::~CpQtSpMainWindow()
+{
+    delete iView;
+    delete iServiceProvider;
+}
+
+void CpQtSpMainWindow::showView()
+{
+    iView->constructView(); 				  
+    addView(iView);    
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/cpqtsp/src/CpQtSpView.cpp	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,176 @@
+/*
+* Copyright (c) 2002 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: 
+*     Bio control for Provisioning documents.
+*
+*/
+
+#include <hbapplication.h>
+#include <hbtoolbar.h>
+#include <hbaction.h>
+#include <hbmenu.h>
+#include <HbTextItem>
+#include <HbFontSpec>
+#include <HbMessageBox>
+#include <QGraphicsLinearLayout>
+#include <xqserviceprovider.h>
+#include <xqservicerequest.h>
+#include <xqserviceutil.h>
+#include <e32base.h>
+#include <flogger.h>
+#include <CWPNameValue.h>
+#include <CWPEngine.h>
+#include <CpQtSpView.h>
+#include <CpQtSpMainWindow.h>
+
+
+CpQtSpView::CpQtSpView(CpQtSp* service,QGraphicsItem *parent)
+    : HbView(parent), iServiceProvider(service)
+{ 
+    setTitle(tr("Messaging"));
+    HbToolBar* toolBar = this->toolBar(); 
+    HbMenu* menu = this->menu();       
+    HbAction* saveAction = new HbAction("Save");     
+    connect(saveAction, SIGNAL(triggered()), this, SLOT(saveProvisoningMessage()));        
+    HbAction* DeleteAction = new HbAction("Delete");
+    
+    toolBar->addAction(saveAction);
+    toolBar->addAction(DeleteAction);
+    toolBar->setOrientation(Qt::Horizontal);
+    iPrimaryFont = new HbFontSpec(HbFontSpec::Primary);
+    iSecondaryFont = new HbFontSpec(HbFontSpec::Secondary);
+    
+    layout = new QGraphicsLinearLayout(Qt::Vertical, this);
+    
+    QString str = hbTrId("txt_device_update_dblist_configuration_message");
+    QString str1 = hbTrId("txt_device_update_dblist_product_code_val_save_to");
+    HbTextItem* mPrimaryItem = new HbTextItem(str, this);
+    HbTextItem* mSecondaryItem = new HbTextItem(str1, this);
+       
+    QFont font = iPrimaryFont->font();
+    mPrimaryItem->setFont(font);
+        
+    font = iSecondaryFont->font();
+    mSecondaryItem->setFont(font);
+    
+    layout->addItem(mPrimaryItem);
+    layout->addItem(mSecondaryItem);
+   
+    setLayout(layout);     
+    }
+
+void CpQtSpView::constructView()
+{
+    iBio = CWPBioControl::NewL(iServiceProvider->returnSession(),iServiceProvider->returnId());
+    RPointerArray<CWPNameValue>* iArray = iBio->CollectItemsLC();    
+    TBufC<200> Name;
+    TBufC<200> Value;    
+    HbTextItem* mPrimaryItem[100];
+    HbTextItem* mSecondaryItem[100];
+    HbTextItem* mSecondaryItemBlank = new HbTextItem("", this);
+    QFont pfont = iPrimaryFont->font();
+    QFont sfont = iSecondaryFont->font();      
+   
+	TBuf<200> currentTitle(KNullDesC);
+	
+    for( TInt item = 0; item < iArray->Count(); item++ )
+    {  	
+    	CWPNameValue* pair = ((*iArray)[item]);
+    	Name = pair->Name();
+    	if(Name.Compare(currentTitle) !=0 )
+    	{
+    	QString qname((QChar*)Name.Ptr(),Name.Length());
+    	mPrimaryItem[item] = new HbTextItem(qname);    	
+    	mPrimaryItem[item]->setFont(pfont);    	
+    	layout->addItem(mSecondaryItemBlank);
+    	layout->addItem(mPrimaryItem[item]);
+    	currentTitle.Copy(Name);
+    	}
+    	    	
+    	Value = pair->Value();
+    	QString qvalue((QChar*)Value.Ptr(),Value.Length());   
+    	mSecondaryItem[item] = new HbTextItem(qvalue);
+    	mSecondaryItem[item]->setFont(sfont);
+    	layout->addItem(mSecondaryItem[item]);  
+   }
+    CleanupStack::PopAndDestroy();
+
+}
+
+void CpQtSpView::saveProvisoningMessage()
+{
+  CWPEngine* engine = iBio->returnEngine();
+  int errSave = KErrNone;
+  
+  for(TInt i=0; i < engine->ItemCount(); i++)
+  {
+   TRAP( errSave, engine->SaveL(i) );
+  } 
+  
+  if( errSave == KErrNone )
+  {
+  	//For testing purpose. Will be removed in future.
+    //HbMessageBox::launchInformationMessageBox("Message Saved");
+  }
+}
+
+CpQtSpView::~CpQtSpView()
+{
+    delete iBio;
+}
+
+void CpQtSpView::requestCompleted(const QVariant& value)
+{
+}
+
+
+CpQtSp::CpQtSp(QObject* parent)
+: XQServiceProvider("com.nokia.services.MDM.Provisioning",parent)
+{  
+    publishAll();
+}
+
+CpQtSp::~CpQtSp()
+{
+	delete iObserver;
+	delete iSession;
+}
+
+void CpQtSp::complete()
+{
+   QString retvalue ="";
+   completeRequest(1,retvalue);
+}
+
+QString CpQtSp::ProcessMessage(const QString& tmsvid)
+{
+    iId = tmsvid.toInt();	
+    TMsvSelectionOrdering sort;    
+    sort.SetShowInvisibleEntries(ETrue); 
+    iObserver = new(ELeave) CObserver;
+    iSession = CMsvSession::OpenSyncL(*iObserver);    
+    emit showView();
+    setCurrentRequestAsync();
+    return "";    
+    }
+
+TMsvId CpQtSp::returnId()
+{
+	return iId;
+}
+
+CMsvSession* CpQtSp::returnSession()
+{
+  return iSession;
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/cpqtsp/src/main.cpp	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,45 @@
+/*
+* Copyright (c) 2002 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: 
+*     Bio control for Provisioning documents.
+*
+*/
+
+#include <hbapplication.h>
+#include <CpQtSpMainWindow.h>
+#include <QTranslator>
+#include <QString>
+#include <QLocale>
+
+int main(int argc, char **argv)
+{ 
+    HbApplication a( argc, argv );    
+    
+    QTranslator *translator = new QTranslator();
+    QString lang = QLocale::system().name();
+    QString path = "Z:/resource/qt/translations/";
+    bool fine = translator->load("deviceupdates_en.qm", path);
+    if (fine)
+        qApp->installTranslator(translator);
+
+    QTranslator *commontranslator = new QTranslator();
+    fine = commontranslator->load("common_" + lang, path);
+    if (fine)
+        qApp->installTranslator(commontranslator);
+    
+    CpQtSpMainWindow mainWindow;    
+    mainWindow.show();
+    return a.exec();     
+}
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/devicemanagementnotifiersplugin/PnpUtilLogger.h	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,138 @@
+/*
+* 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 __LOGGER_H__
+#define __LOGGER_H__
+
+#ifdef _DEBUG
+    #define LOGGING_ENABLED
+#endif
+#ifdef LOGGING_ENABLED          // This must be enabled to use logging system
+
+#define LOGGER_LOGGING          // Log to Logger
+
+
+
+#ifdef LOGGER_LOGGING
+
+//  INCLUDES
+#include <flogger.h>
+
+// LOG SETTINGS 
+_LIT( KPnpLogFolder, "PnP" );
+_LIT( KPnpLogFile, "PnPUtil.TXT" );
+
+#endif
+
+// CONSTANTS  
+// None.
+
+// MACROS
+/*
+-----------------------------------------------------------------------------
+
+    INTERNAL MACROs. 
+
+    DO NOT USE THESE DIRECTLY !!! 
+    SEE EXTERNAL MACROS
+
+-----------------------------------------------------------------------------
+*/
+
+#ifdef LOGGER_LOGGING
+
+_LIT( KTextFormat, "%S%S" );
+_LIT( KPnpUtil, "PnpUtil| " );
+
+#define INTRLOGTEXT( AAA )                                                                                        \
+    {                                                                                                            \
+    RFileLogger::Write( KPnpLogFolder(), KPnpLogFile(), EFileLoggingModeAppend, AAA );            \
+    }
+#define INTRLOGSTRING( AAA )                                                                                    \
+    {                                                                                                            \
+    _LIT( tempLogDes, AAA );                                                                                    \
+    RFileLogger::Write( KPnpLogFolder(), KPnpLogFile(), EFileLoggingModeAppend, tempLogDes() );    \
+    }
+// 20 chars is left for the formatted item
+#define INTRLOGSTRING2( AAA, BBB )                                                                                \
+    {                                                                                                            \
+    _LIT( tempLogDes, AAA );                                                                                    \
+    RFileLogger::WriteFormat( KPnpLogFolder(), KPnpLogFile(), EFileLoggingModeAppend, TRefByValue<const TDesC>( tempLogDes()), BBB ); \
+    }
+// 40 chars is left for the formatted items
+#define INTRLOGSTRING3( AAA, BBB, CCC )                                                                            \
+    {                                                                                                            \
+    _LIT( tempLogDes, AAA );                                                                                    \
+    RFileLogger::WriteFormat( KPnpLogFolder(), KPnpLogFile(), EFileLoggingModeAppend, TRefByValue<const TDesC>( tempLogDes()), BBB, CCC ); \
+    }
+#else
+#define INTRLOGTEXT( AAA )
+#define INTRLOGSTRING( AAA )
+#define INTRLOGSTRING2( AAA, BBB )
+#define INTRLOGSTRING3( AAA, BBB, CCC )
+#endif
+
+/*
+-----------------------------------------------------------------------------
+
+    EXTERNAL MACROs
+
+    USE THESE MACROS IN YOUR CODE !
+
+-----------------------------------------------------------------------------
+*/
+
+
+#define LOGTEXT( AAA )                { \
+                                    INTRLOGTEXT( AAA ); \
+                                    }   // Example: LOGTEXT( own_desc );
+
+#define LOGSTRING( AAA )            { \
+                                    INTRLOGSTRING( AAA ); \
+                                    }   // Example: LOGSTRING( "Test" );
+
+#define LOGSTRING2( AAA, BBB )        { \
+                                    INTRLOGSTRING2( AAA, BBB ); \
+                                    }  // Example: LOGSTRING( "Test %i", aValue );
+
+#define LOGSTRING3( AAA, BBB, CCC )    { \
+                                    INTRLOGSTRING3( AAA, BBB, CCC ); \
+                                    } // Example: LOGSTRING( "Test %i %i", aValue1, aValue2 );
+
+
+#else   // LOGGING_ENABLED
+
+#define LOGTEXT( AAA ) 
+#define LOGSTRING( AAA ) 
+#define LOGSTRING2( AAA, BBB )    
+#define LOGSTRING3( AAA, BBB, CCC )    
+
+#endif  // LOGGING_ENABLED
+
+// DATA TYPES
+// None.
+
+// FUNCTION PROTOTYPES
+// None.
+
+// FORWARD DECLARATIONS
+// None.
+
+// CLASS DECLARATION
+// None.
+
+#endif  // __LOGGER_H__
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/devicemanagementnotifiersplugin/devicemanagementnotifierdevman.qrc	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,10 @@
+<RCC>
+    <qresource prefix="/xml" >
+    	<file>dialog.docml</file>
+    	<file>dialoginformative.docml</file>
+    	<file>dialogserverpushconfirm.docml</file>
+    </qresource>
+    <qresource prefix="/devman_icon" >
+    	<file>iconnotifier.svg</file>
+    </qresource>
+</RCC>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/devicemanagementnotifiersplugin/devicemanagementnotifierplugin.cpp	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,110 @@
+/*
+* 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 <QtPlugin>
+
+#include <hbdevicedialog.h>
+#include "devicemanagementnotifierplugin_p.h"
+#include "devicemanagementnotifierwidget_p.h"
+
+
+Q_EXPORT_PLUGIN2(devicemanagementnotifiersplugin, devicemanagementnotifierplugin)
+
+// This plugin implements one device dialog type
+static const struct {
+    const char *mTypeString;
+} dialogInfos[] = {
+    {"com.nokia.hb.devicemanagementdialog/1.0"}
+};
+
+class devicemanagementnotifierpluginprivate
+{
+public:
+    devicemanagementnotifierpluginprivate() {mError = 0;}
+
+    int mError;
+};
+
+// Constructor
+devicemanagementnotifierplugin::devicemanagementnotifierplugin()
+{
+    
+    d = new devicemanagementnotifierpluginprivate;
+    
+}
+
+// Destructor
+devicemanagementnotifierplugin::~devicemanagementnotifierplugin()
+{
+    
+    delete d;
+    
+}
+
+// Check if client is allowed to use device dialog widget
+bool devicemanagementnotifierplugin::accessAllowed(const QString &deviceDialogType,
+    const QVariantMap &parameters, const QVariantMap &securityInfo) const
+{
+    
+    
+    // This plugin doesn't perform operations that may compromise security.
+    // All clients are allowed to use.
+    return true;
+    
+}
+
+// Create device dialog widget
+HbDeviceDialogInterface *devicemanagementnotifierplugin::createDeviceDialog(
+    const QString &deviceDialogType, const QVariantMap &parameters)
+{
+    return new devicemanagementnotifierwidget(parameters);
+}
+
+// Return information of device dialog the plugin creates
+bool devicemanagementnotifierplugin::deviceDialogInfo(const QString &deviceDialogType,
+    const QVariantMap &parameters, DeviceDialogInfo *info) const
+{
+    
+  
+    return true;
+}
+
+// Return device dialog types this plugin implements
+QStringList devicemanagementnotifierplugin::deviceDialogTypes() const
+{
+    
+    QStringList types;
+    const int numTypes = sizeof(dialogInfos) / sizeof(dialogInfos[0]);
+    for(int i = 0; i < numTypes; i++) {
+        types.append(dialogInfos[i].mTypeString);
+    }
+    
+    return types;
+}
+
+// Return plugin flags
+HbDeviceDialogPlugin::PluginFlags devicemanagementnotifierplugin::pluginFlags() const
+{
+    
+    return NoPluginFlags;
+}
+
+// Return last error
+int devicemanagementnotifierplugin::error() const
+{
+    return d->mError;
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/devicemanagementnotifiersplugin/devicemanagementnotifierplugin_p.h	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,53 @@
+/*
+* 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 DEVICEMANAGEMENTNOTIFIERPLUGIN_P_H
+#define DEVICEMANAGEMENTNOTIFIERPLUGIN_P_H
+
+#include <QObject>
+#include <QVariantMap>
+
+#include <hbdevicedialogplugin.h>
+
+class devicemanagementnotifierpluginprivate;
+
+class devicemanagementnotifierplugin : public HbDeviceDialogPlugin
+{
+    Q_OBJECT
+
+public:
+    friend class devicemanagementnotifierpluginprivate;
+
+    devicemanagementnotifierplugin();
+    ~devicemanagementnotifierplugin();
+
+    bool accessAllowed(const QString &deviceDialogType,
+        const QVariantMap &parameters, const QVariantMap &securityInfo) const;
+    HbDeviceDialogInterface *createDeviceDialog(const QString &deviceDialogType,
+        const QVariantMap &parameters);
+    bool deviceDialogInfo(const QString &deviceDialogType,
+        const QVariantMap &parameters, DeviceDialogInfo *info) const;
+    QStringList deviceDialogTypes() const;
+    PluginFlags pluginFlags() const;
+    int error() const;
+
+private:
+    Q_DISABLE_COPY(devicemanagementnotifierplugin)
+    devicemanagementnotifierpluginprivate *d;
+};
+
+#endif // devicemanagementnotifierplugin_P_H
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/devicemanagementnotifiersplugin/devicemanagementnotifiersplugin.pro	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,41 @@
+# #####################################################################
+# Automatically generated by qmake (2.01a) Fri Jul 4 12:40:38 2008
+# #####################################################################
+TEMPLATE = lib
+TARGET = devicemanagementnotifiersplugin
+CONFIG += hb \
+          plugin        
+INCLUDEPATH += .
+DEPENDPATH += .
+
+DESTDIR = $${HB_BUILD_DIR}/plugins/devicedialogs
+
+SOURCES += devicemanagementnotifierplugin.cpp
+SOURCES += devicemanagementnotifierwidget.cpp
+SOURCES += devicemanagementnotifierutils.cpp
+SOURCES += syncmlnotifierprivate.cpp
+HEADERS += devicemanagementnotifierplugin_p.h
+HEADERS += devicemanagementnotifierwidget_p.h
+HEADERS += devicemanagementnotifierutils.h 
+HEADERS += syncmlnotifierprivate.h
+RESOURCES = devicemanagementnotifierdevman.qrc
+#TRANSLATIONS += deviceupdates.ts
+
+symbian: {
+    TARGET.EPOCALLOWDLLDATA = 1
+    TARGET.CAPABILITY = CAP_GENERAL_DLL
+    TARGET.UID3 = 0x2002DD20
+
+    hblib.sources = Hb.dll
+    hblib.path = \sys\bin
+    hblib.depends = "(0xEEF9EA38), 1, 0, 0, {\"Hb\"}"
+
+    pluginstub.sources = devicemanagementnotifiersplugin.dll
+    pluginstub.path = /resource/plugins/devicedialogs
+    DEPLOYMENT += pluginstub
+    MMP_RULES += "LIBRARY syncmlclientapi.lib centralrepository.lib flogger.lib"
+}
+!local {
+    target.path = $${HB_PLUGINS_DIR}/devicedialogs
+    INSTALLS += target
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/devicemanagementnotifiersplugin/devicemanagementnotifierutils.cpp	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,348 @@
+/*
+* 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 <hbdocumentloader.h>
+#include <hbdialog.h>
+#include <hblabel.h>
+#include <hbmessagebox.h>
+#include <hbaction.h>
+#include <e32property.h>
+#include <qdebug.h>
+#include "SyncMLNotifierParams.h"
+#include "PnpUtilLogger.h"
+#include "devicemanagementnotifierutils.h"
+
+ enum TSyncmlHbNotifierKeys 
+		{
+
+     EHbSOSNotifierKeyStatus = 11, // status set will complete the client subscribe
+     EHbSOSNotifierKeyStatusReturn = 12, // Return the content of actual status value accepted from UI
+     
+     EHbDMSyncNotifierKeyStatus = 13,
+     EHbDMSyncNotifierKeyStatusReturn = 14
+		};
+
+
+devicemanagementnotifierutils::devicemanagementnotifierutils(
+        const QVariantMap &parameters)
+    {
+	qDebug("devicemanagementnotifierutils");
+    syncmlnotifier* notifier = new syncmlnotifier();
+    notifier->launchDialog(parameters);
+
+    }
+
+syncmlnotifier::syncmlnotifier()
+    {
+    qDebug("devicemanagementnotifierutils syncmlnotifier");
+    QTranslator *translator = new QTranslator();
+    QString lang = QLocale::system().name();
+    QString path = "Z:/resource/qt/translations/";
+    bool fine = translator->load("deviceupdates_en.qm", path);
+    if (fine)
+        qApp->installTranslator(translator);
+
+    QTranslator *commontranslator = new QTranslator();
+
+    fine = commontranslator->load("common_" + lang, path);
+    if (fine)
+        qApp->installTranslator(commontranslator);
+
+    msymnotifier = new syncmlnotifierprivate();
+    }
+
+void syncmlnotifier::launchDialog(const QVariantMap &parameters)
+    {
+
+    QVariantMap::const_iterator i = parameters.constBegin();
+    qDebug("devicemanagementnotifierutils syncmlnotifier launchDialog");
+    //i++;
+
+    bool profileidenabled = false;
+    bool uiserverinteraction = false;
+    bool serverpushinformativeenabled = false;
+    bool serverpushinteractiveenabled = false;
+
+    int profileid = 0;
+    int uimode = 0;
+
+    QString serverpushinformmessage;
+    QString serverpushconfirmmessage;
+
+    QString serverdispname;
+
+    while (i != parameters.constEnd())
+        {
+        if (i.key().toAscii() == "profileid")
+            {
+
+            profileid = i.value().toInt();
+            profileidenabled = true;
+            }
+
+        if (i.key().toAscii() == "uimode")
+            {
+            uiserverinteraction = true;
+            uimode = i.value().toInt();
+            }
+
+        if (i.key().toAscii() == "serverpushinformative")
+            {
+			qDebug("server push informative enabled");
+            serverpushinformativeenabled = true;
+            serverpushinformmessage = i.value().toString();
+            }
+
+        if (i.key().toAscii() == "serverpushconfirmative")
+            {
+		    LOGSTRING("Server Push Confirmative");
+            serverpushinteractiveenabled = true;
+            serverpushconfirmmessage = i.value().toString();
+            }
+
+        if (i.key().toAscii() == "serverdisplayname")
+            {
+            serverdispname = i.value().toString();
+            }
+
+        ++i;
+        }
+
+    if (profileidenabled && uiserverinteraction)
+        {
+        qDebug("server interaction packet 0 enabled ");
+        qDebug()<<EHbSOSNotifierKeyStatus;
+        msymnotifier->setnotifierorigin(EHbSOSNotifierKeyStatus);
+        createserverinitnotifier(profileid, uimode, serverdispname);
+        }
+    else if (serverpushinformativeenabled)
+        {
+        qDebug("server push informative enabled ");
+        qDebug()<<EHbDMSyncNotifierKeyStatus;
+        msymnotifier->setnotifierorigin(EHbDMSyncNotifierKeyStatus);
+        createserveralertinformative(serverpushinformmessage);
+        }
+    else if (serverpushinteractiveenabled)
+        {
+        qDebug("server push informative enabled ");
+        qDebug()<<EHbDMSyncNotifierKeyStatus;
+         msymnotifier->setnotifierorigin(EHbDMSyncNotifierKeyStatus);
+        createserveralertconfirmative(serverpushconfirmmessage);
+        }
+
+    }
+
+void syncmlnotifier::createserverinitnotifier(int profileid, int uimode,
+        QString& servername)
+    {
+    
+    int inittype = msymnotifier->serverinittype(uimode);
+    qDebug("Notification type");
+    qDebug()<<inittype;
+
+	LOGSTRING2("Init value = %d", inittype);
+
+    /*For testing purpose*/
+    //inittype = ESANUserInteractive;
+
+    if (inittype == ESANUserInteractive)
+        {
+        HbDocumentLoader loader;
+        bool ok = false;
+        loader.load(":/xml/dialog.docml", &ok);
+        if (!ok)
+            {
+            return;
+            }
+        HbDialog *dialog = qobject_cast<HbDialog *> (loader.findWidget(
+                "dialog"));
+
+        //set heading content
+        HbLabel *contentheading = qobject_cast<HbLabel *> (loader.findWidget(
+                "qtl_dialog_pri_heading"));
+        QString heading = hbTrId("txt_device_update_title_update_available");
+        contentheading->setPlainText(heading);
+
+        //set body content
+        HbLabel *contentbody = qobject_cast<HbLabel *> (loader.findWidget(
+                "qtl_dialog_pri5"));
+        QString serverinitmessage = hbTrId(
+                "txt_device_update_info_recommended_update_is_avail").arg(
+                servername);
+        contentbody->setPlainText(serverinitmessage);
+
+        //set softkeys
+        HbAction *primaryAction = dialog->primaryAction();
+        QString softkeyok = hbTrId("txt_common_button_ok");
+        primaryAction->setText(softkeyok);
+
+        HbAction *secondaryAction = dialog->secondaryAction();
+        QString softkeyCancel = hbTrId("txt_common_button_cancel");
+        secondaryAction->setText(softkeyCancel);
+
+        //set dialog properties
+        dialog->setTimeout(HbPopup::NoTimeout);
+
+        //load appropriate icon from svg file
+        HbLabel* label1 = qobject_cast<HbLabel*> (loader.findWidget("icon"));
+        HbIcon* icon1 = new HbIcon(":/devman_icon/iconnotifier.svg");
+        label1->setIcon(*icon1);
+        //label1->setMode(QIcon::Normal);
+        //label1->setState(QIcon::Off);
+        label1->setToolTip("Mode=Normal, State=Off");
+
+        QObject::connect(primaryAction, SIGNAL(triggered()), this,
+                SLOT(okSelected()));
+
+        QObject::connect(secondaryAction, SIGNAL(triggered()), this,
+                SLOT(cancelSelected()));
+
+        if (dialog)
+            dialog->show();
+        }
+    else if (inittype == ESANUserInformative)
+        {
+        HbDocumentLoader loader;
+        bool ok = false;
+        loader.load(":/xml/dialoginformative.docml", &ok);
+        if (!ok)
+            {
+            return;
+            }
+
+        //hbTrId("qtl_dialog_pri_heading");
+
+        HbDialog *dialog = qobject_cast<HbDialog *> (loader.findWidget(
+                "dialog"));
+
+        HbLabel *content = qobject_cast<HbLabel *> (loader.findWidget(
+                "qtl_dialog_pri5"));
+
+        QString serverinitmessage = hbTrId(
+                "txt_device_update_info_update_serverpush_informative").arg(
+                servername);
+
+        //getserverspecifictexttodisplay(profileid, uimode, serverinitmessage);
+        content->setPlainText(serverinitmessage);
+
+        //get string here /*TODO*/ /*QTranslations*/
+
+        dialog->setTimeout(3000);
+
+        //msymnotifier->setstatus(0);
+
+        if (dialog)
+            dialog->show();
+
+        QObject::connect(dialog, SIGNAL(aboutToClose()), this,
+                SLOT(okSelected()));
+
+        }
+    else if (inittype == ESANSilent)
+        {
+        msymnotifier->setstatus(0);
+        }
+
+    }
+
+void syncmlnotifier::createserveralertinformative(const QString &string)
+    {
+    qDebug("createserveralertinformative start");
+		LOGSTRING("createserveralertinformative start");
+    HbDocumentLoader loader;
+    bool ok = false;
+    loader.load(":/xml/dialoginformative.docml", &ok);
+    if (!ok)
+        {
+        return;
+        }
+    HbDialog *dialog = qobject_cast<HbDialog *> (loader.findWidget("dialog"));
+
+    HbLabel *content = qobject_cast<HbLabel *> (loader.findWidget(
+            "qtl_dialog_pri5"));
+
+    // No translations required
+    content->setPlainText(string);
+
+    dialog->setTimeout(3000);
+
+    if (dialog)
+        dialog->show();
+
+    QObject::connect(dialog, SIGNAL(aboutToClose()), this, SLOT(okSelected()));
+
+	qDebug("createserveralertinformative end");
+
+    }
+
+void syncmlnotifier::createserveralertconfirmative(const QString &string)
+    {
+    HbDocumentLoader loader;
+    bool ok = false;
+    loader.load(":/xml/dialogserverpushconfirm.docml", &ok);
+    if (!ok)
+        {
+        return;
+        }
+    HbDialog *dialog = qobject_cast<HbDialog *> (loader.findWidget("dialog"));
+
+    //set heading content
+    HbLabel *contentheading = qobject_cast<HbLabel *> (loader.findWidget(
+            "qtl_dialog_pri_heading"));
+    QString heading = hbTrId("txt_device_update_title_server_message");
+    contentheading->setPlainText(heading);
+
+    //set body content
+    HbLabel *contentbody = qobject_cast<HbLabel *> (loader.findWidget(
+            "qtl_dialog_pri5"));
+
+    contentbody->setPlainText(string);
+
+    //set softkeys
+    HbAction *primaryAction = dialog->primaryAction();
+    QString softkeyok = hbTrId("txt_common_button_yes");
+    primaryAction->setText(softkeyok);
+
+    HbAction *secondaryAction = dialog->secondaryAction();
+    QString softkeyCancel = hbTrId("txt_common_button_no");
+    secondaryAction->setText(softkeyCancel);
+
+    dialog->setTimeout(HbPopup::NoTimeout);
+
+    QObject::connect(primaryAction, SIGNAL(triggered()), this,
+            SLOT(okSelected()));
+
+    QObject::connect(secondaryAction, SIGNAL(triggered()), this,
+            SLOT(cancelSelected()));
+
+    if (dialog)
+        dialog->show();
+    }
+
+void syncmlnotifier::okSelected()
+    {
+    qDebug("ok selected");
+    msymnotifier->setstatus(0);
+    }
+
+void syncmlnotifier::cancelSelected()
+    {
+    qDebug("cancel selected");
+    msymnotifier->setstatus(-3);
+
+    }
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/devicemanagementnotifiersplugin/devicemanagementnotifierutils.h	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,75 @@
+/*
+* 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 DEVICEMANAGEMENTNOTIFIERUTILS_H_
+#define DEVICEMANAGEMENTNOTIFIERUTILS_H_
+
+#include <hbpushbutton.h>
+#include <qtimeline.h>
+#include <hbcheckbox.h>
+#include <hblabel.h>
+#include <hblineedit.h>
+#include <hbtextedit.h>
+#include <QGraphicsWidget>
+#include <hbdocumentloader.h>
+#include <hbinputeditorinterface.h>
+#include <hbview.h>
+#include <hbprogressbar.h>
+#include <hbdialog.h>
+#include <hbmainwindow.h>
+#include "syncmlnotifierprivate.h"
+
+class syncmlnotifier;
+
+class devicemanagementnotifierutils :public HbDialog  {
+
+Q_OBJECT
+
+public:
+devicemanagementnotifierutils(const QVariantMap &parameters);
+  
+};
+
+class syncmlnotifier:public QObject {
+
+Q_OBJECT
+
+public:
+syncmlnotifier();
+
+public:
+     void launchDialog(const QVariantMap &parameters);
+     void createserverinitnotifier(int profileid, int uimode,QString& servername);
+     void createserveralertinformative(const QString &string);
+     void createserveralertconfirmative(const QString &string);
+
+public slots:
+    void okSelected();
+    void cancelSelected(); 
+
+signals:
+    void servertextmessage(const QString &string);
+ 
+private:
+  syncmlnotifierprivate* msymnotifier;
+
+
+};
+    
+
+
+#endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/devicemanagementnotifiersplugin/devicemanagementnotifierwidget.cpp	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,57 @@
+/*
+* 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 <hbaction.h>
+#include <hbdialog.h>
+
+#include "devicemanagementnotifierwidget_p.h"
+
+
+// Constructor
+devicemanagementnotifierwidget::devicemanagementnotifierwidget(const QVariantMap &parameters):devicemanagementnotifierutils(parameters)
+{
+    
+}
+
+// Set parameters
+bool devicemanagementnotifierwidget::setDeviceDialogParameters(
+    const QVariantMap &parameters)
+{
+    
+    return true;
+}
+
+// Get error
+int devicemanagementnotifierwidget::deviceDialogError() const
+{
+    
+    return 0;
+}
+
+// Close device dialog
+void devicemanagementnotifierwidget::closeDeviceDialog(bool byClient)
+{
+    close();
+    emit deviceDialogClosed();
+}
+
+// Return display widget
+HbDialog *devicemanagementnotifierwidget::deviceDialogWidget() const
+{
+   
+    return const_cast<devicemanagementnotifierwidget*>(this);
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/devicemanagementnotifiersplugin/devicemanagementnotifierwidget_p.h	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,50 @@
+/*
+* 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 DEVICEMANAGEMENTNOTIFIERWIDGET_P_H
+#define DEVICEMANAGEMENTNOTIFIERWIDGET_P_H
+
+#include <QObject>
+#include <QVariantMap>
+
+#include <hbdevicedialoginterface.h>
+#include <hbdevicedialog.h>
+#include "devicemanagementnotifierutils.h"
+
+class HbDialog;
+
+class devicemanagementnotifierwidget :
+    public devicemanagementnotifierutils, public HbDeviceDialogInterface
+{
+	Q_OBJECT
+
+public:
+	devicemanagementnotifierwidget(const QVariantMap &parameters);
+	
+
+public: //derived from HbDeviceDialogInterface
+	bool setDeviceDialogParameters(const QVariantMap &parameters);
+    int deviceDialogError() const;
+    void closeDeviceDialog(bool byClient);
+    HbDialog *deviceDialogWidget() const;
+
+signals:
+        void deviceDialogClosed();
+        void deviceDialogData(QVariantMap data);
+ };
+
+#endif // devicemanagementnotifierwidget_P_H
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/devicemanagementnotifiersplugin/iconnotifier.svg	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,260 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="128"
+   height="128"
+   id="svg2606"
+   sodipodi:version="0.32"
+   inkscape:version="0.45+devel"
+   version="1.0"
+   sodipodi:docname="unknown.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   sodipodi:docbase="/home/david/Progetti/sandbox/svg/mimetypes">
+  <defs
+     id="defs2608">
+    <linearGradient
+       y2="0"
+       x2="28"
+       y1="57.5"
+       x1="28"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2973">
+			<stop
+   id="stop2975"
+   style="stop-color:#2c72c7;stop-opacity:1;"
+   offset="0" />
+
+			<stop
+   id="stop2977"
+   style="stop-color:#0057ae;stop-opacity:1;"
+   offset="1" />
+
+		</linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2973"
+       id="linearGradient2086"
+       x1="86.43512"
+       y1="76.830994"
+       x2="22.813417"
+       y2="8.9537134"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient10207">
+      <stop
+         style="stop-color:#a2a2a2;stop-opacity:1;"
+         offset="0"
+         id="stop10209" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop10211" />
+    </linearGradient>
+    <linearGradient
+       id="XMLID_12_"
+       gradientUnits="userSpaceOnUse"
+       x1="96"
+       y1="104"
+       x2="88.000198"
+       y2="96.000198">
+      <stop
+         offset="0"
+         style="stop-color:#888A85"
+         id="stop83" />
+      <stop
+         offset="0.0072"
+         style="stop-color:#8C8E89"
+         id="stop85" />
+      <stop
+         offset="0.0673"
+         style="stop-color:#ABACA9"
+         id="stop87" />
+      <stop
+         offset="0.1347"
+         style="stop-color:#C5C6C4"
+         id="stop89" />
+      <stop
+         offset="0.2652576"
+         style="stop-color:#DBDBDA"
+         id="stop91" />
+      <stop
+         offset="0.37646064"
+         style="stop-color:#EBEBEB"
+         id="stop93" />
+      <stop
+         offset="0.48740286"
+         style="stop-color:#F7F7F6"
+         id="stop95" />
+      <stop
+         offset="0.6324091"
+         style="stop-color:#FDFDFD"
+         id="stop97" />
+      <stop
+         offset="1"
+         style="stop-color:#FFFFFF"
+         id="stop99" />
+    </linearGradient>
+    <radialGradient
+       id="XMLID_8_"
+       cx="102"
+       cy="112.3047"
+       r="139.55859"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         offset="0"
+         style="stop-color:#b7b8b9;stop-opacity:1;"
+         id="stop41" />
+      <stop
+         offset="0.18851049"
+         style="stop-color:#ECECEC"
+         id="stop47" />
+      <stop
+         offset="0.25718147"
+         style="stop-color:#FAFAFA"
+         id="stop49" />
+      <stop
+         offset="0.30111277"
+         style="stop-color:#FFFFFF"
+         id="stop51" />
+      <stop
+         offset="0.5313"
+         style="stop-color:#FAFAFA"
+         id="stop53" />
+      <stop
+         offset="0.8449"
+         style="stop-color:#EBECEC"
+         id="stop55" />
+      <stop
+         offset="1"
+         style="stop-color:#E1E2E3"
+         id="stop57" />
+    </radialGradient>
+    <filter
+       inkscape:collect="always"
+       x="-0.19200002"
+       width="1.3839999"
+       y="-0.19199999"
+       height="1.3839999"
+       id="filter6697">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="1.9447689"
+         id="feGaussianBlur6699" />
+    </filter>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath7084">
+      <path
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 72,88 L 40,120 L 32,120 L 32,80 L 72,80 L 72,88 z"
+         id="path7086" />
+    </clipPath>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_8_"
+       id="radialGradient9437"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9996653,2e-6,3.0160848e-3)"
+       cx="102"
+       cy="112.3047"
+       r="139.55859" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10207"
+       id="linearGradient10213"
+       x1="98.617439"
+       y1="106.41443"
+       x2="91.228737"
+       y2="99.254974"
+       gradientUnits="userSpaceOnUse" />
+    <filter
+       inkscape:collect="always"
+       id="filter2770">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="2.0786429"
+         id="feGaussianBlur2772" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.8284271"
+     inkscape:cx="64"
+     inkscape:cy="85.975621"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="128px"
+     height="128px"
+     gridspacingx="4px"
+     gridspacingy="4px"
+     gridempspacing="2"
+     showgrid="true"
+     inkscape:grid-points="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1016"
+     inkscape:window-height="692"
+     inkscape:window-x="0"
+     inkscape:window-y="0" />
+  <metadata
+     id="metadata2611">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Livello 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="opacity:0.5;fill:#000000;fill-opacity:1;filter:url(#filter2770)"
+       d="M 16,8 L 16,120 C 16,120 79.15625,120 79.15625,120 L 79.1875,120 C 79.187503,120 91.09375,110.09375 96.59375,104.59375 C 102.09375,99.09375 112,87.1875 112,87.1875 L 112,87.15625 L 112,8 L 16,8 z"
+       id="path7865"
+       sodipodi:nodetypes="csccscccc"
+       transform="matrix(1.0416667,0,0,1.0267857,-2.6666667,-1.2142891)" />
+    <path
+       style="fill:#ffffff;fill-opacity:1"
+       d="M 16.000001,8 L 16,120 C 16,120 79.146418,120 79.146418,120 L 112,87.14642 L 112,8 L 16.000001,8 z"
+       id="path34"
+       sodipodi:nodetypes="cccccc" />
+    <path
+       style="fill:url(#radialGradient9437);fill-opacity:1"
+       d="M 18.000002,9.0000034 C 17.449002,9.0000034 17.000002,9.4488534 17.000002,9.9996684 L 17.000002,117.96352 C 17.000002,118.51533 17.449002,118.96318 18.000002,118.96318 L 77.171999,118.96318 C 77.434999,118.96318 79.934679,119.08131 80.12068,118.89438 L 110.707,88.094202 C 110.894,87.907264 111,85.40942 111,85.146508 L 111,9.9996684 C 111,9.4488534 110.552,9.0000034 110,9.0000034 L 18.000002,9.0000034 z"
+       id="path59"
+       sodipodi:nodetypes="ccccccccccc" />
+    <path
+       d="M 41.879531,115.98249 C 41.879531,115.98249 66.18914,91.672876 66.18914,91.672876 C 66.18914,91.672876 56.836,94.586 46.586,94.586 C 46.586,104.836 41.879531,115.98249 41.879531,115.98249 z"
+       id="path5540"
+       style="opacity:0.4;fill:#000000;fill-opacity:1;filter:url(#filter6697)"
+       sodipodi:nodetypes="cccc"
+       clip-path="url(#clipPath7084)"
+       transform="translate(40,0)" />
+    <path
+       style="fill:url(#linearGradient10213);fill-opacity:1"
+       id="path14523"
+       d="M 79.172,120 C 79.172,120 91.086,110.086 96.586,104.586 C 102.086,99.086 112,87.172 112,87.172 C 112,87.172 98.25,96 88,96 C 88,106.25 79.172,120 79.172,120 z"
+       sodipodi:nodetypes="csccc" />
+    <path
+       id="text2076"
+       d="M 62.842105,28 C 69.438566,28.00007 74.631544,30.070244 78.421053,34.210526 C 80.947326,37.017606 82.210485,40.386024 82.210528,44.315789 C 82.210485,49.157946 79.894696,54.596537 75.263159,60.631581 C 74.421018,61.684251 73.052597,63.368459 71.157895,65.684214 C 67.789444,69.89477 65.57892,74.807045 64.526316,80.421056 C 64.456114,80.912302 64.38594,81.40353 64.315789,81.89474 L 62.526315,81.89474 C 62.666642,76.491254 63.719273,71.508803 65.68421,66.947371 L 68.631579,60.210528 C 71.228037,54.245661 72.526282,48.771981 72.526316,43.789473 C 72.526282,39.228131 70.806986,35.684274 67.36842,33.157894 C 65.543832,31.824628 63.473658,31.157962 61.157895,31.157894 C 57.508752,31.157962 54.631562,32.280768 52.526315,34.526317 C 51.614021,35.579011 51.15788,36.631642 51.157894,37.684211 C 51.15788,38.315851 51.894722,39.543919 53.36842,41.368421 C 54.561386,42.982513 55.157877,44.350934 55.157894,45.473685 C 55.157877,47.649175 54.175422,49.017596 52.210526,49.578948 C 51.789459,49.719349 51.33332,49.789525 50.842103,49.789475 C 47.473673,49.789525 45.789465,47.614088 45.789472,43.26316 C 45.789465,37.929885 48.070165,33.789539 52.631576,30.842104 C 55.578928,28.947438 58.982435,28.00007 62.842105,28 M 63.578947,88.736839 C 65.894709,88.736854 67.578918,89.82458 68.631579,92.00001 C 69.052602,92.77194 69.263127,93.61404 69.263159,94.52631 C 69.263127,97.05264 68.070146,98.73684 65.68421,99.57894 C 64.98243,99.85965 64.245588,100 63.473684,100 C 60.87717,100 59.157873,98.8772 58.315788,96.63158 C 58.105243,96.00001 57.99998,95.33335 57.999998,94.63158 C 57.99998,91.96492 59.122785,90.14037 61.36842,89.157906 C 62.070151,88.877214 62.806993,88.736854 63.578947,88.736839"
+       style="font-size:74.98017883px;font-style:normal;font-weight:normal;fill:url(#linearGradient2086);fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" />
+  </g>
+</svg>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/devicemanagementnotifiersplugin/syncmlnotifierprivate.cpp	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,162 @@
+/*
+* 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 <e32property.h>
+#include <SyncMLClientDM.h>
+#include <SyncMLClient.h>
+#include <centralrepository.h>
+#include <DevManInternalCRKeys.h>
+#include <centralrepository.h>
+#include "nsmlconstantdefs.h"
+#include "SyncMLNotifierParams.h"
+#include "syncmlnotifierprivate.h"
+
+
+
+syncmlnotifierprivate::syncmlnotifierprivate()
+{
+}
+
+void syncmlnotifierprivate::setstatus(TInt value)
+{
+
+    qDebug("setstatus");
+
+ 
+    
+    enum TSyncmlHbNotifierKeys 
+		{
+
+     EHbSOSNotifierKeyStatus = 11, // status set will complete the client subscribe
+     EHbSOSNotifierKeyStatusReturn = 12, // Return the content of actual status value accepted from UI
+     
+     EHbDMSyncNotifierKeyStatus = 13,
+     EHbDMSyncNotifierKeyStatusReturn = 14
+		};
+  
+    TInt err;
+    RProperty intProperty;
+
+    if(iNotifierorigin== EHbSOSNotifierKeyStatus)
+    {
+    TUid uid = {0x101F99FB};
+    err = intProperty.Attach(uid , EHbSOSNotifierKeyStatus, EOwnerThread);
+    if(err == KErrNone)
+       {
+        qDebug("EHbSOSNotifierKeyStatus entered no error"); 
+        intProperty.Set(value);
+        RProperty::Set(uid, EHbSOSNotifierKeyStatusReturn, value);
+        qDebug("Set status of return value");
+        qDebug()<<err;
+        qDebug("Value user selected");
+        qDebug()<<value;
+       }
+    
+    intProperty.Close();
+    }
+    else
+    {
+    TUid uid = {0x101F6DE5};
+    err = intProperty.Attach(uid , EHbDMSyncNotifierKeyStatus, EOwnerThread);
+    if(err == KErrNone)
+       {
+        qDebug("EHbDMSyncNotifierKeyStatus entered no error"); 
+        intProperty.Set(value);
+        err = RProperty::Set(uid, EHbDMSyncNotifierKeyStatusReturn, value);
+        qDebug("Set status of return value");
+        qDebug()<<err;
+        qDebug("Value user selected");
+        qDebug()<<value;
+       }
+    
+    intProperty.Close();
+    }
+}
+
+void syncmlnotifierprivate::getdmprofileparameters(QString& servername, TInt profileid)
+{
+	 
+    TBuf<256> serverdisplayname;
+   
+    RSyncMLSession syncSession;
+    
+    syncSession.OpenL();
+    CleanupClosePushL( syncSession );
+        
+    RSyncMLDevManProfile syncProfile;
+    syncProfile.OpenL( syncSession, profileid, ESmlOpenRead );
+    CleanupClosePushL( syncProfile );
+        
+    serverdisplayname= syncProfile.DisplayName();
+ 
+
+    //convert TBuf serverName to QString
+    QString qString((QChar*)serverdisplayname.Ptr(),serverdisplayname.Length());
+    servername = qString;
+
+        
+        
+    syncProfile.Close();
+    CleanupStack::Pop( &syncProfile );
+     
+    syncSession.Close();
+    CleanupStack::Pop( &syncSession );
+}
+
+
+TInt syncmlnotifierprivate::serverinittype(TInt uimode)
+    {
+
+   
+    TInt SanSupport = 0;
+    
+    CRepository* centrep = NULL;
+    TRAPD( err, centrep = CRepository::NewL( KCRUidDeviceManagementInternalKeys) );    
+    User::LeaveIfError( err );
+    centrep->Get( KDevManSANUIBitVariation, SanSupport );
+    delete centrep;
+    
+    //if SAN is specified then silent operation
+    
+    if(( SanSupport == 1 ))
+        {
+        if( uimode > ESANUserInteractive && uimode < ESANNotSpecified )
+            {
+            uimode = ESANNotSpecified;
+            }
+       
+        if( uimode == ESANNotSpecified || uimode == ESANUserInteractive)
+            {
+            return ESANUserInteractive;
+            }
+        if( uimode == ESANUserInformative)
+            {
+            return ESANUserInformative;
+            }
+        }
+   
+      return ESANSilent;
+        
+      
+    }
+
+void syncmlnotifierprivate::setnotifierorigin(TInt notifierorig)
+    {
+    iNotifierorigin = notifierorig;
+    }
+    
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/devicemanagementnotifiersplugin/syncmlnotifierprivate.h	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,39 @@
+/*
+* 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 SYNCMLNOTIFIERPRIVATE_H_
+#define SYNCMLNOTIFIERPRIVATE_H_
+
+#include <QtCore>
+
+class syncmlnotifierprivate
+{
+public:
+syncmlnotifierprivate();
+
+public:
+   void setstatus(TInt status);
+   void getdmprofileparameters(QString& displayname, TInt profileid);
+   TInt serverinittype(TInt uimode);
+   void setnotifierorigin(TInt notifierorig);
+
+private:
+   TInt iNotifierorigin;
+
+};
+
+#endif
Binary file deviceupdatesui/deviceupdates/conf/101F6DE5.txt has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/deviceupdates/deviceupdates.pro	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,85 @@
+#
+# 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: Device updates application project file
+#
+symbian: {
+SYMBIAN_PLATFORMS = WINSCW \
+    ARMV5
+
+:BLD_INF_RULES.prj_exports += "$${LITERAL_HASH}include <platform_paths.hrh>"
+    :BLD_INF_RULES.prj_exports += "./rom/deviceupdates.iby CORE_APP_LAYER_IBY_EXPORT_PATH(deviceupdates.iby)"
+    :BLD_INF_RULES.prj_exports += "./rom/deviceupdates_resources.iby LANGUAGE_APP_LAYER_IBY_EXPORT_PATH(deviceupdates_resources.iby)"
+    :BLD_INF_RULES.prj_exports += "./conf/101F6DE5.txt /epoc32/data/z/private/10202be9/101F6DE5.txt"    
+TARGET.UID2 = 0x100039CE
+TARGET.UID3 = 0x101F6DE5
+TARGET.CAPABILITY = CAP_APPLICATION 
+ LIBS +=  -lCommonEngine\
+	-lcentralrepository\ 
+	-lfeatmgr\ 
+	-lsyncmlclientapi\ 
+	-lnsmltransporthandler\
+	-lnsmltransport\
+-lnsmlhistorylog\
+-lpolicyengine\
+-lsysutil \
+        -letel \
+        -letelmm \
+        -lsysversioninfo\
+        -letel3rdparty\
+		-letelpckt\
+		-lcmmanager
+	}
+TEMPLATE = app
+TARGET = deviceupdates
+DEPENDPATH += ./inc
+INCLUDEPATH += .
+INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
+# Input
+HEADERS += ./inc/dminforetrieval.h \
+./inc/nsmldmdef.h\
+./inc/nsmldmsyncappengine.h \
+./inc/nsmldmsyncdebug.h \
+./inc/nsmldmsynchandler.h\
+./inc/nsmldmsyncinternalpskeys.h \
+./inc/nsmldmsyncprivatecrkeys.h \
+./inc/nsmldmsyncprofile.h \
+./inc/nsmldmsyncprofileitem.h \
+./inc/nsmldmsyncprofilelist.h \
+./inc/nsmldmsyncutil.h \
+./inc/nsmldmuidefines.h \
+./inc/serversettingsview.h\
+./inc/dmadvancedview.h\
+./inc/settingsdataformcustomitem.h\
+./inc/dmfotaview.h\
+./inc/nsmldmdbnotifier.h
+
+SOURCES += ./src/dmadvancedview.cpp \
+			./src/main.cpp \
+			./src/nsmldmsyncutil.cpp \
+			./src/nsmldmsyncprofilelist.cpp \
+			./src/nsmldmsyncprofileitem.cpp \
+			./src/nsmldmsyncprofile.cpp \
+			./src/nsmldmsyncappengine.cpp \
+			./src/nsmldmsynchandler.cpp \
+			./src/dminforetrieval.cpp\
+			./src/serversettingsview.cpp\
+			./src/settingsdataformcustomitem.cpp\
+			../src/dmfotaview.cpp \
+			../src/nsmldmdbnotifier.cpp
+			
+RESOURCES += ./resources/deviceupdates.qrc
+CONFIG += hb
+#TRANSLATIONS += deviceupdates.ts
+   
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/deviceupdates/inc/dmadvancedview.h	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,132 @@
+/*
+* Copyright (c) 2002-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:  Launches Advanced view
+*
+*/
+
+#ifndef DMADVANCEDVIEW_H
+#define DMADVANCEDVIEW_H
+
+#include <hbwidget.h>
+#include <QList>
+#include <hbinstance.h>
+#include <hbview.h>
+#include <hbaction.h>
+#include <hbgroupbox.h>
+#include <hblistview.h>
+#include <hbpushbutton.h>
+#include <hbmenu.h>
+#include <hblabel.h>
+#include <hbdocumentloader.h>
+#include <hblistviewitem.h>
+#include <hbanchorlayout.h>
+#include <hbicon.h>
+#include <QStandardItem>
+#include <qtranslator.h>
+#include <QSortFilterProxyModel>
+#include <QModelIndex>
+#include <wlansdkpskeys.h>
+#include <btengdomaincrkeys.h>
+#include <QStandardItemModel>
+#include <centralrepository.h>
+#include <hbglobal.h>
+#include <etelpckt.h>
+#include <etel3rdparty.h>
+#include <etelmm.h>
+#include <etel.h>
+#include "serversettingsview.h"
+#include "dminforetrieval.h"
+#define DOCML_FILE_NAME ":xml/serversview.docml"
+#define VIEW_NAME "view"
+#define LIST_NAME "listView"
+#define GROUP "groupBox"
+#define BANNER_NAME "banner"
+#define NEWSERVERBUTTON "pushButton"
+#define WIDGET "content"
+#define LABEL "label"
+#define LISTOTHERDETAILS "listView_1"
+#define OTHERDETAILSGROUP "groupBox_1"
+#define LANDSCAPE "landscape"
+#define PORTRAIT "portrait"
+
+const TInt KWlanMacAddrLength = 100;
+const TInt KBTAddrLength = 64; 
+class DmAdvancedView : public HbView
+{
+    Q_OBJECT
+
+public:
+    explicit DmAdvancedView(HbMainWindow *mainWindow, HbView *mainView, QGraphicsItem *parent=0);
+    virtual ~DmAdvancedView();   
+    bool displayItems();
+    void saveProfile(QStringList& itemdata, bool& sessmode, QString& currap,unsigned int& portnum, bool& nauth );
+    bool checkServerId(QString& serverid);
+    void setBackBehavior();
+    void syncCompleted(int jobstatus);
+    void PacketService(TInt val, QString& string);
+    void NetworkBand(RMobilePhone::TMobilePhoneNetworkBandInfo val, QString& string); 
+    void NetworkCiphering(RMobilePhone::TMobilePhoneNetworkSecurity val, QString& string);  
+    void mainCalltoUpdateView();
+    
+private:
+    void updateEarlierdefaultProfileIcon();
+    void updateListview();
+    
+public slots:        
+    void handleLongPress(HbAbstractViewItem* item,QPointF coOrdinates);
+    void handleClicked(QModelIndex index);
+    void createNewProfile();
+    void otherDetailsGroupClicked(bool state);
+    void serversListGroupClicked(bool state);
+    void reLayout(Qt::Orientation layoutType);
+    void backButtonClicked();
+    
+private:        
+    HbGroupBox *serversListGroup;
+    HbGroupBox *otherDetailsGroup;
+    HbListView* list;
+    HbListView* otherdetailslist;
+    HbLabel *label; 
+    HbMenu* csmenu;
+    HbMenu* viewspecificmenu;
+    HbAction* help;
+    HbAction* exit;
+    HbWidget* viewwidget;
+    HbDocumentLoader *docmlLoader;
+    HbPushButton* newserverprofile;
+    int count;
+    QTranslator *translator;
+    DmInfo* dminfo;
+    QStandardItemModel *model;
+    QStandardItemModel *otherdetailsmodel;
+    int currentdefaultprofile;
+    bool connectionRequested;
+    bool backbehaviorset;
+    QIcon bluetooth;
+    QIcon internet;
+    QIcon defaultprofileicon;
+    HbMainWindow *iMainWindow;
+    ServerSettingsView* serverSetView;
+    HbAnchorLayout* layout;
+    int currentview;
+    HbView* iMainView;
+    HbAction* backaction;
+    RMobilePhone imobPhone;
+    RTelServer iServer;
+    RTelServer::TPhoneInfo info;	
+	RMobilePhone::TMobilePhoneNetworkSecurity idispSecurity;
+};
+
+#endif // DMADVANCEDVIEW_H
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/deviceupdates/inc/dmfotaview.h	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,76 @@
+/*
+* Copyright (c) 2002-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:  DMFotaView header.
+*
+*/
+
+#ifndef DMFOTAVIEW_H_
+#define DMFOTAVIEW_H_
+
+
+#include <hbapplication.h>
+#include <hbwidget.h>
+#include <QGraphicsLinearLayout>
+#include <hbgroupbox.h>
+#include <hbview.h>
+#include <hblabel.h>
+#include <hbdocumentloader.h>
+#include <hbmenu.h>
+#include <SyncMLClient.h>
+#include <SyncMLClientDM.h>
+#include <QStandardItemModel>
+#include <QLocale>
+#include <centralrepository.h>
+#include <QTranslator>
+#include <nsmldmdef.h>
+//_LIT( KSmlEOL,      "\n" );
+
+
+class HbDialog;
+class DmAdvancedView;
+class DMFotaView : public HbView
+    {
+    Q_OBJECT
+public:
+    DMFotaView(HbMainWindow *mainWindow);
+    virtual ~DMFotaView();
+    bool addFotaView();
+    //HbDialog* createDialog() const;
+private:
+    void FormatList(QString val, QString str);
+public slots :
+    void OnHelp();
+    void OnExit();
+	void CheckforUpdate();
+	void AdvancedDeviceManager();
+	void backtoMainWindow();
+	void readSection( Qt::Orientation orientation );
+private:
+	HbMainWindow* mMainWindow;
+	HbView* fotaPortraitView;
+	HbView* fotaLandscapeView;
+	DmAdvancedView* profilesView;
+	HbAction    *mSoftKeyBackAction;
+    RSyncMLSession iSession;
+    RSyncMLDevManProfile profile;
+    RSyncMLDevManJob iSyncJob;
+    QTranslator* mTranslator;
+    HbLabel *label,*label2,*label3,*label4;
+    QStringList list1,list2;
+    TInt i;
+    HbDocumentLoader loader,loader2;
+    };
+    
+
+#endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/deviceupdates/inc/dminforetrieval.h	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,120 @@
+/*
+* Copyright (c) 2002-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:  Provides methods to retrieve device management
+*               information. 
+*
+*/
+
+#ifndef DMINFORETRIEVAL_H_
+#define DMINFORETRIEVAL_H_
+#include <qobject.h>
+#include <featmgr.h>
+#include <QGraphicsItem>
+#include <e32base.h>
+#include <badesca.h>
+#include "nsmldmsyncappengine.h"
+#include "nsmldmsyncprofile.h"
+//#include "NSmlDMSyncProfileItem.h"
+#include "nsmldmsyncutil.h"
+#include "nsmldmsyncdebug.h"
+#include "nsmldmsyncprofilelist.h"
+#include "nsmldmdbnotifier.h"
+class DmAdvancedView;
+class TNSmlDMProfileItem;
+//class CNSmlDMDbNotifier;
+class DmInfo: public QObject, public MNSmlDMDbEventHandler
+    {
+    Q_OBJECT
+
+   public:
+    DmInfo(DmAdvancedView* serversview, QGraphicsItem *parent=0);
+       virtual ~DmInfo();   
+       void refreshProfileList(TBool aIncludeHidden = ETrue);
+       int profilescount();
+      int profileinfo(int profilelistnum, QStringList& itemtext, int& icon, bool& lock);       
+       void setDefaultProfile(int listitem);      
+       bool Isprofilelocked(int profilelistnum/*, bool& lock*/);
+       bool Isdefaultprofile(int profilelistnum/*, bool& defaultprofile*/);
+       void profileTransport(int profilelistnum, int& transport);
+       TInt DeleteProfile( TInt& aIndex );
+       bool createNewprofile();       
+       int saveProfile(QStringList& itemdata, bool& sessmode, QString& currap,unsigned int& portnum, bool& nauth );       
+       bool getProfiledata(int& itemnum, QStringList& itemdata, bool& sessmode, QStringList& iaplist, int& curriap,  int& portnum, bool& nwauth);
+       bool checksrvid(QString& serverid);
+       void getIaplist(QStringList& iaplist, int& iapselected, int& listindex);
+       void synchronize(int& itemnum);
+       void synccomplete(int);     
+       /**
+       * Handles DB events
+       * @param aEvent DB event
+       * @return None
+       */
+       void HandleDbEventL( TNSmlDMDbEvent aEvent );
+       
+       void DisableDbNotifications( TBool aEvent );
+              
+private:
+       void GetProfiles( );
+       void OpenSyncSession();
+       TInt DefaultFotaProfileIdL() const;
+       void SetDefaultFotaProfileIdL( const TInt aProfileId );
+       
+   public slots:
+       
+      
+       
+
+
+   private:
+   //Profile list array
+   CArrayFixFlat<TNSmlDMProfileItem>*  iProfileList;
+   // Profile list
+   CNSmlDMSyncProfileList*             iSyncProfileList;
+   //Application engine
+   CNSmlDMSyncAppEngine*               iAppEngine;
+   // DB notifier
+   CNSmlDMDbNotifier*                  iDbNotifier;
+   TInt iProfileId;
+   // Blocks db events
+   TBool                               iDbEventsBlocked;
+   CNSmlDMSyncProfile* iProfile;
+   
+   QMap<QString,int> iapmap;
+   QStringList sortediaplist;
+   DmAdvancedView* serversView;
+   
+    };
+
+// CLASS DECLARATION
+
+
+/**
+*  TNSmlDMProfileItem helper class
+*/
+NONSHARABLE_CLASS (TNSmlDMProfileItem)
+    {
+    public:
+        TBuf<KNSmlMaxProfileNameLength> iProfileName;   
+        TInt     iProfileId;
+        TBool    iSynced;
+        TTime    iLastSync;
+        TInt     iBearer;
+        TInt     iActive;
+        TTime    iLastSuccessSync;
+        TBool    iDeleteAllowed;
+        TBool    iProfileLocked; 
+    };
+
+
+#endif /* DMINFORETRIEVAL_H_ */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/deviceupdates/inc/nsmldmdbnotifier.h	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,244 @@
+/*
+* Copyright (c) 2002-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:  Header file for CNSmlDMDbNotifier
+*
+*/
+
+
+#ifndef NSMLDMDBNOTIFIER_H
+#define NSMLDMDBNOTIFIER_H
+
+#include <e32std.h>
+#include <SyncMLObservers.h>
+#include <SyncMLClient.h>
+#include "nsmldmsyncutil.h"
+
+// CLASS DECLARATION
+
+/**
+* DB events
+* 
+*/
+NONSHARABLE_CLASS (TNSmlDMDbEvent)
+	{
+	public:
+		TInt iType;	
+		TInt iProfileId;
+		TInt iError;
+	};
+
+/**
+* Interface class to handle database events
+* 
+*/
+class MNSmlDMDbEventHandler
+	{
+
+	public:
+		/**
+        * CNSmlDMDbNotifier calls this to inform that database has changed.
+        * @param aStatus EClose, EUnlock, ECommit, ERollback, or ERecover (d32dbms.h).
+		* @param aMoreEvents ETrue issue new request, EFalse no requests.
+        * @return None. 
+        */
+		virtual void HandleDbEventL( TNSmlDMDbEvent aEvent ) = 0;
+	};
+	
+/**
+* DB notifier
+* 
+*/
+NONSHARABLE_CLASS (CNSmlDMDbNotifier) : public CBase,
+                                        public MNSmlDMActiveCallerObserver,
+                                        public MSyncMLEventObserver
+	{	
+    public:
+	    enum TEventType
+			{
+			EUpdate,
+			EUpdateAll,
+			EDelete,
+	        EClose
+			};
+
+	public:
+		/**
+        * Two-phased constructor
+        * @param aDatabase Reference to RDbDatabase instance.
+		* @param aHandler Pointer to MNSmlDMDbEventHandler instance.
+        * @return None. 
+        */
+		static CNSmlDMDbNotifier* NewL( RSyncMLSession* aSyncSession,
+		                                MNSmlDMDbEventHandler* aHandler );
+
+        /**
+        * Destructor.
+        */
+		virtual ~CNSmlDMDbNotifier();
+
+		// Functions from base classes
+
+	private:
+
+		/**
+        * Constructor
+        * @param aDatabase Reference to RDbDatabase instance.
+		* @param aHandler Pointer to event handler.
+        * @return None. 
+        */
+		CNSmlDMDbNotifier( RSyncMLSession* aSyncSession,
+		                   MNSmlDMDbEventHandler* aHandler);
+
+        /**
+        * By default Symbian OS constructor is private.
+        */
+		void ConstructL();
+
+	public:
+		/**
+		* Start requesting events from db.
+        * @param None. 
+        * @return None. 
+        */
+		void RequestL();
+
+   
+	private:   // from MNSmlDMActiveCallerObserver
+	
+		/**
+        * From MNSmlDMActiveCallerObserver
+		* Called when CNSmlDMActiveCaller completes.
+        * @param None
+        * @return None.
+        */
+		void HandleActiveCallL();
+
+    private:    // from MSyncMLEventObserver
+        
+		/**
+        * From MSyncMLEventObserver
+		* Called when SyncML session events oocur.
+        * @param aEvent.
+        * @param aIdentifier.
+        * @param aError.
+        * @param aAdditionalData.
+        * @return None.
+        */
+        void OnSyncMLSessionEvent( TEvent aEvent,
+                                   TInt aIdentifier,
+                                   TInt aError,
+                                   TInt aAdditionalData);
+
+    public:
+		/**
+		* Call observer with delay
+		* @param None
+		* @return None
+        */
+		void CallObserverWithDelay();
+		
+		/**
+		* Call observer
+		* @param None
+		* @return None
+        */		
+		void CallObserver();
+		
+		/**
+		* Set as disabled
+		* @param aDisable
+		* @return None
+        */		
+		void SetDisabled( TBool aDisable );
+		
+		/**
+		* Change profile count
+		* @param None
+		* @return TInt
+        */		
+		TInt ChangedProfileCount();
+		
+		/**
+		* DB event
+		* @param aIndex
+		* @return db event
+        */        
+        TNSmlDMDbEvent Event(TInt aIndex);
+		
+		/**
+		* Event count
+		* @param None
+		* @return TInt
+        */		
+		TInt EventCount();
+		
+		/**
+		* Reset
+		* @param None
+		* @return None
+        */		
+		void Reset();
+		
+		/**
+		* Find event
+		* @param None
+		* @return TInt
+        */
+		TInt FindCloseEvent();
+		
+		/**
+		* Find event
+		* @param None
+		* @return TInt
+        */
+		TInt FindSingleProfileEvent();
+		
+		/**
+		* Find event
+		* @param None
+		* @return TInt
+        */
+		TInt FindProfileEvent();
+		
+		/**
+		* Check if profile id is unique
+		* @param aId Profile id
+		* @return ETrue if unique
+        */
+		TBool IsUniqueProfileId(TInt aId);
+		
+		/**
+		* Utility function.
+		* @return Sync session.
+        */
+		RSyncMLSession& Session();
+
+	private:  
+		// sync session
+		RSyncMLSession* iSyncSession;
+		// Pointer to event handler
+		MNSmlDMDbEventHandler* iHandler;
+		// for making function call via active scheduler
+		CNSmlDMActiveCaller* iActiveCaller;
+		// for storing ids of changed profiles
+		RArray<TNSmlDMDbEvent> iList;
+		// can observer be called
+		TBool iDisabled;
+		// is synchronizing going on
+		TBool iSyncRunning;
+	};
+
+#endif // NSMLDMDBNOTIFIER_H
+
+// End of File
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/deviceupdates/inc/nsmldmdef.h	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,163 @@
+/*
+* 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:  Application definitions.
+*
+*/
+
+
+#ifndef NSMLDMDEF_H
+#define NSMLDMDEF_H
+
+#include <e32base.h>
+#include "nsmldmuidefines.h"
+//#include "NSmlDMSyncUi.hrh"
+
+#define KNSmlMaxURLLength 150
+#define KNSmlDmServerIdMaxLength 150
+#define KNSmlMaxItemLength 150	// The item max length.
+
+
+const TInt KNSmlDefaultGranularity = 1;
+
+const TInt KBufSize16   = 16;
+const TInt KBufSize     = 128;
+const TInt KBufSize255  = 255;
+const TInt KBufSize256  = 256;
+const TInt KBufSize32   = 32;
+const TInt KPortMaxSize = 65535;
+const TInt KPortMinSize = 1;
+// View UID:s
+//const TUid KNSmlDMFotaViewId        = { ENSmlFotaViewTab     };
+//const TUid KNSmlDMProfilesViewId    = { ENSmlProfilesViewTab };
+
+const TInt KDefaultHttpPort     = 80;
+const TInt KDefaultHttpsPort    = 443;
+ // setting dialog listbox update delay after db event
+const TInt KListBoxUpdateDelay  = 250;
+const TInt KHttpUsed  = 1;
+const TInt KHttpNotUsed  = 0;
+const TInt KNumberofCharacters  = 4;
+const TInt KMultiplier  = 1000000;
+
+//errors
+const TInt KDMErr					= -8144;
+
+// Medium type definitions
+const TUid KUidNSmlMediumTypeInternet  = { 0x101F99F0 };
+const TUid KUidNSmlMediumTypeBluetooth = { 0x101F99F1 };
+const TUid KUidNSmlMediumTypeUSB       = { 0x101F99F2 };
+const TUid KUidNSmlMediumTypeIrDA      = { 0x101F99F3 };
+const TUid KUidSmlSyncApp = { 0x101F6DE5 };
+
+_LIT( KNSmlHttp,    "http" );
+_LIT( KNSmlHttps,   "https" );
+_LIT( KHttpHeader,  "http://" );
+_LIT( KHttpsHeader, "https://" );
+_LIT( KColon,       ":" );
+_LIT( KHttpSep,     "://" );
+_LIT( KSlash,       "/" );
+_LIT( KSmlEOL,      "\n" );
+_LIT( KNSmlTab,     "\t" );
+
+_LIT( KZDrive, "z:" );
+
+#ifdef __SCALABLE_ICONS
+    _LIT( KDMAppIconFileName, "nsmldmsync.mif" );
+#else // !__SCALABLE_ICONS
+    _LIT( KDMAppIconFileName, "nsmldmsync.mbm" );
+#endif
+
+//
+// NOTE: this enum must match to resource r_sml_bearer_type
+//
+enum TNSmlSyncBearerType
+	{
+	EAspBearerInternet = 0,
+	EAspBearerBlueTooth = 1,
+	EAspBearerUsb = 2,
+	EAspBearerIrda = 3,
+    EAspBearerLast = 4
+	};
+
+// NOTE: this enum must match with property array described in 
+// SyncML_Sync_Agent_Client_API_Specification.doc.
+enum TNSmlSyncTransportProperties
+	{
+	EPropertyIntenetAccessPoint = 0,
+	EPropertyHttpUsed = 5,
+	EPropertyHttpUserName = 6,
+	EPropertyHttpPassword = 7
+	};
+
+enum TNSmlSyncState
+	{
+	ESASyncStateEnable,
+	ESASyncStateDisable,
+	ESASyncStateConfirm
+	};
+
+enum TNSmlSyncInitiation    
+	{		
+	EClientInitiated = 1,
+	EServerAlerted
+	};
+
+enum TNSmlEditMode
+	{ 
+	ESmlNewProfile = 0,
+	ESmlEditProfile,
+	ESmlCopyProfile
+	};
+
+enum TNSmlProfileMediumType
+	{
+	EProfileInternet = 0,
+	EProfileObexBlueTooth = 1
+	};
+
+enum TNSmlMandatoryProfileData
+	{
+	EMandatoryOk,
+	EMandatoryNoProfileName,
+    EMandatoryNoHostAddress,
+    EMandatoryNoContent,
+	EMandatoryNoLocalDatabase,
+	EMandatoryNoRemoteDatabase,
+	EMandatoryNoSyncType
+	};
+
+enum TNSmlStatus
+	{
+	ENSmlSyncComplete,
+	ENSmlRefreshMainView
+	};
+
+enum TNSmlAccessPointSelection
+	{	
+	ENsmlDefaultConnection,
+	ENsmlIap,
+	ENsmlAlwaysAsk
+	};	
+
+//Constants used when update happen NSC/DM 
+enum {
+		EFotaUpdateNSC=1,
+		EFotaUpdateNSCBg,
+		EFotaUpdateDM
+};
+
+
+#endif // NSMLDMDEF_H
+
+// End of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/deviceupdates/inc/nsmldmssyncui.hrh	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,79 @@
+/*
+* Copyright (c) 2005-2006 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:  Header file for Device Manager UI Menu and Other enumerations
+*
+*/
+
+
+#ifndef NSMLDMSYNCUI_HRH
+#define NSMLDMSYNCUI_HRH
+
+#include "NSmlDMUIDefines.h"
+enum TNSmlMenuCommands
+    {
+    ENSmlMenuDummy = 0x6000,    // Large enough to prevent confusion
+    ENSmlMenuCmdNewProfile,     // with avkon and eikon enumerations.
+    ENSmlMenuCmdOpenLog,
+    ENSmlMenuCmdOpenSettings,
+    ENSmlMenuCmdEraseProfile,
+    ENSmlMenuCmdStartSync,
+    ENSmlMenuCmdCancelSync,
+    ENSmlMenuCmdMainHelp,
+    ENSmlMenuCmdFotaCheck,
+    ENSmlMenuCmdFotaInstall,
+    ENSmlMenuCmdFotaContinue,
+    ENSmlMenuCmdFotaSettings,
+    ENSmlMenuCmdFotaSettChange,
+    ENSmlMenuCmdFotaServers
+   
+    };
+
+enum TNSmlTabViewId
+    {
+    ENSmlFotaViewTab = 1,
+    ENSmlProfilesViewTab
+    };
+
+enum TNSmlNotesQueriesAndLists
+    {
+    ENSmlProgressNote = 1,
+    ENSmlWaitNote,
+    ENSmlSettingList = 100,
+    ENSmlFotaSettList,
+    ENSmlMainViewList
+    };
+
+enum TNSmlSetting
+    {
+    ENSmlSettChange = 1,
+    ENSmlSettHelp,
+    ENSmlSettExit
+    };
+
+enum TNSmlSyncButtons
+    {
+    ENSmlSyncCancel = 1,
+    ENSmlSyncSelect
+    };
+
+enum TNSmlFotaPkgState
+    {
+    EGenericSession,
+    EFotaPkgFound,
+    EFotaPkgNotFound
+    };
+    
+#endif      //  NSMLDMSYNCUI_HRH
+
+// End of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/deviceupdates/inc/nsmldmsyncappengine.h	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,219 @@
+/*
+* 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:  Application engine for the sync events
+*
+*/
+
+
+
+#ifndef CNSMLDMSYNCAPPENGINE_H
+#define CNSMLDMSYNCAPPENGINE_H
+
+//  INCLUDES
+#include <e32base.h>
+#include <SyncMLClient.h>
+#include "nsmldmdef.h"
+
+// FORWARD DECLARATIONS
+class CNSmlDMSyncHandler;
+class CNSmlDMSyncProfile;
+class DmInfo;
+//class CNSmlDMSyncDocument;
+
+// CLASS DECLARATION
+
+/**
+* MNSmlDMSyncObserver
+*
+* MNSmlDMSyncObserver is for observing Sync.
+*/
+class MNSmlDMSyncObserver
+    {
+    public:
+	    virtual void SyncComplete( TNSmlStatus aStatus ) = 0;
+    };
+   
+/**
+* CNSmlDMSyncAppEngine
+* Sync engine for handling synchronization and profiles.
+*/
+NONSHARABLE_CLASS (CNSmlDMSyncAppEngine) : public CBase
+    {
+    public:  // Constructors and destructor
+        
+        /**
+        * Two-phased constructor.
+        */
+        static CNSmlDMSyncAppEngine* NewL(DmInfo* dmObj);
+        
+        /**
+        * Destructor.
+        */
+        virtual ~CNSmlDMSyncAppEngine();
+
+    public: // New functions
+        
+        /**
+        * Delete profile
+        * @param aProfileId Profile to be deleted.
+        * @return None
+        */
+        void DeleteProfileL( TInt aProfileId );
+
+        /**
+        * Create profile
+        * @param None.
+        * @return None
+        */
+        TInt CreateProfileL();
+
+        /**
+        * Create copy profile
+        * @param aProfileId Profile that is used for copying
+        * @return None
+        */
+        CNSmlDMSyncProfile* CreateCopyProfileL( TInt aProfileId );
+
+        /**
+        * Return current profile
+        * @param None.
+        * @return CNSmlDMSyncProfile*
+        */
+        CNSmlDMSyncProfile* Profile( );
+
+        /**
+        * Cancel synchronization
+        * @param None.
+        * @return None
+        */
+        void CancelSyncL();
+        
+        /**
+        * Return RSyncMLSession
+        * @param None.
+        * @return RSyncMLSession*
+        */
+        RSyncMLSession* Session();
+        
+        /**
+        * Open profile
+        * @param aProfileId Profile id to open
+        * @param aOpenMode opening mode
+        * @return None
+        */
+        CNSmlDMSyncProfile* OpenProfileL( TInt aProfileId,
+                                          TInt aOpenMode = ESmlOpenReadWrite );
+
+        /**
+        * Close profile
+        * @param None.
+        * @return None
+        */        
+        void CloseProfile();
+        
+        /**
+        * Start synchronization
+        * @param aProfileId Profile id to sync
+        * @return None
+        */               
+        void SynchronizeL( TDesC& aServerName,
+                           const TInt aProfileId,
+                           const TInt aConnectionBearer,
+                           const TBool aUseFotaProgressNote );
+        
+        /**
+        * Start synchronization
+        * @param aProfileId Profile id to sync
+        * @param aJobId Jod id to sync
+        * @return None
+        */         
+        void SynchronizeL( TDesC& aServerName,
+                           const TInt aProfileId,
+                           const TInt aJobId,
+                           const TInt aConnectionBearer,
+                           const TBool aUseFotaProgressNote );
+        
+        /**
+        * Check if duplicate server id is found
+        * @param  aServerId Server id
+        * @param  aProfileId current profile id
+        * @return ETrue if server id found
+        */                 
+        TBool ServerIdFoundL( const TDesC& aServerId, const TInt aProfileId );
+        
+		/**
+		* Compare two descriptors
+        * @param aLeft  
+		* @param aRight  
+		* @return - Positive, if this descriptor is 
+        *                     greater than the specified descriptor.
+		*           Negative, if this descriptor is
+		*                     less than the specified descriptor.
+		*           Zero, if the content of both descriptors match
+        */
+        TInt Compare( const TDesC& aLeft, const TDesC& aRight );
+        
+        /**
+        * Sync state
+        * @param None
+        * @return ETrue if sync is running
+        */          
+        TBool SyncRunning();
+        
+        /**
+        * Utility function.
+        * @param aSyncObserver
+        * @return None
+        */
+		void RequestSyncStatus( MNSmlDMSyncObserver* aSyncObserver );
+		
+		void SyncCompleted( TNSmlStatus aStatus );
+
+        /**
+        * Hides or shows the device management progress dialog.
+        * @since Series 60 3.1
+        * @param aShow ETrue -> The progress dialog is shown; EFalse -> The dialog is hidden.
+        * @return None
+        */
+        void ShowProgressDialogL( TBool aShow );
+        
+    private:
+
+        /**
+        * C++ default constructor.
+        */
+        CNSmlDMSyncAppEngine();
+
+        /**
+        * By default Symbian 2nd phase constructor is private.
+        */
+        void ConstructL( DmInfo* dmcallback );
+
+
+    private:    // Data
+        // SyncML Session
+        RSyncMLSession          iSyncMLSession;
+        // Sync profile
+        CNSmlDMSyncProfile*     iProfile;
+        // Sync handler
+        CNSmlDMSyncHandler*     iSyncHandler;
+        TBool               iProgressShown;
+        // Sync Observer
+        MNSmlDMSyncObserver*    iSyncObserver;
+        DmInfo* iDmcallback;
+    };
+
+#endif      // CNSMLDMSYNCAPPENGINE_H
+
+// End of File
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/deviceupdates/inc/nsmldmsyncdebug.h	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,55 @@
+/*
+* 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:  This file defines logging macros for DM
+*
+*/
+
+
+
+#ifndef NSMLDMSYNCDEBUG_H
+#define NSMLDMSYNCDEBUG_H
+
+#ifdef _DEBUG
+#include <e32svr.h>
+
+#define FLOG( a )   { RDebug::Print( _L(a) ); }
+#define FTRACE( a ) { a; }
+
+// Declare the FPrint function
+//
+inline void FPrint( const TRefByValue<const TDesC> aFmt, ... )
+    {
+    VA_LIST list;
+    VA_START( list, aFmt );
+    TInt tmpInt = VA_ARG( list, TInt );
+    TInt tmpInt2 = VA_ARG( list, TInt );
+    TInt tmpInt3 = VA_ARG( list, TInt );
+    VA_END( list );
+    RDebug::Print( aFmt, tmpInt, tmpInt2, tmpInt3 );
+    }
+
+
+
+// ===========================================================================
+#else // // No loggings --> Reduced binary size
+// ===========================================================================
+#define FLOG( a )
+#define FTRACE( a )
+
+#endif // _DEBUG
+
+#endif      // NSMLDMSYNCDEBUG_H
+            
+// End of File
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/deviceupdates/inc/nsmldmsynchandler.h	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,287 @@
+/*
+* 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:  Synchronization handler
+*
+*/
+
+
+#ifndef NSMLDMSYNCHANDLER_H
+#define NSMLDMSYNCHANDLER_H
+
+// INCLUDES
+#include <e32base.h>
+//#include <AknProgressDialog.h>
+#include <SyncMLObservers.h>
+//#include "NSmlDMProgress.h"
+#include "nsmldmsyncutil.h"
+#include "nsmldmsyncprofile.h"
+#include "nsmldmsyncappengine.h"
+// FORWARD DECLARATIONS
+class CNSmlDMSyncState;
+class CNSmlDMActiveCaller;
+//class CEikonEnv;
+//class CNSmlDMSyncDocument;
+//class CAknWaitDialog;
+
+// CLASS DECLARATION
+
+/**
+* CNSmlDMSyncHandler class
+* 
+*/
+NONSHARABLE_CLASS (CNSmlDMSyncHandler) : public CBase, 
+                        /*public MNSmlDMProgressDialogObserver,*/
+						public MNSmlDMActiveCallerObserver,
+						public MSyncMLEventObserver,
+						public MSyncMLProgressObserver/*,
+						public MProgressDialogCallback*/
+						
+	{
+    public:
+        /**
+        * Two-phased constructor.
+        */
+	    static CNSmlDMSyncHandler* NewL( RSyncMLSession* aSyncSession,
+	                                     CNSmlDMSyncAppEngine* aAppEngine/*,
+	                                     CNSmlDMSyncDocument* aSyncDocument*/ );
+
+	    /**
+        * Destructor.
+        */
+	    virtual ~CNSmlDMSyncHandler();
+
+    private:
+	    /**
+        * By default Symbian 2nd phase constructor is private.
+        */
+	    void ConstructL();
+
+	    /**
+        * C++ default constructor.
+        */
+	    CNSmlDMSyncHandler( RSyncMLSession* iSyncSession,
+                            CNSmlDMSyncAppEngine* aAppEngine/*,
+	                        CNSmlDMSyncDocument* aSyncDocument*/ );		
+    
+	private: // from MAspActiveCallerObserver
+		/**
+        * From MAspActiveCallerObserver
+		* Called when CAspActiveCaller completes.
+        * @param None
+        * @return None.
+        */
+		void HandleActiveCallL();
+
+
+    private:    // from MSyncMLEventObserver
+        
+		/**
+        * From MSyncMLEventObserver
+		* Called when SyncML session events oocur.
+        * @param aEvent Sync event
+        * @param aIdentifier Identifier for the sync event
+        * @param aError Synce event error
+        * @param aAdditionalData.
+        * @return None.
+        */
+        void OnSyncMLSessionEvent( TEvent aEvent,
+                                   TInt aIdentifier,
+                                   TInt aError,
+                                   TInt aAdditionalData );
+	
+	
+    private:  //from MSyncMLProgressObserver
+	    
+	    /**
+	    * Receives notification of a synchronisation error.
+        * @param aErrorLevel  The error level.
+	    * @param aError		  The type of error. This is one of 
+	    *                     the SyncMLError error values.	
+	    * @param aTaskId      The ID of the task for which the error occurred.
+	    * @param aInfo1       An integer that can contain additional
+	    *                     information about the error. Normally 0.
+	    * @param aInfo2       An integer that can contain additional
+	    *                     information about the error. Normally 0.
+	    * @return             None.
+	    */
+	    void OnSyncMLSyncError( TErrorLevel aErrorLevel,
+	                            TInt aError,
+	                            TInt aTaskId,
+	                            TInt aInfo1,
+	                            TInt aInfo2 );
+       	
+       	/**
+	    * Receives notification of synchronisation progress.
+	    * @param aStatus	The current status, e.g. 'Connecting'.
+	    * @param aInfo1	    An integer that can contain additional
+	    *                   information about the progress.
+	    * @param aInfo2	    An integer that can contain additional
+        *                   information about the progress.
+	    */
+	    void OnSyncMLSyncProgress( TStatus aStatus, TInt aInfo1, TInt aInfo2);
+	    
+	    /**
+	    * Receives notification of modifications to synchronisation tasks.
+        * @param aTaskId               The ID of the task.
+	    * @param aClientModifications  Modifications made on 
+	    *                              the clients Data Store.
+	    * @param aServerModifications  Modifications made on
+	    *                              the server Data Store.
+	    */
+	    void OnSyncMLDataSyncModifications( 
+	                TInt /*aTaskId*/,
+	                const TSyncMLDataSyncModifications& aClientModifications,
+	                const TSyncMLDataSyncModifications& aServerModifications );
+        
+	private:
+
+        /**
+        * Shows error dialog.
+		* @param None.
+        * @return Error code.
+        */
+        void HandleSyncErrorL();
+        
+        /**
+        * Called when sync completes
+		* @param aError.
+        * @return None.
+        */        
+        void SynchronizeCompletedL(TInt aError);
+        
+        /**
+        * Read sync error from CNSmlSyncLog and show error message.
+		* @param aProfileId Profile id.
+        * @return Result code.
+        */
+		TInt HandleSyncErrorL(TInt aProfileId);
+	
+	public:
+        /**
+        * Performs synchronization.
+        * @param aServerName Name of the server
+		* @param aProfileId Profile identifier.
+		* @param aConnectionBearer Bearer
+		* @param aUseFotaProgressNote Should the simplified progress note used. Only
+		*                             used when checking for firmware updates.
+        * @return None
+        */
+		void SynchronizeL( TDesC& aServerName,
+		                   const TInt aProfileId,
+		                   const TInt aConnectionBearer,
+                           const TBool aUseFotaProgressNote );
+		
+        /**
+        * Performs ServerInitiated synchronization.
+        * @param aServerName Name of the server
+		* @param aProfileId Profile id
+		* @param aJobId Job id.
+		* @param aConnectionBearer Bearer
+		* @param aUseFotaProgressNote Should the simplified progress note used. Only
+		*                             used when checking for firmware updates.
+        * @return None
+        */		
+		void SynchronizeL( TDesC& aServerName, 
+		                   const TInt aProfileId,
+		                   const TInt aJobId,
+		                   const TInt aConnectionBearer,
+                           const TBool aUseFotaProgressNote );
+		
+        /**
+        * Shows the progress dialog.
+		* @param None.
+        * @return None.
+        */
+        void ShowProgressDialogL();
+
+        /**
+        * Deletes the progress dialog if it exists.
+		* @param None.
+        * @return None.
+        */
+        void HideProgressDialogL();
+        
+		/**
+        * Cancel synchronization.
+		* @param None 
+        * @return None
+        */
+		void CancelSynchronizeL();
+				
+	private:
+        
+        /**
+        * Performs synchronization.
+        * @return None
+        */	
+		void SynchronizeL();
+		
+		/**
+        * Utility function.
+        * @return Sync session.
+        */
+		RSyncMLSession& Session();
+
+    public:
+
+		/**
+        * Utility function.
+        * @return ETrue if sync is currently running, EFalse otherwise.
+        */
+		TBool SyncRunning();
+
+    private:
+		// session with sync server
+		RSyncMLSession*                 iSyncSession;
+		// app engine
+		CNSmlDMSyncAppEngine*           iSyncAppEngine;       
+		// profile id
+		TInt                            iProfileId;
+		// sync job id
+		TInt                            iSyncJobId;
+		// sync job
+		RSyncMLDevManJob                iSyncJob;		
+        
+        // CheckUpdate state shown or Not
+        TBool iCheckUpdate;
+
+		CNSmlDMActiveCaller*            iActiveCaller;
+		// is sync currently running
+		TBool                           iSyncRunning;
+		// sync error code
+		TInt                            iSyncError;
+		// long buffer for string handling
+		TBuf<KBufSize256>               iBuf;
+		//Job id
+        TSmlJobId                       iJobId;
+        // Bearer
+        TInt                            iConnectionBearer;
+        // Server name
+        TBuf<KNSmlMaxProfileNameLength> iServerName;
+        // Server sync
+        TBool                           iServerAlertedSync;
+        // Should the simpler FOTA progress not be used
+        TBool                           iUseFotaProgressNote;
+        // Retry sync (authentication error)
+        TBool							iRetrySync;
+          // Variable to show whether in fotaview or not        
+        TInt  iNotinFotaView;
+        
+        // Identifies Fota progress note launched or not
+        TBool iFotaProgressLaunched;
+	};
+
+#endif  // NSMLDMSYNCHANDLER_H
+
+// End of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/deviceupdates/inc/nsmldmsyncinternalpskeys.h	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,81 @@
+/*
+* 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:  Publish and subcribe keys published by device manager
+*                application.
+*
+*/
+
+
+#ifndef NSMLDMSYNCINTERNALPSKEYS_H
+#define NSMLDMSYNCINTERNALPSKEYS_H
+
+// CONSTANTS
+
+// Device manager key UID
+const TUid KPSUidNSmlDMSyncApp = {0x101f6de5};
+
+// Fota Server key UID
+const TUid KFotaServerAppUid = {0x102072C4};
+
+// PubSub key used to share information about the
+// initiator of the device management session.
+// Contains the identifier of a job that is
+// started from the UI. 
+const TUint32 KNSmlDMSyncUiInitiatedJobKey = 0x00000001;
+
+// PubSub key used to share information about the
+// type of the server alert for device management session.
+// Contains the identifier of server alert type
+// started from DM Server
+const TUint32 KServerAlertType = 0x00000004;	
+
+// Indicates that no user initiated sync jobs are in
+// progress.
+const TInt KNSmlDMNoUserInitiatedJob = -1;
+
+// PubSub key used to share information about the
+// launching of the device management application.
+// Contains the identifier of server alert or 
+// OmaDmCPPlugin
+const TUint32 KNSmlDMSyncUiLaunchKey = 0x00000002;
+
+//PubSub key used for putting Fota UI in Foreground or background
+//Sets only by FOTA & DM uses this key value
+const TUint32 KFotaDLStatus = 0x00000008;
+
+//PubSub key used for main view first listitem display
+//Sets by DM UI or FOTA
+const TUint32 KFotaDLRefresh = 0x00000009;
+
+
+//PubSub key used to mark which application is handling the process of download
+//Sets by DM UI, NSC or NSCBackground
+const TUint32 KNSmlCurrentFotaUpdateAppName = 0x0000000A;
+
+
+//PubSub key used to define should "Install Now?" query be shown or not
+//Sets by DM UI or NSC
+const TUint32 KDevManShowInstallNowQuery = 0x0000000B;
+
+//PubSub key used to store the status/error of current DM Job session
+//Sets by DM UI & used by FOTA in case of OMA DM large object download
+const TUint32  KDmJobCancel = 0x00000012; 
+
+//PubSub key used to store the status of whether the DM is busy or not 
+//Sets by DM UI & used by IAD or others
+const TUint32 KDMIdle = 0x0000000C; 
+const TUint32 KSilentSession = 0x0000000D;
+#endif // NSMLDMSYNCINTERNALPSKEYS_H
+            
+// End of File
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/deviceupdates/inc/nsmldmsyncprivatecrkeys.h	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,86 @@
+/*
+* Copyright (c) 2005-2006 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:  Device manager private CenRep key definitions
+*
+*/
+
+
+#ifndef NSMLDMSYNCAPP_PRIVATE_CR_KEYS_H
+#define NSMLDMSYNCAPP_PRIVATE_CR_KEYS_H
+
+// CONSTANTS
+
+// Device manager key UID
+const TUid KCRUidNSmlDMSyncApp = {0x101f6de5};
+//browser uid 
+const TUid browseruid = {0x10008d39}; 
+//java uid 
+const TUid  javauid =   {0x2001FD68};
+//flash uid 
+const TUid  flashuid = {0x101FD693}; 
+
+// CenRep key used in variation of the aspects of
+// the firmware update feature. The flag values are
+// commented below.
+const TUint32 KNSmlDMFotaConfigurationKey = 0x00000001;
+
+// Enables the menu option Check updates.
+const TUint KNSmlDMFotaEnableManualCheckFlag         = 0x0001;
+// Enables the menu option that allows the user to access the default
+// profile used in FOTA sessions.
+const TUint KNSmlDMFotaUnlockedDefaultProfileFlag    = 0x0002;
+// Enables the FOTA view.
+const TUint KNSmlDMFotaEnableFotaViewFlag            = 0x0004;
+
+// CenRep keys for default dm profile used in the
+// firmware update over the air.
+const TUint32 KNSmlDMDefaultFotaProfileKey = 0x00000002;
+
+// CenRep key that can be used to hide a DM profile from the
+// profile list on the UI, but still retaining the UI functionality
+// during server alerted session. The server identifier used
+// to authenticate the server should be stored here.
+const TUint32 KNSmlDMFotaHiddenProfileIdKey = 0x00000003;
+
+// CenRep key that can be used to Enable/Disable the 
+// Connect menu in servers view options.Default value is 1
+// which Enables the Connect menu
+const TUint32 KNSmlDMEnableConnectMenuKey = 0x00000004;
+
+// CenRep key that can be used to Enable/Disable the 
+// Servers menu in Main view options.Default value is 1
+// which Enables the Servers menu
+const TUint32 KNSmlDMServersMenuKey = 0x00000005;
+
+// CenRep key that can be used to Enable/Disable the 
+// Settings menu in Main view options.Default value is 1
+// which Enables the Settings menu
+const TUint32 KNSmlDMSettingsMenuKey = 0x00000006;
+
+// CenRep key that can be used to allow manual check updates 
+// or not.Default value is 1 which Enables the check updates 
+// menu in the main view
+const TUint32 KNsmlDmManualCheckAllowed = 0x00000007;
+
+// CenRep key that can be used to allow to show runtime versions
+// or not.Default value is 0 which makes it off 
+const TUint32 KNsmlDmRuntimeVerSupport = 0x00000008;
+
+// CenRep key that can be used to know who launch DM UI
+// Default value is 0 which makes DM launches other than CP 
+const TUint32 KNsmlDmUILaunch = 0x00000009;
+
+#endif // NSMLDMSYNCAPP_PRIVATE_CR_KEYS_H
+            
+// End of File
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/deviceupdates/inc/nsmldmsyncprofile.h	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,451 @@
+/*
+* 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:  Profile container class
+*
+*/
+
+
+
+#ifndef CNSMLDMSYNCPROFILE_H
+#define CNSMLDMSYNCPROFILE_H
+
+//  INCLUDES
+#include <e32base.h>
+#include <SyncMLClient.h>
+#include <SyncMLClientDM.h>
+#include "NSmlDMdef.h"
+
+//#include "NSmlDMSyncApp.h"
+
+
+/**
+* CNSmlDMSyncProfile 
+*
+* CNSmlDMSyncProfile is used for getting/setting sync profile settings.
+*/
+NONSHARABLE_CLASS (CNSmlDMSyncProfile) : public CBase
+    {
+	enum TOpenMode
+		{
+	    EOpenRead,
+	    EOpenReadWrite
+		};
+		
+    public:
+        /**
+        * Two-phased constructor.
+        * @param aParam
+        */
+        static CNSmlDMSyncProfile* NewLC( const TInt aApplicationId,
+                                          RSyncMLSession* aSyncSession);
+
+        /**
+        * Two-phased constructor.
+        * @param aParam
+        */
+        static CNSmlDMSyncProfile* NewL( const TInt aApplicationId,
+                                         RSyncMLSession* aSyncSession );
+
+	    /**
+        * Destructor.
+        */
+        virtual ~CNSmlDMSyncProfile();
+
+    private:
+        /**
+        * C++ default constructor.
+        * @param aParam
+        */
+	    CNSmlDMSyncProfile( const TInt aApplicationId,
+	                        RSyncMLSession* aSyncSession );
+
+        /**
+        * By default Symbian 2nd phase constructor is private.
+        */
+	    void ConstructL();
+	    
+    public:
+        /**
+		* Open profile
+        * @param aProfileId Profile id to open
+        * @param aOpenMode Opening mode
+		* @return None
+        */
+        void OpenL( TInt aProfileId, TInt aOpenMode );
+        
+        /**
+		* Create profile
+        * @param None.
+		* @return Profile ID.
+        */
+        TInt CreateL();
+        
+        /**
+		* Create copy profile
+        * @param aProfileId Profile that is used for copying
+		* @return None
+        */
+        void CreateCopyL( TInt aProfileId );
+        
+        /**
+		* Save profile
+        * @param None
+		* @return None
+        */
+        void SaveL();
+        
+	public:
+        
+        /**
+		* Set name for profile
+        * @param aText name for profile
+		* @return None
+        */
+        void SetNameL(const TDesC& aText);
+        
+        /**
+		* Get profile name
+        * @param aText name for profile
+		* @return None
+        */
+        void GetName( TDes& aText );
+        
+        /**
+		* Set creator id for the profile
+        * @param aCreatorId creator id
+		* @return None
+        */
+        void SetCreatorId(TInt aCraetorId);
+        
+        /**
+		* Get creator id
+        * @param None
+		* @return creator id
+        */
+        TInt CreatorId();
+        
+        /**
+		* Get profile id
+        * @param None
+		* @return Currently open profile id
+        */
+        TInt ProfileId();
+        
+        /**
+		* Check if delete is allowed
+        * @param None
+		* @return ETrue if allowed
+        */
+        TBool DeleteAllowed();
+        
+        
+        TBool ProfileLocked();
+        /**
+		* Has profile been synced
+        * @param None
+		* @return ETrue if synced
+        */
+		TBool IsSynced();
+        
+        /**
+		* Last sync time
+        * @param None
+		* @return Time of sync
+        */
+		TTime LastSync();
+		
+		/**
+		* Last Success sync time
+        * @param None
+		* @return Time of sync
+        */
+		TTime LastSuccessSync();
+
+    // settings that connection dialog displays
+    public:
+        /**
+		* Set server id
+        * @param aText server id
+		* @return None
+        */
+        void SetServerIdL(const TDesC& aText);
+        
+        /**
+		* Get server id
+        * @param aText server id
+		* @return NOne
+        */
+        void GetServerId(TDes& aText);
+        
+        /**
+		* Get server password
+        * @param aText server password
+		* @return None
+        */
+        void GetServerPassword( TDes& aText );
+        
+        /**
+		* Set server password
+        * @param aText server password
+		* @return None
+        */
+        void SetServerPasswordL( const TDesC& aText );
+        
+        /**
+		* Get protocol version
+        * @param None
+		* @return Version
+        */
+        TInt ProtocolVersion();
+        
+        /**
+		* Set Protocol version
+        * @param aProtocolVersion protocol version
+		* @return None
+        */
+        void SetProtocolVersionL( TInt aProtocolVersion );
+        
+        /**
+		* Get bearer type
+        * @param None
+		* @return bearer type
+        */
+        TInt BearerType();
+        
+        /**
+		* Set bearer type
+        * @param aId bearer type
+		* @return None
+        */
+        void SetBearerTypeL( TInt aId );
+        
+        /**
+		* Get accesspoint
+        * @param None
+		* @return accespoint
+        */
+        TInt AccessPointL();
+        
+        /**
+		* Set accesspoint
+        * @param aId accespoint id
+		* @return None
+        */
+        void SetAccessPointL(const TInt aId);
+        
+        /**
+		* Get host address
+        * @param aText host address
+        * @param aPort host port
+		* @return None
+        */
+        void GetHostAddress( TDes& aText, TInt& aPort );
+        
+        /**
+		* set host address
+        * @param aText host address
+        * @param aPort host 
+		* @return None
+        */
+        void SetHostAddressL( const TDesC& aText, const TInt aPort );
+        
+        /**
+		* Get port number 
+        * @param None
+		* @return port number
+        */
+        TInt PortNumber();
+        
+        /**
+		* Set port number
+        * @param aPortNumber port number
+		* @return None
+        */
+        void SetPortNumber( TInt aPortNumber );
+        
+        /**
+		* Get user name
+        * @param aText user name
+		* @return None
+        */
+        void GetUserName( TDes& aText );
+        
+        /**
+		* Set user name
+        * @param aText user name
+		* @return None
+        */
+        void SetUserNameL( const TDesC& aText );
+        
+        /**
+		* Get user password
+        * @param aText user password
+		* @return None
+        */
+        void GetPassword( TDes& aText );
+        
+        /**
+		* Set user password
+        * @param aText user password
+		* @return None
+        */
+        void SetPasswordL( const TDesC& aText );
+        
+        /**
+		* Set server alert state
+        * @param aState server alert state
+		* @return None
+        */        
+        void SetSASyncStateL( TInt aState );
+        
+        /**
+		* Get Server alert state
+        * @param None
+		* @return server alert state
+        */
+        TInt SASyncState();
+        
+        /**
+		* Set http used state
+        * @param aEnable ETrue if http authentication needs to be used
+		* @return None
+        */
+        void SetHttpUsedL( TBool aEnable );
+        
+        /**
+		* Check whether http authentication is used
+        * @param None
+		* @return ETrue if http authentication is used
+        */
+        TBool HttpUsedL();
+        
+        /**
+		* Get http user name
+        * @param aText user name
+		* @return None
+        */        
+        void GetHttpUserNameL( TDes& aText );
+        
+        /**
+		* Set http user name
+        * @param aText user name
+		* @return None
+        */
+        void SetHttpUserNameL( const TDesC& aText );
+        
+        /**
+		* Get http password
+        * @param aText password
+		* @return None
+        */
+        void GetHttpPasswordL( TDes& aText );
+        
+        /**
+		* Set http password
+        * @param aText password
+		* @return None
+        */
+        void SetHttpPasswordL( const TDesC& aText );
+ 
+               
+    public:
+       
+        /**
+		* Return latest history job
+        * @param None
+		* @return CSyncMLHistoryJob*
+        */        
+        const CSyncMLHistoryJob* LatestHistoryJob();
+        
+        /**
+		* Open connection
+        * @param None
+		* @return None
+        */
+        void OpenConnection();
+        
+        /**
+		* Open history log
+        * @param None
+		* @return None
+        */
+        void OpenHistoryLog();
+
+        /**
+		* Close history log
+        * @param None
+		* @return None
+        */        
+        void CloseHistoryLog();
+
+        /**
+		* Return DevMan profile
+        * @param None
+		* @return RSyncMLDevManProfile&
+        */
+        RSyncMLDevManProfile& Profile();
+        
+        /**
+		* Return SyncML Session
+        * @param None
+		* @return RSyncMLSession&
+        */
+        RSyncMLSession& Session();
+        
+    public:
+        /**
+		* Get connection name
+        * @param aText name
+        * @param aPropertyPos position at the array
+		* @return None
+        */
+        void GetConnectionPropertyNameL( TDes8& aText, TInt aPropertyPos );
+        
+    private:
+    
+        /**
+		* Copy values from one profile to another
+        * @param aSource source profile
+		* @return None
+        */    
+        void CopyValuesL( CNSmlDMSyncProfile* aSource );
+
+	private:
+	    // profile id
+        TInt                    iProfileId;
+        // Log open
+        TBool                   iHistoryLogOpen;
+        // Connection open
+        TBool                   iConnectionOpen;
+        // Port number
+        TInt                    iPortNumber;
+   		// needed for setting creator id
+		TInt                    iApplicationId;
+		// long buffer for string handling 
+		TBuf<KBufSize255>       iBuf;
+		// long buffer for string handling 
+		TBuf8<KBufSize255>      iBuf8;
+   		// sync session
+		RSyncMLSession*         iSyncSession;
+		// sync profile
+		RSyncMLDevManProfile    iProfile;
+		// history log
+		RSyncMLHistoryLog       iHistoryLog;
+		// sync connection
+		RSyncMLConnection       iConnection;
+    };
+
+#endif  // CNSMLDMSYNCPROFILE_H
+
+// End of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/deviceupdates/inc/nsmldmsyncprofileitem.h	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,93 @@
+/*
+* 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:  Represents one sync profile
+*
+*/
+
+
+
+#ifndef TNSMLDMSYNCPROFILEITEM_H
+#define TNSMLDMSYNCPROFILEITEM_H
+
+//  INCLUDES
+#include <e32base.h>
+#include "nsmldmdef.h"
+
+/**
+* TNSmlDMSyncProfileItem
+*
+* TNSmlDMSyncProfileItem represents one sync profile.
+*/
+NONSHARABLE_CLASS (TNSmlDMSyncProfileItem)
+	{
+	public:
+	    /**
+        * Name
+        * @param None
+		* @return TDesC
+        */
+		const TDesC& Name();
+	    
+	    /**
+        * SetName
+        * @param aName Profile name
+		* @return None
+        */
+		void SetName(const TDesC& aName);
+	    
+	    /**
+        * Id
+        * @param None
+		* @return ID
+        */
+		TInt Id();
+	    
+	    /**
+        * SetId
+        * @param aId Profile id
+		* @return None
+        */		
+		void SetId(TInt aId);
+
+	public:
+	    
+	    /**
+        * CompareItem
+        * @param aFirst
+        * @param aSecond
+		* @return 
+        */
+		static TInt CompareItem( const TNSmlDMSyncProfileItem& aFirst,
+		                         const TNSmlDMSyncProfileItem& aSecond );
+
+	public:
+		TBuf<KBufSize> iProfileName;	
+		TInt     iProfileId;
+		TBool	 iSynced;
+		TTime	 iLastSync;
+	    TTime    iLastSuccessSync;
+		TInt	 iBearer;
+		TInt	 iActive;
+		TBool	 iDefault;
+		TBool    iDeleteAllowed;
+		TBool    iProfileLocked;
+		TInt     iApplicationId;
+		TInt     iImplementationId;
+		TInt     iContentCount;
+		TInt     iMandatoryCheck;
+	};
+
+#endif  // TNSMLDMSYNCPROFILEITEM_H
+
+// End of File
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/deviceupdates/inc/nsmldmsyncprofilelist.h	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,164 @@
+/*
+* 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:  Profile list container
+*
+*/
+
+
+
+#ifndef CNSMLDMSYNCPROFILELIST_H
+#define CNSMLDMSYNCPROFILELIST_H
+
+//  INCLUDES
+
+#include <e32base.h>
+#include "nsmldmsyncprofileitem.h"
+
+// FORWARD DECLARATIONS
+class TNSmlDMSyncProfileItem;
+class CNSmlDMSyncProfile;
+class CNSmlDMSyncAppEngine;
+
+/**
+* CNSmlDMSyncProfileList 
+*
+* CNSmlDMSyncProfileList is a list of profiles
+*/
+NONSHARABLE_CLASS (CNSmlDMSyncProfileList) : public CBase
+    {
+
+    public:
+        /**
+        * Two-phased constructor.
+        */
+        static CNSmlDMSyncProfileList* NewL( CNSmlDMSyncAppEngine* aEngine  );
+
+	    /**
+        * Destructor.
+        */
+        virtual ~CNSmlDMSyncProfileList();
+
+    private:
+        /**
+        * C++ default constructor.
+        */
+	    CNSmlDMSyncProfileList( CNSmlDMSyncAppEngine* aEngine  );
+
+        /**
+        * By default Symbian 2nd phase constructor is private.
+        */
+	    void ConstructL();
+
+	public:
+		/**
+		* Returns profile count.
+        * @return Profile count.
+        */
+		TInt Count();
+
+		/**
+		* Returns profile from list.
+        * @param aIndex List index.
+		* @return TNSmlDMSyncProfileItem.
+        */
+		TNSmlDMSyncProfileItem Item( TInt aIndex );
+	
+		/**
+		* Finds profile with name aProfileName.
+		* @param aProfileName Profile name.
+		* @return Profile id or KErrNotFound.
+        */
+		TInt FindProfile( const TDesC& aProfileName );
+
+		/**
+		* Read one profile from database.
+		* @param aProfile.
+		* @return TNSmlDMSyncProfileItem.
+        */
+        TNSmlDMSyncProfileItem ReadProfileItemL( CNSmlDMSyncProfile* aProfile );
+
+		/**
+		* Reads all profiles from database.
+		* @return None.
+        */
+		void ReadProfileItemsL();
+
+		/**
+		* Reads all profiles from database.
+		* @param aIncludeHidden Should hidden profile be included
+		* @return None.
+        */
+		void ReadProfileItemsL( TBool aIncludeHidden );
+
+		/**
+		* Reads one profile from database.
+		* @param aIndex profile index
+		* @return None.
+        */
+		void ReadProfileItemL( TInt aIndex );
+
+		/**
+		* Resets profile list.
+		* @param None.
+		* @return None.
+        */
+		void Reset();
+
+		/**
+		* Remove item from profilelist
+		* @param aProfileId.
+		* @return None.
+        */
+		void Remove( TInt aProfileId );
+
+		/**
+		* Checks that mandatory data exists.
+		* @param aProfile.
+		* @return Return code.
+        */
+        static TInt CheckMandatoryDataL( CNSmlDMSyncProfile* aProfile );
+		
+		/**
+		* Replaces profile items
+		* @param aProfileItem.
+		* @return None.
+        */	
+		void ReplaceProfileItemL( TNSmlDMSyncProfileItem& aProfileItem );
+		
+		/**
+		* Sort list
+		* @param None
+		* @return None.
+        */		
+		void Sort();
+				
+	private:
+		
+		/**
+		* Chceks empty characters
+		* @param aText
+		* @return ETrue if text is empty
+        */
+		static TBool IsEmpty( const TDesC& aText );
+
+	private:
+	    // Sync app engine
+        CNSmlDMSyncAppEngine*           iEngine;
+		// list of profiles
+		RArray<TNSmlDMSyncProfileItem>  iList;
+    };
+
+#endif  // CNSMLDMSYNCPROFILELIST_H
+
+// End of File
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/deviceupdates/inc/nsmldmsyncutil.h	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,449 @@
+/*
+* 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:  Utility classes.
+*
+*/
+
+
+#ifndef NSMLDMSYNCUTIL_H
+#define NSMLDMSYNCUTIL_H
+
+// INCLUDES
+#include <e32base.h>
+
+// CLASS DECLARATION
+
+/**
+* TUtil
+* 
+* This class contains general utility functions. 
+*/
+NONSHARABLE_CLASS (TUtil)
+	{
+    public:
+    
+        /**
+        * Panic
+        * @param aReason.
+        * @return None
+        */
+        static void Panic( TInt aReason );
+        
+        /**
+        * String copy tool
+        * @param aTarget.
+        * @param aSource.
+        * @return None
+        */        
+		static void StrCopy( TDes& aTarget, const TDesC& aSource );
+        /**
+        * String copy tool
+        * @param aTarget.
+        * @param aSource.
+        * @return None
+        */      		
+		static void StrCopy( TDes& aTarget, const TDesC8& aSource );
+        
+        /**
+        * String copy tool
+        * @param aTarget.
+        * @param aSource.
+        * @return None
+        */      		
+		static void StrCopy( TDes8& aTarget, const TDesC& aSource );
+        
+        /**
+        * String append tool
+        * @param aTarget.
+        * @param aSource.
+        * @return None
+        */      		
+		static void StrAppend( TDes& aTarget, const TDesC& aSource );
+        
+        /**
+        * String insert tool
+        * @param aTarget.
+        * @param aSource.
+        * @return None
+        */      		
+		static void StrInsert( TDes& aTarget, const TDesC& aSource );
+        
+        /**
+        * Convert string to int
+        * @param aText.
+        * @param aNum.
+        * @return None
+        */		
+		static TInt StrToInt( const TDesC& aText, TInt& aNum );
+        
+        /**
+        * Check whether textline is empty
+        * @param aText.
+        * @return ETrue if empty
+        */				
+		static TBool IsEmpty( const TDesC& aText );
+        
+        /**
+        * URI Parser
+        * @param aURI
+        * @param aAddress
+        * @param aPort
+        * @param aDocName
+        * @return None
+        */						
+        static void ParseURIL( const TDesC& aURI, 
+                               TDes& aAddress, 
+                               TDes& aPort, 
+                               TDes& aDocName );
+      
+        /**
+        * Returns formatted sync time
+        * @param aLastSync
+        * @return Sync time
+        */
+        static HBufC* SyncTimeLC( TTime aLastSync );
+        
+        /**
+        * Get data as text
+        * @param 
+        * @return 
+        */        
+        static void GetDateTextL( TDes& aText, TTime aDateTime );
+        
+        /**
+        * Get time as text 
+        * @param 
+        * @return 
+        */        
+		static void GetTimeTextL( TDes& aText, TTime aDateTime );
+        
+        /**
+        * Get data and time as text
+        * @param 
+        * @return 
+        */        
+		static void GetDateTimeTextL( TDes& aText, TTime aDateTime );
+        
+        /**
+        * Check if SettingEnforcement is set
+        * @param 
+        * @return Boolean
+        */        
+		static TBool SettingEnforcementStateL();
+
+        /**
+        * Check if SettingEnforcement is set (non-leaving)
+        * @param 
+        * @return Boolean
+        */        
+		static TBool SettingEnforcementState();
+
+    private:
+    
+        /**
+        * Check if sync has happened today
+        * @param atime
+        * @return Boolean
+        */    
+        static TBool IsToday( TTime aTime );
+        
+        /**
+        * Convert time to hometime
+        * @param aUniversalTime
+        * @return TTIme
+        */            
+        static TTime ConvertUniversalToHomeTime( const TTime& aUniversalTime );
+
+	};
+
+/**
+*  TStr contains descriptor operations with range checking.
+*/
+NONSHARABLE_CLASS (TStr)
+    {
+    public:
+        /**
+        * C++ default constructor.
+        */
+        TStr(const TDesC& aStr);
+       
+    public:
+        /**
+        * String manipulating tools
+        * @param aPos
+        * @param aLen
+        * @return TPtrC
+        */        
+        TPtrC Mid( TInt aPos, TInt aLen );
+        
+        /**
+        * String manipulating tools
+        * @param aPos
+        * @return TPtrC
+        */                
+        TPtrC Mid( TInt aPos );
+
+        /**
+        * String manipulating tools
+        * @param aPos
+        * @return TPtrC
+        */                
+        TPtrC Left( TInt aPos );
+        
+        /**
+        * String manipulating tools
+        * @param aPos
+        * @return TPtrC
+        */               
+        TPtrC Right( TInt aPos );
+        
+        /**
+        * String manipulating tools
+        * @param aStartPos
+        * @param aEndPos
+        * @return TPtrC
+        */               
+        TPtrC SubStr( TInt aStartPos, TInt aEndPos );
+
+        /**
+        * String manipulating tools
+        * @param aStartPos
+        * @param aEndPos
+        * @return TPtrC
+        */           
+        TPtrC SubStrEx( TInt aStartPos, TInt aEndPos );
+
+        /**
+        * String manipulating tools
+        * @return TInt
+        */           
+        TInt LastPos();
+
+        /**
+        * String manipulating tools
+        * @return TInt
+        */           
+        TInt Len();
+
+        /**
+        * String manipulating tools
+        * @param aPos
+        * @param aChar
+        * @return TBool
+        */           
+        TBool Compare( TInt aPos, TChar aChar );
+
+        /**
+        * String manipulating tools
+        * @param aStartPos
+        * @param aChar
+        * @return TInt
+        */
+        TInt Find( TInt aPos, TChar aChar );
+        
+    private:
+        // reference to descriptor
+		const TDesC& iStr;
+    };
+
+/**
+*  TURIParser is used for parsing URI.
+*/
+NONSHARABLE_CLASS (TURIParser)
+    {
+    public:
+        /**
+        * C++ default constructor.
+        */
+        TURIParser( const TDesC& aStr );
+       
+    public:
+        /**
+        * URI manipulating tools
+        * @param aText
+        * @return None
+        */    
+        void GetUriWithoutPort( TDes& aText );
+
+        /**
+        * URI manipulating tools
+        * @param aText
+        * @param aPort
+        * @return None
+        */            
+        void GetUri( TDes& aText, const TInt aPort );
+
+        /**
+        * URI manipulating tools
+        * @return TInt
+        */            
+        TInt Port();
+
+        /**
+        * URI manipulating tools
+        * @return TInt
+        */            
+        TInt DefaultPort();
+
+    private:
+        /**
+        * URI manipulating tools
+        * @return TPtrC
+        */          
+        TPtrC ParseHttp();
+
+        /**
+        * URI manipulating tools
+        * @return TPtrC
+        */              
+        TPtrC ParseAddress();
+
+        /**
+        * URI manipulating tools
+        * @return TPtrC
+        */              
+        TPtrC ParseDocument();
+
+        /**
+        * URI manipulating tools
+        * @param aPortNumber
+        * @return TInt
+        */              
+        TInt ParsePort(TInt& aPortNumber);
+
+        /**
+        * URI manipulating tools
+        * @return TPtrC
+        */              
+        TPtrC ParsePort();
+        
+     private:
+
+        /**
+        * URI manipulating tools
+        * @param aStartPos
+        * @param aEndPos
+        * @return None
+        */          
+        void GetHttpPos(TInt& aStartPos, TInt& aEndPos);
+
+        /**
+        * URI manipulating tools
+        * @return NOne
+        */             
+        void SkipHttp();
+  
+    private:
+        // reference to original URI text
+		const TDesC& iOriginalStr;
+		
+		// pointer to original URI text
+		TPtrC iPtr;
+		
+		//reference to Boolean variable which tells about Slash in URI
+		TBool iSlash;
+    };
+
+/**
+* MNSmlDMActiveCallerObserver
+*
+* MNSmlDMActiveCallerObserver is for observing CNSmlDMActiveCaller.
+*/
+class MNSmlDMActiveCallerObserver
+    {
+    public:
+	    virtual void HandleActiveCallL() = 0;
+    };
+
+/**
+* CNSmlDMActiveCaller
+*
+* CNSmlDMActiveCaller is used for generating a call from active scheduler.
+*/
+NONSHARABLE_CLASS (CNSmlDMActiveCaller) : public CActive
+    {
+    public:
+        /**
+        * Two-phased constructor.
+        */
+        static CNSmlDMActiveCaller* NewL(MNSmlDMActiveCallerObserver* aObserver);
+
+	    /**
+        * Destructor.
+        */
+        virtual ~CNSmlDMActiveCaller();
+
+    private:
+        /**
+        * C++ default constructor.
+        */
+	    CNSmlDMActiveCaller(MNSmlDMActiveCallerObserver* aObserver);
+
+        /**
+        * By default Symbian 2nd phase constructor is private.
+        */
+	    void ConstructL();
+
+	public:
+        /**
+        * Calls observer using active object framework.
+        * @param aCallId.
+		* @param aMilliseconds Delay before observer is called.
+        * @return None
+        */
+		void Start( TInt aCallId, TInt aMilliseconds = 0 );
+
+    private:
+        /**
+        * From CActive. Called when asynchronous request completes.
+        * @param None
+        * @return None
+        */
+	    void RunL();
+       
+        /**
+        * From CActive. Called when RunL Leaves.
+        * @param None
+        * @return error
+        */
+        TInt RunError( TInt aError );
+
+        /**
+        * From CActive. Cancels asynchronous request.
+        * @param None
+        * @return None
+        */
+	    void DoCancel();
+        
+        /**
+        * Make active scheduler call RunL.
+        * @param None
+        * @return None
+        */
+		void CompleteSelf();
+
+    private:
+		// call that is passed to observer
+		TInt iCallId;
+
+		// timer
+		RTimer iTimer;
+
+		// observer that gets called
+		MNSmlDMActiveCallerObserver* iObserver;
+    };
+
+#endif  // NSMLDMSYNCUTIL_H
+
+// End of File
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/deviceupdates/inc/nsmldmuidefines.h	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,38 @@
+/*
+* 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:  Header file for UI definitions
+*
+*/
+
+
+#ifndef NSMLDMUIDEFINES_H
+#define NSMLDMUIDEFINES_H
+
+//Authentication query time-out. Time in seconds.
+#define NSmlDMAuthQueryShowTime 900 
+//Accept alert query time-out. Time in seconds.
+#define NSmlDMAlertTimeAccept 60
+
+#define KNSmlMaxTextLength64 64
+#define KNSmlMaxTextLength128 128
+#define KNSmlMaxTextLength256 256
+#define KNSmlMaxEmptyTextLength 100
+
+#define KNSmlMaxProfileNameLength 100 
+#define KNSmlMaxUsernameLength 100 
+#define KNSmlMaxPasswordLength 50 
+
+#endif // NSMLDMUIDEFINES_H
+
+// End of File
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/deviceupdates/inc/serversettingsview.h	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,84 @@
+/*
+* Copyright (c) 2002-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:  Launches server settings view to edit or create
+*               device management server profile.
+*
+*/
+
+#ifndef SERVERSETTINGSVIEW_H_
+#define SERVERSETTINGSVIEW_H_
+#include <hbinstance.h>
+#include <hbview.h>
+#include <hbaction.h>
+#include <hbdataform.h>
+#include <hbdataformmodel.h>
+#include <hbdataformmodelitem.h>
+#include <QStandardItemModel>
+#include <qmobilityglobal.h> 
+
+class HbDataFormViewItem;
+class HbInputFilter;
+class SettingsDataFormCustomItem;
+class DmAdvancedView;
+class ServerSettingsView : public HbView
+{
+    Q_OBJECT
+
+public:
+    explicit ServerSettingsView(HbMainWindow* mainWindow, DmAdvancedView* serversView ,
+                QString& header, QGraphicsItem* parent = 0);
+    virtual ~ServerSettingsView();       
+    void constructview(QString& header);       
+    int setProfileValues(QStringList& settingdatalist,bool& sessionmode, QStringList& apdata, int& currentap
+            ,  int& port, bool& networkauth);    
+    void setBackButtonBehavior();    
+    void makeviewItemsVisible(QString& heading);
+    
+private:    
+    void hideInternetitems(); 
+    void showInternetitems(); 
+    
+public slots:
+    void backButtonClicked();
+    void checkServerIdvalue();    
+    void accessPointItemChanged(int apindex);
+
+public:    
+    HbMainWindow *iMainWindow;        
+    HbMenu* viewspecificmenu;
+    HbAction* help;
+    HbAction* exit;
+    HbDataForm* form;
+    HbDataFormModel* dataformmodel;
+    HbDataFormModelItem* servername; 
+    HbDataFormModelItem* serverid; 
+    HbDataFormModelItem* sessionmode;
+    HbDataFormModelItem *serverpwd; 
+    HbDataFormModelItem* accesspoint;
+    HbDataFormModelItem* hostaddress;
+    HbDataFormModelItem* port; 
+    HbDataFormModelItem* username;
+    HbDataFormModelItem* userpwd;
+    HbDataFormModelItem* networkauth;
+    HbDataFormModelItem* networkusername;
+    HbDataFormModelItem* networkpwd;
+    HbAction* backaction;    
+    DmAdvancedView* serversView;
+    SettingsDataFormCustomItem* customPrototype;
+    int currentiapindex;
+    QStringList apnameslist;
+    bool backbehaviorset;    
+};
+
+#endif /* SERVERSETTINGSVIEW_H_ */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/deviceupdates/inc/settingsdataformcustomitem.h	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,38 @@
+/*
+ * 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:  This class provides custom list item for the
+ * DataForm
+ *
+ */
+
+#ifndef SETTINGS_DATAFORM_CUSTOMITEM_H
+#define SETTINGS_DATAFORM_CUSTOMITEM_H
+
+#include <hbdataformviewitem.h>
+
+class SettingsDataFormCustomItem : public HbDataFormViewItem
+{
+Q_OBJECT
+
+public:
+    explicit SettingsDataFormCustomItem(QGraphicsItem *parent);
+    ~SettingsDataFormCustomItem();
+
+    virtual HbAbstractViewItem* createItem();
+
+protected:
+    virtual HbWidget* createCustomWidget();
+};
+
+#endif // SETTINGS_DATAFORM_CUSTOMITEM_H
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/deviceupdates/resources/deviceupdates.qrc	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<RCC>
+    <qresource prefix="/xml">
+        <file alias="serversview.docml">serversview.docml</file>
+        <file>updatedialog.docml</file>
+        <file>devman.docml</file>
+    </qresource>
+    <qresource prefix="/icons">
+        <file alias="qtg_large_avatar.svg">qtg_large_avatar.svg</file>
+        <file alias="qgn_prop_sml_bt.svg">qgn_prop_sml_bt.svg</file>
+        <file alias="qgn_prop_sml_http.svg">qgn_prop_sml_http.svg</file>
+        <file alias="qgn_indi_sett_protected_add.svg">qgn_indi_sett_protected_add.svg</file>
+    </qresource>
+</RCC>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/deviceupdates/resources/qgn_indi_sett_protected_add.svg	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,14 @@
+<?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" height="13" version="1.1" viewBox="0 0 13 13" width="13" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g>
+<rect fill="none" height="13" width="13"/>
+<g>
+<path d="M5.924,2.246c0.34-0.385,0.847-0.573,1.553-0.573C6.771,1.673,6.263,1.861,5.924,2.246z" fill="none"/>
+<path d="M9.563,3.708C9.521,3.247,9.393,2.665,9.02,2.246C8.763,1.957,8.414,1.779,7.963,1.708    c0.451,0.071,0.8,0.25,1.057,0.539C9.393,2.666,9.521,3.248,9.563,3.708z" fill="none"/>
+<path d="M9.563,3.708c-0.041-0.46-0.17-1.042-0.543-1.461c-0.257-0.29-0.605-0.468-1.057-0.539    C7.813,1.685,7.65,1.673,7.477,1.673c-0.706,0-1.212,0.188-1.553,0.573c-0.093,0.105-0.17,0.222-0.234,0.343    C5.498,2.954,5.427,3.37,5.403,3.708H9.563z" fill="none"/>
+<path d="M11.688,3.708h-0.625C11.014,3,10.818,2.019,10.148,1.259c-0.635-0.72-1.535-1.085-2.674-1.085    c-1.148,0-2.053,0.367-2.685,1.09C4.122,2.028,3.94,3.012,3.902,3.708H3.229c-0.276,0-0.5,0.224-0.5,0.5V11.5    c0,0.275,0.224,0.5,0.5,0.5h8.46c0.275,0,0.5-0.225,0.5-0.5V4.208C12.188,3.932,11.965,3.708,11.688,3.708z M5.689,2.589    c0.064-0.122,0.141-0.238,0.234-0.343c0.339-0.385,0.847-0.573,1.553-0.573c0.174,0,0.336,0.012,0.486,0.035    c0.451,0.071,0.8,0.249,1.057,0.538c0.373,0.419,0.502,1.001,0.543,1.462h-4.16H5.402C5.427,3.37,5.498,2.954,5.689,2.589z     M10.984,8.734c0,0-0.594-0.01-1.5-0.01s-1.063,1.484-2.734,1.484c-1.656,0-1.953-0.885-1.953-1.443h2.313l0.548-0.479V7.135    L7.109,6.656H4.797c0-0.558,0.297-1.443,1.953-1.443c1.672,0,1.828,1.485,2.734,1.485s1.5-0.01,1.5-0.01V8.734z"/>
+<path d="M5.689,2.589C5.498,2.954,5.427,3.37,5.402,3.708h0.001C5.427,3.37,5.498,2.954,5.689,2.589z"/>
+</g>
+</g>
+</svg>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/deviceupdates/resources/qgn_prop_sml_bt.svg	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,64 @@
+<?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 width="84" height="58" viewBox="0.346 2.404 84 58">
+<linearGradient id="_11" gradientUnits="userSpaceOnUse" x1="35.53" y1="8.58" x2="15.86" y2="37.39">
+<stop stop-color="#A2C2DD" offset="0.1"/>
+<stop stop-color="#6C83BB" offset="0.71"/>
+<stop stop-color="#003D6D" offset="0.99"/>
+</linearGradient>
+<path fill="url(#_11)" d="M28.073,11.521c-8.63,3.226-17.035,9.366-17.035,15.963c0.214,4.914,3.531,10.465,8.251,12.718 l-0.479-3.623c0,0-0.724-0.627-0.81-0.883c-0.188-0.759-0.284-1.486-0.284-2.174c0-5.745,6.096-9.069,11.15-11.158 c0.009,0.183,0.051,0.972,0.051,0.972l17.664-11.233L27.767,6.535C27.767,6.535,28.046,11.074,28.073,11.521z"/>
+<linearGradient id="_12" gradientUnits="userSpaceOnUse" x1="26.18" y1="29.3" x2="18.46" y2="24.18">
+<stop stop-color="#E6EEF4" offset="0"/>
+<stop stop-color="#4A9900" offset="0.44"/>
+<stop stop-color="#0E4E58" offset="0.94"/>
+</linearGradient>
+<path fill="url(#_12)" d="M18.157,37.349c-3.745-9.36,6.649-13.8,12.099-15.924c-0.684-1.658-0.453-1.881-1.138-3.54 C16.947,22.626,12.446,29.557,18.157,37.349"/>
+<path fill="#17594C" d="M18.486,36.793c-4.707-2.647-7.327-6.673-7.02-9.781c-0.262,4.508,3.185,10.516,7.391,12.587L18.486,36.793z "/>
+<linearGradient id="_13" gradientUnits="userSpaceOnUse" x1="22.02" y1="1.34" x2="28.89" y2="21.43">
+<stop stop-color="#DCE8E4" offset="0"/>
+<stop stop-color="#43910A" offset="1"/>
+</linearGradient>
+<path fill="url(#_13)" d="M18.486,36.793C3.938,28.536,13.99,17.055,28.438,11.75l-0.291-4.737l17.599,5.209L29.237,22.72 l-0.243-4.601C17.948,22.426,11.835,29.852,18.486,36.793z"/>
+<linearGradient id="_14" gradientUnits="userSpaceOnUse" x1="44.66" y1="11.55" x2="57.38" y2="37.94">
+<stop stop-color="#FFFFFF" offset="0"/>
+<stop stop-color="#A2C2DD" offset="0.35"/>
+<stop stop-color="#6C83BB" offset="0.7"/>
+<stop stop-color="#003D6D" offset="1"/>
+</linearGradient>
+<path fill="url(#_14)" d="M34.267,13.541l4.54-2.407c-0.029,0.018,5.495-2.224,10.221-0.995 c4.566,1.189,7.303,3.673,9.93,7.732c2.629,4.055,3.246,11.162,1.51,14.948c-1.74,3.786-3.346,5.118-4.619,6.318L34.267,13.541z"/>
+<radialGradient id="_15" gradientUnits="userSpaceOnUse" cx="34.06" cy="16.69" r="22.73">
+<stop stop-color="#FFFFFF" offset="0.05"/>
+<stop stop-color="#A2C2DD" offset="1"/>
+</radialGradient>
+<path fill="url(#_15)" d="M57.314,29.195c0.453,9.102-6.096,16.178-14.625,15.811c-8.535-0.366-15.818-8.057-16.269-17.161 c-0.453-9.101,6.097-16.182,14.628-15.815C49.582,12.405,56.863,20.094,57.314,29.195z"/>
+<linearGradient id="_16" gradientUnits="userSpaceOnUse" x1="55.94" y1="38.63" x2="63.33" y2="53.19">
+<stop stop-color="#A2C2DD" offset="0.1"/>
+<stop stop-color="#6C83BB" offset="0.71"/>
+<stop stop-color="#003D6D" offset="0.99"/>
+</linearGradient>
+<path fill="url(#_16)" d="M61.177,17.654c-0.096,0.239,0.225,0.462,0.225,0.462c4.405,2.811,7.194,6.907,6.558,10.752 c-0.598,4.594-5.178,8.876-11.973,11.272c-0.04-0.772-0.247-4.722-0.247-4.722l-17.22,11.052l0.428,3.709l18.586,5.84l-0.076-3.953 c0,0-0.034-0.178-0.067-0.352c2.115-0.857,16.265-7.052,16.265-19.208c0-6.525-2.87-11.621-11.938-15.011 C61.717,17.496,61.305,17.334,61.177,17.654z M73.385,29.575l-0.004-0.033C73.382,29.546,73.385,29.568,73.385,29.575z"/>
+<linearGradient id="_17" gradientUnits="userSpaceOnUse" x1="69.57" y1="42.52" x2="59.03" y2="35.34">
+<stop stop-color="#E6EEF4" offset="0"/>
+<stop stop-color="#2F8E9A" offset="0.44"/>
+<stop stop-color="#003D6D" offset="0.94"/>
+</linearGradient>
+<path fill="url(#_17)" d="M72.268,26.715c0,0-16.184,20.426-16.186,20.426c0.002,0,0.82,4.387,0.82,4.387 C57.377,51.393,78.113,43.305,72.268,26.715z"/>
+<linearGradient id="_18" gradientUnits="userSpaceOnUse" x1="37.66" y1="46.77" x2="64.66" y2="57.61">
+<stop stop-color="#E6EEF4" offset="0"/>
+<stop stop-color="#2F8E9A" offset="0.44"/>
+<stop stop-color="#003D6D" offset="0.94"/>
+</linearGradient>
+<polygon fill="url(#_18)" points="57.107,52.074 57.174,55.54 39.269,49.915 38.892,46.647 "/>
+<linearGradient id="_19" gradientUnits="userSpaceOnUse" x1="48.25" y1="18.94" x2="71.38" y2="74.51">
+<stop stop-color="#E6EEF4" offset="0"/>
+<stop stop-color="#2F8E9A" offset="0.44"/>
+<stop stop-color="#003D6D" offset="0.94"/>
+</linearGradient>
+<path fill="url(#_19)" d="M61.594,17.824c20.027,7.488,11.043,25.286-5.373,29.831l0.887,4.419l-18.216-5.427l16.53-10.608 l0.24,4.602C68.314,36.398,73.684,25.779,61.594,17.824z"/>
+<linearGradient id="_20" gradientUnits="userSpaceOnUse" x1="32.78" y1="17.21" x2="51.02" y2="38.71">
+<stop stop-color="#E6EEF4" offset="0"/>
+<stop stop-color="#4A9900" offset="0.44"/>
+<stop stop-color="#0E4E58" offset="0.94"/>
+</linearGradient>
+<path fill="url(#_20)" d="M51.607,23.322l-11.484-9.805l-0.003,2.292c0,0-0.011,6.183-0.016,9.391l-5.984-5.037l-1.376,1.735 c0,0,2.93,2.427,6.589,5.549c-3.659,2.103-7.395,4.359-7.395,4.359l1.377,2.122l6.789-4.013c0.006,3.718,0.019,11.683,0.019,11.683 l11.484-6.576l-8.197-7.001L51.607,23.322z M42.482,18.439c1.766,1.508,3.668,3.132,5.047,4.31 c-0.754,0.432-2.664,1.526-5.058,2.899C42.476,23.42,42.48,20.708,42.482,18.439z M42.482,37.342 c-0.002-2.271-0.006-4.983-0.01-7.209c2.396,2.043,4.305,3.672,5.057,4.316C46.15,35.243,44.247,36.328,42.482,37.342z"/>
+</svg>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/deviceupdates/resources/qgn_prop_sml_http.svg	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,67 @@
+<?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 width="84" height="58" viewBox="-1.091 -0.148 84 58">
+<linearGradient id="_14" gradientUnits="userSpaceOnUse" x1="34.09" y1="6.03" x2="14.42" y2="34.84">
+<stop stop-color="#A2C2DD" offset="0.1"/>
+<stop stop-color="#6C83BB" offset="0.71"/>
+<stop stop-color="#003D6D" offset="0.99"/>
+</linearGradient>
+<path fill="url(#_14)" d="M26.636,8.969c-8.63,3.226-17.035,9.366-17.035,15.963c0.214,4.915,3.531,10.465,8.251,12.718 l-0.479-3.623c0,0-0.724-0.627-0.81-0.883c-0.188-0.759-0.284-1.485-0.284-2.174c0-5.745,6.096-9.069,11.15-11.158 c0.009,0.183,0.051,0.972,0.051,0.972L45.146,9.552L26.33,3.983C26.33,3.983,26.609,8.522,26.636,8.969z"/>
+<linearGradient id="_15" gradientUnits="userSpaceOnUse" x1="24.74" y1="26.75" x2="17.03" y2="21.63">
+<stop stop-color="#E6EEF4" offset="0"/>
+<stop stop-color="#4A9900" offset="0.44"/>
+<stop stop-color="#0E4E58" offset="0.94"/>
+</linearGradient>
+<path fill="url(#_15)" d="M16.72,34.797c-3.745-9.36,6.649-13.8,12.099-15.924c-0.684-1.658-0.453-1.881-1.138-3.54 C15.51,20.074,11.009,27.005,16.72,34.797"/>
+<path fill="#17594C" d="M17.049,34.241c-4.707-2.647-7.327-6.673-7.02-9.781c-0.262,4.508,3.185,10.516,7.391,12.587L17.049,34.241z "/>
+<linearGradient id="_16" gradientUnits="userSpaceOnUse" x1="20.59" y1="-1.22" x2="27.45" y2="18.88">
+<stop stop-color="#DCE8E4" offset="0"/>
+<stop stop-color="#43910A" offset="1"/>
+</linearGradient>
+<path fill="url(#_16)" d="M17.049,34.241C2.5,25.984,12.553,14.503,27.001,9.198L26.71,4.46l17.599,5.209L27.8,20.168 l-0.243-4.601C16.511,19.874,10.398,27.3,17.049,34.241z"/>
+<linearGradient id="_17" gradientUnits="userSpaceOnUse" x1="43.22" y1="9" x2="55.94" y2="35.39">
+<stop stop-color="#FFFFFF" offset="0"/>
+<stop stop-color="#A2C2DD" offset="0.35"/>
+<stop stop-color="#6C83BB" offset="0.7"/>
+<stop stop-color="#003D6D" offset="1"/>
+</linearGradient>
+<path fill="url(#_17)" d="M32.83,10.989l4.54-2.407C37.34,8.6,42.864,6.358,47.59,7.587c4.566,1.189,7.303,3.673,9.93,7.732 c2.629,4.055,3.246,11.162,1.51,14.948c-1.74,3.786-3.346,5.118-4.619,6.318L32.83,10.989z"/>
+<radialGradient id="_18" gradientUnits="userSpaceOnUse" cx="32.63" cy="14.14" r="22.73">
+<stop stop-color="#FFFFFF" offset="0.05"/>
+<stop stop-color="#A2C2DD" offset="1"/>
+</radialGradient>
+<path fill="url(#_18)" d="M55.877,26.643c0.453,9.102-6.096,16.178-14.625,15.811c-8.535-0.366-15.818-8.057-16.269-17.161 C24.53,16.191,31.08,9.11,39.611,9.477C48.145,9.853,55.426,17.542,55.877,26.643z"/>
+<linearGradient id="_19" gradientUnits="userSpaceOnUse" x1="54.5" y1="36.08" x2="61.89" y2="50.64">
+<stop stop-color="#A2C2DD" offset="0.1"/>
+<stop stop-color="#6C83BB" offset="0.71"/>
+<stop stop-color="#003D6D" offset="0.99"/>
+</linearGradient>
+<path fill="url(#_19)" d="M59.74,15.102c-0.096,0.239,0.225,0.462,0.225,0.462c4.405,2.811,7.194,6.907,6.558,10.752 c-0.598,4.594-5.178,8.876-11.973,11.272c-0.04-0.773-0.247-4.723-0.247-4.723l-17.22,11.053l0.428,3.709l18.586,5.84l-0.076-3.953 c0,0-0.034-0.178-0.067-0.352c2.115-0.857,16.265-7.052,16.265-19.209c0-6.524-2.87-11.62-11.938-15.01 C60.28,14.944,59.868,14.782,59.74,15.102z M71.948,27.023l-0.004-0.033C71.945,26.994,71.948,27.016,71.948,27.023z"/>
+<linearGradient id="_20" gradientUnits="userSpaceOnUse" x1="68.14" y1="39.97" x2="57.59" y2="32.79">
+<stop stop-color="#E6EEF4" offset="0"/>
+<stop stop-color="#2F8E9A" offset="0.44"/>
+<stop stop-color="#003D6D" offset="0.94"/>
+</linearGradient>
+<path fill="url(#_20)" d="M70.831,24.163c0,0-16.184,20.426-16.186,20.426c0.002,0,0.82,4.387,0.82,4.387 C55.94,48.841,76.676,40.753,70.831,24.163z"/>
+<linearGradient id="_21" gradientUnits="userSpaceOnUse" x1="36.23" y1="44.22" x2="63.23" y2="55.05">
+<stop stop-color="#E6EEF4" offset="0"/>
+<stop stop-color="#2F8E9A" offset="0.44"/>
+<stop stop-color="#003D6D" offset="0.94"/>
+</linearGradient>
+<polygon fill="url(#_21)" points="55.67,49.522 55.737,52.988 37.832,47.363 37.455,44.095 "/>
+<linearGradient id="_22" gradientUnits="userSpaceOnUse" x1="46.81" y1="16.39" x2="69.94" y2="71.96">
+<stop stop-color="#E6EEF4" offset="0"/>
+<stop stop-color="#2F8E9A" offset="0.44"/>
+<stop stop-color="#003D6D" offset="0.94"/>
+</linearGradient>
+<path fill="url(#_22)" d="M60.157,15.272C80.184,22.76,71.2,40.558,54.784,45.103l0.887,4.419l-18.216-5.427l16.53-10.607 l0.24,4.602C66.877,33.846,72.247,23.227,60.157,15.272z"/>
+<linearGradient id="_23" gradientUnits="userSpaceOnUse" x1="20.98" y1="20.82" x2="56.48" y2="28.57">
+<stop stop-color="#E6EEF4" offset="0"/>
+<stop stop-color="#4A9900" offset="0.44"/>
+<stop stop-color="#0E4E58" offset="0.94"/>
+</linearGradient>
+<path fill="url(#_23)" d="M36.105,20.456c-0.228-0.055-0.781-0.188-0.781-0.188l0.035,2.071c0,0,0.566,0.139,0.779,0.192 c0.015,0.826,0.068,4.305,0.068,4.305c0.01,0.767,0.022,1.561,0.357,2.31c0.543,1.21,1.694,1.48,2.808,1.74l0.982,0.242 l-0.018-2.047l-0.591-0.133c-0.459-0.095-0.978-0.202-1.253-0.461c-0.261-0.245-0.302-0.685-0.302-1.123 c0-0.102-0.037-3.818-0.045-4.346c0.422,0.104,1.844,0.45,1.844,0.45l-0.027-2.084c0,0-1.6-0.385-1.895-0.457 c-0.004-0.317-0.028-2.414-0.028-2.414l-1.969-0.468C36.068,18.045,36.099,19.988,36.105,20.456z"/>
+<path fill="url(#_23)" d="M41.199,21.68c-0.232-0.057-0.793-0.191-0.793-0.191l0.022,2.069c0,0,0.578,0.142,0.793,0.194 c0.004,0.284,0.047,4.353,0.047,4.353c0.006,0.779,0.014,1.588,0.356,2.348c0.561,1.243,1.821,1.533,2.939,1.787l0.918,0.221 l-0.006-2.058l-0.617-0.14c-0.414-0.087-0.884-0.187-1.184-0.399c-0.334-0.237-0.383-0.724-0.383-1.209 c0-0.104-0.023-3.96-0.027-4.403c0.423,0.105,1.869,0.457,1.869,0.457l-0.018-2.083c0,0-1.643-0.394-1.941-0.466 c-0.002-0.319-0.012-2.435-0.012-2.435l-1.994-0.475C41.172,19.246,41.195,21.211,41.199,21.68z"/>
+<path fill="url(#_23)" d="M46.247,23.199l0.071,12.329l2.024,0.539c0,0-0.013-2.584-0.013-3.092 c0.101,0.026,0.21,0.057,0.21,0.057l1.49,0.337c1.579,0.19,2.729-0.736,3.078-2.476c0.604-3.01-0.406-6.449-3.502-7.192 l-3.361-0.808L46.247,23.199z M48.297,25.547c0.119,0.024,0.242,0.052,0.242,0.052c0.777,0.157,1.658,0.335,2.049,0.909 c0.459,0.67,0.461,1.79,0.463,2.389c0,0.543,0,1.555-0.438,2.004c-0.459,0.477-1.352,0.212-2.066,0.002c0,0-0.115-0.032-0.229-0.064 C48.319,30.519,48.301,26.064,48.297,25.547z"/>
+<path fill="url(#_23)" d="M28.745,28.12l1.901,0.494L30.492,21.6c-0.002-0.014-0.002-0.044,0.063-0.097 c0.234-0.188,0.798-0.237,0.956-0.197c1.321,0.319,1.304,1.901,1.29,3.171l0.08,4.717l1.979,0.514l-0.099-5.563 c-0.01-0.802-0.022-1.63-0.291-2.43c-0.32-0.945-0.956-1.723-1.741-2.128c-0.681-0.354-1.577-0.531-2.285-0.192 c-0.014-0.653-0.084-3.854-0.084-3.854l-1.919-0.436L28.745,28.12z"/>
+</svg>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/deviceupdates/resources/qgn_prop_sml_http_off.svg	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,73 @@
+<?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 width="84" height="58" viewBox="-1.884 -0.817 84 58">
+<g fill-opacity="0.8" stroke-opacity="0.8">
+<linearGradient id="_14" gradientUnits="userSpaceOnUse" x1="33.3" y1="5.36" x2="13.63" y2="34.17">
+<stop stop-color="#A2C2DD" offset="0.1"/>
+<stop stop-color="#6C83BB" offset="0.71"/>
+<stop stop-color="#003D6D" offset="0.99"/>
+</linearGradient>
+<path fill="url(#_14)" d="M25.842,8.3c-8.629,3.225-17.035,9.365-17.035,15.963 c0.215,4.915,3.531,10.465,8.252,12.719l-0.479-3.623c0,0-0.725-0.627-0.811-0.885c-0.188-0.76-0.283-1.484-0.283-2.174 c0-5.745,6.096-9.069,11.148-11.159c0.01,0.184,0.053,0.973,0.053,0.973L44.354,8.883l-18.816-5.57 C25.538,3.312,25.817,7.851,25.842,8.3z"/>
+<linearGradient id="_15" gradientUnits="userSpaceOnUse" x1="14.38" y1="41.14" x2="22.83" y2="16.07">
+<stop stop-color="#FFFFFF" offset="0"/>
+<stop stop-color="#A2C2DD" offset="0.35"/>
+<stop stop-color="#6C83BB" offset="0.7"/>
+<stop stop-color="#003D6D" offset="1"/>
+</linearGradient>
+<path fill="url(#_15)" d="M15.926,34.127c-3.744-9.36,6.65-13.801,12.1-15.924 c-0.684-1.658-0.453-1.881-1.139-3.541C14.717,19.404,10.215,26.336,15.926,34.127"/>
+<path fill="#496DA2" d="M16.256,33.572c-4.707-2.646-7.328-6.674-7.02-9.782 c-0.264,4.508,3.184,10.516,7.391,12.588L16.256,33.572z"/>
+<linearGradient id="_16" gradientUnits="userSpaceOnUse" x1="33.31" y1="-4.43" x2="24.52" y2="21.29">
+<stop stop-color="#FFFFFF" offset="0.05"/>
+<stop stop-color="#A2C2DD" offset="1"/>
+</linearGradient>
+<path fill="url(#_16)" d="M16.256,33.572c-14.549-8.258-4.498-19.739,9.951-25.045 l-0.291-4.736L43.516,9l-16.51,10.498l-0.242-4.6C15.717,19.203,9.606,26.631,16.256,33.572z"/>
+<linearGradient id="_17" gradientUnits="userSpaceOnUse" x1="42.43" y1="8.33" x2="55.15" y2="34.72">
+<stop stop-color="#FFFFFF" offset="0"/>
+<stop stop-color="#A2C2DD" offset="0.35"/>
+<stop stop-color="#6C83BB" offset="0.7"/>
+<stop stop-color="#003D6D" offset="1"/>
+</linearGradient>
+<path fill="url(#_17)" d="M32.038,10.318l4.539-2.406c-0.029,0.018,5.496-2.225,10.221-0.994 c4.566,1.188,7.303,3.672,9.932,7.73c2.629,4.055,3.244,11.162,1.51,14.95c-1.74,3.785-3.348,5.117-4.619,6.318L32.038,10.318z"/>
+<radialGradient id="_18" gradientUnits="userSpaceOnUse" cx="31.83" cy="13.47" r="22.73">
+<stop stop-color="#FFFFFF" offset="0.05"/>
+<stop stop-color="#A2C2DD" offset="1"/>
+</radialGradient>
+<path fill="url(#_18)" d="M55.084,25.972c0.453,9.104-6.096,16.18-14.625,15.813 c-8.535-0.367-15.818-8.057-16.27-17.163c-0.453-9.102,6.098-16.182,14.629-15.814C47.352,9.183,54.633,16.873,55.084,25.972z"/>
+<linearGradient id="_19" gradientUnits="userSpaceOnUse" x1="9.83" y1="17.47" x2="50.55" y2="26.99">
+<stop stop-color="#FFFFFF" offset="0"/>
+<stop stop-color="#A2C2DD" offset="0.35"/>
+<stop stop-color="#6C83BB" offset="0.7"/>
+<stop stop-color="#003D6D" offset="1"/>
+</linearGradient>
+<path fill="url(#_19)" d="M35.313,19.787c-0.229-0.055-0.781-0.188-0.781-0.188l0.035,2.07 c0,0,0.564,0.139,0.777,0.191c0.016,0.826,0.068,4.307,0.068,4.307c0.01,0.766,0.023,1.561,0.357,2.309 c0.543,1.211,1.693,1.481,2.809,1.741l0.982,0.242l-0.02-2.047l-0.592-0.133c-0.459-0.096-0.979-0.203-1.252-0.461 c-0.262-0.246-0.303-0.686-0.303-1.123c0-0.102-0.037-3.818-0.045-4.346c0.422,0.104,1.844,0.449,1.844,0.449l-0.027-2.084 c0,0-1.6-0.385-1.895-0.457c-0.004-0.316-0.027-2.414-0.027-2.414l-1.969-0.467C35.276,17.375,35.305,19.318,35.313,19.787z"/>
+<path fill="url(#_19)" d="M40.407,21.009c-0.232-0.057-0.793-0.191-0.793-0.191l0.021,2.07 c0,0,0.578,0.141,0.793,0.193c0.004,0.283,0.047,4.354,0.047,4.354c0.006,0.779,0.014,1.588,0.355,2.35 c0.561,1.242,1.822,1.531,2.939,1.785l0.918,0.223l-0.006-2.059l-0.617-0.143c-0.414-0.086-0.885-0.186-1.184-0.396 c-0.334-0.238-0.383-0.725-0.383-1.211c0-0.104-0.023-3.959-0.027-4.402c0.424,0.105,1.869,0.457,1.869,0.457l-0.018-2.084 c0,0-1.645-0.393-1.941-0.465c-0.002-0.318-0.012-2.436-0.012-2.436l-1.992-0.477C40.379,18.576,40.403,20.543,40.407,21.009z"/>
+<path fill="url(#_19)" d="M45.454,22.529l0.072,12.331l2.023,0.541 c0,0-0.014-2.584-0.014-3.096c0.102,0.027,0.211,0.061,0.211,0.061l1.49,0.336c1.578,0.189,2.729-0.736,3.078-2.477 c0.604-3.01-0.406-6.45-3.502-7.194l-3.361-0.807L45.454,22.529z M47.504,24.877c0.119,0.023,0.242,0.053,0.242,0.053 c0.777,0.156,1.658,0.334,2.049,0.908c0.459,0.67,0.461,1.791,0.463,2.389c0,0.545,0,1.555-0.438,2.006 c-0.459,0.475-1.354,0.211-2.066,0.002c0,0-0.115-0.033-0.229-0.066C47.526,29.85,47.508,25.394,47.504,24.877z"/>
+<path fill="url(#_19)" d="M27.952,27.451l1.902,0.494L29.7,20.929 c-0.002-0.014-0.002-0.043,0.063-0.096c0.234-0.189,0.799-0.238,0.955-0.197c1.322,0.318,1.305,1.9,1.291,3.17l0.08,4.717 l1.979,0.516l-0.1-5.565c-0.01-0.803-0.021-1.631-0.291-2.43c-0.318-0.945-0.955-1.725-1.74-2.129 c-0.682-0.354-1.576-0.531-2.285-0.191c-0.014-0.654-0.084-3.855-0.084-3.855l-1.918-0.436L27.952,27.451z"/>
+<linearGradient id="_23" gradientUnits="userSpaceOnUse" x1="53.71" y1="35.41" x2="61.1" y2="49.97">
+<stop stop-color="#A2C2DD" offset="0.1"/>
+<stop stop-color="#6C83BB" offset="0.71"/>
+<stop stop-color="#003D6D" offset="0.99"/>
+</linearGradient>
+<path fill="url(#_23)" d="M58.948,14.433c-0.098,0.238,0.225,0.461,0.225,0.461 c4.404,2.811,7.193,6.908,6.559,10.752c-0.6,4.596-5.18,8.879-11.975,11.272c-0.039-0.77-0.246-4.721-0.246-4.721L36.289,43.25 l0.428,3.709l18.586,5.84l-0.076-3.953c0,0-0.033-0.178-0.066-0.352c2.115-0.857,16.264-7.051,16.264-19.207 c0-6.526-2.871-11.624-11.938-15.012C59.487,14.273,59.075,14.111,58.948,14.433z M71.155,26.353l-0.004-0.033 C71.153,26.324,71.155,26.347,71.155,26.353z"/>
+<linearGradient id="_24" gradientUnits="userSpaceOnUse" x1="73.47" y1="28.81" x2="40.77" y2="51.09">
+<stop stop-color="#FFFFFF" offset="0"/>
+<stop stop-color="#A2C2DD" offset="0.35"/>
+<stop stop-color="#6C83BB" offset="0.7"/>
+<stop stop-color="#003D6D" offset="1"/>
+</linearGradient>
+<path fill="url(#_24)" d="M70.038,23.492c0,0-16.184,20.426-16.186,20.426 c0.002,0,0.82,4.389,0.82,4.389C55.147,48.172,75.883,40.084,70.038,23.492z"/>
+<linearGradient id="_25" gradientUnits="userSpaceOnUse" x1="40.45" y1="37.87" x2="53.26" y2="60.89">
+<stop stop-color="#FFFFFF" offset="0"/>
+<stop stop-color="#A2C2DD" offset="0.35"/>
+<stop stop-color="#6C83BB" offset="0.7"/>
+<stop stop-color="#003D6D" offset="1"/>
+</linearGradient>
+<polygon fill="url(#_25)" points="54.877,48.854 54.944,52.319 37.039,46.694 36.663,43.426 "/>
+<linearGradient id="_26" gradientUnits="userSpaceOnUse" x1="47.53" y1="54.33" x2="55.32" y2="31.78">
+<stop stop-color="#FFFFFF" offset="0.05"/>
+<stop stop-color="#A2C2DD" offset="1"/>
+</linearGradient>
+<path fill="url(#_26)" d="M59.364,14.601c20.027,7.488,11.043,25.288-5.373,29.831l0.887,4.422 l-18.215-5.428l16.529-10.607l0.24,4.602C66.084,33.176,71.454,22.556,59.364,14.601z"/>
+<path fill-opacity="0.4" fill="#FFFFFF" d="M71.424,29.287c0-6.526-2.871-11.624-11.938-15.012 c0,0-0.412-0.162-0.541,0.158c-0.096,0.238,0.225,0.461,0.225,0.461c4.406,2.811,7.195,6.908,6.559,10.752 c-0.598,4.596-5.178,8.879-11.973,11.272c-0.01-0.195-0.031-0.594-0.057-1.08c1.26-1.182,2.834-2.535,4.537-6.24 c1.734-3.788,1.119-10.895-1.512-14.95c-2.627-4.059-5.361-6.543-9.93-7.73c-2.855-0.744-5.996-0.219-8.035,0.311L25.538,3.312 c0,0,0.279,4.539,0.305,4.988c-8.629,3.225-17.035,9.365-17.035,15.963c0.215,4.915,3.531,10.465,8.252,12.719l-0.479-3.623 c0,0-0.725-0.627-0.811-0.885c-0.188-0.76-0.283-1.484-0.283-2.174c0-4.981,4.582-8.141,9.096-10.254 c-0.326,1.443-0.473,2.977-0.393,4.574c0.422,8.52,6.822,15.797,14.635,17l-2.537,1.627l0.428,3.711l18.586,5.838l-0.074-3.951 c0,0-0.035-0.178-0.068-0.352C57.276,47.637,71.424,41.444,71.424,29.287z"/>
+</g>
+</svg>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/deviceupdates/resources/qtg_large_avatar.svg	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,18 @@
+<?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" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g>
+<path d="M46.691,42.35c-1.665-0.866-9.918-3.756-10.072-3.936l-0.002,0.002  c-0.934-1.068-0.896-3.433-0.43-4.46c0.001-0.001,0.002-0.001,0.002-0.002c0.032-0.071,0.065-0.139,0.104-0.197  c0.113-0.177,0.219-0.354,0.326-0.533l0,0c0.813-1.329,1.494-2.651,2.054-3.892c1.009,0.349,2.307-0.59,2.95-2.18  c0.667-1.645,0.379-3.354-0.645-3.815c-0.058-0.026-0.119-0.03-0.178-0.048c0-0.001,0-0.002,0-0.002  c0.133-0.521,0.191-0.826,0.191-0.826c1.77-7.934-2.078-14.223-11.402-14.533c-3.832,0-5.617,0.578-7.039,2.398  c-2.313,0.357-6.039,3.642-3.453,12.927c-0.098,0.016-0.195,0.031-0.289,0.071c-1.032,0.436-1.355,2.128-0.724,3.782  c0.633,1.653,1.983,2.643,3.017,2.208c0.063-0.027,0.117-0.072,0.176-0.11c0.568,1.279,1.266,2.646,2.104,4.02H23.38  c0.022,0.037,0.046,0.073,0.067,0.11c0.023,0.038,0.045,0.076,0.068,0.114c0.002,0.003,0.005,0.005,0.007,0.008  c0.061,0.101,0.12,0.201,0.185,0.301c0.532,0.833,0.663,3.229-0.166,4.457c-0.208,0.283-8.346,3.135-10.23,4.136  c-2.161,1.147-5.688,3.782-5.688,9.723h44.756C52.378,46.132,48.354,43.216,46.691,42.35z" fill="url(#SVGID_1_)"/>
+<path d="M7.659,51.072c-0.022,0.323-0.037,0.655-0.037,1h44.756c0-0.345-0.017-0.676-0.042-1H7.659z" fill="#FFFFFF" fill-opacity="0.15" stroke-opacity="0.15"/>
+<path d="M22.551,11.326c1.422-1.82,3.207-2.398,7.039-2.398c7.565,0.252,11.524,4.44,11.804,10.248  C41.535,12.856,37.58,8.194,29.59,7.928c-3.832,0-5.617,0.578-7.039,2.398c-1.81,0.279-4.472,2.367-4.311,7.704  C18.419,13.429,20.858,11.588,22.551,11.326z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M36.617,38.416c-0.441-0.505-0.66-1.3-0.725-2.106c-0.086,1.09,0.098,2.389,0.725,3.106  l0.002-0.002c0.154,0.18,8.407,3.069,10.072,3.936c1.566,0.816,5.225,3.453,5.645,8.723h0.042c0-5.94-4.024-8.856-5.687-9.723  c-1.665-0.866-9.918-3.756-10.072-3.936L36.617,38.416z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M13.311,43.35c1.885-1.001,10.022-3.853,10.23-4.136c0.508-0.752,0.652-1.938,0.568-2.938  c-0.053,0.717-0.225,1.429-0.568,1.938c-0.208,0.283-8.346,3.135-10.23,4.136c-2.161,1.147-5.688,3.782-5.688,9.723h0.037  C8.029,46.833,11.275,44.431,13.311,43.35z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
+<rect fill="none" height="60" width="60"/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.9995" x2="29.9995" y1="8.5967" y2="52.3536">
+<stop offset="0" style="stop-color:#8E8E8E"/>
+<stop offset="1" style="stop-color:#444444"/>
+</linearGradient>
+</defs>
+</g>
+</svg>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/deviceupdates/rom/deviceupdates.iby	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,29 @@
+/*
+* 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: 
+*
+*/
+
+#ifndef __DEVICEUPDATES_IBY__
+#define __DEVICEUPDATES_IBY__
+
+#include <data_caging_paths_for_iby.hrh> 
+
+file=ABI_DIR/BUILD_DIR/deviceupdates.exe PROGRAMS_DIR/deviceupdates.exe
+file=ABI_DIR/BUILD_DIR/deviceupdatesplugin.dll SHARED_LIB_DIR/deviceupdatesplugin.dll
+data=DATAZ_/private/10003a3f/import/apps/deviceupdates_reg.rsc private/10003a3f/import/apps/deviceupdates_reg.rsc
+data = DATAZ_/private/10202be9/101f6de5.txt    private/10202be9/101f6de5.txt
+data=/epoc32/data/c/resource/qt/plugins/controlpanel/deviceupdatesplugin.qtplugin					resource/qt/plugins/controlpanel/deviceupdatesplugin.qtplugin
+
+#endif
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/deviceupdates/rom/deviceupdates_resources.iby	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,27 @@
+/*
+* 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: 
+*
+*/
+#ifndef __DEVICEUPDATES_RESORCES_IBY__
+#define __DEVICEUPDATES_RESORCES_IBY__
+// Backup registration
+#include <data_caging_paths_for_iby.hrh> 
+
+data=DATAZ_/resource/apps/deviceupdates.rsc /resource/apps/deviceupdates.rsc
+
+data=DATAZ_/QT_TRANSLATIONS_DIR/deviceupdates.qm QT_TRANSLATIONS_DIR/deviceupdates.qm 
+
+
+#endif
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/deviceupdates/src/dmadvancedview.cpp	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,670 @@
+
+/*
+* Copyright (c) 2002-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:  Methods for DmAdvancedView.
+*
+*/
+
+#include "dmadvancedview.h"
+#include "serversettingsview.h"
+
+DmAdvancedView::DmAdvancedView(HbMainWindow *mainWindow, HbView *mainView, QGraphicsItem *parent):HbView(parent),
+    bluetooth(":/icons/qgn_prop_sml_bt.svg"),
+    internet(":/icons/qgn_prop_sml_http.svg"), 
+    defaultprofileicon(":/icons/qtg_large_avatar.svg")                
+    {
+    iMainWindow = mainWindow;
+    serverSetView = NULL;
+    iMainView = mainView;
+    dminfo = new DmInfo(this);
+    currentdefaultprofile = -1;
+    currentview = 0;
+    connectionRequested = false;    
+    backbehaviorset = false;
+    }
+
+DmAdvancedView::~DmAdvancedView()
+    {
+    qDebug("omadm DmAdvancedView::~DmAdvancedView");
+    if(docmlLoader)
+        delete docmlLoader;  
+    if(dminfo)
+        delete dminfo;
+    qDebug("omadm DmAdvancedView::~DmAdvancedView end"); 
+    }
+
+void DmAdvancedView::handleLongPress(HbAbstractViewItem* item , QPointF coOrdinates)
+    {
+    if(connectionRequested)
+        return;
+    int itemnum = 0;
+    if (item) 
+        {
+    QStandardItem *modelItem = model->itemFromIndex(item->modelIndex());
+    itemnum = modelItem->row();
+
+
+    csmenu = new HbMenu();
+    HbAction *defaultprofileAction = 0;
+    HbAction *deleteaction= 0;
+    HbAction *connectaction= 0;
+    if(!dminfo->Isdefaultprofile(itemnum))
+        {
+        defaultprofileAction = csmenu->addAction(hbTrId("txt_device_update_menu_set_as_default"));
+        }
+    if(!dminfo->Isprofilelocked(itemnum))
+        {
+        deleteaction = csmenu->addAction(hbTrId("txt_device_update_menu_delete"));
+        }
+    connectaction = csmenu->addAction(hbTrId("txt_device_update_menu_connect"));
+    HbAction *selectedAction = csmenu->exec(coOrdinates);
+    if(selectedAction)
+        {
+        if(selectedAction == defaultprofileAction )
+            {
+            dminfo->setDefaultProfile(itemnum);
+            updateEarlierdefaultProfileIcon();
+            modelItem->setIcon(defaultprofileicon);
+            currentdefaultprofile = itemnum;        
+            }
+        else if (selectedAction == deleteaction )
+            {
+            dminfo->DisableDbNotifications(true);
+            //check currentdefaultprofile is current item
+            if(itemnum == currentdefaultprofile) // deleting default profile
+                currentdefaultprofile = -1;
+            if(dminfo->DeleteProfile(itemnum) >=0 )
+                {
+                //Update the profile list
+                model->removeRow(itemnum);
+                }
+            dminfo->DisableDbNotifications(false);
+            }
+        else if( selectedAction == connectaction )
+            {
+            dminfo->synchronize(itemnum);
+            connectionRequested = true;
+            }
+        else
+            {    
+            }
+        }
+    delete csmenu;
+        }
+    }
+
+
+void DmAdvancedView::handleClicked(QModelIndex index)
+    {
+    if(connectionRequested)
+        return;
+    //Stop listening DB events for profile addition
+    dminfo->DisableDbNotifications(true);
+    //If profile is not locked then take to edit server view
+    int itemnum = 0;
+    QStandardItem *modelItem = model->itemFromIndex(index);
+    itemnum = modelItem->row();                  
+    if(itemnum >= 0 && !dminfo->Isprofilelocked(itemnum))
+        {        
+        //read profile items
+        QStringList itemdata;
+        bool sessmode = 0;
+        QStringList iaplist;
+        int curriap = 0;
+        int portnum = 0;
+        bool nwauth = false ;
+        dminfo->getProfiledata(itemnum, itemdata, sessmode,iaplist,curriap,portnum, nwauth);	
+        QString editserverprof(itemdata[0]);
+        if(!serverSetView)
+            {
+            serverSetView = new ServerSettingsView(iMainWindow, this , editserverprof);
+            }
+        else // view already created
+            {
+            //Just update the setting items as per this profile            
+            serverSetView->makeviewItemsVisible(editserverprof);		  
+            }        
+        serverSetView->setProfileValues(itemdata,sessmode,iaplist,curriap,portnum,nwauth);
+        iMainWindow->setCurrentView(serverSetView);
+  
+        }
+    }
+
+bool DmAdvancedView::displayItems()
+    {    	
+    docmlLoader = new HbDocumentLoader;
+    bool ok ;    
+    docmlLoader->load( DOCML_FILE_NAME,  &ok  );
+    if(ok)
+    	{
+        if(iMainWindow->orientation() == Qt::Vertical)
+            docmlLoader->load( DOCML_FILE_NAME,  PORTRAIT,&ok  );
+        else
+            docmlLoader->load( DOCML_FILE_NAME, LANDSCAPE,&ok  );            
+    	}
+    else
+    	{
+    	 qDebug("omadm docml loading failed");
+    	 return ok;
+    	}
+    if(ok)
+        {        	
+        connect(iMainWindow, SIGNAL(orientationChanged(Qt::Orientation)),
+                this,  SLOT(reLayout(Qt::Orientation)));    
+        viewwidget = qobject_cast<HbView *>(docmlLoader->findWidget( VIEW_NAME ) );    
+        Q_ASSERT_X(viewwidget != 0, "OMADM View not found","Not found");        
+        viewspecificmenu = new HbMenu();    
+        help = viewspecificmenu->addAction(hbTrId("txt_common_menu_help")); 
+        exit = viewspecificmenu->addAction(hbTrId("txt_common_menu_exit"));
+        connect(exit, SIGNAL(triggered()), QCoreApplication::instance(), SLOT(quit()));
+        setMenu(viewspecificmenu);            
+        serversListGroup = qobject_cast<HbGroupBox *>(docmlLoader->findWidget( GROUP ) );
+        serversListGroup->setHeading(hbTrId("txt_device_update_setlabel_device_update_services"));
+        serversListGroup->setCollapsable( true );        
+        connect(serversListGroup, SIGNAL(toggled(bool)), this, SLOT(serversListGroupClicked(bool)));
+        otherDetailsGroup = qobject_cast<HbGroupBox *>(docmlLoader->findWidget( OTHERDETAILSGROUP ) );
+        connect(otherDetailsGroup, SIGNAL(toggled(bool)), this, SLOT(otherDetailsGroupClicked(bool)));        
+        otherDetailsGroup->setHeading(hbTrId("txt_device_update_setlabel_other_details"));
+        otherDetailsGroup->setCollapsable( true );
+        otherDetailsGroup->setCollapsed( true );                            
+        list = qobject_cast<HbListView *>(docmlLoader->findWidget( LIST_NAME ) );
+        HbListViewItem *prototype = list->listItemPrototype();
+        prototype->setGraphicsSize(HbListViewItem::LargeIcon);
+        prototype->setSecondaryTextRowCount(1,2);
+        prototype->setStretchingStyle(HbListViewItem::StretchLandscape);
+        dminfo->refreshProfileList();    
+        int IndicatorCount =dminfo->profilescount();
+        model = new QStandardItemModel();            
+        for (int i = 0; IndicatorCount > 0 && i < IndicatorCount; ++i) {        
+        QStringList liststr;
+        bool lock = false;
+        int icon = 0;
+        int ret = dminfo->profileinfo(i,liststr,icon, lock);
+        if(ret <= 0)
+            {
+            break;
+            }
+        QStandardItem* item ;    
+        item = new QStandardItem();    
+        HbIcon icon1;
+        icon1.setIconName(":/icons/qgn_prop_sml_http.svg");
+        HbIcon icon2;
+        icon2.setIconName(":/icons/qgn_prop_sml_bt.svg");
+        HbIcon icon3;
+        icon3.setIconName(":/icons/qgn_indi_sett_protected_add.svg");   
+        HbIcon defaultprofile;
+        defaultprofile.setIconName(":/icons/qtg_large_avatar.svg");            
+        QList<QVariant> Iconl;    
+        if(icon == 0)//Internet
+            Iconl.insert(0,icon1);
+        else if(icon == 1)//Bluetooth
+            Iconl.insert(0,icon2); 
+        else 
+            {
+            Iconl.insert(0,defaultprofile);
+            currentdefaultprofile = i;
+            }
+        icon = 0;
+        if(lock)
+            {
+            Iconl.insert(1,icon3);
+            lock = false; 
+            }
+        QVariant iconlist(Iconl);
+        iconlist.setValue(Iconl);
+        item->setData(liststr , Qt::DisplayRole);
+        item->setData(iconlist , Qt::DecorationRole);
+        model->setItem(i, item);    
+        }        
+        list->setModel(model,prototype);
+        list->setItemRecycling(false);    
+        connect(list, SIGNAL(longPressed(HbAbstractViewItem*,QPointF)),
+                this,  SLOT(handleLongPress(HbAbstractViewItem*,QPointF)));
+    
+        connect(list, SIGNAL(activated(QModelIndex)), this, SLOT(handleClicked(QModelIndex)));            
+        
+        qDebug("omadm launching other details list");
+        otherdetailslist = qobject_cast<HbListView *>(docmlLoader->findWidget( LISTOTHERDETAILS ) );    
+        otherdetailslist->listItemPrototype()->setStretchingStyle(HbListViewItem::StretchLandscape);
+		otherdetailslist->setLongPressEnabled(EFalse);
+        qDebug("omadm launching other details list done");    
+        mainCalltoUpdateView();           
+        
+    
+        newserverprofile = qobject_cast<HbPushButton *>(docmlLoader->findWidget(NEWSERVERBUTTON));
+        newserverprofile->setText(hbTrId("txt_device_update_button_new_server_profile"));
+        connect(newserverprofile, SIGNAL(clicked()),this, SLOT(createNewProfile()));
+              
+        label = qobject_cast<HbLabel *>(docmlLoader->findWidget(LABEL));        
+        label->setPlainText(hbTrId("txt_device_update_subhead_advanced_device_updates"));        
+        
+        setWidget(viewwidget);        
+        }
+    else 
+        {
+        qDebug("omadm docml section loading failed");
+        }    
+    return ok;
+    }
+
+void DmAdvancedView::updateEarlierdefaultProfileIcon()
+    {
+    if(currentdefaultprofile >= 0)
+        {
+        QStandardItem *modelItem = model->item(currentdefaultprofile);
+        //Find the transport type & set the icon
+        int transporttype = 0;
+        dminfo->profileTransport(currentdefaultprofile,transporttype);
+        if(transporttype == 0)//Internet
+            {
+            modelItem->setIcon(internet);
+            }
+        else
+            {
+            modelItem->setIcon(bluetooth);
+            }        
+        }
+    }
+
+void DmAdvancedView::createNewProfile()
+    {
+    if(dminfo->createNewprofile())
+        {
+        //Open server settings view    
+        QString newserverprof(hbTrId("txt_device_update_setlabel_new_server_profile"));    
+        if(!serverSetView)
+            {
+            serverSetView = new ServerSettingsView(iMainWindow, this, newserverprof);        
+            }
+        else // view already created
+            {
+            //Just update the setting items as per this profile                
+            serverSetView->makeviewItemsVisible(newserverprof);       
+            }
+        QStringList serveritems;    
+        serveritems<< "" <<"" <<"" <<"" <<""<<""<<""<<"";
+        bool sessmode = true;
+        bool nauth = true;
+        QStringList apdata;        
+        int currap =-1;
+        int destap = 0;
+        dminfo->getIaplist(apdata,currap,destap);    
+        int portnum = 8080;    
+        serverSetView->setProfileValues(serveritems,sessmode,apdata,currap,portnum,nauth);
+        iMainWindow->setCurrentView(serverSetView);        
+        }
+    else // profile not getting created
+        {
+        qDebug("OMADM New server profile creation failed");
+        }
+    }
+
+void DmAdvancedView::saveProfile(QStringList& itemdata, bool& sessmode, QString& currap,unsigned int& portnum, bool& nauth )
+    {
+    dminfo->DisableDbNotifications(true);
+    dminfo->saveProfile(itemdata,sessmode,currap,portnum,nauth);
+    updateListview();
+    dminfo->DisableDbNotifications(false);
+    }
+
+void DmAdvancedView::updateListview()
+    {
+    model->clear();
+    int IndicatorCount =dminfo->profilescount();    
+    for (int i = 0; IndicatorCount > 0 && i < IndicatorCount; ++i) {    
+    QStringList liststr;
+    bool lock = false;
+    int icon = 0;
+    int ret = dminfo->profileinfo(i,liststr,icon, lock);
+    if(ret <= 0)
+        {
+        break;
+        }    
+    QStandardItem* item ;
+    item = new QStandardItem();
+    HbIcon icon1;
+    icon1.setIconName(":/icons/qgn_prop_sml_http.svg");
+    HbIcon icon2;
+    icon2.setIconName(":/icons/qgn_prop_sml_bt.svg");
+    HbIcon icon3;
+    icon3.setIconName(":/icons/qgn_indi_sett_protected_add.svg");   
+    HbIcon defaultprofile;
+    defaultprofile.setIconName(":/icons/qtg_large_avatar.svg");    
+    QList<QVariant> Iconl;
+    if(icon == 0)//Internet
+        Iconl.insert(0,icon1);
+    else if(icon == 1)//Bluetooth
+        Iconl.insert(0,icon2); 
+    else //Default profile
+        {
+        Iconl.insert(0,defaultprofile);
+        currentdefaultprofile = i;
+        }
+    icon = 0;
+    if(lock)
+        {
+        Iconl.insert(1,icon3);
+        lock = false; 
+        }
+    QVariant iconlist(Iconl);
+    iconlist.setValue(Iconl);
+    item->setData(liststr , Qt::DisplayRole);
+    item->setData(iconlist , Qt::DecorationRole);
+    model->setItem(i, item);    
+    }    
+    model->sort(0);
+    }
+
+void DmAdvancedView::serversListGroupClicked(bool state)
+    {
+    Q_UNUSED(state);
+    if(serversListGroup->isCollapsed())
+        otherDetailsGroup->setCollapsed(false);
+    else
+        otherDetailsGroup->setCollapsed(true);
+    }
+
+void DmAdvancedView::otherDetailsGroupClicked(bool state)
+    {
+    Q_UNUSED(state);
+    if(otherDetailsGroup->isCollapsed())
+        serversListGroup->setCollapsed(false);
+    else
+        serversListGroup->setCollapsed(true);
+    }
+
+bool DmAdvancedView::checkServerId(QString& serverid)
+    {
+    return dminfo->checksrvid(serverid);
+    }
+
+void DmAdvancedView::reLayout(Qt::Orientation orientation)
+    {
+    qDebug("OMADM servers view DmAdvancedView::reLayout");
+    if(orientation == Qt::Horizontal)
+        {
+        qDebug("OMADM servers view landscape");
+        docmlLoader->load(DOCML_FILE_NAME,LANDSCAPE); 
+        }
+    else
+        {
+        qDebug("OMADM servers view portrait");	        
+        bool ok;
+        docmlLoader->load( DOCML_FILE_NAME,  PORTRAIT, &ok  );
+        }
+    
+    
+    }
+
+void DmAdvancedView::setBackBehavior()
+    {
+    if (!backbehaviorset)
+        {
+        qDebug("OMADM servers view back behavior setting");
+        backaction = new HbAction(Hb::BackNaviAction, this);
+        connect(backaction, SIGNAL(triggered()), this,
+                SLOT(backButtonClicked()));
+        setNavigationAction(backaction);
+        backbehaviorset = true;
+        }
+    qDebug("OMADM servers view back behavior setting done");
+    }
+
+void DmAdvancedView::backButtonClicked()
+    {    
+    QList <HbView*> views = iMainWindow->views();    
+    if(iMainWindow->orientation()==Qt::Vertical)
+            {
+            iMainWindow->setCurrentView(views[0]);
+            }
+        else
+            {
+            iMainWindow->setCurrentView(views[1]);
+            }    
+    }
+
+
+void DmAdvancedView::mainCalltoUpdateView()
+{   
+    int IndicatorCount =6;
+    otherdetailsmodel = new QStandardItemModel(IndicatorCount,0);
+    TInt i=0;
+    TRequestStatus status;
+    QStringList liststr;
+    QStandardItem* item;
+    QString val;
+    QString str;
+    
+    iServer.Connect();
+    iServer.GetPhoneInfo(0, info);
+    imobPhone.Open(iServer, info.iName);
+    //Bands supported
+    
+    RMobilePhone::TMobilePhoneNetworkInfoV1 nwInfov1;
+    RMobilePhone::TMobilePhoneNetworkInfoV1Pckg nwInfov1Pckg(nwInfov1);						
+    imobPhone.GetCurrentNetwork(status, nwInfov1Pckg);
+    User::WaitForRequest( status );
+    status = KRequestPending;
+    nwInfov1 = nwInfov1Pckg();
+    NetworkBand(nwInfov1.iBandInfo, str);
+    item = new QStandardItem();
+    val = hbTrId("txt_device_update_dblist_gsm_bands");
+    liststr << val;
+    liststr << str;
+    item->setData(liststr , Qt::DisplayRole);
+    otherdetailsmodel->setItem(i++, item);
+    
+    //Packet Service
+    
+    TInt packetsrvc =0;
+    RMobilePhone::TMobilePhoneNetworkInfoV5 nwInfov5;
+    RMobilePhone::TMobilePhoneNetworkInfoV5Pckg nwInfov5Pckg(nwInfov5);
+    imobPhone.GetCurrentNetwork( status, nwInfov5Pckg );
+    User::WaitForRequest( status );
+    status = KRequestPending;
+    nwInfov5 = nwInfov5Pckg();
+    
+    if(nwInfov5.iHsdpaAvailableIndicator) packetsrvc =1;
+    
+    if(nwInfov5.iEgprsAvailableIndicator) packetsrvc =2;
+    
+    if(!packetsrvc)
+    {
+        RMobilePhone::TMobilePhoneNetworkInfoV8 nwInfov8;
+        RMobilePhone::TMobilePhoneNetworkInfoV8Pckg nwInfov8Pckg(nwInfov8);
+        imobPhone.GetCurrentNetwork( status, nwInfov8Pckg );
+        User::WaitForRequest( status );
+        status = KRequestPending;
+        nwInfov8 = nwInfov8Pckg();
+        if(nwInfov8.iHsupaAvailableIndicator) packetsrvc =3;
+    }	  
+    liststr.clear();
+    val = hbTrId("txt_device_update_dblist_wcdma_uldl_data_rates");
+    liststr << val;
+    item = new QStandardItem();
+    PacketService(packetsrvc, str);
+    liststr << str;
+    item->setData(liststr , Qt::DisplayRole);
+    otherdetailsmodel->setItem(i++, item);
+				
+    // Ciphering
+    
+    liststr.clear();
+    item = new QStandardItem();
+    val = hbTrId("txt_device_update_dblist_gsm_cipherings");
+    liststr << val;
+    imobPhone.GetNetworkSecurityLevel(status,idispSecurity);
+    User::WaitForRequest( status );
+    NetworkCiphering(idispSecurity, str);
+    liststr << str;
+    item->setData(liststr, Qt::DisplayRole);
+    otherdetailsmodel->setItem(i++, item);
+    
+    // WLAN MAC
+    
+    TUint KPhoneWlanSeparator (':');
+    _LIT( KWLanMACDataFormat, "%02x");  
+    // Fetch WLAN MAC address
+    TBuf<KWlanMacAddrLength> address;
+    RProperty::Get( KPSUidWlan, KPSWlanMacAddress, address );   
+    // Format fetched address
+    TBuf<KWlanMacAddrLength> wlanMACAddress;        
+    for ( TInt i( 0 ); i < address.Length(); i++ )
+        {
+        // Set separator
+        if( i > 0 )
+            {
+            wlanMACAddress.Append( KPhoneWlanSeparator );
+            }
+        // Set data
+        TBuf<50> tmp;
+        tmp.Format( KWLanMACDataFormat, address[i] );
+        wlanMACAddress.Append( tmp );
+        } 
+    liststr.clear();
+    item = new QStandardItem();
+    val = hbTrId("txt_device_update_dblist_wlan_mac_address");
+    liststr << val;
+    str = QString::fromUtf16(wlanMACAddress.Ptr(), wlanMACAddress.Length());
+    liststr << str;
+    item->setData(liststr, Qt::DisplayRole);
+    otherdetailsmodel->setItem(i++, item);
+      
+    // BT MAC
+      
+    TBuf<KBTAddrLength> addressBuffer;
+    // Fetch from Cenrep
+    CRepository* repository = NULL;
+    TRAPD( err, repository = CRepository::NewL( KCRUidBluetoothLocalDeviceAddress ) );
+    if ( err == KErrNone )
+        {
+        qDebug("KCRUidBluetoothLocalDeviceAddress errnone");
+        err = repository->Get( KBTLocalDeviceAddress, addressBuffer );
+        
+        if (err == KErrNone)
+        	qDebug("KBTLocalDeviceAddress errnone");
+        else
+        	qDebug("KBTLocalDeviceAddress Error");
+        	
+        delete repository;
+        }
+    else
+    	{
+    		qDebug("KCRUidBluetoothLocalDeviceAddress Error openin cenrep");
+    	}
+    liststr.clear();
+    val = hbTrId("txt_device_update_dblist_bt_mac_address");
+    liststr << val;
+    item = new QStandardItem();
+    str = QString::fromUtf16(addressBuffer.Ptr(), addressBuffer.Length());
+    liststr << str;
+    item->setData(liststr , Qt::DisplayRole);
+    otherdetailsmodel->setItem(i++, item);
+    
+    otherdetailslist->setModel(otherdetailsmodel);
+		
+}
+
+void DmAdvancedView::PacketService(TInt val, QString& string)
+    {
+     switch (val)
+         {
+         case (0):
+                 string = hbTrId("txt_device_update_dblist_wcdma_uldl_data_val_l1");
+                 break;
+         case (1):
+                 string = hbTrId("txt_device_update_dblist_wcdma_uldl_data_val_l2");
+                 break;
+         case (2):
+                 string = hbTrId("txt_device_update_dblist_wcdma_uldl_data_val_l3");
+                 break;
+         case (3):
+                 string = hbTrId("txt_device_update_dblist_wcdma_uldl_data_val_l4");
+                 break;
+         case (4):
+                 string = hbTrId("txt_device_update_dblist_gsm_cipherings_val_l4");
+                 break;
+         case (5):
+         default :
+                 string = hbTrId("txt_device_update_dblist_wcdma_uldl_data_val_l5");
+                 break;
+         }
+     }
+
+
+void DmAdvancedView::NetworkCiphering(RMobilePhone::TMobilePhoneNetworkSecurity val, QString& string)
+    {
+     switch (val)
+         {
+         case (RMobilePhone::ECipheringGSM):
+                 string = hbTrId("txt_device_update_dblist_gsm_cipherings_val_l2");
+                 break;
+         case (RMobilePhone::ECipheringWCDMA):
+                 string = hbTrId("txt_device_update_dblist_gsm_cipherings_val_l3");
+                 break;
+         case (RMobilePhone::ECipheringCDMA):
+                 string = hbTrId("txt_device_update_dblist_gsm_cipherings_val_l4");
+                 break;
+         case (RMobilePhone::ECipheringOff):
+         default :
+                 string = hbTrId("txt_device_update_dblist_gsm_cipherings_val_l1");
+                 break;
+         }
+    }
+    
+void DmAdvancedView::NetworkBand(RMobilePhone::TMobilePhoneNetworkBandInfo val, QString& string)
+    {
+    switch (val)
+        {
+        case (RMobilePhone::E800BandA):
+                string = hbTrId("txt_device_update_dblist_gsm_bands_val_l2");
+                break;
+        case (RMobilePhone::E800BandB):
+                string = hbTrId("txt_device_update_dblist_gsm_bands_val_l3");
+                break;
+        case (RMobilePhone::E800BandC):
+                string = hbTrId("txt_device_update_dblist_gsm_bands_val_l4");
+                break;
+        case (RMobilePhone::E1900BandA):
+                string = hbTrId("txt_device_update_dblist_gsm_bands_val_l5");
+                break;
+        case (RMobilePhone::E1900BandB):
+                string = hbTrId("txt_device_update_dblist_gsm_bands_val_l6");
+                break;
+        case (RMobilePhone::E1900BandC):
+                string = hbTrId("txt_device_update_dblist_gsm_bands_val_l7");
+                break;
+        case (RMobilePhone::E1900BandD):
+                string = hbTrId("txt_device_update_dblist_gsm_bands_val_l8");
+                break;
+        case (RMobilePhone::E1900BandE):
+                string = hbTrId("txt_device_update_dblist_gsm_bands_val_l9");
+                break;
+        case (RMobilePhone::E1900BandF):
+                string = hbTrId("txt_device_update_dblist_gsm_bands_val_l10");
+                break;
+        case (RMobilePhone::EBandUnknown):
+        default :
+                string = hbTrId("txt_device_update_dblist_gsm_bands_val_l1");
+                break;
+        }   
+    }
+
+void DmAdvancedView::syncCompleted(int jobstatus)
+    {
+    Q_UNUSED(jobstatus);
+    connectionRequested = false;    
+    updateListview();
+    }
+	
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/deviceupdates/src/dmfotaview.cpp	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,413 @@
+/*
+* Copyright (c) 2002-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:  Methods for DmFotaView.
+*
+*/
+
+#include <hbmainwindow.h>
+#include <hbpushbutton.h>
+#include <hbaction.h>
+#include <hbdialog.h>
+#include <sysutil.h>
+#include <hbscrollarea.h>
+#include <etel.h>
+#include <featmgr.h>
+#include <etelmm.h>
+#include <centralrepository.h>
+#include <sysversioninfo.h>
+#include "nsmldmsyncprivatecrkeys.h"
+#include "dmadvancedview.h"
+#include "dmfotaview.h"
+// ============================ MEMBER FUNCTIONS ===============================
+    
+// -----------------------------------------------------------------------------
+// DMFotaView::DMFotaView
+// -----------------------------------------------------------------------------
+//
+DMFotaView::DMFotaView(HbMainWindow *mainWindow):
+    mMainWindow(mainWindow),profilesView(NULL)
+{
+    fotaPortraitView=0;
+    fotaLandscapeView=0;
+}
+
+// -----------------------------------------------------------------------------
+// DMFotaView::~DMFotaView
+// 
+// -----------------------------------------------------------------------------
+//
+DMFotaView::~DMFotaView()
+{ 
+}
+
+// -----------------------------------------------------------------------------
+// DMFotaView::addFotaView
+// Creates and adds the Fota Portrait and Landscape View
+// -----------------------------------------------------------------------------
+//
+bool DMFotaView::addFotaView()
+    {
+    connect( mMainWindow, SIGNAL( orientationChanged(Qt::Orientation) ), this, SLOT( readSection(Qt::Orientation) ) );
+        
+    bool ok = false;
+    QString val,val2;
+    loader.load(":/xml/devman.docml", &ok);
+    ok = false;
+    loader2.load(":/xml/devman.docml", &ok);
+    // Exit if the file format is invalid
+    Q_ASSERT_X(ok, "Device Manager", "Invalid docml file");
+    
+    ok=false;
+    loader.load(":/xml/devman.docml","Portrait", &ok);
+    ok=false;
+    loader2.load(":/xml/devman.docml","Landscape", &ok);
+   
+    // Load the view by name from the xml file
+    fotaPortraitView = qobject_cast<HbView*>(loader.findWidget("p:view"));
+    fotaLandscapeView = qobject_cast<HbView*>(loader2.findWidget("l:view"));
+
+
+    HbAction *help = qobject_cast<HbAction*> (loader.findObject("help")); 
+    help->setText(QString("txt_common_menu_help"));
+    QObject::connect(help, SIGNAL(triggered()), this, SLOT(OnHelp()));
+    HbAction *exit = qobject_cast<HbAction*> (loader.findObject("exit"));
+    exit->setText(QString("txt_common_menu_exit"));
+    QObject::connect(exit, SIGNAL(triggered()), this, SLOT(OnExit()));
+
+    help = qobject_cast<HbAction*>(loader2.findObject("help"));
+    help->setText(QString("txt_common_menu_help"));
+    QObject::connect(help, SIGNAL(triggered()), this, SLOT(OnHelp()));
+    exit = qobject_cast<HbAction*>( loader2.findObject("exit"));
+    exit->setText(QString("txt_common_menu_exit"));
+    QObject::connect(exit, SIGNAL(triggered()), this, SLOT(OnExit()));
+    
+    mSoftKeyBackAction = new HbAction(Hb::BackAction ,this);
+    mSoftKeyBackAction->setText("Back");
+    connect(mSoftKeyBackAction, SIGNAL(triggered()), this, SLOT(backtoMainWindow()));
+        
+    
+    i=0;
+    QString str;
+    //Setting title text
+    label = qobject_cast<HbLabel*> (loader.findWidget("p:title"));
+    label2 = qobject_cast<HbLabel*> (loader2.findWidget("l:title"));
+    val = hbTrId("txt_device_update_subhead_device_updates");
+    label->setPlainText(val);
+    label2->setPlainText(val);
+    
+    //Setting help text for update button
+    label = qobject_cast<HbLabel*> (loader.findWidget("p:updatelabel"));
+    label2 = qobject_cast<HbLabel*> (loader2.findWidget("l:updatelabel"));
+    val = hbTrId("txt_device_update_setlabel_to_update_your_device_s");
+    label->setPlainText(val);
+    label2->setPlainText(val);
+    
+    HbScrollArea* area = qobject_cast<HbScrollArea*> (loader.findWidget("scrollArea"));
+    area->setVerticalScrollBarPolicy(HbScrollArea::ScrollBarAlwaysOn);
+    
+    
+    list1 << "label" << "label_1" << "label_2" << "label_3" << "label_4" << "label_5" << "label_6"<<"label_7"<<"label_8"<<"label_9"<<"label_10"<<"label_11";
+    list2 << "label_13" << "label_14" << "label_15" << "label_16" << "label_17" << "label_18" << "label_19"<<"label_20"<<"label_21"<<"label_22"<<"label_23"<<"label_24";
+
+
+    //Product Release
+    TBuf< 1024 > prodrelease;
+    prodrelease.Zero();
+    if(SysUtil::GetPRInformation(prodrelease)==KErrNone)
+        {
+        val = hbTrId("txt_device_update_dblist_product_release");
+        str = QString::fromUtf16(prodrelease.Ptr(), prodrelease.Length());
+        FormatList(val,str);
+        }
+    
+    //Software version
+    
+    TBuf< KSysUtilVersionTextLength > swversion;
+    TBuf< KSysUtilVersionTextLength > swversiondate;
+    TBuf< KSysUtilVersionTextLength > typedesignator;
+    TBuf< KSysUtilVersionTextLength > version;
+    swversion.Zero();
+    version.Zero();
+    typedesignator.Zero();
+    swversiondate.Zero();
+    if( SysUtil::GetSWVersion(version)==KErrNone)
+        {
+        TInt len= version.Length();
+        TInt pos1 = version.Find(KSmlEOL);
+             if( pos1 != KErrNotFound && len > pos1 )
+                {
+                 TBuf<KSysUtilVersionTextLength> version1;
+                 version1.Zero();
+                 swversion.Append( version.Left(pos1));
+                 version1.Append( version.Right( len-pos1-1 ));
+                 len= version1.Length();
+                 pos1 = version1.Find(KSmlEOL);
+                 if( pos1 != KErrNotFound  && len > pos1 )
+                     {
+                     swversiondate.Append(version1.Left( pos1 ));
+                     version.Zero();
+                     version.Append( version1.Right( len-pos1-1 ));
+                     len= version.Length();
+                     pos1 = version.Find(KSmlEOL);
+                     if( pos1 != KErrNotFound  && len > pos1 )
+                         {
+                         typedesignator.Append(version.Left(pos1));         
+                         }
+                     }
+                }
+            val = hbTrId("txt_device_update_dblist_software_version");
+            str = QString::fromUtf16(swversion.Ptr(), swversion.Length());
+            FormatList(val,str);
+            }
+
+    //Model
+    RTelServer telServer;
+    User::LeaveIfError( telServer.Connect() );
+    RTelServer::TPhoneInfo teleinfo;
+    User::LeaveIfError( telServer.GetPhoneInfo( 0, teleinfo ) );
+    RMobilePhone phone;
+    User::LeaveIfError( phone.Open( telServer, teleinfo.iName ) );
+    User::LeaveIfError(phone.Initialise()); 
+    TUint32 teleidentityCaps;
+    phone.GetIdentityCaps( teleidentityCaps );
+    RMobilePhone::TMobilePhoneIdentityV1 telid;
+    TRequestStatus status;
+    phone.GetPhoneId( status, telid );
+    User::WaitForRequest( status );
+    TBuf <50> imei;
+    if (status==KErrNone)
+    {
+    TBuf<100> phoneName;
+    phoneName.Copy( telid.iModel );
+    imei.Copy(telid.iSerialNumber);
+    if( phoneName.Length()>0 )
+        {
+        val = hbTrId("txt_device_update_dblist_model");
+        str = QString::fromUtf16(phoneName.Ptr(), phoneName.Length());
+        FormatList(val,str);
+        }
+    }
+    phone.Close();
+    telServer.Close();
+
+    //type
+    if(typedesignator.Length()>0)
+        {
+        val = hbTrId("txt_device_update_dblist_type");
+        str = QString::fromUtf16(typedesignator.Ptr(), typedesignator.Length());
+        FormatList(val,str);
+        }
+      
+    //Product Code
+       /* TInt runtimesupport(0);
+        CRepository* cenrep = NULL;
+        TRAPD( error, cenrep = CRepository::NewL( KCRUidNSmlDMSyncApp ) );  
+        if(error)
+            {
+            runtimesupport=1;
+            }
+        if ( cenrep )
+                {
+                cenrep->Get( KNsmlDmRuntimeVerSupport, runtimesupport );
+                delete cenrep; cenrep = NULL;
+                }
+          if(runtimesupport)
+          { */
+         TBuf<KSysUtilVersionTextLength> productcode;
+         productcode.Zero();
+         TInt error = SysVersionInfo::GetVersionInfo(SysVersionInfo::EProductCode, productcode);
+         if(error ==KErrNone )
+         {            
+             if( productcode.Length()>0 )
+             {        
+             val = hbTrId("txt_device_update_dblist_product_code");
+             str = QString::fromUtf16(productcode.Ptr(), productcode.Length());  
+             FormatList(val,str);
+             }                    
+        }
+
+    //IMEI   
+    if(imei.Length()>0)
+        {
+        val = hbTrId("txt_device_update_dblist_imei");
+        str = QString::fromUtf16(imei.Ptr(), imei.Length()); 
+        FormatList(val,str);
+        }
+
+    
+    val = hbTrId("txt_device_update_button_update");
+    HbPushButton *updateButton = qobject_cast<HbPushButton*>(loader.findWidget("p:update"));
+    updateButton->setText(val);
+    QObject::connect(updateButton, SIGNAL(clicked()), this, SLOT(CheckforUpdate()));
+    updateButton = qobject_cast<HbPushButton*>(loader2.findWidget("l:update"));
+    updateButton->setText(val);
+    QObject::connect(updateButton, SIGNAL(clicked()), this, SLOT(CheckforUpdate()));
+    
+    val = hbTrId("txt_device_update_button_advanced");
+    HbPushButton *advancedButton = qobject_cast<HbPushButton*>(loader.findWidget("p:advanced")); 
+    advancedButton->setText(val);
+    QObject::connect(advancedButton, SIGNAL(clicked()), this, SLOT(AdvancedDeviceManager()));
+    advancedButton = qobject_cast<HbPushButton*>(loader2.findWidget("l:advanced"));
+    advancedButton->setText(val);
+    QObject::connect(advancedButton, SIGNAL(clicked()), this, SLOT(AdvancedDeviceManager()));
+
+    
+    mMainWindow->addView(fotaPortraitView);
+    mMainWindow->addView(fotaLandscapeView);
+    
+    if(mMainWindow->orientation()==Qt::Vertical)
+            mMainWindow->setCurrentView(fotaPortraitView);
+        else
+            mMainWindow->setCurrentView(fotaLandscapeView);
+    return ETrue;
+    }
+
+// -----------------------------------------------------------------------------
+// DMFotaView::CheckforUpdate
+// Checks for updates from the default server
+// -----------------------------------------------------------------------------
+//
+void DMFotaView::CheckforUpdate()
+ {
+    // if(no default profile defined)
+    HbDocumentLoader loader;
+    bool ok = false;
+    loader.load(":/xml/updatedialog.docml", &ok);
+    QString val;
+    // Exit if the file format is invalid
+    Q_ASSERT_X(ok, "Device Manager", "Invalid docml file");
+    HbDialog* dialog = qobject_cast<HbDialog*>(loader.findWidget("UpdateDialog"));
+    
+    label=qobject_cast<HbLabel*>(loader.findWidget("DialogText"));
+    val = hbTrId("txt_device_update_info_no_server_configured_to_get");
+    label->setPlainText(val);
+    dialog->setDismissPolicy(HbPopup::TapAnywhere);
+    dialog->setTimeout(HbPopup::StandardTimeout);
+    dialog->setAttribute(Qt::WA_DeleteOnClose, true);
+    dialog->exec();
+    //Else connect
+    /*TInt iProfileId= 1000000;
+    iSession.OpenL();
+    profile.OpenL(iSession,iProfileId);
+    //openconnection
+    iSyncJob.CreateL( iSession, iProfileId );*/
+ }
+
+// -----------------------------------------------------------------------------
+// DMFotaView::AdvancedDeviceManager
+// Displays the Profiles view
+// -----------------------------------------------------------------------------
+//
+void DMFotaView::AdvancedDeviceManager()
+ {
+    
+    qDebug("omadm DeviceManagerUi::AdvancedDeviceManager");
+    if(!profilesView)
+        {
+    qDebug("omadm DeviceManagerUi::AdvancedDeviceManager 1");
+    profilesView = new DmAdvancedView(mMainWindow,this);
+    qDebug("omadm DeviceManagerUi::AdvancedDeviceManager 2");
+        bool loadingok = profilesView->displayItems();
+        if(loadingok)
+            {qDebug("omadm DeviceManagerUi::AdvancedDeviceManager 3");
+        mMainWindow->addView(profilesView);
+        qDebug("omadm DeviceManagerUi::AdvancedDeviceManager 4");
+        profilesView->setBackBehavior();  
+        qDebug("omadm DeviceManagerUi::AdvancedDeviceManager 5");
+        mMainWindow->setCurrentView(profilesView);
+        qDebug("omadm DeviceManagerUi::AdvancedDeviceManager 6");
+            }
+        else
+            {
+        qFatal("omadm Unable to read groupbox.docml");
+        
+            }
+        }
+    else
+        {
+        profilesView->setBackBehavior();                
+        mMainWindow->setCurrentView(profilesView);   
+        }
+ }
+
+// -----------------------------------------------------------------------------
+// DMFotaView::FormatList
+// Adds data to the details list
+// -----------------------------------------------------------------------------
+//
+void DMFotaView::FormatList(QString val,QString str)
+    {
+    label = qobject_cast<HbLabel*> (loader.findWidget(list1[i]));
+    label2 = qobject_cast<HbLabel*> (loader2.findWidget(list2[i++]));         
+    label3 = qobject_cast<HbLabel*> (loader.findWidget(list1[i]));
+    label4 = qobject_cast<HbLabel*> (loader2.findWidget(list2[i++]));
+    label->setPlainText(val);
+    label2->setPlainText(val);
+    label3->setPlainText(str);
+    label4->setPlainText(str);
+    label->setVisible(ETrue);
+    label2->setVisible(ETrue);
+    label3->setVisible(ETrue);
+    label4->setVisible(ETrue);
+    }
+// -----------------------------------------------------------------------------
+// DMFotaView::backtoMainWindow
+// Enables switching between views
+// -----------------------------------------------------------------------------
+//
+void DMFotaView::backtoMainWindow()
+    {
+        qApp->quit();
+    }
+
+// -----------------------------------------------------------------------------
+// DMFotaView::OnHelp
+// Displays Help contents
+// -----------------------------------------------------------------------------
+//
+void DMFotaView::OnHelp()
+{   
+}
+
+// -----------------------------------------------------------------------------
+// DMFotaView::OnExit
+// -----------------------------------------------------------------------------
+//
+void DMFotaView::OnExit()
+{
+    qApp->quit();
+}
+
+void DMFotaView::readSection( Qt::Orientation orientation )
+{
+    if(mMainWindow->currentView() == fotaPortraitView || mMainWindow->currentView() == fotaLandscapeView)
+        {
+        if( orientation == Qt::Vertical ) {
+        // reading "portrait" section
+        mMainWindow->setCurrentView(fotaPortraitView);
+        }
+     else {
+        // reading "landscape" section
+        mMainWindow->setCurrentView(fotaLandscapeView);
+         }
+        }
+    else if(mMainWindow->currentView()==profilesView)
+        {
+        profilesView->reLayout(orientation);
+        }
+
+}   
+
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/deviceupdates/src/dminforetrieval.cpp	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,545 @@
+/*
+* Copyright (c) 2002-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:  Provides methods for DmInfo class. 
+*
+*/
+
+#include <centralrepository.h>
+#include <cmmanager.h>
+#include <cmconnectionmethod.h>
+#include "dmadvancedview.h"
+#include "nsmldmsyncprivatecrkeys.h"
+#include "dminforetrieval.h"
+
+DmInfo::DmInfo(DmAdvancedView* serversview, QGraphicsItem* /*parent*/)
+    {
+    iAppEngine = CNSmlDMSyncAppEngine::NewL(this);
+    iSyncProfileList = CNSmlDMSyncProfileList::NewL( iAppEngine );
+    iProfileList = new (ELeave) CArrayFixFlat< TNSmlDMProfileItem >(1);
+    iDbNotifier = CNSmlDMDbNotifier::NewL( iAppEngine->Session(), this );
+    iDbNotifier->RequestL();
+    serversView = serversview;
+    iDbEventsBlocked = EFalse;
+    }
+
+DmInfo::~DmInfo()
+    {
+    delete iProfileList;
+    delete iSyncProfileList;
+    delete iAppEngine;
+    delete iDbNotifier;
+    }
+
+void DmInfo::refreshProfileList(TBool aIncludeHidden )
+    {    
+    FLOG( "[OMADM] DmInfo::refreshProfileList" );
+    iProfileList->Reset();
+    TKeyArrayFix key(_FOFF( TNSmlDMProfileItem, iProfileName ), ECmpFolded16 );
+    iProfileList->Sort(key);
+    iSyncProfileList->Reset();
+    TRAPD( error, iSyncProfileList->ReadProfileItemsL( aIncludeHidden ) );
+    if ( error != KErrNone )
+        {
+        iSyncProfileList->Reset();
+        }
+
+    //read profile values
+    for ( TInt index = 0; index < iSyncProfileList->Count(); index++ )
+        {
+        TNSmlDMProfileItem profile;
+        profile.iProfileName = iSyncProfileList->Item( index ).iProfileName;
+        if ( profile.iProfileName.Length() == 0 )
+            {
+            //StringLoader::Load( profile.iProfileName, R_QTN_APPS_EMPTYPROFILE );
+            TBuf<20> noname(_L("No NAME"));
+            profile.iProfileName = noname;
+            }       
+        profile.iProfileId   = iSyncProfileList->Item( index ).iProfileId;
+        profile.iBearer      = iSyncProfileList->Item( index ).iBearer;
+        profile.iSynced      = iSyncProfileList->Item( index ).iSynced;
+        profile.iLastSync    = iSyncProfileList->Item( index ).iLastSync;
+        profile.iLastSuccessSync     = iSyncProfileList->Item( index ).iLastSuccessSync;
+        profile.iActive      = iSyncProfileList->Item( index ).iActive;
+        profile.iDeleteAllowed =  iSyncProfileList->Item( index ).iDeleteAllowed;
+        profile.iProfileLocked =  iSyncProfileList->Item( index ).iProfileLocked;    
+        TInt start = 0;
+        TBool found( EFalse );    
+        if ( iProfileList->Count() == 0 )
+            {
+            iProfileList->AppendL ( profile );      
+            }
+        else
+            {
+            while ( ( start < iProfileList->Count() ) && ( !found ) )
+                {
+            if ( iAppEngine->Compare( profile.iProfileName,
+                    iProfileList->At( start ).iProfileName ) < 1 )
+                {
+                iProfileList->InsertL( start, profile );
+                found = ETrue;
+                }
+            start++;
+                }
+            if ( !found ) //insert to the end of the list
+                {
+                iProfileList->AppendL( profile );
+                }
+            }
+        }
+        FLOG( "[OMADM] CNSmlDMSyncDocument::ReadProfileListL() completed" );
+     }
+  
+int DmInfo::profilescount()
+    {
+    return iProfileList->Count();
+    }
+    
+int DmInfo::profileinfo(int profilelistnum, QStringList& itemtext, int& icon, bool& lock)
+    {
+    //TNSmlDMProfileItem* item = ProfileItemAt(profilelistnum);
+    TBuf<KNSmlMaxTextLength256> text;
+    TBuf<KNSmlMaxTextLength64>  timeString; 
+    TBuf<KNSmlMaxTextLength64>  dateString; 
+    HBufC* timeFormatted;
+
+    TBool settingEnforcement = TUtil::SettingEnforcementState();
+    TBool btObex = FeatureManager::FeatureSupported(KFeatureIdSyncMlDmObex);
+
+    if(profilelistnum >= 0 && iProfileList->Count() > 0)
+        {
+        
+        QString text = QString::fromUtf16(iProfileList->At( profilelistnum ).iProfileName.Ptr(), 
+                iProfileList->At( profilelistnum ).iProfileName.Length());
+        itemtext << text ;
+        if(iProfileList->At( profilelistnum ).iSynced)
+            {            
+            timeFormatted = TUtil::SyncTimeLC( ( iProfileList->At( profilelistnum ).iLastSuccessSync ));
+            QString time = QString::fromUtf16(timeFormatted->Ptr(), 
+                    timeFormatted->Length());
+            itemtext << time ;
+            CleanupStack::PopAndDestroy(1);
+            }
+        else
+            {
+            itemtext << hbTrId("txt_device_update_dblist_server_view_l2"); 
+            }
+        if ( ( iProfileList->At( profilelistnum ).iBearer == EProfileInternet ))
+                    {                    
+                    icon = 0;
+                    }
+        else 
+            {
+        //Bluetooth 
+        icon = 1;        
+            }
+        
+        TInt id = DefaultFotaProfileIdL();
+        if( id == iProfileList->At( profilelistnum ).iProfileId)
+            {
+        //Check default or not
+        //If default icon = 3;
+        icon = 2 ;
+            }   
+        
+        if(settingEnforcement || ( iProfileList->At( profilelistnum ).iProfileLocked))
+            {
+            lock = true;
+            }
+        return 1;
+        }
+    else
+        return 0;
+    }
+
+// -----------------------------------------------------------------------------
+// DmInfo::DefaultFotaProfileIdL
+// -----------------------------------------------------------------------------
+//
+TInt DmInfo::DefaultFotaProfileIdL() const
+    {
+    FLOG( "[OMADM] CNSmlDMFotaModel::DefaultFotaProfileIdL()" );
+    TInt profileId( KErrNotFound );
+    CRepository* centrep = NULL;
+    TRAPD( err, centrep = CRepository::NewL( KCRUidNSmlDMSyncApp ) );
+    FTRACE( FPrint( _L(
+        "[OMADM] CNSmlDMFotaModel::DefaultFotaProfileIdL(), opening cenrep returned %d" ),
+        err ) );
+    User::LeaveIfError( err );
+    centrep->Get( KNSmlDMDefaultFotaProfileKey, profileId );
+    delete centrep;    
+    FTRACE( FPrint( _L(
+        "[OMADM] CNSmlDMFotaModel::DefaultFotaProfileIdL() completed, profileId = %d" ),
+        profileId ) );
+    return profileId;
+    }
+
+// -----------------------------------------------------------------------------
+// DmInfo::SetDefaultFotaProfileIdL
+// -----------------------------------------------------------------------------
+//
+void DmInfo::SetDefaultFotaProfileIdL( const TInt aProfileId )
+    {
+    FLOG( "[OMADM] CNSmlDMFotaModel::SetDefaultFotaProfileIdL()" );
+    
+    CRepository* centrep = NULL;
+    TRAPD( err, centrep = CRepository::NewL( KCRUidNSmlDMSyncApp ) );
+    FTRACE( FPrint( _L(
+        "[OMADM] CNSmlDMFotaModel::SetDefaultFotaProfileIdL(), opening cenrep returned %d" ),
+        err ) );
+
+    User::LeaveIfError( err );
+    centrep->Set( KNSmlDMDefaultFotaProfileKey, aProfileId );
+    delete centrep;
+    
+    FLOG( "[OMADM] CNSmlDMFotaModel::SetDefaultFotaProfileIdL() completed" );
+    }
+
+void DmInfo::setDefaultProfile(int listitem)
+    {
+    if(listitem >= 0&& listitem < profilescount())
+        {
+        SetDefaultFotaProfileIdL(iProfileList->At( listitem ).iProfileId);
+        FLOG( "[OMADM] default profile set done" );
+        }
+    else
+        {
+        FLOG( "[OMADM] Invalid list item" );
+        }
+    }
+
+bool DmInfo::Isprofilelocked(int profilelistnum)
+    {
+    bool lock = false;
+    if(profilelistnum >= 0 && iProfileList->Count() > 0)
+        {
+        TBool settingEnforcement = TUtil::SettingEnforcementState();
+        if(settingEnforcement || ( iProfileList->At( profilelistnum ).iProfileLocked))
+            {
+            lock = true;
+            }                  
+        }
+    return lock;
+    }
+
+
+bool DmInfo::Isdefaultprofile(int profilelistnum)
+    {
+    bool defaultprofile = false;
+    if(profilelistnum >= 0 && iProfileList->Count() > 0)
+           {
+            TInt id = DefaultFotaProfileIdL();
+            if( id == iProfileList->At( profilelistnum ).iProfileId)
+                {
+                defaultprofile = true;            
+                }  
+           }
+    return defaultprofile;
+    }
+
+void DmInfo::profileTransport(int profilelistnum, int& transport)
+    {
+    if(profilelistnum >= 0 && profilelistnum < profilescount())
+            {
+    if ( ( iProfileList->At( profilelistnum ).iBearer == EProfileInternet ))
+                       {                    
+    transport = 0;
+    FLOG( "[OMADM] DmInfo::profileTransport Internet" );
+                       }
+    else
+        {
+    transport = 1;
+    FLOG( "[OMADM] DmInfo::profileTransport Bluetooth" );
+        }
+            FLOG( "[OMADM] DmInfo::profileTransport set done" );
+            }
+        else
+            {
+            FLOG( "[OMADM] Invalid list item" );
+            }
+    }
+
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncDocument::DeleteProfile
+// -----------------------------------------------------------------------------
+//
+TInt DmInfo::DeleteProfile( TInt& aIndex )
+    {
+    FTRACE( FPrint(
+        _L("[OMADM] CNSmlDMSyncDocument::DeleteProfile(), index = %d"),
+        aIndex ) );
+        
+    TInt retVal = KErrNotFound;
+    TInt profcount = iProfileList->Count();
+    if (  profcount <= 0 && aIndex >= profcount && aIndex < 0)
+        {
+        return retVal;
+        }
+    TRAP( retVal, iAppEngine->DeleteProfileL( 
+                                (*iProfileList)[aIndex].iProfileId ) );
+    if ( retVal == KErrNone )
+        {
+        //Update profile list
+        refreshProfileList();    
+        }
+
+    FTRACE( FPrint(
+        _L("[OMADM] CNSmlDMSyncDocument::DeleteProfile() completed, retval = %d"),
+        retVal) );
+    return retVal;
+    }
+
+bool DmInfo::createNewprofile()
+    {
+    iProfileId = iAppEngine->CreateProfileL();
+    if(iProfileId > 0)
+        return true;
+    else
+        return false;
+    }
+
+
+int DmInfo::saveProfile(QStringList& itemdata, bool& sessmode, QString& currap,unsigned int& portnum, bool& nauth )
+    {
+    Q_UNUSED(sessmode);
+    Q_UNUSED(nauth);	
+    FLOG( "[OMADM] void CNSmlDMDlgProfileView::SaveProfileL:" );    
+    TRAPD( err, iProfile = iAppEngine->OpenProfileL( iProfileId, ESmlOpenReadWrite ) );
+    if( err != KErrNone )
+        {
+        FLOG( "[OMADM] err != KErrNone--problem in opening the profile" );
+        return false;
+        }
+    TPtrC srvname(reinterpret_cast<const TText*>(itemdata[0].constData()));
+    // Server name
+    iProfile->SetNameL( srvname );
+    // Server Id
+    TPtrC srvid(reinterpret_cast<const TText*>(itemdata[1].constData()));
+    iProfile->SetServerIdL(srvid );
+    // Server password
+    TPtrC srvpwd(reinterpret_cast<const TText*>(itemdata[2].constData()));
+    iProfile->SetServerPasswordL(srvpwd );
+    // connection type
+    iProfile->SetBearerTypeL( EAspBearerInternet );
+    // Accesspoint
+    if(currap.length())
+        iProfile->SetAccessPointL( iapmap[currap] );
+    else
+        iProfile->SetAccessPointL( KErrGeneral ); //Default access point
+    // Host address
+    TInt num = portnum;
+    TPtrC hostaddr(reinterpret_cast<const TText*>(itemdata[3].constData()));
+    iProfile->SetHostAddressL( hostaddr, num );
+    // User name
+    TPtrC usrname(reinterpret_cast<const TText*>(itemdata[4].constData()));
+    iProfile->SetUserNameL( usrname );
+    // User password
+    TPtrC usrpwd(reinterpret_cast<const TText*>(itemdata[5].constData()));
+    iProfile->SetPasswordL( usrpwd );                                 
+    // Http authentication  
+    iProfile->SetHttpUsedL( nauth );
+    // http username
+    TPtrC httpusrname(reinterpret_cast<const TText*>(itemdata[6].constData()));
+    iProfile->SetHttpUserNameL( httpusrname );
+    // http password
+    TPtrC httpusrpwd(reinterpret_cast<const TText*>(itemdata[7].constData()));
+    iProfile->SetHttpPasswordL( httpusrpwd );
+    // iProfile->SetCreatorId( KUidSmlSyncApp.iUid );
+    iProfileId = 0;
+    iProfile->SaveL();
+    iAppEngine->CloseProfile();    
+    refreshProfileList();//updates profile list    
+    return 1;
+    }
+              
+bool DmInfo::getProfiledata(int& itemnum, QStringList& itemdata,
+        bool& sessmode, QStringList& iaplist, int& curriap, int& portnum,
+        bool& nwauth)
+    {
+    if (itemnum >= 0 && iProfileList->Count() > 0)
+        {
+        iProfileId = iProfileList->At(itemnum).iProfileId;
+        }
+    TRAPD( err, iProfile = iAppEngine->OpenProfileL( iProfileId, ESmlOpenRead ) );    
+    if (err == 0)
+        {
+        //srvname
+        TBuf<KBufSize256> bufdata;
+        iProfile->GetName(bufdata);
+        itemdata << QString::fromUtf16(bufdata.Ptr(), bufdata.Length());
+
+        //srvid
+        iProfile->GetServerId(bufdata);
+        itemdata << QString::fromUtf16(bufdata.Ptr(), bufdata.Length());
+
+        //srvpwd
+        iProfile->GetServerPassword(bufdata);
+        itemdata << QString::fromUtf16(bufdata.Ptr(), bufdata.Length());
+
+        //hostaddress
+
+        iProfile->GetHostAddress(bufdata, portnum);
+        itemdata << QString::fromUtf16(bufdata.Ptr(), bufdata.Length());
+
+        //username
+        iProfile->GetUserName(bufdata);
+        itemdata << QString::fromUtf16(bufdata.Ptr(), bufdata.Length());
+
+        //usrpwd
+        iProfile->GetPassword(bufdata);
+        itemdata << QString::fromUtf16(bufdata.Ptr(), bufdata.Length());
+
+        //nwusrname
+        iProfile->GetHttpUserNameL(bufdata);
+        itemdata << QString::fromUtf16(bufdata.Ptr(), bufdata.Length());
+
+        //nwpwd
+        iProfile->GetHttpPasswordL(bufdata);
+        itemdata << QString::fromUtf16(bufdata.Ptr(), bufdata.Length());
+
+        //connection type 
+        int transporttype = iProfile->BearerType();
+        if (((transporttype != EProfileObexBlueTooth) && (transporttype
+                != EProfileInternet)) || transporttype == EProfileInternet)
+            {
+            //default to internet
+            sessmode = true;           
+            }
+        else
+            sessmode = false;       
+        int apid = iProfile->AccessPointL();
+        curriap = apid;
+        getIaplist(iaplist, apid, curriap); //append default connection to list
+        TBuf<20> apnum;
+        RDebug::RawPrint(_L("omadm access point is"));
+        apnum.AppendNum(curriap);
+        RDebug::RawPrint(apnum);
+        //check iap id exists or not 
+        nwauth = iProfile->HttpUsedL();
+        return true;
+        }
+    else
+        {
+        return false;
+        }
+    }
+
+bool DmInfo::checksrvid(QString& serverid)
+    {
+    TPtrC srvid(reinterpret_cast<const TText*> (serverid.constData()));
+    return iAppEngine->ServerIdFoundL(srvid, iProfileId);
+    }
+
+void DmInfo::getIaplist(QStringList& iaplist, int& iapselected,
+        int& listindex)
+    {
+    iapmap.clear();
+    RCmManager cmManager;
+    cmManager.OpenLC();
+    RArray<TUint32> iapidlist;
+    cmManager.ConnectionMethodL(iapidlist, EFalse, EFalse, ETrue);
+    RCmConnectionMethod conn;
+    for (TInt i = 0; i < iapidlist.Count(); i++)
+        {
+        TRAPD(err, conn = cmManager.ConnectionMethodL( iapidlist[i] ));
+
+        if (err == KErrNone)//connection method exists
+            {
+            CleanupClosePushL(conn);
+            HBufC* name = conn.GetStringAttributeL(CMManager::ECmName);
+            QString iapname = QString::fromUtf16(name->Ptr(), name->Length());
+            iaplist << iapname;
+            iapmap[iapname] = iapidlist[i];
+            if (iapselected == iapidlist[i])
+                {
+                RDebug::RawPrint(_L("omadm iap found"));
+                listindex = iapmap.count() - 1;
+                }
+            delete name;
+
+            CleanupStack::PopAndDestroy(1); // conn
+            }
+        }
+    CleanupStack::PopAndDestroy(1); // cmManager
+    }
+
+void DmInfo::synchronize(int& itemnum)
+    {
+    TBool fotanote = EFalse;
+    DisableDbNotifications(ETrue);
+    TRAPD( error, iAppEngine->SynchronizeL( iProfileList->At( itemnum ).iProfileName,
+                    iProfileList->At( itemnum ).iProfileId,
+                    iProfileList->At( itemnum ).iBearer,fotanote ) );
+    if(error == KErrNone)   {}             
+    }
+
+void DmInfo::synccomplete(int jobstatus)
+    {
+    if (jobstatus == ENSmlSyncComplete)
+        {
+        //iSyncProfileList->ReadProfileItemsL();
+        //Update profile list
+        refreshProfileList();
+        }
+    serversView->syncCompleted(jobstatus);
+    iDbEventsBlocked = EFalse;
+    }
+
+// -----------------------------------------------------------------------------
+// HandleDbEventL
+// -----------------------------------------------------------------------------
+//
+void DmInfo::HandleDbEventL(TNSmlDMDbEvent aEvent)
+    {
+    FLOG( "[OMADM] DmInfo::HandleDbEventL:" );
+
+    if (!iDbEventsBlocked)
+        {
+        switch (aEvent.iType)
+            {
+            case CNSmlDMDbNotifier::EClose:
+                iAppEngine->SyncCompleted(ENSmlRefreshMainView);
+                break;
+
+            case CNSmlDMDbNotifier::EUpdate:
+                iSyncProfileList->ReadProfileItemL(aEvent.iProfileId);
+                iAppEngine->SyncCompleted(ENSmlRefreshMainView);
+                break;
+
+            case CNSmlDMDbNotifier::EDelete:
+                iSyncProfileList->Remove(aEvent.iProfileId);
+                iAppEngine->SyncCompleted(ENSmlRefreshMainView);
+                break;
+
+            case CNSmlDMDbNotifier::EUpdateAll:
+                iSyncProfileList->ReadProfileItemsL();
+                iAppEngine->SyncCompleted(ENSmlRefreshMainView);
+                break;
+
+            default:
+                break;
+            }
+        }
+    FLOG( "[OMADM] DmInfo::HandleDbEventL() completed" );
+    }
+
+// -----------------------------------------------------------------------------
+// DisableDbNotifications
+// -----------------------------------------------------------------------------
+//
+void DmInfo::DisableDbNotifications(TBool aEvent)
+    {
+    iDbEventsBlocked = aEvent;
+    FLOG( "[OMADM] DmInfo::DisableDbNotifications() completed" );
+    }
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/deviceupdates/src/main.cpp	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,81 @@
+/*
+* 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:  Application entry. 
+*
+*/
+
+#include <hbinstance.h>
+#include <dmfotaview.h>
+#include <hbapplication.h>
+#include <qdebug.h>
+#include "nsmldmsyncprivatecrkeys.h"
+
+int main(int argc, char *argv[])
+{
+
+    HbApplication app(argc, argv);
+    //HbView* newview= new HbView();
+
+    QTranslator *translator = new QTranslator();
+   QString lang = QLocale::system().name();
+   qDebug("OMADM Loading qm file");
+   qDebug()<<lang;
+   QString path = "z:/resource/qt/translations/";
+    // bool fine = translator->load("deviceupdates_" + lang, path);/*finally required once localisation available*/
+    bool fine = translator->load("deviceupdates_en.qm", path);
+	if(fine)
+   qApp->installTranslator(translator);
+   else
+   qDebug("omadm translator loading failed");
+   
+    QTranslator *commontranslator = new QTranslator();
+   
+   	fine = commontranslator->load("common_" + lang + ".qm", path);/*finally required once localisation available*/
+    //fine = commontranslator->load("common_en" , path);
+   	if(fine)
+   qApp->installTranslator(translator);
+   else
+   qDebug("omadm common translator loading failed");
+   
+    app.setApplicationName(hbTrId("txt_device_update_subhead_device_updates"));
+    
+    CRepository *cenrep = CRepository::NewL(KUidSmlSyncApp);
+    TInt val(0);
+    if(cenrep)
+        {        
+        cenrep->Get(KNsmlDmUILaunch, val);
+            {
+            if(val==1)
+                {
+                QTranslator *tempTranslator = new QTranslator();
+    			QString lang = QLocale::system().name();
+    			tempTranslator->load("control_panel_" + lang, path);
+    			qApp->installTranslator(tempTranslator);
+    			app.setApplicationName(hbTrId("txt_applib_list_control_panel"));
+    			val=0;
+    			cenrep->Set(KNsmlDmUILaunch, val);
+    			delete cenrep;
+    			cenrep = NULL;
+                }
+            }
+        }
+    HbMainWindow window;
+
+    DMFotaView* view = new DMFotaView(&window);
+    bool loadingok = view->addFotaView();
+
+    window.show();
+    return app.exec();
+}
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/deviceupdates/src/nsmldmdbnotifier.cpp	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,331 @@
+/*
+* Copyright (c) 2002-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:  Provides methods for CNSmlDMDbNotifier class. 
+*
+*/
+
+
+#include "nsmldmdbnotifier.h"
+#include "nsmldmsyncdebug.h"
+#include "nsmldmdef.h"
+
+// -----------------------------------------------------------------------------
+// CNSmlDMDbNotifier::CNSmlDMDbNotifier
+// -----------------------------------------------------------------------------
+//
+CNSmlDMDbNotifier::CNSmlDMDbNotifier( RSyncMLSession* aSyncSession,
+                                      MNSmlDMDbEventHandler* aHandler)
+                                     : iSyncSession(aSyncSession),
+                                       iHandler( aHandler )
+ 	{
+ 	}
+
+
+// -----------------------------------------------------------------------------
+// CNSmlDMDbNotifier::NewL
+// -----------------------------------------------------------------------------
+//
+CNSmlDMDbNotifier* CNSmlDMDbNotifier::NewL( RSyncMLSession* aSyncSession,
+                                            MNSmlDMDbEventHandler* aHandler)
+	{
+	CNSmlDMDbNotifier* self = new (ELeave) CNSmlDMDbNotifier( aSyncSession,
+	                                                          aHandler );
+	CleanupStack::PushL(self);
+	self->ConstructL();
+	CleanupStack::Pop(self);
+	return self;
+	}
+
+// -----------------------------------------------------------------------------
+// CNSmlDMDbNotifier::ConstructL
+// -----------------------------------------------------------------------------
+//
+void CNSmlDMDbNotifier::ConstructL()
+	{
+	iActiveCaller = CNSmlDMActiveCaller::NewL(this);
+	}
+
+// -----------------------------------------------------------------------------
+// Destructor
+// -----------------------------------------------------------------------------
+//
+CNSmlDMDbNotifier::~CNSmlDMDbNotifier()
+	{		
+	delete iActiveCaller;
+	iList.Close();
+	}
+
+// -----------------------------------------------------------------------------
+// CNSmlDMDbNotifier::RequestL
+// -----------------------------------------------------------------------------
+//
+void CNSmlDMDbNotifier::RequestL()
+	{
+	Session().RequestEventL( *this );  // request MSyncMLEventObserver events
+	}
+
+// -----------------------------------------------------------------------------
+// CNSmlDMDbNotifier::OnSyncMLSessionEvent
+// -----------------------------------------------------------------------------
+//
+void CNSmlDMDbNotifier::OnSyncMLSessionEvent( TEvent aEvent,
+                                              TInt aIdentifier,
+                                              TInt aError,
+                                              TInt /*aAdditionalData*/ )
+	{
+	TNSmlDMDbEvent event;
+
+	event.iType = aEvent;
+	event.iError = aError;
+		
+	if (aEvent == MSyncMLEventObserver::EProfileCreated || 
+	    aEvent == MSyncMLEventObserver::EProfileChanged ||
+	    aEvent == MSyncMLEventObserver::EProfileDeleted )
+		{
+		event.iProfileId = aIdentifier;
+		}
+	else
+		{
+		event.iProfileId = KErrNotFound;
+		}
+	
+	TRAP_IGNORE( iList.AppendL (event) );
+	
+	CallObserverWithDelay();
+	TRAP_IGNORE( RequestL() );
+    }
+
+// -----------------------------------------------------------------------------
+// CNSmlDMDbNotifier::SetDisabled
+// -----------------------------------------------------------------------------
+//
+void CNSmlDMDbNotifier::SetDisabled( TBool aDisable )
+	{
+    iDisabled = aDisable;
+	}
+
+// -----------------------------------------------------------------------------
+// CNSmlDMDbNotifier::Reset
+// -----------------------------------------------------------------------------
+//
+void CNSmlDMDbNotifier::Reset()
+	{
+    iDisabled = EFalse;
+	iList.Reset();
+	}
+
+// -----------------------------------------------------------------------------
+// CNSmlDMDbNotifier::EventCount
+// -----------------------------------------------------------------------------
+//
+TInt CNSmlDMDbNotifier::EventCount()
+	{
+	return iList.Count();
+	}
+
+// -----------------------------------------------------------------------------
+// CNSmlDMDbNotifier::Event
+// -----------------------------------------------------------------------------
+//
+TNSmlDMDbEvent CNSmlDMDbNotifier::Event( TInt aIndex )
+	{
+	__ASSERT_DEBUG( aIndex >= 0 && aIndex < iList.Count(),
+	                TUtil::Panic(KErrGeneral) );
+
+	return iList[aIndex];
+	}
+
+// -----------------------------------------------------------------------------
+// CNSmlDMDbNotifier::Session
+// -----------------------------------------------------------------------------
+//
+RSyncMLSession& CNSmlDMDbNotifier::Session()
+	{
+	__ASSERT_DEBUG( iSyncSession, TUtil::Panic(KErrGeneral) );
+	
+	return *iSyncSession;
+	}
+
+// -----------------------------------------------------------------------------
+// CNSmlDMDbNotifier::CallObserverWithDelay
+//
+// This is needed to avoid unnecessary observer calls (eg. in case 10 events are
+// reported in short time only last is reported to observer). 
+// -----------------------------------------------------------------------------
+//
+void CNSmlDMDbNotifier::CallObserverWithDelay()
+	{
+    iActiveCaller->Cancel();
+	iActiveCaller->Start( KErrNone, KListBoxUpdateDelay );
+	}
+
+// -----------------------------------------------------------------------------
+// CNSmlDMDbNotifier::CallObserver
+//
+// this function investigates received events from last observer call
+// and calls observer to inform UI what to do. 
+// -----------------------------------------------------------------------------
+//
+void CNSmlDMDbNotifier::CallObserver()
+	{
+	TNSmlDMDbEvent event;
+	event.iProfileId = 0;
+	event.iType = 0;
+	event.iError = 0;
+	//
+	// check for critical error
+	//
+	if ( FindCloseEvent() != KErrNotFound )
+		{
+		event.iType = EClose;
+		TRAP_IGNORE( iHandler->HandleDbEventL( event ) );
+		return; // some database problem - UI should close
+		}
+	
+	//
+	// check if only one profile has changed
+	//
+	TInt index = FindSingleProfileEvent();
+	if ( index != KErrNotFound )
+		{
+		TNSmlDMDbEvent e = iList[index];
+        if (e.iType == MSyncMLEventObserver::EProfileDeleted)
+			{
+			event.iType = EDelete;
+			event.iProfileId = e.iProfileId; 
+			}
+		else
+			{
+			event.iType = EUpdate;
+			event.iProfileId = e.iProfileId; 
+			}
+	
+		TRAP_IGNORE( iHandler->HandleDbEventL( event ) );
+        return;
+		}
+		
+	//
+	// check if 2 or more profiles have changed
+	//
+	if (FindProfileEvent() != KErrNotFound)
+		{
+	    event.iType = EUpdateAll;
+    	TRAP_IGNORE( iHandler->HandleDbEventL( event ) );
+        return;
+    	}
+	}
+
+// -----------------------------------------------------------------------------
+// CNSmlDMDbNotifier::FindCloseEvent
+// -----------------------------------------------------------------------------
+//
+TInt CNSmlDMDbNotifier::FindCloseEvent()
+	{
+	TInt count = iList.Count();
+
+	for ( TInt index = 0; index < count; index++ )
+		{
+		TNSmlDMDbEvent event = iList[index];
+		if ( event.iType == MSyncMLEventObserver::EServerTerminated )
+			{
+			return index;
+			}
+		}
+
+	return KErrNotFound;
+	}
+
+// -----------------------------------------------------------------------------
+// CNSmlDMDbNotifier::FindProfileEvent
+// -----------------------------------------------------------------------------
+//
+TInt CNSmlDMDbNotifier::FindProfileEvent()
+	{
+	TInt count = iList.Count();
+
+    for ( TInt index = 0; index < count; index++ )
+		{
+		TNSmlDMDbEvent event = iList[index];
+		if ( event.iProfileId != KErrNotFound )
+			{
+			return index;
+			}
+		}
+
+	return KErrNotFound;
+	}
+
+// -----------------------------------------------------------------------------
+// CNSmlDMDbNotifier::FindSingleProfileEvent
+// -----------------------------------------------------------------------------
+//
+TInt CNSmlDMDbNotifier::FindSingleProfileEvent()
+	{
+	TInt count = iList.Count();
+
+	// find out whether list contains update events for one profile only
+	for ( TInt index = 0; index < count; index++ )
+		{
+		TNSmlDMDbEvent event = iList[index];
+		if ( event.iProfileId != KErrNotFound &&
+		     IsUniqueProfileId(event.iProfileId) )
+			{
+			return index;
+        	}
+		}
+
+	return KErrNotFound;
+	}
+
+// -----------------------------------------------------------------------------
+// CNSmlDMDbNotifier::IsUniqueProfileId
+// -----------------------------------------------------------------------------
+//
+TBool CNSmlDMDbNotifier::IsUniqueProfileId( TInt aId )
+	{
+	TInt count = iList.Count();
+
+    for ( TInt index = 0; index < count; index++ )
+		{
+		TNSmlDMDbEvent event = iList[index];
+		if ( event.iProfileId != KErrNotFound && event.iProfileId != aId )
+			{
+			return EFalse;
+			}
+		}
+
+	return ETrue;
+	}
+
+// -----------------------------------------------------------------------------
+// CNSmlDMDbNotifier::HandleActiveCallL
+// -----------------------------------------------------------------------------
+//
+void CNSmlDMDbNotifier::HandleActiveCallL()
+	{
+	if ( iDisabled )
+		{
+		return;  // UI has disabled notifications
+		}
+
+	if ( iSyncRunning )
+		{
+		return; // no UI updates while syncing
+		}
+
+	CallObserver();
+	Reset();
+	}
+
+// End of File
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/deviceupdates/src/nsmldmsyncappengine.cpp	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,367 @@
+/*
+* 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:  Methods for CNSmlDMSyncAppEngine
+*
+*/
+
+
+#include <collate.h>
+#include <e32property.h>
+#include "nsmldmsyncappengine.h"
+#include "nsmldmsyncdebug.h"
+#include "nsmldmsynchandler.h"
+#include "nsmldmsyncinternalpskeys.h"
+#include "dminforetrieval.h"
+
+// ============================ MEMBER FUNCTIONS ==============================
+//
+
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncAppEngine::CNSmlDMSyncAppEngine
+// C++ default constructor can NOT contain any code, that
+// might leave.
+// -----------------------------------------------------------------------------
+//
+CNSmlDMSyncAppEngine::CNSmlDMSyncAppEngine() : iProgressShown( ETrue )
+	{
+	FLOG( "[OMADM] CNSmlDMSyncAppEngine::CNSmlDMSyncAppEngine:" );
+	
+	}
+
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncAppEngine::ConstructL
+// Symbian 2nd phase constructor can leave.
+// -----------------------------------------------------------------------------
+//
+void CNSmlDMSyncAppEngine::ConstructL(DmInfo* dmcallback)
+    {
+    FLOG( "[OMADM] CNSmlDMSyncAppEngine::ConstructL:" );
+    
+    iSyncMLSession.OpenL();  
+    iDmcallback = dmcallback;
+    iSyncHandler = CNSmlDMSyncHandler::NewL( &iSyncMLSession,
+                                             this );
+    }
+
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncAppEngine::NewL
+// Two-phased constructor.
+// -----------------------------------------------------------------------------
+//
+CNSmlDMSyncAppEngine* CNSmlDMSyncAppEngine::NewL(DmInfo* dmcallback )
+	{
+	FLOG( "[OMADM] CNSmlDMSyncAppEngine::NewL:" );
+	
+	CNSmlDMSyncAppEngine* self = new( ELeave ) CNSmlDMSyncAppEngine();
+    CleanupStack::PushL( self );
+    self->ConstructL( dmcallback );
+    CleanupStack::Pop();
+
+    return self;
+	}
+
+// ------------------------------------------------------------------------------
+// Destructor
+// ------------------------------------------------------------------------------
+//
+CNSmlDMSyncAppEngine::~CNSmlDMSyncAppEngine()
+    {
+    FLOG( "[OMADM] CNSmlDMSyncAppEngine::~CNSmlDMSyncAppEngine:" );
+    
+    delete iSyncHandler;
+    delete iProfile;        
+    iSyncMLSession.Close();
+	}
+
+// ------------------------------------------------------------------------------
+// CNSmlDMSyncAppEngine::DeleteProfileL
+// ------------------------------------------------------------------------------
+//
+void CNSmlDMSyncAppEngine::DeleteProfileL( TInt aProfileId )
+    {
+    FLOG( "[OMADM] CNSmlDMSyncAppEngine::DeleteProfileL:" );
+    
+    delete iProfile;
+    iProfile = NULL;
+    iSyncMLSession.DeleteProfileL( aProfileId );
+	}
+
+// ------------------------------------------------------------------------------
+// CNSmlDMSyncAppEngine::CreateProfileL
+// ------------------------------------------------------------------------------
+//
+TInt CNSmlDMSyncAppEngine::CreateProfileL()
+    {
+    FLOG( "[OMADM] CNSmlDMSyncAppEngine::CreateProfileL:" );
+    
+    delete iProfile;
+    iProfile = NULL;
+    iProfile = CNSmlDMSyncProfile::NewL( KUidSmlSyncApp.iUid, &iSyncMLSession );
+    return iProfile->CreateL();
+	}
+
+// ------------------------------------------------------------------------------
+// CNSmlDMSyncAppEngine::Profile
+// ------------------------------------------------------------------------------
+//
+CNSmlDMSyncProfile* CNSmlDMSyncAppEngine::Profile( )
+    {
+    FLOG( "[OMADM] CNSmlDMSyncAppEngine::Profile:" );
+    
+    return iProfile;
+	}
+	
+// ------------------------------------------------------------------------------
+// CNSmlDMSyncAppEngine::CreateCopyProfileL
+// ------------------------------------------------------------------------------
+//
+CNSmlDMSyncProfile* CNSmlDMSyncAppEngine::CreateCopyProfileL( TInt aProfileId )
+    {
+    FLOG( "[OMADM] CNSmlDMSyncAppEngine::CreateCopyProfileL:" );
+    
+    delete iProfile;
+    iProfile = NULL;
+    iProfile = CNSmlDMSyncProfile::NewL( KUidSmlSyncApp.iUid, &iSyncMLSession );
+    
+    iProfile->CreateCopyL( aProfileId );
+    return iProfile;
+    }
+
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncAppEngine::Session
+// -----------------------------------------------------------------------------
+//
+RSyncMLSession* CNSmlDMSyncAppEngine::Session()
+	{
+	FLOG( "[OMADM] CNSmlDMSyncAppEngine::Session:" );
+	
+	return &iSyncMLSession;
+	}
+
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncAppEngine::OpenL
+// -----------------------------------------------------------------------------
+//
+CNSmlDMSyncProfile* CNSmlDMSyncAppEngine::OpenProfileL( TInt aProfileId,
+                                                        TInt aOpenMode )
+    {
+	FLOG( "[OMADM] CNSmlDMSyncAppEngine::OpenL:" );
+	
+    delete iProfile;
+    iProfile = NULL;
+    iProfile = CNSmlDMSyncProfile::NewL( KUidSmlSyncApp.iUid, &iSyncMLSession );
+   	iProfile->OpenL( aProfileId, aOpenMode );
+   	return iProfile;
+    }
+
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncAppEngine::Close
+// -----------------------------------------------------------------------------
+//
+void CNSmlDMSyncAppEngine::CloseProfile()
+    {
+    FLOG(  "[OMADM] CNSmlDMSyncAppEngine::Close:" );
+
+    delete iProfile;
+    iProfile = NULL;
+    }
+    
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncAppEngine::SynchronizeL
+// -----------------------------------------------------------------------------
+//
+void CNSmlDMSyncAppEngine::SynchronizeL( TDesC& aServerName,
+                                         TInt aProfileId,
+                                         TInt aConnectionBearer,
+                                         const TBool aUseFotaProgressNote )
+    {
+    FLOG( "[OMADM] CNSmlDMSyncAppEngine::SynchronizeL:" );
+    	
+    iProgressShown = ETrue;
+    iSyncHandler->SynchronizeL( aServerName,
+                                aProfileId,
+                                aConnectionBearer,
+                                aUseFotaProgressNote );
+    }
+    
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncAppEngine::SynchronizeL
+// -----------------------------------------------------------------------------
+//
+void CNSmlDMSyncAppEngine::SynchronizeL( TDesC& aServerName,
+                                         TInt aProfileId,
+                                         TInt aJobId,
+                                         TInt aConnectionBearer,
+                                         const TBool aUseFotaProgressNote )
+    {
+   	FLOG( "[OMADM] CNSmlDMSyncAppEngine::SynchronizeL:" );
+
+    iProgressShown = ETrue;
+  TInt err = RProperty::Set( KPSUidNSmlDMSyncApp,
+    				KDmJobCancel, KErrNone );
+    FTRACE(FPrint(
+    	_L("CNSmlDMSyncAppEngine::SynchronizeL()KDmJobCancel reset to 0 err = %d"),
+    										err ) );
+    iSyncHandler->SynchronizeL( aServerName, 
+                                aProfileId, 
+                                aJobId, 
+                                aConnectionBearer,
+                                aUseFotaProgressNote );
+    }
+
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncAppEngine::ShowProgressDialogL
+// -----------------------------------------------------------------------------
+//
+void CNSmlDMSyncAppEngine::ShowProgressDialogL( TBool aShow )
+    {
+ 	FLOG( "[OMADM] CNSmlDMSyncAppEngine::ShowProgressDialog()" );
+    
+    if ( aShow != iProgressShown )
+        {
+        if ( aShow )
+            {
+            iSyncHandler->ShowProgressDialogL();
+            }
+        else
+            {
+            iSyncHandler->HideProgressDialogL();
+            }
+        iProgressShown = aShow;
+        }
+    }
+    
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncAppEngine::ServerIdFoundL
+// -----------------------------------------------------------------------------
+//    
+TBool CNSmlDMSyncAppEngine::ServerIdFoundL( const TDesC& aServerId,
+                                            const TInt aProfileId )
+    {
+    FLOG( "[OMADM] CNSmlDMSyncAppEngine::ServerIdFoundL:" );
+    
+	RArray<TSmlProfileId> arr;
+    iSyncMLSession.ListProfilesL( arr, ESmlDevMan );
+    TBool ret = EFalse;
+   	CleanupClosePushL(arr);
+   	
+	for ( TInt index = 0; index < arr.Count(); index++ )
+		{
+	    TRAPD( error, OpenProfileL( arr[index], ESmlOpenRead ) );
+	    if ( error == KErrNone )
+	        {
+	        if ( aProfileId != Profile()->ProfileId() )
+	            {	        
+    	        TBuf<KNSmlMaxItemLength> buf;
+    	        Profile()->GetServerId( buf );
+    	        if ( buf.Compare( aServerId ) == 0 )
+    	            {
+    	            FLOG( "[OMADM] CNSmlDMSyncAppEngine::ServerIdFoundL: Match" );
+                    ret = ETrue;
+                    CloseProfile();
+                    break;
+                    }
+	            }
+		    CloseProfile();
+	        }
+		}
+    CleanupStack::PopAndDestroy( &arr );
+    return ret;
+    }
+
+// -----------------------------------------------------------------------------
+//  CNSmlDMSyncAppEngine::Compare
+// -----------------------------------------------------------------------------
+//
+TInt CNSmlDMSyncAppEngine::Compare( const TDesC& aLeft, const TDesC& aRight )
+	{
+	FLOG( "[OMADM] CNSmlDMSyncAppEngine::Compare:" );
+	
+	// Empty Name() is always greater than non-empty Name()
+    if (aLeft.Length() == 0 && aRight.Length() == 0)
+        {
+        return 0;
+        }
+    if (aLeft.Length() == 0)
+        {
+        return 1;
+        }
+    if (aRight.Length() == 0)
+        {
+        return -1;
+        }
+
+    // None of the Name()s was empty, use TDesC::CompareC to do the comparison.
+    // This is from cntmodel.
+    TCollationMethod collateMethod;
+    // get the standard method
+	collateMethod = *Mem::CollationMethodByIndex(0);
+    // dont ignore punctuation and spaces
+	collateMethod.iFlags |= TCollationMethod::EIgnoreNone; 
+	TInt comparison( aLeft.CompareC(aRight, 3, &collateMethod) );
+	return comparison;	
+	}
+	
+// -----------------------------------------------------------------------------
+//  CNSmlDMSyncAppEngine::SyncRunning
+// -----------------------------------------------------------------------------
+//
+TBool CNSmlDMSyncAppEngine::SyncRunning()
+    {
+    FLOG( "[OMADM] CNSmlDMSyncAppEngine::SyncRunning:" );
+    
+    return iSyncHandler->SyncRunning();
+    }
+
+// -----------------------------------------------------------------------------
+//  CNSmlDMSyncAppEngine::CancelSyncL
+// -----------------------------------------------------------------------------
+//
+void CNSmlDMSyncAppEngine::CancelSyncL()
+    {
+    FLOG( "[OMADM] CNSmlDMSyncAppEngine::CancelSyncL()" );
+    iSyncHandler->CancelSynchronizeL();
+    }
+
+// -----------------------------------------------------------------------------
+//  CNSmlDMSyncAppEngine::SyncCompleted
+// -----------------------------------------------------------------------------
+//
+void CNSmlDMSyncAppEngine::SyncCompleted( TNSmlStatus aStatus )
+    {
+    FLOG( "[OMADM] CNSmlDMSyncAppEngine::SyncCompleted:" );
+    iDmcallback->synccomplete(aStatus);
+    if( iSyncObserver )
+        {
+        FLOG( "[OMADM] CNSmlDMSyncAppEngine::SyncCompleted: inform observer" );        
+        iSyncObserver->SyncComplete( aStatus );
+        }    
+    }
+    
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncAppEngine::RequestSyncStatus
+// -----------------------------------------------------------------------------
+//	
+void CNSmlDMSyncAppEngine::RequestSyncStatus( 
+                                           MNSmlDMSyncObserver* aSyncObserver )
+    {
+    FLOG( "[OMADM] CNSmlDMSyncAppEngine::RequestSyncStatus:" );    
+    if( aSyncObserver )
+        {
+        FLOG( "[OMADM] CNSmlDMSyncAppEngine::RequestSyncStatus: added observer" );
+        iSyncObserver = aSyncObserver;
+        }
+    }
+
+// End of File
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/deviceupdates/src/nsmldmsynchandler.cpp	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,456 @@
+/*
+* 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: Implementation of DM UI component
+* 	This is part of omadmappui.
+*
+*/
+
+
+// INCLUDES
+
+#include <textresolver.h>   // for CTextResolver
+#include <e32property.h>
+#include <data_caging_path_literals.hrh>  // for resource and bitmap directories
+#include <SyncMLErr.h>      // sync error codes
+#include <DevManInternalCRKeys.h>
+#include <centralrepository.h>
+#include <featmgr.h>
+#include "nsmldmsynchandler.h"
+#include "nsmldmsyncdebug.h"
+#include "nsmldmsyncinternalpskeys.h"
+
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncHandler::NewL
+//
+// Two-phased constructor.
+// -----------------------------------------------------------------------------
+//
+CNSmlDMSyncHandler* CNSmlDMSyncHandler::NewL( RSyncMLSession* aSyncSession,
+                                              CNSmlDMSyncAppEngine* aAppEngine )
+    {
+	FLOG( "CNSmlDMSyncHandler::NewL()" );
+
+    CNSmlDMSyncHandler* self =
+        new (ELeave) CNSmlDMSyncHandler( aSyncSession,
+                                         aAppEngine);
+	CleanupStack::PushL(self);
+	self->ConstructL();
+	CleanupStack::Pop(self);
+    return self;
+    }
+
+// -----------------------------------------------------------------------------
+// Destructor.
+// -----------------------------------------------------------------------------
+//
+CNSmlDMSyncHandler::~CNSmlDMSyncHandler()
+    {
+    FLOG( "CNSmlDMSyncHandler::~CNSmlDMSyncHandler()" );     
+	delete iActiveCaller;
+
+	if ( iSyncRunning )
+	    {
+	    TRAP_IGNORE( iSyncJob.StopL() );
+        iSyncJob.Close();
+	    }
+	  FeatureManager::UnInitializeLib();
+	FLOG( "CNSmlDMSyncHandler::~CNSmlDMSyncHandler() completed" );
+    }
+
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncHandler::ConstructL
+// Symbian 2nd phase constructor can leave.
+// -----------------------------------------------------------------------------
+//
+void CNSmlDMSyncHandler::ConstructL( void )
+    {
+    FLOG( "CNSmlDMSyncHandler::ConstructL" );
+   FeatureManager::InitializeLibL();   	
+	iActiveCaller = CNSmlDMActiveCaller::NewL(this);
+	iServerAlertedSync = EFalse;
+	iSyncRunning = EFalse;
+	iSyncError = KErrNone;	
+	iCheckUpdate = EFalse;	
+    }
+
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncHandler::CNSmlDMSyncHandler
+// -----------------------------------------------------------------------------
+//
+CNSmlDMSyncHandler::CNSmlDMSyncHandler( RSyncMLSession* aSyncSession,
+                                        CNSmlDMSyncAppEngine* aAppEngine) 
+    : iSyncSession( aSyncSession ),
+    iSyncAppEngine( aAppEngine )   
+	{
+	}
+
+
+
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncHandler::SynchronizeL
+// -----------------------------------------------------------------------------
+//
+void CNSmlDMSyncHandler::SynchronizeL( TDesC& aServerName,
+                                       const TInt aProfileId,
+                                       const TInt aJobId,
+                                       const TInt aConnectionBearer,
+                                       const TBool aUseFotaProgressNote )
+	{
+	FLOG( "CNSmlDMSyncHandler::SynchronizeL Server alert" );
+	
+	iServerName = aServerName;
+	iConnectionBearer = aConnectionBearer;
+    iProfileId = aProfileId;
+    iJobId = aJobId;
+    iUseFotaProgressNote = aUseFotaProgressNote;
+    
+    iSyncJob.OpenL( Session(), iJobId );
+    iSyncJobId = iSyncJob.Identifier();
+    FTRACE( FPrint( _L(
+	    "[OMADM]\tCNSmlDMSyncHandler::SynchronizeL--server alert, iSyncJobId = %d" ),
+	     iSyncJobId ) ); 
+	  //SAN Support
+	  iServerAlertedSync = ETrue;  
+	                      
+	  //SAN Support
+    SynchronizeL();
+	}
+	
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncHandler::SynchronizeL
+// -----------------------------------------------------------------------------
+//
+void CNSmlDMSyncHandler::SynchronizeL( TDesC& aServerName,
+                                       const TInt aProfileId,
+                                       const TInt aConnectionBearer,
+                                       const TBool aUseFotaProgressNote )
+    {
+    FLOG( "CNSmlDMSyncHandler::SynchronizeL" );
+
+    iServerName = aServerName;
+    iConnectionBearer = aConnectionBearer;
+    iProfileId = aProfileId;
+    iUseFotaProgressNote = aUseFotaProgressNote;
+
+    iSyncJob.CreateL( Session(), iProfileId );
+    iSyncJobId = iSyncJob.Identifier();
+    SynchronizeL();
+    
+    
+    FTRACE( FPrint( _L(
+	    "[OMADM]\tCNSmlDMSyncHandler::SynchronizeL--UI initiated, iSyncJobId = %d" ),
+	     iSyncJobId ) );       
+	}
+	
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncHandler::SynchronizeL
+// -----------------------------------------------------------------------------
+//
+void CNSmlDMSyncHandler::SynchronizeL()
+	{
+	FLOG( "CNSmlDMSyncHandler::SynchronizeL" );
+	
+	TInt err = KErrNone;
+	
+	// for MSyncMLEventObserver events
+	TRAP( err, Session().RequestEventL(*this) );
+	if ( err != KErrNone )
+		{
+		iSyncJob.StopL();
+		iSyncJob.Close();
+		User::Leave(err);
+		}
+    
+    // for MSyncMLProgressObserver events
+    TRAP( err, Session().RequestProgressL(*this) );
+	if ( err != KErrNone )
+		{
+		Session().CancelEvent();
+		iSyncJob.StopL();
+		iSyncJob.Close();
+		User::Leave( err );
+		}
+	
+	   
+	
+	TRAP( err, ShowProgressDialogL() );
+	if ( err != KErrNone )
+		{
+		Session().CancelEvent();
+		Session().CancelProgress();
+		iSyncJob.StopL();
+		iSyncJob.Close();
+		User::Leave( err );
+		}
+	FLOG( "CNSmlDMSyncHandler::SynchronizeL Sync is running" );
+
+    //iSyncDocument->MarkFwUpdChangesStartL();
+	
+	iSyncRunning = ETrue;
+	iSyncError = KErrNone;
+	}
+
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncHandler::SynchronizeCompletedL
+// -----------------------------------------------------------------------------
+//
+void CNSmlDMSyncHandler::SynchronizeCompletedL( TInt aError )
+	{
+    FTRACE( FPrint(
+        _L("[OMADM]\t CNSmlDMSyncHandler::SynchronizeCompletedL(), aError = %d"),
+        aError ) );
+	
+	if ( !SyncRunning() )
+		{
+		FLOG( "CNSmlDMSyncHandler::SynchronizeCompletedL already completed" );
+		return;  // sync has already completed
+		}
+		
+    iSyncJob.Close();
+    
+     FTRACE( FPrint( _L(
+	    "[OMADM]\tCNSmlDMSyncHandler::SynchronizecompletedL, iSyncJobId = %d" ),
+	     KNSmlDMNoUserInitiatedJob ) );
+   	
+	iSyncRunning = EFalse;
+	iSyncError = aError;    
+    iCheckUpdate = EFalse;        	
+
+	iUseFotaProgressNote = EFalse;
+    iSyncJob.Close();
+    
+	// handle error in HandleActiveCallL (when active caller completes)
+	iActiveCaller->Start( aError );
+
+	FLOG( "CNSmlDMSyncHandler::SynchronizeCompletedL() completed" );
+	}
+
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncHandler::OnSyncMLSessionEvent
+// -----------------------------------------------------------------------------
+//
+void CNSmlDMSyncHandler::OnSyncMLSessionEvent( TEvent aEvent,
+                                               TInt aIdentifier,
+                                               TInt aError,
+                                               TInt /*aAdditionalData*/ )
+	{
+	FTRACE( FPrint( _L(
+	    "[OMADM]\tCNSmlDMSyncHandler::OnSyncMLSessionEvent(), aEvent = %d, aIdentifier = %d, aError = %d" ),
+	    aEvent, aIdentifier, aError ) );
+	FTRACE( RDebug::Print( _L(
+	    "[OMADM]\tCNSmlDMSyncHandler::OnSyncMLSessionEvent(), aEvent = %d, aIdentifier = %d, aError = %d" ),
+	    aEvent, aIdentifier, aError ) );
+
+	if ( aEvent == EJobStop
+	    || aEvent == EJobStartFailed
+	    || aEvent == EJobRejected )
+		{
+    	FTRACE( RDebug::Print( _L(
+    	    "[OMADM]\tCNSmlDMSyncHandler::OnSyncMLSessionEvent(), iSyncJobId = %d" ),
+    	    iSyncJobId ) );
+    	  FTRACE( FPrint( _L(
+    	    "[OMADM]\tCNSmlDMSyncHandler::OnSyncMLSessionEvent(), iSyncJobId = %d" ),
+    	    iSyncJobId ) );  
+			
+		if ( iSyncJobId == aIdentifier )
+			{
+			FLOG( "CNSmlDMSyncHandler::OnSyncMLSessionEvent EJobStop close" );
+			
+            TRAP_IGNORE( SynchronizeCompletedL( aError ) );
+			}
+		}
+    FLOG( "[OMADM]\tCNSmlDMSyncHandler::OnSyncMLSessionEvent() completed" );
+    }
+
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncHandler::OnSyncMLSyncError
+// -----------------------------------------------------------------------------
+//
+void CNSmlDMSyncHandler::OnSyncMLSyncError( TErrorLevel aErrorLevel,
+                                            TInt aError,
+                                            TInt /*aTaskId*/,
+                                            TInt /*aInfo1*/,
+                                            TInt /*aInfo2*/)
+	{
+	FTRACE( FPrint( _L(
+	    "[OMADM]\tCNSmlDMSyncHandler::OnSyncMLSyncError(), aErrorLevel = %d, aError = %d"),
+	    aErrorLevel, aError ) );
+	    FTRACE( RDebug::Print(
+	          _L("CNSmlDMSyncHandler::OnSyncMLSyncProgress  aErrorLevel =(%d) aError =(%d)"), aErrorLevel, aError  ) );
+	
+	if ( aErrorLevel == ESmlFatalError )
+		{
+        TRAP_IGNORE( SynchronizeCompletedL( aError ) );
+		}
+    FLOG( "[OMADM]\tCNSmlDMSyncHandler::OnSyncMLSyncError() completed" );
+	}
+
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncHandler::OnSyncMLSyncProgress
+// -----------------------------------------------------------------------------
+//
+void CNSmlDMSyncHandler::OnSyncMLSyncProgress( TStatus aStatus,
+                                               TInt /*aInfo1*/,
+                                               TInt /*aInfo2*/ )
+	{
+	FTRACE( RDebug::Print(
+	          _L("CNSmlDMSyncHandler::OnSyncMLSyncProgress (%d)"), aStatus ) );
+	
+	switch (aStatus)
+		{
+		case ESmlConnecting:
+		    //State()->SetSyncPhase( CNSmlDMSyncState::EPhaseConnecting );
+		    break;
+		case ESmlConnected:
+		    break;
+		case ESmlLoggingOn:
+		    break;
+		case ESmlLoggedOn:
+		    
+		    break;
+		case ESmlDisconnected:
+		    
+		    break;
+		case ESmlCompleted:
+		   
+		    break;
+		case ESmlProcessingServerCommands:
+		   
+		    break;
+		case ESmlReceivingServerCommands:
+		   
+		    break;
+		
+		case ESmlSendingModificationsToServer:
+		    {		   		    
+		    break;
+		    }
+		
+		default:
+		    break;
+		}    
+	}
+
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncHandler::OnSyncMLDataSyncModifications
+// -----------------------------------------------------------------------------
+//
+void CNSmlDMSyncHandler::OnSyncMLDataSyncModifications( TInt /*aTaskId*/,
+                   const TSyncMLDataSyncModifications& /*aClientModifications*/,
+                   const TSyncMLDataSyncModifications& /*aServerModifications*/ )
+    {
+    FLOG( "CNSmlDMSyncHandler::OnSyncMLDataSyncModifications" );
+
+    }
+
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncHandler::HandleActiveCallL
+// -----------------------------------------------------------------------------
+//
+void CNSmlDMSyncHandler::HandleActiveCallL()
+	{
+    FLOG( "CNSmlDMSyncHandler::HandleActiveCallL" );
+    
+    // HandleSyncErrorL will set this to true if
+    // sync will be retried.
+    iRetrySync = EFalse;
+
+	if ( (iSyncError != KErrNone) && (iSyncError != KErrCancel) )
+		{
+		TRAP_IGNORE( HandleSyncErrorL() );
+		}
+	if ( iRetrySync == EFalse )
+		{
+	    // Inform parent that sync is done.
+	    iSyncAppEngine->SyncCompleted( ENSmlSyncComplete );		
+		}
+	}
+
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncHandler::HandleSyncErrorL
+// -----------------------------------------------------------------------------
+//
+void CNSmlDMSyncHandler::HandleSyncErrorL()
+	{
+	FLOG( "CNSmlDMSyncHandler::HandleSyncErrorL" );
+	
+	if ( iSyncError != KDMErr )
+		{
+		}
+	if ( ( iSyncError == SyncMLError::KErrAuthenticationFailure ) ||
+	    ( iSyncError == SyncMLError::KErrTransportAuthenticationFailure ) )
+        {
+	    FLOG( "CNSmlDMSyncHandler::HandleSyncErrorL ask username" );
+        }
+    }
+	
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncHandler::ShowProgressDialogL
+// -----------------------------------------------------------------------------
+//
+void CNSmlDMSyncHandler::ShowProgressDialogL( )
+	{
+	FLOG( "CNSmlDMSyncHandler::ShowProgressDialogL" );
+	
+	FLOG( "CNSmlDMSyncHandler::ShowProgressDialogL() completed" );
+	}
+
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncHandler::HideProgressDialogL
+// -----------------------------------------------------------------------------
+//
+void CNSmlDMSyncHandler::HideProgressDialogL()
+    {
+    FLOG( "CNSmlDMSyncHandler::HideProgressDialogL" );
+    }
+
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncHandler::Session
+// -----------------------------------------------------------------------------
+//
+RSyncMLSession& CNSmlDMSyncHandler::Session()
+	{
+	__ASSERT_DEBUG(iSyncSession, TUtil::Panic(KErrGeneral));
+	
+	return *iSyncSession;
+	}
+
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncHandler::SyncRunning
+// -----------------------------------------------------------------------------
+//
+TBool CNSmlDMSyncHandler::SyncRunning()
+	{
+	FTRACE( RDebug::Print(
+	          _L("CNSmlDMSyncHandler::SyncRunning status (%d)"), iSyncRunning ) );
+	          
+	return iSyncRunning;
+	}
+
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncHandler::CancelSynchronizeL
+// -----------------------------------------------------------------------------
+//		
+void CNSmlDMSyncHandler::CancelSynchronizeL()
+    {
+    FLOG( "CNSmlDMSyncHandler::CancelSynchronizeL" );
+    
+    if ( iSyncRunning )
+        {
+        iSyncJob.StopL();
+        SynchronizeCompletedL( KErrCancel );
+        }
+    }
+
+// End of File
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/deviceupdates/src/nsmldmsyncprofile.cpp	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,1108 @@
+/*
+* 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:  Methods for CNSmlDMSyncProfile
+*
+*/
+
+
+#include <SyncMLTransportProperties.h>
+#include "nsmldmsyncprofile.h"
+#include "nsmldmdef.h"
+#include "nsmldmsyncdebug.h"
+#include "nsmldmsyncutil.h"
+
+// ============================ MEMBER FUNCTIONS ==============================
+//
+
+// -----------------------------------------------------------------------------
+// NewLC
+//
+// Two-phased constructor.
+// -----------------------------------------------------------------------------
+//
+CNSmlDMSyncProfile* CNSmlDMSyncProfile::NewLC( const TInt aApplicationId,
+                                               RSyncMLSession* aSyncSession )
+    {
+    FLOG( "[OMADM] CNSmlDMSyncProfile::NewLC()" );
+    
+    CNSmlDMSyncProfile* self = new( ELeave ) CNSmlDMSyncProfile( aApplicationId,
+                                                                 aSyncSession );
+	CleanupStack::PushL( self );
+	self->ConstructL();
+	return self;
+    }
+
+// -----------------------------------------------------------------------------
+// NewL
+//
+// Two-phased constructor.
+// -----------------------------------------------------------------------------
+//
+CNSmlDMSyncProfile* CNSmlDMSyncProfile::NewL( const TInt aApplicationId,
+                                              RSyncMLSession* aSyncSession )
+    {
+    FLOG( "[OMADM] CNSmlDMSyncProfile::NewL:" );
+    
+    CNSmlDMSyncProfile* self = new( ELeave ) CNSmlDMSyncProfile( aApplicationId,
+                                                                 aSyncSession );
+	CleanupStack::PushL( self );
+	self->ConstructL();
+	CleanupStack::Pop( self );
+	return self;
+    }
+
+// -----------------------------------------------------------------------------
+// Destructor.
+// -----------------------------------------------------------------------------
+//
+CNSmlDMSyncProfile::~CNSmlDMSyncProfile()
+    {
+    FLOG( "[OMADM] CNSmlDMSyncProfile::~CNSmlDMSyncProfile:" );
+    
+    iHistoryLog.Close();
+    iConnection.Close();
+    iProfile.Close();
+    }
+
+// -----------------------------------------------------------------------------
+// ConstructL
+//
+// Symbian 2nd phase constructor can leave.
+// -----------------------------------------------------------------------------
+//
+void CNSmlDMSyncProfile::ConstructL()
+    {
+    FLOG( "[OMADM] CNSmlDMSyncProfile::ConstructL:" );
+    }
+
+// -----------------------------------------------------------------------------
+// Constructor.
+// -----------------------------------------------------------------------------
+//
+CNSmlDMSyncProfile::CNSmlDMSyncProfile( const TInt aApplicationId,
+                                        RSyncMLSession* aSyncSession )
+	{
+	FLOG( "[OMADM] CNSmlDMSyncProfile::CNSmlDMSyncProfile:" );
+	
+	iSyncSession = aSyncSession;
+	iApplicationId = aApplicationId;
+	
+    iHistoryLogOpen = EFalse;
+    iConnectionOpen = EFalse;
+	}
+
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncProfile::OpenL
+// -----------------------------------------------------------------------------
+//
+void CNSmlDMSyncProfile::OpenL( TInt aProfileId, TInt aOpenMode )
+    {
+    FTRACE( FPrint(
+        _L("[OMADM] CNSmlDMSyncProfile::OpenL(), aProfileId = %d, aOpenMode = %d"),
+        aProfileId, aOpenMode ) );
+
+    if ( aOpenMode == EOpenRead )
+    	{
+    	iProfile.OpenL( *iSyncSession, aProfileId, ESmlOpenRead );
+    	}
+    else
+    	{
+    	iProfile.OpenL( *iSyncSession, aProfileId, ESmlOpenReadWrite );
+    	}
+    if ( !iConnectionOpen )
+		{
+    	OpenConnection();
+		}
+    FLOG( "[OMADM] CNSmlDMSyncProfile::OpenL() completed" );
+    }
+
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncProfile::CreateL
+// -----------------------------------------------------------------------------
+//
+TInt CNSmlDMSyncProfile::CreateL()
+    {
+    FLOG( "[OMADM] CNSmlDMSyncProfile::CreateL()" );
+    
+    iProfile.CreateL( *iSyncSession );
+    iProfile.SetCreatorId( iApplicationId );
+    iProfile.UpdateL();
+    TInt id = iProfile.Identifier();
+    iProfile.Close();
+
+    FLOG( "[OMADM] CNSmlDMSyncProfile::CreateL() completed" );
+    return id;
+    }
+
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncProfile::CreateCopyL
+// -----------------------------------------------------------------------------
+//
+void CNSmlDMSyncProfile::CreateCopyL( TInt aProfileId )
+    {
+    FLOG( "[OMADM] CNSmlDMSyncProfile::CreateCopyL()" );
+    
+    iProfile.CreateL( *iSyncSession );
+    iProfile.SetCreatorId( iApplicationId );
+    iProfile.UpdateL();
+    if ( !iConnectionOpen )
+		{
+    	OpenConnection();
+		}
+	if ( !iHistoryLogOpen )
+		{
+	    OpenHistoryLog();
+		}
+
+    CNSmlDMSyncProfile* profile = 
+                CNSmlDMSyncProfile::NewL( KUidSmlSyncApp.iUid, iSyncSession );
+    CleanupStack::PushL( profile );
+    profile->OpenL( aProfileId, ESmlOpenRead );
+    CopyValuesL( profile );
+    CleanupStack::PopAndDestroy( profile );
+    profile  = NULL;
+
+    iProfile.UpdateL();
+    CloseHistoryLog();
+    FLOG( "[OMADM] CNSmlDMSyncProfile::CreateCopyL() completed" );
+    }
+
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncProfile::SaveL
+// -----------------------------------------------------------------------------
+//
+void CNSmlDMSyncProfile::SaveL()
+    {
+    FLOG( "[OMADM] CNSmlDMSyncProfile::SaveL()" );
+    
+    iProfile.UpdateL();
+    if ( iConnectionOpen )
+    	{
+    	iConnection.UpdateL(); // IPC call
+    	}
+    iProfile.Close();
+    }
+
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncProfile::GetName
+// -----------------------------------------------------------------------------
+//
+void CNSmlDMSyncProfile::GetName( TDes& aText )
+	{
+	FLOG( "[OMADM] CNSmlDMSyncProfile::GetName()" );
+	
+    TUtil::StrCopy( aText, iProfile.DisplayName() );
+	}
+
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncProfile::SetNameL
+// -----------------------------------------------------------------------------
+//
+void CNSmlDMSyncProfile::SetNameL( const TDesC& aText )
+	{
+	FLOG( "[OMADM] CNSmlDMSyncProfile::SetNameL:" );
+	
+	iProfile.SetDisplayNameL( aText );
+	}
+
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncProfile::CreatorId
+// -----------------------------------------------------------------------------
+//
+TInt CNSmlDMSyncProfile::CreatorId()
+	{
+	FLOG( "[OMADM] CNSmlDMSyncProfile::CreatorId:" );
+	
+	return iProfile.CreatorId();
+	}
+
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncProfile::SetCreatorId
+// -----------------------------------------------------------------------------
+//
+void CNSmlDMSyncProfile::SetCreatorId( TInt aCreatorId )
+	{
+	FLOG( "[OMADM] CNSmlDMSyncProfile::SetCreatorId:" );
+	
+	iProfile.SetCreatorId( aCreatorId );
+	}
+
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncProfile::ProfileId
+// -----------------------------------------------------------------------------
+//
+TInt CNSmlDMSyncProfile::ProfileId()
+	{
+	FLOG( "[OMADM] CNSmlDMSyncProfile::ProfileId()" );
+    TInt retval = iProfile.Identifier();
+    FTRACE( FPrint( _L(
+	    "[OMADM] CNSmlDMSyncProfile::ProfileId() completed: Profile id = %d"),
+	    retval ) );
+    return retval;
+	}
+
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncProfile::DeleteAllowed
+// -----------------------------------------------------------------------------
+//
+TBool CNSmlDMSyncProfile::DeleteAllowed()
+	{
+	FLOG( "[OMADM] CNSmlDMSyncProfile::DeleteAllowed:" );
+	
+    return iProfile.DeleteAllowed();
+	}
+//-----------------------------------------------------------------------------
+// CNSmlDMSyncProfile::ProfileLocked()
+// -----------------------------------------------------------------------------
+//	
+TBool CNSmlDMSyncProfile::ProfileLocked()
+	{
+	FLOG( "[OMADM] CNSmlDMSyncProfile::DeleteAllowed:" );
+	
+    return iProfile.ProfileLocked(EFalse , EFalse);
+	}
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncProfile::IsSynced
+// -----------------------------------------------------------------------------
+//
+TBool CNSmlDMSyncProfile::IsSynced()
+    {
+    FLOG( "[OMADM] CNSmlDMSyncProfile::IsSynced()" );
+    
+    TBool retVal = EFalse;
+    if ( !iHistoryLogOpen )
+		{
+		FLOG( "[OMADM] CNSmlDMSyncProfile::IsSynced(): Opening history log" );
+	    OpenHistoryLog();
+		}
+		
+    if ( iHistoryLogOpen )
+    	{
+	    FTRACE( FPrint( _L(
+	        "[OMADM] CNSmlDMSyncProfile::IsSynced(): Log open! Log count = %d"),
+	                                                 iHistoryLog.Count() ) );
+    	if ( iHistoryLog.Count() > 0 )
+    	    {
+            const CSyncMLHistoryJob* job = LatestHistoryJob();
+            if ( job )
+            	{
+            	FLOG( "[OMADM] CNSmlDMSyncProfile::IsSynced(): True" );
+            	if( job->LastSuccessSyncTime() != NULL )
+                   {
+    	        retVal = ETrue;
+                   }
+            	}
+            else
+                {
+                FLOG( "[OMADM] CNSmlDMSyncProfile::IsSynced(): False" );
+                }
+    	    }
+    	}
+    else
+        {
+        FLOG( "[OMADM] CNSmlDMSyncProfile::IsSynced() Could not open history log!!!" );
+        }
+    CloseHistoryLog();    	
+
+    FLOG( "[OMADM] CNSmlDMSyncProfile::IsSynced() completed" );
+    return retVal;
+    }
+
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncProfile::LastSync
+// -----------------------------------------------------------------------------
+//
+TTime CNSmlDMSyncProfile::LastSync()
+    {
+    FLOG( "[OMADM] CNSmlDMSyncProfile::LastSync()" );
+
+    if ( !iHistoryLogOpen )
+		{
+		FLOG( "[OMADM] CNSmlDMSyncProfile::LastSync(): Opening history log" );
+	    OpenHistoryLog();
+		}
+    
+    TTime time = 0;
+    if ( iHistoryLogOpen )
+    	{
+	    FTRACE( FPrint( _L(
+	        "[OMADM] CNSmlDMSyncProfile::LastSync(): Log open! Log count = %d"),
+	                                                 iHistoryLog.Count() ) );
+    	
+    	if (iHistoryLog.Count() > 0)
+    	    {
+   	        const CSyncMLHistoryJob* job = LatestHistoryJob();
+            if ( job )
+            	{
+                FLOG( "[OMADM] CNSmlDMSyncProfile::LastSync() timestamp" );
+            	time = job->TimeStamp();
+            	}
+    	    }
+    	}
+    else
+        {
+        FLOG( "[OMADM] CNSmlDMSyncProfile::LastSync() Could not open history log!!!" );
+        }
+
+    CloseHistoryLog();    	
+
+    FLOG( "[OMADM] CNSmlDMSyncProfile::LastSync() completed" );
+    return time;
+    }
+
+TTime CNSmlDMSyncProfile::LastSuccessSync()
+{
+	FLOG( "[OMADM] CNSmlDMSyncProfile::LastSuccessSynctime()" );
+
+    if ( !iHistoryLogOpen )
+		{
+		FLOG( "[OMADM] CNSmlDMSyncProfile::LastSync(): Opening history log" );
+	    OpenHistoryLog();
+		}
+    
+    TTime time = 0;
+    if ( iHistoryLogOpen )
+    	{
+	    FTRACE( FPrint( _L(
+	        "[OMADM] CNSmlDMSyncProfile::LastSync(): Log open! Log count = %d"),
+	                                                 iHistoryLog.Count() ) );
+    	
+    	if (iHistoryLog.Count() > 0)
+    	    {
+   	        const CSyncMLHistoryJob* job = LatestHistoryJob();
+   	        iProfileId=ProfileId();
+            if ( job )
+            	{
+                FLOG( "[OMADM] CNSmlDMSyncProfile::LastSync() timestamp" );
+            	time = job->LastSuccessSyncTime();
+            	}
+    	    }
+    	}
+    else
+        {
+        FLOG( "[OMADM] CNSmlDMSyncProfile::LastSync() Could not open history log!!!" );
+        }
+
+    CloseHistoryLog();    	
+
+    FLOG( "[OMADM] CNSmlDMSyncProfile::LastSuccessSynctime() completed" );
+    return time;
+    }
+
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncProfile::GetServerIdL
+// -----------------------------------------------------------------------------
+//
+void CNSmlDMSyncProfile::GetServerId( TDes& aText )
+    {
+    FLOG( "[OMADM] CNSmlDMSyncProfile::GetServerIdL:" );
+    
+	TUtil::StrCopy(aText, iProfile.ServerId());
+	}
+
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncProfile::SetServerIdL
+// -----------------------------------------------------------------------------
+//
+void CNSmlDMSyncProfile::SetServerIdL( const TDesC& aText )
+	{
+	FLOG( "[OMADM] CNSmlDMSyncProfile::SetServerIdL:" );
+	
+	TBuf8<KBufSize256> buf;
+	TUtil::StrCopy(buf, aText);
+	iProfile.SetServerIdL(buf);
+	}
+
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncProfile::GetServerPassword
+// -----------------------------------------------------------------------------
+//
+void CNSmlDMSyncProfile::GetServerPassword(TDes& aText)
+	{
+	FLOG( "[OMADM] CNSmlDMSyncProfile::GetServerPassword:" );
+	
+	TUtil::StrCopy( aText, iProfile.ServerPassword() );
+	}
+	
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncProfile::SetServerPasswordL
+// -----------------------------------------------------------------------------
+//
+void CNSmlDMSyncProfile::SetServerPasswordL(const TDesC& aText)
+	{
+	FLOG( "[OMADM] CNSmlDMSyncProfile::SetServerPasswordL:" );
+	
+	TUtil::StrCopy(iBuf8, aText);    // conver TDes to TDes8
+	iProfile.SetServerPasswordL(iBuf8);
+	}
+
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncProfile::ProtocolVersion
+// -----------------------------------------------------------------------------
+//
+TInt CNSmlDMSyncProfile::ProtocolVersion()
+	{
+	FLOG( "[OMADM] CNSmlDMSyncProfile::ProtocolVersion:" );
+	
+	TSmlProtocolVersion version = iProfile.ProtocolVersion();
+	return version;
+	}
+	
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncProfile::SetProtocolVersionL
+// -----------------------------------------------------------------------------
+//
+void CNSmlDMSyncProfile::SetProtocolVersionL(TInt aProtocolVersion)
+	{
+	FLOG( "[OMADM] CNSmlDMSyncProfile::SetProtocolVersionL:" );
+	
+	iProfile.SetProtocolVersionL((TSmlProtocolVersion) aProtocolVersion);
+    }
+
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncProfile::BearerType
+// -----------------------------------------------------------------------------
+//
+TInt CNSmlDMSyncProfile::BearerType()
+	{
+	FLOG( "[OMADM] CNSmlDMSyncProfile::BearerType:" );
+	
+	TInt id = iConnection.Identifier();
+	
+	if (id == KUidNSmlMediumTypeInternet.iUid)
+		{
+		return EAspBearerInternet;
+		}
+	else if (id == KUidNSmlMediumTypeBluetooth.iUid)
+		{
+		return EAspBearerBlueTooth;
+		}
+	else
+		{
+		return EAspBearerInternet;
+		}
+    }
+	
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncProfile::SetBearerTypeL
+// -----------------------------------------------------------------------------
+//
+void CNSmlDMSyncProfile::SetBearerTypeL(TInt aId)
+	{
+	FLOG( "[OMADM] CNSmlDMSyncProfile::SetBearerTypeL:" );
+
+	if ( aId == EAspBearerInternet )
+		{
+		iConnection.CreateL( Profile(), KUidNSmlMediumTypeInternet.iUid );
+		}
+	else if ( aId == EAspBearerBlueTooth )
+		{
+		iConnection.CreateL( Profile(), KUidNSmlMediumTypeBluetooth.iUid );
+    	}
+	else
+        {
+        // Set default as Internet
+        iConnection.CreateL( Profile(), KUidNSmlMediumTypeInternet.iUid );
+        }
+	}
+
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncProfile::AccessPointL
+// -----------------------------------------------------------------------------
+//
+TInt CNSmlDMSyncProfile::AccessPointL()
+	{
+	FLOG( "[OMADM] CNSmlDMSyncProfile::AccessPointL:" );
+	
+	TInt num = KErrNotFound;
+	
+	if ( iConnectionOpen )
+		{
+	    if ( iConnection.Identifier() == KUidNSmlMediumTypeInternet.iUid )
+	        {
+        	TBuf8<KBufSize32> key;
+        	TBuf<KBufSize32> value;
+
+        	GetConnectionPropertyNameL( key, EPropertyIntenetAccessPoint );
+        	TUtil::StrCopy( value, iConnection.GetPropertyL( key ) );
+        	User::LeaveIfError( TUtil::StrToInt(value, num) );
+	        }
+		}
+	return num;
+	}
+	
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncProfile::SetAccessPointL
+// -----------------------------------------------------------------------------
+//
+void CNSmlDMSyncProfile::SetAccessPointL( const TInt aId )
+	{
+	FTRACE(RDebug::Print(
+	         _L("[OMADM] CNSmlDMSyncProfile::SetAccessPointL aId (%d)"), aId));
+
+	if ( iConnectionOpen )
+		{
+	    if ( iConnection.Identifier() == KUidNSmlMediumTypeInternet.iUid )
+	        { 
+	       	TBuf<KBufSize32> buf;
+        	TBuf8<KBufSize32> key;
+        	TBuf8<KBufSize32> value;
+        	
+        	buf.Num(aId);
+        	TUtil::StrCopy(value, buf);  // convert TDes to TDes8
+        	
+        	GetConnectionPropertyNameL(key, EPropertyIntenetAccessPoint);
+        	
+        	FTRACE(RDebug::Print(
+        	    _L("[OMADM] CNSmlDMSyncProfile::SetAccessPointL key (%S) value (%S)"),
+        	    &key, &value ) );
+        	    
+        	iConnection.SetPropertyL( key, value );
+	        }
+		}
+	}
+
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncProfile::GetHostAddressL
+// -----------------------------------------------------------------------------
+//
+void CNSmlDMSyncProfile::GetHostAddress(TDes& aText, TInt& aPort)
+	{
+	FLOG( "[OMADM] CNSmlDMSyncProfile::GetHostAddress:" );
+	aText = KNullDesC;
+	aPort = KDefaultHttpPort;
+	
+    if (!iConnectionOpen)	
+    	{
+      	return;
+    	}
+	
+	if (BearerType() != EAspBearerInternet)
+		{
+		TUtil::StrCopy(aText, iConnection.ServerURI()); // convert TDes8 to TDes
+		return;  // port number handling is for internet bearer only 
+		}
+	
+	TUtil::StrCopy( iBuf, iConnection.ServerURI() ); // convert TDes8 to TDes
+	
+	TURIParser parser( iBuf );
+	parser.GetUriWithoutPort( aText );
+	aPort = parser.Port();
+	if (aPort == KErrNotFound)
+		{
+		aPort = parser.DefaultPort();
+		}
+	}
+	
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncProfile::SetHostAddressL
+// -----------------------------------------------------------------------------
+//
+void CNSmlDMSyncProfile::SetHostAddressL( const TDesC& aText, const TInt aPort )
+	{
+	FLOG( "[OMADM] CNSmlDMSyncProfile::SetHostAddressL:" );
+	
+    if (!iConnectionOpen)	
+    	{
+    	return;
+    	}
+	if (BearerType() != EAspBearerInternet)
+		{
+		// port number handling is for internet bearer only 
+		TUtil::StrCopy(iBuf, aText); 
+		}
+	else
+		{
+		TURIParser parser(aText);
+	    parser.GetUri(iBuf, aPort);
+		}
+	
+	TUtil::StrCopy( iBuf8, iBuf );
+	iConnection.SetServerURIL( iBuf8 );
+	}
+
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncProfile::GetUserNameL
+// -----------------------------------------------------------------------------
+//
+void CNSmlDMSyncProfile::GetUserName(TDes& aText)
+	{
+	FLOG( "[OMADM] CNSmlDMSyncProfile::GetUserNameL:" );
+	
+	TUtil::StrCopy( aText, iProfile.UserName() );
+	}
+	
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncProfile::SetUserNameL
+// -----------------------------------------------------------------------------
+//
+void CNSmlDMSyncProfile::SetUserNameL(const TDesC& aText)
+	{
+	FLOG( "[OMADM] CNSmlDMSyncProfile::SetUserNameL:" );
+	
+	TUtil::StrCopy(iBuf8, aText);  // conver TDes to TDes8
+	iProfile.SetUserNameL(iBuf8);
+	}
+
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncProfile::GetPasswordL
+// -----------------------------------------------------------------------------
+//
+void CNSmlDMSyncProfile::GetPassword(TDes& aText)
+	{
+	FLOG( "[OMADM] CNSmlDMSyncProfile::GetPasswordL:" );
+	
+	TUtil::StrCopy( aText, iProfile.Password() );
+	}
+	
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncProfile::SetPasswordL
+// -----------------------------------------------------------------------------
+//
+void CNSmlDMSyncProfile::SetPasswordL(const TDesC& aText)
+	{
+	FLOG( "[OMADM] CNSmlDMSyncProfile::SetPasswordL:" );
+	TUtil::StrCopy( iBuf8, aText );    // conver TDes to TDes8
+	
+	FTRACE( RDebug::Print(
+	     _L("[OMADM] CNSmlDMSyncProfile::SetPasswordL iBuf8 (%S)"), &iBuf8 ) );
+	iProfile.SetPasswordL( iBuf8 );
+	}
+
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncProfile::SASyncState
+// -----------------------------------------------------------------------------
+//
+TInt CNSmlDMSyncProfile::SASyncState()
+	{
+	FLOG( "[OMADM] CNSmlDMSyncProfile::SASyncState()" );
+	
+	TSmlServerAlertedAction state = iProfile.SanUserInteraction();
+
+    FTRACE( FPrint(
+        _L( "[OMADM] CNSmlDMSyncProfile::SASyncState() completed, state = %d" ),
+        state ) );
+
+	if (state == ESmlConfirmSync)
+		{
+		return ESASyncStateConfirm;
+		}
+	else if (state == ESmlDisableSync)
+		{
+		return ESASyncStateDisable;
+		}
+	else 
+		{
+		return ESASyncStateEnable;
+		}
+	}
+
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncProfile::SetSASyncStateL
+// -----------------------------------------------------------------------------
+//
+void CNSmlDMSyncProfile::SetSASyncStateL(TInt aState)
+    {
+	if (aState == ESASyncStateConfirm)
+		{
+		FLOG( "[OMADM] CNSmlDMSyncProfile::SetSASyncStateL:ESmlConfirmSync" );
+		Profile().SetSanUserInteractionL(ESmlConfirmSync);
+		}
+	else if (aState == ESASyncStateDisable)
+		{
+		FLOG( "[OMADM] CNSmlDMSyncProfile::SetSASyncStateL:ESmlDisableSync" );
+		Profile().SetSanUserInteractionL(ESmlDisableSync);
+		}
+	else
+		{
+		FLOG( "[OMADM] CNSmlDMSyncProfile::SetSASyncStateL:ESmlEnableSync" );
+		Profile().SetSanUserInteractionL(ESmlEnableSync);
+		}
+    }
+
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncProfile::SetHttpUsed
+// -----------------------------------------------------------------------------
+//
+void CNSmlDMSyncProfile::SetHttpUsedL(TBool aEnable)
+	{
+	FLOG( "[OMADM] CNSmlDMSyncProfile::SetHttpUsed:" );
+
+    if ( iConnectionOpen )
+    	{
+    	if ( iConnection.Identifier() == KUidNSmlMediumTypeInternet.iUid )
+		    {
+        	TBuf8<KBufSize32> key;
+        	TBuf8<KBufSize32> value;
+        	
+        	if ( aEnable )
+        		{
+        		value.Num( KHttpUsed ); 
+        		}
+        	else
+        		{
+        		value.Num( KHttpNotUsed );
+        		}
+        		
+        	GetConnectionPropertyNameL( key, EPropertyHttpUsed );
+        	iConnection.SetPropertyL( key, value );
+		    }
+    	}
+	}
+
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncProfile::HttpUsedL
+// -----------------------------------------------------------------------------
+//
+TBool CNSmlDMSyncProfile::HttpUsedL()
+	{
+	FLOG( "[OMADM] CNSmlDMSyncProfile::HttpUsedL:" );
+    TBool retVal = EFalse; 
+    if ( iConnectionOpen )
+    	{
+    	if ( iConnection.Identifier() == KUidNSmlMediumTypeInternet.iUid )
+		    {
+        	TBuf8<KBufSize32> key; 
+        	TBuf<KBufSize32> value;
+        	TInt intValue;
+        	
+        	GetConnectionPropertyNameL(key, EPropertyHttpUsed);
+        	TUtil::StrCopy(value, iConnection.GetPropertyL(key));
+        	
+            User::LeaveIfError( TUtil::StrToInt( value, intValue ) );
+            
+            if ( intValue == 1 )
+            	{
+                retVal = ETrue;
+                }
+		    }
+    	}
+    return retVal;
+	}
+	
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncProfile::GetHttpUsernameL
+// -----------------------------------------------------------------------------
+//
+void CNSmlDMSyncProfile::GetHttpUserNameL( TDes& aText )
+	{
+	FLOG( "[OMADM] CNSmlDMSyncProfile::GetHttpUsernameL:" );
+
+	aText = KNullDesC;
+	
+    if ( iConnectionOpen )
+    	{
+    	if ( iConnection.Identifier() == KUidNSmlMediumTypeInternet.iUid )
+		    {
+        	TBuf8<KBufSize32> key; 
+        	
+        	GetConnectionPropertyNameL( key, EPropertyHttpUserName );
+        	TUtil::StrCopy( aText, iConnection.GetPropertyL( key ) );
+		    }
+    	}
+  	}
+	
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncProfile::SetHttpUsernameL
+// -----------------------------------------------------------------------------
+//
+void CNSmlDMSyncProfile::SetHttpUserNameL( const TDesC& aText )
+	{
+	FLOG( "[OMADM] CNSmlDMSyncProfile::SetHttpUsernameL:" );
+
+    if ( iConnectionOpen )
+    	{
+    	if ( iConnection.Identifier() == KUidNSmlMediumTypeInternet.iUid )
+		    {
+		    TBuf8<KBufSize32> key;
+	
+	        GetConnectionPropertyNameL( key, EPropertyHttpUserName );
+	        TUtil::StrCopy( iBuf8, aText );  // convert TDes to TDes8
+	        iConnection.SetPropertyL( key, iBuf8 );
+		    }
+    	}
+	}
+
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncProfile::GetHttpPasswordL
+// -----------------------------------------------------------------------------
+//
+void CNSmlDMSyncProfile::GetHttpPasswordL( TDes& aText )
+	{
+	FLOG( "[OMADM] CNSmlDMSyncProfile::GetHttpPasswordL:" );
+   	aText = KNullDesC;
+   	
+    if ( iConnectionOpen )
+    	{
+    	if ( iConnection.Identifier() == KUidNSmlMediumTypeInternet.iUid )
+		    {
+		    TBuf8<KBufSize32> key; 
+	        GetConnectionPropertyNameL( key, EPropertyHttpPassword );
+            TUtil::StrCopy( aText, iConnection.GetPropertyL( key ) );
+		    }
+    	}
+	}
+	
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncProfile::SetHttpPasswordL
+// -----------------------------------------------------------------------------
+//
+void CNSmlDMSyncProfile::SetHttpPasswordL( const TDesC& aText )
+	{
+	FLOG( "[OMADM] CNSmlDMSyncProfile::SetHttpPasswordL:" );
+
+    if ( iConnectionOpen )
+    	{
+    	if ( iConnection.Identifier() == KUidNSmlMediumTypeInternet.iUid )
+		    {
+        	TBuf8<KBufSize32> key;
+        	
+        	GetConnectionPropertyNameL( key, EPropertyHttpPassword );
+        	TUtil::StrCopy( iBuf8, aText );  // convert TDes to TDes8
+        	iConnection.SetPropertyL( key, iBuf8 );
+    	    }
+    	}
+	}
+ 
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncProfile::Profile
+// -----------------------------------------------------------------------------
+//
+RSyncMLDevManProfile& CNSmlDMSyncProfile::Profile()
+    {
+    FLOG( "[OMADM] CNSmlDMSyncProfile::Profile()" );
+    
+    return iProfile;
+    }
+
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncProfile::LatestHistoryJob
+// -----------------------------------------------------------------------------
+//
+const CSyncMLHistoryJob* CNSmlDMSyncProfile::LatestHistoryJob()
+    {
+    FLOG( "[OMADM] CNSmlDMSyncProfile::LatestHistoryJob:" );
+    
+    if ( !iHistoryLogOpen )
+		{
+        OpenHistoryLog();
+		}
+		
+    if ( iHistoryLogOpen )
+		{
+	    TInt count = iHistoryLog.Count();
+        FTRACE( FPrint( _L(
+            "[OMADM] CNSmlDMSyncProfile::LatestHistoryJob(): Log count %d"),
+            count ) );
+
+        if ( count == 0 )
+            {
+            FLOG( "[OMADM] CNSmlDMSyncProfile::LatestHistoryJob(): No history" );
+            return NULL;  // profile has no history job
+            }
+            
+        // sort array
+        iHistoryLog.SortEntries( CSyncMLHistoryEntry::ESortByTime );    
+        
+        // try to find latest sync job (start from last array entry)
+        for ( TInt index = count - 1; index >= 0; index-- )
+        	{
+        	FTRACE( FPrint( _L(
+        	    "[OMADM] CNSmlDMSyncProfile::LatestHistoryJob: count %d index %d"),
+        	    count, index ) );
+            //const CSyncMLHistoryEntry& entry = iHistoryLog[index];
+            const CSyncMLHistoryEntry& entry = iHistoryLog.Entry( index );
+            
+        	FTRACE( FPrint( _L(
+        	    "[OMADM] CNSmlDMSyncProfile::LatestHistoryJob: Entry type = %x"),
+        	    entry.EntryType().iUid ) );
+            
+            const CSyncMLHistoryJob* jobEntry =
+                CSyncMLHistoryJob::DynamicCast( &entry );
+
+            if ( jobEntry )
+            	{
+            	FLOG( "[OMADM] CNSmlDMSyncProfile::LatestHistoryJob() completed: OK" );
+            	return jobEntry;
+            	}
+        	}
+		}
+
+    FLOG( "[OMADM] CNSmlDMSyncProfile::LatestHistoryJob() completed: No history found" );
+    return NULL;  // profile has no history job
+    }
+
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncProfile::OpenHistoryLog
+// -----------------------------------------------------------------------------
+//
+void CNSmlDMSyncProfile::OpenHistoryLog()
+    {
+    FLOG( "[OMADM] CNSmlDMSyncProfile::OpenHistoryLog()" );
+    
+    TInt id = ProfileId();
+   	TRAPD( err, iHistoryLog.OpenL( Session(), id ) );
+
+   	if ( err == KErrNone )
+   		{
+   		FLOG( "[OMADM] CNSmlDMSyncProfile::OpenHistoryLog(): Opened" );
+   		iHistoryLogOpen = ETrue;
+    	}
+
+    FLOG( "[OMADM] CNSmlDMSyncProfile::OpenHistoryLog() completed" );
+    }
+    
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncProfile::CloseHistoryLog
+// -----------------------------------------------------------------------------
+//
+void CNSmlDMSyncProfile::CloseHistoryLog()
+    {
+    FLOG( "[OMADM] CNSmlDMSyncProfile::CloseHistoryLog()" );
+    
+   	if ( iHistoryLogOpen )
+   		{
+   		FLOG( "[OMADM] CNSmlDMSyncProfile::CloseHistoryLog(): Closed " );
+   		iHistoryLog.Close();
+   		iHistoryLogOpen = EFalse;
+    	}
+
+    FLOG( "[OMADM] CNSmlDMSyncProfile::CloseHistoryLog() completed" );
+    }
+    
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncProfile::OpenConnection
+// -----------------------------------------------------------------------------
+//
+void CNSmlDMSyncProfile::OpenConnection()
+    {
+    FLOG( "[OMADM] CNSmlDMSyncProfile::OpenConnection()" );
+        
+   	TInt err = KErrNone;
+   	RArray<TSmlTransportId> arr;
+   	
+    TRAP( err, Profile().ListConnectionsL(arr) );
+    if ( err != KErrNone )
+    	{
+    	return; 
+    	}
+    if ( arr.Count() == 0 )
+    	{
+     	arr.Close();  
+    	return; // no connection
+    	}
+        	
+    TInt transportId = arr[0];
+    arr.Close();
+    	
+    TRAP( err, iConnection.OpenL( iProfile, transportId ) );
+    if ( err == KErrNone )
+    	{
+    	iConnectionOpen = ETrue;
+    	}
+
+    FTRACE( FPrint( _L(
+        "[OMADM] CNSmlDMSyncProfile::OpenConnection() completed, err = %d" ),
+        err ) );
+    }
+
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncProfile::Session
+// -----------------------------------------------------------------------------
+//
+RSyncMLSession& CNSmlDMSyncProfile::Session()
+	{
+	FLOG( "[OMADM] CNSmlDMSyncProfile::Session:" );
+	
+	return *iSyncSession;
+	}
+
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncProfile::GetConnectionPropertyNameL
+// -----------------------------------------------------------------------------
+//
+void CNSmlDMSyncProfile::GetConnectionPropertyNameL( TDes8& aText,
+                                                     TInt aPropertyPos )
+	{
+	FLOG( "[OMADM] CNSmlDMSyncProfile::GetConnectionPropertyNameL:" );
+	
+	// at the moment RSyncMLTransport is only needed
+	// for internet connection settings
+	RSyncMLTransport transport;
+	CleanupClosePushL( transport );
+	transport.OpenL( Session(), KUidNSmlMediumTypeInternet.iUid );
+
+	const CSyncMLTransportPropertiesArray&  arr = transport.Properties();
+
+    __ASSERT_DEBUG( arr.Count() > aPropertyPos, TUtil::Panic( KErrGeneral ) );
+
+	const TSyncMLTransportPropertyInfo& info = arr.At( aPropertyPos );
+	aText = info.iName;
+	CleanupStack::PopAndDestroy( &transport );
+	
+	FLOG( "[OMADM] CNSmlDMSyncProfile::GetConnectionPropertyNameL() completed" );
+	}
+
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncProfile::CopyValuesL
+// -----------------------------------------------------------------------------
+//
+void CNSmlDMSyncProfile::CopyValuesL( CNSmlDMSyncProfile* aSource )
+    {
+	FLOG( "[OMADM] CNSmlDMSyncProfile::CopyValuesL()" );
+
+    TBuf<KBufSize256> buf;
+    TInt num = 0;
+    
+    num = aSource->ProtocolVersion();
+    SetProtocolVersionL( num );
+    if ( num == 1 )
+    	{
+    	aSource->GetServerId( buf );
+    	SetServerIdL( buf );
+    	}
+    	
+    num = aSource->BearerType();
+    SetBearerTypeL( num );
+    
+     num = aSource->AccessPointL();
+    SetAccessPointL( num );
+    
+    aSource->GetHostAddress( buf, num );
+    SetHostAddressL( buf, num );
+     
+    aSource->GetUserName( buf );
+    SetUserNameL(buf);
+     
+    aSource->GetPassword( buf );
+    SetPasswordL( buf );
+    
+    num = aSource->SASyncState();
+    SetSASyncStateL( num );
+    
+    if ( aSource->BearerType() == EAspBearerInternet)
+    	{
+    	num = aSource->HttpUsedL();
+    	SetHttpUsedL(num);
+    	
+    	aSource->GetHttpUserNameL(buf);
+    	SetHttpUserNameL(buf);
+    	
+    	aSource->GetHttpPasswordL(buf);
+    	SetHttpPasswordL(buf);
+    	}
+	FLOG( "[OMADM] CNSmlDMSyncProfile::CopyValuesL() completed" );
+    }
+    
+// End of File
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/deviceupdates/src/nsmldmsyncprofileitem.cpp	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,81 @@
+/*
+* 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:  Profile item
+*
+*/
+
+
+#include "nsmldmsyncprofileitem.h"
+#include "nsmldmsyncdebug.h"
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// TNSmlDMSyncProfileItem::Id
+// -----------------------------------------------------------------------------
+//
+TInt TNSmlDMSyncProfileItem::Id()
+	{
+	FLOG( "[OMADM] TNSmlDMSyncProfileItem::Id:" );
+	
+	return iProfileId;
+	}
+
+// -----------------------------------------------------------------------------
+// TNSmlDMSyncProfileItem::SetId
+// -----------------------------------------------------------------------------
+//
+void TNSmlDMSyncProfileItem::SetId(TInt aId)
+	{
+	FLOG( "[OMADM] TNSmlDMSyncProfileItem::SetId:" );
+	
+	iProfileId = aId;
+	}
+
+// -----------------------------------------------------------------------------
+// TNSmlDMSyncProfileItem::Name
+// -----------------------------------------------------------------------------
+//
+const TDesC& TNSmlDMSyncProfileItem::Name()
+	{
+	FLOG( "[OMADM] TNSmlDMSyncProfileItem::Name:" );
+	
+	return iProfileName;
+	}
+
+// -----------------------------------------------------------------------------
+// TNSmlDMSyncProfileItem::SetName
+// -----------------------------------------------------------------------------
+//
+void TNSmlDMSyncProfileItem::SetName( const TDesC& aName )
+	{
+	FLOG( "[OMADM] TNSmlDMSyncProfileItem::SetName:" );
+	
+	iProfileName.Copy( aName.Left( iProfileName.MaxLength() ) );
+	}
+
+// -----------------------------------------------------------------------------
+// TNSmlDMSyncProfileItem::CompareItem
+// -----------------------------------------------------------------------------
+//
+TInt TNSmlDMSyncProfileItem::CompareItem( 
+                                        const TNSmlDMSyncProfileItem& aFirst,
+                                        const TNSmlDMSyncProfileItem& aSecond )
+	{
+	FLOG( "[OMADM] TNSmlDMSyncProfileItem::CompareItem:" );
+	
+	return aFirst.iProfileName.Compare( aSecond.iProfileName );
+	}
+
+// End of File
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/deviceupdates/src/nsmldmsyncprofilelist.cpp	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,333 @@
+/*
+* Copyright (c) 2005-2006 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:  Methods for CNSmlDMSyncProfile
+*
+*/
+
+
+#include <SyncMLTransportProperties.h>
+#include <centralrepository.h>
+#include <featmgr.h>
+#include "nsmldmsyncprivatecrkeys.h"
+#include "nsmldmsyncprofilelist.h"
+#include "nsmldmsyncprofile.h"
+#include "nsmldmsyncdebug.h"
+#include "nsmldmsyncappengine.h"
+#include "nsmldmsyncutil.h"
+
+// ============================ MEMBER FUNCTIONS ==============================
+//
+
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncProfileList::NewL
+//
+// Two-phased constructor.
+// -----------------------------------------------------------------------------
+//
+CNSmlDMSyncProfileList* CNSmlDMSyncProfileList::NewL( 
+                                                CNSmlDMSyncAppEngine* aEngine )
+    {
+    FLOG( "[OMADM] CNSmlDMSyncProfileList::NewL:");
+    
+    CNSmlDMSyncProfileList* self = 
+                                new(ELeave) CNSmlDMSyncProfileList( aEngine );
+	CleanupStack::PushL(self);
+	self->ConstructL();
+	CleanupStack::Pop( self );
+	return self;
+    }
+
+// -----------------------------------------------------------------------------
+// Destructor.
+// -----------------------------------------------------------------------------
+//
+CNSmlDMSyncProfileList::~CNSmlDMSyncProfileList()
+    {
+    FLOG( "[OMADM] CNSmlDMSyncProfileList::~CNSmlDMSyncProfileList():" );
+    
+	iList.Close();
+    }
+
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncProfileList::ConstructL
+//
+// Symbian 2nd phase constructor can leave.
+// -----------------------------------------------------------------------------
+//
+void CNSmlDMSyncProfileList::ConstructL(void)
+    {
+    FLOG( "[OMADM] CNSmlDMSyncProfileList::ConstructL:" );
+    
+    }
+
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncProfileList::CNSmlDMSyncProfileList.
+// -----------------------------------------------------------------------------
+//
+CNSmlDMSyncProfileList::CNSmlDMSyncProfileList( CNSmlDMSyncAppEngine* aEngine )
+	{
+	FLOG( "[OMADM] CNSmlDMSyncProfileList::CNSmlDMSyncProfileList:" );
+	
+	iEngine = aEngine;
+	}
+
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncProfileList::Count
+// -----------------------------------------------------------------------------
+//
+TInt CNSmlDMSyncProfileList::Count()
+	{
+	return iList.Count();
+	}
+
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncProfileList::Item
+// -----------------------------------------------------------------------------
+//
+TNSmlDMSyncProfileItem CNSmlDMSyncProfileList::Item(TInt aIndex)
+	{
+	if ( ( aIndex < 0 ) || ( aIndex >= Count() ) )
+	    {
+		TUtil::Panic(KErrGeneral);
+	    }
+
+	return iList[aIndex];
+	}
+
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncProfileList::FindProfile
+// -----------------------------------------------------------------------------
+//
+TInt CNSmlDMSyncProfileList::FindProfile(const TDesC& aProfileName)
+	{
+	FLOG( "[OMADM] CNSmlDMSyncProfileList::FindProfile:" );
+	
+	for ( TInt index = 0; index < Count(); index++ )
+		{
+		TPtrC ptr = Item(index).Name();
+		if ( ptr.Compare( aProfileName ) == 0 )
+			{
+			return index;
+			}
+		}
+	return KErrNotFound;
+	}
+
+// -----------------------------------------------------------------------------
+// ReplaceProfileItemL
+// -----------------------------------------------------------------------------
+//
+void CNSmlDMSyncProfileList::ReplaceProfileItemL( 
+                                        TNSmlDMSyncProfileItem& aProfileItem )
+	{
+	// remove old profile with same id
+	Remove( aProfileItem.iProfileId );
+	// add new profile 
+    User::LeaveIfError( iList.Append(aProfileItem) );
+    Sort();
+	}
+	
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncProfileList::ReadProfileItemL
+// -----------------------------------------------------------------------------
+//
+void CNSmlDMSyncProfileList::ReadProfileItemL( TInt aIndex )
+	{
+	FLOG("[OMADM] CNSmlDMSyncProfileList::ReadProfileItemL:" );
+	
+    CNSmlDMSyncProfile* profile = iEngine->OpenProfileL( aIndex, ESmlOpenRead );
+	
+	TNSmlDMSyncProfileItem item = ReadProfileItemL( profile );
+	item.iMandatoryCheck = CheckMandatoryDataL( profile );
+	ReplaceProfileItemL( item );
+	iEngine->CloseProfile();
+	}
+
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncProfileList::ReadProfileItemsL
+// -----------------------------------------------------------------------------
+//
+void CNSmlDMSyncProfileList::ReadProfileItemsL()
+	{
+	ReadProfileItemsL( EFalse );
+	}
+
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncProfileList::ReadProfileItemsL
+// -----------------------------------------------------------------------------
+//
+void CNSmlDMSyncProfileList::ReadProfileItemsL( TBool aIncludeHidden )
+	{
+	FLOG( "[OMADM] CNSmlDMSyncProfileList::ReadProfileItemsL:" );
+	
+	RArray<TSmlProfileId> arr;
+    iEngine->Session()->ListProfilesL( arr, ESmlDevMan );
+   	CleanupClosePushL(arr);
+    TNSmlDMSyncProfileItem item;
+
+    TBool fotaSupported = FeatureManager::FeatureSupported( KFeatureIdSyncMlDmFota );
+    TBuf<KBufSize256> fotaProfileId;
+
+    if ( fotaSupported && !aIncludeHidden )
+    	{
+        CRepository* centrep = CRepository::NewL( KCRUidNSmlDMSyncApp );
+        if ( centrep->Get( KNSmlDMFotaHiddenProfileIdKey, fotaProfileId ) != KErrNone )
+            {
+            fotaProfileId.Zero();
+            }
+        FTRACE( FPrint(
+            _L("[OMADM] CNSmlDMSyncProfileList::ReadProfileItemsL() hidden FOTA profile id = \"%S\""),
+            &fotaProfileId ) );
+        delete centrep;
+    	}
+    
+	for ( TInt index = 0; index < arr.Count(); index++ )
+		{
+	    TRAPD( error, iEngine->OpenProfileL( arr[index], ESmlOpenRead ) );
+	    if ( error == KErrNone )
+	        {
+	        TRAPD( retVal, item = ReadProfileItemL( iEngine->Profile() ) );
+
+            TBuf<KBufSize256> profileId;
+            iEngine->Profile()->GetServerId( profileId );
+            if ( (retVal == KErrNone)
+                && ( fotaProfileId.Compare(profileId) != 0 ) )
+                {
+                iList.Append( item );
+                }
+
+            iEngine->CloseProfile();
+	        }
+		}
+    CleanupStack::PopAndDestroy( &arr );
+	}
+
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncProfileList::ReadProfileItemL
+// -----------------------------------------------------------------------------
+//
+TNSmlDMSyncProfileItem CNSmlDMSyncProfileList::ReadProfileItemL( 
+                                                CNSmlDMSyncProfile* aProfile )
+	{
+	FLOG( "[OMADM] CNSmlDMSyncProfileList::ReadProfileItemL:" );
+	
+	TNSmlDMSyncProfileItem item;
+	item.iApplicationId = aProfile->CreatorId();
+	TBuf<KBufSize> buf;
+	aProfile->GetName( buf );
+	item.SetName( buf );
+	item.SetId( aProfile->ProfileId() );
+	item.iSynced    = aProfile->IsSynced();
+	item.iLastSync  = aProfile->LastSync();
+	item.iLastSuccessSync = aProfile->LastSuccessSync();
+	item.iBearer    = aProfile->BearerType();
+    item.iActive    = EFalse;
+    if ( aProfile->SASyncState() != ESASyncStateDisable )
+    	{
+    	item.iActive = ETrue;
+    	}
+	item.iDeleteAllowed = aProfile->DeleteAllowed();
+	item.iProfileLocked = aProfile->ProfileLocked();
+	
+	// check whether all mandatory data exist
+	item.iMandatoryCheck = CheckMandatoryDataL( aProfile );
+	return item;	
+    }
+
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncProfileList::Reset
+// -----------------------------------------------------------------------------
+//
+void CNSmlDMSyncProfileList::Reset()
+	{
+	FLOG( "[OMADM] CNSmlDMSyncProfileList::Reset:" );
+	
+	iList.Reset();
+	}
+
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncProfileList::Remove
+// -----------------------------------------------------------------------------
+//
+void CNSmlDMSyncProfileList::Remove( TInt aProfileId )
+	{
+	FLOG( "[OMADM] CNSmlDMSyncProfileList::Remove:" );
+	
+	for ( TInt index = 0; index < Count(); index++ )
+		{
+		TNSmlDMSyncProfileItem item = iList[index];
+		if ( item.iProfileId == aProfileId )
+			{
+			iList.Remove( index );
+			return;
+			}
+		}
+	}
+
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncProfileList::CheckMandatoryDataL
+// -----------------------------------------------------------------------------
+//
+TInt CNSmlDMSyncProfileList::CheckMandatoryDataL( CNSmlDMSyncProfile* aProfile )
+	{
+	FLOG( "[OMADM] CNSmlDMSyncProfileList::CheckMandatoryDataL:" );
+
+	TBuf<KBufSize> buf;
+	TInt num;
+
+	aProfile->GetName( buf );
+	if ( TUtil::IsEmpty( buf ) )
+		{
+		return EMandatoryNoProfileName;
+		}
+
+	aProfile->GetHostAddress( buf, num );
+	if ( TUtil::IsEmpty( buf ) )
+		{
+		return EMandatoryNoHostAddress;
+		}
+
+    return EMandatoryOk;
+	}
+
+// -----------------------------------------------------------------------------
+// CNSmlDMSyncProfileList::IsEmpty
+// -----------------------------------------------------------------------------
+//
+TBool CNSmlDMSyncProfileList::IsEmpty( const TDesC& aText )
+	{
+	FLOG( "[OMADM] CNSmlDMSyncProfileList::IsEmpty:" );
+	
+	for ( TInt index = 0; index < aText.Length(); index++ )
+		{
+		TChar character = aText[index];
+		if ( !character.IsSpace() )
+			{
+			return EFalse;
+			}
+		}
+	return ETrue;
+	}
+	
+// -----------------------------------------------------------------------------
+// Sort
+// -----------------------------------------------------------------------------
+//
+void CNSmlDMSyncProfileList::Sort()
+	{
+	iList.Sort( TLinearOrder<TNSmlDMSyncProfileItem>(
+	                                    TNSmlDMSyncProfileItem::CompareItem) );
+	}
+
+// End of File
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/deviceupdates/src/nsmldmsyncutil.cpp	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,861 @@
+/*
+* 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:  Utility classes.
+*
+*/
+
+
+
+// INCLUDES
+#include <SyncMLTransportProperties.h>
+#include <eikenv.h>
+#include <bautils.h>
+#include <collate.h>
+#include <StringLoader.h>
+#include <avkon.rsg>
+#include <SettingEnforcementInfo.h> // VSettingEnforcementInfo
+#include <featmgr.h>
+#include "nsmldmdef.h"
+#include "nsmldmsyncutil.h"
+#include "nsmldmsyncdebug.h"
+
+
+/*****************************************************************************
+ * class TUtil
+ *****************************************************************************/
+
+
+// ----------------------------------------------------------------------------
+// Panic
+// ----------------------------------------------------------------------------
+//
+void TUtil::Panic(TInt aReason)
+    {
+	_LIT(KPanicCategory,"NSmlDMSyncUtil");
+
+	User::Panic( KPanicCategory, aReason ); 
+    }
+
+// ----------------------------------------------------------------------------
+// StrCopy
+// String copy with lenght check.
+// ----------------------------------------------------------------------------
+//
+void TUtil::StrCopy( TDes8& aTarget, const TDesC& aSource )
+    {
+    aTarget.Copy( aSource.Left(aTarget.MaxLength() ) );
+    }
+
+// ----------------------------------------------------------------------------
+// StrCopy
+// String copy with lenght check.
+// ----------------------------------------------------------------------------
+//
+void TUtil::StrCopy( TDes& aTarget, const TDesC8& aSource )
+    {
+	aTarget.Copy( aSource.Left(aTarget.MaxLength() ) );
+    }
+
+// ----------------------------------------------------------------------------
+// StrCopy
+// String copy with lenght check.
+// ----------------------------------------------------------------------------
+//
+void TUtil::StrCopy( TDes& aTarget, const TDesC& aSource )
+    {
+	aTarget.Copy( aSource.Left( aTarget.MaxLength() ) );
+    }
+
+// ----------------------------------------------------------------------------
+// StrAppend
+// ----------------------------------------------------------------------------
+//
+void TUtil::StrAppend( TDes& aTarget, const TDesC& aSource )
+    {
+    if ( aSource.Length() == 0 )
+    	{
+    	return;
+    	}
+    TInt free = aTarget.MaxLength() - aTarget.Length();
+	if ( aSource.Length() <= free )
+		{
+		aTarget.Append( aSource );
+		}
+    }
+
+// ----------------------------------------------------------------------------
+// StrInsert
+// ----------------------------------------------------------------------------
+//
+void TUtil::StrInsert( TDes& aTarget, const TDesC& aSource )
+    {
+	TInt free = aTarget.MaxLength() - aTarget.Length();
+	if (aSource.Length() <= free)
+		{
+		aTarget.Insert(0, aSource);
+		}
+    }
+
+// ----------------------------------------------------------------------------
+// StrToInt
+// ----------------------------------------------------------------------------
+//
+TInt TUtil::StrToInt( const TDesC& aText, TInt& aNum )
+	{
+    TLex lex( aText );
+    TInt err = lex.Val( aNum ); 
+	return err;
+	}
+
+//
+//-----------------------------------------------------------------------------
+// IsEmpty
+// Function returns ETrue if string only contains white space
+// or has no characters.
+//-----------------------------------------------------------------------------
+//
+TBool TUtil::IsEmpty( const TDesC& aText )
+	{
+	TInt len = aText.Length();
+	for ( TInt index=0; index < len; index++ )
+		{
+		TChar character = aText[index];
+		if ( !character.IsSpace() )
+			{
+			return EFalse;
+			}
+		}
+	return ETrue;
+	}
+
+// -----------------------------------------------------------------------------
+// SyncTimeLC
+// -----------------------------------------------------------------------------
+//
+HBufC* TUtil::SyncTimeLC( TTime aLastSync )
+	{
+	FLOG( "[OMADM] TUtil::SyncTimeLC" );
+	
+	TTime homeTime = ConvertUniversalToHomeTime( aLastSync );
+	
+	HBufC* hBuf = HBufC::NewLC( KBufSize255 );
+	TPtr ptr = hBuf->Des();
+
+	if ( IsToday( homeTime ) )
+		{
+		FLOG( "[OMADM] TUtil::SyncTimeLC time" );
+		
+		TBuf<KBufSize> timeFormat;
+		HBufC* buf = StringLoader::LoadLC( R_QTN_TIME_USUAL_WITH_ZERO );
+		TUtil::StrCopy( timeFormat, *buf );
+		CleanupStack::PopAndDestroy( buf );
+		homeTime.FormatL( ptr, timeFormat );
+		
+		FLOG( "[OMADM] TUtil::SyncTimeLC time done" );
+		}
+	else
+		{
+		FLOG( "[OMADM] TUtil::SyncTimeLC date" );
+		
+		TBuf<KBufSize> dateFormat;
+        HBufC* buf = StringLoader::LoadLC( R_QTN_DATE_USUAL_WITH_ZERO );
+        TUtil::StrCopy( dateFormat, *buf );
+        CleanupStack::PopAndDestroy( buf );
+		homeTime.FormatL(ptr, dateFormat);
+		
+		FLOG( "[OMADM] TUtil::SyncTimeLC date done" );
+		}
+    FLOG( "[OMADM] TUtil::SyncTimeLC Done" );
+	return hBuf;
+	}
+
+// -----------------------------------------------------------------------------
+// ConvertUniversalToHomeTime
+// -----------------------------------------------------------------------------
+//
+TTime TUtil::ConvertUniversalToHomeTime( const TTime& aUniversalTime )
+    {
+    TTime time( aUniversalTime );   // time stores UTC time.
+
+    TLocale locale;
+    TTimeIntervalSeconds universalTimeOffset( locale.UniversalTimeOffset() );
+    
+    // Add locale's universal time offset to universal time.
+    time += universalTimeOffset;    // time stores Local Time.
+
+    // If home daylight saving in effect, add one hour offset.
+    if ( locale.QueryHomeHasDaylightSavingOn() )
+        {
+        TTimeIntervalHours daylightSaving(1);
+        time += daylightSaving;
+        }
+
+    return time;
+    }
+
+// -----------------------------------------------------------------------------
+// IsToDay
+// -----------------------------------------------------------------------------
+//
+TBool TUtil::IsToday(TTime aTime)
+	{
+	FLOG( "[OMADM] TUtil::IsToday" );
+	
+	TTime now;
+	now.HomeTime();
+	TInt day1 = now.DayNoInYear();
+	TInt day2 = aTime.DayNoInYear();
+	TTimeIntervalDays daysBetween = now.DaysFrom( aTime );
+	
+	if ( day1 != day2 )
+		{
+		FLOG( "[OMADM] TUtil::IsToday False 1" );
+		return EFalse;
+		}
+		
+	if ( daysBetween.Int() > 0 )
+		{
+		FLOG( "[OMADM] TUtil::IsToday False 2" );
+		return EFalse;
+		}
+
+    FLOG( "[OMADM] TUtil::IsToday True" );
+	return ETrue; 
+	}
+
+
+// -----------------------------------------------------------------------------
+// TUtil::GetDateTextL
+// -----------------------------------------------------------------------------
+//
+void TUtil::GetDateTextL(TDes& aText, TTime aDateTime)
+	{
+	TTime homeTime = ConvertUniversalToHomeTime( aDateTime );
+	HBufC* hBuf = StringLoader::LoadLC( R_QTN_DATE_USUAL_WITH_ZERO );
+    homeTime.FormatL( aText, *hBuf );
+    CleanupStack::PopAndDestroy( hBuf );
+	}
+
+
+// -----------------------------------------------------------------------------
+// TUtil::GetTimeTextL
+// -----------------------------------------------------------------------------
+//
+void TUtil::GetTimeTextL( TDes& aText, TTime aDateTime )
+	{
+	TTime homeTime = ConvertUniversalToHomeTime( aDateTime );
+	HBufC* hBuf = StringLoader::LoadLC( R_QTN_TIME_USUAL_WITH_ZERO );
+    homeTime.FormatL( aText, *hBuf );
+    CleanupStack::PopAndDestroy( hBuf );
+	}
+
+
+// -----------------------------------------------------------------------------
+// TUtil::GetDateTimeTextL
+// -----------------------------------------------------------------------------
+//
+void TUtil::GetDateTimeTextL( TDes& aText, TTime aDateTime )
+	{
+	TDateTime dt = aDateTime.DateTime();
+	aText.Format(_L("%02d.%02d.%04d %02d:%02d:%02d"), dt.Day()+1,
+	                                                  dt.Month()+1,
+	                                                  dt.Year(),
+	                                                  dt.Hour(),
+	                                                  dt.Minute(),
+	                                                  dt.Second() );
+	}
+
+
+// ---------------------------------------------------------
+// TUtil::SettingEnforcementStateL
+// 
+// Checks if setting enforcement is activated.
+// ---------------------------------------------------------
+TBool TUtil::SettingEnforcementStateL()
+    {
+FeatureManager::InitializeLibL();
+if(!FeatureManager::FeatureSupported(KFeatureIdSapPolicyManagement))
+{
+		FeatureManager::UnInitializeLib();
+		    return EFalse;
+}
+else
+{
+	FeatureManager::UnInitializeLib();
+	CSettingEnforcementInfo* info = CSettingEnforcementInfo::NewL();
+	CleanupStack::PushL(info);
+
+	TBool active = EFalse;
+	User::LeaveIfError(info->EnforcementActive(ESyncMLEnforcement, active));
+	CleanupStack::PopAndDestroy(info);
+
+	return active;
+}
+
+    }
+
+
+// ---------------------------------------------------------
+// TUtil::SettingEnforcementState
+// 
+// Checks if setting enforcement is activated.
+// ---------------------------------------------------------
+TBool TUtil::SettingEnforcementState()
+    {
+    TBool ret = EFalse;
+
+    TRAP_IGNORE(ret = SettingEnforcementStateL());
+
+    return ret;
+    }
+
+
+/*****************************************************************************
+ * class TURIParser
+ *****************************************************************************/
+
+// ----------------------------------------------------------------------------
+// Constructor
+// ----------------------------------------------------------------------------
+//
+TURIParser::TURIParser( const TDesC& aStr ) : iOriginalStr( aStr )
+    {
+    SkipHttp();
+    }
+
+// ----------------------------------------------------------------------------
+// GetUriWithoutPort
+// URI format: "http://serveraddress/documentname/"
+// ----------------------------------------------------------------------------
+//
+void TURIParser::GetUriWithoutPort( TDes& aText )
+	{
+	aText = KNullDesC;
+	TPtrC http = ParseHttp();
+	TPtrC address = ParseAddress();
+	TPtrC document = ParseDocument();
+	TUtil::StrAppend( aText, http );
+	TUtil::StrAppend( aText, address );
+	
+	if (document.Length() > 0)
+		{
+		TUtil::StrAppend( aText, KSlash );
+		TUtil::StrAppend( aText, document );
+		}
+	else if ( iSlash )
+		{
+		TUtil::StrAppend( aText, KSlash );
+		}
+	}
+	
+// ----------------------------------------------------------------------------
+// GetURI
+// URI format: "http://serveraddress:port/documentname/"
+// ----------------------------------------------------------------------------
+//
+void TURIParser::GetUri( TDes& aText, const TInt aPort )
+	{
+	aText = KNullDesC;
+	TPtrC http = ParseHttp();
+	TPtrC address = ParseAddress();
+	TPtrC document = ParseDocument();
+	TUtil::StrAppend( aText, http );
+	TUtil::StrAppend( aText, address );
+	
+	TBuf<KBufSize32> buf;
+	buf.Num( aPort );
+	TUtil::StrAppend( aText, KColon );
+	TUtil::StrAppend( aText, buf );
+	
+	if ( document.Length() > 0 )
+		{
+		TUtil::StrAppend( aText, KSlash );
+		TUtil::StrAppend( aText, document );
+		}
+	else if ( iSlash )
+		{
+		TUtil::StrAppend( aText, KSlash );
+		}
+	}
+
+// ----------------------------------------------------------------------------
+// Port
+// ----------------------------------------------------------------------------
+//
+TInt TURIParser::Port()
+	{
+	TInt port = KErrNotFound;
+	
+	TInt err = ParsePort( port );
+	if ( err != KErrNone )
+		{
+		return KErrNotFound;
+		}
+	return port;
+	}
+
+// ----------------------------------------------------------------------------
+// DefaultPort
+// 
+// ----------------------------------------------------------------------------
+//
+TInt TURIParser::DefaultPort()
+	{
+	TInt pos = iOriginalStr.FindF( KHttpsHeader );
+	if ( pos != KErrNotFound )
+		{
+		return KDefaultHttpsPort;
+		}
+	return KDefaultHttpPort;
+	}
+
+// ----------------------------------------------------------------------------
+// SkipHttp
+// Set pointer to the end of "http://".
+// ----------------------------------------------------------------------------
+//
+void TURIParser::SkipHttp()
+	{
+    TInt start = KErrNotFound;
+    TInt end   = KErrNotFound;
+    TStr str(iOriginalStr);
+    
+    GetHttpPos( start, end );
+    
+    if ( start != KErrNotFound )
+    	{
+    	iPtr.Set( str.Right( end + 1 ) );
+    	}
+    else
+    	{
+    	iPtr.Set( str.Right(0) );
+    	}
+	}
+
+// ----------------------------------------------------------------------------
+// ParseHttp
+// 
+// ----------------------------------------------------------------------------
+//
+TPtrC TURIParser::ParseHttp()
+	{
+    TInt start = KErrNotFound;
+    TInt end   = KErrNotFound;
+    
+    GetHttpPos(start, end);
+    
+    if (start == KErrNotFound)
+    	{
+    	return TPtrC();
+    	}
+    
+   	TStr str(iOriginalStr);
+    return str.SubStr(start, end);
+	}
+
+// ----------------------------------------------------------------------------
+// GetHttpPos 
+// ----------------------------------------------------------------------------
+//
+void TURIParser::GetHttpPos( TInt& aStartPos, TInt& aEndPos )
+	{
+	aEndPos = KErrNotFound;
+	
+	aStartPos = iOriginalStr.FindF( KHttpHeader );
+	if ( aStartPos != KErrNotFound )
+		{
+		aEndPos = aStartPos + KHttpHeader().Length() - 1;
+		return;
+		}
+	
+	aStartPos = iOriginalStr.FindF( KHttpsHeader );
+	if ( aStartPos != KErrNotFound )
+		{
+		aEndPos = aStartPos + KHttpsHeader().Length() - 1;
+		return;
+		}
+	}
+
+// ----------------------------------------------------------------------------
+// ParseAddress
+// ----------------------------------------------------------------------------
+TPtrC TURIParser::ParseAddress()
+	{
+	const TChar KSlash('/');
+	const TChar KColon(':');
+	TStr str( iPtr );
+    TInt firstSlash = str.Find( 0, KSlash );
+	TInt firstcolon = str.Find( 0, KColon );
+	TBool portFound = EFalse;
+	iSlash = EFalse;
+	if ( firstSlash != KErrNotFound ) 
+	    {
+		 iSlash = ETrue;
+	    }
+	if (firstcolon != KErrNotFound)
+		{
+		if ( firstSlash == KErrNotFound )
+			{
+			portFound = ETrue;
+			}
+		else if ( firstcolon < firstSlash )
+			{
+			portFound = ETrue;
+			}
+		}
+    
+	if ( portFound )
+		{
+		// address is text before first colon
+		return str.Left( firstcolon - 1 );
+		}
+	else if (firstSlash != KErrNotFound)
+		{
+		// address is text before first slash
+		return str.Left( firstSlash - 1 );
+		}
+	else
+		{
+		// address is all text
+		return str.Right( 0 );
+		}
+	}
+
+// ----------------------------------------------------------------------------
+// ParseDocument
+// ----------------------------------------------------------------------------
+TPtrC TURIParser::ParseDocument()
+	{
+	const TChar KSlash('/');
+	
+	TStr str(iPtr);
+    TInt firstSlash = str.Find( 0, KSlash );
+    
+	if ( firstSlash != KErrNotFound )
+		{
+		// document is all text after first slash
+		return str.Right( firstSlash + 1 );
+		}
+	return TPtrC();
+	}
+	
+// ----------------------------------------------------------------------------
+// ParsePort
+// ----------------------------------------------------------------------------
+// 
+TInt TURIParser::ParsePort( TInt& aNumber )
+	{
+	TPtrC port = ParsePort();
+	if ( port.Length() == 0 )
+		{
+		return KErrNotFound;
+		}
+	return TUtil::StrToInt( port, aNumber );
+	}
+
+// ----------------------------------------------------------------------------
+// ParsePort
+// ----------------------------------------------------------------------------
+// 
+TPtrC TURIParser::ParsePort()
+	{
+	const TChar KSlash('/');
+	const TChar KColon(':');
+	
+	TStr str(iPtr);
+    TInt firstSlash = str.Find( 0, KSlash );
+	TInt firstColon = str.Find( 0, KColon );
+    
+	if ( firstSlash != KErrNotFound )
+		{
+		if ( firstColon != KErrNotFound && firstColon < firstSlash )
+			{
+		    // port number is text between colon and slash 
+		    return str.SubStrEx( firstColon, firstSlash );
+			}
+		}
+	else 
+		{
+		if ( firstColon != KErrNotFound )
+			{
+		    // port number is all text after colon 
+		    return str.Right(firstColon+1);
+			}
+		}
+	return TPtrC();
+	}
+
+/*****************************************************************************
+ * class TStr
+ *****************************************************************************/
+
+// ----------------------------------------------------------------------------
+// TStr::TStr
+// C++ default constructor can NOT contain any code, that
+// might leave.
+// ----------------------------------------------------------------------------
+//
+TStr::TStr( const TDesC& aStr ) : iStr( aStr )
+    {
+    }
+
+// ----------------------------------------------------------------------------
+// TStr::Mid
+// ----------------------------------------------------------------------------
+//
+TPtrC TStr::Mid( TInt aPos )
+    {
+	if ( ( aPos < 0 ) || ( aPos >= iStr.Length() ) )
+	    {
+		return TPtrC();  // return empty descriptor
+	    }
+	return iStr.Mid( aPos );
+    }
+
+// ----------------------------------------------------------------------------
+// TStr::Mid
+// ----------------------------------------------------------------------------
+//
+TPtrC TStr::Mid( TInt aPos, TInt aLen )
+    {
+	TInt len = iStr.Length();
+	if ( ( aPos < 0 ) || ( aPos >= len ) )
+	    {
+		return TPtrC();
+	    }
+	if ( ( aLen <= 0 ) || ( aPos + aLen > len ) )
+	    {
+		return TPtrC();
+	    }
+
+	return iStr.Mid( aPos, aLen );
+    }
+
+// ----------------------------------------------------------------------------
+// TStr::Right
+// ----------------------------------------------------------------------------
+//
+TPtrC TStr::Right( TInt aPos )
+    {
+	return Mid( aPos );
+    }
+
+// ----------------------------------------------------------------------------
+// TStr::Left
+// ----------------------------------------------------------------------------
+//
+TPtrC TStr::Left( TInt aPos )
+    {
+	TInt len = iStr.Length();
+
+	if ( ( aPos < 0 ) || ( len == 0 ) )
+	    {
+		return TPtrC();
+	    }
+
+	TInt pos = len;
+	if ( ( aPos + 1 ) < len )
+	    {
+		pos = aPos + 1;
+	    }
+
+	return iStr.Left( pos );
+    }
+
+// ----------------------------------------------------------------------------
+// TStr::SubStr
+// ----------------------------------------------------------------------------
+//
+TPtrC TStr::SubStr( TInt aStartPos, TInt aEndPos )
+    {
+	return Mid( aStartPos, aEndPos - aStartPos + 1 );
+    }
+
+// ----------------------------------------------------------------------------
+// TStr::SubStrEx
+// ----------------------------------------------------------------------------
+//
+TPtrC TStr::SubStrEx( TInt aStartPos, TInt aEndPos )
+    {
+	return Mid( aStartPos + 1, aEndPos - aStartPos - 1 );
+    }
+
+// ----------------------------------------------------------------------------
+// TStr::LastPos
+// ----------------------------------------------------------------------------
+//
+TInt TStr::LastPos()
+    {
+	return iStr.Length() - 1;
+    }
+
+// ----------------------------------------------------------------------------
+// TStr::Len
+// ----------------------------------------------------------------------------
+//
+TInt TStr::Len()
+    {
+    return iStr.Length();
+    }
+
+// ----------------------------------------------------------------------------
+// TStr::Compare
+// ----------------------------------------------------------------------------
+//
+TBool TStr::Compare( TInt aPos, TChar aChar )
+    {
+	TInt len = iStr.Length();
+	if ( ( aPos < 0) || ( aPos >= len ) )
+	    {
+		return EFalse;
+	    }
+	TChar ch = iStr[aPos];
+	if ( ch == aChar )
+	    {
+		return ETrue;
+	    }
+	return EFalse;
+    }
+
+// ----------------------------------------------------------------------------
+// TStr::Find
+// ----------------------------------------------------------------------------
+//
+TInt TStr::Find(TInt aPos, TChar aChar)
+    {
+	TInt len = iStr.Length();
+	if ( (aPos < 0) || (aPos >= len) )
+	    {
+		return KErrNotFound;
+	    }
+	    
+	TPtrC ptr(iStr.Mid(aPos)); // move to possition aPos
+	return ptr.Locate(aChar);
+    }
+
+//*****************************************************************************
+//* class CNSmlDMActiveCaller
+//*****************************************************************************
+
+// ----------------------------------------------------------------------------
+// CNSmlDMActiveCaller::NewL
+// ----------------------------------------------------------------------------
+//
+CNSmlDMActiveCaller* CNSmlDMActiveCaller::NewL( 
+                                       MNSmlDMActiveCallerObserver* aObserver )
+    {
+    CNSmlDMActiveCaller* self = new(ELeave) CNSmlDMActiveCaller( aObserver );
+	CleanupStack::PushL(self);
+	self->ConstructL();
+	CleanupStack::Pop(self);
+
+	return self;
+    }
+
+// ----------------------------------------------------------------------------
+// Destructor
+// ----------------------------------------------------------------------------
+//
+CNSmlDMActiveCaller::~CNSmlDMActiveCaller()
+    {
+	Cancel();
+	iTimer.Close();
+    }
+
+// ----------------------------------------------------------------------------
+// CNSmlDMActiveCaller::CNSmlDMActiveCaller
+// ----------------------------------------------------------------------------
+//
+CNSmlDMActiveCaller::CNSmlDMActiveCaller( 
+                                        MNSmlDMActiveCallerObserver* aObserver )
+                                      : CActive(CActive::EPriorityStandard )
+    {
+	iObserver = aObserver;
+    }
+
+// ----------------------------------------------------------------------------
+// CNSmlDMActiveCaller::ConstructL
+// ----------------------------------------------------------------------------
+//
+void CNSmlDMActiveCaller::ConstructL()
+    {
+	User::LeaveIfError(iTimer.CreateLocal());
+	CActiveScheduler::Add(this);
+    }
+
+// ----------------------------------------------------------------------------
+// CNSmlDMActiveCaller::DoCancel
+// ----------------------------------------------------------------------------
+//
+void CNSmlDMActiveCaller::DoCancel()
+    {
+	iTimer.Cancel();
+    }
+
+// ----------------------------------------------------------------------------
+// CNSmlDMActiveCaller::RunL
+// ----------------------------------------------------------------------------
+//
+void CNSmlDMActiveCaller::RunL()
+    {
+    iObserver->HandleActiveCallL( );
+    }
+
+// ----------------------------------------------------------------------------
+// CNSmlDMActiveCaller::RunError
+// ----------------------------------------------------------------------------
+//
+TInt CNSmlDMActiveCaller::RunError( TInt /*aError*/ )
+    {
+    return KErrNone;
+    }
+    
+// ----------------------------------------------------------------------------
+// CNSmlDMActiveCaller::CompleteSelf
+//
+// This function calls this class RunL.
+// ----------------------------------------------------------------------------
+//
+void CNSmlDMActiveCaller::CompleteSelf()
+    {
+	SetActive();
+	TRequestStatus* status = &iStatus;
+	User::RequestComplete( status, KErrNone );
+    }
+
+// ----------------------------------------------------------------------------
+// CNSmlDMActiveCaller::Start
+// ----------------------------------------------------------------------------
+//
+void CNSmlDMActiveCaller::Start( TInt aCallId, TInt aMilliseconds )
+    {
+	if (IsActive())
+		{
+		return;
+		}
+	
+	iCallId = aCallId;
+
+	if (aMilliseconds <= 0)
+		{
+		CompleteSelf();  // no delay - complete right away
+		}
+	else
+		{
+	    iTimer.After( iStatus, aMilliseconds*1000 );
+	    SetActive();
+		}
+    }
+
+// End of File
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/deviceupdates/src/serversettingsview.cpp	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,249 @@
+/*
+* Copyright (c) 2002-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:  Methods for ServerSettingsView
+*
+*/
+
+#include <hblineedit.h>
+#include <hbmessagebox.h>
+#include "serversettingsview.h"
+#include "dmadvancedview.h"
+#include "settingsdataformcustomitem.h"
+
+ServerSettingsView::ServerSettingsView(HbMainWindow* mainWindow, DmAdvancedView* serversview, QString& header, QGraphicsItem* parent): HbView(parent), iMainWindow(mainWindow),
+ form(NULL),dataformmodel(NULL),serversView(serversview),backbehaviorset(false)
+    {    
+    constructview(header);
+    viewspecificmenu = new HbMenu();
+    help = viewspecificmenu->addAction(hbTrId("txt_common_menu_help"));
+    exit = viewspecificmenu->addAction(hbTrId("txt_common_menu_exit"));
+    connect(exit, SIGNAL(triggered()), QCoreApplication::instance(), SLOT(quit()));    
+    setMenu(viewspecificmenu);
+    }
+ServerSettingsView::~ServerSettingsView()
+    {
+    
+    }  
+
+void ServerSettingsView::constructview(QString& header)
+    {
+    if(!form)
+        {
+        //custom prototype    
+        form = new HbDataForm();
+        customPrototype = new SettingsDataFormCustomItem(form);
+        form->setItemPrototype(customPrototype);        
+        dataformmodel =  new HbDataFormModel();    
+        makeviewItemsVisible(header);
+        form->setModel(dataformmodel); 
+        setWidget(form);    
+        iMainWindow->addView(this);    
+        }    
+    else //form already created
+        {   
+        }        
+    }
+
+int ServerSettingsView::setProfileValues(QStringList& settingdatalist,
+				bool& sessiontype, QStringList& apdata, int& currentap
+        					   ,  int& portnum, bool& networkauthval)
+    {
+    Q_UNUSED(sessiontype);
+    Q_UNUSED(networkauthval);	
+    int count =  settingdatalist.count();
+    apnameslist = apdata;
+    if(count > 0)
+        {
+        servername->setContentWidgetData(QString("text"), settingdatalist.first());
+        serverid->setContentWidgetData(QString("text"), settingdatalist[1]);         
+        serverpwd->setContentWidgetData(QString("echoMode"),HbLineEdit::Password );
+        serverpwd->setContentWidgetData(QString("text"), settingdatalist[2]);                
+        QStringList sList;
+        sList <<hbTrId("txt_device_update_button_internet");
+        sList<<hbTrId("txt_device_update_button_bluetooth");        
+        sessionmode->setContentWidgetData(QString("text"), sList[0]);//Internet selected
+        sessionmode->setContentWidgetData(QString("additionalText"), sList[1]);
+        
+        apdata.append(hbTrId("txt_device_update_setlabel_access_point_val_defaul"));
+        accesspoint->setContentWidgetData(QString("items"), apdata);
+        currentiapindex = currentap;
+        if(currentap >= 0)
+        accesspoint->setContentWidgetData(QString("currentIndex"), currentap); 
+        else
+            accesspoint->setContentWidgetData(QString("currentIndex"), apdata.count()-1); 
+        form->addConnection(accesspoint, SIGNAL(currentIndexChanged  (int  ) ),this, SLOT(accessPointItemChanged(int)));                
+        hostaddress->setContentWidgetData(QString("text"),settingdatalist[3]);        
+        port->setContentWidgetData(QString("text"),portnum);//Integer only setting needs to be done                   
+        username->setContentWidgetData(QString("text"),settingdatalist[4]);        
+        userpwd->setContentWidgetData(QString("echoMode"),HbLineEdit::Password );
+        userpwd->setContentWidgetData(QString("text"),settingdatalist[5]);                
+        QStringList yesnoList;
+        yesnoList <<hbTrId("txt_device_update_button_yes");
+        yesnoList<<hbTrId("txt_device_update_button_no");
+        networkauth->setContentWidgetData(QString("text"), yesnoList[0]);
+        networkauth->setContentWidgetData(QString("additionalText"), yesnoList[1]);        
+        networkusername->setContentWidgetData(QString("text"),settingdatalist[6]);
+        networkpwd->setContentWidgetData(QString("echoMode"),HbLineEdit::Password );
+        networkpwd->setContentWidgetData(QString("text"),settingdatalist[7]);                
+        return 0;
+        }
+    else 
+        return -1;
+    }
+
+
+void ServerSettingsView::backButtonClicked()
+    {   
+    qDebug("OMADM server settings back button clicked");
+    //Trigger main view
+    //Send data back to servers view and save the profile
+    QStringList itemlist;
+    itemlist << servername->contentWidgetData(QString("text")).toString();
+    itemlist << serverid->contentWidgetData(QString("text")).toString();
+    itemlist << serverpwd->contentWidgetData(QString("text")).toString();
+
+    itemlist << hostaddress->contentWidgetData(QString("text")).toString();
+
+    itemlist << username->contentWidgetData(QString("text")).toString();
+
+    itemlist << userpwd->contentWidgetData(QString("text")).toString();
+
+    itemlist
+            << networkusername->contentWidgetData(QString("text")).toString();
+
+    itemlist << networkpwd->contentWidgetData(QString("text")).toString();
+    QString sesstype =
+            sessionmode->contentWidgetData(QString("text")).toString();
+    bool sessmode = false;
+    if (sesstype.compare("Internet"))
+        sessmode = true;
+    //Map this current iap with iap array
+    QString curriap;
+    if (currentiapindex >= 0 && currentiapindex < apnameslist.count())
+        curriap = apnameslist[currentiapindex];//accesspoint->contentWidgetData(QString("currentText")).toString();
+    else
+        curriap.clear();
+    unsigned int portval = port->contentWidgetData(QString("text")).toInt();
+    QString netauthdata =
+            sessionmode->contentWidgetData(QString("text")).toString();
+    bool netauthval = false;
+    if (netauthdata.compare("yes"))
+        netauthval = true;
+    //check server name , server id, host addr & usrname        
+    if ((itemlist[0].length() > 0) && (itemlist[1].length() > 0)
+            && (itemlist[3].length() > 0) && (itemlist[4].length() > 0))
+        {
+        serversView->saveProfile(itemlist, sessmode, curriap, portval,
+                netauthval);
+        qDebug("omadm before crash");
+        form->removeConnection(accesspoint,
+                SIGNAL(currentIndexChanged (int ) ), this,
+                SLOT(accessPointItemChanged(int)));
+        qDebug("omadm after crash");
+        iMainWindow->setCurrentView(serversView);
+        //Form wk08 soft key owned by view
+        //iMainWindow->removeSoftKeyAction(Hb::SecondarySoftKey,backaction);
+        dataformmodel->clear();
+        }
+    else
+        {
+        HbMessageBox note(HbMessageBox::MessageTypeInformation);
+        note.setText(hbTrId(
+                "txt_device_update_dialog_enter_mandatory_field_values"));
+        note.setPrimaryAction(new HbAction("OK"));
+        note.setTimeout(HbPopup::NoTimeout);
+        note.exec();
+        }        
+    }
+
+void ServerSettingsView::checkServerIdvalue()
+    {
+    QString srvid = serverid->contentWidgetData(QString("text")).toString();
+    if(serversView->checkServerId(srvid))
+        {
+    serverid->setContentWidgetData(QString("text"), QString("")); 
+    HbMessageBox note(HbMessageBox::MessageTypeInformation);
+           note.setText(hbTrId("txt_device_update_dialog_invalid_server_id"));           
+           note.setTimeout(HbPopup::NoTimeout);
+           note.exec();         
+        }          
+    }
+
+void ServerSettingsView::setBackButtonBehavior()
+    {    
+    if (!backbehaviorset)
+        {
+        qDebug("OMADM server settings view back behavior setting");
+        backaction = new HbAction(Hb::BackNaviAction, this);        
+        connect(backaction, SIGNAL(triggered()), this,
+                SLOT(backButtonClicked()));                
+        setNavigationAction(backaction);        
+        backbehaviorset = true;
+        }
+    qDebug("OMADM server settings view back behavior setting done");
+    }
+
+void ServerSettingsView::makeviewItemsVisible(QString& formtitle)
+    {    
+    setBackButtonBehavior();
+    form->setHeading(hbTrId("txt_device_update_subhead_advanced_device_updates"));
+    form->setDescription(formtitle);    
+    if(dataformmodel->rowCount() <= 0)
+        {
+        QString itemname(hbTrId("txt_device_update_formlabel_server_name"));
+        servername = dataformmodel->appendDataFormItem(HbDataFormModelItem::TextItem , itemname);
+        
+        itemname = hbTrId("txt_device_update_formlabel_server_id");
+        serverid = dataformmodel->appendDataFormItem(HbDataFormModelItem::TextItem , itemname);
+    
+        form->addConnection(serverid, SIGNAL(editingFinished ()), 
+                this, SLOT(checkServerIdvalue()));
+        itemname = hbTrId("txt_device_update_formlabel_server_password");
+        serverpwd = dataformmodel->appendDataFormItem(HbDataFormModelItem::TextItem, itemname);
+        
+        itemname = hbTrId("txt_device_update_setlabel_session_mode");
+        sessionmode = dataformmodel->appendDataFormItem(HbDataFormModelItem::ToggleValueItem, itemname);
+        
+        itemname = hbTrId("txt_device_update_setlabel_access_point");
+        accesspoint = dataformmodel->appendDataFormItem(HbDataFormModelItem::ComboBoxItem , itemname);
+        
+        itemname = hbTrId("txt_device_update_formlabel_host_address");
+        hostaddress = dataformmodel->appendDataFormItem(HbDataFormModelItem::TextItem, itemname);
+        
+        itemname = hbTrId("txt_device_update_formlabel_port");
+        port = dataformmodel->appendDataFormItem(HbDataFormModelItem::CustomItemBase, itemname);
+    
+        itemname = hbTrId("txt_device_update_formlabel_user_name");
+        username = dataformmodel->appendDataFormItem(HbDataFormModelItem::TextItem, itemname);
+        
+        itemname = hbTrId("txt_device_update_formlabel_password");
+        userpwd = dataformmodel->appendDataFormItem(HbDataFormModelItem::TextItem, itemname);
+        
+        itemname = hbTrId("txt_device_update_setlabel_network_authentication");
+        networkauth = dataformmodel->appendDataFormItem(HbDataFormModelItem::ToggleValueItem, itemname);
+        
+        itemname = hbTrId("txt_device_update_formlabel_network_user_name");
+        networkusername = dataformmodel->appendDataFormItem(HbDataFormModelItem::TextItem, itemname);
+        
+        itemname = hbTrId("txt_device_update_formlabel_network_password");
+        networkpwd = dataformmodel->appendDataFormItem(HbDataFormModelItem::TextItem, itemname);
+        }
+    }
+
+void ServerSettingsView::accessPointItemChanged(int apindex)
+    {
+    currentiapindex = apindex;
+    qDebug("omadm iap changed");        
+    }
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/deviceupdates/src/settingsdataformcustomitem.cpp	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2002-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:  This class provides custom list item for the
+ * DataForm
+ *
+ */
+
+#include <settingsdataformcustomitem.h>
+#include <hbdataformmodelitem.h>
+#include <hblineedit.h>
+#include <hbinputeditorinterface.h>
+#include <qgraphicslinearlayout.h>
+#include <hblabel.h>
+
+SettingsDataFormCustomItem::SettingsDataFormCustomItem(QGraphicsItem *parent) :
+HbDataFormViewItem(parent)
+{
+}
+
+SettingsDataFormCustomItem::~SettingsDataFormCustomItem()
+{
+}
+
+HbAbstractViewItem* SettingsDataFormCustomItem::createItem()
+{
+    return new SettingsDataFormCustomItem(*this);
+}
+
+HbWidget* SettingsDataFormCustomItem::createCustomWidget()
+{
+    HbDataFormModelItem::DataItemType itemType =
+    static_cast<HbDataFormModelItem::DataItemType> 
+    ( modelIndex().data(HbDataFormModelItem::ItemTypeRole).toInt() );    
+    switch (itemType)
+    {
+      case HbDataFormModelItem::CustomItemBase :
+            {             
+            HbLineEdit* mLineEdit = new HbLineEdit();
+            mLineEdit->setText(QString("8080"));
+            HbEditorInterface editorInterface(mLineEdit);
+            editorInterface.setInputMode(HbInputModeNumeric); 
+            editorInterface.setConstraints(HbEditorConstraintFixedInputMode);            
+            return mLineEdit;            
+            }                
+        default:
+            return 0;
+    }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/deviceupdatesplugin/deviceupdatesplugin.pro	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,70 @@
+#
+# 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 is the project file defnition for deviceupdatesplugin.
+#
+#
+
+
+
+TEMPLATE = lib
+TARGET = deviceupdatesplugin
+DEPENDPATH += . \
+			  ./inc \
+			  ./src
+INCLUDEPATH += . \
+               ./inc
+
+CONFIG += hb plugin
+
+LIBS += -lcpframework \
+					-lcentralrepository
+
+# Input
+HEADERS += deviceupdatesplugin.h \
+		   deviceupdatesdata.h
+		   
+SOURCES += deviceupdatesplugin.cpp \
+		   deviceupdatesdata.cpp
+
+symbian: {
+    TARGET.EPOCALLOWDLLDATA = 1  
+    TARGET.UID3 = 0X2002DD04
+	
+	LIBS += -ldeviceupdatesplugin 
+	
+						SYMBIAN_PLATFORMS = WINSCW \
+    ARMV5
+
+}
+
+symbian {
+    deploy.path = C:
+    headers.sources = qmakepluginstubs/deviceupdatesplugin.qtplugin
+    headers.path = /resource/qt/plugins/controlpanel
+
+    # This is for new exporting system coming in garden
+    for(header, headers.sources):BLD_INF_RULES.prj_exports += "./$$header $$deploy.path$$headers.path/$$basename(header)"
+}
+symbian: INCLUDEPATH += /orbit/hb/include/hbservices \
+			   /orbit/hb/include/hbservices/private \
+			   /orbit/hb/include/hbcore \
+			   /orbit/hb/include/hbcore/private
+			   
+TARGET.CAPABILITY = CAP_GENERAL_DLL
+
+plugin.sources = deviceupdatesplugin.dll
+plugin.path = \resource\qt\plugins\controlpanel
+DEPLOYMENT += plugin
+
+# End of file	--Don't remove this.
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/deviceupdatesplugin/inc/deviceupdatesdata.h	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,49 @@
+/*
+* 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:  Device updates data for control panel
+*
+*/
+
+#ifndef	DEVICEUPDATESDATA_H_
+#define	DEVICEUPDATESDATA_H_
+
+#include <cpsettingformentryitemdata.h>
+
+_LIT( KDMUIProcess, "\\deviceupdates.exe" );
+_LIT( KDMUIName, "deviceupdates" );
+
+
+const TUid KUidSmlSyncApp = { 0x101F6DE5 };
+const TUint32 KNsmlDmUILaunch = 0x00000009;
+
+
+class DeviceUpdateData : public CpSettingFormEntryItemData
+{
+    Q_OBJECT
+public:
+    explicit DeviceUpdateData(CpItemDataHelper &itemDataHelper,
+												const QString &text = QString(),
+												const QString &description = QString(),
+												const HbIcon &icon = HbIcon(),
+												const HbDataFormModelItem *parent = 0);
+    void OpenDmAppL();
+    void CloseDmUi();
+    virtual ~DeviceUpdateData();
+public slots:
+	void onLaunchView();
+private:
+	virtual CpBaseSettingView *createSettingView() const;
+
+};
+#endif//	DEVICEUPDATESVIEW_H_
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/deviceupdatesplugin/inc/deviceupdatesplugin.h	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,42 @@
+/*
+* 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:  Device updates plug-in for control panel
+*
+*/
+
+
+#ifndef DEVICEUPDATESPLUGIN_H_
+#define DEVICEUPDATESPLUGIN_H_
+
+#include <cppluginplatinterface.h>
+#include <qobject.h>
+
+
+class CpItemDataHelper;
+
+class DeviceUpdatesPlugin : public QObject, public CpPluginPlatInterface
+{
+	Q_OBJECT
+  Q_INTERFACES(CpPluginPlatInterface)
+
+public:
+		DeviceUpdatesPlugin();
+
+    virtual ~DeviceUpdatesPlugin();
+
+    virtual int uid() const;
+    virtual CpSettingFormItemData *createSettingFormItemData(CpItemDataHelper &itemDataHelper) const;
+};
+
+#endif /* DEVICEUPDATESPLUGIN_H_ */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/deviceupdatesplugin/src/deviceupdatesdata.cpp	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,103 @@
+/*
+* 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:  Device updates data for control panel
+*
+*/
+
+
+#include <cpsettingformitemdata.h>
+#include <centralrepository.h>
+#include "deviceupdatesdata.h"
+
+
+DeviceUpdateData::DeviceUpdateData(CpItemDataHelper &itemDataHelper,
+													   const QString &text /*= QString()*/,
+													   const QString &description /*= QString()*/,
+													   const HbIcon &icon /*= HbIcon()*/,
+													   const HbDataFormModelItem *parent /*= 0*/)
+													   : CpSettingFormEntryItemData(itemDataHelper,
+													   text,
+													   description,
+													   icon,
+													   parent)
+{
+}
+
+DeviceUpdateData::~DeviceUpdateData()
+{
+	CloseDmUi();
+}
+
+// -----------------------------------------------------------------------------
+// DeviceUpdateData::OpenDmAppL()
+// -----------------------------------------------------------------------------
+//
+void DeviceUpdateData::OpenDmAppL()
+	{	
+		
+    	// Create DM UI Process
+			RProcess rp;
+			TInt cpLaunch(1);
+			CRepository *cenrep = CRepository::NewL(KUidSmlSyncApp);
+			if(cenrep)
+				{
+					cenrep->Set( KNsmlDmUILaunch, cpLaunch);
+					delete cenrep;
+					cenrep = NULL;
+				}	
+    	TInt err = rp.Create(KDMUIProcess,KNullDesC);
+            
+    	User::LeaveIfError(err);  
+    
+		
+      	rp.Resume();    // logon OK - start the server
+      
+    		
+	}
+
+// ---------------------------------------------------------------------------------------------
+// DeviceUpdateData::CloseDmUi
+// closes DM Ui
+// ---------------------------------------------------------------------------------------------	
+void DeviceUpdateData:: CloseDmUi()
+{
+	// Create DM UI Process
+	 
+	TFullName processName;		
+	TFindProcess process;
+	while ( process.Next( processName ) != KErrNotFound )
+	{
+		if ( ( processName.Find( KDMUIName ) != KErrNotFound ) )
+		{
+			RProcess rprocess;
+			if (rprocess.Open(process, EOwnerProcess) == KErrNone)
+			{				
+				rprocess.Terminate(KErrNone);
+				rprocess.Close();			
+			}
+		}
+	}	
+}	
+
+void DeviceUpdateData::onLaunchView()
+{
+	TRAP_IGNORE( OpenDmAppL() );
+}
+
+CpBaseSettingView *DeviceUpdateData::createSettingView() const
+{
+	return 0;
+}
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/deviceupdatesplugin/src/deviceupdatesplugin.cpp	Fri Apr 16 14:53:31 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:  Device updates plug-in for control panel
+*
+*/
+
+//#include <cpsettingformentryitemdataimpl.h>
+
+#include <cpitemdatahelper.h>
+#include "deviceupdatesplugin.h"
+#include "deviceupdatesdata.h"
+
+
+
+DeviceUpdatesPlugin::DeviceUpdatesPlugin()
+{
+	
+}
+
+DeviceUpdatesPlugin::~DeviceUpdatesPlugin()
+{
+	
+}
+
+int DeviceUpdatesPlugin::uid() const
+{
+	//  get a uid and replace it.
+   	 return 0X2002DD04;
+}
+
+CpSettingFormItemData *DeviceUpdatesPlugin::createSettingFormItemData(CpItemDataHelper& itemDataHelper) const
+{
+   
+	CpSettingFormItemData *entryItem = new DeviceUpdateData(itemDataHelper, QString("Device updates"),
+                                          QString());
+
+	return entryItem;	
+}
+
+Q_EXPORT_PLUGIN2( deviceupdatesplugin, DeviceUpdatesPlugin)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/deviceupdatesqtsp/deviceupdatesqtsp.pro	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,60 @@
+#
+# 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:
+#
+#
+
+TEMPLATE = app
+CONFIG += hb \
+          qt \
+		  service
+TARGET = deviceupdatesqtsp
+symbian: {
+
+	TARGET.CAPABILITY = CAP_APPLICATION 
+    TARGET.EPOCALLOWDLLDATA = 1  
+    TARGET.UID3 = 0x1028339D	
+	BLD_INF_RULES.prj_exports += "$${LITERAL_HASH}include <platform_paths.hrh>"
+	BLD_INF_RULES.prj_exports += "./rom/deviceupdatesqtsp.iby CORE_APP_LAYER_IBY_EXPORT_PATH(deviceupdatesqtsp.iby)"
+	BLD_INF_RULES.prj_exports += "./rom/deviceupdatesqtsp_resources.iby LANGUAGE_APP_LAYER_IBY_EXPORT_PATH(deviceupdatesqtsp_resources.iby)"
+	LIBS += -lws32	\
+			apparc.lib
+}			   
+symbian: INCLUDEPATH += /orbit/hb/include/hbservices \
+			   /orbit/hb/include/hbservices/private \
+			   /orbit/hb/include/hbcore \
+			   /orbit/hb/include/hbcore/private	
+INCLUDEPATH += .
+INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE			   
+
+HEADERS += ./inc/DmTelServiceHandler.h 
+
+SOURCES += ./src/main.cpp
+SOURCES += ./src/DmTelServiceHandler.cpp
+
+LIBS += -lhbcore \
+        -lxqservice \
+        -lxqserviceutil
+
+SERVICE.FILE += ./resources/service_conf.xml
+SERVICE.OPTIONS = embeddable
+SERVICE.OPTIONS += hidden
+
+libFiles.sources = xqservice.dll
+libFiles.path = "!:\sys\bin"
+DEPLOYMENT += libFiles
+
+MOC_DIR = moc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/deviceupdatesqtsp/inc/DmTelServiceHandler.h	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,39 @@
+/*
+ * 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:
+ *
+ */
+ 
+#ifndef DMTELSERVICEHANDLER_H
+#define DMTELSERVICEHANDLER_H
+
+#include <xqserviceprovider.h>
+#include <xqservicerequest.h>
+#include <xqserviceutil.h>
+
+_LIT( KDMUIProcess, "\\deviceupdates.exe" );
+
+class DmTelServiceHandler : public XQServiceProvider
+{
+    Q_OBJECT
+public:
+    DmTelServiceHandler(QObject *parent = 0);
+    ~DmTelServiceHandler();
+
+public slots:
+    void showVersionNumber();
+
+};
+
+#endif /* DMTELSERVICEHANDLER_H */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/deviceupdatesqtsp/resources/service_conf.xml	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<service name="com.nokia.services"  filepath="must-not-be-empty" >
+  <description>Device Manager service</description>
+  <interface name="devicemanager" version="1.0" capabilities="">
+    <description>Launch DeviceManager</description>
+  </interface>
+</service>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/deviceupdatesqtsp/rom/deviceupdatesqtsp.iby	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,27 @@
+/*
+* 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:     hbvideoplayerresources.iby
+*
+*/
+
+#ifndef __DeviceUpQtSp_IBY__
+#define __DeviceUpQtSp_IBY__
+
+#include <bldvariant.hrh>
+#include <data_caging_paths_for_iby.hrh> 
+
+file = ABI_DIR/BUILD_DIR/deviceupdatesqtsp.exe PROGRAMS_DIR/deviceupdatesqtsp.exe
+data = DATAZ_/private/10003a3f/import/apps/deviceupdatesqtsp_reg.rsc private/10003a3f/import/apps/deviceupdatesqtsp_reg.rsc
+
+#endif
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/deviceupdatesqtsp/rom/deviceupdatesqtsp_resources.iby	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,27 @@
+/*
+* 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:     hbvideoplayerresources.iby
+*
+*/
+
+#ifndef __DeviceUpQtSp_RESORCES_IBY__
+#define __DeviceUpQtSp_RESORCES_IBY__
+
+#include <data_caging_paths_for_iby.hrh> 
+
+
+data=DATAZ_/resource/apps/deviceupdatesqtsp.rsc /resource/apps/deviceupdatesqtsp.rsc
+
+
+#endif
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/deviceupdatesqtsp/src/DmTelServiceHandler.cpp	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,43 @@
+/*
+ * 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 "DmTelServiceHandler.h"
+#include <hbapplication.h>
+
+DmTelServiceHandler::DmTelServiceHandler(QObject *parent):
+    XQServiceProvider("com.nokia.services.devicemanager", parent)
+{
+    publishAll();
+}
+
+DmTelServiceHandler::~DmTelServiceHandler()
+{
+}
+
+void DmTelServiceHandler::showVersionNumber()
+{
+// Create DM UI Process
+RProcess rp;
+TInt err = rp.Create(KDMUIProcess,KNullDesC);
+User::LeaveIfError(err);  
+rp.SetPriority(EPriorityForeground);
+rp.Resume();    // logon OK - start the server
+
+// quit the service provider app.
+//QCoreApplication::quit();	
+QCoreApplication::exit(0);		  
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/deviceupdatesqtsp/src/main.cpp	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,27 @@
+/*
+* 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 <hbinstance.h>
+#include <hbapplication.h>
+#include "DmTelServiceHandler.h"
+
+int main(int argc, char **argv)
+{
+    HbApplication a( argc, argv );
+    DmTelServiceHandler srvcHndlr;
+    return a.exec();
+}
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/deviceupdatesui.pro	Fri Apr 16 14:53:31 2010 +0300
@@ -0,0 +1,25 @@
+#
+# 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:  Device update project file
+#
+TEMPLATE = subdirs
+
+SUBDIRS  += deviceupdates  deviceupdatesplugin  deviceupdatesqtsp  cpqtsp devicemanagementnotifiersplugin
+
+CONFIG += ordered
+
+symbian: {
+SYMBIAN_PLATFORMS = WINSCW \
+    ARMV5
+    }
\ No newline at end of file
--- a/group/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ b/group/bld.inf	Fri Apr 16 14:53:31 2010 +0300
@@ -24,19 +24,4 @@
 
 
 //omadm
-#include "../omadm/group/bld.inf"
-
-// pnpmobileservices
-#include "../pnpmobileservices/group/bld.inf"
-
-//devicediagnostics
-#include "../devicediagnostics/group/bld.inf"
-
-//applicationmanagement
-#include "../applicationmanagement/group/bld.inf"
-
-//customization
-#include "../customization/group/bld.inf"
-
-//omacp
-#include "../omacp/group/bld.inf"
\ No newline at end of file
+#include "../deviceupdatesui/adapters/bld/bld.inf"
\ No newline at end of file
--- a/layers.sysdef.xml	Tue Feb 02 00:03:17 2010 +0200
+++ b/layers.sysdef.xml	Fri Apr 16 14:53:31 2010 +0300
@@ -1,14 +1,17 @@
 <?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/app/devicecontrol" >
 ]>
 
-<SystemDefinition name="devicecontrol" schema="1.4.0">
+<SystemDefinition name="devicecontrol" schema="1.5.1">
   <systemModel>
     <layer name="app_layer">
       <module name="devicecontrol">
         <unit unitID="spdo.devicecontrol" mrp="" bldFile="&layer_real_source_path;/group" name="devicecontrol" />
+        <unit unitID="spdo.devicecontrol.pro" mrp="" bldFile="&layer_real_source_path;" name="devicecontrol_pro" proFile="devicecontrol.pro"/>
       </module>
     </layer>
   </systemModel>
-</SystemDefinition>
\ No newline at end of file
+</SystemDefinition>
+
+
--- a/omacp/group/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-/*
-* Copyright (c) 2002-2006 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 bld file for omacp.
-*
-*/
-
-#include "../omacpadapters/group/bld.inf"
--- a/omacp/group/omacplogger.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,135 +0,0 @@
-/*
-* Copyright (c) 2002-2006 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:  Code for getting logs for omacp components.
-*
-*/
-
-#ifndef __LOGGER_H__
-#define __LOGGER_H__
-
-#ifdef _DEBUG
-    #define LOGGING_ENABLED
-#endif
-#ifdef LOGGING_ENABLED          // This must be enabled to use logging system
-
-#define LOGGER_LOGGING          // Log to Logger
-
-
-
-#ifdef LOGGER_LOGGING
-
-//  INCLUDES
-#include <flogger.h>
-
-// LOG SETTINGS 
-_LIT( KProvLogFolder, "Provisioning" );
-_LIT( KEmailAdapterLogFile, "EmailAdapter.TXT" );
-
-#endif
-
-// CONSTANTS  
-// None.
-
-// MACROS
-/*
------------------------------------------------------------------------------
-
-    INTERNAL MACROs. 
-
-    DO NOT USE THESE DIRECTLY !!! 
-    SEE EXTERNAL MACROS
-
------------------------------------------------------------------------------
-*/
-
-#ifdef LOGGER_LOGGING
-
-#define INTRLOGTEXT( AAA )                                                                        \
-    {                                                                                            \
-    RFileLogger::Write( KProvLogFolder(), KEmailAdapterLogFile(), EFileLoggingModeAppend, AAA );            \
-    }
-#define INTRLOGSTRING( AAA )                                                                    \
-    {                                                                                            \
-    _LIT( tempLogDes, AAA );                                                                    \
-    RFileLogger::Write( KProvLogFolder(), KEmailAdapterLogFile(), EFileLoggingModeAppend, tempLogDes() ); \
-    }
-#define INTRLOGSTRING2( AAA, BBB )                                                                \
-    {                                                                                            \
-    _LIT( tempLogDes, AAA );                                                                    \
-    RFileLogger::WriteFormat( KProvLogFolder(), KEmailAdapterLogFile(), EFileLoggingModeAppend, TRefByValue<const TDesC>( tempLogDes()), BBB ); \
-    }
-#define INTRLOGSTRING3( AAA, BBB, CCC )                                                            \
-    {                                                                                            \
-    _LIT( tempLogDes, AAA );                                                                    \
-    RFileLogger::WriteFormat( KProvLogFolder(), KEmailAdapterLogFile(), EFileLoggingModeAppend, TRefByValue<const TDesC>( tempLogDes()), BBB, CCC ); \
-    }
-#else
-#define INTRLOGTEXT( AAA )
-#define INTRLOGSTRING( AAA )
-#define INTRLOGSTRING2( AAA, BBB )
-#define INTRLOGSTRING3( AAA, BBB, CCC )
-#endif
-
-/*
------------------------------------------------------------------------------
-
-    EXTERNAL MACROs
-
-    USE THESE MACROS IN YOUR CODE !
-
------------------------------------------------------------------------------
-*/
-
-
-#define LOGTEXT( AAA )                { \
-                                    INTRLOGTEXT( AAA ); \
-                                    }   // Example: LOGTEXT( own_desc );
-
-#define LOGSTRING( AAA )            { \
-                                    INTRLOGSTRING( AAA ); \
-                                    }   // Example: LOGSTRING( "Test" );
-
-#define LOGSTRING2( AAA, BBB )        { \
-                                    INTRLOGSTRING2( AAA, BBB ); \
-                                    }  // Example: LOGSTRING( "Test %i", aValue );
-
-#define LOGSTRING3( AAA, BBB, CCC )    { \
-                                    INTRLOGSTRING3( AAA, BBB, CCC ); \
-                                    } // Example: LOGSTRING( "Test %i %i", aValue1, aValue2 );
-
-
-#else   // LOGGING_ENABLED
-
-#define LOGTEXT( AAA ) 
-#define LOGSTRING( AAA ) 
-#define LOGSTRING2( AAA, BBB )    
-#define LOGSTRING3( AAA, BBB, CCC )    
-
-#endif  // LOGGING_ENABLED
-
-// DATA TYPES
-// None.
-
-// FUNCTION PROTOTYPES
-// None.
-
-// FORWARD DECLARATIONS
-// None.
-
-// CLASS DECLARATION
-// None.
-
-#endif  // __LOGGER_H__
-
-//  End of File
--- a/omacp/omacpadapters/EmailAdapter/Group/101F84E4.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-/*
-* Copyright (c) 2002 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:  Resource file defining the ProvisioningAdapter plugin.
-*
-*/
-
-
-
-//  INCLUDES
-#include <registryinfo.rh>
-#include "../../group/omacpadapteruids.h"
-
-
-//  RESOURCE DEFINITIONS 
-// -----------------------------------------------------------------------------
-//   
-// theInfo
-// Resource defining the ProvisioningAdapter plugin.
-//
-// -----------------------------------------------------------------------------
-//
-
-RESOURCE REGISTRY_INFO theInfo
-	{
-	dll_uid = KProvisioningEMailAdapterDllUid3;
-	interfaces = 
-		{
-		INTERFACE_INFO
-			{
-			interface_uid = KProvisioningAdapterInterface;
-			implementations = 
-				{
-				IMPLEMENTATION_INFO
-					{
-					implementation_uid = KProvisioningEMailAdapterUid;
-					version_no = 1;
-					display_name = "WAP Email PA"; // Use short name to save RAM and ROM space
-					default_data = "";
-					opaque_data = "10";
-					}
-				};
-			}
-		};
-	}
-
--- a/omacp/omacpadapters/EmailAdapter/Group/WPEmailAdapter.mmp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,80 +0,0 @@
-/*
-* Copyright (c) 2002-2006 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 definition file for the ProvisioningEmailAdapter.
-*
-*/
-
-
-#include <platform_paths.hrh>
-#include <data_caging_paths.hrh>
-#include "../../group/omacpadapteruids.h"
-
-#include "../src/LogDef.h"
-
-TARGET          wpemailadapter.dll
-TARGETTYPE      PLUGIN
-UID             KProvisioningEMailAdapterUid2 KProvisioningEMailAdapterDllUid3
-
-
-VENDORID        VID_DEFAULT
-CAPABILITY      CAP_ECOM_PLUGIN
-
-SOURCEPATH      ../src
-SOURCE          CWPEmailAdapter.cpp 
-SOURCE          CWPEmailAdapterGroupProxy.cpp CWPEmailAdapterMain.cpp
-SOURCE          CWPEmailItem.cpp 
-SOURCE          CWPEmailSaveItem.cpp CWPEmailSaveSmtpPopItem.cpp CWPEmailSaveSmtpImapItem.cpp
-SOURCE          CWPLog.cpp
-
-SOURCEPATH      ../Group
-
-START RESOURCE 101F84E4.rss
-TARGET wpemailadapter.rsc
-END
-
-START RESOURCE WPEmailAdapterResource.rss
-HEADER
-TARGET wpemailadapterresource.rsc
-TARGETPATH RESOURCE_FILES_DIR
-LANGUAGE_IDS
-END
-
-USERINCLUDE     ../Inc ../Group ../../group
-
-APP_LAYER_SYSTEMINCLUDE
-SYSTEMINCLUDE 	/epoc32/include/ecom
-
-LIBRARY         euser.lib
-LIBRARY         provisioningengine.lib 
-
-LIBRARY         imcm.lib
-LIBRARY         msgs.lib muiu.lib
-
-LIBRARY         etext.lib                   //CRichText
-LIBRARY         bafl.lib 
-LIBRARY         apengine.lib commdb.lib
-LIBRARY         etel.lib                    // RTelServer
-LIBRARY         etelmm.lib                  // RMobilePhone
-LIBRARY		imumda.lib
-
-
-LIBRARY  pnp.lib
-
-
-
-
-DEBUGLIBRARY    flogger.lib                 // Only in debug builds
-
-
-SMPSAFE
--- a/omacp/omacpadapters/EmailAdapter/Group/WPEmailAdapterResource.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-/*
-* Copyright (c) 2002 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:  Resource file.
-*
-*/
-
-
-
-//  INCLUDES
-#include <badef.rh>
-#include <provisioning.loc>
-
-RESOURCE LBUF r_qtn_sm_title_email_settings
-	{ 
-	txt = qtn_sm_mailboxes; 
-	}
-
-RESOURCE LBUF r_qtn_sm_default_email_name
-	{ 
-	txt = qtn_sm_remote_mailbox_name; 
-	}
-
-
-// End of file
--- a/omacp/omacpadapters/EmailAdapter/Group/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-/*
-* Copyright (c) 2002-2006 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 bld file for Email Adapter.
-*
-*/
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-../../rom/omacpadapters.iby					CORE_APP_LAYER_IBY_EXPORT_PATH(omacpadapters.iby)
-../../rom/omacpresources.iby					LANGUAGE_APP_LAYER_IBY_EXPORT_PATH(omacpresources.iby)
-
-PRJ_MMPFILES
-WPEmailAdapter.mmp
-
-PRJ_TESTMMPFILES
-
-//  End of File  
--- a/omacp/omacpadapters/EmailAdapter/Inc/CWPEmailAdapter.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,247 +0,0 @@
-/*
-* Copyright (c) 2002 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:  Email setting adapter.
-*
-*/
-
-
-#ifndef _CWPEMAILADAPTER_H
-#define _CWPEMAILADAPTER_H
-
-// INCLUDES
-#include "CWPAdapter.h"
-#include <MWPContextExtension.h>
-
-#include <msvapi.h>
-
-// FORWARD DECLARATIONS
-class CDesC16Array;
-class CWPEmailItem;
-class CWPEmailSaveItem;
-class CCommsDatabase;
-
-
-// CLASS DECLARATION
-
-/**
- * CWPEmailAdapter handles provisioning settings.
- *  @lib WPEmail.dll
- *  @since 2.0
- */ 
-class CWPEmailAdapter : public CWPAdapter, 
-                        private MMsvSessionObserver, 
-                        private MWPContextExtension
-	{
-	public:  // Constructors and destructor
-        
-        /**
-        * Two-phased constructor.
-        * @param None
-        * @return self
-        */
-        static CWPEmailAdapter* NewL();
- 		
-        /// Destructor
-        virtual ~CWPEmailAdapter();
-
-    public: // From CWPAdapter
-        /**
-        * From CWPAdapter
-        * @param 
-        * @return 
-        */     
-        TInt ItemCount() const;
-        /**
-        * From CWPAdapter
-        * @param 
-        * @return 
-        */             
-		const TDesC16& SummaryTitle(TInt aIndex) const;
-
-        /**
-        * From CWPAdapter
-        * @param 
-        * @return 
-        */     		
-		const TDesC16& SummaryText(TInt aIndex) const;
-		
-        /**
-        * From CWPAdapter
-        * @param 
-        * @return 
-        */     		
-        void SaveL(TInt aItem);
-
-        /**
-        * From CWPAdapter
-        * @param 
-        * @return 
-        */             
-        TBool CanSetAsDefault( TInt aItem ) const;
-
-        /**
-        * From CWPAdapter
-        * @param 
-        * @return 
-        */             
-        void SetAsDefaultL( TInt aItem );
-        
-        /**
-        * From CWPAdapter
-        * @param 
-        * @return 
-        */             
-		TInt DetailsL( TInt aItem, MWPPairVisitor& aVisitor );
-
-        /**
-        * From CWPAdapter
-        * @param 
-        * @return 
-        */     		
-        TInt ContextExtension( MWPContextExtension*& );
-
-	private: // From MWPVisitor
-        /**
-        * From MWPVisitor
-        * @param 
-        * @return 
-        */       
-		void VisitL(CWPCharacteristic& aElement);
-		
-		/**
-        * From MWPVisitor
-        * @param 
-        * @return 
-        */       
-		void VisitL(CWPParameter& aElement);
-		
-		/**
-        * From MWPVisitor
-        * @param 
-        * @return 
-        */       
-		void VisitLinkL(CWPCharacteristic& aCharacteristic );
-    
-    private: // From MWPContextExtension
-		
-		/**
-        * From MWPContextExtension
-        * @param 
-        * @return 
-        */    
-		const TDesC8& SaveDataL( TInt aIndex ) const;
-		
-		/**
-        * From MWPContextExtension
-        * @param 
-        * @return 
-        */    		
-		void DeleteL( const TDesC8& aSaveData );
-		
-		/**
-        * From MWPContextExtension
-        * @param 
-        * @return 
-        */    		
-        TUint32 Uid() const;
-
-	private:  // Constructor
-        /**
-        * C++ default constructor.
-        */
-		CWPEmailAdapter();
-
-        /**
-        * Symbian 2nd phase constructor.
-        */
-		void ConstructL();
-
-    private:  // New functions
-
-        /**
-        * Check are we dealing with email settings
-        * @return ETrue if settings accepted
-        */
-        TBool AcceptedSettingGroup();
-
-        /**
-        * Add SMTP IMAP setting pair to iEmailSettingPair array
-        * @param aSmtpItem SMTP setting item.
-        * @param aImapItem IMAP setting item.
-        */
-        void AddSmtpImapSettingsL( CWPEmailItem* aSmtpItem, 
-                                   CWPEmailItem* aImapItem );
-
-        /**
-        * Add SMTP POP setting pair to iEmailSettingPair array
-        * @param aSmtpItem SMTP setting item.
-        * @param aPopItem POP setting item.
-        */
-        void AddSmtpPopSettingsL( CWPEmailItem* aSmtpItem, 
-                                  CWPEmailItem* aPopItem );
-
-        /**
-        * Search from iEmailSettings array a pair for new setting item.
-        * If match found creates new setting pair. 
-		* @param aItem new setting item
-        */
-        void CreateSettingsL( CWPEmailItem* aItem );
-    
-    protected:  // Functions from base classes
-        
-        /**
-        * From MMsvSessionObserver
-        */
-        void HandleSessionEventL( TMsvSessionEvent aEvent, 
-                                  TAny* aArg1, 
-                                  TAny* aArg2, 
-                                  TAny* aArg3 );
-
-		
-	private:  // Data
-        
-        // Own: Message server session
-        CMsvSession* iSession;
-        
-        /// Own: CommsDataBase
-        CCommsDatabase* iCommsDb;
-        /**
-        * Own: Stores all individual settings
-        */
-        CArrayPtr<CWPEmailItem>* iEmailSettings;
-        
-        /** 
-        * Own: Stores complete settings pairs
-        */
-        CArrayPtr<CWPEmailSaveItem>* iEmailSettingPair;
-        
-        /** 
-        * Ref: Current setting item. 
-        * Ownership is transferred to Setting array
-        **/
-        CWPEmailItem* iCurrentItem;
-
-        /**
-        * Own: Title text for email settings
-        */
-        HBufC* iTitle;
-	
-    private: // For testing usage.
-		friend class T_CWPEmailAdapter;
-        
-	};
-
-#endif	_CWPEMAILADAPTER_H
-            
-// End of File
--- a/omacp/omacpadapters/EmailAdapter/Inc/CWPEmailItem.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,140 +0,0 @@
-/*
-* Copyright (c) 2002 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: 
-*     Holds Email setting item
-*
-*/
-
-
-#ifndef CWPEmailItem_H
-#define CWPEmailItem_H
-
-// INCLUDES
-#include <MWPVisitor.h>
-#include <e32base.h>
-
-// FORWARD DECLARATIONS
-class CWPCharacteristic;
-
-//E-mail Notification and retrieval parameters
-_LIT( KParamEMN, "EMN" );
-_LIT( KParamCS, "CS" );
-_LIT( KParamLMS, "LMS" );
-_LIT( KParamRETRMODE, "RETR-MODE" );
-_LIT( KParamRETRSIZE, "RETR-SIZE" );
-_LIT( KParamPOLL, "POLL" );
-_LIT( KParamONLINE, "ONLINE" );
-
-
-// CLASS DECLARATION
-
-/**
- * CWPEmailItem handles Email settings.
- * @since 2.0
- */ 
-class CWPEmailItem : public CBase, public MWPVisitor
-	{
-	public:  // Constructors and destructor
-
-        /**
-        * Creates Email setting item
-		* @since 2.0
-        * @return self
-        */
-		static CWPEmailItem* NewL();
-        static CWPEmailItem* NewLC();
-
-        /**
-        * Destructor.
-        */
-		~CWPEmailItem();
-
-    public: // New functions
-		
-		/**
-        * Get parameter value. Must be one of enumeration
-		* TWPParameterID.
-		* @since 2.0
-		* @return param value or KNullDesC if not found
-		*/
-		const TDesC& ParameterValue(TInt aParamID) const;
-		       
-        /**
-        * Get associated IAP name for email settings.
-		* @since 2.0
-        * @return Internet Access Point name.
-        */
-        HBufC* AssociatedIapNameL();
-        
-        /**
-        * Get associated IAP id
-        * @since 2.0
-        * @return IAP id or Zero if not found
-        */
-		TUint32 AssociatedIapId();
-
-        /**
-        * Check that current settings are valid
-        * since 2.0
-        * @return ETrue if settings are valid
-        */
-        TBool IsValid() const;
-        
-        /**
-        * Get parameter value. Must be one of enumeration
-        * TWPParameterID.
-        * @since 2.0
-        * @return param value or KNullDesC if not found
-        */
-        const TDesC& ParameterValue(const TDesC& aParamName);
-
-
-	public: // From MWPVisitor
-
-		void VisitL(CWPCharacteristic& aCharacteristic);
-		void VisitL(CWPParameter& aParameter);
-		void VisitLinkL(CWPCharacteristic& aCharacteristic );
-
-
-	private:  // constructor 
-
-        /**
-        * C++ default constructor.
-        */
-        CWPEmailItem();
-
-        /**
-        * 2nd phase constructor
-        */
-		void ConstructL();
-		
-	private:  // Data
-        
-        /**
-		* Ref: Array to Mail setting parameters
-		**/ 
-		CArrayPtr<CWPParameter>* iEmailSettingParams;
-
-        ///Ref:to the IAP settings
-        CWPCharacteristic* iNapDef;
-
-    
-    private: // for testing use
-        friend class T_CWPEmailItem;
-		
-	};
-
-#endif	// CWPEmailItem_H
-            
-// End of File
--- a/omacp/omacpadapters/EmailAdapter/Inc/CWPEmailSaveItem.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,459 +0,0 @@
-/*
-* Copyright (c) 2002 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:  Save mail settings base class 
-*
-*/
-
-
-
-#ifndef CWPEMAILSAVEITEM_H
-#define CWPEMAILSAVEITEM_H
-
-//  INCLUDES
-#include <e32base.h>
-#include <msvapi.h>
-#include    <cemailaccounts.h>
-#include <MuiuMsvUiServiceUtilities.h>
-
-// FORWARD DECLARATIONS
-class CWPEmailItem;
-class MWPSaveObserver;
-class CDesC16Array;
-class CMsvSession;
-class CCommsDatabase;
-
-#include <ImumDaSettingsData.h>
-#include <ImumDomainApi.h>
-#include <ImumDaMailboxServices.h>
-
-
-//Default values of Retrieval Parameters 
-const TInt64 KImumMboxDefaultAutoRetrievalStartHour = 0;
-const TInt64 KImumMboxDefaultAutoRetrievalEndHour = 0;
-const TInt KImumMboxDefaultAutoRetrieval = TImumDaSettings::EValueAutoOff;
-
-//Boundary values of Retrieval Parameters 
-const TInt KImumPollMinUpdateLimit = 5;
-const TInt KImumPollMaxUpdateLimit = 360;
-const TInt KImumMboxInboxMinUpdateLimit = 0;
-const TInt KImumMboxInboxMaxUpdateLimit = 999;
-const TInt KRetHourLowerBound = 0;
-const TInt KRetHourUpperBound = 23;
-const TInt KRetMinLowerBound = 0;
-const TInt KRetMinUpperBound = 59;
-const TInt KRetHourMinLeadLimit = 10;
-
-//Standard Lengths of Hours, Minutes and Days
-const TInt KRetHourStandardLength = 2;
-const TInt KRetMinStandardLength = 2;
-const TInt KRetDaysStandardMaxLength = 14;
-const TInt KRetDayStandardLength = 1;
-
-//Delimiters
-const TInt KColonChar = ':';
-const TInt KGTChar = '>';
-const TInt KCommaChar = ',';
-
-
-//Retrieval Days Constants
-const TInt KRetSunday = 0;
-const TInt KRetMonday = 1;
-const TInt KRetTuesday = 2;
-const TInt KRetWednesday = 3;
-const TInt KRetThursday = 4;
-const TInt KRetFriday = 5;
-const TInt KRetSaturday = 6;
-
-//Poll Values constants
-const TInt KPoll5minutes = 5;
-const TInt KPoll15minutes = 15;
-const TInt KPoll30minutes = 30;
-const TInt KPoll1Hour = 1;
-const TInt KPoll2Hours = 2;
-const TInt KPoll4Hours = 4;
-const TInt KPoll6Hours = 6;
-            
-//Literals for CS parameter parsing
-_LIT( KRetSecMilliSec, "00.000000" );
-_LIT(KComma, ","); 
-_LIT( KRetLeadingZero, "0" );
-
-
-// CLASS DECLARATION
-
-/**
-*  Save settings base class.
-*
-*  @lib WPEmailAdapter.lib
-*  @since 2.0
-*/
-class CWPEmailSaveItem : public CBase
-    {
-    public:  // Constructors and destructor
-        
-        /// Setting ids
-        struct TSettingId
-            {
-            TInt32 iSmtpId;
-            TInt32 iPopImapId;
-            };
-        
-        /**
-        * Symbian 2nd phase constructor.
-        */
-        void ConstructL();
-        
-        /**
-        * constructor.
-        */
-        CWPEmailSaveItem();
-        
-        /**
-        * Destructor.
-        */
-        virtual ~CWPEmailSaveItem();
-
-    public: // New functions
-        
-        /**
-        * Save settings
-        * Save all settings to system.
-        * @param aSession  
-        * @since 2.0
-        */
-        virtual void SaveL( CMsvSession* aSession ) = 0;
-
-        /**
-        * Validate Setting content
-        * Check that mandatory fields exist and 
-        * maximum lengths are not exeeded.
-        * @since 2.0
-        * @return ETrue if settings are valid.
-        */
-        virtual TBool ValidateL() = 0;
-
-        /**
-        * Set this setting as default.
-        * @since 2.0
-        */
-        virtual void SetAsDefaultL();
-
-        /**
-        * Setting name
-        * @since 2.0
-        * @return default setting name.
-        */
-        virtual const TDesC& SummaryText();
-        
-        /**
-        * Set new default name
-        * default name is used when saving settings to the
-        * msgServer. 
-        * @param aDefaultName new dafault name.
-        */
-        void SetDefaultNameL( const TDesC& aDefaultName );
-
-        /**
-        * Set reference to CommsDataBase
-        * This is needed when saving email settings.
-        * Must be set before calling SaveL. 
-        * @param aCommsDataBase reference to CommsDB
-        */
-        void SetCommsDataBase( CCommsDatabase& aCommsDataBase );
-        
-        /**
-        * Get data needed for removing these setting from the system.
-        * @return setting IDs of saved settings.
-        */
-        const TDesC8& SaveData();
-
-    protected:  // New functions
-        
-        /**
-        * Saves given settings to message server
-        * @param aSmtp SMTP item
-        * @param aPopImap POP or IMAP item
-        * @param aIsPopNotImap email POP or IMAP setting item
-        * @param aSession message server session 
-        * Panic if aSession is NULL,
-        */
-        void SaveMailSettingsToMessageServerL( CWPEmailItem& aSmtp, 
-                                               CWPEmailItem& aPopImap,
-                                               TBool aIsPopNotImap,
-                                               CMsvSession* aSession );
-
-        /**
-        * Valid Email address
-        * @param aAddress email address.
-        * @return ETrue if address format is valid
-        */
-        TBool IsValidEmailAddressL(const TDesC& aAddress);
-
-        /**
-        * Get valid email address
-        * @param aAddress
-        * @return Valid email address or empty.
-        */
-        TPtrC GetValidEmailAddressL(const TDesC& aAddress);
-
-        /**
-        * Validate Text
-        * @param serverAddress
-        * @return KErrGeneral for server address containing only white space characters; KErrNone otherwise.
-        */
-        TInt ValidateText(const TDesC& serverAddress);
-        
-        /**
-        * Validate Server Address
-        * @param serverAddress
-        * @return KErrNone for a valid server address; KErrGeneral otherwise.
-        */
-        TInt ValidateServerAddress(const TDesC& serverAddress);
-        
-        /**
-        * Validate Port No
-        * @param portVal
-        * @return KErrNone for Port No falls between the valid range; KErrArgument otherwise.
-        */
-        TInt ValidatePortNo(const TUint& portVal);
-      
-    private: // New functions
-
-        /**
-        * Search existing email settings
-        */
-        TInt GetMailAccountNamesL();
-
-        /**
-        * Fill array with existing setting names.
-        * @param aArray array to be filled 
-        */
-        void ExistingSettingNamesL( CDesC16Array& aArray );
-        
-        /**
-        * Search existing setting names.
-        * @param aName setting name.
-        * @param aReload ETrue if reload is needed.
-        * @return ETrue if setting name already exist.
-        */
-        TBool SettingNameAlreadyExistsL( const TDesC& aName, TBool aReload );
-     
-        /**
-        * Fill TEntry with SMTP specific data
-        * @param TEntry TEntry to be filled.
-        * @param aIapName name of the used IAP
-        * @param aMailboxName name of the remote mailbox
-        */
-        void FillTEntryWithSmtpData( TMsvEntry& aTEntry,
-                                     const TDesC& aIapName, 
-                                     const TDesC& aMailboxName );
-            
-        /**
-        * Fill TEntry with POP or IMAP specific data
-        * @param aTEnry TEntry to be filled.
-        * @param aSmtpEntry sending host data
-        * @param aMailboxName name of the remote mailbox
-        * @param aIsPop ETrue to create POP or EFalse to create IMAP entry.
-        */
-        void FillTEntryWithPopImapData( TMsvEntry& aTEntry,
-                                        const TMsvEntry& aSmtpEntry,
-                                        const TDesC& aMailboxName,
-                                        TBool aIsPop );
-        /**
-        * Convert TDesC16 to TDesC8
-        */
-        const TDesC8& Des16To8L(const TDesC& aDes16);
-        
-        /**
-        * Get IAP id from WAP id
-        * @param aWapId wap accesspoint id.
-        * @return IAP id (panic if not found)
-        */
-        TUint32 IapIdFromWapIdL(TUint32 aWapId) const;
-        
-        /**
-        * Creates a mail box
-        * @param aPopImapItem pop/imap item
-        * @param aSmtpItem smtp item
-        * @return error
-        */        
-        TInt CreateMailboxEntryL( CWPEmailItem& aPopImapItem,
-            CWPEmailItem& aSmtpItem  );
-        
-        /**
-        * Validates settings name
-        * @param None
-        * @return None
-        */        
-        void ValidateSettingsNameL();
-        /**
-        * 
-        * @param aText
-        * @return None
-        */
-        static void IncrementNameL(TDes& aText);
-        
-        
-        /**
-        * 
-        * @param aText
-        * @param aMaxLength
-        * @return None
-        */
-        static void IncrementNameL(TDes& aText, TInt aMaxLength);
-        
-	/**
-	 * Set Email settings application this value is used for 
-         * PNPMS service
-         */        
-
-	void SetEmailAppIdForPnpServiceL(TDesC& appIDValue);
-
-	 /**
-     * Sets Email Notification and Retrieval Parameters
-     * @param aEmailSettingsData Email settings
-     * @param aPopImapItem Pop/Imap Item
-     * @param aPopImapSet Pop/Imap Set
-     * @return error
-     */
-    TInt SetEmailNotificationRetrievalParamsL(
-            CImumDaSettingsData& aEmailSettingsData,
-            CWPEmailItem& aPopImapItem,
-            MImumDaSettingsDataCollection& aPopImapSet);
-
-    /**
-     * Sets Integer Parameters like EMN, ONLINE, POLL and LMS
-     * @param aEmailSettingsData Email settings
-     * @param aPopImapItem Pop/Imap Item
-     * @param aParamName Parameter Name
-     * @return error
-     */
-    TInt SetIntParam(CImumDaSettingsData& aEmailSettingsData,
-            CWPEmailItem& aPopImapItem, const TDesC& aParamName);
-
-    /**
-     * Gets the value of the Parameter in Integer form
-     * @param aPopImapItem Pop/Imap Item
-     * @param aParamID Parameter ID
-     * @param aVal Value of the Parameter
-     * @return error
-     */
-    TInt GetParamValue(CWPEmailItem& aPopImapItem, const TInt aParamID,
-            TInt& aVal);
-
-    /**
-     * Gets the value of the Parameter in Integer form
-     * @param aPopImapItem Pop/Imap Item
-     * @param aParamName Parameter Name
-     * @param aVal Value of the Parameter
-     * @return error
-     * */
-    TInt GetParamValue(CWPEmailItem& aPopImapItem, const TDesC& aParamName,
-            TInt& aVal);
-
-    /**
-     * Gets the value of the Parameters (Retrieval Hours and Days) 
-     * from CS in String form
-     * @param aCSParamValue Value of CS Parameter
-     * @param aTokenMark Demarcating Character
-     * @param aParm Value of the Parameter
-     * @return True if Parameter value is properly Marked
-     * */
-    TBool GetRetParamValuesFromCS(TLex& aCSParamValue, const TInt aTokenMark,
-            TPtrC& aParm);
-
-    /**
-     * Gets the value of Retrieval Hours parameter from CS in Integer form
-     * @param aCSParamValue Value of CS Parameter
-     * @param aTokenMark Demarcating Character
-     * @param aRetHourMinValue Value of Retrieval Hours
-     * @return error
-     * */
-    TInt GetRetHoursValueL(TLex& aCSParamValue, TInt aTokenMark,
-            TInt64& aRetHourMinValue);
-
-    /**
-     * Sets the value of Retrieval Days parameter
-     * @param aCSParamValue Value of CS Parameter
-     * @param aEmailSettingsData Email settings
-     * @return error
-     * */
-    TInt SetRetDaysL(TLex& aCSParamValue,
-            CImumDaSettingsData& aEmailSettingsData);
-    /**
-     * Sets the value of Poll parameter
-     * @param aEmailSettingsData Email settings
-     * aPollValue Value of Poll parameter
-     * @return error
-     * */
-    TInt SetPollValue(CImumDaSettingsData& aEmailSettingsData,
-            TInt aPollValue);
-    /**
-     * Validates User Name and Password
-     * @param aPopImapSet Pop/Imap Set
-     * @return error
-     */
-    TInt ValidateUserNamePassword(MImumDaSettingsDataCollection& aPopImapSet, TBool& aValidUserPass);
-    
-    /**
-     * Changes the Absolute Integer Hour/Min value to a string 
-     * @param aRetHourMin Retrieval Hour/Min string got from CS parameter
-     * @param aValRetHourMin Retrieval Hour/Min Value
-     * @param aPtrRetHourMin Retrieval Hour/Min string got from Integer value of Hour/Min
-     * @return void
-     */
-    void GetRetHourorMinfromIntValue(TPtrC& aRetHourMin,
-            TInt64 aValRetHourMin, TPtr& aPtrRetHourMin);
-    
-    /**
-     * Validates Retrieval Hours and Minutes
-     * @param aRetHourMin Lexer of Retrieval Hours/Minutes
-     * @return error
-     */
-    TInt ValidateRetHourorMin(TLex& aRetHourMin);
-	
-
-    private:    // Data
-
-        /// Ref: Message server session
-        CMsvSession* iSession;
-        /// Ref: CommsDataBase
-        CCommsDatabase* iCommDb;
-        /// Own: array of names of existing mail settings.
-        CDesC16Array* iExistingSettings;
-        /// Own: for converting 16 to 8 bit descriptor
-        HBufC8* iBufConvert;
-        //Own default name for email settings.
-        HBufC* iDefaultName;
-        //Own: IAP name
-        HBufC*                  iIapName;
-        //Created smtp entry
-        TMsvEntry               iSmtpTEntry;
-        //Created POP/IMAP entry
-        TMsvEntry               iPopImapTEntry;
-        TPckgBuf<TSettingId>    iUid;
-        // Etrue if POP mail
-        TBool                   iPopMail;
-        
-        TMsvId iDefaultMsvId;
-        
-        CImumDomainApi* iDomainApi;
-        MImumDaMailboxServices* iServices;
-
-             
-    };
-
-#endif      // CWPEMAILSAVEITEM_H   
-            
-// End of File
--- a/omacp/omacpadapters/EmailAdapter/Inc/CWPEmailSaveSmtpImapItem.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,105 +0,0 @@
-/*
-* Copyright (c) 2002 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:  Save SMTP/IMAP settings
-*
-*/
-
-
-
-#ifndef CSAVESMTPIMAPITEM_H
-#define CSAVESMTPIMAPITEM_H
-
-//  INCLUDES
-#include "CWPEmailSaveItem.h"
-
-// FORWARD DECLARATIONS
-class CWPEmailItem;
-
-// CLASS DECLARATION
-
-/**
-*  CSaveSmtpImapItem class.
-*
-*  @lib WPEmailAdapter.lib
-*  @since 2.0
-*/
-class CSaveSmtpImapItem : public CWPEmailSaveItem
-    {
-    public:  // Constructors and destructor
-
-        /**
-        * Two-phased constructor.
-        * @param aSmtpItem SMTP setting item. Ownership not taken, Panic if NULL
-        * @param aImapItem IMAP setting item. Ownership not taken, Panic if NULL
-        * @return self
-        */
-        static CSaveSmtpImapItem* NewLC(CWPEmailItem* aSmtpItem, CWPEmailItem* aImapItem);
-        
-        /**
-        * Constructor. See params from NewLC
-        */
-        CSaveSmtpImapItem(CWPEmailItem* aSmtpItem, CWPEmailItem* aImapItem);
-        
-        /**
-        * Destructor.
-        */
-        virtual ~CSaveSmtpImapItem();
-
-    public: // From CWPEmailSaveItem
-        /**
-        * From CWPEmailSaveItem
-        */        
-        void SaveL(CMsvSession* aSession);
-
-        /**
-        * From CWPEmailSaveItem
-        */        
-        TBool ValidateL();
-
-        /**
-        * From CWPEmailSaveItem
-        */        
-        const TDesC& SummaryText();
-
-    private: // New functions
-        /**
-        * Validate smtp data
-        */
-        TBool ValidateSmtpItemL();
-        /**
-        * Validate imap data
-        */
-        TBool ValidateImapItemL();
-        
-    private: // Constructor
-
-        /**
-        * By default Symbian 2nd phase constructor is private.
-        */
-        void ConstructL();
-
-    private: //Data
-        /**
-        * ref: SMTP setting item.
-        */
-        CWPEmailItem* iSmtpItem;
-        /**
-        * ref: POP setting item.
-        */
-        CWPEmailItem* iImapItem;
-    };
-
-#endif      // CSAVESMTPIMAPITEM_H   
-            
-// End of File
--- a/omacp/omacpadapters/EmailAdapter/Inc/CWPEmailSaveSmtpPopItem.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,104 +0,0 @@
-/*
-* Copyright (c) 2002 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:  Save SMTP-POP settings
-*
-*/
-
-
-
-#ifndef CSAVESMTPPOPITEM_H
-#define CSAVESMTPPOPITEM_H
-
-//  INCLUDES
-#include "CWPEmailSaveItem.h"
-
-// FORWARD DECLARATIONS
-class CWPEmailItem;
-
-// CLASS DECLARATION
-
-/**
-*  CSaveSmtpPopItem class.
-*
-*  @lib WPEmailAdapter.lib
-*  @since 2.0
-*/
-class CSaveSmtpPopItem : public CWPEmailSaveItem
-    {
-    public:  // Constructors and destructor
-
-        /**
-        * Two-phased constructor.
-        * @param aSmtpItem SMTP setting item, Panic if NULL
-        * @param aPopItem POP setting item, Panic if NULL
-        * @return self
-        */
-        static CSaveSmtpPopItem* NewLC(CWPEmailItem* aSmtpItem, 
-            CWPEmailItem* aPopItem);
-              
-        /**
-        * Destructor.
-        */
-        ~CSaveSmtpPopItem();
-
-    public: // from CWPEmailSaveItem
-        
-        void SaveL(CMsvSession* aSession);
-        const TDesC& SummaryText();
-        TBool ValidateL();
-           
-    private: // New functions
-
-        /**
-        * By default Symbian 2nd phase constructor is private.
-        */
-        void ConstructL();
-        
-        /**
-        * constructor.
-        * @param see NewLC
-        */
-        CSaveSmtpPopItem(CWPEmailItem* aSmtpItem, 
-            CWPEmailItem* aPopItem);
-
-        /**
-        * Validate SMTP item data
-        * @return ETrue if valid.
-        */
-        TBool ValidateSmtpItemL();
-        /**
-        * Validate Pop data
-        * @return ETrue if valid
-        */
-        TBool ValidatePopItemL();
-
-
-    private:    // Data
-
-        /**
-        * Ref. to SMTP item data.
-        */
-        CWPEmailItem* iSmtpItem;
-
-        /**
-        * Ref. to POP item data.
-        */
-        CWPEmailItem* iPopItem;
-
-
-    };
-
-#endif      // CSAVESMTPPOPITEM_H   
-            
-// End of File
--- a/omacp/omacpadapters/EmailAdapter/Inc/EmailAdapter.pan	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-/*
-* Copyright (c) 2002 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: 
-*     Panic codes for E-Mail Adapter
-*
-*/
-
-
-#ifndef __MSGMAILADAPTER_PAN__
-#define __MSGMAILADAPTER_PAN__
-
-// DATA TYPES
-enum TMsgMailAdapterPanic // Panic codes
-    {
-    EMailAdapterOutOfRange,
-    EMailAdapterNullPointer,
-    EMailAdapterArgument,
-	EMailAdapterInvalidId
-    };
-
-// FUNCTION PROTOTYPES
-
-// ----------------------------------------------------
-// Panic handler
-// ----------------------------------------------------
-//
-GLREF_C void Panic(TInt aPanic);
-
-#endif //__MSGMAILADAPTERR_PAN__     
-            
-// End of File
--- a/omacp/omacpadapters/EmailAdapter/src/CWPEmailAdapter.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,391 +0,0 @@
-/*
-* Copyright (c) 2002 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:  Class for handling provisioning message
-*
-*/
-
-
-
-// INCLUDE FILES
-#include "CWPEmailAdapter.h"
-#include "CWPEmailItem.h"
-#include "CWPEmailSaveSmtpImapItem.h"
-#include "CWPEmailSaveSmtpPopItem.h"
-#include "EmailAdapter.pan"  // Panic codes
-#include "WPEmail.hrh"
-#include <wpemailadapterresource.rsg>
-#include "Cwplog.h"
-
-#include <WPAdapterUtil.h> // Adapter utils
-#include <CWPAdapter.h>
-#include <CWPCharacteristic.h>
-#include <CWPParameter.h>
-
-#include <commdb.h>
-
-// CONSTANTS
-const TInt KFirstArrayIndex = 0;
-const TInt KArrayGranularity = 5;
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CWPEmailAdapter::CWPEmailAdapter
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CWPEmailAdapter::CWPEmailAdapter() : CWPAdapter()
-	{
-	}
-
-// -----------------------------------------------------------------------------
-// CWPEmailAdapter::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CWPEmailAdapter::ConstructL()
-    {
-    iSession = CMsvSession::OpenSyncL(*this);
-    
-    // Usually 1 or 2 settings.
-    iEmailSettings = new(ELeave) CArrayPtrFlat<CWPEmailItem>(KArrayGranularity);
-    
-    iEmailSettingPair = 
-                 new(ELeave) CArrayPtrFlat<CWPEmailSaveItem>(KArrayGranularity);
-        
-    TFileName fileName;
-    Dll::FileName( fileName );
-    iTitle = WPAdapterUtil::ReadHBufCL( fileName, 
-                                        KAdapterName, 
-                                        R_QTN_SM_TITLE_EMAIL_SETTINGS );
-	}
-
-// -----------------------------------------------------------------------------
-// CWPEmailAdapter::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CWPEmailAdapter* CWPEmailAdapter::NewL()
-	{
-	CWPEmailAdapter* self = new(ELeave) CWPEmailAdapter; 
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	CleanupStack::Pop(self);
-	return self;
-	}
-	
-// -----------------------------------------------------------------------------
-// Destructor
-// -----------------------------------------------------------------------------
-CWPEmailAdapter::~CWPEmailAdapter()
-	{
-    delete iSession;
-    delete iCommsDb;
-    delete iCurrentItem;
-    delete iTitle;
-
-    if ( iEmailSettings )
-        {
-        iEmailSettings->ResetAndDestroy();
-        delete iEmailSettings;
-        }
-    if ( iEmailSettingPair )
-        {
-        iEmailSettingPair->ResetAndDestroy();
-        delete iEmailSettingPair;
-        }
-	}
-// -----------------------------------------------------------------------------
-// CWPEmailAdapter::AcceptedSettingGroup
-// -----------------------------------------------------------------------------
-//
-TBool CWPEmailAdapter::AcceptedSettingGroup()
-    {
-    return ( iCurrentItem->IsValid() );
-    }
-
-// -----------------------------------------------------------------------------
-// CWPEmailAdapter::AddSmtpImapSettingsL
-// -----------------------------------------------------------------------------
-//
-void CWPEmailAdapter::AddSmtpImapSettingsL(	CWPEmailItem* aSmtpItem, 
-                                            CWPEmailItem* aImapItem )
-    {
-    CWPEmailSaveItem* settingPair = CSaveSmtpImapItem::NewLC( aSmtpItem, 
-                                                              aImapItem );
-    if ( settingPair->ValidateL() )
-        {
-        iEmailSettingPair->AppendL( settingPair );
-        CleanupStack::Pop(); //settingPair
-        }
-    else
-        {
-        //not valid  so delete
-        CleanupStack::PopAndDestroy(); //settingPair
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// CWPEmailAdapter::AddSmtpPopSettingsL
-// -----------------------------------------------------------------------------
-//
-void CWPEmailAdapter::AddSmtpPopSettingsL( CWPEmailItem* aSmtpItem, 
-                                           CWPEmailItem* aPopItem )
-    {
-    CWPEmailSaveItem* settingPair = CSaveSmtpPopItem::NewLC( aSmtpItem, 
-                                                             aPopItem );
-    if ( settingPair->ValidateL() )
-        {
-        iEmailSettingPair->AppendL(settingPair);
-        CleanupStack::Pop(); //settingPair
-        }
-    else
-        {
-        //not valid  so delete
-        CleanupStack::PopAndDestroy(); //settingPair
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// CWPEmailAdapter::CreateSettingsL
-// -----------------------------------------------------------------------------
-//
-void CWPEmailAdapter::CreateSettingsL( CWPEmailItem* aItem )
-    {
-    // All settings
-    TInt count = iEmailSettings->Count();
-    const TDesC& newItemID = aItem->ParameterValue( EWPParameterAppID );
-
-    for (TInt i(KFirstArrayIndex); i < count; ++i)
-        {        
-        const TDesC& appId = iEmailSettings->At(i)->
-            ParameterValue( EWPParameterAppID );
-
-        // SMTP item
-		if ( newItemID == KEmailSettingPortSMTP)
-			{
-            if ( appId == KEmailSettingPortIMAP )
-				{
-				AddSmtpImapSettingsL( aItem, iEmailSettings->At(i) );
-				}
-			if ( appId == KEmailSettingPortPOP )
-				{
-				AddSmtpPopSettingsL( aItem, iEmailSettings->At(i) );
-				}
-			}
-		// POP/IMAP item
-		else
-			{
-			if ( appId == KEmailSettingPortSMTP )
-				{
- 				if ( newItemID == KEmailSettingPortIMAP )
-					{
-					AddSmtpImapSettingsL( iEmailSettings->At(i), aItem );
-					}
-				if ( newItemID == KEmailSettingPortPOP )
-					{
-					AddSmtpPopSettingsL( iEmailSettings->At(i), aItem );
-					}
-				}			
-			}
-		}
-    }
-
-// -----------------------------------------------------------------------------
-// CWPEmailAdapter::HandleSessionEventL
-// -----------------------------------------------------------------------------
-//
-void CWPEmailAdapter::HandleSessionEventL( TMsvSessionEvent /*aEvent*/, 
-                                           TAny* /*aArg1*/, 
-                                           TAny* /*aArg2*/, 
-                                           TAny* /*aArg3*/ )
-    {
-	// From MMsvSessionObserver. Ignore session events
-    }
-
-// -----------------------------------------------------------------------------
-// CWPEmailAdapter::ItemCount
-// -----------------------------------------------------------------------------
-//
-TInt CWPEmailAdapter::ItemCount() const
-    {
-    return iEmailSettingPair->Count();
-    }
-// -----------------------------------------------------------------------------
-// CWPEmailAdapter::SummaryTitle
-// -----------------------------------------------------------------------------
-//
-const TDesC16& CWPEmailAdapter::SummaryTitle( TInt /*aIndex*/ ) const
-	{
-    // title text is always same
-	return *iTitle;
-	}
-
-// -----------------------------------------------------------------------------
-// CWPEmailAdapter::SummaryText
-// -----------------------------------------------------------------------------
-//
-const TDesC16& CWPEmailAdapter::SummaryText( TInt aIndex ) const
-	{
-    if ( ItemCount() == 0 )
-        {
-        return KNullDesC;
-        }
-	return iEmailSettingPair->At(aIndex)->SummaryText();
-	}
-
-// -----------------------------------------------------------------------------
-// CWPEmailAdapter::SaveL
-// -----------------------------------------------------------------------------
-//
-void CWPEmailAdapter::SaveL( TInt aItem )
-	{
-    __ASSERT_DEBUG(aItem < ItemCount() && 
-        aItem >= KFirstArrayIndex, Panic( EMailAdapterArgument ));
-	
-    // Create the commsdb when the save is initiated first time.
-	// This stays alive until the adapter is destroyed.
-	if ( !iCommsDb )
-		{
-		iCommsDb = CCommsDatabase::NewL( EDatabaseTypeIAP );
-		}    
-    User::LeaveIfNull(iCommsDb);
-    iEmailSettingPair->At(aItem)->SetCommsDataBase( *iCommsDb );
-    iEmailSettingPair->At(aItem)->SaveL( iSession );
-	}
-	
-// -----------------------------------------------------------------------------
-// CWPEmailAdapter::CanSetAsDefault
-// -----------------------------------------------------------------------------
-//
-TBool CWPEmailAdapter::CanSetAsDefault( TInt aItem ) const
-    {
-    // always set first setting as default
-    return (aItem == KFirstArrayIndex && ItemCount());
-    }
-    
-// -----------------------------------------------------------------------------
-// CWPEmailAdapter::SetAsDefaultL
-// -----------------------------------------------------------------------------
-//
-void CWPEmailAdapter::SetAsDefaultL( TInt /*aItem*/ )
-    {
-    // set always first setting as default
-    iEmailSettingPair->At(KFirstArrayIndex)->SetAsDefaultL();
-    }
-    
-// -----------------------------------------------------------------------------
-// CWPEmailAdapter::DetailsL
-// -----------------------------------------------------------------------------
-//
-TInt CWPEmailAdapter::DetailsL( TInt /*aItem*/, MWPPairVisitor& /*aVisitor*/ )
-    {
-    return KErrNotSupported;
-    }
-
-// -----------------------------------------------------------------------------
-// CWPEmailAdapter::ContextExtension
-// -----------------------------------------------------------------------------
-//
-TInt CWPEmailAdapter::ContextExtension( MWPContextExtension*& aExtension )
-    {
-    aExtension = this;
-    return KErrNone;
-    }
-
-// -----------------------------------------------------------------------------
-// CWPEmailAdapter::VisitL
-// -----------------------------------------------------------------------------
-//
-void CWPEmailAdapter::VisitL( CWPCharacteristic& aCharacteristic )
-	{
-	TInt type = aCharacteristic.Type();    
-	// Are we dealing with application specific data.
-    if ( type == KWPApplication ) 
-		{
-        iCurrentItem = CWPEmailItem::NewL();
-        aCharacteristic.AcceptL( *iCurrentItem );
-        
-        if( AcceptedSettingGroup() )
-            {
-			CreateSettingsL( iCurrentItem );
-            iEmailSettings->AppendL( iCurrentItem );
-            }
-        else
-            {
-            delete iCurrentItem;
-            }
-        iCurrentItem = NULL;
-        }
-	}
-
-// -----------------------------------------------------------------------------
-// CWPEmailAdapter::VisitL
-// -----------------------------------------------------------------------------
-//
-void CWPEmailAdapter::VisitL( CWPParameter& /*aParameter*/)
-	{
-	// parameters are handled in the CWPEmailItem.
-	}
-
-// -----------------------------------------------------------------------------
-// CWPEmailAdapter::VisitL
-// -----------------------------------------------------------------------------
-//
-void CWPEmailAdapter::VisitLinkL( CWPCharacteristic& /*aParameter*/)
-    {
-    // visit link is handled in the CWPEmailItem.
-    }
-    
-// -----------------------------------------------------------------------------
-// CWPEmailAdapter::SaveDataL
-// -----------------------------------------------------------------------------
-//
-const TDesC8& CWPEmailAdapter::SaveDataL( TInt aIndex ) const
-    {
-	//	From MWPContextExtension
-    return iEmailSettingPair->At(aIndex)->SaveData();
-    }
-    
-// -----------------------------------------------------------------------------
-// CWPEmailAdapter::DeleteL
-// -----------------------------------------------------------------------------
-//
-void CWPEmailAdapter::DeleteL( const TDesC8& aSaveData )
-    {
-    //	From MWPContextExtension
-    TPckgBuf<CWPEmailSaveItem::TSettingId> uids;
-    uids.Copy( aSaveData );
-
-    TInt32 smtpId = uids().iSmtpId;
-    TInt32 popimapId = uids().iPopImapId;
-    iSession->RemoveEntry( popimapId );
-    // removing POP/IMAP entry removes also 
-    // SMTP entry, but lets make sure it is deleted
-    iSession->RemoveEntry(smtpId);
-    
-    LOG2("CWPEmailAdapter::DeleteL, popimapId: %d, smtpId: %d", popimapId, smtpId);
-    }
-    
-// -----------------------------------------------------------------------------
-// CWPEmailAdapter::Uid
-// -----------------------------------------------------------------------------
-//
-TUint32 CWPEmailAdapter::Uid() const
-    {
-    return iDtor_ID_Key.iUid; 
-    }
-
-//  End of File  
--- a/omacp/omacpadapters/EmailAdapter/src/CWPEmailAdapterGroupProxy.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-/*
-* Copyright (c) 2002 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:  Table of plugins for ECom
-*
-*/
-
-
-
-// INCLUDE FILES
-#include <e32std.h>
-#include <implementationproxy.h>
-#include "../../group/omacpadapteruids.h"
-#include "CWPEmailAdapter.h"
-
-// CONSTANTS
-const TImplementationProxy KImplementationTable[] = 
-	{
-	IMPLEMENTATION_PROXY_ENTRY(KProvisioningEMailAdapterUid, CWPEmailAdapter::NewL )
-//	{{KProvisioningEMailAdapterUid}, CWPEmailAdapter::NewL}
-	};
-
-// ========================== OTHER EXPORTED FUNCTIONS =========================
-
-// -----------------------------------------------------------------------------
-// ImplementationGroupProxy
-// -----------------------------------------------------------------------------
-//
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy(TInt& aTableCount)
-	{
-	aTableCount = sizeof(KImplementationTable) / sizeof(TImplementationProxy);
-
-	return KImplementationTable;
-	}
-
-//  End of File  
--- a/omacp/omacpadapters/EmailAdapter/src/CWPEmailAdapterMain.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-/*
-* Copyright (c) 2002-2006 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:  DLL entry point
-*
-*/
-
-
-
-// INCLUDE FILES
-#include <e32std.h>
-#include "EmailAdapter.pan"
-
-// ========================== OTHER EXPORTED FUNCTIONS =========================
-
-/**
-* Panic handler
-* @param aPanic reason for panic.
-*/
-GLDEF_C void Panic( TInt aPanic )
-    {
-    User::Panic( _L("WPEmail.dll"), aPanic );
-    }
-//  End of File  
--- a/omacp/omacpadapters/EmailAdapter/src/CWPEmailItem.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,241 +0,0 @@
-/*
-* Copyright (c) 2002 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:  Email settin data object
-*
-*/
-
-
-
-// INCLUDE FILES
-#include "CWPEmailItem.h"
-#include "CWPCharacteristic.h"
-#include "CWPParameter.h"
-#include "EmailAdapter.pan"
-#include "WPEmail.hrh"
-#include "Cwplog.h"
-#include    "../../../group/omacplogger.h"
-
-
-// CONSTANTS
-const TInt KArrayGranularity = 10;
-
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CWPEmailItem::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CWPEmailItem* CWPEmailItem::NewL()
-	{
-	CWPEmailItem* self = CWPEmailItem::NewLC(); 
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-CWPEmailItem* CWPEmailItem::NewLC()
-	{
-	CWPEmailItem* self = new(ELeave) CWPEmailItem; 
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-// Destructor
-CWPEmailItem::~CWPEmailItem()
-	{
-	delete iEmailSettingParams;
-	}
-// Constructor
-CWPEmailItem::CWPEmailItem()
-	{
-	}
-// -----------------------------------------------------------------------------
-// CWPEmailItem::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CWPEmailItem::ConstructL()
-	{
-	// average setting contains 10 items
-	iEmailSettingParams = new(ELeave) CArrayPtrFlat<CWPParameter>(
-        KArrayGranularity);
-	}
-
-
-const TDesC& CWPEmailItem::ParameterValue(TInt aParamID) const
-    {
-	TInt count = iEmailSettingParams->Count();
-	for (TInt i=0; i < count; ++i)
-		{
-		if ( iEmailSettingParams->At(i)->ID() == aParamID )
-			{
-			return iEmailSettingParams->At(i)->Value();
-			}
-		}
-    return KNullDesC;
-    }
-
-
-HBufC* CWPEmailItem::AssociatedIapNameL()
-    {    
-    HBufC* string = NULL;
-    
-    if ( iNapDef )
-        {
-        // We have only 1 IAP
-        CArrayFix<TPtrC>* name = new(ELeave) CArrayFixFlat<TPtrC>(1);
-        CleanupStack::PushL(name);
-        
-        // iap name
-        iNapDef->ParameterL(EWPParameterName, name);
-        
-        if (name->Count() > 0)
-            {
-            // IAP name is found from index 0
-            string = name->At(0).AllocL();
-            }
-        
-        CleanupStack::PopAndDestroy(); // name
-        }
-       
-	return string;
-    }
-
-TUint32 CWPEmailItem::AssociatedIapId()
-    {
-    TPckgBuf<TUint32> pckg;
-    pckg() = 0;
-
-    if ( iNapDef )
-        {
-        const TDesC8& data = iNapDef->Data();
-        pckg.Copy( data );	
-        }
-	
-    return pckg();
-    }
-
-TBool CWPEmailItem::IsValid() const
-    {
-    // Check AppID and IAP
-    // if IAP not defined, then  system tries to use default IAP from CommsDB.
-    const TDesC& appID = ParameterValue(EWPParameterAppID);
-    if ( appID == KEmailSettingPortSMTP ||
-        appID == KEmailSettingPortPOP ||
-        appID == KEmailSettingPortIMAP )
-        {
-        LOG("CWPEmailItem::IsValid");
-        return ETrue;
-        }
-    LOG("CWPEmailItem::IsNotValid");
-    return EFalse;
-    }
-
-void CWPEmailItem::VisitL(CWPCharacteristic& aCharacteristic)
-	{
-	switch ( aCharacteristic.Type() )
-		{	
-		case KWPAppAddr:
-			// FALLTROUGH
-		case KWPAppAuth:
-            // FALLTROUGH
-		case KWPPort:
-			aCharacteristic.AcceptL( *this );
-            LOG1("CWPEmailItem::AcceptL: CWPCharacteristic Type: %d", 
-                aCharacteristic.Type());
-			break;
-	
-		default:
-            LOG1("CWPEmailItem::Ignore: CWPCharacteristic Type: %d", 
-                aCharacteristic.Type());
-			// do nothing
-			break;
-		}
-	
-	}
-
-
-void CWPEmailItem::VisitL(CWPParameter& aParameter)
-	{
-	switch( aParameter.ID() )
-		{
-        // read these parameters
-        case EWPParameterAppID:
-        case EWPParameterName:
-        case EWPParameterProviderID:            
-		case EWPParameterAddr:
-		case EWPParameterPortNbr:
-		case EWPParameterService:
-		case EWPParameterAAuthType:
-		case EWPParameterAAuthName:
-		case EWPParameterAAuthSecret:
-        case EWPParameterFrom:
-			iEmailSettingParams->AppendL(&aParameter);
-            LOG2("CWPEmailItem::AppendL: CWPParameter id: %d value: %S", 
-                aParameter.ID(), &aParameter.Value());
-			break;
-			
-        case EWPNamedParameter:
-            {
-            TPtrC namedParam(aParameter.Name());
-            LOGSTRING2( "[Provisioning] CWPEmailItem::VisitL: Parameter Name, %i", namedParam);
-            
-            if (namedParam.CompareF(KParamEMN) == 0 || namedParam.CompareF(
-                    KParamCS) == 0 || namedParam.CompareF(KParamLMS) == 0
-                    || namedParam.CompareF(KParamPOLL) == 0
-                    || namedParam.CompareF(KParamONLINE) == 0)
-                {
-                iEmailSettingParams->AppendL(&aParameter);
-				LOG2("CWPEmailItem::VisitL: Named Parameter %S: value: %S", &aParameter.Name(),
-                        &aParameter.Value());
-                }
-            break;
-            }
-		 
-		default:
-            LOG2("CWPEmailItem::Ignore: CWPParameter id: %d value: %S",
-                aParameter.ID(), &aParameter.Value());
-			// Do nothing
-			break;
-		}
-
-	}
-
-void CWPEmailItem::VisitLinkL(CWPCharacteristic& aCharacteristic )
-    {
-    if ( aCharacteristic.Type() ==  KWPNapDef )
-        {
-        // Link to the IAP settings 
-        iNapDef = &aCharacteristic;
-        LOG("iNapDef is set");
-        }
-	}
-
-const TDesC& CWPEmailItem::ParameterValue(const TDesC& aParamName)
-    {
-    TInt count = iEmailSettingParams->Count();
-    for (TInt i=0; i < count; ++i)
-        {
-        if ( iEmailSettingParams->At(i)->Name().CompareF(aParamName) == 0 )
-            {
-            return iEmailSettingParams->At(i)->Value();
-            }
-        }
-    return KNullDesC;
-    }
-
-//  End of File  
--- a/omacp/omacpadapters/EmailAdapter/src/CWPEmailLog.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +0,0 @@
-/*
-* Copyright (c) 2002 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: 
-*     Logging class
-*     
-*
-*/
-
-
-
-#ifndef Log_H
-#define Log_H
-
-/////////////////////////////////////////////////////////////////////////////
-// #Defines that control printing of additional information to debug stream.
-/////////////////////////////////////////////////////////////////////////////
-
-// INCLUDES
-
-#include "LogDef.h"
-#include <e32std.h>
-
-// DEFINES
-
-#ifdef ENABLE_LOGGING
-#define LOG(s) Log::DoLog(_L(s))
-#define LOG1(s, v) Log::DoLog( _L(s), v )
-#define LOG2(s, v1, v2) Log::DoLog( _L(s), v1, v2 )
-#else
-#define LOG(s)
-#define LOG1(s, v)
-#define LOG2(s, v1, v2)
-#endif // ENABLE_LOGGING
-
-// DATA TYPES
-
-
-// CLASS DECLARATION
-
-/**
-* Class offers logging functionality.
-*/
-class Log
-    {
-
-    public:
-
-        /**
-        * Log the message.
-		* @param aText text to be written to log.
-        */
-        static void DoLog( TRefByValue<const TDesC> aText, ... );
-
-    private: // constructor
-        
-		/// Prohibited default constructor
-		Log();
-
-		/// Prohibited copy constructor
-		Log( const Log& );
-    
-		/// Prohibited assignment operator
-		Log& operator=( const Log& );
-    };
-
-#endif // Log_H
-
-//  End of File  
--- a/omacp/omacpadapters/EmailAdapter/src/CWPEmailSaveItem.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1653 +0,0 @@
-/*
-* Copyright (c) 2002 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:  Saves CWPEmailItems
-*
-*/
-
-
-
-// INCLUDE FILES
-#include    "CWPEmailSaveItem.h"
-#include    "CWPEmailItem.h"
-#include    "EmailAdapter.pan"
-#include    "WPEmail.hrh"
-
-#include    <wpemailadapterresource.rsg>
-#include    <WPAdapterUtil.h>   // Adapter utils
-
-#include    <ApUtils.h>
-#include    <ApDataHandler.h>
-
-#include	<CWPParameter.h>
-#include    <txtrich.h>
-#include    <iapprefs.h>
-#include    <MuiuMsvUiServiceUtilities.h>
-
-#include    <pop3set.h>
-
-#include    <miutpars.h>        // TImMessageField
-#include    <cemailaccounts.h>
-#include    <iapprefs.h>
-
-#include    <ImumDaMailboxUtilities.h>
-#include    <SendUiConsts.h>
-
-#include <ImumDaSettingsKeys.h>
-#include <ImumDaSettingsDataCollection.h>
-
-#include    "../../../group/omacplogger.h"
-#include    <PnpProvUtil.h>
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CWPEmailSaveItem::CWPEmailSaveItem
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CWPEmailSaveItem::CWPEmailSaveItem()
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// CWPEmailSaveItem::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CWPEmailSaveItem::ConstructL()
-    { 
-    iExistingSettings = new (ELeave) CDesC16ArrayFlat(2); //1 or 2 settings
-        
-    TFileName fileName;
-    Dll::FileName( fileName );
-    iDefaultName = WPAdapterUtil::ReadHBufCL( fileName,
-                                              KAdapterName, 
-                                              R_QTN_SM_DEFAULT_EMAIL_NAME );    
-    iDefaultMsvId =  0 ;
-    iDomainApi = CreateDomainApiL(); 
-    iServices = &iDomainApi->MailboxServicesL(); 
-    }
-    
-// -----------------------------------------------------------------------------    
-// Destructor
-// -----------------------------------------------------------------------------
-CWPEmailSaveItem::~CWPEmailSaveItem()
-    {
-    delete iBufConvert;
-    delete iExistingSettings;
-    delete iDefaultName;
-    delete iIapName;
-    delete iDomainApi;
-    }
-
-// -----------------------------------------------------------------------------
-// CWPEmailSaveItem::SetAsDefaultL
-// -----------------------------------------------------------------------------
-//
-void CWPEmailSaveItem::SetAsDefaultL()
-    {
-     iServices->SetDefaultMailboxL( iDefaultMsvId );
-    }
-    
-// -----------------------------------------------------------------------------
-// CWPEmailSaveItem::SummaryText
-// -----------------------------------------------------------------------------
-//
-const TDesC& CWPEmailSaveItem::SummaryText()
-    {    
-    return *iDefaultName;
-    }
-
-// -----------------------------------------------------------------------------
-// CWPEmailSaveItem::SetDefaultNameL
-// -----------------------------------------------------------------------------
-//
-void CWPEmailSaveItem::SetDefaultNameL( const TDesC& aDefaultName )
-    {
-    HBufC* temp = aDefaultName.AllocL();
-    delete iDefaultName;
-    iDefaultName = temp;
-    }
-    
-// -----------------------------------------------------------------------------
-// CWPEmailSaveItem::SetCommsDataBase
-// -----------------------------------------------------------------------------
-//
-void CWPEmailSaveItem::SetCommsDataBase( CCommsDatabase& aCommsDataBase )
-    {
-    iCommDb = &aCommsDataBase;
-    }
-
-// -----------------------------------------------------------------------------
-// CWPEmailSaveItem::SaveData
-// -----------------------------------------------------------------------------
-//
-const TDesC8& CWPEmailSaveItem::SaveData()
-    {
-    iUid().iSmtpId = iSmtpTEntry.Id();
-    iUid().iPopImapId = iPopImapTEntry.Id();
-    return iUid;
-    }
-
-// -----------------------------------------------------------------------------
-// CWPEmailSaveItem::GetMailAccountNamesL
-// -----------------------------------------------------------------------------
-//
-TInt CWPEmailSaveItem::GetMailAccountNamesL()
-    {
-    CMsvEntry* centry = iSession->GetEntryL(KMsvRootIndexEntryId);
-    CleanupStack::PushL(centry);
-    TInt count = centry->Count();
-
-    for ( TInt j = 0; j < count; j++ )
-        {
-        if( (*centry)[j].iType == KUidMsvServiceEntry &&
-            ((*centry)[j].iMtm == KUidMsgTypePOP3  ||
-            (*centry)[j].iMtm == KUidMsgTypeIMAP4))
-            {
-            iExistingSettings->AppendL( (*centry)[j].iDetails );
-            }
-        }
-    CleanupStack::PopAndDestroy( centry );
-    return iExistingSettings->Count();
-    }
-
-// -----------------------------------------------------------------------------
-// CWPEmailSaveItem::SettingNameAlreadyExistsL
-// -----------------------------------------------------------------------------
-//
-TBool CWPEmailSaveItem::SettingNameAlreadyExistsL( const TDesC& aName, 
-                                                   TBool aReload )
-    {
-    if ( aReload )
-        {
-        GetMailAccountNamesL();
-        }
-    TInt count = iExistingSettings->Count();
-
-    for ( TInt n(0); n < count; n++ )
-        {
-        if (aName.CompareF( (*iExistingSettings)[n]) == 0 )
-            {
-            // found match
-            return ETrue;
-            }
-        }
-    return EFalse;
-    }
-
-// -----------------------------------------------------------------------------
-// CWPEmailSaveItem::SaveMailSettingsToMessageServerL
-// -----------------------------------------------------------------------------
-//
-void CWPEmailSaveItem::SaveMailSettingsToMessageServerL( CWPEmailItem& aSmtp,
-                                                         CWPEmailItem& aPopImap,
-                                                         TBool aIsPopNotImap,
-                                                         CMsvSession* aSession )
-    {
-    __ASSERT_ALWAYS( aSession, Panic( EMailAdapterNullPointer ) );
-    
-    iSession = aSession;
-    iPopMail = aIsPopNotImap;
-    
-    ValidateSettingsNameL();
-
-    delete iIapName;
-    iIapName = NULL;
-    iIapName = aSmtp.AssociatedIapNameL();
-    if ( !iIapName )
-        {
-        iIapName = iDefaultName->Des().AllocL();
-        }
-
-    CreateMailboxEntryL( aPopImap,aSmtp ); 
-    }
-
-// -----------------------------------------------------------------------------
-// CWPEmailSaveItem::IsValidEmailAddressL
-// -----------------------------------------------------------------------------
-//
-TBool CWPEmailSaveItem::IsValidEmailAddressL( const TDesC& aAddress )
-    {
-    TPtrC string = GetValidEmailAddressL( aAddress );
-    TImMessageField address;
-    return address.ValidInternetEmailAddress( string );    
-    }
-
-// -----------------------------------------------------------------------------
-// CWPEmailSaveItem::GetValidEmailAddressL
-// -----------------------------------------------------------------------------
-//
-TPtrC CWPEmailSaveItem::GetValidEmailAddressL( const TDesC& aAddress )
-    {
-    TImMessageField address;
-    return address.GetValidInternetEmailAddressFromString( aAddress );    
-    }
-
-// -----------------------------------------------------------------------------
-// CWPEmailSaveItem::FillTEntryWithSmtpData
-// -----------------------------------------------------------------------------
-//
-void CWPEmailSaveItem::FillTEntryWithSmtpData( TMsvEntry& aTEntry,
-                                               const TDesC& aIapName, 
-                                               const TDesC& aMailboxName )
-    {
-    aTEntry.iMtm = KUidMsgTypeSMTP;
-    aTEntry.iType= KUidMsvServiceEntry;
-    aTEntry.iDate.HomeTime();
-    aTEntry.iDescription.Set( aIapName );
-    aTEntry.iDetails.Set( aMailboxName );
-    aTEntry.SetVisible( EFalse );
-    }
-
-// -----------------------------------------------------------------------------
-// CWPEmailSaveItem::FillTEntryWithPopImapData
-// -----------------------------------------------------------------------------
-//
-void CWPEmailSaveItem::FillTEntryWithPopImapData( TMsvEntry& aTEntry,
-                                                  const TMsvEntry& aSmtpEntry, 
-                                                  const TDesC& aMailboxName, 
-                                                  TBool aIsPop )
-    {
-    aTEntry = aSmtpEntry;
-    aTEntry.iRelatedId = aSmtpEntry.Id();
-    aTEntry.SetVisible( ETrue );
-    aTEntry.iType = KUidMsvServiceEntry;
-    aTEntry.iDate.HomeTime();
-    aTEntry.iDetails.Set( aMailboxName );
-    if ( aIsPop )
-        {
-        aTEntry.iMtm = KUidMsgTypePOP3;
-        }
-    else
-        {
-        aTEntry.iMtm = KUidMsgTypeIMAP4;
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// CWPEmailSaveItem::Des16To8L
-// -----------------------------------------------------------------------------
-//
-const TDesC8& CWPEmailSaveItem::Des16To8L( const TDesC& aDes16 )
-    {
-    HBufC8* text = HBufC8::NewL(aDes16.Length()); 
-    delete iBufConvert;
-    iBufConvert = text;
-    iBufConvert->Des().Copy(aDes16);
-    return *iBufConvert;
-    }
-
-// -----------------------------------------------------------------------------
-// CWPEmailSaveItem::IapIdFromWapIdL
-// -----------------------------------------------------------------------------
-//
-TUint32 CWPEmailSaveItem::IapIdFromWapIdL( TUint32 aWapId ) const
-    {
-    CApUtils* apUtils = CApUtils::NewLC( *iCommDb );
-    TUint32 iapId = NULL;
-    iapId = apUtils->IapIdFromWapIdL( aWapId );
-    __ASSERT_ALWAYS( iapId, Panic( EMailAdapterInvalidId ) );
-    CleanupStack::PopAndDestroy( apUtils );
-    return iapId;
-    }
-
-// -----------------------------------------------------------------------------
-// CWPEmailSaveItem::ValidateSettingsNameL
-// -----------------------------------------------------------------------------
-//
-void CWPEmailSaveItem::ValidateSettingsNameL( )
-    {
-    LOGSTRING( "CWPEmailSaveItem::ValidateSettingsNameL : Enter" );
-    if ( SettingNameAlreadyExistsL( *iDefaultName, ETrue ) )
-       {
-        
-        //before appending (XX) to name if >26, make sure length is not equal
-        //to KSettingsNameMaxLength
-        
-        
-        if(iDefaultName->Length() > 26)	
-        {
-        	TBuf<30> temp_Name (*iDefaultName);
-    		
-    		TInt count = iExistingSettings->Count();
-
-    		for ( TInt n(0); n < count; n++ )
-        	{
-        		if (temp_Name.CompareF( (*iExistingSettings)[n]) == 0 )
-            		{
-            		// found match
-            		User::Leave(KErrAlreadyExists);
-            		}
-        	}
-    		
-        }
-        
-        HBufC* newName = HBufC::NewLC( KSettingsNameMaxLength );
-        *newName = *iDefaultName;
-        
-        TPtr namePtr = newName->Des();
-        IncrementNameL( namePtr );
-        
-        while ( SettingNameAlreadyExistsL( namePtr, EFalse ) )
-            {
-           IncrementNameL( namePtr );
-            }
-        
-        delete iDefaultName;
-        iDefaultName = NULL;
-        iDefaultName = namePtr.AllocL();
-        CleanupStack::PopAndDestroy( newName );
-        }
-     LOGSTRING( "CWPEmailSaveItem::ValidateSettingsNameL : Exit" );
-    }
-
-// -----------------------------------------------------------------------------
-// CWPEmailSaveItem::CreateMailboxEntryL
-// -----------------------------------------------------------------------------
-//
-TInt CWPEmailSaveItem::CreateMailboxEntryL( CWPEmailItem& aPopImapItem,
-    CWPEmailItem& aSmtpItem )
-    {
-        LOGSTRING( "CWPEmailSaveItem::CreateMailboxEntryL : Entry" );
-
-    TInt err = KErrNone;
-	TBuf<10> appIdValue;
-    
-	CImumDaSettingsData* eMailSettingsData(NULL);
-    eMailSettingsData = iServices->CreateSettingsDataL(KNullUid);
-    CleanupStack::PushL(eMailSettingsData); //1
-
-    CImIAPPreferences* apSet = CImIAPPreferences::NewLC(); //2
-    CImIAPPreferences* popImapIapSet = CImIAPPreferences::NewLC(); //3
-
-    TPtrC emailAddress = GetValidEmailAddressL(aSmtpItem.ParameterValue(
-            EWPParameterFrom));
-    TImumDaSettings::TTextEmailAddress emailAddressText;
-    emailAddressText.Append(emailAddress);
-
-    err = eMailSettingsData->SetAttr(TImumDaSettings::EKeyEmailAddress,
-            emailAddressText);
-    User::LeaveIfError(err);
-
-    TImumDaSettings::TTextMailboxName mailBoxName(*iDefaultName);
-    err = eMailSettingsData->SetAttr(TImumDaSettings::EKeyMailboxName,
-            mailBoxName);
-
-    // set IMAP/POP specific settings, create the account and set as default     
-    if ( iPopMail ) // POP3
-        {
-        // Add Pop set
-        MImumDaSettingsDataCollection& pop3Set = eMailSettingsData->AddSetL(
-                KSenduiMtmPop3Uid);
-
-
-        // set access point preferences
-        TImIAPChoice popIapChoice;
-        popIapChoice.iDialogPref = ECommDbDialogPrefDoNotPrompt;
-        popIapChoice.iIAP = 0;
-        // We get Wap AP Uid from AP adapter, so it needs to be converted here. 
-        // If correct IAP is not found try to use default IAP from CommsDB
-        TRAPD( error, popIapChoice.iIAP = IapIdFromWapIdL( aPopImapItem.AssociatedIapId() ) );
-        if ( error == KErrNone )
-            {        
-            popImapIapSet->AddIAPL(popIapChoice);
-            }
-        else if ( error == KErrNotFound )
-            {
-            popIapChoice.iIAP = 0;
-            popIapChoice.iDialogPref = ECommDbDialogPrefPrompt;
-            popImapIapSet->AddIAPL( popIapChoice );
-            }
-        else 
-            {
-            User::Leave( error );
-            }
-
-        //Set Access Point
-        err = pop3Set.SetAttr(TImumDaSettings::EKeyAccessPoint, TInt(
-                popImapIapSet->IAPPreference(0).iIAP));
-        User::LeaveIfError(err);
-
-        TImumDaSettings::TTextServerAddress serverAddress;
-        serverAddress.Append(aPopImapItem.ParameterValue(EWPParameterAddr));
-
-        err = pop3Set.SetAttr(TImumDaSettings::EKeyServer, serverAddress);
-        User::LeaveIfError(err);
-
-        TImumDaSettings::TTextUserName userName(Des16To8L(
-                aPopImapItem.ParameterValue(EWPParameterAAuthName)));
-        TImumDaSettings::TTextPassword passWord(Des16To8L(
-                aPopImapItem.ParameterValue(EWPParameterAAuthSecret)));
-
-        //set application ID
-        const TDesC& appID = aPopImapItem.ParameterValue(EWPParameterAppID);
-        appIdValue.Copy(appID);
-
-        if (userName.Length() > 0)
-            {
-            err = pop3Set.SetAttr(TImumDaSettings::EKeyUsername, userName);
-            }
-        if (passWord.Length() > 0)
-            {
-            err = pop3Set.SetAttr(TImumDaSettings::EKeyPassword, passWord);
-            }
-
-        //Set Port Value
-        TInt portVal;
-        if (GetParamValue(aPopImapItem, EWPParameterPortNbr, portVal)
-                == KErrNone)
-            {
-            err = pop3Set.SetAttr(TImumDaSettings::EKeyPort, portVal);
-            }
-
-        // Set Service parameter values [StartTLS, SSL/TLS, Normal]
-        const TDesC& popSecure = aPopImapItem.ParameterValue(
-                EWPParameterService);
-
-        if (popSecure.Compare(KSecureString) == 0)
-            {
-            err = pop3Set.SetAttr(TImumDaSettings::EKeySecurity,
-                    TImumDaSettings::EValueSecurityTls);
-            }
-        else if (popSecure.Compare(KEmailSettingSecurePortPOP) == 0)
-            {
-            err = pop3Set.SetAttr(TImumDaSettings::EKeySecurity,
-                    TImumDaSettings::EValueSecuritySsl);
-            if (!err)
-                {
-                err = pop3Set.SetAttr(TImumDaSettings::EKeyPort,
-                        KEmailSslWrappedPop3Port);
-                }
-            }
-        else
-            {
-            err = pop3Set.SetAttr(TImumDaSettings::EKeySecurity,
-                    TImumDaSettings::EValueSecurityOff);
-            }
-        
-        err = SetEmailNotificationRetrievalParamsL(*eMailSettingsData,
-                aPopImapItem, pop3Set);
-
-        }
-    else // IMAP4
-        {
-        // Add Imap set
-        MImumDaSettingsDataCollection& imap4Set = eMailSettingsData->AddSetL(
-                KSenduiMtmImap4Uid);
-        // set access point preferences
-        TImIAPChoice imapIapChoice;
-        imapIapChoice.iDialogPref = ECommDbDialogPrefDoNotPrompt;
-        imapIapChoice.iIAP = 0;
-        // We get Wap AP Uid from AP adapter, so it needs to be converted here. 
-        // If correct IAP is not found try to use default IAP from CommsDB
-        TRAPD( error, imapIapChoice.iIAP = IapIdFromWapIdL( aPopImapItem.AssociatedIapId() ) );
-        if ( error == KErrNone )
-            {        
-            popImapIapSet->AddIAPL(imapIapChoice);
-            }
-        else if ( error == KErrNotFound )
-            {
-            imapIapChoice.iIAP = 0;
-            imapIapChoice.iDialogPref = ECommDbDialogPrefPrompt;
-            popImapIapSet->AddIAPL( imapIapChoice );
-            }
-        else 
-            {
-            User::Leave( error );
-            }
-
-        //Set Access Point
-        err = imap4Set.SetAttr(TImumDaSettings::EKeyAccessPoint, TInt(
-                popImapIapSet->IAPPreference(0).iIAP));
-        User::LeaveIfError(err);
-
-        // Set incoming mail server
-        TImumDaSettings::TTextServerAddress serverAddress;
-        serverAddress.Append(aPopImapItem.ParameterValue(EWPParameterAddr));
-        err = imap4Set.SetAttr(TImumDaSettings::EKeyServer, serverAddress);
-        User::LeaveIfError(err);
-
-        TImumDaSettings::TTextUserName userName(Des16To8L(
-                aPopImapItem.ParameterValue(EWPParameterAAuthName)));
-        TImumDaSettings::TTextPassword passWord(Des16To8L(
-                aPopImapItem.ParameterValue(EWPParameterAAuthSecret)));
-        
-		//set application ID
-        const TDesC& appID = aPopImapItem.ParameterValue( EWPParameterAppID );
-        appIdValue.Copy(appID); 
-       
-        if (userName.Length() > 0)
-            {
-            err = imap4Set.SetAttr(TImumDaSettings::EKeyUsername, userName);
-            }
-        if (passWord.Length() > 0)
-            {
-            err = imap4Set.SetAttr(TImumDaSettings::EKeyPassword, passWord);
-            }
-
-        //Set Port Value
-        TInt portVal;
-        if (GetParamValue(aPopImapItem, EWPParameterPortNbr, portVal)
-                == KErrNone)
-            {
-            err = imap4Set.SetAttr(TImumDaSettings::EKeyPort, portVal);
-            }
-
-        // Set Service parameter values [StartTLS, SSL/TLS, Normal]
-        const TDesC& imapSecure = aPopImapItem.ParameterValue(
-                EWPParameterService);
-        if (imapSecure.Compare(KSecureString) == 0)
-            {
-            err = imap4Set.SetAttr(TImumDaSettings::EKeySecurity,
-                    TImumDaSettings::EValueSecurityTls);
-            }
-        else if (imapSecure.Compare(KEmailSettingSecurePortIMAP) == 0)
-            {
-            err = imap4Set.SetAttr(TImumDaSettings::EKeySecurity,
-                    TImumDaSettings::EValueSecuritySsl);
-            if (!err)
-                {
-                err = imap4Set.SetAttr(TImumDaSettings::EKeyPort,
-                        KEmailSslWrappedImap4Port);
-                }
-            }
-        else
-            {
-            err = imap4Set.SetAttr(TImumDaSettings::EKeySecurity,
-                    TImumDaSettings::EValueSecurityOff);
-            }
-
-        err = SetEmailNotificationRetrievalParamsL(*eMailSettingsData,
-                aPopImapItem, imap4Set);
-
-        }
-
-    // Add smtp set
-    MImumDaSettingsDataCollection& smtpSet = eMailSettingsData->AddSetL(
-            KSenduiMtmSmtpUid);
-
-    // set access point preferences
-    TImIAPChoice smtpIapChoice;
-    smtpIapChoice.iDialogPref = ECommDbDialogPrefDoNotPrompt;
-    smtpIapChoice.iIAP = 0;
-        // We get Wap AP Uid from AP adapter, so it needs to be converted here. 
-        // If correct IAP is not found try to use default IAP from CommsDB
-        LOGSTRING( "CWPEmailSaveItem::IapIdFromWapIdL : Entry" );
-    TRAPD( error, smtpIapChoice.iIAP = IapIdFromWapIdL( aSmtpItem.AssociatedIapId() ) );
-    if (error == KErrNone)
-        {
-        apSet->AddIAPL(smtpIapChoice);
-        }
-    else if (error == KErrNotFound)
-        {
-        smtpIapChoice.iIAP = 0;
-        smtpIapChoice.iDialogPref = ECommDbDialogPrefPrompt;
-        apSet->AddIAPL(smtpIapChoice);
-        }
-    else
-        {
-        User::Leave(error);
-        }
-        LOGSTRING( "CWPEmailSaveItem::IapIdFromWapIdL : Exit" );
-
-    //Set Access Point
-    err = smtpSet.SetAttr(TImumDaSettings::EKeyAccessPoint, TInt(
-            apSet->IAPPreference(0).iIAP));
-    User::LeaveIfError(err);
-
-    // Set outgoing server address
-    TImumDaSettings::TTextServerAddress serverAddress;
-    serverAddress.Append(aSmtpItem.ParameterValue(EWPParameterAddr));
-    err = smtpSet.SetAttr(TImumDaSettings::EKeyServer, serverAddress);
-    User::LeaveIfError(err);
-
-    TInt val;
-    // set port number
-    if (GetParamValue(aSmtpItem, EWPParameterPortNbr, val) == KErrNone)
-        {
-        err = smtpSet.SetAttr(TImumDaSettings::EKeyPort, val);
-        }
-
-    // Set Service parameter values [StartTLS, SSL/TLS, Normal]
-    const TDesC& secure = aSmtpItem.ParameterValue(EWPParameterService);
-
-    if (secure.Compare(KSecureString) == 0)
-        {
-        err = smtpSet.SetAttr(TImumDaSettings::EKeySecurity,
-                TImumDaSettings::EValueSecurityTls);
-        }
-    else if (secure.Compare(KEmailSettingSecurePortSMTP) == 0)
-        {
-        err = smtpSet.SetAttr(TImumDaSettings::EKeySecurity,
-                TImumDaSettings::EValueSecuritySsl);
-        if (!err)
-            {
-            smtpSet.SetAttr(TImumDaSettings::EKeyPort,
-                    KEmailSslWrappedSmtpPort);
-            }
-        }
-    else
-        {
-        err = smtpSet.SetAttr(TImumDaSettings::EKeySecurity,
-                TImumDaSettings::EValueSecurityOff);
-        }
-
-        LOGSTRING( "Des16To8L : Entry" );
-    TImumDaSettings::TTextUserName smtpUserName(Des16To8L(
-            aSmtpItem.ParameterValue(EWPParameterAAuthName)));
-        LOGSTRING( "Des16To8L : Exit" );
-        LOGSTRING( "Des16To8L : Entry" );
-    TImumDaSettings::TTextPassword smtpPassWord(Des16To8L(
-            aSmtpItem.ParameterValue(EWPParameterAAuthSecret)));
-        LOGSTRING( "Des16To8L : Exit" );
-
-    if (smtpUserName.Length() > 0)
-        {
-        err = smtpSet.SetAttr(TImumDaSettings::EKeyUsername, smtpUserName);
-        }
-    if (smtpPassWord.Length() > 0)
-        {
-        err = smtpSet.SetAttr(TImumDaSettings::EKeyPassword, smtpPassWord);
-        }
-
-    //Set User Preferences
-    err = smtpSet.SetAttr(TImumDaSettings::EKeyReplyToAddress,
-            emailAddressText);
-
-        LOGSTRING( "Emailservices::CreateMailboxL : Entry" );
-    iDefaultMsvId = iServices->CreateMailboxL(*eMailSettingsData);
-        LOGSTRING( "Emailservices::CreateMailboxL : Exit" );
-
-    SetEmailAppIdForPnpServiceL(appIdValue);
-    
-    
-    CleanupStack::PopAndDestroy(3);
-        LOGSTRING( "CWPEmailSaveItem::CreateMailboxEntryL : Exit" );
-
-    return err;
-    }
-void CWPEmailSaveItem::SetEmailAppIdForPnpServiceL(TDesC& appIDValue)
-{
-	
-	
-
-	//if PnPMS service launched by Email client for email settings download
-	//then set application ID of mail box into Cenrep.
-	CPnpProvUtil* prov = CPnpProvUtil::NewLC();
-	// use contant value
-	const TUint32 uidVal = 0x100058C5;
-	TUint32 uidValCenrep = prov->GetApplicationUidL();
-	
-	if(uidVal == uidValCenrep)
-	prov->SetProvAdapterAppIdL(appIDValue); 
-	
-	CleanupStack::PopAndDestroy();
-
-	
-}
-
-
-void CWPEmailSaveItem::IncrementNameL(TDes& aName)
-    {
-    LOGSTRING( "CWPEmailSaveItem::IncrementNameL: Enter" );
-    
-    TInt length = aName.Length();
-
-    // If this fails it means that at least default name should have been assigned
-    // to item.
-    //__ASSERT_ALWAYS(length > 0, Panic(EMEUNameEmpty));
-    
-	    	
-    TInt newOrdinal = 0;
-    TInt index = length-1;
-    TInt charValue = aName[index];
-
-    // Check if name ends with ')'
-    if (charValue == ')')
-        {
-        TBool cutBetweenIndexes = EFalse;
-        index--;
-        TInt multi = 1;
-        while ( index >= 0)
-            {
-            charValue = aName[index];
-            TChar ch(charValue);
-
-            if (!ch.IsDigit())
-                {
-                // There was non-digits inside the brackets.
-                if ( charValue == '(')
-                    {
-                    // We found the start
-                    cutBetweenIndexes = ETrue;
-                    index--;
-                    break;
-                    }
-                else
-                    {
-                    // There was a non-digit inside the '(' and ')'
-                    // We just append after the original name.
-                    break;
-                    }
-                } // if
-            else
-                {
-                TInt newNum = ch.GetNumericValue();
-                if (multi <= 100000000)
-                    {
-                    // If there's a pattern (007) then this makes it to be (007)(01)
-                    if (newNum == 0 && newOrdinal != 0 && multi > 10)
-                        {
-                        break;
-                        }
-                    newOrdinal += newNum * multi;
-                    multi*=10;
-                    }//0010
-                else
-                    {
-                    newOrdinal = 0;
-                    break;
-                    }
-                }
-            index--;
-            } // while
-
-        // There was correct pattern of (0000) so now we delete it.
-        if (cutBetweenIndexes)
-            {
-            aName.Delete(index+1, length-index);
-            }
-        else
-            {
-            // This case is for example 12345) so we get 12345)(01)
-            newOrdinal = 0;
-            }
-        } // if
-
-    // Add one to the ordinal read from the old name
-    newOrdinal++;
-
-    // Check that there's enough space to add the ordinal
-    TInt maxLength = aName.MaxLength();
-    TInt ordinalSpace(4); // Ordinal space comes from (00) so it's 4
-    length = aName.Length();
-    if (length + ordinalSpace > maxLength)
-        {
-        aName.Delete(maxLength-ordinalSpace, ordinalSpace);
-        }
-
-    // Append the ordinal at the end of the name
-    HBufC* old = aName.AllocLC();
-
-    _LIT(KFormatSpecLessTen, "%S(0%d)");
-    _LIT(KFormatSpecOverTen, "%S(%d)");
-    if (newOrdinal < 10)
-        {
-        aName.Format(KFormatSpecLessTen, old, newOrdinal);
-        }
-    else
-        {
-        aName.Format(KFormatSpecOverTen, old, newOrdinal);
-        }
-    CleanupStack::PopAndDestroy(old); // old
-    
-    LOGSTRING( "CWPEmailSaveItem::IncrementNameL: Exit" );
-    }
-
-
-// -----------------------------------------------------------------------------
-// CWPEmailSaveItem::IncrementNameL
-// -----------------------------------------------------------------------------
-//
-void CWPEmailSaveItem::IncrementNameL(TDes& aName, TInt aMaxLength)
-    {
-    LOGSTRING( "CWPEmailSaveItem::IncrementNameL: Enter" );
-    
-    TInt length = aName.Length();
-
-    // If this fails it means that at least default name should have been assigned
-    // to item.
-    //__ASSERT_ALWAYS(length > 0, Panic(EMEUNameEmpty));
-    
-    TInt newOrdinal = 0;
-    TInt index = length-1;
-    TInt charValue = aName[index];
-
-    // Check if name ends with ')'
-    if (charValue == ')')
-        {
-        TBool cutBetweenIndexes = EFalse;
-        index--;
-        TInt multi = 1;
-        while ( index >= 0)
-            {
-            charValue = aName[index];
-            TChar ch(charValue);
-
-            if (!ch.IsDigit())
-                {
-                // There was non-digits inside the brackets.
-                if ( charValue == '(')
-                    {
-                    // We found the start
-                    cutBetweenIndexes = ETrue;
-                    index--;
-                    break;
-                    }
-                else
-                    {
-                    // There was a non-digit inside the '(' and ')'
-                    // We just append after the original name.
-                    break;
-                    }
-                } // if
-            else
-                {
-                TInt newNum = ch.GetNumericValue();
-                if (multi <= 100000000)
-                    {
-                    // If there's a pattern (007) then this makes it to be (007)(01)
-                    if (newNum == 0 && newOrdinal != 0 && multi > 10)
-                        {
-                        break;
-                        }
-                    newOrdinal += newNum * multi;
-                    multi*=10;
-                    }//0010
-                else
-                    {
-                    newOrdinal = 0;
-                    break;
-                    }
-                }
-            index--;
-            } // while
-
-        // There was correct pattern of (0000) so now we delete it.
-        if (cutBetweenIndexes)
-            {
-            aName.Delete(index+1, length-index);
-            }
-        else
-            {
-            // This case is for example 12345) so we get 12345)(01)
-            newOrdinal = 0;
-            }
-        } // if
-
-    // Add one to the ordinal read from the old name
-    newOrdinal++;
-
-    // Check that there's enough space to add the ordinal
-    TInt maxLength = aMaxLength;
-    TInt ordinalSpace(4); // Ordinal space comes from (00) so it's 4
-    length = aName.Length();
-    if (length + ordinalSpace > maxLength)
-        {
-        aName.Delete(maxLength-ordinalSpace, ordinalSpace);
-        }
-
-    // Append the ordinal at the end of the name
-    HBufC* old = aName.AllocLC();
-
-    _LIT(KFormatSpecLessTen, "%S(0%d)");
-    _LIT(KFormatSpecOverTen, "%S(%d)");
-    if (newOrdinal < 10)
-        {
-        aName.Format(KFormatSpecLessTen, old, newOrdinal);
-        }
-    else
-        {
-        aName.Format(KFormatSpecOverTen, old, newOrdinal);
-        }
-    CleanupStack::PopAndDestroy(old); // old
-    
-    LOGSTRING( "CWPEmailSaveItem::IncrementNameL: Exit" );
-    }
-
-// -----------------------------------------------------------------------------
-// CWPEmailSaveItem::ValidateText
-// -----------------------------------------------------------------------------
-//
-TInt CWPEmailSaveItem::ValidateText(const TDesC& serverAddress)
-{
-	
-	// Check if the name of the mailbox contains only 
-    // white space characters.
-    TInt length = serverAddress.Length();
-    	
-		
-    for( TInt i = 0 ; i < length ; i++ )
-    	{
-    		TChar tempChar(serverAddress[i]);
-    		if( !tempChar.IsSpace() )
-    			{
-    			// If the character isn't a white space character 
-    			// then KErrNone is returned.
-    			return KErrNone;
-    			}
-    	}
-    return KErrGeneral;
-    
-}
-
-
-// -----------------------------------------------------------------------------
-// CWPEmailSaveItem::ValidateServerAddress
-// -----------------------------------------------------------------------------
-//
-TInt CWPEmailSaveItem::ValidateServerAddress(const TDesC& serverAddress)
-{
-	
-	TInt result = ValidateText(serverAddress);
-
-    // Check for valid server address
-    if ( result == KErrNone )
-        {
-        TBool ok = EFalse;
-        TRAPD( error, ok = MsvUiServiceUtilities::IsValidDomainL(serverAddress) );
-
-        result = ( error == KErrNone ) && ok ? KErrNone : KErrGeneral;
-        }
-
-    return result;
-    
-}
-
-// -----------------------------------------------------------------------------
-// CWPEmailSaveItem::ValidatePortNo
-// -----------------------------------------------------------------------------
-//
-TInt CWPEmailSaveItem::ValidatePortNo(const TUint& portVal)
-{
-	TInt result = (portVal >= KEmailPortMinValue) && (portVal <= KEmailPortMaxValue) ? KErrNone : KErrArgument;
-	return result;	
-}
-
-// -----------------------------------------------------------------------------
-// CWPEmailSaveItem::SetEmailNotificationRetrievalParamsL
-// -----------------------------------------------------------------------------
-//
-TInt CWPEmailSaveItem::SetEmailNotificationRetrievalParamsL(
-        CImumDaSettingsData& aEmailSettingsData, CWPEmailItem& aPopImapItem,
-        MImumDaSettingsDataCollection& aPopImapSet)
-    {
-        LOGSTRING( "CWPEmailSaveItem::SetEmailNotificationRetrievalParamsL : Entry" );
-    TInt err = KErrGeneral;
-
-    //Set EMN
-    /*
-     Characteristic/name: APPLICATION/EMN
-     Status: Optional.
-     Occurs: 0/1.
-     Default value: 0.
-     Used values: 0, 1, 2.
-     OFF = 0.
-     ON = 1.
-     VALID = 2.
-     Interpretation:
-     Specifies the usage of OMA EMN. If the value is OFF (0), OMA EMN
-     is disabled. If the value is ON (1) OMA EMN is enabled. If the value
-     is VALID (2) OMA EMN is enabled with proxy whitelist validation.
-     This means that OMA EMN messages are accepted only from
-     trusted push proxy gateways. Whitelist validation is made
-     based on Push Validation document available in Forum Nokia.
-     */
-
-    const TDesC& emnParamName(KParamEMN);
-
-    TBool validUserPass = EFalse;
-    // Check whether Username and Password are there in the incoming settings
-
-    err = ValidateUserNamePassword(aPopImapSet, validUserPass);
-    if (!err && validUserPass)
-        {
-        err = SetIntParam(aEmailSettingsData, aPopImapItem, emnParamName);
-        }
-
-    TInt emnValSet;
-    TInt err1;
-    err1 = aEmailSettingsData.GetAttr(TImumDaSettings::EKeyAutoNotifications,
-            emnValSet);
-
-    if (((!err && !err1 && !emnValSet) || err) && validUserPass)
-        {
-        const TDesC& onlineParamName(KParamONLINE);
-        // Check whether Username and Password are there in the incoming settings
-
-        TInt onlineValRec;
-        err = GetParamValue(aPopImapItem, onlineParamName, onlineValRec);
-        if (emnValSet && !err && onlineValRec)
-            {
-            //Set EMN to Off before setting Online
-            err = aEmailSettingsData.SetAttr(
-                    TImumDaSettings::EKeyAutoNotifications,
-                    TImumDaSettings::EValueNotificationsOff);
-            }
-        //Set Online
-        /*
-         Characteristic/name: APPLICATION/ONLINE
-         Status: Optional.
-         Occurs: 0/1. 
-         Default value: 0.
-         Used values: 0 or 1.
-         OFF = 0.
-         ON = 1.
-         Interpretation: 
-         Specifies the online mode. Online mode works with APPLICATION/POLL and
-         APPLICATION/CS parameters in following way:
-         Connection shedule parameter specifies time windows when always online mode
-         is used. Polling can be used to shorter polling interval of IMAP IDLE. This
-         is useful option when network/NAT drops connection after short inactivity
-         */
-        if (!err)
-            {
-            err = SetIntParam(aEmailSettingsData, aPopImapItem,
-                    onlineParamName);
-            }
-
-        }
-
-    const TDesC& csParamName(KParamCS);
-    const TDesC& csParamVal(aPopImapItem.ParameterValue(csParamName));
-
-    if (csParamVal.Length())
-        {
-            LOGSTRING2( "[Provisioning] CWPEmailSaveItem::SetEmailNotificationRetrievalParamsL: csParamVal value %i", csParamVal );
-
-        TLex csParamValue(csParamVal);
-        TInt64 retStartHourMinValue = KImumMboxDefaultAutoRetrievalStartHour;
-        TInt64 retEndHourMinValue = KImumMboxDefaultAutoRetrievalEndHour;
-
-        //Get the Retrieval Start and End Hours, first
-        err = GetRetHoursValueL(csParamValue, '-', retStartHourMinValue);
-
-        if (!err)
-            {
-            err = GetRetHoursValueL(csParamValue, '<', retEndHourMinValue);
-            }
-
-        //Set Retrieval Days
-        /* 
-         Characteristic/name: APPLICATION/CS
-         Status: Optional.
-         Occurs: 0/1.
-         Default value: empty.
-         Used values: empty or time<days>; 00:00-23:59<0,1,2,3,4,5,6>
-         Sunday = 0.
-         Monday = 1.
-         Tuesday = 2.
-         Wednesday = 3.
-         Thursday = 4.
-         Friday = 5.
-         Saturday = 6.
-         Interpretation:
-         Specifies the connection schedule when always online or polling is
-         active. When value is empty, connection schedule is disabled. If
-         connection shedule is inactivated, polling is still enabled.
-         */
-        //Setting Retrieval Days, first, parse the CS parm, till the end
-        if (!err)
-            {
-            err = SetRetDaysL(csParamValue, aEmailSettingsData);
-            }
-
-        // If there no error in parsing the CS parameter, then set the Retrieval Start and End Hours
-        if (!err && retStartHourMinValue
-                > KImumMboxDefaultAutoRetrievalStartHour)
-            {
-            //Set Retrieval Start Hour
-            err = aEmailSettingsData.SetAttr(
-                    TImumDaSettings::EKeyAutoRetrievalStartHour,
-                    retStartHourMinValue);
-            }
-
-        if (!err && retEndHourMinValue > KImumMboxDefaultAutoRetrievalEndHour)
-            {
-            //Set Retrieval End Hour
-            err = aEmailSettingsData.SetAttr(
-                    TImumDaSettings::EKeyAutoRetrievalEndHour,
-                    retEndHourMinValue);
-            }
-
-        }
-
-    const TDesC& pollParamName(KParamPOLL);
-    //Set Poll
-    /*
-     Characteristic/name: APPLICATION/POLL
-     Status: Optional.
-     Occurs: 0/1.
-     Default value: 0.
-     Used values: 0 (off), or 16-bit unsigned integer.
-     Interpretation:
-     Specifies the polling period in minutes. Zero indicates that
-     polling is disabled.
-     */
-    err = SetIntParam(aEmailSettingsData, aPopImapItem, pollParamName);
-
-    const TDesC& lmsParamName(KParamLMS);
-    TInt onlineParamVal;
-    err = aEmailSettingsData.GetAttr(TImumDaSettings::EKeyAutoRetrieval,
-            onlineParamVal);
-
-    if ((!err && onlineParamVal == KImumMboxDefaultAutoRetrieval) || err)
-        {
-        //Automatic Retrieval is off, then set Mailbox Update Limit to the value received
-        /*
-         Characteristic/name: APPLICATION/LMS
-         Status: Optional.
-         Occurs: 0/1.
-         Default value: 0.
-         Used values: 0 (all mails) or 32-bit unsigned integer.
-         Interpretation:
-         Specifies the local mailbox size. This defines the amount of mails kept in
-         local mailbox. If this value has been defined to zero (all), then all mails
-         are fetched to the mobile (local mailbox). If this value is define for
-         example 10, then only 10 newest mails are kept in local mailbox.
-         */
-        err = SetIntParam(aEmailSettingsData, aPopImapItem, lmsParamName);
-        }
-
-        LOGSTRING( "CWPEmailSaveItem::SetEmailNotificationRetrievalParamsL : Exit" );
-
-    return err;
-
-    }
-
-// -----------------------------------------------------------------------------
-// CWPEmailSaveItem::SetIntParam
-// -----------------------------------------------------------------------------
-//
-TInt CWPEmailSaveItem::SetIntParam(CImumDaSettingsData& aEmailSettingsData,
-        CWPEmailItem& aPopImapItem, const TDesC& aParamName)
-    {
-    TInt err = KErrGeneral;
-    TInt paramMinValue;
-    TInt paramMaxValue;
-    TInt paramKey = 0x0000000;
-
-    if (aParamName.CompareF(KParamEMN) == 0)
-        {
-        paramMinValue = TImumDaSettings::EValueNotificationsOff;
-        paramMaxValue = TImumDaSettings::EValueNotificationsHome;
-        paramKey = TImumDaSettings::EKeyAutoNotifications;
-        }
-    else if (aParamName.CompareF(KParamONLINE) == 0)
-        {
-        paramMinValue = TImumDaSettings::EValueAutoOff;
-        paramMaxValue = TImumDaSettings::EValueAutoHomeNetwork;
-        paramKey = TImumDaSettings::EKeyAutoRetrieval;
-        }
-    else if (aParamName.CompareF(KParamPOLL) == 0)
-        {
-        paramMinValue = KImumPollMinUpdateLimit;
-        paramMaxValue = KImumPollMaxUpdateLimit;
-        }
-
-    else if (aParamName.CompareF(KParamLMS) == 0)
-        {
-        paramMinValue = KImumMboxInboxMinUpdateLimit;
-        paramMaxValue = KImumMboxInboxMaxUpdateLimit;
-        paramKey = TImumDaSettings::EKeyInboxUpdateLimit;
-        }
-
-    else
-        {
-        return err;
-        }
-
-    TInt val;
-    err = GetParamValue(aPopImapItem, aParamName, val);
-    if (!err)
-        {
-        if (val >= paramMinValue && val <= paramMaxValue)
-            {
-            if (aParamName.CompareF(KParamPOLL) != 0)
-                {
-                //Set the value for the Parm
-                err = aEmailSettingsData.SetAttr(paramKey, val);
-                }
-            else
-                {
-                //Set the value for Poll
-                err = SetPollValue(aEmailSettingsData, val);
-                }
-            }
-        else
-            {
-            return KErrOverflow;
-            }
-        }
-    return err;
-    }
-// -----------------------------------------------------------------------------
-// CWPEmailSaveItem::GetParamValue
-// -----------------------------------------------------------------------------
-//
-TInt CWPEmailSaveItem::GetParamValue(CWPEmailItem& aEmailItem,
-        const TInt aParamID, TInt& aVal)
-    {
-    TLex paramValue(aEmailItem.ParameterValue(aParamID));
-    return (paramValue.Val(aVal));
-    }
-
-// -----------------------------------------------------------------------------
-// CWPEmailSaveItem::GetParamValue
-// -----------------------------------------------------------------------------
-//
-TInt CWPEmailSaveItem::GetParamValue(CWPEmailItem& aEmailItem,
-        const TDesC& aParamName, TInt& aVal)
-    {
-    TLex paramValue(aEmailItem.ParameterValue(aParamName));
-    return (paramValue.Val(aVal));
-    }
-
-// -----------------------------------------------------------------------------
-// CWPEmailSaveItem::GetRetParamValuesFromCS
-// -----------------------------------------------------------------------------
-//
-TBool CWPEmailSaveItem::GetRetParamValuesFromCS(TLex& aCSParamValue,
-        const TInt aTokenMark, TPtrC& aParm)
-    {
-    aCSParamValue.Mark();
-    TInt next = aCSParamValue.Peek();
-    TChar cnext = aCSParamValue.Peek();
-    TInt count = 0;
-
-    while (!cnext.Eos())
-        {
-        if (next == aTokenMark)
-            {
-            aParm.Set(aCSParamValue.MarkedToken());
-            aCSParamValue.Inc();
-            return ETrue;
-            }
-        aCSParamValue.Inc();
-        next = aCSParamValue.Peek();
-        cnext = aCSParamValue.Peek();
-        count++;
-        }
-
-    while (count--)
-        {
-        aCSParamValue.UnGet();
-        }
-    return EFalse;
-    }
-
-// -----------------------------------------------------------------------------
-// CWPEmailSaveItem::GetRetHoursValueL
-// -----------------------------------------------------------------------------
-//
-TInt CWPEmailSaveItem::GetRetHoursValueL(TLex& aCSParamValue,
-        TInt aTokenMark, TInt64& aRetHourMinValue)
-    {
-    TInt err = KErrGeneral;
-    TPtrC retHour(KNullDesC);
-    TPtrC retMin(KNullDesC);
-
-    if (GetRetParamValuesFromCS(aCSParamValue, KColonChar, retHour)
-            && GetRetParamValuesFromCS(aCSParamValue, aTokenMark, retMin))
-        {
-        if (retHour.Length() != KRetHourStandardLength || retMin.Length()
-                != KRetMinStandardLength)
-            {
-            return KErrOverflow;
-            }
-        TLex lexRetHour(retHour);
-        TLex lexRetMin(retMin);
-        TInt64 valRetHour;
-        TInt64 valRetMin;
-
-        err = ValidateRetHourorMin(lexRetHour);
-
-        if (!err)
-            {
-            err = ValidateRetHourorMin(lexRetMin);
-            }
-
-        if (!err)
-            {
-            err = lexRetHour.Val(valRetHour);
-            }
-
-        if (!err)
-            {
-            err = lexRetMin.Val(valRetMin);
-            }
-
-        if (!err)
-            {
-            //Check for the boundary values
-            if (valRetHour >= KRetHourLowerBound && valRetHour
-                    <= KRetHourUpperBound && valRetMin >= KRetMinLowerBound
-                    && valRetMin <= KRetMinUpperBound)
-                {
-                const TDesC& retSecMilliSec(KRetSecMilliSec);
-                TInt retHourMinMaxSize = retHour.Size() + retMin.Size()
-                        + retSecMilliSec.Size();
-                TInt retHourMaxSize = retHour.Size();
-                TInt retMinMaxSize = retMin.Size();
-                HBufC* bufRetHour = HBufC::NewL(retHourMaxSize);
-                HBufC* bufRetMin = HBufC::NewL(retMinMaxSize);
-                HBufC* bufRetHourMin = HBufC::NewL(retHourMinMaxSize);
-
-            TPtr ptrRetHour(bufRetHour->Des());
-            //Change the Absolute Integer Hour value to a string 
-            GetRetHourorMinfromIntValue(retHour, valRetHour, ptrRetHour);
-
-            TPtr ptrRetMin(bufRetMin->Des());
-            //Change the Absolute Integer Min value to a string 
-            GetRetHourorMinfromIntValue(retMin, valRetMin, ptrRetMin);
-
-            TPtr retHourMin(bufRetHourMin->Des());
-            retHourMin.Append(ptrRetHour);
-            retHourMin.Append(ptrRetMin);
-            //Make the string to be in proper Time format
-            retHourMin.Append(retSecMilliSec);
-
-                    LOGSTRING2( "[Provisioning] CWPEmailSaveItem::GetRetHoursValueL: retHourMin value %i", retHourMin );
-
-            TTime timeretHour(retHourMin);
-            aRetHourMinValue = timeretHour.Int64();
-            delete bufRetHourMin;
-            delete bufRetMin;
-            delete bufRetHour;
-
-                }
-            else
-                {
-                return KErrOverflow;
-                }
-            }
-
-        }
-
-    return err;
-
-    }
-
-// -----------------------------------------------------------------------------
-// CWPEmailSaveItem::SetRetDaysL
-// -----------------------------------------------------------------------------
-//
-TInt CWPEmailSaveItem::SetRetDaysL(TLex& aCSParamValue,
-        CImumDaSettingsData& aEmailSettingsData)
-    {
-    TInt err = KErrGeneral;
-    TPtrC retDays(KNullDesC);
-
-    if (GetRetParamValuesFromCS(aCSParamValue, KGTChar, retDays))
-        {
-            LOGSTRING2( "[Provisioning] CWPEmailSaveItem::SetRetDaysL: retDays value, %i", retDays );
-
-        const TDesC& comma(KComma);
-        const TInt retDaysMaxSize = retDays.Size() + comma.Size();
-        HBufC* bufRetDays = HBufC::NewL(retDaysMaxSize);
-        *bufRetDays = retDays;
-
-        TPtr ptrRetDays(bufRetDays->Des());
-        //Append comma to demarcate the last day
-        ptrRetDays.Append(comma);
-
-        if (ptrRetDays.Length() > KRetDaysStandardMaxLength)
-            {
-            delete bufRetDays;
-            return KErrOverflow;
-            }
-
-        TLex lexRetDays(ptrRetDays);
-        TChar next = lexRetDays.Peek();
-        TInt retDaysFlag = 0x0000000;
-
-        while (!next.Eos())
-            {
-            TPtrC retDay(KNullDesC);
-
-            if (GetRetParamValuesFromCS(lexRetDays, KCommaChar, retDay))
-                {
-                if (retDay.Length() != KRetDayStandardLength)
-                    {
-                    delete bufRetDays;
-                    return KErrOverflow;
-                    }
-                TLex lexRetDay(retDay);
-                TInt retDayVal;
-                    LOGSTRING2( "[Provisioning] CWPEmailSaveItem::SetRetDaysL: retDay value, %i", retDay );
-                
-                err = lexRetDay.Val(retDayVal);
-                if (!err)
-                    {
-                    switch (retDayVal)
-                        {
-                        case KRetSunday:
-                            {
-                            retDaysFlag |= TImumDaSettings::EFlagSunday;
-                            break;
-                            }
-                        case KRetMonday:
-                            {
-                            retDaysFlag |= TImumDaSettings::EFlagMonday;
-                            break;
-                            }
-                        case KRetTuesday:
-                            {
-                            retDaysFlag |= TImumDaSettings::EFlagTuesday;
-                            break;
-                            }
-                        case KRetWednesday:
-                            {
-                            retDaysFlag |= TImumDaSettings::EFlagWednesday;
-                            break;
-                            }
-                        case KRetThursday:
-                            {
-                            retDaysFlag |= TImumDaSettings::EFlagThursday;
-                            break;
-                            }
-                        case KRetFriday:
-                            {
-                            retDaysFlag |= TImumDaSettings::EFlagFriday;
-                            break;
-                            }
-                        case KRetSaturday:
-                            {
-                            retDaysFlag |= TImumDaSettings::EFlagSaturday;
-                            break;
-                            }
-                        default:
-                            {
-                            delete bufRetDays;
-                            return KErrOverflow;
-                            }
-                        }
-                    }
-                else
-                    {
-                    break;
-                    }
-                    
-                }
-
-            next = lexRetDays.Peek();
-            }
-
-        if (!err && retDaysFlag)
-            {
-            //If the flag is set, set the value to Retrieval Days
-            err = aEmailSettingsData.SetAttr(
-                    TImumDaSettings::EKeyAutoRetrievalDays, retDaysFlag);
-            }
-
-        delete bufRetDays;
-        }
-
-    return err;
-
-    }
-
-// -----------------------------------------------------------------------------
-// CWPEmailSaveItem::SetPollValue
-// -----------------------------------------------------------------------------
-//
-TInt CWPEmailSaveItem::SetPollValue(CImumDaSettingsData& aEmailSettingsData,
-        TInt aPollValue)
-    {
-    TInt err = KErrGeneral;
-    TInt pollhour = aPollValue / 60;
-    TInt pollmin = aPollValue % 60;
-    TInt pollval = pollhour;
-
-    if (!pollhour)
-        {
-        pollval = pollmin;
-        }
-
-    //Consider only the absolute minutes and absolute hours 
-    if ((pollhour && !pollmin) || (!pollhour && pollmin))
-        {
-        TInt val = 0;
-        switch (pollval)
-            {
-            case KPoll5minutes:
-                {
-                val = TImumDaSettings::EValue5Minutes;
-                break;
-                }
-            case KPoll15minutes:
-                {
-                val = TImumDaSettings::EValue15Minutes;
-                break;
-                }
-            case KPoll30minutes:
-                {
-                val = TImumDaSettings::EValue30Minutes;
-                break;
-                }
-            case KPoll1Hour:
-                {
-                val = TImumDaSettings::EValue1Hour;
-                break;
-                }
-            case KPoll2Hours:
-                {
-                val = TImumDaSettings::EValue2Hours;
-                break;
-                }
-            case KPoll4Hours:
-                {
-                val = TImumDaSettings::EValue4Hours;
-                break;
-                }
-            case KPoll6Hours:
-                {
-                val = TImumDaSettings::EValue6Hours;
-                break;
-                }
-            }
-        if (val)
-            {
-            //If val is set, set it to Poll
-            err = aEmailSettingsData.SetAttr(
-                    TImumDaSettings::EKeyAutoRetrievalInterval, val);
-            }
-        }
-    return err;
-    }
-
-// -----------------------------------------------------------------------------
-// CWPEmailSaveItem::ValidateUserNamePassword
-// -----------------------------------------------------------------------------
-//
-TInt CWPEmailSaveItem::ValidateUserNamePassword(
-        MImumDaSettingsDataCollection& aPopImapSet, TBool& aValidUserPass )
-    {
-    TInt err = KErrGeneral;
-    TImumDaSettings::TTextUserName userName(KNullDesC8);
-    TImumDaSettings::TTextPassword passWord(KNullDesC8);
-
-    err = aPopImapSet.GetAttr(TImumDaSettings::EKeyUsername, userName);
-
-    if (!err)
-        {
-        err = aPopImapSet.GetAttr(TImumDaSettings::EKeyPassword, passWord);
-        }
-
-    if (!err && userName.Length() > 0 && passWord.Length() > 0)
-        {
-        aValidUserPass = ETrue;
-        }
-
-    return err;
-    }
-
-// -----------------------------------------------------------------------------
-// CWPEmailSaveItem::GetRetHourorMinfromIntValue
-// -----------------------------------------------------------------------------
-//
-void CWPEmailSaveItem::GetRetHourorMinfromIntValue(TPtrC& aRetHourMin,
-        TInt64 aValRetHourMin, TPtr& aPtrRetHourMin)
-    {
-    const TDesC& retLeadingZero(KRetLeadingZero);
-    TInt retHourMaxSize = aRetHourMin.Size();
-    HBufC* bufRetHourMin = HBufC::NewL(retHourMaxSize);
-    HBufC* TempBufRetHourMin = HBufC::NewL(retHourMaxSize);
-
-    TPtr ptrTempRetHourMin(TempBufRetHourMin->Des());
-    ptrTempRetHourMin.Num(aValRetHourMin);
-        LOGSTRING2( "[Provisioning] CWPEmailSaveItem::GetRetHoursValueL: ptrTempRetHourMin value, %i ", ptrTempRetHourMin );
-
-    if (aValRetHourMin < KRetHourMinLeadLimit)
-        {
-        aPtrRetHourMin.Append(retLeadingZero);
-        }
-
-    aPtrRetHourMin.Append(ptrTempRetHourMin);
-        LOGSTRING2( "[Provisioning] CWPEmailSaveItem::GetRetHoursValueL: aPtrRetHourMin value %i", aPtrRetHourMin );
-    
-    delete TempBufRetHourMin;
-    delete bufRetHourMin;
-    }
-
-// -----------------------------------------------------------------------------
-// CWPEmailSaveItem::ValidateRetHourorMin
-// -----------------------------------------------------------------------------
-//
-TInt CWPEmailSaveItem::ValidateRetHourorMin(TLex& aRetHourMin)
-    {
-    TChar cnext = aRetHourMin.Peek();
-    TInt count = 0;
-
-    while (!cnext.Eos())
-        {
-        if (!(cnext.IsDigit()))
-            {
-            return KErrGeneral;
-            }
-        aRetHourMin.Inc();
-        cnext = aRetHourMin.Peek();
-        count++;
-        }
-
-    while (count--)
-        {
-        aRetHourMin.UnGet();
-        }
-
-    return KErrNone;
-    }
-//  End of File  
--- a/omacp/omacpadapters/EmailAdapter/src/CWPEmailSaveSmtpImapItem.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,171 +0,0 @@
-/*
-* Copyright (c) 2002 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:  Saves SMTP IMAP settings
-*
-*/
-
-
-// INCLUDE FILES
-#include    "CWPEmailSaveSmtpImapItem.h"
-#include    "CWPEmailItem.h"
-#include    "WPEmail.hrh"
-#include    "EmailAdapter.pan"
-#include    "Cwplog.h"
-#include    <CWPParameter.h>
-#include    <imapset.h>
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CSaveSmtpImapItem::CSaveSmtpImapItem
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CSaveSmtpImapItem::CSaveSmtpImapItem( CWPEmailItem* aSmtpItem, 
-                                      CWPEmailItem* aImapItem )
-                                      : iSmtpItem( aSmtpItem ),
-                                        iImapItem( aImapItem )
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// CSaveSmtpImapItem::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CSaveSmtpImapItem::ConstructL()
-    {
-    CWPEmailSaveItem::ConstructL();
-    }
-
-// -----------------------------------------------------------------------------
-// CSaveSmtpImapItem::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CSaveSmtpImapItem* CSaveSmtpImapItem::NewLC( CWPEmailItem* aSmtpItem, 
-                                             CWPEmailItem* aImapItem )
-    {
-    __ASSERT_DEBUG(aSmtpItem && aImapItem , Panic(EMailAdapterNullPointer));
-    CSaveSmtpImapItem* self = new( ELeave ) CSaveSmtpImapItem( aSmtpItem,
-                                                               aImapItem );
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    return self;
-    }
-
-// -----------------------------------------------------------------------------    
-// Destructor
-// -----------------------------------------------------------------------------
-CSaveSmtpImapItem::~CSaveSmtpImapItem()
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// CSaveSmtpImapItem::SaveL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CSaveSmtpImapItem::SaveL( CMsvSession* aSession )
-    {  
-    SaveMailSettingsToMessageServerL( *iSmtpItem, *iImapItem, EFalse, aSession );
-    }
-
-// -----------------------------------------------------------------------------
-// CSaveSmtpImapItem::SummaryText
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-TBool CSaveSmtpImapItem::ValidateL()
-    {
-    // Check items
-    return ( ValidateSmtpItemL() && ValidateImapItemL() && 
-        iSmtpItem->ParameterValue(EWPParameterProviderID) == 
-        iImapItem->ParameterValue(EWPParameterProviderID));
-    }
-
-// -----------------------------------------------------------------------------
-// CSaveSmtpImapItem::SummaryText
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-const TDesC& CSaveSmtpImapItem::SummaryText()
-    {
-    // return default name for settings 
-    return CWPEmailSaveItem::SummaryText();
-    }
-
-// -----------------------------------------------------------------------------
-// CSaveSmtpImapItem::ValidateSmtpItemL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-TBool CSaveSmtpImapItem::ValidateSmtpItemL()
-    {
-    const TDesC& ownAddress = iSmtpItem->ParameterValue(EWPParameterFrom);
-    const TDesC& serverAddress = iSmtpItem->ParameterValue(EWPParameterAddr);
-
-    if (ownAddress.Length() > 0
-        && ownAddress.Length() <= KIacMaxAddressLength 
-        && KErrNone == ValidateServerAddress(serverAddress)
-        && serverAddress.Length() <= KIacMaxSendHostLength )
-        {
-        LOG1("CSaveSmtpImapItem::ValidateSmtpItemL %d", IsValidEmailAddressL(ownAddress));
-        return (IsValidEmailAddressL(ownAddress));
-        }
-    LOG("CSaveSmtpImapItem::ValidateSmtpItemL: Not Valid");
-    return EFalse;
-    }
-
-// -----------------------------------------------------------------------------
-// CSaveSmtpImapItem::ValidateImapItemL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-TBool CSaveSmtpImapItem::ValidateImapItemL()
-    {
-    const TDesC& userName = iImapItem->ParameterValue(EWPParameterAAuthName);
-    const TDesC& password = iImapItem->ParameterValue(EWPParameterAAuthSecret);
-    const TDesC& serverAddress = iImapItem->ParameterValue(EWPParameterAddr);
-    const TDesC& imapName = iImapItem->ParameterValue(EWPParameterName);
-    const TDesC& smtpName = iSmtpItem->ParameterValue(EWPParameterName);
-    
-    // Replace default name if found
-	if (imapName.Length() > 0)
-        {
-        SetDefaultNameL(imapName);
-        }
-    else
-        {
-        if (smtpName.Length() > 0)
-            {
-            SetDefaultNameL(smtpName);        
-            }
-        }
-
-    if (KErrNone == ValidateServerAddress(serverAddress)
-        && serverAddress.Length() <= KIacMaxRecHostLength 
-        && userName.Length() <= KIacMaxRemMbxUserNameLength 
-        && password.Length() <= KIacMaxPasswdLength && imapName.Length()<=30 && smtpName.Length()<=30 )
-        {
-        LOG("CSaveSmtpImapItem::ValidateImapItemL: Valid");
-        return ETrue;
-        }
-    LOG("CSaveSmtpImapItem::ValidateImapItemL: Not Valid");
-    return EFalse;
-    }
-    
-//  End of File  
--- a/omacp/omacpadapters/EmailAdapter/src/CWPEmailSaveSmtpPopItem.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,172 +0,0 @@
-/*
-* Copyright (c) 2002 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:  Saves SMTP POP settings
-*
-*/
-
-
-// INCLUDE FILES
-#include    "CWPEmailSaveSmtpPopItem.h"
-#include    "CWPEmailItem.h"
-#include    "EmailAdapter.pan"
-#include    "WPEmail.hrh"
-#include    "Cwplog.h"
-#include    <CWPParameter.h>
-#include    <pop3set.h>
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CSaveSmtpPopItem::CSaveSmtpPopItem
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CSaveSmtpPopItem::CSaveSmtpPopItem( CWPEmailItem* aSmtpItem, 
-                                    CWPEmailItem* aPopItem)
-                                    : iSmtpItem( aSmtpItem ), 
-                                      iPopItem( aPopItem ) 
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// CSaveSmtpPopItem::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CSaveSmtpPopItem::ConstructL()
-    {
-    CWPEmailSaveItem::ConstructL();
-    }
-
-// -----------------------------------------------------------------------------
-// CSaveSmtpPopItem::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CSaveSmtpPopItem* CSaveSmtpPopItem::NewLC( CWPEmailItem* aSmtpItem, 
-                                           CWPEmailItem* aPopItem )
-    {
-    __ASSERT_DEBUG(aSmtpItem && aPopItem, Panic(EMailAdapterNullPointer));
-    CSaveSmtpPopItem* self = new( ELeave ) CSaveSmtpPopItem( aSmtpItem,
-                                                             aPopItem );
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    return self;
-    }
-
-// -----------------------------------------------------------------------------    
-// Destructor
-// -----------------------------------------------------------------------------
-CSaveSmtpPopItem::~CSaveSmtpPopItem()
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// CSaveSmtpPopItem::SaveL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CSaveSmtpPopItem::SaveL(CMsvSession* aSession)
-    {    
-    SaveMailSettingsToMessageServerL( *iSmtpItem, *iPopItem, ETrue, aSession );
-    }
-
-// -----------------------------------------------------------------------------
-// CSaveSmtpPopItem::SummaryText
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-const TDesC& CSaveSmtpPopItem::SummaryText()
-    {
-    return CWPEmailSaveItem::SummaryText();
-    }
-    
-// -----------------------------------------------------------------------------
-// CSaveSmtpPopItem::ValidateL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-TBool CSaveSmtpPopItem::ValidateL()
-    {
-    __ASSERT_DEBUG(iPopItem && iSmtpItem, Panic(EMailAdapterNullPointer));
-
-    // validate items and Provider ID
-    return (ValidatePopItemL() && ValidateSmtpItemL() && 
-        iSmtpItem->ParameterValue(EWPParameterProviderID) == 
-        iPopItem->ParameterValue(EWPParameterProviderID));
-    }
-
-// -----------------------------------------------------------------------------
-// CSaveSmtpPopItem::ValidateSmtpItemL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-TBool CSaveSmtpPopItem::ValidateSmtpItemL()
-    {
-    const TDesC& ownAddress = iSmtpItem->ParameterValue(EWPParameterFrom);
-    const TDesC& serverAddress = iSmtpItem->ParameterValue(EWPParameterAddr);
-
-    if (ownAddress.Length() > 0
-        && ownAddress.Length() <= KIacMaxAddressLength 
-        && KErrNone == ValidateServerAddress(serverAddress)
-        && serverAddress.Length() <= KIacMaxSendHostLength )
-        {
-        LOG1("CSaveSmtpPopItem::ValidateSmtpItemL %d", IsValidEmailAddressL(ownAddress));
-        return IsValidEmailAddressL(ownAddress);
-        }
-    LOG("CSaveSmtpPopItem::ValidateSmtpItemL: Not Valid");
-    return EFalse;
-    }
-
-// -----------------------------------------------------------------------------
-// CSaveSmtpPopItem::ValidatePopItemL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-TBool CSaveSmtpPopItem::ValidatePopItemL()
-    {
-    const TDesC& userName = iPopItem->ParameterValue(EWPParameterAAuthName);
-    const TDesC& password = iPopItem->ParameterValue(EWPParameterAAuthSecret);
-    const TDesC& serverAddress = iPopItem->ParameterValue(EWPParameterAddr);
-    const TDesC& popName = iPopItem->ParameterValue(EWPParameterName);
-    const TDesC& smtpName = iSmtpItem->ParameterValue(EWPParameterName);
-
-    // Replace default name if found
-	if (popName.Length() > 0)
-        {
-        SetDefaultNameL(popName);
-        }
-    else
-        {
-        if (smtpName.Length() > 0)
-            {
-            SetDefaultNameL(smtpName);        
-            }
-        }
-    // Check max/min lenghts
-    	if (KErrNone == ValidateServerAddress(serverAddress)
-        && serverAddress.Length() <= KIacMaxRecHostLength 
-        && userName.Length() <= KIacMaxRemMbxUserNameLength 
-        && password.Length() <= KIacMaxPasswdLength && popName.Length() <= 30 &&  smtpName.Length() <= 30)
-        {        	
-        LOG("CSaveSmtpPopItem::ValidatePopItemL: Valid");
-        return ETrue;
-        }
-    LOG("CSaveSmtpPopItem::ValidatePopItemL: Not Valid");
-    return EFalse;
-    }
-    
-//  End of File  
--- a/omacp/omacpadapters/EmailAdapter/src/CWPLog.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,94 +0,0 @@
-/*
-* Copyright (c) 2003 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: 
-*     Class offers static utility functions.
-*     
-*
-*/
-
-
-// INCLUDE FILES
-
-#include <e32svr.h>
-#include "Cwplog.h"
-
-
-#ifdef ENABLE_LOGGING
-#include <flogger.h>
-
-/// Folder where the WMLBC log resides
-_LIT( KLogFolder, "Provisioning" );
-
-/// The name of the log file
-_LIT( KLogFileName, "EmailAdptr.txt" );
-
-/// The format in which the time is formatted in log
-_LIT( KLogTimeFormat, "%02d.%02d:%02d:%06d ");
-
-/// The length of the string produced by KLogTimeFormat
-const TInt KLogTimeFormatLength = 16;
-
-/// How many characters a log line can contain
-const TInt KLogLineLength = 256;
-
-#endif // ENABLE_LOGGING       
-
-// ================= MEMBER FUNCTIONS =======================
-
-#ifdef ENABLE_LOGGING
-// ---------------------------------------------------------
-// Log() 
-//
-// ---------------------------------------------------------
-void Log::DoLog( TRefByValue<const TDesC> aText, ... )
-    {
-    VA_LIST args;
-    VA_START( args, aText );
-
-    TBuf<256> buf;
-    buf.FormatList( aText, args );
-
-#ifdef _DEBUG
-#ifdef LOG_TO_FILE
-	RFileLogger logger;
-	TInt ret = logger.Connect();
-	if (ret==KErrNone)
-		{
-		logger.SetDateAndTime( EFalse,EFalse );
-		logger.CreateLog( KLogFolder, KLogFileName, EFileLoggingModeAppend );		
-		TBuf<KLogTimeFormatLength> timeStamp;
-		TTime now;
-		now.HomeTime();
-		TDateTime dateTime;
-		dateTime = now.DateTime();
-		timeStamp.Format( KLogTimeFormat, 
-            dateTime.Hour(), dateTime.Minute(),
-            dateTime.Second(), dateTime.MicroSecond() );
-		buf.Insert( 0, timeStamp );
-
-		logger.Write(buf);
-		}
-
-	logger.Close();
-
-#else
-    RDebug::Print( buf );
-#endif // LOG_TO_FILE
-#endif // _DEBUG
-    VA_END( args );
-    }
-
-#endif // ENABLE_LOGGING
-
-// End of file
--- a/omacp/omacpadapters/EmailAdapter/src/Cwplog.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +0,0 @@
-/*
-* Copyright (c) 2002 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: 
-*     Logging class
-*     
-*
-*/
-
-
-
-#ifndef Log_H
-#define Log_H
-
-/////////////////////////////////////////////////////////////////////////////
-// #Defines that control printing of additional information to debug stream.
-/////////////////////////////////////////////////////////////////////////////
-
-// INCLUDES
-
-#include "LogDef.h"
-#include <e32std.h>
-
-// DEFINES
-
-#ifdef ENABLE_LOGGING
-#define LOG(s) Log::DoLog(_L(s))
-#define LOG1(s, v) Log::DoLog( _L(s), v )
-#define LOG2(s, v1, v2) Log::DoLog( _L(s), v1, v2 )
-#else
-#define LOG(s)
-#define LOG1(s, v)
-#define LOG2(s, v1, v2)
-#endif // ENABLE_LOGGING
-
-// DATA TYPES
-
-
-// CLASS DECLARATION
-
-/**
-* Class offers logging functionality.
-*/
-class Log
-    {
-
-    public:
-
-        /**
-        * Log the message.
-		* @param aText text to be written to log.
-        */
-        static void DoLog( TRefByValue<const TDesC> aText, ... );
-
-    private: // constructor
-        
-		/// Prohibited default constructor
-		Log();
-
-		/// Prohibited copy constructor
-		Log( const Log& );
-    
-		/// Prohibited assignment operator
-		Log& operator=( const Log& );
-    };
-
-#endif // Log_H
-
-//  End of File  
--- a/omacp/omacpadapters/EmailAdapter/src/LogDef.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-/*
-* Copyright (c) 2002 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: 
-*     Logging class defines
-*     
-*
-*/
-
-
-
-#ifndef LOGDEF_H
-#define LOGDEF_H
-
-/////////////////////////////////////////////////////////////////////////////
-// #Defines that control printing of additional information to debug stream.
-/////////////////////////////////////////////////////////////////////////////
-
-// Defining this enables logging
-//#define ENABLE_LOGGING
-
-// Defining this will direct all messages to a log file
-//#define LOG_TO_FILE
-
-#endif // LOGDEF_H
-
-//  End of File  
--- a/omacp/omacpadapters/EmailAdapter/src/WPEmail.hrh	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +0,0 @@
-/*
-* Copyright (c) 2002 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 file contains declarations for constants.
-*     The file can be included in C++ or resource file.
-*     
-*
-*/
-
-
-#ifndef WPEMAIL_HRH
-#define WPEMAIL_HRH
-
-// CONSTANTS
-#if ( defined (__WINS__) || defined (__WINSCW) ) // this different on hw
-    _LIT( KAdapterName, "WPEmailAdapterResource" );
-#else
-    _LIT( KAdapterName, "WPEmailAdapter" );
-#endif
-
-
-// secure settin string
-_LIT(KSecureString, "STARTTLS");
-// supports these ports
-_LIT( KEmailSettingPortSMTP, "25" );
-_LIT( KEmailSettingPortIMAP, "143" );
-_LIT( KEmailSettingPortPOP, "110" );
-// SSL/TLS setting strings
-_LIT( KEmailSettingSecurePortSMTP, "465" ); 
-_LIT( KEmailSettingSecurePortPOP, "995" ); 
-_LIT( KEmailSettingSecurePortIMAP, "993" ); 
-
-const TInt KEmailSslWrappedSmtpPort		= 465;
-const TInt KEmailSslWrappedPop3Port		= 995;
-const TInt KEmailSslWrappedImap4Port            = 993;
-
-// maximum lenghts
-const TInt KIacMaxIapLength             = 30;
-const TInt KIacMaxRemMbxUserNameLength  = 50;
-const TInt KIacMaxPasswdLength          = 50;
-const TInt KIacMaxAddressLength         = 100;
-const TInt KIacMaxRecHostLength         = 50;
-const TInt KIacMaxSendHostLength        = 50;
-const TInt KIacMaxRemoteMbxNameLength   = 30;
-
-const TInt KIacFetchHeadersDefaultLimit = 30;
-const TInt KSettingsNameMaxLength       = 30;
-
-//Min and Max values
-const TUint KEmailPortMinValue    = 1;
-const TUint KEmailPortMaxValue    = 65535;
-
-// Default port values
-const TUint KEmailSettingPortValueSMTP = 25;
-const TUint KEmailSettingPortValueIMAP = 143;
-const TUint KEmailSettingPortValuePOP = 110;
-
-#endif // WPEMAIL_HRH
-
-// End of File
-
--- a/omacp/omacpadapters/group/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-/*
-* Copyright (c) 2002-2006 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 bld file for omacpadapters.
-*
-*/
-
-#include "../EmailAdapter/Group/bld.inf"
--- a/omacp/omacpadapters/group/omacpadapteruids.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-/*
-* Copyright (c) 2002 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 of OMA CP Adapters.
-*
-*/
-
-
-#ifndef OMACPADAPTERSUID_H
-#define OMACPADAPTERSUID_H
-
-//  CONSTANTS  
-
-/// ECOM plugin
-#define KECOMUid2 0x10009D8D
-
-/// UID2 for the EMailAdapter DLL
-#define KProvisioningEMailAdapterUid2 KECOMUid2
-
-/// UID3 for the EMailAdapter DLL
-#define KProvisioningEMailAdapterDllUid3 0x101F84E4
-
-/// UID for the EMailAdapter
-#define KProvisioningEMailAdapterUid 0x101F84E5
-
-/// UID of the Provisisioning Adapter plugin interface
-#define KProvisioningAdapterInterface 0x101F84D5
-
-#endif      //  OMACPADAPTERSUID_H
-            
-// End of File
--- a/omacp/omacpadapters/rom/omacpadapters.iby	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-/*
-* Copyright (c) 2002-2006 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 iby file for omacpadapters.
-*
-*/
-
-#ifndef __OMACPADAPTERS_IBY__
-#define __OMACPADAPTERS_IBY__
-
-// EMail adapter
-#ifdef __EMAIL_UI
-ECOM_PLUGIN(WPEMailAdapter.dll,101F84E4.rsc)
-#endif
-
-#endif
--- a/omacp/omacpadapters/rom/omacpresources.iby	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
- /*
-* Copyright (c) 2002-2006 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 bld file for omacpresources.
-*
-*/
-
-#ifndef __OMACPRESOURCES_IBY__
-#define __OMACPRESOURCES_IBY__
-
-#ifdef __EMAIL_UI
- data=DATAZ_\RESOURCE_FILES_DIR\WPEMailAdapterResource.rsc                      RESOURCE_FILES_DIR\WPEMailAdapter.rsc
-#endif
-
-#endif
-
--- a/omadm/dcmo/dcmoadapters/extmemctrl/data/2002132B.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Resource file for ExtMemCtrl Interface Implementation.
-*
-*/
-
-#include "registryinfo.rh"
-
-// Declares info for two implementations
-RESOURCE REGISTRY_INFO theInfo
-	{
-	// UID for the DLL
-	dll_uid = 0x2002132B;
-	// Declare array of interface info
-	interfaces = 
-		{
-		INTERFACE_INFO
-			{
-			// UID of interface that is implemented
-			interface_uid = 0x2001FD40;
-			implementations = 
-				{
-				// Info for ExtMemCtrlDCMOAdapter
-				IMPLEMENTATION_INFO
-					{
-					implementation_uid = 0x2002132C;
-					version_no = 1;
-					display_name = "ExtMemCtrlDCMOAdapter";
-					default_data = "text/wml||This is the type of data that this implementation understands. (Can be anything which will allow the resolver to identify this implementation as the correct one at run time. In this case it is a mime type).";
-					opaque_data = "ExternalMemory";
-					}
-				};
-			}
-		};
-	}
-
--- a/omadm/dcmo/dcmoadapters/extmemctrl/group/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +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 "Eclipse Public License v1.0"
-* which accompanies 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 file provides building information for FOTACtrl.
-*
-*/
-
-#include <platform_paths.hrh>
-
-PRJ_EXPORTS
-
-PRJ_MMPFILES
-extmemctrldcmoadapter.mmp
-
-
-// End Of File
-
--- a/omadm/dcmo/dcmoadapters/extmemctrl/group/extmemctrldcmoadapter.mmp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  ExtMemCtrl plug-in adapter for DCMO
-*
-*/
-
-#include <platform_paths.hrh>
-
-TARGET extmemctrldcmoadapter.dll
-TARGETTYPE PLUGIN
-
-// ECom Dll recognition UID followed by the unique UID for this dll
-UID 0x10009D8D 0x2002132B
-VENDORID VID_DEFAULT
-CAPABILITY  CAP_ECOM_PLUGIN
-
-SOURCEPATH				../src
-SOURCE						extmemctrldcmoadapter.cpp
-SOURCE						extmemctrldcmoadapterproxy.cpp
-
-USERINCLUDE 			../inc 
-
-APP_LAYER_SYSTEMINCLUDE
-
-SYSTEMINCLUDE 		/epoc32/include/ecom
-
-
-SOURCEPATH				../data
-start resource 2002132B.rss
-TARGET extmemctrldcmoadapter.rsc
-LANGUAGE_IDS
-end
-
-LIBRARY 			euser.lib ecom.lib efsrv.lib bafl.lib  etul.lib
-LIBRARY       centralrepository.lib
-LIBRARY       platformenv.lib
-LIBRARY 			commonengine.lib               // Series 60 common components library
-
-SMPSAFE
--- a/omadm/dcmo/dcmoadapters/extmemctrl/inc/extmemctrldcmoadapter.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,89 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  ExtMemCtrl plug-in adapter for DCMO
-*
-*/
-
-#ifndef _EXTMEMCTRLDCMOADAPTER__
-#define _EXTMEMCTRLDCMOADAPTER__
-
-#include "dcmointerface.h"
-
-// An implementation of the CDCMOInterface definition
-class CExtMemCtrlDCMOAdapter : public CDCMOInterface
-	{
-public:
-	// Standardised safe construction which leaves nothing the cleanup stack.
-	static CExtMemCtrlDCMOAdapter* NewL(TAny* aInitParams);
-	// Destructor	
-	~CExtMemCtrlDCMOAdapter();
-
-	// Implementation of CDCMOInterface
-	/**
-	 * Get the interger type value
-	 * @param aId
-	 * @param aValue
-	 * @return TDCMOStatus 
-	 */
-	TDCMOStatus  GetDCMOPluginIntAttributeValueL(TDCMONode aId, TInt& aValue);
-	
-	/**
-	 * Get the string type value
-	 * @param aId
-	 * @param aStrValue
-	 * @return TDCMOStatus
-	 */
-	TDCMOStatus  GetDCMOPluginStrAttributeValueL(TDCMONode aId, TDes& aStrValue);
-	
-	 /**
-		* Set the interger type value
-		* @param aId
-		* @param aValue
-		* @return TDCMOStatus
-		*/
-	TDCMOStatus  SetDCMOPluginIntAttributeValueL(TDCMONode aId, TInt aValue);
-	
-	 /**
-		* Set the string type value
-		* @param aId
-		* @param aStrValue
-		* @return TDCMOStatus
-		*/
-	TDCMOStatus  SetDCMOPluginStrAttributeValueL(TDCMONode aId, const TDes& aStrValue);
-	
-	/**
-	 * Get the localized name of this plug-in
-	 * @param aLocName
-	 * @return None
-	 */
-	void GetLocalizedNameL (HBufC*& aLocName);
-	
-private:
-	// Construction
-	CExtMemCtrlDCMOAdapter(TAny* aInitParams);
-	
-	/**
-	 * second phase constructor
-	 */
-	void ConstructL();
-
-private:
-	// Data to pass back from implementation to client
-	HBufC* iProperty;
-	HBufC* iDescription;
-	// Parameters taken from client
-	CDCMOInterface::TDCMOInterfaceInitParams* iInitParams;
-	};  
-
-#endif
--- a/omadm/dcmo/dcmoadapters/extmemctrl/src/extmemctrldcmoadapter.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,263 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  ExtMemCtrl plug-in adapter for DCMO
-*
-*/
-
-
-#include <f32file.h> 
-#include <driveinfo.h>
-#include <barsread.h> 
-#include <barsc2.h>
-#include <dcmo.rsg>
-#include <stringresourcereader.h> 
-#include <f32file.h> 
-#include <data_caging_path_literals.hrh>
-#include <DevManInternalCRKeys.h>
-#include <centralrepository.h>
-#include "extmemctrldcmoadapter.h"
-
-_LIT( KExtMemCtrlProperty, "ExternalMemory");
-_LIT( KExtMemCtrlDescription, "Used to enable/disable the ExtMem");
-_LIT( KRuntimeResourceFileName, "z:dcmo.rsc" );	
-
-// Construction and destruction functions
-
-// ----------------------------------------------------------------------------------------
-// CExtMemCtrlDCMOAdapter::NewL
-// ----------------------------------------------------------------------------------------
-CExtMemCtrlDCMOAdapter* CExtMemCtrlDCMOAdapter::NewL(TAny* aParams)
-	{
-		CExtMemCtrlDCMOAdapter* self=new(ELeave) CExtMemCtrlDCMOAdapter(aParams);  
-		CleanupStack::PushL(self);
-		self->ConstructL(); 
-		CleanupStack::Pop();
-		return self;
-	}
-
-// ----------------------------------------------------------------------------------------
-// CExtMemCtrlDCMOAdapter::~CExtMemCtrlDCMOAdapter
-// ----------------------------------------------------------------------------------------
-CExtMemCtrlDCMOAdapter::~CExtMemCtrlDCMOAdapter()
-	{
-		delete iProperty;
-		iProperty = NULL;
-		delete iDescription;
-		iDescription = NULL;
-	}
-
-// ----------------------------------------------------------------------------------------
-// CExtMemCtrlDCMOAdapter::CExtMemCtrlDCMOAdapter
-// ----------------------------------------------------------------------------------------
-CExtMemCtrlDCMOAdapter::CExtMemCtrlDCMOAdapter(TAny* aInitParams)
-:  iInitParams((CDCMOInterface::TDCMOInterfaceInitParams*)aInitParams)
-	{
-	// See ConstructL() for initialisation completion.
-	}
-
-// ----------------------------------------------------------------------------------------
-// CExtMemCtrlDCMOAdapter::ConstructL
-// ----------------------------------------------------------------------------------------
-void CExtMemCtrlDCMOAdapter::ConstructL()
-{	
-	// Safely complete the initialization of the constructed object	
-	if(iInitParams->descriptor)
-		iProperty =  (iInitParams->descriptor)->AllocL();
-	else
-		iProperty = KExtMemCtrlProperty().AllocL();
-	iDescription = KExtMemCtrlDescription().AllocL();
-}
-
-// Implementation of CDCMOInterface
-
-// ----------------------------------------------------------------------------------------
-// CExtMemCtrlDCMOAdapter::GetDCMOPluginIntAttributeValueL
-// Gets the integer attribute value.
-// ----------------------------------------------------------------------------------------
-TDCMOStatus  CExtMemCtrlDCMOAdapter::GetDCMOPluginIntAttributeValueL(TDCMONode aId, TInt& aValue)
-{
-	TDCMOStatus status(EDcmoSuccess);
-	TInt err(KErrNone);
-	
-	switch(aId)
-	{
-		case EGroup: {
-									aValue = EHardware;
-								}
-						break;		
-		case EAttached:	{
-						aValue = 0;
-						RFs fsMemoryCard;
-                  		err = fsMemoryCard.Connect();
-                  		if ( err != KErrNone )
-                  		{
-                  			status = EDcmoFail;
-                  		}
-                  		TDriveInfo dInfo;
-						TVolumeInfo vInfo;
-    					TInt error = fsMemoryCard.Drive( dInfo, EDriveF );
-     					if( error == KErrNone )
-         				{
-         					error = fsMemoryCard.Volume( vInfo, EDriveF );
-         					if( error == KErrNone )
-             				{
-             					aValue = 1;
-             				}
-         				}										
-						fsMemoryCard.Close();  
-						}
-						break;
-		case EEnabled:{
-			            RFs fsMemoryCard;
-                  err = fsMemoryCard.Connect();
-                  if ( err != KErrNone )
-                  {
-                  	status = EDcmoFail;
-                  }
-                      
-                  TDriveInfo  info;
-                  err=fsMemoryCard.Drive(info, EDriveF);
- //               DBG_ARGS8( _S8("ExtMem err =  %d info.iType = %d"), err, info.iType );
-                                       
-                  if (info.iType == EMediaNotPresent || err != KErrNone ||info.iType == EMediaUnknown )
-                  {
-                    aValue = 0;
-                  }
-                  else
-                  { 
-                    aValue = 1;
-                  }                        
-                  fsMemoryCard.Close();          
-            		  }
-						break;		
-		case EDenyUserEnable:	{
-										aValue = 1;
-									}
-						break;
-		case ENotifyUser:	{
-											aValue = 1;
-											}
-						break;	
-		default :
-						status = 	EDcmoNotFound;		
-	}	
-	return status;
-}
-
-// ----------------------------------------------------------------------------------------
-// CExtMemCtrlDCMOAdapter::GetDCMOPluginStrAttributeValueL
-// Gets the string attribute value.
-// ----------------------------------------------------------------------------------------
-TDCMOStatus  CExtMemCtrlDCMOAdapter::GetDCMOPluginStrAttributeValueL(TDCMONode aId, TDes& aStrValue) 
-{
-	TDCMOStatus status(EDcmoSuccess);		
-	switch(aId)
-	{
-		case EProperty: 	aStrValue = *iProperty;
-							break;		
-		case EDescription:	aStrValue = *iDescription;
-							break;
-		default :	
-						status = EDcmoNotFound;	
-	}
-	return status;
-}
-
-// ----------------------------------------------------------------------------------------
-// CExtMemCtrlDCMOAdapter::SetDCMOPluginIntAttributeValueL
-// Sets the integer attribute value.
-// ----------------------------------------------------------------------------------------
-TDCMOStatus  CExtMemCtrlDCMOAdapter::SetDCMOPluginIntAttributeValueL(TDCMONode aId, TInt aValue)
-{
-	TDCMOStatus status(EDcmoFail);
-	TInt err(KErrNone);
-	
-	switch(aId)
-	{
-		case EDenyUserEnable:
-							break;
-		case ENotifyUser:
-							break;
-		case EEnable:	{
-			        			RFs fsMemoryCard;
-              			err = fsMemoryCard.Connect();
-              			if ( err != KErrNone )
-               			{
-                		  return status ;
-               			}
-               			TBuf<255> fsysname;
-               			fsysname.Zero();
-               			if (!aValue)
-               			{               	
-                			fsMemoryCard.FileSystemName(fsysname,EDriveF);
-                			TRequestStatus stat;
-                			fsMemoryCard.NotifyDismount(EDriveF, stat, EFsDismountForceDismount);
-                			User::WaitForRequest(stat);
-               			 	//err= fsMemoryCard.DismountFileSystem(fsysname, EDriveF);
-                			//if (err == KErrNone)
-                   		status =EDcmoSuccess;                   
-               			}
-               			else
-               			{
-               	 			TInt err(fsMemoryCard.FileSystemName(fsysname,EDriveF));
-               	 			if (err != KErrNone && !fsysname.Length()) 
-               	 			{
-               	 				_LIT( KFmgrFatFSName, "Fat" );
-               	  			err = fsMemoryCard.MountFileSystem( KFmgrFatFSName, EDriveF );
-               	 			} 
-                   		status = EDcmoSuccess;                                 	
-               			} 
-               			fsMemoryCard.Close();
-			          		CRepository *rep = NULL;
-		            		TRAPD( err1, rep = CRepository::NewL( KCRUidDeviceManagementInternalKeys )) ;
-		            		if(!err1) 
-		              		rep->Set( KDevManMemCardCtrl, aValue ); 		              
-		              	delete rep;
-		              	rep = NULL; 							
-		              }
-						break;
-		default :
-							status = EDcmoNotFound;
-	}	
-	return status;
-}
-
-// ----------------------------------------------------------------------------------------
-// CExtMemCtrlDCMOAdapter::SetDCMOPluginStrAttributeValueL
-// Sets the string attribute value.
-// ----------------------------------------------------------------------------------------
-TDCMOStatus  CExtMemCtrlDCMOAdapter::SetDCMOPluginStrAttributeValueL(TDCMONode /* aId */, const TDes& /* aStrValue */)
-{
-	// Nothing to do
-	TDCMOStatus status(EDcmoNotSupported);	
-	return status;	
-}
-
-// ----------------------------------------------------------------------------------------
-// CExtMemCtrlDCMOAdapter::GetLocalizedNameL
-// returns the localized plug-in name.
-// ----------------------------------------------------------------------------------------
-void CExtMemCtrlDCMOAdapter::GetLocalizedNameL (HBufC*& aLocName)
-{	
-	TFileName myFileName;
-  TParse parseObj;
-  parseObj.Set( KRuntimeResourceFileName(), &KDC_RESOURCE_FILES_DIR,NULL );
-  myFileName = parseObj.FullName();
-	CStringResourceReader* test = CStringResourceReader::NewL( myFileName );
-	TPtrC buf;
-	buf.Set(test->ReadResourceString(R_DM_RUN_TIME_VAR_EXT_MEMORY)); 
-	aLocName = buf.AllocL() ; 
-	delete test;
-	test = NULL;
-}
--- a/omadm/dcmo/dcmoadapters/extmemctrl/src/extmemctrldcmoadapterproxy.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  ExtMemCtrl plug-in adapter for DCMO
-*
-*/
-
-#include <e32std.h>
-#include <implementationproxy.h>
-
-#include "extmemctrldcmoadapter.h"
-
-
-// Map the interface UIDs to implementation factory functions
-const TImplementationProxy ImplementationTable[] = 
-	{
-		IMPLEMENTATION_PROXY_ENTRY(0x2002132C,	CExtMemCtrlDCMOAdapter::NewL),
-	};
-
-// Exported proxy for instantiation method resolution
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy(TInt& aTableCount)
-	{
-	aTableCount = sizeof(ImplementationTable) / sizeof(TImplementationProxy);
-
-	return ImplementationTable;
-	}
-
--- a/omadm/dcmo/dcmoadapters/group/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-/*
-* 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:  This file provides building information for DCMO plug-in adapters.
-*
-*/
-
-
-PRJ_PLATFORMS
-
-PRJ_MMPFILES
-
-#include "../extmemctrl/group/bld.inf"
--- a/omadm/dcmo/group/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +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 "Eclipse Public License v1.0"
-* which accompanies 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 file provides building information for DCMO framework.
-*
-*/
-#include <platform_paths.hrh>
-
-PRJ_EXPORTS
-../rom/dcmo.iby			CORE_APP_LAYER_IBY_EXPORT_PATH(dcmo.iby)
-
-PRJ_MMPFILES
-
-#include "../dcmoadapters/group/bld.inf"
--- a/omadm/dcmo/rom/dcmo.iby	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:   Image description file for project dcmo
-*
-*/
-
-#ifndef _DCMO_IBY_
-#define _DCMO_IBY_
-
-#ifdef FF_RUNTIME_DEVICE_CAPABILITY_CONFIGURATION
-ECOM_PLUGIN(dcmodmadapter.dll,dcmodmadapter.rsc)
-ECOM_PLUGIN(extmemctrldcmoadapter.dll,extmemctrldcmoadapter.rsc)
-#endif
-
-#endif
--- a/omadm/group/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-/*
-* Copyright (c) 2006 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: bld file for omadm component
-* 	This is part of devicecontrol.
-*
-*/
-
-#include "../omadmappui/group/bld.inf"
-#include "../omadmextensions/group/bld.inf"
-#include "../dcmo/group/bld.inf"
--- a/omadm/omadmappui/OmaDmCPPlugin/BWinscw/OmaDmCPPluginu.def	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	?ImplementationGroupProxy@@YAPBUTImplementationProxy@@AAH@Z @ 1 NONAME ; struct TImplementationProxy const * ImplementationGroupProxy(int &)
-
--- a/omadm/omadmappui/OmaDmCPPlugin/data/1028339D.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-/*
-* Copyright (c) 1028 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 rss file which contains the 
-		 interface implementation information.
-*
-*/
-
-
-#include <ecom/registryinfo.rh>
-#include <nsmldmsync.loc>
-
-RESOURCE REGISTRY_INFO theInfo
-{
-dll_uid = 0x1028339D;   //Plugin dll UID3 (security UID)  
-interfaces = 
-    {
-    INTERFACE_INFO
-        {
-        interface_uid               =  0x10207236 ;// CGSPluginInterface UID   
-        implementations = 
-            {
-            IMPLEMENTATION_INFO
-                {
-                implementation_uid  = 0x1028339E; 
-                
-                version_no          = 1;
-                display_name        = qtn_cp_folder_device_updates;
-
-                default_data        = "0x10283317 "; //CP Plugin id of Device Management
-                opaque_data         = "50";         // Order number 
-                }
-            };
-        }
-    };
-}
--- a/omadm/omadmappui/OmaDmCPPlugin/data/OmaDmCPPluginResource.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-/*
-* 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:  Device Updates resource file
-*
-*/
-
-
-NAME DMCP
-
-#include <eikon.rh>
-#include <avkon.rsg>
-#include <avkon.rh>
-#include <avkon.mbg>
-#include <avkon.loc>
-#include <data_caging_paths_strings.hrh>
-#include <nsmldmsync.loc>
-
-RESOURCE RSS_SIGNATURE { }
-
-RESOURCE TBUF { buf=qtn_apps_omadmcp_title; }
-
-RESOURCE TBUF r_omadm_cp_title  { buf=qtn_cp_folder_device_updates; } 
-
-// END FILE OmaDmCPPluginResource.rss
-
--- a/omadm/omadmappui/OmaDmCPPlugin/eabi/OmaDmCPPluginu.def	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-EXPORTS
-	_Z24ImplementationGroupProxyRi @ 1 NONAME
-	_ZTI14COmaDmCPPlugin @ 2 NONAME ; #<TI>#
-	_ZTV14COmaDmCPPlugin @ 3 NONAME ; #<VT>#
-
--- a/omadm/omadmappui/OmaDmCPPlugin/group/OmaDmCPPlugin.mmp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,77 +0,0 @@
-/*
-* 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:  mmp file for Device Manager Control panel plugin
-*
-*/
-
-
-#include <defaultcaps.hrh>
-#include <data_caging_paths.hrh>
-#include <platform_paths.hrh>
-
-TARGET          omadmcpplugin.dll
-TARGETTYPE      PLUGIN
-UID             0x10009D8D 0x1028339D
-
-CAPABILITY      CAP_ECOM_PLUGIN
-VENDORID    	VID_DEFAULT
-
-#if defined(ARMCC)
-DEFFILE		../eabi/OmaDmCPPlugin.def
-#elif defined(WINSCW)
-DEFFILE		../BWinscw/OmaDmCPPlugin.def
-#endif
-
-SOURCEPATH      ../src
-SOURCE          OmaDMCPPlugin.cpp
-
-APP_LAYER_SYSTEMINCLUDE
-SYSTEMINCLUDE   /epoc32/include/ecom
- 
-USERINCLUDE     ../inc 
-USERINCLUDE     ../../inc  //For Loc file
-
-
-SOURCEPATH      ../data
-START RESOURCE  1028339D.rss       
-TARGET          omadmcpplugin.rsc		
-END
-
-SOURCEPATH      ../data
-START RESOURCE  OmaDmCPPluginResource.rss       
-TARGET          omadmcppluginresource.rsc
-TARGETPATH      RESOURCE_FILES_DIR
-LANGUAGE_IDS
-HEADER
-END
-
-LIBRARY         gsecomplugin.lib
-LIBRARY         gsframework.lib 
-LIBRARY         aknskins.lib  
-LIBRARY         aknicon.lib
-LIBRARY         egul.lib
-LIBRARY         euser.lib
-LIBRARY         cone.lib
-LIBRARY         eikcore.lib
-LIBRARY         eikcoctl.lib
-LIBRARY			    avkon.lib
-LIBRARY         commonengine.lib
-LIBRARY         bafl.lib
-
-// Required only for embedded app
-LIBRARY         apgrfx.lib
-LIBRARY         ws32.lib
-LIBRARY         apparc.lib
-
-SMPSAFE
--- a/omadm/omadmappui/OmaDmCPPlugin/group/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-/*
-* 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:  bld.inf file for OmaDmCPPlugin
-*
-*/
-
-//#include "../inc/OmaDmCPFlag.h"
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-
-PRJ_MMPFILES
-
-
-OmaDmCPPlugin.mmp
--- a/omadm/omadmappui/OmaDmCPPlugin/inc/OmaDMCPFlag.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-/*
-* 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:  This header file contains flags,constants that are useful for plugin
-*
-*/
-
-#ifndef DM_CP_PLUGINIDS_H
-#define DM_CP_PLUGINIDS_H
-
-
-
-#endif
\ No newline at end of file
--- a/omadm/omadmappui/OmaDmCPPlugin/inc/OmaDMCPPlugin.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,137 +0,0 @@
-/*
-* 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:  This class implements ECom interface for OmaDmCPPlugin.dll
-*
-*/
-
-
-#ifndef DM_CP_PLUGIN_H
-#define DM_CP_PLUGIN_H
-
-// System includes
-#include <gsplugininterface.h>
-
-// Move this EasAppUids.h
-#define KUidOmaDmCPPluginDll   0x1028339D
-#define KUidOmaDmCPPluginImpl  0x1028339E
-
-
-class CAknNullService;
-
-/**
-* OmaDmCP ECom Plugin
-*/
-class COmaDmCPPlugin : public CGSPluginInterface,
-                     public MAknServerAppExitObserver
-    {    
-	public: 
-
-	    /**
-	    * Two-Phased constructor
-	    * Uses Leave code KErrNotFound if implementation is not found.
-	    */                                                 
-	    static CGSPluginInterface* NewL();
-	    
-	    /**
-	    * From CAknView Returns this view Id.
-	    */
-		TUid Id() const;
-	    
-	    /**
-	    * returns the caption to be displayed in GS view
-	    *
-	    * @param aCaption - The caption to be displayed is to be copied here.
-	    */
-	    void GetCaptionL( TDes& aCaption ) const;
-		
-		/**
-		* returns the icon to be displayed in GS view
-		* 
-		* @param aIconType - type of icon to be displayed
-		*/
-	    CGulIcon* CreateIconL( const TUid aIconType );
-	    
-	    /**
-	    * Destructor
-	    */
-	    ~COmaDmCPPlugin();            
-		
-		/**
-        * From CGSPluginInterface.
-        * @return this plugin's provider category.
-        */
-        TInt PluginProviderCategory() const;
-
-        /**
-        * From CGSPluginInterface.
-        * @return this plugin's item type.
-        */
-        TGSListboxItemTypes ItemType();
-
-        /**
-        * From CGSPluginInterface.
-        * @param aSelectionType selection type.
-        */
-        void HandleSelection( const TGSSelectionTypes aSelectionType );
-	
-	    /**
-        * Opens the Device Manager application
-        * @param None, @return None
-        */
-        void OpenDmAppL();
-
-	private:
-	  
-		void ConstructL();
-		
-		/**
-		* Constructor
-		*/
-	    COmaDmCPPlugin();
-	    
-	    /**
-        * From CAknView.
-        * This implementation is empty because this class, being just a dialog,
-        * does not implement the CAknView finctionality.
-        */
-        void DoActivateL( const TVwsViewId& aPrevViewId,
-                          TUid aCustomMessageId,
-                          const TDesC8& aCustomMessage );
-
-        /**
-        * From CAknView.
-        * This implementation is empty because this class, being just a dialog,
-        * does not implement the CAknView finctionality.
-        */
-        void DoDeactivate();
-        
-        /**
-        * Closes DmUi   
-        * This closes Dm Ui when CAknNullService is destroyed.
-        * 
-        */
-        void CloseDmUi();
-		CEikonEnv* env;
-		TInt       iResId;
-		
-		/**
-        * AVKON NULL Service.
-        * Own.
-        */
-        CAknNullService* iNullService;
-	
-};
-
-#endif // DM_CP_PLUGIN_H
-//End of file
--- a/omadm/omadmappui/OmaDmCPPlugin/src/OmaDMCPPlugin.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,275 +0,0 @@
-/*
-* 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:  Device updates Ecom plugin Implementation.
-*
-*/
-
-
-//System Includes
-#include <e32std.h>
-#include <implementationproxy.h>
-#include <StringLoader.h>
-#include <bautils.h>
-#include <AknsUtils.h>
-#include <gulicon.h>
-#include <akntitle.h>
-#include <e32property.h>
-// Required only for embedded app
-#include <AknNullService.h>
-#include <apgtask.h>
-#include <flogger.h>
-#include <nsmldmsync.mbg>
-#include <omadmcppluginresource.rsg>
-// User includes
-#include "OmaDMCPPlugin.h"
-#include "NSmlDMSyncApp.h"
-#include "nsmldmsyncinternalpskeys.h"
-#include <gsprivatepluginproviderids.h>
-
-_LIT(KOmaDmIconFileName, "Z:\\resource\\apps\\nsmldmsync.mif");
-_LIT(KOmaDmResFileName,  "Z:\\resource\\OmaDmCPPluginResource.rsc" );
-
-// ---------------------------------------------------------------------------------------------
-// OmaDmCPPlugin::NewLC
-// returns an object of OmaDmCPPlugin
-// ---------------------------------------------------------------------------------------------
-//
-CGSPluginInterface* COmaDmCPPlugin::NewL()
-	{
-	
-	COmaDmCPPlugin* self = new(ELeave) COmaDmCPPlugin();
-    CleanupStack::PushL(self);
-    self->ConstructL();
-	CleanupStack::Pop(self);
-	return (CGSPluginInterface*) self;
-	}
-
-// ---------------------------------------------------------------------------------------------
-// OmaDmCPPlugin::Id()
-// returns the view id
-// ---------------------------------------------------------------------------------------------
-//
-TUid COmaDmCPPlugin::Id() const
-	{
-      return TUid::Uid( KUidOmaDmCPPluginDll );	
-	}
-
-// ---------------------------------------------------------------------------------------------
-// OmaDmCPPlugin::ConstructL
-// ---------------------------------------------------------------------------------------------
-//	
-void COmaDmCPPlugin::ConstructL()
-	{
-	BaseConstructL();
-    env = CEikonEnv::Static();
-
-	TFileName fileName(KOmaDmResFileName);
-	
-	BaflUtils::NearestLanguageFile(env->FsSession(), fileName);
-
-	iResId = env->AddResourceFileL(fileName);
-	}
-
-
-// ---------------------------------------------------------------------------------------------
-// OmaDmCPPlugin::OmaDmCPPlugin
-// ---------------------------------------------------------------------------------------------
-//    
-COmaDmCPPlugin::COmaDmCPPlugin()
-	{
-    // Nothing
-	}
-
-// ---------------------------------------------------------------------------------------------
-// COmaDmCPPlugin::~COmaDmCPPlugin
-// ---------------------------------------------------------------------------------------------
-//
-COmaDmCPPlugin::~COmaDmCPPlugin()
-	{
-		TInt value =0;
-		TInt r1=RProperty::Get(KPSUidNSmlDMSyncApp,KNSmlDMSyncUiLaunchKey,value);   
-		if(value ==2 && r1 == KErrNone)
-		{
-		 CloseDmUi();
-		} 
-    if (iResId)
-	   {
-        env->DeleteResourceFile(iResId);
-	   }	
-	if ( iNullService )
-        {
-            delete iNullService;
-            iNullService = NULL;
-        }
-	}
-
-// ---------------------------------------------------------------------------------------------
-// COmaDmCPPlugin::GetCaptionL
-// returns the caption to be shown in GS view
-// ---------------------------------------------------------------------------------------------
-//
-void COmaDmCPPlugin::GetCaptionL( TDes& aCaption ) const
-	{	
-	StringLoader::Load( aCaption, R_OMADM_CP_TITLE);
-	}
-
-// ---------------------------------------------------------------------------------------------
-// COmaDmCPPlugin::CreateIconL
-// Returns the icon to be shown in GS view
-// ---------------------------------------------------------------------------------------------
-CGulIcon* COmaDmCPPlugin::CreateIconL( const TUid /*aIconType*/ )
-	{
-	CFbsBitmap* bitmap = NULL;
-    CFbsBitmap* mask = NULL;                                               
- 
-    MAknsSkinInstance* instance = AknsUtils::SkinInstance();    
-    AknsUtils::CreateIconL(instance, KAknsIIDQgnPropCpDevUpdate, bitmap, mask,
-    					KOmaDmIconFileName,
-    					EMbmNsmldmsyncQgn_prop_cp_dev_update,
-    				EMbmNsmldmsyncQgn_prop_cp_dev_update_mask);
-    CGulIcon* icon = CGulIcon::NewL( bitmap, mask );
-    icon->SetBitmapsOwnedExternally( EFalse );
-    bitmap = NULL;
-    mask = NULL;      
-    return icon;    
-	}
-
-
-// -----------------------------------------------------------------------------
-// COmaDmCPPlugin::PluginProviderCategory
-// -----------------------------------------------------------------------------
-//
-TInt COmaDmCPPlugin::PluginProviderCategory() const
-	{
-    return KGSPluginProviderInternal;
-	}
-
-// -----------------------------------------------------------------------------
-// COmaDmCPPlugin::ItemType()
-// -----------------------------------------------------------------------------
-//
-TGSListboxItemTypes COmaDmCPPlugin::ItemType()
-	{
-    return EGSItemTypeSettingDialog;
-	}
-
-
-// -----------------------------------------------------------------------------
-// COmaDmCPPlugin::HandleSelection()
-// -----------------------------------------------------------------------------
-//
-void COmaDmCPPlugin::HandleSelection(
-    const TGSSelectionTypes /*aSelectionType*/ )
-	{    
-	TRAP_IGNORE( OpenDmAppL() );    
-	}
-
-// -----------------------------------------------------------------------------
-// COmaDmCPPlugin::OpenDmAppL()
-// -----------------------------------------------------------------------------
-//
-void COmaDmCPPlugin::OpenDmAppL()
-	{   
-	static _LIT_SECURITY_POLICY_PASS(KAllowAllPolicy);
-   	static _LIT_SECURITY_POLICY_C1(KAllowWriteDeviceDataPolicy, ECapabilityWriteDeviceData);
-    TInt r=RProperty::Define(KPSUidNSmlDMSyncApp,KNSmlDMSyncUiLaunchKey,RProperty::EInt,KAllowAllPolicy,KAllowWriteDeviceDataPolicy);
-    TInt value=2;
-	if ( r!=KErrNone && r!=KErrAlreadyExists )
-       {
-       User::LeaveIfError(r);
-       }    
-       
-    RWsSession ws;
-    User::LeaveIfError( ws.Connect() );
-    CleanupClosePushL( ws );
-    // Find the task with uid
-    TApaTaskList taskList(ws);
-    TApaTask task = taskList.FindApp( KUidSmlSyncApp );
-    
-    if ( task.Exists() )
-        {    	    
-        task.BringToForeground();        
-        }
-    else
-        {
-        // Launch DM application as embedded.        
-        TInt r1=RProperty::Set(KPSUidNSmlDMSyncApp,KNSmlDMSyncUiLaunchKey,value);         
-        iNullService = CAknNullService::NewL( KUidSmlSyncApp, this );        
-        }
-    CleanupStack::PopAndDestroy();  // ws
-    
-	}
-
-// -----------------------------------------------------------------------------
-// COmaDmCPPlugin::DoActivateL
-// -----------------------------------------------------------------------------
-//
-void COmaDmCPPlugin::DoActivateL( const TVwsViewId& /*aPrevViewId*/,
-                                  TUid /*aCustomMessageId*/,
-                                  const TDesC8& /*aCustomMessage*/ )
-	{
-    // Nothing
-	}
-
-// -----------------------------------------------------------------------------
-// COmaDmCPPlugin::DoDeactivate
-// -----------------------------------------------------------------------------
-//
-void COmaDmCPPlugin::DoDeactivate()
-	{
-    // Closing embedded app
-    if ( iNullService )
-        {
-            delete iNullService;
-            iNullService = NULL;
-        }
-    
-	}
-
-
-// Constants
-const TImplementationProxy KImplementationTable[] = 
-	{
-    IMPLEMENTATION_PROXY_ENTRY( KUidOmaDmCPPluginImpl, COmaDmCPPlugin::NewL ) // used by GS plugin
-	};
-
-// ---------------------------------------------------------------------------
-// ImplementationGroupProxy
-// Gate/factory function
-// ---------------------------------------------------------------------------
-//
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy(  TInt& aTableCount )
-	{
-	aTableCount = sizeof( KImplementationTable ) 
-                / sizeof( TImplementationProxy );
-	return KImplementationTable;
-	}
-// ---------------------------------------------------------------------------------------------
-// OmaDmCPPlugin::CloseDmUi
-// closes DM Ui
-// ---------------------------------------------------------------------------------------------	
-void COmaDmCPPlugin:: CloseDmUi()
-{
-	  
-    RWsSession ws  = CEikonEnv::Static()->WsSession();
-    TApaTaskList taskList( ws );
-    TApaTask task = taskList.FindApp( KUidSmlSyncApp  );
-      if (task.Exists())
-      {
-    	task.EndTask();
-      }
-	
-}	
-// End of File
-
--- a/omadm/omadmappui/aif/NSmlDMSyncaif.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-/*
-* Copyright (c) 2002-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:  RSS for creating the aif file for NSmlDMSyncApp.
-*
-*/
-
-
-#include <aiftool.rh>
-
-RESOURCE AIF_DATA
-{
-    app_uid=0x101F6DE5;
-    num_icons=1;
-    embeddability=KAppNotEmbeddable;
-    newfile=KAppDoesNotSupportNewFile;
-}
-
-// End of File
Binary file omadm/omadmappui/cenrep/keys_nsmldmsync.xls has changed
Binary file omadm/omadmappui/conf/nsmldmsync.confml has changed
Binary file omadm/omadmappui/conf/nsmldmsync_101F6DE5.crml has changed
--- a/omadm/omadmappui/data/NSmlDMSync.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1276 +0,0 @@
-/*
-* Copyright (c) 2005-2006 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:  Resource file for Device Manager UI
-*
-*/
-
-
-//  RESOURCE IDENTIFIER
-NAME    DMUI // 4 letter ID
-
-//  INCLUDES
-#include <bldvariant.hrh>
-#include <eikon.rh>
-#include <uikon.rh>
-#include <avkon.rsg>
-#include <avkon.rh>
-#include <avkon.mbg>
-#include <avkon.hrh>
-#include <AvkonIcons.hrh>
-#include <avkon.loc>
-#include <CommonDialogs.rh>
-#include <CommonDialogs.hrh>
-
-#include <nsmldmsync.loc>
-#include <nsmldmsyncfota.loc>
-#include "NSmlDMSyncUi.hrh"
-#include "NSmlDMUIDefines.h"
-
-#include <appinfo.rh>
-
-//  RESOURCE DEFINITIONS 
-
-RESOURCE RSS_SIGNATURE { }
-
-RESOURCE TBUF { buf= "NSmlDMSync"; }
-
-RESOURCE EIK_APP_INFO
-  {
-  status_pane = r_nsmldm_status_pane; //r_smlsync_status_pane;
-  hotkeys     = r_smlsync_hotkeys;
-  }
-
-//
-// AIF icons/files
-//
-RESOURCE LOCALISABLE_APP_INFO r_nsmldmsync_localisable_app_info
-    {
-    short_caption = qtn_apps_updates_title;
-    caption_and_icon = 
-    CAPTION_AND_ICON_INFO
-        {
-        caption = qtn_apps_updates_title;
-
-    #ifdef __SCALABLE_ICONS
-        number_of_icons = 1;
-        icon_file = "Z:\\resource\\apps\\NSmlDMSync_aif.mif";
-    #else
-        number_of_icons = 2;
-        icon_file = "Z:\\resource\\apps\\NSmlDMSync.mbm";
-    #endif  // __SCALABLE_ICONS
-        };
-    }
-
-//----------------------------------------------------
-//
-//  The status pane for device manager application
-//
-//----------------------------------------------------
-//
-RESOURCE STATUS_PANE_APP_MODEL r_nsmldm_status_pane
-    {
-    panes =
-        {
-        SPANE_PANE
-            {
-            id       = EEikStatusPaneUidNavi;
-            type     = EAknCtNaviPane;
-            resource = r_nsmldm_navi_decorator;
-            }
-        };
-    }
-
-
-//----------------------------------------------------
-//
-//  The navi decorator for device manager application
-//  Defines application views tabs
-//
-//----------------------------------------------------
-//
-
-//----------------------------------------------------
-//
-//  The navi decorator for device manager application
-//  Defines application views tabs
-//
-//----------------------------------------------------
-//
-RESOURCE NAVI_DECORATOR r_nsmldm_navi_decorator
-    {
-    type    = ENaviDecoratorControlNone;
-    }
-
-// -------------------------------------------------------
-//                   MSK Enabled CBA Resources
-// -------------------------------------------------------
-
-
-//CBA for FOTA Updates view and Server profiles view
-RESOURCE CBA r_nsml_fota_profiles_view_msk_options_exit_contextoptions
-   {
-	flags = 0;
-    buttons = 
-        {
-        CBA_BUTTON { id = EAknSoftkeyOptions; txt = text_softkey_option; },
-        CBA_BUTTON { id = EAknSoftkeyExit; txt = text_softkey_exit; },
-        CBA_BUTTON { id = EAknSoftkeyContextOptions; txt = text_softkey_option; }
-        };
-
-   }
-   
-
-   RESOURCE CBA r_cp_nsml_fota_profiles_view_msk_options_back_contextoptions
-   {
-	flags = 0;
-    buttons = 
-        {
-        CBA_BUTTON { id = EAknSoftkeyOptions; txt = text_softkey_option; },
-        CBA_BUTTON { id = EAknSoftkeyBack; txt = text_softkey_back; },
-        CBA_BUTTON { id = EAknSoftkeyContextOptions; txt = text_softkey_option; }
-        };
-
-   }
-
-
-
-RESOURCE CBA r_nsml_profiles_view_msk_options_back_contextoptions
-{
-	flags = 0;
-    buttons = 
-        {
-        CBA_BUTTON { id = EAknSoftkeyOptions; txt = text_softkey_option; },
-        CBA_BUTTON { id = EAknSoftkeyBack; txt = text_softkey_back; },
-        CBA_BUTTON { id = EAknSoftkeyContextOptions; txt = text_softkey_option; }
-        };
-}
-
-
-//CBA for FOTA Settings & Server profile settings Dialog
-RESOURCE CBA r_nsml_fota_profiles_settings_msk_options_back__change
-   {
-	flags = 0;
-    buttons = 
-        {
-        CBA_BUTTON { id = EAknSoftkeyOptions; txt = text_softkey_option; },
-        CBA_BUTTON { id = EAknSoftkeyBack; txt = text_softkey_back; },
-        CBA_BUTTON { id = EAknSoftkeyChange; txt = qtn_msk_change; }
-        };
-   }
-
-
-//CBA for Authentication dialog   
-RESOURCE CBA r_nsml_profiles_authdialog_softkeys
-  {
-   buttons =
-        {
-        CBA_BUTTON 
-            {
-            id = EAknSoftkeySave; 
-            txt = text_softkey_save;
-            },
-        CBA_BUTTON 
-            {
-            id = EAknSoftkeyBack;
-            txt = text_softkey_back; 
-            },
-        CBA_BUTTON 
-            {
-            id = EAknSoftkeySave; 
-            txt = text_softkey_save; 
-            }    
-            
-        };
-	
-  }
-   
- 
-
-// -----------------------------------------------------------------------------
-//   
-// r_smlsync_fota_view
-//
-// -----------------------------------------------------------------------------
-//
-RESOURCE AVKON_VIEW r_smlsync_fota_view
-    {
-    cba = r_nsml_fota_profiles_view_msk_options_exit_contextoptions;
-    menubar = r_smlsync_menubar_fota_view;
-    }
-// -----------------------------------------------------------------------------
-//   
-// control panel FOTA view
-//
-// -----------------------------------------------------------------------------
-//
-
-RESOURCE AVKON_VIEW r_cp_smlsync_fota_view
-    {
-    cba = r_cp_nsml_fota_profiles_view_msk_options_back_contextoptions;
-    menubar = r_smlsync_menubar_fota_view;
-    }
-
-//----------------------------------------------------
-//   
-//    r_smlsync_menubar_fota_view
-//
-//----------------------------------------------------
-//
-RESOURCE MENU_BAR r_smlsync_menubar_fota_view
-  {
-  titles =
-      {
-      MENU_TITLE { menu_pane = r_smlsync_menu_common;    txt = ""; },
-      MENU_TITLE { menu_pane = r_smlsync_menu_fota_view; txt = ""; }
-      };
-  }
-
-//----------------------------------------------------
-//   
-//    r_smlsync_contxt_menubar_fota_view
-//
-//----------------------------------------------------
-//
-RESOURCE MENU_BAR r_smlsync_contxt_menubar_fota_view
-  {
-  titles =
-      {
-      MENU_TITLE { menu_pane = r_smlsync_contxt_menu_fota_view; txt = ""; }
-      };
-  }
-
-//----------------------------------------------------
-//   
-//    r_smlsync_menu_fota_view
-//    Fota view menu items
-//
-//----------------------------------------------------
-//
-RESOURCE MENU_PANE r_smlsync_menu_fota_view	
-    {
-    items =
-        {
-        MENU_ITEM { command = ENSmlMenuCmdFotaContinue;  txt = qtn_fota_options_continue_update; },
-        MENU_ITEM { command = ENSmlMenuCmdFotaInstall;  txt = qtn_fota_options_install_update; },
-        MENU_ITEM { command = ENSmlMenuCmdFotaCheck;    txt = qtn_fota_options_check_updates; },
-        MENU_ITEM { command = ENSmlMenuCmdFotaServers;    txt = qtn_dm_options_servers; },
-        MENU_ITEM { command = ENSmlMenuCmdFotaSettings; txt = qtn_fota_options_update_settings; }
-        };
-    }
-
-//----------------------------------------------------
-//   
-//    r_smlsync_contxt_menu_fota_view
-//    Fota view context menu items
-//
-//----------------------------------------------------
-//
-RESOURCE MENU_PANE r_smlsync_contxt_menu_fota_view	
-    {
-    items =
-        {
-        MENU_ITEM { command = ENSmlMenuCmdFotaContinue;  txt = qtn_fota_options_continue_update; },
-        MENU_ITEM { command = ENSmlMenuCmdFotaInstall;  txt = qtn_fota_options_install_update; },
-        MENU_ITEM { command = ENSmlMenuCmdFotaCheck;    txt = qtn_fota_options_check_updates; }
-        };
-    }
-
-//----------------------------------------------------
-//   
-//    r_fota_menubar_settings
-//    Settings view menu
-//
-//----------------------------------------------------
-//
-RESOURCE MENU_BAR r_fota_menubar_settings
-    {
-    titles =
-        { 
-        MENU_TITLE { menu_pane = r_smlsync_menu_common; txt = ""; },
-        MENU_TITLE { menu_pane = r_fota_menu_settings;  txt = ""; }
-        };
-    }
-
-//----------------------------------------------------
-//   
-//    r_fota_menu_settings
-//    Fota settings dialog specific menu items
-//
-//----------------------------------------------------
-//
-RESOURCE MENU_PANE r_fota_menu_settings	
-    {
-    items =
-        {
-        MENU_ITEM 
-            { 
-            command = ENSmlMenuCmdFotaSettChange; 
-            txt = qtn_options_change; 
-            flags = EEikMenuItemSpecific;
-            }
-        };
-    }
-
-
-//----------------------------------------------------
-// r_nsml_fota_settings_dialog
-// Fota settings dialog
-//
-//----------------------------------------------------
-//
-RESOURCE DIALOG r_nsml_fota_settings_dialog
-    {
-    flags = EEikDialogFlagWait | EEikDialogFlagFillAppClientRect | EEikDialogFlagNotifyEsc;
-    buttons = r_nsml_fota_profiles_settings_msk_options_back__change;
-    items =
-        {
-        DLG_LINE
-            {
-            type = EAknCtSettingListBox;
-            itemflags = EEikDlgItemTakesEnterKey;
-            id = ENSmlFotaSettList;
-            control = LISTBOX
-                {
-                flags = 0;
-                };            
-            }
-        };
-    }
-
-
-// -----------------------------------------------------------------------------
-//   
-// r_smlsync_profiles_view
-//
-// -----------------------------------------------------------------------------
-//
-RESOURCE AVKON_VIEW r_smlsync_profiles_view
-    {
-    cba = r_nsml_profiles_view_msk_options_back_contextoptions;
-    menubar = r_smlsync_menubar_profiles_view;
-    }
-
-
-//----------------------------------------------------
-//   
-//    r_smlsync_hotkeys
-//
-//----------------------------------------------------
-//
-RESOURCE HOTKEYS r_smlsync_hotkeys
-    {
-    control =
-        {
-        HOTKEY { command = EAknCmdExit; key = 'e'; }
-        };
-    }
-
-//----------------------------------------------------
-//   
-//    r_smlsync_menubar_profiles_view
-//
-//----------------------------------------------------
-//
-RESOURCE MENU_BAR r_smlsync_menubar_profiles_view
-  {
-  titles =
-      {
-      MENU_TITLE { menu_pane = r_smlsync_menu_common;        txt = ""; },
-      MENU_TITLE { menu_pane = r_smlsync_menu_profiles_view; txt = ""; }
-      };
-  }
-
-//----------------------------------------------------
-//   
-//    r_smlsync_contxt_menubar_profiles_view
-//
-//----------------------------------------------------
-//
-RESOURCE MENU_BAR r_smlsync_contxt_menubar_profiles_view
-  {
-  titles =
-      {
-      MENU_TITLE { menu_pane = r_smlsync_contxt_menu_profiles_view; txt = ""; }
-      };
-  }
-
-//----------------------------------------------------
-//   
-//    r_context_menu_empty
-//    Main view empty context sensitive view
-//
-//----------------------------------------------------
-//
-RESOURCE MENU_PANE r_context_menu_empty
-  {
-  items =
-    {
-    MENU_ITEM 
-      { 
-      command = ENSmlMenuCmdNewProfile; 
-      txt = qtn_dm_opt_profile_new; 
-      }
-    };
-  }
-
-//----------------------------------------------------
-//   
-//    r_smlsync_contxt_menu_profiles_view
-//    Main view context sensitive view
-//
-//----------------------------------------------------
-//
-RESOURCE MENU_PANE r_smlsync_contxt_menu_profiles_view
-    {
-    items =
-        {
-        MENU_ITEM 
-            { 
-            command = ENSmlMenuCmdStartSync; 
-            txt = qtn_dm_opt_connect; 
-            },
-        MENU_ITEM 
-            { 
-            command = ENSmlMenuCmdNewProfile; 
-            txt = qtn_dm_opt_server_new;
-            },
-        MENU_ITEM 
-            { 
-            command = ENSmlMenuCmdOpenSettings; 
-            txt = qtn_dm_opt_server_edit;
-            },
-        MENU_ITEM 
-            { 
-            command = ENSmlMenuCmdOpenLog; 
-            txt = qtn_dm_opt_profile_log; 
-            }
-        };
-    }
-
-//----------------------------------------------------
-//   
-//    r_smlsync_menu_common
-//    Common menu items
-//
-//----------------------------------------------------
-//
-RESOURCE MENU_PANE r_smlsync_menu_common	
-    {
-    items =
-        {
-        MENU_ITEM { command = EAknCmdHelp; txt = qtn_options_help; },
-        MENU_ITEM { command = EEikCmdExit;          txt = qtn_options_exit; }
-        };
-    }
-
-//----------------------------------------------------
-//   
-//    r_smlsync_menu_profiles_view
-//    Profiles view menu items
-//
-//----------------------------------------------------
-//
-RESOURCE MENU_PANE r_smlsync_menu_profiles_view	
-    {
-	items =
-        {
-        MENU_ITEM 
-            { 
-            command = ENSmlMenuCmdStartSync;  
-            txt = qtn_dm_opt_connect; 
-            flags = EEikMenuItemSpecific;
-            },
-        MENU_ITEM 
-            { 
-            command = ENSmlMenuCmdNewProfile; 
-            txt = qtn_dm_opt_server_new; 
-            },
-        MENU_ITEM 
-            { 
-            command = ENSmlMenuCmdOpenSettings;  
-            txt = qtn_dm_opt_server_edit;
-            flags = EEikMenuItemSpecific; 
-            },
-        MENU_ITEM 
-            { 
-            command = ENSmlMenuCmdEraseProfile;
-            txt = qtn_dm_opt_server_delete; 
-            flags = EEikMenuItemSpecific;
-            },
-        MENU_ITEM 
-            {
-            command = ENSmlMenuCmdOpenLog; 
-            txt = qtn_dm_opt_profile_log; 
-            flags = EEikMenuItemSpecific;
-            }
-        };
-    }
-
-// -----------------------------------------------------------------------------
-//   
-//    r_sml_confirmation_query
-//    General confirmation query resource.
-//
-// -----------------------------------------------------------------------------
-//
-RESOURCE DIALOG r_sml_confirmation_query
-    { 
-    flags = EGeneralQueryFlags;
-    buttons = R_AVKON_SOFTKEYS_YES_NO__YES;
-    items =
-        {
-        DLG_LINE
-            {
-            type = EAknCtQuery;
-            id = EGeneralQuery;
-            control = AVKON_CONFIRMATION_QUERY
-                {
-                layout = EConfirmationLayout;
-                };
-            }
-        };
-    }
-
-
-// -----------------------------------------------------------------------------
-//   
-//    r_sml_wait_note
-//    General wait note resource.
-//
-// -----------------------------------------------------------------------------
-//
-RESOURCE DIALOG r_sml_wait_note
-    {
-    flags = EAknWaitNoteFlags;
-    buttons = R_AVKON_SOFTKEYS_CANCEL;
-    items = 
-        {
-        DLG_LINE
-            {
-            type = EAknCtNote;
-            id = ENSmlWaitNote;
-            control = AVKON_NOTE 
-                {
-                layout = EWaitLayout;
-                };
-            }
-        };
-    } 
-
-//----------------------------------------------------
-//   
-//    r_settings_menu_bar
-//    Menubar and Menupane of the Settings view
-//
-//----------------------------------------------------
-//
-RESOURCE MENU_BAR r_settings_menu_bar
-    {
-    titles = 
-        { 
-        MENU_TITLE { menu_pane = r_settings_menu; txt = ""; }
-        };
-    }
-
-//----------------------------------------------------
-//   
-//    r_settings_menu
-//    Settings view menu
-//
-//----------------------------------------------------
-//
-RESOURCE MENU_PANE r_settings_menu
-    {
-    items =
-        {
-        MENU_ITEM 
-            {
-            command = ENSmlSettChange; 
-            txt = qtn_options_change; 
-            flags = EEikMenuItemSpecific;
-            },
-        MENU_ITEM 
-            {
-            command = EAknCmdHelp;
-            txt = qtn_options_help; 
-            },
-        MENU_ITEM 
-            { 
-            command = ENSmlSettExit; 
-            txt = qtn_options_exit;
-            }        
-        };
-    }
-
-//----------------------------------------------------
-// r_nsml_setting_dialog
-// Content setting dialog
-//
-//----------------------------------------------------
-//
-RESOURCE DIALOG r_nsml_setting_dialog
-  {
-  flags = EEikDialogFlagNoDrag | EEikDialogFlagNoTitleBar | EEikDialogFlagFillAppClientRect | 
-        EEikDialogFlagCbaButtons | EEikDialogFlagModeless;
-  buttons = r_nsml_fota_profiles_settings_msk_options_back__change;
-  items =
-        {
-        DLG_LINE
-            {
-            type = EAknCtSettingListBox;
-            itemflags = EEikDlgItemTakesEnterKey;
-            id = ENSmlSettingList;
-            control = LISTBOX
-              {
-              flags = EAknListBoxMultiselectionList;
-              height = 11;
-              width = 80;
-              };            
-            }
-        };
-  }
-
-//----------------------------------------------------
-//   
-//    r_settings_profilemenu
-//    Settings view menu
-//
-//----------------------------------------------------
-//
-RESOURCE MENU_BAR r_settings_profilemenu
-    {
-    titles =
-        { 
-        MENU_TITLE { menu_pane = r_settings_menu; txt =""; }
-        };
-    }
-
-
-//----------------------------------------------------
-//   
-//    r_smlsync_status_pane
-//    Sync statuspane with overridden title and icon
-//
-//----------------------------------------------------
-//
-RESOURCE STATUS_PANE_APP_MODEL r_smlsync_status_pane
-    {
-    panes =
-        {
-        SPANE_PANE
-            { 
-            id = EEikStatusPaneUidTitle;
-            type = EAknCtTitlePane;
-            resource = r_overridden_smlsync;
-            }
-        };
-    }
-
-//----------------------------------------------------
-//   
-//    r_overridden_smlsync
-//    Application title
-//
-//----------------------------------------------------
-//
-RESOURCE TITLE_PANE r_overridden_smlsync
-    {
-    txt = qtn_apps_dm_title;
-    } 
-
-//----------------------------------------------------
-//   
-//    r_startquery_note
-//    Used at app start, if there aren't any profiles,to
-//    prompt for "Create\nnew profile?"
-//    Used in Main view delete profile prompt "Delete?"   
-//
-//----------------------------------------------------
-//
-RESOURCE DIALOG r_startquery_note
-  { 
-  flags = EGeneralQueryFlags;
-  buttons = R_AVKON_SOFTKEYS_YES_NO__YES;
-  items=
-    {
-    DLG_LINE
-      {
-      type = EAknCtQuery;
-      id = EGeneralQuery;
-      control = AVKON_CONFIRMATION_QUERY
-        {
-        layout = EConfirmationLayout;
-        };
-      }
-    };
-  } 
-
-//----------------------------------------------------
-//   
-//    r_dmalertquery_note
-//    used in confirmation notes After profile deletion
-//
-//----------------------------------------------------  
-//
-RESOURCE DIALOG r_dmalertquery_note
-  { 
-
-  flags = EAknDialogGenericNoteFlags | EEikDialogFlagWait;
-  buttons = R_AVKON_SOFTKEYS_YES_NO__YES;
-  items=
-    {
-    DLG_LINE
-      {
-      type = EAknCtQuery;
-      id = EGeneralNote;
-      control =  AVKON_CONFIRMATION_QUERY 
-        { 
-        layout = EConfirmationLayout;
-        label = "Testing";
-        bmpfile = AVKON_ICON_FILE;
-        bmpid = EMbmAvkonQgn_note_query;
-        bmpmask = EMbmAvkonQgn_note_query_mask;
-        };
-      }
-    };
-  }
-
-//----------------------------------------------------
-//   
-//    r_dmnotifyquery_note
-//    used in confirmation notes After profile deletion
-//
-//----------------------------------------------------  
-//
-RESOURCE DIALOG r_dmnotifyquery_note
-  {
-  flags = EAknWaitNoteFlags; // if modal, use EEikDialogFlagWait 
-  buttons = R_AVKON_SOFTKEYS_EMPTY;
-    items=
-    {
-    DLG_LINE
-      {
-      type = EAknCtNote;
-      id = EGeneralNote;
-      control =  AVKON_NOTE 
-                { 
-                layout = EGeneralLayout;
-                singular_label = "RSS teksti";
-                //bmpfile = AVKON_ICON_FILE;
-                imageid = EMbmAvkonQgn_note_info_5;
-                imagemask = EMbmAvkonQgn_note_info_5_mask;
-                };
-      }
-    };
-  }
-
-//----------------------------------------------------
-//   
-//    r_nsml_settings_text_editor
-//    Editor for text setting page
-//
-//----------------------------------------------------  
-//
-RESOURCE EDWIN r_nsml_settings_text_editor
-  {
-  flags = 0;
-  width = 9;
-  lines = 5;
-  maxlength = KNSmlMaxProfileNameLength;
-  default_input_mode = EAknEditorAlphaInputMode;
-  flags  =  EEikEdwinNoLineOrParaBreaks;
-  avkon_flags = 0;
-  }
-
-//----------------------------------------------------
-//   
-//    r_nsml_settings_text
-//    Text setting page
-//
-//----------------------------------------------------  
-//
-RESOURCE AVKON_SETTING_PAGE r_nsml_settings_text
-  {
-  number = EAknSettingPageNoOrdinalDisplayed;
-  label = "Page 1";
-  type = EEikCtEdwin;
-  softkey_resource = R_AVKON_SOFTKEYS_OK_CANCEL__OK;
-  invalid_contents_softkey_resource = R_AVKON_SOFTKEYS_CANCEL;
-  editor_resource_id = r_nsml_settings_text_editor;
-  }
-
-//----------------------------------------------------
-//   
-//    r_setting_pwd_editor
-//    Editor for secret setting page
-//
-//----------------------------------------------------  
-//
-RESOURCE SECRETED r_setting_pwd_editor
-  {
-  num_letters = KNSmlMaxPasswordLength;
-  }
-
-//----------------------------------------------------
-//   
-//    r_setting_password
-//    Setting page for secret text editor
-//
-//----------------------------------------------------  
-//
-RESOURCE AVKON_SETTING_PAGE r_setting_password
-  { 
-  number = EAknSettingPageNoOrdinalDisplayed;
-  label =  "Password";
-  type = EEikCtSecretEd;
-  softkey_resource = R_AVKON_SOFTKEYS_OK_CANCEL__OK;
-  invalid_contents_softkey_resource = R_AVKON_SOFTKEYS_CANCEL;
-  editor_resource_id = r_setting_pwd_editor;
-  }
-
-//----------------------------------------------------
-//   
-//    r_setting_integer
-//    Editor for number setting page
-//
-//----------------------------------------------------  
-//
-RESOURCE AVKON_INTEGER_EDWIN r_setting_integer
-  {
-  maxlength = 5;
-  min = 1;
-  max = 65535;
-  }
-
-//----------------------------------------------------
-//   
-//    r_settings_number
-//    Setting page for number settings
-//
-//----------------------------------------------------  
-//
-RESOURCE AVKON_SETTING_PAGE r_settings_number
-  {
-  number = EAknSettingPageNoOrdinalDisplayed;
-  type = EAknCtIntegerEdwin;
-  softkey_resource = R_AVKON_SOFTKEYS_OK_CANCEL__OK;
-  invalid_contents_softkey_resource = R_AVKON_SOFTKEYS_CANCEL;
-  editor_resource_id = r_setting_integer;
-  }
-
-//----------------------------------------------------
-//   
-//    r_setting_app_listbox
-//    Listbox resource for Radio setting page
-//
-//----------------------------------------------------  
-//
-RESOURCE LISTBOX r_setting_app_listbox 
-  {
-  flags = 0x0001 ;
-  }
-
-//----------------------------------------------------
-//   
-//    r_settings_radio
-//    Radiobutton setting page
-//
-//----------------------------------------------------  
-//
-RESOURCE AVKON_SETTING_PAGE r_settings_radio
-  { 
-  number = EAknSettingPageNoOrdinalDisplayed;
-  softkey_resource = R_AVKON_SOFTKEYS_OK_CANCEL__OK;
-  type =  EAknSetListBox;
-  editor_resource_id =  r_setting_app_listbox;
-  }
-
-//----------------------------------------------------
-//
-// r_progress_note
-// shows the synchronisation progress
-//
-//----------------------------------------------------
-//
-RESOURCE DIALOG r_progress_note
-  {
-  flags = EAknProgressNoteFlags;
-  buttons = R_AVKON_SOFTKEYS_CANCEL;
-  items= 
-    {
-    DLG_LINE
-      {
-      type = EAknCtNote;
-      id = ENSmlProgressNote;
-      control = AVKON_NOTE 
-        {
-        animation = R_QGN_GRAF_WAIT_BAR_ANIM;
-        layout = EProgressLayout;
-        singular_label =  "\n \n \n";
-        };
-      }
-    };
-  } 
-
-//----------------------------------------------------
-//
-// r_nsmldm_authdialog
-// Authentication dialog for entering username and password.
-//
-//----------------------------------------------------
-//
-RESOURCE DIALOG r_nsmldm_authdialog
-  {
-  flags = EGeneralQueryFlags;
-  buttons = r_nsml_profiles_authdialog_softkeys;
-  items=
-    {
-    DLG_LINE
-      {
-      type = EAknCtMultilineQuery;
-      id = EMultilineFirstLine;
-      control = AVERELL_DATA_QUERY
-        { 
-        layout = EMultiDataFirstEdwin;
-        label = qtn_dm_conf_query_username;
-        control = EDWIN
-          {
-          maxlength = KNSmlMaxUsernameLength;
-          };
-        };
-      },
-    DLG_LINE
-      {
-      type = EAknCtMultilineQuery;
-      id = EMultilineSecondLine;
-      control =  AVERELL_DATA_QUERY 
-        { 
-          layout = EMultiDataSecondSecEd;
-          label = qtn_dm_conf_query_password;
-          control = SECRETED
-	          {
-	          num_letters = KNSmlMaxPasswordLength;
-	          };
-        };
-      }
-    };
-  }
-
-//----------------------------------------------------
-//
-// r_fota_check_wait_note
-//
-//----------------------------------------------------
-//
-RESOURCE DIALOG r_fota_check_wait_note
-    {
-    flags = EAknWaitNoteFlags;
-    buttons = R_AVKON_SOFTKEYS_CANCEL;
-    items =
-        {
-        DLG_LINE
-            {
-            type = EAknCtNote;
-            id = ENSmlWaitNote;
-            control = AVKON_NOTE 
-				{
-                layout = EWaitLayout;
-                singular_label = qtn_fota_wait_checking_update;
-                animation = R_QGN_GRAF_WAIT_BAR_ANIM;
-				};
-			}
-		};
-	} 
-
-//----------------------------------------------------
-//   
-//    r_smlsync_softkeys_options_cancel
-//    LeftSoftKey Select, RightSofKey Cancel (Context menu)
-//
-//----------------------------------------------------  
-//
-RESOURCE CBA r_smlsync_softkeys_options_cancel
-    {
-    buttons =
-        {
-        CBA_BUTTON 
-            {
-            id = ENSmlSyncSelect; 
-            txt = text_softkey_select;
-            },
-        CBA_BUTTON 
-            {
-            id = ENSmlSyncCancel;
-            txt = text_softkey_cancel; 
-            }
-        };
-    }
-
-////////////////////////////////////////////////////
-//  Strings
-//
-
-STRUCT STRING
-  {
-  LTEXT text;
-  }
-
-
-RESOURCE TBUF r_sml_profiles_title                           { buf = qtn_dm_title_servers; }
-		
-
-RESOURCE TBUF r_sml_app_title                           { buf = qtn_apps_dm_title; }
-
-RESOURCE TBUF64 r_qtn_sml_main_sync_last                { buf = qtn_dm_sync_last; }
-RESOURCE TBUF64 r_sml_main_notsynced                    { buf = qtn_dm_not_configured; }
-RESOURCE TBUF128 r_sml_main_noprofiles                  { buf = qtn_dm_empty_no_servers_primary_text; }
-RESOURCE TBUF128 r_sml_main_noprofiles_sec_txt          { buf = qtn_dm_empty_no_servers_secondary_text; }
-RESOURCE TBUF256 r_sml_appui_note_text_del              { buf = qtn_dm_conf_server_delete; } 
-RESOURCE TBUF256 r_sml_appui_note_text_new              { buf = qtn_dm_conf_new_server; }
-RESOURCE TBUF256 r_qtn_sml_appui_copy                   { buf = qtn_dm_conf_server_copy_defaults; }
-RESOURCE TBUF256 r_qtn_sml_name_exists                  { buf = qtn_dm_conf_set_user_name; }
-RESOURCE TBUF256 r_nsml_settings_save_anyway            { buf = qtn_dm_conf_server_settings_missing; }
-RESOURCE TBUF r_qtn_sml_sync_app_invalid_iap            { buf = qtn_dm_conf_ap_setting; }
-RESOURCE TBUF r_qtn_sml_conf_startquery                 { buf = qtn_dm_conf_connection; }
-RESOURCE TBUF r_qtn_sml_conf_allowquery                 { buf = qtn_dm_conf_activation_dm; }
-RESOURCE TBUF r_qtn_sml_conf_activequery                { buf = qtn_dm_conf_activation_server; }
-RESOURCE TBUF r_qtn_dm_conf_set_server_id               { buf = qtn_dm_conf_change_server_id; }
-RESOURCE TBUF r_qtn_dm_conf_set_dup_server_id           { buf = qtn_dm_conf_set_dup_server_id; }
-RESOURCE TBUF r_qtn_dm_query_accept_configuration       { buf = qtn_dm_query_accept_configuration; }
-RESOURCE TBUF r_qtn_sync_cancelled                      { buf = qtn_dm_note_end_cancelled; }
-
-RESOURCE TBUF40 r_syncstatus_sync_conn                  { buf = qtn_dm_note_connecting; }
-RESOURCE TBUF40 r_syncstatus_sync_init                  { buf = qtn_dm_note_initialising; }
-RESOURCE TBUF r_syncstatus_sync_send                    { buf = qtn_dm_note_processing; }
-RESOURCE TBUF40 r_syncstatus_sync_recv                  { buf = qtn_dm_note_receiving; }
-RESOURCE TBUF40 r_syncstatus_sync_comp                  { buf = qtn_dm_note_finalising; }
-RESOURCE TBUF40 r_syncstatus_sync_disc                  { buf = qtn_dm_note_disconnecting; }
-RESOURCE TBUF40 r_syncstatus_sync_fin                   { buf = qtn_dm_note_end_done; }
-RESOURCE TBUF40 r_syncstatus_err                        { buf = qtn_dm_note_end_error; }
-RESOURCE TBUF40 r_syncstatus_canc                       { buf = qtn_dm_note_end_cancelling; }
-RESOURCE TBUF40 r_syncstatus_sync_fin_canc              { buf = qtn_dm_note_end_cancelled; }
-
-RESOURCE TBUF64 r_sml_log_synclog_title                 { buf = qtn_dm_query_hdr_conf_log; }
-RESOURCE TBUF32 r_qtn_sml_log_server                    { buf = qtn_dm_log_remote_server; }
-
-RESOURCE TBUF40 r_qtn_sml_log_ok                        { buf = qtn_dm_log_status_complete; }
-RESOURCE TBUF40 r_qtn_sml_log_cancelled                 { buf = qtn_dm_log_status_cancelled; }
-RESOURCE TBUF40 r_qtn_sml_log_err                       { buf = qtn_dm_log_status_error; }
-
-RESOURCE TBUF128 r_sml_settings_title                   { buf = qtn_dm_title_server_settings; }
-RESOURCE TBUF64 r_qtn_apps_newprofile                   { buf = qtn_dm_default_server_name; }
-RESOURCE TBUF64 r_qtn_apps_emptyprofile                 { buf = qtn_dm_empty_server_name; }
-RESOURCE TBUF64 r_qtn_sml_set_val_field_none            { buf = qtn_selec_setting_compulsory; }
-RESOURCE TBUF64 r_qtn_sml_set_val_hostaddr_field_none   { buf = qtn_selec_setting_compulsory; }
-RESOURCE TBUF r_qtn_invalid_uri                         { buf = qtn_dm_log_err_uriinvalid; }
-
-// ask always
-RESOURCE TBUF64 r_qtn_dm_set_always_ask   { buf = qtn_dm_sett_always_ask; }
-
-//formatting strings for setting items
-RESOURCE TBUF r_qtn_sml_settingrowitem                  { buf = "\t%0U\t\t%1U\t"; }
-RESOURCE TBUF r_qtn_sml_settingrowitem_mand             { buf = "\t%0U\t\t%1U\t*"; }
-
-//error note for locked setting items
-RESOURCE TBUF r_qtn_dm_info_note_locked_setting		{ buf = qtn_selec_protected_setting; }
-
-//error note for client authentication in progress view
-RESOURCE TBUF r_qtn_nsml_log_err_clientauth             { buf = qtn_dm_log_err_clientauth; }
-RESOURCE TBUF r_qtn_numberdata                          { buf = "%N"; }
-
-RESOURCE TBUF r_qtn_dm_log_err_systemerror              { buf = qtn_dm_log_err_systemerror; }
-RESOURCE TBUF r_qtn_dm_log_err_servererror              { buf = qtn_dm_log_err_servererror; }
-RESOURCE TBUF r_qtn_dm_log_err_protocol                 { buf = qtn_dm_log_err_protocol; }
-RESOURCE TBUF r_qtn_dm_log_err_cmdnotsupported          { buf = qtn_dm_log_err_cmdnotsupported; }
-RESOURCE TBUF r_qtn_dm_log_err_versionnotsupported      { buf = qtn_dm_log_err_versionnotsupported; }
-RESOURCE TBUF r_qtn_dm_log_err_contentnotsupported      { buf = qtn_dm_log_err_contentnotsupported; }
-RESOURCE TBUF r_qtn_dm_log_err_clientauth               { buf = qtn_dm_log_err_clientauth; }
-RESOURCE TBUF r_qtn_dm_log_err_servertauth              { buf = qtn_dm_log_err_servertauth; }
-RESOURCE TBUF r_qtn_dm_log_err_serverbusy               { buf = qtn_dm_log_err_serverbusy; }
-RESOURCE TBUF r_qtn_dm_log_err_servernotresponding      { buf = qtn_dm_log_err_servernotresponding; }
-RESOURCE TBUF r_qtn_dm_log_err_uriinvalid               { buf = qtn_dm_log_err_uriinvalid; }
-RESOURCE TBUF r_qtn_dm_log_err_comm                     { buf = qtn_dm_log_err_comm; }
-RESOURCE TBUF r_qtn_dm_log_err_sessionabort             { buf = qtn_dm_log_err_sessionabort; }
-RESOURCE TBUF r_qtn_dm_log_err_offline                  { buf = qtn_offline_not_possible; }
-RESOURCE TBUF r_qtn_dm_log_err_timedout                 { buf = qtn_dm_log_err_timedout;}
-
-// Fota specific strings
-
-RESOURCE TBUF r_item_fota_model  { buf = "\t"qtn_fota_list_model"\t%U\t"; }
-
-RESOURCE TBUF r_item_dm_phone_no_model  { buf = "\t"qtn_fota_list_model
-												"\t"qtn_dm_list_model_not_available"\t"; }
-
-RESOURCE TBUF r_item_fota_latest_update                 { buf = "\t"qtn_fota_list_latest_update"\t%U\t"; }
-RESOURCE TBUF r_item_fota_current_swversion             { buf = "\t"qtn_fota_list_current_version"\t%U\t"; }
-RESOURCE TBUF r_item_fota_new_sw_available              { buf = "\t"qtn_fota_list_new_sw_available
-                                                                "\t"qtn_fota_list_sw_available"\t"; }
-RESOURCE TBUF r_item_fota_download_postponed              { buf = "\t"qtn_fota_list_new_sw_available
-                                                                "\t"qtn_fota_list_download_postponed"\t"; }                                                            
-
-RESOURCE TBUF r_item_fota_default_server               { buf = "\t"qtn_fota_setting_default_server"\t\t%U"; }
-RESOURCE TBUF r_hdr_fota_default_server                { buf = qtn_fota_setting_default_server; }
-
-RESOURCE TBUF r_qtn_fota_title_settings_dialog          { buf = qtn_fota_title_update_settings; }
-RESOURCE TBUF r_qtn_fota_not_updated                    { buf = qtn_fota_list_not_updated; }
-RESOURCE TBUF r_qtn_fota_profile_always_ask             { buf = qtn_fota_setting_value_always_ask; }
-RESOURCE TBUF r_qtn_fota_list_query_select_server_profile { buf = qtn_fota_list_query_select_server; }
-
-RESOURCE TBUF r_qtn_fota_connection_needed              { buf = qtn_fota_conf_query_connection_is_needed; }
-
-// Strings on tabs
-RESOURCE TBUF r_qtn_dm_tab_phone_updates                { buf = qtn_dm_tab_phone_updates; }
-RESOURCE TBUF r_qtn_dm_tab_profiles                     { buf = qtn_dm_tab_profiles; }
-
-
-// Used in the sync handler class, which is not variated.
-RESOURCE TBUF r_qtn_fota_wait_checking_update           { buf = qtn_fota_wait_checking_update; }
-RESOURCE TBUF r_qtn_fota_no_new_updates                 { buf = qtn_fota_no_new_updates; }
-RESOURCE TBUF r_cp_app_title                            { buf = qtn_apps_updates_title;}
-
-//----------------------------------------------------
-//   
-//    r_sml_bearer_type
-//    Texts for connection type setting item
-//
-//----------------------------------------------------  
-//
-RESOURCE ARRAY r_sml_bearer_type
-  {
-  items=
-    {
-    STRING { text = qtn_sml_set_http ; },
-    STRING { text = qtn_sml_set_bluetooth ; }
-    };
-  }
-
-//----------------------------------------------------
-//   
-//    r_nsml_yesno_type
-//    Texts for boolean type setting item (active)
-//
-//----------------------------------------------------  
-//
-RESOURCE ARRAY r_nsml_yesno_type
-  {
-  items=
-    {
-    STRING { text = qtn_dm_set_active_value_false ; },
-    STRING { text = qtn_dm_set_active_value_true ; }
-    };
-  }
-
-//----------------------------------------------------
-//   
-//    r_nsml_accept_yesno_type
-//    Texts for boolean type setting item (accept)
-//
-//----------------------------------------------------  
-//
-RESOURCE ARRAY r_nsml_accept_yesno_type
-  {
-  items=
-    {
-    STRING { text = qtn_dm_set_accepted_value_false ; },
-    STRING { text = qtn_dm_set_accepted_value_true ; }
-    };
-  }
-
-//----------------------------------------------------
-//   
-//    r_nsml_https_active_yesno_type
-//    Texts for boolean type setting item (accept)
-//
-//----------------------------------------------------  
-//
-RESOURCE ARRAY r_nsml_https_active_yesno_type
-  {
-  items=
-    {
-    STRING { text = qtn_dm_set_https_value_no ; },
-    STRING { text = qtn_dm_set_https_value_yes ; }
-    };
-  }
-
-//----------------------------------------------------
-//   
-//    r_sml_settings_items
-//    Texts for settings dialog item list
-//
-//----------------------------------------------------  
-//
-RESOURCE ARRAY r_sml_settings_items
-  {
-  items=
-    {
-    STRING    { text = qtn_dm_set_lbl_server_name; },
-    STRING    { text = qtn_dm_set_lbl_server_id; },
-    STRING    { text = qtn_dm_set_lbl_server_password; },
-    STRING    { text = qtn_dm_set_lbl_connection_type; },
-    STRING    { text = qtn_dm_set_lbl_access_point; },
-    STRING    { text = qtn_dm_set_lbl_host_address; },
-    STRING    { text = qtn_dm_set_lbl_server_port; },
-    STRING    { text = qtn_dm_set_lbl_dm_username; },
-    STRING    { text = qtn_dm_set_lbl_dm_password; },
-    STRING    { text = qtn_dm_set_lbl_active; },
-    STRING    { text = qtn_dm_set_lbl_accepted; },
-    STRING    { text = qtn_dm_set_lbl_https_active; },
-    STRING    { text = qtn_dm_set_lbl_https_username; },
-    STRING    { text = qtn_dm_set_lbl_https_password; }
-    };
-  }
-
-//----------------------------------------------------
-//   
-//    r_sml_settings_items
-//    Texts for Log view
-//
-//----------------------------------------------------  
-//
-RESOURCE ARRAY r_sml_log_items
-  {
-  items=
-    {
-    STRING    { text = qtn_dm_log_profile_name; },
-    STRING    { text = qtn_dm_log_remote_server; },
-    STRING    { text = qtn_dm_log_date; },
-    STRING    { text = qtn_dm_log_time; },
-    STRING    { text = qtn_dm_log_remote_status; }
-    };
-  }
-
-//----------------------------------------------------
-//   
-//    r_sml_settings_items
-//    Texts for settings dialog item list
-//
-//----------------------------------------------------  
-//
-RESOURCE TBUF r_qtn_dm_error_untrusted_cert                      { buf = qtn_dm_log_err_untrusted_certificate; }
-
-
-RESOURCE TBUF r_qtn_fota_list_release                          { buf = "\t"qtn_fota_list_release"\t%U\t"; }
-RESOURCE TBUF r_qtn_fota_list_software_version                 { buf = "\t"qtn_fota_list_sw_version"\t%U\t"; }
-RESOURCE TBUF r_qtn_fota_list_software_version_date            { buf = "\t"qtn_fota_list_sw_version_date"\t%U\t"; }
-RESOURCE TBUF r_qtn_fota_list_language_version                 { buf = "\t"qtn_fota_list_language"\t%U\t"; }
-RESOURCE TBUF r_qtn_fota_list_customsw_version                 { buf =  "\t"qtn_fota_list_custom_version"\t%U\t"; }
-RESOURCE TBUF r_qtn_fota_list_customswdate_version             { buf = "\t"qtn_fota_list_custom_version_date"\t%U\t"; }
-RESOURCE TBUF r_qtn_fota_list_type_designator                  { buf = "\t"qtn_fota_list_type_designator"\t%U\t"; }
-RESOURCE TBUF r_qtn_product_code                               { buf = "\t"qtn_dm_list_product_code"\t%U\t"; }
-RESOURCE TBUF r_qtn_browser_version                            { buf = "\t"qtn_dm_list_browser_version"\t%U\t"; }
-RESOURCE TBUF r_qtn_java_version                               { buf = "\t"qtn_dm_list_java_version"\t%U\t"; }
-RESOURCE TBUF r_qtn_flash_version                              { buf = "\t"qtn_dm_list_flash_version"\t%U\t"; }
-
-
-// End of File
--- a/omadm/omadmappui/data/NSmlDMSync_reg.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-/*
-* 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: Implementation of DM UI component
-* 	This is part of omadmappui.
-*
-*/
-
-
-#include <appinfo.rh>
-#include <NSmlDMSync.rsg>
-#include <SyncService.rh>
-#include <SyncServiceConst.h>
-#include <data_caging_paths_strings.hrh>
-
-UID2 KUidAppRegistrationResourceFile
-UID3 0x101F6DE5 // Define your application UID here
-
-RESOURCE APP_REGISTRATION_INFO
-    {
-    app_file = "NSmlDMSync";
-    localisable_resource_file = APP_RESOURCE_DIR"\\NSmlDMSync";
-    localisable_resource_id = R_NSMLDMSYNC_LOCALISABLE_APP_INFO;
-    embeddability = KAppNotEmbeddable;
-    service_list =
-        {
-        SERVICE_INFO { uid = KSyncServiceUid; opaque_data = r_service_edit; }
-        };
-    }
-
-RESOURCE SYNC_SERVICE_STRUCT r_service_edit
-    {
-    type = KDevManServiceStart;
-    }
-
-// End of File
-
--- a/omadm/omadmappui/data/NsmlDMsync_caption.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-/*
-* Copyright (c) 2002-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:  Application titles
-*
-*/
-
-
-
-#include <apcaptionfile.rh>
-#include <nsmldmsync.loc>
-
-RESOURCE CAPTION_DATA
-{
-caption = qtn_apps_dm_list;
-shortcaption = qtn_apps_dm_grid;
-}
--- a/omadm/omadmappui/group/NSmlDMSync.mmp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,134 +0,0 @@
-/*
-* Copyright (c) 2005-2006 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:  NSmlDMSync mmp file 
-*
-*/
-
-#include  <platform_paths.hrh>
-#include <data_caging_paths.hrh>
-#include <bldvariant.hrh>
-
-
-TARGET          nsmldmsync.exe
-TARGETTYPE      exe
-
-UID             0x100039CE  0x101F6DE5
-EPOCSTACKSIZE   0x5000
-
-CAPABILITY      CAP_APPLICATION
-VENDORID        VID_DEFAULT
-
-
-//
-// AIF icons/files
-//
-START RESOURCE ../data/NSmlDMSync.rss
-// HEADER means epoc32/include
-HEADER
-TARGETPATH APP_RESOURCE_DIR    
-LANGUAGE_IDS
-END
-
-START RESOURCE ../data/NSmlDMSync_reg.rss
-DEPENDS nsmldmsync.rsg
-// Do not change the UID below.
-TARGETPATH /private/10003a3f/apps
-END
-
-SOURCEPATH  ../src
-
-SOURCE      NSmlDMAuthQueryDlg.cpp
-SOURCE      NSmlDMDbNotifier.cpp
-SOURCE      NSmlDMDlgProfileView.cpp
-SOURCE      NSmlDMItemData.cpp
-SOURCE      NSmlDMProfilesContainer.cpp
-SOURCE      NSmlDMProfilesView.cpp
-SOURCE      NSmlDMProgress.cpp
-SOURCE      NSmlDMSyncApp.cpp 
-SOURCE      NSmlDMSyncAppEngine.cpp
-SOURCE      NSmlDMSyncAppServer.cpp
-SOURCE      NSmlDMSyncDialog.cpp
-SOURCE      NSmlDMSyncDocument.cpp
-SOURCE      NSmlDMSyncHandler.cpp
-SOURCE      NSmlDMSyncProfile.cpp
-SOURCE      NSmlDMSyncProfileItem.cpp
-SOURCE      NSmlDMSyncProfileList.cpp
-SOURCE      NSmlDMSyncState.cpp
-SOURCE      NSmlDMSyncUtil.cpp
-
-
-#ifdef __SYNCML_DM_FOTA
-SOURCE      NSmlDMFotaModel.cpp
-#else
-SOURCE      NSmlDMFotaModel_nofota.cpp
-#endif
-SOURCE      NSmlDMFotaView.cpp
-SOURCE      NSmlDMFotaContainer.cpp
-SOURCE      NSmlDMFotaSettingsDialog.cpp
-SOURCE      NSmlDMSyncAppUi_fota.cpp
-
-
-USERINCLUDE     ../inc
-
-// Default system include paths for app layer modules.
-APP_LAYER_SYSTEMINCLUDE
-SYSTEMINCLUDE   /epoc32/include/libc
-
-LIBRARY     aknskins.lib
-LIBRARY     apgrfx.lib
-LIBRARY     apengine.lib
-LIBRARY     apparc.lib
-LIBRARY     apsettingshandlerui.lib 
-LIBRARY     avkon.lib
-LIBRARY     bafl.lib
-LIBRARY     cone.lib
-LIBRARY     commdb.lib
-LIBRARY     commonengine.lib
-LIBRARY     edbms.lib
-LIBRARY     efsrv.lib
-LIBRARY     eikctl.lib
-LIBRARY     eikcore.lib
-LIBRARY     eikcoctl.lib 
-LIBRARY     eikdlg.lib
-LIBRARY     estor.lib
-LIBRARY     euser.lib
-LIBRARY     featmgr.lib
-LIBRARY     hlplch.lib      //help
-LIBRARY     ws32.lib
-LIBRARY     connectionuiutilities.lib
-LIBRARY     sysutil.lib
-LIBRARY	    sysversioninfo.lib
-LIBRARY     etel.lib                        // RTelServer
-LIBRARY     etelmm.lib                      // RMobilePhone
-
-
-LIBRARY     syncmlclientapi.lib
-LIBRARY     nsmltransporthandler.lib
-LIBRARY     nsmltransport.lib
-LIBRARY     nsmlhistorylog.lib
-LIBRARY     syncservice.lib
-LIBRARY     centralrepository.lib
-
-#ifdef __SYNCML_DM_FOTA
-LIBRARY     fotaengine.lib
-#endif
-
-LIBRARY	policyengine.lib
-LIBRARY			  sysversioninfo.lib
-
-LIBRARY			  sisregistryclient.lib
-
-DEBUGLIBRARY    flogger.lib
-
-SMPSAFE
--- a/omadm/omadmappui/group/backup_registration.xml	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-<?xml version="1.0" standalone="yes"?>
-<backup_registration version="1.0">
-    <proxy_data_manager sid = "0x10202BE9" />
-    <restore requires_reboot = "no"/>
-</backup_registration>
--- a/omadm/omadmappui/group/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,75 +0,0 @@
-/*
-* 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:  bld.inf file for NSmlDMSyncApp
-*
-*/
-
-#include <platform_paths.hrh>
-
-#ifdef __SYNCML_DM
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-#include "../help/group/bld.inf"
-
-// Backup registration file
-#ifdef __SYNCML_DM_FOTA
-backup_registration.xml  /epoc32/data/z/private/101f6de5/backup_registration.xml  
-backup_registration.xml  /epoc32/release/winscw/udeb/z/private/101f6de5/backup_registration.xml 
-backup_registration.xml  /epoc32/release/winscw/urel/z/private/101f6de5/backup_registration.xml
-#endif // __SYNCML_DM_FOTA
-
-../rom/OmaDmAppUi.iby													CORE_APP_LAYER_IBY_EXPORT_PATH(omadmappui.iby)
-../rom/OmaDmAppUiResources.iby								LANGUAGE_APP_LAYER_IBY_EXPORT_PATH(omadmappuiresources.iby)
-../loc/NSmlDMSync.loc													APP_LAYER_LOC_EXPORT_PATH(nsmldmsync.loc)
-../loc/NSmlDMSyncFota.loc											APP_LAYER_LOC_EXPORT_PATH(nsmldmsyncfota.loc)
-
-// Generic configuration interface for component cenrep settings  
-../conf/nsmldmsync.confml                    APP_LAYER_CONFML(nsmldmsync.confml)
-../conf/nsmldmsync_101F6DE5.crml 	        APP_LAYER_CRML(nsmldmsync_101F6DE5.crml)
-
-PRJ_EXTENSIONS
-START EXTENSION s60/mifconv
-  OPTION TARGETFILE nsmldmsync.mif
-  OPTION HEADERFILE nsmldmsync.mbg
-  OPTION SOURCES \
-	  -c8,8 qgn_prop_sml_http -c8,8 qgn_prop_sml_http_off -c8,8 qgn_prop_sml_bt \
-	  -c8,8 qgn_prop_sml_bt_off -c8,8 qgn_prop_sml_usb -c8,8 qgn_prop_sml_usb_off \
-	  -c8,8 qgn_menu_dm -c8,8 qgn_menu_dm_disabled_cxt -c8,8 qgn_note_sml \
-	  -c8,8 qgn_note_sml_server -c8,8 qgn_indi_sett_protected_add -c8,8 qgn_prop_cp_dev_update  
-END
-
-START EXTENSION s60/mifconv
-  OPTION TARGETFILE nsmldmsync_aif.mif
-  OPTION SOURCES -c8,8 qgn_menu_dm
-END
-
-
-PRJ_MMPFILES
-/*
-gnumakefile dmui_icons_dc.mk
-
-#ifdef __SCALABLE_ICONS
-    gnumakefile dmui_icons_aif_scalable_dc.mk
-#else
-    gnumakefile dmui_icons_aif_bitmaps_dc.mk
-#endif
-*/
-
-NSmlDMSync.mmp
-#include "../OmaDmCPPlugin/group/bld.inf"
-#endif //__SYNCML_DM
-// End of file
--- a/omadm/omadmappui/group/dmui_icons.mk	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +0,0 @@
-#
-# Copyright (c) 2004 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: Implementation of DM UI component
-# 	This is part of omadmappui.
-#
-
-
-
-ifeq (WINS,$(findstring WINS, $(PLATFORM)))
-ZDIR=\epoc32\release\$(PLATFORM)\$(CFG)\z
-else
-ZDIR=\epoc32\data\z
-endif
-
-TARGETDIR=$(ZDIR)\system\apps\nsmldmsync
-HEADERDIR=\epoc32\include
-ICONTARGETFILENAME=$(TARGETDIR)\nsmldmsync.mif
-HEADERFILENAME=$(HEADERDIR)\nsmldmsync.mbg
-
-do_nothing : 
-	@rem do_nothing
-
-MAKMAKE : do_nothing
-
-BLD : do_nothing
-
-CLEAN : do_nothing
-
-LIB : do_nothing
-
-CLEANLIB : do_nothing
-
-RESOURCE :
-	mifconv $(ICONTARGETFILENAME) /h$(HEADERFILENAME) \
-	/c8,8 qgn_prop_sml_http.bmp \
-	/c8,8 qgn_prop_sml_http_off.bmp \
-	/c8,8 qgn_prop_sml_bt.bmp \
-	/c8,8 qgn_prop_sml_bt_off.bmp \
-	/c8,8 qgn_prop_sml_usb.bmp \
-	/c8,8 qgn_prop_sml_usb_off.bmp \
-	/c8,8 qgn_menu_dm_cxt.bmp \
-	/c8,8 qgn_menu_dm_disabled_cxt.bmp \
-	/c8,8 qgn_note_sml.bmp \
-	/c8,8 qgn_note_sml_server.bmp \
-	/c8,8 qgn_indi_sett_protected_add.bmp \
-	/c8,8 qgn_prop_cp_dev_update.bmp
-		
-
-FREEZE : do_nothing
-
-SAVESPACE : do_nothing
-
-RELEASABLES :
-	@echo $(HEADERFILENAME)&& \
-	@echo $(ICONTARGETFILENAME)
-
-FINAL : do_nothing
--- a/omadm/omadmappui/group/dmui_icons_aif_bitmaps.mk	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-#
-# Copyright (c) 2004 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: Implementation of DM UI component
-# 	This is part of omadmappui.
-#
-
-ifeq (WINS,$(findstring WINS, $(PLATFORM)))
-ZDIR=\epoc32\release\$(PLATFORM)\$(CFG)\z
-else
-ZDIR=\epoc32\data\z
-endif
-
-TARGETDIR=$(ZDIR)\system\apps\nsmldmsync
-ICONTARGETFILENAME=$(TARGETDIR)\nsmldmsync.mbm
-
-do_nothing :
-	@rem do_nothing
-
-MAKMAKE : do_nothing
-
-BLD : do_nothing
-
-CLEAN : do_nothing
-
-LIB : do_nothing
-
-CLEANLIB : do_nothing
-
-RESOURCE :
-	mifconv $(ICONTARGETFILENAME) \
-		/c8,8 qgn_menu_dm_lst.bmp \
-		/c8,8 qgn_menu_dm_cxt.bmp
-
-FREEZE : do_nothing
-
-SAVESPACE : do_nothing
-
-RELEASABLES :
-	@echo $(ICONTARGETFILENAME)
-
-FINAL : do_nothing
-  
\ No newline at end of file
--- a/omadm/omadmappui/group/dmui_icons_aif_bitmaps_dc.mk	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-#
-# Copyright (c) 2004 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: Implementation of DM UI component
-# 	This is part of omadmappui.
-#
-
-ifeq (WINS,$(findstring WINS, $(PLATFORM)))
-ZDIR=\epoc32\release\$(PLATFORM)\$(CFG)\z
-else
-ZDIR=\epoc32\data\z
-endif
-
-TARGETDIR=$(ZDIR)\resource\apps
-ICONTARGETFILENAME=$(TARGETDIR)\nsmldmsync.mbm
-
-do_nothing :
-	@rem do_nothing
-
-MAKMAKE : do_nothing
-
-BLD : do_nothing
-
-CLEAN : do_nothing
-
-LIB : do_nothing
-
-CLEANLIB : do_nothing
-
-RESOURCE :
-	mifconv $(ICONTARGETFILENAME) \
-		/c8,8 qgn_menu_dm_lst.bmp \
-		/c8,8 qgn_menu_dm_cxt.bmp
-
-FREEZE : do_nothing
-
-SAVESPACE : do_nothing
-
-RELEASABLES :
-	@echo $(ICONTARGETFILENAME)
-
-FINAL : do_nothing
-  
\ No newline at end of file
--- a/omadm/omadmappui/group/dmui_icons_aif_scalable.mk	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-#
-# Copyright (c) 2004 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: Implementation of DM UI component
-# 	This is part of omadmappui.
-#
-
-ifeq (WINS,$(findstring WINS, $(PLATFORM)))
-ZDIR=\epoc32\release\$(PLATFORM)\$(CFG)\z
-else
-ZDIR=\epoc32\data\z
-endif
-
-TARGETDIR=$(ZDIR)\system\apps\nsmldmsync
-ICONTARGETFILENAME=$(TARGETDIR)\nsmldmsync_aif.mif
-
-do_nothing :
-	@rem do_nothing
-
-MAKMAKE : do_nothing
-
-BLD : do_nothing
-
-CLEAN : do_nothing
-
-LIB : do_nothing
-
-CLEANLIB : do_nothing
-
-RESOURCE :
-	mifconv $(ICONTARGETFILENAME) \
-		/c8,8 qgn_menu_dm.svg
-
-FREEZE : do_nothing
-
-SAVESPACE : do_nothing
-
-RELEASABLES :
-	@echo $(ICONTARGETFILENAME)
-
-FINAL : do_nothing
-  
\ No newline at end of file
--- a/omadm/omadmappui/group/dmui_icons_aif_scalable_dc.mk	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-#
-# Copyright (c) 2004 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: Implementation of DM UI component
-# 	This is part of omadmappui.
-#
-
-ifeq (WINS,$(findstring WINS, $(PLATFORM)))
-ZDIR=\epoc32\release\$(PLATFORM)\$(CFG)\z
-else
-ZDIR=\epoc32\data\z
-endif
-
-TARGETDIR=$(ZDIR)\resource\apps
-ICONTARGETFILENAME=$(TARGETDIR)\nsmldmsync_aif.mif
-
-do_nothing :
-	@rem do_nothing
-
-MAKMAKE : do_nothing
-
-BLD : do_nothing
-
-CLEAN : do_nothing
-
-LIB : do_nothing
-
-CLEANLIB : do_nothing
-
-RESOURCE :
-	mifconv $(ICONTARGETFILENAME) \
-		/c8,8 qgn_menu_dm.svg
-
-FREEZE : do_nothing
-
-SAVESPACE : do_nothing
-
-RELEASABLES :
-	@echo $(ICONTARGETFILENAME)
-
-FINAL : do_nothing
-  
\ No newline at end of file
--- a/omadm/omadmappui/group/dmui_icons_dc.mk	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-#
-# Copyright (c) 2004 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: Implementation of DM UI component
-# 	This is part of omadmappui.
-#
-
-
-ifeq (WINS,$(findstring WINS, $(PLATFORM)))
-ZDIR=\epoc32\release\$(PLATFORM)\$(CFG)\z
-else
-ZDIR=\epoc32\data\z
-endif
-
-TARGETDIR=$(ZDIR)\resource\apps
-HEADERDIR=\epoc32\include
-ICONTARGETFILENAME=$(TARGETDIR)\nsmldmsync.mif
-HEADERFILENAME=$(HEADERDIR)\nsmldmsync.mbg
-
-
-do_nothing : 
-	@rem do_nothing
-
-MAKMAKE : do_nothing
-
-BLD : do_nothing
-
-CLEAN : do_nothing
-
-LIB : do_nothing
-
-CLEANLIB : do_nothing
-
-RESOURCE :
-	mifconv $(ICONTARGETFILENAME) /h$(HEADERFILENAME) \
-	/c8,8 qgn_prop_sml_http.bmp \
-	/c8,8 qgn_prop_sml_http_off.bmp \
-	/c8,8 qgn_prop_sml_bt.bmp \
-	/c8,8 qgn_prop_sml_bt_off.bmp \
-	/c8,8 qgn_prop_sml_usb.bmp \
-	/c8,8 qgn_prop_sml_usb_off.bmp \
-	/c8,8 qgn_menu_dm_cxt.bmp \
-	/c8,8 qgn_menu_dm_disabled_cxt.bmp \
-	/c8,8 qgn_note_sml.bmp \
-	/c8,8 qgn_note_sml_server.bmp \
-	/c8,8 qgn_indi_sett_protected_add.bmp \
-  /c8,8 qgn_prop_cp_dev_update.bmp
-
-FREEZE : do_nothing
-
-SAVESPACE : do_nothing
-
-RELEASABLES :
-	@echo $(HEADERFILENAME)&& \
-	@echo $(ICONTARGETFILENAME)
-
-FINAL : do_nothing
Binary file omadm/omadmappui/help/data/xhtml.zip has changed
--- a/omadm/omadmappui/help/group/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-#include <platform_paths.hrh>				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
-../inc/dm.hlp.hrh	MW_LAYER_PLATFORM_EXPORT_PATH(csxhelp/dm.hlp.hrh)
-../rom/omadmappuihelps_variant.iby		CUSTOMER_APP_LAYER_IBY_EXPORT_PATH(omadmappuihelps_variant.iby)
--- a/omadm/omadmappui/help/inc/dm.hlp.hrh	Tue Feb 02 00:03:17 2010 +0200
+++ /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:
-*
-*/
-	
-//
-// dm.hlp.hrh generated by CSXHelp Utilities.
-//           
-
-#ifndef __DM_HLP_HRH__
-#define __DM_HLP_HRH__
-
-_LIT(KDM_HLP_MAIN_VIEW, "DM_HLP_MAIN_VIEW"); // 
-_LIT(KFOTA_HLP_SETTINGS, "FOTA_HLP_SETTINGS"); // 
-_LIT(KDM_HLP_SETTINGS, "DM_HLP_SETTINGS"); // 
-_LIT(KDM_HLP_SERVERS_VIEW, "DM_HLP_SERVERS_VIEW"); // 
-
-#endif 
\ No newline at end of file
--- a/omadm/omadmappui/help/rom/omadmappuihelps_variant.iby	Tue Feb 02 00:03:17 2010 +0200
+++ /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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* IBY file for OMADMAPPUI
-*
-*/
-
-#ifndef __OMADMAPPUIHELPS_VARIANT_IBY__
-#define __OMADMAPPUIHELPS_VARIANT_IBY__
-
-#if defined(FF_S60_HELPS_IN_USE)
-    data=LOCALISE(DATAZ_\resource\xhtml\%02d\0x101F6DE5\contents.zip, RESOURCE_FILES_DIR\xhtml\%02d\0x101F6DE5\contents.zip)
-    data=LOCALISE(DATAZ_\resource\xhtml\%02d\0x101F6DE5\index.xml, RESOURCE_FILES_DIR\xhtml\%02d\0x101F6DE5\index.xml)
-    data=LOCALISE(DATAZ_\resource\xhtml\%02d\0x101F6DE5\keywords.xml, RESOURCE_FILES_DIR\xhtml\%02d\0x101F6DE5\keywords.xml)
-    data=LOCALISE(DATAZ_\resource\xhtml\%02d\0x101F6DE5\meta.xml, RESOURCE_FILES_DIR\xhtml\%02d\0x101F6DE5\meta.xml)
-#endif
-
-#endif
\ No newline at end of file
--- a/omadm/omadmappui/inc/NSmlDMAuthQueryDlg.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,155 +0,0 @@
-/*
-* Copyright (c) 2002-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:  Header file for CNSmlDMMultiQuery
-*
-*/
-
-
-#ifndef NSMLDMAUTHQUERYDLG_H
-#define NSMLDMAUTHQUERYDLG_H
-
-#include <AknQueryDialog.h>
-
-#include "NSmlDMdef.h"
-#include "NSmlDMSyncAppEngine.h"
-
-class CNSmlDMQueryTimer;
-
-/**
-* CNSmlDMMultiQuery
-*  
-* Multi query
-*/
-NONSHARABLE_CLASS (CNSmlDMMultiQuery) : public CAknMultiLineDataQueryDialog
-	{
-	public:
-
-        /**
-        * Two-phased constructor.
-        *
-        * @param aAppEngine pointer to app engine
-		* @param aProfileId profile id
-		* @param aText1     text for username
-		* @param aText2     text for password
-        * @return CNSmlDMMultiQuery* new CNSmlDMMultiQuery object
-        */
-		static CNSmlDMMultiQuery* NewL( CNSmlDMSyncAppEngine* aAppEngine,
-		                                TInt aProfileId, 
-		                                TBool aIsHttp );
-		
-		/**
-		* Destructor
-		*/
-		virtual ~CNSmlDMMultiQuery();
-
-		/**
-        * Called during initialisation just before dialog is shown
-		* @param None
-        * @return None
-        */
-		void PostLayoutDynInitL();
-		
-		/**
-		* called when dialog button is clicked or timer has ended
-		* @param aButtonId  Id of button that was clicked
-        * @return ETrue to close dialog
-        */
-		virtual TBool OkToExitL( TInt aButtonId );
-		
-		/**
-		* Called whe timer has ended, calls TryExitL()
-		* @param None
-        * @return None
-        */
-		void HandleTimerEndL();
-	private:
-
-		/**
-		* Constructor
-        * @param aAppEngine  pointer to app engine
-		* @param aProfileId  profile id
-		* @param aTone       sound when launching the dialog
-        * @return None
-        */
-		CNSmlDMMultiQuery( CNSmlDMSyncAppEngine* aAppEngine,
-		                   TInt aProfileId,
-		                   TBool aIsHttp,
-		                   TTone aTone = ENoTone );
-
-	private:
-	    // Application engine
-		CNSmlDMSyncAppEngine*           iAppEngine;
-		// Profile id
-		TInt                            iProfileId;
-		// user name
-		TBuf<KNSmlMaxUsernameLength>    iUsername;
-		// Password
-		TBuf<KNSmlMaxPasswordLength>    iPassword;
-		// Query timer
-		CNSmlDMQueryTimer*              iTimer;
-		TBool                           iIsHttp;
-	};
-
-/**
-* CNSmlDMQueryTimer
-*
-* Query timer  
-*/
-NONSHARABLE_CLASS (CNSmlDMQueryTimer) : public CTimer
-	{
-	public:
-
-        /**
-        * Two-phased constructor.
-        *
-        * @param aAlertDialog  dialog to be closed after timer has ended
-        * @return new CNSmlDMQueryTimer object
-        */
-		static CNSmlDMQueryTimer* NewL( CNSmlDMMultiQuery* aAlertDialog );
-		
-		/**
-		* Method is called when time has passed
-		* @param None
-        * @return None
-        */
-		void RunL();
-
-		/**
-		* Destructor
-        */
-		virtual ~CNSmlDMQueryTimer();
-
-	private:
-        /**
-        * By default Symbian 2nd phase constructor is private.
-        * @param aAlertDialog  dialog to be closed after timer has ended
-        * @return None
-        */
-		void ConstructL( CNSmlDMMultiQuery* aAlertDialog );
-
-		/**
-		* Constructor
-        * @param None
-        * @return None
-        */
-		CNSmlDMQueryTimer();
-
-	private:
-	    // multi query
-		CNSmlDMMultiQuery* iAlertDialog;
-	};
-
-#endif  // NSMLDMAUTHQUERYDLG_H
-
-// End of File
--- a/omadm/omadmappui/inc/NSmlDMDbNotifier.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,244 +0,0 @@
-/*
-* Copyright (c) 2002-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:  Header file for CNSmlDMDbNotifier
-*
-*/
-
-
-#ifndef NSMLDMDBNOTIFIER_H
-#define NSMLDMDBNOTIFIER_H
-
-#include <e32std.h>
-#include <SyncMLObservers.h>
-#include <SyncMLClient.h>
-#include "NSmlDMSyncUtil.h"
-
-// CLASS DECLARATION
-
-/**
-* DB events
-* 
-*/
-NONSHARABLE_CLASS (TNSmlDMDbEvent)
-	{
-	public:
-		TInt iType;	
-		TInt iProfileId;
-		TInt iError;
-	};
-
-/**
-* Interface class to handle database events
-* 
-*/
-class MNSmlDMDbEventHandler
-	{
-
-	public:
-		/**
-        * CNSmlDMDbNotifier calls this to inform that database has changed.
-        * @param aStatus EClose, EUnlock, ECommit, ERollback, or ERecover (d32dbms.h).
-		* @param aMoreEvents ETrue issue new request, EFalse no requests.
-        * @return None. 
-        */
-		virtual void HandleDbEventL( TNSmlDMDbEvent aEvent ) = 0;
-	};
-	
-/**
-* DB notifier
-* 
-*/
-NONSHARABLE_CLASS (CNSmlDMDbNotifier) : public CBase,
-                                        public MNSmlDMActiveCallerObserver,
-                                        public MSyncMLEventObserver
-	{	
-    public:
-	    enum TEventType
-			{
-			EUpdate,
-			EUpdateAll,
-			EDelete,
-	        EClose
-			};
-
-	public:
-		/**
-        * Two-phased constructor
-        * @param aDatabase Reference to RDbDatabase instance.
-		* @param aHandler Pointer to MNSmlDMDbEventHandler instance.
-        * @return None. 
-        */
-		static CNSmlDMDbNotifier* NewL( RSyncMLSession* aSyncSession,
-		                                MNSmlDMDbEventHandler* aHandler );
-
-        /**
-        * Destructor.
-        */
-		virtual ~CNSmlDMDbNotifier();
-
-		// Functions from base classes
-
-	private:
-
-		/**
-        * Constructor
-        * @param aDatabase Reference to RDbDatabase instance.
-		* @param aHandler Pointer to event handler.
-        * @return None. 
-        */
-		CNSmlDMDbNotifier( RSyncMLSession* aSyncSession,
-		                   MNSmlDMDbEventHandler* aHandler);
-
-        /**
-        * By default Symbian OS constructor is private.
-        */
-		void ConstructL();
-
-	public:
-		/**
-		* Start requesting events from db.
-        * @param None. 
-        * @return None. 
-        */
-		void RequestL();
-
-   
-	private:   // from MNSmlDMActiveCallerObserver
-	
-		/**
-        * From MNSmlDMActiveCallerObserver
-		* Called when CNSmlDMActiveCaller completes.
-        * @param None
-        * @return None.
-        */
-		void HandleActiveCallL();
-
-    private:    // from MSyncMLEventObserver
-        
-		/**
-        * From MSyncMLEventObserver
-		* Called when SyncML session events oocur.
-        * @param aEvent.
-        * @param aIdentifier.
-        * @param aError.
-        * @param aAdditionalData.
-        * @return None.
-        */
-        void OnSyncMLSessionEvent( TEvent aEvent,
-                                   TInt aIdentifier,
-                                   TInt aError,
-                                   TInt aAdditionalData);
-
-    public:
-		/**
-		* Call observer with delay
-		* @param None
-		* @return None
-        */
-		void CallObserverWithDelay();
-		
-		/**
-		* Call observer
-		* @param None
-		* @return None
-        */		
-		void CallObserver();
-		
-		/**
-		* Set as disabled
-		* @param aDisable
-		* @return None
-        */		
-		void SetDisabled( TBool aDisable );
-		
-		/**
-		* Change profile count
-		* @param None
-		* @return TInt
-        */		
-		TInt ChangedProfileCount();
-		
-		/**
-		* DB event
-		* @param aIndex
-		* @return db event
-        */        
-        TNSmlDMDbEvent Event(TInt aIndex);
-		
-		/**
-		* Event count
-		* @param None
-		* @return TInt
-        */		
-		TInt EventCount();
-		
-		/**
-		* Reset
-		* @param None
-		* @return None
-        */		
-		void Reset();
-		
-		/**
-		* Find event
-		* @param None
-		* @return TInt
-        */
-		TInt FindCloseEvent();
-		
-		/**
-		* Find event
-		* @param None
-		* @return TInt
-        */
-		TInt FindSingleProfileEvent();
-		
-		/**
-		* Find event
-		* @param None
-		* @return TInt
-        */
-		TInt FindProfileEvent();
-		
-		/**
-		* Check if profile id is unique
-		* @param aId Profile id
-		* @return ETrue if unique
-        */
-		TBool IsUniqueProfileId(TInt aId);
-		
-		/**
-		* Utility function.
-		* @return Sync session.
-        */
-		RSyncMLSession& Session();
-
-	private:  
-		// sync session
-		RSyncMLSession* iSyncSession;
-		// Pointer to event handler
-		MNSmlDMDbEventHandler* iHandler;
-		// for making function call via active scheduler
-		CNSmlDMActiveCaller* iActiveCaller;
-		// for storing ids of changed profiles
-		RArray<TNSmlDMDbEvent> iList;
-		// can observer be called
-		TBool iDisabled;
-		// is synchronizing going on
-		TBool iSyncRunning;
-	};
-
-#endif // NSMLDMDBNOTIFIER_H
-
-// End of File
--- a/omadm/omadmappui/inc/NSmlDMDlgProfileView.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,508 +0,0 @@
-/*
-* Copyright (c) 2005-2006 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:  Header file for Server Profile settings dialog
-*
-*/
-
-
-#ifndef NSMLDMDLGPROFILEVIEW_H
-#define NSMLDMDLGPROFILEVIEW_H
-
-// INCLUDES
-
-#include <AknDialog.h>  //CAknDialog
-#include <eiklbo.h>     //MEikListBoxObserver
-#include <akntextsettingpage.h>
-#include "NSmlDMdef.h"
-
-// FORWARD DECLARATIONS
-class CNSmlDMSyncDocument;
-class CEikListBox;
-class CEikTextListBox;
-class CAknSettingStyleListBox;
-class CAknNavigationDecorator;
-class CAknTabGroup;
-class CNSmlDMSyncAppUi;
-class CNSmlDMSyncProfile;
-class CNSmlDMSyncAppEngine;
-class CNSmlDMProfileData;
-class CAknNavigationControlContainer;
-
-typedef CArrayPtr<CNSmlDMProfileData> CNSmlDMSettingItemList;
-
-// CLASS DECLARATION
-/**
-*  CNSmlDMDlgProfileView
-*
-*  PRofile view
-*/
-NONSHARABLE_CLASS (CNSmlDMDlgProfileView) : public CAknDialog, 
-                                            public MEikListBoxObserver
-    {
-    public:
-    	enum TNSmlProfile
-    		{
-    		ENSmlProfileName = 0,
-    		ENSmlServerId,
-    		ENSmlProfileDMServerPassword,
-    		ENSmlConnType,
-    		ENSmlAccessPoint,
-    		ENSmlProfileURL,
-    		ENSmlProfilePort,
-    		ENSmlUsername,
-    		ENSmlPassword,
-    		ENSmlServerAlertAllowed,
-    		ENSmlServerAccept,
-    		ENSmlHttpsUsed,
-    		ENSmlHttpsUsername,
-    		ENSmlHttpsPassword
-    		};
-
-    public:// Constructors and destructor			
-        /**
-        * Two-phased constructor.
-		* @param aDoc       - pointer to document instance
-		* @param aMode      - edit, new or copy profile mode
-		* @param aProfileId - profile id
-        */
-		static CNSmlDMDlgProfileView* NewL( CNSmlDMSyncDocument* aDoc,
-		                                    TNSmlEditMode aMode,
-		                                    TInt aProfileId );
-
-		/**
-		* Destructor
-		*/
-	    virtual ~CNSmlDMDlgProfileView();
-	    
-    private:
-
-		/**
-		* C++ default constructor.
-		* @param aDoc       - pointer to document instance
-		* @param aMode      - edit, new or copy profile mode
-		* @param aProfileId - profile id
-		* @return None.
-		*/
-		CNSmlDMDlgProfileView( CNSmlDMSyncDocument* aDoc,
-		                       TNSmlEditMode aMode,
-		                       TInt aProfileId );
-	  
-    public:
-		/**
-		* From the base class
-        * @param aKeyEvent
-		* @param aType
-        * @return -
-        */
-		TKeyResponse OfferKeyEventL( const TKeyEvent& aKeyEvent,
-		                                   TEventCode aType );
-
-		/**
-		* From base class
-		* @param CDesCArray* aArray - array of the contacts 
-		*                             items on the smlcontact
-		* @return -
-		*/
-		virtual void ProcessCommandL( TInt aCommandId );
-		
-		/**
-		* Called before menu is shown
-        * @param TInt aResourceId Menu resource id
-		* @param CEikMenuPane* aMenuPane Pointer to the menu
-        * @return -
-        */
-		void DynInitMenuPaneL( TInt aResourceID, CEikMenuPane* aMenuPane );
-
-		/**
-		* Handle selection key presses
-		* @param -
-		* @return -
-		*/
-		void HandleOKL();
-
-        /**
-        * Add setting items to listbox
-        * @param aListBox - pointer to listbox
-        * @param aItemList - pointer to setting item array
-        * @return -
-		*/
-		void AddProfileListItemL( CEikTextListBox* aListBox,
-		                          CNSmlDMSettingItemList* aItemList );
-
-		/**
-		* Loads setting dialog title from resource
-		* @param -
-		* @return -
-		*/
-		void SetSettingTitleL();
-	
-		/**
-		* Checks the type of the setting item
-		* @param CNSmlDMProfileData& aItem - reference to setting item
-		* @return ETrue if changed, EFalse otherwise
-		*/
-		TBool PrepareToEditSettingItemL( CNSmlDMProfileData& aItem );
-
-		/**
-		* Exit application when selected from Options menu
-		* @param -
-		* @return -
-		*/
-		void DoExitFromMenuL();
-
-		/**
-		* Return pointer to CNSmlDMSyncDocument
-		* @param -
-		* @return CNSmlDMSyncDocument*
-		*/
-		CNSmlDMSyncDocument* Document() const { return iDoc; }
-
-		/**
-		* Method to get context sensitive help topic
-        * @param TCoeHelpContext& aContext - Help topic to open
-		* @return -
-        */
-		void GetHelpContext( TCoeHelpContext& aContext ) const;
-
-	private:
-	
-		/**
-        * From CEikDialog OkToExitL( TInt aButtonId );
-		* Called by framework before exiting the dialog
-        * @param TInt aButtonId - id of the pressed button
-		* @return TBool (ETrue to exit\ EFalse to not to exit yet
-        */
-		TBool OkToExitL( TInt aButtonId );
-	
-		/**
-        * From CEikDialog PreLayoutDynInitL()
-		* Called by framework before the dialog is shown
-        * @param -
-		* @return -
-        */
-		void PreLayoutDynInitL();
-
-		/**
-        * HandleListBoxEventL MEikListBoxObserver
-        * @param aListBox Pointer to used listbox
-		* @param aEventType Event type
-        * @return -
-        */
-		void HandleListBoxEventL( CEikListBox* aListBox,
-		                          TListBoxEvent aEventType );
-	
-		/**
-		* Build list items
-		* @param -
-		* @return -
-		*/
-		void CreateProfileSettingsListL();
-
-		/**
-		* Launch access point dialog
-		* @param aItem Profile item
-		* @return Boolean
-		*/
-		TBool EditSettingItemAccessPointL( CNSmlDMProfileData& aItem );
-
-		/**
-		* Check access point
-		* @param TUint aId - id of the access point
-		* @return -
-		*/
-		void SetAccessPointInfoL( TUint aId );
-		
-		/**
-		* Get access point info
-		* @param TUint aId - id of the access point
-		* @return -
-		*/		
-		void GetAccessPointInfoL( TInt aId );
-	
-		/**
-		* Handle text type setting items
-		* @param aItem - reference to setting item
-		* @return ETrue if changed, EFalse otherwise
-		*/
-		TBool EditSettingItemTextL( CNSmlDMProfileData& aItem );
-
-		/**
-		* Handle password type setting items
-		* @param aItem - reference to setting item
-		* @return ETrue if changed, EFalse otherwise
-		*/
-		TBool EditSettingItemSecretL(CNSmlDMProfileData& aItem);
-
-		/**
-		* Handle number type setting items
-		* @param aItem - reference to setting item
-		* @return ETrue if changed, EFalse otherwise
-		*/
-		TBool EditSettingItemNumberL(CNSmlDMProfileData& aItem);
-
-		/**
-		* Handle list type setting items
-		* @param aItem - reference to setting item
-		* @return ETrue if changed, EFalse otherwise
-		*/
-		TBool EditSettingItemListL(CNSmlDMProfileData& aItem);
-
-		/**
-		* Handle boolean type setting items
-		* @param aItem - reference to setting item
-		* @return ETrue to refresh list
-		*/
-		TBool EditSettingItemListYesNoL(CNSmlDMProfileData& aItem);
-		
-		/**
-		* Handle boolean type setting items
-		* @param aItem - reference to setting item
-		* @return ETrue to refresh list
-		*/
-		TBool EditHttpSettingItemListYesNoL(CNSmlDMProfileData& aItem);		
-
-		/**
-		* Saves profile
-		* @param -
-		* @return -
-		*/
-		void SaveProfileL();
-
-		/**
-		* Sets default values for new profile
-		* @param -
-		* @return -
-		*/
-		void FillProfileWithDefaultsL();
-
-		/**
-		* Check that mandatory fields are filled correctly
-		* @param -
-		* @return Index of the invalid setting item, -1 if ok.
-		*/
-		TInt CheckMandatoryFieldsL();
-
-		/**
-		* Check that mandatory fields are filled correctly
-		* @param -
-		* @return Index of the invalid setting item, -1 if ok.
-		*/
-		TInt CheckUniqueFieldsL();
-
-		/**
-		* Launch Confirmation note
-		* @param aResource - resource id
-		* @return ETrue if accepted, otherwise EFalse
-		*/
-		TBool ShowConfirmationNoteL(TInt aResource);
-
-		/**
-		* Is edited profile just edited
-		* @param -
-		* @return ETrue if Edit mode
-		*/
-		inline TBool EditMode() { return iEditMode == ESmlEditProfile; }
-		
-		/**
-		* Is edited profile copied
-		* @param -
-		* @return ETrue if Copy profile
-		*/
-		inline TBool CopyMode() { return iEditMode == ESmlCopyProfile; }
-
-		/**
-		* Show confirmation note to user before editing setting item
-		* @param -
-		* @return - return prompt id if warning needed, 0 otherwise
-		*/
-		TInt WarnUserOfChangeL();
-
-		/**
-		* Get item for current index
-		* @param aIndex index of item
-		* @return ProfileData from item list
-		*/
-        CNSmlDMProfileData* Item( TInt aItemId );
-		
-		/**
-		* Get item for current index
-		* @param aIndex index of item
-		* @return ProfileData from item list
-		*/        
-        CNSmlDMProfileData* IndexItem( TInt aItemId );
-		
-		/**
-		* Get item for current index
-		* @param aIndex index of item
-		* @return ProfileData from item list
-		*/        
-        CNSmlDMProfileData* GetItemForIndex( TInt aIndex );
-
-		/**
-		* Utility function
-		* @param aHeaders
-		* @return None
-		*/
-        void BuildHeaders( CDesCArray* aHeaders );
-
-		/**
-		* Utility function
-		* @param None
-		* @return None
-		*/        
-        void BuildItemIds();
-
-		/**
-		* Utility function
-		* @param None
-		* @return None
-		*/        
-        void BuildProfileNameItemL();
-
-		/**
-		* Utility function
-		* @param None
-		* @return None
-		*/        
-        void BuildProfileServerIdItemL();
-        
-		/**
-		* Utility function
-		* @param None
-		* @return None
-		*/
-        void BuildProfileServerPasswordItemL();
-
-		/**
-		* Utility function
-		* @param None
-		* @return None
-		*/        
-        void BuildProfileConnectionTypeItemL();
-
-		/**
-		* Utility function
-		* @param None
-		* @return None
-		*/        
-        void BuildProfileAccessPointItemL();
-
-		/**
-		* Utility function
-		* @param None
-		* @return None
-		*/        
-        void BuildProfileUrlItemL();
-
-		/**
-		* Utility function
-		* @param None
-		* @return None
-		*/        
-        void BuildProfilePortItemL();
-
-		/**
-		* Utility function
-		* @param None
-		* @return None
-		*/        
-        void BuildProfileUserNameandPassWordItemL();
-
-		/**
-		* Utility function
-		* @param None
-		* @return None
-		*/        
-        void BuildProfileActiveAcceptedItemL();
-
-		/**
-		* Utility function
-		* @param None
-		* @return None
-		*/        
-        void BuildProfileHttpsUsedItemL();
-
-		/**
-		* Utility function
-		* @param None
-		* @return None
-		*/        
-        void BuildProfileHttpsUserNameAndPasswordItemL();
-        
-        /**
-         * Handle connection setting item selection
-         * @param aItem - reference to setting item
-         * @return boolean to refresh list
-         */
-        TBool EditConnectionSettingItemL(CNSmlDMProfileData& aItem );
-
-	private:
-		// Non owned data members
-        CNSmlDMSyncAppEngine*       iSyncAppEngine;
-		CNSmlDMSyncDocument*        iDoc;
-		CNSmlDMSettingItemList*     iProfileList;
-		CNSmlDMSyncProfile*         iProfile;
-		CAknSettingStyleListBox*    iProfileListBox;
-		CAknNavigationDecorator*    iNaviDecorator;
-		CAknTabGroup*               iTabGroup;
-		TNSmlEditMode               iEditMode;
-		TInt                        iProfileId;
-		TInt                        iOldProfileId;
-		TBool                       iServerIdChanged;
-		TBuf<KBufSize256>           iBuf;
-		CAknNavigationControlContainer* iNaviPane;
-		TInt iResourceOffset;
-		TInt iConnUtilResourceOffset;
-    };
-
-// CLASS DECLARATION
-/**
-*  CNSmlDMTextEditor
-*
-*  For Handling Enter keys in Editors
-*/
-
-NONSHARABLE_CLASS (CNSmlDMTextEditor) : public CAknTextSettingPage
-	{
-    public:
-    
-    /**
-		* Constructor
-		* @param resource id
-		* @param text
-		* @param flag
-		*/ 
-        CNSmlDMTextEditor(TInt aResourceID,TDes& aText,TInt aTextSettingPageFlags);                                                    
-         
-   /**
-		* Destructor
-		*/                                            
-        ~CNSmlDMTextEditor();   
-        
-    /**
-     * From the base class
-     * @param aKeyEvent
-     * @param aType
-     * @return -Key response
-     */             
-        
-	    TKeyResponse OfferKeyEventL(const TKeyEvent& aKeyEvent, TEventCode aType);
-	};
-
-
-
-                                            
-#endif //NSMLDMDLGPROFILEVIEW_H
-
-// End of File
--- a/omadm/omadmappui/inc/NSmlDMFotaContainer.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,204 +0,0 @@
-/*
-* Copyright (c) 2005-2006 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:  Declaration of fota view control container
-*
-*/
-
-
-
-#ifndef CNSMLDMFOTACONTAINER_H
-#define CNSMLDMFOTACONTAINER_H
-
-//  INCLUDES
-#include <aknview.h>    // AVKON components
-#include <aknlists.h>
-//#include <FotaEngine.h>
-
-// CLASS DECLARATION
-class CNSmlDMFotaModel;
-
-/**
-*  Control container for NSmlDMSyncApp fota view.
-*
-*  @lib NSmlDMSyncApp
-*  @since Series 60 3.1
-*/
-class CNSmlDMFotaContainer : public CCoeControl, 
-                             public MCoeControlObserver, 
-                             public MEikListBoxObserver
-    {
-    public:  // Constructors and destructor
-    
-        /**
-        * Two-phased constructor.
-        */
-        static CNSmlDMFotaContainer* NewL( CAknView* aView,
-                                           const TRect& aRect,
-                                           CNSmlDMFotaModel* aFotaModel );
-        
-        /**
-        * Destructor.
-        */
-        virtual ~CNSmlDMFotaContainer();
-
-    public: // New functions
-        
-        /**
-        * ?member_description.
-        * @since Series ?XX ?SeriesXX_version
-        * @param ?arg1 ?description
-        * @return ?description
-        */
-        //?type ?member_function( ?type ?arg1 );
-
-    public: // Functions from base classes
-
-        /**
-        * Refreshes the listbox contents.
-        * @since Series 60 3.2
-        * @param None.
-        * @return None.
-        */
-        
-        void RefreshL(TBool aPostponeDisplay);
-        
-        
-    public: // Functions from base classes
-
-        /**
-        * From CoeControl Responds to size changes. 
-        * Sets the size and position of the contents of this control.
-        * @since Series 60 3.1
-        * @param None.
-        * @return None.
-        */
-        void SizeChanged();
-
-        /**
-        * From CoeControl Handles the situations where
-        * a resource (e.g. skin or layout) is changed.
-        * @since Series 60 3.1
-        * @param aType Type of resource change.
-        * @return None.
-        */
-        void HandleResourceChange( TInt aType );
-
-        /**
-        * From CoeControl Gets the number of controls contained 
-        * in a compound control.        
-        * @since Series 60 3.1
-        * @param None.
-        * @return The number of component controls contained by this control.
-        */
-        TInt CountComponentControls() const;
-
-        /**
-        * From CoeControl Gets the specified component of a compound control.
-        * @since Series 60 3.1
-        * @param aIndex The index of the control to get.
-        * @return Reference to the component control.
-        */
-        CCoeControl* ComponentControl( TInt aIndex ) const;
-
-        /**
-        * From CoeControl Draws the control.
-        * @since Series 60 3.1
-        * @param aRect The region of the control to be redrawn.
-        * @return None.
-        */
-        void Draw( const TRect& aRect ) const;
-
-        /**
-        * From CoeControl Handles key events.
-        * @since Series 60 3.1
-        * @param aKeyEvent The key event that occurred.
-        * @param aType The event type.
-        * @return Response to the key event.
-        */
-        TKeyResponse OfferKeyEventL( const TKeyEvent& aKeyEvent, TEventCode aType );
-
-        /**
-        * From MEikListBoxObserver Handles list box events.
-        * @since Series 60 3.1
-        * @param aListBox The originating list box.
-        * @param aEventType The event type.
-        * @return None.
-        */
-        void HandleListBoxEventL( CEikListBox* aListBox, TListBoxEvent aEventType );
-
-        /**
-        * From MCoeControlObserver Handles an event from an observed control.
-        * @since Series 60 3.1
-        * @param aControl The control that sent the event.
-        * @param aEventType The event type.
-        * @return None.
-        */
-        void HandleControlEventL( CCoeControl* aControl, TCoeEvent aEventType );
-
-        /**
-        * From CoeControl Gets the control's help context.
-        * @since Series 60 3.1
-        * @param aContext The control's help context
-        * @return None.
-        */
-        void GetHelpContext( TCoeHelpContext& aContext ) const;
-
-    private:  // New functions
-        
-        /**
-        * Retrieves the required information for the main listbox
-        * and formats the item array.
-        * @since Series 60 3.1
-        * @param aItemsArray Descriptor array that is populated and formatted.
-        * @param aPostponeDisplay on ETrue displays the first item
-        * @return None.
-        */
-        void FormatListboxL( CDesCArray* aItemsArray, TBool aPostponeDisplay );
-
-        /**
-        * Shows a menu corresponding to the given menu bar
-        * resource identifier.
-        * @since Series 60 3.1
-        * @param aResource Resource identifier of the menu to be shown.
-        * @return None.
-        */
-        void ShowContextMenuL( TInt aResource );
-        
-    private:
-
-        /**
-        * C++ default constructor.
-        */
-        CNSmlDMFotaContainer( CAknView* aView,
-                              CNSmlDMFotaModel* aFotaModel );
-
-        /**
-        * By default Symbian 2nd phase constructor is private.
-        */
-        void ConstructL( const TRect& aRect );
-        
-    private:    // Data
-        // Fota view listbox
-        CAknDoubleStyleListBox* iFotaListBox;
-
-        // Pointer to the view instance
-        CAknView*               iView;
-
-        // Pointer to the fota model instance
-        CNSmlDMFotaModel*       iFotaModel;
-    };
-
-#endif      // CNSMLDMFOTACONTAINER_H  
-            
-// End of File
--- a/omadm/omadmappui/inc/NSmlDMFotaModel.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,242 +0,0 @@
-/*
-* 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: Implementation of DM UI component
-* 	This is part of omadmappui.
-*
-*/
-
-
-
-#ifndef CNSMLDMFOTAMODEL_H
-#define CNSMLDMFOTAMODEL_H
-
-//  INCLUDES
-#include <fotaengine.h>
-
-#include "NSmlDMFotaView.h"
-// FORWARD DECLARATIONS
-class CNSmlDMSyncDocument;
-class RFotaEngineSession;
-// CLASS DECLARATION
-
-/**
-*  Functionality required by the fota user interface.
-*
-*  @lib NSmlDMSyncApp
-*  @since Series 60 3.1
-*/
-class CNSmlDMFotaModel : public CBase
-    {
-    public:  // Constructors and destructor
-        
-        /**
-        * Two-phased constructor.
-        */
-        static CNSmlDMFotaModel* NewL( CNSmlDMSyncDocument* aDocument );
-        
-        /**
-        * Destructor.
-        */
-        virtual ~CNSmlDMFotaModel();
-
-    public: // New functions
-        
-        /**
-        * Retrieves the human readable name of the profile.
-        * @since Series 60 3.1
-        * @param aProfileId Profile identifier
-        * @param aProfileId Human readable name of the profile, or KNullDesC if not found.
-        * @return None
-        */
-        void GetProfileNameL( const TInt aProfileId,
-                                    HBufC* aProfileName ) const;
-
-        /**
-        * Retrieves the default fota profile identifier from
-        * the central repository.
-        * @since Series 60 3.1
-        * @param None
-        * @return Profile identifier
-        */
-        TInt DefaultFotaProfileIdL() const;
-
-        /**
-        * Saves the default fota profile identifier to the
-        * central repository.
-        * @since Series 60 3.1
-        * @param aProfileId Profile identifier.
-        * @return None
-        */
-        void SetDefaultFotaProfileIdL( const TInt aProfileId );
-
-        /**
-        * Sets the central repository key to indicate that the
-        * defined profile should be used to request firmware
-        * update.
-        * @since Series 60 3.1
-        * @param aProfileId Profile identifier.
-        * @return None
-        */
-        void EnableFwUpdRequestL( const TInt aProfileId );
-        
-        /**
-        * Retrieves the device management profile names into a list.
-        * @since Series 60 3.1
-        * @param aItems Array into which the profile names are appended.
-        * @return None
-        */
-        void ReadProfileListL( CDesCArray* aItems,
-                               CArrayFixFlat<TInt>* aProfileIdList );
-
-        /**
-        * Returns the index of the default fota profile in the
-        * given list of identifiers.
-        * @since Series 60 3.1
-        * @param aProfileIdList List of profile identifiers.
-        * @return Index of the default fota profile in the list.
-        */
-        TInt SelectDefaultProfileFromList(
-            const CArrayFixFlat<TInt>* aProfileIdList ) const;
-
-        /**
-        * Checks that the profile identifier is included in the
-        * devie management profiles list.
-        * @since Series 60 3.1
-        * @param aProfileIdList List of profile identifiers.
-        * @return Index of the default fota profile in the list.
-        */
-        TBool VerifyProfileL( const TInt aProfileId ) const;
-        
-        /**
-        * Retrieves the list of firmware update packages known to
-        * the FOTA server component.
-        * @since Series 60 3.1
-        * @param None.
-        * @return Array that includes the package identifiers.
-        */
-        TInt RetrieveFwUpdPkgIdListL(TFotaState aState);
-        
-        /**
-        * Checks if the FOTA server component has knowledge of firmware update
-        * packages that are in the given state. 
-        * @since Series 60 3.1
-        * @param aState Package state to be searched for.
-        * @return Identifier of the package that has the given state, or
-        *         KErrNotFound if none are found.
-        */
-        TInt FindFwUpdPkgWithStateL( TFotaState aState );
-
-        /**
-        * Initiates the instalklation of a firmware update package.
-        * @since Series 60 3.1
-        * @param aPkgId Identifier of the update package.
-        * @return error code.
-        */
-        TInt InitiateFwUpdInstall( TInt aPkgId, TInt aProfileId );
-		
-		/**
-        * Continues the installation of a firmware update package.
-        * @since Series 60 3.2
-        * @param None.
-        * @return None.
-        */
-        void ContinueFwUpdInstall( );
-        
-        /**
-        * Returns the version string of the current firmware.
-        * @since Series 60 3.1
-        * @param aVersionString The version string of the current firmware.
-        * @return Error code.
-        */
-        TInt CurrentFwVersionString( TDes& aVersionString );
-
-        /**
-        * Returns the time of the last successful firmware update.
-        * @since Series 60 3.1
-        * @param aVersionString The time of the last firmware update.
-        * @return Error code.
-        */
-        TInt LastUpdateTime( TTime& aTime );
-
-        /**
-        * Saves the current state of update packages.
-        * @param None.
-        * @return None.
-        */
-        void MarkFwUpdChangesStartL();
-
-        /**
-        * Checks if the state of update packages has changed since the saved
-        * situation.
-        * @param None.
-        * @return True if there are differences in pcakage identifiers or states.
-        */
-        TBool FwUpdStatesChangedL();
-        
-       TFotaState GetCurrentFwUpdState();
-
-        
-    public: // Functions from base classes
-
-        /**
-        * From ?base_class ?member_description.
-        * @since Series ?XX ?SeriesXX_version
-        * @param ?arg1 ?description
-        * @return ?description
-        */
-        //?type ?member_function( ?type ?arg1 );
-        
-    protected:  // New functions
-        
-        /**
-        * ?member_description.
-        * @since Series ?XX ?SeriesXX_version
-        * @param ?arg1 ?description
-        * @return ?description
-        */
-        //?type ?member_function( ?type ?arg1 );
-
-    protected:  // Functions from base classes
-        
-        /**
-        * From ?base_class ?member_description
-        */
-        //?type ?member_function();
-
-    private:
-
-        /**
-        * C++ default constructor.
-        */
-        CNSmlDMFotaModel( CNSmlDMSyncDocument* aDocument );
-
-        /**
-        * By default Symbian 2nd phase constructor is private.
-        */
-        void ConstructL();
-
-    private:    // Data
-    
-        // Pointer to the application document instance.
-        CNSmlDMSyncDocument*    iDocument;
-        
-        // Is the data package download in progress.
-        TBool                   iDpDlInProgress;
-    
-        RFotaEngineSession      iFotaEngine;     
-    };
-
-#endif      // CNSMLDMFOTAMODEL_H   
-            
-// End of File
--- a/omadm/omadmappui/inc/NSmlDMFotaSettingsDialog.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,167 +0,0 @@
-/*
-* Copyright (c) 2005-2006 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:  Declaration of FOTA Settings Dialog 
-*
-*/
-
-
-
-#ifndef CNSMLDMFOTASETTINGSDIALOG_H
-#define CNSMLDMFOTASETTINGSDIALOG_H
-
-//  INCLUDES
-#include <AknDialog.h>
-
-// FORWARD DECLARATIONS
-class CAknSettingStyleListBox;
-class CAknTitlePane;
-class CNSmlDMSyncDocument;
-class CAknNavigationControlContainer;
-
-// CLASS DECLARATION
-
-/**
-*  Dialog for fota settings.
-*
-*  @lib ?library
-*  @since Series 60 3.1
-*/
-class CNSmlDMFotaSettingsDialog : public CAknDialog,
-                                  public MEikListBoxObserver
-    {
-    public:  // Constructors and destructor
-        
-        /**
-        * Two-phased constructor.
-        */
-        static CNSmlDMFotaSettingsDialog* NewL();
-        
-        /**
-        * Destructor.
-        */
-        virtual ~CNSmlDMFotaSettingsDialog();
-
-    protected:  // New functions
-
-        /**
-        * Formats the fota settings dialog listbox and items.
-        * @since Series 60 3.1
-        * @param None
-        * @return None
-        */
-        void UpdateFotaSettListboxL();
-
-        /**
-        * Called when OK button is pressed.
-        * @since Series 60 3.1
-        * @param None
-        * @return None
-        */
-        void HandleOKL();
-
-    protected:  // Functions from base classes
-        
-        /**
-        * From CEikDialog Called when a key is pressed. Checks
-        * if it is ok to exit the dialog.
-        * @since Series 60 3.1
-        * @param aButtonId Identifier of the button pressed
-        * @return 
-        */
-        TBool OkToExitL( TInt aButtonId );
-
-        /**
-        * From CEikDialog Initializes the dialog and the required
-        * data. Called before the dialog is shown.
-        * @since Series 60 3.1
-        * @param None
-        * @return None
-        */
-        void PreLayoutDynInitL();
-
-        /**
-        * From CEikDialog
-        * @since Series 60 3.1
-        * @param aKeyEvent
-        * @param aType
-        * @return Was the key event consumed or not.
-        */
-        TKeyResponse OfferKeyEventL( const TKeyEvent& aKeyEvent, TEventCode aType );
-        
-        /**
-        * From MEikCommandObserver Called when a command is received
-        * from the dialog menu.
-        * @since Series 60 3.1
-        * @param aCommandId Identifier of the received command
-        * @return None
-        */
-        void ProcessCommandL( TInt aCommandId );
-
-        /**
-        * From MEikListBoxObserver Handles events originated from the listbox.
-        * @param aListBox Pointer to used listbox
-        * @param aEventType Event type
-        * @return None
-        */
-        void HandleListBoxEventL( CEikListBox* aListBox, TListBoxEvent aEventType );
-
-        /**
-        * From CoeControl Gets the control's help context.
-        * @since Series 60 3.1
-        * @param aContext The control's help context
-        * @return None.
-        */
-        void GetHelpContext( TCoeHelpContext& aContext ) const;
-
-    private:
-
-        /**
-        * C++ default constructor.
-        */
-        CNSmlDMFotaSettingsDialog();
-
-        /**
-        * From CAknView Dynamically initialises options menu.
-        * @since Series 60 5.0
-        * @param aResourceId Id identifying the menu pane to initialise.
-        * @param aMenuPane The in-memory representation of the menu pane.
-        * @return None.
-        **/         
-        void DynInitMenuPaneL( TInt aResourceID,CEikMenuPane* aMenuPane ); 
-        /**
-        * By default Symbian 2nd phase constructor is private.
-        */
-        void ConstructL();
-
-    private:    // Data
-        // The listbox of the dialog
-        CAknSettingStyleListBox*    iFotaSettListBox;
-         
-        // Pointer to title pane
-        CAknTitlePane*              iTitlePane;
-
-        // Pointer to the application document instance.
-        CNSmlDMSyncDocument*        iDocument;
-        
-        // Original title text storage
-        HBufC*                      iOriginalTitle;
-        
-        // Pointer to the navigation pane
-        CAknNavigationControlContainer* iNaviPane;
-
-    };
-
-#endif      // CNSMLDMFOTASETTINGSDIALOG_H   
-            
-// End of File
--- a/omadm/omadmappui/inc/NSmlDMFotaView.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,335 +0,0 @@
-/*
-* Copyright (c) 2005-2006 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:  Declares the firmware update view for the application
-*
-*/
-
-
-
-#ifndef CNSMLDMFOTAVIEW_H
-#define CNSMLDMFOTAVIEW_H
-
-//  INCLUDES
-#include <aknview.h>
-#include <AknWaitNoteWrapper.h>
-#include <e32property.h>
-#include "NSmlDMProgress.h"
-
-// FORWARD DECLARATIONS
-class CNSmlDMFotaContainer;
-class CNSmlDMFotaModel;
-class CAknIconArray;
-class CDLObserver;
-// CLASS DECLARATION
-
-/**
-*  Fota view in the NSmlDMSyncApp.
-*
-*  @lib NSmlDMSyncApp
-*  @since Series 60 3.1
-*/
-enum TFotaState
-			{
-			/** No firmware update has been started */
-	    EIdle                       = 10,
-	    /** Client has sent a client initiated request */
-	    EClientRequest              = 5,
-	    /** There is no data available and download is about to start */
-	    EStartingDownload           = 15,
-	    /** Download failed and there is no data received */
-	    EDownloadFailed             = 20,
-	    /** Download is progressing with resume support. This state shouldn't be set as FUMO state*/
-		EDownloadProgressingWithResume	= 25,
-	    /** Denotes that a download has started and that 0 or more bytes of 
-        data have been downloaded */
-	    EDownloadProgressing        = 30,
-	    /** Have data and download has been completed successfully */
-	    EDownloadComplete           = 40,
-	    /** Have data and about to start update */
-	    EStartingUpdate             = 50,
-	    /** Denotes that the update is currently running, but has not yet 
-        completed */
-	    EUpdateProgressing          = 60,
-	    /** Have data but update failed */
-	    EUpdateFailed               = 70,
-	    /** Update failed and data deleted or removed */
-	    EUpdateFailedNoData         = 80,
-	    /** Update complete and data still available */
-	    EUpdateSuccessful           = 90,
-	    /** Data deleted or removed after a successful update */
-	    EUpdateSuccessfulNoData     = 100,	
-			};
-
-class CNSmlDMFotaView : public CAknView, public MAknBackgroundProcess
-    {
-    friend  class CDLObserver;
-    public:  // Constructors and destructor
-        
-        /**
-        * Symbian 2nd phase constructor.
-        */
-        void ConstructL();
-        
-        /**
-        * Destructor.
-        */
-        virtual ~CNSmlDMFotaView();
-
-    public: // Functions from base classes
-
-        /**
-        * From CAknView Returns view id.
-        * @since Series 60 3.1
-        * @param None.
-        * @return View identifier.
-        */
-        TUid Id() const;
-		
-		/**
-        * From CAknView Handles user commands.
-        * @since Series 60 3.1
-        * @param aCommand The command identifier.
-        * @return None.
-        */
-        void HandleCommandL( TInt aCommand );
-
-        /**
-        * From MAknBackgroundProcess Is called periodically by the
-        * wait note wrapper.
-        * @since Series 60 3.1
-        * @param None.
-        * @return None.
-        */
-        void StepL();
-		
-        /**
-        * From MAknBackgroundProcess Checks if the process is finished
-        * and the wait note can be dismissed.
-        * @since Series 60 3.1
-        * @param None.
-        * @return Can the wait note be dismissed.
-        */
-		TBool IsProcessDone() const;
-		
-	public: // New functions
-        
-        /**
-        * Refreshes the container contents.
-        * @since Series 60 3.2
-        * @param aPostponeDisplay, on ETrue adds the first list item
-        * @return None.
-        */
-        
-        void RefreshL(TBool aPostponeDisplay);
-        
-        
-        /**
-        * For setting the iExitPress value.        
-        * @since Series 60 3.2
-        * @param None.
-        * @return None.
-        */
-        void UpdateExitL();
-        	
-    private:  // New functions
-        
-        /**
-        * ?member_description.
-        * @since Series 60 3.1
-        * @param None
-        * @return None
-        */
-        void InitiateFotaCheckL();
-
-        /**
-        * Shows a popup list of available device management
-        * profiles. Leaves if the query is cancelled.
-        * @since Series 60 3.1
-        * @param None
-        * @return Identifier of the selected profile.
-        */
-        TInt ShowFotaProfileQueryL();
-        
-        /**
-        * Formats the fota initiation profile query
-        * listbox items.
-        * @since Series 60 3.1
-        * @param aItems Array of items included in the listbox
-        * @param aProfileIdList Is changed to an array of profile identifiers. The order is the same as the listbox itmes.
-        * @return None
-        */
-        void FormatProfileQueryListItemsL( CDesCArray*          aItems,
-                                           CArrayFixFlat<TInt>* aProfileIdList );
-
-        /**
-        * Creates a listbox icon array containing the device
-        * management bearer icons.
-        * @since Series 60 3.1
-        * @param aIconArray Pointer to the icon array to be formatted.
-        * @return None
-        */
-        void CreateIconArrayL( CAknIconArray* aIconArray );
-
-        /**
-        * Initiates a firmware update package installation.
-        * @since Series 60 3.1
-        * @param None.
-        * @return None.
-        */
-        void InitiateFwUpdInstallL();
-		
-		/**
-        * Continues a firmware update package installation which is suspended.
-        * @since Series 60 3.2
-        * @param None.
-        * @return None.
-        */
-        void InitiateFwUpdContinueL();
-
-        /**
-        * Manual check allowed or not.
-        * @since Series 60 3.2
-        * @param None.
-        * @return TBool based on manual; check allowed or not.
-        */
-        TBool ManualCheckAllowedL();
-        
-        /**
-        * Enabling context options msk.
-        * @since Series 60 3.2
-        * @param TBool aEnabled.
-        * @return None.
-        */
-        void EnableMskL ( TBool aEnable );
-                                
-    private:  // Functions from base classes
-        /**
-        * From CAknView Activates view.
-        * @since Series 60 3.1
-        * @param aPrevViewId Id of previous view.
-        * @param aCustomMessageId Custom message id.
-        * @param aCustomMessage Custom message.
-        * @return None.
-        */
-        void DoActivateL( const TVwsViewId& aPrevViewId,
-                                TUid aCustomMessageId,
-                          const TDesC8& aCustomMessage );
-
-        /**
-        * From CAknView Deactivates view.        
-        * @since Series 60 3.1
-        * @param None.
-        * @return None.
-        */
-        void DoDeactivate();
-
-        /**
-        * From CAknView Dynamically initialises options menu.
-        * @since Series 60 3.1
-        * @param aResourceId Id identifying the menu pane to initialise.
-        * @param aMenuPane The in-memory representation of the menu pane.
-        * @return None.
-        */
-        void DynInitMenuPaneL( TInt aResourceId, CEikMenuPane* aMenuPane );
-    
-    protected:
-        /**
-        * From CAknView to handle foreground events
-        * @since Series 60 3.2
-        * @param aForeground         
-        * @return None.
-        */ 
-    	void HandleForegroundEventL(TBool aForeground);        
-
-    private:    // Data
-        // Container for view contol.
-        CNSmlDMFotaContainer*   iContainer;
-        
-        // Pointer to the fota model instance.
-        CNSmlDMFotaModel*       iFotaModel;
-        
-        // Pointer to the wait note wrapper that is used during
-        // the manual checking of firmware updates.
-        CAknWaitNoteWrapper*    iWaitNoteWrapper;
-        
-        //For storing cenrep value of manual check updates
-        TInt iManCheckAllowed;
-      
-        //T be used in HandleForegroundeventL for Exit and End key press
-        TInt iExitPress;
-
-		// Active object for refreshing main view    
-        CDLObserver* iFotaDLObserver;
-    };
-
-// CLASS DECLARATION
-// Active object for refreshing main view    
-class CDLObserver : public CActive
-	{	
-	friend class CNSmlDMFotaView;	
-	public:
-	
-		/**
-	     * Constructor.
-	     */
-		inline CDLObserver();    	
-		
-		/**
-	     * Starts the active object monitoring on P&S key
-	     * @param aResetKey,whcih sets the P&S key 
-	     * @return None
-	     */
-		void StartL(TBool aResetKey);
-		
-		/**
-	     * Destructor.
-	     */    	
-		~CDLObserver();
-		
-	private:
-	
-		/**
-	     * From CActive. Called when asynchronous request completes.
-	     * @param None
-	     * @return None
-	     */
-		void RunL();
-		
-		/**
-	      * From CActive. Cancels asynchronous request.
-	      * @param None
-	      * @return None
-	      */
-		void DoCancel();
-		
-		/**
-	     * Symbian 2nd phase constructor.
-	     */
-		void ConstructL(CNSmlDMFotaView *iFotaView);
-		
-		/**
-	     * From CActive. Called when RunL Leaves.
-	     * @param None
-	     * @return error
-	     */
-	    TInt RunError( TInt aError );    	    	
-	    
-	private:	      	
-		CNSmlDMFotaView* iView;
-		RProperty iProperty;    
-	}; 
-
-#endif      // CNSMLDMFOTAVIEW_H   
-            
-// End of File
--- a/omadm/omadmappui/inc/NSmlDMItemData.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,152 +0,0 @@
-/*
-* 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:  Contains profile item data
-*
-*/
-
-
-#ifndef NSMLDMITEMDATA_H
-#define NSMLDMITEMDATA_H
-
-// INCLUDES
-
-#include <e32base.h>
-#include "NSmlDMdef.h"
-
-// CLASS DECLARATION
-
-/**
-*  CNSmlDMItemData
-*
-*  Base class for holding Setting data
-*/
-NONSHARABLE_CLASS (CNSmlDMItemData) : public CBase
-	{
-	public:
-
-		/**
-		* Constructor
-		*/
-		CNSmlDMItemData() : iHeader( 0 ), iValue( 0 ) { }
-		
-		/**
-		* Destructor
-		*/
-		virtual ~CNSmlDMItemData();
-		
-		/**
-		* Set header value of the settings item
-		* @param const TDesC& aData - Setting item header value
-		* @return -
-		*/
-		void SetHeader( const TDesC& aData );
-		
-		/**
-		* Set value of the settings item
-		* @param const TDesC& aData - Setting item value
-		* @return -
-		*/
-		void SetValue( const TDesC& aData );
-		/**
-		* Set value of the port item
-		* @param const TInt aPort - Port number
-		* @return -
-		*/
-		void SetValue( TInt aPort );
-
-		/**
-		* Return header text
-		* @param -
-		* @return - String pointer to the setting item header value
-		*/
-		HBufC* Header() const;
-		
-		/**
-		* Get setting item value text
-		* @param -
-		* @return - String pointer to the setting item value
-		*/
-		HBufC* Value() const;
-		
-		/**
-		* Format Setting item to listbox
-		* @param aConvert ETrue creates language specific conversion.
-		* @return -
-		*/
-		virtual HBufC* ItemToListLC( TBool aConvert );
-
-	public:
-		
-		TBool iMandatory;
-
-	protected:
-
-		/**
-		* Private second constructor
-		*/
-		void ConstructL();
-
-	protected:
-		HBufC* iHeader;
-		HBufC* iValue;
-	};
-
-/**
-*  CNSmlDMItemData
-*
-*  Base class for holding profile data
-*/
-NONSHARABLE_CLASS (CNSmlDMProfileData) : public CNSmlDMItemData
-	{
-	public:
-
-		enum TNSmlItemType
-			{
-			ENSmlTypeIAP,
-			ENSmlTypeText,
-			ENSmlTypeList,
-			ENSmlTypeListYesNo,
-			ENSmlTypeTime,
-			ENSmlTypeNumber,
-			ENSmlTypeSecret,
-			ENSmlTypehttpListYesNo
-			};
-		/**
-		* Create object
-		* @param -
-		* @return -
-		*/
-		static CNSmlDMProfileData* NewLC();
-
-		/**
-		* Destructor
-		*/
-	    virtual	~CNSmlDMProfileData() { }
-	
-		TInt                        iLength;
-		TInt                        iResource;
-		TNSmlItemType               iItemType;
-		TBuf<KNSmlMaxItemLength>    iValue;
-		TInt                        iNumberData;
-		TBool                       iLatinInput;
-		TInt                        iIndex;
-		TBool                       iHidden;
-		TBool                       iWapAPInUse;
-		TInt                        iItemId;
-	};
-
-#endif // NSMLDMITEMDATA_H
-
-
-// End of File
--- a/omadm/omadmappui/inc/NSmlDMProfilesContainer.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,291 +0,0 @@
-/*
-* Copyright (c) 2002-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:  Header file for CNSmlDMProfilesContainer
-*
-*/
-
-
-
-#ifndef CNSMLDMPROFILESCONTAINER_H
-#define CNSMLDMPROFILESCONTAINER_H
-
-// INCLUDES
-#include <bldvariant.hrh>
-#include <eiklbo.h>
-#include <aknlists.h>
-#include <eikdialg.h>
-#include <eikmenup.h>
-#include <e32def.h>
-#include <aknstaticnotedialog.h>
-#include "NSmlDMSyncDocument.h"
-#include "NSmlDMSyncAppUi.h"
-
-// FORWARD DECLARATIONS
-class CNSmlDMSyncDocument;
-class TNSmlDMProfileItem;
-
-// CLASS DECLARATION
-
-/**
-* CNSmlDMProfilesContainer dialog class
-* 
-*/
-class CNSmlDMProfilesContainer : public CCoeControl,
-                                 public MCoeControlObserver,
-                                 public MEikListBoxObserver
-    {
-    public: // Constructors and destructor
-    
-        /**
-        * Two-phased constructor.
-        */
-        static CNSmlDMProfilesContainer* NewL( CAknView* aView,
-                                               const TRect& aRect );
-
-		/**
-        * Destructor.
-        */
-        ~CNSmlDMProfilesContainer();
-
-    public: // New functions
-
-        /**
-        * Refreshes the listbox contents.
-        * @since Series 60 3.1
-        * @param None.
-        * @return None.
-        */
-        void RefreshL();
-
-		/**
-        * Sets the iSettingsView true/false if settingsview is up/down
-        * @param -
-		* @return -
-        */
-		inline void SetSettingsView() { iSettingsView = !iSettingsView; }
-
-		/**
-        * Return status of the Settings view
-        * @param -
-		* @return True if settings isn't open
-        */
-		inline TBool SettingsView() const { return iSettingsView == EFalse; }
-
-		/**
-        * Update index on the main view
-		* @param TInt aIndex - value of the index
-		* @return -
-        */
-		void SetCurrentIndex( TInt aIndex );
-		
-        /**
-        * Shows a menu corresponding to the given menu bar
-        * resource identifier.
-        * @since Series 60 3.1
-        * @param aResource Resource identifier of the menu to be shown.
-        * @return None.
-        */
-        void ShowContextMenuL( TInt aResource );
-
-		/**
-        * Read profiles and fill the profile item list
-		* @param -
-		* @return -
-        */
-		void ReadProfileListL();
-
-		/**
-		* Create and show the logview dialog
-		* @param -
-		* @return -
-        */
-		void PopupLogViewL();
-
-		/**
-        * Close the active popupmenu
-		* @param -
-		* @return -
-        */
-		void ClosePopupMenuL();
-
-		/**
-		* Status of the main dialog menu
-        * @param -		
-        * @return - ETrue if menu is up
-        */
-		TBool MenuUp() const { return iMenuUp == 1; }
-		
-		/**
-		* Closes menu
-        * @param -		
-        * @return - 
-        */
-		void CloseMenuUp() { iMenuUp =0; }
-
-    public: // Functions from base classes
-
-        /**
-        * From CoeControl Responds to size changes. 
-        * Sets the size and position of the contents of this control.
-        * @since Series 60 3.1
-        * @param None.
-        * @return None.
-        */
-        void SizeChanged();
-
-        /**
-        * From CoeControl Handles the situations where
-        * a resource (e.g. skin or layout) is changed.
-        * @since Series 60 3.1
-        * @param aType Type of resource change.
-        * @return None.
-        */
-        void HandleResourceChange( TInt aType );
-
-        /**
-        * From CoeControl Gets the number of controls contained 
-        * in a compound control.        
-        * @since Series 60 3.1
-        * @param None.
-        * @return The number of component controls contained by this control.
-        */
-        TInt CountComponentControls() const;
-
-        /**
-        * From CoeControl Gets the specified component of a compound control.
-        * @since Series 60 3.1
-        * @param aIndex The index of the control to get.
-        * @return Reference to the component control.
-        */
-        CCoeControl* ComponentControl( TInt aIndex ) const;
-
-        /**
-        * From CoeControl Draws the control.
-        * @since Series 60 3.1
-        * @param aRect The region of the control to be redrawn.
-        * @return None.
-        */
-        void Draw( const TRect& aRect ) const;
-
-        /**
-        * From CoeControl Handles key events.
-        * @since Series 60 3.1
-        * @param aKeyEvent The key event that occurred.
-        * @param aType The event type.
-        * @return Response to the key event.
-        */
-        TKeyResponse OfferKeyEventL( const TKeyEvent& aKeyEvent, TEventCode aType );       
-
-		/**
-        * Handle ListBox EventL
-        * @param CEikListBox* aListBox Pointer to used listbox
-		* @param TListBoxEvent aEventType Event type
-        * @return -
-        */
-		void HandleListBoxEventL( CEikListBox* aListBox, TListBoxEvent aEventType );
-		
-        /**
-        * From MCoeControlObserver Handles an event from an observed control.
-        * @since Series 60 3.1
-        * @param aControl The control that sent the event.
-        * @param aEventType The event type.
-        * @return None.
-        */
-        void HandleControlEventL( CCoeControl* aControl, TCoeEvent aEventType );        
-
-        /**
-        * From CoeControl Gets the control's help context.
-        * @since Series 60 3.1
-        * @param aContext The control's help context
-        * @return None.
-        */
-        void GetHelpContext( TCoeHelpContext& aContext ) const;
-        /**
-        * Handle Pointer EventL
-        * @since Series 60 3.2
-        * @param  aPointerEvent The event type
-        * @return None.
-        */
-        void HandlePointerEventL( const TPointerEvent& aPointerEvent );
-
-    protected:
-
-        /**
-		* Change of focus
-        * @param -
-		* @return -
-        */
-        void FocusChanged(TDrawNow aDrawNow);
-
-    protected:  // Functions from CEikDialog
-
-        /**
-		* Called by framework before the dialog is shown
-        * @param -
-		* @return -
-        */
-        void PreLayoutDynInitL();
-
-        /**
-		* Called by framework after the dialog is shown
-        * @param -
-		* @return -
-        */
-		void PostLayoutDynInitL();
-		
-		/**
-		* Build and format the logview listbox texts
-		* @param aArray -
-		* @return -
-        */
-		void FormatLogViewListL(CDesCArray* aArray);
-		
-        /**
-        * Appends icons to the contained listbox.
-        * @since Series 60 3.1
-        * @param None.
-        * @return None.
-        */
-        void AddIconsL();
-		
-    private:
-
-        /**
-        * C++ default constructor.
-        */
-        CNSmlDMProfilesContainer( CAknView* aView );
-
-        /**
-        * By default Symbian 2nd phase constructor is private.
-        */
-        void ConstructL( const TRect& aRect );
-        
-	public:  // data
-		CAknDoubleLargeStyleListBox*    iProfilesListBox;
-
-    private: // data
-		CNSmlDMSyncAppUi*               iAppUi;
-		CNSmlDMSyncDocument*            iDocument;
-        // Pointer to the view instance
-        CAknView*                       iView;
-
-		TBool                           iContextMenuUp;
-		TBool                           iConfirmationNoteUp;
-		TInt                            iMenuUp;
-		TBool                           iSettingsView;
-    };
-
-#endif  // CNSMLDMPROFILESCONTAINER_H
-
-// End of File
--- a/omadm/omadmappui/inc/NSmlDMProfilesView.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,123 +0,0 @@
-/*
-* Copyright (c) 2005-2006 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:  Header file for Server Profiles View
-*
-*/
-
-
-
-#ifndef CNSMLDMPROFILESVIEW_H
-#define CNSMLDMPROFILESVIEW_H
-
-// INCLUDES
-#include <aknview.h>
-
-// FORWARD DECLARATIONS
-class CNSmlDMProfilesContainer;
-
-// CLASS DECLARATION
-
-/**
-* CNSmlDMProfilesView dialog class
-* 
-*/
-class CNSmlDMProfilesView : public CAknView
-    {
-    public: // Constructors and destructor
-        
-        /**
-        * Symbian 2nd phase constructor.
-        */
-        void ConstructL();
-
-		/**
-        * Destructor.
-        */
-        ~CNSmlDMProfilesView();
-
-    public: // New functions
-
-        /**
-        * Refreshes the container contents.
-        * @since Series 60 3.1
-        * @param None.
-        * @return None.
-        */
-        void RefreshL();
-
-    public: // Functions from base classes
-
-        /**
-        * From CAknView Returns view id.
-        * @since Series 60 3.1
-        * @param None.
-        * @return View identifier.
-        */
-        TUid Id() const;
-		
-		/**
-        * From CAknView Handles user commands.
-        * @since Series 60 3.1
-        * @param aCommand The command identifier.
-        * @return None.
-        */
-        void HandleCommandL( TInt aCommand );
-
-    private:  // Functions from base classes
-        /**
-        * From CAknView Activates view.
-        * @since Series 60 3.1
-        * @param aPrevViewId Id of previous view.
-        * @param aCustomMessageId Custom message id.
-        * @param aCustomMessage Custom message.
-        * @return None.
-        */
-        void DoActivateL( const TVwsViewId& aPrevViewId,
-                                TUid aCustomMessageId,
-                          const TDesC8& aCustomMessage );		
-
-        /**
-        * From CAknView Deactivates view.        
-        * @since Series 60 3.1
-        * @param None.
-        * @return None.
-        */
-        void DoDeactivate();
-
-        /**
-        * From CAknView Dynamically initialises options menu.
-        * @since Series 60 3.1
-        * @param aResourceId Id identifying the menu pane to initialise.
-        * @param aMenuPane The in-memory representation of the menu pane.
-        * @return None.
-        */
-        void DynInitMenuPaneL( TInt aResourceId, CEikMenuPane* aMenuPane );
-        
-	    protected:
-	    /**
-	    * From CAknView to handle foreground events
-	    * @since Series 60 5.0
-	    * @param aForeground         
-	    * @return None.
-	    */ 
-		void HandleForegroundEventL(TBool aForeground);   
-
-    private: //data
-        // Control container for profiles view.
-        CNSmlDMProfilesContainer*       iContainer;
-    };
-
-#endif // CNSMLDMPROFILESVIEW_H
-
-// End of File
--- a/omadm/omadmappui/inc/NSmlDMProgress.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,284 +0,0 @@
-/*
-* Copyright (c) 2002-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:  Header file for CNSmlDMProgressDialog
-*
-*/
-
-
-#ifndef NSMLDMPROGRESSDIALOG_H
-#define NSMLDMPROGRESSDIALOG_H
-
-
-//  INCLUDES
-#include    <e32base.h>
-#include    <AknProgressDialog.h>
-#include    <AknsItemID.h>
-
-#include "NSmlDMSyncDocument.h"
-#include    "NSmlDMdef.h"
-
-// CLASS DECLARATIONS
-
-/**
-*  MNSmlDMProgressDialogObserver
-* 
-*/
-class MNSmlDMProgressDialogObserver
-    {
-    public:
-        /**
-        * Callback method
-        * Get's called when a dialog is dismissed.
-        */
-        virtual void HandleDialogEventL(TInt aButtonId) = 0;
-    };
-
-/**
-* CNSmlDMProgressDialog2
-*
-* CNSmlDMProgressDialog2 is needed to modify CAknProgressDialog::OkToExitL. 
-*/
-NONSHARABLE_CLASS (CNSmlDMProgressDialog2) : public CAknProgressDialog
-    {
-	public:
-
-        /**
-        * C++ default constructor.
-        */
-		CNSmlDMProgressDialog2(CEikDialog** aSelfPtr);
-
-        /**
-        * From the base class.
-		* Called by framework before exiting the dialog.
-        * @param Button id.
-		* @return ETrue to exit\ EFalse to not to exit.
-        */
-        TBool OkToExitL(TInt aButtonId);
-
-        /**
-        * From the base class.
-		* Called to launch the dialog.
-        * @param None.
-		* @return the Button Id which exits the dialog
-        */
-        TInt RunLD();
-
-        /**
-        * From the base class.
-		* Called to stop the timer and delete the dialog.
-        * @param None.
-		* @return None.
-        */
-        void ProcessFinishedL();
-        
-  private:
-  
-        /**
-        * From the base class.
-		* Called by framework for key event handling.
-        * @param aKeyEvent.
-		* @param TEventCode.
-		* @return Return code.
-        */
-		TKeyResponse OfferKeyEventL(const TKeyEvent& aKeyEvent,TEventCode aType);
-
-        
-  private:
-        // has dialog received close event (eg. end key) 
-		TBool iCloseEventReceived;
-		
-		// has DM Connection been closed
-        TBool iClosed;
-        //Documnet class reference
-		CNSmlDMSyncDocument*        iDoc;       
-    };
-
-/**
-*  CNSmlDMProgressDialog
-*  
-*/
-NONSHARABLE_CLASS (CNSmlDMProgressDialog) : public CBase,
-                                            public MProgressDialogCallback
-    {
-	enum TAnimationState
-        {
-        EAnimationOn,
-    	EAnimationOff,
-    	EAnimationNone
-        };
-
-    public:// Constructors and destructor
-
-        /**
-        * Two-phased constructor.
-        */
-        static CNSmlDMProgressDialog* NewL(MNSmlDMProgressDialogObserver* aObserver);
-        
-        /**
-        * Destructor.
-        */
-        virtual ~CNSmlDMProgressDialog();
-    
-    private:
-
-        /**
-        * C++ default constructor.
-        */
-        CNSmlDMProgressDialog( MNSmlDMProgressDialogObserver* aObserverPtr );
-	
-        /**
-        * By default Symbian OS constructor is private.
-        */
-        void ConstructL();
-        
-		/**
-		* From MProgressDialogCallback.
-        * Called by the framework when dialog is dismissed.
-        * @param aButtonId
-        * @return None
-        */
-        void DialogDismissedL( TInt aButtonId );
-
-    public:        
-        
-        /**
-        * Launches progress dialog.
-        * @param aLabel.
-        * @return None.
-        */
-        void LaunchProgressDialogL( const TDesC& aLabel );
-        
-        /**
-        * Launches progress dialog with custom bitmap.
-        * @param aLabel Dialog label
-        * @param aId Item identifier used to identify items
-        * @param aFileName Name of the file
-        * @param aFileBitmapId Bitmap id
-        * @param aFileMaskId Mask id
-        * @return None.
-        */
-        void LaunchProgressDialogL( const TDesC& aLabel,
-                                    TAknsItemID aId,
-                                    const TDesC& aFileName,
-                                    TInt aFileBitmapId,
-                                    TInt aFileMaskId );
-        
-        /**
-        * Closes progress dialog.
-        * @param None
-        * @return None
-        */
-        void CancelProgressDialogL();
-        
-        /**
-        * Update dialog label text.
-        * @param aText.
-        * @return None.
-        */
-        void UpdateTextL( const TDesC& aText );
-
-        /**
-        * Update dialog label text.
-        * @param aResId.
-        * @return None.
-        */
-        void UpdateTextL( TInt aResId );
-
-
-        /**
-        * Set progress bar state.
-        * @param aValue.
-        * @return None
-        */
-        void SetProgress( TInt aValue );
-
-        /**
-        * Set progress bar state.
-        * @param aFinalValue.
-        * @return None
-        */
-        void SetFinalProgress( TInt aFinalValue );
-
-        /**
-        * Gets CAknNoteControl from CAknProgressDialog.
-        * @param None
-        * @return CAknNoteControl.
-        */
-		CAknNoteControl* NoteControl();
-
-        /**
-        * Cancels animation.
-        * @param None.
-        * @return None.
-        */
-		void CancelAnimation();
-        
-		/**
-        * Starts animation.
-        * @param None
-        * @return None.
-        */
-		void StartAnimationL();
-    private:
-        /**
-        * Read resource
-        * @param aText Resource text
-        * @param aResourceId Resource id
-        * @return None.
-        */
-        void ReadL( TDes& aText, TInt aResourceId );
-
-    public:       
-        /**
-        * Create image
-        * @param aId
-        * @param aFileName
-        * @param aFileBitmapId
-        * @param aFileMaskId
-        * @return CEikImage*
-        */        
-        CEikImage* CreateImageLC( TAknsItemID aId,
-                                  const TDesC& aFileName,
-                                  TInt aFileBitmapId,
-                                  TInt aFileMaskId );
-       /**
-        * Set's the image
-        * @param CEikImage*
-        * @return None
-        */                            
-       void SetImageL(CEikImage* aimage);
-
-    private:
-        // progress dialog
-		CNSmlDMProgressDialog2*	iProgressDialog;
-
-        // progress dialog info
-        CEikProgressInfo* iProgressInfo;
-
-		// last label text
-		TBuf<KBufSize> iLastText;
-
-		// animation state
-		TBool iAnimation;
-
-		// dialog observer
-        MNSmlDMProgressDialogObserver*	iObserver;
-
-		// count of received events from CAknProgressDialog
-		TInt iEventCount;
-    };
-
-#endif // NSMLDMPROGRESSDIALOG_H
-            
-// End of File
--- a/omadm/omadmappui/inc/NSmlDMSync.hlp.hrh	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-/*
-* Copyright (c) 2002-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:  Constants for help.
-*
-*/
-
-
-#ifndef __NSMLDMSYNC_HLP_HRH__
-#define __NSMLDMSYNC_HLP_HRH__
-
-
-_LIT(KSML_HLP_INTRO,"SML_HLP_INTRO");
-_LIT(KSML_HLP_START,"SML_HLP_START");
-_LIT(KSML_HLP_DLG_MAIN,"SML_HLP_DLG_MAIN");
-_LIT(KSML_HLP_DLG_SETTINGS,"SML_HLP_DLG_SETTINGS");
-_LIT(KSML_HLP_POP_SYNC_LOG,"SML_HLP_POP_SYNC_LOG");
-_LIT(KSML_HLP_POP_DEFAULT,"SML_HLP_POP_DEFAULT");
-_LIT(KSML_HLP_DLG_PROGRESS,"SML_HLP_DLG_PROGRESS");
-_LIT(KSML_HLP_ACTIONS,"SML_HLP_ACTIONS");
-
-#endif
--- a/omadm/omadmappui/inc/NSmlDMSyncApp.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-/*
-* Copyright (c) 2002-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:  Header file for CNSmlDMSyncApp
-*
-*/
-
-
-#ifndef NSMLDMSYNCAPP_H
-#define NSMLDMSYNCAPP_H
-
-// INCLUDES
-#include <aknapp.h>
-#include <AknServerApp.h>
-
-const TUid KUidSmlSyncApp = { 0x101F6DE5 };
-
-// CLASS DECLARATION
-
-/**
-* Device Management Application
-*
-*/
-NONSHARABLE_CLASS (CNSmlDMSyncApp) : public CAknApplication
-    {
-    public:
-        /**
-        * From CApaApplication, creates CNSmlDMSyncDocument document object.
-        * @param None
-		* @return A pointer to the created document object.
-		*/
-        CApaDocument* CreateDocumentL();
-        
-        /**
-        * From CApaApplication, returns application's UID (KUidSmlSyncApp).
-        * @param None
-		* @return The value of KUidSmlSyncApp.
-        */
-        TUid AppDllUid() const;
-        
-        /**
-        * From CApaApplication, Creates new application server
-        * @param aAppServer App server
-		* @return None
-        */
-        void NewAppServerL( CApaAppServer*& aAppServer );
-    };
-
-#endif  // NSMLDMSYNCAPP_H
-
-// End of File
--- a/omadm/omadmappui/inc/NSmlDMSyncAppEngine.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,217 +0,0 @@
-/*
-* 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:  Application engine for the sync events
-*
-*/
-
-
-
-#ifndef CNSMLDMSYNCAPPENGINE_H
-#define CNSMLDMSYNCAPPENGINE_H
-
-//  INCLUDES
-#include <e32base.h>
-#include <SyncMLClient.h>
-#include "NSmlDMdef.h"
-
-// FORWARD DECLARATIONS
-class CNSmlDMSyncHandler;
-class CNSmlDMSyncProfile;
-class CNSmlDMSyncDocument;
-
-// CLASS DECLARATION
-
-/**
-* MNSmlDMSyncObserver
-*
-* MNSmlDMSyncObserver is for observing Sync.
-*/
-class MNSmlDMSyncObserver
-    {
-    public:
-	    virtual void SyncComplete( TNSmlStatus aStatus ) = 0;
-    };
-   
-/**
-* CNSmlDMSyncAppEngine
-* Sync engine for handling synchronization and profiles.
-*/
-NONSHARABLE_CLASS (CNSmlDMSyncAppEngine) : public CBase
-    {
-    public:  // Constructors and destructor
-        
-        /**
-        * Two-phased constructor.
-        */
-        static CNSmlDMSyncAppEngine* NewL( CNSmlDMSyncDocument* aSyncDocument );
-        
-        /**
-        * Destructor.
-        */
-        virtual ~CNSmlDMSyncAppEngine();
-
-    public: // New functions
-        
-        /**
-        * Delete profile
-        * @param aProfileId Profile to be deleted.
-        * @return None
-        */
-        void DeleteProfileL( TInt aProfileId );
-
-        /**
-        * Create profile
-        * @param None.
-        * @return None
-        */
-        TInt CreateProfileL();
-
-        /**
-        * Create copy profile
-        * @param aProfileId Profile that is used for copying
-        * @return None
-        */
-        CNSmlDMSyncProfile* CreateCopyProfileL( TInt aProfileId );
-
-        /**
-        * Return current profile
-        * @param None.
-        * @return CNSmlDMSyncProfile*
-        */
-        CNSmlDMSyncProfile* Profile( );
-
-        /**
-        * Cancel synchronization
-        * @param None.
-        * @return None
-        */
-        void CancelSyncL();
-        
-        /**
-        * Return RSyncMLSession
-        * @param None.
-        * @return RSyncMLSession*
-        */
-        RSyncMLSession* Session();
-        
-        /**
-        * Open profile
-        * @param aProfileId Profile id to open
-        * @param aOpenMode opening mode
-        * @return None
-        */
-        CNSmlDMSyncProfile* OpenProfileL( TInt aProfileId,
-                                          TInt aOpenMode = ESmlOpenReadWrite );
-
-        /**
-        * Close profile
-        * @param None.
-        * @return None
-        */        
-        void CloseProfile();
-        
-        /**
-        * Start synchronization
-        * @param aProfileId Profile id to sync
-        * @return None
-        */               
-        void SynchronizeL( TDesC& aServerName,
-                           const TInt aProfileId,
-                           const TInt aConnectionBearer,
-                           const TBool aUseFotaProgressNote );
-        
-        /**
-        * Start synchronization
-        * @param aProfileId Profile id to sync
-        * @param aJobId Jod id to sync
-        * @return None
-        */         
-        void SynchronizeL( TDesC& aServerName,
-                           const TInt aProfileId,
-                           const TInt aJobId,
-                           const TInt aConnectionBearer,
-                           const TBool aUseFotaProgressNote );
-        
-        /**
-        * Check if duplicate server id is found
-        * @param  aServerId Server id
-        * @param  aProfileId current profile id
-        * @return ETrue if server id found
-        */                 
-        TBool ServerIdFoundL( const TDesC& aServerId, const TInt aProfileId );
-        
-		/**
-		* Compare two descriptors
-        * @param aLeft  
-		* @param aRight  
-		* @return - Positive, if this descriptor is 
-        *                     greater than the specified descriptor.
-		*           Negative, if this descriptor is
-		*                     less than the specified descriptor.
-		*           Zero, if the content of both descriptors match
-        */
-        TInt Compare( const TDesC& aLeft, const TDesC& aRight );
-        
-        /**
-        * Sync state
-        * @param None
-        * @return ETrue if sync is running
-        */          
-        TBool SyncRunning();
-        
-        /**
-        * Utility function.
-        * @param aSyncObserver
-        * @return None
-        */
-		void RequestSyncStatus( MNSmlDMSyncObserver* aSyncObserver );
-		
-		void SyncCompleted( TNSmlStatus aStatus );
-
-        /**
-        * Hides or shows the device management progress dialog.
-        * @since Series 60 3.1
-        * @param aShow ETrue -> The progress dialog is shown; EFalse -> The dialog is hidden.
-        * @return None
-        */
-        void ShowProgressDialogL( TBool aShow );
-        
-    private:
-
-        /**
-        * C++ default constructor.
-        */
-        CNSmlDMSyncAppEngine();
-
-        /**
-        * By default Symbian 2nd phase constructor is private.
-        */
-        void ConstructL( CNSmlDMSyncDocument* aSyncDocument );
-
-
-    private:    // Data
-        // SyncML Session
-        RSyncMLSession          iSyncMLSession;
-        // Sync profile
-        CNSmlDMSyncProfile*     iProfile;
-        // Sync handler
-        CNSmlDMSyncHandler*     iSyncHandler;
-        TBool               iProgressShown;
-        // Sync Observer
-        MNSmlDMSyncObserver*    iSyncObserver;
-    };
-
-#endif      // CNSMLDMSYNCAPPENGINE_H
-
-// End of File
--- a/omadm/omadmappui/inc/NSmlDMSyncAppServer.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-/*
-* 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:  Header file for CNSmlDMSyncAppServer
-*
-*/
-
-
-#ifndef CNSMLDMSYNCAPPSERVER_H
-#define CNSMLDMSYNCAPPSERVER_H
-
-// INCLUDES
-
-#include <AknDoc.h>
-#include <aknapp.h>
-#include <AknServerApp.h>
-
-// CLASS DECLARATION
-
-/**
-* Device Management Aplication Server
-*
-*/
-NONSHARABLE_CLASS (CNSmlDMSyncAppServer) :  public CAknAppServer
-	{
-		
-    public: //from CAknServerApp
-        /**
-        * CreateServiceL.
-        * @param    aServiceType
-        * @return   CApaAppServiceBase*
-        */
-        CApaAppServiceBase* CreateServiceL( TUid aServiceType ) const;
-        
-        /**
-        * ConstructL.
-        * @param    aFixedServerName Server name
-        * @return   None
-        */        
-        void ConstructL(const TDesC& aFixedServerName);
-
-        /**
-        * Implementing this prevents framework for closing application
-        * after last client is destroyed.
-        * @param    None
-        * @return   None
-        */               
-        void HandleAllClientsClosed();
-	};
-
-#endif  //CNSMLDMSYNCAPPSERVER_H
-
-// End of File
--- a/omadm/omadmappui/inc/NSmlDMSyncAppUi.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,337 +0,0 @@
-/*
-* Copyright (c) 2005-2006 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:  Header file for Application UI Class CNSmlDMSyncAppUi
-*
-*/
-
-
-
-#ifndef __NSMLDMSYNCAPPUI_H
-#define __NSMLDMSYNCAPPUI_H
-
-// INCLUDES
-#include <bldvariant.hrh>
-
-#include <aknViewAppUi.h>
-#include <akntitle.h>
-
-#include "NSmlDMdef.h"
-#include "NSmlDMSyncAppEngine.h"
-
-// FORWARD DECLARATIONS
-class CAknNavigationControlContainer;
-class CAknNavigationDecorator;
-
-class CNSmlDMProfilesView;
-class CNSmlDMDlgProfileView;
-class CNSmlDMSyncDocument;
-class CNSmlDMSyncAppEngine;
-class CNSmlDMFotaModel;
-class CNSmlDMDbNotifier;
-class CNSmlDMFotaView;
-
-/**
-* Application UI class.
-* Provides support for the following features:
-* - dialog architecture
-* 
-*/
-NONSHARABLE_CLASS (CNSmlDMSyncAppUi) : public CAknViewAppUi,
-    public MNSmlDMSyncObserver
-   
-    {
-	enum TViews
-		{
-		MainView,
-		LogView,
-		SettingsView,
-		ProgressView
-		};
-
-    public: // Constructors and destructor
-	
-        /**
-        * By default Symbian 2nd phase constructor is private.
-        */
-        void ConstructL();
-
-        /**
-        * Destructor.
-        */      
-        virtual ~CNSmlDMSyncAppUi();
-        
-    public: // New functions
-		
-		/**
-		* Used to close the settings view gracefully
-        * @param aRefresh
-        * @return  -
-        */
-		void ChangeViewL( TBool aRefresh = EFalse );
-
-		/**
-		* Help context
-        * @param None.
-        * @return  pointer to CArrayFix<TCoeHelpContext>
-        */
-		CArrayFix<TCoeHelpContext>* HelpContextL() const;
-		/**
-		* Shows profile editing dialog
-        * @param aMode (EEditProfile to edit or ENewProfile to create a profile
-        * @return - 
-        */
-        void ShowEditProfileDialogL( TNSmlEditMode aMode, TInt aStartUp = 0 );
-
-		/**
-		* Public method to access HandleCommandL outside the class
-        * @param aCommand -forwards command from listquery
-        * @return - 
-        */
-        void HandleContextMenu( TInt aCommand ) { HandleCommandL( aCommand ); }
-
-		/**
-		* Called before the application is started
-        * @param aCommand - StartUp command
-		* @param aDocumentName - Document name
-		* @param aTail - Additional information (profileID)
-        * @return - 
-        */
-		TBool ProcessCommandParametersL( TApaCommand aCommand,
-		                                 TFileName& aDocumentName,
-		                                 const TDesC8& aTail );
-		
-		/**
-		* Called by settingsdialog to set if the settingdialog is properly closed
-        * @param -
-        * @return - 
-        */
-		void DoExit() { iDestroyed = 0; 
-			              CloseGs();
-			              
-			            }
-
-		/**
-		* Called to exit Dm application and control panel
-        * @param -
-        * @return - 
-        */
-        void CloseGs();
-
-
-		/**
-		* Shows error note
-        * @param TInt aResource resource id
-		* @return -
-        */
-		void ShowResourceErrorNoteL( TInt aResource ) const;
-
-        /**
-        * Returns the iFotaModel pointer.
-        * @param None.
-        * @return Pointer to the CNSmlDMFotaModel instance or NULL if it does not exist.
-        */
-        CNSmlDMFotaModel* FotaModel() const;
-        
-        /**
-        * Saves the current state of update packages.
-        * @param None.
-        * @return None.
-        */
-        void MarkFwUpdChangesStartL();
-
-        /**
-        * Checks if the state of update packages has changed since the saved
-        * situation.
-        * @param None.
-        * @return True if there are differences in pcakage identifiers or states.
-        */
-        TBool FwUpdStatesChangedL();
-        
-
-        void SetTitleCall(TInt aView)
-        {
-        iViewTitle = aView;	
-        }
-
-
-    public: // Functions from base classes
-		
-		/**
-		* Initiates a device management session with a server.
-        * @param aProfileId Profile identifier, with which the session is be
-        *                   started. If left empty, defaults to Currently
-        *                   selected profile in the list.
-        * @param aUseFotaProgressNote If true, the progress notes are replaced
-        *                             with a simpler FOTA specific note and
-        *                             changes in firmware update packages are
-        *                             checked after the session.
-        * @return None
-        */
-		void StartSyncL( const TInt aProfileId = KErrNotFound,
-		                 const TBool aUseFotaProgressNote = EFalse );
-
-		/**
-		* Confirms if the synchronisation on and the progress dialog is up
-        * @param None
-        * @return ETrue if sync running
-        */
-		TBool Synchronise();
-			
-		/**
-		* Handles error notes
-        * @param aError error number
-        * @return -
-        */
-		void ShowErrorNoteL( TInt aError ) const;
-
-        void SyncComplete( TNSmlStatus aStatus );
-        
-        /**
-		* Sets the iExitPress value of fota view
-        * @param None
-        * @return -
-        */        
-        void ExitCallL();        
-        
-        /**
-		* Refrsehes Main view 
-        * @param None
-        * @return -
-        */
-        void RefreshMainViewL();
-        
-        /**
- 		* Used to check the fota download going 
-        * @param aNone
-        * @return  aNone
-        */
-        void CheckFotaDlL();        
-        
-        void CheckAMDlL();    
-    private:
-
-               
-		/**
-		* From MEikMenuObserver, called by the framework before
-		*                        the options menu is shown
-        * @param aResourceId - resourceid of the menu
-		* @param aMenuPane - pointer to that menu
-        * @return - 
-        */
-        void DynInitMenuPaneL( TInt aResourceId, CEikMenuPane* aMenuPane );
-
-    private:
-
-        /**
-        * From CEikAppUi, takes care of command handling.
-        * @param aCommand - id of the  command to be handled
-		* @return -
-        */
-        void HandleCommandL( TInt aCommand );
-
-        /**
-        * From CEikAppUi, handles key events.
-        * @param aKeyEvent - Event to handled.
-        * @param aType - Type of the key event. 
-        * @return Reponse code (EKeyWasConsumed, EKeyWasNotConsumed). 
-        */
-        virtual TKeyResponse HandleKeyEventL( const TKeyEvent& aKeyEvent, 
-                                              TEventCode aType );
-                                              
-	private:
-
-		/**
-        * Handles up scroll and forwards the action to right view
-        * @param -
-		* @return -
-        */
-		void HandleUpScrollL();
-
-		/**
-        * Handles down scroll and forwards the action to right view
-        * @param -
-		* @return -
-        */
-		void HandleDownScrollL();
-
-		/**
-        * Handles the error in synchronisation
-        * @param aProfileId the id of the 
-		* @return 0 if no error or user cancellation
-        */
-		TInt HandleSyncErrorL( TInt aProfileId );
-
-		/**
-        * Handles the error message text in synchronisation
-        * @param aError Error value
-		* @param aMsg the error message
-		* @return -
-        */
-		void SetErrorMessageL( TInt aError, TDes& aMsg ) const;
-
-		/**
-		* Shows confirmation dialog
-        * @param aResource prompt resource id
-		* @return ETrue in case note is accepted or EFalse if rejected
-        */
-		TBool ShowConfirmationNoteL( TInt aResource ) const;
-		
-		/**
-		* Utility function for handling New profile command
-        * @param    None
-		* @return   None
-        */
-        void HandleCommandNewProfileL();
-        
-		/**
-		* Utility function for handling erase profile command
-        * @param    None
-		* @return   None
-        */        
-        void HandleCommandEraseProfileL();
-
-	private: //Data
-	    CNSmlDMProfilesView*        iProfilesView;
-	
-		CNSmlDMDlgProfileView*      iAppView;
-		CNSmlDMDbNotifier*          iSmlDbNotifier;
-		CEikStatusPane*             iStatusPane;
-		CAknNavigationControlContainer* iNaviPane;  // NaviPane
-		CAknNavigationDecorator*    iNaviDecorator;
-
-		TInt iViewTitle;// 1 for DM main view, 0-for servers view
-
-		CNSmlDMFotaView* iMainView;
-		//	Left/RightSoftkeys and scrolling
-		CEikButtonGroupContainer*   iControlPane;
-		TInt                        iActiveView;
-		CAknTitlePane*              iTitlePane;
-		
-		TInt                        iDialogUp;
-		TInt                        iDestroyed;
-		TInt                        iConfedProfileId;
-		TBool                       iDbChanged;
-		TBool                       iBusy;
-		
-		CNSmlDMSyncDocument*        iSyncDocument;
-		CNSmlDMSyncAppEngine*       iSyncAppEngine;
-
-        // Pointer to the fota model.
-        CNSmlDMFotaModel*           iFotaModel;
-        
-    };
-
-#endif
-
-// End of File
--- a/omadm/omadmappui/inc/NSmlDMSyncDebug.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,84 +0,0 @@
-/*
-* 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:  This file defines logging macros for DM
-*
-*/
-
-
-
-#ifndef NSMLDMSYNCDEBUG_H
-#define NSMLDMSYNCDEBUG_H
-
-#ifdef _DEBUG
-// ===========================================================================
-#ifdef __WINS__     // File logging for WINS
-// ===========================================================================
-#include <e32std.h>
-#include <f32file.h>
-#include <flogger.h>
-
-_LIT( KLogFile, "OmaDMApp.log" );
-_LIT( KLogDirFullName, "c:\\logs\\" );
-_LIT( KLogDir, "OmaDMApp" );
-
-#define FLOG( a )   { FPrint( _L(a) ); }
-#define FTRACE( a ) { a; }
-
-// Declare the FPrint function
-//
-inline void FPrint( const TRefByValue<const TDesC> aFmt, ... )
-    {
-    VA_LIST list;
-    VA_START( list, aFmt );
-    RFileLogger::WriteFormat( KLogDir,
-                              KLogFile,
-                              EFileLoggingModeAppend,
-                              aFmt,
-                              list );
-    }
-
-// ===========================================================================
-#else               // RDebug logging for target HW
-// ===========================================================================
-#include <e32svr.h>
-
-#define FLOG( a )   { RDebug::Print( _L(a) ); }
-#define FTRACE( a ) { a; }
-
-// Declare the FPrint function
-//
-inline void FPrint( const TRefByValue<const TDesC> aFmt, ... )
-    {
-    VA_LIST list;
-    VA_START( list, aFmt );
-    TInt tmpInt = VA_ARG( list, TInt );
-    TInt tmpInt2 = VA_ARG( list, TInt );
-    TInt tmpInt3 = VA_ARG( list, TInt );
-    VA_END( list );
-    RDebug::Print( aFmt, tmpInt, tmpInt2, tmpInt3 );
-    }
-
-#endif //__WINS__
-
-// ===========================================================================
-#else // // No loggings --> Reduced binary size
-// ===========================================================================
-#define FLOG( a )
-#define FTRACE( a )
-
-#endif // _DEBUG
-
-#endif      // NSMLDMSYNCDEBUG_H
-            
-// End of File
\ No newline at end of file
--- a/omadm/omadmappui/inc/NSmlDMSyncDialog.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,138 +0,0 @@
-/*
-* Copyright (c) 2005-2006 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:  Sync Log handler class
-*
-*/
-
-
-#ifndef NSMLDMSYNCDIALOG_H
-#define NSMLDMSYNCDIALOG_H
-
-//  INCLUDES
-#include <e32base.h>
-#include <badesca.h>
-
-#include "NSmlDMdef.h"
-
-// FORWARD DECLARATIONS
-class RSyncMLSession;
-class RSyncMLHistoryLog;
-class CSyncMLHistoryJob;
-class CNSmlDMSyncProfile;
-
-// CLASS DECLARATION
-
-/**
-*  CNSmlDMSyncDialog
-*  
-*/
-NONSHARABLE_CLASS (CNSmlDMSyncDialog) : public CBase
-    {
-    
-	// this must match with resource r_sml_log_items
-	enum TLogItem
-		{
-	    EHeadingProfile = 0,
-	    EHeadingServer = 1,
-	    EHeadingDate = 2,
-		EHeadingTime = 3,
-		EHeadingStatus = 4
-		};
-
-	public:
-	    /**
-        * Launches log dialog.
-		* @param aProfileId Profile id
-		* @param aSyncSession Server session
-        * @return Completion code.
-        */
-		static TBool ShowDialogL( TInt aProfileId,
-		                          RSyncMLSession* aSyncSession );
-
-    
-	public:// Constructors and destructor
-
-        /**
-        * Two-phased constructor.
-        */
-        static CNSmlDMSyncDialog* NewL( TInt aProfileId,
-                                        RSyncMLSession* aSyncSession );
-        
-        /**
-        * Destructor.
-        */
-        virtual ~CNSmlDMSyncDialog();
-    
-    private:
-
-        /**
-        * C++ default constructor.
-        */
-        CNSmlDMSyncDialog( TInt aProfileId, RSyncMLSession* aSyncSession );
-	
-        /**
-        * By default Symbian OS constructor is private.
-        */
-        void ConstructL();
-
-	private:
-	    /**
-        * Shows popup-style log view.
-		* @param None.
-        * @return None.
-        */
-		void PopupLogViewL();
-
-		/**
-        * Adds general log data into listbox array.
-		* @param aArray Listbox array.
-        * @return None.
-        */
-		void FormatLogViewListL( CDesCArray* aArray );
-      
-		/**
-        * Gets latest history (sync) job.
-		* @param aHistoryLog.
-        * @return History job.
-        */
-        CSyncMLHistoryJob* LatestHistoryJob( RSyncMLHistoryLog& aHistoryLog );
-		
-		/**
-        * Reads resource text with the given resource id.
-		* @param aText Associated resource text.
-		* @param aResourceId Given resource id.
-        * @return None.
-        */
-        void ReadL( TDes& aText, TInt aResourceId );
-
-	private:
-        // profile id
-		TInt                        iProfileId;
-		
-		// sync profile
-		CNSmlDMSyncProfile*         iProfile;
-
-		// session with sync server
-		RSyncMLSession*             iSyncSession;
-		
-		// history job (contains sync information)
-		const CSyncMLHistoryJob*    iHistoryJob;
-
-		// log item headers (from resource file)
-		CDesCArrayFlat*             iLogItems;
-	};
-
-#endif      // NSMLDMSYNCDIALOG_H
-            
-// End of File
--- a/omadm/omadmappui/inc/NSmlDMSyncDocument.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,338 +0,0 @@
-/*
-* Copyright (c) 2002-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:  Header file for CNSmlDMSyncDocument
-*
-*/
-
-
-
-#ifndef NSMLDMSYNCDOCUMENT_H
-#define NSMLDMSYNCDOCUMENT_H
-
-// INCLUDES
-#include <aknapp.h>
-#include <AknDoc.h>
-
-#include "NSmlDMSyncUi.hrh"
-#include "NSmlDMDlgProfileView.h"
-#include "NSmlDMUIDefines.h"
-#include "NSmlDMDbNotifier.h"
-
-// FORWARD DECLARATIONS
-class CEikAppUi;
-class CEikonEnv;
-class CNSmlDMSyncAppEngine;
-class CNSmlDMSyncProfileList;
-class CNSmlDMFotaModel;
-
-// CLASS DECLARATION
-
-
-/**
-*  TNSmlDMProfileItem helper class
-*/
-NONSHARABLE_CLASS (TNSmlDMProfileItem)
-	{
-	public:
-		TBuf<KNSmlMaxProfileNameLength> iProfileName;	
-		TInt     iProfileId;
-		TBool	 iSynced;
-		TTime	 iLastSync;
-		TInt	 iBearer;
-		TInt	 iActive;
-		TTime    iLastSuccessSync;
-		TBool    iDeleteAllowed;
-		TBool    iProfileLocked; 
-	};
-
-/**
-*  CNSmlDMSyncDocument application class.
-*/
-NONSHARABLE_CLASS (CNSmlDMSyncDocument) : public CAknDocument,
-                                          public MNSmlDMDbEventHandler
-    {
-    enum TSanSupport
-			{
-			EOff,					
-	        EOn
-			};	
-    public: // Constructors and destructor
-
-        /**
-        * Two-phased constructor.
-        */
-        static CNSmlDMSyncDocument* NewL( CAknApplication& aApp );
-
-        /**
-        * Destructor.
-        */
-        virtual ~CNSmlDMSyncDocument();
-
-    public: // New functions
-
-		/**
-		* Returns the pointer to the appengine
-        * @param -
-		* @return Pointer to appEngine
-        */
-		inline CNSmlDMSyncAppEngine* AppEngine() const { return iAppEngine; }
-
-		/**
-		* Returns the id of the recently accessed profile
-        * @param -
-		* @return - old profile id
-        */
-		inline TInt OldProfileID() const { return iOldProfileId; }
-
-		/**
-		* Return the number of items
-		* @param -
-		* @return Profile item count
-		*/
-		inline TInt ProfileCount() const { return iProfileList->Count(); }
-
-        /**
-        * Returns the pointer to the fota model.
-        * @since Series 60 3.1
-        * @param None.
-        * @return Pointer to the fota model instance.
-        */
-        CNSmlDMFotaModel* FotaModel() const;
-        
-        /**
-        * Saves the current state of update packages.
-        * @param None.
-        * @return None.
-        */
-        void MarkFwUpdChangesStartL();
-
-        /**
-        * Checks if the state of update packages has changed since the saved
-        * situation.
-        * @param None.
-        * @return True if there are differences in pcakage identifiers or states.
-        */
-        TBool FwUpdStatesChangedL();
-
-		/**
-		* Return the pointer to the profileitem list
-        * @param aIndex Sets current index on the caller
-		* @return Pointer to the profileitem list
-        */
-		CArrayFixFlat< TNSmlDMProfileItem >* ProfileList( TInt& aIndex );
-
-		/**
-		* Set current index
-        * @param aIndex - new index value
-		* @return -
-        */
-		void SetCurrentIndex(TInt aIndex);
-
-		/**
-		* Reads profiles again from the database and fills the profilelist
-        * @param -
-		* @return -
-        */
-		inline void RefreshProfileListL() { ReadProfileListL(); }
-		
-		/**
-		* Reads profiles again from the database and fills the profilelist
-        * @param aIncludeHidden Should hidden profile be included
-		* @return -
-        */
-		inline void RefreshProfileListL( TBool aIncludeHidden ) { ReadProfileListL( aIncludeHidden ); }
-
-		/**
-		* Deletes selected profile and updates new index
-        * @param  aIndex Set new index
-		* @return (1 the deleted profile was default one /
-		* 0 deleted was other than default or there was only one left)
-        */
-		TInt DeleteProfile( TInt& aIndex );
-
-		/**
-		* Return the current profile item
-		* @param -
-		* @return Pointer to the current TProfileItem profile item
-		*/
-		TNSmlDMProfileItem* ProfileItem() const;
-
-		/**
-		* Return the current profile item
-		* @param -
-		* @return Pointer to the indexed TProfileItem profile item
-		*/
-		TNSmlDMProfileItem* ProfileItemAt( TInt aIndex ) const;
-
-		/**
-		* Return the pointer to the CEikAppUi class
-		* @param -
-		* @return Pointer to the CEikAppUi
-		*/
-		CEikAppUi* AppUi() const { return iAppUi; }
-
-		/**
-		* Moves the index on the main view to the profile
-		* with specified profile Id
-		* @param aProfileId profile id
-		* @return -
-		*/
-		void MoveIndexToProfile( TInt aProfileId );
-
-		/**
-		* Copies an existing profile settings to a new id
-		* @param  aProfileId profile id
-		* @return -
-		*/
-		void GetCopyProfileL( TInt& aProfileId );
-
-		/**
-		* Return next available default profile name
-		* @param -
-		* @return - new default profile name
-		*/
-		HBufC* GetNextProfileNameLC();
-
-        /**
-		* Disables DB events
-		* @param aEvent 
-		* @return None
-		*/
-        void DisableDbNotifications( TBool aEvent );
-        
-		/**
-		* Handles DB events
-		* @param aEvent DB event
-		* @return None
-		*/
-        void HandleDbEventL( TNSmlDMDbEvent aEvent );
-        
-        /**
-        * Utility function.
-        * @param -
-        * @return None.
-        */                                
-        TBool IsServerAlertSync();
-  
-        /**
-        * Utility function.
-        * @param -
-        * @return None.
-        */           
-        void StartServerL();
-        
-        /**
-        * ServerAlert Support function
-        * @param -
-        * @return TBool.
-        */
-        TBool SANSupport();
-        
-        /**
-        * ServerAlert type return function
-        * @param -
-        * @return TBool.
-        */
-        TBool SilentSession();
-        
-         /**
-        * ServerAlert type variable reset function
-        * @param -
-        * @return None.
-        */
-        void ResetSession();
-        
-        /**
-        * Server profiles view current index
-        * @param -
-        * @return index of the current focussed profile.
-        */
-        TInt CurrentIndex();
-        
-        /**
-         * FOTA set DL active P&S key defined by DM or not
-         * @param None
-         * @return ETrue or EFalse.
-         */
-         TBool DMDefinesFotaDLKey();
-        
-    private:
-        /**
-        * C++ default constructor.
-        */
-        CNSmlDMSyncDocument(CEikApplication& aApp): CAknDocument(aApp) { }
-
-        /**
-        * By default Symbian 2nd phase constructor is private.
-        */
-        void ConstructL();
-
-		/**
-		* Read settings from the database
-        * @param -
-		* @return -
-        */
-		void ReadProfileListL();
-
-		/**
-		* Read settings from the database
-        * @param aIncludeHidden Should hidden profile be included
-		* @return -
-        */
-		void ReadProfileListL( TBool aIncludeHidden );
-
-		/**
-        * From CEikDocument, create CNSmlDMSyncAppUi "App UI" object.
-        */
-        CEikAppUi* CreateAppUiL();
-        
-		/**
-		* Restore
-        * @param aStore Stream  store
-        * @param aStreamDic Dictionary
-		* @return None
-        */
-        void RestoreL( const CStreamStore& aStore, 
-                       const CStreamDictionary& aStreamDic );
-		
-    private:
-        //Application engine
-		CNSmlDMSyncAppEngine*               iAppEngine;
-		// Profile list
-		CNSmlDMSyncProfileList*             iSyncProfileList;
-		// DB notifier
-		CNSmlDMDbNotifier*                  iDbNotifier;
-		//Profile list array
-		CArrayFixFlat<TNSmlDMProfileItem>*  iProfileList;
-		// Current index
-		TInt                                iCurrentIndex;	
-		// Eikon environment
-		CEikonEnv*                          iEikEnv;
-		// Old profile id
-		TInt                                iOldProfileId;	
-		// Blocks db events
-		TBool                               iDbEventsBlocked;
-		
-		CApaAppServer*                      iServer;
-		//Server alert support
-		TInt  								iSanSupport;
-		//Silent session or not
-		TBool								iSilent;
-		//FOTA DL Active P&S key defined by DM or not
-		TBool 							iDMDefinesFotaDLKey;
-    };
-
-#endif // NSMLDMSYNCDOCUMENT_H
-
-// End of File
--- a/omadm/omadmappui/inc/NSmlDMSyncHandler.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,390 +0,0 @@
-/*
-* 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:  Synchronization handler
-*
-*/
-
-
-#ifndef NSMLDMSYNCHANDLER_H
-#define NSMLDMSYNCHANDLER_H
-
-// INCLUDES
-#include <e32base.h>
-#include <AknProgressDialog.h>
-#include <SyncMLObservers.h>
-#include "NSmlDMProgress.h"
-#include "NSmlDMSyncUtil.h"
-#include "NSmlDMSyncProfile.h"
-
-// FORWARD DECLARATIONS
-class CNSmlDMSyncState;
-class CNSmlDMActiveCaller;
-class CEikonEnv;
-class CNSmlDMSyncDocument;
-class CAknWaitDialog;
-
-// CLASS DECLARATION
-
-/**
-* CNSmlDMSyncHandler class
-* 
-*/
-NONSHARABLE_CLASS (CNSmlDMSyncHandler) : public CBase, 
-                        public MNSmlDMProgressDialogObserver,
-						public MNSmlDMActiveCallerObserver,
-						public MSyncMLEventObserver,
-						public MSyncMLProgressObserver,
-						public MProgressDialogCallback
-						
-	{
-    public:
-        /**
-        * Two-phased constructor.
-        */
-	    static CNSmlDMSyncHandler* NewL( RSyncMLSession* aSyncSession,
-	                                     CNSmlDMSyncAppEngine* aAppEngine,
-	                                     CNSmlDMSyncDocument* aSyncDocument );
-
-	    /**
-        * Destructor.
-        */
-	    virtual ~CNSmlDMSyncHandler();
-
-    private:
-	    /**
-        * By default Symbian 2nd phase constructor is private.
-        */
-	    void ConstructL();
-
-	    /**
-        * C++ default constructor.
-        */
-	    CNSmlDMSyncHandler( RSyncMLSession* iSyncSession,
-                            CNSmlDMSyncAppEngine* aAppEngine,
-	                        CNSmlDMSyncDocument* aSyncDocument );
-
-		
-	private:	
-        /**
-        * From MAspProgressDialogObserver
-    	* Gets called when sync progress dialog closes.
-        * @param aButtonId Button id.
-        * @return None
-        */
-		void HandleDialogEventL( TInt aButtonId );
-
-    
-	private: // from MAspActiveCallerObserver
-		/**
-        * From MAspActiveCallerObserver
-		* Called when CAspActiveCaller completes.
-        * @param None
-        * @return None.
-        */
-		void HandleActiveCallL();
-
-
-    private:    // from MSyncMLEventObserver
-        
-		/**
-        * From MSyncMLEventObserver
-		* Called when SyncML session events oocur.
-        * @param aEvent Sync event
-        * @param aIdentifier Identifier for the sync event
-        * @param aError Synce event error
-        * @param aAdditionalData.
-        * @return None.
-        */
-        void OnSyncMLSessionEvent( TEvent aEvent,
-                                   TInt aIdentifier,
-                                   TInt aError,
-                                   TInt aAdditionalData );
-	
-	
-    private:  //from MSyncMLProgressObserver
-	    
-	    /**
-	    * Receives notification of a synchronisation error.
-        * @param aErrorLevel  The error level.
-	    * @param aError		  The type of error. This is one of 
-	    *                     the SyncMLError error values.	
-	    * @param aTaskId      The ID of the task for which the error occurred.
-	    * @param aInfo1       An integer that can contain additional
-	    *                     information about the error. Normally 0.
-	    * @param aInfo2       An integer that can contain additional
-	    *                     information about the error. Normally 0.
-	    * @return             None.
-	    */
-	    void OnSyncMLSyncError( TErrorLevel aErrorLevel,
-	                            TInt aError,
-	                            TInt aTaskId,
-	                            TInt aInfo1,
-	                            TInt aInfo2 );
-       	
-       	/**
-	    * Receives notification of synchronisation progress.
-	    * @param aStatus	The current status, e.g. 'Connecting'.
-	    * @param aInfo1	    An integer that can contain additional
-	    *                   information about the progress.
-	    * @param aInfo2	    An integer that can contain additional
-        *                   information about the progress.
-	    */
-	    void OnSyncMLSyncProgress( TStatus aStatus, TInt aInfo1, TInt aInfo2);
-	    
-	    /**
-	    * Receives notification of modifications to synchronisation tasks.
-        * @param aTaskId               The ID of the task.
-	    * @param aClientModifications  Modifications made on 
-	    *                              the clients Data Store.
-	    * @param aServerModifications  Modifications made on
-	    *                              the server Data Store.
-	    */
-	    void OnSyncMLDataSyncModifications( 
-	                TInt /*aTaskId*/,
-	                const TSyncMLDataSyncModifications& aClientModifications,
-	                const TSyncMLDataSyncModifications& aServerModifications );
-        
-	private:
-
-        /**
-        * Shows error dialog.
-		* @param None.
-        * @return Error code.
-        */
-        void HandleSyncErrorL();
-        
-        /**
-        * Called when sync completes
-		* @param aError.
-        * @return None.
-        */        
-        void SynchronizeCompletedL(TInt aError);
-
-        /**
-        * Gets sync error text.
-		* @param aError.
-        * @return Error text.
-        */
-        void GetErrorText( TDes& aErrorText,
-                           TInt aErrorCode,
-                           TInt aTransport );
-        
-        /**
-        * Read sync error from CNSmlSyncLog and show error message.
-		* @param aProfileId Profile id.
-        * @return Result code.
-        */
-		TInt HandleSyncErrorL(TInt aProfileId);
-
-        /**
-        * Set synchronisation error message text.
-		* @param aError Error code.
-		* @param aMsg Error text.
-        * @return None.
-        */
-		void SetErrorMessageL(TInt aError, TDes& aMsg);
-	
-	
-	public:
-        /**
-        * Performs synchronization.
-        * @param aServerName Name of the server
-		* @param aProfileId Profile identifier.
-		* @param aConnectionBearer Bearer
-		* @param aUseFotaProgressNote Should the simplified progress note used. Only
-		*                             used when checking for firmware updates.
-        * @return None
-        */
-		void SynchronizeL( TDesC& aServerName,
-		                   const TInt aProfileId,
-		                   const TInt aConnectionBearer,
-                           const TBool aUseFotaProgressNote );
-		
-        /**
-        * Performs ServerInitiated synchronization.
-        * @param aServerName Name of the server
-		* @param aProfileId Profile id
-		* @param aJobId Job id.
-		* @param aConnectionBearer Bearer
-		* @param aUseFotaProgressNote Should the simplified progress note used. Only
-		*                             used when checking for firmware updates.
-        * @return None
-        */		
-		void SynchronizeL( TDesC& aServerName, 
-		                   const TInt aProfileId,
-		                   const TInt aJobId,
-		                   const TInt aConnectionBearer,
-                           const TBool aUseFotaProgressNote );
-		
-        /**
-        * Shows the progress dialog.
-		* @param None.
-        * @return None.
-        */
-        void ShowProgressDialogL();
-
-        /**
-        * Deletes the progress dialog if it exists.
-		* @param None.
-        * @return None.
-        */
-        void HideProgressDialogL();
-        
-		/**
-        * Cancel synchronization.
-		* @param None 
-        * @return None
-        */
-		void CancelSynchronizeL();
-		
-        /**
-        * From MProgressDialogCallback. Handles the situation when the dialog
-        * is dismissed.
-        * @param aButtonId The identifier of the button, with which the dialog
-        *                  was dismissed.
-        * @return None
-        */
-        void DialogDismissedL( TInt aButtonId );
-		
-	private:
-        
-        /**
-        * Performs synchronization.
-        * @return None
-        */	
-		void SynchronizeL();
-		
-		/**
-        * Utility function.
-        * @return Sync session.
-        */
-		RSyncMLSession& Session();
-		
-		/**
-        * Utility function.
-        * @return Progress dialog.
-        */
-		CNSmlDMProgressDialog* Dialog();
-
-		/**
-        * Utility function.
-        * @return Sync state.
-        */
-		CNSmlDMSyncState* State();
-
-    public:
-
-		/**
-        * Utility function.
-        * @return ETrue if sync is currently running, EFalse otherwise.
-        */
-		TBool SyncRunning();
-
-    private:
-    
-		/**
-        * Checks the progress state and returns a corresponding
-        * dialog text string.
-        * @param Reference to the descriptor where the result is stored.
-    	* @return None.
-        */
-        void GetStatusDialogTextL( TDes& aBuffer );
-    
-		/**
-        * Updates progress dialog.
-        * @param None.
-    	* @return None.
-        */
-		void UpdateDialogL();
-
-		/**
-        * Utility function.
-        * @param aText text to show
-        * @param aResourceId resource id
-        * @return None.
-        */
-        void ReadL( TDes& aText, TInt aResourceId );
-
-		/**
-        * Utility function.
-        * @param aText text to show
-        * @param aContent 
-        * @param aCurrent Progress phase
-        * @param aFinal Progress phase
-        * @param aPhase Progress phase
-        * @return None.
-        */
-        void ReadProgressTextL( TDes& aText,
-                                const TDesC& aContent,
-                                TInt aCurrent,
-                                TInt aFinal,
-                                TInt aPhase );
-
-    private:
-		// session with sync server
-		RSyncMLSession*                 iSyncSession;
-		// app engine
-		CNSmlDMSyncAppEngine*           iSyncAppEngine;
-        // Pointer to the application document class
-        CNSmlDMSyncDocument*            iSyncDocument;
-		// profile id
-		TInt                            iProfileId;
-		// sync job id
-		TInt                            iSyncJobId;
-		// sync job
-		RSyncMLDevManJob                iSyncJob;
-		// shows sync progress dialog
-		CNSmlDMProgressDialog*          iProgressDialog;
-				
-        // The alternative wait dialog used in FOTA
-        CAknWaitDialog*                 iWaitDialog;
-         
-        // The progress wait dialog used for any session from main view
-        CNSmlDMProgressDialog*          iFotaProgressDialog;
-        
-        // CheckUpdate state shown or Not
-        TBool iCheckUpdate;
-                        
-		// sync handler state
-		CNSmlDMSyncState*               iState;
-		// for making function call via active scheduler
-		CNSmlDMActiveCaller*            iActiveCaller;
-		// is sync currently running
-		TBool                           iSyncRunning;
-		// sync error code
-		TInt                            iSyncError;
-		// long buffer for string handling
-		TBuf<KBufSize256>               iBuf;
-		//Job id
-        TSmlJobId                       iJobId;
-        // Bearer
-        TInt                            iConnectionBearer;
-        // Server name
-        TBuf<KNSmlMaxProfileNameLength> iServerName;
-        // Server sync
-        TBool                           iServerAlertedSync;
-        // Should the simpler FOTA progress not be used
-        TBool                           iUseFotaProgressNote;
-        // Retry sync (authentication error)
-        TBool							iRetrySync;
-          // Variable to show whether in fotaview or not        
-        TInt  iNotinFotaView;
-        
-        // Identifies Fota progress note launched or not
-        TBool iFotaProgressLaunched;
-	};
-
-#endif  // NSMLDMSYNCHANDLER_H
-
-// End of file
--- a/omadm/omadmappui/inc/NSmlDMSyncPrivateCRKeys.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,82 +0,0 @@
-/*
-* Copyright (c) 2005-2006 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:  Device manager private CenRep key definitions
-*
-*/
-
-
-#ifndef NSMLDMSYNCAPP_PRIVATE_CR_KEYS_H
-#define NSMLDMSYNCAPP_PRIVATE_CR_KEYS_H
-
-// CONSTANTS
-
-// Device manager key UID
-const TUid KCRUidNSmlDMSyncApp = {0x101f6de5};
-//browser uid 
-const TUid browseruid = {0x10008d39}; 
-//java uid 
-const TUid  javauid =   {0x2001FD68};
-//flash uid 
-const TUid  flashuid = {0x101FD693}; 
-
-// CenRep key used in variation of the aspects of
-// the firmware update feature. The flag values are
-// commented below.
-const TUint32 KNSmlDMFotaConfigurationKey = 0x00000001;
-
-// Enables the menu option Check updates.
-const TUint KNSmlDMFotaEnableManualCheckFlag         = 0x0001;
-// Enables the menu option that allows the user to access the default
-// profile used in FOTA sessions.
-const TUint KNSmlDMFotaUnlockedDefaultProfileFlag    = 0x0002;
-// Enables the FOTA view.
-const TUint KNSmlDMFotaEnableFotaViewFlag            = 0x0004;
-
-// CenRep keys for default dm profile used in the
-// firmware update over the air.
-const TUint32 KNSmlDMDefaultFotaProfileKey = 0x00000002;
-
-// CenRep key that can be used to hide a DM profile from the
-// profile list on the UI, but still retaining the UI functionality
-// during server alerted session. The server identifier used
-// to authenticate the server should be stored here.
-const TUint32 KNSmlDMFotaHiddenProfileIdKey = 0x00000003;
-
-// CenRep key that can be used to Enable/Disable the 
-// Connect menu in servers view options.Default value is 1
-// which Enables the Connect menu
-const TUint32 KNSmlDMEnableConnectMenuKey = 0x00000004;
-
-// CenRep key that can be used to Enable/Disable the 
-// Servers menu in Main view options.Default value is 1
-// which Enables the Servers menu
-const TUint32 KNSmlDMServersMenuKey = 0x00000005;
-
-// CenRep key that can be used to Enable/Disable the 
-// Settings menu in Main view options.Default value is 1
-// which Enables the Settings menu
-const TUint32 KNSmlDMSettingsMenuKey = 0x00000006;
-
-// CenRep key that can be used to allow manual check updates 
-// or not.Default value is 1 which Enables the check updates 
-// menu in the main view
-const TUint32 KNsmlDmManualCheckAllowed = 0x00000007;
-
-// CenRep key that can be used to allow to show runtime versions
-// or not.Default value is 0 which makes it off 
-const TUint32 KNsmlDmRuntimeVerSupport = 0x00000008;
-
-#endif // NSMLDMSYNCAPP_PRIVATE_CR_KEYS_H
-            
-// End of File
--- a/omadm/omadmappui/inc/NSmlDMSyncProfile.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,451 +0,0 @@
-/*
-* 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:  Profile container class
-*
-*/
-
-
-
-#ifndef CNSMLDMSYNCPROFILE_H
-#define CNSMLDMSYNCPROFILE_H
-
-//  INCLUDES
-#include <e32base.h>
-#include <SyncMLClient.h>
-#include <SyncMLClientDM.h>
-#include "NSmlDMdef.h"
-
-#include "NSmlDMSyncApp.h"
-
-
-/**
-* CNSmlDMSyncProfile 
-*
-* CNSmlDMSyncProfile is used for getting/setting sync profile settings.
-*/
-NONSHARABLE_CLASS (CNSmlDMSyncProfile) : public CBase
-    {
-	enum TOpenMode
-		{
-	    EOpenRead,
-	    EOpenReadWrite
-		};
-		
-    public:
-        /**
-        * Two-phased constructor.
-        * @param aParam
-        */
-        static CNSmlDMSyncProfile* NewLC( const TInt aApplicationId,
-                                          RSyncMLSession* aSyncSession);
-
-        /**
-        * Two-phased constructor.
-        * @param aParam
-        */
-        static CNSmlDMSyncProfile* NewL( const TInt aApplicationId,
-                                         RSyncMLSession* aSyncSession );
-
-	    /**
-        * Destructor.
-        */
-        virtual ~CNSmlDMSyncProfile();
-
-    private:
-        /**
-        * C++ default constructor.
-        * @param aParam
-        */
-	    CNSmlDMSyncProfile( const TInt aApplicationId,
-	                        RSyncMLSession* aSyncSession );
-
-        /**
-        * By default Symbian 2nd phase constructor is private.
-        */
-	    void ConstructL();
-	    
-    public:
-        /**
-		* Open profile
-        * @param aProfileId Profile id to open
-        * @param aOpenMode Opening mode
-		* @return None
-        */
-        void OpenL( TInt aProfileId, TInt aOpenMode );
-        
-        /**
-		* Create profile
-        * @param None.
-		* @return Profile ID.
-        */
-        TInt CreateL();
-        
-        /**
-		* Create copy profile
-        * @param aProfileId Profile that is used for copying
-		* @return None
-        */
-        void CreateCopyL( TInt aProfileId );
-        
-        /**
-		* Save profile
-        * @param None
-		* @return None
-        */
-        void SaveL();
-        
-	public:
-        
-        /**
-		* Set name for profile
-        * @param aText name for profile
-		* @return None
-        */
-        void SetNameL(const TDesC& aText);
-        
-        /**
-		* Get profile name
-        * @param aText name for profile
-		* @return None
-        */
-        void GetName( TDes& aText );
-        
-        /**
-		* Set creator id for the profile
-        * @param aCreatorId creator id
-		* @return None
-        */
-        void SetCreatorId(TInt aCraetorId);
-        
-        /**
-		* Get creator id
-        * @param None
-		* @return creator id
-        */
-        TInt CreatorId();
-        
-        /**
-		* Get profile id
-        * @param None
-		* @return Currently open profile id
-        */
-        TInt ProfileId();
-        
-        /**
-		* Check if delete is allowed
-        * @param None
-		* @return ETrue if allowed
-        */
-        TBool DeleteAllowed();
-        
-        
-        TBool ProfileLocked();
-        /**
-		* Has profile been synced
-        * @param None
-		* @return ETrue if synced
-        */
-		TBool IsSynced();
-        
-        /**
-		* Last sync time
-        * @param None
-		* @return Time of sync
-        */
-		TTime LastSync();
-		
-		/**
-		* Last Success sync time
-        * @param None
-		* @return Time of sync
-        */
-		TTime LastSuccessSync();
-
-    // settings that connection dialog displays
-    public:
-        /**
-		* Set server id
-        * @param aText server id
-		* @return None
-        */
-        void SetServerIdL(const TDesC& aText);
-        
-        /**
-		* Get server id
-        * @param aText server id
-		* @return NOne
-        */
-        void GetServerId(TDes& aText);
-        
-        /**
-		* Get server password
-        * @param aText server password
-		* @return None
-        */
-        void GetServerPassword( TDes& aText );
-        
-        /**
-		* Set server password
-        * @param aText server password
-		* @return None
-        */
-        void SetServerPasswordL( const TDesC& aText );
-        
-        /**
-		* Get protocol version
-        * @param None
-		* @return Version
-        */
-        TInt ProtocolVersion();
-        
-        /**
-		* Set Protocol version
-        * @param aProtocolVersion protocol version
-		* @return None
-        */
-        void SetProtocolVersionL( TInt aProtocolVersion );
-        
-        /**
-		* Get bearer type
-        * @param None
-		* @return bearer type
-        */
-        TInt BearerType();
-        
-        /**
-		* Set bearer type
-        * @param aId bearer type
-		* @return None
-        */
-        void SetBearerTypeL( TInt aId );
-        
-        /**
-		* Get accesspoint
-        * @param None
-		* @return accespoint
-        */
-        TInt AccessPointL();
-        
-        /**
-		* Set accesspoint
-        * @param aId accespoint id
-		* @return None
-        */
-        void SetAccessPointL(const TInt aId);
-        
-        /**
-		* Get host address
-        * @param aText host address
-        * @param aPort host port
-		* @return None
-        */
-        void GetHostAddress( TDes& aText, TInt& aPort );
-        
-        /**
-		* set host address
-        * @param aText host address
-        * @param aPort host 
-		* @return None
-        */
-        void SetHostAddressL( const TDesC& aText, const TInt aPort );
-        
-        /**
-		* Get port number 
-        * @param None
-		* @return port number
-        */
-        TInt PortNumber();
-        
-        /**
-		* Set port number
-        * @param aPortNumber port number
-		* @return None
-        */
-        void SetPortNumber( TInt aPortNumber );
-        
-        /**
-		* Get user name
-        * @param aText user name
-		* @return None
-        */
-        void GetUserName( TDes& aText );
-        
-        /**
-		* Set user name
-        * @param aText user name
-		* @return None
-        */
-        void SetUserNameL( const TDesC& aText );
-        
-        /**
-		* Get user password
-        * @param aText user password
-		* @return None
-        */
-        void GetPassword( TDes& aText );
-        
-        /**
-		* Set user password
-        * @param aText user password
-		* @return None
-        */
-        void SetPasswordL( const TDesC& aText );
-        
-        /**
-		* Set server alert state
-        * @param aState server alert state
-		* @return None
-        */        
-        void SetSASyncStateL( TInt aState );
-        
-        /**
-		* Get Server alert state
-        * @param None
-		* @return server alert state
-        */
-        TInt SASyncState();
-        
-        /**
-		* Set http used state
-        * @param aEnable ETrue if http authentication needs to be used
-		* @return None
-        */
-        void SetHttpUsedL( TBool aEnable );
-        
-        /**
-		* Check whether http authentication is used
-        * @param None
-		* @return ETrue if http authentication is used
-        */
-        TBool HttpUsedL();
-        
-        /**
-		* Get http user name
-        * @param aText user name
-		* @return None
-        */        
-        void GetHttpUserNameL( TDes& aText );
-        
-        /**
-		* Set http user name
-        * @param aText user name
-		* @return None
-        */
-        void SetHttpUserNameL( const TDesC& aText );
-        
-        /**
-		* Get http password
-        * @param aText password
-		* @return None
-        */
-        void GetHttpPasswordL( TDes& aText );
-        
-        /**
-		* Set http password
-        * @param aText password
-		* @return None
-        */
-        void SetHttpPasswordL( const TDesC& aText );
- 
-               
-    public:
-       
-        /**
-		* Return latest history job
-        * @param None
-		* @return CSyncMLHistoryJob*
-        */        
-        const CSyncMLHistoryJob* LatestHistoryJob();
-        
-        /**
-		* Open connection
-        * @param None
-		* @return None
-        */
-        void OpenConnection();
-        
-        /**
-		* Open history log
-        * @param None
-		* @return None
-        */
-        void OpenHistoryLog();
-
-        /**
-		* Close history log
-        * @param None
-		* @return None
-        */        
-        void CloseHistoryLog();
-
-        /**
-		* Return DevMan profile
-        * @param None
-		* @return RSyncMLDevManProfile&
-        */
-        RSyncMLDevManProfile& Profile();
-        
-        /**
-		* Return SyncML Session
-        * @param None
-		* @return RSyncMLSession&
-        */
-        RSyncMLSession& Session();
-        
-    public:
-        /**
-		* Get connection name
-        * @param aText name
-        * @param aPropertyPos position at the array
-		* @return None
-        */
-        void GetConnectionPropertyNameL( TDes8& aText, TInt aPropertyPos );
-        
-    private:
-    
-        /**
-		* Copy values from one profile to another
-        * @param aSource source profile
-		* @return None
-        */    
-        void CopyValuesL( CNSmlDMSyncProfile* aSource );
-
-	private:
-	    // profile id
-        TInt                    iProfileId;
-        // Log open
-        TBool                   iHistoryLogOpen;
-        // Connection open
-        TBool                   iConnectionOpen;
-        // Port number
-        TInt                    iPortNumber;
-   		// needed for setting creator id
-		TInt                    iApplicationId;
-		// long buffer for string handling 
-		TBuf<KBufSize255>       iBuf;
-		// long buffer for string handling 
-		TBuf8<KBufSize255>      iBuf8;
-   		// sync session
-		RSyncMLSession*         iSyncSession;
-		// sync profile
-		RSyncMLDevManProfile    iProfile;
-		// history log
-		RSyncMLHistoryLog       iHistoryLog;
-		// sync connection
-		RSyncMLConnection       iConnection;
-    };
-
-#endif  // CNSMLDMSYNCPROFILE_H
-
-// End of file
--- a/omadm/omadmappui/inc/NSmlDMSyncProfileItem.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,93 +0,0 @@
-/*
-* 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:  Represents one sync profile
-*
-*/
-
-
-
-#ifndef TNSMLDMSYNCPROFILEITEM_H
-#define TNSMLDMSYNCPROFILEITEM_H
-
-//  INCLUDES
-#include <e32base.h>
-#include "NSmlDMdef.h"
-
-/**
-* TNSmlDMSyncProfileItem
-*
-* TNSmlDMSyncProfileItem represents one sync profile.
-*/
-NONSHARABLE_CLASS (TNSmlDMSyncProfileItem)
-	{
-	public:
-	    /**
-        * Name
-        * @param None
-		* @return TDesC
-        */
-		const TDesC& Name();
-	    
-	    /**
-        * SetName
-        * @param aName Profile name
-		* @return None
-        */
-		void SetName(const TDesC& aName);
-	    
-	    /**
-        * Id
-        * @param None
-		* @return ID
-        */
-		TInt Id();
-	    
-	    /**
-        * SetId
-        * @param aId Profile id
-		* @return None
-        */		
-		void SetId(TInt aId);
-
-	public:
-	    
-	    /**
-        * CompareItem
-        * @param aFirst
-        * @param aSecond
-		* @return 
-        */
-		static TInt CompareItem( const TNSmlDMSyncProfileItem& aFirst,
-		                         const TNSmlDMSyncProfileItem& aSecond );
-
-	public:
-		TBuf<KBufSize> iProfileName;	
-		TInt     iProfileId;
-		TBool	 iSynced;
-		TTime	 iLastSync;
-	    TTime    iLastSuccessSync;
-		TInt	 iBearer;
-		TInt	 iActive;
-		TBool	 iDefault;
-		TBool    iDeleteAllowed;
-		TBool    iProfileLocked;
-		TInt     iApplicationId;
-		TInt     iImplementationId;
-		TInt     iContentCount;
-		TInt     iMandatoryCheck;
-	};
-
-#endif  // TNSMLDMSYNCPROFILEITEM_H
-
-// End of File
--- a/omadm/omadmappui/inc/NSmlDMSyncProfileList.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,164 +0,0 @@
-/*
-* 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:  Profile list container
-*
-*/
-
-
-
-#ifndef CNSMLDMSYNCPROFILELIST_H
-#define CNSMLDMSYNCPROFILELIST_H
-
-//  INCLUDES
-
-#include <e32base.h>
-#include "NSmlDMSyncProfileItem.h"
-
-// FORWARD DECLARATIONS
-class TNSmlDMSyncProfileItem;
-class CNSmlDMSyncProfile;
-class CNSmlDMSyncAppEngine;
-
-/**
-* CNSmlDMSyncProfileList 
-*
-* CNSmlDMSyncProfileList is a list of profiles
-*/
-NONSHARABLE_CLASS (CNSmlDMSyncProfileList) : public CBase
-    {
-
-    public:
-        /**
-        * Two-phased constructor.
-        */
-        static CNSmlDMSyncProfileList* NewL( CNSmlDMSyncAppEngine* aEngine  );
-
-	    /**
-        * Destructor.
-        */
-        virtual ~CNSmlDMSyncProfileList();
-
-    private:
-        /**
-        * C++ default constructor.
-        */
-	    CNSmlDMSyncProfileList( CNSmlDMSyncAppEngine* aEngine  );
-
-        /**
-        * By default Symbian 2nd phase constructor is private.
-        */
-	    void ConstructL();
-
-	public:
-		/**
-		* Returns profile count.
-        * @return Profile count.
-        */
-		TInt Count();
-
-		/**
-		* Returns profile from list.
-        * @param aIndex List index.
-		* @return TNSmlDMSyncProfileItem.
-        */
-		TNSmlDMSyncProfileItem Item( TInt aIndex );
-	
-		/**
-		* Finds profile with name aProfileName.
-		* @param aProfileName Profile name.
-		* @return Profile id or KErrNotFound.
-        */
-		TInt FindProfile( const TDesC& aProfileName );
-
-		/**
-		* Read one profile from database.
-		* @param aProfile.
-		* @return TNSmlDMSyncProfileItem.
-        */
-        TNSmlDMSyncProfileItem ReadProfileItemL( CNSmlDMSyncProfile* aProfile );
-
-		/**
-		* Reads all profiles from database.
-		* @return None.
-        */
-		void ReadProfileItemsL();
-
-		/**
-		* Reads all profiles from database.
-		* @param aIncludeHidden Should hidden profile be included
-		* @return None.
-        */
-		void ReadProfileItemsL( TBool aIncludeHidden );
-
-		/**
-		* Reads one profile from database.
-		* @param aIndex profile index
-		* @return None.
-        */
-		void ReadProfileItemL( TInt aIndex );
-
-		/**
-		* Resets profile list.
-		* @param None.
-		* @return None.
-        */
-		void Reset();
-
-		/**
-		* Remove item from profilelist
-		* @param aProfileId.
-		* @return None.
-        */
-		void Remove( TInt aProfileId );
-
-		/**
-		* Checks that mandatory data exists.
-		* @param aProfile.
-		* @return Return code.
-        */
-        static TInt CheckMandatoryDataL( CNSmlDMSyncProfile* aProfile );
-		
-		/**
-		* Replaces profile items
-		* @param aProfileItem.
-		* @return None.
-        */	
-		void ReplaceProfileItemL( TNSmlDMSyncProfileItem& aProfileItem );
-		
-		/**
-		* Sort list
-		* @param None
-		* @return None.
-        */		
-		void Sort();
-				
-	private:
-		
-		/**
-		* Chceks empty characters
-		* @param aText
-		* @return ETrue if text is empty
-        */
-		static TBool IsEmpty( const TDesC& aText );
-
-	private:
-	    // Sync app engine
-        CNSmlDMSyncAppEngine*           iEngine;
-		// list of profiles
-		RArray<TNSmlDMSyncProfileItem>  iList;
-    };
-
-#endif  // CNSMLDMSYNCPROFILELIST_H
-
-// End of File
--- a/omadm/omadmappui/inc/NSmlDMSyncState.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,175 +0,0 @@
-/*
-* Copyright (c) 2002-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:  Sync state class
-*
-*/
-
-
-
-#ifndef NSMLDMSYNCSTATE_H
-#define NSMLDMSYNCSTATE_H
-
-
-//  INCLUDES
-#include <e32base.h>
-
-// CLASS DECLARATION
-
-/*
-* CNSmlDMSyncState 
-*
-* CNSmlDMSyncState handles sync states
-*/
-NONSHARABLE_CLASS (CNSmlDMSyncState) : public CBase
-    {
-    public:
-		enum TSyncPhase
-			{
-			EPhaseConnecting = 0,
-			EPhaseInitialising,
-			EPhaseSending,
-			EPhaseReceiving,
-			EPhaseSynchronizing,
-			EPhaseDisconnecting,
-			EPhaseCanceling,
-			EPhaseNone,
-			EPhaseFinal 
-
-			};
-
-    public:
-        /**
-        * Two-phased constructor.
-        */
-        static CNSmlDMSyncState* NewL();
-        
-        /**
-        * Destructor.
-        */
-        virtual ~CNSmlDMSyncState();
-        
-    private:
-        /**
-        * By default Symbian 2nd phase constructor is private.
-        */
-        CNSmlDMSyncState();
-        
-        /**
-        * C++ default constructor.
-        */
-        void ConstructL();
-        
-    public:
-        /**
-        * Reset state variables.
-        * @param None.
-        * @return None.
-        */
-        void Reset();
-        
-    public:
-        /**
-        * Set synchronization phase.
-        * @param aPhase synchronization phase.
-        * @return None.
-        */
-        void SetSyncPhase(TInt aPhase);
-        
-        /**
-        * Get synchronization phase.
-        * @param None.
-        * @return Synchronization phase.
-        */
-        TInt SyncPhase();
-
-        /**
-        * Set total sync progress.
-        * @param aCount Progress count.
-        * @return None.
-        */
-		void SetTotalProgress(TInt aCount);
-
-        /**
-        * Get total sync progress.
-        * @param None. 
-        * @return Progress count.
-        */
-		TInt TotalProgress();
-
-        /**
-        * Set sync progress.
-        * @param aCount Progress count.
-        * @return None.
-        */
-		void SetProgress(TInt aCount);
-
-        /**
-        * Increase sync progress.
-        * @param None.
-        * @return None.
-        */
-        void IncreaseProgress();
-        
-        /**
-        * Get sync progress.
-        * @param None. 
-        * @return Progress count.
-        */
-		TInt Progress();
-
-        /**
-        * Set sync content name.
-        * @param aContent Content name.
-        * @return None.
-        */
-        void SetContent(const TDesC& aContent);
-
-        /**
-        * Get sync content name.
-        * @param None. 
-        * @return Content name.
-        */
-		const TDesC& Content();
-
-        /**
-        * Resets progress state.
-        * @param None. 
-        * @return None.
-        */
-		void ResetProgress();
-		
-        /**
-        * Finds out whether total progress count is known.
-        * @param None. 
-        * @return ETrue if total progress count is known, EFalse otherwise.
-        */
-		TBool ProgressKnown();
-        
-    private:
-        // synchronization phase
-		TInt iSyncPhase;
-
-		// total number of sent/received sync items
-		TInt iTotalProgressCount;
-
-		// number of sent/received sync items
-		TInt iProgressCount;
-
-		// name of the content being synced
-		TName iSyncContent;
-    };
-
-#endif  // NSMLDMSYNCSTATE_H
-
-// End of File
--- a/omadm/omadmappui/inc/NSmlDMSyncUi.hrh	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +0,0 @@
-/*
-* Copyright (c) 2005-2006 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:  Header file for Device Manager UI Menu and Other enumerations
-*
-*/
-
-
-#ifndef NSMLDMSYNCUI_HRH
-#define NSMLDMSYNCUI_HRH
-
-#include "NSmlDMUIDefines.h"
-enum TNSmlMenuCommands
-    {
-    ENSmlMenuDummy = 0x6000,    // Large enough to prevent confusion
-    ENSmlMenuCmdNewProfile,     // with avkon and eikon enumerations.
-    ENSmlMenuCmdOpenLog,
-    ENSmlMenuCmdOpenSettings,
-    ENSmlMenuCmdEraseProfile,
-    ENSmlMenuCmdStartSync,
-    ENSmlMenuCmdCancelSync,
-    ENSmlMenuCmdMainHelp,
-    ENSmlMenuCmdFotaCheck,
-    ENSmlMenuCmdFotaInstall,
-    ENSmlMenuCmdFotaContinue,
-    ENSmlMenuCmdFotaSettings,
-    ENSmlMenuCmdFotaSettChange,
-    ENSmlMenuCmdFotaServers
-   
-    };
-
-enum TNSmlTabViewId
-    {
-    ENSmlFotaViewTab = 1,
-    ENSmlProfilesViewTab
-    };
-
-enum TNSmlNotesQueriesAndLists
-    {
-    ENSmlProgressNote = 1,
-    ENSmlWaitNote,
-    ENSmlSettingList = 100,
-    ENSmlFotaSettList,
-    ENSmlMainViewList
-    };
-
-enum TNSmlSetting
-    {
-    ENSmlSettChange = 1,
-    ENSmlSettHelp,
-    ENSmlSettExit
-    };
-
-enum TNSmlSyncButtons
-    {
-    ENSmlSyncCancel = 1,
-    ENSmlSyncSelect
-    };
-
-enum TNSmlFotaPkgState
-    {
-    EGenericSession,
-    EFotaPkgFound,
-    EFotaPkgNotFound
-    };
-    
-#endif      //  NSMLDMSYNCUI_HRH
-
-// End of file
--- a/omadm/omadmappui/inc/NSmlDMSyncUtil.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,449 +0,0 @@
-/*
-* 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:  Utility classes.
-*
-*/
-
-
-#ifndef NSMLDMSYNCUTIL_H
-#define NSMLDMSYNCUTIL_H
-
-// INCLUDES
-#include <e32base.h>
-
-// CLASS DECLARATION
-
-/**
-* TUtil
-* 
-* This class contains general utility functions. 
-*/
-NONSHARABLE_CLASS (TUtil)
-	{
-    public:
-    
-        /**
-        * Panic
-        * @param aReason.
-        * @return None
-        */
-        static void Panic( TInt aReason );
-        
-        /**
-        * String copy tool
-        * @param aTarget.
-        * @param aSource.
-        * @return None
-        */        
-		static void StrCopy( TDes& aTarget, const TDesC& aSource );
-        /**
-        * String copy tool
-        * @param aTarget.
-        * @param aSource.
-        * @return None
-        */      		
-		static void StrCopy( TDes& aTarget, const TDesC8& aSource );
-        
-        /**
-        * String copy tool
-        * @param aTarget.
-        * @param aSource.
-        * @return None
-        */      		
-		static void StrCopy( TDes8& aTarget, const TDesC& aSource );
-        
-        /**
-        * String append tool
-        * @param aTarget.
-        * @param aSource.
-        * @return None
-        */      		
-		static void StrAppend( TDes& aTarget, const TDesC& aSource );
-        
-        /**
-        * String insert tool
-        * @param aTarget.
-        * @param aSource.
-        * @return None
-        */      		
-		static void StrInsert( TDes& aTarget, const TDesC& aSource );
-        
-        /**
-        * Convert string to int
-        * @param aText.
-        * @param aNum.
-        * @return None
-        */		
-		static TInt StrToInt( const TDesC& aText, TInt& aNum );
-        
-        /**
-        * Check whether textline is empty
-        * @param aText.
-        * @return ETrue if empty
-        */				
-		static TBool IsEmpty( const TDesC& aText );
-        
-        /**
-        * URI Parser
-        * @param aURI
-        * @param aAddress
-        * @param aPort
-        * @param aDocName
-        * @return None
-        */						
-        static void ParseURIL( const TDesC& aURI, 
-                               TDes& aAddress, 
-                               TDes& aPort, 
-                               TDes& aDocName );
-      
-        /**
-        * Returns formatted sync time
-        * @param aLastSync
-        * @return Sync time
-        */
-        static HBufC* SyncTimeLC( TTime aLastSync );
-        
-        /**
-        * Get data as text
-        * @param 
-        * @return 
-        */        
-        static void GetDateTextL( TDes& aText, TTime aDateTime );
-        
-        /**
-        * Get time as text 
-        * @param 
-        * @return 
-        */        
-		static void GetTimeTextL( TDes& aText, TTime aDateTime );
-        
-        /**
-        * Get data and time as text
-        * @param 
-        * @return 
-        */        
-		static void GetDateTimeTextL( TDes& aText, TTime aDateTime );
-        
-        /**
-        * Check if SettingEnforcement is set
-        * @param 
-        * @return Boolean
-        */        
-		static TBool SettingEnforcementStateL();
-
-        /**
-        * Check if SettingEnforcement is set (non-leaving)
-        * @param 
-        * @return Boolean
-        */        
-		static TBool SettingEnforcementState();
-
-    private:
-    
-        /**
-        * Check if sync has happened today
-        * @param atime
-        * @return Boolean
-        */    
-        static TBool IsToday( TTime aTime );
-        
-        /**
-        * Convert time to hometime
-        * @param aUniversalTime
-        * @return TTIme
-        */            
-        static TTime ConvertUniversalToHomeTime( const TTime& aUniversalTime );
-
-	};
-
-/**
-*  TStr contains descriptor operations with range checking.
-*/
-NONSHARABLE_CLASS (TStr)
-    {
-    public:
-        /**
-        * C++ default constructor.
-        */
-        TStr(const TDesC& aStr);
-       
-    public:
-        /**
-        * String manipulating tools
-        * @param aPos
-        * @param aLen
-        * @return TPtrC
-        */        
-        TPtrC Mid( TInt aPos, TInt aLen );
-        
-        /**
-        * String manipulating tools
-        * @param aPos
-        * @return TPtrC
-        */                
-        TPtrC Mid( TInt aPos );
-
-        /**
-        * String manipulating tools
-        * @param aPos
-        * @return TPtrC
-        */                
-        TPtrC Left( TInt aPos );
-        
-        /**
-        * String manipulating tools
-        * @param aPos
-        * @return TPtrC
-        */               
-        TPtrC Right( TInt aPos );
-        
-        /**
-        * String manipulating tools
-        * @param aStartPos
-        * @param aEndPos
-        * @return TPtrC
-        */               
-        TPtrC SubStr( TInt aStartPos, TInt aEndPos );
-
-        /**
-        * String manipulating tools
-        * @param aStartPos
-        * @param aEndPos
-        * @return TPtrC
-        */           
-        TPtrC SubStrEx( TInt aStartPos, TInt aEndPos );
-
-        /**
-        * String manipulating tools
-        * @return TInt
-        */           
-        TInt LastPos();
-
-        /**
-        * String manipulating tools
-        * @return TInt
-        */           
-        TInt Len();
-
-        /**
-        * String manipulating tools
-        * @param aPos
-        * @param aChar
-        * @return TBool
-        */           
-        TBool Compare( TInt aPos, TChar aChar );
-
-        /**
-        * String manipulating tools
-        * @param aStartPos
-        * @param aChar
-        * @return TInt
-        */
-        TInt Find( TInt aPos, TChar aChar );
-        
-    private:
-        // reference to descriptor
-		const TDesC& iStr;
-    };
-
-/**
-*  TURIParser is used for parsing URI.
-*/
-NONSHARABLE_CLASS (TURIParser)
-    {
-    public:
-        /**
-        * C++ default constructor.
-        */
-        TURIParser( const TDesC& aStr );
-       
-    public:
-        /**
-        * URI manipulating tools
-        * @param aText
-        * @return None
-        */    
-        void GetUriWithoutPort( TDes& aText );
-
-        /**
-        * URI manipulating tools
-        * @param aText
-        * @param aPort
-        * @return None
-        */            
-        void GetUri( TDes& aText, const TInt aPort );
-
-        /**
-        * URI manipulating tools
-        * @return TInt
-        */            
-        TInt Port();
-
-        /**
-        * URI manipulating tools
-        * @return TInt
-        */            
-        TInt DefaultPort();
-
-    private:
-        /**
-        * URI manipulating tools
-        * @return TPtrC
-        */          
-        TPtrC ParseHttp();
-
-        /**
-        * URI manipulating tools
-        * @return TPtrC
-        */              
-        TPtrC ParseAddress();
-
-        /**
-        * URI manipulating tools
-        * @return TPtrC
-        */              
-        TPtrC ParseDocument();
-
-        /**
-        * URI manipulating tools
-        * @param aPortNumber
-        * @return TInt
-        */              
-        TInt ParsePort(TInt& aPortNumber);
-
-        /**
-        * URI manipulating tools
-        * @return TPtrC
-        */              
-        TPtrC ParsePort();
-        
-     private:
-
-        /**
-        * URI manipulating tools
-        * @param aStartPos
-        * @param aEndPos
-        * @return None
-        */          
-        void GetHttpPos(TInt& aStartPos, TInt& aEndPos);
-
-        /**
-        * URI manipulating tools
-        * @return NOne
-        */             
-        void SkipHttp();
-  
-    private:
-        // reference to original URI text
-		const TDesC& iOriginalStr;
-		
-		// pointer to original URI text
-		TPtrC iPtr;
-		
-		//reference to Boolean variable which tells about Slash in URI
-		TBool iSlash;
-    };
-
-/**
-* MNSmlDMActiveCallerObserver
-*
-* MNSmlDMActiveCallerObserver is for observing CNSmlDMActiveCaller.
-*/
-class MNSmlDMActiveCallerObserver
-    {
-    public:
-	    virtual void HandleActiveCallL() = 0;
-    };
-
-/**
-* CNSmlDMActiveCaller
-*
-* CNSmlDMActiveCaller is used for generating a call from active scheduler.
-*/
-NONSHARABLE_CLASS (CNSmlDMActiveCaller) : public CActive
-    {
-    public:
-        /**
-        * Two-phased constructor.
-        */
-        static CNSmlDMActiveCaller* NewL(MNSmlDMActiveCallerObserver* aObserver);
-
-	    /**
-        * Destructor.
-        */
-        virtual ~CNSmlDMActiveCaller();
-
-    private:
-        /**
-        * C++ default constructor.
-        */
-	    CNSmlDMActiveCaller(MNSmlDMActiveCallerObserver* aObserver);
-
-        /**
-        * By default Symbian 2nd phase constructor is private.
-        */
-	    void ConstructL();
-
-	public:
-        /**
-        * Calls observer using active object framework.
-        * @param aCallId.
-		* @param aMilliseconds Delay before observer is called.
-        * @return None
-        */
-		void Start( TInt aCallId, TInt aMilliseconds = 0 );
-
-    private:
-        /**
-        * From CActive. Called when asynchronous request completes.
-        * @param None
-        * @return None
-        */
-	    void RunL();
-       
-        /**
-        * From CActive. Called when RunL Leaves.
-        * @param None
-        * @return error
-        */
-        TInt RunError( TInt aError );
-
-        /**
-        * From CActive. Cancels asynchronous request.
-        * @param None
-        * @return None
-        */
-	    void DoCancel();
-        
-        /**
-        * Make active scheduler call RunL.
-        * @param None
-        * @return None
-        */
-		void CompleteSelf();
-
-    private:
-		// call that is passed to observer
-		TInt iCallId;
-
-		// timer
-		RTimer iTimer;
-
-		// observer that gets called
-		MNSmlDMActiveCallerObserver* iObserver;
-    };
-
-#endif  // NSMLDMSYNCUTIL_H
-
-// End of File
--- a/omadm/omadmappui/inc/NSmlDMUIDefines.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-/*
-* 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:  Header file for UI definitions
-*
-*/
-
-
-#ifndef NSMLDMUIDEFINES_H
-#define NSMLDMUIDEFINES_H
-
-//Authentication query time-out. Time in seconds.
-#define NSmlDMAuthQueryShowTime 900 
-//Accept alert query time-out. Time in seconds.
-#define NSmlDMAlertTimeAccept 60
-
-#define KNSmlMaxTextLength64 64
-#define KNSmlMaxTextLength128 128
-#define KNSmlMaxTextLength256 256
-#define KNSmlMaxEmptyTextLength 100
-
-#define KNSmlMaxProfileNameLength 100 
-#define KNSmlMaxUsernameLength 100 
-#define KNSmlMaxPasswordLength 50 
-
-#endif // NSMLDMUIDEFINES_H
-
-// End of File
--- a/omadm/omadmappui/inc/NSmlDMdef.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,162 +0,0 @@
-/*
-* 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:  Application definitions.
-*
-*/
-
-
-#ifndef NSMLDMDEF_H
-#define NSMLDMDEF_H
-
-#include <e32base.h>
-#include "NSmlDMUIDefines.h"
-#include "NSmlDMSyncUi.hrh"
-
-#define KNSmlMaxURLLength 150
-#define KNSmlDmServerIdMaxLength 150
-#define KNSmlMaxItemLength 150	// The item max length.
-
-
-const TInt KNSmlDefaultGranularity = 1;
-
-const TInt KBufSize16   = 16;
-const TInt KBufSize     = 128;
-const TInt KBufSize255  = 255;
-const TInt KBufSize256  = 256;
-const TInt KBufSize32   = 32;
-const TInt KPortMaxSize = 65535;
-const TInt KPortMinSize = 1;
-// View UID:s
-const TUid KNSmlDMFotaViewId        = { ENSmlFotaViewTab     };
-const TUid KNSmlDMProfilesViewId    = { ENSmlProfilesViewTab };
-
-const TInt KDefaultHttpPort     = 80;
-const TInt KDefaultHttpsPort    = 443;
- // setting dialog listbox update delay after db event
-const TInt KListBoxUpdateDelay  = 250;
-const TInt KHttpUsed  = 1;
-const TInt KHttpNotUsed  = 0;
-const TInt KNumberofCharacters  = 4;
-const TInt KMultiplier  = 1000000;
-
-//errors
-const TInt KDMErr					= -8144;
-
-// Medium type definitions
-const TUid KUidNSmlMediumTypeInternet  = { 0x101F99F0 };
-const TUid KUidNSmlMediumTypeBluetooth = { 0x101F99F1 };
-const TUid KUidNSmlMediumTypeUSB       = { 0x101F99F2 };
-const TUid KUidNSmlMediumTypeIrDA      = { 0x101F99F3 };
-
-_LIT( KNSmlHttp,    "http" );
-_LIT( KNSmlHttps,   "https" );
-_LIT( KHttpHeader,  "http://" );
-_LIT( KHttpsHeader, "https://" );
-_LIT( KColon,       ":" );
-_LIT( KHttpSep,     "://" );
-_LIT( KSlash,       "/" );
-_LIT( KSmlEOL,      "\n" );
-_LIT( KNSmlTab,     "\t" );
-
-_LIT( KZDrive, "z:" );
-
-#ifdef __SCALABLE_ICONS
-    _LIT( KDMAppIconFileName, "nsmldmsync.mif" );
-#else // !__SCALABLE_ICONS
-    _LIT( KDMAppIconFileName, "nsmldmsync.mbm" );
-#endif
-
-//
-// NOTE: this enum must match to resource r_sml_bearer_type
-//
-enum TNSmlSyncBearerType
-	{
-	EAspBearerInternet = 0,
-	EAspBearerBlueTooth = 1,
-	EAspBearerUsb = 2,
-	EAspBearerIrda = 3,
-    EAspBearerLast = 4
-	};
-
-// NOTE: this enum must match with property array described in 
-// SyncML_Sync_Agent_Client_API_Specification.doc.
-enum TNSmlSyncTransportProperties
-	{
-	EPropertyIntenetAccessPoint = 0,
-	EPropertyHttpUsed = 5,
-	EPropertyHttpUserName = 6,
-	EPropertyHttpPassword = 7
-	};
-
-enum TNSmlSyncState
-	{
-	ESASyncStateEnable,
-	ESASyncStateDisable,
-	ESASyncStateConfirm
-	};
-
-enum TNSmlSyncInitiation    
-	{		
-	EClientInitiated = 1,
-	EServerAlerted
-	};
-
-enum TNSmlEditMode
-	{ 
-	ESmlNewProfile = 0,
-	ESmlEditProfile,
-	ESmlCopyProfile
-	};
-
-enum TNSmlProfileMediumType
-	{
-	EProfileInternet = 0,
-	EProfileObexBlueTooth = 1
-	};
-
-enum TNSmlMandatoryProfileData
-	{
-	EMandatoryOk,
-	EMandatoryNoProfileName,
-    EMandatoryNoHostAddress,
-    EMandatoryNoContent,
-	EMandatoryNoLocalDatabase,
-	EMandatoryNoRemoteDatabase,
-	EMandatoryNoSyncType
-	};
-
-enum TNSmlStatus
-	{
-	ENSmlSyncComplete,
-	ENSmlRefreshMainView
-	};
-
-enum TNSmlAccessPointSelection
-	{
-	ENsmlAlwaysAsk,
-	ENsmlDefaultConnection,
-	ENsmlIap
-	};	
-
-//Constants used when update happen NSC/DM 
-enum {
-		EFotaUpdateNSC=1,
-		EFotaUpdateNSCBg,
-		EFotaUpdateDM
-};
-
-
-#endif // NSMLDMDEF_H
-
-// End of file
--- a/omadm/omadmappui/inc/nsmldmsyncinternalpskeys.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
-/*
-* 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:  Publish and subcribe keys published by device manager
-*                application.
-*
-*/
-
-
-#ifndef NSMLDMSYNCINTERNALPSKEYS_H
-#define NSMLDMSYNCINTERNALPSKEYS_H
-
-// CONSTANTS
-
-// Device manager key UID
-const TUid KPSUidNSmlDMSyncApp = {0x101f6de5};
-
-// Fota Server key UID
-const TUid KFotaServerAppUid = {0x102072C4};
-
-// PubSub key used to share information about the
-// initiator of the device management session.
-// Contains the identifier of a job that is
-// started from the UI. 
-const TUint32 KNSmlDMSyncUiInitiatedJobKey = 0x00000001;
-
-// PubSub key used to share information about the
-// type of the server alert for device management session.
-// Contains the identifier of server alert type
-// started from DM Server
-const TUint32 KServerAlertType = 0x00000004;	
-
-// Indicates that no user initiated sync jobs are in
-// progress.
-const TInt KNSmlDMNoUserInitiatedJob = -1;
-
-// PubSub key used to share information about the
-// launching of the device management application.
-// Contains the identifier of server alert or 
-// OmaDmCPPlugin
-const TUint32 KNSmlDMSyncUiLaunchKey = 0x00000002;
-
-//PubSub key used for putting Fota UI in Foreground or background
-//Sets only by FOTA & DM uses this key value
-const TUint32 KFotaDLStatus = 0x00000008;
-
-//PubSub key used for main view first listitem display
-//Sets by DM UI or FOTA
-const TUint32 KFotaDLRefresh = 0x00000009;
-
-
-//PubSub key used to mark which application is handling the process of download
-//Sets by DM UI, NSC or NSCBackground
-const TUint32 KNSmlCurrentFotaUpdateAppName = 0x0000000A;
-
-
-//PubSub key used to define should "Install Now?" query be shown or not
-//Sets by DM UI or NSC
-const TUint32 KDevManShowInstallNowQuery = 0x0000000B;
-
-//PubSub key used to store the status/error of current DM Job session
-//Sets by DM UI & used by FOTA in case of OMA DM large object download
-const TUint32  KDmJobCancel = 0x00000012; 
-
-//PubSub key used to store the status of whether the DM is busy or not 
-//Sets by DM UI & used by IAD or others
-const TUint32 KDMIdle = 0x0000000C; 
-const TUint32 KSilentSession = 0x0000000D;
-#endif // NSMLDMSYNCINTERNALPSKEYS_H
-            
-// End of File
--- a/omadm/omadmappui/loc/NSmlDMSync.loc	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,733 +0,0 @@
-/*
-* Copyright (c) 2002-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:  Localisation file for NSmlDMSyncApp
-*
-*/
-
-
-
-//d:-----------------------------------------------------------
-//d:APPLICATION TITLES
-//d:-----------------------------------------------------------
-
-//d:Title of the application on the application shell list
-//l:list_single_large_graphic_pane_t1
-//
-#define qtn_apps_dm_list        "Device Manager"
-
-//d:Title of the application on the application shell grid
-//l:cell_app_pane_t1
-//
-#define qtn_apps_dm_grid        "Device Manager"
-
-//d:Title of the application on the title pane
-//l:title_pane_t2/opt9
-//
-#define qtn_apps_dm_title       "Device Manager"
-
-//d:-----------------------------------------------------------
-//d:PROFILES VIEW
-//d:-----------------------------------------------------------
-
-//d:Navipane texts on the mainview
-//d:%U refers to the last synchronisation date (qtn_date_usual)
-//l:navi_navi_text_pane_t1
-//
-#define qtn_dm_sync_last            "Last: %U"
-
-//d:Navipane texts on the mainview
-//d:Profile has not been synchronised
-//l:navi_navi_text_pane_t1
-//
-#define qtn_dm_not_configured       "Not configured"
-
-//d:Command in options list.
-//d:Starts the syncronisation
-//l:list_single_pane_t1_cp2
-//
-#define qtn_dm_opt_connect          "Connect"
-
-//d:Command in options list.
-//d:Starts the syncronisation
-//l:list_single_pane_t1_cp2
-//
-#define qtn_dm_opt_conf_enable      "Enable configurations"
-
-//d:Command in options list.
-//d:Starts the syncronisation
-//l:list_single_pane_t1_cp2
-//
-#define qtn_dm_opt_conf_disable     "Disable configurations"
-
-//d:Command in options list.
-//d:Opens settings view with default profile values
-//l:list_single_pane_t1_cp2
-//
-#define qtn_dm_opt_profile_new      "New profile"
-
-//d:Command in options list.
-//d:Opens settings view with existing profile values
-//l:list_single_pane_t1_cp2
-//
-#define qtn_dm_opt_profile_edit     "Edit profile"
-
-//d:Command in options list.
-//d:Deletes currently selected profile
-//l:list_single_pane_t1_cp2
-//
-#define qtn_dm_opt_profile_delete   "Delete profile"
-
-//d:Command in options list.
-//d:Opens the profile's last synchronisation log for viewing
-//l:list_single_pane_t1_cp2
-//
-#define qtn_dm_opt_profile_log      "View log"
-
-//d:Main view delete sync profile command confirmation
-//d:%U refers to current profile name
-//l:popup_note_window
-//
-#define qtn_dm_conf_delete          "Delete server profile %U"
-
-//d:Text on the confirmation query at application start
-//d:if no profiles exist and the list is empty
-//l:popup_note_window
-//
-#define qtn_dm_conf_newprofile      "Create new profile?"
-
-//d:Text to indicate locked settings when the user tries to
-//d:create, edit, or delete profiles.
-//l:popup_note_window
-//w:
-//r:3.1
-//
-#define qtn_dm_info_note_locked_setting "Cannot edit locked setting item."
-
-//d:-------------------------------------------------------
-//d: CONFIRMATION NOTES
-//d:-------------------------------------------------------
-//d:Confirmtion to start confirmation session
-//l:popup_note_window
-//
-#define qtn_dm_conf_connection          "Connection is usually started from server, when it needs to update phone settings. Continue?"
-
-//d:Confirmtion to start confirmation session
-//l:popup_note_window
-//
-#define qtn_dm_conf_activation_dm       "Remote configurations are disabled. Do you want to active, and start configuration?"
-
-//d:Confirmtion to start confirmation session
-//d:as start values. %U is the name of the selected profile.
-//l:popup_note_window
-//
-#define qtn_dm_conf_activation_profile  "Selected server profile is not active. Do you want to set it active, and start configuration?"
-
-//d:Confirmation to change the server id setting item
-//l:popup_note_window
-//
-#define qtn_dm_conf_change_server_id    "Changing server ID may cause problems.\nDo you still want to change it?"
-
-//d:Error confirmation dialog
-//d:Error message in case the requested access point is invalid
-//l:popup_note_window
-//
-#define qtn_dm_conf_ap_setting          "Selected server has no access point. Do you want to set access point now?"
-
-//d:Confirmation query to accept configuration
-//d:Error message in case the requested access point is invalid
-//l:popup_note_window
-//
-#define qtn_dm_query_accept_configuration   "Server %U is about to configure. Accept ?"
-
-//d:Text for user name editor in multiquery
-//l:popup_query_data_code_window/opt2
-//
-#define qtn_dm_conf_query_username      "User name"
-
-//d:Text for password editor in multiquery
-//l:popup_query_data_code_window/opt2
-//
-#define qtn_dm_conf_query_password      "Password"
-
-//d:-------------------------------------------------------
-//d: SYNC PROGRESS NOTE WINDOW
-//d:-------------------------------------------------------
-//d:progress note window which shows the synchronistion progress
-//d:changing text displayed at connect stage
-//d:Image replaced by animation
-//l:popup_note_wait_window
-//
-#define qtn_dm_note_connecting      "Connecting\n"
-
-//d:changing text displayed at initialising stage
-//d:Image replaced by animation
-//l:popup_note_wait_window
-//
-#define qtn_dm_note_initialising    "Initialising\n"
-
-//d:changing text displayed at initialising stage
-//d:Image replaced by animation
-//l:popup_note_wait_window
-//
-#define qtn_dm_note_processing      "Processing configuration data from %U"
-
-//d:changing text displayed at finishing stage
-//d:Image replaced by animation
-//l:popup_note_wait_window 
-//
-#define qtn_dm_note_finalising      "Finalising\n"
-
-//d:changing text displayed at disconnect stage
-//d:Image replaced by animation
-//l:popup_note_wait_window 
-//
-#define qtn_dm_note_disconnecting   "Disconnecting\n"
-
-//d:changing text displayed after succesful synchronisation
-//d:Image replaced by animation
-//l:popup_note_wait_window 
-//
-#define qtn_dm_note_end_done        "Completed\n\n"
-
-//d:changing text displayed when user has cancelled the
-//d:Image replaced by animation
-//l:popup_note_wait_window 
-//
-#define qtn_dm_note_end_cancelled   "Cancelled\n\n"
-
-//d:changing text displayed when error has stopped the
-//d:Image replaced by animation
-//l:popup_note_wait_window
-//
-#define qtn_dm_note_end_error       "Terminated\n\n"
-
-//d:changing text displayed at cancelling stage
-//d:Image replaced by animation
-//l:popup_note_wait_window
-//
-#define qtn_dm_note_end_cancelling  "Cancelling,\nplease wait\n"
-
-//d:------------------------------------------------------
-//d:CONFIGURATION LOG VIEW
-//d:------------------------------------------------------
-//d:texts for the log view window
-//d:heading for the log view window list
-//l:heading_pane_t1
-//
-#define qtn_dm_query_hdr_conf_log   "Configuration log" 
-
-//d:texts for the log view window
-//d:heading for the log view window list
-//l:list_single_heading_pane_t2
-//
-#define qtn_dm_log_profile_name     "Server name" 
-
-//d:heading for the log view window list
-//l:list_single_heading_pane_t2
-//
-#define qtn_dm_log_date             "Date"
-
-//d:heading for the log view window list
-//l:list_single_heading_pane_t2
-//
-#define qtn_dm_log_time             "Time"
-
-//d:heading for the log view window list
-//l:list_single_heading_pane_t2
-//
-#define qtn_dm_log_remote_server    "Remote server"
-
-//d:heading for the log view window list
-//l:list_single_heading_pane_t2
-//
-#define qtn_dm_log_remote_status    "Status"
-
-//d:heading for the log view window list
-//l:list_single_heading_pane_t1
-//
-#define qtn_dm_log_status_complete  "Complete"
-
-//d:heading for the log view window list
-//l:list_single_heading_pane_t1
-//
-#define qtn_dm_log_status_cancelled "Cancelled"	
-
-//d:heading for the log view window list
-//l:list_single_heading_pane_t1
-//
-#define qtn_dm_log_status_error     "Incomplete"
-
-//d:----------------------------------------------------------
-//d:SETTINGS VIEW
-//d:----------------------------------------------------------
-
-//d:Default title of the new profile 
-//l:list_double_large_graphic_pane_t1
-//
-#define qtn_dm_default_server_name  "Configuration server (%N)"
-
-//d:Default title for the unnamed server name 
-//l:list_set_graphic_pane_t1
-//
-#define qtn_dm_empty_server_name    "<unnamed server>"
-
-//d:settings view title pane text
-//l:title_pane_t2/opt9
-//
-#define qtn_dm_title_profile_settings   "Profile Settings"
-
-//d:if setting item doesn't have a value it's value is none
-//l:list_set_graphic_pane_t1
-//
-#define qtn_dm_set_val_field_none   "None"
-
-//d:if setting item doesn't have a value it's value is none (host address)
-//l:list_set_graphic_pane_t1
-//
-#define qtn_sml_set_val_hostaddr_none   "None"
-
-//d:Value used in setting view's (Yes/No) lists
-//l:list_set_graphic_pane_t1
-//
-#define qtn_dm_set_active_value_true    "Yes"
-
-//d:Value used in setting view's (Yes/No) lists
-//l:list_set_graphic_pane_t1
-//
-#define qtn_dm_set_active_value_false   "No"
-
-//d:Scheduling interval option
-//d:Opens the settings subview
-//l:popup_note_window
-//
-#define qtn_dm_conf_set_user_name   "Name already in use. Profile not saved.\nExit anyway?"
-
-//d:Scheduling interval option
-//d:Opens the settings subview
-//l:popup_note_window
-//
-#define qtn_dm_conf_set_dup_server_id   "Duplicate server ID. Please change the ID."
-
-//d:Prompted for the user if not all the needed
-//d:information isn't entered for the profile
-//l:popup_note_window
-//
-#define qtn_dm_conf_mandatory_missing   "Incomplete server profile settings. Profile not saved.\nExit anyway?"
-
-//d:One of the setting items in settings view
-//d:Used also as a title in editing state 
-//l:list_setting_pane_t1
-//
-#define qtn_dm_set_lbl_server_name  "Server name"
-
-//d:One of the setting items in settings view
-//d:Used also as a title in editing state 
-//l:list_setting_pane_t1
-//
-#define qtn_dm_set_lbl_server_id    "Server Id"
-
-//d:One of the setting items in settings view
-//d:Used also as a title in editing state 
-//l:list_setting_pane_t1
-//
-#define qtn_dm_set_lbl_server_password  "Server password"
-
-//d:One of the setting items in settings view
-//d:Used also as a title in editing state 
-//l:list_setting_pane_t1
-//
-#define qtn_dm_set_lbl_connection_type  "Connection type"
-
-//d:One of the setting items in settings view
-//d:Used also as a title in editing state
-//l:list_setting_pane_t1
-//
-#define qtn_dm_set_lbl_access_point "Access point"
-
-//d:One of the setting items in settings view
-//d:Used also as a title in editing state
-//l:list_setting_pane_t1
-//
-#define qtn_dm_set_lbl_host_address "Host address"
-
-//d:One of the setting items in settings view
-//d:Used also as a title in editing state
-//l:list_setting_pane_t1
-//
-#define qtn_dm_set_lbl_server_port  "Port"
-
-//d:One of the setting items in settings view
-//d:Used also as a title in editing state
-//l:list_setting_pane_t1
-//
-#define qtn_dm_set_lbl_dm_username  "User name"
-
-//d:One of the setting items in settings view
-//d:Used also as a title in editing state
-//l:list_setting_pane_t1
-//
-#define qtn_dm_set_lbl_dm_password  "DM Password"
-
-//d:One of the setting items in settings view
-//d:Used also as a title in editing state
-//l:list_setting_pane_t1
-//
-#define qtn_dm_set_lbl_active       "Active"
-
-//d:One of the setting items in settings view
-//d:Used also as a title in editing state
-//l:list_setting_pane_t1
-//
-#define qtn_dm_set_lbl_accepted     "Accepted"
-
-//d:Value used in setting view's (Yes/No) lists
-//l:list_set_graphic_pane_t1
-//
-#define qtn_dm_set_accepted_value_true  "Yes"
-
-//d:Value used in setting view's (Yes/No) lists
-//l:list_set_graphic_pane_t1
-//
-#define qtn_dm_set_accepted_value_false "No"
-
-
-//d:Command in options list.
-//d:Opens the settings subview
-//l:list_single_pane_t1_cp2
-//
-#define qtn_dm_options_change       "Change"
-
-//d:Value used in setting view's bearer type lists
-//l:list_set_graphic_pane_t1
-//
-#define qtn_sml_set_http            "Internet"
-
-//d:Value used in setting view's bearer type lists
-//l:list_set_graphic_pane_t1
-//
-#define qtn_sml_set_bluetooth       "Bluetooth"
-
-//d:Value used in setting view's bearer type lists
-//l:list_set_graphic_pane_t1
-//
-#define qtn_sml_set_irda            "IrDA"
-
-//d:Value used in setting view's bearer type lists
-//l:list_set_graphic_pane_t1
-//
-#define qtn_sml_set_usb             "USB"
-
-//d:One of the setting items in settings view
-//d:Used also as a title in editing state 
-//l:list_setting_pane_t1
-//w:
-//r:3.0
-//
-#define qtn_dm_set_lbl_https_active "Network authentication"
-
-//d:Value used in setting view's (Yes/No) lists
-//l:list_set_graphic_pane_t1
-//w:
-//r:3.0
-//
-#define qtn_dm_set_https_value_yes  "Yes"
-
-//d:Value used in setting view's (Yes/No) lists
-//l:list_set_graphic_pane_t1
-//w:
-//r:3.0
-//
-#define qtn_dm_set_https_value_no   "No"
-
-//d:One of the setting items in settings view
-//d:Used also as a title in editing state
-//l:list_setting_pane_t1
-//w:
-//r:3.0
-//
-#define qtn_dm_set_lbl_https_username   "Network user name"
-
-//d:One of the setting items in settings view
-//d:Used also as a title in editing state
-//l:list_setting_pane_t1
-//w:
-//r:3.0
-//
-#define qtn_dm_set_lbl_https_password   "Network password"
-
-//d:NOTE: This is defined in "s60\ConnectionUiUtilities\inc\ConnectionUiUtilities.loc"
-//d:(qtn_netw_sett_iap_pref_prompt)
-//d:This string is used as connection dialog access point (qtn_sml_set_list_access)
-//d:setting value when user has selected "Always ask" option in access point selection dialog.
-//l:list_set_graphic_pane_t1
-//r:3.0
-//
-#define qtn_dm_sett_always_ask      "Always ask"
-
-// ------------------------------------------------------
-// Agent info messages
-// ------------------------------------------------------
-
-//d:Error confirmation dialog
-//d:Message in log if system error occured
-//l:popup_note_window
-#define qtn_dm_log_err_systemerror  "System Error"
-
-//d:Error confirmation dialog
-//d:Message in log if system error occured in server
-//l:popup_note_window
-#define qtn_dm_log_err_servererror  "Error in Remote conf server"
-
-//d:Error confirmation dialog
-//d:Message in log if SyncML protocol error occured
-//l:popup_note_window
-#define qtn_dm_log_err_protocol     "Unable to configure"
-
-//d:Error confirmation dialog
-//d:Message in log if command sent to server was not supported 
-//l:popup_note_window
-#define qtn_dm_log_err_cmdnotsupported  "Unsupported SyncML software version in server"
-
-//d:Error confirmation dialog
-//d:Message in log if server has unsupported version
-//l:popup_note_window
-#define qtn_dm_log_err_versionnotsupported  "Unsupported SyncML software version in server"
-
-//d:Error confirmation dialog
-//d:Message in log if content type is not supported by server
-//l:popup_note_window
-#define qtn_dm_log_err_contentnotsupported  "Unsupported content type"
-
-//d:Error confirmation dialog
-//d:Message in log if client authentication failed
-//l:popup_note_window
-#define qtn_dm_log_err_clientauth   "Invalid user name or password"
-
-//d:Error confirmation dialog
-//d:Message in log if server authentication failed
-//l:popup_note_window
-#define qtn_dm_log_err_servertauth  "Authentication failed, check server ID and password"
-
-//d:Error confirmation dialog
-//d:Message in log if server was busy
-//l:popup_note_window
-#define qtn_dm_log_err_serverbusy   "Remote conf server was busy" 
-
-//d:Error confirmation dialog
-//d:Message in log if server is not responding
-//l:popup_note_window
-#define qtn_dm_log_err_servernotresponding  "Server is not responding"
-
-//d:Error confirmation dialog
-//d:Message in log if uri is invalid
-//l:popup_note_window
-#define qtn_dm_log_err_uriinvalid   "Invalid host address"
-
-//d:Error confirmation dialog
-//d:Message in log if communication error occured
-//l:popup_note_window
-#define qtn_dm_log_err_comm         "Error in communication"
-
-//d:Error confirmation dialog
-//d:Message in log if opening remote database failed
-//l:popup_note_window
-#define qtn_dm_log_err_sessionabort "Session was aborted by remote conf server" 
-
-//d:Error confirmation dialog
-//d:Message in log if communication error occured
-//l:popup_note_window
-#define qtn_dm_log_dialog_unknown_err   "Undefined error."
-
-//d:Error confirmation dialog
-//d:Message in log if communication error occured
-//l:popup_note_window
-#define qtn_dm_log_err_timedout         "Session timed out."
-
-//d:Command in main view options list.
-//d:opens the servers view
-//l:list_single_pane_t1_cp2 
-//r:3.2
-//
-#define qtn_dm_options_servers         "Servers"
-
-//d:Title of the application on the title pane
-//l:title_pane_t2/opt9 
-//r:3.2
-//
-#define qtn_dm_title_server_settings "Server settings"
-
-//d:Value used in setting view's bearer type lists
-//l:list_set_graphic_pane_t1 
-//r:3.2
-//
-#define qtn_dm_set_usb "USB"                  
-
-//d:Prompted for the user if not all the needed
-//d:information isn't entered for the profile
-//l:popup_note_window
-//r:3.2
-//
-#define qtn_dm_conf_server_settings_missing  "Incomplete server settings. Server not saved.\nExit anyway?"     
-
-//d:Confirmtion to start confirmation session
-//d:as start values. %U is the name of the selected profile.
-//l:popup_note_window 
-//r:3.2
-//
-#define qtn_dm_conf_activation_server "Selected server is not active. Do you want to set it active, and start configuration?"
-
-//d:Title of the servers view title pane
-//l:title_pane_t2/opt9
-//r:3.2
-//
-#define qtn_dm_title_servers "Servers"
-
-//d:Command in options list.
-//d:Opens settings view with existing server profile values
-//l:list_single_pane_t1_cp2
-//r:3.2
-//
-#define qtn_dm_opt_server_edit   "Edit server"
-
-//d:Command in options list.
-//d:Deletes currently selected server profile
-//l:list_single_pane_t1_cp2 
-//r:3.2
-//
-#define qtn_dm_opt_server_delete   "Delete server"
-
-//d:Command in options list.
-//d:Opens settings view with default server profile values
-//l:list_single_pane_t1_cp2
-//r:3.2
-//
-#define qtn_dm_opt_server_new   "New server"
-
-//d:Text on the confirmation query to use selected server profile's values
-//d:as start values. %U is the name of the selected server profile.
-//l:popup_note_window
-//r:3.2
-//
-#define qtn_dm_conf_server_copy_defaults "Copy values from server\n%U?"       
-
-//d:Main view delete sync profile command confirmation
-//d:%U refers to current profile name
-//l:popup_note_window
-//r:3.2
-//
-#define qtn_dm_conf_server_delete "Delete server\n%U?"          
-
-//d:Text on the confirmation query at application start
-//d:if no profiles exist and the list is empty
-//l:popup_note_window
-//r:3.2
-//
-#define qtn_dm_conf_new_server      "Create new server?"
-
-//d:Displayed as the secondary text in the empty main view if no server profiles exist
-//d:if no server profiles exist and the list is empty
-//l:main_list_empty_pane/opt2
-//r:3.2
-//
-#define qtn_dm_empty_no_profiles_secondary_text  "Select New profile from Options to define server profile"
-
-//d:Displayed as the secondary text in the empty main view if no servers exist with DM UI Evolution
-//d:if no servers exist and the list is empty
-//l:main_list_empty_pane/opt2
-//r:3.2
-//
-#define qtn_dm_empty_no_servers_secondary_text "Select New server from Options to define server"
-
-//d:lText of Device update list item in  Control panel Device management view
-//d:Item opens Updates application
-//l:list_single_large_graphic_pane_t1
-//r:5.0
-//
-#define qtn_cp_folder_device_updates "Device updates"
-
-//d:Text of the application title
-//l:title_pane_t1/opt7
-//r:5.0
-//
-#define qtn_apps_updates_title "Updates"
-
-//d:Information note to be shown for server started user informative session
-//l:popup_note_window
-//r:3.2
-//
-#define qtn_dm_info_note_updating "Updating device from server %U"
-
-//d:Error confirmation dialog
-//d:Message in log if client is connecting to Untrusted server
-//l:popup_note_window
-//r:3.2 
-//
-#define qtn_dm_log_err_untrusted_certificate "Server has Untrusted Certificate"
-
-//d:Displayed at the empty main view as primary text 
-//d:if no profiles exist and the list is empty
-//l:main_pane_empty_t1/opt2
-//r:3.2
-//
-#define	qtn_dm_empty_no_profiles_primary_text   "No profiles defined"
-
-//d:changing text displayed at receiving stage
-//d:Image replaced by animation
-//l:popup_note_wait_window
-//r:3.2
-//
-#define qtn_dm_note_receiving       "Receiving update data from %U"
-
-//d:Displayed at the empty main view as primary text,if no servers exist
-//d:if no servers exist and the list is empty
-//l:main_pane_empty_t1/opt2 
-//r:3.2
-//
-#define qtn_dm_empty_no_servers_primary_text "No servers defined"
-
-//d:Text on the confirmation query to use selected profile's values
-//d:as start values. %U is the name of the selected profile.
-//l:popup_note_window
-//r:3.2
-//
-#define qtn_dm_conf_copy_defaults   "Copy values from profile\n%U?"
-
-//d:Item showing product code in the Fota view
-//d:as start values. %U is Product code.
-//l:list_double_pane_t1_cp2 
-//r:5.2
-//
-#define qtn_dm_list_product_code "Product Code" 
-
-//d:Item showing browser version in the Fota view
-//d:as start values. %U is Browser Version.
-//l:list_double_pane_t1_cp2 
-//r:5.2
-//
-#define qtn_dm_list_browser_version  "Browser Version" 
-
-//d:Item showing java version in the Fota view
-//d:as start values. %U is Java Version.
-//l:list_double_pane_t1_cp2 
-//r:5.2
-//
-#define qtn_dm_list_java_version  "Java Version" 
-
-//d:Item showing flash version in the Fota view
-//d:as start values. %U is Flash Version.
-//l:list_double_pane_t1_cp2 
-//r:5.2
-//
-#define qtn_dm_list_flash_version "Flash Version" 
-// End of File
--- a/omadm/omadmappui/loc/NSmlDMSyncFota.loc	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,254 +0,0 @@
-/*
-* Copyright (c) 2005-2006 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:  FOTA specific localisation strings for NSmlDMSyncApp
-*
-*/
-
-
-//d:-----------------------------------------------------------
-//d:TAB TEXTS
-//d:-----------------------------------------------------------
-
-//d:Tab text when the fota view is active.
-//l:tabs_2_long_active_pane_t1
-//w:
-//r:3.1
-//
-#define qtn_dm_tab_phone_updates    "Updates"
-
-//d:Tab text when the profiles view is active.
-//l:tabs_2_long_active_pane_t1
-//w:
-//r:3.1
-//
-#define qtn_dm_tab_profiles     "Profiles"
-
-//d:-----------------------------------------------------------
-//d:FOTA VIEW
-//d:-----------------------------------------------------------
-
-//d:Item describing the current phone software version
-//d:in the fota view.
-//l:list_double_pane_t1_cp2
-//w:
-//r:3.1
-//
-#define qtn_fota_list_current_version   "Device software"
-
-//d:Item describing the latest update in the fota view.
-//l:list_double_pane_t1_cp2
-//w:
-//r:3.1
-//
-#define qtn_fota_list_latest_update     "Device updated"
-
-//d:Text shown in the place of the time of the latest update
-//d:when no software updates are yet performed.
-//l:list_double_pane_t2_cp2
-//w:
-//r:3.1
-//
-#define qtn_fota_list_not_updated       "Not updated"
-
-//d:Command in fota view options list.
-//d:Starts the checking for software updates
-//l:list_single_pane_t1_cp2
-//w:
-//r:3.1
-//
-#define qtn_fota_options_check_updates  "Check updates"
-
-//d:Command in fota view options list.
-//d:Starts the installing of retrieved update.
-//l:list_single_pane_t1_cp2
-//w:
-//r:3.1
-//
-#define qtn_fota_options_install_update "Install update"
-
-//d:Command in fota view options list.
-//d:Opens the fota settings dialog
-//l:list_single_pane_t1_cp2
-//w:
-//r:3.1
-//
-#define qtn_fota_options_update_settings    "Settings"
-
-//d:Setting item in fota settings view describing the
-//d:default profile used.
-//l:list_setting_pane_t1
-//w:
-//r:3.1
-//
-#define qtn_fota_setting_default_profile    "Default profile"
-
-//d:Setting item data in fota settings view presenting that
-//d:no default profile is defined.
-//l:list_set_graphic_pane_t1
-//w:
-//r:3.1
-//
-#define qtn_fota_setting_value_always_ask   "Always ask"
-
-//d:Title of the fota settings dialog on the title pane
-//l:title_pane_t2/opt9
-//w:
-//r:3.1
-//
-#define qtn_fota_title_update_settings  "Settings"
-
-//d:Title of the profile selection dialog when the user
-//d:initiates the firmware update check.
-//l:heading_pane_t1
-//w:
-//r:3.1
-//
-#define qtn_fota_list_query_select_server_profile   "Select server profile"
-
-//d:Confirmation note used when the user initiates the firmware
-//d:update check. Confirms that the user wants to initiate connection
-//d:to the server.
-//l:popup_note_window
-//w:
-//r:3.1
-//
-#define qtn_fota_conf_query_connection_is_needed    "You are about to connect to the Internet. Normal data call costs may apply. Connect?"
-
-//d:Wait note shown during the user initiated checking of updates.
-//d:Is shown during the communication with the device management
-//d:server and possibly, but not necessarily, during the downloading
-//d:of the update packet.
-//l:popup_note_wait_window
-//w:
-//r:3.1
-//
-#define qtn_fota_wait_checking_update   "Checking for update"
-
-//d:Text of the info note shown to user after the user initiated
-//d:update check, if the SyncML server had no new software updates
-//d:available.
-//l:popup_note_window
-//w:
-//r:3.1
-//
-#define qtn_fota_no_new_updates         "There are no new updates at this time."
-
-//d:Item describing the sales model name
-//d:in main view.
-//l:list_double_pane_t1_cp2
-//r:3.2
-//
-#define qtn_fota_list_model "Model"
-
-//d:Text shown when sales model name not available 
-//d:in main view.
-//l:list_double_pane_t2_cp2
-//r:3.2
-//
-#define qtn_dm_list_model_not_available  	"Not available"
-
-//d:Item shown only when update package is
-//d:available in main view.
-//l:list_double_pane_t1_cp2 
-//r:3.2
-//
-#define qtn_fota_list_new_sw_available  "New device software"
-
-//d:Text shown when update package is ready 
-//d:for install in main view.
-//l:list_double_pane_t2_cp2 
-//r:3.2
-//
-#define qtn_fota_list_sw_available  	"Available for install"
-
-//d:Setting item in fota settings view describing the
-//d:default profile used.
-//l:list_setting_pane_t1 
-//r:3.2
-//
-#define qtn_fota_setting_default_server "Default server"    
-
-//d:Title of the profile selection dialog when the user
-//d:initiates the firmware update check.
-//l:heading_pane_t1 
-//r:3.2
-//
-#define qtn_fota_list_query_select_server   "Select server"
-
-//d:List Item text shown for the software version date
-//d:available in main view.
-//l:list_double_pane_t1 
-//r:3.2
-//
-#define qtn_fota_list_sw_version_date "Software version date" 
-
-//d:List Item text shown for the software version 
-//d:available in main view.
-//l:list_double_pane_t1
-//r:3.2
-//
-#define qtn_fota_list_sw_version "Software version" 
-
-//d:List Item text shown for the custom version
-//d:available in main view.
-//l:list_double_pane_t1
-//r:3.2
-//
-#define qtn_fota_list_custom_version "Custom version" 
-
-//d:List Item text shown for the custom version date
-//d:available in main view.
-//l:list_double_pane_t1
-//r:3.2
-//
-#define qtn_fota_list_custom_version_date "Custom version date" 
-
-//d:List Item text shown for the language package
-//d:available in main view.
-//l:list_double_pane_t1
-//r:3.2
-//
-#define qtn_fota_list_language "Language package" 
-
-//d:List Item text shown for type
-//d:available in main view.
-//l:list_double_pane_t1
-//r:3.2
-//
-#define qtn_fota_list_type_designator "Type"
-
-//d:Command in main view options list.
-//d:Continutes the fota download update process
-//d:This is shown only when download is postponed
-//l:list_single_pane_t1_cp2 
-//r:5.0
-//
-#define qtn_fota_options_continue_update  "Continue update"
-
-//d:Item shown only when download is
-//d:postponed, in main view.
-//l:list_double_pane_t2_cp2
-//r:5.0
-//      
-#define qtn_fota_list_download_postponed	"Download postponed"
-
-//d:List Item text shown for the product release 
-//d:available in main view.
-//l:list_double_pane_t1
-//r:5.2
-//      
-#define qtn_fota_list_release	"Release"
-
-
-// End of File
--- a/omadm/omadmappui/rom/OmaDmAppUi.iby	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of DM UI component
-* 	This is part of omadmappui.
-*
-*/
-REM OMA Device Management Application UI
-
-#include <bldvariant.hrh>
-
-#ifndef __OMADMAPPUI_IBY__
-#define __OMADMAPPUI_IBY__
-
-#ifdef __SYNCML_DM // nothing should be installed from this .iby file if __SYNCML_DM feature is not selected
-
-S60_APP_EXE(NSmlDMSync)
-SCALABLE_IMAGE(APP_BITMAP_DIR,APP_BITMAP_DIR,NSmlDMSync)
-S60_APP_AIF_ICONS(NSmlDMSync)
-S60_APP_AIF_RSC(NSmlDMSync)
-
-#ifdef __SYNCML_DM_FOTA
-data=DATAZ_\private\101F6DE5\backup_registration.xml	private\101F6DE5\backup_registration.xml
-#endif // __SYNCML_DM_FOTA
-
-ECOM_PLUGIN(OmaDmCPPlugin.dll,OmaDmCPPlugin.rsc)
-
-#endif // __SYNCML_DM
-
-#endif //__OMADMAPPUI_IBY__
--- a/omadm/omadmappui/rom/OmaDmAppUiResources.iby	Tue Feb 02 00:03:17 2010 +0200
+++ /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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of DM UI component
-* 	This is part of omadmappui.
-*
-*/
-REM OMA Device Management Application UI IBY-file for localizable elements
-
-#ifndef __OMADMAPPUIRESOURCES_IBY__
-#define __OMADMAPPUIRESOURCES_IBY__
-
-#ifdef __SYNCML_DM
-
-S60_APP_RESOURCE(NSmlDMSync)
-S60_APP_CAPTION(NSmlDMSync)
-
-
-data=DATAZ_\RESOURCE_FILES_DIR\OmaDmCPPluginResource.rsc RESOURCE_FILES_DIR\OmaDmCPPluginResource.rsc
-
-#endif //__SYNCML_DM
-
-#endif //__OMADMAPPUIRESOURCES_IBY__
--- a/omadm/omadmappui/src/NSmlDMAuthQueryDlg.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,196 +0,0 @@
-/*
-* Copyright (c) 2002-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:  Multiquery for user name and password
-*
-*/
-
-
-// INCLUDE FILES
-#include "NSmlDMAuthQueryDlg.h"
-#include "NSmlDMSyncProfile.h"
-#include "NSmlDMSyncDebug.h"
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CNSmlDMMultiQuery::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CNSmlDMMultiQuery* CNSmlDMMultiQuery::NewL( CNSmlDMSyncAppEngine* aAppEngine,
-                                            TInt aProfileId,
-                                            TBool aIsHttp )
-	{
-	CNSmlDMMultiQuery* self = new( ELeave ) CNSmlDMMultiQuery( aAppEngine,
-	                                                           aProfileId,
-	                                                           aIsHttp );
-	CleanupStack::PushL( self );
-	CleanupStack::Pop( self );
-	return self;
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMMultiQuery::CNSmlDMMultiQuery
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CNSmlDMMultiQuery::CNSmlDMMultiQuery( CNSmlDMSyncAppEngine* aAppEngine,
-                                      TInt aProfileId,
-                                      TBool aIsHttp,
-                                      TTone aTone /*= ENoTone*/ )
-                                    : CAknMultiLineDataQueryDialog( aTone ),
-                                      iAppEngine( aAppEngine ),
-                                      iProfileId( aProfileId ),
-                                      iIsHttp( aIsHttp )
-	{
-	}
-
-// -----------------------------------------------------------------------------
-// Destructor.
-// -----------------------------------------------------------------------------
-//
-CNSmlDMMultiQuery::~CNSmlDMMultiQuery() 
-	{ 
-	delete iTimer;
-	}	
-
-// -----------------------------------------------------------------------------
-// CNSmlDMMultiQuery::OkToExitL
-// -----------------------------------------------------------------------------
-//
-TBool CNSmlDMMultiQuery::OkToExitL( TInt aButtonId )
-	{
-	FLOG( "[OMADM] CNSmlDMMultiQuery::OkToExitL" );
-
-	if ( iTimer )
-		{
-		iTimer->Cancel();
-		}
-
-	TBool retValue = CAknMultiLineDataQueryDialog::OkToExitL( aButtonId );
-	
-	if ( aButtonId == EAknSoftkeySave )
-		{
-		CAknMultilineQueryControl* firstControl = FirstControl();
-		firstControl->GetText(iUsername);
-
-		CAknMultilineQueryControl* secondControl = SecondControl();
-		secondControl->GetText(iPassword);
-		
-		CNSmlDMSyncProfile* profile = iAppEngine->OpenProfileL( iProfileId );
-        if ( iIsHttp )
-            {
-            profile->SetHttpUserNameL( iUsername );
-            profile->SetHttpPasswordL( iPassword );
-            }
-        else
-            {   
-		    profile->SetUserNameL( iUsername );
-            profile->SetPasswordL( iPassword );
-            }
-		profile->SaveL();
-        iAppEngine->CloseProfile();
-		}
-	return retValue;
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMMultiQuery::PostLayoutDynInitL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMMultiQuery::PostLayoutDynInitL()
-	{
-    FLOG( "[OMADM] CNSmlDMMultiQuery:" );
-
-	iTimer = CNSmlDMQueryTimer::NewL( this );
-	iTimer->After( NSmlDMAuthQueryShowTime * KMultiplier );	// iTime == microseconds
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMMultiQuery::HandleTimerEndL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMMultiQuery::HandleTimerEndL()
-	{
-    FLOG( "[OMADM] CNSmlDMMultiQuery:" );
-
-	delete iTimer;
-	iTimer = 0;
-	TryExitL( EEikBidCancel );
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMAlertTimer implementation
-// -----------------------------------------------------------------------------
-
-// -----------------------------------------------------------------------------
-// CNSmlDMQueryTimer::CNSmlDMQueryTimer
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CNSmlDMQueryTimer::CNSmlDMQueryTimer() : CTimer( EPriorityStandard )
-	{
-	}
-
-// -----------------------------------------------------------------------------
-// Destructor.
-// -----------------------------------------------------------------------------
-//
-CNSmlDMQueryTimer::~CNSmlDMQueryTimer()
-	{
-	Cancel();
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMQueryTimer::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CNSmlDMQueryTimer* CNSmlDMQueryTimer::NewL( CNSmlDMMultiQuery* aAlertDialog )
-	{
-	CNSmlDMQueryTimer* self = new (ELeave) CNSmlDMQueryTimer();
-	CleanupStack::PushL(self);
-	self->ConstructL( aAlertDialog );
-	CleanupStack::Pop(); // self
-	return self;
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMQueryTimer::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMQueryTimer::ConstructL( CNSmlDMMultiQuery* aAlertDialog )
-	{
-    FLOG( "[OMADM] CNSmlDMQueryTimer: ConstructL" );
-
-	iAlertDialog = aAlertDialog;
-	CTimer::ConstructL();
-	CActiveScheduler::Add(this);
-	}
-	
-// -----------------------------------------------------------------------------
-// CNSmlDMQueryTimer::RunL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMQueryTimer::RunL()
-	{
-    FLOG( "[OMADM] CNSmlDMQueryTimer:" );
-
-	iAlertDialog->HandleTimerEndL();
-	}
-
-//  End of File
--- a/omadm/omadmappui/src/NSmlDMDbNotifier.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,331 +0,0 @@
-/*
-* Copyright (c) 2002-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:  Provides methods for CNSmlDMDbNotifier class. 
-*
-*/
-
-
-#include "NSmlDMDbNotifier.h"
-#include "NSmlDMSyncDebug.h"
-#include "NSmlDMdef.h"
-
-// -----------------------------------------------------------------------------
-// CNSmlDMDbNotifier::CNSmlDMDbNotifier
-// -----------------------------------------------------------------------------
-//
-CNSmlDMDbNotifier::CNSmlDMDbNotifier( RSyncMLSession* aSyncSession,
-                                      MNSmlDMDbEventHandler* aHandler)
-                                     : iSyncSession(aSyncSession),
-                                       iHandler( aHandler )
- 	{
- 	}
-
-
-// -----------------------------------------------------------------------------
-// CNSmlDMDbNotifier::NewL
-// -----------------------------------------------------------------------------
-//
-CNSmlDMDbNotifier* CNSmlDMDbNotifier::NewL( RSyncMLSession* aSyncSession,
-                                            MNSmlDMDbEventHandler* aHandler)
-	{
-	CNSmlDMDbNotifier* self = new (ELeave) CNSmlDMDbNotifier( aSyncSession,
-	                                                          aHandler );
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMDbNotifier::ConstructL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMDbNotifier::ConstructL()
-	{
-	iActiveCaller = CNSmlDMActiveCaller::NewL(this);
-	}
-
-// -----------------------------------------------------------------------------
-// Destructor
-// -----------------------------------------------------------------------------
-//
-CNSmlDMDbNotifier::~CNSmlDMDbNotifier()
-	{		
-	delete iActiveCaller;
-	iList.Close();
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMDbNotifier::RequestL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMDbNotifier::RequestL()
-	{
-	Session().RequestEventL( *this );  // request MSyncMLEventObserver events
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMDbNotifier::OnSyncMLSessionEvent
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMDbNotifier::OnSyncMLSessionEvent( TEvent aEvent,
-                                              TInt aIdentifier,
-                                              TInt aError,
-                                              TInt /*aAdditionalData*/ )
-	{
-	TNSmlDMDbEvent event;
-
-	event.iType = aEvent;
-	event.iError = aError;
-		
-	if (aEvent == MSyncMLEventObserver::EProfileCreated || 
-	    aEvent == MSyncMLEventObserver::EProfileChanged ||
-	    aEvent == MSyncMLEventObserver::EProfileDeleted )
-		{
-		event.iProfileId = aIdentifier;
-		}
-	else
-		{
-		event.iProfileId = KErrNotFound;
-		}
-	
-	TRAP_IGNORE( iList.AppendL (event) );
-	
-	CallObserverWithDelay();
-	TRAP_IGNORE( RequestL() );
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMDbNotifier::SetDisabled
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMDbNotifier::SetDisabled( TBool aDisable )
-	{
-    iDisabled = aDisable;
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMDbNotifier::Reset
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMDbNotifier::Reset()
-	{
-    iDisabled = EFalse;
-	iList.Reset();
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMDbNotifier::EventCount
-// -----------------------------------------------------------------------------
-//
-TInt CNSmlDMDbNotifier::EventCount()
-	{
-	return iList.Count();
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMDbNotifier::Event
-// -----------------------------------------------------------------------------
-//
-TNSmlDMDbEvent CNSmlDMDbNotifier::Event( TInt aIndex )
-	{
-	__ASSERT_DEBUG( aIndex >= 0 && aIndex < iList.Count(),
-	                TUtil::Panic(KErrGeneral) );
-
-	return iList[aIndex];
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMDbNotifier::Session
-// -----------------------------------------------------------------------------
-//
-RSyncMLSession& CNSmlDMDbNotifier::Session()
-	{
-	__ASSERT_DEBUG( iSyncSession, TUtil::Panic(KErrGeneral) );
-	
-	return *iSyncSession;
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMDbNotifier::CallObserverWithDelay
-//
-// This is needed to avoid unnecessary observer calls (eg. in case 10 events are
-// reported in short time only last is reported to observer). 
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMDbNotifier::CallObserverWithDelay()
-	{
-    iActiveCaller->Cancel();
-	iActiveCaller->Start( KErrNone, KListBoxUpdateDelay );
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMDbNotifier::CallObserver
-//
-// this function investigates received events from last observer call
-// and calls observer to inform UI what to do. 
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMDbNotifier::CallObserver()
-	{
-	TNSmlDMDbEvent event;
-	event.iProfileId = 0;
-	event.iType = 0;
-	event.iError = 0;
-	//
-	// check for critical error
-	//
-	if ( FindCloseEvent() != KErrNotFound )
-		{
-		event.iType = EClose;
-		TRAP_IGNORE( iHandler->HandleDbEventL( event ) );
-		return; // some database problem - UI should close
-		}
-	
-	//
-	// check if only one profile has changed
-	//
-	TInt index = FindSingleProfileEvent();
-	if ( index != KErrNotFound )
-		{
-		TNSmlDMDbEvent e = iList[index];
-        if (e.iType == MSyncMLEventObserver::EProfileDeleted)
-			{
-			event.iType = EDelete;
-			event.iProfileId = e.iProfileId; 
-			}
-		else
-			{
-			event.iType = EUpdate;
-			event.iProfileId = e.iProfileId; 
-			}
-	
-		TRAP_IGNORE( iHandler->HandleDbEventL( event ) );
-        return;
-		}
-		
-	//
-	// check if 2 or more profiles have changed
-	//
-	if (FindProfileEvent() != KErrNotFound)
-		{
-	    event.iType = EUpdateAll;
-    	TRAP_IGNORE( iHandler->HandleDbEventL( event ) );
-        return;
-    	}
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMDbNotifier::FindCloseEvent
-// -----------------------------------------------------------------------------
-//
-TInt CNSmlDMDbNotifier::FindCloseEvent()
-	{
-	TInt count = iList.Count();
-
-	for ( TInt index = 0; index < count; index++ )
-		{
-		TNSmlDMDbEvent event = iList[index];
-		if ( event.iType == MSyncMLEventObserver::EServerTerminated )
-			{
-			return index;
-			}
-		}
-
-	return KErrNotFound;
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMDbNotifier::FindProfileEvent
-// -----------------------------------------------------------------------------
-//
-TInt CNSmlDMDbNotifier::FindProfileEvent()
-	{
-	TInt count = iList.Count();
-
-    for ( TInt index = 0; index < count; index++ )
-		{
-		TNSmlDMDbEvent event = iList[index];
-		if ( event.iProfileId != KErrNotFound )
-			{
-			return index;
-			}
-		}
-
-	return KErrNotFound;
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMDbNotifier::FindSingleProfileEvent
-// -----------------------------------------------------------------------------
-//
-TInt CNSmlDMDbNotifier::FindSingleProfileEvent()
-	{
-	TInt count = iList.Count();
-
-	// find out whether list contains update events for one profile only
-	for ( TInt index = 0; index < count; index++ )
-		{
-		TNSmlDMDbEvent event = iList[index];
-		if ( event.iProfileId != KErrNotFound &&
-		     IsUniqueProfileId(event.iProfileId) )
-			{
-			return index;
-        	}
-		}
-
-	return KErrNotFound;
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMDbNotifier::IsUniqueProfileId
-// -----------------------------------------------------------------------------
-//
-TBool CNSmlDMDbNotifier::IsUniqueProfileId( TInt aId )
-	{
-	TInt count = iList.Count();
-
-    for ( TInt index = 0; index < count; index++ )
-		{
-		TNSmlDMDbEvent event = iList[index];
-		if ( event.iProfileId != KErrNotFound && event.iProfileId != aId )
-			{
-			return EFalse;
-			}
-		}
-
-	return ETrue;
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMDbNotifier::HandleActiveCallL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMDbNotifier::HandleActiveCallL()
-	{
-	if ( iDisabled )
-		{
-		return;  // UI has disabled notifications
-		}
-
-	if ( iSyncRunning )
-		{
-		return; // no UI updates while syncing
-		}
-
-	CallObserver();
-	Reset();
-	}
-
-// End of File
--- a/omadm/omadmappui/src/NSmlDMDlgProfileView.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1941 +0,0 @@
-/*
-* Copyright (c) 2005-2006 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:  Methods for Server Profile Settings dialog
-*
-*/
-
-
-// INCLUDE FILES
-#include <akntextsettingpage.h>
-#include <aknpasswordsettingpage.h>
-#include <aknnotewrappers.h>
-#include <aknnavi.h>
-#include <ApUtils.h>
-#include <ApSettingsHandlerUI.h>
-#include <StringLoader.h>
-#include <featmgr.h>
-#include <ConnectionUiUtilities.h>
-#include <aknradiobuttonsettingpage.h>
-
-#include "NSmlDMSyncApp.h"
-#include "NSmlDMSyncDocument.h"
-#include "NSmlDMSyncAppUi.h"
-#include "NSmlDMDlgProfileView.h"
-#include "NSmlDMSyncProfile.h"
-#include "NSmlDMSyncAppEngine.h"
-#include "NSmlDMSyncDebug.h"
-#include "NSmlDMItemData.h"
-#include "nsmldmsyncinternalpskeys.h"
-#include <NSmlDMSync.rsg>
-#include <cmmanager.rsg>
-#include <ConnectionUiUtilities.rsg>
-#include <bautils.h> 
-
-#include <hlplch.h>
-#include <csxhelp/dm.hlp.hrh>
-
-_LIT( KACMManagerResDirAndFileName, "z:cmmanager.rsc" );
-_LIT(KConnectionUiUtilitiesRscPath, "z:ConnectionUiUtilities.rsc");
-_LIT(KDC_RESOURCE_FILES_DIR,"\\resource\\");  
-
-
-// ============================= MEMBER FUNCTIONS ==============================
-
-// -----------------------------------------------------------------------------
-// CNSmlDMDlgProfileView::NewL
-// -----------------------------------------------------------------------------
-//
-CNSmlDMDlgProfileView* CNSmlDMDlgProfileView::NewL( CNSmlDMSyncDocument* aDoc,
-		                                            TNSmlEditMode aMode,
-		                                            TInt aProfileId )
-    {
-    FLOG( "CNSmlDMDlgProfileView::NewL" );
-
-    CNSmlDMDlgProfileView* self =
-                            new ( ELeave ) CNSmlDMDlgProfileView( aDoc,
-                                                                  aMode,
-                                                                  aProfileId );
-    CleanupStack::PushL( self );
-    self->ConstructL( R_SETTINGS_PROFILEMENU );
-    CleanupStack::Pop();
-    return( self );
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMDlgProfileView::CNSmlDMDlgProfileView
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CNSmlDMDlgProfileView::CNSmlDMDlgProfileView( CNSmlDMSyncDocument* aDoc,
-                                              TNSmlEditMode aMode,
-                                              TInt aProfileId  )
-                                            : iDoc( aDoc ),
-                                              iEditMode( aMode ),
-                                              iProfileId( aProfileId ),
-                                              iResourceOffset(KErrNotFound),
-                                              iConnUtilResourceOffset(KErrNotFound)
-	{
-	FLOG( "[OMADM] CNSmlDMDlgProfileView::CNSmlDMDlgProfileView" );
-	
-	}
-
-// -----------------------------------------------------------------------------
-// Destructor
-// -----------------------------------------------------------------------------
-//
-CNSmlDMDlgProfileView::~CNSmlDMDlgProfileView()
-    {
-    FLOG( "[OMADM] ~CNSmlDMDlgProfileView:" );
-    if(iResourceOffset >= 0)
-        {
-        CCoeEnv::Static()->DeleteResourceFile(iResourceOffset);
-        }    
-    if(iConnUtilResourceOffset >= 0)
-        {
-        CCoeEnv::Static()->DeleteResourceFile(iConnUtilResourceOffset);
-        }
-    if ( iNaviPane )
-        {
-        iNaviPane->Pop();
-        }
-    
-	if ( iProfileList )
-		{
-		iProfileList->ResetAndDestroy();
-		delete iProfileList;
-		}
-	iAvkonAppUi->RemoveFromStack( this );
-	FeatureManager::UnInitializeLib();
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMDlgProfileView::OkToExitL
-// -----------------------------------------------------------------------------
-//
-TBool CNSmlDMDlgProfileView::OkToExitL( TInt aButtonId )
-	{
-	FLOG( "[OMADM] CNSmlDMDlgProfileView::OkToExitL:" );
-    
-    if ( aButtonId == EAknSoftkeyChange )
-        {
-    	HandleOKL();
-    	return EFalse;
-        }
-	
-	if ( aButtonId == EAknSoftkeyBack )
-        {
-		TBool closeDlg = ETrue;
-		TBool saveProfile = ETrue;
-        //TInt index;
-		TInt retValue = CheckMandatoryFieldsL();
-		if ( retValue != KErrNotFound ) 
-			{
-			if ( ShowConfirmationNoteL( R_NSML_SETTINGS_SAVE_ANYWAY ) )
-				{
-				if ( iEditMode == ESmlCopyProfile  )
-					{
-					iDoc->MoveIndexToProfile( iProfileId );
-			        // This deletes the source profile
-			        //iDoc->DeleteProfile( index );
-			        iDoc->AppEngine()->DeleteProfileL( iProfileId );
-			        iDoc->MoveIndexToProfile( iOldProfileId );
-					}
-				else if ( iEditMode == ESmlNewProfile )
-				    {
-				    iDoc->AppEngine()->DeleteProfileL( iProfileId );
-				    }
-				//For CP stored umcompleted message
-				else if ( iEditMode == ESmlEditProfile )
-				    {
-				    iDoc->AppEngine()->DeleteProfileL( iProfileId );
-				    iDoc->RefreshProfileListL();
-				    iDoc->MoveIndexToProfile( iProfileId );
-				    }
-				//For CP umcompleted message
-				saveProfile = EFalse;
-				}
-			else
-				{
-				closeDlg = EFalse;
-				iProfileListBox->SetCurrentItemIndexAndDraw( retValue );
-				saveProfile = EFalse;
-				}
-			}
-		if ( saveProfile )
-			{
-			SaveProfileL();	
-			}
-		if ( closeDlg )
-			{
-			((CNSmlDMSyncAppUi*)iDoc->AppUi())->ChangeViewL( ETrue );
-			}
-		return closeDlg;
-		}
-	return CAknDialog::OkToExitL( aButtonId );
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMDlgProfileView::ProcessCommandL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMDlgProfileView::ProcessCommandL( TInt aCommandId )
-	{
-	FLOG( "[OMADM] CNSmlDMDlgProfileView::ProcessCommandL:" );
-	
-	HideMenu();
-	switch ( aCommandId )
-		{
-     case EAknCmdHelp:             
-			{
-				if (FeatureManager::FeatureSupported( KFeatureIdHelp ))
-             { 
-			          HlpLauncher::LaunchHelpApplicationL( iEikonEnv->WsSession(), ((CNSmlDMSyncAppUi*)iDoc->AppUi())->AppHelpContextL() ); 	
-             }
-				
-			
-            break;
-			}
-		case ENSmlSettChange:
-			{				
-			CNSmlDMProfileData* item = 
-			            GetItemForIndex( iProfileListBox->CurrentItemIndex());
-			if ( item->iItemType == CNSmlDMProfileData::ENSmlTypeListYesNo ||
-				 item->iItemType == CNSmlDMProfileData::ENSmlTypehttpListYesNo ||
-				 item->iItemType == CNSmlDMProfileData::ENSmlTypeList
-			    )
-				{
-				if ( EditSettingItemListL( *item ) )
-					{
-					//update listbox
-					AddProfileListItemL( iProfileListBox, iProfileList );
-					}
-				iProfileListBox->HandleItemAdditionL();
-				}
-			else
-				{
-				HandleOKL();
-				}
-			}			
-		    break;
-
-		case ENSmlSettExit:
-		case EAknCmdExit:
-        case EEikCmdExit:
-			{
-			if ( CheckMandatoryFieldsL() >= KErrNone)
-				{
-				if ( !ShowConfirmationNoteL( R_NSML_SETTINGS_SAVE_ANYWAY ) )
-					{
-					return;
-					}
-				else if( iEditMode == ESmlEditProfile )	
-					{
-					iDoc->AppEngine()->DeleteProfileL( iProfileId );
-					}
-				}
-			TApaTaskList taskList(CEikonEnv::Static()->WsSession());
-	        TApaTask task1(taskList.FindApp( KFotaServerAppUid));
-	        if(task1.Exists())
-	        	{
-	        	FLOG( "ending fotaserver 1..." );
-	        	task1.EndTask();
-	        	}
-	        TApaTask task2(taskList.FindApp( KFotaServerAppUid));
-	        if(task2.Exists())
-	        	{
-	        	FLOG( "ending fotaserver 2..." );
-	        	task2.EndTask();
-	        	}
-	        TApaTask task3(taskList.FindApp( KFotaServerAppUid));
-	        if(task3.Exists())
-	        	{
-	        	FLOG( "ending fotaserver 3..." );
-	        	task3.EndTask();
-	        	}
-			STATIC_CAST( CNSmlDMSyncAppUi*, iEikonEnv->EikAppUi() )->DoExit();
-			}
-		    break;
-
-		default:
-	    	break;
-		}
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMDlgProfileView::PreLayoutDynInitL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMDlgProfileView::PreLayoutDynInitL()
-    {
-    FLOG(  "[OMADM] CNSmlDMDlgProfileView::PreLayoutDynInitL:");    
-    TParse parse;
-    parse.Set(KACMManagerResDirAndFileName, &KDC_RESOURCE_FILES_DIR, NULL);
-    TFileName resourceFile;
-    resourceFile.Append(parse.FullName());
-    CEikonEnv* coeEnv = CEikonEnv::Static();
-    RFs& fileSession = coeEnv->FsSession();    
-    BaflUtils::NearestLanguageFile( fileSession, resourceFile );    
-    if ( !BaflUtils::FileExists( fileSession, resourceFile ) )
-        {
-        User::Leave( KErrNotFound );
-        }
-     iResourceOffset = coeEnv->AddResourceFileL( resourceFile );
-     
-     TParse connutilname;
-     connutilname.Set(KConnectionUiUtilitiesRscPath, &KDC_RESOURCE_FILES_DIR, NULL);     
-     resourceFile.Zero();
-     resourceFile.Append(connutilname.FullName());     
-     BaflUtils::NearestLanguageFile( fileSession, resourceFile );     
-     if ( !BaflUtils::FileExists( fileSession, resourceFile ) )
-         {
-         User::Leave( KErrNotFound );
-         }
-     iConnUtilResourceOffset = coeEnv->AddResourceFileL( resourceFile );
-     
-    iAvkonAppUi->AddToStackL( this );
-	FeatureManager::InitializeLibL();
-
-	iProfileListBox = (CAknSettingStyleListBox*)Control( ENSmlSettingList );
-	iProfileListBox->SetListBoxObserver( this );
-	iProfileListBox->CreateScrollBarFrameL( ETrue );
-	iProfileListBox->ScrollBarFrame()->SetScrollBarVisibilityL( 
-	                                                CEikScrollBarFrame::EOn,
-	                                                CEikScrollBarFrame::EAuto );
-
-    iSyncAppEngine = iDoc->AppEngine();
-	iProfileList = new (ELeave) CArrayPtrFlat<CNSmlDMProfileData>(1);
-	
-    if ( iEditMode == ESmlCopyProfile )
-		{
-		iOldProfileId = iProfileId;
-		iDoc->GetCopyProfileL( iProfileId );
-		iDoc->RefreshProfileListL();
-		iDoc->MoveIndexToProfile( iProfileId );
-		iServerIdChanged = ETrue;
-		}
-	else if ( iEditMode == ESmlNewProfile )
-		{
-        iProfileId = iSyncAppEngine->CreateProfileL();
-		}
-    CreateProfileSettingsListL();
-    SetSettingTitleL();
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMDlgProfileView::DynInitMenuPaneL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMDlgProfileView::DynInitMenuPaneL( TInt aResourceID,
-                                              CEikMenuPane* aMenuPane )
-	{
-     	FLOG( "[OMADM] CNSmlDMDlgProfileView::DynInitMenuPaneL:" );
-     	
-     	
-     	if (aResourceID == R_SETTINGS_MENU  && 
-     	                 !FeatureManager::FeatureSupported( KFeatureIdHelp ))
-          {   aMenuPane->SetItemDimmed( EAknCmdHelp , ETrue );
-          }
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMDlgProfileView::HandleListBoxEventL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMDlgProfileView::HandleListBoxEventL( CEikListBox* /*aListBox*/,
-                                                 TListBoxEvent aEventType )
-	{
-	FLOG( "[OMADM] CNSmlDMDlgProfileView::HandleListBoxEventL:" );
-	
-	if ( aEventType == EEventEnterKeyPressed ||
-	     aEventType == EEventItemSingleClicked )
-		{
-		HandleOKL();
-		}
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMDlgProfileView::HandleOKL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMDlgProfileView::HandleOKL()
-	{
-	FLOG( "[OMADM] CNSmlDMDlgProfileView::HandleOKL:");
-	
-	CNSmlDMProfileData* item = 
-	                    GetItemForIndex( iProfileListBox->CurrentItemIndex() );
-	if ( PrepareToEditSettingItemL( *item ) )
-		{
-		if ( iProfileListBox->CurrentItemIndex() == ENSmlServerId )
-			{	
-			iServerIdChanged = ETrue;
-			if ( CheckUniqueFieldsL() != KErrNotFound )
-				{
-				STATIC_CAST( CNSmlDMSyncAppUi*,
-				         iEikonEnv->EikAppUi())->ShowResourceErrorNoteL(
-				                              R_QTN_DM_CONF_SET_DUP_SERVER_ID );
-				}
-			else
-				{
-				iServerIdChanged = EFalse;
-				}	
-			}
-		else if ( iProfileListBox->CurrentItemIndex() == ENSmlConnType )
-			{
-			TBool hidden = 
-			    ( Item( ENSmlConnType )->iNumberData != EProfileInternet );
-			Item( ENSmlAccessPoint )->iHidden = hidden;			  
-			Item( ENSmlProfilePort )->iHidden = hidden;
-			Item( ENSmlHttpsUsed )->iHidden = hidden;
-			if(Item( ENSmlHttpsUsed )->iNumberData == 0 || hidden )
-			    {			    
-			    Item( ENSmlHttpsUsername )->iHidden = ETrue;
-			    Item( ENSmlHttpsPassword )->iHidden = ETrue;
-			    }
-			else
-			    {			    
-			    Item( ENSmlHttpsUsername )->iHidden = EFalse;
-			    Item( ENSmlHttpsPassword )->iHidden = EFalse;
-			    }			
-			}
-		//update listbox items
-		AddProfileListItemL( iProfileListBox, iProfileList );
-		}
-	iProfileListBox->HandleItemAdditionL();
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMDlgProfileView::OfferKeyEventL
-// -----------------------------------------------------------------------------
-//
-TKeyResponse CNSmlDMDlgProfileView::OfferKeyEventL( const TKeyEvent& aKeyEvent,
-                                                    TEventCode aType )
-	{
-	FLOG( "[OMADM] CNSmlDMDlgProfileView::OfferKeyEventL:" );
-	
-	if ( aType == EEventKey )
-		{
-		switch ( aKeyEvent.iCode )
-			{
-			case EKeyEscape:
-                {
-                iAvkonAppUi->ProcessCommandL( EAknCmdExit );
-                }
-			    break;
-			case EKeyEnter:
-			case EKeyOK: // OK button
-                {
-				HandleOKL();
-                return EKeyWasConsumed;
-                }
-			default:
-			    break;
-			}
-		}
-	return CEikDialog::OfferKeyEventL( aKeyEvent, aType);
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMDlgProfileView::AddProfileListItemL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMDlgProfileView::AddProfileListItemL( 
-                                             CEikTextListBox* aListBox,
-                                             CNSmlDMSettingItemList* aItemList )
-	{
-	FLOG( "[OMADM] CNSmlDMDlgProfileView::AddProfileListItemL:" );
-	
-	if ( ( !aListBox ) || ( !aItemList ) )
-		{
-		User::Leave( KErrNotFound );
-		}
-	CDesCArray* arr = (CDesCArray*)aListBox->Model()->ItemTextArray();
-	arr->Reset();
-
-	for ( TInt index = 0; index < aItemList->Count(); index++ )
-		{
-		if ( !(aItemList->At( index ))->iHidden )
-			{
-			TBool convert = 
-			           !( index == ENSmlProfileURL || index == ENSmlUsername /*|| index == ENSmlProfilePort*/ );
-			
-			arr->AppendL( (aItemList->At(index))->ItemToListLC( convert )->Des() );
-			(aItemList->At( index ))->iIndex = arr->Count() - 1;
-			
-			CleanupStack::PopAndDestroy(); //ItemToListLC()
-			}
-		else
-			{
-			(aItemList->At( index ))->iIndex = KErrNotFound;
-			}
-		}
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMDlgProfileView::CreateProfileSettingsListL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMDlgProfileView::CreateProfileSettingsListL()
-	{
-	FLOG( "[OMADM] CNSmlDMDlgProfileView::CreateProfileSettingsListL:" );
-	
-	CDesCArrayFlat* items = 
-	                iEikonEnv->ReadDesCArrayResourceL( R_SML_SETTINGS_ITEMS );
-	CleanupStack::PushL( items );
-	TInt index;
-	for ( index = 0; index < items->Count(); index++ )
-		{
-		iProfileList->AppendL( CNSmlDMProfileData::NewLC() );		
-		CleanupStack::Pop();
-		}
-	BuildHeaders( items );
-	BuildItemIds();
-	// Open profile	
-	iProfile = iSyncAppEngine->OpenProfileL( iProfileId, ESmlOpenReadWrite );
-
-	BuildProfileNameItemL();
-	BuildProfileServerIdItemL();
-	BuildProfileServerPasswordItemL();
-	BuildProfileConnectionTypeItemL();
-	BuildProfileAccessPointItemL();
-    BuildProfileUrlItemL();
-    BuildProfilePortItemL();
-    BuildProfileUserNameandPassWordItemL();
-    BuildProfileActiveAcceptedItemL();
-    BuildProfileHttpsUsedItemL();
-    BuildProfileHttpsUserNameAndPasswordItemL();
-    
-	// Close profile
-	iSyncAppEngine->CloseProfile();
-	
-	AddProfileListItemL( iProfileListBox, iProfileList );
-	CleanupStack::PopAndDestroy( items );
-	}
-
-
-// -----------------------------------------------------------------------------
-// void CNSmlDMDlgProfileView::SaveProfileL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMDlgProfileView::SaveProfileL()
-	{
-	FLOG( "[OMADM] void CNSmlDMDlgProfileView::SaveProfileL:" );
-	
-    TRAPD( err, iProfile = iSyncAppEngine->OpenProfileL( iProfileId, ESmlOpenReadWrite ) );
-    if( err != KErrNone )
-    	{
-    	FLOG( "[OMADM] err != KErrNone--problem in opening the profile" );
-    	// Profile could not be opened for saving
-    	iDoc->RefreshProfileListL();
-    	iDoc->MoveIndexToProfile( iProfileId );
-    	return;
-    	}
-
-	// Server name
-	iProfile->SetNameL( Item(ENSmlProfileName)->Value()->Des() );
-	// Server Id
-	iProfile->SetServerIdL( Item(ENSmlServerId)->Value()->Des() );
-	// Server password
-	iProfile->SetServerPasswordL( Item(ENSmlProfileDMServerPassword)->iValue );
-	// connection type
-    iProfile->SetBearerTypeL( Item(ENSmlConnType)->iNumberData );
-    // Accesspoint
-    if ( Item(ENSmlAccessPoint)->iWapAPInUse )
-        {
-        // User has not edited accesspoint fiels so convert it back to iap
-        SetAccessPointInfoL( Item(ENSmlAccessPoint)->iNumberData );
-        }
-    iProfile->SetAccessPointL( Item(ENSmlAccessPoint)->iNumberData );
-    // Host address
-    TInt num = Item( ENSmlProfilePort )->iNumberData;
-	iProfile->SetHostAddressL( Item(ENSmlProfileURL)->Value()->Des(), num );
-	// User name
-    iProfile->SetUserNameL( Item(ENSmlUsername)->Value()->Des() );
-    // User password
-    iProfile->SetPasswordL( Item(ENSmlPassword)->iValue );
-    // Active profile
-	if (Item(ENSmlServerAlertAllowed)->iNumberData)
-		{
-		iProfile->SetSASyncStateL( ESASyncStateEnable );
-		}
-	else
-		{
-		iProfile->SetSASyncStateL( ESASyncStateDisable );
-		}
-    // Server alert allowed
-    if ( Item(ENSmlServerAlertAllowed)->iNumberData )
-        {
-        if ( !Item(ENSmlServerAccept)->iNumberData )
-			{
-			iProfile->SetSASyncStateL( ESASyncStateConfirm );
-			}
-		}
-    // Http authentication	
-    iProfile->SetHttpUsedL( Item(ENSmlHttpsUsed)->iNumberData );
-    // http username
-    iProfile->SetHttpUserNameL( Item(ENSmlHttpsUsername)->Value()->Des() );
-    // http password
-    iProfile->SetHttpPasswordL( Item(ENSmlHttpsPassword)->iValue );
-    
-	iProfile->SetCreatorId( KUidSmlSyncApp.iUid );
-	iProfileId = iProfile->ProfileId();
-    iProfile->SaveL();
-    iSyncAppEngine->CloseProfile();
-    
-	iDoc->RefreshProfileListL();	
-	iDoc->MoveIndexToProfile( iProfileId );
-	}
-
-//-----------------------------------------------------------------------------
-// CNSmlDMDlgProfileView::Item
-//-----------------------------------------------------------------------------
-//
-CNSmlDMProfileData* CNSmlDMDlgProfileView::Item( TInt aItemId )
-	{
-	return iProfileList->At( aItemId );		
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMDlgProfileView::CheckMandatoryFieldsL
-// -----------------------------------------------------------------------------
-//
-TInt CNSmlDMDlgProfileView::CheckMandatoryFieldsL()
-	{
-	FLOG( "[OMADM] CNSmlDMDlgProfileView::CheckMandatoryFieldsL:" );
-	
-	TInt returnValue = KErrNotFound;
-
-	HBufC* emptyText =
-	    iEikonEnv->AllocReadResourceLC( R_QTN_SML_SET_VAL_FIELD_NONE );
-	HBufC* emptyAddr = 
-	    iEikonEnv->AllocReadResourceLC( R_QTN_SML_SET_VAL_HOSTADDR_FIELD_NONE );
-	
-	for ( TInt index = 0; index < iProfileList->Count(); index++ )
-		{
-		if ( Item(index)->iMandatory && 
-		   ( ( index == ENSmlServerId &&
-		           Item(index)->Value()->Des() == emptyText->Des() ) ||
-		     ( index == ENSmlProfileURL &&
-		           Item(index)->Value()->Des() == emptyAddr->Des() ) || 
-		     ( index == ENSmlUsername &&
-		           Item(index)->Value()->Des() == emptyText->Des() ) ||      
-		     ( Item(index)->Value()->Des().Length() == 0 ) ) )
-		    {
-			returnValue = Item(index)->iIndex;
-			break;
-			}
-		}
-	if ( returnValue == KErrNotFound )
-		{
-		returnValue = CheckUniqueFieldsL();
-		}
-	CleanupStack::PopAndDestroy( emptyAddr );
-	CleanupStack::PopAndDestroy( emptyText );
-	return returnValue;
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMDlgProfileView::CheckUniqueFieldsL
-// -----------------------------------------------------------------------------
-//
-TInt CNSmlDMDlgProfileView::CheckUniqueFieldsL()
-	{
-	FLOG( "[OMADM] CNSmlDMDlgProfileView::CheckUniqueFieldsL:" );
-	
-    TInt returnValue( KErrNotFound );
-	CNSmlDMProfileData* item = Item(ENSmlServerId);
-
-	if ( iServerIdChanged )
-		{
-		if ( iEditMode != ESmlEditProfile )
-			{
-			if ( iSyncAppEngine->ServerIdFoundL( item->Value()->Des(),
-			                                     iProfileId ) )
-				{		
-				returnValue = ENSmlServerId;
-				}
-			}
-		else if ( ( iEditMode == ESmlEditProfile ) &&
-		          ( item->Value()->Des() != item->iValue ) )
-			{
-			if ( iSyncAppEngine->ServerIdFoundL( item->Value()->Des(),
-			                                     iProfileId ) )
-				{		
-				returnValue = ENSmlServerId;
-				}
-			}
-		}
-        
-	return returnValue;
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMDlgProfileView::PrepareToEditSettingItemL
-// -----------------------------------------------------------------------------
-//
-TBool CNSmlDMDlgProfileView::PrepareToEditSettingItemL( 
-                                                    CNSmlDMProfileData& aItem )
-	{
-	FLOG( "[OMADM] CNSmlDMDlgProfileView::PrepareToEditSettingItemL:" );
-	
-	TInt prompt = WarnUserOfChangeL();
-	if ( prompt )	//show confirmation if needed
-		{
-		if ( !ShowConfirmationNoteL( prompt ) )
-			{
-			return EFalse;
-			}
-		}
-	switch ( aItem.iItemType )
-		{
-		case CNSmlDMProfileData::ENSmlTypeIAP:
-		    {
-			return EditSettingItemAccessPointL( aItem );
-		    }
-			
-		case CNSmlDMProfileData::ENSmlTypeText:
-		    {
-			return EditSettingItemTextL( aItem );
-		    }
-
-		case CNSmlDMProfileData::ENSmlTypeSecret:
-			{
-			return EditSettingItemSecretL( aItem );
-			}
-
-		case CNSmlDMProfileData::ENSmlTypeNumber:
-		    {
-			return EditSettingItemNumberL( aItem );
-		    }
-
-		case CNSmlDMProfileData::ENSmlTypeList:
-		    {
-		    return EditConnectionSettingItemL( aItem );
-		    }
-		
-		case CNSmlDMProfileData::ENSmlTypeListYesNo:
-		    {
-		    return EditSettingItemListYesNoL( aItem );
-		    }
-
-		case CNSmlDMProfileData::ENSmlTypehttpListYesNo:
-		    {
-		    return EditHttpSettingItemListYesNoL( aItem );
-		    }
-		    
-		case CNSmlDMProfileData::ENSmlTypeTime:
-		    {
-			return EFalse;
-		    }
-		}
-	return EFalse;
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMDlgProfileView::EditSettingItemTextL
-// -----------------------------------------------------------------------------
-//
-TBool CNSmlDMDlgProfileView::EditSettingItemTextL( CNSmlDMProfileData& aItem )
-	{
-    FLOG( "[OMADM] CNSmlDMDlgProfileView::EditSettingItemTextL:");
-    
-    TBool retVal = EFalse;
-    TInt flags( CAknTextSettingPage::EZeroLengthAllowed );
-	if ( aItem.iMandatory )
-		{
-		flags = CAknTextSettingPage::EZeroLengthNotOffered;
-		}
-
-	HBufC* tmpBuf = HBufC::NewLC( aItem.iLength ); 
-	TPtr ptr( tmpBuf->Des() );
-	ptr.Zero();
-	//Language varaint error fix  EPZO-6Y88F9
-	HBufC* emptyText =
-	    iEikonEnv->AllocReadResourceLC( R_QTN_SML_SET_VAL_FIELD_NONE );
-	if ( aItem.Value()->Des() != emptyText->Des() )
-	{
-	ptr.Append( aItem.Value()->Des() );
-	}  
-	//Language varaint error fix  EPZO-6Y88F9
-	CAknTextSettingPage* dlg = 
-	        new (ELeave) CAknTextSettingPage( R_NSML_SETTINGS_TEXT, ptr, flags );
-	CleanupStack::PushL( dlg );
-	dlg->SetSettingTextL( aItem.Header()->Des() ); 
-	dlg->ConstructL();
-	dlg->TextControl()->SetTextLimit( aItem.iLength );
-
-	if ( aItem.iLatinInput )
-		{		
-		dlg->TextControl()->SetAvkonWrap( ETrue );
-		dlg->TextControl()->SetAknEditorCase( EAknEditorLowerCase );
-		dlg->TextControl()->SetAknEditorFlags( 
-		                                EAknEditorFlagNoT9 |
-		                                EAknEditorFlagLatinInputModesOnly );
-		}
-	CleanupStack::Pop( dlg );
-	
-	if ( ( dlg->ExecuteLD ( CAknSettingPage::EUpdateWhenChanged ) ) &&
-	     ( aItem.Value()->Des() != ptr ) )
-		{//Fix for RKCC-7BC8Z2 
-		if(aItem.iItemId== ENSmlProfileURL)    
-		{  TBuf<255> tempBuf;
-		   tempBuf.Zero();
-		  _LIT(Kfslash ,"/");
-		   for(TInt i= 0;i<ptr.Length();i++)
-		    {   TChar ch = ptr[i];
-		        TText* t = (TText*)ptr[i]; 
-		        if( ptr[i] == '\\') 
-		        {
-		          tempBuf.Append(Kfslash);	
-		        }
-			    else
-			    {
-			      tempBuf.Append(ch);	
-			    } 
-	    	}
-	    	if(tempBuf.Length())
-	    	{
-	    		ptr.Copy(tempBuf);
-	    	}
-		 }
-		aItem.SetValue(ptr);
-		retVal = ETrue;
-		}
-	CleanupStack::PopAndDestroy( emptyText ); 
-	CleanupStack::PopAndDestroy( tmpBuf );
-	return retVal;
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMDlgProfileView::EditSettingItemSecretL
-// -----------------------------------------------------------------------------
-//
-TBool CNSmlDMDlgProfileView::EditSettingItemSecretL( CNSmlDMProfileData& aItem )
-	{
-	FLOG( "[OMADM] CNSmlDMDlgProfileView::EditSettingItemSecretL:" );
-	
-	TBuf<KNSmlMaxTextLength128> buf;
-	CAknAlphaPasswordSettingPage* pwd =
-	         new (ELeave) CAknAlphaPasswordSettingPage( R_SETTING_PASSWORD,
-		                                                aItem.iValue,
-		                                                aItem.iValue  );
-  	CleanupStack::PushL( pwd );
-
-	pwd->SetSettingTextL( aItem.Header()->Des() ); 
-	pwd->ConstructL();
-	pwd->AlphaPasswordEditor()->SetMaxLength( aItem.iLength );
-	//pwd->AlphaPasswordEditor()->RevealSecretText( ETrue );
-
-	CleanupStack::Pop( pwd );
-	if ( pwd->ExecuteLD(CAknSettingPage::EUpdateWhenChanged) )
-		{
-		buf.Fill('*', 4 );
-		aItem.SetValue( buf ); //the real value backed up
-		return ETrue;
-		}
-	return EFalse;
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMDlgProfileView::EditSettingItemNumberL
-// -----------------------------------------------------------------------------
-//
-TBool CNSmlDMDlgProfileView::EditSettingItemNumberL( CNSmlDMProfileData& aItem )
-	{
-	FLOG( "[OMADM] CNSmlDMDlgProfileView::EditSettingItemNumberL:" );
-	
-	CAknIntegerSettingPage * dlg = 
-	    new (ELeave) CAknIntegerSettingPage( 
-	                        R_SETTINGS_NUMBER,
-	                        aItem.iNumberData,
-	                        CAknIntegerSettingPage::EInvalidValueNotOffered) ;
-	CleanupStack::PushL( dlg );
-	dlg->SetSettingTextL( aItem.Header()->Des() );
-	dlg->ConstructL();
-	dlg->IntegerEditorControl()->SetAknEditorNumericKeymap(
-											EAknEditorPlainNumberModeKeymap );
-    if ( aItem.iLatinInput )
-	 {
-		
-    dlg->IntegerEditorControl()->SetAknEditorFlags( EAknEditorFlagLatinInputModesOnly );
-    
-    dlg->IntegerEditorControl()->SetValueL( aItem.iNumberData );
-    
-	 }											
-	CleanupStack::Pop( dlg );
-
-	if ( dlg->ExecuteLD( CAknIntegerSettingPage::EUpdateWhenChanged ) )
-		{
-		   aItem.SetValue( aItem.iNumberData );
-		return ETrue;
-		}
-	return EFalse;
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMDlgProfileView::EditSettingItemListL
-// -----------------------------------------------------------------------------
-//
-TBool CNSmlDMDlgProfileView::EditSettingItemListL( CNSmlDMProfileData& aItem )
-	{
-	FLOG( "[OMADM] CNSmlDMDlgProfileView::EditSettingItemListL:" );
-	
-	TInt curSelection(aItem.iNumberData );
-	CDesCArray* stringData = iEikonEnv->ReadDesCArrayResourceL(aItem.iResource);
-	CleanupStack::PushL( stringData );
-	
-	CAknRadioButtonSettingPage* dlg = 
-	new (ELeave) CAknRadioButtonSettingPage( R_SETTINGS_RADIO,
-	                                         curSelection,
-	                                         stringData );
-	CleanupStack::PushL( dlg );
-	dlg->SetSettingTextL( aItem.Header()->Des() ); 
-    CleanupStack::Pop( dlg );
-	if ( dlg->ExecuteLD() )
-		{
-		aItem.iNumberData = curSelection;
-		if ( aItem.iItemType == CNSmlDMProfileData::ENSmlTypehttpListYesNo )
-			{
-			if ( aItem.iNumberData == 1 )
-				{
-				Item( ENSmlHttpsUsername )->iHidden =  EFalse;
-				Item( ENSmlHttpsPassword )->iHidden =  EFalse;
-				}
-			else
-				{
-				Item( ENSmlHttpsUsername )->iHidden =  ETrue;
-				Item( ENSmlHttpsPassword )->iHidden =  ETrue;
-				}
-			}
-		aItem.SetValue( (*stringData)[curSelection] );
-		CleanupStack::PopAndDestroy(stringData);
-		return ETrue;
-		}
-	CleanupStack::PopAndDestroy(stringData);
-	return EFalse;
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMDlgProfileView::EditSettingItemAccessPointL
-// -----------------------------------------------------------------------------
-//
-TBool CNSmlDMDlgProfileView::EditSettingItemAccessPointL( 
-                                                    CNSmlDMProfileData& aItem )
-	{
-	FLOG( "[OMADM] CNSmlDMDlgProfileView::EditSettingItemAccessPointL:" );
-	
-	TInt curSelection(ENsmlAlwaysAsk);
-    if( aItem.iNumberData == KErrNotFound   ) //Always ask
-       {       
-       curSelection = ENsmlAlwaysAsk;
-       }
-    else if(aItem.iNumberData == KErrGeneral) //default conenction
-        {
-        curSelection = ENsmlDefaultConnection;
-        }
-    else
-        {        
-        curSelection = ENsmlIap;
-        }
-
-    HBufC* destName = StringLoader::LoadLC( 
-									R_CMMANAGERUI_SETT_DEFAULT_CONNECTION);
-    HBufC* userdef = StringLoader::LoadLC(
-									R_CMMANAGERUI_SETT_USER_DEFINED);
-    HBufC* title = StringLoader::LoadLC(
-									R_CMMANAGERUI_SETT_DESTINATION);
-    HBufC* alwaysask = StringLoader::LoadLC(
-									R_ALWAYS_ASK_ALWAYS_ASK);
-    
-    CDesCArrayFlat* stringData = new (ELeave) CDesCArrayFlat( 3 );
-    CleanupStack::PushL( stringData );
-    stringData->AppendL(alwaysask->Des());
-    stringData->AppendL(destName->Des());
-    stringData->AppendL(userdef->Des());
-
-    CAknRadioButtonSettingPage* dlg = 
-    new (ELeave) CAknRadioButtonSettingPage( R_SETTINGS_RADIO,
-            curSelection,
-            stringData );
-    CleanupStack::PushL( dlg );
-    dlg->SetSettingTextL( title->Des() ); 
-    CleanupStack::Pop( dlg );
-
-    TInt ret = dlg->ExecuteLD(); 
-
-	TUint32 currentAccesspoint(0);
-	if ( !ret )
-		{		
-		CleanupStack::PopAndDestroy(5);
-		return EFalse; // user canceled "Always ask" dialog
-		}
-		
-    if ( curSelection == ENsmlAlwaysAsk  )
-    	{    	
-    	aItem.SetValue( alwaysask->Des() );
-		aItem.iNumberData = KErrNotFound;    					
-		CleanupStack::PopAndDestroy(5);
-		return ETrue;  // user selected "Always ask" option 
-    	}
-    else if(curSelection == ENsmlDefaultConnection )
-        {        
-        aItem.SetValue( destName->Des() );
-        aItem.iNumberData = KErrGeneral;
-        CleanupStack::PopAndDestroy(5);        
-        return ETrue;  // user selected "default connection" option 
-        }
-	else
-	    {
-	    CCommsDatabase* commDb = CCommsDatabase::NewL( EDatabaseTypeIAP );
-	    CleanupStack::PushL( commDb );
-	    CApUtils* aputils = CApUtils::NewLC(*commDb);
-	    currentAccesspoint =  aItem.iNumberData ;
-        CleanupStack::PopAndDestroy( aputils );
-	    CleanupStack::PopAndDestroy( commDb );
-	    
-	    FTRACE( RDebug::Print( 
-	     _L("[OMADM] CNSmlDMDlgProfileView::EditSettingItemAccessPointL: current ap (%d)"),
-	                                                currentAccesspoint ) );
-	    }
-	
-	
-	TInt apBearerFlags;
-	if ( FeatureManager::FeatureSupported( KFeatureIdAppCsdSupport ) )
-		{
-		apBearerFlags = EApBearerTypeCSD | 
-		                EApBearerTypeGPRS | 
-		                EApBearerTypeHSCSD | 
-		                EApBearerTypeWLAN;
-		}
-	else
-		{
-		apBearerFlags = EApBearerTypeGPRS | EApBearerTypeWLAN;
-		}
-
-	CApSettingsHandler* handler = CApSettingsHandler::NewLC( 
-            ETrue,
-			EApSettingsSelListIsPopUp,
-			EApSettingsSelMenuSelectNormal,
-			KEApIspTypeAll,
-			apBearerFlags,
-			KEApSortNameAscending );
-
-    TInt retVal = KErrNone;
-    TUint32 selectedIap(0);
-	TRAP_IGNORE( retVal = handler->RunSettingsL( currentAccesspoint,
-	                                             selectedIap ) );
-	CleanupStack::PopAndDestroy(handler);
-	CleanupStack::PopAndDestroy(5);
-
-    if ( retVal & KApUiEventSelected )
-		{
-		SetAccessPointInfoL( selectedIap );
-		}
-	else if ( retVal == KApUiEventExitRequested )
-		{
-		DoExitFromMenuL();
-		}
-	else
-		{		
-		//Keep previous selection
-		}
-	return ETrue;
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMDlgProfileView::SetAccessPointInfoL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMDlgProfileView::SetAccessPointInfoL( TUint aId )
-	{
-	FLOG( "[OMADM] CNSmlDMDlgProfileView::SetAccessPointInfoL:");
-	
-	CCommsDatabase* commDb = CCommsDatabase::NewL( EDatabaseTypeIAP );
-	CleanupStack::PushL( commDb );
-
-	TInt apBearerFilter;
-
-	if ( FeatureManager::FeatureSupported( KFeatureIdAppCsdSupport ) )
-		{
-		apBearerFilter = EApBearerTypeCSD | 
-		                 EApBearerTypeGPRS | 
-		                 EApBearerTypeHSCSD | 
-		                 EApBearerTypeWLAN;
-		}
-	else
-		{
-		apBearerFilter = EApBearerTypeGPRS | EApBearerTypeWLAN;
-		}
-	CApSelect* apSelect = CApSelect::NewLC( *commDb,
-	                                        KEApIspTypeAll,
-	                                        apBearerFilter,
-	                                        KEApSortUidAscending );
-
-	TBool retValue( EFalse );
-
-	if ( apSelect->MoveToFirst() )
-		{
-		if ( aId == apSelect->Uid() )
-			{
-			retValue = ETrue;		
-			}
-		while ( ( ! retValue ) && ( apSelect->MoveNext() ) )
-			{
-			if ( aId == apSelect->Uid() )
-				{
-				retValue = ETrue;
-				}
-			}
-		}
-
-	if ( retValue )
-		{
-		CApUtils* aputils = CApUtils::NewLC(*commDb);
-		TRAP_IGNORE( aId = aputils->IapIdFromWapIdL( aId ) );
-
-		FTRACE(RDebug::Print(_L("accesspoint after IapIdFromWapIdL (%d)"), aId));
-		
-		Item( ENSmlAccessPoint )->SetValue( apSelect->Name() );
-		Item( ENSmlAccessPoint )->iNumberData = aId;
-		Item( ENSmlAccessPoint )->iWapAPInUse = EFalse;
-		
-		CleanupStack::PopAndDestroy( aputils );
-		}
-	else
-		{		
-		HBufC* emptyText = 
-		    iEikonEnv->AllocReadResourceLC(R_CMMANAGERUI_SETT_DEFAULT_CONNECTION);
-        Item( ENSmlAccessPoint )->SetValue( emptyText->Des() );
-		Item( ENSmlAccessPoint )->iNumberData = KErrNotFound;
-		Item( ENSmlAccessPoint )->iWapAPInUse = EFalse;
-		CleanupStack::PopAndDestroy(emptyText);
-		}
-	
-	CleanupStack::PopAndDestroy( apSelect );
-	CleanupStack::PopAndDestroy( commDb );
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMDlgProfileView::GetAccessPointInfoL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMDlgProfileView::GetAccessPointInfoL( TInt aId )
-	{
-	FTRACE( RDebug::Print( 
-	 _L("[OMADM] CNSmlDMDlgProfileView::GetAccessPointInfoL: aId (%d)"), aId));
-    
-    TInt err = KErrNone;
-	
-	CCommsDatabase* commDb = CCommsDatabase::NewL( EDatabaseTypeIAP );
-	CleanupStack::PushL( commDb );
-	CApUtils* aputils = CApUtils::NewLC( *commDb );
-	
-	TBool apExists = EFalse;
-	TRAP( err, apExists = aputils->IAPExistsL( aId ) );
-	if (  aId == KErrNotFound )
-		{
-		HBufC* emptyText = 
-		            iEikonEnv->AllocReadResourceLC( R_ALWAYS_ASK_ALWAYS_ASK );		
-        Item( ENSmlAccessPoint )->SetValue( emptyText->Des() );
-		Item( ENSmlAccessPoint )->iNumberData = KErrNotFound;
-		Item( ENSmlAccessPoint )->iWapAPInUse = EFalse;		
-		CleanupStack::PopAndDestroy( emptyText );
-		CleanupStack::PopAndDestroy( aputils );
-		CleanupStack::PopAndDestroy( commDb );
-		return;
-		}
-	else if(!apExists || aId == KErrGeneral) 
-	    {
-	    HBufC* emptyText = 
-	    iEikonEnv->AllocReadResourceLC(R_CMMANAGERUI_SETT_DEFAULT_CONNECTION);
-	    Item( ENSmlAccessPoint )->SetValue( emptyText->Des() );
-	    Item( ENSmlAccessPoint )->iNumberData = KErrGeneral;
-	    Item( ENSmlAccessPoint )->iWapAPInUse = EFalse;
-	    CleanupStack::PopAndDestroy( emptyText );
-	    CleanupStack::PopAndDestroy( aputils );
-	    CleanupStack::PopAndDestroy( commDb );
-	    return;
-	    }
-	else
-	    {}
-    // convert internet ap to Wap ap
-	TRAP( err, aId = aputils->WapIdFromIapIdL( aId ) );
-    CleanupStack::PopAndDestroy( aputils );
-    
-	if ( err != KErrNone )
-		{
-		CleanupStack::PopAndDestroy( commDb );
-		return;
-		}
-	
-    TInt apBearerFilter;
-
-	if ( FeatureManager::FeatureSupported( KFeatureIdAppCsdSupport ) )
-		{
-		apBearerFilter = EApBearerTypeCSD | 
-		                 EApBearerTypeGPRS | 
-		                 EApBearerTypeHSCSD | 
-		                 EApBearerTypeWLAN;
-		}
-	else
-		{
-		apBearerFilter = EApBearerTypeGPRS | EApBearerTypeWLAN;
-		}
-	CApSelect* selector = CApSelect::NewLC(
-	                             *commDb,
-	                             KEApIspTypeAll,
-		                         apBearerFilter,
-		                         KEApSortUidAscending);
-	
-	TBool found = EFalse;
-	
-	// find access point with id aId
-	if (selector->MoveToFirst())
-		{
-		if (aId == (TInt)selector->Uid())
-			{
-			found = ETrue;		
-			}
-		while (!found && selector->MoveNext())
-			{
-			if (aId == (TInt)selector->Uid())
-				{
-				found = ETrue;
-				}
-			}
-		}
-
-	if (found) 
-		{
-		Item( ENSmlAccessPoint )->SetValue( selector->Name() );
-		Item( ENSmlAccessPoint )->iNumberData = aId;
-		Item( ENSmlAccessPoint )->iWapAPInUse = ETrue;
-		}
-	else
-		{		
-		HBufC* emptyText = 
-		   iEikonEnv->AllocReadResourceLC(R_CMMANAGERUI_SETT_DEFAULT_CONNECTION);
-        Item( ENSmlAccessPoint )->SetValue( emptyText->Des() );
-		Item( ENSmlAccessPoint )->iNumberData = KErrNotFound;
-		CleanupStack::PopAndDestroy(emptyText);
-		}
-		
-    CleanupStack::PopAndDestroy(selector);
-    CleanupStack::PopAndDestroy(commDb);
-
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMDlgProfileView::EditSettingItemListYesNoL
-// -----------------------------------------------------------------------------
-//
-TBool CNSmlDMDlgProfileView::EditSettingItemListYesNoL( 
-                                                    CNSmlDMProfileData& aItem )
-	{
-    FLOG( "[OMADM] CNSmlDMDlgProfileView::EditSettingItemListYesNoL:");
-
-	CDesCArray* stringData = 
-	                      iEikonEnv->ReadDesCArrayResourceL( aItem.iResource );
-	CleanupStack::PushL( stringData );
-	
-	if ( aItem.iNumberData == 0 )
-		{
-		aItem.iNumberData = 1;
-		}
-	else
-		{
-		aItem.iNumberData = 0;
-		}
-	
-	aItem.SetValue( (*stringData)[aItem.iNumberData] );
-	CleanupStack::PopAndDestroy( stringData );
-	return ETrue;
-	}
-
-
-// -----------------------------------------------------------------------------
-// CNSmlDMDlgProfileView::EditHttpSettingItemListYesNoL
-// -----------------------------------------------------------------------------
-//
-TBool CNSmlDMDlgProfileView::EditHttpSettingItemListYesNoL( 
-                                                    CNSmlDMProfileData& aItem )
-	{
-    FLOG( "[OMADM] CNSmlDMDlgProfileView::EditHttpSettingItemListYesNoL:" );
-
-	CDesCArray* stringData = 
-	                      iEikonEnv->ReadDesCArrayResourceL( aItem.iResource );
-	CleanupStack::PushL( stringData );
-	
-	if ( aItem.iNumberData == 0 )
-		{
-		aItem.iNumberData = 1;
-		Item( ENSmlHttpsUsername )->iHidden =  EFalse;
-		Item( ENSmlHttpsPassword )->iHidden =  EFalse;
-		}
-	else
-		{
-		aItem.iNumberData = 0;
-		Item( ENSmlHttpsUsername )->iHidden =  ETrue;
-		Item( ENSmlHttpsPassword )->iHidden =  ETrue;
-		}
-	
-	aItem.SetValue( (*stringData)[aItem.iNumberData] );
-	CleanupStack::PopAndDestroy( stringData );
-	return ETrue;
-	}
-	
-// ---------------------------------------------------------------------------------------------------
-// CNSmlDMDlgProfileView::EditConnectionSettingItemL
-// This method gets called when stylus single clck or MSK pressed on session mode item
-// ---------------------------------------------------------------------------------------------------
-//
-TBool CNSmlDMDlgProfileView::EditConnectionSettingItemL( 
-                                                    CNSmlDMProfileData& aItem )
-    {
-    FLOG( "[OMADM] CNSmlDMDlgProfileView::EditConnectionSettingItemL:" );
-
-    CDesCArray* stringData = 
-                          iEikonEnv->ReadDesCArrayResourceL( aItem.iResource );
-    CleanupStack::PushL( stringData );
-    TBool hidden = EFalse;
-    //Value of the setting item gets changed between Internet & Bluetooth for single click or msk press
-	//If any new session mode like USB(third item) is going to add, radio button setting page should pop up
-    if ( aItem.iNumberData == EProfileInternet )
-        {
-        hidden = ETrue;
-        aItem.iNumberData = EProfileObexBlueTooth;
-        Item( ENSmlAccessPoint )->iHidden = ETrue;           
-        Item( ENSmlProfilePort )->iHidden = ETrue;
-        Item( ENSmlHttpsUsed )->iHidden = ETrue;        
-        }
-    else
-        {
-        hidden = EFalse;
-        aItem.iNumberData = EProfileInternet;
-        Item( ENSmlAccessPoint )->iHidden = EFalse;           
-        Item( ENSmlProfilePort )->iHidden = EFalse;
-        Item( ENSmlHttpsUsed )->iHidden = EFalse;        
-        }
-    
-    if(Item( ENSmlHttpsUsed )->iNumberData == 0 || hidden )
-        {               
-        Item( ENSmlHttpsUsername )->iHidden = ETrue;
-        Item( ENSmlHttpsPassword )->iHidden = ETrue;
-        }
-    else
-        {               
-        Item( ENSmlHttpsUsername )->iHidden = EFalse;
-        Item( ENSmlHttpsPassword )->iHidden = EFalse;
-        } 
-    
-    aItem.SetValue( (*stringData)[aItem.iNumberData] );
-    CleanupStack::PopAndDestroy( stringData );
-    return ETrue;
-    }
-	
-// -----------------------------------------------------------------------------
-// CNSmlDMDlgProfileView::SetSettingTitleL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMDlgProfileView::SetSettingTitleL()
-	{
-	FLOG( "[OMADM] CNSmlDMDlgProfileView::SetSettingTitleL:" );
-	
-	TBuf<KNSmlMaxTextLength128> title;
-	StringLoader::Load( title, R_SML_SETTINGS_TITLE );
-	CAknTitlePane* titlePane = 
-	            (CAknTitlePane*) iAvkonAppUi->StatusPane()->ControlL( 
-	                                      TUid::Uid( EEikStatusPaneUidTitle ) );
-	titlePane->SetTextL( title );
-    iNaviPane = ( CAknNavigationControlContainer* )
-        iAvkonAppUi->StatusPane()->ControlL( TUid::Uid(EEikStatusPaneUidNavi) );
-    iNaviPane->PushDefaultL();
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMDlgProfileView::ShowConfirmationNoteL
-// -----------------------------------------------------------------------------
-//
-TBool CNSmlDMDlgProfileView::ShowConfirmationNoteL(TInt aResource)
-	{
-	FLOG( "[OMADM] CNSmlDMDlgProfileView::ShowConfirmationNoteL:" );
-	
-	HBufC* label = iEikonEnv->AllocReadResourceLC( aResource ); 
-	CAknQueryDialog* queryDialog = new (ELeave) CAknQueryDialog;
-	TBool retVal = queryDialog->ExecuteLD( R_STARTQUERY_NOTE, label->Des() );
-	CleanupStack::PopAndDestroy( label );
-	return retVal;
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMDlgProfileView::WarnUserOfChangeL
-// -----------------------------------------------------------------------------
-//
-TInt CNSmlDMDlgProfileView::WarnUserOfChangeL()
-	{
-	FLOG( "[OMADM] CNSmlDMDlgProfileView::WarnUserOfChangeL:" );
-	
-	TInt prompt = KErrNone;
-    if ( iProfileListBox->CurrentItemIndex() == ENSmlServerId )
-        {
-    	HBufC* emptyText = 
-    	        iEikonEnv->AllocReadResourceLC( R_QTN_SML_SET_VAL_FIELD_NONE );
-    	if ( Item(ENSmlServerId)->Value()->Des() != emptyText->Des() )
-    		{
-    		prompt = R_QTN_DM_CONF_SET_SERVER_ID;
-    		}
-    	CleanupStack::PopAndDestroy( emptyText );
-        }
-	return prompt; 	
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMDlgProfileView::DoExitFromMenuL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMDlgProfileView::DoExitFromMenuL()
-	{
-	FLOG( "[OMADM] CNSmlDMDlgProfileView::DoExitFromMenuL:" );
-	
-	TInt retValue = CheckMandatoryFieldsL();
-	if ( retValue >= KErrNone )
-		{
-		if ( !ShowConfirmationNoteL( R_NSML_SETTINGS_SAVE_ANYWAY ) )
-			{
-			return;
-			}
-		}
-	((CNSmlDMSyncAppUi*)iDoc->AppUi())->ChangeViewL();
-	((CNSmlDMSyncAppUi*)iDoc->AppUi())->DoExit();		
-	}
-
-
-
-// -----------------------------------------------------------------------------
-// CNSmlDMDlgProfileView::GetHelpContext
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMDlgProfileView::GetHelpContext(TCoeHelpContext& aContext) const
-	{
-	FLOG( "[OMADM] CNSmlDMDlgProfileView::GetHelpContext:");
-	
-	aContext.iMajor = KUidSmlSyncApp;
-    aContext.iContext = KDM_HLP_SETTINGS;
-	}
-	
-
-
-// -----------------------------------------------------------------------------
-// CNSmlDMDlgProfileView::BuildHeaders
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMDlgProfileView::BuildHeaders( CDesCArray* aHeaders )
-	{	
-	for ( TInt index = 0; index < iProfileList->Count(); index++ )
-		{
-		iProfileList->At(index)->SetHeader( (*aHeaders)[index] );
-		}
-	}
-// -----------------------------------------------------------------------------
-// CNSmlDMDlgProfileView::BuildItemIds
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMDlgProfileView::BuildItemIds( )
-	{	
-	for ( TInt index = 0; index < iProfileList->Count(); index++ )
-		{
-		iProfileList->At( index )->iItemId = index;
-		}
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMDlgProfileView::BuildProfileNameItemL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMDlgProfileView::BuildProfileNameItemL()
-	{
-	FLOG( "[OMADM] CNSmlDMDlgProfileView::BuildProfileNameItemL" );
-	
-    CNSmlDMProfileData* item = Item(ENSmlProfileName);
-	if ( EditMode() || CopyMode() )
-		{
-        TBuf<KNSmlMaxItemLength> buf;
-        iProfile->GetName( buf );
-		item->SetValue( buf );
-		}
-	//set default profile name if new or namelength is zero
-	if ( ( iEditMode == ESmlNewProfile ) ||
-	     ( item->Value()->Des().Length() == 0) )
-		{
-		item->SetValue( iDoc->GetNextProfileNameLC()->Des() );
-		CleanupStack::PopAndDestroy();
-		}
-	item->iMandatory = ETrue;
-	item->iLength = KNSmlMaxProfileNameLength;
-	item->iItemType = CNSmlDMProfileData::ENSmlTypeText;
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMDlgProfileView::BuildProfileServerIdItemL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMDlgProfileView::BuildProfileServerIdItemL()
-	{
-	FLOG( "[OMADM] CNSmlDMDlgProfileView::BuildProfileServerIdItemL" );
-    CNSmlDMProfileData* item = Item(ENSmlServerId);
-	if ( EditMode() )
-		{
-        TBuf<KNSmlMaxItemLength> buf;
-        iProfile->GetServerId( buf );
-        if( buf.Length() > 0 )       
-           {
-		item->SetValue( buf );
-           } 
-		}
-	else
-		{
-		HBufC* emptyText = iEikonEnv->AllocReadResourceLC(
-		                                         R_QTN_SML_SET_VAL_FIELD_NONE );
-		item->SetValue( emptyText->Des() );
-		CleanupStack::PopAndDestroy( emptyText );
-		
-		}
-	item->iMandatory = ETrue;
-	item->iLength = KNSmlDmServerIdMaxLength;
-	item->iItemType = CNSmlDMProfileData::ENSmlTypeText;
-	item->iLatinInput = ETrue;
-	}
-	
-// -----------------------------------------------------------------------------
-// CNSmlDMDlgProfileView::BuildProfileServerPasswordItemL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMDlgProfileView::BuildProfileServerPasswordItemL()
-	{
-	FLOG( "[OMADM] CNSmlDMDlgProfileView::BuildProfileServerPasswordItemL" );
-	
-    TBuf<KNSmlMaxTextLength256> buf;
-    CNSmlDMProfileData* item = Item(ENSmlProfileDMServerPassword);
-	if ( EditMode() || CopyMode() )
-		{
-        TBuf<KNSmlMaxItemLength> buf;
-        iProfile->GetServerPassword( buf );
-        item->iValue.Copy( buf );
-		}
-	else
-		{
-		item->iValue = KNullDesC;
-		}
-
-	buf.Fill('*', 4 );
-	item->SetValue(buf);
-	item->iLength = KNSmlMaxPasswordLength;
-	item->iItemType = CNSmlDMProfileData::ENSmlTypeSecret;	
-	}
-	
-// -----------------------------------------------------------------------------
-// CNSmlDMDlgProfileView::BuildProfileConnectionTypeItemL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMDlgProfileView::BuildProfileConnectionTypeItemL()
-	{
-	FLOG( "[OMADM] CNSmlDMDlgProfileView::BuildProfileConnectionTypeItemL" );
-	
-	CNSmlDMProfileData* item = Item(ENSmlConnType);
-	if ( EditMode() || CopyMode() )
-		{
-        item->iNumberData = iProfile->BearerType();
-		if ( ( item->iNumberData != EProfileObexBlueTooth ) && 
-		     ( item->iNumberData != EProfileInternet ) )
-			{
-			//default to internet
-			item->iNumberData = EProfileInternet;
-			}
-		}
-	else
-		{
-		item->iNumberData = EProfileInternet;
-		}
-	CDesCArray* stringData = 
-	                    iEikonEnv->ReadDesCArrayResourceL(R_SML_BEARER_TYPE);
-	CleanupStack::PushL( stringData );
-	
-	if ( !FeatureManager::FeatureSupported( KFeatureIdSyncMlDmObex  ) )
-		{
-		item->iHidden = ETrue;
-		item->iNumberData = EProfileInternet;
-		}
-	
-	item->SetValue ( (*stringData)[item->iNumberData] );
-	CleanupStack::PopAndDestroy( stringData );
-	item->iResource = R_SML_BEARER_TYPE;
-	item->iLength   = 80;
-	item->iItemType = CNSmlDMProfileData::ENSmlTypeList;	
-	}
-	
-// -----------------------------------------------------------------------------
-// CNSmlDMDlgProfileView::BuildProfileAccessPointItemL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMDlgProfileView::BuildProfileAccessPointItemL()
-	{
-	FLOG( "[OMADM] CNSmlDMDlgProfileView::BuildProfileAccessPointItemL" );
-	
-	CNSmlDMProfileData* item = Item(ENSmlAccessPoint);
-	item->iWapAPInUse = EFalse;
-	if ( EditMode() || CopyMode() )
-		{
-        item->iNumberData = iProfile->AccessPointL();
-		}
-	else
-		{
-		item->iNumberData = KErrGeneral;
-		}
-    GetAccessPointInfoL( item->iNumberData );
-	item->iLength = 0;
-	item->iItemType = CNSmlDMProfileData::ENSmlTypeIAP;
-	item->iHidden = ( Item( ENSmlConnType )->iNumberData != EProfileInternet );	
-	}
-	
-// -----------------------------------------------------------------------------
-// CNSmlDMDlgProfileView::BuildProfileUrlItemL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMDlgProfileView::BuildProfileUrlItemL()
-	{
-	FLOG( "[OMADM] CNSmlDMDlgProfileView::BuildProfileUrlItemL" );
-	CNSmlDMProfileData* item = Item(ENSmlProfileURL);
-	if ( EditMode() || CopyMode() )
-		{
-		iProfile->GetHostAddress( iBuf, item->iNumberData );
-		if (iBuf.Length() > KNSmlMaxURLLength )
-		  {
-		    iBuf.SetLength(KNSmlMaxURLLength);
-		  }
-		if( iBuf.Length() > 0 )        
-           {
-		item->SetValue( iBuf );
-           }   
-		}
-	else
-		{
-		HBufC* emptyAddr = iEikonEnv->AllocReadResourceLC( 
-		                    R_QTN_SML_SET_VAL_HOSTADDR_FIELD_NONE );
-	    item->SetValue( emptyAddr->Des() );
-	    CleanupStack::PopAndDestroy(); //emptyAddr
-		}
-    item->iLength = KNSmlMaxURLLength;
-	item->iItemType = CNSmlDMProfileData::ENSmlTypeText;
-	item->iLatinInput = ETrue;
-	item->iMandatory = ETrue;	
-	}
-	
-// -----------------------------------------------------------------------------
-// CNSmlDMDlgProfileView::BuildProfilePortItemL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMDlgProfileView::BuildProfilePortItemL()
-	{
-	FLOG( "[OMADM] CNSmlDMDlgProfileView::BuildProfilePortItemL" );
-    CNSmlDMProfileData* item = Item(ENSmlProfilePort);
-    iProfile->GetHostAddress( iBuf, item->iNumberData );
-	
-	if ( item->iNumberData <= KPortMaxSize && item->iNumberData >= KPortMinSize )
-	{
-	item->SetValue( item->iNumberData );    	
-	}
-	else
-	{
-	item->iNumberData = KDefaultHttpPort;	
-	item->SetValue( item->iNumberData );
-	}
-
-	item->iLength = KBufSize16;
-	item->iItemType = CNSmlDMProfileData::ENSmlTypeNumber;	
-	item->iHidden = ( Item( ENSmlConnType )->iNumberData != EProfileInternet );	
-	item->iLatinInput = ETrue;	
-	}
-	
-// -----------------------------------------------------------------------------
-// CNSmlDMDlgProfileView::BuildProfileUserNameandPassWordItemL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMDlgProfileView::BuildProfileUserNameandPassWordItemL()
-	{
-	FLOG( "[OMADM] CNSmlDMDlgProfileView::BuildProfileUserNameandPassWordItemL" );
-	
-    CNSmlDMProfileData* item = Item(ENSmlUsername);
-    HBufC* emptyText = iEikonEnv->AllocReadResourceLC(
-		                                         R_QTN_SML_SET_VAL_FIELD_NONE );
-    item->SetValue( emptyText->Des() );
-    CleanupStack::PopAndDestroy( emptyText );
-    TBuf<KNSmlMaxTextLength256> buf;
-    if ( EditMode() || CopyMode() )
-		{
-        iProfile->GetUserName( buf );
-        if( buf.Length() > 0 )      
-           {
-        item->SetValue( buf );
-           } 
-		}
-	item->iMandatory = ETrue;
-	item->iLength = KNSmlMaxUsernameLength;
-	item->iLatinInput = ETrue;
-	item->iItemType = CNSmlDMProfileData::ENSmlTypeText;
-
-    item = Item(ENSmlPassword);
-	if ( EditMode() || CopyMode() )
-		{
-        TBuf<KNSmlMaxItemLength> buf;
-        iProfile->GetPassword( buf );
-        item->iValue.Copy( buf );
-		}
-	else
-		{
-		item->iValue = KNullDesC;
-		}
-
-	buf.Fill('*', 4 ); //mask
-	item->SetValue( buf );	
-	item->iLength = KNSmlMaxPasswordLength;
-	item->iItemType = CNSmlDMProfileData::ENSmlTypeSecret;	
-	}
-	
-// -----------------------------------------------------------------------------
-// CNSmlDMDlgProfileView::BuildProfileActiceAcceptedItemL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMDlgProfileView::BuildProfileActiveAcceptedItemL()
-	{
-	FLOG( "[OMADM] CNSmlDMDlgProfileView::BuildProfileActiceAcceptedItemL" );
-	
-	CNSmlDMProfileData* item = Item(ENSmlServerAlertAllowed);
-    CDesCArray* stringData =
-                         iEikonEnv->ReadDesCArrayResourceL( R_NSML_YESNO_TYPE );
-	CleanupStack::PushL( stringData );
-
-	if ( EditMode() || CopyMode() )
-		{
-        if ( iProfile->SASyncState() == ESASyncStateDisable)
-		    {
-		    item->iNumberData = EFalse;
-		    }
-		else
-		    {
-		    item->iNumberData = ETrue;
-		    }
-		}
-	else
-		{
-		item->iNumberData = ETrue;
-		}
-	item->iResource = R_NSML_YESNO_TYPE;
-	item->SetValue( (*stringData)[item->iNumberData] );
-	item->iLength = 0;
-	item->iItemType = CNSmlDMProfileData::ENSmlTypeListYesNo;
-	CleanupStack::PopAndDestroy( stringData );
-
-	item = Item(ENSmlServerAccept);
-	if ( iDoc->SANSupport() )
-	{   
-		item->iHidden = ETrue;
-		return;
-	}	
-	stringData = iEikonEnv->ReadDesCArrayResourceL( R_NSML_ACCEPT_YESNO_TYPE );
-	CleanupStack::PushL( stringData );
-	if ( EditMode() || CopyMode() )
-		{
-        if ( iProfile->SASyncState() != ESASyncStateEnable )
-		    {
-		    item->iNumberData = EFalse;
-		    }
-		else
-		    {
-		    item->iNumberData = ETrue;
-		    }
-		}
-	else
-		{
-		item->iNumberData = EFalse;
-		}
-	item->iResource = R_NSML_ACCEPT_YESNO_TYPE;
-	item->SetValue( (*stringData)[item->iNumberData] );
-	item->iLength = 0;
-	item->iItemType = CNSmlDMProfileData::ENSmlTypeListYesNo;
-	CleanupStack::PopAndDestroy( stringData );
-	}
-	
-// -----------------------------------------------------------------------------
-// CNSmlDMDlgProfileView::BuildProfileHttpsUserNameAndPasswordItemL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMDlgProfileView::BuildProfileHttpsUserNameAndPasswordItemL()
-	{
-	FLOG( "[OMADM] CNSmlDMDlgProfileView::BuildProfileHttpsUserNameAndPasswordItemL" );
-	
-	CNSmlDMProfileData* item = Item( ENSmlHttpsUsername );
-	HBufC* emptyText = iEikonEnv->AllocReadResourceLC(
-		                                         R_QTN_SML_SET_VAL_FIELD_NONE );
-	item->SetValue( emptyText->Des() );
-	CleanupStack::PopAndDestroy( emptyText );
-    
-    TBuf<KNSmlMaxTextLength256> buf;
-    if ( EditMode() || CopyMode() )
-		{
-        iProfile->GetHttpUserNameL( buf );
-        if( buf.Length() > 0 )      
-           {
-        item->SetValue( buf );
-           } 
-		}
-	item->iMandatory = ETrue;
-	item->iLength = KNSmlMaxUsernameLength;
-	item->iLatinInput = ETrue;
-	item->iItemType = CNSmlDMProfileData::ENSmlTypeText;
-	if( !iProfile->HttpUsedL() ||  Item( ENSmlConnType )->iNumberData != EProfileInternet )
-	    {
-	    item->iHidden = ETrue;
-	    }
-    
-	item = Item(ENSmlHttpsPassword);
-	if ( EditMode() || CopyMode() )
-		{
-        TBuf<KNSmlMaxItemLength> buf;
-        iProfile->GetHttpPasswordL( buf );
-        item->iValue.Copy( buf );
-		}
-	else
-		{
-		item->iValue = KNullDesC;
-		}
-
-	buf.Fill( '*', KNumberofCharacters ); //mask with 4 stars
-	item->SetValue( buf );	
-	item->iLength = KNSmlMaxPasswordLength;
-	item->iItemType = CNSmlDMProfileData::ENSmlTypeSecret;
-	if( !iProfile->HttpUsedL() ||  Item( ENSmlConnType )->iNumberData != EProfileInternet    )
-	    {
-	    item->iHidden = ETrue;
-	    }	
-	}
-	
-// -----------------------------------------------------------------------------
-// CNSmlDMDlgProfileView::BuildProfileHttpsUsedItemL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMDlgProfileView::BuildProfileHttpsUsedItemL()
-	{
-	FLOG( "[OMADM] CNSmlDMDlgProfileView::BuildProfileHttpsUsedItemL" );
-	
-	CNSmlDMProfileData* item = Item( ENSmlHttpsUsed );
-	CDesCArray* stringData = 
-	        iEikonEnv->ReadDesCArrayResourceL( R_NSML_HTTPS_ACTIVE_YESNO_TYPE );
-	CleanupStack::PushL( stringData );
-	if ( EditMode() || CopyMode() )
-		{
-        if ( iProfile->HttpUsedL() )
-		    {
-		    item->iNumberData = ETrue;
-		    }
-		else
-		    {
-		    item->iNumberData = EFalse;
-		    }
-		}
-	else
-		{
-		item->iNumberData = EFalse;
-		}
-	item->iResource = R_NSML_HTTPS_ACTIVE_YESNO_TYPE;
-	item->SetValue( (*stringData)[item->iNumberData] );
-	item->iLength = 0;
-	item->iItemType = CNSmlDMProfileData::ENSmlTypehttpListYesNo;
-	item->iHidden = ( Item( ENSmlConnType )->iNumberData != EProfileInternet );    
-	CleanupStack::PopAndDestroy( stringData );			
-	}
-	
-// -----------------------------------------------------------------------------
-// CNSmlDMDlgProfileView::GetItemForIndex
-// -----------------------------------------------------------------------------
-//
-CNSmlDMProfileData* CNSmlDMDlgProfileView::GetItemForIndex( TInt aIndex )
-	{
-	FLOG( "[OMADM] CNSmlDMDlgProfileView::GetItemForIndex:" );
-	
-	TInt index = 0;
-	while ( ( aIndex != IndexItem(index)->iIndex ) &&
-	         ( index < iProfileList->Count() ) )
-		{
-        index++;
-		}
-	return (*iProfileList)[index];
-	}
-	
-//-----------------------------------------------------------------------------
-// CNSmlDMDlgProfileView::IndexItem
-//-----------------------------------------------------------------------------
-//
-CNSmlDMProfileData* CNSmlDMDlgProfileView::IndexItem( TInt aItemId )
-	{
-	FLOG( "[OMADM] CNSmlDMDlgProfileView::Item:" );
-	
-	CNSmlDMProfileData* item = NULL;
-	TInt count = iProfileList->Count();
-	for ( TInt index = 0; index < count; index++ )
-		{
-		CNSmlDMProfileData* temp = iProfileList->At(index);
-		if ( temp->iItemId == aItemId )
-			{
-			item = temp;
-			break;
-			}
-		}
-	__ASSERT_DEBUG( item, TUtil::Panic( KErrGeneral ) );
-	return item;
-	}
-
-//-----------------------------------------------------------------------------
-// CNSmlDMTextEditor::CNSmlDMTextEditor()
-//-----------------------------------------------------------------------------
-//
-CNSmlDMTextEditor::CNSmlDMTextEditor(TInt aResourceID, 
-                                                     TDes& aText, 
-                                                     TInt aTextSettingPageFlags)                      
- : CAknTextSettingPage(aResourceID, aText, aTextSettingPageFlags)
-	{
-		
-	}
-//-----------------------------------------------------------------------------
-// CNSmlDMTextEditor::OfferKeyEventL()
-//-----------------------------------------------------------------------------
-//
-TKeyResponse CNSmlDMTextEditor::OfferKeyEventL(const TKeyEvent& aKeyEvent, 
-                                                 TEventCode aType)
-    {
-		    if(EKeyEnter == aKeyEvent.iCode)
-		    {
-		    	ProcessCommandL(EAknSoftkeySelect);
-		    	return EKeyWasConsumed;
-		    }
-		    return CAknTextSettingPage::OfferKeyEventL(aKeyEvent, aType);
-    }
-//-----------------------------------------------------------------------------
-// CNSmlDMTextEditor::~CNSmlDMTextEditor()
-//-----------------------------------------------------------------------------
-//    
-CNSmlDMTextEditor::~CNSmlDMTextEditor()
-  {
-	
-  }    
-// End of File
--- a/omadm/omadmappui/src/NSmlDMFotaContainer.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,673 +0,0 @@
-/*
-* Copyright (c) 2005-2006 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:  Methods for FOTA view control container
-*
-*/
-
-
-
-// INCLUDE FILES
-#include <StringLoader.h>
-#include <featmgr.h>
-#include "NSmlDMSyncApp.h"
-#include "NSmlDMFotaContainer.h"
-#include "NSmlDMFotaView.h"
-#include "NSmlDMFotaModel.h"
-#include "NSmlDMUIDefines.h"
-#include "nsmldmsyncinternalpskeys.h"
-#include "NSmlDMSyncPrivateCRKeys.h"
-#include <etel.h>
-#include <etelmm.h>
-//multi rofs
-#include <sysutil.h>
-#include <sysversioninfo.h>
-#include "NSmlDMdef.h"
-#include <centralrepository.h>
-//multi rofs
-#include <NSmlDMSync.rsg>
-#include <e32property.h>
-#include <swi/sisregistrypackage.h>
-#include <swi/sisregistryentry.h>
-#include <swi/sisregistrysession.h>
-
-#include <csxhelp/dm.hlp.hrh>
-
-
-#include <apgtask.h>
-
-#include "NSmlDMSyncDebug.h"
-
-// ============================ MEMBER FUNCTIONS ===============================
-    
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaContainer::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CNSmlDMFotaContainer* CNSmlDMFotaContainer::NewL( CAknView* aView,
-                                                  const TRect& aRect,
-                                                  CNSmlDMFotaModel* aFotaModel )
-    {
-    CNSmlDMFotaContainer* self =
-        new( ELeave ) CNSmlDMFotaContainer( aView, aFotaModel );
-    
-    CleanupStack::PushL( self );
-    self->SetMopParent( (MObjectProvider*) aView );
-    self->ConstructL( aRect );
-    CleanupStack::Pop();
-
-    return self;
-    }
-
-// Destructor
-CNSmlDMFotaContainer::~CNSmlDMFotaContainer()
-    {
-    delete iFotaListBox;
-     FeatureManager::UnInitializeLib();
-    }
-
-
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaContainer::SizeChanged
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMFotaContainer::SizeChanged()
-    {
-    iFotaListBox->SetRect( Rect() );    // Mandatory, otherwise not drawn
-    }
-
-// ---------------------------------------------------------
-// CNSmlDMFotaContainer::HandleResourceChange
-// ---------------------------------------------------------
-//
-void CNSmlDMFotaContainer::HandleResourceChange( TInt aType )
-    {
-    CCoeControl::HandleResourceChange( aType );
-    
-    //Handle change in layout orientation
-    if ( aType == KEikDynamicLayoutVariantSwitch || aType == KAknsMessageSkinChange )
-        {
-        TRect mainPaneRect;
-        AknLayoutUtils::LayoutMetricsRect( AknLayoutUtils::EMainPane, mainPaneRect );
-        SetRect( mainPaneRect );
-		DrawDeferred();
-		}
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaContainer::CountComponentControls
-// -----------------------------------------------------------------------------
-//
-TInt CNSmlDMFotaContainer::CountComponentControls() const
-    {
-    TInt retval( 0 );
-    if ( iFotaListBox )
-        {
-        retval = 1;
-        }
-    return retval; // return nbr of controls inside this container
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaContainer::ComponentControl
-// -----------------------------------------------------------------------------
-//
-CCoeControl* CNSmlDMFotaContainer::ComponentControl( TInt aIndex ) const
-    {
-    switch ( aIndex )
-        {
-        case 0:
-            return iFotaListBox;
-        default:
-            return NULL;
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaContainer::Draw
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMFotaContainer::Draw( const TRect& /* aRect */ ) const
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaContainer::OfferKeyEventL
-// Redirect keypresses to the listbox
-// -----------------------------------------------------------------------------
-//
-TKeyResponse CNSmlDMFotaContainer::OfferKeyEventL( const TKeyEvent& aKeyEvent,
-                                                         TEventCode aType )                                                                      
-    {
-	FTRACE( FPrint(
-	_L("[OMADM]\t CNSmlDMFotaContainer::OfferKeyEventL>> Begin code = 0x%x"),aKeyEvent.iCode ) );
-	if( FeatureManager::FeatureSupported( KFeatureIdSyncMlDmFota ) ) //NFUI
-		{
-		FLOG( "[OMADM]\t CNSmlDMFotaContainer::OfferKeyEventL FOta supported ." );
-		if (aKeyEvent.iScanCode == EStdKeyDevice0 
-				|| aKeyEvent.iScanCode == EStdKeyDevice3 
-				|| aKeyEvent.iScanCode ==	EStdKeyHash )
-			{
-			FLOG( "[OMADM]\t entered in to first if loop of keys" );
-			TBool value (EFalse);
-			TInt err = RProperty::Get( KPSUidNSmlDMSyncApp, KFotaDLStatus, value );
-			if (!err && value == 1)
-				{
-				FLOG( "[OMADM]\t Ongoing Fota operation identified." );
-				TApaTaskList taskList(CEikonEnv::Static()->WsSession());
-				TApaTask task1(taskList.FindApp( TUid::Uid(KOmaDMAppUid)));
-				FLOG("Bring DM UI into FG"); 
-				task1.BringToForeground(); //DM UI
-				TApaTask task=taskList.FindApp(TUid::Uid(KFotaServerUid));
-			if(task.Exists())
-				{
-				FLOG( "[OMADM]\t  Switching to FS Download" );
-				task.BringToForeground();
-				}
-				else
-				FLOG( "[OMADM]\t Inconsistency problem!! need to debug" );
-			return EKeyWasConsumed;
-			}
-		else
-			{
-				FLOG("[OMADM]\t No ongoing Fota operation identified!");
-			}
-		}
-}
-    if ( aKeyEvent.iCode == EKeyOK || aKeyEvent.iCode == EKeyEnter) 
-        {
-        ShowContextMenuL( R_SMLSYNC_CONTXT_MENUBAR_FOTA_VIEW );
-        }
-    
-    if( ( iFotaListBox )
-          && ( aKeyEvent.iCode != EKeyLeftArrow )
-          && ( aKeyEvent.iCode != EKeyRightArrow ) )
-        {
-        TKeyResponse res = iFotaListBox->OfferKeyEventL( aKeyEvent, aType );
-        // Store current item index for options list usage later
-        return res;
-        }
-     
-	FLOG( "[OMADM]\t CNSmlDMFotaContainer::OfferKeyEventL << End");
-    return EKeyWasNotConsumed;
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaContainer::HandleListBoxEventL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMFotaContainer::HandleListBoxEventL( CEikListBox* /*aListBox*/,
-                                                TListBoxEvent /*aEventType*/ )
-    {
-    FLOG( "[OMADM]\t CNSmlDMFotaContainer::HandleListBoxEventL()" );
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaContainer::HandleControlEventL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMFotaContainer::HandleControlEventL( CCoeControl* /* aControl */,
-                                                TCoeEvent /* aEventType */ )
-    {
-    }
-
-
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaContainer::GetHelpContext
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMFotaContainer::GetHelpContext( TCoeHelpContext& aContext ) const
-    {
-	FLOG( "[OMADM] CNSmlDMFotaContainer::GetHelpContext" );
-	
-	aContext.iMajor = KUidSmlSyncApp;
-    aContext.iContext = KDM_HLP_MAIN_VIEW;
-    }
-
-
-
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaContainer::FormatListbox
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMFotaContainer::FormatListboxL( CDesCArray* aItemsArray,
-										TBool aPostponeDisplay )
-    {
-	FLOG( "[OMADM] CNSmlDMFotaContainer::FormatListboxL()" );
-
-    TBuf< KNSmlMaxTextLength64 > stringHolder;
-    HBufC* itemText = NULL;
-    aItemsArray->Reset();
-
-		TBuf< KNSmlMaxTextLength64 > prodrelease;
-		prodrelease.Zero();
-		TBuf<KSysUtilVersionTextLength> ProdRelease;
-		if ( SysUtil::GetPRInformation( ProdRelease ) == KErrNone )
-		{
-			prodrelease.Copy(ProdRelease);
-		}
-		
-		if( prodrelease.Length()>0 )
-  	{
-			HBufC* itemTextRelease = StringLoader::LoadLC( R_QTN_FOTA_LIST_RELEASE,
-                                            prodrelease );		
-   		aItemsArray->AppendL( itemTextRelease->Des() );
-			CleanupStack::PopAndDestroy( itemTextRelease );
-  	}    
-													
-   if( FeatureManager::FeatureSupported( KFeatureIdSyncMlDmFota ) ) //NFUI
-	       { 
-		if ( aPostponeDisplay && iFotaModel->FindFwUpdPkgWithStateL(
-				EDownloadProgressingWithResume ) != KErrNotFound )	       
-			{
-			TInt val (EFalse);
-			RProperty::Get(KPSUidNSmlDMSyncApp,KFotaDLRefresh,val);
-			if(!val)
-				{
-				HBufC* swItem = StringLoader::LoadLC( R_ITEM_FOTA_DOWNLOAD_POSTPONED );
-				aItemsArray->AppendL( swItem->Des() );
-				FLOG( "[OMADM] postponed item added" );
-				CleanupStack::PopAndDestroy( swItem );	        
-				}
-        }
-   else if ( iFotaModel->FindFwUpdPkgWithStateL( EStartingUpdate )
-                                                               != KErrNotFound )
-   		{
-		HBufC* swItem = StringLoader::LoadLC( R_ITEM_FOTA_NEW_SW_AVAILABLE );
-		aItemsArray->AppendL( swItem->Des() );
-		CleanupStack::PopAndDestroy( swItem );		
-		}			
-	}
-    TBuf< KNSmlMaxTextLength64 > swversion;
-    TBuf< KNSmlMaxTextLength64 >  swversiondate;
-    TBuf< KNSmlMaxTextLength64 >  typedesignator;
-    TBuf< KNSmlMaxTextLength64 >  langversion;
-    TBuf< KNSmlMaxTextLength64 >  customsw;
-    TBuf< KNSmlMaxTextLength64 >  customswdate;
-    TBuf<KSysUtilVersionTextLength> version;
-    version.Zero();
-    swversion.Zero();
-    swversiondate.Zero();
-    typedesignator.Zero();
-    langversion.Zero();
-    customsw.Zero();
-    customswdate.Zero();
-     if ( SysUtil::GetSWVersion( version ) == KErrNone )
-         {         
-         TInt len= version.Length();
-         TInt pos1 = version.Find(KSmlEOL);
-         if( pos1 != KErrNotFound && len > pos1 )
-            {
-         TBuf<KSysUtilVersionTextLength> version1;
-         version1.Zero();
-         swversion.Append( version.Left(pos1));
-         version1.Append( version.Right( len-pos1-1 ));
-         len= version1.Length();
-         pos1 = version1.Find(KSmlEOL);
-            if( pos1 != KErrNotFound  && len > pos1 )
-             {
-         swversiondate.Append(version1.Left( pos1 ));
-         version.Zero();
-         version.Append( version1.Right( len-pos1-1 ));
-            len= version.Length();
-            pos1 = version.Find(KSmlEOL);
-            if( pos1 != KErrNotFound  && len > pos1 )
-             {
-             typedesignator.Append(version.Left(pos1));         
-             }
-             }
-           }
-         }
-    TBuf<KSysUtilVersionTextLength> Langversion;    
-    if( SysUtil::GetLangVersion(Langversion ) == KErrNone )
-      {
-      langversion.Copy(Langversion);
-      }
-    SysVersionInfo::TVersionInfoType x = SysVersionInfo::EOPVersion;
-    version.Zero();
-    if( SysVersionInfo::GetVersionInfo(x,version) == KErrNone )
-      {
-         TInt len= version.Length();
-         TInt pos1 = version.Find(KSmlEOL);
-         if( pos1 != KErrNotFound  && len > pos1 )
-          {        
-          customsw.Append( version.Left(pos1));
-          customswdate.Append( version.Right( len-pos1-1 ));         
-          }
-      }  
-    //multi rofs   
-    HBufC* itemText1 = StringLoader::LoadLC( R_QTN_FOTA_LIST_SOFTWARE_VERSION,
-                                            swversion );
-    HBufC* itemText2 = StringLoader::LoadLC( R_QTN_FOTA_LIST_SOFTWARE_VERSION_DATE,
-                                            swversiondate );   
-    HBufC* itemText3 = StringLoader::LoadLC( R_QTN_FOTA_LIST_CUSTOMSW_VERSION,
-                                            customsw );              
-    HBufC* itemText4 = StringLoader::LoadLC( R_QTN_FOTA_LIST_CUSTOMSWDATE_VERSION,
-                                            customswdate ); 
-    HBufC* itemText5 = StringLoader::LoadLC( R_QTN_FOTA_LIST_LANGUAGE_VERSION,
-                                            langversion );                                                                                                                                                                                                            
-    if( swversion.Length()>0 )
-    {
-    aItemsArray->AppendL( itemText1->Des() );
-    }
-    if( swversiondate.Length()>0 )
-    {
-    aItemsArray->AppendL( itemText2->Des() );
-    }     
-    if( customsw.Length()>0 )
-    {
-    aItemsArray->AppendL( itemText3->Des() );
-    }
-    if( customswdate.Length()>0 )
-    {
-    aItemsArray->AppendL( itemText4->Des() );
-    }
-    if( langversion.Length()>0 )
-    {
-    aItemsArray->AppendL( itemText5->Des() );
-    }    
-    CleanupStack::PopAndDestroy( 5 );// itemtext1 to itemtext5    
-    itemText1 = NULL;
-    itemText2 = NULL;
-    itemText3 = NULL;
-    itemText4 = NULL;
-    itemText5 = NULL; 
-   TInt runtimesupport(0);
-   CRepository* cenrep = NULL;
-    TRAPD( error, cenrep = CRepository::NewL( KCRUidNSmlDMSyncApp ) );  
-    if(error)
-      {
-      	
-      	FLOG( "[OMADM] CNSmlDMFotaContainer::FormatListboxL() cenrep problem" );
-      }    
-    if ( cenrep )
-        {
-        cenrep->Get( KNsmlDmRuntimeVerSupport, runtimesupport );
-        delete cenrep; cenrep = NULL;
-        }
-  if(runtimesupport)
-  {   
-  	TBuf<KSysUtilVersionTextLength> productcode;
-  	productcode.Zero();
-  	TInt error = SysVersionInfo::GetVersionInfo(SysVersionInfo::EProductCode, productcode);
-  	if(error ==KErrNone )
-   	{   		 
-    	if( productcode.Length()>0 )
-    	{                                       
-    		HBufC* itemText6 = StringLoader::LoadLC( R_QTN_PRODUCT_CODE, productcode );   
-    		aItemsArray->AppendL( itemText6->Des() ); 
-    		CleanupStack::PopAndDestroy( );  
-    		itemText6 = NULL;
-  		}                    
-   	}
-  }     
-  RTelServer telServer;
-  User::LeaveIfError( telServer.Connect() );
-  RTelServer::TPhoneInfo teleinfo;
-  User::LeaveIfError( telServer.GetPhoneInfo( 0, teleinfo ) );
-  RMobilePhone phone;
-	User::LeaveIfError( phone.Open( telServer, teleinfo.iName ) );
-	User::LeaveIfError(phone.Initialise());	
-	TUint32 teleidentityCaps;
-	phone.GetIdentityCaps( teleidentityCaps );
-	RMobilePhone::TMobilePhoneIdentityV1 telid;
-	TRequestStatus status;
-	phone.GetPhoneId( status, telid );
-	User::WaitForRequest( status );
-	if (status==KErrNone)
-	{
-		TBuf<100> phoneName;
-		phoneName.Copy( telid.iModel );
-	  HBufC* phoneModl = StringLoader::LoadLC( R_ITEM_FOTA_MODEL, phoneName );
-	  if( phoneName.Length()>0 )
-    {                      
-    	aItemsArray->AppendL(phoneModl ->Des() );
-    }
-    CleanupStack::PopAndDestroy(phoneModl);
-	}
-	else
-	{
-		HBufC* noModel = StringLoader::LoadLC( R_ITEM_DM_PHONE_NO_MODEL );
-		aItemsArray->AppendL(noModel ->Des() );
-		CleanupStack::PopAndDestroy(noModel);
-	} 
-  phone.Close();
-  telServer.Close();
-  itemText1 = StringLoader::LoadLC( R_QTN_FOTA_LIST_TYPE_DESIGNATOR, typedesignator );
-  if( typedesignator.Length()>0 )
-  {
-    aItemsArray->AppendL( itemText1->Des() );
-  }
-  CleanupStack::PopAndDestroy( itemText1 );
-  itemText1 = NULL;  
-  	
-  if( FeatureManager::FeatureSupported( KFeatureIdSyncMlDmFota ) ) //NFUI
-	{
-    //Device updated independent of UI Evol
-		TTime time;
-    TInt err = iFotaModel->LastUpdateTime( time );
-    
-    if ( err == KErrNone )
-    {
-    	TTime currentTime;
-      currentTime.HomeTime();
-      TDateTime currentDateTime = currentTime.DateTime();
-      TDateTime dateTime = time.DateTime();
-        
-      if ( currentDateTime.Year() == dateTime.Year() &&
-             currentDateTime.Month() == dateTime.Month() &&
-             currentDateTime.Day() == dateTime.Day() )
-      {
-            HBufC* timeFormat = iEikonEnv->AllocReadResourceLC( R_QTN_TIME_USUAL ); 
-
-            // Format the time to user readable format. The format is locale dependent	
-            time.FormatL( stringHolder, *timeFormat );
-            CleanupStack::PopAndDestroy(); // timeFormat
-      }
-      else
-      {
-            HBufC* dateFormat = iEikonEnv->AllocReadResourceLC( R_QTN_DATE_USUAL );
-            
-            // Format the date to user readable format. The format is locale dependent
-            time.FormatL( stringHolder, *dateFormat );
-            CleanupStack::PopAndDestroy(); // dateFormat
-      }
-      AknTextUtils::DisplayTextLanguageSpecificNumberConversion( stringHolder );
-      itemText = StringLoader::LoadLC( R_ITEM_FOTA_LATEST_UPDATE, stringHolder );
-      aItemsArray->AppendL( itemText->Des() );
-      CleanupStack::PopAndDestroy( itemText );
-    }
-    else
-    {
-    	HBufC* resStringHolder = iCoeEnv->AllocReadResourceLC( R_QTN_FOTA_NOT_UPDATED );
-      AknTextUtils::DisplayTextLanguageSpecificNumberConversion( ( TDes& ) *resStringHolder );
-      itemText = StringLoader::LoadLC( R_ITEM_FOTA_LATEST_UPDATE, *resStringHolder );
-      aItemsArray->AppendL( itemText->Des() );
-      CleanupStack::PopAndDestroy( 2 ); // itemText, resStringHolder
-     }
-   }
-  
-   
-   Swi::RSisRegistrySession sisses ;
-   TInt r( sisses.Connect() );
-   CleanupClosePushL( sisses );
-   if (r== KErrNone && runtimesupport)
-   {           
-   	Swi::RSisRegistryEntry sientry;
-    // #define  browseruid = 0x10008d39; 
-  
-    TInt oerr = sientry.Open(sisses, browseruid);
-    TVersion bversion;
-    TBuf <255> browserversion;
-    if(oerr == KErrNone)
-    {
-    	TRAPD(err2,bversion= sientry.VersionL());     
-      if (err2 == KErrNone)
-      {
-      	browserversion.AppendNum(bversion.iMajor);
-        browserversion.Append(_L("."));
-        browserversion.AppendNum(bversion.iMinor);
-        if( browserversion.Length()>0 )
-    		{                                
-        	HBufC* itemText7 = StringLoader::LoadLC( R_QTN_BROWSER_VERSION, browserversion );
-        	aItemsArray->AppendL( itemText7->Des() ); 
-        	CleanupStack::PopAndDestroy( );
-        	itemText7 =NULL;
-        }
-       }
-     }
-  }  
-      
-  if (r== KErrNone&& runtimesupport)
-  {           
-  	Swi::RSisRegistryEntry sientry;
-    TInt oerr = sientry.Open(sisses, flashuid);
-    TVersion fversion;
-    TBuf <255> flashversion;
-    if(oerr == KErrNone)
-    {
-    	TRAPD(err2,fversion= sientry.VersionL());         
-      if (err2 == KErrNone)
-      {
-      	flashversion.AppendNum(fversion.iMajor);
-        flashversion.Append(_L("."));
-        flashversion.AppendNum(fversion.iMinor); 
-        if( flashversion.Length()>0 )
-    		{                               
-        	HBufC*	itemText9 = StringLoader::LoadLC( R_QTN_FLASH_VERSION, flashversion );
-        	aItemsArray->AppendL( itemText9->Des() ); 
-        	CleanupStack::PopAndDestroy( );   
-        	itemText9 =NULL;  
-        }                                   
-       }      
-     }
-   }
-         
-   if (r== KErrNone&& runtimesupport)
-   {            
-   	Swi::RSisRegistryEntry sientry;
-    TInt oerr = sientry.Open(sisses, javauid);
-    TVersion jversion;
-    TBuf <255> javaversion;
-    if(oerr == KErrNone)
-    {    	
-      TRAPD(err2,jversion= sientry.VersionL());     
-      if (err2 == KErrNone)
-      {
-      	javaversion.AppendNum(jversion.iMajor);
-        javaversion.Append(_L("."));
-        javaversion.AppendNum(jversion.iMinor);  
-        if( javaversion.Length()>0 )
-    		{ 
-    			HBufC*	itemText8 = StringLoader::LoadLC( R_QTN_JAVA_VERSION, javaversion );                          
-        	aItemsArray->AppendL( itemText8->Des() );
-        	CleanupStack::PopAndDestroy( ); 
-        	itemText8 =NULL;  
-        } 
-       }            
-     }            
-   }       
-      
-  CleanupStack::PopAndDestroy(1);
-          //sisses.Close();  
-	iFotaListBox->HandleItemAdditionL(); 
-	FLOG( "[OMADM] CNSmlDMFotaContainer::FormatListboxL() completed" );
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaContainer::ShowContextMenuL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMFotaContainer::ShowContextMenuL( TInt aResource )
-    {
-	FLOG( "[OMADM] CNSmlDMFotaContainer::ShowContextMenuL()" );
-	
-	// Switch to Context specific options menu,
-	// Show it and switch back to main options menu.
-	CEikMenuBar* menuBar = iView->MenuBar();
-	menuBar->SetMenuTitleResourceId( aResource );
-
-	// TRAP displaying of menu bar.
-	// If it fails, the correct resource is set back before leave.
-	menuBar->SetMenuType( CEikMenuBar::EMenuContext );
-	TRAPD( err, menuBar->TryDisplayMenuBarL() );
-	menuBar->SetMenuTitleResourceId( R_SMLSYNC_MENUBAR_FOTA_VIEW );
-	menuBar->SetMenuType( CEikMenuBar::EMenuOptions );
-	User::LeaveIfError( err );
-
-	FLOG( "[OMADM] CNSmlDMFotaContainer::ShowContextMenuL() completed" );
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaContainer::CNSmlDMFotaContainer
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CNSmlDMFotaContainer::CNSmlDMFotaContainer( CAknView* aView,
-                                            CNSmlDMFotaModel* aFotaModel )
-    : iView( aView ), iFotaModel( aFotaModel )
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaContainer::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMFotaContainer::ConstructL( const TRect& aRect )
-    {
-	FLOG( "[OMADM] CNSmlDMFotaContainer::ConstructL()" );
-
-    CreateWindowL();
-    	FeatureManager::InitializeLibL();
-    // Check if listbox is empty
-    //__ASSERT_DEBUG( iFotaListBox == 0, User::Panic( KErrAlreadyExists ));
-
-    // Create the itemlist
-    iFotaListBox = new (ELeave) CAknDoubleStyleListBox;
-    iFotaListBox->SetContainerWindowL( *this );
-    iFotaListBox->ConstructL( this, EAknListBoxViewerFlags );
-    // Set up/down arrows at bottom of the screen (scrollbar)
-    iFotaListBox->CreateScrollBarFrameL( ETrue );
-    iFotaListBox->ScrollBarFrame()->SetScrollBarVisibilityL( CEikScrollBarFrame::EOn,
-                                                             CEikScrollBarFrame::EAuto );
-
-    iFotaListBox->Model()->SetOwnershipType( ELbmOwnsItemArray );   // Does delete items array
-    CDesCArray* itemsArray = (CDesCArray*) iFotaListBox->Model()->ItemTextArray();
-    FormatListboxL( itemsArray, ETrue );
-    iFotaListBox->HandleItemAdditionL();
-
-    // Set up the observer (events listener)
-    iFotaListBox->SetListBoxObserver( this );
-
-    SetRect( aRect );
-    ActivateL();
-    
-    FLOG( "[OMADM] CNSmlDMFotaContainer::ConstructL() completed" );
-    }
-
-
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaContainer::RefreshL 
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMFotaContainer::RefreshL(TBool aPostponeDisplay)
-	{
-	CDesCArray* itemsArray = (CDesCArray*) iFotaListBox->Model()->ItemTextArray();
-	FormatListboxL(itemsArray, aPostponeDisplay);
-	}
-
-
-//  End of File  
--- a/omadm/omadmappui/src/NSmlDMFotaModel.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,535 +0,0 @@
-/*
-* Copyright (c) 2005-2006 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:  Class containing the FOTA functionality and communication to
-*                other related components
-*
-*/
-
-
-
-// INCLUDE FILES
-#include <sysutil.h>
-#include <centralrepository.h>
-#include <fotaengine.h>
-#include <DevManInternalCRKeys.h>
-#include "NSmlDMSyncPrivateCRKeys.h"
-
-#include "NSmlDMSyncDocument.h"
-#include "NSmlDMFotaModel.h"
-#include "NSmlDMSyncUi.hrh"
-#include "NSmlDMSyncDebug.h"
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaModel::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CNSmlDMFotaModel* CNSmlDMFotaModel::NewL( CNSmlDMSyncDocument* aDocument )
-    {
-    CNSmlDMFotaModel* self = new( ELeave ) CNSmlDMFotaModel( aDocument );
-    
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop();
-
-    return self;
-    }
-
-    
-// Destructor
-CNSmlDMFotaModel::~CNSmlDMFotaModel()
-    {
-    FLOG( "[OMADM] CNSmlDMFotaModel::~CNSmlDMFotaModel()" );
-    //iFwUpdIdStateList.Close();
-    iFotaEngine.Close();
-    }
-
-
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaModel::GetProfileName
-// Changes aProfileName to KNullDesC if the profile identifier is
-// not found.
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMFotaModel::GetProfileNameL( const TInt   aProfileId,
-                                              HBufC* aProfileName ) const
-    {
-    FLOG( "[OMADM] CNSmlDMFotaModel::GetProfileNameL()" );
-
-    TInt index( 0 );
-    aProfileName->Des().Copy( KNullDesC );
-    
-    iDocument->RefreshProfileListL( ETrue ); // Include hidden profile
-    CArrayFixFlat<TNSmlDMProfileItem>* profileList = iDocument->ProfileList( index );
-    
-    for ( index = 0; index < profileList->Count(); index++ )
-        {
-        if ( ( *profileList )[index].iProfileId == aProfileId )
-            {
-            aProfileName->Des().Copy( ( *profileList )[index].iProfileName );
-            }
-        }
-
-    FTRACE( FPrint( _L(
-        "[OMADM] CNSmlDMFotaModel::GetProfileNameL(): aProfileId = %d, ProfileName = \"%S\"" ),
-         aProfileId, aProfileName ) );
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaModel::DefaultFotaProfileIdL
-// -----------------------------------------------------------------------------
-//
-TInt CNSmlDMFotaModel::DefaultFotaProfileIdL() const
-    {
-    FLOG( "[OMADM] CNSmlDMFotaModel::DefaultFotaProfileIdL()" );
-    
-    TInt profileId( KErrNotFound );
-    CRepository* centrep = NULL;
-    TRAPD( err, centrep = CRepository::NewL( KCRUidNSmlDMSyncApp ) );
-    FTRACE( FPrint( _L(
-        "[OMADM] CNSmlDMFotaModel::DefaultFotaProfileIdL(), opening cenrep returned %d" ),
-        err ) );
-
-    User::LeaveIfError( err );
-    centrep->Get( KNSmlDMDefaultFotaProfileKey, profileId );
-    delete centrep;
-    
-    FTRACE( FPrint( _L(
-        "[OMADM] CNSmlDMFotaModel::DefaultFotaProfileIdL() completed, profileId = %d" ),
-        profileId ) );
-    return profileId;
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaModel::SetDefaultFotaProfileIdL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMFotaModel::SetDefaultFotaProfileIdL( const TInt aProfileId )
-    {
-    FLOG( "[OMADM] CNSmlDMFotaModel::SetDefaultFotaProfileIdL()" );
-    
-    CRepository* centrep = NULL;
-    TRAPD( err, centrep = CRepository::NewL( KCRUidNSmlDMSyncApp ) );
-    FTRACE( FPrint( _L(
-        "[OMADM] CNSmlDMFotaModel::SetDefaultFotaProfileIdL(), opening cenrep returned %d" ),
-        err ) );
-
-    User::LeaveIfError( err );
-    centrep->Set( KNSmlDMDefaultFotaProfileKey, aProfileId );
-    delete centrep;
-    
-    FLOG( "[OMADM] CNSmlDMFotaModel::SetDefaultFotaProfileIdL() completed" );
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaModel::EnableFwUpdRequestL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMFotaModel::EnableFwUpdRequestL( const TInt aProfileId )
-    {
-    FLOG( "[OMADM] CNSmlDMFotaModel::SetDefaultFotaProfileIdL()" );
-    
-    CRepository* centrep = NULL;
-    TRAPD( err, centrep = CRepository::NewL( KCRUidDeviceManagementInternalKeys ) );
-    FTRACE( FPrint( _L(
-        "[OMADM] CNSmlDMFotaModel::EnableFwUpdRequestL(), opening cenrep returned %d" ),
-        err ) );
-    User::LeaveIfError( err );
-    centrep->Set( KDevManClientInitiatedFwUpdateId, aProfileId );
-    delete centrep;
-    
-    FLOG( "[OMADM] CNSmlDMFotaModel::SetDefaultFotaProfileIdL() completed" );
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaModel::ReadProfileListL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMFotaModel::ReadProfileListL( CDesCArray*          aItems,
-                                         CArrayFixFlat<TInt>* aProfileIdList )
-    {
-    FLOG( "[OMADM] CNSmlDMFotaModel::ReadProfileListL()" );
-
-    TInt index( 0 );
-
-    iDocument->RefreshProfileListL( ETrue ); // Include hidden profile
-    CArrayFixFlat<TNSmlDMProfileItem>* profileList = iDocument->ProfileList( index );
-
-    for ( index = 0; index < profileList->Count(); index++ )
-        {
-        aItems->AppendL( ( *profileList )[index].iProfileName );
-        aProfileIdList->AppendL( ( *profileList )[index].iProfileId );
-        }
-        
-    FTRACE( FPrint( _L(
-        "[OMADM] CNSmlDMFotaModel::ReadProfileListL() completed, items = %d" ),
-        index ) );
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaModel::SelectDefaultProfileFromList
-// -----------------------------------------------------------------------------
-//
-TInt CNSmlDMFotaModel::SelectDefaultProfileFromList(
-    const CArrayFixFlat<TInt>* aProfileIdList ) const
-    {
-    FLOG( "[OMADM] CNSmlDMFotaModel::SelectDefaultProfileFromList()" );
-
-    TInt retval( KErrNotFound );
-    TInt defaultId( KErrNotFound );
-    
-    TRAPD( err, defaultId = iDocument->FotaModel()->DefaultFotaProfileIdL() );
-    
-    if ( err != KErrNone )
-        {
-        // We do not care about the possible errors here. It only means
-        // that the identifier is not found on the list.
-        FTRACE( FPrint( _L(
-            "[OMADM] CNSmlDMFotaModel::SelectDefaultProfileFromList() received error %d" ),
-            err ) );
-        }
-        
-    for ( TInt index( 0 ); index < aProfileIdList->Count(); index++ )
-        {
-        if ( ( *aProfileIdList )[index] == defaultId )
-            {
-            retval = index;
-            break;  // Jump out of the loop
-            }
-        }
-    
-    FTRACE( FPrint( _L(
-        "[OMADM] CNSmlDMFotaModel::SelectDefaultProfileFromList() completed, retval = %d" ),
-        retval ) );
-    return retval;
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaModel::VerifyProfileL
-// -----------------------------------------------------------------------------
-//
-TBool CNSmlDMFotaModel::VerifyProfileL( const TInt aProfileId ) const
-    {
-    FTRACE( FPrint( _L(
-        "[OMADM] CNSmlDMFotaModel::VerifyProfileL(), aProfileId = %d" ),
-        aProfileId ) );
-
-    TInt index( 0 );
-    TBool retval( EFalse );
-
-    iDocument->RefreshProfileListL( ETrue ); // Include hidden profile
-    CArrayFixFlat<TNSmlDMProfileItem>* profileList = iDocument->ProfileList( index );
-
-    for ( index = 0; index < profileList->Count(); index++ )
-        {
-        if ( ( *profileList )[index].iProfileId == aProfileId )
-            {
-            retval = ETrue;
-            break;  // Jump out of the loop
-            }
-        }
-        
-    FTRACE( FPrint( _L(
-        "[OMADM] CNSmlDMFotaModel::VerifyProfileL() completed, return = %d" ),
-        retval ) );
-    return retval;
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaModel::RetrieveFwUpdPkgIdListL
-// -----------------------------------------------------------------------------
-//
-TInt CNSmlDMFotaModel::RetrieveFwUpdPkgIdListL(TFotaState aState)
-    {
-    const TInt maxNumOfProfiles = 32;
-    
-    TBuf16< maxNumOfProfiles > idListDescriptor;
-    User::LeaveIfError( iFotaEngine.GetUpdatePackageIds( idListDescriptor ) );
-	TInt retval = KErrNotFound;
-    RArray< TInt > idList;
-    
-    TInt count = idListDescriptor.Length();
-    for ( TInt i = 0; i < count; i++ )
-        {
-        idList.Append( idListDescriptor[ i ] );
-        }
-	TInt count1 = idList.Count();
-	for ( TInt i = 0; (i < count1) && (retval == KErrNotFound); i++ )
-		{
-		RFotaEngineSession::TState pkgState;
-		pkgState = iFotaEngine.GetState( idList[ i ] );
-		FTRACE( FPrint( _L(
-				"[OMADM] CNSmlDMFotaModel::RetrieveFwUpdPkgIdListL(): profileid = %d, pkgstate = %d" ),
-				idList[i], (TInt) pkgState ) );
-		if ( pkgState == aState )
-			{
-			retval = idList[ i ];
-			}
-		}
-	FTRACE( FPrint( _L(
-	"[OMADM] CNSmlDMFotaModel::RetrieveFwUpdPkgIdListL(): completed, retval = %d" ),
-	retval ) );
-	idList.Close(); 
-	return retval;
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaModel::FindFwUpdPkgWithStateL
-// -----------------------------------------------------------------------------
-//
-TInt CNSmlDMFotaModel::FindFwUpdPkgWithStateL(
-    TFotaState aState )
-    {
-    FTRACE( FPrint( _L(
-        "[OMADM] CNSmlDMFotaModel::FindFwUpdPkgWithStateL(): aState = %d" ),
-         (TInt) aState ) );
-	RFotaEngineSession fotasession;
-	fotasession.OpenL();
-	CleanupClosePushL(fotasession);
-	const TInt x = -1;
-	TFotaState res = EIdle;
-	res = (TFotaState)fotasession.GetState(x);
-	CleanupStack::PopAndDestroy(&fotasession);
-	if( res == aState )
-		return KErrNone;
-	else
-		return KErrNotFound;
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaModel::InitiateFwUpdInstall
-// -----------------------------------------------------------------------------
-//
-TInt CNSmlDMFotaModel::InitiateFwUpdInstall( TInt aPkgId, TInt aProfileId )
-    {
-    FTRACE( FPrint( _L(
-        "[OMADM] CNSmlDMFotaModel::InitiateFwUpdInstall(): aPkgId = %d, aProfileId = %d" ),
-        aPkgId, aProfileId ) );
-
-    TInt retval = KErrGeneral;
-    retval = iFotaEngine.Update( aPkgId, aProfileId, KNullDesC8, KNullDesC8 );
-
-    FTRACE( FPrint( _L(
-        "[OMADM] CNSmlDMFotaModel::InitiateFwUpdInstall() completed, retval = %d" ),
-        retval ) );
-    return retval;
-    }
-    
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaModel::ContinueFwUpdInstall
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMFotaModel::ContinueFwUpdInstall( )
-    {
-    FLOG( "[OMADM] CNSmlDMFotaModel::ContinueFwUpdInstall(): begin" );
-
-    TInt retval = iFotaEngine.TryResumeDownload( );
-    
-    FTRACE( FPrint( _L(
-    		"[OMADM] CNSmlDMFotaModel::ContinueFwUpdInstall() completed, retval = %d") ,retval ));
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaModel::CurrentFwVersionString
-// If the software version retrieval fails, the aVersionstring is not modified.
-// -----------------------------------------------------------------------------
-//
-TInt CNSmlDMFotaModel::CurrentFwVersionString( TDes& aVersionString )
-    {
-    FLOG( "[OMADM] CNSmlDMFotaModel::CurrentFwVersionString()" );
-    TBuf< KSysUtilVersionTextLength > buf;
-
-    TInt err = SysUtil::GetSWVersion( buf );
-    if ( err == KErrNone )
-        {
-        _LIT( separator, "\n" );
-        TInt location = buf.Find( separator );
-        if ( location != KErrNotFound)
-            {
-            // Delete the separator and the text after it. We are
-            // only interested in the first section.
-            buf.Delete( location, (buf.Length() - location) );
-            }
-
-        aVersionString.Copy( buf.Left( aVersionString.MaxLength() ) );
-        }
-    FTRACE( FPrint( _L(
-        "[OMADM] CNSmlDMFotaModel::CurrentFwVersionString() completed, err = %d, string = \"%S\"" ),
-        err, &aVersionString ) );
-
-    return err;
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaModel::LastUpdateTime
-// -----------------------------------------------------------------------------
-//
-TInt CNSmlDMFotaModel::LastUpdateTime( TTime& aTime )
-    {
-    FLOG( "[OMADM] CNSmlDMFotaModel::LastUpdateTime()" );
-    TInt retval = iFotaEngine.LastUpdate( aTime );
-    FTRACE( FPrint( _L(
-        "[OMADM] CNSmlDMFotaModel::LastUpdateTime() completed, err = %d" ),
-        retval ) );
-    return retval;
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaModel::MarkFwUpdChangesStartL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMFotaModel::MarkFwUpdChangesStartL()
-    {
-    FLOG( "[OMADM] CNSmlDMFotaModel::MarkFwUpdChangesStartL()" );
-    
-    /*iFwUpdIdStateList.Reset();
-    RArray< TInt > pkgIdList = RetrieveFwUpdPkgIdListL();
-
-    TInt count = pkgIdList.Count();
-    for ( TInt i = 0; i < count; i++ )
-        {
-        TFwUpdIdState item;
-        item.iPkgId = pkgIdList[ i ];
-        item.iState = iFotaEngine.GetState( pkgIdList[ i ] );
-        iFwUpdIdStateList.Append( item );
-        }
-    FTRACE( FPrint( _L(
-        "[OMADM] CNSmlDMFotaModel::MarkFwUpdChangesStartL() completed, list count = %d" ),
-        iFwUpdIdStateList.Count() ) );
-    pkgIdList.Close();  */      
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaModel::FwUpdStatesChangedL
-// The array is reseted at the end of the execution to save memory, since at
-// the moment the information is not needed multiple times.
-// -----------------------------------------------------------------------------
-//
-TBool CNSmlDMFotaModel::FwUpdStatesChangedL()
-    {
-    FLOG( "[OMADM] CNSmlDMFotaModel::FwUpdStatesChangedL()" );
-    
-    TBool retval = EFalse;
-    /*RArray< TInt > pkgIdList = RetrieveFwUpdPkgIdListL();
-
-    TInt count = pkgIdList.Count();
-    for ( TInt i = 0; i < count; i++ )
-        {
-        FTRACE( FPrint( _L(
-            "[OMADM] CNSmlDMFotaModel::FwUpdStatesChangedL() searching pkgid = %d" ),
-            pkgIdList[ i ] ) );
-
-        TInt originalCount = iFwUpdIdStateList.Count();
-        TBool found = EFalse;
-        
-        for ( TInt index = 0; (index < originalCount) && (!found);
-            index++ )
-            {
-            if ( iFwUpdIdStateList[ index ].iPkgId == pkgIdList[ i ] )
-                {
-                FTRACE( FPrint( _L(
-                    "[OMADM] CNSmlDMFotaModel::FwUpdStatesChangedL() found pkgid = %d" ),
-                    iFwUpdIdStateList[ index ].iPkgId ) );
-                FTRACE( FPrint( _L(
-                    "[OMADM] CNSmlDMFotaModel::FwUpdStatesChangedL() states are: %d and %d" ),
-                    iFotaEngine.GetState( pkgIdList[ i ] ),
-                    iFwUpdIdStateList[ index ].iState ) );
-
-                found = ETrue;
-                if ( iFwUpdIdStateList[ index ].iState
-                    != iFotaEngine.GetState( pkgIdList[ i ] ) )
-                    {
-                    retval = ETrue;
-                    }
-                }
-            }
-        
-        if ( !found )
-            {
-            retval = ETrue;
-            }
-        }
-    iFwUpdIdStateList.Reset();
-
-    FTRACE( FPrint( _L(
-        "[OMADM] CNSmlDMFotaModel::FwUpdStatesChangedL() completed, return = %d" ),
-        retval ) );
-    pkgIdList.Close();*/
-    TInt configFlags = EGenericSession;
-        //TInt SetGenValue(EGenericSession );
-        CRepository* centrep = NULL;
-        TRAPD( err, centrep = CRepository::NewL( KCRUidDeviceManagementInternalKeys ) );
-        if ( centrep )
-            {
-            centrep->Get( KDevManSessionType, configFlags );
-            
-            }
-        if ( err != KErrNone ) 
-            {
-            User::Leave( err );
-            }
-        else
-            {
-            centrep->Set( KDevManSessionType, EGenericSession );
-            }      
-        if(centrep)    
-           {
-           delete centrep;
-           }
-        if ( configFlags == EFotaPkgFound )
-			{
-			retval = ETrue;
-			}           
-        // configFlags=2 for FOTA Package not downloaded case ,1- successful download
-    return retval;
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaModel::CNSmlDMFotaModel
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CNSmlDMFotaModel::CNSmlDMFotaModel( CNSmlDMSyncDocument* aDocument ) :
-    iDocument( aDocument )
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaModel::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMFotaModel::ConstructL()
-    {
-    iFotaEngine.OpenL();
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaModel::GetCurrentFwUpdState
-// Fetches the state of last or current Fota operation
-// -----------------------------------------------------------------------------
-//
-TFotaState CNSmlDMFotaModel::GetCurrentFwUpdState()
-	{
-	const TInt x = -1;
-	TFotaState res = EIdle;
-	res = (TFotaState)iFotaEngine.GetState(x);
-	return res;
-	}
-
-//  End of File  
--- a/omadm/omadmappui/src/NSmlDMFotaModel_nofota.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,351 +0,0 @@
-/*
-* 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:  Class containing the no FOTA functionality 
-*
-*/
-
-
-
-// INCLUDE FILES
-#include <sysutil.h>
-#include <centralrepository.h>
-#include <devmaninternalcrkeys.h>
-
-#include "nsmldmsyncprivatecrkeys.h"
-#include "nsmldmsyncdocument.h"
-#include "nsmldmfotamodel.h"
-//#include "nsmldmsyncdebug.h"
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaModel::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CNSmlDMFotaModel* CNSmlDMFotaModel::NewL( CNSmlDMSyncDocument* aDocument )
-    {
-    CNSmlDMFotaModel* self = new( ELeave ) CNSmlDMFotaModel( aDocument );
-    
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop();
-
-    return self;
-    }
-
-    
-// Destructor
-CNSmlDMFotaModel::~CNSmlDMFotaModel()
-    {
-    }
-
-
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaModel::GetProfileName
-// Changes aProfileName to KNullDesC if the profile identifier is
-// not found.
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMFotaModel::GetProfileNameL( const TInt   aProfileId,
-                                              HBufC* aProfileName ) const
-    {
-
-    TInt index( 0 );
-    aProfileName->Des().Copy( KNullDesC );
-    
-    iDocument->RefreshProfileListL( ETrue ); // Include hidden profile
-    CArrayFixFlat<TNSmlDMProfileItem>* profileList = iDocument->ProfileList( index );
-    
-    for ( index = 0; index < profileList->Count(); index++ )
-        {
-        if ( ( *profileList )[index].iProfileId == aProfileId )
-            {
-            aProfileName->Des().Copy( ( *profileList )[index].iProfileName );
-            }
-        }
-
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaModel::DefaultFotaProfileIdL
-// -----------------------------------------------------------------------------
-//
-TInt CNSmlDMFotaModel::DefaultFotaProfileIdL() const
-    {
-    
-    TInt profileId( KErrNotFound );
-    CRepository* centrep = NULL;
-    TRAPD( err, centrep = CRepository::NewL( KCRUidNSmlDMSyncApp ) );
-
-    User::LeaveIfError( err );
-    centrep->Get( KNSmlDMDefaultFotaProfileKey, profileId );
-    delete centrep;
-    
-    return profileId;
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaModel::SetDefaultFotaProfileIdL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMFotaModel::SetDefaultFotaProfileIdL( const TInt aProfileId )
-    {
-    
-    CRepository* centrep = NULL;
-    TRAPD( err, centrep = CRepository::NewL( KCRUidNSmlDMSyncApp ) );
-
-    User::LeaveIfError( err );
-    centrep->Set( KNSmlDMDefaultFotaProfileKey, aProfileId );
-    delete centrep;
-    
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaModel::EnableFwUpdRequestL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMFotaModel::EnableFwUpdRequestL( const TInt aProfileId )
-    {
-    /*
-    CRepository* centrep = NULL;
-    TRAPD( err, centrep = CRepository::NewL( KCRUidDeviceManagementInternalKeys ) );
-    FTRACE( FPrint( _L(
-        "[OMADM] CNSmlDMFotaModel::EnableFwUpdRequestL(), opening cenrep returned %d" ),
-        err ) );
-    User::LeaveIfError( err );
-    centrep->Set( KDevManClientInitiatedFwUpdateId, aProfileId );
-    delete centrep;
-    */
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaModel::ReadProfileListL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMFotaModel::ReadProfileListL( CDesCArray*          aItems,
-                                         CArrayFixFlat<TInt>* aProfileIdList )
-    {
-
-    TInt index( 0 );
-
-    iDocument->RefreshProfileListL( ETrue ); // Include hidden profile
-    CArrayFixFlat<TNSmlDMProfileItem>* profileList = iDocument->ProfileList( index );
-
-    for ( index = 0; index < profileList->Count(); index++ )
-        {
-        aItems->AppendL( ( *profileList )[index].iProfileName );
-        aProfileIdList->AppendL( ( *profileList )[index].iProfileId );
-        }
-        
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaModel::SelectDefaultProfileFromList
-// -----------------------------------------------------------------------------
-//
-TInt CNSmlDMFotaModel::SelectDefaultProfileFromList(
-    const CArrayFixFlat<TInt>* aProfileIdList ) const
-    {
-
-    TInt retval( KErrNotFound );
-    TInt defaultId( KErrNotFound );
-    
-    TRAPD( err, defaultId = iDocument->FotaModel()->DefaultFotaProfileIdL() );
-    
-    if ( err != KErrNone )
-        {
-        // We do not care about the possible errors here. It only means
-        // that the identifier is not found on the list.
-        }
-        
-    for ( TInt index( 0 ); index < aProfileIdList->Count(); index++ )
-        {
-        if ( ( *aProfileIdList )[index] == defaultId )
-            {
-            retval = index;
-            break;  // Jump out of the loop
-            }
-        }
-    
-    return retval;
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaModel::VerifyProfileL
-// -----------------------------------------------------------------------------
-//
-TBool CNSmlDMFotaModel::VerifyProfileL( const TInt aProfileId ) const
-    {
-
-    TInt index( 0 );
-    TBool retval( EFalse );
-
-    iDocument->RefreshProfileListL( ETrue ); // Include hidden profile
-    CArrayFixFlat<TNSmlDMProfileItem>* profileList = iDocument->ProfileList( index );
-
-    for ( index = 0; index < profileList->Count(); index++ )
-        {
-        if ( ( *profileList )[index].iProfileId == aProfileId )
-            {
-            retval = ETrue;
-            break;  // Jump out of the loop
-            }
-        }
-        
-    return retval;
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaModel::RetrieveFwUpdPkgIdListL
-// -----------------------------------------------------------------------------
-//
-TInt CNSmlDMFotaModel::RetrieveFwUpdPkgIdListL(TFotaState aState)
-    {
-    return KErrNotFound;
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaModel::FindFwUpdPkgWithStateL
-// -----------------------------------------------------------------------------
-//
-TInt CNSmlDMFotaModel::FindFwUpdPkgWithStateL(
-    TFotaState /*aState*/ )
-    {
-   
-    return KErrNone;    
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaModel::InitiateFwUpdInstall
-// -----------------------------------------------------------------------------
-//
-TInt CNSmlDMFotaModel::InitiateFwUpdInstall( TInt /*aPkgId*/, TInt /*aProfileId*/ )
-    {
-    return KErrGeneral;    
-    }
-    
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaModel::ContinueFwUpdInstall
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMFotaModel::ContinueFwUpdInstall( )
-	{
-	return;
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaModel::CurrentFwVersionString
-// If the software version retrieval fails, the aVersionstring is not modified.
-// -----------------------------------------------------------------------------
-//
-TInt CNSmlDMFotaModel::CurrentFwVersionString( TDes& aVersionString )
-    {
-    TBuf< KSysUtilVersionTextLength > buf;
-
-    TInt err = SysUtil::GetSWVersion( buf );
-    if ( err == KErrNone )
-        {
-        //_LIT( separator, "\n" );
-        TInt location = buf.Find( KSmlEOL );
-        if ( location != KErrNotFound)
-            {
-            // Delete the separator and the text after it. We are
-            // only interested in the first section.
-            buf.Delete( location, (buf.Length() - location) );
-            }
-
-        aVersionString.Copy( buf.Left( aVersionString.MaxLength() ) );
-        }
-
-    return err;
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaModel::LastUpdateTime
-// -----------------------------------------------------------------------------
-//
-TInt CNSmlDMFotaModel::LastUpdateTime( TTime& /*aTime*/ )
-    {
-    return KErrGeneral;
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaModel::MarkFwUpdChangesStartL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMFotaModel::MarkFwUpdChangesStartL()
-    {
-    return;    
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaModel::FwUpdStatesChangedL
-// The array is reseted at the end of the execution to save memory, since at
-// the moment the information is not needed multiple times.
-// -----------------------------------------------------------------------------
-//
-TBool CNSmlDMFotaModel::FwUpdStatesChangedL()
-    {
-    return EFalse;    
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaModel::CNSmlDMFotaModel
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CNSmlDMFotaModel::CNSmlDMFotaModel( CNSmlDMSyncDocument* aDocument ) :
-    iDocument( aDocument )
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaModel::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMFotaModel::ConstructL()
-    {    
-    }
-
-TFotaState CNSmlDMFotaModel::GetCurrentFwUpdState()
-{
-	return EIdle;
-}
-
-//Dummy implementation just to avoid compile time errors
-
-RFotaEngineSession::RFotaEngineSession()
-{
-}
-
-void RFotaEngineSession::ExtensionInterface(TUid /*aInterfaceId*/
-                                              ,TAny*& /*aImplementation*/)
-    {
-    /*RProcess pr; TFullName fn = pr.FullName(); 
-    FLOG(_L("RFotaEngineSession::ExtensionInterface called by %S"), &fn);*/
-    }
-TUid RFotaEngineSession::ServiceUid() const
-	{
-   /* RProcess pr; TFullName fn = pr.FullName(); 
-    FLOG(_L( "RFotaEngineSession::ServiceUid() >> called by: %S" ), &fn );
-    FLOG(_L( "RFotaEngineSession::ServiceUid() << ret: 0x%X" ),
-                                            KFotaServiceUid );
-                                            */
-	return TUid::Uid( 0x102072c4 );
-	}  	
-//End of File  	 
--- a/omadm/omadmappui/src/NSmlDMFotaSettingsDialog.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,403 +0,0 @@
-/*
-* Copyright (c) 2005-2006 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:  Methods For FOTA Setting Dialog
-*
-*/
-
-
-
-// INCLUDE FILES
-#include <StringLoader.h>
-#include <aknradiobuttonsettingpage.h>
-#include <aknlists.h>
-
-#include "NSmlDMSyncApp.h"
-#include "NSmlDMSyncDocument.h"
-#include "NSmlDMSyncAppUi.h"
-#include "NSmlDMFotaSettingsDialog.h"
-#include "NSmlDMFotaModel.h"
-#include "NSmlDMSyncUi.hrh"
-#include <NSmlDMSync.rsg>
-#include <featmgr.h>
-#include "nsmldmsyncinternalpskeys.h" 
-
-#include <hlplch.h>
-#include <csxhelp/dm.hlp.hrh>
-
-
-#include "NSmlDMSyncDebug.h"
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-    
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaSettingsDialog::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CNSmlDMFotaSettingsDialog* CNSmlDMFotaSettingsDialog::NewL()
-    {
-    CNSmlDMFotaSettingsDialog* self = new ( ELeave ) CNSmlDMFotaSettingsDialog;
-    
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop();
-
-    return self;
-    }
-
-// Destructor
-CNSmlDMFotaSettingsDialog::~CNSmlDMFotaSettingsDialog()
-    {
-    if ( iNaviPane )
-        {
-        iNaviPane->Pop();
-        }
-    
-    if ( iTitlePane->Text() && iOriginalTitle ) 
-        {
-        TRAP_IGNORE( iTitlePane->SetTextL( *iOriginalTitle ) );
-        }
-    delete iOriginalTitle;
-    iAvkonAppUi->RemoveFromStack( this );
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaSettingsDialog::UpdateFotaSettListboxL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMFotaSettingsDialog::UpdateFotaSettListboxL()
-    {
-    FLOG( "[OMADM] CNSmlDMFotaSettingsDialog::UpdateFotaSettListboxL()" );
-
-    iFotaSettListBox->ItemDrawer()->ClearAllPropertiesL();
-    
-    CDesCArray* itemsArray = (CDesCArray*) iFotaSettListBox->Model()->ItemTextArray();
-    itemsArray->Reset();
-    
-    TInt profileId = iDocument->FotaModel()->DefaultFotaProfileIdL();
-    HBufC* profileName = HBufC::NewLC( KNSmlMaxProfileNameLength );
-    iDocument->FotaModel()->GetProfileNameL( profileId, profileName );
-    
-    // No default profile found, "Always ask" is shown instead.
-    if ( profileName->Des() == KNullDesC )
-        {
-        // Existing buffer is deleted, since the AllocReadResourceLC reserves
-        // memory for the resource.
-        CleanupStack::PopAndDestroy( profileName );
-        profileName  = iCoeEnv->AllocReadResourceLC( R_QTN_FOTA_PROFILE_ALWAYS_ASK );
-        }
-    
-    
-    HBufC* itemText = StringLoader::LoadLC( R_ITEM_FOTA_DEFAULT_SERVER, *profileName );
-
-    itemsArray->AppendL( itemText->Des() );
-    
-    CleanupStack::PopAndDestroy( 2 ); // itemText, profileName
-    iFotaSettListBox->HandleItemAdditionL();
-
-    FLOG( "[OMADM] CNSmlDMFotaSettingsDialog::UpdateFotaSettListboxL() completed" );
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaSettingsDialog::HandleOKL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMFotaSettingsDialog::HandleOKL()
-    {
-    FLOG( "[OMADM] CNSmlDMFotaSettingsDialog::HandleOKL()" );
-	
-    // Profile list owned by the dialog
-    CArrayFixFlat<TInt>* profileIdList = new ( ELeave ) CArrayFixFlat<TInt>( 1 );
-    CleanupStack::PushL( profileIdList );
-
-    CDesCArray* items = new ( ELeave ) CDesCArrayFlat( 1 );
-    CleanupStack::PushL( items );
-    items->Reset();
-
-    HBufC* string = StringLoader::LoadLC( R_QTN_FOTA_PROFILE_ALWAYS_ASK );
-    items->AppendL( string->Des() );
-    CleanupStack::PopAndDestroy( string );
-    string = NULL;
-
-    iDocument->FotaModel()->ReadProfileListL( items, profileIdList );
-    TInt value = iDocument->FotaModel()->SelectDefaultProfileFromList( profileIdList ) + 1;
-    
-    CAknRadioButtonSettingPage* dlg = 
-        new (ELeave) CAknRadioButtonSettingPage( R_SETTINGS_RADIO,
-                                                 value, items );
- 
-    HBufC* hdr = StringLoader::LoadLC( R_HDR_FOTA_DEFAULT_SERVER );
-	CleanupStack::PushL( dlg );
-	dlg->SetSettingTextL( hdr->Des() );
-    CleanupStack::Pop( dlg );
-
-    TBool ret = dlg->ExecuteLD( CAknSettingPage::EUpdateWhenChanged );
-
-	CleanupStack::PopAndDestroy( hdr );
-	hdr = NULL;
-    CleanupStack::PopAndDestroy( items ); 
-
-    if ( ret )  // User has accepted a choice
-        {
-        // Checks that the value conversion is done propery and the result
-        // is in range.
-        __ASSERT_ALWAYS( ( value >= 0 ) && ( value - 1 < profileIdList->Count() ),
-                         TUtil::Panic( KErrArgument ) );
-        
-        if ( value == 0 )
-            {
-            iDocument->FotaModel()->SetDefaultFotaProfileIdL( KErrNotFound );
-            }
-        else
-            {
-            TInt profileId( ( *profileIdList )[value - 1] );
-            iDocument->FotaModel()->SetDefaultFotaProfileIdL( profileId );
-            }
-        }
-    else //For End key press
-        {
-        STATIC_CAST( CNSmlDMSyncAppUi*, iEikonEnv->EikAppUi() )->ExitCallL();	
-        }    
-    CleanupStack::PopAndDestroy( profileIdList );
-        
-    UpdateFotaSettListboxL();
-
-    FLOG( "[OMADM] CNSmlDMFotaSettingsDialog::HandleOKL() completed" );
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaSettingsDialog::OkToExitL
-// -----------------------------------------------------------------------------
-//
-TBool CNSmlDMFotaSettingsDialog::OkToExitL( TInt aButtonId )
-    {
-    FLOG( "[OMADM] CNSmlDMFotaSettingsDialog::OkToExitL()" );
-    
-    if ( aButtonId == EAknSoftkeyChange )
-        {
-    	HandleOKL();
-    	return EFalse;
-        }
-       
-    if ( aButtonId == EEikBidCancel || aButtonId == EAknSoftkeyBack )
-        {
-        TInt value = EFalse;  //IAD: Making DM Idle
-        TInt r1 = RProperty::Set(KPSUidNSmlDMSyncApp,KDMIdle,value); 
-        FLOG( "[OMADM] CNSmlDMFotaSettingsDialog::OkToExitL() completed" );
-        return ETrue;
-        }
-
-    FLOG( "[OMADM] CNSmlDMFotaSettingsDialog::OkToExitL() completed" );
-    return CAknDialog::OkToExitL( aButtonId );
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaSettingsDialog::PreLayoutDynInitL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMFotaSettingsDialog::PreLayoutDynInitL()
-    {
-    iAvkonAppUi->AddToStackL( this );
-    
-    iFotaSettListBox = (CAknSettingStyleListBox*) ControlOrNull ( ENSmlFotaSettList );
-
-    if ( !iFotaSettListBox )
-        {
-        User::Leave( KErrGeneral );
-        }
-    // Set up/down arrows at bottom of the screen (scrollbar)
-    iFotaSettListBox->CreateScrollBarFrameL( ETrue );
-    iFotaSettListBox->ScrollBarFrame()->SetScrollBarVisibilityL( CEikScrollBarFrame::EOn,
-                                                                 CEikScrollBarFrame::EAuto );
-
-    iFotaSettListBox->Model()->SetOwnershipType( ELbmOwnsItemArray );   // Deletes items array
-    UpdateFotaSettListboxL();
-
-    // Set up the observer (events listener)
-    iFotaSettListBox->SetListBoxObserver( this );
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaSettingsDialog::DynInitMenuPaneL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMFotaSettingsDialog::DynInitMenuPaneL( TInt aResourceID,CEikMenuPane* aMenuPane )
-	{
-     	FLOG( "[OMADM] CNSmlDMDlgProfileView::DynInitMenuPaneL:" );
-     
-     	if (aResourceID == R_SETTINGS_MENU &&
-     	         !FeatureManager::FeatureSupported( KFeatureIdHelp ))    
-          {   
-              aMenuPane->SetItemDimmed( EAknCmdHelp , ETrue );
-          
-          }
-	}
-
-
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaSettingsDialog::OfferKeyEventL
-// -----------------------------------------------------------------------------
-//
-TKeyResponse CNSmlDMFotaSettingsDialog::OfferKeyEventL( const TKeyEvent& aKeyEvent,
-                                                              TEventCode aType )
-	{
-    FLOG( "[OMADM] CNSmlDMFotaSettingsDialog::OfferKeyEventL()" );
-
-    if ( aType == EEventKey )
-        {
-        switch ( aKeyEvent.iCode )
-            {
-            case EKeyEscape:
-                {
-                iAvkonAppUi->ProcessCommandL( EAknCmdExit );
-                break;
-                }
-            case EKeyEnter: // Enter button
-            case EKeyOK: // OK button
-                {
-                HandleOKL();
-                return EKeyWasConsumed;
-                }
-            case EKeyPhoneEnd:
-                {
-                STATIC_CAST( CNSmlDMSyncAppUi*, iEikonEnv->EikAppUi() )->ExitCallL();
-                return EKeyWasConsumed;	
-                }
-            default:
-                {
-                break;
-                }
-            }
-        }
-    return CAknDialog::OfferKeyEventL( aKeyEvent, aType);
-    }
-    
-
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaSettingsDialog::ProcessCommandL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMFotaSettingsDialog::ProcessCommandL( TInt aCommandId )
-    {
-    FLOG( "[OMADM] CNSmlDMFotaSettingsDialog::ProcessCommandL()" );
-
-    HideMenu();
-    switch ( aCommandId )
-        {
-        case EAknCmdHelp:    
-            { if (FeatureManager::FeatureSupported( KFeatureIdHelp ))
-               {               
-               	HlpLauncher::LaunchHelpApplicationL(iEikonEnv->WsSession(), STATIC_CAST( CNSmlDMSyncAppUi*, iEikonEnv->EikAppUi())->AppHelpContextL());
-               }
-            
-            break;
-            }
-        case ENSmlSettChange:
-        case ENSmlMenuCmdFotaSettChange:
-            {				
-            HandleOKL();
-            break;
-            }			
-
-        case ENSmlSettExit:
-        case EAknCmdExit:
-        case EEikCmdExit:
-            {
-            STATIC_CAST( CNSmlDMSyncAppUi*, iEikonEnv->EikAppUi() )->ExitCallL();
-	        STATIC_CAST( CNSmlDMSyncAppUi*, iEikonEnv->EikAppUi() )->CloseGs();
-            break;
-            }
-
-        default:
-            {
-            break;
-            }
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaSettingsDialog::HandleListBoxEventL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMFotaSettingsDialog::HandleListBoxEventL( CEikListBox* /*aListBox*/,
-                                                 TListBoxEvent aEventType )
-	{
-	FLOG( "[OMADM] CNSmlDMDlgProfileView::HandleListBoxEventL()" );
-	
-	if ( aEventType == EEventEnterKeyPressed ||
-	     aEventType == EEventItemSingleClicked )
-		{
-		HandleOKL();
-		}
-	}
-
-
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaSettingsDialog::GetHelpContext
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMFotaSettingsDialog::GetHelpContext( TCoeHelpContext& aContext ) const
-    {
-	FLOG( "[OMADM] CNSmlDMFotaSettingsDialog::GetHelpContext" );
-	
-	aContext.iMajor = KUidSmlSyncApp;
-    aContext.iContext = KFOTA_HLP_SETTINGS;
-    }
-
-
-
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaSettingsDialog::CNSmlDMFotaSettingsDialog
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CNSmlDMFotaSettingsDialog::CNSmlDMFotaSettingsDialog()
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaSettingsDialog::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMFotaSettingsDialog::ConstructL()
-    {
-    CAknDialog::ConstructL( R_SETTINGS_PROFILEMENU );
-
-    iDocument = (CNSmlDMSyncDocument*) iAvkonAppUi->Document();
-    
-    CEikStatusPane* statusPane = iAvkonAppUi->StatusPane();
-    if ( statusPane && statusPane->PaneCapabilities( TUid::Uid(EEikStatusPaneUidTitle) ).IsPresent() )
-        {
-        iNaviPane = ( CAknNavigationControlContainer* )
-            statusPane->ControlL( TUid::Uid(EEikStatusPaneUidNavi) );
-        iNaviPane->PushDefaultL();
-        iTitlePane = static_cast<CAknTitlePane*>
-            ( statusPane->ControlL( TUid::Uid(EEikStatusPaneUidTitle) ) );
-        if ( iTitlePane->Text() ) 
-			{
-			iOriginalTitle = HBufC::NewL( 50 ); //KNsmlMaxTitleSize );
-			iOriginalTitle->Des().Copy( *iTitlePane->Text() );
-            HBufC* titleText = StringLoader::LoadLC( R_QTN_FOTA_TITLE_SETTINGS_DIALOG );
-	   		iTitlePane->SetTextL( *titleText );
-            CleanupStack::PopAndDestroy( titleText );
-            titleText = NULL;
-			}
-		}
-    }
-
-
-//  End of File
--- a/omadm/omadmappui/src/NSmlDMFotaView.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,947 +0,0 @@
-/*
-* Copyright (c) 2005-2006 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:  Methods for the firmware update view 
-*
-*/
-
-
-
-// INCLUDE FILES
-#include <AknIconArray.h>
-#include <AknQueryDialog.h>
-#include <AknsUtils.h>
-#include <featmgr.h>
-#include <StringLoader.h>
-#include <data_caging_path_literals.hrh>
-#include <centralrepository.h>
-#include <SyncMLNotifierDomainCRKeys.h>
-
-#include <e32property.h> 
-#include "NSmlDMSyncApp.h"
-#include "nsmldmsyncinternalpskeys.h"
-
-#include "NSmlDMSyncPrivateCRKeys.h"
-
-#include "NSmlDMSyncDocument.h"
-#include "NSmlDMSyncAppUi.h"
-#include "NSmlDMFotaModel.h"
-#include "NSmlDMFotaView.h"
-#include "NSmlDMFotaContainer.h"
-#include "NSmlDMFotaSettingsDialog.h"
-#include "NSmlDMdef.h"
-
-#include "NSmlDMSyncUi.hrh"
-#include <NSmlDMSync.rsg>
-#include <nsmldmsync.mbg>
-#include "NSmlDMSyncDebug.h"
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaView::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMFotaView::ConstructL()
-    {
-    FLOG( "[OMADM]\t CNSmlDMFotaView::ConstructL()" );
-    CNSmlDMSyncDocument* doc = ( CNSmlDMSyncDocument* ) AppUi()->Document();
-    if( doc->IsServerAlertSync() ) //For embedded application opening
-       {       	      
-       BaseConstructL( R_CP_SMLSYNC_FOTA_VIEW );
-       }
-    else     //Independent application opening
-       {
-       BaseConstructL( R_SMLSYNC_FOTA_VIEW );	
-       }       
-    iExitPress = -1;
-    FeatureManager::InitializeLibL();
-    iFotaDLObserver = new (ELeave) CDLObserver;
-    iFotaDLObserver->ConstructL(this);
-    iFotaDLObserver->StartL(EFalse);
-    FLOG( "[OMADM]\t CNSmlDMFotaView::ConstructL() completed" );
-    }
-
-// Destructor
-CNSmlDMFotaView::~CNSmlDMFotaView()
-    {
-    FLOG( "[OMADM]\t CNSmlDMFotaView::~CNSmlDMFotaView()" );
-   
-    if(iFotaDLObserver)
-    	{
-    	iFotaDLObserver->Cancel();
-    	delete iFotaDLObserver;
-    	iFotaDLObserver = NULL;
-    	}    
-    
-    if ( iContainer )
-        {
-        AppUi()->RemoveFromStack( iContainer );
-        }
-    delete iContainer;
-     FeatureManager::UnInitializeLib();
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaView::Id
-// -----------------------------------------------------------------------------
-//
-TUid CNSmlDMFotaView::Id() const
-    {
-    FLOG( "[OMADM]\t CNSmlDMFotaView::Id()" );
-    return KNSmlDMFotaViewId;
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaView::HandleCommandL
-// Redirects commands to the appui class.
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMFotaView::HandleCommandL( TInt aCommand )
-    {
-    FTRACE( FPrint( _L("[OMADM]\t CNSmlDMFotaView::HandleCommandL(), aCommand = 0x%x"),
-        aCommand ) );
-
-    switch ( aCommand )
-        {
-        case EAknSoftkeyBack:
-            {
-            UpdateExitL();
-            TInt value=-1;
-            TInt r1=RProperty::Set(KPSUidNSmlDMSyncApp,KNSmlDMSyncUiLaunchKey,value);
-            AppUi()->HandleCommandL( EEikCmdExit );
-            break;
-            }
-        /*case EAknCmdExit: 
-        case EEikCmdExit:
-            {
-            STATIC_CAST( CNSmlDMSyncAppUi*, iEikonEnv->EikAppUi() )->CloseGs(); //control panel            
-            break;
-            }*/
-
-        case ENSmlMenuCmdFotaCheck:
-            {
-            InitiateFotaCheckL();
-            break;
-            }
-        case ENSmlMenuCmdFotaInstall:
-            {
-            InitiateFwUpdInstallL();
-            break;
-            }
-        case ENSmlMenuCmdFotaContinue:
-            {
-            RefreshL(EFalse);
-            InitiateFwUpdContinueL();
-            break;
-            }
-        case ENSmlMenuCmdFotaSettings:
-            {
-            TInt value = ETrue;                 //IAD: Making DM busy
-            TInt r1=RProperty::Set(KPSUidNSmlDMSyncApp,KDMIdle,value);	
-            CNSmlDMFotaSettingsDialog* settingDialog = CNSmlDMFotaSettingsDialog::NewL();
-            settingDialog->ExecuteLD( R_NSML_FOTA_SETTINGS_DIALOG );
-            break;
-            }
- 
-        case ENSmlMenuCmdFotaServers:
-            {
-            TInt value = ETrue;    //IAD: Making DM busy
-            TInt r1=RProperty::Set(KPSUidNSmlDMSyncApp,KDMIdle,value);	
-             AppUi()->ActivateLocalViewL( KNSmlDMProfilesViewId );
-             break;
-            }    
- 
-        case EEikCmdExit:
-        case EAknCmdExit:
-            {
-            UpdateExitL();	
-            STATIC_CAST( CNSmlDMSyncAppUi*, iEikonEnv->EikAppUi() )->CloseGs(); //control panel            
-            break;
-            }
-        default:
-            {
-            UpdateExitL();	
-            AppUi()->HandleCommandL( aCommand );
-            break;
-            }
-        }
-        
-    FLOG( "[OMADM]\t CNSmlDMFotaView::HandleCommandL() completed" );
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaView::StepL
-// Does nothing.
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMFotaView::StepL()
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaView::IsProcessDone
-// -----------------------------------------------------------------------------
-//
-TBool CNSmlDMFotaView::IsProcessDone() const
-    {
-    return ETrue;
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaView::InitiateFotaCheckL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMFotaView::InitiateFotaCheckL()
-    {
-    FLOG( "[OMADM]\t CNSmlDMFotaView::InitiateFotaCheck()" );
-    TInt profileId( KErrNotFound );
-    TBool isValidId( EFalse );
-    HBufC* stringHolder = NULL;
-
-    profileId = iFotaModel->DefaultFotaProfileIdL();
-
-    if ( profileId >= KErrNone )
-        {
-         isValidId = iFotaModel->VerifyProfileL( profileId );
-        }
-
-    if( ( profileId == KErrNotFound ) || ( !isValidId ) )
-        {
-    	profileId = ShowFotaProfileQueryL();
-    	if( profileId == KErrNotFound )    
-    	  return;
-        }
-    TInt query(EFalse);
-    CRepository* cRepository=NULL;
-	TRAPD ( error, cRepository = CRepository::NewL ( KCRUidNSmlNotifierDomainKeys ) );
-	if ( error == KErrNone )
-	{
-		CleanupStack::PushL( cRepository );
-		TInt dmChargingNote(1);
-		cRepository->Get ( KNSmlDMChargingNote, dmChargingNote );
-		if(dmChargingNote==1)
-		{      
-    	CAknQueryDialog* dlg = CAknQueryDialog::NewL();
-    	CleanupStack::PushL( dlg );
-    	stringHolder = StringLoader::LoadLC( R_QTN_FOTA_CONNECTION_NEEDED );
-    	dlg->SetPromptL( stringHolder->Des() );
-    
-    CleanupStack::PopAndDestroy( stringHolder );
-    stringHolder = NULL;
-    
-    	CleanupStack::Pop( dlg );
-    
-    	query = dlg->ExecuteLD( R_SML_CONFIRMATION_QUERY );
-  		}
-  		else
-  			query = ETrue;
-  		CleanupStack::PopAndDestroy( cRepository );//cRepository
-  	}
-    if(query)
-    {
-        __ASSERT_ALWAYS( iFotaModel, TUtil::Panic( KErrGeneral ) );
-        
-        iFotaModel->EnableFwUpdRequestL( profileId );
-        ( ( CNSmlDMSyncAppUi* ) AppUi() )->StartSyncL( profileId, ETrue );
-    	iFotaDLObserver->StartL(ETrue);
-        }
-    
-    FLOG( "[OMADM]\t CNSmlDMFotaView::InitiateFotaCheck() completed" );
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaView::ShowFotaProfileQueryL
-// -----------------------------------------------------------------------------
-//
-TInt CNSmlDMFotaView::ShowFotaProfileQueryL()
-    {
-    FLOG( "[OMADM] CNSmlDMFotaView::ShowFotaProfileQueryL()" );
-
-    TInt retval( KErrNotFound );
-
-    CDesCArray* items = new (ELeave) CDesCArrayFlat( KNSmlDefaultGranularity );
-    CleanupStack::PushL( items );
-    items->Reset();
-
-    // Profile list owned by the dialog
-    CArrayFixFlat<TInt>* profileIdList =
-        new ( ELeave ) CArrayFixFlat<TInt>( KNSmlDefaultGranularity );
-    CleanupStack::PushL( profileIdList );
-
-    FormatProfileQueryListItemsL( items, profileIdList );
-
-    if ( items->Count() > 1 )
-        {
-    	CEikFormattedCellListBox* listBox = new ( ELeave )
-    	    CAknDoubleLargeGraphicPopupMenuStyleListBox;
-    	CleanupStack::PushL( listBox );
-
-    	CAknPopupList* popupList = CAknPopupList::NewL( listBox, 
-    							   R_AVKON_SOFTKEYS_OK_CANCEL__OK,
-            				 AknPopupLayouts::EMenuDoubleLargeGraphicWindow );
-    	CleanupStack::PushL( popupList );
-
-    	listBox->ConstructL( popupList, ( EAknListBoxSelectionList | EAknListBoxLoopScrolling ) );
-    	listBox->Model()->SetItemTextArray( items );
-    	listBox->Model()->SetOwnershipType( ELbmDoesNotOwnItemArray );
-        listBox->HandleItemAdditionL();
-    	
-        listBox->CreateScrollBarFrameL( ETrue );
-        listBox->ScrollBarFrame()->SetScrollBarVisibilityL(
-            CEikScrollBarFrame::EOff, CEikScrollBarFrame::EAuto);
-
-    	CAknIconArray* icons = new (ELeave) CAknIconArray( 10 );
-    	CleanupStack::PushL( icons );
-        CreateIconArrayL( icons );
-    	listBox->ItemDrawer()->FormattedCellData()->SetIconArrayL( icons );
-    	CleanupStack::Pop( icons );
-
-        HBufC* popupTitle = iCoeEnv->AllocReadResourceLC(
-            R_QTN_FOTA_LIST_QUERY_SELECT_SERVER_PROFILE );
-        popupList->SetTitleL( popupTitle->Des() );
-        CleanupStack::PopAndDestroy( popupTitle );
-        popupTitle = NULL;
-
-        CleanupStack::Pop( popupList );
-        TBool queryResult = popupList->ExecuteLD();
-        popupList = NULL;
-
-        if ( queryResult )
-            {
-            retval = profileIdList->At( listBox->CurrentItemIndex() );
-            }
-        CleanupStack::PopAndDestroy( listBox );  // Destroys also the icon array
-        }
-    else if ( items->Count() == 1 )
-        {
-        retval = profileIdList->At(0);
-        }
-    else
-        {
-        
-        TInt ServersViewVariable( 0 );
-        CRepository* centrep = NULL;
-        TRAPD( err, centrep = CRepository::NewL( KCRUidNSmlDMSyncApp ) );
-        if ( centrep )
-            {
-            centrep->Get( KNSmlDMServersMenuKey, ServersViewVariable );         
-            delete centrep;
-            }
-        if ( err != KErrNone ) 
-            {
-            User::Leave( err );
-            }    
-        if( ServersViewVariable == 0)   
-            {
-            CleanupStack::PopAndDestroy( profileIdList );
-            CleanupStack::PopAndDestroy( items );
-         	return KErrNotFound;
-            }
-        
-        
-		HBufC* newProfileString = 
-		            iEikonEnv->AllocReadResourceLC( R_SML_APPUI_NOTE_TEXT_NEW );
-
-		CAknQueryDialog* newProfileDialog = new ( ELeave ) CAknQueryDialog;
-
-		if ( newProfileDialog->ExecuteLD( R_SML_CONFIRMATION_QUERY,
-		                                  newProfileString->Des() ) )
-			{	
-			
-			TInt viewtitle = 1;
-			( (CNSmlDMSyncAppUi*) AppUi() )->
-			                         SetTitleCall( viewtitle );	
-			                       
-			( (CNSmlDMSyncAppUi*) AppUi() )->
-			    ShowEditProfileDialogL( ESmlNewProfile );
-			}
-		newProfileDialog = NULL;
-		CleanupStack::PopAndDestroy( newProfileString );
-		
-        }
-
-    CleanupStack::PopAndDestroy( profileIdList );
-    CleanupStack::PopAndDestroy( items );
-
-    FTRACE( FPrint(
-        _L("[OMADM]\t CNSmlDMFotaView::ShowFotaProfileQueryL() completed, retval = %d"),
-        retval ) );
-    return retval;
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaView::FormatProfileQueryListItemsL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMFotaView::FormatProfileQueryListItemsL( CDesCArray*          aItems,
-                                                    CArrayFixFlat<TInt>* aProfileIdList )
-    {
-    FLOG( "[OMADM] CNSmlDMFotaView::FormatProfileQueryListItemsL()" );
-    TInt index( 0 );
-    
-    CNSmlDMSyncDocument* doc = ( CNSmlDMSyncDocument* ) AppUi()->Document();
-    
-    doc->RefreshProfileListL( ETrue ); // Include hidden profile
-    CArrayFixFlat<TNSmlDMProfileItem>* profileList = doc->ProfileList( index );
-
-    TBuf<KNSmlMaxTextLength256> text;
-
-    for ( index = 0; index < profileList->Count(); index++ )
-        {
-        text.Zero();
-        TInt iconIndex( EProfileInternet ); //internet
-
-        if ( ( *profileList )[index].iBearer != EProfileInternet )
-            {
-            iconIndex = EProfileObexBlueTooth;	
-            }
-        text.Num( iconIndex );
-        text.Append( KNSmlTab );
-        text.Append( ( *profileList )[index].iProfileName );
-        text.Append( KNSmlTab );
-        
-        aItems->AppendL( text );
-        aProfileIdList->AppendL( ( *profileList )[index].iProfileId );
-        }
-    FLOG( "[OMADM] CNSmlDMFotaView::FormatProfileQueryListItemsL() completed" );
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaView::CreateIconArrayL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMFotaView::CreateIconArrayL( CAknIconArray* aIconArray )
-    {
-    FLOG( "[OMADM] CNSmlDMFotaView::CreateIconArrayL()" );
-
-    HBufC* appIconFilePath = HBufC::NewLC( 5 + KDC_APP_BITMAP_DIR().Length() 
-                                             + KDMAppIconFileName().Length() );
-    TPtr ptr = appIconFilePath->Des();
-    ptr.Append( KZDrive );
-    ptr.Append( KDC_APP_BITMAP_DIR );
-    ptr.Append( KDMAppIconFileName );
-
-	aIconArray->AppendL( AknsUtils::CreateGulIconL( 
-	                             AknsUtils::SkinInstance(),
-	                             KAknsIIDQgnPropSmlHttp,
-	                             *appIconFilePath,
-	                             EMbmNsmldmsyncQgn_prop_sml_http,
-	                             EMbmNsmldmsyncQgn_prop_sml_http_mask ) );
-	                             
-	aIconArray->AppendL( AknsUtils::CreateGulIconL( 
-	                          AknsUtils::SkinInstance(),
-	                          KAknsIIDQgnPropSmlHttpOff,
-	                          *appIconFilePath,
-	                          EMbmNsmldmsyncQgn_prop_sml_http_off,
-	                          EMbmNsmldmsyncQgn_prop_sml_http_off_mask ) );
-
-	if ( FeatureManager::FeatureSupported( KFeatureIdSyncMlDmObex ) )
-		{
-		aIconArray->AppendL( AknsUtils::CreateGulIconL( 
-		                            AknsUtils::SkinInstance(),
-		                            KAknsIIDQgnPropSmlBt,
-		                            *appIconFilePath,
-		                            EMbmNsmldmsyncQgn_prop_sml_bt,
-		                            EMbmNsmldmsyncQgn_prop_sml_bt_mask ) );
-		                            
-		aIconArray->AppendL( AknsUtils::CreateGulIconL(
-		                        AknsUtils::SkinInstance(),
-		                        KAknsIIDQgnPropSmlBtOff,
-		                        *appIconFilePath,
-		                        EMbmNsmldmsyncQgn_prop_sml_bt_off,
-		                        EMbmNsmldmsyncQgn_prop_sml_bt_off_mask ) );
-		}
-	
-    CleanupStack::PopAndDestroy( appIconFilePath );
-
-    FLOG( "[OMADM] CNSmlDMFotaView::CreateIconArrayL() completed" );
-    }
-    
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaView::InitiateFwUpdInstallL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMFotaView::InitiateFwUpdInstallL()
-    {
-    FLOG( "[OMADM]\t CNSmlDMFotaView::InitiateFwUpdInstallL()" );
-    
-    TInt pkgId = iFotaModel->RetrieveFwUpdPkgIdListL(
-        EStartingUpdate );
-    
-    if ( pkgId != KErrNotFound )
-        {
-        TInt retval = iFotaModel->InitiateFwUpdInstall( pkgId, KErrNotFound );
-
-        // No profile id was stored in the fota engine. Trying to select a suitable
-        // profile, or asking user.
-        if ( retval == KErrNotFound )
-            {
-            TBool isValidId( EFalse );
-            TInt profileId = iFotaModel->DefaultFotaProfileIdL();
-
-            if ( profileId >= KErrNone )
-                {
-                 isValidId = iFotaModel->VerifyProfileL( profileId );
-                }
-
-            if( ( profileId == KErrNotFound ) || ( !isValidId ) )
-                {
-            	profileId = ShowFotaProfileQueryL();
-                }
-            
-            // Retrying the update with the chosen profile id.
-            iFotaModel->InitiateFwUpdInstall( pkgId, profileId );
-            }
-        
-        }
-
-    FLOG( "[OMADM]\t CNSmlDMFotaView::InitiateFwUpdInstallL() completed" );
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaView::InitiateFwUpdContinueL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMFotaView::InitiateFwUpdContinueL()
-    {
-    FLOG( "[OMADM]\t CNSmlDMFotaView::InitiateFwUpdContinueL()" );    
-    iFotaDLObserver->StartL(ETrue);
-    iFotaModel->ContinueFwUpdInstall();
-    FLOG( "[OMADM]\t CNSmlDMFotaView::InitiateFwUpdContinueL() completed" );
-    }
-        
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaView::DoActivateL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMFotaView::DoActivateL( const TVwsViewId& /*aPrevViewId*/,
-                                         TUid /*aCustomMessageId*/,
-                                   const TDesC8& /*aCustomMessage*/ )
-    {
-    FLOG( "[OMADM]\t CNSmlDMFotaView::DoActivateL()" );
-
-    CNSmlDMSyncDocument* doc = ( CNSmlDMSyncDocument* ) AppUi()->Document();
-    __ASSERT_ALWAYS( doc, TUtil::Panic( KErrGeneral ) );
-    
-    	MenuBar()->SetContextMenuTitleResourceId( 
-    	                              R_SMLSYNC_CONTXT_MENUBAR_FOTA_VIEW );
-    
-    //MANUAL CHECK
-    if( !ManualCheckAllowedL() )
-       {    	    
-    Cba()->MakeCommandVisible(EAknSoftkeyContextOptions,EFalse);
-    Cba()->DrawDeferred();    
-       }
-    iFotaModel = doc->FotaModel();
-    iContainer = CNSmlDMFotaContainer::NewL( this, ClientRect(), iFotaModel );
-    AppUi()->AddToStackL( *this, iContainer );
-
-
-	CAknTitlePane* titlePane = 
-	    (CAknTitlePane*)(AppUi()->StatusPane())->ControlL( TUid::Uid( EEikStatusPaneUidTitle ) );
-    HBufC* titleText = iEikonEnv->AllocReadResourceLC( R_CP_APP_TITLE );	
-	titlePane->SetTextL( titleText->Des() );
-	CleanupStack::PopAndDestroy(titleText);	
-    
-    FLOG( "[OMADM]\t CNSmlDMFotaView::DoActivateL() completed" );
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaView::DoDeactivate
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMFotaView::DoDeactivate()
-    {
-    FLOG( "[OMADM]\t CNSmlDMFotaView::DoDeactivate()" );
-
-    if ( iContainer )
-        {
-        AppUi()->RemoveFromStack( iContainer );
-        }
-
-    delete iContainer;
-    iContainer = NULL;
-
-    FLOG( "[OMADM]\t CNSmlDMFotaView::DoDeactivate() completed" );
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaView::DynInitMenuPaneL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMFotaView::DynInitMenuPaneL( TInt aResourceId,
-                                        CEikMenuPane* aMenuPane )
-	{
-	FLOG( "[OMADM] CNSmlDMFotaView::DynInitMenuPaneL()" );
-     
-    if ( aResourceId == R_SMLSYNC_MENU_COMMON && 
-                    ! FeatureManager::FeatureSupported( KFeatureIdHelp ) )
-      {   
-          aMenuPane->SetItemDimmed( EAknCmdHelp , ETrue );
-          
-      }        
-    if ( aResourceId == R_SMLSYNC_MENU_FOTA_VIEW 
-        || aResourceId == R_SMLSYNC_CONTXT_MENU_FOTA_VIEW )
-        {
-        __ASSERT_ALWAYS( iFotaModel, TUtil::Panic( KErrGeneral ) );
-          
-        // Set all variated items first dimmed and show them according to the
-        // configuration flags.
-  
-        aMenuPane->SetItemDimmed( ENSmlMenuCmdFotaCheck, ETrue );
-        aMenuPane->SetItemDimmed( ENSmlMenuCmdFotaInstall, ETrue );
-        aMenuPane->SetItemDimmed( ENSmlMenuCmdFotaContinue, ETrue );
-        TInt configFlags( 0 );
-        
-        TInt ServersViewVariable( 0 ),SettingsVariable(0);
-        
-        CRepository* centrep = NULL;
-        TRAPD( err, centrep = CRepository::NewL( KCRUidNSmlDMSyncApp ) );
-        FTRACE( FPrint(
-            _L("[OMADM]\t CNSmlDMFotaView::DynInitMenuPaneL() centrep open returned %d"),
-            err ) );
-
-        if ( centrep )
-            {
-            centrep->Get( KNSmlDMFotaConfigurationKey, configFlags );
-            centrep->Get( KNSmlDMServersMenuKey, ServersViewVariable );
-            centrep->Get( KNSmlDMSettingsMenuKey, SettingsVariable );
-            delete centrep;
-            }
-
-        // If there was problems with the centrep key, the context menu will
-        // be empty. However, the framework does not handle the situation correctly
-        // and we'll have to leave here in order not to break things.
-        // The Options menu shows at least the Exit item and can be shown.
-        if ( err != KErrNone && aResourceId == R_SMLSYNC_CONTXT_MENU_FOTA_VIEW ) 
-            {
-            User::Leave( err );
-            }
-      
-      if( aResourceId == R_SMLSYNC_MENU_FOTA_VIEW )
-      {      	
-      if(SettingsVariable )
-        {
-        aMenuPane->SetItemDimmed( ENSmlMenuCmdFotaSettings, EFalse );
-        }
-      else
-        {
-        aMenuPane->SetItemDimmed( ENSmlMenuCmdFotaSettings, ETrue );	
-        }      
-      }
-           
-        // if ( configFlags & KNSmlDMFotaEnableManualCheckFlag )
-      if ( ManualCheckAllowedL() )
-            {
-            aMenuPane->SetItemDimmed( ENSmlMenuCmdFotaCheck, EFalse );
-            }
-      if( FeatureManager::FeatureSupported( KFeatureIdSyncMlDmFota ) ) //NFUI
-      {
-        if ( iFotaModel->FindFwUpdPkgWithStateL(
-            EDownloadProgressingWithResume ) != KErrNotFound )
-            {
-            aMenuPane->SetItemDimmed( ENSmlMenuCmdFotaInstall, ETrue );          
-            aMenuPane->SetItemDimmed( ENSmlMenuCmdFotaCheck, ETrue );
-            aMenuPane->SetItemDimmed( ENSmlMenuCmdFotaContinue, EFalse );          
-            }
-        else if ( iFotaModel->FindFwUpdPkgWithStateL(
-            EStartingUpdate ) != KErrNotFound )
-            {
-            aMenuPane->SetItemDimmed( ENSmlMenuCmdFotaInstall, EFalse );          
-            aMenuPane->SetItemDimmed( ENSmlMenuCmdFotaCheck, ETrue );          
-            aMenuPane->SetItemDimmed( ENSmlMenuCmdFotaContinue, ETrue );          
-            }
-        }
-   
-      if( aResourceId == R_SMLSYNC_MENU_FOTA_VIEW )
-        {
-        if( ServersViewVariable )
-           {
-           aMenuPane->SetItemDimmed( ENSmlMenuCmdFotaServers, EFalse );	
-           }
-        else
-           {
-           aMenuPane->SetItemDimmed( ENSmlMenuCmdFotaServers, ETrue );	
-           }
-        
-        }
-      
-	    }
-	   FLOG( "[OMADM] CNSmlDMFotaView::DynInitMenuPaneL() completed" );
-	}
-
-
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaView::RefreshL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMFotaView::RefreshL(TBool aPostponeDisplay)
-    {
-    FLOG( "[OMADM]\t CNSmlDMFotaView::RefreshListBox()" );
-
-    if ( iContainer )
-        {
-        iContainer->RefreshL(aPostponeDisplay);
-        }
-    FLOG( "[OMADM]\t CNSmlDMFotaView::RefreshListBox() completed" );
-    }	
-
-
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaView::ManualCheckAllowed
-// -----------------------------------------------------------------------------
-//
-TBool CNSmlDMFotaView::ManualCheckAllowedL()
-	{
-	CRepository* cenrep = NULL;
-    TRAPD( error, cenrep = CRepository::NewL( KCRUidNSmlDMSyncApp ) );        
-    if ( cenrep )
-        {
-        cenrep->Get( KNsmlDmManualCheckAllowed, iManCheckAllowed );
-        delete cenrep;
-        }
-    if ( error != KErrNone ) 
-        {
-        User::Leave( error );
-        }
-	if ( iManCheckAllowed == 1)
-	    {
-		return ETrue;		
-	    }
- 
-	return EFalse;
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaView::HandleForegroundEventL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMFotaView::HandleForegroundEventL(TBool aForeground)
-	{
-	
-	// For Application Management purpose whenever there is switch between app.
-	
-	
-	
-	FLOG( "[OMADM]\t CNSmlDMFotaView::HandleForegroundEventL():Begin" );
-	if( !aForeground )
-		{
-		FLOG( "[OMADM]\t CNSmlDMFotaView::HandleForegroundEventL() not in FG :end" );
-	    return;	
-		}	
-	
-	
-	if( iExitPress != -2 ) // == 1 some what fast as no call to refreshL based on iexitPress
-		{
-		iExitPress = -1;	
-		STATIC_CAST( CNSmlDMSyncAppUi*, iEikonEnv->EikAppUi())->CheckFotaDlL();
-		FLOG( "[OMADM]\t CNSmlDMFotaView::HandleForegroundEventL(): CheckAMDlL Begin" );
-		STATIC_CAST( CNSmlDMSyncAppUi*, iEikonEnv->EikAppUi())->CheckAMDlL();
-		FLOG( "[OMADM]\t CNSmlDMFotaView::HandleForegroundEventL(): CheckAMDlL END" );
-		}
-	iFotaDLObserver->StartL(EFalse);
-	
-	if ( !ManualCheckAllowedL() && iExitPress != -2 )	//for MSK display
-	    {
-	    if( FeatureManager::FeatureSupported( KFeatureIdSyncMlDmFota ) )
-	       {
-	       if ( iFotaModel->FindFwUpdPkgWithStateL(
-            EStartingUpdate ) != KErrNotFound )
-	    	{
-	        EnableMskL( ETrue );	
-	    	}	
-	       }	    
-	    iExitPress = -1;	
-	    }
-	CAknView::HandleForegroundEventL(aForeground);
-	FLOG( "[OMADM]\t CNSmlDMFotaView::HandleForegroundEventL():completed" );
-	}    
-	
-// -----------------------------------------------------------------------------
-// CNSmlDMFotaView::EnableMskL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMFotaView::EnableMskL ( TBool aEnable )	
-	{
-	CEikButtonGroupContainer* cbaGrp= Cba();
-	if (cbaGrp)
-		{
-		if (aEnable)
-			{						
-			cbaGrp->MakeCommandVisible(EAknSoftkeyContextOptions,ETrue);	    	
-			}
-		else
-			{
-			cbaGrp->MakeCommandVisible(EAknSoftkeyContextOptions,EFalse);
-			}		
-		}
-	}
-
-// ----------------------------------------------------
-// CNSmlDMFotaView::UpdateExitL
-// ----------------------------------------------------
-//	
-void CNSmlDMFotaView::UpdateExitL()
-	{
-	iExitPress = -2;	
-	}	
-
-
-// -----------------------------------------------------------------------------
-// CDLObserver::CDLObserver()
-// -----------------------------------------------------------------------------
-
-inline CDLObserver::CDLObserver()
-	:CActive(EPriorityStandard)
-	{
-	
-	}
-	
-	
-// -----------------------------------------------------------------------------
-// CDLObserver::ConstructL()
-// -----------------------------------------------------------------------------
-
-void CDLObserver::ConstructL(CNSmlDMFotaView* iFotaView)
-	{
-	CActiveScheduler::Add(this);	
-    iView = iFotaView;
-	}
-
-// -----------------------------------------------------------------------------
-// CDLObserver::Start()
-// -----------------------------------------------------------------------------
-void CDLObserver::StartL(TBool aResetKey)
-	{	
-	FLOG("CDLObserver::Start- begin");
-	if(!IsActive())
-		{
-		//set key value to -1			
-		FLOG("logging new request");
-		TInt err = iProperty.Attach(KPSUidNSmlDMSyncApp,KFotaDLRefresh);
-		FTRACE( FPrint(_L("CDLObserver::StartL attached to P&S key with error as %d"),err ) );		
-		CNSmlDMSyncDocument* doc = 
-		    ( CNSmlDMSyncDocument* ) iView->AppUi()->Document();
-		if( aResetKey && doc->DMDefinesFotaDLKey())		
-		 {		 
-		 TInt value = -1;
-		 err = iProperty.Set(KPSUidNSmlDMSyncApp,KFotaDLRefresh,value);
-		 FTRACE( FPrint(_L("CDLObserver::StartL updated the value of p&S key with error %d"),err ) );
-		 }
-		iStatus=KRequestPending;
-		iProperty.Subscribe(iStatus);
-		FLOG("CDLObserver::StartL subscribed to p&S ");
-		SetActive();	
-		}		   
-	}
-
-// -----------------------------------------------------------------------------
-// CDLObserver::RunL()
-// -----------------------------------------------------------------------------
-void CDLObserver::RunL()
-	{
-	FLOG("CDLObserver::RunL()- begin");
-	TInt value;	
-	iProperty.Attach(KPSUidNSmlDMSyncApp,KFotaDLRefresh);
-	iProperty.Get(KPSUidNSmlDMSyncApp,KFotaDLRefresh,value);
-	TInt state (EIdle);
-	state = iView->iFotaModel->GetCurrentFwUpdState();
-	FTRACE( FPrint(_L("current state of fota is %d"),state ) );
-	//EFALSE for suspended,failed & completed
-	//Download Ended either successfully or unsuccessfully
-	if( value == EFalse ) 
-		{			
-		FLOG("CDLObserver::RunL()--status value = 0");			
-		if (state == EDownloadProgressingWithResume || 
-				state == EDownloadComplete ||
-				state == EStartingUpdate ||
-				state == EDownloadFailed)
-			{
-			TInt IsDMBusy = EFalse;    //IAD: Making DM Idle 
-			TInt r2=RProperty::Set(KUidSmlSyncApp,KDMIdle,IsDMBusy);	
-			iView->RefreshL(ETrue);				
-			iProperty.Subscribe(iStatus);
-			FLOG("CDLObserver::RunL()--issued request in the loop EFalse");
-			SetActive();
-			}
-		}
-	else if( value == 1 ) //resume case and update the UI
-		{		
-		FLOG("CDLObserver::RunL()--status value = 1");
-		if (state == EDownloadProgressingWithResume || 
-				state == EDownloadProgressing || 
-				state == EStartingDownload )
-			{
-			TInt IsDMBusy = ETrue;    //IAD: Making DM Busy
-			TInt r2=RProperty::Set(KUidSmlSyncApp,KDMIdle,IsDMBusy);		
-			FLOG("CDLObserver::RunL():call to view refresh");
-			iView->RefreshL(EFalse);
-			}
-		iProperty.Subscribe(iStatus);
-		FLOG("CDLObserver::RunL()--issued request in the loop ETRUe");
-		SetActive();
-
-		}
-	else 
-		{			
-		FTRACE( FPrint(_L("CDLObserver::RunL()-- else loop & value is %d"),value ) );
-		if(!IsActive())
-			{
-			iStatus=KRequestPending;
-			value = -1;
-			iProperty.Set(KPSUidNSmlDMSyncApp,KFotaDLRefresh,value);
-			iProperty.Subscribe(iStatus);
-			FLOG("CDLObserver::RunL()--issued request again");
-			SetActive();
-			}				
-		}
-
-	}
-
-// ----------------------------------------------------------------------------------------
-// CDLObserver::DoCancel() 
-// ----------------------------------------------------------------------------------------
-void CDLObserver::DoCancel()
-	{
-	FLOG("CDLObserver::::DoCancel()");
-    if( iStatus == KRequestPending )
-    	{	
-    	iProperty.Cancel();// new fix to be tested thoroughly
-    	TRequestStatus* status = &iStatus;
-    	User::RequestComplete( status, KErrCancel );
-    	}
-	}
-
-// ----------------------------------------------------------------------------------------
-// CDLObserver::~CDLObserver() 
-// ----------------------------------------------------------------------------------------
-CDLObserver::~CDLObserver()
-	{ 
-	FLOG("CDLObserver::~CDLObserver()");  
-    Cancel();
-    if (iProperty.Handle()) iProperty.Close();
-	}
-
-
-// ---------------------------------------------------------------------------
-// CDLObserver::RunError
-// ---------------------------------------------------------------------------
-//
-TInt CDLObserver::RunError( TInt aError )
-    {
-    return aError;
-    }
-
-//  End of File
--- a/omadm/omadmappui/src/NSmlDMItemData.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,177 +0,0 @@
-/*
-* 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:  Utility classes.
-*
-*/
-
-
-
-// INCLUDES
-#include "NSmlDMItemData.h"
-#include "NSmlDMSyncDebug.h"
-#include <NSmlDMSync.rsg>
-#include "NSmlDMSyncUtil.h"
-
-#include <AknUtils.h>
-#include <StringLoader.h>
-
-// -----------------------------------------------------------------------------
-// CNSmlDMItemData::ConstructL()
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMItemData::ConstructL()
-	{
-	FLOG( "[OMADM] CNSmlDMItemData::ConstructL:" );
-	
-	iHeader = HBufC::NewMaxL(128); 
-	iValue = HBufC::NewMaxL(128); 
-	}
-
-// -----------------------------------------------------------------------------
-// Destructor
-// -----------------------------------------------------------------------------
-//
-CNSmlDMItemData::~CNSmlDMItemData()
-	{
-	FLOG( "[OMADM] ~CNSmlDMItemData:" );
-	
-	delete iHeader;
-	delete iValue;
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMItemData::Header
-// -----------------------------------------------------------------------------
-//
-HBufC* CNSmlDMItemData::Header() const
-	{
-	FLOG( "[OMADM] CNSmlDMItemData::Header:" );
-	
-	return iHeader;
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMItemData::Value
-// -----------------------------------------------------------------------------
-//
-HBufC* CNSmlDMItemData::Value() const
-	{
-	FLOG( "[OMADM] CNSmlDMItemData::Value:" );
-	
-	return iValue;
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMItemData::SetHeader
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMItemData::SetHeader( const TDesC& aData )
-	{
-	FLOG( "[OMADM] CNSmlDMItemData::SetHeader:" );
-	
-	if ( iHeader->Des().MaxLength() < aData.Length() )
-		{
-		HBufC* tmp = iHeader->ReAlloc( aData.Length() );
-		if (tmp)
-			{
-			iHeader = tmp;
-			}
-		}
-	TPtr p( iHeader->Des() );
-	p.Zero();
-	p.Append( aData );
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMItemData::SetValue
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMItemData::SetValue( const TDesC& aData )
-	{
-	FLOG( "[OMADM] CNSmlDMItemData::SetValue:" );
-	
-	if ( iValue->Des().MaxLength() < aData.Length() )
-		{
-		HBufC* tmp = iValue->ReAlloc( aData.Length() );
-		
-		if (tmp)
-			{
-			iValue = tmp;
-			}
-		}
-	TPtr p( iValue->Des() );
-	p.Zero();
-	p.Append( aData );
-	}
-
-void CNSmlDMItemData::SetValue( TInt aPort )
-    {
-    
-	FLOG( "[OMADM] CNSmlDMItemData::SetValue( TInt )" );
-	
-	TBuf<KBufSize16> portbuf;
-	portbuf.Num( aPort );
-	SetValue( portbuf );
-	
-    }
-// -----------------------------------------------------------------------------
-// CNSmlDMItemData::ItemToListLC
-// -----------------------------------------------------------------------------
-//
-HBufC* CNSmlDMItemData::ItemToListLC( TBool aConvert )
-	{
-	FLOG( "[OMADM] CNSmlDMItemData::ItemToListLC:" );
-	
-	CDesCArray* list = new (ELeave) CDesCArrayFlat(1);
-	CleanupStack::PushL( list );
-	
-	list->Reset();
-	list->AppendL( iHeader->Des() );
-	list->AppendL( iValue->Des() );
-
-	HBufC* row;
-	if ( iMandatory )
-		{
-		row = StringLoader::LoadL( R_QTN_SML_SETTINGROWITEM_MAND, *list );
-		}
-	else
-		{
-		row = StringLoader::LoadL( R_QTN_SML_SETTINGROWITEM, *list );
-		}
-	CleanupStack::PopAndDestroy( list );
-	CleanupStack::PushL( row );
-
-	TPtr prow = row->Des();
-	if ( aConvert )
-		{
-		AknTextUtils::DisplayTextLanguageSpecificNumberConversion( prow );
-		}
-	return row;
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMProfileData::NewLC
-// -----------------------------------------------------------------------------
-//
-CNSmlDMProfileData* CNSmlDMProfileData::NewLC()
-	{
-	FLOG( "[OMADM] CNSmlDMProfileData::NewLC():" );
-	
-	CNSmlDMProfileData* self = new (ELeave) CNSmlDMProfileData;
-	CleanupStack::PushL( self);
-	self->ConstructL();
-	return self;
-	}
-
-// End of file
--- a/omadm/omadmappui/src/NSmlDMProfilesContainer.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,665 +0,0 @@
-/*
-* Copyright (c) 2005-2006 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:  Methods for Server Profiles Container
-*
-*/
-
-
-// INCLUDE FILES
-#include <aknPopup.h>		// popup dialogs
-#include <StringLoader.h>
-#include <AknQueryDialog.h>
-#include <textresolver.h>
-#include <AknIconArray.h>
-#include <AknsUtils.h>
-#include <featmgr.h>
-
-#include <AknUtils.h>
-
-#include "NSmlDMProfilesContainer.h"
-#include "NSmlDMProfilesView.h"
-#include "NSmlDMSyncApp.h"
-#include "NSmlDMSyncAppEngine.h"
-#include "NSmlDMSyncUi.hrh"
-#include "NSmlDMdef.h"
-#include "NSmlDMSyncDebug.h"
-#include <NSmlDMSync.rsg>
-#include <nsmldmsync.mbg>
-#include <data_caging_path_literals.hrh>
-
-
-#include <csxhelp/dm.hlp.hrh>
-
-
-// ========================== MEMBER FUNCTIONS =================================
-
-// -----------------------------------------------------------------------------
-// CNSmlDMProfilesContainer::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CNSmlDMProfilesContainer* CNSmlDMProfilesContainer::NewL(       CAknView* aView,
-                                                          const TRect&    aRect )
-    {
-    CNSmlDMProfilesContainer* self = new( ELeave ) CNSmlDMProfilesContainer( aView );
-    
-    CleanupStack::PushL( self );
-    self->SetMopParent( (MObjectProvider*) aView );
-    self->ConstructL( aRect );
-    CleanupStack::Pop();
-
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMProfilesContainer::CNSmlDMProfilesContainer
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CNSmlDMProfilesContainer::CNSmlDMProfilesContainer( CAknView* aView )
-    : iView( aView )
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMProfilesContainer::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMProfilesContainer::ConstructL( const TRect& aRect )
-    {
-    CreateWindowL();
-
-	iContextMenuUp = EFalse;
-	iAppUi = STATIC_CAST( CNSmlDMSyncAppUi*, iEikonEnv->EikAppUi());
-	iDocument = STATIC_CAST( CNSmlDMSyncDocument*, iAppUi->Document() );
-
-	iProfilesListBox = new ( ELeave ) CAknDoubleLargeStyleListBox;
-	iProfilesListBox->SetContainerWindowL( *this );
-	iProfilesListBox->ConstructL( this, EAknListBoxSelectionList );
-	
-	iProfilesListBox->SetListBoxObserver( this );
-	
-	iProfilesListBox->CreateScrollBarFrameL( ETrue );
-	iProfilesListBox->ScrollBarFrame()->SetScrollBarVisibilityL( 
-	                                            CEikScrollBarFrame::EOff,
-	                                            CEikScrollBarFrame::EAuto );
-
-	iDocument->RefreshProfileListL();
-    AddIconsL();
-
-	//Comment this for Moduletests
-	ReadProfileListL();
-
-	iProfilesListBox->UpdateScrollBarsL();
-	iProfilesListBox->ScrollBarFrame()->MoveVertThumbTo( 0 );		
-
-    SetRect( aRect );
-    ActivateL();    
-    }
-
-// Destructor
-CNSmlDMProfilesContainer::~CNSmlDMProfilesContainer()
-    {
-    FLOG( "[OMADM] CNSmlDMProfilesContainer::~CNSmlDMProfilesContainer" );
-    delete iProfilesListBox;
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMProfilesContainer::SizeChanged
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMProfilesContainer::SizeChanged()
-    {
-    iProfilesListBox->SetRect( Rect() );    // Mandatory, otherwise not drawn
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMProfilesContainer::HandleResourceChange
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMProfilesContainer::HandleResourceChange( TInt aType )
-    {
-    CCoeControl::HandleResourceChange( aType );
-    
-    //Handle change in layout orientation
-    if ( aType == KEikDynamicLayoutVariantSwitch || aType == KAknsMessageSkinChange )
-        {
-        if ( aType == KAknsMessageSkinChange )
-        	{
-        	// Skin changed; we'll have to reload the icon array
-            CArrayPtr<CGulIcon>* iconArray =
-                iProfilesListBox->ItemDrawer()->FormattedCellData()->IconArray();
-            if ( iconArray )
-                {
-    	        iconArray->ResetAndDestroy();
-	            delete iconArray;
-	            iconArray = NULL;
-    	        }
-    	    TRAP_IGNORE( AddIconsL() );
-        	}
-
-        TRect mainPaneRect;
-        AknLayoutUtils::LayoutMetricsRect( AknLayoutUtils::EMainPane, mainPaneRect );
-        SetRect( mainPaneRect );
-		DrawDeferred();
-		}
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMProfilesContainer::CountComponentControls
-// -----------------------------------------------------------------------------
-//
-TInt CNSmlDMProfilesContainer::CountComponentControls() const
-    {
-    TInt retval( 0 );
-    if ( iProfilesListBox )
-        {
-        retval = 1;
-        }
-    return retval; // return nbr of controls inside this container
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMProfilesContainer::ComponentControl
-// -----------------------------------------------------------------------------
-//
-CCoeControl* CNSmlDMProfilesContainer::ComponentControl( TInt aIndex ) const
-    {
-    switch ( aIndex )
-        {
-        case 0:
-            {
-            return iProfilesListBox;
-            }
-        default:
-            {
-            return NULL;
-            }
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMProfilesContainer::Draw
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMProfilesContainer::Draw( const TRect& /* aRect */ ) const
-    {
-    }
-
-
-// -----------------------------------------------------------------------------
-// CNSmlDMProfilesContainer::HandleControlEventL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMProfilesContainer::HandleControlEventL( CCoeControl* /* aControl */,
-                                                TCoeEvent /* aEventType */ )
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMProfilesContainer::OfferKeyEventL
-// -----------------------------------------------------------------------------
-//
-TKeyResponse CNSmlDMProfilesContainer::OfferKeyEventL( const TKeyEvent& aKeyEvent,
-                                                             TEventCode aType )
-	{
-	FLOG( "[OMADM] CNSmlDMProfilesContainer::OfferKeyEventL()" );
-	FTRACE( FPrint(
-    _L("[OMADM]\t CNSmlDMProfilesContainer::OfferKeyEventL>> Begin code = 0x%x"),aKeyEvent.iCode ) );
-	
-	if ( iProfilesListBox && aType == EEventKey )
-		{
-		switch ( aKeyEvent.iCode )
-			{
-			case EStdKeyHome:
-				{
-				// delete only in main view
-                if ( iDocument->ProfileCount() != 0 ) 
-                    {
-                    iAvkonAppUi->HandleCommandL( ENSmlMenuCmdEraseProfile );
-                    }
-			    break;
-                }
-            case EKeyEnter: //Enter key
-			case EKeyOK: // OK button
-				{
-				if ( ! iAppUi->Synchronise() )
-					{
-					if (iSettingsView != EFalse) 
-						{
-						return EKeyWasNotConsumed;
-						}
-					else
-						{
-						ShowContextMenuL( R_SMLSYNC_CONTXT_MENUBAR_PROFILES_VIEW );
-						}
-					}
-				return EKeyWasConsumed;
-				}
-			case EKeyEscape:
-				{
-				if ( (iSettingsView != EFalse) || (  iAppUi->Synchronise() ) )
-					{
-					return EKeyWasNotConsumed;
-					}
-				else
-					{
-					iAvkonAppUi->ProcessCommandL( EEikCmdExit );
-					}
-		    	break;
-				}
-			case EKeyUpArrow:
-			case EKeyDownArrow:
-			    {
-			    TKeyResponse retVal =
-			        iProfilesListBox->OfferKeyEventL( aKeyEvent, aType );
-                iDocument->SetCurrentIndex( iProfilesListBox->CurrentItemIndex() );
-                return retVal;
-			    }
-			case EKeyLeftArrow:
-			case EKeyRightArrow:
-			    {
-			    break;  // AppUi handles the tab changes
-			    }
-			default:
-			    {
-			    return iProfilesListBox->OfferKeyEventL( aKeyEvent, aType );
-			    }
-			}
-		}
-	FLOG( "[OMADM] CNSmlDMProfilesContainer::OfferKeyEventL() completed, key was not consumed" );
-	return EKeyWasNotConsumed;
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMProfilesContainer::PostLayoutDynInitL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMProfilesContainer::PostLayoutDynInitL()
-	{
-	FLOG( "[OMADM] CNSmlDMProfilesContainer::PostLayoutDynInitL()" );
-	
-	iConfirmationNoteUp = EFalse;
-	iMenuUp = 0;
-
-	if ( iProfilesListBox->Model()->NumberOfItems() == 0 )
-		{
-		HBufC* emptyText = 
-		                iEikonEnv->AllocReadResourceLC( R_SML_MAIN_NOPROFILES );
-		iProfilesListBox->View()->SetListEmptyTextL( emptyText->Des() );
-		CleanupStack::PopAndDestroy( emptyText );
-
-		iConfirmationNoteUp = ETrue; // using flag for preventing the popupmenu
-									 // from popping up while dialog is up
-		HBufC* newProfile = 
-		            iEikonEnv->AllocReadResourceLC( R_SML_APPUI_NOTE_TEXT_NEW );
-
-		CAknQueryDialog* startDialog = new (ELeave) CAknQueryDialog();
-
-		if ( startDialog->ExecuteLD( R_STARTQUERY_NOTE, newProfile->Des() ) )
-			{	
-			iAppUi->ShowEditProfileDialogL( ESmlNewProfile ); 			
-			}
-		startDialog = NULL;
-		CleanupStack::PopAndDestroy( newProfile );
-		iConfirmationNoteUp = EFalse;
-		}
-	else
-		{
-		iDocument->SetCurrentIndex(0); 
-		iProfilesListBox->ScrollBarFrame()->MoveVertThumbTo( 
-		                                iProfilesListBox->CurrentItemIndex() );
-		}
-
-	FLOG( "[OMADM] CNSmlDMProfilesContainer::PostLayoutDynInitL() completed" );
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMProfilesContainer::PreLayoutDynInitL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMProfilesContainer::PreLayoutDynInitL()
-    {
-    FLOG( "[OMADM] CNSmlDMProfilesContainer::PreLayoutDynInitL" );
-    
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMProfilesContainer::HandleListBoxEventL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMProfilesContainer::HandleListBoxEventL( CEikListBox* aListBox, 
-                                                 TListBoxEvent aEventType )
-	{
-	FLOG( "[OMADM] CNSmlDMProfilesContainer::HandleListBoxEventL()" );	
-	iDocument->SetCurrentIndex( aListBox->CurrentItemIndex() ); 
-	if ( aEventType == MEikListBoxObserver::EEventItemSingleClicked )
-	    {
-	    ShowContextMenuL( R_SMLSYNC_CONTXT_MENUBAR_PROFILES_VIEW );
-	    }	
-	FLOG( "[OMADM] CNSmlDMProfilesContainer::HandleListBoxEventL() completed" );
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMProfilesContainer::ShowContextMenuL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMProfilesContainer::ShowContextMenuL( TInt aResource )
-    {
-	FLOG( "[OMADM] CNSmlDMProfilesContainer::ShowContextMenuL()" );
-	// Switch to Context specific options menu,
-	// Show it and switch back to main options menu.
-	CEikMenuBar* menuBar = iView->MenuBar();
-	menuBar->SetMenuTitleResourceId( aResource );
-    menuBar->SetMenuType( CEikMenuBar::EMenuContext );
-	// TRAP displaying of menu bar.
-	// If it fails, the correct resource is set back before leave.
-	TRAPD( err, menuBar->TryDisplayMenuBarL() );
-	menuBar->SetMenuTitleResourceId( R_SMLSYNC_MENUBAR_PROFILES_VIEW );
-	menuBar->SetMenuType( CEikMenuBar::EMenuOptions );
-	User::LeaveIfError( err );
-	FLOG( "[OMADM] CNSmlDMProfilesContainer::ShowContextMenuL() completed" );
-    }
-
-
-// -----------------------------------------------------------------------------
-//	CNSmlDMProfilesContainer::ReadProfileListL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMProfilesContainer::ReadProfileListL()
-	{
-	FLOG( "[OMADM] CNSmlDMProfilesContainer::ReadProfileListL()" );
-	
-	TInt index = 0;
-	TInt lockindex = 0;
-    iDocument->RefreshProfileListL();
-	CArrayFixFlat<TNSmlDMProfileItem> *profileList =
-	                                             iDocument->ProfileList( index ); 
-	CDesCArray* items = (CDesCArray*) iProfilesListBox->Model()->ItemTextArray();
-
-	items->Reset();
-	
-	TBuf<KNSmlMaxTextLength256> text;
-	TBuf<KNSmlMaxTextLength64>  timeString; 
-	TBuf<KNSmlMaxTextLength64>  dateString; 
-	TBuf<5> indexBuf;
-
-	HBufC* timeFormatted;
-	
-	TBool settingEnforcement = TUtil::SettingEnforcementState();
-	TBool btObex = FeatureManager::FeatureSupported(KFeatureIdSyncMlDmObex);
-
-	for ( TInt i = 0; i < profileList->Count(); i++ )
-		{
-		text.Zero();
-		TInt index( EProfileInternet ); //internet
-		
-		if ( ( *profileList )[i].iBearer != EProfileInternet )
-			{
-			// EProfileObexBlueTooth is defined to 1, but that index has
-			// the HTTP "off" icon. Looking at AddIconsL, BlueTooth icons
-			// should be 2 and 3, if present.
-			//index = EProfileObexBlueTooth;
-			index = EProfileObexBlueTooth + 1;
-			}
-		if ( ( *profileList )[i].iActive == 0 )
-            {
-			index++;
-            }
-
-		if (settingEnforcement ||( *profileList )[i].iProfileLocked ) 
-			{
-			// Locked setting item icon
-			lockindex = 2;
-			if (btObex)
-				{
-				// BlueTooth icons are present
-				lockindex = 4;
-				}
-			}
-
-		indexBuf.Num( index );
-		text.Append ( KNSmlTab );
-		text.Append ( ( *profileList )[i].iProfileName );
-		text.Append ( KNSmlTab );
-		if (  ( *profileList )[i].iSynced ) // profile has been synchronised
-			{
-			timeFormatted = TUtil::SyncTimeLC( ( *profileList )[i].iLastSuccessSync );
-			}
-		else
-			{
-			timeFormatted = 
-			            iEikonEnv->AllocReadResourceLC( R_SML_MAIN_NOTSYNCED );
-			}
-		timeString.Append( timeFormatted->Des() );
-		
-		text.Append ( timeString );
-		timeString.Zero();
-		AknTextUtils::DisplayTextLanguageSpecificNumberConversion( text );
-		text.Insert( 0, indexBuf );
-		if ( settingEnforcement || ( *profileList )[i].iProfileLocked)
-		     {
-		      indexBuf.Num( lockindex );
-			  text.Append ( KNSmlTab );
-			  text.Insert( text.Length(), indexBuf );
-			  }
-		items->AppendL ( text );		
-		CleanupStack::PopAndDestroy( timeFormatted );
-		}
-
-	iProfilesListBox->HandleItemAdditionL();
-
-	if ( iProfilesListBox->Model()->NumberOfItems() == 0 )
-		{
-		//For Main pane primary text
-		HBufC* emptyPrimText = 
-		             iEikonEnv->AllocReadResourceLC( R_SML_MAIN_NOPROFILES );
-        //For Main pane secondary text		                
-        HBufC* emptySecText = 
-		        iEikonEnv->AllocReadResourceLC( R_SML_MAIN_NOPROFILES_SEC_TXT );
-        HBufC* emptyText = HBufC::NewLC( emptyPrimText->Length() + emptySecText->Length()+ 2 );        
-        emptyText->Des().Append( emptyPrimText->Des() );
-        emptyText->Des().Append( KSmlEOL );
-        emptyText->Des().Append( emptySecText->Des() );
-        iProfilesListBox->View()->SetListEmptyTextL( emptyText->Des() );
-        CleanupStack::PopAndDestroy( emptyText );
-		CleanupStack::PopAndDestroy( emptySecText );
-		CleanupStack::PopAndDestroy( emptyPrimText );
-		}
-	
-    FTRACE( FPrint(
-        _L("[OMADM] CNSmlDMProfilesContainer::ReadProfileListL() completed, profile count = %d"),
-        profileList->Count() ) );
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMProfilesContainer::RefreshL 
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMProfilesContainer::RefreshL()
-	{
-	ReadProfileListL();
-	//SetCurrentIndex( iProfilesListBox->CurrentItemIndex() );
-	SetCurrentIndex( iDocument->CurrentIndex() );
-	}
-	
-// -----------------------------------------------------------------------------
-// CNSmlDMProfilesContainer::SetCurrentIndex 
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMProfilesContainer::SetCurrentIndex( const TInt aIndex )
-	{
-    FTRACE( FPrint(
-        _L("[OMADM] CNSmlDMProfilesContainer::SetCurrentIndex() aIndex = %d"),
-        aIndex ) );
-	
-	TInt newIndex( aIndex );
-	
-	if ( iProfilesListBox->Model()->NumberOfItems() > 0 )
-	    {
-    	if ( newIndex < 0 )
-    	    {
-    	    newIndex = 0;
-    	    }
-      if ( newIndex > ( iProfilesListBox->Model()->NumberOfItems() - 1 ) )
-    	    {
-    	        newIndex = iProfilesListBox->Model()->NumberOfItems() - 1;
-    	        iDocument->SetCurrentIndex(newIndex);
-    	    }
-    	iProfilesListBox->SetCurrentItemIndexAndDraw( newIndex );
-	    }
-
-	FLOG( "[OMADM] CNSmlDMProfilesContainer::SetCurrentIndex() completed" );
-	}
-	
-// -----------------------------------------------------------------------------
-// CNSmlDMProfilesContainer::ClosePopupMenu
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMProfilesContainer::ClosePopupMenuL()
-	{
-	FLOG( "[OMADM] CNSmlDMProfilesContainer::ClosePopupMenu" );
-	
-	if (iContextMenuUp)
-		{
-	    iAppUi->SetFadedL( EFalse );
-		
-		CEikButtonGroupContainer* controlPane = 
-		                                    CEikButtonGroupContainer::Current();
-			controlPane->AddCommandSetToStackL(
-					R_NSML_FOTA_PROFILES_VIEW_MSK_OPTIONS_EXIT_CONTEXTOPTIONS );
-		controlPane->DrawNow();
-		iEikonEnv->AppUiFactory()->ClosePopup( iEikonEnv->EikAppUi() );
-		iContextMenuUp = EFalse;
-		}
-	}
-
-
-// -----------------------------------------------------------------------------
-// CNSmlDMProfilesContainer::GetHelpContext
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMProfilesContainer::GetHelpContext( TCoeHelpContext& aContext ) const
-	{
-	FLOG( "[OMADM] CNSmlDMProfilesContainer::GetHelpContext" );
-	
-	aContext.iMajor = KUidSmlSyncApp;
-    aContext.iContext = KDM_HLP_SERVERS_VIEW;
-	}
-
-
-
-// -----------------------------------------------------------------------------
-// CNSmlDMProfilesContainer::FocusChanged
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMProfilesContainer::FocusChanged( TDrawNow /*aDrawNow*/ )
-	{
-	if ( iProfilesListBox )
-		{
-		iProfilesListBox->SetFocus( IsFocused() );
-		}
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMProfilesContainer::AddIconsL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMProfilesContainer::AddIconsL()
-    {
-    FLOG( "[OMADM] CNSmlDMSyncMainDialog::AddIconsL" );
-    
-    HBufC* appIconFilePath = HBufC::NewLC( 5 + KDC_APP_BITMAP_DIR().Length() 
-                                             + KDMAppIconFileName().Length() );
-    TPtr ptr = appIconFilePath->Des();
-    ptr.Append( KZDrive );
-    ptr.Append( KDC_APP_BITMAP_DIR );
-    ptr.Append( KDMAppIconFileName );
-
-	CArrayPtr<CGulIcon>* icons = new (ELeave) CArrayPtrFlat<CGulIcon>(10);
-	iProfilesListBox->ItemDrawer()->FormattedCellData()->SetIconArrayL( icons );
-
-	icons->AppendL( AknsUtils::CreateGulIconL( 
-	                             AknsUtils::SkinInstance(),
-	                             KAknsIIDQgnPropSmlHttp,
-	                             *appIconFilePath,
-	                             EMbmNsmldmsyncQgn_prop_sml_http,
-	                             EMbmNsmldmsyncQgn_prop_sml_http_mask ) );
-	                             
-	icons->AppendL( AknsUtils::CreateGulIconL( 
-	                          AknsUtils::SkinInstance(),
-	                          KAknsIIDQgnPropSmlHttpOff,
-	                          *appIconFilePath,
-	                          EMbmNsmldmsyncQgn_prop_sml_http_off,
-	                          EMbmNsmldmsyncQgn_prop_sml_http_off_mask ) );
-
-	if ( FeatureManager::FeatureSupported( KFeatureIdSyncMlDmObex  ) )
-		{
-		icons->AppendL( AknsUtils::CreateGulIconL( 
-		                            AknsUtils::SkinInstance(),
-		                            KAknsIIDQgnPropSmlBt,
-		                            *appIconFilePath,
-		                            EMbmNsmldmsyncQgn_prop_sml_bt,
-		                            EMbmNsmldmsyncQgn_prop_sml_bt_mask ) );
-		                            
-		icons->AppendL( AknsUtils::CreateGulIconL(
-		                        AknsUtils::SkinInstance(),
-		                        KAknsIIDQgnPropSmlBtOff,
-		                        *appIconFilePath,
-		                        EMbmNsmldmsyncQgn_prop_sml_bt_off,
-		                        EMbmNsmldmsyncQgn_prop_sml_bt_off_mask ) );
-		}
-	
-	icons->AppendL( AknsUtils::CreateGulIconL( 
-	                          AknsUtils::SkinInstance(),
-	                          KAknsIIDQgnIndiSettProtectedAdd,
-	                          *appIconFilePath,
-	                          EMbmNsmldmsyncQgn_indi_sett_protected_add,
-	                          EMbmNsmldmsyncQgn_indi_sett_protected_add_mask ) );
-
-    CleanupStack::PopAndDestroy( appIconFilePath );
-    
-    FLOG( "[OMADM] CNSmlDMSyncMainDialog::AddIconsL Done" );
-    }
-
-void CNSmlDMProfilesContainer::HandlePointerEventL(const TPointerEvent& aPointerEvent)
-    {
-      if ( AknLayoutUtils::PenEnabled() )
-        { 
-        if (iProfilesListBox->Model()->NumberOfItems() == 0 )
-           {
-           if ( aPointerEvent.iType == TPointerEvent::EButton1Up )	
-           		 {
-           		  if ( iContextMenuUp )
-                    {
-                    // Absorb EButton1Up event if we already launched the stylus
-                    // popup menu
-                    iContextMenuUp = EFalse;
-                    }
-                  else  
-                    {
-                    ShowContextMenuL( R_SMLSYNC_CONTXT_MENUBAR_PROFILES_VIEW );	
-                    }
-           	
-           		 }
-           else
-              CCoeControl::HandlePointerEventL(aPointerEvent);		 
-           }
-        else    
-     	CCoeControl::HandlePointerEventL(aPointerEvent);    
-        }
-    }
-// End of File
--- a/omadm/omadmappui/src/NSmlDMProfilesView.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,273 +0,0 @@
-/*
-* Copyright (c) 2005-2006 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:  Methods for Server Profiles View
-*
-*/
-
-
-// INCLUDE FILES
-#include "NSmlDMSyncAppUi.h"
-#include "NSmlDMProfilesView.h"
-#include "NSmlDMProfilesContainer.h"
-#include <NSmlDMSync.rsg>
-#include <featmgr.h>
-#include "NSmlDMSyncDebug.h"
-
-#include <centralrepository.h>
-#include "NSmlDMSyncPrivateCRKeys.h"
-
-#include <e32property.h> 
-#include "nsmldmsyncinternalpskeys.h"
-#include "NSmlDMFotaView.h"
-// ========================== MEMBER FUNCTIONS =================================
-
-// -----------------------------------------------------------------------------
-// CNSmlDMProfilesView::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMProfilesView::ConstructL()
-    {
-    FLOG( "[OMADM]\t CNSmlDMProfilesView::ConstructL()" );
-
-    BaseConstructL( R_SMLSYNC_PROFILES_VIEW );
-
-    FLOG( "[OMADM]\t CNSmlDMProfilesView::ConstructL() completed" );
-    }
-
-
-// -----------------------------------------------------------------------------
-// Destructor
-// -----------------------------------------------------------------------------
-//
-CNSmlDMProfilesView::~CNSmlDMProfilesView()
-    {
-    FLOG( "[OMADM] CNSmlDMProfilesView::~CNSmlDMProfilesView" );
-    if ( iContainer )
-        {
-        AppUi()->RemoveFromStack( iContainer );
-        }
-    delete iContainer;
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMProfilesView::RefreshL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMProfilesView::RefreshL()
-    {
-    FLOG( "[OMADM]\t CNSmlDMProfilesView::RefreshListBox()" );
-
-    if ( iContainer )
-        {
-        iContainer->RefreshL();
-        }
-    FLOG( "[OMADM]\t CNSmlDMProfilesView::RefreshListBox() completed" );
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMProfilesView::Id
-// -----------------------------------------------------------------------------
-//
-TUid CNSmlDMProfilesView::Id() const
-    {
-    return KNSmlDMProfilesViewId;
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMProfilesView::HandleCommandL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMProfilesView::HandleCommandL( TInt aCommand )
-    {
-    FLOG( "[OMADM]\t CNSmlDMProfilesView::HandleCommandL()" );
-
-    switch ( aCommand )
-        {
- 
-         case EAknSoftkeyBack:
-            {
-            TInt value = EFalse;    //IAD: Making DM Idle
-            TInt r1 = RProperty::Set(KPSUidNSmlDMSyncApp,KDMIdle,value); 
-            AppUi()->ActivateLocalViewL( KNSmlDMFotaViewId  );
-            break;
-            }    
-         
-        case EAknCmdExit: 
-        case EEikCmdExit:
-            {            
-            STATIC_CAST( CNSmlDMSyncAppUi*, iEikonEnv->EikAppUi() )->CloseGs(); 
-            break;
-            }
-        
-        default:
-            {
-            AppUi()->HandleCommandL( aCommand );
-            break;
-            }
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMProfilesView::DoActivateL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMProfilesView::DoActivateL( const TVwsViewId& /*aPrevViewId*/,
-                                             TUid /*aCustomMessageId*/,
-                                       const TDesC8& /*aCustomMessage*/)
-    {
-    FLOG( "[OMADM]\t CNSmlDMProfilesView::DoActivateL()" );
-    
-    	MenuBar()->SetContextMenuTitleResourceId( 
-    						 R_SMLSYNC_CONTXT_MENUBAR_PROFILES_VIEW );
-
-    iContainer = CNSmlDMProfilesContainer::NewL( this, ClientRect() );
-    AppUi()->AddToStackL( *this, iContainer );
-    
-    CAknTitlePane* titlePane = 
-	    (CAknTitlePane*)(AppUi()->StatusPane())->ControlL( TUid::Uid( EEikStatusPaneUidTitle ) );
-	HBufC* titleText = iEikonEnv->AllocReadResourceLC( R_SML_PROFILES_TITLE );
-	titlePane->SetTextL( titleText->Des() );
-	CleanupStack::PopAndDestroy(titleText);
-	
-
-    FLOG( "[OMADM]\t CNSmlDMProfilesView::DoActivateL() completed" );
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMProfilesView::DoDeactivate
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMProfilesView::DoDeactivate()
-    {
-    FLOG( "[OMADM]\t CNSmlDMProfilesView::DoDeactivate()" );
-
-    if ( iContainer )
-        {
-        AppUi()->RemoveFromStack( iContainer );
-        }
-
-    delete iContainer;
-    iContainer = NULL;
-
-    FLOG( "[OMADM]\t CNSmlDMProfilesView::DoDeactivate() completed" );
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMProfilesView::DynInitMenuPaneL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMProfilesView::DynInitMenuPaneL( TInt aResourceID,
-                                            CEikMenuPane* aMenuPane)
-	{
-	FLOG( "[OMADM] CNSmlDMProfilesView::DynInitMenuPaneL" );
-	TInt configFlags( 0 );
-	TInt retval( -1 );
-    CRepository* centrep = NULL;
-    TRAPD( err, centrep = CRepository::NewL( KCRUidNSmlDMSyncApp ) );
-    if ( centrep )
-        {
-        retval = centrep->Get( KNSmlDMEnableConnectMenuKey, configFlags );
-        delete centrep;
-        }	
-    if ( err == KErrNone )  	
-        {
-        if ( retval != KErrNone )
-            User::Leave( retval );
-        }
-    else 
-        {
-        User::Leave( err );
-        }	
-    if ( aResourceID == R_SMLSYNC_MENU_COMMON && 
-            ! FeatureManager::FeatureSupported( KFeatureIdHelp ))
-        {
-        aMenuPane->SetItemDimmed( EAknCmdHelp , ETrue );      
-        }	          
-    if ( aResourceID == R_SMLSYNC_MENU_PROFILES_VIEW
-            || aResourceID == R_SMLSYNC_CONTXT_MENU_PROFILES_VIEW )
-        {
-        CNSmlDMSyncDocument* doc = STATIC_CAST( CNSmlDMSyncDocument*, 
-                                            AppUi()->Document() );	    	    
-        if ( iContainer->iProfilesListBox->Model()->NumberOfItems() == 0 )
-            {
-            aMenuPane->DeleteMenuItem( ENSmlMenuCmdStartSync );
-            aMenuPane->DeleteMenuItem( ENSmlMenuCmdOpenLog );
-            aMenuPane->DeleteMenuItem( ENSmlMenuCmdOpenSettings );
-
-            if ( aResourceID == R_SMLSYNC_MENU_PROFILES_VIEW )
-                {
-                aMenuPane->DeleteMenuItem( ENSmlMenuCmdEraseProfile );
-                }
-            }
-        else
-            {
-            doc->SetCurrentIndex(
-                    iContainer->iProfilesListBox->CurrentItemIndex());
-            if((doc->ProfileItem()->iProfileLocked))	
-                {
-                aMenuPane->SetItemDimmed( ENSmlMenuCmdOpenSettings , ETrue);
-                if(aResourceID == R_SMLSYNC_MENU_PROFILES_VIEW)	
-                   aMenuPane->SetItemDimmed( ENSmlMenuCmdEraseProfile , ETrue);
-                }  
-            if(!(doc->ProfileItem()->iDeleteAllowed)&& 
-                            aResourceID == R_SMLSYNC_MENU_PROFILES_VIEW)	
-                {
-                aMenuPane->SetItemDimmed( ENSmlMenuCmdEraseProfile , ETrue);
-                }
-            if ( !(doc->ProfileItem()->iSynced) )
-                {
-                aMenuPane->SetItemDimmed( ENSmlMenuCmdOpenLog, ETrue );
-                if ( configFlags != 1)
-                    aMenuPane->SetItemDimmed( ENSmlMenuCmdStartSync, ETrue );
-                }
-            if ( configFlags != 1)
-                {
-                aMenuPane->SetItemDimmed( ENSmlMenuCmdStartSync, ETrue );	
-                }
-            }       
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMProfilesView::HandleForegroundEventL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMProfilesView::HandleForegroundEventL(TBool aForeground)
-	{
-	FLOG( "CNSmlDMProfilesView::HandleForegroundEventL():Begin" );
-	if( !aForeground )
-		{
-		FLOG("CNSmlDMProfilesView::HandleForegroundEventL() not i n FG :end");
-	    return;	
-		}	
-	else
-		{
-		STATIC_CAST( CNSmlDMSyncAppUi*, iEikonEnv->EikAppUi())->CheckFotaDlL();
-		}		
-	
-
-	// For Application Management View switching
-
-	if(aForeground)
-	{
-		FLOG("CNSmlDMProfilesView::HandleForegroundEventL() For AM View Start");
-		STATIC_CAST( CNSmlDMSyncAppUi*, iEikonEnv->EikAppUi())->CheckAMDlL();
-    FLOG("CNSmlDMProfilesView::HandleForegroundEventL() For AM View End");
-        }
-	CAknView::HandleForegroundEventL(aForeground);
-	FLOG( "[OMADM]\t CNSmlDMProfilesView::HandleForegroundEventL():completed" );
-	}    
-
-// End of File
--- a/omadm/omadmappui/src/NSmlDMProgress.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,482 +0,0 @@
-/*
-* 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:  Methods for CNSmlDMProgressDialog. 
-*
-*/
-
-
-// INCLUDE FILES
-#include "NSmlDMSyncAppUi.h"
-#include "NSmlDMProgress.h"
-#include "NSmlDMSyncUtil.h"
-#include "NSmlDMSyncDebug.h"
-#include <NSmlDMSync.rsg>
-#include <StringLoader.h>
-#include <eikprogi.h>
-#include <notecontrol.h>
-#include <AknsUtils.h>
-#include <aknappui.h>
-#include "NSmlDMSyncUi.hrh"
-// ================= MEMBER FUNCTIONS =======================
-
-// -----------------------------------------------------------------------------
-// CNSmlDMProgressDialog::CNSmlDMProgressDialog
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CNSmlDMProgressDialog::CNSmlDMProgressDialog(
-                                    MNSmlDMProgressDialogObserver* aObserver )
-                                   : iObserver( aObserver )
-    {
-    FLOG( "CNSmlDMProgressDialog: CNSmlDMProgressDialog" );
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMProgressDialog::NewL
-// -----------------------------------------------------------------------------
-//
-CNSmlDMProgressDialog* CNSmlDMProgressDialog::NewL(
-                                      MNSmlDMProgressDialogObserver* aObserver )
-    {
-    FLOG( "CNSmlDMProgressDialog::NewL" );
-
-    CNSmlDMProgressDialog* self = 
-                               new ( ELeave ) CNSmlDMProgressDialog( aObserver );
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop();
-
-    FLOG( "CNSmlDMProgressDialog::NewL completed" );
-    return(self);
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMProgressDialog::ConstructL
-//
-// Symbian OS default constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMProgressDialog::ConstructL()
-    {
-    FLOG( "CNSmlDMProgressDialog::ConstructL" );
-
-	iLastText = KNullDesC;
-	iAnimation = EAnimationNone;
-	iEventCount = 0;
-    
-	FLOG( "CNSmlDMProgressDialog::ConstructL completed" );
-    } 
-
-// -----------------------------------------------------------------------------
-// Destructor
-// -----------------------------------------------------------------------------
-//
-CNSmlDMProgressDialog::~CNSmlDMProgressDialog()
-    {
-    FLOG( "CNSmlDMProgressDialog::~CNSmlDMProgressDialog" );
-
-    delete iProgressDialog;
-
-	FLOG( "CNSmlDMProgressDialog::~CNSmlDMProgressDialog completed" );
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMProgressDialog::LaunchProgressDialogL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMProgressDialog::LaunchProgressDialogL( const TDesC& aLabel)
-    {
-    FLOG( "CNSmlDMProgressDialog::LaunchProgressDialogL" );
-
-	iProgressDialog = new( ELeave ) CNSmlDMProgressDialog2(
-	                          reinterpret_cast<CEikDialog**>(&iProgressDialog));
-    
-	iProgressDialog->PrepareLC( R_PROGRESS_NOTE );
-    iProgressDialog->SetTextL(aLabel);
-
-    // get reference to progress info bar
-    iProgressInfo = iProgressDialog->GetProgressInfoL();
-    iProgressDialog->SetCallback(this);
-    
-    iProgressDialog->RunLD();
-    
-	FLOG( "CNSmlDMProgressDialog::LaunchProgressDialogL completed" );
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMProgressDialog::LaunchProgressDialogL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMProgressDialog::LaunchProgressDialogL( const TDesC& aLabel,
-                                                   TAknsItemID aId,
-                                                   const TDesC& aFileName,
-                                                   TInt aFileBitmapId,
-                                                   TInt aFileMaskId )
-	{
-    FLOG( "CNSmlDMProgressDialog::LaunchProgressDialogL" );
-
-	iProgressDialog = new( ELeave ) CNSmlDMProgressDialog2(
-	                        reinterpret_cast<CEikDialog**>(&iProgressDialog));
-    
-	iProgressDialog->PrepareLC( R_PROGRESS_NOTE );
-    iProgressDialog->SetTextL(aLabel);
-	
-	CEikImage* image = CreateImageLC( aId, 
-	                                  aFileName, 
-	                                  aFileBitmapId, 
-	                                  aFileMaskId );
-    iProgressDialog->SetImageL(image);
-	CleanupStack::Pop(image);
-
-    // get reference to progress info bar
-    iProgressInfo = iProgressDialog->GetProgressInfoL();
-    iProgressDialog->SetCallback(this);
-    
-    iProgressDialog->RunLD();
-
-	FLOG( "CNSmlDMProgressDialog::LaunchProgressDialogL completed" );
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMProgressDialog::CancelProgressDialogL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMProgressDialog::CancelProgressDialogL()
-    {
-    FLOG( "CNSmlDMProgressDialog::CancelProgressDialogL" );
-
-	if( iProgressDialog )
-        {        
-        iProgressDialog->ProcessFinishedL();
-        }    
-
-	FLOG( "CNSmlDMProgressDialog::CancelProgressDialogL completed" );
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMProgressDialog::UpdateTextL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMProgressDialog::UpdateTextL(TInt /*aResId*/)
-    {
-   	FLOG( "CNSmlDMProgressDialog::UpdateTextL " );
-
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMProgressDialog::UpdateTextL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMProgressDialog::UpdateTextL(const TDesC& aText)
-    {
-    FLOG( "CNSmlDMProgressDialog::UpdateTextL ( const TDesC& aText )" );
-
-	__ASSERT_DEBUG(iProgressDialog, TUtil::Panic(KErrGeneral));
-
-	if (iLastText.Compare(aText) == 0)
-		{
-		return;  // text has not changed
-		}
-    
-    iProgressDialog->SetTextL( aText );
-	TUtil::StrCopy(iLastText, aText);
-
-	FLOG(  "CNSmlDMProgressDialog::UpdateTextL ( const TDesC& aText )completed" );
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMProgressDialog::SetProgress
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMProgressDialog::SetProgress(TInt aValue)
-    {
-    FLOG(  "CNSmlDMProgressDialog::SetProgress" );
-    
-	__ASSERT_DEBUG(iProgressDialog  && iProgressInfo, TUtil::Panic(KErrGeneral));
-
-	CEikProgressInfo::SInfo info = iProgressInfo->Info();
-
-	TInt val = aValue;
-	if (val > info.iFinalValue)
-		{
-		val = info.iFinalValue;
-		}
-	iProgressInfo->SetAndDraw(val);
-    
-	FLOG( "CNSmlDMProgressDialog::SetProgress completed" );
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMProgressDialog::SetFinalProgress
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMProgressDialog::SetFinalProgress(TInt aFinalValue)
-	{
-    FLOG( "CNSmlDMProgressDialog::SetFinalProgress" );
-    
-    __ASSERT_DEBUG(iProgressInfo, TUtil::Panic(KErrGeneral));
-
-    iProgressInfo->SetFinalValue(aFinalValue);
-	iProgressInfo->SetAndDraw(0);
-
-	FLOG( "CNSmlDMProgressDialog::SetFinalProgress completed" );
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMProgressDialog::NoteControl
-// -----------------------------------------------------------------------------
-//
-CAknNoteControl* CNSmlDMProgressDialog::NoteControl()
-	{
-	FLOG( "CNSmlDMProgressDialog::NoteControl" );
-	
-    CAknNoteControl* note = STATIC_CAST( 
-                           CAknNoteControl*, 
-                           iProgressDialog->ControlOrNull(ENSmlProgressNote) );
-	__ASSERT_DEBUG( note, TUtil::Panic( KErrGeneral ) );
-
-	return note;
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMProgressDialog::CancelAnimation
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMProgressDialog::CancelAnimation()
-	{
-	NoteControl()->CancelAnimation();
-	}
-
-// ----------------------------------------------------------------------------
-// CNSmlDMProgressDialog::StartAnimationL
-// ----------------------------------------------------------------------------
-//
-void CNSmlDMProgressDialog::StartAnimationL()
-	{
-	NoteControl()->StartAnimationL();
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMProgressDialog::DialogDismissedL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMProgressDialog::DialogDismissedL( TInt aButtonId )
-    {
-    FLOG( "CNSmlDMProgressDialog::DialogDismissedL " );
-  
-    if ( iObserver )
-		{
-        // this dialog only sends one cancel event - other events are ignored 
-    	if ( aButtonId == EEikBidCancel && iEventCount == 0 )
-    		{
-    		iEventCount++;
-            TRAP_IGNORE( iObserver->HandleDialogEventL( aButtonId ) );
-            }
-		}
-    FLOG( "CNSmlDMProgressDialog::DialogDismissedL Completed" );
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMProgressDialog::ReadL
-// -----------------------------------------------------------------------------
-//	
-void CNSmlDMProgressDialog::ReadL( TDes& aText, TInt aResourceId )
-    {
-    HBufC* buf = StringLoader::LoadLC( aResourceId );
-    TUtil::StrCopy( aText, *buf );
-    CleanupStack::PopAndDestroy( buf );
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMProgressDialog::CreateImageLC
-// -----------------------------------------------------------------------------
-//
-CEikImage* CNSmlDMProgressDialog::CreateImageLC( TAknsItemID aId,
-                                                 const TDesC& aFileName,
-                                                 TInt aFileBitmapId,
-                                                 TInt aFileMaskId )
-	{
-	CFbsBitmap* bitmap1 = NULL;
-	CFbsBitmap* bitmap2 = NULL;
-	
-	CEikImage* image = new (ELeave) CEikImage;
-	CleanupStack::PushL(image);
-
-	AknsUtils::CreateIconLC( AknsUtils::SkinInstance(),
-	                         aId,
-	                         bitmap1,
-	                         bitmap2,
-	                         aFileName,
-	                         aFileBitmapId,
-	                         aFileMaskId );
-	image->SetPicture( bitmap1, bitmap2 );
-	CleanupStack::Pop(2); // bitmap1 bitmap2
-
-	return image;
-	}
-	
-// -----------------------------------------------------------------------------
-// CNSmlDMProgressDialog::CNSmlDMProgressDialog2
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMProgressDialog::SetImageL(CEikImage* aimage)
-    {
-    NoteControl()->SetImageL(aimage);	
-    }
-    
-/******************************************************************************
- * class CAknProgressDialog2
- ******************************************************************************/
-
-// -----------------------------------------------------------------------------
-// CNSmlDMProgressDialog2::CNSmlDMProgressDialog2
-// -----------------------------------------------------------------------------
-//
-CNSmlDMProgressDialog2::CNSmlDMProgressDialog2( CEikDialog** aSelfPtr ) 
-                                              : CAknProgressDialog( aSelfPtr )
-	{
-	iCloseEventReceived = EFalse;
-	iClosed = EFalse;
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMProgressDialog2::OkToExitL
-// -----------------------------------------------------------------------------
-//
-TBool CNSmlDMProgressDialog2::OkToExitL(TInt aButtonId)
-    {
-    if ( iCloseEventReceived )
-    {
-    	if (iCallback && !iClosed)
-   	    	{
-   	    	TRAP_IGNORE(iCallback->DialogDismissedL(EKeyPhoneEnd));
-   	    	STATIC_CAST( CNSmlDMSyncAppUi*, iEikonEnv->EikAppUi() )->ExitCallL();	
-   	    	FLOG("CNSmlDMProgressDialog2::OkToExitL: close handling done");
-  	    	}
-   		    
-        if (iAvkonAppUi)
-            {
-            // prevent further close events
-            iAvkonAppUi->RemoveFromStack(this);
-            }
-            
-        FLOG( "CNSmlDMProgressDialog2::OkToExitL END" );
-
-        iClosed = ETrue;
-        return ETrue;
-    }
-    
-    if (aButtonId == EEikBidCancel && iCallback)
-        {
-        iCallback->DialogDismissedL(aButtonId);
-		return EFalse; // leave dialog open - let observer close it
-		}
-
-    return CAknProgressDialog::OkToExitL(aButtonId);
-    }
-    
-// -----------------------------------------------------------------------------
-// CNSmlDMProgressDialog2::OfferKeyEventL
-// -----------------------------------------------------------------------------
-//
-TKeyResponse CNSmlDMProgressDialog2::OfferKeyEventL(const TKeyEvent& aKeyEvent,TEventCode aType)
-	{
-	FLOG("CNSmlDMProgressDialog2::OfferKeyEventL START");
-		
-	if (aType == EEventKey)
-		{
-		switch (aKeyEvent.iCode)
-			{
-
-            case EKeyEscape:  // iCode 27 (0x1b)
-            	{
-            	iCloseEventReceived = ETrue;
-            	FLOG( "CNSmlDMProgressDialog2::OfferKeyEventL: EKeyEscape received" );
-            	break;
-            	}
-            	
-            case EKeyPhoneEnd:
-             	{
-             	iCloseEventReceived = ETrue;
-                FLOG( "CNSmlDMProgressDialog2::OfferKeyEventL: EKeyPhoneEnd received" );
-                break;
-               	}
-
-            default:
-                FLOG( "event key code is %d" );        
-			    break;
-			}
-		}
-
-
-    FLOG( "CNSmlDMProgressDialog2::OfferKeyEventL END" );
-    
-	return CAknProgressDialog::OfferKeyEventL(aKeyEvent, aType);
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMProgressDialog2::RunLD
-// -----------------------------------------------------------------------------
-//
-TInt CNSmlDMProgressDialog2::RunLD()
-    {
-    CNSmlDMSyncAppUi* appUi = STATIC_CAST( CNSmlDMSyncAppUi*, iEikonEnv->EikAppUi());
-	CNSmlDMSyncDocument* doc = STATIC_CAST( CNSmlDMSyncDocument*, appUi->Document() );
-    if ( doc->SANSupport() && doc->SilentSession() ) //to suppress backlight
-        {
-        return CEikDialog::RunLD();	
-    	}
-    
-    else //for User initated and all alerts except silent 
-    	{
-        return CAknNoteDialog::RunLD();		
-    	}
-    
-    }
-    
-// -----------------------------------------------------------------------------
-// CNSmlDMProgressDialog2::ProcessFinishedL
-// -----------------------------------------------------------------------------
-//    
- void CNSmlDMProgressDialog2::ProcessFinishedL()
-    { 
-    CNSmlDMSyncAppUi* appUi = STATIC_CAST( CNSmlDMSyncAppUi*, iEikonEnv->EikAppUi());
-	CNSmlDMSyncDocument* doc = STATIC_CAST( CNSmlDMSyncDocument*, appUi->Document() );	       
-     if ( doc->SANSupport() && doc->SilentSession() ) //to suppress backlight
-      {
-        switch ( iState )
-        {
-        case EProcessOnDisplayOff:
-        case EProcessOnDisplayOnCanBeDismissed:
-            iState = EProcessOffDisplayOff;
-            delete iProgressDialogTimer;
-            iProgressDialogTimer = NULL;
-            //ReportUserActivity();
-            //PlayTone();
-            TryExitL( EAknSoftkeyDone );
-            break;
-        case EProcessOnDisplayOn:
-            iState = EProcessOffDisplayOn;
-            break;
-		default:
-			break;
-        }
-      }
-     else //for User initated and all alerts except silent 
-      {
-      CAknProgressDialog::ProcessFinishedL();
-      } 
-    }
-//  End of File  
--- a/omadm/omadmappui/src/NSmlDMSyncApp.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,121 +0,0 @@
-/*
-* Copyright (c) 2002-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:  Methods for CNSmlDMSyncApp
-*
-*/
-
-
-// INCLUDE FILES
-#include "NSmlDMSyncApp.h"
-#include "NSmlDMSyncDocument.h"
-#include "NSmlDMSyncDebug.h"
-#include "NSmlDMSyncAppServer.h"
-#include <eikstart.h>
-#include <e32property.h>
-#include "nsmldmsyncinternalpskeys.h"
-
-// ================= OTHER EXPORTED FUNCTIONS ==================================
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncApp::AppDllUid()
-// Returns application UID
-// -----------------------------------------------------------------------------
-//
-TUid CNSmlDMSyncApp::AppDllUid() const
-    {
-    FLOG( "[OMADM] AppDllUid:" );
-    
-    return KUidSmlSyncApp;
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncApp::CreateDocumentL()
-// Creates CNSmlDMSyncDocument object
-// -----------------------------------------------------------------------------
-//
-CApaDocument* CNSmlDMSyncApp::CreateDocumentL()
-    {
-    FLOG( "[OMADM] CNSmlDMSyncApp::CreateDocumentL:" );
-    
-    CNSmlDMSyncDocument* document = CNSmlDMSyncDocument::NewL( *this );
-    TInt Value = -1;
-    static _LIT_SECURITY_POLICY_PASS(KAllowAllPolicy);
-   	static _LIT_SECURITY_POLICY_C1(KAllowWriteDeviceDataPolicy, ECapabilityWriteDeviceData);
-    TInt r1=RProperty::Define(KUidSmlSyncApp,KNSmlDMSyncUiLaunchKey,RProperty::EInt,KAllowAllPolicy,KAllowWriteDeviceDataPolicy);
-    TInt r=RProperty::Get(KUidSmlSyncApp,KNSmlDMSyncUiLaunchKey,Value);
-    if( r != KErrNone)
-    {
-    	User::LeaveIfError(r);
-    	
-    }
-    
-    if ( document )
-        {
-        //Only independent launch	
-        if ( !document->IsServerAlertSync() )
-            {
-            document->StartServerL();
-            }
-        //Not an independent launch,server alert launch with SAN support    
-        else if ( document->SANSupport() )     
-            {
-            document->StartServerL();	
-            }	
-
-        else if ( Value == 2)    //DM UI launch from CP
-        {
-        document->StartServerL();        
-        }
-
-        }
-    return document;
-    }
-
-// -----------------------------------------------------------------------------
-// NewApplication() 
-// Constructs CNSmlDMSyncApp
-// Returns: CApaDocument*: created application object
-// -----------------------------------------------------------------------------
-//
-LOCAL_C CApaApplication* NewApplication()
-    {
-    FLOG( "[OMADM] CApaApplication* NewApplication:" );
-    
-    return new CNSmlDMSyncApp;
-    }
-
-// -----------------------------------------------------------------------------
-// E32Main
-// -----------------------------------------------------------------------------
-//
-GLDEF_C TInt E32Main()
-    {
-    FLOG( "[OMADM] E32Main:" );
-    
-    return EikStart::RunApplication( NewApplication );
-    }
-
-// -----------------------------------------------------------------------------
-// NewAppServerL() 
-// 
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncApp::NewAppServerL( CApaAppServer*& aAppServer )
-	{
-	FLOG( "[OMADM] CNSmlDMSyncApp::NewAppServerL()" );
-	
-	aAppServer = new (ELeave) CNSmlDMSyncAppServer;
-	}
-
-// End of File
--- a/omadm/omadmappui/src/NSmlDMSyncAppEngine.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,369 +0,0 @@
-/*
-* 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:  Methods for CNSmlDMSyncAppEngine
-*
-*/
-
-
-#include "NSmlDMSyncAppEngine.h"
-#include "NSmlDMSyncDebug.h"
-#include "NSmlDMSyncHandler.h"
-#include <collate.h>
-#include <e32property.h>
-#include "nsmldmsyncinternalpskeys.h"
-
-// ============================ MEMBER FUNCTIONS ==============================
-//
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncAppEngine::CNSmlDMSyncAppEngine
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CNSmlDMSyncAppEngine::CNSmlDMSyncAppEngine() : iProgressShown( ETrue )
-	{
-	FLOG( "[OMADM] CNSmlDMSyncAppEngine::CNSmlDMSyncAppEngine:" );
-	
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncAppEngine::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncAppEngine::ConstructL( CNSmlDMSyncDocument* aSyncDocument )
-    {
-    FLOG( "[OMADM] CNSmlDMSyncAppEngine::ConstructL:" );
-    
-    iSyncMLSession.OpenL();
-    iSyncHandler = CNSmlDMSyncHandler::NewL( &iSyncMLSession,
-                                             this,
-                                             aSyncDocument );
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncAppEngine::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CNSmlDMSyncAppEngine* CNSmlDMSyncAppEngine::NewL(
-    CNSmlDMSyncDocument* aSyncDocument )
-	{
-	FLOG( "[OMADM] CNSmlDMSyncAppEngine::NewL:" );
-	
-	CNSmlDMSyncAppEngine* self = new( ELeave ) CNSmlDMSyncAppEngine();
-    CleanupStack::PushL( self );
-    self->ConstructL( aSyncDocument );
-    CleanupStack::Pop();
-
-    return self;
-	}
-
-// ------------------------------------------------------------------------------
-// Destructor
-// ------------------------------------------------------------------------------
-//
-CNSmlDMSyncAppEngine::~CNSmlDMSyncAppEngine()
-    {
-    FLOG( "[OMADM] CNSmlDMSyncAppEngine::~CNSmlDMSyncAppEngine:" );
-    
-    delete iSyncHandler;
-    delete iProfile;        
-    iSyncMLSession.Close();
-	}
-
-// ------------------------------------------------------------------------------
-// CNSmlDMSyncAppEngine::DeleteProfileL
-// ------------------------------------------------------------------------------
-//
-void CNSmlDMSyncAppEngine::DeleteProfileL( TInt aProfileId )
-    {
-    FLOG( "[OMADM] CNSmlDMSyncAppEngine::DeleteProfileL:" );
-    
-    delete iProfile;
-    iProfile = NULL;
-    iSyncMLSession.DeleteProfileL( aProfileId );
-	}
-
-// ------------------------------------------------------------------------------
-// CNSmlDMSyncAppEngine::CreateProfileL
-// ------------------------------------------------------------------------------
-//
-TInt CNSmlDMSyncAppEngine::CreateProfileL()
-    {
-    FLOG( "[OMADM] CNSmlDMSyncAppEngine::CreateProfileL:" );
-    
-    delete iProfile;
-    iProfile = NULL;
-    iProfile = CNSmlDMSyncProfile::NewL( KUidSmlSyncApp.iUid, &iSyncMLSession );
-    return iProfile->CreateL();
-	}
-
-// ------------------------------------------------------------------------------
-// CNSmlDMSyncAppEngine::Profile
-// ------------------------------------------------------------------------------
-//
-CNSmlDMSyncProfile* CNSmlDMSyncAppEngine::Profile( )
-    {
-    FLOG( "[OMADM] CNSmlDMSyncAppEngine::Profile:" );
-    
-    return iProfile;
-	}
-	
-// ------------------------------------------------------------------------------
-// CNSmlDMSyncAppEngine::CreateCopyProfileL
-// ------------------------------------------------------------------------------
-//
-CNSmlDMSyncProfile* CNSmlDMSyncAppEngine::CreateCopyProfileL( TInt aProfileId )
-    {
-    FLOG( "[OMADM] CNSmlDMSyncAppEngine::CreateCopyProfileL:" );
-    
-    delete iProfile;
-    iProfile = NULL;
-    iProfile = CNSmlDMSyncProfile::NewL( KUidSmlSyncApp.iUid, &iSyncMLSession );
-    
-    iProfile->CreateCopyL( aProfileId );
-    return iProfile;
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncAppEngine::Session
-// -----------------------------------------------------------------------------
-//
-RSyncMLSession* CNSmlDMSyncAppEngine::Session()
-	{
-	FLOG( "[OMADM] CNSmlDMSyncAppEngine::Session:" );
-	
-	return &iSyncMLSession;
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncAppEngine::OpenL
-// -----------------------------------------------------------------------------
-//
-CNSmlDMSyncProfile* CNSmlDMSyncAppEngine::OpenProfileL( TInt aProfileId,
-                                                        TInt aOpenMode )
-    {
-	FLOG( "[OMADM] CNSmlDMSyncAppEngine::OpenL:" );
-	
-    delete iProfile;
-    iProfile = NULL;
-    iProfile = CNSmlDMSyncProfile::NewL( KUidSmlSyncApp.iUid, &iSyncMLSession );
-   	iProfile->OpenL( aProfileId, aOpenMode );
-   	return iProfile;
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncAppEngine::Close
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncAppEngine::CloseProfile()
-    {
-    FLOG(  "[OMADM] CNSmlDMSyncAppEngine::Close:" );
-
-    delete iProfile;
-    iProfile = NULL;
-    }
-    
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncAppEngine::SynchronizeL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncAppEngine::SynchronizeL( TDesC& aServerName,
-                                         TInt aProfileId,
-                                         TInt aConnectionBearer,
-                                         const TBool aUseFotaProgressNote )
-    {
-    FLOG( "[OMADM] CNSmlDMSyncAppEngine::SynchronizeL:" );
-    	
-    iProgressShown = ETrue;
-    iSyncHandler->SynchronizeL( aServerName,
-                                aProfileId,
-                                aConnectionBearer,
-                                aUseFotaProgressNote );
-    }
-    
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncAppEngine::SynchronizeL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncAppEngine::SynchronizeL( TDesC& aServerName,
-                                         TInt aProfileId,
-                                         TInt aJobId,
-                                         TInt aConnectionBearer,
-                                         const TBool aUseFotaProgressNote )
-    {
-   	FLOG( "[OMADM] CNSmlDMSyncAppEngine::SynchronizeL:" );
-
-    iProgressShown = ETrue;
-    TInt err = RProperty::Set( KPSUidNSmlDMSyncApp,
-    				KDmJobCancel, KErrNone );
-    FTRACE(FPrint(
-    	_L("CNSmlDMSyncAppEngine::SynchronizeL()KDmJobCancel reset to 0 err = %d"),
-    										err ) );
-    iSyncHandler->SynchronizeL( aServerName, 
-                                aProfileId, 
-                                aJobId, 
-                                aConnectionBearer,
-                                aUseFotaProgressNote );
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncAppEngine::ShowProgressDialogL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncAppEngine::ShowProgressDialogL( TBool aShow )
-    {
- 	FLOG( "[OMADM] CNSmlDMSyncAppEngine::ShowProgressDialog()" );
-    
-    if ( aShow != iProgressShown )
-        {
-        if ( aShow )
-            {
-            iSyncHandler->ShowProgressDialogL();
-            }
-        else
-            {
-            iSyncHandler->HideProgressDialogL();
-            }
-        iProgressShown = aShow;
-        }
-    }
-    
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncAppEngine::ServerIdFoundL
-// -----------------------------------------------------------------------------
-//    
-TBool CNSmlDMSyncAppEngine::ServerIdFoundL( const TDesC& aServerId,
-                                            const TInt aProfileId )
-    {
-    FLOG( "[OMADM] CNSmlDMSyncAppEngine::ServerIdFoundL:" );
-    
-	RArray<TSmlProfileId> arr;
-    iSyncMLSession.ListProfilesL( arr, ESmlDevMan );
-    TBool ret = EFalse;
-   	CleanupClosePushL(arr);
-   	
-	for ( TInt index = 0; index < arr.Count(); index++ )
-		{
-	    TRAPD( error, OpenProfileL( arr[index], ESmlOpenRead ) );
-	    if ( error == KErrNone )
-	        {
-	        if ( aProfileId != Profile()->ProfileId() )
-	            {	        
-    	        TBuf<KNSmlMaxItemLength> buf;
-    	        Profile()->GetServerId( buf );
-    	        if ( buf.Compare( aServerId ) == 0 )
-    	            {
-    	            FLOG( "[OMADM] CNSmlDMSyncAppEngine::ServerIdFoundL: Match" );
-                    ret = ETrue;
-                    CloseProfile();
-                    break;
-                    }
-	            }
-		    CloseProfile();
-	        }
-		}
-    CleanupStack::PopAndDestroy( &arr );
-    return ret;
-    }
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSyncAppEngine::Compare
-// -----------------------------------------------------------------------------
-//
-TInt CNSmlDMSyncAppEngine::Compare( const TDesC& aLeft, const TDesC& aRight )
-	{
-	FLOG( "[OMADM] CNSmlDMSyncAppEngine::Compare:" );
-	
-	// Empty Name() is always greater than non-empty Name()
-    if (aLeft.Length() == 0 && aRight.Length() == 0)
-        {
-        return 0;
-        }
-    if (aLeft.Length() == 0)
-        {
-        return 1;
-        }
-    if (aRight.Length() == 0)
-        {
-        return -1;
-        }
-
-    // None of the Name()s was empty, use TDesC::CompareC to do the comparison.
-    // This is from cntmodel.
-    TCollationMethod collateMethod;
-    // get the standard method
-	collateMethod = *Mem::CollationMethodByIndex(0);
-    // dont ignore punctuation and spaces
-	collateMethod.iFlags |= TCollationMethod::EIgnoreNone; 
-	TInt comparison( aLeft.CompareC(aRight, 3, &collateMethod) );
-	return comparison;	
-	}
-	
-// -----------------------------------------------------------------------------
-//  CNSmlDMSyncAppEngine::SyncRunning
-// -----------------------------------------------------------------------------
-//
-TBool CNSmlDMSyncAppEngine::SyncRunning()
-    {
-    FLOG( "[OMADM] CNSmlDMSyncAppEngine::SyncRunning:" );
-    
-    return iSyncHandler->SyncRunning();
-    }
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSyncAppEngine::CancelSyncL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncAppEngine::CancelSyncL()
-    {
-    FLOG( "[OMADM] CNSmlDMSyncAppEngine::CancelSyncL()" );
-    iSyncHandler->CancelSynchronizeL();
-    }
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSyncAppEngine::SyncCompleted
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncAppEngine::SyncCompleted( TNSmlStatus aStatus )
-    {
-    FLOG( "[OMADM] CNSmlDMSyncAppEngine::SyncCompleted:" );
-    
-    if( iSyncObserver )
-        {
-        FLOG( "[OMADM] CNSmlDMSyncAppEngine::SyncCompleted: inform observer" );
-        
-        iSyncObserver->SyncComplete( aStatus );
-        }    
-    }
-    
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncAppEngine::RequestSyncStatus
-// -----------------------------------------------------------------------------
-//	
-void CNSmlDMSyncAppEngine::RequestSyncStatus( 
-                                           MNSmlDMSyncObserver* aSyncObserver )
-    {
-    FLOG( "[OMADM] CNSmlDMSyncAppEngine::RequestSyncStatus:" );
-    
-    if( aSyncObserver )
-        {
-        FLOG( "[OMADM] CNSmlDMSyncAppEngine::RequestSyncStatus: added observer" );
-        iSyncObserver = aSyncObserver;
-        }
-    }
-
-// End of File
--- a/omadm/omadmappui/src/NSmlDMSyncAppServer.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-/*
-* 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:  Sync app server
-*
-*/
-
-
-// INCLUDE FILES
-#include    "NSmlDMSyncAppServer.h"
-#include    "NSmlDMSyncDebug.h"
-
-#include    <SyncServiceSession.h>
-#include    <SyncServiceConst.h>
-
-
-// ------------------------------------------------------------------------------
-// CNSmlDMSyncAppServer::CreateServiceL
-// ------------------------------------------------------------------------------
-//
-CApaAppServiceBase* CNSmlDMSyncAppServer::CreateServiceL( 
-                                                      TUid aServiceType ) const
-	{
-	FLOG( "[OMADM] CNSmlDMSyncAppServer::CreateServiceL" );
-	
-	if ( aServiceType == TUid::Uid( KSyncServiceUid ) )   
-		{
-		return new (ELeave) CSyncServiceSession;
-		}
-	else
-		{
-		return CAknAppServer::CreateServiceL( aServiceType );
-		}
-	}
-
-// ------------------------------------------------------------------------------
-// CNSmlDMSyncAppServer::CreateServiceL
-// ------------------------------------------------------------------------------
-//
-void CNSmlDMSyncAppServer::ConstructL( const TDesC& aFixedServerName )
-    {
-    FTRACE(RDebug::Print(_L("[OMADM] CNSmlDMSyncAppServer::ConstructL %S"),
-                                                           &aFixedServerName));
-
-    CAknAppServer::ConstructL( aFixedServerName );
-    }
-
-// ------------------------------------------------------------------------------
-// CNSmlDMSyncAppServer::HandleAllClientsClosed
-// ------------------------------------------------------------------------------
-//
-void CNSmlDMSyncAppServer::HandleAllClientsClosed()
-    {
-    FLOG( "[OMADM] CNSmlDMSyncAppServer::HandleAllClientsClosed" );
-    }
-
-// End of File
--- a/omadm/omadmappui/src/NSmlDMSyncAppUi_fota.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,876 +0,0 @@
-/*
-* Copyright (c) 2005-2006 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:  Methods for Device Manager Application UI
-*
-*/
-
-#include <apgwgnam.h>
-#include <gsfwviewuids.h>
-#include <aknnotewrappers.h>
-#include <aknnavide.h>
-#include <StringLoader.h>
-#include <textresolver.h>
-#include <DevManInternalCRKeys.h> //SAN support
-#include <centralrepository.h>
-#include <barsread.h>
-#include <e32property.h>
-#include <NSmlDMSync.rsg>
-#include "nsmldmsyncinternalpskeys.h"
-#include "NSmlDMSyncAppUi.h"
-#include "NSmlDMSyncApp.h"
-#include "NSmlDMSyncAppEngine.h"
-#include "NSmlDMFotaModel.h"
-#include "NSmlDMFotaView.h"
-#include "NSmlDMProfilesView.h"
-#include "NSmlDMSyncDocument.h"
-#include "NSmlDMDlgProfileView.h"
-#include "NSmlDMSyncDebug.h"
-#include "NSmlDMSyncDialog.h"
-#include "NSmlDMSyncProfile.h"
-#include "NSmlDMSyncPrivateCRKeys.h"
-#include <featmgr.h>
-
-#include <hlplch.h>
-#include <csxhelp/dm.hlp.hrh>
-
-
-// ============================ MEMBER FUNCTIONS ==============================
-//
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncAppUi::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncAppUi::ConstructL()
-    {
-    FLOG( "[OMADM] CNSmlDMSyncAppUi::ConstructL()" );
-
-    BaseConstructL( EAknEnableSkin | EAknEnableMSK | EAknSingleClickCompatible);
-    iSyncDocument = (CNSmlDMSyncDocument*) iDocument;
-    iSyncAppEngine = iSyncDocument->AppEngine();
-    iSyncAppEngine->RequestSyncStatus( this );
-    iFotaModel = CNSmlDMFotaModel::NewL( iSyncDocument );
-    iProfilesView = new (ELeave) CNSmlDMProfilesView(); 
-
-    iViewTitle = 0;
-    
-    iProfilesView->ConstructL(); // this );
-    AddViewL( iProfilesView ); // Transfer ownership to CAknViewAppUi
-
-    TInt configFlags( 0 );
-    CRepository* centrep = NULL;
-    centrep = CRepository::NewL( KCRUidNSmlDMSyncApp );
-    centrep->Get( KNSmlDMFotaConfigurationKey, configFlags );
-    delete centrep;
-
-    if ( configFlags & KNSmlDMFotaEnableFotaViewFlag )
-        {
-    	iNaviDecorator = 0;
-        // Show tabs for main views from resources
-        CEikStatusPane* sp = StatusPane();
-
-        // Fetch pointer to the default navi pane control
-        iNaviPane = ( CAknNavigationControlContainer* )
-            sp->ControlL( TUid::Uid(EEikStatusPaneUidNavi) );
-
-   
-        CNSmlDMFotaView* fotaView = new (ELeave) CNSmlDMFotaView;
-        iMainView = fotaView;
-        CleanupStack::PushL( fotaView );
-        fotaView->ConstructL();
-        AddViewL( fotaView ); // Transfer ownership to CAknViewAppUi
-        CleanupStack::Pop( fotaView );
-
-        ActivateLocalViewL( fotaView->Id() );
-        }
-    else
-        {
-        ActivateLocalViewL( iProfilesView->Id() );
-        }
-    
- 
-	iDialogUp       = 0;
-	iDestroyed      = 1;
-
-    FLOG( "[OMADM] CNSmlDMSyncAppUi::ConstructL() completed" );
-    }
-
-// ------------------------------------------------------------------------------
-// Destructor
-// ------------------------------------------------------------------------------
-
-CNSmlDMSyncAppUi::~CNSmlDMSyncAppUi()
-    {
-    FLOG( "[OMADM] ~CNSmlDMSyncAppUi()" );
-
-    delete iFotaModel;
-	delete iNaviDecorator;
-	if ( iDestroyed == 0 )
-		{
-		delete iAppView;
-		}
-	}
-
-// ------------------------------------------------------------------------------
-// CNSmlDMSyncAppUi::TabChangedL
-// ------------------------------------------------------------------------------
-//
-
-// ------------------------------------------------------------------------------
-// CNSmlDMSyncAppUi::DynInitMenuPaneL
-// ------------------------------------------------------------------------------
-//
-void CNSmlDMSyncAppUi::DynInitMenuPaneL( TInt /*aResourceId*/,
-                                         CEikMenuPane* /*aMenuPane*/ )
-    {
-    FLOG( "[OMADM] CNSmlDMSyncAppUi::DynInitMenuPaneL:" );
-	}
-
-// ------------------------------------------------------------------------------
-// CNSmlDMSyncAppUi::HandleKeyEventL
-// ------------------------------------------------------------------------------
-//
-TKeyResponse CNSmlDMSyncAppUi::HandleKeyEventL( const TKeyEvent& aKeyEvent,
-                                            	TEventCode aType )
-    {
-    FTRACE( FPrint(
-            _L("[OMADM] CNSmlDMSyncAppUi::HandleKeyEventL: = 0x%x"),aKeyEvent.iCode ) );
-	//EEventKeyDown ends settdialog
-	if ( iDialogUp != 0 ) 
-		{
-		return EKeyWasConsumed;
-		}
-	if ( aType == EEventKey )
-		{
-		switch ( aKeyEvent.iCode )
-			{
-			case EKeyUpArrow:
-				{
-				if ( !Synchronise() )
-					{
-					HandleUpScrollL();
-					}
-				}
-		    	break;
-
-			case EKeyDownArrow:
-				{
-				if ( !Synchronise() )
-					{
-					HandleDownScrollL();
-					}
-				}
-			    break;
-
-			case EKeyPhoneEnd:
-			    {			    			    
-			    FLOG( "End key pressed" );
-			    if ( iMainView )
-			        {			
-			        ExitCallL();
-			        }
-			    }
-			case EKeyEscape:
-				{
-				if ( Synchronise() )
-					{
-					iSyncAppEngine->CancelSyncL();
-					}						
-				}
-			    break;
-			default:
-
-				return EKeyWasNotConsumed;		
-			}
-		}
-    FLOG( "[OMADM] CNSmlDMSyncAppUi::HandleKeyEventL() completed" );
-    return EKeyWasNotConsumed;
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncAppUi::HandleCommandL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncAppUi::HandleCommandL( TInt aCommand )
-    {
-    FTRACE( FPrint(
-        _L("[OMADM] CNSmlDMSyncAppUi::HandleCommandL() command = 0x%x"),
-        aCommand ) );
-
-    iSyncDocument->DisableDbNotifications( ETrue );
-	iBusy = ETrue;
-
-    switch ( aCommand )
-        {
-      case   EAknCmdHelp:                           
-			{
-			     
-           if (FeatureManager::FeatureSupported( KFeatureIdHelp ))
-			   {
-                HlpLauncher::LaunchHelpApplicationL( iEikonEnv->WsSession(), AppHelpContextL());
-      		    	iBusy = EFalse;
-      	 }		 
-			
-			}
-    		break;
-
-	    case EAknSoftkeyExit: //For independent .exe app launch from file browser
-		case EAknCmdExit:
-        case EEikCmdExit:		// quit application
-			{
-			TApaTaskList taskList(CEikonEnv::Static()->WsSession());
-	        TApaTask task1(taskList.FindApp( KFotaServerAppUid));
-			TInt value=-1;
-            TInt r1=RProperty::Set(KPSUidNSmlDMSyncApp,KNSmlDMSyncUiLaunchKey,value);
-	        if(task1.Exists())
-	        	{
-	        	task1.EndTask();
-	        	}
-			Exit();
-			}
-		    break;
-		    
-		case ENSmlMenuCmdNewProfile:	// create new profile
-			{
-			if (TUtil::SettingEnforcementState())
-				{
-				ShowResourceErrorNoteL( R_QTN_DM_INFO_NOTE_LOCKED_SETTING );
-				break;
-				}
-            HandleCommandNewProfileL();
-			}
-		    break;
-
-		case ENSmlMenuCmdEraseProfile:	// delete profile
-			{
-			if (TUtil::SettingEnforcementState()|| iSyncDocument->ProfileItem()->iProfileLocked)
-				{
-				ShowResourceErrorNoteL( R_QTN_DM_INFO_NOTE_LOCKED_SETTING );
-				break;
-				}
-            HandleCommandEraseProfileL();
-			}
-    		break;
-		
-		case ENSmlMenuCmdOpenLog:			// open syncronisation log view
-			{
-			CNSmlDMSyncDialog::ShowDialogL( 
-            			      iSyncDocument->ProfileItem()->iProfileId,
-			                  iSyncAppEngine->Session() );
-			iBusy = EFalse;
-			}
-		    break;
-
-		case ENSmlMenuCmdOpenSettings:		// open profile for editing
-			{
-			if (TUtil::SettingEnforcementState())
-				{
-				ShowResourceErrorNoteL( R_QTN_DM_INFO_NOTE_LOCKED_SETTING );
-				break;
-				}
-			ShowEditProfileDialogL( ESmlEditProfile );
-			}
-		    break;
-		
-		case ENSmlMenuCmdStartSync:			// start synchronisation
-			{
-            if ( ShowConfirmationNoteL( R_QTN_SML_CONF_STARTQUERY ) )
-                {
-                StartSyncL();
-                }
-			}
-		    break;
-		
-		default:
-            break;      
-        }
-    iSyncDocument->DisableDbNotifications( EFalse );
-    FLOG( "[OMADM] CNSmlDMSyncAppUi::HandleCommandL() completed" );
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncAppUi::HandleUpScrollL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncAppUi::HandleUpScrollL()
-	{
-    FLOG( "[OMADM] CNSmlDMSyncAppUi::HandleUpScrollL:" );
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncAppUi::HandleDownScrollL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncAppUi::HandleDownScrollL()
-	{
-    FLOG( "[OMADM] CNSmlDMSyncAppUi::HandleDownScrollL:" );
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncAppUi::ShowEditProfileDialogL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncAppUi::ShowEditProfileDialogL( TNSmlEditMode aMode,
-                                               TInt /*aStartUp*/)
-	{
-    FLOG( "[OMADM] CNSmlDMSyncAppUi::ShowEditProfileDialogL:" );
-
-	TInt profileId( KErrNotFound );
-	if ( aMode != ESmlNewProfile )
-		{
-		profileId = iSyncDocument->ProfileItem()->iProfileId;
-		}
-    
-    iAppView = CNSmlDMDlgProfileView::NewL( 
-                                    iSyncDocument,
-	                                aMode,
-	                                profileId );
-	  	                               
-	TRAPD( error, iAppView->ExecuteLD( R_NSML_SETTING_DIALOG ) );
-	if ( error != KErrNone )
-		{
-		ShowErrorNoteL( error );
-		}
-	else
-		{
-		iBusy = ETrue;
-		iActiveView = CNSmlDMSyncAppUi::SettingsView;
-		AddToStackL( iAppView );
-		}
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncAppUi::ProcessCommandParametersL
-// -----------------------------------------------------------------------------
-//
-TBool CNSmlDMSyncAppUi::ProcessCommandParametersL( TApaCommand /*aCommand*/,
-                                                   TFileName& aDocumentName,
-                                                   const TDesC8& /*aTail*/ )
-	{
-    FLOG( "[OMADM] CNSmlDMSyncAppUi::ProcessCommandParametersL:" );
-
-	 // This is to prevent dummy document creation
-	aDocumentName.Zero();
-	return EFalse;
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncAppUi::StartSyncL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncAppUi::StartSyncL(
-    const TInt aProfileId, // = KErrNotFound
-    const TBool aUseFotaProgressNote ) // = EFalse
-	{
-    FTRACE( FPrint(
-        _L("[OMADM] CNSmlDMSyncAppUi::StartSyncL() aProfileId = %d"),
-        aProfileId ) );
-
-	if ( aProfileId == KErrNotFound )
-	    {
-        iConfedProfileId = iSyncDocument->ProfileItem()->iProfileId;
-	    }
-	else
-	    {
-	    iConfedProfileId = aProfileId;
-	    }
-
-    FTRACE( FPrint(
-        _L("[OMADM] CNSmlDMSyncAppUi::StartSyncL() used profileId = %d"),
-        iConfedProfileId ) );
-        
-	CNSmlDMSyncProfile* profile = 
-	            iSyncAppEngine->OpenProfileL( iConfedProfileId, ESmlOpenReadWrite );
-
-    TInt connectionBearer = profile->BearerType();
-    
-    TBuf<KNSmlMaxProfileNameLength> serverName;
-    profile->GetName( serverName );
-	
-	if ( profile->SASyncState() == ESASyncStateDisable )
-		{
-		if ( ShowConfirmationNoteL( R_QTN_SML_CONF_ACTIVEQUERY ) )
-			{
-			profile->SetSASyncStateL( ESASyncStateEnable );
-			profile->SaveL();
-			}
-		else
-			{
-			iSyncAppEngine->CloseProfile();
-			return;
-			}
-		}
-
-    iSyncAppEngine->CloseProfile();		
-    TRAPD( error, iSyncAppEngine->SynchronizeL( serverName, 
-                                                iConfedProfileId, 
-                                                connectionBearer,
-                                                aUseFotaProgressNote ) );
-	
-	if (error == KErrNone)
-		{
-		iActiveView = CNSmlDMSyncAppUi::ProgressView;
-		}
-	else
-		{
-		ShowErrorNoteL( error );
-		iActiveView = CNSmlDMSyncAppUi::MainView;
-		}
-
-    FTRACE( FPrint(
-        _L("[OMADM] CNSmlDMSyncAppUi::StartSyncL() completed, error = %d"),
-        error ) );
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncAppUi::ChangeViewL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncAppUi::ChangeViewL(TBool aRefresh)
-	{
-    FLOG( "[OMADM] CNSmlDMSyncAppUi::ChangeViewL:" );
-
-	iActiveView = CNSmlDMSyncAppUi::MainView;
-	if ( aRefresh != EFalse )
-		{
-		iSyncDocument->RefreshProfileListL();
-        iProfilesView->RefreshL();
-		}
-	CAknTitlePane* titlePane = 
-	    (CAknTitlePane*) StatusPane()->ControlL( TUid::Uid( EEikStatusPaneUidTitle ) );
-	HBufC* titleText = NULL;    
-
-	if ( iViewTitle )
-	{
-	titleText = iEikonEnv->AllocReadResourceLC( R_SML_APP_TITLE );
-	iViewTitle = 0;	
-	}
-	else
-	{
-	titleText = iEikonEnv->AllocReadResourceLC( R_SML_PROFILES_TITLE );	
-	}	
-	
-	titlePane->SetTextL( titleText->Des() );
-	CleanupStack::PopAndDestroy(titleText);
-	iBusy = EFalse;
-
-    FLOG( "[OMADM] CNSmlDMSyncAppUi::ChangeViewL() completed" );
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncAppUi::ShowErrorNoteL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncAppUi::ShowErrorNoteL( TInt aError ) const
-	{
-    FLOG( "[OMADM] CNSmlDMSyncAppUi::ShowErrorNoteL:" );
-
-	TBuf<KNSmlMaxTextLength256> errMsg;	
-	SetErrorMessageL( aError, errMsg );	
-	CAknInformationNote* queryDialog = new (ELeave) CAknInformationNote;
-	queryDialog->ExecuteLD( errMsg );
-    FLOG( "[OMADM] CNSmlDMSyncAppUi::ShowErrorNoteL() completed" );
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncAppUi::SetErrorMessageL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncAppUi::SetErrorMessageL( TInt aError, TDes& aMsg ) const
-	{
-    FLOG( "[OMADM] CNSmlDMSyncAppUi::SetErrorMessageL:" );
-    CTextResolver* textResolver = CTextResolver::NewLC();
-    
-    aMsg.Append( textResolver->ResolveErrorString( aError,
-	                                         CTextResolver::ECtxNoCtx ) );
-	
-	CleanupStack::PopAndDestroy( textResolver );
-
-	HBufC* appTitle = iEikonEnv->AllocReadResourceLC( R_SML_APP_TITLE );
-	aMsg.Insert( 0, appTitle->Des() );
-	CleanupStack::PopAndDestroy( appTitle );
-    FTRACE( FPrint(
-        _L("[OMADM] CNSmlDMSyncAppUi::SetErrorMessageL() completed, aError = %d, aMsg ="),
-        aError ) );
-    FTRACE( FPrint(
-        _L("[OMADM] \"%S\""),
-        &aMsg ) );
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncAppUi::HelpContextL
-// -----------------------------------------------------------------------------
-//
-
-CArrayFix<TCoeHelpContext>* CNSmlDMSyncAppUi::HelpContextL() const
-	{
-	CArrayFixFlat<TCoeHelpContext>* array = 
-	                            new (ELeave) CArrayFixFlat<TCoeHelpContext>(1);
-	array->AppendL( TCoeHelpContext( KUidSmlSyncApp, KDM_HLP_MAIN_VIEW ) );
-	array->AppendL( TCoeHelpContext( KUidSmlSyncApp, KFOTA_HLP_SETTINGS ) );
-	array->AppendL( TCoeHelpContext( KUidSmlSyncApp, KDM_HLP_SERVERS_VIEW ) );
-	array->AppendL( TCoeHelpContext( KUidSmlSyncApp, KDM_HLP_SETTINGS ) );
-	return array;
-	}
-
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncAppUi::ShowResourceErrorNoteL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncAppUi::ShowResourceErrorNoteL(TInt aResource) const
-    {
-    FLOG( "[OMADM] CNSmlDMSyncAppUi::ShowResourceErrorNoteL:" );
-
-	HBufC* errorText = iEikonEnv->AllocReadResourceLC( aResource );
-	CAknInformationNote* queryDialog = new (ELeave) CAknInformationNote;
-	queryDialog->ExecuteLD( errorText->Des() );
-	CleanupStack::PopAndDestroy( errorText );
-
-    FLOG( "[OMADM] CNSmlDMSyncAppUi::ShowResourceErrorNoteL() completed" );
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncAppUi::FotaModel
-// -----------------------------------------------------------------------------
-//
-CNSmlDMFotaModel* CNSmlDMSyncAppUi::FotaModel() const
-    {
-    return iFotaModel;
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncAppUi::MarkFwUpdChangesStartL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncAppUi::MarkFwUpdChangesStartL()
-    {
-    __ASSERT_ALWAYS( iFotaModel, TUtil::Panic( KErrGeneral ) );
-    iFotaModel->MarkFwUpdChangesStartL();
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncAppUi::FwUpdStatesChangedL
-// -----------------------------------------------------------------------------
-//
-TBool CNSmlDMSyncAppUi::FwUpdStatesChangedL()
-    {
-    __ASSERT_ALWAYS( iFotaModel, TUtil::Panic( KErrGeneral ) );
-    return iFotaModel->FwUpdStatesChangedL();
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncAppUi::ShowConfirmationNoteL
-// -----------------------------------------------------------------------------
-//
-TBool CNSmlDMSyncAppUi::ShowConfirmationNoteL( TInt aResource ) const
-    {
-    FLOG( "[OMADM] CNSmlDMSyncAppUi::ShowConfirmationNoteL:" );
-
-	HBufC* queryText = iEikonEnv->AllocReadResourceLC( aResource );
-	CAknQueryDialog* queryDialog = new (ELeave) CAknQueryDialog();
-
-	TBool retValue = queryDialog->ExecuteLD( R_STARTQUERY_NOTE,
-	                                         queryText->Des() );
-	CleanupStack::PopAndDestroy( queryText );
-    FTRACE( FPrint(
-        _L("[OMADM] CNSmlDMSyncAppUi::ShowConfirmationNoteL() completed, retval = %d"),
-        retValue ) );
-	return retValue;
-	}
-	
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncAppUi::HandleCommandNewProfileL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncAppUi::HandleCommandNewProfileL()
-    {
-    FLOG( "[OMADM] CNSmlDMSyncAppUi::HandleCommandNewProfileL:" );
-    
-	if ( iSyncDocument->ProfileCount() != 0 )
-	    {
-		//This if loop check required whether keypad or touch (via stylus) being used incase of single click enabled
-	    if(iProfilesView->MenuBar()->ItemSpecificCommandsEnabled())
-	        {
-	        HBufC* delQuery = StringLoader::LoadL( 
-	                R_QTN_SML_APPUI_COPY,
-	                iSyncDocument->ProfileItem()->iProfileName );
-	        CleanupStack::PushL( delQuery );
-
-	        CAknQueryDialog* queryDialog = new (ELeave) CAknQueryDialog();
-	        iDialogUp = 1;
-
-	        if ( queryDialog->ExecuteLD( R_STARTQUERY_NOTE, delQuery->Des() ) )  
-	            {
-	            iDialogUp = 0;
-	            ShowEditProfileDialogL( ESmlCopyProfile );					
-	            }
-	        else
-	            {
-	            iDialogUp = 0;
-	            ShowEditProfileDialogL( ESmlNewProfile );	
-	            }
-	        CleanupStack::PopAndDestroy( delQuery );
-	        }
-	    else
-	        {
-	        iDialogUp = 0;
-	        ShowEditProfileDialogL( ESmlNewProfile );   
-	        }
-	    }
-	else
-		{
-		iDialogUp = 0;
-		ShowEditProfileDialogL( ESmlNewProfile );	
-		}
-	
-    FLOG( "[OMADM] CNSmlDMSyncAppUi::HandleCommandNewProfileL() completed" );
-    }
-    
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncAppUi::HandleCommandEraseProfileL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncAppUi::HandleCommandEraseProfileL()
-    {
-    FLOG( "[OMADM] CNSmlDMSyncAppUi::HandleCommandEraseProfileL:" );
-    
-	HBufC* delQuery = StringLoader::LoadL(
-	    R_SML_APPUI_NOTE_TEXT_DEL,
-	    iSyncDocument->ProfileItem()->iProfileName );
-	CleanupStack::PushL( delQuery );
-	
-	CAknQueryDialog* queryDialog = new (ELeave) CAknQueryDialog( );
-	iDialogUp = 1;
-
-	if ( queryDialog->ExecuteLD( R_STARTQUERY_NOTE, delQuery->Des() ) ) 
-		{
-		TInt index = 0;
-		TInt result = iSyncDocument->DeleteProfile( index );
-		if ( result == KErrNone )
-			{
-            iProfilesView->RefreshL();
-			}
-		else
-			{
-			ShowErrorNoteL( result );
-			}
-		}
-	iDialogUp = 0;
-	iBusy = EFalse;
-	CleanupStack::PopAndDestroy( delQuery );
-    FLOG( "[OMADM] CNSmlDMSyncAppUi::HandleCommandEraseProfileL() completed" );
-    }
-    
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncAppUi::Synchronise
-// -----------------------------------------------------------------------------
-//
-TBool CNSmlDMSyncAppUi::Synchronise()
-    {
-    FLOG( "[OMADM] CNSmlDMSyncAppUi::Synchronise:" );
-    return iSyncAppEngine->SyncRunning();
-    }
-    
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncAppUi::SyncComplete
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncAppUi::SyncComplete( TNSmlStatus /* aStatus */ )                                      
-                                     
-    {
-    FLOG( "[OMADM] CNSmlDMSyncAppUi::SyncComplete()" );
-
-    TRAP_IGNORE( iSyncDocument->RefreshProfileListL() );
-    // The listbox should get at least an empty array in any case, so
-    // the result checking is not needed.
-    TRAP_IGNORE( iProfilesView->RefreshL() );
-    RProperty::Set( KPSUidNSmlDMSyncApp,
-                				    KServerAlertType,
-                    				KErrNotFound );
-    iSyncDocument->ResetSession();                				
-    TRAP_IGNORE( iMainView->RefreshL(ETrue) );
-    TInt Value;
-    TInt r=RProperty::Get(KPSUidNSmlDMSyncApp,KNSmlDMSyncUiLaunchKey,Value);    
-    if ( iSyncDocument->IsServerAlertSync() && Value == 1) //for Server alert launch case    
-        {
-        FLOG(  "[OMADM] CNSmlDMSyncAppUi::SyncComplete: RunAppShutter" );
-      //  TRAP_IGNORE( ExitCallL() );
-           	FLOG(  "CNSmlDMSyncAppUi::SyncComplete--SANSupport existed" );
-           	//new for fota case SAN Support
-           	TInt configFlags( EGenericSession  );
-        		CRepository* centrep = NULL;
-        		TRAPD( err, centrep = CRepository::NewL( KCRUidDeviceManagementInternalKeys ) );
-        		if ( centrep )
-            	{
-            	if( err == KErrNone )
-            	{
-            	centrep->Get( KDevManSessionType, configFlags );            
-            	centrep->Set( KDevManSessionType, EGenericSession  );
-              }
-              delete centrep;
-            	}      
-            // Check P&S Key set by Application Management. 
-           	// If P&S Key is set then indicates that DM UI should not be closed. Application Mgmt
-           	// Server will take care of closing DM UI
-           	const TUid KMyPropertyCat = {0x1020781C};
-			
-			const TUint KDMUINotClosed = 0x00005;
-			//enum TMyPropertyKeys {EMyPropertyInteger, EMyPropertyArray};
-	 	
-	 	
-	 		TInt valuekey = 0;
-			RProperty::Get(KMyPropertyCat, KDMUINotClosed, valuekey);
-		      
-           	
-           //new for fota case SAN Support
-           if( configFlags != EFotaPkgFound && !valuekey) //no update found
-              {
-            	FLOG(  "[OMADM] CNSmlDMSyncAppUi::SyncComplete: RunAppShutter::Sansupport" );            	
-            	TRAP_IGNORE( ExitCallL() );          	
-        	 	  CAknEnv::Static()->RunAppShutter();
-              }              
-           }
-    if ( Value == 3 )	
-        {
-       	Value = 2;
-       	RProperty::Set(KPSUidNSmlDMSyncApp,KNSmlDMSyncUiLaunchKey,Value);
-        }      
-
-    }
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncAppUi::RefreshMainViewL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncAppUi::RefreshMainViewL( )
-    {    
-    iMainView->RefreshL(ETrue);	
-    }
-
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncAppUi::CloseGs
-// -----------------------------------------------------------------------------
-//
-
-void CNSmlDMSyncAppUi::CloseGs()
-    {
-    TApaTaskList taskList( CEikonEnv::Static()->WsSession() );
-    TApaTask task(taskList.FindApp( KUidSmlSyncApp ) );
-    task.SetWgId( CEikonEnv::Static()->RootWin().Identifier() ); 
-    task.SendToBackground();
-    CAknEnv::Static()->RunAppShutter();	
-    }
-
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncAppUi::ExitCallL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncAppUi::ExitCallL( )
-    {    
-    iMainView->UpdateExitL();	    
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncAppUi::CheckFotaDlL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncAppUi::CheckFotaDlL()
-	{
-	FLOG( "CNSmlDMSyncAppUi::CheckFotaDlL : Begin" );
-	if( FeatureManager::FeatureSupported( KFeatureIdSyncMlDmFota ) )
-		{
-		//When Download is going on
-	    TInt value = KErrNotFound, err = KErrNotFound;
-	    err = RProperty::Get(KPSUidNSmlDMSyncApp,KFotaDLStatus,value);
-	    FTRACE( FPrint( _L("[OMADM]\t CNSmlDMSyncAppUi::CheckFotaDl() \
-	    KFotaDLStatus val = %d & err = %d"),
-	    value,err ) );
-	    if(!err && value == 1)
-	        {
-	        FLOG( "CNSmlDMSyncAppUi::CheckFotaDl Ongoing Fota operation\
-	        identified." );
-
-	        TApaTaskList taskList(CEikonEnv::Static()->WsSession());
-	        TApaTask task=taskList.FindApp(TUid::Uid(0x102072c4));
-	        if(task.Exists())
-	            {
-	            FLOG( "CNSmlDMSyncAppUi::CheckFotaDl Switching to FS \
-	            Download" );
-	            task.BringToForeground();
-	            }
-	        else
-	            FLOG( "CNSmlDMSyncAppUi::CheckFotaDl Inconsistency problem\
-	            need to debug" );
-	        }							
-
-	    else
-	        {
-	        FLOG("CNSmlDMSyncAppUi::CheckFotaDl  No ongoing Fota\
-	        operation identified!");
-	        }
-	    }
-	FLOG( "CNSmlDMSyncAppUi::CheckFotaDlL : End" );
-	}
-
-void CNSmlDMSyncAppUi::CheckAMDlL()
-  {
-  	
-  	FLOG( "CNSmlDMSyncAppUi::CheckAMDlL : Start" );
-  	const TUid KAppMgmtServerUid = {0x1020781C};
-	
-            
-              TInt silentoperation = 1;
-        	RProperty::Get( KPSUidNSmlDMSyncApp,
-                				    KServerAlertType,
-                    				silentoperation);
-	    
-	 	
-	 	const TUint KAMServerUIEnabled = 0x00001;
-	 	TInt newValue;
-		TInt err = RProperty::Get(KAppMgmtServerUid, KAMServerUIEnabled, newValue);
-		
-		if(!err && newValue && (silentoperation==KErrNotFound || silentoperation==1))
-		{
-	    	FLOG( "CNSmlDMSyncAppUi::CheckAMDlL : Entered:" );
-	    
-	    	if(silentoperation ==0)
-		{
-	    	FLOG( "CNSmlDMSyncAppUi::CheckAMDlL :silentoperation ==0" );
-		}
-	    	else
-		{
-	    	FLOG( "CNSmlDMSyncAppUi::CheckAMDlL :silentoperation not equal to 0" );
-		}	
-			
-		TApaTaskList taskList( CEikonEnv::Static()->WsSession() );
-    		TApaTask task = taskList.FindApp(KAppMgmtServerUid );
-    		const TInt id = task.WgId();
-		task.SetWgId(id);
-		
-		FTRACE( FPrint( _L("[OMADM]\t CNSmlDMSyncAppUi::CheckAMDlL() \
-	    	WGID val = %d"),
-	    	id ) );
-		
-    		if(task.Exists())
-    		{
-    		  FLOG( "CNSmlDMSyncAppUi::CheckAMDlL :task.Exists() : BringToForeground" );
-        	task.BringToForeground();
-        	}      
-     		} 
-  	
-  }
-// End of File
--- a/omadm/omadmappui/src/NSmlDMSyncAppUi_nofota.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,725 +0,0 @@
-/*
-* Copyright (c) 2005-2006 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:  Methods for Device Manager Application UI
-*
-*/
-
-
-#include <e32property.h>
-#include <APGWGNAM.H>
-#include <gsfwviewuids.h>
-#include "nsmldmsyncinternalpskeys.h"
-
-#include <aknnotewrappers.h>
-
-#include <aknnavide.h>
-#include <stringloader.h>
-#include <textresolver.h>
-
-#include "nsmldmsyncappui.h"
-#include "nsmldmsyncapp.h"
-#include "nsmldmsyncappengine.h"
-#include "nsmldmprofilesview.h"
-#include "nsmldmsyncdocument.h"
-#include "nsmldmdlgprofileview.h"
-#include "nsmldmsyncdebug.h"
-#include "nsmldmsyncdialog.h"
-#include "nsmldmsyncprofile.h"
-#include <nsmldmsync.rsg>
-#include <FeatMgr.h>
-
-#include <hlplch.h>
-#include <csxhelp/dm.hlp.hrh>
-
-
-// ============================ MEMBER FUNCTIONS ==============================
-//
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncAppUi::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncAppUi::ConstructL()
-    {
-    FLOG( "[OMADM] CNSmlDMSyncAppUi::ConstructL()" );
-
-    BaseConstructL( EAknEnableSkin | EAknEnableMSK );
-    iSyncDocument = (CNSmlDMSyncDocument*) iDocument;
-    iSyncAppEngine = iSyncDocument->AppEngine();
-    iSyncAppEngine->RequestSyncStatus( this );
-
-	iNaviDecorator = 0;
-
-    iProfilesView = new (ELeave) CNSmlDMProfilesView();
-    iProfilesView->ConstructL(); // this );
-    AddViewL( iProfilesView ); // Transfer ownership to CAknViewAppUi
-    
-    ActivateLocalViewL( iProfilesView->Id() );
-
-	iDialogUp       = 0;
-	iDestroyed      = 1;
-
-    FLOG( "[OMADM] CNSmlDMSyncAppUi::ConstructL() completed" );
-    }
-
-// ------------------------------------------------------------------------------
-// Destructor
-// ------------------------------------------------------------------------------
-
-CNSmlDMSyncAppUi::~CNSmlDMSyncAppUi()
-    {
-    FLOG( "[OMADM] ~CNSmlDMSyncAppUi()" );
-
-	delete iNaviDecorator;
-	if ( iDestroyed == 0 )
-		{
-		delete iAppView;
-		}
-	}
-
-
-
-// ------------------------------------------------------------------------------
-// CNSmlDMSyncAppUi::DynInitMenuPaneL
-// ------------------------------------------------------------------------------
-//
-void CNSmlDMSyncAppUi::DynInitMenuPaneL( TInt /*aResourceId*/,
-                                         CEikMenuPane* /*aMenuPane*/ )
-    {
-    FLOG( "[OMADM] CNSmlDMSyncAppUi::DynInitMenuPaneL:" );
-	}
-
-// ------------------------------------------------------------------------------
-// CNSmlDMSyncAppUi::HandleKeyEventL
-// ------------------------------------------------------------------------------
-//
-TKeyResponse CNSmlDMSyncAppUi::HandleKeyEventL( const TKeyEvent& aKeyEvent,
-                                            	TEventCode aType )
-    {
-    FLOG( "[OMADM] CNSmlDMSyncAppUi::HandleKeyEventL:" );
-
-	//EEventKeyDown ends settdialog
-	if ( iDialogUp != 0 ) 
-		{
-		return EKeyWasConsumed;
-		}
-	if ( aType == EEventKey )
-		{
-		switch ( aKeyEvent.iCode )
-			{
-			case EKeyUpArrow:
-				{
-				if ( !Synchronise() )
-					{
-					HandleUpScrollL();
-					}
-				}
-		    	break;
-
-			case EKeyDownArrow:
-				{
-				if ( !Synchronise() )
-					{
-					HandleDownScrollL();
-					}
-				}
-			    break;
-
-			case EKeyPhoneEnd:
-			case EKeyEscape:
-				{
-				if ( Synchronise() )
-					{
-					iSyncAppEngine->CancelSyncL();
-					}						
-				}
-			    break;
-			default:
-      
-				return EKeyWasNotConsumed;		
-			}
-		}
-    FLOG( "[OMADM] CNSmlDMSyncAppUi::HandleKeyEventL() completed" );
-    return EKeyWasNotConsumed;
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncAppUi::HandleCommandL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncAppUi::HandleCommandL( TInt aCommand )
-    {
-    FTRACE( FPrint(
-        _L("[OMADM] CNSmlDMSyncAppUi::HandleCommandL() command = 0x%x"),
-        aCommand ) );
-
-    iSyncDocument->DisableDbNotifications( ETrue );
-	iBusy = ETrue;
-
-    switch ( aCommand )
-        {
-     case EAknCmdHelp:              //ENSmlMenuCmdMainHelp:
-		  	{
-			  	if (FeatureManager::FeatureSupported( KFeatureIdHelp ))
-           {
-                 HlpLauncher::LaunchHelpApplicationL( iEikonEnv->WsSession(), AppHelpContextL() );
-			           iBusy = EFalse;
-			     }    
-			 
-			
-			  }
-    		break;
-		case EAknCmdExit:
-        case EEikCmdExit:		// quit application
-			{
-			TInt value=-1;
-            TInt r1=RProperty::Set(KPSUidNSmlDMSyncApp,KNSmlDMSyncUiLaunchKey,value);
-			Exit();
-			}
-		    break;
-		    
-		case ENSmlMenuCmdNewProfile:	// create new profile
-			{
-			if (TUtil::SettingEnforcementState())
-				{
-				ShowResourceErrorNoteL( R_QTN_DM_INFO_NOTE_LOCKED_SETTING );
-				break;
-				}
-            HandleCommandNewProfileL();
-			}
-		    break;
-
-		case ENSmlMenuCmdEraseProfile:	// delete profile
-			{
-			if (TUtil::SettingEnforcementState())
-				{
-				ShowResourceErrorNoteL( R_QTN_DM_INFO_NOTE_LOCKED_SETTING );
-				break;
-				}
-            HandleCommandEraseProfileL();
-			}
-    		break;
-		
-		case ENSmlMenuCmdOpenLog:			// open syncronisation log view
-			{
-			CNSmlDMSyncDialog::ShowDialogL( 
-            			      iSyncDocument->ProfileItem()->iProfileId,
-			                  iSyncAppEngine->Session() );
-			iBusy = EFalse;
-			}
-		    break;
-
-		case ENSmlMenuCmdOpenSettings:		// open profile for editing
-			{
-			if (TUtil::SettingEnforcementState())
-				{
-				ShowResourceErrorNoteL( R_QTN_DM_INFO_NOTE_LOCKED_SETTING );
-				break;
-				}
-			ShowEditProfileDialogL( ESmlEditProfile );
-			}
-		    break;
-		
-		case ENSmlMenuCmdStartSync:			// start synchronisation
-			{
-            if ( ShowConfirmationNoteL( R_QTN_SML_CONF_STARTQUERY ) )
-                {
-                StartSyncL();
-                }
-			}
-		    break;
-		
-		default:
-            break;      
-        }
-    iSyncDocument->DisableDbNotifications( EFalse );
-    FLOG( "[OMADM] CNSmlDMSyncAppUi::HandleCommandL() completed" );
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncAppUi::HandleUpScrollL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncAppUi::HandleUpScrollL()
-	{
-    FLOG( "[OMADM] CNSmlDMSyncAppUi::HandleUpScrollL:" );
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncAppUi::HandleDownScrollL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncAppUi::HandleDownScrollL()
-	{
-    FLOG( "[OMADM] CNSmlDMSyncAppUi::HandleDownScrollL:" );
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncAppUi::ShowEditProfileDialogL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncAppUi::ShowEditProfileDialogL( TNSmlEditMode aMode,
-                                               TInt /*aStartUp*/)
-	{
-    FLOG( "[OMADM] CNSmlDMSyncAppUi::ShowEditProfileDialogL:" );
-
-	TInt profileId( KErrNotFound );
-	if ( aMode != ESmlNewProfile )
-		{
-		profileId = iSyncDocument->ProfileItem()->iProfileId;
-		}
-    
-    iAppView = CNSmlDMDlgProfileView::NewL( 
-                                    iSyncDocument,
-	                                aMode,
-	                                profileId );
-	  	                               
-	TRAPD( error, iAppView->ExecuteLD( R_NSML_SETTING_DIALOG ) );
-	if ( error != KErrNone )
-		{
-		ShowErrorNoteL( error );
-		}
-	else
-		{
-		iBusy = ETrue;
-		iActiveView = CNSmlDMSyncAppUi::SettingsView;
-		AddToStackL( iAppView );
-		}
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncAppUi::ProcessCommandParametersL
-// -----------------------------------------------------------------------------
-//
-TBool CNSmlDMSyncAppUi::ProcessCommandParametersL( TApaCommand /*aCommand*/,
-                                                   TFileName& aDocumentName,
-                                                   const TDesC8& /*aTail*/ )
-	{
-    FLOG( "[OMADM] CNSmlDMSyncAppUi::ProcessCommandParametersL:" );
-
-	 // This is to prevent dummy document creation
-	aDocumentName.Zero();
-	return EFalse;
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncAppUi::StartSyncL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncAppUi::StartSyncL(
-    const TInt aProfileId, // = KErrNotFound
-    const TBool /*aUseFotaProgressNote*/ )
-	{
-    FTRACE( FPrint(
-        _L("[OMADM] CNSmlDMSyncAppUi::StartSyncL() aProfileId = %d"),
-        aProfileId ) );
-
-	if ( aProfileId == KErrNotFound )
-	    {
-        iConfedProfileId = iSyncDocument->ProfileItem()->iProfileId;
-	    }
-	else
-	    {
-	    iConfedProfileId = aProfileId;
-	    }
-
-    FTRACE( FPrint(
-        _L("[OMADM] CNSmlDMSyncAppUi::StartSyncL() used profileId = %d"),
-        iConfedProfileId ) );
-        
-	CNSmlDMSyncProfile* profile = 
-	            iSyncAppEngine->OpenProfileL( iConfedProfileId, ESmlOpenReadWrite );
-
-    TInt connectionBearer = profile->BearerType();
-    
-    TBuf<KNSmlMaxProfileNameLength> serverName;
-    profile->GetName( serverName );
-	
-	if ( profile->SASyncState() == ESASyncStateDisable )
-		{
-		if ( ShowConfirmationNoteL( R_QTN_SML_CONF_ACTIVEQUERY ) )
-			{
-			profile->SetSASyncStateL( ESASyncStateEnable );
-			profile->SaveL();
-			}
-		else
-			{
-			iSyncAppEngine->CloseProfile();
-			return;
-			}
-		}
-
-    iSyncAppEngine->CloseProfile();		
-    
-    // Since the FOTA is not supported, the simpler progress note
-    // is also never used and the EFalse can be given as parameter.
-    TRAPD( error, iSyncAppEngine->SynchronizeL( serverName, 
-                                                iConfedProfileId, 
-                                                connectionBearer,
-                                                EFalse ) );
-	
-	if (error == KErrNone)
-		{
-		iActiveView = CNSmlDMSyncAppUi::ProgressView;
-		}
-	else
-		{
-		ShowErrorNoteL( error );
-		iActiveView = CNSmlDMSyncAppUi::MainView;
-		}
-
-    FTRACE( FPrint(
-        _L("[OMADM] CNSmlDMSyncAppUi::StartSyncL() completed, error = %d"),
-        error ) );
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncAppUi::ChangeViewL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncAppUi::ChangeViewL(TBool aRefresh)
-	{
-    FLOG( "[OMADM] CNSmlDMSyncAppUi::ChangeViewL:" );
-
-	iActiveView = CNSmlDMSyncAppUi::MainView;
-	if ( aRefresh != EFalse )
-		{
-		iSyncDocument->RefreshProfileListL();
-        iProfilesView->RefreshL();
-		}
-	CAknTitlePane* titlePane = 
-	    (CAknTitlePane*) StatusPane()->ControlL( TUid::Uid( EEikStatusPaneUidTitle ) );
-	HBufC* titleText = NULL;    
-
-	if ( iViewTitle )
-	{
-	titleText = iEikonEnv->AllocReadResourceLC( R_SML_APP_TITLE );
-	iViewTitle = 0;	
-	}
-	else
-	{
-	titleText = iEikonEnv->AllocReadResourceLC( R_SML_PROFILES_TITLE );	
-	}	
-	
-	titlePane->SetTextL( titleText->Des() );
-	CleanupStack::PopAndDestroy(titleText);
-	iBusy = EFalse;
-
-    FLOG( "[OMADM] CNSmlDMSyncAppUi::ChangeViewL() completed" );
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncAppUi::ShowErrorNoteL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncAppUi::ShowErrorNoteL( TInt aError ) const
-	{
-    FLOG( "[OMADM] CNSmlDMSyncAppUi::ShowErrorNoteL:" );
-
-	TBuf<KNSmlMaxTextLength256> errMsg;	
-	SetErrorMessageL( aError, errMsg );	
-	CAknInformationNote* queryDialog = new (ELeave) CAknInformationNote;
-	queryDialog->ExecuteLD( errMsg );
-    FLOG( "[OMADM] CNSmlDMSyncAppUi::ShowErrorNoteL() completed" );
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncAppUi::SetErrorMessageL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncAppUi::SetErrorMessageL( TInt aError, TDes& aMsg ) const
-	{
-    FLOG( "[OMADM] CNSmlDMSyncAppUi::SetErrorMessageL:" );
-    CTextResolver* textResolver = CTextResolver::NewLC();
-    
-    aMsg.Append( textResolver->ResolveErrorString( aError,
-	                                         CTextResolver::ECtxNoCtx ) );
-	
-	CleanupStack::PopAndDestroy( textResolver );
-
-	HBufC* appTitle = iEikonEnv->AllocReadResourceLC( R_SML_APP_TITLE );
-	aMsg.Insert( 0, appTitle->Des() );
-	CleanupStack::PopAndDestroy( appTitle );
-    FTRACE( FPrint(
-        _L("[OMADM] CNSmlDMSyncAppUi::SetErrorMessageL() completed, aError = %d, aMsg ="),
-        aError ) );
-    FTRACE( FPrint(
-        _L("[OMADM] \"%S\""),
-        &aMsg ) );
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncAppUi::HelpContextL
-// -----------------------------------------------------------------------------
-//
-
-CArrayFix<TCoeHelpContext>* CNSmlDMSyncAppUi::HelpContextL() const
-	{
-	CArrayFixFlat<TCoeHelpContext>* array = 
-	                            new (ELeave) CArrayFixFlat<TCoeHelpContext>(1);
-	array->AppendL( TCoeHelpContext( KUidSmlSyncApp, KDM_HLP_MAIN_VIEW ) );
-	array->AppendL( TCoeHelpContext( KUidSmlSyncApp, KFOTA_HLP_SETTINGS ) );
-	array->AppendL( TCoeHelpContext( KUidSmlSyncApp, KDM_HLP_SERVERS_VIEW ) );
-	array->AppendL( TCoeHelpContext( KUidSmlSyncApp, KDM_HLP_SETTINGS ) );
-	return array;
-	}
-
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncAppUi::ShowResourceErrorNoteL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncAppUi::ShowResourceErrorNoteL(TInt aResource) const
-    {
-    FLOG( "[OMADM] CNSmlDMSyncAppUi::ShowResourceErrorNoteL:" );
-
-	HBufC* errorText = iEikonEnv->AllocReadResourceLC( aResource );
-	CAknInformationNote* queryDialog = new (ELeave) CAknInformationNote;
-	queryDialog->ExecuteLD( errorText->Des() );
-	CleanupStack::PopAndDestroy( errorText );
-
-    FLOG( "[OMADM] CNSmlDMSyncAppUi::ShowResourceErrorNoteL() completed" );
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncAppUi::FotaModel
-// This function is included for header file compliance with the version that
-// implements the FOTA feature. Should not be created in any case and
-// therefore returns always NULL.
-// -----------------------------------------------------------------------------
-//
-CNSmlDMFotaModel* CNSmlDMSyncAppUi::FotaModel() const
-    {
-    return NULL;
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncAppUi::MarkFwUpdChangesStartL
-// This function is included for header file compliance with the version that
-// implements the FOTA feature. Does nothing here.
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncAppUi::MarkFwUpdChangesStartL()
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncAppUi::FwUpdStatesChangedL
-// This function is included for header file compliance with the version that
-// implements the FOTA feature. Returns always EFalse.
-// -----------------------------------------------------------------------------
-//
-TBool CNSmlDMSyncAppUi::FwUpdStatesChangedL()
-    {
-    return EFalse;
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncAppUi::ShowConfirmationNoteL
-// -----------------------------------------------------------------------------
-//
-TBool CNSmlDMSyncAppUi::ShowConfirmationNoteL( TInt aResource ) const
-    {
-    FLOG( "[OMADM] CNSmlDMSyncAppUi::ShowConfirmationNoteL:" );
-
-	HBufC* queryText = iEikonEnv->AllocReadResourceLC( aResource );
-	CAknQueryDialog* queryDialog = new (ELeave) CAknQueryDialog();
-
-	TBool retValue = queryDialog->ExecuteLD( R_STARTQUERY_NOTE,
-	                                         queryText->Des() );
-	CleanupStack::PopAndDestroy( queryText );
-    FTRACE( FPrint(
-        _L("[OMADM] CNSmlDMSyncAppUi::ShowConfirmationNoteL() completed, retval = %d"),
-        retValue ) );
-	return retValue;
-	}
-	
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncAppUi::HandleCommandNewProfileL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncAppUi::HandleCommandNewProfileL()
-    {
-    FLOG( "[OMADM] CNSmlDMSyncAppUi::HandleCommandNewProfileL:" );
-    
-	if ( iSyncDocument->ProfileCount() != 0 )
-		{
-		HBufC* delQuery = StringLoader::LoadL( 
-		    R_QTN_SML_APPUI_COPY,
-		    iSyncDocument->ProfileItem()->iProfileName );
-		CleanupStack::PushL( delQuery );
-		
-		CAknQueryDialog* queryDialog = new (ELeave) CAknQueryDialog();
-		iDialogUp = 1;
-		
-		if ( queryDialog->ExecuteLD( R_STARTQUERY_NOTE, delQuery->Des() ) )  
-			{
-			iDialogUp = 0;
-			ShowEditProfileDialogL( ESmlCopyProfile );					
-			}
-		else
-			{
-			iDialogUp = 0;
-			ShowEditProfileDialogL( ESmlNewProfile );	
-			}
-		CleanupStack::PopAndDestroy( delQuery );
-		}
-	else
-		{
-		iDialogUp = 0;
-		ShowEditProfileDialogL( ESmlNewProfile );	
-		}
-	
-    FLOG( "[OMADM] CNSmlDMSyncAppUi::HandleCommandNewProfileL() completed" );
-    }
-    
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncAppUi::HandleCommandEraseProfileL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncAppUi::HandleCommandEraseProfileL()
-    {
-    FLOG( "[OMADM] CNSmlDMSyncAppUi::HandleCommandEraseProfileL:" );
-    
-	HBufC* delQuery = StringLoader::LoadL(
-	    R_SML_APPUI_NOTE_TEXT_DEL,
-	    iSyncDocument->ProfileItem()->iProfileName );
-	CleanupStack::PushL( delQuery );
-	
-	CAknQueryDialog* queryDialog = new (ELeave) CAknQueryDialog( );
-	iDialogUp = 1;
-
-	if ( queryDialog->ExecuteLD( R_STARTQUERY_NOTE, delQuery->Des() ) ) 
-		{
-		TInt index = 0;
-		TInt result = iSyncDocument->DeleteProfile( index );
-		if ( result == KErrNone )
-			{
-            iProfilesView->RefreshL();
-			}
-		else
-			{
-			ShowErrorNoteL( result );
-			}
-		}
-	iDialogUp = 0;
-	iBusy = EFalse;
-	CleanupStack::PopAndDestroy( delQuery );
-    FLOG( "[OMADM] CNSmlDMSyncAppUi::HandleCommandEraseProfileL() completed" );
-    }
-    
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncAppUi::Synchronise
-// -----------------------------------------------------------------------------
-//
-TBool CNSmlDMSyncAppUi::Synchronise()
-    {
-    FLOG( "[OMADM] CNSmlDMSyncAppUi::Synchronise:" );
-    return iSyncAppEngine->SyncRunning();
-    }
-    
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncAppUi::SyncComplete
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncAppUi::SyncComplete( TNSmlStatus aStatus )
-    {
-    FLOG( "[OMADM] CNSmlDMSyncAppUi::SyncComplete()" );
-
-    TRAP_IGNORE( iSyncDocument->RefreshProfileListL() );
-    // The listbox should get at least an empty array in any case, so
-    // the result checking is not needed.
-    TRAP_IGNORE( iProfilesView->RefreshL() );
-
-    TInt Value;
-    TInt r=RProperty::Get(KUidSmlSyncApp,0,Value);    
-    if ( iSyncDocument->IsServerAlertSync() && Value == 1) //for Server alert launch case    
-        {
-        FLOG(  "[OMADM] CNSmlDMSyncAppUi::SyncComplete: RunAppShutter" );
-        CAknEnv::Static()->RunAppShutter();        
-        }      
-
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncAppUi::CloseGs
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncAppUi::CloseGs()
-    {    
-    TApaTaskList taskList( CEikonEnv::Static()->WsSession() );
-    TApaTask task(taskList.FindApp( KUidSmlSyncApp ) );
-    task.SetWgId( CEikonEnv::Static()->RootWin().Identifier() ); 
-    task.SendToBackground();
-    CAknEnv::Static()->RunAppShutter();	
-    }
-
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncAppUi::ExitCallL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncAppUi::ExitCallL( )
-    {
-    //Dummy Should not be used if fota disabled
-    }
-    
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncAppUi::CheckFotaDlL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncAppUi::CheckFotaDlL()
-	{
-	//Dummy Should not be used if fota disabled
-	}
-
-void CNSmlDMSyncAppUi::CheckAMDlL()
-  {
-  	
-  	FLOG( "CNSmlDMSyncAppUi::CheckAMDlL : Start" );
-  	const TUid KAppMgmtServerUid = {0x1020781C};
-	
-            
-            TInt silentoperation = 1;
-        	RProperty::Get( KPSUidNSmlDMSyncApp,
-                				    KServerAlertType,
-                    				silentoperation);
-	    
-	 	
-	 	const TUint KAMServerUIEnabled = 0x00001;
-	 	TInt newValue;
-		TInt err = RProperty::Get(KAppMgmtServerUid, KAMServerUIEnabled, newValue);
-		
-		if(!err && newValue && (silentoperation==KErrNotFound || silentoperation==1))
-		{
-	    FLOG( "CNSmlDMSyncAppUi::CheckAMDlL : Entered:" );
-	    
-	    if(silentoperation ==0)
-	    FLOG( "CNSmlDMSyncAppUi::CheckAMDlL :silentoperation ==0" );
-	    else
-	    FLOG( "CNSmlDMSyncAppUi::CheckAMDlL :silentoperation not equal to 0" );
-			
-			TApaTaskList taskList( CEikonEnv::Static()->WsSession() );
-    		TApaTask task = taskList.FindApp(KAppMgmtServerUid );
-    
-    		if(task.Exists())
-    		{
-    		  FLOG( "CNSmlDMSyncAppUi::CheckAMDlL :task.Exists() : BringToForeground" );
-        	task.BringToForeground();
-        }      
-     } 
-  	
-  }
-// End of File
--- a/omadm/omadmappui/src/NSmlDMSyncDialog.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,258 +0,0 @@
-/*
-* Copyright (c) 2005-2006 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:  Methods for Sync Log handler class
-*
-*/
-
-
-// INCLUDE FILES
-
-#include "NSmlDMSyncDialog.h"
-#include "NSmlDMSyncUtil.h"
-#include <NSmlDMSync.rsg>
-#include "NSmlDMSyncProfile.h"
-#include "NSmlDMSyncDebug.h"
-
-#include <aknPopup.h>
-#include <aknlists.h>
-#include <StringLoader.h>
-
-// -----------------------------------------------------------------------------
-// ShowDialogL
-// -----------------------------------------------------------------------------
-//
-TBool CNSmlDMSyncDialog::ShowDialogL( TInt aProfileId,
-                                      RSyncMLSession* aSyncSession )
-	{
-	CNSmlDMSyncDialog* dialog = CNSmlDMSyncDialog::NewL( aProfileId,
-	                                                     aSyncSession );
-	CleanupStack::PushL( dialog );
-	dialog->PopupLogViewL();
-	CleanupStack::PopAndDestroy( dialog );
-    return ETrue;
-	}
-
-// -----------------------------------------------------------------------------
-// NewL
-// -----------------------------------------------------------------------------
-//
-CNSmlDMSyncDialog* CNSmlDMSyncDialog::NewL( TInt aProfileId,
-                                            RSyncMLSession* aSyncSession )
-    {
-    CNSmlDMSyncDialog* self = new ( ELeave ) CNSmlDMSyncDialog( aProfileId,
-                                                                aSyncSession );
-    CleanupStack::PushL(self);
-    self->ConstructL();
-    CleanupStack::Pop();
-    return(self);
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncDialog
-// -----------------------------------------------------------------------------
-//
-CNSmlDMSyncDialog::CNSmlDMSyncDialog( TInt aProfileId,
-                                      RSyncMLSession* aSyncSession )
-	{
-    iProfileId = aProfileId;
-	iSyncSession = aSyncSession;
-
-	__ASSERT_DEBUG(iSyncSession, TUtil::Panic(KErrArgument));
-    }
-
-// -----------------------------------------------------------------------------
-// Symbian OS default constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncDialog::ConstructL()
-    {
-    FLOG( "CNSmlDMSyncDialog::ConstructL()" );
-    
-    iLogItems = CEikonEnv::Static()->ReadDesCArrayResourceL( R_SML_LOG_ITEMS );
-
-    iProfile = CNSmlDMSyncProfile::NewL( KUidSmlSyncApp.iUid, iSyncSession );
-   	iProfile->OpenL( iProfileId, ESmlOpenReadWrite );
-   	
-	iHistoryJob = iProfile->LatestHistoryJob();
-   	if ( !iHistoryJob )
-   		{
-   		FLOG( "CNSmlDMSyncDialog::ConstructL() KErrNotFound" );
-   		User::Leave( KErrNotFound );
-   		}
-    } 
-
-// ----------------------------------------------------------------------------
-// Destructor
-// ----------------------------------------------------------------------------
-//
-CNSmlDMSyncDialog::~CNSmlDMSyncDialog()
-    {
-	delete iLogItems;
-	delete iProfile;
-    }
-
-// -----------------------------------------------------------------------------
-// PopupLogViewL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncDialog::PopupLogViewL()
-	{
-	FLOG( "CNSmlDMSyncDialog::PopupLogViewL()" );
-	
-	CAknSingleHeadingPopupMenuStyleListBox* listBox = 
-	                       new (ELeave) CAknSingleHeadingPopupMenuStyleListBox;
-	CleanupStack::PushL( listBox );
-
-	CAknPopupList* popupList = CAknPopupList::NewL( 
-	                                            listBox,
-	                                            R_AVKON_SOFTKEYS_OK_EMPTY__OK,
-	                                            AknPopupLayouts::EMenuWindow );
-	CleanupStack::PushL( popupList );
-
-	listBox->ConstructL( popupList, EAknListBoxViewerFlags );
-	
-	CDesCArray* array = ( CDesCArray* )listBox->Model()->ItemTextArray();
-	listBox->CreateScrollBarFrameL( ETrue );
-	listBox->ScrollBarFrame()->SetScrollBarVisibilityL( 
-	                                               CEikScrollBarFrame::EOff,
-	                                               CEikScrollBarFrame::EAuto );
-
-	// read synclog and trap error if there aren't any content types
-	TRAP_IGNORE( FormatLogViewListL( array ) );
-
-	FLOG( "CNSmlDMSyncDialog::PopupLogViewL() set title" );
-	
-    HBufC* titleText = StringLoader::LoadLC( R_SML_LOG_SYNCLOG_TITLE );
-    popupList->SetTitleL( titleText->Des() );
-    CleanupStack::PopAndDestroy( titleText );
-    popupList->ExecuteLD();
-	
-	CleanupStack::Pop( popupList );
-	CleanupStack::PopAndDestroy( listBox );
-	
-	FLOG( "CNSmlDMSyncDialog::PopupLogViewL() Done" );
-	}
-
-// -----------------------------------------------------------------------------
-// FormatLogViewListL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncDialog::FormatLogViewListL( CDesCArray* aArray )
-	{
-	FLOG( "CNSmlDMSyncDialog::FormatLogViewListL()" );
-	
-	TBuf<KBufSize> buf( KNullDesC );
-	TInt num = KErrNotFound;
-
-	aArray->Reset();
-	TBuf<KBufSize256> tempBuf;
-	
-	tempBuf.Append( (*iLogItems)[EHeadingProfile] );	//profile name heading
-	tempBuf.Append( KNSmlTab );
-	FLOG( "CNSmlDMSyncDialog::FormatLogViewListL() get name" );
-	iProfile->GetName( buf );
-	tempBuf.Append( buf );
-	AknTextUtils::DisplayTextLanguageSpecificNumberConversion( tempBuf );
-	aArray->AppendL( tempBuf );
-    
-	tempBuf.Zero();
-	tempBuf.Append( (*iLogItems)[EHeadingServer] );  // server name heading
-	tempBuf.Append( KNSmlTab );
-
-	iProfile->GetHostAddress( buf, num );
-	tempBuf.Append( buf );
-	aArray->AppendL( tempBuf );
-	
-	TTime time = iHistoryJob->TimeStamp();
-	
-	TUtil::GetDateTextL(buf, time);
-	tempBuf.Zero();
-	tempBuf.Append( (*iLogItems)[EHeadingDate] );	// synchronisation date heading
-	tempBuf.Append( KNSmlTab );
-	tempBuf.Append( buf );
-	AknTextUtils::DisplayTextLanguageSpecificNumberConversion(tempBuf);
-	aArray->AppendL(tempBuf);
-
-    TUtil::GetTimeTextL(buf, time);
-
-	tempBuf.Zero();
-	tempBuf.Append((*iLogItems)[EHeadingTime]);	// synchronisation time heading
-	tempBuf.Append(KNSmlTab);
-	tempBuf.Append(buf);
-
-	AknTextUtils::DisplayTextLanguageSpecificNumberConversion( tempBuf );
-	aArray->AppendL(tempBuf);
-
-	// check sync error
-	TInt status = iHistoryJob->ResultCode();
-	TInt syncTaskError = KErrNone;
-	TInt count = iHistoryJob->TaskCount();
-	for (TInt i=0; i<count; i++)
-		{
-		const CSyncMLHistoryJob::TTaskInfo& taskInfo = iHistoryJob->TaskAt(i);
-		if (taskInfo.iError != KErrNone)
-			{
-			syncTaskError = taskInfo.iError;
-		    }
-		}
-    iProfile->CloseHistoryLog();
-    
-	tempBuf.Zero();
-	tempBuf.Append((*iLogItems)[EHeadingStatus]); // status heading
-	tempBuf.Append(KNSmlTab);	
-		
-	if ( status != KErrNone )
-		{
-		if ( status == KErrCancel )
-			{
-			ReadL( buf, R_QTN_SML_LOG_CANCELLED );
-			}
-		else
-			{
-			ReadL( buf, R_QTN_SML_LOG_ERR );
-			}
-		tempBuf.Append( buf );
-		aArray->AppendL( tempBuf );
-		return;
-		}
-	else if ( syncTaskError != KErrNone )
-		{
-        ReadL( buf, R_QTN_SML_LOG_ERR );
-		tempBuf.Append( buf);
-		aArray->AppendL( tempBuf );
-		}
-    else
-    	{
-        ReadL( buf, R_QTN_SML_LOG_OK );
-	    tempBuf.Append( buf );
-	    aArray->AppendL( tempBuf );
-    	}
-	
-	FLOG( "CNSmlDMSyncDialog::FormatLogViewListL() Done" );
-	}
-	
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncDialog::ReadL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncDialog::ReadL( TDes& aText, TInt aResourceId )
-    {
-    FLOG( "CNSmlDMSyncDialog::ReadL()" );
-    
-    HBufC* buf = StringLoader::LoadLC( aResourceId );
-    TUtil::StrCopy( aText, *buf );
-    CleanupStack::PopAndDestroy( buf );
-    }
-
-//  End of File  
--- a/omadm/omadmappui/src/NSmlDMSyncDocument.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,811 +0,0 @@
-/*
-* Copyright (c) 2002-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:  Methods for CNSmlDMSyncDocument
-*
-*/
-
-
-// INCLUDE FILES
-#include <StringLoader.h>
-#include <eikenv.h>
-#include <centralrepository.h>
-#include <SyncMLNotifierDomainCRKeys.h>
-
-#include <e32const.h>
-#include <DevManInternalCRKeys.h>
-#include <e32property.h>
-#include "nsmldmsyncinternalpskeys.h"
-#include "NSmlDMSyncApp.h"
-#include "NSmlDMSyncAppEngine.h"
-#include "NSmlDMSyncDocument.h"
-#include "NSmlDMSyncAppUi.h"
-#include "NSmlDMSyncProfileList.h"
-#include "NSmlDMSyncProfile.h"
-#include "NSmlDMSyncDebug.h"
-#include <NSmlDMSync.rsg>
-#include <SyncService.h>
-#include <SyncServiceParams.h>
-#include <coreapplicationuisdomainpskeys.h>
-
-
-// ================= MEMBER FUNCTIONS =======================
-
-// -----------------------------------------------------------------------------
-// Desctructor
-// -----------------------------------------------------------------------------
-//
-CNSmlDMSyncDocument::~CNSmlDMSyncDocument()
-    {
-    FLOG( "[OMADM] CNSmlDMSyncDocument::~CNSmlDMSyncDocument" );
-    
-    TInt err = RProperty::Delete(KPSUidNSmlDMSyncApp,KServerAlertType);
-    FTRACE( FPrint(
-            _L("CNSmlDMSyncDocument::~CNSmlDMSyncDocument KServerAlertType key deletion with error err = %d"),err ) );
-    err = RProperty::Delete(KPSUidNSmlDMSyncApp, KFotaDLStatus);
-    FTRACE( FPrint(
-            _L("CNSmlDMSyncDocument::~CNSmlDMSyncDocumentKFotaDLStatus key deletion with error err = %d"),err ) );
-   //IAD****
-   
-   err = RProperty::Delete(KPSUidNSmlDMSyncApp, KDMIdle);         
-            
-    err = RProperty::Delete(KPSUidNSmlDMSyncApp, KFotaDLRefresh);
-    FTRACE( FPrint(
-            _L("CNSmlDMSyncDocument::~CNSmlDMSyncDocumentKFotaDLRefresh key deletion with error err = %d"),err ) );
-    err = RProperty::Delete(KPSUidNSmlDMSyncApp, KDmJobCancel);
-    
-    err = RProperty::Delete(KPSUidNSmlDMSyncApp, KSilentSession);
-    
-    FTRACE( FPrint(
-            _L("CNSmlDMSyncDocument::~CNSmlDMSyncDocument KDmJobCancel key deletion with error err = %d"),err ) );
-    delete iDbNotifier;
-    delete iSyncProfileList;
-	delete iAppEngine;
-	if ( iProfileList )
-	    {
-	    iProfileList->Reset();
-	    delete iProfileList;
-	    }
-    delete iServer;
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncDocument::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncDocument::ConstructL()
-    {
-    FLOG( "[OMADM] CNSmlDMSyncDocument::ConstructL" );
-    
-    iAppEngine = CNSmlDMSyncAppEngine::NewL( this );
-    iSyncProfileList = CNSmlDMSyncProfileList::NewL( iAppEngine );
-    iSilent = EFalse;
-    iDbEventsBlocked = EFalse;
-    iDbNotifier = CNSmlDMDbNotifier::NewL( iAppEngine->Session(), this );
-    iDbNotifier->RequestL();
-
-    iProfileList = new (ELeave) CArrayFixFlat< TNSmlDMProfileItem >(1);
-    iCurrentIndex = 0;
-    iEikEnv = CEikonEnv::Static();
-    iOldProfileId = KErrNotFound;
-    //SAN Spport
-    TInt SanSupport( KErrNone );
-    CRepository* centrep = NULL;
-    TRAPD( err, centrep = CRepository::NewL( KCRUidDeviceManagementInternalKeys) );    
-    if( err == KErrNone )
-       {
-    centrep->Get( KDevManSANUIBitVariation, SanSupport );
-       }
-    delete centrep;
-    iSanSupport = SanSupport;
-    
-        _LIT_SECURITY_POLICY_S0( KWritePolicy, KUidSmlSyncApp.iUid );
-        _LIT_SECURITY_POLICY_C1( KReadPolicy, ECapabilityReadDeviceData );
-        _LIT_SECURITY_POLICY_C1( KWritePolicy1, ECapabilityWriteDeviceData );
-        RProperty::Define( KPSUidNSmlDMSyncApp,
-                           KServerAlertType,
-                           RProperty::EInt,
-                           KReadPolicy,
-                           KWritePolicy );
-    
-     RProperty::Set( KPSUidNSmlDMSyncApp,
-                				    KServerAlertType,
-                    				KErrNotFound );   	
-	err  = RProperty::Define( KPSUidNSmlDMSyncApp,
-			KFotaDLRefresh,
-			RProperty::EInt,KReadPolicy,KWritePolicy1); 
-	TInt err1 = KErrNotFound;
-	//if key defined then only set from DMUI, other wise fota sets it
-	if( err == KErrNone ) 
-		{
-		iDMDefinesFotaDLKey = ETrue;
-		err1 =      RProperty::Set( KPSUidNSmlDMSyncApp,
-				KFotaDLRefresh,KErrNone );    		 
-		}
-	FTRACE( FPrint(
-			_L("KFotaDLRefresh setting err = %d, err1 = %d"),err, err1 ) );
-//IAD ******//
-err  = RProperty::Define( KPSUidNSmlDMSyncApp,
-			KDMIdle,
-			RProperty::EInt); 
-err1 =  RProperty::Set( KPSUidNSmlDMSyncApp,
-			KDMIdle,KErrNone );
- if (err1)
- {
-  FTRACE( FPrint(
-			_L("error in setting = %d, err1 = %d"),err, err1 ) );			
-
- }			 
-FTRACE( FPrint(
-			_L("KDMIdle setting err = %d, err1 = %d"),err, err1 ) );			
-			  
-
-	err  = RProperty::Define( KPSUidNSmlDMSyncApp,
-			KFotaDLStatus,
-			RProperty::EInt,KReadPolicy,KWritePolicy1); 
-	err1 =  RProperty::Set( KPSUidNSmlDMSyncApp,
-			KFotaDLStatus,KErrNotFound );   
-
-    FLOG( "[OMADM] CNSmlDMSyncDocument::ConstructL() completed" );
-	FTRACE( FPrint(
-			_L("KFotaDLStatus setting err = %d, err1 = %d"),err, err1 ) );
-	err  = RProperty::Define( KPSUidNSmlDMSyncApp,
-			KDmJobCancel,
-			RProperty::EInt,KReadPolicy,KWritePolicy1); 
-	err1 =  RProperty::Set( KPSUidNSmlDMSyncApp,
-			KDmJobCancel, KErrNone );   
-			
-	// Define new P&S key to know whether these DM session started in Silent or
-	// User Interactive mode
-	
-	RProperty::Define( KPSUidNSmlDMSyncApp,
-                           KSilentSession,
-                           RProperty::EInt);
-	FTRACE( FPrint(
-			_L("KDmJobCancel setting err = %d, err1 = %d"),err, err1 ) );	
-    FLOG( "[OMADM] CNSmlDMSyncDocument::ConstructL() completed" );
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncDocument::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CNSmlDMSyncDocument* CNSmlDMSyncDocument::NewL( CAknApplication& aApp )
-    {
-    FLOG( "[OMADM] CNSmlDMSyncDocument::NewL:" );
-
-	CNSmlDMSyncDocument* self = new (ELeave) CNSmlDMSyncDocument( aApp );
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop();  //self
-
-    FLOG( "[OMADM] CNSmlDMSyncDocument::NewL() completed" );
-    return self;
-	}
-    
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncDocument::CreateAppUiL
-// -----------------------------------------------------------------------------
-//
-CEikAppUi* CNSmlDMSyncDocument::CreateAppUiL()
-    {
-    FLOG( "[OMADM] CNSmlDMSyncDocument::CreateAppUiL:" );
-    
-	return new (ELeave) CNSmlDMSyncAppUi;
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncDocument::DeleteProfile
-// -----------------------------------------------------------------------------
-//
-TInt CNSmlDMSyncDocument::DeleteProfile( TInt& aIndex )
-	{
-    FTRACE( FPrint(
-        _L("[OMADM] CNSmlDMSyncDocument::DeleteProfile(), index = %d"),
-        aIndex ) );
-        
-    TInt retVal = KErrNotFound;
-	if ( iProfileList->Count() <= 0 )
-		{
-		return retVal;
-		}
-	TRAP( retVal, iAppEngine->DeleteProfileL( 
-	                            (*iProfileList)[iCurrentIndex].iProfileId ) );
-	if ( retVal == KErrNone )
-		{
-		TRAP( retVal, ReadProfileListL() );
-    	if ( retVal == KErrNone )
-    		{		
-    		if ( iCurrentIndex > iProfileList->Count() - 1 )
-    			{
-    			iCurrentIndex--;
-    			}
-    		aIndex = iCurrentIndex;
-    		}
-		}
-
-    FTRACE( FPrint(
-        _L("[OMADM] CNSmlDMSyncDocument::DeleteProfile() completed, retval = %d, index = %d"),
-        retVal, iCurrentIndex ) );
-	return retVal;
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncDocument::ReadProfileListL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncDocument::ReadProfileListL()
-	{
-	ReadProfileListL( EFalse );
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncDocument::ReadProfileListL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncDocument::ReadProfileListL( TBool aIncludeHidden )
-	{
-	FLOG( "[OMADM] CNSmlDMSyncDocument::ReadProfileListL:" );
-
-	iProfileList->Reset();
-
-	TKeyArrayFix key(_FOFF( TNSmlDMProfileItem, iProfileName ), ECmpFolded16 );
-	iProfileList->Sort(key);
-
-    iSyncProfileList->Reset();
-	
-	TRAPD( error, iSyncProfileList->ReadProfileItemsL( aIncludeHidden ) );
-	if ( error != KErrNone )
-	    {
-	    iSyncProfileList->Reset();
-	    }
-	
-	//read profile values
-	for ( TInt index = 0; index < iSyncProfileList->Count(); index++ )
-		{
-	    TNSmlDMProfileItem profile;
-		profile.iProfileName = iSyncProfileList->Item( index ).iProfileName;
-		if ( profile.iProfileName.Length() == 0 )
-			{
-			StringLoader::Load( profile.iProfileName, R_QTN_APPS_EMPTYPROFILE );
-			}		
-    	profile.iProfileId   = iSyncProfileList->Item( index ).iProfileId;
-		profile.iBearer		 = iSyncProfileList->Item( index ).iBearer;
-		profile.iSynced      = iSyncProfileList->Item( index ).iSynced;
-		profile.iLastSync	 = iSyncProfileList->Item( index ).iLastSync;
-		profile.iLastSuccessSync	 = iSyncProfileList->Item( index ).iLastSuccessSync;
-		profile.iActive		 = iSyncProfileList->Item( index ).iActive;
-        profile.iDeleteAllowed =  iSyncProfileList->Item( index ).iDeleteAllowed;
-        profile.iProfileLocked =  iSyncProfileList->Item( index ).iProfileLocked;
-        
-		TInt start = 0;
-		TBool found( EFalse );
-		
-		if ( iProfileList->Count() == 0 )
-			{
-			iProfileList->AppendL ( profile );		
-			}
-		else
-			{
-			while ( ( start < iProfileList->Count() ) && ( !found ) )
-				{
-				if ( iAppEngine->Compare( profile.iProfileName,
-				     iProfileList->At( start ).iProfileName ) < 1 )
-					{
-					iProfileList->InsertL( start, profile );
-					found = ETrue;
-					}
-				start++;
-				}
-			if ( !found ) //insert to the end of the list
-				{
-				iProfileList->AppendL( profile );
-				}
-			}
-		}
-	FLOG( "[OMADM] CNSmlDMSyncDocument::ReadProfileListL() completed" );
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncDocument::ProfileItem
-// -----------------------------------------------------------------------------
-//
-TNSmlDMProfileItem* CNSmlDMSyncDocument::ProfileItem() const
-	{
-    FTRACE( FPrint(
-        _L("[OMADM] CNSmlDMSyncDocument::ProfileItem() iProfileList = 0x%x"),
-        iProfileList ) );
-	
-	if ( iProfileList->Count() > 0 )
-		{
-		return &( *iProfileList )[ iCurrentIndex ];
-		}
-	return 0;
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncDocument::ProfileItemAt
-// -----------------------------------------------------------------------------
-//
-TNSmlDMProfileItem* CNSmlDMSyncDocument::ProfileItemAt( TInt aIndex ) const
-	{
-	FLOG( "[OMADM] CNSmlDMSyncDocument::ProfileItemAt:" );
-	
-	if ( ( iProfileList->Count() > 0 ) &&
-	   ( ( aIndex >= 0 ) &&
-	   ( aIndex < iProfileList->Count() ) ) )
-		{
-		return &( *iProfileList )[aIndex];
-		}
-	return 0;
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncDocument::FotaModel
-// -----------------------------------------------------------------------------
-//
-CNSmlDMFotaModel* CNSmlDMSyncDocument::FotaModel() const
-    {
-    return ((CNSmlDMSyncAppUi*) iAppUi)->FotaModel();
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncDocument::MarkFwUpdChangesStartL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncDocument::MarkFwUpdChangesStartL()
-    {
-    ((CNSmlDMSyncAppUi*) iAppUi)->MarkFwUpdChangesStartL();
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncDocument::FwUpdStatesChangedL
-// -----------------------------------------------------------------------------
-//
-TBool CNSmlDMSyncDocument::FwUpdStatesChangedL()
-    {
-    return ((CNSmlDMSyncAppUi*) iAppUi)->FwUpdStatesChangedL();
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncDocument::ProfileList
-// -----------------------------------------------------------------------------
-//
-CArrayFixFlat< TNSmlDMProfileItem >* CNSmlDMSyncDocument::ProfileList( 
-                                                                  TInt& aIndex )
-	{
-	FLOG( "[OMADM] CNSmlDMSyncDocument::ProfileList:" );
-	
-	if ( iCurrentIndex < 0 )
-		{
-		iCurrentIndex = 0;
-		}
-	aIndex = iCurrentIndex; 
-
-	FLOG( "[OMADM] CNSmlDMSyncDocument::ProfileList() completed" );
-	return iProfileList; 
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncDocument::SetCurrentIndex
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncDocument::SetCurrentIndex( TInt aIndex ) 
-	{
-	FLOG( "[OMADM] CNSmlDMSyncDocument::SetCurrentIndex:" );
-	
-	if ( ( aIndex > -1 ) && ( aIndex < iProfileList->Count() ) )
-		{
-		iCurrentIndex = aIndex; 
-		}
-    FTRACE( FPrint(
-        _L("[OMADM] CNSmlDMSyncDocument::SetCurrentIndex() completed, index = %d"),
-        iCurrentIndex ) );
-	}
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSyncDocument::MoveIndexToProfile
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncDocument::MoveIndexToProfile( TInt aProfileId )
-	{
-    FTRACE( FPrint(
-        _L("[OMADM] CNSmlDMSyncDocument::MoveIndexToProfile(), aProfileId = %d"),
-        aProfileId ) );
-	
-	TInt index = 0;
-	TRAP_IGNORE( ReadProfileListL() );//new fix for the error  ELGO-6ZK8BD
-	TInt profileCount = iProfileList->Count();
-	
-	while ( ( index < profileCount ) &&
-	      ( (*iProfileList)[index].iProfileId != aProfileId ) )
-		{
-		index++;
-		}
-	if ( index < profileCount )
-		{
-		SetCurrentIndex( index );
-		}
-	else //Fix for SMAN-73XGBM
-		{
-		SetCurrentIndex( 0 );	
-		}
-    FTRACE( FPrint(
-        _L("[OMADM] CNSmlDMSyncDocument::MoveIndexToProfile() completed, index = %d"),
-        index ) );
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncDocument::GetCopyProfileL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncDocument::GetCopyProfileL( TInt& aProfileId )
-	{
-	FLOG( "[OMADM] CNSmlDMSyncDocument::GetCopyProfileL:" );
-	
-	if ( iProfileList->Count() <= 0 )
-		{
-		return;
-		}
-	// save the original profileid, if it's not saved it can be deleted
-	iOldProfileId = ( *iProfileList )[iCurrentIndex].iProfileId;
-
-	CNSmlDMSyncProfile* profile = 
-	  iAppEngine->CreateCopyProfileL( (*iProfileList )[iCurrentIndex].iProfileId );
-    
-    profile->SetNameL( GetNextProfileNameLC()->Des() );
-	aProfileId = profile->ProfileId();
-	profile->SaveL();
-	iAppEngine->CloseProfile();
-	
-	CleanupStack::PopAndDestroy(); //name
-
-	FLOG( "[OMADM] CNSmlDMSyncDocument::GetCopyProfileL() completed" );
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncDocument::GetNextProfileNameLC
-// -----------------------------------------------------------------------------
-HBufC* CNSmlDMSyncDocument::GetNextProfileNameLC()
-	{
-	FLOG( "[OMADM] CNSmlDMSyncDocument::GetNextProfileNameLC:" );
-	
-	TBool newNameFound = EFalse;
-	HBufC* profileName = NULL;
-	TInt nameIndex = 1;
-
-	while ( !newNameFound )
-		{
-		profileName = StringLoader::LoadLC( R_QTN_APPS_NEWPROFILE, nameIndex );
-		TNSmlDMProfileItem profileItem;
-		profileItem.iProfileName = *profileName;
-		TKeyArrayFix key(_FOFF(TNSmlDMProfileItem, iProfileName), ECmpFolded16 );
-
-		TInt foundIndex;
-		if ( iProfileList->Find( profileItem, key, foundIndex ) )
-			{
-			newNameFound = ETrue;
-			}
-		else
-			{
-			nameIndex++;
-			CleanupStack::PopAndDestroy( profileName );
-			}
-		}
-
-    FTRACE( FPrint(
-        _L("[OMADM] CNSmlDMSyncDocument::GetNextProfileNameLC() completed, name = \"%S\""),
-        profileName ) );
-	return profileName;
-	}
-
-// -----------------------------------------------------------------------------
-// DisableDbNotifications
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncDocument::DisableDbNotifications( TBool aEvent )
-    {
-    iDbEventsBlocked = aEvent;
-    }
-
-// -----------------------------------------------------------------------------
-// HandleDbEventL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncDocument::HandleDbEventL( TNSmlDMDbEvent aEvent )
-	{
-	FLOG( "[OMADM] CNSmlDMSyncDocument::HandleDbEventL:" );
-	
-	if( !iDbEventsBlocked )
-	    {
-        switch ( aEvent.iType )
-    		{
-    		case CNSmlDMDbNotifier::EClose:
-    			iAppEngine->SyncCompleted( ENSmlRefreshMainView );
-    			break;
-    		
-    		case CNSmlDMDbNotifier::EUpdate:
-                iSyncProfileList->ReadProfileItemL( aEvent.iProfileId );
-                iAppEngine->SyncCompleted( ENSmlRefreshMainView );
-    			break;
-
-    		case CNSmlDMDbNotifier::EDelete:
-                iSyncProfileList->Remove( aEvent.iProfileId );
-                iAppEngine->SyncCompleted( ENSmlRefreshMainView );
-    			break;
-
-    		case CNSmlDMDbNotifier::EUpdateAll:
-                iSyncProfileList->ReadProfileItemsL();
-                iAppEngine->SyncCompleted( ENSmlRefreshMainView );
-    			break;
-
-    		default:
-    			break;
-    		}
-	    }
-	FLOG( "[OMADM] CNSmlDMSyncDocument::HandleDbEventL() completed" );
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncDocument::RestoreL
-//
-// Called (by the environment) when app is opened embedded.
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncDocument::RestoreL( const CStreamStore& aStore,
-                                    const CStreamDictionary& aStreamDic )
-    {
-	FLOG( "[OMADM] CNSmlDMSyncDocument::RestoreL:" );
-	 
-    TSyncParameters params;
-    RStoreReadStream stream;
-    stream.OpenLC( aStore, aStreamDic.At( KUidSyncParameterValue ) );
-    params.InternalizeL( stream );
-    CleanupStack::PopAndDestroy();  // stream
-    switch ( params.iCommand )
-        {
-        case KSyncServCmdStartSync:
-            {
-            FLOG( "[OMADM] CNSmlDMSyncDocument::KSyncServCmdStartSync" );
-            static _LIT_SECURITY_POLICY_PASS(KAllowAllPolicy);
-   	        static _LIT_SECURITY_POLICY_C1(KAllowWriteDeviceDataPolicy, ECapabilityWriteDeviceData);
-            TInt value = 1;
-            TInt r=RProperty::Define(KUidSmlSyncApp,KNSmlDMSyncUiLaunchKey,RProperty::EInt,KAllowAllPolicy,KAllowWriteDeviceDataPolicy);
-	        if ( r!=KErrNone && r!=KErrAlreadyExists )
-              {
-    	       User::LeaveIfError(r);
-              }
-            if( r==KErrAlreadyExists || r==KErrNone )
-             {
-              TInt Value;
-              TInt r=RProperty::Get(KUidSmlSyncApp,KNSmlDMSyncUiLaunchKey,Value);
-            if( Value == 2 ) //DM UI launched from CP
-             {
-             FLOG( "[OMADM] CNSmlDMSyncDocument::RestoreL P& S value = 3:" );
-             value = 3;	//DM UI launched from CP and now from server alert
-             }
-            else
-             {FLOG( "[OMADM] CNSmlDMSyncDocument::RestoreL P& S value = 1:" );
-             value = 1;	//DM UI launched as server alert             
-             }              
-            } 
-            TInt r1=RProperty::Set(KUidSmlSyncApp,KNSmlDMSyncUiLaunchKey,value);   	  
-            
-	    	AppEngine()->OpenProfileL( params.iProfileId );
-            TInt bearer = AppEngine()->Profile()->BearerType();
-            TBuf<KNSmlMaxProfileNameLength> serverName;
-            AppEngine()->Profile()->GetName( serverName );
-            
-            // Server alerted sync should be checked to prevent the sending
-            // the application to background in case the user has opened it.
-           if ( iSanSupport == EOn )
-           {
-           	RProperty::Set( KPSUidNSmlDMSyncApp,
-                				    KServerAlertType,
-                    				params.iSilent );            
-            if ( params.iSilent == 1 )                 
-            	{
-                iSilent = ETrue;  // For already DM app open case also
-            	}             				            
-            if ( IsServerAlertSync()
-                && params.iSilent == 1 
-                 )
-            	{
-                TApaTaskList taskList( iEikEnv->WsSession() );
-                TApaTask task(taskList.FindApp( KUidSmlSyncApp ) );
-                task.SetWgId( iEikEnv->RootWin().Identifier() ); 
-                task.SendToBackground();
-            	}
-           }
-		else if ( IsServerAlertSync())
-			{
-			if(AppEngine()->Profile()->SASyncState() == ESASyncStateEnable )
-                {
-                	//new fix for DD and DL not shown for Accepted "yes"
-                RProperty::Set( KPSUidNSmlDMSyncApp,
-						KServerAlertType, 1 );	
-                TApaTaskList taskList( iEikEnv->WsSession() );
-                TApaTask task(taskList.FindApp( KUidSmlSyncApp ) );
-                task.SetWgId( iEikEnv->RootWin().Identifier() ); 
-                task.SendToBackground();
-                }
-			else
-				{
-				RProperty::Set( KPSUidNSmlDMSyncApp,
-						KServerAlertType, 0 );	
-				}
-			}
-		    AppEngine()->CloseProfile();
-
-            // Simpler FOTA progress note is not used in server initiated
-            // management sessions and EFalse can be given as parameter.
-        	AppEngine()->SynchronizeL( serverName, 
-        	                           params.iProfileId,
-        	                           params.iJobId,
-        	                           bearer,
-        	                           EFalse );
-        	break;
-            }
-        case KSyncServCmdShowProgress:
-            {
-            FLOG( "[OMADM] CNSmlDMSyncDocument::KSyncServCmdShowProgress" );
-            if ( iSanSupport == EOn )
-              {
-           	  RProperty::Set( KPSUidNSmlDMSyncApp,
-                				    KServerAlertType,
-                    				params.iSilent );            
-              if ( params.iSilent == 1 )                 
-            	{
-                iSilent = ETrue;  
-            	}
-              }
-                         
-            if ( params.iJobId == KSyncServEnabled)
-                {                
-                AppEngine()->ShowProgressDialogL( ETrue );
-                }
-            else
-                {                
-                AppEngine()->ShowProgressDialogL( EFalse );
-                }
-            break;
-            }
-        default:
-            {
-            break;
-            }
-        }
-    FLOG( "[OMADM] CNSmlDMSyncDocument::RestoreL() completed" );
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncDocument::IsServerAlertSync
-// -----------------------------------------------------------------------------
-//		
-TBool CNSmlDMSyncDocument::IsServerAlertSync()
-    {
-    FLOG( "CNSmlDMSyncDocument::IsServerAlertSync" );
-    
-    return iEikEnv->StartedAsServerApp();
-    }
-    
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncDocument::StartServerL
-// -----------------------------------------------------------------------------
-//		
-void CNSmlDMSyncDocument::StartServerL()
-    {
-    FLOG( "CNSmlDMSyncDocument::StartServerL" );
-   
-	CApaApplication* app = Application();
-	app->NewAppServerL( iServer ); 
-	TBuf<KMaxFullName> DmAppName;
-    CRepository* centrep = NULL;
-    centrep = CRepository::NewL( KCRUidNSmlNotifierDomainKeys );
-    centrep->Get( KNSmlDMAppName, DmAppName );
-    delete centrep;
-    iServer->ConstructL( DmAppName );
-	
-	FLOG( "CNSmlDMSyncDocument::StartServerL Done" );
-    }
-
-// -----------------------------------------------------------------------------    
-// CNSmlDMSyncDocument::SANSupport()
-// -----------------------------------------------------------------------------
-//
-TBool CNSmlDMSyncDocument::SANSupport()
-    {
-    FLOG( "CNSmlDMSyncDocument::SANSupport" );   		
-    if ( iSanSupport == EOn )
-        {
-        	return ETrue;
-        }	
-    FLOG( "CNSmlDMSyncDocument::SANSupportDone" );    
-    return EFalse;    
-	  
-    }
-    
-// -----------------------------------------------------------------------------    
-// CNSmlDMSyncDocument::SilentSession()
-// -----------------------------------------------------------------------------
-//
-TBool CNSmlDMSyncDocument::SilentSession()
-    {
-    FLOG( "CNSmlDMSyncDocument::SilentSession" );   		
-    TBool silent = ETrue;
-    TInt silentenabled = 0;
-    TInt silentdisabled = 1; 
-    if(iSilent == silent)
-    {
-    
-    RProperty::Set( KPSUidNSmlDMSyncApp,
-                    KSilentSession,
-                    silentenabled );     
-    } 
-    else
-    {
-    RProperty::Set( KPSUidNSmlDMSyncApp,
-                    KSilentSession,
-                    silentdisabled ); 	
-    }	
-
-    // If trust is establish then default make application management silent
-
-    TInt tarmtrustenabled = KErrNone;
-    RProperty::Get( KPSUidCoreApplicationUIs, KCoreAppUIsTarmIndicator, tarmtrustenabled);
-
-
-    if(tarmtrustenabled == ECoreAppUIsTarmTerminalSecurityOnIndicatorOn || 
-       tarmtrustenabled ==ECoreAppUIsTarmMngActiveIndicatorOn )
-    {
-
-	 RProperty::Set( KPSUidNSmlDMSyncApp,
-                    KSilentSession,
-                    silentenabled ); 
-
-    }
-	
-    return iSilent;    
-    }    
-    
-// -----------------------------------------------------------------------------    
-// CNSmlDMSyncDocument::ResetSession()
-// -----------------------------------------------------------------------------
-//   
-void CNSmlDMSyncDocument::ResetSession()
-	{
-	FLOG( "CNSmlDMSyncDocument::ResetSession" );   		
-    iSilent = EFalse;
-    FLOG( "CNSmlDMSyncDocument::ResetSession" );        	
-	}
-	
-// -----------------------------------------------------------------------------    
-// CNSmlDMSyncDocument::CurrentIndex()
-// -----------------------------------------------------------------------------
-//	
-TInt CNSmlDMSyncDocument::CurrentIndex()
-  {
-  return iCurrentIndex;	
-  }	
-
-// -----------------------------------------------------------------------------    
-// CNSmlDMSyncDocument::DMDefinesFotaDLKey()
-// -----------------------------------------------------------------------------
-//
-TBool CNSmlDMSyncDocument::DMDefinesFotaDLKey()
-	{
-	return iDMDefinesFotaDLKey;
-	}
-// End of File
--- a/omadm/omadmappui/src/NSmlDMSyncHandler.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1244 +0,0 @@
-/*
-* 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: Implementation of DM UI component
-* 	This is part of omadmappui.
-*
-*/
-
-
-// INCLUDES
-#include <NSmlDMSync.rsg>
-#include <aknnotewrappers.h>
-#include <AknWaitDialog.h>
-#include <textresolver.h>   // for CTextResolver
-#include <StringLoader.h>
-#include <e32property.h>
-
-#include <data_caging_path_literals.hrh>  // for resource and bitmap directories
-#include <SyncMLErr.h>      // sync error codes
-
-
-#include <AknsUtils.h>
-#include <DevManInternalCRKeys.h>
-#include <centralrepository.h>
-
-#include "NSmlDMSyncDocument.h"
-#include "NSmlDMSyncHandler.h"
-#include "NSmlDMAuthQueryDlg.h"
-#include "NSmlDMSyncState.h"
-#include "NSmlDMSyncDebug.h"
-#include "NSmlDMSyncDialog.h"
-#include "nsmldmsyncinternalpskeys.h"
-
-#include <nsmldmsync.mbg>
-#include <featmgr.h>
-#ifdef __SCALABLE_ICONS
-_LIT( KBitmapFileName,  "z:nsmldmsync.mif" );
-#else
-_LIT( KBitmapFileName,  "z:nsmldmsync.mbm" );
-#endif
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncHandler::NewL
-//
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CNSmlDMSyncHandler* CNSmlDMSyncHandler::NewL( RSyncMLSession* aSyncSession,
-                                              CNSmlDMSyncAppEngine* aAppEngine,
-                                              CNSmlDMSyncDocument* aSyncDocument )
-    {
-	FLOG( "CNSmlDMSyncHandler::NewL()" );
-
-    CNSmlDMSyncHandler* self =
-        new (ELeave) CNSmlDMSyncHandler( aSyncSession,
-                                         aAppEngine,
-                                         aSyncDocument );
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	CleanupStack::Pop(self);
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// Destructor.
-// -----------------------------------------------------------------------------
-//
-CNSmlDMSyncHandler::~CNSmlDMSyncHandler()
-    {
-    FLOG( "CNSmlDMSyncHandler::~CNSmlDMSyncHandler()" );
-
-    
-    if ( iFotaProgressDialog )
-		{
-	    TRAP_IGNORE( iFotaProgressDialog->CancelProgressDialogL() );
-	    delete iFotaProgressDialog;
-		}		            
-
-
-	if ( iProgressDialog )
-		{
-	    TRAP_IGNORE( iProgressDialog->CancelProgressDialogL() );
-	    delete iProgressDialog;
-		}
-	delete iState;
-	delete iActiveCaller;
-
-	if ( iSyncRunning )
-	    {
-	    TRAP_IGNORE( iSyncJob.StopL() );
-        iSyncJob.Close();
-	    }
-	  FeatureManager::UnInitializeLib();
-	FLOG( "CNSmlDMSyncHandler::~CNSmlDMSyncHandler() completed" );
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncHandler::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncHandler::ConstructL( void )
-    {
-    FLOG( "CNSmlDMSyncHandler::ConstructL" );
-   FeatureManager::InitializeLibL();   
-	iState = CNSmlDMSyncState::NewL();
-	iActiveCaller = CNSmlDMActiveCaller::NewL(this);
-	iServerAlertedSync = EFalse;
-	iSyncRunning = EFalse;
-	iSyncError = KErrNone;
-	
-	iCheckUpdate = EFalse;
-	
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncHandler::CNSmlDMSyncHandler
-// -----------------------------------------------------------------------------
-//
-CNSmlDMSyncHandler::CNSmlDMSyncHandler( RSyncMLSession* aSyncSession,
-                                        CNSmlDMSyncAppEngine* aAppEngine,
-                                        CNSmlDMSyncDocument* aSyncDocument ) 
-    : iSyncSession( aSyncSession ),
-    iSyncAppEngine( aAppEngine ),
-    iSyncDocument( aSyncDocument ),iFotaProgressLaunched(EFalse)
-	{
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncHandler::HandleDialogEventL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncHandler::HandleDialogEventL( TInt aButtonId )
-    {
-    FLOG( "CNSmlDMSyncHandler::HandleDialogEventL" );
-    
-	if ( aButtonId == EEikBidCancel )
-		{
-		FLOG( "CNSmlDMSyncHandler::HandleDialogEventL cancelling" );
-		if ( SyncRunning() )
-			{
-	        TInt err = RProperty::Set( KPSUidNSmlDMSyncApp,
-				KDmJobCancel, KErrCancel );
-	        FTRACE( FPrint(
-	              _L("CNSmlDMSyncHandler::CancelSynchronizeL() KDmJobCancel = -3, err = %d"),
-	                			err ) );
-			FLOG( "CNSmlDMSyncHandler::HandleDialogEventL cancelling stop job" );
-			TRAP_IGNORE( iSyncJob.StopL() );
-		    
-		    State()->SetSyncPhase( CNSmlDMSyncState::EPhaseCanceling );
-	        UpdateDialogL();
-			}
-		}
-    FLOG( "CNSmlDMSyncHandler::HandleDialogEventL() completed" );
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncHandler::SynchronizeL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncHandler::SynchronizeL( TDesC& aServerName,
-                                       const TInt aProfileId,
-                                       const TInt aJobId,
-                                       const TInt aConnectionBearer,
-                                       const TBool aUseFotaProgressNote )
-	{
-	FLOG( "CNSmlDMSyncHandler::SynchronizeL Server alert" );
-	
-	iServerName = aServerName;
-	iConnectionBearer = aConnectionBearer;
-    iProfileId = aProfileId;
-    iJobId = aJobId;
-    iUseFotaProgressNote = aUseFotaProgressNote;
-    
-    iSyncJob.OpenL( Session(), iJobId );
-    iSyncJobId = iSyncJob.Identifier();
-    FTRACE( FPrint( _L(
-	    "[OMADM]\tCNSmlDMSyncHandler::SynchronizeL--server alert, iSyncJobId = %d" ),
-	     iSyncJobId ) ); 
-	  //SAN Support
-	  iServerAlertedSync = ETrue;  
-	  _LIT_SECURITY_POLICY_S0( KWritePolicy, KUidSmlSyncApp.iUid );
-        _LIT_SECURITY_POLICY_C1( KReadPolicy, ECapabilityReadDeviceData );
-        RProperty::Define( KPSUidNSmlDMSyncApp,
-                           KNSmlDMSyncUiInitiatedJobKey,
-                           RProperty::EInt,
-                           KReadPolicy,
-                           KWritePolicy ); 
-    RProperty::Set( KPSUidNSmlDMSyncApp,
-                    KNSmlDMSyncUiInitiatedJobKey,
-                    iSyncJobId );                       
-	  //SAN Support
-    SynchronizeL();
-	}
-	
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncHandler::SynchronizeL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncHandler::SynchronizeL( TDesC& aServerName,
-                                       const TInt aProfileId,
-                                       const TInt aConnectionBearer,
-                                       const TBool aUseFotaProgressNote )
-    {
-    FLOG( "CNSmlDMSyncHandler::SynchronizeL" );
-
-    iServerName = aServerName;
-    iConnectionBearer = aConnectionBearer;
-    iProfileId = aProfileId;
-    iUseFotaProgressNote = aUseFotaProgressNote;
-
-    iSyncJob.CreateL( Session(), iProfileId );
-    iSyncJobId = iSyncJob.Identifier();
-    SynchronizeL();
-    
-    TInt dummyValue;
-    TInt err = RProperty::Get( KPSUidNSmlDMSyncApp,
-                               KNSmlDMSyncUiInitiatedJobKey,
-                               dummyValue );
-    if ( err == KErrNotFound )
-        {
-        _LIT_SECURITY_POLICY_S0( KWritePolicy, KUidSmlSyncApp.iUid );
-        _LIT_SECURITY_POLICY_C1( KReadPolicy, ECapabilityReadDeviceData );
-        RProperty::Define( KPSUidNSmlDMSyncApp,
-                           KNSmlDMSyncUiInitiatedJobKey,
-                           RProperty::EInt,
-                           KReadPolicy,
-                           KWritePolicy );
-        }
-    FTRACE( FPrint( _L(
-	    "[OMADM]\tCNSmlDMSyncHandler::SynchronizeL--UI initiated, iSyncJobId = %d" ),
-	     iSyncJobId ) );    
-    RProperty::Set( KPSUidNSmlDMSyncApp,
-                    KNSmlDMSyncUiInitiatedJobKey,
-                    iSyncJobId );
-	}
-	
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncHandler::SynchronizeL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncHandler::SynchronizeL()
-	{
-	FLOG( "CNSmlDMSyncHandler::SynchronizeL" );
-	
-	TInt err = KErrNone;
-	
-	// for MSyncMLEventObserver events
-	TRAP( err, Session().RequestEventL(*this) );
-	if ( err != KErrNone )
-		{
-		iSyncJob.StopL();
-		iSyncJob.Close();
-		User::Leave(err);
-		}
-    
-    // for MSyncMLProgressObserver events
-    TRAP( err, Session().RequestProgressL(*this) );
-	if ( err != KErrNone )
-		{
-		Session().CancelEvent();
-		iSyncJob.StopL();
-		iSyncJob.Close();
-		User::Leave( err );
-		}
-	
-	State()->SetSyncPhase( CNSmlDMSyncState::EPhaseConnecting );
-	TInt IsDMBusy = EFalse;   //IAD: Making DM Idle
-	TInt r2=RProperty::Get(KUidSmlSyncApp,KDMIdle,IsDMBusy);
-	if (IsDMBusy)
-	   iNotinFotaView = 1;    //Not in fota view 
-	else
-	   iNotinFotaView = 0;    //already busy because in other view
-	IsDMBusy =ETrue; 
-  r2=RProperty::Set(KUidSmlSyncApp,KDMIdle,IsDMBusy);	   
-	
-	TRAP( err, ShowProgressDialogL() );
-	if ( err != KErrNone )
-		{
-		Session().CancelEvent();
-		Session().CancelProgress();
-		iSyncJob.StopL();
-		iSyncJob.Close();
-		User::Leave( err );
-		}
-	FLOG( "CNSmlDMSyncHandler::SynchronizeL Sync is running" );
-
-    iSyncDocument->MarkFwUpdChangesStartL();
-	
-	iSyncRunning = ETrue;
-	iSyncError = KErrNone;
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncHandler::SynchronizeCompletedL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncHandler::SynchronizeCompletedL( TInt aError )
-	{
-    FTRACE( FPrint(
-        _L("[OMADM]\t CNSmlDMSyncHandler::SynchronizeCompletedL(), aError = %d"),
-        aError ) );
-	
-	if ( !SyncRunning() )
-		{
-		FLOG( "CNSmlDMSyncHandler::SynchronizeCompletedL already completed" );
-		return;  // sync has already completed
-		}
-		
-    iSyncJob.Close();
-    
-     FTRACE( FPrint( _L(
-	    "[OMADM]\tCNSmlDMSyncHandler::SynchronizecompletedL, iSyncJobId = %d" ),
-	     KNSmlDMNoUserInitiatedJob ) );
-    // Error code can be ignored.
-    RProperty::Set( KPSUidNSmlDMSyncApp,
-                    KNSmlDMSyncUiInitiatedJobKey,
-                    KNSmlDMNoUserInitiatedJob );
-	
-	iSyncRunning = EFalse;
-	iSyncError = aError;
-
-    
-    iCheckUpdate = EFalse;
-    
-    
-	// close progress dialog
-	if ( iProgressDialog )
-        {
-        FLOG( "CNSmlDMSyncHandler::SynchronizeCompletedL close dialog" ); 
-        iProgressDialog->CancelProgressDialogL();
-        delete iProgressDialog;
-        iProgressDialog = NULL;
-        }
-
-    
-    if (  iFotaProgressDialog )
-        {
-        __ASSERT_ALWAYS( iSyncDocument, TUtil::Panic( KErrGeneral ) );
-        
-        iFotaProgressDialog->CancelProgressDialogL();
-        TInt configFlags( EGenericSession );
-        //TInt SetGenValue(0);
-        CRepository* centrep = NULL;
-        TRAPD( err, centrep = CRepository::NewL( KCRUidDeviceManagementInternalKeys ) );
-        if ( centrep )
-            {
-            if( err == KErrNone )
-             {
-            centrep->Get( KDevManSessionType, configFlags );
-             }
-            delete centrep;
-            } 
-        /*if ( err != KErrNone ) 
-            {
-            User::Leave( err );
-            }
-        else
-            {
-            
-            centrep->Set( KDevManSessionType, SetGenValue );
-            }      
-        if(centrep)    
-           {
-           delete centrep;
-           }*/
-        delete iFotaProgressDialog;
-        iFotaProgressDialog = NULL;
-        // configFlags=2 for FOTA Package not downloaded case ,1- successful download
-        if ( !iSyncDocument->FwUpdStatesChangedL() && (aError == KErrNone) 
-        				&& configFlags == EFotaPkgNotFound )
-            {
-            FLOG( "[OMADM]\t CNSmlDMSyncHandler::SynchronizeCompletedL(): No changes in FW Update states." );
-            
-            HBufC* stringHolder =
-                StringLoader::LoadLC( R_QTN_FOTA_NO_NEW_UPDATES );
-
-            CAknInformationNote* infoNote =
-                new (ELeave) CAknInformationNote;
-
-            infoNote->SetTimeout( CAknNoteDialog::ELongTimeout );
-            
-            // We are not interested in the result.
-            infoNote->ExecuteLD( *stringHolder );
-            CleanupStack::PopAndDestroy( stringHolder );
-            }
-        }  
-      
-
-	iUseFotaProgressNote = EFalse;
-    iSyncJob.Close();
-    
-	// handle error in HandleActiveCallL (when active caller completes)
-	iActiveCaller->Start( aError );
-
-	FLOG( "CNSmlDMSyncHandler::SynchronizeCompletedL() completed" );
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncHandler::OnSyncMLSessionEvent
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncHandler::OnSyncMLSessionEvent( TEvent aEvent,
-                                               TInt aIdentifier,
-                                               TInt aError,
-                                               TInt /*aAdditionalData*/ )
-	{
-	FTRACE( FPrint( _L(
-	    "[OMADM]\tCNSmlDMSyncHandler::OnSyncMLSessionEvent(), aEvent = %d, aIdentifier = %d, aError = %d" ),
-	    aEvent, aIdentifier, aError ) );
-	
-
-	if ( aEvent == EJobStop
-	    || aEvent == EJobStartFailed
-	    || aEvent == EJobRejected )
-		{
-    	FTRACE( FPrint( _L(
-    	    "[OMADM]\tCNSmlDMSyncHandler::OnSyncMLSessionEvent(), iSyncJobId = %d" ),
-    	    iSyncJobId ) );
-    	    
-    	 
-    	TInt value =EFalse; 
-    	TInt r=RProperty::Get( KPSUidNSmlDMSyncApp, KFotaDLStatus, value );	  
-    	FTRACE( FPrint(
-					_L("KFotaDLStatus = %d"),r ) );  
-					
-    	if(!iNotinFotaView && value != 1 )    
-        r =  RProperty::Set( KPSUidNSmlDMSyncApp,
-				 			KDMIdle, KErrNone ); 
-									
-							
-							
-							
-							
-		if ( iSyncJobId == aIdentifier )
-			{
-			FLOG( "CNSmlDMSyncHandler::OnSyncMLSessionEvent EJobStop close" );
-			//For holding the DM Job session successful / error for future purpose
-			TInt err =  RProperty::Set( KPSUidNSmlDMSyncApp,
-							KDmJobCancel, KErrNone );   
-			FTRACE( FPrint(
-					_L("KDmJobCancel setting in OnSyncMLSessionEvent err = %d"),err ) );
-            TRAP_IGNORE( SynchronizeCompletedL( aError ) );
-			}
-		}
-    FLOG( "[OMADM]\tCNSmlDMSyncHandler::OnSyncMLSessionEvent() completed" );
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncHandler::OnSyncMLSyncError
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncHandler::OnSyncMLSyncError( TErrorLevel aErrorLevel,
-                                            TInt aError,
-                                            TInt /*aTaskId*/,
-                                            TInt /*aInfo1*/,
-                                            TInt /*aInfo2*/)
-	{
-	FTRACE( FPrint( _L(
-	    "[OMADM]\tCNSmlDMSyncHandler::OnSyncMLSyncError(), aErrorLevel = %d, aError = %d"),
-	    aErrorLevel, aError ) );
-	
-	if ( aErrorLevel == ESmlFatalError )
-		{
-        TRAP_IGNORE( SynchronizeCompletedL( aError ) );
-		}
-    FLOG( "[OMADM]\tCNSmlDMSyncHandler::OnSyncMLSyncError() completed" );
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncHandler::OnSyncMLSyncProgress
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncHandler::OnSyncMLSyncProgress( TStatus aStatus,
-                                               TInt /*aInfo1*/,
-                                               TInt /*aInfo2*/ )
-	{
-	FTRACE( RDebug::Print(
-	          _L("CNSmlDMSyncHandler::OnSyncMLSyncProgress (%d)"), aStatus ) );
-	
-	switch (aStatus)
-		{
-		case ESmlConnecting:
-		    State()->SetSyncPhase( CNSmlDMSyncState::EPhaseConnecting );
-		    break;
-		case ESmlConnected:
-		    break;
-		case ESmlLoggingOn:
-		    break;
-		case ESmlLoggedOn:
-		    State()->SetSyncPhase( CNSmlDMSyncState::EPhaseSynchronizing );
-		    break;
-		case ESmlDisconnected:
-		    State()->SetSyncPhase( CNSmlDMSyncState::EPhaseDisconnecting );
-		    break;
-		case ESmlCompleted:
-		    State()->SetSyncPhase( CNSmlDMSyncState::EPhaseDisconnecting );
-		    break;
-		case ESmlProcessingServerCommands:
-		    State()->SetSyncPhase( CNSmlDMSyncState::EPhaseSending );
-		    break;
-		case ESmlReceivingServerCommands:
-		    State()->SetSyncPhase( CNSmlDMSyncState::EPhaseReceiving );
-		    break;
-		
-		case ESmlSendingModificationsToServer:
-		    {
-		    if( iFotaProgressDialog && iCheckUpdate == EFalse )
-		    {
-		    State()->SetSyncPhase( CNSmlDMSyncState::EPhaseFinal );	
-		    }
-		    
-		    break;
-		    }
-		
-		default:
-		    break;
-		}
-    TRAP_IGNORE( UpdateDialogL() );
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncHandler::OnSyncMLDataSyncModifications
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncHandler::OnSyncMLDataSyncModifications( TInt /*aTaskId*/,
-                   const TSyncMLDataSyncModifications& /*aClientModifications*/,
-                   const TSyncMLDataSyncModifications& /*aServerModifications*/ )
-    {
-    FLOG( "CNSmlDMSyncHandler::OnSyncMLDataSyncModifications" );
-
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncHandler::GetStatusDialogTextL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncHandler::GetStatusDialogTextL( TDes& aBuffer )
-    {
-    FLOG( "CNSmlDMSyncHandler::GetStatusDialogTextL()" );
-    
-	aBuffer = KNullDesC;
-	TInt phase = State()->SyncPhase();
-
-    switch ( phase )
-        {
-        case CNSmlDMSyncState::EPhaseConnecting:
-            {
-            ReadL( aBuffer, R_SYNCSTATUS_SYNC_CONN );  // "Connecting"
-            break;
-            }
-        case CNSmlDMSyncState::EPhaseSynchronizing:
-            {
-            if(iProgressDialog)
-            ReadL( aBuffer, R_SYNCSTATUS_SYNC_SEND ); // "Synchronizing"
-            
-            else if(iFotaProgressDialog ) 
-            ReadL( aBuffer, R_QTN_FOTA_WAIT_CHECKING_UPDATE );
-            
-            break;
-            }
-        case CNSmlDMSyncState::EPhaseDisconnecting:
-            {
-     
-            TInt configFlags( EGenericSession );
-            CRepository* centrep = NULL;
-            TRAPD( err, centrep = CRepository::NewL( KCRUidDeviceManagementInternalKeys ) );
-            if ( centrep )
-                {
-                centrep->Get( KDevManSessionType, configFlags );
-                delete centrep;
-                }
-            if ( err != KErrNone ) 
-                {
-                User::Leave( err );
-                }
-            if( iFotaProgressDialog &&  configFlags == EGenericSession )
-               {
-               ReadL( aBuffer, R_SYNCSTATUS_SYNC_DISC );  // "Disconnecting"
-               }
-            else if( iProgressDialog )
-               {
-               ReadL( aBuffer, R_SYNCSTATUS_SYNC_DISC );  // "Disconnecting"
-               }
-             
-            break;
-            }
-        case CNSmlDMSyncState::EPhaseCanceling:
-            {
-            ReadL( aBuffer, R_SYNCSTATUS_CANC );  // "Canceling"
-            break;
-            }
-        case CNSmlDMSyncState::EPhaseSending:   // ReadProgressText handles both
-        case CNSmlDMSyncState::EPhaseReceiving: // cases.
-            {
-
-            if( iProgressDialog )
-               {
-            	ReadProgressTextL( aBuffer, State()->Content(), State()->Progress(),
-                               State()->TotalProgress(), phase );
-               }
-            TInt configFlags( EGenericSession );
-            CRepository* centrep = NULL;
-            TRAPD( err, centrep = CRepository::NewL( KCRUidDeviceManagementInternalKeys ) );
-            if( centrep )
-                {
-                centrep->Get( KDevManSessionType, configFlags );
-                delete centrep;
-                }
-            if( err != KErrNone ) 
-               {
-               User::Leave( err );
-               }
-            if( iFotaProgressDialog && iCheckUpdate && !iFotaProgressLaunched )
-               {
-               ReadProgressTextL( aBuffer, State()->Content(), State()->Progress(),
-                               State()->TotalProgress(), phase );
-               TFileName bitmapName;
-               TParse parse;
-    	       parse.Set(KBitmapFileName, &KDC_APP_BITMAP_DIR, NULL);
-    	       TUtil::StrCopy(bitmapName, parse.FullName());
-	           CEikImage* image = iFotaProgressDialog->CreateImageLC(KAknsIIDQgnNoteSml,bitmapName,
-		                                                EMbmNsmldmsyncQgn_note_sml,
-		                                              EMbmNsmldmsyncQgn_note_sml_mask);
-	           iFotaProgressDialog->SetImageL(image);
-               CleanupStack::Pop(image);
-               }
-             
-            break;
-            }
-         
-         case CNSmlDMSyncState::EPhaseFinal:
-            {
-            iCheckUpdate = ETrue;
-            ReadL( aBuffer, R_QTN_FOTA_WAIT_CHECKING_UPDATE );  // "Check for update
-            TFileName bitmapName;
-       	    TParse parse;
-    	    parse.Set(KBitmapFileName, &KDC_APP_BITMAP_DIR, NULL);
-    	    TUtil::StrCopy(bitmapName, parse.FullName());
-	        CEikImage* image = iFotaProgressDialog->CreateImageLC(KAknsIIDQgnMenuDm,bitmapName,
-		                                               EMbmNsmldmsyncQgn_menu_dm,
-		                                         EMbmNsmldmsyncQgn_menu_dm_mask);
-	        iFotaProgressDialog->SetImageL(image);
-            CleanupStack::Pop(image);
-            break;
-            }
-         
-        default:
-            {
-            break;
-            }
-        }
-    FLOG( "CNSmlDMSyncHandler::GetStatusDialogTextL() completed" );
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncHandler::UpdateDialogL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncHandler::UpdateDialogL()
-	{
-	FLOG( "CNSmlDMSyncHandler::UpdateDialogL()" );
-	
-	if ( iProgressDialog )
-	    {
-	    FLOG( "CNSmlDMSyncHandler::UpdateDialogL(): dialog exists update" );
-    	TBuf<KBufSize256> stringHolder;
-    	
-    	TInt phase = State()->SyncPhase();
-    	
-        GetStatusDialogTextL( stringHolder );
-        if ( stringHolder.Compare( KNullDesC ) != 0 ) // If correct text found
-            {
-            Dialog()->UpdateTextL( stringHolder );
-            }
-    	
-    	if ( phase == CNSmlDMSyncState::EPhaseSending ||
-    	     phase == CNSmlDMSyncState::EPhaseReceiving )
-    		{
-    		if (State()->Progress() == 1)
-    			{
-    			if ( State()->ProgressKnown() )
-    				{
-	    			Dialog()->CancelAnimation();
-    	    		Dialog()->SetFinalProgress(State()->TotalProgress());
-         	    	Dialog()->SetProgress(State()->Progress());
-    				}
-    			else
-    				{
-        			Dialog()->SetFinalProgress(0);
-	    	        Dialog()->StartAnimationL();
-    				}
-    			}
-    		else if ( State()->ProgressKnown() )
-    			{
-    			Dialog()->SetProgress( State()->Progress() );
-    			}
-    		}
-	    }
-	 
-	 else if( iFotaProgressDialog )   
-	 {
-	 FLOG( "CNSmlDMSyncHandler::UpdateDialogL(): fota dialog" );
-     TBuf<KBufSize256> stringHolder;	
-     TInt phase = State()->SyncPhase();	
-     GetStatusDialogTextL( stringHolder );
-     if ( stringHolder.Compare( KNullDesC ) != 0 ) // If correct text found
-         {
-         iFotaProgressDialog->UpdateTextL( stringHolder );
-         }
-    	
-     if ( phase == CNSmlDMSyncState::EPhaseSending ||
-    	     phase == CNSmlDMSyncState::EPhaseReceiving )
-    	 {
-    		if (State()->Progress() == 1)
-    			{
-    			if ( State()->ProgressKnown() )
-    				{
-	    			iFotaProgressDialog->CancelAnimation();
-    	    	    iFotaProgressDialog->SetFinalProgress(State()->TotalProgress());
-         	    	iFotaProgressDialog->SetProgress(State()->Progress());
-    				}
-    			else
-    				{
-        			iFotaProgressDialog->SetFinalProgress(0);
-	    	        iFotaProgressDialog->StartAnimationL();
-    				}
-    			}
-    		else if ( State()->ProgressKnown() )
-    			{
-    			iFotaProgressDialog->SetProgress( State()->Progress() );
-    			}
-    	 }
-	 }
-	 
-	FLOG( "CNSmlDMSyncHandler::UpdateDialogL() completed" );
-	}
-
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncHandler::HandleActiveCallL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncHandler::HandleActiveCallL()
-	{
-    FLOG( "CNSmlDMSyncHandler::HandleActiveCallL" );
-    
-    // HandleSyncErrorL will set this to true if
-    // sync will be retried.
-    iRetrySync = EFalse;
-
-	if ( (iSyncError != KErrNone) && (iSyncError != KErrCancel) )
-		{
-		TRAP_IGNORE( HandleSyncErrorL() );
-		}
-	if ( iRetrySync == EFalse )
-		{
-	    // Inform parent that sync is done.
-	    iSyncAppEngine->SyncCompleted( ENSmlSyncComplete );		
-		}
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncHandler::HandleSyncErrorL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncHandler::HandleSyncErrorL()
-	{
-	FLOG( "CNSmlDMSyncHandler::HandleSyncErrorL" );
-	
-	if ( iSyncError != KDMErr )
-		{
-    	GetErrorText( iBuf, iSyncError, iConnectionBearer );
-    	CAknErrorNote* queryDialog = new (ELeave) CAknErrorNote(ETrue);
-    	if( iSyncDocument->SANSupport() && iSyncDocument->SilentSession() )
-    	   {
-    	    queryDialog->SetTone(CAknErrorNote::ENoTone);    	
-    	   }
-        queryDialog->ExecuteLD( iBuf );
-		}
-	if ( ( iSyncError == SyncMLError::KErrAuthenticationFailure ) ||
-	    ( iSyncError == SyncMLError::KErrTransportAuthenticationFailure ) )
-        {
-        TBool httpQuery( iSyncError == SyncMLError::KErrTransportAuthenticationFailure );
-        
-	    FLOG( "CNSmlDMSyncHandler::HandleSyncErrorL ask username" );
-
-	    CNSmlDMMultiQuery* dlg = CNSmlDMMultiQuery::NewL( iSyncAppEngine,
-	                                                      iProfileId,
-	                                                      httpQuery );
-	    if ( dlg->ExecuteLD( R_NSMLDM_AUTHDIALOG ) )
-		    {
-		    // ok
-		    FLOG( "CNSmlDMSyncHandler::HandleSyncErrorL ask username ok retry sync" );
-		    iRetrySync = ETrue;
-            // We have already closed job so create a new.
-          	iSyncJob.CreateL( Session(), iProfileId );
-          	iSyncJobId = iSyncJob.Identifier();
-		    SynchronizeL();
-		    }
-	    else
-		    {
-		    FLOG( "CNSmlDMSyncHandler::HandleSyncErrorL ask username cancel" );
-		    }
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncHandler::GetErrorTextL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncHandler::GetErrorText( TDes& aErrorText,
-                                       TInt aErrorCode,
-                                       TInt aTransport )
-	{
-    FTRACE( RDebug::Print(
-          _L("CNSmlDMSyncHandler::GetErrorText Errorcode (%d)"), aErrorCode) );
-    
-    aErrorText = KNullDesC();
-   
-    TInt id = R_QTN_DM_LOG_ERR_SYSTEMERROR;  // "System Error"
-   
-	switch ( aErrorCode )
-		{
-		case SyncMLError::KErrTransportAuthenticationFailure:
-			{
-			if ( aTransport == EAspBearerInternet )
-				{
-				// "Http authentication failed"
-				id = R_QTN_NSML_LOG_ERR_CLIENTAUTH;  
-				}
-			else
-				{
-				// "Invalid user name or password"
-				id = R_QTN_DM_LOG_ERR_CLIENTAUTH;
-				}
-		    break;
-			}
-		
-		case SyncMLError::KErrAuthenticationFailure:
-			{
-			// "Invalid user name or password"
-			id = R_QTN_DM_LOG_ERR_CLIENTAUTH;
-		    break;
-			}	
-
-		case KErrServerBusy:
-		    {
-		    // "Synchronisation server was busy"
-		    id = R_QTN_DM_LOG_ERR_SERVERBUSY;
-		    break;
-		    }
-		    
-		case SyncMLError::KErrServerDatabaseNotFound:
-		    {
-		    // "Invalid remote database"
-		    id = R_QTN_DM_LOG_ERR_SESSIONABORT;
-		    break;
-		    }
-
-		case SyncMLError::KErrConnectionError:
-		    {
-		    // "Server is not responding"
-		    id = R_QTN_DM_LOG_ERR_SERVERNOTRESPONDING;
-		    break;
-		    }
-		    
-		case SyncMLError::KErrTransportSvrNoUri:
-		    {
-		    // "Invalid host address"
-		    id = R_QTN_DM_LOG_ERR_URIINVALID;
-		    break;
-		    }
-		case SyncMLError::KErrTransportDisconnected:
-		{
-			id = R_QTN_DM_LOG_ERR_TIMEDOUT;
-			break;
-		}
-		
-		case SyncMLError::KErrTransportRequest:
-		case SyncMLError::KErrTransportHeader:
-		case SyncMLError::KErrTransportSvrError:
-		case SyncMLError::KErrCannotCommunicateWithServer:
-		    {
-		    // "Error in communication"
-		    id = R_QTN_DM_LOG_ERR_COMM;
-		    break;
-		    }
-		    
-		case SyncMLError::KErrVerDTDMissing:
-		case SyncMLError::KErrProtoMissing:
-		case SyncMLError::KErrVersionDTDNotSupported:
-		case SyncMLError::KErrProtoNotSupported:
-		    {
-		    // "Unsupported SyncML software version in server"
-		    id = R_QTN_DM_LOG_ERR_VERSIONNOTSUPPORTED;  
-		    break;
-		    }
-       
-		case SyncMLError::KErrSessionIdNotValid:
-		case SyncMLError::KErrMappingInfoMissing:
-		case SyncMLError::KErrMappingInfoNotAcked:
-		case SyncMLError::KErrStatusCommandForCommandNotSent:
-		case SyncMLError::KErrStatusCommandNotTheSame:
-		case SyncMLError::KErrMissingStatusCommands:
-		case SyncMLError::KErrFailedToAddRecord:
-		case SyncMLError::KErrFailedToReplaceRecord:
-		case SyncMLError::KErrFailedToDeleteRecord:
-		case SyncMLError::KErrXmlParsingError:
-		case SyncMLError::KErrReferenceToolkitError:
-		case SyncMLError::KErrObjectTooLargeToSendToServer:
-		case SyncMLError::KErrFailedToGetRecord:
-		case SyncMLError::KErrUserInteractionFailed:
-		case SyncMLError::KErrStatusSizeMismatch:
-		case SyncMLError::KErrFailedToCloseDatabase:
-		case SyncMLError::KErrDatabaseAdapterIndexError:
-		case SyncMLError::KErrClientDatabaseNotFound:
-		    {
-		    // "Error in sync server"
-	   	    id = R_QTN_DM_LOG_ERR_SERVERERROR;
-		    break;
-		    }
-		case SyncMLError::KErrPhoneOnOfflineMode:
-		    {
-		    // "Phone in offline"
-	   	    id = R_QTN_DM_LOG_ERR_OFFLINE;
-		    break;	        
-		    }
-
-		case SyncMLError::KErrInvalidCredentials:
-		    {
-		    // Server authentication failed
-	   	    id = R_QTN_DM_LOG_ERR_SERVERTAUTH;
-		    break;	        
-		    }
-	        
-		//TARM Enabled build Server profile Cert not stored or invalid    
-        case SyncMLError::KErrInvalidCert:
-	      {
-	      	if(FeatureManager::FeatureSupported(KFeatureIdSapPolicyManagement))
-	      	{
-	      	id =  R_QTN_DM_ERROR_UNTRUSTED_CERT ;
-	      	}
-	      	break;
-	      }
-        default:
-            {
-            if ( ( aErrorCode == KErrDiskFull ) ||
-                 ( aErrorCode == KErrNoMemory ) )
-                {
-                TRAPD( retVal, SetErrorMessageL( aErrorCode, aErrorText ) );
-                if ( retVal == KErrNone )
-                    {
-                    return;
-                    }
-                }
-            // "System Error"
-            id = R_QTN_DM_LOG_ERR_SYSTEMERROR;
-		    break;
-            }
-		}
-		
-	TRAP_IGNORE( ReadL( aErrorText, id ) );
-	}
-	
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncHandler::ShowProgressDialogL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncHandler::ShowProgressDialogL( )
-	{
-	FLOG( "CNSmlDMSyncHandler::ShowProgressDialogL" );
-	
-	delete iProgressDialog;
-	iProgressDialog = NULL;
-	
-	if ( iUseFotaProgressNote )
-	    {
-      
-        iFotaProgressDialog = CNSmlDMProgressDialog::NewL( this );
-        iFotaProgressLaunched = ETrue;
-        TBuf<KBufSize> buf;
-    	GetStatusDialogTextL( buf );
-       	TFileName bitmapName;
-       	TParse parse;
-    	parse.Set(KBitmapFileName, &KDC_APP_BITMAP_DIR, NULL);
-    	TUtil::StrCopy(bitmapName, parse.FullName());
-    	
-	    if ( iServerAlertedSync )
-		    {
-		     iFotaProgressDialog->LaunchProgressDialogL(
-                                    buf,
-		                            KAknsIIDQgnNoteSml,
-		                            bitmapName,
-		                            EMbmNsmldmsyncQgn_note_sml_server,
-		                            EMbmNsmldmsyncQgn_note_sml_server_mask );		                            
-		    }
-	    else
-		    {
-		    iFotaProgressDialog->LaunchProgressDialogL( 
-		                            buf,
-		                            KAknsIIDQgnNoteSml,
-		                            bitmapName,
-		                            EMbmNsmldmsyncQgn_note_sml,
-		                            EMbmNsmldmsyncQgn_note_sml_mask );
-    		}
-	    iFotaProgressLaunched = EFalse;
-		UpdateDialogL();
-        
-	    }
-    else
-        {
-    	iProgressDialog = CNSmlDMProgressDialog::NewL( this );
-
-    	TBuf<KBufSize> buf;
-    	GetStatusDialogTextL( buf );
-
-       	TFileName bitmapName;
-       	TParse parse;
-    	parse.Set(KBitmapFileName, &KDC_APP_BITMAP_DIR, NULL);
-    	TUtil::StrCopy(bitmapName, parse.FullName());
-    	
-	if ( iServerAlertedSync )
-		{
-		iProgressDialog->LaunchProgressDialogL(
-                                    buf,
-		                            KAknsIIDQgnNoteSml,
-		                            bitmapName,
-		                            EMbmNsmldmsyncQgn_note_sml_server,
-		                            EMbmNsmldmsyncQgn_note_sml_server_mask );		                            
-		}
-	else
-		{
-		iProgressDialog->LaunchProgressDialogL( 
-		                            buf,
-		                            KAknsIIDQgnNoteSml,
-		                            bitmapName,
-		                            EMbmNsmldmsyncQgn_note_sml,
-		                            EMbmNsmldmsyncQgn_note_sml_mask );
-    		}
-		UpdateDialogL();
-        }
-        
-	FLOG( "CNSmlDMSyncHandler::ShowProgressDialogL() completed" );
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncHandler::HideProgressDialogL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncHandler::HideProgressDialogL()
-    {
-    FLOG( "CNSmlDMSyncHandler::HideProgressDialogL" );
-
-
-    if ( iFotaProgressDialog )
-		{
-		FLOG( "CNSmlDMSyncHandler::HideProgressDialogL dialog exists hide it" );
-	    iFotaProgressDialog->CancelProgressDialogL();
-	    delete iFotaProgressDialog;
-	    iFotaProgressDialog = NULL;
-		}
-    
-	if ( iProgressDialog )
-		{
-		FLOG( "CNSmlDMSyncHandler::HideProgressDialogL dialog exists hide it" );
-	    iProgressDialog->CancelProgressDialogL();
-	    delete iProgressDialog;
-	    iProgressDialog = NULL;
-		}
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncHandler::SetErrorMessageL
-// 
-// Set synchronisation error message text.
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncHandler::SetErrorMessageL(TInt aError, TDes& aMsg)
-	{
-	FLOG( "CNSmlDMSyncHandler::SetErrorMessageL" );
-	
-	CTextResolver* textResolver = CTextResolver::NewLC(); 
-	
-    aMsg.Append( textResolver->ResolveErrorString( aError,
-	                                         CTextResolver::ECtxNoCtx ) );
-
-	CleanupStack::PopAndDestroy( textResolver );
-
-	TBuf<KBufSize> buf;
-    ReadL( buf, R_SML_APP_TITLE );
-	TUtil::StrInsert( aMsg, buf );
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncHandler::Session
-// -----------------------------------------------------------------------------
-//
-RSyncMLSession& CNSmlDMSyncHandler::Session()
-	{
-	__ASSERT_DEBUG(iSyncSession, TUtil::Panic(KErrGeneral));
-	
-	return *iSyncSession;
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncHandler::Dialog
-// -----------------------------------------------------------------------------
-//
-CNSmlDMProgressDialog* CNSmlDMSyncHandler::Dialog()
-	{
-	__ASSERT_DEBUG(iProgressDialog, TUtil::Panic(KErrGeneral));
-
-	return iProgressDialog;
-	}
-
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncHandler::SyncRunning
-// -----------------------------------------------------------------------------
-//
-TBool CNSmlDMSyncHandler::SyncRunning()
-	{
-	FTRACE( RDebug::Print(
-	          _L("CNSmlDMSyncHandler::SyncRunning status (%d)"), iSyncRunning ) );
-	          
-	return iSyncRunning;
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncHandler::State
-// -----------------------------------------------------------------------------
-//
-CNSmlDMSyncState* CNSmlDMSyncHandler::State()
-	{
-	__ASSERT_DEBUG(iState, TUtil::Panic(KErrGeneral));
-
-	return iState;
-	}
-	
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncHandler::ReadL
-// -----------------------------------------------------------------------------
-//	
-void CNSmlDMSyncHandler::ReadL( TDes& aText, TInt aResourceId )
-    {
-    FLOG( "CNSmlDMSyncHandler::ReadL" );
-    
-    HBufC* buf = StringLoader::LoadLC( aResourceId );
-    TUtil::StrCopy( aText, *buf );
-    CleanupStack::PopAndDestroy( buf );
-    }
-    
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncHandler::ReadProgressTextL
-// -----------------------------------------------------------------------------
-//	
-void CNSmlDMSyncHandler::ReadProgressTextL( TDes& aText,
-                                            const TDesC& /*aContent*/,
-                                            TInt /*aCurrent*/,
-                                            TInt aFinal,
-                                            TInt aPhase )
-	{
-	FLOG( "CNSmlDMSyncHandler::ReadProgressTextL" );
-	
-	aText = KNullDesC;
-
-	HBufC* buf = NULL;
-    
-    TBool send = EFalse;
-    if ( aPhase == CNSmlDMSyncState::EPhaseSending )
-    	{
-    	send = ETrue;
-    	}
-	if ( send && aFinal == -1 )
-		{
-	    buf = StringLoader::LoadLC( R_SYNCSTATUS_SYNC_SEND, iServerName );
-		}
-	if ( send && aFinal >= 0 )
-		{
-		buf = StringLoader::LoadLC( R_SYNCSTATUS_SYNC_SEND, iServerName );	
-		}
-	if ( !send && aFinal == -1 )
-		{
-	    buf = StringLoader::LoadLC( R_SYNCSTATUS_SYNC_RECV, iServerName );
-		}
-	if ( !send && aFinal >= 0 ) 
-		{
-	    buf = StringLoader::LoadLC( R_SYNCSTATUS_SYNC_RECV, iServerName );	
-		}
-
-	if ( buf )
-		{
-	    TUtil::StrCopy( aText, *buf );
-	    CleanupStack::PopAndDestroy( buf );
-		}
-	}
-	
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncHandler::CancelSynchronizeL
-// -----------------------------------------------------------------------------
-//		
-void CNSmlDMSyncHandler::CancelSynchronizeL()
-    {
-    FLOG( "CNSmlDMSyncHandler::CancelSynchronizeL" );
-    
-    if ( iSyncRunning )
-        {
-        iSyncJob.StopL();
-        TInt err = RProperty::Set( KPSUidNSmlDMSyncApp,
-        			KDmJobCancel, KErrCancel);
-        FTRACE( FPrint(
-            _L( "CNSmlDMSyncHandler::CancelSynchronizeL() KDmJobCancel=-3, err = %d" ),
-                err ) );
-        SynchronizeCompletedL( KErrCancel );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncHandler::DialogDismissedL
-// -----------------------------------------------------------------------------
-//		
-void CNSmlDMSyncHandler::DialogDismissedL( TInt aButtonId )
-    {
-    FTRACE( FPrint(
-        _L( "CNSmlDMSyncHandler::DialogDismissedL(), aButtonId = %d" ),
-        aButtonId ) );
-    
-    HandleDialogEventL( aButtonId );
-    
-    FLOG( "CNSmlDMSyncHandler::DialogDismissedL() completed" );
-    }
-
-// End of File
--- a/omadm/omadmappui/src/NSmlDMSyncProfile.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1108 +0,0 @@
-/*
-* 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:  Methods for CNSmlDMSyncProfile
-*
-*/
-
-
-#include "NSmlDMSyncProfile.h"
-#include <SyncMLTransportProperties.h>
-#include "NSmlDMdef.h"
-#include "NSmlDMSyncDebug.h"
-#include "NSmlDMSyncUtil.h"
-
-// ============================ MEMBER FUNCTIONS ==============================
-//
-
-// -----------------------------------------------------------------------------
-// NewLC
-//
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CNSmlDMSyncProfile* CNSmlDMSyncProfile::NewLC( const TInt aApplicationId,
-                                               RSyncMLSession* aSyncSession )
-    {
-    FLOG( "[OMADM] CNSmlDMSyncProfile::NewLC()" );
-    
-    CNSmlDMSyncProfile* self = new( ELeave ) CNSmlDMSyncProfile( aApplicationId,
-                                                                 aSyncSession );
-	CleanupStack::PushL( self );
-	self->ConstructL();
-	return self;
-    }
-
-// -----------------------------------------------------------------------------
-// NewL
-//
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CNSmlDMSyncProfile* CNSmlDMSyncProfile::NewL( const TInt aApplicationId,
-                                              RSyncMLSession* aSyncSession )
-    {
-    FLOG( "[OMADM] CNSmlDMSyncProfile::NewL:" );
-    
-    CNSmlDMSyncProfile* self = new( ELeave ) CNSmlDMSyncProfile( aApplicationId,
-                                                                 aSyncSession );
-	CleanupStack::PushL( self );
-	self->ConstructL();
-	CleanupStack::Pop( self );
-	return self;
-    }
-
-// -----------------------------------------------------------------------------
-// Destructor.
-// -----------------------------------------------------------------------------
-//
-CNSmlDMSyncProfile::~CNSmlDMSyncProfile()
-    {
-    FLOG( "[OMADM] CNSmlDMSyncProfile::~CNSmlDMSyncProfile:" );
-    
-    iHistoryLog.Close();
-    iConnection.Close();
-    iProfile.Close();
-    }
-
-// -----------------------------------------------------------------------------
-// ConstructL
-//
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncProfile::ConstructL()
-    {
-    FLOG( "[OMADM] CNSmlDMSyncProfile::ConstructL:" );
-    }
-
-// -----------------------------------------------------------------------------
-// Constructor.
-// -----------------------------------------------------------------------------
-//
-CNSmlDMSyncProfile::CNSmlDMSyncProfile( const TInt aApplicationId,
-                                        RSyncMLSession* aSyncSession )
-	{
-	FLOG( "[OMADM] CNSmlDMSyncProfile::CNSmlDMSyncProfile:" );
-	
-	iSyncSession = aSyncSession;
-	iApplicationId = aApplicationId;
-	
-    iHistoryLogOpen = EFalse;
-    iConnectionOpen = EFalse;
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncProfile::OpenL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncProfile::OpenL( TInt aProfileId, TInt aOpenMode )
-    {
-    FTRACE( FPrint(
-        _L("[OMADM] CNSmlDMSyncProfile::OpenL(), aProfileId = %d, aOpenMode = %d"),
-        aProfileId, aOpenMode ) );
-
-    if ( aOpenMode == EOpenRead )
-    	{
-    	iProfile.OpenL( *iSyncSession, aProfileId, ESmlOpenRead );
-    	}
-    else
-    	{
-    	iProfile.OpenL( *iSyncSession, aProfileId, ESmlOpenReadWrite );
-    	}
-    if ( !iConnectionOpen )
-		{
-    	OpenConnection();
-		}
-    FLOG( "[OMADM] CNSmlDMSyncProfile::OpenL() completed" );
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncProfile::CreateL
-// -----------------------------------------------------------------------------
-//
-TInt CNSmlDMSyncProfile::CreateL()
-    {
-    FLOG( "[OMADM] CNSmlDMSyncProfile::CreateL()" );
-    
-    iProfile.CreateL( *iSyncSession );
-    iProfile.SetCreatorId( iApplicationId );
-    iProfile.UpdateL();
-    TInt id = iProfile.Identifier();
-    iProfile.Close();
-
-    FLOG( "[OMADM] CNSmlDMSyncProfile::CreateL() completed" );
-    return id;
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncProfile::CreateCopyL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncProfile::CreateCopyL( TInt aProfileId )
-    {
-    FLOG( "[OMADM] CNSmlDMSyncProfile::CreateCopyL()" );
-    
-    iProfile.CreateL( *iSyncSession );
-    iProfile.SetCreatorId( iApplicationId );
-    iProfile.UpdateL();
-    if ( !iConnectionOpen )
-		{
-    	OpenConnection();
-		}
-	if ( !iHistoryLogOpen )
-		{
-	    OpenHistoryLog();
-		}
-
-    CNSmlDMSyncProfile* profile = 
-                CNSmlDMSyncProfile::NewL( KUidSmlSyncApp.iUid, iSyncSession );
-    CleanupStack::PushL( profile );
-    profile->OpenL( aProfileId, ESmlOpenRead );
-    CopyValuesL( profile );
-    CleanupStack::PopAndDestroy( profile );
-    profile  = NULL;
-
-    iProfile.UpdateL();
-    CloseHistoryLog();
-    FLOG( "[OMADM] CNSmlDMSyncProfile::CreateCopyL() completed" );
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncProfile::SaveL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncProfile::SaveL()
-    {
-    FLOG( "[OMADM] CNSmlDMSyncProfile::SaveL()" );
-    
-    iProfile.UpdateL();
-    if ( iConnectionOpen )
-    	{
-    	iConnection.UpdateL(); // IPC call
-    	}
-    iProfile.Close();
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncProfile::GetName
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncProfile::GetName( TDes& aText )
-	{
-	FLOG( "[OMADM] CNSmlDMSyncProfile::GetName()" );
-	
-    TUtil::StrCopy( aText, iProfile.DisplayName() );
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncProfile::SetNameL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncProfile::SetNameL( const TDesC& aText )
-	{
-	FLOG( "[OMADM] CNSmlDMSyncProfile::SetNameL:" );
-	
-	iProfile.SetDisplayNameL( aText );
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncProfile::CreatorId
-// -----------------------------------------------------------------------------
-//
-TInt CNSmlDMSyncProfile::CreatorId()
-	{
-	FLOG( "[OMADM] CNSmlDMSyncProfile::CreatorId:" );
-	
-	return iProfile.CreatorId();
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncProfile::SetCreatorId
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncProfile::SetCreatorId( TInt aCreatorId )
-	{
-	FLOG( "[OMADM] CNSmlDMSyncProfile::SetCreatorId:" );
-	
-	iProfile.SetCreatorId( aCreatorId );
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncProfile::ProfileId
-// -----------------------------------------------------------------------------
-//
-TInt CNSmlDMSyncProfile::ProfileId()
-	{
-	FLOG( "[OMADM] CNSmlDMSyncProfile::ProfileId()" );
-    TInt retval = iProfile.Identifier();
-    FTRACE( FPrint( _L(
-	    "[OMADM] CNSmlDMSyncProfile::ProfileId() completed: Profile id = %d"),
-	    retval ) );
-    return retval;
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncProfile::DeleteAllowed
-// -----------------------------------------------------------------------------
-//
-TBool CNSmlDMSyncProfile::DeleteAllowed()
-	{
-	FLOG( "[OMADM] CNSmlDMSyncProfile::DeleteAllowed:" );
-	
-    return iProfile.DeleteAllowed();
-	}
-//-----------------------------------------------------------------------------
-// CNSmlDMSyncProfile::ProfileLocked()
-// -----------------------------------------------------------------------------
-//	
-TBool CNSmlDMSyncProfile::ProfileLocked()
-	{
-	FLOG( "[OMADM] CNSmlDMSyncProfile::DeleteAllowed:" );
-	
-    return iProfile.ProfileLocked(EFalse , EFalse);
-	}
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncProfile::IsSynced
-// -----------------------------------------------------------------------------
-//
-TBool CNSmlDMSyncProfile::IsSynced()
-    {
-    FLOG( "[OMADM] CNSmlDMSyncProfile::IsSynced()" );
-    
-    TBool retVal = EFalse;
-    if ( !iHistoryLogOpen )
-		{
-		FLOG( "[OMADM] CNSmlDMSyncProfile::IsSynced(): Opening history log" );
-	    OpenHistoryLog();
-		}
-		
-    if ( iHistoryLogOpen )
-    	{
-	    FTRACE( FPrint( _L(
-	        "[OMADM] CNSmlDMSyncProfile::IsSynced(): Log open! Log count = %d"),
-	                                                 iHistoryLog.Count() ) );
-    	if ( iHistoryLog.Count() > 0 )
-    	    {
-            const CSyncMLHistoryJob* job = LatestHistoryJob();
-            if ( job )
-            	{
-            	FLOG( "[OMADM] CNSmlDMSyncProfile::IsSynced(): True" );
-            	if( job->LastSuccessSyncTime() != NULL )
-                   {
-    	        retVal = ETrue;
-                   }
-            	}
-            else
-                {
-                FLOG( "[OMADM] CNSmlDMSyncProfile::IsSynced(): False" );
-                }
-    	    }
-    	}
-    else
-        {
-        FLOG( "[OMADM] CNSmlDMSyncProfile::IsSynced() Could not open history log!!!" );
-        }
-    CloseHistoryLog();    	
-
-    FLOG( "[OMADM] CNSmlDMSyncProfile::IsSynced() completed" );
-    return retVal;
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncProfile::LastSync
-// -----------------------------------------------------------------------------
-//
-TTime CNSmlDMSyncProfile::LastSync()
-    {
-    FLOG( "[OMADM] CNSmlDMSyncProfile::LastSync()" );
-
-    if ( !iHistoryLogOpen )
-		{
-		FLOG( "[OMADM] CNSmlDMSyncProfile::LastSync(): Opening history log" );
-	    OpenHistoryLog();
-		}
-    
-    TTime time = 0;
-    if ( iHistoryLogOpen )
-    	{
-	    FTRACE( FPrint( _L(
-	        "[OMADM] CNSmlDMSyncProfile::LastSync(): Log open! Log count = %d"),
-	                                                 iHistoryLog.Count() ) );
-    	
-    	if (iHistoryLog.Count() > 0)
-    	    {
-   	        const CSyncMLHistoryJob* job = LatestHistoryJob();
-            if ( job )
-            	{
-                FLOG( "[OMADM] CNSmlDMSyncProfile::LastSync() timestamp" );
-            	time = job->TimeStamp();
-            	}
-    	    }
-    	}
-    else
-        {
-        FLOG( "[OMADM] CNSmlDMSyncProfile::LastSync() Could not open history log!!!" );
-        }
-
-    CloseHistoryLog();    	
-
-    FLOG( "[OMADM] CNSmlDMSyncProfile::LastSync() completed" );
-    return time;
-    }
-
-TTime CNSmlDMSyncProfile::LastSuccessSync()
-{
-	FLOG( "[OMADM] CNSmlDMSyncProfile::LastSuccessSynctime()" );
-
-    if ( !iHistoryLogOpen )
-		{
-		FLOG( "[OMADM] CNSmlDMSyncProfile::LastSync(): Opening history log" );
-	    OpenHistoryLog();
-		}
-    
-    TTime time = 0;
-    if ( iHistoryLogOpen )
-    	{
-	    FTRACE( FPrint( _L(
-	        "[OMADM] CNSmlDMSyncProfile::LastSync(): Log open! Log count = %d"),
-	                                                 iHistoryLog.Count() ) );
-    	
-    	if (iHistoryLog.Count() > 0)
-    	    {
-   	        const CSyncMLHistoryJob* job = LatestHistoryJob();
-   	        iProfileId=ProfileId();
-            if ( job )
-            	{
-                FLOG( "[OMADM] CNSmlDMSyncProfile::LastSync() timestamp" );
-            	time = job->LastSuccessSyncTime();
-            	}
-    	    }
-    	}
-    else
-        {
-        FLOG( "[OMADM] CNSmlDMSyncProfile::LastSync() Could not open history log!!!" );
-        }
-
-    CloseHistoryLog();    	
-
-    FLOG( "[OMADM] CNSmlDMSyncProfile::LastSuccessSynctime() completed" );
-    return time;
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncProfile::GetServerIdL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncProfile::GetServerId( TDes& aText )
-    {
-    FLOG( "[OMADM] CNSmlDMSyncProfile::GetServerIdL:" );
-    
-	TUtil::StrCopy(aText, iProfile.ServerId());
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncProfile::SetServerIdL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncProfile::SetServerIdL( const TDesC& aText )
-	{
-	FLOG( "[OMADM] CNSmlDMSyncProfile::SetServerIdL:" );
-	
-	TBuf8<KBufSize256> buf;
-	TUtil::StrCopy(buf, aText);
-	iProfile.SetServerIdL(buf);
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncProfile::GetServerPassword
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncProfile::GetServerPassword(TDes& aText)
-	{
-	FLOG( "[OMADM] CNSmlDMSyncProfile::GetServerPassword:" );
-	
-	TUtil::StrCopy( aText, iProfile.ServerPassword() );
-	}
-	
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncProfile::SetServerPasswordL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncProfile::SetServerPasswordL(const TDesC& aText)
-	{
-	FLOG( "[OMADM] CNSmlDMSyncProfile::SetServerPasswordL:" );
-	
-	TUtil::StrCopy(iBuf8, aText);    // conver TDes to TDes8
-	iProfile.SetServerPasswordL(iBuf8);
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncProfile::ProtocolVersion
-// -----------------------------------------------------------------------------
-//
-TInt CNSmlDMSyncProfile::ProtocolVersion()
-	{
-	FLOG( "[OMADM] CNSmlDMSyncProfile::ProtocolVersion:" );
-	
-	TSmlProtocolVersion version = iProfile.ProtocolVersion();
-	return version;
-	}
-	
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncProfile::SetProtocolVersionL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncProfile::SetProtocolVersionL(TInt aProtocolVersion)
-	{
-	FLOG( "[OMADM] CNSmlDMSyncProfile::SetProtocolVersionL:" );
-	
-	iProfile.SetProtocolVersionL((TSmlProtocolVersion) aProtocolVersion);
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncProfile::BearerType
-// -----------------------------------------------------------------------------
-//
-TInt CNSmlDMSyncProfile::BearerType()
-	{
-	FLOG( "[OMADM] CNSmlDMSyncProfile::BearerType:" );
-	
-	TInt id = iConnection.Identifier();
-	
-	if (id == KUidNSmlMediumTypeInternet.iUid)
-		{
-		return EAspBearerInternet;
-		}
-	else if (id == KUidNSmlMediumTypeBluetooth.iUid)
-		{
-		return EAspBearerBlueTooth;
-		}
-	else
-		{
-		return EAspBearerInternet;
-		}
-    }
-	
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncProfile::SetBearerTypeL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncProfile::SetBearerTypeL(TInt aId)
-	{
-	FLOG( "[OMADM] CNSmlDMSyncProfile::SetBearerTypeL:" );
-
-	if ( aId == EAspBearerInternet )
-		{
-		iConnection.CreateL( Profile(), KUidNSmlMediumTypeInternet.iUid );
-		}
-	else if ( aId == EAspBearerBlueTooth )
-		{
-		iConnection.CreateL( Profile(), KUidNSmlMediumTypeBluetooth.iUid );
-    	}
-	else
-        {
-        // Set default as Internet
-        iConnection.CreateL( Profile(), KUidNSmlMediumTypeInternet.iUid );
-        }
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncProfile::AccessPointL
-// -----------------------------------------------------------------------------
-//
-TInt CNSmlDMSyncProfile::AccessPointL()
-	{
-	FLOG( "[OMADM] CNSmlDMSyncProfile::AccessPointL:" );
-	
-	TInt num = KErrNotFound;
-	
-	if ( iConnectionOpen )
-		{
-	    if ( iConnection.Identifier() == KUidNSmlMediumTypeInternet.iUid )
-	        {
-        	TBuf8<KBufSize32> key;
-        	TBuf<KBufSize32> value;
-
-        	GetConnectionPropertyNameL( key, EPropertyIntenetAccessPoint );
-        	TUtil::StrCopy( value, iConnection.GetPropertyL( key ) );
-        	User::LeaveIfError( TUtil::StrToInt(value, num) );
-	        }
-		}
-	return num;
-	}
-	
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncProfile::SetAccessPointL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncProfile::SetAccessPointL( const TInt aId )
-	{
-	FTRACE(RDebug::Print(
-	         _L("[OMADM] CNSmlDMSyncProfile::SetAccessPointL aId (%d)"), aId));
-
-	if ( iConnectionOpen )
-		{
-	    if ( iConnection.Identifier() == KUidNSmlMediumTypeInternet.iUid )
-	        { 
-	       	TBuf<KBufSize32> buf;
-        	TBuf8<KBufSize32> key;
-        	TBuf8<KBufSize32> value;
-        	
-        	buf.Num(aId);
-        	TUtil::StrCopy(value, buf);  // convert TDes to TDes8
-        	
-        	GetConnectionPropertyNameL(key, EPropertyIntenetAccessPoint);
-        	
-        	FTRACE(RDebug::Print(
-        	    _L("[OMADM] CNSmlDMSyncProfile::SetAccessPointL key (%S) value (%S)"),
-        	    &key, &value ) );
-        	    
-        	iConnection.SetPropertyL( key, value );
-	        }
-		}
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncProfile::GetHostAddressL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncProfile::GetHostAddress(TDes& aText, TInt& aPort)
-	{
-	FLOG( "[OMADM] CNSmlDMSyncProfile::GetHostAddress:" );
-	aText = KNullDesC;
-	aPort = KDefaultHttpPort;
-	
-    if (!iConnectionOpen)	
-    	{
-      	return;
-    	}
-	
-	if (BearerType() != EAspBearerInternet)
-		{
-		TUtil::StrCopy(aText, iConnection.ServerURI()); // convert TDes8 to TDes
-		return;  // port number handling is for internet bearer only 
-		}
-	
-	TUtil::StrCopy( iBuf, iConnection.ServerURI() ); // convert TDes8 to TDes
-	
-	TURIParser parser( iBuf );
-	parser.GetUriWithoutPort( aText );
-	aPort = parser.Port();
-	if (aPort == KErrNotFound)
-		{
-		aPort = parser.DefaultPort();
-		}
-	}
-	
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncProfile::SetHostAddressL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncProfile::SetHostAddressL( const TDesC& aText, const TInt aPort )
-	{
-	FLOG( "[OMADM] CNSmlDMSyncProfile::SetHostAddressL:" );
-	
-    if (!iConnectionOpen)	
-    	{
-    	return;
-    	}
-	if (BearerType() != EAspBearerInternet)
-		{
-		// port number handling is for internet bearer only 
-		TUtil::StrCopy(iBuf, aText); 
-		}
-	else
-		{
-		TURIParser parser(aText);
-	    parser.GetUri(iBuf, aPort);
-		}
-	
-	TUtil::StrCopy( iBuf8, iBuf );
-	iConnection.SetServerURIL( iBuf8 );
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncProfile::GetUserNameL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncProfile::GetUserName(TDes& aText)
-	{
-	FLOG( "[OMADM] CNSmlDMSyncProfile::GetUserNameL:" );
-	
-	TUtil::StrCopy( aText, iProfile.UserName() );
-	}
-	
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncProfile::SetUserNameL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncProfile::SetUserNameL(const TDesC& aText)
-	{
-	FLOG( "[OMADM] CNSmlDMSyncProfile::SetUserNameL:" );
-	
-	TUtil::StrCopy(iBuf8, aText);  // conver TDes to TDes8
-	iProfile.SetUserNameL(iBuf8);
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncProfile::GetPasswordL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncProfile::GetPassword(TDes& aText)
-	{
-	FLOG( "[OMADM] CNSmlDMSyncProfile::GetPasswordL:" );
-	
-	TUtil::StrCopy( aText, iProfile.Password() );
-	}
-	
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncProfile::SetPasswordL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncProfile::SetPasswordL(const TDesC& aText)
-	{
-	FLOG( "[OMADM] CNSmlDMSyncProfile::SetPasswordL:" );
-	TUtil::StrCopy( iBuf8, aText );    // conver TDes to TDes8
-	
-	FTRACE( RDebug::Print(
-	     _L("[OMADM] CNSmlDMSyncProfile::SetPasswordL iBuf8 (%S)"), &iBuf8 ) );
-	iProfile.SetPasswordL( iBuf8 );
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncProfile::SASyncState
-// -----------------------------------------------------------------------------
-//
-TInt CNSmlDMSyncProfile::SASyncState()
-	{
-	FLOG( "[OMADM] CNSmlDMSyncProfile::SASyncState()" );
-	
-	TSmlServerAlertedAction state = iProfile.SanUserInteraction();
-
-    FTRACE( FPrint(
-        _L( "[OMADM] CNSmlDMSyncProfile::SASyncState() completed, state = %d" ),
-        state ) );
-
-	if (state == ESmlConfirmSync)
-		{
-		return ESASyncStateConfirm;
-		}
-	else if (state == ESmlDisableSync)
-		{
-		return ESASyncStateDisable;
-		}
-	else 
-		{
-		return ESASyncStateEnable;
-		}
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncProfile::SetSASyncStateL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncProfile::SetSASyncStateL(TInt aState)
-    {
-	if (aState == ESASyncStateConfirm)
-		{
-		FLOG( "[OMADM] CNSmlDMSyncProfile::SetSASyncStateL:ESmlConfirmSync" );
-		Profile().SetSanUserInteractionL(ESmlConfirmSync);
-		}
-	else if (aState == ESASyncStateDisable)
-		{
-		FLOG( "[OMADM] CNSmlDMSyncProfile::SetSASyncStateL:ESmlDisableSync" );
-		Profile().SetSanUserInteractionL(ESmlDisableSync);
-		}
-	else
-		{
-		FLOG( "[OMADM] CNSmlDMSyncProfile::SetSASyncStateL:ESmlEnableSync" );
-		Profile().SetSanUserInteractionL(ESmlEnableSync);
-		}
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncProfile::SetHttpUsed
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncProfile::SetHttpUsedL(TBool aEnable)
-	{
-	FLOG( "[OMADM] CNSmlDMSyncProfile::SetHttpUsed:" );
-
-    if ( iConnectionOpen )
-    	{
-    	if ( iConnection.Identifier() == KUidNSmlMediumTypeInternet.iUid )
-		    {
-        	TBuf8<KBufSize32> key;
-        	TBuf8<KBufSize32> value;
-        	
-        	if ( aEnable )
-        		{
-        		value.Num( KHttpUsed ); 
-        		}
-        	else
-        		{
-        		value.Num( KHttpNotUsed );
-        		}
-        		
-        	GetConnectionPropertyNameL( key, EPropertyHttpUsed );
-        	iConnection.SetPropertyL( key, value );
-		    }
-    	}
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncProfile::HttpUsedL
-// -----------------------------------------------------------------------------
-//
-TBool CNSmlDMSyncProfile::HttpUsedL()
-	{
-	FLOG( "[OMADM] CNSmlDMSyncProfile::HttpUsedL:" );
-    TBool retVal = EFalse; 
-    if ( iConnectionOpen )
-    	{
-    	if ( iConnection.Identifier() == KUidNSmlMediumTypeInternet.iUid )
-		    {
-        	TBuf8<KBufSize32> key; 
-        	TBuf<KBufSize32> value;
-        	TInt intValue;
-        	
-        	GetConnectionPropertyNameL(key, EPropertyHttpUsed);
-        	TUtil::StrCopy(value, iConnection.GetPropertyL(key));
-        	
-            User::LeaveIfError( TUtil::StrToInt( value, intValue ) );
-            
-            if ( intValue == 1 )
-            	{
-                retVal = ETrue;
-                }
-		    }
-    	}
-    return retVal;
-	}
-	
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncProfile::GetHttpUsernameL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncProfile::GetHttpUserNameL( TDes& aText )
-	{
-	FLOG( "[OMADM] CNSmlDMSyncProfile::GetHttpUsernameL:" );
-
-	aText = KNullDesC;
-	
-    if ( iConnectionOpen )
-    	{
-    	if ( iConnection.Identifier() == KUidNSmlMediumTypeInternet.iUid )
-		    {
-        	TBuf8<KBufSize32> key; 
-        	
-        	GetConnectionPropertyNameL( key, EPropertyHttpUserName );
-        	TUtil::StrCopy( aText, iConnection.GetPropertyL( key ) );
-		    }
-    	}
-  	}
-	
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncProfile::SetHttpUsernameL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncProfile::SetHttpUserNameL( const TDesC& aText )
-	{
-	FLOG( "[OMADM] CNSmlDMSyncProfile::SetHttpUsernameL:" );
-
-    if ( iConnectionOpen )
-    	{
-    	if ( iConnection.Identifier() == KUidNSmlMediumTypeInternet.iUid )
-		    {
-		    TBuf8<KBufSize32> key;
-	
-	        GetConnectionPropertyNameL( key, EPropertyHttpUserName );
-	        TUtil::StrCopy( iBuf8, aText );  // convert TDes to TDes8
-	        iConnection.SetPropertyL( key, iBuf8 );
-		    }
-    	}
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncProfile::GetHttpPasswordL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncProfile::GetHttpPasswordL( TDes& aText )
-	{
-	FLOG( "[OMADM] CNSmlDMSyncProfile::GetHttpPasswordL:" );
-   	aText = KNullDesC;
-   	
-    if ( iConnectionOpen )
-    	{
-    	if ( iConnection.Identifier() == KUidNSmlMediumTypeInternet.iUid )
-		    {
-		    TBuf8<KBufSize32> key; 
-	        GetConnectionPropertyNameL( key, EPropertyHttpPassword );
-            TUtil::StrCopy( aText, iConnection.GetPropertyL( key ) );
-		    }
-    	}
-	}
-	
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncProfile::SetHttpPasswordL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncProfile::SetHttpPasswordL( const TDesC& aText )
-	{
-	FLOG( "[OMADM] CNSmlDMSyncProfile::SetHttpPasswordL:" );
-
-    if ( iConnectionOpen )
-    	{
-    	if ( iConnection.Identifier() == KUidNSmlMediumTypeInternet.iUid )
-		    {
-        	TBuf8<KBufSize32> key;
-        	
-        	GetConnectionPropertyNameL( key, EPropertyHttpPassword );
-        	TUtil::StrCopy( iBuf8, aText );  // convert TDes to TDes8
-        	iConnection.SetPropertyL( key, iBuf8 );
-    	    }
-    	}
-	}
- 
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncProfile::Profile
-// -----------------------------------------------------------------------------
-//
-RSyncMLDevManProfile& CNSmlDMSyncProfile::Profile()
-    {
-    FLOG( "[OMADM] CNSmlDMSyncProfile::Profile()" );
-    
-    return iProfile;
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncProfile::LatestHistoryJob
-// -----------------------------------------------------------------------------
-//
-const CSyncMLHistoryJob* CNSmlDMSyncProfile::LatestHistoryJob()
-    {
-    FLOG( "[OMADM] CNSmlDMSyncProfile::LatestHistoryJob:" );
-    
-    if ( !iHistoryLogOpen )
-		{
-        OpenHistoryLog();
-		}
-		
-    if ( iHistoryLogOpen )
-		{
-	    TInt count = iHistoryLog.Count();
-        FTRACE( FPrint( _L(
-            "[OMADM] CNSmlDMSyncProfile::LatestHistoryJob(): Log count %d"),
-            count ) );
-
-        if ( count == 0 )
-            {
-            FLOG( "[OMADM] CNSmlDMSyncProfile::LatestHistoryJob(): No history" );
-            return NULL;  // profile has no history job
-            }
-            
-        // sort array
-        iHistoryLog.SortEntries( CSyncMLHistoryEntry::ESortByTime );    
-        
-        // try to find latest sync job (start from last array entry)
-        for ( TInt index = count - 1; index >= 0; index-- )
-        	{
-        	FTRACE( FPrint( _L(
-        	    "[OMADM] CNSmlDMSyncProfile::LatestHistoryJob: count %d index %d"),
-        	    count, index ) );
-            //const CSyncMLHistoryEntry& entry = iHistoryLog[index];
-            const CSyncMLHistoryEntry& entry = iHistoryLog.Entry( index );
-            
-        	FTRACE( FPrint( _L(
-        	    "[OMADM] CNSmlDMSyncProfile::LatestHistoryJob: Entry type = %x"),
-        	    entry.EntryType().iUid ) );
-            
-            const CSyncMLHistoryJob* jobEntry =
-                CSyncMLHistoryJob::DynamicCast( &entry );
-
-            if ( jobEntry )
-            	{
-            	FLOG( "[OMADM] CNSmlDMSyncProfile::LatestHistoryJob() completed: OK" );
-            	return jobEntry;
-            	}
-        	}
-		}
-
-    FLOG( "[OMADM] CNSmlDMSyncProfile::LatestHistoryJob() completed: No history found" );
-    return NULL;  // profile has no history job
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncProfile::OpenHistoryLog
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncProfile::OpenHistoryLog()
-    {
-    FLOG( "[OMADM] CNSmlDMSyncProfile::OpenHistoryLog()" );
-    
-    TInt id = ProfileId();
-   	TRAPD( err, iHistoryLog.OpenL( Session(), id ) );
-
-   	if ( err == KErrNone )
-   		{
-   		FLOG( "[OMADM] CNSmlDMSyncProfile::OpenHistoryLog(): Opened" );
-   		iHistoryLogOpen = ETrue;
-    	}
-
-    FLOG( "[OMADM] CNSmlDMSyncProfile::OpenHistoryLog() completed" );
-    }
-    
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncProfile::CloseHistoryLog
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncProfile::CloseHistoryLog()
-    {
-    FLOG( "[OMADM] CNSmlDMSyncProfile::CloseHistoryLog()" );
-    
-   	if ( iHistoryLogOpen )
-   		{
-   		FLOG( "[OMADM] CNSmlDMSyncProfile::CloseHistoryLog(): Closed " );
-   		iHistoryLog.Close();
-   		iHistoryLogOpen = EFalse;
-    	}
-
-    FLOG( "[OMADM] CNSmlDMSyncProfile::CloseHistoryLog() completed" );
-    }
-    
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncProfile::OpenConnection
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncProfile::OpenConnection()
-    {
-    FLOG( "[OMADM] CNSmlDMSyncProfile::OpenConnection()" );
-        
-   	TInt err = KErrNone;
-   	RArray<TSmlTransportId> arr;
-   	
-    TRAP( err, Profile().ListConnectionsL(arr) );
-    if ( err != KErrNone )
-    	{
-    	return; 
-    	}
-    if ( arr.Count() == 0 )
-    	{
-     	arr.Close();  
-    	return; // no connection
-    	}
-        	
-    TInt transportId = arr[0];
-    arr.Close();
-    	
-    TRAP( err, iConnection.OpenL( iProfile, transportId ) );
-    if ( err == KErrNone )
-    	{
-    	iConnectionOpen = ETrue;
-    	}
-
-    FTRACE( FPrint( _L(
-        "[OMADM] CNSmlDMSyncProfile::OpenConnection() completed, err = %d" ),
-        err ) );
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncProfile::Session
-// -----------------------------------------------------------------------------
-//
-RSyncMLSession& CNSmlDMSyncProfile::Session()
-	{
-	FLOG( "[OMADM] CNSmlDMSyncProfile::Session:" );
-	
-	return *iSyncSession;
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncProfile::GetConnectionPropertyNameL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncProfile::GetConnectionPropertyNameL( TDes8& aText,
-                                                     TInt aPropertyPos )
-	{
-	FLOG( "[OMADM] CNSmlDMSyncProfile::GetConnectionPropertyNameL:" );
-	
-	// at the moment RSyncMLTransport is only needed
-	// for internet connection settings
-	RSyncMLTransport transport;
-	CleanupClosePushL( transport );
-	transport.OpenL( Session(), KUidNSmlMediumTypeInternet.iUid );
-
-	const CSyncMLTransportPropertiesArray&  arr = transport.Properties();
-
-    __ASSERT_DEBUG( arr.Count() > aPropertyPos, TUtil::Panic( KErrGeneral ) );
-
-	const TSyncMLTransportPropertyInfo& info = arr.At( aPropertyPos );
-	aText = info.iName;
-	CleanupStack::PopAndDestroy( &transport );
-	
-	FLOG( "[OMADM] CNSmlDMSyncProfile::GetConnectionPropertyNameL() completed" );
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncProfile::CopyValuesL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncProfile::CopyValuesL( CNSmlDMSyncProfile* aSource )
-    {
-	FLOG( "[OMADM] CNSmlDMSyncProfile::CopyValuesL()" );
-
-    TBuf<KBufSize256> buf;
-    TInt num = 0;
-    
-    num = aSource->ProtocolVersion();
-    SetProtocolVersionL( num );
-    if ( num == 1 )
-    	{
-    	aSource->GetServerId( buf );
-    	SetServerIdL( buf );
-    	}
-    	
-    num = aSource->BearerType();
-    SetBearerTypeL( num );
-    
-     num = aSource->AccessPointL();
-    SetAccessPointL( num );
-    
-    aSource->GetHostAddress( buf, num );
-    SetHostAddressL( buf, num );
-     
-    aSource->GetUserName( buf );
-    SetUserNameL(buf);
-     
-    aSource->GetPassword( buf );
-    SetPasswordL( buf );
-    
-    num = aSource->SASyncState();
-    SetSASyncStateL( num );
-    
-    if ( aSource->BearerType() == EAspBearerInternet)
-    	{
-    	num = aSource->HttpUsedL();
-    	SetHttpUsedL(num);
-    	
-    	aSource->GetHttpUserNameL(buf);
-    	SetHttpUserNameL(buf);
-    	
-    	aSource->GetHttpPasswordL(buf);
-    	SetHttpPasswordL(buf);
-    	}
-	FLOG( "[OMADM] CNSmlDMSyncProfile::CopyValuesL() completed" );
-    }
-    
-// End of File
--- a/omadm/omadmappui/src/NSmlDMSyncProfileItem.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
-/*
-* 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:  Profile item
-*
-*/
-
-
-#include "NSmlDMSyncProfileItem.h"
-#include "NSmlDMSyncDebug.h"
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// TNSmlDMSyncProfileItem::Id
-// -----------------------------------------------------------------------------
-//
-TInt TNSmlDMSyncProfileItem::Id()
-	{
-	FLOG( "[OMADM] TNSmlDMSyncProfileItem::Id:" );
-	
-	return iProfileId;
-	}
-
-// -----------------------------------------------------------------------------
-// TNSmlDMSyncProfileItem::SetId
-// -----------------------------------------------------------------------------
-//
-void TNSmlDMSyncProfileItem::SetId(TInt aId)
-	{
-	FLOG( "[OMADM] TNSmlDMSyncProfileItem::SetId:" );
-	
-	iProfileId = aId;
-	}
-
-// -----------------------------------------------------------------------------
-// TNSmlDMSyncProfileItem::Name
-// -----------------------------------------------------------------------------
-//
-const TDesC& TNSmlDMSyncProfileItem::Name()
-	{
-	FLOG( "[OMADM] TNSmlDMSyncProfileItem::Name:" );
-	
-	return iProfileName;
-	}
-
-// -----------------------------------------------------------------------------
-// TNSmlDMSyncProfileItem::SetName
-// -----------------------------------------------------------------------------
-//
-void TNSmlDMSyncProfileItem::SetName( const TDesC& aName )
-	{
-	FLOG( "[OMADM] TNSmlDMSyncProfileItem::SetName:" );
-	
-	iProfileName.Copy( aName.Left( iProfileName.MaxLength() ) );
-	}
-
-// -----------------------------------------------------------------------------
-// TNSmlDMSyncProfileItem::CompareItem
-// -----------------------------------------------------------------------------
-//
-TInt TNSmlDMSyncProfileItem::CompareItem( 
-                                        const TNSmlDMSyncProfileItem& aFirst,
-                                        const TNSmlDMSyncProfileItem& aSecond )
-	{
-	FLOG( "[OMADM] TNSmlDMSyncProfileItem::CompareItem:" );
-	
-	return aFirst.iProfileName.Compare( aSecond.iProfileName );
-	}
-
-// End of File
--- a/omadm/omadmappui/src/NSmlDMSyncProfileList.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,335 +0,0 @@
-/*
-* Copyright (c) 2005-2006 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:  Methods for CNSmlDMSyncProfile
-*
-*/
-
-
-#include <SyncMLTransportProperties.h>
-#include <centralrepository.h>
-#include <featmgr.h>
-
-#include "NSmlDMSyncPrivateCRKeys.h"
-
-#include "NSmlDMSyncProfileList.h"
-#include "NSmlDMSyncProfile.h"
-#include "NSmlDMSyncDebug.h"
-#include "NSmlDMSyncAppEngine.h"
-#include "NSmlDMSyncUtil.h"
-
-// ============================ MEMBER FUNCTIONS ==============================
-//
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncProfileList::NewL
-//
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CNSmlDMSyncProfileList* CNSmlDMSyncProfileList::NewL( 
-                                                CNSmlDMSyncAppEngine* aEngine )
-    {
-    FLOG( "[OMADM] CNSmlDMSyncProfileList::NewL:");
-    
-    CNSmlDMSyncProfileList* self = 
-                                new(ELeave) CNSmlDMSyncProfileList( aEngine );
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	CleanupStack::Pop( self );
-	return self;
-    }
-
-// -----------------------------------------------------------------------------
-// Destructor.
-// -----------------------------------------------------------------------------
-//
-CNSmlDMSyncProfileList::~CNSmlDMSyncProfileList()
-    {
-    FLOG( "[OMADM] CNSmlDMSyncProfileList::~CNSmlDMSyncProfileList():" );
-    
-	iList.Close();
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncProfileList::ConstructL
-//
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncProfileList::ConstructL(void)
-    {
-    FLOG( "[OMADM] CNSmlDMSyncProfileList::ConstructL:" );
-    
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncProfileList::CNSmlDMSyncProfileList.
-// -----------------------------------------------------------------------------
-//
-CNSmlDMSyncProfileList::CNSmlDMSyncProfileList( CNSmlDMSyncAppEngine* aEngine )
-	{
-	FLOG( "[OMADM] CNSmlDMSyncProfileList::CNSmlDMSyncProfileList:" );
-	
-	iEngine = aEngine;
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncProfileList::Count
-// -----------------------------------------------------------------------------
-//
-TInt CNSmlDMSyncProfileList::Count()
-	{
-	return iList.Count();
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncProfileList::Item
-// -----------------------------------------------------------------------------
-//
-TNSmlDMSyncProfileItem CNSmlDMSyncProfileList::Item(TInt aIndex)
-	{
-	if ( ( aIndex < 0 ) || ( aIndex >= Count() ) )
-	    {
-		TUtil::Panic(KErrGeneral);
-	    }
-
-	return iList[aIndex];
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncProfileList::FindProfile
-// -----------------------------------------------------------------------------
-//
-TInt CNSmlDMSyncProfileList::FindProfile(const TDesC& aProfileName)
-	{
-	FLOG( "[OMADM] CNSmlDMSyncProfileList::FindProfile:" );
-	
-	for ( TInt index = 0; index < Count(); index++ )
-		{
-		TPtrC ptr = Item(index).Name();
-		if ( ptr.Compare( aProfileName ) == 0 )
-			{
-			return index;
-			}
-		}
-	return KErrNotFound;
-	}
-
-// -----------------------------------------------------------------------------
-// ReplaceProfileItemL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncProfileList::ReplaceProfileItemL( 
-                                        TNSmlDMSyncProfileItem& aProfileItem )
-	{
-	// remove old profile with same id
-	Remove( aProfileItem.iProfileId );
-	// add new profile 
-    User::LeaveIfError( iList.Append(aProfileItem) );
-    Sort();
-	}
-	
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncProfileList::ReadProfileItemL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncProfileList::ReadProfileItemL( TInt aIndex )
-	{
-	FLOG("[OMADM] CNSmlDMSyncProfileList::ReadProfileItemL:" );
-	
-    CNSmlDMSyncProfile* profile = iEngine->OpenProfileL( aIndex, ESmlOpenRead );
-	
-	TNSmlDMSyncProfileItem item = ReadProfileItemL( profile );
-	item.iMandatoryCheck = CheckMandatoryDataL( profile );
-	ReplaceProfileItemL( item );
-	iEngine->CloseProfile();
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncProfileList::ReadProfileItemsL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncProfileList::ReadProfileItemsL()
-	{
-	ReadProfileItemsL( EFalse );
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncProfileList::ReadProfileItemsL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncProfileList::ReadProfileItemsL( TBool aIncludeHidden )
-	{
-	FLOG( "[OMADM] CNSmlDMSyncProfileList::ReadProfileItemsL:" );
-	
-	RArray<TSmlProfileId> arr;
-    iEngine->Session()->ListProfilesL( arr, ESmlDevMan );
-   	CleanupClosePushL(arr);
-    TNSmlDMSyncProfileItem item;
-
-    TBool fotaSupported = FeatureManager::FeatureSupported( KFeatureIdSyncMlDmFota );
-    TBuf<KBufSize256> fotaProfileId;
-
-    if ( fotaSupported && !aIncludeHidden )
-    	{
-        CRepository* centrep = CRepository::NewL( KCRUidNSmlDMSyncApp );
-        if ( centrep->Get( KNSmlDMFotaHiddenProfileIdKey, fotaProfileId ) != KErrNone )
-            {
-            fotaProfileId.Zero();
-            }
-        FTRACE( FPrint(
-            _L("[OMADM] CNSmlDMSyncProfileList::ReadProfileItemsL() hidden FOTA profile id = \"%S\""),
-            &fotaProfileId ) );
-        delete centrep;
-    	}
-    
-	for ( TInt index = 0; index < arr.Count(); index++ )
-		{
-	    TRAPD( error, iEngine->OpenProfileL( arr[index], ESmlOpenRead ) );
-	    if ( error == KErrNone )
-	        {
-	        TRAPD( retVal, item = ReadProfileItemL( iEngine->Profile() ) );
-
-            TBuf<KBufSize256> profileId;
-            iEngine->Profile()->GetServerId( profileId );
-            if ( (retVal == KErrNone)
-                && ( fotaProfileId.Compare(profileId) != 0 ) )
-                {
-                iList.Append( item );
-                }
-
-            iEngine->CloseProfile();
-	        }
-		}
-    CleanupStack::PopAndDestroy( &arr );
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncProfileList::ReadProfileItemL
-// -----------------------------------------------------------------------------
-//
-TNSmlDMSyncProfileItem CNSmlDMSyncProfileList::ReadProfileItemL( 
-                                                CNSmlDMSyncProfile* aProfile )
-	{
-	FLOG( "[OMADM] CNSmlDMSyncProfileList::ReadProfileItemL:" );
-	
-	TNSmlDMSyncProfileItem item;
-	item.iApplicationId = aProfile->CreatorId();
-	TBuf<KBufSize> buf;
-	aProfile->GetName( buf );
-	item.SetName( buf );
-	item.SetId( aProfile->ProfileId() );
-	item.iSynced    = aProfile->IsSynced();
-	item.iLastSync  = aProfile->LastSync();
-	item.iLastSuccessSync = aProfile->LastSuccessSync();
-	item.iBearer    = aProfile->BearerType();
-    item.iActive    = EFalse;
-    if ( aProfile->SASyncState() != ESASyncStateDisable )
-    	{
-    	item.iActive = ETrue;
-    	}
-	item.iDeleteAllowed = aProfile->DeleteAllowed();
-	item.iProfileLocked = aProfile->ProfileLocked();
-	
-	// check whether all mandatory data exist
-	item.iMandatoryCheck = CheckMandatoryDataL( aProfile );
-	return item;	
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncProfileList::Reset
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncProfileList::Reset()
-	{
-	FLOG( "[OMADM] CNSmlDMSyncProfileList::Reset:" );
-	
-	iList.Reset();
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncProfileList::Remove
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncProfileList::Remove( TInt aProfileId )
-	{
-	FLOG( "[OMADM] CNSmlDMSyncProfileList::Remove:" );
-	
-	for ( TInt index = 0; index < Count(); index++ )
-		{
-		TNSmlDMSyncProfileItem item = iList[index];
-		if ( item.iProfileId == aProfileId )
-			{
-			iList.Remove( index );
-			return;
-			}
-		}
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncProfileList::CheckMandatoryDataL
-// -----------------------------------------------------------------------------
-//
-TInt CNSmlDMSyncProfileList::CheckMandatoryDataL( CNSmlDMSyncProfile* aProfile )
-	{
-	FLOG( "[OMADM] CNSmlDMSyncProfileList::CheckMandatoryDataL:" );
-
-	TBuf<KBufSize> buf;
-	TInt num;
-
-	aProfile->GetName( buf );
-	if ( TUtil::IsEmpty( buf ) )
-		{
-		return EMandatoryNoProfileName;
-		}
-
-	aProfile->GetHostAddress( buf, num );
-	if ( TUtil::IsEmpty( buf ) )
-		{
-		return EMandatoryNoHostAddress;
-		}
-
-    return EMandatoryOk;
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncProfileList::IsEmpty
-// -----------------------------------------------------------------------------
-//
-TBool CNSmlDMSyncProfileList::IsEmpty( const TDesC& aText )
-	{
-	FLOG( "[OMADM] CNSmlDMSyncProfileList::IsEmpty:" );
-	
-	for ( TInt index = 0; index < aText.Length(); index++ )
-		{
-		TChar character = aText[index];
-		if ( !character.IsSpace() )
-			{
-			return EFalse;
-			}
-		}
-	return ETrue;
-	}
-	
-// -----------------------------------------------------------------------------
-// Sort
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncProfileList::Sort()
-	{
-	iList.Sort( TLinearOrder<TNSmlDMSyncProfileItem>(
-	                                    TNSmlDMSyncProfileItem::CompareItem) );
-	}
-
-// End of File
--- a/omadm/omadmappui/src/NSmlDMSyncState.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,207 +0,0 @@
-/*
-* 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:  Sync state handler
-*
-*/
-
-
-// INCLUDE FILES
-
-#include "NSmlDMSyncState.h"
-#include "NSmlDMSyncUtil.h"
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// NewL
-//
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CNSmlDMSyncState* CNSmlDMSyncState::NewL()
-    {
-    CNSmlDMSyncState* self = new(ELeave) CNSmlDMSyncState();
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	CleanupStack::Pop(self);
-	return self;
-    }
-
-// -----------------------------------------------------------------------------
-// ~CNSmlDMSyncState
-//
-// Destructor.
-// -----------------------------------------------------------------------------
-//
-CNSmlDMSyncState::~CNSmlDMSyncState()
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSyncState
-//
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CNSmlDMSyncState::CNSmlDMSyncState()
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// ConstructL
-//
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncState::ConstructL()
-    {
-	Reset();
-    }
-
-// -----------------------------------------------------------------------------
-// Reset
-//
-// Resets all state variables.
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncState::Reset()
-    {
-	iSyncPhase = EPhaseNone;
-    }
-
-
-// -----------------------------------------------------------------------------
-// SetSyncPhase
-//
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncState::SetSyncPhase(TInt aPhase)
-	{
-	iSyncPhase = aPhase;
-	}
-
-
-// -----------------------------------------------------------------------------
-// SyncPhase
-//
-// -----------------------------------------------------------------------------
-//
-TInt CNSmlDMSyncState::SyncPhase()
-	{
-	return iSyncPhase;
-	}
-
-
-// -----------------------------------------------------------------------------
-// SetProgress
-//
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncState::SetProgress(TInt aCount)
-	{
-	iProgressCount = aCount;
-	}
-
-// -----------------------------------------------------------------------------
-// IncreaseProgress
-//
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncState::IncreaseProgress()
-	{
-	if (iProgressCount < iTotalProgressCount)
-		{
-		iProgressCount++;
-		}
-	}
-
-// -----------------------------------------------------------------------------
-// Progress
-//
-// -----------------------------------------------------------------------------
-//
-TInt CNSmlDMSyncState::Progress()
-	{
-	return iProgressCount;
-	}
-
-// -----------------------------------------------------------------------------
-// SetTotalProgress
-//
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncState::SetTotalProgress(TInt aCount)
-	{
-	iTotalProgressCount = aCount;
-	}
-
-// -----------------------------------------------------------------------------
-// TotalProgress
-//
-// -----------------------------------------------------------------------------
-//
-TInt CNSmlDMSyncState::TotalProgress()
-	{
-	return iTotalProgressCount;
-	}
-
-// -----------------------------------------------------------------------------
-// SetContent
-//
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncState::SetContent(const TDesC& aContent)
-	{
-	TUtil::StrCopy(iSyncContent, aContent);
-	}
-
-// -----------------------------------------------------------------------------
-// Content
-//
-// -----------------------------------------------------------------------------
-//
-const TDesC& CNSmlDMSyncState::Content()
-	{
-	return iSyncContent;
-	}
-
-// -----------------------------------------------------------------------------
-// ResetProgress
-//
-// -----------------------------------------------------------------------------
-//
-void CNSmlDMSyncState::ResetProgress()
-	{
-	iProgressCount = 0;
-	iTotalProgressCount = 0;
-	iSyncContent = KNullDesC;
-	}
-
-// -----------------------------------------------------------------------------
-// ProgressKnown
-//
-// -----------------------------------------------------------------------------
-//
-TBool CNSmlDMSyncState::ProgressKnown()
-	{
-	if (iTotalProgressCount == -1 )
-		{
-		return EFalse;
-		}
-
-	return ETrue;
-	}
-
-
--- a/omadm/omadmappui/src/NSmlDMSyncUtil.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,862 +0,0 @@
-/*
-* 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:  Utility classes.
-*
-*/
-
-
-
-// INCLUDES
-#include <SyncMLTransportProperties.h>
-#include <eikenv.h>
-#include <bautils.h>
-#include <collate.h>
-#include <StringLoader.h>
-#include <avkon.rsg>
-
-#include <SettingEnforcementInfo.h> // VSettingEnforcementInfo
-
-#include "NSmlDMdef.h"
-#include "NSmlDMSyncUtil.h"
-#include "NSmlDMSyncDebug.h"
-#include <featmgr.h>
-
-/*****************************************************************************
- * class TUtil
- *****************************************************************************/
-
-
-// ----------------------------------------------------------------------------
-// Panic
-// ----------------------------------------------------------------------------
-//
-void TUtil::Panic(TInt aReason)
-    {
-	_LIT(KPanicCategory,"NSmlDMSyncUtil");
-
-	User::Panic( KPanicCategory, aReason ); 
-    }
-
-// ----------------------------------------------------------------------------
-// StrCopy
-// String copy with lenght check.
-// ----------------------------------------------------------------------------
-//
-void TUtil::StrCopy( TDes8& aTarget, const TDesC& aSource )
-    {
-    aTarget.Copy( aSource.Left(aTarget.MaxLength() ) );
-    }
-
-// ----------------------------------------------------------------------------
-// StrCopy
-// String copy with lenght check.
-// ----------------------------------------------------------------------------
-//
-void TUtil::StrCopy( TDes& aTarget, const TDesC8& aSource )
-    {
-	aTarget.Copy( aSource.Left(aTarget.MaxLength() ) );
-    }
-
-// ----------------------------------------------------------------------------
-// StrCopy
-// String copy with lenght check.
-// ----------------------------------------------------------------------------
-//
-void TUtil::StrCopy( TDes& aTarget, const TDesC& aSource )
-    {
-	aTarget.Copy( aSource.Left( aTarget.MaxLength() ) );
-    }
-
-// ----------------------------------------------------------------------------
-// StrAppend
-// ----------------------------------------------------------------------------
-//
-void TUtil::StrAppend( TDes& aTarget, const TDesC& aSource )
-    {
-    if ( aSource.Length() == 0 )
-    	{
-    	return;
-    	}
-    TInt free = aTarget.MaxLength() - aTarget.Length();
-	if ( aSource.Length() <= free )
-		{
-		aTarget.Append( aSource );
-		}
-    }
-
-// ----------------------------------------------------------------------------
-// StrInsert
-// ----------------------------------------------------------------------------
-//
-void TUtil::StrInsert( TDes& aTarget, const TDesC& aSource )
-    {
-	TInt free = aTarget.MaxLength() - aTarget.Length();
-	if (aSource.Length() <= free)
-		{
-		aTarget.Insert(0, aSource);
-		}
-    }
-
-// ----------------------------------------------------------------------------
-// StrToInt
-// ----------------------------------------------------------------------------
-//
-TInt TUtil::StrToInt( const TDesC& aText, TInt& aNum )
-	{
-    TLex lex( aText );
-    TInt err = lex.Val( aNum ); 
-	return err;
-	}
-
-//
-//-----------------------------------------------------------------------------
-// IsEmpty
-// Function returns ETrue if string only contains white space
-// or has no characters.
-//-----------------------------------------------------------------------------
-//
-TBool TUtil::IsEmpty( const TDesC& aText )
-	{
-	TInt len = aText.Length();
-	for ( TInt index=0; index < len; index++ )
-		{
-		TChar character = aText[index];
-		if ( !character.IsSpace() )
-			{
-			return EFalse;
-			}
-		}
-	return ETrue;
-	}
-
-// -----------------------------------------------------------------------------
-// SyncTimeLC
-// -----------------------------------------------------------------------------
-//
-HBufC* TUtil::SyncTimeLC( TTime aLastSync )
-	{
-	FLOG( "[OMADM] TUtil::SyncTimeLC" );
-	
-	TTime homeTime = ConvertUniversalToHomeTime( aLastSync );
-	
-	HBufC* hBuf = HBufC::NewLC( KBufSize255 );
-	TPtr ptr = hBuf->Des();
-
-	if ( IsToday( homeTime ) )
-		{
-		FLOG( "[OMADM] TUtil::SyncTimeLC time" );
-		
-		TBuf<KBufSize> timeFormat;
-		HBufC* buf = StringLoader::LoadLC( R_QTN_TIME_USUAL_WITH_ZERO );
-		TUtil::StrCopy( timeFormat, *buf );
-		CleanupStack::PopAndDestroy( buf );
-		homeTime.FormatL( ptr, timeFormat );
-		
-		FLOG( "[OMADM] TUtil::SyncTimeLC time done" );
-		}
-	else
-		{
-		FLOG( "[OMADM] TUtil::SyncTimeLC date" );
-		
-		TBuf<KBufSize> dateFormat;
-        HBufC* buf = StringLoader::LoadLC( R_QTN_DATE_USUAL_WITH_ZERO );
-        TUtil::StrCopy( dateFormat, *buf );
-        CleanupStack::PopAndDestroy( buf );
-		homeTime.FormatL(ptr, dateFormat);
-		
-		FLOG( "[OMADM] TUtil::SyncTimeLC date done" );
-		}
-    FLOG( "[OMADM] TUtil::SyncTimeLC Done" );
-	return hBuf;
-	}
-
-// -----------------------------------------------------------------------------
-// ConvertUniversalToHomeTime
-// -----------------------------------------------------------------------------
-//
-TTime TUtil::ConvertUniversalToHomeTime( const TTime& aUniversalTime )
-    {
-    TTime time( aUniversalTime );   // time stores UTC time.
-
-    TLocale locale;
-    TTimeIntervalSeconds universalTimeOffset( locale.UniversalTimeOffset() );
-    
-    // Add locale's universal time offset to universal time.
-    time += universalTimeOffset;    // time stores Local Time.
-
-    // If home daylight saving in effect, add one hour offset.
-    if ( locale.QueryHomeHasDaylightSavingOn() )
-        {
-        TTimeIntervalHours daylightSaving(1);
-        time += daylightSaving;
-        }
-
-    return time;
-    }
-
-// -----------------------------------------------------------------------------
-// IsToDay
-// -----------------------------------------------------------------------------
-//
-TBool TUtil::IsToday(TTime aTime)
-	{
-	FLOG( "[OMADM] TUtil::IsToday" );
-	
-	TTime now;
-	now.HomeTime();
-	TInt day1 = now.DayNoInYear();
-	TInt day2 = aTime.DayNoInYear();
-	TTimeIntervalDays daysBetween = now.DaysFrom( aTime );
-	
-	if ( day1 != day2 )
-		{
-		FLOG( "[OMADM] TUtil::IsToday False 1" );
-		return EFalse;
-		}
-		
-	if ( daysBetween.Int() > 0 )
-		{
-		FLOG( "[OMADM] TUtil::IsToday False 2" );
-		return EFalse;
-		}
-
-    FLOG( "[OMADM] TUtil::IsToday True" );
-	return ETrue; 
-	}
-
-
-// -----------------------------------------------------------------------------
-// TUtil::GetDateTextL
-// -----------------------------------------------------------------------------
-//
-void TUtil::GetDateTextL(TDes& aText, TTime aDateTime)
-	{
-	TTime homeTime = ConvertUniversalToHomeTime( aDateTime );
-	HBufC* hBuf = StringLoader::LoadLC( R_QTN_DATE_USUAL_WITH_ZERO );
-    homeTime.FormatL( aText, *hBuf );
-    CleanupStack::PopAndDestroy( hBuf );
-	}
-
-
-// -----------------------------------------------------------------------------
-// TUtil::GetTimeTextL
-// -----------------------------------------------------------------------------
-//
-void TUtil::GetTimeTextL( TDes& aText, TTime aDateTime )
-	{
-	TTime homeTime = ConvertUniversalToHomeTime( aDateTime );
-	HBufC* hBuf = StringLoader::LoadLC( R_QTN_TIME_USUAL_WITH_ZERO );
-    homeTime.FormatL( aText, *hBuf );
-    CleanupStack::PopAndDestroy( hBuf );
-	}
-
-
-// -----------------------------------------------------------------------------
-// TUtil::GetDateTimeTextL
-// -----------------------------------------------------------------------------
-//
-void TUtil::GetDateTimeTextL( TDes& aText, TTime aDateTime )
-	{
-	TDateTime dt = aDateTime.DateTime();
-	aText.Format(_L("%02d.%02d.%04d %02d:%02d:%02d"), dt.Day()+1,
-	                                                  dt.Month()+1,
-	                                                  dt.Year(),
-	                                                  dt.Hour(),
-	                                                  dt.Minute(),
-	                                                  dt.Second() );
-	}
-
-
-// ---------------------------------------------------------
-// TUtil::SettingEnforcementStateL
-// 
-// Checks if setting enforcement is activated.
-// ---------------------------------------------------------
-TBool TUtil::SettingEnforcementStateL()
-    {
-FeatureManager::InitializeLibL();
-if(!FeatureManager::FeatureSupported(KFeatureIdSapPolicyManagement))
-{
-		FeatureManager::UnInitializeLib();
-		    return EFalse;
-}
-else
-{
-	FeatureManager::UnInitializeLib();
-	CSettingEnforcementInfo* info = CSettingEnforcementInfo::NewL();
-	CleanupStack::PushL(info);
-
-	TBool active = EFalse;
-	User::LeaveIfError(info->EnforcementActive(ESyncMLEnforcement, active));
-	CleanupStack::PopAndDestroy(info);
-
-	return active;
-}
-
-    }
-
-
-// ---------------------------------------------------------
-// TUtil::SettingEnforcementState
-// 
-// Checks if setting enforcement is activated.
-// ---------------------------------------------------------
-TBool TUtil::SettingEnforcementState()
-    {
-    TBool ret = EFalse;
-
-    TRAP_IGNORE(ret = SettingEnforcementStateL());
-
-    return ret;
-    }
-
-
-/*****************************************************************************
- * class TURIParser
- *****************************************************************************/
-
-// ----------------------------------------------------------------------------
-// Constructor
-// ----------------------------------------------------------------------------
-//
-TURIParser::TURIParser( const TDesC& aStr ) : iOriginalStr( aStr )
-    {
-    SkipHttp();
-    }
-
-// ----------------------------------------------------------------------------
-// GetUriWithoutPort
-// URI format: "http://serveraddress/documentname/"
-// ----------------------------------------------------------------------------
-//
-void TURIParser::GetUriWithoutPort( TDes& aText )
-	{
-	aText = KNullDesC;
-	TPtrC http = ParseHttp();
-	TPtrC address = ParseAddress();
-	TPtrC document = ParseDocument();
-	TUtil::StrAppend( aText, http );
-	TUtil::StrAppend( aText, address );
-	
-	if (document.Length() > 0)
-		{
-		TUtil::StrAppend( aText, KSlash );
-		TUtil::StrAppend( aText, document );
-		}
-	else if ( iSlash )
-		{
-		TUtil::StrAppend( aText, KSlash );
-		}
-	}
-	
-// ----------------------------------------------------------------------------
-// GetURI
-// URI format: "http://serveraddress:port/documentname/"
-// ----------------------------------------------------------------------------
-//
-void TURIParser::GetUri( TDes& aText, const TInt aPort )
-	{
-	aText = KNullDesC;
-	TPtrC http = ParseHttp();
-	TPtrC address = ParseAddress();
-	TPtrC document = ParseDocument();
-	TUtil::StrAppend( aText, http );
-	TUtil::StrAppend( aText, address );
-	
-	TBuf<KBufSize32> buf;
-	buf.Num( aPort );
-	TUtil::StrAppend( aText, KColon );
-	TUtil::StrAppend( aText, buf );
-	
-	if ( document.Length() > 0 )
-		{
-		TUtil::StrAppend( aText, KSlash );
-		TUtil::StrAppend( aText, document );
-		}
-	else if ( iSlash )
-		{
-		TUtil::StrAppend( aText, KSlash );
-		}
-	}
-
-// ----------------------------------------------------------------------------
-// Port
-// ----------------------------------------------------------------------------
-//
-TInt TURIParser::Port()
-	{
-	TInt port = KErrNotFound;
-	
-	TInt err = ParsePort( port );
-	if ( err != KErrNone )
-		{
-		return KErrNotFound;
-		}
-	return port;
-	}
-
-// ----------------------------------------------------------------------------
-// DefaultPort
-// 
-// ----------------------------------------------------------------------------
-//
-TInt TURIParser::DefaultPort()
-	{
-	TInt pos = iOriginalStr.FindF( KHttpsHeader );
-	if ( pos != KErrNotFound )
-		{
-		return KDefaultHttpsPort;
-		}
-	return KDefaultHttpPort;
-	}
-
-// ----------------------------------------------------------------------------
-// SkipHttp
-// Set pointer to the end of "http://".
-// ----------------------------------------------------------------------------
-//
-void TURIParser::SkipHttp()
-	{
-    TInt start = KErrNotFound;
-    TInt end   = KErrNotFound;
-    TStr str(iOriginalStr);
-    
-    GetHttpPos( start, end );
-    
-    if ( start != KErrNotFound )
-    	{
-    	iPtr.Set( str.Right( end + 1 ) );
-    	}
-    else
-    	{
-    	iPtr.Set( str.Right(0) );
-    	}
-	}
-
-// ----------------------------------------------------------------------------
-// ParseHttp
-// 
-// ----------------------------------------------------------------------------
-//
-TPtrC TURIParser::ParseHttp()
-	{
-    TInt start = KErrNotFound;
-    TInt end   = KErrNotFound;
-    
-    GetHttpPos(start, end);
-    
-    if (start == KErrNotFound)
-    	{
-    	return TPtrC();
-    	}
-    
-   	TStr str(iOriginalStr);
-    return str.SubStr(start, end);
-	}
-
-// ----------------------------------------------------------------------------
-// GetHttpPos 
-// ----------------------------------------------------------------------------
-//
-void TURIParser::GetHttpPos( TInt& aStartPos, TInt& aEndPos )
-	{
-	aEndPos = KErrNotFound;
-	
-	aStartPos = iOriginalStr.FindF( KHttpHeader );
-	if ( aStartPos != KErrNotFound )
-		{
-		aEndPos = aStartPos + KHttpHeader().Length() - 1;
-		return;
-		}
-	
-	aStartPos = iOriginalStr.FindF( KHttpsHeader );
-	if ( aStartPos != KErrNotFound )
-		{
-		aEndPos = aStartPos + KHttpsHeader().Length() - 1;
-		return;
-		}
-	}
-
-// ----------------------------------------------------------------------------
-// ParseAddress
-// ----------------------------------------------------------------------------
-TPtrC TURIParser::ParseAddress()
-	{
-	const TChar KSlash('/');
-	const TChar KColon(':');
-	TStr str( iPtr );
-    TInt firstSlash = str.Find( 0, KSlash );
-	TInt firstcolon = str.Find( 0, KColon );
-	TBool portFound = EFalse;
-	iSlash = EFalse;
-	if ( firstSlash != KErrNotFound ) 
-	    {
-		 iSlash = ETrue;
-	    }
-	if (firstcolon != KErrNotFound)
-		{
-		if ( firstSlash == KErrNotFound )
-			{
-			portFound = ETrue;
-			}
-		else if ( firstcolon < firstSlash )
-			{
-			portFound = ETrue;
-			}
-		}
-    
-	if ( portFound )
-		{
-		// address is text before first colon
-		return str.Left( firstcolon - 1 );
-		}
-	else if (firstSlash != KErrNotFound)
-		{
-		// address is text before first slash
-		return str.Left( firstSlash - 1 );
-		}
-	else
-		{
-		// address is all text
-		return str.Right( 0 );
-		}
-	}
-
-// ----------------------------------------------------------------------------
-// ParseDocument
-// ----------------------------------------------------------------------------
-TPtrC TURIParser::ParseDocument()
-	{
-	const TChar KSlash('/');
-	
-	TStr str(iPtr);
-    TInt firstSlash = str.Find( 0, KSlash );
-    
-	if ( firstSlash != KErrNotFound )
-		{
-		// document is all text after first slash
-		return str.Right( firstSlash + 1 );
-		}
-	return TPtrC();
-	}
-	
-// ----------------------------------------------------------------------------
-// ParsePort
-// ----------------------------------------------------------------------------
-// 
-TInt TURIParser::ParsePort( TInt& aNumber )
-	{
-	TPtrC port = ParsePort();
-	if ( port.Length() == 0 )
-		{
-		return KErrNotFound;
-		}
-	return TUtil::StrToInt( port, aNumber );
-	}
-
-// ----------------------------------------------------------------------------
-// ParsePort
-// ----------------------------------------------------------------------------
-// 
-TPtrC TURIParser::ParsePort()
-	{
-	const TChar KSlash('/');
-	const TChar KColon(':');
-	
-	TStr str(iPtr);
-    TInt firstSlash = str.Find( 0, KSlash );
-	TInt firstColon = str.Find( 0, KColon );
-    
-	if ( firstSlash != KErrNotFound )
-		{
-		if ( firstColon != KErrNotFound && firstColon < firstSlash )
-			{
-		    // port number is text between colon and slash 
-		    return str.SubStrEx( firstColon, firstSlash );
-			}
-		}
-	else 
-		{
-		if ( firstColon != KErrNotFound )
-			{
-		    // port number is all text after colon 
-		    return str.Right(firstColon+1);
-			}
-		}
-	return TPtrC();
-	}
-
-/*****************************************************************************
- * class TStr
- *****************************************************************************/
-
-// ----------------------------------------------------------------------------
-// TStr::TStr
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// ----------------------------------------------------------------------------
-//
-TStr::TStr( const TDesC& aStr ) : iStr( aStr )
-    {
-    }
-
-// ----------------------------------------------------------------------------
-// TStr::Mid
-// ----------------------------------------------------------------------------
-//
-TPtrC TStr::Mid( TInt aPos )
-    {
-	if ( ( aPos < 0 ) || ( aPos >= iStr.Length() ) )
-	    {
-		return TPtrC();  // return empty descriptor
-	    }
-	return iStr.Mid( aPos );
-    }
-
-// ----------------------------------------------------------------------------
-// TStr::Mid
-// ----------------------------------------------------------------------------
-//
-TPtrC TStr::Mid( TInt aPos, TInt aLen )
-    {
-	TInt len = iStr.Length();
-	if ( ( aPos < 0 ) || ( aPos >= len ) )
-	    {
-		return TPtrC();
-	    }
-	if ( ( aLen <= 0 ) || ( aPos + aLen > len ) )
-	    {
-		return TPtrC();
-	    }
-
-	return iStr.Mid( aPos, aLen );
-    }
-
-// ----------------------------------------------------------------------------
-// TStr::Right
-// ----------------------------------------------------------------------------
-//
-TPtrC TStr::Right( TInt aPos )
-    {
-	return Mid( aPos );
-    }
-
-// ----------------------------------------------------------------------------
-// TStr::Left
-// ----------------------------------------------------------------------------
-//
-TPtrC TStr::Left( TInt aPos )
-    {
-	TInt len = iStr.Length();
-
-	if ( ( aPos < 0 ) || ( len == 0 ) )
-	    {
-		return TPtrC();
-	    }
-
-	TInt pos = len;
-	if ( ( aPos + 1 ) < len )
-	    {
-		pos = aPos + 1;
-	    }
-
-	return iStr.Left( pos );
-    }
-
-// ----------------------------------------------------------------------------
-// TStr::SubStr
-// ----------------------------------------------------------------------------
-//
-TPtrC TStr::SubStr( TInt aStartPos, TInt aEndPos )
-    {
-	return Mid( aStartPos, aEndPos - aStartPos + 1 );
-    }
-
-// ----------------------------------------------------------------------------
-// TStr::SubStrEx
-// ----------------------------------------------------------------------------
-//
-TPtrC TStr::SubStrEx( TInt aStartPos, TInt aEndPos )
-    {
-	return Mid( aStartPos + 1, aEndPos - aStartPos - 1 );
-    }
-
-// ----------------------------------------------------------------------------
-// TStr::LastPos
-// ----------------------------------------------------------------------------
-//
-TInt TStr::LastPos()
-    {
-	return iStr.Length() - 1;
-    }
-
-// ----------------------------------------------------------------------------
-// TStr::Len
-// ----------------------------------------------------------------------------
-//
-TInt TStr::Len()
-    {
-    return iStr.Length();
-    }
-
-// ----------------------------------------------------------------------------
-// TStr::Compare
-// ----------------------------------------------------------------------------
-//
-TBool TStr::Compare( TInt aPos, TChar aChar )
-    {
-	TInt len = iStr.Length();
-	if ( ( aPos < 0) || ( aPos >= len ) )
-	    {
-		return EFalse;
-	    }
-	TChar ch = iStr[aPos];
-	if ( ch == aChar )
-	    {
-		return ETrue;
-	    }
-	return EFalse;
-    }
-
-// ----------------------------------------------------------------------------
-// TStr::Find
-// ----------------------------------------------------------------------------
-//
-TInt TStr::Find(TInt aPos, TChar aChar)
-    {
-	TInt len = iStr.Length();
-	if ( (aPos < 0) || (aPos >= len) )
-	    {
-		return KErrNotFound;
-	    }
-	    
-	TPtrC ptr(iStr.Mid(aPos)); // move to possition aPos
-	return ptr.Locate(aChar);
-    }
-
-//*****************************************************************************
-//* class CNSmlDMActiveCaller
-//*****************************************************************************
-
-// ----------------------------------------------------------------------------
-// CNSmlDMActiveCaller::NewL
-// ----------------------------------------------------------------------------
-//
-CNSmlDMActiveCaller* CNSmlDMActiveCaller::NewL( 
-                                       MNSmlDMActiveCallerObserver* aObserver )
-    {
-    CNSmlDMActiveCaller* self = new(ELeave) CNSmlDMActiveCaller( aObserver );
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	CleanupStack::Pop(self);
-
-	return self;
-    }
-
-// ----------------------------------------------------------------------------
-// Destructor
-// ----------------------------------------------------------------------------
-//
-CNSmlDMActiveCaller::~CNSmlDMActiveCaller()
-    {
-	Cancel();
-	iTimer.Close();
-    }
-
-// ----------------------------------------------------------------------------
-// CNSmlDMActiveCaller::CNSmlDMActiveCaller
-// ----------------------------------------------------------------------------
-//
-CNSmlDMActiveCaller::CNSmlDMActiveCaller( 
-                                        MNSmlDMActiveCallerObserver* aObserver )
-                                      : CActive(CActive::EPriorityStandard )
-    {
-	iObserver = aObserver;
-    }
-
-// ----------------------------------------------------------------------------
-// CNSmlDMActiveCaller::ConstructL
-// ----------------------------------------------------------------------------
-//
-void CNSmlDMActiveCaller::ConstructL()
-    {
-	User::LeaveIfError(iTimer.CreateLocal());
-	CActiveScheduler::Add(this);
-    }
-
-// ----------------------------------------------------------------------------
-// CNSmlDMActiveCaller::DoCancel
-// ----------------------------------------------------------------------------
-//
-void CNSmlDMActiveCaller::DoCancel()
-    {
-	iTimer.Cancel();
-    }
-
-// ----------------------------------------------------------------------------
-// CNSmlDMActiveCaller::RunL
-// ----------------------------------------------------------------------------
-//
-void CNSmlDMActiveCaller::RunL()
-    {
-    iObserver->HandleActiveCallL( );
-    }
-
-// ----------------------------------------------------------------------------
-// CNSmlDMActiveCaller::RunError
-// ----------------------------------------------------------------------------
-//
-TInt CNSmlDMActiveCaller::RunError( TInt /*aError*/ )
-    {
-    return KErrNone;
-    }
-    
-// ----------------------------------------------------------------------------
-// CNSmlDMActiveCaller::CompleteSelf
-//
-// This function calls this class RunL.
-// ----------------------------------------------------------------------------
-//
-void CNSmlDMActiveCaller::CompleteSelf()
-    {
-	SetActive();
-	TRequestStatus* status = &iStatus;
-	User::RequestComplete( status, KErrNone );
-    }
-
-// ----------------------------------------------------------------------------
-// CNSmlDMActiveCaller::Start
-// ----------------------------------------------------------------------------
-//
-void CNSmlDMActiveCaller::Start( TInt aCallId, TInt aMilliseconds )
-    {
-	if (IsActive())
-		{
-		return;
-		}
-	
-	iCallId = aCallId;
-
-	if (aMilliseconds <= 0)
-		{
-		CompleteSelf();  // no delay - complete right away
-		}
-	else
-		{
-	    iTimer.After( iStatus, aMilliseconds*1000 );
-	    SetActive();
-		}
-    }
-
-// End of File
--- a/omadm/omadmappui/tsrc/Bmarm/ui_dmuiu.def	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	LibEntryL__FR13CTestModuleIf @ 1 NONAME R3UNUSED ; LibEntryL(CTestModuleIf &)
-
--- a/omadm/omadmappui/tsrc/Bwins/ui_dmuiu.def	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	?LibEntryL@@YAPAVCScriptBase@@AAVCTestModuleIf@@@Z @ 1 NONAME ; class CScriptBase * __cdecl LibEntryL(class CTestModuleIf &)
-
--- a/omadm/omadmappui/tsrc/conf/tcConnSet.cfg	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,133 +0,0 @@
-
-[Test]
-title OpenDMFOTADefaultProfileView
-run testscripter c:\testframework\ui_dmui.cfg 1
-run testscripter c:\testframework\ui_dmui.cfg 6
-[Endtest]
-
-[Test]
-title LaunchDMFOTAViewHelp
-run testscripter c:\testframework\ui_dmui.cfg 1
-run testscripter c:\testframework\ui_dmui.cfg 7
-[Endtest]
-
-[Test]
-title ExitDMAppfromMainview
-run testscripter c:\testframework\ui_dmui.cfg 1
-run testscripter c:\testframework\ui_dmui.cfg 8
-[Endtest]
-
-[Test]
-title Newprofilecopy
-run testscripter c:\testframework\ui_dmui.cfg 1
-run testscripter c:\testframework\ui_dmui.cfg 9
-[Endtest]
-
-[Test]
-title Newprofilewithoutcopy
-run testscripter c:\testframework\ui_dmui.cfg 1
-run testscripter c:\testframework\ui_dmui.cfg 10
-[Endtest]
-
-[Test]
-title EditProfile
-run testscripter c:\testframework\ui_dmui.cfg 1
-run testscripter c:\testframework\ui_dmui.cfg 11
-[Endtest]
-
-[Test]
-title DelteProfileandExit
-run testscripter c:\testframework\ui_dmui.cfg 1
-run testscripter c:\testframework\ui_dmui.cfg 12
-[Endtest]
-
-[Test]
-title DMServersViewHelp
-run testscripter c:\testframework\ui_dmui.cfg 1
-run testscripter c:\testframework\ui_dmui.cfg 13
-[Endtest]
-
-[Test]
-title DMServersViewExit
-run testscripter c:\testframework\ui_dmui.cfg 1
-run testscripter c:\testframework\ui_dmui.cfg 14
-[Endtest]
-
-[Test]
-title EditDMServerId
-run testscripter c:\testframework\ui_dmui.cfg 1
-run testscripter c:\testframework\ui_dmui.cfg 15
-[Endtest]
-
-[Test]
-title OpenDMFOTADefaultViewHelp
-run testscripter c:\testframework\ui_dmui.cfg 1
-run testscripter c:\testframework\ui_dmui.cfg 16
-[Endtest]
-
-[Test]
-title OpenDMFOTADefaultViewExit
-run testscripter c:\testframework\ui_dmui.cfg 1
-run testscripter c:\testframework\ui_dmui.cfg 17
-[Endtest]
-
-[Test]
-title DMServersettingshelpandexit
-run testscripter c:\testframework\ui_dmui.cfg 1
-run testscripter c:\testframework\ui_dmui.cfg 18
-[Endtest]
-
-[Test]
-title OpenDMServersviewcancelsync
-run testscripter c:\testframework\ui_dmui.cfg 1
-run testscripter c:\testframework\ui_dmui.cfg 19
-[Endtest]
-
-[Test]
-title OpenDMServersviewendkey
-run testscripter c:\testframework\ui_dmui.cfg 1
-run testscripter c:\testframework\ui_dmui.cfg 20
-[Endtest]
-
-[Test]
-title Mainviewcancelsync
-run testscripter c:\testframework\ui_dmui.cfg 1
-run testscripter c:\testframework\ui_dmui.cfg 21
-[Endtest]
-
-[Test]
-title mainviewendkey
-run testscripter c:\testframework\ui_dmui.cfg 1
-run testscripter c:\testframework\ui_dmui.cfg 22
-[Endtest]
-
-[Test]
-title EditserverPassword
-run testscripter c:\testframework\ui_dmui.cfg 1
-run testscripter c:\testframework\ui_dmui.cfg 23
-[Endtest]
-
-[Test]
-title EditserverPort
-run testscripter c:\testframework\ui_dmui.cfg 1
-run testscripter c:\testframework\ui_dmui.cfg 24
-[Endtest]
-
-[Test]
-title EditserverSettingpage
-run testscripter c:\testframework\ui_dmui.cfg 1
-run testscripter c:\testframework\ui_dmui.cfg 25
-[Endtest]
-
-
-[Test]
-title OpenDMServersViewwrongIAP
-run testscripter c:\testframework\ui_dmui.cfg 1
-run testscripter c:\testframework\ui_dmui.cfg 2
-[Endtest]
-
-[Test]
-title OpenDMmainViewcorrectIAP
-run testscripter c:\testframework\ui_dmui.cfg 1
-run testscripter c:\testframework\ui_dmui.cfg 3
-[Endtest]
--- a/omadm/omadmappui/tsrc/conf/ui_dmui.cfg	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,710 +0,0 @@
-[Test]
-title LaunchAPP#1
-bringtoforeground
-create ui_dmui foobar
-foobar Example pa ra me ters
-pause 1000
-presskey EKeyUpArrow
-presskey keycode=EKeyEnter
-delete foobar
-sendtobackground
-[Endtest] 
-
-
-[Test]
-title OpenDMServersviewandConnectUseWrongIAP#2
-pause 7000
-presskey global EKeyDevice0
-pause 2000
-presskey global EKeyDownArrow
-pause 1000
-presskey global EKeyDevice0
-pause 3000
-presskey global EKeyDevice0
-pause 1000
-presskey global EKeyDevice0
-pause 3000
-presskey global EKeyDevice0
-pause 3000
-presskey global EKeyDevice0
-pause 2000
-presskey global EKeyDevice0
-pause 2000
-presskey global EKeyDevice0
-pause 2000
-presskey global EKeyDevice0
-pause 7000
-presskey global EKeyDevice1
-pause 7000
-presskey global EKeyDevice1
-sendtobackground
-[Endtest]
-
-[Test]
-title OpenMainviewConnectandExitUseWrongIAP#3
-pause 7000
-presskey global EKeyDevice0
-pause 1000
-presskey global EKeyDevice0
-pause 3000
-presskey global EKeyDevice0
-pause 1000
-presskey global EKeyDevice0
-pause 5000
-presskey global EKeyDevice1 // may be cancel or exit
-pause 7000
-presskey global EKeyDevice1 // if cancel then exit
-sendtobackground
-[Endtest]
-
-[Test]
-title OpenDMServersviewandConnectUsecorrectIAP#4
-pause 7000
-presskey global EKeyDevice0
-pause 2000
-presskey global EKeyDownArrow
-pause 1000
-presskey global EKeyDevice0
-pause 3000
-presskey global EKeyDevice0
-pause 1000
-presskey global EKeyDevice0
-pause 8000
-presskey global EKeyDevice0
-pause 2000
-presskey global EKeyDevice0
-pause 2000
-presskey global EKeyDownArrow
-presskey global EKeyDownArrow
-pause 500
-presskey global EKeyDownArrow
-pause 2000
-presskey global EKeyDevice0
-pause 10000
-presskey global EKeyDevice1
-sendtobackground
-[Endtest]
-
-[Test]
-title OpenMainviewConnectandExitUsecorrectIAP#5
-pause 7000
-presskey global EKeyDevice0
-pause 1000
-presskey global EKeyDevice0
-pause 3000
-presskey global EKeyDevice0
-pause 1000
-presskey global EKeyUpArrow
-pause 1000
-presskey global EKeyDevice0
-pause 3000
-presskey global EKeyDevice0
-pause 3000
-presskey global EKeyDevice0
-pause 2000
-presskey global EKeyDevice0
-pause 2000
-presskey global EKeyDevice0
-pause 5000
-presskey global EKeyDevice1
-sendtobackground
-[Endtest]
-
-[Test]
-title OpenDMFOTADefaultProfileView#6
-pause 7000
-presskey global EKeyDevice0
-pause 2000
-presskey global EKeyDownArrow
-pause 2000
-presskey global EKeyDownArrow
-pause 2000
-presskey global EKeyDevice0
-pause 2000
-presskey global EKeyDevice0
-pause 2000
-presskey global EKeyDevice0
-pause 2000
-presskey global EKeyDownArrow
-pause 2000
-presskey global EKeyDevice0
-pause 2000
-presskey global EKeyDevice1
-sendtobackground
-[Endtest]
-
-[Test]
-title OpenDMMainviewHelp#7
-pause 7000
-presskey global EKeyDevice0
-pause 2000
-presskey global EKeyDownArrow
-pause 2000
-presskey global EKeyDownArrow
-pause 2000
-presskey global EKeyDownArrow
-pause 5000
-presskey global EKeyDevice1
-pause 2000
-presskey global EKeyDevice1
-sendtobackground
-[Endtest]
-
-[Test]
-title OpenDMMainviewExit#8
-pause 7000
-presskey global EKeyDevice0
-pause 2000
-presskey global EKeyDownArrow
-pause 2000
-presskey global EKeyDownArrow
-pause 2000
-presskey global EKeyDownArrow
-pause 2000
-presskey global EKeyDownArrow
-pause 2000
-presskey global EKeyDevice0
-sendtobackground
-[Endtest]
-
-[Test]
-title DMServersviewNewProfilewithcopydontsave#9
-pause 7000
-presskey global EKeyDevice0
-pause 2000
-presskey global EKeyDownArrow
-pause 1000
-presskey global EKeyDevice0
-pause 3000
-presskey global EKeyDevice0
-pause 1000
-presskey global EKeyDownArrow
-pause 1000
-presskey global EKeyDevice0
-pause 1000
-presskey global EKeyDevice0
-pause 3000
-presskey global EKeyDownArrow
-pause 1000
-presskey global EKeyDownArrow
-pause 1000
-presskey global EKeyDevice0
-pause 1000
-presskey global EKeyDevice0
-pause 1000
-presskey global EKeyDevice1
-pause 1000
-presskey global EKeyDevice1
-pause 1000
-presskey global EKeyDevice1
-pause 1000
-presskey global EKeyDevice1
-pause 1000
-presskey global EKeyDevice0
-pause 3000
-presskey global EKeyDevice1
-sendtobackground
-[Endtest]
-
-[Test]
-title DMServersviewNewProfiledontcopydontsave#10
-pause 7000
-presskey global EKeyDevice0
-pause 2000
-presskey global EKeyDownArrow
-pause 1000
-presskey global EKeyDevice0
-pause 3000
-presskey global EKeyDevice0
-pause 1000
-presskey global EKeyDownArrow
-pause 1000
-presskey global EKeyDevice0
-pause 1000
-presskey global EKeyDevice1
-pause 3000
-presskey global EKeyDownArrow
-pause 1000
-presskey global EKeyDevice0
-pause 1000
-presskey global EKeyDevice0
-pause 1000
-presskey global EKeyDevice1
-pause 1000
-presskey global EKeyDevice1
-pause 1000
-presskey global EKeyDevice1
-pause 1000
-presskey global EKeyDevice1
-pause 1000
-presskey global EKeyDevice0
-pause 3000
-presskey global EKeyDevice1
-sendtobackground
-[Endtest]
-
-[Test]
-title EditserverProfile#11
-pause 7000
-presskey global EKeyDevice0
-pause 2000
-presskey global EKeyDownArrow
-pause 1000
-presskey global EKeyDevice0
-pause 3000
-presskey global EKeyDevice0
-pause 1000
-presskey global EKeyDownArrow
-pause 1000
-presskey global EKeyDownArrow
-pause 2000
-presskey global EKeyDevice0
-pause 4000
-presskey global EKeyDownArrow
-pause 1000
-presskey global EKeyDevice0
-pause 1000
-presskey global EKeyDevice0
-pause 1000
-presskey global EKeyDevice0
-pause 1000
-presskey global EKeyDevice1
-pause 1000
-presskey global EKeyDevice1
-pause 3000
-presskey global EKeyDevice1
-sendtobackground
-[Endtest]
-
-[Test]
-title DeleteserverProfileandexit#12
-pause 7000
-presskey global EKeyDevice0
-pause 2000
-presskey global EKeyDownArrow
-pause 1000
-presskey global EKeyDevice0
-pause 3000
-presskey global EKeyDevice0
-pause 1000
-presskey global EKeyDownArrow
-pause 1000
-presskey global EKeyDownArrow
-pause 1000
-presskey global EKeyDownArrow
-pause 2000
-presskey global EKeyDevice0
-pause 2000
-presskey global EKeyDevice1
-pause 4000
-presskey global EKeyDevice0
-pause 1000
-presskey global EKeyDownArrow
-pause 1000
-presskey global EKeyDownArrow
-pause 1000
-presskey global EKeyDownArrow
-pause 2000
-presskey global EKeyDevice0
-pause 2000
-presskey global EKeyDevice0
-pause 6000
-presskey global EKeyDevice1
-pause 6000
-presskey global EKeyDevice1
-sendtobackground
-[Endtest]
-
-
-[Test]
-title DMServersViewHelp#13
-pause 7000
-presskey global EKeyDevice0
-pause 2000
-presskey global EKeyDownArrow
-pause 1000
-presskey global EKeyDevice0
-pause 3000
-presskey global EKeyDevice0
-pause 1000
-presskey global EKeyDownArrow
-pause 1000
-presskey global EKeyDownArrow
-pause 1000
-presskey global EKeyDownArrow
-pause 1000
-presskey global EKeyDownArrow
-pause 2000
-presskey global EKeyDevice0
-pause 4000
-presskey global EKeyDevice1
-pause 4000
-presskey global EKeyDevice1
-sendtobackground
-[Endtest]
-
-DMServersViewExit
-[Test]
-title DMServersViewExit#14
-pause 7000
-presskey global EKeyDevice0
-pause 2000
-presskey global EKeyUpArrow
-pause 1000
-presskey global EKeyUpArrow
-pause 1000
-presskey global EKeyDevice0
-sendtobackground
-[Endtest]
-
-[Test]
-title EditserverProfileID#15
-pause 7000
-presskey global EKeyDevice0
-pause 2000
-presskey global EKeyDownArrow
-pause 1000
-presskey global EKeyDevice0
-pause 3000
-presskey global EKeyDevice0
-pause 1000
-presskey global EKeyDownArrow
-pause 1000
-presskey global EKeyDownArrow
-pause 2000
-presskey global EKeyDevice0
-pause 4000
-presskey global EKeyDownArrow
-pause 1000
-presskey global EKeyDevice0
-pause 1000
-presskey global EKeyDevice0
-pause 1000
-presskey global EKeyDevice0
-pause 1000
-presskey global 2
-pause 1000
-presskey global 3
-pause 1000
-presskey global EKeyDevice0 
-pause 1000
-presskey global EKeyDevice0
-pause 1000
-presskey global EKeyDevice0
-pause 1000
-presskey global EKeyDevice0
-pause 1000
-presskey global 1
-pause 1000
-presskey global 3
-pause 1000
-presskey global EKeyDevice1 
-pause 1000
-presskey global EKeyDevice0
-pause 1000
-presskey global EKeyDevice1
-pause 1000
-presskey global EKeyDevice1
-pause 2000
-presskey global EKeyDevice1
-pause 3000
-presskey global EKeyDevice1
-sendtobackground
-[Endtest]
-
-
-[Test]
-title OpenDMFOTADefaultViewHelp#16
-pause 7000
-presskey global EKeyDevice0
-pause 2000
-presskey global EKeyDownArrow
-pause 2000
-presskey global EKeyDownArrow
-pause 2000
-presskey global EKeyDevice0
-pause 2000
-presskey global EKeyDevice0
-pause 2000
-presskey global EKeyDownArrow
-pause 2000
-presskey global EKeyDevice0
-pause 2000
-presskey global EKeyDevice1
-pause 4000
-presskey global EKeyDevice1
-pause 2000
-presskey global EKeyDevice1
-sendtobackground
-[Endtest]
-
-[Test]
-title OpenDMFOTADefaultViewExit#17
-pause 7000
-presskey global EKeyDevice0
-pause 2000
-presskey global EKeyDownArrow
-pause 2000
-presskey global EKeyDownArrow
-pause 2000
-presskey global EKeyDevice0
-pause 2000
-presskey global EKeyDevice0
-pause 2000
-presskey global EKeyDownArrow
-pause 1000
-presskey global EKeyDownArrow
-pause 2000
-presskey global EKeyDevice0
-sendtobackground
-[Endtest]
-
-[Test]
-title DMServersettingshelpandexit#18
-pause 7000
-presskey global EKeyDevice0
-pause 2000
-presskey global EKeyDownArrow
-pause 1000
-presskey global EKeyDevice0
-pause 3000
-presskey global EKeyDevice0
-pause 1000
-presskey global EKeyDownArrow
-pause 1000
-presskey global EKeyDevice0
-pause 2000
-presskey global EKeyDevice0
-pause 1000
-presskey global EKeyDownArrow //help
-pause 1000
-presskey global EKeyDevice0
-pause 4000
-presskey global EKeyDevice1 //close
-pause 2000
-presskey global EKeyDevice0
-pause 1000
-presskey global EKeyDownArrow //help
-pause 1000
-presskey global EKeyDownArrow //exit
-pause 1000
-presskey global EKeyDevice0 //lsk
-sendtobackground
-[Endtest]
-
-[Test]
-title OpenDMServersviewcancelsync#19
-pause 7000
-presskey global EKeyDevice0
-pause 2000
-presskey global EKeyDownArrow
-pause 1000
-presskey global EKeyDevice0
-pause 3000
-presskey global EKeyDevice0
-pause 1000
-presskey global EKeyDevice0
-pause 3000
-presskey global EKeyDevice0 //yes to config
-pause 1000
-presskey global EKeyDevice1
-pause 4000
-presskey global EKeyDevice1
-pause 4000
-presskey global EKeyDevice1
-sendtobackground
-[Endtest]
-
-
-[Test]
-title OpenDMServersviewendkey#20
-pause 7000
-presskey global EKeyDevice0
-pause 2000
-presskey global EKeyDownArrow
-pause 1000
-presskey global EKeyDevice0
-pause 3000
-presskey global EKeyDevice0
-pause 1000
-presskey global EKeyDevice0
-pause 3000
-presskey global EKeyDevice0 //yes to config
-pause 1000
-presskey global EKeyEnd
-sendtobackground
-[Endtest]
-
-[Test]
-title Mainviewcancelsync#21
-pause 7000
-presskey global EKeyDevice0
-pause 1000
-presskey global EKeyDevice0
-pause 3000
-presskey global EKeyDevice0
-pause 3000
-presskey global EKeyDevice0 //yes to config
-pause 1000
-presskey global EKeyDevice1
-pause 4000
-presskey global EKeyDevice1
-sendtobackground
-[Endtest]
-
-
-[Test]
-title mainviewendkey#22
-pause 7000
-presskey global EKeyDevice0
-pause 1000
-presskey global EKeyDevice0
-pause 3000
-presskey global EKeyDevice0
-pause 3000
-presskey global EKeyDevice0 //yes to config
-pause 1000
-presskey global EKeyEnd
-sendtobackground
-[Endtest]
-
-[Test]
-title EditserverPassword#23
-pause 7000
-presskey global EKeyDevice0
-pause 2000
-presskey global EKeyDownArrow
-pause 1000
-presskey global EKeyDevice0
-pause 3000
-presskey global EKeyDevice0
-pause 1000
-presskey global EKeyDownArrow
-pause 1000
-presskey global EKeyDownArrow
-pause 2000
-presskey global EKeyDevice0
-pause 4000
-presskey global EKeyDownArrow
-pause 1000
-presskey global EKeyDownArrow
-pause 1000
-presskey global EKeyDevice0
-pause 1000
-presskey global EKeyDevice0
-pause 1000
-presskey global 2
-pause 1000
-presskey global 3
-pause 1000
-presskey global EKeyDevice0
-pause 1000
-presskey global EKeyDevice0
-pause 1000
-presskey global EKeyDevice0
-pause 1000
-presskey global 1
-pause 1000
-presskey global 3
-pause 1000
-presskey global EKeyDevice1 
-pause 1000
-presskey global EKeyDevice0
-pause 1000
-presskey global EKeyDevice1
-pause 1000
-presskey global EKeyDevice1
-pause 2000
-presskey global EKeyDevice1
-pause 3000
-presskey global EKeyDevice1
-sendtobackground
-[Endtest]
-
-[Test]
-title EditserverPort#24
-pause 7000
-presskey global EKeyDevice0
-pause 2000
-presskey global EKeyDownArrow
-pause 1000
-presskey global EKeyDevice0
-pause 3000
-presskey global EKeyDevice0
-pause 1000
-presskey global EKeyDownArrow
-pause 1000
-presskey global EKeyDownArrow
-pause 2000
-presskey global EKeyDevice0
-pause 4000
-presskey global EKeyDownArrow
-pause 1000
-presskey global EKeyDownArrow
-pause 1000
-presskey global EKeyDevice0
-pause 1000
-presskey global EKeyDevice0
-pause 1000
-presskey global 2
-pause 1000
-presskey global 3
-pause 1000
-presskey global EKeyDevice0
-pause 1000
-presskey global EKeyDevice0
-pause 1000
-presskey global EKeyDevice0
-pause 1000
-presskey global 1
-pause 1000
-presskey global 3
-pause 1000
-presskey global EKeyDevice1 
-pause 1000
-presskey global EKeyDevice0
-pause 1000
-presskey global EKeyDevice1
-pause 1000
-presskey global EKeyDevice1
-pause 2000
-presskey global EKeyDevice1
-pause 3000
-presskey global EKeyDevice1
-sendtobackground
-[Endtest]
-
-[Test]
-title EditserverSettingpage#25
-pause 7000
-presskey global EKeyDevice0
-pause 2000
-presskey global EKeyDownArrow
-pause 1000
-presskey global EKeyDevice0
-pause 3000
-presskey global EKeyDevice0
-pause 1000
-presskey global EKeyDownArrow
-pause 1000
-presskey global EKeyDownArrow
-pause 2000
-presskey global EKeyDevice0
-pause 4000
-presskey global EKeyUpArrow
-pause 1000
-presskey global EKeyDevice0
-pause 1000
-presskey global EKeyDevice0
-pause 1000
-presskey global EKeyDownArrow
-pause 1000
-presskey global EKeyDevice0
-pause 1000
-presskey global EKeyDevice1 //back
-pause 3000
-presskey global EKeyDevice1 //back
-pause 3000
-presskey global EKeyDevice1
-sendtobackground
-[Endtest]
--- a/omadm/omadmappui/tsrc/eabi/ui_dmuiu.def	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	_Z9LibEntryLR13CTestModuleIf @ 1 NONAME
-
--- a/omadm/omadmappui/tsrc/group/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-/*
-* Copyright (c) 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:  Implementation of DM UI test component
-* 	This is part of omadmappui test application.
-*
-*/
-
-
-
-
-PRJ_PLATFORMS
-// specify the platforms your component needs to be built for here
-// defaults to WINS MARM so you can ignore this if you just build these
-DEFAULT
-
-PRJ_TESTEXPORTS
-// NOTE: If using ARS requirements all export operations should be done under this.
-// 'abld test export'
-
-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
-// Example: 
-
-
-PRJ_TESTMMPFILES
-ui_dmui.mmp
-
-PRJ_MMPFILES
-// ui_dmui_nrm.mmp
-
-// Specify the .mmp files required for building the important component
-// releasables.
-//
-// Specify "tidy" if the component you need to build doesn't need to be
-// released. Specify "ignore" if the MMP file exists but should be
-// ignored.
-// Example:
-
-//  End of File
--- a/omadm/omadmappui/tsrc/group/ui_dmui.mmp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-/*
-* Copyright (c) 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:  Implementation of DM UI test component
-* 	This is part of omadmappui test application.
-*
-*/
-
-
-
-#include <platform_paths.hrh>
-
-TARGET          ui_dmui.dll
-TARGETTYPE      dll
-UID             0x1000008D 0x101FB3E3
-
-CAPABILITY      ALL -TCB
-/* Remove comments and replace 0x00000000 with correct vendor id */
-// VENDORID     0x00000000
-/* Remove comments and replace 0x00000000 with correct secure id */
-// SECUREID     0x00000000
-
-//TARGETPATH      ?target_path
-DEFFILE         ui_dmui.def
-
-
-APP_LAYER_SYSTEMINCLUDE
-
-SOURCEPATH      ../src
-
-USERINCLUDE			../inc
-SOURCE          ui_dmui.cpp
-SOURCE          ui_dmuiBlocks.cpp
-
-//RESOURCE        resource_file
-//RESOURCE        resource_file2
-
-LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
-LIBRARY         stiftestengine.lib
-LIBRARY 				apgrfx.lib cone.lib ws32.lib 
-
-LANG            SC
-
-
-
-SMPSAFE
-// End of File
-
--- a/omadm/omadmappui/tsrc/group/ui_dmui.pkg	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +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 "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:  Implementation of DM UI component
-; 	This is part of omadmappui.
-;
-
-;*Languages
-&EN
-;
-;*Standard SIS file header. This section specifies the package name,
-;application UID, and version/build numbers. Add the package TYPE here if needed.
-#{"ui_dmui"},(0x101FB3E8),1,0,1;
-;
-
-;*Unique (Non-Localised) Vendor name
-;This is used in combination with signing to prevent the unauthroized
-;upgrade ofa a package by someone other than the rightful vendor.
-:"Nokia"
-
-;*Localized Vendor Name
-;This specifies the localised vendor name(s) correspodning to language(s).
-%{"Nokia Test EN"}
-
-;*Files To Copy...<src> <destination>
-"\epoc32\release\armv5\urel\ui_dmui.dll" -"C:\sys\bin\ui_dmui.dll"
-"..\conf\tcConnSet.cfg" -"C:\TestFramework\tcConnSet.cfg"
-"..\conf\ui_dmui.cfg" -"C:\TestFramework\ui_dmui.cfg"
-"..\init\ui_dmui.ini" -"C:\TestFramework\TestFramework.ini"
--- a/omadm/omadmappui/tsrc/inc/ui_dmui.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,188 +0,0 @@
-/*
-* Copyright (c) 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:  Implementation of DM UI test component
-* 	This is part of omadmappui test application.
-*
-*/
-
-
-
-
-#ifndef UI_DMUI_H
-#define UI_DMUI_H
-
-//  INCLUDES
-#include <StifLogger.h>
-#include <TestScripterInternal.h>
-#include <StifTestModule.h>
-#include <TestclassAssert.h>
-
-// CONSTANTS
-//const ?type ?constant_var = ?constant;
-
-// MACROS
-//#define ?macro ?macro_def
-#define TEST_CLASS_VERSION_MAJOR 0
-#define TEST_CLASS_VERSION_MINOR 0
-#define TEST_CLASS_VERSION_BUILD 0
-
-// Logging path
-_LIT( Kui_dmuiLogPath, "\\logs\\testframework\\ui_dmui\\" ); 
-// Log file
-_LIT( Kui_dmuiLogFile, "ui_dmui.txt" ); 
-_LIT( Kui_dmuiLogFileWithTitle, "ui_dmui_[%S].txt" );
-
-// FUNCTION PROTOTYPES
-//?type ?function_name(?arg_list);
-
-// FORWARD DECLARATIONS
-//class ?FORWARD_CLASSNAME;
-class Cui_dmui;
-
-// DATA TYPES
-//enum ?declaration
-//typedef ?declaration
-//extern ?data_type;
-
-// CLASS DECLARATION
-
-/**
-*  Cui_dmui test class for STIF Test Framework TestScripter.
-*  ?other_description_lines
-*
-*  @lib ?library
-*  @since ?Series60_version
-*/
-NONSHARABLE_CLASS(Cui_dmui) : public CScriptBase
-    {
-    public:  // Constructors and destructor
-
-        /**
-        * Two-phased constructor.
-        */
-        static Cui_dmui* NewL( CTestModuleIf& aTestModuleIf );
-
-        /**
-        * Destructor.
-        */
-        virtual ~Cui_dmui();
-
-    public: // New functions
-
-        /**
-        * ?member_description.
-        * @since ?Series60_version
-        * @param ?arg1 ?description
-        * @return ?description
-        */
-        //?type ?member_function( ?type ?arg1 );
-
-    public: // Functions from base classes
-
-        /**
-        * From CScriptBase Runs a script line.
-        * @since ?Series60_version
-        * @param aItem Script line containing method name and parameters
-        * @return Symbian OS error code
-        */
-        virtual TInt RunMethodL( CStifItemParser& aItem );
-
-    protected:  // New functions
-
-        /**
-        * ?member_description.
-        * @since ?Series60_version
-        * @param ?arg1 ?description
-        * @return ?description
-        */
-        //?type ?member_function( ?type ?arg1 );
-
-    protected:  // Functions from base classes
-
-        /**
-        * From ?base_class ?member_description
-        */
-        //?type ?member_function();
-
-    private:
-
-        /**
-        * C++ default constructor.
-        */
-        Cui_dmui( CTestModuleIf& aTestModuleIf );
-
-        /**
-        * By default Symbian 2nd phase constructor is private.
-        */
-        void ConstructL();
-
-        // Prohibit copy constructor if not deriving from CBase.
-        // ?classname( const ?classname& );
-        // Prohibit assigment operator if not deriving from CBase.
-        // ?classname& operator=( const ?classname& );
-
-        /**
-        * Frees all resources allocated from test methods.
-        * @since ?Series60_version
-        */
-        void Delete();
-
-        /**
-        * Test methods are listed below. 
-        */
-
-        /**
-        * Example test method.
-        * @since ?Series60_version
-        * @param aItem Script line containing parameters.
-        * @return Symbian OS error code.
-        */
-        virtual TInt ExampleL( CStifItemParser& aItem );
-         virtual TInt LaunchserverviewL( CStifItemParser& aItem );
-        /**
-         * Method used to log version of test class
-         */
-        void SendTestClassVersion();
-
-        //ADD NEW METHOD DEC HERE
-        //[TestMethods] - Do not remove
-
-    public:     // Data
-        // ?one_line_short_description_of_data
-        //?data_declaration;
-
-    protected:  // Data
-        // ?one_line_short_description_of_data
-        //?data_declaration;
-
-    private:    // Data
-        
-        // ?one_line_short_description_of_data
-        //?data_declaration;
-
-        // Reserved pointer for future extension
-        //TAny* iReserved;
-
-    public:     // Friend classes
-        //?friend_class_declaration;
-    protected:  // Friend classes
-        //?friend_class_declaration;
-    private:    // Friend classes
-        //?friend_class_declaration;
-
-    };
-
-#endif      // UI_DMUI_H
-
-// End of File
--- a/omadm/omadmappui/tsrc/init/ui_dmui.ini	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,200 +0,0 @@
-#
-# This is STIF initialization file
-# Comment lines start with '#'-character.
-# See STIF TestFramework users guide.doc for instructions
-
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-# Set following test engine settings:
-#	- Set Test Reporting mode. TestReportMode's possible values are:
-#		+ 'Summary': Summary of the tested test cases.
-#		+ 'Environment': Hardware and software info.
-#		+ 'TestCases': Test case report.
-#		+ 'FullReport': Set of all above ones.
-#		+ Example 'TestReportMode= Summary TestCases'
-#
-# 	- CreateTestReport setting controls report creation mode
-#		+ YES, Test report will created.
-#		+ NO, No Test report.
-#
-# 	- File path indicates the base path of the test report.
-# 	- File name indicates the name of the test report.
-#
-# 	- File format indicates the type of the test report.
-#		+ TXT, Test report file will be txt type, for example 'TestReport.txt'.
-#		+ HTML, Test report will be html type, for example 'TestReport.html'.
-#   + XML, Test report will be xml type, for example 'TestReport.xml'.
-#          Note, that xml format is available only when output is set to FILE.
-#
-# 	- File output indicates output source of the test report.
-#		+ FILE, Test report logging to file.
-#		+ RDEBUG, Test report logging to using rdebug.
-#
-# 	- File Creation Mode indicates test report overwriting if file exist.
-#		+ OVERWRITE, Overwrites if the Test report file exist.
-#		+ APPEND, Continue logging after the old Test report information if
-#                 report exist.
-# 	- Sets a device reset module's dll name(Reboot).
-#		+ If Nokia specific reset module is not available or it is not correct one
-#		  StifHWResetStub module may use as a template for user specific reset
-#		  module.
-# 	- Sets STIF test measurement disable options. e.g. pluging1 and pluging2 disablation
-#		DisableMeasurement= stifmeasurementplugin01 stifmeasurementplugin02
-#
-
-[Engine_Defaults]
-
-TestReportMode= FullReport    # Possible values are: 'Empty', 'Summary', 'Environment',
-                                                     'TestCases' or 'FullReport'
-
-CreateTestReport= YES         # Possible values: YES or NO
-
-TestReportFilePath= C:\LOGS\TestFramework\
-TestReportFileName= TestReport
-
-TestReportFormat= TXT         # Possible values: TXT, HTML or XML
-TestReportOutput= FILE        # Possible values: FILE or RDEBUG
-TestReportFileCreationMode= OVERWRITE # Possible values: OVERWRITE or APPEND
-
-DeviceResetDllName= StifResetForNokia.dll # e.g. 'StifHWResetStub.dll' for user specific reseting
-
-DisableMeasurement= stifmeasurementdisablenone  # Possible values are:
-              # 'stifmeasurementdisablenone', 'stifmeasurementdisableall'
-              # 'stifmeasurementplugin01', 'stifmeasurementplugin02',
-              # 'stifmeasurementplugin03', 'stifmeasurementplugin04',
-              # 'stifmeasurementplugin05' or 'stifbappeaprofiler'
-
-Timeout= 0                    # Default timeout value for each test case. In milliseconds
-UITestingSupport= YES        # Possible values: YES or NO
-SeparateProcesses= YES       # Possible values: YES or NO (default: NO)
-[End_Defaults]
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-
-
-
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-# Module configurations start
-# Modules are added between module tags
-# tags. Module name is specified after ModuleName= tag, like
-# ModuleName= XXXXXXXXX
-# Modules might have initialisation file, specified as
-# IniFile= c:\testframework\YYYYYY
-# Modules might have several configuration files, like
-# TestCaseFile= c:\testframework\NormalCases.txt
-# TestCaseFile= c:\testframework\SmokeCases.txt
-# TestCaseFile= c:\testframework\ManualCases.txt
-
-# (TestCaseFile is synonym for old term ConfigFile)
-
-# Following case specifies demo module settings. Demo module
-# does not read any settings from file, so tags 
-# IniFile and TestCaseFile are not used.
-# In the simplest case it is enough to specify only the
-# name of the test module when adding new test module
-
-[New_Module]
-ModuleName= testcombiner
-TestCaseFile= c:\testframework\tcConnSet.cfg
-[End_Module]
-
-
-# Load testmoduleXXX, optionally with initialization file and/or test case files
-#[New_Module]
-#ModuleName= testmodulexxx
-
-#TestModuleXXX used initialization file
-#IniFile= c:\testframework\init.txt
-
-#TestModuleXXX used configuration file(s)
-#TestCaseFile= c:\testframework\testcases1.cfg
-#TestCaseFile= c:\testframework\testcases2.cfg
-#TestCaseFile= c:\testframework\manualtestcases.cfg
-
-#[End_Module]
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-
-
-
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-# Set STIF logging overwrite parameters for Logger.
-# 	Hardware and emulator environment logging path and styles can
-# 	be configured from here to overwrite the Logger's implemented values.
-#	
-#	Settings description:
-#	- Indicates option for creation log directory/directories. If log directory/directories
-#         is/are not created by user they will make by software.
-#		+ YES, Create log directory/directories if not allready exist.
-#		+ NO, Log directory/directories not created. Only created one is used.
-#
-#	- Overwrite emulator path setting.
-#		+ Example: If 'EmulatorBasePath= C:\LOGS\TestFramework\' and in code is defined 
-#		           Logger's path 'D:\\LOGS\\Module\\' with those definition the path
-#		           will be 'C:\LOGS\TestFramework\LOGS\Module\'
-#
-#	- Overwrite emulator's logging format.
-#		+ TXT, Log file(s) will be txt type(s), for example 'Module.txt'.
-#		+ HTML, Log file(s) will be html type(s), for example 'Module.html'.
-#
-#	- Overwrited emulator logging output source.
-#		+ FILE, Logging to file(s).
-#		+ RDEBUG, Logging to using rdebug(s).
-#
-#	- Overwrite hardware path setting (Same description as above in emulator path).
-#	- Overwrite hardware's logging format(Same description as above in emulator format).
-#	- Overwrite hardware's logging output source(Same description as above in emulator output).
-#
-#	- File Creation Mode indicates file overwriting if file exist.
-#		+ OVERWRITE, Overwrites if file(s) exist.
-#		+ APPEND, Continue logging after the old logging information if file(s) exist.
-#
-#	- Will thread id include to the log filename.
-#		+ YES, Thread id to log file(s) name, Example filename 'Module_b9.txt'.
-#		+ NO, No thread id to log file(s), Example filename 'Module.txt'.
-#
-#	- Will time stamps include the to log file.
-#		+ YES, Time stamp added to each line in log file(s). Time stamp is 
-#                 for example'12.Nov.2003 115958    LOGGING INFO'
-#		+ NO, No time stamp(s).
-#
-#	- Will line breaks include to the log file.
-#		+ YES, Each logging event includes line break and next log event is in own line.
-#		+ NO, No line break(s).
-#
-#	- Will event ranking include to the log file.
-#		+ YES, Event ranking number added to each line in log file(s). Ranking number
-#                 depends on environment's tics, for example(includes time stamp also)
-#                 '012   12.Nov.2003 115958    LOGGING INFO'
-#		+ NO, No event ranking.
-#
-#	- Will write log file in unicode format.
-#		+ YES, Log file will be written in unicode format
-#		+ NO, Log will be written as normal, not unicode, file.
-#
-
-[Logger_Defaults]
-
-#NOTE: If you want to set Logger using next setting(s) remove comment(s)'#'
-#NOTE: TestEngine and TestServer logging settings cannot change here
-
-#CreateLogDirectories= YES    # Possible values: YES or NO
-
-#EmulatorBasePath= C:\LOGS\TestFramework\
-#EmulatorFormat= HTML         # Possible values: TXT or HTML
-#EmulatorOutput= FILE         # Possible values: FILE or RDEBUG
-
-#HardwareBasePath= D:\LOGS\TestFramework\
-#HardwareFormat= HTML         # Possible values: TXT or HTML
-#HardwareOutput= FILE         # Possible values: FILE or RDEBUG
-
-#FileCreationMode= OVERWRITE  # Possible values: OVERWRITE or APPEND
-
-#ThreadIdToLogFile= YES       # Possible values: YES or NO
-#WithTimeStamp= YES           # Possible values: YES or NO
-#WithLineBreak= YES           # Possible values: YES or NO
-#WithEventRanking= YES        # Possible values: YES or NO
-
-#FileUnicode= YES             # Possible values: YES or NO
-#AddTestCaseTitle= YES        # Possible values: YES or NO
-[End_Logger_Defaults]
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-
-# End of file
--- a/omadm/omadmappui/tsrc/src/ui_dmui.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,203 +0,0 @@
-/*
-* Copyright (c) 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:  Implementation of DM UI test component
-* 	This is part of omadmappui test application.
-*
-*/
-
-
-
-
-// INCLUDE FILES
-#include <Stiftestinterface.h>
-#include "ui_dmui.h"
-#include <SettingServerClient.h>
-
-// EXTERNAL DATA STRUCTURES
-//extern  ?external_data;
-
-// EXTERNAL FUNCTION PROTOTYPES  
-//extern ?external_function( ?arg_type,?arg_type );
-
-// CONSTANTS
-//const ?type ?constant_var = ?constant;
-
-// MACROS
-//#define ?macro ?macro_def
-
-// LOCAL CONSTANTS AND MACROS
-//const ?type ?constant_var = ?constant;
-//#define ?macro_name ?macro_def
-
-// MODULE DATA STRUCTURES
-//enum ?declaration
-//typedef ?declaration
-
-// LOCAL FUNCTION PROTOTYPES
-//?type ?function_name( ?arg_type, ?arg_type );
-
-// FORWARD DECLARATIONS
-//class ?FORWARD_CLASSNAME;
-
-// ============================= LOCAL FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// ?function_name ?description.
-// ?description
-// Returns: ?value_1: ?description
-//          ?value_n: ?description_line1
-//                    ?description_line2
-// -----------------------------------------------------------------------------
-//
-/*
-?type ?function_name(
-    ?arg_type arg,  // ?description
-    ?arg_type arg)  // ?description
-    {
-
-    ?code  // ?comment
-
-    // ?comment
-    ?code
-    }
-*/
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// Cui_dmui::Cui_dmui
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-Cui_dmui::Cui_dmui( 
-    CTestModuleIf& aTestModuleIf ):
-        CScriptBase( aTestModuleIf )
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// Cui_dmui::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void Cui_dmui::ConstructL()
-    {
-    //Read logger settings to check whether test case name is to be
-    //appended to log file name.
-    RSettingServer settingServer;
-    TInt ret = settingServer.Connect();
-    if(ret != KErrNone)
-        {
-        User::Leave(ret);
-        }
-    // Struct to StifLogger settigs.
-    TLoggerSettings loggerSettings; 
-    // Parse StifLogger defaults from STIF initialization file.
-    ret = settingServer.GetLoggerSettings(loggerSettings);
-    if(ret != KErrNone)
-        {
-        User::Leave(ret);
-        } 
-    // Close Setting server session
-    settingServer.Close();
-
-    TFileName logFileName;
-    
-    if(loggerSettings.iAddTestCaseTitle)
-        {
-        TName title;
-        TestModuleIf().GetTestCaseTitleL(title);
-        logFileName.Format(Kui_dmuiLogFileWithTitle, &title);
-        }
-    else
-        {
-        logFileName.Copy(Kui_dmuiLogFile);
-        }
-
-    iLog = CStifLogger::NewL( Kui_dmuiLogPath, 
-                          logFileName,
-                          CStifLogger::ETxt,
-                          CStifLogger::EFile,
-                          EFalse );
-    
-    SendTestClassVersion();
-    }
-
-// -----------------------------------------------------------------------------
-// Cui_dmui::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-Cui_dmui* Cui_dmui::NewL( 
-    CTestModuleIf& aTestModuleIf )
-    {
-    Cui_dmui* self = new (ELeave) Cui_dmui( aTestModuleIf );
-
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop();
-
-    return self;
-
-    }
-
-// Destructor
-Cui_dmui::~Cui_dmui()
-    { 
-
-    // Delete resources allocated from test methods
-    Delete();
-
-    // Delete logger
-    delete iLog; 
-
-    }
-
-//-----------------------------------------------------------------------------
-// Cui_dmui::SendTestClassVersion
-// Method used to send version of test class
-//-----------------------------------------------------------------------------
-//
-void Cui_dmui::SendTestClassVersion()
-	{
-	TVersion moduleVersion;
-	moduleVersion.iMajor = TEST_CLASS_VERSION_MAJOR;
-	moduleVersion.iMinor = TEST_CLASS_VERSION_MINOR;
-	moduleVersion.iBuild = TEST_CLASS_VERSION_BUILD;
-	
-	TFileName moduleName;
-	moduleName = _L("ui_dmui.dll");
-
-	TBool newVersionOfMethod = ETrue;
-	TestModuleIf().SendTestModuleVersion(moduleVersion, moduleName, newVersionOfMethod);
-	}
-
-// ========================== OTHER EXPORTED FUNCTIONS =========================
-
-// -----------------------------------------------------------------------------
-// LibEntryL is a polymorphic Dll entry point.
-// Returns: CScriptBase: New CScriptBase derived object
-// -----------------------------------------------------------------------------
-//
-EXPORT_C CScriptBase* LibEntryL( 
-    CTestModuleIf& aTestModuleIf ) // Backpointer to STIF Test Framework
-    {
-
-    return ( CScriptBase* ) Cui_dmui::NewL( aTestModuleIf );
-
-    }
-
-
-//  End of File
--- a/omadm/omadmappui/tsrc/src/ui_dmuiBlocks.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,236 +0,0 @@
-/*
-* Copyright (c) 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:  Implementation of DM UI test component
-* 	This is part of omadmappui test application.
-*
-*/
-
-
-
-
-// [INCLUDE FILES] - do not remove
-#include <e32svr.h>
-#include <W32STD.H> 
-#include <COEMAIN.H> 
-#include <APGCLI.H> 
-#include <APGTASK.H> 
-#include <StifParser.h>
-#include <Stiftestinterface.h>
-#include "ui_dmui.h"
-
-// EXTERNAL DATA STRUCTURES
-//extern  ?external_data;
-
-// EXTERNAL FUNCTION PROTOTYPES  
-//extern ?external_function( ?arg_type,?arg_type );
-
-// CONSTANTS
-//const ?type ?constant_var = ?constant;
-
-// MACROS
-//#define ?macro ?macro_def
-
-// LOCAL CONSTANTS AND MACROS
-//const ?type ?constant_var = ?constant;
-//#define ?macro_name ?macro_def
-
-// MODULE DATA STRUCTURES
-//enum ?declaration
-//typedef ?declaration
-
-// LOCAL FUNCTION PROTOTYPES
-//?type ?function_name( ?arg_type, ?arg_type );
-
-// FORWARD DECLARATIONS
-//class ?FORWARD_CLASSNAME;
-
-// ============================= LOCAL FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// ?function_name ?description.
-// ?description
-// Returns: ?value_1: ?description
-//          ?value_n: ?description_line1
-//                    ?description_line2
-// -----------------------------------------------------------------------------
-//
-/*
-?type ?function_name(
-    ?arg_type arg,  // ?description
-    ?arg_type arg)  // ?description
-    {
-
-    ?code  // ?comment
-
-    // ?comment
-    ?code
-    }
-*/
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// Cui_dmui::Delete
-// Delete here all resources allocated and opened from test methods. 
-// Called from destructor. 
-// -----------------------------------------------------------------------------
-//
-void Cui_dmui::Delete() 
-    {
-
-    }
-
-// -----------------------------------------------------------------------------
-// Cui_dmui::RunMethodL
-// Run specified method. Contains also table of test mothods and their names.
-// -----------------------------------------------------------------------------
-//
-TInt Cui_dmui::RunMethodL( 
-    CStifItemParser& aItem ) 
-    {
-
-    static TStifFunctionInfo const KFunctions[] =
-        {  
-        // Copy this line for every implemented function.
-        // First string is the function name used in TestScripter script file.
-        // Second is the actual implementation member function. 
-        ENTRY( "Example", Cui_dmui::ExampleL ),
-        //ADD NEW ENTRY HERE
-        // [test cases entries] - Do not remove
-
-        };
-
-    const TInt count = sizeof( KFunctions ) / 
-                        sizeof( TStifFunctionInfo );
-
-    return RunInternalL( KFunctions, count, aItem );
-
-    }
-
-// -----------------------------------------------------------------------------
-// Cui_dmui::ExampleL
-// Example test method function.
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-TInt Cui_dmui::ExampleL( CStifItemParser& aItem )
-    {
-
-    // Print to UI
-
-    /*
-    TestModuleIf().Printf( 0, Kui_dmui, KExample );
-    // Print to log file
-    iLog->Log( KExample );
-
-    TInt i = 0;
-    TPtrC string;
-    _LIT( KParam, "Param[%i]: %S" );
-    while ( aItem.GetNextString ( string ) == KErrNone )
-        {
-        TestModuleIf().Printf( i, Kui_dmui, 
-                                KParam, i, &string );
-        i++;
-        }
-*/
-
-RDebug::Print( _L("stiff "));
-	                                                
-const TUid KDeviceManagerUid = {0x101F6DE5};        // Device manager application 
-RWsSession sess = CCoeEnv::Static()->WsSession();
-RDebug::Print( 
-	     _L("stiff after sess"));
-    RApaLsSession apaLsSession;        
-  
-    TApaTaskList appList( sess );
-    TApaTask bring = appList.FindApp( KDeviceManagerUid );
-RDebug::Print( 
-	     _L("stiff after app list"));
-    if ( bring.Exists() )
-        {
-        	RDebug::Print( 
-	     _L("stiff 1 exists"));
-        bring.BringToForeground();
-        }
-    else
-        {
-        	RDebug::Print( 
-	     _L("stiff 1 new app launch"));
-        if( !apaLsSession.Handle() )
-            {
-            User::LeaveIfError(apaLsSession.Connect());
-            RDebug::Print( 
-	     _L("stiff 1 new app launch connect"));
-            }
-        CleanupClosePushL( apaLsSession );
-        TThreadId thread;
-        RDebug::Print( 
-	     _L("stiff 1 new app thread creation"));
-	     TInt t = apaLsSession.StartDocument(KNullDesC, KDeviceManagerUid, thread);
-	     TBuf <20> err;
-	     err.Num(t);
-	     err.Append(_L("err"));
-	     RDebug::Print(err );
-        User::LeaveIfError( t );
-         RDebug::Print( 
-	     _L("stiff 1 new app thread created"));
-        CleanupStack::PopAndDestroy( &apaLsSession );  
-        RDebug::Print( 
-	     _L("stiff 1 new destroy app ls session"));
-          TApaTaskList appList( CCoeEnv::Static()->WsSession());
-    TApaTask bring = appList.FindApp( KDeviceManagerUid );
-
-    /*if ( bring.Exists() )
-        {
-        	RDebug::Print( 
-	     _L("stiff 1 app send to bg"));
-	     User::After(3000000);
-        bring.SendToBackground();
-        //bring.BringToForeground();
-        //bring.SendToBackground();
-        }*/
-      }
-      RDebug::Print( 
-	     _L("stiff 1 return ke errnone"));
-    return KErrNone;
-
-    }
-
-
-TInt Cui_dmui::LaunchserverviewL( CStifItemParser& aItem )
-    {
-
-       return KErrNone;
-
-    }
-// -----------------------------------------------------------------------------
-// Cui_dmui::?member_function
-// ?implementation_description
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-/*
-TInt Cui_dmui::?member_function(
-   CItemParser& aItem )
-   {
-
-   ?code
-
-   }
-*/
-
-// ========================== OTHER EXPORTED FUNCTIONS =========================
-// None
-
-//  [End of File] - Do not remove
--- a/omadm/omadmextensions/adapters/bld/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-/*
-* Copyright (c) 2002 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:    for building DM adapters
-*
-*/
-
-
-
-
-
-#include "../devinfo/bld/bld.inf"
-#include "../devdetail/bld/bld.inf"
-//#include "../internet/bld/bld.inf"
-#include "../syncmldm/bld/bld.inf"
-#include "../syncmldm12/bld/bld.inf"
-#include "../browseradapter/bld/bld.inf"
-#include "../streamingadapter/bld/bld.inf"
-
-#include "../globalwlansettings/group/bld.inf"
-#include "../nsmldinternet/group/bld.inf"
-#include "../nsmldmalwaysonadapter/group/bld.inf"
-#include "../nsmldmbmadapter/group/bld.inf"
-#include "../wlanctrldcmoadapter/group/bld.inf"
-#include "../connmoadapter/group/bld.inf"
-
-#ifdef __SYNCML_DM_DS
-#include "../syncmlds/bld/bld.inf"
-#endif
-
-#ifdef __SYNCML_DM_EMAIL
-#include "../email/bld/bld.inf"
-#endif
-
-#ifdef __SYNCML_DM_MMS
-#include "../mms/bld/bld.inf"
-#endif
-
-#ifdef __SYNCML_DM_FOTA
-#include "../fota/bld/bld.inf"
-#endif
-
-#ifdef __SYNCML_DM_IMPS
-#include "../imps/bld/bld.inf"
-#endif
-
-#include "../dcmodmadapter/group/bld.inf"
--- a/omadm/omadmextensions/adapters/browseradapter/bld/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-/*
-* 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:    build info file for browser adapter
-*
-*/
-
-
-
-
-PRJ_MMPFILES
-./nsmlbrowseradapter.mmp
-
-
-
-
--- a/omadm/omadmextensions/adapters/browseradapter/bld/nsmlbrowseradapter.mmp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-/*
-* 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: Implementation of dm adapters
-* 	This is part of omadmextensions.
-*
-*/
-
-
-
-
-
-#include "defaultcaps.hrh"
-#include  <platform_paths.hrh>
-
-CAPABILITY      CAP_ECOM_PLUGIN
-TARGET          nsmldmbrowseradapter.dll
-TARGETTYPE      PLUGIN
-UID             0x10009D8D 0x1028335E
-VENDORID        VID_DEFAULT
-
-APP_LAYER_SYSTEMINCLUDE
-SYSTEMINCLUDE 	/epoc32/include/ecom ../../../inc
-SOURCEPATH      ../src
-
-USERINCLUDE     ../inc 
-USERINCLUDE		../../inc
-
-SOURCE          nsmlbrowseradapter.cpp
-
-START RESOURCE nsmldmbrowseradapter.rss
-TARGET nsmldmbrowseradapter.rsc
-LANGUAGE_IDS
-END
-
-
-LIBRARY         euser.lib 
-LIBRARY         ecom.lib 
-LIBRARY         nsmldebug.lib
-LIBRARY         nsmlagentcommon.lib
-LIBRARY         centralrepository.lib
-LIBRARY 	commdb.lib apengine.lib 
-LIBRARY     nsmldmiapmatcher.lib
-
-
-SMPSAFE
--- a/omadm/omadmextensions/adapters/browseradapter/inc/nsmlbrowseradapter.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,130 +0,0 @@
-/*
-* 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:    DM Browser Adapter
-*
-*/
-
-
-
-
-
-
-#ifndef __NSMLDMDEVINFOADAPTER_H__
-#define __NSMLDMDEVINFOADAPTER_H__
-
-// INCLUDES
-#include <e32base.h>
-#include <smldmadapter.h>
-#include "nsmldmconstants.h"
-
-// MACROS
-
-// the DDF version must be changed if any changes in DDF structure 
-// ( built in DDFStructureL() function )
-_LIT8( KNSmlDMBrowserAdapterDDFVersion, "1.0" ); 
-
-_LIT8 (KNSmlURISeparator ,"/");
-
-_LIT8( KNSmlDMBrowserAdapterTextPlain, "text/plain" );
-_LIT8( KNSmlDMBrowserAdapterNodeName, "Browser" );
-_LIT8( KNSmlDMBrowserAdapterDescription, "The parent object holding all Browser objects" );
-_LIT8( KNSmlDMBrowserStartpageURLDescription, "The default URL that is connected when the browser opens" );
-
-_LIT8( KNSmlDMBrowserAdapterAPNode, "ToConRef" );
-_LIT8( KNSmlDMBrowserAdapterBrowserNodes, "ToConRef/StartPage" );
-_LIT8( KNSmlDMBrowserAdapterStartpageURL, "StartPage" );
-_LIT8( KNSmlDMBrowserAdapterAPNodeDescription, "To set the default AP of browser" );
-_LIT8( KNSmlDMBrowserAdapterAPvalue,"");
-
-_LIT8( KNSmlDMBrowserAdapterAPDefaultvalue,"AP/APId001");
-
-
-const TInt KMaxLengthStartpageName = 255;
-
-const TInt KBrowserHomePageUDefined = 1;
-const TInt KMaxLengthStartpageBookmark = 3;
-
-const TUint32 KBrowserNGStartpageURL = 0x00000030;
-//const TUint32 KBrowserNGHomepageType = 0x00000031;
-
-
-
-// CLASS DECLARATION
-class CNSmlDmBrowserAdapter : public CSmlDmAdapter
-    {
-public: // constructors and destructor
-    static CNSmlDmBrowserAdapter* NewL(MSmlDmCallback* aDmCallback );
-    static CNSmlDmBrowserAdapter* NewLC(MSmlDmCallback* aDmCallback );
-
-    virtual ~CNSmlDmBrowserAdapter();
-
-private: ///new functions
-
-    void SetLeafPropertiesL( MSmlDmDDFObject& aObject, 
-                 const TSmlDmAccessTypes& aAccessTypes, 
-                 const TDesC8& aDescription ) const;
-    CNSmlDmBrowserAdapter(TAny* aEcomArguments);
-    CSmlDmAdapter::TError FetchLeafObjectL( const TDesC8& aURI, CBufBase& aObject );
-    
-private: // from base classes
-    // Adapter interface from CSmlDmAdapter
-    void DDFVersionL( CBufBase& aDDFVersion );
-    void DDFStructureL( MSmlDmDDFObject& aDDF );
-    void UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, 
-                const TDesC8& aObject, const TDesC8& aType, 
-                const TInt aStatusRef );
-    void DeleteObjectL( const TDesC8& aURI, const TDesC8& aLUID, TInt aStatusRef ); 
-    void FetchLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, 
-                   const TDesC8& aType, const TInt aResultsRef, 
-                   const TInt aStatusRef ); 
-    void ChildURIListL( const TDesC8& aURI, const TDesC8& aLUID, 
-                const CArrayFix<TSmlDmMappingInfo>& aPreviousURISegmentList, 
-                const TInt aResultsRef, const TInt aStatusRef );  
-    void AddNodeObjectL( const TDesC8& aURI, const TDesC8& aParentLUID, 
-                 const TInt aStatusRef );
-    
-    void UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, 
-                RWriteStream*& aStream, const TDesC8& aType, 
-                const TInt aStatusRef );
-    void FetchLeafObjectSizeL( const TDesC8& aURI, const TDesC8& aLUID, 
-                   const TDesC8& aType, const TInt aResultsRef, 
-                   const TInt aStatusRef );
-     
-    void ExecuteCommandL( const TDesC8& aURI, const TDesC8& aLUID,
-                          const TDesC8& aArgument, 
-                          const TDesC8& aType,
-                          const TInt aStatusRef );
-                                  
-    void ExecuteCommandL( const TDesC8& aURI, const TDesC8& aLUID,
-                          RWriteStream*& aStream, 
-                          const TDesC8& aType,
-                          const TInt aStatusRef );
-    
-    void CopyCommandL( const TDesC8& aTargetURI, const TDesC8& aTargetLUID,
-                       const TDesC8& aSourceURI, 
-                       const TDesC8& aSourceLUID,
-                       const TDesC8& aType, TInt aStatusRef );
-    void StartAtomicL();
-    void CommitAtomicL();
-    void RollbackAtomicL();
-    TBool StreamingSupport( TInt& aItemSize );
-    void StreamCommittedL();
-    void CompleteOutstandingCmdsL();
-    
-    
-private:
-    MSmlDmCallback* iDmCallback;
-    };
-
-#endif // __NSMLDMDEVINFOADAPTER_H__
--- a/omadm/omadmextensions/adapters/browseradapter/src/nsmlbrowseradapter.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,650 +0,0 @@
-/*
-* 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:    DM browser Adapter
-*
-*/
-
-
-
-
-
-//INCLUDE FILES
-#include <implementationproxy.h> // For TImplementationProxy definition
-#include "nsmldmimpluids.h"
-
-
-#include "nsmldebug.h"
-#include "nsmlconstants.h"
-#include "nsmldmconst.h"
-#include "nsmlbrowseradapter.h"
-#include "nsmldmiapmatcher.h"
-
-#include <centralrepository.h>
-#include <BrowserUiSDKCRKeys.h>
-#include <commdb.h>
-#include <cdbcols.h>             // CommsDB columname defs
-#include <ApUtils.h>
-
-#ifndef __WINS__
-                                    // This lowers the unnecessary compiler warning (armv5) to remark.
-                                    // "Warning: #174-D: expression has no effect..." is caused by 
-                                    // DBG_ARGS8 macro in no-debug builds.
-#pragma diag_remark 174
-#endif
-const TInt KUserDefined = 0;
-
-
-const TUint KNSmlDMBrowserAdapterImplUid = 0x1028335F;
-
-
-// -----------------------------------------------------------------------------
-// CNSmlDmBrowserAdapter* CNSmlDmBrowserAdapter::NewL( )
-// -----------------------------------------------------------------------------
-CNSmlDmBrowserAdapter* CNSmlDmBrowserAdapter::NewL(MSmlDmCallback* aDmCallback )
-    {
-    _DBG_FILE("CNSmlDmBrowserAdapter::NewL(): begin");
-    CNSmlDmBrowserAdapter* self = NewLC( aDmCallback );
-    CleanupStack::Pop();
-    _DBG_FILE("CNSmlDmBrowserAdapter::NewL(): end");
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDmBrowserAdapter* CNSmlDmBrowserAdapter::NewLC( )
-// -----------------------------------------------------------------------------
-CNSmlDmBrowserAdapter* CNSmlDmBrowserAdapter::NewLC(MSmlDmCallback* aDmCallback )
-    {
-    _DBG_FILE("CNSmlDmBrowserAdapter::NewLC(): begin");
-    CNSmlDmBrowserAdapter* self = new (ELeave) CNSmlDmBrowserAdapter(aDmCallback);
-    CleanupStack::PushL(self);
-    self->iDmCallback = aDmCallback;
-    _DBG_FILE("CNSmlDmBrowserAdapter::NewLC(): end");
-    return self;
-    }
-
-
-
-// -----------------------------------------------------------------------------
-// CNSmlDmBrowserAdapter::~CNSmlDmBrowserAdapter()
-// -----------------------------------------------------------------------------
-CNSmlDmBrowserAdapter::~CNSmlDmBrowserAdapter()
-    {
-    _DBG_FILE("CNSmlDmBrowserAdapter::~CNSmlDmBrowserAdapter(): begin");
-    _DBG_FILE("CNSmlDmBrowserAdapter::~CNSmlDmBrowserAdapter(): end");
-    }
-    
-// -----------------------------------------------------------------------------
-// CNSmlDmBrowserAdapter::CNSmlDmBrowserAdapter()
-// -----------------------------------------------------------------------------
-
-CNSmlDmBrowserAdapter::CNSmlDmBrowserAdapter(TAny* aEcomArguments):CSmlDmAdapter(aEcomArguments)
-    {
-    _DBG_FILE("CNSmlDmBrowserAdapter::CNSmlDmBrowserAdapter(aEcomArguments): begin");
-    _DBG_FILE("CNSmlDmBrowserAdapter::CNSmlDmBrowserAdapter(aEcomArguments): end"); 
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDmBrowserAdapter::SetLeafPropertiesL()
-// -----------------------------------------------------------------------------
-void CNSmlDmBrowserAdapter::SetLeafPropertiesL( MSmlDmDDFObject& aObject, 
-                                                const TSmlDmAccessTypes& aAccessTypes, 
-                                                const TDesC8& aDescription ) const
-    {
-    aObject.SetAccessTypesL( aAccessTypes );
-    aObject.SetScopeL( MSmlDmDDFObject::EPermanent );
-    aObject.SetDFFormatL( MSmlDmDDFObject::EChr );
-    aObject.AddDFTypeMimeTypeL( KNSmlDMBrowserAdapterTextPlain );
-    aObject.SetDescriptionL( aDescription );
-    }
-
-
-// -----------------------------------------------------------------------------
-//  CNSmlDmBrowserAdapter::DDFVersionL()
-// -----------------------------------------------------------------------------
-void CNSmlDmBrowserAdapter::DDFVersionL(CBufBase& aDDFVersion)
-    {
-    _DBG_FILE("CNSmlDmBrowserAdapter::DDFVersionL(TDes& aDDFVersion): begin");
-    aDDFVersion.InsertL(0,KNSmlDMBrowserAdapterDDFVersion);
-    _DBG_FILE("CNSmlDmBrowserAdapter::DDFVersionL(TDes& aDDFVersion): end");
-    }
-
-
-// -----------------------------------------------------------------------------
-//  CNSmlDmBrowserAdapter::DDFStructureL()
-//
-// -----------------------------------------------------------------------------
-void CNSmlDmBrowserAdapter::DDFStructureL( MSmlDmDDFObject& aDDF )
-    {
-    _DBG_FILE("CNSmlDmBrowserAdapter::DDFStructureL(): begin");
-    
-    TSmlDmAccessTypes accessTypes;
-    accessTypes.SetGet();
-    
-    TSmlDmAccessTypes accessSetTypes;
-    accessSetTypes.SetGet();
-    accessSetTypes.SetAdd();
-    accessSetTypes.SetReplace();
-    
-    MSmlDmDDFObject& dmBrowserAdap = aDDF.AddChildObjectL( KNSmlDMBrowserAdapterNodeName );
-    dmBrowserAdap.SetAccessTypesL( accessTypes ); 
-    dmBrowserAdap.SetScopeL( MSmlDmDDFObject::EPermanent );
-    dmBrowserAdap.SetDescriptionL( KNSmlDMBrowserAdapterDescription );
-  
-    MSmlDmDDFObject& toNapID = dmBrowserAdap.AddChildObjectL(KNSmlDMBrowserAdapterAPNode);
-    toNapID.SetAccessTypesL( accessSetTypes );
-    toNapID.SetScopeL( MSmlDmDDFObject::EDynamic );
-    toNapID.SetDFFormatL( MSmlDmDDFObject::EChr );
-    toNapID.AddDFTypeMimeTypeL( KNSmlDMBrowserAdapterTextPlain );
-    toNapID.SetDescriptionL( KNSmlDMBrowserAdapterAPNodeDescription );
-    
-    MSmlDmDDFObject& startpageURL = dmBrowserAdap.AddChildObjectL(KNSmlDMBrowserAdapterStartpageURL);
-    startpageURL.SetAccessTypesL( accessSetTypes );
-    startpageURL.SetScopeL( MSmlDmDDFObject::EPermanent );
-    startpageURL.SetDFFormatL( MSmlDmDDFObject::EChr );
-    startpageURL.AddDFTypeMimeTypeL( KNSmlDMBrowserAdapterTextPlain );
-    startpageURL.SetDescriptionL( KNSmlDMBrowserStartpageURLDescription );
-    _DBG_FILE("CNSmlDmBrowserAdapter::DDFStructureL(): end");
-    }
-
-// -----------------------------------------------------------------------------
-//  CNSmlDmBrowserAdapter::UpdateLeafObjectL()
-// -----------------------------------------------------------------------------
-void CNSmlDmBrowserAdapter::UpdateLeafObjectL( const TDesC8& aURI, 
-                                               const TDesC8& aLUID, 
-                                               const TDesC8& aObject, 
-                                               const TDesC8& aType, 
-                                               const TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlDmBrowserAdapter::UpdateLeafObjectL(): begin");
-    
-     CSmlDmAdapter::TError retValue = CSmlDmAdapter::EOk;
-    TInt ret = aURI.LocateReverse(KNSmlURISeparator()[0]);
-    if ( ret == KErrNotFound ) 
-        {
-        retValue = CSmlDmAdapter::EError;
-        iDmCallback->SetStatusL( aStatusRef, retValue );
-        }
-    else
-        {
-        iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
-        TInt len = aURI.Length() - (ret + 1);
-        TPtrC8 segment = aURI.Right( len );
-        
-    	DBG_ARGS8(_S8(" Value being set  URI - <%S> <%S> "), &aURI, &aObject );
-                      
-		if (segment == KNSmlDMBrowserAdapterAPNode )
-            {
-              // Get IAP ID and then set the browser setting 
-            TInt err = KErrNone;  
-            CNSmlDMIAPMatcher* iapmatch = CNSmlDMIAPMatcher::NewL( &Callback() );
-            CleanupStack::PushL(iapmatch);
-            
-            TInt iap = iapmatch->IAPIdFromURIL( aObject );
-
-            CleanupStack::PopAndDestroy(); // iapmatch
-            
-            if ( iap != KErrNotFound )
-                {
-                CCommsDatabase* commDb = CCommsDatabase::NewL();
-                CleanupStack::PushL(commDb);
-                CApUtils* aputils = CApUtils::NewLC(*commDb);
-                TRAP(err, iap = aputils->WapIdFromIapIdL( iap ) );
-                DBG_ARGS(_S("IAP = %d"), iap);
-
-                CleanupStack::PopAndDestroy(2); //commdb,aputils
-
-                if( err == KErrNone)
-                    {
-                    CRepository* repository = CRepository::NewLC( KCRUidBrowser );
-    
-				    // Force the browser to use the User Defined AP selection mode.
-    				User::LeaveIfError( repository->Set( KBrowserAccessPointSelectionMode,
-                                         KUserDefined ) );
-    				// This sets the accesspoint default for browser.
-    				User::LeaveIfError( repository->Set( KBrowserDefaultAccessPoint,
-                                         iap ) );
-				    CleanupStack::PopAndDestroy(); // repository
-    
-                    }
-                else
-                    {
-                    _DBG_FILE("CNSmlDmMMSAdapter::UpdateDataL(): \
-                    err!=KErrNone");
-                    iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EInvalidObject );
-                     
-                    }
-                }
-            else
-                {
-                _DBG_FILE("CNSmlDmMMSAdapter::UpdateDataL(): status = \
-                CSmlDmAdapter::EInvalidObject");
-              	iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EInvalidObject );
-                }
-            }
-		else if(segment == KNSmlDMBrowserAdapterStartpageURL )
-		    {
-		    	// To Get the Browser Start page URL
-		    TBuf<KMaxLengthStartpageName> aBuf;
-		    TInt aErr;
-		    aBuf.Zero();
-		    aBuf.Copy(aObject);
-
-            if(aBuf.Length() == 0 || aBuf.Length() > KMaxLengthStartpageName)
-                {
-                _DBG_FILE("CNSmlDmBrowserAdapter::UpdateLeafObjectL(): Error Zero Length String");
-                iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EInvalidObject);
-                return;
-                }
-                
-		    
-		    CRepository* repository = CRepository::NewLC( KCRUidBrowser );
-		        
-		    if(repository)
-		        {
-		        _DBG_FILE("CNSmlDmBrowserAdapter::UpdateLeafObjectL(): Before Set for StartPage");
-		        User::LeaveIfError( aErr = repository->Set( KBrowserNGStartpageURL,aBuf));
-		        if(aErr != KErrNone)
-                    {
-                    _DBG_FILE("CNSmlDmBrowserAdapter::UpdateLeafObjectL(): Error in Cenrep Set");
-                    iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EError);
-					return;
-                    }
-		        _DBG_FILE("CNSmlDmBrowserAdapter::UpdateLeafObjectL(): Before Set for StartPageType");
-		        User::LeaveIfError( aErr = repository->Set( KBrowserNGHomepageType,KBrowserHomePageUDefined));
-                if(aErr != KErrNone)
-                    {
-                    _DBG_FILE("CNSmlDmBrowserAdapter::UpdateLeafObjectL(): Error in Cenrep Set");
-                    iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EError);
-                    return;
-                    }
-
-		        }
-		    _DBG_FILE("CNSmlDmBrowserAdapter::UpdateLeafObjectL(): Before Setting status to OK");
-            CleanupStack::PopAndDestroy(); // repository
-            iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
-		        
-		    }
-        else
-            {
-            iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
-            }   
-        }
-        
-    _DBG_FILE("CNSmlDmBrowserAdapter::UpdateLeafObjectL(): end");
-    }
-
-
-// -----------------------------------------------------------------------------
-// CNSmlDmBrowserAdapter::DeleteObjectL()
-// -----------------------------------------------------------------------------
-void CNSmlDmBrowserAdapter::DeleteObjectL( const TDesC8& /*aURI*/, 
-                                           const TDesC8& /*aLUID*/, 
-                                           const TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlDmBrowserAdapter::DeleteLeafObjectL( ): begin");
-    _DBG_FILE("CNSmlDmBrowserAdapter::DeleteLeafObjectL( ): end");
-    iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-    }
-
-
-// -----------------------------------------------------------------------------
-//  CNSmlDmBrowserAdapter::FetchLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, 
-// const TDesC8& aType, const TInt aResultsRef, const TInt aStatusRef )
-// -----------------------------------------------------------------------------
-void CNSmlDmBrowserAdapter::FetchLeafObjectL( const TDesC8& aURI, 
-                                              const TDesC8& /*aLUID*/, 
-                                              const TDesC8& aType, 
-                                              const TInt aResultsRef, 
-                                              const TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlDmBrowserAdapter::FetchLeafObjectL(): begin");
-    
-    CBufBase *object = CBufFlat::NewL( 1 );
-    CleanupStack::PushL( object );
-    
-    CSmlDmAdapter::TError retValue = FetchLeafObjectL( aURI, *object );
-    
-    iDmCallback->SetStatusL( aStatusRef, retValue );
-    iDmCallback->SetResultsL( aResultsRef, *object, aType );
-    CleanupStack::PopAndDestroy(); //object
-    _DBG_FILE("CNSmlDmDevInfoAdapt+er::FetchLeafObjectL(): end");
-    }
-
-
-// -----------------------------------------------------------------------------
-//  CNSmlDmBrowserAdapter::ChildURIListL( const TDesC& aURI, 
-// const TDesC& aParentLUID, const CArrayFix<TSmlDmMappingInfo>& aPreviousURISegmentList, 
-// const TInt aResultsRef, const TInt aStatusRef )
-// -----------------------------------------------------------------------------
-void CNSmlDmBrowserAdapter::ChildURIListL( const TDesC8& aURI, 
-                                           const TDesC8& /*aParentLUID*/, 
-                                           const CArrayFix<TSmlDmMappingInfo>& /*aPreviousURISegmentList*/, 
-                                           const TInt aResultsRef, 
-                                           const TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlDmBrowserAdapter::ChildURIListL(): begin");
-    CSmlDmAdapter::TError retValue = CSmlDmAdapter::EOk;
-    CBufBase* currentURISegmentList = CBufFlat::NewL( 1 );
-    CleanupStack::PushL( currentURISegmentList );
-    TInt ret = aURI.LocateReverse(KNSmlURISeparator()[0]);
-    if ( ret == KErrNotFound ) 
-        {
-        ret = -1;
-        }
-    TInt len = aURI.Length() - ( ret + 1 );
-    TPtrC8 segment = aURI.Right( len );
-
-    if ( segment == KNSmlDMBrowserAdapterNodeName )
-        {
-        currentURISegmentList->InsertL( currentURISegmentList->Size(), KNSmlDMBrowserAdapterBrowserNodes() );
-        }
-    
-    else
-        {
-        retValue = CSmlDmAdapter::EError;
-        }
-    iDmCallback->SetStatusL( aStatusRef, retValue );
-    iDmCallback->SetResultsL( aResultsRef, *currentURISegmentList, KNullDesC8 );
-    CleanupStack::PopAndDestroy(); //currentURISegmentList
-    _DBG_FILE("CNSmlDmBrowserAdapter::ChildURIListL(): end");
-    }
-
-
-// -----------------------------------------------------------------------------
-// CNSmlDmBrowserAdapter::AddNodeObjectL( const TDesC8& aURI, 
-// const TDesC8& aParentLUID, const TInt aStatusRef )
-// -----------------------------------------------------------------------------
-void CNSmlDmBrowserAdapter::AddNodeObjectL( const TDesC8& /*aURI*/, 
-                                            const TDesC8& /*aParentLUID*/, 
-                                            const TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlDmBrowserAdapter::AddNodeObjectL(): begin");
-    iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-    _DBG_FILE("CNSmlDmBrowserAdapter::AddNodeObjectL(): end");
-    }
-
-// -----------------------------------------------------------------------------
-//  CNSmlDmBrowserAdapter::UpdateLeafObjectL()
-// -----------------------------------------------------------------------------
-void CNSmlDmBrowserAdapter::UpdateLeafObjectL( const TDesC8& /*aURI*/, 
-                                               const TDesC8& /*aLUID*/, 
-                                               RWriteStream*& /*aStream*/, 
-                                               const TDesC8& /*aType*/, 
-                                               const TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlDmBrowserAdapter::UpdateLeafObjectL(): stream: begin");
-    iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-    _DBG_FILE("CNSmlDmBrowserAdapter::UpdateLeafObjectL(): stream: end");
-    }
-
-
-// -----------------------------------------------------------------------------
-//  CNSmlDmBrowserAdapter::FetchLeafObjectSizeL( const TDesC8& aURI, 
-//  const TDesC8& aLUID, const TDesC8& aType, TInt aResultsRef, TInt aStatusRef )
-// -----------------------------------------------------------------------------
-void CNSmlDmBrowserAdapter::FetchLeafObjectSizeL( const TDesC8& aURI, 
-                                                  const TDesC8& /*aLUID*/, 
-                                                  const TDesC8& aType, 
-                                                  const TInt aResultsRef, 
-                                                  const TInt aStatusRef )
-    {
-
-    _DBG_FILE("CNSmlDmBrowserAdapter::FetchLeafObjectSizeL(): begin");
-    
-    CBufBase *object = CBufFlat::NewL( 1 );
-    CleanupStack::PushL( object );
-    CSmlDmAdapter::TError retValue = FetchLeafObjectL( aURI, *object );
-        
-    TInt objSizeInBytes = object->Size();
-    TBuf8<2> stringObjSizeInBytes;
-    stringObjSizeInBytes.Num( objSizeInBytes );
-    object->Reset();
-    object->InsertL( 0, stringObjSizeInBytes );
-    
-    iDmCallback->SetStatusL( aStatusRef, retValue );
-    iDmCallback->SetResultsL( aResultsRef, *object, aType );
-    CleanupStack::PopAndDestroy(); //object
-    _DBG_FILE("CNSmlDmBrowserAdapter::FetchLeafObjectSizeL(): end");
-    }
-    
-
-// -----------------------------------------------------------------------------
-//  CNSmlDmBrowserAdapter::ExecuteCommandL( const TDesC8& aURI, 
-//  const TDesC8& aParentLUID, TDesC8& aArgument, const TDesC8& aType, TInt aStatusRef )
-// -----------------------------------------------------------------------------
-void CNSmlDmBrowserAdapter::ExecuteCommandL( const TDesC8& aURI, const TDesC8& aLUID, const TDesC8& aArgument, const TDesC8& aType, const TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlDmBrowserAdapter::ExecuteCommandL(): begin");
-    iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-    _DBG_FILE("CNSmlDmBrowserAdapter::ExecuteCommandL(): end");
-    }
-
-// -----------------------------------------------------------------------------
-//  CNSmlDmBrowserAdapter::ExecuteCommandL( const TDesC8& aURI, 
-//  const TDesC8& aParentLUID, RWriteStream*& aStream, const TDesC8& aType, 
-//  TInt aStatusRef )
-// -----------------------------------------------------------------------------
-void CNSmlDmBrowserAdapter::ExecuteCommandL( const TDesC8& /*aURI*/, 
-                                             const TDesC8& /*aParentLUID*/, 
-                                             RWriteStream*& /*aStream*/, 
-                                             const TDesC8& /*aType*/, 
-                                             const TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlDmBrowserAdapter::ExecuteCommandL(): stream: begin");
-    iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-    _DBG_FILE("CNSmlDmBrowserAdapter::ExecuteCommandL(): stream: end");
-    }
-
-// -----------------------------------------------------------------------------
-//  CNSmlDmBrowserAdapter::CopyCommandL( const TDesC8& aTargetURI, const TDesC8& 
-//  aSourceURI, const TDesC8& aSourceLUID, const TDesC8& /*aType*/, TInt aStatusRef )
-// -----------------------------------------------------------------------------
-void CNSmlDmBrowserAdapter::CopyCommandL( const TDesC8& /*aTargetURI*/, const TDesC8& 
-                                          /*aTargetLUID*/, const TDesC8& /*aSourceURI*/, 
-                                          const TDesC8& /*aSourceLUID*/, 
-                                          const TDesC8& /*aType*/, TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlDmBrowserAdapter::CopyCommandL(): begin");
-    iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-    _DBG_FILE("CNSmlDmBrowserAdapter::CopyCommandL(): end");
-    }
-
-// --------------------------------------
-//  CNSmlDmBrowserAdapter::StartAtomicL()
-// --------------------------------------
-void CNSmlDmBrowserAdapter::StartAtomicL()
-    {
-    _DBG_FILE("CNSmlDmBrowserAdapter::StartAtomicL(): begin");
-    _DBG_FILE("CNSmlDmBrowserAdapter::StartAtomicL(): end");
-    }
-    
-// ---------------------------------------
-//  CNSmlDmBrowserAdapter::CommitAtomicL()
-// ---------------------------------------
-void CNSmlDmBrowserAdapter::CommitAtomicL()
-    {
-    _DBG_FILE("CNSmlDmBrowserAdapter::CommitAtomicL(): begin");
-    _DBG_FILE("CNSmlDmBrowserAdapter::CommitAtomicL(): end");
-    }
-
-// -----------------------------------------
-//  CNSmlDmBrowserAdapter::RollbackAtomicL()
-// -----------------------------------------
-void CNSmlDmBrowserAdapter::RollbackAtomicL()
-    {
-    _DBG_FILE("CNSmlDmBrowserAdapter::RollbackAtomicL(): begin");
-    _DBG_FILE("CNSmlDmBrowserAdapter::RollbackAtomicL(): end");
-    }
-
-// -----------------------------------------------------------
-//  CNSmlDmBrowserAdapter::StreamingSupport( TInt& aItemSize )
-// -----------------------------------------------------------  
-TBool CNSmlDmBrowserAdapter::StreamingSupport( TInt& /*aItemSize*/ )
-    {
-    _DBG_FILE("CNSmlDmBrowserAdapter::StreamingSupport(): begin");
-    _DBG_FILE("CNSmlDmBrowserAdapter::StreamingSupport(): end");
-    return EFalse;
-    }
-
-// ------------------------------------------
-//  CNSmlDmBrowserAdapter::StreamCommittedL()
-// ------------------------------------------
-void CNSmlDmBrowserAdapter::StreamCommittedL()
-    {
-    _DBG_FILE("CNSmlDmBrowserAdapter::StreamCommittedL(): begin");
-    _DBG_FILE("CNSmlDmBrowserAdapter::StreamCommittedL(): end");
-    }
-
-// --------------------------------------------------
-//  CNSmlDmBrowserAdapter::CompleteOutstandingCmdsL()
-// --------------------------------------------------   
-void CNSmlDmBrowserAdapter::CompleteOutstandingCmdsL()
-    {
-    _DBG_FILE("CNSmlDmBrowserAdapter::CompleteOutstandingCmdsL(): begin");
-    _DBG_FILE("CNSmlDmBrowserAdapter::CompleteOutstandingCmdsL(): end");    
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDmDevDetailAdapter::FetchLeafObjectL()
-// -----------------------------------------------------------------------------
-CSmlDmAdapter::TError CNSmlDmBrowserAdapter::FetchLeafObjectL( const TDesC8& aURI, 
-                                                               CBufBase& aObject )
-    {
-    _DBG_FILE("CNSmlDmInfoAdapter::FetchLeafObjectL(): begin");
-    CSmlDmAdapter::TError retValue = CSmlDmAdapter::EOk;
-    TInt ret = aURI.LocateReverse(KNSmlURISeparator()[0]);
-    TInt err = KErrNone;
-    if ( ret == KErrNotFound ) 
-        {
-        retValue = CSmlDmAdapter::EError;
-        }
-    else
-        {
-        TInt len = aURI.Length() - (ret + 1);
-        TPtrC8 segment = aURI.Right( len );
-        
-        if(segment == KNSmlDMBrowserAdapterAPNode)
-            {
-            TInt iap ;
-            CRepository* repository = CRepository::NewLC( KCRUidBrowser );
-    
-		    // Force the browser to use the User Defined AP selection mode.
-    		TInt selectionMode;
-    		User::LeaveIfError( repository->Get( KBrowserAccessPointSelectionMode,
-                                         selectionMode ) );
-    		if (selectionMode != KUserDefined)                                          
-        		{
-         		retValue= CSmlDmAdapter::ENotFound;
-		         
-        		CleanupStack::PopAndDestroy(); // repository
-        		}
-       		else
-        		{
-        		// This sets the accesspoint default for browser.
-    			User::LeaveIfError( repository->Get( KBrowserDefaultAccessPoint,
-                                         iap ) );
-    			CleanupStack::PopAndDestroy(); // repository
-            
-            	CCommsDatabase* commDb = CCommsDatabase::NewL();
-                CleanupStack::PushL(commDb);
-                CApUtils* aputils = CApUtils::NewLC(*commDb);
-                TRAP(err, iap = aputils->IapIdFromWapIdL( iap ) );
-                DBG_ARGS(_S("IAP = %d"), iap);
-
-        
-        	if( iap != -1 && err == KErrNone )
-            	{
-            	CNSmlDMIAPMatcher* iapmatch = CNSmlDMIAPMatcher::NewL( &Callback() );
-            	CleanupStack::PushL(iapmatch);
-    
-            	HBufC8* uri8 = iapmatch->URIFromIAPIdL( iap );
-                
-            if( uri8 )
-                {
-                CleanupStack::PushL(uri8);
-                aObject.InsertL(0,uri8->Des());
-                retValue= CSmlDmAdapter::EOk;
-                
-                CleanupStack::PopAndDestroy(); // uri8
-                }
-            else
-                {
-                retValue= CSmlDmAdapter::ENotFound;
-                
-                }    
-            CleanupStack::PopAndDestroy(); // iapMatch
-            
-            }
-            else
-                {
-                retValue= CSmlDmAdapter::ENotFound;
-                }
-                CleanupStack::PopAndDestroy(); // apUrils
-                CleanupStack::PopAndDestroy(); // commDb
-            }
-        }
-        else if(segment == KNSmlDMBrowserAdapterStartpageURL)
-            {
-            	// To Set the Browser Start page URL
-            TBuf8<KMaxLengthStartpageName> aName;
-            CRepository* centrep( NULL);
-            aName.Zero();
-            centrep = CRepository::NewLC(KCRUidBrowser);
-
-            if ( centrep )
-                {
-                TFullName temp;
-                
-                if (centrep->Get( KBrowserNGStartpageURL, temp )==KErrNone && temp.Length() )
-                    {
-                    _DBG_FILE("CNSmlDmBrowserAdapter::FetchLeafObjectL(): Got the value for start page");
-                    temp.Trim();
-                    aName.Copy(temp);
-                    }
-                CleanupStack::PopAndDestroy(centrep);
-                }
-            aObject.InsertL(0,aName);
-            retValue= CSmlDmAdapter::EOk;   
-            }
-    
-        }
-    _DBG_FILE("CNSmlDmInfoAdapter::FetchLeafObjectL(): end");
-    return retValue;
-    }
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-#ifndef IMPLEMENTATION_PROXY_ENTRY
-#define IMPLEMENTATION_PROXY_ENTRY(aUid, aFuncPtr)  {{aUid},(aFuncPtr)}
-#endif
-
-const TImplementationProxy ImplementationTable[] = 
-    {
-        IMPLEMENTATION_PROXY_ENTRY(KNSmlDMBrowserAdapterImplUid, CNSmlDmBrowserAdapter::NewL)
-    };
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy( TInt& aTableCount )
-    {
-    _DBG_FILE("ImplementationGroupProxy() for CNSmlDmBrowserAdapter: begin");
-    aTableCount = sizeof(ImplementationTable) / sizeof(TImplementationProxy);
-    _DBG_FILE("ImplementationGroupProxy() for CNSmlDmBrowserAdapter: end");
-    return ImplementationTable;
-    }
-
-// End of file
-
--- a/omadm/omadmextensions/adapters/browseradapter/src/nsmldmbrowseradapter.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of dm adapters
-* 	This is part of omadmextensions.
-*
-*/
-
-
-CHARACTER_SET UTF8
-
-/*
-* ============================================================================
-*  Name     : 101f6de8.rss
-*  Part of  : SyncMl
-*  Origin   : SyncML Phase 2
-*  Created  : 06.03.2003
-*  Implementation notes:
-*     
-*  Version  : 0.1
-*   $Revision: 2 $, $Modtime: 10.05.05 11:06 $ by $Author: Kollasep $
-*  ---------------------------------------------------------------------------
-*  Version history:
-*  Template version: 1.02, 21.6.2000 by maparnan
-*  <ccm_history>
-*  </ccm_history>
-* ============================================================================
-*/
-
-
-
-#include <registryinfo.rh>
-#include "nsmldmconstants.h"
-
-RESOURCE REGISTRY_INFO theRegistryInfo
-  {
-  dll_uid = 0x1028335E;//The DLL's 3rd UID.
-  interfaces = 
-      {
-      INTERFACE_INFO
-          {
-          interface_uid = KNSmlDMInterfaceUid; // DM interface UID
-          implementations = 
-            {
-            IMPLEMENTATION_INFO
-                {
-                implementation_uid = 0x1028335F; // DM browser implementation UID
-                version_no = 1; 
-                display_name = "";
-                default_data = "";
-                opaque_data = "";
-                }
-            };
-          }
-      };
-    }
--- a/omadm/omadmextensions/adapters/connmoadapter/group/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /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 "Eclipse Public License v1.0"
-* which accompanies 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 <platform_paths.hrh>
-
-PRJ_PLATFORMS
-
-DEFAULT
-
-PRJ_EXPORTS
-
-
-PRJ_MMPFILES
-connmoadapter.mmp
-
-
-
--- a/omadm/omadmextensions/adapters/connmoadapter/group/connmoadapter.mmp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +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 "Eclipse Public License v1.0"
-* which accompanies 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  <platform_paths.hrh>
-
-CAPABILITY      CAP_ECOM_PLUGIN
-TARGET	      	connmoadapter.dll
-TARGETTYPE      PLUGIN
-UID             0x10009D8D 0x2001FE5E
-VENDORID        VID_DEFAULT
-
-MW_LAYER_SYSTEMINCLUDE
-SYSTEMINCLUDE 	/epoc32/include/ecom 
-
-SOURCEPATH      ../src
-USERINCLUDE     ../inc
-USERINCLUDE     ../traces
-
-START RESOURCE ConnMoAdapter.rss
-END
-
-LANG	sc
-
-LIBRARY		charconv.lib ecom.lib euser.lib
-LIBRARY		sysutil.lib
-LIBRARY 	cmmanager.lib
-
-SOURCE ConnMoAdapter.cpp BranchBase.cpp NapBranch.cpp ProxyBranch.cpp AddBuffer.cpp Utils.cpp
-
--- a/omadm/omadmextensions/adapters/connmoadapter/inc/AddBuffer.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,145 +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 "Eclipse Public License v1.0"
-* which accompanies 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 ADDBUFFER_H_
-#define ADDBUFFER_H_
-
-TInt const KMaxFieldLength = 128;
-
-/**
-* CConnMoNodeElement is array element for ConnMo node objects.  
-*/
-class CConnMoNodeElement : public CBase
-    {
-public:
-    CConnMoNodeElement();
-    ~CConnMoNodeElement();
-    
-    /** Node address */
-    TBuf8<KMaxFieldLength>  iUri;
-    /** Unique identifier of the parent node */
-    TBuf8<KMaxFieldLength>  iParentLUID;
-    /** Leaf object's data */
-    TBuf8<KMaxFieldLength>  iObject;
-    /** Refenrence for giving commands return value to framework */
-    TInt  iStatusRef;
-    /** Information whether adapter has processed the node or not */
-    TBool iProcessed;
-    /** Specifies if the node leaf or not */
-    TBool iLeaf;
-private:
-    };
-
-/**
-* CAddBuffer is array for ConnMo nodes to be added in .
-* 
-* CConnMoAdapter uses this class to buffer node and leaf data 
-* addition DM commands. 
-*/
-class CAddBuffer : public CBase
-    {
-public:
-    
-    /**
-     * Creates new instance of CAddBuffer
-     */
-    static CAddBuffer* NewL();
-    
-    /**
-     * Adds node to buffer
-     * 
-     * @param aUri target node URI
-     * @param aParentLUID refrence to parent node
-     * @param aStatusRef Status reference
-     */
-    void AddNodeToBufferL( const TDesC8& aUri, 
-                           const TDesC8& aParentLUID, 
-                           const TInt    aStatusRef );
-    
-    /**
-     * Adds leaf node to buffer
-     * 
-     * @param aUri target node URI
-     * @param aParentLUID refrence to parent node
-     * @param aObject Leaf object data
-     * @param aStatusRef Status reference
-     */
-    void AddNodeToBufferL( const TDesC8& aUri, 
-                           const TDesC8& aLUID, 
-                           const TDesC8& aObject,
-                           const TInt    aStatusRef );
-    
-    /**
-     * Searches buffer for given dynamic node
-     * 
-     * @param aUri target node URI
-     */
-    CConnMoNodeElement* FindDynamicNode( const TDesC8& aUri );
-    
-    /**
-     * Gets all unprocessed nodes associated to given root node
-     * 
-     * Function searches buffer for all unprocessed nodes that 
-     * belong to given group and are under same dynamic node 
-     * 
-     * @param aRoot target group
-     * @param aGroup Array for result nodes
-     */
-    TInt GetGroup( const TDesC8& aRoot, RPointerArray<CConnMoNodeElement>* aGroup );
-    
-    /**
-     * Searches buffer for givennode
-     * 
-     * @param aUri target node URI
-     */
-    CConnMoNodeElement* CacheFind( const TDesC8& aUri );
-    
-    /**
-     * Searches buffer for given dynamic node
-     * 
-     * @param aUri target node URI
-     */
-    CConnMoNodeElement* CacheFindDynamicNode( const TDesC8& aUri );
-    
-    /**
-     * Empties buffer and frees all allocated memory
-     */
-    void Reset();
-
-    virtual ~CAddBuffer(); 
-    
-private:
-    
-    //-----------------------------------------------------------------------------
-    // Private functions
-    //-----------------------------------------------------------------------------
-    void ConstructL();
-    CAddBuffer();
-          
-    //-----------------------------------------------------------------------------
-    // Private member variables
-    //-----------------------------------------------------------------------------
-    /** Contains all nodes to be added */
-    RPointerArray<CConnMoNodeElement> iBuffer;
-    /** Contains group of nodes that user has previously asked */
-    RPointerArray<CConnMoNodeElement> iCache;
-        
-    };
-
-#endif /* ADDBUFFER_H_ */
--- a/omadm/omadmextensions/adapters/connmoadapter/inc/BranchBase.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,186 +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 "Eclipse Public License v1.0"
-* which accompanies 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 BRANCHBASE_H_
-#define BRANCHBASE_H_
-
-#include <cmmanagerext.h> 
-#include "smldmadapter.h"
-
-// ------------------------------------------------------------------------------------------------
-// Constants
-// ------------------------------------------------------------------------------------------------
-#define KConnMoAdapterUid 0x2001FE5F
-
-/**
- * Abstract base class for all ConnMO branches.
- */
-class CBranchBase : public CBase
-    {
-public:
-
-    /**
-     * Builds DDF structure of DM settings it governs.
-     * 
-     * Implementations should build their structure using given node 
-     * as the root node.
-     * 
-     * @param aDDF Root node
-     */
-    virtual void DDFStructureL( MSmlDmDDFObject& aDDF ) = 0;
-    
-    /**
-     * Updates leaf node data.
-     * 
-     * @param aURI Root node
-     * @param aLUID refrence to branch LUID
-     * @param aObject Leaf object data
-     * @param aType Type of the node
-     * @param aStatusRef Status reference
-     */
-    virtual void UpdateLeafObjectL( const TDesC8& aURI, 
-                                    const TDesC8& aLUID,
-                                    const TDesC8& aObject, 
-                                    const TDesC8& aType,
-                                    TInt aStatusRef ) = 0;
-    /**
-     * Deletes object pointed by aURI.
-     * 
-     * @param aURI Root node
-     * @param aLUID refrence to branch LUID
-     * @param aStatusRef Status reference
-     */    
-    virtual void DeleteObjectL( const TDesC8& aURI, 
-                                const TDesC8& aLUID,
-                                TInt aStatusRef ) = 0;
-        
-    /**
-     * Gets node data for leaf nodes and child list for parent nodes.
-     * 
-     * @param aURI Root node
-     * @param aLUID refrence to branch LUID
-     * @param aObject Leaf object data
-     * @param aType Type of the node
-     * @param aResultsRef Result reference
-     * @param aStatusRef Status reference
-     */
-    virtual void FetchLeafObjectL( const TDesC8& aURI, 
-                                   const TDesC8& aLUID,
-                                   const TDesC8& aType, 
-                                   TInt aResultsRef,
-                                   TInt aStatusRef ) = 0;
-        
-    /**
-     * Gets the size of the data in leaf node.
-     */
-    virtual void FetchLeafObjectSizeL( const TDesC8& aURI, 
-                                       const TDesC8& aLUID,
-                                       const TDesC8& aType, 
-                                       TInt aResultsRef,
-                                       TInt aStatusRef) = 0;
-
-    /**
-     * Gets all childs of the given node.
-     */
-    virtual void ChildURIListL( const TDesC8& aURI, 
-                                const TDesC8& aLUID,
-                                const CArrayFix<TSmlDmMappingInfo>& aPreviousURISegmentList,
-                                TInt aResultsRef, 
-                                TInt aStatusRef ) = 0;
-        
-    /**
-     * Adds node to DM tree.
-     */
-    virtual void AddNodeObjectL( const TDesC8& aURI, 
-                                 const TDesC8& aParentLUID,
-                                 TInt aStatusRef )=0;
-
-        
-    virtual ~CBranchBase();
-
-protected:
-    
-    CBranchBase();
-    
-    CBranchBase( MSmlDmCallback* aDmCallback );
-            
-    /**
-     * This function gives all Connection Methods from Connection Method Manager.
-     * 
-     * @param aCmArray Result Array.
-     * @param aCmManager CM Manager.
-     */
-    void GetAllConnectionMethodsL( RArray<TUint32>& aCmArray,
-                                   RCmManagerExt& aCmManager );
-    
-    /**
-     * This function checks if given CM ID is found from given URI segmentlist.
-     * 
-     * @param aPreviousURISegmentList Array where to search.
-     * @param aCmId CM ID to be searched.
-     * @param aURISeg If match is found, the URI segment matching the CM ID is copied here.
-     * @return TBool ETrue if CM ID is found from array.
-     */
-    TBool CheckPreviousURIList( const CArrayFix<TSmlDmMappingInfo>& aPreviousURISegmentList,
-                                const TUint32 aCmId,
-                                TDes8& aURISeg );
-    
-    /**
-     * This function gets list of dynamic nodes for the specified URI
-     * 
-     * @param aURI which to get the list for
-     * @param aLuid refrence to branch LUID
-     * @param aPreviousURISegmentList previous URI segment list
-     * @param aResultRef result reference
-     * @param aStatusRef status reference
-     * @param aCmManagerExt CM Manager reference
-     * @param aCurrentURISegmentList current URI segment list
-     * @param aField branch name
-     * @param aNodeCount number of dynamic nodes
-     * @aCallback pointer to DM callback
-     */
-    void GetAllDynamicNodesL( const TDesC8& aURI, 
-                              const TDesC8& aLUID,
-                              const CArrayFix<TSmlDmMappingInfo>& aPreviousURISegmentList,
-                              TInt aResultsRef,
-                              TInt aStatusRef,
-                              RCmManagerExt& aCmManagerExt,
-                              CBufBase& aCurrentURISegmentList,
-                              const TDesC8& aField,
-                              const TInt aNodeCount,
-                              MSmlDmCallback* aCallback );
-    
-    /**
-     * This function gets connection method
-     * 
-     * @param aCmManagerExt CM Manager
-     * @param aCm CM Manager
-     * @param aCmId CM ID
-     * @return TBool ETrue if connection method found
-     */
-    TBool GetConnectionMethodLC( RCmManagerExt& aCmManagerExt,
-                                 RCmConnectionMethodExt& aCm,
-                                 TUint32 aCmId );
-    
-private:
-    MSmlDmCallback* iCallback;
-    
-    };
-
-#endif /* BRANCHBASE_H_ */
--- a/omadm/omadmextensions/adapters/connmoadapter/inc/ConnMoAdapter.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,155 +0,0 @@
-/*
-* ==============================================================================
-*  Name        : ConnMoAdapter.h
-*  Part of     : ConnMoAdapter
-*  Interface   : ecom / ConnMOAdapter
-*  Description : Connection Management Object
-*  Version     : $Revision: 61 $ $Modtime: 29.09.05 8:17 $
-*
-* 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:
-*
-* ==============================================================================
-*/
-
-#ifndef CONNMOADAPTER_H_
-#define CONNMOADAPTER_H_
-
-// ------------------------------------------------------------------------------------------------
-// Includes
-// ------------------------------------------------------------------------------------------------
-#include <smldmadapter.h>
-#include <cmmanagerext.h>
-
-class CNapBranch;
-class CProxyBranch;
-class CAddBuffer;
-class CBranchBase;
-
-_LIT8( KCMDdfNAP,                   "NAP" );
-_LIT8( KCMDdfProxy,                 "Proxy" );
-
-/**
- * Implements ConnMO partition of the DM tree
- */
-class CConnMoAdapter : public CSmlDmAdapter
-    {
-public:
-
-    static CConnMoAdapter* NewL(MSmlDmCallback* aDmCallback );
-    static CConnMoAdapter* NewLC(MSmlDmCallback* aDmCallback );
-
-    virtual ~CConnMoAdapter(); 
-    
-    // Adapter Interface inherited from CSmlDmAdapter
-    void DDFVersionL( CBufBase& aVersion );
-    void DDFStructureL( MSmlDmDDFObject& aDDF );
-    
-    void UpdateLeafObjectL( const TDesC8& aURI, 
-                            const TDesC8& aLUID,
-                            const TDesC8& aObject, 
-                            const TDesC8& aType,
-                            TInt aStatusRef );
-    
-    void UpdateLeafObjectL( const TDesC8& aURI, 
-                            const TDesC8& aLUID,
-                            RWriteStream*& aStream, 
-                            const TDesC8& aType,
-                            TInt aStatusRef );
-    
-    void DeleteObjectL( const TDesC8& aURI, 
-                        const TDesC8& aLUID,
-                        TInt aStatusRef );
-    
-    void FetchLeafObjectL( const TDesC8& aURI, 
-                           const TDesC8& aLUID,
-                           const TDesC8& aType, 
-                           TInt aResultsRef,
-                           TInt aStatusRef );
-    
-    void FetchLeafObjectSizeL( const TDesC8& aURI, 
-                               const TDesC8& aLUID,
-                               const TDesC8& aType, 
-                               TInt aResultsRef,
-                               TInt aStatusRef );
-    
-    void ChildURIListL( const TDesC8& aURI, 
-                        const TDesC8& aLUID,
-                        const CArrayFix<TSmlDmMappingInfo>& aPreviousURISegmentList,
-                        TInt aResultsRef, TInt aStatusRef );
-    
-    void AddNodeObjectL( const TDesC8& aURI, 
-                         const TDesC8& aParentLUID,
-                         TInt aStatusRef );
-
-    void ExecuteCommandL( const TDesC8& aURI, 
-                          const TDesC8& aLUID,
-                          const TDesC8& aArgument, 
-                          const TDesC8& aType,
-                          TInt aStatusRef );
-
-    void ExecuteCommandL( const TDesC8& aURI, 
-                          const TDesC8& aLUID,
-                          RWriteStream*& aStream, 
-                          const TDesC8& aType,
-                          TInt aStatusRef );
-
-    void CopyCommandL( const TDesC8& aTargetURI, 
-                       const TDesC8& aTargetLUID,
-                       const TDesC8& aSourceURI, 
-                       const TDesC8& aSourceLUID,
-                       const TDesC8& aType, 
-                       TInt aStatusRef );
-
-    void StartAtomicL(); 
-    void CommitAtomicL();
-    void RollbackAtomicL();
-    TBool StreamingSupport( TInt& aItemSize );
-    void StreamCommittedL();
-    void CompleteOutstandingCmdsL();
-    
-private:
-    
-    //-----------------------------------------------------------------------------
-    // Private functions
-    //-----------------------------------------------------------------------------
-    void ConstructL();
-    CConnMoAdapter( TAny* aEcomArguments );
-    
-    CBranchBase* GetBranch( const TDesC8& aUri );
-    
-    MSmlDmDDFObject& AddBaseUriL( MSmlDmDDFObject& aRootDDF);
-    
-    MSmlDmDDFObject& AddBranchL( MSmlDmDDFObject& aRootDDF, 
-                                const TDesC8& aNodeName);
-    
-    //-----------------------------------------------------------------------------
-    // Private member variables
-    //-----------------------------------------------------------------------------
-    /** Callback to framework */
-    MSmlDmCallback*     iCallBack;
-    
-    /** branches of ConnMo structure */
-    CNapBranch*         iNapBranch;
-    CProxyBranch*       iProxyBranch;
-    
-    /** Buffer for node addition */
-    CAddBuffer*         iBuffer;
-    
-    /** CmMager for manipulating CM settings */
-    RCmManagerExt       iCmManager;
-    };
-
-
-#endif /* CONNMOADAPTER_H_ */
--- a/omadm/omadmextensions/adapters/connmoadapter/inc/NapBranch.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,151 +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 "Eclipse Public License v1.0"
-* which accompanies 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 NAPBRANCH_H_
-#define NAPBRANCH_H_
-
-// ------------------------------------------------------------------------------------------------
-// Includes
-// ------------------------------------------------------------------------------------------------
-#include <cmmanagerext.h> 
-#include <smldmadapter.h>
-#include "BranchBase.h"
-#include "AddBuffer.h"
-
-/**
- * Class for handling Network Access Point (NAP) settings in ConnMo DM tree
- */
-class CNapBranch : public CBranchBase
-    {
-public:
-
-    static CNapBranch* NewL(MSmlDmCallback* aDmCallback, 
-                            CAddBuffer* aBuffer,
-                            RCmManagerExt* aCmManagerExt );
-    
-    void DDFStructureL( MSmlDmDDFObject& aDDF );
-    
-    void UpdateLeafObjectL( const TDesC8& aURI, 
-                            const TDesC8& aLUID,
-                            const TDesC8& aObject, 
-                            const TDesC8& aType,
-                            TInt aStatusRef );
-    
-    void DeleteObjectL( const TDesC8& aURI, 
-                        const TDesC8& aLUID,
-                        TInt aStatusRef );
-    
-    void FetchLeafObjectL( const TDesC8& aURI, 
-                           const TDesC8& aLUID,
-                           const TDesC8& aType, 
-                           TInt aResultsRef,
-                           TInt aStatusRef );
-    
-
-    void FetchLeafObjectSizeL( const TDesC8& aURI, 
-                               const TDesC8& aLUID,
-                               const TDesC8& aType, 
-                               TInt aResultsRef,
-                               TInt aStatusRef );
-
-    void ChildURIListL( const TDesC8& aURI, 
-                        const TDesC8& aLUID,
-                        const CArrayFix<TSmlDmMappingInfo>& aPreviousURISegmentList,
-                        TInt aResultsRef, 
-                        TInt aStatusRef );
-    
-    void AddNodeObjectL( const TDesC8& aURI, 
-                         const TDesC8& aParentLUID,
-                         TInt aStatusRef);
-    
-    /**
-     * Processes all Proxy related nodes from buffer
-     */
-    void ProcessBufferL();
-
-    virtual ~CNapBranch(); 
-    
-private:
-    
-    //-----------------------------------------------------------------------------
-    // Private functions
-    //-----------------------------------------------------------------------------
-    void ConstructL( CAddBuffer* aBuffer, RCmManagerExt* aCmManagerExt );
-    CNapBranch( MSmlDmCallback* aDmCallback );
-    
-    CSmlDmAdapter::TError GetUnmodifiableFieldValueL(const TDesC8& aUri,
-                                                    CBufBase* aResult );
-    
-    CSmlDmAdapter::TError GetLeafDataL(const TDesC8& aURI,
-                                       RCmConnectionMethodExt& aCm,
-                                       CBufBase* aResult );
-    
-    CSmlDmAdapter::TError GetUnmodifiableFieldAddResult( const TDesC8& aUri, 
-                                                         const TDesC8& aObject );
-    
-    TUint32 MapUriToCmAttribute( const TDesC8& aUri );
-    
-    void SetLeafDataL( const TDesC8& aURI, 
-                       const TDesC8& aObject, 
-                       TInt aStatusRef, 
-                       RCmConnectionMethodExt& aCm);
-    
-    void SetNodeDataL( CConnMoNodeElement* aNode, 
-                       RCmConnectionMethodExt& aCm );
-    
-    TBool FindNewCmType( TUint32& aBearerType );
-    
-    TBool AllMandatoryNapFieldsFound();
-    
-    void NapChildURIListL( const TDesC8& aURI,
-                           const CArrayFix<TSmlDmMappingInfo>& aPreviousURISegmentList,
-                           TInt aResultsRef, 
-                           TInt aStatusRef,
-                           CBufBase& aCurrentURISegmentList );
-   
-    void GetAllDynamicNapNodesL( const TDesC8& aURI, 
-                                 const TDesC8& aLUID,
-                                 const CArrayFix<TSmlDmMappingInfo>& aPreviousURISegmentList,
-                                 TInt aResultsRef,
-                                 TInt aStatusRef,
-                                 CBufBase& aCurrentURISegmentList,
-                                 const TDesC8& aField );
-								 
-    void IpBranchDDFStructureL( MSmlDmDDFObject& aIPDDF );
-    
-    CSmlDmAdapter::TError DeleteObjectL( const TDesC8& aURI, 
-                                         const TDesC8& aLUID );
-    
-    TPtrC8 GetDynamicNAPNodeUri( const TDesC8& aURI );
-    
-    TBool IsNAPUriFormatMatchPredefined(const TDesC8 & aURI);
-    
-    TInt GetCmIdFromURIL(const TDesC8& aURI);
-    //-----------------------------------------------------------------------------
-    // Private member variables
-    //-----------------------------------------------------------------------------
-    CAddBuffer* iBuffer;
-    MSmlDmCallback* iCallback;
-    RCmManagerExt* iCmManager;
-    };
-    
-    
-    
-#endif /* NAPBRANCH_H_ */
--- a/omadm/omadmextensions/adapters/connmoadapter/inc/ProxyBranch.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,197 +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 "Eclipse Public License v1.0"
-* which accompanies 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 PROXYBRANCH_H_
-#define PROXYBRANCH_H_
-
-
-// ------------------------------------------------------------------------------------------------
-// Includes
-// ------------------------------------------------------------------------------------------------
-#include <smldmadapter.h>
-#include "BranchBase.h"
-#include "cmmanagerext.h"
-#include "AddBuffer.h"
-
-/**
- * Class for handling Proxy settings in ConnMo DM tree
- */
-class CProxyBranch : public CBranchBase
-    {
-public:
-
-    static CProxyBranch* NewL(MSmlDmCallback* aDmCallback, 
-                              CAddBuffer* aBuffer,
-                              RCmManagerExt* aCmManagerExt );
-    
-    // Adapter branch interface from CProxyBranch
-    void DDFStructureL( MSmlDmDDFObject& aDDF );
-
-    void UpdateLeafObjectL( const TDesC8& aURI, 
-                            const TDesC8& aLUID,
-                            const TDesC8& aObject, 
-                            const TDesC8& aType,
-                            TInt aStatusRef );
-    
-    void DeleteObjectL( const TDesC8& aURI, 
-                        const TDesC8& aLUID,
-                        TInt aStatusRef );
-    
-    void FetchLeafObjectL( const TDesC8& aURI, 
-                           const TDesC8& aLUID,
-                           const TDesC8& aType, 
-                           TInt aResultsRef,
-                           TInt aStatusRef );
-    
-
-    void FetchLeafObjectSizeL( const TDesC8& aURI, 
-                               const TDesC8& aLUID,
-                               const TDesC8& aType, 
-                               TInt aResultsRef,
-                               TInt aStatusRef);
-
-    void ChildURIListL( const TDesC8& aURI, 
-                        const TDesC8& aLUID,
-                        const CArrayFix<TSmlDmMappingInfo>& aPreviousURISegmentList,
-                        TInt aResultsRef, 
-                        TInt aStatusRef );
-    
-    void AddNodeObjectL( const TDesC8& aURI, 
-                         const TDesC8& aParentLUID,
-                         TInt aStatusRef );
-    
-    /**
-     * The function processes all proxy nodes from add buffer.
-     * @param aCmManagerExt Reference to CmManager session. 
-     */
-    void ProcessBufferL();
-    
-    virtual ~CProxyBranch(); 
-    
-private:
-    
-    //-----------------------------------------------------------------------------
-    // Private functions
-    //-----------------------------------------------------------------------------
-    CProxyBranch(MSmlDmCallback* aDmCallback, 
-                 CAddBuffer* aBuffer, 
-                 RCmManagerExt* aCmManagerExt );
-        
-    /**
-     * The function returns URI list of dynamic Proxy nodes. The list is returned by 
-     * calling the SetResultsL function of MSmlCallback callback interface.
-     * @param aURI URI of the parent object.
-     * @param aPreviousURISegmentList URI list with mapping LUID information.
-     * @param aResultsRef Reference to correct results.
-     * @param aStatusRef  Reference to correct command.
-     * @param aCmManagerExt Reference to CmManager session. 
-     */
-    void GetAllDynamicProxyNodesL( const TDesC8& aURI,
-                                   const CArrayFix<TSmlDmMappingInfo>& aPreviousURISegmentList,
-                                   TInt aResultsRef, 
-                                   TInt aStatusRef,
-                                   CBufBase& aCurrentURISegmentList );
-    
-    /**
-     * The function returns URI list of requested dynamic Proxy node.
-     * @param aLUID LUID of the parent object.
-     * @param aResultsRef Reference to correct results.
-     * @param aStatusRef  Reference to correct command.
-     * @param aCmManagerExt Reference to CmManager session. 
-     */
-    void GetURIListForProxyNodeL( const TDesC8& aLUID,
-                                  TInt aResultsRef, 
-                                  TInt aStatusRef );
-    
-    /**
-     * The function adjust DM operation return values for hardcoded fields.
-     * @param aURI URI of the object.
-     * @return CSmlDmAdapter::TError Status value for DM operation.
-     */
-    CSmlDmAdapter::TError CheckForUnmodifiableField( const TDesC8& aUri );
-    
-    /**
-     * The function returns CMManager's attribute enum that corresponds to uri.
-     * @param aURI URI of the object.
-     * @return TUint32 Attribute enum for CM.
-     */
-    TUint32 MapUriToCmAttribute( const TDesC8& aUri );
-    
-    /**
-     * The function searches for connection method that is referenced from proxy buffered
-     * in the addbuffer.
-     * @param aCmManagerExt Reference to CmManager session. 
-     * @return TUint32 CM ID.
-     */
-    TInt32 FindConnectionMethodL();
-    
-    /**
-     * The function checs that the addbuffer contains all necessary fields 
-     * to create new proxy entry.
-     * @return TBool True if all mandatory fields found.
-     */
-    TBool AllMandatoryProxyFieldsFound();
-    
-    /**
-     * The function writes information from the addbuffer to connection method.
-     * @param aURI URI of the object.
-     * @param aLUID Local UID of the leaf.
-     * @param aObject objecto to be written in CM.
-     * @param aStatusRef  Reference to correct command.
-     * @param aCm Reference to Connection Method. 
-     */
-    void SetLeafDataL( const TDesC8& aURI, 
-                       const TDesC8& aLUID,
-                       const TDesC8& aObject, 
-                       TInt aStatusRef, 
-                       RCmConnectionMethodExt& aCm);
-    
-    /**
-     * The function informs framework about new nodes.
-     * @param aNode Node to be saved.
-     * @param aCm Reference to Connection Method.
-     */
-    void SetNodeDataL( CConnMoNodeElement* aNode, RCmConnectionMethodExt& aCm );
-    
-    /**
-     * Fethces leaf object data from connection settings
-     * @param aURI Target node
-     * @param aLuid Local UID for target node
-     * @param buffer for returning object data
-     * @return CSmlDmAdapter::TError Return value informs completion status of the operation
-     */
-    CSmlDmAdapter::TError FetchLeafObjectL( const TDesC8& aURI,
-                                            const TDesC8& aLUID,
-                                            CBufBase& aLeafObject );
-    
-    TPtrC8 GetDynamicProxyNodeUri( const TDesC8& aURI );
-    
-    TBool IsProxyUriFormatMatchPredefined(const TDesC8 & aURI);
- 
-    TInt GetCmIdFromURIL(const TDesC8& aURI);
-    
-    //-----------------------------------------------------------------------------
-    // Private member variables
-    //-----------------------------------------------------------------------------
-    MSmlDmCallback* iCallback;
-    CAddBuffer* iBuffer;
-    RCmManagerExt* iCmManager;
-    };
-    
-#endif /* PROXYBRANCH_H_ */
--- a/omadm/omadmextensions/adapters/connmoadapter/inc/Utils.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,156 +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 "Eclipse Public License v1.0"
-* which accompanies 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 UTILS_H_
-#define UTILS_H_
-
-// ------------------------------------------------------------------------------------------------
-// Includes
-// ------------------------------------------------------------------------------------------------
-#include "ConnMoAdapter.h"
-
-class TLuid;
-
-/**
- * Utilities class for ConnMo adapter needs
- * 
- * Class contains useful helper functions etc. for parsing URI and TLuid
- */
-class CUtils : public CBase
-    {
-public:
-    
-    virtual ~CUtils();
-    
-    /**
-     * Returns first segment of URI.
-     * 
-     * @param aUri URI to be searched.
-     * @return First segment of URI.
-     */
-    static TPtrC8 GetFirstURISeg( const TDesC8& aURI );
-    
-    /**
-     * Returns second segment of URI.
-     * 
-     * @param aUri URI to be searched.
-     * @return Second segment of URI.
-     */
-    static TPtrC8 GetSecondURISeg( const TDesC8& aURI );
-    
-    /**
-     * Returns last segment of URI.
-     * 
-     * @param aUri URI to be searched.
-     * @return Last segment of URI.
-     */
-    static TPtrC8 GetLastURISeg( const TDesC8& aURI );
-    
-    /**
-     * Returns the end of URI starting from passed segment.
-     * 
-     * @param aUri URI to be parsed.
-     * @param aName Segment to start.
-     * @return End of URI starting from aName.
-     */
-    static TPtrC8 GetEndOfURIFromSeg( const TDesC8& aURI, const TDesC8& aName );
-    
-    /**
-     * This function converts string value to 8-bit value.
-     * 
-     * @param aSource String to convert.
-     * @return Pointer to 8-bit value.
-     */
-    static TDesC8& ConvertTo8LC( const TDesC& aSource );
-    
-    /**
-     * This function converts string value to 16-bit value.
-     * 
-     * @param aSource String to convert.
-     * @return Pointer to 16-bit value.
-     */
-    static TDesC16& ConvertTo16LC( const TDesC8& aSource );
-    
-    /**
-     * This function sets given information to given node.
-     * 
-     * @param aNode Target node.
-     * @param aAccTypes Node's access types.
-     * @param aOccurrence Amount of possible nodes of same type.
-     * @param aScope Describes if node is static or dynamic.
-     * @param aFormat Node's format.
-     * @param aDescription String containing description of the node.
-     * @return Pointer integer value.
-     */
-    static void FillNodeInfoL( MSmlDmDDFObject& aNode,
-                               TSmlDmAccessTypes aAccTypes,
-                               MSmlDmDDFObject::TOccurence aOccurrence, 
-                               MSmlDmDDFObject::TScope aScope, 
-                               MSmlDmDDFObject::TDFFormat aFormat,
-                               const TDesC8& aDescription);
-        
-    /**
-     * This function removes characters that are not allowed in URI from given descriptor.
-     * 
-     * @param aString String to be modified.
-     */
-    static void RemoveIllegalCharsFromURI( TDes8& aString );
-        
-    /**
-     * This function returns string as bool value.
-     * 
-     * @param aSource String to convert.
-     * @param aBool conversion result.
-     * @return TInt32 KErrNone if succesful conversion.
-     */
-    static TInt32 DesToBool( const TDesC8& aString, TBool& aBool );
-    
-    /**
-     * This function convert integer value to string presentation.
-     * 
-     * @param aObject Int value to convert.
-     * @return TDesC8& Int as string.
-     */
-    static TDesC8& IntToCharL( const TInt& aObject );
-    
-    /**
-     * This function takes first segment from uri and adds it to target
-     * 
-     * @param aURI Contains source uri.
-     * @param aTarget Target string.
-     * @return TInt Index of first uri delimiter.
-     */
-    static TInt AppendFirstURISeg( TDes8& aURI, TDes8& aTarget );
-    
-    static TInt IntLUID(const TDesC8& aLUID);
-    
-private:
-    
-    //-----------------------------------------------------------------------------
-    // Private functions
-    //-----------------------------------------------------------------------------
-    CUtils();
-              
-    //-----------------------------------------------------------------------------
-    // Private member variables
-    //-----------------------------------------------------------------------------
-       
-    };
-
-#endif /* UTILS_H_ */
--- a/omadm/omadmextensions/adapters/connmoadapter/rom/connmoadapter.iby	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +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 "Eclipse Public License v1.0"
-* which accompanies 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 <bldvariant.hrh>
-
-#ifndef __CONNMOADAPTER_IBY__
-#define __CONNMOADAPTER_IBY__
-
-#ifdef __SYNCML_DM // nothing should be installed from this .iby file if __SYNCML_DM feature is not selected
-#ifdef FF_DM_CONNMO_ADAPTER // nothing should be installed from this .iby file if this flag is not specified.
-														 // old internet adapter is used in that case for access point provisioning.
-
-ECOM_PLUGIN(connmoadapter.dll,connmoadapter.rsc)
-
-#endif FF_DM_CONNMO_ADAPTER 
-#endif // __SYNCML_DM_WLAN 
-
-#endif //__CONNMOADAPTER_IBY__
\ No newline at end of file
--- a/omadm/omadmextensions/adapters/connmoadapter/src/AddBuffer.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,302 +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 "Eclipse Public License v1.0"
- * which accompanies 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 <e32base.h>
-
-#include "AddBuffer.h"
-#include "Utils.h"
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "AddBufferTraces.h"
-#endif
-
-_LIT8( KChildNodeWildCardPattern, "/*" );
-_LIT8( KNodeSeparator, "/" );
-
-// ======== LOCAL FUNCTIONS =========
-
-// ======== MEMBER FUNCTIONS ========
-//------------------------------------------------------------------------------
-// CConnMoNodeElement::CConnMoNodeElement()
-//------------------------------------------------------------------------------
-CConnMoNodeElement::CConnMoNodeElement() 
-    {
-    OstTraceFunctionEntry0( CCONNMONODEELEMENT_CCONNMONODEELEMENT_ENTRY );
-    
-    OstTraceFunctionExit0( CCONNMONODEELEMENT_CCONNMONODEELEMENT_EXIT );
-    }
-
-//------------------------------------------------------------------------------
-// CAddBuffer::~CAddBuffer()
-//------------------------------------------------------------------------------
-CConnMoNodeElement::~CConnMoNodeElement()
-    {
-    OstTraceFunctionEntry0( CCONNMONODEELEMENT_DELETE_ENTRY );
-    
-    OstTraceFunctionExit0( CCONNMONODEELEMENT_DELETE_EXIT );
-    }
-
-//-----------------------------------------------------------------------------
-// CAddBuffer* CAddBuffer::NewL( )
-//-----------------------------------------------------------------------------
-CAddBuffer* CAddBuffer::NewL()
-    {
-    OstTraceFunctionEntry0( CADDBUFFER_NEWL_ENTRY );
-    
-    CAddBuffer* self = new ( ELeave ) CAddBuffer();
-    CleanupStack::PushL( self );
-    
-    self->ConstructL();
-    
-    CleanupStack::Pop( self );
-
-    OstTraceFunctionExit1( CADDBUFFER_NEWL_EXIT, ( TUint )( self ) );
-    return self;
-    }
-
-//------------------------------------------------------------------------------
-// CAddBuffer::CAddBuffer()
-//------------------------------------------------------------------------------
-CAddBuffer::CAddBuffer() 
-    {
-    OstTraceFunctionEntry0( CADDBUFFER_CADDBUFFER_ENTRY );
-    
-    OstTraceFunctionExit0( CADDBUFFER_CADDBUFFER_EXIT );
-    }
-
-//------------------------------------------------------------------------------
-// CAddBuffer::~CAddBuffer()
-//------------------------------------------------------------------------------
-CAddBuffer::~CAddBuffer()
-    {
-    OstTraceFunctionEntry0( CADDBUFFER_DELETE_ENTRY );
-    
-    iBuffer.ResetAndDestroy();
-    
-    OstTraceFunctionExit0( CADDBUFFER_DELETE_EXIT );
-    }
-
-//------------------------------------------------------------------------------
-// CAddBuffer::CAddBuffer()
-//------------------------------------------------------------------------------
-void CAddBuffer::ConstructL() 
-    {
-    OstTraceFunctionEntry0( CADDBUFFER_CONSTRUCTL_ENTRY );
-    
-    OstTraceFunctionExit0( CADDBUFFER_CONSTRUCTL_EXIT );
-    }
-
-//------------------------------------------------------------------------------
-// CAddBuffer::AddNodeToBuffer()
-//------------------------------------------------------------------------------
-void CAddBuffer::AddNodeToBufferL( const TDesC8& aUri, 
-                                   const TDesC8& aParentLUID,
-                                   const TInt    aStatusRef )
-    {
-    OstTraceExt1( TRACE_NORMAL, CADDBUFFER_ADDNODETOBUFFERL_ENTRY, "ENTRY: CAddBuffer::AddNodeToBufferL;aUri=%s", aUri );
-    
-    CConnMoNodeElement* newNode = new (ELeave) CConnMoNodeElement();
-    
-    newNode->iUri.Copy( aUri );
-    newNode->iParentLUID.Copy( aParentLUID );
-    newNode->iStatusRef = aStatusRef;
-    newNode->iProcessed = EFalse;
-    newNode->iLeaf = EFalse;
-    
-    iBuffer.AppendL( newNode );
-    OstTrace0( TRACE_NORMAL, CADDBUFFER_ADDNODETOBUFFERL_EXIT, "EXIT: CAddBuffer::AddNodeToBufferL");
-    }
-
-//------------------------------------------------------------------------------
-// CAddBuffer::AddNodeToBuffer()
-//------------------------------------------------------------------------------
-void CAddBuffer::AddNodeToBufferL( const TDesC8& aUri, 
-                                   const TDesC8& aLUID,
-                                   const TDesC8& aObject,
-                                   const TInt    aStatusRef )
-    {
-    OstTraceExt1( TRACE_NORMAL, CADDBUFFER_ADDNODETOBUFFERL_LEAF_ENTRY, "ENTRY: CAddBuffer::AddNodeToBufferL;aUri=%s", aUri );
-    
-    CConnMoNodeElement* newNode = new (ELeave) CConnMoNodeElement();
-    
-    newNode->iUri.Copy( aUri );
-    newNode->iParentLUID.Copy( aLUID );
-    newNode->iObject.Copy( aObject );
-    newNode->iStatusRef = aStatusRef;
-    newNode->iProcessed = EFalse;
-    newNode->iLeaf = ETrue;
-    
-    iBuffer.AppendL( newNode );
-    OstTrace0( TRACE_NORMAL, CADDBUFFER_ADDNODETOBUFFERL_LEAF_EXIT, "EXIT: CAddBuffer::AddNodeToBufferL");
-    }
-
-//------------------------------------------------------------------------------
-// CAddBuffer::FindDynamicNode
-//------------------------------------------------------------------------------
-CConnMoNodeElement* CAddBuffer::FindDynamicNode( const TDesC8& aUri )
-    {
-    OstTraceExt1( TRACE_NORMAL, CADDBUFFER_FINDDYNAMICNODE_ENTRY, "ENTRY: CAddBuffer::FindDynamicNode;aUri=%s", aUri );
-
-    CConnMoNodeElement* resultNode = NULL;
-
-    for ( TInt i = 0; i < iBuffer.Count(); ++i )
-        {
-        if ( iBuffer[i]->iUri.Match(aUri) != KErrNotFound )
-            {
-            // 
-            TBuf8<KMaxFieldLength> dynamicNodeChildUri(aUri);
-            dynamicNodeChildUri.Append( KChildNodeWildCardPattern );
-            
-            if ( iBuffer[i]->iUri.Match( dynamicNodeChildUri ) == KErrNotFound )
-                {
-                // Correct dynamic node found.
-                OstTrace0( TRACE_NORMAL, 
-                           CADDBUFFER_FINDDYNAMICNODE_MATCH_FOUND, 
-                           "CAddBuffer::FindDynamicNode;Matching node found.");
-                resultNode = iBuffer[i];
-                break;
-                }
-            }
-        }
-	if ( resultNode != NULL )
-	    {
-        OstTraceExt1( TRACE_NORMAL, 
-                  CADDBUFFER_FINDDYNAMICNODE_EXIT, 
-                  "EXIT: CAddBuffer::FindDynamicNode;resultNode=%s", 
-                  resultNode->iUri );
-	    }
-    
-    return resultNode;
-    }
-    
-
-//------------------------------------------------------------------------------
-// CAddBuffer::Find
-//------------------------------------------------------------------------------
-CConnMoNodeElement* CAddBuffer::CacheFind( const TDesC8& aUri )
-    {
-    OstTraceExt1( TRACE_NORMAL, CADDBUFFER_CACHEFIND_ENTRY, "ENTRY: CAddBuffer::CacheFind;aUri=%s", aUri );
-    
-    CConnMoNodeElement* resultNode = NULL;
-
-    for ( TInt i = 0; i < iCache.Count(); ++i )
-        {
-        if ( iCache[i]->iUri.Match( aUri ) != KErrNotFound )
-            {
-            OstTrace0( TRACE_NORMAL, CADDBUFFER_CACHEFIND_MATCH_FOUND, "CAddBuffer::CacheFind; Matching URI found.");
-            resultNode = iCache[i];
-            
-            OstTraceExt1( TRACE_NORMAL, 
-                          CADDBUFFER_CACHEFIND_RESULT_NODE, 
-                          "CAddBuffer::CacheFind; resultNode=%s", 
-                          resultNode->iUri );
-            break;
-            }
-        }
-    
-    OstTrace0( TRACE_NORMAL, CADDBUFFER_CACHEFIND_EXIT, "EXIT: CAddBuffer::CacheFind");
-    return resultNode;
-    }
-
-//------------------------------------------------------------------------------
-// CAddBuffer::FindDynamicNode
-//------------------------------------------------------------------------------
-CConnMoNodeElement* CAddBuffer::CacheFindDynamicNode( const TDesC8& aUri )
-    {
-    OstTraceExt1( TRACE_NORMAL, CADDBUFFER_CACHEFINDDYNAMICNODE_ENTRY, "ENTRY: CAddBuffer::CacheFindDynamicNode;aUri=%s", aUri );
-    
-    CConnMoNodeElement* resultNode = NULL;
-
-    for ( TInt i = 0; i < iCache.Count(); ++i )
-        {
-        if ( iCache[i]->iUri.Match( aUri ) != KErrNotFound )
-            {
-            // 
-            TBuf8<KMaxFieldLength> dynamicNodeChildUri( aUri );
-            dynamicNodeChildUri.Append( KChildNodeWildCardPattern );
-            
-            if ( iCache[i]->iUri.Match(dynamicNodeChildUri) == KErrNotFound )
-                {
-                // Correct dynamic node found.
-                OstTrace0( TRACE_NORMAL, 
-                           CADDBUFFER_CACHEFINDDYNAMICNODE_MATCH_FOUND, 
-                           "CAddBuffer::CacheFindDynamicNode; Matching node found.");
-                          
-                resultNode = iCache[i];
-                break;
-                }
-            }
-        }
-    if ( resultNode != NULL )
-        {
-        OstTraceExt1( TRACE_NORMAL, 
-                  CADDBUFFER_CACHEFINDDYNAMICNODE_EXIT, 
-                  "EXIT: CAddBuffer::CacheFindDynamicNode;resultNode=%s", 
-                  resultNode->iUri );
-        }
-    
-    return resultNode;
-    }
-//------------------------------------------------------------------------------
-// CAddBuffer::AddNodeToBuffer()
-//------------------------------------------------------------------------------
-TInt CAddBuffer::GetGroup( const TDesC8& aRoot, RPointerArray<CConnMoNodeElement>* aGroup )
-    {
-    OstTraceExt1( TRACE_NORMAL, CADDBUFFER_GETGROUP_ENTRY, "ENTRY: CAddBuffer::GetGroup;aRoot=%s", aRoot );
-
-    iCache.Reset();
-    TInt retval( KErrNotFound );
-    TBool first = ETrue;
-    TBuf8<KSmlMaxURISegLen> groupTag;
-    groupTag.Copy( aRoot );
-    groupTag.Append( KChildNodeWildCardPattern );
-
-    for ( TInt i = 0; i < iBuffer.Count(); ++i )
-        {
-        if ( iBuffer[i]->iUri.Match( groupTag ) != KErrNotFound
-             && !iBuffer[i]->iProcessed )
-            {
-            if ( first )
-                {
-                groupTag.Insert( aRoot.Length(), KNodeSeparator );
-                groupTag.Insert( aRoot.Length() + 1, CUtils::GetSecondURISeg( iBuffer[i]->iUri ) );
-                first = EFalse;
-                retval = 0;
-                }
-            aGroup->Append(iBuffer[i]);
-            iCache.Append(iBuffer[i]);
-            retval++;
-            }
-        }
-    OstTrace1( TRACE_NORMAL, CADDBUFFER_GETGROUP_EXIT, "EXIT: CAddBuffer::GetGroup;retval=%d", retval );
-
-    return retval;
-    }
-//------------------------------------------------------------------------------
-// CAddBuffer::~CAddBuffer()
-//------------------------------------------------------------------------------
-void CAddBuffer::Reset()
-    {
-    OstTraceFunctionEntry0( CADDBUFFER_Reset_ENTRY );
-    
-    iBuffer.ResetAndDestroy();
-    
-    OstTraceFunctionExit0( CADDBUFFER_Reset_EXIT );
-    }
-
--- a/omadm/omadmextensions/adapters/connmoadapter/src/BranchBase.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,220 +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 "Eclipse Public License v1.0"
- * which accompanies 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 <smldmadapter.h>
-#include <cdbcols.h>
-#include <cmpluginpacketdatadef.h>
-#include "BranchBase.h"
-
-#include "Utils.h"
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "BranchBaseTraces.h"
-#endif
-
-_LIT8( KCMProxyNodeSeparator,   "/" );
-
-
-
-// ======== LOCAL FUNCTIONS =========
-
-// ======== MEMBER FUNCTIONS ========
-// -------------------------------------------------------------------------------------
-// CBranchBase::CBranchBase()
-// -------------------------------------------------------------------------------------
-CBranchBase::CBranchBase()
-    {
-    OstTraceFunctionEntry0( CBRANCHBASE_CBRANCHBASE_ENTRY );
-    
-    OstTraceFunctionExit0( CBRANCHBASE_CBRANCHBASE_EXIT );
-    }
-// -------------------------------------------------------------------------------------
-// CBranchBase::CBranchBase
-// -------------------------------------------------------------------------------------
-CBranchBase::CBranchBase( MSmlDmCallback* aDmCallback )
-
-    {
-    OstTraceFunctionEntry0( CBRANCHBASE_CBRANCHBASE_2_ENTRY );
-    iCallback = aDmCallback;
-    OstTraceFunctionExit0( DUP1_CBRANCHBASE_CBRANCHBASE_2_EXIT );
-    }
-// -------------------------------------------------------------------------------------
-// CBranchBase::~CBranchBase()
-// -------------------------------------------------------------------------------------
-CBranchBase::~CBranchBase()
-    {
-    OstTraceFunctionEntry0( CBRANCHBASE_DELETE_ENTRY );
-    
-    OstTraceFunctionExit0( CBRANCHBASE_DELETE_EXIT );
-    }
-
-// -------------------------------------------------------------------------------------
-// CBranchBase::GetAllConnectionMethodsL()
-// Returns all connection methods
-// -------------------------------------------------------------------------------------
-void CBranchBase::GetAllConnectionMethodsL( RArray<TUint32>& aCmArray,
-                                           RCmManagerExt& aCmManager )
-    {
-    OstTraceFunctionEntry0( CBRANCHBASE_GETALLCONNECTIONMETHODSL_ENTRY );
-    
-    // Get all connection methods
-    TBool supportedBearersOnly = EFalse;
-    TBool legacyCmsOnly = EFalse;
-    TBool includeEasyWlan = EFalse;
-        
-    aCmManager.ConnectionMethodL( aCmArray, 
-                                 supportedBearersOnly,
-                                 legacyCmsOnly,
-                                 includeEasyWlan );
-    
-    RCmConnectionMethodExt cm;
-    
-    // Loop all connection methods and filter away everything else besides packet data.
-    // Other bearer types are not supported
-    for( TInt i = 0; i < aCmArray.Count(); i++ )
-        {
-        if ( GetConnectionMethodLC( aCmManager, cm, aCmArray[i] ) )
-            {
-            TUint bearerType = cm.GetIntAttributeL( CMManager::ECmBearerType );                      
-            
-            if( bearerType != KUidPacketDataBearerType )
-                {
-                // Non supported bearer type. Remove
-                aCmArray.Remove( i );
-                i--;              
-                }            
-            }        
-        CleanupStack::PopAndDestroy( &cm );
-        }
-    OstTrace1( TRACE_NORMAL, CBRANCHBASE_GETALLCONNECTIONMETHODSL_COUNT, "CBranchBase::GetAllConnectionMethodsL; Found %u connection methods.", aCmArray.Count() );
-    
-    OstTraceFunctionExit0( CBRANCHBASE_GETALLCONNECTIONMETHODSL_EXIT );
-    }
-
-//-----------------------------------------------------------------------------
-// TBool CBranchBase::CheckPreviousURIList()
-//-----------------------------------------------------------------------------
-TBool CBranchBase::CheckPreviousURIList( const CArrayFix<TSmlDmMappingInfo>& aPreviousURISegmentList,
-                                         const TUint32 aCmId,
-                                         TDes8& aURISeg )
-    {
-    OstTraceExt2( TRACE_NORMAL, CBRANCHBASE_CHECKPREVIOUSURILIST_ENTRY, "ENTRY: CBranchBase::CheckPreviousURIList;aURISeg=%s;aCmId=%u", aURISeg, aCmId );
-    
-    TBool retval = EFalse;
-    
-    for ( TInt i = 0; i < aPreviousURISegmentList.Count(); i++ )
-        {        
-        if ( CUtils::IntLUID( aPreviousURISegmentList.At(i).iURISegLUID ) == aCmId )
-            {
-            aURISeg.Copy( aPreviousURISegmentList.At(i).iURISeg );
-            retval = ETrue;
-            break;
-            }
-        }
-    OstTrace1( TRACE_NORMAL, CBRANCHBASE_CHECKPREVIOUSURILIST_EXIT, "EXIT: CBranchBase::CheckPreviousURIList;retval=%d", retval );
-    
-    return retval;
-    }
-
-
-//-----------------------------------------------------------------------------
-// CBranchBase::GetAllDynamicNodesL
-//-----------------------------------------------------------------------------
-void CBranchBase::GetAllDynamicNodesL( const TDesC8& aURI, 
-                                       const TDesC8& /*aLUID*/,
-                                       const CArrayFix<TSmlDmMappingInfo>& aPreviousURISegmentList,
-                                       TInt aResultsRef,
-                                       TInt aStatusRef,
-                                       RCmManagerExt& /*aCmManagerExt*/,
-                                       CBufBase& aCurrentURISegmentList,
-                                       const TDesC8& aField,
-                                       const TInt aNodeCount,
-                                       MSmlDmCallback* aCallback )
-    {
-    OstTraceExt3( TRACE_NORMAL, 
-                  CBRANCHBASE_GETALLDYNAMICNODESL_ENTRY, 
-                  "ENTRY: CBranchBase::GetAllDynamicNodesL;aURI=%s;aField=%s;aNodeCount=%d", 
-                  aURI, 
-                  aField, 
-                  aNodeCount );
-    
-    if ( aPreviousURISegmentList.Count() > 0 ) // Already mapped
-        {
-        for ( TInt i = 0; i < aPreviousURISegmentList.Count(); i++ )
-            {
-            aCurrentURISegmentList.InsertL( aCurrentURISegmentList.Size(), 
-                                            aPreviousURISegmentList.At(i).iURISeg );
-            aCurrentURISegmentList.InsertL( aCurrentURISegmentList.Size(), 
-                                            KCMProxyNodeSeparator );                
-            }
-        }
-    else
-        {
-        TBuf8<KSmlMaxURISegLen> addNodeName;
-   
-        // Generate as many nodes as defined
-        for ( TInt i = 1; i <= aNodeCount; i++ )
-            {
-            addNodeName.Format( _L8( "%s%d" ), aField.Ptr(), i );
-            aCurrentURISegmentList.InsertL( aCurrentURISegmentList.Size(), addNodeName );
-            aCurrentURISegmentList.InsertL( aCurrentURISegmentList.Size(), 
-                                            KCMProxyNodeSeparator );
-            }            
-       }
-    
-    aCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
-    aCallback->SetResultsL( aResultsRef, aCurrentURISegmentList, KNullDesC8);
-    
-    OstTrace0( TRACE_NORMAL, 
-               CBRANCHBASE_GETALLDYNAMICNODESL_EXIT, 
-               "EXIT: CBranchBase::GetAllDynamicNodesL" );
-       
-    }
-
-//------------------------------------------------------------------------------
-//  TBool CBranchBase::GetConnectionMethodLC()
-//------------------------------------------------------------------------------ 
-TBool CBranchBase::GetConnectionMethodLC( RCmManagerExt& aCmManagerExt,
-                                          RCmConnectionMethodExt& aCm,
-                                          TUint32 aCmId )
-    {
-    OstTrace1( TRACE_NORMAL, CBRANCHBASE_GETCONNECTIONMETHODLC_ENTRY, "ENTRY: CBranchBase::GetConnectionMethodLC;aCmId=%d", aCmId );
-    TInt error( KErrNone );
-    
-    TRAP( error, aCm = aCmManagerExt.ConnectionMethodL( aCmId ) );
-    
-    CleanupClosePushL( aCm );
-    
-    if ( error != KErrNone )
-        {
-        OstTrace0( TRACE_NORMAL, 
-                   CBRANCHBASE_GETCONNECTIONMETHODLC_EXIT_NOT_FOUND, 
-                   "EXIT: CBranchBase::GetConnectionMethodLC;Connection Method NOT found: EFalse." );
-        return EFalse;
-        }
-    
-    OstTrace0( TRACE_NORMAL, 
-               CBRANCHBASE_GETCONNECTIONMETHODLC_EXIT_FOUND, 
-               "EXIT: CBranchBase::GetConnectionMethodLC;Connection Method FOUND: ETrue." );
-    
-    return ETrue;
-    }
-
-// ======== GLOBAL FUNCTIONS ========
-
--- a/omadm/omadmextensions/adapters/connmoadapter/src/ConnMoAdapter.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,571 +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 "Eclipse Public License v1.0"
- * which accompanies 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 <e32base.h>
-#include <implementationproxy.h> // For TImplementationProxy definition
-#include <cmmanagerext.h> 
-
-#include "nsmldebug.h"
-#include "ConnMoAdapter.h"
-#include "Utils.h"
-#include "BranchBase.h"
-#include "NapBranch.h" 
-#include "ProxyBranch.h"
-#include "AddBuffer.h" 
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "ConnMoAdapterTraces.h"
-#endif
-
-// ------------------------------------------------------------------------------------------------
-// Constants
-// ------------------------------------------------------------------------------------------------
-// DDF version number
-_LIT8( KConnMoAdapterDDFversion,    "1.0");
-
-// URI base for ConnMo Nodes
-_LIT8( KConnMoBase,                 "");
-
-// ======== LOCAL FUNCTIONS =========
-
-CBranchBase* CConnMoAdapter::GetBranch( const TDesC8& aUri )
-    {
-    TDesC8 connMoBase( KConnMoBase );
-    CBranchBase* retval = NULL;
-        
-    TPtrC8 connMoTree = 
-        ( CUtils::GetEndOfURIFromSeg( aUri, KConnMoBase )).Mid( connMoBase.Size() );
-        
-    if ( CUtils::GetFirstURISeg( connMoTree ).Match( KCMDdfNAP )!= KErrNotFound )
-        {
-        retval = iNapBranch;
-        }
-    else if ( CUtils::GetFirstURISeg( connMoTree ).Match( KCMDdfProxy )!= KErrNotFound )
-        {
-        retval = iProxyBranch;
-        }
-    return retval;
-    }
-
-// -------------------------------------------------------------------------------------
-// CConnMoAdapter::AddBaseUriL( )
-// Handles addition of possible base URI to ConnMO DDF structure
-// -------------------------------------------------------------------------------------
-MSmlDmDDFObject& CConnMoAdapter::AddBaseUriL( MSmlDmDDFObject& aRootDDF )
-    {
-    OstTraceFunctionEntry0( CCONNMOADAPTER_ADDBASEURIL_ENTRY );
-    
-    TDesC8 base(KConnMoBase);
-    
-    if ( base.Size() > 0)
-        {
-    
-        // Set rest acceptable operations for data itself     
-        TSmlDmAccessTypes aclTypesOnlyGet;
-        aclTypesOnlyGet.SetGet();
-        
-        MSmlDmDDFObject& ddf = aRootDDF.AddChildObjectL( KConnMoBase ); // CMO
-
-        _LIT8( KDescription, "ConnMo DDF description" );
-        _LIT8( KDFTitle, "ConnMo Settings Base Node" );
-    
-        CUtils::FillNodeInfoL( ddf, 
-                   aclTypesOnlyGet, 
-                   MSmlDmDDFObject::EOne, 
-                   MSmlDmDDFObject::EPermanent, 
-                   MSmlDmDDFObject::ENode, 
-                   KDescription );
-                   
-        ddf.SetDFTitleL( KDFTitle );
-        ddf.SetDefaultValueL( KNullDesC8 );
-        OstTraceFunctionExit0( CCONNMOADAPTER_ADDBASEURIL_EXIT );
-        return ddf;
-        }
-    else
-        {
-        OstTraceFunctionExit0( CCONNMOADAPTER_ADDBASEURIL_EXIT_2 );
-        return aRootDDF;
-        }    
-    
-    }
-// -------------------------------------------------------------------------------------
-// CConnMoAdapter::AddBranchL( )
-// Adds dynamic branch to given root node with given name
-// -------------------------------------------------------------------------------------
-MSmlDmDDFObject& CConnMoAdapter::AddBranchL( MSmlDmDDFObject& aRootDDF, 
-                                            const TDesC8& aNodeName )
-    {
-    OstTraceExt1( TRACE_NORMAL, CCONNMOADAPTER_ADDBRANCHL_ENTRY, "ENTRY: CConnMoAdapter::AddBranchL;aNodeName=%s", aNodeName );
-    
-    // Set rest acceptable operations for data itself     
-    TSmlDmAccessTypes aclTypesOnlyGet;
-    aclTypesOnlyGet.SetGet();
-
-    TSmlDmAccessTypes aclTypesAll;
-    aclTypesAll.SetGet();
-    aclTypesAll.SetReplace();
-    aclTypesAll.SetAdd();
-    aclTypesAll.SetDelete();
-    
-    TSmlDmAccessTypes aclTypesNoDelete;
-    aclTypesNoDelete.SetGet();
-    aclTypesNoDelete.SetReplace();
-    aclTypesNoDelete.SetAdd();
-    
-    MSmlDmDDFObject& nChildRootDdf = aRootDDF.AddChildObjectL( aNodeName ); // Node
-    CUtils::FillNodeInfoL( nChildRootDdf, 
-                           aclTypesOnlyGet, 
-                           MSmlDmDDFObject::EOne,
-                           MSmlDmDDFObject::EPermanent, 
-                           MSmlDmDDFObject::ENode, 
-                           KNullDesC8 );
-    
-    MSmlDmDDFObject& nChildDdf = nChildRootDdf.AddChildObjectGroupL();  // Node/<X>  
-    if ( aNodeName == KCMDdfNAP )
-        {      
-        CUtils::FillNodeInfoL( nChildDdf, 
-                               aclTypesAll, 
-                               MSmlDmDDFObject::EZeroOrMore, 
-                               MSmlDmDDFObject::EDynamic, 
-                               MSmlDmDDFObject::ENode, 
-                               KNullDesC8 );
-        }
-    else
-        {  
-        CUtils::FillNodeInfoL( nChildDdf, 
-                               aclTypesNoDelete, 
-                               MSmlDmDDFObject::EZeroOrMore, 
-                               MSmlDmDDFObject::EDynamic, 
-                               MSmlDmDDFObject::ENode, 
-                               KNullDesC8 );
-        }
-    OstTrace0( TRACE_NORMAL, CCONNMOADAPTER_ADDBRANCHL_EXIT, "EXIT: CConnMoAdapter::AddBranchL" );
-    return nChildDdf;
-    }
-
-// ======== MEMBER FUNCTIONS ========
-//-----------------------------------------------------------------------------
-// CConnMoAdapter* CConnMoAdapter::NewL( )
-//-----------------------------------------------------------------------------
-CConnMoAdapter* CConnMoAdapter::NewL( MSmlDmCallback* aDmCallback )
-    {
-    OstTraceFunctionEntry0( CCONNMOADAPTER_NEWL_ENTRY );
-
-    CConnMoAdapter* self = CConnMoAdapter::NewLC( aDmCallback );
-    CleanupStack::Pop();
-
-    OstTraceFunctionExit1( CCONNMOADAPTER_NEWL_EXIT, ( TUint )( self ) );
-    return self;
-    }
-
-//-----------------------------------------------------------------------------
-// CConnMoAdapter* CConnMoAdapter::NewLC( )
-//-----------------------------------------------------------------------------
-CConnMoAdapter* CConnMoAdapter::NewLC( MSmlDmCallback* aDmCallback )
-    {
-    OstTraceFunctionEntry0( CCONNMOADAPTER_NEWLC_ENTRY );
-       
-    CConnMoAdapter* self = new ( ELeave ) CConnMoAdapter( aDmCallback );
-    CleanupStack::PushL( self );
-
-    self->iCallBack = aDmCallback;
-    self->ConstructL();
-
-    OstTraceFunctionExit1( CCONNMOADAPTER_NEWLC_EXIT, ( TUint )( self ) );
-    return self;
-    }
-
-//------------------------------------------------------------------------------
-// CConnMoAdapter::CConnMoAdapter()
-//------------------------------------------------------------------------------
-CConnMoAdapter::CConnMoAdapter( TAny* aEcomArguments ) 
-    : CSmlDmAdapter( aEcomArguments )
-    {
-    OstTraceFunctionEntry0( CCONNMOADAPTER_CCONNMOADAPTER_ENTRY );
-    
-    OstTraceFunctionExit0( CCONNMOADAPTER_CCONNMOADAPTER_EXIT );
-    }
-
-//------------------------------------------------------------------------------
-// CConnMoAdapter::~CConnMoAdapter()
-//------------------------------------------------------------------------------
-CConnMoAdapter::~CConnMoAdapter()
-    {
-    OstTraceFunctionEntry0( CCONNMOADAPTER_DELETE_ENTRY );
-    
-    delete iBuffer;
-    delete iNapBranch;
-    delete iProxyBranch;
-    iCmManager.Close();
-
-    OstTraceFunctionExit0( CCONNMOADAPTER_DELETE_EXIT );
-    }
-
-//=============================================
-//      CConnMoAdapter::ConstructL()
-//      Second phase constructor.
-//=============================================
-void CConnMoAdapter::ConstructL()
-    {
-    OstTraceFunctionEntry0( CCONNMOADAPTER_CONSTRUCTL_ENTRY );  
-    
-    iCmManager.OpenL();
-       
-    iBuffer = CAddBuffer::NewL();
-    iNapBranch = CNapBranch::NewL( iCallBack, iBuffer, &iCmManager );
-    iProxyBranch = CProxyBranch::NewL( iCallBack, iBuffer, &iCmManager );
-    
-    OstTraceFunctionExit0( CCONNMOADAPTER_CONSTRUCTL_EXIT );
-    }
-
-void CConnMoAdapter::DDFVersionL( CBufBase& aDDFVersion )
-    {
-    OstTraceFunctionEntry0( CCONNMOADAPTER_DDFVERSIONL_ENTRY );
-    
-    aDDFVersion.InsertL( 0, KConnMoAdapterDDFversion );
-    
-    OstTraceFunctionExit0( CCONNMOADAPTER_DDFVERSIONL_EXIT );
-    }
-
-//------------------------------------------------------------------------------
-//  void CConnMoAdapter::DDFStructureL()
-//------------------------------------------------------------------------------
-void CConnMoAdapter::DDFStructureL( MSmlDmDDFObject& aDDF )
-    {
-    OstTraceFunctionEntry0( CCONNMOADAPTER_DDFSTRUCTUREL_ENTRY );
-    
-    // Insert Base URI in the beginning of the tree
-    MSmlDmDDFObject& ddf = AddBaseUriL( aDDF);
-    
-    // NAP Branch
-    MSmlDmDDFObject& nNapDdf = AddBranchL( ddf, KCMDdfNAP );
-    iNapBranch->DDFStructureL( nNapDdf );
-    
-    // Proxy Branch
-    MSmlDmDDFObject& nProxyDdf = AddBranchL( ddf, KCMDdfProxy );
-    iProxyBranch->DDFStructureL( nProxyDdf );
-    
-    OstTraceFunctionExit0( CCONNMOADAPTER_DDFSTRUCTUREL_EXIT );
-    }
-    
-void CConnMoAdapter::UpdateLeafObjectL( const TDesC8& aURI, 
-                                        const TDesC8& aLUID,
-                                        const TDesC8& aObject, 
-                                        const TDesC8& aType,
-                                        TInt aStatusRef )
-    {
-    OstTraceExt1( TRACE_NORMAL, CCONNMOADAPTER_UPDATELEAFOBJECTL_ENTRY, "ENTRY: CConnMoAdapter::UpdateLeafObjectL;aURI=%s", aURI );
-    
-    CBranchBase* implementation = GetBranch( aURI ); 
-    
-    implementation->UpdateLeafObjectL( aURI, aLUID, aObject, aType, aStatusRef );
-
-    OstTrace0( TRACE_NORMAL, CCONNMOADAPTER_UPDATELEAFOBJECTL_EXIT, "EXIT: CConnMoAdapter::UpdateLeafObjectL" );
-    }
-
-//------------------------------------------------------------------------------
-// void CConnMoAdapter::UpdateLeafObjectL
-//------------------------------------------------------------------------------
-void CConnMoAdapter::UpdateLeafObjectL( const TDesC8& /*aURI*/, 
-                                        const TDesC8& /*aLUID*/,
-                                        RWriteStream*& /*aStream*/, 
-                                        const TDesC8& /*aType*/,
-                                        TInt aStatusRef )
-    {
-    OstTraceFunctionEntry0( CCONNMOADAPTER_UPDATELEAFOBJECTL_STREAM_ENTRY );
-    
-    iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-    OstTrace0( TRACE_NORMAL, 
-               CCONNMOADAPTER_UPDATELEAFOBJECTL_STREAM_UNSUPPORTED_METHOD_CALL, 
-               "CConnMoAdapter::UpdateLeafObjectL;Unsupported method call. CSmlDmAdapter::EError." );
-   
-    OstTraceFunctionExit0( CCONNMOADAPTER_UPDATELEAFOBJECTL_STREAM_EXIT );
-    }
-
-//------------------------------------------------------------------------------
-// void CConnMoAdapter::DeleteObjectL
-//------------------------------------------------------------------------------
-void CConnMoAdapter::DeleteObjectL( const TDesC8& aURI, 
-                                    const TDesC8& aLUID,
-                                    TInt aStatusRef )
-    {
-    OstTraceExt1( TRACE_NORMAL, CCONNMOADAPTER_DELETEOBJECTL_ENTRY, "ENTRY: CConnMoAdapter::DeleteObjectL;aURI=%s", aURI );
-
-    CBranchBase* implementation = GetBranch( aURI ); 
-    
-    implementation->DeleteObjectL( aURI, aLUID, aStatusRef );
-    
-    OstTrace0( TRACE_NORMAL, CCONNMOADAPTER_DELETEOBJECTL_EXIT, "EXIT: CConnMoAdapter::DeleteObjectL" );
-    }
-
-//------------------------------------------------------------------------------
-// void CConnMoAdapter::FetchLeafObjectL
-//------------------------------------------------------------------------------
-void CConnMoAdapter::FetchLeafObjectL( const TDesC8& aURI, 
-                                       const TDesC8& aLUID,
-                                       const TDesC8& aType, 
-                                       TInt aResultsRef,
-                                       TInt aStatusRef )
-    {
-    OstTraceExt1( TRACE_NORMAL, CCONNMOADAPTER_FETCHLEAFOBJECTL_ENTRY, "ENTRY: CConnMoAdapter::FetchLeafObjectL;aURI=%s", aURI );
-    
-    CBranchBase* implementation = GetBranch( aURI ); 
-    
-    implementation->FetchLeafObjectL( aURI, aLUID, aType, aResultsRef, aStatusRef );
-       
-    OstTrace0( TRACE_NORMAL, CCONNMOADAPTER_FETCHLEAFOBJECTL_EXIT, "EXIT: CConnMoAdapter::FetchLeafObjectL" );
-    }
-
-//------------------------------------------------------------------------------
-// void CConnMoAdapter::FetchLeafObjectSizeL
-//------------------------------------------------------------------------------
-void CConnMoAdapter::FetchLeafObjectSizeL( const TDesC8& aURI, 
-                                           const TDesC8& aLUID,
-                                           const TDesC8& aType, 
-                                           TInt aResultsRef,
-                                           TInt aStatusRef )
-    {
-    OstTraceExt1( TRACE_NORMAL, CCONNMOADAPTER_FETCHLEAFOBJECTSIZEL_ENTRY, "ENTRY: CConnMoAdapter::FetchLeafObjectSizeL;aURI=%s", aURI );
-    
-    CBranchBase* implementation = GetBranch( aURI ); 
-    
-    implementation->FetchLeafObjectSizeL( aURI, 
-                                          aLUID, 
-                                          aType, 
-                                          aResultsRef, 
-                                          aStatusRef );
-    
-    OstTrace0( TRACE_NORMAL, CCONNMOADAPTER_FETCHLEAFOBJECTSIZEL_EXIT, "EXIT: CConnMoAdapter::FetchLeafObjectSizeL" );
-    }
-
-//------------------------------------------------------------------------------
-// CConnMoAdapter::ChildURIListL
-// Return childs of the requested node.
-//------------------------------------------------------------------------------
-void CConnMoAdapter::ChildURIListL( const TDesC8& aURI, 
-                        const TDesC8& aLUID,
-                        const CArrayFix<TSmlDmMappingInfo>& aPreviousURISegmentList,
-                        TInt aResultsRef,
-						TInt aStatusRef )
-    {
-    OstTraceExt1( TRACE_NORMAL, CCONNMOADAPTER_CHILDURILISTL_ENTRY, "ENTRY: CConnMoAdapter::ChildURIListL;aURI=%s", aURI );
-    
-    CBranchBase* implementation = GetBranch( aURI ); 
-    
-    implementation->ChildURIListL( aURI, aLUID, aPreviousURISegmentList, 
-                                   aResultsRef, aStatusRef );
-
-    
-    OstTrace0( TRACE_NORMAL, CCONNMOADAPTER_CHILDURILISTL_EXIT, "EXIT: CConnMoAdapter::ChildURIListL" );
-    }
-    
-//------------------------------------------------------------------------------
-// CConnMoAdapter::AddNodeObjectL
-//------------------------------------------------------------------------------
-void CConnMoAdapter::AddNodeObjectL( const TDesC8& aURI, 
-                                     const TDesC8& aParentLUID,
-                                     TInt aStatusRef )
-    {
-    OstTraceExt1( TRACE_NORMAL, CCONNMOADAPTER_ADDNODEOBJECTL_ENTRY, "ENTRY: CConnMoAdapter::AddNodeObjectL;aURI=%s", aURI );
-    
-    CBranchBase* implementation = GetBranch( aURI ); 
-    
-    implementation->AddNodeObjectL( aURI, aParentLUID, aStatusRef );
-
-    OstTrace0( TRACE_NORMAL, CCONNMOADAPTER_ADDNODEOBJECTL_EXIT, "EXIT: CConnMoAdapter::AddNodeObjectL" );
-    }
-
-//------------------------------------------------------------------------------
-// CConnMoAdapter::ExecuteCommandL
-// Not supported. Returns EError.
-//------------------------------------------------------------------------------
-void CConnMoAdapter::ExecuteCommandL( const TDesC8& /*aURI*/, 
-                                      const TDesC8& /*aLUID*/,
-                                      const TDesC8& /*aArgument*/, 
-                                      const TDesC8& /*aType*/,
-                                      TInt aStatusRef )
-    {
-    OstTraceFunctionEntry0( CCONNMOADAPTER_EXECUTECOMMANDL_ENTRY );
-    
-    iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-
-    OstTrace0( TRACE_NORMAL, 
-               CCONNMOADAPTER_EXECUTECOMMANDL_UNSUPPORTED_METHOD_CALL, 
-               "CConnMoAdapter::ExecuteCommandL;Unsupported method call. CSmlDmAdapter::EError." );
-
-    OstTraceFunctionExit0( CCONNMOADAPTER_EXECUTECOMMANDL_EXIT );
-    }
-
-//------------------------------------------------------------------------------
-// CConnMoAdapter::ExecuteCommandL
-// Not supported. Returns EError.
-//------------------------------------------------------------------------------
-void CConnMoAdapter::ExecuteCommandL( const TDesC8& /*aURI*/, 
-                                      const TDesC8& /*aLUID*/,
-                                      RWriteStream*& /*aStream*/, 
-                                      const TDesC8& /*aType*/,
-                                      TInt aStatusRef )
-    {
-    OstTraceFunctionEntry0( CCONNMOADAPTER_EXECUTECOMMANDL_STREAM_ENTRY );
-    
-    iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-    
-    OstTrace0( TRACE_NORMAL, 
-               CCONNMOADAPTER_EXECUTECOMMANDL_STREAM_UNSUPPORTED_METHOD_CALL, 
-               "CConnMoAdapter::ExecuteCommandL;Unsupported method call. CSmlDmAdapter::EError." );
-    
-    OstTraceFunctionExit0( CCONNMOADAPTER_EXECUTECOMMANDL_STREAM_EXIT );
-    }
-
-//------------------------------------------------------------------------------
-// CConnMoAdapter::CopyCommandL
-// Not supported. Returns EError.
-//------------------------------------------------------------------------------
-void CConnMoAdapter::CopyCommandL( const TDesC8& /*aTargetURI*/, 
-                                   const TDesC8& /*aTargetLUID*/,
-                                   const TDesC8& /*aSourceURI*/, 
-                                   const TDesC8& /*aSourceLUID*/,
-                                   const TDesC8& /*aType*/, 
-                                   TInt aStatusRef )
-    {
-    OstTraceFunctionEntry0( CCONNMOADAPTER_COPYCOMMANDL_ENTRY );
-    
-    iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-
-    OstTrace0( TRACE_NORMAL, 
-               CCONNMOADAPTER_COPYCOMMANDL_UNSUPPORTED_METHOD_CALL, 
-               "CConnMoAdapter::CopyCommandL;Unsupported method call. CSmlDmAdapter::EError." );
-    
-    OstTraceFunctionExit0( CCONNMOADAPTER_COPYCOMMANDL_EXIT );
-    }
-
-//------------------------------------------------------------------------------
-// CConnMoAdapter::StartAtomicL
-// Not supported.
-//------------------------------------------------------------------------------
-void CConnMoAdapter::StartAtomicL()
-    {
-    OstTraceFunctionEntry0( CCONNMOADAPTER_STARTATOMICL_ENTRY );
-    
-    OstTrace0( TRACE_NORMAL, 
-               CCONNMOADAPTER_STARTATOMICL_UNSUPPORTED_METHOD_CALL, 
-               "CConnMoAdapter::StartAtomicL;Unsupported method call." );
-
-    OstTraceFunctionExit0( CCONNMOADAPTER_STARTATOMICL_EXIT );
-    }
-
-//------------------------------------------------------------------------------
-// CConnMoAdapter::CommitAtomicL
-// Not supported.
-//------------------------------------------------------------------------------
-void CConnMoAdapter::CommitAtomicL()
-    {
-    OstTraceFunctionEntry0( CCONNMOADAPTER_COMMITATOMICL_ENTRY );
-
-    OstTrace0( TRACE_NORMAL, 
-               CCONNMOADAPTER_COMMITATOMICL_UNSUPPORTED_METHOD_CALL, 
-               "CConnMoAdapter::CommitAtomicL;Unsupported method call." );
-    
-    OstTraceFunctionExit0( CCONNMOADAPTER_COMMITATOMICL_EXIT );
-    }
-
-//------------------------------------------------------------------------------
-// CConnMoAdapter::RollbackAtomicL
-// Not supported.
-//------------------------------------------------------------------------------
-void CConnMoAdapter::RollbackAtomicL()
-    {
-    OstTraceFunctionEntry0( CCONNMOADAPTER_ROLLBACKATOMICL_ENTRY );
-
-    OstTrace0( TRACE_NORMAL, 
-               CCONNMOADAPTER_ROLLBACKATOMICL_UNSUPPORTED_METHOD_CALL, 
-               "CConnMoAdapter::RollbackAtomicL;Unsupported method call." );
-    
-    OstTraceFunctionExit0( CCONNMOADAPTER_ROLLBACKATOMICL_EXIT );
-    }
-
-//------------------------------------------------------------------------------
-// CConnMoAdapter::StreamingSupport
-// Not supported. Returns EFalse.
-//------------------------------------------------------------------------------
-TBool CConnMoAdapter::StreamingSupport( TInt& /*aItemSize*/ )
-    {
-    OstTraceFunctionEntry0( CCONNMOADAPTER_STREAMINGSUPPORT_ENTRY );
-
-    
-    OstTrace0( TRACE_NORMAL, 
-               CCONNMOADAPTER_STREAMINGSUPPORT_NOT_SUPPORTED, 
-               "CConnMoAdapter::StreamingSupport;Not supported." );
-    
-    OstTraceFunctionExitExt( CCONNMOADAPTER_STREAMINGSUPPORT_EXIT, this, EFalse );
-    return EFalse;
-    }
-
-//------------------------------------------------------------------------------
-// CConnMoAdapter::StreamCommittedL
-// Not supported. Returns EError.
-//------------------------------------------------------------------------------
-void CConnMoAdapter::StreamCommittedL()
-    {
-    OstTraceFunctionEntry0( CCONNMOADAPTER_STREAMCOMMITTEDL_ENTRY);
-    
-    OstTrace0( TRACE_NORMAL, 
-               CCONNMOADAPTER_STREAMCOMMMITTEDL_UNSUPPORTED_METHOD_CALL, 
-               "CConnMoAdapter::StreamCommittedL;Unsupported method call." );
-
-    OstTraceFunctionExit0( CCONNMOADAPTER_STREAMCOMMITTEDL_EXIT );
-    }
-
-void CConnMoAdapter::CompleteOutstandingCmdsL()
-    {
-    OstTraceFunctionEntry0( CCONNMOADAPTER_COMPLETEOUTSTANDINGCMDSL_ENTRY );
-    
-    iNapBranch->ProcessBufferL();
-    iProxyBranch->ProcessBufferL();
-    
-    iBuffer->Reset();
-    
-    OstTraceFunctionExit0( CCONNMOADAPTER_COMPLETEOUTSTANDINGCMDSL_EXIT );
-    }
-
-// ======== GLOBAL FUNCTIONS ========
-//------------------------------------------------------------------------------
-//
-//------------------------------------------------------------------------------
-#ifndef IMPLEMENTATION_PROXY_ENTRY
-#define IMPLEMENTATION_PROXY_ENTRY( aUid, aFuncPtr )  {{aUid},(aFuncPtr)}
-#endif
-
-const TImplementationProxy ImplementationTable[] = 
-    {
-    IMPLEMENTATION_PROXY_ENTRY(KConnMoAdapterUid, CConnMoAdapter::NewL)
-    };
-
-//------------------------------------------------------------------------------
-// TImplementationProxy* ImplementationGroupProxy()
-//------------------------------------------------------------------------------
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy( TInt& aTableCount )
-    {
-    OstTraceFunctionEntry1( CONNMOADAPTER_IMPLEMENTATIONGROUPPROXY_ENTRY, aTableCount );
-
-    aTableCount = sizeof(ImplementationTable) / sizeof(TImplementationProxy);
-
-    OstTraceFunctionExit0( CONNMOADAPTER_IMPLEMENTATIONGROUPPROXY_EXIT );
-    return ImplementationTable;
-    }
--- a/omadm/omadmextensions/adapters/connmoadapter/src/ConnMoAdapter.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-/** @file
-* 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:  ConnMO resources
-*
-*/
-
-#include <registryinfo.rh>
-#include "nsmldmconstants.h"
-
-RESOURCE REGISTRY_INFO theRegistryInfo
-  {
-  dll_uid = 0x2001FE5E; //The DLL's 3rd UID.
-  interfaces = 
-      {
-      INTERFACE_INFO
-          {
-          interface_uid = KNSmlDMInterfaceUid; // DM interface UID
-          implementations = 
-            {
-            IMPLEMENTATION_INFO
-                {
-                implementation_uid = 0x2001FE5F; // DM ConnMO Adapter
-                version_no = 1; 
-                display_name = "";
-                default_data = "";
-                opaque_data = "";
-                }
-            };
-          }
-      };
-    }
--- a/omadm/omadmextensions/adapters/connmoadapter/src/Luid.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,78 +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 "Eclipse Public License v1.0"
- * which accompanies 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 "Luid.h"
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "LuidTraces.h"
-#endif
-
-
-// ======== LOCAL FUNCTIONS =========
-
-// ======== MEMBER FUNCTIONS ========
-
-//------------------------------------------------------------------------------
-// TLuid::TLuid()
-//------------------------------------------------------------------------------
-TLuid::TLuid() 
-    {
-
-    }
-
-//------------------------------------------------------------------------------
-// TLuid::TLuid()
-//------------------------------------------------------------------------------
-TLuid::TLuid( const TDesC8& aName, const TUint32 aCmId ) 
-    {
-    OstTraceExt2( TRACE_NORMAL, TLUID_TLUID, "ENTRY: TLuid::TLuid;aName=%s;aCmId=%u", aName, aCmId );
-    
-    iName = aName;
-    iCmId = aCmId;
-    }
-
-//------------------------------------------------------------------------------
-// TLuid::Equals()
-//------------------------------------------------------------------------------
-TBool TLuid::Equals( TUint32 aId ) const
-    {
-    OstTraceFunctionEntry1( TLUID_EQUALS_ENTRY, this );
-    if ( aId == iCmId)
-        {
-        OstTraceFunctionExitExt( TLUID_EQUALS_EXIT, this, ETrue );
-        return ETrue;
-        }
-    else
-        {
-        OstTraceFunctionExitExt( DUP1_TLUID_EQUALS_EXIT, this, EFalse );
-        return EFalse;
-        }
-    }
-
-//------------------------------------------------------------------------------
-// TLuid::GetCmId()
-//------------------------------------------------------------------------------
-TUint32 TLuid::GetCmId()
-    {
-    OstTrace1( TRACE_NORMAL, TLUID_GETCMID, "TLuid::GetCmId;iCmId=%u", iCmId );
-    
-    return iCmId;
-    }
-
-// ======== GLOBAL FUNCTIONS ========  
--- a/omadm/omadmextensions/adapters/connmoadapter/src/NapBranch.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1350 +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 "Eclipse Public License v1.0"
- * which accompanies 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 <featmgr.h>
-#include <cmmanagerext.h> 
-#include <cmpluginpacketdatadef.h>
-#include <cmpluginwlandef.h>
-#include <cmconnectionmethoddef.h>
-#include <nsmldmtreedbclient.h>
-#include "NapBranch.h"
-#include "Utils.h"
-#include "AddBuffer.h"
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "NapBranchTraces.h"
-#endif
-// ------------------------------------------------------------------------------------------------
-// Constants
-// ------------------------------------------------------------------------------------------------
-// NAP Branch
-_LIT8( KCMDdfID, "ID" );
-_LIT8( KCMDdfName, "Name" );
-_LIT8( KCMDdfAddrType, "AddrType" );
-_LIT8( KCMDdfAddr, "Addr" );
-_LIT8( KCMDdfIP, "IP" );
-_LIT8( KCMDdfAuthInfo, "AuthInfo" );
-_LIT8( KCMDdfAuthType, "AuthType" );
-_LIT8( KCMDdfBearerType, "BearerType" );
-_LIT8( KCMDdfBearerParams, "BearerParams" );
-_LIT8( KCMDdfIPv4, "IPv4" );
-_LIT8( KCMDdfAutoConfig, "AutoConfig" );
-_LIT8( KCMDdfIPAddr, "IPAddr" );
-_LIT8( KCMDdfNetMask, "NetMask" );
-_LIT8( KCMDdfGateway, "Gateway" );
-_LIT8( KCMDdfAutoDNS, "AutoDNS" );
-_LIT8( KCMDdfDNS, "DNS" );
-_LIT8( KCMDdfServers, "Servers" );
-_LIT8( KCMDdfServer, "Server" );
-_LIT8( KCMDdfAuthName, "AuthName" );
-_LIT8( KCMDdfAuthSecret, "AuthSecret" );
-// NAP Child URI List
-_LIT8( KCMNapFields, "ID/Name/AddrType/Addr/IP/AuthInfo/BearerType" );
-_LIT8( KCMNIPFields, "IPv4" );
-_LIT8( KCMNIPv4Fields, "AutoConfig/IPAddr/NetMask/Gateway/AutoDNS/DNS" );
-_LIT8( KCMNDNSFields, "Servers" );
-_LIT8( KCMNAuthInfoFields, "AuthType/AuthName/AuthSecret" );
-_LIT8( KCMNDNSServersFields, "Addr");
-_LIT8( KSlash, "/" );
-_LIT8( KDynamicNapNode, "NAP/*" );
-_LIT8( KDynamicNapNodeChildUri, "NAP/*/*" );
-_LIT8( KDynamicIPNode, "NAP/*/IP" );
-_LIT8( KDynamicIPNodeChildUri, "NAP/*/IP/*" );
-_LIT8( KDynamicIPv4Node, "NAP/*/IP/IPv4" );
-_LIT8( KDynamicIPv4NodeChildUri, "NAP/*/IP/IPv4/*" );
-_LIT8( KDynamicIPv4DnsNode, "NAP/*/IP/IPv4/DNS" );
-_LIT8( KDynamicIPv4DnsNodeChildUri, "NAP/*/IP/IPv4/DNS/*" );
-_LIT8( KDynamicIPv4DnsServersNode, "NAP/*/IP/IPv4/DNS/Servers" );
-_LIT8( KDynamicIPv4DnsServersNodeChildUri, "NAP/*/IP/IPv4/DNS/Servers/*" );
-_LIT8( KDynamicIPv4DnsServersNodeChildUriNodes, "NAP/*/IP/IPv4/DNS/Servers/*/*");
-_LIT8( KDynamicAuthInfoNode, "NAP/*/AuthInfo");
-_LIT8( KDynamicAuthInfoNodeChildUri, "NAP/*/AuthInfo/*");
-_LIT8( KNapBearerTypeUri, "NAP/*/BearerType");
-_LIT8( KNapAddrUri, "NAP/*/Addr");
-_LIT8( KNapDNSAddr1Uri, "NAP/*/Server1/Addr");
-_LIT8( KNapDNSAddr2Uri, "NAP/*/Server2/Addr");
-_LIT8( KNapIPv4AddrUri, "NAP/*/IPv4/*Addr");
-_LIT8( KPacketDataBearerType, "3GPPPS");
-_LIT8( KGPRSAddrType, "APN");
-_LIT8( KGPRSAuthType, "PAP");
-
-
-TInt const KInvalidBearerType = 0;
-TInt const KBufferExpandSize = 128;
-TInt const KNumOfNAPNodes = 8;
-TInt const KMaxResultSize = 64;
-TInt const KMaxDnsAddr = 2;
-_LIT8( KFalse, "False");
-_LIT8( KTrue, "True");
-
-_LIT8( KDynamicNodePrefix, "NAPId" );
-
-// ======== LOCAL FUNCTIONS =========
-//-----------------------------------------------------------------------------
-// TUint32 CNapBranch::CheckForUnmodifiableFieldL()
-//-----------------------------------------------------------------------------
-CSmlDmAdapter::TError CNapBranch::GetUnmodifiableFieldValueL(
-        const TDesC8& aUri, CBufBase* aResult)
-    {
-    OstTraceExt1( TRACE_NORMAL, CNAPBRANCH_GETUNMODIFIABLEFIELDVALUEL_ENTRY,
-            "ENTRY: CNapBranch::GetUnmodifiableFieldValueL;aUri=%s", aUri );
-
-    CSmlDmAdapter::TError retval( CSmlDmAdapter::ENotFound );
-    TPtrC8 nodeName = CUtils::GetLastURISeg( aUri );
-
-    if ( nodeName.Match( KCMDdfAddrType ) != KErrNotFound )
-        {
-        aResult->InsertL( 0, KGPRSAddrType );
-        retval = CSmlDmAdapter::EOk;
-        }
-    else if ( nodeName.Match( KCMDdfBearerType ) != KErrNotFound )
-        {
-        aResult->InsertL( 0, KPacketDataBearerType );
-        retval = CSmlDmAdapter::EOk;
-        }
-    else if ( nodeName.Match( KCMDdfAuthType ) != KErrNotFound )
-        {
-        aResult->InsertL( 0, KGPRSAuthType );
-        retval = CSmlDmAdapter::EOk;
-        }
-    else if ( nodeName.Match( KCMDdfID ) != KErrNotFound )
-        {
-        TPtrC8 dynamicNode = GetDynamicNAPNodeUri( aUri );
-        aResult->InsertL( 0, dynamicNode );
-        retval = CSmlDmAdapter::EOk;
-        }
-
-    OstTrace1( TRACE_NORMAL, CNAPBRANCH_GETUNMODIFIABLEFIELDVALUEL_EXIT,
-            "EXIT: CNapBranch::GetUnmodifiableFieldValueL;retval=%{TError}", retval );
-
-    return retval;
-    }
-//-----------------------------------------------------------------------------
-// CSmlDmAdapter::TErrorCNapBranch::GetLeafData()
-//-----------------------------------------------------------------------------
-CSmlDmAdapter::TError CNapBranch::GetLeafDataL(const TDesC8& aURI,
-        RCmConnectionMethodExt& aCm, CBufBase* aResult)
-    {
-    OstTraceExt1( TRACE_NORMAL, CNAPBRANCH_GETLEAFDATAL_ENTRY,
-            "ENTRY: CNapBranch::GetLeafDataL;aURI=%s", aURI );
-
-    TUint32 attributeRef( 0 );
-    CSmlDmAdapter::TError status = CSmlDmAdapter::EOk;
-    HBufC16* resultTmp;
-
-    attributeRef = MapUriToCmAttribute( aURI );
-    switch ( attributeRef )
-        {
-        case CMManager::ECmName:
-        case CMManager::EPacketDataIPNameServer1:
-        case CMManager::EPacketDataIPNameServer2:
-        case CMManager::EPacketDataAPName:
-        case CMManager::EPacketDataIFAuthName:
-        case CMManager::EPacketDataIPAddr:
-        case CMManager::EPacketDataIPNetmask:
-        case CMManager::EPacketDataIPGateway:
-        resultTmp = aCm.GetStringAttributeL( attributeRef );
-        CleanupStack::PushL( resultTmp );
-        aResult->InsertL( 0, CUtils::ConvertTo8LC( *resultTmp ) );
-        CleanupStack::PopAndDestroy(); // ConvertTo8LC
-        CleanupStack::PopAndDestroy( resultTmp );
-        break;
-        case CMManager::EPacketDataIPAddrFromServer:
-        case CMManager::EPacketDataIPDNSAddrFromServer:
-        if ( aCm.GetBoolAttributeL( attributeRef ) )
-            {
-            aResult->InsertL( 0, KTrue );
-            }
-        else
-            {
-            aResult->InsertL( 0, KFalse );
-            }
-
-        break;
-        default:
-        status = GetUnmodifiableFieldValueL( aURI, aResult );
-        break;
-        }
-    OstTrace1( TRACE_NORMAL, CNAPBRANCH_GETLEAFDATAL_EXIT,
-            "EXIT: CNapBranch::GetLeafDataL;status=%{TError}", status );
-
-    return status;
-    }
-
-//-----------------------------------------------------------------------------
-// CNapBranch::GetUnmodifiableFieldAddResult()
-//-----------------------------------------------------------------------------
-CSmlDmAdapter::TError CNapBranch::GetUnmodifiableFieldAddResult(
-        const TDesC8& aUri, const TDesC8& aObject)
-    {
-    OstTraceExt1( TRACE_NORMAL, CNAPBRANCH_GETUNMODIFIABLEFIELDADDRESULT_ENTRY,
-            "ENTRY: CNapBranch::GetUnmodifiableFieldAddResult;aUri=%s", aUri );
-
-    CSmlDmAdapter::TError retval( CSmlDmAdapter::ENotFound );
-    TPtrC8 nodeName = CUtils::GetLastURISeg( aUri );
-
-    if ( nodeName.Match( KCMDdfAddrType ) != KErrNotFound )
-        {
-        if ( aObject.Match( KGPRSAddrType ) != KErrNotFound )
-            {
-            retval = CSmlDmAdapter::EOk;
-            }
-        else
-            {
-            retval = CSmlDmAdapter::EInvalidObject;
-            }
-        }
-    else if ( nodeName.Match( KCMDdfAuthType ) != KErrNotFound )
-        {
-        if ( aObject.Match( KGPRSAuthType ) != KErrNotFound )
-            {
-            retval = CSmlDmAdapter::EOk;
-            }
-        else
-            {
-            retval = CSmlDmAdapter::EInvalidObject;
-            }
-        }
-
-    OstTrace1( TRACE_NORMAL, DUP1_CNAPBRANCH_GETUNMODIFIABLEFIELDADDRESULT_EXIT,
-            "EXIT: CNapBranch::GetUnmodifiableFieldAddResult;retval=%{TError}", retval );
-
-    return retval;
-    }
-//-----------------------------------------------------------------------------
-// CNapBranch::MapUriToCmAttribute(()
-//-----------------------------------------------------------------------------
-TUint32 CNapBranch::MapUriToCmAttribute(const TDesC8& aUri)
-    {
-    OstTraceExt1( TRACE_NORMAL, CNAPBRANCH_MAPURITOCMATTRIBUTE_ENTRY,
-            "ENTRY: CNapBranch::MapUriToCmAttribute;aUri=%s", aUri );
-
-    TUint32 retval( 0 );
-
-    TPtrC8 nodeName = CUtils::GetLastURISeg( aUri );
-
-    OstTraceExt1( TRACE_NORMAL, CNAPBRANCH_MAPURITOCMATTRIBUTE_GET_NODE,
-            "CNapBranch::MapUriToCmAttribute;nodeName=%s", nodeName );
-
-    if ( nodeName.Match( KCMDdfName ) != KErrNotFound )
-        {
-        retval = CMManager::ECmName;
-        }
-    else if ( nodeName.Match( KCMDdfAddr ) != KErrNotFound )
-        {
-        // IP branch and NAP branch have both "Addr" leaf. Select between them.
-        if ( aUri.Match( KNapAddrUri ) != KErrNotFound &&
-                aUri.Match( KNapIPv4AddrUri ) == KErrNotFound )
-            {
-            retval = CMManager::EPacketDataAPName;
-            }
-        else if ( aUri.Match( KNapDNSAddr1Uri ) != KErrNotFound )
-            {
-            retval = CMManager::EPacketDataIPNameServer1;
-            }
-        else if ( aUri.Match( KNapDNSAddr2Uri ) != KErrNotFound )
-            {
-            retval = CMManager::EPacketDataIPNameServer2;
-            }
-        }
-    else if ( nodeName.Match( KCMDdfBearerType ) != KErrNotFound )
-        {
-        retval = CMManager::ECmBearerType;
-        }
-    else if ( nodeName.Match( KCMDdfAuthName ) != KErrNotFound )
-        {
-        retval = CMManager::EPacketDataIFAuthName;
-        }
-    else if ( nodeName.Match( KCMDdfAuthSecret ) != KErrNotFound )
-        {
-        retval = CMManager::EPacketDataIFAuthPass;
-        }
-    else if ( nodeName.Match( KCMDdfAutoConfig ) != KErrNotFound )
-        {
-        retval = CMManager::EPacketDataIPAddrFromServer;
-        }
-    else if ( nodeName.Match( KCMDdfIPAddr ) != KErrNotFound )
-        {
-        retval = CMManager::EPacketDataIPAddr;
-        }
-    else if ( nodeName.Match( KCMDdfNetMask ) != KErrNotFound )
-        {
-        retval = CMManager::EPacketDataIPNetmask;
-        }
-    else if ( nodeName.Match( KCMDdfGateway ) != KErrNotFound )
-        {
-        retval = CMManager::EPacketDataIPGateway;
-        }
-    else if ( nodeName.Match( KCMDdfAutoDNS )!= KErrNotFound )
-        {
-        retval = CMManager::EPacketDataIPDNSAddrFromServer;
-        }
-
-    OstTrace1( TRACE_NORMAL, CNAPBRANCH_MAPURITOCMATTRIBUTE_EXIT,
-            "EXIT: CNapBranch::MapUriToCmAttribute;retval=%{TError}", retval );
-
-    return retval;
-    }
-//-----------------------------------------------------------------------------
-// void CNapBranch::SetLeafData()
-//-----------------------------------------------------------------------------
-void CNapBranch::SetLeafDataL(const TDesC8& aURI, const TDesC8& aObject,
-        TInt aStatusRef, RCmConnectionMethodExt& aCm)
-    {
-    OstTraceExt1( TRACE_FLOW, CNAPBRANCH_SETLEAFDATAL_ENTRY,
-            "ENTRY: CNapBranch::SetLeafDataL;aURI=%s", aURI );
-
-    TUint32 attributeRef( 0 );
-    TBool tmpBool = EFalse;
-    CSmlDmAdapter::TError status = CSmlDmAdapter::EOk;
-
-    attributeRef = MapUriToCmAttribute( aURI );
-    OstTrace1( TRACE_NORMAL, CNAPBRANCH_SETLEAFDATAL_GET_CMATTRIB,
-            "CNapBranch::SetLeafDataL;CM Attribute:;attributeRef=%{TConnectionMethodCommonAttributes}",
-            attributeRef );
-
-    switch ( attributeRef )
-        {
-        case CMManager::ECmName:
-        case CMManager::EPacketDataIPNameServer1:
-        case CMManager::EPacketDataIPNameServer2:
-        case CMManager::EPacketDataAPName:
-        case CMManager::EPacketDataIFAuthName:
-        case CMManager::EPacketDataIFAuthPass:
-        case CMManager::EPacketDataIPAddr:
-        case CMManager::EPacketDataIPNetmask:
-        case CMManager::EPacketDataIPGateway:
-        aCm.SetStringAttributeL( attributeRef, CUtils::ConvertTo16LC( aObject ) );
-        CleanupStack::PopAndDestroy(); // ConvertTo16LC
-        break;
-        case CMManager::EPacketDataIPAddrFromServer:
-        case CMManager::EPacketDataIPDNSAddrFromServer:
-        if ( CUtils::DesToBool( aObject, tmpBool ) == KErrNone )
-            {
-            aCm.SetBoolAttributeL( attributeRef, tmpBool );
-            }
-        else
-            {
-            status = CSmlDmAdapter::EInvalidObject;
-            }
-        break;
-        case CMManager::ECmBearerType:
-        // BearerType is already set when CM was created.
-        break;
-        default:
-        // Attribute field was not from CM. Check if value is hard coded to CM.
-        status = GetUnmodifiableFieldAddResult( aURI, aObject );
-        break;
-        }
-    iCallback->SetStatusL( aStatusRef, status );
-    OstTrace1( TRACE_NORMAL, CNAPBRANCH_SETLEAFDATAL_EXIT,
-            "EXIT: CNapBranch::SetLeafDataL;status=%{TError}", status );
-    }
-
-//-----------------------------------------------------------------------------
-// TBool CNapBranch::SetNodeData()
-//-----------------------------------------------------------------------------
-void CNapBranch::SetNodeDataL(CConnMoNodeElement* aNode,
-        RCmConnectionMethodExt& aCm)
-    {
-    OstTraceExt1( TRACE_NORMAL, CNAPBRANCH_SETNODEDATAL_ENTRY,
-            "ENTRY: CNapBranch::SetNodeDataL;aNode->iUri=%s", aNode->iUri );
-
-    if ( aNode->iParentLUID.Length() == 0 )
-        {
-        TBuf8<16> addLUID;
-        _LIT8( KFormat, "%d" );    
-        addLUID.Format( KFormat, aCm.GetIntAttributeL( CMManager::ECmId ) );
-        
-        iCallback->SetMappingL( aNode->iUri, addLUID );
-        iCallback->SetStatusL( aNode->iStatusRef, CSmlDmAdapter::EOk );
-
-        OstTrace0( TRACE_NORMAL, CNAPBRANCH_SETNODEDATAL_OK,
-                "CNapBranch::SetNodeDataL; CSmlDmAdapter::EOk" );
-        }
-    else
-        {
-        iCallback->SetStatusL( aNode->iStatusRef, CSmlDmAdapter::EAlreadyExists );
-        OstTrace0( TRACE_NORMAL, CNAPBRANCH_SETNODEDATAL_EXISTS,
-                "CNapBranch::SetNodeDataL; CSmlDmAdapter::EAlreadyExists" );
-        }
-    OstTrace0( TRACE_NORMAL, CNAPBRANCH_SETNODEDATAL_EXIT,
-            "EXIT: CNapBranch::SetNodeDataL" );
-    }
-
-//-----------------------------------------------------------------------------
-// TBool CNapBranch::FindNewCmType
-//-----------------------------------------------------------------------------
-TBool CNapBranch::FindNewCmType(TUint32& aBearerType)
-    {
-    OstTrace0( TRACE_NORMAL, CNAPBRANCH_FINDNEWCMTYPE_ENTRY, "ENTRY: CNapBranch::FindNewCmType" );
-
-    TBool retval = EFalse;
-    // Find bearer type for creating a connection methdod
-    CConnMoNodeElement* processNode = iBuffer->CacheFind( KNapBearerTypeUri );
-    if ( processNode )
-        {
-        if ( processNode->iObject.Match( KPacketDataBearerType ) != KErrNotFound )
-            {
-            OstTraceExt1( TRACE_NORMAL, CNAPBRANCH_FINDNEWCMTYPE_3GPP,
-                    "CNapBranch::FindNewCmType;Bearer Type: %s", KPacketDataBearerType );
-
-            aBearerType = KUidPacketDataBearerType;
-            retval = ETrue;
-            }
-        else
-            {
-            aBearerType = KInvalidBearerType;
-            }
-        }
-    OstTrace1( TRACE_NORMAL, CNAPBRANCH_FINDNEWCMTYPE_EXIT,
-            "EXIT: CNapBranch::FindNewCmType;retval=%d", retval );
-
-    return retval;
-    }
-//-----------------------------------------------------------------------------
-// TBool CNapBranch::AllMandatoryNapFieldsFound()
-//-----------------------------------------------------------------------------
-TBool CNapBranch::AllMandatoryNapFieldsFound()
-    {
-    OstTrace0( TRACE_NORMAL, CNAPBRANCH_ALLMANDATORYNAPFIELDSFOUND_ENTRY,
-            "ENTRY: CNapBranch::AllMandatoryNapFieldsFound" );
-
-    TBool retval = ETrue;
-
-    // Check that NAP Address addition is found
-    if ( !iBuffer->CacheFind( KNapAddrUri ) )
-        {
-        retval = EFalse;
-        }
-    // Check that dynamic nap node addition is found
-    if ( !iBuffer->CacheFindDynamicNode( KDynamicNapNode ) )
-        {
-        retval = EFalse;
-        }
-
-    OstTrace1( TRACE_NORMAL, CNAPBRANCH_ALLMANDATORYNAPFIELDSFOUND_EXIT,
-            "EXIT: CNapBranch::AllMandatoryNapFieldsFound;retval=%d", retval );
-
-    return retval;
-    }
-//-----------------------------------------------------------------------------
-// TBool CNapBranch::NapChildURIListL
-// TBool CNapBranch::NapChildURIList( )
-//-----------------------------------------------------------------------------
-void CNapBranch::NapChildURIListL(const TDesC8& aURI, const CArrayFix<
-        TSmlDmMappingInfo>& aPreviousURISegmentList, TInt aResultsRef,
-        TInt aStatusRef, CBufBase& aCurrentURISegmentList)
-    {
-    OstTraceExt1( TRACE_NORMAL, CNAPBRANCH_NAPCHILDURILISTL_ENTRY,
-            "ENTRY: CNapBranch::NapChildURIListL;aURI=%s", aURI );
-
-    RArray<TUint32> CmArray;
-    CleanupClosePushL( CmArray );
-
-    TPtrC8 napTree = CUtils::GetEndOfURIFromSeg( aURI, KCMDdfNAP );
-
-    GetAllConnectionMethodsL( CmArray, *iCmManager );
-
-    for (TInt i = 0; i < CmArray.Count(); i++ )
-        {
-        TBuf8<KBufferExpandSize> addURISeg;
-        if ( !CheckPreviousURIList( aPreviousURISegmentList, CmArray[i], addURISeg ) )
-            {
-            // Connection Method not found in previous URI list                        
-            addURISeg.Append( aURI );
-            addURISeg.Append( KSlash );
-            addURISeg.Append( KDynamicNodePrefix );
-
-            addURISeg.AppendNumFixedWidth( CmArray[i], EDecimal, 3);
-
-            TBuf8<16> addLUID;
-            _LIT8( KFormat, "%d" );    
-            addLUID.Format( KFormat, CmArray[i] );
-
-            OstTraceExt1( TRACE_NORMAL,
-                    CNAPBRANCH_NAPCHILDURILISTL_ADDED_TO_LIST,
-                    "CNapBranch::NapChildURIListL;Added to list: URI=%s", addURISeg );
-
-            iCallback->SetMappingL( addURISeg, addLUID );
-            }
-
-        // Child is the last segment in uri
-        aCurrentURISegmentList.InsertL( aCurrentURISegmentList.Size(),
-                CUtils::GetLastURISeg(addURISeg) );
-        aCurrentURISegmentList.InsertL( aCurrentURISegmentList.Size(), KSlash );
-        }
-    iCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
-    iCallback->SetResultsL( aResultsRef, aCurrentURISegmentList, KNullDesC8 );
-
-    CleanupStack::PopAndDestroy( &CmArray );
-
-    OstTrace0( TRACE_NORMAL, CNAPBRANCH_NAPCHILDURILISTL_EXIT,
-            "EXIT: CNapBranch::NapChildURIListL" );
-    }
-//-----------------------------------------------------------------------------
-// CSmlDmAdapter::TError CNapBranch::DeleteObjectL
-//-----------------------------------------------------------------------------
-CSmlDmAdapter::TError CNapBranch::DeleteObjectL(const TDesC8& aURI,
-        const TDesC8& aLUID)
-    {
-    OstTrace0( TRACE_NORMAL, CNAPBRANCH_DELETEOBJECTL_PRIVATE_ENTRY,
-            "ENTRY: CNapBranch::DeleteObjectL" );
-
-    CSmlDmAdapter::TError status = CSmlDmAdapter::ENotFound;
-
-    // If this is for pre-defined node then get CM id xxx from URI (NAP/NAPIdxxx)
-    TInt cmId = GetCmIdFromURIL( aURI );
-    
-    RCmConnectionMethodExt cm;
-    
-    if( aLUID.Length() > 0 )
-        {       
-        cmId = CUtils::IntLUID( aLUID );
-        }
-
-    // Check, if referred connection method exists           
-    if ( GetConnectionMethodLC( *iCmManager, cm, cmId ) )
-        {
-        cm.DeleteL();
-        status = CSmlDmAdapter::EOk;
-        OstTrace1( TRACE_NORMAL, CNAPBRANCH_DELETEOBJECTL_PRIVATE_DELETE,
-                "CNapBranch::DeleteObjectL; Connection Method=%u deleted.", cmId );
-        }
-
-    CleanupStack::PopAndDestroy( &cm );
-
-    OstTrace1( TRACE_NORMAL, CNAPBRANCH_DELETEOBJECTL_PRIVATE_EXIT,
-            "EXIT: CNapBranch::DeleteObjectL;status=%{TError}", status );
-
-    return status;
-    }
-
-// ======== MEMBER FUNCTIONS ========
-//-----------------------------------------------------------------------------
-// CNapBranch* CNapBranch::NewL( )
-//-----------------------------------------------------------------------------
-CNapBranch* CNapBranch::NewL(MSmlDmCallback* aDmCallback,
-        CAddBuffer* aBuffer, RCmManagerExt* aCmManagerExt)
-    {
-    OstTraceFunctionEntry1( CNAPBRANCH_NEWL_ENTRY, ( TUint )( aDmCallback ) );
-
-    CNapBranch* self = new (ELeave) CNapBranch( aDmCallback );
-    CleanupStack::PushL(self);
-
-    self->ConstructL( aBuffer, aCmManagerExt );
-
-    CleanupStack::Pop(self);
-
-    OstTraceFunctionExit1( CNAPBRANCH_NEWL_EXIT, ( TUint )( self ) );
-    return self;
-    }
-
-//------------------------------------------------------------------------------
-// CNapBranch::CNapBranch()
-//------------------------------------------------------------------------------
-CNapBranch::CNapBranch(MSmlDmCallback* aDmCallback) :
-    CBranchBase(aDmCallback)
-    {
-    OstTraceFunctionEntry1( CNAPBRANCH_CONSTRUCTOR_ENTRY, this );
-
-    iCallback = aDmCallback;
-
-    OstTraceFunctionExit1( CNAPBRANCH_CONSTRUCTOR_EXIT, this );
-    }
-
-//------------------------------------------------------------------------------
-// CNapBranch::~CNapBranch()
-//------------------------------------------------------------------------------
-CNapBranch::~CNapBranch()
-    {
-    OstTraceFunctionEntry1( CNAPBRANCH_DESTRUCTOR_ENTRY, this );
-
-    OstTraceFunctionExit1( CNAPBRANCH_DESTRUCTOR_EXIT, this );
-    }
-
-//=============================================
-//      CNapBranch::ConstructL()
-//      Second phase constructor.
-//=============================================
-void CNapBranch::ConstructL(CAddBuffer* aBuffer, RCmManagerExt* aCmManagerExt)
-    {
-    OstTraceFunctionEntry1( CNAPBRANCH_CONSTRUCTL_ENTRY, this );
-
-    iBuffer = aBuffer;
-    iCmManager = aCmManagerExt;
-
-    OstTraceFunctionExit1( CNAPBRANCH_CONSTRUCTL_EXIT, this );
-    }
-
-//------------------------------------------------------------------------------
-//  void CNapBranch::DDFStructureL()
-//------------------------------------------------------------------------------
-void CNapBranch::DDFStructureL(MSmlDmDDFObject& aDDF)
-    {
-    OstTraceFunctionEntry0( CNAPBRANCH_DDFSTRUCTUREL_ENTRY );
-
-    //
-    // Set rest acceptable operations for data itself
-    //
-    TSmlDmAccessTypes aclTypesNoDelete;
-    aclTypesNoDelete.SetGet();
-    aclTypesNoDelete.SetReplace();
-    aclTypesNoDelete.SetAdd();
-
-    TSmlDmAccessTypes aclTypesNoGet;
-    aclTypesNoGet.SetReplace();
-    aclTypesNoGet.SetAdd();
-    aclTypesNoGet.SetDelete();
-
-    TSmlDmAccessTypes aclTypesOnlyGet;
-    aclTypesOnlyGet.SetGet();
-
-    MSmlDmDDFObject& nIDDDF = aDDF.AddChildObjectL( KCMDdfID ); // ID
-    CUtils::FillNodeInfoL( nIDDDF,
-            aclTypesOnlyGet,
-            MSmlDmDDFObject::EOne,
-            MSmlDmDDFObject::EDynamic,
-            MSmlDmDDFObject::EChr,
-            KNullDesC8 );
-
-    MSmlDmDDFObject& nNameDDF = aDDF.AddChildObjectL( KCMDdfName ); // Name
-    CUtils::FillNodeInfoL( nNameDDF,
-            aclTypesNoDelete,
-            MSmlDmDDFObject::EZeroOrOne,
-            MSmlDmDDFObject::EDynamic,
-            MSmlDmDDFObject::EChr,
-            KNullDesC8 );
-
-    MSmlDmDDFObject& nAddrTypeDDF = aDDF.AddChildObjectL( KCMDdfAddrType ); // AddrType
-    CUtils::FillNodeInfoL( nAddrTypeDDF,
-            aclTypesNoDelete,
-            MSmlDmDDFObject::EZeroOrOne,
-            MSmlDmDDFObject::EDynamic,
-            MSmlDmDDFObject::EChr,
-            KNullDesC8 );
-
-    MSmlDmDDFObject& nAddrDDF = aDDF.AddChildObjectL( KCMDdfAddr ); // Addr
-    CUtils::FillNodeInfoL( nAddrDDF,
-            aclTypesNoDelete,
-            MSmlDmDDFObject::EOne,
-            MSmlDmDDFObject::EDynamic,
-            MSmlDmDDFObject::EChr,
-            KNullDesC8 );
-
-    MSmlDmDDFObject& nIPDDF = aDDF.AddChildObjectL( KCMDdfIP ); // IP
-    CUtils::FillNodeInfoL( nIPDDF,
-            aclTypesNoDelete,
-            MSmlDmDDFObject::EOne,
-            MSmlDmDDFObject::EDynamic,
-            MSmlDmDDFObject::ENode,
-            KNullDesC8 );
-
-    MSmlDmDDFObject& nIPv4DDF = nIPDDF.AddChildObjectL( KCMDdfIPv4 ); // IPv4
-    CUtils::FillNodeInfoL( nIPv4DDF,
-            aclTypesNoDelete,
-            MSmlDmDDFObject::EZeroOrOne,
-            MSmlDmDDFObject::EDynamic,
-            MSmlDmDDFObject::ENode,
-            KNullDesC8 );
-    IpBranchDDFStructureL( nIPv4DDF );
-
-    MSmlDmDDFObject& nAuthInfoDDF = aDDF.AddChildObjectL( KCMDdfAuthInfo ); // AuthInfo
-    CUtils::FillNodeInfoL( nAuthInfoDDF,
-            aclTypesNoDelete,
-            MSmlDmDDFObject::EZeroOrOne,
-            MSmlDmDDFObject::EDynamic,
-            MSmlDmDDFObject::ENode,
-            KNullDesC8 );
-
-    MSmlDmDDFObject& nAuthNameDDF = nAuthInfoDDF.AddChildObjectL( KCMDdfAuthName ); // AuthName
-    CUtils::FillNodeInfoL( nAuthNameDDF,
-            aclTypesNoDelete,
-            MSmlDmDDFObject::EZeroOrOne,
-            MSmlDmDDFObject::EDynamic,
-            MSmlDmDDFObject::EChr,
-            KNullDesC8 );
-
-    MSmlDmDDFObject& nAuthTypeDDF = nAuthInfoDDF.AddChildObjectL( KCMDdfAuthType ); // AuthType
-    CUtils::FillNodeInfoL( nAuthTypeDDF,
-            aclTypesNoDelete,
-            MSmlDmDDFObject::EZeroOrOne,
-            MSmlDmDDFObject::EDynamic,
-            MSmlDmDDFObject::EChr,
-            KNullDesC8 );
-
-    MSmlDmDDFObject& nAuthSecretDDF = nAuthInfoDDF.AddChildObjectL( KCMDdfAuthSecret ); // AuthSecret
-    CUtils::FillNodeInfoL( nAuthSecretDDF,
-            aclTypesNoGet,
-            MSmlDmDDFObject::EZeroOrOne,
-            MSmlDmDDFObject::EDynamic,
-            MSmlDmDDFObject::EChr,
-            KNullDesC8 );
-
-    MSmlDmDDFObject& nBearerTypeDDF = aDDF.AddChildObjectL( KCMDdfBearerType ); // BearerType
-    CUtils::FillNodeInfoL( nBearerTypeDDF,
-            aclTypesNoDelete,
-            MSmlDmDDFObject::EOne,
-            MSmlDmDDFObject::EDynamic,
-            MSmlDmDDFObject::EChr,
-            KNullDesC8 );
-
-    MSmlDmDDFObject& nBearerParamsDDF = aDDF.AddChildObjectL( KCMDdfBearerParams ); // BearerParams
-    CUtils::FillNodeInfoL( nBearerParamsDDF,
-            aclTypesNoDelete,
-            MSmlDmDDFObject::EOne,
-            MSmlDmDDFObject::EDynamic,
-            MSmlDmDDFObject::ENode,
-            KNullDesC8 );
-
-    OstTraceFunctionExit0( CNAPBRANCH_DDFSTRUCTUREL_EXIT );
-    }
-
-// -------------------------------------------------------------------------------------
-// CNapBranch::IpBranchDDFStructureL
-// -------------------------------------------------------------------------------------
-void CNapBranch::IpBranchDDFStructureL(MSmlDmDDFObject& nIPvXDDF)
-    {
-    OstTraceFunctionEntry0( CNAPBRANCH_IPBRANCHDDFSTRUCTUREL_ENTRY );
-
-    //
-    // Set rest acceptable operations for data itself
-    //
-    TSmlDmAccessTypes aclTypesNoDelete;
-    aclTypesNoDelete.SetGet();
-    aclTypesNoDelete.SetReplace();
-    aclTypesNoDelete.SetAdd();
-
-    MSmlDmDDFObject& nAutoConfigDDF = nIPvXDDF.AddChildObjectL( KCMDdfAutoConfig ); // AutoConfig
-    CUtils::FillNodeInfoL( nAutoConfigDDF,
-            aclTypesNoDelete,
-            MSmlDmDDFObject::EZeroOrOne,
-            MSmlDmDDFObject::EDynamic,
-            MSmlDmDDFObject::EChr,
-            KNullDesC8 );
-
-    MSmlDmDDFObject& nIPAddrDDF = nIPvXDDF.AddChildObjectL( KCMDdfIPAddr ); // IPAddr
-    CUtils::FillNodeInfoL( nIPAddrDDF,
-            aclTypesNoDelete,
-            MSmlDmDDFObject::EZeroOrOne,
-            MSmlDmDDFObject::EDynamic,
-            MSmlDmDDFObject::EChr,
-            KNullDesC8 );
-
-    MSmlDmDDFObject& nNetMaskDDF = nIPvXDDF.AddChildObjectL( KCMDdfNetMask ); // NetMask
-    CUtils::FillNodeInfoL( nNetMaskDDF,
-            aclTypesNoDelete,
-            MSmlDmDDFObject::EZeroOrOne,
-            MSmlDmDDFObject::EDynamic,
-            MSmlDmDDFObject::EChr,
-            KNullDesC8 );
-
-    MSmlDmDDFObject& nGatewayDDF = nIPvXDDF.AddChildObjectL( KCMDdfGateway ); // Gateway
-    CUtils::FillNodeInfoL( nGatewayDDF,
-            aclTypesNoDelete,
-            MSmlDmDDFObject::EZeroOrOne,
-            MSmlDmDDFObject::EDynamic,
-            MSmlDmDDFObject::EChr,
-            KNullDesC8 );
-
-    MSmlDmDDFObject& nAutoDNSDDF = nIPvXDDF.AddChildObjectL( KCMDdfAutoDNS ); // AutoDNS
-    CUtils::FillNodeInfoL( nAutoDNSDDF,
-            aclTypesNoDelete,
-            MSmlDmDDFObject::EZeroOrOne,
-            MSmlDmDDFObject::EDynamic,
-            MSmlDmDDFObject::EBool,
-            KNullDesC8 );
-
-    MSmlDmDDFObject& nDNSDDF = nIPvXDDF.AddChildObjectL( KCMDdfDNS ); // DNS
-    CUtils::FillNodeInfoL( nDNSDDF,
-            aclTypesNoDelete,
-            MSmlDmDDFObject::EZeroOrOne,
-            MSmlDmDDFObject::EDynamic,
-            MSmlDmDDFObject::ENode,
-            KNullDesC8 );
-
-    MSmlDmDDFObject& nServersDDF = nDNSDDF.AddChildObjectL( KCMDdfServers ); // Servers
-    CUtils::FillNodeInfoL( nServersDDF,
-            aclTypesNoDelete,
-            MSmlDmDDFObject::EZeroOrOne,
-            MSmlDmDDFObject::EDynamic,
-            MSmlDmDDFObject::ENode,
-            KNullDesC8 );
-
-    MSmlDmDDFObject& nServersRootDDF = nServersDDF.AddChildObjectGroupL(); // Servers/<x>
-    CUtils::FillNodeInfoL( nServersRootDDF,
-            aclTypesNoDelete,
-            MSmlDmDDFObject::EOneOrMore,
-            MSmlDmDDFObject::EDynamic,
-            MSmlDmDDFObject::ENode,
-            KNullDesC8 );
-
-    MSmlDmDDFObject& nAddrDDF = nServersRootDDF.AddChildObjectL( KCMDdfAddr ); // Addr
-    CUtils::FillNodeInfoL( nAddrDDF,
-            aclTypesNoDelete,
-            MSmlDmDDFObject::EOne,
-            MSmlDmDDFObject::EDynamic,
-            MSmlDmDDFObject::EChr,
-            KNullDesC8 );
-
-    OstTraceFunctionExit0( CNAPBRANCH_IPBRANCHDDFSTRUCTUREL_EXIT );
-    }
-
-// -------------------------------------------------------------------------------------
-// CNapBranch::UpdateLeafObjectL
-// -------------------------------------------------------------------------------------
-void CNapBranch::UpdateLeafObjectL(const TDesC8& aURI, const TDesC8& aLUID,
-        const TDesC8& aObject, const TDesC8& /*aType*/, TInt aStatusRef)
-    {
-    OstTraceExt1( TRACE_NORMAL, CNAPBRANCH_UPDATELEAFOBJECTL_ENTRY,
-            "ENTRY: CNapBranch::UpdateLeafObjectL;aURI=%s", aURI );
-
-    // If this is for pre-defined node then get CM id xxx from URI (NAP/NAPIdxxx)
-    TInt cmId = GetCmIdFromURIL( aURI );
-    
-    if ( aLUID.Length() == 0 && cmId == KErrNotFound )
-        {
-            // New node, add to buffer
-            iBuffer->AddNodeToBufferL( aURI, aLUID, aObject, aStatusRef );    
-        }  
-    else
-        {
-        // Existing node, update data immediately
-        TInt err( KErrNone );
-        RCmConnectionMethodExt cm;
-        if ( cmId == KErrNotFound )
-            {
-            cmId = CUtils::IntLUID( aLUID );
-            }
-            
-        TRAP( err, cm = iCmManager->ConnectionMethodL( cmId ) );
-        CleanupClosePushL( cm );
-
-        if ( !err )
-            {
-            OstTrace0( TRACE_NORMAL, CNAPBRANCH_UPDATELEAFOBJECTL, "CNapBranch::UpdateLeafObjectL; Update existing node data immediately." );
-            SetLeafDataL( aURI, aObject, aStatusRef, cm );
-            cm.UpdateL();
-            }
-        else
-            {
-            OstTrace0( TRACE_NORMAL, DUP1_CNAPBRANCH_UPDATELEAFOBJECTL, "CNapBranch::UpdateLeafObjectL; Stale LUID - Buffer setting." );
-            iBuffer->AddNodeToBufferL( aURI, KNullDesC8, aObject, aStatusRef );
-            }
-
-        CleanupStack::PopAndDestroy( &cm );
-        }
-
-    OstTrace0( TRACE_NORMAL, CNAPBRANCH_UPDATELEAFOBJECTL_EXIT,
-            "EXIT: CNapBranch::UpdateLeafObjectL" );
-    }
-
-// -------------------------------------------------------------------------------------
-// CNapBranch::DeleteObjectL
-// -------------------------------------------------------------------------------------
-void CNapBranch::DeleteObjectL(const TDesC8& aURI, const TDesC8& aLUID,
-        TInt aStatusRef)
-    {
-    OstTraceExt1( TRACE_NORMAL, CNAPBRANCH_DELETEOBJECTL_ENTRY,
-            "ENTRY: CNapBranch::DeleteObjectL;aURI=%s", aURI );
-
-    CSmlDmAdapter::TError status = CSmlDmAdapter::EError;
-
-    TPtrC8 napTree = CUtils::GetEndOfURIFromSeg( aURI, KCMDdfNAP );
-
-    if ( napTree.Match( KDynamicNapNode ) != KErrNotFound &&
-            napTree.Match( KDynamicNapNodeChildUri ) == KErrNotFound )
-        {
-
-        status = DeleteObjectL( aURI, aLUID );
-
-        }
-
-    iCallback->SetStatusL( aStatusRef, status );
-
-    OstTrace1( TRACE_NORMAL, CNAPBRANCH_DELETEOBJECTL_EXIT,
-            "EXIT: CNapBranch::DeleteObjectL;status=%{TError}", status );
-    }
-
-// -------------------------------------------------------------------------------------
-// CNapBranch::FetchLeafObjectL
-// -------------------------------------------------------------------------------------
-void CNapBranch::FetchLeafObjectL(const TDesC8& aURI, const TDesC8& aLUID,
-        const TDesC8& aType, TInt aResultsRef, TInt aStatusRef)
-    {
-    OstTraceExt1( TRACE_NORMAL, CNAPBRANCH_FETCHLEAFOBJECTL_ENTRY,
-            "ENTRY: CNapBranch::FetchLeafObjectL;aURI=%s", aURI );
-    TInt cmId( KErrNotFound );
-    if ( aLUID.Length() > 0 )
-         {
-         cmId = CUtils::IntLUID( aLUID );      
-         }
-     else
-         {
-         // If this is for pre-defined node then get CM id xxx from URI (NAP/NAPIdxxx)
-         cmId = GetCmIdFromURIL( aURI );
-         }
-    if ( cmId != KErrNotFound )
-        {
-        CBufBase* result = CBufFlat::NewL( KBufferExpandSize );
-        CleanupStack::PushL( result );
-
-        // Open connection method.
-        RCmConnectionMethodExt cm;
-        TRAPD(err, cm = iCmManager->ConnectionMethodL( cmId ) );
-        if (err != KErrNone )
-            {
-            CleanupStack::PopAndDestroy( result );
-            iCallback->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-            OstTrace0( TRACE_NORMAL, CNAPBRANCH_DUP_FETCHLEAFOBJECTL_NOT_FOUND, "CSmlDmAdapter::ENotFound" );
-            return;
-            }
-        CleanupClosePushL( cm );
-
-        // Find data from CM
-        CSmlDmAdapter::TError status = GetLeafDataL( aURI,
-                cm,
-                result );
-
-        OstTrace1( TRACE_NORMAL, CNAPBRANCH_FETCHLEAFOBJECTL_STATUS,
-                "CNapBranch::FetchLeafObjectL;status=%{TError}", status );
-
-        if ( status == CSmlDmAdapter::EOk )
-            {
-            iCallback->SetResultsL( aResultsRef, *result, aType );
-            }
-        iCallback->SetStatusL( aStatusRef, status );
-
-        CleanupStack::PopAndDestroy( &cm );
-        CleanupStack::PopAndDestroy( result );
-        }
-    else
-        {
-        iCallback->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-        OstTrace0( TRACE_NORMAL, CNAPBRANCH_FETCHLEAFOBJECTL_NOT_FOUND, "CSmlDmAdapter::ENotFound" );
-        }
-    OstTrace0( TRACE_NORMAL, CNAPBRANCH_FETCHLEAFOBJECTL_EXIT, "EXIT: CNapBranch::FetchLeafObjectL" );
-    }
-
-// -------------------------------------------------------------------------------------
-// CNapBranch::FetchLeafObjectSizeL
-// -------------------------------------------------------------------------------------
-void CNapBranch::FetchLeafObjectSizeL(const TDesC8& aURI,
-        const TDesC8& aLUID, const TDesC8& aType, TInt aResultsRef,
-        TInt aStatusRef)
-    {
-    OstTraceExt1( TRACE_NORMAL, CNAPBRANCH_FETCHLEAFOBJECTSIZEL_ENTRY,
-            "ENTRY: CNapBranch::FetchLeafObjectSizeL;aURI=%s", aURI );
-    TInt cmId( KErrNotFound );
-    if ( aLUID.Length() > 0 )
-         {
-         cmId = CUtils::IntLUID( aLUID );        
-         }
-     else
-         {
-         // If this is for pre-defined node then get CM id xxx from URI (NAP/NAPIdxxx)
-         cmId = GetCmIdFromURIL( aURI );
-         }
-    if ( cmId != KErrNotFound )
-        {
-        CBufBase* result = CBufFlat::NewL( KBufferExpandSize );
-        CleanupStack::PushL(result);
-
-        // Open connection method.
-        RCmConnectionMethodExt cm;
-        TRAPD(err, cm = iCmManager->ConnectionMethodL( cmId ) );
-        if (err != KErrNone )
-            {
-            CleanupStack::PopAndDestroy( result );
-            iCallback->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-            OstTrace0( TRACE_NORMAL, CNAPBRANCH_DUP1_FETCHLEAFOBJECTL_NOT_FOUND, "CSmlDmAdapter::ENotFound" );
-            return;
-            }
-        CleanupClosePushL( cm );
-
-        // Find data from CM
-        CSmlDmAdapter::TError status = GetLeafDataL( aURI,
-                cm,
-                result );
-
-        OstTrace1( TRACE_NORMAL, CNAPBRANCH_FETCHLEAFOBJECTSIZEL_STATUS,
-                "CNapBranch::FetchLeafObjectSizeL;status=%{TError}", status );
-
-        if ( status == CSmlDmAdapter::EOk )
-            {
-            TInt size = result->Size();
-            TBuf8<KMaxResultSize> sizeStr;
-            sizeStr.AppendNum( size );
-
-            result->Reset();
-            result->InsertL( 0, sizeStr );
-
-            iCallback->SetResultsL( aResultsRef, *result, aType);
-            }
-        iCallback->SetStatusL( aStatusRef, status );
-
-        CleanupStack::PopAndDestroy( &cm );
-        CleanupStack::PopAndDestroy( result );
-        }
-    else
-        {
-        iCallback->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-        OstTrace0( TRACE_NORMAL, CNAPBRANCH_FETCHLEAFOBJECTSIZEL_NOT_FOUND,
-                "CNapBranch::FetchLeafObjectSizeL;CSmlDmAdapter::ENotFound" );
-        }
-    OstTrace0( TRACE_NORMAL, CNAPBRANCH_FETCHLEAFOBJECTSIZEL_EXIT,
-            "EXIT: CNapBranch::FetchLeafObjectSizeL" );
-    }
-
-// -------------------------------------------------------------------------------------
-// CNapBranch::ChildURIListL
-// -------------------------------------------------------------------------------------
-void CNapBranch::ChildURIListL(const TDesC8& aURI, const TDesC8& aLUID,
-        const CArrayFix<TSmlDmMappingInfo>& aPreviousURISegmentList,
-        TInt aResultsRef, TInt aStatusRef)
-    {
-    OstTraceExt1( TRACE_NORMAL, CNAPBRANCH_CHILDURILISTL_ENTRY,
-            "ENTRY: CNapBranch::ChildURIListL;aURI=%s", aURI );
-    
-       
-    TPtrC8 napTree = CUtils::GetEndOfURIFromSeg( aURI,KCMDdfNAP );
-
-    CBufBase* currentURISegmentList = CBufFlat::NewL( KSmlMaxURISegLen );
-    CleanupStack::PushL( currentURISegmentList );    
-    
-    // First handle ./NAP as a special case
-    if ( napTree.Match( KCMDdfNAP ) != KErrNotFound )
-        {
-        NapChildURIListL( aURI,
-                aPreviousURISegmentList,
-                aResultsRef,
-                aStatusRef,
-                *currentURISegmentList );
-        CleanupStack::PopAndDestroy( currentURISegmentList );
-        return;
-        }
-
-    // Then check if the CM exists. Use LUID or predefined ID    
-    TInt cmId( KErrNotFound );
-    if ( aLUID.Length() > 0 )
-        {
-        cmId = CUtils::IntLUID( aLUID );
-        }
-    else
-        {
-        // If this is for pre-defined node then get CM id xxx from URI (NAP/NAPIdxxx)
-        cmId = GetCmIdFromURIL( aURI );
-        }
-    // If after this cmId is still not found then the branch does not exist
-    if ( cmId == KErrNotFound )
-        {
-        iCallback->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-        CleanupStack::PopAndDestroy( currentURISegmentList );
-        OstTrace0( TRACE_NORMAL, DUP1_CNAPBRANCH_CHILDURILISTL, "CNapBranch::ChildURIListL; CSmlDmAdapter::ENotFound" );
-        return;
-        }
-    
-    RCmConnectionMethodExt cm;
-    // Check it the method actually can be found      
-    if ( !GetConnectionMethodLC( *iCmManager, cm, cmId ) )       
-        {
-        iCallback->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-        CleanupStack::PopAndDestroy( &cm );
-        CleanupStack::PopAndDestroy( currentURISegmentList );        
-        OstTrace0( TRACE_NORMAL, DUP2_CNAPBRANCH_CHILDURILISTL, "CNapBranch::ChildURIListL; CSmlDmAdapter::ENotFound" );
-        return;
-        }            
-    CleanupStack::PopAndDestroy( &cm );    
-            
-    if ( napTree.Match( KDynamicNapNode ) != KErrNotFound &&
-            napTree.Match( KDynamicNapNodeChildUri ) == KErrNotFound )
-        {
-        currentURISegmentList->InsertL( currentURISegmentList->Size(), KCMNapFields ); 
-        iCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
-        iCallback->SetResultsL( aResultsRef, *currentURISegmentList, KNullDesC8 );        
-        }
-    // ./NAP/*/IP
-
-    else if ( napTree.Match( KDynamicIPNode ) != KErrNotFound &&
-            napTree.Match( KDynamicIPNodeChildUri ) == KErrNotFound )
-        {
-        currentURISegmentList->InsertL( currentURISegmentList->Size(), KCMNIPFields );
-        iCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
-        iCallback->SetResultsL( aResultsRef, *currentURISegmentList, KNullDesC8 );
-        }
-    // ./NAP/*/IP/IPv4
-
-    else if ( napTree.Match( KDynamicIPv4Node ) != KErrNotFound &&
-            napTree.Match( KDynamicIPv4NodeChildUri ) == KErrNotFound )
-        {
-        currentURISegmentList->InsertL( currentURISegmentList->Size(), KCMNIPv4Fields );
-        iCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
-        iCallback->SetResultsL( aResultsRef, *currentURISegmentList, KNullDesC8 );
-        }
-    // ./NAP/*/IP/IPv4/DNS
-
-    else if ( napTree.Match( KDynamicIPv4DnsNode ) != KErrNotFound &&
-            napTree.Match( KDynamicIPv4DnsNodeChildUri ) == KErrNotFound )
-        {
-        currentURISegmentList->InsertL( currentURISegmentList->Size(), KCMNDNSFields );
-        iCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
-        iCallback->SetResultsL( aResultsRef, *currentURISegmentList, KNullDesC8 );
-        }
-    // ./NAP/*/IP/IPv4/DNS/Servers
-
-    else if ( napTree.Match( KDynamicIPv4DnsServersNode ) != KErrNotFound )
-        {
-        GetAllDynamicNodesL( aURI,
-                aLUID,
-                aPreviousURISegmentList,
-                aResultsRef,
-                aStatusRef,
-                *iCmManager,
-                *currentURISegmentList,
-                KCMDdfServer,
-                KMaxDnsAddr,
-                iCallback );
-        }
-    // ./NAP/*/IP/IPv4/DNS/Servers*
-
-    else if ( napTree.Match( KDynamicIPv4DnsServersNodeChildUri ) != KErrNotFound &&
-            napTree.Match( KDynamicIPv4DnsServersNodeChildUriNodes ) == KErrNotFound )
-        {
-        currentURISegmentList->InsertL( currentURISegmentList->Size(), KCMNDNSServersFields ); 
-        iCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
-        iCallback->SetResultsL( aResultsRef, *currentURISegmentList, KNullDesC8 );
-        }
-    // ./NAP/*/AuthInfo
-
-    else if ( napTree.Match( KDynamicAuthInfoNode ) != KErrNotFound &&
-            napTree.Match( KDynamicAuthInfoNodeChildUri ) == KErrNotFound )
-        {
-        currentURISegmentList->InsertL( currentURISegmentList->Size(), KCMNAuthInfoFields );
-        iCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
-        iCallback->SetResultsL( aResultsRef, *currentURISegmentList, KNullDesC8 );
-        }
-    else
-        {
-        iCallback->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-        OstTrace0( TRACE_NORMAL, CNAPBRANCH_CHILDURILISTL,
-                "CNapBranch::ChildURIListL; CSmlDmAdapter::ENotFound" );
-        }
-
-    CleanupStack::PopAndDestroy( currentURISegmentList );
-
-    OstTrace0( TRACE_NORMAL, DUP1_CNAPBRANCH_CHILDURILISTL_EXIT,
-            "EXIT: CNapBranch::ChildURIListL" );
-    }
-
-// -------------------------------------------------------------------------------------
-// CNapBranch::AddNodeObjectL
-// -------------------------------------------------------------------------------------
-void CNapBranch::AddNodeObjectL(const TDesC8& aURI,
-        const TDesC8& aParentLUID, TInt aStatusRef)
-    {
-    OstTraceExt1( TRACE_NORMAL, CNAPBRANCH_ADDNODEOBJECTL_ENTRY,
-            "ENTRY: CNapBranch::AddNodeObjectL;aURI=%s", aURI );
-
-    if ( aParentLUID.Length() == 0 )
-        {        
-        // If this is for pre-defined node then get CM id xxx from URI (NAP/NAPIdxxx)
-        TInt cmId = GetCmIdFromURIL( aURI );
-        RCmConnectionMethodExt cm;
-        // Check if CM exists
-        if ( cmId != KErrNotFound && GetConnectionMethodLC( *iCmManager, cm, cmId ) )
-            {
-            CleanupStack::PopAndDestroy( &cm );
-            // Pre-defined CM already exists for this ID.
-            // NAPs must be added in one message. If luid is given add is done to existing AP or node
-            iCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EAlreadyExists );
-            OstTrace0( TRACE_NORMAL, CNAPBRANCH_ADDNODEOBJECTL, 
-                    "CNapBranch::AddNodeObjectL; CSmlDmAdapter::EAlreadyExists because tried to add in predefined node format that exists" );
-            return;
-            }                          
-        if ( cmId != KErrNotFound )
-            {
-            CleanupStack::PopAndDestroy( &cm );
-            }
-
-        // New node, add to buffer
-        iBuffer->AddNodeToBufferL( aURI, aParentLUID, aStatusRef );
-        //iCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
-        OstTrace0( TRACE_NORMAL, CNAPBRANCH_ADDNODEOBJECTL_NEW_NODE,
-                "CNapBranch::AddNodeObjectL;New node -> Add to buffer." );
-        }
-    else
-        {
-        // Sanity check: If the dynamic name of the NAP node has is the same as deleted previously and
-        // DM Framework hasn't updated the tree, it will give the LUID when calling this method. Thus,
-        // it's needed to check that the connection method really exists.
-        TBuf8<KSmlMaxURISegLen> parentLUID;
-        parentLUID.Zero();
-        parentLUID = aParentLUID;
-        RCmConnectionMethodExt cm;               
-        if ( !GetConnectionMethodLC( *iCmManager, cm,  CUtils::IntLUID( parentLUID) ) )
-            {            
-			if(aParentLUID.Length() > 0)
-				{
-				TInt ret = iCallback->RemoveMappingL(KConnMoAdapterUid,
-							GetDynamicNAPNodeUri( aURI ), ETrue );
-				if(ret)
-					{
-					iCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-					CleanupStack::PopAndDestroy( &cm );
-					return;
-					}				
-				}
-			// New node, add to buffer
-            iBuffer->AddNodeToBufferL( aURI, KNullDesC8, aStatusRef );
-            OstTrace0( TRACE_NORMAL, CNAPBRANCH_ADDNODEOBJECTL_NEW_NODE2,
-                    "CNapBranch::AddNodeObjectL;New node -> Add to buffer." );
-            }
-        else
-            {
-            // NAPs must be added in one message. If luid is given add is done to existing AP or node
-            iCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EAlreadyExists );
-            OstTrace0( TRACE_NORMAL, CNAPBRANCH_ADDNODEOBJECTL_ALLREADY_EXISTS,
-                    "CNapBranch::AddNodeObjectL; CSmlDmAdapter::EAlreadyExists" );
-            }
-
-        CleanupStack::PopAndDestroy( &cm );
-        }
-    OstTrace0( TRACE_NORMAL, CNAPBRANCH_ADDNODEOBJECTL_EXIT, "EXIT: CNapBranch::AddNodeObjectL" );
-
-    }
-
-// -------------------------------------------------------------------------------------
-// CNapBranch::ProcessNodeBufferL()
-// -------------------------------------------------------------------------------------
-void CNapBranch::ProcessBufferL()
-    {
-    OstTrace0( TRACE_NORMAL, CNAPBRANCH_PROCESSBUFFERL_ENTRY, "ENTRY: CNapBranch::ProcessBufferL" );
-
-    TUint32 bearerType;
-
-    RPointerArray<CConnMoNodeElement> napNodes( KNumOfNAPNodes );
-    CleanupClosePushL( napNodes );
-
-    while ( iBuffer->GetGroup( KCMDdfNAP, &napNodes ) != KErrNotFound )
-        {
-
-        if ( FindNewCmType( bearerType ) && AllMandatoryNapFieldsFound() )
-            {
-            // Create new connection method and update nodes
-            RCmConnectionMethodExt cm = iCmManager->CreateConnectionMethodL( bearerType );
-            CleanupClosePushL( cm );
-            cm.UpdateL();
-
-            for ( TInt i = 0; i < napNodes.Count(); ++i )
-                {
-                if ( napNodes[i]->iLeaf )
-                    {
-                    // Leaf data found
-                    SetLeafDataL( napNodes[i]->iUri,
-                            napNodes[i]->iObject,
-                            napNodes[i]->iStatusRef, cm );
-                    napNodes[i]->iProcessed = ETrue;
-                    }
-                else
-                    {
-                    // Node has no leaf data
-                    SetNodeDataL( napNodes[i], cm);
-                    napNodes[i]->iProcessed = ETrue;
-                    }
-                }
-            cm.UpdateL();
-            CleanupStack::PopAndDestroy( &cm );
-            }
-        else
-            {
-            for ( TInt i = 0; i < napNodes.Count(); ++i )
-                {
-                iCallback->SetStatusL( napNodes[i]->iStatusRef, CSmlDmAdapter::EError );
-                napNodes[i]->iProcessed = ETrue;
-                }
-            }
-        napNodes.Reset();
-        }
-    CleanupStack::Pop( &napNodes );
-    napNodes.Close();
-
-    OstTrace0( TRACE_NORMAL, CNAPBRANCH_PROCESSBUFFERL_EXIT, "EXIT: CNapBranch::ProcessBufferL" );
-
-    }
-
-//------------------------------------------------------------------------------
-// TPtrC8 CUtils::GetDynamicAPNodeUri( const TDesC8& aURI )
-// returns NAP/xxx URI
-//------------------------------------------------------------------------------
-TPtrC8 CNapBranch::GetDynamicNAPNodeUri(const TDesC8& aURI)
-    {
-
-    OstTraceExt1( TRACE_NORMAL, CNAPBRANCH_GETDYNAMICNAPNODEURI, "CNapBranch::GetDynamicNAPNodeUri;aURI=%s", aURI );
-
-    TInt i= 0;
-    for ( i = aURI.Find( KCMDdfNAP ) + 4; i < aURI.Length(); i++ )
-        {
-        if( aURI[i] == '/' )
-            {
-            break;
-            }
-        }
-    OstTraceExt1( TRACE_NORMAL, DUP1_CNAPBRANCH_GETDYNAMICNAPNODEURI, "CNapBranch::GetDynamicNAPNodeUri;return URI=%s", aURI.Left( i ) );
-
-    return aURI.Left( i );
-    }
-
-//--------------------------------------------------------------------
-//TInt CNapBranch::IsNAPUriFormatMatchPredefined(const TDesC8 & aURI)
-//
-//-------------------------------------------------------------------
-
-
-TBool CNapBranch::IsNAPUriFormatMatchPredefined(const TDesC8 & aURI)
-{
-    if( aURI.Match( _L8( "NAP/NAPId*" ) ) != KErrNotFound )
-    {
-        return ETrue;
-    }
-    else
-    {
-        return EFalse;
-    }
-}
-//------------------------------------------------------------------------------
-// TUint32 CNapBranch::GetAPIdFromURIL(const TDesC8& aURI)
-//         Get NAP id for given aURI
-//------------------------------------------------------------------------------
-TInt CNapBranch::GetCmIdFromURIL(const TDesC8& aURI)
-    {
-    TInt ret(KErrNotFound);
-    
-    if( !IsNAPUriFormatMatchPredefined( aURI ) )
-        {
-        // Cannot get CmIds from any other format URIs than predefined
-        return ret;
-        }
-   
-    TLex8 lex;
-    //  Find xxx from ./NAP/NAPIdxxx/...    
-    TInt start = aURI.Find( KDynamicNodePrefix ) + KDynamicNodePrefix().Length();
-    lex = aURI.Mid( start, 3 );
-    lex.Val( ret );
-    
-    return ret;
-    }
--- a/omadm/omadmextensions/adapters/connmoadapter/src/ProxyBranch.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1112 +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 "Eclipse Public License v1.0"
- * which accompanies 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 <e32base.h>
-#include <cmconnectionmethoddef.h>
-#include <nsmldmtreedbclient.h>
-
-#include "ProxyBranch.h"
-#include "Utils.h"
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "ProxyBranchTraces.h"
-#endif
-
-// ------------------------------------------------------------------------------------------------
-// Constants
-// ------------------------------------------------------------------------------------------------
-_LIT8( KCMProxyDdf,             "Proxy" );
-_LIT8( KCMProxyDdfProxyId,      "ProxyId" );
-_LIT8( KCMProxyDdfName,         "Name" );
-_LIT8( KCMProxyDdfAddr,         "Addr" );
-_LIT8( KCMProxyDdfToConRef,     "ToConRef" );
-_LIT8( KCMProxyDdfConRef,       "ConRef" );
-_LIT8( KCMProxyDdfPorts,        "Ports" );
-_LIT8( KCMProxyDdfPortNbr,      "PortNbr" );
-_LIT8( KCMProxyDdfProxyParams,  "ProxyParams" );
-_LIT8( KCMProxyDdfProxyType,    "ProxyType" );
-_LIT8( KCMProxyDdfWap,          "WAP" );
-_LIT8( KCMProxyDdfStartpg,      "Startpg" );
-
-_LIT8( KCMProxyFields,          "ProxyId/Addr/ToConRef/Ports/ProxyType/ProxyParams" );
-_LIT8( KCMProxyParamsFields,    "WAP" );
-_LIT8( KCMProxyWapFields,       "Startpg" );
-_LIT8( KCMProxyNodeSeparator,   "/" );
-
-_LIT8( KDynamicProxyNodePattern,            "Proxy/*" );
-_LIT8( KDynamicProxyNodeChildUri,           "Proxy/*/*" );
-_LIT8( KDynamicToConrefNode,                "Proxy/*/ToConRef" ); 
-_LIT8( KDynamicToConrefNodeChildUri,        "Proxy/*/ToConRef/*" ); 
-_LIT8( KDynamicToConrefNodeChildUriNodes,   "Proxy/*/ToConRef/*/*" );
-_LIT8( KDynamicPortsNode,                   "Proxy/*/Ports" );
-_LIT8( KDynamicPortsNodeChildUri,           "Proxy/*/Ports/*" );
-_LIT8( KDynamicPortsNodeChildUriNodes,      "Proxy/*/Ports/*/*" );
-_LIT8( KDynamicProxyParamsNode,             "Proxy/*/ProxyParams" );
-_LIT8( KDynamicProxyParamsNodeChildUri,     "Proxy/*/ProxyParams/*" );
-_LIT8( KDynamicProxyParamsWapNode,          "Proxy/*/ProxyParams/WAP" );
-
-_LIT8( KProxyAddrUri,                     "Proxy/*/Addr");
-_LIT8( KProxyConrefUri,                   "Proxy/*/ConRef");
-
-_LIT8( KRoot,                             "./");
-
-TInt const KBufferExpandSize = 128;
-TInt const KNumOfProxyNodes = 8;
-
-_LIT8( KDynamicNodePrefix,                  "ProxyId");
-
-// ======== LOCAL FUNCTIONS =========
-
-//-----------------------------------------------------------------------------
-// CSmlDmAdapter::TError CProxyBranch::FetchLeafObjectL()
-//-----------------------------------------------------------------------------
-CSmlDmAdapter::TError CProxyBranch::FetchLeafObjectL( const TDesC8& aURI,
-                                                      const TDesC8& aLUID,
-                                                      CBufBase& aLeafObject )
-    {
-    OstTraceExt1( TRACE_NORMAL, CPROXYBRANCH_FETCHLEAFOBJECTL_ENTRY, 
-                  "ENTRY: CProxyBranch::FetchLeafObjectL;aURI=%s", aURI );
-    
-    RCmConnectionMethodExt cm;    
-    CSmlDmAdapter::TError status = CSmlDmAdapter::ENotAllowed;
-    TPtrC8 leafNode = CUtils::GetLastURISeg( aURI );
-    TInt cmId( KErrNotFound );
-    if ( aLUID.Length() > 0 )
-         {
-         cmId = CUtils::IntLUID( aLUID );         
-         }
-     else
-         {
-         // If this is for pre-defined node then get CM id xxx from URI (NAP/NAPIdxxx)
-         cmId = GetCmIdFromURIL( aURI );
-         }
-    
-    if ( cmId == KErrNotFound || !GetConnectionMethodLC( *iCmManager, cm, cmId ) || 
-            !cm.GetBoolAttributeL(CMManager::ECmProxyUsageEnabled) )
-        {
-        if ( cmId != KErrNotFound )
-            {
-            CleanupStack::PopAndDestroy( &cm );
-            }
-        status = CSmlDmAdapter::ENotFound;
-        
-        OstTrace1( TRACE_NORMAL, CPROXYBRANCH_FETCHLEAFOBJECTL_NOT_FOUND, 
-                   "CProxyBranch::FetchLeafObjectL;status=%{TError}", status );
-        
-        return status;
-        }
-    
-    if ( leafNode.Compare( KCMProxyDdfAddr ) == 0 )
-        {
-        HBufC* serverName = cm.GetStringAttributeL( CMManager::ECmProxyServerName );
-        
-        CleanupStack::PushL( serverName );
-        aLeafObject.InsertL( 0, CUtils::ConvertTo8LC( *serverName ) );
-        
-        CleanupStack::PopAndDestroy(); // CUtils::ConvertTo8LC
-        CleanupStack::PopAndDestroy( serverName );
-        
-        status = CSmlDmAdapter::EOk;
-        }
-    else if ( leafNode.Compare( KCMProxyDdfConRef ) == 0 )
-        {
-        TBuf8<KBufferExpandSize> conRef;
-        TBuf8<KBufferExpandSize> napChildList;
-        CBufBase* napChildListBuf = CBufFlat::NewL( KSmlMaxURISegLen );
-        CleanupStack::PushL( napChildListBuf );      
-        
-        // Get all NAP node childs
-        iCallback->FetchLinkL( _L8("./NAP"), *napChildListBuf,  status );
-        napChildListBuf->Read( 0, napChildList, napChildListBuf->Size() );
-        
-        if ( status == CSmlDmAdapter::EOk)
-            {
-            // Reset operation end status 
-            status = CSmlDmAdapter::EError;
-            
-            // Find correct Uri
-            while ( napChildList.Length() > 0 && status != CSmlDmAdapter::EOk )
-                {
-                conRef.Append( _L("NAP/") );
-                CUtils::AppendFirstURISeg( napChildList, conRef );
-                HBufC8* napLuid = iCallback->GetLuidAllocL( conRef );
-                if ( cmId == CUtils::IntLUID( *napLuid ) )
-                    {
-                    status = CSmlDmAdapter::EOk;
-                    aLeafObject.InsertL( 0, conRef );
-                    }
-                delete napLuid;
-                conRef.Delete( 0, conRef.Length() );
-                }
-            }
-        
-        CleanupStack::PopAndDestroy( napChildListBuf );
-        }
-    else if ( leafNode.Compare( KCMProxyDdfPortNbr ) == 0 )
-        {
-        TInt proxyPort = cm.GetIntAttributeL( CMManager::ECmProxyPortNumber );
-                        
-        aLeafObject.InsertL( 0, CUtils::IntToCharL( proxyPort ) );
-        CleanupStack::PopAndDestroy();
-                
-        status = CSmlDmAdapter::EOk;
-        }
-    else if ( leafNode.Compare( KCMProxyDdfStartpg ) == 0 )
-        {
-        HBufC* startPage = cm.GetStringAttributeL( CMManager::ECmStartPage );
-        
-        CleanupStack::PushL( startPage );
-        aLeafObject.InsertL( 0, CUtils::ConvertTo8LC( *startPage ) );
-        
-        CleanupStack::PopAndDestroy(); // CUtils::ConvertTo8LC
-        CleanupStack::PopAndDestroy( startPage );
-        
-        status = CSmlDmAdapter::EOk;
-        }
-    else if ( leafNode.Compare( KCMProxyDdfProxyType ) == 0 )
-        {
-        HBufC* protocolName = cm.GetStringAttributeL( CMManager::ECmProxyProtocolName );
-        
-        CleanupStack::PushL( protocolName );
-        aLeafObject.InsertL( 0, CUtils::ConvertTo8LC( *protocolName ) );
-        
-        CleanupStack::PopAndDestroy(); // CUtils::ConvertTo8LC
-        CleanupStack::PopAndDestroy( protocolName );
-        
-        status = CSmlDmAdapter::EOk;
-        }
-    else if ( leafNode.Compare( KCMProxyDdfProxyId ) == 0 )
-        {
-        TPtrC8 dynamicNode = GetDynamicProxyNodeUri( aURI );
-        aLeafObject.InsertL( 0, dynamicNode );
-        status = CSmlDmAdapter::EOk;
-        }
-
-    CleanupStack::PopAndDestroy( &cm );
-    
-    OstTrace1( TRACE_NORMAL, CPROXYBRANCH_FETCHLEAFOBJECTL_EXIT, 
-               "EXIT: CProxyBranch::FetchLeafObjectL;status=%{TError}", status );
-    return status;
-    }
-
-//-----------------------------------------------------------------------------
-// TUint32 CProxyBranch::CheckForUnmodifiableField()
-//-----------------------------------------------------------------------------
-CSmlDmAdapter::TError CProxyBranch::CheckForUnmodifiableField(const TDesC8& aUri)
-    {
-    OstTraceExt1( TRACE_NORMAL, CPROXYBRANCH_CHECKFORUNMODIFIABLEFIELD_ENTRY, 
-                  "ENTRY: CProxyBranch::CheckForUnmodifiableField;aUri=%s", aUri );
-    
-    CSmlDmAdapter::TError retval(CSmlDmAdapter::ENotFound);
-    TPtrC8 nodeName = CUtils::GetLastURISeg(aUri);
-       
-    if ( nodeName.Match(KCMProxyDdfName) != KErrNotFound ||
-         nodeName.Match(KCMProxyDdfConRef) != KErrNotFound  )
-        {
-        retval = CSmlDmAdapter::EOk;
-        }
-    
-    OstTrace1( TRACE_NORMAL, CPROXYBRANCH_CHECKFORUNMODIFIABLEFIELD_EXIT, 
-               "EXIT: CProxyBranch::CheckForUnmodifiableField;retval=%{TError}", retval );
-    
-    return retval;
-    }
-//-----------------------------------------------------------------------------
-// TBool CProxyBranch::MapUriToCmAttribute()
-//-----------------------------------------------------------------------------
-TUint32 CProxyBranch::MapUriToCmAttribute( const TDesC8& aUri )
-    {
-    OstTraceExt1( TRACE_NORMAL, CPROXYBRANCH_MAPURITOCMATTRIBUTE_ENTRY, 
-                  "ENTRY: CProxyBranch::MapUriToCmAttribute;aUri=%s", aUri );
-    
-    TUint32 retval(0);
-    
-    TPtrC8 nodeName = CUtils::GetLastURISeg( aUri );
-    
-    if ( nodeName.Match( KCMProxyDdfAddr )!= KErrNotFound )
-        {
-        retval = CMManager::ECmProxyServerName;
-        }
-    else if ( nodeName.Match( KCMProxyDdfPortNbr ) != KErrNotFound )
-        {
-        retval = CMManager::ECmProxyPortNumber; 
-        }
-    else if ( nodeName.Match( KCMProxyDdfStartpg ) != KErrNotFound )
-        {
-        retval = CMManager::ECmStartPage;
-        }
-    else if ( nodeName.Match( KCMProxyDdfProxyType ) != KErrNotFound )
-            {
-            retval = CMManager::ECmProxyProtocolName;
-            }
-    
-    OstTrace1( TRACE_NORMAL, CPROXYBRANCH_MAPURITOCMATTRIBUTE_EXIT, 
-               "EXIT: CProxyBranch::MapUriToCmAttribute;retval=%{TConnectionMethodCommonAttributes}", 
-               retval );
-    
-    return retval;
-    }
-//-----------------------------------------------------------------------------
-// TInt32 CProxyBranch::FindConnectionMethodL()
-//-----------------------------------------------------------------------------
-TInt32 CProxyBranch::FindConnectionMethodL()
-    {
-    OstTrace0( TRACE_NORMAL, CPROXYBRANCH_FINDCONNECTIONMETHODL_ENTRY, 
-               "ENTRY: CProxyBranch::FindConnectionMethod" );
-    
-    TInt32 retval = KErrNotFound;
-    
-    CConnMoNodeElement* processNode = iBuffer->CacheFind( KProxyConrefUri );
-    
-    if ( processNode )
-        {
-        
-        HBufC8* luid;
-        
-        // Ignore root part ("./") of the URI if present in the beginning
-        if ( processNode->iObject.Mid( 0, 2 ).Match( KRoot ) != KErrNotFound )
-            {
-            luid = iCallback->GetLuidAllocL( processNode->iObject.Mid( 2 ) );
-            }
-        else
-            {
-            luid = iCallback->GetLuidAllocL( processNode->iObject );
-            }
-        
-        retval = CUtils::IntLUID( *luid );
-        
-        delete luid;
-        
-        }
-    
-    OstTrace1( TRACE_NORMAL, CPROXYBRANCH_FINDCONNECTIONMETHODL_EXIT, 
-               "EXIT: CProxyBranch::FindConnectionMethod;CmId=%d", retval );
-    
-    return retval;
-    }
-//-----------------------------------------------------------------------------
-// TBool CProxyBranch::AllMandatoryProxyFieldsFound()
-//-----------------------------------------------------------------------------
-TBool CProxyBranch::AllMandatoryProxyFieldsFound()
-    {
-    OstTrace0( TRACE_NORMAL, CPROXYBRANCH_ALLMANDATORYPROXYFIELDSFOUND_ENTRY, 
-               "ENTRY: CProxyBranch::AllMandatoryProxyFieldsFound" );
-    
-    TBool retval = ETrue;
-
-    // Check that NAP Address addition is found
-    if ( !iBuffer->CacheFind(KProxyAddrUri) )
-        {
-        retval = EFalse;
-        }
-    if ( !iBuffer->CacheFind(KProxyConrefUri) )
-        {
-        retval = EFalse;
-        }
-    // Check that dynamic nap node addition is found
-    if ( !iBuffer->CacheFindDynamicNode(KDynamicProxyNodePattern) )
-        {
-        retval = EFalse;
-        }
-    OstTrace1( TRACE_NORMAL, CPROXYBRANCH_ALLMANDATORYPROXYFIELDSFOUND_EXIT, 
-               "EXIT: CProxyBranch::AllMandatoryProxyFieldsFound;retval=%d", retval );
-    
-    return retval;
-    }
-//-----------------------------------------------------------------------------
-// TBool CProxyBranch::SetLeafData()
-//-----------------------------------------------------------------------------
-void CProxyBranch::SetLeafDataL(const TDesC8& aURI, 
-                                const TDesC8& /*aLUID*/,
-                                const TDesC8& aObject, 
-                                 TInt aStatusRef, 
-                                 RCmConnectionMethodExt& aCm)
-    {
-    OstTraceExt1( TRACE_NORMAL, CPROXYBRANCH_SETLEAFDATAL_ENTRY, 
-                  "ENTRY: CProxyBranch::SetLeafDataL;aURI=%s", aURI );
-    
-    TUint32 attributeRef = ( 0 );
-    TLex8 lex( aObject );
-    TInt value = 0;
-    CSmlDmAdapter::TError status = CSmlDmAdapter::EOk;
-
-    attributeRef = MapUriToCmAttribute( aURI );
-    
-    switch ( attributeRef )
-        {
-        case CMManager::ECmProxyServerName:
-        case CMManager::ECmStartPage:
-        case CMManager::ECmProxyProtocolName:
-            aCm.SetStringAttributeL( attributeRef, CUtils::ConvertTo16LC( aObject ) );
-            CleanupStack::PopAndDestroy(); // CUtils::ConvertTo16LC
-            break;
-        case CMManager::ECmProxyPortNumber:        
-            if ( lex.Val( value ) == KErrNone )
-                {
-                aCm.SetIntAttributeL( attributeRef, value );
-                }
-            else
-                {
-                status = CSmlDmAdapter::EInvalidObject;
-                }
-            break;
-        default:
-            status = CheckForUnmodifiableField( aURI );
-            break;
-        }
-    iCallback->SetStatusL( aStatusRef, status );
-    
-    OstTrace1( TRACE_NORMAL, CPROXYBRANCH_SETLEAFDATAL_EXIT, 
-               "EXIT: CProxyBranch::SetLeafDataL;status=%{TError}", status );
-    }
-//-----------------------------------------------------------------------------
-// TBool CProxyBranch::SetNodeData()
-//-----------------------------------------------------------------------------
-void CProxyBranch::SetNodeDataL(CConnMoNodeElement* aNode, RCmConnectionMethodExt& aCm)
-    {
-    OstTraceExt1( TRACE_NORMAL, CPROXYBRANCH_SETNODEDATAL_ENTRY, "ENTRY: CProxyBranch::SetNodeDataL;aNode->iUri=%s", aNode->iUri );
-    
-    if ( aNode->iParentLUID.Length() == 0 )
-        {
-        TBuf8<16> addLUID;
-        _LIT8( KFormat, "%d" );    
-        addLUID.Format( KFormat, aCm.GetIntAttributeL( CMManager::ECmId ) );
-        
-        iCallback->SetMappingL( aNode->iUri, addLUID );
-        iCallback->SetStatusL( aNode->iStatusRef, CSmlDmAdapter::EOk );
-        }
-    else
-        {
-        iCallback->SetStatusL( aNode->iStatusRef, CSmlDmAdapter::EAlreadyExists );
-        }
-    OstTrace0( TRACE_NORMAL, CPROXYBRANCH_SETNODEDATAL_EXIT, "EXIT: CProxyBranch::SetNodeDataL" );
-    
-    }
-//------------------------------------------------------------------------------
-//  void CProxyBranch::GetAllDynamicProxyNodes()
-//------------------------------------------------------------------------------
-void CProxyBranch::GetAllDynamicProxyNodesL( const TDesC8& aURI,
-                                             const CArrayFix<TSmlDmMappingInfo>& aPreviousURISegmentList,
-                                             TInt aResultsRef, 
-                                             TInt aStatusRef,
-                                             CBufBase& aCurrentURISegmentList )
-    {
-    OstTraceExt1( TRACE_NORMAL, CPROXYBRANCH_GETALLDYNAMICPROXYNODESL_ENTRY, 
-                  "ENTRY: CProxyBranch::GetAllDynamicProxyNodesL;aURI=%s", aURI );
-    
-    // Array for connection methods
-    RArray <TUint32> cmArray;
-    
-    CleanupClosePushL( cmArray );
-    cmArray.Reset();
-    
-    GetAllConnectionMethodsL( cmArray, *iCmManager );
-    
-    // Loop through all connection methods
-    for ( TInt i = 0; i < cmArray.Count(); i++ )
-        {
-        RCmConnectionMethodExt cm = iCmManager->ConnectionMethodL( cmArray[i] );
-        CleanupClosePushL( cm );
-        
-        // If proxy is enabled for connection method
-        if ( cm.GetBoolAttributeL( CMManager::ECmProxyUsageEnabled ) )
-            {
-            OstTrace1( TRACE_NORMAL, CPROXYBRANCH_GETALLDYNAMICPROXYNODESL_PROXY, 
-                        "CProxyBranch::GetAllDynamicProxyNodesL;Proxy enabled for Cm Id=%u", 
-                        cmArray[i] );
-            
-            TBuf8<KSmlMaxURISegLen>addCmName;
-            // Check if node exists in aPreviousURISegmentList
-            if ( !CheckPreviousURIList( aPreviousURISegmentList, cmArray[i], addCmName ) )
-                {
-                // Connection Method not found in previous URI list                        
-                addCmName.Append( aURI );
-                addCmName.Append( KCMProxyNodeSeparator );
-                addCmName.Append( KDynamicNodePrefix );
-                
-                addCmName.AppendNumFixedWidth( cmArray[i], EDecimal, 3); 
-                
-                TBuf8<16> addLUID;
-                _LIT8( KFormat, "%d" );    
-                addLUID.Format( KFormat, cmArray[i] );
-                
-                OstTraceExt1( TRACE_NORMAL, 
-                           CPROXYBRANCH_GETALLDYNAMICPROXYNODES_ADDED_TO_LIST, 
-                           "CProxyBranch::GetAllDynamicProxyNodesL;Added to list: URI=%s", addCmName );
-                                             
-                iCallback->SetMappingL( addCmName, addLUID );
-                }
-            aCurrentURISegmentList.InsertL( aCurrentURISegmentList.Size(), CUtils::GetLastURISeg( addCmName ) );
-            aCurrentURISegmentList.InsertL( aCurrentURISegmentList.Size(), KCMProxyNodeSeparator );
-            }
-        CleanupStack::PopAndDestroy( &cm );
-        }
-    
-    iCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
-    iCallback->SetResultsL( aResultsRef, aCurrentURISegmentList, KNullDesC8 );
-
-    CleanupStack::PopAndDestroy( &cmArray );
-    
-    OstTrace0( TRACE_NORMAL, CPROXYBRANCH_GETALLDYNAMICPROXYNODESL_EXIT, 
-               "EXI: CProxyBranch::GetAllDynamicProxyNodesLT" );  
-    }
-
-// ======== MEMBER FUNCTIONS ========
-//-----------------------------------------------------------------------------
-// CProxyBranch* CProxyBranch::NewL( )
-//-----------------------------------------------------------------------------
-CProxyBranch* CProxyBranch::NewL(MSmlDmCallback* aDmCallback, 
-                                 CAddBuffer* aBuffer, 
-                                 RCmManagerExt* aCmManagerExt  )
-    {
-    OstTraceFunctionEntry1( CPROXYBRANCH_NEWL_ENTRY, ( TUint )( aDmCallback ) );
-
-    CProxyBranch* self = new (ELeave) CProxyBranch(aDmCallback, aBuffer, aCmManagerExt );
-
-    OstTraceFunctionExit1( CPROXYBRANCH_NEWL_EXIT, ( TUint )( self ) );
-    return self;
-    }
-
-//------------------------------------------------------------------------------
-// CProxyBranch::CProxyBranch()
-//------------------------------------------------------------------------------
-CProxyBranch::CProxyBranch(MSmlDmCallback* aDmCallback, 
-                           CAddBuffer* aBuffer,
-                           RCmManagerExt* aCmManagerExt )
-    : CBranchBase( aDmCallback )
-    {
-    OstTraceFunctionEntry1( CPROXYBRANCH_CONSTRUCTOR_ENTRY, this );
-    
-    iCallback = aDmCallback;
-    iBuffer = aBuffer;
-    iCmManager = aCmManagerExt;
-    
-    OstTraceFunctionExit1( CPROXYBRANCH_CONSTRUCTOR_EXIT, this );
-    }
-
-//------------------------------------------------------------------------------
-// CProxyBranch::~CProxyBranch()
-//------------------------------------------------------------------------------
-CProxyBranch::~CProxyBranch()
-    {
-    OstTraceFunctionEntry1( CPROXYBRANCH_DESTRUCTOR_ENTRY, this );
-
-    OstTraceFunctionExit1( CPROXYBRANCH_DESTRUCTOR_EXIT, this );
-    }
-
-//------------------------------------------------------------------------------
-//  void CProxyBranch::DDFStructureL()
-//------------------------------------------------------------------------------
-void CProxyBranch::DDFStructureL( MSmlDmDDFObject& aDDF )
-    {
-    OstTraceFunctionEntry0( CPROXYBRANCH_DDFSTRUCTUREL_ENTRY );
-        
-    //
-    // Set rest acceptable operations for data itself
-    //
-    TSmlDmAccessTypes aclTypesNoDelete;
-    aclTypesNoDelete.SetGet();
-    aclTypesNoDelete.SetReplace();
-    aclTypesNoDelete.SetAdd();
-
-    TSmlDmAccessTypes aclTypesAddGet;
-    aclTypesAddGet.SetGet();
-    aclTypesAddGet.SetAdd();
-    
-    TSmlDmAccessTypes aclTypesOnlyGet;
-    aclTypesOnlyGet.SetGet();
-
-    MSmlDmDDFObject& nProxyIdDDF = aDDF.AddChildObjectL( KCMProxyDdfProxyId );        // ProxyId
-    CUtils::FillNodeInfoL( nProxyIdDDF, 
-                           aclTypesOnlyGet, 
-                           MSmlDmDDFObject::EOne, 
-                           MSmlDmDDFObject::EDynamic, 
-                           MSmlDmDDFObject::EChr, 
-                           KNullDesC8 );
-    
-    MSmlDmDDFObject& nAddrDDF = aDDF.AddChildObjectL( KCMProxyDdfAddr );     // Addr
-    CUtils::FillNodeInfoL( nAddrDDF, 
-                           aclTypesNoDelete, 
-                           MSmlDmDDFObject::EOne, 
-                           MSmlDmDDFObject::EDynamic, 
-                           MSmlDmDDFObject::EChr, 
-                           KNullDesC8 ); 
-    
-    MSmlDmDDFObject& nToConRefDDF = aDDF.AddChildObjectL( KCMProxyDdfToConRef );     // ToConRef
-    CUtils::FillNodeInfoL( nToConRefDDF, 
-                           aclTypesNoDelete, 
-                           MSmlDmDDFObject::EZeroOrOne, 
-                           MSmlDmDDFObject::EDynamic, 
-                           MSmlDmDDFObject::ENode, 
-                           KNullDesC8 );
-    
-    MSmlDmDDFObject& nToConRefRootDDF = nToConRefDDF.AddChildObjectGroupL();     // ToConRef/<x>
-    CUtils::FillNodeInfoL( nToConRefRootDDF, 
-                           aclTypesNoDelete, 
-                           MSmlDmDDFObject::EOneOrMore, 
-                           MSmlDmDDFObject::EDynamic, 
-                           MSmlDmDDFObject::ENode, 
-                           KNullDesC8 );
-    
-    MSmlDmDDFObject& nConRefDDF = nToConRefRootDDF.AddChildObjectL( KCMProxyDdfConRef ); // ToConRef/<x>/ConRef
-    CUtils::FillNodeInfoL( nConRefDDF, 
-                           aclTypesAddGet, 
-                           MSmlDmDDFObject::EOne, 
-                           MSmlDmDDFObject::EDynamic, 
-                           MSmlDmDDFObject::EChr, 
-                           KNullDesC8 );    
-       
-    MSmlDmDDFObject& nPortsDDF = aDDF.AddChildObjectL( KCMProxyDdfPorts );     // Ports
-    CUtils::FillNodeInfoL( nPortsDDF, 
-                           aclTypesNoDelete, 
-                           MSmlDmDDFObject::EZeroOrOne, 
-                           MSmlDmDDFObject::EDynamic, 
-                           MSmlDmDDFObject::ENode, 
-                           KNullDesC8 );
-
-    MSmlDmDDFObject& nPortsRootDDF = nPortsDDF.AddChildObjectGroupL();     // Ports/<x>
-    CUtils::FillNodeInfoL( nPortsRootDDF, 
-                           aclTypesNoDelete, 
-                           MSmlDmDDFObject::EOneOrMore, 
-                           MSmlDmDDFObject::EDynamic, 
-                           MSmlDmDDFObject::ENode, 
-                           KNullDesC8 );    
-          
-    MSmlDmDDFObject& nPortNbrDDF = nPortsRootDDF.AddChildObjectL( KCMProxyDdfPortNbr );  // Ports/<x>/PortNbr
-    CUtils::FillNodeInfoL( nPortNbrDDF, 
-                           aclTypesNoDelete, 
-                           MSmlDmDDFObject::EOne, 
-                           MSmlDmDDFObject::EDynamic, 
-                           MSmlDmDDFObject::EInt, 
-                           KNullDesC8 );
-
-    MSmlDmDDFObject& nProxyParamsDDF = aDDF.AddChildObjectL( KCMProxyDdfProxyParams ); // ProxyParams
-    CUtils::FillNodeInfoL( nProxyParamsDDF, 
-                           aclTypesNoDelete, 
-                           MSmlDmDDFObject::EZeroOrOne, 
-                           MSmlDmDDFObject::EDynamic, 
-                           MSmlDmDDFObject::ENode, 
-                           KNullDesC8 );
-
-    MSmlDmDDFObject& nProxyTypeDDF = aDDF.AddChildObjectL( KCMProxyDdfProxyType ); // ProxyType
-    CUtils::FillNodeInfoL( nProxyTypeDDF, 
-                           aclTypesNoDelete, 
-                           MSmlDmDDFObject::EZeroOrOne, 
-                           MSmlDmDDFObject::EDynamic, 
-                           MSmlDmDDFObject::EChr, 
-                           KNullDesC8 );
-
-    
-    MSmlDmDDFObject& nWapDDF = nProxyParamsDDF.AddChildObjectL( KCMProxyDdfWap ); // WAP
-    CUtils::FillNodeInfoL( nWapDDF, 
-                           aclTypesNoDelete, 
-                           MSmlDmDDFObject::EZeroOrOne, 
-                           MSmlDmDDFObject::EDynamic, 
-                           MSmlDmDDFObject::ENode, 
-                           KNullDesC8 );
-
-    MSmlDmDDFObject& nStartpgDDF = nWapDDF.AddChildObjectL( KCMProxyDdfStartpg ); // Startpg
-    CUtils::FillNodeInfoL( nStartpgDDF, 
-                           aclTypesNoDelete, 
-                           MSmlDmDDFObject::EZeroOrOne, 
-                           MSmlDmDDFObject::EDynamic, 
-                           MSmlDmDDFObject::EChr, 
-                           KNullDesC8 );
-    
-    OstTraceFunctionEntry0( CPROXYBRANCH_DDFSTRUCTUREL_EXIT );
-    }
-
-//------------------------------------------------------------------------------
-//  void CProxyBranch::UpdateLeafObjectL()
-//------------------------------------------------------------------------------
-void CProxyBranch::UpdateLeafObjectL( const TDesC8& aURI, 
-                                      const TDesC8& aLUID,
-                                      const TDesC8& aObject, 
-                                      const TDesC8& /*aType*/,
-                                      TInt aStatusRef )
-    {
-    OstTraceExt1( TRACE_NORMAL, CPROXYBRANCH_UPDATELEAFOBJECTL_ENTRY, 
-                  "ENTRY: CProxyBranch::UpdateLeafObjectL;aURI=%s", aURI );        
-    
-    // If this is for pre-defined node then get CM id xxx from URI (NAP/NAPIdxxx)
-    TInt cmId = GetCmIdFromURIL( aURI );
-
-    if ( aLUID.Length() == 0 && cmId == KErrNotFound )
-        {
-        // New node, add to buffer
-        iBuffer->AddNodeToBufferL( aURI, aLUID, aObject, aStatusRef);
-        }
-    else
-        {
-        // Existing node, update data immediately
-        TInt err( KErrNone );
-        RCmConnectionMethodExt cm;
-        if ( cmId == KErrNotFound )
-            {
-            cmId = CUtils::IntLUID( aLUID );
-            }
-            
-        TRAP( err, cm = iCmManager->ConnectionMethodL( cmId ) );
-        CleanupClosePushL( cm );
-                
-        if ( !err )
-            {
-            OstTrace0( TRACE_NORMAL, DUP1_CPROXYBRANCH_UPDATELEAFOBJECTL, "CProxyBranch::UpdateLeafObjectL; Existing connection method - write value immediately." );            
-            SetLeafDataL( aURI, aLUID, aObject, aStatusRef, cm );
-            cm.UpdateL();
-            }
-        else
-            {
-            //iCallback->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-            OstTrace0( TRACE_NORMAL, CPROXYBRANCH_UPDATELEAFOBJECTL, "CProxyBranch::UpdateLeafObjectL; Stale LUID - buffer setting." );            
-            iBuffer->AddNodeToBufferL(aURI,KNullDesC8,aObject,aStatusRef);
-            }
-
-        CleanupStack::PopAndDestroy( &cm );
-        }
-    OstTrace0( TRACE_NORMAL, CPROXYBRANCH_UPDATELEAFOBJECTL_EXIT, 
-               "EXIT: CProxyBranch::UpdateLeafObjectL" );
-    
-    }
-    
-//------------------------------------------------------------------------------
-//  void CProxyBranch::DeleteObjectL()
-//------------------------------------------------------------------------------
-void CProxyBranch::DeleteObjectL( const TDesC8& /*aURI*/, 
-                                  const TDesC8& /*aLUID*/,
-                                  TInt /*aStatusRef*/ )
-    {
- 
-    }
-    
-//------------------------------------------------------------------------------
-//  void CProxyBranch::FetchLeafObjectL()
-//------------------------------------------------------------------------------
-void CProxyBranch::FetchLeafObjectL( const TDesC8& aURI, 
-                                     const TDesC8& aLUID,
-                                     const TDesC8& aType, 
-                                     TInt aResultsRef,
-                                     TInt aStatusRef )
-    {
-    OstTraceExt1( TRACE_NORMAL, CPROXYBRANCH_FETCHLEAFOBJECTL_PUPLIC_ENTRY, 
-                  "ENTRY: CProxyBranch::FetchLeafObjectL;aURI=%s", aURI );
-    
-    CSmlDmAdapter::TError status = CSmlDmAdapter::ENotFound;
-    
-    CBufBase *leafObject = CBufFlat::NewL( KBufferExpandSize );
-    CleanupStack::PushL( leafObject );
-    leafObject->Reset();
-   
-    status = FetchLeafObjectL( aURI, aLUID, *leafObject );
-    
-    if ( status == CSmlDmAdapter::EOk )
-        {
-        iCallback->SetResultsL( aResultsRef, *leafObject, aType );
-        OstTrace0( TRACE_NORMAL, CPROXYBRANCH_FETCHLEAFOBJECT_OK, 
-                   "CProxyBranch::FetchLeafObjectL; EOk" );
-        }
-    
-    CleanupStack::PopAndDestroy( leafObject );   
-
-    iCallback->SetStatusL( aStatusRef, status );
-    OstTrace1( TRACE_NORMAL, CPROXYBRANCH_FETCHLEAFOBJECTL_PUPLIC_EXIT, 
-               "EXIT: CProxyBranch::FetchLeafObjectL;status=%{TError}", status );
-    
-    }
-    
-//------------------------------------------------------------------------------
-//  void CProxyBranch::FetchLeafObjectSizeL()
-//------------------------------------------------------------------------------
-void CProxyBranch::FetchLeafObjectSizeL( const TDesC8& aURI, 
-                                         const TDesC8& aLUID,
-                                         const TDesC8& aType, 
-                                         TInt aResultsRef,
-                                         TInt aStatusRef )
-    {
-    OstTraceExt1( TRACE_NORMAL, CPROXYBRANCH_FETCHLEAFOBJECTSIZEL_ENTRY, 
-                  "ENTRY: CProxyBranch::FetchLeafObjectSizeL;aURI=%s", aURI );
-    
-    CSmlDmAdapter::TError status = CSmlDmAdapter::ENotFound;
- 
-    CBufBase *leafObject = CBufFlat::NewL( KSmlMaxURISegLen );
-    CleanupStack::PushL( leafObject );
-    leafObject->Reset();
-
-    status = FetchLeafObjectL( aURI, aLUID, *leafObject );
-
-    if ( status == CSmlDmAdapter::EOk )
-        {
-        leafObject->Compress();
-        TBuf8<8> size;
-        size.Num( leafObject->Size() );
-        leafObject->Reset();
-        leafObject->InsertL(0, size );
-        iCallback->SetResultsL( aResultsRef, *leafObject, aType );
-        }
-    
-    CleanupStack::PopAndDestroy( leafObject );
-
-    iCallback->SetStatusL( aStatusRef, status );
-    OstTrace1( TRACE_NORMAL, CPROXYBRANCH_FETCHLEAFOBJECTSIZEL_EXIT, 
-               "EXIT: CProxyBranch::FetchLeafObjectSizeL;status=%{TError}", status );
-    
-    }
-
-//------------------------------------------------------------------------------
-//  void CProxyBranch::ChildURIListL()
-//------------------------------------------------------------------------------
-void CProxyBranch::ChildURIListL( const TDesC8& aURI, 
-                                  const TDesC8& aLUID,
-                                  const CArrayFix<TSmlDmMappingInfo>& aPreviousURISegmentList,
-                                  TInt aResultsRef,
-                                  TInt aStatusRef )
-    {
-    OstTraceExt1( TRACE_NORMAL, CPROXYBRANCH_CHILDURILISTL_ENTRY, 
-                  "ENTRY: CProxyBranch::ChildURIListL;aURI=%s", aURI );
-        
-    TPtrC8 proxyDdfTree = CUtils::GetEndOfURIFromSeg( aURI, KCMProxyDdf );
-    
-    CBufBase* currentURISegmentList = CBufFlat::NewL( KSmlMaxURISegLen );
-    CleanupStack::PushL( currentURISegmentList );
-    
-    // Proxy (handle as special case)   
-    if ( proxyDdfTree.Match( KCMProxyDdf ) != KErrNotFound )
-        {
-        GetAllDynamicProxyNodesL( aURI,
-                                  aPreviousURISegmentList,
-                                  aResultsRef, 
-                                  aStatusRef,
-                                  *currentURISegmentList );
-        CleanupStack::PopAndDestroy( currentURISegmentList );
-        return;
-        }
-    // Then check if the CM exists. Use LUID or predefined ID    
-    TInt cmId( KErrNotFound );
-    if ( aLUID.Length() > 0 )
-        {
-        cmId = CUtils::IntLUID( aLUID );
-        }
-    else
-        {
-        // If this is for pre-defined node then get CM id xxx from URI (NAP/NAPIdxxx)
-        cmId = GetCmIdFromURIL( aURI );
-        }
-    // If after this cmId is still not found then the branch does not exist
-    if ( cmId == KErrNotFound )
-        {
-        iCallback->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-        CleanupStack::PopAndDestroy( currentURISegmentList );
-        OstTrace0( TRACE_NORMAL, DUP1_CPROXYBRANCH_CHILDURILISTL, "CNapBranch::ChildURIListL; CSmlDmAdapter::ENotFound" );
-        return;
-        }
-    
-    RCmConnectionMethodExt cm;
-    // Check it the method actually can be found      
-    if ( !GetConnectionMethodLC( *iCmManager, cm, cmId ) || !cm.GetBoolAttributeL(CMManager::ECmProxyUsageEnabled ) )       
-        {
-        iCallback->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-        CleanupStack::PopAndDestroy( &cm );
-        CleanupStack::PopAndDestroy( currentURISegmentList );        
-        OstTrace0( TRACE_NORMAL, DUP2_CPROXYBRANCH_CHILDURILISTL, "CNapBranch::ChildURIListL; CSmlDmAdapter::ENotFound" );
-        return;
-        }            
-    CleanupStack::PopAndDestroy( &cm );    
-    
-    
-    // Proxy/<x>
-    if ( proxyDdfTree.Match( KDynamicProxyNodePattern ) != KErrNotFound &&
-              proxyDdfTree.Match( KDynamicProxyNodeChildUri ) == KErrNotFound )
-        {
-        currentURISegmentList->InsertL( currentURISegmentList->Size(), KCMProxyFields ); 
-        iCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
-        iCallback->SetResultsL( aResultsRef, *currentURISegmentList, KNullDesC8 );        
-        }
-    
-    // Proxy/<x>/ToConRef/<x>
-    else if ( proxyDdfTree.Match( KDynamicToConrefNodeChildUri ) != KErrNotFound &&
-              proxyDdfTree.Match( KDynamicToConrefNodeChildUriNodes ) == KErrNotFound )
-        {
-        currentURISegmentList->InsertL( currentURISegmentList->Size(), KCMProxyDdfConRef ); 
-        iCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
-        iCallback->SetResultsL( aResultsRef, *currentURISegmentList, KNullDesC8 );
-        }
-    
-    // Proxy/<x>/ToConRef
-    else if ( proxyDdfTree.Match( KDynamicToConrefNode ) != KErrNotFound )
-        {        
-        GetAllDynamicNodesL( aURI,
-                             aLUID,
-                             aPreviousURISegmentList,
-                             aResultsRef, 
-                             aStatusRef,
-                             *iCmManager,
-                             *currentURISegmentList,
-                             KCMProxyDdfToConRef,
-                             1,
-                             iCallback );
-        }
-    
-    // Proxy/<x>/Ports/<x>
-    else if ( proxyDdfTree.Match( KDynamicPortsNodeChildUri ) != KErrNotFound &&
-              proxyDdfTree.Match( KDynamicPortsNodeChildUriNodes ) == KErrNotFound )
-        {      
-        currentURISegmentList->InsertL( currentURISegmentList->Size(), KCMProxyDdfPortNbr ); 
-        iCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
-        iCallback->SetResultsL( aResultsRef, *currentURISegmentList, KNullDesC8 );        
-        }
-    
-    // Proxy/<x>/Ports
-    else if ( proxyDdfTree.Match( KDynamicPortsNode ) != KErrNotFound )
-        {
-        GetAllDynamicNodesL( aURI, 
-                             aLUID,
-                             aPreviousURISegmentList,
-                             aResultsRef, 
-                             aStatusRef,
-                             *iCmManager,
-                             *currentURISegmentList,
-                             KCMProxyDdfPorts,
-                             1,
-                             iCallback );      
-        }
-    
-    // Proxy/<x>/ProxyParams
-    else if ( proxyDdfTree.Match( KDynamicProxyParamsNode ) != KErrNotFound &&
-              proxyDdfTree.Match( KDynamicProxyParamsNodeChildUri ) == KErrNotFound )
-        {
-        currentURISegmentList->InsertL( currentURISegmentList->Size(), KCMProxyParamsFields ); 
-        iCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
-        iCallback->SetResultsL( aResultsRef, *currentURISegmentList, KNullDesC8 );        
-        }
-    
-    // Proxy/<x>/ProxyParams/WAP
-    else if ( proxyDdfTree.Match( KDynamicProxyParamsWapNode ) != KErrNotFound )
-        {
-        currentURISegmentList->InsertL( currentURISegmentList->Size(), KCMProxyWapFields ); 
-        iCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
-        iCallback->SetResultsL( aResultsRef, *currentURISegmentList, KNullDesC8 );  
-        }
-    
-    // Not found
-    else
-        {
-        iCallback->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-        OstTrace0( TRACE_NORMAL, CPROXYBRANCH_CHILDURILISTL_NOT_FOUND, 
-                   "CProxyBranch::ChildURIListL;CSmlDmAdapter::ENotFound" );
-        
-        }
-    
-    CleanupStack::PopAndDestroy( currentURISegmentList );
-    OstTrace0( TRACE_NORMAL, CPROXYBRANCH_CHILDURILISTL_EXIT, 
-               "EXIT: CProxyBranch::ChildURIListL" );
-        
-    }
-
-//------------------------------------------------------------------------------
-//  void CProxyBranch::AddNodeObjectL()
-//------------------------------------------------------------------------------    
-void CProxyBranch::AddNodeObjectL( const TDesC8& aURI, 
-                                   const TDesC8& aParentLUID,
-                                   TInt aStatusRef )
-    {
-    OstTraceExt1( TRACE_NORMAL, CPROXYBRANCH_ADDNODEOBJECTL_ENTRY, 
-                  "ENTRY: CProxyBranch::AddNodeObjectL;aURI=%s", aURI );
-    
-    if ( aParentLUID.Length() == 0 )
-        {
-        // If this is for pre-defined node then get CM id xxx from URI (Proxy/ProxyIdxxx)
-        TInt cmId = GetCmIdFromURIL( aURI );
-        RCmConnectionMethodExt cm;
-        // Check if CM exists
-        if ( cmId != KErrNotFound && GetConnectionMethodLC( *iCmManager, cm, cmId ) 
-             && cm.GetBoolAttributeL(CMManager::ECmProxyUsageEnabled))
-            {
-            CleanupStack::PopAndDestroy( &cm );
-            // Pre-defined CM already exists for this ID.            
-            iCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EAlreadyExists );
-            return;
-            }
-        if ( cmId != KErrNotFound )
-            {
-            CleanupStack::PopAndDestroy( &cm );
-            }
-        // New node, add to buffer
-        iBuffer->AddNodeToBufferL( aURI, aParentLUID, aStatusRef );
-        OstTrace0( TRACE_NORMAL, CPROXYBRANCH_ADDNODEOBJECTL_NEW_NODE, 
-                   "CProxyBranch::AddNodeObjectL;New node -> Add to buffer." );
-        }
-    else
-        {
-        // Sanity check: If the dynamic name of the Proxy node has is the same as deleted previously and
-        // DM Framework hasn't updated the tree, it will give the LUID when calling this method. Thus,
-        // it's needed to check that the connection method really exists.
-        RCmConnectionMethodExt cm;
-    
-        
-        if ( !GetConnectionMethodLC( *iCmManager, cm, CUtils::IntLUID( aParentLUID ) ) )
-            {
-            // New node, add to buffer
-            iBuffer->AddNodeToBufferL( aURI, KNullDesC8, aStatusRef );
-            OstTrace0( TRACE_NORMAL, CPROXYBRANCH_ADDNODEOBJECTL_NEW_NODE2, 
-                       "CProxyBranch::AddNodeObjectL;New node -> Add to buffer." );
-            }
-        else
-            {
-            // Proxies must be added in one message. If luid is given add is done to existing AP or node
-            iCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EAlreadyExists );
-            OstTrace0( TRACE_NORMAL, CPROXYBRANCH_ADDNODEOBJECTL_ALREADY_EXISTS, 
-                       "CProxyBranch::AddNodeObjectL;CSmlDmAdapter::EAlreadyExists" );
-            } 
-       
-        CleanupStack::PopAndDestroy( &cm );
-        }
-        
-    OstTrace0( TRACE_NORMAL, CPROXYBRANCH_ADDNODEOBJECTL_EXIT, "EXIT: CProxyBranch::AddNodeObjectL" );   
-    }
-
-// -------------------------------------------------------------------------------------
-// CProxyBranch::ProcessNodeBufferL()
-// -------------------------------------------------------------------------------------
-void CProxyBranch::ProcessBufferL()
-    {
-    OstTrace0( TRACE_NORMAL, CPROXYBRANCH_PROCESSBUFFERL_ENTRY, "ENTRY: CProxyBranch::ProcessBufferL" );
-    
-    RPointerArray<CConnMoNodeElement> proxyNodes( KNumOfProxyNodes );
-    CleanupClosePushL( proxyNodes );
-    while ( iBuffer->GetGroup( KCMDdfProxy, &proxyNodes ) != KErrNotFound )
-        {
-        TInt32 cmId = FindConnectionMethodL();
-    
-        if ( AllMandatoryProxyFieldsFound() && cmId != KErrNotFound )
-            {
-            // Open connection method, enable proxy and update nodes
-            RCmConnectionMethodExt cm;
-            TRAPD( err, cm = iCmManager->ConnectionMethodL( cmId ) );
-            CleanupClosePushL( cm );
-            
-            if ( !err )
-                {
-                cm.SetBoolAttributeL( CMManager::ECmProxyUsageEnabled, ETrue );
-        
-                for ( TInt i = 0; i < proxyNodes.Count(); ++i )
-                    {
-                    if ( proxyNodes[i]->iLeaf  )
-                        {
-                    // Leaf data found
-                    SetLeafDataL( proxyNodes[i]->iUri, 
-                                  proxyNodes[i]->iParentLUID, 
-                                  proxyNodes[i]->iObject, 
-                                  proxyNodes[i]->iStatusRef, cm );
-                    proxyNodes[i]->iProcessed = ETrue;
-                        }
-                    else
-                        {
-                        // Node has no leaf data
-                        SetNodeDataL( proxyNodes[i], cm );
-                        proxyNodes[i]->iProcessed = ETrue;
-                        }
-                    }
-                cm.UpdateL();
-                }
-            else
-                {
-                for ( TInt i = 0; i < proxyNodes.Count(); ++i )
-                    {
-                    iCallback->SetStatusL( proxyNodes[i]->iStatusRef, CSmlDmAdapter::EError );
-                    proxyNodes[i]->iProcessed = ETrue;
-                    }
-                }
-            CleanupStack::PopAndDestroy( &cm );
-            }
-        else
-            {
-            for ( TInt i = 0; i < proxyNodes.Count(); ++i )
-                {
-                iCallback->SetStatusL( proxyNodes[i]->iStatusRef, CSmlDmAdapter::EError );
-                proxyNodes[i]->iProcessed = ETrue;
-                }
-            }
-        proxyNodes.Reset();
-        }
-    CleanupStack::Pop( &proxyNodes );
-    proxyNodes.Close();
- 
-    OstTrace0( TRACE_NORMAL, CPROXYBRANCH_PROCESSBUFFERL_EXIT, "EXIT: CProxyBranch::ProcessBufferL" );  
-    }
-
-
-//------------------------------------------------------------------------------
-// TPtrC8 CUtils::GetDynamicAPNodeUri( const TDesC8& aURI )
-// returns NAP/xxx URI
-//------------------------------------------------------------------------------
-TPtrC8 CProxyBranch::GetDynamicProxyNodeUri( const TDesC8& aURI )
-    {    
-    OstTraceExt1( TRACE_NORMAL, CPROXYBRANCH_GETDYNAMICPROXYNODEURI, "CProxyBranch::GetDynamicProxyNodeUri;aURI=%s", aURI );
-    TInt i= 0;
-    for ( i = aURI.Find( KCMDdfProxy ) + 6; i < aURI.Length(); i++ )
-        {
-        if( aURI[i] == '/' )
-            {
-            break;
-            }
-        }           
-    OstTraceExt1( TRACE_NORMAL, DUP1_CPROXYRANCH_GETDYNAMICPROXYNODEURI, "CProxyBranch::GetDynamicProxyNodeUri;return URI=%s", aURI.Left( i ) );
-    return aURI.Left( i );
-    }
-
-//--------------------------------------------------------------------
-//TInt CProxyBranch::IsNAPUriFormatMatchPredefined(const TDesC8 & aURI)
-//
-//-------------------------------------------------------------------
-
-
-TBool CProxyBranch::IsProxyUriFormatMatchPredefined(const TDesC8 & aURI)
-{
-    if( aURI.Match( _L8( "Proxy/ProxyId*" ) ) != KErrNotFound )
-    {
-        return ETrue;
-    }
-    else
-    {
-        return EFalse;
-    }
-}
-//------------------------------------------------------------------------------
-// TUint32 CProxyBranch::GetAPIdFromURIL(const TDesC8& aURI)
-//         Get NAP id for given aURI
-//------------------------------------------------------------------------------
-TInt CProxyBranch::GetCmIdFromURIL(const TDesC8& aURI)
-    {
-    TInt ret(KErrNotFound);
-    
-    if( !IsProxyUriFormatMatchPredefined( aURI ) )
-        {
-        // Cannot get CmIds from any other format URIs than predefined
-        return ret;
-        }
-   
-    TLex8 lex;
-    //  Find xxx from ./Proxy/ProxyIdxxx/...    
-    TInt start = aURI.Find( KDynamicNodePrefix ) + KDynamicNodePrefix().Length();
-    lex = aURI.Mid( start, 3 );
-    lex.Val( ret );
-    
-    return ret;
-    }
--- a/omadm/omadmextensions/adapters/connmoadapter/src/Utils.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,312 +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 "Eclipse Public License v1.0"
- * which accompanies 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 <e32base.h>
-#include <utf.h>
-#include <cmpluginpacketdatadef.h>
-
-#include "Utils.h"
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "UtilsTraces.h"
-#endif
-
-// ======== LOCAL CONSTANTS =========
-
-_LIT8( KFalse,               "False" );
-_LIT8( KTrue,                "True" );
-_LIT8( KWhiteSpace,          " " );
-
-// ======== LOCAL FUNCTIONS =========
-
-// ======== MEMBER FUNCTIONS ========   
-//------------------------------------------------------------------------------
-// CUtils::CUtils()
-//------------------------------------------------------------------------------
-CUtils::CUtils() 
-    {
-    OstTraceFunctionEntry0( CUTILS_CUTILS_ENTRY );
-    OstTraceFunctionExit0( CUTILS_CUTILS_EXIT );
-    }
-
-//------------------------------------------------------------------------------
-// CUtils::~CUtils()
-//------------------------------------------------------------------------------
-CUtils::~CUtils()
-    {
-    }
-
-//------------------------------------------------------------------------------
-// TPtrC8 CUtils::GetFirstURISeg(const TDesC8& aURI)
-//------------------------------------------------------------------------------
-TPtrC8 CUtils::GetFirstURISeg( const TDesC8& aURI )
-    {
-    OstTraceExt1( TRACE_NORMAL, CUTILS_GETFIRSTURISEG_ENTRY, 
-                  "ENTRY: CUtils::GetFirstURISeg;aURI=%s", aURI );
-    
-    TInt i = 0;
-    TInt j = 0;
-    
-    for( i  =0; i <= aURI.Length()-1; i++ )
-        {
-        if( aURI[i] == '/' )
-            {
-            if ( i == 0 )
-                {
-                // Skip first slash
-                j = 1;
-                continue;
-                }
-            break;
-            }
-        }
-    OstTraceExt1( TRACE_NORMAL, CUTILS_GETFIRSTURISEG_EXIT, 
-                  "EXIT: CUtils::GetFirstURISeg;retval=%s", aURI.Mid( j,i-j ) );
-    
-    return aURI.Mid( j,i-j );
-    }
-
-//------------------------------------------------------------------------------
-// TPtrC8 CUtils::GetSecondURISeg(const TDesC8& aURI)
-//------------------------------------------------------------------------------
-TPtrC8 CUtils::GetSecondURISeg( const TDesC8& aURI )
-    {
-    OstTraceExt1( TRACE_NORMAL, CUTILS_GETSECONDURISEG_ENTRY, 
-                  "ENTRY: CUtils::GetSecondURISeg;aURI=%s", aURI );
-    
-    TInt j = 0;
-    TInt i = 0;
-    
-    for( i = 0; i <= aURI.Length() - 1; i++ )
-        {
-        if( aURI[i] == '/' )
-            {
-            for( j = i + 1; j <= aURI.Length() - 1; j++ )
-                {
-                if( aURI[j] == '/' ) // Second slash => AP/xxxx
-                    {
-                    break;
-                    }
-                }
-            break;
-            }
-        }
-    OstTraceExt1( TRACE_NORMAL, CUTILS_GETSECONDTURISEG_EXIT, 
-                  "EXIT: CUtils::GetSecondURISeg;retval=%s", aURI.Mid( i+1, j-1-i ) );
-    
-    return aURI.Mid( i+1, j-1-i );
-    }
-
-//------------------------------------------------------------------------------
-// TPtrC8 CUtils::GetLastURISeg(const TDesC8& aURI)
-// Returns only the last uri segment
-//------------------------------------------------------------------------------
-TPtrC8 CUtils::GetLastURISeg( const TDesC8& aURI )
-    {
-    OstTraceExt1( TRACE_NORMAL, CUTILS_GETLASTURISEG_ENTRY, 
-                  "ENTRY: CUtils::GetLastURISeg;aURI=%s", aURI );
-    
-    TInt i;
-    
-    for( i = aURI.Length() - 1 ; i >= 0; i-- )
-        {
-        if( aURI[i] == '/' )
-            {
-            break;
-            }
-        }
-    if( i == 0 )
-        {
-        OstTraceExt1( TRACE_NORMAL, CUTILS_GETLASTURISEG_EXIT, 
-                      "EXIT: CUtils::GetLastURISeg;retval=%s", aURI );
-        return aURI;
-        }
-    else
-        {
-        OstTraceExt1( TRACE_NORMAL, CUTILS_GETLASTURISEG_EXIT2, 
-                      "EXIT: CUtils::GetLastURISeg;retval=%s", aURI.Mid( i+1 ) );
-        return aURI.Mid( i+1 );
-        }
-    }
-
-//------------------------------------------------------------------------------
-// TPtrC8 CUtils::GetEndOfURIFromSeg(const TDesC8& aURI,const TDesC8 aName)
-// Returns the end of aURI starting from aName
-//------------------------------------------------------------------------------
-TPtrC8 CUtils::GetEndOfURIFromSeg( const TDesC8& aURI, const TDesC8& aName )
-    {
-    OstTraceExt2( TRACE_NORMAL, CUTILS_GETENDOFURIFROMSEG_ENTRY, 
-                  "ENTRY: CUtils::GetEndOfURIFromSeg;aURI=%s;aName=%s", aURI, aName );
-    
-    TInt begin = aURI.Find( aName );
-    
-    if ( begin == KErrNotFound )
-        {
-        OstTrace1( TRACE_NORMAL, CUTILS_GETENDOFURIFROMSEG_EXIT, 
-                   "EXIT: CUtils::GetEndOfURIFromSeg;%d", KErrNotFound );
-        return aURI;
-        }
-    OstTraceExt1( TRACE_NORMAL, CUTILS_GETENDOFURIFROMSEG_EXIT2, 
-                  "EXIT: CUtils::GetEndOfURIFromSeg;%s", aURI.Mid(begin) );    
-    return aURI.Mid(begin);
-    }
-
-//------------------------------------------------------------------------------
-// CUtils::ConvertTo8LC()
-// Converts string value to 8-bit
-//------------------------------------------------------------------------------
-TDesC8& CUtils::ConvertTo8LC( const TDesC& aSource )
-    {
-    HBufC8* buf = HBufC8::NewLC( aSource.Length() * 2 );
-    TPtr8 bufPtr = buf->Des();
-    CnvUtfConverter::ConvertFromUnicodeToUtf8( bufPtr, aSource );
-
-    return *buf;
-    }
-
-//------------------------------------------------------------------------------
-// CUtils::ConvertTo16LC()
-// Converts string value to 16-bit      
-//------------------------------------------------------------------------------
-TDesC16& CUtils::ConvertTo16LC( const TDesC8& aSource )
-    {
-    HBufC16* buf16 = HBufC16::NewLC( aSource.Length() );
-    TPtr bufPtr16 = buf16->Des();
-
-    CnvUtfConverter::ConvertToUnicodeFromUtf8( bufPtr16, aSource );
-
-    return *buf16;
-    }
-
-// -------------------------------------------------------------------------------------
-// CUtils::FillNodeInfoL()
-// Fills the node info in ddf structure
-// -------------------------------------------------------------------------------------
-void CUtils::FillNodeInfoL( MSmlDmDDFObject& aNode,
-                            TSmlDmAccessTypes aAccTypes,
-                            MSmlDmDDFObject::TOccurence aOccurrence, 
-                            MSmlDmDDFObject::TScope aScope, 
-                            MSmlDmDDFObject::TDFFormat aFormat,
-                            const TDesC8& aDescription )
-                                          
-    {
-    aNode.SetAccessTypesL( aAccTypes );
-    aNode.SetOccurenceL( aOccurrence );
-    aNode.SetScopeL( aScope );
-    aNode.SetDFFormatL( aFormat );
-    if( aFormat != MSmlDmDDFObject::ENode )
-        {
-        // aNode.AddDFTypeMimeTypeL(KNSmlMimeType);
-        }
-    if ( aDescription != KNullDesC8 )
-        {
-        aNode.SetDescriptionL( aDescription );
-        }
-    }
-
-// -------------------------------------------------------------------------------------
-// CUtils::StripWhiteSpaces()
-// Removes all white spaces from a string
-// -------------------------------------------------------------------------------------
-void CUtils::RemoveIllegalCharsFromURI( TDes8& aString )
-    {
-    TInt delPos;
-    TInt delLen = 1;
-    
-    aString.TrimAll();
-    delPos = aString.Find( KWhiteSpace );
-    while ( delPos != KErrNotFound )
-        {
-        aString.Delete( delPos,delLen );
-        delPos = aString.Find( KWhiteSpace );
-        }
-    }
-
-// -------------------------------------------------------------------------------------
-// TInt CUtils::DesCToBool
-// -------------------------------------------------------------------------------------
-TInt32 CUtils::DesToBool( const TDesC8& aSource, TBool& aBool )
-    {
-    TInt retval( KErrNone );
-    
-    if ( aSource.Match( KTrue ) != KErrNotFound )
-        {
-        aBool = ETrue;
-        }
-    else if ( aSource.Match( KFalse ) != KErrNotFound )
-        {
-        aBool = EFalse;
-        }
-    else
-        {
-        retval = KErrGeneral;
-        }
-        
-    return retval;
-    }
-
-// -------------------------------------------------------------------------------------
-// CUtils::IntToCharL()
-// -------------------------------------------------------------------------------------
-TDesC8& CUtils::IntToCharL( const TInt& aObject )
-    {
-    HBufC8* buf = HBufC8::NewLC( 8 );
-    TPtr8 ptrBuf = buf->Des();
-
-    ptrBuf.Num( aObject );
-
-    return *buf;
-    }
-//------------------------------------------------------------------------------
-// TPtrC8 CUtils::AppendFirstURISeg( TDes8& aURI, TDes8& aTarget )
-//------------------------------------------------------------------------------
-TInt CUtils::AppendFirstURISeg( TDes8& aURI, TDes8& aTarget )
-    {
-    
-    TInt i = aURI.FindC(_L8("/"));
-    
-    if ( i != KErrNotFound )
-        {
-        aTarget.Append( aURI.Left( i ) );
-        aURI.Copy( aURI.Right( aURI.Length() - i - 1 ) );
-        }
-    else
-        {
-        aTarget.Copy( aURI );
-        aURI.Copy( aURI.Right( 0 ) );
-        }
-    
-    return i;
-    }
-
-//=============================================
-//      CUtils::IntLUID()
-//      Returns IntValue for aLUID
-//=============================================
-TInt CUtils::IntLUID(const TDesC8& aLUID)
-    {
-    TInt ret(0);
-
-    TLex8 lex(aLUID);
-    
-    lex.Val( ret );
-    
-    return ret;
-    }
-
--- a/omadm/omadmextensions/adapters/connmoadapter/traces/OstTraceDefinitions.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-#ifndef __OSTTRACEDEFINITIONS_H__
-#define __OSTTRACEDEFINITIONS_H__
-// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
-// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
-//#define OST_TRACE_COMPILER_IN_USE
-#include <opensystemtrace.h>
-#endif
--- a/omadm/omadmextensions/adapters/connmoadapter/traces/fixed_id.definitions	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,586 +0,0 @@
-#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
-[GROUP]TRACE_FLOW=0x7
-[GROUP]TRACE_NORMAL=0x3
-[TRACE]TRACE_FLOW[0x7]_CADDBUFFER_CADDBUFFER_ENTRY=0x1ef
-[TRACE]TRACE_FLOW[0x7]_CADDBUFFER_CADDBUFFER_EXIT=0x1f0
-[TRACE]TRACE_FLOW[0x7]_CADDBUFFER_CONSTRUCTL_ENTRY=0x1f3
-[TRACE]TRACE_FLOW[0x7]_CADDBUFFER_CONSTRUCTL_EXIT=0x1f4
-[TRACE]TRACE_FLOW[0x7]_CADDBUFFER_DELETE_ENTRY=0x1f7
-[TRACE]TRACE_FLOW[0x7]_CADDBUFFER_DELETE_EXIT=0x1f8
-[TRACE]TRACE_FLOW[0x7]_CADDBUFFER_NEWL_ENTRY=0x1ad
-[TRACE]TRACE_FLOW[0x7]_CADDBUFFER_NEWL_EXIT=0x1ae
-[TRACE]TRACE_FLOW[0x7]_CADDBUFFER_Reset_ENTRY=0x27b
-[TRACE]TRACE_FLOW[0x7]_CADDBUFFER_Reset_EXIT=0x27c
-[TRACE]TRACE_FLOW[0x7]_CBRANCHBASE_CBRANCHBASE_2_ENTRY=0x209
-[TRACE]TRACE_FLOW[0x7]_CBRANCHBASE_CBRANCHBASE_ENTRY=0x207
-[TRACE]TRACE_FLOW[0x7]_CBRANCHBASE_CBRANCHBASE_EXIT=0x208
-[TRACE]TRACE_FLOW[0x7]_CBRANCHBASE_DELETE_ENTRY=0x20b
-[TRACE]TRACE_FLOW[0x7]_CBRANCHBASE_DELETE_EXIT=0x20c
-[TRACE]TRACE_FLOW[0x7]_CBRANCHBASE_GETALLCONNECTIONMETHODSL_ENTRY=0x277
-[TRACE]TRACE_FLOW[0x7]_CBRANCHBASE_GETALLCONNECTIONMETHODSL_EXIT=0x278
-[TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_ADDBASEURIL_ENTRY=0x274
-[TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_ADDBASEURIL_EXIT=0x275
-[TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_ADDBASEURIL_EXIT_2=0x276
-[TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_CCONNMOADAPTER_ENTRY=0x24f
-[TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_CCONNMOADAPTER_EXIT=0x250
-[TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_COMMITATOMICL_ENTRY=0x263
-[TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_COMMITATOMICL_EXIT=0x264
-[TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_COMPLETEOUTSTANDINGCMDSL_ENTRY=0x26b
-[TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_COMPLETEOUTSTANDINGCMDSL_EXIT=0x26c
-[TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_CONSTRUCTL_ENTRY=0x253
-[TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_CONSTRUCTL_EXIT=0x254
-[TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_COPYCOMMANDL_ENTRY=0x25f
-[TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_COPYCOMMANDL_EXIT=0x260
-[TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_DDFSTRUCTUREL_ENTRY=0x257
-[TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_DDFSTRUCTUREL_EXIT=0x258
-[TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_DDFVERSIONL_ENTRY=0x255
-[TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_DDFVERSIONL_EXIT=0x256
-[TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_DELETE_ENTRY=0x251
-[TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_DELETE_EXIT=0x252
-[TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_EXECUTECOMMANDL_ENTRY=0x25b
-[TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_EXECUTECOMMANDL_EXIT=0x25c
-[TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_EXECUTECOMMANDL_STREAM_ENTRY=0x25d
-[TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_EXECUTECOMMANDL_STREAM_EXIT=0x25e
-[TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_NEWLC_ENTRY=0x24d
-[TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_NEWLC_EXIT=0x24e
-[TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_NEWL_ENTRY=0x24b
-[TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_NEWL_EXIT=0x24c
-[TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_ROLLBACKATOMICL_ENTRY=0x265
-[TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_ROLLBACKATOMICL_EXIT=0x266
-[TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_STARTATOMICL_ENTRY=0x261
-[TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_STARTATOMICL_EXIT=0x262
-[TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_STREAMCOMMITTEDL_ENTRY=0x269
-[TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_STREAMCOMMITTEDL_EXIT=0x26a
-[TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_STREAMINGSUPPORT_ENTRY=0x267
-[TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_STREAMINGSUPPORT_EXIT=0x268
-[TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_UPDATELEAFOBJECTL_STREAM_ENTRY=0x259
-[TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_UPDATELEAFOBJECTL_STREAM_EXIT=0x25a
-[TRACE]TRACE_FLOW[0x7]_CCONNMONODEELEMENT_CCONNMONODEELEMENT_ENTRY=0x1eb
-[TRACE]TRACE_FLOW[0x7]_CCONNMONODEELEMENT_CCONNMONODEELEMENT_EXIT=0x1ec
-[TRACE]TRACE_FLOW[0x7]_CCONNMONODEELEMENT_DELETE_ENTRY=0x1f5
-[TRACE]TRACE_FLOW[0x7]_CCONNMONODEELEMENT_DELETE_EXIT=0x1f6
-[TRACE]TRACE_FLOW[0x7]_CNAPBRANCH_CONSTRUCTL_ENTRY=0x7d
-[TRACE]TRACE_FLOW[0x7]_CNAPBRANCH_CONSTRUCTL_EXIT=0x7e
-[TRACE]TRACE_FLOW[0x7]_CNAPBRANCH_CONSTRUCTOR_ENTRY=0x79
-[TRACE]TRACE_FLOW[0x7]_CNAPBRANCH_CONSTRUCTOR_EXIT=0x7a
-[TRACE]TRACE_FLOW[0x7]_CNAPBRANCH_DDFSTRUCTUREL_ENTRY=0x7f
-[TRACE]TRACE_FLOW[0x7]_CNAPBRANCH_DDFSTRUCTUREL_EXIT=0x80
-[TRACE]TRACE_FLOW[0x7]_CNAPBRANCH_DESTRUCTOR_ENTRY=0x7b
-[TRACE]TRACE_FLOW[0x7]_CNAPBRANCH_DESTRUCTOR_EXIT=0x7c
-[TRACE]TRACE_FLOW[0x7]_CNAPBRANCH_IPBRANCHDDFSTRUCTUREL_ENTRY=0x279
-[TRACE]TRACE_FLOW[0x7]_CNAPBRANCH_IPBRANCHDDFSTRUCTUREL_EXIT=0x27a
-[TRACE]TRACE_FLOW[0x7]_CNAPBRANCH_NEWL_ENTRY=0x77
-[TRACE]TRACE_FLOW[0x7]_CNAPBRANCH_NEWL_EXIT=0x78
-[TRACE]TRACE_FLOW[0x7]_CNAPBRANCH_SETLEAFDATAL_ENTRY=0x247
-[TRACE]TRACE_FLOW[0x7]_CONNMOADAPTER_IMPLEMENTATIONGROUPPROXY_ENTRY=0x26d
-[TRACE]TRACE_FLOW[0x7]_CONNMOADAPTER_IMPLEMENTATIONGROUPPROXY_EXIT=0x26e
-[TRACE]TRACE_FLOW[0x7]_CPROXYBRANCH_CONSTRUCTOR_ENTRY=0x8d
-[TRACE]TRACE_FLOW[0x7]_CPROXYBRANCH_CONSTRUCTOR_EXIT=0x8e
-[TRACE]TRACE_FLOW[0x7]_CPROXYBRANCH_DDFSTRUCTUREL_ENTRY=0x91
-[TRACE]TRACE_FLOW[0x7]_CPROXYBRANCH_DDFSTRUCTUREL_EXIT=0x92
-[TRACE]TRACE_FLOW[0x7]_CPROXYBRANCH_DESTRUCTOR_ENTRY=0x8f
-[TRACE]TRACE_FLOW[0x7]_CPROXYBRANCH_DESTRUCTOR_EXIT=0x90
-[TRACE]TRACE_FLOW[0x7]_CPROXYBRANCH_NEWL_ENTRY=0x8b
-[TRACE]TRACE_FLOW[0x7]_CPROXYBRANCH_NEWL_EXIT=0x8c
-[TRACE]TRACE_FLOW[0x7]_CUTILS_CUTILS_ENTRY=0xe4
-[TRACE]TRACE_FLOW[0x7]_CUTILS_CUTILS_EXIT=0xe5
-[TRACE]TRACE_FLOW[0x7]_DUP1_CBRANCHBASE_CBRANCHBASE_2_EXIT=0x20a
-[TRACE]TRACE_NORMAL[0x3]_CADDBUFFER_ADDNODETOBUFFERL_ENTRY=0x1b
-[TRACE]TRACE_NORMAL[0x3]_CADDBUFFER_ADDNODETOBUFFERL_EXIT=0x1c
-[TRACE]TRACE_NORMAL[0x3]_CADDBUFFER_ADDNODETOBUFFERL_LEAF_ENTRY=0x1d
-[TRACE]TRACE_NORMAL[0x3]_CADDBUFFER_ADDNODETOBUFFERL_LEAF_EXIT=0x1e
-[TRACE]TRACE_NORMAL[0x3]_CADDBUFFER_CACHEFINDDYNAMICNODE_ENTRY=0x49
-[TRACE]TRACE_NORMAL[0x3]_CADDBUFFER_CACHEFINDDYNAMICNODE_EXIT=0x4b
-[TRACE]TRACE_NORMAL[0x3]_CADDBUFFER_CACHEFINDDYNAMICNODE_MATCH_FOUND=0x4a
-[TRACE]TRACE_NORMAL[0x3]_CADDBUFFER_CACHEFIND_ENTRY=0x148
-[TRACE]TRACE_NORMAL[0x3]_CADDBUFFER_CACHEFIND_EXIT=0x48
-[TRACE]TRACE_NORMAL[0x3]_CADDBUFFER_CACHEFIND_MATCH_FOUND=0x47
-[TRACE]TRACE_NORMAL[0x3]_CADDBUFFER_CACHEFIND_RESULT_NODE=0x147
-[TRACE]TRACE_NORMAL[0x3]_CADDBUFFER_FINDDYNAMICNODE_ENTRY=0x43
-[TRACE]TRACE_NORMAL[0x3]_CADDBUFFER_FINDDYNAMICNODE_EXIT=0x45
-[TRACE]TRACE_NORMAL[0x3]_CADDBUFFER_FINDDYNAMICNODE_MATCH_FOUND=0x44
-[TRACE]TRACE_NORMAL[0x3]_CADDBUFFER_GETGROUP_ENTRY=0x4c
-[TRACE]TRACE_NORMAL[0x3]_CADDBUFFER_GETGROUP_EXIT=0x4d
-[TRACE]TRACE_NORMAL[0x3]_CBRANCHBASE_CHECKPREVIOUSURILIST_ENTRY=0x61
-[TRACE]TRACE_NORMAL[0x3]_CBRANCHBASE_CHECKPREVIOUSURILIST_EXIT=0x9d
-[TRACE]TRACE_NORMAL[0x3]_CBRANCHBASE_GETALLCONNECTIONMETHODSL_COUNT=0x16e
-[TRACE]TRACE_NORMAL[0x3]_CBRANCHBASE_GETALLDYNAMICNODESL_ENTRY=0x65
-[TRACE]TRACE_NORMAL[0x3]_CBRANCHBASE_GETALLDYNAMICNODESL_EXIT=0x67
-[TRACE]TRACE_NORMAL[0x3]_CBRANCHBASE_GETCONNECTIONMETHODLC_ENTRY=0x173
-[TRACE]TRACE_NORMAL[0x3]_CBRANCHBASE_GETCONNECTIONMETHODLC_EXIT_FOUND=0x175
-[TRACE]TRACE_NORMAL[0x3]_CBRANCHBASE_GETCONNECTIONMETHODLC_EXIT_NOT_FOUND=0x174
-[TRACE]TRACE_NORMAL[0x3]_CCONNMOADAPTER_ADDBRANCHL_ENTRY=0x16c
-[TRACE]TRACE_NORMAL[0x3]_CCONNMOADAPTER_ADDBRANCHL_EXIT=0x16d
-[TRACE]TRACE_NORMAL[0x3]_CCONNMOADAPTER_ADDNODEOBJECTL_ENTRY=0x157
-[TRACE]TRACE_NORMAL[0x3]_CCONNMOADAPTER_ADDNODEOBJECTL_EXIT=0x158
-[TRACE]TRACE_NORMAL[0x3]_CCONNMOADAPTER_CHILDURILISTL_ENTRY=0x155
-[TRACE]TRACE_NORMAL[0x3]_CCONNMOADAPTER_CHILDURILISTL_EXIT=0x156
-[TRACE]TRACE_NORMAL[0x3]_CCONNMOADAPTER_COMMITATOMICL_UNSUPPORTED_METHOD_CALL=0x15d
-[TRACE]TRACE_NORMAL[0x3]_CCONNMOADAPTER_COPYCOMMANDL_UNSUPPORTED_METHOD_CALL=0x15b
-[TRACE]TRACE_NORMAL[0x3]_CCONNMOADAPTER_DELETEOBJECTL_ENTRY=0x14f
-[TRACE]TRACE_NORMAL[0x3]_CCONNMOADAPTER_DELETEOBJECTL_EXIT=0x150
-[TRACE]TRACE_NORMAL[0x3]_CCONNMOADAPTER_EXECUTECOMMANDL_STREAM_UNSUPPORTED_METHOD_CALL=0x15a
-[TRACE]TRACE_NORMAL[0x3]_CCONNMOADAPTER_EXECUTECOMMANDL_UNSUPPORTED_METHOD_CALL=0x159
-[TRACE]TRACE_NORMAL[0x3]_CCONNMOADAPTER_FETCHLEAFOBJECTL_ENTRY=0x151
-[TRACE]TRACE_NORMAL[0x3]_CCONNMOADAPTER_FETCHLEAFOBJECTL_EXIT=0x152
-[TRACE]TRACE_NORMAL[0x3]_CCONNMOADAPTER_FETCHLEAFOBJECTSIZEL_ENTRY=0x153
-[TRACE]TRACE_NORMAL[0x3]_CCONNMOADAPTER_FETCHLEAFOBJECTSIZEL_EXIT=0x154
-[TRACE]TRACE_NORMAL[0x3]_CCONNMOADAPTER_ROLLBACKATOMICL_UNSUPPORTED_METHOD_CALL=0x15e
-[TRACE]TRACE_NORMAL[0x3]_CCONNMOADAPTER_STARTATOMICL_UNSUPPORTED_METHOD_CALL=0x15c
-[TRACE]TRACE_NORMAL[0x3]_CCONNMOADAPTER_STREAMCOMMMITTEDL_UNSUPPORTED_METHOD_CALL=0x160
-[TRACE]TRACE_NORMAL[0x3]_CCONNMOADAPTER_STREAMINGSUPPORT_NOT_SUPPORTED=0x15f
-[TRACE]TRACE_NORMAL[0x3]_CCONNMOADAPTER_UPDATELEAFOBJECTL_ENTRY=0x14c
-[TRACE]TRACE_NORMAL[0x3]_CCONNMOADAPTER_UPDATELEAFOBJECTL_EXIT=0x14d
-[TRACE]TRACE_NORMAL[0x3]_CCONNMOADAPTER_UPDATELEAFOBJECTL_STREAM_UNSUPPORTED_METHOD_CALL=0x14e
-[TRACE]TRACE_NORMAL[0x3]_CNAPBRANCH_ADDNODEOBJECTL=0x18a
-[TRACE]TRACE_NORMAL[0x3]_CNAPBRANCH_ADDNODEOBJECTL_ALLREADY_EXISTS=0x181
-[TRACE]TRACE_NORMAL[0x3]_CNAPBRANCH_ADDNODEOBJECTL_ENTRY=0xdc
-[TRACE]TRACE_NORMAL[0x3]_CNAPBRANCH_ADDNODEOBJECTL_EXIT=0xdd
-[TRACE]TRACE_NORMAL[0x3]_CNAPBRANCH_ADDNODEOBJECTL_NEW_NODE=0x165
-[TRACE]TRACE_NORMAL[0x3]_CNAPBRANCH_ADDNODEOBJECTL_NEW_NODE2=0x169
-[TRACE]TRACE_NORMAL[0x3]_CNAPBRANCH_ALLMANDATORYNAPFIELDSFOUND_ENTRY=0xb8
-[TRACE]TRACE_NORMAL[0x3]_CNAPBRANCH_ALLMANDATORYNAPFIELDSFOUND_EXIT=0xb9
-[TRACE]TRACE_NORMAL[0x3]_CNAPBRANCH_CHILDURILISTL=0x6
-[TRACE]TRACE_NORMAL[0x3]_CNAPBRANCH_CHILDURILISTL_ENTRY=0xd8
-[TRACE]TRACE_NORMAL[0x3]_CNAPBRANCH_DELETEOBJECTL_ENTRY=0xcb
-[TRACE]TRACE_NORMAL[0x3]_CNAPBRANCH_DELETEOBJECTL_EXIT=0xcc
-[TRACE]TRACE_NORMAL[0x3]_CNAPBRANCH_DELETEOBJECTL_PRIVATE_DELETE=0x166
-[TRACE]TRACE_NORMAL[0x3]_CNAPBRANCH_DELETEOBJECTL_PRIVATE_ENTRY=0xc7
-[TRACE]TRACE_NORMAL[0x3]_CNAPBRANCH_DELETEOBJECTL_PRIVATE_EXIT=0xc8
-[TRACE]TRACE_NORMAL[0x3]_CNAPBRANCH_DUP1_FETCHLEAFOBJECTL_NOT_FOUND=0x189
-[TRACE]TRACE_NORMAL[0x3]_CNAPBRANCH_DUP_FETCHLEAFOBJECTL_NOT_FOUND=0x188
-[TRACE]TRACE_NORMAL[0x3]_CNAPBRANCH_FETCHLEAFOBJECTL_ENTRY=0xcf
-[TRACE]TRACE_NORMAL[0x3]_CNAPBRANCH_FETCHLEAFOBJECTL_EXIT=0xd3
-[TRACE]TRACE_NORMAL[0x3]_CNAPBRANCH_FETCHLEAFOBJECTL_NOT_FOUND=0xd2
-[TRACE]TRACE_NORMAL[0x3]_CNAPBRANCH_FETCHLEAFOBJECTL_STATUS=0xd0
-[TRACE]TRACE_NORMAL[0x3]_CNAPBRANCH_FETCHLEAFOBJECTSIZEL_ENTRY=0xd4
-[TRACE]TRACE_NORMAL[0x3]_CNAPBRANCH_FETCHLEAFOBJECTSIZEL_EXIT=0xd7
-[TRACE]TRACE_NORMAL[0x3]_CNAPBRANCH_FETCHLEAFOBJECTSIZEL_NOT_FOUND=0xd6
-[TRACE]TRACE_NORMAL[0x3]_CNAPBRANCH_FETCHLEAFOBJECTSIZEL_STATUS=0xd5
-[TRACE]TRACE_NORMAL[0x3]_CNAPBRANCH_FINDNEWCMTYPE_3GPP=0xb4
-[TRACE]TRACE_NORMAL[0x3]_CNAPBRANCH_FINDNEWCMTYPE_ENTRY=0xb2
-[TRACE]TRACE_NORMAL[0x3]_CNAPBRANCH_FINDNEWCMTYPE_EXIT=0xb3
-[TRACE]TRACE_NORMAL[0x3]_CNAPBRANCH_GETDYNAMICNAPNODEURI=0x17a
-[TRACE]TRACE_NORMAL[0x3]_CNAPBRANCH_GETLEAFDATAL_ENTRY=0xa3
-[TRACE]TRACE_NORMAL[0x3]_CNAPBRANCH_GETLEAFDATAL_EXIT=0x9a
-[TRACE]TRACE_NORMAL[0x3]_CNAPBRANCH_GETUNMODIFIABLEFIELDADDRESULT_ENTRY=0xa4
-[TRACE]TRACE_NORMAL[0x3]_CNAPBRANCH_GETUNMODIFIABLEFIELDVALUEL_ENTRY=0x16f
-[TRACE]TRACE_NORMAL[0x3]_CNAPBRANCH_GETUNMODIFIABLEFIELDVALUEL_EXIT=0x170
-[TRACE]TRACE_NORMAL[0x3]_CNAPBRANCH_MAPURITOCMATTRIBUTE_ENTRY=0xac
-[TRACE]TRACE_NORMAL[0x3]_CNAPBRANCH_MAPURITOCMATTRIBUTE_EXIT=0xa8
-[TRACE]TRACE_NORMAL[0x3]_CNAPBRANCH_MAPURITOCMATTRIBUTE_GET_NODE=0xa7
-[TRACE]TRACE_NORMAL[0x3]_CNAPBRANCH_NAPCHILDURILISTL_ADDED_TO_LIST=0xc1
-[TRACE]TRACE_NORMAL[0x3]_CNAPBRANCH_NAPCHILDURILISTL_ENTRY=0xc0
-[TRACE]TRACE_NORMAL[0x3]_CNAPBRANCH_NAPCHILDURILISTL_EXIT=0xc2
-[TRACE]TRACE_NORMAL[0x3]_CNAPBRANCH_PROCESSBUFFERL_ENTRY=0xdf
-[TRACE]TRACE_NORMAL[0x3]_CNAPBRANCH_PROCESSBUFFERL_EXIT=0xe0
-[TRACE]TRACE_NORMAL[0x3]_CNAPBRANCH_SETLEAFDATAL_EXIT=0xae
-[TRACE]TRACE_NORMAL[0x3]_CNAPBRANCH_SETLEAFDATAL_GET_CMATTRIB=0xad
-[TRACE]TRACE_NORMAL[0x3]_CNAPBRANCH_SETNODEDATAL_ENTRY=0xaf
-[TRACE]TRACE_NORMAL[0x3]_CNAPBRANCH_SETNODEDATAL_EXISTS=0x163
-[TRACE]TRACE_NORMAL[0x3]_CNAPBRANCH_SETNODEDATAL_EXIT=0x161
-[TRACE]TRACE_NORMAL[0x3]_CNAPBRANCH_SETNODEDATAL_OK=0x162
-[TRACE]TRACE_NORMAL[0x3]_CNAPBRANCH_UPDATELEAFOBJECTL=0x176
-[TRACE]TRACE_NORMAL[0x3]_CNAPBRANCH_UPDATELEAFOBJECTL_ENTRY=0xc5
-[TRACE]TRACE_NORMAL[0x3]_CNAPBRANCH_UPDATELEAFOBJECTL_EXIT=0xc6
-[TRACE]TRACE_NORMAL[0x3]_CPROXYBRANCH_ADDNODEOBJECTL_ALREADY_EXISTS=0x10b
-[TRACE]TRACE_NORMAL[0x3]_CPROXYBRANCH_ADDNODEOBJECTL_ENTRY=0x109
-[TRACE]TRACE_NORMAL[0x3]_CPROXYBRANCH_ADDNODEOBJECTL_EXIT=0x10c
-[TRACE]TRACE_NORMAL[0x3]_CPROXYBRANCH_ADDNODEOBJECTL_NEW_NODE=0x167
-[TRACE]TRACE_NORMAL[0x3]_CPROXYBRANCH_ADDNODEOBJECTL_NEW_NODE2=0x168
-[TRACE]TRACE_NORMAL[0x3]_CPROXYBRANCH_ALLMANDATORYPROXYFIELDSFOUND_ENTRY=0xf2
-[TRACE]TRACE_NORMAL[0x3]_CPROXYBRANCH_ALLMANDATORYPROXYFIELDSFOUND_EXIT=0xf3
-[TRACE]TRACE_NORMAL[0x3]_CPROXYBRANCH_CHECKFORUNMODIFIABLEFIELD_ENTRY=0xe6
-[TRACE]TRACE_NORMAL[0x3]_CPROXYBRANCH_CHECKFORUNMODIFIABLEFIELD_EXIT=0xe7
-[TRACE]TRACE_NORMAL[0x3]_CPROXYBRANCH_CHILDURILISTL_ENTRY=0x106
-[TRACE]TRACE_NORMAL[0x3]_CPROXYBRANCH_CHILDURILISTL_EXIT=0x108
-[TRACE]TRACE_NORMAL[0x3]_CPROXYBRANCH_CHILDURILISTL_NOT_FOUND=0x107
-[TRACE]TRACE_NORMAL[0x3]_CPROXYBRANCH_FETCHLEAFOBJECTL_ENTRY=0xe3
-[TRACE]TRACE_NORMAL[0x3]_CPROXYBRANCH_FETCHLEAFOBJECTL_EXIT=0xe5
-[TRACE]TRACE_NORMAL[0x3]_CPROXYBRANCH_FETCHLEAFOBJECTL_NOT_FOUND=0xe4
-[TRACE]TRACE_NORMAL[0x3]_CPROXYBRANCH_FETCHLEAFOBJECTL_PUPLIC_ENTRY=0x102
-[TRACE]TRACE_NORMAL[0x3]_CPROXYBRANCH_FETCHLEAFOBJECTL_PUPLIC_EXIT=0x103
-[TRACE]TRACE_NORMAL[0x3]_CPROXYBRANCH_FETCHLEAFOBJECTSIZEL_ENTRY=0x104
-[TRACE]TRACE_NORMAL[0x3]_CPROXYBRANCH_FETCHLEAFOBJECTSIZEL_EXIT=0x105
-[TRACE]TRACE_NORMAL[0x3]_CPROXYBRANCH_FETCHLEAFOBJECT_OK=0x18
-[TRACE]TRACE_NORMAL[0x3]_CPROXYBRANCH_FINDCONNECTIONMETHODL_ENTRY=0x171
-[TRACE]TRACE_NORMAL[0x3]_CPROXYBRANCH_FINDCONNECTIONMETHODL_EXIT=0x172
-[TRACE]TRACE_NORMAL[0x3]_CPROXYBRANCH_GETALLDYNAMICPROXYNODESL_ENTRY=0xf8
-[TRACE]TRACE_NORMAL[0x3]_CPROXYBRANCH_GETALLDYNAMICPROXYNODESL_EXIT=0xfa
-[TRACE]TRACE_NORMAL[0x3]_CPROXYBRANCH_GETALLDYNAMICPROXYNODESL_PROXY=0xfb
-[TRACE]TRACE_NORMAL[0x3]_CPROXYBRANCH_GETALLDYNAMICPROXYNODES_ADDED_TO_LIST=0x1
-[TRACE]TRACE_NORMAL[0x3]_CPROXYBRANCH_GETDYNAMICPROXYNODEURI=0x17e
-[TRACE]TRACE_NORMAL[0x3]_CPROXYBRANCH_MAPURITOCMATTRIBUTE_ENTRY=0xea
-[TRACE]TRACE_NORMAL[0x3]_CPROXYBRANCH_MAPURITOCMATTRIBUTE_EXIT=0xeb
-[TRACE]TRACE_NORMAL[0x3]_CPROXYBRANCH_PROCESSBUFFERL_ENTRY=0x10d
-[TRACE]TRACE_NORMAL[0x3]_CPROXYBRANCH_PROCESSBUFFERL_EXIT=0x10f
-[TRACE]TRACE_NORMAL[0x3]_CPROXYBRANCH_SETLEAFDATAL_ENTRY=0xf4
-[TRACE]TRACE_NORMAL[0x3]_CPROXYBRANCH_SETLEAFDATAL_EXIT=0xf5
-[TRACE]TRACE_NORMAL[0x3]_CPROXYBRANCH_SETNODEDATAL_ENTRY=0xf6
-[TRACE]TRACE_NORMAL[0x3]_CPROXYBRANCH_SETNODEDATAL_EXIT=0xf7
-[TRACE]TRACE_NORMAL[0x3]_CPROXYBRANCH_UPDATELEAFOBJECTL=0x179
-[TRACE]TRACE_NORMAL[0x3]_CPROXYBRANCH_UPDATELEAFOBJECTL_ENTRY=0xfe
-[TRACE]TRACE_NORMAL[0x3]_CPROXYBRANCH_UPDATELEAFOBJECTL_EXIT=0xff
-[TRACE]TRACE_NORMAL[0x3]_CUTILS_GETENDOFURIFROMSEG_ENTRY=0x13b
-[TRACE]TRACE_NORMAL[0x3]_CUTILS_GETENDOFURIFROMSEG_EXIT=0x13c
-[TRACE]TRACE_NORMAL[0x3]_CUTILS_GETENDOFURIFROMSEG_EXIT2=0x13f
-[TRACE]TRACE_NORMAL[0x3]_CUTILS_GETFIRSTURISEG_ENTRY=0x110
-[TRACE]TRACE_NORMAL[0x3]_CUTILS_GETFIRSTURISEG_EXIT=0x13d
-[TRACE]TRACE_NORMAL[0x3]_CUTILS_GETLASTURISEG_ENTRY=0x123
-[TRACE]TRACE_NORMAL[0x3]_CUTILS_GETLASTURISEG_EXIT=0x124
-[TRACE]TRACE_NORMAL[0x3]_CUTILS_GETLASTURISEG_EXIT2=0x141
-[TRACE]TRACE_NORMAL[0x3]_CUTILS_GETSECONDTURISEG_EXIT=0x140
-[TRACE]TRACE_NORMAL[0x3]_CUTILS_GETSECONDURISEG_ENTRY=0x112
-[TRACE]TRACE_NORMAL[0x3]_DUP1_CNAPBRANCH_CHILDURILISTL=0x182
-[TRACE]TRACE_NORMAL[0x3]_DUP1_CNAPBRANCH_CHILDURILISTL_EXIT=0xd9
-[TRACE]TRACE_NORMAL[0x3]_DUP1_CNAPBRANCH_GETDYNAMICNAPNODEURI=0x17b
-[TRACE]TRACE_NORMAL[0x3]_DUP1_CNAPBRANCH_GETUNMODIFIABLEFIELDADDRESULT_EXIT=0xa5
-[TRACE]TRACE_NORMAL[0x3]_DUP1_CNAPBRANCH_UPDATELEAFOBJECTL=0x177
-[TRACE]TRACE_NORMAL[0x3]_DUP1_CPROXYBRANCH_CHILDURILISTL=0x186
-[TRACE]TRACE_NORMAL[0x3]_DUP1_CPROXYBRANCH_UPDATELEAFOBJECTL=0x178
-[TRACE]TRACE_NORMAL[0x3]_DUP1_CPROXYRANCH_GETDYNAMICPROXYNODEURI=0x17f
-[TRACE]TRACE_NORMAL[0x3]_DUP2_CNAPBRANCH_CHILDURILISTL=0x183
-[TRACE]TRACE_NORMAL[0x3]_DUP2_CPROXYBRANCH_CHILDURILISTL=0x187
-[[OBSOLETE]][TRACE]TRACE_DEBUG[0x9]_CUTILS_GETSEGPOSITIONFROMURI=0x1
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CADDBUFFER_AddNodeToBufferL_ENTRY=0x1b3
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CADDBUFFER_AddNodeToBufferL_EXIT=0x1b4
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CADDBUFFER_AddNodeToBufferL__leaf_EXIT=0x1b6
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CADDBUFFER_AddNodeToBufferL_leaf_ENTRY=0x1b5
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CADDBUFFER_CONSTRUCTOR_ENTRY=0x1af
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CADDBUFFER_CONSTRUCTOR_EXIT=0x1b0
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CADDBUFFER_CacheFindDynamicNode_ENTRY=0x1c5
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CADDBUFFER_CacheFindDynamicNode_EXIT=0x1c6
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CADDBUFFER_CacheFind_ENTRY=0x1c3
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CADDBUFFER_CacheFind_EXIT=0x1c4
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CADDBUFFER_DESTRUCTOR_ENTRY=0x1b1
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CADDBUFFER_DESTRUCTOR_EXIT=0x1b2
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CADDBUFFER_FindDynamicNode_ENTRY=0x1b9
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CADDBUFFER_FindDynamicNode_EXIT=0x1ba
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CADDBUFFER_Find_ENTRY=0x1b7
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CADDBUFFER_Find_EXIT=0x1b8
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CADDBUFFER_GetGroup_ENTRY=0x1bb
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CADDBUFFER_GetGroup_EXIT=0x1bc
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CADDBUFFER_NEWLC_ENTRY=0x9d
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CADDBUFFER_NEWLC_EXIT=0x9e
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CADDBUFFER_NEWL_ENTRY=0x9b
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CADDBUFFER_NEWL_EXIT=0x9c
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CBRANCHBASE_CALLBACK_ENTRY=0x20d
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CBRANCHBASE_CALLBACK_EXIT=0x20e
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CBRANCHBASE_GETALLCONNECTIONMETHODS_ENTRY=0x20f
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CBRANCHBASE_GETALLCONNECTIONMETHODS_EXIT=0x210
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_ADDBASEURI_ENTRY=0x248
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_ADDBASEURI_EXIT=0x249
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_ADDBASEURI_EXIT_2=0x24a
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_ADDBRANCH_ENTRY=0x165
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_ADDBRANCH_EXIT=0x166
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_ADDNODEOBJECTL_ENTRY=0x181
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_ADDNODEOBJECTL_EXIT=0x182
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_CCONNMOADAPTER_ENTRY=0x214
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_CCONNMOADAPTER_EXIT=0x215
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_CHILDURILISTL_ENTRY=0x17f
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_CHILDURILISTL_EXIT=0x180
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_COMMITATOMICL_ENTRY=0x18b
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_COMMITATOMICL_EXIT=0x18c
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_COMPLETEOUTSTANDINGCMDSL_ENTRY=0x193
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_COMPLETEOUTSTANDINGCMDSL_EXIT=0x194
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_CONSTRUCTL_ENTRY=0x16f
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_CONSTRUCTL_EXIT=0x170
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_CONSTRUCTOR_ENTRY=0x16b
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_CONSTRUCTOR_EXIT=0x16c
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_COPYCOMMANDL_ENTRY=0x228
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_COPYCOMMANDL_EXIT=0x229
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_DDFSTRUCTUREL_ENTRY=0x173
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_DDFSTRUCTUREL_EXIT=0x174
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_DDFVERSIONL_ENTRY=0x171
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_DDFVERSIONL_EXIT=0x172
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_DELETEOBJECTL_ENTRY=0x179
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_DELETEOBJECTL_EXIT=0x17a
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_DELETE_ENTRY=0x218
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_DELETE_EXIT=0x219
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_DESTRUCTOR_ENTRY=0x16d
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_DESTRUCTOR_EXIT=0x16e
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_EXECUTECOMMANDL_ENTRY=0x224
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_EXECUTECOMMANDL_EXIT=0x225
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_EXECUTECOMMANDL_STREAM_ENTRY=0x226
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_EXECUTECOMMANDL_STREAM_EXIT=0x227
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_FETCHLEAFOBJECTL_ENTRY=0x17b
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_FETCHLEAFOBJECTL_EXIT=0x17c
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_FETCHLEAFOBJECTSIZEL_ENTRY=0x17d
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_FETCHLEAFOBJECTSIZEL_EXIT=0x17e
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_NEWLC_ENTRY=0x169
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_NEWLC_EXIT=0x16a
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_NEWL_ENTRY=0x167
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_NEWL_EXIT=0x168
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_ROLLBACKATOMICL_ENTRY=0x18d
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_ROLLBACKATOMICL_EXIT=0x18e
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_STARTATOMICL_ENTRY=0x189
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_STARTATOMICL_EXIT=0x18a
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_STREAMCOMMITTEDL_ENTRY=0x191
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_STREAMCOMMITTEDL_EXIT=0x192
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_STREAMINGSUPPORT_ENTRY=0x18f
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_STREAMINGSUPPORT_EXIT=0x190
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_UPDATELEAFOBJECTL_ENTRY=0x175
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_UPDATELEAFOBJECTL_EXIT=0x176
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_UPDATELEAFOBJECTL_STREAM_ENTRY=0x22a
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CCONNMOADAPTER_UPDATELEAFOBJECTL_STREAM_EXIT=0x237
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CEAPBRANCH_ADDNODEOBJECTL_ENTRY=0x1ab
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CEAPBRANCH_ADDNODEOBJECTL_EXIT=0x1ac
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CEAPBRANCH_CHILDURILISTL_ENTRY=0x1a9
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CEAPBRANCH_CHILDURILISTL_EXIT=0x1aa
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CEAPBRANCH_CONSTRUCTOR_ENTRY=0x233
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CEAPBRANCH_CONSTRUCTOR_EXIT=0x234
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CEAPBRANCH_DDFSTRUCTUREL_ENTRY=0x19d
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CEAPBRANCH_DDFSTRUCTUREL_EXIT=0x19e
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CEAPBRANCH_DELETEOBJECTL_ENTRY=0x1a3
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CEAPBRANCH_DELETEOBJECTL_EXIT=0x1a4
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CEAPBRANCH_DESTRUCTOR_ENTRY=0x235
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CEAPBRANCH_DESTRUCTOR_EXIT=0x236
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CEAPBRANCH_FETCHLEAFOBJECTL_ENTRY=0x1a5
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CEAPBRANCH_FETCHLEAFOBJECTL_EXIT=0x1a6
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CEAPBRANCH_FETCHLEAFOBJECTSIZEL_ENTRY=0x1a7
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CEAPBRANCH_FETCHLEAFOBJECTSIZEL_EXIT=0x1a8
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CEAPBRANCH_NEWL_ENTRY=0x232
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CEAPBRANCH_NEWL_EXIT=0x22d
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CEAPBRANCH_UPDATELEAFOBJECTL_ENTRY=0x19f
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CEAPBRANCH_UPDATELEAFOBJECTL_EXIT=0x1a0
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CNAPBRANCH_ADDNODEOBJECTL_ENTRY=0xc2
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CNAPBRANCH_ADDNODEOBJECTL_EXIT=0xc3
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CNAPBRANCH_AllMandatoryNapFieldsFound_ENTRY=0x14b
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CNAPBRANCH_AllMandatoryNapFieldsFound_EXIT=0x14c
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CNAPBRANCH_CHECKPREVIOUSURILIST_ENTRY=0xe8
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CNAPBRANCH_CHECKPREVIOUSURILIST_EXIT=0xe9
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CNAPBRANCH_CHILDURILISTL_ENTRY=0xc0
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CNAPBRANCH_CHILDURILISTL_EXIT=0xc1
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CNAPBRANCH_CheckForUnmodifiableField_ENTRY=0x141
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CNAPBRANCH_CheckForUnmodifiableField_EXIT=0x142
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CNAPBRANCH_DELETEOBJECTL_ENTRY=0xba
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CNAPBRANCH_DELETEOBJECTL_EXIT=0xbb
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CNAPBRANCH_FETCHLEAFOBJECTL_ENTRY=0xbc
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CNAPBRANCH_FETCHLEAFOBJECTL_EXIT=0xbd
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CNAPBRANCH_FETCHLEAFOBJECTSIZEL_ENTRY=0xbe
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CNAPBRANCH_FETCHLEAFOBJECTSIZEL_EXIT=0xbf
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CNAPBRANCH_FindNewCmType_ENTRY=0x149
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CNAPBRANCH_FindNewCmType_EXIT=0x14a
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CNAPBRANCH_GETURILISTFORNAPNODEL_ENTRY=0x127
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CNAPBRANCH_GETURILISTFORNAPNODEL_EXIT=0x128
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CNAPBRANCH_GetLeafDataL_ENTRY=0x1c1
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CNAPBRANCH_GetLeafDataL_EXIT=0x1c2
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CNAPBRANCH_GetUnmodifiableFieldValue_ENTRY=0x1bf
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CNAPBRANCH_GetUnmodifiableFieldValue_EXIT=0x1c0
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CNAPBRANCH_IPBRANCHDDFSTRUCTURE_ENTRY=0x81
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CNAPBRANCH_IPBRANCHDDFSTRUCTURE_EXIT=0x82
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CNAPBRANCH_MapUriToCmAttribute_ENTRY=0x143
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CNAPBRANCH_MapUriToCmAttribute_EXIT=0x144
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CNAPBRANCH_NAPCHILDURILISTL_ENTRY=0x105
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CNAPBRANCH_NAPCHILDURILISTL_EXIT=0x106
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CNAPBRANCH_ProcessBufferL_ENTRY=0x14d
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CNAPBRANCH_ProcessBufferL_EXIT=0x14e
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CNAPBRANCH_SetLeafDataL_ENTRY=0x145
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CNAPBRANCH_SetLeafDataL_EXIT=0x146
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CNAPBRANCH_SetNodeDataL_ENTRY=0x147
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CNAPBRANCH_SetNodeDataL_EXIT=0x148
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CNAPBRANCH_UPDATELEAFOBJECTL_ENTRY=0xb6
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CNAPBRANCH_UPDATELEAFOBJECTL_EXIT=0xb7
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CNAPBRANCH_UPDATELEAFOBJECTL_STREAM_ENTRY=0xb8
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CNAPBRANCH_UPDATELEAFOBJECTL_STREAM_EXIT=0xb9
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CONNMOADAPTER_IMPLEMENTATIONGROUPPROXY_ENTRY=0x195
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CONNMOADAPTER_IMPLEMENTATIONGROUPPROXY_EXIT=0x196
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CPROXYBRANCH_ADDNODEOBJECTL_ENTRY=0x121
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CPROXYBRANCH_ADDNODEOBJECTL_EXIT=0x122
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CPROXYBRANCH_AllMandatoryProxyFieldsFound_ENTRY=0x135
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CPROXYBRANCH_AllMandatoryProxyFieldsFound_EXIT=0x136
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CPROXYBRANCH_CHILDURILISTL_ENTRY=0x11f
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CPROXYBRANCH_CHILDURILISTL_EXIT=0x120
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CPROXYBRANCH_CheckForUnmodifiableField_ENTRY=0x12f
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CPROXYBRANCH_CheckForUnmodifiableField_EXIT=0x130
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CPROXYBRANCH_DELETEOBJECTL_ENTRY=0x119
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CPROXYBRANCH_DELETEOBJECTL_EXIT=0x11a
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CPROXYBRANCH_FETCHLEAFOBJECTL_ENTRY=0x11b
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CPROXYBRANCH_FETCHLEAFOBJECTL_EXIT=0x11c
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CPROXYBRANCH_FETCHLEAFOBJECTSIZEL_ENTRY=0x11d
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CPROXYBRANCH_FETCHLEAFOBJECTSIZEL_EXIT=0x11e
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CPROXYBRANCH_FindConnectionMethod_ENTRY=0x133
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CPROXYBRANCH_FindConnectionMethod_EXIT=0x134
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CPROXYBRANCH_GETALLDYNAMICPROXYNODES_ENTRY=0x113
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CPROXYBRANCH_GETALLDYNAMICPROXYNODES_EXIT=0x114
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CPROXYBRANCH_GETCONNECTIONMETHOD_ENTRY=0x110
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CPROXYBRANCH_GETCONNECTIONMETHOD_EXIT=0x111
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CPROXYBRANCH_GETDYNAMICNODESFORPROXYFIELDL_ENTRY=0x125
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CPROXYBRANCH_GETDYNAMICNODESFORPROXYFIELDL_EXIT=0x126
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CPROXYBRANCH_GETURILISTFORPROXYNODEL_ENTRY=0x123
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CPROXYBRANCH_GETURILISTFORPROXYNODEL_EXIT=0x124
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CPROXYBRANCH_MapUriToCmAttribute_ENTRY=0x131
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CPROXYBRANCH_MapUriToCmAttribute_EXIT=0x132
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CPROXYBRANCH_ProcessBufferL_ENTRY=0x13b
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CPROXYBRANCH_ProcessBufferL_EXIT=0x13c
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CPROXYBRANCH_SetLeafDataL_ENTRY=0x137
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CPROXYBRANCH_SetLeafDataL_EXIT=0x138
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CPROXYBRANCH_SetNodeDataL_ENTRY=0x139
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CPROXYBRANCH_SetNodeDataL_EXIT=0x13a
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CPROXYBRANCH_UPDATELEAFOBJECTL_ENTRY=0x115
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CPROXYBRANCH_UPDATELEAFOBJECTL_EXIT=0x116
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CPROXYBRANCH_UPDATELEAFOBJECTL_STREAM_ENTRY=0x117
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CPROXYBRANCH_UPDATELEAFOBJECTL_STREAM_EXIT=0x118
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CUTILS_CONSTRUCTL_ENTRY=0x26
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CUTILS_CONSTRUCTL_EXIT=0x27
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CUTILS_CONVERTTO16LC_ENTRY=0x1a
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CUTILS_CONVERTTO16LC_EXIT=0x1b
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CUTILS_CONVERTTO8LC_ENTRY=0x18
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CUTILS_CONVERTTO8LC_EXIT=0x19
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CUTILS_CUTILS_ENTRY=0x22
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CUTILS_CUTILS_EXIT=0x23
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CUTILS_DESTOINT_ENTRY=0x1c
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CUTILS_DESTOINT_EXIT=0x1d
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CUTILS_DesToBool_ENTRY=0x13d
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CUTILS_DesToBool_EXIT=0x13e
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CUTILS_ExtractCmId_ENTRY=0x13f
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CUTILS_ExtractCmId_EXIT=0x140
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CUTILS_GETALLDYNAMICNODESL_ENTRY=0x1bd
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CUTILS_GETALLDYNAMICNODESL_EXIT=0x1be
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CUTILS_GETENDOFURIFROMSEG_ENTRY=0x3f
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CUTILS_GETENDOFURIFROMSEG_EXIT=0x41
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CUTILS_GETFIRSTURISEG_ENTRY=0xea
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CUTILS_GETFIRSTURISEG_EXIT=0x104
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CUTILS_GETLASTURISEG_ENTRY=0x33
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CUTILS_GETLASTURISEG_EXIT=0x36
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CUTILS_GETLASTURISEG_EXIT2=0x37
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CUTILS_GETSECONDTURISEG_EXIT=0xec
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CUTILS_GETSECONDURISEG_ENTRY=0xeb
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CUTILS_GETSEGFROMURI_ENTRY=0x3c
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CUTILS_GETSEGFROMURI_EXIT=0x3d
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CUTILS_GETSEGPOSITIONFROMURI_ENTRY=0x49
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CUTILS_GETSEGPOSITIONFROMURI_EXIT=0x4a
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CUTILS_GETURILISTFORNODEL_ENTRY=0x12d
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CUTILS_GETURILISTFORNODEL_EXIT=0x12e
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CUTILS_NEWLC_ENTRY=0xe2
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CUTILS_NEWLC_EXIT=0xe3
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CUTILS_NEWL_ENTRY=0xe0
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CUTILS_NEWL_EXIT=0xe1
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CUTILS_NUMOFURISEGS_ENTRY=0x39
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CUTILS_NUMOFURISEGS_ENTRY_EXIT=0x3b
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CUTILS_NUMOFURISEGS_EXIT=0xf
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CUTILS_NUMOFURISEG_ENTRY=0x38
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CWLANBRANCH_ADDNODEOBJECTL_ENTRY=0x163
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CWLANBRANCH_ADDNODEOBJECTL_EXIT=0x164
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CWLANBRANCH_CHILDURILISTL_ENTRY=0x161
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CWLANBRANCH_CHILDURILISTL_EXIT=0x162
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CWLANBRANCH_CONSTRUCTOR_ENTRY=0x151
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CWLANBRANCH_CONSTRUCTOR_EXIT=0x152
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CWLANBRANCH_DDFSTRUCTUREL_ENTRY=0x155
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CWLANBRANCH_DDFSTRUCTUREL_EXIT=0x156
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CWLANBRANCH_DELETEOBJECTL_ENTRY=0x15b
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CWLANBRANCH_DELETEOBJECTL_EXIT=0x15c
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CWLANBRANCH_DESTRUCTOR_ENTRY=0x153
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CWLANBRANCH_DESTRUCTOR_EXIT=0x154
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CWLANBRANCH_FETCHLEAFOBJECTL_ENTRY=0x15d
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CWLANBRANCH_FETCHLEAFOBJECTL_EXIT=0x15e
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CWLANBRANCH_FETCHLEAFOBJECTSIZEL_ENTRY=0x15f
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CWLANBRANCH_FETCHLEAFOBJECTSIZEL_EXIT=0x160
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CWLANBRANCH_NEWL_ENTRY=0x14f
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CWLANBRANCH_NEWL_EXIT=0x150
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CWLANBRANCH_UPDATELEAFOBJECTL_ENTRY=0x157
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CWLANBRANCH_UPDATELEAFOBJECTL_EXIT=0x158
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CWLANBRANCH_UPDATELEAFOBJECTL_STREAM_ENTRY=0x159
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_CWLANBRANCH_UPDATELEAFOBJECTL_STREAM_EXIT=0x15a
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_DUP1_CEAPBRANCH_UPDATELEAFOBJECTL_ENTRY=0x1a1
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_DUP1_CEAPBRANCH_UPDATELEAFOBJECTL_EXIT=0x1a2
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_DUP1_CPROXYBRANCH_GETCONNECTIONMETHOD_EXIT=0x112
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_DUP1_CUTILS_CUTILS_ENTRY=0x24
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_DUP1_CUTILS_CUTILS_EXIT=0x25
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_DUP1_CUTILS_GETENDOFURIFROMSEG_EXIT=0x40
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_DUP1_CUTILS_GETSEGFROMURI_EXIT=0x3e
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_DUP1_CUTILS_GETSEGPOSITIONFROMURI_EXIT=0x4b
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_DUP1_TLUID_EQUALS_EXIT=0x273
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_DUP2_CUTILS_GETSEGFROMURI_EXIT=0x42
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_TLUID_DELETE_ENTRY=0x26f
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_TLUID_DELETE_EXIT=0x270
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_TLUID_EQUALS_ENTRY=0x271
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_TLUID_EQUALS_EXIT=0x272
-[[OBSOLETE]][TRACE]TRACE_FLOW[0x7]_TLUID_GETCMID_EXIT=0x246
-[[OBSOLETE]][TRACE]TRACE_IMPORTANT[0x2]_CCONNMOADAPTER_COMMITATOMICL_UNSUPPORTED_METHOD_CALL=0xe
-[[OBSOLETE]][TRACE]TRACE_IMPORTANT[0x2]_CCONNMOADAPTER_COPYCOMMANDL_UNSUPPORTED_METHOD_CALL=0xc
-[[OBSOLETE]][TRACE]TRACE_IMPORTANT[0x2]_CCONNMOADAPTER_EXECUTECOMMANDL_STREAM_UNSUPPORTED_METHOD_CALL=0xb
-[[OBSOLETE]][TRACE]TRACE_IMPORTANT[0x2]_CCONNMOADAPTER_EXECUTECOMMANDL_UNSUPPORTED_METHOD_CALL=0xa
-[[OBSOLETE]][TRACE]TRACE_IMPORTANT[0x2]_CCONNMOADAPTER_ROLLBACKATOMICL_UNSUPPORTED_METHOD_CALL=0xf
-[[OBSOLETE]][TRACE]TRACE_IMPORTANT[0x2]_CCONNMOADAPTER_STARTATOMICL_UNSUPPORTED_METHOD_CALL=0xd
-[[OBSOLETE]][TRACE]TRACE_IMPORTANT[0x2]_CCONNMOADAPTER_STREAMCOMMMITTEDL_UNSUPPORTED_METHOD_CALL=0x10
-[[OBSOLETE]][TRACE]TRACE_IMPORTANT[0x2]_CCONNMOADAPTER_UPDATELEAFOBJECTL_UNSUPPORTED_METHOD_CALL=0x9
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_CADDBUFFER_CACHEFIND_ENTRY=0x46
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_CADDBUFFER_FIND_ENTRY=0x1f
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_CADDBUFFER_FIND_EXIT=0x20
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_CADDBUFFER_FIND_MATCH_FOUND=0x42
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_CBRANCHBASE_CHECKPREVIOUSURILIST_EXIT=0x62
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_CBRANCHBASE_GETALLCONNECTIONMETHODS_COUNT=0xf9
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_CBRANCHBASE_GETALLDYNAMICNODESL_ADDED_TO_LIST=0x17
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_CBRANCHBASE_GETALLDYNAMICNODESL_NOTFOUND=0x66
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_CBRANCHBASE_GETCONNECTIONMETHODL_ENTRY=0x68
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_CBRANCHBASE_GETCONNECTIONMETHODL_EXIT_FOUND=0x6a
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_CBRANCHBASE_GETCONNECTIONMETHODL_EXIT_NOT_FOUND=0x69
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_CBRANCHBASE_GETURILISTFORNODEL_ENTRY=0x63
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_CBRANCHBASE_GETURILISTFORNODEL_EXIT=0x185
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_CBRANCHBASE_GETURILISTFORNODEL_NOTFOUND=0x184
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_CBRANCHBASE_GETURILISTFORNODEL_OK=0x14
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_CCONNMOADAPTER_ADDBRANCH_ENTRY=0x149
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_CCONNMOADAPTER_ADDBRANCH_EXIT=0x14a
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_CCONNMOADAPTER_ADDNODEOBJECTL_ENTRY=0x7b
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_CCONNMOADAPTER_ADDNODEOBJECTL_EXIT=0x7c
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_CCONNMOADAPTER_CHILDURILISTL_ENTRY=0x85
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_CCONNMOADAPTER_CHILDURILISTL_EXIT=0x86
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_CCONNMOADAPTER_COMMITATOMICL_UNSUPPORTED_METHOD_CALL=0x81
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_CCONNMOADAPTER_COPYCOMMANDL_UNSUPPORTED_METHOD_CALL=0x7f
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_CCONNMOADAPTER_DDFVERSIONL_VERSION=0x14b
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_CCONNMOADAPTER_DELETEOBJECTL_ENTRY=0x8b
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_CCONNMOADAPTER_DELETEOBJECTL_EXIT=0x8c
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_CCONNMOADAPTER_EXECUTECOMMANDL_STREAM_UNSUPPORTED_METHOD_CALL=0x7e
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_CCONNMOADAPTER_EXECUTECOMMANDL_UNSUPPORTED_METHOD_CALL=0x7d
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_CCONNMOADAPTER_FETCHLEAFOBJECTL_ENTRY=0x89
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_CCONNMOADAPTER_FETCHLEAFOBJECTL_EXIT=0x8a
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_CCONNMOADAPTER_FETCHLEAFOBJECTSIZEL_ENTRY=0x87
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_CCONNMOADAPTER_FETCHLEAFOBJECTSIZEL_EXIT=0x88
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_CCONNMOADAPTER_ROLLBACKATOMICL_UNSUPPORTED_METHOD_CALL=0x82
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_CCONNMOADAPTER_STARTATOMICL_UNSUPPORTED_METHOD_CALL=0x80
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_CCONNMOADAPTER_STREAMCOMMMITTEDL_UNSUPPORTED_METHOD_CALL=0x84
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_CCONNMOADAPTER_STREAMINGSUPPORT_NOT_SUPPORTED=0x83
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_CCONNMOADAPTER_UPDATELEAFOBJECTL_ENTRY=0x8e
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_CCONNMOADAPTER_UPDATELEAFOBJECTL_EXIT=0x8f
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_CCONNMOADAPTER_UPDATELEAFOBJECTL_STREAM_UNSUPPORTED_METHOD_CALL=0x8d
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_CCONNMONODEELEMENT_CCONNMONODEELEMENT_ENTRY_2=0x40
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_CCONNMONODEELEMENT_CCONNMONODEELEMENT_EXIT_2=0x41
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_CNAPBRANCH_ADDNODEOBJECTL=0x180
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_CNAPBRANCH_ADDNODEOBJECTL_ALLREADY_EXISTS=0xde
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_CNAPBRANCH_DELETEOBJECTL_PUBLIC_ENTRY=0xc3
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_CNAPBRANCH_DELETEOBJECTL_PUBLIC_EXIT=0xc4
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_CNAPBRANCH_FINDNEWCMTYPE_WLAN=0xb5
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_CNAPBRANCH_GETLEAFDATAL=0x99
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_CNAPBRANCH_GETUNMODIFIABLEFIELDVALUE=0x98
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_CNAPBRANCH_GETUNMODIFIABLEFIELDVALUE_ENTRY=0x97
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_CNAPBRANCH_GETUNMODIFIABLEFIELDVALUE_EXIT=0xa2
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_CNAPBRANCH_GETURILISTFORNAPNODEL=0x7
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_CNAPBRANCH_GETURILISTFORNAPNODEL_NOTFOUND=0xf
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_CNAPBRANCH_GETURILISTFORNAPNODEL_OK=0xe
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_CPROXYBRANCH_ADDNODEOBJECTL_NEW_NODE=0x164
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_CPROXYBRANCH_CHILDURILISTL3=0x4
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_CPROXYBRANCH_FETCHLEAFOBJECTSIZE_OK=0x19
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_CPROXYBRANCH_FINDCONNECTIONMETHOD_ENTRY=0xee
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_CPROXYBRANCH_FINDCONNECTIONMETHOD_EXIT=0x10e
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_CPROXYBRANCH_GETDYNAMICNODESFORPROXYFIELDL_ADDED_TO_LIST=0x5
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_CUTILS_GETALLDYNAMICNODESL_ADDED_TO_LIST=0x1a
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_CUTILS_GETSEGFROMURI_ENTRY=0x133
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_CUTILS_GETSEGFROMURI_EXIT=0x136
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_CUTILS_GETSEGFROMURI_EXIT2=0x139
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_CUTILS_GETSEGFROMURI_EXIT3=0x142
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_CUTILS_GETSEGPOSITIONFROMURI_ENTRY=0x143
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_CUTILS_GETSEGPOSITIONFROMURI_EXIT=0x144
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_CUTILS_GETSEGPOSITIONFROMURI_EXIT2=0x145
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_CUTILS_GETURILISTFORNODEL_NOTFOUND=0x13
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_CUTILS_GETURILISTFORNODEL_OK=0x16
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_CUTILS_NUMOFURISEGS_ENTRY_EXIT=0x146
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_CUTILS_NUMOFURISEG_ENTRY=0x131
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_DUP2_CPROXYBRANCH_UPDATELEAFOBJECTL=0x17d
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_DUP3_CNAPBRANCH_UPDATELEAFOBJECTL=0x17c
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_GetUriListForProxyNodeL=0x2
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_GetUriListForProxyNodeL2=0x3
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_TLUID_GETCMID=0x16b
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_TLUID_TLUID=0x16a
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_TLUID_TLUID_ID=0x91
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x3]_TLUID_TLUID_NAME=0x90
--- a/omadm/omadmextensions/adapters/connmoadapter/traces/trace.properties	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<trace_properties>
-<enum name="TError">
-<value id="0">EOk</value>
-<value id="1">ENotFound</value>
-<value id="2">EInvalidObject</value>
-<value id="3">EAlreadyExists</value>
-<value id="4">ETooLargeObject</value>
-<value id="5">EDiskFull</value>
-<value id="6">EError</value>
-<value id="7">ERollbackFailed</value>
-<value id="8">EObjectInUse</value>
-<value id="9">ENoMemory</value>
-<value id="10">ECommitOK</value>
-<value id="11">ERollbackOK</value>
-<value id="12">ECommitFailed</value>
-<value id="13">ENotAllowed</value>
-</enum>
-<enum name="TConnectionMethodCommonAttributes">
-<value id="0">ECmCoverage</value>
-<value id="1">ECmDefaultPriority</value>
-<value id="2">ECmDestination</value>
-<value id="3">ECmBearerHasUi</value>
-<value id="4">ECmIPv6Supported</value>
-<value id="5">ECmDefaultUiPriority</value>
-<value id="100">ECmBearerIcon</value>
-<value id="101">ECmBearerAvailableIcon</value>
-<value id="200">ECmBearerAvailableName</value>
-<value id="201">ECmBearerSupportedName</value>
-<value id="202">ECmBearerAvailableText</value>
-<value id="203">ECmBearerNamePopupNote</value>
-<value id="204">ECmCommsDBBearerType</value>
-<value id="205">ECmBearerSettingName</value>
-<value id="206">ECmVirtual</value>
-<value id="400">ECmInvalidAttribute</value>
-<value id="401">ECmAddToAvailableList</value>
-<value id="402">ECmLoadResult</value>
-<value id="500">ECmBearerType</value>
-<value id="501">ECmName</value>
-<value id="502">ECmIapId</value>
-<value id="503">ECmStartPage</value>
-<value id="504">ECmHidden</value>
-<value id="505">ECmProtected</value>
-<value id="506">ECmNamingMethod</value>
-<value id="507">ECmSeamlessnessLevel</value>
-<value id="508">ECmElementID</value>
-<value id="509">ECmNetworkId</value>
-<value id="510">ECmConnected</value>
-<value id="511">ECmId</value>
-<value id="512">ECmWapId</value>
-<value id="513">ECmIapServiceId</value>
-<value id="600">ECmMetaHighlight</value>
-<value id="601">ECmMetaHiddenAgent</value>
-<value id="602">ECmNextLayerIapId</value>
-<value id="603">ECmNextLayerSNAPId</value>
-<value id="1000">ECmProxyUsageEnabled</value>
-<value id="1001">ECmProxyServerName</value>
-<value id="1002">ECmProxyProtocolName</value>
-<value id="1003">ECmProxyPortNumber</value>
-<value id="1004">ECmProxyExceptions</value>
-<value id="1999">ECmProxyRangeMax</value>
-<value id="2000">ECmChargeCardUsageEnabled</value>
-<value id="2001">ECmChargeCardAccountNumber</value>
-<value id="2002">ECmChargeCardPIN</value>
-<value id="2003">ECmChargeCardLocalRule</value>
-<value id="2004">ECmChargeCardNatRule</value>
-<value id="2005">ECmChargeCardIntlRule</value>
-<value id="2999">ECmChargeCardRangeMax</value>
-<value id="3000">ECmLocationUsageEnabled</value>
-<value id="3001">ECmLocationIntlPrefixCode</value>
-<value id="3002">ECmLocationNatPrefixCode</value>
-<value id="3003">ECmLocationNatCode</value>
-<value id="3004">ECmLocationAreaCode</value>
-<value id="3005">ECmLocationDialOutCode</value>
-<value id="3006">ECmLocationDisableCallWaitingCode</value>
-<value id="3007">ECmLocationMobile</value>
-<value id="3008">ECmLocationUsePulseDial</value>
-<value id="3009">ECmLocationWaitForDialTone</value>
-<value id="3010">ECmLocationPauseAfterDialOut</value>
-<value id="3999">ECmLocationRangeMax</value>
-<value id="4000">ECmWapIPGatewayAddress</value>
-<value id="4001">ECmWapIPWSPOption</value>
-<value id="4002">ECmWapIPSecurity</value>
-<value id="4003">ECmWapIPProxyPort</value>
-<value id="4004">ECmWapIPProxyLoginName</value>
-<value id="4005">ECmWapIPProxyLoginPass</value>
-<value id="4099">ECmWapRangeMax</value>
-<value id="5000">ECmCommonAttributesStart</value>
-<value id="5001">ECmIFName</value>
-<value id="5002">ECmIFParams</value>
-<value id="5003">ECmIFNetworks</value>
-<value id="5004">ECmIFPromptForAuth</value>
-<value id="5005">ECmIFAuthName</value>
-<value id="5006">ECmIFAuthPass</value>
-<value id="5007">ECmIFAuthRetries</value>
-<value id="5050">ECmIPNetmask</value>
-<value id="5051">ECmIPGateway</value>
-<value id="5052">ECmIPAddFromServer</value>
-<value id="5053">ECmIPAddress</value>
-<value id="5054">ECmIPDNSAddrFromServer</value>
-<value id="5055">ECmIPNameServer1</value>
-<value id="5056">ECmIPNameServer2</value>
-<value id="5057">ECmIP6DNSAddrFromServer</value>
-<value id="5058">ECmIP6NameServer1</value>
-<value id="5059">ECmIP6NameServer2</value>
-<value id="5060">ECmIPAddrLeaseValidFrom</value>
-<value id="5061">ECmIPAddrLeaseValidTo</value>
-<value id="5100">ECmConfigDaemonManagerName</value>
-<value id="5101">ECmConfigDaemonName</value>
-<value id="5110">ECmEnableLPCExtension</value>
-<value id="5111">ECmDisablePlainTextAuth</value>
-<value id="5999">ECmCommonAttributesEnd</value>
-<value id="6000">ECmSpecialAttributes</value>
-<value id="6001">ECmIsLinked</value>
-<value id="8999">ECmSpecialAttributesEnd</value>
-</enum>
-</trace_properties>
--- a/omadm/omadmextensions/adapters/dcmodmadapter/data/dcmodmadapter.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Resource file for DCMO DM Adapter.
-*
-*/
-
-// INCLUDES
-#include <registryinfo.rh>
-#include <nsmldmconstants.h>
-
-// CONSTANTS  
-
-// MACROS  
-
-// RESOURCE DEFINITIONS 
-
-//-----------------------------------------------------------------------------
-//   
-//    theInfo
-//    -
-//
-//-----------------------------------------------------------------------------
-//
-RESOURCE REGISTRY_INFO theRegistryInfo
-    {
-    dll_uid = 0x2001FD3E; // The DLL's 3rd UID.
-    interfaces =
-        {
-        INTERFACE_INFO
-            {
-            interface_uid = KNSmlDMInterfaceUid; // DM interface UID
-            implementations =
-                {
-                IMPLEMENTATION_INFO
-                    {
-                    implementation_uid = 0x2001FD3F;
-                    version_no = 1;
-                    display_name = "DCMO DM Adapter";
-                    default_data = "";
-                    opaque_data = "";
-                    }
-                };
-            }
-        };
-    }
-
-// End Of File
--- a/omadm/omadmextensions/adapters/dcmodmadapter/group/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +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 "Eclipse Public License v1.0"
-* which accompanies 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 file provides building information for DCMO DM Adapter.
-*
-*/
-
-#include <platform_paths.hrh>
-
-PRJ_EXPORTS
-
-PRJ_MMPFILES
-dcmodmadapter.mmp
-
-// End Of File
--- a/omadm/omadmextensions/adapters/dcmodmadapter/group/dcmodmadapter.mmp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  DCMO DM Adapter
-*
-*/
-
-#include <platform_paths.hrh>
-
-TARGET          dcmodmadapter.dll
-TARGETTYPE      PLUGIN
-CAPABILITY      CAP_ECOM_PLUGIN
-
-UID             0x10009D8D 0x2001FD3E
-VENDORID        VID_DEFAULT
-LANG            SC
-
-SOURCEPATH      ../src
-SOURCE          dcmodmadapter.cpp
-SOURCE          dcmodmadaptermain.cpp
-
-APP_LAYER_SYSTEMINCLUDE
-
-USERINCLUDE     ../inc
-
-SYSTEMINCLUDE 	/epoc32/include/ecom
-
-
-START RESOURCE  ../data/dcmodmadapter.rss
-TARGET          dcmodmadapter.rsc
-LANGUAGE_IDS
-END
-
-LIBRARY         euser.lib
-LIBRARY         ecom.lib
-LIBRARY         centralrepository.lib
-LIBRARY         dmutil.lib
-STATICLIBRARY   dmutils.lib
-LIBRARY         charconv.lib
-LIBRARY					dcmoclient.lib
-LIBRARY					policyengine.lib
-LIBRARY					nsmldebug.lib
-
-
-SMPSAFE
-// End Of File
-
--- a/omadm/omadmextensions/adapters/dcmodmadapter/inc/dcmodmadapter.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,528 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  DCMO DM Adapter
-*
-*/
-
-#ifndef __DCMODMADAPTER_H
-#define __DCMODMADAPTER_H
-
-// INCLUDES
-#include <e32base.h>
-#include <smldmadapter.h>
-#include <centralrepository.h>
-#include "dcmoclient.h"
-#include "dcmoconst.h"
-
-const TUid KCRUidDCMOServer={0x2001FE47};
-const TInt KDCMOKeyMaxNumber = 16;
-const TInt KDCMOPropertyNumber = 1;
-
-_LIT8( KMimeType, "text/plain" );
-_LIT8( KNSmlDCMOAdapterTitle,       "DCMO DM Adapter" );
-_LIT8( KNSmlTrue,						"True" );
-_LIT8( KNSmlFalse,					"False" );
-
-_LIT8( KNSmlHardware,				"Hardware" );
-_LIT8( KNSmlIO,							"IO" );
-_LIT8( KNSmlConnectivity,		"Connectivity" );
-_LIT8( KNSmlSoftware,				"Software" );
-_LIT8( KNSmlService,				"Service" );
-
-//DDF accepted DM-fieldnames
-_LIT8( KNSmlDdfProperty,				"Property" );
-_LIT8( KNSmlDdfGroup,						"Group" );
-_LIT8( KNSmlDdfDescription,			"Description" );
-_LIT8( KNSmlDdfAttached,				"Attached" );
-_LIT8( KNSmlDdfEnabled,					"Enabled" );
-_LIT8( KNSmlDdfDCMOConfig,			"DCMOConfig" );
-_LIT8( KNSmlDdfDenyUserEnable,	"DenyUserEnable" );
-_LIT8( KNSmlDdfNotifyUser,			"NotifyUser" );
-_LIT8( KNSmlDdfOperations,			"Operations" );
-_LIT8( KNSmlDdfEnable,					"Enable" );
-_LIT8( KNSmlDdfDisable,					"Disable" );
-_LIT8( KNSmlDdfOpExt,						"Ext" ); 
-_LIT8( KNSmlDdfExt,							"Ext" );
-_LIT8( KNSmlDdfOpExtSemiEnable,	"SemiEnable" );
-
-//DDF DM-field descriptions
-_LIT8( KDCMOCapabilityDescription,				"DCMO capability node");
-_LIT8( KNSmlDdfPropertyDescription,				"Property of DCMO" );
-_LIT8( KNSmlDdfGroupDescription,					"Group of DCMO" );
-_LIT8( KNSmlDdfDescDescription,						"The Description node" );
-_LIT8( KNSmlDdfAttachedDescription,				"Attached" );
-_LIT8( KNSmlDdfEnabledDescription,				"Enabled" );
-_LIT8( KNSmlDdfDCMOConfigDescription,			"The DCMO Configuration node" );
-_LIT8( KNSmlDdfDenyUserEnableDescription,	"DenyUserEnable" );
-_LIT8( KNSmlDdfNotifyUserDescription,			"NotifyUser" );
-_LIT8( KNSmlDdfOperationsDescription ,    "Operations node " );
-_LIT8( KNSmlDdfEnableDescription ,       	"Enable Operation " );
-_LIT8( KNSmlDdfDisableDescription ,       "Disable Operation " );
-_LIT8( KNSmlDdfOpExtDescription ,       	"Extra Operations " );
-_LIT8( KNSmlDdfExtDescription,						"Extra" );
-_LIT8( KNSmlDdfOpExtSemiEnableDescription,	"Semi Enable Operation" );
-
-_LIT8( KDcmoMatch, 											"DCMO" );
-_LIT8( KDcmoMatch2, 										"DCMO/*" );
-_LIT8( KDcmoMatch3, 										"DCMO/*/*" );
-_LIT8( KDcmoConfigMatch, 								"DCMO/*/DCMOConfig");
-_LIT8( KSegmDcmo,												"Property/Group/Description/Attached/Enabled/DCMOConfig/Operations/Ext");
-_LIT8( KSegmDcmoConfig,									"DenyUserEnable/NotifyUser");
-_LIT8( KSegmDcmoOperations,							"Enable/Disable/Ext");
-_LIT8( KDcmoConfigDenyUserEnableMatch, 	"DCMO/*/DCMOConfig/DenyUserEnable");
-_LIT8( KDcmoConfigNotifyUserMatch, 			"DCMO/*/DCMOConfig/NotifyUser");
-_LIT8( KDcmoOperationsMatch, 						"DCMO/*/Operations");
-_LIT8( KDcmoOperationsExtMatch, 				"DCMO/*/Operations/Ext");
-
-
-_LIT8( KNSmlBluetooth,									"Bluetooth" );
-
-// CLASS DECLARATION
-
-/**
-* Adapter class
-* Provides DM adapter interface
-*/
-class CDcmoDMAdapter : public CSmlDmAdapter
-    {
-    
-    public: // Constructors, destructor
-        /**
-        * Create instance of CDcmoDMAdapter
-        * @param aDmCallBack
-        * @return Instance of CDcmoDMAdapter
-        */    
-        static CDcmoDMAdapter* NewL( MSmlDmCallback* aDmCallback );
-
-        /**
-        * Create instance of CDcmoDMAdapter
-        * @param aDmCallBack
-        * @return Instance of CDcmoDMAdapter
-        */   
-        static CDcmoDMAdapter* NewLC( MSmlDmCallback* aDmCallback );
-
-        /**
-        * C++ Destructor
-        */
-        virtual ~CDcmoDMAdapter();
-
-    public:
-	    /**
-	    * The function returns current version of the DDF.
-	    * By asking current DDF versions from adapters DM Module can control
-	    * possible changes in the data structure and send the changed DDF
-	    * description to a management server.
-	    * This function is always called after DDFStructureL.
-        * @param aVersion DDF version of the adapter. (filled by the adapter)
-	    * @publishedPartner
-	    * @prototype
-	    */
-	    void DDFVersionL( CBufBase& aVersion );
-	
-	    /**
-	    * The function for filling the DDF structure of the adapter
-	    * This function is only called once, immediately after the adapter is created.
-	    * @param aDDFObject	Reference to root object. A DM adapter starts filling
-		         the data structure by calling AddChildObjectL to the root object and
-				 so describes the DDF of the adapter. 
-	    * @publishedPartner
-	    * @prototype
-	    */
-        void DDFStructureL( MSmlDmDDFObject& aDDF );
-	
-	    /**
-	    * The function creates new leaf objects, or replaces data in existing leaf
-	    * objects. The information about the success of the command should be
-	    * returned by calling SetStatusL function of MSmlDmCallback callback
-	    * interface. This makes it possible to buffer the commands. However, all
-	    * the status codes for buffered commands must be returned at the latest when
-	    * the adapter's CompleteOutstandingCmdsL() is called.
-	    * @param aURI			URI of the object
-	    * @param aLUID		LUID of the object (if the adapter has earlier returned a
-	 	     				LUID to the DM Module). For new objects, this is the LUID
- 			    			inherited through the parent node.
- 	    * @param aObject		Data of the object. 
-	    * @param aType		MIME type of the object
-	    * @param aStatusRef	Reference to correct command, i.e. this reference
-	 					must be used when calling the SetStatusL of this command
-	    * @publishedPartner
-	    * @prototype
-	    */
-	    void UpdateLeafObjectL( const TDesC8& aURI, 
-	                            const TDesC8& aLUID,
-			                    const TDesC8& aObject, 
-			 				    const TDesC8& aType,
-							    TInt aStatusRef 
-							  );
-		
-        /**
-	    * The function creates new leaf objects, or replaces data in existing leaf
-	    * objects, in the case where data is large enough to be streamed. The
-	    * information about the success of the command should be returned by calling
-	    * SetStatusL function of MSmlDmCallback callback interface. This makes it
-	    * possible to buffer the commands.  However, all the status codes for buffered
-	    * commands must be returned at the latest when the CompleteOutstandingCmdsL()
-	    * of adapter is called.
-	    * @param aURI		URI of the object
-	    * @param aLUID		LUID of the object (if the adapter has earlier returned a
-    						LUID to the DM Module). For new objects, this is the LUID
-	    					inherited through the parent node.
-	    * @param aStream	Data of the object. Adapter should create write stream
-		    				and return, when data is written to stream by DM agent,
-			    			StreamCommittedL() is called by DM engine
-	    * @param aType		MIME type of the object
-	    * @param aStatusRef	Reference to correct command, i.e. this reference
-    						must be used when calling the SetStatusL of this
-		    				command.
-	    * @publishedPartner
-	    * @prototype
-	    */
-	    void UpdateLeafObjectL( const TDesC8& aURI, 
-	                            const TDesC8& aLUID,
-								RWriteStream*& aStream, 
-								const TDesC8& aType,
-		 						TInt aStatusRef 
-		 				      );
-	
-	    /**
-	    * The function deletes an object and its child objects. The SetStatusL
-	    * should be used as described in UpdateLeafObjectL()
-	    * @param aURI		URI of the object
-	    * @param aLUID		LUID of the object (if the adapter have earlier returned
-    						LUID to the DM Module).
-	    * @param aStatusRef	Reference to correct command, i.e. this reference must
-						be used when calling the SetStatusL of this command.
-        * @publishedPartner
-	    * @prototype
-	    */
-	    void DeleteObjectL( const TDesC8& aURI, 
-	                        const TDesC8& aLUID,
-							TInt aStatusRef 
-					      );
-	
-	    /**
-	    * The function fetches data of a leaf object. The SetStatusL should be used
-	    * as described in UpdateLeafObjectL(). The data is returned by using the
-	    * SetResultsL function of MSmlCallback callback interface, and may be streamed.
-	    * @param aURI			URI of the object
-	    * @param aLUID			LUID of the object (if the adapter have earlier
-    							returned LUID to the DM Module).   
-	    * @param aType 			MIME type of the object
-	    * @param aResultsRef	Reference to correct results, i.e. this reference
-    							must be used when returning the result by calling
-	    						the SetResultsL.
-	    * @param aStatusRef		Reference to correct command, i.e. this reference
-		    					must be used when calling the SetStatusL of this
-    							command.
-	    * @publishedPartner
-	    * @prototype
-	    */
-	    void FetchLeafObjectL( const TDesC8& aURI, 
-	                           const TDesC8& aLUID,
-							   const TDesC8& aType, 
-							   TInt aResultsRef,
-							   TInt aStatusRef 
-							 );
-	
-	    /**
-	    * The function fetches the size of the data of a leaf object. The size is
-	    * in bytes, and must reflect the number of bytes that will be transferred
-	    * when the framework calls FetchLeafObjectL. The SetStatusL should be used
-	    * as described in FetchLeafObjectL(). The size value is returned by using
-	    * the SetResultsL function of MSmlCallback callback interface, and must be
-	    * a decimal integer expressed as a string, eg. "1234".
-	    * Results from this call MUST NOT be streamed.
-	    * @param aURI			URI of the object
-	    * @param aLUID			LUID of the object (if the adapter have earlier
-    							returned LUID to the DM Module).   
-	    * @param aType 			MIME type of the object
-	    * @param aResultsRef	Reference to correct results, i.e. this reference
-    							must be used when returning the result by calling
-	    						the SetResultsL.
-	    * @param aStatusRef		Reference to correct command, i.e. this reference
-     							must be used when calling the SetStatusL of this
-	    						command.
-	    * @publishedPartner
-	    * @prototype
-	    */
-	    void FetchLeafObjectSizeL( const TDesC8& aURI, 
-	                               const TDesC8& aLUID,
-								   const TDesC8& aType, 
-								   TInt aResultsRef,
-								   TInt aStatusRef 
-								 );
-	    /**
-	    * The function fetches URI list. An adapter returns the list of URI segments
-	    * under the given URI be separated by slash ("/"). The URI segment names for
-	    * new objects must be given by the adapter.
-	    * The list is returned by calling the SetResultsL function of MSmlCallback
-	    * callback interface.	Results from this call MUST NOT be streamed.
-	    * @param aParentURI					URI of the parent object
-	    * @param aParentLUID				LUID of the parent object (if the
-    										adapter have earlier returned LUID to
-		    								the DM Module).   
-	    * @param aPreviousURISegmentList	URI list with mapping LUID information,
-			    							which is known by DM engine. An adapter
-				    						can use this information when verifying
-					    					if old objects still exists. An adapter
-						    				also knows what objects are new to DM
-							    			engine and can provide LUID mapping for
-								    		them. aPreviousURISegmentList parameter
-									    	(see above) helps to recognise new
-    										objects.
-	    * @param aResultsRef				Reference to correct results, i.e. this
-    										reference must be used when returning
-	    									the result by calling the SetResultsL.
-	    * @param aStatusRef					Reference to correct command, i.e. this
-		    								reference must be used when calling the
-			    							SetStatusL of this command.
-	    * @publishedPartner
-	    * @prototype
-	    */
-	    void ChildURIListL( const TDesC8& aURI, 
-	                        const TDesC8& aLUID,
-					        const CArrayFix<TSmlDmMappingInfo>& aPreviousURISegmentList,
-					        TInt aResultsRef, 
-					        TInt aStatusRef 
-					      );
-	
-        /**
-	    * The function adds node object. In some cases an implementation of the
-	    * function may be empty function, if the node object does not need concrete
-	    * database update. Still this function may be helpful to an adapter, i.e. in
-	    * passing mapping LUID of the node to DM Module. The SetStatusL should be
-	    * used as described in UpdateLeafObjectL()
-	    * @param aURI			URI of the object
-	    * @param aParentLUID	LUID of the parent object (if the adapter have
-     							earlier returned LUID to the DM Module).   
-	    * @param aStatusRef		Reference to correct command, i.e. this reference
-		    					must be used when calling the SetStatusL of this
-			    				command.
-	    * @publishedPartner
-	    * @prototype
-	    */
-	    void AddNodeObjectL( const TDesC8& aURI, 
-	                         const TDesC8& aParentLUID,
-		  					 TInt aStatusRef 
-		  				   );
-
-	    /**
-	    * The function implements execute command. The information about the success
-	    * of the command should be returned by calling SetStatusL function of
-	    * MSmlDmCallback callback interface. This makes it possible to buffer the
-	    * commands.
-	    * However, all the status codes for buffered commands must be returned at
-	    * the latest when the CompleteOutstandingCmdsL() of adapter is called.
-	    * @param aURI			URI of the command
-	    * @param aLUID			LUID of the object (if the adapter have earlier
-    							returned LUID to the DM Module).   
-	    * @param aArgument		Argument for the command
-	    * @param aType			MIME type of the object 
-	    * @param aStatusRef		Reference to correct command, i.e. this reference
-    							must be used when calling the SetStatusL of this
-	    						command.
-	    * @publishedPartner
-	    * @prototype
-	    */
-	    void ExecuteCommandL( const TDesC8& aURI, 
-	                          const TDesC8& aLUID,
-							  const TDesC8& aArgument, 
-							  const TDesC8& aType,
-							  TInt aStatusRef 
-							);
-
-	    /**
-	    * The function implements execute command. The information about the
-	    * success of the command should be returned by calling SetStatusL function
-	    * of MSmlDmCallback callback interface. This makes it possible to buffer the
-	    * commands.
-	    * However, all the status codes for buffered commands must be returned at
-	    * the latest when the CompleteOutstandingCmdsL() of adapter is called.
-	    * @param aURI			URI of the command
-	    * @param aLUID			LUID of the object (if the adapter have earlier
-    							returned LUID to the DM Module).   
-	    * @param aStream		Argument for the command. Adapter should create
-		    					write stream and return, when data is written to
-			    				stream by DM agent, StreamCommittedL() is called by
-				    			DM engine
-	    * @param aType			MIME type of the object 
-	    * @param aStatusRef		Reference to correct command, i.e. this reference
-    							must be used when calling the SetStatusL of this
-	    						command.
-	    * @publishedPartner
-	    * @prototype
-	    */
-	    void ExecuteCommandL( const TDesC8& aURI, 
-	                          const TDesC8& aLUID,
-							  RWriteStream*& aStream, 
-							  const TDesC8& aType,
-							  TInt aStatusRef 
-							);
-
-	    /**
-	    * The function implements copy command. The information about the success of
-	    * the command should be returned by calling SetStatusL function of
-	    * MSmlDmCallback callback interface. This makes it possible to buffer the
-	    * commands.
-	    * However, all the status codes for buffered commands must be returned at
-	    * the latest when the CompleteOutstandingCmdsL() of adapter is called.
-	    * @param aTargetURI		Target URI for the command
-	    * @param aSourceLUID	LUID of the target object (if one exists, and if the adapter
-    							has	earlier returned a LUID to the DM Module).   
-	    * @param aSourceURI		Source URI for the command
-	    * @param aSourceLUID	LUID of the source object (if the adapter has
-    							earlier returned a LUID to the DM Module).   
-	    * @param aType			MIME type of the objects
-	    * @param aStatusRef		Reference to correct command, i.e. this reference
-    							must be used when calling the SetStatusL of this
-	    						command.
-	    * @publishedPartner
-	    * @prototype
-	    */
-	    void CopyCommandL( const TDesC8& aTargetURI, 
-	                       const TDesC8& aTargetLUID,
-						   const TDesC8& aSourceURI, 
-						   const TDesC8& aSourceLUID,
-						   const TDesC8& aType, 
-						   TInt aStatusRef 
-						 );
-
-	    /**
-	    * The function indicates start of Atomic command.
-	    * @publishedPartner
-	    * @prototype
-	    */
-	    void StartAtomicL();
-	
-	    /**
-	    * The function indicates successful end of Atomic command. The adapter
-	    * should commit all changes issued between StartAtomicL() and
-	    * CommitAtomicL()
-	    * @publishedPartner
-	    * @prototype
-	    */
-	    void CommitAtomicL();
-	
-	    /**
-	    * The function indicates unsuccessful end of Atomic command. The adapter
-	    * should rollback all changes issued between StartAtomicL() and
-	    * RollbackAtomicL(). If rollback fails for a command, adapter should use
-	    * SetStatusL() to indicate it.
-	    * @publishedPartner
-	    * @prototype
-	    */
-	    void RollbackAtomicL();
-	
-	    /**
-        * Returns ETrue if adapter supports streaming otherwise EFalse.
-	    * @param aItemSize size limit for stream usage
-        * @return TBool ETrue for streaming support
-	    * @publishedPartner
-	    * @prototype
-        */
-	    TBool StreamingSupport( TInt& aItemSize );
-	
-	    /**
-        * Called when stream returned from UpdateLeafObjectL or ExecuteCommandL has
-	    * been written to and committed. Not called when fetching item.
-	    * @publishedPartner
-	    * @prototype
-        */	
-	    void StreamCommittedL();
-	
-	    /**
-	    * The function tells the adapter that all the commands of the message that
-	    * can be passed to the adapter have now been passed.  This indicates that
-	    * the adapter must supply status codes and results to any buffered commands.
-	    * This must be done at latest by the time this function returns.
-	    * This function is used at the end of SyncML messages, and during processing
-	    * of Atomic.   In the case of Atomic processing, the function will be
-	    * followed by a call to CommitAtomicL or RollbackAtomicL.
-	    * @publishedPartner
-	    * @prototype
-	    */
-	    void CompleteOutstandingCmdsL();
-
-    private: // New methods
-    	
-    	/**
-	    * The function fills the adapter node with the details
-	    * @publishedPartner
-	    * @prototype
-	    */
-        void FillNodeInfoL( MSmlDmDDFObject& aDDFObject, 
-                                            TSmlDmAccessTypes& aAccessTypes, 
-                                            MSmlDmDDFObject::TScope aScope,
-                                            MSmlDmDDFObject::TDFFormat aFormat, 
-                                            MSmlDmDDFObject::TOccurence aOccurence,
-                                            const TDesC8& aDescription,
-                                            const TDesC8& aMIMEType );
-       
-      /**
-	    * This function loads all the DCMO plug-in adapters 
-	    * @publishedPartner
-	    * @prototype
-	    */
-        void DDFDCMOAdaptersL(MSmlDmDDFObject& rootdcmo);
-        
-     /**
-	    * This function constructs the DDFnode with the details 
-	    * @publishedPartner
-	    * @prototype
-	    */ 
-        void FillDCMODDFL(MSmlDmDDFObject& aDDF);  
-        
-          
-      /**
-	    * This function returns the Category of the plug-in 
-	    * adapter from the aURI.
-	    * @param aURI
-	    * @return TPtrC8 category
-	    */    
-        
-        TPtrC8 GetCategoryFromUriL(const TDesC8& aURI )  ;    
-                            
-      /**
-    	* Maps a system wide error code to a TError.
-    	* @param aError A system wide error code.
-    	* @return A TError value depending on aError.
-    	*/
-    		CSmlDmAdapter::TError MapErrorToStatus( TInt aError ) const;     
-    	
-    	/**
-	    * This function returns the dcmo enforcement 
-	    * @param None
-	    * @return TBool true if dcmo enforcement or false
-	    */        	
-    	TBool CheckEnforcementL();
-                                
-    private: // Constructor
-        /**
-        * Symbian 2nd phase constructor
-        */
-        void ConstructL();
-
-        /**
-        * C++ Constructor
-        */    
-        CDcmoDMAdapter( TAny* aEcomArguments );
-                                                                                 
-    private: // Data
-        RDCMOClient* idcmoClient;
-        TBool iExtOpNode;
-    };
-
-#endif // __DCMODMADAPTER_H
-
-// End Of File
--- a/omadm/omadmextensions/adapters/dcmodmadapter/src/dcmodmadapter.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,926 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  DCMO DM Adapter implementation
-*
-*/
-
-// INCLUDE
-#include <implementationproxy.h>
-#include <smldmadapter.h>
-#include <data_caging_path_literals.hrh>
-#include <centralrepository.h>
-#include <e32base.h>
-#include <ecom.h>
-#include <utf.h>
-#include <SettingEnforcementInfo.h> // DCMO Enforcement
-#include "nsmldebug.h"
-#include "dcmodmadapter.h"
-#include "dcmointerface.h"
-
-// CONSTANTS
-
-#define MAXBUFLEN 255
-
-_LIT8( KTextType,"text/plain" ); // Leaf inputs
-_LIT8( KDCMODMAdapterVersion, "1.0" ); // Adapter version
-_LIT8( KDCMORootNode, "DCMO" ); // root URI
-
-
-// ============================= MEMBER FUNCTIONS =============================
-
-// ----------------------------------------------------------------------------
-// CDcmoDMAdapter::NewL
-// Symbian 1st phase contructor
-// (static, may leave)
-// Status : Draft
-// ----------------------------------------------------------------------------
-//
-CDcmoDMAdapter* CDcmoDMAdapter::NewL( MSmlDmCallback* aCallback )
-    {
-    CDcmoDMAdapter* self = NewLC( aCallback );
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// ----------------------------------------------------------------------------
-// CDcmoDMAdapter::NewLC
-// Symbian 1st phase contructor. Push object to cleanup-stack
-// (static, may leave)
-// Status : Draft
-// ----------------------------------------------------------------------------
-//
-CDcmoDMAdapter* CDcmoDMAdapter::NewLC( MSmlDmCallback* aCallback )
-    {
-    	_DBG_FILE( "CDcmoDMAdapter NewLC : begin"  );
-    	CDcmoDMAdapter* self = new ( ELeave ) CDcmoDMAdapter( aCallback );
-    	CleanupStack::PushL( self );
-    	self->ConstructL();
-    	_DBG_FILE( "CDcmoDMAdapter NewLC : end"  );
-    	return self;
-    }
-
-// ----------------------------------------------------------------------------
-// CDcmoDMAdapter::CDcmoDMAdapter()
-// C++ Constructor
-// Status : Draft
-// ----------------------------------------------------------------------------
-CDcmoDMAdapter::CDcmoDMAdapter( TAny* aEcomArguments )
-    : CSmlDmAdapter::CSmlDmAdapter( aEcomArguments )
-    {
-    	_DBG_FILE( "CDcmoDMAdapter Constructor"  );
-    }
-
-// ----------------------------------------------------------------------------
-// CDcmoDMAdapter::ConstructL
-// 2nd phase contructor
-// (may leave)
-// Status : Draft
-// ----------------------------------------------------------------------------
-//
-void CDcmoDMAdapter::ConstructL()
-    {
-    	_DBG_FILE( "CDcmoDMAdapter::ConstructL"  );
-    	idcmoClient = RDCMOClient::NewL();
-    	iExtOpNode = EFalse;	
-    }
-
-// ----------------------------------------------------------------------------
-// CDcmoDMAdapter::~CDcmoDMAdapter()
-// C++ Destructor
-// Status : Draft
-// ----------------------------------------------------------------------------
-//
-CDcmoDMAdapter::~CDcmoDMAdapter()
-    {
-    	_DBG_FILE( "CDcmoDMAdapter Destructor"  );
-    	if( idcmoClient )
-    		{
-    			idcmoClient->Close();
-    			delete idcmoClient;
-    		}
-    	idcmoClient = NULL;
-    }
-
-// ----------------------------------------------------------------------------
-// CDcmoDMAdapter::DDFVersionL
-// Return DM plug-in version
-// (may leave)
-// Status : Draft
-// ----------------------------------------------------------------------------
-//
-void CDcmoDMAdapter::DDFVersionL( CBufBase& aDDFVersion )
-    {
-    // Insert version information
-    _DBG_FILE( "CDcmoDMAdapter::DDFVersionL" );
-    aDDFVersion.InsertL( 0, KDCMODMAdapterVersion );
-    }
-
-// ----------------------------------------------------------------------------
-// CDcmoDMAdapter::DDFStructureL
-// Return DM plug-in structure
-// (may leave)
-// Status : Draft
-// ----------------------------------------------------------------------------
-//
-void CDcmoDMAdapter::DDFStructureL( MSmlDmDDFObject& aDDF )
-    {
-    // Declare accesses
-    _DBG_FILE( "CDcmoDMAdapter::DDFStructureL begin" );
-    TSmlDmAccessTypes accessTypes;
-    accessTypes.SetGet();    
-    
-    // Create root node 
-    MSmlDmDDFObject& root = aDDF.AddChildObjectL( KDCMORootNode );
-    FillNodeInfoL( root,
-                   accessTypes,
-                   MSmlDmDDFObject::EPermanent,
-                   MSmlDmDDFObject::ENode,
-                   MSmlDmDDFObject::EOne,
-                   KNullDesC8(),
-                   KTextType );
-                   
-   	root.SetDFTitleL( KNSmlDCMOAdapterTitle );
-                   
-   	DDFDCMOAdaptersL(root);
-   	_DBG_FILE( "CDcmoDMAdapter::DDFStructureL end" );
-
-    }
-
-// ----------------------------------------------------------------------------
-// CDcmoDMAdapter::StreamingSupport
-// Return streaming support status, set supported item size
-// Status : Draft
-// ----------------------------------------------------------------------------
-//
-TBool CDcmoDMAdapter::StreamingSupport( TInt& /* aItemSize */ )
-    {
-    // Not supported
-    _DBG_FILE( "CDcmoDMAdapter::StreamingSupport"  );
-    return EFalse;
-    }
-    
-// ----------------------------------------------------------------------------
-// CDcmoDMAdapter::StreamCommittedL
-// Commit stream buffer
-// (may leave)
-// Status : Draft
-// ----------------------------------------------------------------------------
-//
-void CDcmoDMAdapter::StreamCommittedL()
-    {        
-    _DBG_FILE("CDcmoDMAdapter::StreamCommitted"  );
-    // Intentionally left empty 
-    }
-
-// ----------------------------------------------------------------------------
-// CDcmoDMAdapter::CompleteOutstandingCmdsL
-// Complete outstanding commands
-// (may leave)
-// Status : Draft
-// ----------------------------------------------------------------------------
-//
-void CDcmoDMAdapter::CompleteOutstandingCmdsL()
-    {
-    _DBG_FILE( "CDcmoDMAdapter::CompleteOutstandingCmdsL"  );
-    }
-
-// ----------------------------------------------------------------------------
-// CDcmoDMAdapter::FillNodeInfoL
-// Fill node info
-// (may leave)
-// Status : Draft
-// ----------------------------------------------------------------------------
-//
-void CDcmoDMAdapter::FillNodeInfoL( MSmlDmDDFObject& aDDFObject, 
-                                     TSmlDmAccessTypes& aAccessTypes, 
-                                     MSmlDmDDFObject::TScope aScope,
-                                     MSmlDmDDFObject::TDFFormat aFormat, 
-                                     MSmlDmDDFObject::TOccurence aOccurence,
-                                     const TDesC8& aDescription,
-                                     const TDesC8& aMIMEType )
-    {
-    _DBG_FILE( "CDcmoDMAdapter::FillNodeInfoL - begin"  );
-    aDDFObject.SetAccessTypesL( aAccessTypes );
-    aDDFObject.SetScopeL( aScope );
-    aDDFObject.SetOccurenceL( aOccurence );
-    aDDFObject.SetDFFormatL( aFormat );
-    aDDFObject.SetDescriptionL( aDescription );
-    if ( aFormat != MSmlDmDDFObject::ENode )
-        {
-        aDDFObject.AddDFTypeMimeTypeL( aMIMEType );
-        }
-    _DBG_FILE( "CDcmoDMAdapter::FillNodeInfoL - end"  );    
-    }
-
-// ----------------------------------------------------------------------------
-// CDcmoDMAdapter::CopyCommandL
-// Copy object
-// (may leave)
-// Status : Draft
-// ----------------------------------------------------------------------------
-//
-void CDcmoDMAdapter::CopyCommandL( const TDesC8& /*aTargetURI*/, 
-                                    const TDesC8& /*aTargetLUID*/,
-                                    const TDesC8& /*aSourceURI*/, 
-                                    const TDesC8& /*aSourceLUID*/,
-                                    const TDesC8& /*aType*/, 
-                                    TInt aStatusRef )
-    {
-    // Not supported
-    _DBG_FILE( "CDcmoDMAdapter::CopyCommandL"  );
-    Callback().SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-    }
-
-// ----------------------------------------------------------------------------
-// DeleteObjectL
-// Delete object
-// (may leave)
-// Status : Draft
-// ----------------------------------------------------------------------------
-//
-void CDcmoDMAdapter::DeleteObjectL( const TDesC8& /* aURI */, 
-                                     const TDesC8& /* aLUID */,
-                                     TInt aStatusRef )
-
-    {
-    // Not supported
-    _DBG_FILE( "CDcmoDMAdapter::DeleteObjectL"  );
-    Callback().SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-    }
-    
-// ----------------------------------------------------------------------------
-// CDcmoDMAdapter::FetchLeafObjectL
-// Fetch leaf
-// (may leave)
-// Status : Draft
-// ----------------------------------------------------------------------------
-//
-void CDcmoDMAdapter::FetchLeafObjectL( const TDesC8& aURI, 
-                                        const TDesC8& /* aLUID */,
-								        const TDesC8& aType, 
-								        TInt aResultsRef,
-								        TInt aStatusRef )
-    {
-    _DBG_FILE( "CDcmoDMAdapter::FetchLeafObjectL - begin"  );
-    MSmlDmAdapter::TError retValue = CSmlDmAdapter::EOk; 
-		TDCMOStatus err (EDcmoFail);
-		
-    TBool dcmoEnforce=EFalse;
-	  TRAPD(eError, dcmoEnforce =CheckEnforcementL())
-	  if(!(eError==KErrNone && dcmoEnforce))
-	  {
-	  	 // Respond
-	  	retValue = CSmlDmAdapter::ENotAllowed;
-  		Callback().SetStatusL( aStatusRef, retValue );
-  		return;
-	  }
-    
-		TBuf<MAXBUFLEN> iName;
-		
-		TPtrC8 category = GetCategoryFromUriL( aURI );
-		iName.Copy ( category );
-
-		CBufBase *lObject = CBufFlat::NewL( 128 );
-    CleanupStack::PushL( lObject );
-    lObject->Reset();
-    TBool value;
-    TInt group;
-    	
-		if(aURI.Find(KNSmlDdfProperty)!= KErrNotFound)
-		{
-			 _DBG_FILE( "CDcmoDMAdapter::FetchLeafObjectL - In Property"  );
-			TBuf<KDCMOMaxStringSize> property;
-			err = idcmoClient->GetDCMOStrAttributeValue(iName, EProperty,property); 
-			lObject->Reset();
-			TBuf8<KDCMOMaxStringSize> tmp;
-			tmp.Copy(property);
-			lObject->InsertL(lObject->Size(),tmp);
-		}
-			
-		else if(aURI.Find(KNSmlDdfGroup)!= KErrNotFound)
-		{
-			 _DBG_FILE( "CDcmoDMAdapter::FetchLeafObjectL - In Group"  );
-			err = idcmoClient->GetDCMOIntAttributeValue(iName, EGroup, group); 
-			switch(group)
-			{
-				case EHardware			: 	lObject->InsertL(lObject->Size(),KNSmlHardware);
-										break;
-				case EIO						:	lObject->InsertL(lObject->Size(),KNSmlIO);
-										break;
-				case EConnectivity	:	lObject->InsertL(lObject->Size(),KNSmlConnectivity);
-										break;
-				case ESoftware			:	lObject->InsertL(lObject->Size(),KNSmlSoftware);
-										break;
-				case EService				:	lObject->InsertL(lObject->Size(),KNSmlService);
-										break;	
-				default : retValue = CSmlDmAdapter::ENotFound;
-									
-			}
-		}			
-		else if(aURI.Find(KNSmlDdfDescription)!= KErrNotFound)
-		{
-			 _DBG_FILE( "CDcmoDMAdapter::FetchLeafObjectL - In Description"  );
-			TBuf<KDCMOMaxStringSize> description;
-			err = idcmoClient->GetDCMOStrAttributeValue(iName, EDescription, description); 
-			lObject->Reset();
-			TBuf8<KDCMOMaxStringSize> tmp;
-			tmp.Copy(description);
-			lObject->InsertL(lObject->Size(),tmp);
-		}
-			
-		else if(aURI.Find(KNSmlDdfAttached)!= KErrNotFound)
-		{
-			 _DBG_FILE( "CDcmoDMAdapter::FetchLeafObjectL - In Attached"  );
-			err = idcmoClient->GetDCMOIntAttributeValue(iName, EAttached, value); 
-			if(value)
-				lObject->InsertL(lObject->Size(),KNSmlTrue);
-			else
-				lObject->InsertL(lObject->Size(),KNSmlFalse);
-		}
-		
-		else if(aURI.Find(KNSmlDdfEnabled)!= KErrNotFound) 
-		{
-			 _DBG_FILE( "CDcmoDMAdapter::FetchLeafObjectL - In Enabled"  );
-			err = idcmoClient->GetDCMOIntAttributeValue(iName, EEnabled, value); 
-			if(value)
-				lObject->InsertL(lObject->Size(),KNSmlTrue);
-			else
-				lObject->InsertL(lObject->Size(),KNSmlFalse);			
-		}
-			
-		else if(aURI.Find(KNSmlDdfDenyUserEnable)!= KErrNotFound)
-		{
-			 _DBG_FILE( "CDcmoDMAdapter::FetchLeafObjectL - In DenyUserEnable"  );
-			err = idcmoClient->GetDCMOIntAttributeValue(iName, EDenyUserEnable, value); 
-			if(value)
-				lObject->InsertL(lObject->Size(),KNSmlTrue);
-			else
-				lObject->InsertL(lObject->Size(),KNSmlFalse);
-		}
-			
-		else if(aURI.Find(KNSmlDdfNotifyUser)!= KErrNotFound)
-		{
-			 _DBG_FILE( "CDcmoDMAdapter::FetchLeafObjectL - In NotifyUser"  );
-			err = idcmoClient->GetDCMOIntAttributeValue(iName, ENotifyUser, value); 
-			if(value)
-				lObject->InsertL(lObject->Size(),KNSmlTrue);
-			else
-				lObject->InsertL(lObject->Size(),KNSmlFalse);
-		}
-		
-		else if(aURI.Find(KNSmlDdfExt)!= KErrNotFound)
-		{
-			_DBG_FILE( "CDcmoDMAdapter::FetchLeafObjectL - In Ext"  );
-			lObject->Reset();
-			lObject->InsertL(lObject->Size(), KNullDesC8);
-			err = EDcmoSuccess;
-		}
-			
-		else
-			retValue = CSmlDmAdapter::ENotFound;
-		
-		if(retValue == CSmlDmAdapter::EOk)
-    {
-			switch(err)
-			{
-				case EDcmoSuccess 		:	Callback().SetResultsL( aResultsRef, *lObject, aType );
-											break;
-				case EDcmoNotSupported	:	retValue = CSmlDmAdapter::EError;
-											break;
-				case EDcmoAccessDenied	:	retValue = CSmlDmAdapter::ENotAllowed;
-											break;
-				default :
-											retValue = CSmlDmAdapter::EError;						
-			}
-				
-  	}
-    	
-    CleanupStack::PopAndDestroy(); //lObject	
-
-    // Respond
-  Callback().SetStatusL( aStatusRef, retValue );
-   _DBG_FILE( "CDcmoDMAdapter::FetchLeafObjectL - end"  );
-    }    
-    
-// ----------------------------------------------------------------------------
-// CDcmoDMAdapter::FetchLeafObjectSizeL
-// Calculate leaf object size
-// (may leave)
-// Status : Draft
-// ----------------------------------------------------------------------------
-//
-void CDcmoDMAdapter::FetchLeafObjectSizeL( const TDesC8& /* aURI */, 
-                                            const TDesC8& /* aLUID */,
-									        const TDesC8& /* aType */, 
-									        TInt /* aResultsRef */,
-									        TInt aStatusRef )
-    {
-    _DBG_FILE( "CDcmoDMAdapter::FetchLeafObjectSizeL"  );
-    MSmlDmAdapter::TError retValue = CSmlDmAdapter::EOk;
-    // Respond
-    Callback().SetStatusL( aStatusRef, retValue );
-    }    
-
-// ----------------------------------------------------------------------------
-// CDcmoDMAdapter::ChildURIListL
-// Create child URI list
-// (may leave)
-// Status : Draft
-// ----------------------------------------------------------------------------
-//
-void CDcmoDMAdapter::ChildURIListL( const TDesC8& aURI, 
-                                     const TDesC8& /* aLUID */,
-					                 const CArrayFix<TSmlDmMappingInfo>& /* aPreviousURISegmentList */,
-            					     TInt aResultsRef, 
-            					     TInt aStatusRef )
-    {
-    _DBG_FILE( "CDcmoDMAdapter::ChildURIListL - begin"  );
-    MSmlDmAdapter::TError retValue = CSmlDmAdapter::EOk;
-    CBufBase *currentURISegmentList = CBufFlat::NewL( 128 );
-		CleanupStack::PushL( currentURISegmentList );	
-
- 		if(( aURI.Match( KDcmoMatch2 ) != KErrNotFound ) &&
-		 (aURI.Match( KDcmoMatch3 ) == KErrNotFound ))
-		{	
-            currentURISegmentList->InsertL( currentURISegmentList->Size(), KSegmDcmo );
-			Callback().SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
-		    Callback().SetResultsL( aResultsRef, *currentURISegmentList, KNullDesC8 );
-            CleanupStack::PopAndDestroy(  ); // currentURISegmentList
-       		_DBG_FILE( "CDcmoDMAdapter::ChildURIListL(): end" );
-			return;
-		}
-    else if(( aURI.Match( KDcmoMatch ) != KErrNotFound ) &&
-              (aURI.Match( KDcmoMatch2 ) == KErrNotFound ))
-        {
-        //    
-        }
-    // DCMOConfig subtree
-    else if( ( aURI.Match( KDcmoConfigMatch ) != KErrNotFound ))
-        {
-          currentURISegmentList->InsertL( currentURISegmentList->Size(), KSegmDcmoConfig );
-        }
-    // Operations    
-    else if(( aURI.Match( KDcmoOperationsMatch ) != KErrNotFound ))
-        {
-          currentURISegmentList->InsertL( currentURISegmentList->Size(), KSegmDcmoOperations );
-        } 
-    // Ext    
-    else if(( aURI.Match(KNSmlBluetooth) != KErrNotFound) && ( aURI.Match(KDcmoOperationsExtMatch)!= KErrNotFound ))
-        {
-          currentURISegmentList->InsertL( currentURISegmentList->Size(), KNSmlDdfOpExtSemiEnable );
-        }        
-    else
-        {
-        retValue = CSmlDmAdapter::ENotFound;
-        }
-
-    // Respond
-    Callback().SetStatusL( aStatusRef, retValue );
-    CleanupStack::PopAndDestroy(); // currentURISegmentList
-    _DBG_FILE( "CDcmoDMAdapter::ChildURIListL - end"  );
-    }    
-
-// ----------------------------------------------------------------------------
-// CDcmoDMAdapter::AddNodeObjectL
-// Add node
-// (may leave)
-// Status : Draft
-// ----------------------------------------------------------------------------
-//
-void CDcmoDMAdapter::AddNodeObjectL( const TDesC8& /* aURI */,
-                                     const TDesC8& /* aParentLUID */,
-								     TInt aStatusRef )
-    {
-    // Not supported
-    _DBG_FILE( "CDcmoDMAdapter::AddNodeObjectL - begin"  );
-    Callback().SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-    _DBG_FILE( "CDcmoDMAdapter::AddNodeObjectL - end"  );
-    }    
-
-// ----------------------------------------------------------------------------
-// CDcmoDMAdapter::ExecuteCommandL
-// Execute command
-// (may leave)
-// Status : Draft
-// ----------------------------------------------------------------------------
-//
-void CDcmoDMAdapter::ExecuteCommandL( const TDesC8&  aURI , 
-                                      const TDesC8& /* aLUID */,
-							          const TDesC8& /* aArgument */, 
-							          const TDesC8& /* aType */,
-								      TInt aStatusRef )
-    {
-    _DBG_FILE( "CDcmoDMAdapter::ExecuteCommandL - begin"  );
-   	MSmlDmAdapter::TError status = CSmlDmAdapter::EOk;
-    TInt err (EDcmoFail);
-    
-    TBool dcmoEnforce=EFalse;
-	  TRAPD(eError, dcmoEnforce =CheckEnforcementL())
-	  if(!(eError==KErrNone && dcmoEnforce))
-	  {
-	  	 // Respond
-	  	status = CSmlDmAdapter::ENotAllowed;
-  		Callback().SetStatusL( aStatusRef, status );
-  		return;
-	  }
-	  
-		TBuf<MAXBUFLEN> iName;
-		TPtrC8 category = GetCategoryFromUriL( aURI );
-		iName.Copy ( category );		
-		
-		if((category.Compare( KNSmlBluetooth ) == KErrNone ) && (aURI.Find( KNSmlDdfOpExtSemiEnable ) != KErrNotFound ))
-			err = idcmoClient->SetDCMOIntAttributeValue(iName, EEnable, 2); 
-		else if(aURI.Find( KNSmlDdfEnable ) != KErrNotFound ) 
-			err = idcmoClient->SetDCMOIntAttributeValue(iName, EEnable, 1); 
-		else if(aURI.Find( KNSmlDdfDisable ) != KErrNotFound ) 
-			err = idcmoClient->SetDCMOIntAttributeValue(iName, EEnable, 0); 		
-		else	
-			err = EDcmoNotFound;				
-			// map error	
-		status = MapErrorToStatus( err );
-								
-    Callback().SetStatusL( aStatusRef, status );
-    _DBG_FILE( "CDcmoDMAdapter::ExecuteCommandL - end"  );
-    }    
-
-// ----------------------------------------------------------------------------
-// CDcmoDMAdapter::ExecuteCommandL
-// Execute command, streaming enabled
-// (may leave)
-// Status : Draft
-// ----------------------------------------------------------------------------
-//
-void CDcmoDMAdapter::ExecuteCommandL( const TDesC8& /* aURI */, 
-                                      const TDesC8& /* aLUID */,
-								      RWriteStream*& /* aStream */,
-								      const TDesC8& /* aType */,
-								      TInt aStatusRef )
-    {
-    // Not supported
-    Callback().SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-    }    
-    
-// ----------------------------------------------------------------------------
-// CDcmoDMAdapter::UpdateLeafObjectL
-// Update leaf object
-// (may leave)
-// Status : Draft
-// ----------------------------------------------------------------------------
-//
-void CDcmoDMAdapter::UpdateLeafObjectL( const TDesC8& /* aURI */, 
-                                        const TDesC8& /* aLUID */,
-                                        const TDesC8& /* aObject */,
-                                        const TDesC8& /* aType */,
-                                        TInt aStatusRef )
-    {
-      _DBG_FILE( "CDcmoDMAdapter::UpdateLeafObjectL - begin"  );
- 		// Not supported
-    Callback().SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-   _DBG_FILE( "CDcmoDMAdapter::UpdateLeafObjectL - end"  );
-    }
-
-// ----------------------------------------------------------------------------
-// CDcmoDMAdapter::UpdateLeafObjectL
-// Update leaf object, streaming enabled
-// (may leave)
-// Status : Draft
-// ----------------------------------------------------------------------------
-//
-void CDcmoDMAdapter::UpdateLeafObjectL( const TDesC8& /* aURI */, 
-                                         const TDesC8& /* aLUID */,
-									     RWriteStream*& /* aStream */, 
-									     const TDesC8& /* aType */,
-		 							     TInt aStatusRef )
-    {
-    // Not supported
-    Callback().SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-    }
-    
-// ----------------------------------------------------------------------------
-// CDcmoDMAdapter::StartAtomicL
-// Start atomic
-// (may leave)
-// Status : Draft
-// ----------------------------------------------------------------------------
-//
-void CDcmoDMAdapter::StartAtomicL()
-    {
-    }
-    
-// ----------------------------------------------------------------------------
-// CDcmoDMAdapter::CommitAtomicL
-// Commit atomic commands
-// (may leave)
-// Status : Draft
-// ----------------------------------------------------------------------------
-//
-void CDcmoDMAdapter::CommitAtomicL()
-    {
-    }
-
-// ----------------------------------------------------------------------------
-// CDcmoDMAdapter::RollbackAtomicL
-// Lose all modifications after 'StartAtomicL' command
-// (may leave)
-// Status : Draft
-// ----------------------------------------------------------------------------
-//
-void CDcmoDMAdapter::RollbackAtomicL()
-    {
-    }    
-
-// ---------------------------------------------------------------------------
-// CNSmlDmFotaAdapter::MapStatusToError()
-// Returns a status code corresponding to the system error code given 
-// as parameter.
-// ---------------------------------------------------------------------------
-//
-CSmlDmAdapter::TError CDcmoDMAdapter::MapErrorToStatus( TInt aError ) const
- {
-    CSmlDmAdapter::TError err = CSmlDmAdapter::EError;
-    
-    switch( aError )
-        {
-        case EDcmoSuccess:
-            err = CSmlDmAdapter::EExecSuccess;
-            break;
-        case EDcmoFail:
-            err = CSmlDmAdapter::EExecClientError;
-            break;    
-        case EDcmoNotFound:
-            err = CSmlDmAdapter::EExecDownloadFailed;
-            break;
-        case EDcmoNotSupported:
-            err = CSmlDmAdapter::EExecClientError;
-            break;
-        case EDcmoAccessDenied:
-            err = CSmlDmAdapter::EExecClientError;
-            break;            
-        default :
-        		err = CSmlDmAdapter::EExecClientError;        
-        }
-    
-    return err;
- }
-      
-// ========================= OTHER EXPORTED FUNCTIONS =========================
-
-void CleanupEComArray(TAny* aArray)
-	{
-	(static_cast<RImplInfoPtrArray*> (aArray))->ResetAndDestroy();
-	(static_cast<RImplInfoPtrArray*> (aArray))->Close();
-	}
-
-// ----------------------------------------------------------------------------
-// CDcmoDMAdapter::DDFDCMOAdaptersL
-// This function loads all the DCMO plug-in adapters
-// ----------------------------------------------------------------------------
-//
-void CDcmoDMAdapter::DDFDCMOAdaptersL(MSmlDmDDFObject& rootdcmo)
-{
-		_DBG_FILE("CDcmoDMAdapter::DDFDCMOAdaptersL(): begin");	
-			TBuf8<MAXBUFLEN> buf;
-      TSmlDmAccessTypes accessTypes;
-    	accessTypes.SetGet();
-    	
-			CRepository* centrep = NULL;
-			TInt err(KErrNone);
-			TRAP(err, centrep = CRepository::NewL( KCRUidDCMOServer ));
-			if(err == KErrNone)
-			{
-				TUint32 centrepKey = 0;
-				TInt count(0);
-				TInt reterr = centrep->Get( centrepKey, count );	
-				if(reterr == KErrNone)
-				{		
-					TBuf<MAXBUFLEN> buffer;
-					for(TInt i=0; i<count; i++)
-					{   
-        		centrepKey = KDCMOKeyMaxNumber*i + KDCMOPropertyNumber ;
-        		reterr = centrep->Get( centrepKey, buffer );
-	    			if( reterr== KErrNone )
-        		{        			
-        			buf.Copy ( buffer );
-        			MSmlDmDDFObject& entityNode = rootdcmo.AddChildObjectL( buf );
-    					FillNodeInfoL( entityNode,
-                   accessTypes,
-                   MSmlDmDDFObject::EDynamic,
-                   MSmlDmDDFObject::ENode,
-                   MSmlDmDDFObject::EZeroOrOne,                   
-                   KDCMOCapabilityDescription,
-                   KMimeType ); 
-                                       
-							FillDCMODDFL(entityNode);
-							buf.Zero();
-        		}
-					}
-				}	
-				delete centrep;
-				centrep = NULL;
-			}
-			
-			// Read info about all implementations into infoArray
-			RImplInfoPtrArray infoArray;
-			// Note that a special cleanup function is required to reset and destroy
-			// all items in the array, and then close it.
-			TCleanupItem cleanup(CleanupEComArray, &infoArray);
-			CleanupStack::PushL(cleanup);
-			REComSession::ListImplementationsL(KDCMOInterfaceUid, infoArray);
-
-			// Loop through each info for each implementation
-			// and create and use each in turn
-			CDCMOInterface* ex;			
-
-			for (TInt i=0; i< infoArray.Count(); i++)
-				{
-
-				TUid impluid = infoArray[i]->ImplementationUid();
-				// Create object of type and call its function
-				
-				buf = infoArray[i]->OpaqueData();
-				
-				CDCMOInterface::TDCMOInterfaceInitParams initParms;
-				initParms.uid = impluid;
-				TBuf<MAXBUFLEN> categoryName;
-				categoryName.Copy(buf);
-				initParms.descriptor = categoryName.AllocL(); 
-				ex = CDCMOInterface::NewL(initParms);
-				CleanupStack::PushL(ex);
-				if( buf.Compare(KNSmlBluetooth)== KErrNone )
-				{
-					iExtOpNode = ETrue;
-				}	
-    			MSmlDmDDFObject& entityNode = rootdcmo.AddChildObjectL( buf );
-    			FillNodeInfoL( entityNode,
-                   accessTypes,
-                   MSmlDmDDFObject::EDynamic,
-                   MSmlDmDDFObject::ENode,
-                   MSmlDmDDFObject::EZeroOrOne,                   
-                   KDCMOCapabilityDescription,
-                   KMimeType ); 
-                                       
-				FillDCMODDFL(entityNode);
-				ex = NULL;
-				buf.Zero();
-				CleanupStack::PopAndDestroy(); //ex
-				}
-
-			// Clean up
-			CleanupStack::PopAndDestroy(); //infoArray, results in a call to CleanupEComArray
-	_DBG_FILE("CDcmoDMAdapter::DDFDCMOAdaptersL(): end");	
-}
-
-// ----------------------------------------------------------------------------
-// CDcmoDMAdapter::FillDCMODDFL
-// This function constructs the DDFnode with the details
-// ----------------------------------------------------------------------------
-//	
-void CDcmoDMAdapter::FillDCMODDFL(MSmlDmDDFObject& aDDF)
-{
-	_DBG_FILE("CDcmoDMAdapter::FillDCMPDDFL(): begin");
-		
-	  TSmlDmAccessTypes accessTypesG;
-    accessTypesG.SetGet();
-    
-    MSmlDmDDFObject& nPropertyDDF = aDDF.AddChildObjectL( KNSmlDdfProperty );			// Property
-    FillNodeInfoL( nPropertyDDF, accessTypesG,  
-                    MSmlDmDDFObject::EPermanent, MSmlDmDDFObject::EChr, MSmlDmDDFObject::EOne,
-                    KNSmlDdfPropertyDescription, KMimeType );
-
-    //Group 
-    MSmlDmDDFObject& nGroupDDF = aDDF.AddChildObjectL( KNSmlDdfGroup );					// Group
-    FillNodeInfoL( nGroupDDF, accessTypesG,  
-                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::EChr, MSmlDmDDFObject::EOne,
-                    KNSmlDdfGroupDescription, KMimeType );           
-                    
-    // Description node 
-    MSmlDmDDFObject& nDescriptionDDF = aDDF.AddChildObjectL( KNSmlDdfDescription );		// Description
-    FillNodeInfoL( nDescriptionDDF, accessTypesG, 
-                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::EChr, MSmlDmDDFObject::EOne, 
-                    KNSmlDdfDescDescription, KMimeType );
-
-    MSmlDmDDFObject& nAttachedDDF = aDDF.AddChildObjectL( KNSmlDdfAttached );			// Attached
-    FillNodeInfoL( nAttachedDDF, accessTypesG, 
-                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::EChr, MSmlDmDDFObject::EOne,
-                    KNSmlDdfAttachedDescription, KMimeType );
-
-		MSmlDmDDFObject& nEnabledDDF = aDDF.AddChildObjectL( KNSmlDdfEnabled );			// Enabled
-    FillNodeInfoL( nEnabledDDF, accessTypesG,  
-                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::EChr, MSmlDmDDFObject::EOne,
-                    KNSmlDdfEnabledDescription, KMimeType );
-
-		MSmlDmDDFObject& nDCMOConfigDDF = aDDF.AddChildObjectL( KNSmlDdfDCMOConfig );	// DCMOConfig
-    FillNodeInfoL( nDCMOConfigDDF, accessTypesG,  
-                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::ENode, MSmlDmDDFObject::EOne,
-                    KNSmlDdfDCMOConfigDescription, KMimeType );
-    
-    MSmlDmDDFObject& nDenyUserEnableDDF = nDCMOConfigDDF.AddChildObjectL( KNSmlDdfDenyUserEnable );	// DenyUserEnable
-    FillNodeInfoL( nDenyUserEnableDDF, accessTypesG,  
-                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::EChr, MSmlDmDDFObject::EZeroOrOne,
-                    KNSmlDdfDenyUserEnableDescription, KMimeType );
-                    
-
-    MSmlDmDDFObject& nNotifyUserDDF = nDCMOConfigDDF.AddChildObjectL( KNSmlDdfNotifyUser );	// NotifyUser
-    FillNodeInfoL( nNotifyUserDDF, accessTypesG,  
-                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::EChr, MSmlDmDDFObject::EOne,
-                    KNSmlDdfNotifyUserDescription, KMimeType );                     
-    //Operations 
-   
-  	MSmlDmDDFObject& nOperationsDDF = aDDF.AddChildObjectL( KNSmlDdfOperations );		// Operations
-    FillNodeInfoL( nOperationsDDF, accessTypesG,  
-                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::ENode, MSmlDmDDFObject::EOne,
-                    KNSmlDdfOperationsDescription, KMimeType ); 
-                    
-   	
-   	TSmlDmAccessTypes accessTypesE;   
-    accessTypesE.SetExec();
-    
-   	MSmlDmDDFObject& nEnableDDF = nOperationsDDF.AddChildObjectL( KNSmlDdfEnable );		// Enable
-    FillNodeInfoL( nEnableDDF, accessTypesE,  
-                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::EChr, MSmlDmDDFObject::EOne,
-                    KNSmlDdfEnableDescription, KMimeType );
-                    
-    
-   	MSmlDmDDFObject& nDisableDDF = nOperationsDDF.AddChildObjectL( KNSmlDdfDisable );	// Disable
-    FillNodeInfoL( nDisableDDF, accessTypesE,  
-                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::EChr, MSmlDmDDFObject::EOne,
-                    KNSmlDdfDisableDescription, KMimeType );
-                    
-
-   	MSmlDmDDFObject& nOpExtDDF = nOperationsDDF.AddChildObjectL( KNSmlDdfOpExt );		// Operations/Ext
-    FillNodeInfoL( nOpExtDDF, accessTypesG,  
-                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::ENode, MSmlDmDDFObject::EOne,
-                    KNSmlDdfOpExtDescription, KMimeType );
-    
-    if( iExtOpNode )
-    {	
-    	MSmlDmDDFObject& nOpExtSemiEnableDDF = nOpExtDDF.AddChildObjectL( KNSmlDdfOpExtSemiEnable );		// Operations/Ext/SemiEnable
-    	FillNodeInfoL( nOpExtSemiEnableDDF, accessTypesE,  
-                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::EChr, MSmlDmDDFObject::EOne,
-                    KNSmlDdfOpExtSemiEnableDescription, KMimeType );                    
-    	iExtOpNode = EFalse;
-  	}               
-
-   	MSmlDmDDFObject& nExtDDF = aDDF.AddChildObjectL( KNSmlDdfExt );						// Ext
-    FillNodeInfoL( nExtDDF, accessTypesG, 
-                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::EChr, MSmlDmDDFObject::EOne, 
-                    KNSmlDdfExtDescription, KMimeType ); 
-
-
-	_DBG_FILE("CDcmoDMAdapter::FillDCMPDDFL(): end");
-}    
-
-// ----------------------------------------------------------------------------
-// CDcmoDMAdapter::GetCategoryFromUriL
-// This function returns the implementation UID if the plug-in
-// ----------------------------------------------------------------------------
-//	
-TPtrC8 CDcmoDMAdapter::GetCategoryFromUriL(const TDesC8& aURI )
-{
-	_DBG_FILE("CDcmoDMAdapter::GetDCMOAdapterUidL(): begin");
-	
-	TInt length = aURI.Length ();
-	TInt count = 0;
-	TInt flag = 0;
-	for (count=0; count<length; count++)
-		{
-		if ( aURI[count]=='/')
-			{
-				if ( flag )
-					break;
-				flag = count;			
-			}
-		}
-		
-	_DBG_FILE("CDcmoDMAdapter::GetDCMOAdapterUidL(): end");	
-	return ( aURI.Mid ( flag+1 , count-(flag+1) ));	
-
-
-}
-
-//----------------------------------------------------------------------
-// TBool CDcmoDMAdapter::CheckEnforcementL()
-// If DCMO policy is enforced true is returned else false
-//----------------------------------------------------------------------
-TBool CDcmoDMAdapter::CheckEnforcementL()
-{
-    CSettingEnforcementInfo* info = CSettingEnforcementInfo::NewL();
-    CleanupStack::PushL(info);
-    TBool enforceActive ( EFalse );
-    User::LeaveIfError(info->EnforcementActive(EDCMOEnforcement, enforceActive));
-    CleanupStack::PopAndDestroy(info);
-    return enforceActive;
-}
-    
-// End of File  
--- a/omadm/omadmextensions/adapters/dcmodmadapter/src/dcmodmadaptermain.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  DCMO DM Adapter implementation
-*
-*/
-
-// INCLUDE
-#include <implementationproxy.h>
-#include "dcmodmadapter.h"
-
-// ----------------------------------------------------------------------------
-// ImplementationTable
-// Ecom plug-in implementation table
-// Status : Draft
-// ----------------------------------------------------------------------------
-//
-const TImplementationProxy ImplementationTable[] = 
-    {
-	IMPLEMENTATION_PROXY_ENTRY( 0x2001FD3F, CDcmoDMAdapter::NewL )
-    };
-
-// ----------------------------------------------------------------------------
-// ImplementationGroupProxy
-// Instance of implementation proxy
-// (exported)
-// Status : Draft
-// ----------------------------------------------------------------------------
-//
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy( TInt& aTableCount )
-    {
-    aTableCount = sizeof( ImplementationTable ) / sizeof( TImplementationProxy );
-
-    return ImplementationTable;
-    }
-
-// End Of File
--- a/omadm/omadmextensions/adapters/devdetail/bld/DevDetail_HwV.txt	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-0000
\ No newline at end of file
--- a/omadm/omadmextensions/adapters/devdetail/bld/DevDetail_SwV.txt	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-xxx-xxx 0.00 00
\ No newline at end of file
--- a/omadm/omadmextensions/adapters/devdetail/bld/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-/*
-* Copyright (c) 2002 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:    build info file for DevDetail adapter
-*
-*/
-
-
-
-
-PRJ_EXPORTS
-./DevDetail_SwV.txt /epoc32/release/winscw/udeb/z/resource/devman/devdetail_swv.txt
-./DevDetail_SwV.txt /epoc32/release/winscw/urel/z/resource/devman/devdetail_swv.txt
-./DevDetail_HwV.txt /epoc32/release/winscw/udeb/z/resource/devman/devdetail_hwv.txt
-./DevDetail_HwV.txt /epoc32/release/winscw/urel/z/resource/devman/devdetail_hwv.txt
-
-PRJ_MMPFILES
-./nsmldmdevdetailadapter.mmp
-
-
-
-
--- a/omadm/omadmextensions/adapters/devdetail/bld/nsmldmdevdetailadapter.mmp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +0,0 @@
-/*
-* Copyright (c) 2004 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 devdetail adapter
-*
-*/
-
-
-
-
-#include "defaultcaps.hrh"
-#include  <platform_paths.hrh>
-
-//This flag is used for enabling Fota Multi-ROFS Support
-MACRO	_ENABLE_MULTIROFS_SUPPORT
-
-TARGET          nsmldmdevdetailadapter.dll
-TARGETTYPE      PLUGIN
-UID             0x10009D8D 0x101F6DE9
-VENDORID        VID_DEFAULT
-CAPABILITY  CAP_GENERAL_DLL
-
-APP_LAYER_SYSTEMINCLUDE
-SYSTEMINCLUDE   /epoc32/include/ecom
-
-SOURCEPATH      ../src
-USERINCLUDE     ../inc
-USERINCLUDE     ../../inc
-SOURCE          nsmldmdevdetailadapter.cpp
-
-//#if defined(ARMCC)
-SOURCE          nsmldmdevdetailutils_ARM.cpp
-//#elif defined(WINSCW)
-//SOURCE          nsmldmdevdetailutils_WINSCW.cpp
-//#endif
-
-START RESOURCE nsmldmdevdetailadapter.rss
-LANGUAGE_IDS
-END
-
-
-
-
-//#if defined(ARMCC)
-LIBRARY sysutil.lib
-//#elif defined(WINSCW)
-//LIBRARY efsrv.lib
-//#endif
-
-
-LIBRARY         euser.lib 
-LIBRARY         ecom.lib 
-LIBRARY         nsmldebug.lib
-LIBRARY         nsmlagentcommon.lib
-
-//For Multi-ROFS Support
-LIBRARY			  sysversioninfo.lib
-
-
-SMPSAFE
--- a/omadm/omadmextensions/adapters/devdetail/inc/nsmldmdevdetailadapter.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,164 +0,0 @@
-/*
-* Copyright (c) 2004 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:    DM DevDetail Adapter
-*
-*/
-
-
-
-
-#ifndef __NSMLDMDEVDETAILADAPTER_H__
-#define __NSMLDMDEVDETAILADAPTER_H__
-
-// INCLUDES
-
-#include <e32base.h>
-#include <smldmadapter.h>
-#include "nsmldmconstants.h"
-
-// the DDF version must be changed if any changes in DDF structure 
-// ( built in DDFStructureL() function )
-_LIT8( KNSmlDMDevDetailDDFVersion, "1.0" ); 
-
-_LIT8( KNSmlDMDevDetailTextPlain, "text/plain" );
-_LIT8( KNSmlDMDevDetailNodeName, "DevDetail" );
-_LIT8( KNSmlDMDevDetailDescription, "The interior object holds all DevDetail objects" );
-
-_LIT8( KNSmlDMDevDetailDevTypNodeName, "DevTyp" );
-_LIT8( KNSmlDMDevDetailDevTypDescription, "The type of the device" );
-_LIT8( KNSmlDMDevDetailDevTypValue, "smartphone" );
-
-_LIT8( KNSmlDMDevDetailOEMNodeName, "OEM" );
-_LIT8( KNSmlDMDevDetailOEMDescription, "Original Equipment Manufacturer" );
-
-_LIT8( KNSmlDMDevDetailFwVNodeName, "FwV" );
-_LIT8( KNSmlDMDevDetailFwVDescription, "The firmware revision of the device" );
-
-_LIT8( KNSmlDMDevDetailSwVNodeName, "SwV" );
-_LIT8( KNSmlDMDevDetailSwVDescription, "The software revision of the device" );
-
-_LIT8( KNSmlDMDevDetailHwVNodeName, "HwV" );
-_LIT8( KNSmlDMDevDetailHwVDescription, "The hardware revision of the device" );
-
-_LIT8( KNSmlDMDevDetailLrgObjNodeName, "LrgObj" );
-_LIT8( KNSmlDMDevDetailLrgObjDescription, "Large object handling supported if value is true" );
-_LIT8( KNSmlDMDevDetailLrgObjValue, "true" );
-
-_LIT8( KNSmlDMDevDetailURINodeName, "URI" );
-_LIT8( KNSmlDMDevDetailURIDescription, "The tree limitations branch" );
-
-_LIT8( KNSmlDMDevDetailMaxDepthNodeName, "MaxDepth" );
-_LIT8( KNSmlDMDevDetailMaxDepthDescription, "Maximum tree depth" );
-_LIT8( KNSmlDMDevDetailMaxDepthValue, "0" );
-
-_LIT8( KNSmlDMDevDetailMaxTotLenNodeName, "MaxTotLen" );
-_LIT8( KNSmlDMDevDetailMaxTotLenDescription, "Maximum URI length" );
-_LIT8( KNSmlDMDevDetailMaxTotLenValue, "0" );
-
-_LIT8( KNSmlDMDevDetailMaxSegLenNodeName, "MaxSegLen" );
-_LIT8( KNSmlDMDevDetailMaxSegLenDescription, "Maximum URI segment length" );
-_LIT8( KNSmlDMDevDetailMaxSegLenValue, "9" );
-
-_LIT8( KNSmlDMDevDetailSeparator, "/" );
-
-const TInt KNSmlMaxRequestBufferLength = 128;
-const TInt KNSmlMaxSizeBufferLength = 4;
-
-_LIT( KNSmlDevDetailPanic,      "DevDetail" );
-
-// CLASS DECLARATION
-class CNSmlDmDevDetailAdapter : public CSmlDmAdapter
-    {
-public:  // contructors and destructor
-    static CNSmlDmDevDetailAdapter* NewL(MSmlDmCallback* aDmCallback );
-    static CNSmlDmDevDetailAdapter* NewLC(MSmlDmCallback* aDmCallback );
-
-    virtual ~CNSmlDmDevDetailAdapter();
-    virtual TInt DevDetailValueCrcL();
-
-private: // new functions
-    CNSmlDmDevDetailAdapter(TAny* aEcomArguments);
-    void AddObjectToBufferL( CBufBase& aCrcBuf, const TDesC8& aURI ); 
-    CSmlDmAdapter::TError FetchLeafObjectL( const TDesC8& aURI, CBufBase& aObject ); 
-    void SetLeafPropertiesL( MSmlDmDDFObject& aObject, 
-                             const TSmlDmAccessTypes& aAccessTypes, 
-                             const TDesC8& aDescription ) const;
-            
-private: // functions from base classes
-    // from CSmlDmAdapter
-    void DDFVersionL( CBufBase& aVersion );
-    void DDFStructureL( MSmlDmDDFObject& aDDF );
-    void UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, 
-                            const TDesC8& aObject, const TDesC8& aType, 
-                            const TInt aStatusRef );
-    void DeleteObjectL( const TDesC8& aURI, const TDesC8& aLUID, const TInt aStatusRef ); 
-    void FetchLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, 
-                           const TDesC8& aType, const TInt aResultsRef, 
-                           const TInt aStatusRef ); 
-    void ChildURIListL( const TDesC8& aURI, const TDesC8& aLUID, 
-                        const CArrayFix<TSmlDmMappingInfo>& aPreviousURISegmentList, 
-                        const TInt aResultsRef, const TInt aStatusRef );  
-    void AddNodeObjectL( const TDesC8& aURI, const TDesC8& aParentLUID, 
-                         const TInt aStatusRef );
-    void UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, 
-                            RWriteStream*& aStream, const TDesC8& aType, 
-                            const TInt aStatusRef );
-    void FetchLeafObjectSizeL( const TDesC8& aURI, const TDesC8& aLUID, 
-                               const TDesC8& aType, const TInt aResultsRef, 
-                               const TInt aStatusRef );
-    void ExecuteCommandL( const TDesC8& aURI, const TDesC8& aLUID, const TDesC8& aArgument, 
-                          const TDesC8& aType, const TInt aStatusRef );
-    void ExecuteCommandL( const TDesC8& aURI, const TDesC8& aLUID, RWriteStream*& aStream, 
-                          const TDesC8& aType, const TInt aStatusRef );
-    void CopyCommandL( const TDesC8& aTargetURI, const TDesC8& aTargetLUID, 
-                       const TDesC8& aSourceURI, const TDesC8& aSourceLUID, 
-                       const TDesC8& aType, TInt aStatusRef );
-    void StartAtomicL();
-    void CommitAtomicL();
-    void RollbackAtomicL();
-    TBool StreamingSupport( TInt& aItemSize );
-    void StreamCommittedL();
-    void CompleteOutstandingCmdsL();
-
-// FOTA
-private:
-
-    /**
-    * Enumeration specifies the data that can be fetched using
-    * GetDevDetailDataL().
-    */
-    enum TNSmlDevDetailData
-        {
-        ESwVersion,
-        EHwVersion
-        };
-
-    /**
-    * Fetches and/or forms DevDetail data specified by aElement.
-    * In WINSCW this data is read from file. In ARM builds the 
-    * data is fetched from EInfo.
-    * @param aObject The buffer where fetched data is inserted.
-    * @param aElement Specifies the data that should be fetched.
-    */
-    void GetDevDetailDataL( CBufBase& aObject, TNSmlDevDetailData aElement ) const;
-	
-// FOTA end
-
-private:
-
-    MSmlDmCallback* iDmCallback;
-    
-    };
-
-#endif // __NSMLDMDEVDETAILADAPTER_H__
--- a/omadm/omadmextensions/adapters/devdetail/src/nsmldmdevdetailadapter.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,561 +0,0 @@
-/*
-* Copyright (c) 2004 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:    DM DevDetail Adapter Source Code
-*
-*/
-
-
-
-
-// INCLUDE FILES
-#include <implementationproxy.h> // For TImplementationProxy definition
-
-#include "nsmldmimpluids.h"
-#include "nsmldmdevdetailadapter.h"
-#include "nsmldebug.h"
-#include "nsmlphoneinfo.h"
-#include "nsmlunicodeconverter.h"
-#include "nsmlconstants.h"
-
-
-// ------------------------------------------------------------------------------------------------
-// CNSmlDmDevDetailAdapter::NewL( )
-// ------------------------------------------------------------------------------------------------
-CNSmlDmDevDetailAdapter* CNSmlDmDevDetailAdapter::NewL(MSmlDmCallback* aDmCallback )
-    {
-    _DBG_FILE("CNSmlDmDevDetailAdapter::NewL(): begin");
-    CNSmlDmDevDetailAdapter* self = NewLC( aDmCallback );
-    CleanupStack::Pop();
-    _DBG_FILE("CNSmlDmDevDetailAdapter::NewL(): end");
-    return self;
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CNSmlDmDevDetailAdapter::NewLC( )
-// ------------------------------------------------------------------------------------------------
-CNSmlDmDevDetailAdapter* CNSmlDmDevDetailAdapter::NewLC(MSmlDmCallback* aDmCallback )
-    {
-    _DBG_FILE("CNSmlDmDevDetailAdapter::NewLC(): begin");
-    CNSmlDmDevDetailAdapter* self = new (ELeave) CNSmlDmDevDetailAdapter(aDmCallback);
-    CleanupStack::PushL(self);
-    self->iDmCallback=aDmCallback;
-    _DBG_FILE("CNSmlDmDevDetailAdapter::NewLC(): end");
-    return self;
-    }
-
-    
-// ------------------------------------------------------------------------------------------------
-// CNSmlDmDevDetailAdapter::CNSmlDmDevDetailAdapter(TAny* aEcomArguments)
-// ------------------------------------------------------------------------------------------------
-CNSmlDmDevDetailAdapter::CNSmlDmDevDetailAdapter(TAny* aEcomArguments):CSmlDmAdapter(aEcomArguments)
-    {
-    _DBG_FILE("CNSmlDmDevDetailAdapter::CNSmlDmDevDetailAdapter(): begin");
-    _DBG_FILE("CNSmlDmDevDetailAdapter::CNSmlDmDevDetailAdapter(): end");
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDmDevDetailAdapter::~CNSmlDmDevDetailAdapter()
-// -----------------------------------------------------------------------------
-CNSmlDmDevDetailAdapter::~CNSmlDmDevDetailAdapter()
-    {
-    _DBG_FILE("CNSmlDmDevDetailAdapter::~CNSmlDmDevDetailAdapter(): begin");
-    _DBG_FILE("CNSmlDmDevDetailAdapter::~CNSmlDmDevDetailAdapter(): end");
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDmDevDetailAdapter::DevDetailValueCrcL()
-// -----------------------------------------------------------------------------
-TInt CNSmlDmDevDetailAdapter::DevDetailValueCrcL()
-    {
-    CBufBase* crcBuf = CBufFlat::NewL( 1 );
-    CleanupStack::PushL( crcBuf );
-    
-    AddObjectToBufferL( *crcBuf, KNSmlDMDevDetailDevTypNodeName() );
-    AddObjectToBufferL( *crcBuf, KNSmlDMDevDetailOEMNodeName() );
-    AddObjectToBufferL( *crcBuf, KNSmlDMDevDetailFwVNodeName() );
-    AddObjectToBufferL( *crcBuf, KNSmlDMDevDetailSwVNodeName() );
-    AddObjectToBufferL( *crcBuf, KNSmlDMDevDetailHwVNodeName() );
-    AddObjectToBufferL( *crcBuf, KNSmlDMDevDetailLrgObjNodeName() );
-    AddObjectToBufferL( *crcBuf, KNSmlDMDevDetailMaxDepthNodeName() );
-    AddObjectToBufferL( *crcBuf, KNSmlDMDevDetailMaxTotLenNodeName() );
-    AddObjectToBufferL( *crcBuf, KNSmlDMDevDetailMaxSegLenNodeName() );
-    
-    TUint16 crc = 0;
-    Mem::Crc( crc, crcBuf->Ptr(0).Ptr(), crcBuf->Size() );
-    CleanupStack::PopAndDestroy();  // crcBuf
-    return crc;
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDmDevDetailAdapter::AddObjectToBufferL()
-// -----------------------------------------------------------------------------
-void CNSmlDmDevDetailAdapter::AddObjectToBufferL( CBufBase& aCrcBuf, 
-                                                  const TDesC8& aURI )
-    {
-    CBufBase* buf = CBufFlat::NewL( 1 );
-    CleanupStack::PushL( buf );
-    FetchLeafObjectL( aURI, *buf );
-    aCrcBuf.InsertL( aCrcBuf.Size(), buf->Ptr(0) );
-    _LIT8( KNSmlDmSeparator, ";" );
-    aCrcBuf.InsertL( aCrcBuf.Size(), KNSmlDmSeparator );
-    CleanupStack::PopAndDestroy(); //buf    
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDmDevDetailAdapter::FetchLeafObjectL()
-// -----------------------------------------------------------------------------
-CSmlDmAdapter::TError CNSmlDmDevDetailAdapter::FetchLeafObjectL( const TDesC8& aURI, 
-                                                                 CBufBase& aObject )
-    {
-    _DBG_FILE("CNSmlDmDevDetailAdapter::FetchLeafObjectL(): begin");
-    CSmlDmAdapter::TError retValue = CSmlDmAdapter::EOk;
-
-    TInt ret = aURI.LocateReverse(KNSmlDMDevDetailSeparator()[0]);
-    if ( ret == KErrNotFound ) 
-        {
-        ret = -1;
-        }
-    TInt len = aURI.Length() - ( ret + 1 );
-    TPtrC8 segment = aURI.Right( len );
-    if ( segment == KNSmlDMDevDetailDevTypNodeName )
-        {
-        aObject.InsertL( 0, KNSmlDMDevDetailDevTypValue );
-        }
-    else
-    if ( segment == KNSmlDMDevDetailOEMNodeName )
-        {
-        CNSmlPhoneInfo* phoneInfo = CNSmlPhoneInfo::NewLC();
-        HBufC* manufacturer = HBufC::NewLC( 50 );
-        TPtr manufacturerPtr = manufacturer->Des();  
-        phoneInfo->PhoneDataL( CNSmlPhoneInfo::EPhoneManufacturer, manufacturerPtr );
-        HBufC8* manufacturerInUTF8 = NULL;
-        NSmlUnicodeConverter::HBufC8InUTF8LC( *manufacturer, manufacturerInUTF8 );
-        aObject.InsertL( 0, *manufacturerInUTF8 );
-        CleanupStack::PopAndDestroy( 3 ); //manufacturerInUTF8, manufacturer, phoneInfo
-        }
-    else
-    if ( segment == KNSmlDMDevDetailSwVNodeName )
-        {
-        // fetch software version
-        GetDevDetailDataL( aObject, ESwVersion );
-        }
-    else
-    if ( segment == KNSmlDMDevDetailHwVNodeName )
-        {
-        // fetch hardware version
-        GetDevDetailDataL( aObject, EHwVersion );
-        }
-    else
-    if ( segment == KNSmlDMDevDetailLrgObjNodeName )
-        {
-        aObject.InsertL( 0, KNSmlDMDevDetailLrgObjValue );
-        }
-    else
-    if ( segment == KNSmlDMDevDetailMaxDepthNodeName )
-        {
-        aObject.InsertL( 0, KNSmlDMDevDetailMaxDepthValue );
-        }
-    else
-    if ( segment == KNSmlDMDevDetailMaxTotLenNodeName )
-        {
-        aObject.InsertL( 0, KNSmlDMDevDetailMaxTotLenValue );
-        }
-    else
-    if ( segment == KNSmlDMDevDetailMaxSegLenNodeName )
-        {
-        aObject.InsertL( 0, KNSmlDMDevDetailMaxSegLenValue );
-        }
-    else
-    if ( segment != KNSmlDMDevDetailFwVNodeName )
-        {
-        retValue = CSmlDmAdapter::EError;
-        }
-        
-    _DBG_FILE("CNSmlDmDevDetailAdapter::FetchLeafObjectL(): end");
-    return retValue;
-    }
-// -----------------------------------------------------------------------------
-// CNSmlDmDevDetailAdapter::SetLeafPropertiesL()
-// -----------------------------------------------------------------------------
-void CNSmlDmDevDetailAdapter::SetLeafPropertiesL( MSmlDmDDFObject& aObject, 
-                                                  const TSmlDmAccessTypes& aAccessTypes,  
-                                                  const TDesC8& aDescription ) const
-    {
-    aObject.SetAccessTypesL( aAccessTypes );
-    aObject.SetScopeL( MSmlDmDDFObject::EPermanent );
-    aObject.SetDFFormatL( MSmlDmDDFObject::EChr );
-    aObject.AddDFTypeMimeTypeL( KNSmlDMDevDetailTextPlain );
-    aObject.SetDescriptionL( aDescription );
-    }
-
-
-
-// -----------------------------------------------------------------------------
-// CNSmlDmDevDetailAdapter::DDFVersionL()
-// -----------------------------------------------------------------------------
-void CNSmlDmDevDetailAdapter::DDFVersionL(CBufBase& aDDFVersion)
-    {
-    _DBG_FILE("CNSmlDmDevDetailAdapter::DDFVersionL(TDes& aDDFVersion): begin");
-    aDDFVersion.InsertL(0,KNSmlDMDevDetailDDFVersion);
-    _DBG_FILE("CNSmlDmDevDetailAdapter::DDFVersionL(TDes& aDDFVersion): end");
-    }
-
-
-// -----------------------------------------------------------------------------
-// void CNSmlDmDevDetailAdapter::DDFStructureL()
-//
-// -----------------------------------------------------------------------------
-void CNSmlDmDevDetailAdapter::DDFStructureL( MSmlDmDDFObject& aDDF )
-    {
-    _DBG_FILE("CNSmlDmDevDetailAdapter::DDFStructureL(): begin");
-    
-    TSmlDmAccessTypes accessTypes;
-    
-    accessTypes.SetGet();
-    // DevDetail
-    MSmlDmDDFObject& devDetail = aDDF.AddChildObjectL( KNSmlDMDevDetailNodeName );
-    devDetail.SetAccessTypesL( accessTypes ); 
-    devDetail.SetScopeL( MSmlDmDDFObject::EPermanent );
-    devDetail.SetDescriptionL( KNSmlDMDevDetailDescription );
-
-    // DevTyp   
-    MSmlDmDDFObject& devTyp = devDetail.AddChildObjectL(KNSmlDMDevDetailDevTypNodeName );
-    SetLeafPropertiesL( devTyp, accessTypes, KNSmlDMDevDetailDevTypDescription );
-    // OEM  
-    MSmlDmDDFObject& oem = devDetail.AddChildObjectL(KNSmlDMDevDetailOEMNodeName);
-    SetLeafPropertiesL( oem, accessTypes, KNSmlDMDevDetailOEMDescription );
-    // FwV  
-    MSmlDmDDFObject& fwv = devDetail.AddChildObjectL(KNSmlDMDevDetailFwVNodeName);
-    SetLeafPropertiesL( fwv, accessTypes, KNSmlDMDevDetailFwVDescription );
-    // SwV  
-    MSmlDmDDFObject& swv = devDetail.AddChildObjectL( KNSmlDMDevDetailSwVNodeName );
-    SetLeafPropertiesL( swv, accessTypes, KNSmlDMDevDetailSwVDescription );
-    // HwV  
-    MSmlDmDDFObject& hwv = devDetail.AddChildObjectL(KNSmlDMDevDetailHwVNodeName );
-    SetLeafPropertiesL( hwv, accessTypes, KNSmlDMDevDetailHwVDescription );
-    // LrgObj   
-    MSmlDmDDFObject& lrgObj = devDetail.AddChildObjectL(KNSmlDMDevDetailLrgObjNodeName );
-    SetLeafPropertiesL( lrgObj, accessTypes, KNSmlDMDevDetailLrgObjDescription );
-    lrgObj.SetDFFormatL( MSmlDmDDFObject::EBool );
-    // URI
-    MSmlDmDDFObject& uri = devDetail.AddChildObjectL(KNSmlDMDevDetailURINodeName);
-    uri.SetAccessTypesL( accessTypes );
-    uri.SetScopeL( MSmlDmDDFObject::EPermanent );
-    uri.SetDescriptionL( KNSmlDMDevDetailURIDescription );
-    // MaxDepth
-    MSmlDmDDFObject& maxDepth = uri.AddChildObjectL( KNSmlDMDevDetailMaxDepthNodeName);
-    SetLeafPropertiesL( maxDepth, accessTypes, KNSmlDMDevDetailMaxDepthDescription );
-    // MaxTotLen
-    MSmlDmDDFObject& maxTotLen = uri.AddChildObjectL( KNSmlDMDevDetailMaxTotLenNodeName );
-    SetLeafPropertiesL( maxTotLen, accessTypes, KNSmlDMDevDetailMaxTotLenDescription );
-    // MaxSegLen
-    MSmlDmDDFObject& maxSegLen = uri.AddChildObjectL( KNSmlDMDevDetailMaxSegLenNodeName);
-    SetLeafPropertiesL( maxSegLen, accessTypes, KNSmlDMDevDetailMaxSegLenDescription );
-        
-    _DBG_FILE("CNSmlDmDevDetailAdapter::DDFStructureL(): end");
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDmDevDetailAdapter::UpdateLeafObjectL()
-// -----------------------------------------------------------------------------
-void  CNSmlDmDevDetailAdapter::UpdateLeafObjectL( const TDesC8& /*aURI*/, 
-                                                  const TDesC8& /*aLUID*/, 
-                                                  const TDesC8& /*aObject*/, 
-                                                  const TDesC8& /*aType*/,
-                                                  const TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlDmDevDetailAdapter::UpdateLeafObjectL(): begin");
-    _DBG_FILE("CNSmlDmDevDetailAdapter::UpdateLeafObjectL(): end");
-    iDmCallback->SetStatusL(aStatusRef,CSmlDmAdapter::EError);
-    }
-
-
-// -----------------------------------------------------------------------------
-//  CNSmlDmDevDetailAdapter::DeleteObjectL()
-// -----------------------------------------------------------------------------
-void  CNSmlDmDevDetailAdapter::DeleteObjectL( const TDesC8& /*aURI*/, 
-                                              const TDesC8& /*aLUID*/,
-                                              const TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlDmDevDetailAdapter::DeleteLeafObjectL( ): begin");
-    _DBG_FILE("CNSmlDmDevDetailAdapter::DeleteLeafObjectL( ): end");
-    iDmCallback->SetStatusL(aStatusRef,CSmlDmAdapter::EError);
-    }
-
-
-// -----------------------------------------------------------------------------
-// CNSmlDmDevDetailAdapter::FetchLeafObjectL()
-// -----------------------------------------------------------------------------
-void  CNSmlDmDevDetailAdapter::FetchLeafObjectL( const TDesC8& aURI, 
-                                                 const TDesC8& /*aLUID*/, 
-                                                 const TDesC8& aType, 
-                                                 const TInt aResultsRef, 
-                                                 const TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlDmDevDetailAdapter::FetchLeafObjectL(): begin");
-    CBufBase *object = CBufFlat::NewL( 1 );
-    CleanupStack::PushL( object );
-    CSmlDmAdapter::TError retValue = FetchLeafObjectL( aURI, *object );
-
-    iDmCallback->SetStatusL( aStatusRef, retValue );
-    iDmCallback->SetResultsL( aResultsRef, *object, aType);
-    CleanupStack::PopAndDestroy(); //object
-        
-    _DBG_FILE("CNSmlDmDevDetailAdapter::FetchLeafObjectL(): end");
-    }
-
-
-// -----------------------------------------------------------------------------
-// CSmlDmAdapter::TError CNSmlDmDevDetailAdapter::ChildURIListL()
-// -----------------------------------------------------------------------------
-
-void  CNSmlDmDevDetailAdapter::ChildURIListL( const TDesC8& aURI, 
-                                              const TDesC8& /*aLUID*/, 
-                                              const CArrayFix<TSmlDmMappingInfo>& /*aPreviousURISegmentList*/, 
-                                              const TInt aResultsRef, 
-                                              const TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlDmDevDetailAdapter::ChildURIListL(): begin");
-    CSmlDmAdapter::TError retValue = CSmlDmAdapter::EOk;
-    CBufBase *currentURISegmentList = CBufFlat::NewL(64);
-    CleanupStack::PushL(currentURISegmentList);
-
-    TInt ret = aURI.LocateReverse(KNSmlDMDevDetailSeparator()[0]);
-    if ( ret == KErrNotFound ) 
-        {
-        ret = -1;
-        }
-    TInt len = aURI.Length() - ( ret + 1 );
-    TPtrC8 segment = aURI.Right( len );
-
-    if ( segment == KNSmlDMDevDetailNodeName )
-        {
-        currentURISegmentList->InsertL( currentURISegmentList->Size(), KNSmlDMDevDetailDevTypNodeName() );
-        currentURISegmentList->InsertL( currentURISegmentList->Size(), KNSmlDMDevDetailSeparator() );
-        currentURISegmentList->InsertL( currentURISegmentList->Size(), KNSmlDMDevDetailOEMNodeName() );
-        currentURISegmentList->InsertL( currentURISegmentList->Size(), KNSmlDMDevDetailSeparator() );
-        currentURISegmentList->InsertL( currentURISegmentList->Size(), KNSmlDMDevDetailFwVNodeName() );
-        currentURISegmentList->InsertL( currentURISegmentList->Size(), KNSmlDMDevDetailSeparator() );
-        currentURISegmentList->InsertL( currentURISegmentList->Size(), KNSmlDMDevDetailSwVNodeName() );
-        currentURISegmentList->InsertL( currentURISegmentList->Size(), KNSmlDMDevDetailSeparator() );
-         currentURISegmentList->InsertL( currentURISegmentList->Size(), KNSmlDMDevDetailHwVNodeName() );
-        currentURISegmentList->InsertL( currentURISegmentList->Size(), KNSmlDMDevDetailSeparator() );
-        currentURISegmentList->InsertL( currentURISegmentList->Size(), KNSmlDMDevDetailLrgObjNodeName() );
-        currentURISegmentList->InsertL( currentURISegmentList->Size(), KNSmlDMDevDetailSeparator() );
-         currentURISegmentList->InsertL( currentURISegmentList->Size(), KNSmlDMDevDetailURINodeName() );
-        }
-    else
-    if ( segment == KNSmlDMDevDetailURINodeName )
-        {
-        currentURISegmentList->InsertL( currentURISegmentList->Size(), KNSmlDMDevDetailMaxDepthNodeName() );
-        currentURISegmentList->InsertL( currentURISegmentList->Size(), KNSmlDMDevDetailSeparator() );
-        currentURISegmentList->InsertL( currentURISegmentList->Size(), KNSmlDMDevDetailMaxTotLenNodeName() );
-        currentURISegmentList->InsertL( currentURISegmentList->Size(), KNSmlDMDevDetailSeparator() );
-        currentURISegmentList->InsertL( currentURISegmentList->Size(), KNSmlDMDevDetailMaxSegLenNodeName() );
-        }
-    else
-        {
-        retValue = CSmlDmAdapter::EError;
-        }
-
-    iDmCallback->SetStatusL(aStatusRef,retValue);
-    iDmCallback->SetResultsL(aResultsRef,*currentURISegmentList,KNullDesC8);
-    CleanupStack::PopAndDestroy(); //currentURISegmentList;
-    _DBG_FILE("CNSmlDmDevDetailAdapter::ChildURIListL(): end");
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDmDevDetailAdapter::AddNodeObjectL()
-// -----------------------------------------------------------------------------
-void  CNSmlDmDevDetailAdapter::AddNodeObjectL( const TDesC8& /*aURI*/, 
-                                               const TDesC8& /*aParentLUID*/,
-                                               const TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlDmDevDetailAdapter::AddNodeObjectL(): begin");
-    _DBG_FILE("CNSmlDmDevDetailAdapter::AddNodeObjectL(): end");
-    iDmCallback->SetStatusL(aStatusRef,CSmlDmAdapter::EError);
-    }
-
-// -----------------------------------------------------------------------------
-//  CNSmlDmDevDetailAdapter::UpdateLeafObjectL(const TDesC8& aURI, 
-// const TDesC8& aLUID, RWriteStream*& aStream, const TDesC8& aType, 
-// const TInt aStatusRef)
-// -----------------------------------------------------------------------------
-void CNSmlDmDevDetailAdapter::UpdateLeafObjectL( const TDesC8& /*aURI*/, 
-                                                 const TDesC8& /*aLUID*/, 
-                                                 RWriteStream*& /*aStream*/, 
-                                                 const TDesC8& /*aType*/, 
-                                                 const TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlDmDevInfoAdapter::UpdateLeafObjectL(): stream: begin");
-    iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-    _DBG_FILE("CNSmlDmDevInfoAdapter::UpdateLeafObjectL(): stream: end");
-    }
-
-// -----------------------------------------------------------------------------
-//  CNSmlDmDevDetailAdapter::FetchLeafObjectSizeL( const TDesC8& aURI, 
-// const TDesC8& aLUID, const TDesC8& aType, const TInt aResultsRef, 
-// const TInt aStatusRef )
-// -----------------------------------------------------------------------------
-void CNSmlDmDevDetailAdapter::FetchLeafObjectSizeL( const TDesC8& aURI, 
-                                                    const TDesC8& /*aLUID*/, 
-                                                    const TDesC8& aType, 
-                                                    const TInt aResultsRef, 
-                                                    const TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlDmDevDetailAdapter::FetchLeafObjectSizeL(): begin");
-
-    CBufBase *object = CBufFlat::NewL( 1 );
-    CleanupStack::PushL( object );
-    CSmlDmAdapter::TError retValue = FetchLeafObjectL( aURI, *object );
-
-    TInt objSizeInBytes = object->Size();
-    TBuf8<KNSmlMaxSizeBufferLength> stringObjSizeInBytes;
-    stringObjSizeInBytes.Num( objSizeInBytes );
-    object->Reset();
-    object->InsertL( 0, stringObjSizeInBytes );
-    
-    iDmCallback->SetStatusL( aStatusRef, retValue );
-    iDmCallback->SetResultsL( aResultsRef, *object, aType);
-    CleanupStack::PopAndDestroy(); //object 
-
-            
-    _DBG_FILE("CNSmlDmDevDetailAdapter::FetchLeafObjectSizeL(): end");
-    }
-    
-// -----------------------------------------------------------------------------
-//  CNSmlDmDevDetailAdapter::ExecuteCommandL( const TDesC8& aURI, 
-//  const TDesC8& aParentLUID, TDesC8& aArgument, const TDesC8& aType, 
-//  TInt aStatusRef )
-// -----------------------------------------------------------------------------
-void CNSmlDmDevDetailAdapter::ExecuteCommandL( const TDesC8& /*aURI*/, const TDesC8& /*aLUID*/, const TDesC8& /*aArgument*/, const TDesC8& /*aType*/, const TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlDmDevInfoAdapter::ExecuteCommandL(): begin");
-    iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-    _DBG_FILE("CNSmlDmDevInfoAdapter::ExecuteCommandL(): end");
-    }
-
-// -----------------------------------------------------------------------------
-//  CNSmlDmDevDetailAdapter::ExecuteCommandL( const TDesC8& aURI, 
-//  const TDesC8& aParentLUID, RWriteStream*& aStream, const TDesC8& aType, 
-//  const TInt aStatusRef )
-// -----------------------------------------------------------------------------
-void CNSmlDmDevDetailAdapter::ExecuteCommandL( const TDesC8& /*aURI*/, 
-                                               const TDesC8& /*aParentLUID*/, 
-                                               RWriteStream*& /*aStream*/, 
-                                               const TDesC8& /*aType*/, 
-                                               const TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlDmDevInfoAdapter::ExecuteCommandL(): stream: begin");
-    iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-    _DBG_FILE("CNSmlDmDevInfoAdapter::ExecuteCommandL(): stream: end");
-    }
-// -----------------------------------------------------------------------------
-//  CNSmlDmDevDetailAdapter::CopyCommandL( const TDesC8& aTargetURI, 
-//  const TDesC8& aSourceURI, const TDesC8& aSourceLUID, const TDesC8& aType, 
-//  const TInt aStatusRef )
-// -----------------------------------------------------------------------------
-void CNSmlDmDevDetailAdapter::CopyCommandL( const TDesC8& /*aTargetURI*/, 
-                                            const TDesC8& /*aTargetLUID*/, 
-                                            const TDesC8& /*aSourceURI*/, 
-                                            const TDesC8& /*aSourceLUID*/, 
-                                            const TDesC8& /*aType*/, 
-                                            TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlDmDevInfoAdapter::CopyCommandL(): begin");
-    iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-    _DBG_FILE("CNSmlDmDevInfoAdapter::CopyCommandL(): end");
-    }
-
-// ----------------------------------------
-//  CNSmlDmDevDetailAdapter::StartAtomicL()
-// ----------------------------------------
-void CNSmlDmDevDetailAdapter::StartAtomicL()
-    {
-    _DBG_FILE("CNSmlDmDevInfoAdapter::StartAtomicL(): begin");
-    _DBG_FILE("CNSmlDmDevInfoAdapter::StartAtomicL(): end");
-    }
-    
-// -----------------------------------------
-//  CNSmlDmDevDetailAdapter::CommitAtomicL()
-// -----------------------------------------
-void CNSmlDmDevDetailAdapter::CommitAtomicL()
-    {
-    _DBG_FILE("CNSmlDmDevInfoAdapter::CommitAtomicL(): begin");
-    _DBG_FILE("CNSmlDmDevInfoAdapter::CommitAtomicL(): end");
-    }
-
-// -------------------------------------------
-//  CNSmlDmDevDetailAdapter::RollbackAtomicL()
-// -------------------------------------------
-void CNSmlDmDevDetailAdapter::RollbackAtomicL()
-    {
-    _DBG_FILE("CNSmlDmDevInfoAdapter::RollbackAtomicL(): begin");
-    _DBG_FILE("CNSmlDmDevInfoAdapter::RollbackAtomicL(): end");
-    }
-
-// -------------------------------------------------------------
-//  CNSmlDmDevDetailAdapter::StreamingSupport( TInt& aItemSize )
-// -------------------------------------------------------------    
-TBool CNSmlDmDevDetailAdapter::StreamingSupport( TInt& /*aItemSize*/ )
-    {
-    _DBG_FILE("CNSmlDmDevInfoAdapter::StreamingSupport(): begin");
-    _DBG_FILE("CNSmlDmDevInfoAdapter::StreamingSupport(): end");
-    return EFalse;
-    }
-
-// --------------------------------------------
-//  CNSmlDmDevDetailAdapter::StreamCommittedL()
-// --------------------------------------------
-void CNSmlDmDevDetailAdapter::StreamCommittedL()
-    {
-    _DBG_FILE("CNSmlDmDevInfoAdapter::StreamCommittedL(): begin");
-    _DBG_FILE("CNSmlDmDevInfoAdapter::StreamCommittedL(): end");
-    }
-
-// ----------------------------------------------------
-//  CNSmlDmDevDetailAdapter::CompleteOutstandingCmdsL()
-// ---------------------------------------------------- 
-void CNSmlDmDevDetailAdapter::CompleteOutstandingCmdsL()
-    {
-    _DBG_FILE("CNSmlDmDevInfoAdapter::CompleteOutstandingCmdsL(): begin");
-    _DBG_FILE("CNSmlDmDevInfoAdapter::CompleteOutstandingCmdsL(): end");
-    }
-
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-
-#ifndef IMPLEMENTATION_PROXY_ENTRY
-#define IMPLEMENTATION_PROXY_ENTRY(aUid, aFuncPtr)  {{aUid},(aFuncPtr)}
-#endif
-
-const TImplementationProxy ImplementationTable[] = 
-    {
-        IMPLEMENTATION_PROXY_ENTRY(KNSmlDMDevDetailAdapterImplUid, 
-                                   CNSmlDmDevDetailAdapter::NewL)
-    };
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy( TInt& aTableCount )
-    {
-    _DBG_FILE("ImplementationGroupProxy() for CNSmlDmDevDetailAdapter: begin");
-    aTableCount = sizeof(ImplementationTable) / sizeof(TImplementationProxy);
-    _DBG_FILE("ImplementationGroupProxy() for CNSmlDmDevDetailAdapter: end");
-    return ImplementationTable;
-    }
-
--- a/omadm/omadmextensions/adapters/devdetail/src/nsmldmdevdetailadapter.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of dm adapters
-* 	This is part of omadmextensions.
-*
-*/
-
-
-CHARACTER_SET UTF8
-
-/*
-* ============================================================================
-*  Name     : 101f6de9.rss
-*  Part of  : SyncMl
-*  Origin   : SyncML Phase 2 
-*  Created  : 06.03.2003
-*  Implementation notes:
-*     
-*  Version  : 0.1
-*   $Revision: 2 $, $Modtime: 10.05.05 11:04 $ by $Author: Kollasep $
-*  ---------------------------------------------------------------------------
-*  Version history:
-*  Template version: 1.02, 21.6.2000 by maparnan
-*  <ccm_history>
-*  </ccm_history>
-* ============================================================================
-*/
-
-
-
-#include <registryinfo.rh>
-#include <nsmldmconstants.h>
-
-RESOURCE REGISTRY_INFO theRegistryInfo
-  {
-  dll_uid = 0x101F6DE9; //The DLL's 3rd UID.
-  interfaces = 
-      {
-      INTERFACE_INFO
-          {
-          interface_uid = KNSmlDMInterfaceUid; // DM interface UID
-          implementations = 
-            {
-            IMPLEMENTATION_INFO
-                {
-                implementation_uid = 0x101F6DEF; // DM devdetail implementation UID
-                version_no = 1; 
-                display_name = "";
-                default_data = "";
-                opaque_data = "";
-                }
-            };
-          }
-      };
-    }
--- a/omadm/omadmextensions/adapters/devdetail/src/nsmldmdevdetailutils_ARM.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,132 +0,0 @@
-/*
-* Copyright (c) 2004 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:    DM DevDetail Adapter Source Code, ARM implementation
-*
-*/
-
-
-
-
-// INCLUDES
-#include <sysutil.h>
-#include "nsmldmdevdetailadapter.h"
-#include "nsmldebug.h"
-
-#if defined (_ENABLE_MULTIROFS_SUPPORT)
-#include <sysversioninfo.h>
-#else
-// CONSTANTS
-_LIT8( KNSmlSwVersionSeparator, " " );
-#endif
-
-// ---------------------------------------------------------------------------
-// CNSmlDmDevDetailAdapter::GetDevDetailDataL( )
-// Fetches device specific data using EInfo interface.
-// ---------------------------------------------------------------------------
-void CNSmlDmDevDetailAdapter::GetDevDetailDataL( 
-                                CBufBase& aObject, 
-                                TNSmlDevDetailData aElement ) const
-    {
-    _DBG_FILE("CNSmlDmDevDetailAdapter::GetDevDetailDataL(): begin (MARM)");
-    
-    aObject.Reset();
-    
-    switch( aElement )
-        {
-        case ESwVersion:
-            {
-            // buffers for data fetched from sysutil
-#if defined (_ENABLE_MULTIROFS_SUPPORT)
-
-            TBuf16<KSysVersionInfoTextLength> temp;
-			TBuf8<KSysVersionInfoTextLength> temp8;
-			temp.Zero();
-			temp8.Zero();
-            SysVersionInfo::TVersionInfoType what = SysVersionInfo::EFWVersion;
-            TInt error = SysVersionInfo::GetVersionInfo(what,temp);
-			
-			User::LeaveIfError(error);
-
-			//Ascii copy which is required
-			temp8.Copy(temp);
-			aObject.InsertL(0,temp8);
-			//Unicode copy if required
-			//aObject.InsertL(0,temp.Ptr(),temp.Length());
-#else
-            HBufC* verBuf = HBufC::NewLC( KSysUtilVersionTextLength );
-            HBufC8* verBuf8 = HBufC8::NewLC( KSysUtilVersionTextLength );
-            
-            TPtr ver = verBuf->Des();
-            TPtr8 ver8 = verBuf8->Des();
-            // fetch software version (sw.txt) from sysutil
-        	SysUtil::GetSWVersion( ver );
-        	ver8.Copy( ver );
-        	
-            // parse sw fields and append to aObject
-        	TChar separator('\n');
-        	TInt pos = ver8.Locate( separator );
-
-            if ( pos == KErrNotFound )
-                {
-                User::Leave( KErrNotFound );
-                }
-
-            // insert version (1st field) and separator to beginning
-        	aObject.InsertL( 0, ver8.Mid( 0, pos ) );
-        	aObject.InsertL( 0, KNSmlSwVersionSeparator );
-        	
-        	// locate type designator (3rd field)
-        	ver8 = ver8.Mid( pos + 1 );
-        	pos = ver8.Locate( separator );
-        	ver8 = ver8.Mid( pos + 1 );
-        	pos = ver8.Locate( separator );
-        	
-        	if ( pos == KErrNotFound )
-        	    {
-                // type designator (the rest of the string, since there was no \n found) 
-            	aObject.InsertL( 0, ver8 );
-        	    }
-        	else
-        	    {
-                // type designator to beginning
-            	aObject.InsertL( 0, ver8.Mid( 0, pos ) );
-        	    }
-        	
-        	// fetch variant (lang.txt) from sysutil
-        	ver.Zero();
-        	SysUtil::GetLangVersion( ver );
-        	ver8.Copy( ver );
-        	
-            // insert separator and variant to the end
-        	aObject.InsertL( aObject.Size(), KNSmlSwVersionSeparator );
-        	aObject.InsertL( aObject.Size(), ver8 );
-            
-            CleanupStack::PopAndDestroy( verBuf8 );
-            CleanupStack::PopAndDestroy( verBuf );
-#endif //_ENABLE_MULTIROFS_SUPPORT
-            break;
-            }
-        case EHwVersion:
-            {
-            break;
-            }
-        default:
-            User::Panic( KNSmlDevDetailPanic, KErrArgument );
-            break;
-        }
-
-    _DBG_FILE("CNSmlDmDevDetailAdapter::GetDevDetailDataL(): end (MARM)");
-    }
-
-
--- a/omadm/omadmextensions/adapters/devdetail/src/nsmldmdevdetailutils_WINSCW.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,94 +0,0 @@
-/*
-* Copyright (c) 2004 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:    DM DevDetail Adapter Source Code, WINSCW implementation
-*
-*/
-
-
-
-
-// INCLUDES
-#include "nsmldmdevdetailadapter.h"
-#include "nsmldebug.h"
-
-// CONSTANTS
-_LIT( KNSmlDevDetailSwVFile,    "z:\\Resource\\DevMan\\DevDetail_SwV.txt" );
-_LIT( KNSmlDevDetailHwVFile,    "z:\\Resource\\DevMan\\DevDetail_HwV.txt" );
-
-const TInt KNSmlDevDetailMaxDataSize = 2048;
-
-// ---------------------------------------------------------------------------
-// CNSmlDmDevDetailAdapter::GetDevDetailDataL( )
-// ---------------------------------------------------------------------------
-void CNSmlDmDevDetailAdapter::GetDevDetailDataL( 
-                                CBufBase& aObject, 
-                                TNSmlDevDetailData aElement ) const
-    {
-    _DBG_FILE("CNSmlDmDevDetailAdapter::GetDevDetailDataL(): begin (WINSCW)");
-    
-    // Select file according to aElement
-    HBufC* name = NULL;
-    
-    switch( aElement )
-        {
-        case ESwVersion:
-            name = KNSmlDevDetailSwVFile().AllocLC();
-            break;
-        case EHwVersion:
-            name = KNSmlDevDetailHwVFile().AllocLC();
-            break;
-        default:
-            User::Panic( KNSmlDevDetailPanic, KErrArgument );
-        }
-    
-    // open file server session
-    RFs fileSession;
-    User::LeaveIfError( fileSession.Connect() );
-    CleanupClosePushL( fileSession );
-    
-    // open file
-    RFile file;
-    TInt err = file.Open( fileSession, *name, EFileRead|EFileShareReadersOnly );
-    
-    // if opening file succeeded, read the contents of the file
-    if ( err == KErrNone )
-        {
-        CleanupClosePushL( file );
-        
-        // read only if data size is not too large
-        TInt fileSize = 0;
-        User::LeaveIfError( file.Size( fileSize ) );
-        if ( fileSize <= KNSmlDevDetailMaxDataSize )
-            {
-            // read data
-            HBufC8* data = HBufC8::NewLC( fileSize );
-            TPtr8 dataPtr = data->Des();
-            file.Read( dataPtr, fileSize );
-            
-            // insert data to result buffer
-            aObject.Reset();
-            aObject.InsertL( 0, *data );
-            
-            CleanupStack::PopAndDestroy( data );
-            }
-        
-        CleanupStack::PopAndDestroy( &file );
-        }
-    
-    CleanupStack::PopAndDestroy( &fileSession );
-    CleanupStack::PopAndDestroy( name );
-    
-    _DBG_FILE("CNSmlDmDevDetailAdapter::GetDevDetailDataL(): end (WINSCW)");
-    }
-
--- a/omadm/omadmextensions/adapters/devinfo/bld/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-/*
-* Copyright (c) 2002 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:    build info file for DevInfo adapter
-*
-*/
-
-
-
-
-PRJ_MMPFILES
-./nsmldmdevinfoadapter.mmp
-
-
-
-
--- a/omadm/omadmextensions/adapters/devinfo/bld/nsmldmdevinfoadapter.mmp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-/*
-* Copyright (c) 2002 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: Implementation of dm adapters
-* 	This is part of omadmextensions.
-*
-*/
-
-
-
-
-
-#include "defaultcaps.hrh"
-#include  <platform_paths.hrh>
-
-CAPABILITY      CAP_ECOM_PLUGIN
-TARGET          nsmldmdevinfoadapter.dll
-TARGETTYPE      PLUGIN
-UID             0x10009D8D 0x101F6DE8
-VENDORID        VID_DEFAULT
-
-APP_LAYER_SYSTEMINCLUDE
-SYSTEMINCLUDE 	/epoc32/include/ecom
-SOURCEPATH      ../src
-
-USERINCLUDE     ../inc ../../inc
-USERINCLUDE     ../../devdetail/inc
-SOURCE          nsmldmdevinfoadapter.cpp
-
-START RESOURCE nsmldmdevinfoadapter.rss
-LANGUAGE_IDS
-END
-
-
-
-LIBRARY         euser.lib 
-LIBRARY         ecom.lib 
-LIBRARY         nsmldebug.lib
-LIBRARY         nsmlagentcommon.lib
-LIBRARY     	featmgr.lib
-
-SMPSAFE
--- a/omadm/omadmextensions/adapters/devinfo/inc/nsmldmdevinfoadapter.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,210 +0,0 @@
-/*
-* Copyright (c) 2004 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:    DM DevInfo Adapter
-*
-*/
-
-
-
-
-
-
-#ifndef __NSMLDMDEVINFOADAPTER_H__
-#define __NSMLDMDEVINFOADAPTER_H__
-
-// INCLUDES
-#include <e32base.h>
-#include <smldmadapter.h>
-#include "nsmldmconstants.h"
-
-// MACROS
-
-// the DDF version must be changed if any changes in DDF structure 
-// ( built in DDFStructureL() function )
-_LIT8( KNSmlDMDevInfoDDFVersion, "1.0" ); 
-
-_LIT8( KNSmlDMDevInfoTextPlain, "text/plain" );
-_LIT8( KNSmlDMDevInfoNodeName, "DevInfo" );
-_LIT8( KNSmlDMDevInfoDescription, "The interior object holds all DevInfo objects" );
-
-_LIT8( KNSmlDMDevInfoManNodeName, "Man" );
-_LIT8( KNSmlDMDevInfoManDescription, "The name of the device manufacturer" );
-
-_LIT8( KNSmlDMDevInfoModNodeName, "Mod" );
-_LIT8( KNSmlDMDevInfoModDescription, "The name of the device model" );
-
-_LIT8( KNSmlDMDevInfoDevIdNodeName, "DevId" );
-_LIT8( KNSmlDMDevInfoDevIdDescription, "The unique device identifier" );
-
-_LIT8( KNSmlDMDevInfoLangNodeName, "Lang" );
-_LIT8( KNSmlDMDevInfoLangDescription, "The current language setting of the device" );
-
-_LIT8( KNSmlDMDevInfoDmVNodeName, "DmV" );
-_LIT8( KNSmlDMDevInfoDmVDescription, "The current DM client revision of the device" );
-
-_LIT8( KNSmlDMDevInfoExtNodeName, "Ext" );
-_LIT8( KNSmlDMDevInfoExtDescription, "The extendable DevInfo branch" );
-
-_LIT8( KNSmlDMDevInfoModDDFNodeName, "ModDDF" );
-_LIT8( KNSmlDMDevInfoModDDFDescription, "The checksum counted from DDF" );
-
-_LIT8( KNSmlDMDevInfoModDevDetNodeName, "ModDevDet" );
-_LIT8( KNSmlDMDevInfoModDevDetDescription, "The checksum counted from DevDetail values" );
-
-_LIT8( KNSmlDmDDFChangeUri, "DDFCHANGE" );
-
-_LIT8( KNSmlDMDevInfoSeparator, "/" );
-
-_LIT8( KNSmlDMEnglish, "en" );
-_LIT8( KNSmlDMFrench, "fr" );
-_LIT8( KNSmlDMGerman, "de" );
-_LIT8( KNSmlDMSpanish, "es" );
-_LIT8( KNSmlDMItalian, "it" );
-_LIT8( KNSmlDMSwedish, "sv" );
-_LIT8( KNSmlDMDanish, "da" );
-_LIT8( KNSmlDMNorwegian, "no" ); 
-_LIT8( KNSmlDMFinnish, "fi" );
-_LIT8( KNSmlDMPortuguese, "pt" );
-_LIT8( KNSmlDMTurkish, "tr" );
-_LIT8( KNSmlDMIcelandic, "is" );
-_LIT8( KNSmlDMRussian, "ru" );
-_LIT8( KNSmlDMHungarian, "hu" );
-_LIT8( KNSmlDMDutch, "nl" );
-_LIT8( KNSmlDMCzech, "cs" );
-_LIT8( KNSmlDMSlovak, "sk" );
-_LIT8( KNSmlDMPolish, "pl" );
-_LIT8( KNSmlDMSlovenian, "sl" );
-_LIT8( KNSmlDMChinese, "ch" );
-_LIT8( KNSmlDMJapanese, "ja" );
-_LIT8( KNSmlDMThai, "th" );
-_LIT8( KNSmlDMAfrikaans, "af" );
-_LIT8( KNSmlDMAlbanian, "sq" );
-_LIT8( KNSmlDMAmharic, "am" );
-_LIT8( KNSmlDMArabic, "ar" );
-_LIT8( KNSmlDMArmenian, "hy" );
-_LIT8( KNSmlDMTagalog, "tl" );
-_LIT8( KNSmlDMBelarussian, "be" );
-_LIT8( KNSmlDMBengali, "bn" );
-_LIT8( KNSmlDMBulgarian, "bg" );
-_LIT8( KNSmlDMBurmese, "my" );
-_LIT8( KNSmlDMCatalan, "ca" );
-_LIT8( KNSmlDMCroatian, "hr" );
-_LIT8( KNSmlDMEstonian, "et" );
-_LIT8( KNSmlDMFarsi, "fo" );
-_LIT8( KNSmlDMScotsGaelic, "gl" );
-_LIT8( KNSmlDMGeorgian, "ka" );
-_LIT8( KNSmlDMGreek, "el" );
-_LIT8( KNSmlDMGujarati, "gu" );
-_LIT8( KNSmlDMHebrew, "he" );
-_LIT8( KNSmlDMHindi, "hi" );
-_LIT8( KNSmlDMIndonesian, "id" );
-_LIT8( KNSmlDMIrish, "ga" );
-_LIT8( KNSmlDMKannada, "kn" );
-_LIT8( KNSmlDMKazakh, "kk" );
-_LIT8( KNSmlDMKorean, "ko" );
-_LIT8( KNSmlDMLao, "lo" );
-_LIT8( KNSmlDMLatvian, "lv" );
-_LIT8( KNSmlDMLithuanian, "lt" );
-_LIT8( KNSmlDMMacedonian, "mk" );
-_LIT8( KNSmlDMMalay, "ms" );
-_LIT8( KNSmlDMMalayalam, "ml" );
-_LIT8( KNSmlDMMarathi, "mr" );
-_LIT8( KNSmlDMMoldavian, "mo" );
-_LIT8( KNSmlDMMongolian, "mn" );
-_LIT8( KNSmlDMPunjabi, "pa" );
-_LIT8( KNSmlDMRomanian, "ro" );
-_LIT8( KNSmlDMSerbian, "sr" );
-_LIT8( KNSmlDMSinhalese, "si" );                
-_LIT8( KNSmlDMSomali, "so" );
-_LIT8( KNSmlDMSwahili, "sw" );
-_LIT8( KNSmlDMTamil, "ta" );
-_LIT8( KNSmlDMTelugu, "te" );
-_LIT8( KNSmlDMTibetan, "bo" );
-_LIT8( KNSmlDMTigrinya, "ti" );
-_LIT8( KNSmlDMTurkmen, "tk" );
-_LIT8( KNSmlDMUkrainian, "uk" );
-_LIT8( KNSmlDMUrdu, "ur" ); 
-_LIT8( KNSmlDMVietnamese, "vi" );
-_LIT8( KNSmlDMWelsh, "cy" );
-_LIT8( KNSmlDMZulu, "zu" );
-
-
-// CLASS DECLARATION
-class CNSmlDmDevInfoAdapter : public CSmlDmAdapter
-    {
-public: // constructors and destructor
-    static CNSmlDmDevInfoAdapter* NewL(MSmlDmCallback* aDmCallback );
-    static CNSmlDmDevInfoAdapter* NewLC(MSmlDmCallback* aDmCallback );
-
-    virtual ~CNSmlDmDevInfoAdapter();
-
-private: ///new functions
-
-    void SetLeafPropertiesL( MSmlDmDDFObject& aObject, 
-                 const TSmlDmAccessTypes& aAccessTypes, 
-                 const TDesC8& aDescription ) const;
-    CNSmlDmDevInfoAdapter(TAny* aEcomArguments);
-    CSmlDmAdapter::TError FetchLeafObjectL( const TDesC8& aURI, CBufBase& aObject );
-    
-private: // from base classes
-    // Adapter interface from CSmlDmAdapter
-    void DDFVersionL( CBufBase& aDDFVersion );
-    void DDFStructureL( MSmlDmDDFObject& aDDF );
-    void UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, 
-                const TDesC8& aObject, const TDesC8& aType, 
-                const TInt aStatusRef );
-    void DeleteObjectL( const TDesC8& aURI, const TDesC8& aLUID, TInt aStatusRef ); 
-    void FetchLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, 
-                   const TDesC8& aType, const TInt aResultsRef, 
-                   const TInt aStatusRef ); 
-    void ChildURIListL( const TDesC8& aURI, const TDesC8& aLUID, 
-                const CArrayFix<TSmlDmMappingInfo>& aPreviousURISegmentList, 
-                const TInt aResultsRef, const TInt aStatusRef );  
-    void AddNodeObjectL( const TDesC8& aURI, const TDesC8& aParentLUID, 
-                 const TInt aStatusRef );
-    
-    void UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, 
-                RWriteStream*& aStream, const TDesC8& aType, 
-                const TInt aStatusRef );
-    void FetchLeafObjectSizeL( const TDesC8& aURI, const TDesC8& aLUID, 
-                   const TDesC8& aType, const TInt aResultsRef, 
-                   const TInt aStatusRef );
-     
-    void ExecuteCommandL( const TDesC8& aURI, const TDesC8& aLUID,
-                          const TDesC8& aArgument, 
-                          const TDesC8& aType,
-                          const TInt aStatusRef );
-                                  
-    void ExecuteCommandL( const TDesC8& aURI, const TDesC8& aLUID,
-                          RWriteStream*& aStream, 
-                          const TDesC8& aType,
-                          const TInt aStatusRef );
-    
-    void CopyCommandL( const TDesC8& aTargetURI, const TDesC8& aTargetLUID,
-                       const TDesC8& aSourceURI, 
-                       const TDesC8& aSourceLUID,
-                       const TDesC8& aType, TInt aStatusRef );
-    void StartAtomicL();
-    void CommitAtomicL();
-    void RollbackAtomicL();
-    TBool StreamingSupport( TInt& aItemSize );
-    void StreamCommittedL();
-    void CompleteOutstandingCmdsL();
-    
-    
-private:
-    MSmlDmCallback* iDmCallback;
-    };
-
-#endif // __NSMLDMDEVINFOADAPTER_H__
--- a/omadm/omadmextensions/adapters/devinfo/src/nsmldmdevinfoadapter.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,770 +0,0 @@
-/*
-* Copyright (c) 2004 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:    DM DevInfo Adapter
-*
-*/
-
-
-
-
-
-//INCLUDE FILES
-#include <implementationproxy.h> // For TImplementationProxy definition
-#include "nsmldmimpluids.h"
-#include <featmgr.h>
-
-#include "nsmldmdevinfoadapter.h"
-#include "nsmldebug.h"
-#include "nsmlphoneinfo.h"
-#include "nsmlunicodeconverter.h"
-#include "nsmlconstants.h"
-#include "nsmldmconst.h"
-#include "nsmldmdevdetailadapter.h"
-
-
-// -----------------------------------------------------------------------------
-// CNSmlDmDevInfoAdapter* CNSmlDmDevInfoAdapter::NewL( )
-// -----------------------------------------------------------------------------
-CNSmlDmDevInfoAdapter* CNSmlDmDevInfoAdapter::NewL(MSmlDmCallback* aDmCallback )
-    {
-    _DBG_FILE("CNSmlDmDevInfoAdapter::NewL(): begin");
-    CNSmlDmDevInfoAdapter* self = NewLC( aDmCallback );
-    CleanupStack::Pop();
-    _DBG_FILE("CNSmlDmDevInfoAdapter::NewL(): end");
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDmDevInfoAdapter* CNSmlDmDevInfoAdapter::NewLC( )
-// -----------------------------------------------------------------------------
-CNSmlDmDevInfoAdapter* CNSmlDmDevInfoAdapter::NewLC(MSmlDmCallback* aDmCallback )
-    {
-    _DBG_FILE("CNSmlDmDevInfoAdapter::NewLC(): begin");
-    CNSmlDmDevInfoAdapter* self = new (ELeave) CNSmlDmDevInfoAdapter(aDmCallback);
-    CleanupStack::PushL(self);
-    self->iDmCallback = aDmCallback;
-    FeatureManager::InitializeLibL();
-    _DBG_FILE("CNSmlDmDevInfoAdapter::NewLC(): end");
-    return self;
-    }
-
-
-
-// -----------------------------------------------------------------------------
-// CNSmlDmDevInfoAdapter::~CNSmlDmDevInfoAdapter()
-// -----------------------------------------------------------------------------
-CNSmlDmDevInfoAdapter::~CNSmlDmDevInfoAdapter()
-    {
-    _DBG_FILE("CNSmlDmDevInfoAdapter::~CNSmlDmDevInfoAdapter(): begin");
-    FeatureManager::UnInitializeLib();
-    _DBG_FILE("CNSmlDmDevInfoAdapter::~CNSmlDmDevInfoAdapter(): end");
-    }
-    
-// -----------------------------------------------------------------------------
-// CNSmlDmDevInfoAdapter::CNSmlDmDevInfoAdapter()
-// -----------------------------------------------------------------------------
-
-CNSmlDmDevInfoAdapter::CNSmlDmDevInfoAdapter(TAny* aEcomArguments):CSmlDmAdapter(aEcomArguments)
-    {
-    _DBG_FILE("CNSmlDmDevInfoAdapter::CNSmlDmDevInfoAdapter(aEcomArguments): begin");
-    _DBG_FILE("CNSmlDmDevInfoAdapter::CNSmlDmDevInfoAdapter(aEcomArguments): end"); 
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDmDevInfoAdapter::SetLeafPropertiesL()
-// -----------------------------------------------------------------------------
-void CNSmlDmDevInfoAdapter::SetLeafPropertiesL( MSmlDmDDFObject& aObject, 
-                                                const TSmlDmAccessTypes& aAccessTypes, 
-                                                const TDesC8& aDescription ) const
-    {
-    aObject.SetAccessTypesL( aAccessTypes );
-    aObject.SetScopeL( MSmlDmDDFObject::EPermanent );
-    aObject.SetDFFormatL( MSmlDmDDFObject::EChr );
-    aObject.AddDFTypeMimeTypeL( KNSmlDMDevInfoTextPlain );
-    aObject.SetDescriptionL( aDescription );
-    }
-
-
-// -----------------------------------------------------------------------------
-//  CNSmlDmDevInfoAdapter::DDFVersionL()
-// -----------------------------------------------------------------------------
-void CNSmlDmDevInfoAdapter::DDFVersionL(CBufBase& aDDFVersion)
-    {
-    _DBG_FILE("CNSmlDmDevInfoAdapter::DDFVersionL(TDes& aDDFVersion): begin");
-    aDDFVersion.InsertL(0,KNSmlDMDevInfoDDFVersion);
-    _DBG_FILE("CNSmlDmDevInfoAdapter::DDFVersionL(TDes& aDDFVersion): end");
-    }
-
-
-// -----------------------------------------------------------------------------
-//  CNSmlDmDevInfoAdapter::DDFStructureL()
-//
-// -----------------------------------------------------------------------------
-void CNSmlDmDevInfoAdapter::DDFStructureL( MSmlDmDDFObject& aDDF )
-    {
-    _DBG_FILE("CNSmlDmDevInfoAdapter::DDFStructureL(): begin");
-    
-    TSmlDmAccessTypes accessTypes;
-    accessTypes.SetGet();
-    // DevInfo
-    MSmlDmDDFObject& devInfo = aDDF.AddChildObjectL( KNSmlDMDevInfoNodeName );
-    devInfo.SetAccessTypesL( accessTypes ); 
-    devInfo.SetScopeL( MSmlDmDDFObject::EPermanent );
-    devInfo.SetDescriptionL( KNSmlDMDevInfoDescription );
-    // Man  
-    MSmlDmDDFObject& man = devInfo.AddChildObjectL(KNSmlDMDevInfoManNodeName);
-    SetLeafPropertiesL( man, accessTypes, KNSmlDMDevInfoManDescription );
-    // Mod  
-    MSmlDmDDFObject& mod = devInfo.AddChildObjectL(KNSmlDMDevInfoModNodeName );
-    SetLeafPropertiesL( mod, accessTypes, KNSmlDMDevInfoModDescription );
-    // DevId    
-    MSmlDmDDFObject& devid = devInfo.AddChildObjectL( KNSmlDMDevInfoDevIdNodeName);
-    SetLeafPropertiesL( devid, accessTypes, KNSmlDMDevInfoDevIdDescription ); 
-    // Lang 
-    MSmlDmDDFObject& lang = devInfo.AddChildObjectL(KNSmlDMDevInfoLangNodeName );
-    SetLeafPropertiesL( lang, accessTypes, KNSmlDMDevInfoLangDescription ); 
-    // DmV  
-    MSmlDmDDFObject& dmv = devInfo.AddChildObjectL(KNSmlDMDevInfoDmVNodeName);
-    SetLeafPropertiesL( dmv, accessTypes, KNSmlDMDevInfoDmVDescription );
-    // Ext
-    MSmlDmDDFObject& ext = devInfo.AddChildObjectL(KNSmlDMDevInfoExtNodeName );
-    ext.SetAccessTypesL( accessTypes );
-    ext.SetScopeL( MSmlDmDDFObject::EPermanent );
-    ext.SetDescriptionL( KNSmlDMDevInfoExtDescription );
-    // ModDDF   
-    MSmlDmDDFObject& modDDF = ext.AddChildObjectL( KNSmlDMDevInfoModDDFNodeName);
-    SetLeafPropertiesL( modDDF, accessTypes, KNSmlDMDevInfoModDDFDescription );
-    // ModDevDet    
-    MSmlDmDDFObject& modDevDet = ext.AddChildObjectL(KNSmlDMDevInfoModDevDetNodeName );
-    SetLeafPropertiesL( modDevDet, accessTypes, KNSmlDMDevInfoModDevDetDescription );
-    _DBG_FILE("CNSmlDmDevInfoAdapter::DDFStructureL(): end");
-    }
-
-// -----------------------------------------------------------------------------
-//  CNSmlDmDevInfoAdapter::UpdateLeafObjectL()
-// -----------------------------------------------------------------------------
-void CNSmlDmDevInfoAdapter::UpdateLeafObjectL( const TDesC8& /*aURI*/, 
-                                               const TDesC8& /*aLUID*/, 
-                                               const TDesC8& /*aObject*/, 
-                                               const TDesC8& /*aType*/, 
-                                               const TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlDmDevInfoAdapter::UpdateLeafObjectL(): begin");
-    _DBG_FILE("CNSmlDmDevInfoAdapter::UpdateLeafObjectL(): end");
-    iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-    }
-
-
-// -----------------------------------------------------------------------------
-// CNSmlDmDevInfoAdapter::DeleteObjectL()
-// -----------------------------------------------------------------------------
-void CNSmlDmDevInfoAdapter::DeleteObjectL( const TDesC8& /*aURI*/, 
-                                           const TDesC8& /*aLUID*/, 
-                                           const TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlDmDevInfoAdapter::DeleteLeafObjectL( ): begin");
-    _DBG_FILE("CNSmlDmDevInfoAdapter::DeleteLeafObjectL( ): end");
-    iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-    }
-
-
-// -----------------------------------------------------------------------------
-//  CNSmlDmDevInfoAdapter::FetchLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, 
-// const TDesC8& aType, const TInt aResultsRef, const TInt aStatusRef )
-// -----------------------------------------------------------------------------
-void CNSmlDmDevInfoAdapter::FetchLeafObjectL( const TDesC8& aURI, 
-                                              const TDesC8& /*aLUID*/, 
-                                              const TDesC8& aType, 
-                                              const TInt aResultsRef, 
-                                              const TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlDmDevInfoAdapter::FetchLeafObjectL(): begin");
-    
-    CBufBase *object = CBufFlat::NewL( 1 );
-    CleanupStack::PushL( object );
-    
-    CSmlDmAdapter::TError retValue = FetchLeafObjectL( aURI, *object );
-    
-    iDmCallback->SetStatusL( aStatusRef, retValue );
-    iDmCallback->SetResultsL( aResultsRef, *object, aType );
-    CleanupStack::PopAndDestroy(); //object
-    _DBG_FILE("CNSmlDmDevInfoAdapt+er::FetchLeafObjectL(): end");
-    }
-
-
-// -----------------------------------------------------------------------------
-//  CNSmlDmDevInfoAdapter::ChildURIListL( const TDesC& aURI, 
-// const TDesC& aParentLUID, const CArrayFix<TSmlDmMappingInfo>& aPreviousURISegmentList, 
-// const TInt aResultsRef, const TInt aStatusRef )
-// -----------------------------------------------------------------------------
-void CNSmlDmDevInfoAdapter::ChildURIListL( const TDesC8& aURI, 
-                                           const TDesC8& /*aParentLUID*/, 
-                                           const CArrayFix<TSmlDmMappingInfo>& /*aPreviousURISegmentList*/, 
-                                           const TInt aResultsRef, 
-                                           const TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlDmDevInfoAdapter::ChildURIListL(): begin");
-    CSmlDmAdapter::TError retValue = CSmlDmAdapter::EOk;
-    CBufBase* currentURISegmentList = CBufFlat::NewL( 1 );
-    CleanupStack::PushL( currentURISegmentList );
-    TInt ret = aURI.LocateReverse(KNSmlDMDevInfoSeparator()[0]);
-    if ( ret == KErrNotFound ) 
-        {
-        ret = -1;
-        }
-    TInt len = aURI.Length() - ( ret + 1 );
-    TPtrC8 segment = aURI.Right( len );
-
-    if ( segment == KNSmlDMDevInfoNodeName )
-        {
-        currentURISegmentList->InsertL( currentURISegmentList->Size(), KNSmlDMDevInfoManNodeName() );
-        currentURISegmentList->InsertL( currentURISegmentList->Size(), KNSmlDMDevInfoSeparator() );
-        currentURISegmentList->InsertL( currentURISegmentList->Size(), KNSmlDMDevInfoModNodeName() );
-        currentURISegmentList->InsertL( currentURISegmentList->Size(), KNSmlDMDevInfoSeparator() );
-        currentURISegmentList->InsertL( currentURISegmentList->Size(), KNSmlDMDevInfoDevIdNodeName() );
-        currentURISegmentList->InsertL( currentURISegmentList->Size(), KNSmlDMDevInfoSeparator() );
-        currentURISegmentList->InsertL( currentURISegmentList->Size(), KNSmlDMDevInfoLangNodeName() );
-        currentURISegmentList->InsertL( currentURISegmentList->Size(), KNSmlDMDevInfoSeparator() );
-        currentURISegmentList->InsertL( currentURISegmentList->Size(), KNSmlDMDevInfoDmVNodeName() );
-        currentURISegmentList->InsertL( currentURISegmentList->Size(), KNSmlDMDevInfoSeparator() );
-        currentURISegmentList->InsertL( currentURISegmentList->Size(), KNSmlDMDevInfoExtNodeName() );
-        }
-    else
-    if ( segment == KNSmlDMDevInfoExtNodeName )
-        {
-        currentURISegmentList->InsertL( currentURISegmentList->Size(), KNSmlDMDevInfoModDDFNodeName() );
-        currentURISegmentList->InsertL( currentURISegmentList->Size(), KNSmlDMDevInfoSeparator() );
-        currentURISegmentList->InsertL( currentURISegmentList->Size(), KNSmlDMDevInfoModDevDetNodeName() );
-        }
-    else
-        {
-        retValue = CSmlDmAdapter::EError;
-        }
-    iDmCallback->SetStatusL( aStatusRef, retValue );
-    iDmCallback->SetResultsL( aResultsRef, *currentURISegmentList, KNullDesC8 );
-    CleanupStack::PopAndDestroy(); //currentURISegmentList
-    _DBG_FILE("CNSmlDmDevInfoAdapter::ChildURIListL(): end");
-    }
-
-
-// -----------------------------------------------------------------------------
-// CNSmlDmDevInfoAdapter::AddNodeObjectL( const TDesC8& aURI, 
-// const TDesC8& aParentLUID, const TInt aStatusRef )
-// -----------------------------------------------------------------------------
-void CNSmlDmDevInfoAdapter::AddNodeObjectL( const TDesC8& /*aURI*/, 
-                                            const TDesC8& /*aParentLUID*/, 
-                                            const TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlDmDevInfoAdapter::AddNodeObjectL(): begin");
-    iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-    _DBG_FILE("CNSmlDmDevInfoAdapter::AddNodeObjectL(): end");
-    }
-
-// -----------------------------------------------------------------------------
-//  CNSmlDmDevInfoAdapter::UpdateLeafObjectL()
-// -----------------------------------------------------------------------------
-void CNSmlDmDevInfoAdapter::UpdateLeafObjectL( const TDesC8& /*aURI*/, 
-                                               const TDesC8& /*aLUID*/, 
-                                               RWriteStream*& /*aStream*/, 
-                                               const TDesC8& /*aType*/, 
-                                               const TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlDmDevInfoAdapter::UpdateLeafObjectL(): stream: begin");
-    _DBG_FILE("CNSmlDmDevInfoAdapter::UpdateLeafObjectL(): stream: end");
-    iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-    }
-
-
-// -----------------------------------------------------------------------------
-//  CNSmlDmDevInfoAdapter::FetchLeafObjectSizeL( const TDesC8& aURI, 
-//  const TDesC8& aLUID, const TDesC8& aType, TInt aResultsRef, TInt aStatusRef )
-// -----------------------------------------------------------------------------
-void CNSmlDmDevInfoAdapter::FetchLeafObjectSizeL( const TDesC8& aURI, 
-                                                  const TDesC8& /*aLUID*/, 
-                                                  const TDesC8& aType, 
-                                                  const TInt aResultsRef, 
-                                                  const TInt aStatusRef )
-    {
-
-    _DBG_FILE("CNSmlDmDevInfoAdapter::FetchLeafObjectSizeL(): begin");
-    
-    CBufBase *object = CBufFlat::NewL( 1 );
-    CleanupStack::PushL( object );
-    CSmlDmAdapter::TError retValue = FetchLeafObjectL( aURI, *object );
-        
-    TInt objSizeInBytes = object->Size();
-    TBuf8<2> stringObjSizeInBytes;
-    stringObjSizeInBytes.Num( objSizeInBytes );
-    object->Reset();
-    object->InsertL( 0, stringObjSizeInBytes );
-    
-    iDmCallback->SetStatusL( aStatusRef, retValue );
-    iDmCallback->SetResultsL( aResultsRef, *object, aType );
-    CleanupStack::PopAndDestroy(); //object
-    _DBG_FILE("CNSmlDmDevInfoAdapter::FetchLeafObjectSizeL(): end");
-    }
-    
-
-// -----------------------------------------------------------------------------
-//  CNSmlDmDevInfoAdapter::ExecuteCommandL( const TDesC8& aURI, 
-//  const TDesC8& aParentLUID, TDesC8& aArgument, const TDesC8& aType, TInt aStatusRef )
-// -----------------------------------------------------------------------------
-void CNSmlDmDevInfoAdapter::ExecuteCommandL( const TDesC8& /*aURI*/, const TDesC8& /*aLUID*/, const TDesC8& /*aArgument*/, const TDesC8& /*aType*/, const TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlDmDevInfoAdapter::ExecuteCommandL(): begin");
-    iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-    _DBG_FILE("CNSmlDmDevInfoAdapter::ExecuteCommandL(): end");
-    }
-
-// -----------------------------------------------------------------------------
-//  CNSmlDmDevInfoAdapter::ExecuteCommandL( const TDesC8& aURI, 
-//  const TDesC8& aParentLUID, RWriteStream*& aStream, const TDesC8& aType, 
-//  TInt aStatusRef )
-// -----------------------------------------------------------------------------
-void CNSmlDmDevInfoAdapter::ExecuteCommandL( const TDesC8& /*aURI*/, 
-                                             const TDesC8& /*aParentLUID*/, 
-                                             RWriteStream*& /*aStream*/, 
-                                             const TDesC8& /*aType*/, 
-                                             const TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlDmDevInfoAdapter::ExecuteCommandL(): stream: begin");
-    iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-    _DBG_FILE("CNSmlDmDevInfoAdapter::ExecuteCommandL(): stream: end");
-    }
-
-// -----------------------------------------------------------------------------
-//  CNSmlDmDevInfoAdapter::CopyCommandL( const TDesC8& aTargetURI, const TDesC8& 
-//  aSourceURI, const TDesC8& aSourceLUID, const TDesC8& /*aType*/, TInt aStatusRef )
-// -----------------------------------------------------------------------------
-void CNSmlDmDevInfoAdapter::CopyCommandL( const TDesC8& /*aTargetURI*/, const TDesC8& 
-                                          /*aTargetLUID*/, const TDesC8& /*aSourceURI*/, 
-                                          const TDesC8& /*aSourceLUID*/, 
-                                          const TDesC8& /*aType*/, TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlDmDevInfoAdapter::CopyCommandL(): begin");
-    iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-    _DBG_FILE("CNSmlDmDevInfoAdapter::CopyCommandL(): end");
-    }
-
-// --------------------------------------
-//  CNSmlDmDevInfoAdapter::StartAtomicL()
-// --------------------------------------
-void CNSmlDmDevInfoAdapter::StartAtomicL()
-    {
-    _DBG_FILE("CNSmlDmDevInfoAdapter::StartAtomicL(): begin");
-    _DBG_FILE("CNSmlDmDevInfoAdapter::StartAtomicL(): end");
-    }
-    
-// ---------------------------------------
-//  CNSmlDmDevInfoAdapter::CommitAtomicL()
-// ---------------------------------------
-void CNSmlDmDevInfoAdapter::CommitAtomicL()
-    {
-    _DBG_FILE("CNSmlDmDevInfoAdapter::CommitAtomicL(): begin");
-    _DBG_FILE("CNSmlDmDevInfoAdapter::CommitAtomicL(): end");
-    }
-
-// -----------------------------------------
-//  CNSmlDmDevInfoAdapter::RollbackAtomicL()
-// -----------------------------------------
-void CNSmlDmDevInfoAdapter::RollbackAtomicL()
-    {
-    _DBG_FILE("CNSmlDmDevInfoAdapter::RollbackAtomicL(): begin");
-    _DBG_FILE("CNSmlDmDevInfoAdapter::RollbackAtomicL(): end");
-    }
-
-// -----------------------------------------------------------
-//  CNSmlDmDevInfoAdapter::StreamingSupport( TInt& aItemSize )
-// -----------------------------------------------------------  
-TBool CNSmlDmDevInfoAdapter::StreamingSupport( TInt& /*aItemSize*/ )
-    {
-    _DBG_FILE("CNSmlDmDevInfoAdapter::StreamingSupport(): begin");
-    _DBG_FILE("CNSmlDmDevInfoAdapter::StreamingSupport(): end");
-    return EFalse;
-    }
-
-// ------------------------------------------
-//  CNSmlDmDevInfoAdapter::StreamCommittedL()
-// ------------------------------------------
-void CNSmlDmDevInfoAdapter::StreamCommittedL()
-    {
-    _DBG_FILE("CNSmlDmDevInfoAdapter::StreamCommittedL(): begin");
-    _DBG_FILE("CNSmlDmDevInfoAdapter::StreamCommittedL(): end");
-    }
-
-// --------------------------------------------------
-//  CNSmlDmDevInfoAdapter::CompleteOutstandingCmdsL()
-// --------------------------------------------------   
-void CNSmlDmDevInfoAdapter::CompleteOutstandingCmdsL()
-    {
-    _DBG_FILE("CNSmlDmDevInfoAdapter::CompleteOutstandingCmdsL(): begin");
-    _DBG_FILE("CNSmlDmDevInfoAdapter::CompleteOutstandingCmdsL(): end");    
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDmDevDetailAdapter::FetchLeafObjectL()
-// -----------------------------------------------------------------------------
-CSmlDmAdapter::TError CNSmlDmDevInfoAdapter::FetchLeafObjectL( const TDesC8& aURI, 
-                                                               CBufBase& aObject )
-    {
-    _DBG_FILE("CNSmlDmInfoAdapter::FetchLeafObjectL(): begin");
-    CSmlDmAdapter::TError retValue = CSmlDmAdapter::EOk;
-    TInt ret = aURI.LocateReverse(KNSmlDMDevInfoSeparator()[0]);
-    if ( ret == KErrNotFound ) 
-        {
-        retValue = CSmlDmAdapter::EError;
-        }
-    else
-        {
-        TInt len = aURI.Length() - (ret + 1);
-        TPtrC8 segment = aURI.Right( len );
-        if ( segment == KNSmlDMDevInfoManNodeName ||
-             segment == KNSmlDMDevInfoModNodeName ||
-             segment == KNSmlDMDevInfoDevIdNodeName )
-            {
-            CNSmlPhoneInfo* phoneInfo = CNSmlPhoneInfo::NewLC();
-            HBufC* phonedata = HBufC::NewLC( 50 );
-            TPtr phonedataPtr = phonedata->Des();  
-            if ( segment == KNSmlDMDevInfoManNodeName )
-                {
-                phoneInfo->PhoneDataL( CNSmlPhoneInfo::EPhoneManufacturer, phonedataPtr );
-                }
-            if ( segment == KNSmlDMDevInfoModNodeName )
-                {
-                phoneInfo->PhoneDataL( CNSmlPhoneInfo::EPhoneModelId, phonedataPtr );
-                }
-            if ( segment == KNSmlDMDevInfoDevIdNodeName )
-                {
-                phoneInfo->PhoneDataL( CNSmlPhoneInfo::EPhoneSerialNumber, phonedataPtr );
-                }
-            HBufC8* phonedataInUTF8 = NULL;
-            NSmlUnicodeConverter::HBufC8InUTF8LC( *phonedata, phonedataInUTF8 );
-            aObject.InsertL( 0, *phonedataInUTF8 );
-            CleanupStack::PopAndDestroy( 3 ); //phonedataInUTF8, phonedata, phoneInfo
-            }
-        else
-        if ( segment == KNSmlDMDevInfoLangNodeName )
-            { 
-            TLanguage language = User::Language();
-            TBuf8<2> langCode;
-            switch ( language )
-                {
-                case ELangEnglish: 
-                case ELangAmerican:
-                case ELangAustralian:
-                case ELangNewZealand:
-                case ELangCanadianEnglish:
-                case ELangInternationalEnglish:
-                case ELangSouthAfricanEnglish:
-                    langCode = KNSmlDMEnglish;
-                    break; 
-                case ELangFrench:
-                case ELangSwissFrench:
-                case ELangBelgianFrench:
-                case ELangInternationalFrench:
-                case ELangCanadianFrench:
-                    langCode = KNSmlDMFrench;
-                    break;
-                case ELangGerman:
-                case ELangSwissGerman:
-                case ELangAustrian:
-                    langCode = KNSmlDMGerman;
-                    break;
-                case ELangSpanish:
-                case ELangInternationalSpanish:
-                case ELangLatinAmericanSpanish:
-                    langCode = KNSmlDMSpanish;
-                    break;
-                case ELangItalian:
-                case ELangSwissItalian:
-                    langCode = KNSmlDMItalian;
-                    break;
-                case ELangSwedish:
-                case ELangFinlandSwedish:
-                    langCode = KNSmlDMSwedish;
-                    break;
-                case ELangDanish:
-                    langCode = KNSmlDMDanish;
-                    break;
-                case ELangNorwegian:
-                case ELangNorwegianNynorsk:
-                    langCode = KNSmlDMNorwegian;
-                    break;
-                case ELangFinnish:
-                    langCode = KNSmlDMFinnish;
-                    break;
-                case ELangPortuguese:
-                case ELangBrazilianPortuguese:
-                    langCode = KNSmlDMPortuguese;
-                    break;
-                case ELangTurkish:
-                case ELangCyprusTurkish:
-                    langCode = KNSmlDMTurkish;
-                    break;
-                case ELangIcelandic:
-                    langCode = KNSmlDMIcelandic;
-                    break;
-                case ELangRussian:
-                    langCode = KNSmlDMRussian;
-                    break;
-                case ELangHungarian:
-                    langCode = KNSmlDMHungarian;
-                    break;
-                case ELangDutch:
-                case ELangBelgianFlemish:
-                    langCode = KNSmlDMDutch;
-                    break;
-                case ELangCzech:
-                    langCode = KNSmlDMCzech;
-                    break;
-                case ELangSlovak:
-                    langCode = KNSmlDMSlovak;
-                    break;
-                case ELangPolish:
-                    langCode = KNSmlDMPolish;
-                    break;
-                case ELangSlovenian:
-                    langCode = KNSmlDMSlovenian;
-                    break;
-                case ELangTaiwanChinese:
-                case ELangHongKongChinese:
-                case ELangPrcChinese:
-                    langCode = KNSmlDMChinese;
-                    break;
-                case ELangJapanese:
-                    langCode = KNSmlDMJapanese;
-                    break;
-                case ELangThai:
-                    langCode = KNSmlDMThai;
-                    break;
-                case ELangAfrikaans:
-                    langCode = KNSmlDMAfrikaans;
-                    break;
-                case ELangAlbanian:
-                    langCode = KNSmlDMAlbanian;
-                    break;
-                case ELangAmharic:
-                    langCode = KNSmlDMAmharic;
-                    break;
-                case ELangArabic:
-                    langCode = KNSmlDMArabic;
-                    break;
-                case ELangArmenian:
-                    langCode = KNSmlDMArmenian;
-                    break;
-                case ELangTagalog:
-                    langCode = KNSmlDMTagalog;
-                    break;
-                case ELangBelarussian:
-                    langCode = KNSmlDMBelarussian;
-                    break;
-                case ELangBengali:
-                    langCode = KNSmlDMBengali;
-                    break;
-                case ELangBulgarian:
-                    langCode = KNSmlDMBulgarian;
-                    break;
-                case ELangBurmese:
-                    langCode = KNSmlDMBurmese;
-                    break;
-                case ELangCatalan:
-                    langCode = KNSmlDMCatalan;
-                    break;
-                case ELangCroatian:
-                    langCode = KNSmlDMCroatian;
-                    break;
-                case ELangEstonian:
-                    langCode = KNSmlDMEstonian;
-                    break;
-                case ELangFarsi:
-                    langCode = KNSmlDMFarsi;
-                    break;
-                case ELangScotsGaelic:
-                    langCode = KNSmlDMScotsGaelic;
-                    break;
-                case ELangGeorgian:
-                    langCode = KNSmlDMGeorgian;
-                    break;
-                case ELangGreek:
-                case ELangCyprusGreek:
-                    langCode = KNSmlDMGreek;
-                    break;
-                case ELangGujarati:
-                    langCode = KNSmlDMGujarati;
-                    break;
-                case ELangHebrew:
-                    langCode = KNSmlDMHebrew;
-                    break;
-                case ELangHindi:
-                    langCode = KNSmlDMHindi;
-                    break;
-                case ELangIndonesian:
-                    langCode = KNSmlDMIndonesian;
-                    break;
-                case ELangIrish:
-                    langCode = KNSmlDMIrish;
-                    break;
-                case ELangKannada:
-                    langCode = KNSmlDMKannada;
-                    break;
-                case ELangKazakh:
-                    langCode = KNSmlDMKazakh;
-                    break;
-                case ELangKorean:
-                    langCode = KNSmlDMKorean;
-                    break;
-                case ELangLao:
-                    langCode = KNSmlDMLao;
-                    break;
-                case ELangLatvian:
-                    langCode = KNSmlDMLatvian;
-                    break;
-                case ELangLithuanian:
-                    langCode = KNSmlDMLithuanian;
-                    break;
-                case ELangMacedonian:
-                    langCode = KNSmlDMMacedonian;
-                    break;
-                case ELangMalay:
-                    langCode = KNSmlDMMalay;
-                    break;
-                case ELangMalayalam:
-                    langCode = KNSmlDMMalayalam;
-                    break;
-                case ELangMarathi:
-                    langCode = KNSmlDMMarathi;
-                    break;
-                case ELangMoldavian:
-                    langCode = KNSmlDMMoldavian;
-                    break;
-                case ELangMongolian:
-                    langCode = KNSmlDMMongolian;
-                    break;
-                case ELangPunjabi:
-                    langCode = KNSmlDMPunjabi;
-                    break;
-                case ELangRomanian:
-                    langCode = KNSmlDMRomanian;
-                    break;
-                case ELangSerbian:
-                    langCode = KNSmlDMSerbian;
-                    break;
-                case ELangSinhalese:
-                    langCode = KNSmlDMSinhalese;
-                    break;
-                case ELangSomali:
-                    langCode = KNSmlDMSomali;
-                    break;
-                case ELangSwahili:
-                    langCode = KNSmlDMSwahili;
-                    break;
-                case ELangTamil:
-                    langCode = KNSmlDMTamil;
-                    break;
-                case ELangTelugu:
-                    langCode = KNSmlDMTelugu;
-                    break;
-                case ELangTibetan:
-                    langCode = KNSmlDMTibetan;
-                    break;
-                case ELangTigrinya:
-                    langCode = KNSmlDMTigrinya;
-                    break;
-                case ELangTurkmen:
-                    langCode = KNSmlDMTurkmen;
-                    break;
-                case ELangUkrainian:
-                    langCode = KNSmlDMUkrainian;
-                    break;
-                case ELangUrdu:
-                    langCode = KNSmlDMUrdu;
-                    break;
-                case ELangVietnamese:
-                    langCode = KNSmlDMVietnamese;
-                    break;
-                case ELangWelsh:
-                    langCode = KNSmlDMWelsh;
-                    break;
-                case ELangZulu:
-                    langCode = KNSmlDMZulu;
-                    break;
-                default:
-                    langCode = KNSmlDMEnglish;
-                }
-            aObject.InsertL( 0, langCode );
-            }
-        else
-        if ( segment == KNSmlDMDevInfoDmVNodeName )
-            {
-            if(!FeatureManager::FeatureSupported( KFeatureIdSyncMlDm112  ))
-                aObject.InsertL( 0, KNSmlDMDmV12 );
-            else
-            aObject.InsertL( 0, KNSmlDMDmV );
-            }
-        else
-        if ( segment == KNSmlDMDevInfoModDDFNodeName )
-            {
-
-            }
-        else
-        if ( segment == KNSmlDMDevInfoModDevDetNodeName )
-            {
-            TUid implUID;
-            implUID.iUid = KNSmlDMDevDetailAdapterImplUid;
-            
-            TAny* nPtr = NULL;
-            MSmlDmCallback& aDmNull = reinterpret_cast<MSmlDmCallback&>(nPtr);
-            CNSmlDmDevDetailAdapter* devDetAdapter = 
-                reinterpret_cast<CNSmlDmDevDetailAdapter*>(CSmlDmAdapter::NewL( implUID, aDmNull ) );
-            CleanupStack::PushL(devDetAdapter);
-            TInt checkSumDevDet = devDetAdapter->DevDetailValueCrcL();
-            TBuf8<16> stringCheckSumDevDet; 
-            stringCheckSumDevDet.Num( checkSumDevDet );
-            aObject.InsertL( 0, stringCheckSumDevDet );
-            CleanupStack::PopAndDestroy(); // devDetAdapter
-            }
-        else
-            {
-            retValue = CSmlDmAdapter::EError;
-            }
-        }
-    _DBG_FILE("CNSmlDmInfoAdapter::FetchLeafObjectL(): end");
-    return retValue;
-    }
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-#ifndef IMPLEMENTATION_PROXY_ENTRY
-#define IMPLEMENTATION_PROXY_ENTRY(aUid, aFuncPtr)  {{aUid},(aFuncPtr)}
-#endif
-
-const TImplementationProxy ImplementationTable[] = 
-    {
-        IMPLEMENTATION_PROXY_ENTRY(KNSmlDMDevInfoAdapterImplUid, CNSmlDmDevInfoAdapter::NewL)
-    };
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy( TInt& aTableCount )
-    {
-    _DBG_FILE("ImplementationGroupProxy() for CNSmlDmDevInfoAdapter: begin");
-    aTableCount = sizeof(ImplementationTable) / sizeof(TImplementationProxy);
-    _DBG_FILE("ImplementationGroupProxy() for CNSmlDmDevInfoAdapter: end");
-    return ImplementationTable;
-    }
-
-// End of file
-
--- a/omadm/omadmextensions/adapters/devinfo/src/nsmldmdevinfoadapter.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of dm adapters
-* 	This is part of omadmextensions.
-*
-*/
-
-
-CHARACTER_SET UTF8
-
-/*
-* ============================================================================
-*  Name     : 101f6de8.rss
-*  Part of  : SyncMl
-*  Origin   : SyncML Phase 2 
-*  Created  : 06.03.2003
-*  Implementation notes:
-*     
-*  Version  : 0.1
-*   $Revision: 2 $, $Modtime: 10.05.05 11:06 $ by $Author: Kollasep $
-*  ---------------------------------------------------------------------------
-*  Version history:
-*  Template version: 1.02, 21.6.2000 by maparnan
-*  <ccm_history>
-*  </ccm_history>
-* ============================================================================
-*/
-
-
-
-#include <registryinfo.rh>
-#include <nsmldmconstants.h>
-
-RESOURCE REGISTRY_INFO theRegistryInfo
-  {
-  dll_uid = 0x101F6DE8; //The DLL's 3rd UID.
-  interfaces = 
-      {
-      INTERFACE_INFO
-          {
-          interface_uid = KNSmlDMInterfaceUid; // DM interface UID
-          implementations = 
-            {
-            IMPLEMENTATION_INFO
-                {
-                implementation_uid = 0x101F6DEE; // DM devinfo implementation UID
-                version_no = 1; 
-                display_name = "";
-                default_data = "";
-                opaque_data = "";
-                }
-            };
-          }
-      };
-    }
--- a/omadm/omadmextensions/adapters/email/bld/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-/*
-* Copyright (c) 2004 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:    build info file for email settings adapter
-*
-*/
-
-
-
-
-PRJ_MMPFILES
-./nsmldmemailadapter.mmp
-
-
-// End of File
\ No newline at end of file
--- a/omadm/omadmextensions/adapters/email/bld/nsmldmemailadapter.mmp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-/*
-* Copyright (c) 2004 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 SyncML DM Email adapter
-*
-*/
-
-
-
-  
-#include "defaultcaps.hrh"
-#include  <platform_paths.hrh>
-
-CAPABILITY      CAP_ECOM_PLUGIN
-TARGET          nsmldmemailadapter.dll
-TARGETTYPE      PLUGIN
-UID             0x10009D8D 0x101F6E34
-VENDORID        VID_DEFAULT
-
-APP_LAYER_SYSTEMINCLUDE
-SYSTEMINCLUDE 	/epoc32/include/ecom
-
-SOURCEPATH      ../src
-USERINCLUDE     ../inc ../../inc
-SOURCE          nsmldmemailadapter.cpp
-
-START RESOURCE  nsmldmemailadapter.rss
-TARGET nsmldmemailadapter.rsc
-LANGUAGE_IDS
-END
-
-
-
-LIBRARY         euser.lib ecom.lib muiu.lib msgs.lib charconv.lib imcm.lib nsmldebug.lib commdb.lib
-LIBRARY			efsrv.lib sysutil.lib nsmldmiapmatcher.lib
-LIBRARY         etel.lib                        // RTelServer
-LIBRARY         etelmm.lib                      // RMobilePhone
-
-
-SMPSAFE
-// End of File
--- a/omadm/omadmextensions/adapters/email/inc/nsmldmemailadapter.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,744 +0,0 @@
-/*
-* Copyright (c) 2004 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:    DM Email Settings Adapter
- *
-*/
-
-
-
-
-
-#ifndef __NSMLDMEMAILADAPTER_H__
-#define __NSMLDMEMAILADAPTER_H__
-
-// -----------------------------------------------------------------------------
-// Includes
-// -----------------------------------------------------------------------------
-#include <e32base.h>
-#include <smldmadapter.h>
-#include <msvapi.h>
-
-// -----------------------------------------------------------------------------
-// Class forwards
-// -----------------------------------------------------------------------------
-class CImSmtpSettings;
-class CImPop3Settings;
-class CImImap4Settings;
-class CImIAPPreferences;
-class CMsvSession;
-class CEmailAccounts;
-
-
-// -----------------------------------------------------------------------------
-// Definitions
-// -----------------------------------------------------------------------------
-
-// the DDF version must be changed if any changes in DDF structure 
-// ( built in DDFStructureL() function )
-//
-_LIT8( KNSmlDMEmailDDFVersion, "1.1" ); 
-
-_LIT8( KNSmlDMEmailTextPlain, "text/plain" );
-_LIT8( KNSmlDMEmailNodeName, "Email" );
-_LIT8( KNSmlDMEmailDescription, "The interior object holds all email objects" );
-_LIT8( KNSmlDMDynamicNodeDescription, "Placeholder for one or more Email objects" );
-_LIT8( KNSmlDMNameDescription, "Displayable Account Name for the Email Settings" );
-_LIT8( KNSmlDMUIDDescription, "User ID for email account" );
-_LIT8( KNSmlDMPWDescription, "Password for email account " );
-_LIT8( KNSmlDMUAddrDescription, "User's email address" );
-_LIT8( KNSmlDMUNameDescription, "Displayable name for the user" );
-_LIT8( KNSmlDMMrcvDescription, "Host name of the receiving  (IMAP/POP3) server" );
-_LIT8( KNSmlDMMsndDescription, "Host name of the SMTP server" );
-_LIT8( KNSmlDMMproDescription, "Remote mailbox protocol" );
-_LIT8( KNSmlDMUseSecConDescription, "Secure connection is used or not" );
-_LIT8( KNSmlDMUseSauthDescription, "SMTP authentication is used or not" );
-_LIT8( KNSmlDMSauthUIDDescription, "SMTP authenticatio user Id" );
-_LIT8( KNSmlDMSauthPWDescription, "SMTP authentication password" );
-_LIT8( KNSmlDMPtxtSAuthDescription, "Plain text SMTP authentication is allowed or not" );
-_LIT8( KNSmlDMDelFetDescription, "Defines whether to delete fetched mail from remote server" );
-_LIT8( KNSmlDMUseAPOPDescription, "Defines whether  the APOP is used or not" );
-_LIT8( KNSmlDMRcvPortDescription, "Port for IMAP4 or POP3" );
-_LIT8( KNSmlDMSndPortDescription, "Port for SMTP" );
-_LIT8( KNSmlDMToNapIDDescription, "Link to connectivity information" );
-
-_LIT8( KNSmlDMSToNapIDDescription, "Link to connectivity information for sending SMTP" );
-_LIT8( KNSmlDMSUseSecConDescription, "Defines whether SSL/TLS security is used in SMTP" );
-_LIT8( KNSmlDMUseStartTLSDescription, "Defines whether StartTLS is used in IMAP/POP" );
-_LIT8( KNSmlDMSUseStartTLSDescription, "Defines whether StartTLS is in SMTP" );
-_LIT8( KNSmlDMMrcvPortDescription, "Defines the port number of the IMAP/POP server" );
-_LIT8( KNSmlDMMsndPortDescription, "Defines the port number of the SMTP server" );
-_LIT8( KNSmlDMFolderPathDescription, "Defines the mailbox folder path" );
-
-_LIT8( KNSmlDMEmailDynamicNode, "" );
-_LIT8( KNSmlDMEmailName, "Name" );
-_LIT8( KNSmlDMEmailUID, "UID" );
-_LIT8( KNSmlDMEmailPW, "PW" );
-_LIT8( KNSmlDMEmailUAddr, "UAddr" );
-_LIT8( KNSmlDMEmailUName, "UName" );
-_LIT8( KNSmlDMEmailMrcv, "Mrcv" );
-_LIT8( KNSmlDMEmailMsnd, "Msnd" );
-_LIT8( KNSmlDMEmailMpro, "Mpro" );
-_LIT8( KNSmlDMEmailUseAPOP, "UseAPOP" );
-_LIT8( KNSmlDMEmailUseSecCon, "UseSecCon" );
-_LIT8( KNSmlDMEmailUseSauth, "UseSauth" );
-_LIT8( KNSmlDMEmailSauthUID, "SauthUID" );
-_LIT8( KNSmlDMEmailSauthPW, "SauthPW" );
-_LIT8( KNSmlDMEmailPtxtSAuth, "PtxtSAuth" );
-//_LIT8( KNSmlDMEmailRcvPort, "RcvPort" );
-//_LIT8( KNSmlDMEmailSndPort, "SndPort" );
-_LIT8( KNSmlDMEmailToNapID, "ToNapID" );
-_LIT8( KNSmlDMEmailIAPUri, "AP" );
-
-_LIT8( KNSmlDMEmailSToNapID, "SToNapID" );
-_LIT8( KNSmlDMEmailSUseSecCon, "SUseSecCon" );
-_LIT8( KNSmlDMEmailUseStartTLS, "UseStartTLS" );
-_LIT8( KNSmlDMEmailSUseStartTLS, "SUseStartTLS" );
-_LIT8( KNSmlDMEmailMrcvPort, "MrcvPort" );
-_LIT8( KNSmlDMEmailMsndPort, "MsndPort" );
-_LIT8( KNSmlDMEmailFolderPath, "FolderPath" );
-
-_LIT8( KNSmlDMEmailMproPOP, "POP" );
-_LIT8( KNSmlDMEmailMproIMAP, "IMAP" );
-_LIT8( KNSmlDMEmailTrue, "True" );
-_LIT8( KNSmlDMEmailFalse, "False" );
-
-_LIT8( KNSmlDMEmailListOfLeafs, "Name/UID/PW/UAddr/UName/Mrcv/Msnd/Mpro/UseSecCon/UseSauth/SauthUID/SauthPW/PtxtSAuth/ToNapID/SToNapID/SUseSecCon/UseStartTLS/SUseStartTLS/MrcvPort/MsndPort/UseAPOP/FolderPath" );
-_LIT8( KNSmlDMEmailSeparator8, "/" );
-_LIT8( KNSmlEmailUriDotSlash, "./");
-
-const TInt KNSmlDmFatMinimumFileSize = 512;
-const TInt KNSmlSmtpMessageTypeValue = 0x10001028;
-const TInt KNSmlDefaultMaxLimit = 1024*10; //maximum message size (default)
-const TInt KNSmlDmEmailGranularity = 4;
-const TUint32 KNSmlDmEmailAlwaysAskIap = 0;
-
-const TInt KNSmlDMEmailNormalSmtpPort = 25;
-const TInt KNSmlDMEmailSslSmtpPort = 465;
-const TInt KNSmlDMEmailNormalImap4Port = 143;
-const TInt KNSmlDMEmailNormalPop3Port = 110;
-const TInt KNSmlDMEmailSslWrappedImap4Port = 993;
-const TInt KNSmlDMEmailSslWrappedPop3Port = 995;
-const TInt KNSmlDMEmailDefaultHeaderCount = 30;
-
-const TInt KNSmlDmEmailImapLuidLow = 50000;
-const TInt KNSmlDmEmailImapLuidHigh = 100000;
-const TInt KNSmlDmEmailPopLuidHigh = 150000;
-const TUint32 KNSmlDMEmailMaxPortNbr = 0xffff;
-
-/**
-* The main class of the SyncML DM Email adapter.
-*
-*  @since 
-*/
-class CNSmlDmEmailAdapter : public CSmlDmAdapter, public MMsvSessionObserver
-    {
-public:
-    /**
-     * The one phase constructor
-     *
-     */
-    static CNSmlDmEmailAdapter* NewL(MSmlDmCallback* aDmCallback );
-
-    /** 
-     * The destructor
-     *
-     */
-    virtual ~CNSmlDmEmailAdapter();
-
-    // Adapter interface from CSmlDmAdapter
-    /**
-     * The function returns current version of the DDF.  By asking
-     * current DDF versions from adapters DM Module can control *
-     * possible changes in the data structure and send the changed DDF
-     * description to a management server.  This function is always
-     * called after DDFStructureL.  
-     * @param aVersion DDF version of the
-     * adapter. (filled by the adapter) 
-     * @publishedPartner 
-     * @prototype
-     */
-
-    void DDFVersionL( CBufBase& aDDFVersion );
-    /**
-     * The function for filling the DDF structure of the adapter
-     * This function is only called once, immediately after the adapter is created.
-     * @param aDDFObject   Reference to root object. A DM adapter starts filling
-     * the data structure by calling AddChildObjectL to the root object and
-     * so describes the DDF of the adapter. 
-     * @publishedPartner
-     * @prototype
-    */
-    void DDFStructureL( MSmlDmDDFObject& aDDF );
-    /**
-     * The function creates new leaf objects, or replaces data in existing leaf
-     * objects. The information about the success of the command should be
-     * returned by calling SetStatusL function of MSmlDmCallback callback
-     * interface. This makes it possible to buffer the commands.  However, all
-     * the status codes for buffered commands must be returned at the latest when
-     * the adapter's CompleteOutstandingCmdsL() is called.
-     * @param aURI         URI of the object
-     * @param aLUID        LUID of the object (if the adapter has earlier returned a
-     *                    LUID to the DM Module). For new objects, this is the LUID
-     *                    inherited through the parent node.
-     * @param aObject      Data of the object.
-     * @param aType        MIME type of the object
-     * @param aStatusRef   Reference to correct command, i.e. this reference
-     *                    must be used when calling the SetStatusL of this command
-     * @publishedPartner
-     * @prototype
-    */
-    void UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, 
-                            const TDesC8& aObject, const TDesC8& aType, 
-                            TInt aStatusRef );
-    /**
-     * The function deletes an object and its child objects. The SetStatusL
-     * should be used as described in UpdateLeafObjectL()
-     * @param aURI     URI of the object
-     * @param aLUID        LUID of the object (if the adapter have earlier returned
-     *                     LUID to the DM Module).
-     * @param aStatusRef   Reference to correct command, i.e. this reference must
-     *                     be used when calling the SetStatusL of this command.
-     * @publishedPartner
-     * @prototype
-    */
-    void DeleteObjectL( const TDesC8& aURI, const TDesC8& aLUID, 
-                        const TInt aStatusRef );
-    /**
-     * The function fetches data of a leaf object. The SetStatusL should be used
-     * as described in UpdateLeafObjectL(). The data is returned by using the
-     * SetResultsL function of MSmlCallback callback interface, and may be streamed.
-     * @param aURI         URI of the object
-     * @param aLUID            LUID of the object (if the adapter have earlier
-     *                       returned LUID to the DM Module).   
-     * @param aType            MIME type of the object
-     * @param aResultsRef  Reference to correct results, i.e. this reference
-     *                         must be used when returning the result by calling
-     *                         the SetResultsL.
-     * @param aStatusRef       Reference to correct command, i.e. this reference
-     *                         must be used when calling the SetStatusL of this
-     *                         command.
-     * @publishedPartner
-     * @prototype
-    */
-    void FetchLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, 
-                           const TDesC8& aType, const TInt aResultsRef, 
-                           const TInt aStatusRef );
-    /**
-     * The function fetches URI list. An adapter returns the list of URI segments
-     * under the given URI be separated by slash ("/"). The URI segment names for
-     * new objects must be given by the adapter.
-     * The list is returned by calling the SetResultsL function of MSmlCallback
-     * callback interface. Results from this call MUST NOT be streamed.
-     * @param aParentURI                   URI of the parent object
-     * @param aParentLUID              LUID of the parent object (if the
-     *                                     adapter have earlier returned LUID to
-     *                                     the DM Module).   
-     * @param aPreviousURISegmentList  URI list with mapping LUID information,
-     *                                     which is known by DM engine. An adapter
-     *                                     can use this information when verifying
-     *                                     if old objects still exists. An adapter
-     *                                     also knows what objects are new to DM
-     *                                     engine and can provide LUID mapping for
-     *                                     them. aPreviousURISegmentList parameter
-     *                                     (see above) helps to recognise new
-     *                                     objects.
-     * @param aResultsRef              Reference to correct results, i.e. this
-     *                                     reference must be used when returning
-     *                                     the result by calling the SetResultsL.
-     * @param aStatusRef                   Reference to correct command, i.e. this
-     *                                     reference must be used when calling the
-     *                                     SetStatusL of this command.
-     * @publishedPartner
-     * @prototype
-    */
-    void ChildURIListL( const TDesC8& aURI, 
-                        const TDesC8& aLUID, 
-                     const CArrayFix<TSmlDmMappingInfo>& aPreviousURISegmentList,
-        const TInt aResultsRef, const TInt aStatusRef );
-    /**
-     * The function adds node object. In some cases an implementation of the
-     * function may be empty function, if the node object does not need concrete
-     * database update. Still this function may be helpful to an adapter, i.e. in
-     * passing mapping LUID of the node to DM Module. The SetStatusL should be
-     * used as described in UpdateLeafObjectL()
-     * @param aURI         URI of the object
-     * @param aParentLUID  LUID of the parent object (if the adapter have
-     *                         earlier returned LUID to the DM Module).   
-     * @param aStatusRef       Reference to correct command, i.e. this reference
-     *                         must be used when calling the SetStatusL of this
-     *                         command.
-     * @publishedPartner
-     * @prototype
-    */
-    void AddNodeObjectL( const TDesC8& aURI, const TDesC8& aParentLUID, 
-                         const TInt aStatusRef );
-    /**
-     * The function creates new leaf objects, or replaces data in existing leaf
-     * objects, in the case where data is large enough to be streamed. The
-     * information about the success of the command should be returned by calling
-     * SetStatusL function of MSmlDmCallback callback interface. This makes it
-     * possible to buffer the commands.  However, all the status codes for buffered
-     * commands must be returned at the latest when the CompleteOutstandingCmdsL()
-     * of adapter is called.
-     * @param aURI     URI of the object
-     * @param aLUID        LUID of the object (if the adapter has earlier returned a
-     *                     LUID to the DM Module). For new objects, this is the LUID
-     *                     inherited through the parent node.
-     * @param aStream  Data of the object. Adapter should create write stream
-     *                     and return, when data is written to stream by DM agent,
-     *                     StreamCommittedL() is called by DM engine
-     * @param aType        MIME type of the object
-     * @param aStatusRef   Reference to correct command, i.e. this reference
-     *                     must be used when calling the SetStatusL of this
-     *                     command.
-     * @publishedPartner
-     * @prototype
-    */
-    void UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, 
-                            RWriteStream*& aStream, const TDesC8& aType, 
-                            const TInt aStatusRef );
-    /**
-     * The function fetches the size of the data of a leaf object. The size is
-     * in bytes, and must reflect the number of bytes that will be transferred
-     * when the framework calls FetchLeafObjectL. The SetStatusL should be used
-     * as described in FetchLeafObjectL(). The size value is returned by using
-     * the SetResultsL function of MSmlCallback callback interface, and must be
-     * a decimal integer expressed as a string, eg. "1234".
-     * Results from this call MUST NOT be streamed.
-     * @param aURI         URI of the object
-     * @param aLUID            LUID of the object (if the adapter have earlier
-     *                         returned LUID to the DM Module).   
-     * @param aType            MIME type of the object
-     * @param aResultsRef  Reference to correct results, i.e. this reference
-     *                         must be used when returning the result by calling
-     *                         the SetResultsL.
-     * @param aStatusRef       Reference to correct command, i.e. this reference
-     *                         must be used when calling the SetStatusL of this
-     *                         command.
-     * @publishedPartner
-     * @prototype
-    */
-    void FetchLeafObjectSizeL( const TDesC8& aURI, const TDesC8& aLUID, 
-                               const TDesC8& aType, const TInt aResultsRef, 
-                               const TInt aStatusRef );
-    /**
-     * The function implements execute command. The information about the success
-     * of the command should be returned by calling SetStatusL function of
-     * MSmlDmCallback callback interface. This makes it possible to buffer the
-     * commands.
-     * However, all the status codes for buffered commands must be returned at
-     * the latest when the CompleteOutstandingCmdsL() of adapter is called.
-     * @param aURI         URI of the command
-     * @param aLUID            LUID of the object (if the adapter have earlier
-     *                         returned LUID to the DM Module).   
-     * @param aArgument        Argument for the command
-     * @param aType            MIME type of the object 
-     * @param aStatusRef       Reference to correct command, i.e. this reference
-     *                         must be used when calling the SetStatusL of this
-     *                         command.
-     * @publishedPartner
-     * @prototype
-    */
-    void ExecuteCommandL( const TDesC8& aURI, const TDesC8& aLUID, 
-                          const TDesC8& aArgument, const TDesC8& aType, 
-                          const TInt aStatusRef );
-    /**
-     * The function implements execute command. The information about the
-     * success of the command should be returned by calling SetStatusL function
-     * of MSmlDmCallback callback interface. This makes it possible to buffer the
-     * commands.
-     * However, all the status codes for buffered commands must be returned at
-     * the latest when the CompleteOutstandingCmdsL() of adapter is called.
-     * @param aURI         URI of the command
-     * @param aLUID            LUID of the object (if the adapter have earlier
-     *                         returned LUID to the DM Module).   
-     * @param aStream      Argument for the command. Adapter should create
-     *                         write stream and return, when data is written to
-     *                         stream by DM agent, StreamCommittedL() is called by
-     *                         DM engine
-     * @param aType            MIME type of the object 
-     * @param aStatusRef       Reference to correct command, i.e. this reference
-     *                         must be used when calling the SetStatusL of this
-     *                         command.
-     * @publishedPartner
-     * @prototype
-    */
-    void ExecuteCommandL( const TDesC8& aURI, const TDesC8& aLUID, 
-                          RWriteStream*& aStream, const TDesC8& aType, 
-                          const TInt aStatusRef );
-    /**
-     * The function implements copy command. The information about the success of
-     * the command should be returned by calling SetStatusL function of
-     * MSmlDmCallback callback interface. This makes it possible to buffer the
-     * commands.
-     * However, all the status codes for buffered commands must be returned at
-     * the latest when the CompleteOutstandingCmdsL() of adapter is called.
-     * @param aTargetURI       Target URI for the command
-     * @param aSourceLUID  LUID of the target object (if one exists, and if the adapter
-     *                         has earlier returned a LUID to the DM Module).   
-     * @param aSourceURI       Source URI for the command
-     * @param aSourceLUID  LUID of the source object (if the adapter has
-     *                         earlier returned a LUID to the DM Module).   
-     * @param aType            MIME type of the objects
-     * @param aStatusRef       Reference to correct command, i.e. this reference
-     *                         must be used when calling the SetStatusL of this
-     *                         command.
-     * @publishedPartner
-     * @prototype
-    */
-    void CopyCommandL( const TDesC8& aTargetURI, const TDesC8& aTargetLUID, 
-                       const TDesC8& aSourceURI, const TDesC8& aSourceLUID, 
-                       const TDesC8& aType, TInt aStatusRef );
-    /**
-     * The function indicates start of Atomic command.
-     * @publishedPartner
-     * @prototype
-    */
-    void StartAtomicL();
-    /**
-     * The function indicates successful end of Atomic command. The adapter
-     * should commit all changes issued between StartAtomicL() and
-     * CommitAtomicL()
-     * @publishedPartner
-     * @prototype
-    */
-    void CommitAtomicL();
-    /**
-     * The function indicates unsuccessful end of Atomic command. The adapter
-     * should rollback all changes issued between StartAtomicL() and
-     * RollbackAtomicL(). If rollback fails for a command, adapter should use
-     * SetStatusL() to indicate it.
-     * @publishedPartner
-     * @prototype
-    */
-    void RollbackAtomicL();
-    /**
-     * Returns ETrue if adapter supports streaming otherwise EFalse.
-     * @param aItemSize size limit for stream usage
-     * @return TBool ETrue for streaming support
-     * @publishedPartner
-     * @prototype
-    */
-    TBool StreamingSupport( TInt& aItemSize );
-    /**
-     * Called when stream returned from UpdateLeafObjectL or ExecuteCommandL has
-     * been written to and committed. Not called when fetching item.
-     * @publishedPartner
-     * @prototype
-    */  
-    void StreamCommittedL();
-    /**
-     * The function tells the adapter that all the commands of the message that
-     * can be passed to the adapter have now been passed.  This indciates that
-     * the adapter must supply status codes and results to any buffered commands.
-     * This must be done at latest by the time this function returns.
-     * This function is used at the end of SyncML messages, and during processing
-     * of Atomic.   In the case of Atomic processing, the function will be
-     * followed by a call to CommitAtomicL or RollbackAtomicL.
-     * @publishedPartner
-     * @prototype
-    */
-    void CompleteOutstandingCmdsL();
-
-protected:  
-    /**
-     * Inherited from MMsvSessionObserver
-     * Indicates an event has occurred.
-     * @param aEvent Indicates the event type. 
-     * @param aArg1 Event type-specific argument value 
-     * @param aArg2 Event type-specific argument value 
-     * @param aArg3 Event type-specific argument value 
-     */
-    void HandleSessionEventL( TMsvSessionEvent aEvent, TAny* aArg1, TAny* aArg2,
-                              TAny* aArg3 );
-
-private:
-
-struct TNSmlEmailCommandElement
-    {
-    HBufC8* iLastUriSeg;
-    HBufC8* iData;
-    TInt iStatusRef;
-    TBool iLeaf;
-    CSmlDmAdapter::TError iStatus;
-    };
-
-enum TNSmlEmailAccountType
-    {
-    EImap,
-    EPop,
-    EUnknown
-    };
-
-enum TNSmlEmailSecuritySetting
-    {
-    EUseSecCon = 1,
-    EUseStartTls,
-    ESuseSecCon,
-    ESuseStartTls,
-    };
-
-struct TNSmlEmailSettingsElement
-    {
-    CArrayFixFlat<TNSmlEmailCommandElement> *iNodeBuf;
-    /* iMappingName = Email/xxxx */
-    HBufC8* iMappingName;
-    HBufC* iName;
-    CImSmtpSettings* iSmtpSettings;
-    CImPop3Settings* iPop3Settings;
-    CImImap4Settings* iImap4Settings;
-    CImIAPPreferences* iIapPref;
-    CImIAPPreferences* iSmtpIapPref;
-    
-    TBool iExecuted;
-    TInt iLuid;
-    TBool iJustFetch;
-    CNSmlDmEmailAdapter::TNSmlEmailAccountType iAccType;
-    TInt iAccId;
-    TMsvId iServiceId;
-    };
-
-    /**
-    * C++ default constructor.
-    */
-    void ConstructL();
-    CNSmlDmEmailAdapter();
-    CNSmlDmEmailAdapter( MSmlDmCallback* aDmCallback );
-
-    /**
-     * Initializes the buffer for leaf nodes.
-     * @param    aURI URI of the object
-     * @param    aObject The data to be updated
-     * @param    aStatusRef The status reference
-     * @param    aIndex The index to command buffer
-     * @return   status of the operation
-     */
-    TInt FirstAddLeafL(const TDesC8& aURI, 
-        const TDesC8& aObject, 
-        TInt aStatusRef,
-        TInt aIndex);
-
-    /**
-     * Updates the value of leaf object
-     * @param    aLastUriSeg URI of the object
-     * @param    aObject The data to be updated
-     * @param    aIndex The index to node buffer
-     * @param    aCommand The index to command buffer
-     * @return   status of the operation
-     */
-    TInt DoAddLeafObjectL(const TDesC8& aLastUriSeg, 
-        const TDesC8& aObject,
-        TInt aIndex, 
-        TInt aCommand);
-
-    /**
-     * Set the default values to email account
-     * @param    aIndex The index to node buffer
-     * @return   none
-     */
-    void SetDefaultSettingsL(TInt aIndex);
-
-    /**
-     * Converts 16bit descriptor to integer
-     * @param    aLuid The descriptor to be converted
-     * @return    Integer value of the descriptor
-     */
-    TInt DesToInt(const TDesC& aLuid) const;
-
-    /**
-     * Converts 8bit descriptor to integer
-     * @param    aLuid The descriptor to be converted
-     * @return    Integer value of the descriptor
-     */
-    TInt DesToInt(const TDesC8& aLuid) const;
-
-    /**
-     * Converts integer to 16bit descriptor
-     * @param    aLuid The integer to be converted
-     * @return    The Integer as a descriptor
-     */
-    HBufC* IntToDesLC(const TInt aLuid) const;
-
-    /**
-     * Converts integer to 8bit descriptor
-     * @param    aLuid The integer to be converted
-     * @return    The Integer as a descriptor
-     */
-    HBufC8* IntToDes8LC(const TInt aLuid) const;
-
-    /**
-     * Converts 16bit descriptor to 8bit descriptor
-     * @param    aSource The descriptor to be converted
-     * @return    The 8bit descriptor
-     */
-    HBufC8* ConvertTo8LC( const TDesC& aSource ) const;
-
-    /**
-     * Transfers the email settings from memory to phones permanent data store
-     * @param    aIndex The index to command buffer
-     * @return    Luid of the email account
-     */
-    TInt ValidateAndStoreSettingsL(TInt aIndex);
-
-    /**
-     * Restores the settings to the adapter from phones permanent data store
-     * @param    aIndex The index to command buffer
-     * @return    Status of the operation
-     */
-    TInt DoRestoreSettingsL(TInt aIndex);
-
-    /**
-     * Opens the CMsvSession if it is not open already
-     * @param    none
-     * @return    Status of the operation
-     */
-    TInt OpenSessionL();
-
-    /**
-     * Parses the last URI segment from URI
-     * @param    aURI The whole URI
-     * @return    The last URI segment
-     */
-    TPtrC8 LastURISeg(const TDesC8& aURI) const; 
-
-    /**
-     * Removes the last URI segment from URI
-     * @param    aURI The whole URI
-     * @return    The aURI without the last URI segment
-     */
-    TPtrC8 RemoveLastURISeg(const TDesC8& aURI) const;
-
-    /**
-     * Calculates the number of URI segments
-     * @param    aURI The whole URI
-     * @return    The number of URI segments
-     */
-    TInt NumOfURISegs(const TDesC8& aURI) const;
-
-    /**
-     * Fills the DDF node with desired properties
-     * @param    aNode           Reference to node or leaf which info to be filled.
-     * @param    aAccTypes       Access rights for a leaf / node.
-     * @param    aOccurrence     Occurance of the node / leaf.
-     * @param    aScope          Scope (dynamic / permanent) of the leaf / node.
-     * @param    aFormat         Data format of the leaf / node.
-     * @param    aDescription    Description of the node / leaf.
-     * @param    aDefaultValue   Default value for a leaf or node.
-     * @return    none
-     */
-    void FillNodeInfoL( MSmlDmDDFObject& aNode,
-        const TSmlDmAccessTypes& aAccTypes, 
-                        MSmlDmDDFObject::TOccurence aOccurrence, 
-                        MSmlDmDDFObject::TScope aScope, 
-                        MSmlDmDDFObject::TDFFormat aFormat,
-                        const TDesC8& aDescription) const;
-
-    /**
-     * Parses the dot and slash in start of URI away
-     * @param    aURI The whole URI
-     * @return    The URI without dot and slash in start
-     */
-    TPtrC8 RemoveDotSlash(const TDesC8& aURI) const;
-
-    /**
-     * Fetches the value of leaf node
-     * @param    aURI The whole URI
-     * @param    aLUID The LUID
-     * @param    aObject The storage for the result
-     * @return    Status of the operation
-     */
-    CSmlDmAdapter::TError FetchObjectL(const TDesC8& aURI, 
-        const TDesC8& aLUID,
-        CBufBase& aObject);
-
-    /**
-     * Calculates correct account id from the LUID
-     * @param    aAccType Account Type
-     * @param    aAccId Account ID
-     * @param    aLuid The LUID
-     * @return    none
-     */
-    void GetIdByLuid( TNSmlEmailAccountType& aAccType, 
-                      TInt& aAccId, const TInt aLuid ) const;
-
-    /**
-     * Calculates LUID from the account id
-     * @param    aAccType Account Type
-     * @param    aAccId Account ID
-     * @param    aLuid The LUID
-     * @return    none
-     */
-    void SetLuidById( const TNSmlEmailAccountType& aAccType, 
-                      const TInt& aAccId, TInt& aLuid ) const;
-
-    /**
-     * Checks if the account with given id exists
-     * @param    aAccs Pointer to CEmailAccount object
-     * @param    aAccType Account Type
-     * @param    aId Account ID
-     * @param    aIndex The LUIDIndex to the command buffer
-     * @return    True if the account exists
-     */
-    TBool AccountExistsL( CEmailAccounts* aAccs, 
-                         const TNSmlEmailAccountType aAccType, 
-                         const TInt aId,
-                         TInt aIndex );
-
-    /**
-     * Sets the parameters related to STARTTLS and SSL/TLS
-     * @param    aObject The value(True/False) to be set
-     * @param    aThisElem The element of which value is to be set.
-     * @param    aSetting The setting which value is to be set
-     * @return    none
-     */
-    void SetDefaultSecurityL(const TDesC8& aObject,
-                          const TNSmlEmailSettingsElement* aThisElem,
-                          const TNSmlEmailSecuritySetting aSetting
-        ) const;
-
-    /**
-     * Fetches the parameters related to STARTTLS and SSL/TLS
-     * @param    aObject The storage for the value
-     * @param    aElem The element of which value is fetched.
-     * @param    aSetting The setting which value is fetched.
-     * @return    Status of the operation
-     */
-    CSmlDmAdapter::TError FetchSecurityValueL(CBufBase& aObject, 
-        const TNSmlEmailSettingsElement* aElem,
-        const TNSmlEmailSecuritySetting aSetting ) const;
-		
-		/**
-     * Creates the mapping for the email account preset
-     * @param    aURI The whole URI
-     * @return   the luid of the email account specified im aURI, else -1
-     */
-		TInt ConstructTreeL(const TDesC8& aURI);
-		
- /**
-        * The function extracts Email/x node from aURI		        
-        * @param    aURI     Email aURI.
-        * @return   Email/x node.
-    */ 
-    TPtrC8 GetDynamicEmailNodeUri( const TDesC8& aURI );
-		
-private:
-    // Pointer to CMsvSession
-    CMsvSession* iMsvSession;
-    // The buffer for received commands
-    CArrayFixFlat<TNSmlEmailSettingsElement>* iBuffer;
-    };
-
-#endif // __NSMLDMEMAILADAPTER_H__
-
-// End of File
--- a/omadm/omadmextensions/adapters/email/sis/emailadapter.pkg	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +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 "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description: Implementation of dm adapters
-; 	This is part of omadmextensions.
-;
-&EN
-
-; standard SIS file header
-#{"nsmlemailadapter"},(0x101F6E34),2,0,0,TYPE=SA
-
-;Localised Vendor name
-%{"Nokia-EN"}
-
-;Unique Vendor name
-:"Nokia"
-
-;Supports Series 60 v 3.0
-;[0x101F6E34], 0, 0, 0, {"Series60ProductID"}
-
-;Files to install
-;Exes  to be installed 
-"\EPOC32\RELEASE\ARMV5\UREL\nsmldmemailadapter.dll"                            -"!:\sys\bin\nsmldmemailadapter.dll"
-; Application resource files to be installed 
-"\EPOC32\data\z\resource\plugins\nsmldmemailadapter.Rsc"             -"!:\resource\plugins\nsmldmemailadapter.Rsc"
--- a/omadm/omadmextensions/adapters/email/sis/gensis.bat	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-rem
-rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-rem All rights reserved.
-rem This component and the accompanying materials are made available
-rem under the terms of "Eclipse Public License v1.0"
-rem which accompanies this distribution, and is available
-rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
-rem
-rem Initial Contributors:
-rem Nokia Corporation - initial contribution.
-rem
-rem Contributors:
-rem
-rem Description: Implementation of dm adapters
-rem 	This is part of omadmextensions.
-rem
-
-makesis emailadapter.pkg
-signsis emailadapter.SIS emailadapter.SISX \S60\mw\contentmanagement\swinstalleruis\Appinstui\internal\RD_rootCA\rd.cer \s60\mw\contentmanagement\swinstalleruis\appinstui\internal\RD_rootca\rd-key.pem
\ No newline at end of file
--- a/omadm/omadmextensions/adapters/email/src/nsmldmemailadapter.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3380 +0,0 @@
-/*
-* Copyright (c) 2004 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:    DM Email Settings Adapter
- *
-*/
-
-
-
-
-#include <implementationproxy.h> // For TImplementationProxy definition
-#include <utf.h>
-#include <iapprefs.h>
-#include <smtpset.h>
-#include <pop3set.h>
-#include <imapset.h>
-#include <sysutil.h>
-#include <etelmm.h>
-
-#include <cemailaccounts.h>
-
-#include "nsmldmimpluids.h"
-#include "nsmldmemailadapter.h"
-#include "nsmldebug.h"
-#include "nsmlconstants.h"
-#include "nsmldmconst.h"
-#include "nsmldmiapmatcher.h"
-
-#ifndef __WINS__
-// This lowers the unnecessary compiler warning (armv5) to remark.
-// "Warning:  #174-D: expression has no effect..." is caused by 
-// DBG_ARGS8 macro in no-debug builds.
-#pragma diag_remark 174
-#endif
-
-// -----------------------------------------------------------------------------
-// CNSmlDmEmailAdapter* CNSmlDmEmailAdapter::NewL( )
-// -----------------------------------------------------------------------------
-CNSmlDmEmailAdapter* CNSmlDmEmailAdapter::NewL(MSmlDmCallback* aDmCallback )
-    {
-    _DBG_FILE("CNSmlDmEmailAdapter::NewL(): begin");
-    CNSmlDmEmailAdapter* self = new (ELeave) CNSmlDmEmailAdapter(aDmCallback);
-    CleanupStack::PushL(self);
-    self->ConstructL();
-    CleanupStack::Pop();
-    _DBG_FILE("CNSmlDmEmailAdapter::NewL(): end");
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDmEmailAdapter::CNSmlDmEmailAdapter()
-// -----------------------------------------------------------------------------
-
-CNSmlDmEmailAdapter::CNSmlDmEmailAdapter( MSmlDmCallback* aDmCallback )
-    : CSmlDmAdapter(aDmCallback)
-    {
-    _DBG_FILE("CNSmlDmEmailAdapter::CNSmlDmEmailAdapter(): begin");
-    iMsvSession = NULL;
-    _DBG_FILE("CNSmlDmEmailAdapter::CNSmlDmEmailAdapter(): end");
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDmEmailAdapter::ConstructL()
-// -----------------------------------------------------------------------------
-void CNSmlDmEmailAdapter::ConstructL()
-    {
-    iBuffer = new (ELeave) CArrayFixFlat <TNSmlEmailSettingsElement> 
-        (KNSmlDmEmailGranularity);
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDmEmailAdapter::~CNSmlDmEmailAdapter()
-// -----------------------------------------------------------------------------
-CNSmlDmEmailAdapter::~CNSmlDmEmailAdapter()
-    {
-    _DBG_FILE("CNSmlDmEmailAdapter::~CNSmlDmEmailAdapter(): begin");
-    delete iMsvSession;
-    if(iBuffer)
-        {
-        for(TInt i=0;i<iBuffer->Count();i++)
-            {
-            delete iBuffer->At(i).iMappingName;
-            delete iBuffer->At(i).iName;
-            delete iBuffer->At(i).iSmtpSettings;
-            delete iBuffer->At(i).iPop3Settings;
-            delete iBuffer->At(i).iImap4Settings;
-            delete iBuffer->At(i).iIapPref;
-            delete iBuffer->At(i).iSmtpIapPref;
-
-            if(iBuffer->At(i).iNodeBuf)
-                {
-                for(TInt j=0;j<iBuffer->At(i).iNodeBuf->Count();j++)
-                    {
-                    delete iBuffer->At(i).iNodeBuf->At(j).iLastUriSeg;
-                    delete iBuffer->At(i).iNodeBuf->At(j).iData;
-                    }
-                iBuffer->At(i).iNodeBuf->Reset();
-                delete iBuffer->At(i).iNodeBuf;
-                }
-            }
-        iBuffer->Reset();
-        delete iBuffer;
-        }
-
-    _DBG_FILE("CNSmlDmEmailAdapter::~CNSmlDmEmailAdapter(): end");
-    }
-
-// -----------------------------------------------------------------------------
-//  CNSmlDmEmailAdapter::DDFVersionL()
-// -----------------------------------------------------------------------------
-void CNSmlDmEmailAdapter::DDFVersionL(CBufBase& aDDFVersion)
-    {
-    _DBG_FILE("CNSmlDmEmailAdapter::DDFVersionL(TDes& aDDFVersion): begin");
-    aDDFVersion.InsertL(0,KNSmlDMEmailDDFVersion);
-    _DBG_FILE("CNSmlDmEmailAdapter::DDFVersionL(TDes& aDDFVersion): end");
-    }
-
-
-// -----------------------------------------------------------------------------
-//  CNSmlDmEmailAdapter::DDFStructureL()
-//
-// -----------------------------------------------------------------------------
-void CNSmlDmEmailAdapter::DDFStructureL(MSmlDmDDFObject& aDDF)
-    {
-    _DBG_FILE("CNSmlDmEmailAdapter::DDFStructureL(): begin");
-
-    TSmlDmAccessTypes accessTypesNode;
-
-    accessTypesNode.SetGet();
-
-    // Email
-    MSmlDmDDFObject& email = aDDF.AddChildObjectL(KNSmlDMEmailNodeName);
-    FillNodeInfoL(email,accessTypesNode,MSmlDmDDFObject::EOne,
-                  MSmlDmDDFObject::EPermanent,
-                  MSmlDmDDFObject::ENode,KNSmlDMEmailDescription);
-
-    accessTypesNode.SetAdd();
-    accessTypesNode.SetDelete();
-    accessTypesNode.SetReplace();
-    MSmlDmDDFObject& rtNode = email.AddChildObjectGroupL();
-
-
-    FillNodeInfoL(rtNode,accessTypesNode,MSmlDmDDFObject::EZeroOrMore,
-                  MSmlDmDDFObject::EDynamic,MSmlDmDDFObject::ENode,
-                  KNSmlDMDynamicNodeDescription);
-
-    TSmlDmAccessTypes accessTypes;
-    accessTypes.SetGet();
-    accessTypes.SetAdd();
-    accessTypes.SetReplace();
-    //displayable account name
-    MSmlDmDDFObject& name = rtNode.AddChildObjectL(KNSmlDMEmailName);
-    FillNodeInfoL(name,accessTypes,MSmlDmDDFObject::EZeroOrOne,
-                  MSmlDmDDFObject::EDynamic,MSmlDmDDFObject::EChr,
-                  KNSmlDMNameDescription);
-
-    //user id for email account
-    MSmlDmDDFObject& uid = rtNode.AddChildObjectL(KNSmlDMEmailUID);
-    FillNodeInfoL(uid,accessTypes,MSmlDmDDFObject::EOne,
-                  MSmlDmDDFObject::EDynamic,MSmlDmDDFObject::EChr,
-                  KNSmlDMUIDDescription);
-
-    //password for email account
-    TSmlDmAccessTypes accessTypesPw;
-    accessTypesPw.SetAdd();
-    accessTypesPw.SetReplace();
-    MSmlDmDDFObject& pw = rtNode.AddChildObjectL(KNSmlDMEmailPW);
-    FillNodeInfoL(pw,accessTypesPw,MSmlDmDDFObject::EZeroOrOne,
-                  MSmlDmDDFObject::EDynamic,MSmlDmDDFObject::EChr,
-                  KNSmlDMPWDescription);
-
-    //user's email address
-    MSmlDmDDFObject& uaddr = rtNode.AddChildObjectL(KNSmlDMEmailUAddr);
-    FillNodeInfoL(uaddr,accessTypes,MSmlDmDDFObject::EOne,
-                  MSmlDmDDFObject::EDynamic,MSmlDmDDFObject::EChr,
-                  KNSmlDMUAddrDescription);
-
-    //Displayable name for the user
-    MSmlDmDDFObject& uname = rtNode.AddChildObjectL(KNSmlDMEmailUName);
-    FillNodeInfoL(uname,accessTypes,MSmlDmDDFObject::EZeroOrOne,
-                  MSmlDmDDFObject::EDynamic,MSmlDmDDFObject::EChr,
-                  KNSmlDMUNameDescription);
-
-    //Host name for the receiving server
-    MSmlDmDDFObject& mrcv = rtNode.AddChildObjectL(KNSmlDMEmailMrcv);
-    FillNodeInfoL(mrcv,accessTypes,MSmlDmDDFObject::EOne,
-                  MSmlDmDDFObject::EDynamic,MSmlDmDDFObject::EChr,
-                  KNSmlDMMrcvDescription);
-
-    //Host name for the sending server
-    MSmlDmDDFObject& msnd = rtNode.AddChildObjectL(KNSmlDMEmailMsnd);
-    FillNodeInfoL(msnd,accessTypes,MSmlDmDDFObject::EOne,
-                  MSmlDmDDFObject::EDynamic,MSmlDmDDFObject::EChr,
-                  KNSmlDMMsndDescription);
-
-    //Remote mailbox protocol
-    MSmlDmDDFObject& mpro = rtNode.AddChildObjectL(KNSmlDMEmailMpro);
-    FillNodeInfoL(mpro,accessTypes,MSmlDmDDFObject::EOne,
-                  MSmlDmDDFObject::EDynamic,MSmlDmDDFObject::EChr,
-                  KNSmlDMMproDescription);
-
-    //Use secure connection
-    MSmlDmDDFObject& useSecCon = rtNode.AddChildObjectL(KNSmlDMEmailUseSecCon);
-    FillNodeInfoL(useSecCon,accessTypes,MSmlDmDDFObject::EZeroOrOne,
-                  MSmlDmDDFObject::EDynamic,MSmlDmDDFObject::EBool,
-                  KNSmlDMUseSecConDescription);
-
-    //Use APop
-    MSmlDmDDFObject& useAPOP = rtNode.AddChildObjectL(KNSmlDMEmailUseAPOP);
-    FillNodeInfoL(useAPOP, accessTypes, MSmlDmDDFObject::EZeroOrOne,
-                  MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::EBool,
-                  KNSmlDMUseAPOPDescription );
-
-    //Use smtp authentication
-    MSmlDmDDFObject& useSauth = rtNode.AddChildObjectL(KNSmlDMEmailUseSauth);
-    FillNodeInfoL(useSauth,accessTypes,MSmlDmDDFObject::EZeroOrOne,
-                  MSmlDmDDFObject::EDynamic,MSmlDmDDFObject::EBool,
-                  KNSmlDMUseSauthDescription);
-
-    //smtp authentication user id
-    MSmlDmDDFObject& sauthUid = rtNode.AddChildObjectL(KNSmlDMEmailSauthUID);
-    FillNodeInfoL(sauthUid,accessTypes,MSmlDmDDFObject::EZeroOrOne,
-                  MSmlDmDDFObject::EDynamic,MSmlDmDDFObject::EChr,
-                  KNSmlDMSauthUIDDescription);
-
-    //Use smtp authentication
-    MSmlDmDDFObject& sauthPw = rtNode.AddChildObjectL(KNSmlDMEmailSauthPW);
-    FillNodeInfoL(sauthPw,accessTypesPw,MSmlDmDDFObject::EZeroOrOne,
-                  MSmlDmDDFObject::EDynamic,MSmlDmDDFObject::EChr,
-                  KNSmlDMSauthPWDescription);
-
-    //Use smtp authentication
-    MSmlDmDDFObject& ptxtSAuth = rtNode.AddChildObjectL(KNSmlDMEmailPtxtSAuth);
-    FillNodeInfoL(ptxtSAuth,accessTypes,MSmlDmDDFObject::EZeroOrOne,
-                  MSmlDmDDFObject::EDynamic,MSmlDmDDFObject::EBool,
-                  KNSmlDMPtxtSAuthDescription);
-
-    //Link to IAP
-    MSmlDmDDFObject& toNapId = rtNode.AddChildObjectL(KNSmlDMEmailToNapID);
-    FillNodeInfoL(toNapId,accessTypes,MSmlDmDDFObject::EZeroOrOne,
-                  MSmlDmDDFObject::EDynamic,MSmlDmDDFObject::EChr,
-                  KNSmlDMToNapIDDescription);
-
-    //Link to IAP for SMTP
-    MSmlDmDDFObject& sToNapId = rtNode.AddChildObjectL(KNSmlDMEmailSToNapID);
-    FillNodeInfoL(sToNapId,accessTypes,MSmlDmDDFObject::EZeroOrOne,
-                  MSmlDmDDFObject::EDynamic,MSmlDmDDFObject::EChr,
-                  KNSmlDMSToNapIDDescription);
-
-    //SSL/TLS used in SMTP
-    MSmlDmDDFObject& sUseSecCon = rtNode.
-        AddChildObjectL(KNSmlDMEmailSUseSecCon);
-    FillNodeInfoL(sUseSecCon,accessTypes,MSmlDmDDFObject::EZeroOrOne,
-                  MSmlDmDDFObject::EDynamic,MSmlDmDDFObject::EBool,
-                  KNSmlDMSUseSecConDescription);
-
-    //StartTLS used in IMAP/POP
-    MSmlDmDDFObject& useStartTls = rtNode.
-        AddChildObjectL(KNSmlDMEmailUseStartTLS);
-    FillNodeInfoL(useStartTls,accessTypes,MSmlDmDDFObject::EZeroOrOne,
-                  MSmlDmDDFObject::EDynamic,MSmlDmDDFObject::EBool,
-                  KNSmlDMUseStartTLSDescription);
-
-    //StartTLS used in SMTP
-    MSmlDmDDFObject& sUseStartTls = rtNode.
-        AddChildObjectL(KNSmlDMEmailSUseStartTLS);
-    FillNodeInfoL(sUseStartTls,accessTypes,MSmlDmDDFObject::EZeroOrOne,
-                  MSmlDmDDFObject::EDynamic,MSmlDmDDFObject::EBool,
-                  KNSmlDMSUseStartTLSDescription);
-
-    //port of IMAP/POP server
-    MSmlDmDDFObject& mrcvPort = rtNode.AddChildObjectL(KNSmlDMEmailMrcvPort);
-    FillNodeInfoL(mrcvPort,accessTypes,MSmlDmDDFObject::EZeroOrOne,
-                  MSmlDmDDFObject::EDynamic,MSmlDmDDFObject::EInt,
-                  KNSmlDMMrcvPortDescription);
-
-    //port of SMTP server
-    MSmlDmDDFObject& msndPort = rtNode.AddChildObjectL(KNSmlDMEmailMsndPort);
-    FillNodeInfoL(msndPort,accessTypes,MSmlDmDDFObject::EZeroOrOne,
-                  MSmlDmDDFObject::EDynamic,MSmlDmDDFObject::EInt,
-                  KNSmlDMMsndPortDescription);
-
-    //IMAP folder path
-    MSmlDmDDFObject& folderPath = rtNode.
-        AddChildObjectL(KNSmlDMEmailFolderPath);
-    FillNodeInfoL(folderPath,accessTypes,MSmlDmDDFObject::EZeroOrOne,
-                  MSmlDmDDFObject::EDynamic,MSmlDmDDFObject::EChr,
-                  KNSmlDMFolderPathDescription);
-
-    _DBG_FILE("CNSmlDmEmailAdapter::DDFStructureL(): end");
-    }
-
-// -----------------------------------------------------------------------------
-//  CNSmlDmEmailAdapter::UpdateLeafObjectL()
-// -----------------------------------------------------------------------------
-void CNSmlDmEmailAdapter::UpdateLeafObjectL( const TDesC8& aURI, 
-                                             const TDesC8& aLUID,
-                                             const TDesC8& aObject,
-                                             const TDesC8& /*aType*/,
-                                             const TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlDmEmailAdapter::UpdateLeafObjectL(): begin");
-
-    TInt index = -1;
-    TBool firstAdd = EFalse;
-
-    for(TInt i = 0; i<iBuffer->Count(); i++)
-        {
-        TPtrC8 parentUri = RemoveLastURISeg(aURI);
-        //Check Node from buffer if match
-        if(iBuffer->At(i).iMappingName->Compare(parentUri) == 0 )
-            {
-            firstAdd = ETrue;
-            index = i;
-            break;
-            }
-        }
- 	
- 	TInt luid = DesToInt(aLUID);
-			
-    if(aLUID.Length()==0 && index<0)
-        {
-        	luid = ConstructTreeL(aURI);
-        	if(luid == -1)        	
-        	{
-        		Callback().SetStatusL(aStatusRef, CSmlDmAdapter::ENotFound);
-        		_DBG_FILE("CNSmlDmEmailAdapter::UpdateLeafObjectL(): end");
-        		return;
-        	}
-        }
-
-    if( OpenSessionL() != KErrNone )
-        {
-        Callback().SetStatusL(aStatusRef, CSmlDmAdapter::EError);
-        _DBG_FILE("CNSmlDmEmailAdapter::UpdateLeafObjectL(): end");
-        return;
-        }
-
-    if(!firstAdd)
-        {
-
-        if(LastURISeg(aURI).Compare(KNSmlDMEmailMpro)==0)
-            {
-            Callback().SetStatusL(aStatusRef, CSmlDmAdapter::EError);
-            _DBG_FILE("CNSmlDmEmailAdapter::UpdateLeafObjectL(): end");
-            return;
-            }
-        index = -1;
-        for(TInt i=0;i<iBuffer->Count();i++)
-            {
-            if(iBuffer->At(i).iLuid == luid)
-                {
-                index = i;
-                break;
-                }
-            }
-
-        if(index<0)
-            {
-            TNSmlEmailSettingsElement newNode;
-            newNode.iImap4Settings = NULL;
-            newNode.iPop3Settings = NULL;
-            newNode.iSmtpSettings = NULL;
-            newNode.iIapPref = NULL;
-            newNode.iSmtpIapPref = NULL;
-            newNode.iLuid = luid;
-            newNode.iMappingName = aURI.AllocLC();
-            newNode.iName = HBufC::NewLC(0);
-            newNode.iNodeBuf = new (ELeave) CArrayFixFlat 
-                <TNSmlEmailCommandElement> (KNSmlDmEmailGranularity);
-            newNode.iExecuted = ETrue;
-            GetIdByLuid(newNode.iAccType, newNode.iAccId, luid); 
-            iBuffer->AppendL(newNode);
-            index = iBuffer->Count() - 1;
-            TInt err = DoRestoreSettingsL(index);
-            if(err!=KErrNone)
-                {
-                CleanupStack::PopAndDestroy(2); //newNode.iMappingName,newNode.iName
-                newNode.iMappingName = NULL;
-                newNode.iName = NULL;
-                iBuffer->At(index).iNodeBuf->Reset();
-                delete iBuffer->At(index).iNodeBuf;
-                iBuffer->Delete(index);
-                }
-            if(err==KErrNotFound)
-                {
-                Callback().SetStatusL(aStatusRef, CSmlDmAdapter::ENotFound);
-                _DBG_FILE("CNSmlDmEmailAdapter::UpdateLeafObjectL(): end");
-                return;
-                }
-            else if(err!=KErrNone)
-                {
-                Callback().SetStatusL(aStatusRef, CSmlDmAdapter::EError);
-                _DBG_FILE("CNSmlDmEmailAdapter::UpdateLeafObjectL(): end");
-                return;
-                }
-            CleanupStack::Pop(2); //newNode.iMappingName,newNode.iName
-            }
-        TNSmlEmailCommandElement newCommand;
-        newCommand.iLastUriSeg = LastURISeg(aURI).AllocLC();
-        newCommand.iData = NULL;
-        newCommand.iStatusRef = aStatusRef;
-        newCommand.iLeaf = ETrue;
-        newCommand.iStatus = CSmlDmAdapter::EOk;
-        iBuffer->At(index).iNodeBuf->AppendL(newCommand);
-        CleanupStack::Pop(); //newCommand.iLastUriSeg
-        iBuffer->At(index).iJustFetch=EFalse;
-        DoAddLeafObjectL(newCommand.iLastUriSeg->Des(),aObject,index,
-                         iBuffer->At(index).iNodeBuf->Count()-1);
-        }
-    else
-        {
-        FirstAddLeafL(aURI,aObject,aStatusRef,index);
-        }
-
-    _DBG_FILE("CNSmlDmEmailAdapter::UpdateLeafObjectL(): end");
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDmEmailAdapter::DeleteObjectL( const TDesC8& aURI,
-//                                         const TDesC8& aLUID,
-//                                         const TInt aStatusRef )
-// -----------------------------------------------------------------------------
-void CNSmlDmEmailAdapter::DeleteObjectL( const TDesC8& aURI,
-                                         const TDesC8& aLUID,
-                                         const TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlDmEmailAdapter::DeleteLeafObjectL( ): begin");
-    if(NumOfURISegs(aURI)==2)
-        {
-        if(aLUID.Length()==0)
-            {
-            Callback().SetStatusL(aStatusRef, CSmlDmAdapter::ENotFound);
-            _DBG_FILE("CNSmlDmEmailAdapter::DeleteLeafObjectL( ): ENotFound end");
-            return;
-            }
-
-        TInt luid = DesToInt(aLUID);
-        TInt err = OpenSessionL();
-        if(err!=KErrNone)
-            {
-            Callback().SetStatusL(aStatusRef, CSmlDmAdapter::EError);
-            _DBG_FILE("CNSmlDmEmailAdapter::DeleteLeafObjectL( ): EError end");
-            return;
-            }
-        CEmailAccounts* emailAccs = CEmailAccounts::NewLC();
-        TNSmlEmailAccountType accType;
-        TInt id;
-        GetIdByLuid(accType, id, luid );
-        if( AccountExistsL( emailAccs, accType, id, -1 ) )
-            {
-            switch ( accType )
-                {
-            case EImap:
-                {
-                RArray<TImapAccount> imap4Accs;
-                CleanupClosePushL( imap4Accs );
-                emailAccs->GetImapAccountsL( imap4Accs );
-                
-                for (TInt i(0); i < imap4Accs.Count(); i++)
-                    {
-                    if ( imap4Accs[i].iImapAccountId == id  ) 
-                        {
-                        // Delete also related Smtp account
-                        TSmtpAccount relatedSmtp;
-                        emailAccs->GetSmtpAccountL( imap4Accs[i].iSmtpService, relatedSmtp );
-                        emailAccs->DeleteImapAccountL( imap4Accs[i] );
-                        emailAccs->DeleteSmtpAccountL( relatedSmtp );                       
-                        //The only email a/c in phone gettiong deleted , so delete the default sntp a/c                     
-                        if( imap4Accs.Count() == 1 )
-	                        {
-	                        TInt deferr = KErrNone;
-                        	TRAP(deferr, emailAccs->DeleteDefaultSmtpAccountL());
-                        	DBG_ARGS(_S16("CNSmlDmEmailAdapter::DeleteLeafObjectL( ): Delete default smtp account Error code %d"),deferr);
-    	                    }
-                        break;   
-                        }
-                    }
-                
-                CleanupStack::PopAndDestroy(&imap4Accs); //imap4Accs
-                
-                // If the default account was just deleted,
-                // new one needs to be set.
-                // 
-	            TSmtpAccount defaultSmtp;
-	            TInt retVal = emailAccs->DefaultSmtpAccountL( defaultSmtp );
-	            if (  retVal != KErrNone )
-	                {
-                    RArray<TImapAccount> imapAccs;
-                    CleanupClosePushL( imapAccs );
-                    emailAccs->GetImapAccountsL( imapAccs );
-                    if ( imapAccs.Count() > 0 )
-                        {
-                        TSmtpAccount relatedSmtp;
-                        emailAccs->GetSmtpAccountL( imapAccs[0].iSmtpService, relatedSmtp );
-	                    emailAccs->SetDefaultSmtpAccountL( relatedSmtp );
-                        }
-                    CleanupStack::PopAndDestroy( &imapAccs );
-                    RArray<TPopAccount> popAccounts;
-                    CleanupClosePushL( popAccounts );
-                    emailAccs->GetPopAccountsL( popAccounts );
-                    if ( popAccounts.Count() > 0 )
-                        {
-                        TSmtpAccount relatedSmtp;
-                        emailAccs->GetSmtpAccountL( popAccounts[0].iSmtpService, relatedSmtp );
-	                    emailAccs->SetDefaultSmtpAccountL( relatedSmtp );
-                        }
-                    CleanupStack::PopAndDestroy( &popAccounts );
-	                }	                
-                break;    
-                }
-                
-            case EPop:
-                {
-                RArray<TPopAccount> popAccs;
-                CleanupClosePushL( popAccs );
-                emailAccs->GetPopAccountsL( popAccs );
-                
-                for (TInt i(0); i < popAccs.Count(); i++)
-                    {
-                    if ( popAccs[i].iPopAccountId == id  ) 
-                        {
-                        // Delete also related Smtp account
-                        TSmtpAccount relatedSmtp;
-                        emailAccs->GetSmtpAccountL( popAccs[i].iSmtpService, relatedSmtp );
-                        emailAccs->DeletePopAccountL( popAccs[i] );    
-                        emailAccs->DeleteSmtpAccountL( relatedSmtp );
-                        if( popAccs.Count() == 1 )
-                        	{
-                        	TInt deferr = KErrNone;
-                        	TRAP(deferr, emailAccs->DeleteDefaultSmtpAccountL());
-                        	DBG_ARGS(_S16("CNSmlDmEmailAdapter::DeleteLeafObjectL( ): Delete default smtp account Error code %d "),deferr);
-                        	}
-                        break;                                             
-                        }
-                    }
-                
-                CleanupStack::PopAndDestroy(); //popAccs
-
-                // If the default account was just deleted,
-                // new one needs to be set.
-                // 
-	            TSmtpAccount defSmtp;
-	            TInt retVal = emailAccs->DefaultSmtpAccountL( defSmtp );
-	            if (  retVal != KErrNone )
-	                {
-                    RArray<TPopAccount> popAccounts;
-                    CleanupClosePushL( popAccounts );
-                    emailAccs->GetPopAccountsL( popAccounts );
-                    if ( popAccounts.Count() > 0 )
-                        {
-                        TSmtpAccount relatedSmtp;
-                        emailAccs->GetSmtpAccountL( popAccounts[0].iSmtpService, relatedSmtp );
-	                    emailAccs->SetDefaultSmtpAccountL( relatedSmtp );
-                        }
-                    CleanupStack::PopAndDestroy( &popAccounts );
-                    RArray<TImapAccount> imapAccs;
-                    CleanupClosePushL( imapAccs );
-                    emailAccs->GetImapAccountsL( imapAccs );
-                    if ( imapAccs.Count() > 0 )
-                        {
-                        TSmtpAccount relatedSmtp;
-                        emailAccs->GetSmtpAccountL( imapAccs[0].iSmtpService, relatedSmtp );
-	                    emailAccs->SetDefaultSmtpAccountL( relatedSmtp );
-                        }
-                    CleanupStack::PopAndDestroy( &imapAccs );                    
-	                }	                
-                break;
-                }                
-                
-            default:
-                Callback().SetStatusL(aStatusRef, CSmlDmAdapter::ENotFound);
-                break;
-                }
-
-            Callback().SetStatusL(aStatusRef, CSmlDmAdapter::EOk);
-            }
-        else
-            {
-            Callback().SetStatusL(aStatusRef, CSmlDmAdapter::ENotFound);
-            }
-        CleanupStack::PopAndDestroy(); //emailAccs
-        }
-    else
-        {
-        Callback().SetStatusL(aStatusRef, CSmlDmAdapter::EError);
-        }
-
-    _DBG_FILE("CNSmlDmEmailAdapter::DeleteLeafObjectL( ): end");
-    }
-
-// -----------------------------------------------------------------------------
-//  CNSmlDmEmailAdapter::FetchLeafObjectL( const TDesC8& aURI,
-//                                            const TDesC8& aLUID,
-//                                            const TDesC8& aType,
-//                                            const TInt aResultsRef,
-//                                            const TInt aStatusRef )
-//  
-// -----------------------------------------------------------------------------
-void CNSmlDmEmailAdapter::FetchLeafObjectL( const TDesC8& aURI,
-                                            const TDesC8& aLUID,
-                                            const TDesC8& aType,
-                                            const TInt aResultsRef,
-                                            const TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlDmEmailAdapter::FetchLeafObjectL(): begin");
-		
-	TInt luid = DesToInt(aLUID);	
-			
-    if(aLUID.Length()==0)
-        {
-        	luid = ConstructTreeL(aURI);
-        	if(luid == -1)        	
-        	{
-        		Callback().SetStatusL(aStatusRef, CSmlDmAdapter::ENotFound);
-        		_DBG_FILE("CNSmlDmEmailAdapter::FetchLeafObjectL(): ENotFound end");
-        		return;
-        	}
-        }
-    if( OpenSessionL() != KErrNone )
-        {
-        Callback().SetStatusL(aStatusRef, CSmlDmAdapter::EError);
-        _DBG_FILE("CNSmlDmEmailAdapter::FetchLeafObjectL(): EError end");
-        return;
-        }
-
-    TInt index  = -1;
-    for(TInt i=0;i<iBuffer->Count();i++)
-        {
-        if(iBuffer->At(i).iLuid == luid)
-            {
-            index = i;
-            break;
-            }
-        }
-
-    if(index<0)
-        {
-        TNSmlEmailSettingsElement newNode;
-        newNode.iImap4Settings = NULL;
-        newNode.iPop3Settings = NULL;
-        newNode.iSmtpSettings = NULL;
-        newNode.iIapPref = NULL;
-        newNode.iSmtpIapPref = NULL;
-        newNode.iLuid = luid;
-        newNode.iMappingName = aURI.AllocLC();
-        newNode.iName = HBufC::NewLC(0);
-        newNode.iNodeBuf = new (ELeave)
-            CArrayFixFlat <TNSmlEmailCommandElement> (KNSmlDmEmailGranularity);
-        newNode.iExecuted = ETrue;
-        newNode.iJustFetch = ETrue;
-        GetIdByLuid(newNode.iAccType, newNode.iAccId, luid);
-        iBuffer->AppendL(newNode);
-        index = iBuffer->Count() - 1;
-        if( DoRestoreSettingsL(index) != KErrNone )
-            {
-            Callback().SetStatusL(aStatusRef, CSmlDmAdapter::EError);
-            CleanupStack::Pop(2); //newNode.iMappingName,newNode.iName
-            _DBG_FILE("CNSmlDmEmailAdapter::FetchLeafObjectL(): EError end");
-            return;
-            }
-        CleanupStack::Pop(2); //newNode.iMappingName,newNode.iName
-        }
-
-    TPtrC8 lastUriSeg = LastURISeg(aURI);
-    CBufBase* object = CBufFlat::NewL(32);
-    CleanupStack::PushL(object);
-    CSmlDmAdapter::TError status = CSmlDmAdapter::EOk;
-
-    if(lastUriSeg.Compare(KNSmlDMEmailName)==0)
-        {
-        HBufC8 *data = HBufC8::NewLC(iBuffer->At(index).iName->Length());
-        TPtr8 dataPtr = data->Des();
-        CnvUtfConverter::ConvertFromUnicodeToUtf8( 
-            dataPtr,iBuffer->At(index).iName->Des() );
-        object->InsertL(0,dataPtr);
-        CleanupStack::PopAndDestroy(); //data
-        }
-
-    else if(lastUriSeg.Compare(KNSmlDMEmailUID)==0)
-        {
-        HBufC *data = NULL;
-        if(iBuffer->At(index).iPop3Settings!= NULL)
-            {
-            data = HBufC::NewLC(iBuffer->At(index).iPop3Settings->LoginName().Length());
-            data->Des().Copy(iBuffer->At(index).iPop3Settings->LoginName());
-            }
-        else if(iBuffer->At(index).iImap4Settings!= NULL)
-            {
-            data = HBufC::NewLC(iBuffer->At(index).iImap4Settings->LoginName().Length());
-            data->Des().Copy(iBuffer->At(index).iImap4Settings->LoginName());
-            }
-        if(data)
-            {
-            HBufC8 *data8 = CnvUtfConverter::ConvertFromUnicodeToUtf8L(*data);
-            CleanupStack::PushL(data8);
-            object->InsertL(0,*data8);
-            CleanupStack::PopAndDestroy(2);//data, data8
-            }
-        }
-
-    else if(lastUriSeg.Compare(KNSmlDMEmailPW)==0)
-        {
-        HBufC *data = NULL;
-        if(iBuffer->At(index).iPop3Settings!= NULL)
-            {
-            data = HBufC::NewLC(iBuffer->At(index).iPop3Settings->Password().Length());
-            data->Des().Copy(iBuffer->At(index).iPop3Settings->Password());
-            }
-        else if(iBuffer->At(index).iImap4Settings!= NULL)
-            {
-            data = HBufC::NewLC(iBuffer->At(index).iImap4Settings->Password().Length());
-            data->Des().Copy(iBuffer->At(index).iImap4Settings->Password());
-            }
-        if(data)
-            {
-            HBufC8 *data8 = CnvUtfConverter::ConvertFromUnicodeToUtf8L(*data);
-            CleanupStack::PushL(data8);
-            object->InsertL(0,*data8);
-            CleanupStack::PopAndDestroy(2);//data, data8
-            }
-        }
-
-    else if(lastUriSeg.Compare(KNSmlDMEmailUAddr)==0)
-        {
-        HBufC *data = NULL;
-        data = iBuffer->At(index).iSmtpSettings->EmailAddress().AllocLC();
-        HBufC8 *data8 = HBufC8::NewLC(data->Size());
-        TPtr8 dataPtr8 = data8->Des();
-        CnvUtfConverter::ConvertFromUnicodeToUtf8( dataPtr8, data->Des() );
-
-        object->InsertL(0,dataPtr8);
-        CleanupStack::PopAndDestroy(2); //data, data8
-        }
-
-    else if(lastUriSeg.Compare(KNSmlDMEmailUName)==0)
-        {
-
-        HBufC *data = NULL;
-        data = iBuffer->At(index).iSmtpSettings->EmailAlias().AllocLC();
-        HBufC8 *data8 = HBufC8::NewLC(data->Size());
-        TPtr8 dataPtr8 = data8->Des();
-        CnvUtfConverter::ConvertFromUnicodeToUtf8( dataPtr8, data->Des() );
-
-        object->InsertL(0,dataPtr8);
-        CleanupStack::PopAndDestroy(2); //data, data8
-        }
-
-    else if(lastUriSeg.Compare( KNSmlDMEmailMrcv)==0)
-        {
-        HBufC *data = NULL;
-        if(iBuffer->At(index).iPop3Settings!= NULL)
-            {
-            data = iBuffer->At(index).iPop3Settings->ServerAddress().AllocLC();
-            }
-        else if(iBuffer->At(index).iImap4Settings!= NULL)
-            {
-            data = iBuffer->At(index).iImap4Settings->ServerAddress().AllocLC();
-            }
-        else
-        	{
-          	status = CSmlDmAdapter::ENotFound;
-        	}
-        if(data)
-        	{	    
-        		HBufC8 *data8 = HBufC8::NewLC(data->Size());
-        		TPtr8 dataPtr8 = data8->Des();
-        		CnvUtfConverter::ConvertFromUnicodeToUtf8( dataPtr8, data->Des() );
-
-        		object->InsertL(0,dataPtr8);
-        		CleanupStack::PopAndDestroy(2); //data, data8
-        	}
-        }
-
-    else if(lastUriSeg.Compare(KNSmlDMEmailMsnd)==0)
-        {
-        HBufC *data = NULL;
-        data = iBuffer->At(index).iSmtpSettings->ServerAddress().AllocLC();
-        HBufC8 *data8 = HBufC8::NewLC(data->Size());
-        TPtr8 dataPtr8 = data8->Des();
-        CnvUtfConverter::ConvertFromUnicodeToUtf8( dataPtr8, data->Des() );
-
-        object->InsertL(0,dataPtr8);
-        CleanupStack::PopAndDestroy(2); //data, data8
-        }
-
-    else if(lastUriSeg.Compare(KNSmlDMEmailMpro)==0)
-        {
-        if(iBuffer->At(index).iPop3Settings!= NULL)
-            {
-            object->InsertL(0,KNSmlDMEmailMproPOP);
-            }
-        else if(iBuffer->At(index).iImap4Settings!= NULL)
-            {
-            object->InsertL(0,KNSmlDMEmailMproIMAP);
-            }
-        }
-
-    else if(lastUriSeg.Compare(KNSmlDMEmailUseSecCon)==0)
-        {
-        FetchSecurityValueL(*object, &iBuffer->At(index), EUseSecCon );
-        }
-
-    else if(lastUriSeg.Compare(KNSmlDMEmailUseSauth)==0)
-        {
-        if(iBuffer->At(index).iSmtpSettings->SMTPAuth())
-            {
-            object->InsertL(0,KNSmlDMEmailTrue);
-            }
-        else
-            {
-            object->InsertL(0,KNSmlDMEmailFalse);
-            }
-        }
-
-    else if(lastUriSeg.Compare(KNSmlDMEmailSauthUID)==0)
-        {
-        HBufC *data = HBufC::NewLC(iBuffer->At(index).iSmtpSettings->LoginName().Length());
-        data->Des().Copy(iBuffer->At(index).iSmtpSettings->LoginName());
-        HBufC8 *data8 = CnvUtfConverter::ConvertFromUnicodeToUtf8L(*data);
-        CleanupStack::PushL(data8);
-        object->InsertL(0,*data8);
-        CleanupStack::PopAndDestroy(2);//data, data8
-        }
-
-    else if(lastUriSeg.Compare(KNSmlDMEmailSauthPW)==0)
-        {
-        HBufC *data = HBufC::NewLC(iBuffer->At(index).iSmtpSettings->Password().Length());
-        data->Des().Copy(iBuffer->At(index).iSmtpSettings->Password());
-        HBufC8 *data8 = CnvUtfConverter::ConvertFromUnicodeToUtf8L(*data);
-        CleanupStack::PushL(data8);
-        object->InsertL(0,*data8);
-        CleanupStack::PopAndDestroy(2);//data, data8
-        }
-
-    else if(lastUriSeg.Compare(KNSmlDMEmailPtxtSAuth)==0)
-        {
-        if(iBuffer->At(index).iSmtpSettings->InboxLoginDetails())
-            {
-            object->InsertL(0,KNSmlDMEmailTrue);
-            }
-        else
-            {
-            object->InsertL(0,KNSmlDMEmailFalse);
-            }
-        }
-
-    else if (lastUriSeg.Compare(KNSmlDMEmailSUseSecCon)==0)
-        {
-        FetchSecurityValueL(*object, &iBuffer->At(index), ESuseSecCon );
-        }
-
-    else if (lastUriSeg.Compare(KNSmlDMEmailUseStartTLS)==0)
-        {
-        FetchSecurityValueL(*object, &iBuffer->At(index), EUseStartTls );
-        }
-
-    else if (lastUriSeg.Compare(KNSmlDMEmailSUseStartTLS)==0)
-        {
-        FetchSecurityValueL(*object, &iBuffer->At(index), ESuseStartTls );
-        }
-
-    else if(lastUriSeg.Compare(KNSmlDMEmailMrcvPort)==0)
-        {
-        TUint port;
-        if(iBuffer->At(index).iPop3Settings!= NULL)
-            {
-            port = iBuffer->At(index).iPop3Settings->Port();
-            }
-        else 
-            {
-            port = iBuffer->At(index).iImap4Settings->Port();
-            }
-        HBufC8 *data = IntToDes8LC(port);
-        object->InsertL(0,data->Des());
-        CleanupStack::PopAndDestroy(); //data
-        }
-
-    else if(lastUriSeg.Compare(KNSmlDMEmailMsndPort)==0)
-        {
-        TUint port = iBuffer->At(index).iSmtpSettings->Port();
-        HBufC8 *data = IntToDes8LC(port);
-        object->InsertL(0,data->Des());
-        CleanupStack::PopAndDestroy(); //data
-        }
-
-    else if(lastUriSeg.Compare(KNSmlDMEmailUseAPOP)==0)
-        {
-        if(iBuffer->At(index).iPop3Settings!= NULL)
-            {
-            if(iBuffer->At(index).iPop3Settings->Apop())
-                {
-                object->InsertL(0,KNSmlDMEmailTrue);
-                }
-            else
-                {
-                object->InsertL(0,KNSmlDMEmailFalse);
-                }
-            }
-        else
-            {
-            status = CSmlDmAdapter::ENotFound;
-            }
-        }
-
-    else if (lastUriSeg.Compare(KNSmlDMEmailFolderPath)==0)
-        {
-        if(iBuffer->At(index).iImap4Settings)
-            {
-            object->InsertL(0, iBuffer->At(index).iImap4Settings->FolderPath() );
-            }
-        else
-            {
-            status = CSmlDmAdapter::ENotFound;
-            }
-        }
-
-    else if(lastUriSeg.Compare(KNSmlDMEmailToNapID)==0)
-        {
-
-        CNSmlDMIAPMatcher* iapmatch = CNSmlDMIAPMatcher::NewL( &Callback() );
-        CleanupStack::PushL(iapmatch);
-        HBufC8* uri8 = NULL;
-        TInt iapCount = iBuffer->At(index).iIapPref->NumberOfIAPs();
-        if ( iapCount )
-            {
-            TImIAPChoice localIAP = iBuffer->At(index).iIapPref->IAPPreference(0);
-            uri8 = iapmatch->URIFromIAPIdL( localIAP.iIAP );
-            }
-
-        if( uri8 )
-            {
-            CleanupStack::PushL(uri8);
-            object->InsertL(0,uri8->Des());
-            status = CSmlDmAdapter::EOk;
-            CleanupStack::PopAndDestroy(); // uri8
-            }
-        else
-            {
-            status = CSmlDmAdapter::ENotFound;
-            }
-
-        CleanupStack::PopAndDestroy(); // iapMatch
-        }
-    else if(lastUriSeg.Compare(KNSmlDMEmailSToNapID)==0)
-        {
-
-        // SToNapID exists only for SMTP
-        if (iBuffer->At(index).iSmtpSettings!= NULL)
-            {
-            CNSmlDMIAPMatcher* iapmatch = CNSmlDMIAPMatcher::NewL( &Callback() );
-            CleanupStack::PushL(iapmatch);
-            HBufC8* uri8 = NULL;
-            TInt iapCount = iBuffer->At(index).iIapPref->NumberOfIAPs();
-            if ( iapCount )
-                {
-                TImIAPChoice localIAP = iBuffer->At(index).iSmtpIapPref->IAPPreference(0);
-                uri8 = iapmatch->URIFromIAPIdL( localIAP.iIAP );
-                }
-
-            if( uri8 )
-                {
-                CleanupStack::PushL(uri8);
-                object->InsertL(0,uri8->Des());
-                status = CSmlDmAdapter::EOk;
-                CleanupStack::PopAndDestroy(); // uri8
-                }
-            else
-                {
-                status = CSmlDmAdapter::ENotFound;
-                }
-
-            CleanupStack::PopAndDestroy(); // iapMatch
-            }
-        else
-            {
-            status = CSmlDmAdapter::ENotFound;
-            }
-        }
-
-    if(status == CSmlDmAdapter::EOk)
-        {
-        Callback().SetResultsL(aResultsRef,*object,aType);
-        }
-    Callback().SetStatusL(aStatusRef, status);
-    CleanupStack::PopAndDestroy(object); //object
-
-    _DBG_FILE("CNSmlDmEmailAdapter::FetchLeafObjectL(): end");
-    }
-
-// -----------------------------------------------------------------------------
-//  CNSmlDmEmailAdapter::ChildURIListL( const TDesC8& aURI,
-//                                          const TDesC8& aParentLUID,
-//                                          const CArrayFix<TSmlDmMappingInfo>& 
-//                                          aPreviousURISegmentList,
-//                                          const TInt aResultsRef,
-//                                          const TInt aStatusRef  )
-// -----------------------------------------------------------------------------
-void CNSmlDmEmailAdapter::ChildURIListL( const TDesC8& aURI,
-                                         const TDesC8& aParentLUID,
-                                         const CArrayFix<TSmlDmMappingInfo>& 
-                                         aPreviousURISegmentList,
-                                         const TInt aResultsRef,
-                                         const TInt aStatusRef  )
-    {
-    _DBG_FILE("CNSmlDmEmailAdapter::ChildURIListL(): begin");
-
-    CSmlDmAdapter::TError ret = CSmlDmAdapter::EError;
-
-    if( OpenSessionL() != KErrNone )
-        {
-        Callback().SetStatusL(aStatusRef, ret);
-        _DBG_FILE("CNSmlDmEmailAdapter::ChildURIListL(): end");
-        return;
-        }
-    CBufBase *currentList = CBufFlat::NewL(128);
-    CleanupStack::PushL(currentList);
-
-    CEmailAccounts* emailAccs = CEmailAccounts::NewLC();
-
-    if(aURI.Compare(KNSmlDMEmailNodeName)==0)
-        {
-        RArray<TImapAccount> imap4Accounts;
-        CleanupClosePushL( imap4Accounts );
-        emailAccs->GetImapAccountsL(imap4Accounts);
-
-        // First, IMAP accounts
-        //
-        TInt luid;
-        TPtrC8 name;
-        // cycle through every found account
-        for(TInt count = 0; count < imap4Accounts.Count(); count++)
-            {
-            SetLuidById( EImap, imap4Accounts[count].iImapAccountId, luid );
-
-            TBool found = EFalse;
-            // cycle through every known account
-            for(TInt i = 0; i<aPreviousURISegmentList.Count();i++)
-                {
-                // compare if found is known
-                if( luid == DesToInt(aPreviousURISegmentList.At(i).iURISegLUID))
-                    {
-                    found = ETrue;
-                    name.Set(aPreviousURISegmentList.At(i).iURISeg);
-                    break;
-                    }
-                }
-            // if found != known add mapping to it
-            if(!found)
-                {
-                HBufC8 *uri = HBufC8::NewLC(aURI.Length() + 
-                                            KNSmlDMEmailMproIMAP().Length() + 6);
-                                            
-                TPtr8 uriPtr = uri->Des();
-                uriPtr.Format(aURI);
-                uriPtr.Append(KNSmlDMEmailSeparator8);
-                uriPtr.Append(KNSmlDMEmailMproIMAP);
-                TUint16 crc;
-               	Mem::Crc ( crc, &imap4Accounts[count],sizeof(TImapAccount) );
-                HBufC8 *crcBuf = IntToDes8LC(crc);
-                uriPtr.Append(*crcBuf);
-                HBufC8 *luidBuf = IntToDes8LC(luid);
-                Callback().SetMappingL(uriPtr,luidBuf->Des());
-                currentList->InsertL( currentList->Size(),LastURISeg(uriPtr));
-                CleanupStack::PopAndDestroy(3); //uri,luidBuf, crcBuf
-                }
-            else
-                {
-                currentList->InsertL( currentList->Size(),name );
-                }
-            // in all cases: add it to results.
-            if(count < imap4Accounts.Count()-1 )
-                {
-                currentList->InsertL(currentList->Size(),KNSmlDMEmailSeparator8);
-                }
-            }
-        CleanupStack::PopAndDestroy(); //imap4Accounts
-
-        // Then, POP accounts
-        //
-        RArray<TPopAccount> pop3Accounts;
-        CleanupClosePushL( pop3Accounts );
-        emailAccs->GetPopAccountsL( pop3Accounts );
-        if (pop3Accounts.Count()&&currentList->Size()>0)
-            {
-            // there is at least one account; insert separator
-            currentList->InsertL(currentList->Size(),KNSmlDMEmailSeparator8);
-            }
-        // cycle through every found account
-        for(TInt count = 0; count < pop3Accounts.Count(); count++)
-            {
-            SetLuidById( EPop, pop3Accounts[count].iPopAccountId, luid );
-
-            TBool found = EFalse;
-            // cycle through every known account
-            for(TInt i = 0; i<aPreviousURISegmentList.Count();i++)
-                {
-                // compare if found is known
-                if( luid == DesToInt(aPreviousURISegmentList.At(i).iURISegLUID))
-
-                    {
-                    found = ETrue;
-                    name.Set(aPreviousURISegmentList.At(i).iURISeg);
-                    break;
-                    }
-                }
-            // if found != known add mapping to it
-            if(!found)
-                {
-                                         
-                HBufC8 *uri = HBufC8::NewLC(aURI.Length() + 
-                                            KNSmlDMEmailMproPOP().Length() + 5);
-                TPtr8 uriPtr = uri->Des();
-                uriPtr.Format(aURI);
-                uriPtr.Append(KNSmlDMEmailSeparator8);
-                uriPtr.Append(KNSmlDMEmailMproPOP);
-                TUint16 crc;
-               	Mem::Crc ( crc, &pop3Accounts[count],sizeof(TPopAccount) );
-                HBufC8 *crcBuf = IntToDes8LC(crc);
-                uriPtr.Append(*crcBuf);
-                HBufC8 *luidBuf = IntToDes8LC(luid);
-                Callback().SetMappingL(uriPtr,luidBuf->Des());
-                currentList->InsertL( currentList->Size(),LastURISeg(uriPtr));
-                CleanupStack::PopAndDestroy(3); //uri,luidBuf,crcBuf
-                }
-            else
-                {
-                currentList->InsertL( currentList->Size(),name );
-                }
-            // in all cases: add it to results.
-            if(count < pop3Accounts.Count()-1)
-                {
-                currentList->InsertL(currentList->Size(),KNSmlDMEmailSeparator8);
-                }
-            }
-        CleanupStack::PopAndDestroy(); //pop3Accounts
-        ret = CSmlDmAdapter::EOk;
-        }
-    else
-        {
-        if(aParentLUID.Length() > 0)
-            {
-            TInt err = KErrNotFound;
-            TInt luid = DesToInt(aParentLUID);
-            TNSmlEmailAccountType accType;
-            TInt id;
-            GetIdByLuid( accType, id, luid );
-            switch ( accType )
-                {
-            case EImap:
-                {
-                RArray<TImapAccount> imap4Accounts;
-                CleanupClosePushL( imap4Accounts );
-                emailAccs->GetImapAccountsL( imap4Accounts ); 
-                for ( TInt i=0; i<imap4Accounts.Count(); i++ )
-                    {
-                    if ( imap4Accounts[i].iImapAccountId == id )
-                        {
-                        err = KErrNone;
-                        break;
-                        }
-                    }
-                CleanupStack::PopAndDestroy(); //imap4Accounts    
-                break;                
-                }
-            case EPop:
-                {
-                RArray<TPopAccount> pop3Accounts;
-                CleanupClosePushL( pop3Accounts );
-                emailAccs->GetPopAccountsL(pop3Accounts); 
-                for ( TInt i=0; i<pop3Accounts.Count(); i++ )
-                    {
-                    if ( pop3Accounts[i].iPopAccountId == id )
-                        {
-                        err = KErrNone;
-                        break;
-                        }
-                    }
-                CleanupStack::PopAndDestroy(); //pop3Accounts       
-                break;                
-                }
-            default:
-                ret = CSmlDmAdapter::EError;
-                break;
-                }
-            if( err == KErrNotFound )
-                {
-                ret = CSmlDmAdapter::ENotFound;
-                }
-            
-            if ( err == KErrNone )
-                {
-                ret = CSmlDmAdapter::EOk;
-                currentList->InsertL(0,KNSmlDMEmailListOfLeafs);
-                }
-            }
-        else
-            {
-            ret = CSmlDmAdapter::ENotFound;
-            }
-        }
-    // Common part
-    Callback().SetStatusL(aStatusRef, ret);
-    if( ret == CSmlDmAdapter::EOk )
-        {
-        Callback().SetResultsL(aResultsRef,*currentList,KNullDesC8);
-        }
-
-    CleanupStack::PopAndDestroy(emailAccs); //emailAccs
-    CleanupStack::PopAndDestroy(currentList); //currentList
-    _DBG_FILE("CNSmlDmEmailAdapter::ChildURIListL(): end");
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDmEmailAdapter::AddNodeObjectL( const TDesC8& aURI, 
-// const TDesC8& aParentLUID, const TInt aStatusRef )
-// -----------------------------------------------------------------------------
-void CNSmlDmEmailAdapter::AddNodeObjectL( const TDesC8& aURI,
-                                          const TDesC8& aParentLUID,
-                                          const TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlDmEmailAdapter::AddNodeObjectL(): begin");
-
-    if(aParentLUID.Length()>0)
-        {
-        TInt luid = DesToInt(aParentLUID);
-        TInt accId;
-        TNSmlEmailAccountType accType;
-        GetIdByLuid( accType, accId, luid );
-        TInt err = OpenSessionL();
-        if(err!=KErrNone)
-            {
-            Callback().SetStatusL(aStatusRef, CSmlDmAdapter::EError);
-            _DBG_FILE("CNSmlDmEmailAdapter::AddNodeObjectL(): EError end");
-            return;
-            }
-        CEmailAccounts* emailAccs = CEmailAccounts::NewLC();
-        TBool accEx = AccountExistsL( emailAccs, accType, accId, -1 );
-        CleanupStack::PopAndDestroy( emailAccs );
-        if( accEx )
-            {
-            Callback().SetStatusL(aStatusRef, CSmlDmAdapter::EAlreadyExists);
-            _DBG_FILE("CNSmlDmEmailAdapter::AddNodeObjectL(): EAlreadyExists end");
-            return;
-            }
-        else
-            {
-            TInt ret = Callback().RemoveMappingL( KNSmlDMEmailAdapterImplUid, 
-						GetDynamicEmailNodeUri(aURI), ETrue );
-			if(ret != KErrNone)
-				{
-            	Callback().SetStatusL(aStatusRef, CSmlDmAdapter::EError);
-	            _DBG_FILE("CNSmlDmEmailAdapter::AddNodeObjectL(): EError end");
-            	return;
-				}
-            }
-        Callback().SetMappingL(aURI,KNullDesC8);
-        }
-
-    if( aURI.Find(KNSmlDMEmailNodeName)>=0 && NumOfURISegs(aURI)==2 )
-        {
-        if( OpenSessionL() != KErrNone )
-            {
-            Callback().SetStatusL(aStatusRef, CSmlDmAdapter::EError);
-            _DBG_FILE("CNSmlDmEmailAdapter::AddNodeObjectL(): EError end");
-            return;
-            }
-
-        RFs fs;
-        User::LeaveIfError( fs.Connect() );
-        CleanupClosePushL(fs);
-        //2files and 2 folders are needed for settings
-        if (SysUtil::FFSSpaceBelowCriticalLevelL(&fs,
-                                                 KNSmlDmFatMinimumFileSize*4))
-            {
-            CleanupStack::PopAndDestroy(); //fs
-            Callback().SetStatusL(aStatusRef, CSmlDmAdapter::EDiskFull);
-            _DBG_FILE("CNSmlDmEmailAdapter::AddNodeObjectL(): EDiskFull end");
-            return;
-            // do not write
-            }
-        CleanupStack::PopAndDestroy(); //fs
-
-
-        TNSmlEmailSettingsElement newNode;
-        newNode.iMappingName = aURI.AllocLC();
-        newNode.iName = HBufC::NewLC(0);
-        newNode.iNodeBuf = new (ELeave)
-            CArrayFixFlat <TNSmlEmailCommandElement> (KNSmlDmEmailGranularity);
-        newNode.iExecuted = EFalse;
-        newNode.iImap4Settings = NULL;
-        newNode.iPop3Settings = NULL;
-        newNode.iSmtpSettings = NULL;
-        newNode.iIapPref = NULL;
-        newNode.iSmtpIapPref = NULL;
-        newNode.iLuid = 0;
-        newNode.iJustFetch=EFalse;
-        iBuffer->AppendL(newNode);
-        CleanupStack::Pop(2); //newNode.iMappingName,newNode.iName
-        TNSmlEmailCommandElement newCommand;
-        newCommand.iLastUriSeg = LastURISeg(aURI).AllocLC(); //aURI.AllocLC();
-        newCommand.iData = NULL;
-        newCommand.iStatusRef = aStatusRef;
-        newCommand.iLeaf = EFalse;
-        newCommand.iStatus = CSmlDmAdapter::EOk;
-        TInt index = iBuffer->Count() - 1;
-        iBuffer->At(index).iNodeBuf->AppendL(newCommand);
-        CleanupStack::Pop(); //newCommand.iLastUriSeg
-
-
-        }
-    _DBG_FILE("CNSmlDmEmailAdapter::AddNodeObjectL(): end");
-    }
-// -----------------------------------------------------------------------------
-// CNSmlDmEmailAdapter::UpdateLeafObjectL( const TDesC8& aURI,
-// const TDesC8& aLUID, RWriteStream*& aStream, const TDesC8& aType,
-// const TInt aStatusRef )
-// This should update a stream object, but in case of Email settings streaming 
-// is not supported.
-// -----------------------------------------------------------------------------
-void CNSmlDmEmailAdapter::UpdateLeafObjectL( const TDesC8& /*aURI*/,
-                                             const TDesC8& /*aLUID*/,
-                                             RWriteStream*& /*aStream*/,
-                                             const TDesC8& /*aType*/,
-                                             const TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlDmEmailAdapter::UpdateLeafObjectL(stream): begin");
-    Callback().SetStatusL(aStatusRef, CSmlDmAdapter::EError);
-    _DBG_FILE("CNSmlDmEmailAdapter::UpdateLeafObjectL(stream): end");
-    }
-// -----------------------------------------------------------------------------
-// void CNSmlDmEmailAdapter::FetchLeafObjectSizeL( const TDesC8& aURI,
-// const TDesC8& aLUID, const TDesC8& aType, const TInt aResultsRef,
-// const TInt aStatusRef )
-// Fetches data object and returns its size.
-// -----------------------------------------------------------------------------
-void CNSmlDmEmailAdapter::FetchLeafObjectSizeL( const TDesC8& aURI,
-                                                const TDesC8& aLUID,
-                                                const TDesC8& aType,
-                                                const TInt aResultsRef,
-                                                const TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlDmEmailAdapter::FetchLeafObjectSizeL(): begin");
-
-    CBufBase *result = CBufFlat::NewL(32);
-    CleanupStack::PushL(result);
-    CSmlDmAdapter::TError status = FetchObjectL(aURI, aLUID, *result);
-    if( status == CSmlDmAdapter::EOk )
-        {
-        TInt objSizeInBytes = result->Size();
-        TBuf8<4> stringObjSizeInBytes;
-        stringObjSizeInBytes.Num( objSizeInBytes );
-        result->Reset();
-        result->InsertL( 0, stringObjSizeInBytes );
-        Callback().SetResultsL(aResultsRef, *result, aType);
-        }
-    Callback().SetStatusL(aStatusRef, status);
-    CleanupStack::PopAndDestroy(); //result
-    _DBG_FILE("CNSmlDmEmailAdapter::FetchLeafObjectSizeL(): end");
-    }
-// -----------------------------------------------------------------------------
-// CNSmlDmEmailAdapter::ExecuteCommandL()
-// -----------------------------------------------------------------------------
-void CNSmlDmEmailAdapter::ExecuteCommandL( const TDesC8& /*aURI*/,
-                                           const TDesC8& /*aLUID*/,
-                                           const TDesC8& /*aArgument*/,
-                                           const TDesC8& /*aType*/,
-                                           const TInt aStatusRef )
-    {
-    //Not supported
-    _DBG_FILE("CNSmlDmEmailAdapter::ExecuteCommandL(): begin");
-    Callback().SetStatusL(aStatusRef, CSmlDmAdapter::EError);
-    _DBG_FILE("CNSmlDmEmailAdapter::ExecuteCommandL(): end");
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDmEmailAdapter::ExecuteCommandL()
-// -----------------------------------------------------------------------------
-void CNSmlDmEmailAdapter::ExecuteCommandL( const TDesC8& /*aURI*/,
-                                           const TDesC8& /*aLUID*/,
-                                           RWriteStream*& /*aStream*/,
-                                           const TDesC8& /*aType*/,
-                                           const TInt aStatusRef )
-    {
-    //Not supported
-    _DBG_FILE("CNSmlDmEmailAdapter::ExecuteCommandL(): begin");
-    Callback().SetStatusL(aStatusRef, CSmlDmAdapter::EError);
-    _DBG_FILE("CNSmlDmEmailAdapter::ExecuteCommandL(): end");
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDmEmailAdapter::CopyCommandL()
-// -----------------------------------------------------------------------------
-void CNSmlDmEmailAdapter::CopyCommandL( const TDesC8& /*aTargetURI*/,
-                                        const TDesC8& /*aTargetLUID*/,
-                                        const TDesC8& /*aSourceURI*/,
-                                        const TDesC8& /*aSourceLUID*/,
-                                        const TDesC8& /*aType*/,
-                                        TInt aStatusRef )
-    {
-    //Not supported
-    _DBG_FILE("CNSmlDmEmailAdapter::CopyCommandL(): begin");
-    Callback().SetStatusL(aStatusRef, CSmlDmAdapter::EError);
-    _DBG_FILE("CNSmlDmEmailAdapter::CopyCommandL(): end");
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDmEmailAdapter::StartAtomicL()
-// -----------------------------------------------------------------------------
-void CNSmlDmEmailAdapter::StartAtomicL()
-    {
-    //Not supported
-    _DBG_FILE("CNSmlDmEmailAdapter::StartAtomicL(): begin");
-    _DBG_FILE("CNSmlDmEmailAdapter::StartAtomicL(): end");
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDmEmailAdapter::CommitAtomicL()
-// -----------------------------------------------------------------------------
-void CNSmlDmEmailAdapter::CommitAtomicL()
-    {
-    //Not supported
-    _DBG_FILE("CNSmlDmEmailAdapter::CommitAtomicL(): begin");
-    _DBG_FILE("CNSmlDmEmailAdapter::CommitAtomicL(): end");
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDmEmailAdapter::RollbackAtomicL()
-// -----------------------------------------------------------------------------
-void CNSmlDmEmailAdapter::RollbackAtomicL()
-    {
-    //Not supported
-    _DBG_FILE("CNSmlDmEmailAdapter::RollbackAtomicL(): begin");
-    _DBG_FILE("CNSmlDmEmailAdapter::RollbackAtomicL(): end");
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDmEmailAdapter::StreamingSupport()
-// -----------------------------------------------------------------------------
-TBool CNSmlDmEmailAdapter::StreamingSupport( TInt& /*aItemSize*/ )
-    {
-    _DBG_FILE("CNSmlDmEmailAdapter::StreamingSupport(): begin");
-    _DBG_FILE("CNSmlDmEmailAdapter::StreamingSupport(): end");
-    return EFalse;
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDmEmailAdapter::StreamCommittedL()
-// -----------------------------------------------------------------------------
-void CNSmlDmEmailAdapter::StreamCommittedL()
-    {
-    //Not supported
-    _DBG_FILE("CNSmlDmEmailAdapter::StreamCommittedL(): begin");
-    _DBG_FILE("CNSmlDmEmailAdapter::StreamCommittedL(): end");
-    }
-// -----------------------------------------------------------------------------
-// CNSmlDmEmailAdapter::CompleteOutstandingCmdsL()
-// Indication of message ending. The buffered commands must be executed
-// before return of this function.
-// -----------------------------------------------------------------------------
-void CNSmlDmEmailAdapter::CompleteOutstandingCmdsL()
-    {
-    _DBG_FILE("CNSmlDmEmailAdapter::CompleteOutstandingCmdsL(): begin");
-
-    for(TInt i=0;i<iBuffer->Count();i++)
-        {
-
-        //Set buffered port values
-        for(TInt cmd=0;cmd<iBuffer->At(i).iNodeBuf->Count();cmd++)
-            {
-            
-            TNSmlEmailSettingsElement& bufElem = iBuffer->At(i);
-            TNSmlEmailCommandElement& elem = bufElem.iNodeBuf->At(cmd);
-
-            if(elem.iLastUriSeg->Compare(KNSmlDMEmailMrcvPort)==0)
-                {
-                TUint port = DesToInt(*elem.iData);
-                
-                if(port>0 && port <= KNSmlDMEmailMaxPortNbr)
-                    {
-                    if(bufElem.iPop3Settings!= NULL)
-                        {
-                        bufElem.iPop3Settings->SetPort(port);
-                        }
-                    else if(bufElem.iImap4Settings!= NULL)
-                        {
-                        bufElem.iImap4Settings->SetPort(port);
-                        }
-                    }
-                else
-                    {
-                    elem.iStatus = CSmlDmAdapter::EInvalidObject;
-                    }
-                }
-            else if(elem.iLastUriSeg->Compare(KNSmlDMEmailMsndPort)==0)
-                {
-                TUint port = DesToInt(*elem.iData);
-                
-                if(port>0 && port <= KNSmlDMEmailMaxPortNbr)
-                    {
-                    bufElem.iSmtpSettings->SetPort(port);
-                    }
-                else
-                    {
-                    elem.iStatus = CSmlDmAdapter::EInvalidObject;
-                    }
-                }
-                if((iBuffer->At(i).iSmtpSettings->LoginName()==KNullDesC8) && elem.iLastUriSeg->Compare(KNSmlDMEmailUID)==0)
-              	{
-                	elem.iStatus = CSmlDmAdapter::EError;
-        	      }
-           }
-        
-
-        CSmlDmAdapter::TError stat = CSmlDmAdapter::EOk;
-        TInt luid=-1;
-        
-        if(iBuffer->At(i).iExecuted)
-            {
-            TRAPD( leaveCode,luid = ValidateAndStoreSettingsL(i) );
-            if(leaveCode!=KErrNone)
-                {
-                stat = CSmlDmAdapter::EError;
-                }
-            }
-        else
-            {
-            stat = CSmlDmAdapter::EError;
-            }
-
-        for(TInt cmd=0;cmd<iBuffer->At(i).iNodeBuf->Count();cmd++)
-            {
-
-            if(iBuffer->At(i).iNodeBuf->At(cmd).iStatus==CSmlDmAdapter::EOk)
-                {
-                Callback().SetStatusL(iBuffer->At(i).iNodeBuf->At(cmd).iStatusRef,
-                                      stat);
-                if(!iBuffer->At(i).iNodeBuf->At(cmd).iLeaf)
-                    {
-                    if(stat==CSmlDmAdapter::EOk)
-                        {
-                        HBufC8* luidDes = IntToDes8LC(luid);
-                        Callback().SetMappingL( iBuffer->At(i).iMappingName->Des(),
-                                                luidDes->Des() );
-                        CleanupStack::PopAndDestroy(); //luidDes
-                        }
-                    }
-                }
-            else
-                {
-                Callback().SetStatusL(iBuffer->At(i).iNodeBuf->At(cmd).iStatusRef,
-                                      iBuffer->At(i).iNodeBuf->At(cmd).iStatus);
-                }
-
-            delete iBuffer->At(i).iNodeBuf->At(cmd).iLastUriSeg;
-            iBuffer->At(i).iNodeBuf->At(cmd).iLastUriSeg= NULL;
-            delete iBuffer->At(i).iNodeBuf->At(cmd).iData;
-            iBuffer->At(i).iNodeBuf->At(cmd).iData= NULL;
-
-            }
-        iBuffer->At(i).iNodeBuf->Reset();
-        delete iBuffer->At(i).iNodeBuf;
-        iBuffer->At(i).iNodeBuf = NULL;
-        delete iBuffer->At(i).iMappingName;
-        iBuffer->At(i).iMappingName= NULL;
-        delete iBuffer->At(i).iName;
-        iBuffer->At(i).iName= NULL;
-        delete iBuffer->At(i).iSmtpSettings;
-        iBuffer->At(i).iSmtpSettings= NULL;
-        delete iBuffer->At(i).iPop3Settings;
-        iBuffer->At(i).iPop3Settings= NULL;
-        delete iBuffer->At(i).iImap4Settings;
-        iBuffer->At(i).iImap4Settings= NULL;
-        delete iBuffer->At(i).iIapPref;
-        iBuffer->At(i).iIapPref= NULL;
-        delete iBuffer->At(i).iSmtpIapPref;
-        iBuffer->At(i).iSmtpIapPref= NULL;
-
-        } // end for
-    iBuffer->Reset();
-
-    _DBG_FILE("CNSmlDmEmailAdapter::CompleteOutstandingCmdsL(): end");
-    }
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-
-#ifndef IMPLEMENTATION_PROXY_ENTRY
-#define IMPLEMENTATION_PROXY_ENTRY(aUid, aFuncPtr)  {{aUid},(aFuncPtr)}
-#endif
-
-const TImplementationProxy ImplementationTable[] =
-    {
-    IMPLEMENTATION_PROXY_ENTRY(KNSmlDMEmailAdapterImplUid, 
-                               CNSmlDmEmailAdapter::NewL)
-    };
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy( TInt& aTableCount )
-    {
-    _DBG_FILE("ImplementationGroupProxy() for CNSmlDmEmailAdapter: begin");
-    aTableCount = sizeof(ImplementationTable) / sizeof(TImplementationProxy);
-    _DBG_FILE("ImplementationGroupProxy() for CNSmlDmEmailAdapter: end");
-    return ImplementationTable;
-    }
-
-
-
-// -----------------------------------------------------------------------------
-// TPtrC8 CNSmlDmEmailAdapter::LastURISeg(const TDesC8& aURI)
-// Returns only the last uri segemnt
-// -----------------------------------------------------------------------------
-TPtrC8 CNSmlDmEmailAdapter::LastURISeg(const TDesC8& aURI) const
-    {
-    _DBG_FILE("CNSmlDmEmailAdapter::LastURISeg() : begin");
-    TInt i;
-    for(i=aURI.Length()-1;i>=0;i--)
-        {
-        if(aURI[i]=='/')
-            {
-            break;
-            }
-        }
-    _DBG_FILE("CNSmlDmEmailAdapter::LastURISeg() : end");
-    if(i==0)
-        {
-        return aURI;
-        }
-    else
-        {
-        return aURI.Mid(i+1);
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// TPtrC8 CNSmlDmEmailAdapter::RemoveLastURISeg(const TDesC8& aURI)
-// returns parent uri, i.e. removes last uri segment
-// -----------------------------------------------------------------------------
-TPtrC8 CNSmlDmEmailAdapter::RemoveLastURISeg(const TDesC8& aURI) const
-    {
-    TInt i;
-    for(i=aURI.Length()-1;i>=0;i--)
-        {
-        if(aURI[i]=='/')
-            {
-            break;
-            }
-        }
-    return aURI.Left(i);
-    }
-
-
-
-// -----------------------------------------------------------------------------
-// TInt CNSmlDmEmailAdapter::NumOfURISegs(const TDesC8& aURI)
-// Returns the num of uri segs
-// -----------------------------------------------------------------------------
-TInt CNSmlDmEmailAdapter::NumOfURISegs(const TDesC8& aURI) const
-    {
-    TInt numOfURISegs = 1;
-    for(TInt i=0;i<aURI.Length();i++)
-        {
-        if(aURI[i]=='/')
-            {
-            numOfURISegs++;
-            }
-        }
-    return numOfURISegs;
-    }
-
-
-
-// -----------------------------------------------------------------------------
-// void CNSmlDmEmailAdapter::HandleSessionEventL( TMsvSessionEvent /*aEvent*/,
-//                                               TAny* /*aArg1*/,
-//                                               TAny* /*aArg2*/,
-//                                               TAny* /*aArg3*/ )
-// -----------------------------------------------------------------------------
-void CNSmlDmEmailAdapter::HandleSessionEventL( TMsvSessionEvent /*aEvent*/,
-                                               TAny* /*aArg1*/,
-                                               TAny* /*aArg2*/,
-                                               TAny* /*aArg3*/ )
-    {
-    _DBG_FILE("CNSmlDmEmailAdapter::HandleSessionEventL(): begin");
-    _DBG_FILE("CNSmlDmEmailAdapter::HandleSessionEventL(): end");
-    }
-
-
-// -----------------------------------------------------------------------------
-// TInt CNSmlDmEmailAdapter::DesToInt(const TDesC& aLuid) const
-// Converts 16bit descriptor to int
-// -----------------------------------------------------------------------------
-TInt CNSmlDmEmailAdapter::DesToInt(const TDesC& aLuid) const
-    {
-    TLex16 lex(aLuid);
-    TInt value = 0;
-    lex.Val(value);
-    return value;
-    }
-
-// -----------------------------------------------------------------------------
-// TInt CNSmlDmEmailAdapter::DesToInt(const TDesC8& aLuid) const
-// Converts 8bit descriptor to int
-// -----------------------------------------------------------------------------
-TInt CNSmlDmEmailAdapter::DesToInt(const TDesC8& aLuid) const
-    {
-    TLex8 lex(aLuid);
-    TInt value = 0;
-    lex.Val(value);
-    return value;
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDmEmailAdapter::FirstAddLeafL()
-// -----------------------------------------------------------------------------
-TInt CNSmlDmEmailAdapter::FirstAddLeafL(const TDesC8& aURI, 
-                                        const TDesC8& aObject,
-                                        TInt aStatusRef,
-                                        TInt aIndex)
-    {
-    _DBG_FILE("CNSmlDmEmailAdapter::FirstAddLeafL() :: begin");
-
-    TPtrC8 lastSeg = LastURISeg(aURI);
-
-    TNSmlEmailCommandElement newCommand;
-    newCommand.iLastUriSeg = lastSeg.AllocLC();
-    newCommand.iData = aObject.AllocLC();
-    newCommand.iStatusRef = aStatusRef;
-    newCommand.iLeaf = ETrue;
-    newCommand.iStatus = CSmlDmAdapter::EOk;
-    iBuffer->At(aIndex).iNodeBuf->AppendL(newCommand);
-    CleanupStack::Pop(2); //newCommand.iLastUriSeg, newCommand.iData
-    if(!iBuffer->At(aIndex).iExecuted)
-        {
-        if(lastSeg.Compare(KNSmlDMEmailMpro)==0)
-            {
-            TBool ok = EFalse;
-            HBufC8* object = aObject.AllocLC();
-            TPtr8 objectPtr = object->Des();
-            objectPtr.UpperCase();
-
-            if(objectPtr.Find(KNSmlDMEmailMproPOP) >= 0)
-                {
-                iBuffer->At(aIndex).iPop3Settings = new(ELeave) CImPop3Settings;
-                ok=ETrue;
-                }
-
-            else if(objectPtr.Find(KNSmlDMEmailMproIMAP) >= 0)
-                {
-                iBuffer->At(aIndex).iImap4Settings = new(ELeave) CImImap4Settings;
-                ok=ETrue;
-                }
-            if(ok)
-                {
-                iBuffer->At(aIndex).iSmtpSettings = new(ELeave) CImSmtpSettings;
-                iBuffer->At(aIndex).iIapPref = CImIAPPreferences::NewLC();
-                iBuffer->At(aIndex).iSmtpIapPref = CImIAPPreferences::NewLC();
-                CleanupStack::Pop(); //iBuffer->At(index).iIapPref
-                CleanupStack::Pop(); //iBuffer->At(index).iSmtpIapPref
-                SetDefaultSettingsL(aIndex);
-
-                for(TInt i = 0; i<iBuffer->At(aIndex).iNodeBuf->Count();i++)
-                    {
-                    if(iBuffer->At(aIndex).iNodeBuf->At(i).iLeaf)
-                        {
-                        DoAddLeafObjectL(iBuffer->At(aIndex).iNodeBuf->At(i).iLastUriSeg->Des(),
-                                         iBuffer->At(aIndex).iNodeBuf->At(i).iData->Des(),
-                                         aIndex, i);
-                        }
-                    }
-
-                iBuffer->At(aIndex).iExecuted = ETrue;
-                }
-            CleanupStack::PopAndDestroy(); //object
-            }
-        }
-    else
-        {
-        DoAddLeafObjectL(lastSeg,aObject,aIndex,
-                         iBuffer->At(aIndex).iNodeBuf->Count()-1);
-        }
-
-    _DBG_FILE("CNSmlDmEmailAdapter::FirstAddLeafL() :: end");
-    return KErrNone;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CNSmlDmEmailAdapter::DoAddLeafObjectL
-// -----------------------------------------------------------------------------
-TInt CNSmlDmEmailAdapter::DoAddLeafObjectL(const TDesC8& aLastUriSeg,
-                                           const TDesC8& aObject,
-                                           TInt aIndex,
-                                           TInt aCommand)
-    {
-    _DBG_FILE("CNSmlDmEmailAdapter::DoAddLeafObjectL() :: begin");
-    if(aLastUriSeg.Compare(KNSmlDMEmailName)==0)
-        {
-        if ( aObject.Size() < KEmailAccountNameSize )
-            {
-            delete iBuffer->At(aIndex).iName;
-            iBuffer->At(aIndex).iName = NULL;
-            iBuffer->At(aIndex).iName = HBufC::NewL(aObject.Size());
-            TPtr namePtr = iBuffer->At(aIndex).iName->Des();
-            CnvUtfConverter::ConvertToUnicodeFromUtf8( namePtr, aObject );
-            }
-        else 
-            {
-            iBuffer->At(aIndex).iNodeBuf->At(aCommand).iStatus = 
-                CSmlDmAdapter::ETooLargeObject;
-            }
-        }
-
-    else if(aLastUriSeg.Compare(KNSmlDMEmailUID)==0)
-        {
-        if(iBuffer->At(aIndex).iPop3Settings!= NULL)
-            {
-            iBuffer->At(aIndex).iPop3Settings->SetLoginNameL(aObject);
-            }
-        else if(iBuffer->At(aIndex).iImap4Settings!= NULL)
-            {
-            iBuffer->At(aIndex).iImap4Settings->SetLoginNameL(aObject);
-            }
-        if(iBuffer->At(aIndex).iSmtpSettings->LoginName()==KNullDesC8)
-            {
-            iBuffer->At(aIndex).iSmtpSettings->SetLoginNameL(aObject);
-            }
-        }
-
-    else if(aLastUriSeg.Compare(KNSmlDMEmailPW)==0)
-        {
-        if(iBuffer->At(aIndex).iPop3Settings!= NULL)
-            {
-            iBuffer->At(aIndex).iPop3Settings->SetPasswordL(aObject);
-            }
-        else if(iBuffer->At(aIndex).iImap4Settings!= NULL)
-            {
-            iBuffer->At(aIndex).iImap4Settings->SetPasswordL(aObject);
-            }
-        if(iBuffer->At(aIndex).iSmtpSettings->Password()==KNullDesC8)
-            {
-            iBuffer->At(aIndex).iSmtpSettings->SetPasswordL(aObject);
-            }
-        }
-
-    else if(aLastUriSeg.Compare(KNSmlDMEmailUAddr)==0)
-        {
-        HBufC *object = HBufC::NewLC(aObject.Size());
-        TPtr objectPtr = object->Des();
-        CnvUtfConverter::ConvertToUnicodeFromUtf8( objectPtr, aObject );
-        if(iBuffer->At(aIndex).iSmtpSettings!= NULL)
-            {
-            iBuffer->At(aIndex).iSmtpSettings->SetEmailAddressL(objectPtr);
-            iBuffer->At(aIndex).iSmtpSettings->SetReplyToAddressL(objectPtr);
-            iBuffer->At(aIndex).iSmtpSettings->SetReceiptAddressL(objectPtr);
-            }
-
-        CleanupStack::PopAndDestroy(); //object
-        }
-
-    else if(aLastUriSeg.Compare(KNSmlDMEmailUName)==0)
-        {
-        HBufC *object = HBufC::NewLC(aObject.Size());
-        TPtr objectPtr = object->Des();
-        CnvUtfConverter::ConvertToUnicodeFromUtf8( objectPtr, aObject );
-        if(iBuffer->At(aIndex).iSmtpSettings!= NULL)
-            {
-            iBuffer->At(aIndex).iSmtpSettings->SetEmailAliasL(objectPtr);
-            }
-        CleanupStack::PopAndDestroy(); //object
-        }
-
-    else if(aLastUriSeg.Compare( KNSmlDMEmailMrcv)==0)
-        {
-        HBufC *object = HBufC::NewLC(aObject.Size());
-        TPtr objectPtr = object->Des();
-        CnvUtfConverter::ConvertToUnicodeFromUtf8( objectPtr, aObject );
-        if(iBuffer->At(aIndex).iPop3Settings!= NULL)
-            {
-            iBuffer->At(aIndex).iPop3Settings->SetServerAddressL(objectPtr);
-            }
-        else if(iBuffer->At(aIndex).iImap4Settings!= NULL)
-            {
-            iBuffer->At(aIndex).iImap4Settings->SetServerAddressL(objectPtr);
-            }
-        CleanupStack::PopAndDestroy(); //object
-        }
-
-    else if(aLastUriSeg.Compare(KNSmlDMEmailMsnd)==0)
-        {
-        HBufC *object = HBufC::NewLC(aObject.Size());
-        TPtr objectPtr = object->Des();
-        CnvUtfConverter::ConvertToUnicodeFromUtf8( objectPtr, aObject );
-        if(iBuffer->At(aIndex).iSmtpSettings!= NULL)
-            {
-            iBuffer->At(aIndex).iSmtpSettings->SetServerAddressL(objectPtr);
-            }
-        CleanupStack::PopAndDestroy(); //object
-        }
-
-    else if(aLastUriSeg.Compare(KNSmlDMEmailMpro)==0)
-        {
-        iBuffer->At(aIndex).iNodeBuf->At(aCommand).iStatus = CSmlDmAdapter::EOk;
-        }
-
-    else if(aLastUriSeg.Compare(KNSmlDMEmailUseSecCon)==0)
-        {
-        SetDefaultSecurityL(aObject, &iBuffer->At(aIndex), EUseSecCon );
-        }
-
-    else if(aLastUriSeg.Compare(KNSmlDMEmailUseSauth)==0)
-        {
-        HBufC8 *data = aObject.AllocLC();
-        TPtr8 dataPtr = data->Des();
-        dataPtr.Capitalize();
-        TBool object=EFalse;
-        if(dataPtr.Find(KNSmlDMEmailTrue)>=0)
-            {
-            object = ETrue;
-            }
-        if(iBuffer->At(aIndex).iSmtpSettings!= NULL)
-            {
-            iBuffer->At(aIndex).iSmtpSettings->SetSMTPAuth(object);
-            }
-        CleanupStack::PopAndDestroy(); //data
-        }
-
-    else if(aLastUriSeg.Compare(KNSmlDMEmailSauthUID)==0)
-        {
-        if( iBuffer->At(aIndex).iSmtpSettings )
-            {
-            iBuffer->At(aIndex).iSmtpSettings->SetLoginNameL(aObject);
-            }
-        }
-
-    else if(aLastUriSeg.Compare(KNSmlDMEmailSauthPW)==0)
-        {
-        if( iBuffer->At(aIndex).iSmtpSettings )
-            {
-            iBuffer->At(aIndex).iSmtpSettings->SetPasswordL( aObject );
-            }
-        }
-
-    else if(aLastUriSeg.Compare(KNSmlDMEmailPtxtSAuth)==0)
-        {
-        HBufC8 *data = aObject.AllocLC();
-        TPtr8 dataPtr = data->Des();
-        dataPtr.Capitalize();
-        TBool object=EFalse;
-        if(dataPtr.Find(KNSmlDMEmailTrue)>=0)
-            {
-            object = ETrue;
-            }
-        if(iBuffer->At(aIndex).iSmtpSettings!= NULL)
-            {
-            iBuffer->At(aIndex).iSmtpSettings->SetInboxLoginDetails(object);
-            }
-        CleanupStack::PopAndDestroy(); //data
-        }
-
-    else if(aLastUriSeg.Compare(KNSmlDMEmailSUseSecCon)==0)
-        {
-        SetDefaultSecurityL(aObject, &iBuffer->At(aIndex), ESuseSecCon );
-        }
-
-    else if(aLastUriSeg.Compare(KNSmlDMEmailUseStartTLS)==0)
-        {
-        SetDefaultSecurityL(aObject, &iBuffer->At(aIndex), EUseStartTls );
-        }
-
-    else if(aLastUriSeg.Compare(KNSmlDMEmailSUseStartTLS)==0)
-        {
-        SetDefaultSecurityL(aObject, &iBuffer->At(aIndex), ESuseStartTls );
-        }
-
-    else if(aLastUriSeg.Compare(KNSmlDMEmailMrcvPort)==0)
-        {
-        TNSmlEmailSettingsElement& bufElem = iBuffer->At(aIndex);
-        TNSmlEmailCommandElement& elem = bufElem.iNodeBuf->At(aCommand);
-        elem.iData = aObject.AllocL();
-        }
-
-    else if(aLastUriSeg.Compare(KNSmlDMEmailMsndPort)==0)
-        {
-        TNSmlEmailSettingsElement& bufElem = iBuffer->At(aIndex);
-        TNSmlEmailCommandElement& elem = bufElem.iNodeBuf->At(aCommand);
-        elem.iData = aObject.AllocL();
-        }
-
-    else if(aLastUriSeg.Compare(KNSmlDMEmailUseAPOP)==0)
-        {
-        TBool object=EFalse;
-        if(aObject.Find(_L8("True"))>=0 || aObject.Find(_L8("true"))>=0)
-            {
-            object = ETrue;
-            }
-        if(iBuffer->At(aIndex).iPop3Settings!= NULL)
-            {
-            iBuffer->At(aIndex).iPop3Settings->SetApop(object);
-            }
-        }
-
-    else if(aLastUriSeg.Compare(KNSmlDMEmailFolderPath)==0)
-        {
-        if(iBuffer->At(aIndex).iImap4Settings!= NULL)
-            {
-            iBuffer->At(aIndex).iImap4Settings->SetFolderPathL(aObject);
-            }
-        }
-
-    else if(aLastUriSeg.Compare(KNSmlDMEmailToNapID)==0)
-        {
-        CNSmlDMIAPMatcher* iapmatch = CNSmlDMIAPMatcher::NewL( &Callback() );
-        CleanupStack::PushL(iapmatch);
-
-        TInt iap = iapmatch->IAPIdFromURIL( aObject );
-
-        if ( iap != KErrNotFound )
-            {
-            TImIAPChoice localIAP;
-            localIAP.iIAP = iap;
-            DBG_ARGS(_S("IAP = %d"), localIAP.iIAP);
-            localIAP.iDialogPref = ECommDbDialogPrefDoNotPrompt;
-
-            if ( iBuffer->At(aIndex).iSmtpIapPref->NumberOfIAPs() )
-                {
-                iBuffer->At(aIndex).iIapPref->RemoveIAPL(0);
-                }
-            iBuffer->At(aIndex).iIapPref->AddIAPL(localIAP,0);
-            if (iBuffer->At(aIndex).iSmtpSettings!= NULL)
-                {
-                if ( iBuffer->At(aIndex).iSmtpIapPref->NumberOfIAPs() )
-                    {
-                    iBuffer->At(aIndex).iSmtpIapPref->RemoveIAPL(0);
-                    }
-                iBuffer->At(aIndex).iSmtpIapPref->AddIAPL(localIAP,0);
-                }
-            }
-        else
-            {
-            iBuffer->At(aIndex).iNodeBuf->At(aCommand).iStatus = CSmlDmAdapter::ENotFound;
-            }
-
-        CleanupStack::PopAndDestroy(); // iapmatch
-        }
-
-    else if(aLastUriSeg.Compare(KNSmlDMEmailSToNapID)==0)
-        {
-        CNSmlDMIAPMatcher* iapmatch = CNSmlDMIAPMatcher::NewL( &Callback() );
-        CleanupStack::PushL(iapmatch);
-
-        TInt iap = iapmatch->IAPIdFromURIL( aObject );
-
-        if ( iap != KErrNotFound )
-            {
-            TImIAPChoice localIAP;
-            localIAP.iIAP = iap;
-            DBG_ARGS(_S("SMTP IAP = %d"), localIAP.iIAP);
-            localIAP.iDialogPref = ECommDbDialogPrefDoNotPrompt;
-            if ( iBuffer->At(aIndex).iSmtpSettings!= NULL )
-                {
-                if ( iBuffer->At(aIndex).iSmtpIapPref->NumberOfIAPs() )
-                    {
-                    iBuffer->At(aIndex).iSmtpIapPref->RemoveIAPL(0);
-                    }
-                iBuffer->At(aIndex).iSmtpIapPref->AddIAPL(localIAP,0);
-                }
-            else
-                {
-                iBuffer->At(aIndex).iNodeBuf->At(aCommand).iStatus =
-                    CSmlDmAdapter::ENotFound;
-                }
-            }
-        else
-            {
-            iBuffer->At(aIndex).iNodeBuf->At(aCommand).iStatus =
-                CSmlDmAdapter::ENotFound;
-            }
-
-        CleanupStack::PopAndDestroy(); // iapmatch
-        }
-    _DBG_FILE("CNSmlDmEmailAdapter::DoAddLeafObjectL() :: end");
-    return KErrNone;
-    }
-
-
-// -----------------------------------------------------------------------------
-// void CNSmlDmEmailAdapter::SetDefaultSettingsL(TInt aIndex)
-// Set defaults for used protocol
-// -----------------------------------------------------------------------------
-void CNSmlDmEmailAdapter::SetDefaultSettingsL(TInt aIndex)
-    {
-    _DBG_FILE("CNSmlDmEmailAdapter::SetDefaultSettingsL() :: begin");
-    TNSmlEmailSettingsElement& thisElem = iBuffer->At(aIndex);
-    CEmailAccounts* emailAccs = CEmailAccounts::NewLC();
-    if( thisElem.iPop3Settings )
-        {
-          
-        emailAccs->PopulateDefaultPopSettingsL(*thisElem.iPop3Settings,
-                                               *thisElem.iIapPref
-                                               );
-        emailAccs->PopulateDefaultSmtpSettingsL(*thisElem.iSmtpSettings,
-                                                *thisElem.iSmtpIapPref 
-                                               );
-                                               
-        thisElem.iPop3Settings->SetDeleteEmailsWhenDisconnecting( EFalse ); 
-        thisElem.iPop3Settings->SetInboxSynchronisationLimit( KNSmlDMEmailDefaultHeaderCount );
-        thisElem.iPop3Settings->SetSecureSockets( EFalse );
-        thisElem.iPop3Settings->SetAutoSendOnConnect( ETrue );
-        thisElem.iPop3Settings->SetDisconnectedUserMode( ETrue );
-        thisElem.iPop3Settings->SetAcknowledgeReceipts( EFalse );                                
-        }
-    else if( thisElem.iImap4Settings )
-        {
-        
-        emailAccs->PopulateDefaultImapSettingsL(*thisElem.iImap4Settings,
-                                                *thisElem.iIapPref 
-                                                );
-
-        emailAccs->PopulateDefaultSmtpSettingsL(*thisElem.iSmtpSettings,
-                                                *thisElem.iSmtpIapPref 
-                                               );
-                                                
-        thisElem.iImap4Settings->SetDeleteEmailsWhenDisconnecting( EFalse );
-        thisElem.iImap4Settings->SetInboxSynchronisationLimit( KNSmlDMEmailDefaultHeaderCount );
-        thisElem.iImap4Settings->SetMailboxSynchronisationLimit( KNSmlDMEmailDefaultHeaderCount );
-        thisElem.iImap4Settings->SetSecureSockets( EFalse );
-        thisElem.iImap4Settings->SetAutoSendOnConnect( ETrue );
-        thisElem.iImap4Settings->SetDisconnectedUserMode( ETrue );
-        thisElem.iImap4Settings->SetImapIdle( ETrue );
-        thisElem.iImap4Settings->SetUpdatingSeenFlags( ETrue );
-        }
-    thisElem.iSmtpSettings->SetLoginNameL(KNullDesC8);
-    thisElem.iSmtpSettings->SetPasswordL(KNullDesC8);
-    // Set IAP id to 0 and ask from user if ToNapID/SToNapID not sent
-    TImIAPChoice tmpIap;
-    tmpIap.iIAP = KNSmlDmEmailAlwaysAskIap;
-    tmpIap.iDialogPref = ECommDbDialogPrefPrompt;
-    thisElem.iIapPref->AddIAPL( tmpIap, 0 );
-    thisElem.iSmtpIapPref->AddIAPL( tmpIap, 0 );
-    CleanupStack::PopAndDestroy(); //emailAccs
-    _DBG_FILE("CNSmlDmEmailAdapter::SetDefaultSettingsL() :: end");
-    }
-
-// -----------------------------------------------------------------------------
-// HBufC* CNSmlDmEmailAdapter::IntToDesLC(const TInt aLuid) const
-// Converts integer to 16bit descriptor
-// -----------------------------------------------------------------------------
-HBufC* CNSmlDmEmailAdapter::IntToDesLC(const TInt aLuid) const
-    {
-    HBufC* buf = HBufC::NewLC(10); //10 = max length of 32bit integer
-    TPtr ptrBuf = buf->Des();
-    ptrBuf.Num(aLuid);
-    return buf;
-    }
-
-// -----------------------------------------------------------------------------
-// HBufC8* CNSmlDmEmailAdapter::IntToDes8LC(const TInt aLuid) const
-// Converts integer to 8bit descriptor
-// -----------------------------------------------------------------------------
-HBufC8* CNSmlDmEmailAdapter::IntToDes8LC(const TInt aLuid) const
-    {
-    HBufC8* buf = HBufC8::NewLC(10); //10 = max length of 32bit integer
-    TPtr8 ptrBuf = buf->Des();
-    ptrBuf.Num(aLuid);
-    return buf;
-    }
-   
-// -----------------------------------------------------------------------------
-//      CNSmlDmEmailAdapter::ConvertTo8LC()
-//      Converts string value to 8-bit
-//      
-// -----------------------------------------------------------------------------
-HBufC8* CNSmlDmEmailAdapter::ConvertTo8LC( const TDesC& aSource ) const
-    {
-    HBufC8* buf = HBufC8::NewLC( aSource.Length()*2);
-    TPtr8 bufPtr = buf->Des();
-    CnvUtfConverter::ConvertFromUnicodeToUtf8( bufPtr, aSource );
-
-    return buf;
-    }
-
-// -----------------------------------------------------------------------------
-// TInt CNSmlDmEmailAdapter::ValidateAndStoreSettingsL(TInt aIndex
-// Transfers the email settings from memory to phones permanent data store
-// -----------------------------------------------------------------------------
-TInt CNSmlDmEmailAdapter::ValidateAndStoreSettingsL(TInt aIndex)
-    {
-    _DBG_FILE("CNSmlDmEmailAdapter::ValidateAndStoreSettingsL() : begin");
-    TInt luid = 0;
-
-    TNSmlEmailSettingsElement& thisElem = iBuffer->At(aIndex);
-
-    if( iBuffer->At( aIndex ).iJustFetch )
-        {
-        _DBG_FILE("CNSmlDmEmailAdapter::ValidateAndStoreSettingsL() : end");
-        return luid;
-        }
-    CEmailAccounts* emailAccs = CEmailAccounts::NewLC();
-    if( iBuffer->At( aIndex ).iLuid != 0 )
-        {
-        switch ( thisElem.iAccType )
-            {
-        case EPop:
-            {
-            TPopAccount accId;
-            emailAccs->GetPopAccountL( thisElem.iServiceId, accId ); 
-            //Copy name field
-            accId.iPopAccountName.Copy(thisElem.iName->Des());
-            emailAccs->SavePopSettingsL( accId, *thisElem.iPop3Settings );
-	        emailAccs->SavePopIapSettingsL( accId, *thisElem.iIapPref );            
-            TSmtpAccount smtpAcc;
-	        emailAccs->GetSmtpAccountL( accId.iSmtpService, smtpAcc ); 
-	        //Copy name field
-	        smtpAcc.iSmtpAccountName.Copy(thisElem.iName->Des());
-	        emailAccs->SaveSmtpSettingsL( smtpAcc, *thisElem.iSmtpSettings );
-	        emailAccs->SaveSmtpIapSettingsL( smtpAcc, *thisElem.iSmtpIapPref );
-            break;            
-            }
-        case EImap:
-            {
-            TImapAccount accId2;
-    	    emailAccs->GetImapAccountL( thisElem.iServiceId, accId2 );
-    	    //Copy name field
-    	    accId2.iImapAccountName.Copy(thisElem.iName->Des());
-            emailAccs->SaveImapSettingsL( accId2, *thisElem.iImap4Settings );
-	        emailAccs->SaveImapIapSettingsL( accId2, *thisElem.iIapPref );
-            TSmtpAccount smtpAccForImap;
-	        emailAccs->GetSmtpAccountL( accId2.iSmtpService, smtpAccForImap );
-	        //Copy name field
-	        smtpAccForImap.iSmtpAccountName.Copy(thisElem.iName->Des()); 
-	        emailAccs->SaveSmtpSettingsL( smtpAccForImap, *thisElem.iSmtpSettings );
-	        emailAccs->SaveSmtpIapSettingsL( smtpAccForImap, *thisElem.iSmtpIapPref );
-            break;            
-            }
-        default:
-
-            break;
-            }
-        }
-    else // if(iBuffer->At(aIndex).iLuid != 0)
-        {
-        RTelServer telServer;
-        User::LeaveIfError( telServer.Connect() );
-        CleanupClosePushL(telServer);
-
-        TInt numPhones = 0;
-        User::LeaveIfError( telServer.EnumeratePhones( numPhones ) );
-        if ( numPhones < 1 )
-            {
-            User::Leave( KErrNotFound );
-            }
-
-        RTelServer::TPhoneInfo info;
-        User::LeaveIfError( telServer.GetPhoneInfo( 0, info ) );
-        RMobilePhone mobilePhone;
-        User::LeaveIfError( mobilePhone.Open( telServer, info.iName ) );
-        CleanupClosePushL( mobilePhone );
-        TRequestStatus status;
-        RMobilePhone::TMobilePhoneIdentityV1 mobilePhoneIdentity;
-        mobilePhone.GetPhoneId( status, mobilePhoneIdentity );
-        User::WaitForRequest( status );
-        User::LeaveIfError( status.Int() );
-        TBuf<50> imei;            
-        imei.Copy( mobilePhoneIdentity.iSerialNumber );
-        
-        CleanupStack::PopAndDestroy(&mobilePhone);
-        CleanupStack::PopAndDestroy(&telServer);
-        if ( thisElem.iPop3Settings )
-            {
-            TPopAccount accId;
-            accId = emailAccs->CreatePopAccountL( *thisElem.iName, 
-                                                  *thisElem.iPop3Settings, 
-                                                  *thisElem.iIapPref, 
-                                                  EFalse );
-
-    	    TSmtpAccount smtpAcc = emailAccs->CreateSmtpAccountL( accId, 
-    	                                                          *thisElem.iSmtpSettings, 
-                                                                  *thisElem.iSmtpIapPref, 
-                                                                  EFalse );
-            TMsvEntry smtpEntry;
-            TMsvEntry popEntry;
-            CMsvEntry* entry = iMsvSession->GetEntryL(smtpAcc.iSmtpService);
-            CleanupStack::PushL(entry);
-            smtpEntry = entry->Entry();
-            smtpEntry.iMtmData2 =  smtpAcc.iSmtpAccountId;
-            smtpEntry.iDescription.Set( imei );
-	        entry->ChangeL(smtpEntry);
-            CleanupStack::PopAndDestroy(entry);
-
-            entry = iMsvSession->GetEntryL(smtpAcc.iRelatedService);
-            CleanupStack::PushL(entry);
-            popEntry = entry->Entry();
-            popEntry.iMtmData2 =  accId.iPopAccountId;          
-            popEntry.iDescription.Set( imei );
-	        entry->ChangeL(popEntry);
-            CleanupStack::PopAndDestroy(entry);
-
-            if ( accId.iSmtpService != smtpAcc.iSmtpService || smtpAcc.iRelatedService != accId.iPopService )
-                {
-                DBG_ARGS8(_S8("ERROR!!! PopAccount creation: iSmtpService=%d, smtpAcc.iSmtpService=%d, iRelatedService=%d, iPopService=%d"),
-                                accId.iSmtpService, smtpAcc.iSmtpService, smtpAcc.iRelatedService, accId.iPopService );
-                }                                                               
-            
-            thisElem.iAccType = EPop;
-            thisElem.iAccId = accId.iPopAccountId;
-            SetLuidById( thisElem.iAccType, thisElem.iAccId, thisElem.iLuid );
-
-			  RArray<TPopAccount> popAccs;
-              CleanupClosePushL( popAccs );
-              emailAccs->GetPopAccountsL( popAccs );
-              
-			  RArray<TImapAccount> imapAccs;
-              CleanupClosePushL( imapAccs );
-              emailAccs->GetImapAccountsL( imapAccs );
-              
-              if ( popAccs.Count() == 1 && !imapAccs.Count())
-                 {
-                  emailAccs->SetDefaultSmtpAccountL( smtpAcc );
-                 }
-              
-              CleanupStack::PopAndDestroy( &imapAccs );          
-			  CleanupStack::PopAndDestroy( &popAccs );          
-            // Check and set the default account
-	        TSmtpAccount defSmtp;
-	        TInt retVal = emailAccs->DefaultSmtpAccountL( defSmtp );
-	        if (  retVal != KErrNone )
-	            {
-                RArray<TPopAccount> popAccounts;
-                CleanupClosePushL( popAccounts );
-                emailAccs->GetPopAccountsL( popAccounts );
-                if ( popAccounts.Count() > 0 )
-                    {
-                    TSmtpAccount relatedSmtp;
-                    emailAccs->GetSmtpAccountL( popAccounts[0].iSmtpService, relatedSmtp );
-	                emailAccs->SetDefaultSmtpAccountL( relatedSmtp );
-                    }
-                CleanupStack::PopAndDestroy( &popAccounts );
-	            }	                
-            }
-        else if ( thisElem.iImap4Settings )
-            {
-            TImapAccount accId2;
-            accId2 = emailAccs->CreateImapAccountL(*thisElem.iName, 
-                                                   *thisElem.iImap4Settings, 
-                                                   *thisElem.iIapPref,
-                                                   EFalse);
-
-    	    TSmtpAccount smtpAcc = emailAccs->CreateSmtpAccountL( accId2, 
-    	                                                          *thisElem.iSmtpSettings, 
-                                                                  *thisElem.iSmtpIapPref, 
-                                                                  EFalse );
-            
-            TMsvEntry smtpEntry;
-            TMsvEntry imapEntry;
-            CMsvEntry* entry = iMsvSession->GetEntryL(smtpAcc.iSmtpService);
-            CleanupStack::PushL(entry);
-            smtpEntry = entry->Entry();
-            smtpEntry.iMtmData2 =  smtpAcc.iSmtpAccountId;          
-            smtpEntry.iDescription.Set( imei );
-	        entry->ChangeL(smtpEntry);
-            CleanupStack::PopAndDestroy(entry);
-
-            entry = iMsvSession->GetEntryL(smtpAcc.iRelatedService);
-            CleanupStack::PushL(entry);
-            imapEntry = entry->Entry();
-            imapEntry.iMtmData2 =  accId2.iImapAccountId;          
-            imapEntry.iDescription.Set( imei );
-	        entry->ChangeL(imapEntry);
-            CleanupStack::PopAndDestroy(entry);
-
-            if ( accId2.iSmtpService != smtpAcc.iSmtpService || smtpAcc.iRelatedService != accId2.iImapService )
-                {
-                DBG_ARGS8(_S8("ERROR!!! ImapAccount creation: iSmtpService=%d, smtpAcc.iSmtpService=%d, iRelatedService=%d, iImapService=%d"),
-                                accId2.iSmtpService, smtpAcc.iSmtpService, smtpAcc.iRelatedService, accId2.iImapService );
-                }
-                                                                  
-                                                   
-            thisElem.iAccType = EImap;
-            thisElem.iAccId = accId2.iImapAccountId;
-            SetLuidById( thisElem.iAccType, thisElem.iAccId, thisElem.iLuid );
-
-            // Check and set the default account
-            RArray<TPopAccount> popAccs;
-            CleanupClosePushL( popAccs );
-            emailAccs->GetPopAccountsL( popAccs );
-              
-			RArray<TImapAccount> imapAccs;
-            CleanupClosePushL( imapAccs );
-            emailAccs->GetImapAccountsL( imapAccs );
-              
-            if ( imapAccs.Count() == 1 && !popAccs.Count())
-            	{
-                emailAccs->SetDefaultSmtpAccountL( smtpAcc );
-                }
-              
-            CleanupStack::PopAndDestroy( &imapAccs );          
-			CleanupStack::PopAndDestroy( &popAccs );
-	        TSmtpAccount defaultSmtp;
-	        TInt retVal = emailAccs->DefaultSmtpAccountL( defaultSmtp );
-	        if (  retVal != KErrNone )
-	            {
-                RArray<TImapAccount> imapAccs;
-                CleanupClosePushL( imapAccs );
-                emailAccs->GetImapAccountsL( imapAccs );
-                if ( imapAccs.Count() > 0 )
-                    {
-                    TSmtpAccount relatedSmtp;
-                    emailAccs->GetSmtpAccountL( imapAccs[0].iSmtpService, relatedSmtp );
-	                emailAccs->SetDefaultSmtpAccountL( relatedSmtp );
-                    }
-                CleanupStack::PopAndDestroy( &imapAccs );
-	            }	                
-            }
-
-        }
-    luid = thisElem.iLuid;
-    CleanupStack::PopAndDestroy(); //emailAccs
-    _DBG_FILE("CNSmlDmEmailAdapter::ValidateAndStoreSettingsL() : end");
-    return luid;
-    }
-// -----------------------------------------------------------------------------
-// void CNSmlDmEmailAdapter::GetIdByLuid( TNSmlEmailAccountType& aAccType,
-//                                           TInt& aAccId, 
-//                                       const TInt aLuid ) const
-// Calculates the account type and id on basis of luid
-// -----------------------------------------------------------------------------
-void CNSmlDmEmailAdapter::GetIdByLuid( TNSmlEmailAccountType& aAccType,
-                                       TInt& aAccId, 
-                                       const TInt aLuid ) const
-    {
-    if ( ( aLuid > KNSmlDmEmailImapLuidLow ) && 
-         ( aLuid < KNSmlDmEmailImapLuidHigh ) )
-        {
-        aAccType = EImap;
-        aAccId = aLuid - KNSmlDmEmailImapLuidLow;
-        }
-    else if (( aLuid > KNSmlDmEmailImapLuidHigh ) && 
-             ( aLuid < KNSmlDmEmailPopLuidHigh ))
-        {
-        aAccType = EPop;
-        aAccId = aLuid - KNSmlDmEmailImapLuidHigh;
-        }
-    else
-        {
-        aAccType = EUnknown;
-        }
-
-    }
-
-
-// -----------------------------------------------------------------------------
-// void CNSmlDmEmailAdapter::SetLuidById( const TNSmlEmailAccountType& aAccType,
-// const TInt& aAccId, TInt& aLuid ) const
-// Sets the luid on basis of account type and id
-// -----------------------------------------------------------------------------
-void CNSmlDmEmailAdapter::SetLuidById( const TNSmlEmailAccountType& aAccType,
-                                       const TInt& aAccId, TInt& aLuid ) const
-    {
-    switch (aAccType)
-        {
-    case EImap :
-        aLuid = KNSmlDmEmailImapLuidLow + aAccId;
-        break;
-
-    case EPop :
-        aLuid = KNSmlDmEmailImapLuidHigh + aAccId;
-        break;
-
-    default :
-        aLuid = -1;
-        break;
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// TBool CNSmlDmEmailAdapter::AccountExistsL( const CEmailAccounts* aAccs, 
-//                                          const TNSmlEmailAccountType aAccType, 
-//                                          const TInt aId,
-//                                          TInt aIndex )
-// Checks if the accout matching the given parameters is found. 
-// returns True if found.
-// -----------------------------------------------------------------------------
-TBool CNSmlDmEmailAdapter::AccountExistsL( CEmailAccounts* aAccs, 
-                                           const TNSmlEmailAccountType aAccType, 
-                                           const TInt aId,
-                                           TInt aIndex )
-    {
-    RArray<TImapAccount> imap4Accs;
-    CleanupClosePushL( imap4Accs );
-    RArray<TPopAccount> pop3Accs;
-    CleanupClosePushL( pop3Accs );
-    switch ( aAccType )
-        {
-    case EImap:
-        aAccs->GetImapAccountsL(imap4Accs);
-        for(TInt i=0;i<imap4Accs.Count();i++)
-            {
-            if ( imap4Accs[i].iImapAccountId == aId )
-                {
-                
-                if ( aIndex >= 0 )
-                    {
-                    iBuffer->At(aIndex).iServiceId = imap4Accs[i].iImapService;
-                    delete iBuffer->At(aIndex).iName;
-                    iBuffer->At(aIndex).iName = NULL;
-                    iBuffer->At(aIndex).iName = HBufC::NewL(imap4Accs[i].iImapAccountName.Size());
-                    *iBuffer->At(aIndex).iName = imap4Accs[i].iImapAccountName;
-                    }
-                CleanupStack::PopAndDestroy(2); //imap4Accs, pop3Accs
-                return ETrue;
-                }
-            }
-        break;
-        
-    case EPop:
-        aAccs->GetPopAccountsL(pop3Accs);
-        for(TInt i=0;i<pop3Accs.Count();i++)
-            {
-            if ( pop3Accs[i].iPopAccountId == aId )
-                {
-                if ( aIndex >= 0 )
-                    {
-                    iBuffer->At(aIndex).iServiceId = pop3Accs[i].iPopService;                    
-                    delete iBuffer->At(aIndex).iName;
-                    iBuffer->At(aIndex).iName = NULL;
-                    iBuffer->At(aIndex).iName = HBufC::NewL(pop3Accs[i].iPopAccountName.Size());
-                    *iBuffer->At(aIndex).iName = pop3Accs[i].iPopAccountName;
-                    }
-                CleanupStack::PopAndDestroy(2); //imap4Accs, pop3Accs
-                return ETrue;
-                }
-            }
-        break;
-    default:
-        // Returns EFalse in this case.
-        break;
-        }
-    CleanupStack::PopAndDestroy(2); //imap4Accs, pop3Accs
-    return EFalse;
-    }
-
-// -----------------------------------------------------------------------------
-// TInt CNSmlDmEmailAdapter::DoRestoreSettingsL(TInt aIndex)
-// Restores the settings to the adapter from settings store
-// -----------------------------------------------------------------------------
-TInt CNSmlDmEmailAdapter::DoRestoreSettingsL(TInt aIndex)
-    {
-    _DBG_FILE("CNSmlDmEmailAdapter::DoRestoreSettingsL() : begin");
-    TNSmlEmailSettingsElement& thisElem = iBuffer->At(aIndex);
-
-    CEmailAccounts* emailAccs = CEmailAccounts::NewLC();
-    TInt err = KErrNone;
-
-    // These are destroyed latest at destructor
-    thisElem.iSmtpSettings = new (ELeave) CImSmtpSettings;
-    thisElem.iIapPref = CImIAPPreferences::NewLC();
-    thisElem.iSmtpIapPref = CImIAPPreferences::NewLC();
-
-    switch( thisElem.iAccType )
-        {
-    case EImap:
-        if (AccountExistsL(emailAccs, thisElem.iAccType, thisElem.iAccId, aIndex ))
-            {
-            TImapAccount imapAccId;
-            
-            thisElem.iImap4Settings = new(ELeave) CImImap4Settings;
-            
-            //Get IMAP account by iAccId id
-            emailAccs->GetImapAccountL(thisElem.iServiceId, imapAccId);
-            //Get IMAP settings by account id
-            emailAccs->LoadImapSettingsL( imapAccId, *thisElem.iImap4Settings );
-            //Get IMAP settings IAP prefs
-            emailAccs->LoadImapIapSettingsL( imapAccId, *thisElem.iIapPref );
-            
-            TSmtpAccount smtpAccount;
-            //Get smtp account by related IMAP id
-            emailAccs->GetSmtpAccountL( imapAccId.iSmtpService, smtpAccount );  
-            //Get smtp settings by IMAP id                                        
-            emailAccs->LoadSmtpSettingsL( smtpAccount, *thisElem.iSmtpSettings );
-            //Get Smtp settings IAP prefs
-            emailAccs->LoadSmtpIapSettingsL( smtpAccount, *thisElem.iSmtpIapPref );
-            }
-        else
-            {
-            err = KErrNotFound;
-            }
-        break;
-
-    case EPop:
-        if (AccountExistsL(emailAccs, thisElem.iAccType, thisElem.iAccId, aIndex ))
-            {
-            TPopAccount popAccId;
-            
-            thisElem.iPop3Settings = new(ELeave) CImPop3Settings;
-            
-            //Get POP3 account by iAccId id
-            emailAccs->GetPopAccountL( thisElem.iServiceId, popAccId );
-            //Get POP3 settings by account id
-            emailAccs->LoadPopSettingsL( popAccId, *thisElem.iPop3Settings );
-            //Get POP3 setting IAP prefs
-            emailAccs->LoadPopIapSettingsL( popAccId, *thisElem.iIapPref );
-                        
-            TSmtpAccount smtpAccount;
-            //Get smtp account by related POP id
-            emailAccs->GetSmtpAccountL( popAccId.iSmtpService, smtpAccount );  
-            //Get smtp settings                                        
-            emailAccs->LoadSmtpSettingsL( smtpAccount, *thisElem.iSmtpSettings );
-            //Get Smtp setting IAP prefs
-            emailAccs->LoadSmtpIapSettingsL( smtpAccount, *thisElem.iSmtpIapPref );
-            }
-        else
-            {
-            err = KErrNotFound;
-            }
-        break;
-
-    default:
-        err = KErrNotFound;
-        break;
-        }
-
-    if ( err )
-        {
-        _DBG_FILE("CNSmlDmEmailAdapter::DoRestoreSettingsL() : \
-         KErrNotFound end");
-        CleanupStack::PopAndDestroy(2); // iIapPref, iSmtpIapPref
-        CleanupStack::PopAndDestroy(emailAccs); //emailAccs
-        return KErrNotFound;
-        }
-
-    CleanupStack::Pop(2); // iIapPref, iSmtpIapPref
-    CleanupStack::PopAndDestroy(emailAccs); //emailAccs
-    _DBG_FILE("CNSmlDmEmailAdapter::DoRestoreSettingsL() : end");
-    return KErrNone;
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDmEmailAdapter::OpenSessionL()
-// Opens the CMsvSession if it is not open already
-// -----------------------------------------------------------------------------
-TInt CNSmlDmEmailAdapter::OpenSessionL()
-    {
-    _DBG_FILE("CNSmlDmEmailAdapter::OpenSessionL() : begin");
-    if(!iMsvSession)
-        {
-        TRAPD(err, iMsvSession = CMsvSession::OpenSyncL(*this));
-        _DBG_FILE("CNSmlDmEmailAdapter::OpenSessionL() : end");
-        return err;
-        }
-
-    _DBG_FILE("CNSmlDmEmailAdapter::OpenSessionL() : end");
-    return KErrNone;
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDmEmailAdapter::FillNodeInfoL()
-// Fills the node info in ddf structure
-// -----------------------------------------------------------------------------
-void CNSmlDmEmailAdapter::FillNodeInfoL( MSmlDmDDFObject& aNode,
-                                         const TSmlDmAccessTypes& aAccTypes,
-                                         MSmlDmDDFObject::TOccurence aOccurrence,
-                                         MSmlDmDDFObject::TScope aScope,
-                                         MSmlDmDDFObject::TDFFormat aFormat,
-                                         const TDesC8& aDescription) const
-    {
-    aNode.SetAccessTypesL(aAccTypes);
-    aNode.SetOccurenceL(aOccurrence);
-    aNode.SetScopeL(aScope);
-    aNode.SetDFFormatL(aFormat);
-    if(aFormat!=MSmlDmDDFObject::ENode)
-        {
-        aNode.AddDFTypeMimeTypeL(KNSmlDMEmailTextPlain);
-        }
-    aNode.SetDescriptionL(aDescription);
-
-    }
-
-// -----------------------------------------------------------------------------
-// TPtrC8 CNSmlDmEmailAdapter::RemoveDotSlash(const TDesC8& aURI)
-// return uri without dot and slash in start
-// -----------------------------------------------------------------------------
-TPtrC8 CNSmlDmEmailAdapter::RemoveDotSlash(const TDesC8& aURI) const
-    {
-    if(aURI.Find(KNSmlEmailUriDotSlash)==0)
-        {
-        return aURI.Right(aURI.Length()-KNSmlEmailUriDotSlash().Length());
-        }
-    else
-        {
-        return aURI;
-        }
-    }
-// -----------------------------------------------------------------------------
-// CSmlDmAdapter::TError CNSmlDmEmailAdapter::FetchObjectL(const TDesC8& aURI,
-// const TDesC8& aLUID, CBufBase& aObject)
-// Fetches object acording to URI & LUID. Retur codes acording to 
-// CSmlDmAdapter::TError.
-// -----------------------------------------------------------------------------
-CSmlDmAdapter::TError CNSmlDmEmailAdapter::FetchObjectL(const TDesC8& aURI,
-                                                        const TDesC8& aLUID,
-                                                        CBufBase& aObject)
-    {
-    _DBG_FILE("CNSmlDmEmailAdapter::FetchObjectL() : begin");
-    CSmlDmAdapter::TError status = EOk;
-    if(aLUID.Length()==0)
-        {
-        _DBG_FILE("CNSmlDmEmailAdapter::FetchObjectL() : ENotFound end");
-        return CSmlDmAdapter::ENotFound;
-        }
-    if( OpenSessionL() != KErrNone )
-        {
-        _DBG_FILE("CNSmlDmEmailAdapter::FetchObjectL() : EError end");
-        return CSmlDmAdapter::EError;
-        }
-    TInt luid = DesToInt(aLUID);
-    TInt index  = -1;
-    for(TInt i=0;i<iBuffer->Count();i++)
-        {
-        if(iBuffer->At(i).iLuid == luid)
-            {
-            index = i;
-            break;
-            }
-        }
-
-    if(index<0)
-        {
-        TNSmlEmailSettingsElement newNode;
-        newNode.iImap4Settings = NULL;
-        newNode.iPop3Settings = NULL;
-        newNode.iSmtpSettings = NULL;
-        newNode.iIapPref = NULL;
-        newNode.iLuid = luid;
-        newNode.iMappingName = aURI.AllocLC();
-        newNode.iName = HBufC::NewLC(0);
-        newNode.iNodeBuf = new (ELeave)
-            CArrayFixFlat <TNSmlEmailCommandElement> (KNSmlDmEmailGranularity);
-        newNode.iExecuted = ETrue;
-        newNode.iJustFetch = ETrue;
-        GetIdByLuid(newNode.iAccType, newNode.iAccId, luid);
-        iBuffer->AppendL(newNode);
-        index = iBuffer->Count() - 1;
-        if(DoRestoreSettingsL(index)!=KErrNone)
-            {
-            CleanupStack::Pop(2); //newNode.iMappingName,newNode.iName
-            _DBG_FILE("CNSmlDmEmailAdapter::FetchObjectL() : EError end");
-            return CSmlDmAdapter::EError;
-            }
-        CleanupStack::Pop(2); //newNode.iMappingName,newNode.iName
-        }
-
-    TPtrC8 lastUriSeg = LastURISeg(aURI);
-
-    if(lastUriSeg.Compare(KNSmlDMEmailName)==0)
-        {
-        HBufC8 *data = HBufC8::NewLC(iBuffer->At(index).iName->Length());
-        TPtr8 dataPtr = data->Des();
-        CnvUtfConverter::ConvertFromUnicodeToUtf8( dataPtr, iBuffer->At(index).iName->Des() );
-        aObject.InsertL(0,dataPtr);
-        CleanupStack::PopAndDestroy(); //data
-        }
-    else if(lastUriSeg.Compare(KNSmlDMEmailUID)==0)
-        {
-        HBufC *data = NULL;
-        if(iBuffer->At(index).iPop3Settings!= NULL)
-            {
-            data = HBufC::NewLC(iBuffer->At(index).iPop3Settings->LoginName().Length());
-            data->Des().Copy(iBuffer->At(index).iPop3Settings->LoginName());
-            }
-        else if(iBuffer->At(index).iImap4Settings!= NULL)
-            {
-            data = HBufC::NewLC(iBuffer->At(index).iImap4Settings->LoginName().Length());
-            data->Des().Copy(iBuffer->At(index).iImap4Settings->LoginName());
-            }
-        if(data)
-            {
-            HBufC8 *data8 = CnvUtfConverter::ConvertFromUnicodeToUtf8L(*data);
-            CleanupStack::PushL(data8);
-            aObject.InsertL(0,*data8);
-            CleanupStack::PopAndDestroy(2);//data, data8
-            }
-        }
-    else if(lastUriSeg.Compare(KNSmlDMEmailPW)==0)
-        {
-        HBufC *data = NULL;
-        if(iBuffer->At(index).iPop3Settings!= NULL)
-            {
-            data = HBufC::NewLC(iBuffer->At(index).iPop3Settings->Password().Length());
-            data->Des().Copy(iBuffer->At(index).iPop3Settings->Password());
-            }
-        else if(iBuffer->At(index).iImap4Settings!= NULL)
-            {
-            data = HBufC::NewLC(iBuffer->At(index).iImap4Settings->Password().Length());
-            data->Des().Copy(iBuffer->At(index).iImap4Settings->Password());
-            }
-        if(data)
-            {
-            HBufC8 *data8 = CnvUtfConverter::ConvertFromUnicodeToUtf8L(*data);
-            CleanupStack::PushL(data8);
-            aObject.InsertL(0,*data8);
-            CleanupStack::PopAndDestroy(2);//data, data8
-            }
-        }
-    else if(lastUriSeg.Compare(KNSmlDMEmailUAddr)==0)
-        {
-        HBufC *data = NULL;
-        data = iBuffer->At(index).iSmtpSettings->EmailAddress().AllocLC();
-        HBufC8 *data8 = HBufC8::NewLC(data->Size());
-        TPtr8 dataPtr8 = data8->Des();
-        CnvUtfConverter::ConvertFromUnicodeToUtf8( dataPtr8, data->Des() );
-
-        aObject.InsertL(0,dataPtr8);
-        CleanupStack::PopAndDestroy(2); //data, data8
-        }
-    else if(lastUriSeg.Compare(KNSmlDMEmailUName)==0)
-        {
-
-        HBufC *data = NULL;
-        data = iBuffer->At(index).iSmtpSettings->EmailAlias().AllocLC();
-        HBufC8 *data8 = HBufC8::NewLC(data->Size());
-        TPtr8 dataPtr8 = data8->Des();
-        CnvUtfConverter::ConvertFromUnicodeToUtf8( dataPtr8, data->Des() );
-
-        aObject.InsertL(0,dataPtr8);
-        CleanupStack::PopAndDestroy(2); //data, data8
-        }
-
-    else if(lastUriSeg.Compare( KNSmlDMEmailMrcv)==0)
-        {
-        HBufC *data = NULL;
-        if(iBuffer->At(index).iPop3Settings!= NULL)
-            {
-            data = iBuffer->At(index).iPop3Settings->ServerAddress().AllocLC();
-            }
-        else if(iBuffer->At(index).iImap4Settings!= NULL)
-            {
-            data = iBuffer->At(index).iImap4Settings->ServerAddress().AllocLC();
-            }
-        else
-        	{
-          	status = CSmlDmAdapter::ENotFound;
-          	return status;            
-        	}
-        HBufC8 *data8 = HBufC8::NewLC(data->Size());
-        TPtr8 dataPtr8 = data8->Des();
-        CnvUtfConverter::ConvertFromUnicodeToUtf8( dataPtr8, data->Des() );
-
-        aObject.InsertL(0,dataPtr8);
-        CleanupStack::PopAndDestroy(2); //data, data8
-        }
-    else if(lastUriSeg.Compare(KNSmlDMEmailMsnd)==0)
-        {
-        HBufC *data = NULL;
-        data = iBuffer->At(index).iSmtpSettings->ServerAddress().AllocLC();
-        HBufC8 *data8 = HBufC8::NewLC(data->Size());
-        TPtr8 dataPtr8 = data8->Des();
-        CnvUtfConverter::ConvertFromUnicodeToUtf8( dataPtr8, data->Des() );
-
-        aObject.InsertL(0,dataPtr8);
-        CleanupStack::PopAndDestroy(2); //data, data8
-        }
-    else if(lastUriSeg.Compare(KNSmlDMEmailMpro)==0)
-        {
-        if(iBuffer->At(index).iPop3Settings!= NULL)
-            {
-            aObject.InsertL(0,KNSmlDMEmailMproPOP);
-            }
-        else if(iBuffer->At(index).iImap4Settings!= NULL)
-            {
-            aObject.InsertL(0,KNSmlDMEmailMproIMAP);
-            }
-        }
-    else if(lastUriSeg.Compare(KNSmlDMEmailUseSecCon)==0)
-        {
-        FetchSecurityValueL(aObject, &iBuffer->At(index), EUseSecCon );
-        }
-
-    else if(lastUriSeg.Compare(KNSmlDMEmailUseSauth)==0)
-        {
-        if(iBuffer->At(index).iSmtpSettings->SMTPAuth())
-            {
-            aObject.InsertL(0,KNSmlDMEmailTrue);
-            }
-        else
-            {
-            aObject.InsertL(0,KNSmlDMEmailFalse);
-            }
-        }
-    else if(lastUriSeg.Compare(KNSmlDMEmailSauthUID)==0)
-        {
-        HBufC *data = HBufC::NewLC(iBuffer->At(index).iSmtpSettings->LoginName().Length());
-        data->Des().Copy(iBuffer->At(index).iSmtpSettings->LoginName());
-        HBufC8 *data8 = CnvUtfConverter::ConvertFromUnicodeToUtf8L(*data);
-        CleanupStack::PushL(data8);
-        aObject.InsertL(0,*data8);
-        CleanupStack::PopAndDestroy(2);//data, data8
-        }
-    else if(lastUriSeg.Compare(KNSmlDMEmailSauthPW)==0)
-        {
-        HBufC *data = HBufC::NewLC(iBuffer->At(index).iSmtpSettings->Password().Length());
-        data->Des().Copy(iBuffer->At(index).iSmtpSettings->Password());
-        HBufC8 *data8 = CnvUtfConverter::ConvertFromUnicodeToUtf8L(*data);
-        CleanupStack::PushL(data8);
-        aObject.InsertL(0,*data8);
-        CleanupStack::PopAndDestroy(2);//data, data8
-        }
-    else if(lastUriSeg.Compare(KNSmlDMEmailPtxtSAuth)==0)
-        {
-        if(iBuffer->At(index).iSmtpSettings->InboxLoginDetails())
-            {
-            aObject.InsertL(0,KNSmlDMEmailTrue);
-            }
-        else
-            {
-            aObject.InsertL(0,KNSmlDMEmailFalse);
-            }
-        }
-
-    else if (lastUriSeg.Compare(KNSmlDMEmailSUseSecCon)==0)
-        {
-        FetchSecurityValueL(aObject, &iBuffer->At(index), ESuseSecCon );
-        }
-
-    else if (lastUriSeg.Compare(KNSmlDMEmailUseStartTLS)==0)
-        {
-        FetchSecurityValueL(aObject, &iBuffer->At(index), EUseStartTls );
-        }
-
-    else if (lastUriSeg.Compare(KNSmlDMEmailSUseStartTLS)==0)
-        {
-        FetchSecurityValueL(aObject, &iBuffer->At(index), ESuseStartTls );
-        }
-
-    else if(lastUriSeg.Compare(KNSmlDMEmailMrcvPort)==0)
-        {
-        TUint port;
-        if(iBuffer->At(index).iPop3Settings!= NULL)
-            {
-            port = iBuffer->At(index).iPop3Settings->Port();
-            }
-        else 
-            {
-            port = iBuffer->At(index).iImap4Settings->Port();
-            }
-        HBufC8 *data = IntToDes8LC(port);
-        aObject.InsertL(0,data->Des());
-        CleanupStack::PopAndDestroy(); //data
-        }
-
-    else if(lastUriSeg.Compare(KNSmlDMEmailMsndPort)==0)
-        {
-        TUint port = iBuffer->At(index).iSmtpSettings->Port();
-        HBufC8 *data = IntToDes8LC(port);
-        aObject.InsertL(0,data->Des());
-        CleanupStack::PopAndDestroy(); //data
-        }
-
-    else if(lastUriSeg.Compare(KNSmlDMEmailUseAPOP)==0)
-        {
-        if(iBuffer->At(index).iPop3Settings!= NULL)
-            {
-            if(iBuffer->At(index).iPop3Settings->Apop())
-                {
-                aObject.InsertL(0,KNSmlDMEmailTrue);
-                }
-            else
-                {
-                aObject.InsertL(0,KNSmlDMEmailFalse);
-                }
-            }
-        else if(iBuffer->At(index).iImap4Settings!= NULL)
-            {
-            status = CSmlDmAdapter::ENotFound;
-            }
-        }
-
-    else if (lastUriSeg.Compare(KNSmlDMEmailFolderPath)==0)
-        {
-        if( iBuffer->At(index).iImap4Settings )
-            {
-            aObject.InsertL(0, iBuffer->At(index).iImap4Settings->FolderPath() );
-            }
-        else
-            {
-            status = CSmlDmAdapter::ENotFound;
-            }
-        }
-
-    else if(lastUriSeg.Compare(KNSmlDMEmailToNapID)==0)
-        {
-        CNSmlDMIAPMatcher* iapmatch=CNSmlDMIAPMatcher::NewL( &Callback() );
-        CleanupStack::PushL(iapmatch);
-        HBufC8* uri8 = NULL;
-        TInt iapCount = iBuffer->At(index).iIapPref->NumberOfIAPs();
-        if ( iapCount )
-            {
-            TImIAPChoice localIAP = iBuffer->At(index).iIapPref->IAPPreference(0);
-            uri8 = iapmatch->URIFromIAPIdL( localIAP.iIAP );
-            }
-
-        if( uri8 )
-            {
-            CleanupStack::PushL(uri8);
-            aObject.InsertL(0,uri8->Des());
-            status = CSmlDmAdapter::EOk;
-            CleanupStack::PopAndDestroy(); // uri8
-            }
-        else
-            {
-            status = CSmlDmAdapter::ENotFound;
-            }
-
-        CleanupStack::PopAndDestroy(); // iapMatch
-        }
-    else if(lastUriSeg.Compare(KNSmlDMEmailSToNapID)==0)
-        {
-        // SToNapID exists only for SMTP
-        if (iBuffer->At(index).iSmtpSettings!= NULL)
-            {
-            CNSmlDMIAPMatcher* iapmatch=CNSmlDMIAPMatcher::NewL( &Callback() );
-            CleanupStack::PushL(iapmatch);
-            HBufC8* uri8 = NULL;
-            TInt iapCount = iBuffer->At(index).iIapPref->NumberOfIAPs();
-            if ( iapCount )
-                {
-                TImIAPChoice localIAP = iBuffer->At(index).iSmtpIapPref->IAPPreference(0);
-                uri8 = iapmatch->URIFromIAPIdL( localIAP.iIAP );
-                }
-
-            if( uri8 )
-                {
-                CleanupStack::PushL(uri8);
-                aObject.InsertL(0,uri8->Des());
-                status = CSmlDmAdapter::EOk;
-                CleanupStack::PopAndDestroy(); // uri8
-                }
-            else
-                {
-                status = CSmlDmAdapter::ENotFound;
-                }
-
-            CleanupStack::PopAndDestroy(); // iapMatch
-            }
-        else
-            {
-            status = CSmlDmAdapter::ENotFound;
-            }
-        }
-    _DBG_FILE("CNSmlDmEmailAdapter::FetchObjectL() : end");
-    return status;
-    }
-
-// -----------------------------------------------------------------------------
-// void CNSmlDmEmailAdapter::SetDefaultSecurityL(const TDesC8& aObject,
-// const TNSmlEmailSettingsElement* thisElem,
-// const TNSmlEmailSecuritySetting aSetting )
-// Sets (on/off) the security modes: SSL/TLS, StartTLS
-// -----------------------------------------------------------------------------
-void CNSmlDmEmailAdapter::SetDefaultSecurityL(const TDesC8& aObject,
-                                              const TNSmlEmailSettingsElement* aThisElem,
-                                              const TNSmlEmailSecuritySetting aSetting
-    ) const
-    {
-    _DBG_FILE("CNSmlDmEmailAdapter::SetDefaultSecurityL(): begin");
-    HBufC8 *data = aObject.AllocLC();
-    TPtr8 dataPtr = data->Des();
-    dataPtr.Capitalize();
-    TBool object=EFalse;
-    if(dataPtr.Find(KNSmlDMEmailTrue)>=0)
-        {
-        object = ETrue;
-        }
-    switch ( aSetting )
-        {
-    case EUseSecCon :
-        if ( object )
-            {
-            if ( aThisElem->iImap4Settings )
-                {
-                aThisElem->iImap4Settings->SetSecureSockets(EFalse);
-                aThisElem->iImap4Settings->SetSSLWrapper(ETrue);
-                aThisElem->iImap4Settings->SetPort( KNSmlDMEmailSslWrappedImap4Port );
-                }
-            else if ( aThisElem->iPop3Settings )
-                {
-                aThisElem->iPop3Settings->SetSecureSockets(EFalse);
-                aThisElem->iPop3Settings->SetSSLWrapper(ETrue);
-                aThisElem->iPop3Settings->SetPort( KNSmlDMEmailSslWrappedPop3Port );
-                }
-            }
-        else
-            {
-            if ( aThisElem->iImap4Settings )
-                {
-                aThisElem->iImap4Settings->SetPort( KNSmlDMEmailNormalImap4Port );
-                aThisElem->iImap4Settings->SetSSLWrapper(EFalse);
-                }
-            else if ( aThisElem->iPop3Settings )
-                {
-                aThisElem->iPop3Settings->SetPort( KNSmlDMEmailNormalPop3Port );
-                aThisElem->iPop3Settings->SetSSLWrapper(EFalse);
-                }
-            }
-        break;
-    case EUseStartTls :
-         if ( object )
-            {
-           if ( aThisElem->iImap4Settings )
-                {
-                aThisElem->iImap4Settings->SetSecureSockets(ETrue);
-                aThisElem->iImap4Settings->SetSSLWrapper(EFalse);
-                aThisElem->iImap4Settings->SetPort( KNSmlDMEmailNormalImap4Port );
-                }
-            else if ( aThisElem->iPop3Settings )
-                {
-                aThisElem->iPop3Settings->SetSecureSockets(ETrue);
-                aThisElem->iPop3Settings->SetSSLWrapper(EFalse);
-                aThisElem->iPop3Settings->SetPort( KNSmlDMEmailNormalPop3Port );
-                }
-            }
-        else
-            {
-            if ( aThisElem->iImap4Settings )
-                {
-                aThisElem->iImap4Settings->SetSecureSockets(EFalse);
-                }
-            else if ( aThisElem->iPop3Settings )
-                {
-                aThisElem->iPop3Settings->SetSecureSockets(EFalse);
-                }
-            }
-        break;
-    case ESuseSecCon :
-        if ( object )
-            {
-            // The port is same in all cases
-            aThisElem->iSmtpSettings->SetSecureSockets(EFalse);
-            aThisElem->iSmtpSettings->SetSSLWrapper(ETrue);
-            aThisElem->iSmtpSettings->SetPort( KNSmlDMEmailSslSmtpPort );
-            }
-        else
-            {
-            aThisElem->iSmtpSettings->SetPort( KNSmlDMEmailNormalSmtpPort );
-            aThisElem->iSmtpSettings->SetSSLWrapper( EFalse );
-            }
-        break;
-    case ESuseStartTls :
-        if ( object )
-            {
-            // The port is same in all cases
-            aThisElem->iSmtpSettings->SetSecureSockets(ETrue);
-            aThisElem->iSmtpSettings->SetSSLWrapper(EFalse);
-            aThisElem->iSmtpSettings->SetPort( KNSmlDMEmailNormalSmtpPort );
-            }
-        else
-            {
-            aThisElem->iSmtpSettings->SetSecureSockets( EFalse );
-            }
-
-        break;
-    default :
-        break;
-        }
-    CleanupStack::PopAndDestroy(); // object
-    _DBG_FILE("CNSmlDmEmailAdapter::SetDefaultSecurityL(): end");
-    }
-
-// -----------------------------------------------------------------------------
-// CSmlDmAdapter::TError CNSmlDmEmailAdapter::FetchSecurityValueL(
-//                               CBufBase& aObject,
-//                               const TNSmlEmailSettingsElement* aElem,
-//                               const TNSmlEmailSecuritySetting aSetting )
-// Gets the status(on/off) of security modes  SSL/TLS or StartTLS
-// -----------------------------------------------------------------------------
-
-CSmlDmAdapter::TError CNSmlDmEmailAdapter::FetchSecurityValueL(
-    CBufBase& aObject,
-    const TNSmlEmailSettingsElement* aElem,
-    const TNSmlEmailSecuritySetting aSetting ) const
-    {
-    _DBG_FILE("CNSmlDmEmailAdapter::FetchSecurityValueL(): start");
-    TBool result=EFalse;
-    CSmlDmAdapter::TError status = CSmlDmAdapter::EOk;
-    switch ( aSetting )
-        {
-
-        case EUseStartTls :
-                if ( aElem->iImap4Settings)
-                    {
-                    result = aElem->iImap4Settings->SecureSockets();
-                    }
-                else if(aElem->iPop3Settings)
-                    {
-                    result = aElem->iPop3Settings->SecureSockets();
-                    }
-                else
-                    {
-                    status = CSmlDmAdapter::EError;
-                    }
-                break;
-        case EUseSecCon :
-                if ( aElem->iImap4Settings)
-                    {
-                    result = aElem->iImap4Settings->SSLWrapper();
-                    }
-                else if(aElem->iPop3Settings)
-                    {
-                    result = aElem->iPop3Settings->SSLWrapper();
-                    }
-                else
-                    {
-                    status = CSmlDmAdapter::EError;
-                    }
-                break;
-        case ESuseStartTls :
-                if(aElem->iSmtpSettings)
-                    {
-                    result = aElem->iSmtpSettings->SecureSockets();
-                    }
-                else
-                    {
-                    status = CSmlDmAdapter::EError;
-                    }
-                break;
-        case ESuseSecCon :
-                if(aElem->iSmtpSettings)
-                    {
-                    result = aElem->iSmtpSettings->SSLWrapper();
-                    }
-                else
-                    {
-                    status = CSmlDmAdapter::EError;
-                    }
-                break;
-        default:
-            status = CSmlDmAdapter::EError;
-            break;
-        }
-        
-    if ( result )
-        {
-        aObject.InsertL(0,KNSmlDMEmailTrue);
-        }
-    else 
-        {
-        aObject.InsertL(0,KNSmlDMEmailFalse);
-        }
-    _DBG_FILE("CNSmlDmEmailAdapter::FetchSecurityValueL(): end");
-    return status;
-    }
-
-//--------------------------------------------------------------------
-//TInt CNSmlDmEmailAdapter::ConstructTreeL(const TDesC8& aURI)
-//
-//-------------------------------------------------------------------
-
-TInt CNSmlDmEmailAdapter::ConstructTreeL(const TDesC8& aURI)
-{
-	TInt ret = KErrNotFound;
-	CEmailAccounts* emailAccs = CEmailAccounts::NewLC();
-	
-    if(aURI.Find(KNSmlDMEmailNodeName)!= KErrNotFound)
-        {
-        RArray<TImapAccount> imap4Accounts;
-        CleanupClosePushL( imap4Accounts );
-        emailAccs->GetImapAccountsL(imap4Accounts);
-
-        // First, IMAP accounts
-        //
-        TInt luid;
-        TPtrC8 name;
-        // cycle through every found account
-        for(TInt count = 0; count < imap4Accounts.Count(); count++)
-            {
-            
-            	SetLuidById( EImap, imap4Accounts[count].iImapAccountId, luid );
-            	HBufC8 *uri = HBufC8::NewLC(KNSmlDMEmailNodeName().Length() + 
-                                            KNSmlDMEmailMproIMAP().Length() + 6);
-                                            
-                TPtr8 uriPtr = uri->Des();
-                uriPtr.Append(KNSmlDMEmailNodeName);
-                uriPtr.Append(KNSmlDMEmailSeparator8);
-                uriPtr.Append(KNSmlDMEmailMproIMAP);
-                uriPtr.AppendNumFixedWidth(count,EDecimal,3); 
-                HBufC8 *luidBuf = IntToDes8LC(luid); 
-                HBufC8* mapInfo = Callback().GetLuidAllocL(uriPtr);					
-				if (mapInfo->Length() == 0)
-				{                             
-                	Callback().SetMappingL(uriPtr, luidBuf->Des());
-                	if( aURI.Find(uriPtr) >= 0 )
-        			{ 
-         				ret = luid;
-        			}  
-				}
-				else
-				{
-					delete mapInfo;
-				}
-
-                CleanupStack::PopAndDestroy(2); //uri,luidBuf   
-            }
-        CleanupStack::PopAndDestroy(); //imap4Accounts
-
-        // Then, POP accounts
-        //
-        RArray<TPopAccount> pop3Accounts;
-        CleanupClosePushL( pop3Accounts );
-        emailAccs->GetPopAccountsL( pop3Accounts );        
-        // cycle through every found account
-        for(TInt count = 0; count < pop3Accounts.Count(); count++)
-            {
-            	SetLuidById( EPop, pop3Accounts[count].iPopAccountId, luid );
-                                     
-                HBufC8 *uri = HBufC8::NewLC(KNSmlDMEmailNodeName().Length() + 
-                                            KNSmlDMEmailMproPOP().Length() + 5);
-                TPtr8 uriPtr = uri->Des();
-                uriPtr.Append(KNSmlDMEmailNodeName);
-                uriPtr.Append(KNSmlDMEmailSeparator8);
-                uriPtr.Append(KNSmlDMEmailMproPOP);
-				uriPtr.AppendNumFixedWidth(count,EDecimal,3); 
-                HBufC8 *luidBuf = IntToDes8LC(luid);
-                HBufC8* mapInfo = Callback().GetLuidAllocL(uriPtr);					
-				if (mapInfo->Length() == 0)
-				{ 
-                	Callback().SetMappingL(uriPtr,luidBuf->Des());
-                	if( aURI.Find(uriPtr) >= 0 )
-        			{ 
-         				ret = luid;
-        			}  
-				}
-				else
-				{
-					delete mapInfo;
-				}
-
-                CleanupStack::PopAndDestroy(2); //uri,luidBuf
-            }
-        CleanupStack::PopAndDestroy(); //pop3Accounts
-        }
-        CleanupStack::PopAndDestroy(); //emailAccs
-		return ret;
-}
-
-//------------------------------------------------------------------------------
-// TPtrC8 CNSmlDmEmailAdapter::GetDynamicEmailNodeUri( const TDesC8& aURI )
-// returns Email/xxx URI
-//------------------------------------------------------------------------------
-TPtrC8 CNSmlDmEmailAdapter::GetDynamicEmailNodeUri( const TDesC8& aURI )
-    {
-    DBG_ARGS8(_S8("CNSmlDmEmailAdapter::GetDynamicEmailNodeUri() - <%S> "), &aURI);
-    TInt i= 0;
-	TBuf8<50> EmailAccRoot(KNSmlDMEmailNodeName);
-    for ( i = aURI.Find( KNSmlDMEmailNodeName ) + EmailAccRoot.Length() + 1; 
-						i < aURI.Length(); i++ )
-        {
-        if( aURI[i] == '/' )
-            {
-            break;
-            }
-        }        
-    _DBG_FILE("CNSmlDmEmailAdapter::GetDynamicEmailNodeUri(): end");
-    return aURI.Left( i );
-    }
-
-
-// End of File
--- a/omadm/omadmextensions/adapters/email/src/nsmldmemailadapter.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-CHARACTER_SET UTF8/*
-* 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:    Resource data for SyncML DM Email adapter
-*
-*/
-
-
-
-
-
-
-#include <registryinfo.rh>
-#include "nsmldmconstants.h"
-
-RESOURCE REGISTRY_INFO theRegistryInfo
-  {
-  dll_uid = 0x101F6E34; //The DLL's 3rd UID.
-  interfaces = 
-      {
-      INTERFACE_INFO
-          {
-          interface_uid = KNSmlDMInterfaceUid; // DM interface UID
-          implementations = 
-            {
-            IMPLEMENTATION_INFO
-                {
-                implementation_uid = 0x101F6E35; // DM Email implementation UID
-                version_no = 1; 
-                display_name = "";
-                default_data = "";
-                opaque_data = "";
-                }
-            };
-          }
-      };
-    }
-
-// End of File
--- a/omadm/omadmextensions/adapters/email/tsrc/bwins/emailtestu.def	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	?LibEntryL@@YAPAVCScriptBase@@AAVCTestModuleIf@@@Z @ 1 NONAME ; class CScriptBase * LibEntryL(class CTestModuleIf &)
-
--- a/omadm/omadmextensions/adapters/email/tsrc/conf/emailtest.cfg	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,96 +0,0 @@
-[Test]
-title DDF
-create emailtest foobar jee
-foobar DDFStructure
-delete foobar
-[Endtest] 
-
-[Test]
-title StartAtomic
-create emailtest foobar
-foobar StartAtomic
-delete foobar
-[Endtest]
-
-[Test]
-title CommitAtomic
-create emailtest foobar
-foobar CommitAtomic
-delete foobar
-[Endtest]
-
-[Test]
-title RollbackAtomic
-create emailtest foobar
-foobar RollbackAtomic
-delete foobar
-[Endtest]
-
-[Test]
-title AddEmail
-create emailtest foobar
-foobar AddNode Email/IMAP33245
-foobar UpdateLeaf Email/IMAP33245/Name email99
-foobar UpdateLeaf Email/IMAP33245/UName Test
-foobar UpdateLeaf Email/IMAP33245/Mpro IMAP
-foobar UpdateLeaf Email/IMAP33245/Mrcv mai..yaho.com
-foobar UpdateLeaf Email/IMAP33245/Msnd smtp.yahoo.com
-foobar CompleteCommands
-delete foobar
-[Endtest]
-
-[Test]
-title UpdateLeafEmailName
-create emailtest foobar
-foobar UpdateLeaf Email/IMAP33245/Name newname99
-delete foobar
-[Endtest]
-
-[Test]
-title FetchNodeEmail
-create emailtest foobar
-foobar FetchNode Email/IMAP33245
-delete foobar
-[Endtest]
-
-[Test]
-title FetchLeafEmailName
-create emailtest foobar
-foobar FetchLeaf Email/IMAP33245/Name
-delete foobar
-[Endtest]
-
-[Test]
-title FetchLeafEmailUName
-create emailtest foobar
-foobar FetchLeaf Email/IMAP33245/UName
-delete foobar
-[Endtest]
-
-[Test]
-title FetchLeafEmailMpro
-create emailtest foobar
-foobar FetchLeaf Email/IMAP33245/Mpro
-delete foobar
-[Endtest]
-
-[Test]
-title FetchLeafEmailMrcv
-create emailtest foobar
-foobar FetchLeaf Email/IMAP33245/Mrcv
-delete foobar
-[Endtest]
-
-[Test]
-title FetchLeafEmailMsnd
-create emailtest foobar
-foobar FetchLeaf Email/IMAP33245/Msnd
-delete foobar
-[Endtest]
-
-[Test]
-title DeleteEmail
-create emailtest foobar
-foobar DeleteNode Email/IMAP33245
-delete foobar
-[Endtest]
--- a/omadm/omadmextensions/adapters/email/tsrc/eabi/emailtestu.def	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-EXPORTS
-	_Z9LibEntryLR13CTestModuleIf @ 1 NONAME
-	_ZTI10CemailTest @ 2 NONAME ; #<TI>#
-	_ZTI16CTestDmDDFObject @ 3 NONAME ; #<TI>#
-	_ZTI8Cdmatest @ 4 NONAME ; #<TI>#
-	_ZTV10CemailTest @ 5 NONAME ; #<VT>#
-	_ZTV16CTestDmDDFObject @ 6 NONAME ; #<VT>#
-	_ZTV8Cdmatest @ 7 NONAME ; #<VT>#
-
--- a/omadm/omadmextensions/adapters/email/tsrc/group/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-/*
-* Copyright (c) 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:  Implementation of DM adapter test component
-* 	This is part of omadmextensions/adapter test application.
-*
-*/
-
-
-
-
-
-
-PRJ_PLATFORMS
-// specify the platforms your component needs to be built for here
-// defaults to WINS MARM so you can ignore this if you just build these
-DEFAULT
-
-PRJ_TESTEXPORTS
-// NOTE: If using ARS requirements all export operations should be done under this.
-// 'abld test export'
-
-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
-// Example: 
-
-
-PRJ_TESTMMPFILES
-// NOTE: If using ARS requirements .mmp file operation should be done under this.
-// 'abld test build'
-emailtest.mmp
-
-PRJ_MMPFILES
-// Specify the .mmp files required for building the important component
-// releasables.
-//
-// Specify "tidy" if the component you need to build doesn't need to be
-// released. Specify "ignore" if the MMP file exists but should be
-// ignored.
-// Example:
-
-//  End of File
--- a/omadm/omadmextensions/adapters/email/tsrc/group/emailtest.mmp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-/*
-* Copyright (c) 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:  Implementation of DM adapter test component
-* 	This is part of omadmextensions/adapter test application.
-*
-*/
-
-
-
-
-#include <platform_paths.hrh>
-
-TARGET          emailtest.dll
-TARGETTYPE      dll
-UID             0x1000008D 0x101FB3E3
-
-CAPABILITY	ALL -TCB
-/* Remove comments and replace 0x00000000 with correct vendor id */
-// VENDORID 	0x00000000
-
-//TARGETPATH      ?target_path
-DEFFILE         emailtest.def
-
-SOURCEPATH      ../src
-SOURCE          dmatest.cpp
-SOURCE          TestDmDDFObject.cpp
-SOURCE          emailtest.cpp
-SOURCE          emailtestBlocks.cpp
-
-
-USERINCLUDE     ../inc 
-USERINCLUDE		  ../../inc
-
-SYSTEMINCLUDE   /epoc32/include/ecom
-APP_LAYER_SYSTEMINCLUDE
-
- 
-
-LIBRARY         apgrfx.lib apmime.lib
-LIBRARY         euser.lib ecom.lib
-LIBRARY         stiftestinterface.lib
-LIBRARY         stiftestengine.lib
-LIBRARY         efsrv.lib
-LIBRARY         estor.lib 
-LIBRARY         SWInstCli.lib
-
-LANG			SC
-
-
-
-SMPSAFE
-// End of File
-
--- a/omadm/omadmextensions/adapters/email/tsrc/group/emailtest.pkg	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-;
-; Copyright (c) 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:  Implementation of DM adapter test component
-; 	This is part of omadmextensions/adapter test application.
-;
-
-;*Languages
-&EN
-;
-;*Standard SIS file header. This section specifies the package name,
-;application UID, and version/build numbers. Add the package TYPE here if needed.
-#{"emailtest"},(0x101FB3E8),1,0,1;
-;
-
-;*Unique (Non-Localised) Vendor name
-;This is used in combination with signing to prevent the unauthroized
-;upgrade ofa a package by someone other than the rightful vendor.
-:"Nokia"
-
-;*Localized Vendor Name
-;This specifies the localised vendor name(s) correspodning to language(s).
-%{"Nokia Test EN"}
-
-;*Files To Copy...<src> <destination>
-"\epoc32\release\armv5\urel\emailtest.dll" -"C:\sys\bin\emailtest.dll"
-"..\conf\emailtest.cfg"-"C:\TestFramework\emailtest.cfg"
-"..\init\emailtest.ini"-"C:\TestFramework\emailtest.ini"
--- a/omadm/omadmextensions/adapters/email/tsrc/inc/TestDmDDFObject.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,203 +0,0 @@
-/*
-* Copyright (c) 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:  Implementation of DM adapter test component
-* 	This is part of omadmextensions/adapter test application.
-*
-*/
-
-
-
-
-
-
-#ifndef __TESTDMDDFOBJECT_H
-#define __TESTDMDDFOBJECT_H
-
-//  INCLUDES
-//#include <?include_file>
-#include <smldmadapter.h>
-
-// CONSTANTS
-//const ?type ?constant_var = ?constant;
-
-// MACROS
-//#define ?macro ?macro_def
-
-// DATA TYPES
-//enum ?declaration
-//typedef ?declaration
-//extern ?data_type;
-
-// FUNCTION PROTOTYPES
-//?type ?function_name(?arg_list);
-
-// FORWARD DECLARATIONS
-class CStifLogger;
-
-// CLASS DECLARATION
-
-/**
-*  ?one_line_short_description.
-*  ?other_description_lines
-*
-*  @lib ?library
-*  @since Series ?XX ?SeriesXX_version
-*/
-class CTestDmDDFObject : public CBase, public MSmlDmDDFObject
-    {
-    public:  // Constructors and destructor
-        
-        /**
-        * Two-phased constructor.
-        */
-        static CTestDmDDFObject* NewL( CStifLogger *aLog );
-        static CTestDmDDFObject* NewLC( CStifLogger *aLog );
-        
-        /**
-        * Destructor.
-        */
-        virtual ~CTestDmDDFObject();
-
-    public: // New functions
-        
-        /**
-        * ?member_description.
-        * @since Series ?XX ?SeriesXX_version
-        * @param ?arg1 ?description
-        * @return ?description
-        */
-        //?type ?member_function( ?type ?arg1 );
-
-		virtual void SetNameL( const TDesC8& aName );
-		
-		void DumpL( const TDesC8& aParentName, TBool aFullDump = ETrue );
-		void ExternalizeL(RWriteStream& aStream) const;
-		
-		
-
-    public: // Functions from base classes
-    
-//sf-    *********************************
-    
-		void SetAccessTypesL( TSmlDmAccessTypes aAccessTypes );
-		void SetDefaultValueL( const TDesC8& aDefaultValue );
-		void SetDescriptionL( const TDesC8& aDescription );
-		void SetDFFormatL( TDFFormat aFormat );
-		void SetOccurenceL( TOccurence aOccurence );
-		void SetScopeL( TScope aScope );
-		void SetDFTitleL( const TDesC8& aTitle );
-		void AddDFTypeMimeTypeL( const TDesC8& aMimeType );
-		void SetAsObjectGroup();
-		MSmlDmDDFObject& AddChildObjectL(const TDesC8& aNodeName);
-		MSmlDmDDFObject& AddChildObjectGroupL();
-
-//sf-    #############################
-
-		const TDesC8& Name();
-		TSmlDmAccessTypes  AccessTypes();
-		const TDesC8& DefaultValue();
-		const TDesC8& Description();
-		TDFFormat DFFormat();
-		TOccurence Occurence();
-		TScope Scope();
-		const TDesC8& DFTitle();
-		const TDesC8& DFTypeMimeType();
-		TBool ObjectGroup();
-		
-		TInt ChildObjectCount();
-		CTestDmDDFObject& ChildObject( TInt aIndex );
-
-		CTestDmDDFObject* FindChildObject( const TDesC8& aName );
-		TInt SubObjectsCount();
-
-
-    protected:  // New functions
-        
-        /**
-        * ?member_description.
-        * @since Series ?XX ?SeriesXX_version
-        * @param ?arg1 ?description
-        * @return ?description
-        */
-        //?type ?member_function( ?type ?arg1 );
-
-    protected:  // Functions from base classes
-        
-        /**
-        * From ?base_class ?member_description
-        */
-        //?type ?member_function();
-
-    private:
-
-        /**
-        * C++ default constructor.
-        */
-        CTestDmDDFObject( CStifLogger *aLog );
-
-        /**
-        * By default Symbian 2nd phase constructor is private.
-        */
-        void ConstructL();
-
-        // Prohibit copy constructor if not deriving from CBase.
-        // CTestDmDDFObject( const CTestDmDDFObject& );
-        // Prohibit assigment operator if not deriving from CBase.
-        // CTestDmDDFObject& operator=( const CTestDmDDFObject& );
-
-    public:     // Data
-        // ?one_line_short_description_of_data
-        //?data_declaration;
-    
-    protected:  // Data
-        // ?one_line_short_description_of_data
-        //?data_declaration;
-
-    private:    // Data
-        // ?one_line_short_description_of_data
-        //?data_declaration;
-		HBufC8* iName;
-
-		TSmlDmAccessTypes iAccessTypes;
-		HBufC8* iDefaultValue;
-		HBufC8* iDescription;
-		TDFFormat iFormat;
-		TOccurence iOccurence;
-		TScope iScope;
-		HBufC8* iTitle;
-		HBufC8* iMimeType;
-		TBool iObjectGroup;
-		
-		RPointerArray<CTestDmDDFObject> iChildren;
-
-         
-        // Reserved pointer for future extension
-        //TAny* iReserved;
-
-    public:     // Friend classes
-        //?friend_class_declaration;
-    protected:  // Friend classes
-        //?friend_class_declaration;
-    private:    // Friend classes
-        //?friend_class_declaration;
-        /**
-        * Logger.
-        */
-        CStifLogger*    iLog;
-
-    };
-
-#endif      // __TESTDMDDFOBJECT_H
-            
-// End of File
--- a/omadm/omadmextensions/adapters/email/tsrc/inc/dmatest.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,277 +0,0 @@
-/*
-* Copyright (c) 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:  Implementation of DM adapter test component
-* 	This is part of omadmextensions/adapter test application.
-*
-*/
-
-
-
-
-
-
-#ifndef __DMA_TEST_H__
-#define __DMA_TEST_H__
-
-//  INCLUDES
-#include <StifLogger.h>
-#include <TestScripterInternal.h>
-#include <StifTestModule.h>
-#include <apmstd.h>
-#include <smldmadapter.h>
-#include "nsmldmemailadapter.h"
-
-class Cdmatest;
-
-
-struct TMapping
-	{
-	TBuf8<256> iURI;
-	TBuf8<64> iLuid;
-	TMapping( const TDesC8 &aURI, const TDesC8 &aLuid )  : iURI( aURI ), iLuid( aLuid )
-	{
-		
-		}
-	};
-	
-typedef RArray<TMapping> RMappingArray;
-
-typedef void (Cdmatest::* ResultsFunction)( TInt , CBufBase& , const TDesC8&  ) ; 
-
-
-// CLASS DECLARATION
-
-/**
-*  ?one_line_short_description.
-*  ?other_description_lines
-*
-*  @lib ?library
-*  @since Series ?XX ?SeriesXX_version
-*/
-class Cdmatest : public CScriptBase, public MSmlDmCallback
-    {
-    
-    public:  // Constructors and destructor
-        
-        /**
-        * Destructor.
-        */
-        virtual ~Cdmatest();
-
-    public: // Functions from base classes
-
-        /**
-        * From CScriptBase Runs a script line.
-        * @since ?Series60_version
-        * @param aItem Script line containing method name and parameters
-        * @return Symbian OS error code
-        */
-        virtual TInt RunMethodL( CStifItemParser& aItem ) = 0;
-    
-
-	public:
-		/**
-		The function is used to return the data in case of FetchLeafObjectL(),
-		FetchLeafObjectSizeL() and ChildURIListL() functions. It should not be
-		called where the DM command has failed, i.e. the error code returned in
-		SetStatusL is something other than EOk.
-		@param aResultsRef	Reference to correct command
-		@param aObject		The data which should be returned
-		@param aType			MIME type of the object
-		@publishedPartner
-		@prototype
-		*/
-		void SetResultsL( TInt aResultsRef, CBufBase& aObject,
-								  const TDesC8& aType );
-		
-		/**
-		The function is used to return the data in case of FetchLeafObjectL() and
-		ChildURIListL() functions, where the size of the data being returned is
-		large enough for the Adapter to stream it. This function should not be
-		called when command was failed, i.e. the error code returned in SetStatusL
-		is something other than EOk.
-		@param aResultsRef	Reference to correct command
-		@param aStream		Large data which should be returned, DM engine
-								closes stream when it has read all the data
-		@param aType			MIME type of the object
-		@publishedPartner
-		@prototype
-		*/
-		void SetResultsL( TInt /*aResultsRef*/, RReadStream*& /*aStream*/,
-								  const TDesC8& /*aType*/ ) 
-		{
-			
-		}
-
-		/**
-		The function returns information about the Add,Update,Delete and Fetch
-		commands success to DM engine. The reference to correct command must be
-		used when calling the SetStatusL function, the reference is got from the
-		argument of the command functions. The SetStatusL function must be called
-		separately for every single command.
-		@param aStatusRef	Reference to correct command
-		@param aErrorCode	Information about the command success
-		@publishedPartner
-		@prototype
-		*/
-		void SetStatusL( TInt aStatusRef,
-								 MSmlDmAdapter::TError aErrorCode ) ;
-
-		/**
-		The function passes map information to DM Module. This function is called
-		for a new management object, both for node objects and for leaf objects.
-		In addition if ChildURIListL() function has returned new objects a mapping
-		information of the new objects must be passed. A mapping is treated as
-		inheritable. If the mapping is not set with this function, the mapping
-		LUID of the parent object is passed in following commands to the object.
-		@param aURI	URI of the object. 
-		@param aLUID	LUID of the object. LUID must contain the all information,
-						which is needed for retrieve the invidual object from the
-						database. Typically it is ID for the database table. In
-						more complicated structures it can be combination of IDs,
-						which represent path to the object.
-		@publishedPartner
-		@prototype
-		*/
-		void SetMappingL( const TDesC8& aURI, const TDesC8& aLUID );
-
-		/**
-		The function is used to make a fetch to other adapters. The most common
-		use is to make a fetch to the AP adapter, because when managing the access
-		points, the data comes as URI. For example, there are ToNAPId field in
-		some adapters, and data to it can be something like AP/IAPidx, and then
-		the link to AP adapter is needed.
-		Using FetchLinkL causes the DM Framework to make a Get request to the
-		appropriate DM adapter.  The receiving adapter MUST complete the Get
-		request synchronously.
-		@param aURI		URI of the object. 
-		@param aData		Reference to data, i.e. data is returned here
-		@param aStatus	The status of fetch command is returned here
-		@publishedPartner
-		@prototype
-		*/
-		void FetchLinkL( const TDesC8& /*aURI*/, CBufBase& /*aData*/,
-								 MSmlDmAdapter::TError& /*aStatus*/ ) 
-			{
-				
-			}
-
-		/**
-		The function returns the LUID which is mapped to aURI. If LUID is not
-		found, the function allocates a null length string, i.e. the function
-		allocates memory in every case.
-		@param aURI	URI of the object. 
-		@publishedPartner
-		@prototype
-		*/
-		HBufC8* GetLuidAllocL( const TDesC8& aURI ) ;
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-    
-    void GetMappingInfoListL( const TDesC8& aURI,
-								CArrayFix<TSmlDmMappingInfo>& aSegmentList );
-
-#else
-// nothing
-#endif
-		        
-    protected:  // New functions
-
-        
-		void FetchNodeResultsL( TInt aResultsRef, CBufBase& aObject,
-							  const TDesC8& aType );
-		void SaveDataL( TInt aResultsRef, CBufBase& aObject,
-							  const TDesC8& aType ) ;
-							  
-		TPtrC8 LastURISeg( const TDesC8& aURI );
-		TPtrC8 RemoveLastURISeg( const TDesC8& aURI );
-		TPtrC RemoveLastURISeg( const TDesC& aURI );
-		void SetURIL( const TDesC& aURI );
-		void SetURIL( const TDesC8& aURI );
-		void SetURIL( HBufC8* aURI );		
-		HBufC8 *LoadFileLC( const TDesC &aFileName, TDataType &aType );
-		HBufC8 *LoadFileLC( const TDesC8 &aFileName, TDataType &aType );
-		HBufC8 *GetNextStringLC ( CStifItemParser& aItem, const TDesC &aName );
-		HBufC8* GetLuidAllocLC( const TDesC8& aURI ) ;
-		TPtrC8 RemoveLastSeg(const TDesC8& aURI);
-		
-		TInt FetchNodeL( CStifItemParser& aItem ) ;
-		TInt FetchLeafL( CStifItemParser& aItem ) ;
-		TInt AddNodeL( CStifItemParser& aItem );
-		TInt DeleteObjectL( CStifItemParser& aItem );	
-		TInt UpdateLeafL( CStifItemParser& aItem )	;
-		TInt UpdateLeafDataL( CStifItemParser& aItem ) ;
-		TInt UpdateLeafDataURLL( CStifItemParser& aItem ) ;
-		
-		TInt ExecuteLeafL ( CStifItemParser& aItem ) ;
-		TInt ExecuteLeafDataL ( CStifItemParser& aItem ) ;
-		TInt StartAtomicL( CStifItemParser& aItem )	;
-		TInt CommitAtomicL( CStifItemParser& aItem )	;
-		TInt RollbackAtomicL( CStifItemParser& aItem )	;
-		TInt CompleteCommandsL( CStifItemParser& aItem );
-		TInt DDFStructureL( CStifItemParser& aItem )	;
-//        TInt DeliverL( CStifItemParser& aItem ) ;
-//        TInt DetailsL( CStifItemParser& aItem ) ;
-//		TInt InstallL( CStifItemParser& aItem ) ;
-//		TInt BareInstallL( CStifItemParser& aItem ) ;		
-
-    protected:
-
-        /**
-        * C++ default constructor.
-        */
-        Cdmatest( CTestModuleIf& aTestModuleIf, TUid aUid );
-
-        /**
-        * By default Symbian 2nd phase constructor is private.
-        */
-        void ConstructL();
-
-        // Prohibit copy constructor if not deriving from CBase.
-        // Cdmatest( const Cdmatest& );
-        // Prohibit assigment operator if not deriving from CBase.
-        // Cdmatest& operator=( const Cdmatest& );
-
-		/**
-        * Frees all resources allocated from test methods.
-        * @since ?Series60_version
-        */
-        virtual void Delete();
-        void LoadMappingsL();
-        void SaveMappingsL();
-    public:     // Data
-        // ?one_line_short_description_of_data
-        //?data_declaration;
-    
-    protected:  // Data
-        // ?one_line_short_description_of_data
-        //?data_declaration;
-		MSmlDmAdapter::TError iStatus ;
-        ResultsFunction iResultsFunction;
-        //CSmlDmAdapter *iAdapter ;
-        CNSmlDmEmailAdapter *iAdapter ;
-        HBufC8 *iURI; 
-        CArrayFix<TSmlDmMappingInfo> *iEmptyMappingInfoArray;
-		TFileName iSaveFileName;
-		RMappingArray iMappingTable;
-		TUid iUid;
-		TInt iCounter;
-		//class CNSmlDmMgmtTree* iMgmtTree;
-		class CNSmlDmMgmtTree* iMgmtTree;
-		CNSmlDmEmailAdapter *Adapter() ;
-    };
-
-#endif      // __DMA_TEST_H__
-            
-// End of File
--- a/omadm/omadmextensions/adapters/email/tsrc/inc/emailtest.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,133 +0,0 @@
-/*
-* Copyright (c) 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:  Implementation of DM adapter test component
-* 	This is part of omadmextensions/adapter test application.
-*
-*/
-
-
-
-
-
-
-#ifndef TCTEST_H
-#define TCTEST_H
-
-//  INCLUDES
-#include <StifLogger.h>
-#include <TestScripterInternal.h>
-#include <StifTestModule.h>
-#include <smldmadapter.h>
-#include "dmatest.h"
-
-const TUint KNSmlemailAdapterImplUid = 0x101F6E35;
-	
-
-const TUid KAdapterUid = 
-		{
-		KNSmlemailAdapterImplUid
-		};
-// Logging path
-_LIT( KamtestLogPath, "\\logs\\testframework\\tctest\\" ); 
-// Log file
-_LIT( KamtestLogFile, "tctest.txt" ); 
-
-
-// FORWARD DECLARATIONS
-class CemailTest;
-
-
-// CLASS DECLARATION
-
-/**
-*  CemailTest test class for STIF Test Framework TestScripter.
-*  ?other_description_lines
-*
-*  @lib ?library
-*  @since ?Series60_version
-*/
-class CemailTest : public Cdmatest
-    {
-    public:  // Constructors and destructor
-        
-        /**
-        * Two-phased constructor.
-        */
-        static CemailTest* NewL( CTestModuleIf& aTestModuleIf );
-        
-        /**
-        * Destructor.
-        */
-        virtual ~CemailTest();
-
-    public: // Functions from base classes
-
-        /**
-        * From CScriptBase Runs a script line.
-        * @since ?Series60_version
-        * @param aItem Script line containing method name and parameters
-        * @return Symbian OS error code
-        */
-        virtual TInt RunMethodL( CStifItemParser& aItem );
-                
-
-    private:
-
-        /**
-        * C++ default constructor.
-        */
-        CemailTest( CTestModuleIf& aTestModuleIf );
-
-        /**
-        * By default Symbian 2nd phase constructor is private.
-        */
-        void ConstructL();
-
-        // Prohibit copy constructor if not deriving from CBase.
-        // ?classname( const ?classname& );
-        // Prohibit assigment operator if not deriving from CBase.
-        // ?classname& operator=( const ?classname& );
-    
-        /**
-        * Frees all resources allocated from test methods.
-        * @since ?Series60_version
-        */
-        virtual void Delete();
-        
-        /**
-        * Test methods are listed below. 
-        */
-        
-        /**
-        * Example test method.
-        * @since ?Series60_version
-        * @param aItem Script line containing parameters.
-        * @return Symbian OS error code.
-        */
-/*        virtual TInt ExampleL( CStifItemParser& aItem ) ;
-        virtual TInt DeliverL( CStifItemParser& aItem ) ;
-        virtual TInt DetailsL( CStifItemParser& aItem ) ;
-		    virtual TInt InstallL( CStifItemParser& aItem ) ;
-		    virtual TInt BareInstallL( CStifItemParser& aItem ) ;*/
-		
-
-    private:    // Data
-        HBufC8 *GetNextStringLC ( CStifItemParser& aItem, const TDesC &aName );
-
-
-    };
-
-#endif      // TCTEST_H
-            
-// End of File
--- a/omadm/omadmextensions/adapters/email/tsrc/init/emailtest.ini	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,204 +0,0 @@
-#
-# This is STIF initialization file
-# Comment lines start with '#'-character.
-# See STIF TestFramework users guide.doc for instructions
-
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-# Set following test engine settings:
-#	- Set Test Reporting mode. TestReportMode's possible values are:
-#		+ 'Summary': Summary of the tested test cases.
-#		+ 'Environment': Hardware and software info.
-#		+ 'TestCases': Test case report.
-#		+ 'FullReport': Set of all above ones.
-#		+ Example 'TestReportMode= Summary TestCases'
-#
-# 	- CreateTestReport setting controls report creation mode
-#		+ YES, Test report will created.
-#		+ NO, No Test report.
-#
-# 	- File path indicates the base path of the test report.
-# 	- File name indicates the name of the test report.
-#
-# 	- File format indicates the type of the test report.
-#		+ TXT, Test report file will be txt type, for example 'TestReport.txt'.
-#		+ HTML, Test report will be html type, for example 'TestReport.html'.
-#
-# 	- File output indicates output source of the test report.
-#		+ FILE, Test report logging to file.
-#		+ RDEBUG, Test report logging to using rdebug.
-#
-# 	- File Creation Mode indicates test report overwriting if file exist.
-#		+ OVERWRITE, Overwrites if the Test report file exist.
-#		+ APPEND, Continue logging after the old Test report information if
-#                 report exist.
-# 	- Sets a device reset module's dll name(Reboot).
-#		+ If Nokia specific reset module is not available or it is not correct one
-#		  StifHWResetStub module may use as a template for user specific reset
-#		  module.
-# 	- Sets STIF test measurement disable options. e.g. pluging1 and pluging2 disablation
-#		DisableMeasurement= stifmeasurementplugin01 stifmeasurementplugin02
-#
-
-[Engine_Defaults]
-
-TestReportMode= FullReport    # Possible values are: 'Empty', 'Summary', 'Environment',
-                                                     'TestCases' or 'FullReport'
-
-CreateTestReport= YES         # Possible values: YES or NO
-
-TestReportFilePath= C:\LOGS\TestFramework\
-TestReportFileName= TestReport
-
-TestReportFormat= TXT         # Possible values: TXT or HTML
-TestReportOutput= FILE        # Possible values: FILE or RDEBUG
-TestReportFileCreationMode= OVERWRITE # Possible values: OVERWRITE or APPEND
-
-DeviceResetDllName= StifResetForNokia.dll # e.g. 'StifHWResetStub.dll' for user specific reseting
-
-DisableMeasurement= stifmeasurementdisablenone  # Possible values are:
-              # 'stifmeasurementdisablenone', 'stifmeasurementdisableall'
-              # 'stifmeasurementplugin01', 'stifmeasurementplugin02',
-              # 'stifmeasurementplugin03', 'stifmeasurementplugin04',
-              # 'stifmeasurementplugin05' or 'stifbappeaprofiler'
-
-Timeout= 0                    # Default timeout value for each test case. In milliseconds
-#UITestingSupport= YES        # Possible values: YES or NO
-#SeparateProcesses= YES       # Possible values: YES or NO (default: NO)
-[End_Defaults]
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-
-
-
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-# Module configurations start
-# Modules are added between module tags
-# tags. Module name is specified after ModuleName= tag, like
-# ModuleName= XXXXXXXXX
-# Modules might have initialisation file, specified as
-# IniFile= c:\testframework\YYYYYY
-# Modules might have several configuration files, like
-# TestCaseFile= c:\testframework\NormalCases.txt
-# TestCaseFile= c:\testframework\SmokeCases.txt
-# TestCaseFile= c:\testframework\ManualCases.txt
-
-# (TestCaseFile is synonym for old term ConfigFile)
-
-# Following case specifies demo module settings. Demo module
-# does not read any settings from file, so tags 
-# IniFile and TestCaseFile are not used.
-# In the simplest case it is enough to specify only the
-# name of the test module when adding new test module
-
-#[New_Module]
-#ModuleName= demomodule
-#[End_Module]
-
-
-[New_Module]
-ModuleName= testscripter
-#DM
-TestCaseFile= c:\testframework\emailtest.cfg
-[End_Module]
-
-
-# Load testmoduleXXX, optionally with initialization file and/or test case files
-#[New_Module]
-#ModuleName= testmodulexxx
-
-#TestModuleXXX used initialization file
-#IniFile= c:\testframework\init.txt
-
-#TestModuleXXX used configuration file(s)
-#TestCaseFile= c:\testframework\testcases1.cfg
-#TestCaseFile= c:\testframework\testcases2.cfg
-#TestCaseFile= c:\testframework\manualtestcases.cfg
-
-#[End_Module]
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-
-
-
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-# Set STIF logging overwrite parameters for Logger.
-# 	Hardware and emulator environment logging path and styles can
-# 	be configured from here to overwrite the Logger's implemented values.
-#	
-#	Settings description:
-#	- Indicates option for creation log directory/directories. If log directory/directories
-#         is/are not created by user they will make by software.
-#		+ YES, Create log directory/directories if not allready exist.
-#		+ NO, Log directory/directories not created. Only created one is used.
-#
-#	- Overwrite emulator path setting.
-#		+ Example: If 'EmulatorBasePath= C:\LOGS\TestFramework\' and in code is defined 
-#		           Logger's path 'D:\\LOGS\\Module\\' with those definition the path
-#		           will be 'C:\LOGS\TestFramework\LOGS\Module\'
-#
-#	- Overwrite emulator's logging format.
-#		+ TXT, Log file(s) will be txt type(s), for example 'Module.txt'.
-#		+ HTML, Log file(s) will be html type(s), for example 'Module.html'.
-#
-#	- Overwrited emulator logging output source.
-#		+ FILE, Logging to file(s).
-#		+ RDEBUG, Logging to using rdebug(s).
-#
-#	- Overwrite hardware path setting (Same description as above in emulator path).
-#	- Overwrite hardware's logging format(Same description as above in emulator format).
-#	- Overwrite hardware's logging output source(Same description as above in emulator output).
-#
-#	- File Creation Mode indicates file overwriting if file exist.
-#		+ OVERWRITE, Overwrites if file(s) exist.
-#		+ APPEND, Continue logging after the old logging information if file(s) exist.
-#
-#	- Will thread id include to the log filename.
-#		+ YES, Thread id to log file(s) name, Example filename 'Module_b9.txt'.
-#		+ NO, No thread id to log file(s), Example filename 'Module.txt'.
-#
-#	- Will time stamps include the to log file.
-#		+ YES, Time stamp added to each line in log file(s). Time stamp is 
-#                 for example'12.Nov.2003 115958    LOGGING INFO'
-#		+ NO, No time stamp(s).
-#
-#	- Will line breaks include to the log file.
-#		+ YES, Each logging event includes line break and next log event is in own line.
-#		+ NO, No line break(s).
-#
-#	- Will event ranking include to the log file.
-#		+ YES, Event ranking number added to each line in log file(s). Ranking number
-#                 depends on environment's tics, for example(includes time stamp also)
-#                 '012   12.Nov.2003 115958    LOGGING INFO'
-#		+ NO, No event ranking.
-#
-#	- Will write log file in unicode format.
-#		+ YES, Log file will be written in unicode format
-#		+ NO, Log will be written as normal, not unicode, file.
-#
-
-[Logger_Defaults]
-
-#NOTE: If you want to set Logger using next setting(s) remove comment(s)'#'
-#NOTE: TestEngine and TestServer logging settings cannot change here
-
-#CreateLogDirectories= YES    # Possible values: YES or NO
-
-#EmulatorBasePath= C:\LOGS\TestFramework\
-#EmulatorFormat= HTML         # Possible values: TXT or HTML
-#EmulatorOutput= FILE         # Possible values: FILE or RDEBUG
-
-#HardwareBasePath= D:\LOGS\TestFramework\
-#HardwareFormat= HTML         # Possible values: TXT or HTML
-#HardwareOutput= FILE         # Possible values: FILE or RDEBUG
-
-#FileCreationMode= OVERWRITE  # Possible values: OVERWRITE or APPEND
-
-#ThreadIdToLogFile= YES       # Possible values: YES or NO
-#WithTimeStamp= YES           # Possible values: YES or NO
-#WithLineBreak= YES           # Possible values: YES or NO
-#WithEventRanking= YES        # Possible values: YES or NO
-
-#FileUnicode= YES             # Possible values: YES or NO
-#AddTestCaseTitle= YES        # Possible values: YES or NO
-[End_Logger_Defaults]
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-
-# End of file
--- a/omadm/omadmextensions/adapters/email/tsrc/src/TestDmDDFObject.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,516 +0,0 @@
-/*
-* Copyright (c) 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:  Implementation of DM adapter test component
-* 	This is part of omadmextensions/adapter test application.
-*
-*/
-
-
-
-
-
-
-// INCLUDE FILES
-
-#include "TestDmDDFObject.h"
-#include "StifLogger.h"
-
-// EXTERNAL DATA STRUCTURES
-//extern  ?external_data;
-
-// EXTERNAL FUNCTION PROTOTYPES  
-//extern ?external_function( ?arg_type,?arg_type );
-
-// CONSTANTS
-//const ?type ?constant_var = ?constant;
-
-// MACROS
-//#define ?macro ?macro_def
-
-// LOCAL CONSTANTS AND MACROS
-//const ?type ?constant_var = ?constant;
-//#define ?macro_name ?macro_def
-
-// MODULE DATA STRUCTURES
-//enum ?declaration
-//typedef ?declaration
-
-// LOCAL FUNCTION PROTOTYPES
-//?type ?function_name( ?arg_type, ?arg_type );
-
-// FORWARD DECLARATIONS
-//class ?FORWARD_CLASSNAME;
-
-// ============================= LOCAL FUNCTIONS ===============================
-
-
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CTestDmDDFObject::CTestDmDDFObject
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CTestDmDDFObject::CTestDmDDFObject( CStifLogger *aLog )
-	: iName( 0 )
-	, iAccessTypes()
-	, iDefaultValue( 0 )
-	, iDescription( 0 )
-	, iFormat( (TDFFormat)0 )
-	, iOccurence( (TOccurence)0 )
-	, iScope( (TScope)0 )
-	, iTitle ( 0 )
-	, iMimeType( 0 )
-	, iObjectGroup( EFalse )
-	, iLog( aLog )
-//	RPointerArray<CTestDmDDFObject> iChildren;
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// CTestDmDDFObject::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CTestDmDDFObject::ConstructL()
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// CTestDmDDFObject::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CTestDmDDFObject* CTestDmDDFObject::NewL( CStifLogger *aLog )
-    {
-    CTestDmDDFObject* self = CTestDmDDFObject::NewLC( aLog );
-    CleanupStack::Pop( self );
-
-    return self;
-    }
-
-CTestDmDDFObject* CTestDmDDFObject::NewLC( CStifLogger *aLog )
-    {
-    CTestDmDDFObject* self = new( ELeave ) CTestDmDDFObject( aLog );
-    
-    CleanupStack::PushL( self );
-    self->ConstructL();
-
-    return self;
-    }
-
-    
-// Destructor
-CTestDmDDFObject::~CTestDmDDFObject()
-    {
-	delete iName;
-	delete iDefaultValue;
-	delete iDescription;
-	delete iTitle;
-	delete iMimeType;
-	iChildren.ResetAndDestroy();
-    }
-
-
-// -----------------------------------------------------------------------------
-// CTestDmDDFObject::?member_function
-// ?implementation_description
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-/*?type CTestDmDDFObject::?member_function(
-    ?arg_type arg,
-    ?arg_type arg )
-    {
-    
-    ?code
-    
-    }
-*/
-
-void CTestDmDDFObject::SetAccessTypesL( TSmlDmAccessTypes aAccessTypes )
-	{
-	iLog->Log( _L8( "SetAccessTypesL, aAccessTypes=%d" ), aAccessTypes.GetACL() );
-	iAccessTypes = aAccessTypes;
-	}
-
-void CTestDmDDFObject::SetDefaultValueL( const TDesC8& aDefaultValue )
-	{
-	iLog->Log( _L8( "SetDefaultValueL, aDefaultValue='%S'" ), &aDefaultValue );
-	delete iDefaultValue;
-	iDefaultValue = 0;
-	iDefaultValue = aDefaultValue.AllocL();
-	}
-
-void CTestDmDDFObject::SetDescriptionL( const TDesC8& aDescription )
-	{
-	iLog->Log( _L8( "SetDescriptionL, aDescription='%S'" ), &aDescription );
-	delete iDescription;
-	iDescription = 0;
-	iDescription = aDescription.AllocL();
-	}
-	
-void CTestDmDDFObject::SetDFFormatL( TDFFormat aFormat )
-	{
-	iLog->Log( _L8( "SetDFFormatL, aFormat=%d" ), aFormat );
-	iFormat = aFormat;
-	}
-	
-void CTestDmDDFObject::SetOccurenceL( TOccurence aOccurence )
-	{
-	iLog->Log( _L8( "SetOccurenceL, aOccurence=%d" ), aOccurence );
-	iOccurence = aOccurence;
-	}
-	
-void CTestDmDDFObject::SetScopeL( TScope aScope )
-	{
-	iLog->Log( _L8( "SetScopeL, aScope=%d" ), aScope );
-	iScope = aScope;
-	}
-	
-void CTestDmDDFObject::SetDFTitleL( const TDesC8& aTitle )
-	{
-	iLog->Log( _L8( "SetDFTitleL, aTitle='%S'" ), &aTitle );
-	delete iTitle;
-	iTitle = 0;
-	iTitle = aTitle.AllocL();
-	}
-	
-void CTestDmDDFObject::AddDFTypeMimeTypeL( const TDesC8& aMimeType )
-	{
-	iLog->Log( _L8( "AddDFTypeMimeTypeL, aMimeType='%S'" ), &aMimeType );
-	delete iMimeType;
-	iMimeType = 0;
-	iMimeType = aMimeType.AllocL();
-	}
-	
-void CTestDmDDFObject::SetAsObjectGroup()
-	{
-	iLog->Log( _L8( "SetAsObjectGroup, true" ) );
-	iObjectGroup = ETrue;
-	}
-	
-MSmlDmDDFObject& CTestDmDDFObject::AddChildObjectL(const TDesC8& aNodeName)
-	{
-	iLog->Log( _L8( "AddChildObjectL, aNodeName='%S'" ), &aNodeName );
-	CTestDmDDFObject* child = CTestDmDDFObject::NewLC( iLog ); //, aNodeName );
-	child->SetNameL( aNodeName );
-	iChildren.AppendL( child );
-	CleanupStack::Pop( child ); // Don't destroy
-	return *child;
-	}
-
-MSmlDmDDFObject& CTestDmDDFObject::AddChildObjectGroupL()
-	{
-	iLog->Log( _L8( "AddChildObjectGroupL, ''" ) );
-	CTestDmDDFObject* child = CTestDmDDFObject::NewLC( iLog ); //, KNullDesC );
-	child->SetAsObjectGroup();
-	iChildren.AppendL( child );
-	CleanupStack::Pop( child ); // Don't destroy
-	return *child;
-	}
-
-// Own functions
-
-void CTestDmDDFObject::SetNameL( const TDesC8& aName )
-	{
-	delete iName;
-	iName = 0;
-	iName = aName.AllocL();
-	}
-
-void CTestDmDDFObject::DumpL( const TDesC8& aParentName, TBool aFullDump )
-	{
-	TPtrC8 name( _L8("<X>") );
-	if (iName && iName->Length() > 0)
-		{
-		name.Set( *iName );
-		}
-
-	HBufC8* fullName = HBufC8::NewLC( aParentName.Length() + name.Length() + 1 );
-	*fullName = aParentName;
-	if (aParentName.Length() > 0 && aParentName[ aParentName.Length() - 1 ] != '/')
-		{
-		fullName->Des().Append( _L8("/"));
-		}
-	fullName->Des().Append( name );
-
-	/* Translate some members to text for dumping */
-	TBuf8<20> strAccessTypes;
-	TUint8 accessTypes = iAccessTypes.GetACL();
-	if ((accessTypes & iAccessTypes.EAccessType_Add) != 0)
-		{
-		strAccessTypes.Append( _L8("A") );
-		}
-	if ((accessTypes & iAccessTypes.EAccessType_Copy) != 0)
-		{
-		strAccessTypes.Append( _L8("C") );
-		}
-	if ((accessTypes & iAccessTypes.EAccessType_Delete) != 0)
-		{
-		strAccessTypes.Append( _L8("D") );
-		}
-	if ((accessTypes & iAccessTypes.EAccessType_Exec) != 0)
-		{
-		strAccessTypes.Append( _L8("E") );
-		}
-	if ((accessTypes & iAccessTypes.EAccessType_Get) != 0)
-		{
-		strAccessTypes.Append( _L8("G") );
-		}
-	if ((accessTypes & iAccessTypes.EAccessType_Replace) != 0)
-		{
-		strAccessTypes.Append( _L8("R") );
-		}
-	
-	TBuf8<20> strFormat;
-	switch( iFormat )
-		{
-	case EB64:
-		strFormat = _L8("Base64");
-		break;
-	case EBool:
-		strFormat = _L8("Bool");
-		break;
-	case EChr:
-		strFormat = _L8("Chr");
-		break;
-	case EInt:
-		strFormat = _L8("Int");
-		break;
-	case ENode:
-		strFormat = _L8("Node");
-		break;
-	case ENull:
-		strFormat = _L8("Null");
-		break;
-	case EXml:
-		strFormat = _L8("Xml");
-		break;
-	case EBin:
-		strFormat = _L8("Bin");
-		break;
-	default:
-		break;
-		}
-
-
-	TBuf8<20> strOccurence;
-	switch( iOccurence )
-		{
-	case EOne:
-		/** The node appears exactly once */
-		strOccurence = _L8("M:1");
-		break;
-	case EZeroOrOne:
-		/** The node is optional and may appear zero or once */
-		strOccurence = _L8("O:0-1");
-		break;
-	case EZeroOrMore:
-		/** The node is optional and may appear zero or more times */
-		strOccurence = _L8("O:0-*");
-		break;
-	case EOneOrMore:
-		/** The node is mandatory and may appear once or more times */
-		strOccurence = _L8("M:1-*");
-		break;
-	case EZeroOrN:
-		/** The node is optional and may appear between once and 'N' times */
-		strOccurence = _L8("O:1-N");
-		break;
-	case EOneOrN:
-		/** The node is mandatory and may appear between once and 'N' times */
-		strOccurence = _L8("M:1-N");
-		break;
-	default:
-		break;
-		}
-	
-	
-	TBuf8<20> strScope;
-	switch( iScope)
-		{
-	case EPermanent:
-		/** The node appears exactly once */
-		strScope = _L8("Permanent");
-		break;
-	case EDynamic:
-		/** The node is optional and may appear zero or once */
-		strScope = _L8("O:Dynamic");
-		break;
-	default:
-		break;
-		}
-
-	
-	/* Dump main data */
-	if (aFullDump)
-		{
-		iLog->Log( _L8( "DDFObject: '%S'" ), fullName );
-		}
-		else
-		{
-		iLog->Log( _L8( "DDFObject: '%S'   (%S), %S, %S, %S" ),
-					fullName, &strAccessTypes, &strFormat, &strOccurence, &strScope );
-		}
-	
-	/* Dump members */
-	if (aFullDump)
-		{
-		TPtrC8 empty( _L8( "<null>" ) );
-		#define CHK_NULL(a) ((a)==0?(TDesC8*)(&empty):(TDesC8*)(a))
-
-		iLog->Log( _L8( "    iName=='%S'" ), iName );
-		iLog->Log( _L8( "    iAccessTypes=%d (%S)" ), iAccessTypes.GetACL(), &strAccessTypes );
-		iLog->Log( _L8( "    iDefaultValue='%S'" ), CHK_NULL(iDefaultValue));
-		iLog->Log( _L8( "    iDescription='%S'" ), CHK_NULL(iDescription ));
-		iLog->Log( _L8( "    iFormat=%d (%S)" ), iFormat, &strFormat );
-		iLog->Log( _L8( "    iOccurence=%d (%S)" ), iOccurence, &strOccurence );
-		iLog->Log( _L8( "    iScope=%d (%S)" ), iScope, &strScope );
-		iLog->Log( _L8( "    iTitle='%S'" ), CHK_NULL(iTitle ));
-		iLog->Log( _L8( "    iMimeType='%S'" ), CHK_NULL(iMimeType ));
-		iLog->Log( _L8( "----------------------------------" ) );
-		}
-	
-	/* Dump children */
-	for (TInt i = 0 ; i < iChildren.Count() ; i++)
-		{
-		iChildren[i]->DumpL( *fullName, aFullDump );
-		}
-
-	CleanupStack::PopAndDestroy( fullName );
-	}
-
-/*
-void CTestDmDDFObject::ExternalizeL(RWriteStream& aStream) const
-	{
-	X;
-	aStream << *iName << eol;
-	}
-*/
-
-const TDesC8& CTestDmDDFObject::Name()
-	{
-	return (iName != 0) ? *iName : KNullDesC8();
-	}
-
-TSmlDmAccessTypes  CTestDmDDFObject::AccessTypes()
-	{
-	return iAccessTypes;
-	}
-
-const TDesC8& CTestDmDDFObject::DefaultValue()
-	{
-	return (iDefaultValue != 0) ? *iDefaultValue : KNullDesC8();
-	}
-
-const TDesC8& CTestDmDDFObject::Description()
-	{
-	return (iDescription != 0) ? *iDescription : KNullDesC8();
-	}
-
-CTestDmDDFObject::TDFFormat CTestDmDDFObject::DFFormat()
-	{
-	return iFormat;
-	}
-
-CTestDmDDFObject::TOccurence CTestDmDDFObject::Occurence()
-	{
-	return iOccurence;
-	}
-
-CTestDmDDFObject::TScope CTestDmDDFObject::Scope()
-	{
-	return iScope;
-	}
-
-const TDesC8& CTestDmDDFObject::DFTitle()
-	{
-	return (iTitle != 0) ? *iTitle : KNullDesC8();
-	}
-
-const TDesC8& CTestDmDDFObject::DFTypeMimeType()
-	{
-	return (iMimeType != 0) ? *iMimeType : KNullDesC8();
-	}
-
-TBool CTestDmDDFObject::ObjectGroup()
-	{
-	return iObjectGroup;
-	}
-
-TInt CTestDmDDFObject::ChildObjectCount()
-	{
-	return iChildren.Count();
-	}
-
-CTestDmDDFObject& CTestDmDDFObject::ChildObject( TInt aIndex )
-	{
-	return *iChildren[aIndex];
-	}
-
-CTestDmDDFObject* CTestDmDDFObject::FindChildObject( const TDesC8& aName )
-	{
-	CTestDmDDFObject* foundObject = 0;
-
-	for (TInt i = 0 ; i < iChildren.Count() ; i++)
-		{
-		if ( aName.CompareC( iChildren[i]->Name() ) == 0 )
-			{
-			foundObject = iChildren[i];
-			break;
-			}
-		}
-
-	return foundObject;
-	}
-
-TInt CTestDmDDFObject::SubObjectsCount()
-	{
-	TInt count = 0;
-
-	TInt i;
-	for (i = 0 ; i < iChildren.Count() ; i++)
-		{
-		count += iChildren[i]->SubObjectsCount();
-		}
-	count += i;
-
-	return count;
-	}
-
-/*
-// ========================== OTHER EXPORTED FUNCTIONS =========================
-
-// -----------------------------------------------------------------------------
-// ?function_name implements...
-// ?implementation_description.
-// Returns: ?value_1: ?description
-//          ?value_n: ?description
-//                    ?description
-// -----------------------------------------------------------------------------
-//
-?type  ?function_name(
-    ?arg_type arg,  // ?description
-    ?arg_type arg )  // ?description
-    {
-
-    ?code
-
-    }
-*/
-//  End of File  
--- a/omadm/omadmextensions/adapters/email/tsrc/src/dmatest.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,953 +0,0 @@
-/*
-* Copyright (c) 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:  Implementation of DM adapter test component
-* 	This is part of omadmextensions/adapter test application.
-*
-*/
-
-
-
-
-
-
-// INCLUDE FILES
-#include "dmatest.h"
-
-#include <StifParser.h>
-#include <Stiftestinterface.h>
-#include <S32FILE.H>
-#include <s32mem.h>
-#include <apgcli.h>
-#include <e32svr.h>
-#include <e32math.h>
-#include <f32file.h>
-#include <swinstapi.h>
-
-#include "TestDmDDFObject.h"
-
-_LIT8( KEmptyType, "" );
-_LIT8( KDefaultType, "text/plain" );
-_LIT( KMappingTableFile, "\\dmtestmappings.txt" );
-//_LIT8( KNSmlDMSeparator8, "/" );
-const TUint8 KNSmlDMUriSeparator = 0x2f; //forward slash
-
-#define LEAVE_IF_ERROR(x,msg) \
-	{ TInt __xres = (x); if ( __xres < 0 ) { if ( iLog ) iLog->Log( (msg), __xres ); User::Leave( __xres );	} }
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// Cdmatest::Cdmatest
-// C++ default constructor can NOT contain any code, that
-// leave.
-// -----------------------------------------------------------------------------
-//
-Cdmatest::Cdmatest(CTestModuleIf& aTestModuleIf, TUid aUid ):
-        CScriptBase( aTestModuleIf ), iMappingTable(2), iUid( aUid )
-    {
-    
-    }
-
-// -----------------------------------------------------------------------------
-// Cdmatest::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void Cdmatest::ConstructL()
-    {    
-    Adapter();
-	iEmptyMappingInfoArray = new ( ELeave ) CArrayFixFlat<TSmlDmMappingInfo>(1);
-	
-	TRAPD( err, LoadMappingsL() );
-	if (err != KErrEof && err != KErrNone && err != KErrNotFound)
-		{
-		User::Leave( err );
-		}
-    }
-    
-CNSmlDmEmailAdapter *Cdmatest::Adapter()  
-	{
-	if ( iAdapter == NULL )
-		{
-		if ( iLog )
-			{
-			iLog->Log( _L( "Loading Adapter" ) );
-			}
-  		
-  		TRAPD( err, iAdapter = (CNSmlDmEmailAdapter*) CSmlDmAdapter::NewL( iUid,*this ) );
-	if ( err == KErrNone )
-		{
-		if (iLog )
-			{
-			iLog->Log( _L( "Loaded" ) );	
-			}
-		}
-	else
-		{
-		if (iLog)
-			{
-			iLog->Log( _L( "Failed to load adapter: %d" ), err );
-			}
-		}
-		}
-	return iAdapter;
-	}
-    
-    
-void Cdmatest::LoadMappingsL()
-	{
-	TDataType type; 
-	HBufC8 *data = LoadFileLC( KMappingTableFile,  type );
-	RDesReadStream buf( *data );
-	CleanupClosePushL( buf );
-
-	TInt len( data->Length() );
-	while (buf.Source()->TellL( MStreamBuf::ERead ).Offset() < len)
-		{
-		TUint32 val = buf.ReadUint32L();
-		TBuf8<256> uri;
-		TBuf8<64> luid;
-		buf.ReadL(uri, val);
-		val = buf.ReadUint32L();
-		buf.ReadL(luid, val);
-		TMapping m( uri, luid ) ;
-		TInt err( iMappingTable.Append( m )	);
-		if ( err == KErrNone )
-			{
-			iLog->Log( _L8( "Loaded mapping: '%S' : '%S'"), &m.iURI, &m.iLuid );
-			}
-		else
-			{
-			iLog->Log( _L8( "FAILED TO Load mapping: '%d' "), err );
-			}
-		}
-	CleanupStack::PopAndDestroy( &buf); // buf
-	CleanupStack::PopAndDestroy( data ); // data
-	}
-    	
-	
-
-void Cdmatest::SaveMappingsL()
-    {
-	TInt c( iMappingTable.Count() );
-	if ( c > 0 )
-	{
-    	RFs fs;
-    	User::LeaveIfError( fs.Connect() );
-    	CleanupClosePushL( fs );
-    	RFileWriteStream buf;
-    	User::LeaveIfError( buf.Replace( fs, KMappingTableFile, EFileWrite ) );
-    	CleanupClosePushL( buf );
-		
-		TInt i( 0 ) ;
-		do 
-			{
-			buf.WriteUint32L( iMappingTable[i].iURI.Length() );
-			buf.WriteL( iMappingTable[i].iURI );
-			buf.WriteUint32L( iMappingTable[i].iLuid.Length() );
-			buf.WriteL( iMappingTable[i].iLuid );
-			}
-		while ( ++i < c )	;
-		buf.CommitL();
-		buf.Close();
-	
-		CleanupStack::PopAndDestroy(); // buf
-		CleanupStack::PopAndDestroy(); // fs
-		}
-    }
-    	
-    
-// Destructor
-Cdmatest::~Cdmatest()
-    {
-    // Delete resources allocated from test methods
-    TRAPD(err, SaveMappingsL() );
-    if ( err != KErrNone )
-    	{
-    	iLog->Log( _L8( "Failed to save mappings!: %d"), err );
-    	}
-    Delete();
-    
-    // Delete logger
-    delete iLog;  
-    delete iEmptyMappingInfoArray;
-    delete iAdapter;
-    delete iURI;
-    iMappingTable.Reset();
-    REComSession::FinalClose();    
-    }
-
-
-// -----------------------------------------------------------------------------
-// Camatest::Delete
-// Delete here all resources allocated and opened from test methods. 
-// Called from destructor. 
-// -----------------------------------------------------------------------------
-//
-void Cdmatest::Delete() 
-    {
-    
-    }
-
-// -----------------------------------------------------------------------------
-// Cdmatest::?member_function
-// ?implementation_description
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-
-
-        
-HBufC8 *Cdmatest::GetNextStringLC ( CStifItemParser& aItem, const TDesC &aName )
-	{
-	TPtrC nodename( KNullDesC );
-
-    TInt i( aItem.GetNextString ( nodename ) );
-    if ( i != KErrNone ) 
-	    {
-	    iLog->Log( _L( "ERROR Reading '%S' argument: 0x%X" ), &aName, i );
-	    }
-	else
-		{
-		iLog->Log( _L("%S: %S"), &aName, &nodename);
-		}
-	
-	HBufC8 *buf = HBufC8::NewLC( nodename.Length() ) ;
-	buf->Des().Copy( nodename );
-	return buf;
-	}
-	
-TInt Cdmatest::FetchNodeL( CStifItemParser& aItem )	
-	{
-
-    TInt ret( KErrNone );
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("Cdmatest"), _L("FetchNodeL") );
-
-	iResultsFunction = FetchNodeResultsL;
-	
-    TPtrC8 nodename( GetNextStringLC( aItem, _L(" nodename" ) )->Des() ) ;
-		
-	SetURIL(nodename) ;//
-	HBufC8 *luid = GetLuidAllocLC( *iURI );
-
-	Adapter()->ChildURIListL( *iURI, *luid, *iEmptyMappingInfoArray, 4, 5) ;
-
-	if ( iStatus == MSmlDmAdapter::EOk )
-		{
-		}
-	else
-		{
-		iLog->Log( _L("FetchNodeL: ChildUriList Error ! %d" ), iStatus );	
-		ret = KErrGeneral ;
-		}
-	CleanupStack::PopAndDestroy( luid ) ; 
-	CleanupStack::PopAndDestroy() ; // nodename
-	iLog->Log( _L("FetchNodeL: Test Complete with status %d" ), ret );	
-
-    return ret;
-	}
-	
-TInt Cdmatest::StartAtomicL( CStifItemParser& /*aItem*/ )	
-	{
-	TRAPD( err, Adapter()->StartAtomicL() ) ;
-	iLog->Log( _L("StartAtomicL: Atomic started resulting error %d" ), err );	
-    return err;
-	}
-
-TInt Cdmatest::RollbackAtomicL( CStifItemParser& /*aItem*/ )	
-	{
-	TRAPD( err, Adapter()->RollbackAtomicL() ) ;
-	iLog->Log( _L("RollbackAtomicL: Atomic rolled back resulting error %d" ), err );	
-    return err;
-	}
-	
-TInt Cdmatest::CommitAtomicL( CStifItemParser& /*aItem*/ )	
-	{
-	TRAPD( err, Adapter()->CommitAtomicL() ) ;
-	iLog->Log( _L("RollbackAtomicL: Atomic commited resulting error %d" ), err );	
-    return err;
-	}
-	
-
-TInt Cdmatest::DDFStructureL( CStifItemParser& /*aItem*/ )	
-	{
-	CTestDmDDFObject* ddfRoot = CTestDmDDFObject::NewLC( iLog ); //, aNodeName );
-
-	TRAPD( err, iAdapter->DDFStructureL( *ddfRoot ) ) ;
-	CleanupStack::PopAndDestroy( ddfRoot );
-	iLog->Log( _L("DDFStructureL: method called resulting error %d" ), err );	
-    return err;
-	}
-		
-		
-TInt Cdmatest::AddNodeL( CStifItemParser& aItem )	
-	{
-
-    TInt ret( KErrNone );
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("Cdmatest"), _L("AddNodeL") );
-
-    
-    TPtrC8 nodename( GetNextStringLC ( aItem, _L("nodename" ) )->Des() ) ;
-    SetURIL( nodename );
-
-	Adapter()->AddNodeObjectL( *iURI, KEmptyType, 8 ) ;
-	
-	if ( iStatus == MSmlDmAdapter::EOk )
-		{
-		iLog->Log( _L("AddNodeL: AddNodeObjectL Successful! %d" ), iStatus );	
-		}
-	else
-		{
-		iLog->Log( _L("AddNodeL: AddNodeObjectL Error ! %d" ), iStatus );	
-		ret = KErrGeneral ;
-		}
-		
-	CleanupStack::PopAndDestroy() ; // nodename
-	iLog->Log( _L("AddNodeL Test Complete with status %d" ), ret );	
-
-    return ret;
-	}	
-		
-TInt Cdmatest::UpdateLeafL( CStifItemParser& aItem )	
-	{
-
-    TInt ret( KErrNone );
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("Cdmatest"), _L("UpdateLeafL") );
-
-    TPtrC8 nodename( GetNextStringLC ( aItem, _L("Node name") )->Des() ) ;
-    TPtrC8 data (GetNextStringLC( aItem, _L("datafile"))->Des() );
-    
-	HBufC8 *mime = GetNextStringLC( aItem, _L("mime") ) ;
-    SetURIL( nodename );
-    
-    TPtrC8 parentURI(RemoveLastSeg(nodename));
-    HBufC8 *luid = GetLuidAllocLC( parentURI );
-    
-    TDataType type; 
-
-	TPtrC8 mimePtr( *mime == KNullDesC8 ? type.Des8() : mime->Des() );
-
-    /**
-    virtual void UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID,
-									const TDesC8& aObject, const TDesC8& aType,
-									TInt aStatusRef ) = 0;
-    */
-    
-	Adapter()->UpdateLeafObjectL( *iURI , *luid, data, mimePtr, 3);
-
-	if ( iStatus == MSmlDmAdapter::EOk )
-	{
-		iLog->Log( _L("UpdateLeafL: UpdateLeafObjectL Successful! %d" ), iStatus );	
-	}
-	else
-	{
-		iLog->Log( _L("UpdateLeafL UpdateLeafObjectL Error ! %d" ), iStatus );	
-		ret = KErrGeneral ;
-	}
-
-	CleanupStack::PopAndDestroy(); // loadfile
-	CleanupStack::PopAndDestroy(); // luid
-	CleanupStack::PopAndDestroy(); // mime
-	CleanupStack::PopAndDestroy(); // nodename
-
-	iLog->Log( _L("UpdateLeafL Test Complete with status %d" ), ret );	
-
-    return ret;
-	}	
-	
-
-TInt Cdmatest::UpdateLeafDataURLL( CStifItemParser& aItem )	
-	{
-
-    TInt ret( KErrNone );
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("Cdmatest"), _L("UpdateLeafDataL") );
-
-    TPtrC8 nodename( GetNextStringLC ( aItem, _L("Node name") )->Des() ) ;
-    TPtrC8 http (GetNextStringLC( aItem, _L("http"))->Des() );
-    TPtrC8 url (GetNextStringLC( aItem, _L("rest of url"))->Des() );
-	HBufC8 *mime = GetNextStringLC( aItem, _L("mime") ) ;
-    SetURIL( nodename );
-    
-    _LIT8( KTag, "://" );
-    
-    HBufC8 *fullurl = HBufC8::NewLC( http.Length() + KTag().Length() + url.Length() );
-    TPtr8 pfullurl( fullurl->Des() );
-    pfullurl.Copy( http ) ;
-    pfullurl.Append( KTag );
-    pfullurl.Append( url );
-    TPtrC8 mimePtr( *mime == KNullDesC8 ? KDefaultType() : mime->Des() );
-    
-    HBufC8 *luid = GetLuidAllocLC( *iURI );
-    /**
-    virtual void UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID,
-									const TDesC8& aObject, const TDesC8& aType,
-									TInt aStatusRef ) = 0;
-    */
-	Adapter()->UpdateLeafObjectL( *iURI , *luid, pfullurl, mimePtr, 3);
-	if ( iStatus == MSmlDmAdapter::EOk )
-		{
-		iLog->Log( _L("UpdateLeafDataL: UpdateLeafObjectL Successful! %d" ), iStatus );	
-		}
-	else
-		{
-		iLog->Log( _L("UpdateLeafDataL UpdateLeafObjectL Error ! %d" ), iStatus );	
-		ret = KErrGeneral ;
-		}
-	CleanupStack::PopAndDestroy( luid ); // 
-	CleanupStack::PopAndDestroy( mime ); // mime
-	CleanupStack::PopAndDestroy(); // url
-	CleanupStack::PopAndDestroy(); // http
-	CleanupStack::PopAndDestroy(); // nodename
-	iLog->Log( _L("UpdateLeafDataL Test Complete with status %d" ), ret );	
-
-    return ret;
-	}
-    
-TInt Cdmatest::UpdateLeafDataL( CStifItemParser& aItem )	
-	{
-
-    TInt ret( KErrNone );
-    // Print to UI
-   TestModuleIf().Printf( 0, _L("Camtest"), _L("UpdateLeafDataL") );
-
-    TPtrC8 nodename( GetNextStringLC ( aItem, _L("Node name") )->Des() ) ;
-    TPtrC8 data (GetNextStringLC( aItem, _L("data"))->Des() );
-	HBufC8 *mime = GetNextStringLC( aItem, _L("mime") ) ;
-	
-    SetURIL( nodename );
-    
-        
-    TPtrC8 mimePtr( *mime == KNullDesC8 ? KDefaultType() : mime->Des() );
-    
-    TPtrC8 parentURI(RemoveLastSeg(nodename));
-    HBufC8 *luid = GetLuidAllocLC( parentURI );
-     
-//    
-//    virtual void UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID,
-//									const TDesC8& aObject, const TDesC8& aType,
-//									TInt aStatusRef ) = 0;
-//   
-	Adapter()->UpdateLeafObjectL( *iURI , *luid, data, mimePtr, 3);
-	if ( iStatus == MSmlDmAdapter::EOk )
-		{
-		iLog->Log( _L("UpdateLeafDataL: UpdateLeafObjectL Successful! %d" ), iStatus );	
-		}
-	else
-		{
-		iLog->Log( _L("UpdateLeafDataL UpdateLeafObjectL Error ! %d" ), iStatus );	
-		ret = KErrGeneral ;
-		}
-	
-	CleanupStack::PopAndDestroy(); // mime
-	CleanupStack::PopAndDestroy(); // luid
-	CleanupStack::PopAndDestroy(); // data
-	CleanupStack::PopAndDestroy(); // nodename
-	iLog->Log( _L("UpdateLeafDataL Test Complete with status %d" ), ret );	
-
-    return ret;
-	}	
-			
-TInt Cdmatest::FetchLeafL( CStifItemParser& aItem )	
-	{
-
-    TInt ret( KErrNone );
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("Camtest"), _L("FetchLeafL") );
-
-	iResultsFunction = NULL;
-	
-    TInt i( 0 );
-    TPtrC8 nodename ( GetNextStringLC( aItem, _L( "nodename" ) )->Des() ) ;
-    
-    //TPtrC datafile;
-    TPtrC datafile( KNullDesC );
-    i = aItem.GetNextString ( datafile ) ;
-    if ( i != KErrNone ) 
-	    {
-	    iLog->Log(_L("FetchLeafL: ERROR Reading outfile argument: 0x%X"), i );
-	    //return i;
-	    }
-	else
-		{
-		iSaveFileName = datafile;
-		iLog->Log( _L( " Save file nameis '%S'" ), &iSaveFileName );
-		iResultsFunction = SaveDataL;
-		}
-    
-	SetURIL(nodename) ;
-		
-		/*
-			void FetchLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID,
-								   const TDesC8& aType, TInt aResultsRef,
-								   TInt aStatusRef );
-		*/
-    TPtrC8 parentURI(RemoveLastSeg(nodename));
-    HBufC8 *luid = GetLuidAllocLC( parentURI );
-
-	Adapter()->FetchLeafObjectL( *iURI, *luid, KEmptyType, 7, 8 ) ;
-	if ( iStatus == MSmlDmAdapter::EOk )
-		{
-		iLog->Log( _L("FetchLeafL: FetchLeafObjectL Successful! %d" ), iStatus );	
-		}
-	else
-		{
-		iLog->Log( _L("FetchLeafL: FetchLeafObjectL Error ! %d" ), iStatus );	
-		ret = KErrGeneral ;
-		}
-	CleanupStack::PopAndDestroy( luid );
-	CleanupStack::PopAndDestroy(  ); // nodename
-	iLog->Log( _L("FetchLeafL Test Complete with status %d" ), ret );	
-    return ret;
-	}	
-
-
-TInt Cdmatest::ExecuteLeafL( CStifItemParser& aItem )		
-	{
-	TInt ret( KErrNone );
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("Camtest"), _L("ExecuteLeafL") );
-
-	iResultsFunction = NULL;
-	
-    TPtrC8 nodename( GetNextStringLC ( aItem, _L("Nodename") )->Des() ) ;
-    TPtrC8 data( GetNextStringLC ( aItem, _L("Input file") )->Des() ) ;
-	
-	SetURIL(nodename) ;
-
-		/*
-			virtual void ExecuteCommandL( const TDesC8& aURI, const TDesC8& aLUID,
-							      const TDesC8& aArgument, const TDesC8& aType,
-								  TInt aStatusRef ) = 0;
-		*/
-	TDataType type;
-	
-    TPtrC8 parentURI(RemoveLastSeg(nodename));
-    HBufC8 *luid = GetLuidAllocLC( parentURI );
-
-	Adapter()->ExecuteCommandL( *iURI, *luid, data, KEmptyType, 11 ) ;
-	if ( iStatus == MSmlDmAdapter::EOk )
-		{
-		iLog->Log( _L("ExecuteLeafL: ExecuteCommandL Successful! %d" ), iStatus );	
-		}
-	else
-		{
-		iLog->Log( _L("ExecuteLeafL: ExecuteCommandL FetchLeafObjectL Error ! %d" ), iStatus );	
-		ret = KErrGeneral ;
-		}
-	CleanupStack::PopAndDestroy( luid ); // luid
-	CleanupStack::PopAndDestroy(); // data
-	CleanupStack::PopAndDestroy(); // nodename
-	
-	iLog->Log( _L("ExecuteLeafL: Test Complete with status %d" ), ret );	
-
-    return ret;
-	}
-	
-TInt Cdmatest::CompleteCommandsL( CStifItemParser& /*aItem*/ )
-	{
-	TRAPD( err, Adapter()->CompleteOutstandingCmdsL() );
-	delete iAdapter;
-	iAdapter = NULL;
-	return err;
-	}
-TInt Cdmatest::DeleteObjectL( CStifItemParser& aItem )
-{
-	TInt ret( KErrNone );
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("Camtest"), _L("DeleteObjectL") );
-
-    TPtrC8 nodename( GetNextStringLC ( aItem, _L("Nodename") )->Des() ) ;
-
-	SetURIL(nodename) ;
-
-	HBufC8 *luid = GetLuidAllocLC( *iURI );
-	Adapter()->DeleteObjectL( *iURI, *luid, 11 ) ;
-	if ( iStatus == MSmlDmAdapter::EOk )
-		{
-		iLog->Log( _L("DeleteNode: DeleteObjectL Successful! %d" ), iStatus );	
-		}
-	else
-		{
-		iLog->Log( _L("DeleteNode: DeleteObjectL FetchLeafObjectL Error ! %d" ), iStatus );	
-		ret = KErrGeneral ;
-		}
-	CleanupStack::PopAndDestroy( luid ); // luid
-	CleanupStack::PopAndDestroy(); // nodename	
-	iLog->Log( _L("ExecuteLeafDataL Test Complete with status %d" ), ret );	
-
-    return ret;	
-}
-	
-TInt Cdmatest::ExecuteLeafDataL( CStifItemParser& aItem )		
-	{
-	TInt ret( KErrNone );
-
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("Camtest"), _L("ExecuteLeafL") );
-
-	iResultsFunction = NULL;
-	
-    TPtrC8 nodename( GetNextStringLC ( aItem, _L("Nodename") )->Des() ) ;
-    TPtrC8 data( GetNextStringLC ( aItem, _L("Input data") )->Des() ) ;
-    
-	SetURIL(nodename) ;
-
-		/*
-			virtual void ExecuteCommandL( const TDesC8& aURI, const TDesC8& aLUID,
-							      const TDesC8& aArgument, const TDesC8& aType,
-								  TInt aStatusRef ) = 0;
-		*/
-	HBufC8 *luid = GetLuidAllocLC( *iURI );
-	Adapter()->ExecuteCommandL( *iURI, *luid, data, KEmptyType, 11 ) ;
-	if ( iStatus == MSmlDmAdapter::EOk )
-		{
-		iLog->Log( _L("ExecuteLeafDataL: ExecuteCommandL Successful! %d" ), iStatus );	
-		}
-	else
-		{
-		iLog->Log( _L("ExecuteLeafDataL: ExecuteCommandL FetchLeafObjectL Error ! %d" ), iStatus );	
-		ret = KErrGeneral ;
-		}
-	CleanupStack::PopAndDestroy(); // luid
-	CleanupStack::PopAndDestroy(); // data		
-	CleanupStack::PopAndDestroy(); // nodename	
-	iLog->Log( _L("ExecuteLeafDataL Test Complete with status %d" ), ret );	
-
-    return ret;
-	}
-
-
-HBufC8 *Cdmatest::LoadFileLC( const TDesC &aFileName, TDataType &aType )	
-	{
-	RFs fs ;
-	LEAVE_IF_ERROR( fs.Connect(), _L( "Could not connect fileserver: %d"  ) );
-	
-	CleanupClosePushL( fs );
-	RFile file ;
-	LEAVE_IF_ERROR( file.Open(fs,aFileName,EFileRead), _L( "Could not open file: %d" ) );
-	
-	
-	
-	CleanupClosePushL( file );
-	TInt dataSize ;
-	LEAVE_IF_ERROR( file.Size( dataSize ), _L( "Could not get file size: %d" ) );
-	HBufC8 *nodedata = HBufC8::NewL ( dataSize );
-	CleanupStack::PushL( nodedata );
-	TPtr8 nodedataptr( nodedata->Des() );
-	LEAVE_IF_ERROR( file.Read( nodedataptr ), _L( "Could not read file: %d" ) );
-	TDataRecognitionResult aDataType;
-	RApaLsSession ls ;
-	TInt err( ls.Connect() );
-	if ( err == KErrNone )
-		{
-		CleanupClosePushL( ls );
-		err = ls.RecognizeData(aFileName, nodedataptr, aDataType)  ;
-		if ( err == KErrNone )
-			{
-			aType = aDataType.iDataType;
-			}
-		else
-			{
-			iLog->Log( _L("LoadFileLC: WARNING Failed to get type: %d" ), err );
-			aType = TDataType( KDefaultType );
-			}	
-		CleanupStack::PopAndDestroy( &ls ); 
-		}
-	else
-		{
-		iLog->Log( _L("LoadFileLC: WARNING Failed to connect rapalssession: %d" ), err );
-		}	
-	CleanupStack::Pop( nodedata );
-	CleanupStack::PopAndDestroy( &file ); 
-	CleanupStack::PopAndDestroy( &fs ); 
-	CleanupStack::PushL( nodedata );
-	return nodedata ;
-	}
-
-HBufC8 *Cdmatest::LoadFileLC( const TDesC8 &aFileName, TDataType &aType )	
-	{
-	TFileName fn ;
-	fn.Copy( aFileName );
-	return LoadFileLC( fn, aType );
-	}
-	
-
-void Cdmatest::SaveDataL( TInt /*aResultsRef*/, CBufBase& aObject,
-							  const TDesC8& aType ) 
-	{
-	iLog->Log( _L8( "Saving data of type: '%S'" ), &aType );
-	RFs fs;
-	User::LeaveIfError( fs.Connect() );
-	CleanupClosePushL( fs );
-	RFile file;
-	User::LeaveIfError( file.Replace ( fs, iSaveFileName, EFileWrite ) );
-	CleanupClosePushL( file );
-	TPtrC8 p( aObject.Ptr( 0 ) );
-	User::LeaveIfError( file.Write( p ) );
-	CleanupStack::PopAndDestroy( 2 ); // file, fs
-	}
-							  
-		
-	
-void Cdmatest::FetchNodeResultsL( TInt /*aResultsRef*/, CBufBase& aObject,
-							  const TDesC8& /*aType*/ )
-	{
-	TPtrC8 ptr( aObject.Ptr( 0 ) );	
-	iLog->Log( _L8("FetchNodeResultsL for '%S': '%S'" ), iURI, &ptr );
-	
-	if ( ptr.Length() > 0 )
-		{
-		TPtrC8 last( LastURISeg( ptr ) );
-		HBufC8 *oldUri = HBufC8::NewL( iURI->Length() );
-		(*oldUri) = *iURI; 
-		do 
-			{
-			iLog->Log ( _L8( " Node: '%S' "), &last );
-			HBufC8 *nUri = HBufC8::NewLC( oldUri->Length() + 1 + last.Length() );
-			nUri->Des().Copy( *oldUri ) ;
-			nUri->Des().Append( '/' );
-			nUri->Des().Append( last );
-			
-			SetURIL( nUri );
-			//iResultsFunction = FetchNodeResultsL;
-			
-		    //TPtrC8 parentURI(RemoveLastSeg(*nUri));
-		    //HBufC8 *luid = GetLuidAllocLC( parentURI );
-		    CleanupStack::Pop( nUri );
-			
-			HBufC8 *luid = GetLuidAllocLC( *iURI );
-			
-			Adapter()->ChildURIListL( *nUri, KNullDesC8, *iEmptyMappingInfoArray, 4, 5 );//Dipak
-			
-			CleanupStack::PopAndDestroy( luid ); 			
-			
-			ptr.Set( RemoveLastURISeg( ptr ) );
-			last.Set( LastURISeg( ptr ) );
-			
-			}
-		while (last != KNullDesC8);	
-		}
-	
-	}
-	
-
-	
-TPtrC8 Cdmatest::LastURISeg( const TDesC8& aURI )
-	{
-	TInt i;
-	for( i = aURI.Length() - 1; i >= 0; i-- ) 
-		{
-		if( aURI[i] == '/' )
-			{
-			break;
-			}
-		}
-
-	if( i == 0 )
-		{
-		return aURI;
-		}
-	else
-		{
-		return aURI.Mid( i+1 );
-		}
-	}
-TPtrC8 Cdmatest::RemoveLastSeg(const TDesC8& aURI)
-	{
-	TInt i;
-	for(i=aURI.Length()-1;i>=0;i--)
-		{
-		if(aURI[i]==KNSmlDMUriSeparator)
-			{
-			break;
-			}
-		}
-
-	if(i>0)
-		{
-		return aURI.Left(i);
-		}
-	else
-		{
-		return KNullDesC8();
-		}
-	}
-
-// ------------------------------------------------------------------------------------------------
-// TPtrC8 Cdmatest::RemoveLastURISeg(const TDesC8& aURI)
-// returns parent uri, i.e. removes last uri segment
-// ------------------------------------------------------------------------------------------------
-TPtrC8 Cdmatest::RemoveLastURISeg( const TDesC8& aURI )
-	{
-	TInt i;
-	for ( i = aURI.Length() - 1; i >= 0 ; i-- )
-		{
-		if( aURI[i] == '/' )
-			{
-			break;
-			}
-		}
-	if ( i > -1 )
-		{
-		return aURI.Left( i );	
-		}
-	else
-		{
-		return KNullDesC8();
-		}
-	}	
-	
-TPtrC Cdmatest::RemoveLastURISeg( const TDesC& aURI )
-	{
-	TInt i;
-	for ( i = aURI.Length() - 1; i >= 0 ; i-- )
-		{
-		if( aURI[i] == '/' )
-			{
-			break;
-			}
-		}
-	if ( i > -1 )
-		{
-		return aURI.Left( i );	
-		}
-	else
-
-		{
-		return KNullDesC();
-		}
-	}		
-	
-void Cdmatest::SetURIL( const TDesC& aURI )
-	{
-	if ( iURI != NULL )
-		{
-		delete iURI ;
-		iURI = NULL;
-		}
-	iURI = HBufC8::NewL( aURI.Length() ) ;
-	iURI->Des().Copy( aURI );
-	}
-	
-void Cdmatest::SetURIL( const TDesC8& aURI )
-	{
-	if ( iURI != NULL )
-		{
-		delete iURI ;
-		iURI = NULL;
-		}
-	iURI = HBufC8::NewL( aURI.Length() ) ;
-	iURI->Des().Copy( aURI );
-	}	
-
-void Cdmatest::SetURIL( HBufC8* aURI )
-	{
-	if ( iURI != NULL )
-		{
-		delete iURI ;
-		iURI = NULL;
-		}
-	iURI = aURI ;
-	}
-		
-		
-		
-void Cdmatest::SetResultsL( 
-	TInt aResultsRef, 
-	CBufBase& aObject,
-	const TDesC8& aType )
-	{
-	TPtrC8 ptr( aObject.Ptr(0) );
-	iLog->Log( _L8( "SetResults, ref=%d, object='%S', type='%S'" ), aResultsRef, &ptr, &aType );
-	if ( iResultsFunction )
-		{
-		(this->*iResultsFunction)( aResultsRef, aObject, aType );
-		iResultsFunction = NULL ;
-		}
-	
-	}
-
-
-void Cdmatest::SetStatusL( TInt aStatusRef,
-							 MSmlDmAdapter::TError aErrorCode ) 
-	{
-	iStatus = aErrorCode ;
-	iLog->Log( _L( "SetStatusL, ref=%d, code=%d" ), aStatusRef, aErrorCode );
-	
-	
-	}
-	
-void Cdmatest::SetMappingL( const TDesC8& aURI, const TDesC8& aLUID ) 
-	{
-	iLog->Log( _L8( "SetMappingL, aURI='%s', aLUID='%s'" ), aURI.Ptr(), aLUID.Ptr() );	
-	
-	iMappingTable.Append(TMapping( aURI, aLUID ) )	;
-	}
-	
-HBufC8* Cdmatest::GetLuidAllocL( const TDesC8& aURI ) 
-	{
-	iLog->Log( _L8( "GetLuidAllocL, aURI='%S'" ), &aURI );		
-	HBufC8 *res = NULL;		
-	for( TInt i(0); i < iMappingTable.Count(); i++ )	
-		{
-		if ( aURI == iMappingTable[i].iURI )
-			{
-			res = iMappingTable[i].iLuid.AllocL();
-			}
-		}
-	if ( res == NULL )
-		{
-		res = HBufC8::NewL( 0 );
-		}
-	iLog->Log( _L8( "GetLuidAllocL, response='%S'" ), res );
-	return res;
-	}	    
-    
-HBufC8* Cdmatest::GetLuidAllocLC( const TDesC8& aURI ) 
-	{
-	iLog->Log( _L8( "GetLuidAllocL, aURI='%S'" ), &aURI );
-	HBufC8 *res = NULL;		
-	for( TInt i(0); i < iMappingTable.Count(); i++ )	
-		{
-		if ( aURI == iMappingTable[i].iURI )
-			{
-			res = iMappingTable[i].iLuid.AllocLC();
-			break;
-			}
-		}
-	if ( res == NULL )
-		{
-		res = HBufC8::NewLC( 0 );
-		}
-	iLog->Log( _L8( "GetLuidAllocLC, response='%S'" ), res );
-	return res ;
-	}	
-    	
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-    
-void Cdmatest::GetMappingInfoListL( const TDesC8& /*aURI*/,
-								CArrayFix<TSmlDmMappingInfo>& /*aSegmentList*/ )
-	{
-	// do nothing
-	}								
-
-#else
-// nothing
-#endif
-//***************************************************************************
-//  End of File
--- a/omadm/omadmextensions/adapters/email/tsrc/src/emailtest.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,117 +0,0 @@
-/*
-* Copyright (c) 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:  Implementation of DM adapter test component
-* 	This is part of omadmextensions/adapter test application.
-*
-*/
-
-
-
-
-
-
-// INCLUDE FILES
-#include <Stiftestinterface.h>
-#include "emailTest.h"
-#include <stiflogger.h>
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CemailTest::CemailTest
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-/*CemailTest::CemailTest( 
-    CTestModuleIf& aTestModuleIf ):
-        CScriptBase( aTestModuleIf )
-    {
-    }*/
-CemailTest::CemailTest( CTestModuleIf& aTestModuleIf )
-		: Cdmatest( aTestModuleIf, KAdapterUid )
-    {
-    }
-// -----------------------------------------------------------------------------
-// CemailTest::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CemailTest::ConstructL()
-    {
-/*    iLog = CStifLogger::NewL( KamtestLogPath, 
-                          KamtestLogFile,
-                          CStifLogger::ETxt,
-                          CStifLogger::EFile,
-                          EFalse );*///Commented the Part for emailTest Dipak
-    iLog = CStifLogger::NewL( KamtestLogPath, 
-                          KamtestLogFile,
-                          CStifLogger::ETxt,
-                          CStifLogger::EFile );
-                          
-    iLog->Log( _L( "Loading Adapter" ) );
-    
-	Cdmatest::ConstructL();                         	
-
-    }
-
-// -----------------------------------------------------------------------------
-// CemailTest::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CemailTest* CemailTest::NewL( 
-    CTestModuleIf& aTestModuleIf )
-    {
-    CemailTest* self = new (ELeave) CemailTest( aTestModuleIf );
-    
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop();
-
-    return self;
-    
-    }
-    
-// Destructor
-CemailTest::~CemailTest()
-    { 
-    
-    // Delete resources allocated from test methods
-//    Delete();
-    
-    // Delete logger
-//    delete iLog;  
-    
-    }
-
-// ========================== OTHER EXPORTED FUNCTIONS =========================
-
-// -----------------------------------------------------------------------------
-// LibEntryL is a polymorphic Dll entry point.
-// Returns: CScriptBase: New CScriptBase derived object
-// -----------------------------------------------------------------------------
-//
-EXPORT_C CScriptBase* LibEntryL( 
-    CTestModuleIf& aTestModuleIf ) // Backpointer to STIF Test Framework
-    {
-    
-    return ( CScriptBase* ) CemailTest::NewL( aTestModuleIf );
-        
-    }
-
-
-    
-//  End of File
--- a/omadm/omadmextensions/adapters/email/tsrc/src/emailtestBlocks.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,108 +0,0 @@
-/*
-* Copyright (c) 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:  Implementation of DM adapter test component
-* 	This is part of omadmextensions/adapter test application.
-*
-*/
-
-
-
-
-
-
-// INCLUDE FILES
-#include <e32svr.h>
-#include <StifParser.h>
-#include <Stiftestinterface.h>
-#include "emailTest.h"
-#include <e32math.h>
-#include <f32file.h>
-#include <swinstapi.h>
-
-
-//using namespace NApplicationManagement;//Dipak
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CemailTest::Delete
-// Delete here all resources allocated and opened from test methods. 
-// Called from destructor. 
-// -----------------------------------------------------------------------------
-//
-void CemailTest::Delete() 
-    {
-    
-    }
-    
-// -----------------------------------------------------------------------------
-// CemailTest::RunMethodL
-// Run specified method. Contains also table of test mothods and their names.
-// -----------------------------------------------------------------------------
-//
-TInt CemailTest::RunMethodL( 
-    CStifItemParser& aItem ) 
-    {
-   
-    TStifFunctionInfo const KFunctions[] =
-        {  
-        // Copy this line for every implemented function.
-        // First string is the function name used in TestScripter script file.
-        // Second is the actual implementation member function. 
-        ENTRY( "DDFStructure", CemailTest::DDFStructureL),
-        ENTRY( "FetchNode", CemailTest::FetchNodeL ),
-        ENTRY( "FetchLeaf", CemailTest::FetchLeafL ),
-        ENTRY( "AddNode", CemailTest::AddNodeL ),
-        ENTRY( "UpdateLeaf", CemailTest::UpdateLeafL ),
-        ENTRY( "UpdateLeafData", CemailTest::UpdateLeafDataL ),
-        ENTRY( "Execute", CemailTest::ExecuteLeafL ),
-        ENTRY( "ExecuteData", CemailTest::ExecuteLeafDataL ),
-        ENTRY( "DeleteNode", CemailTest::DeleteObjectL ),
-        ENTRY( "StartAtomic", CemailTest::StartAtomicL),
-	    ENTRY( "CommitAtomic", CemailTest::CommitAtomicL),
-	    ENTRY( "RollbackAtomic", CemailTest::RollbackAtomicL),
-	    ENTRY( "CompleteCommands", CemailTest::CompleteCommandsL),
-        };
-
-    const TInt count = sizeof( KFunctions ) / 
-                        sizeof( TStifFunctionInfo );
-
-    return RunInternalL( KFunctions, count, aItem );
-
-    }    
-
-        
-        
-HBufC8 *CemailTest::GetNextStringLC ( CStifItemParser& aItem, const TDesC &aName )
-	{
-	TPtrC nodename;
-	nodename.Set( KNullDesC );
-
-    TInt i( aItem.GetNextString ( nodename ) );
-    if ( i != KErrNone ) 
-	    {
-	    iLog->Log( _L( "ERROR Reading '%S' argument: 0x%X" ), &aName, i );
-	    }
-	else
-		{
-		iLog->Log( _L("%S: %S"), &aName, &nodename);
-		}
-	
-	HBufC8 *buf = HBufC8::NewLC( nodename.Length() ) ;
-	buf->Des().Copy( nodename );
-	
-	return buf;
-	}
-	
-//  End of File
--- a/omadm/omadmextensions/adapters/fota/bld/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-/*
-* Copyright (c) 2004 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:    build info file for Fota adapter
-*
-*/
-
-
-
-
-#include <platform_paths.hrh>
-
-PRJ_EXPORTS
-
-// Generic configuration interface for component cenrep settings  
-../conf/fotaadapter.confml                    APP_LAYER_CONFML(fotaadapter.confml)
-../conf/fotaadapter_101F9A08.crml 	        APP_LAYER_CRML(fotaadapter_101F9A08.crml)
-
-// ARMv5 udeb
-../src/101F9A02.SPD        /epoc32/release/armv5/udeb/z/private/100012a5/policy/101f9a02.spd
-
-// ARMv5 urel
-../src/101F9A02.SPD        /epoc32/release/armv5/urel/z/private/100012a5/policy/101f9a02.spd
-
-// WINSCW udeb
-../src/101F9A02.SPD        /epoc32/release/winscw/udeb/z/private/100012a5/policy/101f9a02.spd
-
-// WINSCW urel
-../src/101F9A02.SPD        /epoc32/release/winscw/urel/z/private/100012a5/policy/101f9a02.spd
-
-
-
-PRJ_MMPFILES
-./nsmldmfotaadapter.mmp
-
-
-
-
--- a/omadm/omadmextensions/adapters/fota/bld/nsmldmfotaadapter.mmp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-/*
-* Copyright (c) 2004 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:    DM Fota Adapter
-*
-*/
-
-
-
-
-#include "defaultcaps.hrh"
-#include  <platform_paths.hrh>
-
-CAPABILITY		CAP_GENERAL_DLL
-TARGET          nsmldmfotaadapter.dll
-TARGETTYPE      PLUGIN
-UID             0x10009D8D 0x101F9A08
-VENDORID        VID_DEFAULT
-
-//Default system include paths for app layer modules.
-APP_LAYER_SYSTEMINCLUDE
-SYSTEMINCLUDE 	/epoc32/include/ecom
-
-
-USERINCLUDE     ../inc
-USERINCLUDE     ../../inc
-
-SOURCEPATH      ../src
-SOURCE          nsmldmfotaadapter.cpp
-SOURCE          nsmldmfotaadapterdb.cpp
-
-START RESOURCE nsmldmfotaadapter.rss
-LANGUAGE_IDS
-END
-
-
-
-LIBRARY        	euser.lib ecom.lib nsmldebug.lib
-LIBRARY         efsrv.lib edbms.lib estor.lib
-LIBRARY         sysutil.lib bafl.lib
-LIBRARY			fotaengine.lib
-LIBRARY			syncmlclientapi.lib
-LIBRARY			nsmlprivateapi.lib
-LIBRARY         centralrepository.lib
-LIBRARY     	nsmldmtreedbclient.lib
-
-SMPSAFE
Binary file omadm/omadmextensions/adapters/fota/cenrep/keys_fotaadapter.xls has changed
Binary file omadm/omadmextensions/adapters/fota/conf/fotaadapter.confml has changed
Binary file omadm/omadmextensions/adapters/fota/conf/fotaadapter_101F9A08.crml has changed
--- a/omadm/omadmextensions/adapters/fota/inc/fotaadapterCRKeys.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-/*
-* 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:    FotaAdapter private CenRep key definitions
-*
-*/
-
-
-
-
-#ifndef FOTAADAPTERCRKEYS_H
-#define FOTAADAPTERCRKEYS_H
-
-// CONSTANTS
-
-// key uid
-const TUid KCRUidFotaAdapter = {0x101F9A08};
-
-// Fota adapter is loaded iff key is on
-const TUint32 KCRFotaAdapterEnabled = 0x00000001;
-
-
-#endif // FOTAADAPTERCRKEYS_H
-            
-// End of File
--- a/omadm/omadmextensions/adapters/fota/inc/nsmldmfotaadapter.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,565 +0,0 @@
-/*
-* Copyright (c) 2004 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:    DM Fota Adapter
-*
-*/
-
-
-
-
-#ifndef __NSMLDMFOTAADAPTER_H__
-#define __NSMLDMFOTAADAPTER_H__
-
-//  INCLUDES
-#include <e32base.h>
-#include <smldmadapter.h>
-#include <fotaengine.h>
-#include <fotaConst.h>
-
-#include "nsmldmfotaadapterdb.h"
-
-
-// CONSTANTS
-
-const TInt KNSmlDMFotaResultBufferExpandSize = 64;
-const TInt KNSmlDMFotaStreamingTreshold = 4096;
-const TInt KNSmlDMFotaNullPkgId = -1;
-
-// final result values
-const TInt KNSmlDMFotaUndefinedError = 410;
-const TInt KNSmlDMFotaSuccessfullDownload = 202;
-const TInt KNSmlDMFotaBadUrl = 502;
-
-// P&S keys defined & owned by FotaServer for OMA DM large object
-// sets the OMA DM large object download status
-const TUint32 KFotaLrgObjDl = 0x00000005;
-// sets the profile id used for OMA DM large object download
-const TUint32 KFotaLrgObjProfileId = 0x00000006;
-// literals for DDF structure
-_LIT8( KNSmlDMFotaNode,                     "FUMO" );
-_LIT8( KNSmlDMFotaNodeName,                 "PkgName" );
-_LIT8( KNSmlDMFotaNodeVersion,              "PkgVersion" );
-_LIT8( KNSmlDMFotaNodeDownload,             "Download" );
-_LIT8( KNSmlDMFotaNodeDownloadUrl,          "PkgURL" );
-_LIT8( KNSmlDMFotaNodeUpdate,               "Update" );
-_LIT8( KNSmlDMFotaNodeUpdateData,           "PkgData" );
-_LIT8( KNSmlDMFotaNodeDownloadAndUpdate,    "DownloadAndUpdate" );
-_LIT8( KNSmlDMFotaNodeDownloadAndUpdateUrl, "PkgURL" );
-_LIT8( KNSmlDMFotaNodeState,                "State" );
-
-// descriptions for DDF nodes
-_LIT8( KNSmlDMFotaNodeDescription,
-"Placeholder for all firmware management objects" );
-
-_LIT8( KNSmlDMFotaRunTimeNodeDescription,
-"Placeholder for a single firmware management object" );
-
-_LIT8( KNSmlDMFotaNodeNameDescription,
-"Name of a firmware update package" );
-
-_LIT8( KNSmlDMFotaNodeVersionDescription,
-"Version of a firmware update package" );
-
-_LIT8( KNSmlDMFotaNodeDownloadDescription,
-"Execution target for firmware update package download" );
-
-_LIT8( KNSmlDMFotaNodeDownloadUrlDescription,
-"Url to a location containing binary firmare update package" );
-
-_LIT8( KNSmlDMFotaNodeUpdateDescription,
-"Execution target for installing update package to device" );
-
-_LIT8( KNSmlDMFotaNodeUpdateDataDescription,
-"Binary data used in installation" );
-
-_LIT8( KNSmlDMFotaNodeDownloadAndUpdateDescription,
-"Execution target for downloading firmware update package and installing it" );
-
-_LIT8( KNSmlDMFotaNodeDownloadAndUpdateUrlDescription,
-"Url to a location containing binary firmare update package" );
-
-_LIT8( KNSmlDMFotaNodeStateDescription,
-"Current state of firmware update" );
-
-// mime types etc
-_LIT8( KNSmlDMFotaRunTimeMimeType,
-"org.openmobilealliance/1.0/FirmwareUpdateManagementObject" );
-
-_LIT8( KNSmlDMFotaTextPlain,    "text/plain" );
-_LIT8( KNSmlDMFotaDDFVersion,   "1.0" ); 
-
-_LIT8( KNSmlDMFotaUpdateMetaType,
-"org.openmobilealliance.dm.firmwareupdate.update" );
-
-_LIT8( KNSmlDMFotaDownloadMetaType,
-"org.openmobilealliance.dm.firmwareupdate.download" );
-
-_LIT8( KNSmlDMFotaDownloadAndUpdateMetaType,
-"org.openmobilealliance.dm.firmwareupdate.downloadandupdate" );
-
-_LIT8( KNSmlDMFotaMetaFormat, "text/plain" );
-
-_LIT8( KNSmlDMFotaRunTimeChildren,
-"PkgName/PkgVersion/Download/Update/DownloadAndUpdate/State" );
-
-// uri related
-_LIT8( KNSmlDMFotaSeparatorDes, "/" );
-_LIT8( KNSmlDMFotaRuntimeMatch, "*FUMO/*" );
-_LIT8( KNSmlDMFotaRootMatch,    "*FUMO" );
-
-
-/**
-*  CNSmlDmFotaAdapter, the main adapter class of Fota. Provides methods 
-*  to access and modify FUMO objects.
-*  
-*  @lib nsmldmfotaadapter.lib
-*  
-*/
-class CNSmlDmFotaAdapter : public CSmlDmAdapter
-    {
-
-public:
-
-    /**
-    * Two-phased constructor.
-    * @param aDmCallback A pointer to DM Callback, which is used to 
-    * set statuses and results of commands.
-    * @return A pointer to the newly created adapter.
-    */
-    static CNSmlDmFotaAdapter* NewL( MSmlDmCallback* aDmCallback );
-    
-    /**
-    * Two-phased constructor. Pushes the pointer onto the CleanupStack.
-    * @param aDmCallback A pointer to DM Callback, which is used to 
-    * set statuses and results of commands.
-    * @return A pointer to the newly created adapter.
-    */
-    static CNSmlDmFotaAdapter* NewLC( MSmlDmCallback* aDmCallback );
-
-    /**
-    * Destructor.
-    */
-    virtual ~CNSmlDmFotaAdapter();
-    
-public: 
-    
-    // from CSmlDmAdapter
-    
-    /**
-    * Sets current version of Fota adapter's DDF structure to aDDFVersion.
-    * @param aVersion Buffer which on return contains the version.
-    */
-    void DDFVersionL( CBufBase& aDDFVersion );
-    
-    /**
-    * Fills the DDF structure of firmware management object using the given 
-    * reference as the root of DDF. Also checks if there are any Generic 
-    * Alerts to be sent to current remote DM server. If there are, delegates 
-    * the alerts to SOS Server using Private API.
-    * @param aDDFObject Reference to root DDF node.
-    */
-    void DDFStructureL( MSmlDmDDFObject& aDDF );
-    
-    /**
-    * Updates a leaf object in FUMO. Sets ENotFound as status to DM Framework,
-    * if aURI and/or aLUID is not valid.
-    * @param aURI Uri which spesifies the leaf to be updated in a firmware 
-    * object.
-    * @param aLUID Identifier used to identify in which firmware object 
-    * the leaf should be updated.
-    * @param aObject Data used in the update.
-    * @param aType Mime type of the data. Ignored in Fota adapter.
-    * @param aStatusRef Identifier that is used when setting the completion
-    * status to DM Framework.
-    */
-    void UpdateLeafObjectL( const TDesC8& aURI,
-                            const TDesC8& aLUID, 
-                            const TDesC8& aObject, 
-                            const TDesC8& aType, 
-                            TInt aStatusRef );
-    
-    /**
-    * Deletes a firmware object from Fota DB. If aURI does not point to a 
-    * runtime node and/or aLUIDis invalid, ENotFound is set as status for 
-    * this command.
-    * @param aURI Uri which spesifies a firmware object.
-    * @param aLUID Identifier used to identify in which firmware object 
-    * should be deleted.
-    * @param aStatusRef Identifier that is used when setting the completion 
-    * status to DM Framework.
-    */
-    void DeleteObjectL( const TDesC8& aURI,
-                        const TDesC8& aLUID, 
-                        const TInt aStatusRef ); 
-    
-    /**
-    * Fetches a leaf object in FUMO. Sets ENotFound as status to DM Framework,
-    * if aURI and/or aLUID is not valid.
-    * @param aURI Uri which spesifies the leaf to be fetched.
-    * @param aLUID Identifier used to identify from which firmware object the 
-    * leaf should be fetched.
-    * @param aType Mime type that server wishes to be used in the returned data.
-    * Ignored in Fota adapter (but used when setting the result).
-    * @param aResultRef Identifier that is used when setting the result 
-    * (fetched data) to DM Framework.
-    * @param aStatusRef Identifier that is used when setting the completion
-    * status to DM Framework.
-    */
-    void FetchLeafObjectL( const TDesC8& aURI, 
-                           const TDesC8& aLUID, 
-                           const TDesC8& aType, 
-                           const TInt aResultsRef, 
-                           const TInt aStatusRef ); 
-    
-    /**
-    * Forms a list of children of given node (aURI) and sets the list to 
-    * DM Framework as result.
-    * @param aURI Uri which spesifies the node whose children should be 
-    * listed. In Fota this should point to either to the ./FUMO or ./FUMO/<x>.
-    * In the first case aPreviousURISegmentList is trusted and the list is 
-    * formed entirely based on it. In the latter case, a hard coded list of 
-    * run time node's children is returned.
-    * @param aLUID Identifier of aURI. Ignored in Fota adapter.
-    * @param aPreviousURISegmentList A List of aURI's children formed by 
-    * DM Framework.
-    * @param aResultRef Identifier that is used when setting the result 
-    * (fetched data) to DM Framework.
-    * @param aStatusRef Identifier that is used when setting the completion
-    * status to DM Framework.
-    */
-    void ChildURIListL( const TDesC8& aURI, 
-                        const TDesC8& aLUID, 
-                        const CArrayFix<TSmlDmMappingInfo>& aPreviousURISegmentList, 
-                        const TInt aResultsRef, 
-                        const TInt aStatusRef );
-    
-    /**
-    * Adds a firmware object to Fota DB. If aURI does not point to a runtime 
-    * node and/or aLUID is invalid, ENotFound is set as status for this 
-    * command.
-    * @param aURI Uri which spesifies the firmware object.
-    * @param aParentLUID Identifier of aURI. If this is a valid ID, then 
-    * the object has already been added and EAlreadyExists is set as status 
-    * for this command.
-    * @param aStatusRef Identifier that is used when setting the completion 
-    * status to DM Framework.
-    */
-    void AddNodeObjectL( const TDesC8& aURI, 
-                         const TDesC8& aParentLUID, 
-                         const TInt aStatusRef );
-    
-    /**
-    * This method is used to update PkgData, which is the only large object 
-    * data in FUMO. Adapter opens a stream to a data (using Fota Engine) 
-    * and sets this stream to aStream after which this method returns. DM Host
-    * Server then writes the data to the stream piece by piece and finally 
-    * calls StreamCommittedL() when all data is written.
-    * @param aURI Uri which spesifies the leaf to be updated in a firmware 
-    * object. If this does not point to ./FUMO/<x>/Update/PkgData, ENotFound 
-    * is set as status for this command.
-    * @param aLUID Identifier used to identify in which firmware object the 
-    * data should be updated.
-    * @param aStream Pointer to a stream, where the opened stream is set.
-    * @param aType Mime type of the data. Ignored in Fota adapter.
-    * @param aStatusRef Identifier that is used when setting the completion 
-    * status to DM Framework.
-    */
-    void UpdateLeafObjectL( const TDesC8& aURI,
-                            const TDesC8& aLUID, 
-                            RWriteStream*& aStream, 
-                            const TDesC8& aType, 
-                            const TInt aStatusRef );
-    
-    /**
-    * Fetches the size of leaf object's data in bytes. Sets ENotFound as 
-    * status to DM Framework, if aURI and/or aLUID is not valid.
-    * @param aURI Uri which spesifies the leaf whose data is measured.
-    * @param aLUID Identifier used to identify from which firmware object 
-    * the leaf size should be counted.
-    * @param aType Mime type that server wishes to be used in the returned 
-    * data. Ignored in Fota adapter (but used when setting the result)
-    * @param aResultRef Identifier that is used when setting the result 
-    * (fetched data) to DM Framework.
-    * @param aStatusRef Identifier that is used when setting the completion 
-    * status to DM Framework.
-    */
-    void FetchLeafObjectSizeL( const TDesC8& aURI,
-                               const TDesC8& aLUID, 
-                               const TDesC8& aType, 
-                               const TInt aResultsRef, 
-                               const TInt aStatusRef );
-    
-    /**
-    * Executes command targeting Download, DownloadAndUpdate or Update. In any
-    * other case, ENotFound is set as status for this command. Saves all 
-    * the data needed when reporting the final result of this command in 
-    * the beginning of next DM session, fetches needed data for the command 
-    * and delegates the command to Fota Engine.
-    * @param aURI Uri which spesifies the target node for the exec command.
-    * @param aLUID Identifier used to identify the firmware object where the 
-    * target node lies.
-    * @param aArgument The argument data of the exec command. In Fota this is 
-    * an overloaded feature, and this parameter contains the Correlator of 
-    * the exec command.
-    * @param aType Mime type of aArgument. Ignored in Fota adapter.
-    * @param aStatusRef Identifier that is used when setting the completion 
-    * status to DM Framework.
-    */
-    void ExecuteCommandL( const TDesC8& aURI, 
-                          const TDesC8& aLUID,
-                          const TDesC8& aArgument, 
-                          const TDesC8& aType, 
-                          const TInt aStatusRef );
-    
-    /**
-    * Not supported.
-    */
-    void ExecuteCommandL( const TDesC8& aURI, 
-                          const TDesC8& aLUID, 
-                          RWriteStream*& aStream, 
-                          const TDesC8& aType, 
-                          const TInt aStatusRef );
-    
-    /**
-    * Not supported.
-    */
-    void CopyCommandL( const TDesC8& aTargetURI, 
-                       const TDesC8& aTargetLUID, 
-                       const TDesC8& aSourceURI, 
-                       const TDesC8& aSourceLUID, 
-                       const TDesC8& aType, 
-                       TInt aStatusRef );
-    
-    /**
-    * Not supported.
-    */
-    void StartAtomicL();
-    
-    /**
-    * Not supported.
-    */
-    void CommitAtomicL();
-    
-    /**
-    * Not supported.
-    */
-    void RollbackAtomicL();
-    
-    /**
-    * Returns whether or not streaming is supported in this adapter. In Fota
-    * this method is also used to enquire whether or not a large object 
-    * whose size is given in aItemSize fits to disk (OOD check using Fota 
-    * Engine), and to acknowledge that Generic Alerts have been successfully 
-    * sent. If aItemSize is larger that 0, OOD check feature is executed. If 
-    * aItemSize equals KNSmlDMResetGenAlerts, Generic Alerts are marked sent.
-    * Otherwise aItemSize is set to a treshold value, which is used by DM 
-    * Host Server to determine if streaming should be used (large object) 
-    * or not.
-    * @param aItemSize If this parameter is larger than zero in the beginning,
-    * on return it equals KErrNone if the data fits to disk, and KErrNoMemory 
-    * if not. If in the beginning this param equals KNSmlDMResetGenAlerts, 
-    * Generic Alerts are marked sent. Otherwise if in the beginning this param
-    * is less or equal to zero, on return it equals to the treshold value 
-    * mentioned above.
-    * @return Whether or not streaming is supported in this adapter 
-    * (ETrue always).
-    */
-    TBool StreamingSupport( TInt& aItemSize );
-    
-    /**
-    * DM Host Server notifies Fota adapter using this method, when all data 
-    * has been written to the stream opened for streaming in UpdateLeafObjectL 
-    * targeting PkgData. Fota adapter forwards this notification to Fota 
-    * Engine.
-    */
-    void StreamCommittedL();
-    
-    /**
-    * Not supported.
-    */
-    void CompleteOutstandingCmdsL();
-    
-private:
-
-    /**
-    * Check if fota table exists
-    * @param aLUID    ID of the node
-    * @return  whether table exists
-    */
-    TBool TableExistsL(const TDesC8& aLUID) const;
-
-    /**
-    * Default constructor.
-    * @param aEcomArguments A pointer to MSmlDmCallback which is received 
-    * through ECom. The pointer is passed on to base class.
-    */
-    CNSmlDmFotaAdapter( TAny* aEcomArguments );
-    
-    /**
-    * Second phase construction.
-    */
-    void ConstructL();
-    
-    /**
-    * Fetches the data in firmware object identified by aLUID (object) and 
-    * aURI (leaf).
-    * @param aURI Identifies the leaf whose data should be fetched.
-    * @param aLUID Identifies the FW object in which the leaf object is.
-    * @param aObject Reference to CBufBase to which the fetched data is 
-    * written.
-    * @return Status code according to the success of the fetch.
-    */
-    CSmlDmAdapter::TError DoFetchObjectL( const TDesC8& aURI, 
-                                          const TDesC8& aLUID, 
-                                          CBufBase& aObject );
-    
-    /**
-    * Gets data needed for Update execution from Fota DB and notifies 
-    * Fota Engine. Note: this method does not wait for Fota Engine to 
-    * execute the command, but immediately returns when Fota Engine has been 
-    * notified.
-    * @param aLUID The id of the firmware object to which this exec is 
-    * targeted.
-    * @param aProfile The profile id of the currently running DM session.
-    * @return Status code according to the success of the method.
-    */
-    CSmlDmAdapter::TError DoExecUpdateL( const TNSmlDmFwObjectId aLUID, 
-                                         const TSmlProfileId aProfile );
-    
-    /**
-    * Gets data needed for Download or DownloadAndUpdate execution from 
-    * Fota DB and notifies Fota Engine. Note: this method does not wait 
-    * for Fota Engine to execute the command, but immediately returns when 
-    * Fota Engine has been notified.
-    * @param aLUID The id of the firmware object to which this exec is 
-    * targeted.
-    * @param aProfile The profile id of the currently running DM session.
-    * @param aUpdate If set ETrue, executes DownloadAndUpdate. Otherwise 
-    * executes Download.
-    * @return Status code according to the success of the method.
-    */
-    CSmlDmAdapter::TError DoExecDownloadL( const TNSmlDmFwObjectId aLUID, 
-                                           const TSmlProfileId aProfile,
-                                           TBool aUpdate );
-    
-    /**
-    * Saves all the data needed to save before any exec command and returns 
-    * the id of the profile of currently running DM session.
-    * @param aURI Management uri, which is the target of the exec command.
-    * @param aLUID Identifies the firm3ware object that is the target of the 
-    * exec command.
-    * @param aCorrelator Correlator received as an argument in the exec 
-    * command.
-    * @return Profile id of the currently running DM session.
-    */
-    TSmlProfileId SaveExecInfoL( const TDesC8& aURI, 
-                                 const TNSmlDmFwObjectId aLUID,
-                                 const TDesC8& aCorrelator );
-    
-    /**
-    * Fetches profile id and server id of the currently running DM session 
-    * using Client API.
-    * @param aProfId Reference which on succesful return contains the 
-    * profile id.
-    * @param aServerId Reference which on successful return contains 
-    * the server id.
-    */
-    void GetServerInfoL( TSmlProfileId& aProfId, HBufC8*& aServerId ) const;
-    
-    /**
-    * Checks if there are any firmware objects that have empty final results. 
-    * If there are, checks if any their final result should be reported to 
-    * currently running DM session's remote server using Generic Alert. 
-    * I.e. if the remote server is the same as with any of those firmware 
-    * object's whose execution's final result has not been reported yet, 
-    * uses Private API to generate Generic Alert about them.
-    */
-    void MakeGenericAlertsL();
-    
-    /***
-    * Checks existance of predefined node under FUMO and adds it to 
-    * DM Tree 
-    **/
-    
-    void CheckAndAddPredefinedNodeL();
-    /***
-    * Gets predefined node name to be created under FUMO from cenrep 
-    * 
-    **/
-    
-    void GetPredefinedNodeL(TDes8& aNode);
-    /**
-    * Sets final result to all those FW objects that are associated with 
-    * current DM session's remote server, have been a target to an exec 
-    * command and that exec command has been finished. I.e. Generic Alert 
-    * has been successfully sent reporting these final results, and is not 
-    * needed to be sent anymore in next DM session.
-    */
-    void MarkGenericAlertsSentL();
-    
-    /**
-    * Returns correct meta/type acoording to the execution target aURI.
-    * @param aURI The target for exec command, e.g. ./FUMO/<X>/Update
-    * @return The meta/type
-    */
-    TPtrC8 GetMetaType( const TDesC8& aURI ) const;
-    
-    /**
-    * Maps a system wide error code to a TError.
-    * @param aError A system wide error code.
-    * @return A TError value depending on aError.
-    */
-    CSmlDmAdapter::TError MapErrorToStatus( TInt aError ) const;
-    
-    /**
-    * Parses a numeric value from aLUID.
-    * @param aLUID A string representation of a signed integer.
-    * @return TInt value.
-    */
-    TInt DesToInt( const TDesC8& aLUID ) const;
-    
-    /**
-    * Return the last uri segment of the given uri. E.g. in 
-    * ./FUMO/<x>/Download last uri segment is "Download"
-    * @param aURI the uri to be parsed.
-    * @return The last segment.
-    */
-    TPtrC8 LastURISeg( const TDesC8& aURI ) const;
-    
-    /**
-    * Fills the given information to a DDF Object node.
-    * @param aNode The node whose data is filled.
-    * @param aAccTypes The access types of the node.
-    * @param aOccurance Occurance of the node.
-    * @param aScope The scope of the node.
-    * @param aFormat The format of the node's data, i.e. node/chr/bin/...
-    * @param aDescription Informal description of the node.
-    */
-    void FillNodeInfoL( MSmlDmDDFObject& aNode, 
-                        const TSmlDmAccessTypes& aAccTypes, 
-                        MSmlDmDDFObject::TOccurence aOccurrence, 
-                        MSmlDmDDFObject::TScope aScope, 
-                        MSmlDmDDFObject::TDFFormat aFormat,
-                        const TDesC8& aDescription ) const;
-
-private:
-
-    CNSmlDmFotaAdapterDb* iFotaDb;
-    RFotaEngineSession iFotaEngine;
-    
-    TInt iPkgId;
-    
-    };
-
-#endif // __NSMLDMFOTAADAPTER_H__
--- a/omadm/omadmextensions/adapters/fota/inc/nsmldmfotaadapterdb.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,458 +0,0 @@
-/*
-* Copyright (c) 2004 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:    Fota adapter's DB header file
-*
-*/
-
-
-
-
-
-#ifndef __NSMLDMFOTAADAPTERDB_H
-#define __NSMLDMFOTAADAPTERDB_H
-
-// INCLUDE FILES
-
-#include <e32std.h>
-#include <e32base.h>
-#include <d32dbms.h>
-#include <f32file.h>
-#include <SyncMLDef.h>
-#include <fotaengine.h>
-#include <fotaConst.h>
-
-// CONSTANTS
-
-// null final result value
-const TInt KNSmlFotaNullResult = 0;
-
-// Database name & location
-const TInt KNSmlFotaAdapterDbDrive = EDriveC;
-_LIT( KNSmlFotaAdapterDbName, "c:nsmldmfotaadapter.db" );
-
-// Table and column names
-_LIT( KNSmlTableFwMgmtObject,       "FwMgmtObject" );
-_LIT( KNSmlFwMgmtObjectId,          "PkgId" );
-_LIT( KNSmlFwMgmtObjectName,        "PkgName" );
-_LIT( KNSmlFwMgmtObjectVersion,     "PkgVersion" );
-_LIT( KNSmlFwMgmtObjectUrl,         "PkgURL" );
-_LIT( KNSmlFwMgmtObjectMgmtUri,     "MgmtURI" );
-_LIT( KNSmlFwMgmtObjectProfileId,   "ProfileId" );
-_LIT( KNSmlFwMgmtObjectServerId,    "ServerId" );
-_LIT( KNSmlFwMgmtObjectResult,      "FinalResult" );
-_LIT( KNSmlFwMgmtObjectCorrelator,  "Correlator" );
-
-// SQL statements
-_LIT( KNSmlCreateFwMgmtObjectTable, "CREATE TABLE FwMgmtObject ( PkgId \
-COUNTER NOT NULL, PkgName CHAR(%d), PkgVersion CHAR(%d), PkgURL LONG VARCHAR, \
-MgmtURI CHAR(%d), ProfileId INTEGER, ServerId CHAR(%d), FinalResult INTEGER, \
-Correlator CHAR(%d) )" );
-
-_LIT( KNSmlGetFwMgmtObject, "SELECT * FROM FwMgmtObject WHERE PkgId = %d" );
-
-_LIT( KNSmlGetUnfinishedFwMgmtObjects, "SELECT * FROM FwMgmtObject \
-WHERE FinalResult = %d" );
-
-_LIT( KNSmlGetUnfinishedFwMgmtObjectByServerId, "SELECT * FROM FwMgmtObject \
-WHERE FinalResult = %d AND ServerId = '%S' AND NOT (MgmtURI = '')" );
-
-_LIT( KNSmlDeleteFwMgmtObject,"DELETE FROM FwMgmtObject WHERE PkgId = %d");
-
-// Max. lengths of string fields in FwMgmtObject
-const TInt KNSmlMaxMgmtUriLength = 60;
-const TInt KNSmlMaxServerIdLength = 150;
-const TInt KNSmlMaxCorrelatorLength = 150;
-
-// Estimate of url size used in max row size (OOD checks)
-const TInt KNSmlPkgURLLengthEstimate = 350;
-
-// space needed for above integers in buffer
-const TInt KNSmlFwMgmtObjectIntLength = 4;
-
-// space needed for an integer in buffer
-const TInt KNSmlFwMgmtObjectIntegerLength = 10;
-
-// Size of empty Fota database in bytes (+ additional treshold)
-const TInt KNSmlFotaAdapterEmptyDbSize = 350;
-
-// Estimated maximum size of FwMgmtObject table row (+ additional treshold)
-const TInt KNSmlMaxFwMgmtObjectRowSize = KFotaMaxPkgNameLength + 
-                                         KFotaMaxPkgVersionLength + 
-                                         KNSmlPkgURLLengthEstimate + 
-                                         KNSmlMaxMgmtUriLength + 
-                                         KNSmlMaxServerIdLength + 
-                                         KNSmlMaxCorrelatorLength + 115;
-
-// TYPEDEFS
-typedef TInt TNSmlDmFwObjectId;
-typedef RArray<TNSmlDmFwObjectId> RNSmlDmFwObjectArray;
-
-
-
-// CLASS DECLARATION
-
-/**
-*  CNSmlDmFotaAdapterDb provides an interface for accessing Fota database.
-*  
-*  @lib nsmldmfotaadapter.lib
-*  
-*/
-class CNSmlDmFotaAdapterDb : public CBase
-    {
-
-public:
-        
-    /**
-    * Two-phased constructor.
-    * @return A pointer to the newly created instance.
-    */
-    static CNSmlDmFotaAdapterDb* NewL();    
-
-    /**
-    * Two-phased constructor. Pushes the pointer onto the CleanupStack.
-    * @return A pointer to the newly created instance.
-    */
-    static CNSmlDmFotaAdapterDb* NewLC();
-
-    /**
-    * Destructor.
-    */
-    virtual ~CNSmlDmFotaAdapterDb();
-
-    /**
-    * Adds a new row (i.e. firmware object) to the FwMgmtObject table.
-    * The values in each column are left NULL, except FinalResult to 
-    * KNSmlFotaNullResult. 
-    * Leaves with KErrDiskFull, if OOD check fails.
-    * @return The id of the new fw object in Fota database.
-    */
-    TNSmlDmFwObjectId AddFwObjectL();
-    
-    /**
-    * Deletes a firmware object from FwMgmtObject table.
-    * @param aId The identifier of the object to be deleted.
-    * @return KErrNone if the object was successfully deleted, KErrNotFound if 
-    * the object was not found from database.
-    */
-    TInt DeleteFwObjectL( const TNSmlDmFwObjectId aId );
-    
-    /**
-    * Finds all the firmware objects that have null final result and sets
-    * the ids of those objetcs to aArray.
-    * @param aArray that on return contains the ids.
-    */
-    void GetEmptyFinalResultsL( RNSmlDmFwObjectArray& aArray );
-    
-    /**
-    * Finds all the firmware objects that have null final result, server id 
-    * equals to given server id and mgmt uri is not empty. Sets the ids of 
-    * those objetcs to aArray.
-    * @param aArray Array that on return contains the ids.
-    * @param aServerId The id of the server whose empty final result values 
-    * are listed.
-    */
-    void GetEmptyFinalResultsL( RNSmlDmFwObjectArray& aArray, 
-                                const TDesC8& aServerId );
-    
-    /**
-    * Fetches the PkgName field of a firmware object from database.
-    * @param aId The identifier of the object, whose data should be fetched.
-    * @return The value in PkgName field of the object, if object was found.
-    * NULL otherwise.
-    */
-    HBufC8* PkgNameL( const TNSmlDmFwObjectId aId );
-    
-    /**
-    * Fetches the PkgVersion field of a firmware object from database.
-    * @param aId The identifier of the object, whose data should be fetched.
-    * @return The value in PkgVersion field of the object, if object was found.
-    * NULL otherwise.
-    */
-    HBufC8* PkgVersionL( const TNSmlDmFwObjectId aId );
-    
-    /**
-    * Fetches the PkgURL field of a firmware object from database.
-    * @param aId The identifier of the object, whose data should be fetched.
-    * @return The value in PkgURL field of the object, if object was found.
-    * NULL otherwise.
-    */
-    HBufC8* PkgUrlL( const TNSmlDmFwObjectId aId );
-    
-    /**
-    * Fetches the MgmtURI field of a firmware object from database.
-    * @param aId The identifier of the object, whose data should be fetched.
-    * @return The value in MgmtURI field of the object, if object was found.
-    * NULL otherwise.
-    */
-    HBufC8* MgmtUriL( const TNSmlDmFwObjectId aId );
-    
-    /**
-    * Fetches the ProfileId field of a firmware object from database.
-    * @param aId The identifier of the object, whose data should be fetched.
-    * @return The value in ProfileId field of the object, if object was found.
-    * KErrNotFound otherwise.
-    */
-    TSmlProfileId ProfileIdL( const TNSmlDmFwObjectId aId );
-    
-    /**
-    * Fetches the ServerId field of a firmware object from database.
-    * @param aId The identifier of the object, whose data should be fetched.
-    * @return The value in ServerId field of the object, if object was found.
-    * NULL otherwise.
-    */
-    HBufC8* ServerIdL( const TNSmlDmFwObjectId aId );
-    
-    /**
-    * Fetches the FinalResult field of a firmware object from database.
-    * @param aId The identifier of the object, whose data should be fetched.
-    * @return The value in FinalResult field of the object, if object was 
-    * found. KErrNotFound otherwise.
-    */
-    TInt FinalResultL( const TNSmlDmFwObjectId aId );
-    
-    /**
-    * Fetches the Correlator field of a firmware object from database.
-    * @param aId The identifier of the object, whose data should be fetched.
-    * @return The value in Correlator field of the object, if object was 
-    * found. NULL otherwise.
-    */
-    HBufC8* CorrelatorL( const TNSmlDmFwObjectId aId );
-    
-    /**
-    * Sets the value of PkgName field of a firmware object.
-    * @param aName The new value for the field.
-    * @param aId The identifier of the object, whose data should be updated.
-    * @return KErrNone, if the update was successful. KErrNotFound, if the 
-    * object was not found. KErrOverflow, if given name is too large for the 
-    * database.
-    */
-    TInt SetPkgNameL( const TDesC8& aName, const TNSmlDmFwObjectId aId );
-    
-    /**
-    * Sets the value of PkgVersion field of a firmware object.
-    * @param aVersion The new value for the field.
-    * @param aId The identifier of the object, whose data should be updated.
-    * @return KErrNone, if the update was successful. KErrNotFound, if the 
-    * object was not found. KErrOverflow, if given version is too large 
-    * for the database.
-    */
-    TInt SetPkgVersionL( const TDesC8& aVersion, const TNSmlDmFwObjectId aId );
-    
-    /**
-    * Sets the value of PkgURL field of a firmware object.
-    * @param aUrl The new value for the field.
-    * @param aId The identifier of the object, whose data should be updated.
-    * @return KErrNone, if the update was successful. KErrNotFound, if the 
-    * object was not found. KErrOverflow, if given url is too large for the 
-    * database.
-    */
-    TInt SetPkgUrlL( const TDesC8& aUrl, const TNSmlDmFwObjectId aId );
-    
-    /**
-    * Sets the value of MgmtURI field of a firmware object.
-    * @param aUri The new value for the field.
-    * @param aId The identifier of the object, whose data should be updated.
-    * @return KErrNone, if the update was successful. KErrNotFound, if the 
-    * object was not found. KErrOverflow, if given uri is too large for the 
-    * database.
-    */
-    TInt SetMgmtUriL( const TDesC8& aUri, const TNSmlDmFwObjectId aId );
-    
-    /**
-    * Sets the values of ProfileId and ServerId fields of a firmware object.
-    * @param aProfile The new value for the ProfileId.
-    * @param aServerId The new value for the ServerId.
-    * @param aId The identifier of the object, whose data should be updated.
-    * @return KErrNone, if the update was successful. KErrNotFound, if the 
-    * object was not found. KErrOverflow, if given server id is too large 
-    * for the database.
-    */
-    TInt SetServerInfoL( const TSmlProfileId aProfile, 
-                         const TDesC8& aServerId,
-                         const TNSmlDmFwObjectId aId );
-    
-    /**
-    * Sets the value of FinalResult field of a firmware object.
-    * @param aResult The new value for the field.
-    * @param aId The identifier of the object, whose data should be updated.
-    * @return KErrNone, if the update was successful. KErrNotFound, if the 
-    * object was not found.
-    */
-    TInt SetFinalResultL( const TInt aResult, const TNSmlDmFwObjectId aId );
-    
-    /**
-    * Sets the value of Correlator field of a firmware object.
-    * @param aCorrelator The new value for the field.
-    * @param aId The identifier of the object, whose data should be updated.
-    * @return KErrNone, if the update was successful. KErrNotFound, if the 
-    * object was not found. KErrOverflow, if given correlator is too large 
-    * for the database.
-    */
-    TInt SetCorrelatorL( const TDesC8& aCorrelator, 
-                         const TNSmlDmFwObjectId aId );
-
-private:
-
-    /**
-    * Creates Fota database.
-    * @param aFullName Name and path of database.
-    */
-    void CreateDatabaseL( const TDesC& aFullName );
-
-    /**
-    * Sets new value to a text field in a firmware object. This method is used 
-    * by the public descriptor setters.
-    * @param aColumn The name of the field to be updated.
-    * @param aValue The new value for the field.
-    * @param aObject The identifier of the object, whose data should be 
-    * updated.
-    * @return KErrNone, if the update was successful. KErrNotFound, if the 
-    * object was not found.
-    */
-    TInt SetStrValueL( const TDesC& aColumn, 
-                       const TDesC8& aValue, 
-                       const TNSmlDmFwObjectId aObject );
-
-    /**
-    * Writes using Db streams the new value to a long text field in a 
-    * firmware object. This method is used by the public descriptor 
-    * setters (PkgURL).
-    * @param aColumn The name of the field to be updated.
-    * @param aValue The new value for the field.
-    * @param aObject The identifier of the object, whose data should 
-    * be updated.
-    * @return KErrNone, if the update was successful. KErrNotFound, if 
-    * the object was not found.
-    */
-    TInt SetLongStrValueL( const TDesC& aColumn,
-                           const TDesC8& aValue, 
-                           const TNSmlDmFwObjectId aObject );
-
-    /**
-    * Sets new value to a integer field in a firmware object. This method 
-    * is used by the public integer setters.
-    * @param aColumn The name of the field to be updated.
-    * @param aValue The new value for the field.
-    * @param aObject The identifier of the object, whose data should be 
-    * updated.
-    * @return KErrNone, if the update was successful. KErrNotFound, if the 
-    * object was not found.
-    */
-    TInt SetIntValueL( const TDesC& aColumn,
-                       const TInt aValue, 
-                       const TNSmlDmFwObjectId aObject );
-
-    /**
-    * Fetches the value in a text field of a firmware object. This method is 
-    * used by the public descriptor getters.
-    * @param aColumn The name of the field where the data should be fetched.
-    * @param aObject The identifier of the object, whose data should be 
-    * fetched.
-    * @return The value in the field, if object was found. NULL otherwise.
-    */
-    HBufC8* StrValueL( const TDesC& aColumn, const TNSmlDmFwObjectId aObject );
-
-    /**
-    * Fetches the value in a long text field of a firmware object using Db 
-    * streams. This method is used by the public descriptor getters (PkgURL).
-    * @param aColumn The name of the field where the data should be fetched.
-    * @param aObject The identifier of the object, whose data should be 
-    * fetched.
-    * @return The value in the field, if object was found. NULL otherwise.
-    */
-    HBufC8* LongStrValueL( const TDesC& aColumn, 
-                           const TNSmlDmFwObjectId aObject );
-
-    /**
-    * Fetches the value in a integer field of a firmware object. This method 
-    * is used by the public integer getters.
-    * @param aColumn The name of the field where the data should be fetched.
-    * @param aObject The identifier of the object, whose data should be 
-    * fetched.
-    * @return The value in the field, if object was found. KErrNotFound 
-    * otherwise.
-    */
-    TInt IntValueL( const TDesC& aColumn, const TNSmlDmFwObjectId aObject );
-
-    /**
-    * Prepares iView with read-only access rights to a single firmware object.
-    * @param aObject The identifier of the object, whose data is about 
-    * to be read.
-    */
-    void FetchRowL( const TNSmlDmFwObjectId aObject );
-    
-    /**
-    * Prepares iView with update access rights to a single firmware object. 
-    * @param aObject The identifier of the object, whose data is about to 
-    * be updated.
-    * @return KErrNone, if there were no errors and iView was successfully
-    * prepared. 
-    * KErrNotFound, if the firmware object was not found.
-    */
-    TInt UpdateRowL( const TNSmlDmFwObjectId aObject );
-    
-    /**
-    * Makes an SQL query string for getting a row from FwMgmtObject table.
-    * @param aId The identifier of the object, which is used in the SQL query.
-    * @return A string containing the formatted SQL query.
-    */
-    HBufC* FwMgmtObjectRowSqlLC( TNSmlDmFwObjectId aId ) const;
-
-    /**
-    * Closes the view and then prepares it with the given values.
-    * @param aSql SQL statement defining the view, which is prepared by 
-    * this method.
-    * @param aAccess Permitted operations for the view.
-    */
-    void PrepareViewL( const TDesC& aSql, RDbRowSet::TAccess aAccess );
-
-    /**
-    * Commits update and compacts the database.
-    */
-    void CommitAndCompact();
-
-    /**
-    * Converts a 8-bit descriptor to a 16-bit descriptor, which is allocated 
-    * from heap and pushed onto the CleanupStack.
-    * @param aDes Descriptor to be converted.
-    * @return A pointer to the newly allocated copy.
-    */
-    HBufC* ConvertTo16BitLC( const TDesC8& aDes ) const;
-
-    /**
-    * Second phase construction.
-    */
-    void ConstructL();
-
-    /**
-    * Constructor.
-    */
-    CNSmlDmFotaAdapterDb();
-
-private:
-
-    RDbNamedDatabase iDatabase;
-    RFs iFsSession;
-    RDbs iRdbSession;
-
-    RDbTable iFwObjectTable;
-    CDbColSet* iColSet;
-    RDbView iView;
-
-    };
-
-
-#endif // __NSMLDMFOTAADAPTERDB_H   
-            
-// End of File
Binary file omadm/omadmextensions/adapters/fota/src/101F9A02.SPD has changed
--- a/omadm/omadmextensions/adapters/fota/src/101F9A02.txt	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-[database]
-read
-SID = 101F9A02
-write
-SID = 101F9A02
-schema
-SID = 101F9A02
--- a/omadm/omadmextensions/adapters/fota/src/nsmldmfotaadapter.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1677 +0,0 @@
-/*
-* Copyright (c) 2004 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:    DM Fota Adapter
-*
-*/
-
-
-
-
-// INCLUDE FILES
-#include <implementationproxy.h> // For TImplementationProxy definition
-//#ifdef RD_OMADMAPPUI_UI_EVOLUTION
-#include <DevManInternalCRKeys.h>
-//#endif
-#include <SyncMLClient.h>
-#include <SyncMLClientDM.h>
-#include <e32property.h>
-#include <centralrepository.h>
-#include "fotaadapterCRKeys.h"
-#include "NSmlPrivateAPI.h"
-#include "nsmldmimpluids.h"
-#include "nsmldmfotaadapter.h"
-#include "nsmldmconst.h"
-#include "nsmldebug.h"
-
-#include "nsmldmtreedbclient.h"
-
-
-// =========================== MEMBER FUNCTIONS ==============================
-
-// ---------------------------------------------------------------------------
-// CNSmlDmFotaAdapter* CNSmlDmFotaAdapter::NewL()
-// Creates new instance of CNSmlDmFotaEngine and returns a pointer to it.
-// ---------------------------------------------------------------------------
-//
-CNSmlDmFotaAdapter* CNSmlDmFotaAdapter::NewL( MSmlDmCallback* aDmCallback )
-    {
-    _DBG_FILE("CNSmlDmFotaAdapter::NewL(): begin");
-    CNSmlDmFotaAdapter* self = NewLC( aDmCallback );
-    CleanupStack::Pop( self );
-    _DBG_FILE("CNSmlDmFotaAdapter::NewL(): end");
-    return self;
-    }
-
-// ---------------------------------------------------------------------------
-// CNSmlDmFotaAdapter* CNSmlDmFotaAdapter::NewLC()
-// Creates new instance of CNSmlDmFotaEngine and returns a pointer to it. 
-// Leaves the pointer onto the CleanupStack.
-// ---------------------------------------------------------------------------
-//
-CNSmlDmFotaAdapter* CNSmlDmFotaAdapter::NewLC( MSmlDmCallback* aDmCallback )
-    {
-    _DBG_FILE("CNSmlDmFotaAdapter::NewLC(): begin");
-    CNSmlDmFotaAdapter* self = new (ELeave) CNSmlDmFotaAdapter( aDmCallback );
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    _DBG_FILE("CNSmlDmFotaAdapter::NewLC(): end");
-    return self;
-    }
-
-// ---------------------------------------------------------------------------
-// CNSmlDmFotaAdapter::CNSmlDmFotaAdapter()
-// Constructor.
-// ---------------------------------------------------------------------------
-//
-CNSmlDmFotaAdapter::CNSmlDmFotaAdapter( TAny* aEcomArguments )
-    : CSmlDmAdapter( aEcomArguments ), iPkgId( KNSmlDMFotaNullPkgId )
-    {
-    _DBG_FILE("CNSmlDmFotaAdapter::CNSmlDmFotaAdapter(): begin");
-    _DBG_FILE("CNSmlDmFotaAdapter::CNSmlDmFotaAdapter(): end");
-    }
-
-// ---------------------------------------------------------------------------
-// CNSmlDmFotaAdapter::ConstructL()
-// Second phase construction.
-// ---------------------------------------------------------------------------
-//
-void CNSmlDmFotaAdapter::ConstructL()
-    {
-    // Check if Fota feature is defined
-    TInt value( 0 );
-    CRepository * rep = CRepository::NewLC( KCRUidFotaAdapter );
-	TInt err = rep->Get( KCRFotaAdapterEnabled, value );
-	CleanupStack::PopAndDestroy( rep );
-	
-	if ( err != KErrNone || value == 0 )
-    	{
-    	User::Leave( KErrNotSupported );
-    	}    
-    	
-    iFotaEngine.OpenL();
-    iFotaDb = CNSmlDmFotaAdapterDb::NewL();
-    }
-    
-// ---------------------------------------------------------------------------
-// CNSmlDmFotaAdapter::~CNSmlDmFotaAdapter()
-// Destructor.
-// ---------------------------------------------------------------------------
-//
-CNSmlDmFotaAdapter::~CNSmlDmFotaAdapter()
-    {
-    _DBG_FILE("CNSmlDmFotaAdapter::~CNSmlDmFotaAdapter(): begin");
-
-    iFotaEngine.Close();
-
-    delete iFotaDb;
-
-    _DBG_FILE("CNSmlDmFotaAdapter::~CNSmlDmFotaAdapter(): end");
-    }
-
-// ---------------------------------------------------------------------------
-//  CNSmlDmFotaAdapter::DDFVersionL()
-//  Returns the DDF version of the adapter.
-// ---------------------------------------------------------------------------
-//
-void CNSmlDmFotaAdapter::DDFVersionL( CBufBase& aDDFVersion )
-    {
-    _DBG_FILE("CNSmlDmFotaAdapter::DDFVersionL(TDes& aDDFVersion): begin");
-
-    aDDFVersion.InsertL( 0, KNSmlDMFotaDDFVersion );
-
-    _DBG_FILE("CNSmlDmFotaAdapter::DDFVersionL(TDes& aDDFVersion): end");
-    }
-
-// ---------------------------------------------------------------------------
-//  CNSmlDmFotaAdapter::DDFStructureL()
-//  Builds the DDF structure of adapter.
-// ---------------------------------------------------------------------------
-//
-void CNSmlDmFotaAdapter::DDFStructureL( MSmlDmDDFObject& aDDF )
-    {
-    _DBG_FILE("CNSmlDmFotaAdapter::DDFStructureL(): begin");
-
-    TSmlDmAccessTypes accessTypes;
-    
-    // fota root
-    MSmlDmDDFObject& FUMO = aDDF.AddChildObjectL( KNSmlDMFotaNode );
-    accessTypes.SetAdd();
-    accessTypes.SetGet();
-    FillNodeInfoL(  FUMO, 
-                    accessTypes,
-                    MSmlDmDDFObject::EOne,
-                    MSmlDmDDFObject::EPermanent,
-                    MSmlDmDDFObject::ENode,
-                    KNSmlDMFotaNodeDescription );
-
-    accessTypes.Reset();
-
-    // run time node <X>
-    MSmlDmDDFObject& rtPkg = FUMO.AddChildObjectGroupL();
-    rtPkg.AddDFTypeMimeTypeL( KNSmlDMFotaRunTimeMimeType );
-    accessTypes.SetAdd();
-    accessTypes.SetDelete();
-    accessTypes.SetGet();
-    //accessTypes.SetReplace();
-    FillNodeInfoL(  rtPkg, 
-                    accessTypes,
-                    MSmlDmDDFObject::EZeroOrMore, 
-                    MSmlDmDDFObject::EDynamic, 
-                    MSmlDmDDFObject::ENode, 
-                    KNSmlDMFotaRunTimeNodeDescription );
-
-    accessTypes.Reset();
-
-    // <X>/PkgName
-    MSmlDmDDFObject& name = rtPkg.AddChildObjectL( KNSmlDMFotaNodeName );
-    accessTypes.SetAdd();
-    accessTypes.SetGet();
-    accessTypes.SetReplace();
-    FillNodeInfoL(  name,
-                    accessTypes,
-                    MSmlDmDDFObject::EZeroOrOne,
-                    MSmlDmDDFObject::EDynamic,
-                    MSmlDmDDFObject::EChr,
-                    KNSmlDMFotaNodeNameDescription );
-
-    // <X>/PkgVersion
-    MSmlDmDDFObject& version = rtPkg.AddChildObjectL( KNSmlDMFotaNodeVersion );
-    FillNodeInfoL(  version,
-                    accessTypes,
-                    MSmlDmDDFObject::EZeroOrOne,
-                    MSmlDmDDFObject::EDynamic,
-                    MSmlDmDDFObject::EChr,
-                    KNSmlDMFotaNodeVersionDescription );
-
-    accessTypes.Reset();
-
-    // <X>/Download
-    MSmlDmDDFObject& download = 
-    rtPkg.AddChildObjectL( KNSmlDMFotaNodeDownload );
-
-    accessTypes.SetGet();
-    accessTypes.SetExec();
-    FillNodeInfoL(  download,
-                    accessTypes,
-                    MSmlDmDDFObject::EZeroOrOne,
-                    MSmlDmDDFObject::EDynamic,
-                    MSmlDmDDFObject::ENode,
-                    KNSmlDMFotaNodeDownloadDescription );
-
-    accessTypes.Reset();
-
-    // <X>/Download/PkgURL
-    MSmlDmDDFObject& dlUrl = 
-    download.AddChildObjectL( KNSmlDMFotaNodeDownloadUrl );
-
-    accessTypes.SetGet();
-    accessTypes.SetReplace();
-    FillNodeInfoL(  dlUrl,
-                    accessTypes,
-                    MSmlDmDDFObject::EOne,
-                    MSmlDmDDFObject::EDynamic,
-                    MSmlDmDDFObject::EChr,
-                    KNSmlDMFotaNodeDownloadUrlDescription );
-
-    accessTypes.Reset();
-
-    // <X>/Update
-    MSmlDmDDFObject& update = rtPkg.AddChildObjectL( KNSmlDMFotaNodeUpdate );
-    accessTypes.SetGet();
-    accessTypes.SetExec();
-    FillNodeInfoL(  update,
-                    accessTypes,
-                    MSmlDmDDFObject::EZeroOrOne,
-                    MSmlDmDDFObject::EDynamic,
-                    MSmlDmDDFObject::ENode,
-                    KNSmlDMFotaNodeUpdateDescription );
-
-    accessTypes.Reset();
-
-    // <X>/Update/PkgData
-    MSmlDmDDFObject& data = 
-    update.AddChildObjectL( KNSmlDMFotaNodeUpdateData );
-
-    accessTypes.SetReplace();
-    FillNodeInfoL(  data,
-                    accessTypes,
-                    MSmlDmDDFObject::EZeroOrOne,
-                    MSmlDmDDFObject::EDynamic,
-                    MSmlDmDDFObject::EBin,
-                    KNSmlDMFotaNodeUpdateDataDescription );
-
-    accessTypes.Reset();
-
-    // <X>/DownloadAndUpdate
-    MSmlDmDDFObject& dlAndUpdate = 
-    rtPkg.AddChildObjectL( KNSmlDMFotaNodeDownloadAndUpdate );
-
-    accessTypes.SetGet();
-    accessTypes.SetExec();
-    FillNodeInfoL(  dlAndUpdate,
-                    accessTypes,
-                    MSmlDmDDFObject::EZeroOrOne,
-                    MSmlDmDDFObject::EDynamic,
-                    MSmlDmDDFObject::ENode,
-                    KNSmlDMFotaNodeDownloadAndUpdateDescription );
-
-    accessTypes.Reset();
-
-    // <X>/DownloadAndUpdate/PkgURL
-    MSmlDmDDFObject& dlAndUpdateUrl = 
-    dlAndUpdate.AddChildObjectL( KNSmlDMFotaNodeDownloadAndUpdateUrl );
-
-    accessTypes.SetGet();
-    accessTypes.SetReplace();
-    FillNodeInfoL(  dlAndUpdateUrl,
-                    accessTypes,
-                    MSmlDmDDFObject::EOne,
-                    MSmlDmDDFObject::EDynamic,
-                    MSmlDmDDFObject::EChr,
-                    KNSmlDMFotaNodeDownloadAndUpdateUrlDescription );
-
-    accessTypes.Reset();
-
-    // <X>/State
-    MSmlDmDDFObject& state = rtPkg.AddChildObjectL( KNSmlDMFotaNodeState );
-    accessTypes.SetGet();
-    FillNodeInfoL(  state,
-                    accessTypes,
-                    MSmlDmDDFObject::EOne,
-                    MSmlDmDDFObject::EDynamic,
-                    MSmlDmDDFObject::EInt,
-                    KNSmlDMFotaNodeStateDescription );
-
-    
-    
-    //Check cenrep for predefined node and add if its not in DB
-    CheckAndAddPredefinedNodeL();
-    
-    // check if there is need to make generic alert(s), 
-    // and generate them if there are
-    MakeGenericAlertsL();
-
-
-    // Set ACL for fota root, if not yet set
-    RNSmlDMCallbackSession session;
-    User::LeaveIfError( session.Connect() );
-    CleanupClosePushL(session);
-
-    CBufBase* acl=CBufFlat::NewL(10);
-    CleanupStack::PushL( acl );
-    session.GetAclL( KNSmlDMFotaNode,*acl,EFalse );
-
-    if( acl->Size() == 0 )
-        {
-        _LIT8(KACLForAll, "Add=*&Get=*&Delete=*&Exec=*&Replace=*");
-        session.UpdateAclL( KNSmlDMFotaNode, KACLForAll);
-        }
-    CleanupStack::PopAndDestroy( acl );
-    CleanupStack::PopAndDestroy( &session );
-
-    _DBG_FILE("CNSmlDmFotaAdapter::DDFStructureL(): end");
-    }
-
-// ---------------------------------------------------------------------------
-// CNSmlDmFotaAdapter::UpdateLeafObjectL()
-// Updates value of leaf object.
-// ---------------------------------------------------------------------------
-//
-void CNSmlDmFotaAdapter::UpdateLeafObjectL( const TDesC8& aURI, 
-                                            const TDesC8& aLUID, 
-                                            const TDesC8& aObject, 
-                                            const TDesC8& /*aType*/, 
-                                            const TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlDmFotaAdapter::UpdateLeafObjectL(): begin");
-    
-    CSmlDmAdapter::TError status = CSmlDmAdapter::EOk;
-    
-    if ( aLUID.Length() > 0 )
-        {
-        TInt res = KErrNotFound;
-        TNSmlDmFwObjectId id = DesToInt( aLUID );
-        
-        TPtrC8 lastSeg = LastURISeg( aURI );
-        if ( lastSeg == KNSmlDMFotaNodeName )
-            {
-            res = iFotaDb->SetPkgNameL( aObject, id );
-            }
-        else if ( lastSeg == KNSmlDMFotaNodeVersion )
-            {
-            res = iFotaDb->SetPkgVersionL( aObject, id );
-            }
-        else if ( lastSeg == KNSmlDMFotaNodeDownloadUrl || 
-                  lastSeg == KNSmlDMFotaNodeDownloadAndUpdateUrl )
-            {
-            TInt configFlags( KErrNone );        
-            CRepository* centrep = NULL;
-            TRAPD( err, centrep = CRepository::NewL( KCRUidDeviceManagementInternalKeys ) );    	
-            if ( err == KErrNone && centrep ) 
-                {
-                configFlags = 2; //means fota operation
-                centrep->Set( KDevManSessionType, configFlags );
-                delete centrep;
-                centrep = NULL;
-                }
-            else
-                {
-                User::Leave( err );
-                }
-            res = iFotaDb->SetPkgUrlL( aObject, id );
-            }
-        else if ( lastSeg == KNSmlDMFotaNodeUpdateData )
-            {
-            // check if there is space for this data
-            if ( iFotaEngine.IsPackageStoreSizeAvailable( aObject.Size() ) )
-                {
-                // get stream from Fota Engine
-                RWriteStream* stream = NULL;
-                TInt err = iFotaEngine.OpenUpdatePackageStore( id, stream );
-                
-                if ( ( err == KErrNone ) && stream )
-                    {
-                    // stream was opened successfully, write data 
-                    // and close stream
-                    stream->WriteL( aObject );
-                    stream->Close();
-                    
-                    // inform fota engine that data has been written
-                    iFotaEngine.UpdatePackageDownloadComplete( id );
-                    
-                    res = KErrNone;
-                    }
-                else
-                    {
-                    // error occured
-                    res = KErrGeneral;
-                    }
-                }
-            else
-                {
-                // there was no space for the data
-                res = KErrDiskFull;
-                }
-            }
-        
-        // map error
-        status = MapErrorToStatus( res );
-        }
-    else
-        {
-        // cannot update, object unknown
-        status = CSmlDmAdapter::ENotFound;
-        }
-    
-    Callback().SetStatusL( aStatusRef, status );
-    
-    _DBG_FILE("CNSmlDmFotaAdapter::UpdateLeafObjectL(): end");
-    }
-    
-// ---------------------------------------------------------------------------
-// CNSmlDmFotaAdapter::DeleteObjectL()
-// Deletes a firmware object from Fota database.
-// ---------------------------------------------------------------------------
-//
-void CNSmlDmFotaAdapter::DeleteObjectL( const TDesC8& aURI, 
-                                        const TDesC8& aLUID, 
-                                        const TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlDmFotaAdapter::DeleteLeafObjectL( ): begin");
-    
-    CSmlDmAdapter::TError status = CSmlDmAdapter::EOk;
-    
-    if ( ( aURI.Match( KNSmlDMFotaRuntimeMatch ) != KErrNotFound ) && 
-         ( aLUID.Length() > 0 ) )
-        {
-		TBuf8<KMaxFullName> temp;
-		GetPredefinedNodeL(temp);
-		TBuf8<KMaxName> node[4];
-    	TInt location = temp.LocateReverse(',');
-    	node[0].Copy(temp.Mid(location+1));
-    	TInt newLocation = (temp.Left(location-1)).LocateReverse(',');
-    	node[1].Copy(temp.Mid(newLocation+1,location-(newLocation+1)));
-    	location = newLocation;
-    	newLocation = (temp.Left(location-1)).LocateReverse(',');
-    	node[2].Copy(temp.Mid(newLocation+1,location-(newLocation+1)));
-    	node[3].Copy(temp.Mid(0,newLocation ));
-    	for(TInt i =0 ; i<4; i++)
-    	{    		
-    		if (node[i].Length() && aURI.Find( node[i] ) != KErrNotFound)
-            {
-            status = CSmlDmAdapter::ENotAllowed;
-            Callback().SetStatusL( aStatusRef, status );
-            return;
-            }
-    	}
-        // delete object identified by aLUID
-        TNSmlDmFwObjectId id = DesToInt( aLUID );
-        TInt res = iFotaDb->DeleteFwObjectL( id );
-
-        if ( res == KErrNone )
-            {
-            // deletion was successful, delete also from Fota Engine
-            iFotaEngine.DeleteUpdatePackage( id );
-            }
-        else
-            {
-            status = MapErrorToStatus( res );
-            }
-        }
-    else
-        {
-        // object unknown
-        status = CSmlDmAdapter::ENotFound;
-        }
-    
-    Callback().SetStatusL( aStatusRef, status );
-    
-    _DBG_FILE("CNSmlDmFotaAdapter::DeleteLeafObjectL( ): end");
-    }
-    
-// ---------------------------------------------------------------------------
-//  CNSmlDmFotaAdapter::FetchLeafObjectL()
-//  Fetches the values of leaf objects.
-// ---------------------------------------------------------------------------
-//
-void CNSmlDmFotaAdapter::FetchLeafObjectL( const TDesC8& aURI, 
-                                           const TDesC8& aLUID,
-                                           const TDesC8& aType,
-                                           const TInt aResultsRef,
-                                           const TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlDmFotaAdapter::FetchLeafObjectL(): begin");
-    // buffer for result
-    CBufBase* result = CBufFlat::NewL( KNSmlDMFotaResultBufferExpandSize );
-    CleanupStack::PushL( result );
-    
-    // fetch data
-    CSmlDmAdapter::TError status = DoFetchObjectL( aURI, aLUID, *result );
-    if ( status == CSmlDmAdapter::EOk )
-        {
-        Callback().SetResultsL( aResultsRef, *result, aType );
-        }
-    
-    CleanupStack::PopAndDestroy( result );
-    
-    Callback().SetStatusL( aStatusRef, status );
-    
-    _DBG_FILE("CNSmlDmFotaAdapter::FetchLeafObjectL(): end");
-    }
-
-// ---------------------------------------------------------------------------
-//  CNSmlDmFotaAdapter::ChildURIListL()
-//  Returns the list of children of a node.
-// ---------------------------------------------------------------------------
-//
-void CNSmlDmFotaAdapter::ChildURIListL( const TDesC8& aURI,
-                                        const TDesC8& aLUID, 
-                                        const CArrayFix<TSmlDmMappingInfo>& aPreviousURISegmentList, 
-                                        const TInt aResultsRef, 
-                                        const TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlDmFotaAdapter::ChildURIListL(): begin");
-
-    CSmlDmAdapter::TError status = CSmlDmAdapter::EOk;
-    TPtrC8 mimeType( KNullDesC8 );
-    
-    // buffer for result
-    CBufBase* result = CBufFlat::NewL( KNSmlDMFotaResultBufferExpandSize );
-    CleanupStack::PushL( result );
-    
-    TPtrC8 lastSeg = LastURISeg( aURI );
-    if ( lastSeg == KNSmlDMFotaNodeDownload && aLUID.Length() > 0 )
-        {
-        // target is ./FUMO/<x>/Download
-        result->InsertL( 0, KNSmlDMFotaNodeDownloadUrl );
-        }
-    else if ( lastSeg == KNSmlDMFotaNodeUpdate && aLUID.Length() > 0 )
-        {
-        // target is ./FUMO/<x>/Update
-        result->InsertL( 0, KNSmlDMFotaNodeUpdateData );
-        }
-    else if ( lastSeg == KNSmlDMFotaNodeDownloadAndUpdate && aLUID.Length() > 0 )
-        {
-        // target is ./FUMO/<x>/DownloadAndUpdate
-        result->InsertL( 0, KNSmlDMFotaNodeDownloadAndUpdateUrl );
-        }
-    else if ( ( aURI.Match( KNSmlDMFotaRuntimeMatch ) != KErrNotFound ) 
-        && ( TableExistsL( aLUID ) ) )
-        {
-        // target is ./FUMO/<x>
-        result->InsertL( 0, KNSmlDMFotaRunTimeChildren );
-        mimeType.Set( KNSmlDMFotaRunTimeMimeType );
-        }
-    else if ( aURI.Match( KNSmlDMFotaRootMatch ) != KErrNotFound )
-        {
-        // target is ./FUMO
-        
-        // return the children listed in aPreviousURISegmentList
-        TInt childCount = aPreviousURISegmentList.Count();
-        for ( TInt i = 0; i < childCount - 1; ++i )
-            {
-            result->InsertL( result->Size(), aPreviousURISegmentList[i].iURISeg );
-            result->InsertL( result->Size(), KNSmlDMFotaSeparatorDes );
-            }
-        
-        if ( childCount )
-            {
-            // insert last child without separator
-            result->InsertL( result->Size(), 
-                aPreviousURISegmentList[ childCount - 1 ].iURISeg );
-            }
-        
-        }
-    else
-        {
-        // invalid target
-        status = CSmlDmAdapter::ENotFound;
-        }
-    
-    // set result, if it was found
-    if ( status == CSmlDmAdapter::EOk )
-        {
-        Callback().SetResultsL( aResultsRef, *result, mimeType );
-        }
-    
-    Callback().SetStatusL( aStatusRef, status );
-    
-    CleanupStack::PopAndDestroy( result );
-    
-    _DBG_FILE("CNSmlDmFotaAdapter::ChildURIListL(): end");
-    }
-    
-
-
-// ---------------------------------------------------------------------------
-// CNSmlDmFotaAdapter::TableExistsL(const TDesC8& aLUID) const
-// Checks if table exists
-// ---------------------------------------------------------------------------
-//
-TBool CNSmlDmFotaAdapter::TableExistsL(const TDesC8& aLUID) const
-    {
-    TBool ret = EFalse;
-    if(aLUID.Length()>0)
-        {
-        TNSmlDmFwObjectId luid = DesToInt( aLUID );
-        TSmlProfileId profileId = iFotaDb->ProfileIdL(luid);
-        if (profileId!=KErrNotFound)
-            {
-            ret = ETrue;
-            }
-        }
-    return ret;
-    }
-
-//
-// ---------------------------------------------------------------------------
-// CNSmlDmFotaAdapter::AddNodeObjectL()
-// Adds new row to firmware object table in Fota database.
-// ---------------------------------------------------------------------------
-//
-void CNSmlDmFotaAdapter::AddNodeObjectL( const TDesC8& aURI, 
-                                         const TDesC8& aParentLUID, 
-                                         const TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlDmFotaAdapter::AddNodeObjectL(): begin");
-    
-    CSmlDmAdapter::TError status = CSmlDmAdapter::EOk;
-    
-     // Luid specified and it's a valid luid => already exists
-    if ( TableExistsL( aParentLUID ) )
-        {
-        // the object has already been created and mapping set to DM Framework
-        status = CSmlDmAdapter::EAlreadyExists;
-        }
-    else if ( aURI.Match( KNSmlDMFotaRuntimeMatch ) != KErrNotFound )
-        {
-        // add new FW object to db
-        TNSmlDmFwObjectId newId = KErrNotFound;
-        TRAPD( err, newId = iFotaDb->AddFwObjectL() );
-        
-        if ( err == KErrNone )
-            {
-            // added ok
-            TBuf8<KNSmlFwMgmtObjectIntegerLength> newLUID;
-            newLUID.AppendNum( newId );
-            
-            Callback().SetMappingL( aURI, newLUID );
-            }
-        else
-            {
-            status = MapErrorToStatus( err );
-            }
-        
-        }
-    else
-        {
-        // error, invalid uri
-        status = CSmlDmAdapter::ENotFound;
-        }
-    
-    Callback().SetStatusL( aStatusRef, status );
-//    if(status==CSmlDmAdapter::EOk)
-//        {
-//        TSmlProfileId profId = KErrNotFound;
-//        HBufC8* serverId = NULL;
-//        
-//        GetServerInfoL( profId, serverId );
-//        
-//        if(serverId)
-//            {
-//            CleanupStack::PushL( serverId );
-//            
-//            _LIT( KFotaAclAdd, "Add=");
-//            _LIT( KFotaAclGet, "Get=");
-//            _LIT( KFotaAclReplace, "Replace=");
-//            _LIT( KFotaAclDelete, "Delete=");
-//            _LIT( KFotaAclExec, "Exec=");
-//            _LIT( KFotaAclSeparator, "&");
-//            _LIT( KFotaAclForAll, "*");
-//            
-//            const TUint length = KFotaAclAdd().Length() +
-//                                 KFotaAclGet().Length() +
-//                                 KFotaAclReplace().Length() +
-//                                 KFotaAclDelete().Length() +
-//                                 KFotaAclExec().Length() +
-//                                 serverId->Length()*4 +
-//                                 5; /* 4*'&'+ ''*' */
-//                                 
-//            HBufC8* acl = HBufC8::NewLC(length);
-//            TPtr8 acltPtr = acl->Des();
-//            acltPtr.Append(KFotaAclAdd);
-//            acltPtr.Append(*serverId);
-//            acltPtr.Append(KFotaAclSeparator);
-//
-//            acltPtr.Append(KFotaAclGet);
-//            acltPtr.Append(*serverId);
-//            acltPtr.Append(KFotaAclSeparator);
-//
-//            acltPtr.Append(KFotaAclReplace);
-//            acltPtr.Append(*serverId);
-//            acltPtr.Append(KFotaAclSeparator);
-//
-//            acltPtr.Append(KFotaAclDelete);
-//            acltPtr.Append(KFotaAclForAll);
-//            acltPtr.Append(KFotaAclSeparator);
-//
-//            acltPtr.Append(KFotaAclExec);
-//            acltPtr.Append(*serverId);
-//            
-//            RNSmlDMCallbackSession session;
-//            User::LeaveIfError( session.Connect() );
-//            CleanupClosePushL(session);
-//            session.UpdateAclL(aURI,*acl);
-//            CleanupStack::PopAndDestroy( &session );
-//            CleanupStack::PopAndDestroy( acl );
-//            CleanupStack::PopAndDestroy( serverId );
-//            }
-//        }
-    
-    _DBG_FILE("CNSmlDmFotaAdapter::AddNodeObjectL(): end");
-    }
-    
-// ---------------------------------------------------------------------------
-// CNSmlDmFotaAdapter::UpdateLeafObjectL()
-// Updates a leaf object using streaming. In Fota adapter this method is used 
-// only to update PkgData of a firmware object.
-// ---------------------------------------------------------------------------
-//
-void CNSmlDmFotaAdapter::UpdateLeafObjectL( const TDesC8& aURI, 
-                                            const TDesC8& aLUID, 
-                                            RWriteStream*& aStream, 
-                                            const TDesC8& /*aType*/, 
-                                            const TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlDmFotaAdapter::UpdateLeafObjectL(stream): begin");
-    
-    CSmlDmAdapter::TError status = CSmlDmAdapter::ENotFound;
-    
-    if ( aLUID.Length() > 0 )
-        {
-        TNSmlDmFwObjectId id = DesToInt( aLUID );
-        
-        TPtrC8 lastSeg = LastURISeg( aURI );
-        if ( lastSeg == KNSmlDMFotaNodeUpdateData )
-            {
-            // set final result to undefined error in db (in case an 
-            // error occures during large object download)
-            TInt res = iFotaDb->SetFinalResultL( KNSmlDMFotaUndefinedError, id );
-            
-            if ( res == KErrNone )
-                {
-                // save the id so that it is known when stream is committed
-                iPkgId = id;
-            
-                // open stream and give it to DM Host Server
-                TInt err = iFotaEngine.OpenUpdatePackageStore( id, aStream );
-                
-                if ( err == KErrNone )
-                    {
-                    // stream was opened successfully
-                    status = CSmlDmAdapter::EOk;
-                	User::LeaveIfError(iFotaDb->SetFinalResultL( KNSmlFotaNullResult, id ));
-                	User::LeaveIfError( iFotaDb->SetMgmtUriL( aURI, id ) );
-                	// fetch profile id and server id of the currently running dm session
-                	TSmlProfileId profId = KErrNotFound;
-                	HBufC8* serverId = NULL;                    
-                	GetServerInfoL( profId, serverId );
-                	CleanupStack::PushL( serverId );                    
-                	// save profile id and server id to fota db
-                	User::LeaveIfError( iFotaDb->SetServerInfoL( profId, *serverId, id ) );
-                	DBG_FILE_CODE(profId, _S8("UpdateLeafObjectL profile id is"));
-                	//Set ProfId & PkgId
-                	err = RProperty::Set(TUid::Uid(KFotaServerUid),KFotaLrgObjDl,1);
-                	DBG_FILE_CODE(err, _S8("UpdateLeafObjectL set P&S key KFotaLrgObjDl to 1"));
-                	err = RProperty::Set(TUid::Uid(KFotaServerUid),KFotaLrgObjProfileId,profId);
-                	DBG_FILE_CODE(err, _S8("UpdateLeafObjectL set P&S key profile id err is"));                	
-                	CleanupStack::PopAndDestroy( serverId );
-                    }
-                else
-                    {
-                    // error occured
-                    aStream = NULL;
-                    status = CSmlDmAdapter::EError;
-                    }
-                }
-            }
-        }
-        
-    Callback().SetStatusL( aStatusRef, status );
-    
-    _DBG_FILE("CNSmlDmFotaAdapter::UpdateLeafObjectL(stream): end");
-    }
-
-// ---------------------------------------------------------------------------
-// void CNSmlDmFotaAdapter::FetchLeafObjectSizeL()
-// Fetches data object and returns its size.
-// ---------------------------------------------------------------------------
-//
-void CNSmlDmFotaAdapter::FetchLeafObjectSizeL( const TDesC8& aURI, 
-                                               const TDesC8& aLUID, 
-                                               const TDesC8& aType, 
-                                               const TInt aResultsRef, 
-                                               const TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlDmFotaAdapter::FetchLeafObjectSizeL(): begin");
-    
-    // buffer for result
-    CBufBase* result = CBufFlat::NewL( KNSmlDMFotaResultBufferExpandSize );
-    CleanupStack::PushL( result );
-    
-    // fetch data
-    CSmlDmAdapter::TError status = DoFetchObjectL( aURI, aLUID, *result );
-    if ( status == CSmlDmAdapter::EOk )
-        {
-        // get size and form a string representation
-        TInt size = result->Size();
-        TBuf8<KNSmlFwMgmtObjectIntegerLength> sizeStr;
-        sizeStr.AppendNum( size );
-        
-        // insert size to result
-        result->Reset();
-        result->InsertL( 0, sizeStr );
-        
-        Callback().SetResultsL( aResultsRef, *result, aType );
-        }
-    
-    CleanupStack::PopAndDestroy( result );
-    
-    Callback().SetStatusL( aStatusRef, status );
-    
-    _DBG_FILE("CNSmlDmFotaAdapter::FetchLeafObjectSizeL(): end");
-    }
-
-// ---------------------------------------------------------------------------
-// CNSmlDmFotaAdapter::ExecuteCommandL()
-// Executes Update, Download or DownloadAndUpdate command depending on aURI. 
-// If aURI does not match to any of these, ENotFound is set as status.
-// ---------------------------------------------------------------------------
-//
-void CNSmlDmFotaAdapter::ExecuteCommandL( const TDesC8& aURI, 
-                                          const TDesC8& aLUID, 
-                                          const TDesC8& aArgument, 
-                                          const TDesC8& /*aType*/, 
-                                          const TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlDmFotaAdapter::ExecuteCommandL(): begin");
-    //#ifdef RD_OMADMAPPUI_UI_EVOLUTION
-    TInt configFlags( 0 );        
-    CRepository* centrep = NULL;
-    TRAPD( err, centrep = CRepository::NewL( KCRUidDeviceManagementInternalKeys ) );
-    if ( centrep )
-        {
-        centrep->Get( KDevManSessionType, configFlags );            
-        }
-    if ( err != KErrNone ) 
-        {
-        User::Leave( err );
-        }
-    else
-        {
-        configFlags = 1;
-        centrep->Set( KDevManSessionType, configFlags );
-        }
-    if( centrep )    
-       {
-        delete centrep;
-       }        
-    //#endif   
-    CSmlDmAdapter::TError status = CSmlDmAdapter::ENotFound;
-    
-    if ( aLUID.Length() > 0 )
-        {
-        TNSmlDmFwObjectId id = DesToInt( aLUID );
-        
-        // uri should target Update, Download or DownloadAndUpdate
-        TPtrC8 lastSeg = LastURISeg( aURI );
-        if ( lastSeg == KNSmlDMFotaNodeUpdate ||
-             lastSeg == KNSmlDMFotaNodeDownload ||
-             lastSeg == KNSmlDMFotaNodeDownloadAndUpdate )
-            {
-            
-            // save information about the execution and get profile id of 
-            // currently running DM session
-            TSmlProfileId profId = 0;
-            TRAPD( err, profId = SaveExecInfoL( aURI, id, aArgument ) );
-            
-            if ( err == KErrNone )
-                {
-                if ( lastSeg == KNSmlDMFotaNodeUpdate )
-                    {
-                    // update
-                    status = DoExecUpdateL( id, profId );
-                    }
-                else if ( lastSeg == KNSmlDMFotaNodeDownload )
-                    {
-                    // download
-                    status = DoExecDownloadL( id, profId, EFalse );
-                    }
-                else if ( lastSeg == KNSmlDMFotaNodeDownloadAndUpdate )
-                    {
-                    // download and update
-                    status = DoExecDownloadL( id, profId, ETrue );
-                    }
-                
-                }
-            else
-                {
-                status = MapErrorToStatus( err );
-                }
-            }
-        
-        }
-    
-    Callback().SetStatusL( aStatusRef, status );
-    
-    _DBG_FILE("CNSmlDmFotaAdapter::ExecuteCommandL(): end");
-    }
-
-// ---------------------------------------------------------------------------
-// CNSmlDmFotaAdapter::ExecuteCommandL()
-// Not supported.
-// ---------------------------------------------------------------------------
-//
-void CNSmlDmFotaAdapter::ExecuteCommandL( const TDesC8& /*aURI*/, 
-                                          const TDesC8& /*aLUID*/, 
-                                          RWriteStream*& /*aStream*/, 
-                                          const TDesC8& /*aType*/, 
-                                          const TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlDmFotaAdapter::ExecuteCommandL(): begin");
-    
-    Callback().SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-    
-    _DBG_FILE("CNSmlDmFotaAdapter::ExecuteCommandL(): end");
-    }
-
-// ---------------------------------------------------------------------------
-// CNSmlDmFotaAdapter::CopyCommandL()
-// Not supported.
-// ---------------------------------------------------------------------------
-//
-void CNSmlDmFotaAdapter::CopyCommandL( const TDesC8& /*aTargetURI*/, 
-                                       const TDesC8& /*aTargetLUID*/, 
-                                       const TDesC8& /*aSourceURI*/,
-                                       const TDesC8& /*aSourceLUID*/, 
-                                       const TDesC8& /*aType*/, 
-                                       TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlDmFotaAdapter::CopyCommandL(): begin");
-    
-    Callback().SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-    
-    _DBG_FILE("CNSmlDmFotaAdapter::CopyCommandL(): end");
-    }
-
-// ---------------------------------------------------------------------------
-// CNSmlDmFotaAdapter::StartAtomicL()
-// Not supported.
-// ---------------------------------------------------------------------------
-//
-void CNSmlDmFotaAdapter::StartAtomicL()
-    {
-    _DBG_FILE("CNSmlDmFotaAdapter::StartAtomicL(): begin");
-    _DBG_FILE("CNSmlDmFotaAdapter::StartAtomicL(): end");
-    }
-
-// ---------------------------------------------------------------------------
-// CNSmlDmFotaAdapter::CommitAtomicL()
-// Not supported.
-// ---------------------------------------------------------------------------
-//
-void CNSmlDmFotaAdapter::CommitAtomicL()
-    {
-    _DBG_FILE("CNSmlDmFotaAdapter::CommitAtomicL(): begin");
-    _DBG_FILE("CNSmlDmFotaAdapter::CommitAtomicL(): end");
-    }
-
-// ---------------------------------------------------------------------------
-// CNSmlDmFotaAdapter::RollbackAtomicL()
-// Not supported.
-// ---------------------------------------------------------------------------
-//
-void CNSmlDmFotaAdapter::RollbackAtomicL()
-    {
-    _DBG_FILE("CNSmlDmFotaAdapter::RollbackAtomicL(): begin");
-    _DBG_FILE("CNSmlDmFotaAdapter::RollbackAtomicL(): end");
-    }
-
-// ---------------------------------------------------------------------------
-// CNSmlDmFotaAdapter::StreamingSupport()
-// Returns whether or not streaming is supported in this adapter.
-// In Fota this method is also used to enquire whether or not a large object
-// whose size is given in aItemSize fits to disk (OOD check using Fota Engine),
-// and to acknowledge that Generic Alerts have been sent succesfully to remote 
-// server. If aItemSize is larger that 0, OOD check feature is executed. 
-// If aItemSize equals to KNSmlDMResetGenAlerts, Generic Alerts are marked 
-// sent. Otherwise aItemSize is set to a treshold value, which is used by 
-// DM Host Server to determineif streaming should be used (large object) 
-// or not.
-// ---------------------------------------------------------------------------
-//
-TBool CNSmlDmFotaAdapter::StreamingSupport( TInt& aItemSize )
-    {
-    _DBG_FILE("CNSmlDmFotaAdapter::StreamingSupport(): begin");
-    
-    if ( aItemSize == KNSmlDMResetGenAlerts )
-        {
-        // generic alerts have been sent successfully to this server
-        TRAPD( err, MarkGenericAlertsSentL() );
-        if(err)
-        {
-        	_DBG_FILE("CNSmlDmFotaAdapter::StreamingSupport(): error in MarkGenricAlertSentL()");
-        }
-        }
-    else if ( aItemSize <= 0 )
-        {
-        // item size set so that streaming is used only when updating PkgData
-        aItemSize = KNSmlDMFotaStreamingTreshold;
-        }
-    else
-        {
-        // streaming is about to be used (fota overloaded feature)
-        // ask from engine if enough space is available
-        if ( iFotaEngine.IsPackageStoreSizeAvailable( aItemSize ) )
-            {
-            // space available
-            aItemSize = KErrNone;
-            }
-        else
-            {
-            // not enough space available
-            aItemSize = KErrNoMemory;
-            }
-        }
-    
-    _DBG_FILE("CNSmlDmFotaAdapter::StreamingSupport(): end");
-    
-    return ETrue;
-    }
-
-// ---------------------------------------------------------------------------
-// CNSmlDmFotaAdapter::StreamCommittedL()
-// Notification method used by DM Host Server. All data has been written to 
-// stream successfully and stream has been committed and closed.
-// ---------------------------------------------------------------------------
-//
-void CNSmlDmFotaAdapter::StreamCommittedL()
-    {
-    _DBG_FILE("CNSmlDmFotaAdapter::StreamCommittedL(): begin");
-    TInt err = RProperty::Set(TUid::Uid(KFotaServerUid),KFotaLrgObjDl,KErrNotFound);
-    DBG_FILE_CODE(err, _S8("StreamCommittedL set P&S key KFotaLrgObjDl to -1"));
-    // set success result to db
-    iFotaDb->SetFinalResultL( KNSmlDMFotaSuccessfullDownload, iPkgId );
-    
-    // notify fota engine that all data is written
-    iFotaEngine.UpdatePackageDownloadComplete( iPkgId );
-    
-    iPkgId = KNSmlDMFotaNullPkgId;
-    
-    _DBG_FILE("CNSmlDmFotaAdapter::StreamCommittedL(): end");
-    }
-    
-// ---------------------------------------------------------------------------
-// CNSmlDmFotaAdapter::CompleteOutstandingCmdsL()
-// Not supported.
-// ---------------------------------------------------------------------------
-//
-void CNSmlDmFotaAdapter::CompleteOutstandingCmdsL()
-    {
-    _DBG_FILE("CNSmlDmFotaAdapter::CompleteOutstandingCmdsL(): begin");
-    _DBG_FILE("CNSmlDmFotaAdapter::CompleteOutstandingCmdsL(): end");
-    }
-
-// ---------------------------------------------------------------------------
-// CNSmlDmFotaAdapter::DoFetchObjectL()
-// Fetches the data identified by aURI in FW object aLUID. Writes the data 
-// to aObject and returns status code according to the success of the fetch.
-// ---------------------------------------------------------------------------
-//
-CSmlDmAdapter::TError CNSmlDmFotaAdapter::DoFetchObjectL( const TDesC8& aURI,
-                                                          const TDesC8& aLUID,
-                                                          CBufBase& aObject )
-    {
-    CSmlDmAdapter::TError status = CSmlDmAdapter::ENotFound;
-    
-    if ( aLUID.Length() > 0 )
-        {
-        HBufC8* data = NULL;
-        TNSmlDmFwObjectId id = DesToInt( aLUID );
-        
-        // get correct data according to the last segment of the uri
-        TPtrC8 lastSeg = LastURISeg( aURI );
-        if ( lastSeg == KNSmlDMFotaNodeName )
-            {
-            data = iFotaDb->PkgNameL( id );
-            }
-        else if ( lastSeg == KNSmlDMFotaNodeVersion )
-            {
-            data = iFotaDb->PkgVersionL( id );
-            }
-        else if ( lastSeg == KNSmlDMFotaNodeDownloadUrl || 
-                  lastSeg == KNSmlDMFotaNodeDownloadAndUpdateUrl )
-            {
-            data = iFotaDb->PkgUrlL( id );
-            }
-        else if ( lastSeg == KNSmlDMFotaNodeState )
-            {
-            // state is fetched from fota engine
-            RFotaEngineSession::TState state = iFotaEngine.GetState( id );
-            data = HBufC8::NewL( KNSmlFwMgmtObjectIntegerLength );
-            data->Des().AppendNum( state );
-            }
-        
-        // if data is fetched ok, set results
-        if ( data )
-            {
-            CleanupStack::PushL( data );
-            
-            aObject.InsertL( 0, *data );
-            status = CSmlDmAdapter::EOk;
-            
-            CleanupStack::PopAndDestroy( data );
-            }
-        }
-    
-    return status;
-    }
-
-// ---------------------------------------------------------------------------
-// CNSmlDmFotaAdapter::DoExecUpdateL()
-// Gets needed data for Update from Fota DB and notifies Fota Engine that 
-// Update should be executed. Returns status according to the success of 
-// the method.
-// ---------------------------------------------------------------------------
-//
-CSmlDmAdapter::TError CNSmlDmFotaAdapter::DoExecUpdateL( 
-                                                const TNSmlDmFwObjectId aLUID, 
-                                                const TSmlProfileId aProfile )
-    {
-    CSmlDmAdapter::TError status = CSmlDmAdapter::EOk;
-    
-    // get needed data from db for fota engine
-    HBufC8* pkgName = iFotaDb->PkgNameL( aLUID );
-    CleanupStack::PushL( pkgName );
-    
-    HBufC8* pkgVersion = iFotaDb->PkgVersionL( aLUID );
-    CleanupStack::PushL( pkgVersion );
-    
-    TInt error = KErrNone;
-
-    if ( pkgName && pkgVersion )
-        {
-        // notify fota engine to start update
-        error = iFotaEngine.Update( aLUID, aProfile, *pkgName, *pkgVersion );
-        
-        // if immediate error occured, set final result to corresponding 
-        // value so that generic alert is not sent
-        if ( error == KErrNotFound )
-            {
-            // binary update package has not been downloaded yet -> not 
-            // possible to update
-            status = CSmlDmAdapter::ENotFound;
-            iFotaDb->SetFinalResultL( KNSmlDMFotaUndefinedError, aLUID  );
-            }
-        else if ( error != KErrNone )
-            {
-            // other error
-            status = CSmlDmAdapter::EError;
-            iFotaDb->SetFinalResultL( KNSmlDMFotaUndefinedError, aLUID );
-            }
-        }
-    else
-        {
-        // fw object was not found
-        status = CSmlDmAdapter::ENotFound;
-        }
-    
-    CleanupStack::PopAndDestroy( pkgVersion );
-    CleanupStack::PopAndDestroy( pkgName );
-
-    return status;
-    }
-
-// ---------------------------------------------------------------------------
-// CNSmlDmFotaAdapter::DoExecDownloadL()
-// Gets needed data for Download or DownloadAndUpdate from Fota DB and 
-// notifies Fota Engine that Download or DownloadAndUpdate should be executed.
-// Returns status according to the success of the method.
-// ---------------------------------------------------------------------------
-//
-CSmlDmAdapter::TError CNSmlDmFotaAdapter::DoExecDownloadL( 
-                                                const TNSmlDmFwObjectId aLUID,
-                                                const TSmlProfileId aProfile,
-                                                TBool aUpdate )
-    {
-    CSmlDmAdapter::TError status = CSmlDmAdapter::EOk;
-    
-    // get needed data from db for fota engine
-    HBufC8* url = iFotaDb->PkgUrlL( aLUID );
-    CleanupStack::PushL( url );
-    
-    HBufC8* pkgName = iFotaDb->PkgNameL( aLUID );
-    CleanupStack::PushL( pkgName );
-    
-    HBufC8* pkgVersion = iFotaDb->PkgVersionL( aLUID );
-    CleanupStack::PushL( pkgVersion );
-    
-    TInt error = KErrNone;
-    
-    if ( url && pkgName && pkgVersion )
-        {
-        
-        if ( aUpdate )
-            {
-            // notify fota engine to start download and update
-            error = iFotaEngine.DownloadAndUpdate( aLUID, *url, aProfile, *pkgName, *pkgVersion );
-            }
-        else
-            {
-            // notify fota engine to start download
-            error = iFotaEngine.Download( aLUID, *url, aProfile, *pkgName, *pkgVersion );
-            }
-        
-        // if immediate error occured, set final result to corresponding value so that 
-        // generic alert is not sent
-        if ( error == KErrArgument )
-            {
-            // url incorrectly formed
-            status = CSmlDmAdapter::EInvalidObject;
-            iFotaDb->SetFinalResultL( KNSmlDMFotaBadUrl, aLUID );
-            }
-        else if ( error != KErrNone )
-            {
-            // other error
-            status = CSmlDmAdapter::EError;
-            iFotaDb->SetFinalResultL( KNSmlDMFotaUndefinedError, aLUID );
-            }
-        }
-    else
-        {
-        // fw object was not found
-        status = CSmlDmAdapter::ENotFound;
-        }
-    
-    CleanupStack::PopAndDestroy( pkgVersion );
-    CleanupStack::PopAndDestroy( pkgName );
-    CleanupStack::PopAndDestroy( url );
-
-    return status;
-    }
-
-// ---------------------------------------------------------------------------
-// CNSmlDmFotaAdapter::SaveExecInfoL()
-// Saves the values needed when starting an exec command. Returns the saved 
-// profile id.
-// ---------------------------------------------------------------------------
-//
-TSmlProfileId CNSmlDmFotaAdapter::SaveExecInfoL( const TDesC8& aURI, 
-                                                 const TNSmlDmFwObjectId aLUID,
-                                                 const TDesC8& aCorrelator )
-    {
-    // set final result (null), uri and correlator to fota db
-    User::LeaveIfError( iFotaDb->SetFinalResultL( KNSmlFotaNullResult, aLUID ) );
-    User::LeaveIfError( iFotaDb->SetMgmtUriL( aURI, aLUID ) );
-    User::LeaveIfError( iFotaDb->SetCorrelatorL( aCorrelator, aLUID ) );
-    
-    // fetch profile id and server id of the currently running dm session
-    TSmlProfileId profId = KErrNotFound;
-    HBufC8* serverId = NULL;
-    
-    GetServerInfoL( profId, serverId );
-    CleanupStack::PushL( serverId );
-    
-    // save profile id and server id to fota db
-    User::LeaveIfError( iFotaDb->SetServerInfoL( profId, *serverId, aLUID ) );
-    
-    CleanupStack::PopAndDestroy( serverId );
-    
-    return profId;
-    }
-
-// ---------------------------------------------------------------------------
-// CNSmlDmFotaAdapter::GetServerInfoL()
-// Fetches profile id and server id of the currently running dm session. 
-// Data is fetched using Client API and set to the references given as 
-// parameters. Reallocates server id to aServerId.
-// ---------------------------------------------------------------------------
-//
-void CNSmlDmFotaAdapter::GetServerInfoL( TSmlProfileId& aProfId, 
-                                         HBufC8*& aServerId ) const
-    {
-    // Open session
-    RSyncMLSession session;
-    session.OpenL();
-    CleanupClosePushL( session );
-    
-    // get current job's id (and usage type)
-    TSmlJobId jobId = KErrNotFound;
-    TSmlUsageType type = ESmlDevMan;
-    session.CurrentJobL( jobId, type );
-    
-    // open currently running job
-    RSyncMLDevManJob dmJob;
-    dmJob.OpenL( session, jobId );
-    CleanupClosePushL( dmJob );
-    
-    // get job's profile id
-    aProfId = dmJob.Profile();
-    
-    // open profile using id in read-only mode
-    RSyncMLDevManProfile dmProf;
-    dmProf.OpenL( session, aProfId, ESmlOpenRead );
-    CleanupClosePushL( dmProf );
-    
-    // get profile's server id
-    aServerId = dmProf.ServerId().AllocL();
-    
-    // close handles
-    CleanupStack::PopAndDestroy( &dmProf );
-    CleanupStack::PopAndDestroy( &dmJob );
-    CleanupStack::PopAndDestroy( &session );
-    }
-// ---------------------------------------------------------------------------
-// CNSmlDmFotaAdapter::CheckAndAddPredefinedNodeL()
-// Checks if predefined node for FUMO is in tree if not add to the tree 
-// ---------------------------------------------------------------------------
-//    
-void CNSmlDmFotaAdapter::CheckAndAddPredefinedNodeL()
-    {
-    
-	TBuf8<KMaxFullName> temp;
-	GetPredefinedNodeL(temp);
-	if (temp.Length())
-		{
-    	RNSmlDMCallbackSession session;
-    	User::LeaveIfError( session.Connect() );
-    	CleanupClosePushL(session);
-	TBuf8<KMaxName> node[4];
-    TInt location = temp.LocateReverse(',');
-    node[0].Copy(temp.Mid(location+1));
-    TInt newLocation = (temp.Left(location-1)).LocateReverse(',');
-    node[1].Copy(temp.Mid(newLocation+1,location-(newLocation+1)));
-    location = newLocation;
-    newLocation = (temp.Left(location-1)).LocateReverse(',');
-    node[2].Copy(temp.Mid(newLocation+1,location-(newLocation+1)));
-    node[3].Copy(temp.Mid(0,newLocation ));
-	for(TInt i=0; i<4; i++)
-	{	
-		TBuf8<KMaxFullName> temp1;
-		temp1.Zero();
-		temp1.Copy(KNSmlDMFotaNode);
-		temp1.Append(KNSmlDMFotaSeparatorDes);
-		temp1.Append(node[i]);
-   		HBufC8* luid = session.GetLuidAllocL( KNSmlDMFotaAdapterImplUid,temp1);
-		CleanupStack::PushL(luid);
-    	if ( luid->Length() > 0 )
-			{
-			CleanupStack::PopAndDestroy( luid );
-    		CleanupStack::PopAndDestroy( &session );
-			return;			
-			}
-   		else
-    		{
-      		// Add the mapping 
-			TNSmlDmFwObjectId newId = KErrNotFound;
-        	TRAPD( err, newId = iFotaDb->AddFwObjectL() );
-
-	        if ( err == KErrNone )
-				{
-            	// added ok
-            	TBuf8<KNSmlFwMgmtObjectIntegerLength> newLUID;
-            	newLUID.AppendNum( newId );
-      			session.AddMappingInfoL(KNSmlDMFotaAdapterImplUid, temp1, newLUID );
-            	}
-    		}
-		CleanupStack::PopAndDestroy( luid );
-	}
-		CleanupStack::PopAndDestroy( &session );
-    	}
-    }
-// ---------------------------------------------------------------------------
-// CNSmlDmFotaAdapter::GetPredefinedNodeL()
-// Gets  predefined node for FUMO from cenrep 
-// ---------------------------------------------------------------------------
-//
-void CNSmlDmFotaAdapter::GetPredefinedNodeL(TDes8& aNode)
-	{
-    CRepository* centrep( NULL);
-	aNode.Zero();
-   	centrep = CRepository::NewLC( TUid::Uid(0x101F9A0A) );
-
-    if ( centrep )
-	    {
-    	TFullName temp;
-		
-    	if (centrep->Get( KDevManFUMOPredefinedNodes, temp )==KErrNone && temp.Length() )
-			{
-			temp.Trim();
-			aNode.Copy(temp);
-			}
-		CleanupStack::PopAndDestroy(centrep);
-	    }
-	}
-// ---------------------------------------------------------------------------
-// CNSmlDmFotaAdapter::MakeGenericAlertsL()
-// Checks whether or not there are fw objects whose final result should be 
-// sent to the remote server which is involved with the current DM session.
-// If there are such objects, notifies private api using the data needed for
-// generic alert generation.
-// ---------------------------------------------------------------------------
-//
-void CNSmlDmFotaAdapter::MakeGenericAlertsL()
-    {
-    // search for fw objects that have empty final result
-    RNSmlDmFwObjectArray ids;
-    CleanupClosePushL( ids );
-    
-    iFotaDb->GetEmptyFinalResultsL( ids );
-    if ( ids.Count() == 0 )
-        {
-        // none found, no need for generic alerts
-        CleanupStack::PopAndDestroy( &ids );
-        return;
-        }
-    
-    // get information of the remote DM server
-    TSmlProfileId profId = 0;
-    HBufC8* serverId = NULL;
-    GetServerInfoL( profId, serverId );
-    CleanupStack::PushL( serverId );
-    
-    // open handle to private api
-    RNSmlPrivateAPI privateAPI;
-    privateAPI.OpenL();
-    CleanupClosePushL( privateAPI );
-    
-    // go through all objects in ids
-    for ( TInt i = 0; i < ids.Count(); ++i )
-        {
-        // check that server ids match. if not, move to next entry
-        HBufC8* fwServerId = iFotaDb->ServerIdL( ids[i] );
-        CleanupStack::PushL( fwServerId );
-        
-        if ( *serverId == *fwServerId )
-            {
-            // check that mgmt uri is not empty string. if it is, 
-            // move to next entry
-            HBufC8* fwMgmtUri = iFotaDb->MgmtUriL( ids[i] );
-            CleanupStack::PushL( fwMgmtUri );
-            
-            if ( *fwMgmtUri != KNullDesC8 )
-                {
-                // check that update has reached its final result
-                TInt finalResult = iFotaEngine.GetResult( ids[i] );
-                
-                RFotaEngineSession::TState finalState = iFotaEngine.GetState( ids[i] );
-                
-                if ( finalResult != KErrNotFound && finalState != RFotaEngineSession::EStartingUpdate)
-                    {
-                    // get fw object's correlator
-                    HBufC8* fwCorrelator = iFotaDb->CorrelatorL( ids[i] );
-                    CleanupStack::PushL( fwCorrelator );
-                    
-                    // add generic alert to dm message
-                    TPtrC8 metaType = GetMetaType( *fwMgmtUri );
-                    privateAPI.AddDMGenericAlertRequestL( *fwMgmtUri, metaType, KNSmlDMFotaMetaFormat, finalResult, *fwCorrelator );
-                    
-                    CleanupStack::PopAndDestroy( fwCorrelator );
-                    }
-                }
-            
-            CleanupStack::PopAndDestroy( fwMgmtUri );
-            }
-        
-        CleanupStack::PopAndDestroy( fwServerId );
-        }
-    
-    CleanupStack::PopAndDestroy( &privateAPI );
-    CleanupStack::PopAndDestroy( serverId );
-    CleanupStack::PopAndDestroy( &ids );
-    
-    }
-
-// ---------------------------------------------------------------------------
-// CNSmlDmFotaAdapter::MarkGenericAlertsSentL()
-// Puts a final result value to those fw objects, that are 
-// associated with current DM session's remote server, have 
-// been a target to an exec command and the exec command has 
-// finished. I.e. Generic Alert has been sent to remote server
-// reporting the results of these exec commands --> not needed to 
-// send Generic Alert anymore in next DM session.
-// ---------------------------------------------------------------------------
-//
-void CNSmlDmFotaAdapter::MarkGenericAlertsSentL()
-    {
-    // search for fw objects that have empty final result
-    RNSmlDmFwObjectArray ids;
-    CleanupClosePushL( ids );
-    
-    // get information of the remote DM server
-    TSmlProfileId profId = 0;
-    HBufC8* serverId = NULL;
-    GetServerInfoL( profId, serverId );
-    CleanupStack::PushL( serverId );
-    
-    iFotaDb->GetEmptyFinalResultsL( ids, *serverId );
-    
-    // go through all objects in ids
-    for ( TInt i = 0; i < ids.Count(); ++i )
-        {
-        // check that update has reached its final result
-        TInt finalResult = iFotaEngine.GetResult( ids[i] );
-        if ( finalResult != KErrNotFound )
-            {
-            // set final result thus setting generic alert sent
-            iFotaDb->SetFinalResultL( finalResult, ids[i] );
-            
-            // also notify fota engine, that generic alert has been
-            // successfully sent, thus enabling possible cleanup
-            iFotaEngine.GenericAlertSentL( ids[i] );
-            }
-        }
-    
-    CleanupStack::PopAndDestroy( serverId );
-    CleanupStack::PopAndDestroy( &ids );
-    }
-
-// ---------------------------------------------------------------------------
-// CNSmlDmFotaAdapter::GetMetaType()
-// Determines by the given uri which meta/type should be used in generic 
-// alert.Returns the correct type, or KNullDesC8 if uri does not match to 
-// exec targets.
-// ---------------------------------------------------------------------------
-//
-TPtrC8 CNSmlDmFotaAdapter::GetMetaType( const TDesC8& aURI ) const
-    {
-    TPtrC8 lastSeg = LastURISeg( aURI );
-    
-    if ( lastSeg == KNSmlDMFotaNodeUpdate )
-        {
-        return KNSmlDMFotaUpdateMetaType();
-        }
-    else if ( lastSeg == KNSmlDMFotaNodeDownload )
-        {
-        return KNSmlDMFotaDownloadMetaType();
-        }
-    else if ( lastSeg == KNSmlDMFotaNodeDownloadAndUpdate )
-        {
-        return KNSmlDMFotaDownloadAndUpdateMetaType();
-        }
-
-    return KNullDesC8();
-    }
-
-// ---------------------------------------------------------------------------
-// CNSmlDmFotaAdapter::MapStatusToError()
-// Returns a status code corresponding to the system error code given 
-// as parameter.
-// ---------------------------------------------------------------------------
-//
-CSmlDmAdapter::TError CNSmlDmFotaAdapter::MapErrorToStatus( TInt aError ) const
-    {
-    CSmlDmAdapter::TError err = CSmlDmAdapter::EError;
-    
-    switch( aError )
-        {
-        case KErrNone:
-            err = CSmlDmAdapter::EOk;
-            break;
-        case KErrNotFound:
-            err = CSmlDmAdapter::ENotFound;
-            break;
-        case KErrDiskFull:
-            err = CSmlDmAdapter::EDiskFull;
-            break;
-        case KErrOverflow:
-            err = CSmlDmAdapter::ETooLargeObject;
-            break;
-        default:
-            break;
-        }
-    
-    return err;
-    }
-
-// ---------------------------------------------------------------------------
-// CNSmlDmFotaAdapter::DesToInt()
-// Converts a 8 bit descriptor to an integer.
-// ---------------------------------------------------------------------------
-//
-TInt CNSmlDmFotaAdapter::DesToInt( const TDesC8& aLUID ) const
-    {
-    TLex8 lex( aLUID );
-    TInt value = KErrNotFound;
-    lex.Val( value );
-    
-    return value;
-    }
-
-// ---------------------------------------------------------------------------
-// CNSmlDmFotaAdapter::LastURISeg()
-// Returns the last segment of the given uri.
-// ---------------------------------------------------------------------------
-//
-TPtrC8 CNSmlDmFotaAdapter::LastURISeg( const TDesC8& aURI ) const
-    {
-    TInt pos = aURI.LocateReverse( KNSmlDMFotaSeparatorDes()[0] );
-    if( pos == KErrNotFound )
-        {
-        return aURI;
-        }
-    else
-        {
-        return aURI.Mid( pos + 1 );
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// CNSmlDmFotaAdapter::FillNodeInfoL()
-// Fills the DDF node info.
-// ---------------------------------------------------------------------------
-//
-void CNSmlDmFotaAdapter::FillNodeInfoL( MSmlDmDDFObject& aNode, 
-                                        const TSmlDmAccessTypes& aAccTypes, 
-                                        MSmlDmDDFObject::TOccurence aOccurrence, 
-                                        MSmlDmDDFObject::TScope aScope, 
-                                        MSmlDmDDFObject::TDFFormat aFormat, 
-                                        const TDesC8& aDescription ) const
-    {
-    aNode.SetAccessTypesL( aAccTypes );
-    aNode.SetOccurenceL( aOccurrence );
-    aNode.SetScopeL( aScope );
-    aNode.SetDFFormatL( aFormat );
-    
-    if( aFormat != MSmlDmDDFObject::ENode )
-        {
-        aNode.AddDFTypeMimeTypeL( KNSmlDMFotaTextPlain );
-        }
-    
-    aNode.SetDescriptionL( aDescription );
-    }
-
-// ---------------------------------------------------------------------------
-// TImplementationProxy ImplementationTable[]
-// Needed because of ECOM architecture.
-// ---------------------------------------------------------------------------
-//
-#ifndef IMPLEMENTATION_PROXY_ENTRY
-#define IMPLEMENTATION_PROXY_ENTRY(aUid, aFuncPtr)  {{aUid},(aFuncPtr)}
-#endif
-
-const TImplementationProxy ImplementationTable[] = 
-    {
-    IMPLEMENTATION_PROXY_ENTRY(KNSmlDMFotaAdapterImplUid, CNSmlDmFotaAdapter::NewL)
-    };
-
-
-// ========================== OTHER EXPORTED FUNCTIONS =========================
-
-// ---------------------------------------------------------------------------
-// ImplementationGroupProxy()
-// Needed because of ECOM architecture.
-// ---------------------------------------------------------------------------
-//
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy( TInt& aTableCount )
-    {
-    _DBG_FILE("ImplementationGroupProxy() for CNSmlDmFotaAdapter: begin");
-    aTableCount = sizeof(ImplementationTable) / sizeof(TImplementationProxy);
-    _DBG_FILE("ImplementationGroupProxy() for CNSmlDmFotaAdapter: end");
-    return ImplementationTable;
-    }
-
-
-// End of file
-
--- a/omadm/omadmextensions/adapters/fota/src/nsmldmfotaadapter.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-CHARACTER_SET UTF8/*
-* Copyright (c) 2004 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:    Resource data for Fota adapter
-*
-*/
-
-
-
-
-
-#include <registryinfo.rh>
-#include "nsmldmconstants.h"
-
-RESOURCE REGISTRY_INFO theRegistryInfo
-  {
-  dll_uid = 0x101F9A08; //The DLL's 3rd UID.
-  interfaces = 
-      {
-      INTERFACE_INFO
-          {
-          interface_uid = KNSmlDMInterfaceUid; // DM interface UID
-          implementations = 
-            {
-            IMPLEMENTATION_INFO
-                {
-                implementation_uid = 0x101F9A09; // DM FOTA implementation UID
-                version_no = 1; 
-                display_name = "";
-                default_data = "";
-                opaque_data = "";
-                }
-            };
-          }
-      };
-    }
--- a/omadm/omadmextensions/adapters/fota/src/nsmldmfotaadapterdb.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,881 +0,0 @@
-/*
-* Copyright (c) 2004 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:    Fota adapter's DB implementation file
-*
-*/
-
-
-
-
-
-// INCLUDE FILES
-#include <sysutil.h>
-#include <bautils.h>
-
-#include "nsmldmfotaadapterdb.h"
-#include "nsmlconstants.h"
-#include "nsmldebug.h"
-
-#ifndef __WINS__
-                                    // This lowers the unnecessary compiler warning (armv5) to remark.
-                                    // "Warning: #174-D: expression has no effect..." is caused by 
-                                    // DBG_ARGS8 macro in no-debug builds.
-#pragma diag_remark 174
-#endif
-
-// ============================ MEMBER FUNCTIONS =============================
-
-// ---------------------------------------------------------------------------
-//  CNSmlDmFotaAdapterDb::NewL()
-//  Creates a new instance of CNSmlDmFotaAdapterDb object.
-// ---------------------------------------------------------------------------
-// 
-CNSmlDmFotaAdapterDb* CNSmlDmFotaAdapterDb::NewL()
-    {
-    _DBG_FILE("CNSmlDmFotaAdapterDb::NewL(): begin");
-    
-    CNSmlDmFotaAdapterDb* self = CNSmlDmFotaAdapterDb::NewLC(); 
-    CleanupStack::Pop( self );
-
-    _DBG_FILE("CNSmlDmFotaAdapterDb::NewL(): end");
-    
-    return self;
-    }   
-
-// ---------------------------------------------------------------------------
-//  CNSmlDmFotaAdapterDb::NewLC()
-//  Creates a new instance of CNSmlDmFotaAdapterDb object. 
-//  Pushes and leaves new instance onto CleanupStack.
-// ---------------------------------------------------------------------------
-// 
-CNSmlDmFotaAdapterDb* CNSmlDmFotaAdapterDb::NewLC()
-    {
-    _DBG_FILE("CNSmlDmFotaAdapterDb::NewLC(): begin");
-    
-    CNSmlDmFotaAdapterDb* self = new( ELeave ) CNSmlDmFotaAdapterDb();
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    
-    _DBG_FILE("CNSmlDmFotaAdapterDb::NewLC(): end");
-    
-    return self;
-    }
-
-// ---------------------------------------------------------------------------
-//  CNSmlDmFotaAdapterDb::ConstructL()
-//  Second phase constructor.
-// ---------------------------------------------------------------------------
-// 
-void CNSmlDmFotaAdapterDb::ConstructL()
-    {
-    _DBG_FILE("CNSmlDmFotaAdapterDb::ConstructL(): begin");
-    
-    User::LeaveIfError( iFsSession.Connect() );
-    User::LeaveIfError( iRdbSession.Connect() );
-    iFsSession.SetSessionToPrivate( KNSmlFotaAdapterDbDrive );
-
-    TParse name;
-
-#ifdef SYMBIAN_SECURE_DBMS
-	name.Set( KNSmlFotaAdapterDbName(), NULL, NULL );
-#else
-    name.Set( KNSmlFotaAdapterDbName(), KNSmlDatabasesNonSecurePath, NULL );
-#endif
-
-	TInt err = iDatabase.Open( iRdbSession,
-	                           name.FullName(),
-	                           KNSmlDBMSSecureMDHostOneID );
-    if ( err == KErrNotFound )
-        {
-        CreateDatabaseL( name.FullName() );
-        err = iDatabase.Open( iRdbSession,
-                              name.FullName(),
-                              KNSmlDBMSSecureMDHostOneID );
-        User::LeaveIfError( err );
-        }
-    else
-        {
-        
-        if ( ( err == KErrEof ) || ( err == KErrCorrupt ) || 
-             ( err == KErrArgument ) )
-            {
-            // something seriously wrong with the db, delete it and try 
-            // to create new
-            iRdbSession.DeleteDatabase( name.FullName(),
-                                        KNSmlDMHostOnePolicyUID );
-            CreateDatabaseL( name.FullName() );
-            err = iDatabase.Open( iRdbSession,
-                                  name.FullName(),
-                                  KNSmlDBMSSecureMDHostOneID );
-            }
-        
-        User::LeaveIfError( err );
-        }
-
-    User::LeaveIfError( iFwObjectTable.Open( iDatabase,
-                                             KNSmlTableFwMgmtObject ) );
-    iColSet = iFwObjectTable.ColSetL();
-    
-    _DBG_FILE("CNSmlDmFotaAdapterDb::ConstructL(): end");
-    }
-
-// ---------------------------------------------------------------------------
-//  CNSmlDmFotaAdapterDb::CNSmlDmFotaAdapterDb()
-//  Constructor.
-// ---------------------------------------------------------------------------
-// 
-CNSmlDmFotaAdapterDb::CNSmlDmFotaAdapterDb()
-    {
-    _DBG_FILE("CNSmlDmFotaAdapterDb::CNSmlDmFotaAdapterDb(): begin");
-    _DBG_FILE("CNSmlDmFotaAdapterDb::CNSmlDmFotaAdapterDb(): end");
-    }
-    
-// ---------------------------------------------------------------------------
-//  CNSmlDmFotaAdapterDb::~CNSmlDmFotaAdapterDb()
-//  Destructor.
-// ---------------------------------------------------------------------------
-// 
-CNSmlDmFotaAdapterDb::~CNSmlDmFotaAdapterDb()
-    {
-    _DBG_FILE("CNSmlDmFotaAdapterDb::~CNSmlDmFotaAdapterDb(): begin");
-
-    iView.Close();
-    
-    delete iColSet;
-    iFwObjectTable.Close();
-        
-    iDatabase.Close();
-    iFsSession.Close();
-    iRdbSession.Close();
-    
-    _DBG_FILE("CNSmlDmFotaAdapterDb::~CNSmlDmFotaAdapterDb(): ends");
-    }
-
-// ---------------------------------------------------------------------------
-//  CNSmlDmFotaAdapterDb::AddFwObjectL()
-//  Inserts new uninitialized row to FwMgmtObject table and returns its id.
-// ---------------------------------------------------------------------------
-// 
-TNSmlDmFwObjectId CNSmlDmFotaAdapterDb::AddFwObjectL()
-    {
-    _DBG_FILE("CNSmlDmFotaAdapterDb::AddFwObjectL(): begin");
-    
-    // Check OOD before inserting new row into FwMgmtObject table
-    if ( SysUtil::FFSSpaceBelowCriticalLevelL( &iFsSession, 
-                                               KNSmlMaxFwMgmtObjectRowSize ) )
-        {
-        User::Leave( KErrDiskFull );
-        }
-    
-    iDatabase.Begin();
-    
-    // Insert new row, and set finalt result to its null value
-    iFwObjectTable.InsertL();
-    iFwObjectTable.SetColL( iColSet->ColNo( KNSmlFwMgmtObjectResult ), 
-                            KNSmlFotaNullResult );
-    iFwObjectTable.PutL();
-    
-    CommitAndCompact();
-    
-    _DBG_FILE("CNSmlDmFotaAdapterDb::AddFwObjectL(): end");
-    
-    return iFwObjectTable.ColUint( iColSet->ColNo( KNSmlFwMgmtObjectId ) );
-    }
-    
-// ---------------------------------------------------------------------------
-//  CNSmlDmFotaAdapterDb::DeleteFwObjectL()
-//  Deletes a row from FwMgmtObject table identified by aId. If such row is 
-//  not found, returns KErrNotFound, KErrNone otherwise.
-// ---------------------------------------------------------------------------
-// 
-TInt CNSmlDmFotaAdapterDb::DeleteFwObjectL( const TNSmlDmFwObjectId aId )
-    {
-    _DBG_FILE("CNSmlDmFotaAdapterDb::DeleteFwObjectL(): begin");
-    
-    HBufC* sql = HBufC::NewL( KNSmlDeleteFwMgmtObject().Length() + 
-                              KNSmlFwMgmtObjectIntegerLength );
-    sql->Des().Format( KNSmlDeleteFwMgmtObject, aId );
-    
-    iDatabase.Begin();
-    TInt result = iDatabase.Execute( *sql );
-    CommitAndCompact();
-    
-    delete sql;
-    
-    _DBG_FILE("CNSmlDmFotaAdapterDb::DeleteFwObjectL(): end");
-    
-    return ( result == 0 ) ? KErrNotFound : KErrNone;
-    }
-    
-// ---------------------------------------------------------------------------
-//  CNSmlDmFotaAdapterDb::GetEmptyFinalResultsL()
-//  Finds all the rows in FwMgmtObject table that have null final result and
-//  puts the PkgIds of those rows to aArray.
-// ---------------------------------------------------------------------------
-// 
-void CNSmlDmFotaAdapterDb::GetEmptyFinalResultsL( RNSmlDmFwObjectArray& aArray )
-    {
-    _DBG_FILE("CNSmlDmFotaAdapterDb::GetEmptyFinalResultsL(): begin");
-    
-    aArray.Reset();
-    
-    HBufC* sql = HBufC::NewLC( KNSmlGetUnfinishedFwMgmtObjects().Length() + 
-                               KNSmlFwMgmtObjectIntLength );
-    sql->Des().Format( KNSmlGetUnfinishedFwMgmtObjects, KNSmlFotaNullResult );
-    
-    PrepareViewL( *sql, iView.EReadOnly );
-
-    CleanupStack::PopAndDestroy( sql );
-    
-    while ( iView.NextL() )
-        {
-        // get final result and append it to aArray
-        iView.GetL();
-        aArray.AppendL( iView.ColUint( 
-                        iColSet->ColNo( KNSmlFwMgmtObjectId ) ) );
-        }
-    
-    _DBG_FILE("CNSmlDmFotaAdapterDb::GetEmptyFinalResultsL(): end");
-    }
-    
-// ---------------------------------------------------------------------------
-//  CNSmlDmFotaAdapterDb::GetEmptyFinalResultsL()
-//  Finds all the rows in FwMgmtObject table that have null final result, 
-//  server id equals to aServerId and management uri is not an empty string.
-//  Puts the PkgIds of those rows to aArray.
-// ---------------------------------------------------------------------------
-// 
-void CNSmlDmFotaAdapterDb::GetEmptyFinalResultsL( RNSmlDmFwObjectArray& aArray, 
-                                                  const TDesC8& aServerId )
-    {
-    _DBG_FILE("CNSmlDmFotaAdapterDb::GetEmptyFinalResultsL(serverid): begin");
-    
-    aArray.Reset();
-    
-    HBufC* serverId = ConvertTo16BitLC( aServerId );
-    
-    HBufC* sql = HBufC::NewLC( 
-                        KNSmlGetUnfinishedFwMgmtObjectByServerId().Length() + 
-                        KNSmlFwMgmtObjectIntLength + 
-                        serverId->Length() );
-    
-    sql->Des().Format( KNSmlGetUnfinishedFwMgmtObjectByServerId, 
-                       KNSmlFotaNullResult, 
-                       serverId );
-    
-    PrepareViewL( *sql, iView.EReadOnly );
-
-    CleanupStack::PopAndDestroy( sql );
-    CleanupStack::PopAndDestroy( serverId );
-    
-    while ( iView.NextL() )
-        {
-        // get final result and append it to aArray
-        iView.GetL();
-        aArray.AppendL( iView.ColUint( 
-                        iColSet->ColNo( KNSmlFwMgmtObjectId ) ) );
-        }
-    
-    _DBG_FILE("CNSmlDmFotaAdapterDb::GetEmptyFinalResultsL( serverid ): end");
-    }
-    
-// ---------------------------------------------------------------------------
-//  CNSmlDmFotaAdapterDb::PkgNameL()
-//  Returns the PkgName field from FW object identified by aId. If no such 
-//  object is found, returns NULL.
-// ---------------------------------------------------------------------------
-// 
-HBufC8* CNSmlDmFotaAdapterDb::PkgNameL( const TNSmlDmFwObjectId aId )
-    {
-    return StrValueL( KNSmlFwMgmtObjectName, aId );
-    }
-    
-// ---------------------------------------------------------------------------
-//  CNSmlDmFotaAdapterDb::PkgVersionL()
-//  Returns the PkgVersion field from FW object identified by aId. If no such 
-//  object is found, returns NULL.
-// ---------------------------------------------------------------------------
-// 
-HBufC8* CNSmlDmFotaAdapterDb::PkgVersionL( const TNSmlDmFwObjectId aId )
-    {
-    return StrValueL( KNSmlFwMgmtObjectVersion, aId );
-    }
-    
-// ---------------------------------------------------------------------------
-//  CNSmlDmFotaAdapterDb::PkgUrlL()
-//  Returns the PkgUrl field from FW object identified by aId. If no such 
-//  object is found, returns NULL.
-// ---------------------------------------------------------------------------
-// 
-HBufC8* CNSmlDmFotaAdapterDb::PkgUrlL( const TNSmlDmFwObjectId aId )
-    {
-    return LongStrValueL( KNSmlFwMgmtObjectUrl, aId );
-    }
-    
-// ---------------------------------------------------------------------------
-//  CNSmlDmFotaAdapterDb::MgmtUriL()
-//  Returns the MgmtUri field from FW object identified by aId. If no such 
-//  object is found, returns NULL.
-// ---------------------------------------------------------------------------
-// 
-HBufC8* CNSmlDmFotaAdapterDb::MgmtUriL( const TNSmlDmFwObjectId aId )
-    {
-    return StrValueL( KNSmlFwMgmtObjectMgmtUri, aId );
-    }
-    
-// ---------------------------------------------------------------------------
-//  CNSmlDmFotaAdapterDb::ProfileIdL()
-//  Returns the ProfileId field from FW object identified by aId. If no such 
-//  object is found, returns KErrNotFound.
-// ---------------------------------------------------------------------------
-// 
-TSmlProfileId CNSmlDmFotaAdapterDb::ProfileIdL( const TNSmlDmFwObjectId aId )
-    {
-    return IntValueL( KNSmlFwMgmtObjectProfileId, aId );
-    }
-    
-// ---------------------------------------------------------------------------
-//  CNSmlDmFotaAdapterDb::ServerIdL()
-//  Returns the ServerId field from FW object identified by aId. If no such 
-//  object is found, returns NULL.
-// ---------------------------------------------------------------------------
-// 
-HBufC8* CNSmlDmFotaAdapterDb::ServerIdL( const TNSmlDmFwObjectId aId )
-    {
-    return StrValueL( KNSmlFwMgmtObjectServerId, aId );
-    }
-    
-// ---------------------------------------------------------------------------
-//  CNSmlDmFotaAdapterDb::FinalResultL()
-//  Returns the FinalResult field from FW object identified by aId. If no such 
-//  object is found, returns KErrNotFound.
-// ---------------------------------------------------------------------------
-// 
-TInt CNSmlDmFotaAdapterDb::FinalResultL( const TNSmlDmFwObjectId aId )
-    {
-    return IntValueL( KNSmlFwMgmtObjectResult, aId );
-    }
-    
-// ---------------------------------------------------------------------------
-//  CNSmlDmFotaAdapterDb::CorrelatorL()
-//  Returns the Correlator field from FW object identified by aId. If no such 
-//  object is found, returns NULL.
-// ---------------------------------------------------------------------------
-// 
-HBufC8* CNSmlDmFotaAdapterDb::CorrelatorL( const TNSmlDmFwObjectId aId )
-    {
-    return StrValueL( KNSmlFwMgmtObjectCorrelator, aId );
-    }
-    
-// ---------------------------------------------------------------------------
-//  CNSmlDmFotaAdapterDb::SetPkgNameL()
-//  Sets aName as the value of PkgName in FW object identified by aId. If no 
-//  such object is found, returns KErrNotFound. If name is too large for the 
-//  database, returns KErrOverflow.
-// ---------------------------------------------------------------------------
-// 
-TInt CNSmlDmFotaAdapterDb::SetPkgNameL( const TDesC8& aName, 
-                                        const TNSmlDmFwObjectId aId )
-    {
-    if ( aName.Length() > KFotaMaxPkgNameLength )
-        {
-        return KErrOverflow;
-        }
-    
-    return SetStrValueL( KNSmlFwMgmtObjectName, aName, aId );
-    }
-    
-// ---------------------------------------------------------------------------
-//  CNSmlDmFotaAdapterDb::SetPkgVersionL()
-//  Sets aVersion as the value of PkgVersion in FW object identified by aId.
-//  If no such object is found, returns KErrNotFound. If version is too 
-//  large for the database, returns KErrOverflow.
-// ---------------------------------------------------------------------------
-// 
-TInt CNSmlDmFotaAdapterDb::SetPkgVersionL( const TDesC8& aVersion, 
-                                           const TNSmlDmFwObjectId aId )
-    {
-    if ( aVersion.Length() > KFotaMaxPkgVersionLength )
-        {
-        return KErrOverflow;
-        }
-    
-    return SetStrValueL( KNSmlFwMgmtObjectVersion, aVersion, aId );
-    }
-    
-// ---------------------------------------------------------------------------
-//  CNSmlDmFotaAdapterDb::SetPkgUrlL()
-//  Sets aUrl as the value of PkgURL in FW object identified by aId. If no 
-//  such object is found, returns KErrNotFound. If url is too large for the 
-//  database, returns KErrOverflow.
-// ---------------------------------------------------------------------------
-// 
-TInt CNSmlDmFotaAdapterDb::SetPkgUrlL( const TDesC8& aUrl, 
-                                       const TNSmlDmFwObjectId aId )
-    {
-    if ( aUrl.Length() > KFotaMaxPkgURLLength )
-        {
-        return KErrOverflow;
-        }
-    
-    return SetLongStrValueL( KNSmlFwMgmtObjectUrl, aUrl, aId );
-    }
-    
-// ---------------------------------------------------------------------------
-//  CNSmlDmFotaAdapterDb::SetMgmtUriL()
-//  Sets aUri as the value of MgmtURI in FW object identified by aId. If no 
-//  such object is found, returns KErrNotFound. If uri is too large for the 
-//  database, returns KErrOverflow.
-// ---------------------------------------------------------------------------
-// 
-TInt CNSmlDmFotaAdapterDb::SetMgmtUriL( const TDesC8& aUri, 
-                                        const TNSmlDmFwObjectId aId )
-    {
-    if ( aUri.Length() > KNSmlMaxMgmtUriLength )
-        {
-        return KErrOverflow;
-        }
-    
-    return SetStrValueL( KNSmlFwMgmtObjectMgmtUri, aUri, aId );
-    }
-    
-// ---------------------------------------------------------------------------
-//  CNSmlDmFotaAdapterDb::SetServerInfoL()
-//  Sets aProfileId as the value of ProfileId and aServerId as the value of 
-//  ServerId in FW object identified by aId. If no such object is found, 
-//  returns KErrNotFound. If server id is too large for the database, 
-//  returns KErrOverflow.
-// ---------------------------------------------------------------------------
-// 
-TInt CNSmlDmFotaAdapterDb::SetServerInfoL( const TSmlProfileId aProfile, 
-                                           const TDesC8& aServerId, 
-                                           const TNSmlDmFwObjectId aId )
-    {
-    _DBG_FILE("CNSmlDmFotaAdapterDb::SetServerInfoL(): begin");
-    
-    if ( aServerId.Length() > KNSmlMaxServerIdLength )
-        {
-        return KErrOverflow;
-        }
-    
-    HBufC* serverId = ConvertTo16BitLC( aServerId );
-    TInt ret = UpdateRowL( aId );
-    
-    if ( ret == KErrNone )
-        {
-        // do update
-        iView.SetColL( iColSet->ColNo( KNSmlFwMgmtObjectProfileId ), 
-                       aProfile );
-        iView.SetColL( iColSet->ColNo( KNSmlFwMgmtObjectServerId ), 
-                       *serverId );
-        iView.PutL();
-        }
-    
-    CommitAndCompact();
-    
-    CleanupStack::PopAndDestroy( serverId );
-    
-    _DBG_FILE("CNSmlDmFotaAdapterDb::SetServerInfoL(): end");
-    
-    return ret;
-    }
-    
-// ---------------------------------------------------------------------------
-//  CNSmlDmFotaAdapterDb::SetFinalResultL()
-//  Sets aResult as the value of FinalResult in FW object identified by aId.
-//  If no such object is found, returns KErrNotFound.
-// ---------------------------------------------------------------------------
-// 
-TInt CNSmlDmFotaAdapterDb::SetFinalResultL( const TInt aResult, 
-                                            const TNSmlDmFwObjectId aId )
-    {
-    return SetIntValueL( KNSmlFwMgmtObjectResult, aResult, aId );
-    }
-    
-// ---------------------------------------------------------------------------
-//  CNSmlDmFotaAdapterDb::SetCorrelatorL()
-//  Sets aCorrealtor as the value of Correlator in FW object identified by aId.
-//  If no such object is found, returns KErrNotFound. If given correlator is 
-//  too large for the database, returns KErrOverflow.
-// ---------------------------------------------------------------------------
-// 
-TInt CNSmlDmFotaAdapterDb::SetCorrelatorL( const TDesC8& aCorrelator, 
-                                           const TNSmlDmFwObjectId aId )
-    {
-    if ( aCorrelator.Length() > KNSmlMaxCorrelatorLength )
-        {
-        return KErrOverflow;
-        }
-    
-    return SetStrValueL( KNSmlFwMgmtObjectCorrelator, aCorrelator, aId );
-    }
-
-// ---------------------------------------------------------------------------
-//  CNSmlDmFotaAdapterDb::CreateDatabaseL()
-//  Creates Fota database.
-// ---------------------------------------------------------------------------
-// 
-void CNSmlDmFotaAdapterDb::CreateDatabaseL( const TDesC& aFullName )
-    {
-    _DBG_FILE("CNSmlDmFotaAdapterDb::CreateDatabaseL(): begin");
-
-    // Check OOD before creating new Fota DB
-    if ( SysUtil::FFSSpaceBelowCriticalLevelL( &iFsSession, 
-                                               KNSmlFotaAdapterEmptyDbSize ) )
-        {
-        User::Leave( KErrDiskFull );
-        }
-
-    // create sql query string, 5 = amount of length integers used in Format()
-    HBufC* createFwMgmtTable = HBufC::NewLC( 
-                                    KNSmlCreateFwMgmtObjectTable().Length() + 
-                                    KNSmlFwMgmtObjectIntLength*5 );
-    
-    createFwMgmtTable->Des().Format( KNSmlCreateFwMgmtObjectTable, 
-                                     KFotaMaxPkgNameLength,
-                                     KFotaMaxPkgVersionLength,
-                                     KNSmlMaxMgmtUriLength,
-                                     KNSmlMaxServerIdLength,
-                                     KNSmlMaxCorrelatorLength );
-
-    User::LeaveIfError( iDatabase.Create( iRdbSession,
-	                                      aFullName,
-	                                      KNSmlDBMSSecureMDHostOneID ) );
-    iDatabase.Begin();
-    iDatabase.Execute( *createFwMgmtTable );
-
-    CommitAndCompact();
-    iDatabase.Close();
-    
-    CleanupStack::PopAndDestroy( createFwMgmtTable );
-    
-    _DBG_FILE("CNSmlDmFotaAdapterDb::CreateDatabaseL(): end");
-    }   
-
-
-// ---------------------------------------------------------------------------
-//  CNSmlDmFotaAdapterDb::SetStrValueL()
-//  Sets aValue as the value of aColumn in FW object identified by aObject.
-// ---------------------------------------------------------------------------
-// 
-TInt CNSmlDmFotaAdapterDb::SetStrValueL( const TDesC& aColumn, 
-                                         const TDesC8& aValue,
-                                         const TNSmlDmFwObjectId aObject )
-    {
-    _DBG_FILE("CNSmlDmFotaAdapterDb::SetStrValueL(): begin");
-    
-    HBufC* value = ConvertTo16BitLC( aValue );
-    
-    DBG_ARGS( _S16("CNSmlDmFotaAdapterDb::SetStrValueL(): ('%S', '%S', %d)"), 
-              &aColumn, value, aObject );
-    
-    TInt ret = UpdateRowL( aObject );
-    
-    if ( ret == KErrNone )
-        {
-        // do update
-        iView.SetColL( iColSet->ColNo( aColumn ), *value );
-        iView.PutL();
-        }
-    
-    CommitAndCompact();
-    
-    CleanupStack::PopAndDestroy( value );
-    
-    _DBG_FILE("CNSmlDmFotaAdapterDb::SetStrValueL(): end");
-    
-    return ret;
-    }
-
-// ---------------------------------------------------------------------------
-//  CNSmlDmFotaAdapterDb::SetLongStrValueL()
-//  Streams aValue and its length as the value of aColumn in FW object 
-//  identified by aObject.
-// ---------------------------------------------------------------------------
-// 
-TInt CNSmlDmFotaAdapterDb::SetLongStrValueL( const TDesC& aColumn, 
-                                             const TDesC8& aValue, 
-                                             const TNSmlDmFwObjectId aObject )
-    {
-    _DBG_FILE("CNSmlDmFotaAdapterDb::SetLongStrValueL(): begin");
-    
-    HBufC* value = ConvertTo16BitLC( aValue );
-    
-    DBG_ARGS( _S16("CNSmlDmFotaAdapterDb::SetStrValueL(): ('%S', '%S', %d)"),
-              &aColumn, value, aObject );
-    
-    TInt ret = UpdateRowL( aObject );
-    
-    if ( ret == KErrNone )
-        {
-        // do update
-        
-        RDbColWriteStream wStream;
-        wStream.OpenL( iView, iColSet->ColNo( aColumn ) );
-        CleanupClosePushL( wStream );
-        
-        wStream.WriteInt32L( value->Length() );
-        wStream.WriteL( *value, value->Length() );
-        
-        CleanupStack::PopAndDestroy( &wStream );
-        
-        iView.PutL();
-        }
-    
-    CommitAndCompact();
-    
-    CleanupStack::PopAndDestroy( value );
-    
-    _DBG_FILE("CNSmlDmFotaAdapterDb::SetLongStrValueL(): end");
-    
-    return ret;
-    }
-
-// ---------------------------------------------------------------------------
-//  CNSmlDmFotaAdapterDb::SetIntValueL()
-//  Sets aValue as the value of aColumn in FW object identified by aObject.
-// ---------------------------------------------------------------------------
-// 
-TInt CNSmlDmFotaAdapterDb::SetIntValueL( const TDesC& aColumn, 
-                                         const TInt aValue, 
-                                         const TNSmlDmFwObjectId aObject )
-    {
-    _DBG_FILE("CNSmlDmFotaAdapterDb::SetIntValueL(): begin");
-    DBG_ARGS( _S16("CNSmlDmFotaAdapterDb::SetIntValueL(): ('%S', %d, %d)"), 
-              &aColumn, aValue, aObject );
-    
-    TInt ret = UpdateRowL( aObject );
-    
-    if ( ret == KErrNone )
-        {
-        // do update
-        iView.SetColL( iColSet->ColNo( aColumn ), aValue );
-        iView.PutL();
-        }
-    
-    CommitAndCompact();
-    
-    _DBG_FILE("CNSmlDmFotaAdapterDb::SetIntValueL(): end");
-    
-    return ret;
-    }
-    
-// ---------------------------------------------------------------------------
-//  CNSmlDmFotaAdapterDb::UpdateRowL()
-//  Prepares iView when setting a value to one of the rows in DB table. 
-// ---------------------------------------------------------------------------
-// 
-TInt CNSmlDmFotaAdapterDb::UpdateRowL( const TNSmlDmFwObjectId aObject )
-    {
-    TInt ret = KErrNone;
-    
-    HBufC* sql = FwMgmtObjectRowSqlLC( aObject );
-    PrepareViewL( *sql, iView.EUpdatable );
-    iDatabase.Begin();
-
-    CleanupStack::PopAndDestroy( sql );
-    
-    if ( iView.FirstL() )
-        {
-        // fw object exists
-        // Get current row for accessing and initiate update
-        iView.GetL();
-        iView.UpdateL();
-        }
-    else
-        {
-        // fw object does not exists, cannot update
-        ret = KErrNotFound;
-        }
-    
-    return ret;
-    }
-    
-// ---------------------------------------------------------------------------
-//  CNSmlDmFotaAdapterDb::StrValueL()
-//  Returns the value in FW object identified by aObject in column aColumn.
-// ---------------------------------------------------------------------------
-// 
-HBufC8* CNSmlDmFotaAdapterDb::StrValueL( const TDesC& aColumn, 
-                                         const TNSmlDmFwObjectId aObject )
-    {
-    DBG_ARGS( _S16("CNSmlDmFotaAdapterDb::StrValueL('%S', %d): begin"), 
-              &aColumn, aObject );
-    
-    HBufC8* value = NULL;
-    
-    FetchRowL( aObject );
-    
-    if ( iView.FirstL() )
-        {
-        // get value
-        iView.GetL();
-        TPtrC res = iView.ColDes( iColSet->ColNo( aColumn ) );
-        
-        // convert to 8-bit
-        value = HBufC8::NewL( res.Length() );
-        value->Des().Copy( res );
-        }
-    
-    _DBG_FILE("CNSmlDmFotaAdapterDb::StrValueL(): end");
-    
-    return value;
-    }
-
-// ---------------------------------------------------------------------------
-//  CNSmlDmFotaAdapterDb::LongStrValueL()
-//  Returns the value in FW object identified by aObject in column aColumn.
-// ---------------------------------------------------------------------------
-// 
-HBufC8* CNSmlDmFotaAdapterDb::LongStrValueL( const TDesC& aColumn, 
-                                             const TNSmlDmFwObjectId aObject )
-    {
-    DBG_ARGS( _S16("CNSmlDmFotaAdapterDb::LongStrValueL('%S', %d): begin"), 
-              &aColumn, aObject );
-    
-    HBufC8* value = NULL;
-    
-    FetchRowL( aObject );
-    
-    if ( iView.FirstL() )
-        {
-        // get value
-        iView.GetL();
-        
-        RDbColReadStream rStream;
-        rStream.OpenL( iView, iColSet->ColNo( aColumn ) );
-        CleanupClosePushL( rStream );
-        
-        TInt length = 0;
-        TRAPD( err, length = rStream.ReadInt32L() );
-        
-        HBufC* buf = HBufC::NewLC( length );
-        TPtr bufPtr = buf->Des();
-        
-        if ( err == KErrNone )
-            {
-            rStream.ReadL( bufPtr, length );
-            }
-        
-        // convert to 8-bit
-        value = HBufC8::NewL( bufPtr.Length() );
-        value->Des().Copy( bufPtr );
-        
-        CleanupStack::PopAndDestroy( buf );
-        CleanupStack::PopAndDestroy( &rStream );
-        }
-    
-    _DBG_FILE("CNSmlDmFotaAdapterDb::LongStrValueL(): end");
-    
-    return value;
-    }
-
-// ---------------------------------------------------------------------------
-//  CNSmlDmFotaAdapterDb::IntValueL()
-//  Returns the value in FW object identified by aObject in column aColumn.
-// ---------------------------------------------------------------------------
-// 
-TInt CNSmlDmFotaAdapterDb::IntValueL( const TDesC& aColumn,
-                                      const TNSmlDmFwObjectId aObject )
-    {
-    DBG_ARGS( _S16("CNSmlDmFotaAdapterDb::IntValueL('%S', %d): begin"), 
-              &aColumn, aObject );
-    
-    TInt value = KErrNotFound;
-    
-    FetchRowL( aObject );
-    
-    if ( iView.FirstL() )
-        {
-        iView.GetL();
-        value = iView.ColInt( iColSet->ColNo( aColumn ) );
-        }
-    
-    _DBG_FILE("CNSmlDmFotaAdapterDb::IntValueL(): end");
-    
-    return value;
-    }
-
-// ---------------------------------------------------------------------------
-//  CNSmlDmFotaAdapterDb::FetchRowL()
-//  Prepares iView when getting a single row from DB.
-// ---------------------------------------------------------------------------
-// 
-void CNSmlDmFotaAdapterDb::FetchRowL( const TNSmlDmFwObjectId aObject )
-    {
-    HBufC* sql = FwMgmtObjectRowSqlLC( aObject );
-    
-    PrepareViewL( *sql, iView.EReadOnly );
-
-    CleanupStack::PopAndDestroy( sql );
-    }
-
-// ---------------------------------------------------------------------------
-//  CNSmlDmFotaAdapterDb::FwMgmtObjectRowSqlLC()
-//  Returns a buffer containing formatted SQL statement for getting a FW object 
-//  identified by aId.
-// ---------------------------------------------------------------------------
-// 
-HBufC* CNSmlDmFotaAdapterDb::FwMgmtObjectRowSqlLC( TNSmlDmFwObjectId aId ) const
-    {
-    HBufC* sql = HBufC::NewLC( KNSmlGetFwMgmtObject().Length() + 
-                               KNSmlFwMgmtObjectIntegerLength );
-    
-    TPtr sqlPtr = sql->Des();
-    sqlPtr.Format( KNSmlGetFwMgmtObject, aId );
-    return sql;
-    }
-
-// ---------------------------------------------------------------------------
-//  CNSmlDmFotaAdapterDb::PrepareViewL()
-//  Closes and prepares the view
-// ---------------------------------------------------------------------------
-// 
-void CNSmlDmFotaAdapterDb::PrepareViewL( const TDesC& aSql, 
-                                         RDbRowSet::TAccess aAccess )
-    {
-    iView.Close();
-    User::LeaveIfError( iView.Prepare( iDatabase, TDbQuery(aSql), aAccess ) );
-    
-    if ( iView.Unevaluated() )
-        {
-        User::LeaveIfError( iView.EvaluateAll() );
-        }
-    }
-
-// ---------------------------------------------------------------------------
-//  CNSmlDmFotaAdapterDb::CommitAndCompact()
-//  Commits update and compacts the database
-// ---------------------------------------------------------------------------
-// 
-void CNSmlDmFotaAdapterDb::CommitAndCompact() 
-    {
-    iDatabase.Commit();
-    iDatabase.Compact();
-    }
-
-// ---------------------------------------------------------------------------
-//  CNSmlDmFotaAdapterDb::ConvertTo16BitLC()
-//  Returns a pointer to a unicode copy of the given 8-bit descriptor.
-//  The pointer to the copy is allocated from heap and pushed on the 
-//  CleanupStack.
-// ---------------------------------------------------------------------------
-// 
-HBufC* CNSmlDmFotaAdapterDb::ConvertTo16BitLC( const TDesC8& aDes ) const
-    {
-    HBufC* buf = HBufC::NewLC( aDes.Length() );
-    buf->Des().Copy( aDes );
-    
-    return buf;
-    }
--- a/omadm/omadmextensions/adapters/globalwlansettings/group/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-/*
-* Copyright (c) 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:   build info file for globalwlanadapter
-*
-*/
-
-
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-
-PRJ_MMPFILES
-./globalwlanadapter.mmp
-
-
-
--- a/omadm/omadmextensions/adapters/globalwlansettings/group/globalwlanadapter.mmp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-/*
-* Copyright (c) 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:   Project definition file for project globalwlanadapter 
-*
-*/
-
-
-
-#include  <platform_paths.hrh>
-#include <data_caging_paths.hrh>
-
-CAPABILITY      CAP_ECOM_PLUGIN
-TARGET	      	globalwlanadapter.dll
-TARGETTYPE      PLUGIN
-UID             0x10009D8D 0x1315DBD
-VENDORID        VID_DEFAULT
-
-MW_LAYER_SYSTEMINCLUDE
-SYSTEMINCLUDE 	/epoc32/include/ecom 
-
-USERINCLUDE     ../inc
-
-START RESOURCE	../src/globalwlanadapter.rss
-END
-
-SOURCEPATH ../src
-SOURCE globalwlanadapter.cpp
-
-LIBRARY		charconv.lib commdb.lib efsrv.lib ecom.lib euser.lib  
-LIBRARY		nsmldebug.lib sysutil.lib
-LIBRARY		inetprotutil.lib
-LIBRARY 	centralrepository.lib bafl.lib estor.lib edbms.lib FeatMgr.lib
--- a/omadm/omadmextensions/adapters/globalwlansettings/inc/globalwlanadapter.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,392 +0,0 @@
-/*
-* Copyright (c) 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:   Global WLAN settings adapter
-*
-*/
-
-
-
-#ifndef __GLOBALWLANADAPTER_H__
-#define __GLOBALWLANADAPTER_H__
-
-
-// -----------------------------------------------------------------------------------------------
-// Includes
-// -----------------------------------------------------------------------------------------------
-#include <utf.h>
-#include <commdb.h>
-#include <EapSettings.h>
-#include <internetconnectivitycrkeys.h>
-#include <smldmadapter.h>
-
-
-// -----------------------------------------------------------------------------------------------
-// Constants
-// -----------------------------------------------------------------------------------------------
-
-// The nodes of the DDF structure
-_LIT8( KNSmlWLan, "WLAN" );
-_LIT8( KNSmlWLanInternetConnectivityTest, "InternetConnectivityTest" );
-_LIT8( KNSmlWLanUseDefaultSettings, "UseDefaultSettings" );
-_LIT8( KNSmlWLanLongRetryLimit, "LongRetryLimit" );
-_LIT8( KNSmlWLanShortRetryLimit, "ShortRetryLimit" );
-_LIT8( KNSmlWLanRTSThreshold, "RTSThreshold" );
-_LIT8( KNSmlWLanTXPowerLevel, "TXPowerLevel" );
-_LIT8( KNSmlWLanPowerSaving, "PowerSaving" );
-_LIT8( KNSmlWLanBackgroundScanInterval, "BackgroundScanInterval" );
-_LIT8( KNSmlWLanScanRate, "ScanRate" );
-_LIT8( KNSmlWLanRCPITrigger, "RCPITrigger" );
-_LIT8( KNSmlWLanMinActiveChannelTime, "MinActiveChannelTime" );
-_LIT8( KNSmlWLanMaxActiveChannelTime, "MaxActiveChannelTime" );
-_LIT8( KNSmlWLanMaxTxMSDULifeTime, "MaxTxMSDULifeTime" );
-_LIT8( KNSmlWLanScanExpirationTimer, "ScanExpirationTimer" );
-_LIT8( KNSmlWLanUnloadDriverTimer, "UnloadDriverTimer" );
-_LIT8( KNSmlWLanRoamTimer, "RoamTimer" );
-_LIT8( KNSmlWLanRCPIDifference, "RCPIDifference" );
-_LIT8( KNSmlWLanConnRegainTimer, "ConnRegainTimer" );
-_LIT8( KNSmlWLanMaxTriesToFindNw, "MaxTriesToFindNw" );
-_LIT8( KNSmlWLanDelayBetweenFindNw, "DelayBetweenFindNw" );
-_LIT8( KNSmlWLanAllowRadioMeasurements, "AllowRadioMeasurements" );
-_LIT8( KNSmlWLanMinPassiveChannelTime, "MinPassiveChannelTime" );
-_LIT8( KNSmlWLanMaxPassiveChannelTime, "MaxPassiveChannelTime" );
-_LIT8( KNSmlWLanMaxApFailureCount, "MaxApFailureCount" );
-_LIT8( KNSmlWLanLongBeaconFindCount, "LongBeaconFindCount" );
-_LIT8( KNSmlWLanQosNullFrameInterval, "QosNullFrameInterval" );
-_LIT8( KNSmlWLanQosNullFrameTimeout, "QosNullFrameTimeout" );
-_LIT8( KNSmlWLanMTU, "MTU" );
-_LIT8( KNSmlWLanNode, "InternetConnectivityTest/UseDefaultSettings/LongRetryLimit/ShortRetryLimit/RTSThreshold/TXPowerLevel/PowerSaving/BackgroundScanInterval/ScanRate/RCPITrigger/MinActiveChannelTime/MaxActiveChannelTime/MaxTxMSDULifeTime/ScanExpirationTimer/UnloadDriverTimer/RoamTimer/RCPIDifference/ConnRegainTimer/MaxTriesToFindNw/DelayBetweenFindNw/AllowRadioMeasurements/MinPassiveChannelTime/MaxApFailureCount/LongBeaconFindCount/QosNullFrameInterval/QosNullFrameTimeout" );
-
-//DDF version number
-_LIT8( KNSmGlobalWlanAdapterDDFversion, "1.0");
-_LIT8( KNSmlMimeType, "text/plain" );
-_LIT8( KNSmlEmpty, "");
-
-
-const TInt KUriSegListLength = 128;
-// Maximum input size for nodes
-const TInt KInputMaxLength = 50;
-// Max lenght of the DDF type
-const TInt KTypeMaxLength = 40;
-// Repository id
-const TUid KCRUidWlanDeviceSettingsRegistryId = {0x101f8e44};
-
-
-// WLan engine central repository parameters
-const TUint32 KWlanScanRate =                            0x00000004;
-const TUint32 KWlanRcpiTrigger =                         0x00000005;
-const TUint32 KWlanMinActiveChannelTime =                0x00000006;
-const TUint32 KWlanMaxActiveChannelTime =                0x00000007;
-const TUint32 KWlanMaxTxMSDULifeTime =                   0x00000008;
-const TUint32 KWlanScanExpirationTimer =                 0x00000009;
-const TUint32 KWlanUnloadDriverTimer =                   0x0000000A;
-const TUint32 KWlanRoamTimer =                           0x0000000B;
-const TUint32 KWlanRcpiDifference =                      0x0000000C;
-const TUint32 KWlanConnRegainTimer =                     0x0000000D;
-const TUint32 KWlanMaxTriesToFindNw =                    0x0000000E;
-const TUint32 KWlanDelayBetweenFindNw =                  0x0000000F;
-const TUint32 KWlanMTU =								 0x00000010;
-const TUint32 KWlanMinPassiveChannelTime =               0x00000011;
-const TUint32 KWlanMaxPassiveChannelTime =               0x00000012;
-const TUint32 KWlanMaxApFailureCount =                   0x00000013;
-const TUint32 KWlanLongBeaconFindCount =                 0x00000014;
-const TUint32 KWlanQosNullFrameInterval =                0x00000015;
-const TUint32 KWlanQosNullFrameTimeout =                 0x00000016;
-
-// -----------------------------------------------------------------------------------------------
-// Structures
-// -----------------------------------------------------------------------------------------------
-
-// Structure for storing the settings to be stored into cenrep and commsdb
-struct TGlobalSettings
-{
-	TUint32 internetConnectivityTest;
-	TBool internetConnectivityTestPresent;
-	TBool useDefaultSettings;
-	TBool useDefaultSettingsPresent;
-	TUint32 longRetryLimit;
-	TBool longRetryLimitPresent;
-	TUint32 shortRetryLimit;
-	TBool shortRetryLimitPresent;
-	TUint32 RTSThreshold;
-	TBool RTSThresholdPresent;
-	TUint32 TXPowerLevel;
-	TBool TXPowerLevelPresent;
-	TBool powerSaving;
-	TBool powerSavingPresent;
-	TUint32 backgroundScanInterval;
-	TBool backgroundScanIntervalPresent;
-	TUint32 scanRate;
-	TBool scanRatePresent;
-	TUint32 RCPITrigger;
-	TBool RCPITriggerPresent;
-	TUint32 minActiveChannelTime;
-	TBool minActiveChannelTimePresent;
-	TUint32 maxActiveChannelTime;
-	TBool maxActiveChannelTimePresent;
-	TUint32 maxTxMSDULifeTime;
-	TBool maxTxMSDULifeTimePresent;
-	TUint32 scanExpirationTimer;
-	TBool scanExpirationTimerPresent;
-	TUint32 unloadDriverTimer;
-	TBool unloadDriverTimerPresent;
-	TUint32 roamTimer;
-	TBool roamTimerPresent;
-	TUint32 RCPIDifference;
-	TBool RCPIDifferencePresent;
-	TUint32 connRegainTimer;
-	TBool connRegainTimerPresent;
-	TUint32 maxTriesToFindNw;
-	TBool maxTriesToFindNwPresent;
-	TUint32 delayBetweenFindNw;
-	TBool delayBetweenFindNwPresent;
-	TBool allowRadioMeasurements;
-	TBool allowRadioMeasurementsPresent;
-	TUint32 minPassiveChannelTime;
-	TBool minPassiveChannelTimePresent;
-	TUint32 maxPassiveChannelTime;
-	TBool maxPassiveChannelTimePresent;
-	TUint32 maxApFailureCount;
-	TBool maxApFailureCountPresent;
-	TUint32 longBeaconFindCount;
-	TBool longBeaconFindCountPresent;
-	TUint32 qosNullFrameInterval;
-	TBool qosNullFrameIntervalPresent;
-	TUint32 qosNullFrameTimeout;
-	TBool qosNullFrameTimeoutPresent;
-	TUint32 MTU;
-	TBool MTUPresent;
-};
-
-// Structure for storing the result and status variables from every addition/fetch command
-struct TStatusResult
-{
-	TInt internetConnectivityTestStatus;
-	TInt internetConnectivityTestResult;
-	TInt useDefaultSettingsStatus;
-	TInt useDefaultSettingsResult;
-	TInt longRetryLimitStatus;
-	TInt longRetryLimitResult;
-	TInt shortRetryLimitStatus;
-	TInt shortRetryLimitResult;
-	TInt RTSThresholdStatus;
-	TInt RTSThresholdResult;
-	TInt TXPowerLevelStatus;
-	TInt TXPowerLevelResult;
-	TInt powerSavingStatus;
-	TInt powerSavingResult;
-	TInt backgroundScanIntervalStatus;
-	TInt backgroundScanIntervalResult;
-	TInt scanRateStatus;
-	TInt scanRateResult;
-	TInt RCPITriggerStatus;
-	TInt RCPITriggerResult;
-	TInt minActiveChannelTimeStatus;
-	TInt minActiveChannelTimeResult;
-	TInt maxActiveChannelTimeStatus;
-	TInt maxActiveChannelTimeResult;
-	TInt maxTxMSDULifeTimeStatus;
-	TInt maxTxMSDULifeTimeResult;
-	TInt scanExpirationTimerStatus;
-	TInt scanExpirationTimerResult;
-	TInt unloadDriverTimerStatus;
-	TInt unloadDriverTimerResult;
-	TInt roamTimerStatus;
-	TInt roamTimerResult;
-	TInt RCPIDifferenceStatus;
-	TInt RCPIDifferenceResult;
-	TInt connRegainTimerStatus;
-	TInt connRegainTimerResult;
-	TInt maxTriesToFindNwStatus;
-	TInt maxTriesToFindNwResult;
-	TInt delayBetweenFindNwStatus;
-	TInt delayBetweenFindNwResult;
-	TInt allowRadioMeasurementsStatus;
-	TInt allowRadioMeasurementsResult;
-	TInt minPassiveChannelTimeStatus;
-	TInt minPassiveChannelTimeResult;
-	TInt maxPassiveChannelTimeStatus;
-	TInt maxPassiveChannelTimeResult;
-	TInt maxApFailureCountStatus;
-	TInt maxApFailureCountResult;
-	TInt longBeaconFindCountStatus;
-	TInt longBeaconFindCountResult;
-	TInt qosNullFrameIntervalStatus;
-	TInt qosNullFrameIntervalResult;
-	TInt qosNullFrameTimeoutStatus;
-	TInt qosNullFrameTimeoutResult;
-	TInt MTUStatus;
-	TInt MTUResult;
-};
-
-
-// -----------------------------------------------------------------------------------------------
-// Enumerations
-// -----------------------------------------------------------------------------------------------
-        
-   
-// ------------------------------------------------------------------------------------------------
-// CGlobalWLanAdapter 
-// ------------------------------------------------------------------------------------------------
-class CGlobalWLANAdapter : public CSmlDmAdapter
-        {
-public:
-        static CGlobalWLANAdapter* NewL( MSmlDmCallback* aDmCallback );
-        static CGlobalWLANAdapter* NewLC( MSmlDmCallback* aDmCallback );
-        void ConstructL( );
-        virtual ~CGlobalWLANAdapter();
-
-// Adapter interface
-        void DDFVersionL( CBufBase& aDDFVersion );
-        void DDFStructureL( MSmlDmDDFObject& aDDF );
-        void AddLeafObjectL( const TDesC8& aURI,
-                             const TDesC8& aParentLUID, 
-                             const TDesC8& aObject, 
-                             const TDesC8& aType, 
-                             const TInt aStatusRef );  
-        void UpdateLeafObjectL( const TDesC8& aURI, 
-                                const TDesC8& aLUID, 
-                            const TDesC8& aObject, 
-                            const TDesC8& aType, 
-                            const TInt aStatusRef );
-       void UpdateLeafObjectL( const TDesC8& aURI, 
-                            const TDesC8& aLUID,
-                            RWriteStream*& aStream, 
-                            const TDesC8& aType,
-                            TInt aStatusRef );
-        void DeleteObjectL( const TDesC8& aURI, 
-                            const TDesC8& aLUID, 
-                            const TInt aStatusRef ); 
-        void FetchLeafObjectL( const TDesC8& aURI, 
-                               const TDesC8& aLUID, 
-                               const TDesC8& aType, 
-                               const TInt aResultsRef, 
-                               const TInt aStatusRef ); 
-        void FetchLeafObjectSizeL( const TDesC8& aURI, 
-                               const TDesC8& aLUID,
-                               const TDesC8& aType, 
-                               TInt aResultsRef,
-                               TInt aStatusRef );
-        void ChildURIListL( const TDesC8& aURI, 
-                            const TDesC8& aLUID, 
-                            const CArrayFix<TSmlDmMappingInfo>& aPreviousURISegmentList, 
-                            const TInt aResultsRef, 
-                            const TInt aStatusRef ); 
-        void AddNodeObjectL( const TDesC8& aURI, 
-                             const TDesC8& aParentLUID, 
-                             const TInt aStatusRef );
-        void ExecuteCommandL( const TDesC8& aURI, 
-                              const TDesC8& aLUID,
-                              const TDesC8& aArgument, 
-                              const TDesC8& aType,
-                              TInt aStatusRef );
-        void ExecuteCommandL( const TDesC8& aURI, 
-                              const TDesC8& aLUID,
-                              RWriteStream*& aStream, 
-                              const TDesC8& aType,
-                              TInt aStatusRef );
-        void CopyCommandL( const TDesC8& aTargetURI, 
-                           const TDesC8& aTargetLUID, 
-                           const TDesC8& aSourceURI,
-                           const TDesC8& aSourceLUID, 
-                           const TDesC8& aType,
-                           TInt aStatusRef );
-        void StartAtomicL();
-        void CommitAtomicL();
-        void RollbackAtomicL();
-        TBool StreamingSupport( TInt& aItemSize );
-        void StreamCommittedL();
-        void CompleteOutstandingCmdsL();
-
-
-private:
-        CGlobalWLANAdapter(TAny* aEcomArguments);
-        void FillNodeInfoL( MSmlDmDDFObject& aNode,
-                            TSmlDmAccessTypes aAccTypes,
-                            MSmlDmDDFObject::TOccurence aOccurrence, 
-                            MSmlDmDDFObject::TScope aScope, 
-                            MSmlDmDDFObject::TDFFormat aFormat,
-                            const TDesC8& aDescription );
-        void ExecuteBufferL( TBool aFinal = EFalse ); 
-        
-        /**
-     	* Stores the central repository parameters
-     	*
-     	* @return 
-     	*/
-        void StoreCenRepParamsL();
-        
-        /**
-     	* Stores the CommsDB parameters
-     	*
-     	* @return 
-     	*/
-  		void StoreCommsDBParamsL();
-  			
-  		/**
-     	* Reads the central repository parameters
-     	*
-     	* @return 
-     	*/
-        void ReadCenRepParamsL();
-        
-        /**
-     	* Returns the central repository parameters and updates statuses
-     	*
-     	* @return 
-     	*/
-        void UpdateStatusAndResultL( TInt aResult, TInt aStatus, TDesC8& aValue, TDesC8& aType, TInt aStoreErr );
-        
-        /**
-     	* Reads the CommsDB parameters
-     	*
-     	* @return 
-     	*/
-  		void ReadCommsDBParamsL();
-                          
-        /**
-     	* Gets the number of uri segments in the URI
-     	*
-     	* @since S60 ?S60_version
-     	* @param aUri The URI whose segments are counted
-     	* @return The amount of segments
-     	*/
-        TInt NumOfUriSegs( const TDesC8& aUri );
-        
-        /**
-     	* Gets the last uri segment
-     	*
-     	* @since S60 ?S60_version
-     	* @param aUri The URI whose segments are counted
-     	* @return The last segment
-     	*/        
-        TPtrC8 GetLastUriSeg(const TDesC8& aURI);
-        
-        TInt DesToInt( const TDesC8& aLuid );
-        void InitMemberVariables();
-
-        MSmlDmCallback* iCallBack;
-        
-        // Variable to store the received parameters
-        TGlobalSettings* iWriteSettings;
-        // Variable to store whick parameters are to be fetched
-        TGlobalSettings* iReadSettings;
-        // Status and result information related to fetches and additions
-        TStatusResult* iReadStatuses;
-        TStatusResult* iWriteStatuses;
-        
-        TBool iWlanSupported;
-
-        };
-
-#endif __GLOBALWLANADAPTER_H__
--- a/omadm/omadmextensions/adapters/globalwlansettings/rom/globalwlanadapter.iby	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-/*
-* Copyright (c) 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:   Image description file for project GlobalWLANAdapter
-*
-*/
-
-
-
-REM SyncML Device Management internet adapter
-
-#include <bldvariant.hrh>
-
-#ifndef __GLOBALWLANADAPTER_IBY__
-#define __GLOBALWLANADAPTER_IBY__
-
-#ifdef __SYNCML_DM // nothing should be installed from this .iby file if __SYNCML_DM feature is not selected
-
-#ifdef __SYNCML_DM_WLAN 
-ECOM_PLUGIN(globalwlanadapter.dll,globalwlanadapter.rsc)
-#endif // __SYNCML_DM_WLAN
-
-#endif //__SYNCML_DM
-
-#endif //__GLOBALWLANADAPTER_IBY__
--- a/omadm/omadmextensions/adapters/globalwlansettings/src/globalwlanadapter.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2998 +0,0 @@
-/*
-* Copyright (c) 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:   Global WLAN settings Adapter
-*
-*/
-
-
-
-#include "globalwlanadapter.h"
-#include "nsmldebug.h"
-#include <implementationproxy.h> // For TImplementationProxy definition
-#include <commdb.h>
-#include <WlanCdbCols.h>
-#include <utf.h>
-#include <cdbstore.h>
-#include <cdbcols.h>
-#include <f32file.h>
-#include <e32const.h>
-#include <s32strm.h>
-#include <e32base.h>
-#include <sysutil.h>
-#include <e32cmn.h>
-#include <featmgr.h>
-
-#include <centralrepository.h>
-#include <commsdattypesv1_1.h>
-
-
-#ifndef __WINS__
-// This lowers the unnecessary compiler warning (armv5) to remark.
-// "Warning:  #174-D: expression has no effect..." is caused by 
-// DBG_ARGS8 macro in no-debug builds.
-#pragma diag_remark 174
-#endif
-
-
-//------------------------------------------------------------------------------
-//
-//------------------------------------------------------------------------------
-const TImplementationProxy ImplementationTable[] = 
-    {
-    IMPLEMENTATION_PROXY_ENTRY(0x1315DBE, CGlobalWLANAdapter::NewL)
-    };
-
-//------------------------------------------------------------------------------
-// TImplementationProxy* ImplementationGroupProxy()
-//------------------------------------------------------------------------------
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy( TInt& aTableCount )
-    {
-    _DBG_FILE("ImplementationGroupProxy() for CGlobalWLANAdapter: begin");
-
-    aTableCount = sizeof(ImplementationTable) / sizeof(TImplementationProxy);
-
-    _DBG_FILE("ImplementationGroupProxy() for CGlobalWLANAdapter: end");
-    return ImplementationTable;
-    }
-
-
-//-----------------------------------------------------------------------------
-// CGlobalWLANAdapter* CGlobalWLANAdapter::NewL( )
-//-----------------------------------------------------------------------------
-CGlobalWLANAdapter* CGlobalWLANAdapter::NewL( MSmlDmCallback* aDmCallback )
-    {
-    _DBG_FILE("CGlobalWLANAdapter::NewL(): begin");
-
-    CGlobalWLANAdapter* self = NewLC( aDmCallback );
-    CleanupStack::Pop( self );
-
-    _DBG_FILE("CGlobalWLANAdapter::NewL(): end");
-    return self;
-    }
-
-//-----------------------------------------------------------------------------
-// CGlobalWLANAdapter* CGlobalWLANAdapter::NewLC( )
-//-----------------------------------------------------------------------------
-CGlobalWLANAdapter* CGlobalWLANAdapter::NewLC( MSmlDmCallback* aDmCallback )
-    {
-    _DBG_FILE("CGlobalWLANAdapter::NewLC(): begin");
-    
-    CGlobalWLANAdapter* self = new(ELeave) CGlobalWLANAdapter(aDmCallback);
-    CleanupStack::PushL( self );
-
-    self->iCallBack = aDmCallback;
-    _DBG_FILE("CGlobalWLANAdapter::NewLC(): call constructL");
-    self->ConstructL( );
-
-    _DBG_FILE("CGlobalWLANAdapter::NewLC(): end");
-    return self;
-    }
-
-//-----------------------------------------------------------------------------
-// void CGlobalWLAdapter::ConstructL( )
-// Second phase constructor
-//-----------------------------------------------------------------------------
-void CGlobalWLANAdapter::ConstructL(  )
-	{
-    _DBG_FILE("CGlobalWLANAdapter::ConstructL(): begin");
-    
-    // checks if Wlan feature is supported
-    FeatureManager::InitializeLibL();
-    iWlanSupported = FeatureManager::FeatureSupported( KFeatureIdProtocolWlan );
-    FeatureManager::UnInitializeLib();
-    
-    iWriteSettings = new(ELeave) TGlobalSettings;
-    iReadSettings = new(ELeave) TGlobalSettings;
-    iReadStatuses = new(ELeave) TStatusResult;
-    iWriteStatuses = new(ELeave) TStatusResult;
-    
-    // set "present" variables to false, since symbian inits thems as true
-    InitMemberVariables();
-     
-    _DBG_FILE("CGlobalWLANAdapter::ConstructL(): end");
-    }
-
-//-----------------------------------------------------------------------------
-// CGlobalWLANAdapter::CGlobalWLANAdapter( )
-// Constructor
-//-----------------------------------------------------------------------------
-CGlobalWLANAdapter::CGlobalWLANAdapter( TAny* aEcomArguments )
-    : CSmlDmAdapter(aEcomArguments)
-    {
-    _DBG_FILE("CGlobalWLANAdapter::CGlobalWLANAdapter(): begin");
-    _DBG_FILE("CGlobalWLANAdapter::CGlobalWLANAdapter(): end");
-    }
-
-//-----------------------------------------------------------------------------
-// CGlobalWLANAdapter::~CGlobalWLANAdapter( )
-// Destructor
-//-----------------------------------------------------------------------------
-CGlobalWLANAdapter::~CGlobalWLANAdapter( )
-    {
-    _DBG_FILE("CGlobalWLANAdapter::~CGlobalWLANAdapter(): begin");
-    
-    delete iWriteSettings;
-    delete iReadSettings;
-    delete iReadStatuses;
-    delete iWriteStatuses;
-    
-    _DBG_FILE("CGlobalWLANAdapter::~CGlobalWLANAdapter(): end");
-    }
-
-
-//-----------------------------------------------------------------------------
-// CGlobalWLANAdapter* CGlobalWLANAdapter::DDFVersionL( CBufBase& aDDFVersion )
-//-----------------------------------------------------------------------------
-void CGlobalWLANAdapter::DDFVersionL( CBufBase& aDDFVersion )
-    {
-    _DBG_FILE("CGlobalWLANAdapter::DDFVersionL(): begin");
-    
-    aDDFVersion.InsertL( 0, KNSmGlobalWlanAdapterDDFversion );
-    
-    _DBG_FILE("CGlobalWLANAdapter::DDFVersionL(): end");
-    }
-
-//-----------------------------------------------------------------------------
-// CGlobalWLANAdapter* CGlobalWLANAdapter::DDFStructureL( MSmlDmDDFObject& aDDF )
-//-----------------------------------------------------------------------------
-void CGlobalWLANAdapter::DDFStructureL( MSmlDmDDFObject& aDDF )
-    {
-    _DBG_FILE("CGlobalWLANAdapter::DDFStructureL(): begin");
-    if( !iWlanSupported )
-        {
-        _DBG_FILE("CGlobalWLANAdapter::DDFStructureL(): WLAN not supported.");
-        return;
-        }  
-//
-// Set Get, add and replace as acceptable operations
-//
-
-    TSmlDmAccessTypes accessTypesGetAddReplace;     
-    accessTypesGetAddReplace.SetAdd();
-    accessTypesGetAddReplace.SetGet();
-    accessTypesGetAddReplace.SetReplace();
-    
-    //WLAN
-    MSmlDmDDFObject& rootWLan = aDDF.AddChildObjectL( KNSmlWLan );
-    FillNodeInfoL( rootWLan,
-               	accessTypesGetAddReplace,
-               	MSmlDmDDFObject::EZeroOrOne,
-               	MSmlDmDDFObject::EDynamic,
-               	MSmlDmDDFObject::ENode,
-               	KNSmlEmpty );
-
-    //WLAN/InternetConnectivityTest
-    MSmlDmDDFObject& internetConnectivityTest = rootWLan.AddChildObjectL( KNSmlWLanInternetConnectivityTest );
-    FillNodeInfoL( internetConnectivityTest,
-    			accessTypesGetAddReplace,
-    			MSmlDmDDFObject::EZeroOrOne,
-    			MSmlDmDDFObject::EDynamic,
-    			MSmlDmDDFObject::EInt,
-    			KNSmlEmpty );
-    
-    //WLAN/UseDefaultSettings
-    MSmlDmDDFObject& useDefaultSettings = rootWLan.AddChildObjectL( KNSmlWLanUseDefaultSettings );
-    FillNodeInfoL( useDefaultSettings,
-    			accessTypesGetAddReplace,
-    			MSmlDmDDFObject::EZeroOrOne,
-    			MSmlDmDDFObject::EDynamic,
-    			MSmlDmDDFObject::EBool,
-    			KNSmlEmpty );
-
-     //WLAN/LongRetryLimit
-    MSmlDmDDFObject& longRetryLimit = rootWLan.AddChildObjectL( KNSmlWLanLongRetryLimit );
-    FillNodeInfoL( longRetryLimit,
-    			accessTypesGetAddReplace,
-    			MSmlDmDDFObject::EZeroOrOne,
-    			MSmlDmDDFObject::EDynamic,
-    			MSmlDmDDFObject::EInt,
-    			KNSmlEmpty );
-    			
-    //WLAN/ShortRetryLimit
-    MSmlDmDDFObject& shortRetryLimit = rootWLan.AddChildObjectL( KNSmlWLanShortRetryLimit );
-    FillNodeInfoL( shortRetryLimit,
-    			accessTypesGetAddReplace,
-    			MSmlDmDDFObject::EZeroOrOne,
-    			MSmlDmDDFObject::EDynamic,
-    			MSmlDmDDFObject::EInt,
-    			KNSmlEmpty );
-    			
-    			
-    //WLAN/RTSThreshold
-    MSmlDmDDFObject& RTSThreshold = rootWLan.AddChildObjectL( KNSmlWLanRTSThreshold );
-    FillNodeInfoL( RTSThreshold,
-    			accessTypesGetAddReplace,
-    			MSmlDmDDFObject::EZeroOrOne,
-    			MSmlDmDDFObject::EDynamic,
-    			MSmlDmDDFObject::EInt,
-    			KNSmlEmpty );
-    			
-    //WLAN/TXPowerLevel
-    MSmlDmDDFObject& TXPowerLevel = rootWLan.AddChildObjectL( KNSmlWLanTXPowerLevel );
-    FillNodeInfoL( TXPowerLevel,
-    			accessTypesGetAddReplace,
-    			MSmlDmDDFObject::EZeroOrOne,
-    			MSmlDmDDFObject::EDynamic,
-    			MSmlDmDDFObject::EInt,
-    			KNSmlEmpty );
-    			
-    //WLAN/PowerSaving
-    MSmlDmDDFObject& powerSaving = rootWLan.AddChildObjectL( KNSmlWLanPowerSaving );
-    FillNodeInfoL( powerSaving,
-    			accessTypesGetAddReplace,
-    			MSmlDmDDFObject::EZeroOrOne,
-    			MSmlDmDDFObject::EDynamic,
-    			MSmlDmDDFObject::EBool,
-    			KNSmlEmpty );
-    			
-    //WLAN/BackgroundScanInterval
-    MSmlDmDDFObject& backgroundScanInterval = rootWLan.AddChildObjectL( KNSmlWLanBackgroundScanInterval );
-    FillNodeInfoL( backgroundScanInterval,
-    			accessTypesGetAddReplace,
-    			MSmlDmDDFObject::EZeroOrOne,
-    			MSmlDmDDFObject::EDynamic,
-    			MSmlDmDDFObject::EInt,
-    			KNSmlEmpty );
-    			
-    //WLAN/ScanRate
-    MSmlDmDDFObject& scanRate = rootWLan.AddChildObjectL( KNSmlWLanScanRate );
-    FillNodeInfoL( scanRate,
-    			accessTypesGetAddReplace,
-    			MSmlDmDDFObject::EZeroOrOne,
-    			MSmlDmDDFObject::EDynamic,
-    			MSmlDmDDFObject::EInt,
-    			KNSmlEmpty );
-
-    //WLAN/RCPITrigger
-    MSmlDmDDFObject& RCPITrigger = rootWLan.AddChildObjectL( KNSmlWLanRCPITrigger );
-    FillNodeInfoL( RCPITrigger,
-    			accessTypesGetAddReplace,
-    			MSmlDmDDFObject::EZeroOrOne,
-    			MSmlDmDDFObject::EDynamic,
-    			MSmlDmDDFObject::EInt,
-    			KNSmlEmpty );
-
-    //WLAN/MinActiveChannelTime
-    MSmlDmDDFObject& minActiveChannelTime = rootWLan.AddChildObjectL( KNSmlWLanMinActiveChannelTime );
-    FillNodeInfoL( minActiveChannelTime,
-    			accessTypesGetAddReplace,
-    			MSmlDmDDFObject::EZeroOrOne,
-    			MSmlDmDDFObject::EDynamic,
-    			MSmlDmDDFObject::EInt,
-    			KNSmlEmpty );
-    			
-     //WLAN/MaxActiveChannelTime
-    MSmlDmDDFObject& maxActiveChannelTime = rootWLan.AddChildObjectL( KNSmlWLanMaxActiveChannelTime );
-    FillNodeInfoL( maxActiveChannelTime,
-    			accessTypesGetAddReplace,
-    			MSmlDmDDFObject::EZeroOrOne,
-    			MSmlDmDDFObject::EDynamic,
-    			MSmlDmDDFObject::EInt,
-    			KNSmlEmpty );
-    			
-     //WLAN/MaxTxMSDULifeTime
-    MSmlDmDDFObject& maxTxMSDULifeTime = rootWLan.AddChildObjectL( KNSmlWLanMaxTxMSDULifeTime );
-    FillNodeInfoL( maxTxMSDULifeTime,
-    			accessTypesGetAddReplace,
-    			MSmlDmDDFObject::EZeroOrOne,
-    			MSmlDmDDFObject::EDynamic,
-    			MSmlDmDDFObject::EInt,
-    			KNSmlEmpty );
-    			
-    //WLAN/ScanExpirationTimer
-    MSmlDmDDFObject& scanExpirationTimer = rootWLan.AddChildObjectL( KNSmlWLanScanExpirationTimer );
-    FillNodeInfoL( scanExpirationTimer,
-    			accessTypesGetAddReplace,
-    			MSmlDmDDFObject::EZeroOrOne,
-    			MSmlDmDDFObject::EDynamic,
-    			MSmlDmDDFObject::EInt,
-    			KNSmlEmpty );
-
-    //WLAN/UnloadDriverTimer
-    MSmlDmDDFObject& unloadDriverTimer = rootWLan.AddChildObjectL( KNSmlWLanUnloadDriverTimer );
-    FillNodeInfoL( unloadDriverTimer,
-    			accessTypesGetAddReplace,
-    			MSmlDmDDFObject::EZeroOrOne,
-    			MSmlDmDDFObject::EDynamic,
-    			MSmlDmDDFObject::EInt,
-    			KNSmlEmpty );
-    			
-    //WLAN/RoamTimer
-    MSmlDmDDFObject& roamTimer = rootWLan.AddChildObjectL( KNSmlWLanRoamTimer );
-    FillNodeInfoL( roamTimer,
-    			accessTypesGetAddReplace,
-    			MSmlDmDDFObject::EZeroOrOne,
-    			MSmlDmDDFObject::EDynamic,
-    			MSmlDmDDFObject::EInt,
-    			KNSmlEmpty );
-    			
-    //WLAN/KNSmlWLanRCPIDifference
-    MSmlDmDDFObject& RCPIDifference = rootWLan.AddChildObjectL( KNSmlWLanRCPIDifference );
-    FillNodeInfoL( RCPIDifference,
-    			accessTypesGetAddReplace,
-    			MSmlDmDDFObject::EZeroOrOne,
-    			MSmlDmDDFObject::EDynamic,
-    			MSmlDmDDFObject::EInt,
-    			KNSmlEmpty );
-
-    //WLAN/ConnRegainTimer
-    MSmlDmDDFObject& connRegainTimer = rootWLan.AddChildObjectL( KNSmlWLanConnRegainTimer );
-    FillNodeInfoL( connRegainTimer,
-    			accessTypesGetAddReplace,
-    			MSmlDmDDFObject::EZeroOrOne,
-    			MSmlDmDDFObject::EDynamic,
-    			MSmlDmDDFObject::EInt,
-    			KNSmlEmpty );
-
-    //WLAN/MaxTriesToFindNw
-    MSmlDmDDFObject& maxTriesToFindNw = rootWLan.AddChildObjectL( KNSmlWLanMaxTriesToFindNw );
-    FillNodeInfoL( maxTriesToFindNw,
-    			accessTypesGetAddReplace,
-    			MSmlDmDDFObject::EZeroOrOne,
-    			MSmlDmDDFObject::EDynamic,
-    			MSmlDmDDFObject::EInt,
-    			KNSmlEmpty );
-
-    //WLAN/DelayBetweenFindNw
-    MSmlDmDDFObject& delayBetweenFindNw = rootWLan.AddChildObjectL( KNSmlWLanDelayBetweenFindNw );
-    FillNodeInfoL( delayBetweenFindNw,
-    			accessTypesGetAddReplace,
-    			MSmlDmDDFObject::EZeroOrOne,
-    			MSmlDmDDFObject::EDynamic,
-    			MSmlDmDDFObject::EInt,
-    			KNSmlEmpty );
-
-    //WLAN/AllowRadioMeasurements
-    MSmlDmDDFObject& allowRadioMeasurements = rootWLan.AddChildObjectL( KNSmlWLanAllowRadioMeasurements );
-    FillNodeInfoL( allowRadioMeasurements,
-    			accessTypesGetAddReplace,
-    			MSmlDmDDFObject::EZeroOrOne,
-    			MSmlDmDDFObject::EDynamic,
-    			MSmlDmDDFObject::EBool,
-    			KNSmlEmpty );
-
-    //WLAN/MinPassiveChannelTime
-    MSmlDmDDFObject& minPassiveChannelTime = rootWLan.AddChildObjectL( KNSmlWLanMinPassiveChannelTime );
-    FillNodeInfoL( minPassiveChannelTime,
-    			accessTypesGetAddReplace,
-    			MSmlDmDDFObject::EZeroOrOne,
-    			MSmlDmDDFObject::EDynamic,
-    			MSmlDmDDFObject::EInt,
-    			KNSmlEmpty );
-    			
-    //WLAN/MaxPassiveChannelTime
-    MSmlDmDDFObject& maxPassiveChannelTime = rootWLan.AddChildObjectL( KNSmlWLanMaxPassiveChannelTime );
-    FillNodeInfoL( maxPassiveChannelTime,
-    			accessTypesGetAddReplace,
-    			MSmlDmDDFObject::EZeroOrOne,
-    			MSmlDmDDFObject::EDynamic,
-    			MSmlDmDDFObject::EInt,
-    			KNSmlEmpty );
-    			
-    //WLAN/MaxApFailureCount
-    MSmlDmDDFObject& maxApFailureCount = rootWLan.AddChildObjectL( KNSmlWLanMaxApFailureCount );
-    FillNodeInfoL( maxApFailureCount,
-    			accessTypesGetAddReplace,
-    			MSmlDmDDFObject::EZeroOrOne,
-    			MSmlDmDDFObject::EDynamic,
-    			MSmlDmDDFObject::EInt,
-    			KNSmlEmpty );
-
-    //WLAN/LongBeaconFindCount
-    MSmlDmDDFObject& longBeaconFindCount = rootWLan.AddChildObjectL( KNSmlWLanLongBeaconFindCount );
-    FillNodeInfoL( longBeaconFindCount,
-    			accessTypesGetAddReplace,
-    			MSmlDmDDFObject::EZeroOrOne,
-    			MSmlDmDDFObject::EDynamic,
-    			MSmlDmDDFObject::EInt,
-    			KNSmlEmpty );
-    			
-    //WLAN/QosNullFrameInterval
-    MSmlDmDDFObject& qosNullFrameInterval = rootWLan.AddChildObjectL( KNSmlWLanQosNullFrameInterval );
-    FillNodeInfoL( qosNullFrameInterval,
-    			accessTypesGetAddReplace,
-    			MSmlDmDDFObject::EZeroOrOne,
-    			MSmlDmDDFObject::EDynamic,
-    			MSmlDmDDFObject::EInt,
-    			KNSmlEmpty );
-
-    //WLAN/QosNullFrameTimeout
-    MSmlDmDDFObject& qosNullFrameTimeout = rootWLan.AddChildObjectL( KNSmlWLanQosNullFrameTimeout );
-    FillNodeInfoL( qosNullFrameTimeout,
-    			accessTypesGetAddReplace,
-    			MSmlDmDDFObject::EZeroOrOne,
-    			MSmlDmDDFObject::EDynamic,
-    			MSmlDmDDFObject::EInt,
-    			KNSmlEmpty );
-
-    //WLAN/MTU
-    MSmlDmDDFObject& MTU = rootWLan.AddChildObjectL( KNSmlWLanMTU );
-    FillNodeInfoL( MTU,
-    			accessTypesGetAddReplace,
-    			MSmlDmDDFObject::EZeroOrOne,
-    			MSmlDmDDFObject::EDynamic,
-    			MSmlDmDDFObject::EInt,
-    			KNSmlEmpty );
-
-
-    _DBG_FILE("CGlobalWLANAdapter::DDFStructureL(): end");
-    }
-    
-      
-
-//-----------------------------------------------------------------------------
-// CGlobalWLANAdapter* CGlobalWLANAdapter::AddLeafObjectL( const TDesC& aURI,const 
-// TDesC& aParentLUID, const TDesC8& aObject, const TDesC& aType, 
-// const TInt aStatusRef )
-//-----------------------------------------------------------------------------
-void CGlobalWLANAdapter::AddLeafObjectL( const TDesC8& aURI,
-                                       const TDesC8& aParentLUID, 
-                                       const TDesC8& aObject, 
-                                       const TDesC8& /*aType*/, 
-                                       const TInt aStatusRef )
-    {
-    DBG_ARGS8(_S8("CGlobalWLANAdapter::AddLeafObjectL - <%S> <%S>"), &aURI, &aParentLUID );
-
-    // Get the last uri segment and the number of uri items in the input
-    TInt uriSegs = NumOfUriSegs( aURI );
-    TInt err(KErrNone);
-    TPtrC8 lastUriSeg = GetLastUriSeg( aURI );
-    
-    //**************************************************************************
-    // Check which leaf is in question
-    //**************************************************************************
-    if( aURI.Match( _L8("WLAN/*" ) ) != KErrNotFound && uriSegs==2 )
-    	{  
-      	// *****************************************************************
-      	if( lastUriSeg.Match( KNSmlWLanInternetConnectivityTest ) != KErrNotFound )
-      		{
-      		// check whether input is of legal size
-      		if ( aObject.Size() <= KInputMaxLength )
-      			{
-      	    	//store the parameter
-      	    	DBG_ARGS8(_S8("CGlobalWLANAdapter::AddLeafObjectL, add leaf - <%S>"), &aURI );
-      	    	
-      	    	err = DesToInt( aObject );
-      	    	if ( err >= 0 )
-      	    		{
-      	    		iWriteSettings->internetConnectivityTest = err;
-      	    		iWriteSettings->internetConnectivityTestPresent = ETrue;
-      	    		iWriteStatuses->internetConnectivityTestStatus = aStatusRef;
-      	    		err = KErrNone;
-      	    		}
-      			}
-      		else
-      			{
-      			err = KErrTooBig;
-      			}
-      		}
-      	
-      	// *****************************************************************
-      	else if( lastUriSeg.Match( KNSmlWLanUseDefaultSettings ) != KErrNotFound )
-      		{
-      		// check whether input is of legal size
-      		if ( aObject.Size() <= KInputMaxLength )
-      			{
-      		    //store the parameter 
-      		    if( aObject.MatchF( _L8("True")) != KErrNotFound ||
-      		    	aObject.MatchF( _L8("true")) != KErrNotFound )
-                	{
-                	DBG_ARGS8(_S8("CGlobalWLANAdapter::AddLeafObjectL, add leaf - <%S>"), &aURI );
-                	iWriteSettings->useDefaultSettings = ETrue;
-                	iWriteSettings->useDefaultSettingsPresent = ETrue;
-                	iWriteStatuses->useDefaultSettingsStatus = aStatusRef;
-                	}
-            	else if ( aObject.MatchF( _L8("False")) != KErrNotFound ||
-            			  aObject.MatchF( _L8("false")) != KErrNotFound )
-                	{
-                	DBG_ARGS8(_S8("CGlobalWLANAdapter::AddLeafObjectL, add leaf - <%S>"), &aURI );
-                	iWriteSettings->useDefaultSettings = EFalse;
-                	iWriteSettings->useDefaultSettingsPresent = ETrue;
-                	iWriteStatuses->useDefaultSettingsStatus = aStatusRef;
-                	}
-              	else 
-              		{
-              		err = KErrArgument;
-              		}
-            	}
-      		else
-      			{
-      			err = KErrTooBig;
-      			}
-      		}	
-      	// *****************************************************************
-      	else if( lastUriSeg.Match( KNSmlWLanLongRetryLimit ) != KErrNotFound )
-      		{
-      		// check whether input is of legal size
-      		if ( aObject.Size() <= KInputMaxLength )
-      			{
-      	    	//store the parameter
-      	    	DBG_ARGS8(_S8("CGlobalWLANAdapter::AddLeafObjectL, add leaf - <%S>"), &aURI );
-      	    	err = DesToInt( aObject );
-      	    	if ( err >= 0 )
-      	    		{
-      	    		iWriteSettings->longRetryLimit = err;
-      	    		iWriteSettings->longRetryLimitPresent = ETrue;
-      	    		iWriteStatuses->longRetryLimitStatus = aStatusRef;
-      	    		err = KErrNone;
-      	    		}
-      			}
-      		else
-      			{
-      			err = KErrTooBig;
-      			}
-      		}
-      	// *****************************************************************
-      	else if( lastUriSeg.Match( KNSmlWLanShortRetryLimit ) != KErrNotFound )
-      		{
-      		// check whether input is of legal size
-      		if ( aObject.Size() <= KInputMaxLength )
-      			{
-				//store the parameter
-				DBG_ARGS8(_S8("CGlobalWLANAdapter::AddLeafObjectL, add leaf - <%S>"), &aURI );
-      	    	err = DesToInt( aObject );
-      	    	if ( err >= 0 )
-      	    		{
-      	    		iWriteSettings->shortRetryLimit = err;
-      	    		iWriteSettings->shortRetryLimitPresent = ETrue;
-      	    		iWriteStatuses->shortRetryLimitStatus = aStatusRef;
-      	    		err = KErrNone;
-      	    		}
-      			}
-      		else
-      			{
-      			err = KErrTooBig;
-      			}
-      		}	
-      	// *****************************************************************
-      	else if( lastUriSeg.Match( KNSmlWLanRTSThreshold ) != KErrNotFound )
-      		{
-      		// check whether input is of legal size
-      		if ( aObject.Size() <= KInputMaxLength )
-      			{
-      			DBG_ARGS8(_S8("CGlobalWLANAdapter::AddLeafObjectL, add leaf - <%S>"), &aURI );
-      	    	err = DesToInt( aObject );
-      	    	if ( err >= 0 )
-      	    		{
-      	    		iWriteSettings->RTSThreshold = err;
-      	    		iWriteSettings->RTSThresholdPresent = ETrue;
-      	    		iWriteStatuses->RTSThresholdStatus = aStatusRef;
-      	    		err = KErrNone;
-      	    		}
-      			}
-      		else
-      			{
-      			err = KErrTooBig;
-      			}
-      		}
-      	// *****************************************************************
-      	else if( lastUriSeg.Match( KNSmlWLanTXPowerLevel ) != KErrNotFound )
-      		{
-      		// check whether input is of legal size
-      		if ( aObject.Size() <= KInputMaxLength )
-      			{
-      			DBG_ARGS8(_S8("CGlobalWLANAdapter::AddLeafObjectL, add leaf - <%S>"), &aURI );
-      		  	//store the parameter
-      	    	err = DesToInt( aObject );
-      	    	if ( err >= 0)
-      	    		{
-      	    		iWriteSettings->TXPowerLevel = err;
-      	    		iWriteSettings->TXPowerLevelPresent = ETrue;
-      	    		iWriteStatuses->TXPowerLevelStatus = aStatusRef;
-      	    		err = KErrNone;
-      	    		}
-      			}
-      		else
-      			{
-      			err = KErrTooBig;
-      			}
-      		}
-       	// *****************************************************************
-      	else if( lastUriSeg.Match( KNSmlWLanPowerSaving ) != KErrNotFound )
-      		{
-      		// check whether input is of legal size
-      		if ( aObject.Size() <= KInputMaxLength )
-      			{
-      		  	//store the parameter 
-      		  	if( aObject.MatchF( _L8("True")) != KErrNotFound ||
-      		  		aObject.MatchF( _L8("true")) != KErrNotFound )
-              		{
-              		DBG_ARGS8(_S8("CGlobalWLANAdapter::AddLeafObjectL, add leaf - <%S>"), &aURI );
-              		iWriteSettings->powerSaving = ETrue;
-              		iWriteSettings->powerSavingPresent = ETrue;
-              		iWriteStatuses->powerSavingStatus = aStatusRef;
-              		}
-           		else if ( aObject.MatchF( _L8("False")) != KErrNotFound ||
-           				  aObject.MatchF( _L8("false")) != KErrNotFound )
-              		{
-              		DBG_ARGS8(_S8("CGlobalWLANAdapter::AddLeafObjectL, add leaf - <%S>"), &aURI );
-              		iWriteSettings->powerSaving = EFalse;
-              		iWriteSettings->powerSavingPresent = ETrue;
-              		iWriteStatuses->powerSavingStatus = aStatusRef;
-              		}
-            	else
-            		{
-            		err = KErrArgument;
-            		}
-      			}
-      		else
-      			{
-      			err = KErrTooBig;
-      			}
-      		}	
-      	// *****************************************************************
-      	else if( lastUriSeg.Match( KNSmlWLanBackgroundScanInterval ) != KErrNotFound )
-      		{
-      		// check whether input is of legal size
-      		if ( aObject.Size() <= KInputMaxLength )
-      			{
-				//store the parameter
-				DBG_ARGS8(_S8("CGlobalWLANAdapter::AddLeafObjectL, add leaf - <%S>"), &aURI );
-      	    	err = DesToInt( aObject );
-      	    	if ( err >= 0 )
-      	    		{
-      	    		iWriteSettings->backgroundScanInterval = err;
-      	    		iWriteSettings->backgroundScanIntervalPresent = ETrue;
-      	    		iWriteStatuses->backgroundScanIntervalStatus = aStatusRef;
-      	    		err = KErrNone;
-      	    		}
-      			}
-      		else
-      			{
-      			err = KErrTooBig;
-      			}
-      		}
-      	// *****************************************************************
-      	else if( lastUriSeg.Match( KNSmlWLanScanRate ) != KErrNotFound )
-      		{
-      		// check whether input is of legal size
-      		if ( aObject.Size() <= KInputMaxLength )
-      			{
-      			//store the parameter
-      			DBG_ARGS8(_S8("CGlobalWLANAdapter::AddLeafObjectL, add leaf - <%S>"), &aURI );
-      	    	err = DesToInt( aObject );
-      	    	if ( err >= 0 )
-      	    		{
-      	    		iWriteSettings->scanRate = err;
-      	    		iWriteSettings->scanRatePresent = ETrue;
-      	    		iWriteStatuses->scanRateStatus = aStatusRef;
-      	    		err = KErrNone;
-      	    		}
-      			}
-      		else
-      			{
-      			err = KErrTooBig;
-      			}
-      		}	
-      	// *****************************************************************
-      	else if( lastUriSeg.Match( KNSmlWLanRCPITrigger ) != KErrNotFound )
-      		{
-      		// check whether input is of legal size
-      		if ( aObject.Size() <= KInputMaxLength )
-      			{
-      		  	//store the parameter
-      		  	DBG_ARGS8(_S8("CGlobalWLANAdapter::AddLeafObjectL, add leaf - <%S>"), &aURI );
-      	    	err = DesToInt( aObject );
-      	    	if ( err >= 0)
-      	    		{
-      	    		iWriteSettings->RCPITrigger = err;
-      	    		iWriteSettings->RCPITriggerPresent = ETrue;
-      	    		iWriteStatuses->RCPITriggerStatus = aStatusRef;
-      	    		err = KErrNone;
-      	    		}
-      			}
-      		else
-      			{
-      			err = KErrTooBig;
-      			}
-      		}	
-      	// *****************************************************************
-      	else if( lastUriSeg.Match( KNSmlWLanMinActiveChannelTime ) != KErrNotFound )
-      		{
-      		// check whether input is of legal size
-      		if ( aObject.Size() <= KInputMaxLength )
-      			{
-      		  	//store the parameter
-      		  	DBG_ARGS8(_S8("CGlobalWLANAdapter::AddLeafObjectL, add leaf - <%S>"), &aURI );
-      	    	err = DesToInt( aObject );
-      	    	if ( err >= 0 )
-      	    		{
-      	    		iWriteSettings->minActiveChannelTime = err;
-      	    		iWriteSettings->minActiveChannelTimePresent = ETrue;
-      	    		iWriteStatuses->minActiveChannelTimeStatus = aStatusRef;
-      	    		err = KErrNone;
-      	    		}
-      			}
-      		else
-      			{
-      			err = KErrTooBig;
-      			}
-      		}
-      	// *****************************************************************
-      	else if( lastUriSeg.Match( KNSmlWLanMaxActiveChannelTime ) != KErrNotFound )
-      		{
-      		// check whether input is of legal size
-      		if ( aObject.Size() <= KInputMaxLength )
-      			{
-      		  	//store the parameter
-      		  	DBG_ARGS8(_S8("CGlobalWLANAdapter::AddLeafObjectL, add leaf - <%S>"), &aURI );
-      	    	err = DesToInt( aObject );
-      	    	if ( err >= 0)
-      	    		{
-      	    		iWriteSettings->maxActiveChannelTime = err;
-      	    		iWriteSettings->maxActiveChannelTimePresent = ETrue;
-      	    		iWriteStatuses->maxActiveChannelTimeStatus = aStatusRef;
-      	    		err = KErrNone;
-      	    		}
-      			}
-      		else
-      			{
-      			err = KErrTooBig;
-      			}
-      		}
-      	// *****************************************************************
-      	else if( lastUriSeg.Match( KNSmlWLanMaxTxMSDULifeTime ) != KErrNotFound )
-      		{
-      		// check whether input is of legal size
-      		if ( aObject.Size() <= KInputMaxLength )
-      			{
-      		  	//store the parameter
-      		  	DBG_ARGS8(_S8("CGlobalWLANAdapter::AddLeafObjectL, add leaf - <%S>"), &aURI );
-      	    	err = DesToInt( aObject );
-      	    	if ( err >= 0 )
-      	    		{
-      	    		iWriteSettings->maxTxMSDULifeTime = err;
-      	    		iWriteSettings->maxTxMSDULifeTimePresent = ETrue;
-      	    		iWriteStatuses->maxTxMSDULifeTimeStatus = aStatusRef;
-      	    		err = KErrNone;
-      	    		}
-      			}
-      		else
-      			{
-      			err = KErrTooBig;
-      			}
-      		}
-      	// *****************************************************************
-      	else if( lastUriSeg.Match( KNSmlWLanScanExpirationTimer ) != KErrNotFound )
-      		{
-      		// check whether input is of legal size
-      		if ( aObject.Size() <= KInputMaxLength )
-      			{
-      		  	//store the parameter
-      			DBG_ARGS8(_S8("CGlobalWLANAdapter::AddLeafObjectL, add leaf - <%S>"), &aURI );
-      	    	err = DesToInt( aObject );
-      	    	if ( err >= 0 )
-      	    		{
-      	    		iWriteSettings->scanExpirationTimer = err;
-      	    		iWriteSettings->scanExpirationTimerPresent = ETrue;
-      	    		iWriteStatuses->scanExpirationTimerStatus = aStatusRef;
-      	    		err = KErrNone;
-      	    		}
-      			}
-      		else
-      			{
-      			err = KErrTooBig;
-      			}
-      		}
-      	// *****************************************************************
-      	else if( lastUriSeg.Match( KNSmlWLanUnloadDriverTimer ) != KErrNotFound )
-      		{
-      		// check whether input is of legal size
-      		if ( aObject.Size() <= KInputMaxLength )
-      			{
-      		  	//store the parameter
-      		  	DBG_ARGS8(_S8("CGlobalWLANAdapter::AddLeafObjectL, add leaf - <%S>"), &aURI );
-      	    	err = DesToInt( aObject );
-      	    	if ( err >= 0 )
-      	    		{
-      	    		iWriteSettings->unloadDriverTimer = err;
-      	    		iWriteSettings->unloadDriverTimerPresent = ETrue;
-      	    		iWriteStatuses->unloadDriverTimerStatus = aStatusRef;
-      	    		err = KErrNone;
-      	    		}
-      			}
-      		else
-      			{
-      			err = KErrTooBig;
-      			}
-      		}
-      	// *****************************************************************
-      	else if( lastUriSeg.Match( KNSmlWLanRoamTimer ) != KErrNotFound )
-      		{
-      		// check whether input is of legal size
-      		if ( aObject.Size() <= KInputMaxLength )
-      			{
-      		  	//store the parameter
-      		  	DBG_ARGS8(_S8("CGlobalWLANAdapter::AddLeafObjectL, add leaf - <%S>"), &aURI );
-      	    	err = DesToInt( aObject );
-      	    	if ( err >= 0 )
-      	    		{
-      	    		iWriteSettings->roamTimer = err;
-      	    		iWriteSettings->roamTimerPresent = ETrue;
-      	    		iWriteStatuses->roamTimerStatus = aStatusRef;
-      	    		err = KErrNone;
-      	    		}
-      			}
-      		else
-      			{
-      			err = KErrTooBig;
-      			}
-      		}
-       	// *****************************************************************
-      	else if( lastUriSeg.Match( KNSmlWLanRCPIDifference ) != KErrNotFound )
-      		{
-      		// check whether input is of legal size
-      		if ( aObject.Size() <= KInputMaxLength )
-      			{
-      		  	//store the parameter
-      		  	DBG_ARGS8(_S8("CGlobalWLANAdapter::AddLeafObjectL, add leaf - <%S>"), &aURI );
-      	    	err = DesToInt( aObject );
-      	    	if ( err >= 0 )
-      	    		{
-      	    		iWriteSettings->RCPIDifference = err;
-      	    		iWriteSettings->RCPIDifferencePresent = ETrue;
-      	    		iWriteStatuses->RCPIDifferenceStatus = aStatusRef;
-      	    		err = KErrNone;
-      	    		}
-      			}
-      		else
-      			{
-      			err = KErrTooBig;
-      			}
-      		}
-      	// *****************************************************************
-      	else if( lastUriSeg.Match( KNSmlWLanConnRegainTimer ) != KErrNotFound )
-      		{
-      		// check whether input is of legal size
-      		if ( aObject.Size() <= KInputMaxLength )
-      			{
-      		  	//store the parameter
-      		  	DBG_ARGS8(_S8("CGlobalWLANAdapter::AddLeafObjectL, add leaf - <%S>"), &aURI );
-      	    	err = DesToInt( aObject );
-      	    	if ( err >= 0 )
-      	    		{
-      	    		iWriteSettings->connRegainTimer = err;
-      	    		iWriteSettings->connRegainTimerPresent = ETrue;
-      	    		iWriteStatuses->connRegainTimerStatus = aStatusRef;
-      	    		err = KErrNone;
-      	    		}
-      			}
-      		else
-      			{
-      			err = KErrTooBig;
-      			}
-      		}
-      	// *****************************************************************
-      	else if( lastUriSeg.Match( KNSmlWLanMaxTriesToFindNw ) != KErrNotFound )
-      		{
-      		// check whether input is of legal size
-      		if ( aObject.Size() <= KInputMaxLength )
-      			{
-      		  	//store the parameter
-      		  	DBG_ARGS8(_S8("CGlobalWLANAdapter::AddLeafObjectL, add leaf - <%S>"), &aURI );
-      	    	err = DesToInt( aObject );
-      	    	if ( err >= 0)
-      	    		{
-      	    		iWriteSettings->maxTriesToFindNw = err;
-      	    		iWriteSettings->maxTriesToFindNwPresent = ETrue;
-      	    		iWriteStatuses->maxTriesToFindNwStatus = aStatusRef;
-      	    		err = KErrNone;
-      	    		}
-      			}
-      		else
-      			{
-      			err = KErrTooBig;
-      			}
-      		}
-      	// *****************************************************************
-      	else if( lastUriSeg.Match( KNSmlWLanDelayBetweenFindNw ) != KErrNotFound )
-      		{
-      		// check whether input is of legal size
-      		if ( aObject.Size() <= KInputMaxLength )
-      			{
-      		  	//store the parameter
-      		  	DBG_ARGS8(_S8("CGlobalWLANAdapter::AddLeafObjectL, add leaf - <%S>"), &aURI );
-      	    	err = DesToInt( aObject );
-      	    	if ( err >= 0 )
-      	    		{
-      	    		iWriteSettings->delayBetweenFindNw = err;
-      	    		iWriteSettings->delayBetweenFindNwPresent = ETrue;
-      	    		iWriteStatuses->delayBetweenFindNwStatus = aStatusRef;
-      	    		err = KErrNone;
-      	    		}
-      			}
-      		else
-      			{
-      			err = KErrTooBig;
-      			}
-      		}
-      	// *****************************************************************
-      	else if( lastUriSeg.Match( KNSmlWLanAllowRadioMeasurements ) != KErrNotFound )
-      		{
-      		// check whether input is of legal size
-      		if ( aObject.Size() <= KInputMaxLength )
-      			{
-      		  	if( aObject.MatchF( _L8("True")) != KErrNotFound ||
-      		  		aObject.MatchF( _L8("true")) != KErrNotFound )
-              		{
-              		DBG_ARGS8(_S8("CGlobalWLANAdapter::AddLeafObjectL, add leaf - <%S>"), &aURI );
-              		iWriteSettings->allowRadioMeasurements = ETrue;
-              		iWriteSettings->allowRadioMeasurementsPresent = ETrue;
-              		iWriteStatuses->allowRadioMeasurementsStatus = aStatusRef;
-              		}
-           		else if ( aObject.MatchF( _L8("False")) != KErrNotFound ||
-           			      aObject.MatchF( _L8("false")) != KErrNotFound )
-              		{
-              		DBG_ARGS8(_S8("CGlobalWLANAdapter::AddLeafObjectL, add leaf - <%S>"), &aURI );
-              		iWriteSettings->allowRadioMeasurements = EFalse;
-              		iWriteSettings->allowRadioMeasurementsPresent = ETrue;
-              		iWriteStatuses->allowRadioMeasurementsStatus = aStatusRef;
-              		}
-           		else
-           			{
-           			err = KErrArgument;
-      				}
-      			}
-      		else
-      			{
-      			err = KErrTooBig;
-      			}
-      		}
-      	// *****************************************************************
-      	else if( lastUriSeg.Match( KNSmlWLanMinPassiveChannelTime ) != KErrNotFound )
-      		{
-      		// check whether input is of legal size
-      		if ( aObject.Size() <= KInputMaxLength )
-      			{
-      		  	//store the parameter
-      		  	DBG_ARGS8(_S8("CGlobalWLANAdapter::AddLeafObjectL, add leaf - <%S>"), &aURI );
-      	    	err = DesToInt( aObject );
-      	    	if ( err >= 0 )
-      	    		{
-      	    		iWriteSettings->minPassiveChannelTime = err;
-      	    		iWriteSettings->minPassiveChannelTimePresent = ETrue;
-      	    		iWriteStatuses->minPassiveChannelTimeStatus = aStatusRef;
-      	    		err = KErrNone;
-      	    		}
-      			}
-      		else
-      			{
-      			err = KErrTooBig;
-      			}
-      		}
-      	// *****************************************************************
-      	else if( lastUriSeg.Match( KNSmlWLanMaxPassiveChannelTime ) != KErrNotFound )
-      		{
-      		// check whether input is of legal size
-      		if ( aObject.Size() <= KInputMaxLength )
-      			{
-      		  	//store the parameter
-      		  	DBG_ARGS8(_S8("CGlobalWLANAdapter::AddLeafObjectL, add leaf - <%S>"), &aURI );
-      	    	err = DesToInt( aObject );
-      	    	if ( err >= 0 )
-      	    		{
-      	    		iWriteSettings->maxPassiveChannelTime = err;
-      	    		iWriteSettings->maxPassiveChannelTimePresent = ETrue;
-      	    		iWriteStatuses->maxPassiveChannelTimeStatus = aStatusRef;
-      	    		err = KErrNone;
-      	    		}
-      			}
-      		else
-      			{
-      			err = KErrTooBig;
-      			}
-      		}
-      	// *****************************************************************
-      	else if( lastUriSeg.Match( KNSmlWLanMaxApFailureCount ) != KErrNotFound )
-      		{
-      		// check whether input is of legal size
-      		if ( aObject.Size() <= KInputMaxLength )
-      			{
-      		  	//store the parameter
-      		  	DBG_ARGS8(_S8("CGlobalWLANAdapter::AddLeafObjectL, add leaf - <%S>"), &aURI );
-      	    	err = DesToInt( aObject );
-      	    	if ( err >= 0 )
-      	    		{
-      	    		iWriteSettings->maxApFailureCount = err;
-      	    		iWriteSettings->maxApFailureCountPresent = ETrue;
-      	    		iWriteStatuses->maxApFailureCountStatus = aStatusRef;
-      	    		err = KErrNone;
-      	    		}
-      			}
-      		else
-      			{
-      			err = KErrTooBig;
-      			}
-      		}
-      	// *****************************************************************
-      	else if( lastUriSeg.Match( KNSmlWLanLongBeaconFindCount ) != KErrNotFound )
-      		{
-      		// check whether input is of legal size
-      		if ( aObject.Size() <= KInputMaxLength )
-      			{
-      		  	//store the parameter
-      		  	DBG_ARGS8(_S8("CGlobalWLANAdapter::AddLeafObjectL, add leaf - <%S>"), &aURI );
-      	    	err = DesToInt( aObject );
-      	    	if ( err >= 0 )
-      	    		{
-      	    		iWriteSettings->longBeaconFindCount = err;
-      	    		iWriteSettings->longBeaconFindCountPresent = ETrue;
-      	    		iWriteStatuses->longBeaconFindCountStatus = aStatusRef;
-      	    		err = KErrNone;
-      	    		}
-      			}
-      		else
-      			{
-      			err = KErrTooBig;
-      			}
-      		}
-      	// *****************************************************************
-      	else if( lastUriSeg.Match( KNSmlWLanQosNullFrameInterval ) != KErrNotFound )
-      		{
-      		// check whether input is of legal size
-      		if ( aObject.Size() <= KInputMaxLength )
-      			{
-      		  	//store the parameter
-      		  	DBG_ARGS8(_S8("CGlobalWLANAdapter::AddLeafObjectL, add leaf - <%S>"), &aURI );
-      	    	err = DesToInt( aObject );
-      	    	if ( err >= 0 )
-      	    		{
-      	    		iWriteSettings->qosNullFrameInterval = err;
-      	    		iWriteSettings->qosNullFrameIntervalPresent = ETrue;
-      	    		iWriteStatuses->qosNullFrameIntervalStatus = aStatusRef;
-      	    		err = KErrNone;
-      	    		}
-      			}
-      		else
-      			{
-      			err = KErrTooBig;
-      			}
-      		}
-      	// *****************************************************************
-      	else if( lastUriSeg.Match( KNSmlWLanQosNullFrameTimeout ) != KErrNotFound )
-      		{
-      		// check whether input is of legal size
-      		if ( aObject.Size() <= KInputMaxLength )
-      			{
-      		  	//store the parameter
-      		  	DBG_ARGS8(_S8("CGlobalWLANAdapter::AddLeafObjectL, add leaf - <%S>"), &aURI );
-      	    	err = DesToInt( aObject );
-      	    	if ( err >= 0 )
-      	    		{
-      	    		iWriteSettings->qosNullFrameTimeout = err;
-      	    		iWriteSettings->qosNullFrameTimeoutPresent = ETrue;
-      	    		iWriteStatuses->qosNullFrameTimeoutStatus = aStatusRef;
-      	    		err = KErrNone;
-      	    		}
-      			}
-      		else
-      			{
-      			err = KErrTooBig;
-      			}
-      		}
-      	// *****************************************************************
-      	else if( lastUriSeg.Match( KNSmlWLanMTU ) != KErrNotFound )
-      		{
-      		// check whether input is of legal size
-      		if ( aObject.Size() <= KInputMaxLength )
-      			{
-      		  	//store the parameter
-      		  	DBG_ARGS8(_S8("CGlobalWLANAdapter::AddLeafObjectL, add leaf - <%S>"), &aURI );
-      	    	err = DesToInt( aObject );
-      	    	if ( err >= 0 )
-      	    		{
-      	    		iWriteSettings->MTU = err;
-      	    		iWriteSettings->MTUPresent = ETrue;
-      	    		iWriteStatuses->MTUStatus = aStatusRef;
-      	    		err = KErrNone;
-      	    		}
-      			}
-      		else
-      			{
-      			err = KErrTooBig;
-      			}
-      		}
-      	// *****************************************************************
-     	// The given leaf was not found
-	  	else
-  			{
-			err = KErrNotFound;
-  			}
-    	}
-	else
-    	{
-        // Something went wrong
-    	_DBG_FILE("CGlobalWLANAdapter::AddLeafObjectL(): Leaf addition failed");
-        err = KErrGeneral;
-    	}   	
-
-    // Update the possible failure to the status, success is updated when the 
-    // actual writing to db is done
-    switch ( err )
-    	{
-    	case KErrTooBig:
-    		iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ETooLargeObject );
-    		break;	
-    		
-    	case KErrNotFound:
-    		iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EInvalidObject );
-    		break;
-    		
-    	case KErrGeneral:
-    		iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-    		break;
-    		
-    	case KErrArgument:
-			iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EInvalidObject );
-			break;
-			
-    	case KErrOverflow:
-    		iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EInvalidObject );
-    		break;
-    	}
-
-    _DBG_FILE("CGlobalWLANAdapter::AddLeafObjectL(): end");
-    }
-
-//-----------------------------------------------------------------------------
-// CGlobalWLANAdapter* CGlobalWLANAdapter::UpdateLeafObjectL( const TDesC& aURI, 
-//    const TDesC& aLUID, const TDesC8& aObject, const TDesC& aType, 
-//    const TInt aStatusRef )
-//-----------------------------------------------------------------------------
-void CGlobalWLANAdapter::UpdateLeafObjectL( const TDesC8& aURI, 
-                                          const TDesC8& aLUID, 
-                                          const TDesC8& aObject, 
-                                          const TDesC8& aType, 
-                                          const TInt aStatusRef )
-    {
-    _DBG_FILE("CGlobalWLANAdapter::UpdateLeafObjectL(): begin");
-    DBG_ARGS8(_S8("CGlobalWLANAdapter::UpdateLeafObjectL - <%S> <%S>"), &aURI, &aLUID );
-    
-    AddLeafObjectL( aURI, aLUID, aObject, aType, aStatusRef );
-
-    _DBG_FILE("CGlobalWLANAdapter::UpdateLeafObjectL(): end");
-    }
-
-//------------------------------------------------------------------------------
-// CGlobalWLANAdapter::UpdateLeafObjectL( const TDesC8& aURI, 
-// const TDesC8& aLUID, const TDesC8& aObject, const TDesC8& aType )
-// Not supported
-//------------------------------------------------------------------------------
-
-void CGlobalWLANAdapter::UpdateLeafObjectL( const TDesC8& /*aURI*/, 
-                                          const TDesC8& /*aLUID*/,
-                                          RWriteStream*& /*aStream*/, 
-                                          const TDesC8& /*aType*/,
-                                          TInt aStatusRef )
-    {
-    _DBG_FILE("CGlobalWLANAdapter::UpdateLeafObjectL(): streaming: begin");
-    
-    iCallBack->SetStatusL(aStatusRef, CSmlDmAdapter::EError);
-    
-    _DBG_FILE("CGlobalWLANAdapter::UpdateLeafObjectL() streaming: end");
-    }
-
-//-----------------------------------------------------------------------------
-// CGlobalWLANAdapter* CGlobalWLANAdapter::DeleteObjectL( const TDesC8& aURI, 
-// const TDesC8& aLUID, const TInt aStatusRef )
-// Not supported
-//-----------------------------------------------------------------------------
-void CGlobalWLANAdapter::DeleteObjectL( const TDesC8& /*aURI*/, 
-                                      const TDesC8& /*aLUID*/, 
-                                      const TInt aStatusRef )
-    {
-    _DBG_FILE("CGlobalWLANAdapter::DeleteObjectL(): begin");
-    
-    iCallBack->SetStatusL(aStatusRef, CSmlDmAdapter::EError); 
-       
-    _DBG_FILE("CGlobalWLANAdapter::DeleteObjectL(): end");
-    }
-
-//-----------------------------------------------------------------------------
-// CGlobalWLANAdapter* CGlobalWLANAdapter::FetchLeafObjectSizeL( const TDesC8& aURI, 
-//                     const TDesC8& aLUID, const TDesC8& aType, 
-//                     const TInt aResultsRef, const TInt aStatusRef )
-// not supported
-//-----------------------------------------------------------------------------
-
-void CGlobalWLANAdapter::FetchLeafObjectSizeL( const TDesC8& /*aURI*/, 
-                                                 const TDesC8& /*aLUID*/,
-                                                 const TDesC8& /*aType*/, 
-                                                 TInt /*aResultsRef*/,
-                                                 TInt /*aStatusRef*/ )
-    {
-    _DBG_FILE("CGlobalWLANAdapter::FetchLeafObjectSizeL(): begin");
-    _DBG_FILE("CGlobalWLANAdapter::FetchLeafObjectSizeL(): end");
-    return;
-    }                                                
-
-
-//-----------------------------------------------------------------------------
-// CGlobalWLANAdapter* CGlobalWLANAdapter::FetchLeafObjectL( const TDesC8& aURI, 
-//                     const TDesC8& aLUID, const TDesC8& aType, 
-//                     const TInt aResultsRef, const TInt aStatusRef )
-// 
-//-----------------------------------------------------------------------------
-void CGlobalWLANAdapter::FetchLeafObjectL( const TDesC8& aURI, 
-                                        const TDesC8& aLUID, 
-                                        const TDesC8& /*aType*/, 
-                                        const TInt aResultsRef, 
-                                        const TInt aStatusRef )
-    {
-    _DBG_FILE("CGlobalWLANAdapter::FetchLeafObjectL(): begin");
-    DBG_ARGS8(_S8("Fetch aURI - %S - %S"), &aURI, &aLUID);
-    
-    // Store the required parameters into the struct. Actual reading will be done in
-    // when CompleteOutstandingCommands is called
-    
-    // Get the last uri segment
-    TPtrC8 lastUriSeg = GetLastUriSeg( aURI );
-    DBG_ARGS8(_S8("Fetch leaf, lasturiseg - %S"), &lastUriSeg);
-    
-    //**************************************************************************
-    // Check which leaf is in question
-    //**************************************************************************
-    if( aURI.Match( _L8("WLAN/*" ) ) != KErrNotFound )
-    	{
-        _DBG_FILE("CGlobalWLANAdapter::FetchLeafObjectL(): WLAN/* found in uri");
-      	// *****************************************************************
-      	if( lastUriSeg.Match( KNSmlWLanInternetConnectivityTest ) != KErrNotFound )
-      		{	
-      		_DBG_FILE("CGlobalWLANAdapter::FetchLeafObjectL(): leaf"); 
-      	   	iReadSettings->internetConnectivityTestPresent = ETrue;
-      	   	iReadStatuses->internetConnectivityTestResult = aResultsRef;
-      	   	iReadStatuses->internetConnectivityTestStatus = aStatusRef;
-      		}
-      	
-      	// *****************************************************************
-      	else if( lastUriSeg.Match( KNSmlWLanUseDefaultSettings ) != KErrNotFound )
-      		{	
-      		_DBG_FILE("CGlobalWLANAdapter::FetchLeafObjectL(): leaf"); 
-            iReadSettings->useDefaultSettingsPresent = ETrue;  
-            iReadStatuses->useDefaultSettingsResult = aResultsRef;
-            iReadStatuses->useDefaultSettingsStatus = aStatusRef;
-            }
-	
-      	// *****************************************************************
-      	else if( lastUriSeg.Match( KNSmlWLanLongRetryLimit ) != KErrNotFound )
-      		{
-      		_DBG_FILE("CGlobalWLANAdapter::FetchLeafObjectL(): leaf"); 
-      	    iReadSettings->longRetryLimitPresent = ETrue;
-      	    iReadStatuses->longRetryLimitResult = aResultsRef;
-      	    iReadStatuses->longRetryLimitStatus = aStatusRef;
-      		}
-
-      	// *****************************************************************
-      	else if( lastUriSeg.Match( KNSmlWLanShortRetryLimit ) != KErrNotFound )
-      		{	
-      		_DBG_FILE("CGlobalWLANAdapter::FetchLeafObjectL(): leaf"); 
-      	    iReadSettings->shortRetryLimitPresent = ETrue;
-      	    iReadStatuses->shortRetryLimitResult = aResultsRef;
-      	    iReadStatuses->shortRetryLimitStatus = aStatusRef;
-      		}
-	
-      	// *****************************************************************
-      	else if( lastUriSeg.Match( KNSmlWLanRTSThreshold ) != KErrNotFound )
-      		{
-      		_DBG_FILE("CGlobalWLANAdapter::FetchLeafObjectL(): leaf"); 
-      	    iReadSettings->RTSThresholdPresent = ETrue;
-      	    iReadStatuses->RTSThresholdResult = aResultsRef;
-      	    iReadStatuses->RTSThresholdStatus = aStatusRef;
-      		}
-      		
-      	// *****************************************************************
-      	else if( lastUriSeg.Match( KNSmlWLanTXPowerLevel ) != KErrNotFound )
-      		{
-      		_DBG_FILE("CGlobalWLANAdapter::FetchLeafObjectL(): leaf"); 
-      	   	iReadSettings->TXPowerLevelPresent = ETrue;
-      	   	iReadStatuses->TXPowerLevelResult = aResultsRef;
-      	   	iReadStatuses->TXPowerLevelStatus = aStatusRef;
-      		}
-      		
-       	// *****************************************************************
-      	else if( lastUriSeg.Match( KNSmlWLanPowerSaving ) != KErrNotFound )
-      		{
-      		_DBG_FILE("CGlobalWLANAdapter::FetchLeafObjectL(): leaf"); 
-            iReadSettings->powerSavingPresent = ETrue;
-            iReadStatuses->powerSavingResult = aResultsRef;
-            iReadStatuses->powerSavingStatus = aStatusRef;
-      		}
-      			
-      	// *****************************************************************
-      	else if( lastUriSeg.Match( KNSmlWLanBackgroundScanInterval ) != KErrNotFound )
-      		{
-      		_DBG_FILE("CGlobalWLANAdapter::FetchLeafObjectL(): leaf"); 
-      	   	iReadSettings->backgroundScanIntervalPresent = ETrue;
-      	   	iReadStatuses->backgroundScanIntervalResult = aResultsRef;
-      	   	iReadStatuses->backgroundScanIntervalStatus = aStatusRef;
-      		}
-      		
-      	// *****************************************************************
-      	else if( lastUriSeg.Match( KNSmlWLanScanRate ) != KErrNotFound )
-      		{
-      		_DBG_FILE("CGlobalWLANAdapter::FetchLeafObjectL(): leaf"); 
-      	   	iReadSettings->scanRatePresent = ETrue;
-      	   	iReadStatuses->scanRateResult = aResultsRef;
-      	   	iReadStatuses->scanRateStatus = aStatusRef;
-      		}
-      			
-      	// *****************************************************************
-      	else if( lastUriSeg.Match( KNSmlWLanRCPITrigger ) != KErrNotFound )
-      		{
-      		_DBG_FILE("CGlobalWLANAdapter::FetchLeafObjectL(): leaf"); 
-      	   	iReadSettings->RCPITriggerPresent = ETrue;
-      	   	iReadStatuses->RCPITriggerResult = aResultsRef;
-      	   	iReadStatuses->RCPITriggerStatus = aStatusRef;
-      		}
-      			
-      	// *****************************************************************
-      	else if( lastUriSeg.Match( KNSmlWLanMinActiveChannelTime ) != KErrNotFound )
-      		{
-      		_DBG_FILE("CGlobalWLANAdapter::FetchLeafObjectL(): leaf"); 
-      	   	iReadSettings->minActiveChannelTimePresent = ETrue;
-      	   	iReadStatuses->minActiveChannelTimeResult = aResultsRef;
-      	   	iReadStatuses->minActiveChannelTimeStatus = aStatusRef;
-      		}
-      		
-      	// *****************************************************************
-      	else if( lastUriSeg.Match( KNSmlWLanMaxActiveChannelTime ) != KErrNotFound )
-      		{
-      		_DBG_FILE("CGlobalWLANAdapter::FetchLeafObjectL(): leaf"); 
-      	   	iReadSettings->maxActiveChannelTimePresent = ETrue;
-      	   	iReadStatuses->maxActiveChannelTimeResult = aResultsRef;
-      	   	iReadStatuses->maxActiveChannelTimeStatus = aStatusRef;
-      		}
-      		
-      	// *****************************************************************
-      	else if( lastUriSeg.Match( KNSmlWLanMaxTxMSDULifeTime ) != KErrNotFound )
-      		{
-      		_DBG_FILE("CGlobalWLANAdapter::FetchLeafObjectL(): leaf"); 
-      	   	iReadSettings->maxTxMSDULifeTimePresent = ETrue;
-      	   	iReadStatuses->maxTxMSDULifeTimeResult = aResultsRef;
-      	   	iReadStatuses->maxTxMSDULifeTimeStatus = aStatusRef;
-      		}
-      		
-      	// *****************************************************************
-      	else if( lastUriSeg.Match( KNSmlWLanScanExpirationTimer ) != KErrNotFound )
-      		{
-      		_DBG_FILE("CGlobalWLANAdapter::FetchLeafObjectL(): leaf"); 
-      	   	iReadSettings->scanExpirationTimerPresent = ETrue;
-      	   	iReadStatuses->scanExpirationTimerResult = aResultsRef;
-      	   	iReadStatuses->scanExpirationTimerStatus = aStatusRef;
-      		}
-      		
-      	// *****************************************************************
-      	else if( lastUriSeg.Match( KNSmlWLanUnloadDriverTimer ) != KErrNotFound )
-      		{
-      		_DBG_FILE("CGlobalWLANAdapter::FetchLeafObjectL(): leaf"); 
-      	   	iReadSettings->unloadDriverTimerPresent = ETrue;
-      	   	iReadStatuses->unloadDriverTimerResult = aResultsRef;
-      	   	iReadStatuses->unloadDriverTimerStatus = aStatusRef;
-      		}
-      		
-      	// *****************************************************************
-      	else if( lastUriSeg.Match( KNSmlWLanRoamTimer ) != KErrNotFound )
-      		{
-      		_DBG_FILE("CGlobalWLANAdapter::FetchLeafObjectL(): leaf"); 
-      	   	iReadSettings->roamTimerPresent = ETrue;
-      	   	iReadStatuses->roamTimerResult = aResultsRef;
-      	   	iReadStatuses->roamTimerStatus = aStatusRef;
-      		}
-      		
-       	// *****************************************************************
-      	else if( lastUriSeg.Match( KNSmlWLanRCPIDifference ) != KErrNotFound )
-      		{
-      		_DBG_FILE("CGlobalWLANAdapter::FetchLeafObjectL(): leaf"); 
-      	   	iReadSettings->RCPIDifferencePresent = ETrue;
-      	   	iReadStatuses->RCPIDifferenceResult = aResultsRef;
-      	   	iReadStatuses->RCPIDifferenceStatus = aStatusRef;
-      		}
-      		
-      	// *****************************************************************
-      	else if( lastUriSeg.Match( KNSmlWLanConnRegainTimer ) != KErrNotFound )
-      		{
-      		_DBG_FILE("CGlobalWLANAdapter::FetchLeafObjectL(): leaf"); 
-      	   	iReadSettings->connRegainTimerPresent = ETrue;
-      	   	iReadStatuses->connRegainTimerResult = aResultsRef;
-      	   	iReadStatuses->connRegainTimerStatus = aStatusRef;
-      		}
-      		
-      	// *****************************************************************
-      	else if( lastUriSeg.Match( KNSmlWLanMaxTriesToFindNw ) != KErrNotFound )
-      		{
-      		_DBG_FILE("CGlobalWLANAdapter::FetchLeafObjectL(): leaf"); 
-      	   	iReadSettings->maxTriesToFindNwPresent = ETrue;
-      	   	iReadStatuses->maxTriesToFindNwResult = aResultsRef;
-      	   	iReadStatuses->maxTriesToFindNwStatus = aStatusRef;
-      		}
-      		
-      	// *****************************************************************
-      	else if( lastUriSeg.Match( KNSmlWLanDelayBetweenFindNw ) != KErrNotFound )
-      		{
-      		_DBG_FILE("CGlobalWLANAdapter::FetchLeafObjectL(): leaf"); 
-      	   	iReadSettings->delayBetweenFindNwPresent = ETrue;
-      	   	iReadStatuses->delayBetweenFindNwResult = aResultsRef;
-      	   	iReadStatuses->delayBetweenFindNwStatus = aStatusRef;
-      		}
-      		
-      	// *****************************************************************
-      	else if( lastUriSeg.Match( KNSmlWLanAllowRadioMeasurements ) != KErrNotFound )
-      		{
-      		_DBG_FILE("CGlobalWLANAdapter::FetchLeafObjectL(): leaf"); 
-            iReadSettings->allowRadioMeasurementsPresent = ETrue;
-           	iReadStatuses->allowRadioMeasurementsResult = aResultsRef;
-      	   	iReadStatuses->allowRadioMeasurementsStatus = aStatusRef;
-            }
-              
-      	// *****************************************************************
-      	else if( lastUriSeg.Match( KNSmlWLanMinPassiveChannelTime ) != KErrNotFound )
-      		{
-      		_DBG_FILE("CGlobalWLANAdapter::FetchLeafObjectL(): leaf"); 
-      	   	iReadSettings->minPassiveChannelTimePresent = ETrue;
-      	   	iReadStatuses->minPassiveChannelTimeResult = aResultsRef;
-      	   	iReadStatuses->minPassiveChannelTimeStatus = aStatusRef;
-      		}
-      		
-      	// *****************************************************************
-      	else if( lastUriSeg.Match( KNSmlWLanMaxPassiveChannelTime ) != KErrNotFound )
-      		{
-      		_DBG_FILE("CGlobalWLANAdapter::FetchLeafObjectL(): leaf"); 
-      	   	iReadSettings->maxPassiveChannelTimePresent = ETrue;
-      	   	iReadStatuses->maxPassiveChannelTimeResult = aResultsRef;
-      	   	iReadStatuses->maxPassiveChannelTimeStatus = aStatusRef;
-      		}
-      		
-      	// *****************************************************************
-      	else if( lastUriSeg.Match( KNSmlWLanMaxApFailureCount ) != KErrNotFound )
-      		{
-      		_DBG_FILE("CGlobalWLANAdapter::FetchLeafObjectL(): leaf"); 
-      	   	iReadSettings->maxApFailureCountPresent = ETrue;
-      	   	iReadStatuses->maxApFailureCountResult = aResultsRef;
-      	   	iReadStatuses->maxApFailureCountStatus = aStatusRef;
-      		}
-      		
-      	// *****************************************************************
-      	else if( lastUriSeg.Match( KNSmlWLanLongBeaconFindCount ) != KErrNotFound )
-      		{
-      		_DBG_FILE("CGlobalWLANAdapter::FetchLeafObjectL(): leaf"); 
-      	   	iReadSettings->longBeaconFindCountPresent = ETrue;
-      	   	iReadStatuses->longBeaconFindCountResult = aResultsRef;
-      	   	iReadStatuses->longBeaconFindCountStatus = aStatusRef;
-      		}
-      		
-      	// *****************************************************************
-      	else if( lastUriSeg.Match( KNSmlWLanQosNullFrameInterval ) != KErrNotFound )
-      		{
-      		_DBG_FILE("CGlobalWLANAdapter::FetchLeafObjectL(): leaf"); 
-      	   	iReadSettings->qosNullFrameIntervalPresent = ETrue;
-      	   	iReadStatuses->qosNullFrameIntervalResult = aResultsRef;
-      	   	iReadStatuses->qosNullFrameIntervalStatus = aStatusRef;
-      		}
-      		
-      	// *****************************************************************
-      	else if( lastUriSeg.Match( KNSmlWLanQosNullFrameTimeout ) != KErrNotFound )
-      		{
-      		_DBG_FILE("CGlobalWLANAdapter::FetchLeafObjectL(): leaf"); 
-      	   	iReadSettings->qosNullFrameTimeoutPresent = ETrue;
-      	   	iReadStatuses->qosNullFrameTimeoutResult = aResultsRef;
-      	   	iReadStatuses->qosNullFrameTimeoutStatus = aStatusRef;
-      		}
-      		
-      	// *****************************************************************
-      	else if( lastUriSeg.Match( KNSmlWLanMTU ) != KErrNotFound )
-      		{
-      		_DBG_FILE("CGlobalWLANAdapter::FetchLeafObjectL(): leaf"); 
-      	   	iReadSettings->MTUPresent = ETrue;
-      	   	iReadStatuses->MTUResult = aResultsRef;
-      	   	iReadStatuses->MTUStatus = aStatusRef;
-      		}
-      		
-      	// *****************************************************************
-   		// The given leaf was not found
-	  	else
-  			{
-  			_DBG_FILE("CGlobalWLANAdapter::FetchLeafObjectL(): No matchin leaf was found");
-			iCallBack->SetStatusL(aStatusRef, ENotFound);
-  			}
-    	}
-	else
-    	{
-        // Something went wrong
-    	_DBG_FILE("CGlobalWLANAdapter::FetchLeafObjectL(): No matchin node was found");
-        iCallBack->SetStatusL(aStatusRef, EInvalidObject);
-    	}   
-
-    _DBG_FILE("CGlobalWLANAdapter::FetchLeafObjectL(): end");
-
-    }
-    
-
-//-----------------------------------------------------------------------------
-// CGlobalWLANAdapter* CGlobalWLANAdapter::ChildURIListL( const TDesC& aURI, 
-// const TDesC& aLUID, const CArrayFix<TNSmlDmMappingInfo>& aPreviousURISegmentList, 
-// const TInt aResultsRef, const TInt aStatusRef )
-//-----------------------------------------------------------------------------
-void CGlobalWLANAdapter::ChildURIListL( const TDesC8& aURI, 
-                                      const TDesC8& /*aLUID*/, 
-                                      const CArrayFix<TSmlDmMappingInfo>& /*aPreviousURISegmentList*/, 
-                                      const TInt aResultsRef, 
-                                      const TInt aStatusRef )
-    {
-    _DBG_FILE("CGlobalWLANAdapter::ChildURIListL(): begin");
-    DBG_ARGS8(_S8("globalwlanadapter::ChildUriList - <%S>"), &aURI );
- 
-    CBufBase* currentUriSegmentList = CBufFlat::NewL( KUriSegListLength );
-    CleanupStack::PushL( currentUriSegmentList );
-   	TEntry currentEntry;
-   	TInt uriSegs = NumOfUriSegs( aURI );
-    
-    // Check whether WLAN node in question	
-    if ( aURI.Match(_L8("WLAN"  ))!= KErrNotFound && uriSegs == 1 )
-    	{
-    	_DBG_FILE("CGlobalWLANAdapter::ChildURIListL(): WLAN");
-    	currentUriSegmentList->InsertL( 0, KNSmlWLanNode );
-      	iCallBack->SetResultsL( aResultsRef, *currentUriSegmentList, KNullDesC8 );
-    	iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
-    	_DBG_FILE("CGlobalWLANAdapter::ChildURIListL(): WLAN leafs returned");
-    	}
-    
-    // Some illegal node/leaf in question
-    else
-    	{
-        iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::ENotFound);
-        _DBG_FILE("CNSmlInternetAdapter::ChildURIListL(): ENotFound end");
-    	}
-    
-    // delete the list
-    CleanupStack::PopAndDestroy( currentUriSegmentList );
-    _DBG_FILE("CGlobalWLANAdapter::ChildURIListL(): end");
-    }
-
-//-----------------------------------------------------------------------------
-// void CGlobalWLANAdapter::AddNodeObjectL( const TDesC& aURI, const TDesC& aParentLUID, 
-// const TInt aStatusRef )
-//-----------------------------------------------------------------------------
-void CGlobalWLANAdapter::AddNodeObjectL( const TDesC8& aURI, 
-                                       const TDesC8& aParentLUID, 
-                                       const TInt aStatusRef )
-    {
- 
-    DBG_ARGS8(_S8("CGlobalWLANAdapter::AddNodeObjectL - uri: <%S> to aParentLuid: <%S>"), 
-                &aURI, &aParentLUID ); 
-                
-    TInt uriSegs = NumOfUriSegs( aURI );
-                
-    // The only node is WLAN, lets check if that is in question
-    if( aURI.Match( _L8("WLAN" ) ) != KErrNotFound && uriSegs==1 )
-    	{
-    	// No actions needed, the table is created and filled in the
-    	// Execution function.
-    	iCallBack->SetStatusL(aStatusRef, CSmlDmAdapter::EOk);
-    	}
-    else
-    	{
-    	iCallBack->SetStatusL(aStatusRef, CSmlDmAdapter::EError);
-    	}
-
-    _DBG_FILE("CGlobalWLANAdapter::AddNodeObjectL(): end");
-    }
-    
-//------------------------------------------------------------------------------
-// CGlobalWLANAdapter::ExecuteCommandL
-// not supported
-//------------------------------------------------------------------------------
-void CGlobalWLANAdapter::ExecuteCommandL( const TDesC8& /*aURI*/, 
-                              const TDesC8& /*aLUID*/,
-                              const TDesC8& /*aArgument*/, 
-                              const TDesC8& /*aType*/,
-                              TInt aStatusRef )
-    {
-    _DBG_FILE("CGlobalWLANAdapter::ExecuteCommandL(): begin");
-    
-    iCallBack->SetStatusL(aStatusRef, CSmlDmAdapter::EError);
-    
-    _DBG_FILE("CGlobalWLANAdapter::ExecuteCommandL(): end");
-    }
-
-//------------------------------------------------------------------------------
-// CGlobalWLANAdapter::ExecuteCommandL ( .. RWriteStream ..)
-// not supported
-//------------------------------------------------------------------------------
-void CGlobalWLANAdapter::ExecuteCommandL( const TDesC8& /*aURI*/, 
-                              const TDesC8& /*aLUID*/,
-                              RWriteStream*& /*aStream*/, 
-                              const TDesC8& /*aType*/,
-                              TInt aStatusref )
-    {
-    _DBG_FILE("CGlobalWLANAdapter::ExecuteCommandL(): begin");
-     
-   	iCallBack->SetStatusL( aStatusref, CSmlDmAdapter::EError );
-   	
-    _DBG_FILE("CGlobalWLANAdapter::ExecuteCommandL(): end");
-    }
-
-//------------------------------------------------------------------------------
-// CGlobalWLANAdapter::CopyCommandL
-// not supported
-//------------------------------------------------------------------------------
-void CGlobalWLANAdapter::CopyCommandL( const TDesC8& /*aTargetURI*/,
-                                     const TDesC8& /*aTargetLUID*/,
-                                     const TDesC8& /* aSourceURI*/,
-                                     const TDesC8& /*aSourceLUID*/, 
-                                     const TDesC8& /*aType*/,
-                                     TInt aStatusRef )
-    {
-    _DBG_FILE("CGlobalWLANAdapter::CopyCommandL(): begin");
-    
-    iCallBack->SetStatusL(aStatusRef, CSmlDmAdapter::EError);
-    
-    _DBG_FILE("CGlobalWLANAdapter::CopyCommandL(): end");
-    }
-//------------------------------------------------------------------------------
-// CGlobalWLANAdapter::StartAtomicL
-// not supported
-//------------------------------------------------------------------------------
-void CGlobalWLANAdapter::StartAtomicL()
-    {
-    _DBG_FILE("CGlobalWLANAdapter::StartAtomicL(): begin");
-    _DBG_FILE("CGlobalWLANAdapter::StartAtomicL(): end");
-    }
-
-//------------------------------------------------------------------------------
-// CGlobalWLANAdapter::CommitAtomicL
-// not supported
-//------------------------------------------------------------------------------
-void CGlobalWLANAdapter::CommitAtomicL()
-    {
-    _DBG_FILE("CGlobalWLANAdapter::CommitAtomicL(): begin");
-    _DBG_FILE("CGlobalWLANAdapter::CommitAtomicL(): end");
-    }
-
-//------------------------------------------------------------------------------
-// CGlobalWLANAdapter::RollbackAtomicL
-// returns EError
-//------------------------------------------------------------------------------
-void CGlobalWLANAdapter::RollbackAtomicL()
-    {
-    _DBG_FILE("CGlobalWLANAdapter::RollbackAtomicL(): begin");
-    _DBG_FILE("CGlobalWLANAdapter::RollbackAtomicL(): end");
-    }
-
-
-//------------------------------------------------------------------------------
-// CGlobalWLANAdapter::StreamingSupport
-// returns ETrue, streaming is supported
-//------------------------------------------------------------------------------
-
-TBool CGlobalWLANAdapter::StreamingSupport( TInt& /*aItemSize*/ )
-    {
-    _DBG_FILE("CGlobalWLANAdapter::StreamingSupport(): begin");
-    _DBG_FILE("CGlobalWLANAdapter::StreamingSupport(): end");
-    return EFalse;
-    }
-
-//------------------------------------------------------------------------------
-// CGlobalWLANAdapter::StreamCommittedL
-// not used in this adapter
-//------------------------------------------------------------------------------
-
-void CGlobalWLANAdapter::StreamCommittedL()
-    {
-    _DBG_FILE("CGlobalWLANAdapter::StreamCommittedL(): begin");
-    _DBG_FILE("CGlobalWLANAdapter::StreamCommittedL(): end");
-    }
-
-//-----------------------------------------------------------------------------
-// CGlobalWLANAdapter* CGlobalWLANAdapter::CompleteOutstandingCmdsL( )
-//-----------------------------------------------------------------------------
-void CGlobalWLANAdapter::CompleteOutstandingCmdsL( )
-    {
-    _DBG_FILE("CGlobalWLANAdapter::CompleteOutStandingCmdsL(): begin");
-    
-    ExecuteBufferL( ETrue );  
-    
-    _DBG_FILE("CGlobalWLANAdapter::CompleteOutStandingCmdsL(): end");
-    }
-
-
-// -------------------------------------------------------------------------------------
-// CGlobalWLANAdapter::FillNodeInfoL()
-// Fills the node info in ddf structure
-// -------------------------------------------------------------------------------------
-void CGlobalWLANAdapter::FillNodeInfoL( MSmlDmDDFObject& aNode,
-                                          TSmlDmAccessTypes aAccTypes,
-                                          MSmlDmDDFObject::TOccurence aOccurrence, 
-                                          MSmlDmDDFObject::TScope aScope, 
-                                          MSmlDmDDFObject::TDFFormat aFormat,
-                                          const TDesC8& aDescription )
-                                          
-    {
-    aNode.SetAccessTypesL(aAccTypes);
-    aNode.SetOccurenceL(aOccurrence);
-    aNode.SetScopeL(aScope);
-    aNode.SetDFFormatL(aFormat);
-    if(aFormat!=MSmlDmDDFObject::ENode)
-        {
-        aNode.AddDFTypeMimeTypeL(KNSmlMimeType);
-        }
-    aNode.SetDescriptionL(aDescription);
-    }
-
-
-// ------------------------------------------------------------------------------------------------
-// void CGlobalWLANAdapter::ExecuteBufferL( TBool aFinal )
-// Executes buffered commands
-// ------------------------------------------------------------------------------------------------
-void CGlobalWLANAdapter::ExecuteBufferL( TBool /*aFinal*/ )
-    {
-    
-    _DBG_FILE("CGlobalWLANAdapter::ExecuteBuffer(): begin");
-  
-  	// Store the given values into cenrep and commsdb and
-  	// read the required parameters from cenrep and commsdb
-  	TRAPD (err1, StoreCenRepParamsL());
-  	TRAPD (err2, StoreCommsDBParamsL());
-  	TRAPD (err3, ReadCenRepParamsL());
-  	TRAPD (err4, ReadCommsDBParamsL());
-  	
-  	// Init the member variables after updates
-  	InitMemberVariables();
-  	
-  	// If some of the operations failed, then leave
-  	User::LeaveIfError( err1 );
-  	User::LeaveIfError( err2 );
-  	User::LeaveIfError( err3 );
-  	User::LeaveIfError( err4 );
-  	
-    _DBG_FILE("CGlobalWLANAdapter::ExecuteBuffer(): End");
-    }
-
-
-// ------------------------------------------------------------------------------------------------
-// TBool CGlobalWLANAdapter::StoreCenRepParamsL( )
-// Stores the parameters to central repository
-// ------------------------------------------------------------------------------------------------
-void CGlobalWLANAdapter::StoreCenRepParamsL()
-	{
-	
-	_DBG_FILE("CGlobalWLANAdapter::StoreCenRepParams(): begin");
-
- 	CRepository* repository = NULL;
- 	CRepository* conSettRep = NULL;
- 	TInt err = KErrNone;
-    
-
-	// Write KWlanInternetConnectivityTest
-    if ( iWriteSettings->internetConnectivityTestPresent )
-    	{
-    	_DBG_FILE("CGlobalWLANAdapter:StoreCenRepParams() KWlanInternetConnectivityTest start " ); 
-    	// Open the cenrep for internet connectivity settings. This is the only global wlan parameter
-    	// from this cenrep
-        conSettRep = CRepository::NewL( KCRUidInternetConnectivitySettings );
-        
-        // There is no pointer to the repository, leave
-        if ( conSettRep == NULL )
-        	{
-        	User::LeaveIfError( KErrGeneral );
-        	}
-        
-        CleanupStack::PushL(conSettRep);
-        
-    	err = conSettRep->Set( KIctsTestPermission, static_cast<TInt>( iWriteSettings->internetConnectivityTest ) );
-    	_DBG_FILE("CGlobalWLANAdapter:StoreCenRepParams() KWlanInternetConnectivityTest set to cenRep " ); 
-    	if( err == KErrNone ) 
-        	{ 
-        	_DBG_FILE("CGlobalWLANAdapter:StoreCenRepParams() KWlanInternetConnectivityTest" ); 
-        	iCallBack->SetStatusL(iWriteStatuses->internetConnectivityTestStatus, CSmlDmAdapter::EOk);
-       	 	}
-       	 else
-       	 	{
-       	 	_DBG_FILE("CGlobalWLANAdapter:StoreCenRepParams() KWlanInternetConnectivityTest failed " ); 
-       	 	iCallBack->SetStatusL(iWriteStatuses->internetConnectivityTestStatus, CSmlDmAdapter::EError);
-       	 	}
-    	CleanupStack::PopAndDestroy(conSettRep);
-       	}
-    
-    
-    // The rest of the parameters are stored to Wlan device settings cenRep
-    repository = CRepository::NewL( KCRUidWlanDeviceSettingsRegistryId );
-    
-    // There is no pointer to the repository, leave
-    if ( repository == NULL )
-    	{
-    	User::LeaveIfError( KErrGeneral );
-    	}
-    
-    CleanupStack::PushL(repository);
-    
-    if ( iWriteSettings->MTUPresent )
-    	{
-    	err = repository->Set( KWlanMTU, static_cast<TInt>( iWriteSettings->MTU ) );
-    		
-    	DBG_ARGS8(_S8("CGlobalWLANAdapter::StoreCenRepParams, MTU status - (%d)"), err );
-    	if( err == KErrNone  ) 
-        	{ 
-        	_DBG_FILE("CGlobalWLANAdapter:StoreCenRepParams() MTU" ); 
-        	iCallBack->SetStatusL(iWriteStatuses->MTUStatus, CSmlDmAdapter::EOk);
-       	 	}
-       	 else
-       	 	{
-       	 	_DBG_FILE("CGlobalWLANAdapter:StoreCenRepParams() MTU failed " ); 
-       	 	iCallBack->SetStatusL(iWriteStatuses->MTUStatus, CSmlDmAdapter::EError);
-       	 	}
-       	}
-
-    // Write KWlanScanRate
-    if ( iWriteSettings->scanRatePresent )
-    	{
-    	err = repository->Set( KWlanScanRate, static_cast<TInt>( iWriteSettings->scanRate ) );
-    		
-    	DBG_ARGS8(_S8("CGlobalWLANAdapter::StoreCenRepParams, scanrate status - (%d)"), err );
-    	if( err == KErrNone ) 
-        	{ 
-        	_DBG_FILE("CGlobalWLANAdapter:StoreCenRepParams() WlanScanRate" ); 
-        	iCallBack->SetStatusL(iWriteStatuses->scanRateStatus, CSmlDmAdapter::EOk);
-       	 	}
-       	 else
-       	 	{
-       	 	_DBG_FILE("CGlobalWLANAdapter:StoreCenRepParams() WlanScanRate failed " ); 
-       	 	iCallBack->SetStatusL(iWriteStatuses->scanRateStatus, CSmlDmAdapter::EError);
-       	 	}
-       	}
-
-    // Write KWlanRcpiTrigger
-   	if ( iWriteSettings->RCPITriggerPresent )
-    	{
-    	err = repository->Set( KWlanRcpiTrigger, static_cast<TInt>( iWriteSettings->RCPITrigger ) );
-    		
-    	if( err == KErrNone ) 
-        	{
-        	_DBG_FILE("CGlobalWLANAdapter:StoreCenRepParams() KWlanRcpiTrigger" );
-    	    iCallBack->SetStatusL(iWriteStatuses->RCPITriggerStatus, CSmlDmAdapter::EOk);
-       	 	}
-       	 else
-       	 	{
-       	 	_DBG_FILE("CGlobalWLANAdapter:StoreCenRepParams() KWlanRcpiTrigger failed" );
-       	 	iCallBack->SetStatusL(iWriteStatuses->RCPITriggerStatus, CSmlDmAdapter::EError);
-       	 	}
-    	}
-
-    // Write KWlanMinActiveChannelTime
-    if ( iWriteSettings->minActiveChannelTimePresent )
-    	{
-    	err = repository->Set( KWlanMinActiveChannelTime, static_cast<TInt>( iWriteSettings->minActiveChannelTime ) );
-    		
-    	if( err == KErrNone ) 
-        	{
-        	_DBG_FILE("CGlobalWLANAdapter:StoreCenRepParams() KWlanMinActiveChannelTime" );
-        	iCallBack->SetStatusL(iWriteStatuses->minActiveChannelTimeStatus, CSmlDmAdapter::EOk);
-       	 	}
-       	 else
-       	 	{
-       	 	_DBG_FILE("CGlobalWLANAdapter:StoreCenRepParams() KWlanMinActiveChannelTime failed" );
-       	 	iCallBack->SetStatusL(iWriteStatuses->minActiveChannelTimeStatus, CSmlDmAdapter::EError);
-       	 	}
-        }
-
-    // Write KWlanMaxActiveChannelTime
-    if ( iWriteSettings->maxActiveChannelTimePresent )
-    	{
-    	err = repository->Set( KWlanMaxActiveChannelTime, static_cast<TInt>( iWriteSettings->maxActiveChannelTime ) );
-    		
-    	if( err == KErrNone ) 
-        	{ 
-        	_DBG_FILE("CGlobalWLANAdapter:StoreCenRepParams() KWlanMaxActiveChannelTime" );
-        	iCallBack->SetStatusL(iWriteStatuses->maxActiveChannelTimeStatus, CSmlDmAdapter::EOk);
-       	 	}
-       	 else
-       	 	{
-       	 	_DBG_FILE("CGlobalWLANAdapter:StoreCenRepParams() KWlanMaxActiveChannelTime failed" );
-       	 	iCallBack->SetStatusL(iWriteStatuses->maxActiveChannelTimeStatus, CSmlDmAdapter::EError);
-       	 	}
-        }
-
-    // Write KWlanMaxTxMSDULifeTime
-    if ( iWriteSettings->maxTxMSDULifeTimePresent )
-    	{
-    	err = repository->Set( KWlanMaxTxMSDULifeTime, static_cast<TInt>( iWriteSettings->maxTxMSDULifeTime ) );
-    	
-    	if( err == KErrNone ) 
-        	{
-        	_DBG_FILE("CGlobalWLANAdapter:StoreCenRepParams()KWlanMaxTxMSDULifeTime" );
-        	iCallBack->SetStatusL(iWriteStatuses->maxTxMSDULifeTimeStatus, CSmlDmAdapter::EOk);
-       	 	}
-       	 else
-       	 	{
-       	 	_DBG_FILE("CGlobalWLANAdapter:StoreCenRepParams()KWlanMaxTxMSDULifeTime failed" );
-       	 	iCallBack->SetStatusL(iWriteStatuses->maxTxMSDULifeTimeStatus, CSmlDmAdapter::EError);
-       	 	}
-        }
-
-    // Write KWlanScanExpirationTimer
-    if ( iWriteSettings->scanExpirationTimerPresent )
-    	{
-    	err = repository->Set( KWlanScanExpirationTimer, static_cast<TInt>( iWriteSettings->scanExpirationTimer ) );
-    	
-    	if( err == KErrNone ) 
-        	{
-        	_DBG_FILE("CGlobalWLANAdapter:StoreCenRepParams()KWlanScanExpirationTimer" );
-        	iCallBack->SetStatusL(iWriteStatuses->scanExpirationTimerStatus, CSmlDmAdapter::EOk);
-       	 	}
-       	 else
-       	 	{
-       	 	_DBG_FILE("CGlobalWLANAdapter:StoreCenRepParams()KWlanScanExpirationTimer failed" );
-       	 	iCallBack->SetStatusL(iWriteStatuses->scanExpirationTimerStatus, CSmlDmAdapter::EError);
-       	 	}
-		}
-				
-    // Write KWlanUnloadDriverTimer
-    if ( iWriteSettings->unloadDriverTimerPresent )
-    	{
-    	err = repository->Set( KWlanUnloadDriverTimer, static_cast<TInt>( iWriteSettings->unloadDriverTimer ) );
-    	
-    	if( err == KErrNone ) 
-        	{
-        	_DBG_FILE("CGlobalWLANAdapter:StoreCenRepParams()KWlanUnloadDriverTimer" );
-        	iCallBack->SetStatusL(iWriteStatuses->unloadDriverTimerStatus, CSmlDmAdapter::EOk);
-       	 	}
-       	 else
-       	 	{
-       	 	_DBG_FILE("CGlobalWLANAdapter:StoreCenRepParams()KWlanUnloadDriverTimer failed" );
-       	 	iCallBack->SetStatusL(iWriteStatuses->unloadDriverTimerStatus, CSmlDmAdapter::EError);
-       	 	}
-        }
-
-    // Write KWlanRoamTimer
-    if ( iWriteSettings->roamTimerPresent )
-    	{
-    	err = repository->Set( KWlanRoamTimer, static_cast<TInt>( iWriteSettings->roamTimer ) );
-    	
-    	if( err == KErrNone) 
-        	{
-        	_DBG_FILE("CGlobalWLANAdapter:StoreCenRepParams() KWlanRoamTimer" );
-        	iCallBack->SetStatusL(iWriteStatuses->roamTimerStatus, CSmlDmAdapter::EOk);
-       	 	}
-       	 else
-       	 	{
-       	 	_DBG_FILE("CGlobalWLANAdapter:StoreCenRepParams() KWlanRoamTimer failed" );
-       	 	iCallBack->SetStatusL(iWriteStatuses->roamTimerStatus, CSmlDmAdapter::EError);
-       	 	}
-        }
-
-    // Write KWlanRcpiDifference
-    if ( iWriteSettings->RCPIDifferencePresent )
-    	{
-    	err = repository->Set( KWlanRcpiDifference, static_cast<TInt>( iWriteSettings->RCPIDifference ) );
-    	
-    	DBG_ARGS8(_S8("CGlobalWLANAdapter::StoreCenRepParams, rcpidifference status - (%d)"), err );
-    	if( err == KErrNone) 
-        	{ 
-        	_DBG_FILE("CGlobalWLANAdapter:StoreCenRepParams() KWlanRcpiDifference" );
-        	iCallBack->SetStatusL(iWriteStatuses->RCPIDifferenceStatus, CSmlDmAdapter::EOk);
-       	 	}
-       	 else
-       	 	{
-       	 	_DBG_FILE("CGlobalWLANAdapter:StoreCenRepParams() KWlanRcpiDifference failed" );
-       	 	iCallBack->SetStatusL(iWriteStatuses->RCPIDifferenceStatus, CSmlDmAdapter::EError);
-       	 	}
-        }
-
-    // Write KWlanConnRegainTimer
-    if ( iWriteSettings->connRegainTimerPresent )
-    	{
-    	err = repository->Set( KWlanConnRegainTimer, static_cast<TInt>( iWriteSettings->connRegainTimer ) );
-    	
-    	if( err == KErrNone ) 
-        	{
-        	_DBG_FILE("CGlobalWLANAdapter:StoreCenRepParams() KWlanConnRegainTimer" );
-        	iCallBack->SetStatusL(iWriteStatuses->connRegainTimerStatus, CSmlDmAdapter::EOk);
-       	 	}
-       	else
-       	 	{
-       	 	_DBG_FILE("CGlobalWLANAdapter:StoreCenRepParams() KWlanConnRegainTimer failed" );
-       	 	iCallBack->SetStatusL(iWriteStatuses->connRegainTimerStatus, CSmlDmAdapter::EError);
-       	 	}
-		}
-				
-    // Write KWlanMaxTriesToFindNw
-   	if ( iWriteSettings->maxTriesToFindNwPresent )
-    	{
-    	err = repository->Set( KWlanMaxTriesToFindNw, static_cast<TInt>( iWriteSettings->maxTriesToFindNw ) );
-    	
-    	if( err == KErrNone ) 
-        	{
-        	_DBG_FILE("CGlobalWLANAdapter:StoreCenRepParams() KWlanMaxTriesToFindNw ");
-        	iCallBack->SetStatusL(iWriteStatuses->maxTriesToFindNwStatus, CSmlDmAdapter::EOk);
-       	 	}
-       	 else
-       	 	{
-       	 	_DBG_FILE("CGlobalWLANAdapter:StoreCenRepParams() KWlanMaxTriesToFindNw failed");
-       	 	iCallBack->SetStatusL(iWriteStatuses->maxTriesToFindNwStatus, CSmlDmAdapter::EError);
-       	 	}
-        }
-
-    // Write KWlanDelayBetweenFindNw
-    if ( iWriteSettings->delayBetweenFindNwPresent )
-    	{
-    	err = repository->Set( KWlanDelayBetweenFindNw, static_cast<TInt>( iWriteSettings->delayBetweenFindNw ) );
-    	
-    	if( err == KErrNone ) 
-        	{
-        	_DBG_FILE("CGlobalWLANAdapter:StoreCenRepParams() KWlanDelayBetweenFindNw" );
-        	iCallBack->SetStatusL(iWriteStatuses->delayBetweenFindNwStatus, CSmlDmAdapter::EOk);
-       	 	}
-       	 else
-       	 	{
-       	 	_DBG_FILE("CGlobalWLANAdapter:StoreCenRepParams() KWlanDelayBetweenFindNw failed" );
-       	 	iCallBack->SetStatusL(iWriteStatuses->delayBetweenFindNwStatus, CSmlDmAdapter::EError);
-       	 	}
-		}
-				
-    // Write KWlanMinPassiveChannelTime
-    if ( iWriteSettings->minPassiveChannelTimePresent )
-    	{
-    	err = repository->Set( KWlanMinPassiveChannelTime, static_cast<TInt>( iWriteSettings->minPassiveChannelTime ) );
-    	
-    	if( err == KErrNone ) 
-        	{
-        	_DBG_FILE("CGlobalWLANAdapter:StoreCenRepParams() KWlanMinPassiveChannelTime" );
-        	iCallBack->SetStatusL(iWriteStatuses->minPassiveChannelTimeStatus, CSmlDmAdapter::EOk);
-       	 	}
-       	 else
-       	 	{
-       	 	_DBG_FILE("CGlobalWLANAdapter:StoreCenRepParams() KWlanMinPassiveChannelTime failed" );
-       	 	iCallBack->SetStatusL(iWriteStatuses->minPassiveChannelTimeStatus, CSmlDmAdapter::EError);
-       	 	}
-        }
-
-    // Write KWlanMaxPassiveChannelTime
-    if ( iWriteSettings->maxPassiveChannelTimePresent )
-    	{
-    	err = repository->Set( KWlanMaxPassiveChannelTime, static_cast<TInt>( iWriteSettings->maxPassiveChannelTime ) );
-    	
-    	if( err == KErrNone ) 
-        	{
-        	_DBG_FILE("CGlobalWLANAdapter:StoreCenRepParams() KWlanMaxPassiveChannelTime" );
-        	iCallBack->SetStatusL(iWriteStatuses->maxPassiveChannelTimeStatus, CSmlDmAdapter::EOk);
-       	 	}
-       	else
-       	 	{
-       	 	_DBG_FILE("CGlobalWLANAdapter:StoreCenRepParams() KWlanMaxPassiveChannelTime failed" );
-       	 	iCallBack->SetStatusL(iWriteStatuses->maxPassiveChannelTimeStatus, CSmlDmAdapter::EError);
-       	 	}
-		}
-				
-    // Write KWlanMaxApFailureCount
-    if ( iWriteSettings->maxApFailureCountPresent )
-    	{
-    	err = repository->Set( KWlanMaxApFailureCount, static_cast<TInt>( iWriteSettings->maxApFailureCount ) );
-    	
-    	if( err == KErrNone ) 
-        	{
-        	_DBG_FILE("CGlobalWLANAdapter:StoreCenRepParams() KWlanMaxApFailureCount" );
-        	iCallBack->SetStatusL(iWriteStatuses->maxApFailureCountStatus, CSmlDmAdapter::EOk);
-       	 	}
-        else
-       	 	{
-       	 	_DBG_FILE("CGlobalWLANAdapter:StoreCenRepParams() KWlanMaxApFailureCount failed" );
-       	 	iCallBack->SetStatusL(iWriteStatuses->maxApFailureCountStatus, CSmlDmAdapter::EError);
-       	 	}
-        }
-
-    // Write KWlanLongBeaconFindCount
-    if ( iWriteSettings->longBeaconFindCountPresent )
-    	{
-    	err = repository->Set( KWlanLongBeaconFindCount, static_cast<TInt>( iWriteSettings->longBeaconFindCount ) );
-    	
-    	if( err == KErrNone ) 
-      		{
-        	_DBG_FILE("CGlobalWLANAdapter:StoreCenRepParams() KWlanLongBeaconFindCount" );
-        	iCallBack->SetStatusL(iWriteStatuses->longBeaconFindCountStatus, CSmlDmAdapter::EOk);
-       	 	}
-       	else
-       	 	{
-       	 	_DBG_FILE("CGlobalWLANAdapter:StoreCenRepParams() KWlanLongBeaconFindCount failed" );
-       	 	iCallBack->SetStatusL(iWriteStatuses->longBeaconFindCountStatus, CSmlDmAdapter::EError);
-       	 	}
-		}
-				
-    // Write KWlanQosNullFrameInterval
-    if ( iWriteSettings->qosNullFrameIntervalPresent )
-    	{
-    	err = repository->Set( KWlanQosNullFrameInterval, static_cast<TInt>( iWriteSettings->qosNullFrameInterval ) );
-    	
-    	if( err == KErrNone ) 
-        	{
-        	_DBG_FILE("CGlobalWLANAdapter:StoreCenRepParams() KWlanQosNullFrameInterval" );
-        	iCallBack->SetStatusL(iWriteStatuses->qosNullFrameIntervalStatus, CSmlDmAdapter::EOk);
-       	 	}
-       	else
-       	 	{
-       	 	_DBG_FILE("CGlobalWLANAdapter:StoreCenRepParams() KWlanQosNullFrameInterval failed" );
-       	 	iCallBack->SetStatusL(iWriteStatuses->qosNullFrameIntervalStatus, CSmlDmAdapter::EError);
-       	 	}
-        }
-
-    // Write KWlanQosNullFrameTimeout
-    if ( iWriteSettings->qosNullFrameTimeoutPresent )
-    	{
-    	err = repository->Set( KWlanQosNullFrameTimeout, static_cast<TInt>( iWriteSettings->qosNullFrameTimeout ) );
-    	
-    	if( err == KErrNone ) 
-        	{
-        	_DBG_FILE("CGlobalWLANAdapter:StoreCenRepParams() KWlanQosNullFrameTimeout" );
-        	iCallBack->SetStatusL(iWriteStatuses->qosNullFrameTimeoutStatus, CSmlDmAdapter::EOk);
-       	 	}
-       	else
-       	 	{
-       	 	_DBG_FILE("CGlobalWLANAdapter:StoreCenRepParams() KWlanQosNullFrameTimeout failed" );
-       	 	iCallBack->SetStatusL(iWriteStatuses->qosNullFrameTimeoutStatus, CSmlDmAdapter::EError);
-       	 	}
-       	}
-
-    // Cleanup
-   	CleanupStack::PopAndDestroy(repository);
-    _DBG_FILE("CGlobalWLANAdapter::StoreCenRepParams(): end");
-    return;
-	}
-	
-// ------------------------------------------------------------------------------------------------
-// void CGlobalWLANAdapter::StoreCommsDBParams( )
-// Stores the parameters to central repository
-// ------------------------------------------------------------------------------------------------
-void CGlobalWLANAdapter::StoreCommsDBParamsL()
-	{
-	
-	_DBG_FILE("CGlobalWLANAdapter::StoreCommsDBParams(): begin");
-	
-	CCommsDatabase* db = CCommsDatabase::NewL();
-	CleanupStack::PushL(db);
-			
-	// User defined WLAN device settings table from Comms database
-    CCommsDbTableView* usrTable;
-    
-    // Open user settings.
-    usrTable = db->OpenViewMatchingUintLC( TPtrC(WLAN_DEVICE_SETTINGS),
-											TPtrC(WLAN_DEVICE_SETTINGS_TYPE),
-											KWlanUserSettings );
-		
-	// if record did not exist, then it is created.
-    if ( usrTable->GotoFirstRecord() != KErrNone )
-        {
-        _DBG_FILE("CGlobalWLANAdapter::StoreCommsDBParams(): Record creation");
-    	TUint32 id;
-    	User::LeaveIfError( usrTable->InsertRecord( id ) );
-    
-    	usrTable->WriteUintL( TPtrC(WLAN_DEVICE_SETTINGS_TYPE), KWlanUserSettings );  
-    	//usrTable->WriteUintL( TPtrC(WLAN_TABLE_VERSION), KWlanDeviceSettingsTableVersion );
-    	User::LeaveIfError( usrTable->PutRecordChanges() ); // End and save changes.
-        }
-			
-	// Write CommsDat settings
-    User::LeaveIfError( usrTable->UpdateRecord() ); // Begin changes.
-	
-	// Check which parameters are present in the structure, store them into commsdb and
-	// update the status to OK/Error accordingly	
-	if ( iWriteSettings->backgroundScanIntervalPresent )
-		{
-		_DBG_FILE("CGlobalWLANAdapter::StoreCommsDBParams(): write KBgScanInterval");
-    	TRAPD( err, usrTable->WriteUintL( TPtrC(WLAN_BG_SCAN_INTERVAL), iWriteSettings->backgroundScanInterval ));
-    	if ( err == KErrNone)
-    		{
-    		iCallBack->SetStatusL(iWriteStatuses->backgroundScanIntervalStatus, CSmlDmAdapter::EOk);
-    		}
-    	else
-    		{
-    		iCallBack->SetStatusL(iWriteStatuses->backgroundScanIntervalStatus, CSmlDmAdapter::EError);	
-    		}
-		}
-		
-    if ( iWriteSettings->useDefaultSettingsPresent )
-    	{
-    	_DBG_FILE("CGlobalWLANAdapter::StoreCommsDBParams(): write KUseDefaultSettings");
-    	TRAPD( err, usrTable->WriteBoolL( TPtrC(WLAN_USE_DEFAULT_SETTINGS), iWriteSettings->useDefaultSettings ));
-    	if ( err == KErrNone)
-    		{
-    		iCallBack->SetStatusL(iWriteStatuses->useDefaultSettingsStatus, CSmlDmAdapter::EOk);
-    		}
-    	else
-    		{
-    		iCallBack->SetStatusL(iWriteStatuses->useDefaultSettingsStatus, CSmlDmAdapter::EError);	
-    		}
-		}
-		
-    if ( iWriteSettings->longRetryLimitPresent )
-   		{
-   		_DBG_FILE("CGlobalWLANAdapter::StoreCommsDBParams(): write KWlanLongRetry");
-    	TRAPD( err, usrTable->WriteUintL( TPtrC(WLAN_LONG_RETRY), iWriteSettings->longRetryLimit ));
-    	if ( err == KErrNone)
-    		{
-    		iCallBack->SetStatusL(iWriteStatuses->longRetryLimitStatus, CSmlDmAdapter::EOk);
-    		}
-    	else
-    		{
-    		iCallBack->SetStatusL(iWriteStatuses->longRetryLimitStatus, CSmlDmAdapter::EError);	
-    		}
-		}
-		
-    if ( iWriteSettings->shortRetryLimitPresent )
-    	{
-    	_DBG_FILE("CGlobalWLANAdapter::StoreCommsDBParams(): write KWlanShortRetry");
-    	TRAPD( err, usrTable->WriteUintL( TPtrC(WLAN_SHORT_RETRY), iWriteSettings->shortRetryLimit ));
-    	if ( err == KErrNone)
-    		{
-    		iCallBack->SetStatusL(iWriteStatuses->shortRetryLimitStatus, CSmlDmAdapter::EOk);
-    		}
-    	else
-    		{
-    		iCallBack->SetStatusL(iWriteStatuses->shortRetryLimitStatus, CSmlDmAdapter::EError);	
-    		}
-		}
-		
-    if ( iWriteSettings->RTSThresholdPresent )
-   		{
-   		_DBG_FILE("CGlobalWLANAdapter::StoreCommsDBParams(): write KWlanRTSThreshold");
-    	TRAPD( err, usrTable->WriteUintL( TPtrC(WLAN_RTS_THRESHOLD), iWriteSettings->RTSThreshold ));
-    	if ( err == KErrNone)
-    		{
-    		iCallBack->SetStatusL(iWriteStatuses->RTSThresholdStatus, CSmlDmAdapter::EOk);
-    		}
-    	else
-    		{
-    		iCallBack->SetStatusL(iWriteStatuses->RTSThresholdStatus, CSmlDmAdapter::EError);	
-    		}
-		}
-		
-    if ( iWriteSettings->TXPowerLevelPresent )
-    	{
-    	_DBG_FILE("CGlobalWLANAdapter::StoreCommsDBParams(): write KWlanTxPowerLevel");
-    	TRAPD( err, usrTable->WriteUintL( TPtrC(NU_WLAN_TX_POWER_LEVEL), iWriteSettings->TXPowerLevel ));
-    	if ( err == KErrNone)
-    		{
-    		iCallBack->SetStatusL(iWriteStatuses->TXPowerLevelStatus, CSmlDmAdapter::EOk);
-    		}
-    	else
-    		{
-    		iCallBack->SetStatusL(iWriteStatuses->TXPowerLevelStatus, CSmlDmAdapter::EError);	
-    		}
-		}
-		
-    if ( iWriteSettings->allowRadioMeasurementsPresent )
-    	{
-    	_DBG_FILE("CGlobalWLANAdapter::StoreCommsDBParams(): write KWlanAllowRadioMeasurements");
-    	TRAPD( err, usrTable->WriteBoolL( TPtrC(WLAN_ALLOW_RADIO_MEASUREMENTS), iWriteSettings->allowRadioMeasurements ));
-        if ( err == KErrNone)
-    		{
-    		iCallBack->SetStatusL(iWriteStatuses->allowRadioMeasurementsStatus, CSmlDmAdapter::EOk);
-    		}
-    	else
-    		{
-    		iCallBack->SetStatusL(iWriteStatuses->allowRadioMeasurementsStatus, CSmlDmAdapter::EError);	
-    		}
-		}
-    
-    if ( iWriteSettings->powerSavingPresent )
-    	{
-    	_DBG_FILE("CGlobalWLANAdapter::StoreCommsDBParams(): write KWlanPowerSaving");
-    	TRAPD( err, usrTable->WriteBoolL( TPtrC(WLAN_POWER_MODE), iWriteSettings->powerSaving ));
-        if ( err == KErrNone)
-    		{
-    		iCallBack->SetStatusL(iWriteStatuses->powerSavingStatus, CSmlDmAdapter::EOk);
-    		}
-    	else
-    		{
-    		iCallBack->SetStatusL(iWriteStatuses->powerSavingStatus, CSmlDmAdapter::EError);	
-    		}
-		}
-    
-    _DBG_FILE("CGlobalWLANAdapter::StoreCommsDBParams(): end");
-    User::LeaveIfError( usrTable->PutRecordChanges() ); // End and save changes.
-    CleanupStack::PopAndDestroy( usrTable );
-    CleanupStack::PopAndDestroy( db );
-    return;
-    
-	}
-			
-
-// ------------------------------------------------------------------------------------------------
-// void CGlobalWLANAdapter::ReadCenRepParams( )
-// Reads parameters from central repository
-// ------------------------------------------------------------------------------------------------
-void CGlobalWLANAdapter::ReadCenRepParamsL()
-	{
-		
-	_DBG_FILE("CGlobalWLANAdapter::ReadCenRepParams(): begin");
-	
-	TInt err = KErrNone;
-    CRepository* repository = NULL;
-    TBuf8<KInputMaxLength> value;
-    TBuf8<KTypeMaxLength> type;
-    TInt temp = 0;
-     
-    // InternetConnectivityTest parameter is in a different cenRep than the other parameters
-    // Write KWlanScanRate
-    if ( iReadSettings->internetConnectivityTestPresent )
-    	{
-    	// This parameter is in the internet connectivity settings cenRep, open the repository
-        repository = CRepository::NewL( KCRUidInternetConnectivitySettings );
-        CleanupStack::PushL(repository);
-      
-    	value.Zero();
-    	type.Zero();
-    	
-    	// if opening the cenrtral repository failed, then leave this function
-    	if ( repository == NULL )
-    		{
-    		User::LeaveIfError( KErrGeneral );
-    		}
-    	
-    	err = repository->Get( KIctsTestPermission, temp );    	
-       	value.Num(temp);
-       	type.Append( KNSmlWLanInternetConnectivityTest );
-       	UpdateStatusAndResultL( iReadStatuses->internetConnectivityTestResult, iReadStatuses->internetConnectivityTestStatus, 
-       					value, type, err  );
-       	
-       	CleanupStack::PopAndDestroy(repository);
-    	}
-    
-    // The rest of the parameters are in WlanDeviceSettings cenRep
-    repository = CRepository::NewL( KCRUidWlanDeviceSettingsRegistryId );
-    CleanupStack::PushL(repository);
-    
-    // if opening the cenrtral repository failed, then leave this function
-	if ( repository == NULL )
-		{
-		User::LeaveIfError( KErrGeneral );
-		}
-    
-    if ( iReadSettings->MTUPresent )
-    	{
-    	value.Zero();
-    	type.Zero();
-    	err = repository->Get( KWlanMTU, temp );
-       	value.Num(temp);
-       	type.Append( KNSmlWLanMTU );
-       	UpdateStatusAndResultL( iReadStatuses->MTUResult, iReadStatuses->MTUStatus, 
-       					value, type, err  );
-    	}
-    
-    // Write KWlanScanRate
-    if ( iReadSettings->scanRatePresent )
-    	{
-    	value.Zero();
-    	type.Zero();
-    	err = repository->Get( KWlanScanRate, temp );
-       	value.Num(temp);
-       	type.Append( KNSmlWLanScanRate );
-       	UpdateStatusAndResultL( iReadStatuses->scanRateResult, iReadStatuses->scanRateStatus, 
-       					value, type, err  );
-    	}
-
-    // Write KWlanRcpiTrigger
-   	if ( iReadSettings->RCPITriggerPresent )
-    	{
-    	value.Zero();
-    	type.Zero();
-    	err = repository->Get( KWlanRcpiTrigger, temp );
-       	value.Num(temp);
-       	type.Append( KNSmlWLanRCPITrigger );
-       	UpdateStatusAndResultL( iReadStatuses->RCPITriggerResult, iReadStatuses->RCPITriggerStatus, 
-       					value, type, err  );
-       	}
-
-    // Write KWlanMinActiveChannelTime
-    if ( iReadSettings->minActiveChannelTimePresent )
-   	 	{
-   	 	value.Zero();
-   	 	type.Zero();
-   	 	err = repository->Get( KWlanMinActiveChannelTime, temp );
-       	value.Num(temp);
-       	type.Append( KNSmlWLanMinActiveChannelTime );
-       	UpdateStatusAndResultL( iReadStatuses->minActiveChannelTimeResult, iReadStatuses->minActiveChannelTimeStatus, 
-       					value, type, err  );
-       	}
-       	
-    // Write KWlanMaxActiveChannelTime
-    if ( iReadSettings->maxActiveChannelTimePresent )
-   	 	{
-   	 	value.Zero();
-   	 	type.Zero();
-   	 	err = repository->Get( KWlanMaxActiveChannelTime, temp );
-		value.Num(temp);
-		type.Append( KNSmlWLanMaxActiveChannelTime );
-       	UpdateStatusAndResultL( iReadStatuses->maxActiveChannelTimeResult, iReadStatuses->maxActiveChannelTimeStatus, 
-       					value, type, err  );
-       	}
-
-    // Write KWlanMaxTxMSDULifeTime
-    if ( iReadSettings->maxTxMSDULifeTimePresent )
-   	 	{
-   	 	value.Zero();
-   	 	type.Zero();
-   	 	err = repository->Get( KWlanMaxTxMSDULifeTime, temp );
-		value.Num(temp);
-		type.Append( KNSmlWLanMaxTxMSDULifeTime );
-       	UpdateStatusAndResultL( iReadStatuses->maxTxMSDULifeTimeResult, iReadStatuses->maxTxMSDULifeTimeStatus, 
-       					value, type, err  );
-       	}
-
-    // Write KWlanScanExpirationTimer
-    if ( iReadSettings->scanExpirationTimerPresent )
-   	 	{
-   	 	value.Zero();
-   	 	type.Zero();
-   	 	err = repository->Get( KWlanScanExpirationTimer, temp );
-		value.Num(temp);
-		type.Append( KNSmlWLanScanExpirationTimer );
-       	UpdateStatusAndResultL( iReadStatuses->scanExpirationTimerResult, iReadStatuses->scanExpirationTimerStatus, 
-       					value, type, err  );
-       	}
-				
-    // Write KWlanUnloadDriverTimer
-    if ( iReadSettings->unloadDriverTimerPresent )
-   	 	{
-   	 	value.Zero();
-   	 	type.Zero();
-   	 	err = repository->Get( KWlanUnloadDriverTimer, temp );
-		value.Num(temp);
-		type.Append( KNSmlWLanUnloadDriverTimer );
-       	UpdateStatusAndResultL( iReadStatuses->unloadDriverTimerResult, iReadStatuses->unloadDriverTimerStatus, 
-       					value, type, err  );
-       	}
-
-    // Write KWlanRoamTimer
-    if ( iReadSettings->roamTimerPresent )
-    	{
-    	value.Zero();
-		type.Zero();
-    	err = repository->Get( KWlanRoamTimer, temp );
-    	value.Num(temp);
-		type.Append( KNSmlWLanRoamTimer );
-       	UpdateStatusAndResultL( iReadStatuses->roamTimerResult, iReadStatuses->roamTimerStatus, 
-       					value, type, err  );
-       	}
-
-    // Write KWlanRcpiDifference
-    if ( iReadSettings->RCPIDifferencePresent )
-    	{
-    	value.Zero();
-    	type.Zero();
-    	type.Append( KNSmlWLanRCPIDifference );
-    	err = repository->Get( KWlanRcpiDifference, temp );
-		value.Num(temp); 	
-       	UpdateStatusAndResultL( iReadStatuses->RCPIDifferenceResult, iReadStatuses->RCPIDifferenceStatus, 
-       					value, type, err  );
-       	}
-
-    // Write KWlanConnRegainTimer
-    if ( iReadSettings->connRegainTimerPresent )
-    	{
-    	value.Zero();
-    	type.Zero();
-    	type.Append( KNSmlWLanConnRegainTimer );
-    	err = repository->Get( KWlanConnRegainTimer, temp );
-		value.Num(temp);
-       	UpdateStatusAndResultL( iReadStatuses->connRegainTimerResult, iReadStatuses->connRegainTimerStatus, 
-       					value, type, err  );
-       	}
-				
-    // Write KWlanMaxTriesToFindNw
-   	if ( iReadSettings->maxTriesToFindNwPresent )
-    	{
-    	value.Zero();
-    	type.Zero();
-    	err = repository->Get( KWlanMaxTriesToFindNw, temp );
-		value.Num(temp);
-		type.Append( KNSmlWLanMaxTriesToFindNw );
-       	UpdateStatusAndResultL( iReadStatuses->maxTriesToFindNwResult, iReadStatuses->maxTriesToFindNwStatus, 
-       					value, type, err  );
-       	}
-
-    // Write KWlanDelayBetweenFindNw
-    if ( iReadSettings->delayBetweenFindNwPresent )
-    	{
-    	value.Zero();
-    	type.Zero();
-    	err = repository->Get( KWlanDelayBetweenFindNw, temp );
-		value.Num(temp);
-		type.Append( KNSmlWLanDelayBetweenFindNw );
-       	UpdateStatusAndResultL( iReadStatuses->delayBetweenFindNwResult, iReadStatuses->delayBetweenFindNwStatus, 
-       					value, type, err  );
-       	}
-				
-    // Write KWlanMinPassiveChannelTime
-    if ( iReadSettings->minPassiveChannelTimePresent )
-    	{
-    	value.Zero();
-    	type.Zero();
-    	err = repository->Get( KWlanMinPassiveChannelTime, temp );
-		value.Num(temp);
-		type.Append( KNSmlWLanRCPITrigger );
-       	UpdateStatusAndResultL( iReadStatuses->minPassiveChannelTimeResult, iReadStatuses->minPassiveChannelTimeStatus, 
-       					value, type, err  );
-       	}
-
-    // Write KWlanMaxPassiveChannelTime
-    if ( iReadSettings->maxPassiveChannelTimePresent )
-    	{
-    	value.Zero();
-    	type.Zero();
-    	err = repository->Get( KWlanMaxPassiveChannelTime, temp );
-		value.Num(temp);
-		type.Append( KNSmlWLanMinPassiveChannelTime );
-       	UpdateStatusAndResultL( iReadStatuses->maxPassiveChannelTimeResult, iReadStatuses->maxPassiveChannelTimeStatus, 
-       					value, type, err  );
-       	}
-       			
-    // Write KWlanMaxApFailureCount
-    if ( iReadSettings->maxApFailureCountPresent )
-    	{
-    	value.Zero();
-    	type.Zero();
-    	err = repository->Get( KWlanMaxApFailureCount, temp );
-		value.Num(temp);
-		type.Append( KNSmlWLanMaxApFailureCount );
-       	UpdateStatusAndResultL( iReadStatuses->maxApFailureCountResult, iReadStatuses->maxApFailureCountStatus, 
-       					value, type, err  );
-       	}
-
-    // Write KWlanLongBeaconFindCount
-    if ( iReadSettings->longBeaconFindCountPresent )
-    	{
-    	value.Zero();
-    	type.Zero();
-    	err = repository->Get( KWlanLongBeaconFindCount, temp );
-		value.Num(temp);
-		type.Append( KNSmlWLanLongBeaconFindCount );
-       	UpdateStatusAndResultL( iReadStatuses->longBeaconFindCountResult, iReadStatuses->longBeaconFindCountStatus, 
-       					value, type, err  );
-       	}
-				
-    // Write KWlanQosNullFrameInterval
-    if ( iReadSettings->qosNullFrameIntervalPresent )
-    	{
-    	value.Zero();
-    	type.Zero();
-    	err = repository->Get( KWlanQosNullFrameInterval, temp );
-		value.Num(temp);
-		type.Append( KNSmlWLanQosNullFrameInterval );
-       	UpdateStatusAndResultL( iReadStatuses->qosNullFrameIntervalResult, iReadStatuses->qosNullFrameIntervalStatus, 
-       					value, type, err  );
-       	}
-
-    // Write KWlanQosNullFrameTimeout
-    if ( iReadSettings->qosNullFrameTimeoutPresent )
-    	{
-    	value.Zero();
-    	type.Zero();
-    	err = repository->Get( KWlanQosNullFrameTimeout, temp );
-		value.Num(temp);
-		type.Append( KNSmlWLanQosNullFrameTimeout );
-       	UpdateStatusAndResultL( iReadStatuses->qosNullFrameTimeoutResult, iReadStatuses->qosNullFrameTimeoutStatus, 
-       					value, type, err  );
-       	}
-
-    // Cleanup
-    CleanupStack::PopAndDestroy(repository);
-    _DBG_FILE("CGlobalWLANAdapter::ReadCenRepParams(): end"); 
-    return;
-	
-	}
-
-// ------------------------------------------------------------------------------------------------
-// void CGlobalWLANAdapter::UpdateStatusAndResultL( )
-// Reads parameters from cenrep and updates result/status
-// ------------------------------------------------------------------------------------------------
-void CGlobalWLANAdapter::UpdateStatusAndResultL( TInt aResult, TInt aStatus, TDesC8& aValue, TDesC8& aType, TInt aStoreErr )
-	{
-	
-	_DBG_FILE("CGlobalWLANAdapter::UpdateStatusAndResultL(): begin");
-
-	CBufBase *lObject = CBufFlat::NewL(KInputMaxLength);
-    CleanupStack::PushL(lObject);
-
-    // If reading went ok, then we can set the results and statuses
-    if ( aStoreErr == KErrNone )
-    	{
-    	lObject->InsertL(0, aValue);
-    	iCallBack->SetResultsL( aResult,*lObject,aType );
-    	iCallBack->SetStatusL( aStatus, CSmlDmAdapter::EOk);
-    	}
-    else
-    	{
-    	iCallBack->SetStatusL( aStatus, CSmlDmAdapter::EError );
-    	}
-    
-    _DBG_FILE("CGlobalWLANAdapter::UpdateStatusAndResultL(): end");
-    CleanupStack::PopAndDestroy(lObject);
-    return;
-   	}
-
-// ------------------------------------------------------------------------------------------------
-// void CGlobalWLANAdapter::ReadCommsDBParams( )
-// Reads parameters from commsDB
-// ------------------------------------------------------------------------------------------------
-void CGlobalWLANAdapter::ReadCommsDBParamsL()
-	{
-	_DBG_FILE("CGlobalWLANAdapter::ReadCommsDBParams() begin" );  
-   
-  	CCommsDatabase* db = CCommsDatabase::NewL();
-  	CleanupStack::PushL(db);
-			
-	// User defined WLAN device settings table from Comms database
-    CCommsDbTableView* usrTable;
-    
-    // Open user settings.
-    usrTable = db->OpenViewMatchingUintLC( TPtrC(WLAN_DEVICE_SETTINGS),
-    										TPtrC(WLAN_DEVICE_SETTINGS_TYPE),
-    										KWlanUserSettings );
-
-    TUint32 intVal;
-    TBool boolVal = EFalse;
-    TBuf8<KInputMaxLength> value;
-    TBuf8<KTypeMaxLength> type;
-    TInt err = KErrNone;
-    TInt readErr = KErrNone;
-    _LIT8(KTrue,"True");
-    _LIT8(KFalse,"False");
-		
-	// if record did not exist, then we don't do anything
-    if ( usrTable == NULL )
-    	readErr = KErrGeneral;
-   	else
-   		readErr = usrTable->GotoFirstRecord();
-
-    // Check whether parameter was requested to be fetched
-   	if ( iReadSettings->backgroundScanIntervalPresent )
-   		{
-   		// The reading is done if the commdb record was opened successfully, otherwise the err
-   		// is updated so that the ReadAndSetStatus function can update thet status correctly
-   		if ( readErr == KErrNone )
-   			{
-    		TRAP( err, usrTable->ReadUintL( TPtrC(WLAN_BG_SCAN_INTERVAL), intVal ));
-   			}
-    	else
-    		{
-            err=readErr;
-    		}
-   		
-   		value.Zero();
-   		type.Zero();
-    	value.Num(intVal); 
-    	type.Append( KNSmlWLanBackgroundScanInterval );
-    	UpdateStatusAndResultL( iReadStatuses->backgroundScanIntervalResult, iReadStatuses->backgroundScanIntervalStatus, 
-       					value, type, err );
-   		}
- 
-    if ( iReadSettings->useDefaultSettingsPresent )
-    	{
-   		if ( readErr == KErrNone )
-   			{
-    		TRAP( err, usrTable->ReadBoolL( TPtrC(WLAN_USE_DEFAULT_SETTINGS), boolVal ));
-   			}
-    	else
-    		{
-            err=readErr;
-    		}
-    	
-		value.Zero();
-		type.Zero();
-    	if ( boolVal == 0 )
-    		value.Copy(KFalse);
-    	else
-    		value.Copy(KTrue);
-    	
-    	type.Append( KNSmlWLanUseDefaultSettings );
-    	_DBG_FILE("CGlobalWLANAdapter::ReadCommsDBParams() go set status" );
-    	UpdateStatusAndResultL( iReadStatuses->useDefaultSettingsResult, iReadStatuses->useDefaultSettingsStatus, 
-       					value, type, err );
-    	}
-    
-    if ( iReadSettings->longRetryLimitPresent )
-    	{
-    	if ( readErr == KErrNone )
-    		{
-    		TRAP( err, usrTable->ReadUintL( TPtrC(WLAN_LONG_RETRY), intVal ));
-    		}
-   		else
-   			{
-   			err = readErr;
-   			}
-    	
-    	value.Zero();
-    	value.Num(intVal);
-    	type.Zero();
-    	type.Append( KNSmlWLanLongRetryLimit );
-    	UpdateStatusAndResultL( iReadStatuses->longRetryLimitResult, iReadStatuses->longRetryLimitStatus, 
-       					value, type, err );
-    	}
-    
-    if ( iReadSettings->shortRetryLimitPresent )
-    	{
-    	if ( readErr == KErrNone )
-    		{
-    		TRAP( err, usrTable->ReadUintL( TPtrC(WLAN_SHORT_RETRY), intVal ));
-    		}
-   		else
-   			{
-   			err = readErr;
-   			}
-    	
-    	value.Zero();
-    	type.Zero();
-    	value.Num(intVal);
-    	type.Append( KNSmlWLanShortRetryLimit );
-    	UpdateStatusAndResultL( iReadStatuses->shortRetryLimitResult, iReadStatuses->shortRetryLimitStatus, 
-       					value, type, err );
-    	}
-    	
-    if ( iReadSettings->RTSThresholdPresent )
-    	{
-    	if ( readErr == KErrNone )
-    		{
-    		TRAP( err, usrTable->ReadUintL( TPtrC(WLAN_RTS_THRESHOLD), intVal ));
-    		}
-   		else
-   			{
-   			err = readErr;
-   			}
-    	
-    	value.Zero();
-    	type.Zero();
-    	value.Num(intVal);
-    	type.Append( KNSmlWLanRTSThreshold );
-    	UpdateStatusAndResultL( iReadStatuses->RTSThresholdResult, iReadStatuses->RTSThresholdStatus, 
-       					value, type, err );
-    	}
-    
-    if ( iReadSettings->TXPowerLevelPresent )
-    	{
-		if ( readErr == KErrNone )
-			{
-    		TRAP( err, usrTable->ReadUintL( TPtrC(NU_WLAN_TX_POWER_LEVEL), intVal ));
-			}
-   		else
-   			{
-   			err = readErr;
-   			}
-		
-		value.Zero();
-		type.Zero();
-    	value.Num(intVal);
-    	type.Append( KNSmlWLanTXPowerLevel );
-    	UpdateStatusAndResultL( iReadStatuses->TXPowerLevelResult, iReadStatuses->TXPowerLevelStatus, 
-       					value, type, err );
-    	}
-    
-    if ( iReadSettings->allowRadioMeasurementsPresent )
-    	{
-		if ( readErr == KErrNone )
-			{
-    		TRAP( err, usrTable->ReadBoolL( TPtrC(WLAN_ALLOW_RADIO_MEASUREMENTS), boolVal ));
-			}
-   		else
-   			{
-   			err = readErr;
-   			}
-		
-		value.Zero();
-		type.Zero();
-    	if ( boolVal )
-    		value.Copy(_L8("True"));
-    	else
-    		value.Copy(_L8("False"));
-    	
-    	type.Append( KNSmlWLanAllowRadioMeasurements );
-    	UpdateStatusAndResultL( iReadStatuses->allowRadioMeasurementsResult, iReadStatuses->allowRadioMeasurementsStatus, 
-       					value, type, err );
-    	}
-    
-    if ( iReadSettings->powerSavingPresent )
-    	{
-		if ( readErr == KErrNone )
-    		{
-    		TRAP( err, usrTable->ReadBoolL( TPtrC(WLAN_POWER_MODE), boolVal ));
-    		}
-   		else
-   			{
-   			err = readErr;
-   			}
-		
-		value.Zero();
-		type.Zero();
-    	if ( boolVal )
-    		value.Copy(_L8("True"));
-    	else
-    		value.Copy(_L8("False"));
-    	
-    	type.Append( KNSmlWLanPowerSaving );
-    	UpdateStatusAndResultL( iReadStatuses->powerSavingResult, iReadStatuses->powerSavingStatus, 
-       					value, type, err );
-    	}
-
-	CleanupStack::PopAndDestroy( usrTable );
-    CleanupStack::PopAndDestroy( db );
-	_DBG_FILE("CGlobalWLANAdapter::ReadCommsDBParams() end" );  
-	return;
-	}
-
-
-
-// ------------------------------------------------------------------------------------------------
-// TInt CGlobalWLANAdapter::NumOfUriSegs( const TDesC8& aUri )
-// Return count of URI segments of aUri
-// ------------------------------------------------------------------------------------------------
-TInt CGlobalWLANAdapter::NumOfUriSegs( const TDesC8& aUri )
-    {
-    _DBG_FILE("CGlobalWLANAdapter::NumOfUriSegs(): begin");
-
-    TInt count = 1;
-    for( TInt i=0; i<aUri.Length(); i++ )
-        {
-        if( aUri[i] == '/' )
-            count ++;
-        }
-
-    _DBG_FILE("CGlobalWLANAdapter::NumOfUriSegs(): end");
-    return count;
-    }
-
-
-// ------------------------------------------------------------------------------------------------
-// TPtrC8 CGlobalWLANAdapter::GetLastUriSeg(const TDesC8& aURI)
-// Returns only the last uri segemnt
-// ------------------------------------------------------------------------------------------------
-TPtrC8 CGlobalWLANAdapter::GetLastUriSeg( const TDesC8& aURI )
-    {
-    _DBG_FILE("CGlobalWLANAdapter::GetLastUriSeg(): begin");
-
-	// search for the segment after the last slash
-    TInt i;
-    for( i = aURI.Length() - 1; i >= 0; i-- )
-        {
-        if( aURI[i] == '/' )
-            {
-            break;
-            }
-        }
-
-    if( i == 0 )
-        {
-        _DBG_FILE("CGlobalWLANAdapter::GetLastUriSeg(): end");
-        return aURI;
-        }
-    else
-        {
-        _DBG_FILE("CGlobalWLANAdapter::GetLastUriSeg(): end");
-        return aURI.Mid( i + 1 );
-        }
-    }
-    
-
-// ------------------------------------------------------------------------------------------------
-// TInt CNSmlWLanAdapter::DesToInt( const TDesC8& aNumber )
-// Returns aLuid as integer value
-// ------------------------------------------------------------------------------------------------
-TInt CGlobalWLANAdapter::DesToInt( const TDesC8& aNumber )
-    {
-    _DBG_FILE("CGlobalWLANAdapter::DesToInt(): begin");
-    
-    TInt err = KErrNone;
-    TLex8 lex(aNumber);
-    TInt value = 0;
-    err = lex.Val( value );
-
-    DBG_ARGS8(_S8("CGlobalWLANAdapter::DesToInt() - Des: <%S> Int: <%D>"), &aNumber, value );
-    _DBG_FILE("CGlobalWLANAdapter::DesToInt(): end");
-   
-    // the input might have been illegal. Return error code if conversion failed.
-    if ( err == KErrNone )
-    	return value;
-    else
-    	return err;
-    }
-    
-    
-// ------------------------------------------------------------------------------------------------
-// TInt CNSmlWLanAdapter::InitMemberVariables
-// Inits the member variable structures
-// ------------------------------------------------------------------------------------------------
-void CGlobalWLANAdapter::InitMemberVariables()
-    {
-    _DBG_FILE("CGlobalWLANAdapter::InitMemberVariables(): begin");
-    
-    iWriteSettings->RCPITriggerPresent=EFalse;
-  	iWriteSettings->internetConnectivityTestPresent=EFalse;
-	iWriteSettings->useDefaultSettingsPresent=EFalse;
-	iWriteSettings->longRetryLimitPresent=EFalse;
-	iWriteSettings->shortRetryLimitPresent=EFalse;
-	iWriteSettings->RTSThresholdPresent=EFalse;
-	iWriteSettings->TXPowerLevelPresent=EFalse;
-	iWriteSettings->powerSavingPresent=EFalse;
-	iWriteSettings->backgroundScanIntervalPresent=EFalse;
-	iWriteSettings->scanRatePresent=EFalse;
-	iWriteSettings->RCPITriggerPresent=EFalse;
-	iWriteSettings->minActiveChannelTimePresent=EFalse;
-	iWriteSettings->maxActiveChannelTimePresent=EFalse;
-	iWriteSettings->maxTxMSDULifeTimePresent=EFalse;
-	iWriteSettings->scanExpirationTimerPresent=EFalse;
-	iWriteSettings->unloadDriverTimerPresent=EFalse;
-	iWriteSettings->roamTimerPresent=EFalse;
-	iWriteSettings->RCPIDifferencePresent=EFalse;
-	iWriteSettings->connRegainTimerPresent=EFalse;
-	iWriteSettings->maxTriesToFindNwPresent=EFalse;
-	iWriteSettings->delayBetweenFindNwPresent=EFalse;
-	iWriteSettings->allowRadioMeasurementsPresent=EFalse;
-	iWriteSettings->minPassiveChannelTimePresent=EFalse;
-	iWriteSettings->maxPassiveChannelTimePresent=EFalse;
-	iWriteSettings->maxApFailureCountPresent=EFalse;
-	iWriteSettings->longBeaconFindCountPresent=EFalse;
-	iWriteSettings->qosNullFrameIntervalPresent=EFalse;
-	iWriteSettings->qosNullFrameTimeoutPresent=EFalse;
-	iWriteSettings->MTUPresent=EFalse;
-		 
-	iReadSettings->RCPITriggerPresent=EFalse;
-  	iReadSettings->internetConnectivityTestPresent=EFalse;
-	iReadSettings->useDefaultSettingsPresent=EFalse;
-	iReadSettings->longRetryLimitPresent=EFalse;
-	iReadSettings->shortRetryLimitPresent=EFalse;
-	iReadSettings->RTSThresholdPresent=EFalse;
-	iReadSettings->TXPowerLevelPresent=EFalse;
-	iReadSettings->powerSavingPresent=EFalse;
-	iReadSettings->backgroundScanIntervalPresent=EFalse;
-	iReadSettings->scanRatePresent=EFalse;
-	iReadSettings->RCPITriggerPresent=EFalse;
-	iReadSettings->minActiveChannelTimePresent=EFalse;
-	iReadSettings->maxActiveChannelTimePresent=EFalse;
-	iReadSettings->maxTxMSDULifeTimePresent=EFalse;
-	iReadSettings->scanExpirationTimerPresent=EFalse;
-	iReadSettings->unloadDriverTimerPresent=EFalse;
-	iReadSettings->roamTimerPresent=EFalse;
-	iReadSettings->RCPIDifferencePresent=EFalse;
-	iReadSettings->connRegainTimerPresent=EFalse;
-	iReadSettings->maxTriesToFindNwPresent=EFalse;
-	iReadSettings->delayBetweenFindNwPresent=EFalse;
-	iReadSettings->allowRadioMeasurementsPresent=EFalse;
-	iReadSettings->minPassiveChannelTimePresent=EFalse;
-	iReadSettings->maxPassiveChannelTimePresent=EFalse;
-	iReadSettings->maxApFailureCountPresent=EFalse;
-	iReadSettings->longBeaconFindCountPresent=EFalse;
-	iReadSettings->qosNullFrameIntervalPresent=EFalse;
-	iReadSettings->qosNullFrameTimeoutPresent=EFalse;
-	iReadSettings->MTUPresent=EFalse;
-
-	_DBG_FILE("CGlobalWLANAdapter::InitMemberVariables(): begin");
-    }
-
-// end of file
--- a/omadm/omadmextensions/adapters/globalwlansettings/src/globalwlanadapter.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-CHARACTER_SET UTF8/*
-* Copyright (c) 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:   glowal wlan-settings adapter resources
-*
-*/
-
- 
-
-
-#include <registryinfo.rh>
-#include "nsmldmconstants.h"
-
-RESOURCE REGISTRY_INFO theRegistryInfo
-  {
-  dll_uid = 0x1315DBD; //The DLL's 3rd UID.
-  interfaces = 
-      {
-      INTERFACE_INFO
-          {
-          interface_uid = KNSmlDMInterfaceUid; // DM interface UID
-          implementations = 
-            {
-            IMPLEMENTATION_INFO
-                {
-                implementation_uid = 0x1315DBE; // Global WLAN Adapter
-                version_no = 1; 
-                display_name = "GlobalWLanAdapter";
-                default_data = "";
-                opaque_data = "";
-                }
-            };
-          }
-      };
-    }
--- a/omadm/omadmextensions/adapters/imps/bld/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-/*
-* Copyright (c) 2002-2004 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:    Device Management IMPS Adapter
-*
-*/
-
-
-
-#include <platform_paths.hrh>
-
-PRJ_EXPORTS
-../rom/nsmldmimpsadapter.iby							CORE_APP_LAYER_IBY_EXPORT_PATH(nsmldmimpsadapter.iby)
-
-PRJ_MMPFILES
-
-./nsmldmimpsadapter.mmp
-
-
-
-
--- a/omadm/omadmextensions/adapters/imps/bld/nsmldmimpsadapter.mmp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-/*
-* 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:    Project specification file for DM IMPS adapter.
-*
-*/
-
-
-  
-
-#include "defaultcaps.hrh"
-#include  <platform_paths.hrh>
-
-CAPABILITY CAP_ECOM_PLUGIN
-
-TARGET          nsmldmimpsadapter.dll
-TARGETTYPE      PLUGIN
-UID             0x10009D8D 0x101F9A2A
-VENDORID        VID_DEFAULT
-
-APP_LAYER_SYSTEMINCLUDE
-SYSTEMINCLUDE   /epoc32/include/ecom
-
-SOURCEPATH      ../src
-USERINCLUDE     ../inc ../../inc
-
-SOURCE          nsmldmimpsadapter.cpp
-
-START RESOURCE  nsmldmimpsadapter.rss
-END
-
-LIBRARY         euser.lib ecom.lib charconv.lib 
-LIBRARY         sysutil.lib wvsapsettingsstore.lib efsrv.lib
-LIBRARY         nsmldmclientserverutils.lib nsmldmiapmatcher.lib nsmldebug.lib
-LIBRARY         featmgr.lib
-
-SMPSAFE
\ No newline at end of file
--- a/omadm/omadmextensions/adapters/imps/inc/nsmldmimpsadapter.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,395 +0,0 @@
-/*
-* Copyright (c) 2002-2004 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:    Device Management IMPS Adapter
-*
-*/
-
-
-
-// TaH 3.6.2005 Added constants for parameter lenghts (KNSmlDMMaxNameLen, KNSmlDMMaxAddrLen). 
-// TaH 13.6.2005 Added comments for functions.
-// TaH 27.9.2005 Constansts for dynamic node names changed.
-
-#ifndef __NSMLDMIMPSADAPTER_H__
-#define __NSMLDMIMPSADAPTER_H__
-
-// ------------------------------------------------------------------------------------------------
-// Includes
-// ------------------------------------------------------------------------------------------------
-#include <e32base.h>
-#include <smldmadapter.h>
-#include <msvapi.h>
-
-// CONSTANTS
-// Defined in nsmldmimpluids.h file
-const TUint KNSmlDMImpsAdapterImplUid = 0x101F9A2B;
-const TInt KNSmlDMSAPSettings = 200;
-const TInt KNSmlDMMaxNameLen = 50;
-const TInt KNSmlDMMaxAddrLen = 255;
-const TInt KNSmlDMReservingData = 16;
-const TInt KNSmlDMReservingMaxData = 100;
-
-// MACROS
-
-// DATA TYPES
-
-// FUNCTION PROTOTYPES
-
-// FORWARD DECLARATIONS
-
-// CLASS DECLARATION
-
-// the DDF version must be changed if any changes in DDF structure ( built in DDFStructureL() function )
-_LIT8( KNSmlDMImpsDDFVersion, "1.0" ); 
-
-_LIT8( KNSmlDMImpsTextPlain, "text/plain" );
-_LIT8( KNSmlDMImpsDynamicNode, "" );
-_LIT8( KNSmlDMImpsNodeName, "IMPS" );
-_LIT8( KNSmlDMImpsAppId, "AppID" );
-_LIT8( KNSmlDMImpsName, "Name" );
-_LIT8( KNSmlDMImpsPrefConRef, "PrefConRef" );
-_LIT8( KNSmlDMImpsPrefAddr, "PrefAddr" );
-_LIT8( KNSmlDMImpsAppAuth, "AppAuth" );
-_LIT8( KNSmlDMImpsAAuthLevel, "AAuthLevel" );
-_LIT8( KNSmlDMImpsAAuthName, "AAuthName" );
-_LIT8( KNSmlDMImpsAAuthSecret, "AAuthSecret" );
-_LIT8( KNSmlDMImpsServices, "Services" );
-_LIT8( KNSmlDMImpsExtNode, "Ext" );
-_LIT8( KNSmlDMImpsPepCompliant, "PEPCompliant" );
-_LIT( KNSmlDMImpsPepCompliant16, "PEPCompliant" );
-
-_LIT8( KNSmlDMImpsDescr, "The interior object holds all IMPS objects" );
-_LIT8( KNSmlDMDynamicNodeDescr, "Placeholder for one or more objects" );
-_LIT8( KNSmlDMImpsAppIDDescr, "Identifier for the application service available at the described SAP" );
-_LIT8( KNSmlDMImpsNameDescr, "Logical and user readable identity of the SAP" );
-_LIT8( KNSmlDMImpsPrefConRefDescr, "Indicator for preferred linkage to connectivity parameters" );
-_LIT8( KNSmlDMImpsPrefAddrDescr, "Addres of the application server" );
-_LIT8( KNSmlDMImpsAppAuthDescr, "Container of authentication information to be used with the SAP" );
-_LIT8( KNSmlDMImpsAAuthLevelDescr, "Tells how the provided authentication credentials are to be applied" );
-_LIT8( KNSmlDMImpsAAuthNameDescr, "Indicator of the ID" );
-_LIT8( KNSmlDMImpsAAuthSecretDescr, "Indicator of the authentication secret" );
-_LIT8( KNSmlDMImpsServicesDescr, "List of supported high-level services" );
-_LIT8( KNSmlDMImpsExtNodeDescr, "Container of vendor specific information" );
-_LIT8( KNSmlDMImpsPepCompliantDescr, "Indicator of the PEP Compliantly" );
-
-_LIT8( KNSmlDMImpsDefaultAppID, "wA" );
-_LIT8( KNSmlDMImpsDefaultAAuthLevel, "APPSRV" );
-_LIT8( KNSmlDMImpsDefaultPEC, "TRUE" );
-_LIT8( KNSmlDMImpsDefaultIM, "FALSE" );
-_LIT8( KNSmlDMImpsDefPEC, "T" );
-_LIT8( KNSmlDMImpsDefIM, "F" );
-_LIT( KNSmlDMImpsNotDefined, "" );
-_LIT8( KNSmlDMImpsNotDefined8, "" );
-_LIT8( KNSmlDMImpsIAPUri, "AP" );
-_LIT8( KNSmlDMImpsServiceIM, "IM" );
-_LIT8( KNSmlDMImpsServicePS, "PS" );
-_LIT8( KNSmlDMImpsServiceGR, "GR" );
-_LIT8( KNSmlDMImpsConnMOIAPUri, "NAP" );
-
-_LIT8( KNSmlDMImpsRtNode, "AppID/Name/PrefConRef/PrefAddr/Services/AppAuth/Ext");
-_LIT8( KNSmlDMAppAuthRtNode, "AAuthLevel/AAuthName/AAuthSecret");
-_LIT8( KNSmlDMRtNode8, "AAId1");
-_LIT( KNSmlDMRtNode, "AAId1");
-
-_LIT8( KNSmlDMImpsSeparator8, "/" );
-_LIT( KNSmlDMImpsSeparator, "/" );
-_LIT8( KNSmlImpsUriDotSlash, "./");
-_LIT8( KNSmlDMImpsSemiColon, ";");
-_LIT( KNSmlDMImpsDefaultName, "default" );
-
-_LIT8( KNSmlDMImpsRootAndDyn, "IMPS/*" );
-_LIT8( KNSmlDMImpsWholeAppAuthUri, "IMPS/*/AppAuth" );
-_LIT8( KNSmlDMImpsWholeAppAuthDynUri, "IMPS/*/AppAuth/*" );
-_LIT8( KNSmlDMImpsWholeExtUri, "IMPS/*/Ext" );
-
-_LIT8( KNSMLDMImpsDynNodeName, "ImpsId" );
-_LIT8( KNSmlImpsLine, "-");
-
-// ------------------------------------------------------------------------------------------------
-// CNSmlDmImpsAdapter 
-// ------------------------------------------------------------------------------------------------
-class CNSmlDmImpsAdapter : public CSmlDmAdapter, public MMsvSessionObserver
-	{
-public: // Constructors and destructor
-
-        /**
-        * Two-phased constructors.
-        */	
-    static CNSmlDmImpsAdapter* NewL( MSmlDmCallback* aDmCallback );
-    static CNSmlDmImpsAdapter* NewLC( MSmlDmCallback* aDmCallback );
-
-	    /**
-        * Destructor.
-        */
-    virtual ~CNSmlDmImpsAdapter();
-
-        /**
-        * Requests DDF Version
-        * @param aVersion, Reference for version
-        */
-    void DDFVersionL( CBufBase& aVersion );	
-
-        /**
-        * Requests DDF Structure
-        * @param aDDF, Reference to root node
-        */
-    void DDFStructureL( MSmlDmDDFObject& aDDF );
-
-        /**
-        * Updates leaf object value
-        * @param aURI, The uri of parameter
-        * @param aLUID, The Luid of Uri
-        * @param aObject, The value for parameter
-        * @param aType, Not used at the moment
-        * @param aStatusRef, Status reference of command
-        */
-    void UpdateLeafObjectL( const TDesC8& aURI, 
-	                        const TDesC8& aLUID, 
-	                        const TDesC8& aObject, 
-	                        const TDesC8& aType, 
-	                        TInt aStatusRef );
-
-        /**
-        * Updates leaf object value
-        * Not used at the moment
-        */
-    void UpdateLeafObjectL( const TDesC8& aURI, 
-	                        const TDesC8& aLUID,
-	                        RWriteStream*& aStream, 
-	                        const TDesC8& aType,
-	                        TInt aStatusRef );
-
-        /**
-        * Fetches the leaf object size
-        * @param aURI, The uri of parameter
-        * @param aLUID, The Luid of Uri
-        * @param aType, Not used at the moment
-        * @param aResultsRef, Result reference of command
-        * @param aStatusRef, Status reference of command
-        */
-    void FetchLeafObjectSizeL( const TDesC8& aURI, 
-	                           const TDesC8& aLUID, 
-	                           const TDesC8& aType, 
-	                           const TInt aResultsRef, 
-	                           const TInt aStatusRef );
-	
-        /**
-        * Fetches the leaf object value
-        * @param aURI, The uri of parameter
-        * @param aLUID, The Luid of Uri
-        * @param aType, Not used at the moment
-        * @param aResultsRef, Result reference of command
-        * @param aStatusRef, Status reference of command
-        */
-    void FetchLeafObjectL( const TDesC8& aURI, 
-	                       const TDesC8& aLUID, 
-	                       const TDesC8& aType, 
-	                       TInt aResultsRef, 
-	                       TInt aStatusRef );
-
-        /**
-        * Deletes the node or leaf 
-        * @param aURI, The uri of parameter
-        * @param aLUID, The Luid of Uri
-        * @param aType, Not used at the moment
-        * @param aResultsRef, Result reference of command
-        * @param aStatusRef, Status reference of command
-        */
-    void DeleteObjectL( const TDesC8& aURI, 
-	                    const TDesC8& aLUID, 
-	                    TInt aStatusRef );
-	
-	
-        /**
-        * Requests the child uri list
-        * @param aURI, The uri of parameter
-        * @param aLUID, The Luid of Uri
-        * @param aPreviousURISegmentList, list of previous Uri Segments
-        * @param aResultsRef, Result reference of command
-        * @param aStatusRef, Status reference of command
-        */
-    void ChildURIListL( const TDesC8& aURI, 
-	                    const TDesC8& aLUID, 
-	                    const CArrayFix<TSmlDmMappingInfo>& aPreviousURISegmentList, 
-	                    TInt aResultsRef, 
-	                    TInt aStatusRef );
-	
-        /**
-        * Adds new node
-        * @param aURI, The uri of parameter
-        * @param aParentLUID, The Luid of ParentUri
-        * @param aStatusRef, Status reference of command
-        */
-    void AddNodeObjectL( const TDesC8& aURI, 
-	                     const TDesC8& aParentLUID, 
-	                     TInt aStatusRef );
-
-        /**
-        * Following methods are not used at the moment
-        */
-	void CompleteOutstandingCmdsL();
-	void ExecuteCommandL( const TDesC8& aURI, const TDesC8& aLUID, const TDesC8& aArgument, const TDesC8& aType, const TInt aStatusRef );
-	void ExecuteCommandL( const TDesC8& aURI, const TDesC8& aLUID, RWriteStream*& aStream, const TDesC8& aType, const TInt aStatusRef );
-	void CopyCommandL( const TDesC8& aTargetURI, const TDesC8& aTargetLUID, const TDesC8& aSourceURI, const TDesC8& aSourceLUID, const TDesC8& aType, TInt aStatusRef );
-	void StartAtomicL();
-	void CommitAtomicL();
-	void RollbackAtomicL();
-	TBool StreamingSupport( TInt& aItemSize );
-	void StreamCommittedL();
-	
-protected:	
-	
-        /**
-        * From MMsvSessionObserver
-        */
-    void HandleSessionEventL( TMsvSessionEvent aEvent, TAny* aArg1, TAny* aArg2, TAny* aArg3 );
-
-private:
-
-        /**
-        * Constructors.
-        */
-	CNSmlDmImpsAdapter();
-	CNSmlDmImpsAdapter( TAny* aEcomArguments );//new
-	
-        /**
-        * Symbian 2nd phase constructor.
-        */
-    void ConstructL( MSmlDmCallback* aDmCallback );
-
-        /**
-        * Change Descriptor to Int
-        * @param aLuid, Descriptor
-        * @return Integer value
-        */
-    TInt DesToInt( const TDesC& aLuid );
-	TInt DesToInt( const TDesC8& aLuid );
-
-        /**
-        * Change Int to descriptor
-        * @param aLuid, Integer value
-        * @return Descriptor
-        */
-	HBufC* IntToDesLC( const TInt aLuid );
-	HBufC8* IntToDes8LC( const TInt aLuid );
-
-        /**
-        * Converts 8 bit descriptor to 16 bit descriptor 
-        * @param aSource, source descriptor
-        * @return Destination descriptor
-        */
-    TDesC8&  ConvertTo8LC( const TDesC& aSource );
-
-        /**
-        * Converts 16 bit descriptor to 8 bit descriptor 
-        * @param aSource, source descriptor
-        * @return Destination descriptor
-        */
-	TDesC16& ConvertTo16LC( const TDesC8& aSource );
-	
-        /**
-        * Fill node info
-        * @param aNode, node name
-        * @param aAccTypes, access types
-        * @param aOccurence, occurrence
-        * @param aScope, Dynamic or permanent
-        * @param aFormat, type of leaf
-        * @param aDescription, description of node/leaf
-        */
-	void FillNodeInfoL( MSmlDmDDFObject& aNode, 
-	                    const TSmlDmAccessTypes aAccTypes, 
-	                    MSmlDmDDFObject::TOccurence aOccurrence, 
-	                    MSmlDmDDFObject::TScope aScope, 
-	                    MSmlDmDDFObject::TDFFormat aFormat,
-	                    const TDesC8& aDescription );
-	                    
-        /**
-        * Find correct SAP from DB and read the data
-        * @param aLUID, SAP uid
-        * @param aSap, place for reading SAP data
-        * @param aStore, variable for rading SAP data
-        * @return error status
-        */
-    TInt GetCorrectSapL( const TDesC8& aLUID, 
-                         CIMPSSAPSettings* aSap, 
-                         CIMPSSAPSettingsStore* aStore );
-
-        /**
-        * Reset Sap with empty data
-        * @param aSap, includes the SAP data
-        */
-    void ResetSapL( CIMPSSAPSettings* aSap );
-
-        /**
-        * Update value to SAP data
-        * @param aUri, parameter
-        * @param aObject, parameter value
-        * @param aSap, variable for SAP data
-        * @return error status
-        */
-    CSmlDmAdapter::TError UpdateValueL( const TDesC8& aUri, 
-                                        const TDesC8& aObject, 
-                                        CIMPSSAPSettings* aSap );
-                                        
-        /**
-        * Update PEP value to SAP data
-        * @param aUri, parameter
-        * @param aObject, parameter value
-        * @param aLUID, SAP uid
-        * @param aSap, variable for reading SAP data
-        * @param aStore, used for rading SAP data
-        * @return error status
-        */
-	CSmlDmAdapter::TError UpdatePEPValueL( const TDesC8& aURI, 
-	                                       const TDesC8& aObject, 
-	                                       const TDesC8& aLUID, 
-	                                       CIMPSSAPSettings* aSap, 
-	                                       CIMPSSAPSettingsStore* aStore );
-	                                       
-        /**
-        * Delete value from SAP data
-        * @param aUri, parameter
-        * @param aSap, variable for reading SAP data
-        * @return error status
-        */
-    CSmlDmAdapter::TError DeleteValueL( const TDesC8& aUri, 
-                                        CIMPSSAPSettings* aSap );
-
-        /**
-        * Fetch object data 
-        * @param aUri, parameter
-        * @param aLUID, SAP uid
-        * @param aObject, variable for returning parameter data
-        * @return error status
-        */
-    CSmlDmAdapter::TError FetchObjectL( const TDesC8& aUri, 
-                                        const TDesC8& aLUID, 
-                                        CBufBase& aObject );
-                                        
-        /**
-        * Get Connection Reference 
-        * @return accesspoint reference 
-        */
-    const TDesC8& GetConRef() ; 
-
-
-private: // Data
-	MSmlDmCallback* iCallBack;
-	/**
-		* Boolean to check FeatMgr Initialization
-		*/
-		TBool iFeatMgrInitialized; 
-	};
-
-#endif // __NSMLDMIMPSADAPTER_H__
--- a/omadm/omadmextensions/adapters/imps/rom/nsmldmimpsadapter.iby	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-/*
-* Copyright (c) 2002-2004 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: Implementation of dm adapters
-* 	This is part of omadmextensions.
-*
-*/
-
-
-
-
-#ifndef NSMLDMIMPSADAPTER_IBY
-#define NSMLDMIMPSADAPTER_IBY
-
-
-#ifdef __SYNCML_DM_IMPS
-#ifdef __SYNCML_DM 
-#ifdef __PRESENCE
-ECOM_PLUGIN(nsmldmimpsadapter.dll,nsmldmimpsadapter.rsc)
-#endif //__PRESENCE
-#endif //__SYNCML_DM
-#endif // __SYNCML_DM_IMPS
-
-#endif // NSMLDMIMPSADAPTER_IBY
-
-//  End of File  
\ No newline at end of file
--- a/omadm/omadmextensions/adapters/imps/src/101F9A2A.loc	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-/*
-* Copyright (c) 2002-2004 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:    Device Management IMPS Adapter
-*
-*/
-
-
- 
-
-// r: 
-// v: 
-// i: Localisation text file for Remote Configuration DM IMPS adapter
-
-//b:-1
-//e:-1
-//f:None/Unknown
-//s:None/Unknown
-//d:Display name for DM IMPS settings adapter
-//
-rls_string NSDM_VA_IMPS_DNAME "DM IMPS Settings" 
--- a/omadm/omadmextensions/adapters/imps/src/nsmldmimpsadapter.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2029 +0,0 @@
-/*
-* Copyright (c) 2002-2004 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:    Device Management IMPS Adapter
-*
-*/
-
-
-
-// TaH 3.6.2005 Added the checking of Name, PrefAddr, AAuthName and AAuthSecret lenght. 
-//              and corrected the fetching of PrefConRef parameter.
-// TaH 16.6.2005 Some minor changes done according the code review comments.
-// TaH 8.7.2005 Corrected errors ESBA-6DYMFL, ESBA-6DYNMK and ESBA-6DYMNV
-// TaH 27.9.2005 Dynamic node names changed, 
-//				 reduced number of warnings caused by debug logs writtings.
-
-// INCLUDE FILES
-
-
-#include <msvids.h>
-#include <implementationproxy.h> // For TImplementationProxy definition
-#include <utf.h>
-#include <iapprefs.h>
-#include <commdb.h>
-#include <cdbcols.h>			 // CommsDB columname defs
-#include <sysutil.h>
-#include <e32des8.h>
-#include <cimpssapsettings.h>         //CIMPSSAPSettings
-#include <cimpssapsettingsstore.h>    //CWWVSAPSettingsStore
-#include <cimpssapsettingslist.h>     //CIMPSSAPSettingsList
-#include <featmgr.h>
-#include "nsmldmimpluids.h"
-#include "nsmldmimpsadapter.h"
-#include "nsmldebug.h"
-#include "nsmlconstants.h"
-#include "nsmldmconst.h"
-#include "nsmldmiapmatcher.h"
-#include "nsmldmuri.h"
-
-// EXTERNAL DATA STRUCTURES
-
-// EXTERNAL FUNCTION PROTOTYPES  
-
-// CONSTANTS
-
-// MACROS
-
-// LOCAL CONSTANTS AND MACROS
-
-// MODULE DATA STRUCTURES
-
-// LOCAL FUNCTION PROTOTYPES
-
-// FORWARD DECLARATIONS
-
-#ifndef __WINS__
-// This lowers the unnecessary compiler warning (armv5) to remark.
-// "Warning:  #174-D: expression has no effect..." is caused by 
-// DBG_ARGS8 macro in no-debug builds.
-#pragma diag_remark 174
-#endif
-
-// ============================= LOCAL FUNCTIONS ==============================
-
-// ============================ MEMBER FUNCTIONS ==============================
-	
-// ----------------------------------------------------------------------------
-// CNSmlDmImpsAdapter::CNSmlDmImpsAdapter()
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// ----------------------------------------------------------------------------
-
-CNSmlDmImpsAdapter::CNSmlDmImpsAdapter(TAny* aEcomArguments) : 
-        CSmlDmAdapter(aEcomArguments)
-	{
-	_DBG_FILE( "CNSmlDmImpsAdapter::CNSmlDmImpsAdapter(): begin" );
-	_DBG_FILE( "CNSmlDmImpsAdapter::CNSmlDmImpsAdapter(): end" );
-	}
-
-
-// ----------------------------------------------------------------------------
-// CNSmlDmImpsAdapter::ConstructL()
-// Symbian 2nd phase constructor can leave. 
-// The global variables are created here.
-// ----------------------------------------------------------------------------
-void CNSmlDmImpsAdapter::ConstructL( MSmlDmCallback *aDmCallback )
-	{
-	iCallBack = aDmCallback;
-	FeatureManager::InitializeLibL();
-  iFeatMgrInitialized = ETrue;
-	}
-
-// ----------------------------------------------------------------------------
-// CNSmlDmImpsAdapter* CNSmlDmImpsAdapter::NewL( )
-// Two-phased constructor.
-// ----------------------------------------------------------------------------
-CNSmlDmImpsAdapter* CNSmlDmImpsAdapter::NewL( MSmlDmCallback* aDmCallback )
-	{
-	_DBG_FILE( "CNSmlDmImpsAdapter::NewL(): begin" );
-	CNSmlDmImpsAdapter* self = NewLC( aDmCallback );
-	CleanupStack::Pop();
-	_DBG_FILE( "CNSmlDmImpsAdapter::NewL(): end" );	
-	return self;
-	}
-
-// ----------------------------------------------------------------------------
-// CNSmlDmImpsAdapter* CNSmlDmImpsAdapter::NewLC( )
-// Two-phased constructor.
-// ----------------------------------------------------------------------------
-CNSmlDmImpsAdapter* CNSmlDmImpsAdapter::NewLC( MSmlDmCallback* aDmCallback )
-	{
-	_DBG_FILE( "CNSmlDmImpsAdapter::NewLC(): begin" );
-	CNSmlDmImpsAdapter* self = new( ELeave ) CNSmlDmImpsAdapter( aDmCallback );
-	CleanupStack::PushL( self );
-	self->ConstructL( aDmCallback );
-	_DBG_FILE( "CNSmlDmImpsAdapter::NewLC(): end" );
-	return self;
-	}
-
-
-// ----------------------------------------------------------------------------
-// CNSmlDmImpsAdapter::~CNSmlDmImpsAdapter()    
-// Destructor, the global variables are deleted here.
-// ----------------------------------------------------------------------------
-CNSmlDmImpsAdapter::~CNSmlDmImpsAdapter()
-	{
-	_DBG_FILE( "CNSmlDmImpsAdapter::~CNSmlDmImpsAdapter(): begin" );
-	if(iFeatMgrInitialized)
-    		{
-    			FeatureManager::UnInitializeLib();
-    		}
-
-    _DBG_FILE( "CNSmlDmImpsAdapter::~CNSmlDmImpsAdapter(): end" );
-	}
-
-// ----------------------------------------------------------------------------
-//  CNSmlDmImpsAdapter::DDFVersionL()
-//  The method returns the DDFVersion number.
-// ----------------------------------------------------------------------------
-void CNSmlDmImpsAdapter::DDFVersionL( CBufBase& aDDFVersion )
-	{
-	_DBG_FILE( "CNSmlDmImpsAdapter::DDFVersionL( TDes& aDDFVersion ): begin" );
-	aDDFVersion.InsertL( 0,KNSmlDMImpsDDFVersion );
-	_DBG_FILE( "CNSmlDmImpsAdapter::DDFVersionL( TDes& aDDFVersion ): end" );
-	}
-
-
-// ----------------------------------------------------------------------------
-//  CNSmlDmImpsAdapter::DDFStructureL()
-//  The method creates the DDFStructure
-// ----------------------------------------------------------------------------
-void CNSmlDmImpsAdapter::DDFStructureL( MSmlDmDDFObject& aDDF )
-	{
-	_DBG_FILE( "CNSmlDmImpsAdapter::DDFStructureL(): begin" );
-	
-	TSmlDmAccessTypes allAccessTypes;
-    allAccessTypes.SetAdd();  
-	allAccessTypes.SetDelete();
-	allAccessTypes.SetGet();
-	allAccessTypes.SetReplace();
-
-	TSmlDmAccessTypes accessTypesAddGet;
-    accessTypesAddGet.SetAdd();  
-	accessTypesAddGet.SetGet();
-    
-	TSmlDmAccessTypes accessTypesGet;
-	accessTypesGet.SetGet();
-	
-	TSmlDmAccessTypes accessTypesNoDel;
-    accessTypesNoDel.SetAdd();  
-	accessTypesNoDel.SetGet();
-	accessTypesNoDel.SetReplace();
-
-	TSmlDmAccessTypes accessTypesASecret;
-	accessTypesASecret.SetAdd();
-	accessTypesASecret.SetDelete();
-	accessTypesASecret.SetReplace();
-	
-    
-  // IMPS
-    MSmlDmDDFObject& imps = aDDF.AddChildObjectL( KNSmlDMImpsNodeName );
-    FillNodeInfoL( imps, 
-                    accessTypesGet, 
-                    MSmlDmDDFObject::EOne,
-                    MSmlDmDDFObject::EPermanent, 
-                    MSmlDmDDFObject::ENode, KNSmlDMImpsDescr );
-
-    // run-time node under IMPS
-    // IMPS/<X>
-    MSmlDmDDFObject& rtNode = imps.AddChildObjectGroupL(); 
-    FillNodeInfoL( rtNode, 
-                allAccessTypes,
-                MSmlDmDDFObject::EZeroOrMore, 
-                MSmlDmDDFObject::EDynamic, 
-                MSmlDmDDFObject::ENode, 
-                KNSmlDMDynamicNodeDescr );
-    
-    // AppID
-    MSmlDmDDFObject& appId = rtNode.AddChildObjectL( KNSmlDMImpsAppId );
-    FillNodeInfoL( appId, 
-                   accessTypesAddGet, 
-                   MSmlDmDDFObject::EZeroOrOne, 
-                   MSmlDmDDFObject::EDynamic, 
-                   MSmlDmDDFObject::EChr, 
-                   KNSmlDMImpsAppIDDescr );
-
-    // Name
-    MSmlDmDDFObject& name = rtNode.AddChildObjectL( KNSmlDMImpsName );
-    FillNodeInfoL( name, 
-                   allAccessTypes, 
-                   MSmlDmDDFObject::EZeroOrOne, 
-                   MSmlDmDDFObject::EDynamic, 
-                   MSmlDmDDFObject::EChr, 
-                   KNSmlDMImpsNameDescr );
-
-    // PrefConRef
-    MSmlDmDDFObject& prefConRef = rtNode.AddChildObjectL( KNSmlDMImpsPrefConRef );
-    FillNodeInfoL( prefConRef, 
-                   allAccessTypes, 
-                   MSmlDmDDFObject::EZeroOrOne, 
-                   MSmlDmDDFObject::EDynamic, 
-                   MSmlDmDDFObject::EChr, 
-                   KNSmlDMImpsPrefConRefDescr );
-
-    // PrefAddr
-    MSmlDmDDFObject& prefAddr = rtNode.AddChildObjectL( KNSmlDMImpsPrefAddr );
-    FillNodeInfoL( prefAddr, 
-                   allAccessTypes, 
-                   MSmlDmDDFObject::EZeroOrOne, 
-                   MSmlDmDDFObject::EDynamic, 
-                   MSmlDmDDFObject::EChr, 
-                   KNSmlDMImpsPrefAddrDescr );
-
-    // AppAuth
-    MSmlDmDDFObject& appAuth = rtNode.AddChildObjectL( KNSmlDMImpsAppAuth );
-    FillNodeInfoL( appAuth, 
-                   allAccessTypes, 
-                   MSmlDmDDFObject::EZeroOrOne,
-                   MSmlDmDDFObject::EDynamic,
-                   MSmlDmDDFObject::ENode,
-                   KNSmlDMImpsAppAuthDescr );
-	
-    // Run-time node under AppAuth
-    MSmlDmDDFObject& rtNodeAppAuth = appAuth.AddChildObjectGroupL(); 
-    FillNodeInfoL( rtNodeAppAuth, 
-                   allAccessTypes, 
-                   MSmlDmDDFObject::EZeroOrMore, 
-                   MSmlDmDDFObject::EDynamic, 
-                   MSmlDmDDFObject::ENode, 
-                   KNSmlDMDynamicNodeDescr );
-
-    // AAuthLevel
-    MSmlDmDDFObject& AAuthLevel = rtNodeAppAuth.AddChildObjectL( KNSmlDMImpsAAuthLevel );
-    FillNodeInfoL( AAuthLevel,
-                   allAccessTypes,
-                   MSmlDmDDFObject::EOne,
-                   MSmlDmDDFObject::EDynamic,
-                   MSmlDmDDFObject::EChr,
-                   KNSmlDMImpsAAuthLevelDescr );
-
-    // AAuthName
-    MSmlDmDDFObject& AAuthName = rtNodeAppAuth.AddChildObjectL( KNSmlDMImpsAAuthName );
-    FillNodeInfoL( AAuthName,
-                   allAccessTypes,
-                   MSmlDmDDFObject::EZeroOrOne,
-                   MSmlDmDDFObject::EDynamic,
-                   MSmlDmDDFObject::EChr,
-                   KNSmlDMImpsAAuthNameDescr );
-
-    // AAuthSecret
-    MSmlDmDDFObject& AAuthSecret = rtNodeAppAuth.AddChildObjectL( KNSmlDMImpsAAuthSecret );
-    FillNodeInfoL( AAuthSecret,
-                   accessTypesASecret,
-                   MSmlDmDDFObject::EZeroOrOne,
-                   MSmlDmDDFObject::EDynamic,
-                   MSmlDmDDFObject::EChr,
-                   KNSmlDMImpsAAuthSecretDescr );
-
-    // Services
-    MSmlDmDDFObject& service = rtNode.AddChildObjectL( KNSmlDMImpsServices );
-    FillNodeInfoL( service, 
-                   accessTypesNoDel, 
-                   MSmlDmDDFObject::EZeroOrOne, 
-                   MSmlDmDDFObject::EDynamic, 
-                   MSmlDmDDFObject::EChr, 
-                   KNSmlDMImpsServicesDescr );
-
-    // Ext
-    MSmlDmDDFObject& extNode = rtNode.AddChildObjectL( KNSmlDMImpsExtNode );
-    FillNodeInfoL( extNode, 
-                   allAccessTypes, 
-                   MSmlDmDDFObject::EZeroOrOne,
-                   MSmlDmDDFObject::EDynamic,
-                   MSmlDmDDFObject::ENode, 
-                   KNSmlDMImpsExtNodeDescr );
-
-    // PEPCompliant
-    MSmlDmDDFObject& pepCompliant = extNode.AddChildObjectL( KNSmlDMImpsPepCompliant );
-    FillNodeInfoL( pepCompliant, 
-                   allAccessTypes, 
-                   MSmlDmDDFObject::EOne, 
-                   MSmlDmDDFObject::EDynamic, 
-                   MSmlDmDDFObject::EBool, 
-                   KNSmlDMImpsPepCompliantDescr );
-            
-	_DBG_FILE( "CNSmlDmImpsAdapter::DDFStructureL(): end" );
-	}
-
-// ----------------------------------------------------------------------------
-// CNSmlDmImpsAdapter::AddNodeObjectL()
-// The method adds new node.
-// - Check number of uri segments
-// - If number of segements = 2
-//  	 - Read all dynamic nodes under IMPS from the DMTree
-//  	 - Check that the new node name does not already exist
-//	   - If exists
-//	    --> return error status "AlreadyExists"
-//	   - If does not exist, create new SAP to the database 
-//              and use the node name as temporary SAP name
-//	   - Map the received index to the URI.
-// - If number of segments = 3 or 4
-//     - Check that there exists a SAP with given LUID value in db
-//	   - If does not exist
-//		  --> return error status "NotFound"
-//	   - If exists
-//	    --> if number of segments = 4
-//		    - check that there does not already exist the dynamic node 
-//                  ( only one dynamic allowed )
-//			  - if exists
-// 			   --> Return error status invalid object
-//	   - Set mapping for DB index and URI.
-// ----------------------------------------------------------------------------
-void CNSmlDmImpsAdapter::AddNodeObjectL( const TDesC8& aURI, 
-        const TDesC8& aParentLUID, const TInt aStatusRef )
-	{
-	_DBG_FILE( "CNSmlDmImpsAdapter::AddNodeObjectL(): begin" );
-
-    CIMPSSAPSettings* ownSap = CIMPSSAPSettings::NewL();
-	CleanupStack::PushL( ownSap );
-    CIMPSSAPSettingsStore* ownStore = CIMPSSAPSettingsStore::NewL();
-	CleanupStack::PushL( ownStore );
-    CIMPSSAPSettingsList* ownList = CIMPSSAPSettingsList::NewL();   
-	CleanupStack::PushL( ownList );
-
-    CSmlDmAdapter::TError status = CSmlDmAdapter::EOk;
-    TInt numOfSegs = NSmlDmURI::NumOfURISegs( aURI );
-    TPtrC8 checkedNode = NSmlDmURI::LastURISeg( aURI );
-    
-    if ( ( numOfSegs == 2 ) && 
-         ( aURI.Match( KNSmlDMImpsRootAndDyn ) != KErrNotFound ) )
-        {   
-        status = CSmlDmAdapter::EOk;
-
-        // Read all dynamic nodes under IMPS from tree
-        CSmlDmAdapter::TError stat;
-        CBufBase *allNodes = CBufFlat::NewL( KNSmlDMReservingData );
-    	CleanupStack::PushL( allNodes );
-	    iCallBack->FetchLinkL( KNSmlDMImpsNodeName, *allNodes, stat );
-
-        // Check if the second node is found
-        TInt startIndex = 0;        
-        for( TInt i = 0; i < allNodes->Size(); i++ )
-            {
-            if( allNodes->Ptr(0)[i] == '/' || i == allNodes->Size()-1 )
-                {
-                TPtrC8 uriSeg8Ptr = allNodes->Ptr( startIndex ).Mid( 0, i-startIndex );    			                
-                if ( uriSeg8Ptr.Compare( checkedNode ) == 0 )        
-                    {
-                    status = EAlreadyExists;
-                    break;
-                    }
-                startIndex = i + 1;
-                }  // if ( allNodes->Ptr )            
-            } // for
-        CleanupStack::PopAndDestroy(); // allNodes
-
-        if  ( status == CSmlDmAdapter::EOk )
-            {
-            // the item does not exist - create it to the db    
-            RFs fs;
-            User::LeaveIfError( fs.Connect() );
-            CleanupClosePushL( fs );
-            if ( SysUtil::FFSSpaceBelowCriticalLevelL( &fs, 
-                                                       KNSmlDMSAPSettings ) )
-	            {
-                _DBG_FILE( "CNSmlDmImpsAdapter::AddNodeObjectL(): DISK FULL end" );
-                status = CSmlDmAdapter::EDiskFull; // Disk full
-                }
-            else
-                {
-                ResetSapL( ownSap );
-                
-                TBufC8<5> tmpName( KNSmlDMImpsName ); 
-                status = UpdateValueL( tmpName, checkedNode, ownSap );
-				if ( status == CSmlDmAdapter::EOk  )
-    				{ 		        			    
-					TUint32 uid32 = ownStore->StoreNewSAPL( ownSap, EIMPSIMAccessGroup );
-					TInt uid( uid32 );
-				    _DBG_FILE( "CNSmlDmImpsAdapter::AddNodeObjectL(): New SAP added" );
-      		    	HBufC8 *luidDes = IntToDes8LC( uid );
-	            	iCallBack->SetMappingL( aURI, *luidDes );
-       		    	CleanupStack::PopAndDestroy(); // luidDes
-    				}
-                }  //disk size
-            CleanupStack::PopAndDestroy(); // fs
-            }
-        }
-	// AppAuth nodes        
-    else if ( ( ( numOfSegs == 3 ) && 
-                ( aURI.Match( KNSmlDMImpsWholeAppAuthUri ) != KErrNotFound ) )
-           || ( ( numOfSegs == 4 ) && 
-                ( aURI.Match( KNSmlDMImpsWholeAppAuthDynUri ) != KErrNotFound ) ) )
-        {
-    	  if( aParentLUID.Length() > 0 )
-		    {
-        // Check that Store is not empty
-        // causes leaving if empty db is tried to read
-        	TInt count = 0;
-        	count = ownStore->SAPCountL( EIMPSAccessFilterAll );
-        	DBG_ARGS8(_S8("IMPS::Count of SAPs in store = %d \n"), count );
-            if ( count > 0 )
-                {
-    	        TInt uid = DesToInt( aParentLUID );
-    	        TUint32 uid32( uid );
-                ownStore->PopulateSAPSettingsListL( *ownList, 
-                                                    EIMPSAccessFilterAll );
-                _DBG_FILE( "CNSmlDmImpsAdapter::AddNodeObjectL(): SAP settings list" );
-               	TBool found = EFalse;
-                for ( TInt i = 0; i < count; i++ )
-                    {
-                    TUint32 id32 = ownList->UidForIndex( i );
-                    if ( id32 == uid32 )
-                        {
-                        found = ETrue;
-                        if ( numOfSegs == 4 )
-                            {
-                            // There can be only one dynamic node, 
-                            // check that there is not one
-                            TPtrC8 ptrToParentUri = NSmlDmURI::RemoveLastSeg( aURI );
-	                            // Read dynamic nodes under AppAuth from tree
-                            CSmlDmAdapter::TError stat;
-                            CBufBase *dynNodes = CBufFlat::NewL( KNSmlDMReservingData );
-    	                    CleanupStack::PushL( dynNodes );
-	                        iCallBack->FetchLinkL( ptrToParentUri, *dynNodes, stat );
-	                        TInt len = dynNodes->Size();	                        
-                            if ( len > 0 )                             
-                                {
-                                status = EInvalidObject;
-                                }
-                            else
-                                {
-                                iCallBack->SetMappingL( aURI, aParentLUID );
-                                }
-                            CleanupStack::PopAndDestroy(); // dynNodes
-                            }
-                        else
-                            {
-            	    	    iCallBack->SetMappingL( aURI, aParentLUID );
-                            }
-                        break;
-                        }
-                    } // for
-		                    
-                if ( !found )
-                    {
-   	                status = CSmlDmAdapter::ENotFound;
-       	            }            
-                } // count
-            }  // aParentLUID length
-        else
-        	{
-	        status = CSmlDmAdapter::ENotFound;
-            }  
-        } // aParentLUID length
-        
-	// Ext node
-   	else if ( ( numOfSegs == 3 ) && 
-   	          ( aURI.Match( KNSmlDMImpsWholeExtUri ) != KErrNotFound ) )
-		{
-       	if( aParentLUID.Length() > 0 )
-		    {
-        // Check that Store is not empty
-        // causes leaving if empty db is tried to read
-        	TInt count = 0;
-            count = ownStore->SAPCountL( EIMPSAccessFilterAll );
-            DBG_ARGS8(_S8("IMPS::Count of SAPs in store = %d \n"), count );
-            if ( count > 0 )
-                {
-   	        	TInt uid = DesToInt( aParentLUID );
-   	        	TUint32 uid32( uid );
-                ownStore->PopulateSAPSettingsListL( *ownList, EIMPSAccessFilterAll );
-                _DBG_FILE( "CNSmlDmImpsAdapter::AddNodeobjectL(): SAP settings list" );
-                TBool found = EFalse;
-                for ( TInt i = 0; i < count; i++ )
-                    {
-                    TUint32 id32 = ownList->UidForIndex( i );
-                    if ( id32 == uid32 )
-                        {
-                        found = ETrue;
-          	    	    iCallBack->SetMappingL( aURI, aParentLUID );
-                        break;
-                        }
-                    } // for
-                if ( !found )
-                    {
-                    status = CSmlDmAdapter::ENotFound;
-                    }            
-	            } // count            	
-            }  // aParentLUID length
-        else
-        	{
-	        status = CSmlDmAdapter::ENotFound;
-            }  
-        } // aParentLUID length
-        
-    else 
-        {
-        status = CSmlDmAdapter::EInvalidObject;
-        }
-
-    CleanupStack::PopAndDestroy( 3 ); // ownList, ownStore, ownSap
-
-    iCallBack->SetStatusL( aStatusRef, status );
-    _DBG_FILE( "CNSmlDmImpsAdapter::AddNodeObjectL(): end" );
-
-    return;
-	}
-
-
-// ----------------------------------------------------------------------------
-//  CNSmlDmImpsAdapter::UpdateLeafObjectL()
-//  The method updates the leaf value.
-//  - Check that LUID length > 0
-//	- Check that there exists SAP with uid which is same as received LUID value.
-//  - If exists
-//	  --> update received parameter value to db
-//  - else
-//	  --> return error status
-// ----------------------------------------------------------------------------
-void CNSmlDmImpsAdapter::UpdateLeafObjectL( const TDesC8& aURI, 
-                                            const TDesC8& aLUID, 
-                                            const TDesC8& aObject, 
-											const TDesC8& /*aType*/, 
-											TInt aStatusRef )	
-    {
-    _DBG_FILE( "CNSmlDmImpsAdapter::UpdateLeafObjectL(): begin" );
-
-// Used only in Test purpose
-//   TBuf8<50> tmpUriBuf = aURI;
-//   TBuf8<50> tmpLuidBuf = aLUID;   
-//   DBG_ARGS8(_S8("IMPS Luid / Uri : Luid = %S  Uri = %S \n"), &tmpLuidBuf, &tmpUriBuf );     
-
-    CSmlDmAdapter::TError status = CSmlDmAdapter::EOk;
-
-    CIMPSSAPSettings* ownSap = CIMPSSAPSettings::NewL();
-    CleanupStack::PushL( ownSap );
-    CIMPSSAPSettingsStore* ownStore = CIMPSSAPSettingsStore::NewL();
-    CleanupStack::PushL( ownStore );
-
-    TPtrC8 lastSeg = NSmlDmURI::LastURISeg( aURI );
-
-    if( aLUID.Length() > 0 )
-        {	    
-        // Check that Store is not empty and find the correct SAP
-        TInt sapFound = GetCorrectSapL( aLUID, 
-                                        ownSap, 
-                                        ownStore );                    	  	
-        if ( sapFound == KErrNone )                    	  
-            {        
-            if ( lastSeg.Compare( KNSmlDMImpsPepCompliant ) == 0 )
-                {
-                TInt stat = UpdatePEPValueL( aURI, 
-                                             aObject, 
-                                             aLUID, 
-                                             ownSap, 
-                                             ownStore );
-                if ( stat != KErrNone )
-                    { 
-                    status = CSmlDmAdapter::EError;
-                    }
-                }
-            else if ( lastSeg.Compare( KNSmlDMImpsAppId ) == 0 )
-                {
-                // Only value "wA" is accepted for AppID parameter
-                if ( aObject.Compare( KNSmlDMImpsDefaultAppID ) != 0 )
-                    {
-                    status = CSmlDmAdapter::EInvalidObject;
-                    }	  		
-                }			  				  	
-            else
-                {
-                TInt uid = DesToInt( aLUID );
-                TUint32 Uid32( uid );
-                status = UpdateValueL( lastSeg, aObject, ownSap );        
-                if ( status == KErrNone )
-                    {    
-                    ownStore->UpdateOldSAPL( ownSap, Uid32 );					
-                    _DBG_FILE( "CNSmlDmImpsAdapter::UpdateLeafObjectL(): SAP updated" );
-                    }		  	
-                }
-            }	// sapFound
-    		  			  	
-        else if ( sapFound == KErrNotFound )                    	 
-            {      		
-            status = CSmlDmAdapter::ENotFound;
-            }  
-        else
-            {
-            status = CSmlDmAdapter::EError;
-            }
-        } // aLUID length
-    else
-        {
-        status = CSmlDmAdapter::ENotFound;
-        }  
-
-    iCallBack->SetStatusL( aStatusRef, status );
-
-    CleanupStack::PopAndDestroy( 2 ); // ownStore, ownSap
-
-    _DBG_FILE( "CNSmlDmImpsAdapter::UpdateLeafObjectL( ): end" );
-    	
-    return;
-    }
-
-// ----------------------------------------------------------------------------
-//  CNSmlDmImpsAdapter::UpdateLeafObjectL()
-//  Method not used. Used if streaming in use.
-// ----------------------------------------------------------------------------
-void CNSmlDmImpsAdapter::UpdateLeafObjectL( const TDesC8& /*aURI*/, 
-                                            const TDesC8& /*aLUID*/, 
-                                            RWriteStream*& /*aStream*/, 
-                                            const TDesC8& /*aType*/, 
-                                            TInt aStatusRef )
-    {
-    _DBG_FILE( "CNSmlDmImpsAdapter::UpdateLeafObjectL(): begin" );
-    iCallBack->SetStatusL(aStatusRef, CSmlDmAdapter::EError);
-    _DBG_FILE( "CNSmlDmImpsAdapter::UpdateLeafObjectL( ): end" );
-    }
-
-// ----------------------------------------------------------------------------
-// void CNSmlDmImpsAdapter::FetchLeafObjectSizeL()
-// Fetches data object and returns its size.
-// - Take last URI segment and request the value for requested parameter 
-//      by using method FetchObjectL.
-// - Take the size of received parameter value and change it to descriptor
-// - Return the size and status
-// ----------------------------------------------------------------------------
-void CNSmlDmImpsAdapter::FetchLeafObjectSizeL( const TDesC8& aURI, 
-                                               const TDesC8& aLUID, 
-                                               const TDesC8& aType, 
-                                               const TInt aResultsRef, 
-                                               const TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlDmImpsAdapter::FetchLeafObjectSizeL(): begin");
-
-    CBufBase *currentURISegmentList = CBufFlat::NewL( KNSmlDMReservingMaxData );
-    CleanupStack::PushL( currentURISegmentList );
-    TPtrC8 fetchedLeaf = NSmlDmURI::LastURISeg( aURI );    
-
-    CSmlDmAdapter::TError status = FetchObjectL( fetchedLeaf, 
-                                                 aLUID, 
-                                                 *currentURISegmentList );
-
-    if ( status == CSmlDmAdapter::EOk )
-        {
-        TInt objSizeInBytes = currentURISegmentList->Size();
-        TBuf8<16> stringObjSizeInBytes;
-        stringObjSizeInBytes.Num( objSizeInBytes );
-        currentURISegmentList->Reset();
-        currentURISegmentList->InsertL( 0, stringObjSizeInBytes );
-
-        iCallBack->SetResultsL( aResultsRef, *currentURISegmentList, aType );
-        }
-
-    iCallBack->SetStatusL( aStatusRef, status );
-    CleanupStack::PopAndDestroy();  //currentURISegmentList
-	
-    _DBG_FILE("CNSmlDmImpsAdapter::FetchLeafObjectSizeL(): end");
-    }
-    
-// ----------------------------------------------------------------------------
-// CNSmlDmImpsAdapter::DeleteObjectL()
-// The method deletes the requested parameter values.
-// - Check number of segments
-// - If number of segments > 2
-// 	 --> check that the SAP which the deletion involves exists in DB 
-//          and get SAP to ownSap
-//   - If number of segments = 2
-//	   --> delete whole SAP from the DB
-//	 - If number of segments > 2 and <= 5
-//	   --> check the requested parameter and delete the value from it in DB
-// - If number of segments < 1 or > 5 or given SAP is not found from DB
-//	 --> return error status
-// ----------------------------------------------------------------------------
-void CNSmlDmImpsAdapter::DeleteObjectL( const TDesC8& aURI, 
-                                        const TDesC8& aLUID, 
-                                        TInt aStatusRef )
-    {
-    _DBG_FILE( "CNSmlDmImpsAdapter::DeleteLeafObjectL( ): begin" );
-
-    CIMPSSAPSettings* ownSap = CIMPSSAPSettings::NewL();
-    CleanupStack::PushL( ownSap );
-    CIMPSSAPSettingsStore* ownStore = CIMPSSAPSettingsStore::NewL();
-    CleanupStack::PushL( ownStore );
-
-    CSmlDmAdapter::TError status = CSmlDmAdapter::EOk;
-
-    // Check the number of uri segments to find out is a node or a leaf deleted 
-    TInt numOfSegs = NSmlDmURI::NumOfURISegs( aURI );
-
-    if ( numOfSegs < 2 || numOfSegs > 5 )
-        {
-        // Sap does not exist, return error status
-        status = CSmlDmAdapter::EInvalidObject;
-        iCallBack->SetStatusL( aStatusRef, status );
-        return;
-        }
-
-    if( aLUID.Length() > 0 )
-        {
-        // Check that Store is not empty, 
-        // causes leaving if empty db is tried to read
-        TInt sapFound = KErrNotFound;
-        sapFound = GetCorrectSapL( aLUID, 
-                                   ownSap, 
-                                   ownStore ); 
-        if ( sapFound == KErrNone )
-            {   		
-            TInt uid = DesToInt( aLUID );
-            TUint32 Uid32( uid );
-            if ( numOfSegs == 2 )
-                {
-                // delete SAP
-                ownStore->DeleteSAPL( Uid32 );
-                _DBG_FILE( "CNSmlDmImpsAdapter::DeleteObjectL(): SAP deleted" );
-                }  // if numOfSegs
-            else 
-                {            
-                TPtrC8 deletedLeaf = NSmlDmURI::LastURISeg( aURI );    
-                if ( ( deletedLeaf.Compare( KNSmlDMImpsPepCompliant ) == 0 ) ||              
-                   ( deletedLeaf.Compare( KNSmlDMImpsExtNode ) == 0 ) )
-                    {
-                    TBuf8<5> tmpPep( KNSmlDMImpsDefaultIM );  //False		    	    
-                    TInt stat = EOk;
-                    if ( deletedLeaf.Compare( KNSmlDMImpsExtNode ) == 0 )
-                        {
-                        HBufC8 *tmpUri = HBufC8::NewLC( aURI.Length() + 14 );
-                        TPtr8 tmpUriPtr = tmpUri->Des();
-
-                        // URI: IMPS/<x>/PEPCompliant
-                        tmpUriPtr.Format( aURI );
-                        tmpUriPtr.Append( KNSmlDMImpsSeparator8 );
-                        tmpUriPtr.Append( KNSmlDMImpsPepCompliant );
-                        stat = UpdatePEPValueL( tmpUriPtr, 
-                                                tmpPep, 
-                                                aLUID, 
-                                                ownSap, 
-                                                ownStore );
-                        CleanupStack::PopAndDestroy();  // tmpUri
-                        }
-                    else
-                        {
-                        stat = UpdatePEPValueL( aURI, 
-                                                tmpPep, 
-                                                aLUID, 
-                                                ownSap, 
-                                                ownStore );                    
-                        }
-                    if ( stat != KErrNone )
-                        { 
-                        status = CSmlDmAdapter::EError;
-                        }
-                    }  // stat
-                else
-                    {
-                    status  = DeleteValueL( aURI, ownSap );
-                    if ( status == EOk )
-                        {                        
-                        // update the SAP to db 
-                        ownStore->UpdateOldSAPL( ownSap, Uid32 );
-                        _DBG_FILE( "CNSmlDmImpsAdapter::DeleteObjectL(): SAP updated" );
-                        }			  		                	
-                    }  // status 
-                } // numOfSegs
-            }  // sapFound
-        else if ( sapFound == KErrNotFound )                    	 
-            {      		
-            status = CSmlDmAdapter::ENotFound;
-            }  
-        else
-            {
-            status = CSmlDmAdapter::EError;
-            }
-        }  // LUID length
-    else
-        {
-        status = CSmlDmAdapter::ENotFound;
-        }
-    
-    iCallBack->SetStatusL( aStatusRef, status );
-
-    CleanupStack::PopAndDestroy( 2 );  // ownSap, ownStore
-
-    _DBG_FILE( "CNSmlDmImpsAdapter::DeleteLeafObjectL( ): end" );
-
-    return;
-    }
-    
-// ----------------------------------------------------------------------------
-//  CNSmlDmImpsAdapter::FetchLeafObjectL()
-// The method returns the requested parameter value from DB
-// - Take last URI segment and request the value for requested parameter 
-//          by using method FetchObjectL.
-// - Return the parameter value and status
-// ----------------------------------------------------------------------------
-void CNSmlDmImpsAdapter::FetchLeafObjectL( const TDesC8& aURI, 
-                                           const TDesC8& aLUID, 
-                                           const TDesC8& aType, 
-                                           TInt aResultsRef, 
-                                           TInt aStatusRef )
-    {
-    _DBG_FILE( "CNSmlDmImpsAdapter::FetchLeafObjectL(): begin" );    
-
-    CBufBase *currentURISegmentList = CBufFlat::NewL( KNSmlDMReservingMaxData );
-    CleanupStack::PushL( currentURISegmentList );
-    TPtrC8 fetchedLeaf = NSmlDmURI::LastURISeg( aURI );    
-    CSmlDmAdapter::TError status = FetchObjectL( fetchedLeaf, 
-                                                 aLUID, 
-                                                 *currentURISegmentList );
-
-    if ( status == CSmlDmAdapter::EOk )
-        {
-        iCallBack->SetResultsL( aResultsRef, *currentURISegmentList, aType );
-        }
-
-    iCallBack->SetStatusL( aStatusRef, status );
-    CleanupStack::PopAndDestroy();  //currentURISegmentList
-
-    _DBG_FILE( "CNSmlDmImpsAdapter::FetchLeafObjectL(): end" );
-
-    return;
-    }
-
-
-// ----------------------------------------------------------------------------
-//  void CNSmlDmImpsAdapter::ChildURIListL()
-//  The method returns the child nodes or leafs under requested node. 
-//  - Check number of URI segments. 
-//  - If number of segments = 1
-//    --> check if the dynamic node name is found by setting the DB uid
-//              against the LUID value in aPreviousURISegmentList 
-// 	      - If the name is found, it is taken to the result list, 
-//		  - else the index number of SAP is converted to the name 
-//              and returned as node name
-//  - If number of segments > 1 and < 5
-//	  --> check that given LUID is found as index in DB 
-//              and get the SAP data to ownSap
-//      - if number of segments = 2 or 4
-//		  --> return parameter under dynamic node
-// 	    - if number of segments = 3
-//		  --> return the name of dynamic node under AppAuth node.
-//  - Return the results and status
-//  - In error case return error status
-// ----------------------------------------------------------------------------
-void CNSmlDmImpsAdapter::ChildURIListL( const TDesC8& aURI, 
-                                        const TDesC8& aLUID, 
-                                        const CArrayFix<TSmlDmMappingInfo>& aPreviousURISegmentList, 
-                                        TInt aResultsRef, 
-                                        TInt aStatusRef )
-    {
-    _DBG_FILE( "CNSmlDmImpsAdapter::ChildURIListL(): begin" );
-        
-// Used only in Test purpose
-//   TBuf8<50> tmpUriBuf = aURI;
-//   TBuf8<50> tmpLuidBuf = aLUID;   
-//   DBG_ARGS8(_S8("IMPS Luid / Uri : Luid = %S  Uri = %S \n"), &tmpLuidBuf, &tmpUriBuf );     
-        
-    CSmlDmAdapter::TError status = CSmlDmAdapter::EOk;    
-                        
-    CIMPSSAPSettings* ownSap = CIMPSSAPSettings::NewL();
-    CleanupStack::PushL( ownSap );
-    CIMPSSAPSettingsStore* ownStore = CIMPSSAPSettingsStore::NewL();
-    CleanupStack::PushL( ownStore );
-    CIMPSSAPSettingsList* ownList = CIMPSSAPSettingsList::NewL();   
-    CleanupStack::PushL( ownList );
-
-    TInt numOfSegs = NSmlDmURI::NumOfURISegs( aURI );
-
-    CBufBase *currentURISegmentList = CBufFlat::NewL( KNSmlDMReservingMaxData );
-    CleanupStack::PushL( currentURISegmentList );
-
-    if ( numOfSegs == 1 )
-        {
-        if ( aURI.Compare( KNSmlDMImpsNodeName ) == 0 )
-            {   
-            ownStore->PopulateSAPSettingsListL( *ownList, EIMPSAccessFilterAll );
-            _DBG_FILE( "CNSmlDmImpsAdapter::ChildURIListL(): SAP settings list" );
-            TInt32 id32; 
-            TInt count = 0;
-            count = ownStore->SAPCountL( EIMPSAccessFilterAll );			
-            DBG_ARGS8(_S8("IMPS::Count of SAPs in store = %d "), count );
-            TInt prevUriSegListCount = aPreviousURISegmentList.Count();
-            DBG_ARGS8(_S8("IMPS::Count of luids in prevUriSegList = %d "), 
-                           prevUriSegListCount );
-			
-            for ( TInt i = 0; i < count; i++ )
-                {
-                id32 = ownList->UidForIndex( i );
-                TInt id( id32 );
-                DBG_ARGS8(_S8("IMPS::Sap id = %d"), id );
-		
-                HBufC8* name=0;
-                TBool found = EFalse;
-                // Go through the previousUriSegmentList
-			 
-                for( TInt prevListIx = 0; 
-                     prevListIx < aPreviousURISegmentList.Count(); 
-                     prevListIx++ )
-                    {
-                     // Check if the Sap id is found from segment list
-                    if( id == DesToInt( aPreviousURISegmentList.At( prevListIx ).iURISegLUID ) )
-                        {
-                        found = ETrue;
-                        // If id is found, take the urisegment from segment list
-                        name = aPreviousURISegmentList.At( prevListIx ).iURISeg.AllocLC();
-                        DBG_ARGS8(_S8("InList: Id = %d Seg %S"), id, 
-                                  &aPreviousURISegmentList.At( prevListIx ).iURISeg);                                            
-                        break;
-                        }
-                    } // for prevListIx
-                if( !found )
-                    {
-                    // id not found from previousUriSegmentList
-                    // change the id to segment name
-
-                    name = HBufC8::NewLC( 20 ); 
-                    TPtr8 namePtr = name->Des();
-                    namePtr = KNSMLDMImpsDynNodeName;
-                    namePtr.AppendNum( i+1 );
-
-                    HBufC8 *uri = HBufC8::NewLC( aURI.Length() + name->Length() + 1 );
-                    TPtr8 uriPtr = uri->Des();
-                    // Format the whole URI
-                    uriPtr.Format( aURI );
-                    uriPtr.Append( KNSmlDMImpsSeparator );
-                    uriPtr.Append( name->Des() );
-                    HBufC8 *luid = IntToDes8LC( id );
-                    // Map the received uri to id
-                    iCallBack->SetMappingL( uriPtr, *luid );
-    	    		
-// Used only in Test purpose
-//    	    		TBuf8<50> uriBuf = uriPtr;
-//                    DBG_ARGS8(_S8("NotInList, mapping done: Luid = %d  Uri = %S "), 
-//                                   id, &uriBuf );
-      	    		   		
-                    CleanupStack::PopAndDestroy( 2 ); //uri,luid
-                    }                    
-                TPtr8 namePtr = name->Des();
-                currentURISegmentList->InsertL( currentURISegmentList->Size(), 
-                                                namePtr );
-                if( i + 1 < count )
-                    {
-                    currentURISegmentList->InsertL( currentURISegmentList->Size(), 
-                                                    KNSmlDMImpsSeparator8 );
-                    }
-                CleanupStack::PopAndDestroy( ); // name              
-                } // for i < count
-              
-            iCallBack->SetResultsL( aResultsRef, 
-                                    *currentURISegmentList, 
-                                    KNullDesC8 );	            			                
-            }  // aUri
-        else 
-            {
-            status = CSmlDmAdapter::EInvalidObject;
-            }  // aUri
-        } 
-    else if ( ( numOfSegs > 1 ) && ( numOfSegs < 5 ) )
-        {
-        if( aLUID.Length() > 0 )
-            {                   
-            // Check that Store is not empty
-            // causes leaving if empty db is tried to read
-            TInt sapFound = KErrNotFound;
-            sapFound = GetCorrectSapL( aLUID, ownSap, ownStore );
-            if ( sapFound == KErrNone)
-                {
-                if ( ( numOfSegs == 2 ) && 
-                     ( aURI.Match( KNSmlDMImpsRootAndDyn ) != KErrNotFound ) )
-                    {
-                    // List leafs
-                    currentURISegmentList->InsertL( currentURISegmentList->Size(), 
-                                                    KNSmlDMImpsRtNode() );
-                                                                        
-                    iCallBack->SetResultsL( aResultsRef, 
-                                            *currentURISegmentList, 
-                                            KNullDesC8 );
-                    }  // numOfSegs
-                else if ( ( numOfSegs == 3 ) && 
-                          ( aURI.Match( KNSmlDMImpsWholeExtUri ) != KErrNotFound ) )
-                    {
-                    currentURISegmentList->InsertL( currentURISegmentList->Size(), 
-                                                    KNSmlDMImpsPepCompliant() );            
-                    iCallBack->SetResultsL( aResultsRef, 
-                                            *currentURISegmentList, 
-                                            KNullDesC8 );
-                    }
-                else if ( ( numOfSegs == 3 ) && 
-                          ( aURI.Match( KNSmlDMImpsWholeAppAuthUri ) != KErrNotFound ) )
-                    {
-                    HBufC8* name=0;
-                    TInt count = aPreviousURISegmentList.Count();
-                    if ( count > 0 ) 
-                        {
-                        for( TInt prevListIx = 0; prevListIx < count; prevListIx++ )
-                            {
-                            name = aPreviousURISegmentList.At( prevListIx ).iURISeg.AllocLC();
-                            TPtr8 namePtr = name->Des();
-                            currentURISegmentList->InsertL( currentURISegmentList->Size(), 
-                                                            namePtr );                 
-                            if( prevListIx + 1 < count )
-                                {
-                                currentURISegmentList->InsertL( currentURISegmentList->Size(), 
-                                                                KNSmlDMImpsSeparator8 );
-                                }
-                            CleanupStack::PopAndDestroy();  // name
-                            } // for
-                        }  // if count > 0
-                    else
-                        {
-                        if ( ( ownSap->SAPUserId().Compare(KNSmlDMImpsNotDefined ) == 0 ) &&
-                             ( ownSap->SAPUserPassword().Compare(KNSmlDMImpsNotDefined ) == 0 ) )
-                            {                    
-                            }
-                        else
-                            {
-                            HBufC8 *uri = HBufC8::NewLC( aURI.Length() + 9 );
-                            TPtr8 uriPtr = uri->Des();
-                            uriPtr.Format( aURI );
-                            uriPtr.Append( KNSmlDMImpsSeparator );
-                            uriPtr.Append( KNSmlDMRtNode );
-                            iCallBack->SetMappingL( uriPtr, aLUID );
-                            currentURISegmentList->InsertL( currentURISegmentList->Size(), 
-                                                            KNSmlDMRtNode8() );
-                            CleanupStack::PopAndDestroy(); //uri
-                            }
-                        }
-                    iCallBack->SetResultsL( aResultsRef, 
-                                            *currentURISegmentList, 
-                                            KNullDesC8 );                              
-                    }
-                else if ( ( numOfSegs == 4 ) && 
-                          ( aURI.Match( KNSmlDMImpsWholeAppAuthDynUri ) != KErrNotFound ) )
-                    {
-                    currentURISegmentList->InsertL( currentURISegmentList->Size(), 
-                                                    KNSmlDMAppAuthRtNode() );            
-                    iCallBack->SetResultsL( aResultsRef, 
-                                            *currentURISegmentList, 
-                                            KNullDesC8 );
-                    }                                                              
-                else
-                    {
-                    status = CSmlDmAdapter::EInvalidObject;
-                    }
-                }  // sapFound
-            else if ( sapFound == KErrNotFound )                    	 
-                {      		
-                status = CSmlDmAdapter::ENotFound;
-                }  
-            else
-                {
-                status = CSmlDmAdapter::EError;
-                }
-            }  // luid len
-        else  
-            {
-            status = CSmlDmAdapter::ENotFound;
-            }
-        } // numOfSegs
-    else 
-        {
-        status = CSmlDmAdapter::EInvalidObject;
-        }
-
-// Used only in Test purpose
-    DBG_ARGS8(_S8("Status = %d \n"), status );       
-        
-    iCallBack->SetStatusL( aStatusRef, status );
-    
-    CleanupStack::PopAndDestroy( 4 ); // currentUriSegmentList, ownSap, ownStore, ownList
-
-    _DBG_FILE( "CNSmlDmImpsAdapter::ChildURIListL(): end" );
-    return;
-    }
-
-// ----------------------------------------------------------------------------
-// CNSmlDmImpsAdapter::CompleteOutstandingCmdsL()
-// ----------------------------------------------------------------------------
-void CNSmlDmImpsAdapter::CompleteOutstandingCmdsL()
-    {
-    _DBG_FILE( "CNSmlDmImpsAdapter::EndMessageL(): begin" );
-    _DBG_FILE( "CNSmlDmImpsAdapter::EndMessageL(): end" );
-    }
-
-//==============================================================================
-// CNSmlDmImpsAdapter::ExecuteCommandL()
-//==============================================================================
-void CNSmlDmImpsAdapter::ExecuteCommandL( const TDesC8& /*aURI*/, 
-                                          const TDesC8& /*aLUID*/, 
-                                          const TDesC8& /*aArgument*/, 
-                                          const TDesC8& /*aType*/, 
-                                          const TInt aStatusRef )
-    {
-    //Not supported
-    _DBG_FILE( "CNSmlDmImpsAdapter::ExecuteCommandL(): begin" );
-    iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-    _DBG_FILE( "CNSmlDmImpsAdapter::ExecuteCommandL(): end" );
-    }
-
-//==============================================================================
-// CNSmlDmImpsAdapter::ExecuteCommandL()
-//==============================================================================
-void CNSmlDmImpsAdapter::ExecuteCommandL( const TDesC8& /*aURI*/, 
-                                          const TDesC8& /*aLUID*/, 
-                                          RWriteStream*& /*aStream*/, 
-                                          const TDesC8& /*aType*/, 
-                                          const TInt aStatusRef )
-    {
-    //Not supported
-    _DBG_FILE( "CNSmlDmImpsAdapter::ExecuteCommandL(): begin" );
-    iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-    _DBG_FILE( "CNSmlDmImpsAdapter::ExecuteCommandL(): end" );
-    }
-
-//==============================================================================
-// CNSmlDmImpsAdapter::CopyCommandL()
-//==============================================================================
-void CNSmlDmImpsAdapter::CopyCommandL( const TDesC8& /*aTargetURI*/, 
-                                       const TDesC8& /*aTargetLUID*/, 
-                                       const TDesC8& /*aSourceURI*/, 
-                                       const TDesC8& /*aSourceLUID*/, 
-                                       const TDesC8& /*aType*/, 
-                                       TInt aStatusRef )
-    {    
-    //Not supported
-    _DBG_FILE( "CNSmlDmImpsAdapter::CopyCommandL(): begin" );
-    iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-    _DBG_FILE( "CNSmlDmImpsAdapter::CopyCommandL(): end" );
-    }
-
-//==============================================================================
-// CNSmlDmImpsAdapter::StartAtomicL()
-//==============================================================================
-void CNSmlDmImpsAdapter::StartAtomicL()
-    {
-    //Not supported
-    _DBG_FILE( "CNSmlDmImpsAdapter::StartAtomicL(): begin" );
-    _DBG_FILE( "CNSmlDmImpsAdapter::StartAtomicL(): end" );
-    }
-
-//==============================================================================
-// CNSmlDmImpsAdapter::CommitAtomicL()
-//==============================================================================
-void CNSmlDmImpsAdapter::CommitAtomicL()
-    {
-    //Not supported
-    _DBG_FILE( "CNSmlDmImpsAdapter::CommitAtomicL(): begin" );
-    _DBG_FILE( "CNSmlDmImpsAdapter::CommitAtomicL(): end" );
-    }
-    
-//==============================================================================
-// CNSmlDmImpsAdapter::RollbackAtomicL()
-//==============================================================================
-void CNSmlDmImpsAdapter::RollbackAtomicL()
-    {
-    //Not supported
-    _DBG_FILE( "CNSmlDmImpsAdapter::RollbackAtomicL(): begin" );
-    _DBG_FILE( "CNSmlDmImpsAdapter::RollbackAtomicL(): end" );
-    }
-
-//==============================================================================
-// CNSmlDmImpsAdapter::StreamingSupport()
-//==============================================================================
-TBool CNSmlDmImpsAdapter::StreamingSupport( TInt& /*aItemSize*/ )
-    {
-    _DBG_FILE( "CNSmlDmImpsAdapter::StreamingSupport(): begin" );
-    _DBG_FILE( "CNSmlDmImpsAdapter::StreamingSupport(): end" );
-    return EFalse;
-    }
-
-//==============================================================================
-// CNSmlDmImpsAdapter::StreamCommittedL()
-//==============================================================================
-void CNSmlDmImpsAdapter::StreamCommittedL()
-    {
-    //Not supported
-    _DBG_FILE( "CNSmlDmImpsAdapter::StreamCommittedL(): begin" );
-    _DBG_FILE( "CNSmlDmImpsAdapter::StreamCommittedL(): end" );
-    }
-
-
-// ----------------------------------------------------------------------------
-// Converts 16 bit descriptor to integer value.
-// ----------------------------------------------------------------------------
-TInt CNSmlDmImpsAdapter::DesToInt( const TDesC& aLuid )
-    {
-    TLex16 lex( aLuid );
-    TInt value = 0;
-    lex.Val( value );
-    return value;
-    }
-
-// ----------------------------------------------------------------------------
-// Converts 8 bit descriptor to integer value.
-// ----------------------------------------------------------------------------
-TInt CNSmlDmImpsAdapter::DesToInt( const TDesC8& aLuid )
-    {
-    TLex8 lex( aLuid );
-    TInt value = 0;
-    lex.Val( value );
-    return value;
-    }
-
-// ----------------------------------------------------------------------------
-// Converts integer value to 8 bit descriptor.
-// ----------------------------------------------------------------------------
-HBufC8* CNSmlDmImpsAdapter::IntToDes8LC( const TInt aLuid )
-    {
-    HBufC8* buf = HBufC8::NewLC( 10 ); //10 = max length of 32bit integer
-    TPtr8 ptrBuf = buf->Des();
-    ptrBuf.Num( aLuid );
-    return buf;
-    }
-
-// ----------------------------------------------------------------------------
-// Converts integer value to 16 bit descriptor.
-// ----------------------------------------------------------------------------
-HBufC* CNSmlDmImpsAdapter::IntToDesLC( const TInt aLuid )
-    {
-    HBufC* buf = HBufC::NewLC( 10 ); //10 = max length of 32bit integer
-    TPtr ptrBuf = buf->Des();
-    ptrBuf.Num( aLuid );
-    return buf;
-    }
-
-// ----------------------------------------------------------------------------
-// CNSmlDmImpsAdapter::FillNodeInfoL()
-// Fills the node info in ddf structure
-// ----------------------------------------------------------------------------
-void CNSmlDmImpsAdapter::FillNodeInfoL( MSmlDmDDFObject& aNode, 
-                                        const TSmlDmAccessTypes aAccTypes, 
-                                        MSmlDmDDFObject::TOccurence aOccurrence,
-                                        MSmlDmDDFObject::TScope aScope, 
-                                        MSmlDmDDFObject::TDFFormat aFormat, 
-                                        const TDesC8& aDescription )
-    {
-    aNode.SetAccessTypesL( aAccTypes );
-    aNode.SetOccurenceL( aOccurrence );
-    aNode.SetScopeL( aScope );
-    aNode.SetDFFormatL( aFormat );
-    if( aFormat != MSmlDmDDFObject::ENode )
-        {
-        aNode.AddDFTypeMimeTypeL( KNSmlDMImpsTextPlain );
-        }
-    aNode.SetDescriptionL( aDescription );
-    }
-
-// ----------------------------------------------------------------------------
-// CNSmlDmImpsAdapter::ConvertTo8LC()
-// Converts string value to 8-bit
-// ----------------------------------------------------------------------------
-TDesC8& CNSmlDmImpsAdapter::ConvertTo8LC( const TDesC& aSource )
-    {    
-    HBufC8* buf = HBufC8::NewLC( aSource.Length()*2 );
-    TPtr8 bufPtr = buf->Des();
-    CnvUtfConverter::ConvertFromUnicodeToUtf8( bufPtr, aSource );
-
-    return *buf;
-    }
-
-// ----------------------------------------------------------------------------
-// CNSmlDmImpsAdapter::ConvertTo16LC()
-// Converts string value to 16-bit
-// ----------------------------------------------------------------------------
-TDesC16& CNSmlDmImpsAdapter::ConvertTo16LC( const TDesC8& aSource )
-    {
-    HBufC16* buf16 = HBufC16::NewLC( aSource.Length() );
-    TPtr bufPtr16 = buf16->Des();
-
-    CnvUtfConverter::ConvertToUnicodeFromUtf8( bufPtr16, aSource );
-
-    return *buf16;
-    }
-
-// ----------------------------------------------------------------------------
-// CNSmlDmImpsAdapter::ResetSapL();
-// Initializes all fields with empty string.
-// ----------------------------------------------------------------------------
-void CNSmlDmImpsAdapter::ResetSapL( CIMPSSAPSettings* aSap )
-    {
-    aSap->SetSAPNameL( KNSmlDMImpsNotDefined );
-    aSap->SetSAPAddressL( KNSmlDMImpsNotDefined );
-    aSap->SetSAPUserIdL( KNSmlDMImpsNotDefined );
-    aSap->SetSAPUserPasswordL( KNSmlDMImpsNotDefined );
-    aSap->SetAccessPoint( 0 );
-    aSap->SetHighLevelServices( EIMPSServicesUnknown ); 
-    return;
-    }
-
-// ----------------------------------------------------------------------------
-// CNSmlDmImpsAdapter::UpdateValueL();
-// Updates the given leaf value. 
-// Checks that the object is not too long and returns error status if is.
-// ----------------------------------------------------------------------------
-CSmlDmAdapter::TError CNSmlDmImpsAdapter::UpdateValueL( const TDesC8& aUpdatedLeaf, 
-                                                        const TDesC8& aObject, 
-                                                        CIMPSSAPSettings* aSap )
-    {
-    _DBG_FILE( "CNSmlDmImpsAdapter::UpdateValueL(): begin" );		
-    
-    CSmlDmAdapter::TError status = CSmlDmAdapter::EOk;
-
-    if ( aUpdatedLeaf.Compare( KNSmlDMImpsName ) == 0 )
-        {
-        // Check the length of SapName
-        if ( aObject.Length() <= KNSmlDMMaxNameLen )
-            {
-            aSap->SetSAPNameL( ConvertTo16LC( aObject ) );
-            CleanupStack::PopAndDestroy();  // ConvertTo16LC            
-            }
-        else
-            {
-            // length of SapName is too long
-            status = CSmlDmAdapter::ETooLargeObject; 
-            }
-        }    
-    else if ( aUpdatedLeaf.Compare( KNSmlDMImpsPrefAddr ) == 0 )
-        {
-        // Check the length of PrefAddr
-        if ( aObject.Length() <= KNSmlDMMaxAddrLen )
-            {
-            aSap->SetSAPAddressL( ConvertTo16LC( aObject ) );
-            CleanupStack::PopAndDestroy(); // ConvertTo16LC
-            }
-        else
-            {
-            // length of PrefAddr is too long
-            status = CSmlDmAdapter::ETooLargeObject; 
-            }                
-        }
-    else if ( aUpdatedLeaf.Compare( KNSmlDMImpsAAuthName ) == 0 )
-        {
-        // Check the length of AAuthName
-        if ( aObject.Length() <= KNSmlDMMaxNameLen )
-            {
-            aSap->SetSAPUserIdL( ConvertTo16LC( aObject ) );
-            CleanupStack::PopAndDestroy(); // ConvertTo16LC
-            }
-        else
-            {
-            // length of AuthName is too long
-            status = CSmlDmAdapter::ETooLargeObject; 
-            }        
-        }
-    else if ( aUpdatedLeaf.Compare( KNSmlDMImpsAAuthSecret ) == 0 )
-        {
-        // Check the length of AAuthSecret
-        if ( aObject.Length() <= KNSmlDMMaxNameLen )
-            {
-            aSap->SetSAPUserPasswordL( ConvertTo16LC( aObject ) );
-            CleanupStack::PopAndDestroy(); // ConvertTo16LC
-            }
-        else
-            {
-            // length of AuthSecret is too long
-            status = CSmlDmAdapter::ETooLargeObject; 
-            }        
-        }        
-    else if ( aUpdatedLeaf.Compare( KNSmlDMImpsPrefConRef ) == 0 )
-        {
-        // find out the access point link        
-        TPtrC8 objectPtr= NSmlDmURI::RemoveDotSlash( aObject );
-
-// Used only in Test purpose
-//   TBuf8<50> tmpObjBuf = objectPtr;   
-//   DBG_ARGS8(_S8("IMPS : AP = %S \n"), &tmpObjBuf );     
-
-        HBufC8* luid = iCallBack->GetLuidAllocL( objectPtr );
-        CleanupStack::PushL( luid );
-
-// Used only in Test purpose
-//        DBG_ARGS8(_S8("Luid length = %d \n"), luid->Length() );     
-
-        if( luid->Length() > 0 )
-            {
-            TInt uid = DesToInt( *luid );
-            TUint32 uid32( uid );
-            aSap->SetAccessPoint( uid32 );  
-            }
-        else
-            {
-            status = CSmlDmAdapter::ENotFound;
-            }
-
-        CleanupStack::PopAndDestroy(); // luid        
-        }
-            
-    else if ( aUpdatedLeaf.Compare( KNSmlDMImpsAAuthLevel ) == 0 )
-        {
-        if ( ( aObject.Length() > 0 ) && 
-             ( aObject.Compare( KNSmlDMImpsDefaultAAuthLevel ) != 0 ) )
-            {
-            status = CSmlDmAdapter::EInvalidObject;
-            }
-        }       
-    else if ( aUpdatedLeaf.Compare( KNSmlDMImpsServices ) == 0 )
-        {
-        // Change the text to int value    
-        TUint32 serv = EIMPSServicesUnknown;
-
-        TBool imFlag = EFalse;
-        TBool psFlag = EFalse;
-        TBool grFlag = EFalse;
-        
-        TInt len = aObject.Length();
-        TInt startIndex = 0;  // tells the start point of value
-        TInt endIndex = 1;  // tells the end point of value
-        while ( endIndex < len )
-            {
-//            TPtrC8 objPtr = aObject.Mid( startIndex, 2 );
-            TBufC8<2> str = aObject.Mid( startIndex, 2 );
-            if ( str.Match( KNSmlDMImpsServiceIM ) != KErrNotFound )
-                {
-                if ( imFlag == EFalse )
-                    {
-                    // IM service found	
-                    serv |= EIMPSServicesIM;
-                    imFlag = ETrue;
-                    }                    	    					                
-                else
-                    {
-                    status = CSmlDmAdapter::EInvalidObject;
-                    break;
-                    }            
-                }
-            else if ( str.Match( KNSmlDMImpsServicePS ) != KErrNotFound )
-                {
-                if ( psFlag == EFalse )
-                    {
-                    // PS service found	
-                    serv |= EIMPSServicesPEC;
-                    psFlag = ETrue;
-                    }                    	    					                
-                else
-                    {
-                    status = CSmlDmAdapter::EInvalidObject;
-                    break;
-                    }            
-                }
-            else if ( str.Match( KNSmlDMImpsServiceGR ) != KErrNotFound )
-                {
-                if ( grFlag == EFalse )
-                    {
-                    // GR service found	
-                    serv |= EIMPSServicesGroups;
-                    grFlag = ETrue;
-                    }                    	    					                
-                else
-                    {
-                    status = CSmlDmAdapter::EInvalidObject;
-                    break;
-                    }            
-                }      	    	          
-            else
-                {
-                status = CSmlDmAdapter::EInvalidObject;
-                break;
-                }            
-            startIndex = endIndex + 1;
-            if ( startIndex < len )
-                {
-                TBufC8<1> chr = aObject.Mid( startIndex, 1 );
-                if ( chr.Match( KNSmlDMImpsSemiColon ) == KErrNotFound )
-                    {
-                    status = CSmlDmAdapter::EInvalidObject;
-                    break;                    
-                    }
-                }
-            startIndex++;
-            endIndex = startIndex + 1;
-            }  // while
-
-            // Set Services
-        if ( status == KErrNone )
-            {
-            aSap->SetHighLevelServices( serv );	    	                    
-            }	
-        }  // KNSmlDMImpsServices
-    else  // Unknown leaf
-        {
-        status = CSmlDmAdapter::EInvalidObject;
-        }        
-
-    _DBG_FILE( "CNSmlDmImpsAdapter::UpdateValueL(): end" );		
-            
-    return status;
-    }
-
-// ----------------------------------------------------------------------------
-// CNSmlDmImpsAdapter::UpdatePEPValueL();
-// If PEP value is changed, deletes the existing SAP and creates new one with 
-// received access group and sets new mappings to all nodes and leafs
-// ----------------------------------------------------------------------------
-CSmlDmAdapter::TError CNSmlDmImpsAdapter::UpdatePEPValueL( const TDesC8& aURI, 
-                                                           const TDesC8& aObject, 
-                                                           const TDesC8& aLUID, 
-                                                           CIMPSSAPSettings* aSap, 
-                                                           CIMPSSAPSettingsStore* aStore )
-    {	
-    _DBG_FILE( "CNSmlDmImpsAdapter::UpdatePEPValueL(): begin" );		
-
-    HBufC8 *object = HBufC8::NewLC( aObject.Length() );
-    TPtr8 objPtr = object->Des();
-    objPtr.Format( aObject );
-    objPtr.UpperCase();
-    
-    CSmlDmAdapter::TError status = CSmlDmAdapter::EOk;
-    TInt uid = DesToInt ( aLUID );
-    TUint32 uid32( uid );
-    
-    TIMPSAccessGroup newAccGroup = EIMPSIMAccessGroup;
-    if ( ( objPtr.Compare( KNSmlDMImpsDefaultPEC ) == 0 ) 
-        || ( objPtr.Compare( KNSmlDMImpsDefPEC ) == 0 ) )
-        {
-        newAccGroup = EIMPSPECAccessGroup;
-        }
-    else if ( ( objPtr.Compare( KNSmlDMImpsDefaultIM ) == 0 ) 
-        || ( objPtr.Compare( KNSmlDMImpsDefIM ) == 0 ) )
-        {
-        newAccGroup = EIMPSIMAccessGroup;
-        }
-    else
-        {
-        status = CSmlDmAdapter::EInvalidObject;
-        }        
-
-    CleanupStack::PopAndDestroy(); // object
- 
-    TIMPSAccessGroup oldAccGroup = aSap->AccessGroup();
-    if ( oldAccGroup != newAccGroup )
-        {	        
-        // The AccessGroup should be changed.    	        
-        // Check mapping first
-        
-        TPtrC8 ptrToExtUri = NSmlDmURI::RemoveLastSeg( aURI ); // IMPS/<x>/Ext            
-        TPtrC8 ptrToDynNode = NSmlDmURI::RemoveLastSeg( ptrToExtUri ); // IMPS/<x>
-
-        HBufC8 *appAuthUri = HBufC8::NewLC( ptrToDynNode.Length() + 
-                                     KNSmlDMMaxNameLen );
-        TPtr8 appAuthPtr= appAuthUri->Des();
-
-        // URI: IMPS/<x>/AppAuth
-        appAuthPtr.Format( ptrToDynNode );
-        appAuthPtr.Append( KNSmlDMImpsSeparator8 );
-        appAuthPtr.Append( KNSmlDMImpsAppAuth );
-		
-// Used only in Test purpose
-//        TBuf8<50> tmpUriBuf = appAuthPtr;
-//        DBG_ARGS8(_S8("Fetched Uri = %S"), &tmpUriBuf );     
-
-        // Get dynamic node under AppAuth
-        CBufBase *allNodes = CBufFlat::NewL( KNSmlDMReservingData );
-        CleanupStack::PushL( allNodes );
-        iCallBack->FetchLinkL( appAuthPtr, *allNodes, status );
-		    
-// Used only in Test purpose
-        DBG_ARGS8(_S8("Status = %d \n"), status );     
-		    
-        if( status == CSmlDmAdapter::EOk )
-            {               	        	
-            // Delete existing SAP
-            aStore->DeleteSAPL( uid32 );
-            _DBG_FILE( "CNSmlDmImpsAdapter::UpdatePEPValueL(): SAP deleted" );
-        
-            // Create new with correct AccessGroup        
-            uid32 = aStore->StoreNewSAPL( aSap, newAccGroup );
-            uid = TInt( uid32 );
-            _DBG_FILE( "CNSmlDmImpsAdapter::UpdatePEPValueL(): New SAP added" );
-		
-            // Set mappings to new UID
-            HBufC8 *luidDes = IntToDes8LC( TInt( uid ) );
-        	
-            // URI: IMPS/<x>/Ext/PEPCompliant
-            iCallBack->SetMappingL( aURI, *luidDes );
-
-            // URI: IMPS/<x>/Ext        	
-            iCallBack->SetMappingL( ptrToExtUri, *luidDes );
-
-            // URI: IMPS/<x>
-            iCallBack->SetMappingL( ptrToDynNode, *luidDes );
-        
-            // URI: IMPS/<x>/AppAuth
-            iCallBack->SetMappingL( appAuthPtr, *luidDes );		
-
-       	    if ( allNodes->Size() > 0 )
-                {
-                TPtrC8 uriSeg8Ptr = allNodes->Ptr( 0 );
-
-                // URI: IMPS/<x>/AppAuth/<x>
-                HBufC8 *authUri = HBufC8::NewLC( appAuthPtr.Length() + 
-                                                 uriSeg8Ptr.Length() );				
-                TPtr8 authUriPtr= authUri->Des();
-                authUriPtr.Format( appAuthPtr );
-                authUriPtr.Append( KNSmlDMImpsSeparator8 );
-                authUriPtr.Append( uriSeg8Ptr );
-                iCallBack->SetMappingL( authUriPtr, *luidDes );
-                
-                CleanupStack::PopAndDestroy(); // authUri
-                }
-            CleanupStack::PopAndDestroy(); // luidDes
-            }
-		
-        CleanupStack::PopAndDestroy( 2 ); // appAuthUri, allNodes
-        } // oldValue != newValue  	
-
-    _DBG_FILE( "CNSmlDmImpsAdapter::UpdatePEPValueL(): end" );		
-
-    return status;
-    }
-
-// ----------------------------------------------------------------------------
-// CNSmlDmImpsAdapter::DeleteValueL();
-// Initializes the given leaf field with empty string.
-// ----------------------------------------------------------------------------
-CSmlDmAdapter::TError CNSmlDmImpsAdapter::DeleteValueL( const TDesC8& aUri, 
-                                                        CIMPSSAPSettings* aSap )
-    {
-    CSmlDmAdapter::TError status = CSmlDmAdapter::EOk;
-
-    TPtrC8 deletedLeaf = NSmlDmURI::LastURISeg( aUri );
-    TPtrC8 ptrToParentUri = NSmlDmURI::RemoveLastSeg( aUri );
-    TPtrC8 parentSeg = NSmlDmURI::LastURISeg( ptrToParentUri );
-
-    if ( deletedLeaf.Compare( KNSmlDMImpsName ) == 0)
-        {
-        aSap->SetSAPNameL( ConvertTo16LC( parentSeg ) );
-        CleanupStack::PopAndDestroy();
-        }
-    else if ( deletedLeaf.Compare( KNSmlDMImpsPrefAddr ) == 0)
-        {
-        aSap->SetSAPAddressL( KNSmlDMImpsNotDefined );
-        }
-    else if ( deletedLeaf.Compare( KNSmlDMImpsAAuthName ) == 0)
-        {
-        aSap->SetSAPUserIdL( KNSmlDMImpsNotDefined );
-        }
-    else if ( deletedLeaf.Compare( KNSmlDMImpsAAuthSecret ) == 0)
-        {
-        aSap->SetSAPUserPasswordL( KNSmlDMImpsNotDefined );
-        }
-    else if ( deletedLeaf.Compare( KNSmlDMImpsPrefConRef ) == 0 )
-        {
-        aSap->SetAccessPoint( 0 );  
-        }
-    else if ( deletedLeaf.Compare( KNSmlDMImpsAAuthLevel ) == 0 )
-        {
-        // AAuthLevel is not stored anywhere so it can not be deleted either
-        }
-    else if ( ( aUri.Match( KNSmlDMImpsWholeAppAuthUri ) != KErrNotFound ) ||
-            ( aUri.Match( KNSmlDMImpsWholeAppAuthDynUri ) != KErrNotFound ) )
-        {
-        aSap->SetSAPUserIdL( KNSmlDMImpsNotDefined );
-        aSap->SetSAPUserPasswordL( KNSmlDMImpsNotDefined );
-        }
-    else if ( deletedLeaf.Compare( KNSmlDMImpsServices ) == 0 )
-        {
-        status = CSmlDmAdapter::EError;
-        }
-    else  // Unknown leaf
-        {
-        status = CSmlDmAdapter::EInvalidObject;
-        }
-                
-    return status;
-    }
-
-// ----------------------------------------------------------------------------
-// CNSmlDmImpsAdapter::FetchObjectL();
-// The method reads the requested parameter value from DB
-// - Check that the requested SAP exists in DB by checking that 
-//      the uid with LUID value exists.
-// - Get SAP data to aSap
-// - Read the requested parameter value
-// - In error case return error status
-// ----------------------------------------------------------------------------
-CSmlDmAdapter::TError CNSmlDmImpsAdapter::FetchObjectL( const TDesC8& aUri, 
-                                                        const TDesC8& aLUID, 
-                                                        CBufBase& aObject )
-    {	
-    CSmlDmAdapter::TError status = CSmlDmAdapter::EOk;
-    
-    CIMPSSAPSettings* ownSap = CIMPSSAPSettings::NewL();
-    CleanupStack::PushL( ownSap );
-    CIMPSSAPSettingsStore* ownStore = CIMPSSAPSettingsStore::NewL();
-    CleanupStack::PushL( ownStore );
-    
-    if( aLUID.Length() > 0 )
-        {
-        // Check that Store is not empty
-        // causes leaving if empty db is tried to read
-        TInt sapFound = KErrNotFound;
-        sapFound = GetCorrectSapL( aLUID, ownSap, ownStore );
-        if ( sapFound == KErrNone )
-            {
-            // Sap exist, read value of correct leaf
-            if ( aUri.Compare( KNSmlDMImpsName ) == 0 )
-                {
-                aObject.InsertL( 0, ConvertTo8LC( ownSap->SAPName() ) );
-                CleanupStack::PopAndDestroy();  // ConvertTo8LC
-                }
-            else if ( aUri.Compare( KNSmlDMImpsPrefAddr ) == 0 )
-                {
-                aObject.InsertL( 0, ConvertTo8LC( ownSap->SAPAddress() ) );
-                CleanupStack::PopAndDestroy();  // ConvertTo8LC
-                }
-            else if ( aUri.Compare( KNSmlDMImpsAAuthName ) == 0 )
-                {
-                aObject.InsertL( 0, ConvertTo8LC( ownSap->SAPUserId() ) );
-                CleanupStack::PopAndDestroy();  // ConvertTo8LC
-                }
-            else if ( aUri.Compare( KNSmlDMImpsAAuthSecret ) == 0 )
-                {
-                // Requesting password not allowed.
-                status = EError;
-                }
-            else if ( aUri.Compare( KNSmlDMImpsPepCompliant ) == 0 )
-                {
-                TIMPSAccessGroup accGroup = ownSap->AccessGroup();
-                if ( accGroup == EIMPSPECAccessGroup )	    	
-                    { 
-                    aObject.InsertL( 0, KNSmlDMImpsDefaultPEC );  		
-                    }
-                else
-                    {
-                    aObject.InsertL( 0, KNSmlDMImpsDefaultIM );  						  					  	
-                    }
-                }  // PEPCompliant
-            else if ( aUri.Compare( KNSmlDMImpsPrefConRef ) == 0 )
-                {            
-                HBufC8* buf = IntToDes8LC( ownSap->AccessPoint() );
-                TUint idFromDb = DesToInt( buf->Des() );
-                CleanupStack::PopAndDestroy( ); // buf
-                
-                CBufBase *allIAPs = CBufFlat::NewL( KNSmlDMReservingData );
-                CleanupStack::PushL( allIAPs );
-                iCallBack->FetchLinkL( GetConRef(), *allIAPs, status );
-		    
-                TBool found = EFalse;
-                if( status == CSmlDmAdapter::EOk )
-                    {
-                    TInt startIndex = 0;
-        
-                    for( TInt i = 0; i < allIAPs->Size(); i++ )
-                        {
-                        if( allIAPs->Ptr(0)[i] == '/' || i == allIAPs->Size()-1 )
-                            {
-                            HBufC8 *uriSegment=0;
-                            TPtrC8 uriSeg8Ptr = allIAPs->Ptr( startIndex ).Mid( 0, i-startIndex );                				
-                            uriSegment = uriSeg8Ptr.AllocLC();
-                            HBufC8 *uri = HBufC8::NewLC( GetConRef().Length() + 1 + uriSegment->Length() );
-                            TPtr8 uriPtr= uri->Des();
-                            uriPtr.Format( GetConRef());
-                            uriPtr.Append( KNSmlDMImpsSeparator );
-                            uriPtr.Append( *uriSegment );
-                            HBufC8* luid = iCallBack->GetLuidAllocL( uriPtr );
-                            CleanupStack::PushL( luid );
-
-                            if( luid->Length() > 0 )
-                                {
-                                TInt iapId = DesToInt( luid->Des() );
-                                if( iapId == idFromDb )
-                                    {
-                                    found = ETrue;
-                                    aObject.InsertL( 0, uriPtr );
-                                    CleanupStack::PopAndDestroy( 3 ); // uriSegment, uri, luid
-                                    break;
-                                    }                                
-                                }  // if luid
-					        
-                            startIndex = i + 1;
-                            CleanupStack::PopAndDestroy( 3 ); // uriSegment, uri, luid
-                            } //end if allIaps...
-                        } //end for
-                    }
-                CleanupStack::PopAndDestroy(); //allIaps
-                if( !found )
-                    {
-                    status = CSmlDmAdapter::ENotFound;
-                    }
-                } // PrefConRef
-
-            else if ( aUri.Compare( KNSmlDMImpsAppId ) == 0 )
-                {
-                // AppID is not used yet so return default value
-                aObject.InsertL( 0, KNSmlDMImpsDefaultAppID ); 
-                }
-            else if ( aUri.Compare( KNSmlDMImpsAAuthLevel ) == 0 )
-                {
-                // Check from the database if the AAuthName or AAuthSecret are defined
-                // if they are, return default value
-                if ( ( ownSap->SAPUserId().Compare(KNSmlDMImpsNotDefined ) == 0 ) &&
-                     ( ownSap->SAPUserPassword().Compare(KNSmlDMImpsNotDefined ) == 0 ) )
-                    // AAuthName and AAuthSecret are not defined 
-                    {
-                    aObject.InsertL( 0, KNSmlDMImpsNotDefined8 ); 
-                    }
-                else
-                    {
-                    aObject.InsertL( 0, KNSmlDMImpsDefaultAAuthLevel ); 
-                    }
-                }   // AppID                 
-            else if ( aUri.Compare( KNSmlDMImpsServices ) == 0 )
-                {
-                HBufC8 *services=0;
-                TUint32 serv = EIMPSServicesUnknown;
-                services = HBufC8::NewLC( 11 ); 
-                TPtr8 servicesPtr = services->Des();
-            	
-                serv = ownSap->HighLevelServices();
-                switch ( serv )
-                    {
-                    case ( EIMPSServicesIM ):
-                        {
-                        servicesPtr.Format( KNSmlDMImpsServiceIM );
-                        break;
-                        }
-                    case ( EIMPSServicesPEC ):
-                        {
-                        servicesPtr.Format( KNSmlDMImpsServicePS );            			
-                        break;
-                        }
-                    case ( EIMPSServicesIM | EIMPSServicesPEC ):
-                        {
-                        servicesPtr.Format( KNSmlDMImpsServiceIM );
-                        servicesPtr.Append( KNSmlDMImpsSemiColon );
-                        servicesPtr.Append( KNSmlDMImpsServicePS );
-                        break;
-                        }
-                    case ( EIMPSServicesGroups ):
-                        {
-                        servicesPtr.Format( KNSmlDMImpsServiceGR );           			
-                        break;
-                        }
-                    case ( EIMPSServicesIM | EIMPSServicesGroups ):
-                        {
-                        servicesPtr.Format( KNSmlDMImpsServiceIM );
-                        servicesPtr.Append( KNSmlDMImpsSemiColon );
-                        servicesPtr.Append( KNSmlDMImpsServiceGR );
-                        break;
-                        }
-                        case ( EIMPSServicesPEC | EIMPSServicesGroups ):
-                        {
-                        servicesPtr.Format( KNSmlDMImpsServicePS );
-                        servicesPtr.Append( KNSmlDMImpsSemiColon );
-                        servicesPtr.Append( KNSmlDMImpsServiceGR );
-                        break;
-                        }
-            		case ( EIMPSServicesIM | EIMPSServicesPEC | EIMPSServicesGroups ):
-            			{
-						servicesPtr.Format( KNSmlDMImpsServiceIM );
-						servicesPtr.Append( KNSmlDMImpsSemiColon );
-                        servicesPtr.Append( KNSmlDMImpsServicePS );
-                        servicesPtr.Append( KNSmlDMImpsSemiColon );
-                        servicesPtr.Append( KNSmlDMImpsServiceGR );
-
-						break;
-            			}
-            		default:
-        	    		{
-                        servicesPtr.Format( KNSmlDMImpsNotDefined8 );	            		
-                        break;
-                        }
-                    }  // Service      		            		            	
-                    aObject.InsertL( 0, servicesPtr );
-                    CleanupStack::PopAndDestroy(); // services     		        
-                } 
-            else  
-                {
-                status = CSmlDmAdapter::EInvalidObject;
-                }
-            }  // sapFound
-        else if ( sapFound == KErrNotFound )                    	 
-            {      		
-            status = CSmlDmAdapter::ENotFound;
-            }  
-        else
-            {
-            status = CSmlDmAdapter::EError;
-            }
-
-        }  // aLUID length
-    else  
-        {
-        status = CSmlDmAdapter::ENotFound;
-        }
-
-    CleanupStack::PopAndDestroy( 2 ); // ownSap, ownStore
-        
-    return status;
-    }
-
-// ----------------------------------------------------------------------------
-// CNSmlDmImpsAdapter::GetCorrectSapL();
-// The method reads the requested parameter value from DB
-// - Check that the requested SAP exists in DB by checking 
-//      that the index with LUID value exists.
-// - Get SAP data to aSap
-// - Read the requested parameter value
-// - In error case return error status
-// ----------------------------------------------------------------------------
-TInt CNSmlDmImpsAdapter::GetCorrectSapL( const TDesC8& aLUID, 
-                                         CIMPSSAPSettings* aSap, 
-                                         CIMPSSAPSettingsStore* aStore )
-    {	
-    // If value of Stat is KErrNone, the Sap has been found. 
-    // If it is KErrNotFound, the Sap does not exist.
-    // Else the stat returns error status.
-    CIMPSSAPSettingsList* ownList = CIMPSSAPSettingsList::NewL();   
-    CleanupStack::PushL( ownList );
-	
-    TInt stat = KErrNotFound;
-	
-        // Check that Store is not empty
-        // causes leaving if empty db is tried to read
-    TInt count = 0;
-    count = aStore->SAPCountL( EIMPSAccessFilterAll ) ;
-    DBG_ARGS8(_S8("IMPS::Count of SAPs in store = %d \n"), count );
-    if ( count > 0 )
-        {
-        TInt uid = DesToInt( aLUID );
-        TUint32 uid32( uid );
-        aStore->PopulateSAPSettingsListL( *ownList, EIMPSAccessFilterAll );
-        _DBG_FILE( "CNSmlDmImpsAdapter::GetCorrectSapL(): SAP settings list" );
-        for ( TInt i = 0; i < count; i++ )
-            {
-            TUint32 id32 = ownList->UidForIndex( i );
-            if ( id32 == uid32 )
-                {
-                aStore->GetSAPL( uid32, aSap );
-                _DBG_FILE( "CNSmlDmImpsAdapter::GetCorrectSapL(): SAP requested" );
-                stat = KErrNone;
-                break;
-                }
-            } // for        	   
-        } // if count
-
-    CleanupStack::PopAndDestroy(); // ownList
-
-    return stat;
-    }
-
-// ----------------------------------------------------------------------------
-// TImplementationProxy ImplementationTable[]
-// Needed because of ECOM architecture
-// ----------------------------------------------------------------------------
-#ifndef IMPLEMENTATION_PROXY_ENTRY
-#define IMPLEMENTATION_PROXY_ENTRY( aUid, aFuncPtr ) { {aUid}, ( aFuncPtr ) }
-#endif
-const TImplementationProxy ImplementationTable[] = 
-    {
-    IMPLEMENTATION_PROXY_ENTRY( KNSmlDMImpsAdapterImplUid, 
-                                CNSmlDmImpsAdapter::NewL )
-    };
-
-// ----------------------------------------------------------------------------
-//
-// ----------------------------------------------------------------------------
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy( TInt& aTableCount )
-    {
-    _DBG_FILE( "ImplementationGroupProxy() for CNSmlDmImpsAdapter: begin" );
-    aTableCount = sizeof( ImplementationTable ) / sizeof( TImplementationProxy );
-    _DBG_FILE( "ImplementationGroupProxy() for CNSmlDmImpsAdapter: end" );
-    return ImplementationTable;
-    }
-
-
-// ----------------------------------------------------------------------------
-//
-// ----------------------------------------------------------------------------
-void CNSmlDmImpsAdapter::HandleSessionEventL( TMsvSessionEvent /*aEvent*/, 
-                                              TAny* /*aArg1*/, 
-                                              TAny* /*aArg2*/, 
-                                              TAny* /*aArg3*/ )
-    {
-    _DBG_FILE( "CNSmlDmImpsAdapter::HandleSessionEventL(): begin" );
-
-    _DBG_FILE( "CNSmlDmImpsAdapter::HandleSessionEventL(): end" );
-    }
-    
-// ------------------------------------------------------------------------------------------------
-// CNSmlDmImpsAdapter::const TDesC8& GetConRef()
-// Returns the connection reference
-// ------------------------------------------------------------------------------------------------
-const TDesC8& CNSmlDmImpsAdapter::GetConRef()
-	{
-	if(FeatureManager::FeatureSupported(KFeatureIdFfDmConnmoAdapter))
-		{
-			return KNSmlDMImpsConnMOIAPUri();
-		}
-	else
-		{
-			return KNSmlDMImpsIAPUri();
-		}	
-  }	    
-
-
-// End of file
-
--- a/omadm/omadmextensions/adapters/imps/src/nsmldmimpsadapter.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-/*
-* Copyright (c) 2002-2004 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:    Device Management IMPS Adapter
-*
-*/
-
-
-
-
-
-#include <registryinfo.rh>
-#include "nsmldmconstants.h"
-
-RESOURCE REGISTRY_INFO theRegistryInfo
-  {
-  dll_uid = 0x101F9A2A; //The DLL's 3rd UID.
-  interfaces = 
-      {
-      INTERFACE_INFO
-          {
-          interface_uid = KNSmlDMInterfaceUid; // DM interface UID
-          implementations = 
-            {
-            IMPLEMENTATION_INFO
-                {
-                implementation_uid = 0x101F9A2B; // DM IMPS implementation UID
-                version_no = 1; 
-                display_name = "";
-                default_data = "";
-                opaque_data = "";
-                }
-            };
-          }
-      };
-    }
--- a/omadm/omadmextensions/adapters/inc/nsmldmimpluids.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-/*
-* Copyright (c) 2002 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:    DM tree etc.
-*
-*/
-
-
-
-
-#ifndef __NSMLDMIMPLUIDS_H__
-#define __NSMLDMIMPLUIDS_H__
-
-// ------------------------------------------------------------------------------------------------
-// Includes
-// ------------------------------------------------------------------------------------------------
-#include <e32base.h>
-
-// ------------------------------------------------------------------------------------------------
-//
-// ------------------------------------------------------------------------------------------------
-
-// Implementation UIDs for DS adapters
-const TUint KNSmlDMSettingsAdapterImplUid = 0x101F6DEC;
-const TUint KNSmlDSSettingsAdapterImplUid = 0x101F6DED;
-const TUint KNSmlDMDevInfoAdapterImplUid = 0x101F6DEE;
-const TUint KNSmlDMDevDetailAdapterImplUid = 0x101F6DEF;
-const TUint KNSmlInternetAdapterImplUid = 0x101F6DE2;
-const TUint KNSmlDMEmailAdapterImplUid = 0x101F6E35;
-const TUint KNSmlDMMMSAdapterImplUid = 0x101F6E37;
-const TUint KNSmlDMFotaAdapterImplUid = 0x101F9A09;
-#endif // __CNSMLDMIMPLUIDS_H__
--- a/omadm/omadmextensions/adapters/mms/bld/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-/*
-* 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:    build info file for MMS settings adapter
-*
-*/
-
-
-
-
-PRJ_MMPFILES
-./nsmldmmmsadapter.mmp
-
-
-
-
--- a/omadm/omadmextensions/adapters/mms/bld/nsmldmmmsadapter.mmp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-/*
-* 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:    DM MMS Settings Adapter
-*
-*/
-
-
-
-
-#include "defaultcaps.hrh"
-#include  <platform_paths.hrh>
-
-TARGET          nsmldmmmsadapter.dll
-TARGETTYPE      PLUGIN
-UID             0x10009D8D 0x101F6E36
-VENDORID        VID_DEFAULT
-CAPABILITY      CAP_ECOM_PLUGIN
-
-APP_LAYER_SYSTEMINCLUDE
-SYSTEMINCLUDE 	/epoc32/include/ecom
-SYSTEMINCLUDE  /epoc32/include/comms-infras/commdb/protection
-#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
-SYSTEMINCLUDE		/epoc32/include/platform/comms-infras/commdb/protection
-#endif
-
-SOURCEPATH      ../src
-USERINCLUDE     ../inc ../../inc
-
-SOURCE          nsmldmmmsadapter.cpp
-
-START RESOURCE nsmldmmmsadapter.rss
-TARGET nsmldmmmsadapter.rsc
-LANGUAGE_IDS
-END
-
-
-LIBRARY     euser.lib ecom.lib msgs.lib charconv.lib nsmldebug.lib 
-LIBRARY 	commdb.lib apengine.lib mmsserversettings.lib
-LIBRARY     nsmldmiapmatcher.lib
-LIBRARY     nsmldmtreedbclient.lib
-
-
-SMPSAFE
-// End of File
--- a/omadm/omadmextensions/adapters/mms/inc/nsmldmmmsadapter.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,370 +0,0 @@
-/*
-* 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:    DM MMS Settings Adapter
- *
-*/
-
-
-
-
-
-#ifndef __NSMLDMMMSADAPTER_H__
-#define __NSMLDMMMSADAPTER_H__
-
-// -----------------------------------------------------------------------------
-// Includes
-// -----------------------------------------------------------------------------
-#include <e32base.h>
-#include <smldmadapter.h>
-#include <mtclreg.h>
-#include <mmssettings.h>
-
-// --------------------------------------------------------------------------
-// Class forwards
-// --------------------------------------------------------------------------
-class CClientMtmRegistry;
-class CMsvSession;
-class CMmsClientMtm;
-
-// --------------------------------------------------------------------------
-// Constant definitions
-// --------------------------------------------------------------------------
-
-const TInt KNSmlDMMMSDefaultExpiry = 72 * 3600; //3 days
-const TInt KNSmlDMMMSExpiryHour = 3600; //1 hour
-const TInt KNSmlDMMMSExpirySixHours = 6*3600; //6 hours
-const TInt KNSmlDMMMSExpiryDay = 24*3600; //24 hours
-const TInt KNSmlDMMMSExpiryThreeDays = 3*24*3600; //3 days
-const TInt KNSmlDMMMSExpiryWeek = 7*24*3600; //1 week
-const TInt KNSmlDMMMSExpiryMaximum = 0;
-//Iap id which is not found from commsdb
-const TUint32 KNSmlDMMMSIapNotDefined = 999999; 
-const TInt KNSmlMMSUndefinedStatusRef = -1;
-
-const TInt KNSmlDMMMSFirstAccessPointId = 0;
-const TInt KNSmlDMMMSSecondAccessPointId = 1;
-const TUint8 KNSmlDMMMSSeparatorDef = 0x2f; //forward slash
-const TUint8 KNSmlDmMmsObjectSizeWidth = 4;
-
-// the DDF version must be changed if any changes in DDF structure 
-// ( built in DDFStructureL() function )
-
-// --------------------------------------------------------------------------
-// Literal definitions
-// --------------------------------------------------------------------------
-
-_LIT8( KNSmlDMMMSDDFVersion, "1.1" ); 
-
-_LIT8( KNSmlDMMMSNodeName, "MMS" );
-_LIT8( KNSmlDMMMSName, "Name" );
-_LIT8( KNSmlDMMMSMMRecep, "MMRecep" );
-_LIT8( KNSmlDMMMSAMsg, "AMsg" );
-_LIT8( KNSmlDMMMSRcvAds, "RcvAds" );
-_LIT8( KNSmlDMMMSImgSize, "ImgSize" );
-_LIT8( KNSmlDMMMSDRepSnd, "DRepSnd" );
-_LIT8( KNSmlDMMMSRcvRep, "RcvRep" );
-_LIT8( KNSmlDMMMSMsgVal, "MsgVal" );
-_LIT8( KNSmlDMMMSCon, "Con" );
-_LIT8( KNSmlDMMMSMToNapID, "MToNapID" );
-_LIT8( KNSmlDMMMSMToNapIDL, "MToNapIDL" );
-_LIT8( KNSmlDMMMSCreMode, "CreMode" );
-
-_LIT8( KNSmlDMMMSConSlash, "Con/" );
-_LIT8( KNSmlDMMMSTextPlain, "text/plain" );
-
-_LIT8( KNSmlDMMMSNodeNameDescription, "The interior object holds all MMS objects" );
-_LIT8( KNSmlDMMMSDynamicNodeDescription, "Placeholder for one set of MMS settings" );
-_LIT8( KNSmlDMMMSNameDescription, "Displayable Account Name for the MMS Settings" );
-_LIT8( KNSmlDMMMSMMRecepDescription, "Level of MMS protocol operations" );
-_LIT8( KNSmlDMMMSAMsgDescription, "Anonymous messages allowed or not" );
-_LIT8( KNSmlDMMMSRcvAdsDescription, "Receiving adverts allowed or not" );
-_LIT8( KNSmlDMMMSImgSizeDescription, "Image  resolution in sending messages" );
-_LIT8( KNSmlDMMMSDRepSndDescription, "Sending of Delivery Reports is allowed or not" );
-_LIT8( KNSmlDMMMSRcvRepDescription, "Defines whether the delivery report is requested by default from each recipient or not" );
-_LIT8( KNSmlDMMMSMsgValDescription, "Message validity time" );
-_LIT8( KNSmlDMMMSMMSSAddrDescription, "MMS server address" );
-
-_LIT8( KNSmlDMMMSConNodeDescription, "Parent for MMS connectivity object" );
-_LIT8( KNSmlDMMMSConRtNodeDescription, "Place holder for one or more connectivity objects" );
-_LIT8( KNSmlDMMMSMToNapIDDescription, "Parent to multiple NAP connection reference objects" );
-_LIT8( KNSmlDMMMSMToNapIDLDescription, "Link to internet access point" );
-_LIT8( KNSmlDMMMSCreModeDescription, "MMS creation mode" );
-_LIT8( KNSmlDMMMSTextPlainDescription, "text/plain" );
-
-_LIT8( KNSmlDMMMSAccount8, "MMSAcc" );
-_LIT( KNSmlDMMMSAccount16, "MMSAcc" );
-_LIT8( KNSmlDMMMSListOfLeafsLo, "MMRecep/CreMode/AMsg/RcvAds/ImgSize/DRepSnd/RcvRep/MsgVal/Con" );
-_LIT8( KNSmlDMMMSListOfLeafsMid, "MMSSAddr/MToNapID" );
-_LIT8( KNSmlDMMMSListOfLeafsHi, "MToNapIDL" );
-_LIT8( KNSmlDMMMSConDynamicName8, "DCon" );
-_LIT8( KNSmlDMMMSConDynamicName16, "DCon" );
-_LIT8( KNSmlDMMMSMMSSAddr, "MMSSAddr" );
-
-_LIT8( KNSmlDMMMSDynamicPrimary, "Primary" );
-
-
-_LIT( KNSmlDMMMSSeparator16, "/" );
-_LIT8( KNSmlDMMMSSeparator8, "/" );
-
-_LIT8( KNSmlDMMMSValueTrue, "True" );
-_LIT8( KNSmlDMMMSValueFalse, "False" );
-_LIT8( KNSmlDMMMSValueAlwaysOn, "Always on" );
-
-_LIT8( KNSmlDMMMSValueAutomaticAtHome, "Automatic at home" );
-_LIT8( KNSmlDMMMSValueAutomaticAtHomeShort, "Aut" );
-_LIT8( KNSmlDMMMSValueAlwaysManual, "Always Manual" );
-_LIT8( KNSmlDMMMSValueAlwaysManual2, "Always manual" );  
-_LIT8( KNSmlDMMMSValueOff, "Off" );
-_LIT8( KNSmlDMMMSValueFree, "Free" );
-_LIT8( KNSmlDMMMSValueRestricted, "Restricted" );
-_LIT8( KNSmlDMMMSValueWarning, "Warning" );
-
-_LIT8( KNSmlDMMMSValueLow, "Low" );
-_LIT8( KNSmlDMMMSValueNormal, "Normal" );
-_LIT8( KNSmlDMMMSValueHigh, "High" );
-_LIT8( KNSmlDMMMSValueSmall, "Small" );
-_LIT8( KNSmlDMMMSValueLarge, "Large" );
-_LIT8( KNSmlDMMMSValueOriginal, "Original" );
-
-_LIT8( KNSmlDMMMSValueHour, "one hour" );
-_LIT8( KNSmlDMMMSValueSixHours, "six hours" );
-_LIT8( KNSmlDMMMSValueDay, "24 hours" );
-_LIT8( KNSmlDMMMSValueThreeDays, "three days" );
-_LIT8( KNSmlDMMMSValueWeek, "a week" );
-
-_LIT8( KNSmlDMMMSValueHourShort, "hour" );
-_LIT8( KNSmlDMMMSValueSixHoursShort, "six" );
-_LIT8( KNSmlDMMMSValueSixHoursShortNum, "6" );
-_LIT8( KNSmlDMMMSValueDayShort, "24" );
-_LIT8( KNSmlDMMMSValueThreeDaysShort, "three" );
-_LIT8( KNSmlDMMMSValueThreeDaysShortNum, "3" );
-_LIT8( KNSmlDMMMSValueWeekShort, "week" );
-_LIT8( KNSmlDMMMSValueMaximumTimeShort, "max" );
-_LIT8( KNSmlDMMMSValueMaximumTime , "maximum time" );
-
-_LIT8( KNSmlDMMMSValuePrimary, "Primary" );
-_LIT8( KNSmlDMMMSValueSecondary, "Secondary" );
-_LIT8( KNSmlMMSUriDotSlash, "./");
-_LIT8( KNSmlDMMMSIAPUri, "AP" );
-
-_LIT8( KNSmlDMMMSLevel3Parents, "MMS/MMSAcc" );
-_LIT8( KNSmlDMMMSLevel5Parents, "MMS/MMSAcc/Con/DCon" );
-_LIT8( KNSmlDMMMSLevel7Parents1, "MMS/MMSAcc/Con/DCon/MToNapID/Primary" );
-_LIT8( KNSmlDMMMSLevel7Parents2, "MMS/MMSAcc/Con/DCon/MToNapID/Secondary" );
-
-_LIT8( KNSmlDMMMSAclName, "MMS/MMSAcc/Name" );
-_LIT8( KNSmlDMMMSAclMMRecep, "MMS/MMSAcc/MMRecep" );
-_LIT8( KNSmlDMMMSAclCreMode, "MMS/MMSAcc/CreMode" );
-_LIT8( KNSmlDMMMSAclAMsg, "MMS/MMSAcc/AMsg" );
-_LIT8( KNSmlDMMMSAclRcvAds, "MMS/MMSAcc/RcvAds" );
-_LIT8( KNSmlDMMMSAclImgSize, "MMS/MMSAcc/ImgSize" );
-_LIT8( KNSmlDMMMSAclDRepSnd, "MMS/MMSAcc/DRepSnd" );
-_LIT8( KNSmlDMMMSAclRcvRep, "MMS/MMSAcc/RcvRep" );
-_LIT8( KNSmlDMMMSAclMsgVal, "MMS/MMSAcc/MsgVal" );
-_LIT8( KNSmlDMMMSAclMMSSAddr, "MMS/MMSAcc/Con/DCon/MMSSAddr" );
-_LIT8( KNSmlDMMMSAclPrimaryMToNapIDL, "MMS/MMSAcc/Con/DCon/MToNapID/Primary/MToNapIDL" );
-
-_LIT8(KNSmlDmMMSAclDefault, "Get=*&Replace=*");
-_LIT8(KNSmlDmMMSAclGet, "Get=*");
-
-/**
-* The main class of the SyncML DM MMS adapter.
-*
-*  @since 
-*/
-
-class CNSmlDmMMSAdapter : public CSmlDmAdapter, public MMsvSessionObserver
-    {
-public:
-    static CNSmlDmMMSAdapter* NewL(MSmlDmCallback* aDmCallback );
-
-    ~CNSmlDmMMSAdapter();
-    
-    // Adapter interface from CSmlDmAdapter
-    void DDFVersionL( CBufBase& aDDFVersion );
-    void DDFStructureL( MSmlDmDDFObject& aDDF );
-    void UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, 
-                            const TDesC8& aObject, const TDesC8& aType, 
-                            TInt aStatusRef );
-    void DeleteObjectL( const TDesC8& aURI, const TDesC8& aLUID, 
-                        const TInt aStatusRef ); 
-    void FetchLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, 
-                           const TDesC8& aType, const TInt aResultsRef, 
-                           const TInt aStatusRef ); 
-    void ChildURIListL( const TDesC8& aURI, const TDesC8& aLUID, 
-                        const CArrayFix<TSmlDmMappingInfo>& aPreviousURISegmentList, 
-                        const TInt aResultsRef, const TInt aStatusRef );
-    void AddNodeObjectL( const TDesC8& aURI, const TDesC8& aParentLUID, 
-                         const TInt aStatusRef );
-    void UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, 
-                            RWriteStream*& aStream, const TDesC8& aType, 
-                            const TInt aStatusRef );
-    void FetchLeafObjectSizeL( const TDesC8& aURI, const TDesC8& aLUID, 
-                               const TDesC8& aType, const TInt aResultsRef, 
-                               const TInt aStatusRef );
-    void ExecuteCommandL( const TDesC8& aURI, const TDesC8& aLUID, 
-                          const TDesC8& aArgument, const TDesC8& aType, 
-                          const TInt aStatusRef );
-    void ExecuteCommandL( const TDesC8& aURI, const TDesC8& aLUID, 
-                          RWriteStream*& aStream, const TDesC8& aType, 
-                          const TInt aStatusRef );
-    void CopyCommandL( const TDesC8& aTargetURI, const TDesC8& aTargetLUID, 
-                       const TDesC8& aSourceURI, const TDesC8& aSourceLUID, 
-                       const TDesC8& aType, TInt aStatusRef );
-    void StartAtomicL();
-    void CommitAtomicL();
-    void RollbackAtomicL();
-    TBool StreamingSupport( TInt& aItemSize );
-    void StreamCommittedL();
-    void CompleteOutstandingCmdsL();
-        
-    // from MMsvSessionObserver
-    void HandleSessionEventL( TMsvSessionEvent aEvent, TAny* aArg1, TAny* aArg2, 
-                              TAny* aArg3 );
-
-private:
-/**
- * Default constructor
- * @param   aDmCallback Pointer to callback interface
- * @return    
- */
-    CNSmlDmMMSAdapter( MSmlDmCallback* aDmCallback );
-
-/**
-* Second level constructor
-* @param    
-* @return    
-*/
-    void ConstructL();
-
-/**
-* Converts a descriptor to integer.
-* @param    aLuid Descriptor to convert.
-* @return    TInt value
-*/
-    TInt DesToInt( const TDesC& aLuid );
-/**
-* Removes the last uri segment, ie. everything after and including  the last "/" character.
-* @param    aURI The URI to process.
-* @return    The modified aURI
-*/
-
-    TPtrC8 RemoveLastURISeg( const TDesC8& aURI );
-/**
-* Calculates the number of the URI segments.
-* @param    aURI URI to process.
-* @return    The number of segments.
-*/
-
-    TInt NumOfURISegs( const TDesC8& aURI );
-/**
-* Parses the last segment of URI, ie everything after the last "/" character.
-* @param    aURI The URI to parse.
-* @return    The last segment of the URI.
-*/
-
-    TPtrC8 LastURISeg( const TDesC8& aURI );
-/**
-* Performs the actual UPDATE operation.
-* @param    aURI The URI to update.
-* @param    aParentLUID LUID of the object.
-* @param    aObject The new data to update.
-* @param    aStatusRef The command reference.
-* @return    Status of the UPDATE operation
-*/
-
-    CSmlDmAdapter::TError UpdateDataL( const TDesC8& aURI,
-                                       const TDesC8& aParentLUID, 
-                                       const TDesC8& aObject, 
-                                       TInt aStatusRef );
-/**
-* Replaces accesspoint in iMmsSettings's accesspoint array.
-* @param    aIapId The new IAP id to update.
-* @param    aPos A position to update IAP id
-* @return    
-*/
-
-    void ReplaceAPL( TInt aIapId, TInt aPos );
-/**
-* Performs updating of MMSAddr field.
-* @param    
-* @return   Status of the update. 
-*/
-
-    CSmlDmAdapter::TError UpdateMMSAddrL();
-/**
-* Retrieves the paramters to iMmsSettings class from phones permanent storage.
-* @param  
-* @return    
-*/
-
-    void CreateMMSClientL();
-
-/**
-* Updates the parameters of given DDF node
-* @param    aNode The node to update.
-* @param    aAccTypes Access types of the node.
-* @param    aOccurrence Occurrance of the node.
-* @param    aScope Scope of the node.
-* @param    aFormat Format of the node.
-* @param    aDescription A description of the node.
-* @return    
-*/
-
-    void FillNodeInfoL( MSmlDmDDFObject& aNode,TSmlDmAccessTypes aAccTypes,
-                        MSmlDmDDFObject::TOccurence aOccurrence, 
-                        MSmlDmDDFObject::TScope aScope, 
-                        MSmlDmDDFObject::TDFFormat aFormat,
-                        const TDesC8& aDescription);
-
-/**
-* Fetches a value from iMmsSettings class.
-* @param    aURI The URI to fetch
-* @param    aObject The container for the result.
-* @return    Status of the operation.
-*/
-
-    CSmlDmAdapter::TError FetchObjectL( const TDesC8& aURI, CBufBase& aObject );
-/**
-* Stores the contents of iMmsSettings class to phones permanen storage.
-* @param    
-* @return    
-*/
-
-    void StoreSettingsL();
-/**
-* Checks the URI validity.
-* @param    aURI The URI to check.
-* @return    Status of the operation.
-*/
-
-    CSmlDmAdapter::TError ValidateUriL(const TDesC8& aURI );
-    
-    TBool IsWAPAccessPointRecordLockedL(TUint32 aRecord);
-	  TInt DoProtectWAPAccessRecordL(TUint32 aRecord,TBool aProtect);
-private:
-    CClientMtmRegistry* iClientMtmRegistry;
-    CMsvSession* iMsvSession;
-    CMmsClientMtm *iMmsClient;
-    CMmsSettings* iMmsSettings;
-    MSmlDmCallback* iCallback;
-    TInt iStatusRef;
-    HBufC8 *iMMSSAddr;
-    TInt iImgSizeStatusRef;
-    CCommsDatabase* iDatabase;
-    };
-
-#endif // __NSMLDMMMSADAPTER_H__
-
-// End of File
--- a/omadm/omadmextensions/adapters/mms/src/nsmldmmmsadapter.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1513 +0,0 @@
-/*
-* 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:    DM MMS Settings Adapter
- *
-*/
-
-
-
-#include <iapprefs.h>
-#include <msvids.h>
-#include <msvuids.h>
-#include <utf.h>
-#include <implementationproxy.h> // For TImplementationProxy definition
-#include <commdb.h>
-#include <cdbcols.h>             // CommsDB columname defs
-#include <mmsclient.h>
-#include <ApUtils.h>
-#include <MmsConformance.h>
-#include <protectdb.h>
-
-#include "nsmldmimpluids.h"
-#include "nsmldmmmsadapter.h"
-#include "nsmldebug.h"
-#include "nsmlconstants.h"
-#include "nsmldmconst.h"
-#include "nsmldmiapmatcher.h"
-#include "nsmldmtreedbclient.h"
-
-#ifndef __WINS__
-// This lowers the unnecessary compiler warning (armv5) to remark.
-// "Warning:  #174-D: expression has no effect..." is caused by 
-// DBG_ARGS8 macro in no-debug builds.
-#pragma diag_remark 174
-#endif
-
-
-// -----------------------------------------------------------------------------
-// CNSmlDmMMSAdapter* CNSmlDmMMSAdapter::NewL( )
-// -----------------------------------------------------------------------------
-CNSmlDmMMSAdapter* CNSmlDmMMSAdapter::NewL(MSmlDmCallback* aDmCallback )
-    {
-    _DBG_FILE("CNSmlDmMMSAdapter::NewL(): begin");
-    CNSmlDmMMSAdapter* self = new (ELeave) CNSmlDmMMSAdapter(aDmCallback);
-    CleanupStack::PushL(self);
-    self->ConstructL();
-    CleanupStack::Pop();
-    _DBG_FILE("CNSmlDmMMSAdapter::NewL(): end");
-    return self;
-    }
-    
-// -----------------------------------------------------------------------------
-// CNSmlDmMMSAdapter::CNSmlDmMMSAdapter()
-// -----------------------------------------------------------------------------
-CNSmlDmMMSAdapter::CNSmlDmMMSAdapter(MSmlDmCallback* aDmCallback) 
-    : CSmlDmAdapter(aDmCallback)
-    {
-    _DBG_FILE("CNSmlDmMMSAdapter::CNSmlDmMMSAdapter(): begin");
-    _DBG_FILE("CNSmlDmMMSAdapter::CNSmlDmMMSAdapter(): end");
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDmMMSAdapter::ConstructL()
-// -----------------------------------------------------------------------------
-void CNSmlDmMMSAdapter::ConstructL()
-    {
-    _DBG_FILE("CNSmlDmMMSAdapter::ConstructL(): begin");
-    iStatusRef = KNSmlMMSUndefinedStatusRef;
-    iImgSizeStatusRef = KNSmlMMSUndefinedStatusRef;
-    iDatabase = CCommsDatabase::NewL(EDatabaseTypeIAP);
-    _DBG_FILE("CNSmlDmMMSAdapter::ConstructL(): end");
-    }
-
-
-// -----------------------------------------------------------------------------
-// CNSmlDmMMSAdapter::~CNSmlDmMMSAdapter()
-// -----------------------------------------------------------------------------
-CNSmlDmMMSAdapter::~CNSmlDmMMSAdapter()
-    {
-    _DBG_FILE("CNSmlDmMMSAdapter::~CNSmlDmMMSAdapter(): begin");
-    delete iMmsClient;
-    delete iClientMtmRegistry;
-    delete iMsvSession;
-    delete iMMSSAddr;
-    delete iMmsSettings;
-	if(iDatabase)
-    delete iDatabase;
-    _DBG_FILE("CNSmlDmMMSAdapter::~CNSmlDmMMSAdapter(): end");
-    }
-
-// -----------------------------------------------------------------------------
-//  CNSmlDmMMSAdapter::DDFVersionL()
-//  Returns the DDF version of the adapter
-// -----------------------------------------------------------------------------
-void CNSmlDmMMSAdapter::DDFVersionL(CBufBase& aDDFVersion)
-    {
-    _DBG_FILE("CNSmlDmMMSAdapter::DDFVersionL(TDes& aDDFVersion): begin");
-    aDDFVersion.InsertL(0,KNSmlDMMMSDDFVersion);
-    _DBG_FILE("CNSmlDmMMSAdapter::DDFVersionL(TDes& aDDFVersion): end");
-    }
-
-
-// -----------------------------------------------------------------------------
-//  CNSmlDmMMSAdapter::DDFStructureL()
-//  Builds the DDF structure of adapter
-// -----------------------------------------------------------------------------
-void CNSmlDmMMSAdapter::DDFStructureL( MSmlDmDDFObject& aDDF )
-    {
-    _DBG_FILE("CNSmlDmMMSAdapter::DDFStructureL(): begin");
-
-    TSmlDmAccessTypes accessTypesGetAdd;
-    accessTypesGetAdd.SetGet();
-    accessTypesGetAdd.SetAdd();
-    
-    TSmlDmAccessTypes accessTypesGet;
-    accessTypesGet.SetGet();
-
-    TSmlDmAccessTypes accessTypesNoDelete;
-    accessTypesNoDelete.SetGet();
-    accessTypesNoDelete.SetAdd();
-    accessTypesNoDelete.SetReplace();
-
-    // MMS
-    MSmlDmDDFObject& MMS = aDDF.AddChildObjectL(KNSmlDMMMSNodeName);
-    FillNodeInfoL(MMS,accessTypesGet,MSmlDmDDFObject::EOne,
-                  MSmlDmDDFObject::EPermanent,MSmlDmDDFObject::ENode,
-                  KNSmlDMMMSNodeNameDescription);
-
-    //run time node 
-    MSmlDmDDFObject& rtAcc = MMS.AddChildObjectGroupL();
-    FillNodeInfoL(rtAcc,accessTypesGet,MSmlDmDDFObject::EOne,
-                  MSmlDmDDFObject::EDynamic,MSmlDmDDFObject::ENode,
-                  KNSmlDMMMSDynamicNodeDescription);
-
-    //level of mms protocol operations
-    MSmlDmDDFObject& mmRecep = rtAcc.AddChildObjectL(KNSmlDMMMSMMRecep);
-    FillNodeInfoL(mmRecep,accessTypesNoDelete,MSmlDmDDFObject::EZeroOrOne,
-                  MSmlDmDDFObject::EDynamic,MSmlDmDDFObject::EChr,
-                  KNSmlDMMMSMMRecepDescription);
-
-    //Creation mode
-    MSmlDmDDFObject& creMode = rtAcc.AddChildObjectL(KNSmlDMMMSCreMode);
-    FillNodeInfoL(creMode,accessTypesNoDelete,MSmlDmDDFObject::EZeroOrOne,
-                  MSmlDmDDFObject::EDynamic,MSmlDmDDFObject::EChr,
-                  KNSmlDMMMSCreModeDescription);
-
-    //anonymous messages allowed
-    MSmlDmDDFObject& amsg = rtAcc.AddChildObjectL(KNSmlDMMMSAMsg);
-    FillNodeInfoL(amsg,accessTypesNoDelete,MSmlDmDDFObject::EZeroOrOne,
-                  MSmlDmDDFObject::EDynamic,MSmlDmDDFObject::EBool,
-                  KNSmlDMMMSAMsgDescription);
-
-    //adverts messages allowed
-    MSmlDmDDFObject& rcvAds = rtAcc.AddChildObjectL(KNSmlDMMMSRcvAds);
-    FillNodeInfoL(rcvAds,accessTypesNoDelete,MSmlDmDDFObject::EZeroOrOne,
-                  MSmlDmDDFObject::EDynamic,MSmlDmDDFObject::EBool,
-                  KNSmlDMMMSRcvAdsDescription);
-
-    //image size in sending
-    MSmlDmDDFObject& imgSize = rtAcc.AddChildObjectL(KNSmlDMMMSImgSize);
-    FillNodeInfoL(imgSize,accessTypesNoDelete,MSmlDmDDFObject::EZeroOrOne,
-                  MSmlDmDDFObject::EDynamic,MSmlDmDDFObject::EChr,
-                  KNSmlDMMMSImgSizeDescription);
-
-    //deny delivery report sending
-    MSmlDmDDFObject& dRepSnd = rtAcc.AddChildObjectL(KNSmlDMMMSDRepSnd);
-    FillNodeInfoL(dRepSnd,accessTypesNoDelete,MSmlDmDDFObject::EZeroOrOne,
-                  MSmlDmDDFObject::EDynamic,MSmlDmDDFObject::EBool,
-                  KNSmlDMMMSDRepSndDescription);
-
-    //delivery report requested by default
-    MSmlDmDDFObject& rcvRep = rtAcc.AddChildObjectL(KNSmlDMMMSRcvRep);
-    FillNodeInfoL(rcvRep,accessTypesNoDelete,MSmlDmDDFObject::EZeroOrOne,
-                  MSmlDmDDFObject::EDynamic,MSmlDmDDFObject::EBool,
-                  KNSmlDMMMSRcvRepDescription);
-
-    //message validity time
-    MSmlDmDDFObject& msgVal = rtAcc.AddChildObjectL(KNSmlDMMMSMsgVal);
-    FillNodeInfoL(msgVal,accessTypesNoDelete,MSmlDmDDFObject::EZeroOrOne,
-                  MSmlDmDDFObject::EDynamic,MSmlDmDDFObject::EChr,
-                  KNSmlDMMMSMsgValDescription);
-
-    // MMS/<X>/Con
-    MSmlDmDDFObject& con = rtAcc.AddChildObjectL(KNSmlDMMMSCon);
-    FillNodeInfoL(con,accessTypesGet,MSmlDmDDFObject::EOne,
-                  MSmlDmDDFObject::EDynamic,MSmlDmDDFObject::ENode,
-                  KNSmlDMMMSConNodeDescription);
-
-
-    // MMS/<X>/Con/<X>
-    MSmlDmDDFObject& rtCon = con.AddChildObjectL(KNSmlDMMMSConDynamicName16);
-    FillNodeInfoL(rtCon,accessTypesGet,MSmlDmDDFObject::EOne,
-                  MSmlDmDDFObject::EDynamic,MSmlDmDDFObject::ENode,
-                  KNSmlDMMMSConRtNodeDescription);
-
-
-    // MMS/<X>/Con/<X>/MMSSAddr
-    MSmlDmDDFObject& mmsAddr = rtCon.AddChildObjectL(KNSmlDMMMSMMSSAddr);
-    FillNodeInfoL(mmsAddr,accessTypesNoDelete,MSmlDmDDFObject::EOne,
-                  MSmlDmDDFObject::EDynamic,MSmlDmDDFObject::EChr,
-                  KNSmlDMMMSMMSSAddrDescription);
-
-    // MMS/<X>/Con/<X>/MToNapID
-    MSmlDmDDFObject& mToNapID = rtCon.AddChildObjectL(KNSmlDMMMSMToNapID);
-    FillNodeInfoL(mToNapID,accessTypesGet,MSmlDmDDFObject::EZeroOrOne,
-                  MSmlDmDDFObject::EDynamic,MSmlDmDDFObject::ENode,
-                  KNSmlDMMMSConRtNodeDescription);
-
-    // MMS/<X>/Con/<X>/MToNapID/<X>
-    MSmlDmDDFObject& rtNapIds = mToNapID.AddChildObjectL(KNullDesC8);
-    FillNodeInfoL(rtNapIds,accessTypesGet,MSmlDmDDFObject::EZeroOrOne,
-                  MSmlDmDDFObject::EDynamic,MSmlDmDDFObject::ENode,
-                  KNSmlDMMMSConRtNodeDescription);
-
-    // MMS/<X>/Con/<X>/MToNapID/<X>/MToNapIdL
-    MSmlDmDDFObject& mToNapIDL = rtNapIds.AddChildObjectL(KNSmlDMMMSMToNapIDL);
-    FillNodeInfoL(mToNapIDL,accessTypesNoDelete,MSmlDmDDFObject::EOneOrMore,
-                  MSmlDmDDFObject::EDynamic,MSmlDmDDFObject::EChr,
-                  KNSmlDMMMSMToNapIDLDescription);
-
-    RNSmlDMCallbackSession session;
-    User::LeaveIfError( session.Connect() );
-    CleanupClosePushL(session);
-    
-    session.UpdateAclL(KNSmlDMMMSLevel3Parents,KNSmlDmMMSAclGet);
-    session.UpdateAclL(KNSmlDMMMSAclName,KNSmlDmMMSAclDefault);
-    session.UpdateAclL(KNSmlDMMMSAclMMRecep,KNSmlDmMMSAclDefault);
-    session.UpdateAclL(KNSmlDMMMSAclCreMode,KNSmlDmMMSAclDefault);
-    session.UpdateAclL(KNSmlDMMMSAclAMsg,KNSmlDmMMSAclDefault);
-    session.UpdateAclL(KNSmlDMMMSAclRcvAds,KNSmlDmMMSAclDefault);
-    session.UpdateAclL(KNSmlDMMMSAclImgSize,KNSmlDmMMSAclDefault);
-    session.UpdateAclL(KNSmlDMMMSAclDRepSnd,KNSmlDmMMSAclDefault);
-    session.UpdateAclL(KNSmlDMMMSAclRcvRep,KNSmlDmMMSAclDefault);
-    session.UpdateAclL(KNSmlDMMMSAclMsgVal,KNSmlDmMMSAclDefault);
-    session.UpdateAclL(KNSmlDMMMSAclMMSSAddr,KNSmlDmMMSAclDefault);
-    session.UpdateAclL(KNSmlDMMMSAclPrimaryMToNapIDL,KNSmlDmMMSAclDefault);
-    CleanupStack::PopAndDestroy(); //session
-    
-    _DBG_FILE("CNSmlDmMMSAdapter::DDFStructureL(): end");
-    }
-
-// -----------------------------------------------------------------------------
-//  CNSmlDmMMSAdapter::UpdateLeafObjectL()
-// Updates value of leaf object
-// -----------------------------------------------------------------------------
-void CNSmlDmMMSAdapter::UpdateLeafObjectL( const TDesC8& aURI, 
-                                           const TDesC8& aLUID, 
-                                           const TDesC8& aObject, 
-                                           const TDesC8& /*aType*/, 
-                                           const TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlDmMMSAdapter::UpdateLeafObjectL(): begin");
-    CSmlDmAdapter::TError status = ValidateUriL( aURI );
-    if ( status == EOk )
-        {
-        _DBG_FILE("CNSmlDmMMSAdapter::UpdateLeafObjectL(): OK update");
-        status = UpdateDataL(aURI, aLUID, aObject, aStatusRef);
-        }
-    // ImgSize and MMSAddr are always stored last, from the 
-    // CompleteOutstandingCmdsL() function
-    if( ( aStatusRef != iStatusRef ) && (aStatusRef != iImgSizeStatusRef ))
-        {
-        StoreSettingsL();
-        Callback().SetStatusL(aStatusRef, status);
-        }
-    _DBG_FILE("CNSmlDmMMSAdapter::UpdateLeafObjectL(): end");
-    }
-// -----------------------------------------------------------------------------
-// CNSmlDmMMSAdapter::DeleteObjectL( const TDesC8& aURI, const TDesC8& aLUID )
-// This should delete values or accounts, but in case of MMS adapter the delete 
-// is not allowed
-// and the adapters returns allways the EError.
-// -----------------------------------------------------------------------------
-void CNSmlDmMMSAdapter::DeleteObjectL( const TDesC8& /*aURI*/, 
-                                       const TDesC8& /*aLUID*/, 
-                                       const TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlDmMMSAdapter::DeleteLeafObjectL( ): begin");
-
-    Callback().SetStatusL(aStatusRef, CSmlDmAdapter::EError);
-    _DBG_FILE("CNSmlDmMMSAdapter::DeleteLeafObjectL( ): end");
-    }
-// -----------------------------------------------------------------------------
-//  CNSmlDmMMSAdapter::FetchLeafObjectL( const TDesC8& aURI, 
-//  const TDesC8& aLUID,
-//  const TDesC8& aType, 
-//  const TInt aResultsRef, 
-//  const TInt aStatusRef )
-//  Fetches the values of leaf objects.
-// -----------------------------------------------------------------------------
-void CNSmlDmMMSAdapter::FetchLeafObjectL( const TDesC8& aURI, 
-                                          const TDesC8& /*aLUID*/, 
-                                          const TDesC8& aType, 
-                                          const TInt aResultsRef, 
-                                          const TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlDmMMSAdapter::FetchLeafObjectL(): begin");
-    CBufBase* result = CBufFlat::NewL(64);
-    CleanupStack::PushL(result);
-    CSmlDmAdapter::TError status = FetchObjectL(aURI, *result);
-    if(status == CSmlDmAdapter::EOk)
-        {
-        Callback().SetResultsL(aResultsRef,*result,aType);
-        }
-    Callback().SetStatusL(aStatusRef, status);
-
-    CleanupStack::PopAndDestroy(); //result
-    _DBG_FILE("CNSmlDmMMSAdapter::FetchLeafObjectL(): end");
-    }
-
-// -----------------------------------------------------------------------------
-//  CNSmlDmMMSAdapter::ChildURIListL( const TDesC8& aURI, 
-//                                       const TDesC8& /*aLUID*/, 
-//                                       const CArrayFix<TSmlDmMappingInfo>& 
-//                                       /*aPreviousURISegmentList*/, 
-//                                       const TInt aResultsRef, 
-//                                       const TInt aStatusRef )
-//  Retuns the list of children of the node
-// -----------------------------------------------------------------------------
-void CNSmlDmMMSAdapter::ChildURIListL( const TDesC8& aURI, 
-                                       const TDesC8& /*aLUID*/, 
-                                       const CArrayFix<TSmlDmMappingInfo>& 
-                                       /*aPreviousURISegmentList*/, 
-                                       const TInt aResultsRef, 
-                                       const TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlDmMMSAdapter::ChildURIListL(): begin");
-    TRAPD(err, CreateMMSClientL());
-    if(err!=KErrNone)
-        {
-        Callback().SetStatusL(aStatusRef, CSmlDmAdapter::EError);
-        _DBG_FILE("CNSmlDmMMSAdapter::ChildURIListL(): EError end");
-        return;
-        }
-
-    CBufBase* currentList = CBufFlat::NewL(1);
-    CleanupStack::PushL(currentList);
-
-    TMsvId id = iMmsSettings->Service();
-    if(id==KMsvNullIndexEntryId)
-        {
-        if(aURI.Compare(KNSmlDMMMSNodeName)==0)
-            {
-            Callback().SetResultsL(aResultsRef,*currentList,KNullDesC8);
-            Callback().SetStatusL(aStatusRef, CSmlDmAdapter::EOk);
-            _DBG_FILE("CNSmlDmMMSAdapter::ChildURIListL(): end");
-            }
-        else
-            {
-            Callback().SetStatusL(aStatusRef, CSmlDmAdapter::ENotFound);
-            _DBG_FILE("CNSmlDmMMSAdapter::ChildURIListL(): ENotFound end");
-            }
-        CleanupStack::PopAndDestroy(); //currentList
-        return;
-        }
-
-    CSmlDmAdapter::TError status = CSmlDmAdapter::EOk;
-    TPtrC8 lastSeg = LastURISeg(aURI);
-    TInt num = NumOfURISegs(aURI);
-
-    if(aURI.Compare(KNSmlDMMMSNodeName)==0)
-        {
-        currentList->InsertL(0,KNSmlDMMMSAccount8);
-        }
-    else if(num==2&&aURI.Find(KNSmlDMMMSAccount8)>=0)
-        {
-        currentList->InsertL(0,KNSmlDMMMSListOfLeafsLo);
-        }
-    else if(num==3&&lastSeg.Compare(KNSmlDMMMSCon)==0)
-        {
-        currentList->InsertL(0,KNSmlDMMMSConDynamicName8);
-        }
-    else if(num==4&&lastSeg.Compare(KNSmlDMMMSConDynamicName16)==0)
-        {
-        currentList->InsertL(0,KNSmlDMMMSListOfLeafsMid);
-        }
-    else if(num==5&&lastSeg.Compare(KNSmlDMMMSMToNapID)==0)
-        {
-        currentList->InsertL(0,KNSmlDMMMSValuePrimary);
-        }
-    else if(num==6&&(lastSeg.Compare(KNSmlDMMMSDynamicPrimary)==0))
-        {
-        currentList->InsertL(0,KNSmlDMMMSListOfLeafsHi);
-        }
-    else
-        {
-        status=CSmlDmAdapter::ENotFound;
-        }
-    Callback().SetStatusL(aStatusRef, status);
-    if(status==CSmlDmAdapter::EOk)
-        {
-        Callback().SetResultsL(aResultsRef,*currentList,KNullDesC8);
-        }
-    CleanupStack::PopAndDestroy(); //currentList
-
-    _DBG_FILE("CNSmlDmMMSAdapter::ChildURIListL(): end");
-    }
-// -----------------------------------------------------------------------------
-// CNSmlDmMMSAdapter::AddNodeObjectL( const TDesC8& aURI, 
-// const TDesC8& aParentLUID )
-// This should add a new account, but in case of MMS settings only one 
-// account exist,
-// and so the add is not possible. Returns allways CSmlDmAdapter::EError.
-// -----------------------------------------------------------------------------
-void CNSmlDmMMSAdapter::AddNodeObjectL( const TDesC8& /*aURI*/, 
-                                        const TDesC8& /*aParentLUID*/, 
-                                        const TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlDmMMSAdapter::AddNodeObjectL(): begin");
-    //If add is needed in future then add call to AddObjectL function here
-    Callback().SetStatusL(aStatusRef, CSmlDmAdapter::EError);
-    _DBG_FILE("CNSmlDmMMSAdapter::AddNodeObjectL(): end");
-    }
-// -----------------------------------------------------------------------------
-// CNSmlDmMMSAdapter::UpdateLeafObjectL( const TDesC8& aURI, 
-// const TDesC8& aLUID, RWriteStream*& aStream, const TDesC8& aType,
-//  const TInt aStatusRef )
-// This should update a stream object, but in case of MMS settings streaming is 
-// not supported.
-// -----------------------------------------------------------------------------
-void CNSmlDmMMSAdapter::UpdateLeafObjectL( const TDesC8& /*aURI*/, 
-                                           const TDesC8& /*aLUID*/, 
-                                           RWriteStream*& /*aStream*/, 
-                                           const TDesC8& /*aType*/, 
-                                           const TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlDmMMSAdapter::UpdateLeafObjectL(stream): begin");
-    Callback().SetStatusL(aStatusRef, CSmlDmAdapter::EError);
-    _DBG_FILE("CNSmlDmMMSAdapter::UpdateLeafObjectL(stream): end");
-    }
-// -----------------------------------------------------------------------------
-// void CNSmlDmMMSAdapter::FetchLeafObjectSizeL( const TDesC8& aURI, 
-// const TDesC8& aLUID, const TDesC8& aType, const TInt aResultsRef, 
-// const TInt aStatusRef )
-// Fetches data object and returns its size.
-// -----------------------------------------------------------------------------
-void CNSmlDmMMSAdapter::FetchLeafObjectSizeL( const TDesC8& aURI, 
-                                              const TDesC8& /*aLUID*/, 
-                                              const TDesC8& aType, 
-                                              const TInt aResultsRef, 
-                                              const TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlDmMMSAdapter::FetchLeafObjectSizeL(): begin");
-
-    CBufBase* result = CBufFlat::NewL(64);
-    CleanupStack::PushL(result);
-    CSmlDmAdapter::TError status = FetchObjectL(aURI, *result);
-    if( status == CSmlDmAdapter::EOk )
-        {
-        TInt objSizeInBytes = result->Size();
-        TBuf8<KNSmlDmMmsObjectSizeWidth> stringObjSizeInBytes;
-        stringObjSizeInBytes.Num( objSizeInBytes );
-        result->Reset();
-        result->InsertL( 0, stringObjSizeInBytes );
-        Callback().SetResultsL(aResultsRef, *result, aType);
-        }
-    Callback().SetStatusL(aStatusRef, status);
-    CleanupStack::PopAndDestroy(); //result
-    _DBG_FILE("CNSmlDmMMSAdapter::FetchLeafObjectSizeL(): end");
-    }
-//==============================================================================
-// CNSmlDmMMSAdapter::ExecuteCommandL()
-//==============================================================================
-void CNSmlDmMMSAdapter::ExecuteCommandL( const TDesC8& /*aURI*/, 
-                                         const TDesC8& /*aLUID*/, 
-                                         const TDesC8& /*aArgument*/, 
-                                         const TDesC8& /*aType*/, 
-                                         const TInt aStatusRef )
-    {
-    //Not supported 
-    Callback().SetStatusL(aStatusRef, CSmlDmAdapter::EError);
-    }
-
-//==============================================================================
-// CNSmlDmMMSAdapter::ExecuteCommandL()
-//==============================================================================
-void CNSmlDmMMSAdapter::ExecuteCommandL( const TDesC8& /*aURI*/, 
-                                         const TDesC8& /*aLUID*/, 
-                                         RWriteStream*& /*aStream*/, 
-                                         const TDesC8& /*aType*/, 
-                                         const TInt aStatusRef )
-    {
-    //Not supported
-    Callback().SetStatusL(aStatusRef, CSmlDmAdapter::EError);
-    }
-
-//==============================================================================
-// CNSmlDmMMSAdapter::CopyCommandL()
-//==============================================================================
-void CNSmlDmMMSAdapter::CopyCommandL( const TDesC8& /*aTargetURI*/, 
-                                      const TDesC8& /*aTargetLUID*/, 
-                                      const TDesC8& /*aSourceURI*/, 
-                                      const TDesC8& /*aSourceLUID*/, 
-                                      const TDesC8& /*aType*/, 
-                                      TInt aStatusRef )
-    {
-    //Not supported
-    Callback().SetStatusL(aStatusRef, CSmlDmAdapter::EError);
-
-    }
-
-//==============================================================================
-// CNSmlDmMMSAdapter::StartAtomicL()
-//==============================================================================
-void CNSmlDmMMSAdapter::StartAtomicL()
-    {
-    //Not supported
-    }
-
-//==============================================================================
-// CNSmlDmMMSAdapter::CommitAtomicL()
-//==============================================================================
-void CNSmlDmMMSAdapter::CommitAtomicL()
-    {
-    //Not supported
-    }
-
-//==============================================================================
-// CNSmlDmMMSAdapter::RollbackAtomicL()
-//==============================================================================
-void CNSmlDmMMSAdapter::RollbackAtomicL()
-    {
-    //Not supported
-    }
-
-//==============================================================================
-// CNSmlDmMMSAdapter::StreamingSupport()
-//==============================================================================
-TBool CNSmlDmMMSAdapter::StreamingSupport( TInt& /*aItemSize*/ )
-    {
-    return EFalse;
-    }
-
-//==============================================================================
-// CNSmlDmMMSAdapter::StreamCommittedL()
-//==============================================================================
-void CNSmlDmMMSAdapter::StreamCommittedL()
-    {
-    //Not supported
-    }
-// -----------------------------------------------------------------------------
-// CNSmlDmMMSAdapter::CompleteOutstandingCmdsL()
-// Indication of message ending. The buffered commands must be executed before 
-// return of this function.
-// -----------------------------------------------------------------------------
-void CNSmlDmMMSAdapter::CompleteOutstandingCmdsL()
-    {
-    _DBG_FILE("CNSmlDmMMSAdapter::CompleteOutstandingCmdsL(): begin");
-    if(iStatusRef!=KNSmlMMSUndefinedStatusRef)
-        {
-        Callback().SetStatusL(iStatusRef,UpdateMMSAddrL());
-        delete iMMSSAddr;
-        iMMSSAddr = 0;
-        iStatusRef = KNSmlMMSUndefinedStatusRef;
-        }
-    StoreSettingsL();
-    _DBG_FILE("CNSmlDmMMSAdapter::CompleteOutstandingCmdsL(): end");
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDmMMSAdapter::HandleSessionEventL()
-// Inherited from MMsvSessionObserver, and this is needs to implemented for 
-// opening the CMsvSession
-// -----------------------------------------------------------------------------
-void CNSmlDmMMSAdapter::HandleSessionEventL( TMsvSessionEvent /*aEvent*/, 
-                                             TAny* /*aArg1*/, 
-                                             TAny* /*aArg2*/, 
-                                             TAny* /*aArg3*/ )
-    {
-    }
-
-
-// -----------------------------------------------------------------------------
-// CSmlDmAdapter::TError CNSmlDmMMSAdapter::UpdateDataL()
-// The function is used for updating the MMS settings. The function is used in 
-// AddLeafObjectL() and UpdateLeafObjectL()
-// -----------------------------------------------------------------------------
-CSmlDmAdapter::TError CNSmlDmMMSAdapter::UpdateDataL(const TDesC8& aURI, 
-                                                     const TDesC8& /*aParentLUID*/,
-                                                     const TDesC8& aObject, 
-                                                     TInt aStatusRef)
-    {
-    _DBG_FILE("CNSmlDmMMSAdapter::UpdateDataL(): begin");
-    HBufC8* data = NULL;
-    TRAPD(err, CreateMMSClientL());
-    if(err!=KErrNone)
-        {
-        _DBG_FILE("CNSmlDmMMSAdapter::UpdateDataL(): EError end");
-        return CSmlDmAdapter::EError;
-        }
-
-    TMsvId id = iMmsSettings->Service();
-
-    if( id == KMsvNullIndexEntryId || aURI.Find( KNSmlDMMMSAccount8 )
-        ==KErrNotFound )
-        {
-        _DBG_FILE("CNSmlDmMMSAdapter::UpdateDataL(): ENotFound end");
-        return CSmlDmAdapter::ENotFound;
-        }
-
-    TPtrC8 uriSeg = LastURISeg(aURI);
-    CSmlDmAdapter::TError status = CSmlDmAdapter::EOk;
-
-    if(uriSeg.Compare(KNSmlDMMMSName)==0)
-        {
-        // Not supported.
-        _DBG_FILE("CNSmlDmMMSAdapter::UpdateDataL(): ENotFound end");
-        status = CSmlDmAdapter::ENotFound;
-        }
-    else if(uriSeg.Compare(KNSmlDMMMSMMRecep)==0)
-        {
-        data = aObject.AllocLC();
-        TPtr8 dataPtr = data->Des();
-        dataPtr.Capitalize();
-        if(dataPtr.Find(KNSmlDMMMSValueAlwaysOn)==0)
-            {
-            iMmsSettings->SetReceivingModeHome(EMmsReceivingAutomatic);
-            iMmsSettings->SetReceivingModeForeign(EMmsReceivingAutomatic);
-            }
-        else if(dataPtr.Compare(KNSmlDMMMSValueOff)==0)
-            {
-            iMmsSettings->SetReceivingModeHome(EMmsReceivingReject);
-            iMmsSettings->SetReceivingModeForeign(EMmsReceivingReject);
-            }
-        else if(dataPtr.Find(KNSmlDMMMSValueAutomaticAtHome)==0)
-            {
-            iMmsSettings->SetReceivingModeHome(EMmsReceivingAutomatic);
-            iMmsSettings->SetReceivingModeForeign(EMmsReceivingReject);
-            }
-        else if (dataPtr.Find(KNSmlDMMMSValueAlwaysManual2)==0 ||
-                 dataPtr.Find(KNSmlDMMMSValueAlwaysManual)==0 )
-            {
-            iMmsSettings->SetReceivingModeHome(EMmsReceivingManual);
-            iMmsSettings->SetReceivingModeForeign(EMmsReceivingManual);
-            }
-        else
-            {
-            status = CSmlDmAdapter::EInvalidObject;
-            }
-        CleanupStack::PopAndDestroy(); //data
-        }
-    else if(uriSeg.Compare(KNSmlDMMMSCreMode)==0)
-        {
-        data = aObject.AllocLC();
-        TPtr8 dataPtr = data->Des();
-        dataPtr.Capitalize();
-        if(dataPtr.Find(KNSmlDMMMSValueFree)==0)
-            {
-            iMmsSettings->SetCreationMode(EMmsCreationModeFree);
-            }
-        else if(dataPtr.Find(KNSmlDMMMSValueRestricted)==0)
-            {
-               iMmsSettings->SetImageWidth(KImageRichWidth);
-               iMmsSettings->SetImageHeight(KImageRichHeight);
-               iMmsSettings->SetCreationMode(EMmsCreationModeRestricted);
-            }
-        else if(dataPtr.Find(KNSmlDMMMSValueWarning)==0)
-            {
-            iMmsSettings->SetCreationMode(EMmsCreationModeWarning);
-            }
-        else
-            {
-            status = CSmlDmAdapter::EInvalidObject;
-            }
-        CleanupStack::PopAndDestroy(); //data
-        }
-    else if( uriSeg.Compare(KNSmlDMMMSAMsg) == 0 )
-        {
-        data = aObject.AllocLC();
-        TPtr8 dataPtr = data->Des();
-        dataPtr.Capitalize();
-        TBool object=EFalse;
-        if(dataPtr.Find(KNSmlDMMMSValueTrue)>=0)
-            {
-            object = ETrue;
-            }
-        iMmsSettings->SetAcceptAnonymousMessages(object);
-        CleanupStack::PopAndDestroy(); //data
-        }
-    else if( uriSeg.Compare(KNSmlDMMMSRcvAds) == 0 )
-        {
-        data = aObject.AllocLC();
-        TPtr8 dataPtr = data->Des();
-        dataPtr.Capitalize();
-        TBool object=EFalse;
-        if(dataPtr.Find(KNSmlDMMMSValueTrue)>=0)
-            {
-            object = ETrue;
-            }
-        iMmsSettings->SetAcceptAdvertisementMessages(object);
-        CleanupStack::PopAndDestroy(); //data
-        }
-    else if(uriSeg.Compare(KNSmlDMMMSImgSize)==0)
-        {
-        data = aObject.AllocLC();
-        TPtr8 dataPtr = data->Des();
-        dataPtr.Capitalize();
-        if(dataPtr.Compare(KNSmlDMMMSValueLarge)==0)
-            {
-             switch(iMmsSettings->CreationMode())
-            {
-                case EMmsCreationModeRestricted:
-                status = CSmlDmAdapter::EInvalidObject;
-                break;
-                default : 
-                iMmsSettings->SetImageWidth(KImageMegapixelWidth);
-                iMmsSettings->SetImageHeight(KImageMegapixelHeight);
-                break;
-            }
-            iImgSizeStatusRef = KNSmlMMSUndefinedStatusRef;
-            }
-        else if(dataPtr.Compare(KNSmlDMMMSValueSmall)==0)
-            {
-            iMmsSettings->SetImageWidth(KImageRichWidth);
-            iMmsSettings->SetImageHeight(KImageRichHeight);
-            iImgSizeStatusRef = KNSmlMMSUndefinedStatusRef;
-            }
-        else
-            {
-            status = CSmlDmAdapter::EInvalidObject;
-            }
-        CleanupStack::PopAndDestroy(); //data
-        }
-    else if(uriSeg.Compare(KNSmlDMMMSDRepSnd)==0)
-        {
-        data = aObject.AllocLC();
-        TPtr8 dataPtr = data->Des();
-        dataPtr.Capitalize();
-        if(dataPtr.Compare(KNSmlDMMMSValueFalse)==0)
-            {
-            iMmsSettings->SetDeliveryReportSendingAllowed(KMmsYes);
-            }
-        else
-            {
-            iMmsSettings->SetDeliveryReportSendingAllowed(KMmsNo);
-            }
-        CleanupStack::PopAndDestroy(); //data
-        }
-    else if(uriSeg.Compare(KNSmlDMMMSRcvRep)==0)
-        {
-        data = aObject.AllocLC();
-        TPtr8 dataPtr = data->Des();
-        dataPtr.Capitalize();
-        if(dataPtr.Compare(KNSmlDMMMSValueTrue)==0)
-            {
-            iMmsSettings->SetDeliveryReportWanted(KMmsYes);
-            }
-        else
-            {
-            iMmsSettings->SetDeliveryReportWanted(KMmsNo);
-            }
-        CleanupStack::PopAndDestroy(); //data
-        }
-    else if(uriSeg.Compare(KNSmlDMMMSMsgVal)==0)
-        {
-        data = aObject.AllocLC();
-        TPtr8 dataPtr = data->Des();
-        dataPtr.LowerCase();
-        if(dataPtr.Compare(KNSmlDMMMSValueHour)==0 ||
-           dataPtr.Compare(KNSmlDMMMSValueHourShort)==0)
-            {
-            iMmsSettings->SetExpiryInterval(KNSmlDMMMSExpiryHour);
-            }
-        else if(dataPtr.Find(KNSmlDMMMSValueSixHoursShort)==0 ||
-                dataPtr.Find(KNSmlDMMMSValueSixHoursShortNum)==0)
-            {
-            iMmsSettings->SetExpiryInterval(KNSmlDMMMSExpirySixHours);
-            }
-        else if(dataPtr.Find(KNSmlDMMMSValueDayShort)==0)
-            {
-            iMmsSettings->SetExpiryInterval(KNSmlDMMMSExpiryDay);
-            }
-        else if(dataPtr.Find(KNSmlDMMMSValueThreeDaysShort)==0 ||
-                dataPtr.Find(KNSmlDMMMSValueThreeDaysShortNum)==0)
-            {
-            iMmsSettings->SetExpiryInterval(KNSmlDMMMSExpiryThreeDays);
-            }
-        else if(dataPtr.Find(KNSmlDMMMSValueWeekShort)>=0)
-            {
-            iMmsSettings->SetExpiryInterval(KNSmlDMMMSExpiryWeek);
-            }
-        else if(dataPtr.Find(KNSmlDMMMSValueMaximumTimeShort)==0)
-            {
-            iMmsSettings->SetExpiryInterval(KNSmlDMMMSExpiryMaximum);
-            }
-        else
-            {
-            status = CSmlDmAdapter::EInvalidObject;
-            }
-        CleanupStack::PopAndDestroy(); //data
-        }
-    else if(uriSeg.Compare(KNSmlDMMMSMToNapIDL)==0)
-        {
-        TPtrC8 seg=LastURISeg(RemoveLastURISeg(aURI));
-        if( seg.Compare(KNSmlDMMMSDynamicPrimary)==0 )
-            {
-            CNSmlDMIAPMatcher* iapmatch = CNSmlDMIAPMatcher::NewL( &Callback() );
-            CleanupStack::PushL(iapmatch);
-            
-            TInt iap = iapmatch->IAPIdFromURIL( aObject );
-
-            CleanupStack::PopAndDestroy(); // iapmatch
-            
-            if ( iap != KErrNotFound )
-                {
-                CCommsDatabase* commDb = CCommsDatabase::NewL();
-                CleanupStack::PushL(commDb);
-                CApUtils* aputils = CApUtils::NewLC(*commDb);
-                TRAP(err, iap = aputils->WapIdFromIapIdL( iap ) );
-                DBG_ARGS(_S("IAP = %d"), iap);
-
-                CleanupStack::PopAndDestroy(2); //commdb,aputils
-
-                if( err == KErrNone)
-                    {
-                    ReplaceAPL( iap, KNSmlDMMMSFirstAccessPointId );
-                    }
-                else
-                    {
-                    _DBG_FILE("CNSmlDmMMSAdapter::UpdateDataL(): \
-                    err!=KErrNone");
-                    iap = KNSmlDMMMSIapNotDefined;
-                    status = CSmlDmAdapter::EInvalidObject;
-                    }
-                }
-            else
-                {
-                _DBG_FILE("CNSmlDmMMSAdapter::UpdateDataL(): status = \
-                CSmlDmAdapter::EInvalidObject");
-                status = CSmlDmAdapter::EInvalidObject;
-                }
-            }
-        else
-            {
-            if( status == CSmlDmAdapter::EOk )
-                {
-                status = CSmlDmAdapter::ENotFound;
-                }
-            }
-        }
-    else if(uriSeg.Compare(KNSmlDMMMSMMSSAddr)==0)
-        {
-        if(iMMSSAddr)
-            {
-            delete iMMSSAddr;
-            iMMSSAddr = 0;
-            }
-        if(iStatusRef != KNSmlMMSUndefinedStatusRef)
-            {
-            Callback().SetStatusL(iStatusRef,CSmlDmAdapter::EError);
-            }
-        iMMSSAddr = aObject.AllocL();
-        iStatusRef = aStatusRef;
-        }
-
-    _DBG_FILE("CNSmlDmMMSAdapter::UpdateDataL(): end");
-    return status;
-    }
-
-// -----------------------------------------------------------------------------
-// void CNSmlDmMMSAdapter::ReplaceAP( TInt aIapId, TInt aPos )
-// replace AP, if no AP exitst in aPos then just add it.
-// -----------------------------------------------------------------------------
-void CNSmlDmMMSAdapter::ReplaceAPL( TInt aIapId, TInt aPos )
-    {
-    if( iMmsSettings->AccessPoint( aPos ) != KErrNotFound )
-        {
-        iMmsSettings->DeleteAccessPointL( aPos );
-        }
-    iMmsSettings->AddAccessPointL( aIapId, aPos );
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDmMMSAdapter::UpdateMMSAddrL()
-// Executes the buffered MMSSAddr update command. 
-// This command is called from CompleteOutstandingCmdsL() 
-// -----------------------------------------------------------------------------
-CSmlDmAdapter::TError CNSmlDmMMSAdapter::UpdateMMSAddrL()
-    {
-    _DBG_FILE("CNSmlDmMMSAdapter::UpdateMMSAddrL(): begin");
-    CSmlDmAdapter::TError status = CSmlDmAdapter::EOk;
-
-    TBool ok = EFalse;
-    TUint32 wapid = iMmsSettings->AccessPoint(KNSmlDMMMSFirstAccessPointId);
-    
-    //Check if locked , if locked unlock else execute normal sequence.
-        
-        TBool reclock = EFalse;
-        TBool lockerror =KErrNone;
-        reclock = IsWAPAccessPointRecordLockedL(wapid);
-        if(reclock)
-        {
-        	_DBG_FILE("CNSmlDmMMSAdapter::UpdateMMSAddrL():making record unlock");
-        	//unlock the record
-        	lockerror = DoProtectWAPAccessRecordL(wapid,EFalse);
-        	_DBG_FILE("CNSmlDmMMSAdapter::UpdateMMSAddrL():record unlocked with error as ");
-        	DBG_ARGS(_S("err = %d"), lockerror);
-        }
-        
-    
-    CCommsDbTableView* tableView=0;
-    tableView = iDatabase->OpenViewMatchingUintLC(TPtrC(WAP_ACCESS_POINT),
-                                               TPtrC(COMMDB_ID), wapid );        
-    if(tableView->GotoFirstRecord()==KErrNone)
-        {
-        _DBG_FILE("CNSmlDmMMSAdapter::UpdateMMSAddrL(): GotoFirstRecord");
-        
-        
-        //If it was unlocked, lock it again
-        
-        if(lockerror == KErrNone)
-        {
-        	TInt err = tableView->UpdateRecord();
-        	if(err == KErrNone)
-        	{
-        		HBufC* object = HBufC::NewLC(iMMSSAddr->Length());
-        TPtr obPtr = object->Des();
-        CnvUtfConverter::ConvertToUnicodeFromUtf8( obPtr, *iMMSSAddr);
-
-        TRAPD(err,tableView->WriteLongTextL(TPtrC(WAP_START_PAGE),obPtr));
-        DBG_ARGS(_S("err = %d"), err);
-        if(err==KErrNone)
-            {
-            _DBG_FILE("CNSmlDmMMSAdapter::UpdateMMSAddrL(): Write OK");
-            tableView->PutRecordChanges();
-            ok = ETrue;
-            }
-        CleanupStack::PopAndDestroy(); //object
-        
-        	}
-        	
-        }
-        
-        }
-    CleanupStack::PopAndDestroy(1); //tableview  //, commDb--iDatabase
-if(reclock)
-        	{
-        		TInt err = DoProtectWAPAccessRecordL(wapid,ETrue);
-        	_DBG_FILE("CNSmlDmMMSAdapter::UpdateMMSAddrL():record again locked with error as ");
-        	 DBG_ARGS(_S("err = %d"), err);
-        	 reclock = EFalse;
-        	}
-    if(!ok)
-        {
-        status = CSmlDmAdapter::EError;
-        }
-
-    _DBG_FILE("CNSmlDmMMSAdapter::UpdateMMSAddrL(): end");
-    return status;
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDmMMSAdapter::DesToInt()
-// Converts a 16 bit descriptor to TInt
-// -----------------------------------------------------------------------------
-TInt CNSmlDmMMSAdapter::DesToInt(const TDesC& aLuid)
-    {
-    TLex16 lex(aLuid);
-    TInt value = 0;
-    lex.Val(value);
-    return value;
-    }
-
-
-// -----------------------------------------------------------------------------
-// TPtrC8 CNSmlDmMMSAdapter::RemoveLastURISeg(const TDesC8& aURI)
-// returns parent uri, i.e. removes last uri segment
-// -----------------------------------------------------------------------------
-TPtrC8 CNSmlDmMMSAdapter::RemoveLastURISeg(const TDesC8& aURI)
-    {
-    TInt i;
-    for(i=aURI.Length()-1;i>=0;i--)
-        {
-        if(aURI[i]==KNSmlDMMMSSeparatorDef)
-            {
-            break;
-            }
-        }
-    return aURI.Left(i);
-    }
-
-
-
-// -----------------------------------------------------------------------------
-// TInt CNSmlDmMMSAdapter::NumOfURISegs(const TDesC8& aURI)
-// Returns the num of uri segs
-// -----------------------------------------------------------------------------
-TInt CNSmlDmMMSAdapter::NumOfURISegs(const TDesC8& aURI)
-    {
-    TInt numOfURISegs = 1;
-    for(TInt i=0;i<aURI.Length();i++)
-        {
-        if(aURI[i]==KNSmlDMMMSSeparatorDef)
-            {
-            numOfURISegs++;
-            }
-        }
-    return numOfURISegs;
-    }
-
-
-// -----------------------------------------------------------------------------
-// TPtrC8 CNSmlDmMMSAdapter::LastURISeg(const TDesC8& aURI)
-// Returns only the last uri segemnt
-// -----------------------------------------------------------------------------
-TPtrC8 CNSmlDmMMSAdapter::LastURISeg(const TDesC8& aURI)
-    {
-    _DBG_FILE("CNSmlDmMMSAdapter::LastURISeg() : begin");
-    TInt i;
-    for(i=aURI.Length()-1;i>=0;i--)
-        {
-        if(aURI[i]==KNSmlDMMMSSeparatorDef)
-            {
-            break;
-            }
-        }
-    _DBG_FILE("CNSmlDmMMSAdapter::LastURISeg() : end");
-    if(i==0)
-        {
-        return aURI;
-        }
-    else
-        {
-        return aURI.Mid(i+1);
-        }
-    }
-
-
-// -----------------------------------------------------------------------------
-// CNSmlDmMMSAdapter::CreateMMSClientL()
-// Creates MMS client mtm
-// -----------------------------------------------------------------------------
-void CNSmlDmMMSAdapter::CreateMMSClientL()
-    {
-    if(iMmsClient ==0)
-        {
-        iMsvSession = CMsvSession::OpenSyncL( *this );
-        iClientMtmRegistry = CClientMtmRegistry::NewL(* iMsvSession );
-        iMmsClient = (CMmsClientMtm *) iClientMtmRegistry->
-            NewMtmL( KUidMsgTypeMultimedia );
-        iMmsClient->RestoreSettingsL();
-        iMmsSettings = CMmsSettings::NewL();
-        iMmsSettings->CopyL( iMmsClient->MmsSettings() );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDmMMSAdapter::FillNodeInfoL()
-// Fills the node info in ddf structure
-// -----------------------------------------------------------------------------
-void CNSmlDmMMSAdapter::FillNodeInfoL( MSmlDmDDFObject& aNode,
-                                       TSmlDmAccessTypes aAccTypes,
-                                       MSmlDmDDFObject::TOccurence aOccurrence, 
-                                       MSmlDmDDFObject::TScope aScope, 
-                                       MSmlDmDDFObject::TDFFormat aFormat,
-                                       const TDesC8& aDescription)
-    {
-    aNode.SetAccessTypesL(aAccTypes);
-    aNode.SetOccurenceL(aOccurrence);
-    aNode.SetScopeL(aScope);
-    aNode.SetDFFormatL(aFormat);
-    if(aFormat!=MSmlDmDDFObject::ENode)
-        {
-        aNode.AddDFTypeMimeTypeL(KNSmlDMMMSTextPlain);
-        }
-    aNode.SetDescriptionL(aDescription);
-
-    }
-
-// -----------------------------------------------------------------------------
-// CSmlDmAdapter::TError FetchObjectL(const TDesC8& aURI, const TDesC8& aObject)
-// Fetches data object and returns it in parameter. 
-// Return values according to CSmlDmAdapter::TError.
-// -----------------------------------------------------------------------------
-CSmlDmAdapter::TError CNSmlDmMMSAdapter::FetchObjectL(const TDesC8& aURI, 
-                                                      CBufBase& aObject)
-    {
-    _DBG_FILE("CNSmlDmMMSAdapter::FetchObjectL(): begin");
-    TRAPD(err, CreateMMSClientL());
-    if(err!=KErrNone)
-        {
-        _DBG_FILE("CNSmlDmMMSAdapter::FetchObjectL(): EError end");
-        return CSmlDmAdapter::EError;
-        }
-
-    TMsvId id = iMmsSettings->Service();
-
-    if(id == KMsvNullIndexEntryId||aURI.Find(KNSmlDMMMSAccount8)==KErrNotFound)
-        {
-        _DBG_FILE("CNSmlDmMMSAdapter::FetchObjectL(): ENotFound end");
-        return CSmlDmAdapter::ENotFound;
-        }
-
-    TPtrC8 uriSeg = LastURISeg(aURI);
-    CSmlDmAdapter::TError status = CSmlDmAdapter::EOk;
-
-    if(uriSeg.Compare(KNSmlDMMMSName)==0)
-        {
-        status = CSmlDmAdapter::ENotFound;
-        }
-    else if(uriSeg.Compare(KNSmlDMMMSMMRecep)==0)
-        {
-        TMmsReceivingMode rcvHome = iMmsSettings->ReceivingModeHome();
-        TMmsReceivingMode rcvForeign = iMmsSettings->ReceivingModeForeign();
-        if ( rcvHome == EMmsReceivingAutomatic )
-            {
-            if ( rcvForeign == EMmsReceivingAutomatic )
-                {
-                aObject.InsertL( 0, KNSmlDMMMSValueAlwaysOn );
-                }
-            else
-                {
-                aObject.InsertL( 0, KNSmlDMMMSValueAutomaticAtHome );
-                }
-            }
-        else if ( rcvHome == EMmsReceivingReject )
-            {
-            aObject.InsertL( 0, KNSmlDMMMSValueOff );
-            }
-        else if ( rcvHome == EMmsReceivingManual )
-            {
-            aObject.InsertL( 0, KNSmlDMMMSValueAlwaysManual );
-            }
-        else
-            {
-            aObject.InsertL( 0, KNSmlDMMMSValueAutomaticAtHome );
-            }
-
-        }
-    else if(uriSeg.Compare(KNSmlDMMMSCreMode)==0)
-        {
-        switch(iMmsSettings->CreationMode())
-            {
-        case EMmsCreationModeWarning:
-            aObject.InsertL(0,KNSmlDMMMSValueWarning);
-            break;
-            
-        case EMmsCreationModeFree:
-            aObject.InsertL(0,KNSmlDMMMSValueFree);
-            break;
-
-        case EMmsCreationModeRestricted:
-            aObject.InsertL(0,KNSmlDMMMSValueRestricted);
-            break;
-
-        default:
-            aObject.InsertL(0,KNSmlDMMMSValueWarning);
-            break;
-            }
-        }
-    else if(uriSeg.Compare(KNSmlDMMMSAMsg)==0)
-        {
-        if(iMmsSettings->AcceptAnonymousMessages())
-            {
-            aObject.InsertL(0,KNSmlDMMMSValueTrue);
-            }
-        else
-            {
-            aObject.InsertL(0,KNSmlDMMMSValueFalse);
-            }
-        }
-    else if(uriSeg.Compare(KNSmlDMMMSRcvAds)==0)
-        {
-        if(iMmsSettings->AcceptAdvertisementMessages())
-            {
-            aObject.InsertL(0,KNSmlDMMMSValueTrue);
-            }
-        else
-            {
-            aObject.InsertL(0,KNSmlDMMMSValueFalse);
-            }
-        }
-    else if(uriSeg.Compare(KNSmlDMMMSImgSize)==0)
-        {
-        if( iMmsSettings->ImageWidth() == KImageRichWidth && 
-            iMmsSettings->ImageHeight() == KImageRichHeight )
-            {
-            aObject.InsertL(0,KNSmlDMMMSValueSmall);
-            }
-        else if ( iMmsSettings->ImageWidth() == KImageMegapixelWidth && 
-                  iMmsSettings->ImageHeight() == KImageMegapixelHeight )
-            {
-            aObject.InsertL(0,KNSmlDMMMSValueLarge);
-            }
-        }
-    else if(uriSeg.Compare(KNSmlDMMMSDRepSnd)==0)
-        {
-        if( iMmsSettings->DeliveryReportSendingAllowed() == KMmsYes)
-            {
-            aObject.InsertL(0,KNSmlDMMMSValueFalse);
-            }
-        else
-            {
-            aObject.InsertL(0,KNSmlDMMMSValueTrue);
-            }
-        }
-    else if(uriSeg.Compare(KNSmlDMMMSRcvRep)==0)
-        {
-        if( iMmsSettings->DeliveryReportWanted() == KMmsYes)
-            {
-            aObject.InsertL(0,KNSmlDMMMSValueTrue);
-            }
-        else
-            {
-            aObject.InsertL(0,KNSmlDMMMSValueFalse);
-            }
-        }
-    else if( uriSeg.Compare( KNSmlDMMMSMsgVal ) == 0 )
-        {
-        switch(iMmsSettings->ExpiryInterval())
-            {
-        case KNSmlDMMMSExpiryHour:
-            aObject.InsertL(0,KNSmlDMMMSValueHourShort);
-            break;
-            
-        case KNSmlDMMMSExpirySixHours:
-            aObject.InsertL(0,KNSmlDMMMSValueSixHours);
-            break;
-
-        case KNSmlDMMMSExpiryDay:
-            aObject.InsertL(0,KNSmlDMMMSValueDay);
-            break;
-
-        case KNSmlDMMMSExpiryThreeDays:
-            aObject.InsertL(0,KNSmlDMMMSValueThreeDays);
-            break;
-
-        case KNSmlDMMMSExpiryWeek:
-            aObject.InsertL(0,KNSmlDMMMSValueWeek);
-            break;
-
-        case KNSmlDMMMSExpiryMaximum:
-            aObject.InsertL(0,KNSmlDMMMSValueMaximumTime);
-            break;
-
-        default:
-            aObject.InsertL(0,KNSmlDMMMSValueThreeDays);
-            break;
-            }
-        }
-    else if(uriSeg.Compare(KNSmlDMMMSMToNapIDL)==0)
-        {
-        TUint32 iap = KNSmlDMMMSIapNotDefined;
-        TInt32 mmsIap = -1;
-        CCommsDatabase* commDb = CCommsDatabase::NewL();
-        CleanupStack::PushL(commDb);
-        CApUtils* aputils = CApUtils::NewLC(*commDb);
-
-        if(LastURISeg(RemoveLastURISeg(aURI)).Compare(
-               KNSmlDMMMSDynamicPrimary)==0)
-            {
-            mmsIap = iMmsSettings->AccessPoint( KNSmlDMMMSFirstAccessPointId );
-            }
-        
-        if(mmsIap != KErrNotFound )
-        	{
-        	iap = mmsIap;
-        	TRAPD(err, iap = aputils->IapIdFromWapIdL( iap ) ); 
-        
-        	if( iap != KNSmlDMMMSIapNotDefined && err == KErrNone )
-            	{
-            	CNSmlDMIAPMatcher* iapmatch = CNSmlDMIAPMatcher::NewL( &Callback() );
-            	CleanupStack::PushL(iapmatch);
-    
-            	HBufC8* uri8 = iapmatch->URIFromIAPIdL( iap );
-                
-            if( uri8 )
-                {
-                CleanupStack::PushL(uri8);
-                aObject.InsertL(0,uri8->Des());
-                status = CSmlDmAdapter::EOk;
-                CleanupStack::PopAndDestroy(); // uri8
-                }
-            else
-                {
-                status = CSmlDmAdapter::ENotFound;
-                }    
-            CleanupStack::PopAndDestroy(); // iapMatch
-            }
-        else
-            {
-            status = CSmlDmAdapter::ENotFound;
-            }
-        	
-        }
-        else
-        {
-        	status = CSmlDmAdapter::ENotFound;
-        }
-        CleanupStack::PopAndDestroy(2); //commdb,aputils
-        }
-    else if(uriSeg.Compare(KNSmlDMMMSMMSSAddr)==0)
-        {
-        CCommsDatabase* commDb = CCommsDatabase::NewL(EDatabaseTypeIAP);
-        CleanupStack::PushL(commDb);
-
-        TBool ok = EFalse;
-
-        CCommsDbTableView* tableView=0;
-        
-        TInt apId = iMmsSettings->AccessPoint(KNSmlDMMMSFirstAccessPointId);
-        
-        if ( apId != KErrNotFound )
-            {
-            
-            tableView = commDb->OpenViewMatchingUintLC(TPtrC(WAP_ACCESS_POINT),
-                                                       TPtrC(COMMDB_ID),
-                                                       apId);
-
-            if(tableView->GotoFirstRecord()==KErrNone)
-                {
-                TBuf<KCommsDbSvrMaxFieldLength> columnValue;
-                HBufC* tmpPage;
-                tmpPage = tableView->ReadLongTextLC(TPtrC(WAP_START_PAGE));
-            
-                if(err==KErrNone)
-                    {
-                    HBufC8* val8 = HBufC8::NewLC(tmpPage->Size());
-                    TPtr8 valPtr = val8->Des();
-                    CnvUtfConverter::ConvertFromUnicodeToUtf8( valPtr, 
-                                                               *tmpPage);
-                    aObject.InsertL(0,valPtr);
-                    ok = ETrue;
-                    CleanupStack::PopAndDestroy(); //val8
-                    }
-                CleanupStack::PopAndDestroy(tmpPage);
-                }
-            CleanupStack::PopAndDestroy(); //tableview
-            }
-        CleanupStack::PopAndDestroy(); //commDb
-        if(!ok)
-            {
-            status = CSmlDmAdapter::EError;
-            }
-        }
-    else 
-        {
-        status = CSmlDmAdapter::ENotFound;
-        }
-    _DBG_FILE("CNSmlDmMMSAdapter::FetchObjectL(): end");
-    return status;
-    }
-
-// -----------------------------------------------------------------------------
-// void StoreSettingsL()
-// Stores the MMS settings to the phone.
-// 
-// -----------------------------------------------------------------------------
-void CNSmlDmMMSAdapter::StoreSettingsL()
-    {
-    _DBG_FILE("CNSmlDmMMSAdapter::StoreSettingsL(): begin");
-    if ( iMmsSettings && iMmsClient )
-        {
-        iMmsSettings->SaveSettingsL();
-        iMmsClient->SetSettingsL( *iMmsSettings );
-        }
-    _DBG_FILE("CNSmlDmMMSAdapter::StoreSettingsL(): end");
-    }
-
-// -----------------------------------------------------------------------------
-// CSmlDmAdapter::TError ValidateUriL( const TDesC8& aURI )
-// Validate URI, return error if not valid.
-// 
-// -----------------------------------------------------------------------------
-CSmlDmAdapter::TError CNSmlDmMMSAdapter::ValidateUriL( const TDesC8& aURI )
-    {
-    _DBG_FILE("CNSmlDmMMSAdapter::ValidateUriL(): begin");
-    CSmlDmAdapter::TError status = EOk;
-    TPtrC8 parentUri = RemoveLastURISeg(aURI);
-    switch ( NumOfURISegs( aURI ) )
-        {
-    case 3:
-        if ( parentUri.Match( KNSmlDMMMSLevel3Parents ) != 0 )
-            {
-            _DBG_FILE("CNSmlDmMMSAdapter::ValidateUriL(): 3");
-            status = ENotFound;
-            }
-        break;
-    case 5:
-        if ( parentUri.Match( KNSmlDMMMSLevel5Parents ) != 0 )
-            {
-            _DBG_FILE("CNSmlDmMMSAdapter::ValidateUriL(): 5");
-            status = ENotFound;
-            }
-        break;
-    case 7:
-        if ( parentUri.Match( KNSmlDMMMSLevel7Parents1 ) != 0 && 
-             parentUri.Match( KNSmlDMMMSLevel7Parents2 ) != 0)
-            {
-            _DBG_FILE("CNSmlDmMMSAdapter::ValidateUriL(): 7");
-            status = ENotFound;
-            }
-        break;
-    default:
-        status = ENotFound;
-        break;
-
-        }
-    _DBG_FILE("CNSmlDmMMSAdapter::ValidateUriL(): end");
-    return status;
-    }
-
-// -----------------------------------------------------------------------------
-// TImplementationProxy ImplementationTable[]
-// Needed because of ECOM architecture
-// -----------------------------------------------------------------------------
-
-#ifndef IMPLEMENTATION_PROXY_ENTRY
-#define IMPLEMENTATION_PROXY_ENTRY(aUid, aFuncPtr)  {{aUid},(aFuncPtr)}
-#endif
-
-const TImplementationProxy ImplementationTable[] = 
-    {
-    IMPLEMENTATION_PROXY_ENTRY(KNSmlDMMMSAdapterImplUid, 
-                               CNSmlDmMMSAdapter::NewL)
-    };
-
-// -----------------------------------------------------------------------------
-// ImplementationGroupProxy()
-// Needed because of ECOM architecture
-// -----------------------------------------------------------------------------
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy( TInt& 
-                                                               aTableCount )
-    {
-    _DBG_FILE("ImplementationGroupProxy() for CNSmlDmMMSAdapter: begin");
-    aTableCount = sizeof(ImplementationTable) / sizeof(TImplementationProxy);
-    _DBG_FILE("ImplementationGroupProxy() for CNSmlDmMMSAdapter: end");
-    return ImplementationTable;
-    }
-
-
-//----------------------------------------------------------------------
-//TBool CNSmlDmMMSAdapter::IsWAPAccessPointRecordLockedL(TUint32 aRecord)
-//check for wap access point record  lock status 
-//----------------------------------------------------------------------
-    
-TBool CNSmlDmMMSAdapter::IsWAPAccessPointRecordLockedL(TUint32 aRecord)
-	{
-	_DBG_FILE("CNSmlDmMMSAdapter::IsWAPAccessPointRecordLockedL():  BEGIN");	
-	
-	TBool ret = EFalse;
-    CCommsDbTableView* wapView;
-    DBG_ARGS8(_S8("CNSmlDmMMSAdapter::IsWAPAccessPointRecordLockedL record being checked = %d"),aRecord);
-    wapView = iDatabase->OpenViewMatchingUintLC(TPtrC(WAP_ACCESS_POINT),
-                                                            TPtrC(COMMDB_ID),
-                                                            aRecord);
-      	                                                      
-    TInt aAccess( 0 );
-    if(wapView!=NULL)
-    	{
-   		_DBG_FILE("CNSmlDmMMSAdapter::IsWAPAccessPointRecordLockedL():wap record exists, check for access type");	
-    	TInt err = (((CCommsDbProtectTableView*) wapView )->GetRecordAccess( aAccess ) );
-    	DBG_ARGS8(_S8("CNSmlDmMMSAdapter::IsWAPAccessPointRecordLockedL , GetrecordAccess code is =%d and acess type of record = %d"),err, aAccess);
-    	CleanupStack::PopAndDestroy( wapView);                                            
-    	if(aAccess == RDbRowSet::EReadOnly)                                                    
-       		ret = ETrue;
-    	}
-    
-    _DBG_FILE("CNSmlDmMMSAdapter::IsWAPAccessPointRecordLockedL():  END");	
-    return ret;
-        		
-	}
-//----------------------------------------------------------------------
-//TBool CNSmlDmMMSAdapter::DoProtectWAPAccessRecordL(TUint32 aRecord,TBool aProtect)
-// protect or unprotect wapaccesspoint record of access point being altered 
-//----------------------------------------------------------------------
-
-
-TInt CNSmlDmMMSAdapter::DoProtectWAPAccessRecordL(TUint32 aRecord,TBool aProtect)
-	{
-	_DBG_FILE("CNSmlDmMMSAdapter::DoProtectWAPAccessRecordL():  BEGIN");	
-	DBG_ARGS8(_S8("CNSmlDmMMSAdapter::DoProtectWAPAccessRecordL , record and protect value  =%d  = %d"),aRecord, aProtect);
-	TInt err = KErrNone;
-	
-	CCommsDbTableView* wapView;
-    wapView = iDatabase->OpenViewMatchingUintLC(TPtrC(WAP_ACCESS_POINT),
-                                                            TPtrC(COMMDB_ID),
-                                                            aRecord);
-	if( wapView != NULL )
-		{
-		_DBG_FILE("CNSmlDmMMSAdapter::DoProtectWAPAccessRecordL():  wap record exists");	
-		if( !aProtect )
-    		{
-    		err = ( (CCommsDbProtectTableView*) wapView )->UnprotectRecord();
-    		DBG_ARGS8(_S8("CNSmlDmMMSAdapter::DoProtectWAPAccessRecordL ,error code of Unprotectrecord = %d"),err);
-        	}
-     			
-     	else
-     		{
-     		err = ( (CCommsDbProtectTableView*) wapView )->ProtectRecord();
-     		DBG_ARGS8(_S8("CNSmlDmMMSAdapter::DoProtectWAPAccessRecordL ,error code of ProtectRecord = %d"),err);	
-     		}
-  
-  		CleanupStack::PopAndDestroy( wapView);
-		}
-   	
-	_DBG_FILE("CNSmlDmMMSAdapter::DoProtectWAPAccessRecordL():  END");	
-	return err;
-	}
-	
-	
-
-// End of File
--- a/omadm/omadmextensions/adapters/mms/src/nsmldmmmsadapter.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of dm adapters
-* 	This is part of omadmextensions.
-*
-*/
-
-
-CHARACTER_SET UTF8
-
-/*
-* ============================================================================
-*  Name     : 101f6e36.rss
-*  Part of  : SyncMl
-*  Interface: ecom / SmlDmAdapter
-*  Origin   : SyncML Phase 2 
-*  Created  : 06.03.2003
-*  Implementation notes:
-*     
-*  Version  : 0.1
-*   $Revision: 4 $, $Modtime: 6.06.05 10:28 $ 
-*  ---------------------------------------------------------------------------
-*  Version history:
-*  Template version: 1.02, 21.6.2000 by maparnan
-*  <ccm_history>
-*  </ccm_history>
-* ============================================================================
-*/
-
-
-
-#include <registryinfo.rh>
-#include "nsmldmconstants.h"
-
-RESOURCE REGISTRY_INFO theRegistryInfo
-  {
-  dll_uid = 0x101F6E36; //The DLL's 3rd UID.
-  interfaces = 
-      {
-      INTERFACE_INFO
-          {
-          interface_uid = KNSmlDMInterfaceUid; // DM interface UID
-          implementations = 
-            {
-            IMPLEMENTATION_INFO
-                {
-                implementation_uid = 0x101F6E37; // DM MMS implementation UID
-                version_no = 1; 
-                display_name = "";
-                default_data = "";
-                opaque_data = "";
-                }
-            };
-          }
-      };
-    }
-
-// End of File
--- a/omadm/omadmextensions/adapters/mms/tsrc/bwins/mmstestu.def	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	?LibEntryL@@YAPAVCScriptBase@@AAVCTestModuleIf@@@Z @ 1 NONAME ; class CScriptBase * LibEntryL(class CTestModuleIf &)
-
--- a/omadm/omadmextensions/adapters/mms/tsrc/conf/mmstest.cfg	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,111 +0,0 @@
-[Test]
-title DDF
-create mmstest foobar jee
-foobar DDFStructure
-delete foobar
-[Endtest] 
-
-[Test]
-title StartAtomic
-create mmstest foobar
-foobar StartAtomic
-delete foobar
-[Endtest]
-
-[Test]
-title CommitAtomic
-create mmstest foobar
-foobar CommitAtomic
-delete foobar
-[Endtest]
-
-[Test]
-title RollbackAtomic
-create mmstest foobar
-foobar RollbackAtomic
-delete foobar
-[Endtest]
-
-[Test]
-title UpdateMMSSAddr
-create mmstest foobar
-foobar UpdateLeaf MMS/MMSAcc/Con/DCon/MMSSAddr newname99
-delete foobar
-[Endtest]
-
-[Test]
-title UpdateMToNapIDL
-create mmstest foobar
-foobar UpdateLeaf MMS/MMSAcc/Con/DCon/MToNapID/Primary/MToNapIDL AP/APId000
-delete foobar
-[Endtest]
-
-[Test]
-title FetchNodemms
-create mmstest foobar
-foobar FetchNode MMS/MMSAcc/Con/DCon
-delete foobar
-[Endtest]
-
-[Test]
-title FetchMMSSAddr
-create mmstest foobar
-foobar FetchLeaf MMS/MMSAcc/Con/DCon/MMSSAddr
-delete foobar
-[Endtest]
-
-[Test]
-title FetchMToNapIDL
-create mmstest foobar
-foobar FetchLeaf MMS/MMSAcc/Con/DCon/MToNapID/Primary/MToNapIDL
-delete foobar
-[Endtest]
-
-[Test]
-title FetchCreMode
-create mmstest foobar
-foobar FetchLeaf MMS/MMSAcc/CreMode
-delete foobar
-[Endtest]
-
-[Test]
-title FetchDRepSnd
-create mmstest foobar
-foobar FetchLeaf MMS/MMSAcc/DRepSnd
-delete foobar
-[Endtest]
-
-[Test]
-title FetchImgSize
-create mmstest foobar
-foobar FetchLeaf MMS/MMSAcc/ImgSize
-delete foobar
-[Endtest]
-
-[Test]
-title FetchMMRecep
-create mmstest foobar
-foobar FetchLeaf MMS/MMSAcc/MMRecep
-delete foobar
-[Endtest]
-
-[Test]
-title FetchMsgVal
-create mmstest foobar
-foobar FetchLeaf MMS/MMSAcc/MsgVal
-delete foobar
-[Endtest]
-
-[Test]
-title FetchRcvAds
-create mmstest foobar
-foobar FetchLeaf MMS/MMSAcc/RcvAds
-delete foobar
-[Endtest]
-
-[Test]
-title FetchRcvRep
-create mmstest foobar
-foobar FetchLeaf MMS/MMSAcc/RcvRep
-delete foobar
-[Endtest]
--- a/omadm/omadmextensions/adapters/mms/tsrc/eabi/mmstestu.def	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-EXPORTS
-	_Z9LibEntryLR13CTestModuleIf @ 1 NONAME
-	_ZTI16CTestDmDDFObject @ 2 NONAME ; #<TI>#
-	_ZTI8Cdmatest @ 3 NONAME ; #<TI>#
-	_ZTI8CmmsTest @ 4 NONAME ; #<TI>#
-	_ZTV16CTestDmDDFObject @ 5 NONAME ; #<VT>#
-	_ZTV8Cdmatest @ 6 NONAME ; #<VT>#
-	_ZTV8CmmsTest @ 7 NONAME ; #<VT>#
-
--- a/omadm/omadmextensions/adapters/mms/tsrc/group/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-/*
-* Copyright (c) 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:  Implementation of DM adapter test component
-* 	This is part of omadmextensions/adapter test application.
-*
-*/
-
-
-
-
-
-
-PRJ_PLATFORMS
-// specify the platforms your component needs to be built for here
-// defaults to WINS MARM so you can ignore this if you just build these
-DEFAULT
-
-PRJ_TESTEXPORTS
-// NOTE: If using ARS requirements all export operations should be done under this.
-// 'abld test export'
-
-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
-// Example: 
-
-
-PRJ_TESTMMPFILES
-// NOTE: If using ARS requirements .mmp file operation should be done under this.
-// 'abld test build'
-mmstest.mmp
-
-PRJ_MMPFILES
-// Specify the .mmp files required for building the important component
-// releasables.
-//
-// Specify "tidy" if the component you need to build doesn't need to be
-// released. Specify "ignore" if the MMP file exists but should be
-// ignored.
-// Example:
-
-//  End of File
--- a/omadm/omadmextensions/adapters/mms/tsrc/group/mmstest.mmp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-/*
-* Copyright (c) 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:  Implementation of DM adapter test component
-* 	This is part of omadmextensions/adapter test application.
-*
-*/
-
-
-
-
-#include <platform_paths.hrh>
-
-TARGET          mmstest.dll
-TARGETTYPE      dll
-UID             0x1000008D 0x101FB3E3
-
-CAPABILITY	ALL -TCB
-/* Remove comments and replace 0x00000000 with correct vendor id */
-// VENDORID 	0x00000000
-
-//TARGETPATH      ?target_path
-DEFFILE         mmstest.def
-
-SOURCEPATH      ../src
-SOURCE          dmatest.cpp
-SOURCE          TestDmDDFObject.cpp
-SOURCE          mmstest.cpp
-SOURCE          mmstestBlocks.cpp
-
-
-USERINCLUDE     ../inc 
-USERINCLUDE		  ../../inc
-
-APP_LAYER_SYSTEMINCLUDE
-SYSTEMINCLUDE   /epoc32/include/ecom
- 
-
-LIBRARY         apgrfx.lib apmime.lib
-LIBRARY         euser.lib ecom.lib
-LIBRARY         stiftestinterface.lib
-LIBRARY         stiftestengine.lib
-LIBRARY         efsrv.lib
-LIBRARY         estor.lib 
-LIBRARY         SWInstCli.lib
-LIBRARY     		msgs.lib charconv.lib nsmldebug.lib 
-LIBRARY 				commdb.lib apengine.lib mmsserversettings.lib
-
-LANG			SC
-
-
-
-SMPSAFE
-// End of File
-
--- a/omadm/omadmextensions/adapters/mms/tsrc/group/mmstest.pkg	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-;
-; Copyright (c) 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:  Implementation of DM adapter test component
-; 	This is part of omadmextensions/adapter test application.
-;
-
-;*Languages
-&EN
-;
-;*Standard SIS file header. This section specifies the package name,
-;application UID, and version/build numbers. Add the package TYPE here if needed.
-#{"mmstest"},(0x101FB3E8),1,0,1;
-;
-
-;*Unique (Non-Localised) Vendor name
-;This is used in combination with signing to prevent the unauthroized
-;upgrade ofa a package by someone other than the rightful vendor.
-:"Nokia"
-
-;*Localized Vendor Name
-;This specifies the localised vendor name(s) correspodning to language(s).
-%{"Nokia Test EN"}
-
-;*Files To Copy...<src> <destination>
-"\epoc32\release\armv5\urel\mmstest.dll" -"C:\sys\bin\mmstest.dll"
-"..\conf\mmstest.cfg"-"C:\TestFramework\mmstest.cfg"
-"..\init\mmstest.ini"-"C:\TestFramework\mmstest.ini"
--- a/omadm/omadmextensions/adapters/mms/tsrc/inc/TestDmDDFObject.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,203 +0,0 @@
-/*
-* Copyright (c) 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:  Implementation of DM adapter test component
-* 	This is part of omadmextensions/adapter test application.
-*
-*/
-
-
-
-
-
-
-#ifndef __TESTDMDDFOBJECT_H
-#define __TESTDMDDFOBJECT_H
-
-//  INCLUDES
-//#include <?include_file>
-#include <smldmadapter.h>
-
-// CONSTANTS
-//const ?type ?constant_var = ?constant;
-
-// MACROS
-//#define ?macro ?macro_def
-
-// DATA TYPES
-//enum ?declaration
-//typedef ?declaration
-//extern ?data_type;
-
-// FUNCTION PROTOTYPES
-//?type ?function_name(?arg_list);
-
-// FORWARD DECLARATIONS
-class CStifLogger;
-
-// CLASS DECLARATION
-
-/**
-*  ?one_line_short_description.
-*  ?other_description_lines
-*
-*  @lib ?library
-*  @since Series ?XX ?SeriesXX_version
-*/
-class CTestDmDDFObject : public CBase, public MSmlDmDDFObject
-    {
-    public:  // Constructors and destructor
-        
-        /**
-        * Two-phased constructor.
-        */
-        static CTestDmDDFObject* NewL( CStifLogger *aLog );
-        static CTestDmDDFObject* NewLC( CStifLogger *aLog );
-        
-        /**
-        * Destructor.
-        */
-        virtual ~CTestDmDDFObject();
-
-    public: // New functions
-        
-        /**
-        * ?member_description.
-        * @since Series ?XX ?SeriesXX_version
-        * @param ?arg1 ?description
-        * @return ?description
-        */
-        //?type ?member_function( ?type ?arg1 );
-
-		virtual void SetNameL( const TDesC8& aName );
-		
-		void DumpL( const TDesC8& aParentName, TBool aFullDump = ETrue );
-		void ExternalizeL(RWriteStream& aStream) const;
-		
-		
-
-    public: // Functions from base classes
-    
-//sf-    *********************************
-    
-		void SetAccessTypesL( TSmlDmAccessTypes aAccessTypes );
-		void SetDefaultValueL( const TDesC8& aDefaultValue );
-		void SetDescriptionL( const TDesC8& aDescription );
-		void SetDFFormatL( TDFFormat aFormat );
-		void SetOccurenceL( TOccurence aOccurence );
-		void SetScopeL( TScope aScope );
-		void SetDFTitleL( const TDesC8& aTitle );
-		void AddDFTypeMimeTypeL( const TDesC8& aMimeType );
-		void SetAsObjectGroup();
-		MSmlDmDDFObject& AddChildObjectL(const TDesC8& aNodeName);
-		MSmlDmDDFObject& AddChildObjectGroupL();
-
-//sf-    #############################
-
-		const TDesC8& Name();
-		TSmlDmAccessTypes  AccessTypes();
-		const TDesC8& DefaultValue();
-		const TDesC8& Description();
-		TDFFormat DFFormat();
-		TOccurence Occurence();
-		TScope Scope();
-		const TDesC8& DFTitle();
-		const TDesC8& DFTypeMimeType();
-		TBool ObjectGroup();
-		
-		TInt ChildObjectCount();
-		CTestDmDDFObject& ChildObject( TInt aIndex );
-
-		CTestDmDDFObject* FindChildObject( const TDesC8& aName );
-		TInt SubObjectsCount();
-
-
-    protected:  // New functions
-        
-        /**
-        * ?member_description.
-        * @since Series ?XX ?SeriesXX_version
-        * @param ?arg1 ?description
-        * @return ?description
-        */
-        //?type ?member_function( ?type ?arg1 );
-
-    protected:  // Functions from base classes
-        
-        /**
-        * From ?base_class ?member_description
-        */
-        //?type ?member_function();
-
-    private:
-
-        /**
-        * C++ default constructor.
-        */
-        CTestDmDDFObject( CStifLogger *aLog );
-
-        /**
-        * By default Symbian 2nd phase constructor is private.
-        */
-        void ConstructL();
-
-        // Prohibit copy constructor if not deriving from CBase.
-        // CTestDmDDFObject( const CTestDmDDFObject& );
-        // Prohibit assigment operator if not deriving from CBase.
-        // CTestDmDDFObject& operator=( const CTestDmDDFObject& );
-
-    public:     // Data
-        // ?one_line_short_description_of_data
-        //?data_declaration;
-    
-    protected:  // Data
-        // ?one_line_short_description_of_data
-        //?data_declaration;
-
-    private:    // Data
-        // ?one_line_short_description_of_data
-        //?data_declaration;
-		HBufC8* iName;
-
-		TSmlDmAccessTypes iAccessTypes;
-		HBufC8* iDefaultValue;
-		HBufC8* iDescription;
-		TDFFormat iFormat;
-		TOccurence iOccurence;
-		TScope iScope;
-		HBufC8* iTitle;
-		HBufC8* iMimeType;
-		TBool iObjectGroup;
-		
-		RPointerArray<CTestDmDDFObject> iChildren;
-
-         
-        // Reserved pointer for future extension
-        //TAny* iReserved;
-
-    public:     // Friend classes
-        //?friend_class_declaration;
-    protected:  // Friend classes
-        //?friend_class_declaration;
-    private:    // Friend classes
-        //?friend_class_declaration;
-        /**
-        * Logger.
-        */
-        CStifLogger*    iLog;
-
-    };
-
-#endif      // __TESTDMDDFOBJECT_H
-            
-// End of File
--- a/omadm/omadmextensions/adapters/mms/tsrc/inc/dmatest.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,278 +0,0 @@
-/*
-* Copyright (c) 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:  Implementation of DM adapter test component
-* 	This is part of omadmextensions/adapter test application.
-*
-*/
-
-
-
-
-
-
-#ifndef __DMA_TEST_H__
-#define __DMA_TEST_H__
-
-//  INCLUDES
-#include <StifLogger.h>
-#include <TestScripterInternal.h>
-#include <StifTestModule.h>
-#include <apmstd.h>
-#include <smldmadapter.h>
-#include <commdb.h>
-#include "nsmldmmmsadapter.h"
-
-class Cdmatest;
-
-
-struct TMapping
-	{
-	TBuf8<256> iURI;
-	TBuf8<64> iLuid;
-	TMapping( const TDesC8 &aURI, const TDesC8 &aLuid )  : iURI( aURI ), iLuid( aLuid )
-	{
-		
-		}
-	};
-	
-typedef RArray<TMapping> RMappingArray;
-
-typedef void (Cdmatest::* ResultsFunction)( TInt , CBufBase& , const TDesC8&  ) ; 
-
-
-// CLASS DECLARATION
-
-/**
-*  ?one_line_short_description.
-*  ?other_description_lines
-*
-*  @lib ?library
-*  @since Series ?XX ?SeriesXX_version
-*/
-class Cdmatest : public CScriptBase, public MSmlDmCallback
-    {
-    
-    public:  // Constructors and destructor
-        
-        /**
-        * Destructor.
-        */
-        virtual ~Cdmatest();
-
-    public: // Functions from base classes
-
-        /**
-        * From CScriptBase Runs a script line.
-        * @since ?Series60_version
-        * @param aItem Script line containing method name and parameters
-        * @return Symbian OS error code
-        */
-        virtual TInt RunMethodL( CStifItemParser& aItem ) = 0;
-    
-
-	public:
-		/**
-		The function is used to return the data in case of FetchLeafObjectL(),
-		FetchLeafObjectSizeL() and ChildURIListL() functions. It should not be
-		called where the DM command has failed, i.e. the error code returned in
-		SetStatusL is something other than EOk.
-		@param aResultsRef	Reference to correct command
-		@param aObject		The data which should be returned
-		@param aType			MIME type of the object
-		@publishedPartner
-		@prototype
-		*/
-		void SetResultsL( TInt aResultsRef, CBufBase& aObject,
-								  const TDesC8& aType );
-		
-		/**
-		The function is used to return the data in case of FetchLeafObjectL() and
-		ChildURIListL() functions, where the size of the data being returned is
-		large enough for the Adapter to stream it. This function should not be
-		called when command was failed, i.e. the error code returned in SetStatusL
-		is something other than EOk.
-		@param aResultsRef	Reference to correct command
-		@param aStream		Large data which should be returned, DM engine
-								closes stream when it has read all the data
-		@param aType			MIME type of the object
-		@publishedPartner
-		@prototype
-		*/
-		void SetResultsL( TInt /*aResultsRef*/, RReadStream*& /*aStream*/,
-								  const TDesC8& /*aType*/ ) 
-		{
-			
-		}
-
-		/**
-		The function returns information about the Add,Update,Delete and Fetch
-		commands success to DM engine. The reference to correct command must be
-		used when calling the SetStatusL function, the reference is got from the
-		argument of the command functions. The SetStatusL function must be called
-		separately for every single command.
-		@param aStatusRef	Reference to correct command
-		@param aErrorCode	Information about the command success
-		@publishedPartner
-		@prototype
-		*/
-		void SetStatusL( TInt aStatusRef,
-								 MSmlDmAdapter::TError aErrorCode ) ;
-
-		/**
-		The function passes map information to DM Module. This function is called
-		for a new management object, both for node objects and for leaf objects.
-		In addition if ChildURIListL() function has returned new objects a mapping
-		information of the new objects must be passed. A mapping is treated as
-		inheritable. If the mapping is not set with this function, the mapping
-		LUID of the parent object is passed in following commands to the object.
-		@param aURI	URI of the object. 
-		@param aLUID	LUID of the object. LUID must contain the all information,
-						which is needed for retrieve the invidual object from the
-						database. Typically it is ID for the database table. In
-						more complicated structures it can be combination of IDs,
-						which represent path to the object.
-		@publishedPartner
-		@prototype
-		*/
-		void SetMappingL( const TDesC8& aURI, const TDesC8& aLUID );
-
-		/**
-		The function is used to make a fetch to other adapters. The most common
-		use is to make a fetch to the AP adapter, because when managing the access
-		points, the data comes as URI. For example, there are ToNAPId field in
-		some adapters, and data to it can be something like AP/IAPidx, and then
-		the link to AP adapter is needed.
-		Using FetchLinkL causes the DM Framework to make a Get request to the
-		appropriate DM adapter.  The receiving adapter MUST complete the Get
-		request synchronously.
-		@param aURI		URI of the object. 
-		@param aData		Reference to data, i.e. data is returned here
-		@param aStatus	The status of fetch command is returned here
-		@publishedPartner
-		@prototype
-		*/
-		void FetchLinkL( const TDesC8& /*aURI*/, CBufBase& /*aData*/,
-								 MSmlDmAdapter::TError& /*aStatus*/ ) 
-			{
-				
-			}
-
-		/**
-		The function returns the LUID which is mapped to aURI. If LUID is not
-		found, the function allocates a null length string, i.e. the function
-		allocates memory in every case.
-		@param aURI	URI of the object. 
-		@publishedPartner
-		@prototype
-		*/
-		HBufC8* GetLuidAllocL( const TDesC8& aURI ) ;
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-    
-    void GetMappingInfoListL( const TDesC8& aURI,
-								CArrayFix<TSmlDmMappingInfo>& aSegmentList );
-
-#else
-// nothing
-#endif
-		        
-    protected:  // New functions
-
-        
-		void FetchNodeResultsL( TInt aResultsRef, CBufBase& aObject,
-							  const TDesC8& aType );
-		void SaveDataL( TInt aResultsRef, CBufBase& aObject,
-							  const TDesC8& aType ) ;
-							  
-		TPtrC8 LastURISeg( const TDesC8& aURI );
-		TPtrC8 RemoveLastURISeg( const TDesC8& aURI );
-		TPtrC RemoveLastURISeg( const TDesC& aURI );
-		void SetURIL( const TDesC& aURI );
-		void SetURIL( const TDesC8& aURI );
-		void SetURIL( HBufC8* aURI );		
-		HBufC8 *LoadFileLC( const TDesC &aFileName, TDataType &aType );
-		HBufC8 *LoadFileLC( const TDesC8 &aFileName, TDataType &aType );
-		HBufC8 *GetNextStringLC ( CStifItemParser& aItem, const TDesC &aName );
-		HBufC8* GetLuidAllocLC( const TDesC8& aURI ) ;
-		TPtrC8 RemoveLastSeg(const TDesC8& aURI);
-		
-		TInt FetchNodeL( CStifItemParser& aItem ) ;
-		TInt FetchLeafL( CStifItemParser& aItem ) ;
-		TInt AddNodeL( CStifItemParser& aItem );
-		TInt DeleteObjectL( CStifItemParser& aItem );	
-		TInt UpdateLeafL( CStifItemParser& aItem )	;
-		TInt UpdateLeafDataL( CStifItemParser& aItem ) ;
-		TInt UpdateLeafDataURLL( CStifItemParser& aItem ) ;
-		
-		TInt ExecuteLeafL ( CStifItemParser& aItem ) ;
-		TInt ExecuteLeafDataL ( CStifItemParser& aItem ) ;
-		TInt StartAtomicL( CStifItemParser& aItem )	;
-		TInt CommitAtomicL( CStifItemParser& aItem )	;
-		TInt RollbackAtomicL( CStifItemParser& aItem )	;
-		TInt CompleteCommandsL( CStifItemParser& aItem );
-		TInt DDFStructureL( CStifItemParser& aItem )	;
-//        TInt DeliverL( CStifItemParser& aItem ) ;
-//        TInt DetailsL( CStifItemParser& aItem ) ;
-//		TInt InstallL( CStifItemParser& aItem ) ;
-//		TInt BareInstallL( CStifItemParser& aItem ) ;		
-
-    protected:
-
-        /**
-        * C++ default constructor.
-        */
-        Cdmatest( CTestModuleIf& aTestModuleIf, TUid aUid );
-
-        /**
-        * By default Symbian 2nd phase constructor is private.
-        */
-        void ConstructL();
-
-        // Prohibit copy constructor if not deriving from CBase.
-        // Cdmatest( const Cdmatest& );
-        // Prohibit assigment operator if not deriving from CBase.
-        // Cdmatest& operator=( const Cdmatest& );
-
-		/**
-        * Frees all resources allocated from test methods.
-        * @since ?Series60_version
-        */
-        virtual void Delete();
-        void LoadMappingsL();
-        void SaveMappingsL();
-    public:     // Data
-        // ?one_line_short_description_of_data
-        //?data_declaration;
-    
-    protected:  // Data
-        // ?one_line_short_description_of_data
-        //?data_declaration;
-		MSmlDmAdapter::TError iStatus ;
-        ResultsFunction iResultsFunction;
-        //CSmlDmAdapter *iAdapter ;
-        CNSmlDmMMSAdapter *iAdapter ;
-        HBufC8 *iURI; 
-        CArrayFix<TSmlDmMappingInfo> *iEmptyMappingInfoArray;
-		TFileName iSaveFileName;
-		RMappingArray iMappingTable;
-		TUid iUid;
-		TInt iCounter;
-		//class CNSmlDmMgmtTree* iMgmtTree;
-		class CNSmlDmMgmtTree* iMgmtTree;
-		CNSmlDmMMSAdapter *Adapter() ;
-    };
-
-#endif      // __DMA_TEST_H__
-            
-// End of File
--- a/omadm/omadmextensions/adapters/mms/tsrc/inc/mmstest.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,133 +0,0 @@
-/*
-* Copyright (c) 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:  Implementation of DM adapter test component
-* 	This is part of omadmextensions/adapter test application.
-*
-*/
-
-
-
-
-
-
-#ifndef TCTEST_H
-#define TCTEST_H
-
-//  INCLUDES
-#include <StifLogger.h>
-#include <TestScripterInternal.h>
-#include <StifTestModule.h>
-#include <smldmadapter.h>
-#include "dmatest.h"
-
-const TUint KNSmlmmsAdapterImplUid = 0x101F6E37;
-	
-
-const TUid KAdapterUid = 
-		{
-		KNSmlmmsAdapterImplUid
-		};
-// Logging path
-_LIT( KamtestLogPath, "\\logs\\testframework\\tctest\\" ); 
-// Log file
-_LIT( KamtestLogFile, "tctest.txt" ); 
-
-
-// FORWARD DECLARATIONS
-class CmmsTest;
-
-
-// CLASS DECLARATION
-
-/**
-*  CmmsTest test class for STIF Test Framework TestScripter.
-*  ?other_description_lines
-*
-*  @lib ?library
-*  @since ?Series60_version
-*/
-class CmmsTest : public Cdmatest
-    {
-    public:  // Constructors and destructor
-        
-        /**
-        * Two-phased constructor.
-        */
-        static CmmsTest* NewL( CTestModuleIf& aTestModuleIf );
-        
-        /**
-        * Destructor.
-        */
-        virtual ~CmmsTest();
-
-    public: // Functions from base classes
-
-        /**
-        * From CScriptBase Runs a script line.
-        * @since ?Series60_version
-        * @param aItem Script line containing method name and parameters
-        * @return Symbian OS error code
-        */
-        virtual TInt RunMethodL( CStifItemParser& aItem );
-                
-
-    private:
-
-        /**
-        * C++ default constructor.
-        */
-        CmmsTest( CTestModuleIf& aTestModuleIf );
-
-        /**
-        * By default Symbian 2nd phase constructor is private.
-        */
-        void ConstructL();
-
-        // Prohibit copy constructor if not deriving from CBase.
-        // ?classname( const ?classname& );
-        // Prohibit assigment operator if not deriving from CBase.
-        // ?classname& operator=( const ?classname& );
-    
-        /**
-        * Frees all resources allocated from test methods.
-        * @since ?Series60_version
-        */
-        virtual void Delete();
-        
-        /**
-        * Test methods are listed below. 
-        */
-        
-        /**
-        * Example test method.
-        * @since ?Series60_version
-        * @param aItem Script line containing parameters.
-        * @return Symbian OS error code.
-        */
-/*        virtual TInt ExampleL( CStifItemParser& aItem ) ;
-        virtual TInt DeliverL( CStifItemParser& aItem ) ;
-        virtual TInt DetailsL( CStifItemParser& aItem ) ;
-		    virtual TInt InstallL( CStifItemParser& aItem ) ;
-		    virtual TInt BareInstallL( CStifItemParser& aItem ) ;*/
-		
-
-    private:    // Data
-        HBufC8 *GetNextStringLC ( CStifItemParser& aItem, const TDesC &aName );
-
-
-    };
-
-#endif      // TCTEST_H
-            
-// End of File
--- a/omadm/omadmextensions/adapters/mms/tsrc/init/mmstest.ini	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,204 +0,0 @@
-#
-# This is STIF initialization file
-# Comment lines start with '#'-character.
-# See STIF TestFramework users guide.doc for instructions
-
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-# Set following test engine settings:
-#	- Set Test Reporting mode. TestReportMode's possible values are:
-#		+ 'Summary': Summary of the tested test cases.
-#		+ 'Environment': Hardware and software info.
-#		+ 'TestCases': Test case report.
-#		+ 'FullReport': Set of all above ones.
-#		+ Example 'TestReportMode= Summary TestCases'
-#
-# 	- CreateTestReport setting controls report creation mode
-#		+ YES, Test report will created.
-#		+ NO, No Test report.
-#
-# 	- File path indicates the base path of the test report.
-# 	- File name indicates the name of the test report.
-#
-# 	- File format indicates the type of the test report.
-#		+ TXT, Test report file will be txt type, for example 'TestReport.txt'.
-#		+ HTML, Test report will be html type, for example 'TestReport.html'.
-#
-# 	- File output indicates output source of the test report.
-#		+ FILE, Test report logging to file.
-#		+ RDEBUG, Test report logging to using rdebug.
-#
-# 	- File Creation Mode indicates test report overwriting if file exist.
-#		+ OVERWRITE, Overwrites if the Test report file exist.
-#		+ APPEND, Continue logging after the old Test report information if
-#                 report exist.
-# 	- Sets a device reset module's dll name(Reboot).
-#		+ If Nokia specific reset module is not available or it is not correct one
-#		  StifHWResetStub module may use as a template for user specific reset
-#		  module.
-# 	- Sets STIF test measurement disable options. e.g. pluging1 and pluging2 disablation
-#		DisableMeasurement= stifmeasurementplugin01 stifmeasurementplugin02
-#
-
-[Engine_Defaults]
-
-TestReportMode= FullReport    # Possible values are: 'Empty', 'Summary', 'Environment',
-                                                     'TestCases' or 'FullReport'
-
-CreateTestReport= YES         # Possible values: YES or NO
-
-TestReportFilePath= C:\LOGS\TestFramework\
-TestReportFileName= TestReport
-
-TestReportFormat= TXT         # Possible values: TXT or HTML
-TestReportOutput= FILE        # Possible values: FILE or RDEBUG
-TestReportFileCreationMode= OVERWRITE # Possible values: OVERWRITE or APPEND
-
-DeviceResetDllName= StifResetForNokia.dll # e.g. 'StifHWResetStub.dll' for user specific reseting
-
-DisableMeasurement= stifmeasurementdisablenone  # Possible values are:
-              # 'stifmeasurementdisablenone', 'stifmeasurementdisableall'
-              # 'stifmeasurementplugin01', 'stifmeasurementplugin02',
-              # 'stifmeasurementplugin03', 'stifmeasurementplugin04',
-              # 'stifmeasurementplugin05' or 'stifbappeaprofiler'
-
-Timeout= 0                    # Default timeout value for each test case. In milliseconds
-#UITestingSupport= YES        # Possible values: YES or NO
-#SeparateProcesses= YES       # Possible values: YES or NO (default: NO)
-[End_Defaults]
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-
-
-
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-# Module configurations start
-# Modules are added between module tags
-# tags. Module name is specified after ModuleName= tag, like
-# ModuleName= XXXXXXXXX
-# Modules might have initialisation file, specified as
-# IniFile= c:\testframework\YYYYYY
-# Modules might have several configuration files, like
-# TestCaseFile= c:\testframework\NormalCases.txt
-# TestCaseFile= c:\testframework\SmokeCases.txt
-# TestCaseFile= c:\testframework\ManualCases.txt
-
-# (TestCaseFile is synonym for old term ConfigFile)
-
-# Following case specifies demo module settings. Demo module
-# does not read any settings from file, so tags 
-# IniFile and TestCaseFile are not used.
-# In the simplest case it is enough to specify only the
-# name of the test module when adding new test module
-
-#[New_Module]
-#ModuleName= demomodule
-#[End_Module]
-
-
-[New_Module]
-ModuleName= testscripter
-#DM
-TestCaseFile= c:\testframework\mmstest.cfg
-[End_Module]
-
-
-# Load testmoduleXXX, optionally with initialization file and/or test case files
-#[New_Module]
-#ModuleName= testmodulexxx
-
-#TestModuleXXX used initialization file
-#IniFile= c:\testframework\init.txt
-
-#TestModuleXXX used configuration file(s)
-#TestCaseFile= c:\testframework\testcases1.cfg
-#TestCaseFile= c:\testframework\testcases2.cfg
-#TestCaseFile= c:\testframework\manualtestcases.cfg
-
-#[End_Module]
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-
-
-
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-# Set STIF logging overwrite parameters for Logger.
-# 	Hardware and emulator environment logging path and styles can
-# 	be configured from here to overwrite the Logger's implemented values.
-#	
-#	Settings description:
-#	- Indicates option for creation log directory/directories. If log directory/directories
-#         is/are not created by user they will make by software.
-#		+ YES, Create log directory/directories if not allready exist.
-#		+ NO, Log directory/directories not created. Only created one is used.
-#
-#	- Overwrite emulator path setting.
-#		+ Example: If 'EmulatorBasePath= C:\LOGS\TestFramework\' and in code is defined 
-#		           Logger's path 'D:\\LOGS\\Module\\' with those definition the path
-#		           will be 'C:\LOGS\TestFramework\LOGS\Module\'
-#
-#	- Overwrite emulator's logging format.
-#		+ TXT, Log file(s) will be txt type(s), for example 'Module.txt'.
-#		+ HTML, Log file(s) will be html type(s), for example 'Module.html'.
-#
-#	- Overwrited emulator logging output source.
-#		+ FILE, Logging to file(s).
-#		+ RDEBUG, Logging to using rdebug(s).
-#
-#	- Overwrite hardware path setting (Same description as above in emulator path).
-#	- Overwrite hardware's logging format(Same description as above in emulator format).
-#	- Overwrite hardware's logging output source(Same description as above in emulator output).
-#
-#	- File Creation Mode indicates file overwriting if file exist.
-#		+ OVERWRITE, Overwrites if file(s) exist.
-#		+ APPEND, Continue logging after the old logging information if file(s) exist.
-#
-#	- Will thread id include to the log filename.
-#		+ YES, Thread id to log file(s) name, Example filename 'Module_b9.txt'.
-#		+ NO, No thread id to log file(s), Example filename 'Module.txt'.
-#
-#	- Will time stamps include the to log file.
-#		+ YES, Time stamp added to each line in log file(s). Time stamp is 
-#                 for example'12.Nov.2003 115958    LOGGING INFO'
-#		+ NO, No time stamp(s).
-#
-#	- Will line breaks include to the log file.
-#		+ YES, Each logging event includes line break and next log event is in own line.
-#		+ NO, No line break(s).
-#
-#	- Will event ranking include to the log file.
-#		+ YES, Event ranking number added to each line in log file(s). Ranking number
-#                 depends on environment's tics, for example(includes time stamp also)
-#                 '012   12.Nov.2003 115958    LOGGING INFO'
-#		+ NO, No event ranking.
-#
-#	- Will write log file in unicode format.
-#		+ YES, Log file will be written in unicode format
-#		+ NO, Log will be written as normal, not unicode, file.
-#
-
-[Logger_Defaults]
-
-#NOTE: If you want to set Logger using next setting(s) remove comment(s)'#'
-#NOTE: TestEngine and TestServer logging settings cannot change here
-
-#CreateLogDirectories= YES    # Possible values: YES or NO
-
-#EmulatorBasePath= C:\LOGS\TestFramework\
-#EmulatorFormat= HTML         # Possible values: TXT or HTML
-#EmulatorOutput= FILE         # Possible values: FILE or RDEBUG
-
-#HardwareBasePath= D:\LOGS\TestFramework\
-#HardwareFormat= HTML         # Possible values: TXT or HTML
-#HardwareOutput= FILE         # Possible values: FILE or RDEBUG
-
-#FileCreationMode= OVERWRITE  # Possible values: OVERWRITE or APPEND
-
-#ThreadIdToLogFile= YES       # Possible values: YES or NO
-#WithTimeStamp= YES           # Possible values: YES or NO
-#WithLineBreak= YES           # Possible values: YES or NO
-#WithEventRanking= YES        # Possible values: YES or NO
-
-#FileUnicode= YES             # Possible values: YES or NO
-#AddTestCaseTitle= YES        # Possible values: YES or NO
-[End_Logger_Defaults]
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-
-# End of file
--- a/omadm/omadmextensions/adapters/mms/tsrc/src/TestDmDDFObject.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,516 +0,0 @@
-/*
-* Copyright (c) 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:  Implementation of DM adapter test component
-* 	This is part of omadmextensions/adapter test application.
-*
-*/
-
-
-
-
-
-
-// INCLUDE FILES
-
-#include "TestDmDDFObject.h"
-#include "StifLogger.h"
-
-// EXTERNAL DATA STRUCTURES
-//extern  ?external_data;
-
-// EXTERNAL FUNCTION PROTOTYPES  
-//extern ?external_function( ?arg_type,?arg_type );
-
-// CONSTANTS
-//const ?type ?constant_var = ?constant;
-
-// MACROS
-//#define ?macro ?macro_def
-
-// LOCAL CONSTANTS AND MACROS
-//const ?type ?constant_var = ?constant;
-//#define ?macro_name ?macro_def
-
-// MODULE DATA STRUCTURES
-//enum ?declaration
-//typedef ?declaration
-
-// LOCAL FUNCTION PROTOTYPES
-//?type ?function_name( ?arg_type, ?arg_type );
-
-// FORWARD DECLARATIONS
-//class ?FORWARD_CLASSNAME;
-
-// ============================= LOCAL FUNCTIONS ===============================
-
-
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CTestDmDDFObject::CTestDmDDFObject
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CTestDmDDFObject::CTestDmDDFObject( CStifLogger *aLog )
-	: iName( 0 )
-	, iAccessTypes()
-	, iDefaultValue( 0 )
-	, iDescription( 0 )
-	, iFormat( (TDFFormat)0 )
-	, iOccurence( (TOccurence)0 )
-	, iScope( (TScope)0 )
-	, iTitle ( 0 )
-	, iMimeType( 0 )
-	, iObjectGroup( EFalse )
-	, iLog( aLog )
-//	RPointerArray<CTestDmDDFObject> iChildren;
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// CTestDmDDFObject::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CTestDmDDFObject::ConstructL()
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// CTestDmDDFObject::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CTestDmDDFObject* CTestDmDDFObject::NewL( CStifLogger *aLog )
-    {
-    CTestDmDDFObject* self = CTestDmDDFObject::NewLC( aLog );
-    CleanupStack::Pop( self );
-
-    return self;
-    }
-
-CTestDmDDFObject* CTestDmDDFObject::NewLC( CStifLogger *aLog )
-    {
-    CTestDmDDFObject* self = new( ELeave ) CTestDmDDFObject( aLog );
-    
-    CleanupStack::PushL( self );
-    self->ConstructL();
-
-    return self;
-    }
-
-    
-// Destructor
-CTestDmDDFObject::~CTestDmDDFObject()
-    {
-	delete iName;
-	delete iDefaultValue;
-	delete iDescription;
-	delete iTitle;
-	delete iMimeType;
-	iChildren.ResetAndDestroy();
-    }
-
-
-// -----------------------------------------------------------------------------
-// CTestDmDDFObject::?member_function
-// ?implementation_description
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-/*?type CTestDmDDFObject::?member_function(
-    ?arg_type arg,
-    ?arg_type arg )
-    {
-    
-    ?code
-    
-    }
-*/
-
-void CTestDmDDFObject::SetAccessTypesL( TSmlDmAccessTypes aAccessTypes )
-	{
-	iLog->Log( _L8( "SetAccessTypesL, aAccessTypes=%d" ), aAccessTypes.GetACL() );
-	iAccessTypes = aAccessTypes;
-	}
-
-void CTestDmDDFObject::SetDefaultValueL( const TDesC8& aDefaultValue )
-	{
-	iLog->Log( _L8( "SetDefaultValueL, aDefaultValue='%S'" ), &aDefaultValue );
-	delete iDefaultValue;
-	iDefaultValue = 0;
-	iDefaultValue = aDefaultValue.AllocL();
-	}
-
-void CTestDmDDFObject::SetDescriptionL( const TDesC8& aDescription )
-	{
-	iLog->Log( _L8( "SetDescriptionL, aDescription='%S'" ), &aDescription );
-	delete iDescription;
-	iDescription = 0;
-	iDescription = aDescription.AllocL();
-	}
-	
-void CTestDmDDFObject::SetDFFormatL( TDFFormat aFormat )
-	{
-	iLog->Log( _L8( "SetDFFormatL, aFormat=%d" ), aFormat );
-	iFormat = aFormat;
-	}
-	
-void CTestDmDDFObject::SetOccurenceL( TOccurence aOccurence )
-	{
-	iLog->Log( _L8( "SetOccurenceL, aOccurence=%d" ), aOccurence );
-	iOccurence = aOccurence;
-	}
-	
-void CTestDmDDFObject::SetScopeL( TScope aScope )
-	{
-	iLog->Log( _L8( "SetScopeL, aScope=%d" ), aScope );
-	iScope = aScope;
-	}
-	
-void CTestDmDDFObject::SetDFTitleL( const TDesC8& aTitle )
-	{
-	iLog->Log( _L8( "SetDFTitleL, aTitle='%S'" ), &aTitle );
-	delete iTitle;
-	iTitle = 0;
-	iTitle = aTitle.AllocL();
-	}
-	
-void CTestDmDDFObject::AddDFTypeMimeTypeL( const TDesC8& aMimeType )
-	{
-	iLog->Log( _L8( "AddDFTypeMimeTypeL, aMimeType='%S'" ), &aMimeType );
-	delete iMimeType;
-	iMimeType = 0;
-	iMimeType = aMimeType.AllocL();
-	}
-	
-void CTestDmDDFObject::SetAsObjectGroup()
-	{
-	iLog->Log( _L8( "SetAsObjectGroup, true" ) );
-	iObjectGroup = ETrue;
-	}
-	
-MSmlDmDDFObject& CTestDmDDFObject::AddChildObjectL(const TDesC8& aNodeName)
-	{
-	iLog->Log( _L8( "AddChildObjectL, aNodeName='%S'" ), &aNodeName );
-	CTestDmDDFObject* child = CTestDmDDFObject::NewLC( iLog ); //, aNodeName );
-	child->SetNameL( aNodeName );
-	iChildren.AppendL( child );
-	CleanupStack::Pop( child ); // Don't destroy
-	return *child;
-	}
-
-MSmlDmDDFObject& CTestDmDDFObject::AddChildObjectGroupL()
-	{
-	iLog->Log( _L8( "AddChildObjectGroupL, ''" ) );
-	CTestDmDDFObject* child = CTestDmDDFObject::NewLC( iLog ); //, KNullDesC );
-	child->SetAsObjectGroup();
-	iChildren.AppendL( child );
-	CleanupStack::Pop( child ); // Don't destroy
-	return *child;
-	}
-
-// Own functions
-
-void CTestDmDDFObject::SetNameL( const TDesC8& aName )
-	{
-	delete iName;
-	iName = 0;
-	iName = aName.AllocL();
-	}
-
-void CTestDmDDFObject::DumpL( const TDesC8& aParentName, TBool aFullDump )
-	{
-	TPtrC8 name( _L8("<X>") );
-	if (iName && iName->Length() > 0)
-		{
-		name.Set( *iName );
-		}
-
-	HBufC8* fullName = HBufC8::NewLC( aParentName.Length() + name.Length() + 1 );
-	*fullName = aParentName;
-	if (aParentName.Length() > 0 && aParentName[ aParentName.Length() - 1 ] != '/')
-		{
-		fullName->Des().Append( _L8("/"));
-		}
-	fullName->Des().Append( name );
-
-	/* Translate some members to text for dumping */
-	TBuf8<20> strAccessTypes;
-	TUint8 accessTypes = iAccessTypes.GetACL();
-	if ((accessTypes & iAccessTypes.EAccessType_Add) != 0)
-		{
-		strAccessTypes.Append( _L8("A") );
-		}
-	if ((accessTypes & iAccessTypes.EAccessType_Copy) != 0)
-		{
-		strAccessTypes.Append( _L8("C") );
-		}
-	if ((accessTypes & iAccessTypes.EAccessType_Delete) != 0)
-		{
-		strAccessTypes.Append( _L8("D") );
-		}
-	if ((accessTypes & iAccessTypes.EAccessType_Exec) != 0)
-		{
-		strAccessTypes.Append( _L8("E") );
-		}
-	if ((accessTypes & iAccessTypes.EAccessType_Get) != 0)
-		{
-		strAccessTypes.Append( _L8("G") );
-		}
-	if ((accessTypes & iAccessTypes.EAccessType_Replace) != 0)
-		{
-		strAccessTypes.Append( _L8("R") );
-		}
-	
-	TBuf8<20> strFormat;
-	switch( iFormat )
-		{
-	case EB64:
-		strFormat = _L8("Base64");
-		break;
-	case EBool:
-		strFormat = _L8("Bool");
-		break;
-	case EChr:
-		strFormat = _L8("Chr");
-		break;
-	case EInt:
-		strFormat = _L8("Int");
-		break;
-	case ENode:
-		strFormat = _L8("Node");
-		break;
-	case ENull:
-		strFormat = _L8("Null");
-		break;
-	case EXml:
-		strFormat = _L8("Xml");
-		break;
-	case EBin:
-		strFormat = _L8("Bin");
-		break;
-	default:
-		break;
-		}
-
-
-	TBuf8<20> strOccurence;
-	switch( iOccurence )
-		{
-	case EOne:
-		/** The node appears exactly once */
-		strOccurence = _L8("M:1");
-		break;
-	case EZeroOrOne:
-		/** The node is optional and may appear zero or once */
-		strOccurence = _L8("O:0-1");
-		break;
-	case EZeroOrMore:
-		/** The node is optional and may appear zero or more times */
-		strOccurence = _L8("O:0-*");
-		break;
-	case EOneOrMore:
-		/** The node is mandatory and may appear once or more times */
-		strOccurence = _L8("M:1-*");
-		break;
-	case EZeroOrN:
-		/** The node is optional and may appear between once and 'N' times */
-		strOccurence = _L8("O:1-N");
-		break;
-	case EOneOrN:
-		/** The node is mandatory and may appear between once and 'N' times */
-		strOccurence = _L8("M:1-N");
-		break;
-	default:
-		break;
-		}
-	
-	
-	TBuf8<20> strScope;
-	switch( iScope)
-		{
-	case EPermanent:
-		/** The node appears exactly once */
-		strScope = _L8("Permanent");
-		break;
-	case EDynamic:
-		/** The node is optional and may appear zero or once */
-		strScope = _L8("O:Dynamic");
-		break;
-	default:
-		break;
-		}
-
-	
-	/* Dump main data */
-	if (aFullDump)
-		{
-		iLog->Log( _L8( "DDFObject: '%S'" ), fullName );
-		}
-		else
-		{
-		iLog->Log( _L8( "DDFObject: '%S'   (%S), %S, %S, %S" ),
-					fullName, &strAccessTypes, &strFormat, &strOccurence, &strScope );
-		}
-	
-	/* Dump members */
-	if (aFullDump)
-		{
-		TPtrC8 empty( _L8( "<null>" ) );
-		#define CHK_NULL(a) ((a)==0?(TDesC8*)(&empty):(TDesC8*)(a))
-
-		iLog->Log( _L8( "    iName=='%S'" ), iName );
-		iLog->Log( _L8( "    iAccessTypes=%d (%S)" ), iAccessTypes.GetACL(), &strAccessTypes );
-		iLog->Log( _L8( "    iDefaultValue='%S'" ), CHK_NULL(iDefaultValue));
-		iLog->Log( _L8( "    iDescription='%S'" ), CHK_NULL(iDescription ));
-		iLog->Log( _L8( "    iFormat=%d (%S)" ), iFormat, &strFormat );
-		iLog->Log( _L8( "    iOccurence=%d (%S)" ), iOccurence, &strOccurence );
-		iLog->Log( _L8( "    iScope=%d (%S)" ), iScope, &strScope );
-		iLog->Log( _L8( "    iTitle='%S'" ), CHK_NULL(iTitle ));
-		iLog->Log( _L8( "    iMimeType='%S'" ), CHK_NULL(iMimeType ));
-		iLog->Log( _L8( "----------------------------------" ) );
-		}
-	
-	/* Dump children */
-	for (TInt i = 0 ; i < iChildren.Count() ; i++)
-		{
-		iChildren[i]->DumpL( *fullName, aFullDump );
-		}
-
-	CleanupStack::PopAndDestroy( fullName );
-	}
-
-/*
-void CTestDmDDFObject::ExternalizeL(RWriteStream& aStream) const
-	{
-	X;
-	aStream << *iName << eol;
-	}
-*/
-
-const TDesC8& CTestDmDDFObject::Name()
-	{
-	return (iName != 0) ? *iName : KNullDesC8();
-	}
-
-TSmlDmAccessTypes  CTestDmDDFObject::AccessTypes()
-	{
-	return iAccessTypes;
-	}
-
-const TDesC8& CTestDmDDFObject::DefaultValue()
-	{
-	return (iDefaultValue != 0) ? *iDefaultValue : KNullDesC8();
-	}
-
-const TDesC8& CTestDmDDFObject::Description()
-	{
-	return (iDescription != 0) ? *iDescription : KNullDesC8();
-	}
-
-CTestDmDDFObject::TDFFormat CTestDmDDFObject::DFFormat()
-	{
-	return iFormat;
-	}
-
-CTestDmDDFObject::TOccurence CTestDmDDFObject::Occurence()
-	{
-	return iOccurence;
-	}
-
-CTestDmDDFObject::TScope CTestDmDDFObject::Scope()
-	{
-	return iScope;
-	}
-
-const TDesC8& CTestDmDDFObject::DFTitle()
-	{
-	return (iTitle != 0) ? *iTitle : KNullDesC8();
-	}
-
-const TDesC8& CTestDmDDFObject::DFTypeMimeType()
-	{
-	return (iMimeType != 0) ? *iMimeType : KNullDesC8();
-	}
-
-TBool CTestDmDDFObject::ObjectGroup()
-	{
-	return iObjectGroup;
-	}
-
-TInt CTestDmDDFObject::ChildObjectCount()
-	{
-	return iChildren.Count();
-	}
-
-CTestDmDDFObject& CTestDmDDFObject::ChildObject( TInt aIndex )
-	{
-	return *iChildren[aIndex];
-	}
-
-CTestDmDDFObject* CTestDmDDFObject::FindChildObject( const TDesC8& aName )
-	{
-	CTestDmDDFObject* foundObject = 0;
-
-	for (TInt i = 0 ; i < iChildren.Count() ; i++)
-		{
-		if ( aName.CompareC( iChildren[i]->Name() ) == 0 )
-			{
-			foundObject = iChildren[i];
-			break;
-			}
-		}
-
-	return foundObject;
-	}
-
-TInt CTestDmDDFObject::SubObjectsCount()
-	{
-	TInt count = 0;
-
-	TInt i;
-	for (i = 0 ; i < iChildren.Count() ; i++)
-		{
-		count += iChildren[i]->SubObjectsCount();
-		}
-	count += i;
-
-	return count;
-	}
-
-/*
-// ========================== OTHER EXPORTED FUNCTIONS =========================
-
-// -----------------------------------------------------------------------------
-// ?function_name implements...
-// ?implementation_description.
-// Returns: ?value_1: ?description
-//          ?value_n: ?description
-//                    ?description
-// -----------------------------------------------------------------------------
-//
-?type  ?function_name(
-    ?arg_type arg,  // ?description
-    ?arg_type arg )  // ?description
-    {
-
-    ?code
-
-    }
-*/
-//  End of File  
--- a/omadm/omadmextensions/adapters/mms/tsrc/src/dmatest.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,954 +0,0 @@
-/*
-* Copyright (c) 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:  Implementation of DM adapter test component
-* 	This is part of omadmextensions/adapter test application.
-*
-*/
-
-
-
-
-
-
-// INCLUDE FILES
-#include "dmatest.h"
-
-#include <StifParser.h>
-#include <Stiftestinterface.h>
-#include <S32FILE.H>
-#include <s32mem.h>
-#include <apgcli.h>
-#include <e32svr.h>
-#include <e32math.h>
-#include <f32file.h>
-#include <swinstapi.h>
-
-#include "TestDmDDFObject.h"
-
-_LIT8( KEmptyType, "" );
-_LIT8( KDefaultType, "text/plain" );
-_LIT( KMappingTableFile, "\\dmtestmappings.txt" );
-//_LIT8( KNSmlDMSeparator8, "/" );
-const TUint8 KNSmlDMUriSeparator = 0x2f; //forward slash
-
-#define LEAVE_IF_ERROR(x,msg) \
-	{ TInt __xres = (x); if ( __xres < 0 ) { if ( iLog ) iLog->Log( (msg), __xres ); User::Leave( __xres );	} }
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// Cdmatest::Cdmatest
-// C++ default constructor can NOT contain any code, that
-// leave.
-// -----------------------------------------------------------------------------
-//
-Cdmatest::Cdmatest(CTestModuleIf& aTestModuleIf, TUid aUid ):
-        CScriptBase( aTestModuleIf ), iMappingTable(2), iUid( aUid )
-    {
-    
-    }
-
-// -----------------------------------------------------------------------------
-// Cdmatest::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void Cdmatest::ConstructL()
-    {    
-    Adapter();
-	iEmptyMappingInfoArray = new ( ELeave ) CArrayFixFlat<TSmlDmMappingInfo>(1);
-	
-	TRAPD( err, LoadMappingsL() );
-	if (err != KErrEof && err != KErrNone && err != KErrNotFound)
-		{
-		User::Leave( err );
-		}
-    }
-    
-CNSmlDmMMSAdapter *Cdmatest::Adapter()  
-	{
-	if ( iAdapter == NULL )
-		{
-		if ( iLog )
-			{
-			iLog->Log( _L( "Loading Adapter" ) );
-			}
-  		
-  		TRAPD( err, iAdapter = (CNSmlDmMMSAdapter*) CSmlDmAdapter::NewL( iUid,*this ) );
-	if ( err == KErrNone )
-		{
-		if (iLog )
-			{
-			iLog->Log( _L( "Loaded" ) );	
-			}
-		}
-	else
-		{
-		if (iLog)
-			{
-			iLog->Log( _L( "Failed to load adapter: %d" ), err );
-			}
-		}
-		}
-	return iAdapter;
-	}
-    
-    
-void Cdmatest::LoadMappingsL()
-	{
-	TDataType type; 
-	HBufC8 *data = LoadFileLC( KMappingTableFile,  type );
-	RDesReadStream buf( *data );
-	CleanupClosePushL( buf );
-
-	TInt len( data->Length() );
-	while (buf.Source()->TellL( MStreamBuf::ERead ).Offset() < len)
-		{
-		TUint32 val = buf.ReadUint32L();
-		TBuf8<256> uri;
-		TBuf8<64> luid;
-		buf.ReadL(uri, val);
-		val = buf.ReadUint32L();
-		buf.ReadL(luid, val);
-		TMapping m( uri, luid ) ;
-		TInt err( iMappingTable.Append( m )	);
-		if ( err == KErrNone )
-			{
-			iLog->Log( _L8( "Loaded mapping: '%S' : '%S'"), &m.iURI, &m.iLuid );
-			}
-		else
-			{
-			iLog->Log( _L8( "FAILED TO Load mapping: '%d' "), err );
-			}
-		}
-	CleanupStack::PopAndDestroy( &buf); // buf
-	CleanupStack::PopAndDestroy( data ); // data
-	}
-    	
-	
-
-void Cdmatest::SaveMappingsL()
-    {
-	TInt c( iMappingTable.Count() );
-	if ( c > 0 )
-	{
-    	RFs fs;
-    	User::LeaveIfError( fs.Connect() );
-    	CleanupClosePushL( fs );
-    	RFileWriteStream buf;
-    	User::LeaveIfError( buf.Replace( fs, KMappingTableFile, EFileWrite ) );
-    	CleanupClosePushL( buf );
-		
-		TInt i( 0 ) ;
-		do 
-			{
-			buf.WriteUint32L( iMappingTable[i].iURI.Length() );
-			buf.WriteL( iMappingTable[i].iURI );
-			buf.WriteUint32L( iMappingTable[i].iLuid.Length() );
-			buf.WriteL( iMappingTable[i].iLuid );
-			}
-		while ( ++i < c )	;
-		buf.CommitL();
-		buf.Close();
-	
-		CleanupStack::PopAndDestroy(); // buf
-		CleanupStack::PopAndDestroy(); // fs
-		}
-    }
-    	
-    
-// Destructor
-Cdmatest::~Cdmatest()
-    {
-    // Delete resources allocated from test methods
-    TRAPD(err, SaveMappingsL() );
-    if ( err != KErrNone )
-    	{
-    	if(iLog)
-    			iLog->Log( _L8( "Failed to save mappings!: %d"), err );
-    	}
-    Delete();
-    
-    // Delete logger
-    delete iLog;  
-    delete iEmptyMappingInfoArray;
-    delete iAdapter;
-    delete iURI;
-    iMappingTable.Reset();
-    REComSession::FinalClose();
-    }
-
-
-// -----------------------------------------------------------------------------
-// Camatest::Delete
-// Delete here all resources allocated and opened from test methods. 
-// Called from destructor. 
-// -----------------------------------------------------------------------------
-//
-void Cdmatest::Delete() 
-    {
-    
-    }
-
-// -----------------------------------------------------------------------------
-// Cdmatest::?member_function
-// ?implementation_description
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-
-
-        
-HBufC8 *Cdmatest::GetNextStringLC ( CStifItemParser& aItem, const TDesC &aName )
-	{
-	TPtrC nodename( KNullDesC );
-
-    TInt i( aItem.GetNextString ( nodename ) );
-    if ( i != KErrNone ) 
-	    {
-	    iLog->Log( _L( "ERROR Reading '%S' argument: 0x%X" ), &aName, i );
-	    }
-	else
-		{
-		iLog->Log( _L("%S: %S"), &aName, &nodename);
-		}
-	
-	HBufC8 *buf = HBufC8::NewLC( nodename.Length() ) ;
-	buf->Des().Copy( nodename );
-	return buf;
-	}
-	
-TInt Cdmatest::FetchNodeL( CStifItemParser& aItem )	
-	{
-
-    TInt ret( KErrNone );
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("Cdmatest"), _L("FetchNodeL") );
-
-	iResultsFunction = FetchNodeResultsL;
-	
-    TPtrC8 nodename( GetNextStringLC( aItem, _L(" nodename" ) )->Des() ) ;
-		
-	SetURIL(nodename) ;//
-	HBufC8 *luid = GetLuidAllocLC( *iURI );
-
-	Adapter()->ChildURIListL( *iURI, *luid, *iEmptyMappingInfoArray, 4, 5) ;
-
-	if ( iStatus == MSmlDmAdapter::EOk )
-		{
-		}
-	else
-		{
-		iLog->Log( _L("FetchNodeL: ChildUriList Error ! %d" ), iStatus );	
-		ret = KErrGeneral ;
-		}
-	CleanupStack::PopAndDestroy( luid ) ; 
-	CleanupStack::PopAndDestroy() ; // nodename
-	iLog->Log( _L("FetchNodeL: Test Complete with status %d" ), ret );	
-
-    return ret;
-	}
-	
-TInt Cdmatest::StartAtomicL( CStifItemParser& /*aItem*/ )	
-	{
-	TRAPD( err, Adapter()->StartAtomicL() ) ;
-	iLog->Log( _L("StartAtomicL: Atomic started resulting error %d" ), err );	
-    return err;
-	}
-
-TInt Cdmatest::RollbackAtomicL( CStifItemParser& /*aItem*/ )	
-	{
-	TRAPD( err, Adapter()->RollbackAtomicL() ) ;
-	iLog->Log( _L("RollbackAtomicL: Atomic rolled back resulting error %d" ), err );	
-    return err;
-	}
-	
-TInt Cdmatest::CommitAtomicL( CStifItemParser& /*aItem*/ )	
-	{
-	TRAPD( err, Adapter()->CommitAtomicL() ) ;
-	iLog->Log( _L("RollbackAtomicL: Atomic commited resulting error %d" ), err );	
-    return err;
-	}
-	
-
-TInt Cdmatest::DDFStructureL( CStifItemParser& /*aItem*/ )	
-	{
-	CTestDmDDFObject* ddfRoot = CTestDmDDFObject::NewLC( iLog ); //, aNodeName );
-
-	TRAPD( err, iAdapter->DDFStructureL( *ddfRoot ) ) ;
-	CleanupStack::PopAndDestroy( ddfRoot );
-	iLog->Log( _L("DDFStructureL: method called resulting error %d" ), err );	
-    return err;
-	}
-		
-		
-TInt Cdmatest::AddNodeL( CStifItemParser& aItem )	
-	{
-
-    TInt ret( KErrNone );
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("Cdmatest"), _L("AddNodeL") );
-
-    
-    TPtrC8 nodename( GetNextStringLC ( aItem, _L("nodename" ) )->Des() ) ;
-    SetURIL( nodename );
-
-	Adapter()->AddNodeObjectL( *iURI, KEmptyType, 8 ) ;
-	
-	if ( iStatus == MSmlDmAdapter::EOk )
-		{
-		iLog->Log( _L("AddNodeL: AddNodeObjectL Successful! %d" ), iStatus );	
-		}
-	else
-		{
-		iLog->Log( _L("AddNodeL: AddNodeObjectL Error ! %d" ), iStatus );	
-		ret = KErrGeneral ;
-		}
-		
-	CleanupStack::PopAndDestroy() ; // nodename
-	iLog->Log( _L("AddNodeL Test Complete with status %d" ), ret );	
-
-    return ret;
-	}	
-		
-TInt Cdmatest::UpdateLeafL( CStifItemParser& aItem )	
-	{
-
-    TInt ret( KErrNone );
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("Cdmatest"), _L("UpdateLeafL") );
-
-    TPtrC8 nodename( GetNextStringLC ( aItem, _L("Node name") )->Des() ) ;
-    TPtrC8 data (GetNextStringLC( aItem, _L("datafile"))->Des() );
-    
-	HBufC8 *mime = GetNextStringLC( aItem, _L("mime") ) ;
-    SetURIL( nodename );
-    
-    TPtrC8 parentURI(RemoveLastSeg(nodename));
-    HBufC8 *luid = GetLuidAllocLC( parentURI );
-    
-    TDataType type; 
-
-	TPtrC8 mimePtr( *mime == KNullDesC8 ? type.Des8() : mime->Des() );
-
-    /**
-    virtual void UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID,
-									const TDesC8& aObject, const TDesC8& aType,
-									TInt aStatusRef ) = 0;
-    */
-    
-	Adapter()->UpdateLeafObjectL( *iURI , *luid, data, mimePtr, 3);
-
-	if ( iStatus == MSmlDmAdapter::EOk )
-	{
-		iLog->Log( _L("UpdateLeafL: UpdateLeafObjectL Successful! %d" ), iStatus );	
-	}
-	else
-	{
-		iLog->Log( _L("UpdateLeafL UpdateLeafObjectL Error ! %d" ), iStatus );	
-		ret = KErrGeneral ;
-	}
-
-	CleanupStack::PopAndDestroy(); // loadfile
-	CleanupStack::PopAndDestroy(); // luid
-	CleanupStack::PopAndDestroy(); // mime
-	CleanupStack::PopAndDestroy(); // nodename
-
-	iLog->Log( _L("UpdateLeafL Test Complete with status %d" ), ret );	
-
-    return ret;
-	}	
-	
-
-TInt Cdmatest::UpdateLeafDataURLL( CStifItemParser& aItem )	
-	{
-
-    TInt ret( KErrNone );
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("Cdmatest"), _L("UpdateLeafDataL") );
-
-    TPtrC8 nodename( GetNextStringLC ( aItem, _L("Node name") )->Des() ) ;
-    TPtrC8 http (GetNextStringLC( aItem, _L("http"))->Des() );
-    TPtrC8 url (GetNextStringLC( aItem, _L("rest of url"))->Des() );
-	HBufC8 *mime = GetNextStringLC( aItem, _L("mime") ) ;
-    SetURIL( nodename );
-    
-    _LIT8( KTag, "://" );
-    
-    HBufC8 *fullurl = HBufC8::NewLC( http.Length() + KTag().Length() + url.Length() );
-    TPtr8 pfullurl( fullurl->Des() );
-    pfullurl.Copy( http ) ;
-    pfullurl.Append( KTag );
-    pfullurl.Append( url );
-    TPtrC8 mimePtr( *mime == KNullDesC8 ? KDefaultType() : mime->Des() );
-    
-    HBufC8 *luid = GetLuidAllocLC( *iURI );
-    /**
-    virtual void UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID,
-									const TDesC8& aObject, const TDesC8& aType,
-									TInt aStatusRef ) = 0;
-    */
-	Adapter()->UpdateLeafObjectL( *iURI , *luid, pfullurl, mimePtr, 3);
-	if ( iStatus == MSmlDmAdapter::EOk )
-		{
-		iLog->Log( _L("UpdateLeafDataL: UpdateLeafObjectL Successful! %d" ), iStatus );	
-		}
-	else
-		{
-		iLog->Log( _L("UpdateLeafDataL UpdateLeafObjectL Error ! %d" ), iStatus );	
-		ret = KErrGeneral ;
-		}
-	CleanupStack::PopAndDestroy( luid ); // 
-	CleanupStack::PopAndDestroy( mime ); // mime
-	CleanupStack::PopAndDestroy(); // url
-	CleanupStack::PopAndDestroy(); // http
-	CleanupStack::PopAndDestroy(); // nodename
-	iLog->Log( _L("UpdateLeafDataL Test Complete with status %d" ), ret );	
-
-    return ret;
-	}
-    
-TInt Cdmatest::UpdateLeafDataL( CStifItemParser& aItem )	
-	{
-
-    TInt ret( KErrNone );
-    // Print to UI
-   TestModuleIf().Printf( 0, _L("Camtest"), _L("UpdateLeafDataL") );
-
-    TPtrC8 nodename( GetNextStringLC ( aItem, _L("Node name") )->Des() ) ;
-    TPtrC8 data (GetNextStringLC( aItem, _L("data"))->Des() );
-	HBufC8 *mime = GetNextStringLC( aItem, _L("mime") ) ;
-	
-    SetURIL( nodename );
-    
-        
-    TPtrC8 mimePtr( *mime == KNullDesC8 ? KDefaultType() : mime->Des() );
-    
-    TPtrC8 parentURI(RemoveLastSeg(nodename));
-    HBufC8 *luid = GetLuidAllocLC( parentURI );
-     
-//    
-//    virtual void UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID,
-//									const TDesC8& aObject, const TDesC8& aType,
-//									TInt aStatusRef ) = 0;
-//   
-	Adapter()->UpdateLeafObjectL( *iURI , *luid, data, mimePtr, 3);
-	if ( iStatus == MSmlDmAdapter::EOk )
-		{
-		iLog->Log( _L("UpdateLeafDataL: UpdateLeafObjectL Successful! %d" ), iStatus );	
-		}
-	else
-		{
-		iLog->Log( _L("UpdateLeafDataL UpdateLeafObjectL Error ! %d" ), iStatus );	
-		ret = KErrGeneral ;
-		}
-	
-	CleanupStack::PopAndDestroy(); // mime
-	CleanupStack::PopAndDestroy(); // luid
-	CleanupStack::PopAndDestroy(); // data
-	CleanupStack::PopAndDestroy(); // nodename
-	iLog->Log( _L("UpdateLeafDataL Test Complete with status %d" ), ret );	
-
-    return ret;
-	}	
-			
-TInt Cdmatest::FetchLeafL( CStifItemParser& aItem )	
-	{
-
-    TInt ret( KErrNone );
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("Camtest"), _L("FetchLeafL") );
-
-	iResultsFunction = NULL;
-	
-    TInt i( 0 );
-    TPtrC8 nodename ( GetNextStringLC( aItem, _L( "nodename" ) )->Des() ) ;
-    
-    //TPtrC datafile;
-    TPtrC datafile( KNullDesC );
-    i = aItem.GetNextString ( datafile ) ;
-    if ( i != KErrNone ) 
-	    {
-	    iLog->Log(_L("FetchLeafL: ERROR Reading outfile argument: 0x%X"), i );
-	    //return i;
-	    }
-	else
-		{
-		iSaveFileName = datafile;
-		iLog->Log( _L( " Save file nameis '%S'" ), &iSaveFileName );
-		iResultsFunction = SaveDataL;
-		}
-    
-	SetURIL(nodename) ;
-		
-		/*
-			void FetchLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID,
-								   const TDesC8& aType, TInt aResultsRef,
-								   TInt aStatusRef );
-		*/
-    TPtrC8 parentURI(RemoveLastSeg(nodename));
-    HBufC8 *luid = GetLuidAllocLC( parentURI );
-
-	Adapter()->FetchLeafObjectL( *iURI, *luid, KEmptyType, 7, 8 ) ;
-	if ( iStatus == MSmlDmAdapter::EOk )
-		{
-		iLog->Log( _L("FetchLeafL: FetchLeafObjectL Successful! %d" ), iStatus );	
-		}
-	else
-		{
-		iLog->Log( _L("FetchLeafL: FetchLeafObjectL Error ! %d" ), iStatus );	
-		ret = KErrGeneral ;
-		}
-	CleanupStack::PopAndDestroy( luid );
-	CleanupStack::PopAndDestroy(  ); // nodename
-	iLog->Log( _L("FetchLeafL Test Complete with status %d" ), ret );	
-    return ret;
-	}	
-
-
-TInt Cdmatest::ExecuteLeafL( CStifItemParser& aItem )		
-	{
-	TInt ret( KErrNone );
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("Camtest"), _L("ExecuteLeafL") );
-
-	iResultsFunction = NULL;
-	
-    TPtrC8 nodename( GetNextStringLC ( aItem, _L("Nodename") )->Des() ) ;
-    TPtrC8 data( GetNextStringLC ( aItem, _L("Input file") )->Des() ) ;
-	
-	SetURIL(nodename) ;
-
-		/*
-			virtual void ExecuteCommandL( const TDesC8& aURI, const TDesC8& aLUID,
-							      const TDesC8& aArgument, const TDesC8& aType,
-								  TInt aStatusRef ) = 0;
-		*/
-	TDataType type;
-	
-    TPtrC8 parentURI(RemoveLastSeg(nodename));
-    HBufC8 *luid = GetLuidAllocLC( parentURI );
-
-	Adapter()->ExecuteCommandL( *iURI, *luid, data, KEmptyType, 11 ) ;
-	if ( iStatus == MSmlDmAdapter::EOk )
-		{
-		iLog->Log( _L("ExecuteLeafL: ExecuteCommandL Successful! %d" ), iStatus );	
-		}
-	else
-		{
-		iLog->Log( _L("ExecuteLeafL: ExecuteCommandL FetchLeafObjectL Error ! %d" ), iStatus );	
-		ret = KErrGeneral ;
-		}
-	CleanupStack::PopAndDestroy( luid ); // luid
-	CleanupStack::PopAndDestroy(); // data
-	CleanupStack::PopAndDestroy(); // nodename
-	
-	iLog->Log( _L("ExecuteLeafL: Test Complete with status %d" ), ret );	
-
-    return ret;
-	}
-	
-TInt Cdmatest::CompleteCommandsL( CStifItemParser& /*aItem*/ )
-	{
-	TRAPD( err, Adapter()->CompleteOutstandingCmdsL() );
-	delete iAdapter;
-	iAdapter = NULL;
-	return err;
-	}
-TInt Cdmatest::DeleteObjectL( CStifItemParser& aItem )
-{
-	TInt ret( KErrNone );
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("Camtest"), _L("DeleteObjectL") );
-
-    TPtrC8 nodename( GetNextStringLC ( aItem, _L("Nodename") )->Des() ) ;
-
-	SetURIL(nodename) ;
-
-	HBufC8 *luid = GetLuidAllocLC( *iURI );
-	Adapter()->DeleteObjectL( *iURI, *luid, 11 ) ;
-	if ( iStatus == MSmlDmAdapter::EOk )
-		{
-		iLog->Log( _L("DeleteNode: DeleteObjectL Successful! %d" ), iStatus );	
-		}
-	else
-		{
-		iLog->Log( _L("DeleteNode: DeleteObjectL FetchLeafObjectL Error ! %d" ), iStatus );	
-		ret = KErrGeneral ;
-		}
-	CleanupStack::PopAndDestroy( luid ); // luid
-	CleanupStack::PopAndDestroy(); // nodename	
-	iLog->Log( _L("ExecuteLeafDataL Test Complete with status %d" ), ret );	
-
-    return ret;	
-}
-	
-TInt Cdmatest::ExecuteLeafDataL( CStifItemParser& aItem )		
-	{
-	TInt ret( KErrNone );
-
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("Camtest"), _L("ExecuteLeafL") );
-
-	iResultsFunction = NULL;
-	
-    TPtrC8 nodename( GetNextStringLC ( aItem, _L("Nodename") )->Des() ) ;
-    TPtrC8 data( GetNextStringLC ( aItem, _L("Input data") )->Des() ) ;
-    
-	SetURIL(nodename) ;
-
-		/*
-			virtual void ExecuteCommandL( const TDesC8& aURI, const TDesC8& aLUID,
-							      const TDesC8& aArgument, const TDesC8& aType,
-								  TInt aStatusRef ) = 0;
-		*/
-	HBufC8 *luid = GetLuidAllocLC( *iURI );
-	Adapter()->ExecuteCommandL( *iURI, *luid, data, KEmptyType, 11 ) ;
-	if ( iStatus == MSmlDmAdapter::EOk )
-		{
-		iLog->Log( _L("ExecuteLeafDataL: ExecuteCommandL Successful! %d" ), iStatus );	
-		}
-	else
-		{
-		iLog->Log( _L("ExecuteLeafDataL: ExecuteCommandL FetchLeafObjectL Error ! %d" ), iStatus );	
-		ret = KErrGeneral ;
-		}
-	CleanupStack::PopAndDestroy(); // luid
-	CleanupStack::PopAndDestroy(); // data		
-	CleanupStack::PopAndDestroy(); // nodename	
-	iLog->Log( _L("ExecuteLeafDataL Test Complete with status %d" ), ret );	
-
-    return ret;
-	}
-
-
-HBufC8 *Cdmatest::LoadFileLC( const TDesC &aFileName, TDataType &aType )	
-	{
-	RFs fs ;
-	LEAVE_IF_ERROR( fs.Connect(), _L( "Could not connect fileserver: %d"  ) );
-	
-	CleanupClosePushL( fs );
-	RFile file ;
-	LEAVE_IF_ERROR( file.Open(fs,aFileName,EFileRead), _L( "Could not open file: %d" ) );
-	
-	
-	
-	CleanupClosePushL( file );
-	TInt dataSize ;
-	LEAVE_IF_ERROR( file.Size( dataSize ), _L( "Could not get file size: %d" ) );
-	HBufC8 *nodedata = HBufC8::NewL ( dataSize );
-	CleanupStack::PushL( nodedata );
-	TPtr8 nodedataptr( nodedata->Des() );
-	LEAVE_IF_ERROR( file.Read( nodedataptr ), _L( "Could not read file: %d" ) );
-	TDataRecognitionResult aDataType;
-	RApaLsSession ls ;
-	TInt err( ls.Connect() );
-	if ( err == KErrNone )
-		{
-		CleanupClosePushL( ls );
-		err = ls.RecognizeData(aFileName, nodedataptr, aDataType)  ;
-		if ( err == KErrNone )
-			{
-			aType = aDataType.iDataType;
-			}
-		else
-			{
-			iLog->Log( _L("LoadFileLC: WARNING Failed to get type: %d" ), err );
-			aType = TDataType( KDefaultType );
-			}	
-		CleanupStack::PopAndDestroy( &ls ); 
-		}
-	else
-		{
-		iLog->Log( _L("LoadFileLC: WARNING Failed to connect rapalssession: %d" ), err );
-		}	
-	CleanupStack::Pop( nodedata );
-	CleanupStack::PopAndDestroy( &file ); 
-	CleanupStack::PopAndDestroy( &fs ); 
-	CleanupStack::PushL( nodedata );
-	return nodedata ;
-	}
-
-HBufC8 *Cdmatest::LoadFileLC( const TDesC8 &aFileName, TDataType &aType )	
-	{
-	TFileName fn ;
-	fn.Copy( aFileName );
-	return LoadFileLC( fn, aType );
-	}
-	
-
-void Cdmatest::SaveDataL( TInt /*aResultsRef*/, CBufBase& aObject,
-							  const TDesC8& aType ) 
-	{
-	iLog->Log( _L8( "Saving data of type: '%S'" ), &aType );
-	RFs fs;
-	User::LeaveIfError( fs.Connect() );
-	CleanupClosePushL( fs );
-	RFile file;
-	User::LeaveIfError( file.Replace ( fs, iSaveFileName, EFileWrite ) );
-	CleanupClosePushL( file );
-	TPtrC8 p( aObject.Ptr( 0 ) );
-	User::LeaveIfError( file.Write( p ) );
-	CleanupStack::PopAndDestroy( 2 ); // file, fs
-	}
-							  
-		
-	
-void Cdmatest::FetchNodeResultsL( TInt /*aResultsRef*/, CBufBase& aObject,
-							  const TDesC8& /*aType*/ )
-	{
-	TPtrC8 ptr( aObject.Ptr( 0 ) );	
-	iLog->Log( _L8("FetchNodeResultsL for '%S': '%S'" ), iURI, &ptr );
-	
-	if ( ptr.Length() > 0 )
-		{
-		TPtrC8 last( LastURISeg( ptr ) );
-		HBufC8 *oldUri = HBufC8::NewL( iURI->Length() );
-		(*oldUri) = *iURI; 
-		do 
-			{
-			iLog->Log ( _L8( " Node: '%S' "), &last );
-			HBufC8 *nUri = HBufC8::NewLC( oldUri->Length() + 1 + last.Length() );
-			nUri->Des().Copy( *oldUri ) ;
-			nUri->Des().Append( '/' );
-			nUri->Des().Append( last );
-			
-			SetURIL( nUri );
-			//iResultsFunction = FetchNodeResultsL;
-			
-		    //TPtrC8 parentURI(RemoveLastSeg(*nUri));
-		    //HBufC8 *luid = GetLuidAllocLC( parentURI );
-		    CleanupStack::Pop( nUri );
-			
-			HBufC8 *luid = GetLuidAllocLC( *iURI );
-			
-			Adapter()->ChildURIListL( *nUri, KNullDesC8, *iEmptyMappingInfoArray, 4, 5 );//Dipak
-			
-			CleanupStack::PopAndDestroy( luid ); 			
-			
-			ptr.Set( RemoveLastURISeg( ptr ) );
-			last.Set( LastURISeg( ptr ) );
-			
-			}
-		while (last != KNullDesC8);	
-		}
-	
-	}
-	
-
-	
-TPtrC8 Cdmatest::LastURISeg( const TDesC8& aURI )
-	{
-	TInt i;
-	for( i = aURI.Length() - 1; i >= 0; i-- ) 
-		{
-		if( aURI[i] == '/' )
-			{
-			break;
-			}
-		}
-
-	if( i == 0 )
-		{
-		return aURI;
-		}
-	else
-		{
-		return aURI.Mid( i+1 );
-		}
-	}
-TPtrC8 Cdmatest::RemoveLastSeg(const TDesC8& aURI)
-	{
-	TInt i;
-	for(i=aURI.Length()-1;i>=0;i--)
-		{
-		if(aURI[i]==KNSmlDMUriSeparator)
-			{
-			break;
-			}
-		}
-
-	if(i>0)
-		{
-		return aURI.Left(i);
-		}
-	else
-		{
-		return KNullDesC8();
-		}
-	}
-
-// ------------------------------------------------------------------------------------------------
-// TPtrC8 Cdmatest::RemoveLastURISeg(const TDesC8& aURI)
-// returns parent uri, i.e. removes last uri segment
-// ------------------------------------------------------------------------------------------------
-TPtrC8 Cdmatest::RemoveLastURISeg( const TDesC8& aURI )
-	{
-	TInt i;
-	for ( i = aURI.Length() - 1; i >= 0 ; i-- )
-		{
-		if( aURI[i] == '/' )
-			{
-			break;
-			}
-		}
-	if ( i > -1 )
-		{
-		return aURI.Left( i );	
-		}
-	else
-		{
-		return KNullDesC8();
-		}
-	}	
-	
-TPtrC Cdmatest::RemoveLastURISeg( const TDesC& aURI )
-	{
-	TInt i;
-	for ( i = aURI.Length() - 1; i >= 0 ; i-- )
-		{
-		if( aURI[i] == '/' )
-			{
-			break;
-			}
-		}
-	if ( i > -1 )
-		{
-		return aURI.Left( i );	
-		}
-	else
-
-		{
-		return KNullDesC();
-		}
-	}		
-	
-void Cdmatest::SetURIL( const TDesC& aURI )
-	{
-	if ( iURI != NULL )
-		{
-		delete iURI ;
-		iURI = NULL;
-		}
-	iURI = HBufC8::NewL( aURI.Length() ) ;
-	iURI->Des().Copy( aURI );
-	}
-	
-void Cdmatest::SetURIL( const TDesC8& aURI )
-	{
-	if ( iURI != NULL )
-		{
-		delete iURI ;
-		iURI = NULL;
-		}
-	iURI = HBufC8::NewL( aURI.Length() ) ;
-	iURI->Des().Copy( aURI );
-	}	
-
-void Cdmatest::SetURIL( HBufC8* aURI )
-	{
-	if ( iURI != NULL )
-		{
-		delete iURI ;
-		iURI = NULL;
-		}
-	iURI = aURI ;
-	}
-		
-		
-		
-void Cdmatest::SetResultsL( 
-	TInt aResultsRef, 
-	CBufBase& aObject,
-	const TDesC8& aType )
-	{
-	TPtrC8 ptr( aObject.Ptr(0) );
-	iLog->Log( _L8( "SetResults, ref=%d, object='%S', type='%S'" ), aResultsRef, &ptr, &aType );
-	if ( iResultsFunction )
-		{
-		(this->*iResultsFunction)( aResultsRef, aObject, aType );
-		iResultsFunction = NULL ;
-		}
-	
-	}
-
-
-void Cdmatest::SetStatusL( TInt aStatusRef,
-							 MSmlDmAdapter::TError aErrorCode ) 
-	{
-	iStatus = aErrorCode ;
-	iLog->Log( _L( "SetStatusL, ref=%d, code=%d" ), aStatusRef, aErrorCode );
-	
-	
-	}
-	
-void Cdmatest::SetMappingL( const TDesC8& aURI, const TDesC8& aLUID ) 
-	{
-	iLog->Log( _L8( "SetMappingL, aURI='%s', aLUID='%s'" ), aURI.Ptr(), aLUID.Ptr() );	
-	
-	iMappingTable.Append(TMapping( aURI, aLUID ) )	;
-	}
-	
-HBufC8* Cdmatest::GetLuidAllocL( const TDesC8& aURI ) 
-	{
-	iLog->Log( _L8( "GetLuidAllocL, aURI='%S'" ), &aURI );		
-	HBufC8 *res = NULL;		
-	for( TInt i(0); i < iMappingTable.Count(); i++ )	
-		{
-		if ( aURI == iMappingTable[i].iURI )
-			{
-			res = iMappingTable[i].iLuid.AllocL();
-			}
-		}
-	if ( res == NULL )
-		{
-		res = HBufC8::NewL( 0 );
-		}
-	iLog->Log( _L8( "GetLuidAllocL, response='%S'" ), res );
-	return res;
-	}	    
-    
-HBufC8* Cdmatest::GetLuidAllocLC( const TDesC8& aURI ) 
-	{
-	iLog->Log( _L8( "GetLuidAllocL, aURI='%S'" ), &aURI );
-	HBufC8 *res = NULL;		
-	for( TInt i(0); i < iMappingTable.Count(); i++ )	
-		{
-		if ( aURI == iMappingTable[i].iURI )
-			{
-			res = iMappingTable[i].iLuid.AllocLC();
-			break;
-			}
-		}
-	if ( res == NULL )
-		{
-		res = HBufC8::NewLC( 0 );
-		}
-	iLog->Log( _L8( "GetLuidAllocLC, response='%S'" ), res );
-	return res ;
-	}	
-    	
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-    
-void Cdmatest::GetMappingInfoListL( const TDesC8& /*aURI*/,
-								CArrayFix<TSmlDmMappingInfo>& /*aSegmentList*/ )
-	{
-	// do nothing
-	}								
-
-#else
-// nothing
-#endif
-//***************************************************************************
-//  End of File
--- a/omadm/omadmextensions/adapters/mms/tsrc/src/mmstest.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,117 +0,0 @@
-/*
-* Copyright (c) 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:  Implementation of DM adapter test component
-* 	This is part of omadmextensions/adapter test application.
-*
-*/
-
-
-
-
-
-
-// INCLUDE FILES
-#include <Stiftestinterface.h>
-#include "mmsTest.h"
-#include <stiflogger.h>
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CmmsTest::CmmsTest
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-/*CmmsTest::CmmsTest( 
-    CTestModuleIf& aTestModuleIf ):
-        CScriptBase( aTestModuleIf )
-    {
-    }*/
-CmmsTest::CmmsTest( CTestModuleIf& aTestModuleIf )
-		: Cdmatest( aTestModuleIf, KAdapterUid )
-    {
-    }
-// -----------------------------------------------------------------------------
-// CmmsTest::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CmmsTest::ConstructL()
-    {
-/*    iLog = CStifLogger::NewL( KamtestLogPath, 
-                          KamtestLogFile,
-                          CStifLogger::ETxt,
-                          CStifLogger::EFile,
-                          EFalse );*///Commented the Part for mmsTest Dipak
-    iLog = CStifLogger::NewL( KamtestLogPath, 
-                          KamtestLogFile,
-                          CStifLogger::ETxt,
-                          CStifLogger::EFile );
-                          
-    iLog->Log( _L( "Loading Adapter" ) );
-    
-	Cdmatest::ConstructL();                         	
-
-    }
-
-// -----------------------------------------------------------------------------
-// CmmsTest::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CmmsTest* CmmsTest::NewL( 
-    CTestModuleIf& aTestModuleIf )
-    {
-    CmmsTest* self = new (ELeave) CmmsTest( aTestModuleIf );
-    
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop();
-
-    return self;
-    
-    }
-    
-// Destructor
-CmmsTest::~CmmsTest()
-    { 
-    
-    // Delete resources allocated from test methods
-//    Delete();
-    
-    // Delete logger
-//    delete iLog;  
-    
-    }
-
-// ========================== OTHER EXPORTED FUNCTIONS =========================
-
-// -----------------------------------------------------------------------------
-// LibEntryL is a polymorphic Dll entry point.
-// Returns: CScriptBase: New CScriptBase derived object
-// -----------------------------------------------------------------------------
-//
-EXPORT_C CScriptBase* LibEntryL( 
-    CTestModuleIf& aTestModuleIf ) // Backpointer to STIF Test Framework
-    {
-    
-    return ( CScriptBase* ) CmmsTest::NewL( aTestModuleIf );
-        
-    }
-
-
-    
-//  End of File
--- a/omadm/omadmextensions/adapters/mms/tsrc/src/mmstestBlocks.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,108 +0,0 @@
-/*
-* Copyright (c) 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:  Implementation of DM adapter test component
-* 	This is part of omadmextensions/adapter test application.
-*
-*/
-
-
-
-
-
-
-// INCLUDE FILES
-#include <e32svr.h>
-#include <StifParser.h>
-#include <Stiftestinterface.h>
-#include "mmsTest.h"
-#include <e32math.h>
-#include <f32file.h>
-#include <swinstapi.h>
-
-
-//using namespace NApplicationManagement;//Dipak
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CmmsTest::Delete
-// Delete here all resources allocated and opened from test methods. 
-// Called from destructor. 
-// -----------------------------------------------------------------------------
-//
-void CmmsTest::Delete() 
-    {
-    
-    }
-    
-// -----------------------------------------------------------------------------
-// CmmsTest::RunMethodL
-// Run specified method. Contains also table of test mothods and their names.
-// -----------------------------------------------------------------------------
-//
-TInt CmmsTest::RunMethodL( 
-    CStifItemParser& aItem ) 
-    {
-   
-    TStifFunctionInfo const KFunctions[] =
-        {  
-        // Copy this line for every implemented function.
-        // First string is the function name used in TestScripter script file.
-        // Second is the actual implementation member function. 
-        ENTRY( "DDFStructure", CmmsTest::DDFStructureL),
-        ENTRY( "FetchNode", CmmsTest::FetchNodeL ),
-        ENTRY( "FetchLeaf", CmmsTest::FetchLeafL ),
-        ENTRY( "AddNode", CmmsTest::AddNodeL ),
-        ENTRY( "UpdateLeaf", CmmsTest::UpdateLeafL ),
-        ENTRY( "UpdateLeafData", CmmsTest::UpdateLeafDataL ),
-        ENTRY( "Execute", CmmsTest::ExecuteLeafL ),
-        ENTRY( "ExecuteData", CmmsTest::ExecuteLeafDataL ),
-        ENTRY( "DeleteNode", CmmsTest::DeleteObjectL ),
-        ENTRY( "StartAtomic", CmmsTest::StartAtomicL),
-	    ENTRY( "CommitAtomic", CmmsTest::CommitAtomicL),
-	    ENTRY( "RollbackAtomic", CmmsTest::RollbackAtomicL),
-	    ENTRY( "CompleteCommands", CmmsTest::CompleteCommandsL),
-        };
-
-    const TInt count = sizeof( KFunctions ) / 
-                        sizeof( TStifFunctionInfo );
-
-    return RunInternalL( KFunctions, count, aItem );
-
-    }    
-
-        
-        
-HBufC8 *CmmsTest::GetNextStringLC ( CStifItemParser& aItem, const TDesC &aName )
-	{
-	TPtrC nodename;
-	nodename.Set( KNullDesC );
-
-    TInt i( aItem.GetNextString ( nodename ) );
-    if ( i != KErrNone ) 
-	    {
-	    iLog->Log( _L( "ERROR Reading '%S' argument: 0x%X" ), &aName, i );
-	    }
-	else
-		{
-		iLog->Log( _L("%S: %S"), &aName, &nodename);
-		}
-	
-	HBufC8 *buf = HBufC8::NewLC( nodename.Length() ) ;
-	buf->Des().Copy( nodename );
-	
-	return buf;
-	}
-	
-//  End of File
--- a/omadm/omadmextensions/adapters/nsmldinternet/group/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-/*
-* 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:   build info file for internet settings adapter
-*
-*/
-
-
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-
-PRJ_EXPORTS
-
-PRJ_MMPFILES
-./nsmlinternetadapter.mmp
-
-
-
--- a/omadm/omadmextensions/adapters/nsmldinternet/group/nsmlinternetadapter.mmp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-/*
-* Copyright (c) 2004-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:   InternetAdapter 
-*
-*/
-
-
-
-#include "defaultcaps.hrh"
-#include  <platform_paths.hrh>
-
-CAPABILITY      CAP_ECOM_PLUGIN
-TARGET	      	nsmlinternetadapter.dll
-TARGETTYPE      PLUGIN
-UID             0x10009D8D 0x101F6DEA
-VENDORID        VID_DEFAULT
-
-
-APP_LAYER_SYSTEMINCLUDE
-SYSTEMINCLUDE 	/epoc32/include/ecom 
-
-SOURCEPATH      ../src
-USERINCLUDE     ../inc
-
-SOURCE          NSmlInternetAdapter.cpp
-
-SOURCE		NSmlWLanAdapter.cpp
-SOURCE		NSmlWlanSettings.cpp
-
-START RESOURCE	NSmlInternetAdapter.rss
-END
-
-LANG	sc
-
-LIBRARY		charconv.lib commdb.lib efsrv.lib ecom.lib euser.lib nsmldmclientserverutils.lib
-LIBRARY		nsmldebug.lib sysutil.lib
-LIBRARY		inetprotutil.lib
-LIBRARY 	commsdat.lib
-LIBRARY 	cmmanager.lib
-LIBRARY 	cmmanagerdatabase.lib
-LIBRARY 	centralrepository.lib FeatMgr.lib
-LIBRARY		policyengine.lib
-LIBRARY		nsmldmtreedbclient.lib
-
--- a/omadm/omadmextensions/adapters/nsmldinternet/inc/NSmlInternetAdapter.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,575 +0,0 @@
-/*
-* 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:   Internet-settings 
-*
-*/
-
-
-
-
-#ifndef __NSMLINTERNETADAPTER_H__
-#define __NSMLINTERNETADAPTER_H__
-
-// SyncML device management LoginScript
-//#define __SYNCML_DM_LSCRIPT 1
-//#define __SYNCML_DM_WLAN 1
-// ------------------------------------------------------------------------------------------------
-// Includes
-// ------------------------------------------------------------------------------------------------
-#include <utf.h>
-#include <bldvariant.hrh>
-#include <commdb.h>
-#include <metadatabase.h>
-#include "smldmadapter.h"
-#include "nsmlconstants.h"
-
-#include "NSmlWLanAdapter.h"
-#include "NSmlWlanSettings.h"
-
-const TInt  KNSmlInternetAdapterFatMinSize=512;
-const TInt  KNSmlIncompleteAP=-1;
-// Buffering Stuff
-const TInt KNSmlAPGranularity = 4;
-const TUint8 KNSmlDMUriSeparator = 0x2f;
-
-const TUint8 KNSmlDMDot = 0x2e;
-const TUint8 KNSmlDMAsciiIntStart = 0x30;
-const TUint8 KNSmlDMAsciiIntEnd = 0x39;
-// Other constants
-const TInt KNSmlApDnsLuidUpperBase = 300000;
-const TInt KNSmlAp3gpppsLowerBase = 50000;
-const TInt KNSmlApProxyLowerBase = 100000;
-const TInt KNSmlApProxyUpperBase = 200000;
-const TInt KNSmlApWapLowerBase = 9200;
-const TInt KNSmlApWapUpperBase = 9203;
-
-//DDF version number
-_LIT8( KNSmlInternetAdapterDDFversion, "1.1");
-
-//DDF accepted AP-fieldnames
-_LIT8( KNSmlDdfAP,              "AP" );
-
-_LIT8( KNSmlDdfPx,              "Px" );
-_LIT8( KNSmlDdfPxName,          "Name" );
-_LIT8( KNSmlDdfPxId,            "PxID" );
-_LIT8( KNSmlDdfPxPW,            "PxPW" );
-_LIT8( KNSmlDdfPPGAuthTy,       "PPGAuthTy" );
-_LIT8( KNSmlDdfDomain,          "Domain" );
-_LIT8( KNSmlDdfDomainL,         "DomainL" );
-_LIT8( KNSmlDdfPxAddr,          "PxAddr" );
-_LIT8( KNSmlDdfToNAPID,         "ToNAPID" );
-_LIT8( KNSmlDdfToNAPIDL,        "ToNAPIDL" );
-_LIT8( KNSmlDdfStartpg,         "Startpg" );
-_LIT8( KNSmlDdfBasAuthId,       "BasAuthId" );
-_LIT8( KNSmlDdfBasAuthPW,       "BasAuthPW" );
-_LIT8( KNSmlDdfPort,            "Port" );
-_LIT8( KNSmlDdfPortNbr,         "PortNbr" );
-_LIT8( KNSmlDdfPxAuthTy,        "PxAuthTy" ); 
-_LIT8( KNSmlDdfService,         "Service" );
-_LIT8( KNSmlDdfServiceL,        "ServiceL" );
-_LIT8( KNSmlDdfUsePTxtLog,      "UsePTxtLog" );
-
-_LIT8( KNSmlDdfGPRSPDP,         "GPRSPDP" );
-_LIT8( KNSmlDdfDefGW,           "DefGW" );
-_LIT8( KNSmlDdfNetworkMask,     "NetworkMask" );
-
-_LIT8( KNSmlDdfPPPComp,         "PPPComp" );
-
-_LIT8( KNSmlDdfNAPDef,          "NAPDef" );
-_LIT8( KNSmlDdfNAPName,         "Name" );
-_LIT8( KNSmlDdfNAPLinger,         "Linger" );
-_LIT8( KNSmlDdfNAPID,           "NAPID" );
-_LIT8( KNSmlDdfBearer,          "Bearer" );
-_LIT8( KNSmlDdfBearerL,         "BearerL" );
-_LIT8( KNSmlDdfDirection,       "Direction" );
-_LIT8( KNSmlDdfInternet,        "Internet" );
-_LIT8( KNSmlDdfNAPAddr,         "NAPAddr" );
-_LIT8( KNSmlDdfNAPAddrTy,       "NAPAddrTy" );
-_LIT8( KNSmlDdfDNSAddr,         "DNSAddr" );
-_LIT8( KNSmlDdfDNSAddrL,        "DNSAddrL" );
-_LIT8( KNSmlDdfDNSAddrTy,       "DNSAddrTy" );
-_LIT8( KNSmlDdfDNSPriority,     "DNSPriority" );
-_LIT8( KNSmlDdfNAPAuthInf,      "NAPAuthInf" ); 
-_LIT8( KNSmlDdfAuthName,        "AuthName" ); 
-_LIT8( KNSmlDdfAuthSecr,        "AuthSecr" );
-_LIT8( KNSmlDdfPxAuthInf,       "PxAuthInf" );
-_LIT8( KNSmlDdfPxAuthId,        "PxAuthID" );
-_LIT8( KNSmlDdfPxAuthPW,        "PxAuthPW" );
-
-_LIT8( KNSmlDdfIPAddrFromServer,"IPAddrFromServer" );
-_LIT8( KNSmlDdfIPAddr,          "IPAddr" );
-_LIT8( KNSmlDdfDNSAddrFromServer,"IPDNSAddrFromServer" );
-_LIT8( KNSmlDdfIPv6DNSAddrFromServer,"IPv6DNSAddrFromServer" );
-_LIT8( KNSmlDdfIfNetworks,      "IfNetworks" );
-_LIT8( KNSmlDdfIAPService,      "IAPService" );
-_LIT8( KNSmlDdfLANService,      "LANService" );
-
-_LIT8( KNSmlDdfIAPSeamlessness, "Seamlessness" );
-_LIT8( KNSmlDdfIAPMetaData,     "MetaData" );
-
-_LIT8( KNSmlDdfNoPxFor,         "NoPxFor" );
-_LIT8( KNSmlDdfNoPxForL,        "NoPxForL" );
-
-_LIT8( KNSmlDdfNetworks,        "Networks" );
-_LIT8( KNSmlDdfNetworkName,     "Name" );
-_LIT8( KNSmlDdfNetworkID,       "ID" );
-
-//DDF AP-field descriptions
-_LIT8( KNSmlDdfAPDesc,           "AP (Access Point) node" );
-
-_LIT8( KNSmlDdfPxDesc,          "Px (Proxy) node" );
-_LIT8( KNSmlDdfPxNameDesc,      "Px name description" );
-_LIT8( KNSmlDdfNameDesc,        "Displayable name for the Proxy" );
-_LIT8( KNSmlDdfPxIdDesc,        "Define one Proxy entity" );
-_LIT8( KNSmlDdfPxPWDesc,        "Password for one Proxy entity" );
-_LIT8( KNSmlDdfPPGAuthTyDesc,   "Link PxID and PxPW to an authentication method" );
-_LIT8( KNSmlDdfPxAddrDesc,      "Proxy-Address" );
-_LIT8( KNSmlDdfToNAPIDDesc,     "Parent to all Network Access Point link objects" );
-_LIT8( KNSmlDdfToNAPIDLDesc,    "NAPID end" );
-_LIT8( KNSmlDdfStartpgDesc,     "The WAP homepage or start page" );
-_LIT8( KNSmlDdfBasAuthIdDesc,   "Basic authentication identifier" );
-_LIT8( KNSmlDdfBasAuthPWDesc,   "Basic authentication password" );
-_LIT8( KNSmlDdfPortDesc,        "Port node" );
-_LIT8( KNSmlDdfPortNbrDesc,     "Value of the port number" );
-_LIT8( KNSmlDdfServiceDesc,     "Service node" );
-_LIT8( KNSmlDdfServiceLDesc,    "ServiceL" );
-_LIT8( KNSmlDdfUsePTxtLogDesc,  "Plain Text Login is used or not" );
-
-_LIT8( KNSmlDdfGPRSPDPDesc,     "GPRS PDP-type" );
-_LIT8( KNSmlDdfDefGWDesc,       "Default Gateway" );
-_LIT8( KNSmlDdfNetworkMaskDesc, "Network/Subnet mask" );
-
-_LIT8( KNSmlDdfPPPCompDesc,     "PPP Compression" );
-
-_LIT8( KNSmlDdfNAPDefDesc,      "Network Access Point Definition objects parent" );
-_LIT8( KNSmlDdfNAPNameDesc,     "Displayable name for the NAP" );
-_LIT8( KNSmlDdfNAPIDDesc,       "Used by TO-NAPID link of the Proxy" );
-_LIT8( KNSmlDdfNAPLingerDesc,       "Linger value" );
-_LIT8( KNSmlDdfBearerDesc,      "Bearer node" );
-_LIT8( KNSmlDdfBearerLDesc,     "Bearer valid" );
-_LIT8( KNSmlDdfDirectionDesc,   "Direction for network type" );
-_LIT8( KNSmlDdfInternetDesc,    "IP-routable network segment" );
-_LIT8( KNSmlDdfNAPAddrDesc,     "NAP-Address" );
-_LIT8( KNSmlDdfNAPAddrTyDesc,   "NAP-Address-Type" );
-_LIT8( KNSmlDdfDNSAddrDesc,     "DNSAddr node" );
-_LIT8( KNSmlDdfDNSAddrLDesc,    "Address of a DNS server" );
-_LIT8( KNSmlDdfDNSAddrTyDesc,   "Type of DNS address" );
-_LIT8( KNSmlDdfDNSPriorityDesc, "Rank of DNS server" );
-_LIT8( KNSmlDdfNAPAuthInfDesc,  "Authentication Info" );
-_LIT8( KNSmlDdfAuthNameDesc,    "Loginname" );
-_LIT8( KNSmlDdfAuthSecrDesc,    "Loginpassword" );
-_LIT8( KNSmlDdfPxAuthInfDesc,    "Proxy Authentication Info" );
-_LIT8( KNSmlDdfPxAuthIdDesc,        "Proxy Loginname" );
-_LIT8( KNSmlDdfPxAuthPWDesc,        "Proxy Loginpassword" );
-
-_LIT8( KNSmlDdfIPAddrFromServerDesc,"Get IP addresses from server?" );
-_LIT8( KNSmlDdfIPAddrDesc,          "IP-address" );
-_LIT8( KNSmlDdfDNSAddrFromServerDesc,"Get DNS addresses from server?" );
-_LIT8( KNSmlDdfIPv6DNSAddrFromServerDesc,"Get IPv6 addresses from server?" );
-_LIT8( KNSmlDdfIfNetworksDesc,      "Comma separated list of network protocols, e.g. PPP" );
-_LIT8( KNSmlDdfIAPServiceDesc,      "IAP service" );
-
-_LIT8( KNSmlDdfIAPSeamlessnessDesc, "IAP seamlessness value" );
-_LIT8( KNSmlDdfIAPMetaDataDesc,      "IAP meta data value" );
-
-_LIT8( KNSmlDdfDomainDesc,          "Domain desc" );
-_LIT8( KNSmlDdfDomainLDesc,         "Domain, for which the Proxy is responsible" );
-
-_LIT8( KNSmlDdfNoPxForDesc,     "No proxy for listed AP:s" );
-_LIT8( KNSmlDdfNoPxForLDesc,    "No proxy for this AP" );
-
-_LIT8( KNSmlDdfNetworksDesc,    "Networks" );
-_LIT8( KNSmlDdfNetworkNameDesc, "Network Name" );
-_LIT8( KNSmlDdfNetworkIDDesc,   "Network ID" );
-
-//Other 
-_LIT8( KNSmlDNS1,               "/DNS1" );
-_LIT8( KNSmlDNS2,               "/DNS2" );
-_LIT8( KNSmlDNS3,               "/DNS3" );
-_LIT8( KNSmlDNS4,               "/DNS4" );
-
-_LIT8(KNSmlAPnode,      "NAPDef/Px");
-
-
-_LIT8(KNSmlNAPDefGPRSnode, "Name/NAPID/Startpg/Bearer/IPAddr/IPAddrFromServer/IfNetworks/NAPAddr/NAPAddrTy/IPDNSAddrFromServer/IPv6DNSAddrFromServer/DNSAddr/NAPAuthInf/DefGW/NetworkMask/PPPComp/UsePTxtLog/GPRSPDP/Networks/IAPService/Seamlessness/MetaData/Linger");
-
-//_LIT8(KNSmlNAPDefCSDnode, "Name/NAPID/Bearer/IPAddr/IPAddrFromServer/IfNetworks/NAPAddr/NAPAddrTy/CallTy/IPDNSAddrFromServer/IPv6DNSAddrFromServer/DNSAddr/NAPAuthInf/LnkSpeed/DefGW/NetworkMask/PPPComp/UseCB/CBTy/CBNbr/UsePTxtLog/ModemInit/Networks/IAPService");
-
-//_LIT8(KNSmlNAPDefGPRSnode, "Name/NAPID/Bearer/IPAddr/IPAddrFromServer/IfNetworks/NAPAddr/NAPAddrTy/CallTy/IPDNSAddrFromServer/IPv6DNSAddrFromServer/DNSAddr/NAPAuthInf/LnkSpeed/DefGW/NetworkMask/PPPComp/UsePTxtLog/GPRSPDP/Networks/IAPService");
-
-_LIT8(KNSmlPxnode,      "Name/PxID/PxAddr/Port/ToNAPID/Startpg/Domain/PxAuthInf/NoPxFor");
-
-#ifdef __SYNCML_DM_LSCRIPT
-_LIT8(KNSmlLoginscriptnode, "/LoginTW/LoginScriptData");
-#endif
-
-_LIT8(KNSmlDNSAddrNode, "DNSAddrL/DNSAddrTy/DNSPriority" );
-
-_LIT8(KNSmlWLannode, "/WLAN/SSID/UsedSSID/SSIDHidden/UseWPAPSK/NetworkMode/SecurityMode/WEPAuthMode/WPAPreSharedKey/WLANEAPList/WEPKeyIndex/WEPKey/Data/Length/WEPKeyID/Username/Password/EAPType/Realm/UsePseudonym/Encapsulation/VerifyCertRealm/RequireClientAuthentication/SessionValidityTime/CipherSuite/AllowPEAPv0/AllowPEAPv1/AllowPEAPv2/IssuerName/SubjectName/CertType/SerialNumber/SubjectKeyId/Fingerprint");
-
-//Default data values
-_LIT( KNSmlDefName,             "APAdapterIns" );
-_LIT( KNSmlDefAP,               "AP" );
-_LIT8( KNSmlFirstDNSPri,        "1" );
-_LIT8( KNSmlSecondDNSPri,       "2" );
-_LIT8( KNSmlDNSIp,              "IP" );
-_LIT8( KNSmlDNSIp6,             "IP6" );
-_LIT8( KNSmlEmptyIpv4Address8,  "0.0.0.0");
-_LIT( KNSmlEmptyIpv4Address,   "0.0.0.0");
-_LIT8( KNSmlMimeTypeTextPlain,  "text/plain" );
-
-_LIT8( KNSmlDmApValOutgoing, "Outgoing" );
-_LIT8( KNSmlDmApValIncoming, "Incoming" );
-_LIT8( KNSmlDmApVal3Gppps, "3GPPPS" );
-_LIT8( KNSmlDmApValGsmCsd, "GSM-CSD" );
-_LIT8( KNSmlDmApValGsmGprs, "GSM-GPRS" );
-_LIT8( KNSmlDmApValGsmHscsd, "GSM-HSCSD" );
-_LIT8( KNSmlDmApValVpn, "VPN" );
-_LIT8( KNSmlDmApValWlan, "WLAN" );
-_LIT8( KNSmlDmApValFSlash, "/" );
-_LIT8( KNSmlDmApValAnalog, "ANALOG-MODEM" );
-_LIT8( KNSmlDmApValV110, "V.110" );
-_LIT8( KNSmlDmApValV120, "V.120" );
-
-_LIT8( KNSmlDmApValAuto, "Auto" );
-_LIT8( KNSmlDmApVal2400, "2400" );
-_LIT8( KNSmlDmApVal4800, "4800" );
-_LIT8( KNSmlDmApVal9600, "9600" );
-_LIT8( KNSmlDmApVal14400, "14400" );
-_LIT8( KNSmlDmApVal19200, "19200" );
-_LIT8( KNSmlDmApVal28800, "28800" );
-_LIT8( KNSmlDmApVal32000, "32000" );
-_LIT8( KNSmlDmApVal33600, "33600" );
-_LIT8( KNSmlDmApVal38400, "38400" );
-_LIT8( KNSmlDmApVal43200, "43200" );
-_LIT8( KNSmlDmApVal48000, "48000" );
-_LIT8( KNSmlDmApVal56000, "56000" );
-_LIT8( KNSmlDmApVal57600, "57600" );
-_LIT8( KNSmlDmApVal64000, "64000" );
-_LIT8( KNSmlDmApValExtended, "Extended" );
-_LIT8( KNSmlDmApValIpv4, "IPv4" );
-_LIT8( KNSmlDmApValIpv6, "IPv6" );
-_LIT8( KNSmlDmApValTrue, "True" );
-_LIT8( KNSmlDmApValFalse, "False" );
-
-
-//class forwards
-class CNSmlWLanAdapter;
-
-struct TNSmlAPAddElement
-    {
-    HBufC8  *iUri;
-    HBufC8 *iData;
-    TInt iStatusRef;
-    HBufC8* iLuid;
-    TBool iLeaf;
-    TBool iDone;
-    };
-
-enum TNSmlAPLeafType
-    {
-    EDMUpdate,
-    EDMAdd,
-    EDMDelete,
-    EDMUnset
-    };
-
-struct TNSmlAPBufferElement
-    {
-    CArrayFixFlat<TNSmlAPAddElement> *iNodeBuf;
-    CArrayFixFlat<TNSmlAPAddElement> *iWlanNodeBuf;
-    HBufC8* iMappingName;
-    HBufC8* iName;
-    TBool iExecuted;
-    TInt  iLuid;
-    TBool iBearer;
-    TBool iDirection;
-    TBool iNameReceived;
-    TBool iDnsUpdateBuf;
-    };
-//
-// ------------------------------------------------------------------------------------------------
-// CNSmlInternetAdapter 
-// ------------------------------------------------------------------------------------------------
-class CNSmlInternetAdapter : public CSmlDmAdapter
-    {
-public:
-
-enum TNSmlAPFieldType
-    {
-    EStr,
-    EInt,
-    EBin,
-    EBool,
-    ESpec,
-    EWap,
-    EWrong
-    };
-    static CNSmlInternetAdapter* NewL(MSmlDmCallback* aDmCallback );
-    static CNSmlInternetAdapter* NewLC(MSmlDmCallback* aDmCallback );
-
-    virtual ~CNSmlInternetAdapter(); 
-
-    // Adapter interface
-    void DDFVersionL( CBufBase& aDDFVersion );
-    void DDFStructureL( MSmlDmDDFObject& aDDF );
-    void AddLeafObjectL( const TDesC8& aURI,
-                         const TDesC8& aParentLUID, 
-                         const TDesC8& aObject, 
-                         const TDesC8& aType, 
-                         const TInt aStatusRef );  
-    void UpdateLeafObjectL( const TDesC8& aURI, 
-                            const TDesC8& aLUID, 
-                            const TDesC8& aObject, 
-                            const TDesC8& aType, 
-                            const TInt aStatusRef );
-    void UpdateLeafObjectL( const TDesC8& aURI, 
-                            const TDesC8& aLUID,
-                            RWriteStream*& aStream, 
-                            const TDesC8& aType,
-                            TInt aStatusRef );
-    void DeleteObjectL( const TDesC8& aURI, 
-                        const TDesC8& aLUID, 
-                        const TInt aStatusRef ); 
-    void FetchLeafObjectL( const TDesC8& aURI, 
-                           const TDesC8& aLUID, 
-                           const TDesC8& aType, 
-                           const TInt aResultsRef, 
-                           const TInt aStatusRef );
-    void FetchLeafObjectSizeL( const TDesC8& aURI, 
-                               const TDesC8& aLUID,
-                               const TDesC8& aType, 
-                               TInt aResultsRef,
-                               TInt aStatusRef );
-    void ChildURIListL( const TDesC8& aURI, 
-                        const TDesC8& aLUID, 
-                        const CArrayFix<TSmlDmMappingInfo>& aPreviousURISegmentList, 
-                        const TInt aResultsRef, 
-                        const TInt aStatusRef );  
-    void AddNodeObjectL( const TDesC8& aURI, 
-                         const TDesC8& aParentLUID, 
-                         const TInt aStatusRef );
-    void ExecuteCommandL( const TDesC8& aURI, 
-                          const TDesC8& aLUID,
-                          const TDesC8& aArgument, 
-                          const TDesC8& aType,
-                          TInt aStatusRef );
-    void ExecuteCommandL( const TDesC8& aURI, 
-                          const TDesC8& aLUID,
-                          RWriteStream*& aStream,
-                          const TDesC8& aType, 
-                          TInt aStatusRef );
-    void CopyCommandL( const TDesC8& aTargetURI,
-                       const TDesC8& aTargetLUID, 
-                       const TDesC8& aSourceURI,
-                       const TDesC8& aSourceLUID, 
-                       const TDesC8& aType,
-                       TInt aStatusRef );
-    void StartAtomicL();
-    void CommitAtomicL();
-    void RollbackAtomicL();
-    TBool StreamingSupport( TInt& aItemSize );
-    void StreamCommittedL();                      
-    void CompleteOutstandingCmdsL();
-
-private:
-    void ConstructL();
-    CNSmlInternetAdapter( TAny* aEcomArguments );
-    TDesC8& SetIntObjectLC( const TInt& aObject );
-    TInt    SetField( const TDesC8& aSource );
-    TInt GetIntObject8( const TDesC8& aObject );
-    TInt IntLUID( const TDesC8& aLUID );
-
-    void AddNodeBufferL( const TDesC8& aURI, 
-                         const TDesC8& aParentLUID, 
-                         const TInt aStatusRef,
-                         const TBool aDontAppend,
-                         const TBool aWlan = EFalse );
-    
-    void AddLeafBufferL( const TDesC8& aURI,
-                         const TDesC8& aParentLUID, 
-                         const TDesC8& aObject, 
-                         const TDesC8& aType, 
-                         const TInt aStatusRef,
-                         const TBool aWlan = EFalse );
-    
-    CSmlDmAdapter::TError FetchLeafObjectL( const TDesC8& aURI, 
-                                            const TDesC8& aLUID,
-                                            const TDesC8& aType,
-                                            CBufBase& aObject); 
-    TPtrC8 LastURISeg(const TDesC8& aURI);
-    TPtrC8 FirstURISeg(const TDesC8& aURI);
-    TPtrC8 GetDynamicAPNodeUri( const TDesC8& aURI );
-    void ExecuteBufferL(const TDesC8& aURI, const TBool aCompleting = EFalse);
-    TPtrC8 GetAddURISeg(const TDesC8& aURI,const TDesC8& aName);
-    
-    CNSmlInternetAdapter::TNSmlAPFieldType   GetAPFieldType( const TDesC8& aURI ) const;
-    TBool GetAPField( TPtrC& aTableName, TPtrC& aColumn ) const;
-    TBool NotValidStrLenght( const TDesC& aSource );
-
-    TDesC8&  ConvertTo8LC( const TDesC& aSource );
-    TDesC16& ConvertTo16LC( const TDesC8& aSource );
-
-    TInt InitializeGPRSL( CCommsDbTableView* aTable );
-    TInt InitializeProxyL( CCommsDbTableView* aTable );
-
-    TInt InitializeWAPIAPL( CCommsDbTableView* aTable, const TDesC8& aName );
-    TInt InitializeWAPL( CCommsDbTableView* aTable );
-    TInt InitializeLANServiceL( CCommsDbTableView* aTable );
-    TInt InitializeVPNServiceL( CCommsDbTableView* aTable );
-    TBool IsValidNameL(const TDesC8& aName);
-    TBool IsValidIPv4AddressL(const TDesC8& aNapAddr);
-    void  NextAPNameL(const TDesC8& aName);
-    
-    TUint32 GetIAPSeamlessnessL(TUint32 aId);
-    TUint32 GetIAPMetaDataL(TUint32 aId);
-    void SetIAPSeamlessnessL(TUint32 apMetaID,TUint32 aSeam,TInt aStatusRef);
-    void SetIAPMetaDataL(TUint32 apMetaID,TUint32 aMeta,TInt aStatusRef);
-    
-    TBool CheckEnforcementL();
-    TBool CheckWLANEnforcementL();
-    TInt UnprotectWLANAPItemL(TUint32 aId);
-    TInt DoProtectWAPTablesL(TBool aProtect);
-    void DoLockIAPTablesL(TBool aLock);
-
-    TBool IsIAPRecordLockedL(TUint32 aRecord);
-    TInt DoProtectIAPRecordL(TUint32 aRecord,TBool aProtect);
-    TBool IsProxyRecordLockedL(TUint32 aRecord);
-    TInt DoProtectProxyRecordL(TUint32 aRecord,TBool aProtect);
-    TBool IsServiceRecordLockedL(TUint32 aRecord);
-    TInt DoProtectServiceRecordL(TUint32 aRecord,TBool aProtect);
-	TBool IsWAPAccessPointRecordLockedL(TUint32 aRecord);
-	TInt DoProtectWAPAccessRecordL(TUint32 aRecord,TBool aProtect);
-
-    TBool IsWLANfield( const TDesC8& aURI );
-    TBool IsWlanL( const TDesC8& aURI );
-    TBool GetLanBearerL( TUint32& aId );
-
-    void SaveIAPDataL(const TDesC8& aURI);
-    TBool GetModemBearerL(TUint32& aId);
-    TBool IsInsertAllowedL();
-    TUint32 GetMaxIdL();
-    TBool GetProxyIdL(const TDesC8& aURI);
-
-    TBool APExistsL(TUint32 aId);
-    TBool NAPDefExistsL( TUint32 aId );
-    TBool PxExistsL(TUint32 aId);
-    TBool WapAPExistsL(TUint32 aId);
-    TBool NetworkExistsL(TUint32 aId);
-    TBool NetworkNameExistsL(TUint32& aId, const TDesC8& aObject);
-    TBool AddNetworkL(TUint32& aId, const TDesC8& aObject);
-
-    TBool DeleteAPL(TUint32 aId);
-    TBool DeleteNAPDefL(TUint32 aId);
-    TBool DeleteProxyL(TUint32 aId);
-    TBool DeleteWapAPL(TUint32 aId);
-
-    TUint32 GetAPIdFromURIL(const TDesC8& aURI);
-    void IsWapPort( const TDesC8& aObject );
-    void FillNodeInfoL( MSmlDmDDFObject& aNode,
-                        TSmlDmAccessTypes aAccTypes,
-                        MSmlDmDDFObject::TOccurence aOccurrence, 
-                        MSmlDmDDFObject::TScope aScope, 
-                        MSmlDmDDFObject::TDFFormat aFormat,
-                        const TDesC8& aDescription);
-
-    TInt UpdateIAPnameL( TUint32 aId, const TDesC8& aObject );
-    TUint32 GetLocationL();
-
-    TBool InitializeDNSParamsFromBuffL( const TPtrC8 aParentUri, TInt& aDnsPri );
-    TInt DnsToLuid( const UriUtils::TUriHostType aType, 
-                    const TInt aPriority ) const;
-    TInt LuidToDns( UriUtils::TUriHostType& aType, TInt& aPriority, 
-                    const TInt aLuid ) const;
-    TPtrC8 RemoveLastSeg(const TDesC8& aURI) const;
-    
-    void ClearBuffer( CArrayFixFlat<TNSmlAPAddElement>* aBuffer );
-    void LingerValueL( const TDesC8& aObject );
-    void AddLingerL( const TInt aIapId, const TInt aLingerInterval);
-    void UpdateLingerL( const TInt aIapId, const TInt aLingerInterval );
-    void GetLingerL( const TInt aIapId, TInt& aLingerInterval );
-    void DeleteLingerL( const TInt aIapId );        
-    TBool Notalpha(const TDesC& aValue);  
-    TUint32 ConstructTreeL(const TDesC8& aURI);
-    TBool IsAPUriFormatMatchPredefined(const TDesC8 & aURI);
-
-    
-
-private:
-    MSmlDmCallback* iCallBack;
-
-    CNSmlWLanAdapter* iWlanAdapter;
-
-    TInt iLUID;
-    TInt iParentLUID;
-    TInt iObject;
-    TBool iWapPort;
-    TInt iDirection;
-	TBool iStaleMapUpdate;
-    HBufC8* iField;     
-    TNSmlAPLeafType   iLeafType;
-
-    TBuf8<KCommsDbSvrMaxFieldLength> iWAPAccessPoint;
-    TUint32 iWapId;
-    TBuf<KCommsDbSvrMaxFieldLength> iWapBearer;
-    TBuf8<KCommsDbSvrMaxFieldLength> iWapName;
-    TBuf8<KCommsDbSvrMaxFieldLength> iWapUserName;
-    TBuf8<KCommsDbSvrMaxFieldLength> iWapPassword;
-
-    CArrayFixFlat<TNSmlAPBufferElement> *iBuffer;
-    TBool i3GPPPS;
-
-    private:    // data
-        CCommsDatabase* iDatabase;
-        
-        TBool iIAPExists;
-        
-        TInt iDnsIpv4Pri; // 1 or 2 
-        TInt iDnsIpv6Pri;
-        TInt iExecutionIndex;
-        TBool iExecutingBuffer;
-        TBool iDnsUpdate;
-        
-        TBuf8<KCommsDbSvrMaxFieldLength>        iIAPName;
-        
-        TUint32 iIAPId;
-        
-        TUint32 iISPId;
-
-        TUint32 iProxyId;
-        TUint32 iProxyISP;
-
-        TBuf<KCommsDbSvrMaxFieldLength> iProxyServiceType;
-        TBuf8<KCommsDbSvrMaxFieldLength> iProxyServerName;
-        
-        HBufC8* iPrevURI;
-        TInt   iPrevLUID;
-
-        TBuf<KCommsDbSvrMaxFieldLength> iBearer;
-        
-        TUint32 iBearerType;
-        TInt iNetworkId;
-        TInt iLingerValue;
-        TBool iLingerFlag;
-        TBool iTransactionCommitted;
-        TBool iWAPRelock;
-        RArray<TPtrC> iLockTableList;
-        
-        TBool iWlanSupported;
-    };
-
-
-
-#endif // __NSMLINTERNETADAPTER_H__
-// End of File
--- a/omadm/omadmextensions/adapters/nsmldinternet/inc/NSmlWLanAdapter.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,365 +0,0 @@
-/*
-* Copyright (c) 2002 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:   Wlan adapter
-*
-*/
-
-
-
-#ifndef __NSMLWLANADAPTER_H__
-#define __NSMLWLANADAPTER_H__
-
-
-// -----------------------------------------------------------------------------------------------
-// Includes
-// -----------------------------------------------------------------------------------------------
-#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
-#include <commsdat_partner.h>
-#endif
-#include <utf.h>
-#include <commdb.h>
-#include <EapSettings.h>
-#include "smldmadapter.h"
-#include "nsmlconstants.h"
-#include "NSmlWlanSettings.h"
-
-
-// -----------------------------------------------------------------------------------------------
-// Constants
-// -----------------------------------------------------------------------------------------------
-const TInt KNSmlWepKeyGranularity = 4;
-const TInt KNSmlMaxURISegLen = 32;
-const TInt KExpandedEAPIdLength = 8;
-const TInt KNsmlSubjectKeyIdLength = 255;
-
-_LIT8( KNSmlWLanAdapterDDFversion, "1.0" );
-_LIT16( KNSmlWLanServiceTable, "WLANServiceTable" );
-_LIT8( KNSmlWLanId, "Id" );
-_LIT8( KNSmlWLanName, "Name" );
-_LIT8( KNSmlWLanHidden, "Hidden" );
-_LIT8( KNSmlWLanReadOnly, "ReadOnly" );
-_LIT8( KNSmlWLanServiceId, "ServiceID" );
-_LIT8( KNSmlWLanNetworkMode, "NetworkMode" );
-_LIT8( KNSmlWLanConnectionMode, "WlanConnectionMode" );
-_LIT8( KNSmlWLanSsid, "SSID" );
-_LIT8( KNSmlWLanUsedSsid, "UsedSSID" );
-_LIT8( KNSmlWLanSsidHidden, "SSIDHidden" );
-_LIT8( KNSmlWLanUseWPAPSK, "UseWPAPSK" );
-_LIT8( KNSmlWLanEnablePSK, "EnablePSK" );
-_LIT8( KNSmlWLanWepKey1, "WEPKey1InHex" );
-_LIT8( KNSmlWLanWepKey2, "WEPKey2InHex" );
-_LIT8( KNSmlWLanWepKey3, "WEPKey3InHex" );
-_LIT8( KNSmlWLanWepKey4, "WEPKey4InHex" );
-_LIT8( KNSmlWLanWepIndex, "WEPKeyIndex" );       
-_LIT8( KNSmlWLanWepKey, "WEPKey" );      
-_LIT8( KNSmlWLanSecurityMode, "SecurityMode" );
-_LIT8( KNSmlWLanWpaAuthMode, "WPAAuthMode" );
-_LIT8( KNSmlWLanWpaPreSharedKey, "WPAPreSharedKey" );
-_LIT8( KNSmlWLanEapList, "WLANEAPList" );
-_LIT8( KNSmlWLanAuthMode, "WEPAuthMode" );
-_LIT8( KNSmlWLanWepKeyId, "WEPKeyID" );
-_LIT8( KNSmlWLanWepKeyData, "Data" );
-_LIT8( KNSmlWLanNodeName, "WLAN" );
-
-_LIT8( KNSmlEmpty, "" );
-#define  KNSmlWLanDefaultSSID _S("Net1")
-
-_LIT8( KNSmlWLan, "/WLAN" );
-_LIT8( KNSmlNAPDefWlanNode,"Name/NAPID/Bearer/IPAddrFromServer/IfNetworks/NAPAddr/NAPAddrTy/IPDNSAddrFromServer/DNSAddr/DefGW/NetworkMask/Networks/IAPService");
-
-_LIT8( KNSmlWLanListOfLeafs, "SSID/UsedSSID/SSIDHidden/NetworkMode/SecurityMode/WPAPreSharedKey/UseWPAPSK/WEPKey/WEPKeyIndex/WLANEAPList/WEPAuthMode/EAP/SecondarySSID" );
-
-_LIT8( KNSmlWLanListOfSecondaryLeafs, "SSID/UsedSSID" );
-_LIT8( KNSmlWLanListOfWepKeys, "1/2/3/4" );
-_LIT8( KNSmlWLanListOfWepKeyLeafs, "WEPKeyID/Data" );
-_LIT8( KNSmlWLanAllowUnsecure8, "allow unsecure" );
-_LIT8( KNSmlWLanWep8, "WEP" );
-_LIT8( KNSmlWLan8021x8, "802.1X" );
-_LIT8( KNSmlWLanWpa8, "WPA" );
-_LIT8( KNSmlWLanWpa28, "WPA2" );
-_LIT8( KNSmlWLanWpaPreSharedKey8, "WPA pre-shared key" );
-_LIT8( KNSmlWLanAdHoc8, "ADHOC" );
-_LIT8( KNSmlWLanInfrastructure8, "Infrastructure" );
-_LIT8( KNSmlMimeType,           "text/plain" );
-
-
-#ifdef FF_WLAN_EXTENSIONS
-_LIT8( KNSmlWLanListOfEAPLeafs, "EAPType/Username/Password/Realm/UsePseudonym/VerifyCertRealm/RequireClientAuthentication/SessionValidityTime/CipherSuite/AllowPEAPv0/AllowPEAPv1/AllowPEAPv2/Certificate/AuthProvMode/UnauthProvMode/PACGroupRef/WarnADHPNoPAC/WarnADHPNoMatchPAC/WarnNotDefaultSrv" );
-#else
-_LIT8( KNSmlWLanListOfEAPLeafs, "EAPType/Username/Password/Realm/UsePseudonym/VerifyCertRealm/RequireClientAuthentication/SessionValidityTime/CipherSuite/AllowPEAPv0/AllowPEAPv1/AllowPEAPv2/Certificate" );
-#endif
-
-_LIT8( KNSmlWLanListOfCertificateLeafs, "IssuerName/SubjectName/CertType/SerialNumber/SubjectKeyId/Fingerprint" );
-
-_LIT8( KNSmlWLanSecSsid, "SecondarySSID" );
-_LIT8( KNSmlWLanEap, "EAP" );
-_LIT8( KNSmlWLanEapType, "EAPType" );
-_LIT8( KNSmlWLanUsername, "Username" );
-_LIT8( KNSmlWLanPassword, "Password" );
-_LIT8( KNSmlWLanRealm, "Realm" );
-_LIT8( KNSmlWLanUsePseudonym, "UsePseudonym" );
-_LIT8( KNSmlWLanEncapsulation, "Encapsulation" );
-_LIT8( KNSmlWLanVerifyCertRealm, "VerifyCertRealm" );
-_LIT8( KNSmlWLanRequireClientAuthentication, "RequireClientAuthentication" );
-_LIT8( KNSmlWLanSessionValidityTime, "SessionValidityTime" );
-_LIT8( KNSmlWLanCipherSuite, "CipherSuite" );
-_LIT8( KNSmlWLanAllowPEAPv0, "AllowPEAPv0" );
-_LIT8( KNSmlWLanAllowPEAPv1, "AllowPEAPv1" );
-_LIT8( KNSmlWLanAllowPEAPv2, "AllowPEAPv2" );
-#ifdef FF_WLAN_EXTENSIONS 
-_LIT8( KNSmlWLanAuthProvMode, "AuthProvMode" );
-_LIT8( KNSmlWLanUnauthProvMode, "UnauthProvMode" );
-_LIT8( KNSmlWLanPACGroupRef, "PACGroupRef" );
-_LIT8( KNSmlWLanWarnADHPNoPAC, "WarnADHPNoPAC" );
-_LIT8( KNSmlWLanWarnADHPNoMatchPAC, "WarnADHPNoMatchPAC" );
-_LIT8( KNSmlWLanWarnNotDefaultSrv, "WarnNotDefaultSrv" );
-#endif
-_LIT8( KNSmlWLanCertificate, "Certificate" );
-_LIT8( KNSmlWLanIssuerName, "IssuerName" );
-_LIT8( KNSmlWLanSubjectName, "SubjectName" );
-_LIT8( KNSmlWLanCertType, "CertType" );
-_LIT8( KNSmlWLanSerialNumber, "SerialNumber" );
-_LIT8( KNSmlWLanSubjectKeyId, "SubjectKeyId" );
-_LIT8( KNSmlWLanFingerprint, "Fingerprint" );
-
-_LIT8(KTrue, "True");
-_LIT8(KFalse, "False");
-_LIT8(KTtrue, "true");
-_LIT8(KFfalse, "false");
-_LIT8(KSlash, "/");
-_LIT8(KDash, "-");
-_LIT8(KNSmlWLanEapId, "EAPId" );
-
-_LIT8(KSuitesDefault, "-010,-022,-019,-047,-050,-051,-004,-005");
-
-const TUint RSA_3DES_SHA = 10;
-const TUint DHE_RSA_3DES_SHA = 22;
-const TUint DHE_DSS_3DES_SHA = 19;
-const TUint RSA_AES_SHA = 47; // ?
-const TUint DHE_RSA_AES_SHA = 50; // ?
-const TUint DHE_DSS_AES_SHA = 51; // ?
-const TUint RSA_RC4_MD5 = 4;
-const TUint RSA_RC4_SHA = 5;
-const TUint NUMBER_OF_CIPHERSUITES = 8;
-
-_LIT8(KEAPSIM, "EAP-SIM");
-_LIT8(KEAPAKA, "EAP-AKA");
-_LIT8(KEAPTLS, "EAP-TLS");
-_LIT8(KEAPPEAP, "EAP-PEAP");
-_LIT8(KEAPTTLS, "EAP-TTLS");
-_LIT8(KEAPLEAP, "EAP-LEAP");
-_LIT8(KEAPMSCHAPV2, "EAP-MSCHAPV2");
-_LIT8(KMSCHAPV2, "MSCHAPV2");
-_LIT8(KEAPGTC, "EAP-GTC");
-_LIT8(KEAPFAST, "EAP-FAST");
-_LIT8(KEAPTTLSPAP, "EAP-TTLSPAP");
-
-
-const TUint8 KEapNoneId[] = {0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-const TUint8 KEapTlsTypeId[] = {0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0d};
-const TUint8 KEapGtcTypeId[] = {0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06};
-const TUint8 KEapLeapTypeId[] = {0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11};
-const TUint8 KEapSimTypeId[] = {0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12};
-const TUint8 KEapTtlsTypeId[] = {0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15};
-const TUint8 KEapAkaTypeId[] = {0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x17};
-const TUint8 KEapPeapTypeId[] = {0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x19};
-const TUint8 KEapMschapv2TypeId[] = {0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1A};
-const TUint8 KEapSecuridTypeId[] = {0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20};
-const TUint8 KEapFastTypeId[] = {0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2B};
-const TUint8 KMschapv2TypeId[] = {0xfe, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x63};
-const TUint8 KTtlspapTypeId[] = {0xfe, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x62};
-
-
-
-
-// -----------------------------------------------------------------------------------------------
-// Structures
-// -----------------------------------------------------------------------------------------------
-struct TNSmlWepKeyBufferElement
-        {
-        HBufC8* iUri;
-        HBufC8* iData;
-        TInt iWepKeyId;
-        TInt iIdStatusRef;
-        //TInt iUseWPAPSK;
-        TInt iDataStatusRef;
-        TInt iNodeStatusRef;
-        TInt iLengthStatusRef;
-        TBool iExecuted;
-        TBool iDataSet;
-        TInt  iLuid;
-        };
-
- struct TNSmlSecondarySSIDBufferElement
-    {
-     HBufC8* iUri;
-     TBuf<KMaxTextLength>   ScannedId;
-     TBuf<KMaxTextLength>   UsedId;
-     TInt  wlanLuid;
-     TBool iExecuted;
-    };
-
-struct TNSmlEAPBufferElement
-	{
-		EAPSettings* iEAPSettings;
-        EAPSettings::TEapType iEncapsulatingEAPId;
-        RArray<TInt> iStatusRefArray;
-        TInt iWLANServiceId;
-	};
-
-// -----------------------------------------------------------------------------------------------
-// Enumerations
-// -----------------------------------------------------------------------------------------------
-enum TConnectionMode
-        {
-        EAdhoc = 0,
-        EInfrastructure = 1
-        };
-
-enum TWLanSecurityMode
-        {
-        EAllowUnsecure = 1,
-        EWep = 2,
-        EWlan8021x = 4,
-        EWpa = 8,
-        EWpa2 = 16   
-        };
-
-enum TWepAuthenticationMode
-        {
-        EOpen = 0,
-        EShared = 1
-        };
-        
-// ------------------------------------------------------------------------------------------------
-// CNSmlWLanAdapter 
-// ------------------------------------------------------------------------------------------------
-class CNSmlWLanAdapter : public CSmlDmAdapter
-        {
-public:
-        static CNSmlWLanAdapter* NewL( MSmlDmCallback* aDmCallback, CCommsDatabase& aDatabase );
-        static CNSmlWLanAdapter* NewLC( MSmlDmCallback* aDmCallback, CCommsDatabase& aDatabase );
-        void ConstructL( CCommsDatabase& aDatabase );
-        virtual ~CNSmlWLanAdapter();
-
-// Adapter interface
-        void DDFVersionL( CBufBase& aDDFVersion );
-        void DDFStructureL( MSmlDmDDFObject& aDDF );
-        void AddLeafObjectL( const TDesC8& aURI,
-                             const TDesC8& aParentLUID, 
-                             const TDesC8& aObject, 
-                             const TDesC8& aType, 
-                             const TInt aStatusRef ); 
-        void UpdateLeafObjectL( const TDesC8& aURI, 
-                                const TDesC8& aLUID, 
-                            const TDesC8& aObject, 
-                            const TDesC8& aType, 
-                            const TInt aStatusRef );
-       void UpdateLeafObjectL( const TDesC8& aURI, 
-                            const TDesC8& aLUID,
-                            RWriteStream*& aStream, 
-                            const TDesC8& aType,
-                            TInt aStatusRef );
-        void DeleteObjectL( const TDesC8& aURI, 
-                            const TDesC8& aLUID, 
-                            const TInt aStatusRef ); 
-        void FetchLeafObjectL( const TDesC8& aURI, 
-                               const TDesC8& aLUID, 
-                               const TDesC8& aType, 
-                               const TInt aResultsRef, 
-                               const TInt aStatusRef ); 
-        void FetchLeafObjectSizeL( const TDesC8& aURI, 
-                               const TDesC8& aLUID,
-                               const TDesC8& aType, 
-                               TInt aResultsRef,
-                               TInt aStatusRef );
-
-        void ChildURIListL( const TDesC8& aURI, 
-                            const TDesC8& aLUID, 
-                            const CArrayFix<TSmlDmMappingInfo>& aPreviousURISegmentList, 
-                            const TInt aResultsRef, 
-                            const TInt aStatusRef ); 
-        void AddNodeObjectL( const TDesC8& aURI, 
-                             const TDesC8& aParentLUID, 
-                             const TInt aStatusRef );
-        void ExecuteCommandL( const TDesC8& aURI, 
-                              const TDesC8& aLUID,
-                              const TDesC8& aArgument, 
-                              const TDesC8& aType,
-                              TInt aStatusRef );
-        void ExecuteCommandL( const TDesC8& aURI, 
-                              const TDesC8& aLUID,
-                              RWriteStream*& aStream, 
-                              const TDesC8& aType,
-                              TInt aStatusRef );
-        void CopyCommandL( const TDesC8& aTargetURI, 
-                           const TDesC8& aTargetLUID, 
-                           const TDesC8& aSourceURI,
-                           const TDesC8& aSourceLUID, 
-                           const TDesC8& aType,
-                           TInt aStatusRef );
-        void StartAtomicL();
-        void CommitAtomicL();
-        void RollbackAtomicL();
-        TBool StreamingSupport( TInt& aItemSize );
-        void StreamCommittedL();
-        void CompleteOutstandingCmdsL();
-        CSmlDmAdapter::TError FetchLeafObjectL( const TDesC8& aURI,
-                                                const TDesC8& aLUID,
-                                                const TDesC8& aType,
-                                                CBufBase& aObject );
-
-private:
-        CNSmlWLanAdapter(TAny* aEcomArguments);
-        void FillNodeInfoL( MSmlDmDDFObject& aNode,
-                            TSmlDmAccessTypes aAccTypes,
-                            MSmlDmDDFObject::TOccurence aOccurrence, 
-                            MSmlDmDDFObject::TScope aScope, 
-                            MSmlDmDDFObject::TDFFormat aFormat,
-                            const TDesC8& aDescription );
-        HBufC* IntToDesLC(const TInt aLuid);
-        HBufC8* IntToDes8LC(const TInt aLuid);
-        TInt DesToInt(const TDesC8& aLuid);
-        TInt GetIdFromLuid( const TDesC8& aLuid );        
-        TUint32 GetSecSSIDFromUriL(const TDesC8& aUri );
-        TInt GetEAPIdFromUri( const TDesC8& aUri );
-        TInt GetCertificateIdFromUri( const TDesC8& aUri );
-        TInt GetWepKeyIdFromLuid( const TDesC8& aLuid );
-        TInt GetWepKeyIdFromUri( const TDesC8& aUri );
-        TInt NumOfUriSegs( const TDesC8& aUri );
-        TPtrC8 GetLastUriSeg(const TDesC8& aURI);
-        TPtrC8 RemoveLastUriSeg(const TDesC8& aURI);
-        void ExecuteBufferL( TBool aFinal = EFalse );
-        TDesC8&  ConvertTo8LC( const TDesC& aSource );
-        TDesC16& ConvertTo16LC( const TDesC8& aSource );        
-        void DesToBufferL(CBufBase& aTo, const TDesC& aFrom);
-        void FillCipherSuiteBufferL(CBufBase& aBuffer);      
-        void FillCipherSuitesL(const TDesC8& aObject, const TInt aLuid);
-        void ConvertEAPStringToIds( const TDesC8& aEAPString, TDes8& aExpandedId, EAPSettings::TEapType& aId);
-        TInt GetServiceIdFromUriL( const TDesC8& aURI);		
-        TInt GetEncapsEAPIdFromUri( const TDesC8& aUri );
-        void ResetEAPStructL();
-        void DeleteEAPStructL();
-
-        MSmlDmCallback* iCallBack;
-        CWlanSettings* iWlanSettings;
-        CArrayFixFlat<TNSmlWepKeyBufferElement> *iBuffer;
-        TWlanSettings *iSettings;
-        EAPSettings* iEAPSettings;
-        RPointerArray<TNSmlSecondarySSIDBufferElement>  iSecondaryBuffer;
-        RPointerArray<TNSmlEAPBufferElement>  iEAPBuffer;
-
-        };
-
-#endif __NSMLWLANADAPTER_H__
--- a/omadm/omadmextensions/adapters/nsmldinternet/inc/NSmlWlanSettings.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,129 +0,0 @@
-/*
-* Copyright (c) 2002 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:   Wlan Adapter commsDB handler
-*
-*/
-
-
-
-#ifndef __NSMLWLANSETTINGS_H__
-#define __NSMLWLANSETTINGS_H__
-
-#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
-#include <commsdat_partner.h>
-#endif
-#include <commdb.h>
-#include <commsdattypesv1_1.h>
-#include <EapType.h>
-
-const TInt KMaxPSKLength = 63;
-const TInt KMinPSKLength = 8;
-
-// ==========================================================================
-// Class forwards
-// ==========================================================================
-//
-class CWlanSettings;
-
-class TWlanSettings
-    {
-public:    
-    TBuf<KMaxTextLength>     Name;
-    TUint32                  Id;
-    TUint32                  ServiceID;
-    TUint32                  ConnectionMode;     // Infrastructure / adhoc
-    TBuf<KMaxTextLength>     SSID;           
-    TBuf8<KMaxTextLength>    WepKey1; 
-    TBuf8<KMaxTextLength>    WepKey2;
-    TBuf8<KMaxTextLength>    WepKey3;
-    TBuf8<KMaxTextLength>    WepKey4;
-    TUint32                  WepIndex;
-    TUint32                  SecurityMode;   // SecurityMode (Allow unsecure, wep, 802.1xs, wpa) enum EWlanSecurityMode
-    TUint32                  WPAMode;        // enum EWpaMode
-    TUint32                  UseWPAPSK;      // CR ID: TMVI-5Y49AS
-    TBuf8<KMaxPSKLength>    WPAPreSharedKey;  
-    TUint32				     AuthMode;
-    TBuf<KMaxTextLength>     UsedSSID;           
-    TUint32                  ScanSSID;           
-    TBuf<KMaxLongTextLength> EapList;
-    TBool                       SecondarySSIDsExisting;
-//    TBuf<KMaxTextLength>        SecondarySSID;
-//    TBuf<KMaxTextLength>        UsedSecondarySSID;
-
-    };
-            
-class TSecondarySSID
-    {
-public:
-    TUint32                 Id;
-    TBuf<KMaxTextLength>   ScannedId;
-    TBuf<KMaxTextLength>   UsedId;
-    };    
-
-
-// -----------------------------------------------------------------------------------------------
-// Defines
-// -----------------------------------------------------------------------------------------------
-
-class CWlanSettings : public CBase
-    {
-public:
-    static CWlanSettings* NewL( CCommsDatabase& aDatabase );
-    void ConstructL( );
-    ~CWlanSettings( );
-
-    TInt GetWlanSettings( TUint32 aLuid, TWlanSettings& aWlanSettings );
-    TInt DeleteWlanSettings( TUint32 aLuid );
-    TInt WriteWlanSettings( TWlanSettings& aWlanSettings );
-    void ConnectToDatabaseL( );
-    TInt RecordExists( TUint32 aLuid );
-    TInt PerformLockWLANTablesL(TBool aProtect);
-    TBool CheckEnforcementL();
-    TBool CheckAPEnforcementL();
-    TBool iWLANRelock;
-    
-    TInt GetEAPSettings( const TInt aId, const TInt aEapType, const TInt aTunnelingType, EAPSettings& aEapSettings );
-    TInt DeleteEAPSettings( TInt aId , TInt aEapType  );
-    void DeleteWlanEapSettingsL( TInt aWlanId );
-    TInt DeleteSecondarySSIDsL( TUint32 aWLANId );
-    TInt DeleteOneSecondarySSIDL( TUint32 aWLANId , TUint32 asecId);
-    TInt WriteEAPSettings( EAPSettings& aEapSettings);
-    TInt WriteSecondarySSIDL( TUint32 aWlanID, TSecondarySSID& aSettings, TBool aNew );
-    void GetSecondarySSIDListL(TUint32 aLuid, RArray<TSecondarySSID>& aSecondarySSIDs);
-    void GetEAPInterfaceL(const TInt aId, const TInt aTunnelingType, const TInt aType);
-    TInt InstalledEAPsL(CBufBase& aEAPList);
-	
-
-private:
-
-    CWlanSettings( CCommsDatabase& aDatabase );
-    TInt GoToRecord( TUint32 aId );
-    void GetDataFromRecordL( TWlanSettings* aWlanSettings );
-    void WriteDataToRecordL( TWlanSettings* aWlanSettings );
-    void InitialiseRecordL( );
-    void SetSecondaryViewToRecordL( TUint32 aId );
-
-    TDesC8&  ConvertTo8LC( const TDesC& aSource );
-    TDesC16& ConvertTo16LC( const TDesC8& aSource );
-
-    CCommsDatabase& iDatabase;
-    CCommsDbTableView* iTableView;
-    CCommsDbTableView* iSecondaryView;
-    CEapType* iEapType;
-    TUint32 iServiceID;
-    TBool iExpandedEAPTypeFieldsUsed;
-    };
-
-
-#endif __NSMLWLANSETTINGS_H__
--- a/omadm/omadmextensions/adapters/nsmldinternet/rom/nsmlinternetadapter.iby	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-/*
-* 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:   Image description file for project InternetAdapter
-*
-*/
-
-
-
-REM SyncML Device Management internet adapter
-
-#include <bldvariant.hrh>
-
-#ifndef __NSMLINTERNETADAPTER_IBY__
-#define __NSMLINTERNETADAPTER_IBY__
-
-#ifdef __SYNCML_DM // nothing should be installed from this .iby file if __SYNCML_DM feature is not selected
-#ifndef FF_DM_CONNMO_ADAPTER // nothing should be installed from this .iby file if this flag is specified.
-														 // ConnMO is used in that case for access point provisioning.
-
-ECOM_PLUGIN(nsmlinternetadapter.dll,nsmlinternetadapter.rsc)
-
-#endif // FF_DM_CONNMO_ADAPTER
-#endif //__SYNCML_DM
-
-#endif //__NSMLINTERNETADAPTER_IBY__
--- a/omadm/omadmextensions/adapters/nsmldinternet/src/NSmlInternetAdapter.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9261 +0,0 @@
-/*
-* 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:   Internet-settings 
- *
-*/
-
-
-#include <commdb.h>
-#include <cdbstore.h>
-#include <cdbcols.h>             // CommsDB columname defs
-#include <implementationproxy.h> // For TImplementationProxy definition
-#include <cdbpreftable.h>
-#include <etelpckt.h>   // ISP enumerations
-#include <etelmm.h>     // GPRS ProtocolType
-#include <nifvar.h>     // CallbackType
-#include <etelqos.h>    // GPRS enumeration
-#include <wappdef.h>    // WAP  enumeration
-#include <sysutil.h>    // OOD checking
-#include <uriutils.h>   // ipv4 + ipv6 checking
-#include <featmgr.h>
-#include "NSmlInternetAdapter.h"
-#include "NSmlWLanAdapter.h"
-#include "nsmldebug.h"
-#include "nsmldmtreedbclient.h"
-#include <comms-infras/commdb/protection/protectdb.h>
-#include <utf.h>
-
-
-#include <metadatabase.h>
-#include <cmmanagerext.h>
-#include <cmconnectionmethoddef.h>
-#include <cmconnectionmethodext.h>
-#include  <cmpluginbaseeng.h>
-#include <centralrepository.h>
-#include <pdpcontextmanagerinternalcrkeys.h>
-
-const TUint KNSmlInternetAdapterImplUid = 0x101F6DE2;
-
-const TUint KIapColumn        = 0x00000100;
-const TUint KLingerColumn     = 0x00000200;
-const TUint KColumnMask       = 0xFFFFFF00;
-const TUint KRowMask          = 0x000000FF;
-
-
-#include <SettingEnforcementInfo.h> // VSettingEnforcementInfo
-
-class CNSmlWLanAdapter;
-
-_LIT( KDaemonManagerName, "NetCfgExtnDhcp" );
-_LIT( KConfigDaemonName, "!DhcpServ" );
-
-#ifndef __WINS__
-// This lowers the unnecessary compiler warning (armv5) to remark.
-// "Warning:  #174-D: expression has no effect..." is caused by 
-// DBG_ARGS8 macro in no-debug builds.
-#pragma diag_remark 174
-#endif
-
-const TInt KBeginTransRetryDelay = 1000000; // Delay for comms db begintransaction retry (microseconds)
-const  TInt KBeginTransRetryCount = 7;      // Maximum number of retries
-//-----------------------------------------------------------------------------
-// CSmlInternetAdapter* CSmlInternetAdapter::NewL( )
-//-----------------------------------------------------------------------------
-
-CNSmlInternetAdapter* CNSmlInternetAdapter::NewL(MSmlDmCallback* aDmCallback )
-    {
-    _DBG_FILE("CNSmlInternetAdapter::NewL(): begin");
-
-    CNSmlInternetAdapter* self = NewLC(aDmCallback);
-    CleanupStack::Pop();
-
-    _DBG_FILE("CNSmlInternetAdapter::NewL(): end");
-    return self;
-    }
-
-//------------------------------------------------------------------------------
-// CNSmlInternetAdapter* CNSmlInternetAdapter::NewLC( )
-//------------------------------------------------------------------------------
-CNSmlInternetAdapter* CNSmlInternetAdapter::NewLC(MSmlDmCallback* aDmCallback )
-    {
-    _DBG_FILE("CNSmlInternetAdapter::NewLC(): begin");
-    CNSmlInternetAdapter* self = new (ELeave) CNSmlInternetAdapter(aDmCallback);
-    CleanupStack::PushL(self);
-
-    self->iCallBack = aDmCallback;
-    self->ConstructL();
-
-    _DBG_FILE("CNSmlInternetAdapter::NewLC(): end");
-    return self;
-    }
-
-//------------------------------------------------------------------------------
-// CNSmlInternetAdapter::CNSmlInternetAdapter()
-//------------------------------------------------------------------------------
-CNSmlInternetAdapter::CNSmlInternetAdapter(TAny* aEcomArguments) 
-    : CSmlDmAdapter(aEcomArguments)
-    {
-    _DBG_FILE("CNSmlInternetAdapter::CNSmlInternetAdapter(): begin");
-    _DBG_FILE("CNSmlInternetAdapter::CNSmlInternetAdapter(): end");
-    }
-
-//------------------------------------------------------------------------------
-// CNSmlInternetAdapter::~CNSmlInternetAdapter(TAny* aEcomArguments)
-//------------------------------------------------------------------------------
-CNSmlInternetAdapter::~CNSmlInternetAdapter()
-    {
-    _DBG_FILE("CNSmlInternetAdapter::~CNSmlInternetAdapter(): begin");
-
-    delete iField;
-
-    delete iPrevURI;
-
-    // Command buffer cleaning if leave happend
-    if (iBuffer)
-        {
-        for(TInt i=0;i<iBuffer->Count();i++)
-            {
-            delete iBuffer->At(i).iMappingName;
-            delete iBuffer->At(i).iName;
-
-            ClearBuffer( iBuffer->At(iExecutionIndex).iNodeBuf );
-            delete iBuffer->At(i).iNodeBuf;
-            
-            ClearBuffer( iBuffer->At(iExecutionIndex).iWlanNodeBuf );
-            delete iBuffer->At(i).iWlanNodeBuf;
-            }
-
-        iBuffer->Reset();
-        delete iBuffer;
-        }
-
-    if ( iWlanSupported )
-      {
-        delete iWlanAdapter; 
-        }
-
-    delete iDatabase;
-    FeatureManager::UnInitializeLib();
-    _DBG_FILE("CNSmlInternetAdapter::~CNSmlInternetAdapter(): end");
-    }
-
-//=============================================
-//      CNSmlInternetAdapter::ConstructL()
-//      Second phase constructor.
-//=============================================
-void CNSmlInternetAdapter::ConstructL()
-    {
-   	FeatureManager::InitializeLibL();
-    iField    = HBufC8::NewL( KNSmlMaxURLLength );
-
-    iPrevURI  = HBufC8::NewL( KNSmlMaxURLLength );
-
-    iDatabase = CCommsDatabase::NewL();
-    // iDatabase->BeginTransaction(); //+++
-    iTransactionCommitted=ETrue;
-    i3GPPPS = EFalse;
-
-    iLeafType = EDMUnset; // Default for leaf handling
-
-    //  Reset identification data
-
-    iDirection = ECommDbConnectionDirectionUnknown;
-
-    //
-    //  Command buffering used for AddNode + AddLeaf
-    //
-    iBuffer = new (ELeave) CArrayFixFlat <TNSmlAPBufferElement> (KNSmlAPGranularity);
-  
-  // checks if Wlan feature is supported
-    iWlanSupported = FeatureManager::FeatureSupported( KFeatureIdProtocolWlan );
-
-  // WlanAdapter 
-    //  
-    if ( iWlanSupported )
-        {
-      iWlanAdapter = CNSmlWLanAdapter::NewL(iCallBack, *iDatabase); 
-        }
-
-    iNetworkId = KErrNotFound;
-    iLingerValue = NULL;
-  iLingerFlag = ETrue;
-    }
-
-//------------------------------------------------------------------------------
-// void CNSmlInternetAdapter::DDFVersionL()
-//------------------------------------------------------------------------------
-void CNSmlInternetAdapter::DDFVersionL(CBufBase& aDDFVersion)
-    {
-    aDDFVersion.InsertL(0,KNSmlInternetAdapterDDFversion);
-    }
-//------------------------------------------------------------------------------
-//  void CNSmlInternetAdapter::DDFStructureL()
-//------------------------------------------------------------------------------
-void CNSmlInternetAdapter::DDFStructureL( MSmlDmDDFObject& aDDF )
-    {
-    _DBG_FILE("CNSmlInternetAdapter::DDFStructureL(): begin");
-
-    //
-    // Set rest acceptable operations for data itself
-    //
-
-  TSmlDmAccessTypes aclTypesAddGetDel;
-  aclTypesAddGetDel.SetGet();
-    aclTypesAddGetDel.SetAdd();
-    aclTypesAddGetDel.SetDelete();
-    
-    TSmlDmAccessTypes aclTypesAddGet;
-    aclTypesAddGet.SetGet();
-    aclTypesAddGet.SetAdd();
-
-    TSmlDmAccessTypes aclTypesNoDelete;
-    aclTypesNoDelete.SetGet();
-    aclTypesNoDelete.SetReplace();
-    aclTypesNoDelete.SetAdd();
-
-    TSmlDmAccessTypes aclTypesNoGet;
-    aclTypesNoGet.SetReplace();
-    aclTypesNoGet.SetAdd();
-    aclTypesNoGet.SetDelete();
-    
-    TSmlDmAccessTypes aclTypesAddReplace;
-    aclTypesAddReplace.SetReplace();
-    aclTypesAddReplace.SetAdd();
-
-    TSmlDmAccessTypes aclTypesOnlyGet;
-    aclTypesOnlyGet.SetGet();
-
-    TSmlDmAccessTypes aclTypesAll;
-    aclTypesAll.SetGet();
-    aclTypesAll.SetReplace();
-    aclTypesAll.SetAdd();
-    aclTypesAll.SetDelete();
-
-    MSmlDmDDFObject* ddfRoot = &aDDF;
-    MSmlDmDDFObject& ddf = ddfRoot->AddChildObjectL(KNSmlDdfAP);
-
-    _LIT8(KDescription,"AP-Settings DDF description");
-    _LIT8(KDFTitle,"AP-settings title");
-    
-    FillNodeInfoL( ddf, 
-                   aclTypesOnlyGet, 
-                   MSmlDmDDFObject::EOne, 
-                   MSmlDmDDFObject::EPermanent, 
-                   MSmlDmDDFObject::ENode, 
-                   KDescription);
-                   
-    ddf.SetDFTitleL(KDFTitle);
-    ddf.SetDefaultValueL(KNullDesC8);
-
-    MSmlDmDDFObject& nApDDF = ddf.AddChildObjectGroupL(); // For AP/<X>
-
-    FillNodeInfoL( nApDDF, 
-                   aclTypesAll, 
-                   MSmlDmDDFObject::EZeroOrMore, 
-                   MSmlDmDDFObject::EDynamic, 
-                   MSmlDmDDFObject::ENode, 
-                   KNullDesC8);
-
-    MSmlDmDDFObject& nNAPDefRootDDF = nApDDF.AddChildObjectL(KNSmlDdfNAPDef);       // NAPDef
-    FillNodeInfoL( nNAPDefRootDDF, 
-                   aclTypesAddGet, 
-                   MSmlDmDDFObject::EZeroOrOne, // EZeroOrMore
-                   MSmlDmDDFObject::EDynamic, 
-                   MSmlDmDDFObject::ENode, 
-                   KNullDesC8);
-
-    MSmlDmDDFObject& nNAPDefDDF = nNAPDefRootDDF.AddChildObjectGroupL();        // For NAPDef<x>
-    FillNodeInfoL( nNAPDefDDF, 
-                   aclTypesAddGet, 
-                   MSmlDmDDFObject::EOne, 
-                   MSmlDmDDFObject::EDynamic, 
-                   MSmlDmDDFObject::ENode, 
-                   KNullDesC8);
-
-    MSmlDmDDFObject& nPxRootDDF = nApDDF.AddChildObjectL(KNSmlDdfPx);               // Px
-    FillNodeInfoL( nPxRootDDF, 
-                   aclTypesAddGet, 
-                   MSmlDmDDFObject::EZeroOrOne, 
-                   MSmlDmDDFObject::EDynamic, 
-                   MSmlDmDDFObject::ENode, 
-                   KNullDesC8);
-
-    MSmlDmDDFObject& nPxDDF = nPxRootDDF.AddChildObjectGroupL();                // For Px<x>
-    FillNodeInfoL( nPxDDF, 
-                   aclTypesAddGetDel,//aclTypesAddGet
-                   MSmlDmDDFObject::EOne, 
-                   MSmlDmDDFObject::EDynamic, 
-                   MSmlDmDDFObject::ENode, 
-                   KNullDesC8);
-//
-//  NAPDef-node fields
-//
-    MSmlDmDDFObject& nNameDDF = nNAPDefDDF.AddChildObjectL(KNSmlDdfNAPName);        // Name
-    FillNodeInfoL( nNameDDF, 
-                   aclTypesAddGet, 
-                   MSmlDmDDFObject::EZeroOrOne, 
-                   MSmlDmDDFObject::EDynamic, 
-                   MSmlDmDDFObject::EChr, 
-                   KNSmlDdfNAPNameDesc);
-
-    MSmlDmDDFObject& nNAPIDDDF = nNAPDefDDF.AddChildObjectL(KNSmlDdfNAPID);     // NAPID
-    FillNodeInfoL( nNAPIDDDF, 
-                   aclTypesOnlyGet, 
-                   MSmlDmDDFObject::EOne, 
-                   MSmlDmDDFObject::EDynamic, 
-                   MSmlDmDDFObject::EChr, 
-                   KNSmlDdfNAPIDDesc);
-
-    MSmlDmDDFObject& nNAPLingerDDF = nNAPDefDDF.AddChildObjectL(KNSmlDdfNAPLinger);     // Linger
-    FillNodeInfoL( nNAPLingerDDF, 
-                   aclTypesNoDelete, 
-                   MSmlDmDDFObject::EZeroOrOne, 
-                   MSmlDmDDFObject::EDynamic, 
-                   MSmlDmDDFObject::EInt, 
-                   KNSmlDdfNAPLingerDesc);
-                   
-    MSmlDmDDFObject& nNAPStartpgDDF = nNAPDefDDF.AddChildObjectL(KNSmlDdfStartpg);       // Startpg
-    FillNodeInfoL( nNAPStartpgDDF, 
-                   aclTypesNoDelete,
-                   MSmlDmDDFObject::EZeroOrOne, 
-                   MSmlDmDDFObject::EDynamic, 
-                   MSmlDmDDFObject::EChr, 
-                   KNSmlDdfStartpgDesc);
-
-    MSmlDmDDFObject& nBearerRootDDF = nNAPDefDDF.AddChildObjectL(KNSmlDdfBearer);   // Bearer 
-    FillNodeInfoL( nBearerRootDDF, 
-                   aclTypesAddGet, 
-                   MSmlDmDDFObject::EZeroOrOne, 
-                   MSmlDmDDFObject::EDynamic, 
-                   MSmlDmDDFObject::ENode, 
-                   KNullDesC8);
-
-    MSmlDmDDFObject& nBearerDDF = nBearerRootDDF.AddChildObjectGroupL();        // Bearer/<x>
-    FillNodeInfoL( nBearerDDF, 
-                   aclTypesAddGet, 
-                   MSmlDmDDFObject::EZeroOrOne, 
-                   MSmlDmDDFObject::EDynamic, 
-                   MSmlDmDDFObject::ENode, 
-                   KNullDesC8);
-
-    MSmlDmDDFObject& nBearerLDDF = nBearerDDF.AddChildObjectL(KNSmlDdfBearerL); // BearerL
-    FillNodeInfoL( nBearerLDDF, 
-                   aclTypesAddGet, 
-                   MSmlDmDDFObject::EOne, 
-                   MSmlDmDDFObject::EDynamic, 
-                   MSmlDmDDFObject::EChr, 
-                   KNSmlDdfBearerLDesc);
-
-    MSmlDmDDFObject& nDirectionDDF = nBearerDDF.AddChildObjectL(KNSmlDdfDirection); // Direction
-    FillNodeInfoL( nDirectionDDF, 
-                   aclTypesAddGet, 
-                   MSmlDmDDFObject::EOne, 
-                   MSmlDmDDFObject::EDynamic, 
-                   MSmlDmDDFObject::EChr, 
-                   KNSmlDdfDirectionDesc);
-
-    MSmlDmDDFObject& nNAPAddrDDF = nNAPDefDDF.AddChildObjectL(KNSmlDdfNAPAddr); // NAPAddr
-    FillNodeInfoL( nNAPAddrDDF, 
-                   aclTypesNoDelete, 
-                   MSmlDmDDFObject::EZeroOrOne, 
-                   MSmlDmDDFObject::EDynamic, 
-                   MSmlDmDDFObject::EChr, 
-                   KNSmlDdfNAPAddrDesc);
-
-    MSmlDmDDFObject& nNAPAddrTyDDF = nNAPDefDDF.AddChildObjectL(KNSmlDdfNAPAddrTy); // NAPAddrTy
-    FillNodeInfoL( nNAPAddrTyDDF, 
-                   aclTypesNoDelete, 
-                   MSmlDmDDFObject::EZeroOrOne, 
-                   MSmlDmDDFObject::EDynamic, 
-                   MSmlDmDDFObject::EChr, 
-                   KNSmlDdfNAPAddrTyDesc);
-
-    MSmlDmDDFObject& nDNSAddrRootDDF = nNAPDefDDF.AddChildObjectL(KNSmlDdfDNSAddr); // DNSAddr
-    FillNodeInfoL( nDNSAddrRootDDF, 
-             aclTypesAddGet, 
-                   MSmlDmDDFObject::EZeroOrOne, 
-                   MSmlDmDDFObject::EDynamic, 
-                   MSmlDmDDFObject::ENode, 
-                   KNullDesC8);
-
-    MSmlDmDDFObject& nDNSAddrDDF = nDNSAddrRootDDF.AddChildObjectGroupL();  // DNSAddr/<x>
-    FillNodeInfoL( nDNSAddrDDF, 
-             aclTypesAddGet, 
-                   MSmlDmDDFObject::EOneOrMore, 
-                   MSmlDmDDFObject::EDynamic, 
-                   MSmlDmDDFObject::ENode, 
-                   KNullDesC8);
-
-    MSmlDmDDFObject& nDNSAddrLDDF = nDNSAddrDDF.AddChildObjectL(KNSmlDdfDNSAddrL);  // DNSAddrL
-    FillNodeInfoL( nDNSAddrLDDF, 
-                   aclTypesNoDelete, 
-                   MSmlDmDDFObject::EOne, 
-                   MSmlDmDDFObject::EDynamic, 
-                   MSmlDmDDFObject::EChr, 
-                   KNSmlDdfDNSAddrLDesc);
-
-    MSmlDmDDFObject& nDNSAddrTyDDF = nDNSAddrDDF.AddChildObjectL(KNSmlDdfDNSAddrTy);  // DNSAddrTy
-    FillNodeInfoL( nDNSAddrTyDDF, 
-                   aclTypesOnlyGet, 
-                   MSmlDmDDFObject::EOne, 
-                   MSmlDmDDFObject::EDynamic, 
-                   MSmlDmDDFObject::EChr, 
-                   KNSmlDdfDNSAddrTyDesc);
-
-    MSmlDmDDFObject& nDNSPriorityDDF = nDNSAddrDDF.AddChildObjectL(KNSmlDdfDNSPriority);  // DNSAddrPriority
-    FillNodeInfoL( nDNSPriorityDDF, 
-                   aclTypesNoDelete,
-                   MSmlDmDDFObject::EOne, 
-                   MSmlDmDDFObject::EDynamic, 
-                   MSmlDmDDFObject::EChr, 
-                   KNSmlDdfDNSPriorityDesc);
-
-    MSmlDmDDFObject& nNAPAuthInfRootDDF = nNAPDefDDF.AddChildObjectL(KNSmlDdfNAPAuthInf); // NAPAuthInf 
-    FillNodeInfoL( nNAPAuthInfRootDDF, 
-                   aclTypesNoDelete, 
-                   MSmlDmDDFObject::EZeroOrOne, 
-                   MSmlDmDDFObject::EDynamic, 
-                   MSmlDmDDFObject::ENode, 
-                   KNullDesC8);
-
-    MSmlDmDDFObject& nNAPAuthInfDDF = nNAPAuthInfRootDDF.AddChildObjectGroupL();    // NAPAuthInf/<x>
-    FillNodeInfoL( nNAPAuthInfDDF, 
-                   aclTypesNoDelete, 
-                   MSmlDmDDFObject::EZeroOrOne, 
-                   MSmlDmDDFObject::EDynamic, 
-                   MSmlDmDDFObject::ENode, 
-                   KNullDesC8);
-
-    MSmlDmDDFObject& nAuthNameDDF = nNAPAuthInfDDF.AddChildObjectL(KNSmlDdfAuthName);   // AuthName
-    FillNodeInfoL( nAuthNameDDF, 
-                   aclTypesNoDelete, 
-                   MSmlDmDDFObject::EZeroOrOne, 
-                   MSmlDmDDFObject::EDynamic, 
-                   MSmlDmDDFObject::EChr, 
-                   KNSmlDdfAuthNameDesc);
-
-    MSmlDmDDFObject& nAuthSecrDDF = nNAPAuthInfDDF.AddChildObjectL(KNSmlDdfAuthSecr);   // AuthSecr
-    FillNodeInfoL( nAuthSecrDDF, 
-             aclTypesAddReplace, 
-                   MSmlDmDDFObject::EZeroOrOne, 
-                   MSmlDmDDFObject::EDynamic, 
-                   MSmlDmDDFObject::EChr, 
-                   KNSmlDdfAuthSecrDesc);
-
-    MSmlDmDDFObject& nDefGWDDF = nNAPDefDDF.AddChildObjectL(KNSmlDdfDefGW);         // DefGW
-    FillNodeInfoL( nDefGWDDF, 
-                   aclTypesNoDelete, 
-                   MSmlDmDDFObject::EZeroOrOne, 
-                   MSmlDmDDFObject::EDynamic, 
-                   MSmlDmDDFObject::EChr, 
-                   KNSmlDdfDefGWDesc);
-
-    MSmlDmDDFObject& nNetworkMaskDDF = nNAPDefDDF.AddChildObjectL(KNSmlDdfNetworkMask); // NetworkMask
-    FillNodeInfoL( nNetworkMaskDDF, 
-                   aclTypesNoDelete, 
-                   MSmlDmDDFObject::EZeroOrOne, 
-                   MSmlDmDDFObject::EDynamic, 
-                   MSmlDmDDFObject::EChr, 
-                   KNSmlDdfNetworkMaskDesc);
-
-    MSmlDmDDFObject& nUsePTxtLogDDF = nNAPDefDDF.AddChildObjectL(KNSmlDdfUsePTxtLog);   // UsePTxtLog
-    FillNodeInfoL( nUsePTxtLogDDF, 
-                   aclTypesNoDelete, 
-                   MSmlDmDDFObject::EZeroOrOne, 
-                   MSmlDmDDFObject::EDynamic, 
-                   MSmlDmDDFObject::EBool, 
-                   KNSmlDdfUsePTxtLogDesc);
-
-    MSmlDmDDFObject& nNetworksRootDDF = nNAPDefDDF.AddChildObjectL(KNSmlDdfNetworks);   // Networks 
-    FillNodeInfoL( nNetworksRootDDF, 
-                   aclTypesAddGet, 
-                   MSmlDmDDFObject::EZeroOrOne, 
-                   MSmlDmDDFObject::EDynamic, 
-                   MSmlDmDDFObject::ENode, 
-                   KNullDesC8 );
-
-    MSmlDmDDFObject& nNetworksDDF = nNetworksRootDDF.AddChildObjectGroupL();        // Networks/<x>
-    FillNodeInfoL( nNetworksDDF, 
-                   aclTypesAddGet, 
-                   MSmlDmDDFObject::EOne, 
-                   MSmlDmDDFObject::EDynamic, 
-                   MSmlDmDDFObject::ENode, 
-                   KNullDesC8);
-
-    MSmlDmDDFObject& nNetworkNameDDF = nNetworksDDF.AddChildObjectL(KNSmlDdfNetworkName);   // NetworkName
-    FillNodeInfoL( nNetworkNameDDF, 
-                   aclTypesNoDelete, 
-                   MSmlDmDDFObject::EOne, 
-                   MSmlDmDDFObject::EDynamic, 
-                   MSmlDmDDFObject::EChr, 
-                   KNSmlDdfNetworkNameDesc);
-
-    MSmlDmDDFObject& nNetworkIDDDF = nNetworksDDF.AddChildObjectL(KNSmlDdfNetworkID);   // NetworkID
-    FillNodeInfoL( nNetworkIDDDF, 
-                   aclTypesNoDelete, 
-                   MSmlDmDDFObject::EOne, 
-                   MSmlDmDDFObject::EDynamic, 
-                   MSmlDmDDFObject::EInt, 
-                   KNSmlDdfNetworkIDDesc);
-
-    MSmlDmDDFObject& nPPPCompDDF = nNAPDefDDF.AddChildObjectL(KNSmlDdfPPPComp);     // PPPComp
-    FillNodeInfoL( nPPPCompDDF, 
-                   aclTypesNoDelete, 
-                   MSmlDmDDFObject::EZeroOrOne, 
-                   MSmlDmDDFObject::EDynamic, 
-                   MSmlDmDDFObject::EBool, 
-                   KNSmlDdfPPPCompDesc);
-
-    MSmlDmDDFObject& nGPRSPDPDDF = nNAPDefDDF.AddChildObjectL(KNSmlDdfGPRSPDP); // GPRSPDP
-    FillNodeInfoL( nGPRSPDPDDF, 
-                   aclTypesNoDelete, 
-                   MSmlDmDDFObject::EZeroOrOne, 
-                   MSmlDmDDFObject::EDynamic, 
-                   MSmlDmDDFObject::EChr, 
-                   KNSmlDdfGPRSPDPDesc);
-
-    MSmlDmDDFObject& nIPAddrFromServerDDF = nNAPDefDDF.AddChildObjectL(KNSmlDdfIPAddrFromServer);   // IPAddrFromServer
-    FillNodeInfoL( nIPAddrFromServerDDF, 
-                   aclTypesNoDelete, 
-                   MSmlDmDDFObject::EZeroOrOne, 
-                   MSmlDmDDFObject::EDynamic, 
-                   MSmlDmDDFObject::EBool, 
-                   KNSmlDdfIPAddrFromServerDesc);
-
-    MSmlDmDDFObject& nIPAddrDDF = nNAPDefDDF.AddChildObjectL(KNSmlDdfIPAddr);  // IPAddr
-    FillNodeInfoL( nIPAddrDDF, 
-                   aclTypesNoDelete, 
-                   MSmlDmDDFObject::EZeroOrOne, 
-                   MSmlDmDDFObject::EDynamic, 
-                   MSmlDmDDFObject::EChr, 
-                   KNSmlDdfIPAddrDesc);
-
-    MSmlDmDDFObject& nDNSAddrFromServerDDF = nNAPDefDDF.AddChildObjectL(KNSmlDdfDNSAddrFromServer); // DNSAddrFromServer
-    FillNodeInfoL( nDNSAddrFromServerDDF, 
-                   aclTypesNoDelete, 
-                   MSmlDmDDFObject::EZeroOrOne, 
-                   MSmlDmDDFObject::EDynamic, 
-                   MSmlDmDDFObject::EBool, 
-                   KNSmlDdfDNSAddrFromServerDesc);
-
-    MSmlDmDDFObject& nIPv6DNSAddrFromServerDDF = nNAPDefDDF.AddChildObjectL(KNSmlDdfIPv6DNSAddrFromServer); // IPv6DNSAddrFromServer
-    FillNodeInfoL( nIPv6DNSAddrFromServerDDF, 
-                   aclTypesNoDelete, 
-                   MSmlDmDDFObject::EZeroOrOne, 
-                   MSmlDmDDFObject::EDynamic, 
-                   MSmlDmDDFObject::EBool, 
-                   KNSmlDdfIPv6DNSAddrFromServerDesc);
-
-    MSmlDmDDFObject& nIfNetworksDDF = nNAPDefDDF.AddChildObjectL(KNSmlDdfIfNetworks);   // IfNetworks
-    FillNodeInfoL( nIfNetworksDDF, 
-                   aclTypesNoDelete, 
-                   MSmlDmDDFObject::EZeroOrOne, 
-                   MSmlDmDDFObject::EDynamic, 
-                   MSmlDmDDFObject::EChr, 
-                   KNSmlDdfIfNetworksDesc);
-
-    MSmlDmDDFObject& nIAPServiceDDF = nNAPDefDDF.AddChildObjectL(KNSmlDdfIAPService);   // IAPService
-    FillNodeInfoL( nIAPServiceDDF, 
-             aclTypesOnlyGet, 
-                   MSmlDmDDFObject::EZeroOrOne, 
-                   MSmlDmDDFObject::EDynamic, 
-                   MSmlDmDDFObject::EChr, 
-                   KNSmlDdfIAPServiceDesc);
-
-
-
-    MSmlDmDDFObject& nIAPSeamlessnessDDF = nNAPDefDDF.AddChildObjectL(KNSmlDdfIAPSeamlessness);   // IAPService
-    FillNodeInfoL( nIAPSeamlessnessDDF, 
-                   aclTypesNoDelete, 
-                   MSmlDmDDFObject::EZeroOrOne, 
-                   MSmlDmDDFObject::EDynamic, 
-                   MSmlDmDDFObject::EInt, 
-                   KNSmlDdfIAPSeamlessnessDesc);
-    MSmlDmDDFObject& nIAPMetaDataDDF = nNAPDefDDF.AddChildObjectL(KNSmlDdfIAPMetaData);   // IAPService
-    FillNodeInfoL( nIAPMetaDataDDF, 
-                   aclTypesNoDelete, 
-                   MSmlDmDDFObject::EZeroOrOne, 
-                   MSmlDmDDFObject::EDynamic, 
-                   MSmlDmDDFObject::EInt, 
-                   KNSmlDdfIAPMetaDataDesc);
-
-    if ( iWlanSupported )
-        {
-        iWlanAdapter->DDFStructureL( nNAPDefDDF ); // Adds WLAN fields to DDF
-        }
-    
-//
-//  Px-node fields
-//
-    MSmlDmDDFObject& nPxNameDDF = nPxDDF.AddChildObjectL(KNSmlDdfPxName);           // Name
-    FillNodeInfoL( nPxNameDDF, 
-                   aclTypesNoDelete, 
-                   MSmlDmDDFObject::EZeroOrOne, 
-                   MSmlDmDDFObject::EDynamic, 
-                   MSmlDmDDFObject::EChr, 
-                   KNSmlDdfPxDesc);
-
-    MSmlDmDDFObject& nPxIdDDF = nPxDDF.AddChildObjectL(KNSmlDdfPxId);               // PxId
-    FillNodeInfoL( nPxIdDDF, 
-                   aclTypesOnlyGet, 
-                   MSmlDmDDFObject::EOne, 
-                   MSmlDmDDFObject::EDynamic, 
-                   MSmlDmDDFObject::EChr, 
-                   KNSmlDdfPxIdDesc);
-
-    MSmlDmDDFObject& nDomainRootDDF = nPxDDF.AddChildObjectL(KNSmlDdfDomain);   // Domain 
-    FillNodeInfoL( nDomainRootDDF, 
-                   aclTypesAddGet, 
-                   MSmlDmDDFObject::EZeroOrOne, 
-                   MSmlDmDDFObject::EDynamic, 
-                   MSmlDmDDFObject::ENode, 
-                   KNSmlDdfDomainDesc);
-
-    MSmlDmDDFObject& nDomainDDF = nDomainRootDDF.AddChildObjectGroupL();    // Domain<x> 
-    FillNodeInfoL( nDomainDDF, 
-                   aclTypesAddGet, 
-                   MSmlDmDDFObject::EOneOrMore, 
-                   MSmlDmDDFObject::EDynamic, 
-                   MSmlDmDDFObject::ENode, 
-                   KNullDesC8);
-
-    MSmlDmDDFObject& nDomainLDDF = nDomainDDF.AddChildObjectL(KNSmlDdfDomainL); // DomainL (Get)
-    FillNodeInfoL( nDomainLDDF, 
-                   aclTypesNoDelete, 
-                   MSmlDmDDFObject::EOne, 
-                   MSmlDmDDFObject::EDynamic, 
-                   MSmlDmDDFObject::EChr, 
-                   KNSmlDdfDomainLDesc);
-
-    MSmlDmDDFObject& nPxPWDDF = nPxDDF.AddChildObjectL(KNSmlDdfPxPW);               // PxPW
-    FillNodeInfoL( nPxPWDDF, 
-                   aclTypesNoDelete, 
-                   MSmlDmDDFObject::EZeroOrOne, 
-                   MSmlDmDDFObject::EDynamic, 
-                   MSmlDmDDFObject::EChr, 
-                   KNSmlDdfPxPWDesc);
-
-    MSmlDmDDFObject& nPxAddrDDF = nPxDDF.AddChildObjectL(KNSmlDdfPxAddr);           // PxAddr
-    FillNodeInfoL( nPxAddrDDF, 
-                   aclTypesNoDelete, 
-                   MSmlDmDDFObject::EOne, 
-                   MSmlDmDDFObject::EDynamic, 
-                   MSmlDmDDFObject::EChr, 
-                   KNSmlDdfPxAddrDesc);
-
-    MSmlDmDDFObject& nPortRootDDF = nPxDDF.AddChildObjectL(KNSmlDdfPort);           // Port 
-    FillNodeInfoL( nPortRootDDF, 
-                   aclTypesAddGet, 
-                   MSmlDmDDFObject::EZeroOrOne, 
-                   MSmlDmDDFObject::EDynamic, 
-                   MSmlDmDDFObject::ENode, 
-                   KNSmlDdfPortDesc);
-
-    MSmlDmDDFObject& nPortDDF = nPortRootDDF.AddChildObjectGroupL();            // Port<x> 
-    FillNodeInfoL( nPortDDF, 
-                   aclTypesAddGet, 
-                   MSmlDmDDFObject::EOneOrMore, 
-                   MSmlDmDDFObject::EDynamic, 
-                   MSmlDmDDFObject::ENode, 
-                   KNullDesC8);
-
-    MSmlDmDDFObject& nPortNbrDDF = nPortDDF.AddChildObjectL(KNSmlDdfPortNbr);       // PortNbr (Get)
-    FillNodeInfoL( nPortNbrDDF, 
-                   aclTypesNoDelete, 
-                   MSmlDmDDFObject::EOne, 
-                   MSmlDmDDFObject::EDynamic, 
-                   MSmlDmDDFObject::EInt, 
-                   KNSmlDdfPortNbrDesc);
-
-    MSmlDmDDFObject& nToNAPIDRootDDF = nPxDDF.AddChildObjectL(KNSmlDdfToNAPID); // ToNAPID 
-    FillNodeInfoL( nToNAPIDRootDDF, 
-                   aclTypesOnlyGet, 
-                   MSmlDmDDFObject::EZeroOrOne, 
-                   MSmlDmDDFObject::EDynamic, 
-                   MSmlDmDDFObject::ENode, 
-                   KNSmlDdfToNAPIDDesc);
-
-    MSmlDmDDFObject& nToNAPIDDDF = nToNAPIDRootDDF.AddChildObjectGroupL();  // ToNAPID<x> 
-    FillNodeInfoL( nToNAPIDDDF, 
-                   aclTypesOnlyGet, 
-                   MSmlDmDDFObject::EOne, 
-                   MSmlDmDDFObject::EDynamic, 
-                   MSmlDmDDFObject::ENode, 
-                   KNullDesC8);
-
-    MSmlDmDDFObject& nToNAPIDLDDF = nToNAPIDDDF.AddChildObjectL(KNSmlDdfToNAPIDL);  // ToNAPIDL (Get)
-    FillNodeInfoL( nToNAPIDLDDF, 
-                   aclTypesOnlyGet, 
-                   MSmlDmDDFObject::EOne, 
-                   MSmlDmDDFObject::EDynamic, 
-                   MSmlDmDDFObject::EChr, 
-                   KNSmlDdfToNAPIDLDesc);
-
-    MSmlDmDDFObject& nPxStartpgDDF = nPxDDF.AddChildObjectL(KNSmlDdfStartpg);       // Startpg
-    FillNodeInfoL( nPxStartpgDDF, 
-                   aclTypesNoDelete,
-                   MSmlDmDDFObject::EZeroOrOne, 
-                   MSmlDmDDFObject::EDynamic, 
-                   MSmlDmDDFObject::EChr, 
-                   KNSmlDdfStartpgDesc);
-
-    MSmlDmDDFObject& nPxAuthInfRootDDF = nPxDDF.AddChildObjectL(KNSmlDdfPxAuthInf); // PxAuthInf 
-    FillNodeInfoL( nPxAuthInfRootDDF, 
-             aclTypesAddGet, 
-                   MSmlDmDDFObject::EZeroOrOne, 
-                   MSmlDmDDFObject::EDynamic, 
-                   MSmlDmDDFObject::ENode, 
-                   KNullDesC8);
-
-    MSmlDmDDFObject& nPxAuthInfDDF = nPxAuthInfRootDDF.AddChildObjectGroupL();  // PxAuthInf/<x>
-    FillNodeInfoL( nPxAuthInfDDF, 
-             aclTypesAddGet, 
-                   MSmlDmDDFObject::EOneOrMore, 
-                   MSmlDmDDFObject::EDynamic, 
-                   MSmlDmDDFObject::ENode, 
-                   KNullDesC8);
-
-    MSmlDmDDFObject& nPxAuthIdDDF = nPxAuthInfDDF.AddChildObjectL(KNSmlDdfPxAuthId);    // PxAuthId
-    FillNodeInfoL( nPxAuthIdDDF, 
-                   aclTypesNoDelete, 
-                   MSmlDmDDFObject::EZeroOrOne, 
-                   MSmlDmDDFObject::EDynamic, 
-                   MSmlDmDDFObject::EChr, 
-                   KNSmlDdfPxAuthIdDesc);
-
-    MSmlDmDDFObject& nPxAuthPWDDF = nPxAuthInfDDF.AddChildObjectL(KNSmlDdfPxAuthPW);    // PxAuthPW
-    FillNodeInfoL( nPxAuthPWDDF, 
-                   aclTypesAddReplace, 
-                   MSmlDmDDFObject::EZeroOrOne, 
-                   MSmlDmDDFObject::EDynamic, 
-                   MSmlDmDDFObject::EChr, 
-                   KNSmlDdfPxAuthPWDesc);
-
-    MSmlDmDDFObject& nNoPxForRootDDF = nPxDDF.AddChildObjectL(KNSmlDdfNoPxFor);     // NoPxFor 
-    FillNodeInfoL( nNoPxForRootDDF, 
-                   aclTypesAddGet, 
-                   MSmlDmDDFObject::EZeroOrOne, 
-                   MSmlDmDDFObject::EDynamic, 
-                   MSmlDmDDFObject::ENode, 
-                   KNSmlDdfNoPxForDesc);
-
-    MSmlDmDDFObject& nNoPxForDDF = nNoPxForRootDDF.AddChildObjectGroupL();      // NoPxFor<x> 
-    FillNodeInfoL( nNoPxForDDF, 
-                   aclTypesAddGet, 
-                   MSmlDmDDFObject::EOne, 
-                   MSmlDmDDFObject::EDynamic, 
-                   MSmlDmDDFObject::ENode, 
-                   KNullDesC8);
-
-    MSmlDmDDFObject& nNoPxForLDDF = nNoPxForDDF.AddChildObjectL(KNSmlDdfNoPxForL);  // NoPxForL (Get)
-    FillNodeInfoL( nNoPxForLDDF, 
-                   aclTypesNoDelete, 
-                   MSmlDmDDFObject::EOne, 
-                   MSmlDmDDFObject::EDynamic, 
-                   MSmlDmDDFObject::EChr, 
-                   KNSmlDdfNoPxForLDesc);
-
-    
-    _DBG_FILE("CNSmlInternetAdapter::DDFStructureL(): end");
-    }
-
-//------------------------------------------------------------------------------
-// CNSmlInternetAdapter::LingerValueL()
-//------------------------------------------------------------------------------
-
-void CNSmlInternetAdapter::LingerValueL( const TDesC8& aObject )
-{
-    
-    TBuf<100> desObj;
-    CnvUtfConverter::ConvertToUnicodeFromUtf8(desObj, aObject);
-    TInt err(KErrNone);
-    //const TDesC& value = desObj;
-    if(!Notalpha(desObj))
-    {
-    TLex lex( desObj );
-    TUint Linger = 0;
-    TInt lingerint;
-    err = lex.Val( Linger, EDecimal );
-    if( err == KErrNone )
-    {
-        lingerint = Linger;
-      if( lingerint >= 0 )
-        {
-          iLingerValue = lingerint;
-          iLingerFlag = EFalse;
-        }
-    }
-    }
-}
-
-
-// -----------------------------------------------------------------------------
-// CWPAPNapdef::UdateligerValueL
-// 
-// -----------------------------------------------------------------------------
-//
-TBool CNSmlInternetAdapter::Notalpha(const TDesC& aValue)
-{
-  TBool NotAlpha = EFalse;
-  TChar character;
-  for(TInt i = 0 ; i < aValue.Length(); i++)
-  {
-    character = aValue[i];
-    NotAlpha = character.IsAlpha();
-    if(NotAlpha)
-    break;
-  }
-  
-  return NotAlpha;
-}
-// CNSmlInternetAdapter::AddLeafObjectL()
-//------------------------------------------------------------------------------
-void CNSmlInternetAdapter::AddLeafObjectL( const TDesC8& aURI,
-                                           const TDesC8& aParentLUID, 
-                                           const TDesC8& aObject, 
-                                           const TDesC8& aType, 
-                                           const TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): begin");
-    DBG_ARGS8(_S8("AP:add aURI AddLeafObjectL   - %S - %S"), &aURI, &aParentLUID);
-    DBG_ARGS8(_S8("AP:Object %S"), &aObject);
-
-  TInt parentLUID(0);
-  if(aParentLUID.Length()<=0 )
-  {
-    if (aURI.Match(_L8("AP/*/Px/*"  ))!= KErrNotFound)
-        {
-        if(!GetProxyIdL(aURI)) 
-            {
-            _DBG_FILE("CNSmlInternetAdapter::FetchLeafObjectL(internal)()(): ENotFound end");
-            return; 
-            }
-        }
-        if(!iLUID)
-        iLUID = IntLUID(aParentLUID);
-      parentLUID = GetAPIdFromURIL(aURI);
-    if( parentLUID == 0 )
-      {
-        if( IsAPUriFormatMatchPredefined(aURI) )
-        {
-          iLUID = ConstructTreeL(aURI);
-          parentLUID = GetAPIdFromURIL(aURI);
-        } 
-      }
-   
-  }
-  else
-  {
-    _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): PParentLUID set to parentLUID");
-    parentLUID = IntLUID(aParentLUID); 
-  }
-// Always buffer DNSAddr/<X>/*
-    if( ( parentLUID ==0 ||
-          aURI.Find(KNSmlDdfDNSPriority ) >= 0 ||
-          aURI.Find(KNSmlDdfDNSAddrL ) >= 0 ) && !iExecutingBuffer  )
-    // Update as add
-        {
-        iLeafType = EDMUnset; // Default for leaf handling
-        AddLeafBufferL(aURI,aParentLUID,aObject,aType,aStatusRef);
-        _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): end");
-        return;
-        }
-
-    if(parentLUID == KNSmlIncompleteAP)
-        {
-        _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): EError end");
-        iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EError);
-        return;
-        }
-
-//check if Stale and add leaf buffer
-  if (parentLUID > 0 && !iExecutingBuffer  )
-  {
-    _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): parentLUID > 0 && !iExecutingBuffer");
-    TUint32 apID = GetAPIdFromURIL(aURI);
-      if(!APExistsL(apID))
-      {
-    AddLeafBufferL(aURI,aParentLUID,aObject,aType,aStatusRef);
-    iStaleMapUpdate=ETrue;
-        _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): end");
-        return;
-      }
-  }
-    TInt pushed = 0;
-//
-//  Check which field going to be handled
-//
-    SetField(aURI);
-    if((iField->Compare(KNSmlDdfNAPLinger) == 0))
-    {
-      TUint32 apID = GetAPIdFromURIL(aURI);
-      if( aObject.Size()==0 )
-      {
-        DeleteLingerL( apID ); 
-        iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EOk);
-        return;
-      }
-      LingerValueL( aObject );
-      
-      if ( !iLingerFlag )
-    {
-        iLingerFlag = ETrue;
-        TRAPD (error, AddLingerL( apID , iLingerValue ));
-        if( error == !KErrNone)
-        {
-          iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EError);
-        }
-        else
-        {
-          iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EOk);
-        }
-    }
-    else
-    {
-      iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EError);
-    }
-    return; 
-    }
-    
-//
-//  On leaf handling and add, must be checked that value not set before
-// 
-    if (iLeafType != EDMUpdate && 
-        iLeafType != EDMDelete )
-        {
-        iLeafType = EDMAdd;
-        }
-    if (iStaleMapUpdate)
-     {
-         iLeafType = EDMAdd;
-     }
-
-    TPtrC qTable  = TPtrC(KNullDesC);
-    TPtrC qColumn = TPtrC(KNullDesC);
-    TPtrC qDB = TPtrC(COMMDB_ID);
-
-    if(aURI.Find(KNSmlDdfPortNbr) >= 0)
-        {
-        IsWapPort(aObject);
-        }
-//
-//  Get Database field type 
-//
-
-    if(parentLUID > 0)
-        {
-        // Get IAP nbr for servicetype
-        TUint32 iapIDs = GetAPIdFromURIL(aURI);
-        
-        DBG_ARGS8(_S8("CNSmlInternetAdapter::AddLeafObjectL(): checkluid is %d and iapId %d "),parentLUID, iapIDs );
-
-        //  IAP-table search serviceType (=Bearer)
-        CCommsDbTableView* iapViews = iDatabase->OpenViewMatchingUintLC(TPtrC(IAP),
-                                                                        TPtrC(COMMDB_ID),
-                                                                        iapIDs);
-    
-        TBuf<KCommsDbSvrMaxFieldLength> serviceType;
-
-        TInt errorCode = iapViews->GotoFirstRecord();
-    
-        // Read iapService from (IAP)
-        if ( errorCode == KErrNone )
-            {
-            iapViews->ReadTextL(TPtrC(IAP_SERVICE_TYPE), serviceType);
-            CleanupStack::PopAndDestroy(); // iapViews
-            qTable.Set(serviceType);
-            }
-        else
-            {
-            CleanupStack::PopAndDestroy(); // iapViews
-            iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::ENotFound);
-            _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): ENotFound 1 end");
-            return;
-            }
-        } 
-
-  if ( iWlanSupported )
-    {
-      TBool wLANfield = IsWLANfield(aURI);
-      if( wLANfield )
-          {
-          iWlanAdapter->AddLeafObjectL( aURI, aParentLUID, aObject, aType, aStatusRef );
-          CleanupStack::PopAndDestroy(pushed); 
-          return;
-          }
-    }
-
-    TInt fType = GetAPFieldType( aURI );
-    if (fType == EWrong) // Error if leaf not supported
-        {
-        _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): EError end");
-        iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EError);
-        return;
-        }
-
-    TBool fieldOK = GetAPField(qTable,qColumn);
-    if(!fieldOK ) // OK if column for table not supported
-        {
-        _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): EOk end");
-        iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EOk);
-        return;
-        }
-
-    iISPId = parentLUID;
-    if(aURI.Match(_L8("AP/*/Px/*/*" ))!= KErrNotFound)
-        {
-        if(iProxyId == 0)
-            iProxyId = parentLUID;
-        }
-
-    if (( fType == CNSmlInternetAdapter::EStr ) ||
-        ( fType == CNSmlInternetAdapter::EInt && aURI.Find(KNSmlDdfGPRSPDP) >= 0) ||  // KNSmlDdfNAPAddrTy
-        ( fType == CNSmlInternetAdapter::EInt && aURI.Find(KNSmlDdfNAPAddrTy) >= 0))  // KNSmlDdfNAPAddrTy
-        { // Name + NAPAddr + DNSAddr +  Networks/*/Name
-        
-        if(aURI.Match(_L8("AP/*/Networks/*/Name"))!= KErrNotFound)
-            {
-            TUint32 checkLUID = 0;
-            TUint32 iapID1 = GetAPIdFromURIL(aURI);
-            
-    
-            //  IAP-table NetworkId Update
-            CCommsDbTableView* iapUpdate = iDatabase->OpenViewMatchingUintLC(TPtrC(IAP),TPtrC(COMMDB_ID),iapID1);
-            TInt iapExists = iapUpdate->GotoFirstRecord();
-    
-        if (iapExists == KErrNone)
-            {
-            _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL, Get network id");
-            iapUpdate->ReadUintL(TPtrC(IAP_NETWORK),checkLUID);
-            DBG_ARGS8(_S8("CNSmlInternetAdapter::AddLeafObjectL(): networks is %d"),checkLUID);
-            _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL, IAP exists");
-            if( checkLUID >0 )                                       
-                {
-                _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL, network id > 0");
-                //check if network exist in NETWORK TABLE 
-                CCommsDbTableView*  checknetView;
-                checknetView = iDatabase->OpenViewMatchingUintLC(TPtrC(NETWORK),TPtrC(COMMDB_ID),checkLUID);
-                TInt error = checknetView->GotoFirstRecord();
-                if (error == KErrNotFound)
-                    {
-                    _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL: Network does not exist, create it");
-                    AddNetworkL(checkLUID,aObject);
-                    if( checkLUID > 0 )
-                        {
-                        _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL: network generation ok");
-                        DBG_ARGS8(_S8("CNSmlInternetAdapter::AddLeafObjectL(): network id is %d"),checkLUID);
-                        //iapUpdate->WriteUintL(TPtrC(IAP_NETWORK),checkLUID); 
-                        }
-                    else
-                        {
-                        _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): network generation failed");
-                        iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EError);
-                        return;
-                        }
-                    }
-                  // Network was found, update the name to the given name.
-                  else
-                    {
-                    if(checknetView->UpdateRecord()==KErrNone)
-                      {
-                      _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL: network found, update name");
-                      checknetView->WriteTextL(TPtrC(COMMDB_NAME), ConvertTo16LC(aObject));
-                      _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL: network name updated");
-                      CleanupStack::PopAndDestroy(); //ConvertTo16LC
-                      }
-                    // writing failed for some reason
-                    else
-                        {
-                        _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): network generation failed");
-                        iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EError);
-                        return;
-                        }
-                    }
-                _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL: network ok");
-                CleanupStack::PopAndDestroy();  //checknetView
-                }
-            }
-            // IAP does not exist yet, create network, network id will be updated later using checkLUID
-        else
-            {
-            _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL: network does not exist, creation 2");
-            AddNetworkL(checkLUID,aObject);
-            DBG_ARGS8(_S8("CNSmlInternetAdapter::AddLeafObjectL(): network id is %d"),checkLUID);
-            }
-        CleanupStack::PopAndDestroy(); // iapUpdate
-        _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL: network addition handled");
-            
-
-            //  IAP-table NetworkId Update
-            CCommsDbTableView* iapView = iDatabase->OpenViewMatchingUintLC(TPtrC(IAP),
-                                                                           TPtrC(COMMDB_ID),
-                                                                           iapID1);
-            TInt iapFound = iapView->GotoFirstRecord();
-            _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL: network id update begin");
-            if(iapFound==KErrNone)
-                {
-                TBool iapReLock = EFalse;
-	            if(FeatureManager::FeatureSupported(KFeatureIdSapPolicyManagement))
-	                {
-	                TBool apEnforce=EFalse;
-	                TRAPD(eError,apEnforce=CheckEnforcementL())
-	                DBG_ARGS8(_S8("CNSmlInternetAdapter::AddLeafObjectL(): EError %d , APEnforcement is %d"),eError,apEnforce);
-	                if(eError==KErrNone && apEnforce)
-	                    {
-	                    DoLockIAPTablesL(EFalse);
-	                    ((CCommsDbProtectTableView*)iapView)->UnprotectRecord();
-	                    iWAPRelock = ETrue;
-	                    }
-	                }
-	                
-	            if(IsIAPRecordLockedL(iapID1))
-	                {
-	                _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): apaccesspoint record is LOCKED");  
-        			TInt reclockerr = ((CCommsDbProtectTableView*)iapView)->UnprotectRecord();
-	                DBG_ARGS8(_S8("CNSmlInternetAdapter::AddLeafObjectL ,UnProtecting IAPAccessRecord returned code = %d"),reclockerr);
-	                if(reclockerr==KErrNone)
-	                    iapReLock = ETrue;
-	                }
-	            else
-	                {
-	                _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): apaccesspoint record is not write protected");  
-	                }
-                
-	            if(iapView->UpdateRecord()==KErrNone)
-                    {
-                    iapView->WriteUintL(TPtrC(IAP_NETWORK), checkLUID);
-                    DBG_ARGS8(_S8("CNSmlInternetAdapter::AddLeafObject(): checkLUID is %d"),checkLUID);
-                    _DBG_FILE("CNSmlInternetAdapter::AddLeafObject, IAP_NETWORK set to checkLUID ");
-                    iapView->PutRecordChanges();
-                    _DBG_FILE("CNSmlInternetAdapter::AddLeafObject, iap found, set iNetworkId to checkLUID");
-                    iNetworkId = checkLUID;
-                    iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EOk);
-                    }
-                else
-                    {
-                    iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EError);
-                    }
-                    
-                    if(FeatureManager::FeatureSupported(KFeatureIdSapPolicyManagement))
-                        {
-                        if(iWAPRelock)
-                            {
-                            DoLockIAPTablesL(ETrue);
-                            ((CCommsDbProtectTableView*)iapView)->ProtectRecord();
-                            iWAPRelock = EFalse;
-                            }
-                        }                   
-                    if(iapReLock)
-                        {
-                        TInt reclockerr = DoProtectIAPRecordL(iapID1,ETrue);
-                        DBG_ARGS8(_S8("CNSmlInternetAdapter::AddLeafObjectL ,Protecting IAPAccessRecord returned code = %d"),reclockerr);
-                        if(reclockerr==KErrNone)
-                            iapReLock = EFalse;  
-                        }                   
-                    }
-                else if (iapFound==KErrNotFound)
-                    {
-                    _DBG_FILE("CNSmlInternetAdapter::AddLeafObject, iap not found, set iNetworkId");
-                    DBG_ARGS8(_S8("CNSmlInternetAdapter::AddLeafObject(): checkLUID is %d"),checkLUID);
-                    iNetworkId = checkLUID;
-                    iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EOk);
-                    }
-                else
-                    {
-                    _DBG_FILE("CNSmlInternetAdapter::AddLeafObject, iap found");
-                    iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EError);
-                    }
-
-                CleanupStack::PopAndDestroy(); // iapView
-                CleanupStack::PopAndDestroy(pushed); 
-
-                _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): OK end");
-                return;
-            }
-        
-        else if(((aURI.Match(_L8("AP/*/Px/*/Name"))   != KErrNotFound ||    // ProxyName
-                  aURI.Match(_L8("AP/*/Px/*/PxAddr"))  != KErrNotFound ||   // ProxyAddr
-                  aURI.Match(_L8("AP/*/Px/*/DomainL")) != KErrNotFound ) // DomainL (PROXY_PROTOCOL_NAME)
-                 &&  iLeafType == EDMUpdate) ||
-                ((aURI.Match(_L8("AP/*/Px/*/PxAddr"))  != KErrNotFound 
-                  ||  aURI.Match(_L8("AP/*/Px/*/DomainL")) != KErrNotFound )
-                 &&  iLeafType == EDMAdd))
-            {
-            CCommsDbTableView* tableView = iDatabase->OpenViewMatchingUintLC(TPtrC(PROXIES),
-                                                                             TPtrC(COMMDB_ID),
-                                                                             iProxyId);
-			TBool proxyReLock = EFalse;
-			if(IsProxyRecordLockedL(iProxyId))
-			{
-        		_DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): proxy record is LOCKED");	        		
-        		TInt reclockerr = ((CCommsDbProtectTableView*)tableView)->UnprotectRecord();
-        		DBG_ARGS8(_S8("CNSmlInternetAdapter::AddLeafObjectL ,UnProtecting ProxyRecord returned code = %d"),reclockerr);
-        		if(reclockerr==KErrNone)
-               		proxyReLock = ETrue;
-			}
-			else
-			{
-  		     _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): apaccesspoint record is not write protected");	
-			}
-
-            TInt errorCode = tableView->GotoFirstRecord();
-            if ( errorCode == KErrNone )
-                {
-                if (tableView->UpdateRecord() == KErrNone )
-                    {
-                    if (aURI.Match(_L8("AP/*/Px/*/PxAddr"))      != KErrNotFound )
-                        {
-                        tableView->WriteLongTextL(TPtrC(PROXY_SERVER_NAME), ConvertTo16LC(aObject));
-                        pushed++;
-                        }
-                    else if (aURI.Match(_L8("AP/*/Px/*/DomainL"))   != KErrNotFound )
-                        {
-                        // Accepted values are (http, https, ftp, ftps)
-                        _LIT8(KProxyProtocol,"http, https, ftp, ftps");
-
-                        TInt protocolFound = 0;
-                        if(aObject.Length() > 0)
-                            {
-                            protocolFound = KProxyProtocol().Find(aObject);
-                            }
-                        if( protocolFound == KErrNotFound && aObject.Length() > 0)
-                            {
-                            CleanupStack::PopAndDestroy(); // tableView
-                            CleanupStack::PopAndDestroy(pushed); 
-                            iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EError);
-                            _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): EError end");
-                            return;
-                            }
-                        if(aObject.Length() == 0)
-                            {   
-                            tableView->SetNullL(TPtrC(PROXY_PROTOCOL_NAME)); 
-                            }
-                        else
-                            {
-                            tableView->WriteTextL(TPtrC(PROXY_PROTOCOL_NAME), ConvertTo16LC(aObject)); 
-                            CleanupStack::PopAndDestroy(); //ConvertTo16LC
-                            }
-                        }
-                    tableView->PutRecordChanges();
-                    CleanupStack::PopAndDestroy(); // tableView
-                    }
-                else
-                    {
-                    CleanupStack::PopAndDestroy(); // tableView
-                    CleanupStack::PopAndDestroy(pushed); 
-                    iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EError);
-                    _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): EError end");
-                    return;
-                    }
-                }
-            else
-                {
-                CleanupStack::PopAndDestroy(); // tableView
-                CleanupStack::PopAndDestroy(pushed); 
-                iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::ENotFound);
-                _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): ENotFound end");
-                return;
-                }
-            if(proxyReLock)
-	    	{
-	    		TInt reclockerr = DoProtectProxyRecordL(iProxyId,ETrue);
-            	DBG_ARGS8(_S8("CNSmlInternetAdapter::AddLeafObjectL ,UnProtecting Proxy returned code = %d"),reclockerr);
-            	if(reclockerr==KErrNone)
-               		proxyReLock = EFalse;	
-	    	}
-            CleanupStack::PopAndDestroy(pushed); 
-            iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EOk);
-            _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): EOk end");
-            return;
-            }
-
-        if (iLeafType == EDMUpdate ||
-            (iLeafType == EDMAdd && 
-             (aURI.Find(KNSmlDdfNAPName) >= 0  &&
-              aURI.Find(KNSmlDdfNAPDef)  >= 0) ||
-             aURI.Find(KNSmlDdfNAPAddr)  >= 0 ||
-             aURI.Find(KNSmlDdfGPRSPDP)  >= 0 ||
-             aURI.Find(KNSmlDdfDNSAddrL) >= 0 ||
-             aURI.Find(KNSmlDdfAuthSecr) >= 0 ||
-             aURI.Find(KNSmlDdfDefGW)    >= 0 ||
-             aURI.Find(KNSmlDdfNetworkMask) >= 0 ||
-             aURI.Find(KNSmlDdfIPAddr)   >= 0 ||
-             aURI.Find(KNSmlDdfNAPAddrTy)>= 0 ))
-            {
-            // Get IAP nbr for servicetype
-
-            TUint32 iapID2 = GetAPIdFromURIL(aURI);
-
-            //  IAP-table search serviceType (=Bearer)
-            CCommsDbTableView* serviceView = iDatabase->OpenViewMatchingUintLC(TPtrC(IAP),
-                                                                               qDB,
-                                                                               iapID2);
-    
-            TBuf<KCommsDbSvrMaxFieldLength> serviceType;
-
-            TInt errorCode = serviceView->GotoFirstRecord();
-    
-            // Read serviceType from (IAP)
-            if ( errorCode == KErrNone )
-                {
-                serviceView->ReadTextL(TPtrC(IAP_SERVICE_TYPE), serviceType);
-                serviceView->ReadTextL(TPtrC(IAP_SERVICE_TYPE), iProxyServiceType); // for locking
-
-                    serviceView->ReadUintL(TPtrC(IAP_SERVICE), iISPId);
-
-                CleanupStack::PopAndDestroy(); // serviceView
-                }
-            else
-                {
-                CleanupStack::PopAndDestroy(); // serviceView
-                CleanupStack::PopAndDestroy(pushed); 
-                iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::ENotFound);
-                _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): ENotFound end");
-                return;
-                }
-            qTable.Set(serviceType);
-
-            CCommsDbTableView* tableView = iDatabase->OpenViewMatchingUintLC(serviceType,
-                                                                             qDB,
-                                                                             iISPId);
-    
-            errorCode = tableView->GotoFirstRecord();
-
-            if ( errorCode == KErrNone )
-                {
-                TBool serviceReLock = EFalse;
-                if(IsServiceRecordLockedL(iISPId))
-        {
-              _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): apaccesspoint record is LOCKED");
-              TInt reclockerr = ( (CCommsDbProtectTableView*) tableView )->UnprotectRecord();             
-              DBG_ARGS8(_S8("CNSmlInternetAdapter::AddLeafObjectL ,UnProtecting WAPAccessRecord returned code = %d"),reclockerr);
-              if(reclockerr==KErrNone)
-                  serviceReLock = ETrue;
-        }
-        else
-        {
-              _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): apaccesspoint record is not write protected"); 
-        }    
-
-                if(tableView->UpdateRecord()!=KErrNone)
-                    {
-                    //database locked
-                    CleanupStack::PopAndDestroy(); // tableView
-                    CleanupStack::PopAndDestroy(pushed); 
-                    iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EError);
-                    _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): Update failed end");
-                    return;
-                    }
-                if ( fType == CNSmlInternetAdapter::EInt)
-                    {
-                    TUint32 object32;
-                    if (aURI.Find(KNSmlDdfGPRSPDP) >= 0 ||      /* GPRSPDP handling */
-                        aURI.Find(KNSmlDdfNAPAddrTy) >= 0)      /* NAPAddrTy handling */
-                        {
-                        if(aObject.MatchF(KNSmlDmApValIpv4) != KErrNotFound )
-                            {
-                            object32 = RPacketContext::EPdpTypeIPv4;    
-                            }
-                        else if (aObject.MatchF(KNSmlDmApValIpv6) != KErrNotFound )
-                            {
-                            object32 = RPacketContext::EPdpTypeIPv6;
-                            }
-                        else if (aObject.MatchF(_L8("PPP")) != KErrNotFound )
-                            {
-                            object32 = RPacketContext::EPdpTypePPP;
-                            }
-                        else 
-                            { // NotValid value
-                            tableView->CancelRecordChanges();
-                            CleanupStack::PopAndDestroy(); // tableView
-                            CleanupStack::PopAndDestroy(pushed); 
-                            iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EError);
-                            _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): Update failed end");
-                            return;
-                            }
-                        }
-                    else
-                        {
-                    object32 = GetIntObject8(aObject);
-                        }
-
-                    tableView->WriteUintL(qColumn, object32);
-                    }
-                else
-                    {
-                    // This should be executed only when executing buffered cmds
-                    if(aURI.Find(KNSmlDdfDNSAddrL) >= 0 )
-                    // DNS address 
-                        {
-                        TPtrC8 parentUri = RemoveLastSeg(aURI);
-                        TInt dnsPri = 0;
-                        TBool found = InitializeDNSParamsFromBuffL( parentUri, dnsPri );
-                        UriUtils::TUriHostType dnsAddrTy = UriUtils::HostType(aObject);
-
-                        if (!found )
-                            {
-                            UriUtils::TUriHostType dnsLuidType;
-                            TInt dnsLuidPriority;
-                            if ( LuidToDns(dnsLuidType, dnsLuidPriority, parentLUID ) != KErrNone )
-                                {
-                                if ( dnsAddrTy == UriUtils::EIPv4Host )
-                                    {
-                                    iDnsIpv4Pri = (iDnsIpv4Pri % 2 ) + 1;
-                                    dnsPri = iDnsIpv4Pri;
-                                    }
-                                else if ( dnsAddrTy == UriUtils::EIPv6Host )
-                                    {
-                                    iDnsIpv6Pri = (iDnsIpv6Pri % 2 ) + 1; 
-                                    dnsPri = iDnsIpv6Pri;
-                                    }
-                                }
-                            else 
-                                {
-                                // update
-                                dnsPri = dnsLuidPriority;
-                                }
-
-                            }
-                        if ( dnsPri != 0 )
-                            { 
-                            if ( dnsPri == 1)
-                                {
-                                if ( dnsAddrTy == UriUtils::EIPv4Host )
-                                    {
-                                    qColumn.Set( TPtrC(SERVICE_IP_NAME_SERVER1 ));
-                                    }
-                                else
-                                    {
-                                    qColumn.Set( TPtrC(SERVICE_IP6_NAME_SERVER1 ));
-
-                                    }
-                                }
-                            else
-                                {
-                                if ( dnsAddrTy == UriUtils::EIPv4Host )
-                                    {
-                                    qColumn.Set( TPtrC(SERVICE_IP_NAME_SERVER2 ));
-                                    }
-                                else
-                                    {
-                                    qColumn.Set( TPtrC(SERVICE_IP6_NAME_SERVER2 ));
-
-                                    }
-                                }
-                            tableView->WriteTextL(qColumn, ConvertTo16LC(aObject));
-                            pushed++;
-                            TInt dnsLuid =  DnsToLuid( dnsAddrTy, dnsPri);
-                            iCallBack->SetMappingL(parentUri, SetIntObjectLC( dnsLuid ));
-                            pushed++;
-                            }
-                        else
-                            {
-                            CleanupStack::PopAndDestroy(); // tableView
-                            CleanupStack::PopAndDestroy(pushed); 
-                            iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EError);
-                            _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): Update failed end");
-                            return;
-                            }
-                            
-                        }
-
-                    else
-                        {
-                      if(( serviceType == TPtrC( LAN_SERVICE ) ) && (iField->Compare(KNSmlDdfNAPAddr) == 0 ) )
-                        {
-                          if(!IsValidIPv4AddressL(aObject))
-                              {
-                              iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EInvalidObject);
-                        _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): EInvalidObject end");
-                        CleanupStack::PopAndDestroy(); // tableView
-                                CleanupStack::PopAndDestroy(pushed); 
-                        return;
-                                }
-                                        
-                            }
-                        tableView->WriteTextL(qColumn, ConvertTo16LC(aObject));
-                        pushed++;
-                       
-                        }
-                    // DNSAddrL <> 0.0.0.0 or empty => 
-                    if(aURI.Find(KNSmlDdfDNSAddrL) >= 0 ) /* DNS serviceFlag handling */
-                        {
-                        if( aObject.Match(_L8("fec0:0:0:ffff::1")) == KErrNotFound ||
-                            aObject.Match(_L8("fec0:0:0:ffff::2")) == KErrNotFound )
-                            {
-                            tableView->WriteBoolL(TPtrC(SERVICE_IP6_DNS_ADDR_FROM_SERVER),EFalse);
-                            }
-                        else
-                            {
-                            tableView->WriteBoolL(TPtrC(SERVICE_IP6_DNS_ADDR_FROM_SERVER),ETrue);
-                            }
-                                    
-
-                  }
-                    }
-                TInt putOk = tableView->PutRecordChanges();
-                if ( putOk != KErrNone )
-                    {
-                    TInt retry = KBeginTransRetryCount;
-                    while ( retry > 0 && putOk == KErrLocked )
-                    {
-                        User::After(KBeginTransRetryDelay);
-                        putOk = tableView->PutRecordChanges();
-                        retry--;
-                    }
-                    if(putOk != KErrNone)
-                        {
-                    CleanupStack::PopAndDestroy(); // tableView
-                    CleanupStack::PopAndDestroy(pushed); 
-                    iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EError);
-                    _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): Update failed end");
-                      DBG_ARGS(_S16("CNSmlInternetAdapter::AddLeafObjectL(): Update failed with Code %d"),putOk);
-                    return;
-                        }
-                    }
-                if (aURI.Find(KNSmlDdfNAPName) >= 0 &&
-                    aURI.Find(KNSmlDdfAuthName) <= 0 ) /* NAPName */
-                    {
-                    if(UpdateIAPnameL(iapID2,aObject) != KErrNone )
-                        {
-                        iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EError);
-                        }
-                    }
-        if(serviceReLock)
-          {
-            TInt reclockerr = DoProtectServiceRecordL(iISPId,ETrue);
-                  DBG_ARGS8(_S8("CNSmlInternetAdapter::AddLeafObjectL ,UnProtecting WAPAccessRecord returned code = %d"),reclockerr);
-                  if(reclockerr==KErrNone)
-                    serviceReLock = EFalse; 
-          }
-                }
-            else
-                {
-                CleanupStack::PopAndDestroy(); // tableView
-                CleanupStack::PopAndDestroy(pushed); 
-                iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::ENotFound);
-                _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): ENotFound end");
-                return;
-                }
-
-            CleanupStack::PopAndDestroy(); // tableView
-            }   
-
-        }
-    else if (fType == CNSmlInternetAdapter::EBool)
-        { // UseCB + UseIPSec
-        TUint32 iapID3 = GetAPIdFromURIL(aURI);
-
-        //  IAP-table search serviceType (=Bearer)
-        CCommsDbTableView* boolView = iDatabase->OpenViewMatchingUintLC(TPtrC(IAP),
-                                                                        TPtrC(COMMDB_ID),
-                                                                        iapID3);
-        TInt errorCode = boolView->GotoFirstRecord();
-        
-        TBuf<KCommsDbSvrMaxFieldLength> serviceType;
-
-        errorCode = boolView->GotoFirstRecord();
-    
-        // Read serviceType from (IAP)
-        if ( errorCode == KErrNone )
-            {
-            boolView->ReadTextL(TPtrC(IAP_SERVICE_TYPE), serviceType);
-            boolView->ReadTextL(TPtrC(IAP_SERVICE_TYPE), iProxyServiceType); // for locking
-            boolView->ReadUintL(TPtrC(IAP_SERVICE), iISPId);
-            }
-        else
-            {
-            CleanupStack::PopAndDestroy(); // boolView
-            CleanupStack::PopAndDestroy(pushed); 
-            iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::ENotFound);
-            _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): ENotFound end");
-            return;
-            }
-
-        CleanupStack::PopAndDestroy(); // boolView
-
-        qTable.Set(serviceType);
-        TBool ret = GetAPField(qTable,qColumn);
-        if(!ret)
-            {
-            CleanupStack::PopAndDestroy(pushed); 
-            iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EInvalidObject);
-            _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): EInvalidObject end");
-            return;
-            }
-
-
-        CCommsDbTableView* tableView = iDatabase->OpenViewMatchingUintLC(serviceType,
-                                                                         TPtrC(COMMDB_ID),
-                                                                         iISPId);
-
-        errorCode = tableView->GotoFirstRecord();
-
-        if ( errorCode == KErrNone )
-            {
-            TBool serviceReLock = EFalse;
-            if(IsServiceRecordLockedL(iISPId))
-      {
-            _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): apaccesspoint record is LOCKED");
-            TInt reclockerr = ( (CCommsDbProtectTableView*) tableView )->UnprotectRecord(); 
-            DBG_ARGS8(_S8("CNSmlInternetAdapter::AddLeafObjectL ,UnProtecting WAPAccessRecord returned code = %d"),reclockerr);
-            if(reclockerr==KErrNone)
-                serviceReLock = ETrue;
-      }
-      else
-      {
-            _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): apaccesspoint record is not write protected"); 
-      }    
-            if(tableView->UpdateRecord()!=KErrNone)
-                {
-                //database locked
-                CleanupStack::PopAndDestroy(); // tableView
-                CleanupStack::PopAndDestroy(pushed); 
-                iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EError);
-                _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): Update failed end");
-                return;
-                }
-            TBool tObject = EFalse;
-
-            if(aObject.CompareF(KNSmlDmApValTrue) == 0)
-                {
-                tObject = ETrue; 
-                }
-            if(aURI.Right(10).Compare(KNSmlDdfUsePTxtLog)==0)
-                {
-                tObject=!tObject;
-                }
-      if( qColumn.Match(TPtrC(SERVICE_IP_ADDR_FROM_SERVER)) != KErrNotFound )
-        {
-        if ( serviceType == TPtrC( LAN_SERVICE ) ) // Is WLAN service
-            {
-            if( tObject )
-              {
-                  tableView->WriteTextL( TPtrC(SERVICE_CONFIG_DAEMON_MANAGER_NAME), 
-                             KDaemonManagerName );
-              tableView->WriteTextL( TPtrC(SERVICE_CONFIG_DAEMON_NAME), 
-                           KConfigDaemonName );
-              }
-            else
-              {
-                  tableView->WriteTextL( TPtrC(SERVICE_CONFIG_DAEMON_MANAGER_NAME), KNullDesC );
-              tableView->WriteTextL( TPtrC(SERVICE_CONFIG_DAEMON_NAME), KNullDesC );
-              }
-            }
-        }  // Is WLAN service
-
-            tableView->WriteBoolL(qColumn, tObject );
-            tableView->PutRecordChanges();
-            CleanupStack::PopAndDestroy(); // tableView
-            if(serviceReLock)
-        {
-          TInt reclockerr = DoProtectServiceRecordL(iISPId,ETrue);
-                DBG_ARGS8(_S8("CNSmlInternetAdapter::AddLeafObjectL ,UnProtecting ServiceRecord returned code = %d"),reclockerr);
-                if(reclockerr==KErrNone)
-                  serviceReLock = EFalse; 
-        }
-            }
-        else
-            {
-            tableView->CancelRecordChanges();
-            CleanupStack::PopAndDestroy(); // tableView
-            CleanupStack::PopAndDestroy(pushed); 
-            iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EError);
-            _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): EError end");
-            return;
-            }
-        }
-    else if (fType == CNSmlInternetAdapter::EInt)
-        { // UsePTxtLog + PortNbr + seamlessness and metadata
-        iObject = GetIntObject8(aObject);
-  
-            if(aURI.Find(KNSmlDdfIAPSeamlessness) >= 0 )
-                {
-               // TUint32 setSeam = GetIntObject8(aObject);
-                TUint32 apMetaID = GetAPIdFromURIL(aURI);
-                SetIAPSeamlessnessL(apMetaID,iObject,aStatusRef);
-                return;
-                }
-             
-             else if (aURI.Find(KNSmlDdfIAPMetaData)  >= 0)
-                {
-              //  TUint32 setMeta = GetIntObject8(aObject);
-                TUint32 apMetaID = GetAPIdFromURIL(aURI);
-                SetIAPMetaDataL(apMetaID,iObject,aStatusRef);
-                return;
-                }
-            
-    
-        if (aURI.Find(KNSmlDdfUsePTxtLog) >= 0)
-            {
-            TUint32 iapID4 = GetAPIdFromURIL(aURI);
-
-            //  IAP-table search serviceType (=Bearer)
-            CCommsDbTableView* iapView4 = iDatabase->OpenViewMatchingUintLC(TPtrC(IAP),
-                                                                            TPtrC(COMMDB_ID),
-                                                                            iapID4);
-            TInt errorCode = iapView4->GotoFirstRecord();
-        
-            TBuf<KCommsDbSvrMaxFieldLength> serviceType;
-
-            errorCode = iapView4->GotoFirstRecord();
-    
-            // Read serviceType from (IAP)
-            if ( errorCode == KErrNone )
-                {
-                iapView4->ReadTextL(TPtrC(IAP_SERVICE_TYPE), serviceType);
-                iapView4->ReadTextL(TPtrC(IAP_SERVICE_TYPE), iProxyServiceType); // for locking
-                iapView4->ReadUintL(TPtrC(IAP_SERVICE), iISPId);
-                CleanupStack::PopAndDestroy(); // iapView4
-                }
-            else
-                {
-                CleanupStack::PopAndDestroy(); // iapView4
-                CleanupStack::PopAndDestroy(pushed); 
-                iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::ENotFound);
-                _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): ENotFound end");
-                return;
-                }
-
-            CCommsDbTableView* tableView = iDatabase->OpenViewMatchingUintLC(serviceType,
-                                                                             TPtrC(COMMDB_ID),
-                                                                             iISPId);
-
-            errorCode = tableView->GotoFirstRecord();
-
-            if ( errorCode == KErrNone )
-                {
-                TBool serviceReLock = EFalse;
-              if(IsServiceRecordLockedL(iISPId))
-        {
-          
-              _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): apaccesspoint record is LOCKED");
-              TInt reclockerr = ( (CCommsDbProtectTableView*) tableView )->UnprotectRecord();
-              DBG_ARGS8(_S8("CNSmlInternetAdapter::AddLeafObjectL ,UnProtecting WAPAccessRecord returned code = %d"),reclockerr);
-              if(reclockerr==KErrNone)
-                  serviceReLock = ETrue;
-        }
-        else
-        { 
-              _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): apaccesspoint record is not write protected"); 
-        }    
-                if(tableView->UpdateRecord()!=KErrNone)
-                    {
-                    //database locked
-                    CleanupStack::PopAndDestroy(); // tableView
-                    CleanupStack::PopAndDestroy(pushed); 
-                    iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EError);
-                    _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): Update failed end");
-                    return;
-                    }
-                TBool tObject = EFalse;
-                if(iObject) 
-                    {
-                    tObject = ETrue; // <> 0
-                    }
-                tableView->WriteBoolL(TPtrC(SERVICE_DISABLE_PLAIN_TEXT_AUTH), tObject );
-                tableView->PutRecordChanges();
-        if(serviceReLock)
-          {
-              DoProtectIAPRecordL(iapID4,ETrue);
-            TInt reclockerr = DoProtectServiceRecordL(iISPId,ETrue);
-                  DBG_ARGS8(_S8("CNSmlInternetAdapter::AddLeafObjectL ,UnProtecting ServiceRecord returned code = %d"),reclockerr);
-                  if(reclockerr==KErrNone)
-                    serviceReLock = EFalse; 
-          }
-                CleanupStack::PopAndDestroy(); // tableView
-                }
-            else
-                {
-                tableView->CancelRecordChanges();
-                CleanupStack::PopAndDestroy(); // tableView
-                CleanupStack::PopAndDestroy(pushed); 
-                iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EError);
-                _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): EError end");
-                return;
-                }
-            }
-        else if (aURI.Find(KNSmlDdfPortNbr) >= 0)
-            {
-            if(GetProxyIdL(aURI))
-                {
-                iProxyISP = GetAPIdFromURIL(aURI);
-
-                CCommsDbTableView* tableView = iDatabase->OpenViewMatchingUintLC(TPtrC(PROXIES),
-                                                                                 TPtrC(COMMDB_ID),
-                                                                                 iProxyId);
-                TInt errorCode = tableView->GotoFirstRecord();
-          TBool proxyReLock = EFalse;
-                // Read all columns needed.
-                if ( errorCode == KErrNone )
-                    {
-          if(IsProxyRecordLockedL(iProxyId))
-          {
-                _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): proxy record is LOCKED");  
-        		TInt reclockerr = ((CCommsDbProtectTableView*)tableView)->UnprotectRecord();
-                DBG_ARGS8(_S8("CNSmlInternetAdapter::AddLeafObjectL ,UnProtecting Proxy Record returned code = %d"),reclockerr);
-                if(reclockerr==KErrNone)
-                      proxyReLock = ETrue;
-          }
-          else
-          {
-                _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): apaccesspoint record is not write protected"); 
-          }
-                    if(tableView->UpdateRecord()!=KErrNone)
-                        {
-                        //database locked
-                        CleanupStack::PopAndDestroy(); // tableView
-                        CleanupStack::PopAndDestroy(pushed); 
-                        iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EError);
-                        _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): Update failed end");
-                        return;
-                        }
-                    iObject = GetIntObject8(aObject);
-
-                    tableView->WriteUintL(TPtrC(PROXY_PORT_NUMBER), iObject);
-                    }
-                tableView->PutRecordChanges();
-                if(proxyReLock)
-          {
-            TInt reclockerr = DoProtectProxyRecordL(iProxyId,ETrue);
-                  DBG_ARGS8(_S8("CNSmlInternetAdapter::AddLeafObjectL ,UnProtecting Proxy Record returned code = %d"),reclockerr);
-                  if(reclockerr==KErrNone)
-                    proxyReLock = EFalse; 
-          }
-                CleanupStack::PopAndDestroy(); // tableView
-                }
-            else
-                {
-                CleanupStack::PopAndDestroy(pushed); 
-                iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EError);
-                _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): PortNbr Error end");
-                return;
-                }
-            }
-        else
-            {
-            CleanupStack::PopAndDestroy(pushed); 
-            iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EError);
-            _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): PortNbr Error end");
-            return;
-            }
-
-        }
-
-    else if (fType == CNSmlInternetAdapter::EWap)
-        { // Startpg + PxAuthId + PxAuthPW (WAP-settings) (BasAuthId + BasAuthPW)
-        TUint32 iapID5 = GetAPIdFromURIL(aURI);
-        //
-        // Without iapID5 no insert possible, set on buffer
-        //
-        if(iapID5 < 1)
-            {
-            AddLeafBufferL(aURI,aParentLUID,aObject,aType,aStatusRef);
-            _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): end");
-            return;
-            }
-        
-        GetAPField(qTable,qColumn);
-        if(WapAPExistsL(iapID5)) 
-            {  // Update handled
-            TBool iapReLock = EFalse;
-            if(FeatureManager::FeatureSupported(KFeatureIdSapPolicyManagement))
-                {
-                TBool apEnforce=EFalse;
-                TRAPD(eError,apEnforce=CheckEnforcementL())
-                DBG_ARGS8(_S8("CNSmlInternetAdapter::AddLeafObjectL(): EError %d , APEnforcement is %d"),eError,apEnforce);
-                if(eError==KErrNone && apEnforce)
-                    {
-                    DoLockIAPTablesL(EFalse);
-                    iWAPRelock = ETrue;
-                    }
-                }
-            if(IsIAPRecordLockedL(iapID5))
-                {
-                _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): apaccesspoint record is LOCKED");  
-                TInt reclockerr = DoProtectIAPRecordL(iapID5,EFalse);
-                DBG_ARGS8(_S8("CNSmlInternetAdapter::AddLeafObjectL ,UnProtecting IAPAccessRecord returned code = %d"),reclockerr);
-                if(reclockerr==KErrNone)
-                    iapReLock = ETrue;
-                }
-            else
-                {
-                _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): apaccesspoint record is not write protected"); 
-                }
-            CCommsDbTableView* wapView;
-            TBool wapaccesspointTableLocked = EFalse;
-
-            if(qColumn == TPtrC(WAP_START_PAGE))
-                {
-                _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): record to be added WAP_START_PAGE, check for lock status");
-                DBG_ARGS8(_S8("CNSmlInternetAdapter::AddLeafObjectL Get WapAccessPoint record access for ID = %d"),iWapId);
-                if(IsWAPAccessPointRecordLockedL(iWapId))
-                    {
-                    _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): wapaccesspoint record is LOCKED"); 
-                    TInt reclockerr = DoProtectWAPAccessRecordL(iWapId,EFalse);
-                    DBG_ARGS8(_S8("CNSmlInternetAdapter::AddLeafObjectL ,UnProtecting IAPAccessRecord returned code = %d"),reclockerr);
-                    if(reclockerr==KErrNone)
-                    wapaccesspointTableLocked = ETrue;
-                    }
-                else
-                    {
-                    _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): wapaccesspoint record is not write protected");  
-                    }
-                wapView = iDatabase->OpenViewMatchingUintLC(TPtrC(WAP_ACCESS_POINT),
-                                                            TPtrC(COMMDB_ID),
-                                                            iWapId);
-                pushed++;
-                }
-            else // Other WAP-data
-                {
-                wapView = iDatabase->OpenViewMatchingUintLC(TPtrC(WAP_IP_BEARER),
-                                                            TPtrC(WAP_ACCESS_POINT_ID),
-                                                            iWapId);
-                pushed++;
-                }
-
-            TInt errorCode = wapView->GotoFirstRecord();
-    
-            // Read all columns needed.
-            if ( errorCode == KErrNone )
-                {
-                if(wapView->UpdateRecord()!=KErrNone)
-                    {
-                    //database locked
-                    CleanupStack::PopAndDestroy(pushed); 
-                    iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EError);
-                    _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): Wapview Update failed end");
-                    if(wapaccesspointTableLocked)
-                      {
-                      _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): wapaccesspoint record to be locked again "); 
-                      DoProtectWAPAccessRecordL(iWapId,ETrue);
-                      wapaccesspointTableLocked = EFalse; 
-                      }
-                    if(FeatureManager::FeatureSupported(KFeatureIdSapPolicyManagement))
-                        {
-                        if(iWAPRelock)
-                            {
-                            DoLockIAPTablesL(ETrue);
-                            iWAPRelock = EFalse;
-                            }
-                        }
-                    if(iapReLock)
-                        {
-                        TInt reclockerr = DoProtectIAPRecordL(iapID5,ETrue);
-                        DBG_ARGS8(_S8("CNSmlInternetAdapter::AddLeafObjectL ,UnProtecting WAPAccessRecord returned code = %d"),reclockerr);
-                        if(reclockerr==KErrNone)
-                            iapReLock = EFalse; 
-                        }
-                        return;
-                    }
-
-                if(qColumn == TPtrC(WAP_PROXY_PORT))
-                    {
-                    TBool security = EFalse; // => 9200 + 9201, ETrue 9202 + 9203
-                    TUint32 object32;
-                    TPtrC object16 = ConvertTo16LC(aObject);
-                    pushed++;
-                    if(object16.Match(KWappPort9200) != KErrNotFound )
-                        {
-                        object32 = KWAPP_PORT_9200; // wappdef.h
-                        }
-                    else if(object16.Match(KWappPort9201) != KErrNotFound )
-                        {
-                        object32 = KWAPP_PORT_9201; 
-                        }
-                    else if(object16.Match(KWappPort9202) != KErrNotFound )
-                        {
-                        object32 = KWAPP_PORT_9202; 
-                        security = ETrue;
-                        }
-                    else if(object16.Match(KWappPort9203) != KErrNotFound )
-                        {
-                        object32 = KWAPP_PORT_9203; 
-                        security = ETrue;
-                        }
-                    else
-                        {
-                        wapView->CancelRecordChanges();
-                        CleanupStack::PopAndDestroy(pushed);
-                        iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EError);
-                        _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): EError end");
-                        if(FeatureManager::FeatureSupported(KFeatureIdSapPolicyManagement))
-                            {
-                            if(iWAPRelock)
-                                {
-                                DoLockIAPTablesL(ETrue);
-                                iWAPRelock = EFalse;
-                                }
-                            }
-                        if(iapReLock)
-                            {
-                            TInt reclockerr = DoProtectIAPRecordL(iapID5,ETrue);
-                            DBG_ARGS8(_S8("CNSmlInternetAdapter::AddLeafObjectL ,UnProtecting IAPAccessRecord returned code = %d"),reclockerr);
-                            if(reclockerr==KErrNone)
-                                iapReLock = EFalse; 
-                            }
-                            return;
-                        }
-                    wapView->WriteUintL(qColumn, object32);
-                    wapView->WriteBoolL(TPtrC(WAP_SECURITY), security );
-                    }
-                else
-                    {
-                    wapView->WriteTextL(TPtrC(qColumn),ConvertTo16LC(aObject));
-                    pushed++;
-                    }
-                }
-            wapView->PutRecordChanges();
-            _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): wapaccesspoint record Changes DONE successfully ");  
-            if(wapaccesspointTableLocked)
-            {
-              _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): wapaccesspoint record to be locked again "); 
-              TInt reclockerr = DoProtectWAPAccessRecordL(iWapId,ETrue);  
-              DBG_ARGS8(_S8("CNSmlInternetAdapter::AddLeafObjectL ,Protecting WAPAccessRecord %d , returned code = %d"),iWapId,reclockerr);
-              wapaccesspointTableLocked = EFalse;
-            }
-            if(FeatureManager::FeatureSupported(KFeatureIdSapPolicyManagement))
-                {
-                if(iWAPRelock)
-                    {
-                    DoLockIAPTablesL(ETrue);
-                    iWAPRelock = EFalse;
-                    }
-                }
-            if(iapReLock)
-                {
-                TInt reclockerr = DoProtectIAPRecordL(iapID5,ETrue);
-                DBG_ARGS8(_S8("CNSmlInternetAdapter::AddLeafObjectL ,UnProtecting WAPAccessRecord returned code = %d"),reclockerr);
-                if(reclockerr==KErrNone)
-                    iapReLock = EFalse; 
-                }
-            CleanupStack::PopAndDestroy(pushed);
-            pushed = 0;
-            }
-        else
-            { // Insert handled
-            CCommsDbTableView* insView;
-            TInt wapInitOK = KErrCancel;
-            TBool iapReLock = EFalse;
-            
-            if(FeatureManager::FeatureSupported(KFeatureIdSapPolicyManagement))
-                {
-                TBool apEnforce=EFalse;
-                TRAPD(eError,apEnforce=CheckEnforcementL())
-                DBG_ARGS8(_S8("CNSmlInternetAdapter::AddLeafObjectL(): EError %d , APEnforcement is %d"),eError,apEnforce);
-                if(eError==KErrNone && apEnforce)
-                    {
-                    DoLockIAPTablesL(EFalse);
-                    iWAPRelock = ETrue;
-                    }
-                }
-        if(iapReLock)
-            {
-            TInt reclockerr = DoProtectIAPRecordL(iapID5,ETrue);
-            DBG_ARGS8(_S8("CNSmlInternetAdapter::AddLeafObjectL ,UnProtecting WAPAccessRecord returned code = %d"),reclockerr);
-            if(reclockerr==KErrNone)
-                iapReLock = EFalse; 
-            }
-            insView = iDatabase->OpenTableLC(TPtrC(WAP_ACCESS_POINT));
-            iWapId = 0;
-            wapInitOK = insView->InsertRecord(iWapId);
-            if(wapInitOK == KErrNone)
-                {
-                iWAPAccessPoint.Zero();
-                iWapUserName.Zero();
-                iWapPassword.Zero();
-
-                if(qColumn == TPtrC(WAP_START_PAGE))
-                    {
-                    iWAPAccessPoint = aObject;
-                    }
-                else if(qColumn == TPtrC(WAP_PROXY_LOGIN_NAME))
-                    {
-                    iWapUserName = aObject;
-                    }
-                else if(qColumn == TPtrC(WAP_PROXY_LOGIN_PASS))
-                    {
-                    iWapPassword = aObject;
-                    }
-
-                iWapBearer = TPtrC(WAP_IP_BEARER);
-                iWapName   = FirstURISeg(aURI); // Name needed !!!
-
-                wapInitOK = InitializeWAPIAPL( insView, iIAPName );
-                if( wapInitOK == KErrNone )
-                    {
-                    insView->PutRecordChanges();
-                    CleanupStack::PopAndDestroy(); // insView
-
-                    CCommsDbTableView* updView;
-                    TUint32 iWapId2 = 0;
-                    iISPId = iapID5; // IAP number set
-                    updView = iDatabase->OpenTableLC(TPtrC(WAP_IP_BEARER));
-                    if(updView->InsertRecord(iWapId2) == KErrNone )
-                        {
-                        wapInitOK = InitializeWAPL( updView );
-                        }
-                    else
-                        {
-                        wapInitOK = KErrGeneral;
-                        }
-                    if( wapInitOK == KErrNone )
-                        {
-                        if( !PxExistsL(iapID5) ) 
-                            {
-
-                            // Set mapping-data
-
-                            TPtrC8 addURI = GetAddURISeg(aURI,KNSmlDdfStartpg);
-                            TBuf8<16> addLUID;
-                            _LIT8(KFormat,"%d");    
-                            addLUID.Format(KFormat,iapID5); 
-                            iCallBack->SetMappingL(addURI,addLUID);
-                            }
-                        else if( !NAPDefExistsL(iapID5) ) 
-                            {
-
-                            // Set mapping-data
-
-                            TPtrC8 addURI = GetAddURISeg(aURI,KNSmlDdfStartpg);
-                            TBuf8<16> addLUID;
-                            _LIT8(KFormat,"%d");    
-                            addLUID.Format(KFormat,iapID5); 
-                            iCallBack->SetMappingL(addURI,addLUID);
-                            }
-
-                        updView->PutRecordChanges();
-                        CleanupStack::PopAndDestroy(); // updView
-                        CleanupStack::PopAndDestroy(pushed); 
-                        iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EOk);
-                        
-                        if(FeatureManager::FeatureSupported(KFeatureIdSapPolicyManagement))
-                            {
-                            if(iWAPRelock)
-                                {
-                                DoLockIAPTablesL(ETrue);
-                                iWAPRelock = EFalse;
-                                }
-                            }
-                        if(iapReLock)
-                            {
-                            TInt reclockerr = DoProtectIAPRecordL(iapID5,ETrue);
-                            DBG_ARGS8(_S8("CNSmlInternetAdapter::AddLeafObjectL ,UnProtecting IAPAccessRecord returned code = %d"),reclockerr);
-                            if(reclockerr==KErrNone)
-                                iapReLock = EFalse; 
-                            }
-                            _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): EOk end");
-                            return;
-                        }
-                    else
-                        {
-                        CleanupStack::PopAndDestroy(); // updView
-                        CleanupStack::PopAndDestroy(pushed); 
-                        iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EError);
-                        
-                        if(FeatureManager::FeatureSupported(KFeatureIdSapPolicyManagement))
-                            {
-                            if(iWAPRelock)
-                                {
-                                DoLockIAPTablesL(ETrue);
-                                iWAPRelock = EFalse;
-                                }
-                            }
-                        if(iapReLock)
-                            {
-                            TInt reclockerr = DoProtectIAPRecordL(iapID5,ETrue);
-                            DBG_ARGS8(_S8("CNSmlInternetAdapter::AddLeafObjectL ,UnProtecting IAPAccessRecord returned code = %d"),reclockerr);
-                            if(reclockerr==KErrNone)
-                                iapReLock = EFalse; 
-                            }
-                            _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): EError end");
-                            return;
-                        }
-                    }
-                else
-                    {
-                    insView->CancelRecordChanges();
-                    CleanupStack::PopAndDestroy(); // insView
-                    CleanupStack::PopAndDestroy(pushed); 
-                    iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EError);
-                    
-                    if(FeatureManager::FeatureSupported(KFeatureIdSapPolicyManagement))
-                        {
-                        if(iWAPRelock)
-                            {
-                            DoLockIAPTablesL(ETrue);
-                            iWAPRelock = EFalse;
-                            }
-                        }
-                   if(iapReLock)
-                       {
-                       TInt reclockerr = DoProtectIAPRecordL(iapID5,ETrue);
-                       DBG_ARGS8(_S8("CNSmlInternetAdapter::AddLeafObjectL ,UnProtecting IAPAccessRecord returned code = %d"),reclockerr);
-                       if(reclockerr==KErrNone)
-                           iapReLock = EFalse; 
-                       }
-                        _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): EError end");
-                        return;
-                        }
-                    }
-                else
-                    {
-                    CleanupStack::PopAndDestroy(); // insView
-                    CleanupStack::PopAndDestroy(pushed); 
-                    iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EError);
-                    if(FeatureManager::FeatureSupported(KFeatureIdSapPolicyManagement))
-                        {
-                        if(iWAPRelock)
-                            {
-                            DoLockIAPTablesL(ETrue);
-                            iWAPRelock = EFalse;
-                            }
-                        }
-                    if(iapReLock)
-                        {
-                        TInt reclockerr = DoProtectIAPRecordL(iapID5,ETrue);
-                        DBG_ARGS8(_S8("CNSmlInternetAdapter::AddLeafObjectL ,UnProtecting IAPAccessRecord returned code = %d"),reclockerr);
-                        if(reclockerr==KErrNone)
-                            iapReLock = EFalse; 
-                        }
-                    _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): EError end");
-                    return;
-                    }
-                }
-        }
-    else if ( fType == CNSmlInternetAdapter::ESpec )
-        { // BearerL + NoPxForL + IAPService + Direction
-        if (aURI.Find(KNSmlDdfDirection) >= 0)
-            {
-            _LIT8(KDirection,"Outgoing");
-            if(KDirection().Find(aObject) != KErrNotFound)
-                {
-                iDirection = ECommDbConnectionDirectionOutgoing;
-                }
-            else
-                {
-                iDirection = ECommDbConnectionDirectionIncoming;
-                if(iBearer == TPtrC(OUTGOING_GPRS))
-                    {
-                    iBearer = TPtrC(INCOMING_GPRS);
-                    }
-                }
-            }
-        else if (aURI.Find(KNSmlDdfIAPService) >= 0)
-            {
-            CleanupStack::PopAndDestroy(pushed); 
-            iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EError);
-            _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): EError end");
-            return;
-            }
-        else if (aURI.Find(KNSmlDdfNoPxForL) >= 0) /* No proxies used field handling */
-            {
-            TBool proxyFound = GetProxyIdL(aURI);
-            if(!proxyFound)
-                {
-                iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EError);
-                _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): EError end");
-                CleanupStack::PopAndDestroy(pushed); 
-                return;
-                }
-
-            CCommsDbTableView* specView = iDatabase->OpenViewMatchingUintLC(TPtrC(PROXIES),
-                                                                            TPtrC(COMMDB_ID),
-                                                                            iProxyId);
-            TInt errorCode = specView->GotoFirstRecord();
-    
-
-            if ( errorCode == KErrNone )
-                {
-                TBool proxyReLock = EFalse;
-        if(IsProxyRecordLockedL(iProxyId))
-        {
-              _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): apaccesspoint record is LOCKED");  
-        	  TInt reclockerr = ((CCommsDbProtectTableView*)specView)->UnprotectRecord();
-              DBG_ARGS8(_S8("CNSmlInternetAdapter::AddLeafObjectL ,UnProtecting ProxyAccessRecord returned code = %d"),reclockerr);
-              if(reclockerr==KErrNone)
-                    proxyReLock = ETrue;
-        }
-        else
-        {
-              _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): apaccesspoint record is not write protected"); 
-        }
-                if(specView->UpdateRecord()==KErrNone)
-                    {
-                    //database not locked
-                    specView->WriteLongTextL(TPtrC(PROXY_EXCEPTIONS), ConvertTo16LC(aObject));
-                    specView->PutRecordChanges();
-                    iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EOk);
-                    CleanupStack::PopAndDestroy(); // ConvertTo16LC
-                    }
-                else
-                    {
-                    iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EError);
-                    }
-        if(proxyReLock)
-          {
-            TInt reclockerr = DoProtectProxyRecordL(iProxyId,ETrue);
-                  DBG_ARGS8(_S8("CNSmlInternetAdapter::AddLeafObjectL ,UnProtecting ProxyAccessRecord returned code = %d"),reclockerr);
-                  if(reclockerr==KErrNone)
-                    proxyReLock = EFalse; 
-                    }
-                }
-            else
-                {
-                iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EError);
-                }
-            CleanupStack::PopAndDestroy(); // specView
-
-            CleanupStack::PopAndDestroy(pushed); 
-            _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): EError end");
-            return;
-            }
-        else if (aURI.Find(KNSmlDdfBearerL) >= 0) /* Bearer handling */
-            {
-            if (aObject.Match(KNSmlDmApValGsmGprs) != KErrNotFound)
-                {
-                if(iDirection == ECommDbConnectionDirectionIncoming)
-                    {
-                    iBearer = TPtrC(INCOMING_GPRS);
-                    }
-                else
-                    {
-                    iBearer = TPtrC(OUTGOING_GPRS);
-                    }
-                }
-
-            else if (aObject.Match(KNSmlDmApVal3Gppps) != KErrNotFound)
-                {
-                i3GPPPS = ETrue;
-                if(iDirection == ECommDbConnectionDirectionIncoming)
-                    {
-                    iBearer = TPtrC(INCOMING_GPRS);
-                    }
-                else
-                    {
-                    iBearer = TPtrC(OUTGOING_GPRS);
-                    }
-                }
-            else if (aObject.Match(KNSmlDmApValVpn) != KErrNotFound) 
-                {
-                iBearer = TPtrC(VPN_SERVICE);
-                }
-            else if ( (aObject.Match(KNSmlDmApValWlan) != KErrNotFound )
-                    && iWlanSupported ) 
-                {
-                iBearer = TPtrC(LAN_SERVICE);
-                }
-            else
-                {
-                CleanupStack::PopAndDestroy(pushed); 
-                iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EError);
-                _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): UNKNOWN Bearer Error end");
-                return;
-                }
-            }
-        else if (aURI.Find( KNSmlDdfNAPName ) >= 0)
-            {
-            iIAPName.Copy( aObject );
-            TUint32 iapID2 = GetAPIdFromURIL(aURI);
-            if( iapID2 > 0 && UpdateIAPnameL(iapID2,aObject) != KErrNone )
-                {
-                CleanupStack::PopAndDestroy(pushed);
-                iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EError);
-                return;
-                }
-            }
-        }
-
-    CleanupStack::PopAndDestroy(pushed);
-    pushed = 0; 
-
-//  Update CommsDB IAP + insert iBearer Table
-
-    if( IsInsertAllowedL() && iLeafType == EDMAdd && fType == CNSmlInternetAdapter::ESpec)  //iIAPExists  
-        {
-        TInt initOK = KErrCancel;
-
-        iISPId = GetMaxIdL() + 1;  // For new data
-
-        SaveIAPDataL(aURI); // Level 1 Mapping inside
-
-        CCommsDbTableView* newAPView;
-
-        newAPView = iDatabase->OpenTableLC(iBearer);
-        // 3GPPPS  = OUTGOING/INCOMING_GPRS
-        if (iBearer == TPtrC(OUTGOING_GPRS) ||
-            iBearer == TPtrC(INCOMING_GPRS))
-            {
-            if(newAPView->InsertRecord(iISPId)==KErrNone)
-                {
-                initOK = InitializeGPRSL(newAPView);
-                }
-            else
-                {
-                initOK = KErrGeneral;
-                }
-            }
-
-        else if(iBearer == TPtrC(VPN_SERVICE) ) 
-            {
-            if(newAPView->InsertRecord(iISPId)==KErrNone)
-                {
-                initOK = InitializeVPNServiceL(newAPView);
-                }
-            else
-                {
-                initOK = KErrGeneral;
-                }
-            }
-        else if( ( iBearer == TPtrC(LAN_SERVICE) ) && iWlanSupported ) 
-            {
-            if(newAPView->InsertRecord(iISPId)==KErrNone)
-                {
-                initOK = InitializeLANServiceL(newAPView);
-                }
-            else
-                {
-                initOK = KErrGeneral;
-                }
-            }
-        else
-            {
-            initOK = KErrCancel;
-            }
-
-        if ( initOK == KErrNone)
-            {
-            TUint32 newId = 0;
-            newAPView->PutRecordChanges();
-            newAPView->ReadUintL(TPtrC(COMMDB_ID), newId);
-
-            // To update right Id
-
-            iISPId = newId;
-
-            SaveIAPDataL(aURI);
-            
-            TUint32 iapID2 = GetAPIdFromURIL(aURI);
-            UpdateIAPnameL( iapID2, iIAPName );
-            //
-            // Set mapping-data (levels 2 and 3 )
-            //
-            TPtrC8 addURI = GetAddURISeg(aURI,KNSmlDdfNAPDef);
-
-            TBuf8<16> addLUID;
-            _LIT8(KFormat,"%d");    
-            addLUID.Format(KFormat,newId);  
-
-            // Also NAPDef  (level 2)
-            iCallBack->SetMappingL(addURI,addLUID);
-            DBG_ARGS8(_S8("AP:level2 URI - <%S> <%S> <%d>"), &addURI, &addLUID, newId );
-
-            // Also BearerL (level 3)
-            TPtrC8 addURI2 = GetAddURISeg(aURI,KNSmlDdfBearer);
-            if ( i3GPPPS )
-                {
-                newId = KNSmlAp3gpppsLowerBase+newId;
-                addLUID.Format(KFormat,newId);
-                i3GPPPS = EFalse;
-                }
-            iCallBack->SetMappingL(addURI2,addLUID);
-            DBG_ARGS8(_S8("AP:level3 URI - <%S> <%S> <%d>"), &addURI2, &addLUID, newId );
-            }
-        else
-            {
-            if(initOK==KErrCancel)
-                {
-                newAPView->CancelRecordChanges();
-                }
-            CleanupStack::PopAndDestroy(newAPView);
-            CleanupStack::PopAndDestroy(pushed);
-            iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EError);
-            _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): EError end");
-            return;
-            }
-
-        CleanupStack::PopAndDestroy(newAPView); 
-        }
-    else if(IsInsertAllowedL() && 
-            iLeafType == EDMAdd &&
-            aURI.Find(KNSmlDdfBearerL) >= 0 )
-
-        {
-        CleanupStack::PopAndDestroy(pushed);
-        iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EAlreadyExists);
-        _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): EAlreadyExists BearerL end");
-        return;
-        }
-    CleanupStack::PopAndDestroy(pushed);
-    iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EOk);
-    _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): OK end");
-    return;
-    }
-
-//------------------------------------------------------------------------------
-// CNSmlInternetAdapter::UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, const TDesC8& aObject, const TDesC8& aType )
-//------------------------------------------------------------------------------
-void CNSmlInternetAdapter::UpdateLeafObjectL( const TDesC8& aURI, 
-                                              const TDesC8& aLUID, 
-                                              const TDesC8& aObject, 
-                                              const TDesC8& aType, 
-                                              const TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlInternetAdapter::UpdateLeafObjectL(): begin");
-
-    DBG_ARGS8(_S8("AP:update aURI UpdateLeafObjectL   - %S - %S"), &aURI, &aLUID);
-    DBG_ARGS8(_S8("AP:Object %S"), &aObject);
-    if( iTransactionCommitted )
-        {               
-        TInt dberr = iDatabase->BeginTransaction();
-        if( dberr == KErrLocked )
-            {
-            _DBG_FILE("UpdateLeafObjectL: CommsDat was locked.");
-            TInt retry = KBeginTransRetryCount;            
-            while ( retry > 0 && dberr == KErrLocked )
-                {
-                User::After(KBeginTransRetryDelay);
-                _DBG_FILE("UpdateLeafObjectL: Slept 1 second. Try again");
-                dberr = iDatabase->BeginTransaction();
-                retry--;
-                }
-            if(dberr != KErrNone)
-                {        
-                _DBG_FILE("CNSmlInternetAdapter: BeginTransaction failed completely.");
-                User::Leave( dberr ); 
-                }           
-            }        
-        iTransactionCommitted = EFalse;
-        }  
-    if ( ( aURI.Match(_L8("*/WLAN*" )) != KErrNotFound ) && iWlanSupported )
-        {
-        AddLeafBufferL( aURI, aLUID, aObject, aType, aStatusRef, ETrue );
-        iDatabase->CommitTransaction();
-        iTransactionCommitted = ETrue;
-        _DBG_FILE("CNSmlInternetAdapter::UpdateLeafObjectL(): WLAN end");
-
-        return;
-        }
-//
-//  No direct update allowed only update as add
-//
-    if( aLUID.Length() > 0 &&
-            aURI.Find(KNSmlDdfNAPDef) >= 0 )
-        /*( aURI.Find(KNSmlDdfBearerL)   >= 0 ||
-          aURI.Find(KNSmlDdfDirection) >= 0 || 
-          aURI.Find(KNSmlDdfNAPName) >= 0 ) */ 
-        {
-        _DBG_FILE("Bearer | direction CNSmlInternetAdapter::UpdatelaefObject ( ): EError end");
-
-         AddLeafBufferL( aURI, aLUID, aObject, aType, aStatusRef, EFalse );
-         iDatabase->CommitTransaction();
-         iTransactionCommitted = ETrue;
-         return;
-        }
-    
-    iLeafType = EDMUpdate;
-
-    TRAP_IGNORE(AddLeafObjectL( aURI, aLUID, aObject, aType , aStatusRef ));
-    iDatabase->CommitTransaction();
-    iTransactionCommitted = ETrue;
-//
-//  If try to update field that has value which is not default errorvalue should be returned
-//
-    iLeafType = EDMUnset;
-
-    _DBG_FILE("CNSmlInternetAdapter::UpdateLeafObjectL(): end");
-
-    return;
-    }
-
-//------------------------------------------------------------------------------
-// CNSmlInternetAdapter::UpdateLeafObjectL( const TDesC8& aURI, 
-// const TDesC8& aLUID, const TDesC8& aObject, const TDesC8& aType )
-//------------------------------------------------------------------------------
-
-void CNSmlInternetAdapter::UpdateLeafObjectL( const TDesC8& /*aURI*/, 
-                                              const TDesC8& /*aLUID*/,
-                                              RWriteStream*& /*aStream*/, 
-                                              const TDesC8& /*aType*/,
-                                              TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlInternetAdapter::UpdateLeafObjectL(RWriteStream): begin");
-    iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EError);
-    _DBG_FILE("CNSmlInternetAdapter::UpdateLeafObjectL(RWriteStream): end");
-    }
-
-//------------------------------------------------------------------------------
-// CNSmlInternetAdapter::DeleteObjectL( const TDesC& aURI, const TDesC& aLUID, 
-// const TInt aStatusRef )
-//------------------------------------------------------------------------------
-void CNSmlInternetAdapter::DeleteObjectL( const TDesC8& aURI, 
-                                          const TDesC8& aLUID, 
-                                          const TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlInternetAdapter::DeleteObjectL( ): begin");
-    if( iTransactionCommitted )
-        {
-        TInt dberr = iDatabase->BeginTransaction();
-        if( dberr == KErrLocked )
-            {
-            _DBG_FILE("DeleteObjectL: CommsDat was locked.");
-            TInt retry = KBeginTransRetryCount;            
-            while ( retry > 0 && dberr == KErrLocked )
-                {
-                User::After(KBeginTransRetryDelay);
-                _DBG_FILE("DeleteObjectL: Slept 1 second. Try again");
-                dberr = iDatabase->BeginTransaction();
-                retry--;
-                }
-            if(dberr != KErrNone)
-                {        
-                _DBG_FILE("CNSmlInternetAdapter: BeginTransaction failed completely.");
-                User::Leave( dberr ); 
-                }           
-            }
-        iTransactionCommitted = EFalse;
-        }  
-
-    if( ( aURI.Match( _L8( "AP/*/NAPDef/*/WLAN/*" ) ) != KErrNotFound ) && iWlanSupported )
-        {
-        iWlanAdapter->DeleteObjectL( aURI, aLUID, aStatusRef );
-        _DBG_FILE("CNSmlInternetAdapter::DeleteObjectL( ): end");
-        return;
-        }
-
-//
-//  Check which field going to be handled
-//
-    SetField(aURI);
-
-    iLUID = IntLUID(aLUID);
-
-    TUint32 checkLUID = IntLUID(aLUID); 
-//
-//  Check which kind node to be deleted (Leaf delete not supported)
-//
-    if( aURI.Match(_L8("AP/*"  ))!= KErrNotFound &&
-        aURI.Match(_L8("AP/*/*"))== KErrNotFound )
-        {
-        // Check if AP exists
-        if(!APExistsL(checkLUID)) 
-            {
-            iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::ENotFound);
-            _DBG_FILE("CNSmlInternetAdapter::DeleteObjectL(): ENotFound end");
-            return;
-            }
-        if(DeleteAPL(checkLUID))
-            {
-            iPrevURI->Des().Format( KNullDesC8 );
-            iPrevLUID = 0;
-            iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EOk);
-            _DBG_FILE("CNSmlInternetAdapter::DeleteObjectL(): EOk end");
-            return;
-            }
-        else
-            {
-            iPrevURI->Des().Format( KNullDesC8 );
-            iPrevLUID = 0;
-            iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EError);
-            _DBG_FILE("CNSmlInternetAdapter::DeleteObjectL(): EError end");
-            return;
-            }
-        }
-
-    if (aURI.Match(_L8("AP/*/Px/*/Startpg"  ))!= KErrNotFound) //Key for WAP-delete  
-        {
-        // Check if WAPAp exists
-        if(!WapAPExistsL(checkLUID)) 
-            {
-            iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::ENotFound);
-            _DBG_FILE("CNSmlInternetAdapter::DeleteObjectL(): ENotFound end");
-            return;
-            }
-        if(DeleteWapAPL(checkLUID))
-            {
-            iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EOk);
-            _DBG_FILE("CNSmlInternetAdapter::DeleteObjectL(): EOk end");
-            return;
-            }
-        else
-            {
-            iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EError);
-            _DBG_FILE("CNSmlInternetAdapter::DeleteObjectL(): EError end");
-            return;
-            }
-        }
-    
-    if (aURI.Match(_L8("AP/*/NAPDef/*"  ))!= KErrNotFound &&
-        aURI.Match(_L8("AP/*/NAPDef/*/*"))== KErrNotFound )
-        {
-        // Check if NAPDef exists
-        if(!NAPDefExistsL(checkLUID )) 
-            {
-            iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::ENotFound);
-            _DBG_FILE("CNSmlInternetAdapter::DeleteObjectL(): ENotFound end");
-            return;
-            }
-        if(DeleteNAPDefL(checkLUID))
-            {
-            iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EOk);
-            _DBG_FILE("CNSmlInternetAdapter::DeleteObjectL(): EOk end");
-            return;
-            }
-        }
-    
-    if (aURI.Match(_L8("AP/*/Px/*"  ))!= KErrNotFound &&
-        aURI.Match(_L8("AP/*/Px/*/*"))== KErrNotFound )
-        {
-        // Check if PX exists
-        if(!PxExistsL(checkLUID)) 
-            {
-            iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::ENotFound);
-            _DBG_FILE("CNSmlInternetAdapter::DeleteObjectL(): ENotFound end");
-            return;
-            }
-        if(DeleteProxyL(checkLUID))
-            {
-            iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EOk);
-            _DBG_FILE("CNSmlInternetAdapter::DeleteObjectL(): EOk end");
-            return;
-            }
-        }
-
-    iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EError);
-    _DBG_FILE("CNSmlInternetAdapter::DeleteObjectL( ): end");
-    return;
-    }
-
-//------------------------------------------------------------------------------
-// CNSmlInternetAdapter::FetchLeafObjectSizeL()
-//------------------------------------------------------------------------------
-    
-void CNSmlInternetAdapter::FetchLeafObjectSizeL( const TDesC8& aURI, 
-                                                 const TDesC8& aLUID,
-                                                 const TDesC8& aType, 
-                                                 TInt aResultsRef,
-                                                 TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlInternetAdapter::FetchLeafObjectSizeL(): begin");
-
-    DBG_ARGS8(_S8("AP:Fetch aURI - %S - %S"), &aURI, &aLUID);
-    CBufBase *lObject = CBufFlat::NewL(128);
-    CleanupStack::PushL(lObject);
-
-    // call to internal fetchleafobj.
-    CSmlDmAdapter::TError status = FetchLeafObjectL( aURI, aLUID, aType, *lObject );
-
-    if ( status == CSmlDmAdapter::EOk )
-        {
-        lObject->Compress();
-        TBuf8<8> size;
-        size.Num( lObject->Size() );
-        lObject->Reset();
-        lObject->InsertL(0, size );
-        iCallBack->SetResultsL(aResultsRef, *lObject, aType);
-        }
-    iCallBack->SetStatusL(aStatusRef, status);
-
-    CleanupStack::PopAndDestroy(lObject);
-    _DBG_FILE("CNSmlInternetAdapter::FetchLeafObjectSizeL(): end");
-
-    return;
-    }                                                
-
-
-//------------------------------------------------------------------------------
-// CNSmlInternetAdapter::FetchLeafObjectL()
-//------------------------------------------------------------------------------
-
-void CNSmlInternetAdapter::FetchLeafObjectL( const TDesC8& aURI, 
-                                             const TDesC8& aLUID, 
-                                             const TDesC8& aType, 
-                                             const TInt aResultsRef, 
-                                             const TInt aStatusRef  )
-    {
-    _DBG_FILE("CNSmlInternetAdapter::FetchLeafObjectL(): begin");
-
-    DBG_ARGS8(_S8("AP:Fetch aURI - %S - %S"), &aURI, &aLUID);
-    CBufBase *lObject = CBufFlat::NewL(128);
-    CleanupStack::PushL(lObject);
-
-    // Add call to internal fetchleafobj
-    CSmlDmAdapter::TError status = FetchLeafObjectL( aURI, aLUID, aType, *lObject );
-    if ( status == CSmlDmAdapter::EOk )
-        {
-        iCallBack->SetResultsL(aResultsRef,*lObject,aType);
-        }
-    iCallBack->SetStatusL(aStatusRef, status);
-
-    CleanupStack::PopAndDestroy(); //lObject 
-    _DBG_FILE("CNSmlInternetAdapter::FetchLeafObjectL(): end");
-    return;
-    }
-
-
-
-//------------------------------------------------------------------------------
-// CSmlDmInternetAdapter::FetchLeafObjectL()
-//------------------------------------------------------------------------------
-    
-CSmlDmAdapter::TError CNSmlInternetAdapter::FetchLeafObjectL( 
-    const TDesC8& aURI,
-    const TDesC8& aLUID,
-    const TDesC8& aType,
-    CBufBase& aObject )
-    {
-    _DBG_FILE("CNSmlInternetAdapter::FetchLeafObjectL(internal)(): begin");
-    
-    TInt pushed = 0;
-    TUint32 iapID = 0;
-    TBool treeConstructed(EFalse);  
-    //
-    // If no proxy no fetch allowed 
-    //
-    if (aURI.Match(_L8("AP/*/Px/*"  ))!= KErrNotFound)
-        {
-        if(!GetProxyIdL(aURI)) 
-            {
-            _DBG_FILE("CNSmlInternetAdapter::FetchLeafObjectL(internal)()(): ENotFound end");
-            return CSmlDmAdapter::ENotFound;
-            }
-        }
-  if(!iLUID)
-    iLUID = IntLUID(aLUID);
-
-    iapID = GetAPIdFromURIL(aURI);
-  
-    if( iapID == 0 )
-    {
-      if( IsAPUriFormatMatchPredefined(aURI) )
-      {
-        iLUID = ConstructTreeL(aURI);
-        iapID = GetAPIdFromURIL(aURI);
-        treeConstructed = ETrue;
-      }
-       
-    }
-    // Check if values for Given LUID
-    if (!iLUID
-      && (!IsWLANfield( aURI ) || !iWlanSupported) )
-        {
-        _DBG_FILE("CNSmlInternetAdapter::FetchLeafObjectL(internal)()(): ENotFound end");
-        return CSmlDmAdapter::ENotFound;
-        }
-//
-//  Check which field going to be handled
-//
-    SetField(aURI);
-
-    aObject.Reset();
-
-//Linger value 
-    if((iField->Compare(KNSmlDdfNAPLinger) == 0))
-    {
-      TInt lingerInterval;
-      TRAPD (err, GetLingerL( iapID, lingerInterval ));
-      if(err == KErrNotFound)
-      {
-        
-        return CSmlDmAdapter::ENotFound;
-      }
-      else if( err !=KErrNone)
-      {
-        
-        return CSmlDmAdapter::EError;
-        
-      }
-      else
-      { 
-        TBuf<10> slinger;
-        slinger.AppendNum(lingerInterval);
-        
-        aObject.InsertL(aObject.Size(),ConvertTo8LC(slinger));
-        CleanupStack::PopAndDestroy();
-        return CSmlDmAdapter::EOk;
-      }
-  }
-    TPtrC qTable  = TPtrC(KNullDesC);
-    TPtrC qColumn = TPtrC(KNullDesC);
-    TPtrC qDB = TPtrC(COMMDB_ID);
-
-    if(aURI.Find(KNSmlDdfPortNbr) >= 0) // Check if WAP or PROXY port asked
-        {
-        _LIT8( KWap, "/WAP" );
-        if(aURI.Find(KWap) >= 0)
-            {
-            iWapPort = ETrue;
-            }
-        else
-            {
-            iWapPort = EFalse;
-            }
-        }
-
-
-    if ( iWlanSupported )
-      {
-      TBool wLANfield = IsWLANfield(aURI);
-      if(wLANfield)
-        {
-        //
-        //      WLAN-adapter handles all WLAN fields
-        //
-        return iWlanAdapter->FetchLeafObjectL(aURI, aLUID, aType, aObject);
-        }
-      }
-
-//
-//  Get Database field type 
-//
-    TInt fType = GetAPFieldType( aURI );
-
-    if (fType == EWrong)
-        {
-        _DBG_FILE("CNSmlInternetAdapter::FetchLeafObjectL(internal)()(): EError end");
-        return CSmlDmAdapter::EError;
-        }
-//
-    iISPId = iLUID;
-//
-//  IAP-table search serviceType (=Bearer)
-
-    CCommsDbTableView* serviceView = iDatabase->OpenViewMatchingUintLC(TPtrC(IAP),
-                                                                       qDB,
-                                                                       iapID);
-    
-    TBuf<KCommsDbSvrMaxFieldLength> serviceType;
-    TUint32 serviceId = 0;
-
-    TInt errorCode = serviceView->GotoFirstRecord();
-    
-    // Read serviceType from (IAP)
-    if ( errorCode == KErrNone )
-        {
-        serviceView->ReadTextL(TPtrC(IAP_SERVICE_TYPE), serviceType);
-        serviceView->ReadUintL(TPtrC(IAP_SERVICE),      serviceId);
-        CleanupStack::PopAndDestroy(); // serviceView
-        }
-    else
-        {
-        CleanupStack::PopAndDestroy(); // serviceView
-        _DBG_FILE("CNSmlInternetAdapter::FetchLeafObjectL(internal)()(): ENotFound end");
-        CleanupStack::PopAndDestroy(pushed);
-        return CSmlDmAdapter::ENotFound;
-        }
-    qTable.Set(serviceType);
-
-    TBool allowed = GetAPField(qTable,qColumn);
-
-    if(!allowed)
-        {
-        if( aURI.Find(KNSmlDdfNAPAddrTy) >= 0)      /* NAPAddrTy handling */
-            {
-            if (serviceType == TPtrC(OUTGOING_GPRS) ||
-                serviceType == TPtrC(INCOMING_GPRS))
-                {
-                _LIT8( KApn, "APN" );
-                aObject.InsertL(aObject.Size(), KApn );
-
-                }
-            CleanupStack::PopAndDestroy(pushed); 
-            return CSmlDmAdapter::EOk;
-
-            }
-        _DBG_FILE("CNSmlInternetAdapter::FetchLeafObjectL(internal)()(): FieldNot allowed");
-        CleanupStack::PopAndDestroy(pushed); 
-        return CSmlDmAdapter::EError;
-        }
-
-    if (fType == CNSmlInternetAdapter::EStr)
-        { // Name + NAPAddr + DNSAddrL
-        if(aURI.Match(_L8("AP/*/Networks/*/Name"))!= KErrNotFound ) // Networks-name
-            {
-            TUint32 iapID8 = IntLUID(aLUID);
-
-            //  IAP-table NetworkId Fetch
-            CCommsDbTableView* networkView = iDatabase->OpenViewMatchingUintLC(TPtrC(IAP),
-                                                                               TPtrC(COMMDB_ID),
-                                                                               iapID8);
-            networkView->GotoFirstRecord();
-            TRAPD(leavecode,networkView->ReadUintL(TPtrC(IAP_NETWORK), iISPId));
-            CleanupStack::PopAndDestroy(); // networkView
-            if(leavecode != 0)
-                {
-                _DBG_FILE("CNSmlInternetAdapter::FetchLeafObjectL(internal)()(): ENotFound end");
-                CleanupStack::PopAndDestroy(pushed); 
-                return CSmlDmAdapter::ENotFound;
-                }
-
-            CCommsDbTableView* tableView = iDatabase->OpenViewMatchingUintLC(TPtrC(NETWORK),
-                                                                             TPtrC(COMMDB_ID),
-                                                                             iISPId);
-
-            errorCode = tableView->GotoFirstRecord();
-    
-
-            if ( errorCode == KErrNone )
-                {
-                TBuf<KCommsDbSvrMaxFieldLength> columnValue;
-
-                tableView->ReadTextL(qColumn, columnValue);
-            
-                aObject.InsertL(aObject.Size(),ConvertTo8LC(columnValue));
-                pushed++;
-                }
-            else
-                {
-                CleanupStack::PopAndDestroy(); // tableView
-                _DBG_FILE("CNSmlInternetAdapter::FetchLeafObjectL(internal)()(): ENotFound end");
-                CleanupStack::PopAndDestroy(pushed); 
-                return CSmlDmAdapter::ENotFound;
-                }
-            }
-        else if(aURI.Match(_L8("AP/*/Px/*/Name"))   != KErrNotFound ||  // ProxyName
-                aURI.Match(_L8("AP/*/Px/*/PxAddr")) != KErrNotFound ||  // ProxyAddr
-                aURI.Match(_L8("AP/*/Px/*/DomainL")) != KErrNotFound )  // DomainL (PROXY_PROTOCOL_NAME)
-            {
-            CCommsDbTableView* proxyView = iDatabase->OpenViewMatchingUintLC(TPtrC(PROXIES),
-                                                                             TPtrC(COMMDB_ID),
-                                                                             iProxyId);
-
-            errorCode = proxyView->GotoFirstRecord();
-    
-
-            if ( errorCode == KErrNone )
-                {
-                if(aURI.Match(_L8("AP/*/Px/*/DomainL"))!= KErrNotFound)
-                    {
-                    TBuf<KCommsDbSvrMaxFieldLength> columnValue;
-    
-                    proxyView->ReadTextL(TPtrC(PROXY_PROTOCOL_NAME), columnValue);
-                
-                    aObject.InsertL(aObject.Size(),ConvertTo8LC(columnValue));
-                    pushed++;
-                    }
-
-                else if(aURI.Match(_L8("AP/*/Px/*/PxAddr"))!= KErrNotFound)
-                    {
-                    HBufC* serverName = proxyView->ReadLongTextLC(TPtrC(PROXY_SERVER_NAME));
-                    pushed++;
-
-                    aObject.InsertL(aObject.Size(),ConvertTo8LC(*serverName));
-                    pushed++;
-                    }
-                }
-            else
-                {
-                CleanupStack::PopAndDestroy(); // proxyView
-                CleanupStack::PopAndDestroy(pushed); 
-                _DBG_FILE("CNSmlInternetAdapter::FetchLeafObjectL(internal)()(): ENotFound end");
-                return CSmlDmAdapter::ENotFound;
-                }
-            }
-        else
-            {
-            CCommsDbTableView* tableView = iDatabase->OpenViewMatchingUintLC(serviceType,
-                                                                             qDB,
-                                                                             serviceId);
-    
-            errorCode = tableView->GotoFirstRecord();
-    
-
-            if ( errorCode == KErrNone )
-                {
-                if ( aURI.Find(KNSmlDdfDNSPriority) >= 0)    /* DNSPriority */
-                    {
-                    UriUtils::TUriHostType theType;
-                    TInt dnsPri;
-                    
-                    // This resets iLUID to match aLUID, which is needed in this case.
-                    // Otherwise iLUID has a different value
-                    if(!treeConstructed)
-                       iLUID = IntLUID(aLUID);
-
-                    if ( LuidToDns( theType, dnsPri, iLUID ) == KErrNone )
-                        {
-                        if ( dnsPri == 1 )
-                            {
-                            aObject.InsertL( aObject.Size(), KNSmlFirstDNSPri );
-                            }
-                        else
-                            {
-                            aObject.InsertL( aObject.Size(), KNSmlSecondDNSPri );
-                            }
-                        }
-                    else
-                        {
-                        CleanupStack::PopAndDestroy(tableView); // tableView
-                        CleanupStack::PopAndDestroy(pushed); 
-                        _DBG_FILE("CNSmlInternetAdapter::FetchLeafObjectL(internal)()(): ENotFound end");
-                        return CSmlDmAdapter::ENotFound;
-                        }
-                    }
-                else if ( aURI.Find(KNSmlDdfDNSAddrTy) >= 0)    /* DNSAddrTy */
-                    {
-                    UriUtils::TUriHostType theType;
-                    TInt dnsPri;
-                    // This resets iLUID to match aLUID, which is needed in this case.
-                    // Otherwise iLUID has a different value
-                    if(!treeConstructed)
-                    iLUID = IntLUID(aLUID);
-                    if ( LuidToDns( theType, dnsPri, iLUID ) == KErrNone )
-                        {
-                        if ( theType ==  UriUtils::EIPv4Host)
-                            {
-                            aObject.InsertL( aObject.Size(), KNSmlDNSIp );
-                            }
-                        else
-                            {
-                            aObject.InsertL( aObject.Size(), KNSmlDNSIp6 );
-                            }
-                        }
-                    else
-                        {
-                        CleanupStack::PopAndDestroy(tableView); // tableView
-                        CleanupStack::PopAndDestroy(pushed); 
-                        _DBG_FILE("CNSmlInternetAdapter::FetchLeafObjectL(internal)()(): ENotFound end");
-                        return CSmlDmAdapter::ENotFound;
-                        }
-                    }
-                else
-                    {
-                    TBuf<KCommsDbSvrMaxFieldLength> columnValue;
-                    if ( aURI.Find(KNSmlDdfDNSAddrL ) >= 0)
-                        {
-                        UriUtils::TUriHostType theType;
-                        TInt dnsPri;
-                        
-                        // This resets iLUID to match aLUID, which is needed in this case.
-                        // Otherwise iLUID has a different value
-                        if(!treeConstructed)
-                        iLUID = IntLUID(aLUID);
-                        if ( LuidToDns( theType, dnsPri, iLUID ) == KErrNone )
-                            {
-                            if ( dnsPri == 1)
-                                {
-                                if ( theType == UriUtils::EIPv4Host )
-                                    {
-                                    qColumn.Set( TPtrC(SERVICE_IP_NAME_SERVER1 ));
-                                    }
-                                else
-                                    {
-                                    qColumn.Set( TPtrC(SERVICE_IP6_NAME_SERVER1 ));
-
-                                    }
-                                }
-                            else
-                                {
-                                if ( theType == UriUtils::EIPv4Host )
-                                    {
-                                    qColumn.Set( TPtrC(SERVICE_IP_NAME_SERVER2 ));
-                                    }
-                                else
-                                    {
-                                    qColumn.Set( TPtrC(SERVICE_IP6_NAME_SERVER2 ));
-
-                                    }
-                                }
-                            }
-                        else
-                            {
-                            CleanupStack::PopAndDestroy(tableView); // tableView
-                            CleanupStack::PopAndDestroy(pushed); 
-                            _DBG_FILE("CNSmlInternetAdapter::FetchLeafObjectL(internal)()(): ENotFound end");
-                            return CSmlDmAdapter::ENotFound;
-                            }
-                        }
-                    TRAPD(leavecode,tableView->ReadTextL(qColumn,  columnValue));
-                    if(leavecode != 0)
-                        {
-                        CleanupStack::PopAndDestroy(); // tableView
-                        CleanupStack::PopAndDestroy(pushed); 
-                        _DBG_FILE("CNSmlInternetAdapter::FetchLeafObjectL(internal)()(): ENotFound end");
-                        return CSmlDmAdapter::ENotFound;
-                        }
-                    aObject.InsertL(aObject.Size(),ConvertTo8LC(columnValue));
-                    pushed++;
-                    }
-                }
-            else
-                {
-                CleanupStack::PopAndDestroy(); // tableView
-                CleanupStack::PopAndDestroy(pushed); 
-                _DBG_FILE("CNSmlInternetAdapter::FetchLeafObjectL(internal)()(): ENotFound end");
-                return CSmlDmAdapter::ENotFound;
-                }
-            }
-        CleanupStack::PopAndDestroy(); // tableView
-        }
-    else if (fType == CNSmlInternetAdapter::EBool)
-        { // UseCB
-        CCommsDbTableView* boolView = iDatabase->OpenViewMatchingUintLC(serviceType,
-                                                                        qDB,
-                                                                        serviceId);
-        
-        errorCode = boolView->GotoFirstRecord();
-
-        TBool objectBool = EFalse;
-        if ( errorCode == KErrNone )
-            {
-            TRAPD(leavecode,boolView->ReadBoolL(qColumn,objectBool ));
-            if(leavecode == KErrUnknown ) // value is null
-                {
-                }
-            }
-        else
-            {
-            CleanupStack::PopAndDestroy(); // boolView
-            CleanupStack::PopAndDestroy(pushed); 
-            _DBG_FILE("CNSmlInternetAdapter::FetchLeafObjectL(internal)()(): EError end");
-            return CSmlDmAdapter::EError;
-            }
-
-        if (objectBool)
-            {
-            aObject.InsertL(aObject.Size(),KNSmlDmApValTrue);
-            }
-        else
-            {
-            aObject.InsertL(aObject.Size(),KNSmlDmApValFalse);
-            }
-
-        CleanupStack::PopAndDestroy(); // boolView
-        }
-    else if (fType == CNSmlInternetAdapter::EInt)
-        { // NAPId +Bearer + NAPAddrTy + PxID + PortNbr + UsePTxtLog
-          // CBTy + LnkSpeed
-
-        if(aURI.Match(_L8("AP/*/Px/*/PxID"))!= KErrNotFound )
-            {
-            aObject.InsertL(aObject.Size(),SetIntObjectLC(iISPId)); 
-            pushed++;
-            }
-    
-         else if (aURI.Find(KNSmlDdfIAPSeamlessness) >= 0 )  /* Seamlessness handling */
-            {
-                TInt seam = GetIAPSeamlessnessL(iapID);
-                aObject.InsertL(aObject.Size(),SetIntObjectLC(seam)); 
-                pushed++;
-            }
-        else if(aURI.Find(KNSmlDdfIAPMetaData) >= 0)
-            {
-                TInt meta = GetIAPMetaDataL(iapID);
-                aObject.InsertL(aObject.Size(),SetIntObjectLC(meta)); 
-                pushed++;
-            }
-          
-        else if(aURI.Match(_L8("AP/*/Networks/*/ID"))!= KErrNotFound )
-            {
-
-            iISPId= IntLUID(aLUID);
-
-            CCommsDbTableView* nwidView = iDatabase->OpenViewMatchingUintLC(TPtrC(IAP),
-                                                                            TPtrC(COMMDB_ID),
-                                                                            iISPId);
-            nwidView->GotoFirstRecord();
-            nwidView->ReadUintL(TPtrC(IAP_NETWORK), iISPId);
-            CleanupStack::PopAndDestroy(); // nwidView
-
-            aObject.InsertL(aObject.Size(),SetIntObjectLC(iISPId)); 
-            pushed++;
-            }
-        else if(aURI.Match(_L8("AP/*/Px/*/PortNbr"))!= KErrNotFound )
-            {
-            _DBG_FILE("CNSmlInternetAdapter::FetchLeafObjectL(internal)()(): PortNbr");
-            DBG_ARGS8(_S8("iISPId = %d "), iISPId );
-            DBG_ARGS8(_S8("proxyid = %d "), iProxyId );
-            CCommsDbTableView* portView = iDatabase->OpenViewMatchingUintLC(TPtrC(PROXIES),
-                                                TPtrC(COMMDB_ID),
-                                                iProxyId);
-
-            errorCode = portView->GotoFirstRecord();
-            
-
-            if ( errorCode == KErrNone )
-                {
-                _DBG_FILE("CNSmlInternetAdapter::FetchLeafObjectL(internal)()(): Portview opened");
-                TUint32 object32=0;
-
-                TRAPD(leavecode,portView->ReadUintL(qColumn,object32 ));
-                if(leavecode == KErrNone)
-                    {
-                    aObject.InsertL(aObject.Size(),SetIntObjectLC(object32));
-                    pushed++;
-                    }
-                else
-                    {
-                    _DBG_FILE("CNSmlInternetAdapter::FetchLeafObjectL(internal)()(): db read failed");
-                    CleanupStack::PopAndDestroy(); // portView
-                    CleanupStack::PopAndDestroy(pushed); 
-                    _DBG_FILE("CNSmlInternetAdapter::FetchLeafObjectL(internal)()(): EError end");
-                    return CSmlDmAdapter::EError;
-                    }
-                }
-            else
-                {
-                _DBG_FILE("CNSmlInternetAdapter::FetchLeafObjectL(internal)()(): Portview opening failed");
-                CleanupStack::PopAndDestroy(); // portView
-                CleanupStack::PopAndDestroy(pushed); 
-                _DBG_FILE("CNSmlInternetAdapter::FetchLeafObjectL(internal)()(): ENotFound end");
-                return CSmlDmAdapter::ENotFound;
-                }
-            CleanupStack::PopAndDestroy(); // portView
-            }
-        else if(aURI.Match(_L8("AP/*/NAPID"))!= KErrNotFound ||
-                aURI.Match(_L8("AP/*/ToNAPIDL"))!= KErrNotFound )
-            {
-            iObject = iapID;
-            TPtrC8 napidUri = FirstURISeg(aURI);
-            aObject.InsertL(aObject.Size(),napidUri);
-
-            }
-        else
-            {
-            iObject = 0;
-
-            CCommsDbTableView* colView = iDatabase->OpenViewMatchingUintLC(serviceType,
-                                                                           qDB,
-                                                                           serviceId);
-        
-            errorCode = colView->GotoFirstRecord();
-
-            TUint32 object32 = 0;
-            if ( errorCode == KErrNone )
-                {
-                if(aURI.Find(KNSmlDdfUsePTxtLog) >= 0)
-                    {
-                    TBool objectBool = EFalse;
-                    TRAPD(leavecode,colView->ReadBoolL(qColumn,objectBool ));
-                    errorCode = leavecode;
-                    object32 = objectBool;
-                    }
-                else
-                    {
-                    TRAPD(leavecode,colView->ReadUintL(qColumn,object32 ));
-                    errorCode = leavecode;
-                    }
-                }
-
-            if ( errorCode == KErrNone )
-                {
-
-                if (aURI.Find(KNSmlDdfNAPAddrTy) >= 0 || /* NAPAddrTy handling */
-                    aURI.Find(KNSmlDdfGPRSPDP)   >= 0) /* NAPAddrTy handling */
-                    {
-                    if(object32 == RPacketContext::EPdpTypeIPv4)
-                        {
-                        aObject.InsertL(aObject.Size(),KNSmlDmApValIpv4);    
-                        }
-                    else if (object32 == RPacketContext::EPdpTypeIPv6)
-                        {
-                        aObject.InsertL(aObject.Size(), KNSmlDmApValIpv6);
-                        }
-                    else if (object32 == RPacketContext::EPdpTypePPP)
-                        {
-                        _LIT8( KPpp, "PPP" );
-                        aObject.InsertL(aObject.Size(),KPpp);
-                        }
-                    else 
-                        {
-                        aObject.InsertL(aObject.Size(),KNullDesC8);
-                        }
-                    }
-                else
-                    {
-                    aObject.InsertL(aObject.Size(),SetIntObjectLC(object32));
-                    pushed++;
-                    }
-                }
-            else
-                {
-                CleanupStack::PopAndDestroy(); // colView
-                CleanupStack::PopAndDestroy(pushed); 
-                _DBG_FILE("CNSmlInternetAdapter::FetchLeafObjectL(internal)()(): ENotFound end");
-                return CSmlDmAdapter::ENotFound;
-                }
-            CleanupStack::PopAndDestroy(); // colView
-            }
-        }
-
-    else if (fType == CNSmlInternetAdapter::EWap)
-        { // Startpg + PxAuthId + PxAuthPW + PortNbr (BasAuthId + BasAuthPW)
-        CCommsDbTableView* wapView = iDatabase->OpenViewMatchingUintLC(TPtrC(WAP_IP_BEARER),
-                                                                       TPtrC(WAP_IAP),
-                                                                       iapID);
-
-        errorCode = wapView->GotoFirstRecord();
-    
-        if ( errorCode == KErrNone )
-            {
-            TBuf<KCommsDbSvrMaxFieldLength> columnValue;
-
-            if(qColumn == TPtrC(WAP_START_PAGE))
-                {
-                TRAPD(leavecode,wapView->ReadUintL(TPtrC(WAP_ACCESS_POINT_ID), iWapId));
-                CleanupStack::PopAndDestroy(); // wapView
-                if(leavecode != KErrNone)
-                    {
-                    CleanupStack::PopAndDestroy(pushed); 
-                    _DBG_FILE("CNSmlInternetAdapter::FetchLeafObjectL(internal)()(): EError end");
-                    return CSmlDmAdapter::EError;
-    
-                    }
-
-                CCommsDbTableView* wapView2 = iDatabase->OpenViewMatchingUintLC(TPtrC(WAP_ACCESS_POINT),
-                                                                                TPtrC(COMMDB_ID),
-                                                                                iWapId);
-
-                errorCode = wapView2->GotoFirstRecord();
-                if ( errorCode != KErrNone )
-                    {
-                    CleanupStack::PopAndDestroy(); // wapView2
-                    CleanupStack::PopAndDestroy(pushed); 
-                    _DBG_FILE("CNSmlInternetAdapter::FetchLeafObjectL(internal)()(): ENotFound end");
-                    return CSmlDmAdapter::ENotFound;
-                    }
-
-                HBufC* tmpVal = wapView2->ReadLongTextLC( qColumn );
-                
-                aObject.InsertL(aObject.Size(),ConvertTo8LC(tmpVal->Des()));
-                CleanupStack::PopAndDestroy(); // ReadLongTextLC
-                CleanupStack::PopAndDestroy(); // wapView2
-                pushed++;
-                }
-            else
-                {
-                if(qColumn == TPtrC(WAP_PROXY_PORT))
-                    {
-                    TUint32 object32;
-                    wapView->ReadUintL(qColumn, object32);
-                    if(object32 == KWAPP_PORT_9200) // wappdef.h
-                        {
-                        aObject.InsertL(aObject.Size(),ConvertTo8LC(KWappPort9200));    
-                        }
-                    else if(object32 == KWAPP_PORT_9201)
-                        {
-                        aObject.InsertL(aObject.Size(),ConvertTo8LC(KWappPort9201));    
-                        }
-                    else if(object32 == KWAPP_PORT_9202)
-                        {
-                        aObject.InsertL(aObject.Size(),ConvertTo8LC(KWappPort9202));    
-                        }
-                    else if(object32 == KWAPP_PORT_9203)
-                        {
-                        aObject.InsertL(aObject.Size(),ConvertTo8LC(KWappPort9203));
-                        }
-                    else
-                        {
-                        CleanupStack::PopAndDestroy(); // wapView
-                        CleanupStack::PopAndDestroy(pushed); 
-                        _DBG_FILE("CNSmlInternetAdapter::FetchLeafObjectL(internal)()(): ENotFound end");
-                        return CSmlDmAdapter::ENotFound;
-                        }
-
-                    pushed++;
-                    }
-                else
-                    {
-                    wapView->ReadTextL(qColumn, columnValue);
-                    aObject.InsertL(aObject.Size(),ConvertTo8LC(columnValue));
-                    pushed++;
-                    }
-                CleanupStack::PopAndDestroy(); // wapView
-                }
-            }
-        else
-            {
-            CleanupStack::PopAndDestroy(); // wapView
-            CleanupStack::PopAndDestroy(pushed); 
-            _DBG_FILE("CNSmlInternetAdapter::FetchLeafObjectL(internal)()(): ENotFound end");
-            return CSmlDmAdapter::ENotFound;
-            }
-        }
-    else if (fType == CNSmlInternetAdapter::ESpec)
-        { 
-        // name
-        if ( aURI.Find( KNSmlDdfNAPName ) >= 0 )
-            {
-            CCommsDbTableView* tableView = iDatabase->OpenViewMatchingUintLC(serviceType,
-                                                                             qDB,
-                                                                             serviceId);
-                
-            errorCode = tableView->GotoFirstRecord();
-                
-            if ( errorCode == KErrNone )
-                {
-                TBuf<KCommsDbSvrMaxFieldLength> columnValue;
-                TRAPD(leavecode,tableView->ReadTextL(qColumn,  columnValue));
-                if(leavecode != 0)
-                    {
-                    CleanupStack::PopAndDestroy(); // tableView
-                    CleanupStack::PopAndDestroy(pushed); 
-                    _DBG_FILE("CNSmlInternetAdapter::FetchLeafObjectL(internal)()(): ENotFound end");
-                    return CSmlDmAdapter::ENotFound;
-                    }
-                aObject.InsertL(aObject.Size(),ConvertTo8LC(columnValue));
-                pushed++;
-                }
-            CleanupStack::PopAndDestroy(); // tableView
-            }
-        // BearerL + NoPxForL + IAPService
-        else if (aURI.Find(KNSmlDdfIAPService) >= 0) 
-            {
-            aObject.InsertL(aObject.Size(),SetIntObjectLC(serviceId)); 
-            pushed++;
-            _DBG_FILE("CNSmlInternetAdapter::FetchLeafObjectL(internal)()(): EOk end");
-            CleanupStack::PopAndDestroy(pushed); 
-            return CSmlDmAdapter::EOk;
-            }
-        else if (aURI.Find(KNSmlDdfNoPxForL) >= 0) /* No proxies used handling */
-            {
-            TBool proxyFound = GetProxyIdL(aURI);
-            if(!proxyFound)
-                {
-                _DBG_FILE("CNSmlInternetAdapter::FetchLeafObjectL(internal)()(): ENotFound end");
-                CleanupStack::PopAndDestroy(pushed); 
-                return CSmlDmAdapter::ENotFound;
-                } 
-
-            CCommsDbTableView* exeptionView = iDatabase->OpenViewMatchingUintLC(TPtrC(PROXIES),
-                                                                                TPtrC(COMMDB_ID),
-                                                                                iProxyId);
-            errorCode = exeptionView->GotoFirstRecord();
-    
-            if ( errorCode == KErrNone )
-                {
-                HBufC* proxyExceptions = exeptionView->ReadLongTextLC(TPtrC(PROXY_EXCEPTIONS));
-                pushed++;
-    
-                aObject.InsertL(aObject.Size(),ConvertTo8LC(*proxyExceptions));
-                pushed++;
-                }
-            else
-                {
-                _DBG_FILE("CNSmlInternetAdapter::FetchLeafObjectL(internal)()(): ENotFound end");
-                CleanupStack::PopAndDestroy(pushed); 
-                return CSmlDmAdapter::ENotFound;
-                }
-            CleanupStack::PopAndDestroy(); // exeptionView
-
-            _DBG_FILE("CNSmlInternetAdapter::FetchLeafObjectL(internal)()(): EOk end");
-            CleanupStack::PopAndDestroy(pushed); 
-            return CSmlDmAdapter::EOk;
-            }
-
-        if(aURI.Find(KNSmlDdfDirection) >= 0)
-            {
-            if (serviceType == TPtrC(OUTGOING_GPRS))
-                {
-                aObject.InsertL(aObject.Size(),KNSmlDmApValOutgoing);
-                }
-            else if (serviceType == TPtrC(INCOMING_GPRS))
-                {
-                aObject.InsertL(aObject.Size(),KNSmlDmApValIncoming);
-                }
-            else if (serviceType == TPtrC(LAN_SERVICE)) // Wlan ADD
-                {
-                aObject.InsertL(aObject.Size(),KNSmlDmApValOutgoing);
-                }
-            else if (serviceType == TPtrC(VPN_SERVICE)) 
-                {
-                aObject.InsertL(aObject.Size(),KNSmlDmApValOutgoing);
-                }
-            else 
-                {
-                _LIT8( KDirectionUnk, "DirectionUnknown");
-                aObject.InsertL(aObject.Size(),KDirectionUnk);
-                }
-            }
-        else
-            {
-            if (serviceType == TPtrC(OUTGOING_GPRS) ||
-                serviceType == TPtrC(INCOMING_GPRS))
-                {
-                if (i3GPPPS)
-                    {
-                    aObject.InsertL(aObject.Size(),KNSmlDmApVal3Gppps);
-                    i3GPPPS = EFalse;
-                    }
-                else
-                    {
-                    aObject.InsertL(aObject.Size(),KNSmlDmApValGsmGprs);
-                    }
-                
-                }
-
-            else if (serviceType == TPtrC(OUTGOING_GPRS) ||
-                     serviceType == TPtrC(INCOMING_GPRS))
-                {
-                if (i3GPPPS)
-                    {
-                    aObject.InsertL(aObject.Size(),KNSmlDmApVal3Gppps);
-                    i3GPPPS = EFalse;
-                    }
-                else
-                    {
-                    aObject.InsertL(aObject.Size(),KNSmlDmApValGsmGprs);
-                    }
-                
-                }
-            else if (serviceType == TPtrC(VPN_SERVICE)) 
-                {
-                aObject.InsertL(aObject.Size(),KNSmlDmApValVpn);
-                }
-
-            else if ( ( serviceType == TPtrC(LAN_SERVICE) && iWlanSupported ) ) 
-                {
-                aObject.InsertL(aObject.Size(),KNSmlDmApValWlan);
-                }
-            else 
-                {
-                _LIT8( KUnkBearer, "Unknown Bearer");
-                aObject.InsertL(aObject.Size(),KUnkBearer);
-                }
-            }
-        }
-    else 
-        {
-        _DBG_FILE("CNSmlInternetAdapter::FetchLeafObjectL(internal)(): ENotFound end");
-        CleanupStack::PopAndDestroy(pushed); 
-        return CSmlDmAdapter::ENotFound;
-        }
-
-    _DBG_FILE("CNSmlInternetAdapter::FetchLeafObjectL(internal)(): end");
-    CleanupStack::PopAndDestroy(pushed); 
-    return CSmlDmAdapter::EOk;
-    
-    }
-
-//------------------------------------------------------------------------------
-// CSmlDmAdapter::ChildURIListL()
-//------------------------------------------------------------------------------
-void CNSmlInternetAdapter::ChildURIListL( const TDesC8& aURI, 
-                                          const TDesC8& aLUID, 
-                                          const CArrayFix<TSmlDmMappingInfo>& aPreviousURISegmentList, 
-                                          const TInt aResultsRef, 
-                                          const TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlInternetAdapter::ChildURIListL(): begin");
-    DBG_ARGS8(_S8("AP:ChildURIListL URI - <%S> <%S>"), &aURI, &aLUID );
-
-    CBufBase* currentURISegmentList = CBufFlat::NewL(128);
-    CleanupStack::PushL(currentURISegmentList);
-    
-    TUint32 checkLUID = IntLUID(aLUID);
-    
-    // If this is command to proxy node we'll need to make sure that
-    // the LUID is for proxy node and not AP node.
-    // If this command comes to predefined AP node then 
-    // the LUID passed is inherited from that node and is not
-    // proper proxy node.
-    if ( aURI.Match(_L8("AP/*/Px/*" ))!= KErrNotFound )
-        {    
-        TLex8 lex(aLUID);
-        TUint tempLUID;
-        if ( !((lex.Val( tempLUID ) == KErrNone ) 
-              && ( tempLUID > KNSmlApProxyLowerBase ) 
-              && ( tempLUID < KNSmlApProxyUpperBase )) )                                     
-            {
-               // Non-proxy LUID         
-                checkLUID = 0;
-            }        
-        }   
-     
-    // Fetch all data for child
-    if ( !checkLUID 
-      && ( !IsWLANfield( aURI ) || !iWlanSupported ) )  
-        {
-        if(aURI.Match(KNSmlDdfAP)== KErrNotFound) // Not for AP
-            {
-            CleanupStack::PopAndDestroy(); // currentURISegmentList
-            iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::ENotFound);
-            _DBG_FILE("CNSmlInternetAdapter::ChildURIListL(): ENotFound end");
-            return;
-            }
-        }
-
-    TUint32 apId = GetAPIdFromURIL( aURI );
-    
-    if( aURI.Match( _L8("AP/*") ) != KErrNotFound && 
-        !APExistsL( apId ) )
-        {
-        if ( aLUID.Length() > 0 )
-            {
-            // Stale data, remove mapping. 
-		    TInt ret = iCallBack->RemoveMappingL( KNSmlInternetAdapterImplUid,
-							GetDynamicAPNodeUri( aURI ), ETrue );					
-            }
-        
-        iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-        CleanupStack::PopAndDestroy(); // currentURISegmentList
-        _DBG_FILE("CNSmlInternetAdapter::ChildURIListL(): AP doesn't exist: ENotFound end");
-        return;
-        }
-    
-    if( aURI.Match(_L8("AP/*"  ))!= KErrNotFound &&
-        aURI.Match(_L8("AP/*/*"))== KErrNotFound )
-        {
-        // Check if AP exists
-        if(!APExistsL(checkLUID)) 
-            {
-            iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::ENotFound);
-            CleanupStack::PopAndDestroy(); // currentURISegmentList
-            _DBG_FILE("CNSmlInternetAdapter::ChildURIListL(): ENotFound end");
-            return;
-            }
-        currentURISegmentList->InsertL( 0, KNSmlAPnode); 
-        iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EOk);
-        iCallBack->SetResultsL(aResultsRef,*currentURISegmentList,KNullDesC8);
-        CleanupStack::PopAndDestroy(); // currentURISegmentList
-        _DBG_FILE("CNSmlInternetAdapter::ChildURIListL(): end");
-        return;
-        }
-
-    // Check that queried proxy exists
-    if (aURI.Match(_L8("AP/*/Px/*" ))!= KErrNotFound &&
-        !PxExistsL(checkLUID))
-        {
-        iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::ENotFound);
-        CleanupStack::PopAndDestroy(); // currentURISegmentList
-        _DBG_FILE("CNSmlInternetAdapter::ChildURIListL(): ENotFound end");
-        return;
-        }
-
-    if (aURI.Match(_L8("AP/*/Px/*"  ))!= KErrNotFound &&
-        aURI.Match(_L8("AP/*/Px/*/*"))== KErrNotFound )
-        {
-        // Check if PX exists
-        if(!PxExistsL(checkLUID)) 
-            {
-            // Only WAP-data  
-            iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::ENotFound);
-            CleanupStack::PopAndDestroy(); // currentURISegmentList
-            _DBG_FILE("CNSmlInternetAdapter::ChildURIListL(): ENotFound end");
-            return;
-            }
-        // List all Px
-        currentURISegmentList->InsertL( 0, KNSmlPxnode ); 
-        iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EOk);
-        iCallBack->SetResultsL(aResultsRef,*currentURISegmentList,KNullDesC8);
-        CleanupStack::PopAndDestroy(); // currentURISegmentList
-        _DBG_FILE("CNSmlInternetAdapter::ChildURIListL(): OK end");
-        return;
-        }
-
-    if (aURI.Match(_L8("AP/*/NAPDef/*"  ))!= KErrNotFound &&
-        aURI.Match(_L8("AP/*/NAPDef/*/*"))== KErrNotFound )
-        {
-        // Check if IAP has luid mapped
-        HBufC8* iapIdBuf = iCallBack->GetLuidAllocL(RemoveLastSeg(aURI));
-        TInt iapIdInt = GetIntObject8(iapIdBuf->Des());
-        
-        delete iapIdBuf;
-        iapIdBuf = NULL;
-        
-        if ( iapIdInt > 0 )
-            {
-            CCommsDbTableView* iapView = iDatabase->OpenViewMatchingUintLC(
-                TPtrC(IAP),TPtrC(COMMDB_ID), iapIdInt);
-            TInt error = iapView->GotoFirstRecord();
-            TBuf<KCommsDbSvrMaxFieldLength> serviceType;
-            if (error == KErrNone)
-                {
-                iapView->ReadTextL(TPtrC(IAP_SERVICE_TYPE), serviceType);
-                }
-            CleanupStack::PopAndDestroy( iapView );
-
-            // Check if NAPDef exists
-            if(!NAPDefExistsL(checkLUID)) 
-                {
-                iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::ENotFound);
-                CleanupStack::PopAndDestroy(); // currentURISegmentList
-                _DBG_FILE("CNSmlInternetAdapter::ChildURIListL(): ENotFound end");
-                return;
-                }
-            // List all NAPDef
-            if(IsWlanL(aURI) && iWlanSupported )
-                {
-                iWlanAdapter->ChildURIListL(aURI,aLUID,aPreviousURISegmentList,aResultsRef,aStatusRef); 
-                CleanupStack::PopAndDestroy(); // currentURISegmentList
-                _DBG_FILE("CNSmlInternetAdapter::ChildURIListL(): WLAN end");
-                return;
-                }
-            _LIT( KGprs, "*GPRS*");
-            _LIT( K3gppps, "*3GPPPS*");
-            if ( serviceType.Match(KGprs) != KErrNotFound ||
-                 serviceType.Match(K3gppps) != KErrNotFound)
-                {
-                currentURISegmentList->InsertL( 0 ,KNSmlNAPDefGPRSnode);
-                }
-
-#ifdef __SYNCML_DM_LSCRIPT
-            currentURISegmentList->InsertL(currentURISegmentList->Size(),KNSmlLoginscriptnode); 
-#endif
-
-            iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EOk);
-            iCallBack->SetResultsL(aResultsRef,*currentURISegmentList,KNullDesC8);
-            }
-        else
-            {
-            iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EError);
-            }
-        CleanupStack::PopAndDestroy(); // currentURISegmentList
-        _DBG_FILE("CNSmlInternetAdapter::ChildURIListL(): end");
-        return;
-        }
-
-
-    if ( ( aURI.Match(_L8("AP/*/WLAN")) != KErrNotFound 
-           || aURI.Match(_L8("AP/*/WLAN/*"))!= KErrNotFound )
-           && iWlanSupported )
-        {
-        iWlanAdapter->ChildURIListL(aURI,aLUID,aPreviousURISegmentList,aResultsRef,aStatusRef); 
-        CleanupStack::PopAndDestroy(); // currentURISegmentList
-        _DBG_FILE("CNSmlInternetAdapter::ChildURIListL(): WLAN end");
-        return;
-        }
-//
-//  Get all AP numbers from IAP-table
-//
-    if (aURI.Match(KNSmlDdfAP)!= KErrNotFound)
-        {
-        TBool inDatabase = EFalse;
-
-        CCommsDbTableView* apView = iDatabase->OpenTableLC(TPtrC(IAP));
-
-        TInt errorCode = apView->GotoFirstRecord();
-        
-        while ( errorCode == KErrNone ) 
-            {
-            TUint32 lValue;
-            TBool validService = EFalse;
-            TInt lLine(0);
-            apView->ReadUintL(TPtrC(COMMDB_ID),lValue);
-
-            TBuf<KCommsDbSvrMaxFieldLength> serviceType;
-            apView->ReadTextL(TPtrC(IAP_SERVICE_TYPE), serviceType);
-            TUint32 bearerId  = 0;
-            apView->ReadUintL(TPtrC(IAP_BEARER),bearerId);
-            //
-            // Skip other service types than GSM outgoing
-            //
-            if (serviceType == TPtrC(OUTGOING_GPRS) ||
-                serviceType == TPtrC(INCOMING_GPRS))
-                {
-                validService = ETrue;
-                }
-
-            else if(serviceType == TPtrC(LAN_SERVICE) &&
-                    bearerId > 1) 
-                {
-                validService = ETrue;
-                }
-            else if(serviceType == TPtrC(VPN_SERVICE)) 
-                {
-                validService = ETrue;
-                }
-            else if( ( serviceType == TPtrC(LAN_SERVICE) ) && iWlanSupported ) 
-                {
-                validService = ETrue;
-                }
-
-            if(validService)
-                { 
-                // Skip others
-                //
-                //  Check if in aPreviousURISegmentList
-                // 
-                while(!inDatabase && lLine < aPreviousURISegmentList.Count())
-                    {
-                    TUint32 list = GetIntObject8(aPreviousURISegmentList.At(lLine).iURISegLUID);
-                    if(list == lValue) 
-                        {
-                        inDatabase = ETrue;
-                        }
-                    else
-                        {
-                        lLine++;
-                        }
-                    }
-
-                if(inDatabase)
-                    {
-                    currentURISegmentList->InsertL(currentURISegmentList->Size(),aPreviousURISegmentList.At(lLine).iURISeg);
-                    currentURISegmentList->InsertL(currentURISegmentList->Size(),KNSmlDmApValFSlash);
-                    inDatabase = EFalse;
-                    DBG_ARGS8(_S8("InList: Id = %d Name %S"), lValue, &aPreviousURISegmentList.At(lLine).iURISeg);
-
-                    }
-                else
-                    {
-                    _LIT8(Kprev,"APId");
-                    TBuf8<9> addNAME(Kprev); // APIdnnn , nnn = profileid
-                    addNAME.AppendNumFixedWidth(lValue,EDecimal,3); 
-
-                    currentURISegmentList->InsertL(currentURISegmentList->Size(),addNAME);
-                    currentURISegmentList->InsertL(currentURISegmentList->Size(),KNSmlDmApValFSlash);
-                    DBG_ARGS8(_S8("NotInList: Id = %d Name %S"), lValue, &addNAME);
-
-                    // KNSmlDMStart includes start text for URISeg
-                    TBuf8<20> addURI; // AP/APIdnnn , nnn = profileid
-                    addURI.Append(_L8("AP/APId"));
-                    addURI.AppendNumFixedWidth(lValue,EDecimal,3); 
-
-                    TBuf8<16> addLUID;
-                    _LIT8(KFormat,"%d");
-                    addLUID.Format(KFormat,lValue);
-
-                    // Also added to mapping
-                    iCallBack->SetMappingL(addURI,addLUID);
-                    }
-                } // Skip
-            errorCode = apView->GotoNextRecord();
-            }
-
-        iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EOk);
-        iCallBack->SetResultsL(aResultsRef,*currentURISegmentList,KNullDesC8);
-
-        CleanupStack::PopAndDestroy(2); // apView, currentURISegmentList
-
-        _DBG_FILE("CNSmlInternetAdapter::ChildURIListL(): AP end");
-        return;
-        }
-
-    iISPId = IntLUID(aLUID);
-
-//
-//  Get all NAPDef numbers
-//
-    if (aURI.Match(_L8("AP/*/NAPDef"))!= KErrNotFound)
-        {
-        TBool inDatabase = EFalse;
-        TBuf<KCommsDbSvrMaxFieldLength> serviceType;
-        TUint32 serviceId;
-
-        CCommsDbTableView* napdefView = iDatabase->OpenViewMatchingUintLC(TPtrC(IAP)
-                                                                          ,
-                                                                          TPtrC(COMMDB_ID),
-                                                                          iISPId);
-
-        TInt errorCode = napdefView->GotoFirstRecord();
-
-        if (errorCode != KErrNone )
-            {
-            iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EError);
-            _DBG_FILE("CNSmlInternetAdapter::ChildURIListL(): NAPDef error end");
-            CleanupStack::PopAndDestroy(2); // napdefView, currentURISegmentList
-            return;
-            }
-        else
-            {
-            napdefView->ReadTextL(TPtrC(IAP_SERVICE_TYPE), serviceType);
-            napdefView->ReadUintL(TPtrC(IAP_SERVICE),       serviceId);  // ID  
-            CleanupStack::PopAndDestroy(); // napdefView
-            }
-        
-        CCommsDbTableView* tableView = iDatabase->OpenViewMatchingUintLC(serviceType,
-                                                                         TPtrC(COMMDB_ID),
-                                                                         serviceId);
-
-        errorCode = tableView->GotoFirstRecord();
-
-        while ( errorCode == KErrNone ) 
-            {
-            TUint32 lValue;
-            TInt lLine(0);
-            tableView->ReadUintL(TPtrC(COMMDB_ID),lValue);
-            //
-            //  Check if in aPreviousURISegmentList
-            // 
-            while(!inDatabase && lLine<aPreviousURISegmentList.Count())
-                {
-                TUint32 list = GetIntObject8(aPreviousURISegmentList.At(lLine).iURISegLUID);
-                if(list == lValue) 
-                    {
-                    inDatabase = ETrue;
-                    }
-                else
-                    {
-                    lLine++;
-                    }
-                }
-
-            if(inDatabase)
-                {
-                currentURISegmentList->InsertL(currentURISegmentList->Size(),aPreviousURISegmentList.At(lLine).iURISeg);
-                currentURISegmentList->InsertL(currentURISegmentList->Size(),KNSmlDmApValFSlash);
-                inDatabase = EFalse;
-                }
-            else
-                {
-                _LIT8(Kprev,"NAPId");
-                TBuf8<15> addNAME(Kprev); // APIdnnn , nnn = profileid
-                addNAME.AppendNumFixedWidth(lValue,EDecimal,3); 
-
-                currentURISegmentList->InsertL(currentURISegmentList->Size(),addNAME);
-                currentURISegmentList->InsertL(currentURISegmentList->Size(),KNSmlDmApValFSlash);
-
-
-
-                _LIT8(Kprev2,"/NAPId");
-                TBuf8<80> addURI; // AP/xxx/NAPDef/NAPIdnnn , nnn = id nbr
-                addURI.Append(aURI);
-                addURI.Append(Kprev2);
-                addURI.AppendNumFixedWidth(lValue,EDecimal,3); 
-
-                TBuf8<16> addLUID;
-                _LIT8(KFormat,"%d");    
-                addLUID.Format(KFormat,lValue); 
-
-                // Also added to mapping
-                iCallBack->SetMappingL(addURI,addLUID);
-                }
-            errorCode = tableView->GotoNextRecord();
-            }
-
-        iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EOk);
-        iCallBack->SetResultsL(aResultsRef,*currentURISegmentList,KNullDesC8);
-
-        CleanupStack::PopAndDestroy(2); // tableView, currentURISegmentList
-
-        _DBG_FILE("CNSmlInternetAdapter::ChildURIListL(): AP end");
-        return;
-        }
-
-//  Get all Px numbers 
-//  Check also AP-nbr + serviceType and nbr for Proxy
-//  To get right data for AP
-//
-    if (aURI.Match(_L8("AP/*/Px"))!= KErrNotFound)
-        {
-        TBool inDatabase = EFalse;
-        TBuf<KCommsDbSvrMaxFieldLength> serviceType;
-        TUint32                         ServiceIsp;
-
-        CCommsDbTableView* pxView = iDatabase->OpenViewMatchingUintLC(TPtrC(IAP),
-                                                                      TPtrC(COMMDB_ID),
-                                                                      iISPId);
-
-        TInt errorCode = pxView->GotoFirstRecord();
-
-        if (errorCode != KErrNone )
-            {
-            CleanupStack::PopAndDestroy(2); // pxView, currentURISegmentList
-            _DBG_FILE("CNSmlInternetAdapter::ChildURIListL(): NAPDef error end");
-            iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EError);
-            return;
-            }
-        else
-            {
-            pxView->ReadTextL(TPtrC(IAP_SERVICE_TYPE), serviceType); // Type
-            pxView->ReadUintL(TPtrC(IAP_SERVICE),      ServiceIsp);  // ID  
-            CleanupStack::PopAndDestroy(); // pxView
-            }
-        
-        CCommsDbTableView* tableView = iDatabase->OpenViewMatchingTextLC(TPtrC(PROXIES),
-                                                                         TPtrC(PROXY_SERVICE_TYPE),
-                                                                         serviceType);
-
-        errorCode = tableView->GotoFirstRecord();
-        
-        TBool proxyFound(false);
-        while ( errorCode == KErrNone ) 
-            {
-            TUint32 lProxyIspId;
-            TUint32 lProxyId;
-            TInt lLine(0);
-            tableView->ReadUintL(TPtrC(PROXY_ISP),lProxyIspId);
-            tableView->ReadUintL(TPtrC(COMMDB_ID),lProxyId);
-            if (lProxyIspId == ServiceIsp) // Right value ISP
-                {
-                proxyFound=true;
-                tableView->ReadUintL(TPtrC(COMMDB_ID),lProxyId);
-                //
-                //  Check if in aPreviousURISegmentList
-                // 
-                while(!inDatabase && lLine < aPreviousURISegmentList.Count())
-                    {
-                    TUint32 list = GetIntObject8(aPreviousURISegmentList.At(
-                                                     lLine).iURISegLUID) - KNSmlApProxyLowerBase;
-                    if(list == lProxyId) 
-                        {
-                        inDatabase = ETrue;
-                        }
-                    else
-                        {
-                        lLine++;
-                        }
-                    }
-
-                if(inDatabase)
-                    {
-                    currentURISegmentList->InsertL(currentURISegmentList->Size(),aPreviousURISegmentList.At(lLine).iURISeg);
-                    currentURISegmentList->InsertL(currentURISegmentList->Size(),KNSmlDmApValFSlash);
-                    inDatabase = EFalse;
-                    DBG_ARGS8(_S8("InList: Id = %d Name %S"), lProxyId + KNSmlApProxyLowerBase , &aPreviousURISegmentList.At(lLine).iURISeg);
-                    }
-                else
-                    {
-                    _LIT8(Kprev,"PXId");
-                    TBuf8<9> addNAME(Kprev); // PXIdnnn , nnn = profileid
-                    addNAME.AppendNumFixedWidth(lProxyId,EDecimal,3); 
-
-                    currentURISegmentList->InsertL(currentURISegmentList->Size(),addNAME);
-                    currentURISegmentList->InsertL(currentURISegmentList->Size(),KNSmlDmApValFSlash);
-                    DBG_ARGS8(_S8("NotInList: Id = %d Name %S"), lProxyId, &addNAME);
-                    TBuf8<80> addURI; // AP/xxx/Px/PXIdnnn , nnn = id nbr
-                    addURI.Append(aURI);
-                    _LIT8( KPxid, "/PXId");
-                    addURI.Append( KPxid );
-                    addURI.AppendNumFixedWidth(lProxyId,EDecimal,3); 
-
-                    TBuf8<16> addLUID;
-                    _LIT8(KFormat,"%d");    
-                    addLUID.Format(KFormat,  KNSmlApProxyLowerBase + lProxyId);    // 100000 + lProxyId
-
-                    // Also added to mapping
-                    iCallBack->SetMappingL(addURI,addLUID);
-                    }
-                }
-            errorCode = tableView->GotoNextRecord();
-            }
-        _DBG_FILE("CNSmlInternetAdapter::ChildURIListL(): AP end");
-        if(proxyFound)
-            {
-            iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EOk);    
-            }
-        else
-            {
-            iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::ENotFound);
-            }
-        iCallBack->SetResultsL(aResultsRef,*currentURISegmentList,KNullDesC8);
-
-        CleanupStack::PopAndDestroy(2); //  tableView, currentURISegmentList
-
-        return;
-        }
-
-    if (aURI.Match(_L8("AP/*/Bearer/*"  ))!= KErrNotFound &&
-        aURI.Match(_L8("AP/*/Bearer/*/*"))== KErrNotFound )
-        {
-        currentURISegmentList->InsertL(currentURISegmentList->Size(),(_L8("BearerL/Direction"))); // Direction
-        iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EOk);
-        iCallBack->SetResultsL(aResultsRef,*currentURISegmentList,KNullDesC8);
-        CleanupStack::PopAndDestroy(); // currentURISegmentList
-        _DBG_FILE("CNSmlInternetAdapter::ChildURIListL(): BearerL end");
-        return;
-        }
-
-    if (aURI.Match(_L8("AP/*/Bearer"))!= KErrNotFound)
-        {
-        if(aPreviousURISegmentList.Count()>0) // Allready mapped
-            {
-            currentURISegmentList->InsertL(currentURISegmentList->Size(),aPreviousURISegmentList.At(0).iURISeg);
-            currentURISegmentList->InsertL(currentURISegmentList->Size(),KNSmlDmApValFSlash);
-            }
-        else
-            {
-            _LIT8(Kprev,"BId");
-            TBuf8<9> addNAME(Kprev); // Id
-            addNAME.AppendNumFixedWidth(checkLUID,EDecimal,3); 
-
-            currentURISegmentList->InsertL(currentURISegmentList->Size(),addNAME);
-            currentURISegmentList->InsertL(currentURISegmentList->Size(),KNSmlDmApValFSlash);
-    
-            TBuf8<80> addURI; // AP/xxx/NapDef/Bearer/BIdn , n=aLUID
-            addURI.Append(aURI);
-            _LIT8( KBid, "/BId");
-            addURI.Append( KBid );
-            addURI.AppendNumFixedWidth(checkLUID,EDecimal,3); 
-
-            TBuf8<16> addLUID;
-            _LIT8(KFormat,"%d");    
-            addLUID.Format(KFormat,checkLUID);
-
-            // Also added to mapping
-            iCallBack->SetMappingL(addURI,addLUID);
-            }
-        _DBG_FILE("CNSmlInternetAdapter::ChildURIListL(): Bearer end");
-        iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EOk);
-        iCallBack->SetResultsL(aResultsRef,*currentURISegmentList,KNullDesC8);
-
-        CleanupStack::PopAndDestroy(); //  currentURISegmentList
-        
-        return;
-        }
-
-    if (aURI.Match(_L8("AP/*/DNSAddr/*"  ))!= KErrNotFound &&
-        aURI.Match(_L8("AP/*/DNSAddr/*/*"))== KErrNotFound )
-        {
-        currentURISegmentList->InsertL(currentURISegmentList->Size(),KNSmlDNSAddrNode);
-        iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EOk);
-        iCallBack->SetResultsL(aResultsRef,*currentURISegmentList,KNullDesC8);
-        CleanupStack::PopAndDestroy(); // currentURISegmentList
-        _DBG_FILE("CNSmlInternetAdapter::ChildURIListL(): DNSAddrL end");
-        return;
-        }
-
-    if (aURI.Match(_L8("AP/*/DNSAddr"))!= KErrNotFound)
-        {
-
-        TBuf<KCommsDbSvrMaxFieldLength> ServType;
-        TUint32 servId;
-
-        CCommsDbTableView* napdefView = iDatabase->OpenViewMatchingUintLC(TPtrC(IAP) ,
-                                                                          TPtrC(COMMDB_ID),
-                                                                          iISPId);
-
-        TInt errorCode = napdefView->GotoFirstRecord();
-
-        if (errorCode != KErrNone )
-            {
-            iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EError);
-            _DBG_FILE("CNSmlInternetAdapter::ChildURIListL(): DNSAddr error end");
-            CleanupStack::PopAndDestroy(2); // napdefView, currentURISegmentList
-            return;
-            }
-        else
-            {
-            napdefView->ReadTextL(TPtrC(IAP_SERVICE_TYPE), ServType);
-            napdefView->ReadUintL(TPtrC(IAP_SERVICE),       servId);  // ID  
-            CleanupStack::PopAndDestroy(napdefView); // napdefView
-            }
-        
-        CCommsDbTableView* tableView = iDatabase->OpenViewMatchingUintLC(ServType,
-                                                                         TPtrC(COMMDB_ID),
-                                                                         servId);
-
-        errorCode = tableView->GotoFirstRecord();
-
-        if ( errorCode != KErrNone ) 
-            {
-            iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EError);
-            _DBG_FILE("CNSmlInternetAdapter::ChildURIListL(): DNSAddr error end");
-            CleanupStack::PopAndDestroy(2); // tableView, currentURISegmentList
-            return;
-            }
-        else 
-            {
-            // Now we can read DNSAddrL values
-            TInt leavecode;
-            TBuf<KCommsDbSvrMaxFieldLength> columnValue;
-            TBuf8<16> addLUID;
-            TBuf8<80> addURI; // AP/xxx/NAPDef/DNSAddr/DNSx
-            _LIT8(KFormat,"%d");    
-            TRAP(leavecode, tableView->ReadTextL( TPtrC(SERVICE_IP_NAME_SERVER1 ),  columnValue));
-            if ( ( leavecode == KErrNone ) && ( columnValue.Length() > 0 ) )
-                {
-                addURI.Append(aURI);
-                addURI.Append(KNSmlDNS1);
-                _LIT8( KDns1, "DNS1");
-                currentURISegmentList->InsertL(currentURISegmentList->Size(),KDns1);
-                addLUID.Format(KFormat, DnsToLuid( UriUtils::EIPv4Host, 1));
-                iCallBack->SetMappingL(addURI,addLUID);
-                addURI.Zero();
-                }
-
-            TRAP(leavecode, tableView->ReadTextL( TPtrC(SERVICE_IP_NAME_SERVER2 ),  columnValue));
-            if ( leavecode == KErrNone && ( columnValue.Length() > 0 ) )
-                {
-                if ( currentURISegmentList->Size() > 0 )
-                    {
-                    currentURISegmentList->InsertL(currentURISegmentList->Size(), KNSmlDmApValFSlash);
-                    }
-                addURI.Append(aURI);
-                addURI.Append(KNSmlDNS2);
-                _LIT8( KDns2, "DNS2");
-                currentURISegmentList->InsertL(currentURISegmentList->Size(),KDns2);
-                addLUID.Format(KFormat, DnsToLuid( UriUtils::EIPv4Host, 2));
-                iCallBack->SetMappingL(addURI,addLUID);
-                addURI.Zero();
-                }
-
-            TRAP(leavecode, tableView->ReadTextL( TPtrC(SERVICE_IP6_NAME_SERVER1 ),  columnValue));
-            if ( leavecode == KErrNone && ( columnValue.Length() > 0 ) )
-                {
-                if ( currentURISegmentList->Size() > 0 )
-                    {
-                    currentURISegmentList->InsertL(currentURISegmentList->Size(), KNSmlDmApValFSlash);
-                    }
-                addURI.Append(aURI);
-                addURI.Append(KNSmlDNS3);
-                _LIT8( KDns3, "DNS3");
-                currentURISegmentList->InsertL(currentURISegmentList->Size(),KDns3);
-                addLUID.Format(KFormat, DnsToLuid( UriUtils::EIPv6Host, 1));
-                iCallBack->SetMappingL(addURI,addLUID);
-                addURI.Zero();
-                }
-
-            TRAP(leavecode, tableView->ReadTextL( TPtrC(SERVICE_IP6_NAME_SERVER2 ),  columnValue));
-            if ( leavecode == KErrNone && ( columnValue.Length() > 0 ) )
-                {
-                if ( currentURISegmentList->Size() > 0 )
-                    {
-                    currentURISegmentList->InsertL(currentURISegmentList->Size(), KNSmlDmApValFSlash);
-                    }
-                addURI.Append(aURI);
-                addURI.Append(KNSmlDNS4);
-                _LIT8(KDns4, "DNS4" );
-                currentURISegmentList->InsertL(currentURISegmentList->Size(),KDns4 );
-                addLUID.Format(KFormat, DnsToLuid( UriUtils::EIPv6Host, 2));
-                iCallBack->SetMappingL(addURI,addLUID);
-                }
-
-            _DBG_FILE("CNSmlInternetAdapter::ChildURIListL(): DNSAddr end");
-            iCallBack->SetStatusL(aStatusRef, CSmlDmAdapter::EOk);
-            iCallBack->SetResultsL(aResultsRef, *currentURISegmentList, KNullDesC8);
-
-            CleanupStack::PopAndDestroy(tableView);
-            CleanupStack::PopAndDestroy(currentURISegmentList); //  currentURISegmentList
-            }
-        return;
-        }
-
-
-    if (aURI.Match(_L8("AP/*/Port/*"  ))!= KErrNotFound &&
-        aURI.Match(_L8("AP/*/Port/*/*"))== KErrNotFound )
-        {
-        currentURISegmentList->InsertL(currentURISegmentList->Size(),KNSmlDdfPortNbr);
-        iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EOk);
-        iCallBack->SetResultsL(aResultsRef,*currentURISegmentList,KNullDesC8);
-        CleanupStack::PopAndDestroy(); // currentURISegmentList
-        _DBG_FILE("CNSmlInternetAdapter::ChildURIListL(): Port end");
-        return;
-        }
-
-    if (aURI.Match(_L8("AP/*/Port"))!= KErrNotFound)
-        {
-
-        TUint32 iapID10 = GetAPIdFromURIL(aURI);
-
-        if(WapAPExistsL(iapID10)) // WapPort
-            {
-            TBuf8<80> addURI; // AP/xxx/Px/Port/WAP
-            addURI.Append(aURI);
-            _LIT8( KWap, "/WAP");
-            addURI.Append( KWap );
-            _LIT8( KWap2, "WAP/");
-            currentURISegmentList->InsertL(currentURISegmentList->Size(),KWap2);
-            }
-        
-        if(PxExistsL(checkLUID)) // ProxyPort
-            {
-            TBuf8<80> addURI; // AP/xxx/Px/Port/PROXY
-            addURI.Append(aURI);
-            _LIT8( KProxy, "/PROXY");
-            addURI.Append( KProxy );
-            _LIT8( KProxy2, "PROXY/");
-            currentURISegmentList->InsertL(currentURISegmentList->Size(),KProxy2);
-            }
-
-        _DBG_FILE("CNSmlInternetAdapter::ChildURIListL(): Port end");
-        iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EOk);
-        iCallBack->SetResultsL(aResultsRef,*currentURISegmentList,KNullDesC8);
-
-        CleanupStack::PopAndDestroy(); //  currentURISegmentList
-        
-        return;
-        }
-
-    if (aURI.Match(_L8("AP/*/NAPAuthInf/*"  ))!= KErrNotFound &&
-        aURI.Match(_L8("AP/*/NAPAuthInf/*/*"))== KErrNotFound )
-        {
-        _LIT8( KAuthFields, "AuthName/AuthSecr");
-        currentURISegmentList->InsertL(currentURISegmentList->Size(),(KAuthFields));
-        iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EOk);
-        iCallBack->SetResultsL(aResultsRef,*currentURISegmentList,KNullDesC8);
-        CleanupStack::PopAndDestroy(); // currentURISegmentList
-        _DBG_FILE("CNSmlInternetAdapter::ChildURIListL(): NAPAuthInfL end");
-        return;
-        }
-
-    if (aURI.Match(_L8("AP/*/NAPAuthInf"))!= KErrNotFound)
-        {
-        _LIT8(Kprev,"AUId");
-        TBuf8<9> addNAME(Kprev); // Id
-        addNAME.AppendNumFixedWidth(checkLUID,EDecimal,3); 
-
-        currentURISegmentList->InsertL(currentURISegmentList->Size(),addNAME);
-        currentURISegmentList->InsertL(currentURISegmentList->Size(),KNSmlDmApValFSlash);
-
-        TBuf8<80> addURI; // AP/xxx/NapDef/NAPAuthInf/AUIdn , n=aLUID
-        addURI.Append(aURI);
-        _LIT8( KAuid, "/AUId" );
-        addURI.Append( KAuid );
-        addURI.AppendNumFixedWidth(checkLUID,EDecimal,3); 
-
-        TBuf8<16> addLUID;
-        _LIT8(KFormat,"%d");    
-        addLUID.Format(KFormat,checkLUID);
-
-        // Also added to mapping
-        iCallBack->SetMappingL(addURI,addLUID);
-        _DBG_FILE("CNSmlInternetAdapter::ChildURIListL(): NAPAuthInf end");
-        iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EOk);
-        iCallBack->SetResultsL(aResultsRef,*currentURISegmentList,KNullDesC8);
-
-        CleanupStack::PopAndDestroy(); //  currentURISegmentList
-        
-        return;
-        }
-
-    if (aURI.Match(_L8("AP/*/PxAuthInf/*"  ))!= KErrNotFound &&
-        aURI.Match(_L8("AP/*/PxAuthInf/*/*"))== KErrNotFound )
-        {
-        _LIT8( KPxAuthFields, "PxAuthId/PxAuthPW");
-        currentURISegmentList->InsertL(currentURISegmentList->Size(),(KPxAuthFields));
-        iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EOk);
-        iCallBack->SetResultsL(aResultsRef,*currentURISegmentList,KNullDesC8);
-        CleanupStack::PopAndDestroy(); // currentURISegmentList
-        _DBG_FILE("CNSmlInternetAdapter::ChildURIListL(): NAPAuthInfL end");
-        return;
-        }
-
-    if (aURI.Match(_L8("AP/*/PxAuthInf"))!= KErrNotFound)
-        {
-        _LIT8(Kprev,"AUPxId");
-        TBuf8<11> addNAME(Kprev); // Id
-        addNAME.AppendNumFixedWidth(checkLUID,EDecimal,3); 
-
-        currentURISegmentList->InsertL(currentURISegmentList->Size(),addNAME);
-        currentURISegmentList->InsertL(currentURISegmentList->Size(),KNSmlDmApValFSlash);
-
-        TBuf8<80> addURI; // AP/xxx/Px/PxAuthInf/AUPxIdn , n=aLUID
-        addURI.Append(aURI);
-        _LIT8( KAupxid, "/AUPxId" );
-        addURI.Append( KAupxid );
-        addURI.AppendNumFixedWidth(checkLUID,EDecimal,3); 
-
-        _DBG_FILE("CNSmlInternetAdapter::ChildURIListL(): NAPAuthInf end");
-        iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EOk);
-        iCallBack->SetResultsL(aResultsRef,*currentURISegmentList,KNullDesC8);
-
-        CleanupStack::PopAndDestroy(); //  currentURISegmentList
-        
-        return;
-        }
-
-    if (aURI.Match(_L8("AP/*/ToNAPID/*"  ))!= KErrNotFound &&
-        aURI.Match(_L8("AP/*/ToNAPID/*/*"))== KErrNotFound )
-        {
-        currentURISegmentList->InsertL(currentURISegmentList->Size(),(KNSmlDdfToNAPIDL));
-        iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EOk);
-        iCallBack->SetResultsL(aResultsRef,*currentURISegmentList,KNullDesC8);
-        CleanupStack::PopAndDestroy(); // currentURISegmentList
-        _DBG_FILE("CNSmlInternetAdapter::ChildURIListL(): ToNAPIDL end");
-        return;
-        }
-
-    if (aURI.Match(_L8("AP/*/ToNAPID"))!= KErrNotFound)
-        {
-        _LIT8(Kprev,"TId");
-        TBuf8<9> addNAME(Kprev); // Id
-        addNAME.AppendNumFixedWidth(checkLUID,EDecimal,3); 
-
-        currentURISegmentList->InsertL(currentURISegmentList->Size(),addNAME);
-        currentURISegmentList->InsertL(currentURISegmentList->Size(),KNSmlDmApValFSlash);
-
-        TBuf8<80> addURI; // AP/xxx/NapDef/ToNAPID/TIdn , n=aLUID
-        addURI.Append(aURI);
-        _LIT8( KTid, "/TId" );
-        addURI.Append( KTid );
-        addURI.AppendNumFixedWidth(checkLUID,EDecimal,3); 
-
-        _DBG_FILE("CNSmlInternetAdapter::ChildURIListL(): ToNAPID end");
-        iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EOk);
-        iCallBack->SetResultsL(aResultsRef,*currentURISegmentList,KNullDesC8);
-
-        CleanupStack::PopAndDestroy(); //  currentURISegmentList
-        
-        return;
-        }
-
-    if (aURI.Match(_L8("AP/*/Networks/*"  ))!= KErrNotFound &&
-        aURI.Match(_L8("AP/*/Networks/*/*"))== KErrNotFound )
-        {
-        _LIT8( KNameId, "Name/ID" );
-        currentURISegmentList->InsertL(currentURISegmentList->Size(),(KNameId));
-        iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EOk);
-        iCallBack->SetResultsL(aResultsRef,*currentURISegmentList,KNullDesC8);
-        CleanupStack::PopAndDestroy(); // currentURISegmentList
-        _DBG_FILE("CNSmlInternetAdapter::ChildURIListL(): Networks end");
-        return;
-        }
-
-    if (aURI.Match(_L8("AP/*/Networks"))!= KErrNotFound)
-        {
-        checkLUID = GetAPIdFromURIL(aURI); 
-
-        CCommsDbTableView* tableView = iDatabase->OpenViewMatchingUintLC(TPtrC(IAP),
-                                                                         TPtrC(COMMDB_ID),
-                                                                         checkLUID);
-
-        TInt errorCode = tableView->GotoFirstRecord();
-        
-        if ( errorCode == KErrNone ) 
-            {
-            TUint32 nwLUID = 0;
-            tableView->ReadUintL(TPtrC(IAP_NETWORK),nwLUID); // Networks luid
-            if(!NetworkExistsL(nwLUID))
-                {
-                errorCode = KErrNotFound;
-                }
-            }
-
-        CleanupStack::PopAndDestroy(); // tableView
-
-        if(errorCode != KErrNone)
-            {
-            _DBG_FILE("CNSmlInternetAdapter::ChildURIListL(): Networks error end");
-            iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EError);
-            CleanupStack::PopAndDestroy(); //  currentURISegmentList
-            return;
-            }
-
-        if(aPreviousURISegmentList.Count()>0) // Allready mapped
-            {
-            currentURISegmentList->InsertL(currentURISegmentList->Size(),aPreviousURISegmentList.At(0).iURISeg);
-            currentURISegmentList->InsertL(currentURISegmentList->Size(),KNSmlDmApValFSlash);
-            }
-        else
-            {
-            _LIT8(Kprev,"NwId");
-            TBuf8<9> addNAME(Kprev); // Id
-            addNAME.AppendNumFixedWidth(checkLUID,EDecimal,3); 
-
-            currentURISegmentList->InsertL(currentURISegmentList->Size(),addNAME);
-            currentURISegmentList->InsertL(currentURISegmentList->Size(),KNSmlDmApValFSlash);
-
-            TBuf8<80> addURI; // AP/xxx/NapDef/Networks/NwIdn , n=aLUID
-            addURI.Append(aURI);
-            _LIT8( KNwid, "/NwId");
-            addURI.Append(KNwid);
-            addURI.AppendNumFixedWidth(checkLUID,EDecimal,3); 
-
-            TBuf8<16> addLUID;
-            _LIT8(KFormat,"%d");    
-            addLUID.Format(KFormat,checkLUID);
-
-
-            // Also added to mapping
-            iCallBack->SetMappingL(addURI,addLUID);
-            }
-        _DBG_FILE("CNSmlInternetAdapter::ChildURIListL(): Networks end");
-        iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EOk);
-        iCallBack->SetResultsL(aResultsRef,*currentURISegmentList,KNullDesC8);
-
-        CleanupStack::PopAndDestroy(); //  currentURISegmentList
-        
-        return;
-        }
-
-    if (aURI.Match(_L8("AP/*/NoPxFor/*"  ))!= KErrNotFound &&
-        aURI.Match(_L8("AP/*/NoPxFor/*/*"))== KErrNotFound )
-        {
-        currentURISegmentList->InsertL(currentURISegmentList->Size(),(KNSmlDdfNoPxForL));
-        iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EOk);
-        iCallBack->SetResultsL(aResultsRef,*currentURISegmentList,KNullDesC8);
-        CleanupStack::PopAndDestroy(); // currentURISegmentList
-        _DBG_FILE("CNSmlInternetAdapter::ChildURIListL(): NoPxFor end");
-        return;
-        }
-
-    if (aURI.Match(_L8("AP/*/NoPxFor"))!= KErrNotFound)
-        {
-        if(aPreviousURISegmentList.Count()>0) // Allready mapped
-            {
-            currentURISegmentList->InsertL(currentURISegmentList->Size(),aPreviousURISegmentList.At(0).iURISeg);
-            currentURISegmentList->InsertL(currentURISegmentList->Size(),KNSmlDmApValFSlash);
-            }
-        else
-            {
-            _LIT8(KexepPrev,"eXC");
-            currentURISegmentList->InsertL(currentURISegmentList->Size(),KexepPrev);
-            }
-        _DBG_FILE("CNSmlInternetAdapter::ChildURIListL(): NoPxFor end");
-        iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EOk);
-        iCallBack->SetResultsL(aResultsRef,*currentURISegmentList,KNullDesC8);
-
-        CleanupStack::PopAndDestroy(); //  currentURISegmentList
-        
-        return;
-        }
-
-    if (aURI.Match(_L8("AP/*/Domain/*"  ))!= KErrNotFound &&
-        aURI.Match(_L8("AP/*/Domain/*/*"))== KErrNotFound )
-        {
-        currentURISegmentList->InsertL(currentURISegmentList->Size(),(KNSmlDdfDomainL));
-        iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EOk);
-        iCallBack->SetResultsL(aResultsRef,*currentURISegmentList,KNullDesC8);
-        CleanupStack::PopAndDestroy(); // currentURISegmentList
-        _DBG_FILE("CNSmlInternetAdapter::ChildURIListL(): Domain end");
-        return;
-        }
-
-    if (aURI.Match(_L8("AP/*/Domain"))!= KErrNotFound)
-        {
-        if(aPreviousURISegmentList.Count()>0) // Allready mapped
-            {
-            currentURISegmentList->InsertL(currentURISegmentList->Size(),aPreviousURISegmentList.At(0).iURISeg);
-            currentURISegmentList->InsertL(currentURISegmentList->Size(),KNSmlDmApValFSlash);
-            }
-        else
-            {
-            _LIT8(KexepPrev,"dOM");
-            currentURISegmentList->InsertL(currentURISegmentList->Size(),KexepPrev);
-            }
-        _DBG_FILE("CNSmlInternetAdapter::ChildURIListL(): Domain end");
-        iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EOk);
-        iCallBack->SetResultsL(aResultsRef,*currentURISegmentList,KNullDesC8);
-
-        CleanupStack::PopAndDestroy(); //  currentURISegmentList
-        
-        return;
-        }
-
-    iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EOk);
-    iCallBack->SetResultsL(aResultsRef,*currentURISegmentList,KNullDesC8);
-    _DBG_FILE("CNSmlInternetAdapter::ChildURIListL(): end");
-
-    CleanupStack::PopAndDestroy(); // currentURISegmentList
-
-    return;
-    }
-
-//------------------------------------------------------------------------------
-// CNSmlInternetAdapter::AddNodeBufferL()
-// Inserts new AP-data to database
-//------------------------------------------------------------------------------
-void CNSmlInternetAdapter::AddNodeBufferL( const TDesC8& aURI, 
-                                           const TDesC8& /*aParentLUID*/, 
-                                           const TInt aStatusRef,
-                                           const TBool aDnsUpd,
-                                           const TBool aWlan )
-    {
-    TInt index = -1;
-
-    for(TInt i = 0; i<iBuffer->Count(); i++)
-        {
-        TPtrC8 parentUri = FirstURISeg(aURI);
-        if(iBuffer->At(i).iMappingName->Compare(parentUri) == 0 )
-            {
-            index = i;
-            break;
-            }
-        }
-
-    if(index<0)
-        {
-        TNSmlAPBufferElement newNode;
-        newNode.iMappingName = aURI.AllocLC();
-        
-        NextAPNameL(*LastURISeg(aURI).AllocLC());
-        CleanupStack::PopAndDestroy();
-        
-        newNode.iName = iIAPName.AllocLC();
-        newNode.iNodeBuf = new (ELeave) CArrayFixFlat <TNSmlAPAddElement> (KNSmlAPGranularity);
-        newNode.iWlanNodeBuf = new (ELeave) CArrayFixFlat <TNSmlAPAddElement> (KNSmlAPGranularity);
-        newNode.iExecuted  = EFalse;
-        newNode.iBearer    = EFalse;
-        newNode.iDirection = EFalse;
-        newNode.iNameReceived = EFalse;
-        if ( aDnsUpd )
-            {
-            newNode.iDnsUpdateBuf = ETrue;
-            }
-        else
-            {
-            newNode.iDnsUpdateBuf = EFalse;
-            }
-        newNode.iLuid = 0;
-        iBuffer->AppendL(newNode);
-        CleanupStack::Pop(2); //newNode.iMappingName,newNode.iName
-
-        index = iBuffer->Count() - 1;
-        }
-
-    if ( !aDnsUpd )
-        {
-        TNSmlAPAddElement newCommand;
-        newCommand.iUri = aURI.AllocLC();
-        newCommand.iData = 0;
-        newCommand.iStatusRef = aStatusRef;
-        newCommand.iLeaf   = EFalse;
-        newCommand.iDone   = EFalse;
-        
-        TPtrC8 parentUri = FirstURISeg(aURI);
-        newCommand.iLuid   = iCallBack->GetLuidAllocL( parentUri );
-        
-        if ( aWlan )
-            {
-            iBuffer->At(index).iWlanNodeBuf->AppendL(newCommand);
-            }
-        else
-            {
-            iBuffer->At(index).iNodeBuf->AppendL(newCommand);
-            }
-        CleanupStack::Pop(); //newCommand.iUri
-        }
-    }
-
-//------------------------------------------------------------------------------
-// CNSmlInternetAdapter::AddLeafBufferL()
-//------------------------------------------------------------------------------
-void CNSmlInternetAdapter::AddLeafBufferL( const TDesC8& aURI,
-                                           const TDesC8& aParentLUID, 
-                                           const TDesC8& aObject, 
-                                           const TDesC8& /*aType*/, 
-                                           const TInt aStatusRef,
-                                           const TBool aWlan )
-    {
-    TInt index = -1;
-
-    for(TInt i = 0; i<iBuffer->Count(); i++)
-        {
-        TPtrC8 parentUri = FirstURISeg(aURI);
-        if(iBuffer->At(i).iMappingName->Compare(parentUri) == 0 )
-            {
-            index = i;
-            break;
-            }
-        }
-
-    if( index<0 )
-        {
-        if ( aParentLUID.Length() < 0 )
-            {
-            DBG_ARGS8(_S8("AP:AddLeafBufferL URI - <%S> <%S> NOTFOUND"), &aURI, &aParentLUID );
-            iCallBack->SetStatusL(aStatusRef,  CSmlDmAdapter::ENotFound);
-            return;
-            }
-        else
-            {
-            // this means update to DNSAddr/<X>
-            TPtrC8 apURI = FirstURISeg(aURI);
-            HBufC8* luid = iCallBack->GetLuidAllocL(apURI);
-            CleanupStack::PushL( luid );
-            
-            AddNodeBufferL( apURI, luid->Des(), -2, ETrue );
-            iDnsIpv4Pri = 0;
-            iDnsIpv6Pri = 0;
-            
-            CleanupStack::PopAndDestroy( luid );
-            index = 0;
-            }
-        }
-
-    TNSmlAPAddElement newCommand;
-
-    newCommand.iUri = aURI.AllocLC(); //aURI.AllocLC();
-    newCommand.iData = aObject.AllocLC();
-    newCommand.iStatusRef = aStatusRef;
-    newCommand.iLuid = aParentLUID.AllocLC();
-    newCommand.iLeaf = ETrue;
-    newCommand.iDone = EFalse;
-    
-    if ( aWlan )
-        {
-        iBuffer->At(index).iWlanNodeBuf->AppendL(newCommand);
-        }
-    else
-        {
-        iBuffer->At(index).iNodeBuf->AppendL(newCommand);
-        }
-    
-    CleanupStack::Pop(3); //newCommand.iLastUriSeg, newCommand.iData, newCommand.iLuid
-
-    if (aURI.Find(KNSmlDdfBearerL) >= 0 )   // Bearer added
-        {
-        if (aObject.Match(KNSmlDmApValGsmGprs)!= KErrNotFound)
-            {
-            iBuffer->At(index).iBearer = ETrue;
-            }
-
-        else if (aObject.Match(KNSmlDmApVal3Gppps) != KErrNotFound ||
-                 aObject.Match(KNSmlDmApValVpn) != KErrNotFound )
-            {
-            iBuffer->At(index).iBearer = ETrue;
-            }
-        if ( ( aObject.Match(KNSmlDmApValWlan) != KErrNotFound ) && iWlanSupported )   // Valid Bearer
-            {
-            iBuffer->At(index).iBearer = ETrue;
-            }
-        }
-
-    if (aURI.Find(KNSmlDdfDirection) >= 0 ) // Direction added
-        {
-        iBuffer->At(index).iDirection = ETrue;
-        }
-    
-    if ( aURI.Match(_L8("AP/*/NAPDef/*/*"  ))!= KErrNotFound &&
-         aURI.Match(_L8("AP/*/NAPDef/*/*/*"))== KErrNotFound &&
-         LastURISeg(aURI).Compare( KNSmlDdfNAPName ) == 0 )                         
-        {
-        iIAPExists = EFalse;
-        iBuffer->At(index).iNameReceived = ETrue;
-        
-        delete iBuffer->At(index).iName;
-        iBuffer->At(index).iName = 0;
-        
-        iBuffer->At(index).iName = aObject.AllocLC();
-        iIAPName.Copy( aObject );
-        CleanupStack::Pop();
-        
-        // Check if Name and LUID match
-        TPtrC qTable = TPtrC(IAP);          // Check if IAP-table free
-        TPtrC qDB    = TPtrC(COMMDB_ID);
-        TPtrC8 parentUri = FirstURISeg(aURI);
-        HBufC8* luid = iCallBack->GetLuidAllocL( parentUri );
-        CleanupStack::PushL( luid );
-        
-        CCommsDbTableView* tableView = iDatabase->OpenViewMatchingUintLC(qTable,
-                                                                         qDB,
-                                                                         IntLUID( *luid ) );
-        
-            
-        TInt errorCode = tableView->GotoFirstRecord();
-        if( errorCode != KErrNotFound )
-            {
-            // Check the name
-            TBuf8<KCommsDbSvrMaxFieldLength> name;                             
-            tableView->ReadTextL( TPtrC(COMMDB_NAME ),  name);
-            if ( name.Compare( aObject ) != 0 )
-                {
-                // Not correct name                                    
-                // Remove all mappings from AP/xxx level
-                TInt ret = iCallBack->RemoveMappingL( KNSmlInternetAdapterImplUid,
-								GetDynamicAPNodeUri( aURI ) , ETrue );		
-                iPrevURI->Des().Format( KNullDesC8 );
-                iPrevLUID = 0;
-                }     
-            else
-                {
-                iIAPExists = ETrue;
-                iLeafType = EDMUpdate;
-                }
-            }
-        CleanupStack::PopAndDestroy( tableView );
-        CleanupStack::PopAndDestroy( luid );
-        }
-//    
-    
-//  If Bearer data + Direction + name => add is possible for AP
-//
-    if (iBuffer->At(index).iDirection &&
-        iBuffer->At(index).iBearer &&
-        iBuffer->At(index).iNameReceived &&
-        !iExecutingBuffer )
-        {
-        iBearer.Zero();        
-        iDirection = ECommDbConnectionDirectionUnknown;
-        ExecuteBufferL(aURI);
-
-        }
-    }
-
-//------------------------------------------------------------------------------
-// CNSmlInternetAdapter::AddNodeObjectL()
-// Inserts new AP-data to database
-//------------------------------------------------------------------------------
-void CNSmlInternetAdapter::AddNodeObjectL( const TDesC8& aURI, 
-                                           const TDesC8& aParentLUID, 
-                                           const TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlInternetAdapter::AddNodeObjectL(): begin");
-
-    DBG_ARGS8(_S8("CNSmlInternetAdapter::AddNodeObjectL(): aURI=<%S>, aParentLUID=<%S>"), &aURI, &aParentLUID);
-
-    if (iLeafType == EDMUpdate && iExecutingBuffer )
-        {
-        // This is an update to an old IAP. All node additions return KErrAlreadyExists.
-        iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EAlreadyExists); // EError
-        _DBG_FILE("CNSmlInternetAdapter::AddNodeObjectL(): EAlreadyExists end");
-        return;
-        }
-
-    // Save LUID to local variable to be able to reset the value, if needed.
-    TBuf8<KSmlMaxURISegLen> parentLUID;
-    parentLUID.Zero();
-    parentLUID = aParentLUID;
-
-    TUint32 apId = GetAPIdFromURIL( aURI );
-        
-    if( parentLUID.Length() > 0 && IntLUID(parentLUID) > 0 && 
-        !APExistsL( apId ) )
-        {
-        // AP has been deleted. Handle as new data.
-        _DBG_FILE("CNSmlInternetAdapter::AddNodeObjectL(): parentLUID.Length() > 0 && !APExistsL() -> Remove mapping ");          
-        TInt ret = iCallBack->RemoveMappingL( KNSmlInternetAdapterImplUid,
-								GetDynamicAPNodeUri( aURI ) , ETrue );
-		if(ret)
-			{
-			iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-			return;
-			}
-        parentLUID.Zero();
-        iPrevURI->Des().Format( KNullDesC8 );
-        iPrevLUID = 0;
-        }
-    
-    if(parentLUID.Length()<=0)
-        {
-        // Check OOD before saving new 
-        RFs fs;
-        User::LeaveIfError( fs.Connect() );
-        CleanupClosePushL(fs);
-
-        if (SysUtil::FFSSpaceBelowCriticalLevelL(&fs, KNSmlInternetAdapterFatMinSize))
-            {
-            CleanupStack::PopAndDestroy(); // fs
-            iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EDiskFull);
-            _DBG_FILE("CNSmlInternetAdapter::AddNodeObjectL(): DISK FULL end");
-            return;
-            // do not write
-            }
-        CleanupStack::PopAndDestroy(); //fs
-        }
-//
-//  Check if AP-add
-//
-    if(( aURI.Match(_L8("AP/*"  ))!= KErrNotFound &&
-         aURI.Match(_L8("AP/*/*"))== KErrNotFound ) ||
-       ( aURI.Match(_L8("AP/*/NAPDef/*"  ))!= KErrNotFound &&
-         aURI.Match(_L8("AP/*/NAPDef/*/*"))== KErrNotFound ) ||
-       aURI.Match(_L8("AP/*/NAPDef"  ))!= KErrNotFound ||
-       aURI.Match(_L8("AP/*/NAPDef/*/Bearer"))!= KErrNotFound ||
-       ( aURI.Match(_L8("AP/*/NAPDef/*/Bearer/*"  ))!= KErrNotFound &&
-         aURI.Match(_L8("AP/*/NAPDef/*/Bearer/*/*"))== KErrNotFound ) ||
-       aURI.Match(_L8("*/WLAN*" )) != KErrNotFound)
-        {
-        if( ( parentLUID.Length()<=0 ) && ( aURI.Match(_L8("*/WLAN*" )) != KErrNotFound ) )
-            {
-            AddNodeBufferL(aURI,parentLUID,aStatusRef, EFalse, ETrue);
-            return;
-            }
-        if(parentLUID.Length()<=0)
-            {
-            AddNodeBufferL(aURI,parentLUID,aStatusRef, EFalse);
-            return;
-            }
-
-        if( iTransactionCommitted && !iDatabase->InTransaction() )
-        {
-        
-        _DBG_FILE("CNSmlInternetAdapter::AddNode object, begin commsdb transaction ");
-        TInt codeBegin = iDatabase->BeginTransaction();
-        TInt retry = KBeginTransRetryCount;
-        if( codeBegin == KErrNone )
-        {
-          iTransactionCommitted = EFalse;
-        }
-        DBG_ARGS8(_S8("CNSmlInternetAdapter::AddNode object iDatabase->Begintransaction start of addobjectL return code = %d"),codeBegin);
-        if( codeBegin == KErrLocked )
-        {
-        _DBG_FILE("CNSmlInternetAdapter::Addnodeobject Database->Begintransaction has returned KErrLocked");
-        while ( retry > 0 && codeBegin == KErrLocked )
-            {
-            User::After(KBeginTransRetryDelay);
-            codeBegin = iDatabase->BeginTransaction();
-            DBG_ARGS8(_S8("CNSmlInternetAdapter::AddNode object iDatabase->Begintransaction after 2 seconds of wait of addobjectL return code = %d"),codeBegin);
-            retry--;
-            }
-        
-        if( codeBegin == KErrNone )
-            {
-             iTransactionCommitted = EFalse;
-            _DBG_FILE("CNSmlInternetAdapter::AddNode object transaction commited is false ");        
-            }
-                       
-        }
-      
-     
-        }    
-        if ( ( aURI.Match(_L8("*/WLAN*" )) != KErrNotFound ) && iWlanSupported )
-            {
-            DBG_ARGS8(_S8("To WlanAdapter::AddNodeObjectL - uri: <%S> to parentLUID: <%S>"), &aURI, &parentLUID );
-            iWlanAdapter->AddNodeObjectL( aURI, parentLUID, aStatusRef );
-            return;
-            }
-
-        TInt pluid = IntLUID(parentLUID);
-
-        if(pluid < 0)
-            {
-            iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EOk);
-            _DBG_FILE("CNSmlInternetAdapter::AddNodeObjectL(): end");
-            return;
-            }
-        iIAPId = pluid;
-
-        TPtrC qTable = TPtrC(IAP);          // Check if IAP-table free
-        TPtrC qDB    = TPtrC(COMMDB_ID);
-
-    //Check if URI is /AP/*/NAPDef/* then it should be check IAP ID in DB not IAPService
-    if(( iIAPId > 0 ) && ((aURI.Match(_L8("AP/*/NAPDef/*"  ))!= KErrNotFound) || (aURI.Match(_L8("AP/*/NAPDef/*/Bearer/*"  ))!= KErrNotFound)))
-    {
-      //Get parent UID and check if that exist if not add 
-      iIAPId = GetAPIdFromURIL(aURI);
-      
-    }
-        CCommsDbTableView* tableView = iDatabase->OpenViewMatchingUintLC(qTable,
-                                                                         qDB,
-                                                                         iIAPId);
-    
-        TInt errorCode = tableView->GotoFirstRecord();
-
-        CleanupStack::PopAndDestroy(tableView); 
-
-        // Node allready exists => No adding possible
-        if ( errorCode == KErrNone )
-            {
-            if ( !iExecutingBuffer )
-                {
-                AddNodeBufferL(aURI,parentLUID,aStatusRef, EFalse);
-                }
-            else
-                {
-                iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EAlreadyExists); // EError
-                _DBG_FILE("CNSmlInternetAdapter::AddNodeObjectL(): EAlreadyExists end");    
-                }            
-            return;
-            }
-        else if ( iIAPId == 0 )
-            {
-            iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::ENotFound);
-            _DBG_FILE("CNSmlInternetAdapter::AddNodeObjectL(): ENotFound end");
-            return;
-            }
-        else if( iIAPId > 0 && errorCode == KErrNotFound) // Stale data, needs update
-        {
-          
-           _DBG_FILE("CNSmlInternetAdapter::AddNodeObjectL(): stale data Add to buffer");
-          AddNodeBufferL(aURI,parentLUID,aStatusRef, EFalse);
-          iStaleMapUpdate=ETrue;
-          return;
-        }
-
-        }
-    else if (aURI.Match(_L8("AP/*/Px/*"  ))!= KErrNotFound  &&  // How to check if already added
-             aURI.Match(_L8("AP/*/Px/*/*"))== KErrNotFound )    // dm-tree knows last LUID
-        {
-        if(parentLUID.Length()<=0) 
-            {
-            AddNodeBufferL(aURI,parentLUID,aStatusRef, EFalse);
-            return;
-            }                       
-
-        // Check if already exists on database (=> only One possible for AP)
-        if(GetProxyIdL(aURI))
-            {
-            iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EAlreadyExists);
-            _DBG_FILE("CNSmlInternetAdapter::AddNodeObjectL(): EAlreadyExists end");
-            return;
-            }
-
-        TUint32 iapID = GetAPIdFromURIL(aURI);
-
-        //  IAP-table search serviceType (=Bearer)
-        CCommsDbTableView* iapView = iDatabase->OpenViewMatchingUintLC(TPtrC(IAP),
-                                                                       TPtrC(COMMDB_ID),
-                                                                       iapID);
-
-        TInt errorCode = iapView->GotoFirstRecord();
-    
-        // Read serviceType from (IAP)
-        if ( errorCode == KErrNone )
-            {
-            iapView->ReadTextL(TPtrC(IAP_SERVICE_TYPE), iProxyServiceType);
-            iapView->ReadUintL(TPtrC(IAP_SERVICE),      iProxyISP);
-            CleanupStack::PopAndDestroy(); // iapView
-            }
-        else if( iapID > 0 && errorCode == KErrNotFound) // Stale data, needs update
-        {
-          
-          CleanupStack::PopAndDestroy(); // iapViewv
-           _DBG_FILE("CNSmlInternetAdapter::AddNodeObjectL(): stale data for proxy this as new AP ");
-          AddNodeBufferL(aURI,parentLUID,aStatusRef, EFalse);
-          iStaleMapUpdate=ETrue;
-          return;
-            }
-        else
-            {
-            CleanupStack::PopAndDestroy(); // iapView
-            iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::ENotFound);
-            _DBG_FILE("CNSmlInternetAdapter::AddNodeObjectL(): ENotFound end");
-            return;
-            }
-
-        CCommsDbTableView* proxyTable;
-
-        proxyTable = iDatabase->OpenTableLC(TPtrC(PROXIES));
-
-        TInt initOK = proxyTable->InsertRecord(iapID);
-        
-        TInt retry = KBeginTransRetryCount; 
-        while ( retry > 0 && initOK != KErrNone )
-            {
-            User::After( KBeginTransRetryDelay );
-            initOK = proxyTable->InsertRecord( iapID );
-            retry--;
-            }
-        
-        if( initOK == KErrNone )
-            {
-            iProxyServerName = LastURISeg(aURI); // Name from URI
-            initOK = InitializeProxyL( proxyTable );
-            
-            User::After( KBeginTransRetryDelay );
-            if ( initOK == KErrNone)
-                {
-                TUint32 newId = 0;
-                initOK = proxyTable->PutRecordChanges();
-                
-                retry = KBeginTransRetryCount;
-                while ( retry > 0 && initOK != KErrNone )
-                    {
-                    User::After( KBeginTransRetryDelay );
-                    initOK = proxyTable->PutRecordChanges();
-                    retry--;
-                    }
-                
-                proxyTable->ReadUintL(TPtrC(COMMDB_ID), newId);
-                //
-                // Set mapping-data
-                //
-                TBuf8<16> addLUID;
-                _LIT8(KFormat,"%d");    
-                addLUID.Format(KFormat,KNSmlApProxyLowerBase + newId);     // 100000 + lProxyId
-
-                // Also added to mapping
-                iCallBack->SetMappingL(aURI,addLUID);
-                }
-            else
-                {
-                proxyTable->CancelRecordChanges();
-                iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EError);
-                _DBG_FILE("CNSmlInternetAdapter::AddNodeObjectL(): EError end");
-                }
-            }
-        else
-            {
-            iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EError);
-            _DBG_FILE("CNSmlInternetAdapter::AddNodeObjectL(): EError end Insert failed");
-            }
-        CleanupStack::PopAndDestroy(); // proxyTable
-
-        }
-    else if (aURI.Match(_L8("AP/*/Px/*/*"))!= KErrNotFound )
-        {
-        if(parentLUID.Length()<=0) 
-            {
-            AddNodeBufferL(aURI,parentLUID,aStatusRef, EFalse);
-            _DBG_FILE("CNSmlInternetAdapter::AddNodeObjectL(): end");
-            return;
-            }                       
-
-        TInt pluid = IntLUID(parentLUID);
-
-        if(pluid < 0)
-            {
-            iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EOk);
-            _DBG_FILE("CNSmlInternetAdapter::AddNodeObjectL(): end");
-            return;
-            }
-        else 
-          {
-            TUint32 apID = GetAPIdFromURIL(aURI);
-            CCommsDbTableView* tableView = iDatabase->OpenViewMatchingUintLC(TPtrC(IAP),
-                                                                       TPtrC(COMMDB_ID),
-                                                                           apID);
-              TInt errorCode = tableView->GotoFirstRecord();
-            CleanupStack::PopAndDestroy(tableView); 
-            if( apID > 0 && errorCode == KErrNotFound) // Stale data, needs update
-            {
-        _DBG_FILE("CNSmlInternetAdapter::AddNodeObjectL(): stale data for proxy this as new AP ");
-             AddNodeBufferL(aURI,parentLUID,aStatusRef, EFalse);
-            iStaleMapUpdate=ETrue;
-            return;
-            }
-        
-          }
-        }
-
-    else if (aURI.Match(_L8("AP/*/Px"))!= KErrNotFound )
-        {
-        if(parentLUID.Length()<=0)
-            {
-            AddNodeBufferL(aURI,parentLUID,aStatusRef, EFalse);
-            return;
-            }
-
-        TInt pluid = IntLUID(parentLUID);
-
-        if(pluid < 0)
-            {
-            iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EOk);
-            _DBG_FILE("CNSmlInternetAdapter::AddNodeObjectL(): end");
-            return;
-            }
-        else if(pluid == 0)
-            {
-            iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EError);
-            _DBG_FILE("CNSmlInternetAdapter::AddNodeObjectL(): EError");
-            return;
-            }
-          else 
-          {
-            TUint32 apID = GetAPIdFromURIL(aURI);
-            CCommsDbTableView* tableView = iDatabase->OpenViewMatchingUintLC(TPtrC(IAP),
-                                                                       TPtrC(COMMDB_ID),
-                                                                           apID);
-              TInt errorCode = tableView->GotoFirstRecord();
-            CleanupStack::PopAndDestroy(tableView); 
-            if( apID > 0 && errorCode == KErrNotFound) // Stale data, needs update
-            {
-        _DBG_FILE("CNSmlInternetAdapter::AddNodeObjectL(): stale data for proxy this as new AP ");
-             AddNodeBufferL(aURI,parentLUID,aStatusRef, EFalse);
-            iStaleMapUpdate=ETrue;
-            return;
-            }
-            }
-        }
-
-    else if (aURI.Match(_L8("AP/*/Networks/*"  ))!= KErrNotFound &&
-             aURI.Match(_L8("AP/*/Networks/*/*"))== KErrNotFound )
-        {
-        iIAPId = IntLUID(parentLUID);
-        }
-
-
-
-    iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EOk);
-    _DBG_FILE("CNSmlInternetAdapter::AddNodeObjectL(): end");
-    return;
-    }
-
-//------------------------------------------------------------------------------
-// CNSmlInternetAdapter::ExecuteCommandL
-// not supported
-//------------------------------------------------------------------------------
-
-
-void CNSmlInternetAdapter::ExecuteCommandL( const TDesC8&/* aURI*/, 
-                                            const TDesC8& /*aLUID*/,
-                                            const TDesC8& /*aArgument*/, 
-                                            const TDesC8& /*aType*/,
-                                            TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlInternetAdapter::ExecuteCommandL(): begin");
-    iCallBack->SetStatusL(aStatusRef, CSmlDmAdapter::EError);
-    _DBG_FILE("CNSmlInternetAdapter::ExecuteCommandL(): end");
-    }
-    
-//------------------------------------------------------------------------------
-// CNSmlInternetAdapter::ExecuteCommandL ( .. RWriteStream ..)
-// not supported
-//------------------------------------------------------------------------------
-
-
-void CNSmlInternetAdapter::ExecuteCommandL( const TDesC8& /*aURI*/, 
-                                            const TDesC8& /*aLUID*/,
-                                            RWriteStream*& /*aStream*/, 
-                                            const TDesC8& /*aType*/,
-                                            TInt aStatusref )
-    {
-    _DBG_FILE("CNSmlInternetAdapter::ExecuteCommandL(): begin");
-    iCallBack->SetStatusL(aStatusref, CSmlDmAdapter::EError);
-    _DBG_FILE("CNSmlInternetAdapter::ExecuteCommandL(): end");
-    }
-    
-//------------------------------------------------------------------------------
-// CNSmlInternetAdapter::CopyCommandL
-// not supported
-//------------------------------------------------------------------------------
-
-
-void CNSmlInternetAdapter::CopyCommandL( const TDesC8& /*aTargetURI*/,
-                                         const TDesC8& /*aTargetLUID*/,
-                                         const TDesC8& /*aSourceURI*/,
-                                         const TDesC8& /*aSourceLUID*/, 
-                                         const TDesC8& /*aType*/,
-                                         TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlInternetAdapter::CopyCommandL(): begin");
-    iCallBack->SetStatusL(aStatusRef, CSmlDmAdapter::EError);
-    _DBG_FILE("CNSmlInternetAdapter::CopyCommandL(): end");
-    }
-    
-//------------------------------------------------------------------------------
-// CNSmlInternetAdapter::StartAtomicL
-// not supported
-//------------------------------------------------------------------------------
-
-
-void CNSmlInternetAdapter::StartAtomicL()
-    {
-    _DBG_FILE("CNSmlInternetAdapter::StartAtomicL(): begin");
-    _DBG_FILE("CNSmlInternetAdapter::StartAtomicL(): end");
-    }
-    
-//------------------------------------------------------------------------------
-// CNSmlInternetAdapter::CommitAtomicL
-// not supported
-//------------------------------------------------------------------------------
-
-
-void CNSmlInternetAdapter::CommitAtomicL()
-    {
-    _DBG_FILE("CNSmlInternetAdapter::CommitAtomicL(): begin");
-    _DBG_FILE("CNSmlInternetAdapter::CommitAtomicL(): end");
-    }
-
-//------------------------------------------------------------------------------
-// CNSmlInternetAdapter::RollbackAtomicL
-// not supported
-//------------------------------------------------------------------------------
-
-void CNSmlInternetAdapter::RollbackAtomicL()
-    {
-    _DBG_FILE("CNSmlInternetAdapter::RollbackAtomicL(): begin");
-    _DBG_FILE("CNSmlInternetAdapter::RollbackAtomicL(): end");
-    }
-
-//------------------------------------------------------------------------------
-// CNSmlInternetAdapter::StreamingSupport
-// returns EFalse
-//------------------------------------------------------------------------------
-
-TBool CNSmlInternetAdapter::StreamingSupport( TInt& /*aItemSize*/ )
-    {   
-    _DBG_FILE("CNSmlInternetAdapter::StreamingSupport(): begin");
-    _DBG_FILE("CNSmlInternetAdapter::StreamingSupport(): end");
-    return EFalse;
-    }
-
-//------------------------------------------------------------------------------
-// CNSmlInternetAdapter::StreamCommittedL
-// not used in this adapter
-//------------------------------------------------------------------------------
-
-void CNSmlInternetAdapter::StreamCommittedL()
-    {
-    _DBG_FILE("CNSmlInternetAdapter::StreamCommittedL(): begin");
-    _DBG_FILE("CNSmlInternetAdapter::StreamCommittedL(): end");
-    }
-
-//------------------------------------------------------------------------------
-// CNSmlInternetAdapter::CompleteOutstandingCmdsL
-// 
-//------------------------------------------------------------------------------
-void CNSmlInternetAdapter::CompleteOutstandingCmdsL()
-    {
-
-    _DBG_FILE("CNSmlInternetAdapter::CompleteOutstandingCmdsL(): begin");
-//
-//  Handle possible unhandled buffered nodes
-//
-    if( !iDatabase->InTransaction() )
-        {
-        _DBG_FILE("CompleteOutstandingCmds: Try first begintransaction.");
-        TInt err = iDatabase->BeginTransaction();        
-        if( err == KErrLocked )
-            {
-            _DBG_FILE("CompleteOutstandingCmds: CommsDat was locked.");
-            TInt retry = KBeginTransRetryCount;            
-            while ( retry > 0 && err == KErrLocked )
-                {
-                User::After(KBeginTransRetryDelay);
-                _DBG_FILE("CompleteOutstandingCmds: Slept 1 second. Try again");
-                err = iDatabase->BeginTransaction();
-                retry--;
-                }
-            if(err != KErrNone)
-                {        
-                _DBG_FILE("CNSmlInternetAdapter: BeginTransaction failed completely.");
-                User::Leave( err ); 
-                }           
-            }
-        }
-    _DBG_FILE("CompleteOutstandingCmds: BeginTransaction was successful");
-    
-    iDnsIpv4Pri = 0;
-    iDnsIpv6Pri = 0;
-    _LIT8( KDummy, "/Dummy" );
-    for(TInt h = iBuffer->Count()-1; h >= 0; h--) // Through buffers
-        {
-        TBuf8<80> commandURI;
-        commandURI.Append(iBuffer->At(h).iMappingName->Des());
-        commandURI.Append( KDummy ); // Removed on execution
-        ExecuteBufferL(commandURI, ETrue);
-        } 
-    iDnsUpdate = EFalse;
-    iDnsIpv4Pri = 0;
-    iDnsIpv6Pri = 0;
-    iBuffer->Reset();
-
-  if ( iWlanSupported )
-    {
-    iWlanAdapter->CompleteOutstandingCmdsL(); // Execute possible unhandled WLAN commands 
-      }
-
-    iNetworkId = KErrNotFound;
-
-    iDatabase->CommitTransaction();
-    iTransactionCommitted = ETrue;
-    _DBG_FILE("CNSmlInternetAdapter::CompleteOutstandingCmdsL(): end");
-    }
-
-//=============================================
-//      CNSmlInternetAdapter::GetAPField()
-//      Match URI fieldname to 
-//      CommsDb table and column
-//      
-//=============================================
-TBool CNSmlInternetAdapter::GetAPField(TPtrC& aTableName,TPtrC& aColumn) const
-    {
-    _DBG_FILE("CNSmlInternetAdapter::GetAPField(): Start");
-
-    TBool fRet = EFalse;
-
-    aColumn.Set(TPtrC(KNullDesC));
-
-    if (iField->Compare(KNSmlDdfAuthName) == 0)
-        {
-        if( aTableName == TPtrC(OUTGOING_GPRS) ||
-            aTableName == TPtrC(INCOMING_GPRS))
-            {
-            aColumn.Set(TPtrC(SERVICE_IF_AUTH_NAME));
-            }
-        else
-            {
-            return fRet;
-            }
-        fRet = ETrue;
-        }
-    else if (iField->Compare(KNSmlDdfNAPName) == 0)
-        {
-        aColumn.Set(TPtrC(COMMDB_NAME));
-        fRet = ETrue;
-        }
-    else if (iField->Compare(KNSmlDdfToNAPIDL) == 0)
-        {
-        aColumn.Set(TPtrC(COMMDB_ID));
-        fRet = ETrue;
-        }
-    else if (iField->Compare(KNSmlDdfNAPID) == 0)
-        {
-        aColumn.Set(TPtrC(COMMDB_ID));
-        fRet = ETrue;
-        }
-    else if (iField->Compare(KNSmlDdfPxId) == 0)
-        {
-        aColumn.Set(TPtrC(COMMDB_ID));
-        fRet = ETrue;
-        }
-    else if (iField->Compare(KNSmlDdfPxAddr) == 0)
-        {
-        aTableName.Set(TPtrC(PROXIES));
-        aColumn.Set(TPtrC(PROXY_SERVER_NAME));
-        fRet = ETrue;
-        }
-    else if (iField->Compare(KNSmlDdfNAPAddrTy) == 0)   // Is valid
-        {
-        return fRet;
-        }
-    else if (iField->Compare(KNSmlDdfDNSAddrL) == 0)
-        {
-        fRet = ETrue;
-        }
-    else if (iField->Compare(KNSmlDdfDNSPriority) == 0)
-        {
-        fRet = ETrue;
-        }
-    else if (iField->Compare(KNSmlDdfDNSAddrTy) == 0)
-        {
-        fRet = ETrue;
-        }
-    else if (iField->Compare(KNSmlDdfNAPAddr) == 0)
-        {
-        if( aTableName == TPtrC(OUTGOING_GPRS) ||
-                 aTableName == TPtrC(INCOMING_GPRS))
-            {
-            aColumn.Set(TPtrC(GPRS_APN));               // GPRS_PDP_ADDRESS
-            }
-        else if(aTableName == TPtrC(LAN_SERVICE))       // Wlan ADD
-            {
-            aColumn.Set(TPtrC(ISP_IP_ADDR));  
-            // Leni: Should this be LAN_IP_ADDR  ??
-            }
-        else
-            {
-            return fRet;
-            }
-        fRet = ETrue;
-        }
-    else if (iField->Compare(KNSmlDdfBearerL) == 0)
-        {
-        aTableName.Set(TPtrC(IAP));
-        fRet = ETrue;
-        }
-    else if (iField->Compare(KNSmlDdfDirection) == 0)
-        {
-        aTableName.Set(TPtrC(IAP));
-        fRet = ETrue;
-        }
-    else if (iField->Compare(KNSmlDdfAuthSecr) == 0)
-        {
-        if( aTableName == TPtrC(OUTGOING_GPRS) ||
-            aTableName == TPtrC(INCOMING_GPRS))
-            {
-            aColumn.Set(TPtrC(SERVICE_IF_AUTH_PASS)); 
-            }
-        else
-            {
-            return fRet; // NotValid
-            }
-        fRet = ETrue;
-        }
-    else if (iField->Compare(KNSmlDdfPortNbr) == 0)
-        {
-        if(iWapPort)
-            {
-            aTableName.Set(TPtrC(WAP_IP_BEARER));
-            aColumn.Set(TPtrC(WAP_PROXY_PORT));
-            }
-        else
-            {
-            aTableName.Set(TPtrC(PROXIES));
-            aColumn.Set(TPtrC(PROXY_PORT_NUMBER));
-            }
-        fRet = ETrue;
-        }
-    else if (iField->Compare(KNSmlDdfStartpg) == 0)
-        {
-        aTableName.Set(TPtrC(WAP_ACCESS_POINT));
-        aColumn.Set(TPtrC(WAP_START_PAGE));
-        fRet = ETrue;
-        }
-    else if (iField->Compare(KNSmlDdfPxAuthId) == 0) // No KNSmlDdfBasAuthId
-        {
-        aTableName.Set(TPtrC(WAP_IP_BEARER));
-        aColumn.Set(TPtrC(WAP_PROXY_LOGIN_NAME));
-        fRet = ETrue;
-        }
-    else if (iField->Compare(KNSmlDdfPxAuthPW) == 0) // No KNSmlDdfBasAuthPW
-        {
-        aTableName.Set(TPtrC(WAP_IP_BEARER));
-        aColumn.Set(TPtrC(WAP_PROXY_LOGIN_PASS));
-        fRet = ETrue;
-        }
-    else if (iField->Compare(KNSmlDdfUsePTxtLog) == 0)
-        {
-        if( aTableName == TPtrC(OUTGOING_GPRS) ||
-            aTableName == TPtrC(INCOMING_GPRS))
-            {
-            aColumn.Set(TPtrC(SERVICE_DISABLE_PLAIN_TEXT_AUTH));
-            fRet = ETrue;
-            }
-        else
-            {
-            return fRet; // NotValid
-            }
-        }
-    else if (iField->Compare(KNSmlDdfDefGW) == 0)
-        {
-        aColumn.Set(TPtrC(SERVICE_IP_GATEWAY));
-        fRet = ETrue;
-        }
-    else if (iField->Compare(KNSmlDdfNetworkMask) == 0)
-        {
-        aColumn.Set(TPtrC(SERVICE_IP_NETMASK));
-        fRet = ETrue;
-        }
-    else if (iField->Compare(KNSmlDdfNetworkID) == 0)
-        {
-        aColumn.Set(TPtrC(COMMDB_ID));
-        fRet = ETrue;
-        }
-    else if (iField->Compare(KNSmlDdfPPPComp) == 0)
-        {
-        if( aTableName == TPtrC(OUTGOING_GPRS) ||
-            aTableName == TPtrC(INCOMING_GPRS))
-            {
-            aColumn.Set(TPtrC(GPRS_DATA_COMPRESSION));
-            }
-        else
-            {
-            return fRet; // NotValid
-            }
-        fRet = ETrue;
-        }
-    else if (iField->Compare(KNSmlDdfGPRSPDP) == 0)
-        {
-        if( aTableName == TPtrC(OUTGOING_GPRS) ||
-            aTableName == TPtrC(INCOMING_GPRS))
-            {
-            aColumn.Set(TPtrC(GPRS_PDP_TYPE));
-            }
-        else
-            {
-            return fRet; // NotValid
-            }
-        fRet = ETrue;
-        }
-    else if (iField->Compare(KNSmlDdfNoPxForL) == 0)
-        {
-        aColumn.Set(TPtrC(PROXY_EXCEPTIONS));
-        fRet = ETrue;
-        }
-    else if (iField->Compare(KNSmlDdfDomainL) == 0)
-        {
-        aColumn.Set(TPtrC(PROXY_PROTOCOL_NAME));
-        fRet = ETrue;
-        }
-    else if (iField->Compare(KNSmlDdfIPAddrFromServer) == 0)
-        {
-        aColumn.Set(TPtrC(SERVICE_IP_ADDR_FROM_SERVER));
-        fRet = ETrue;
-        }
-    else if (iField->Compare(KNSmlDdfIPAddr) == 0)
-        {
-        aColumn.Set(TPtrC(SERVICE_IP_ADDR));    
-        fRet = ETrue;
-        }
-    else if (iField->Compare(KNSmlDdfDNSAddrFromServer) == 0)
-        {
-        aColumn.Set(TPtrC(SERVICE_IP_DNS_ADDR_FROM_SERVER));
-        fRet = ETrue;
-        }
-    else if (iField->Compare(KNSmlDdfIPv6DNSAddrFromServer) == 0)
-        {
-        aColumn.Set(TPtrC(SERVICE_IP6_DNS_ADDR_FROM_SERVER));
-        fRet = ETrue;
-        }
-    else if (iField->Compare(KNSmlDdfIfNetworks) == 0)
-        {
-        aColumn.Set(TPtrC(SERVICE_IF_NETWORKS));
-        fRet = ETrue;
-        }
-    else if (iField->Compare(KNSmlDdfIAPService) == 0)
-        {
-        aColumn.Set(TPtrC(IAP_SERVICE));
-        fRet = ETrue;
-        }
-   
-    else if (iField->Compare(KNSmlDdfIAPSeamlessness) == 0)
-        {
-        fRet= ETrue;
-        }
-    else if (iField->Compare(KNSmlDdfIAPMetaData) == 0)
-        {
-        fRet= ETrue;
-        }
-
-    DBG_ARGS(_S16("GetAPField: aURI    - %S - %S - %S"),&aTableName, &aColumn, &*iField);
-
-    _DBG_FILE("CNSmlInternetAdapter::GetAPField(): EOk");
-
-    return fRet;
-    }
-
-//=============================================
-//      CNSmlInternetAdapter::GetAPFieldType()
-//      Match fieldtype to Commsdb-database 
-//      
-//=============================================
-CNSmlInternetAdapter::TNSmlAPFieldType CNSmlInternetAdapter::GetAPFieldType( const TDesC8& aURI ) const
-    {
-    if (iField->Compare(KNSmlDdfBearerL) == 0)
-        {
-        return CNSmlInternetAdapter::ESpec;
-        }
-    else if (iField->Compare(KNSmlDdfDirection) == 0)
-        {
-        return CNSmlInternetAdapter::ESpec;
-        }
-    else if (iField->Compare(KNSmlDdfBearer) == 0)
-        {
-        return CNSmlInternetAdapter::EInt;
-        }
-    else if (iField->Compare(KNSmlDdfToNAPIDL) == 0)
-        {
-        return CNSmlInternetAdapter::EInt;
-        }
-    else if (iField->Compare(KNSmlDdfNAPID) == 0)
-        {
-        return CNSmlInternetAdapter::EInt;
-        }
-    else if (iField->Compare(KNSmlDdfPxId) == 0)
-        {
-        return CNSmlInternetAdapter::EInt;
-        }
-    else if (iField->Compare(KNSmlDdfAuthName) == 0)
-        {
-        return CNSmlInternetAdapter::EStr;
-        }
-    else if (iField->Compare(KNSmlDdfNAPName) == 0 ||
-             iField->Compare(KNSmlDdfPxName) == 0 ||
-             iField->Compare(KNSmlDdfNetworkName) == 0 )
-        {
-        if( aURI.Match(_L8("AP/*/Px/*/Name"))   != KErrNotFound
-            || aURI.Match(_L8("AP/*/Networks/*/Name"))!= KErrNotFound )
-            {
-            return CNSmlInternetAdapter::EStr;
-            }
-        else
-            {
-            return CNSmlInternetAdapter::ESpec; // For NAPName
-            }
-        }
-    else if (iField->Compare(KNSmlDdfNAPAddrTy) == 0)
-        {
-        return CNSmlInternetAdapter::EInt;
-        }
-    else if (iField->Compare(KNSmlDdfNAPAddr) == 0)
-        {
-        return CNSmlInternetAdapter::EStr;
-        }
-    else if (iField->Compare(KNSmlDdfStartpg) == 0)
-        {
-        return CNSmlInternetAdapter::EWap;
-        }
-    else if (iField->Compare(KNSmlDdfPxAuthId) == 0)
-        {
-        return CNSmlInternetAdapter::EWap;
-        }
-    else if (iField->Compare(KNSmlDdfPxAuthPW) == 0)
-        {
-        return CNSmlInternetAdapter::EWap;
-        }
-    else if (iField->Compare(KNSmlDdfPxAddr) == 0)
-        {
-        return CNSmlInternetAdapter::EStr;
-        }
-    else if (iField->Compare(KNSmlDdfDNSAddrFromServer) == 0)
-        {
-        return CNSmlInternetAdapter::EBool;
-        }
-    else if (iField->Compare(KNSmlDdfIPv6DNSAddrFromServer) == 0)
-        {
-        return CNSmlInternetAdapter::EBool;
-        }
-    else if (iField->Compare(KNSmlDdfDNSAddrL) == 0)
-        {
-        return CNSmlInternetAdapter::EStr;
-        }
-    else if (iField->Compare(KNSmlDdfDNSAddrTy) == 0)
-        {
-        return CNSmlInternetAdapter::EStr;
-        }
-    else if (iField->Compare(KNSmlDdfDNSPriority) == 0)
-        {
-        return CNSmlInternetAdapter::EStr;
-        }
-    else if (iField->Compare(KNSmlDdfPxName) == 0)
-        {
-        return CNSmlInternetAdapter::EStr;
-        }
-    else if (iField->Compare(KNSmlDdfAuthSecr) == 0)
-        {
-        return CNSmlInternetAdapter::EStr;
-        }
-    else if (iField->Compare(KNSmlDdfPxId) == 0)
-        {
-        return CNSmlInternetAdapter::EInt;
-        }
-    else if (iField->Compare(KNSmlDdfPxPW) == 0)
-        {
-        return CNSmlInternetAdapter::EStr;
-        }
-    else if (iField->Compare(KNSmlDdfPortNbr) == 0)
-        {
-        if(iWapPort)    // Different handlig for WAP and Proxy PortNbr
-            {
-            return CNSmlInternetAdapter::EWap;
-            }
-        else
-            {
-            return CNSmlInternetAdapter::EInt;
-            }
-        }
-    else if (iField->Compare(KNSmlDdfUsePTxtLog) == 0)
-        {
-        return CNSmlInternetAdapter::EBool;
-        }
-    else if (iField->Compare(KNSmlDdfDefGW) == 0)
-        {
-        return CNSmlInternetAdapter::EStr;
-        }
-    else if (iField->Compare(KNSmlDdfNetworkMask) == 0)
-        {
-        return CNSmlInternetAdapter::EStr;
-        }
-    else if (iField->Compare(KNSmlDdfNetworkID) == 0)
-        {
-        return CNSmlInternetAdapter::EInt;
-        }
-    else if (iField->Compare(KNSmlDdfPPPComp) == 0)
-        {
-        return CNSmlInternetAdapter::EBool;
-        }
-    else if (iField->Compare(KNSmlDdfGPRSPDP) == 0)
-        {
-        return CNSmlInternetAdapter::EInt;
-        }
-    else if (iField->Compare(KNSmlDdfDomainL) == 0)
-        {
-        return CNSmlInternetAdapter::EStr;
-        }
-    else if (iField->Compare(KNSmlDdfNoPxForL) == 0)
-        {
-        return CNSmlInternetAdapter::ESpec;
-        }
-    else if (iField->Compare(KNSmlDdfIPAddrFromServer) == 0)
-        {
-        return CNSmlInternetAdapter::EBool;
-        }
-    else if (iField->Compare(KNSmlDdfIPAddr) == 0)
-        {
-        return EStr;
-        }
-    else if (iField->Compare(KNSmlDdfIfNetworks) == 0)
-        {
-        return CNSmlInternetAdapter::EStr;
-        }
-    else if (iField->Compare(KNSmlDdfIAPService) == 0)
-        {
-        return CNSmlInternetAdapter::ESpec;
-        }
-
-    else if (iField->Compare(KNSmlDdfIAPSeamlessness) == 0)
-        {
-        return CNSmlInternetAdapter::EInt;
-        }
-    else if (iField->Compare(KNSmlDdfIAPMetaData) == 0)
-        {
-        return CNSmlInternetAdapter::EInt;
-        }
-
-    _DBG_FILE("CNSmlInternetAdapter::GetAPFieldType(): Error");
-
-    return EWrong;
-    }
-
-//------------------------------------------------------------------------------
-//
-//------------------------------------------------------------------------------
-#ifndef IMPLEMENTATION_PROXY_ENTRY
-#define IMPLEMENTATION_PROXY_ENTRY(aUid, aFuncPtr)  {{aUid},(aFuncPtr)}
-#endif
-
-const TImplementationProxy ImplementationTable[] = 
-    {
-    IMPLEMENTATION_PROXY_ENTRY(0x101F6DE2, CNSmlInternetAdapter::NewL)
-    };
-
-//------------------------------------------------------------------------------
-// TImplementationProxy* ImplementationGroupProxy()
-//------------------------------------------------------------------------------
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy( TInt& aTableCount )
-    {
-    _DBG_FILE("ImplementationGroupProxy() for CNSmlInternetAdapter: begin");
-
-    aTableCount = sizeof(ImplementationTable) / sizeof(TImplementationProxy);
-
-    _DBG_FILE("ImplementationGroupProxy() for CNSmlInternetAdapter: end");
-    return ImplementationTable;
-    }
-
-//=============================================
-//      CNSmlInternetAdapter::IntLUID()
-//      Returns IntValue for aLUID
-//=============================================
-TInt CNSmlInternetAdapter::IntLUID(const TDesC8& aLUID)
-    {
-    TLex8 lex(aLUID);
-
-    if (lex.Val(iLUID) == KErrNone)
-        {
-        if ((iLUID > KNSmlApProxyUpperBase) && 
-            (iLUID < KNSmlApDnsLuidUpperBase ))
-            {
-            iLUID = iLUID - KNSmlApProxyUpperBase;
-            }
-        else if ((iLUID > KNSmlApProxyLowerBase) && 
-                 (iLUID < KNSmlApProxyUpperBase ))
-            {
-            iProxyId = iLUID - KNSmlApProxyLowerBase; // Proxy 
-            iLUID = iProxyId;
-            }
-        else if ((iLUID > KNSmlAp3gpppsLowerBase ) && 
-                 (iLUID <= KNSmlApProxyLowerBase) )
-            {
-            iLUID = iLUID - KNSmlAp3gpppsLowerBase;
-            i3GPPPS = ETrue;
-            }
-        else
-            {
-            iProxyId = 0;
-            }
-        return iLUID;
-        }
-    else
-        {
-        return 0;
-        }
-    }
-
-//=============================================
-//      CNSmlInternetAdapter::GetIntObject8()
-//      Returns IntValue for aObject
-//=============================================
-TInt CNSmlInternetAdapter::GetIntObject8(const TDesC8& aObject)
-    {
-    TLex8 lex(aObject);
-
-    TInt lValue = 0;
-
-    if (lex.Val(lValue) == KErrNone)
-        {
-        return lValue;
-        }
-    else
-        {
-        return lValue;
-        }
-    }
-//=============================================
-//      CNSmlInternetAdapter::SetIntObjectLC()
-//      Returns IntValue for aObject
-//=============================================
-TDesC8& CNSmlInternetAdapter::SetIntObjectLC(const TInt& aObject)
-    {
-    HBufC8* buf = HBufC8::NewLC(8);
-    TPtr8 ptrBuf = buf->Des();
-
-    ptrBuf.Num(aObject);
-
-    return *buf;
-    }
-
-//=============================================
-//      CNSmlInternetAdapter::NotValidStrLenght()
-//      False if datalength is valid
-//=============================================
-TBool CNSmlInternetAdapter::NotValidStrLenght(const TDesC& aSource)
-    {
-    TInt len = aSource.Length();
-    TBool theBool = EFalse;
-
-    if(len > KCommsDbSvrMaxFieldLength)
-        {
-        theBool = ETrue;  
-        }
-    return theBool;
-    }
-
-//=============================================
-//      CNSmlInternetAdapter::SetField()
-//      String after last '/' is returned
-//      
-//=============================================
-TInt CNSmlInternetAdapter::SetField( const TDesC8& aSource )
-    {
-    if (aSource.LocateReverse('/') == KErrNotFound)
-        {
-        iField->Des().Format(aSource);
-        }
-    else
-        {
-        iField->Des().Format(aSource.Mid(aSource.LocateReverse('/')+1));
-        }
-
-    return KErrNone;
-    }
-
-//=============================================
-//      CNSmlInternetAdapter::ConvertTo8LC()
-//      Converts string value to 8-bit
-//      
-//=============================================
-TDesC8& CNSmlInternetAdapter::ConvertTo8LC( const TDesC& aSource )
-    {
-    HBufC8* buf = HBufC8::NewLC( aSource.Length()*2);
-    TPtr8 bufPtr = buf->Des();
-    CnvUtfConverter::ConvertFromUnicodeToUtf8( bufPtr, aSource );
-
-    return *buf;
-    }
-
-//=============================================
-//      CNSmlInternetAdapter::ConvertTo16LC()
-//      Converts string value to 16-bit
-//      
-//=============================================
-TDesC16& CNSmlInternetAdapter::ConvertTo16LC( const TDesC8& aSource)
-    {
-    HBufC16* buf16 = HBufC16::NewLC( aSource.Length() );
-    TPtr bufPtr16 = buf16->Des();
-
-    CnvUtfConverter::ConvertToUnicodeFromUtf8(bufPtr16, aSource);
-
-    return *buf16;
-    }
-
-
-//=============================================
-//      CNSmlInternetAdapter::InitializeGPRSL()
-//      Initialize GPRS-data before insert
-//      
-//=============================================
-TInt CNSmlInternetAdapter::InitializeGPRSL( CCommsDbTableView* aTable )
-    {
-    TBuf<KCommsDbSvrMaxFieldLength> user;
-    TBuf<KCommsDbSvrMaxFieldLength> pass;
-
-  _LIT(Kdns6Address,   "0:0:0:0:0:0:0:0");
-    _LIT(KgifNetworks,"ip");
-
-    // COMMON DATA 
-    aTable->WriteBoolL(TPtrC(SERVICE_DISABLE_PLAIN_TEXT_AUTH),EFalse);
-
-    aTable->WriteTextL(TPtrC(GPRS_IF_NETWORKS), KgifNetworks);
-
-    aTable->WriteTextL(TPtrC(COMMDB_NAME), ConvertTo16LC(iIAPName)); // Same as IAP
-    CleanupStack::PopAndDestroy(); //ConvertTo16LC
-
-    aTable->WriteBoolL(TPtrC(GPRS_IF_PROMPT_FOR_AUTH),      EFalse);
-    aTable->WriteTextL(TPtrC(GPRS_IF_AUTH_NAME),            user);
-    aTable->WriteTextL(TPtrC(GPRS_IF_AUTH_PASS),            pass);
-
-    aTable->WriteBoolL(TPtrC(GPRS_IP_ADDR_FROM_SERVER),     ETrue );
-    aTable->WriteTextL(TPtrC(GPRS_IP_ADDR),                 KNSmlEmptyIpv4Address);
-
-    aTable->WriteBoolL(TPtrC(GPRS_IP_DNS_ADDR_FROM_SERVER), ETrue );
-    aTable->WriteTextL(TPtrC(GPRS_IP_NAME_SERVER1),         KNSmlEmptyIpv4Address);
-    aTable->WriteTextL(TPtrC(GPRS_IP_NAME_SERVER2),         KNSmlEmptyIpv4Address);
-        
-    aTable->WriteBoolL(TPtrC(GPRS_IP6_DNS_ADDR_FROM_SERVER), ETrue );  
-    aTable->WriteTextL(TPtrC(GPRS_IP6_NAME_SERVER1),        Kdns6Address);
-    aTable->WriteTextL(TPtrC(GPRS_IP6_NAME_SERVER2),        Kdns6Address);
-    // GPRS DATA
-
-    aTable->WriteTextL(TPtrC(GPRS_APN), ConvertTo16LC(iIAPName)); // Same as IAP
-    CleanupStack::PopAndDestroy(); //ConvertTo16LC
-
-    aTable->WriteUintL(TPtrC(GPRS_REQ_PRECEDENCE),          0);
-    aTable->WriteUintL(TPtrC(GPRS_REQ_DELAY),               0);
-    aTable->WriteUintL(TPtrC(GPRS_REQ_RELIABILITY),         0);
-    aTable->WriteUintL(TPtrC(GPRS_REQ_PEAK_THROUGHPUT),     0);
-    aTable->WriteUintL(TPtrC(GPRS_REQ_MEAN_THROUGHPUT),     0);
-    aTable->WriteUintL(TPtrC(GPRS_MIN_PRECEDENCE),          0);
-    aTable->WriteUintL(TPtrC(GPRS_MIN_DELAY),               0);
-    aTable->WriteUintL(TPtrC(GPRS_MIN_RELIABILITY),         0);
-    aTable->WriteUintL(TPtrC(GPRS_MIN_PEAK_THROUGHPUT),     0);
-    aTable->WriteUintL(TPtrC(GPRS_MIN_MEAN_THROUGHPUT),     0);
-
-    aTable->WriteUintL(TPtrC(GPRS_IF_AUTH_RETRIES),         0);
-    
-    aTable->WriteBoolL(TPtrC(GPRS_DATA_COMPRESSION),        EFalse );
-    aTable->WriteUintL(TPtrC(GPRS_PDP_TYPE),                RPacketContext::EPdpTypeIPv4);  // IPV4
-
-    aTable->WriteBoolL(TPtrC(GPRS_ENABLE_LCP_EXTENSIONS),   EFalse );
-    aTable->WriteBoolL(TPtrC(GPRS_ANONYMOUS_ACCESS),        EFalse );
-    aTable->WriteBoolL(TPtrC(GPRS_HEADER_COMPRESSION),      EFalse );
-
-    aTable->WriteBoolL(TPtrC(GPRS_IP_ADDR_FROM_SERVER),     ETrue );
-    aTable->WriteTextL(TPtrC(GPRS_IP_GATEWAY),              KNSmlEmptyIpv4Address);
-
-    aTable->WriteTextL(TPtrC(GPRS_IP_ADDR),                 KNSmlEmptyIpv4Address); 
-    aTable->WriteTextL(TPtrC(GPRS_IF_PARAMS),               KNullDesC);
-    aTable->WriteTextL(TPtrC(GPRS_IP_NETMASK),              KNullDesC);
-
-    aTable->WriteUintL(TPtrC(GPRS_QOS_WARNING_TIMEOUT),     0xffffffff);
-
-    aTable->WriteUintL(TPtrC(GPRS_AP_TYPE), (TUint32)EIspTypeInternetAndWAP);   
-
-
-    return KErrNone;
-    }
-
-//=============================================
-//      CNSmlInternetAdapter::InitializeProxyL()
-//      Initialize Proxy-data before insert
-//      
-//=============================================
-TInt CNSmlInternetAdapter::InitializeProxyL( CCommsDbTableView* aTable )
-    {
-    _LIT(KprotocolName,    "http"); // http, https, ftp, ftps
-    const TUint32 KPortNumber(80);
-
-    aTable->WriteUintL(TPtrC(PROXY_ISP),                iProxyISP);         // ISP with which these proxies are associated 
-
-    aTable->WriteTextL(TPtrC(PROXY_SERVICE_TYPE),       iProxyServiceType); // Type ISP/GPRS
-    aTable->WriteBoolL(TPtrC(PROXY_USE_PROXY_SERVER),   ETrue );
-
-    TPtr proxyName16 = HBufC::NewLC( iProxyServerName.Length() )->Des();
-    CnvUtfConverter::ConvertToUnicodeFromUtf8( proxyName16, iProxyServerName );
-
-    aTable->WriteLongTextL(TPtrC(PROXY_SERVER_NAME),    proxyName16);   // Name of the proxy server
-    aTable->WriteTextL(TPtrC(PROXY_PROTOCOL_NAME),      KprotocolName);      // also https + ftps
-
-    aTable->WriteUintL(TPtrC(PROXY_PORT_NUMBER),        KPortNumber); 
-
-    aTable->WriteLongTextL(TPtrC(PROXY_EXCEPTIONS),     KNullDesC);
-
-    CleanupStack::PopAndDestroy(); //proxyName16
-    return KErrNone;
-    }
-
-
-//      CNSmlInternetAdapter::IsInsertAllowedL
-//      Check if possible to Add new AP
-//
-//=============================================
-TBool CNSmlInternetAdapter::IsInsertAllowedL()
-    {
-    TBool theBool = EFalse;
-//
-//  Id + Name + Bearer needed for Insert
-//
-    if (
-        iIAPName.Length() > 0  &&
-        iBearer.Length()  > 0  &&
-        iDirection != ECommDbConnectionDirectionUnknown)
-        {
-        theBool = ETrue;
-        }
-//
-//  Should check also if Name or iISPId in USE !!!
-//
-    if(theBool)
-        {
-        CCommsDbTableView* tableView = iDatabase->OpenViewMatchingTextLC(iBearer,
-                                                                         TPtrC(COMMDB_NAME),
-                                                                         iIAPName);
-        TInt errorCode = tableView->GotoFirstRecord();
-
-        // Node allready exists => No adding possible
-        if ( errorCode == KErrNone )
-            {
-            DBG_ARGS8(_S8("CNSmlInternetAdapter::NODE NAME <%S> ALLREADY(): error"), &iIAPName );
-            theBool = EFalse;
-            }
-        CleanupStack::PopAndDestroy(tableView); 
-        }
-    return theBool;
-    }
-
-//=============================================
-//      CNSmlInternetAdapter::SaveIAPDataL
-//      Saves data to IAP-table
-//      
-//=============================================
-void CNSmlInternetAdapter::SaveIAPDataL(const TDesC8& aURI)
-    {
-    TInt                    errorCode;
-    CCommsDbTableView*      tableView;
-    
-    TBool apEnforce=EFalse;
-    TBool iapReLock = EFalse;
-
-    
-    if(FeatureManager::FeatureSupported(KFeatureIdSapPolicyManagement))
-        {
-        TRAPD(eError,apEnforce=CheckEnforcementL())
-        DBG_ARGS8(_S8("CNSmlInternetAdapter::SaveIAPDataL(): EError %d , APEnforcement is %d"),eError,apEnforce);
-        if(eError==KErrNone && apEnforce)
-            {
-            DoLockIAPTablesL(EFalse);
-            iWAPRelock = ETrue;
-            }
-        }
-    if(iIAPExists)
-        {
-        tableView = iDatabase->OpenViewMatchingUintLC(TPtrC(IAP),TPtrC(COMMDB_ID),  iIAPId);
-        if(IsIAPRecordLockedL(iIAPId))
-            {
-           _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): apaccesspoint record is LOCKED"); 
-      	   TInt reclockerr = ((CCommsDbProtectTableView*)tableView)->UnprotectRecord();
-           DBG_ARGS8(_S8("CNSmlInternetAdapter::AddLeafObjectL ,UnProtecting IAPAccessRecord returned code = %d"),reclockerr);
-           if(reclockerr==KErrNone)
-                iapReLock = ETrue;
-            }
-        else
-            {
-            _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): apaccesspoint record is not write protected");  
-            }
-        
-        errorCode = tableView->GotoFirstRecord();
-        
-        if ( errorCode == KErrNone )
-            {
-            if(FeatureManager::FeatureSupported(KFeatureIdSapPolicyManagement))
-                {
-                // if enforcement is on and rec exists, it needs to be unprotected
-                if ( apEnforce )
-                    {
-                    ((CCommsDbProtectTableView*)tableView)->UnprotectRecord();
-                    }            
-                }
-                errorCode = tableView->UpdateRecord();
-            }
-        }
-    else
-        {
-        tableView = iDatabase->OpenTableLC(TPtrC(IAP));
-        
-        errorCode = tableView->InsertRecord(iIAPId);
-        }
-    
-    if ( errorCode == KErrNone )
-        {
-        TUint32 modemISPId = 1;                    // Default
-        TBuf<KCommsDbSvrMaxFieldLength> modemBearer = TPtrC(MODEM_BEARER);
-        if(iBearer == TPtrC(LAN_SERVICE))
-            {
-            modemBearer = TPtrC(LAN_BEARER);
-            }
-        else if(iBearer == TPtrC(VPN_SERVICE))
-            {
-            modemBearer = TPtrC(VIRTUAL_BEARER);
-            }
-        else
-            {
-            modemBearer = TPtrC(MODEM_BEARER);
-            }
-        
-        if(modemBearer == TPtrC(MODEM_BEARER))
-            {
-            GetModemBearerL(modemISPId);
-            }
-        else if(modemBearer == TPtrC(VIRTUAL_BEARER))
-            {
-            modemISPId = 1;
-            }
-        else if ( iWlanSupported )
-            {
-            GetLanBearerL(modemISPId);
-            }        
-        tableView->WriteTextL(TPtrC(COMMDB_NAME),       ConvertTo16LC(iIAPName));
-        CleanupStack::PopAndDestroy(); //ConvertTo16LC
-        
-        // ISP id must be written
-        tableView->WriteUintL(TPtrC(IAP_SERVICE),       iISPId);
-        tableView->WriteTextL(TPtrC(IAP_SERVICE_TYPE),  iBearer);
-
-        tableView->WriteUintL(TPtrC(IAP_BEARER),        modemISPId);
-        tableView->WriteTextL(TPtrC(IAP_BEARER_TYPE),   modemBearer);        
-        if( iNetworkId != KErrNotFound )
-            {
-            tableView->WriteUintL(TPtrC(IAP_NETWORK),       iNetworkId); // First name on network table    
-            }        
-        tableView->WriteUintL(TPtrC(IAP_NETWORK_WEIGHTING), 0);
-        tableView->WriteUintL(TPtrC(IAP_LOCATION),      2); // Minimum=2
-        
-
-        errorCode = tableView->PutRecordChanges();
-        }
-    if(FeatureManager::FeatureSupported(KFeatureIdSapPolicyManagement))
-        {
-        if(iWAPRelock)
-            {
-            DoLockIAPTablesL(ETrue);
-            ((CCommsDbProtectTableView*)tableView)->ProtectRecord();
-            iWAPRelock = EFalse;
-            }
-        }
-    if(iapReLock)
-        {
-        TInt reclockerr = DoProtectIAPRecordL(iIAPId,ETrue);
-        DBG_ARGS8(_S8("CNSmlInternetAdapter::AddLeafObjectL ,UnProtecting IAPAccessRecord returned code = %d"),reclockerr);
-        if(reclockerr==KErrNone)
-            iapReLock = EFalse; 
-        } 
-
-    if ( errorCode == KErrNone )
-        {
-        if(!iIAPExists)
-            {
-            TUint32 lValue;
-            tableView->ReadUintL(TPtrC(COMMDB_ID),lValue);
-            
-            // Add AP
-            TPtrC8 addURI = GetAddURISeg(aURI,KNSmlDdfAP);
-            
-            TBuf8<16> addLUID;
-            _LIT8(KFormat,"%d");
-            addLUID.Format(KFormat,lValue);
-            
-            // Also added to mapping
-            iCallBack->SetMappingL(addURI,addLUID);
-            DBG_ARGS8(_S8("AP:level1 URI - <%S> <%S> <%d>"), &addURI, &addLUID, lValue );
-            }
-        
-        iIAPExists = ETrue;
-        }
-
-    if (apEnforce)
-      apEnforce=EFalse; // to rget rid of warnings
-    
-    CleanupStack::PopAndDestroy(); // tableView
-    User::LeaveIfError(errorCode);
-    }
-
-//=============================================
-//      CNSmlInternetAdapter::GetMaxIdL
-//      Get max id from given bearer
-//      
-//=============================================
-TUint32 CNSmlInternetAdapter::GetMaxIdL()
-    {
-    CCommsDbTableView*  checkView;
-    TUint32 maxGPRS(0);
-    checkView = iDatabase->OpenTableLC(iBearer);
-    TInt errorCodem = checkView->GotoFirstRecord();
-    while (errorCodem == KErrNone)
-        {
-        TUint32 lValue;
-        checkView->ReadUintL(TPtrC(COMMDB_ID),lValue);
-        if(lValue > maxGPRS)
-            {
-            maxGPRS = lValue;
-            }
-        errorCodem = checkView->GotoNextRecord();
-        }
-
-    CleanupStack::PopAndDestroy(); // checkView
-
-    return (maxGPRS);
-    }
-
-//=============================================
-//      CNSmlInternetAdapter::GetProxyIdL
-//      Get proxy id for given IAP
-//      
-//=============================================
-TBool CNSmlInternetAdapter::GetProxyIdL(const TDesC8& aURI)
-    {
-    TBool proxyFound = EFalse;
-
-    CCommsDbTableView*  checkView;
-
-    // Get servicetype for IAP nbr  
-
-    TUint32 iapID = GetAPIdFromURIL(aURI);
-    if( iapID == 0 )
-    {
-      if( IsAPUriFormatMatchPredefined(aURI) )
-      {
-        iLUID = ConstructTreeL(aURI);
-        iapID = GetAPIdFromURIL(aURI);
-      }
-       
-    }
-    //  IAP-table search serviceType + serviceId
-    CCommsDbTableView* iapView = iDatabase->OpenViewMatchingUintLC(TPtrC(IAP),
-                                                                   TPtrC(COMMDB_ID),
-                                                                   iapID);
-    
-    TBuf<KCommsDbSvrMaxFieldLength> serviceType;
-    TUint32 serviceId;
-
-    TInt errorCode = iapView->GotoFirstRecord();
-    
-    // Read serviceType from (IAP)
-    if ( errorCode == KErrNone )
-        {
-        iapView->ReadTextL(TPtrC(IAP_SERVICE_TYPE), serviceType);
-        iapView->ReadUintL(TPtrC(IAP_SERVICE),      serviceId);
-        CleanupStack::PopAndDestroy(); // iapView
-        }
-    else
-        {
-        CleanupStack::PopAndDestroy(); // iapView
-        return proxyFound;
-        }
-
-    checkView = iDatabase->OpenViewMatchingTextLC(TPtrC(PROXIES),
-                                                  TPtrC(PROXY_SERVICE_TYPE),
-                                                  serviceType);
-
-    TInt errorCodem = checkView->GotoFirstRecord();
-
-    while (errorCodem == KErrNone)
-        {
-        TUint32 lValue;
-        checkView->ReadUintL(TPtrC(PROXY_ISP),lValue);
-        if(lValue ==  serviceId)
-            {
-            checkView->ReadUintL(TPtrC(COMMDB_ID),iProxyId);
-            proxyFound = ETrue;
-            break;
-            }
-        errorCodem = checkView->GotoNextRecord();
-        }
-
-    CleanupStack::PopAndDestroy(); // checkView
-
-    return proxyFound;
-    }
-
-//------------------------------------------------------------------------------
-// TBool CNSmlInternetAdapter::APExistsL()
-//------------------------------------------------------------------------------
-TBool CNSmlInternetAdapter::APExistsL(TUint32 aId)
-    {
-    TBool ret = EFalse;
-    CCommsDbTableView*  checkView;
-
-    checkView = iDatabase->OpenViewMatchingUintLC(TPtrC(IAP),TPtrC(COMMDB_ID),  aId);
-    TInt error = checkView->GotoFirstRecord();
-    if (error == KErrNone)
-        {
-        ret = ETrue;
-        }
-    CleanupStack::PopAndDestroy(); // checkView
-
-    return ret;
-    }
-
-//------------------------------------------------------------------------------
-// TBool CNSmlInternetAdapter::NetworkExistsL()
-//------------------------------------------------------------------------------
-TBool CNSmlInternetAdapter::NetworkExistsL(TUint32 aId)
-    {
-    TBool ret = EFalse;
-    CCommsDbTableView*  checkView;
-
-    checkView = iDatabase->OpenViewMatchingUintLC(TPtrC(NETWORK),TPtrC(COMMDB_ID),  aId);
-    TInt error = checkView->GotoFirstRecord();
-    if (error == KErrNone)
-        {
-        ret = ETrue;
-        }
-    CleanupStack::PopAndDestroy(); // checkView
-
-    return ret;
-    }
-
-//------------------------------------------------------------------------------
-// TBool CNSmlInternetAdapter::NetworkNameExistsL()
-//------------------------------------------------------------------------------
-TBool CNSmlInternetAdapter::NetworkNameExistsL(TUint32& aId, const TDesC8& aObject)
-    {
-    TBool ret = EFalse;
-    CCommsDbTableView*  checkView;
-
-    checkView = iDatabase->OpenViewMatchingTextLC(TPtrC(NETWORK),TPtrC(COMMDB_NAME), ConvertTo16LC(aObject));
-    TInt error = checkView->GotoFirstRecord();
-    if (error == KErrNone)
-        {
-        checkView->ReadUintL(TPtrC(COMMDB_ID), aId);
-        ret = ETrue;
-        }
-
-    CleanupStack::PopAndDestroy(2); // checkView ConvertTo16LC
-
-    return ret;
-    }
-
-//------------------------------------------------------------------------------
-// TBool CNSmlInternetAdapter::AddNetworkL()
-//------------------------------------------------------------------------------
-TBool CNSmlInternetAdapter::AddNetworkL(TUint32& aId, const TDesC8& aObject)
-    {
-    TBool ret = EFalse;
-    TUint32 newId;
-    CCommsDbTableView* networkView = iDatabase->OpenTableLC(TPtrC(NETWORK));
-
-    if( networkView->InsertRecord(newId) == KErrNone )
-        {
-        networkView->WriteTextL(TPtrC(COMMDB_NAME), ConvertTo16LC(aObject));
-        if(networkView->PutRecordChanges() == KErrNone)
-            {
-            networkView->ReadUintL(TPtrC(COMMDB_ID), aId); // New networks Id
-            ret = ETrue;
-            }
-        CleanupStack::PopAndDestroy(); //ConvertTo16LC
-        }
-    CleanupStack::PopAndDestroy(); // networkView
-    DBG_ARGS8(_S8("NsmlInternetAdapter: AddNetworkL:networkId %d"), aId);
-
-    return ret;
-    }
-//------------------------------------------------------------------------------
-// TBool CNSmlInternetAdapter::NAPDefExistsL()
-//------------------------------------------------------------------------------
-TBool CNSmlInternetAdapter::NAPDefExistsL(TUint32 aId )
-    {
-    TBool ret = EFalse;
-    CCommsDbTableView*  checkView;
-
-    
-    checkView = iDatabase->OpenViewMatchingUintLC(TPtrC(IAP),TPtrC(IAP_SERVICE), aId);
-    TInt error = checkView->GotoFirstRecord();
-    if (error == KErrNone)
-        {
-        TBuf<KCommsDbSvrMaxFieldLength> serviceType;
-
-        checkView->ReadTextL(TPtrC(IAP_SERVICE_TYPE), serviceType);
-        CCommsDbTableView* tableView = iDatabase->OpenViewMatchingUintLC(serviceType,TPtrC(COMMDB_ID), aId);
-        error = tableView->GotoFirstRecord();
-
-        if (error == KErrNone)
-            {
-            ret = ETrue;
-            }
-        CleanupStack::PopAndDestroy(); // tableView
-        }
-
-    CleanupStack::PopAndDestroy(); // checkView
-
-    return ret;
-    }
-
-//------------------------------------------------------------------------------
-// TBool CNSmlInternetAdapter::PxExistsL()
-//------------------------------------------------------------------------------
-TBool CNSmlInternetAdapter::PxExistsL(TUint32 aId)
-    {
-    TBool ret = EFalse;
-    CCommsDbTableView*  pxView;
-
-    pxView = iDatabase->OpenViewMatchingUintLC( TPtrC(PROXIES),TPtrC(COMMDB_ID), aId);
-
-    TInt errorCode = pxView->GotoFirstRecord();
-
-    if (errorCode == KErrNone )
-        {
-        ret = ETrue;
-        }
-    CleanupStack::PopAndDestroy(); // pxView
-
-    return ret;
-    }
-
-//------------------------------------------------------------------------------
-// TBool CNSmlInternetAdapter::WapAPExistsL()
-//------------------------------------------------------------------------------
-TBool CNSmlInternetAdapter::WapAPExistsL(TUint32 aId)
-    {
-    TBool ret = EFalse;
-    CCommsDbTableView*  wapView;
-
-    wapView = iDatabase->OpenViewMatchingUintLC( TPtrC(WAP_IP_BEARER),TPtrC(WAP_IAP), aId);
-
-    TInt errorCode = wapView->GotoFirstRecord();
-
-    if (errorCode == KErrNone )
-        {
-        wapView->ReadUintL(TPtrC(WAP_ACCESS_POINT_ID), iWapId);
-        ret = ETrue;
-        }
-    CleanupStack::PopAndDestroy(); // wapView
-
-    return ret;
-    }
-
-//------------------------------------------------------------------------------
-// TUint32 CNSmlInternetAdapter::GetAPIdFromURIL(const TDesC8& aURI)
-//         Get AP luid for given aURI
-//------------------------------------------------------------------------------
-TUint32 CNSmlInternetAdapter::GetAPIdFromURIL(const TDesC8& aURI)
-    {
-    HBufC8* apURI = HBufC8::NewLC(aURI.Length());
-    
-    _DBG_FILE("CNSmlInternetAdapter::GetAPIdFromURIL(): begin");
-    DBG_ARGS8(_S8("AP:add aURI GetAPIdFromURIL   - %S "), &aURI);
-//
-//  Second slash after AP
-//
-    TInt i= 0;
-    for( i=aURI.Find(KNSmlDdfAP)+3; i < aURI.Length(); i++ )
-        {
-        if(aURI[i]=='/')
-            {
-            break;
-            }
-        }
-    DBG_ARGS8(_S8("AP:add aURI GetAPIdFromURIL i is %d "), i);
-    if(i>0)
-        {
-        apURI->Des().Format(aURI.Left(i));
-        }
-//
-//  Same profile as previous
-//
-    if(iPrevURI->Match(*apURI) != KErrNotFound)
-        {
-        _DBG_FILE("CNSmlInternetAdapter::GetAPIdFromURIL(): previous uri");
-        CleanupStack::PopAndDestroy(); // apURI
-        return iPrevLUID;
-        }
-//
-//  Fetch AP-id for URI
-//
-    HBufC8* apLUID = iCallBack->GetLuidAllocL(*apURI);
-    CleanupStack::PushL(apLUID);
-    
-    TUint32 resLUID = IntLUID(*apLUID); 
-    DBG_ARGS8(_S8("AP:add aURI GetAPIdFromURIL luidallocation is %d "), resLUID);
-    
-    if ( resLUID > 0 )
-      {
-      iPrevURI->Des().Format( *apURI );
-      iPrevLUID = resLUID;
-      }
-
-    CleanupStack::PopAndDestroy(2); // apURI, apLUID
-
-    return resLUID;
-    }
-
-//------------------------------------------------------------------------------
-// TBool CNSmlInternetAdapter::DeleteProxyL()
-//------------------------------------------------------------------------------
-TBool CNSmlInternetAdapter::DeleteProxyL(TUint32 aId)
-    {
-    TBool ret = EFalse;
-    CCommsDbTableView*  pxView;
-
-    pxView = iDatabase->OpenViewMatchingUintLC( TPtrC(PROXIES),TPtrC(COMMDB_ID), aId);
-
-    TInt errorCode = pxView->GotoFirstRecord();
-
-    if (errorCode == KErrNone )
-        {
-        errorCode = pxView->DeleteRecord();
-        if (errorCode == KErrNone )
-            {
-            ret = ETrue;
-            }
-        }
-
-    CleanupStack::PopAndDestroy(); // pxView
-    return ret;
-    }
-
-//------------------------------------------------------------------------------
-// TBool CNSmlInternetAdapter::DeleteWapAPL()
-//------------------------------------------------------------------------------
-TBool CNSmlInternetAdapter::DeleteWapAPL(TUint32 aId)
-    {
-    TBool ret = EFalse;
-    CCommsDbTableView*  wapView;
-
-    TUint32 wapId = 0;
-    
-    if(FeatureManager::FeatureSupported(KFeatureIdSapPolicyManagement))
-        {
-        TBool apEnforce=EFalse;
-        TRAPD(eError,apEnforce=CheckEnforcementL())
-        DBG_ARGS8(_S8("CNSmlInternetAdapter::DeleteWAPAPL(): EError %d , APEnforcement is %d"),eError,apEnforce);
-        if(eError==KErrNone && apEnforce)
-            {
-            DoLockIAPTablesL(EFalse);
-            iWAPRelock = ETrue;
-            }
-        }
-    wapView = iDatabase->OpenViewMatchingUintLC( TPtrC(WAP_IP_BEARER),TPtrC(WAP_IAP), aId);
-    
-    TInt errorCode = wapView->GotoFirstRecord();
-    
-    if (errorCode == KErrNone )
-        {
-        wapView->ReadUintL(TPtrC(WAP_ACCESS_POINT_ID),  wapId);  // WapIAP id
-        errorCode = wapView->DeleteRecord();
-        if (errorCode == KErrNone )
-            {
-            ret = ETrue;
-            }
-        }
-
-    if(ret)
-        {
-        CCommsDbTableView* wapApView = iDatabase->OpenViewMatchingUintLC( TPtrC(WAP_ACCESS_POINT),TPtrC(COMMDB_ID), wapId);
-
-        errorCode = wapApView->GotoFirstRecord();
-
-        if (errorCode == KErrNone )
-            {
-            errorCode = wapApView->DeleteRecord();
-            if (errorCode == KErrNone )
-                {
-                ret = ETrue;
-                }
-            }
-        CleanupStack::PopAndDestroy(); // wapApView
-        }
-
-    CleanupStack::PopAndDestroy(); // wapView
-    if(FeatureManager::FeatureSupported(KFeatureIdSapPolicyManagement))
-        {
-        if(iWAPRelock)
-            {
-            DoLockIAPTablesL(ETrue);
-            iWAPRelock = EFalse;
-            }
-        }
-    return ret;
-    }
-
-//------------------------------------------------------------------------------
-// TBool CNSmlInternetAdapter::DeleteNAPDefL()
-//------------------------------------------------------------------------------
-TBool CNSmlInternetAdapter::DeleteNAPDefL(TUint32 aId)
-    {
-    TBool ret = EFalse;
-    CCommsDbTableView*  checkView;
-    TBool apEnforce=EFalse;
-    TBool iapReLock = EFalse;
-    
-    if(FeatureManager::FeatureSupported(KFeatureIdSapPolicyManagement))
-        {
-        TRAPD( eError,apEnforce=CheckEnforcementL() )
-        DBG_ARGS8(_S8("CNSmlInternetAdapter::DeleteNAPDefL(): EError %d , APEnforcement is %d"),eError,apEnforce);
-        if( eError==KErrNone && apEnforce )
-            {
-            DoLockIAPTablesL(EFalse);
-            iWAPRelock = ETrue;
-            }
-        }
-
-    checkView = iDatabase->OpenViewMatchingUintLC(TPtrC(IAP),TPtrC(IAP_SERVICE), aId);
-    if(IsIAPRecordLockedL(aId))
-        {
-        _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): apaccesspoint record is LOCKED");  
-        TInt reclockerr = ((CCommsDbProtectTableView*)checkView)->UnprotectRecord();
-        DBG_ARGS8(_S8("CNSmlInternetAdapter::AddLeafObjectL ,UnProtecting IAPAccessRecord returned code = %d"),reclockerr);
-        if(reclockerr==KErrNone)
-            iapReLock = ETrue;
-        }
-    else
-        {
-       _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): apaccesspoint record is not write protected");  
-        }
-    TInt error = checkView->GotoFirstRecord();
-    if (error == KErrNone)
-        {
-        TBuf<KCommsDbSvrMaxFieldLength> serviceType;
-
-        checkView->ReadTextL(TPtrC(IAP_SERVICE_TYPE), serviceType);
-
-        CCommsDbTableView* tableView = iDatabase->OpenViewMatchingUintLC(serviceType,TPtrC(COMMDB_ID), aId);
-        error = tableView->GotoFirstRecord();
-
-        if (error == KErrNone)
-            {
-            if(FeatureManager::FeatureSupported(KFeatureIdSapPolicyManagement))
-                {
-                if ( apEnforce )
-                    {
-                    ((CCommsDbProtectTableView*)tableView)->UnprotectRecord();
-                    }
-                }
-            
-            error = tableView->DeleteRecord();
-            if (error == KErrNone )
-                {
-                ret = ETrue;
-                }
-            }
-        CleanupStack::PopAndDestroy(); // tableView
-        }
-
-    CleanupStack::PopAndDestroy(); // checkView
-   
-    if(FeatureManager::FeatureSupported(KFeatureIdSapPolicyManagement))
-        {
-        if(iWAPRelock)
-            {
-            DoLockIAPTablesL(ETrue);
-            iWAPRelock = EFalse;
-            }
-        }
-    
-    if(iapReLock)
-        {
-        TInt reclockerr = DoProtectIAPRecordL(aId,ETrue);
-        DBG_ARGS8(_S8("CNSmlInternetAdapter::AddLeafObjectL ,UnProtecting WAPAccessRecord returned code = %d"),reclockerr);
-        if(reclockerr==KErrNone)
-            iapReLock = EFalse; 
-        }
-    if (apEnforce)
-      apEnforce=EFalse; // to get rid of warnings
-    
-    return ret;
-    }
-
-// ---------------------------------------------------------------------------
-// Removes iapID and linger interval from CentralRepository
-// ---------------------------------------------------------------------------
-//
-void CNSmlInternetAdapter::DeleteLingerL( const TInt aIapId )    
-    {
-    TInt    err( KErrNone );
-    
-    // Open repository
-    CRepository* repository = CRepository::NewLC( KCRUidPDPContextManager );
-    
-    // Find if an entry for "iapId" already exists in CentRep 
-    RArray< TUint32 > foundKeys;
-    foundKeys.Reset();
-    
-    err = repository->FindEqL( KIapColumn,       // partial key
-                                KColumnMask,      // key mask
-                                aIapId,           // value
-                                foundKeys );      // found keys
-    
-    if ( err == KErrNone )
-        {
-        if ( foundKeys.Count() > 0 )
-            {
-            TInt    arrayCount( 0 );
-            
-            // Get number of iapId&linger entries in Centrep
-            err = repository->Get( KPdpContextManagerLingerArrayCount, arrayCount );
-
-            if ( err == KErrNone )
-                {
-                TInt32 row = foundKeys[ 0 ] & KRowMask;
-
-                // Shift existing entries one position left
-                for ( TInt i=row+1; i <= arrayCount; i++ )
-                    {
-                    TInt iapId( 0 );
-                    TInt linger( 0 );
-                        
-                    err = repository->Get( ( KIapColumn | i ), iapId );
-                    
-                    if ( err == KErrNone )
-                        {
-                        err = repository->Get( ( KLingerColumn | i ), linger );    
-                        }
-                        
-                    if ( err == KErrNone )
-                        {
-                        err = repository->Set( ( KIapColumn | (i-1) ), iapId );    
-                        }
-                                    
-                    if ( err == KErrNone )
-                        {
-                        err = repository->Set( ( KLingerColumn | (i-1) ), linger );    
-                        }
-                    }
-                        
-                // Remove the last entry on row arrayCount
-                if ( err == KErrNone )
-                    {
-                    TUint32 errorKey( 0 );
-                       
-                    err = repository->Delete( ( KIapColumn | arrayCount ), 
-                                                 0xFFFFFFFF, 
-                                                 errorKey);
-                    
-                    if ( err == KErrNone )
-                        {
-                        err = repository->Delete( ( KLingerColumn | arrayCount ), 
-                                                   0xFFFFFFFF, 
-                                                   errorKey);    
-                        arrayCount--;
-                        }
-                    }
-                    
-                // Update number of iapId&linger entries in Centrep
-                err = repository->Set( KPdpContextManagerLingerArrayCount, arrayCount );
-                }
-            }        
-        }
-        
-    foundKeys.Close();
-    CleanupStack::PopAndDestroy( repository );
-       
-    }
-//------------------------------------------------------------------------------
-// TBool CNSmlInternetAdapter::DeleteAPL()
-//------------------------------------------------------------------------------
-TBool CNSmlInternetAdapter::DeleteAPL(TUint32 aId)
-    {
-    TBool ret = EFalse;
-    
-  //Check MIP IAP first then go forward
-    if(FeatureManager::FeatureSupported(KFeatureIdSapPolicyManagement))
-        { 
-        TBool apEnforce=EFalse;
-        TBool wlanEnforce= EFalse;
-        TInt wError = KErrNone;
-        TRAP(wError,wlanEnforce=CheckWLANEnforcementL());
-        TRAPD( eError,apEnforce=CheckEnforcementL() )
-        if( wlanEnforce)
-            {
-            UnprotectWLANAPItemL(aId);
-            }
-        DBG_ARGS8(_S8("CNSmlInternetAdapter::DeleteAPL(): EError %d , APEnforcement is %d"),eError,apEnforce);
-        if( eError==KErrNone && apEnforce )
-            {
-            DoLockIAPTablesL(EFalse);
-            iWAPRelock = ETrue;
-            }
-        }
-  
-    if(iDatabase->InTransaction())
-        iDatabase->CommitTransaction();
-    RCmManagerExt        cmManagerExt;
-    cmManagerExt.OpenL();
-    RCmConnectionMethodExt cmConMethodExt ;
-    TRAPD(err, cmConMethodExt= cmManagerExt.ConnectionMethodL( aId ));
-    CleanupClosePushL( cmConMethodExt );
-    if(err == KErrNone)
-        {
-        TRAPD(dError,cmConMethodExt.DeleteL());
-        if(dError == KErrNone)
-            {
-            DeleteLingerL( aId );
-            ret= ETrue;
-            }
-        }
-  
-        CleanupStack::PopAndDestroy(  );
-        cmManagerExt.Close();
-        if(!iDatabase->InTransaction())
-            {
-            TInt dberr = iDatabase->BeginTransaction();
-            if( dberr == KErrLocked )
-                {
-                _DBG_FILE("DeleteAPL: CommsDat was locked.");
-                TInt retry = KBeginTransRetryCount;            
-                while ( retry > 0 && dberr == KErrLocked )
-                    {
-                    User::After(KBeginTransRetryDelay);
-                    _DBG_FILE("DeleteAPL: Slept 1 second. Try again");
-                    dberr = iDatabase->BeginTransaction();
-                    retry--;
-                    }
-                if(dberr != KErrNone)
-                    {        
-                    _DBG_FILE("CNSmlInternetAdapter: BeginTransaction failed completely.");
-                    User::Leave( dberr ); 
-                    }           
-                }
-            }
-    
-    //The following code is kept under #ifndef , so that it can be removed
-    //after RD_DM_APPLICATION_LEVEL_ROAMING_SUPPORT becomes stable.
-    
-   /* #ifndef RD_DM_APPLICATION_LEVEL_ROAMING_SUPPORT
-    CCommsDbTableView*  checkView;
-    CCommsDbTableView*  proxyView;
-    
-    checkView = iDatabase->OpenViewMatchingUintLC(TPtrC(IAP),TPtrC(COMMDB_ID),  aId);
-    TInt error = checkView->GotoFirstRecord();
-    if (error == KErrNone)
-        {
-        //
-        // Remove possible NAPDef-data first if ONLY IAP
-        //
-        TBuf<KCommsDbSvrMaxFieldLength> serviceType;
-        TUint32                         serviceId;
-
-        checkView->ReadTextL(TPtrC(IAP_SERVICE_TYPE),   serviceType);
-        checkView->ReadUintL(TPtrC(IAP_SERVICE),        serviceId);  
-
-
-        CCommsDbTableView* tableView;
-        tableView= iDatabase->OpenViewMatchingUintLC(serviceType, TPtrC(COMMDB_ID), serviceId);
-        error = tableView->GotoFirstRecord();
-        if (error == KErrNone )
-            {
-            error = tableView->DeleteRecord();
-            }
-        CleanupStack::PopAndDestroy();  // tableView
-        
-        //
-        // Delete Proxies for AP also
-        //
-        proxyView = iDatabase->OpenViewMatchingTextLC(TPtrC(PROXIES),
-                                                      TPtrC(PROXY_SERVICE_TYPE),
-                                                      serviceType);
-
-        TInt errorProxy = proxyView->GotoFirstRecord();
-
-        while (errorProxy == KErrNone)
-            {
-            TUint32 lValue;
-            proxyView->ReadUintL(TPtrC(PROXY_ISP),lValue);
-            if(lValue ==  serviceId)
-                {
-                proxyView->ReadUintL(TPtrC(COMMDB_ID),iProxyId);
-               DBG_ARGS8(_S8("DeleteAPL:Delete ServiceId=%d ProxyId=%d"),lValue, iProxyId);
-                error = proxyView->DeleteRecord();
-                }
-            errorProxy = proxyView->GotoNextRecord();
-            }
-            
-        CleanupStack::PopAndDestroy();  // proxyView
-
-        error = checkView->DeleteRecord();
-        if( error == KErrNone )
-            {
-            ret = ETrue;
-            }
-
-        // Delete WAP also
-        if(WapAPExistsL(aId))
-            {
-            DeleteWapAPL(aId);
-            }
-        }
-
-    CleanupStack::PopAndDestroy();      // checkView
- #endif
- */
-    if(FeatureManager::FeatureSupported(KFeatureIdSapPolicyManagement))
-        {
-        if(iWAPRelock)
-            {
-            DoLockIAPTablesL(ETrue);
-            iWAPRelock = EFalse;
-            }   
-        }
-    return ret;
-    }
-
-//------------------------------------------------------------------------------
-// TPtrC8 CNSmlInternetAdapter::LastURISeg(const TDesC8& aURI)
-// Returns only the last uri segment
-//------------------------------------------------------------------------------
-TPtrC8 CNSmlInternetAdapter::LastURISeg(const TDesC8& aURI)
-    {
-    TInt i;
-    for(i=aURI.Length()-1;i>=0;i--)
-        {
-        if(aURI[i]=='/')
-            {
-            break;
-            }
-        }
-    if(i==0)
-        {
-        return aURI;
-        }
-    else
-        {
-        return aURI.Mid(i+1);
-        }
-    }
-
-//------------------------------------------------------------------------------
-// TPtrC8 CNSmlInternetAdapter::FirstURISeg(const TDesC8& aURI)
-// returns parent uri, i.e. removes last uri segment
-//------------------------------------------------------------------------------
-TPtrC8 CNSmlInternetAdapter::FirstURISeg(const TDesC8& aURI)
-    {
-    TInt j= 0;
-    for(TInt i=0;i<=aURI.Length()-1;i++)
-        {
-        if(aURI[i]=='/')
-            {
-            for(j=i+1;j<=aURI.Length()-1;j++)
-                {
-                if(aURI[j]=='/') // Second slash => AP/xxxx
-                break;
-                }
-            break;
-            }
-        }
-    return aURI.Left(j);
-    }
-
-//------------------------------------------------------------------------------
-// TPtrC8 CNSmlInternetAdapter::GetDynamicAPNodeUri( const TDesC8& aURI )
-// returns AP/xxx URI
-//------------------------------------------------------------------------------
-TPtrC8 CNSmlInternetAdapter::GetDynamicAPNodeUri( const TDesC8& aURI )
-    {
-    _DBG_FILE("CNSmlInternetAdapter::GetDynamicAPNodeUri(): begin");
-    DBG_ARGS8(_S8("CNSmlInternetAdapter::GetDynamicAPNodeUri() - <%S> "), &aURI);
-
-    TInt i= 0;
-    for ( i = aURI.Find( KNSmlDdfAP ) + 3; i < aURI.Length(); i++ )
-        {
-        if( aURI[i] == '/' )
-            {
-            break;
-            }
-        }
-        
-    _DBG_FILE("CNSmlInternetAdapter::GetDynamicAPNodeUri(): end");
-    
-    return aURI.Left( i );
-    }
-
-//------------------------------------------------------------------------------
-// CNSmlInternetAdapter::ExecuteBufferL(const TDesC8& aURI)
-// Executes commands for AP after Bearer-data is set
-//------------------------------------------------------------------------------
-void CNSmlInternetAdapter::ExecuteBufferL(const TDesC8& aURI, const TBool aCompleting)
-    {
-    //
-    // Choose AP according to aURI
-    //
-    iExecutingBuffer = ETrue;
-    for(TInt i = 0; i<iBuffer->Count(); i++)
-        {
-        TPtrC8 parentUri = FirstURISeg(aURI);
-        if(iBuffer->At(i).iMappingName->Compare(parentUri) == 0 )
-            {
-            iExecutionIndex = i;
-            break;
-            }
-        }
-
-    if((iExecutionIndex<0) || (iExecutionIndex >= iBuffer->Count()))
-        {
-        return;
-        }
-
-    iISPId = 0;
-    //
-    // Execute all commands for One AP NAPDef
-    //
-    if ( iBuffer->At(iExecutionIndex).iDnsUpdateBuf )
-        {
-        iDnsUpdate = ETrue;
-        }
-    
-    for(TInt cmd=iBuffer->At(iExecutionIndex).iNodeBuf->Count()-1;cmd>=0;cmd--)
-        {
-        TBuf8<16> addLUID;
-        _LIT8(KFormat,"%d");    
-
-        if(iBuffer->At(iExecutionIndex).iNodeBuf->At(cmd).iUri->Match(_L8("AP/*/Px*")) != 0)
-            {
-
-            if (!iBuffer->At(iExecutionIndex).iNodeBuf->At(cmd).iLeaf) 
-                {
-                addLUID.Format(KFormat,0);
-                if(iBuffer->At(iExecutionIndex).iLuid > 0)
-                    {
-                    addLUID.Format(KFormat,-1); // Used for Status return
-                    }
-                AddNodeObjectL(iBuffer->At(iExecutionIndex).iNodeBuf->At(cmd).iUri->Des(),
-                               addLUID,
-                               iBuffer->At(iExecutionIndex).iNodeBuf->At(cmd).iStatusRef);
-
-                iBuffer->At(iExecutionIndex).iExecuted = ETrue;
-                }
-            else
-                {
-                if ( iBuffer->At(iExecutionIndex).iDnsUpdateBuf )
-                    {
-                    addLUID.Zero();
-                    addLUID.Append(iBuffer->At(iExecutionIndex).iNodeBuf->At(cmd).iLuid->Des());
-                    }
-                else
-                    {
-                    addLUID.Format(KFormat,iBuffer->At(iExecutionIndex).iLuid);
-                    if(!iBuffer->At(iExecutionIndex).iDirection ||    // The three values has to be set
-                       !iBuffer->At(iExecutionIndex).iBearer ||
-                       !iBuffer->At(iExecutionIndex).iNameReceived )         // before new AP set
-                        {
-                        addLUID.Format(KFormat,KNSmlIncompleteAP);  // (-1) Used for error 
-                        }                                           // Status return
-                    }
-                //iIAPName = iBuffer->At(iExecutionIndex).iName->Des();
-
-                AddLeafObjectL(iBuffer->At(iExecutionIndex).iNodeBuf->At(cmd).iUri->Des(),
-                               addLUID,
-                               iBuffer->At(iExecutionIndex).iNodeBuf->At(cmd).iData->Des(),
-                               KNSmlMimeTypeTextPlain,
-                               iBuffer->At(iExecutionIndex).iNodeBuf->At(cmd).iStatusRef);
-
-                if(iBuffer->At(iExecutionIndex).iLuid == 0) // After BearerL
-                iBuffer->At(iExecutionIndex).iLuid = iISPId;
-                }
-
-            iBuffer->At(iExecutionIndex).iNodeBuf->At(cmd).iDone = ETrue;
-            }
-
-        }
-    //
-    // Execute all commands for One AP Px
-    //
-    for(TInt cmd2=0;cmd2 < iBuffer->At(iExecutionIndex).iNodeBuf->Count();cmd2++)
-        {
-        TBuf8<16> addLUID2;
-        _LIT8(KFormat,"%d");    
-        if(!iBuffer->At(iExecutionIndex).iNodeBuf->At(cmd2).iDone)
-            {
-            if (!iBuffer->At(iExecutionIndex).iNodeBuf->At(cmd2).iLeaf) 
-                {
-                addLUID2.Format(KFormat,0);
-                if(iBuffer->At(iExecutionIndex).iLuid > 0)
-                    {
-                    addLUID2.Format(KFormat,-1); // Used for Status return
-                    }
-                AddNodeObjectL(iBuffer->At(iExecutionIndex).iNodeBuf->At(cmd2).iUri->Des(),
-                               addLUID2,
-                               iBuffer->At(iExecutionIndex).iNodeBuf->At(cmd2).iStatusRef);
-
-                iBuffer->At(iExecutionIndex).iExecuted = ETrue;
-                }
-            else
-                {
-                addLUID2.Format(KFormat,iBuffer->At(iExecutionIndex).iLuid);
-                iIAPName = iBuffer->At(iExecutionIndex).iName->Des();
-                if(!iBuffer->At(iExecutionIndex).iDirection ||    // Allvalues has to be set
-                   !iBuffer->At(iExecutionIndex).iBearer ||
-                   !iBuffer->At(iExecutionIndex).iName) // before new AP set
-                    {
-                    addLUID2.Format(KFormat,KNSmlIncompleteAP); // (-1) Used for error 
-                    }                                           // Status return
-
-                AddLeafObjectL(iBuffer->At(iExecutionIndex).iNodeBuf->At(cmd2).iUri->Des(),
-                               addLUID2,
-                               iBuffer->At(iExecutionIndex).iNodeBuf->At(cmd2).iData->Des(),
-                               KNSmlMimeTypeTextPlain,
-                               iBuffer->At(iExecutionIndex).iNodeBuf->At(cmd2).iStatusRef);
-
-                if(iBuffer->At(iExecutionIndex).iLuid == 0) // After BearerL
-                iBuffer->At(iExecutionIndex).iLuid = iISPId;
-                }
-            } //++
-
-        iBuffer->At(iExecutionIndex).iNodeBuf->At(cmd2).iDone = ETrue;
-    
-        delete iBuffer->At(iExecutionIndex).iNodeBuf->At(cmd2).iUri;
-        iBuffer->At(iExecutionIndex).iNodeBuf->At(cmd2).iUri = NULL;
-        
-        if(iBuffer->At(iExecutionIndex).iNodeBuf->At(cmd2).iData)
-            {
-            delete iBuffer->At(iExecutionIndex).iNodeBuf->At(cmd2).iData;
-            iBuffer->At(iExecutionIndex).iNodeBuf->At(cmd2).iData = NULL;
-            }
-        }
-
-    // Wlan buffer execution only when called from CompleteOutstandingCmdsL (= aCompleting)
-    for(TInt i = 0; aCompleting && i < iBuffer->At(iExecutionIndex).iWlanNodeBuf->Count(); ++i )        
-        {
-        TBuf8<16> addLUID;
-        _LIT8( KFormat,"%d" );    
-
-        if ( !iBuffer->At( iExecutionIndex ).iWlanNodeBuf->At( i ).iLeaf ) 
-            {
-            addLUID.Format( KFormat, 0 );
-            
-            if( iBuffer->At( iExecutionIndex ).iLuid > 0 )
-                {
-                addLUID.Format( KFormat, iBuffer->At(iExecutionIndex).iLuid );
-                }
-            
-            AddNodeObjectL( iBuffer->At( iExecutionIndex ).iWlanNodeBuf->At( i ).iUri->Des(),
-                            addLUID,
-                            iBuffer->At( iExecutionIndex ).iWlanNodeBuf->At( i ).iStatusRef );
-
-            iBuffer->At( iExecutionIndex ).iExecuted = ETrue;
-            }
-        else
-            {
-            addLUID.Zero();
-            addLUID.Append( iBuffer->At( iExecutionIndex ).iWlanNodeBuf->At( i ).iLuid->Des() );
-            
-            iIAPName = iBuffer->At( iExecutionIndex ).iName->Des();
-
-            AddLeafObjectL( iBuffer->At( iExecutionIndex ).iWlanNodeBuf->At( i ).iUri->Des(),
-                            addLUID,
-                            iBuffer->At( iExecutionIndex ).iWlanNodeBuf->At( i ).iData->Des(),
-                            KNSmlMimeTypeTextPlain,
-                            iBuffer->At( iExecutionIndex ).iWlanNodeBuf->At( i ).iStatusRef);
-
-            if( iBuffer->At( iExecutionIndex ).iLuid == 0 ) // After BearerL            
-              {
-              iBuffer->At( iExecutionIndex ).iLuid = iISPId;
-              }
-              
-            }
-
-        iBuffer->At( iExecutionIndex ).iWlanNodeBuf->At( i ).iDone = ETrue;
-        }
-
-//
-//  Remove data from handled AP-commands
-//
-
-    ClearBuffer( iBuffer->At(iExecutionIndex).iNodeBuf );
-    
-    if ( aCompleting )
-        {
-        delete iBuffer->At(iExecutionIndex).iNodeBuf;
-        
-        ClearBuffer( iBuffer->At(iExecutionIndex).iWlanNodeBuf );
-        delete iBuffer->At(iExecutionIndex).iWlanNodeBuf;
-        
-        if(iBuffer->At(iExecutionIndex).iMappingName)
-            {
-            delete iBuffer->At(iExecutionIndex).iMappingName;
-            iBuffer->At(iExecutionIndex).iMappingName = NULL;
-            }
-
-        if(iBuffer->At(iExecutionIndex).iName)
-            {
-            delete iBuffer->At(iExecutionIndex).iName;
-            iBuffer->At(iExecutionIndex).iName = NULL;
-            }
-
-        iBuffer->Delete(iExecutionIndex); 
-        iBuffer->Compress();
-        }
-
-    iExecutingBuffer = EFalse;
-    iStaleMapUpdate = EFalse;
-    }
-
-//------------------------------------------------------------------------------
-// TPtrC16 CNSmlInternetAdapter::GetAddURISeg(const TDesC8& aURI,const TDesC8 aName)
-// Returns uri segment until the next segment after given aName
-//------------------------------------------------------------------------------
-TPtrC8 CNSmlInternetAdapter::GetAddURISeg(const TDesC8& aURI,const TDesC8& aName)
-    {
-    TInt lStrt = aURI.Find(aName);
-    if (lStrt == KErrNotFound)
-        {
-        return aURI;
-        }
-
-    lStrt += 1;
-    TInt i = 0;
-    for( i=lStrt+aName.Length(); i <= aURI.Length()-1; i++ )
-        {
-        if(aURI[i]=='/')
-            {
-            break;
-            }
-        }
-    if(i==0)
-        {
-        return aURI;
-        }
-    else
-        {
-        return aURI.Left(i);
-        }
-    }
-
-//=============================================
-//      CNSmlInternetAdapter::InitializeWAPAIPL()
-//      Initialize WAP IAP-data before insert
-//      
-//=============================================
-TInt CNSmlInternetAdapter::InitializeWAPIAPL( CCommsDbTableView* aTable, 
-                                              const TDesC8& aName )
-    {
-    aTable->WriteTextL(TPtrC(COMMDB_NAME),        ConvertTo16LC(aName)); // Same as IAP
-    
-
-    aTable->WriteTextL(TPtrC(WAP_CURRENT_BEARER), iWapBearer);
-    aTable->WriteLongTextL(TPtrC(WAP_START_PAGE),     ConvertTo16LC(iWAPAccessPoint)); 
-    CleanupStack::PopAndDestroy(2); //ConvertTo16LC
-    return KErrNone;
-    }
-
-//=============================================
-//      CNSmlInternetAdapter::InitializeWAPL()
-//      Initialize WAP IP Bearer-data  before insert
-//      
-//=============================================
-TInt CNSmlInternetAdapter::InitializeWAPL( CCommsDbTableView* aTable )
-    {
-    TUint32 wapPortNumber = 0;                 
-
-    aTable->WriteUintL(TPtrC(WAP_ACCESS_POINT_ID),  iWapId);        
-    aTable->WriteTextL(TPtrC(WAP_GATEWAY_ADDRESS),  KNSmlEmptyIpv4Address);
-
-    aTable->WriteUintL(TPtrC(WAP_WSP_OPTION),       EWapWspOptionConnectionOriented); // EWapWspOptionConnectionless
-    aTable->WriteBoolL(TPtrC(WAP_SECURITY),         EFalse ); // if 9200 => false
-
-    aTable->WriteUintL(TPtrC(WAP_IAP),              iISPId);        
-    aTable->WriteUintL(TPtrC(WAP_PROXY_PORT),       wapPortNumber);        
-
-    aTable->WriteTextL(TPtrC(WAP_PROXY_LOGIN_NAME), ConvertTo16LC(iWapUserName)); 
-    aTable->WriteTextL(TPtrC(WAP_PROXY_LOGIN_PASS), ConvertTo16LC(iWapPassword));
-    
-    CleanupStack::PopAndDestroy(2); //ConvertTo16LC
-    return KErrNone;
-    }
-
-//=============================================
-//      CNSmlInternetAdapter::IsWapPort()
-//      Check if portnbr for proxy or wap
-//      
-//=============================================
-void CNSmlInternetAdapter::IsWapPort( const TDesC8& aObject )
-    {
-    iWapPort = EFalse;
-    TInt portNbr = GetIntObject8(aObject);
-    if( portNbr >= KNSmlApWapLowerBase && portNbr <= KNSmlApWapUpperBase )
-        {
-        iWapPort = ETrue;
-        }
-    }
-
-// -------------------------------------------------------------------------------------
-// CNSmlInternetAdapter::FillNodeInfoL()
-// Fills the node info in ddf structure
-// -------------------------------------------------------------------------------------
-void CNSmlInternetAdapter::FillNodeInfoL( MSmlDmDDFObject& aNode,
-                                          TSmlDmAccessTypes aAccTypes,
-                                          MSmlDmDDFObject::TOccurence aOccurrence, 
-                                          MSmlDmDDFObject::TScope aScope, 
-                                          MSmlDmDDFObject::TDFFormat aFormat,
-                                          const TDesC8& aDescription )
-                                          
-    {
-    aNode.SetAccessTypesL(aAccTypes);
-    aNode.SetOccurenceL(aOccurrence);
-    aNode.SetScopeL(aScope);
-    aNode.SetDFFormatL(aFormat);
-    if(aFormat!=MSmlDmDDFObject::ENode)
-        {
-        aNode.AddDFTypeMimeTypeL(KNSmlMimeType);
-        }
-    aNode.SetDescriptionL(aDescription);
-    }
-
-
-//=======================================================
-//      CNSmlInternetAdapter::UpdateIAPnameL()
-//      Update IAP-table name add Network-table if needed
-//      Add/update WAP-table name also
-//      
-//=======================================================
-TInt CNSmlInternetAdapter::UpdateIAPnameL( TUint32 aId, const TDesC8& aObject )
-    {
-
-    TUint32 nwId=0;
-    TInt ret = KErrNone;
-    TBool iapReLock = EFalse;
-    
-  TBool apEnforce=EFalse;
-  TRAPD( eError,apEnforce=CheckEnforcementL() )
-  DBG_ARGS8(_S8("CNSmlInternetAdapter::UpdateIAPNAme(): EError %d , APEnforcement is %d"),eError,apEnforce);
-  if( eError==KErrNone && apEnforce )
-    {
-        DoLockIAPTablesL(EFalse);
-        iWAPRelock = ETrue;
-    }
-   
-    CCommsDbTableView*  iapUpdate = iDatabase->OpenViewMatchingUintLC(TPtrC(IAP),TPtrC(COMMDB_ID),  aId);
-    if(IsIAPRecordLockedL(aId))
-        {
-        _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): apaccesspoint record is LOCKED");  
-        TInt reclockerr = ((CCommsDbProtectTableView*)iapUpdate)->UnprotectRecord();
-        DBG_ARGS8(_S8("CNSmlInternetAdapter::AddLeafObjectL ,UnProtecting IAPAccessRecord returned code = %d"),reclockerr);
-        if(reclockerr==KErrNone)
-               iapReLock = ETrue;
-        }
-    else
-        {
-        _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): apaccesspoint record is not write protected");  
-        }
-    TInt error = iapUpdate->GotoFirstRecord();
-    if (error == KErrNone)
-        {
-        _DBG_FILE("CNSmlInternetAdapter::UpdateIAPName, IAP_NETWORK set");
-        TRAPD(err, iapUpdate->ReadUintL(TPtrC(IAP_NETWORK),nwId));
-        
-        if(iapUpdate->UpdateRecord()==KErrNone)
-            {
-            iapUpdate->WriteTextL(TPtrC(COMMDB_NAME), ConvertTo16LC(aObject));
-                        
-            if( err != KErrNone ) // Network entry not yet created
-                {                
-        		AddNetworkL(nwId,aObject);
-                if( nwId > 0 )
-                    {
-                    _DBG_FILE("CNSmlInternetAdapter::UpdateIAPName, IAP_NETWORK set");
-                    DBG_ARGS8(_S8("CNSmlInternetAdapter::UpdateIAPName(): networks is %d"),nwId);
-                    iapUpdate->WriteUintL(TPtrC(IAP_NETWORK),nwId); 
-                    }
-                else
-                    {
-                    ret = KErrGeneral;
-            		}
-                }
-            iapUpdate->PutRecordChanges();
-            }
-        CleanupStack::PopAndDestroy(); //ConvertTo16LC
-        }    
-    CleanupStack::PopAndDestroy(); // iapUpdate
-    
-    
-    if(WapAPExistsL(aId)) 
-        {  // Update handled
-        CCommsDbTableView* wapView;
-        wapView = iDatabase->OpenViewMatchingUintLC(TPtrC(WAP_ACCESS_POINT),
-                                                    TPtrC(COMMDB_ID),
-                                                    iWapId);
-        TInt errorCode = wapView->GotoFirstRecord();
-    
-        // Read all columns needed.
-        if ( errorCode == KErrNone )
-            {
-            if(wapView->UpdateRecord()==KErrNone)
-                {
-                wapView->WriteTextL(TPtrC(COMMDB_NAME), ConvertTo16LC(aObject));
-                wapView->PutRecordChanges();
-                CleanupStack::PopAndDestroy(); //ConvertTo16LC
-                }
-            }
-        CleanupStack::PopAndDestroy(); // wapView
-        }
-    else
-        { // Insert handled
-        CCommsDbTableView* insView;
-        TInt wapInitOK = KErrCancel;
-
-        insView = iDatabase->OpenTableLC(TPtrC(WAP_ACCESS_POINT));
-        iWapId = 0;
-        wapInitOK = insView->InsertRecord(iWapId);
-        if(wapInitOK == KErrNone)
-            {
-            iWAPAccessPoint.Zero();
-            iWapUserName.Zero();
-            iWapPassword.Zero();
-            iWapBearer = TPtrC(WAP_IP_BEARER);
-
-            wapInitOK = InitializeWAPIAPL( insView, aObject );
-            wapInitOK = insView->PutRecordChanges();
-
-            if( wapInitOK == KErrNone )
-                {
-                CCommsDbTableView* updView;
-                TUint32 iWapId2 = 0;
-                iISPId = aId; // IAP number set
-                updView = iDatabase->OpenTableLC(TPtrC(WAP_IP_BEARER));
-                if(updView->InsertRecord(iWapId2) == KErrNone)
-                    {
-                    InitializeWAPL(updView);
-                    updView->PutRecordChanges();
-                    }
-                CleanupStack::PopAndDestroy(); // updView
-                }
-            }
-        else
-            {
-            ret = KErrGeneral;
-            }
-        CleanupStack::PopAndDestroy(); // insView
-        }   
-    if(FeatureManager::FeatureSupported(KFeatureIdSapPolicyManagement))
-        {
-        if(iWAPRelock)
-            {
-            DoLockIAPTablesL(ETrue);
-            iWAPRelock = EFalse;
-            }
-        }
-    if(iapReLock)
-        {
-        TInt reclockerr = DoProtectIAPRecordL(aId,ETrue);
-        DBG_ARGS8(_S8("CNSmlInternetAdapter::AddLeafObjectL ,UnProtecting IAPAccessRecord returned code = %d"),reclockerr);
-        if(reclockerr==KErrNone)
-            iapReLock = EFalse; 
-        }
-        return ret;
-    }
-
-//=============================================
-//      CNSmlInternetAdapter::InitializeVPNServiceL()
-//      Initialize VPNService-data before insert
-//=============================================
-TInt CNSmlInternetAdapter::InitializeVPNServiceL( CCommsDbTableView* aTable )
-    {
-    _LIT(KdefPolicy, "Home");
-
-    aTable->WriteTextL(TPtrC(COMMDB_NAME)           ,iIAPName); // Same as IAP
-
-    aTable->WriteTextL(TPtrC(VPN_SERVICE_POLICY)    ,KdefPolicy);
-    aTable->WriteUintL(TPtrC(VPN_SERVICE_IAP)       ,1);
-    aTable->WriteUintL(TPtrC(VPN_SERVICE_NETWORKID) ,1);
-
-    return KErrNone;
-    }
-
-
-//=============================================
-//      CNSmlInternetAdapter::InitializeLANServiceL()
-//      Initialize LANService-data before insert
-//=============================================
-TInt CNSmlInternetAdapter::InitializeLANServiceL( CCommsDbTableView* aTable )
-    {
-    if ( !iWlanSupported )
-        {
-      _DBG_FILE("CNSmlInternetAdapter::InitializeLANServiceL, WLAN not supported.");
-      return KErrNotSupported;
-        }
-    _LIT(KgifNetworks,   "ip,ip6");
-    _LIT(Kdns6Address,   "0:0:0:0:0:0:0:0");
-    _LIT(KdefaultNetmask, "255.255.255.0");
-
-    aTable->WriteTextL(TPtrC(COMMDB_NAME)            ,ConvertTo16LC(iIAPName));    // Same as IAP
-    aTable->WriteTextL(TPtrC(LAN_IF_NETWORKS)        ,KgifNetworks);
-    aTable->WriteBoolL(TPtrC(SERVICE_IP_ADDR_FROM_SERVER),ETrue);   // DHCP by default.
-    aTable->WriteTextL(TPtrC(SERVICE_IP_ADDR)        ,KNSmlEmptyIpv4Address);
-    aTable->WriteTextL(TPtrC(SERVICE_IP_NETMASK)     ,KdefaultNetmask);
-    aTable->WriteBoolL(TPtrC(SERVICE_IP_DNS_ADDR_FROM_SERVER),ETrue);
-    aTable->WriteTextL(TPtrC(SERVICE_IP_NAME_SERVER1),KNSmlEmptyIpv4Address); 
-    aTable->WriteTextL(TPtrC(SERVICE_IP_NAME_SERVER2),KNSmlEmptyIpv4Address); 
-    aTable->WriteTextL(TPtrC(SERVICE_IP_GATEWAY)     ,KNSmlEmptyIpv4Address); 
-    
-    aTable->WriteBoolL(TPtrC(SERVICE_IP6_DNS_ADDR_FROM_SERVER),ETrue );
-    aTable->WriteTextL(TPtrC(SERVICE_IP6_NAME_SERVER1),Kdns6Address);
-    aTable->WriteTextL(TPtrC(SERVICE_IP6_NAME_SERVER2),Kdns6Address);
-    aTable->WriteTextL(TPtrC(SERVICE_CONFIG_DAEMON_MANAGER_NAME), KDaemonManagerName);
-    aTable->WriteTextL(TPtrC(SERVICE_CONFIG_DAEMON_NAME), KConfigDaemonName );
-                            
-    CleanupStack::PopAndDestroy(); //ConvertTo16LC
-    return KErrNone;
-    }
-
-//=============================================
-//      CNSmlInternetAdapter::IsWLANfield()
-//      Check if handled by WLAN-adapter
-//=============================================
-TBool CNSmlInternetAdapter::IsWLANfield( const TDesC8& aURI )
-    {
-    TBool ret(EFalse);
-
-    SetField(aURI);
-
-    if(KNSmlDdfNetworkID().Match(*iField) == 0) // ID not valid
-        {
-        return ret;
-        }
-    if(KNSmlDdfAP().Match(*iField) == 0) // AP not valid
-        {
-        return ret;
-        }
-    if (aURI.Match(_L8("AP/*/NAPDef/*/WLAN/*")) != KErrNotFound)
-        {
-        DBG_ARGS8(_S8("AP:IsWLANfield URI - <%S> <%S> FOUND"), &aURI, iField );
-        ret = ETrue;
-        }
-
-    return ret;
-    }
-
-//=============================================
-//      CNSmlInternetAdapter::IsWlanL()
-//      Check if WLAN accesspoint
-//=============================================
-TBool CNSmlInternetAdapter::IsWlanL( const TDesC8& aURI )
-    {
-    TBool ret(EFalse);
-    
-    if ( !iWlanSupported )
-        {
-      _DBG_FILE("CNSmlInternetAdapter::IsWlanL, WLAN not supported.");
-      return ret;
-        }
-
-    TBuf<KCommsDbSvrMaxFieldLength> serviceType;
-
-    // Get IAP nbr for servicetype
-    TUint32 apWlan = GetAPIdFromURIL(aURI);
-
-    //  IAP-table search serviceType (=Bearer)
-    CCommsDbTableView* iapViews = iDatabase->OpenViewMatchingUintLC(TPtrC(IAP),
-                                                                    TPtrC(COMMDB_ID),
-                                                                    apWlan);
-
-    TInt errorCode = iapViews->GotoFirstRecord();
-    
-    // Read iapService from (IAP)
-    if ( errorCode == KErrNone )
-        {
-        iapViews->ReadTextL(TPtrC(IAP_SERVICE_TYPE), serviceType);
-        if(serviceType == TPtrC(LAN_SERVICE))
-            {
-            ret = ETrue;
-            }
-        }
-    CleanupStack::PopAndDestroy(); // iapViews
-
-    return ret;
-    }
-
-//------------------------------------------------------------------------------
-// TBool CNSmlInternetAdapter::GetLanBearerL()
-//------------------------------------------------------------------------------
-TBool CNSmlInternetAdapter::GetLanBearerL(TUint32& aId)
-    {
-    TBool ret = EFalse;
-    
-    if ( !iWlanSupported )
-        {
-      _DBG_FILE("CNSmlInternetAdapter::GetLanBearerL, WLAN not supported.");
-      return ret;
-        }
-    
-    CCommsDbTableView*  checkView;
-
-    HBufC* bName = HBufC::NewLC(15);
-    TPtr bNamePtr = bName->Des();
-    _LIT(KWlanBearer, "WLANBearer" );
-    bNamePtr.Format( KWlanBearer );
-
-    checkView = iDatabase->OpenViewMatchingTextLC(TPtrC(LAN_BEARER),TPtrC(COMMDB_NAME), bNamePtr);
-    TInt error = checkView->GotoFirstRecord();
-    if (error == KErrNone)
-        {
-        checkView->ReadUintL(TPtrC(COMMDB_ID), aId);
-        ret = ETrue;
-        }
-    else
-        {
-        aId = 1; // Default modem 
-        }
-    DBG_ARGS8(_S8("CNSmlInternetAdapter:GetLanBearerL %d"), aId);
-
-    CleanupStack::PopAndDestroy(2); // checkView bName
-
-    return ret;
-    }
-
-
-//------------------------------------------------------------------------------
-// TBool CNSmlInternetAdapter::GetModemBearerL()
-//------------------------------------------------------------------------------
-TBool CNSmlInternetAdapter::GetModemBearerL(TUint32& aId)
-    {
-    TBool ret = EFalse;
-    CCommsDbTableView*  checkView;
-
-    HBufC* bName = HBufC::NewLC(15);
-    TPtr bNamePtr = bName->Des();
-    
-    if(iBearer == TPtrC(OUTGOING_GPRS) ||
-       iBearer == TPtrC(INCOMING_GPRS) )
-        {
-        _LIT(KGprsModem, "GPRS Modem" );
-        bNamePtr.Format( KGprsModem );
-        }
-
-    checkView = iDatabase->OpenViewMatchingTextLC(TPtrC(MODEM_BEARER),TPtrC(COMMDB_NAME), bNamePtr);
-    TInt error = checkView->GotoFirstRecord();
-    if (error == KErrNone)
-        {
-        checkView->ReadUintL(TPtrC(COMMDB_ID), aId);
-        ret = ETrue;
-        }
-    else
-        {
-        aId = 5; // Default modem 1->5 ???
-        }
-    DBG_ARGS8(_S8("CNSmlInternetAdapter:GetModemBearerL %d"), aId);
-
-    CleanupStack::PopAndDestroy(2); // checkView bName
-
-    return ret;
-    }
-
-
-// ---------------------------------------------------------
-//      NextAPNameL()
-//      Generates new AP name.
-// ---------------------------------------------------------
-void CNSmlInternetAdapter::NextAPNameL(const TDesC8& aName)
-    {
-    // generate name candidate
-    HBufC8* nameCandidate = HBufC8::NewLC(aName.Length()+12);
-    TPtr8 candidatePtr = nameCandidate->Des();
-
-    // loop while valid name is found
-    TBool validName;
-
-    // loop while valid name is found
-    TInt i=0;
-    do  {
-        validName = ETrue;
-        candidatePtr.Format(aName);
-        if(i>0)
-            {
-            _LIT( KLeftBrace, "(" );
-            _LIT( KRightBrace, ")" );
-            HBufC* buf = HBufC::NewLC(10); //10 = max length of 32bit integer
-            TPtr ptrBuf = buf->Des();
-            ptrBuf.Num(i);
-            candidatePtr.Append( KLeftBrace );
-            candidatePtr.Append(ptrBuf);
-            candidatePtr.Append( KRightBrace );
-            CleanupStack::PopAndDestroy(); //buf
-            }
-        i++;
-        if(!IsValidNameL(candidatePtr))
-            {
-            validName = EFalse;
-            }
-    } while( !validName );
-
-    iIAPName = candidatePtr;
-
-    CleanupStack::PopAndDestroy(); //nameCandidate
-    }
-
-//------------------------------------------------------------------------------
-// TBool CNSmlInternetAdapter::IsValidNameL()
-//------------------------------------------------------------------------------
-TBool CNSmlInternetAdapter::IsValidNameL(const TDesC8& aName)
-    {
-    TBool ret = ETrue;
-    CCommsDbTableView*  nameView;    
-
-    nameView = iDatabase->OpenViewMatchingTextLC( TPtrC(IAP),TPtrC(COMMDB_NAME), aName);
-
-    TInt errorCode = nameView->GotoFirstRecord();
-
-    if (errorCode == KErrNone )
-        {
-        ret = EFalse; // If found error returned        
-        }
-    
-    CleanupStack::PopAndDestroy(); // nameView
-    return ret;
-    }
-
-//------------------------------------------------------------------------------
-// TBool CNSmlInternetAdapter::InitializeDNSParamsFromBuffL(const TPtrC8 aParentUri,
-//                                                          TInt& aDnsPri )
-// Finds parameters needed in updating DNSAddrL from buffer
-//------------------------------------------------------------------------------
-TBool CNSmlInternetAdapter::InitializeDNSParamsFromBuffL( const TPtrC8 aParentUri, 
-                                                          TInt& aDnsPri )
-    {
-    TInt cmd(0);
-    TBool found(EFalse);
-
-    TNSmlAPBufferElement& thisElem = iBuffer->At( 0 );
-
-    // Parse URI to match
-    CBufBase* buf = CBufFlat::NewL(150);
-    CleanupStack::PushL( buf );
-    buf->InsertL(0, aParentUri);
-    buf->InsertL(buf->Size(), KNSmlDmApValFSlash);
-    buf->InsertL(buf->Size(), KNSmlDdfDNSPriority );
-    TBuf8<150> tmp;
-    buf->Read(0, tmp, buf->Size());
-
-    cmd = thisElem.iNodeBuf->Count() -1;
-    // check if the DNSPriority is sent for DNSAddr/<x>
-    while( cmd >= 0 )
-        {
-        TNSmlAPAddElement& dbgElem2 = thisElem.iNodeBuf->At(cmd);
-        if( thisElem.iNodeBuf->At(cmd).iUri->Match( tmp ) != KErrNotFound )
-            {
-            TLex8 lex(thisElem.iNodeBuf->At(cmd).iData->Des());
-            lex.Val(aDnsPri);
-            thisElem.iNodeBuf->At(cmd).iDone = ETrue;
-            found = ETrue;
-            }
-        cmd--;
-        }
-    CleanupStack::PopAndDestroy(buf);
-    return found;
-    }
-
-//------------------------------------------------------------------------------
-// TBool CNSmlInternetAdapter::DnsToLuid(const UriUtils::TUriHostType aType,)
-//                                      const TInt aPriority ) const
-// Encodes special luid for DNSAddr/<X>
-//------------------------------------------------------------------------------
-TInt CNSmlInternetAdapter::DnsToLuid( const UriUtils::TUriHostType aType, 
-                                      const TInt aPriority ) const
-    {
-    return KNSmlApDnsLuidUpperBase + static_cast<TInt>(aType)*10 + aPriority;
-    }
-//------------------------------------------------------------------------------
-// TBool CNSmlInternetAdapter::LuidToDns(UriUtils::TUriHostType& aType,)
-//                                     TInt& aPriority, const TInt aLuid ) const
-// Decodes DNAddr/<X> type from LUID
-//------------------------------------------------------------------------------
-TInt CNSmlInternetAdapter::LuidToDns( UriUtils::TUriHostType& aType, 
-                                      TInt& aPriority, const TInt aLuid ) const
-    {
-    TInt err = KErrNone;
-    if ( aLuid < KNSmlApDnsLuidUpperBase )
-        {
-        err = KErrGeneral;
-        }
-    else
-        {
-        aPriority = ( aLuid - KNSmlApDnsLuidUpperBase ) % 10;
-        if ( (aPriority > 0) && (aPriority < 3) )
-            {
-            TInt type  = ( aLuid - KNSmlApDnsLuidUpperBase - aPriority ) / 10;
-            if ( ( type >= 0 ) && ( type < 2 ) )
-                {
-                aType = static_cast<UriUtils::TUriHostType>(type);
-                }
-            else
-                {
-                err = KErrGeneral;
-                }
-            }
-        else 
-            {
-            err = KErrGeneral;
-            }
-        }
-    return err;
-    }
-//------------------------------------------------------------------------------
-// TBool CNSmlInternetAdapter::RemoveLastSeg(const TDesC8& aURI)
-// Returns URI without its last segment
-//------------------------------------------------------------------------------
-TPtrC8 CNSmlInternetAdapter::RemoveLastSeg(const TDesC8& aURI) const
-    {
-    TInt i;
-    for(i=aURI.Length()-1;i>=0;i--)
-        {
-        if(aURI[i]==KNSmlDMUriSeparator)
-            {
-            break;
-            }
-        }
-    if(i>0)
-        {
-        return aURI.Left(i);
-        }
-    else
-        {
-        return KNullDesC8();
-        }
-    }
-
-//------------------------------------------------------------------------------
-// void CNSmlInternetAdapter::ClearBuffer()
-// Deletes all dynamically allocated data from given array's each element
-// and resets the buffer.
-//------------------------------------------------------------------------------
-void CNSmlInternetAdapter::ClearBuffer( CArrayFixFlat<TNSmlAPAddElement>* aBuffer )
-    {
-    for( TInt i = 0; i < aBuffer->Count(); i++ )
-        {
-        delete aBuffer->At(i).iUri;
-        aBuffer->At(i).iUri = NULL;
-        
-        delete aBuffer->At(i).iData;
-        aBuffer->At(i).iData = NULL;
-        
-        delete aBuffer->At(i).iLuid;
-        aBuffer->At(i).iLuid = NULL;
-        }
-    
-    aBuffer->Reset();
-    }
-
-
-
-//----------------------------------------------------------------------
-//TBool CNSmlInternetAdapter::IsValidIPv4AddressL(const TDesC8& aNapAddr)
-//Checks if the string is of correct IPV4 address format x.x.x.x and 
-//numbers are within the range 0-255
-//returns true on sucess and false on failure.
-//----------------------------------------------------------------------
-TBool CNSmlInternetAdapter::IsValidIPv4AddressL(const TDesC8& aNapAddr)
-    {
-    TInt digitLen(0);
-    TBool ret = EFalse;
-    _LIT8( KNSmlDMV4Format,      "*.*.*.*" );
-    
-    if( aNapAddr.Match(KNSmlDMV4Format)!= KErrNotFound )
-        {
-        TInt pos = 0;
-        TInt numDots=0;
-        TInt maxIP=255;
-        TInt minIP=0;
-        for( TInt i=0;i<aNapAddr.Length();i++ ) 
-            {  
-            digitLen ++;
-            //Check if aNapAddr contain any characters other than 
-            // 0 - 9 and ".",  If yes return from the function.
-            if( aNapAddr[i]!=KNSmlDMDot && (aNapAddr[i]<KNSmlDMAsciiIntStart || aNapAddr[i] > KNSmlDMAsciiIntEnd ))
-                {
-                ret = EFalse;
-                break;
-                }
-            if(aNapAddr[i]==KNSmlDMDot)
-                {
-                ret = ETrue;
-                if (i > 0 )
-                    {
-                    TInt digit;
-                    TPtrC8 ptrOneDigit = aNapAddr.Mid(pos,digitLen-1);
-                    TLex8 lexint(ptrOneDigit);
-                    if( lexint.Val(digit)!=KErrNone || digit >= maxIP || digit < minIP )
-                        {
-                        ret = EFalse;
-                        break;
-                        }
-                    } // end of if i > 0
-                pos = i+1;
-                numDots++;
-                digitLen=0;
-                } // end of if
-            } //End of for
-         if( numDots==3 && ret )
-            {
-            ret = ETrue;
-            }
-            else 
-            {
-            ret = EFalse;
-            }
-        } // end of outer if, format check
-    return ret;
-    }
-
-TBool CNSmlInternetAdapter::IsWAPAccessPointRecordLockedL(TUint32 aRecord)
-  {
-  _DBG_FILE("CNSmlInternetAdapter::IsWAPAccessPointRecordLockedL():  BEGIN"); 
-  TBool ret = EFalse;
-    CCommsDbTableView* wapView;
-    DBG_ARGS8(_S8("CNSmlInternetAdapter::IsWAPAccessPointRecordLockedL record being checked = %d"),aRecord);
-    wapView = iDatabase->OpenViewMatchingUintLC(TPtrC(WAP_ACCESS_POINT),
-                                                            TPtrC(COMMDB_ID),
-                                                            aRecord);
-                                                              
-    TInt aAccess( 0 );
-    if(wapView!=NULL)
-      {
-      _DBG_FILE("CNSmlInternetAdapter::IsWAPAccessPointRecordLockedL():wap record exists, check for access type");  
-      TInt err = (((CCommsDbProtectTableView*) wapView )->GetRecordAccess( aAccess ) );
-      DBG_ARGS8(_S8("CNSmlInternetAdapter::IsWAPAccessPointRecordLockedL , GetrecordAccess code is =%d and acess type of record = %d"),err, aAccess);
-      CleanupStack::PopAndDestroy( wapView);                                            
-      if(aAccess == RDbRowSet::EReadOnly)                                                    
-          ret = ETrue;
-      }
-    
-    _DBG_FILE("CNSmlInternetAdapter::IsWAPAccessPointRecordLockedL():  END"); 
-    return ret;
-            
-  }
-//----------------------------------------------------------------------
-//TBool CNSmlInternetAdapter::DoProtectWAPAccessRecordL(TUint32 aRecord,TBool aProtect)
-// protect or unprotect wapaccesspoint record of access point being altered 
-//----------------------------------------------------------------------
-
-
-TInt CNSmlInternetAdapter::DoProtectWAPAccessRecordL(TUint32 aRecord,TBool aProtect)
-  {
-  _DBG_FILE("CNSmlInternetAdapter::DoProtectWAPAccessRecordL():  BEGIN"); 
-  DBG_ARGS8(_S8("CNSmlInternetAdapter::DoProtectWAPAccessRecordL , record and protect value  =%d  = %d"),aRecord, aProtect);
-  TInt err = KErrNone;
-  
-  CCommsDbTableView* wapView;
-    wapView = iDatabase->OpenViewMatchingUintLC(TPtrC(WAP_ACCESS_POINT),
-                                                            TPtrC(COMMDB_ID),
-                                                            aRecord);
-  if( wapView != NULL )
-    {
-    _DBG_FILE("CNSmlInternetAdapter::DoProtectWAPAccessRecordL():  wap record exists"); 
-    if( !aProtect )
-        {
-        err = ( (CCommsDbProtectTableView*) wapView )->UnprotectRecord();
-        DBG_ARGS8(_S8("CNSmlInternetAdapter::DoProtectWAPAccessRecordL ,error code of Unprotectrecord = %d"),err);
-          }
-          
-      else
-        {
-        err = ( (CCommsDbProtectTableView*) wapView )->ProtectRecord();
-        DBG_ARGS8(_S8("CNSmlInternetAdapter::DoProtectWAPAccessRecordL ,error code of ProtectRecord = %d"),err);  
-        }
-  
-      CleanupStack::PopAndDestroy( wapView);
-    }
-    
-  _DBG_FILE("CNSmlInternetAdapter::DoProtectWAPAccessRecordL():  END"); 
-  return err;
-  }
-  
-//------------------------------------------------------------------------------
-// TUint32 CNSmlInternetAdapter::GetIAPSeamlessnessL(TUint32 aId)
-// Gets the seamlessness value from the IAPMetadata table though the cmmanager API
-//------------------------------------------------------------------------------
-
-TUint32 CNSmlInternetAdapter::GetIAPSeamlessnessL(TUint32 aId)
-    {
-        _DBG_FILE("CNSmlInternetAdapter::GetIAPSeamlessnessL(): begin");
-        //Deleting iDatabase, Required since CommsDB has one view open for reading and commsdat API would
-        //return KErrLocked if this is not done
-        TBool reopenTransaction( EFalse );
-        if( iDatabase->InTransaction() )
-        {
-        	iDatabase->CommitTransaction();
-        	iTransactionCommitted = ETrue;       
-        	reopenTransaction = ETrue;
-        }
-        	
-
-        RCmManagerExt        cmManagerExt;
-        cmManagerExt.OpenL();
-        RCmConnectionMethodExt cm = cmManagerExt.ConnectionMethodL( aId );        
-        CleanupClosePushL( cm );
-        TUint32 smless= cm.GetIntAttributeL( CMManager::ECmSeamlessnessLevel );
-        CleanupStack::PopAndDestroy(  );
-        cmManagerExt.Close();
-        
-        //Recreate reference to CommsDB since other tables
-        //are manipulated with Commsdb 
-        if( reopenTransaction )
-            {
-            TInt dberr = iDatabase->BeginTransaction();
-            if( dberr == KErrLocked )
-                {
-                _DBG_FILE("GetIAPSeamlessnessL: CommsDat was locked.");
-                TInt retry = KBeginTransRetryCount;            
-                while ( retry > 0 && dberr == KErrLocked )
-                    {
-                    User::After(KBeginTransRetryDelay);
-                    _DBG_FILE("GetIAPSeamlessnessL: Slept 1 second. Try again");
-                    dberr = iDatabase->BeginTransaction();
-                    retry--;
-                    }
-                if(dberr != KErrNone)
-                    {        
-                    _DBG_FILE("CNSmlInternetAdapter: BeginTransaction failed completely.");
-                    User::Leave( dberr ); 
-                    }           
-                }
-            }
-                
-       _DBG_FILE("CNSmlInternetAdapter::GetIAPSeamlessnessL(): End");
-        return smless;
-            
-    }
-
-//------------------------------------------------------------------------------
-// TUint32 CNSmlInternetAdapter::GetIAPMetaDataL(TUint32 aId)
-// Gets the metadata value from the IAPMetadata table though the cmmanager API
-//--------------------------------------------------------------------------
-    
-TUint32 CNSmlInternetAdapter::GetIAPMetaDataL(TUint32 aId)
-    {
-         _DBG_FILE("CNSmlInternetAdapter::GetIAPMetaDataL(): begin");
-        //Deleting iDatabase, Required since CommsDB has one view open for reading and commsdat API would
-        //return KErrLocked if this is not done 
-         TBool reopenTransaction( EFalse );
-         if( iDatabase->InTransaction() )
-         {
-             iDatabase->CommitTransaction();
-             iTransactionCommitted = ETrue;       
-             reopenTransaction = ETrue;
-         }
-                 
-        TUint32 metadata, highlight, hidden;
-        RCmManagerExt        cmManagerExt;
-        
-        cmManagerExt.OpenL();
-        RCmConnectionMethodExt cm = cmManagerExt.ConnectionMethodL( aId );        
-        CleanupClosePushL( cm );
-        
-        TBool metaHidden = cm.GetBoolAttributeL( CMManager::ECmMetaHiddenAgent);
-        TBool metaHL = cm.GetBoolAttributeL( CMManager::ECmMetaHighlight);
-        highlight =   EMetaHighlight & metaHL;
-        hidden    =   EMetaHiddenAgent &  metaHidden;
-        metadata  =   highlight | hidden; 
-        
-        CleanupStack::PopAndDestroy(  );
-        cmManagerExt.Close();
-        //Recreate reference to CommsDB since other tables
-        //are manipulated with Commsdb 
-        if( reopenTransaction )
-            {
-            TInt dberr = iDatabase->BeginTransaction();
-            if( dberr == KErrLocked )
-                {
-                _DBG_FILE("GetIAPMetaDataL: CommsDat was locked.");
-                TInt retry = KBeginTransRetryCount;            
-                while ( retry > 0 && dberr == KErrLocked )
-                    {
-                    User::After(KBeginTransRetryDelay);
-                    _DBG_FILE("GetIAPMetaDataL: Slept 1 second. Try again");
-                    dberr = iDatabase->BeginTransaction();
-                    retry--;
-                    }
-                if(dberr != KErrNone)
-                    {        
-                    _DBG_FILE("CNSmlInternetAdapter: BeginTransaction failed completely.");
-                    User::Leave( dberr ); 
-                    }           
-                }
-            }
-        
-        _DBG_FILE("CNSmlInternetAdapter::GetIAPMetaDataL(): end");
-        return metadata;
-            
-    }
-//------------------------------------------------------------------------------
-// void CNSmlInternetAdapter::SetIAPSeamlessnessL(TUint32 apMetaID,TUint32 aSeam,TInt aStatusRef)
-// Sets the seamlessness value to the IAPMetadata table though the cmmanager API
-//------------------------------------------------------------------------------
- void CNSmlInternetAdapter::SetIAPSeamlessnessL(TUint32 apMetaID,TUint32 aSeam,TInt aStatusRef)
-    {
-    
-      _DBG_FILE("CNSmlInternetAdapter::SetIAPSeamlessnessL(): begin");
-      TBool reopenTransaction( EFalse );
-      if( iDatabase->InTransaction() )
-      {
-          iDatabase->CommitTransaction();
-          iTransactionCommitted = ETrue;       
-          reopenTransaction = ETrue;
-      }
-        
-       
-       RCmManagerExt        cmManagerExt;
-       cmManagerExt.OpenL();
-       RCmConnectionMethodExt cm ;
-       TInt cmerror = KErrNone;
-       TRAP(cmerror, cm= cmManagerExt.ConnectionMethodL( apMetaID ));        
-       CleanupClosePushL( cm );
-       TRAPD(sErr,cm.SetIntAttributeL( CMManager::ECmSeamlessnessLevel,aSeam ))
-       if(sErr == KErrNone)
-        {
-           cm.UpdateL(); 
-           iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EOk);
-        }
-       else
-        {
-            iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EError);
-        }
-             
-       CleanupStack::PopAndDestroy(  );
-       
-       cmManagerExt.Close();
-     //  iDatabase = CCommsDatabase::NewL();
-       if( reopenTransaction )
-           {
-           TInt dberr = iDatabase->BeginTransaction();
-           if( dberr == KErrLocked )
-               {
-               _DBG_FILE("SetIAPSeamlessnessL: CommsDat was locked.");
-               TInt retry = KBeginTransRetryCount;            
-               while ( retry > 0 && dberr == KErrLocked )
-                   {
-                   User::After(KBeginTransRetryDelay);
-                   _DBG_FILE("SetIAPSeamlessnessL: Slept 1 second. Try again");
-                   dberr = iDatabase->BeginTransaction();
-                   retry--;
-                   }
-               if(dberr != KErrNone)
-                   {        
-                   _DBG_FILE("CNSmlInternetAdapter: BeginTransaction failed completely.");
-                   User::Leave( dberr ); 
-                   }           
-               }
-           }
-       
-       _DBG_FILE("CNSmlInternetAdapter::SetIAPSeamlessnessL(): end");
-    }
-
-//------------------------------------------------------------------------------
-// void CNSmlInternetAdapter::SetIAPMetaDataL(TUint32 apMetaID,TUint32 aMeta,TInt aStatusRef)
-// Sets the metadata value to the IAPMetadata table though the cmmanager API
-//------------------------------------------------------------------------------
- 
- void CNSmlInternetAdapter::SetIAPMetaDataL(TUint32 apMetaID,TUint32 aMeta,TInt aStatusRef)
-    {
-    
-       _DBG_FILE("CNSmlInternetAdapter::SetIAPMetaDataL(): begin");
-       TInt hMHLErr = KErrNone;
-       TInt hMHAErr = KErrNone;
-       if(iDatabase)
-        {
-         iDatabase->CommitTransaction();
-        // delete iDatabase;
-        }
-       RCmManagerExt        cmManagerExt;
-       cmManagerExt.OpenL();
-       RCmConnectionMethodExt cm = cmManagerExt.ConnectionMethodL( apMetaID );
-       CleanupClosePushL( cm );
-       
-       if(aMeta & EMetaHighlight)
-          {
-             TRAP(hMHLErr,cm.SetBoolAttributeL( CMManager::ECmMetaHighlight,ETrue));
-          }
-        else
-          {
-             TRAP(hMHLErr,cm.SetBoolAttributeL( CMManager::ECmMetaHighlight,EFalse));
-          }
-          
-        if(aMeta & EMetaHiddenAgent )
-          {
-             TRAP(hMHAErr,cm.SetBoolAttributeL( CMManager::ECmMetaHiddenAgent,ETrue));
-          }
-        else
-          {
-             TRAP(hMHAErr,cm.SetBoolAttributeL( CMManager::ECmMetaHiddenAgent,EFalse));
-          }
-         if( (hMHAErr==KErrNone) && (hMHLErr==KErrNone) )
-          {
-              cm.UpdateL();  
-              iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EOk);  
-                  
-          }
-         else
-          {
-              iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EError);
-          }
-          
-
-	       CleanupStack::PopAndDestroy(  );
-	       
-	       cmManagerExt.Close();
-	       TInt dberr = iDatabase->BeginTransaction();
-           if( dberr == KErrLocked )
-               {
-               _DBG_FILE("SetIAPMetaDataL: CommsDat was locked.");
-               TInt retry = KBeginTransRetryCount;            
-               while ( retry > 0 && dberr == KErrLocked )
-                   {
-                   User::After(KBeginTransRetryDelay);
-                   _DBG_FILE("SetIAPMetaDataL: Slept 1 second. Try again");
-                   dberr = iDatabase->BeginTransaction();
-                   retry--;
-                   }
-               if(dberr != KErrNone)
-                   {        
-                   _DBG_FILE("CNSmlInternetAdapter: BeginTransaction failed completely.");
-                   User::Leave( dberr ); 
-                   }           
-               }
-           
-	       _DBG_FILE("CNSmlInternetAdapter::SetIAPMetaDataL(): end");
-    }
-
-
-void CNSmlInternetAdapter::AddLingerL( const TInt aIapId, const TInt aLingerInterval)
-{
-    TInt    err( KErrNone );
-    
-    // Open repository
-    CRepository* repository = CRepository::NewLC( KCRUidPDPContextManager );
-    
-    // Find if an entry for "iapId" already exists in CentRep 
-    RArray< TUint32 > foundKeys;
-    foundKeys.Reset();
-    
-    err = repository->FindEqL( KIapColumn,       // partial key
-                               KColumnMask,      // key mask
-                               aIapId,           // value
-                               foundKeys );      // found keys
-    
-    if ( err == KErrNone || err == KErrNotFound )
-        {
-        if ( foundKeys.Count() == 0 )
-            {
-            // Add a new entry
-            TInt arrayCount( 0 );
-            
-            // Get number of iapId&linger entries in Centrep
-            err = repository->Get( KPdpContextManagerLingerArrayCount, 
-                                   arrayCount );
-        
-            if ( err == KErrNone )
-                {
-                arrayCount++;
-                
-                err = repository->Create( ( KIapColumn | arrayCount ), aIapId ); 
-                
-                if ( err == KErrNone )
-                    {
-                    err = repository->Create( ( KLingerColumn | arrayCount ), 
-                                               aLingerInterval );     
-                    }
-                
-                if ( err == KErrNone )
-                    {
-                    // Update number of iapId&linger entries in Centrep
-                    err = repository->Set( KPdpContextManagerLingerArrayCount, 
-                                           arrayCount );
-                    }
-                }
-            }
-        else
-            {
-            // Update existing entry on current row
-            TInt32 row = foundKeys[ 0 ] & KRowMask;
-            
-            err = repository->Set( ( KLingerColumn | row ), aLingerInterval ); 
-            }         
-        }
-        
-    foundKeys.Close();
-    CleanupStack::PopAndDestroy( repository );
-    
-    User::LeaveIfError( err );
-}
-
-void CNSmlInternetAdapter::UpdateLingerL( const TInt aIapId, const TInt aLingerInterval )
-    { 
-    TInt    err( KErrNone );
-    
-    // Open repository
-    CRepository* repository = CRepository::NewLC( KCRUidPDPContextManager );
-
-    // Find if an entry for "iapId" already exists in CentRep 
-    RArray< TUint32 > foundKeys;
-    foundKeys.Reset();
-    
-    err = repository->FindEqL( KIapColumn,       // partial key
-                                KColumnMask,      // key mask
-                                aIapId,           // value
-                                foundKeys );      // found keys
-    
-    if ( err == KErrNone || err == KErrNotFound )
-        {
-        
-        if ( foundKeys.Count() == 0 )
-            {
-            // Add a new entry
-            TInt arrayCount( 0 );
-            
-            // Get number of iapId&linger entries in Centrep
-            err = repository->Get( KPdpContextManagerLingerArrayCount, 
-                                   arrayCount );
-        
-            if ( err == KErrNone )
-                {
-                arrayCount++;
-                
-                err = repository->Create( ( KIapColumn | arrayCount ), aIapId ); 
-                
-                if ( err == KErrNone )
-                    {
-                    err = repository->Create( ( KLingerColumn | arrayCount ), 
-                                               aLingerInterval );     
-                    }
-                
-                if ( err == KErrNone )
-                    {
-                    // Update number of iapId&linger entries in Centrep
-                    err = repository->Set( KPdpContextManagerLingerArrayCount, 
-                                           arrayCount );
-                    }
-                }
-            }
-        else
-            {
-            // Update existing entry on currebt row
-            TInt32 row = foundKeys[ 0 ] & KRowMask;
-            
-            err = repository->Set( ( KLingerColumn | row ), aLingerInterval ); 
-            }    
-        }
-        
-    foundKeys.Close();
-    CleanupStack::PopAndDestroy( repository );
-    
-    User::LeaveIfError( err );
-    }
-void CNSmlInternetAdapter::GetLingerL( const TInt aIapId, TInt& aLingerInterval )    
-    {
-    TInt    err( KErrNone );
-    
-    // Open repository
-    CRepository* repository = CRepository::NewLC( KCRUidPDPContextManager );
-
-    // Find if an entry for "iapId" already exists in CentRep 
-    RArray< TUint32 > foundKeys;
-    foundKeys.Reset();
-    
-    err = repository->FindEqL( KIapColumn,       // partial key
-                                KColumnMask,      // key mask
-                                aIapId,           // value
-                                foundKeys );      // found keys
-    
-    if ( err == KErrNone )
-        {
-        if ( foundKeys.Count() > 0 )
-            {
-            // Find linger interval for the iap id on current row
-            TInt32 row = foundKeys[ 0 ] & KRowMask;
-            
-            err = repository->Get( ( KLingerColumn | row ), aLingerInterval ); 
-            }        
-        }
-        
-    foundKeys.Close();
-    CleanupStack::PopAndDestroy( repository );
-    
-    User::LeaveIfError( err );
-    }
-    
-
-
-
-//----------------------------------------------------------------------
-//TBool CNSmlInternetAdapter::CheckEnforcementL()
-// If AP policy is enforced true is returned else false
-//----------------------------------------------------------------------
-TBool CNSmlInternetAdapter::CheckEnforcementL()
-    {
-      CSettingEnforcementInfo* info = CSettingEnforcementInfo::NewL();
-    CleanupStack::PushL(info);
-    TBool enforceActive ( EFalse );
-    User::LeaveIfError(info->EnforcementActive(EAPEnforcement, enforceActive));
-    CleanupStack::PopAndDestroy(info);
-    return enforceActive;
-    }
-
-//----------------------------------------------------------------------
-//TBool CNSmlInternetAdapter::CheckWLANEnforcementL()
-// If WLAN AP policy is enforced true is returned else false
-//----------------------------------------------------------------------
-TBool CNSmlInternetAdapter::CheckWLANEnforcementL()
-    {
-      CSettingEnforcementInfo* info = CSettingEnforcementInfo::NewL();
-    CleanupStack::PushL(info);
-    TBool enforceActive ( EFalse );
-    User::LeaveIfError(info->EnforcementActive(EWLANEnforcement, enforceActive));
-    CleanupStack::PopAndDestroy(info);
-    return enforceActive;
-    }
-    
-    
-//----------------------------------------------------------------------
-//TInt CNSmlInternetAdapter::DoProtectWAPTablesL(TBool aProtect)
-// if aProtect is true , tables are locked otherwise tables are unlocked.
-//----------------------------------------------------------------------
-  
-TInt CNSmlInternetAdapter::DoProtectWAPTablesL(TBool aProtect)
-    {
-    TInt err = KErrNone;
-    CCommsDatabaseProtect* dbprotect = CCommsDatabaseProtect::NewL();
-    CleanupStack::PushL(dbprotect);
-    for ( TInt i( 0 ); i < iLockTableList.Count(); i++ )
-      {
-          if(!aProtect)
-        {
-          err = dbprotect->UnProtectTable( iLockTableList[ i ] ); 
-        }
-          else 
-        { 
-          err = dbprotect->ProtectTable( iLockTableList[ i ] );
-        }
-    
-      }
-  CleanupStack::PopAndDestroy( dbprotect );
-  return err;
-    }
-//----------------------------------------------------------------------
-//void CNSmlInternetAdapter::DoLockIAPTablesL(TBool aProtect)
-// if aProtect is true , tables are locked otherwise tables are unlocked.
-//----------------------------------------------------------------------
-      
-void CNSmlInternetAdapter::DoLockIAPTablesL(TBool aLock)
-    {
-    TInt protError = KErrNone;
-    TInt err = KErrNone;
-    iDatabase->CommitTransaction();
-    iLockTableList.AppendL( TPtrC( WAP_ACCESS_POINT ) );
-    iLockTableList.AppendL( TPtrC( WAP_IP_BEARER ) );
-    iLockTableList.AppendL( TPtrC( IAP ) );
-  
-    TRAP(err, protError = DoProtectWAPTablesL(aLock));
-    DBG_ARGS8(_S8("CNSmlInternetAdapter::DoLockIAPTablesL(): Table protect error %d , leave error %d " ),protError,err);
-    
-    if ( protError != KErrNone ) // To remove the warnings
-        {
-        protError = KErrNone;
-        }
-	TInt dberr = iDatabase->BeginTransaction();
-    if( dberr == KErrLocked )
-        {
-        _DBG_FILE("DoLockIAPTablesL: CommsDat was locked.");
-        TInt retry = KBeginTransRetryCount;            
-        while ( retry > 0 && dberr == KErrLocked )
-            {
-            User::After(KBeginTransRetryDelay);
-            _DBG_FILE("DoLockIAPTablesL: Slept 1 second. Try again");
-            dberr = iDatabase->BeginTransaction();
-            retry--;
-            }
-        if(dberr != KErrNone)
-            {        
-            _DBG_FILE("CNSmlInternetAdapter: BeginTransaction failed completely.");
-            User::Leave( dberr ); 
-            }           
-        }
-  }
-//--------------------------------------------------------------------
-//TInt UnprotectWLANAPItemL(TUint32 aId)
-//Unprotect the wlan AP if only wlan enforcement is on
-//-------------------------------------------------------------------
-TInt CNSmlInternetAdapter::UnprotectWLANAPItemL(TUint32 aId)
-{
-  _DBG_FILE("CNSmlInternetAdapter::UnprotectWLANAPItemL():  BEGIN");  
-  CCommsDbTableView*  wapView;
-  
-  TInt errorCode = KErrNone;
-  TBuf<KCommsDbSvrMaxFieldLength> serviceType;
-  
-  //check if its WLAN AP being deleted
-  wapView = iDatabase->OpenViewMatchingUintLC( TPtrC(IAP),TPtrC(COMMDB_ID), aId);
-  
-  errorCode = wapView->GotoFirstRecord();
-  
-  if ( errorCode == KErrNone )
-      {
-      wapView->ReadTextL(TPtrC(IAP_SERVICE_TYPE), serviceType);
-      if(serviceType != TPtrC(LAN_SERVICE))
-          {
-          CleanupStack::PopAndDestroy(); // wapView   
-          return KErrNone;
-          }
-      }
-
-  ((CCommsDbProtectTableView*)wapView)->UnprotectRecord();
-              
-  CleanupStack::PopAndDestroy(); // wapView   
-  
-  _DBG_FILE("CNSmlInternetAdapter::UnprotectWLANAPItemL():  END"); 
-  return errorCode;
-}
-      
-
-//----------------------------------------------------------------------
-//TBool CNSmlInternetAdapter::IsIAPRecordLockedL(TUint32 aRecord)
-//check for wap access point record  lock status 
-//----------------------------------------------------------------------
-    
-TBool CNSmlInternetAdapter::IsIAPRecordLockedL(TUint32 aRecord)
-  {
-  _DBG_FILE("CNSmlInternetAdapter::IsIAPRecordLockedL():  BEGIN");  
-  TBool ret = EFalse;
-    CCommsDbTableView* apView;
-    DBG_ARGS8(_S8("CNSmlInternetAdapter::IsIAPRecordLockedL record being checked = %d"),aRecord);
-    apView = iDatabase->OpenViewMatchingUintLC(TPtrC(IAP),
-                                                TPtrC(COMMDB_ID),
-                                                aRecord);
-                                                              
-    TInt aAccess( 0 );
-    if(apView!=NULL)
-      {
-      _DBG_FILE("CNSmlInternetAdapter::IsIAPRecordLockedL():wap record exists, check for access type"); 
-      TInt err = (((CCommsDbProtectTableView*) apView )->GetRecordAccess( aAccess ) );
-      DBG_ARGS8(_S8("CNSmlInternetAdapter::IsIAPRecordLockedL , GetrecordAccess code is =%d and acess type of record = %d"),err, aAccess);
-      CleanupStack::PopAndDestroy( apView);                                            
-      if(aAccess == RDbRowSet::EReadOnly)                                                    
-          ret = ETrue;
-      }
-    
-    _DBG_FILE("CNSmlInternetAdapter::IsIAPRecordLockedL():  END");  
-    return ret;
-            
-  }
-//----------------------------------------------------------------------
-//TBool CNSmlInternetAdapter::DoProtectIAPRecordL(TUint32 aRecord,TBool aProtect)
-// protect or unprotect wapaccesspoint record of access point being altered 
-//----------------------------------------------------------------------
-
-
-TInt CNSmlInternetAdapter::DoProtectIAPRecordL(TUint32 aRecord,TBool aProtect)
-  {
-  _DBG_FILE("CNSmlInternetAdapter::DoProtectIAPRecordL():  BEGIN"); 
-  DBG_ARGS8(_S8("CNSmlInternetAdapter::DoProtectIAPRecordL , record and protect value  =%d  = %d"),aRecord, aProtect);
-  TInt err = KErrNone;
-  
-  CCommsDbTableView* apView;
-    apView = iDatabase->OpenViewMatchingUintLC(TPtrC(IAP),
-                                                TPtrC(COMMDB_ID),
-                                                aRecord);
-  if( apView != NULL )
-    {
-    _DBG_FILE("CNSmlInternetAdapter::DoProtectIAPRecordL():  wap record exists"); 
-    if( !aProtect )
-        {
-        err = ( (CCommsDbProtectTableView*) apView )->UnprotectRecord();
-        DBG_ARGS8(_S8("CNSmlInternetAdapter::DoProtectIAPAccessRecordL ,error code of Unprotectrecord = %d"),err);
-          }
-          
-      else
-        {
-        err = ( (CCommsDbProtectTableView*) apView )->ProtectRecord();
-        DBG_ARGS8(_S8("CNSmlInternetAdapter::DoProtectIAPRecordL ,error code of ProtectRecord = %d"),err);  
-        }
-  
-      CleanupStack::PopAndDestroy( apView);
-    }
-    
-  _DBG_FILE("CNSmlInternetAdapter::DoProtectIAPRecordL():  END"); 
-  return err;
-  }
-//----------------------------------------------------------------------
-//TBool CNSmlInternetAdapter::IsProxyRecordLockedL(TUint32 aRecord)
-//check for proxy record  lock status 
-//----------------------------------------------------------------------
-    
-TBool CNSmlInternetAdapter::IsProxyRecordLockedL(TUint32 aRecord)
-  {
-  _DBG_FILE("CNSmlInternetAdapter::IsProxyRecordLockedL():  BEGIN");  
-  TBool ret = EFalse;
-    CCommsDbTableView* proxyView;
-    DBG_ARGS8(_S8("CNSmlInternetAdapter::IsProxyRecordLockedL record being checked = %d"),aRecord);
-    proxyView = iDatabase->OpenViewMatchingUintLC(TPtrC(PROXIES),
-                                                TPtrC(COMMDB_ID),
-                                                aRecord);
-                                                              
-    TInt aAccess( 0 );
-    if(proxyView!=NULL)
-      {
-      _DBG_FILE("CNSmlInternetAdapter::IsProxyRecordLockedL():wap record exists, check for access type"); 
-      TInt err = (((CCommsDbProtectTableView*) proxyView )->GetRecordAccess( aAccess ) );
-      DBG_ARGS8(_S8("CNSmlInternetAdapter::IsProxyRecordLockedL , GetrecordAccess code is =%d and acess type of record = %d"),err, aAccess);
-      CleanupStack::PopAndDestroy( proxyView);                                            
-      if(aAccess == RDbRowSet::EReadOnly)                                                    
-          ret = ETrue;
-      }
-    
-    _DBG_FILE("CNSmlInternetAdapter::IsProxyRecordLockedL():  END");  
-    return ret;
-            
-  }
-//----------------------------------------------------------------------
-//TBool CNSmlInternetAdapter::DoProtectProxyRecordL(TUint32 aRecord,TBool aProtect)
-// protect or unprotect proxy record of access point being altered 
-//----------------------------------------------------------------------
-
-
-TInt CNSmlInternetAdapter::DoProtectProxyRecordL(TUint32 aRecord,TBool aProtect)
-  {
-  _DBG_FILE("CNSmlInternetAdapter::DoProtectProxyRecordL():  BEGIN"); 
-  DBG_ARGS8(_S8("CNSmlInternetAdapter::DoProtectProxyRecordL , record and protect value  =%d  = %d"),aRecord, aProtect);
-  TInt err = KErrNone;
-  
-  CCommsDbTableView* proxyView;
-    proxyView = iDatabase->OpenViewMatchingUintLC(TPtrC(PROXIES),
-                                                TPtrC(COMMDB_ID),
-                                                aRecord);
-  if( proxyView != NULL )
-    {
-    _DBG_FILE("CNSmlInternetAdapter::DoProtectProxyRecordL():  wap record exists"); 
-    if( !aProtect )
-        {
-        err = ( (CCommsDbProtectTableView*) proxyView )->UnprotectRecord();
-        DBG_ARGS8(_S8("CNSmlInternetAdapter::DoProtectProxyRecordL ,error code of Unprotectrecord = %d"),err);
-          }
-          
-      else
-        {
-        err = ( (CCommsDbProtectTableView*) proxyView )->ProtectRecord();
-        DBG_ARGS8(_S8("CNSmlInternetAdapter::DoProtectProxyRecordL ,error code of ProtectRecord = %d"),err);  
-        }
-  
-      CleanupStack::PopAndDestroy( proxyView);
-    }
-    
-  _DBG_FILE("CNSmlInternetAdapter::DoProtectProxyRecordL():  END"); 
-  return err;
-  }
-  
-//----------------------------------------------------------------------
-//TBool CNSmlInternetAdapter::IsServiceRecordLockedL(TUint32 aRecord)
-//check for proxy record  lock status 
-//----------------------------------------------------------------------
-    
-TBool CNSmlInternetAdapter::IsServiceRecordLockedL(TUint32 aRecord)
-  {
-  _DBG_FILE("CNSmlInternetAdapter::IsProxyRecordLockedL():  BEGIN");  
-  TBool ret = EFalse;
-    CCommsDbTableView* serviceView;
-    DBG_ARGS8(_S8("CNSmlInternetAdapter::IsProxyRecordLockedL record being checked = %d"),aRecord);
-    serviceView = iDatabase->OpenViewMatchingUintLC(iProxyServiceType,
-                                                TPtrC(COMMDB_ID),
-                                                aRecord);
-                                                              
-    TInt aAccess( 0 );
-    if(serviceView!=NULL)
-      {
-      _DBG_FILE("CNSmlInternetAdapter::IsProxyRecordLockedL():wap record exists, check for access type"); 
-      TInt err = (((CCommsDbProtectTableView*) serviceView )->GetRecordAccess( aAccess ) );
-      DBG_ARGS8(_S8("CNSmlInternetAdapter::IsProxyRecordLockedL , GetrecordAccess code is =%d and acess type of record = %d"),err, aAccess);
-      CleanupStack::PopAndDestroy( serviceView);                                            
-      if(aAccess == RDbRowSet::EReadOnly)                                                    
-          ret = ETrue;
-      }
-    
-    _DBG_FILE("CNSmlInternetAdapter::IsProxyRecordLockedL():  END");  
-    return ret;
-            
-  }
-//----------------------------------------------------------------------
-//TBool CNSmlInternetAdapter::DoProtectProxyRecordL(TUint32 aRecord,TBool aProtect)
-// protect or unprotect proxy record of access point being altered 
-//----------------------------------------------------------------------
-
-
-TInt CNSmlInternetAdapter::DoProtectServiceRecordL(TUint32 aRecord,TBool aProtect)
-  {
-  _DBG_FILE("CNSmlInternetAdapter::DoProtectProxyRecordL():  BEGIN"); 
-  DBG_ARGS8(_S8("CNSmlInternetAdapter::DoProtectProxyRecordL , record and protect value  =%d  = %d"),aRecord, aProtect);
-  TInt err = KErrNone;
-  
-  CCommsDbTableView* serviceView;
-    serviceView = iDatabase->OpenViewMatchingUintLC(iProxyServiceType,
-                                                TPtrC(COMMDB_ID),
-                                                aRecord);
-  if( serviceView != NULL )
-    {
-    _DBG_FILE("CNSmlInternetAdapter::DoProtectProxyRecordL():  wap record exists"); 
-    if( !aProtect )
-        {
-        err = ( (CCommsDbProtectTableView*) serviceView )->UnprotectRecord();
-        DBG_ARGS8(_S8("CNSmlInternetAdapter::DoProtectProxyRecordL ,error code of Unprotectrecord = %d"),err);
-          }
-          
-      else
-        {
-        err = ( (CCommsDbProtectTableView*) serviceView )->ProtectRecord();
-        DBG_ARGS8(_S8("CNSmlInternetAdapter::DoProtectProxyRecordL ,error code of ProtectRecord = %d"),err);  
-        }
-  
-      CleanupStack::PopAndDestroy( serviceView);
-    }
-    
-  _DBG_FILE("CNSmlInternetAdapter::DoProtectProxyRecordL():  END"); 
-  return err;
-  } 
-//--------------------------------------------------------------------
-//TInt CNSmlInternetAdapter::IsAPUriFormatMatchPredefined(const TDesC8 & aURI)
-//
-//-------------------------------------------------------------------
-
-
-TBool CNSmlInternetAdapter::IsAPUriFormatMatchPredefined(const TDesC8 & aURI)
-{
-  if(aURI.Match(_L8("AP/APId*"))   != KErrNotFound ||
-    aURI.Match(_L8("AP/APId*/NAPDef/NAPId*"))   != KErrNotFound)
-  {
-    return ETrue;
-  }
-  else
-  {
-    return EFalse;
-  }
-  
-  
-}
-//--------------------------------------------------------------------
-//TInt CNSmlInternetAdapter::ConstructTreeL(const TDesC8& aURI)
-//
-//-------------------------------------------------------------------
-
-     
-TUint32 CNSmlInternetAdapter::ConstructTreeL(const TDesC8& aURI)
-{
-  _DBG_FILE("CNSmlInternetAdapter::ConstructTreeL(): AP begin");
-  TUint32 returnLuid = 0; // IAP doesn't exist
-
-  CCommsDbTableView* apView = iDatabase->OpenTableLC(TPtrC(IAP));
-
-    TInt errorCode = apView->GotoFirstRecord();
-        
-    while ( errorCode == KErrNone ) 
-        {
-        TUint32 lValue;
-        TBool validService = EFalse;
-        apView->ReadUintL(TPtrC(COMMDB_ID),lValue);
-        
-        TBuf<KCommsDbSvrMaxFieldLength> serviceType;
-        apView->ReadTextL(TPtrC(IAP_SERVICE_TYPE), serviceType);
-        TUint32 bearerId  = 0;
-        apView->ReadUintL(TPtrC(IAP_BEARER),bearerId);
-        //
-        // Skip other service types than GSM outgoing
-        //
-        if (serviceType == TPtrC(OUTGOING_GPRS) ||
-            serviceType == TPtrC(INCOMING_GPRS))
-            {
-            validService = ETrue;
-            }
-      
-        else if(serviceType == TPtrC(LAN_SERVICE) &&
-                bearerId > 0) 
-            {
-            validService = ETrue;
-            }
-        else if(serviceType == TPtrC(VPN_SERVICE)) 
-            {
-            validService = ETrue;
-            }
-
-        if(validService)
-            { 
-            // Skip others
-            //
-            //  Check if in aPreviousURISegmentList
-            // 
-          TBool skipToNextIAP = EFalse;
-            // KNSmlDMStart includes start text for URISeg
-            TBuf8<20> addAPURI; // AP/APIdnnn , nnn = profileid
-            addAPURI.Append(_L8("AP/APId"));
-            addAPURI.AppendNumFixedWidth(lValue,EDecimal,3); 
-
-            TBuf8<16> addLUID;
-            _LIT8(KFormat,"%d");
-            addLUID.Format(KFormat,lValue);  
-            
-            HBufC8* mapInfo = iCallBack->GetLuidAllocL(addAPURI);
-            CleanupStack::PushL( mapInfo );
-      if (mapInfo->Length() == 0)
-          {
-        iCallBack->SetMappingL(addAPURI,addLUID);
-        if( aURI.Find(addAPURI) >= 0 )
-            { 
-                returnLuid = lValue;
-          iPrevLUID = lValue;
-            }
-          }
-      else
-          {            
-        skipToNextIAP= ETrue;
-          }
-			CleanupStack::PopAndDestroy( mapInfo );
-      
-      if( !skipToNextIAP ) 
-          {
-          // Add the NAPDef also 
-            
-            TBuf<KCommsDbSvrMaxFieldLength> serviceType;
-            TUint32 serviceId;
-
-            CCommsDbTableView* napdefView = iDatabase->OpenViewMatchingUintLC(TPtrC(IAP),
-                                                                          TPtrC(COMMDB_ID),
-                                                                          lValue);
-
-            errorCode = napdefView->GotoFirstRecord();
-            if (errorCode == KErrNone )
-                {               
-                napdefView->ReadTextL(TPtrC(IAP_SERVICE_TYPE), serviceType);
-                napdefView->ReadUintL(TPtrC(IAP_SERVICE),       serviceId);  // ID 
-                }
-        
-            CCommsDbTableView* tableView = iDatabase->OpenViewMatchingUintLC(serviceType,
-                                                                         TPtrC(COMMDB_ID),
-                                                                         serviceId);
-
-            errorCode = tableView->GotoFirstRecord();
-
-            while( errorCode == KErrNone ) 
-                {
-                  TUint32 lValue;
-                  tableView->ReadUintL(TPtrC(COMMDB_ID),lValue);
-                  //
-                  //  Check if in aPreviousURISegmentList
-                  // 
-                
-                    _LIT8(Kprev,"NAPId");
-                    TBuf8<15> addNAME(Kprev); // APIdnnn , nnn = profileid
-                    addNAME.AppendNumFixedWidth(lValue,EDecimal,3); 
-    
-               
-                    _LIT8(Kprev2,"/NAPDef/NAPId");
-                    TBuf8<80> addURI; // AP/xxx/NAPDef/NAPIdnnn , nnn = id nbr
-                    addURI.Append(addAPURI);
-                    addURI.Append(Kprev2);
-                    addURI.AppendNumFixedWidth(lValue,EDecimal,3); 
-    
-                    TBuf8<16> addLUID;
-                    _LIT8(KFormat,"%d");    
-                    addLUID.Format(KFormat,lValue); 
-          
-            HBufC8* mapInfo = iCallBack->GetLuidAllocL(addURI);
-    				CleanupStack::PushL( mapInfo );
-            if (mapInfo->Length() == 0)
-                {
-                // Also added to mapping
-              iCallBack->SetMappingL(addURI,addLUID);
-              if( aURI.Find(addURI) >= 0 ) 
-                    returnLuid = lValue;
-              _DBG_FILE("CNSmlInternetAdapter::ConstructTreeL(): Set NAPDef Mapping ");
-             
-              TBuf<KCommsDbSvrMaxFieldLength> columnValue;
-              TBuf8<16> addDNSLUID;
-                TBuf8<80> addDNSURI; // AP/xxx/NAPDef/DNSAddr/DNSx
-                _LIT8(KFormat,"%d");   
-              tableView->ReadTextL( TPtrC(SERVICE_IP_NAME_SERVER1 ),  columnValue);
-             
-              if ( ( columnValue.Length() > 0 ) )
-                  {
-                    _LIT8(Kprev2,"/DNSAddr/DNS1");                      
-                        addDNSURI.Append(addURI);
-                        addDNSURI.Append(Kprev2);                       
-                    addLUID.Format(KFormat, DnsToLuid( UriUtils::EIPv4Host, 1));
-                    iCallBack->SetMappingL(addDNSURI,addLUID);  
-                    if( aURI.Find(addDNSURI) >= 0 ) 
-                      returnLuid = DnsToLuid( UriUtils::EIPv4Host, 1);                      
-                    addDNSURI.Zero();
-                  }
-
-              tableView->ReadTextL( TPtrC(SERVICE_IP_NAME_SERVER2 ),  columnValue);
-              if ( columnValue.Length() > 0 )
-                      {  
-                    _LIT8(Kprev2,"/DNSAddr/DNS2");
-                      addDNSURI.Append(addURI);
-                      addDNSURI.Append(Kprev2);
-                    addLUID.Format(KFormat, DnsToLuid( UriUtils::EIPv4Host, 2));
-                    iCallBack->SetMappingL(addDNSURI,addLUID);
-                    if( aURI.Find(addDNSURI) >= 0 ) 
-                      returnLuid = DnsToLuid( UriUtils::EIPv4Host, 2);
-                    addDNSURI.Zero();                   
-                      }
-
-              tableView->ReadTextL( TPtrC(SERVICE_IP6_NAME_SERVER1 ),  columnValue);
-              if ( columnValue.Length() > 0 )
-                      {  
-                    _LIT8(Kprev2,"/DNSAddr/DNS3");
-                      addDNSURI.Append(addURI);
-                      addDNSURI.Append(Kprev2);
-                    addLUID.Format(KFormat,DnsToLuid( UriUtils::EIPv6Host, 1) );
-                    iCallBack->SetMappingL(addDNSURI,addLUID);
-                    if( aURI.Find(addDNSURI) >= 0 ) 
-                      returnLuid = DnsToLuid( UriUtils::EIPv6Host, 1);
-                    addDNSURI.Zero();                   
-                      }
-              tableView->ReadTextL( TPtrC(SERVICE_IP6_NAME_SERVER2 ),  columnValue);
-              if ( columnValue.Length() > 0 ) 
-                      {  
-                    _LIT8(Kprev2,"/DNSAddr/DNS4");
-                      addDNSURI.Append(addURI);
-                      addDNSURI.Append(Kprev2);
-                    addLUID.Format(KFormat, DnsToLuid( UriUtils::EIPv6Host, 2));
-                    iCallBack->SetMappingL(addDNSURI,addLUID);
-                    if( aURI.Find(addDNSURI) >= 0 ) 
-                      returnLuid = DnsToLuid( UriUtils::EIPv6Host, 2);
-                    addDNSURI.Zero(); 
-                      }              
-            _DBG_FILE("CNSmlInternetAdapter::ConstructTreeL(): Set DNS Mapping ");  
-                  
-            TUint32 nwID = 0;
-                napdefView->ReadUintL(TPtrC(IAP_NETWORK),nwID); // Networks luid
-                   
-                    CCommsDbTableView* nwView = iDatabase->OpenViewMatchingUintLC(TPtrC(NETWORK),TPtrC(COMMDB_ID), nwID);
-
-              errorCode = nwView->GotoFirstRecord();                
-        
-              if ( errorCode == KErrNone ) 
-                  {                         
-                          _LIT8(Kprev2,"/Networks/NwId");
-                          TBuf8<80> addNwURI; // AP/xxx/NAPDef/xxx/Networks/NwIdnnn , nnn = id nbr
-                          addNwURI.Append(addURI);
-                          addNwURI.Append(Kprev2);
-                          addNwURI.AppendNumFixedWidth(nwID,EDecimal,3); 
-                          TBuf8<16> addNwLUID;
-                          _LIT8(KFormat,"%d");    
-                          addNwLUID.Format(KFormat,nwID); 
-                  HBufC8* mapInfo = iCallBack->GetLuidAllocL(addNwURI);
-        					CleanupStack::PushL( mapInfo );
-            
-              if (mapInfo->Length() == 0)
-                  {
-                  // Also added to mapping
-                  iCallBack->SetMappingL(addNwURI,addNwLUID);
-                  if( aURI.Find(addNwURI) >= 0 ) 
-                          returnLuid = nwID;
-                  _DBG_FILE("CNSmlInternetAdapter::ConstructTreeL(): Set Networks Mapping ");             
-                  }                           
-					 		CleanupStack::PopAndDestroy( mapInfo );
-              }
-              CleanupStack::PopAndDestroy(); // nwView              
-
-              if ( iWlanSupported )
-                  {
-                        // Check WLAN node
-                        if(serviceType == TPtrC(LAN_SERVICE)) 
-                            {
-                            TUint32 wlanID = serviceId;
-                            _LIT8(Kprev2,"/WLAN/WLId");
-                            TBuf8<80> addWlanURI; // AP/xxx/NAPDef/xxx/WLAN/WLIdnnn , nnn = id nbr
-                            addWlanURI.Append(addURI);
-                            addWlanURI.Append(Kprev2);
-                            addWlanURI.AppendNumFixedWidth(wlanID,EDecimal,3); 
-                            TBuf8<16> addWlanLUID;
-                            _LIT8(KFormat,"%d");    
-                            addWlanLUID.Format(KFormat,wlanID); 
-                    HBufC8* mapInfo = iCallBack->GetLuidAllocL(addWlanURI);
-        						CleanupStack::PushL( mapInfo );
-            
-                    if (mapInfo->Length() == 0)
-                        {
-                      // Also added to mapping
-                      iCallBack->SetMappingL(addWlanURI,addWlanLUID);
-                      if( aURI.Find(addWlanURI) >= 0 ) 
-                                returnLuid = wlanID;
-                      _DBG_FILE("CNSmlInternetAdapter::ConstructTreeL(): Set WLAN Mapping ");                       
-                            
-                      TBuf<KCommsDbSvrMaxFieldLength> value;
-                      TBuf8<16> addWkLUID;
-                            TBuf8<80> addWkURI; // AP/xxx/NAPDef/xxx/WLAN/xxx/WEPKey/WKIdn, n = id nbr
-                                                   
-                      for( TInt value =1; value <=4 ;value++)
-                          {
-                                _LIT8(Kprev2,"/WEPKey/WKId");                     
-                                addWkURI.Append(addWlanURI);
-                                addWkURI.Append(Kprev2);
-                                addWkURI.AppendNumFixedWidth(value,EDecimal,1); 
-                                _LIT8(KFormat,"%d");    
-                                addWkLUID.Format(KFormat,(1000*value)+value);                       
-                                iCallBack->SetMappingL(addWkURI,addWkLUID);
-                                if( aURI.Find(addWkURI) >= 0 ) 
-                                  returnLuid = (1000*value)+value;
-                                addWkURI.Zero();
-                          } 
-                        }                              
-        						CleanupStack::PopAndDestroy( mapInfo );
-                            }                                           
-                  }
-
-            //Check Bearer node 
-                               
-                  CCommsDbTableView* bView = iDatabase->OpenViewMatchingUintLC(TPtrC(NETWORK),TPtrC(COMMDB_ID), lValue);
-                errorCode = bView->GotoFirstRecord();
-                
-                if ( errorCode == KErrNone ) 
-                    {                         
-                        _LIT8(Kprev2,"/Bearer/BId");
-                        TBuf8<80> addbURI; // AP/xxx/NAPDef/xxx/Bearer/BIdnnn , nnn = id nbr
-                        addbURI.Append(addURI);
-                        addbURI.Append(Kprev2);
-                        addbURI.AppendNumFixedWidth(lValue,EDecimal,3); 
-                        TBuf8<16> addbLUID;
-                        _LIT8(KFormat,"%d");    
-                        addbLUID.Format(KFormat,lValue); 
-                HBufC8* mapInfo = iCallBack->GetLuidAllocL(addbURI);
-    						CleanupStack::PushL( mapInfo );
-            
-              if (mapInfo->Length() == 0)
-                  {
-                  // Also added to mapping
-                  iCallBack->SetMappingL(addbURI,addbLUID);
-                  if( aURI.Find(addbURI) >= 0 ) 
-                            returnLuid = lValue;
-                  _DBG_FILE("CNSmlInternetAdapter::ConstructTreeL(): Set Bearer Mapping ");            
-                  }                             
-							CleanupStack::PopAndDestroy( mapInfo );
-                    }
-                  CleanupStack::PopAndDestroy(); // bView 
-                  
-                  //Check NAPAuthInf node NAPAuthInf/AUId
-                               
-                  CCommsDbTableView* authView = iDatabase->OpenViewMatchingUintLC(TPtrC(NETWORK),TPtrC(COMMDB_ID), lValue);
-
-                errorCode = authView->GotoFirstRecord();
-        
-                if ( errorCode == KErrNone ) 
-                    {                         
-                        _LIT8(Kprev2,"/Bearer/BId");
-                        TBuf8<80> addauthURI; // AP/xxx/NAPDef/xxx/Bearer/BIdnnn , nnn = id nbr
-                        addauthURI.Append(addURI);
-                        addauthURI.Append(Kprev2);
-                        addauthURI.AppendNumFixedWidth(lValue,EDecimal,3); 
-                        TBuf8<16> addauthLUID;
-                        _LIT8(KFormat,"%d");    
-                        addauthLUID.Format(KFormat,lValue); 
-                HBufC8* mapInfo = iCallBack->GetLuidAllocL(addauthURI);
-    						CleanupStack::PushL( mapInfo );
-            
-              if (mapInfo->Length() == 0)
-                  {
-                  // Also added to mapping
-                  iCallBack->SetMappingL(addauthURI,addauthLUID);
-                  if( aURI.Find(addauthURI) >= 0 ) 
-                            returnLuid = lValue;
-    							_DBG_FILE("CNSmlInternetAdapter::ConstructTreeL(): Set NAPAuthInf Mapping ");						 					
-                        }
-							CleanupStack::PopAndDestroy( mapInfo );
-        				    }        				    
-                    CleanupStack::PopAndDestroy(); // authView  
-                      
-                    //Check Proxy node          
-
-                    CCommsDbTableView* pxView = iDatabase->OpenViewMatchingTextLC(TPtrC(PROXIES),
-                                                                         TPtrC(PROXY_SERVICE_TYPE),
-                                                                         serviceType);
-
-                    errorCode = pxView->GotoFirstRecord();
-                  if(errorCode == KErrNone)                   
-                      {                       
-                      while ( errorCode == KErrNone ) 
-                          {
-                          TUint32 lProxyIspId;
-                          TUint32 lProxyId;
-                          pxView->ReadUintL(TPtrC(PROXY_ISP),lProxyIspId);                      
-                          if (lProxyIspId == serviceId) //ServiceIsp) // Right value ISP
-                              {                         
-                              pxView->ReadUintL(TPtrC(COMMDB_ID),lProxyId);
-                  
-                      _LIT8(Kprev2,"/Px/PXId");
-                              TBuf8<80> addURI; // AP/xxx/Px/PXIdnnn , nnn = id nbr
-                              addURI.Append(addAPURI);
-                              addURI.Append(Kprev2);
-                              addURI.AppendNumFixedWidth(lProxyId,EDecimal,3); 
-    
-                                TBuf8<16> addLUID;
-                                _LIT8(KFormat,"%d");    
-                                addLUID.Format(KFormat,  KNSmlApProxyLowerBase + lProxyId);    // 100000 + lProxyId
-                                HBufC8* mapInfo = iCallBack->GetLuidAllocL(addURI);
-				                  	CleanupStack::PushL( mapInfo );
-                  
-                    if (mapInfo->Length() == 0)
-                        {
-                        // Also added to mapping
-                        iCallBack->SetMappingL(addURI,addLUID);
-                        if( aURI.Find(addURI) >= 0 ) 
-                                  returnLuid = KNSmlApProxyLowerBase + lProxyId;
-                        _DBG_FILE("CNSmlInternetAdapter::ConstructTreeL(): Set Proxy Mapping ");
-                        _LIT8(KProxy,"/Port/PROXY");
-                        TBuf8<80> addPortURI; // AP/xxx/Px/Port/PROXY
-                              addPortURI.Append(addURI);
-                              addPortURI.Append( KProxy );
-                              TBuf8<16> addPortLUID;
-                              _LIT8(KFormat,"%d");    
-                                  addPortLUID.Format(KFormat, 1);
-                              iCallBack->SetMappingL(addPortURI,addPortLUID);
-                              if( aURI.Find(addPortURI) >= 0 ) 
-                                  returnLuid = 1;
-                        }
-					 				CleanupStack::PopAndDestroy( mapInfo );
-                              }
-                          errorCode = pxView->GotoNextRecord();
-                      }           
-                }
-                CleanupStack::PopAndDestroy() ;//Pxview             
-                      }
-				CleanupStack::PopAndDestroy( mapInfo );
-                  errorCode = tableView->GotoNextRecord();                    
-                    }
-          CleanupStack::PopAndDestroy() ;//tableview
-                CleanupStack::PopAndDestroy() ;//napdefview
-                }
-            }
-        errorCode = apView->GotoNextRecord();
-        }         
-        CleanupStack::PopAndDestroy(); // apView
-        _DBG_FILE("CNSmlInternetAdapter::ConstructTreeL(): AP end"); 
-        return returnLuid;        
-}   
-// End of File
--- a/omadm/omadmextensions/adapters/nsmldinternet/src/NSmlInternetAdapter.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-CHARACTER_SET UTF8/*
-* 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:   Internet-settings resources
-*
-*/
-
- 
-
-
-#include <registryinfo.rh>
-#include "nsmldmconstants.h"
-
-RESOURCE REGISTRY_INFO theRegistryInfo
-  {
-  dll_uid = 0x101F6DEA; //The DLL's 3rd UID.
-  interfaces = 
-      {
-      INTERFACE_INFO
-          {
-          interface_uid = KNSmlDMInterfaceUid; // DM interface UID
-          implementations = 
-            {
-            IMPLEMENTATION_INFO
-                {
-                implementation_uid = 0x101F6DE2; // DM Internet Adapter
-                version_no = 1; 
-                display_name = "";
-                default_data = "";
-                opaque_data = "";
-                }
-            };
-          }
-      };
-    }
--- a/omadm/omadmextensions/adapters/nsmldinternet/src/NSmlWLanAdapter.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3993 +0,0 @@
-/*
-* Copyright (c) 2002-2006 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:   Wlan Adapter
-*
-*/
-
-
-
-#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
-#include <commsdat_partner.h>
-#endif
-#include "NSmlWLanAdapter.h"
-#include "NSmlWlanSettings.h"
-#include "nsmldebug.h"
-#include <commdb.h>
-#include <utf.h>
-#include <cdbstore.h>
-#include <cdbcols.h>
-#include <EapType.h>
-#include <nsmldmuri.h>
-
-
-#ifndef __WINS__
-// This lowers the unnecessary compiler warning (armv5) to remark.
-// "Warning:  #174-D: expression has no effect..." is caused by 
-// DBG_ARGS8 macro in no-debug builds.
-#pragma diag_remark 174
-#endif
-
-//-----------------------------------------------------------------------------
-// CNSmlWLanAdapter* CNSmlWLanAdapter::NewL( )
-//-----------------------------------------------------------------------------
-CNSmlWLanAdapter* CNSmlWLanAdapter::NewL( MSmlDmCallback* aDmCallback,CCommsDatabase& aDatabase )
-    {
-    _DBG_FILE("CNSmlWLanAdapter::NewL(): begin");
-
-    CNSmlWLanAdapter* self = NewLC( aDmCallback, aDatabase );
-    CleanupStack::Pop( self );
-
-    _DBG_FILE("CNSmlWLanAdapter::NewL(): end");
-    return self;
-    }
-
-//-----------------------------------------------------------------------------
-// CNSmlWLanAdapter* CNSmlWLanAdapter::NewLC( )
-//-----------------------------------------------------------------------------
-CNSmlWLanAdapter* CNSmlWLanAdapter::NewLC( MSmlDmCallback* aDmCallback, CCommsDatabase& aDatabase )
-    {
-    _DBG_FILE("CNSmlWLanAdapter::NewLC(): begin");
-
-    CNSmlWLanAdapter* self = new(ELeave) CNSmlWLanAdapter(aDmCallback);
-    CleanupStack::PushL( self );
-
-    self->iCallBack = aDmCallback;
-    self->ConstructL( aDatabase );
-
-    _DBG_FILE("CNSmlWLanAdapter::NewLC(): end");
-    return self;
-    }
-
-//-----------------------------------------------------------------------------
-// void CNSmlWLanAdapter::ConstructL( )
-// Second phase constructor
-//-----------------------------------------------------------------------------
-void CNSmlWLanAdapter::ConstructL( CCommsDatabase& aDatabase )
-    {
-    _DBG_FILE("CNSmlWLanAdapter::ConstructL(): begin");
-
-    iWlanSettings = CWlanSettings::NewL( aDatabase );
-    iBuffer = new (ELeave) CArrayFixFlat <TNSmlWepKeyBufferElement> (KNSmlWepKeyGranularity);
-    iSettings = new (ELeave) TWlanSettings;
-    iEAPSettings = new (ELeave) EAPSettings;
-
-    _DBG_FILE("CNSmlWLanAdapter::ConstructL(): end");
-    }
-
-//-----------------------------------------------------------------------------
-// CNSmlWLanAdapter::CNSmlWLanAdapter( )
-// Constructor
-//-----------------------------------------------------------------------------
-CNSmlWLanAdapter::CNSmlWLanAdapter( TAny* aEcomArguments )
-    : CSmlDmAdapter(aEcomArguments)
-    {
-    _DBG_FILE("CNSmlWLanAdapter::CNSmlWLanAdapter(): begin");
-    _DBG_FILE("CNSmlWLanAdapter::CNSmlWLanAdapter(): end");
-    }
-
-//-----------------------------------------------------------------------------
-// CNSmlWLanAdapter::~CNSmlWLanAdapter( )
-// Destructor
-//-----------------------------------------------------------------------------
-CNSmlWLanAdapter::~CNSmlWLanAdapter( )
-    {
-    _DBG_FILE("CNSmlWLanAdapter::~CNSmlWLanAdapter(): begin");
-
-	if ( iBuffer )
-		{
-		
-	    for( TInt index=0; index<iBuffer->Count(); index++ )
-	        {
-	        delete iBuffer->At(index).iUri;
-	        delete iBuffer->At(index).iData;
-
-	        iBuffer->Delete(index);
-	        }
-
-	    iBuffer->Reset();
-	    delete iBuffer;
-	    
-		}
-    delete iWlanSettings;
-    delete iSettings;
-
-    TRAP_IGNORE( DeleteEAPStructL() );
-    
-    for ( TInt i = 0 ; i < iEAPBuffer.Count() ; i++ )
-    	{
-    	iEAPBuffer[i]->iStatusRefArray.Close();
-    	iEAPBuffer[i]->iEAPSettings->iEncapsulatedEAPTypes.Close();
-    	iEAPBuffer[i]->iEAPSettings->iCipherSuites.Close();    	
-    	delete iEAPBuffer[i]->iEAPSettings;
-    	iEAPBuffer[i]->iEAPSettings = NULL;
-    	}
-    iEAPBuffer.ResetAndDestroy(); 
-    
-    TInt count = iSecondaryBuffer.Count();
-    for( TInt index=0; index<count; index++ )
-        {
-        delete iSecondaryBuffer[index];
-        }
-
-    iSecondaryBuffer.Reset();
-
-
-    _DBG_FILE("CNSmlWLanAdapter::~CNSmlWLanAdapter(): end");
-    }
-
-
-//-----------------------------------------------------------------------------
-// CNSmlWLanAdapter* CNSmlWLanAdapter::DDFVersionL( CBufBase& aDDFVersion )
-//-----------------------------------------------------------------------------
-void CNSmlWLanAdapter::DDFVersionL( CBufBase& aDDFVersion )
-    {
-    _DBG_FILE("CNSmlWLanAdapter::DDFVersionL(): begin");
-
-    aDDFVersion.InsertL( 0, KNSmlWLanAdapterDDFversion );
-
-    _DBG_FILE("CNSmlWLanAdapter::DDFVersionL(): end");
-    }
-
-//-----------------------------------------------------------------------------
-// CNSmlWLanAdapter* CNSmlWLanAdapter::DDFStructureL( MSmlDmDDFObject& aDDF )
-//-----------------------------------------------------------------------------
-void CNSmlWLanAdapter::DDFStructureL( MSmlDmDDFObject& aDDF )
-    {
-    _DBG_FILE("CNSmlWLanAdapter::DDFStructureL(): begin");
-
-    TSmlDmAccessTypes *aclTypes = new (ELeave) TSmlDmAccessTypes();
-    CleanupStack::PushL(aclTypes);
-//
-// Set Get as acceptable operations
-//
-    aclTypes->SetGet();
-    aclTypes->SetAdd(); // 041208 Added
-    aclTypes->SetDelete( );
-    aclTypes->SetReplace( );
-
-    TSmlDmAccessTypes accessTypesAll;
-    accessTypesAll.SetGet( );
-    accessTypesAll.SetDelete( );
-    accessTypesAll.SetAdd( );
-    accessTypesAll.SetReplace( );
-
-    TSmlDmAccessTypes accessTypesNoDelete;
-    accessTypesNoDelete.SetGet( );
-    accessTypesNoDelete.SetAdd( );
-    accessTypesNoDelete.SetReplace( );
-
-    TSmlDmAccessTypes accessTypesGetAdd;
-    accessTypesGetAdd.SetGet( );
-    accessTypesGetAdd.SetAdd(); 
-    
-    TSmlDmAccessTypes accessTypesGetAddDel;
-    accessTypesGetAddDel.SetGet();     
-    accessTypesGetAddDel.SetAdd();
-    accessTypesGetAddDel.SetDelete();
-    //WLAN
-    MSmlDmDDFObject& rootNode = aDDF.AddChildObjectL( KNSmlWLanNodeName );
-    FillNodeInfoL( rootNode,
-    		   accessTypesGetAdd,
-               MSmlDmDDFObject::EZeroOrOne,
-               MSmlDmDDFObject::EDynamic,
-               MSmlDmDDFObject::ENode,
-               KNSmlEmpty );
-
-    //WLAN/<x>
-    MSmlDmDDFObject& wlanNode = rootNode.AddChildObjectGroupL( );
-    FillNodeInfoL( wlanNode,
-    		   accessTypesGetAddDel,
-               MSmlDmDDFObject::EOne,
-               MSmlDmDDFObject::EDynamic,
-               MSmlDmDDFObject::ENode,
-               KNSmlEmpty );
-
-    //WLAN/<x>/SSID
-    MSmlDmDDFObject& ssid = wlanNode.AddChildObjectL( KNSmlWLanSsid );
-    FillNodeInfoL( ssid,
-               accessTypesNoDelete,
-               MSmlDmDDFObject::EZeroOrOne,
-               MSmlDmDDFObject::EDynamic,
-               MSmlDmDDFObject::EChr,
-               KNSmlEmpty );
-
-    //WLAN/<x>/UsedSSID
-    MSmlDmDDFObject& usedSsid = wlanNode.AddChildObjectL( KNSmlWLanUsedSsid );
-    FillNodeInfoL( usedSsid,
-               accessTypesNoDelete,
-               MSmlDmDDFObject::EZeroOrOne,
-               MSmlDmDDFObject::EDynamic,
-               MSmlDmDDFObject::EChr,
-               KNSmlEmpty );
-               
-    //WLAN/<x>/SSIDHidden
-    MSmlDmDDFObject& ssidHidden = wlanNode.AddChildObjectL( KNSmlWLanSsidHidden );
-    FillNodeInfoL( ssidHidden,
-               accessTypesNoDelete,
-               MSmlDmDDFObject::EZeroOrOne,
-               MSmlDmDDFObject::EDynamic,
-               MSmlDmDDFObject::EBool,
-               KNSmlEmpty );
-
-    //WLAN/<x>/NetworkMode
-    MSmlDmDDFObject& networkMode = wlanNode.AddChildObjectL( KNSmlWLanNetworkMode );
-    FillNodeInfoL( networkMode,
-               accessTypesNoDelete,
-               MSmlDmDDFObject::EZeroOrOne,
-               MSmlDmDDFObject::EDynamic,
-               MSmlDmDDFObject::EChr,
-               KNSmlEmpty );               
-
-    //WLAN/<x>/SecurityMode
-    MSmlDmDDFObject& securityMode = wlanNode.AddChildObjectL( KNSmlWLanSecurityMode );
-    FillNodeInfoL( securityMode,
-               accessTypesNoDelete,
-               MSmlDmDDFObject::EZeroOrOne,
-               MSmlDmDDFObject::EDynamic,
-               MSmlDmDDFObject::EChr,
-               KNSmlEmpty );               
-
-    //WLAN/<x>/UseWPAPSK
-    MSmlDmDDFObject& useWPAPSK = wlanNode.AddChildObjectL( KNSmlWLanUseWPAPSK );
-    FillNodeInfoL( useWPAPSK,
-               accessTypesNoDelete,
-               MSmlDmDDFObject::EZeroOrOne,
-               MSmlDmDDFObject::EDynamic,
-               MSmlDmDDFObject::EBool,
-               KNSmlEmpty );
-
-    //WLAN/<x>/WPAPreSharedKey
-    MSmlDmDDFObject& wpaPreSharedKey = wlanNode.AddChildObjectL( KNSmlWLanWpaPreSharedKey );
-    FillNodeInfoL( wpaPreSharedKey,
-               accessTypesNoDelete,
-               MSmlDmDDFObject::EZeroOrOne,
-               MSmlDmDDFObject::EDynamic,
-               MSmlDmDDFObject::EBin,
-               KNSmlEmpty );               
-
-    //WLAN/<x>/WLANEAPList
-    MSmlDmDDFObject& wlanEapList = wlanNode.AddChildObjectL( KNSmlWLanEapList );
-    FillNodeInfoL( wlanEapList,
-               accessTypesNoDelete,
-               MSmlDmDDFObject::EZeroOrOne,
-               MSmlDmDDFObject::EDynamic,
-               MSmlDmDDFObject::EChr,
-               KNSmlEmpty );                       
-
-    //WLAN/<x>/WEPKeyIndex
-    MSmlDmDDFObject& wepKeyIndex = wlanNode.AddChildObjectL( KNSmlWLanWepIndex );
-    FillNodeInfoL( wepKeyIndex,
-               accessTypesNoDelete,
-               MSmlDmDDFObject::EZeroOrOne,
-               MSmlDmDDFObject::EDynamic,
-               MSmlDmDDFObject::EInt,
-               KNSmlEmpty );                       
-               
-    //WLAN/<x>/WEPAuthMode
-    MSmlDmDDFObject& wlanWepAuthMode = wlanNode.AddChildObjectL( KNSmlWLanAuthMode );
-    FillNodeInfoL( wlanWepAuthMode,
-               accessTypesNoDelete,
-               MSmlDmDDFObject::EZeroOrOne,
-               MSmlDmDDFObject::EDynamic,
-               MSmlDmDDFObject::EInt,
-               KNSmlEmpty );                       
-
-    //WLAN/<x>/WEPKey/
-    MSmlDmDDFObject& wepKeyRoot = wlanNode.AddChildObjectL( KNSmlWLanWepKey );
-    FillNodeInfoL( wepKeyRoot,
-               accessTypesNoDelete,
-               MSmlDmDDFObject::EZeroOrOne,
-               MSmlDmDDFObject::EDynamic,
-               MSmlDmDDFObject::ENode,
-               KNSmlEmpty );               
-
-    //WLAN/<x>/WEPKey/<x>
-    MSmlDmDDFObject& wepKey = wepKeyRoot.AddChildObjectGroupL( );
-    FillNodeInfoL( wepKey,
-    		   accessTypesGetAdd,
-               MSmlDmDDFObject::EOneOrN,
-               MSmlDmDDFObject::EDynamic,
-               MSmlDmDDFObject::ENode,
-               KNSmlEmpty );               
-
-    //WLAN/<x>/WEPKey/<x>/WEPKeyID
-    MSmlDmDDFObject& wepKeyId = wepKey.AddChildObjectL( KNSmlWLanWepKeyId );
-    FillNodeInfoL( wepKeyId,
-               accessTypesNoDelete,
-               MSmlDmDDFObject::EOne,
-               MSmlDmDDFObject::EDynamic,
-               MSmlDmDDFObject::EInt,
-               KNSmlEmpty );                           
-
-    //WLAN/<x>/WEPKey/<x>/Data
-    MSmlDmDDFObject& data = wepKey.AddChildObjectL( KNSmlWLanWepKeyData );
-    FillNodeInfoL( data,
-               accessTypesNoDelete,
-               MSmlDmDDFObject::EOne,
-               MSmlDmDDFObject::EDynamic,
-               MSmlDmDDFObject::EBin,
-               KNSmlEmpty );         
-
-
-    //WLAN/<x>/SecondarySSID/
-    MSmlDmDDFObject& secondarySSidRoot = wlanNode.AddChildObjectL( KNSmlWLanSecSsid );
-    FillNodeInfoL( secondarySSidRoot,
-               accessTypesGetAdd,
-               MSmlDmDDFObject::EZeroOrOne,
-               MSmlDmDDFObject::EDynamic,
-               MSmlDmDDFObject::ENode,
-               KNSmlEmpty );               
-
-    //WLAN/<x>/SecondarySSID/<x>
-    MSmlDmDDFObject& secondarySSid = secondarySSidRoot.AddChildObjectGroupL( );
-    FillNodeInfoL( secondarySSid,
-               accessTypesGetAddDel,
-               MSmlDmDDFObject::EOneOrN,
-               MSmlDmDDFObject::EDynamic,
-               MSmlDmDDFObject::ENode,
-               KNSmlEmpty );               
-
-    //WLAN/<x>/SecondarySSID/<x>/SSID
-    MSmlDmDDFObject& secSsidId = secondarySSid.AddChildObjectL( KNSmlWLanSsid );
-    FillNodeInfoL( secSsidId,
-               accessTypesNoDelete,
-               MSmlDmDDFObject::EOne,
-               MSmlDmDDFObject::EDynamic,
-               MSmlDmDDFObject::EChr,
-               KNSmlEmpty );                           
-
-    //WLAN/<x>/SecondarySSID/<x>/UsedSSID
-    MSmlDmDDFObject& secUsedSsidId = secondarySSid.AddChildObjectL( KNSmlWLanUsedSsid );
-    FillNodeInfoL( secUsedSsidId,
-               accessTypesNoDelete,
-               MSmlDmDDFObject::EZeroOrOne,
-               MSmlDmDDFObject::EDynamic,
-               MSmlDmDDFObject::EChr,
-               KNSmlEmpty );                           
-
-    //WLAN/<x>/EAP/
-    MSmlDmDDFObject& eapRoot = wlanNode.AddChildObjectL( KNSmlWLanEap );
-    FillNodeInfoL( eapRoot,
-               accessTypesGetAdd,
-               MSmlDmDDFObject::EZeroOrOne,
-               MSmlDmDDFObject::EDynamic,
-               MSmlDmDDFObject::ENode,
-               KNSmlEmpty );               
-
-    //WLAN/<x>/EAP/<x>
-    MSmlDmDDFObject& eap = eapRoot.AddChildObjectGroupL( );
-    FillNodeInfoL( eap,
-               accessTypesGetAdd,
-               MSmlDmDDFObject::EOneOrN,
-               MSmlDmDDFObject::EDynamic,
-               MSmlDmDDFObject::ENode,
-               KNSmlEmpty );               
-
-    //WLAN/<x>/EAP/<x>/EAPType
-    MSmlDmDDFObject& eapType = eap.AddChildObjectL( KNSmlWLanEapType );
-    FillNodeInfoL( eapType,
-               accessTypesNoDelete,
-               MSmlDmDDFObject::EOne,
-               MSmlDmDDFObject::EDynamic,
-               MSmlDmDDFObject::EChr,
-               KNSmlEmpty );                           
-
-    //WLAN/<x>/EAP/<x>/Username
-    MSmlDmDDFObject& eapUsername = eap.AddChildObjectL( KNSmlWLanUsername );
-    FillNodeInfoL( eapUsername,
-               accessTypesNoDelete,
-               MSmlDmDDFObject::EZeroOrOne,
-               MSmlDmDDFObject::EDynamic,
-               MSmlDmDDFObject::EChr,
-               KNSmlEmpty );                           
-
-    //WLAN/<x>/EAP/<x>/Password
-    MSmlDmDDFObject& eapPassword = eap.AddChildObjectL( KNSmlWLanPassword );
-    FillNodeInfoL( eapPassword,
-               accessTypesNoDelete,
-               MSmlDmDDFObject::EZeroOrOne,
-               MSmlDmDDFObject::EDynamic,
-               MSmlDmDDFObject::EChr,
-               KNSmlEmpty );                           
-
-    //WLAN/<x>/EAP/<x>/Realm
-    MSmlDmDDFObject& eapRealm = eap.AddChildObjectL( KNSmlWLanRealm );
-    FillNodeInfoL( eapRealm,
-               accessTypesNoDelete,
-               MSmlDmDDFObject::EZeroOrOne,
-               MSmlDmDDFObject::EDynamic,
-               MSmlDmDDFObject::EChr,
-               KNSmlEmpty );                           
-
-    //WLAN/<x>/EAP/<x>/UsePseudonym
-    MSmlDmDDFObject& eapPseudo = eap.AddChildObjectL( KNSmlWLanUsePseudonym );
-    FillNodeInfoL( eapPseudo,
-               accessTypesNoDelete,
-               MSmlDmDDFObject::EZeroOrOne,
-               MSmlDmDDFObject::EDynamic,
-               MSmlDmDDFObject::EBool,
-               KNSmlEmpty );                           
-
-    //WLAN/<x>/EAP/<x>/Encapsulation
-    // Encapsulation is not supported using this parameter. It is done
-    // with */EAP/EAPIdxxx-yyy/* where xxx is the encapsulated and yyy the encapsulating method.
-    /*MSmlDmDDFObject& eapEncapsulation = eap.AddChildObjectL( KNSmlWLanEncapsulation );
-    FillNodeInfoL( eapEncapsulation,
-               accessTypesNoDelete,
-               MSmlDmDDFObject::EZeroOrOne,
-               MSmlDmDDFObject::EDynamic,
-               MSmlDmDDFObject::EChr,
-               KNSmlEmpty );                           */
-
-    //WLAN/<x>/EAP/<x>/VerifyCertRealm
-    MSmlDmDDFObject& eapVerifyCertRealm = eap.AddChildObjectL( KNSmlWLanVerifyCertRealm );
-    FillNodeInfoL( eapVerifyCertRealm,
-               accessTypesNoDelete,
-               MSmlDmDDFObject::EZeroOrOne,
-               MSmlDmDDFObject::EDynamic,
-               MSmlDmDDFObject::EBool,
-               KNSmlEmpty );                           
-
-    //WLAN/<x>/EAP/<x>/RequireClientAuthentication
-    MSmlDmDDFObject& eapRequireClientAuthentication = eap.AddChildObjectL( KNSmlWLanRequireClientAuthentication );
-    FillNodeInfoL( eapRequireClientAuthentication,
-               accessTypesNoDelete,
-               MSmlDmDDFObject::EZeroOrOne,
-               MSmlDmDDFObject::EDynamic,
-               MSmlDmDDFObject::EBool,
-               KNSmlEmpty );                           
-
-    //WLAN/<x>/EAP/<x>/SessionValidityTime
-    MSmlDmDDFObject& eapSessionValidityTime = eap.AddChildObjectL( KNSmlWLanSessionValidityTime );
-    FillNodeInfoL( eapSessionValidityTime,
-               accessTypesNoDelete,
-               MSmlDmDDFObject::EZeroOrOne,
-               MSmlDmDDFObject::EDynamic,
-               MSmlDmDDFObject::EChr,
-               KNSmlEmpty );                           
-
-    //WLAN/<x>/EAP/<x>/CipherSuite
-    MSmlDmDDFObject& eapCipherSuite = eap.AddChildObjectL( KNSmlWLanCipherSuite );
-    FillNodeInfoL( eapCipherSuite,
-               accessTypesNoDelete,
-               MSmlDmDDFObject::EZeroOrOne,
-               MSmlDmDDFObject::EDynamic,
-               MSmlDmDDFObject::EChr,
-               KNSmlEmpty );                           
-
-    //WLAN/<x>/EAP/<x>/AllowPEAPv0
-    MSmlDmDDFObject& eapAllowPEAPv0 = eap.AddChildObjectL( KNSmlWLanAllowPEAPv0 );
-    FillNodeInfoL( eapAllowPEAPv0,
-               accessTypesNoDelete,
-               MSmlDmDDFObject::EZeroOrOne,
-               MSmlDmDDFObject::EDynamic,
-               MSmlDmDDFObject::EBool,
-               KNSmlEmpty );                           
-
-    //WLAN/<x>/EAP/<x>/AllowPEAPv1
-    MSmlDmDDFObject& eapAllowPEAPv1 = eap.AddChildObjectL( KNSmlWLanAllowPEAPv1 );
-    FillNodeInfoL( eapAllowPEAPv1,
-               accessTypesNoDelete,
-               MSmlDmDDFObject::EZeroOrOne,
-               MSmlDmDDFObject::EDynamic,
-               MSmlDmDDFObject::EBool,
-               KNSmlEmpty );                           
-
-    //WLAN/<x>/EAP/<x>/AllowPEAPv2
-    MSmlDmDDFObject& eapAllowPEAPv2 = eap.AddChildObjectL( KNSmlWLanAllowPEAPv2 );
-    FillNodeInfoL( eapAllowPEAPv2,
-               accessTypesNoDelete,
-               MSmlDmDDFObject::EZeroOrOne,
-               MSmlDmDDFObject::EDynamic,
-               MSmlDmDDFObject::EBool,
-               KNSmlEmpty );  
-               
-#ifdef FF_WLAN_EXTENSIONS 
-
-    //WLAN/<x>/EAP/<x>/AuthProvModeAllowed
-    MSmlDmDDFObject& authProvMode = eap.AddChildObjectL( KNSmlWLanAuthProvMode );
-    FillNodeInfoL( authProvMode,
-               accessTypesNoDelete,
-               MSmlDmDDFObject::EZeroOrOne,
-               MSmlDmDDFObject::EDynamic,
-               MSmlDmDDFObject::EBool,
-               KNSmlEmpty ); 
-                             
-    //WLAN/<x>/EAP/<x>/UnauthProvModeAllowed
-    MSmlDmDDFObject& unauthProvMode = eap.AddChildObjectL( KNSmlWLanUnauthProvMode );
-    FillNodeInfoL( unauthProvMode,
-               accessTypesNoDelete,
-               MSmlDmDDFObject::EZeroOrOne,
-               MSmlDmDDFObject::EDynamic,
-               MSmlDmDDFObject::EBool,
-               KNSmlEmpty ); 
-                                 
-    //WLAN/<x>/EAP/<x>/PACGroupReference
-    MSmlDmDDFObject& pacGroupRef = eap.AddChildObjectL( KNSmlWLanPACGroupRef );
-    FillNodeInfoL( pacGroupRef,
-               accessTypesNoDelete,
-               MSmlDmDDFObject::EZeroOrOne,
-               MSmlDmDDFObject::EDynamic,
-               MSmlDmDDFObject::EChr,
-               KNSmlEmpty );             
-               
-	//WLAN/<x>/EAP/<x>/WarnADHPNoPAC
-    MSmlDmDDFObject& warnADHPNoPAC = eap.AddChildObjectL( KNSmlWLanWarnADHPNoPAC );
-    FillNodeInfoL( warnADHPNoPAC,
-               accessTypesNoDelete,
-               MSmlDmDDFObject::EZeroOrOne,
-               MSmlDmDDFObject::EDynamic,
-               MSmlDmDDFObject::EBool,
-               KNSmlEmpty ); 
-               
- 	//WLAN/<x>/EAP/<x>/WarnADHPNoMatchingPAC
-    MSmlDmDDFObject& warnADHPNoMatchingPAC = eap.AddChildObjectL( KNSmlWLanWarnADHPNoMatchPAC );
-    FillNodeInfoL( warnADHPNoMatchingPAC,
-               accessTypesNoDelete,
-               MSmlDmDDFObject::EZeroOrOne,
-               MSmlDmDDFObject::EDynamic,
-               MSmlDmDDFObject::EBool,
-               KNSmlEmpty ); 
-              
-    //WLAN/<x>/EAP/<x>/WarnNotDefaultServer
-    MSmlDmDDFObject& warnNoDefServ = eap.AddChildObjectL( KNSmlWLanWarnNotDefaultSrv );
-    FillNodeInfoL( warnNoDefServ,
-               accessTypesNoDelete,
-               MSmlDmDDFObject::EZeroOrOne,
-               MSmlDmDDFObject::EDynamic,
-               MSmlDmDDFObject::EBool,
-               KNSmlEmpty ); 
-               
-#endif           
-                                                 
-
-    //WLAN/<x>/EAP/<x>/Certificate
-    MSmlDmDDFObject& eapCertificateRoot = eap.AddChildObjectL( KNSmlWLanCertificate );
-    FillNodeInfoL( eapCertificateRoot,
-               accessTypesGetAdd,
-               MSmlDmDDFObject::EZeroOrOne,
-               MSmlDmDDFObject::EDynamic,
-               MSmlDmDDFObject::ENode,
-               KNSmlEmpty );                           
-
-    //WLAN/<x>/EAP/<x>/Certificate/<x>
-    MSmlDmDDFObject& eapCertificate = eapCertificateRoot.AddChildObjectGroupL( );
-    FillNodeInfoL( eapCertificate,
-               accessTypesGetAdd,
-               MSmlDmDDFObject::EOneOrMore,
-               MSmlDmDDFObject::EDynamic,
-               MSmlDmDDFObject::ENode,
-               KNSmlEmpty );               
-
-    //WLAN/<x>/EAP/<x>/Certificate/<x>/IssuerName
-    MSmlDmDDFObject& eapIssuerName = eapCertificate.AddChildObjectL( KNSmlWLanIssuerName );
-    FillNodeInfoL( eapIssuerName,
-               accessTypesNoDelete,
-               MSmlDmDDFObject::EZeroOrOne,
-               MSmlDmDDFObject::EDynamic,
-               MSmlDmDDFObject::EChr,
-               KNSmlEmpty );                           
-
-    //WLAN/<x>/EAP/<x>/Certificate/<x>/SubjectName
-    MSmlDmDDFObject& eapSubjectName = eapCertificate.AddChildObjectL( KNSmlWLanSubjectName );
-    FillNodeInfoL( eapSubjectName,
-               accessTypesNoDelete,
-               MSmlDmDDFObject::EZeroOrOne,
-               MSmlDmDDFObject::EDynamic,
-               MSmlDmDDFObject::EChr,
-               KNSmlEmpty );                           
-
-    //WLAN/<x>/EAP/<x>/Certificate/<x>/CertType
-    MSmlDmDDFObject& eapCertType = eapCertificate.AddChildObjectL( KNSmlWLanCertType );
-    FillNodeInfoL( eapCertType,
-               accessTypesNoDelete,
-               MSmlDmDDFObject::EOne,
-               MSmlDmDDFObject::EDynamic,
-               MSmlDmDDFObject::EChr,
-               KNSmlEmpty );                           
-
-    //WLAN/<x>/EAP/<x>/Certificate/<x>/SerialNumber
-    MSmlDmDDFObject& eapSerialNumber = eapCertificate.AddChildObjectL( KNSmlWLanSerialNumber );
-    FillNodeInfoL( eapSerialNumber,
-               accessTypesNoDelete,
-               MSmlDmDDFObject::EZeroOrOne,
-               MSmlDmDDFObject::EDynamic,
-               MSmlDmDDFObject::EChr,
-               KNSmlEmpty );                           
-
-    //WLAN/<x>/EAP/<x>/Certificate/<x>/SubjectKeyId
-    MSmlDmDDFObject& eapSubjectKeyId = eapCertificate.AddChildObjectL( KNSmlWLanSubjectKeyId );
-    FillNodeInfoL( eapSubjectKeyId,
-               accessTypesNoDelete,
-               MSmlDmDDFObject::EOne,
-               MSmlDmDDFObject::EDynamic,
-               MSmlDmDDFObject::EChr,
-               KNSmlEmpty );                           
-
-    //WLAN/<x>/EAP/<x>/Certificate/<x>/Fingerprint
-    MSmlDmDDFObject& eapFingerprint = eapCertificate.AddChildObjectL( KNSmlWLanFingerprint );
-    FillNodeInfoL( eapFingerprint,
-               accessTypesNoDelete,
-               MSmlDmDDFObject::EZeroOrOne,
-               MSmlDmDDFObject::EDynamic,
-               MSmlDmDDFObject::EChr,
-               KNSmlEmpty );                           
-
-	CleanupStack::PopAndDestroy(); //aclTypes
-
-    _DBG_FILE("CNSmlWLanAdapter::DDFStructureL(): end");
-    }
-
-//-----------------------------------------------------------------------------
-// CNSmlWLanAdapter* CNSmlWLanAdapter::AddLeafObjectL( const TDesC& aURI,const 
-// TDesC& aParentLUID, const TDesC8& aObject, const TDesC& aType, 
-// const TInt aStatusRef )
-//-----------------------------------------------------------------------------
-void CNSmlWLanAdapter::AddLeafObjectL( const TDesC8& aURI,
-                                       const TDesC8& aParentLUID, 
-                                       const TDesC8& aObject, 
-                                       const TDesC8& /*aType*/, 
-                                       const TInt aStatusRef )
-    {
-    DBG_ARGS8(_S8("CNSmlWLanAdapter::AddLeafObjectL - <%S> <%S> <%S>"), &aURI, &aParentLUID, &aObject );
-
-    TInt uriSegs = NumOfUriSegs( aURI );
-    TInt luid = GetIdFromLuid( aParentLUID );
-    TInt err(KErrNone);
-    TPtrC8 lastUriSeg = GetLastUriSeg( aURI );
-    
-    TInt eapIndex(0);
-    
-    TInt eapId = GetEAPIdFromUri( aURI );
-    if (eapId == KErrNotFound)
-        {
-        _DBG_FILE("CNSmlWLanAdapter::AddLeafObjectL(): Non-EAP setting.");
-        if(luid==KErrNotFound)
-        	{
-        	return;
-        	}
-        err = iWlanSettings->GetWlanSettings( luid, *iSettings );    
-        }
-    else
-       	{
-       	_DBG_FILE("CNSmlWLanAdapter::AddLeafObjectL(): EAP setting.");       	
-		TInt encapsEapId = GetEncapsEAPIdFromUri( aURI );
-        if ( encapsEapId == KErrNotFound )
-        	{
-        	_DBG_FILE("CNSmlWLanAdapter::AddLeafObjectL(): Does not have encapsulation id xx-xx.");
-        	encapsEapId = EAPSettings::EEapNone;
-        	}
-        TInt i(0);
-    	// This is EAP addition. Check if the buffer for this EAP already exists
-    	for ( i = 0 ; i < iEAPBuffer.Count() ; i++ )
-    		{
-    		if ( eapId == iEAPBuffer[i]->iEAPSettings->iEAPType
-    			&& encapsEapId == iEAPBuffer[i]->iEncapsulatingEAPId )
-    			{
-    			// The correct buffer was found.     			
-    			_DBG_FILE("CNSmlWLanAdapter::AddLeafObjectL(): Found existing buffer.");
-				eapIndex = i;
-				break;                    			
-    			}
-    		}
-    	if ( i == iEAPBuffer.Count() )
-    		{
-    		DBG_ARGS8(_S8("CNSmlWLanAdapter::AddLeafObjectL(): No buffer found. Create new: <%d>-<%d>"), eapId, encapsEapId );
-			// Buffer was not found. Create new.
-			TInt WLANServiceId = GetServiceIdFromUriL ( aURI );
-    
-	        if ( WLANServiceId == KErrNotFound )
-	        	{
-	        	_DBG_FILE("CNSmlWLanAdapter::AddLeafObjectL(): Could not find WLAN service ID from URI.");
-	        	iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-	        	return;
-	        	}
-	        
-	        TNSmlEAPBufferElement* buffer = new (ELeave) TNSmlEAPBufferElement;	        
-	        CleanupStack::PushL( buffer );
-	        
-	        buffer->iEAPSettings = new (ELeave) EAPSettings;	        
-	        CleanupStack::PushL( buffer->iEAPSettings );
-	        
-	        buffer->iEAPSettings->iEAPType = static_cast<EAPSettings::TEapType> ( eapId );
-	        buffer->iWLANServiceId = WLANServiceId;
-	        buffer->iEncapsulatingEAPId = static_cast<EAPSettings::TEapType>( encapsEapId );
-	        iEAPBuffer.AppendL(buffer);
-	        
-	        CleanupStack::Pop( buffer->iEAPSettings );
-	        CleanupStack::Pop( buffer );
-	        
-	        eapIndex = iEAPBuffer.Count() - 1;			
-   			}
-       	}
-    if( err != KErrNone )
-        {
-        DBG_ARGS(_S16("CNSmlWLanAdapter::AddLeafObjectL - ErrorCode <%D>"), err );
-        iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-        return;
-        }
-
-    else if( aURI.Match( _L8("AP/*/NAPDef/*/WLAN/*/WEPKey/*/*") ) != KErrNotFound && uriSegs==9 )
-        {
-        TInt wepKeyId = GetWepKeyIdFromLuid( aParentLUID );
-
-        if( wepKeyId != KErrNotFound )
-            {
-            if( lastUriSeg.Match( KNSmlWLanWepKeyData ) != KErrNotFound  )
-                {
-                switch( wepKeyId )
-                    {
-                case 1:
-                    iSettings->WepKey1 = aObject;
-                    break;
-                case 2:
-                    iSettings->WepKey2 = aObject;
-                    break;
-                case 3:
-                    iSettings->WepKey3 = aObject;
-                    break;
-                case 4:
-                    iSettings->WepKey4 = aObject;
-                    break;
-                default:
-                    iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-                    return;
-                    }
-                }
-            else if( lastUriSeg.Match( KNSmlWLanWepKeyId ) != KErrNotFound )
-                {
-                iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
-                return;
-                }
-            else
-                {
-                iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-                return;
-                }
-            }
-
-        else
-            {
-            TInt index = -1;
-
-            for( TInt i=0; i<iBuffer->Count(); i++ )
-                {
-                if( aURI.Find( iBuffer->At(i).iUri->Des() ) != KErrNotFound )
-                    {
-                    index = i;
-                    break;
-                    }
-                }
-            if( index < 0 )
-                {
-                wepKeyId = GetWepKeyIdFromUri( aURI );
-
-                TBuf8<80> addLUID; // AP/<x>/NapDef/<x>/WLAN/<x>/WEPKey/WKIdnnn
-                addLUID.AppendNum( wepKeyId );
-                addLUID.AppendNumFixedWidth( luid, EDecimal, 3 );
-
-                DBG_ARGS8(_S8("WLanAdapter::AddleafObject - mapping uri: <%S> to luid: <%S>"), &aURI, &addLUID );
-                DBG_ARGS8(_S8("Parametrit - <%S> <%S>"), &aURI, &addLUID );
-                iCallBack->SetMappingL(aURI, addLUID);
-                if( lastUriSeg.Match( KNSmlWLanWepKeyData ) != KErrNotFound  )
-                {
-                switch( wepKeyId )
-                    {
-                case 1:
-                    iSettings->WepKey1 = aObject;
-                    break;
-                case 2:
-                    iSettings->WepKey2 = aObject;
-                    break;
-                case 3:
-                    iSettings->WepKey3 = aObject;
-                    break;
-                case 4:
-                    iSettings->WepKey4 = aObject;
-                    break;
-                default:
-                    iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-                    return;
-                    }
-                }
-            else if( lastUriSeg.Match( KNSmlWLanWepKeyId ) != KErrNotFound )
-                {
-                iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
-                return;
-                }
-            else
-                {
-                iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-                return;
-                }
-                }
-            else
-                {
-                //Add WepKeyId and execute buffer
-                if( lastUriSeg.Match( KNSmlWLanWepKeyId ) != KErrNotFound )
-                    {
-                    iBuffer->At(index).iWepKeyId = DesToInt( aObject );
-                    iBuffer->At(index).iIdStatusRef = aStatusRef;
-                                       
-//                  ExecuteBufferL( ); (JPLA-6M29NR caused error in WEPkey Data if buffer is executed here)
-                    return;
-                    }
-
-                else if( lastUriSeg.Match( KNSmlWLanWepKeyData ) != KErrNotFound )
-                    {
-                    iBuffer->At(index).iData = aObject.AllocLC();
-                    iBuffer->At(index).iDataSet = ETrue;
-                    CleanupStack::Pop( ); //iBuffer->At(index).iData
-                    iBuffer->At(index).iDataStatusRef = aStatusRef;
-                    return;
-                    }
-                else
-                    {
-                    iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-                    return;
-                    }
-                }
-            }
-        }
-
-    else if( aURI.Match( _L8("AP/*/NAPDef/*/WLAN/*/*") ) != KErrNotFound && uriSegs==7 )
-        {
-        if( lastUriSeg.Compare(KNSmlWLanSsid) == 0 )
-            {
-            TInt returnValue = CnvUtfConverter::ConvertToUnicodeFromUtf8( iSettings->SSID, aObject );
-            DBG_ARGS(_S16("WLanAdapter::ssid convert: <%D>"), returnValue );
-            if (returnValue != KErrNone)
-            	{
-            	// setting the default value to the network name
-            	iSettings->SSID = TPtrC(KNSmlWLanDefaultSSID);
-            	DBG_ARGS(_S16("CNSmlWLanAdapter::AddLeafObjectL SSID - ErrorCode <%D>"), returnValue );
-                iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-                return;
-            	}
-            }
-
-        else if( lastUriSeg.Compare(KNSmlWLanUsedSsid) == 0 )
-            {
-            TInt returnValue = CnvUtfConverter::ConvertToUnicodeFromUtf8( iSettings->UsedSSID, aObject );
-            DBG_ARGS(_S16("WLanAdapter::usedSsid convert: <%D>"), returnValue );
-            }
-
-        else if( lastUriSeg.Compare(KNSmlWLanSsidHidden) == 0 )
-            {
-            if( aObject.MatchF( _L8("True")) != KErrNotFound )
-                {
-                iSettings->ScanSSID = 1;
-                }
-            else
-                {
-                iSettings->ScanSSID = 0;
-                }
-            }
-
-        else if( lastUriSeg.Compare(KNSmlWLanNetworkMode) == 0 )
-            {
-            if( aObject.MatchF( _L8("ADHOC") ) != KErrNotFound )
-                {
-                iSettings->ConnectionMode = EAdhoc;
-                }
-
-            else if( aObject.MatchF( _L8("Infrastructure") ) != KErrNotFound )
-                {
-                iSettings->ConnectionMode = EInfrastructure;
-                }
-            else
-                {
-                iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EInvalidObject );
-                return;
-                }
-            }
-    
-        else if( lastUriSeg.Compare(KNSmlWLanSecurityMode) == 0 )
-            {
-            if( aObject.MatchF( _L8("NONE") ) != KErrNotFound )
-                {
-                iSettings->SecurityMode = EAllowUnsecure;
-                }
-            else if( aObject.MatchF( _L8("WEP") ) != KErrNotFound )
-                {
-                iSettings->SecurityMode = EWep;
-                }
-            else if( aObject.MatchF( _L8("8021X") ) != KErrNotFound )
-                {
-                iSettings->SecurityMode = EWlan8021x;
-                }
-            else if( aObject.MatchF( _L8("WPA") ) != KErrNotFound )
-                {
-                iSettings->SecurityMode = EWpa;
-                }
-            else if( aObject.MatchF( _L8("WPA2") ) != KErrNotFound )
-                {
-                iSettings->SecurityMode = EWpa2;
-                }
-            else
-                {
-                iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EInvalidObject );
-                return;
-                }
-            }
-
-        else if( lastUriSeg.Compare( KNSmlWLanUseWPAPSK ) == 0 )
-            {
-            if( aObject.MatchF( _L8("True")) != KErrNotFound )
-                {
-                iSettings->UseWPAPSK = 1;
-                }
-            else
-                {
-                iSettings->UseWPAPSK = 0;
-                }
-            }
-
-        else if( lastUriSeg.Compare(KNSmlWLanWpaPreSharedKey) == 0 )
-            {
-            if(aObject.Length() > KMaxPSKLength)
-            {
-            	iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ETooLargeObject );
-            	return;
-            }
-            /*else if(aObject.Length() < KMinPSKLength)
-            {
-              	iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EInvalidObject );
-            	return;
-            }*/
-            else
-            {
-                iSettings->WPAPreSharedKey = aObject;     
-            }
-            }   
-
-	    else if( lastUriSeg.Compare( KNSmlWLanEapList ) == 0 )
-    	    {
-            TInt returnValue = CnvUtfConverter::ConvertToUnicodeFromUtf8( iSettings->EapList, aObject );
-            DBG_ARGS(_S16("WLanAdapter::EapList convert: <%D>"), returnValue );            
-        	}
-
-    	else if( lastUriSeg.Compare( KNSmlWLanAuthMode ) == 0 )
-        	{
-        	if( aObject.MatchF( _L8("1")) != KErrNotFound )
-                {
-                iSettings->AuthMode = EShared;
-                }
-            else
-                {
-                iSettings->AuthMode = EOpen;
-                }            
-        	}
-
-        else if( lastUriSeg.Compare(KNSmlWLanWepIndex) == 0 )
-            {
-            TInt32 actualIndex = DesToInt( aObject );
-            if( actualIndex < 4 && actualIndex >= 0  )
-            {
-            	iSettings->WepIndex = actualIndex ;
-            }
-            else
-            {
-            	if ( actualIndex > 3)
-            	{
-				iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ETooLargeObject );
-            	}
-            	else
-            	{
-				iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-            	}
-            	return;
-            }
-            }
-
-        else
-            {
-            iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-            return;
-            }
-        }
-
-    else if( aURI.Match( _L8("AP/*/NAPDef/*/WLAN/*/SecondarySSID/*/*") ) != KErrNotFound && uriSegs == 9 )
-        {
-        TSecondarySSID ssid;
-        ssid.Id = 0;
-        TUint32 id = GetSecSSIDFromUriL(aURI);
-        RArray<TSecondarySSID> secondaryList;
-        CleanupClosePushL( secondaryList );
-        iWlanSettings->GetSecondarySSIDListL(luid, secondaryList);
-        TInt count = secondaryList.Count();
-        for (TInt i=0;i<count;i++)
-            {
-            if (id == secondaryList[i].Id)
-                {
-                ssid = secondaryList[i];
-                break;
-                }
-            }
-        CleanupStack::PopAndDestroy(&secondaryList);
-        if (ssid.Id == 0)
-            {
-            
-            _DBG_FILE("CNSmlWLanAdapter::Coming to check buffer ");
-            
-            //Check if its buffered here - Divya
-            TInt index = -1;
-
-            for( TInt i=0; i<iSecondaryBuffer.Count(); i++ )
-                {
-                if( aURI.Find( iSecondaryBuffer[i]->iUri->Des() ) != KErrNotFound )
-                    {
-                    index = i;
-                    _DBG_FILE("CNSmlWLanAdapter::one indexis matched :-)");
-                    break;
-                    }
-                }
-            if( index < 0 )
-                {
-                _DBG_FILE("CNSmlWLanAdapter::one indexis matched :-)");
-                iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-                return;
-                }
-            else
-                {
-                DBG_ARGS8(_S8("CWlanadaptes::Execute Buffer - copying in buffer instead of giving 404 uri: object id  : <%S>"), &aObject);
-                
-                    if( lastUriSeg.Compare(KNSmlWLanSsid) == 0 )
-                    {
-                    if ( aObject.Length() <= KMaxTextLength )
-                    	{
-                    	iSecondaryBuffer[index]->ScannedId.Copy(aObject);
-                    	}
-                    else
-                    	{
-                    	_DBG_FILE("CNSmlWLanAdapter::AddLeafObject - SecondarySSID too long");
-                        iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-                        return;
-                    	}
-                    		
-                    }
-                    else if (lastUriSeg.Compare(KNSmlWLanUsedSsid) == 0 )
-                    {
-                    iSecondaryBuffer[index]->UsedId.Copy(aObject);
-                    }
-                
-                }
-                
-            
-            }
-        
-        else
-            {
-            
-        if( lastUriSeg.Compare(KNSmlWLanSsid) == 0 )
-            {
-            ssid.ScannedId.Copy(aObject);
-            }
-        else if (lastUriSeg.Compare(KNSmlWLanUsedSsid) == 0 )
-            {
-            ssid.UsedId.Copy(aObject);
-            }
-        TInt retval = iWlanSettings->WriteSecondarySSIDL(luid, ssid, EFalse);
-        if (retval == KErrNone)
-            {
-            iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
-            }
-        else
-            {
-            iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-            }
-            }
-        }
-    else if( aURI.Match( _L8("AP/*/NAPDef/*/WLAN/*/EAP/*/*") ) != KErrNotFound && uriSegs == 9 )
-        {
-        DBG_ARGS8(_S8("CNSmlWLanAdapter::AddLeafObjectL - EAP index: <%d>"), eapIndex );
-        
-        if( lastUriSeg.Compare(KNSmlWLanEapType) == 0 )
-            {
-            // Get EAP ID from URI instead of the value because the server gives the value
-            // incorrectly as the textual representation of the EAP method instead of the IANA number.            
-            iEAPBuffer[eapIndex]->iEAPSettings->iEAPType = static_cast<EAPSettings::TEapType>(GetEAPIdFromUri(aURI));
-            }
-        else if (lastUriSeg.Compare(KNSmlWLanUsername) == 0)
-            {
-            TInt retval = CnvUtfConverter::ConvertToUnicodeFromUtf8( iEAPBuffer[eapIndex]->iEAPSettings->iUsername, aObject );
-            if (retval == KErrNone)
-            	{
-                iEAPBuffer[eapIndex]->iEAPSettings->iUsernamePresent = ETrue;
-            	}
-            else
-            	{
-            	iEAPBuffer[eapIndex]->iEAPSettings->iUsername.Zero();
-                DBG_ARGS(_S16("CNSmlWLanAdapter::AddLeafObjectL EAP username - ErrorCode <%D>"), retval );
-                iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-                return;
-            	}
-
-            }
-        else if (lastUriSeg.Compare(KNSmlWLanPassword) == 0)
-            {
-            TInt retval = CnvUtfConverter::ConvertToUnicodeFromUtf8( iEAPBuffer[eapIndex]->iEAPSettings->iPassword, aObject );
-            if (retval == KErrNone)
-            	{
-                iEAPBuffer[eapIndex]->iEAPSettings->iPasswordPresent = ETrue;
-            	}
-            else
-            	{
-            	iEAPBuffer[eapIndex]->iEAPSettings->iPassword.Zero();
-                DBG_ARGS(_S16("CNSmlWLanAdapter::AddLeafObjectL EAP password - ErrorCode <%D>"), retval );
-                iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-                return;
-            	}
-            }
-        else if (lastUriSeg.Compare(KNSmlWLanRealm) == 0)
-            {
-            TInt retval = CnvUtfConverter::ConvertToUnicodeFromUtf8( iEAPBuffer[eapIndex]->iEAPSettings->iRealm, aObject );
-            if (retval == KErrNone)
-                iEAPBuffer[eapIndex]->iEAPSettings->iRealmPresent = ETrue;
-            
-            }
-        else if (lastUriSeg.Compare(KNSmlWLanUsePseudonym) == 0)
-            {
-            if ( (aObject == KTrue) || (aObject == KTtrue) )
-                iEAPBuffer[eapIndex]->iEAPSettings->iUsePseudonyms = ETrue; 
-            else
-                iEAPBuffer[eapIndex]->iEAPSettings->iUsePseudonyms = EFalse;
-            
-            
-            iEAPBuffer[eapIndex]->iEAPSettings->iUsePseudonymsPresent = ETrue; 
-            }
-        else if (lastUriSeg.Compare(KNSmlWLanEncapsulation) == 0)
-            {           
-            TBuf8<KExpandedEAPIdLength> dummy;
-            ConvertEAPStringToIds( aObject, dummy, iEAPBuffer[eapIndex]->iEncapsulatingEAPId );
-            }
-        else if (lastUriSeg.Compare(KNSmlWLanVerifyCertRealm) == 0)
-            {
-            if ( (aObject == KTrue) || (aObject == KTtrue) )
-                iEAPBuffer[eapIndex]->iEAPSettings->iVerifyServerRealm = ETrue; 
-            else
-                iEAPBuffer[eapIndex]->iEAPSettings->iVerifyServerRealm = EFalse;
-            
-            
-            iEAPBuffer[eapIndex]->iEAPSettings->iVerifyServerRealmPresent = ETrue; 
-            
-            }
-        else if (lastUriSeg.Compare(KNSmlWLanRequireClientAuthentication) == 0)
-            {
-            if ( (aObject == KTrue) || (aObject == KTtrue) )
-                iEAPBuffer[eapIndex]->iEAPSettings->iRequireClientAuthentication = ETrue; 
-            else
-                iEAPBuffer[eapIndex]->iEAPSettings->iRequireClientAuthentication = EFalse;
-            
-            
-            iEAPBuffer[eapIndex]->iEAPSettings->iRequireClientAuthenticationPresent = ETrue; 
-            
-            }
-        else if (lastUriSeg.Compare(KNSmlWLanSessionValidityTime) == 0)
-            {
-            TLex8 lex(aObject);
-            TUint newVal;
-            TInt sesValErr = lex.Val(newVal);
-            // Check whether the conversion went ok
-            if ( sesValErr == KErrNone ) 
-            	{
-            	iEAPBuffer[eapIndex]->iEAPSettings->iSessionValidityTime = newVal;
-            	iEAPBuffer[eapIndex]->iEAPSettings->iSessionValidityTimePresent = ETrue;
-            	}
-            else 
-            	{
-            	// there were errors, let's leave the function and update status
-                DBG_ARGS(_S16("CNSmlWLanAdapter::AddLeafObjectL SessionValidityTime - ErrorCode <%D>"), sesValErr );
-                iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EInvalidObject );
-                return;
-            	}
-            }
-        else if (lastUriSeg.Compare(KNSmlWLanCipherSuite) == 0)
-            {
-            FillCipherSuitesL( aObject , eapIndex );
-            }
-        else if (lastUriSeg.Compare(KNSmlWLanAllowPEAPv0) == 0)
-            {
-            if ( (aObject == KTrue) || (aObject == KTtrue) )
-                iEAPBuffer[eapIndex]->iEAPSettings->iPEAPv0Allowed = ETrue; 
-            else
-                iEAPBuffer[eapIndex]->iEAPSettings->iPEAPv0Allowed = EFalse;
-            
-            iEAPBuffer[eapIndex]->iEAPSettings->iPEAPVersionsPresent = ETrue;
-            }
-        else if (lastUriSeg.Compare(KNSmlWLanAllowPEAPv1) == 0)
-            {
-            if ( (aObject == KTrue) || (aObject == KTtrue) )
-                iEAPBuffer[eapIndex]->iEAPSettings->iPEAPv1Allowed = ETrue; 
-            else
-                iEAPBuffer[eapIndex]->iEAPSettings->iPEAPv1Allowed = EFalse;
-
-            iEAPBuffer[eapIndex]->iEAPSettings->iPEAPVersionsPresent = ETrue;
-            
-            }
-        else if (lastUriSeg.Compare(KNSmlWLanAllowPEAPv2) == 0)
-            {
-            if ( (aObject == KTrue) || (aObject == KTtrue) )
-                iEAPBuffer[eapIndex]->iEAPSettings->iPEAPv2Allowed = ETrue; 
-            else
-                iEAPBuffer[eapIndex]->iEAPSettings->iPEAPv2Allowed = EFalse;
-            
-            iEAPBuffer[eapIndex]->iEAPSettings->iPEAPVersionsPresent = ETrue;
-            }
-            
-#ifdef FF_WLAN_EXTENSIONS 
-		else if (lastUriSeg.Compare(KNSmlWLanAuthProvMode) == 0)
-            {
-            if ( (aObject == KTrue) || (aObject == KTtrue) )
-                iEAPBuffer[eapIndex]->iEAPSettings->iAuthProvModeAllowed = ETrue; 
-            else
-                iEAPBuffer[eapIndex]->iEAPSettings->iAuthProvModeAllowed = EFalse;
-            
-            iEAPBuffer[eapIndex]->iEAPSettings->iAuthProvModeAllowedPresent = ETrue;
-            }
-            
-            
-      	else if (lastUriSeg.Compare(KNSmlWLanUnauthProvMode) == 0)
-            {
-            if ( (aObject == KTrue) || (aObject == KTtrue) )
-                iEAPBuffer[eapIndex]->iEAPSettings->iUnauthProvModeAllowed = ETrue; 
-            else
-                iEAPBuffer[eapIndex]->iEAPSettings->iUnauthProvModeAllowed = EFalse;
-            
-            iEAPBuffer[eapIndex]->iEAPSettings->iUnauthProvModeAllowedPresent = ETrue;
-            }
-            
-                        
-     	else if (lastUriSeg.Compare(KNSmlWLanPACGroupRef) == 0)
-            {
-            TInt retval = CnvUtfConverter::ConvertToUnicodeFromUtf8( iEAPBuffer[eapIndex]->iEAPSettings->iPACGroupReference, aObject );
-            if (retval == KErrNone)
-                iEAPBuffer[eapIndex]->iEAPSettings->iPACGroupReferencePresent = ETrue;
-            
-            }
-                        
-    	else if (lastUriSeg.Compare(KNSmlWLanWarnADHPNoPAC) == 0)
-            {
-            if ( (aObject == KTrue) || (aObject == KTtrue) )
-                iEAPBuffer[eapIndex]->iEAPSettings->iWarnADHPNoPAC = ETrue; 
-            else
-                iEAPBuffer[eapIndex]->iEAPSettings->iWarnADHPNoPAC = EFalse;
-            
-            iEAPBuffer[eapIndex]->iEAPSettings->iWarnADHPNoPACPresent = ETrue;
-            }
-            
-            
-    	else if (lastUriSeg.Compare(KNSmlWLanWarnADHPNoMatchPAC) == 0)
-            {
-            if ( (aObject == KTrue) || (aObject == KTtrue) )
-                iEAPBuffer[eapIndex]->iEAPSettings->iWarnADHPNoMatchingPAC = ETrue; 
-            else
-                iEAPBuffer[eapIndex]->iEAPSettings->iWarnADHPNoMatchingPAC = EFalse;
-            
-            iEAPBuffer[eapIndex]->iEAPSettings->iWarnADHPNoMatchingPACPresent = ETrue;
-            }
-            
-            
-  		else if (lastUriSeg.Compare(KNSmlWLanWarnNotDefaultSrv) == 0)
-            {
-            if ( (aObject == KTrue) || (aObject == KTtrue) )
-                iEAPBuffer[eapIndex]->iEAPSettings->iWarnNotDefaultServer = ETrue; 
-            else
-                iEAPBuffer[eapIndex]->iEAPSettings->iWarnNotDefaultServer = EFalse;
-            
-            iEAPBuffer[eapIndex]->iEAPSettings->iWarnNotDefaultServerPresent = ETrue;
-            }
-            
-
-#endif            
-        
-        // Save the status reference
-		iEAPBuffer[eapIndex]->iStatusRefArray.AppendL(aStatusRef);        
-		return;
-        }
-    else if (aURI.Match( _L8("AP/*/NAPDef/*/WLAN/*/EAP/*/Certificate/*/*") ) != KErrNotFound && uriSegs == 11)
-        {
-		TPtrC8 ptr = NSmlDmURI::ParentURI( aURI );
-
-		// Get the LUID from ptr2
-       	HBufC8* certLuid = iCallBack->GetLuidAllocL( ptr );
-		
-		TInt certIndex = GetIdFromLuid( *certLuid );
-        
-        delete certLuid;		
-        
-        DBG_ARGS8(_S8("CNSmlWLanAdapter::AddLeafObjectL - cert index: <%d>, cert count: <%d>"), 
-        	certIndex, iEAPBuffer[eapIndex]->iEAPSettings->iCertificates.Count());
-      	
-      	if ( iEAPBuffer[eapIndex]->iEAPSettings->iCertificates.Count() - 1 < certIndex )
-      		{
-      		_DBG_FILE("CNSmlWLanAdapter::AddLeafObject - Certificate buffer does not exist. Create it.");
-      		// The certificate buffer does not exist. Create a new one
-	  		CertificateEntry entry;
-			iEAPBuffer[eapIndex]->iEAPSettings->iCertificates.AppendL(entry);
-			iEAPBuffer[eapIndex]->iEAPSettings->iCertificatesPresent = ETrue;
-	        	        
-	       	certIndex = iEAPBuffer[eapIndex]->iEAPSettings->iCertificates.Count() - 1;
-	       	
-	        TBuf8<2> newLuid;
-			newLuid.Num( certIndex );
-			
-	        DBG_ARGS8(_S8("WLanAdapter::AddLeafObjectL - mapping uri: <%S> to luid: <%S>"), &aURI, &newLuid );
-	        iCallBack->SetMappingL( aURI, newLuid);	              		      		
-      		}
-      
-        if (lastUriSeg.Compare(KNSmlWLanIssuerName) == 0)
-            {
-            TInt retval = 
-                CnvUtfConverter::ConvertToUnicodeFromUtf8( 
-                	iEAPBuffer[eapIndex]->iEAPSettings->iCertificates[certIndex].iIssuerName, aObject );
-            if (retval == KErrNone)
-                iEAPBuffer[eapIndex]->iEAPSettings->iCertificates[certIndex].iIssuerNamePresent = ETrue;
-            }
-        else if (lastUriSeg.Compare(KNSmlWLanSubjectName) == 0)
-            {
-            TInt retval = CnvUtfConverter::ConvertToUnicodeFromUtf8(
-            	iEAPBuffer[eapIndex]->iEAPSettings->iCertificates[certIndex].iSubjectName, aObject );
-            if (retval == KErrNone)
-                iEAPBuffer[eapIndex]->iEAPSettings->iCertificates[certIndex].iSubjectNamePresent = ETrue;
-            }
-        else if (lastUriSeg.Compare(KNSmlWLanCertType) == 0)
-            {
-            iEAPBuffer[eapIndex]->iEAPSettings->iCertificates[certIndex].iCertType = (CertificateEntry::TCertType)DesToInt(aObject);
-            }
-        else if (lastUriSeg.Compare(KNSmlWLanSerialNumber) == 0)
-            {
-            TInt retval = CnvUtfConverter::ConvertToUnicodeFromUtf8(
-            	iEAPBuffer[eapIndex]->iEAPSettings->iCertificates[certIndex].iSerialNumber, aObject );
-            if (retval == KErrNone)
-                iEAPBuffer[eapIndex]->iEAPSettings->iCertificates[certIndex].iSerialNumberPresent = ETrue;
-            
-            }
-        else if (lastUriSeg.Compare(KNSmlWLanSubjectKeyId) == 0)
-            {
-            
-            // Define literals to search the subject key for possible 0X/0x beginning
-            _LIT(KHexIdLC, "0x");
-           	_LIT(KHexIdUC, "0X");
-           	TBuf<2> hexIdBuf;
-           	// The lenght of the key given as input
-           	TInt keyLen = aObject.Length();
-           	
-           	// setting the given key to the key buffer
-           	TBuf8<KNsmlSubjectKeyIdLength> origKey = aObject;
-           	origKey.SetLength(keyLen);
-           	TBuf<KNsmlSubjectKeyIdLength> key;
-           	TLex8 tmpByte;
-           	TUint16 byte;
-           	
-           	// Remove possible spaces from the beginning
-           	origKey.TrimLeft();
-           	
-           	// the key should be atleast two chars long
-           	if (origKey.Length() >= 2)
-                {
-            	// Copy the two left most characters in to the buffer
-            	hexIdBuf.Copy(origKey.Left(2));
-            	
-            	// If the first characters are 0x or 0X, then thet should be ignored
-            	if (hexIdBuf.Compare(KHexIdLC) == 0
-            			|| hexIdBuf.Compare(KHexIdUC) == 0)
-            		{
-            		// delete two characters
-            		origKey.Delete(0, 2);
-            		}
-                }
-            
-
-           	// looping the subject key through, removing whitespaces
-           	for (TInt i = 0; i < keyLen; i++)
-           		{
-           		// removing white spaces from the left side of the key
-           		origKey.TrimLeft();
-           		// check that there are characters left
-           		if (origKey.Length() >= 2)
-           			{
-           			// pick the two left most bytes from the key
-           			tmpByte = origKey.Left(2);
-           			// convert byte into binary format
-           			err = tmpByte.Val(byte, EHex);
-           			
-           			// check whether conversion to decimal went ok
-           			if (err != KErrNone)
-           				{
-           				// if there are problems, then leave the loop
-           				break;
-           				}
-           			
-           			// store the appended byte into the key variable
-           			key.Append(byte);
-           			// delete two characters from the left side of the character array in the buffer
-           			origKey.Delete(0, 2);
-           			}
-           		else if (	origKey.Length() == 1 )
-           			{
-           			// pick the left most byte from the key
-           			tmpByte = origKey.Left(1);
-           			// convert byte into binary format
-           			err = tmpByte.Val(byte, EHex);
-           			
-           			// check whether conversion to decimal went ok
-           			if (err != KErrNone)
-           				{
-           				// if there are problems, then leave the loop
-           				break;
-           				}
-           			
-           			// store the appended byte into the key variable
-           			key.Append(byte);
-           			// delete two characters from the left side of the character array in the buffer
-           			origKey.Delete(0, 1);
-           			}
-           		else {
-           			// leave the loop, no characters are left
-           			break;
-           			}
-           		}
-           	// store key value only if no errors occurred
-           	if (err == KErrNone) 
-           		{
-           		iEAPBuffer[eapIndex]->iEAPSettings->iCertificates[certIndex].iSubjectKeyID.Copy(key);
-           		iEAPBuffer[eapIndex]->iEAPSettings->iCertificates[certIndex].iSubjectKeyIDPresent = ETrue;
-           		}
-             else 
-            	{
-            	// there were errors, let's leave the function and update status
-                DBG_ARGS(_S16("CNSmlWLanAdapter::AddLeafObjectL - ErrorCode <%D>"), err );
-                iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-                return;
-            	}
-            }
-        else if (lastUriSeg.Compare(KNSmlWLanFingerprint) == 0)
-            {
-            TInt retval = CnvUtfConverter::ConvertToUnicodeFromUtf8( 
-            	iEAPBuffer[eapIndex]->iEAPSettings->iCertificates[certIndex].iThumbprint, aObject );
-            if (retval == KErrNone)
-                iEAPBuffer[eapIndex]->iEAPSettings->iCertificates[certIndex].iThumbprintPresent = ETrue;
-            }
-        // Save the status reference
-		iEAPBuffer[eapIndex]->iStatusRefArray.AppendL(aStatusRef);        
-		
-        return;
-        }
-        
-    if (eapId == KErrNotFound)
-        {
-        err = iWlanSettings->WriteWlanSettings( *iSettings );
-        }
-    
-    if( err != KErrNone )
-        {
-        DBG_ARGS(_S16("CNSmlWLanAdapter::AddLeafObjectL - ErrorCode <%D>"), err );
-        iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-        return;
-        }
-
-    iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
-
-    _DBG_FILE("CNSmlWLanAdapter::AddLeafObjectL(): end");
-    }
-
-//-----------------------------------------------------------------------------
-// CNSmlWLanAdapter* CNSmlWLanAdapter::UpdateLeafObjectL( const TDesC& aURI, 
-//    const TDesC& aLUID, const TDesC8& aObject, const TDesC& aType, 
-//    const TInt aStatusRef )
-//-----------------------------------------------------------------------------
-void CNSmlWLanAdapter::UpdateLeafObjectL( const TDesC8& aURI, 
-                                          const TDesC8& aLUID, 
-                                          const TDesC8& aObject, 
-                                          const TDesC8& aType, 
-                                          const TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlWLanAdapter::UpdateLeafObjectL(): begin");
-    DBG_ARGS8(_S8("WLanAdapter::UpdateLeafObjectL - <%S> <%S> <%S>"), &aURI, &aLUID, &aObject );
-
-    AddLeafObjectL( aURI, aLUID, aObject, aType, aStatusRef );
-
-    _DBG_FILE("CNSmlWLanAdapter::UpdateLeafObjectL(): end");
-    }
-
-//------------------------------------------------------------------------------
-// CNSmlWLanAdapter::UpdateLeafObjectL( const TDesC8& aURI, 
-// const TDesC8& aLUID, const TDesC8& aObject, const TDesC8& aType )
-//------------------------------------------------------------------------------
-
-void CNSmlWLanAdapter::UpdateLeafObjectL( const TDesC8& /*aURI*/, 
-                                          const TDesC8& /*aLUID*/,
-                                          RWriteStream*& /*aStream*/, 
-                                          const TDesC8& /*aType*/,
-                                          TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlWLanAdapter::UpdateLeafObjectL(): begin");
-    iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EError);
-    _DBG_FILE("CNSmlWLanAdapter::UpdateLeafObjectL(): end");
-    }
-
-//-----------------------------------------------------------------------------
-// CNSmlWLanAdapter* CNSmlWLanAdapter::DeleteObjectL( const TDesC8& aURI, 
-// const TDesC8& aLUID, const TInt aStatusRef )
-//-----------------------------------------------------------------------------
-void CNSmlWLanAdapter::DeleteObjectL( const TDesC8& aURI, 
-                                      const TDesC8& aLUID, 
-                                      const TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlWLanAdapter::DeleteObjectL(): begin");
-    CSmlDmAdapter::TError status = CSmlDmAdapter::ENotFound;
-
-    if( aLUID.Length() == 0 )
-        {
-        iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-
-        _DBG_FILE("CNSmlWLanAdapter::DeleteObjectL(): end");
-        return;
-        }
-
-	TInt luid = GetIdFromLuid( aLUID );
-
-
-    if( ( NumOfUriSegs( aURI ) < 6 )
-     	|| (aURI.Match( _L8("AP/*/NAPDef/*/WLAN/*") ) != KErrNotFound && NumOfUriSegs( aURI ) == 6 ) )
-        {
-        if(luid==KErrNotFound)
-        	{
-        	return;
-        	}	
-        TInt ret = iWlanSettings->DeleteWlanSettings( luid );
-
-        if( ret == KErrNone )
-        	{
-        	status = CSmlDmAdapter::EOk;
-        	}                          
-        else
-            {
-            status = CSmlDmAdapter::EError;
-            }
-            
-        }
-    else if( aURI.Match( _L8("AP/*/NAPDef/*/WLAN/*/WEPKey") ) != KErrNotFound && NumOfUriSegs( aURI ) == 7 )
-        {
-        // Individual WLAN settings cannot be deleted and this case should never happen.
-        // These are deleted through WLAN parent nodes.
-        status = CSmlDmAdapter::EError;
-        }
-        
-    else if( aURI.Match( _L8("AP/*/NAPDef/*/WLAN/*/SecondarySSID/*"))!= KErrNotFound && NumOfUriSegs( aURI ) == 8  )
-    {
-      _DBG_FILE("CNSmlWLanAdapter::DeleteObjectL(): matching SecondarySSID/*");
-    	//Check if the secondary SSID is present , if so delete that 
-    	 TUint32 secid = GetSecSSIDFromUriL(aURI);
-    	 TInt retvalue( KErrNone );
-         _DBG_FILE("CNSmlWLanAdapter::DeleteObjectL() before call to DeleteOneSecondarySSIDL ");
-        TRAPD(ssidError, retvalue = iWlanSettings->DeleteOneSecondarySSIDL(luid,secid));
-         _DBG_FILE("CNSmlWLanAdapter::DeleteObjectL() After call to DeleteOneSecondarySSIDL ");
-         DBG_ARGS8(_S8("TRAP ERROR  ssidError : Id = %d and retvalue eror = %d"), ssidError, retvalue);
-                  
-		 if(ssidError == KErrNone )
-		 {
-		   _DBG_FILE("CNSmlWLanAdapter::DeleteObjectL() SSID trap KERRONONE");
-		 	if(retvalue == KErrNone)            
-		 	{
-		 		_DBG_FILE("CNSmlWLanAdapter::DeleteObjectL() retvalue also  KERRONONE, so its deleted");
-		 		status = CSmlDmAdapter::EOk;
-		 	}
-		 	
-			 else  if (retvalue == KErrNotFound)
-			 {
-			 	status = CSmlDmAdapter::ENotFound;
-			 	_DBG_FILE("CNSmlWLanAdapter::DeleteObjectL() retvalue KErrNotFound :-(");
-			 }
-			
-			else
-			{
-				_DBG_FILE("CNSmlWLanAdapter::DeleteObjectL() retvalue some error :-(");
-				status = CSmlDmAdapter::EError;
-			}
-				
-			
-		 }
-		 else
-		 {
-		 _DBG_FILE("CNSmlWLanAdapter::DeleteObjectL() trap error :-( ");
-		 	status = CSmlDmAdapter::EError;
-		 }  
-				 
-    }
-    
-    else if( aURI.Match( _L8("AP/*/NAPDef/*/WLAN/*/*") ) != KErrNotFound && NumOfUriSegs( aURI ) == 7 )
-        {
-        // Individual WLAN settings cannot be deleted and this case should never happen.
-        // These are deleted through WLAN parent nodes.
-        status = CSmlDmAdapter::EError;
-        }
-
-    else if( aURI.Match( _L8("AP/*/NAPDef/*/WLAN/*/WEPKey/*") ) != KErrNotFound && NumOfUriSegs( aURI ) == 8 )
-        {
-        // Individual WEP keys cannot be deleted and this case should never happen.
-        // These are deleted through WLAN parent nodes.
-        status = CSmlDmAdapter::EError;
-        }
-
-    else if( aURI.Match( _L8("AP/*/NAPDef/*/WLAN/*/WEPKey/*/Data") ) != KErrNotFound && NumOfUriSegs( aURI ) == 9 )
-        {
-    	// Individual WEP keys cannot be deleted and this case should never happen.
-    	// These are deleted through WLAN parent nodes.	
-       	status = CSmlDmAdapter::EError;        
-        }
-
-    else if( aURI.Match( _L8("AP/*/NAPDef/*/WLAN/*/EAP/*") ) != KErrNotFound && NumOfUriSegs( aURI ) == 8 )
-        {
-    	// Individual EAP settings cannot be deleted and this case should never happen.
-    	// These are deleted through WLAN parent nodes.	
-       	status = CSmlDmAdapter::EError;        
-        }
-    else if( aURI.Match( _L8("AP/*/NAPDef/*/WLAN/*/EAP/*/*") ) != KErrNotFound && NumOfUriSegs( aURI ) == 9 )
-        {
-        // Individual EAP settings cannot be deleted and this case should never happen.
-        // These are deleted through WLAN parent nodes.
-        status = CSmlDmAdapter::EError;
-        }
-    else if (aURI.Match( _L8("AP/*/NAPDef/*/WLAN/*/EAP/*/Certificate/*") ) != KErrNotFound && NumOfUriSegs( aURI ) == 10)
-        {
-        // Individual certificates are not allowed to be deleted and this case should never happen
-        // These are deleted through WLAN parent nodes.
-        status = CSmlDmAdapter::EError;
-               
-        }
-    else if (aURI.Match( _L8("AP/*/NAPDef/*/WLAN/*/EAP/*/Certificate/*/*") ) != KErrNotFound && NumOfUriSegs( aURI ) == 11)
-        {
-        // Individual certificate fields are not allowed to be deleted and this case should never happen.
-        // These are deleted through WLAN parent nodes.
-        status = CSmlDmAdapter::EError;
-		}
-
-    iCallBack->SetStatusL( aStatusRef, status );
-
-    _DBG_FILE("CNSmlWLanAdapter::DeleteObjectL(): end");
-    }
-
-//-----------------------------------------------------------------------------
-// CNSmlWLanAdapter* CNSmlWLanAdapter::FetchLeafObjectL( const TDesC8& aURI, 
-//                     const TDesC8& aLUID, const TDesC8& aType, 
-//                     const TInt aResultsRef, const TInt aStatusRef )
-// not used.
-//-----------------------------------------------------------------------------
-
-void CNSmlWLanAdapter::FetchLeafObjectSizeL( const TDesC8& /*aURI*/, 
-                                                 const TDesC8& /*aLUID*/,
-                                                 const TDesC8& /*aType*/, 
-                                                 TInt /*aResultsRef*/,
-                                                 TInt /*aStatusRef*/ )
-    {
-    _DBG_FILE("CNSmlWLanAdapter::FetchLeafObjectSizeL(): begin");
-    _DBG_FILE("CNSmlWLanAdapter::FetchLeafObjectSizeL(): end");
-    return;
-}                                                
-
-
-//-----------------------------------------------------------------------------
-// CNSmlWLanAdapter* CNSmlWLanAdapter::FetchLeafObjectL( const TDesC8& aURI, 
-//                     const TDesC8& aLUID, const TDesC8& aType, 
-//                     const TInt aResultsRef, const TInt aStatusRef )
-//-----------------------------------------------------------------------------
-void CNSmlWLanAdapter::FetchLeafObjectL( const TDesC8& /*aURI*/, 
-                                        const TDesC8& /*aLUID*/, 
-                                        const TDesC8& /*aType*/, 
-                                        const TInt /*aResultsRef*/, 
-                                        const TInt /*aStatusRef*/ )
-    {
-    _DBG_FILE("CNSmlWLanAdapter::FetchLeafObjectL(): begin");
-    _DBG_FILE("CNSmlWLanAdapter::FetchLeafObjectL(): end");
-
-    }
-    
-//-----------------------------------------------------------------------------
-// CNSmlWLanAdapter* CNSmlWLanAdapter::FetchLeafObjectL( const TDesC& aURI, 
-//                     const TDesC& aLUID, const TDesC& aType, 
-//                     const TInt aResultsRef, const TInt aStatusRef )
-//-----------------------------------------------------------------------------
-CSmlDmAdapter::TError CNSmlWLanAdapter::FetchLeafObjectL( const TDesC8& aURI, 
-                                        const TDesC8& aLUID, 
-                                        const TDesC8& aType, 
-                                        CBufBase& aObject )
-    {
-    
-    _DBG_FILE("CNSmlWLanAdapter::FetchLeafObjectL(): begin");
-    DBG_ARGS8(_S8("WLanAdapter::FetchLeafObjectL - <%S> <%S> <%S>"), &aURI, &aLUID, &aType);
-
-    if(aLUID.Length()==0)
-        {
-
-        _DBG_FILE("CNSmlWLanAdapter::FetchLeafObjectL(): ENotFound");
-        return CSmlDmAdapter::ENotFound;
-        }
-
-    CSmlDmAdapter::TError status = CSmlDmAdapter::ENotFound;
-
-	// This luid is the service table id (Found from EAP node and parents)
-	TInt luid;
-	if ( aURI.Match( _L8("AP/*/NAPDef/*/WLAN/*/EAP/*")) != KErrNotFound )
-		{
-		luid = GetServiceIdFromUriL( aURI );
-		}
-	else
-		{
-		// The luid supplied is ok
-		luid = GetIdFromLuid( aLUID );
-		}
-    
-    TPtrC8 lastUriSeg = GetLastUriSeg( aURI );
-    
-    if(luid==KErrNotFound)
-    	{
-    	return;
-    	}
-        
-    TInt err = iWlanSettings->GetWlanSettings( luid, *iSettings );
-
-    if( err == KErrNotFound )
-    {
-
-        _DBG_FILE("CNSmlWLanAdapter::FetchLeafObjectL(): ENotFound");       
-        return CSmlDmAdapter::ENotFound;
-    }
-
-    if( lastUriSeg.Compare( KNSmlWLanSsid ) == 0 )
-        {
-
-        if (aURI.Match( _L8("AP/*/NAPDef/*/WLAN/*/SecondarySSID/*")) != KErrNotFound)
-            {
-            RArray<TSecondarySSID> secondarySSIDs;
-            CleanupClosePushL( secondarySSIDs );
-            iWlanSettings->GetSecondarySSIDListL(luid, secondarySSIDs);
-            TSecondarySSID ssid;
-            ssid.Id = 0;
-            TUint32 id = GetSecSSIDFromUriL(aURI);
-            TInt count = secondarySSIDs.Count();
-            for (TInt i=0;i<count;i++)
-                {
-                if (id == secondarySSIDs[i].Id)
-                    {
-                    ssid = secondarySSIDs[i];
-                    break;
-                    }
-                }            
-            CleanupStack::PopAndDestroy(&secondarySSIDs);
-            if (ssid.Id == 0)
-                {
-                status = CSmlDmAdapter::ENotFound;
-                }
-            else
-                {
-                HBufC* data = ssid.ScannedId.AllocLC();
-                HBufC8* data8 = HBufC8::NewLC(data->Size());
-                TPtr8 dataPtr8 = data8->Des();
-                //FFS
-                CnvUtfConverter::ConvertFromUnicodeToUtf8( dataPtr8, data->Des() );
-
-                aObject.InsertL( 0, dataPtr8 );
-                status = CSmlDmAdapter::EOk;
-
-                CleanupStack::PopAndDestroy( 2 ); //data, data8
-                }
-            }
-        else
-            {
-
-        HBufC* data = iSettings->SSID.AllocLC();
-        HBufC8* data8 = HBufC8::NewLC(data->Size());
-        TPtr8 dataPtr8 = data8->Des();
-        //FFS
-        CnvUtfConverter::ConvertFromUnicodeToUtf8( dataPtr8, data->Des() );
-
-        aObject.InsertL( 0, dataPtr8 );
-        status = CSmlDmAdapter::EOk;
-
-        CleanupStack::PopAndDestroy( 2 ); //data, data8
-
-            }
-
-        }
-
-    else if( lastUriSeg.Compare( KNSmlWLanUsedSsid ) == 0 )
-        {
-
-        if (aURI.Match( _L8("AP/*/NAPDef/*/WLAN/*/SecondarySSID/*")) != KErrNotFound)
-            {
-            RArray<TSecondarySSID> secondarySSIDs;
-            CleanupClosePushL( secondarySSIDs );
-            iWlanSettings->GetSecondarySSIDListL(luid, secondarySSIDs);
-            TSecondarySSID ssid;
-            ssid.Id = 0;
-            TUint32 id = GetSecSSIDFromUriL(aURI);
-            TInt count = secondarySSIDs.Count();
-            for (TInt i=0;i<count;i++)
-                {
-                if (id == secondarySSIDs[i].Id)
-                    {
-                    ssid = secondarySSIDs[i];
-                    break;
-                    }
-                }
-            CleanupStack::PopAndDestroy(&secondarySSIDs);            
-            if (ssid.Id == 0)
-                {
-                status = CSmlDmAdapter::ENotFound;
-                }
-            else
-                {
-                HBufC* data = ssid.UsedId.AllocLC();
-                HBufC8* data8 = HBufC8::NewLC(data->Size());
-                TPtr8 dataPtr8 = data8->Des();
-                //FFS
-                CnvUtfConverter::ConvertFromUnicodeToUtf8( dataPtr8, data->Des() );
-
-                aObject.InsertL( 0, dataPtr8 );
-                status = CSmlDmAdapter::EOk;
-
-                CleanupStack::PopAndDestroy( 2 ); //data, data8
-                }
-            }
-        else
-            {
-            
-        HBufC* data = iSettings->UsedSSID.AllocLC();
-        HBufC8* data8 = HBufC8::NewLC(data->Size());
-        TPtr8 dataPtr8 = data8->Des();
-        //FFS
-        CnvUtfConverter::ConvertFromUnicodeToUtf8( dataPtr8, data->Des() );
-
-        aObject.InsertL( 0, dataPtr8 );
-        status = CSmlDmAdapter::EOk;
-
-        CleanupStack::PopAndDestroy( 2 ); //data, data8
-        
-            }
-
-        }
-        
-    else if( lastUriSeg.Compare( KNSmlWLanSsidHidden ) == 0 )
-        {
-        if ( iSettings->ScanSSID == 1 )
-            {
-            aObject.InsertL( 0, _L8("True" ) );
-            }
-        else
-            {
-            aObject.InsertL( 0, _L8("False" ) );
-            }
-        status = CSmlDmAdapter::EOk;
-        }
-
-
-    else if( lastUriSeg.Compare( KNSmlWLanNetworkMode ) == 0 )
-        {
-        status = CSmlDmAdapter::EOk;
-
-        switch( iSettings->ConnectionMode )
-            {
-        case 0:
-            aObject.InsertL( 0, KNSmlWLanAdHoc8 );
-            break;
-        case 1:
-            aObject.InsertL( 0, KNSmlWLanInfrastructure8 );
-            break;
-        default:
-            status = CSmlDmAdapter::ENotFound;
-            break;
-            }
-        }
-    else if( lastUriSeg.Compare( KNSmlWLanSecurityMode ) == 0 )
-        {
-        status = CSmlDmAdapter::EOk;
-
-        switch( iSettings->SecurityMode )
-            {
-        case EAllowUnsecure:
-            aObject.InsertL( 0, KNSmlWLanAllowUnsecure8 );
-            break;
-        case EWep:
-            aObject.InsertL( 0, KNSmlWLanWep8 );
-            break;
-        case EWlan8021x:
-            aObject.InsertL( 0, KNSmlWLan8021x8 );
-            break;
-        case EWpa:
-            aObject.InsertL( 0, KNSmlWLanWpa8 );
-            break;
-        case EWpa2:
-            aObject.InsertL( 0, KNSmlWLanWpa28 );
-            break;
-        default:
-            status = CSmlDmAdapter::ENotFound;
-            break;
-            }
-        }
-        
-    else if( lastUriSeg.Compare( KNSmlWLanWpaPreSharedKey ) == 0 )
-        {
-		aObject.InsertL( 0, iSettings->WPAPreSharedKey );
-        status = CSmlDmAdapter::EOk;
-        }
-
-    else if( lastUriSeg.Compare( KNSmlWLanUseWPAPSK ) == 0 )
-        {
-        if ( iSettings->UseWPAPSK == 1 )
-            {
-            aObject.InsertL( 0, _L8("True" ) );
-            }
-        else
-            {
-            aObject.InsertL( 0, _L8("False" ) );
-            }       
-        status = CSmlDmAdapter::EOk;
-        }
-
-    else if( lastUriSeg.Compare( KNSmlWLanWepIndex ) == 0 )
-        {
-        HBufC8* data = IntToDes8LC( iSettings->WepIndex );
-        aObject.InsertL( 0, data->Des() );
-        
-        CleanupStack::PopAndDestroy( data ); //data
-        status = CSmlDmAdapter::EOk;
-        }
-
-    else if( lastUriSeg.Compare( KNSmlWLanEapList ) == 0 )
-        {     
-        HBufC* data = iSettings->EapList.AllocLC();
-        HBufC8* data8 = HBufC8::NewLC(data->Size());
-        TPtr8 dataPtr8 = data8->Des();
-        //FFS
-        CnvUtfConverter::ConvertFromUnicodeToUtf8( dataPtr8, data->Des() );
-
-        aObject.InsertL( 0, dataPtr8 );
-        status = CSmlDmAdapter::EOk;
-
-        CleanupStack::PopAndDestroy( 2 ); //data, data8
-      
-        }
-
-    else if( lastUriSeg.Compare( KNSmlWLanAuthMode ) == 0 )
-        {
-        HBufC8* data = IntToDes8LC( iSettings->AuthMode );
-        aObject.InsertL( 0, data->Des() );
-        
-        CleanupStack::PopAndDestroy( data ); //data
-        status = CSmlDmAdapter::EOk;
-        }
-
-    else if( lastUriSeg.Compare( KNSmlWLanWepKeyData ) == 0 )
-        {
-        TInt wepKeyIndex = GetWepKeyIdFromLuid( aLUID );
-        if(wepKeyIndex == KErrNotFound)
-        {
-        	wepKeyIndex = GetWepKeyIdFromUri( aURI );
-        	TBuf8<80> addLUID; // AP/<x>/NapDef/<x>/WLAN/<x>/WEPKey/WKIdnnn
-            addLUID.AppendNum( wepKeyIndex );
-            addLUID.AppendNumFixedWidth( luid, EDecimal, 3 );
-            DBG_ARGS8(_S8("WLanAdapter::Fetchleaf object, set mapping uri: <%S> to luid: <%S>"), &aURI, &addLUID );
-            DBG_ARGS8(_S8("Parametrit - <%S> <%S>"), &aURI, &addLUID );
-           iCallBack->SetMappingL(aURI, addLUID);
-                
-        }
-        status = CSmlDmAdapter::EOk;
-        switch( wepKeyIndex )
-            {
-        case 1:
-            aObject.InsertL( 0, iSettings->WepKey1 );
-            break;
-        case 2:
-            aObject.InsertL( 0, iSettings->WepKey2 );
-            break;
-        case 3:
-            aObject.InsertL( 0, iSettings->WepKey3 );
-            break;
-        case 4:
-            aObject.InsertL( 0, iSettings->WepKey4 );
-            break;
-        default:
-            status = CSmlDmAdapter::EError;
-            }
-        }
-    else if( lastUriSeg.Compare( KNSmlWLanWepKeyId ) == 0 )
-        {
-        TInt wepKeyIndex = GetWepKeyIdFromLuid( aLUID );
-        if(wepKeyIndex == KErrNotFound)
-        {
-        	wepKeyIndex = GetWepKeyIdFromUri( aURI );
-        	TBuf8<80> addLUID; // AP/<x>/NapDef/<x>/WLAN/<x>/WEPKey/WKIdnnn
-            addLUID.AppendNum( wepKeyIndex );
-            addLUID.AppendNumFixedWidth( luid, EDecimal, 3 );
-            DBG_ARGS8(_S8("WLanAdapter::Fetchleaf object, set mapping uri: <%S> to luid: <%S>"), &aURI, &addLUID );
-            DBG_ARGS8(_S8("Parametrit - <%S> <%S>"), &aURI, &addLUID );
-           iCallBack->SetMappingL(aURI, addLUID);
-        }
-        if( wepKeyIndex > 0 )
-            {
-            HBufC8* data = IntToDes8LC( wepKeyIndex );
-            aObject.InsertL( 0, data->Des() );
-            CleanupStack::PopAndDestroy( data ); //data
-            status = CSmlDmAdapter::EOk;
-            }
-        else
-            {
-            status = CSmlDmAdapter::EError;
-            }
-        }
-
-    else if (aURI.Match( _L8("AP/*/NAPDef/*/WLAN/*/EAP/*")) != KErrNotFound)
-        {
-        TInt eapId = GetEAPIdFromUri(aURI);
-
-        // Check if the id contains encapsulating type as well
-        TInt encapsEapId = GetEncapsEAPIdFromUri( aURI );
-        if ( encapsEapId == KErrNotFound )
-        	{
-        	encapsEapId = EAPSettings::EEapNone;
-        	}
-        
-        ResetEAPStructL();
-                              
-        TInt err = iWlanSettings->GetEAPSettings( luid, eapId, encapsEapId, *iEAPSettings );
-        if (err != KErrNone || iEAPSettings == NULL)
-            {
-            status = CSmlDmAdapter::EError; 
-            }
-        else if (lastUriSeg.Compare( KNSmlWLanEapType ) == 0 )
-            {
-            aObject.InsertL(0, *IntToDes8LC((TInt)iEAPSettings->iEAPType));
-            CleanupStack::PopAndDestroy(); // IntToDes8LC
-            status = CSmlDmAdapter::EOk;
-            }
-        else if (lastUriSeg.Compare( KNSmlWLanUsername ) == 0 )
-            {
-            if (iEAPSettings->iUsernamePresent)
-                {
-                DesToBufferL(aObject, iEAPSettings->iUsername);
-                }
-            status = CSmlDmAdapter::EOk;
-            }
-        else if (lastUriSeg.Compare( KNSmlWLanPassword ) == 0 )
-            {
-            if (iEAPSettings->iPasswordPresent)
-                {
-                DesToBufferL(aObject, iEAPSettings->iPassword);
-                }
-            status = CSmlDmAdapter::EOk;
-            }
-        else if (lastUriSeg.Compare( KNSmlWLanRealm ) == 0 )
-            {
-            if (iEAPSettings->iRealmPresent)
-                {
-                DesToBufferL(aObject, iEAPSettings->iRealm);
-                }
-            status = CSmlDmAdapter::EOk;
-            }
-        else if (lastUriSeg.Compare( KNSmlWLanUsePseudonym ) == 0 )
-            {
-            if (iEAPSettings->iUsePseudonymsPresent && iEAPSettings->iUsePseudonyms)
-                {
-                aObject.InsertL(0, KTrue);
-                }
-            else
-                {
-                aObject.InsertL(0, KFalse);
-                }
-            status = CSmlDmAdapter::EOk;
-            }
-        else if (lastUriSeg.Compare( KNSmlWLanEncapsulation ) == 0 )
-            {
-            if ( encapsEapId == EAPSettings::EEapPeap )
-            	{
-            	aObject.InsertL( 0, KEAPPEAP);            	
-            	}
-            else if ( encapsEapId == EAPSettings::EEapTtls )
-            	{
-            	aObject.InsertL( 0, KEAPTTLS);
-            	}
-            status = CSmlDmAdapter::EOk;
-            }
-        else if (lastUriSeg.Compare( KNSmlWLanVerifyCertRealm ) == 0 )
-            {
-            if (iEAPSettings->iVerifyServerRealmPresent && iEAPSettings->iVerifyServerRealm)
-                {
-                aObject.InsertL(0, KTrue);
-                }
-            else
-                {
-                aObject.InsertL(0, KFalse);
-                }
-            status = CSmlDmAdapter::EOk;
-            }
-        else if (lastUriSeg.Compare( KNSmlWLanRequireClientAuthentication ) == 0 )
-            {
-            if (iEAPSettings->iRequireClientAuthenticationPresent && iEAPSettings->iRequireClientAuthentication)
-                {
-                aObject.InsertL(0, KTrue);
-                }
-            else
-                {
-                aObject.InsertL(0, KFalse);
-                }
-            status = CSmlDmAdapter::EOk;
-            }
-        else if (lastUriSeg.Compare( KNSmlWLanSessionValidityTime ) == 0 )
-            {
-            if (iEAPSettings->iSessionValidityTimePresent)
-                {
-                aObject.InsertL(0, *IntToDes8LC((TInt)iEAPSettings->iSessionValidityTime));
-                CleanupStack::PopAndDestroy(); // IntToDes8LC
-                }
-            status = CSmlDmAdapter::EOk;
-            }
-        else if (lastUriSeg.Compare( KNSmlWLanCipherSuite ) == 0 )
-            {
-            FillCipherSuiteBufferL(aObject);
-            status = CSmlDmAdapter::EOk; 
-            }
-        else if (lastUriSeg.Compare( KNSmlWLanAllowPEAPv0 ) == 0 )
-            {
-            if (iEAPSettings->iPEAPVersionsPresent && iEAPSettings->iPEAPv0Allowed)
-                {
-                aObject.InsertL(0, KTrue);
-                }
-            else
-                {
-                aObject.InsertL(0, KFalse);
-                }
-            status = CSmlDmAdapter::EOk;
-            }
-        else if (lastUriSeg.Compare( KNSmlWLanAllowPEAPv1 ) == 0 )
-            {
-            if (iEAPSettings->iPEAPVersionsPresent && iEAPSettings->iPEAPv1Allowed)
-                {
-                aObject.InsertL(0, KTrue);
-                }
-            else
-                {
-                aObject.InsertL(0, KFalse);
-                }
-            status = CSmlDmAdapter::EOk;
-            }
-        else if (lastUriSeg.Compare( KNSmlWLanAllowPEAPv2 ) == 0 )
-            {
-            if (iEAPSettings->iPEAPVersionsPresent && iEAPSettings->iPEAPv2Allowed)
-                {
-                aObject.InsertL(0, KTrue);
-                }
-            else
-                {
-                aObject.InsertL(0, KFalse);
-                }
-            status = CSmlDmAdapter::EOk;
-            }
-            
-            
-            
-#ifdef FF_WLAN_EXTENSIONS 
-		else if (lastUriSeg.Compare(KNSmlWLanAuthProvMode) == 0)
-            {
-            if (iEAPSettings->iAuthProvModeAllowedPresent && iEAPSettings->iAuthProvModeAllowed)
-                {
-                aObject.InsertL(0, KTrue);
-                }
-            else
-                {
-                aObject.InsertL(0, KFalse);
-                }
-            status = CSmlDmAdapter::EOk;
-            }
-            
-                        
-      	else if (lastUriSeg.Compare(KNSmlWLanUnauthProvMode) == 0)
-                        {
-            if (iEAPSettings->iUnauthProvModeAllowedPresent && iEAPSettings->iUnauthProvModeAllowed)
-                {
-                aObject.InsertL(0, KTrue);
-                }
-            else
-                {
-                aObject.InsertL(0, KFalse);
-                }
-            status = CSmlDmAdapter::EOk;
-            }
-                                    
-     	else if (lastUriSeg.Compare(KNSmlWLanPACGroupRef) == 0)
-            {
-            if (iEAPSettings->iPACGroupReferencePresent)
-                {
-                DesToBufferL(aObject, iEAPSettings->iPACGroupReference);
-                }
-            status = CSmlDmAdapter::EOk;
-            }
-                        
-    	else if (lastUriSeg.Compare(KNSmlWLanWarnADHPNoPAC) == 0)
-            {
-            if (iEAPSettings->iWarnADHPNoPACPresent && iEAPSettings->iWarnADHPNoPAC)
-                {
-                aObject.InsertL(0, KTrue);
-                }
-            else
-                {
-                aObject.InsertL(0, KFalse);
-                }
-            status = CSmlDmAdapter::EOk;
-            }
-            
-            
-    	else if (lastUriSeg.Compare(KNSmlWLanWarnADHPNoMatchPAC) == 0)
-            {
-            if (iEAPSettings->iWarnADHPNoMatchingPACPresent && iEAPSettings->iWarnADHPNoMatchingPAC)
-                {
-                aObject.InsertL(0, KTrue);
-                }
-            else
-                {
-                aObject.InsertL(0, KFalse);
-                }
-            status = CSmlDmAdapter::EOk;
-            }
-            
-            
-            
-  		else if (lastUriSeg.Compare(KNSmlWLanWarnNotDefaultSrv) == 0)
-            {
-            if (iEAPSettings->iWarnNotDefaultServerPresent && iEAPSettings->iWarnNotDefaultServer)
-                {
-                aObject.InsertL(0, KTrue);
-                }
-            else
-                {
-                aObject.InsertL(0, KFalse);
-                }
-            status = CSmlDmAdapter::EOk;
-            }
-            
-#endif  
-                                
-            
-        else if (lastUriSeg.Compare( KNSmlWLanIssuerName ) == 0 )
-            {
-            status = CSmlDmAdapter::ENotFound;            
-            
-            TInt certId = GetCertificateIdFromUri(aURI);
-            
-            if ( iEAPSettings->iCertificatesPresent
-            	&& iEAPSettings->iCertificates.Count() >= certId
-            	&& certId != KErrNotFound )
-                {
-                if (iEAPSettings->iCertificates[certId-1].iIssuerNamePresent)
-                	{
-                	aObject.InsertL(0, ConvertTo8LC(iEAPSettings->iCertificates[certId-1].iIssuerName));
-                   	CleanupStack::PopAndDestroy(); // ConvertTo8LC
-                   	status = CSmlDmAdapter::EOk;
-                	}
-            	}
-            }
-        else if (lastUriSeg.Compare( KNSmlWLanSubjectName ) == 0 )
-            {
-            status = CSmlDmAdapter::ENotFound;            
-            
-            TInt certId = GetCertificateIdFromUri(aURI);
-            
-            if ( iEAPSettings->iCertificatesPresent
-            	&& iEAPSettings->iCertificates.Count() >= certId
-            	&& certId != KErrNotFound )
-                {
-                if (iEAPSettings->iCertificates[certId-1].iSubjectNamePresent)
-                	{
-                    aObject.InsertL(0, ConvertTo8LC(iEAPSettings->iCertificates[certId-1].iSubjectName));
-                    CleanupStack::PopAndDestroy(); // ConvertTo8LC
-					status = CSmlDmAdapter::EOk;                  
-                	}                   
-                }
-            }
-        else if (lastUriSeg.Compare( KNSmlWLanCertType ) == 0 )
-            {
-            status = CSmlDmAdapter::ENotFound;            
-            
-            TInt certId = GetCertificateIdFromUri(aURI);
-            
-            if ( iEAPSettings->iCertificatesPresent
-            	&& iEAPSettings->iCertificates.Count() >= certId
-            	&& certId != KErrNotFound )
-                {
-                aObject.InsertL(0, *IntToDes8LC(iEAPSettings->iCertificates[certId-1].iCertType));
-                CleanupStack::PopAndDestroy(); // IntToDes8LC
-                status = CSmlDmAdapter::EOk;
-                }                            
-            }
-        else if (lastUriSeg.Compare( KNSmlWLanSerialNumber ) == 0 )
-            {
-            status = CSmlDmAdapter::ENotFound;            
-            
-            TInt certId = GetCertificateIdFromUri(aURI);
-            
-            if ( iEAPSettings->iCertificatesPresent
-            	&& iEAPSettings->iCertificates.Count() >= certId
-            	&& certId != KErrNotFound )
-                {
-                if (iEAPSettings->iCertificates[certId-1].iSerialNumberPresent)
-    	            {
-                    aObject.InsertL(0, ConvertTo8LC(iEAPSettings->iCertificates[certId-1].iSerialNumber));
-                    CleanupStack::PopAndDestroy(); // ConvertTo8LC
-	                status = CSmlDmAdapter::EOk;
-                    }
-                }
-            }
-        else if (lastUriSeg.Compare( KNSmlWLanSubjectKeyId ) == 0 )
-            {
-            status = CSmlDmAdapter::ENotFound;            
-            
-            TInt certId = GetCertificateIdFromUri(aURI);
-            
-            if ( iEAPSettings->iCertificatesPresent
-            	&& iEAPSettings->iCertificates.Count() >= certId
-            	&& certId != KErrNotFound )
-            	{         	
-                if (iEAPSettings->iCertificates[certId-1].iSubjectKeyIDPresent)
-                    {
-                    _DBG_FILE("CNSmlWLanAdapter::FetchLeafObject - Fetch subject key.");
-                    // check the lenght of the given subjectKeyId, if it is longer that 20, then we
-                    // update the status with error and will not go through the key
-                    if ((iEAPSettings->iCertificates[certId-1].iSubjectKeyID.Length()) > KKeyIdentifierLength)
-                    	{
-                    	status = CSmlDmAdapter::EError;        
-                    	}
-                    else 
-                    	{
-                    	_DBG_FILE("CNSmlWLanAdapter::FetchLeafObject - key is under max lenght");
-                    	TBuf8<KKeyIdentifierLength> binKey = iEAPSettings->iCertificates[certId-1].iSubjectKeyID;
-                    	TBuf8<2> idBuf;
-                    	TBuf8<KKeyIdentifierLength*2> key;
-                    	TUint8 byte;
-                    
-                    	// hexadecimal representation
-                    	_LIT8(KFormat, "%02x");
-                                             	
-                    	// looping the subject key through
-                    	for (TInt i = 0; i < binKey.Length(); i++)
-                    		{
-                    		_DBG_FILE("CNSmlWLanAdapter::FetchLeafObject - Loop the key through.");
-                    		// pick the next value from the buffer
-                    		byte = binKey[i];
-                    		// convert the value into hexadecimal format
-                    		idBuf.Format(KFormat, byte);		
-                    		// store the hexa value into the key variable
-                    		key.Append(idBuf);
-                    		}
-                    	// Copy the key to the aObject variable
-                    	aObject.InsertL(0, key);
-                    	status = CSmlDmAdapter::EOk;
-                    	}
-                    }
-            	}            
-            }
-        else if (lastUriSeg.Compare( KNSmlWLanFingerprint ) == 0 )
-            {
-            status = CSmlDmAdapter::ENotFound;            
-            
-            TInt certId = GetCertificateIdFromUri(aURI);
-
-            if ( iEAPSettings->iCertificatesPresent
-            	&& iEAPSettings->iCertificates.Count() >= certId
-            	&& certId != KErrNotFound )
-                {   
-                if (iEAPSettings->iCertificates[certId-1].iThumbprintPresent)
-                	{
-                    aObject.InsertL(0, ConvertTo8LC(iEAPSettings->iCertificates[certId-1].iThumbprint));
-                    CleanupStack::PopAndDestroy(); // ConvertTo8LC
-                    status = CSmlDmAdapter::EOk;
-                	}                 
-                }
-            }
-        else if (lastUriSeg.Compare( KNSmlWLanSerialNumber ) == 0 )
-            {
-            status = CSmlDmAdapter::ENotFound;            
-            
-            TInt certId = GetCertificateIdFromUri(aURI);
-            
-            if ( iEAPSettings->iCertificatesPresent
-            	&& iEAPSettings->iCertificates.Count() >= certId
-            	&& certId != KErrNotFound )
-                {   
-                if (iEAPSettings->iCertificates[certId-1].iSerialNumberPresent)
-                	{
-                    aObject.InsertL(0, ConvertTo8LC(iEAPSettings->iCertificates[certId-1].iSerialNumber));
-                    CleanupStack::PopAndDestroy(); // ConvertTo8LC
-                    status = CSmlDmAdapter::EOk;
-                	}
-               	}
-            }
-        }
-
-        
-    DBG_ARGS(_S16("CNSmlWLanAdapter::FetchLeafObjectL - Status <%D>"), status );
-    _DBG_FILE("CNSmlWLanAdapter::FetchLeafObjectL(): end");
-    return status;
-    }
-
-//-----------------------------------------------------------------------------
-// CNSmlWLanAdapter* CNSmlWLanAdapter::ChildURIListL( const TDesC& aURI, 
-// const TDesC& aLUID, const CArrayFix<TNSmlDmMappingInfo>& aPreviousURISegmentList, 
-// const TInt aResultsRef, const TInt aStatusRef )
-//-----------------------------------------------------------------------------
-void CNSmlWLanAdapter::ChildURIListL( const TDesC8& aURI, 
-                                      const TDesC8& aLUID, 
-                                      const CArrayFix<TSmlDmMappingInfo>& aPreviousURISegmentList, 
-                                      const TInt aResultsRef, 
-                                      const TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlWLanAdapter::ChildURIListL(): begin");
-    DBG_ARGS8(_S8("WLanAdapter::ChildURIListL - <%S> <%S>"), &aURI, &aLUID );
-    CBufBase* currentUriSegmentList = CBufFlat::NewL( 128 );
-    CleanupStack::PushL( currentUriSegmentList );
-
-    TInt uriSegs = NumOfUriSegs( aURI );
-    TInt luid = GetIdFromLuid( aLUID );
-
-    //AP/<x>/NAPDef/<x>/
-    if( aURI.Match( _L8("AP/*/NAPDef/*") ) != KErrNotFound && uriSegs==4 )
-        {
-        DBG_ARGS8(_S8("WLanAdapter::ChildURIListL->NAPDef - <%S> <%S>"), &aURI, &aLUID );
-        if(luid==KErrNotFound)
-        	  {
-        	  return;
-        	  }
-    	  if( iWlanSettings->RecordExists( luid ) < 0 )
-            {
-            currentUriSegmentList->InsertL( 0, KNSmlNAPDefWlanNode );
-            iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
-            iCallBack->SetResultsL( aResultsRef, *currentUriSegmentList, KNullDesC8 );
-		    _DBG_FILE("CNSmlWLanAdapter::ChildURIListL(): status ok");
-            }
-        else
-            {
-            currentUriSegmentList->InsertL( 0, KNSmlNAPDefWlanNode );
-            currentUriSegmentList->InsertL( currentUriSegmentList->Size(), KNSmlWLan );
-            iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
-            iCallBack->SetResultsL( aResultsRef, *currentUriSegmentList, KNullDesC8 );
-		    _DBG_FILE("CNSmlWLanAdapter::ChildURIListL(): status ok");
-            }
-        }
-
-    //AP/<x>/NAPDef/<x>/WLAN
-    else if (aURI.Match(_L8("AP/*/NAPDef/*/WLAN")) != KErrNotFound && uriSegs == 5 ) 
-        {
-        if( aPreviousURISegmentList.Count() > 0 )
-            {
-            HBufC8 *uriSeg = HBufC8::NewLC(KNSmlMaxURISegLen);
-            TPtr8 uriSegPtr = uriSeg->Des();
-            uriSegPtr = aPreviousURISegmentList.At(0).iURISeg;
-            currentUriSegmentList->InsertL( currentUriSegmentList->Size(), uriSegPtr );
-            CleanupStack::PopAndDestroy( uriSeg ); //uriSeg
-            iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EOk);
-        	iCallBack->SetResultsL(aResultsRef,*currentUriSegmentList,KNullDesC8);
-		    _DBG_FILE("CNSmlWLanAdapter::ChildURIListL(): status ok");
-            }
-        else
-            {
-            if(luid==KErrNotFound)
-        	      {
-        	      return;
-        	      }	
-            if( iWlanSettings->RecordExists( luid ) < 0)
-                {
-                iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::ENotFound);
-                _DBG_FILE("CNSmlWLanAdapter::ChildURIListL(): status: Not found");
-                }
-            else
-                {
-                _LIT8(Kprev,"WLId");
-                TBuf8<9> addNAME(Kprev); // WLId
-                addNAME.AppendNumFixedWidth(luid,EDecimal,3);
-
-                currentUriSegmentList->InsertL(currentUriSegmentList->Size(),addNAME);
-                currentUriSegmentList->InsertL(currentUriSegmentList->Size(),_L8("/"));
-
-                TBuf8<80> addURI; // AP/<x>/NapDef/<x>/WLAN/WLIdnnn , n=aLUID
-                addURI.Append(aURI);
-                addURI.Append(_L8("/WLId"));
-                addURI.AppendNumFixedWidth(luid,EDecimal,3);
-
-                TBuf8<16> addLUID;
-                _LIT8(KFormat,"%d");
-                addLUID.Format(KFormat,luid);
-        
-                // Also added to mapping
-                DBG_ARGS8(_S8("WLanAdapter::ChildURIListL - mapping uri: <%S> to luid: <%S>"), &addURI, &addLUID );
-                DBG_ARGS8(_S8("Parameters - <%S> <%S>"), &aURI, &aLUID );
-                iCallBack->SetMappingL(addURI,addLUID);
-                iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EOk);
-        		iCallBack->SetResultsL(aResultsRef,*currentUriSegmentList,KNullDesC8);
-		    	_DBG_FILE("CNSmlWLanAdapter::ChildURIListL(): status ok");
-                }
-            }        
-        }
-
-    //AP/<x>/NAPDef/<x>/WLAN/<x>
-    else if( aURI.Match( _L8("AP/*/NAPDef/*/WLAN/*") ) != KErrNotFound && uriSegs==6 )
-        {
-        DBG_ARGS8(_S8("WLanAdapter::ChildURIListL->NAPDef - <%S> <%S>"), &aURI, &aLUID );
-        if(luid==KErrNotFound)
-        	  {
-        	  return;
-        	  }
-        if( iWlanSettings->RecordExists( luid ) < 0 )
-            {
-            iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-            _DBG_FILE("CNSmlWLanAdapter::ChildURIListL(): ENotFound end");
-            }
-        else
-            {
-            currentUriSegmentList->InsertL( currentUriSegmentList->Size(), KNSmlWLanListOfLeafs );
-            iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
-            iCallBack->SetResultsL( aResultsRef, *currentUriSegmentList, KNullDesC8 );
-            _DBG_FILE("CNSmlWLanAdapter::ChildURIListL(): status ok");
-            }
-        }
-
-    
-    //AP/<x>/NAPDef/<x>/WLAN/<x>/WEPKey
-    else if( aURI.Match( _L8("AP/*/NAPDef/*/WLAN/*/WEPKey") ) != KErrNotFound && uriSegs==7 )
-        {
-        DBG_ARGS8(_S8("WLanAdapter::ChildURIListL->WEPKey - <%S> <%S> <%D> <%D>"), &aURI, &aLUID, aResultsRef, aStatusRef );
-
-        for( TInt i=0; i<4; i++ )
-            {
-            if( aPreviousURISegmentList.Count()>i )
-                {
-                HBufC8 *uriSeg = HBufC8::NewLC( KNSmlMaxURISegLen) ;
-                TPtr8 uriSegPtr = uriSeg->Des();
-                uriSegPtr = aPreviousURISegmentList.At(i).iURISeg;
-                
-                currentUriSegmentList->InsertL( currentUriSegmentList->Size(),uriSegPtr );
-                currentUriSegmentList->InsertL( currentUriSegmentList->Size(),_L8( "/" ) );
-                CleanupStack::PopAndDestroy(); //uriSeg
-                }
-            else
-                {
-                TBuf8<25> addNAME;
-                addNAME.Append( _L8("WKId") );
-                addNAME.AppendNum( i+1 );
-                addNAME.Append( _L8("/") );
-
-                currentUriSegmentList->InsertL( currentUriSegmentList->Size(),addNAME );
-                }
-            }
-
-        iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
-        iCallBack->SetResultsL( aResultsRef, *currentUriSegmentList, KNullDesC8 );           
-        _DBG_FILE("CNSmlWLanAdapter::ChildURIListL(): status ok");
-        }
-
-    //AP/<x>/NAPDef/<x>/WEPKey/<x>
-    else if( aURI.Match( _L8("AP/*/NAPDef/*/WLAN/*/WEPKey/*") ) != KErrNotFound && uriSegs==8 )
-        {
-        DBG_ARGS8(_S8("WLanAdapter::ChildURIListL->WEPKey/* - <%S> <%D>"), &aURI, luid );
-        if(luid==KErrNotFound)
-        	  {
-        	  return;
-        	  }
-        if( iWlanSettings->RecordExists( luid ) < 0 )
-            {
-            //wlan settings not found for aLUID
-            iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-            _DBG_FILE("CNSmlWLanAdapter::ChildURIListL(): ENotFound end");
-            }
-        else
-            {
-            TInt wepKeyId = GetWepKeyIdFromLuid( aLUID );
-            if( wepKeyId == KErrNotFound )
-                {
-                wepKeyId = GetWepKeyIdFromUri( aURI );
-
-                TBuf8<80> addLUID; // AP/<x>/NapDef/<x>/WLAN/<x>/WEPKey/WKIdnnn
-                addLUID.AppendNum( wepKeyId );
-                addLUID.AppendNumFixedWidth( luid, EDecimal, 3 );
-
-                DBG_ARGS8(_S8("WLanAdapter::ChildURIListL - mapping uri: <%S> to luid: <%S>"), &aURI, &addLUID );
-                DBG_ARGS8(_S8("Parametrit - <%S> <%S>"), &aURI, &addLUID );
-                iCallBack->SetMappingL(aURI, addLUID);
-                }
-
-            currentUriSegmentList->InsertL( currentUriSegmentList->Size(), KNSmlWLanListOfWepKeyLeafs );
-            iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
-            iCallBack->SetResultsL( aResultsRef, *currentUriSegmentList, KNullDesC8 );
-            _DBG_FILE("CNSmlWLanAdapter::ChildURIListL(): status ok");
-            }
-        }
-
-    //AP/<x>/NAPDef/<x>/WLAN/<x>/SecondarySSID/
-    else if( aURI.Match( _L8("AP/*/NAPDef/*/WLAN/*/SecondarySSID") ) != KErrNotFound && uriSegs==7 )
-        {
-        DBG_ARGS8(_S8("WLanAdapter::ChildURIListL->EAP - <%S> <%S> <%D> <%D>"), &aURI, &aLUID, aResultsRef, aStatusRef );
-        if( aPreviousURISegmentList.Count() > 0 )
-            {
-            HBufC8 *uriSeg = HBufC8::NewLC(KNSmlMaxURISegLen);
-            TPtr8 uriSegPtr = uriSeg->Des();
-            uriSegPtr = aPreviousURISegmentList.At(0).iURISeg;
-            currentUriSegmentList->InsertL( currentUriSegmentList->Size(), uriSegPtr );
-            CleanupStack::PopAndDestroy( uriSeg ); //uriSeg
-            iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
-        	iCallBack->SetResultsL( aResultsRef, *currentUriSegmentList, KNullDesC8 );           
-        	_DBG_FILE("CNSmlWLanAdapter::ChildURIListL(): status ok");
-            }
-        else
-            {
-            if(luid==KErrNotFound)
-        	      {
-        	      return;
-        	      }
-            if( iWlanSettings->RecordExists( luid ) < 0)
-                {
-                iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::ENotFound);
-                _DBG_FILE("CNSmlWLanAdapter::ChildURIListL(): status: Not found");
-                }
-            else
-                {
-                RArray<TSecondarySSID> secondarySSIDs;
-                CleanupClosePushL( secondarySSIDs );
-                iWlanSettings->GetSecondarySSIDListL(luid, secondarySSIDs);
-                TInt count = secondarySSIDs.Count();
-                _LIT8(KPrefixSSID,"SecSSID");
-                TBuf8<5> addNAME; // number
-                for (TInt i=0;i<count;i++)
-                    {
-                    if (i != 0) // Don't do it in first iteration, but with all the following
-                        {
-                        currentUriSegmentList->InsertL(currentUriSegmentList->Size(),_L8("/"));
-                        }
-                    currentUriSegmentList->InsertL(currentUriSegmentList->Size(),KPrefixSSID);
-                    addNAME.Zero();
-                    addNAME.AppendNumFixedWidth(secondarySSIDs[i].Id ,EDecimal,3);
-                    currentUriSegmentList->InsertL(currentUriSegmentList->Size(),addNAME);
-                    }
-                CleanupStack::PopAndDestroy(&secondarySSIDs);
-                iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
-        		iCallBack->SetResultsL( aResultsRef, *currentUriSegmentList, KNullDesC8 );           
-        		_DBG_FILE("CNSmlWLanAdapter::ChildURIListL(): status ok");
-                }
-            }       
-        }
-    //AP/<x>/NAPDef/<x>/WLAN/<x>/SecondarySSID/*
-    else if( aURI.Match( _L8("AP/*/NAPDef/*/WLAN/*/SecondarySSID/*") ) != KErrNotFound && uriSegs==8 )
-        {
-        DBG_ARGS8(_S8("WLanAdapter::ChildURIListL->SecondarySSID/* - <%S> <%D>"), &aURI, luid );
-        if(luid==KErrNotFound)
-        	  {
-        	  return;
-        	  }
-        if( iWlanSettings->RecordExists( luid ) < 0 )
-            {
-            //wlan settings not found for aLUID
-            iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-            _DBG_FILE("CNSmlWLanAdapter::ChildURIListL(): ENotFound end");
-            }
-        else
-            {
-            currentUriSegmentList->InsertL( currentUriSegmentList->Size(), KNSmlWLanListOfSecondaryLeafs );
-            iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
-            iCallBack->SetResultsL( aResultsRef, *currentUriSegmentList, KNullDesC8 );
-            _DBG_FILE("CNSmlWLanAdapter::ChildURIListL(): status ok");
-            }
-        }
-    //AP/<x>/NAPDef/<x>/WLAN/<x>/EAP
-    else if( aURI.Match( _L8("AP/*/NAPDef/*/WLAN/*/EAP") ) != KErrNotFound && uriSegs==7 )
-        {        
-        DBG_ARGS8(_S8("WLanAdapter::ChildURIListL->EAP - <%S> <%S> <%D> <%D>"), &aURI, &aLUID, aResultsRef, aStatusRef );
-        
-        // Need to get the service id from parent node
-		luid = GetServiceIdFromUriL ( aURI );
-		
-		if(luid==KErrNotFound)
-        	  {
-        	  return;
-        	  }
-		if( iWlanSettings->RecordExists( luid ) < 0 )
-            {
-            //wlan settings not found for aLUID
-            iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-            _DBG_FILE("CNSmlWLanAdapter::ChildURIListL(): ENotFound end");
-            }
-        else
-        	{
-	        iWlanSettings->InstalledEAPsL(*currentUriSegmentList);
-
-    	    iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
-	        iCallBack->SetResultsL( aResultsRef, *currentUriSegmentList, KNullDesC8 );           
-	        _DBG_FILE("CNSmlWLanAdapter::ChildURIListL(): status ok");        	
-        	}
-        }
-    //AP/<x>/NAPDef/<x>/WLAN/<x>/EAP/<x>
-    else if( aURI.Match( _L8("AP/*/NAPDef/*/WLAN/*/EAP/*") ) != KErrNotFound && uriSegs==8 )
-        {
-		// Need to get the service id from parent node
-		luid = GetServiceIdFromUriL ( aURI );
-		
-        DBG_ARGS8(_S8("WLanAdapter::ChildURIListL->EAP/* - <%S> <%D>"), &aURI, luid );
-        if( iWlanSettings->RecordExists( luid ) < 0 )
-            {
-            //wlan settings not found for aLUID
-            iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-            _DBG_FILE("CNSmlWLanAdapter::ChildURIListL(): ENotFound end");
-            }
-        else
-            {
-            currentUriSegmentList->InsertL( currentUriSegmentList->Size(), KNSmlWLanListOfEAPLeafs );
-            iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
-            iCallBack->SetResultsL( aResultsRef, *currentUriSegmentList, KNullDesC8 );
-            _DBG_FILE("CNSmlWLanAdapter::ChildURIListL(): status ok");
-            }
-        }
-    //AP/<x>/NAPDef/<x>/WLAN/<x>/EAP/<x>/Certificate
-    else if( aURI.Match( _L8("AP/*/NAPDef/*/WLAN/*/EAP/*/Certificate") ) != KErrNotFound && uriSegs== 9 )
-        {
-		luid = GetServiceIdFromUriL ( aURI );
-		      
-        DBG_ARGS8(_S8("WLanAdapter::ChildURIListL->Certificate - <%S> <%D>"), &aURI, luid );
-        if( iWlanSettings->RecordExists( luid ) < 0 )
-            {
-            //wlan settings not found for aLUID
-            iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-            _DBG_FILE("CNSmlWLanAdapter::ChildURIListL(): ENotFound end");
-            }
-        else
-            {
-            TInt eapId = GetEAPIdFromUri( aURI );
-            
-            // Check if the id contains encapsulating type as well
-            TInt encapsEapId = GetEncapsEAPIdFromUri( aURI );
-            if ( encapsEapId == KErrNotFound )
-            	{
-            	encapsEapId = EAPSettings::EEapNone;
-            	}
-            
-            ResetEAPStructL();
-            TInt err = iWlanSettings->GetEAPSettings(luid, eapId, encapsEapId, *iEAPSettings);
-            if (err != KErrNone || !iEAPSettings->iCertificatesPresent)
-                {
-                iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-                _DBG_FILE("CNSmlWLanAdapter::ChildURIListL(): ENotFound end");
-                }
-            else
-                {
-                TInt certCount = iEAPSettings->iCertificates.Count();
-                HBufC8* pBuf = HBufC8::NewLC(KNSmlMaxURISegLen);
-                TPtr8 ptrCerts = pBuf->Des();
-                for (TInt i=0; i<certCount; i++)
-                    {
-                    ptrCerts.Append(_L8("CertId"));
-                    ptrCerts.AppendNumFixedWidth( i+1, EDecimal, 3);
-                    ptrCerts.Append( _L8("/") );
-                    }
-                
-                currentUriSegmentList->InsertL( currentUriSegmentList->Size(), ptrCerts );
-                CleanupStack::PopAndDestroy(pBuf); // pBuf
-                iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
-            	iCallBack->SetResultsL( aResultsRef, *currentUriSegmentList, KNullDesC8 );
-            	_DBG_FILE("CNSmlWLanAdapter::ChildURIListL(): status ok");
-                }
-            }
-        }
-    //AP/<x>/NAPDef/<x>/WLAN/<x>/EAP/<x>/Certificate/<x>
-    else if( aURI.Match( _L8("AP/*/NAPDef/*/WLAN/*/EAP/*/Certificate/*") ) != KErrNotFound && uriSegs==10 )
-        {
-        DBG_ARGS8(_S8("WLanAdapter::ChildURIListL->EAP/* - <%S> <%D>"), &aURI, luid );
-        TInt eapId = GetEAPIdFromUri(aURI);
-        // Check if the id contains encapsulating type as well
-        TInt encapsEapId = GetEncapsEAPIdFromUri( aURI );
-        if ( encapsEapId == KErrNotFound )
-        	{
-        	encapsEapId = EAPSettings::EEapNone;
-        	}
-
-        ResetEAPStructL();
-        TInt err = iWlanSettings->GetEAPSettings(luid, eapId, encapsEapId, *iEAPSettings);
-        if (err != KErrNone || !iEAPSettings->iCertificatesPresent)
-            {
-            iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-            _DBG_FILE("CNSmlWLanAdapter::ChildURIListL(): ENotFound end");            
-            }
-        else
-          	{
-	        currentUriSegmentList->InsertL( currentUriSegmentList->Size(), KNSmlWLanListOfCertificateLeafs );
-	        iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
-	        iCallBack->SetResultsL( aResultsRef, *currentUriSegmentList, KNullDesC8 );
-	        _DBG_FILE("CNSmlWLanAdapter::ChildURIListL(): status ok");  	
-          	}                      
-        }
-
-
-    CleanupStack::PopAndDestroy( currentUriSegmentList );
-
-    _DBG_FILE("CNSmlWLanAdapter::ChildURIListL(): end");
-    }
-
-//-----------------------------------------------------------------------------
-// void CNSmlWLanAdapter::AddNodeObjectL( const TDesC& aURI, const TDesC& aParentLUID, 
-// const TInt aStatusRef )
-//-----------------------------------------------------------------------------
-void CNSmlWLanAdapter::AddNodeObjectL( const TDesC8& aURI, 
-                                       const TDesC8& aParentLUID, 
-                                       const TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlWLanAdapter::AddNodeObjectL(): begin");
-    DBG_ARGS8(_S8("WLanAdapter::AddNodeObjectL - uri: <%S> to aParentLuid: <%S>"), 
-                &aURI, &aParentLUID );
-
-    TInt uriSegs = NumOfUriSegs( aURI );
-    if( (aURI.Match (_L8( "AP/*/NAPDef/*/WLAN") ) != KErrNotFound && uriSegs == 5 )
-    	|| (aURI.Match (_L8( "AP/*/NAPDef/*/WLAN/*/EAP") ) != KErrNotFound && uriSegs == 7 )
-    	|| (aURI.Match (_L8( "AP/*/NAPDef/*/WLAN/*/EAP/*/Certificate") ) != KErrNotFound && uriSegs == 9 ) )
-        {
-        iCallBack->SetMappingL( aURI, aParentLUID );
-        iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
-        return;
-        }
-
-    //Add new wlan settings
-    else if( aURI.Match( _L8("AP/*/NAPDef/*/WLAN/*") ) != 
-            KErrNotFound && NumOfUriSegs( aURI ) == 6 )
-        {
-        iSettings->Id = 0;
-        iSettings->ServiceID = DesToInt( aParentLUID ); 
-        iSettings->ConnectionMode = 0;
-      	iSettings->SSID = TPtrC(KNSmlWLanDefaultSSID);
-        iSettings->UsedSSID = _L("");
-        iSettings->ScanSSID = 0;
-        iSettings->WepKey1 = _L8("");
-        iSettings->WepKey2 = _L8("");
-        iSettings->WepKey3 = _L8("");
-        iSettings->WepKey4 = _L8("");
-        iSettings->WepIndex = 0;
-        iSettings->SecurityMode = EAllowUnsecure;
-        iSettings->WPAPreSharedKey = _L8("");
-        iSettings->UseWPAPSK = 0;
-        iSettings->EapList = _L("");
-        iSettings->AuthMode = 0;                
-
-        TInt err = iWlanSettings->WriteWlanSettings( *iSettings );
-        if( err != KErrNone )
-            {
-            iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-            return;
-            }
-
-        DBG_ARGS8(_S8("WLanAdapter::AddNodeObjectL - mapping uri: <%S> to luid: <%S>"), &aURI, &aParentLUID );
-        iCallBack->SetMappingL( aURI, aParentLUID );
-        iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
-        }
-
-    else if( aURI.Match( _L8("AP/*/NAPDef/*/WLAN/*/WEPKey") ) != KErrNotFound && uriSegs == 7 )
-        {
-        if( iWlanSettings->RecordExists( DesToInt( aParentLUID ) ) )
-            iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
-        else
-            iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-        return;
-        }
-
-    //Add wep key for existing record
-    else if( aURI.Match( _L8("AP/*/NAPDef/*/WLAN/*/WEPKey/*") ) != KErrNotFound && uriSegs == 8 )
-        {
-        for( TInt i=0; i<iBuffer->Count(); i++ )
-            {
-            if( iBuffer->At(i).iUri->Match( aURI ) != KErrNotFound )
-                {
-                iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EAlreadyExists );
-
-                _DBG_FILE("CNSmlWLanAdapter::AddNodeObjectL(): EAlreadyExists");
-                return;
-                }
-            }
-        DBG_ARGS8(_S8("WLanAdapter::Bufferiin - uri: <%S> to aParentLuid: <%S>"), &aURI, &aParentLUID );
-
-        TNSmlWepKeyBufferElement newNode;
-        newNode.iUri = aURI.AllocLC();
-        newNode.iData = 0;
-        newNode.iWepKeyId = 0;
-        //newNode.iUseWPAPSK = 0;
-        newNode.iIdStatusRef = 0;
-        newNode.iDataStatusRef = 0;
-        newNode.iLengthStatusRef = 0;
-        newNode.iNodeStatusRef = aStatusRef;
-        newNode.iExecuted = EFalse;
-        newNode.iDataSet = EFalse;
-        newNode.iLuid = DesToInt( aParentLUID );
-        iBuffer->AppendL( newNode );
-
-        CleanupStack::Pop( );   //newNode.iUri
-
-        _DBG_FILE("CNSmlWLanAdapter::AddNodeObjectL(): end");
-        return;
-        }
-
-    else if( aURI.Match( _L8("AP/*/NAPDef/*/WLAN/*/SecondarySSID/*") ) != 
-            KErrNotFound && NumOfUriSegs( aURI ) == 8 )
-        {
-        /*
-        TSecondarySSID ssid;
-        ssid.ScannedId = KNullDesC;
-        ssid.UsedId = KNullDesC;
-        TInt luid = GetIdFromLuid( aParentLUID );
-        TInt retval = iWlanSettings->WriteSecondarySSIDL(luid, ssid, ETrue);*/
-        
-        TNSmlSecondarySSIDBufferElement *newSecNode =  new (ELeave) TNSmlSecondarySSIDBufferElement;;
-        newSecNode->iUri = aURI.AllocLC();
-        newSecNode->ScannedId = KNullDesC;
-        newSecNode->UsedId = KNullDesC;
-        newSecNode->iExecuted = EFalse;
-        newSecNode->wlanLuid = GetIdFromLuid( aParentLUID );
-        iSecondaryBuffer.AppendL( newSecNode );
-        CleanupStack::Pop( );   //newNode.iUri
-        return;
-        }
-
-    else if( aURI.Match( _L8("AP/*/NAPDef/*/WLAN/*/EAP/*") ) != 
-            KErrNotFound && NumOfUriSegs( aURI ) == 8 )
-        {
-        TInt eapTypeId = GetEAPIdFromUri(aURI);
-		TInt encapsEapId = GetEncapsEAPIdFromUri( aURI );
-        if ( encapsEapId == KErrNotFound )
-        	{
-        	encapsEapId = EAPSettings::EEapNone;
-        	}
-        
-                    
-        TInt WLANServiceId = GetServiceIdFromUriL ( aURI );
-        
-        if ( WLANServiceId == KErrNotFound )
-        	{
-        	_DBG_FILE("CNSmlWLanAdapter::AddNodeObjectL(): Could not find WLAN service ID from URI.");
-        	User::Leave( KErrNotFound );
-        	}
-        
-        TInt i(0);
-        // Check if the buffer for this EAP already exists
-        for ( i = 0 ; i < iEAPBuffer.Count() ; i++ )
-            {
-            if ( eapTypeId == iEAPBuffer[i]->iEAPSettings->iEAPType
-                && encapsEapId == iEAPBuffer[i]->iEncapsulatingEAPId )
-                {
-                // The correct buffer was found.                
-                _DBG_FILE("CNSmlWLanAdapter::AddNodeObjectL(): Found existing buffer.");
-                break;                              
-                }
-            }
-        // buffer did not exist. Update the existing buffer
-        if ( i == iEAPBuffer.Count() )
-            {   
-            TNSmlEAPBufferElement* buffer = new (ELeave) TNSmlEAPBufferElement;
-            CleanupStack::PushL( buffer );
-       	
-            buffer->iEAPSettings = new (ELeave) EAPSettings;
-            CleanupStack::PushL( buffer->iEAPSettings );
-	                
-            buffer->iEAPSettings->iEAPType = static_cast<EAPSettings::TEapType> (eapTypeId);        
-            buffer->iStatusRefArray.AppendL(aStatusRef);
-            buffer->iWLANServiceId = WLANServiceId;
-            buffer->iEncapsulatingEAPId = static_cast<EAPSettings::TEapType>(encapsEapId);
-            iEAPBuffer.AppendL(buffer);       
-
-            CleanupStack::Pop( buffer->iEAPSettings );
-            CleanupStack::Pop( buffer );
-            }
-        
-        // Set the mapping luid to be the index to the iEAPBuffer
-        TBuf8<2> luid;
-        luid.Num( iEAPBuffer.Count() - 1 );
-        DBG_ARGS8(_S8("WLanAdapter::AddNodeObjectL - mapping uri: <%S> to luid: <%S>"), &aURI, &luid );
-        iCallBack->SetMappingL( aURI, luid);
-            
-        }
-    else if( aURI.Match( _L8("AP/*/NAPDef/*/WLAN/*/EAP/*/Certificate/*") ) != 
-            KErrNotFound && NumOfUriSegs( aURI ) == 10 )
-        {
-		TPtrC8 ptr = NSmlDmURI::ParentURI( aURI );
-		TPtrC8 ptr2 = NSmlDmURI::ParentURI( ptr );
-							
-       	HBufC8* eapLuidBuf = iCallBack->GetLuidAllocL( ptr2 );
-		
-		TInt index = GetIdFromLuid( *eapLuidBuf );
-        
-        delete eapLuidBuf;
-        
-  		CertificateEntry entry;
-		iEAPBuffer[index]->iEAPSettings->iCertificates.AppendL(entry);
-		iEAPBuffer[index]->iEAPSettings->iCertificatesPresent = ETrue;
-        iEAPBuffer[index]->iStatusRefArray.AppendL(aStatusRef);
-        
-        TBuf8<2> luid;
-		luid.Num( iEAPBuffer[index]->iEAPSettings->iCertificates.Count() - 1 );
-		
-        DBG_ARGS8(_S8("WLanAdapter::AddNodeObjectL - mapping uri: <%S> to luid: <%S>"), &aURI, &luid );
-        iCallBack->SetMappingL( aURI, luid);
-        }
-    _DBG_FILE("CNSmlWLanAdapter::AddNodeObjectL(): end");
-    }
-    
-//------------------------------------------------------------------------------
-// CNSmlWLanAdapter::ExecuteCommandL
-// not supported
-//------------------------------------------------------------------------------
-void CNSmlWLanAdapter::ExecuteCommandL( const TDesC8& /*aURI*/, 
-                              const TDesC8& /*aLUID*/,
-                              const TDesC8& /*aArgument*/, 
-                              const TDesC8& /*aType*/,
-                              TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlWLanAdapter::ExecuteCommandL(): begin");
-    iCallBack->SetStatusL(aStatusRef, CSmlDmAdapter::EError);
-    _DBG_FILE("CNSmlWLanAdapter::ExecuteCommandL(): end");
-    }
-
-//------------------------------------------------------------------------------
-// CNSmlWLanAdapter::ExecuteCommandL ( .. RWriteStream ..)
-// not supported
-//------------------------------------------------------------------------------
-void CNSmlWLanAdapter::ExecuteCommandL( const TDesC8& /*aURI*/, 
-                              const TDesC8& /*aLUID*/,
-                              RWriteStream*& /*aStream*/, 
-                              const TDesC8& /*aType*/,
-                              TInt aStatusref )
-    {
-    _DBG_FILE("CNSmlWLanAdapter::ExecuteCommandL(): begin");
-    iCallBack->SetStatusL(aStatusref, CSmlDmAdapter::EError);
-    _DBG_FILE("CNSmlWLanAdapter::ExecuteCommandL(): end");
-    }
-
-//------------------------------------------------------------------------------
-// CNSmlWLanAdapter::CopyCommandL
-// not supported
-//------------------------------------------------------------------------------
-void CNSmlWLanAdapter::CopyCommandL( const TDesC8& /*aTargetURI*/,
-                                     const TDesC8& /*aTargetLUID*/,
-                                     const TDesC8& /* aSourceURI*/,
-                                     const TDesC8& /*aSourceLUID*/, 
-                                     const TDesC8& /*aType*/,
-                                     TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlWLanAdapter::CopyCommandL(): begin");
-    iCallBack->SetStatusL(aStatusRef, CSmlDmAdapter::EError);
-    _DBG_FILE("CNSmlWLanAdapter::CopyCommandL(): end");
-    }
-//------------------------------------------------------------------------------
-// CNSmlWLanAdapter::StartAtomicL
-// not supported
-//------------------------------------------------------------------------------
-void CNSmlWLanAdapter::StartAtomicL()
-    {
-    _DBG_FILE("CNSmlWLanAdapter::StartAtomicL(): begin");
-    _DBG_FILE("CNSmlWLanAdapter::StartAtomicL(): end");
-    }
-
-//------------------------------------------------------------------------------
-// CNSmlWLanAdapter::CommitAtomicL
-// not supported
-//------------------------------------------------------------------------------
-void CNSmlWLanAdapter::CommitAtomicL()
-    {
-    _DBG_FILE("CNSmlWLanAdapter::CommitAtomicL(): begin");
-    _DBG_FILE("CNSmlWLanAdapter::CommitAtomicL(): end");
-    }
-
-//------------------------------------------------------------------------------
-// CNSmlWLanAdapter::RollbackAtomicL
-// returns EError
-//------------------------------------------------------------------------------
-void CNSmlWLanAdapter::RollbackAtomicL()
-    {
-    _DBG_FILE("CNSmlWLanAdapter::RollbackAtomicL(): begin");
-    _DBG_FILE("CNSmlWLanAdapter::RollbackAtomicL(): end");
-    }
-
-//------------------------------------------------------------------------------
-// CNSmlWLanAdapter::StreamingSupport
-// returns EFalse
-//------------------------------------------------------------------------------
-
-TBool CNSmlWLanAdapter::StreamingSupport( TInt& /*aItemSize*/ )
-    {
-    _DBG_FILE("CNSmlWLanAdapter::StreamingSupport(): begin");
-    _DBG_FILE("CNSmlWLanAdapter::StreamingSupport(): end");
-    return EFalse;
-    }
-
-//------------------------------------------------------------------------------
-// CNSmlWLanAdapter::StreamCommittedL
-// not used in this adapter
-//------------------------------------------------------------------------------
-
-void CNSmlWLanAdapter::StreamCommittedL()
-    {
-    _DBG_FILE("CNSmlWLanAdapter::StreamCommittedL(): begin");
-    _DBG_FILE("CNSmlWLanAdapter::StreamCommittedL(): end");
-    }
-
-//-----------------------------------------------------------------------------
-// CNSmlWLanAdapter* CNSmlWLanAdapter::CompleteOutstandingCmdsL( )
-//-----------------------------------------------------------------------------
-void CNSmlWLanAdapter::CompleteOutstandingCmdsL( )
-    {
-    _DBG_FILE("CNSmlWLanAdapter::CompleteOutStandingCmdsL(): begin");
-
-    ExecuteBufferL( ETrue );
-
-    _DBG_FILE("CNSmlWLanAdapter::CompleteOutStandingCmdsL(): end");
-    }
-
-// ------------------------------------------------------------------------------------------------
-// TPtrC8 CNSmlWLanAdapter::GetLastUriSeg(const TDesC8& aURI)
-// Returns only the last uri segemnt
-// ------------------------------------------------------------------------------------------------
-TPtrC8 CNSmlWLanAdapter::GetLastUriSeg( const TDesC8& aURI )
-    {
-    _DBG_FILE("CNSmlWLanAdapter::GetLastUriSeg(): begin");
-
-    TInt i;
-    for( i = aURI.Length()-1; i >= 0; i-- )
-        {
-        if( aURI[i] == '/' )
-            {
-            break;
-            }
-        }
-
-    if( i==0 )
-        {
-        _DBG_FILE("CNSmlWLanAdapter::GetLastUriSeg(): end");
-        return aURI;
-        }
-    else
-        {
-        _DBG_FILE("CNSmlWLanAdapter::GetLastUriSeg(): end");
-        return aURI.Mid( i+1 );
-        }
-    }
-
-
-// ------------------------------------------------------------------------------------------------
-// TPtrC16 CNSmlWLanAdapter::RemoveLastURISeg(const TDesC8& aURI)
-// returns parent uri, i.e. removes last uri segment
-// ------------------------------------------------------------------------------------------------
-TPtrC8 CNSmlWLanAdapter::RemoveLastUriSeg(const TDesC8& aURI)
-    {
-    _DBG_FILE("CNSmlWLanAdapter::RemoveLastUriSeg(): begin");
-
-    TInt i;
-    for( i = aURI.Length()-1; i >= 0; i-- )
-        {
-        if(aURI[i] == '/')
-            {
-            break;
-            }
-        }
-
-    _DBG_FILE("CNSmlWLanAdapter::RemoveLastUriSeg(): end");
-    return aURI.Left(i);
-    }
-
-
-// ------------------------------------------------------------------------------------------------
-// TInt CNSmlWLanAdapter::DesToInt( const TDesC8& aLuid )
-// Returns aLuid as integer value
-// ------------------------------------------------------------------------------------------------
-TInt CNSmlWLanAdapter::DesToInt( const TDesC8& aLuid )
-    {
-    _DBG_FILE("CNSmlWLanAdapter::DesToInt(): begin");
-
-    TLex8 lex(aLuid);
-    TInt value = 0;
-    lex.Val( value );
-
-    DBG_ARGS8(_S8("WLanAdapter::DesToInt() - Des: <%S> Int: <%D>"), &aLuid, value );
-    _DBG_FILE("CNSmlWLanAdapter::DesToInt(): end");
-    return value;
-    }
-
-
-// ------------------------------------------------------------------------------------------------
-// HBufC* CNSmlWLanAdapter::IntToDesLC(const TInt aLuid)
-// ------------------------------------------------------------------------------------------------
-HBufC* CNSmlWLanAdapter::IntToDesLC(const TInt aLuid)
-    {
-    _DBG_FILE("CNSmlWLanAdapter::IntToDesLC(): begin");
-
-    HBufC* buf = HBufC::NewLC(10);
-    TPtr ptrBuf = buf->Des();
-    ptrBuf.Num(aLuid);
-
-    _DBG_FILE("CNSmlWLanAdapter::IntToDesLC(): end");
-    return buf;
-    }
-
-// ------------------------------------------------------------------------------------------------
-// HBufC8* CNSmlWLanAdapter::IntToDes8LC(const TInt aLuid)
-// ------------------------------------------------------------------------------------------------
-HBufC8* CNSmlWLanAdapter::IntToDes8LC(const TInt aLuid)
-    {
-    _DBG_FILE("CNSmlWLanAdapter::IntToDes8LC(): begin");
-
-    HBufC8* buf = HBufC8::NewLC(10);
-    TPtr8 ptrBuf = buf->Des();
-    ptrBuf.Num(aLuid);
-    
-    _DBG_FILE("CNSmlWLanAdapter::IntToDes8LC(): end");
-    return buf;
-    }
-
-// ------------------------------------------------------------------------------------------------
-// TInt CNSmlWLanAdapter::NumOfUriSegs( const TDesC8& aUri )
-// Return count of URI segments of aUri
-// ------------------------------------------------------------------------------------------------
-TInt CNSmlWLanAdapter::NumOfUriSegs( const TDesC8& aUri )
-    {
-    _DBG_FILE("CNSmlWLanAdapter::NumOfUriSegs(): begin");
-
-    TInt count = 1;
-    for( TInt i=0; i<aUri.Length(); i++ )
-        {
-        if( aUri[i] == '/' )
-            count ++;
-        }
-
-    _DBG_FILE("CNSmlWLanAdapter::NumOfUriSegs(): end");
-    return count;
-    }
-
-
-// -------------------------------------------------------------------------------------
-// CNSmlWLanAdapter::FillNodeInfoL()
-// Fills the node info in ddf structure
-// -------------------------------------------------------------------------------------
-void CNSmlWLanAdapter::FillNodeInfoL( MSmlDmDDFObject& aNode,
-                                          TSmlDmAccessTypes aAccTypes,
-                                          MSmlDmDDFObject::TOccurence aOccurrence, 
-                                          MSmlDmDDFObject::TScope aScope, 
-                                          MSmlDmDDFObject::TDFFormat aFormat,
-                                          const TDesC8& aDescription )
-                                          
-    {
-    aNode.SetAccessTypesL(aAccTypes);
-    aNode.SetOccurenceL(aOccurrence);
-    aNode.SetScopeL(aScope);
-    aNode.SetDFFormatL(aFormat);
-    if(aFormat!=MSmlDmDDFObject::ENode)
-        {
-        aNode.AddDFTypeMimeTypeL(KNSmlMimeType);
-        }
-    aNode.SetDescriptionL(aDescription);
-    }
-
-
-
-// ------------------------------------------------------------------------------------------------
-// TInt CNSmlWLanAdapter::GetEAPIdFromUri( const TDesC8& aUri )
-// Return WLan ID number from URI
-// ------------------------------------------------------------------------------------------------
-TInt CNSmlWLanAdapter::GetEAPIdFromUri( const TDesC8& aUri )
-    {
-    DBG_ARGS8(_S8("WLanAdapter::GetEAPIdFromUri - <%S>"), &aUri );
-
-    if( aUri.Match( _L8("AP/*/NAPDef/*/WLAN/*/EAP/*") ) == KErrNotFound )
-        {
-        return KErrNotFound;
-        }
-    
-    TInt begin = aUri.Find(_L8("/EAPId")) + 6;
-    if ( begin == KErrNotFound )
-    	{
-    	return KErrNotFound;
-    	}
-
-    TInt eapId = DesToInt( aUri.Mid( begin, 3 ) );    
-    
-    return eapId;
-    }
-
-// ------------------------------------------------------------------------------------------------
-// TInt CNSmlWLanAdapter::GetEncapsEAPIdFromUri( const TDesC8& aUri )
-// Return WLan ID number from URI
-// ------------------------------------------------------------------------------------------------
-TInt CNSmlWLanAdapter::GetEncapsEAPIdFromUri( const TDesC8& aUri )
-    {
-    DBG_ARGS8(_S8("WLanAdapter::GetEncapsEAPIdFromUri - <%S>"), &aUri );
-
-    if( aUri.Match( _L8("AP/*/NAPDef/*/WLAN/*/EAP/EAPId*-*") ) == KErrNotFound )
-        {
-        return KErrNotFound;
-        }
-    
-    TInt begin = aUri.Find(_L8("/EAPId")) + 9;
-    if ( aUri[begin] != '-' )
-    	{
-    	return KErrNotFound;
-    	}
-    begin++;
-    TInt end = -1;
-    TInt count;
-
-    for( count=0; count+begin<aUri.Length(); count++ )
-        {
-        if( aUri[begin+count]=='/' )
-            {
-            end = begin+count;
-            break;
-            }
-        else if( aUri.Length() == begin+count+1 )
-            {
-            count++;
-            end = begin+count;
-            break;
-            }
-        }
-
-    if( end > 0 )
-        {
-        TInt eapId = DesToInt( aUri.Mid( begin, count ) );
-        return eapId;
-        }
-    return KErrNotFound;
-    }
-    
-// ------------------------------------------------------------------------------------------------
-// TInt CNSmlWLanAdapter::GetEAPIdFromUriL( const TDesC8& aUri )
-// Return WLan ID number from URI
-// ------------------------------------------------------------------------------------------------
-TInt CNSmlWLanAdapter::GetServiceIdFromUriL( const TDesC8& aURI)
-    {
-    DBG_ARGS8(_S8("WLanAdapter::GetServiceIdFromUriL - <%S>"), &aURI );
-
-    if( aURI.Match( _L8("AP/*/NAPDef/*/WLAN/*/EAP*") ) == KErrNotFound )
-        {
-        return KErrNotFound;
-        }
-    
-    TInt end = aURI.Find(_L8("/EAP")) + 4;
-    
-    if( end > 0 )
-        {        
-        
-       	HBufC8* luidBuf = iCallBack->GetLuidAllocL( aURI.Left( end ) );
-		
-		TInt serviceId = GetIdFromLuid( *luidBuf );
-        
-	    delete luidBuf;		
-          
-	    return serviceId;        
-        }
- 	return KErrNotFound;        
- }
-
-// ------------------------------------------------------------------------------------------------
-// TInt CNSmlWLanAdapter::GetSecSSIDFromUriL( const TDesC8& aUri )
-// Return WLan ID number from URI
-// ------------------------------------------------------------------------------------------------
-TUint32 CNSmlWLanAdapter::GetSecSSIDFromUriL( const TDesC8& aUri )
-    {
-    DBG_ARGS8(_S8("WLanAdapter::GetSecSSIDFromUriL - <%S>"), &aUri );
-
-    if( aUri.Match( _L8("AP/*/NAPDef/*/WLAN/*/SecondarySSID/*") ) == KErrNotFound )
-        {
-        User::Leave(KErrNotFound);
-        }
-    _LIT8(KSSIDString, "/SecondarySSID/SecSSID");
-    TInt begin = aUri.Find(KSSIDString) + KSSIDString().Length();
-    TInt end = -1;
-    TInt count;
-
-    for( count=0; count+begin<aUri.Length(); count++ )
-        {
-        if( aUri[begin+count]=='/' )
-            {
-            end = begin+count;
-            break;
-            }
-        else if( aUri.Length() == begin+count+1 )
-            {
-            count++;
-            end = begin+count;
-            break;
-            }
-        }
-
-    if( end > 0 )
-        {
-        TLex8 lex(aUri.Mid( begin, count ));
-        TUint32 value = 0;
-        lex.Val( value, EDecimal );
-        return value;
-        }
-    else
-        {
-        User::Leave(KErrNotFound);
-        }
-    return 0;
-    }
-
-
-// ------------------------------------------------------------------------------------------------
-// TInt CNSmlWLanAdapter::GetEAPIdFromUri( const TDesC8& aUri )
-// Return WLan ID number from URI
-// ------------------------------------------------------------------------------------------------
-TInt CNSmlWLanAdapter::GetCertificateIdFromUri( const TDesC8& aUri )
-    {
-    DBG_ARGS8(_S8("WLanAdapter::GetCertificateIdFromUri - <%S>"), &aUri );
-
-    if( aUri.Match( _L8("AP/*/NAPDef/*/WLAN/*/EAP/*/Certificate/*") ) == KErrNotFound )
-        {
-        return KErrNotFound;
-        }
-    _LIT8(KCertString, "/Certificate/CertId");
-    
-    TInt begin = aUri.Find(KCertString);
-    if ( begin == KErrNotFound )
-        {
-        return KErrNotFound;
-        }
-    
-    begin += KCertString().Length();
-    
-    TInt end = -1;
-    TInt count;
-
-    for( count=0; count+begin<aUri.Length(); count++ )
-        {
-        if( aUri[begin+count]=='/' )
-            {
-            end = begin+count;
-            break;
-            }
-        else if( aUri.Length() == begin+count+1 )
-            {
-            count++;
-            end = begin+count;
-            break;
-            }
-        }
-
-    if( end > 0 )
-        {
-        TInt certId = DesToInt( aUri.Mid( begin, count ) );
-        return certId;
-        }
-    return KErrNotFound;
-    }
-
-
-// ------------------------------------------------------------------------------------------------
-// TInt CNSmlWLanAdapter::GetWepKeyIdFromUri( const TDesC8& aUri )
-// Returns WepKey ID number from URI
-// ------------------------------------------------------------------------------------------------
-TInt CNSmlWLanAdapter::GetWepKeyIdFromUri( const TDesC8& aUri )
-    {
-    if( aUri.Match( _L8("AP/*/NAPDef/*/WLAN/*/WEPKey/*") ) == KErrNotFound )
-        {
-        return KErrNotFound;
-        }
-    
-    TInt begin = aUri.Find(_L8("WEPKey/WKId")) + 11;
-    TInt end = -1;
-    TInt count;
-
-    for( count=0; count<aUri.Length()-11; count++ )
-        {
-        if( aUri[begin+count]=='/' )
-            {
-            end = begin+count;
-            break;
-            }
-        
-        else if( aUri.Length() == begin+count+1 )
-            {
-            count ++;
-            end = begin+count;
-            break;
-            }
-        }
-
-    if( end > 0 )
-        {
-        TInt wlanId = DesToInt( aUri.Mid( begin, count ) );
-        return wlanId;
-        }
-    return KErrNotFound;
-    }
-
-// ------------------------------------------------------------------------------------------------
-// TInt CNSmlWLanAdapter::GetWepKeyIdFromLuid( const TDesC8& aLuid )
-// Return id number of wepkey
-// ------------------------------------------------------------------------------------------------
-TInt CNSmlWLanAdapter::GetWepKeyIdFromLuid( const TDesC8& aLuid )
-    {
-    TLex8 iLex( aLuid );
-
-    TInt luid;
-    if (iLex.Val( luid ) == KErrNone)
-        {
-        if( luid > 1000 )
-            {
-            return luid / 1000;
-            }
-        else
-            {
-            return KErrNotFound;
-            }
-        }
-    else
-        {
-        return KErrNotFound;
-        }
-    }
-
-// ------------------------------------------------------------------------------------------------
-// TInt CNSmlWLanAdapter::GetIdFromLuid( const TDesC& aLuid )
-// Return luid of wlan node
-// ------------------------------------------------------------------------------------------------
-TInt CNSmlWLanAdapter::GetIdFromLuid( const TDesC8& aLuid )
-    {
-    TLex8 iLex( aLuid );
-
-    TInt luid;
-    if( iLex.Val(luid) == KErrNone )
-        {
-        if( luid < 1000 )
-            {
-            return luid;
-            }
-        else
-            {
-            TInt tmp = luid / 1000 * 1000; //First number of luid > 1000
-            return luid - tmp;
-            }
-        }
-    else
-        {
-        return KErrNotFound;
-        }
-    }
-
-// ------------------------------------------------------------------------------------------------
-// void CNSmlWLanAdapter::ExecuteBufferL( TBool aFinal )
-// Executes buffered commands from iBuffer
-// ------------------------------------------------------------------------------------------------
-void CNSmlWLanAdapter::ExecuteBufferL( TBool aFinal )
-    {
-    for( TInt index=0; index<iBuffer->Count(); index++ )
-        {
-        DBG_ARGS8(_S8("WLanAdapter::ExecuteBuffer(): Buf count: <%D> index: <%D>"), iBuffer->Count(), index );
-
-        if( iBuffer->At(index).iExecuted )
-            {
-            continue;
-            }
-        TInt err = 0;
-
-        TInt luid = iBuffer->At(index).iLuid;
-        TInt wepKeyId = iBuffer->At(index).iWepKeyId;
-        if( ! wepKeyId && ! aFinal )
-            {
-            continue;
-            }
-
-        if( wepKeyId > 4 ||
-            ! wepKeyId && aFinal )
-            {
-            if( iBuffer->At(index).iDataStatusRef )
-                iCallBack->SetStatusL( iBuffer->At(index).iDataStatusRef, CSmlDmAdapter::EError );
-            if( iBuffer->At(index).iNodeStatusRef )
-                iCallBack->SetStatusL( iBuffer->At(index).iNodeStatusRef, CSmlDmAdapter::EError );
-            if( iBuffer->At(index).iLengthStatusRef )
-                iCallBack->SetStatusL( iBuffer->At(index).iLengthStatusRef, CSmlDmAdapter::EError );
-
-            iBuffer->At(index).iIdStatusRef = 0;
-            iBuffer->At(index).iNodeStatusRef = 0;
-            iBuffer->At(index).iDataStatusRef = 0;
-            iBuffer->At(index).iLengthStatusRef = 0;
-            iBuffer->At(index).iExecuted = ETrue;
-
-            continue;
-            }
-        
-        if( iBuffer->At(index).iDataSet &&
-            iBuffer->At(index).iWepKeyId > 0 )
-            {
-            iWlanSettings->GetWlanSettings( luid, *iSettings );
-
-            switch( wepKeyId )
-                {
-            case 1:
-                iSettings->WepKey1 = iBuffer->At(index).iData->Des();
-                break;
-            case 2:
-                iSettings->WepKey2 = iBuffer->At(index).iData->Des();
-                break;
-            case 3:
-                iSettings->WepKey3 = iBuffer->At(index).iData->Des();
-                break;
-            case 4:
-                iSettings->WepKey4 = iBuffer->At(index).iData->Des();
-                break;
-            default:
-                continue;
-                }
-
-            err = iWlanSettings->WriteWlanSettings( *iSettings );
-            if( err == KErrNone )
-                {
-                iCallBack->SetStatusL( iBuffer->At(index).iDataStatusRef, CSmlDmAdapter::EOk );
-                }
-            else
-                {
-                iCallBack->SetStatusL( iBuffer->At(index).iDataStatusRef, CSmlDmAdapter::EError );
-                }
-
-            iBuffer->At(index).iDataStatusRef = 0;
-            }
-
-        TBuf8<5> addLUID;
-        addLUID.AppendNum( wepKeyId );
-        addLUID.AppendNumFixedWidth( luid, EDecimal, 3 );
-        
-        iCallBack->SetMappingL( iBuffer->At( index).iUri->Des(), addLUID );
-        if( iBuffer->At(index).iIdStatusRef )
-            iCallBack->SetStatusL( iBuffer->At(index).iIdStatusRef, CSmlDmAdapter::EOk );
-        if( iBuffer->At(index).iNodeStatusRef )
-            iCallBack->SetStatusL( iBuffer->At(index).iNodeStatusRef, CSmlDmAdapter::EOk );
-        if( iBuffer->At(index).iLengthStatusRef )
-            iCallBack->SetStatusL( iBuffer->At(index).iLengthStatusRef, CSmlDmAdapter::EOk );
-
-        iBuffer->At(index).iIdStatusRef = 0;
-        iBuffer->At(index).iNodeStatusRef = 0;
-        iBuffer->At(index).iLengthStatusRef = 0;
-        iBuffer->At(index).iExecuted = ETrue;
-        }
-
-    //Clean executed command from buffer
-    for( TInt i=0; i<iBuffer->Count(); i++ )
-        {
-        if( iBuffer->At(i).iExecuted )
-            {
-            if( iBuffer->At(i).iUri )
-                {
-                delete iBuffer->At(i).iUri;
-                iBuffer->At(i).iUri = 0;
-                }
-            if( iBuffer->At(i).iData )
-                {
-                delete iBuffer->At(i).iData;
-                iBuffer->At(i).iData = 0;
-                }
-            iBuffer->Delete(i);
-            iBuffer->Compress();
-            }
-        }
-// Secondary SSID Buffer 
-      for( TInt index=0; index<iSecondaryBuffer.Count(); index++ )
-        {
-        DBG_ARGS8(_S8("WLanAdapter::ExecuteBuffer(): Buf count: <%D> index: <%D>"), iBuffer->Count(), index );
-
-        if( iSecondaryBuffer[index]->iExecuted )
-            {
-            continue;
-            }
-               
-        TSecondarySSID ssid;
-        ssid.ScannedId = iSecondaryBuffer[index]->ScannedId;
-        ssid.UsedId = iSecondaryBuffer[index]->UsedId;
-        
-        DBG_ARGS8(_S8("CWlanadaptes::Execute Buffer - WLAN_SEC_SSID_SCANNED_SSID uri: <%S> ad  WLAN_SEC_SSID_USED_SSID : <%S>"), &iSecondaryBuffer[index]->ScannedId, &iSecondaryBuffer[index]->UsedId );
-        
-        TInt retval = iWlanSettings->WriteSecondarySSIDL(iSecondaryBuffer[index]->wlanLuid, ssid, ETrue);
-        iSecondaryBuffer[index]->iExecuted=ETrue;
-        
-        }
-      // EAP settings
-      for( TInt i = 0 ; i < iEAPBuffer.Count() ; i++ )
-      	{
-      	// Check if this method has encapsulated methods
-      	for ( TInt j = 0; j < iEAPBuffer.Count() ; j++ )
-      		{
-      		if ( iEAPBuffer[i]->iEAPSettings->iEAPType == iEAPBuffer[j]->iEncapsulatingEAPId )
-      			{
-      			// j is encapsulated inside i
-      			iEAPBuffer[i]->iEAPSettings->iEncapsulatedEAPTypes.Append( iEAPBuffer[j]->iEAPSettings->iEAPType );
-				iEAPBuffer[i]->iEAPSettings->iEncapsulatedEAPTypesPresent = ETrue;
-      			}
-      		}
-      	
-      	TRAPD( err, iWlanSettings->GetEAPInterfaceL(iEAPBuffer[i]->iWLANServiceId, 
-      												iEAPBuffer[i]->iEncapsulatingEAPId, 
-      												static_cast<TInt> (iEAPBuffer[i]->iEAPSettings->iEAPType ) ) );
- 		if ( err == KErrNone )
- 			{ 			
- 			err = iWlanSettings->WriteEAPSettings( *iEAPBuffer[i]->iEAPSettings );
- 			}
-      											      											      	
-      	MSmlDmAdapter::TError status;
-      	switch ( err ) 
-      		{
-      			case KErrNotFound:
-      				{
-      				status = CSmlDmAdapter::ENotFound;
-      				break;
-      				}
-      			case KErrNone:
-      				{
-      				status = CSmlDmAdapter::EOk;
-      				break;
-      				}
-      			default:
-      				{
-      				status = CSmlDmAdapter::EError;      				
-      				}
-      		}
-      		
-      	for ( TInt j = 0; j < iEAPBuffer[i]->iStatusRefArray.Count() ; j++)
-      		{
-      			iCallBack->SetStatusL( iEAPBuffer[i]->iStatusRefArray[j], status );	
-      		}      	
-      	}      	
-      	for ( TInt i = 0 ; i < iEAPBuffer.Count() ; i++ )
-    		{
-    		iEAPBuffer[i]->iStatusRefArray.Close();
-    		iEAPBuffer[i]->iEAPSettings->iEncapsulatedEAPTypes.Close();
-    		iEAPBuffer[i]->iEAPSettings->iCipherSuites.Close();
-    		delete iEAPBuffer[i]->iEAPSettings;
-    		iEAPBuffer[i]->iEAPSettings = NULL;
-	    	}
-      	iEAPBuffer.ResetAndDestroy();
-    }
-
-
-//=============================================
-//      CNSmlWLanAdapter::ConvertTo8LC()
-//      Converts string value to 8-bit
-//      
-//=============================================
-TDesC8& CNSmlWLanAdapter::ConvertTo8LC( const TDesC& aSource )
-    {
-    HBufC8* buf = HBufC8::NewLC( aSource.Length()*2);
-    TPtr8 bufPtr = buf->Des();
-    CnvUtfConverter::ConvertFromUnicodeToUtf8( bufPtr, aSource );
-
-    return *buf;
-    }
-
-//=============================================
-//      CNSmlWLanAdapter::ConvertTo16LC()
-//      Converts string value to 16-bit
-//      
-//=============================================
-TDesC16& CNSmlWLanAdapter::ConvertTo16LC( const TDesC8& aSource)
-    {
-    HBufC16* buf16 = HBufC16::NewLC( aSource.Length() );
-    TPtr bufPtr16 = buf16->Des();
-
-    CnvUtfConverter::ConvertToUnicodeFromUtf8(bufPtr16, aSource);
-
-    return *buf16;
-    }
-
-void CNSmlWLanAdapter::ResetEAPStructL()
-    {
-    DeleteEAPStructL();
-    iEAPSettings = new (ELeave) EAPSettings;
-    }
-
-    
-void CNSmlWLanAdapter::DeleteEAPStructL()
-    {
-    if (iEAPSettings != NULL)
-        {        
-        if (iEAPSettings->iCertificatesPresent)
-            {
-            iEAPSettings->iCertificates.Reset();
-            }
-        iEAPSettings->iEncapsulatedEAPTypes.Close();
-        iEAPSettings->iCipherSuites.Close();
-            
-        delete iEAPSettings;
-        iEAPSettings = NULL;
-        }
-    }
-
-
-void CNSmlWLanAdapter::DesToBufferL(CBufBase& aTo, const TDesC& aFrom)
-    {
-    aTo.InsertL( 0, ConvertTo8LC(aFrom) );
-    CleanupStack::PopAndDestroy(); // ConvertTo8LC
-    }
-
-void CNSmlWLanAdapter::FillCipherSuiteBufferL(CBufBase& aBuffer)
-    {
-    if (iEAPSettings == NULL || !iEAPSettings->iCipherSuitesPresent)
-        {
-        return;
-        }
-                        // 0    5    10   15   20   25   30   35
-    _LIT8(KPlus, "+");
-    aBuffer.InsertL(0,KSuitesDefault);
-    TInt count = iEAPSettings->iCipherSuites.Count();
-    for (TInt i=count-1; i>=0;--i)
-        {
-        switch (iEAPSettings->iCipherSuites[i])
-            {
-            case RSA_3DES_SHA:
-                {
-                aBuffer.Write(0, KPlus);
-                break;
-                }
-            case DHE_RSA_3DES_SHA:
-                {
-                aBuffer.Write(5, KPlus);
-                break;
-                }
-            case DHE_DSS_3DES_SHA:
-                {
-                aBuffer.Write(10, KPlus);
-                break;
-                }
-            case RSA_AES_SHA:
-                {
-                aBuffer.Write(15, KPlus);
-                break;
-                }
-            case DHE_RSA_AES_SHA:
-                {
-                aBuffer.Write(20, KPlus);
-                break;
-                }
-            case DHE_DSS_AES_SHA:
-                {
-                aBuffer.Write(25, KPlus);
-                break;
-                }
-            case RSA_RC4_MD5:
-                {
-                aBuffer.Write(30, KPlus);
-                break;
-                }
-            case RSA_RC4_SHA:
-                {
-                aBuffer.Write(35, KPlus);
-                break;
-                }
-            default:
-                {
-                break;
-                }
-                
-            }
-        }
-        
-    }
-
-    
-void CNSmlWLanAdapter::FillCipherSuitesL(const TDesC8& aObject, const TInt aLuid)
-    {
-    if (iEAPBuffer[aLuid] == NULL)
-        {
-        return;
-        }
-    iEAPBuffer[aLuid]->iEAPSettings->iCipherSuites.Reset();
-    iEAPBuffer[aLuid]->iEAPSettings->iCipherSuitesPresent = EFalse; // init to EFalse
-    
-    TChar plus('+');
-    
-    TInt length = aObject.Length();
-    for (TInt i=0; i+3<length;i+=5)
-        {
-        if (aObject[i] == plus)
-            {
-            TLex8 lex(aObject.Mid(i+1, 3));
-            TUint suite;
-            lex.Val(suite);
-            iEAPBuffer[aLuid]->iEAPSettings->iCipherSuites.Append(suite);
-            iEAPBuffer[aLuid]->iEAPSettings->iCipherSuitesPresent = ETrue;
-            }
-        }
-    }
-
-void CNSmlWLanAdapter::ConvertEAPStringToIds( const TDesC8& aEAPString, TDes8& aExpandedId, EAPSettings::TEapType& aId)
-	{
-    if ( aEAPString == KEAPSIM )
-		{	
-		aExpandedId.Copy( KEapSimTypeId, KExpandedEAPIdLength );		
-		aId = EAPSettings::EEapSim;
-		}
-    else if( aEAPString == KEAPAKA )
-        {
-		aExpandedId.Copy( KEapAkaTypeId, KExpandedEAPIdLength );	
-		aId = EAPSettings::EEapAka;	
-        }
-    else if( aEAPString == KEAPTLS )
-        {		
-		aExpandedId.Copy( KEapTlsTypeId, KExpandedEAPIdLength );	
-		aId = EAPSettings::EEapTls;	
-        }
-    else if( aEAPString == KEAPPEAP )
-    	{   
-		aExpandedId.Copy( KEapPeapTypeId, KExpandedEAPIdLength );	
-		aId = EAPSettings::EEapPeap;	
-        }
-    else if( aEAPString == KEAPTTLS )
-        {
-		aExpandedId.Copy( KEapTtlsTypeId, KExpandedEAPIdLength );		
-		aId = EAPSettings::EEapTtls;
-        }
-   else if( aEAPString == KEAPLEAP )
-        {
-		aExpandedId.Copy( KEapLeapTypeId, KExpandedEAPIdLength );
-		aId = EAPSettings::EEapLeap;		
-        }                                    
-   else if( aEAPString == KEAPMSCHAPV2 )
-        {
-		aExpandedId.Copy( KEapMschapv2TypeId, KExpandedEAPIdLength );		
-		aId = EAPSettings::EEapMschapv2;
-        }     
-   else if( aEAPString == KMSCHAPV2 )
-        {
-		aExpandedId.Copy( KMschapv2TypeId, KExpandedEAPIdLength );		
-		aId = EAPSettings::EPlainMschapv2;
-        }     
-   else if( aEAPString == KEAPGTC )
-   		{
-   		aExpandedId.Copy( KEapGtcTypeId, KExpandedEAPIdLength );
-		aId = EAPSettings::EEapGtc;
-        }
-   else if( aEAPString == KEAPFAST )
-        {		
-		aExpandedId.Copy( KEapFastTypeId, KExpandedEAPIdLength );		
-		aId = EAPSettings::EEapFast;
-        }
-   else if( aEAPString == KEAPTTLSPAP )
-       {		
-		aExpandedId.Copy( KTtlspapTypeId, KExpandedEAPIdLength );		
-		aId = static_cast<EAPSettings::TEapType>(98);
-       }
-    else
-        {		
-		aExpandedId.Copy( KEapNoneId, KExpandedEAPIdLength );
-		aId = EAPSettings::EEapNone;
-        }
-
-	}
-
-
-// end of file
--- a/omadm/omadmextensions/adapters/nsmldinternet/src/NSmlWlanSettings.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1732 +0,0 @@
-/*
-* Copyright (c) 2002-2006 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:   Wlan Adapter DB handler
-*
-*/
-
-
-
-
-#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
-#include <commsdat_partner.h>
-#endif
-#include <WlanCdbCols.h>
-#include "NSmlWlanSettings.h"
-#include "NSmlWLanAdapter.h"
-#include "nsmldebug.h"
-#include <comms-infras/commdb/protection/protectdb.h>
-#include <SettingEnforcementInfo.h> // vsettingenforcementinfo
-#include <featmgr.h>
-
-#ifndef __WINS__
-// This lowers the unnecessary compiler warning (armv5) to remark.
-// "Warning:  #174-D: expression has no effect..." is caused by 
-// DBG_ARGS8 macro in no-debug builds.
-#pragma diag_remark 174
-#endif
-
-const TUint KEAPListBufferSize = 128;
-const TUint KLengthOfOldStyleEAPListEntry = 5; // "+xxx,"
-
-const TInt KBeginTransRetryDelay = 1000000; // Delay for comms db begintransaction retry (microseconds)
-const  TInt KBeginTransRetryCount = 7;      // Maximum number of retries
-//-----------------------------------------------------------------------------
-// CWlanAdapter::CWlanSettings( CCommsDatabase& aDatabase )
-//-----------------------------------------------------------------------------
-CWlanSettings::CWlanSettings( CCommsDatabase& aDatabase ) : iDatabase( aDatabase ), iExpandedEAPTypeFieldsUsed( ETrue )
-	{
-	_DBG_FILE("CWlanSettings::CWlanSettings(): begin");
-
-	iTableView = 0;
-	iEapType = NULL;
-	iSecondaryView = NULL;
-
-
-	_DBG_FILE("CWlanSettings::CWlanSettings(): end");
-	}
-
-//-----------------------------------------------------------------------------
-// CWlanAdapter::~CWlanSettings( )
-//-----------------------------------------------------------------------------
-CWlanSettings::~CWlanSettings( )
-	{
-
-	delete iEapType;
-	delete iSecondaryView;
-	delete iTableView;
-	}
-
-//-----------------------------------------------------------------------------
-// CWlanSettings* CWlanSettings::NewL( CCommsDatabase& aDatabase )
-//-----------------------------------------------------------------------------
-CWlanSettings* CWlanSettings::NewL( CCommsDatabase& aDatabase )
-	{
-	_DBG_FILE("CWlanSettings::NewL(): begin");
-
-	CWlanSettings* self = new(ELeave) CWlanSettings( aDatabase );
-
-	CleanupStack::PushL( self );
-	self->ConstructL( );
-	CleanupStack::Pop( self );
-
-	_DBG_FILE("CWlanSettings::NewL(): end");
-	return self;
-	}
-
-//-----------------------------------------------------------------------------
-// void CWlanSettings::ConstructL( )
-//-----------------------------------------------------------------------------
-void CWlanSettings::ConstructL( )
-{
-	_DBG_FILE("CWlanSettings::ConstructL(): begin");
-	_DBG_FILE("CWlanSettings::ConstructL(): end");
-}
-
-
-//-----------------------------------------------------------------------------
-// TInt CWlanSettings::GetWlanSettings( TUint32 aLuid, TWlanSettings& aWlanSettings )
-//-----------------------------------------------------------------------------
-TInt CWlanSettings::GetWlanSettings( TUint32 aLuid, TWlanSettings& aWlanSettings )
-	{
-	_DBG_FILE("CWlanSettings::GetWlanSettings(): begin");
-
-	TRAPD( err, ConnectToDatabaseL() );
-	if( err == KErrNone )
-		{
-		err = GoToRecord( aLuid );
-
-		if( err == KErrNone )
-			{
-			TRAP( err, GetDataFromRecordL( &aWlanSettings ) );			
-			}
-		}
-
-	_DBG_FILE("CWlanSettings::GetWlanSettings(): end");
-	return err;
-	}
-	
-
-//-----------------------------------------------------------------------------
-// TInt CWlanSettings::GetEapSettings( TInt aId, TWlanSettings& aWlanSettings )
-//-----------------------------------------------------------------------------
-TInt CWlanSettings::GetEAPSettings( const TInt aId, const TInt aEapType, const TInt aTunnelingType, EAPSettings& aEapSettings )
-	{
-	_DBG_FILE("CWlanSettings::GetEapSettings(): begin");
-	DBG_ARGS(_S16("aId=%d, eEapType=%d"), aId, aEapType);
-
-	TRAPD( err, GetEAPInterfaceL(aId, aTunnelingType, aEapType) );
-	DBG_ARGS(_S16("GetEAPInterfaceL leaved with %d"), err);
-	if( err == KErrNone )
-		{
-		TRAP(err, iEapType->GetConfigurationL(aEapSettings));
-    	DBG_ARGS(_S16("iEapType->GetConfigurationL leaved with %d"), err);
-		}
-		
-	_DBG_FILE("CWlanSettings::GetEAPSettings(): end");
-	return err;
-	}
-
-
-//-----------------------------------------------------------------------------
-// TInt CWlanSettings::DeleteWlanSettings( TUint32 aLuid )
-//-----------------------------------------------------------------------------
-TInt CWlanSettings::DeleteWlanSettings( TUint32 aLuid )
-	{
-	_DBG_FILE("CWlanSettings::DeleteWlanSettings(): begin");
-	TBool wlanEnforce = EFalse;
-	TInt tableLockError= KErrNone;
-	
-    if(FeatureManager::FeatureSupported(KFeatureIdSapPolicyManagement))
-        {
-        TInt enError = KErrNone;
-        TRAP(enError, wlanEnforce=CheckEnforcementL());
-        DBG_ARGS(_S16("CWlanSettings::DeleteWLANSettings, check enforcement failed. error: <%D>"), enError );
-        if(wlanEnforce)
-            {
-            _DBG_FILE("CWlanSettings::WriteWlanSettings(): wlan enforce is ON ");
-            TRAPD(lockError,tableLockError = PerformLockWLANTablesL(EFalse));
-            if(lockError == KErrNone && tableLockError == KErrNone)
-                {
-                _DBG_FILE("CWlanSettings::WriteWlanSettings(): Table unlcoked successfully ");
-                iWLANRelock = ETrue;	
-                }
-            }
-        }
- 	
-	TRAPD( err, ConnectToDatabaseL() );
-	if( err == KErrNone )
-		{
-		err = GoToRecord( aLuid );
-		if( err == KErrNone )
-			{
-			
-			if(FeatureManager::FeatureSupported(KFeatureIdSapPolicyManagement))
-			    {
-			    if(wlanEnforce)
-			        {
-			        ((CCommsDbProtectTableView*)iTableView)->UnprotectRecord();
-			        }
-			    }
-
-			
-			TInt err = iTableView->UpdateRecord( );
-	        if( err == KErrLocked )
-	             {
-	             _DBG_FILE("DeleteWlanSettings: UpdateRecord was locked.");
-	             TInt retry = KBeginTransRetryCount;            
-	             while ( retry > 0 && err == KErrLocked )
-	                 {
-	                 User::After(KBeginTransRetryDelay);
-	                 _DBG_FILE("DeleteWlanSettings: Slept 1 second. Try again");
-	                 err = iTableView->UpdateRecord();	                 
-	                 retry--;
-	                 }      	                           
-                 if( err != KErrNone )
-                     {
-                     _DBG_FILE("DeleteWlanSettings: UpdateRecord was unsuccessful");
-                     }			
-                 else
-                     {
-                     _DBG_FILE("DeleteWlanSettings: UpdateRecord was successful");
-                     }
-	             }			
-			
-			if( err == KErrNone )
-				{
-				TRAP( err, iTableView->WriteUintL( TPtrC(WLAN_SERVICE_ID), 0 ) );
-				if( err != KErrNone )
-					{
-					if(FeatureManager::FeatureSupported(KFeatureIdSapPolicyManagement))
-					    {
-					    TInt tableLockError= KErrNone;
-					    if(iWLANRelock)
-					        {
-					        TInt lockError = KErrNone;
-					        TRAP(lockError,tableLockError = PerformLockWLANTablesL(ETrue));
-					        ((CCommsDbProtectTableView*)iTableView)->ProtectRecord();
-					        DBG_ARGS(_S16("CWlanSettings::DeleteWLANSettings, WLAN table Lock error. error: <%D>, <%D> "), lockError,tableLockError );
-					        iWLANRelock =EFalse;		             
-					        }
-					    if ( tableLockError != KErrNone ) // to remove warnings
-					        {
-					        tableLockError = KErrNone;
-					        }
-					    }
-					return err;
-					}
-				}
-			err = iTableView->PutRecordChanges( );
-			if( err == KErrLocked )
-                {
-                _DBG_FILE("DeleteWlanSettings: PutRecordChanges was locked.");
-                TInt retry = KBeginTransRetryCount;            
-                while ( retry > 0 && err == KErrLocked )
-                    {
-                    User::After(KBeginTransRetryDelay);
-                    _DBG_FILE("DeleteWlanSettings: Slept 1 second. Try again");
-                    err = iTableView->PutRecordChanges();
-                    retry--;
-                    }                                     
-                if( err != KErrNone )
-                    {
-                    _DBG_FILE("DeleteWlanSettings: PutRecordChanges was unsuccessful");
-                    }
-                else
-                    {
-                    _DBG_FILE("DeleteWlanSettings: PutRecordChanges was successful");
-                    }
-                }
-			
-			if(FeatureManager::FeatureSupported(KFeatureIdSapPolicyManagement))
-			    {
-				TInt tableLockError= KErrNone;
-				if(iWLANRelock)
-					{
-					TInt lockError = KErrNone;
-					TRAP(lockError,tableLockError = PerformLockWLANTablesL(ETrue));
-					DBG_ARGS(_S16("CWlanSettings::DeleteWLANSettings, WLAN table Lock error. error: <%D>, <%D> "), lockError,tableLockError );
-					((CCommsDbProtectTableView*)iTableView)->ProtectRecord();
-					iWLANRelock =EFalse;
-					}
-				if ( tableLockError != KErrNone ) // to remove warnings
-				    {
-				    tableLockError = KErrNone;
-				    }
-			    }   
-
-			
-			if ( err == KErrNone )
-				{
-				// Ignore err on purpose
-				TRAP( err, DeleteSecondarySSIDsL( aLuid ) );				
-    	                    
-	            TRAP( err, DeleteWlanEapSettingsL( aLuid ) );
-				}            
-			}
-		}
-
-
-	_DBG_FILE("CWlanSettings::DeleteWlanSettings(): end");
-	if(FeatureManager::FeatureSupported(KFeatureIdSapPolicyManagement))
-	    {
-	    if(iWLANRelock)
-		    {
-		    TInt lockError = KErrNone;
-		    TRAP(lockError,tableLockError = PerformLockWLANTablesL(ETrue));
-	        DBG_ARGS(_S16("CWlanSettings::DeleteWLANSettings, WLAN table Lock error. error: <%D>, <%D> "), lockError,tableLockError );
-	        ((CCommsDbProtectTableView*)iTableView)->ProtectRecord();
-	        iWLANRelock =EFalse;		   
-		    }
-	    }
-	
-	if (wlanEnforce) 
-		wlanEnforce = EFalse; // to get rid of warnings
-	return err;
-	}
-
-
-
-
-TInt CWlanSettings::DeleteOneSecondarySSIDL( TUint32 aWLANId , TUint32 asecId)
-{
-  
-  	   TInt retval = KErrNone;
-        SetSecondaryViewToRecordL(aWLANId);
-    	retval = iSecondaryView->GotoFirstRecord();
-          
-       while (retval == KErrNone)
-        {
-        TSecondarySSID ssid;
-        TRAP(retval, iSecondaryView->ReadUintL( TPtrC(WLAN_SEC_SSID_ID ),  ssid.Id ));
-        if(ssid.Id == asecId)
-            {
-            //retval = iSecondaryView->UpdateRecord();
-            //if( retval==KErrNone )
-              //  {
-            if(FeatureManager::FeatureSupported(KFeatureIdSapPolicyManagement))
-                {
-    			TBool wlanEnforce = EFalse;
-    			TInt enError = KErrNone;
-    			TRAP(enError, wlanEnforce=CheckEnforcementL());
-    			DBG_ARGS(_S16("CWlanSettings::DeleteWLANSettings, check enforcement failed. error: <%D>"), enError );
-    			if(wlanEnforce)
-    				{
-    				((CCommsDbProtectTableView*)iSecondaryView)->UnprotectRecord();
-    				}
-                }
-
-            retval = iSecondaryView->DeleteRecord();
-            if( retval == KErrLocked )
-                {
-                _DBG_FILE("DeleteOneSecondarySSIDL: DeleteRecord was locked.");
-                TInt retry = KBeginTransRetryCount;            
-                while ( retry > 0 && retval == KErrLocked )
-                    {
-                    User::After(KBeginTransRetryDelay);
-                    _DBG_FILE("DeleteOneSecondarySSIDL: Slept 1 second. Try again");
-                    retval = iSecondaryView->DeleteRecord();
-                    retry--;
-                    }                                    
-                if( retval != KErrNone )
-                    {
-                    _DBG_FILE("DeleteOneSecondarySSIDL: DeleteRecord was unsuccessful");
-                    }
-                else
-                    {
-                    _DBG_FILE("DeleteOneSecondarySSIDL: DeleteRecord was successful");
-                    }
-                }
-                DBG_ARGS(_S16("CWlanSettings::DeleteOneSecondarySSIDL, Secondaryssid delete error: <%D> "), retval );
-
-                //    iTableView->PutRecordChanges( );
-                //}
-
-        	break;
-       	}
-        
-        retval = iSecondaryView->GotoNextRecord();
-        }
-        
-	return retval;
-}
-
-TInt CWlanSettings::DeleteSecondarySSIDsL( TUint32 aWLANId )
-    {
-    TInt retVal(KErrNone);
-	if (iSecondaryView == NULL)
-	    {
-	    SetSecondaryViewToRecordL(aWLANId);
-	    }
-	else 
-	    {
-	    retVal = iSecondaryView->GotoFirstRecord();
-	    TUint32 secId = 0;
-	    if (retVal == KErrNone)
-	        {
-	        iSecondaryView->ReadUintL( TPtrC(WLAN_SEC_SSID_SERVICE_ID), secId );
-	        }
-	    if (secId != aWLANId)
-	        {
-	        SetSecondaryViewToRecordL(aWLANId);
-	        }
-	    }
-	    
-    TInt err = iSecondaryView->GotoFirstRecord();
-    while (err == KErrNone)
-        {
-        if(FeatureManager::FeatureSupported(KFeatureIdSapPolicyManagement))
-            {
-			TBool wlanEnforce = EFalse;
-			TInt enError = KErrNone;
-			TRAP(enError, wlanEnforce=CheckEnforcementL());
-			DBG_ARGS(_S16("CWlanSettings::DeleteSecondarySSIDsL, check enforcement failed. error: <%D>"), enError );
-			if(wlanEnforce)
-				{
-				((CCommsDbProtectTableView*)iSecondaryView)->UnprotectRecord();
-				}
-            }
-		retVal = iSecondaryView->DeleteRecord();
-        if( retVal == KErrLocked )
-             {
-             _DBG_FILE("DeleteSecondarySSIDsL: DeleteRecord was locked.");
-             TInt retry = KBeginTransRetryCount;            
-             while ( retry > 0 && retVal == KErrLocked )
-                 {
-                 User::After(KBeginTransRetryDelay);
-                 _DBG_FILE("DeleteSecondarySSIDsL: Slept 1 second. Try again");
-                 retVal = iSecondaryView->DeleteRecord();
-                 retry--;
-                 }                                   
-             if( retVal != KErrNone )
-                 {
-                 _DBG_FILE("DeleteSecondarySSIDsL: DeleteRecord was unsuccessful");
-                 }
-             else
-                 {
-                 _DBG_FILE("DeleteSecondarySSIDsL: DeleteRecord was successful");     
-                 }
-             }
-		DBG_ARGS(_S16("CWlanSettings::DeleteSecondarySSIDsL, Secondaryssid delete error: <%D> "), retVal );
-
-		err = iSecondaryView->GotoNextRecord();
-        }
-    
-    return retVal;
-    }
-//-----------------------------------------------------------------------------
-// TInt CWlanSettings::DeleteEapSettings( TInt aWlanId, TInt aEapType )
-//-----------------------------------------------------------------------------
-TInt CWlanSettings::DeleteEAPSettings( TInt aWlanId, TInt aEapType  )
-	{
-	_DBG_FILE("CWlanSettings::DeleteEAPSettings(): begin");
-
-	TRAPD( err, GetEAPInterfaceL(aWlanId, EAPSettings::EEapNone, aEapType) );
-	if( err == KErrNone )
-		{
-		TRAP( err, iEapType->DeleteConfigurationL());
-		if( err != KErrNone )
-		    {
-		    DBG_ARGS(_S16("CWlanSettings::DeleteEAPSettings, delete failed, error: <%D> "), err );
-			return err;
-		    }
-		}
-
-	_DBG_FILE("CWlanSettings::DeleteEAPSettings(): end");
-	return err;
-	}
-
-//-----------------------------------------------------------------------------
-// TInt CWlanSettings::DeleteWlanEapSettings( TInt aWlanId )
-// Deletes all EAPs from a Wlan
-//-----------------------------------------------------------------------------
-void CWlanSettings::DeleteWlanEapSettingsL( TInt aWlanId )
-	{
-	_DBG_FILE("CWlanSettings::DeleteWlanEapSettings(): begin");    
-    TInt retVal( KErrNone );
-    TInt err( KErrNone );
-
-    // List EAP implementations and call deletion for those that are not encapsulated
-	
-	RImplInfoPtrArray ecomInfoArray;
-	REComSession::ListImplementationsL( KEapTypeInterfaceUid, ecomInfoArray );	
-	TUint eapId;
-	for (TInt i = 0; i < ecomInfoArray.Count(); i++)
-		{
-		if ( !CEapType::IsDisallowedOutsidePEAP( *ecomInfoArray[i] ) )
-			{
-			// Not encapsulated method. Settings can be deleted.
-			if ( ecomInfoArray[i]->DataType().Length() == KExpandedEAPIdLength)
-				{				
-				// The EAP ID is in expanded type format
-				eapId = ecomInfoArray[i]->DataType()[7];				
-				}
-			else
-				{
-				// The EAP ID is in old 8-bit format (as string)
-				TLex8 lex( ecomInfoArray[i]->DataType() );
-        		lex.Val( eapId );        		        		
-				}
-			err = DeleteEAPSettings( aWlanId, eapId );				
-			if ( err != KErrNone )
-				{
-				retVal = err;
-				}
-			}
-		}
-	ecomInfoArray.ResetAndDestroy();
-	User::LeaveIfError (retVal);
-		
-	_DBG_FILE("CWlanSettings::DeleteWlanEapSettings(): end");	
-	}
-
-
-
-//-----------------------------------------------------------------------------
-// TInt CWlanSettings::WriteWlanSettings( TWlanSettings& aWlanSettings )
-//-----------------------------------------------------------------------------
-TInt CWlanSettings::WriteWlanSettings( TWlanSettings& aWlanSettings )
-	{
-	_DBG_FILE("CWlanSettings::WriteWlanSettings(): begin");
-
-	TInt err = 0;
-	TInt enError= KErrNone;
-	iServiceID = aWlanSettings.ServiceID; 
-	TBool wlanEnforce = EFalse;
-
-	if(FeatureManager::FeatureSupported(KFeatureIdSapPolicyManagement))
-	    {
-	    TRAP(enError, wlanEnforce=CheckEnforcementL());
-	    DBG_ARGS(_S16("CWlanSettings::WriteWlanSettings, check enforcement . error: <%D>"), enError );
-	    if(wlanEnforce)
-	        {
-	        TRAPD(lockError,enError = PerformLockWLANTablesL(EFalse));
-	        if(lockError == KErrNone && enError == KErrNone)
-	            {
-	            iWLANRelock = ETrue;	
-	            }
-	        }
-	    }
-	
-	if( RecordExists( aWlanSettings.ServiceID ) <= 0 )
-		{
-		err = iTableView->InsertRecord( aWlanSettings.Id );			           
-        if( err == KErrLocked )
-            {
-            _DBG_FILE("WriteWlanSettings InsertRecord: CommsDat was locked.");
-            TInt retry = KBeginTransRetryCount;            
-            while ( retry > 0 && err == KErrLocked )
-                {
-                User::After(KBeginTransRetryDelay);
-                _DBG_FILE("WriteWlanSettings: Slept 1 second. Try again");
-                err = iTableView->InsertRecord( aWlanSettings.Id ); 
-                retry--;
-                }      
-            }        
-		
-		if( err != KErrNone )
-			{
-			DBG_ARGS(_S16("CWlanSettings::WriteWlanSettings(): - InsertRecord failed. error: <%D>"), err );
-		
-			if(FeatureManager::FeatureSupported(KFeatureIdSapPolicyManagement))
-			    {
-			    TInt tableLockError= KErrNone;
-			    if(iWLANRelock)
-			        {
-			        TInt lockError = KErrNone;
-			        TRAP(lockError,tableLockError = PerformLockWLANTablesL(ETrue));
-			        DBG_ARGS(_S16("CWlanSettings::WriteWlanSettings, WLAN table Lock error. error: <%D>, <%D> "), lockError,tableLockError );
-			        iWLANRelock =EFalse;
-			        }
-			    if ( tableLockError != KErrNone ) // to remove warnings
-			        {
-			        tableLockError = KErrNone;
-			        }
-			    }
-			return err;
-			}
-		TRAP( err, InitialiseRecordL() );
-		if( err != KErrNone )
-			{
-			DBG_ARGS(_S16("CWlanSettings::WriteWlanSettings(): - InitialiseRecord failed. error: <%D>"), err );
-		
-			if(FeatureManager::FeatureSupported(KFeatureIdSapPolicyManagement))
-			    {
-			    TInt tableLockError= KErrNone;
-			    if(iWLANRelock)
-			        {
-			        TInt lockError = KErrNone;
-			        TRAP(lockError,tableLockError = PerformLockWLANTablesL(ETrue));
-			        DBG_ARGS(_S16("CWlanSettings::WriteWlanSettings, WLAN table Lock error. error: <%D>, <%D> "), lockError,tableLockError );
-			        iWLANRelock =EFalse;
-			        }
-			    if ( tableLockError != KErrNone ) // to remove warnings
-			        {
-			        tableLockError = KErrNone;
-			        }
-			    }
-			return err;
-			}
-		}
-	else
-		{
-		err = GoToRecord( aWlanSettings.ServiceID );
-		if( err == KErrNone )
-			{
-			
-			if(FeatureManager::FeatureSupported(KFeatureIdSapPolicyManagement))
-			    {
-				if ( wlanEnforce )
-					{
-					_DBG_FILE("CWlanSettings::WriteWlanSettings(): unprotect wlan");
-					((CCommsDbProtectTableView*)iTableView)->UnprotectRecord(); 
-					}
-			    }
-
-			
-			err = iTableView->UpdateRecord( );
-            if( err == KErrLocked )
-                {
-                _DBG_FILE("WriteWlanSettings: UpdateRecord was locked.");
-                TInt retry = KBeginTransRetryCount;            
-                while ( retry > 0 && err == KErrLocked )
-                    {
-                    User::After(KBeginTransRetryDelay);
-                    _DBG_FILE("WriteWlanSettings: Slept 1 second. Try again");
-                    err = iTableView->UpdateRecord();                    
-                    retry--;
-                    }               
-                if( err != KErrNone )
-                    {
-                    _DBG_FILE("WriteWlanSettings: UpdateRecord was unsuccessful");
-                    }
-                else
-                    {
-                    _DBG_FILE("WriteWlanSettings: UpdateRecord was successful");
-                    }
-                }           
-			
-			if( err != KErrNone )
-				{
-				DBG_ARGS(_S16("CWlanSettings::WriteWlanSettings(): - UpdateRecord failed. error: <%D>"), err );
-			
-				if(FeatureManager::FeatureSupported(KFeatureIdSapPolicyManagement))
-				    {
-				    TInt tableLockError= KErrNone;
-				    if(iWLANRelock)
-				        {
-				        TInt lockError = KErrNone;
-				        TRAP(lockError,tableLockError = PerformLockWLANTablesL(ETrue));
-				        DBG_ARGS(_S16("CWlanSettings::WriteWlanSettings, WLAN table Lock error. error: <%D>, <%D> "), lockError,tableLockError );
-				        ((CCommsDbProtectTableView*)iTableView)->ProtectRecord(); 
-				        iWLANRelock =EFalse;
-				        }
-				    if ( tableLockError != KErrNone ) // to remove warnings
-				        {
-				        tableLockError = KErrNone;
-				        }
-				    }
-				return err;
-				}
-			}
-		}
-
-	TRAP( err, WriteDataToRecordL( &aWlanSettings ) );
-
-	if( err == KErrNone )
-		{
-		_DBG_FILE("CWlanSettings::WriteWlanSettings(): PutRecordChanges");
-		err = iTableView->PutRecordChanges();
-		if( err == KErrLocked )
-            {
-            _DBG_FILE("WriteWlanSettings: PutRecordChanges was locked.");
-            TInt retry = KBeginTransRetryCount;            
-            while ( retry > 0 && err == KErrLocked )
-                {
-                User::After(KBeginTransRetryDelay);
-                _DBG_FILE("WriteWlanSettings: Slept 1 second. Try again");
-                err = iTableView->PutRecordChanges();
-                retry--;
-                }      
-            }                
-        if( err != KErrNone )
-            {
-            _DBG_FILE("WriteWlanSettings: PutRecordChanges was unsuccessful");
-            }				
-        else
-            {
-            _DBG_FILE("WriteWlanSettings: PutRecordChanges was successful");        
-            }
-		}
-	if(FeatureManager::FeatureSupported(KFeatureIdSapPolicyManagement))
-	    {
-	    if(iWLANRelock)
-	        {
-	        TInt lockError = KErrNone;
-	        TRAP(lockError,enError = PerformLockWLANTablesL(ETrue));
-	        DBG_ARGS(_S16("CWlanSettings::WriteWlanSettings, WLAN table Lock error. error: <%D>, <%D> "), lockError,enError );
-	       iWLANRelock =EFalse;
-		   }
-	    }
-	DBG_ARGS(_S16("CWlanSettings::WriteWlanSettings(): end. err: <%D>"), err );
-	return err;
-	}
-
-
-
-//-----------------------------------------------------------------------------
-// TInt CWlanSettings::WriteWlanSettings( TWlanSettings& aWlanSettings )
-//-----------------------------------------------------------------------------
-TInt CWlanSettings::WriteSecondarySSIDL( TUint32 aWlanID, TSecondarySSID& aSettings, TBool aNew )
-    {
-    
-    _DBG_FILE("CWlanSettings::WriteSecondarySSIDL(): begin");
-
-    TUint32 id = 0;
-    delete iSecondaryView;
-    iSecondaryView = NULL;
-    
-    TInt retval = KErrNone;
-    TInt reLock = EFalse;
-    TBool apEnforce=EFalse;
-    
-    if(FeatureManager::FeatureSupported(KFeatureIdSapPolicyManagement))
-        {
-    	TRAPD(eError,apEnforce=CheckEnforcementL())
-    	DBG_ARGS8(_S8("CNSmlInternetAdapter::WriteSecondarySSIDL(): EError %d , APEnforcement is %d"),eError,apEnforce);
-		if(eError==KErrNone && apEnforce)
-			{
-			_DBG_FILE("CWlanSettings::WriteSecondarySSIDL(): set db protect");
-			TInt enError=KErrNone;
-			TInt lockError = KErrNone;
-			TRAP(lockError,enError = PerformLockWLANTablesL(EFalse));
-			reLock = ETrue;
-			if ( enError != KErrNone ) // to remove warnings
-			    {
-			    enError = KErrNone;
-			    }
-			}
-        }
-
-    
-    if (aNew)
-        {
-        _DBG_FILE("CWlanSettings::WriteSecondarySSIDL(): new table inserted");
-        iSecondaryView = iDatabase.OpenTableLC( TPtrC( WLAN_SECONDARY_SSID ) ); 
-        CleanupStack::Pop(iSecondaryView); // iSecondaryView
-        retval = iSecondaryView->InsertRecord(id);
-        
-        if( retval == KErrLocked )
-             {
-             _DBG_FILE("WriteSecondarySSIDL: InsertRecord was locked.");
-             TInt retry = KBeginTransRetryCount;            
-             while ( retry > 0 && retval == KErrLocked )
-                 {
-                 User::After(KBeginTransRetryDelay);
-                 _DBG_FILE("WriteSecondarySSIDL: Slept 1 second. Try again");
-                 retval = iSecondaryView->InsertRecord(id);
-                 retry--;
-                 }      
-             }                
-         if( retval != KErrNone )
-             {
-             _DBG_FILE("WriteSecondarySSIDL: InsertRecord was unsuccessful");
-             }
-         else 
-             {
-             _DBG_FILE("WriteSecondarySSIDL: InsertRecord was successful");
-             }
-        
-        DBG_ARGS8(_S8("CNSmlInternetAdapter::WriteSecondarySSIDL(): Add record, error %d"), retval);
-        if ( retval == KErrNone )
-        	{
-        	_DBG_FILE("CWlanSettings::WriteSecondarySSIDL(): table insertion went ok");      
-        	iSecondaryView->WriteUintL(TPtrC(WLAN_SEC_SSID_SERVICE_ID), aWlanID );
-        	iSecondaryView->WriteUintL(TPtrC(WLAN_SEC_SSID_ID), id );
-        	}
-        }
-    else
-        {
-        _DBG_FILE("CWlanSettings::WriteSecondarySSIDL(): table exists, find it");
-        iSecondaryView = iDatabase.OpenViewMatchingUintLC(TPtrC(WLAN_SECONDARY_SSID),
-                                                        TPtrC(WLAN_SEC_SSID_ID),
-                                                        aSettings.Id);
-        CleanupStack::Pop(iSecondaryView); // iSecondaryView
-        TInt err = iSecondaryView->GotoFirstRecord();
-        if (err != KErrNone)
-            {
-            _DBG_FILE("CWlanSettings::WriteSecondarySSIDL(): go to first record failed");
-            // most likely KErrNotFound, something wrong with the URI parsing probably
-            return err;
-            }
-        if(FeatureManager::FeatureSupported(KFeatureIdSapPolicyManagement))
-            {
-    		if ( apEnforce )
-    			{
-    			((CCommsDbProtectTableView*)iSecondaryView)->UnprotectRecord();
-    			}
-            }
-        retval = iSecondaryView->UpdateRecord();
-        if( retval == KErrLocked )
-             {
-             _DBG_FILE("WriteSecondarySSIDL: UpdateRecord was locked.");
-             TInt retry = KBeginTransRetryCount;            
-             while ( retry > 0 && retval == KErrLocked )
-                 {
-                 User::After(KBeginTransRetryDelay);
-                 _DBG_FILE("WriteSecondarySSIDL: Slept 1 second. Try again");
-                 retval = iSecondaryView->UpdateRecord();
-                 retry--;
-                 }      
-             }                
-         if( retval != KErrNone )
-             {
-             _DBG_FILE("WriteSecondarySSIDL: UpdateRecord was unsuccessful");
-             }
-         else
-             {
-             _DBG_FILE("WriteSecondarySSIDL: UpdateRecord was successful");
-             }
-        }
-    if ( retval == KErrNone )
-    	{
-    	DBG_ARGS8(_S8("CWlanSettings::writesecondaryssids - WLAN_SEC_SSID_SCANNED_SSID uri: <%S> ad  WLAN_SEC_SSID_USED_SSID : <%S>"), &aSettings.ScannedId, &aSettings.UsedId );
-    	iSecondaryView->WriteTextL(TPtrC(WLAN_SEC_SSID_SCANNED_SSID), aSettings.ScannedId);
-    	iSecondaryView->WriteTextL(TPtrC(WLAN_SEC_SSID_USED_SSID), aSettings.UsedId);
-    
-    	retval = iSecondaryView->PutRecordChanges();
-        if( retval == KErrLocked )
-             {
-             _DBG_FILE("WriteSecondarySSIDL: PutRecordChanges was locked.");
-             TInt retry = KBeginTransRetryCount;            
-             while ( retry > 0 && retval == KErrLocked )
-                 {
-                 User::After(KBeginTransRetryDelay);
-                 _DBG_FILE("WriteSecondarySSIDL: Slept 1 second. Try again");
-                 retval = iSecondaryView->PutRecordChanges();
-                 retry--;
-                 }      
-             }                
-         if( retval != KErrNone )
-             {
-             _DBG_FILE("WriteSecondarySSIDL: PutRecordChanges was unsuccessful");
-             }
-         else
-             {
-             _DBG_FILE("WriteSecondarySSIDL: PutRecordChanges was successful");
-             }
-    	}
-    
-    if(FeatureManager::FeatureSupported(KFeatureIdSapPolicyManagement))
-        {
-    	if ( reLock )
-    		{
-			TInt enError=KErrNone;
-			TInt lockError = KErrNone;
-			TRAP(lockError,enError = PerformLockWLANTablesL(ETrue));
-			if ( iSecondaryView != NULL )
-				{
-				((CCommsDbProtectTableView*)iSecondaryView)->ProtectRecord();
-				}
-			if ( enError != KErrNone ) // to remove warnings
-			    {
-			    enError = KErrNone;
-			    }
-    		}
-        }
-
-    	
-    // This makes sure that there will be no calling to GotoFirstRecord() 
-    // before secondaryview is reinitialized, (causes a panic if that would happen)
-    delete iSecondaryView;
-    iSecondaryView = NULL;
-    
-    if ( reLock&&apEnforce )
-    	{
-    	reLock = EFalse; // to get rid of warnings
-    	apEnforce = EFalse;
-    	}
-    
-    return retval;
-    
-    }
-	
-TInt CWlanSettings::WriteEAPSettings( EAPSettings& aEapSettings) 
-    {
-    TRAPD(err, iEapType->SetConfigurationL(aEapSettings));
-    return err;
-    }
-
-
-//-----------------------------------------------------------------------------
-// void CWlanSettings::ConnectToDatabaseL( )
-//-----------------------------------------------------------------------------
-void CWlanSettings::ConnectToDatabaseL( )
-	{
-	_DBG_FILE("CWlanSettings::ConnectToDatabaseL(): begin");
-
-	if( !iTableView )
-		{
-		iTableView = iDatabase.OpenTableLC( TPtrC( WLAN_SERVICE ) ); 
-
-		if( iTableView == NULL )
-			{
-			_DBG_FILE("CWlanSettings::ConnectToDatabaseL(): could not open table");
-			User::Leave( KErrCouldNotConnect );
-			}
-
-		CleanupStack::Pop( iTableView ); //iTableView
-		}
-	
-	_DBG_FILE("CWlanSettings::ConnectToDatabaseL(): end");
-	}
-
-
-void CWlanSettings::GetEAPInterfaceL(const TInt aId, const TInt aTunnelingType, const TInt aType)
-    {
-    if ( aId < 0 )
-    	{
-    	// Illegal input
-    	User::Leave( KErrArgument );
-    	}
-    	
- 	if ( iEapType )
-	    {
-	    delete iEapType;
-	    iEapType = NULL;
-	    }
-
-    TInt err = KErrNone;
-    TUint8 expandedEapId[] = {0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-
-    TBuf8<KExpandedEAPIdLength> cue;
-    
-	// First try loading EAP type using the expanded id and if that fails 
-	// try the 8-bit id. If that succeeds then set the flag so that subsequent
-	// EAP method loads are always done using the 8-bit id.
-	if ( iExpandedEAPTypeFieldsUsed )
-		{
-		_DBG_FILE("CWlanSettings::GetEAPInterfaceL(): iExpandedEAPTypeFieldsUsed == True.");
-		// Set-up 64-bit expanded EAP id
-		if ( ( aType == KMschapv2TypeId[7] ) || ( aType == KTtlspapTypeId[7] ) )
-			{
-			// This is plain MSCHAPv2. Set vendor ID correctly
-			expandedEapId[1] = KMschapv2TypeId[1];
-			expandedEapId[2] = KMschapv2TypeId[2];
-			expandedEapId[3] = KMschapv2TypeId[3];
-			}
-		
-		expandedEapId[KExpandedEAPIdLength - 1] = static_cast<TUint8> ( aType );	
-						
-		cue.Copy( expandedEapId, KExpandedEAPIdLength );
-		
-		// Try loading EAP ECOM module
-		TRAP( err, iEapType = CEapType::NewL( cue, ELan, aId ));
-		if ( err != KErrNone )
-			{
-			_DBG_FILE("CWlanSettings::GetEAPInterfaceL(): Expanded EAP type loading failed. Trying old style.");
-			// It failed. Try old style
-			cue.Format( _L8("%d"), aType );
-			iEapType = CEapType::NewL( cue, ELan, aId );
-			_DBG_FILE("CWlanSettings::GetEAPInterfaceL(): Old style loading successful.");
-			// Succeeded (because didn't leave). Set the flag so that subsequent trys
-			// are directly using the old format.
-			iExpandedEAPTypeFieldsUsed = EFalse;					
-			}			
-    	}
-    else
-    	{
-    	// Use the old 8-bit format
-    	_DBG_FILE("CWlanSettings::GetEAPInterfaceL(): iExpandedEAPTypeFieldsUsed == False.");
-    	cue.Format( _L8("%d"), aType );
-		iEapType = CEapType::NewL( cue, ELan, aId );
-		_DBG_FILE("CWlanSettings::GetEAPInterfaceL(): Old style loading successful.");
-    	}   
-    	
-    // Set tunneling type
-	if (aTunnelingType != EAPSettings::EEapNone)
-		{
-		iEapType->SetTunnelingType(aTunnelingType);
-		}
-}
-
-
-
-//-----------------------------------------------------------------------------
-// TInt CWlanSettings::GoToRecord( TUint32 aId )
-// Moves iTableView to point record whose id-number equals to aId
-//-----------------------------------------------------------------------------
-TInt CWlanSettings::GoToRecord( TUint32 aId )
-{
-	_DBG_FILE("CWlanSettings::GoToRecord(): begin");
-	DBG_ARGS(_S16("CWlanSettings::GoToRecord(): begin Search record id: <%D>"), aId );
-	
-	TInt err = iTableView->GotoFirstRecord( );
-	if( err != KErrNone )
-		{
-		DBG_ARGS(_S16("CWlanSettings::GoToRecord(): end, GotoFirstRecord. err: <%D>"), err );
-    return err;
-		}
-
-	TUint32 id = 0;
-	TRAP( err, iTableView->ReadUintL( TPtrC(WLAN_SERVICE_ID), id ) );
-	if( err != KErrNone )
-		{
-		DBG_ARGS(_S16("CWlanSettings::GoToRecord(): end, ReadUintL. err: <%D>"), err );
-	  return err;
-		}
-
-	while( aId != id )
-		{
-		err = iTableView->GotoNextRecord( );
-		if( err != KErrNone )
-			{
-			DBG_ARGS(_S16("CWlanSettings::GoToRecord(): end, GotoNextRecord. err: <%D>"), err );
-  	  	    return err;
-			}
-
-		TRAP( err, iTableView->ReadUintL( TPtrC(WLAN_SERVICE_ID), id ) );
-
-		if( err == KErrNone )
-			{
-			DBG_ARGS(_S16("CWlanSettings::GoToRecord(): Found service id: <%D>"), id );
-			}
-		else
-			{
-	  	DBG_ARGS(_S16("CWlanSettings::GoToRecord(): end, ReadUintL next. err: <%D>"), err );
-			return err;
-			}
-		}
-
-    TRAP(err, SetSecondaryViewToRecordL(aId));
-
-
-	DBG_ARGS(_S16("CWlanSettings::GoToRecord(): end. Final record id: <%D>"), id );
-
-	return err;
-	}
-
-
-
-void CWlanSettings::SetSecondaryViewToRecordL( TUint32 aId )
-    {
-    // optional secondarySSID
-    if (iSecondaryView)
-        {
-        delete iSecondaryView;
-        iSecondaryView = NULL;
-        }
-        
-    // first open a view to secondary ssid table, with all the rows with service id
-    // matching the wlan service id (count can be zero)        
-    iSecondaryView = iDatabase.OpenViewMatchingUintLC( TPtrC(WLAN_SECONDARY_SSID),
-                                                        TPtrC(WLAN_SEC_SSID_SERVICE_ID),
-                                                        aId);
-	if( iSecondaryView == NULL )
-		{
-		// this should not happen in a normal situation
-		User::Leave( KErrCouldNotConnect );
-		}
-	CleanupStack::Pop( iSecondaryView );
-    }
-
-
-//-----------------------------------------------------------------------------
-// void CWlanSettings::GetDataFromRecordL( TWlanSettings* aWlanSettings )
-// Read settings from database to aWlanSettings structure
-//-----------------------------------------------------------------------------
-void CWlanSettings::GetDataFromRecordL( TWlanSettings* aWlanSettings )
-	{
-	_DBG_FILE("CWlanSettings::GetDataFromRecordL(): begin");
-	
-    TInt leavecode = 0;
-
-    aWlanSettings->ServiceID = 0;
-    aWlanSettings->ConnectionMode = 0;
-    aWlanSettings->SSID = _L("");
-    aWlanSettings->UsedSSID = _L("");
-    aWlanSettings->ScanSSID = 0;
-    aWlanSettings->WepKey1 = _L8("");
-    aWlanSettings->WepKey2 = _L8("");
-    aWlanSettings->WepKey3 = _L8("");
-    aWlanSettings->WepKey4 = _L8("");
-    aWlanSettings->WepIndex = 0;
-    aWlanSettings->SecurityMode = EAllowUnsecure;
-    aWlanSettings->WPAPreSharedKey = _L8("");
-    aWlanSettings->UseWPAPSK = 0;
-    aWlanSettings->EapList = _L("");
-    aWlanSettings->AuthMode = 0;                
-            
-    TRAP( leavecode, iTableView->ReadUintL( TPtrC( WLAN_SERVICE_ID ), aWlanSettings->ServiceID ) );
-    if ( leavecode != KErrNone ) 
-        {
-        DBG_ARGS(_S16("CWlanSettings::GetDataFromRecordL(): WLAN_SERVICE_ID read error: <%D>"), leavecode );
-        }       
-       
-    TRAP( leavecode, iTableView->ReadUintL( TPtrC( WLAN_CONNECTION_MODE ), aWlanSettings->ConnectionMode ) );
-    if ( leavecode != KErrNone ) 
-        {
-        DBG_ARGS(_S16("CWlanSettings::GetDataFromRecordL(): WLAN_CONNECTION_MODE read error: <%D>"), leavecode );
-        }       
-
-    TRAP( leavecode, iTableView->ReadUintL( TPtrC( NU_WLAN_AUTHENTICATION_MODE ), aWlanSettings->AuthMode ) );
-    if ( leavecode != KErrNone ) 
-        {
-        DBG_ARGS(_S16("CWlanSettings::GetDataFromRecordL(): NU_WLAN_AUTHENTICATION_MODE read error: <%D>"), leavecode );
-        }       
- 
-    TRAP( leavecode, iTableView->ReadUintL( TPtrC( WLAN_WEP_INDEX ), aWlanSettings->WepIndex ) );
-    if ( leavecode != KErrNone ) 
-        {
-        DBG_ARGS(_S16("CWlanSettings::GetDataFromRecordL(): WLAN_WEP_INDEX read error: <%D>"), leavecode );
-        }       
-
-    TRAP( leavecode, iTableView->ReadUintL( TPtrC( WLAN_SECURITY_MODE ), aWlanSettings->SecurityMode ) );
-    if ( leavecode != KErrNone ) 
-        {
-        DBG_ARGS(_S16("CWlanSettings::GetDataFromRecordL(): WLAN_SECURITY_MODE read error: <%D>"), leavecode );
-        }       
-
-    TRAP( leavecode, iTableView->ReadUintL( TPtrC( WLAN_ENABLE_WPA_PSK ), aWlanSettings->UseWPAPSK ) );
-    if ( leavecode != KErrNone ) 
-        {
-        DBG_ARGS(_S16("CWlanSettings::GetDataFromRecordL(): WLAN_ENABLE_WPA_PSK read error: <%D>"), leavecode );
-        }       
-
-    TBuf8<KCommsDbSvrMaxFieldLength> columnValue8;
-    TRAP(leavecode, iTableView->ReadTextL( TPtrC(NU_WLAN_WEP_KEY1 ),  columnValue8 ));
-    if ( ( leavecode == KErrNone ) && ( columnValue8.Length() > 0 ) )
-        {
-    	aWlanSettings->WepKey1 = columnValue8;
-        }
-    else
-        {
-        DBG_ARGS(_S16("CWlanSettings::GetDataFromRecordL(): NU_WLAN_WEP_KEY1 read error: <%D>"), leavecode );
-        }
-
-    TRAP(leavecode, iTableView->ReadTextL( TPtrC(NU_WLAN_WEP_KEY2 ),  columnValue8 ));
-    if ( ( leavecode == KErrNone ) && ( columnValue8.Length() > 0 ) )
-        {
-    	aWlanSettings->WepKey2 = columnValue8;
-        }
-    else
-        {
-        DBG_ARGS(_S16("CWlanSettings::GetDataFromRecordL(): NU_WLAN_WEP_KEY2 read error: <%D>"), leavecode );
-        }
-
-    TRAP(leavecode, iTableView->ReadTextL( TPtrC(NU_WLAN_WEP_KEY3 ),  columnValue8 ));
-    if ( ( leavecode == KErrNone ) && ( columnValue8.Length() > 0 ) )
-        {
-    	aWlanSettings->WepKey3 = columnValue8;
-        }
-    else
-        {
-        DBG_ARGS(_S16("CWlanSettings::GetDataFromRecordL(): NU_WLAN_WEP_KEY3 read error: <%D>"), leavecode );
-        }
-
-    TRAP(leavecode, iTableView->ReadTextL( TPtrC(NU_WLAN_WEP_KEY4 ),  columnValue8 ));
-    if ( ( leavecode == KErrNone ) && ( columnValue8.Length() > 0 ) )
-        {
-    	aWlanSettings->WepKey4 = columnValue8;
-        }
-    else
-        {
-        DBG_ARGS(_S16("CWlanSettings::GetDataFromRecordL(): NU_WLAN_WEP_KEY4 read error: <%D>"), leavecode );
-        }
-
-	TBuf8<KMaxPSKLength> precolumnValue8;
-    TBuf<KCommsDbSvrMaxFieldLength> columnValue;
-    
-    _DBG_FILE("CWlanSettings::GetDataFromRecordL(): Before getting WLAN_WPA_PRE_SHARED_KEY ");
-    TRAP(leavecode, iTableView->ReadTextL( TPtrC(WLAN_WPA_PRE_SHARED_KEY ),  precolumnValue8 ));
-    DBG_ARGS(_S16("CWlanSettings::ReadTextL( TPtrC(WLAN_WPA_PRE_SHARED_KEY ),length of key: <%D>"), precolumnValue8.Length() );
-    if ( ( leavecode == KErrNone ) && ( precolumnValue8.Length() > 0 ) )
-        {
-    	aWlanSettings->WPAPreSharedKey = precolumnValue8;
-        }
-    else
-        {
-        DBG_ARGS(_S16("CWlanSettings::GetDataFromRecordL(): WLAN_WPA_PRE_SHARED_KEY read error: <%D>"), leavecode );
-        }
-
-    TRAP(leavecode, iTableView->ReadTextL( TPtrC(NU_WLAN_SSID ),  columnValue ));
-    if ( ( leavecode == KErrNone ) && ( columnValue.Length() > 0 ) )
-        {
-    	aWlanSettings->SSID = columnValue;
-        }
-    else
-        {
-        DBG_ARGS(_S16("CWlanSettings::GetDataFromRecordL(): NU_WLAN_SSID read error: <%D>"), leavecode );
-        }
-
-    TRAP(leavecode, iTableView->ReadTextL( TPtrC(WLAN_USED_SSID ),  columnValue ));
-    if ( ( leavecode == KErrNone ) && ( columnValue.Length() > 0 ) )
-        {
-    	aWlanSettings->UsedSSID = columnValue;
-        _DBG_FILE("CWlanSettings::GetDataFromRecordL(): WLAN_USED_SSID reading ok");
-        }
-    else
-        {
-        DBG_ARGS(_S16("CWlanSettings::GetDataFromRecordL(): WLAN_USED_SSID read error: <%D>"), leavecode );
-        }
-	
-    iTableView->ReadTextL( TPtrC(WLAN_USED_SSID), aWlanSettings->UsedSSID );
-    _DBG_FILE("CWlanSettings::GetDataFromRecordL(): WLAN_USED_SSID");
-
-    TRAP(leavecode, iTableView->ReadUintL( TPtrC(WLAN_SCAN_SSID ), aWlanSettings->ScanSSID ));
-    if ( leavecode != KErrNone )
-        {
-        DBG_ARGS(_S16("CWlanSettings::GetDataFromRecordL(): WLAN_SCAN_SSID read error: <%D>"), leavecode );
-        }
-
-	TInt retval = iSecondaryView->GotoFirstRecord();
-	if (retval == KErrNone)
-	    {
-	    aWlanSettings->SecondarySSIDsExisting = ETrue;
-	    }
-	else
-	    {
-	    aWlanSettings->SecondarySSIDsExisting = EFalse;
-	    }
-
-	// Try to read the old EAPList field
-	HBufC* eapList = iTableView->ReadLongTextLC( TPtrC( WLAN_EAPS ) );
-	if ( eapList->Length() > 0 )
-		{
-		// The old field was valid and there was content
-		aWlanSettings->EapList = *eapList;		
-		}
-	else
-		{
-		// Old list was invalid or empty. Try the new fields:
-	    // enabled EAP types
-	    TBuf8<KEAPListBufferSize> enabledTypes;
-	    TBuf8<KEAPListBufferSize> disabledTypes;
-	    iTableView->ReadTextL( TPtrC( WLAN_ENABLED_EAPS ), enabledTypes);
-	    iTableView->ReadTextL( TPtrC( WLAN_DISABLED_EAPS ), disabledTypes);         	                               
-		
-	    // Calculate the number of EAP types altogether
-	    TUint numEapTypes = enabledTypes.Length() / KExpandedEAPIdLength;
-	    numEapTypes += disabledTypes.Length() / KExpandedEAPIdLength;
-	    
-	    if (numEapTypes > 0)
-		    {
-		    // One EAP type reserves maximum of 5 bytes: "+xxx,"
-		    HBufC* outputBuf = HBufC::NewLC( numEapTypes * KLengthOfOldStyleEAPListEntry );
-		    		    
-		    TPtr output = outputBuf->Des();	    
-			_LIT( KFormat, "%03d" );		                  	                               
-			for ( TInt i = (KExpandedEAPIdLength - 1) ; i < enabledTypes.Length() ; i += KExpandedEAPIdLength)
-				{
-				
-				output.Append(TChar( '+' ));
-				output.AppendFormat( KFormat, enabledTypes[i] );
-				output.Append(TChar( ',' ));
-				}
-				
-			for ( TInt i = (KExpandedEAPIdLength - 1) ; i < disabledTypes.Length() ; i += KExpandedEAPIdLength)
-				{				
-				output.Append(TChar( '-' ));
-				output.AppendFormat( KFormat, disabledTypes[i] );
-				output.Append(TChar( ',' ));
-				}
-			// Strip the final ','
-			output.Delete( output.Length() - 1, 1 );
-			
-			aWlanSettings->EapList = *outputBuf;
-			CleanupStack::PopAndDestroy( outputBuf );
-		    }
-		}
-    
-	CleanupStack::PopAndDestroy( eapList );
-
-    _DBG_FILE("CWlanSettings::GetDataFromRecordL(): WLAN_EAPS");
-    
-
-	_DBG_FILE("CWlanSettings::GetDataFromRecordL(): end");
-	}
-	
-	
-	
-//-----------------------------------------------------------------------------
-// void CWlanSettings::GetSecondarySSIDListL(TUint32 aId, RArray<TSecondarySSID>& aSecondarySSIDs)
-// Fills the array with secondarySSIDs, which are associated with given WLANID
-//-----------------------------------------------------------------------------
-void CWlanSettings::GetSecondarySSIDListL(TUint32 aWlanId, RArray<TSecondarySSID>& aSecondarySSIDs)
-    {
-    if (iSecondaryView == NULL)
-        {
-        // views haven't been initialized, in case of incorrect usage
-        User::Leave(KErrNotReady);
-        }
-        
-    // set the view pointer into the first record
-    TInt retval = iSecondaryView->GotoFirstRecord();
-    if (retval != KErrNone)
-        {
-        return;
-        }
-    
-    // check that given id matches the current rowset. If not, then reinitialize
-    TUint32 id;
-    TInt err(KErrNone);
-    TRAP(err, iSecondaryView->ReadUintL( TPtrC(WLAN_SEC_SSID_SERVICE_ID ),  id ));
-    if (id != aWlanId)
-        {
-        SetSecondaryViewToRecordL(aWlanId);
-    	retval = iSecondaryView->GotoFirstRecord();
-        }
-        
-    TBuf<KMaxTextLength> columnValue;
-
-    while (retval == KErrNone)
-        {
-        TSecondarySSID ssid;
-        TRAP(retval, iSecondaryView->ReadUintL( TPtrC(WLAN_SEC_SSID_ID ),  ssid.Id ));
-        TRAP(retval, iSecondaryView->ReadTextL( TPtrC(WLAN_SEC_SSID_SCANNED_SSID ),  ssid.ScannedId ));
-        TRAP(retval, iSecondaryView->ReadTextL( TPtrC(WLAN_SEC_SSID_USED_SSID ),  ssid.UsedId ));
-        aSecondarySSIDs.Append(ssid);
-        retval = iSecondaryView->GotoNextRecord();
-        }
-    }
-
-
-
-
-//-----------------------------------------------------------------------------
-// void CWlanSettings::WriteDataToRecordL( TWlanSettings* aWlanSettings )
-// Writes settings to database from aWlanSettings structure
-//-----------------------------------------------------------------------------
-void CWlanSettings::WriteDataToRecordL( TWlanSettings* aWlanSettings )
-	{
-	_DBG_FILE("CWlanSettings::WriteDataToRecordL(): begin");
-
-	iTableView->WriteUintL( TPtrC(WLAN_SERVICE_ID), aWlanSettings->ServiceID );
-	iTableView->WriteUintL( TPtrC(WLAN_CONNECTION_MODE), aWlanSettings->ConnectionMode );
-	iTableView->WriteUintL( TPtrC(WLAN_WEP_INDEX), aWlanSettings->WepIndex );
-	iTableView->WriteUintL( TPtrC(WLAN_SECURITY_MODE), aWlanSettings->SecurityMode );
-	iTableView->WriteUintL( TPtrC(WLAN_ENABLE_WPA_PSK), aWlanSettings->UseWPAPSK );
-	iTableView->WriteUintL( TPtrC(NU_WLAN_AUTHENTICATION_MODE), aWlanSettings->AuthMode );
-	iTableView->WriteTextL( TPtrC(NU_WLAN_SSID), aWlanSettings->SSID );
-	iTableView->WriteTextL( TPtrC(WLAN_USED_SSID), aWlanSettings->UsedSSID );
-	iTableView->WriteUintL( TPtrC(WLAN_SCAN_SSID), aWlanSettings->ScanSSID );
-	
-	iTableView->WriteTextL( TPtrC(NU_WLAN_WEP_KEY1), aWlanSettings->WepKey1 );
-	iTableView->WriteTextL( TPtrC(NU_WLAN_WEP_KEY2), aWlanSettings->WepKey2 );
-	iTableView->WriteTextL( TPtrC(NU_WLAN_WEP_KEY3), aWlanSettings->WepKey3 );
-	iTableView->WriteTextL( TPtrC(NU_WLAN_WEP_KEY4), aWlanSettings->WepKey4 );
-	iTableView->WriteUintL( TPtrC(WLAN_WEP_KEY1_FORMAT ), 1 ); // 0 = Eascii, 1 = EHexadecimal
-	iTableView->WriteUintL( TPtrC(WLAN_WEP_KEY2_FORMAT ), 1 );
-	iTableView->WriteUintL( TPtrC(WLAN_WEP_KEY3_FORMAT ), 1 );
-	iTableView->WriteUintL( TPtrC(WLAN_WEP_KEY4_FORMAT ), 1 ); 
-	
-	iTableView->WriteTextL( TPtrC(WLAN_WPA_PRE_SHARED_KEY), aWlanSettings->WPAPreSharedKey );
-	iTableView->WriteUintL( TPtrC(WLAN_WPA_KEY_LENGTH), aWlanSettings->WPAPreSharedKey.Length() );
-
-	// Expanded EAP types in use. Write the eap list to the new columns.
-
-    // generate appropriate entries in the new enabled and disabled list,
-    // overwriting those values 
-    
-    // count the + and - signs to determine the size of enabled and 
-    // disabled descriptors
-    TLex lex( aWlanSettings->EapList );
-    
-    TInt numPlus = 0;
-    TInt numMinus = 0;
-    TChar ch;
-    while ( !lex.Eos() )
-        {
-        ch = lex.Get();
-        if ( ch == '+' ) ++numPlus;
-        else if ( ch == '-' ) ++numMinus;
-        }
-        
-    // each entry consumes 8 bytes in binary format
-    HBufC8* enabledEAPPlugin = HBufC8::NewL( 8 * numPlus );
-    CleanupStack::PushL( enabledEAPPlugin );
-    
-    HBufC8* disabledEAPPlugin = HBufC8::NewL( 8 * numMinus );
-    CleanupStack::PushL( disabledEAPPlugin );
-        
-    lex.Assign( aWlanSettings->EapList );
-    
-    while ( !lex.Eos() )
-        {
-        // beginning of implementation UID
-        TInt16 implUid = 0;
-        
-        if ( lex.Val( implUid ) != KErrNone || !implUid )
-            {
-            // if the old string is corrupted, null out both lists
-            enabledEAPPlugin->Des().Zero();
-            disabledEAPPlugin->Des().Zero();
-            break;
-            }
-
-        // append it to the appropriate list ('+' enabled, '-' disabled)
-        _LIT8( KPadding, "\xFE\0\0\0\0\0\0" );
-        _LIT8( KMsChapV2Padding, "\xFE\xFF\xFF\xFF\0\0\0");
-        const TInt KPlainMsChapV2ImplUid = 99;
-        const TInt KTtlspapImplUid = 98;
-        
-        // Check whether eap is inluded or not +/-
-        if ( implUid > 0 )
-            {
-            // check whether plain mschap or ttlspap in question
-            if ( Abs( implUid ) == KPlainMsChapV2ImplUid || Abs( implUid ) == KTtlspapImplUid )
-            	{
-            	enabledEAPPlugin->Des().Append( KMsChapV2Padding );
-            	}
-            else
-            	{
-            	enabledEAPPlugin->Des().Append( KPadding );
-            	}
-            enabledEAPPlugin->Des().Append( Abs( implUid ) );
-            }
-        else if (implUid < 0 )
-            {
-            // check whether plain mschap or ttlspap in question
-            if ( Abs( implUid ) == KPlainMsChapV2ImplUid || Abs( implUid ) == KTtlspapImplUid )
-            	{
-            	disabledEAPPlugin->Des().Append( KMsChapV2Padding );
-            	}
-            else
-            	{
-            	disabledEAPPlugin->Des().Append( KPadding );
-            	}
-            disabledEAPPlugin->Des().Append( Abs( implUid ) );
-            }
-        
-        // swallow the delimiter (',')
-        lex.Get();
-        }
-                	
-	
-	
-	iTableView->WriteTextL( TPtrC( WLAN_ENABLED_EAPS ), 
-                                  enabledEAPPlugin? 
-                                        (const TDesC8&)*enabledEAPPlugin: 
-                                        (const TDesC8&)KNullDesC8 );
-
-    iTableView->WriteTextL( TPtrC( WLAN_DISABLED_EAPS ), 
-                                  disabledEAPPlugin? 
-                                        (const TDesC8&)*disabledEAPPlugin: 
-                                        (const TDesC8&)KNullDesC8 );
-    CleanupStack::PopAndDestroy( disabledEAPPlugin );
-    CleanupStack::PopAndDestroy( enabledEAPPlugin );
-    
-	_DBG_FILE("CWlanSettings::WriteDataToRecordL(): end");
-	}
-
-//-----------------------------------------------------------------------------
-// TInt CWlanSettings::RecordExists( TUint32 aLuid )
-// Returns ETrue if record exists in database
-//-----------------------------------------------------------------------------
-TInt CWlanSettings::RecordExists( TUint32 aLuid )
-	{
-	_DBG_FILE("CWlanSettings::RecordExists(): begin");
-	
-	TInt err = KErrNone;
-	TRAP( err, ConnectToDatabaseL() );
-	
-	// If the connection went ok, then we can go to the record
-	if( err == KErrNone )
-	    {	    
-	    err = GoToRecord( aLuid );
-	    }
-	
-	if( err == KErrNone )
-		{
-  	    DBG_ARGS(_S16("CWlanSettings::RecordExists(): end. GoToRecord OK err: <%D>"), err );
-		return ETrue;
-		}
-	else
-		{
-  	    DBG_ARGS(_S16("CWlanSettings::RecordExists(): end. GoToRecord error err: <%D>"), err );
-		return err;
-		}
-	}
-
-//-----------------------------------------------------------------------------
-// void CWlanSettings::InitialiseRecordL( )
-// Inserts mandatory values for commsdb
-//-----------------------------------------------------------------------------
-void CWlanSettings::InitialiseRecordL( )
-	{
-	_DBG_FILE("CWlanSettings::InitialiseRecordL(): begin");
-	
-	iTableView->WriteUintL( TPtrC(WLAN_WPA_KEY_LENGTH), 0 );
-	iTableView->WriteUintL( TPtrC(NU_WLAN_AUTHENTICATION_MODE), 0 );
-
-  _DBG_FILE("CWlanSettings::InitialiseRecordL(): end");
-	}
-
-		
-TInt CWlanSettings::InstalledEAPsL(CBufBase& aEAPList)
-    {
-    _DBG_FILE("CWlanSettings::InstalledEAPsL(): begin");
-
-    RImplInfoPtrArray ecomInfoArray;
-    REComSession::ListImplementationsL(KEapTypeInterfaceUid, ecomInfoArray);
-        
-    TUint eapId( 0 ); 
-                
-    // First sort the EAPIds
-    for (TInt i = 0; i < ecomInfoArray.Count(); i++)
-        {        
-		if ( ecomInfoArray[i]->DataType().Length() == KExpandedEAPIdLength)
-			{
-			// The EAP ID is in expanded type format
-			// Only handle the vendor type of 0
-			if ( (ecomInfoArray[i]->DataType()[1] != 0
-				 || ecomInfoArray[i]->DataType()[2] != 0
-				 || ecomInfoArray[i]->DataType()[3] != 0  )
-				 && ( ( ecomInfoArray[i]->DataType()[7] != KMschapv2TypeId[7] ) &&
-					  ( ecomInfoArray[i]->DataType()[7] != KTtlspapTypeId[7] ) ) )
-				 {
-				 	// This is some other vendor type than IETF
-				 	continue;	
-				 }
-			eapId = ecomInfoArray[i]->DataType()[7];
-			_DBG_FILE("CWlanSettings::InstalledEAPsL(): Expanded EAP id found.");			
-			}
-		else
-			{
-			// The EAP ID is in old 8-bit format (as string)
-			TLex8 lex( ecomInfoArray[i]->DataType() );
-        	if ( lex.Val( eapId ) != KErrNone )
-        		{
-        		// Unsupported format. Ignore this.
-        		_DBG_FILE("CWlanSettings::InstalledEAPsL(): Unsupported EAP id found.");
-        		continue;
-				}			       			
-				_DBG_FILE("CWlanSettings::InstalledEAPsL(): Old style EAP id found.");
-			}
-			        
-        if ( !CEapType::IsDisallowedOutsidePEAP( *ecomInfoArray[i] ) )
-        	{
-		        aEAPList.InsertL(aEAPList.Size(), KNSmlWLanEapId);  // EAPId
-        		TBuf8<3> cue;    // Max EAPId == 255
-        		cue.AppendNumFixedWidth( eapId, EDecimal, 3 );
-        		aEAPList.InsertL(aEAPList.Size(), cue);
-				aEAPList.InsertL(aEAPList.Size(), KSlash);				
-        	}
-
-		// Check if the method is allowed inside PEAP
-		if ( !CEapType::IsDisallowedInsidePEAP( *ecomInfoArray[i] ) )
-			{			
-	        aEAPList.InsertL(aEAPList.Size(), KNSmlWLanEapId);  // EAPId
-	        TBuf8<3> cue;    // Max EAPId == 255
-	        cue.AppendNumFixedWidth( eapId, EDecimal, 3 );
-	        aEAPList.InsertL(aEAPList.Size(), cue);		
-	        aEAPList.InsertL(aEAPList.Size(), KDash);
-	        cue.Zero();
-	        cue.AppendNumFixedWidth( KEapPeapTypeId[7], EDecimal, 3 );
-	        aEAPList.InsertL(aEAPList.Size(), cue);			       
-	        aEAPList.InsertL(aEAPList.Size(), KSlash);
-	        
-#ifdef FF_WLAN_EXTENSIONS
-			// same additions for EAP-FAST
-	       	aEAPList.InsertL(aEAPList.Size(), KNSmlWLanEapId);  // EAPId
-	       	cue.Zero();    // Max EAPId == 255
-	        cue.AppendNumFixedWidth( eapId, EDecimal, 3 );
-	       	aEAPList.InsertL(aEAPList.Size(), cue);		
-	        aEAPList.InsertL(aEAPList.Size(), KDash);
-	        cue.Zero();
-	        cue.AppendNumFixedWidth( KEapFastTypeId[7], EDecimal, 3 );
-	        aEAPList.InsertL(aEAPList.Size(), cue);			       
-	        aEAPList.InsertL(aEAPList.Size(), KSlash);	
-#endif		        
-			}
-		// Check if the method is allowed inside TTLS
-		if ( !CEapType::IsDisallowedInsideTTLS( *ecomInfoArray[i] ) )
-			{
-	        aEAPList.InsertL(aEAPList.Size(), KNSmlWLanEapId);  // EAPId
-	        TBuf8<3> cue;    // Max EAPId == 255
-	        cue.AppendNumFixedWidth( eapId, EDecimal, 3 );
-	        aEAPList.InsertL(aEAPList.Size(), cue);		
-	        aEAPList.InsertL(aEAPList.Size(), KDash);
-	        cue.Zero();
-	        cue.AppendNumFixedWidth( KEapTtlsTypeId[7], EDecimal, 3 );
-	        aEAPList.InsertL(aEAPList.Size(), cue);			       	
-	        aEAPList.InsertL(aEAPList.Size(), KSlash);		                		        		
-			}
-        }
-    // ECOM array is no longer needed.
-    ecomInfoArray.ResetAndDestroy();
-
-    // Cut the last slash
-	aEAPList.ResizeL( aEAPList.Size() -1);
-     
-    _DBG_FILE("CWlanSettings::InstalledEAPsL(): end");
-    return KErrNone;
-    }
-
-		
-
-//-----------------------------------------------------------------------------
-// TBool CWlanSettings::CheckEnforcementL( )
-// Checks if wlan enforcement is On or Off
-//-----------------------------------------------------------------------------
-    TBool CWlanSettings::CheckEnforcementL()
-    {
-    	CSettingEnforcementInfo* info = CSettingEnforcementInfo::NewL();
-		CleanupStack::PushL(info);
-		TBool enforceWLANActive ( EFalse );
-		User::LeaveIfError(info->EnforcementActive(EWLANEnforcement, enforceWLANActive));
-		CleanupStack::PopAndDestroy(info);
-		return ( enforceWLANActive) ;
-    }
-
-//-----------------------------------------------------------------------------
-// TBool CWlanSettings::CheckAPEnforcementL( )
-// Checks if AP enforcement is On or Off
-//-----------------------------------------------------------------------------
-    
-TBool CWlanSettings::CheckAPEnforcementL()
-    {
-    	CSettingEnforcementInfo* info = CSettingEnforcementInfo::NewL();
-		CleanupStack::PushL(info);
-		TBool enforceAPActive ( EFalse );
-		User::LeaveIfError(info->EnforcementActive(EAPEnforcement, enforceAPActive));
-		CleanupStack::PopAndDestroy(info);
-		return ( enforceAPActive) ;
-    }
-//-----------------------------------------------------------------------------
-// TInt CWlanSettings::PerformLockWLANTablesL( )
-// Locks or unlocks the wlan tables depending on the 
-// aProtect value
-//-----------------------------------------------------------------------------
-  TInt CWlanSettings::PerformLockWLANTablesL(TBool aProtect)
-    {
-       
-   	_DBG_FILE("CWlanSettings::PerformLockWLANTablesL(): BEGIN ");
-    CCommsDatabaseProtect* dbprotect = CCommsDatabaseProtect::NewL();
-    CleanupStack::PushL(dbprotect);
-    RArray<TPtrC> wlanTableList;
-    CleanupClosePushL( wlanTableList );
-    TBuf<KCommsDbSvrMaxFieldLength> serviceType;
-   	TBool apEnforce = EFalse;
-   	TInt err = KErrNone;
-	
-   	TRAP_IGNORE( apEnforce=CheckAPEnforcementL() );
-   	if(apEnforce)
-    	{
-    	_DBG_FILE("CWlanSettings::PerformLockWLANTablesL(): AP enforcement is TRUE");
-   		wlanTableList.AppendL( TPtrC( WAP_ACCESS_POINT ) );
-		wlanTableList.AppendL( TPtrC( WAP_IP_BEARER ) );
-		wlanTableList.AppendL( TPtrC( IAP ) );
-		//condition when only ap is enforced and not wlan then its not 
-		//necessary to add wlanservice table
-		RDbRowSet::TAccess checkAccessType;
-		checkAccessType =  dbprotect->GetTableAccessL(TPtrC(WLAN_DEVICE_SETTINGS));
-    	switch(checkAccessType)
-			{
-			case RDbRowSet::EReadOnly :
-				{
-				wlanTableList.AppendL( TPtrC(WLAN_SERVICE) );
-				wlanTableList.AppendL(TPtrC(WLAN_SECONDARY_SSID) );
-				}
-			default :	
-				{
-				break;
-				}
-			}
-		
-    	}
-    else
-    	{
-    	_DBG_FILE("CWlanSettings::PerformLockWLANTablesL() Only wlan enforcement is ON");
-    	wlanTableList.AppendL( TPtrC(WLAN_SERVICE) );	
-    	wlanTableList.AppendL(TPtrC(WLAN_SECONDARY_SSID) );
-    	}
-    	
-   	iDatabase.CommitTransaction();
-	                                                               	   
-   	for ( TInt i( 0 ); i < wlanTableList.Count(); i++ )	
-   	    {
-   	    if(!aProtect)
-   	        {
-		   	err = dbprotect->UnProtectTable( wlanTableList[ i ] );
-		   	DBG_ARGS(_S16("CWlanSettings::PerformLockWLANTablesL(): Unprotect error  %D"), err);	
-		   	//Check if current AP is locked , if yes , unprotect 
-			// lock = EFalse;
-			}
-   	    else 
-			{
-			err = dbprotect->ProtectTable( wlanTableList[ i ] );
-			//Check if current ServiceID is not locked , if yes , protect
-			// lock = ETrue;
-			}
-   	    } //for loop
-	
-   	CleanupStack::PopAndDestroy(&wlanTableList);
-   	CleanupStack::PopAndDestroy( dbprotect );		
-   	CCommsDatabase* commsDataBase = CCommsDatabase::NewL();
-   	CleanupStack::PushL( commsDataBase );
-			
-	// Open the IAP from IAP Table and protect 
-					
-	TUint32 apIAPID = 0;   					
-	CCommsDbTableView* iapViews = commsDataBase->OpenViewMatchingUintLC(TPtrC(IAP),
-	                                                                    TPtrC(IAP_SERVICE),
-                                                                        iServiceID);
-    err = iapViews->GotoFirstRecord();
-	// Service ID can be same for GPRS or WLAN, hence check service type and get the iAPID
-    while (err == KErrNone )
-        {
-        iapViews->ReadTextL(TPtrC(IAP_SERVICE_TYPE), serviceType);
-		if(serviceType == TPtrC(LAN_SERVICE))    
-		    {		           	
-		    iapViews->ReadUintL(TPtrC(COMMDB_ID), apIAPID);
-		    DBG_ARGS(_S16("CWlanSettings::PerformLockWLANTablesL():  IAPId   %D"), apIAPID);	
-		    break;
-		    }      
-		err = iapViews->GotoNextRecord();
-        }
-                                                          
-        //iapViews->ReadUintL(TPtrC(COMMDB_ID), apIAPID);
-        DBG_ARGS(_S16("CWlanSettings::PerformLockWLANTablesL(): end. IAP ID being locked %d "), apIAPID );
-        if(err == KErrNone)		
-            {	
-            CCommsDbTableView* iapUpdate = commsDataBase->OpenViewMatchingUintLC(TPtrC(IAP),TPtrC(COMMDB_ID),apIAPID);
-            TInt iapExists = iapUpdate->GotoFirstRecord();
-	
-            if(!aProtect)                                                                       	
-                {	
-                ((CCommsDbProtectTableView*)iapViews)->UnprotectRecord(); 	
-                if (iapExists)		
-                    {	
-                    ((CCommsDbProtectTableView*)iapUpdate)->UnprotectRecord();
-                    }
-                }	
-            else
-        		{
-        		((CCommsDbProtectTableView*)iapViews)->ProtectRecord();
-        		if (iapExists)
-        			{
-        			((CCommsDbProtectTableView*)iapUpdate)->ProtectRecord();
-        			}
-        		}
-        	CleanupStack::PopAndDestroy(); // iapUpdate
-            }
-    
-        CleanupStack::PopAndDestroy( iapViews );
-        CleanupStack::PopAndDestroy( commsDataBase );
-            
-        iDatabase.BeginTransaction();
-		return err;
-    }
-  
-			
--- a/omadm/omadmextensions/adapters/nsmldmalwaysonadapter/group/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-/*
-* 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:  Build information file for project nsmldmalwaysonadapter
-*
-*/
-
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-
-
-PRJ_MMPFILES
-nsmldmalwaysonadapter.mmp
-
-PRJ_TESTMMPFILES
-
-PRJ_TESTEXPORTS
--- a/omadm/omadmextensions/adapters/nsmldmalwaysonadapter/group/nsmldmalwaysonadapter.mmp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-/*
-* 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:  Project definition file for project nsmldmalwaysonadapter
-*
-*/
-
-#include <platform_paths.hrh>
-#include <defaultcaps.hrh>
-
-TARGET                  nsmldmalwaysonadapter.dll
-TARGETTYPE              PLUGIN
-UID                     0x10009d8d 0x101f6d36
-
-CAPABILITY              CAP_ECOM_PLUGIN
-VENDORID                VID_DEFAULT
-
-SOURCEPATH              ../src
-SOURCE                  nsmldmalwaysonadapter.cpp
-SOURCE                  nsmldmalwaysonsettingstore.cpp
-
-START RESOURCE          nsmldmalwaysonadapter.rss
-END
-
-USERINCLUDE             ../inc
-
-//Default system include paths for middleware layer modules
-MW_LAYER_SYSTEMINCLUDE
-
-SYSTEMINCLUDE 	        /epoc32/include/ecom
-
-LIBRARY                 euser.lib ecom.lib charconv.lib flogger.lib
-LIBRARY                 centralrepository.lib
--- a/omadm/omadmextensions/adapters/nsmldmalwaysonadapter/inc/logger.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,99 +0,0 @@
-/*
-* 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:  Provides logging services.
-*
-*/
-
-
-#ifndef ALWAYSONLOGGER_H
-#define ALWAYSONLOGGER_H
-
-#ifdef _DEBUG
-                              // 0 = No logging,
-#define LOGGING_METHOD  1     // 1 = Flogger,
-                              // 2 = RDebug
-#else
-
-#define LOGGING_METHOD  0     // No logging in UREL builds
-
-#endif // _DEBUG
-
-
-#if LOGGING_METHOD == 1       // Flogger
-
-#include <flogger.h>
-_LIT(KLOGFolder,"ALWAYSONADAPTER");
-_LIT(KLOGFile,"ALWAYSONADAPTER.txt");
-
-#define LOGTEXT(x)\
-    {\
-    RFileLogger::Write(KLOGFolder(),KLOGFile(),EFileLoggingModeAppend,\
-    x);\
-    }
-
-#define LOGSTRING(x)\
-    {\
-    _LIT8(tempLogDes,x);\
-    RFileLogger::Write(KLOGFolder(),KLOGFile(),EFileLoggingModeAppend,\
-    tempLogDes());\
-    }
-
-#define LOGSTRING2(x,y)\
-    { _LIT8(tempLogDes,x);\
-    RFileLogger::WriteFormat(KLOGFolder(),\
-                             KLOGFile(),\
-                             EFileLoggingModeAppend,\
-                             TRefByValue<const TDesC8>(tempLogDes()),y);\
-    }
-
-#define LOGSTRING3(x,y,z)\
-    { _LIT8(tempLogDes,x);\
-    RFileLogger::WriteFormat(KLOGFolder(),\
-                             KLOGFile(),\
-                             EFileLoggingModeAppend,\
-    TRefByValue<const TDesC8>(tempLogDes()),y,z);\
-    }
-
-#define LOGSTRING4(w,x,y,z)\
-    { _LIT8(tempLogDes,w);\
-    RFileLogger::WriteFormat(KLOGFolder(),\
-                             KLOGFile(),\
-                             EFileLoggingModeAppend,\
-    TRefByValue<const TDesC8>(tempLogDes()),x,y,z);\
-    }
-
-
-#elif _LOGGING_METHOD == 2    // RDebug
-
-#include <e32svr.h>
-
-#define LOGSTRING(x) RDebug::Print(x);
-#define LOGSTRING(x) RDebug::Print(_L(x));
-#define LOGSTRING2(x,y) RDebug::Print(_L(x),y);
-#define LOGSTRING3(x,y,z) RDebug::Print(_L(x),y,z);
-#define LOGSTRING4(w,x,y,z) RDebug::Print(_L(w),x,y,z);
-
-#else // LOGGING_METHOD == 0 or invalid
-
-#define LOGSTRING(x)
-#define LOGSTRING(x)
-#define LOGSTRING2(x,y)
-#define LOGSTRING3(x,y,z)
-#define LOGSTRING4(w,x,y,z)
-
-#endif // LOGGING_METHOD
-
-#endif  // ALWAYSONLOGGER_H
-
-// End of File
--- a/omadm/omadmextensions/adapters/nsmldmalwaysonadapter/inc/nsmldmalwaysonadapter.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,581 +0,0 @@
-/*
-* 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:  DM adapter for handling always-on settings.
-*
-*/
-
-
-#ifndef NSMLDMALWAYSONADAPTER_H
-#define NSMLDMALWAYSONADAPTER_H
-
-#include <smldmadapter.h>
-
-#include "nsmldmalwaysonsettingstore.h"
-
-class CSmlDmAOCommandElement;
-class CNSmlDmAOSettingStore;
-
-// The DDF version must be changed if any changes in DDF structure 
-// ( built in DDFStructureL() function )
-_LIT8( KNSmlDmAOAdapterDDFVersion, "1.0" ); 
-_LIT8( KNSmlDmAOAdapterTextPlain, "text/plain" );
-
-// Names of the nodes
-// When updating KNSmlDmAOAdapterAOURI also update 
-// KNSmlDmAOAdapterURIMaxLength! */
-_LIT8(KNSmlDmAOAdapterAOURI, "./VENDORCONFIG");
-_LIT8(KNSmlDmAOAdapterAO, "VENDORCONFIG");
-_LIT8(KNSmlDmAOAdapterName, "NAME");
-_LIT8(KNSmlDmAOAdapterAwonPdpc, "AWON-PDPC");
-_LIT8(KNSmlDmAOAdapterTRetry, "T-RETRY");
-
-
-// Descriptions of the nodes
-_LIT8( KNSmlDmAOAdapterAODescription, 
-       "Always-on provides management of connections");
-_LIT8( KNSmlDmAOAdapterNameDescription, 
-       "Name of the VENDORCONFIG");
-_LIT8( KNSmlDmAOAdapterAwonPdpcDescription, 
-       "Always-on setting in home and visited network");
-_LIT8( KNSmlDmAOAdapterTRetryDescription, 
-       "T-Retry timer interval");
-
-// Leaf nodes of VENDORCONFIG node
-_LIT8( KNSmlDmAOAllLeafNodes, 
-       "NAME/AWON-PDPC/T-RETRY");
-
-// URI segment separator
-// When updating this literal also update 
-// KNSmlDmAOAdapterAPURIMaxLength and KNSmlDmAOAdapterURIMaxLength!
-_LIT8( KNSmlDmAOSeparator, "/" );
-
-// URI segment separator
-// When updating KNSmlDmAOAdapterAOURI also update 
-// KNSmlDmAOAdapterAPURIMaxLength and KNSmlDmAOAdapterURIMaxLength!
-_LIT8( KNSmlDmAOUriListSeparator, "," );
-
-// Prefix in URIs (removed for LUID mapping)
-_LIT8( KNSmlDmAOAdapterURIPrefix, "./" );
-
-// Name prefix for unnamed VENDORCONFIG nodes
-_LIT8( KNSmlDmAONamePrefix, "VENDORCONFIG" );
-
-const TInt KNSmlDmAOGranularity = 4;
-const TInt KNSmlDmAOInvalidRef = -1;
-
-// Maximum length of VENDORCONFIG URI including a separator 
-// character in URI List. Node is not calculated here.  
-// KNSmlDmAOAdapterAOURI + KNSmlDmAOSeparator + KNSmlDmAOUriListSeparator
-const TInt KNSmlDmAOAdapterURIMaxLength =  16;
-        
-/**
- *  Always-on device management adapter
- *
- *  Always-on device management adapter manages settings
- *  related to VENDORCONFIG.
- *
- *  @lib nsmldmalwaysonadapter
- *  @since S60 v3.2
- */
-class CNSmlDmAOAdapter : public CSmlDmAdapter
-    {
-    
-public:
-
-/** Possible command types */
-enum TCommandType
-    {
-    EAddCmd,
-    EGetCmd,
-    EGetSizeCmd,
-    EDeleteCmd
-    };
-
-
-    static CNSmlDmAOAdapter* NewL( MSmlDmCallback* aDmCallback );
-    
-    virtual ~CNSmlDmAOAdapter();
-
-
-// from base class CSmlDmAdapter
-
-    /**
-     *  The function returns current version of the DDF. 
-     *
-     *  @since S60 v3.2
-     *  @param aVersion DDF version of the
-     *  adapter. (filled by the adapter) 
-     */
-    void DDFVersionL( CBufBase& aDDFVersion );
-
-    /**
-     *  The function for filling the DDF structure of the adapter
-     *
-     *  @since S60 v3.2
-     *  @param aDDFObject   Reference to root object.
-    */
-    void DDFStructureL( MSmlDmDDFObject& aDDF );
-
-    /**
-     * The function creates new leaf objects, or replaces data in existing 
-     * leaf objects. The information about the success of the command is
-     * returned by calling SetStatusL function of MSmlDmCallback callback
-     * interface. 
-     *     
-     * @since S60 v3.2
-     * @param aURI         URI of the object
-     * @param aLUID        LUID of the object 
-     * @param aObject      Data of the object.
-     * @param aType        MIME type of the object
-     * @param aStatusRef   Reference to correct command, i.e. this reference
-     *                     must be used when calling the SetStatusL of this 
-     *                     command
-    */
-    void UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID,
-							const TDesC8& aObject, const TDesC8& aType,
-							TInt aStatusRef );
-    /**
-     * The function deletes an object and its child objects. 
-     *
-     * @since S60 v3.2
-     * @param aURI         URI of the object
-     * @param aLUID        LUID of the object (if the adapter have earlier 
-     *                     returned LUID to the DM Module).
-     * @param aStatusRef   Reference to correct command, i.e. this reference 
-     *                     must be used when calling the SetStatusL of this 
-     *                     command.
-    */
-    void DeleteObjectL( const TDesC8& aURI, const TDesC8& aLUID,
-						TInt aStatusRef );
-
-    /**
-     * The function fetches data of a leaf object. The SetStatusL is used
-     * as described in UpdateLeafObjectL(). The data is returned by using the
-     * SetResultsL function of MSmlCallback callback interface.
-	 *
-     * @since S60 v3.2
-     * @param aURI             URI of the object
-     * @param aLUID            LUID of the object (if the adapter have 
-     *                         earlier returned LUID to the DM Module).   
-     * @param aType            MIME type of the object
-     * @param aResultsRef      Reference to correct results, i.e. this 
-     *                         reference must be used when returning the 
-     *                         result by calling the SetResultsL.
-     * @param aStatusRef       Reference to correct command, i.e. this 
-     *                         reference must be used when calling the 
-     *                         SetStatusL of this command.
-    */
-    void FetchLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID,
-						   const TDesC8& aType, TInt aResultsRef,
-						   TInt aStatusRef );
-
-    /**
-     * The function fetches the size of the data of a leaf object. The size 
-     * is in bytes, and must reflect the number of bytes that will be 
-     * transferred when the framework calls FetchLeafObjectL. 
-	 *
-     * @since S60 v3.2
-     * @param aURI             URI of the object
-     * @param aLUID            LUID of the object (if the adapter have 
-     *                         earlier returned LUID to the DM Module).   
-     * @param aType            MIME type of the object
-     * @param aResultsRef      Reference to correct results, i.e. this 
-     *                         reference must be used when returning the 
-     *                         result by calling the SetResultsL.
-     * @param aStatusRef       Reference to correct command, i.e. this 
-     *                         reference must be used when calling the 
-     *                         SetStatusL of this command.
-    */
-    void FetchLeafObjectSizeL( const TDesC8& aURI, const TDesC8& aLUID,
-							   const TDesC8& aType, TInt aResultsRef,
-							   TInt aStatusRef );
-
-    /**
-     * The function fetches URI list. An adapter returns the list of URI 
-     * segments under the given URI be separated by slash ("/"). The URI 
-     * segment names for new objects must be given by the adapter.
-     * The list is returned by calling the SetResultsL function of 
-     * MSmlCallback callback interface. 
-	 *
-     * @since S60 v3.2
-     * @param aParentURI               URI of the parent object
-     * @param aParentLUID              LUID of the parent object (if the
-     *                                 adapter have earlier returned LUID to
-     *                                 the DM Module).   
-     * @param aPreviousURISegmentList  URI list with mapping LUID 
-     *                                 information, which is known by DM
-     *                                 engine.  
-     * @param aResultsRef              Reference to correct results, i.e. 
-     *                                 this reference must be used when 
-     *                                 returning the result by calling the 
-     *                                 SetResultsL.
-     * @param aStatusRef               Reference to correct command, i.e. 
-     *                                 this reference must be used when 
-     *                                 calling the SetStatusL of this 
-     *                                 command.
-    */
-    void ChildURIListL( const TDesC8& aURI, const TDesC8& aLUID,
-					    const CArrayFix<TSmlDmMappingInfo>& aPreviousURISegmentList,
-					    TInt aResultsRef, TInt aStatusRef );
-
-    /**
-     * The function adds node object. 
-     *
-     * @since S60 v3.2
-     * @param aURI             URI of the object
-     * @param aParentLUID      LUID of the parent object (if the adapter have
-     *                         earlier returned LUID to the DM Module).   
-     * @param aStatusRef       Reference to correct command, i.e. this 
-     *                         reference must be used when calling the 
-     *                         SetStatusL of this command.
-    */
-    void AddNodeObjectL( const TDesC8& aURI, const TDesC8& aParentLUID,
-						 TInt aStatusRef );
-    /**
-     * The adapter does not support streaming and no implementation is 
-     * provided for this function.
-     *
-     * @since S60 v3.2
-     * @param aURI         URI of the object
-     * @param aLUID        LUID of the object
-     * @param aStream      Data of the object. 
-     * @param aType        MIME type of the object
-     * @param aStatusRef   Reference to correct command, i.e. this reference
-     *                     must be used when calling the SetStatusL of this
-     *                     command.
-    */
-    void UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID,
-							RWriteStream*& aStream, const TDesC8& aType,
-		 					TInt aStatusRef );
-    /**
-     * The adapter does not support execute command and does not 
-     * provide implementation for this function. 
-     *
-     *  @since S60 v3.2
-     * @param aURI             URI of the command
-     * @param aLUID            LUID of the object
-     * @param aArgument        Argument for the command
-     * @param aType            MIME type of the object 
-     * @param aStatusRef       Reference to correct command, i.e. this 
-     *                         reference must be used when calling the 
-     *                         SetStatusL of this command.
-    */
-    void ExecuteCommandL( const TDesC8& aURI, const TDesC8& aLUID, 
-                          const TDesC8& aArgument, const TDesC8& aType, 
-                          TInt aStatusRef );
-    /**
-     * The adapter does not support execute command and does not 
-     * provide implementation for this function. 
-     *
-     * @since S60 v3.2
-     * @param aURI         URI of the command
-     * @param aLUID            LUID of the object 
-     * @param aStream      Argument for the command. 
-     * @param aType            MIME type of the object 
-     * @param aStatusRef       Reference to correct command, i.e. this 
-     *                         reference must be used when calling the 
-     *                         SetStatusL of this command.
-    */
-    void ExecuteCommandL( const TDesC8& aURI, const TDesC8& aLUID,
-						  RWriteStream*& aStream, const TDesC8& aType,
-						  TInt aStatusRef );
-    /**
-     * The adapter does not support copy command and does not 
-     * provide implementation for this function. 
-     *
-     * @since S60 v3.2
-     * @param aTargetURI       Target URI for the command
-     * @param aSourceLUID      LUID of the target object 
-     * @param aSourceURI       Source URI for the command
-     * @param aSourceLUID      LUID of the source object 
-     * @param aType            MIME type of the objects
-     * @param aStatusRef       Reference to correct command, i.e. this 
-     *                         reference must be used when calling the 
-     *                         SetStatusL of this command.
-    */
-    void CopyCommandL( const TDesC8& aTargetURI, const TDesC8& aTargetLUID, 
-                       const TDesC8& aSourceURI, const TDesC8& aSourceLUID, 
-                       const TDesC8& aType, TInt aStatusRef );
-    /**
-     * Not supported
-     *  @since S60 v3.2
-    */
-    void StartAtomicL();
-    /**
-     * Not Supported     
-     *  @since S60 v3.2
-     *
-    */
-    void CommitAtomicL();
-    /**
- 	 * Not supported.
-     *  @since S60 v3.2
-     */
-    void RollbackAtomicL();
-    /**
-     * Returns EFalse as the adapter does not support streaming
-     *
-     * @since S60 v3.2
-     * @param aItemSize size limit for stream usage
-     * @return TBool EFalse as streaming is not supported
-    */
-    TBool StreamingSupport( TInt& aItemSize );
-    /**
-     * Not supported
-     *
-     *  @since S60 v3.2
-    */  
-    void StreamCommittedL();
-    /**
-     * The function tells the adapter that all the commands of the message 
-     * that can be passed to the adapter have now been passed.  This 
-     * indciates that the adapter must supply status codes and results to 
-     * any buffered commands. This must be done at latest by the time this 
-     * function returns. This function is used at the end of SyncML messages, 
-     * and during processing of Atomic.  
-     *
-     *  @since S60 v3.2
-    */
-    void CompleteOutstandingCmdsL();
-        
-    /**
-     * Converts integer to 8bit descriptor
-     *
-     *  @since S60 v3.2
-     * @param    aLuid The integer to be converted
-     * @return    The Integer as a descriptor
-     */
-    HBufC8* IntToDes8L( TInt aLuid) const;
-    
-    /**
-     * Converts 8bit descriptor to integer
-     *
-     *  @since S60 v3.2
-     * @param    aLuid The descriptor to be converted
-     * @return    Integer value of the descriptor
-     */
-    TUint DesToIntL(const TDesC8& aLuid) const;
-
-
-private:
-
-     /**
-     * Constructor
-     */
-    CNSmlDmAOAdapter();
-
-    /**
-     * Constructor
-     * @param aDmCallback Callback object to the framework
-     */
-    CNSmlDmAOAdapter( MSmlDmCallback* aDmCallback );   
-
-    /**
-     * Second phase constructor
-     */
-    void ConstructL();
-     
-    /**
-     * Parses the last URI segment from URI
-     * @param    aURI The whole URI
-     * @return    The last URI segment
-     */
-    TPtrC8 LastURISeg(const TDesC8& aURI) const; 
-
-
-private: //data
-
-    /**
-     * Setting store object, which is called for managing settings 
-     * in CommsDat. Own.
-     */
-     CNSmlDmAOSettingStore * iSettingStore;
-        
-    };
-
-
-/**
- *  CSmlDmAOCommandElement 
- *
- * Helper class, which stores a single command for a VENDORCONFIG. 
- *  @lib nsmldmalwaysonadapter
- *  @since S60 v3.2
- */
-
-class CSmlDmAOCommandElement : public CBase
-    {
-
-public:
-
-    static CSmlDmAOCommandElement* NewLC( TBool aLeaf, 
-                                          TInt aStatusRef, 
-                                          TInt aResultRef, 
-                                          CNSmlDmAOAdapter::TCommandType  aCmdType, 
-                                          const TDesC8& aLastUriSeg, 
-                                          const TDesC8& aData );
-
-     ~CSmlDmAOCommandElement();
-
-    /**
-     * Returns the iExecuted member value of the object
-     *
-     * @since S60 v3.2
-     * @return The iExecuted member value of the object
-     */
-    inline TBool Executed();
-
-    /**
-     * Sets the iExecuted member value of the object
-     *
-     * @since S60 v3.2
-     * @param aExecuted Executed value for the object. 
-     */    
-    inline void SetExecuted( TBool aExecuted );
-    
-    /**
-     * Returns the iStatus member value of the object
-     *
-     * @since S60 v3.2
-     * @return The iStatus value of the object
-     */
-    inline CSmlDmAdapter::TError Status();
-    
-    /**
-     * Sets the iStatus member value of the object
-     *
-     * @since S60 v3.2
-     * @param aStatus Status value for the object. 
-     */    
-    inline void SetStatus( CSmlDmAdapter::TError aStatus ); 
-    
-    /**
-     * Returns the iLeaf member value of the object
-     *
-     * @since S60 v3.2
-     * @return The iLeaf member value of the object
-     */
-    inline TBool Leaf();
-    
-    /**
-     * Returns the iStatusRef member value of the object
-     *
-     * @since S60 v3.2
-     * @return The iStatusRef member value of the object
-     */
-    inline TInt StatusRef();
-    
-    /**
-     * Returns the iResultRef member value of the object
-     *
-     * @since S60 v3.2
-     * @return The iResultRef member value of the object
-     */
-    inline TInt ResultRef();
-    
-    /**
-     * Returns the iCmdType member value of the object
-     *
-     * @since S60 v3.2
-     * @return The iCmdType member value of the object
-     */
-    inline CNSmlDmAOAdapter::TCommandType  CmdType();        
-    
-    /**
-     * Returns the iData member value of the object
-     *
-     * @since S60 v3.2
-     * @return The iData member value of the object
-     */
-    inline const HBufC8* Data();
-    
-    /**
-     * Returns the iLastUriSeg member value of the object
-     *
-     * @since S60 v3.2
-     * @return The iLastUriSeg member value of the object
-     */
-    inline const HBufC8* LastUriSeg();
-    
-    /**
-     * Sets the iData member value of the object
-     *
-     * @since S60 v3.2
-     * @param aData Data set to the object. The data will be owned by 
-     * the command object. 
-     */    
-    inline void SetData( HBufC8* aData );
-
-private:
-
-    CSmlDmAOCommandElement( TBool aLeaf, 
-                            TInt aStatusRef, 
-                            TInt aResultRef, 
-                            CNSmlDmAOAdapter::TCommandType aCmdType );                              
-
-    void ConstructL( const TDesC8& aLastUriSeg, const TDesC8& aData );   
-
-    
-private: //data
-
-    /**
-     * Has command been executed. 
-     * Set to ETrue when command is executed.
-     */
-    TBool iExecuted;
-    
-    /**
-     * The execution status of an exeuted command. 
-     * Filled in when command is executed.
-     */    
-    CSmlDmAdapter::TError iStatus;
-    
-    
-    /**
-     * True if commend is for a leaf node, False if it is for a NAPDEF node.
-     */    
-    const TBool iLeaf;
-    
-    /**
-     * Reference for returning the status to DM framework.
-     */    
-    const TInt iStatusRef;
-    
-    /**
-     * Reference for returning result of Get command to the DM framework.
-     */    
-    const TInt iResultRef;
-    
-    /**
-     * Type of command.
-     */    
-    const CNSmlDmAOAdapter::TCommandType  iCmdType;        
-    
-
-    /**
-     * Data which is either ment to be stored to setting store 
-     * or which has been fetched from there. 
-     */
-    HBufC8* iData;
-
-    /**
-     * Last segment in the command URI, which indicates the leaf node 
-     * in question. For non leaf command empty string. 
-     */    
-    HBufC8* iLastUriSeg;
-
-    };
-    
-#include "nsmldmalwaysonadapter.inl"    
-
-#endif // NSMLDMALWAYSONADAPTER_H
--- a/omadm/omadmextensions/adapters/nsmldmalwaysonadapter/inc/nsmldmalwaysonadapter.inl	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,119 +0,0 @@
-/*
-* 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:  Contains implementations of inline functions.
-*
-*/
-
-
-// -----------------------------------------------------------------------------
-// Returns the iExecuted member of the object
-// -----------------------------------------------------------------------------
-//
-TBool CSmlDmAOCommandElement::Executed()
-    {
-    return iExecuted;
-    }
-
-// -----------------------------------------------------------------------------
-// Returns the iStatus member of the object
-// -----------------------------------------------------------------------------
-//
-CSmlDmAdapter::TError CSmlDmAOCommandElement::Status()
-    {
-    return iStatus;
-    }
-    
-// -----------------------------------------------------------------------------
-// Returns the iLeaf member of the object
-// -----------------------------------------------------------------------------
-//
-TBool CSmlDmAOCommandElement::Leaf()
-    {
-    return iLeaf;
-    }
-    
-// -----------------------------------------------------------------------------
-// Returns the iStatusRef member of the object
-// -----------------------------------------------------------------------------
-//
-TInt CSmlDmAOCommandElement::StatusRef()
-    {
-    return iStatusRef;    
-    }
-    
-// -----------------------------------------------------------------------------
-// Returns the iResultRef member of the object
-// -----------------------------------------------------------------------------
-//
-TInt CSmlDmAOCommandElement::ResultRef()
-    {
-    return iResultRef;
-    }
-    
-// -----------------------------------------------------------------------------
-// Returns the iCmdType member of the object
-// -----------------------------------------------------------------------------
-//
-CNSmlDmAOAdapter::TCommandType  CSmlDmAOCommandElement::CmdType()
-    {
-    return iCmdType;
-    }
-    
-// -----------------------------------------------------------------------------
-// Returns the iData member of the object
-// -----------------------------------------------------------------------------
-//
-const HBufC8* CSmlDmAOCommandElement::Data()
-    {
-    return iData;
-    }
-    
-// -----------------------------------------------------------------------------
-// Returns the iLastUriSeg member of the object
-// -----------------------------------------------------------------------------
-//
-const HBufC8* CSmlDmAOCommandElement::LastUriSeg()
-    {
-    return iLastUriSeg;
-    }
-    
-// -----------------------------------------------------------------------------
-// Sets the iExecuted member of the object
-// -----------------------------------------------------------------------------
-//
-void CSmlDmAOCommandElement::SetExecuted( TBool aExecuted )
-    {
-    iExecuted = aExecuted;
-    }
-
-// -----------------------------------------------------------------------------
-// Sets the iStatus member of the object
-// -----------------------------------------------------------------------------
-//
-void CSmlDmAOCommandElement::SetStatus( CSmlDmAdapter::TError aStatus )
-    {
-    iStatus = aStatus;
-    }
-    
-    
-// -----------------------------------------------------------------------------
-// Sets the iData member of the object. Ownership of aData argument will be 
-// transfered to the CSmlDmAOCommandElement
-// -----------------------------------------------------------------------------
-//
-void CSmlDmAOCommandElement::SetData( HBufC8* aData )
-    {
-    iData = aData;
-    }
-
--- a/omadm/omadmextensions/adapters/nsmldmalwaysonadapter/inc/nsmldmalwaysonsettingstore.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,165 +0,0 @@
-/*
-* 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:  Manages always-on settings in Central Repository.
-*
-*/
-
-
-#ifndef NSMLDMALWAYSONSETTINGSTORE_H
-#define NSMLDMALWAYSONSETTINGSTORE_H
-
-#include "nsmldmalwaysonadapter.h"
-
-#include <centralrepository.h>
-
-const TInt KDefaultLuid = 1;
-
-class CNSmlDmAOAdapter;
-class CSmlDmAOCommandElement;
-
-/**
- *  Setting Store is used for managing settings in CentralRepository
- *
- *  The class provides functions for executing commands 
- *  and sets of commands that involve manipulation of 
- *  data in CentralRepository. 
- *
- *  @lib nsmldmalwaysonadapter
- *  @since S60 v3.2
- */
-class CNSmlDmAOSettingStore : public CBase
-    {
-
-public:
-
-    static CNSmlDmAOSettingStore * NewL( CNSmlDmAOAdapter* aAdapter );
-
-    virtual ~CNSmlDmAOSettingStore();
-
-    /**
-     * Executes the argument command. 
-     *
-     * @since S60 v3.2
-     * @param aCmd Command to be executed
-     * @param aLUID LUID of the VENDORCONFIG which command is referring.
-     */
-     void ExecuteCmdL( CSmlDmAOCommandElement& aCmd, TUint aLuid);   
-
-    /**
-     * Fetches all VENDORCONFIGs and inserts id of each VENDORCONFIG
-     * into the argument array (in practise there is only one VENDORCONFIG)
-     *
-     * @since S60 v3.2
-     * @param aLUIDArray Array for VENDORCONFIG ids
-     */
-    void GetVendorConfigsL( RArray<TUint32>& aLUIDArray );
- 
-private:
-
-    CNSmlDmAOSettingStore( CNSmlDmAOAdapter * aAdapter );
-
-    void ConstructL();
-
-//----------- Commands for managing leaf nodes -------------------//
-
-    /**
-     * Executes VENDORCONFIG commands. The valid commands include 
-     * get. With get commands the iData 
-     * memeber is used to pass fetched data back to caller. 
-     * After execution of command the function fills in the status 
-     * in aCmd.iStatus memeber and sets aCmd.iExecuted as True. The function
-     * leaves if command can not be executed for some reason. 
-     *
-     * @param aCmd The command to be executed
-     * @param aLuid The id of the VENDORCONFIG
-     */
-    void ExecuteVendorConfigCmdL( CSmlDmAOCommandElement& aCmd, TUint aLuid );    
-
-    /**
-     * Executes NAME commands. The valid commands include 
-     * update and get. With update commands data is read from the 
-     * iData memeber of the argument command. With get commands the iData 
-     * memeber is used to pass fetched data back to caller. 
-     * After execution of command the function fills in the status 
-     * in aCmd.iStatus memeber and sets aCmd.iExecuted as True. The function
-     * leaves if command can not be executed for some reason. 
-     *
-     * @param aCmd    The command to be executed
-     * @param aCenrep Pointer to PdpContextManager2 repository
-     */
-    void ExecuteNameCmdL( CSmlDmAOCommandElement& aCmd, 
-                          CRepository*            aCenrep );
-
-
-    /**
-     * Executes AWON-PDPC commands. The valid commands include 
-     * update and get. With update commands data is read from the 
-     * iData memeber of the argument command. With get commands the iData 
-     * memeber is used to pass fetched data back to caller. 
-     * After execution of command the function fills in the status 
-     * in aCmd.iStatus memeber and sets aCmd.iExecuted as True. The function
-     * leaves if command can not be executed for some reason. 
-     *
-     * @param aCmd The command to be executed
-     * @param aCenrep Pointer to PdpContextManager2 repository
-     */
-    void ExecuteAwonPdpcCmdL( CSmlDmAOCommandElement& aCmd, 
-                              CRepository*            aCenrep );
-
-
-    /**
-     * Executes T-RETRY commands. The valid commands include 
-     * update and get. With update commands data is read from the 
-     * iData memeber of the argument command. With get commands the iData 
-     * memeber is used to pass fetched data back to caller. 
-     * After execution of command the function fills in the status 
-     * in aCmd.iStatus memeber and sets aCmd.iExecuted as True. The function
-     * leaves if command can not be executed for some reason. 
-     *
-     * @param aCmd The command to be executed
-     * @param aCenrep Pointer to PdpContextManager2 repository
-     */
-    void ExecuteTRetryCmdL( CSmlDmAOCommandElement& aCmd, 
-                            CRepository*            aCenrep );
-    
-     /**
-     * Parses integer from descriptor 
-     *
-     * @param aPtr Descriptor containing value
-     * @param aInt Value as integer
-     */                        
-    void ParseIntegerL( const TDesC& aPtr, TInt& aInt );
-    
-     /**
-     * Parses settings for home network and visited network 
-     *
-     * @param aInt Interger containing home & visited network setting
-     * @param aHplmn "1" when always-on enabled in hplmn, otherwise "0"
-     * @param aVplmn "1" when always-on enabled in vplmn, otherwise "0"
-     */
-    void ParseAwonPdpcValuesL( const TInt aInt, TInt& aHplmn, TInt& aVplmn );                        
-
-private: //data
-     
-    /**
-     * Pointer to the adapter. This is used for 
-     * querying data from DM framework when necessary
-     * and using helper functions. Not own.
-     */ 
-    CNSmlDmAOAdapter* iAdapter;
-
-  };
-
-
-#endif // NSMLDMALWAYSONSETTINGSTORE_H
--- a/omadm/omadmextensions/adapters/nsmldmalwaysonadapter/rom/nsmldmalwaysonadapter.iby	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-/*
-* 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:  Image description file for project nsmldmalwaysonadapter
-*
-*/
-
-
-#ifndef NSMLDMALWAYSONADAPTER_IBY
-#define NSMLDMALWAYSONADAPTER_IBY
-
-#include <data_caging_paths_for_iby.hrh>
-
-#ifdef __ALWAYS_ONLINE_PDPCONTEXT2 
-#ifdef __SYNCML_DM
-
-ECOM_PLUGIN( nsmldmalwaysonadapter.dll, nsmldmalwaysonadapter.rsc )
-
-#endif // __SYNCML_DM
-#endif // __ALWAYS_ONLINE_PDPCONTEXT2
-
-#endif // NSMLDMALWAYSONADAPTER_IBY
--- a/omadm/omadmextensions/adapters/nsmldmalwaysonadapter/src/nsmldmalwaysonadapter.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,647 +0,0 @@
-/*
-* 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:  Provides handling of Always-on settings in Device management.
-*
-*/
-
-
-#include <ecom/implementationproxy.h>
-
-#include "nsmldmalwaysonadapter.h"
-#include "logger.h"
-
-// ======== MEMBER FUNCTIONS ========
-
-
-// --------------------------------------------------------------------------
-// Maps plugin UID to its factory function (constructor)
-// --------------------------------------------------------------------------
-const TImplementationProxy ImplementationTable[] =
-    {
-    IMPLEMENTATION_PROXY_ENTRY(0x101f6d36, 
-                               CNSmlDmAOAdapter::NewL)
-    };
-
-// --------------------------------------------------------------------------
-// For ecom plugin implementation
-// -------------------------------------------------------------------------
-
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy( TInt& aTableCount )
-    {
-    aTableCount = sizeof(ImplementationTable) / sizeof(TImplementationProxy);
-    return ImplementationTable;
-    }
-
-// --------------------------------------------------------------------------
-// CNSmlDmAOAdapter::NewL
-// --------------------------------------------------------------------------
-CNSmlDmAOAdapter* CNSmlDmAOAdapter::NewL( MSmlDmCallback* aDmCallback )
-    {
-    LOGSTRING("CNSmlDmAOAdapter::NewL: Start");
-    
-    CNSmlDmAOAdapter* self = new (ELeave) CNSmlDmAOAdapter( aDmCallback );
-    CleanupStack::PushL(self);
-    self->ConstructL();
-    CleanupStack::Pop( self );
-    
-    LOGSTRING("CNSmlDmAOAdapter::NewL: End");
-    return self;
-    }
-
-// --------------------------------------------------------------------------
-// CNSmlDmAOAdapter::CNSmlDmAOAdapter
-// --------------------------------------------------------------------------
-
-CNSmlDmAOAdapter::CNSmlDmAOAdapter( MSmlDmCallback* aDmCallback ) 
-    : CSmlDmAdapter( aDmCallback )
-    {
-    }
-
-// --------------------------------------------------------------------------
-// CNSmlDmAOAdapter::ConstructL
-// --------------------------------------------------------------------------
-void CNSmlDmAOAdapter::ConstructL()
-    {
-    LOGSTRING( "CNSmlDmAOAdapter::CNSmlDmAOAdapter: Start" );
-    
-    iSettingStore = CNSmlDmAOSettingStore::NewL( this );
-    
-    LOGSTRING( "CNSmlDmAOAdapter::CNSmlDmAOAdapter: End" );
-    }
-
-// --------------------------------------------------------------------------
-// CNSmlDmAOAdapter::~CNSmlDmAOAdapter
-// --------------------------------------------------------------------------
-CNSmlDmAOAdapter::~CNSmlDmAOAdapter()
-    {
-    LOGSTRING( "CNSmlDmAOAdapter::~CNSmlDmAOAdapter: Start" );    
- 
-    //iBuffer.ResetAndDestroy();
-    //iBuffer.Close();
-    delete iSettingStore;
- 
-    LOGSTRING( "CNSmlDmAOAdapter::~CNSmlDmAOAdapter: End" );
-    }
-    
-// --------------------------------------------------------------------------
-// CNSmlDmAOAdapter::DDFVersionL
-// Returns ddf version nr
-// --------------------------------------------------------------------------
-void CNSmlDmAOAdapter::DDFVersionL( CBufBase& aDDFVersion )
-    {
-    LOGSTRING( "CNSmlDmAOAdapter::DDFVersionL: Start" );
- 
-    aDDFVersion.InsertL( 0, KNSmlDmAOAdapterDDFVersion );
- 
-    LOGSTRING( "CNSmlDmAOAdapter::DDFVersionL:End" );
-    }
-   
-// --------------------------------------------------------------------------
-// CNSmlDmAOAdapter::DDFStructureL
-//  Constructs the DDF structure
-// --------------------------------------------------------------------------
-void CNSmlDmAOAdapter::DDFStructureL( MSmlDmDDFObject& aDDF )
-    {
-    LOGSTRING( "CNSmlDmAOAdapter::DDFStructureL: Start" );
-    TSmlDmAccessTypes accessTypes;
-
-    // VENDORCONFIG
-    MSmlDmDDFObject& ao = aDDF.AddChildObjectL( KNSmlDmAOAdapterAO );
-    
-    accessTypes.SetGet();    
-    
-    ao.SetAccessTypesL( accessTypes );
-    ao.SetOccurenceL( MSmlDmDDFObject::EOne );
-    ao.SetScopeL( MSmlDmDDFObject::EPermanent );
-    ao.SetDFFormatL( MSmlDmDDFObject::ENode );
-    ao.AddDFTypeMimeTypeL( KNSmlDmAOAdapterTextPlain );
-    ao.SetDescriptionL( KNSmlDmAOAdapterAODescription );
-    accessTypes.Reset();
-
-    // VENDORCONFIG/Name
-    MSmlDmDDFObject& name = ao.AddChildObjectL( KNSmlDmAOAdapterName );
-    
-    accessTypes.SetGet();
-    accessTypes.SetReplace();
-    accessTypes.SetAdd();
-    
-    name.SetAccessTypesL( accessTypes );
-    name.SetOccurenceL( MSmlDmDDFObject::EOne );
-    name.SetScopeL( MSmlDmDDFObject::EDynamic );
-    name.SetDFFormatL( MSmlDmDDFObject::EChr );
-    name.SetDescriptionL( KNSmlDmAOAdapterNameDescription );
-    accessTypes.Reset();
-
-    // VENDORCONFIG/AWON-PDPC
-    MSmlDmDDFObject& awonPdpc = 
-                          ao.AddChildObjectL( KNSmlDmAOAdapterAwonPdpc );
-    
-    accessTypes.SetGet();
-    accessTypes.SetReplace();
-    accessTypes.SetAdd();
-    
-    awonPdpc.SetAccessTypesL( accessTypes );
-    awonPdpc.SetOccurenceL( MSmlDmDDFObject::EOne );
-    awonPdpc.SetScopeL( MSmlDmDDFObject::EDynamic );
-    awonPdpc.SetDFFormatL( MSmlDmDDFObject::EChr );
-    awonPdpc.SetDescriptionL( KNSmlDmAOAdapterAwonPdpcDescription );
-    accessTypes.Reset();
-        
-    // VENDORCONFIG/T-RETRY
-    MSmlDmDDFObject& tRetry = 
-                          ao.AddChildObjectL( KNSmlDmAOAdapterTRetry );
-    
-    accessTypes.SetGet();
-    accessTypes.SetReplace();
-    accessTypes.SetAdd();
-    
-    tRetry.SetAccessTypesL( accessTypes );
-    tRetry.SetOccurenceL( MSmlDmDDFObject::EOne );
-    tRetry.SetScopeL( MSmlDmDDFObject::EDynamic );
-    tRetry.SetDFFormatL( MSmlDmDDFObject::EChr );
-    tRetry.SetDescriptionL( KNSmlDmAOAdapterTRetryDescription );
-    accessTypes.Reset();
-    
-    LOGSTRING( "CNSmlDmAOAdapter::DDFStructureL: End" );    
-    }
-
-// -------------------------------------------------------------------------
-// CNSmlDmAOAdapter::UpdateLeafObjectL
-// Adds or updates leaf node value. 
-// -------------------------------------------------------------------------
-void CNSmlDmAOAdapter::UpdateLeafObjectL( const TDesC8& aURI, 
-                                          const TDesC8& aLUID, 
-                                          const TDesC8& aObject, 
-                                          const TDesC8& /*aType*/, 
-                                          TInt aStatusRef )
-    {
-    LOGSTRING( "CNSmlDmAOAdapter::UpdateLeafObjectL: Start" );
-    LOGSTRING4( "\tUpdateLeafObjectL  \tURI: %S, \n\tLUID: %S,\
-                         \tobject: %S ", 
-                        &aURI, &aLUID, &aObject );
-        
-	// execute command and return status  
-    CSmlDmAOCommandElement* cmd = 
-    CSmlDmAOCommandElement::NewLC( ETrue, 
-                                   aStatusRef,
-                                   KNSmlDmAOInvalidRef, 
-                                   CNSmlDmAOAdapter::EAddCmd,
-                                   LastURISeg( aURI ), 
-                                   aObject);
-    
-    TInt luid( KDefaultLuid );
-    
-    if ( aLUID.Length() > 0 )
-        {
-        luid = DesToIntL( aLUID );    
-        }
-                                                                                                     
-    iSettingStore->ExecuteCmdL( *cmd, luid );    
-    
-    LOGSTRING2( "\tCmd executed with status: %d", 
-                          cmd->Status() );
-    Callback().SetStatusL( aStatusRef, cmd->Status() );     
-    CleanupStack::PopAndDestroy( cmd );                
-        
-    LOGSTRING( "CNSmlDmAOAdapter::UpdateLeafObjectL: End" );    
-    }
-// --------------------------------------------------------------------------
-// CNSmlDmAOAdapter::DeleteObjectL
-// Not supported
-// --------------------------------------------------------------------------
-
-void CNSmlDmAOAdapter::DeleteObjectL( const TDesC8& /*aURI*/, 
-                                      const TDesC8& /*aLUID*/,
-						              TInt aStatusRef )
-    {
-    LOGSTRING( "CNSmlDmAOAdapter::DeleteObjectL: Start" );
-    Callback().SetStatusL(aStatusRef, CSmlDmAdapter::EError); 
-    LOGSTRING( "CNSmlDmAOAdapter::DeleteObjectL: End" );
-    }
-    
-// -------------------------------------------------------------------------
-// CNSmlDmAOAdapter::FetchLeafObjectL
-// Fetches leaf object value.
-// -------------------------------------------------------------------------
-void CNSmlDmAOAdapter::FetchLeafObjectL( const TDesC8& aURI, 
-                                         const TDesC8& aLUID, 
-                                         const TDesC8& /*aType*/, 
-                                         const TInt aResultsRef, 
-                                         const TInt aStatusRef )
-    {
-    LOGSTRING( "NSmlDmAOAdapter::FetchLeafObjectL: Start" );
-    LOGSTRING3( "\tFetchLeafObjectL  \tURI: %S, \tLUID: %S,", 
-                        &aURI, &aLUID );
-    
-    CSmlDmAOCommandElement* cmd = 
-    CSmlDmAOCommandElement::NewLC( ETrue, 
-                                   aStatusRef, 
-                                   aResultsRef, 
-                                   CNSmlDmAOAdapter::EGetCmd,
-                                   LastURISeg( aURI ), 
-                                   KNullDesC8);
-
-    TInt luid( KDefaultLuid );
-    
-    if ( aLUID.Length() > 0 )
-        {
-        luid = DesToIntL( aLUID );    
-        }
-        
-    iSettingStore->ExecuteCmdL( *cmd, luid );
-    LOGSTRING2( "\tCmd executed with status: %d ", 
-                          cmd->Status() );
-
-    // if executed return status
-    if ( cmd->Executed() ) 
-        {
-        Callback().SetStatusL( aStatusRef, cmd->Status() );            
-        // if successful set results
-        if ( cmd->Status() == CSmlDmAdapter::EOk )
-            {
-            LOGSTRING2( "\tCmd executed with result: %S ", 
-                                  cmd->Data() );
-            CBufBase* result = CBufFlat::NewL( cmd->Data()->Size() );
-            CleanupStack::PushL( result );
-            result->InsertL( 0, *cmd->Data() );
-            Callback().SetResultsL( aResultsRef, *result, KNullDesC8 );
-            CleanupStack::PopAndDestroy( result );
-            }
-        }
-    else
-        {
-        // failed to execute command
-        Callback().SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-        }
-    CleanupStack::PopAndDestroy( cmd );
-    
-    
-    LOGSTRING( "NSmlDmAOAdapter::FetchLeafObjectL: End" );
-    }
-
-// --------------------------------------------------------------------------
-//  CNSmlDmAOAdapter::FetchLeafObjectSizeL
-//  Fetches leaf object size.
-// -------------------------------------------------------------------------
-void CNSmlDmAOAdapter::FetchLeafObjectSizeL( const TDesC8& aURI, 
-                                             const TDesC8& aLUID,
-									         const TDesC8& /* aType */, 
-									         TInt aResultsRef,
-									         TInt aStatusRef )
-    {
-    LOGSTRING( "CNSmlDmAOAdapter::FetchLeafObjectSizeL: Start" );
-    LOGSTRING3( "\tFetchLeafObjectSizeL  \tURI: %S, \tLUID: %S,", 
-                         &aURI, &aLUID );
-   
-    CSmlDmAOCommandElement* cmd = 
-    CSmlDmAOCommandElement::NewLC( ETrue, 
-                                   aStatusRef, 
-                                   aResultsRef, 
-                                   CNSmlDmAOAdapter::EGetSizeCmd,
-                                   LastURISeg( aURI ), 
-                                   KNullDesC8);
-                                   
-    TInt luid( KDefaultLuid );
-    
-    if ( aLUID.Length() > 0 )
-        {
-        luid = DesToIntL( aLUID );    
-        }
-                                       
-    iSettingStore->ExecuteCmdL( *cmd, luid );
-    
-    LOGSTRING2( "\tCmd executed with status: %d ", 
-                          cmd->Status() );
-    // if executed get status
-    if ( cmd->Executed() ) 
-        {
-        Callback().SetStatusL( aStatusRef, cmd->Status() );            
-        // if successful get results
-        if ( cmd->Status() == CSmlDmAdapter::EOk )
-            {
-            LOGSTRING2( "\tCmd executed with result: %S ", 
-                                  cmd->Data() );
-            CBufBase* result = CBufFlat::NewL( cmd->Data()->Size() );
-            CleanupStack::PushL( result );
-            result->InsertL( 0, *cmd->Data() );
-            Callback().SetResultsL( aResultsRef, *result, KNullDesC8 );
-            CleanupStack::PopAndDestroy( result );
-            }
-        }
-    else
-        {
-        // failed to execute command
-        Callback().SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-        }
-    
-    CleanupStack::PopAndDestroy( cmd );
-        
-    LOGSTRING( "CNSmlDmAOAdapter::FetchLeafObjectSizeL: End" );
-    }
-
-// ------------------------------------------------------------------------
-//  CNSmlDmAOAdapter::ChildURIListL
-//  Fetches child nodes of a node. these may be either all VENDORCONFIG 
-//  nodes or leaf nodes under a VENDORCONFIG node. 
-// ------------------------------------------------------------------------
-void CNSmlDmAOAdapter::ChildURIListL( const TDesC8& aURI, 
-                                      const TDesC8& aLUID,
-					                  const CArrayFix<TSmlDmMappingInfo>& 
-					                  /*aPreviousURISegmentList*/,
-					                  TInt aResultsRef, 
-					                  TInt aStatusRef )
-    {
-    LOGSTRING( "CNSmlDmAOAdapter::ChildURIListL: Start" );
-    LOGSTRING3( "\tChildURIListL  URI: %S, LUID: %S ", 
-                        &aURI, &aLUID );
-    
-    CBufBase* resultList = CBufFlat::NewL( KSmlMaxURISegLen );
-    CleanupStack::PushL( resultList );
-	
-	// get all leaf nodes below VENDORCONFIG node
-    if ( !aURI.Compare( KNSmlDmAOAdapterAO ) )
-        {        
-        CSmlDmAOCommandElement* cmd = 
-        CSmlDmAOCommandElement::NewLC( EFalse, 
-                                       aStatusRef,
-                                       aResultsRef, 
-                                       CNSmlDmAOAdapter::EGetCmd, 
-                                       KNullDesC8, 
-                                       KNullDesC8 );
-                                       
-        TInt luid( KDefaultLuid );
-    
-        if ( aLUID.Length() > 0 )
-            {
-            luid = DesToIntL( aLUID );    
-            }
-                                           
-        iSettingStore->ExecuteCmdL( *cmd, luid );
-        
-        LOGSTRING2( "\tCmd executed with status: %d ", 
-                              cmd->Status() );
-   
-        Callback().SetStatusL( aStatusRef, cmd->Status() );
-        if( cmd->Status() == CSmlDmAdapter::EOk )
-            {
-            resultList->InsertL( 0, *cmd->Data() );
-            Callback().SetResultsL( aResultsRef, 
-                                    *resultList, 
-                                    KNullDesC8 );
-            } 
-   
-        CleanupStack::PopAndDestroy( cmd );               
-        }        
-   
-    CleanupStack::PopAndDestroy( resultList );
-    LOGSTRING( "CNSmlDmAOAdapter::ChildURIListL: End" );
-    }
- 
-// --------------------------------------------------------------------------
-//  CNSmlDmAOAdapter::AddNodeObjectL
-//  Not supported
-// --------------------------------------------------------------------------
-void CNSmlDmAOAdapter::AddNodeObjectL( const TDesC8& /*aURI*/, 
-                                       const TDesC8& /*aParentLUID*/,
-								       TInt aStatusRef )
-    {
-    LOGSTRING( "CNSmlDmAOAdapter::AddNodeObjectL: Start" );
-    Callback().SetStatusL(aStatusRef, CSmlDmAdapter::EError);
-    LOGSTRING( "CNSmlDmAOAdapter::AddNodeObjectL: End" );
-    }
-
-// -------------------------------------------------------------------------
-//  CNSmlDmAOAdapter::UpdateLeafObjectL
-//  Not supported from stream
-// -------------------------------------------------------------------------
-void CNSmlDmAOAdapter::UpdateLeafObjectL( const TDesC8& /* aURI */, 
-                                          const TDesC8& /* aLUID */, 
-                                          RWriteStream*& /* aStream */, 
-                                          const TDesC8& /* aType */, 
-                                          TInt aStatusRef )
-    {
-    LOGSTRING( "CNSmlDmAOAdapter::UpdateLeafObjectL: Start" );
-    Callback().SetStatusL(aStatusRef, CSmlDmAdapter::EError);    
-    LOGSTRING( "CNSmlDmAOAdapter::UpdateLeafObjectL: End" );
-    }
-
-
-
-// -------------------------------------------------------------------------
-//  CNSmlDmAOAdapter::ExecuteCommandL
-//  Not supported
-// -------------------------------------------------------------------------
-void CNSmlDmAOAdapter::ExecuteCommandL( const TDesC8& /* aURI */, 
-                                        const TDesC8& /* aLUID */, 
-                                        const TDesC8& /* aArgument */, 
-                                        const TDesC8& /* aType */, 
-                                        TInt aStatusRef )
-    {
-    LOGSTRING( "CNSmlDmAOAdapter::ExecuteCommandL: Start" );
-    Callback().SetStatusL(aStatusRef, CSmlDmAdapter::EError);    
-    LOGSTRING( "CNSmlDmAOAdapter::ExecuteCommandL: End" );
-    }
-// -------------------------------------------------------------------------
-//  CNSmlDmAOAdapter::ExecuteCommandL
-//  Not supported
-// -------------------------------------------------------------------------
-void CNSmlDmAOAdapter::ExecuteCommandL( const TDesC8& /* aURI */, 
-                                        const TDesC8& /* aLUID */, 
-                                        RWriteStream*& /* aStream */, 
-                                        const TDesC8& /* aType */, 
-                                        TInt aStatusRef )
-    {
-    LOGSTRING( "CNSmlDmAOAdapter::ExecuteCommandL: Start" );
-    Callback().SetStatusL( aStatusRef, CSmlDmAdapter::EError );    
-    LOGSTRING( "CNSmlDmAOAdapter::ExecuteCommandL: End" );
-    }
- 
-// -------------------------------------------------------------------------
-//  CNSmlDmAOAdapter::CopyCommandL
-//  Not supported
-// -------------------------------------------------------------------------
-void CNSmlDmAOAdapter::CopyCommandL( const TDesC8& /* aTargetURI */ , 
-                                     const TDesC8& /* aTargetLUID */ , 
-                                     const TDesC8& /* aSourceURI */ , 
-                                     const TDesC8& /* aSourceLUID */, 
-                                     const TDesC8& /* aType */ , 
-                                     TInt aStatusRef )
-    {
-    //not supported
-    LOGSTRING( "CNSmlDmAOAdapter::CopyCommandL: Sart" );
-    Callback().SetStatusL( aStatusRef, CSmlDmAdapter::EError );    
-    LOGSTRING( "CNSmlDmAOAdapter::CopyCommandL: End" );
-    }
-// -------------------------------------------------------------------------
-//  CNSmlDmAOAdapter::StartAtomicL
-//  Not supported
-// -------------------------------------------------------------------------
-void CNSmlDmAOAdapter::StartAtomicL()
-    {
-    LOGSTRING( "CNSmlDmAOAdapter::StartAtomicL: Start" );
-    LOGSTRING( "CNSmlDmAOAdapter::StartAtomicL: End" );
-    }
-// -------------------------------------------------------------------------
-//  CNSmlDmAOAdapter::CommitAtomicL
-//  Not supported
-// -------------------------------------------------------------------------
-void CNSmlDmAOAdapter::CommitAtomicL()
-    {
-    LOGSTRING( "CNSmlDmAOAdapter::CommitAtomicL: Start" );
-    LOGSTRING( "CNSmlDmAOAdapter::CommitAtomicL: End" );
-    }
-
-// -------------------------------------------------------------------------
-//  CNSmlDmAOAdapter::RollbackAtomicL
-//  Not supported
-// -------------------------------------------------------------------------
-void CNSmlDmAOAdapter::RollbackAtomicL()
-    {
-    LOGSTRING( "CNSmlDmAOAdapter::RollbackAtomicL: Start" );
-    LOGSTRING( "CNSmlDmAOAdapter::RollbackAtomicL: End" );
-    }
-
-TBool CNSmlDmAOAdapter::StreamingSupport( TInt& /* aItemSize */ )
-    {
-    LOGSTRING( "CNSmlDmAOAdapter::StreamingSupport: Start" );
-    LOGSTRING( "CNSmlDmAOAdapter::StreamingSupport: End" );
-    return EFalse;
-    }
-// -------------------------------------------------------------------------
-//  CNSmlDmAOAdapter::StreamCommittedL
-//  Not supported
-// -------------------------------------------------------------------------
-void CNSmlDmAOAdapter::StreamCommittedL()
-    {
-    LOGSTRING( "CNSmlDmAOAdapter::StreamCommittedL: Start" );
-    LOGSTRING( "CNSmlDmAOAdapter::StreamCommittedL: End" );
-    }
-
-// -------------------------------------------------------------------------
-// CNSmlDmAOAdapter::CompleteOutstandingCmdsL
-// Buffering not needed because nodes can't be added
-// -------------------------------------------------------------------------
-void CNSmlDmAOAdapter::CompleteOutstandingCmdsL()
-    {
-    LOGSTRING( "CNSmlDmAOAdapter::CompleteOutstandingCmdsL: Start");
-    LOGSTRING( "CNSmlDmAOAdapter::CompleteOutstandingCmdsL: End" );    
-    }
-
-// --------------------------------------------------------------------------
-// CNSmlDmAOAdapter::IntToDes8L
-// Converts integer to 8bit descriptor
-// --------------------------------------------------------------------------
-HBufC8* CNSmlDmAOAdapter::IntToDes8L( TInt aLuid ) const
-    {
-    HBufC8* buf = HBufC8::NewL( 10 ); //10 = max length of 32bit integer
-    TPtr8 ptrBuf = buf->Des();
-    ptrBuf.Num( aLuid );
-    return buf;
-    }
-    
-// --------------------------------------------------------------------------
-// CNSmlDmAOAdapter::DesToIntL
-// Converts 8bit descriptor to int
-// --------------------------------------------------------------------------
-TUint CNSmlDmAOAdapter::DesToIntL( const TDesC8& aLuid ) const
-    {
-    TLex8 lex( aLuid );
-    TUint value( 0 );
-    User::LeaveIfError( lex.Val( value ) );
-    return value;
-    }        
-
-// --------------------------------------------------------------------------
-// CNSmlDmAOAdapter::LastURISeg
-// Returns the last uri segemnt of a uri. 
-// --------------------------------------------------------------------------
-TPtrC8 CNSmlDmAOAdapter::LastURISeg( const TDesC8& aURI ) const
-    {
-    TInt i;
-    for ( i=aURI.Length()-1; i >= 0; i-- )
-        {
-        if ( aURI[i]=='/' )
-            {
-            break;
-            }
-        }
-        
-    if ( i==0 )
-        {
-        return aURI;
-        }
-    else
-        {
-        return aURI.Mid( i + 1 );
-        }
-    }
-
-
-//---------------------- CSmlDmAOCommandElement -------------------------//
-
-// --------------------------------------------------------------------------
-// CSmlDmAOCommandElement* CSmlDmAOCommandElement::NewLC
-// --------------------------------------------------------------------------
-
-CSmlDmAOCommandElement* CSmlDmAOCommandElement::NewLC( TBool aLeaf,
-                                                       TInt aStatusRef, 
-                                                       TInt aResultRef, 
-                                                       CNSmlDmAOAdapter::TCommandType aCmdType,
-                                                       const TDesC8& aLastUriSeg, 
-                                                       const TDesC8& aData )
-    {
-    CSmlDmAOCommandElement* self = new (ELeave) CSmlDmAOCommandElement( aLeaf, 
-                                                                        aStatusRef, 
-                                                                        aResultRef, 
-                                                                        aCmdType );
-    CleanupStack::PushL(self);
-    self->ConstructL( aLastUriSeg, aData );
-    return self;
-    }    
-    
-// --------------------------------------------------------------------------
-// CSmlDmAOCommandElement::~CSmlDmAOCommandElement
-// --------------------------------------------------------------------------
-CSmlDmAOCommandElement::~CSmlDmAOCommandElement()
-    {
-    delete iLastUriSeg;
-    delete iData;
-    }
-    
-// --------------------------------------------------------------------------
-// CSmlDmAOCommandElement::CSmlDmAOCommandElement
-// --------------------------------------------------------------------------
-CSmlDmAOCommandElement::CSmlDmAOCommandElement( TBool aLeaf,
-                                                TInt aStatusRef, 
-                                                TInt aResultRef, 
-                                                CNSmlDmAOAdapter::TCommandType  aCmdType )
-                                                : iStatus( CSmlDmAdapter::EError ),
-                                                iLeaf( aLeaf ),
-                                                iStatusRef( aStatusRef ),
-                                                iResultRef( aResultRef ),
-                                                iCmdType( aCmdType ),
-                                                iData( NULL )
-                                                
-    {
-    }
-
-// --------------------------------------------------------------------------
-// CSmlDmAOCommandElement::ConstructL
-// --------------------------------------------------------------------------
-void CSmlDmAOCommandElement::ConstructL( const TDesC8& aLastUriSeg, 
-                                         const TDesC8& aData )
-    {
-    iLastUriSeg = aLastUriSeg.AllocL();    
-    iData = aData.AllocL();
-    }
--- a/omadm/omadmextensions/adapters/nsmldmalwaysonadapter/src/nsmldmalwaysonadapter.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-CHARACTER_SET UTF8/*
-* 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:  Resource definitions for project nsmldmalwaysonadapter
-*
-*/
-
-
-#include <ecom/registryinfo.rh>
-#include "nsmldmconstants.h"
-
-RESOURCE REGISTRY_INFO theRegistryInfo
-  {
-  dll_uid = 0x101f6d36; //The DLL's 3rd UID.
-  interfaces = 
-      {
-      INTERFACE_INFO
-          {
-          interface_uid = KNSmlDMInterfaceUid; //DM interface UID
-          implementations = 
-            {
-            IMPLEMENTATION_INFO
-                {
-                implementation_uid = 0x101f6d36; // adapter implementation UID
-                version_no = 1; 
-                display_name = "";
-                default_data = "";
-                opaque_data = "";
-                }
-            };
-          }
-      };
-    }
-
-// End of File
--- a/omadm/omadmextensions/adapters/nsmldmalwaysonadapter/src/nsmldmalwaysonsettingstore.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,396 +0,0 @@
-/*
-* 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:  Provides settings management in Central Repository.
-*
-*/
-
-
-
-#include <utf.h>
-#include <pdpcontextmanagerinternalcrkeys.h>
-
-#include "nsmldmalwaysonsettingstore.h"
-#include "nsmldmalwaysonadapter.h"
-#include "logger.h"
-
-// AWON-PDPC
-// Values are XY, where X is related to 3G flag and Y is related to 2G flag.
-// Possible values are:
-// "00", AlwaysOn is OFF for both 3G and 2G
-// "10", AlwaysOn is ON for 3G, OFF for 2G
-// "01", AlwaysOn is OFF for 3G, ON for 2G
-// "11", AlwaysOn is ON for 3G, ON for 2G
-const TInt KAwonPdpc_Off3G_Off2G = 00;
-const TInt KAwonPdpc_Off3G_On2G  = 01;
-const TInt KAwonPdpc_On3G_Off2G  = 10;
-const TInt KAwonPdpc_On3G_On2G   = 11;
-
-const TInt KBufSize = 10;
-
-// -----------------------------------------------------------------------------
-// CNSmlDmAOSettingStore::NewL
-// -----------------------------------------------------------------------------
-CNSmlDmAOSettingStore* CNSmlDmAOSettingStore::NewL( CNSmlDmAOAdapter * aAdapter )
-    {
-    CNSmlDmAOSettingStore* self = new (ELeave) CNSmlDmAOSettingStore( aAdapter );
-    CleanupStack::PushL(self);
-    self->ConstructL();
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDmAOSettingStore::CNSmlDmAOSettingStore
-// -----------------------------------------------------------------------------
-CNSmlDmAOSettingStore::CNSmlDmAOSettingStore( CNSmlDmAOAdapter * aAdapter ) 
-    : iAdapter( aAdapter )
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDmAOSettingStore::ConstructL
-// -----------------------------------------------------------------------------
-void CNSmlDmAOSettingStore::ConstructL()
-    {   
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDmAOSettingStore::~CNSmlDmAOSettingStore
-// -----------------------------------------------------------------------------
-CNSmlDmAOSettingStore::~CNSmlDmAOSettingStore()
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDmAOSettingStore::ExecuteCmdL
-// Executes a single command
-// -----------------------------------------------------------------------------
-void CNSmlDmAOSettingStore::ExecuteCmdL( CSmlDmAOCommandElement& aCmd, TUint aLuid)
-    {   
-    if( !aCmd.Leaf() )
-        {
-        ExecuteVendorConfigCmdL( aCmd, aLuid );
-        }
-    else 
-        {
-        CRepository* cenrep = CRepository::NewL( KCRUidPDPContextManager );
-        CleanupStack::PushL( cenrep );
-        
-        // name
-        if ( !aCmd.LastUriSeg()->Compare( KNSmlDmAOAdapterName ) )
-            {
-            ExecuteNameCmdL( aCmd, cenrep );            
-            }
-        // awon-pdpc
-        else if ( !aCmd.LastUriSeg()->Compare( KNSmlDmAOAdapterAwonPdpc ) )
-            {
-            ExecuteAwonPdpcCmdL( aCmd, cenrep );
-            } 
-        // t-retry
-        else if ( !aCmd.LastUriSeg()->Compare( KNSmlDmAOAdapterTRetry ) )
-            {
-            ExecuteTRetryCmdL( aCmd, cenrep ); 
-            } 
-        else
-            {
-            // invalid node
-            LOGSTRING( "ExecuteCmdL: Error, Invalid node name" );
-            aCmd.SetStatus( CSmlDmAdapter::ENotFound );
-            }
-                         				    
-        aCmd.SetExecuted( ETrue );
-        
-        CleanupStack::PopAndDestroy( cenrep );    
-        }   
-    }    
-
-	 
-// -----------------------------------------------------------------------------
-// CNSmlDmAOSettingStore::GetVendorConfigsL
-// Fetches all VENDORCONFIG ids
-// -----------------------------------------------------------------------------
-void CNSmlDmAOSettingStore::GetVendorConfigsL( RArray<TUint32>& aLUIDArray )
-        {
-        // Only one VENDORCONFIG node possible at the moment
-        aLUIDArray.Append( KDefaultLuid );
-        }
- 
-// -----------------------------------------------------------------------------
-// CNSmlDmAOSettingStore::ExecuteVendorConfigCmdL
-// Executes a command for VENDORCONFIG node. Either delete or get, adds are handled 
-// in StoreVendorConfigL
-// -----------------------------------------------------------------------------
-void CNSmlDmAOSettingStore::ExecuteVendorConfigCmdL( CSmlDmAOCommandElement& aCmd, 
-                                                     TUint /*aLuid*/ )
-    {
-    
-    if ( aCmd.CmdType() == CNSmlDmAOAdapter::EGetCmd )
-        {
-        aCmd.SetData( KNSmlDmAOAllLeafNodes().AllocL() );
-        aCmd.SetStatus( CSmlDmAdapter::EOk );
-        aCmd.SetExecuted( ETrue );
-        }
-    else if ( aCmd.CmdType() == CNSmlDmAOAdapter::EDeleteCmd )
-        {
-        // Should not be possible to delete
-        aCmd.SetStatus( CSmlDmAdapter::EOk );
-        aCmd.SetExecuted( ETrue );
-        }
-    else
-        {
-        LOGSTRING( "ExecuteVendorConfigCmdL: Error, Invalid cmd type" );
-        aCmd.SetStatus( CSmlDmAdapter::EError );
-        }
-    }
-
-
-// ---------------------------------------------------------------------------
-// CNSmlDmAOSettingStore::ExecuteNameCmdL
-// Executes NAME command (add or get )
-// ---------------------------------------------------------------------------
-//
-void CNSmlDmAOSettingStore::ExecuteNameCmdL( CSmlDmAOCommandElement& aCmd, 
-                                             CRepository*         /*aCenrep*/ )
-    {
-    if ( aCmd.CmdType() == CNSmlDmAOAdapter::EAddCmd )
-        {
-        HBufC* name = HBufC::NewLC( aCmd.Data()->Size() );
-        TPtr namePtr = name->Des();
-        CnvUtfConverter::ConvertToUnicodeFromUtf8( namePtr, *aCmd.Data() );
-
-        // name is not written to the CentralRepository
-        // Add write to CR here
-
-        CleanupStack::PopAndDestroy( name );
-        aCmd.SetStatus( CSmlDmAdapter::EOk );
-        }        		
-    else if ( aCmd.CmdType() == CNSmlDmAOAdapter::EGetCmd ||
-              aCmd.CmdType() == CNSmlDmAOAdapter::EGetSizeCmd )
-        {
-        // name is not written/read to/from the CentralRepository
-        // Add read from CR here
-        
-        //HBufC* data = ...read name
-        
-        //HBufC8* data8 = HBufC8::NewLC( data->Size() );
-        //TPtr8 toPtr = data8->Des();        
-        //CnvUtfConverter::ConvertFromUnicodeToUtf8( toPtr, *data );
-        //aCmd.SetData( data8 );
-        //CleanupStack::Pop( data8 );
-        //CleanupStack::PopAndDestroy( data );
-
-        // for size command, set the command data to be the 
-        // size of the fetched data
-        
-        //if( aCmd.CmdType() == CNSmlDmAOAdapter::EGetSizeCmd )
-        //    {            
-        //    HBufC8* size = iAdapter->IntToDes8L( aCmd.Data()->Size() );
-        //    aCmd.SetData( size );
-        //    }                
-        
-        aCmd.SetStatus( CSmlDmAdapter::EOk );
-        aCmd.SetExecuted( ETrue );
-        }
-    else    
-        {
-        // unsupported command
-        // this is checked by framework
-        aCmd.SetStatus( CSmlDmAdapter::EError );
-        LOGSTRING( "ExecuteNameCmdL: Error, Only Add, Get and Get size commands supported" );
-        }  
-    }
-    
-// ---------------------------------------------------------------------------
-// CNSmlDmAOSettingStore::ExecuteAwonPdpcCmdL
-// Executes AWON-PDPC command (add or get )
-// ---------------------------------------------------------------------------
-//
-void CNSmlDmAOSettingStore::ExecuteAwonPdpcCmdL( CSmlDmAOCommandElement& aCmd, 
-                                                 CRepository*         aCenrep )
-    {
-    if ( aCmd.CmdType() == CNSmlDmAOAdapter::EAddCmd )
-        {
-        HBufC* data = HBufC::NewLC( aCmd.Data()->Size() );
-        TPtr dataPtr = data->Des();
-        CnvUtfConverter::ConvertToUnicodeFromUtf8( dataPtr, *aCmd.Data() );
-
-        // write to the CentralRepository
-        TInt value( 0 );
-        TInt hplmn( 0 );
-        TInt vplmn( 0 );
-        
-        ParseIntegerL( dataPtr, value );
-        ParseAwonPdpcValuesL( value, hplmn, vplmn );
-        
-        User::LeaveIfError( aCenrep->Set( KPDPContextManagerEnableWhenHome,
-        hplmn ) );
-        User::LeaveIfError( aCenrep->Set( KPDPContextManagerEnableWhenRoaming,
-        vplmn ) );
-
-        CleanupStack::PopAndDestroy( data );
-        aCmd.SetStatus( CSmlDmAdapter::EOk );
-        }        		
-    else if ( aCmd.CmdType() == CNSmlDmAOAdapter::EGetCmd ||
-              aCmd.CmdType() == CNSmlDmAOAdapter::EGetSizeCmd )
-        {
-        // read from CentralRepository
-        TInt hplmn( 0 );
-        TInt vplmn( 0 );
-        
-        User::LeaveIfError(
-        aCenrep->Get( KPDPContextManagerEnableWhenHome, hplmn ) );
-        User::LeaveIfError(
-        aCenrep->Get( KPDPContextManagerEnableWhenRoaming, vplmn ) );
-        
-        HBufC* data    = HBufC::NewLC( KBufSize );
-        TPtr   dataPtr = data->Des();
-        
-        dataPtr.Zero();
-        dataPtr.FillZ();
-        dataPtr.AppendNum( hplmn );
-        dataPtr.AppendNum( vplmn );
-        
-        HBufC8* data8 = HBufC8::NewLC( data->Size() );
-        TPtr8 toPtr = data8->Des();        
-        CnvUtfConverter::ConvertFromUnicodeToUtf8( toPtr, *data );
-        aCmd.SetData( data8 );
-        CleanupStack::Pop( data8 );
-        CleanupStack::PopAndDestroy( data );
-
-        // for size command, set the command data to be the 
-        // size of the fetched data
-        if( aCmd.CmdType() == CNSmlDmAOAdapter::EGetSizeCmd )
-            {            
-            HBufC8* size = iAdapter->IntToDes8L( aCmd.Data()->Size() );
-            aCmd.SetData( size );
-            }                
-        aCmd.SetStatus( CSmlDmAdapter::EOk );
-        aCmd.SetExecuted( ETrue );
-        }
-    else    
-        {
-        // unsupported command
-        // this is checked by framework
-        aCmd.SetStatus( CSmlDmAdapter::EError );
-        LOGSTRING( "ExecuteNameCmdL: Error, Only Add, Get and Get size commands supported" );
-        }  
-    }
-    
- // ---------------------------------------------------------------------------
-// CNSmlDmAOSettingStore::ExecuteTRetryCmdL
-// Executes T-RETRY command (add or get )
-// ---------------------------------------------------------------------------
-//
-void CNSmlDmAOSettingStore::ExecuteTRetryCmdL( CSmlDmAOCommandElement& aCmd, 
-                                               CRepository*            aCenrep )
-    {
-    if ( aCmd.CmdType() == CNSmlDmAOAdapter::EAddCmd )
-        {
-        HBufC* data = HBufC::NewLC( aCmd.Data()->Size() );
-        TPtr dataPtr = data->Des();
-        CnvUtfConverter::ConvertToUnicodeFromUtf8( dataPtr, *aCmd.Data() );
-
-        // write to the CentralRepository
-        TInt value( 0 );
-        ParseIntegerL( dataPtr, value );
-        
-        User::LeaveIfError( aCenrep->Set( KPDPContextManagerRetryTimer,
-                            value ) );
-
-        CleanupStack::PopAndDestroy( data );
-        aCmd.SetStatus( CSmlDmAdapter::EOk );
-        }        		
-    else if ( aCmd.CmdType() == CNSmlDmAOAdapter::EGetCmd ||
-              aCmd.CmdType() == CNSmlDmAOAdapter::EGetSizeCmd )
-        {
-        // Read from CentralRepository
-        TInt value( 0 );
-        User::LeaveIfError( aCenrep->Get( KPDPContextManagerRetryTimer,
-                            value ) );
-        
-        HBufC* data    = HBufC::NewLC( KBufSize );
-        TPtr   dataPtr = data->Des();
-        
-        dataPtr.Zero();
-        dataPtr.FillZ();
-        dataPtr.AppendNum( value );
-        
-        HBufC8* data8 = HBufC8::NewLC( data->Size() );
-        TPtr8 toPtr = data8->Des();        
-        CnvUtfConverter::ConvertFromUnicodeToUtf8( toPtr, *data );
-        aCmd.SetData( data8 );
-        CleanupStack::Pop( data8 );
-        CleanupStack::PopAndDestroy( data );
-
-        // for size command, set the command data to be the 
-        // size of the fetched data
-        if( aCmd.CmdType() == CNSmlDmAOAdapter::EGetSizeCmd )
-            {            
-            HBufC8* size = iAdapter->IntToDes8L( aCmd.Data()->Size() );
-            aCmd.SetData( size );
-            }                
-        aCmd.SetStatus( CSmlDmAdapter::EOk );
-        aCmd.SetExecuted( ETrue );
-        }
-    else    
-        {
-        // unsupported command
-        // this is checked by framework
-        aCmd.SetStatus( CSmlDmAdapter::EError );
-        LOGSTRING( "ExecuteNameCmdL: Error, Only Add, Get and Get size commands supported" );
-        }  
-    }
-    
-// -----------------------------------------------------------------------------
-// CNSmlDmAOSettingStore::ParseIntegerL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDmAOSettingStore::ParseIntegerL( const TDesC& aPtr, TInt& aInt )
-    {
-    TLex lex( aPtr );
-    User::LeaveIfError( lex.Val( aInt ) );
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDmAOSettingStore::ParseAwonPdpcValuesL
-// -----------------------------------------------------------------------------
-//
-void CNSmlDmAOSettingStore::ParseAwonPdpcValuesL( const TInt aInt,
-                                                  TInt& aHplmn,
-                                                  TInt& aVplmn )
-    {
-    switch( aInt )
-        {
-        case KAwonPdpc_Off3G_Off2G:
-            aHplmn = 0;
-            aVplmn = 0;
-            break;
-        case KAwonPdpc_Off3G_On2G:
-            aHplmn = 0;
-            aVplmn = 1;
-            break;
-        case KAwonPdpc_On3G_Off2G:
-            aHplmn = 1;
-            aVplmn = 0;
-            break;
-        case KAwonPdpc_On3G_On2G:
-            aHplmn = 1;
-            aVplmn = 1;
-            break;
-        default:
-            User::Leave( KErrNotSupported );
-            break;
-        }
-    }           
-
--- a/omadm/omadmextensions/adapters/nsmldmbmadapter/group/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-/*
-* Copyright (c) 2006-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:   Build information file for project nsmldmbmadapter
-*
-*/
-
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-
-PRJ_MMPFILES
-nsmldmbmadapter.mmp
-
-PRJ_TESTMMPFILES
-
-PRJ_TESTEXPORTS
--- a/omadm/omadmextensions/adapters/nsmldmbmadapter/group/nsmldmbmadapter.mmp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-/*
-* Copyright (c) 2006 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 definition file for project nsmldmbmadapter
-*
-*/
-
-
-#include <platform_paths.hrh>
-#include <defaultcaps.hrh>
-
-TARGET                  nsmldmbmadapter.dll
-TARGETTYPE              PLUGIN
-UID                     0x10009d8d 0x101f6d2f
-
-CAPABILITY              CAP_ECOM_PLUGIN
-VENDORID                VID_DEFAULT
-
-SOURCEPATH              ../src
-SOURCE                  nsmldmbmadapter.cpp
-SOURCE                  nsmldmbmsettingstore.cpp
-
-START RESOURCE          nsmldmbmadapter.rss
-END
-
-//LANG sc
-
-USERINCLUDE             ../inc
-
-//Default system include paths for middleware layer modules
-MW_LAYER_SYSTEMINCLUDE
-
-SYSTEMINCLUDE 	/epoc32/include/ecom
-
-LIBRARY        euser.lib ecom.lib cmmanagerdatabase.lib cmmanager.lib charconv.lib flogger.lib
--- a/omadm/omadmextensions/adapters/nsmldmbmadapter/inc/bmadapterlogger.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,103 +0,0 @@
-/*
-* Copyright (c) 2006 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:   Logging functions for the component.
-*
-*/
-
-
-
-#ifndef BMADAPTERLOGGER_H
-#define BMADAPTERLOGGER_H
-
-#ifndef _DEBUG
-
-// UREL BUILD:
-#define BMADAPTER_LOGGING_METHOD  0   // No logging in UREL builds
-
-#else
-
-// UDEB BUILD:
-#define BMADAPTER_LOGGING_METHOD  1     // 0 = No logging,
-                                        // 1 = Flogger,
-                                        // 2 = RDebug
-#endif // _DEBUG
-
-
-#if BMADAPTER_LOGGING_METHOD == 1 // Flogger
-
-#include <flogger.h>
-_LIT(KBMADAPTERLOGFolder,"NSMLDMBMADAPTER");
-_LIT(KBMADAPTERLOGFile,"NSMLDMBMADAPTER.txt");
-
-#define BMADAPTERLOGTEXT(x)\
-    {\
-    RFileLogger::Write(KBMADAPTERLOGFolder(),KBMADAPTERLOGFile(),EFileLoggingModeAppend,\
-    x);\
-    }
-
-#define BMADAPTERLOGSTRING(x)\
-    {\
-    _LIT8(tempLogDes,x);\
-    RFileLogger::Write(KBMADAPTERLOGFolder(),KBMADAPTERLOGFile(),EFileLoggingModeAppend,\
-    tempLogDes());\
-    }
-
-#define BMADAPTERLOGSTRING2(x,y)\
-    { _LIT8(tempLogDes,x);\
-    RFileLogger::WriteFormat(KBMADAPTERLOGFolder(),\
-                             KBMADAPTERLOGFile(),\
-                             EFileLoggingModeAppend,\
-                             TRefByValue<const TDesC8>(tempLogDes()),y);\
-    }
-
-#define BMADAPTERLOGSTRING3(x,y,z)\
-    { _LIT8(tempLogDes,x);\
-    RFileLogger::WriteFormat(KBMADAPTERLOGFolder(),\
-                             KBMADAPTERLOGFile(),\
-                             EFileLoggingModeAppend,\
-    TRefByValue<const TDesC8>(tempLogDes()),y,z);\
-    }
-
-#define BMADAPTERLOGSTRING4(w,x,y,z)\
-    { _LIT8(tempLogDes,w);\
-    RFileLogger::WriteFormat(KBMADAPTERLOGFolder(),\
-                             KBMADAPTERLOGFile(),\
-                             EFileLoggingModeAppend,\
-    TRefByValue<const TDesC8>(tempLogDes()),x,y,z);\
-    }
-
-
-#elif BMADAPTER_LOGGING_METHOD == 2    // RDebug
-
-#include <e32svr.h>
-
-#define BMADAPTERLOGSTRING(x) RDebug::Print(x);
-#define BMADAPTERLOGSTRING(x) RDebug::Print(_L(x));
-#define BMADAPTERLOGSTRING2(x,y) RDebug::Print(_L(x),y);
-#define BMADAPTERLOGSTRING3(x,y,z) RDebug::Print(_L(x),y,z);
-#define BMADAPTERLOGSTRING4(w,x,y,z) RDebug::Print(_L(w),x,y,z);
-
-#else // BMADAPTER_LOGGING_METHOD == 0 or invalid
-
-#define BMADAPTERLOGSTRING(x)
-#define BMADAPTERLOGSTRING(x)
-#define BMADAPTERLOGSTRING2(x,y)
-#define BMADAPTERLOGSTRING3(x,y,z)
-#define BMADAPTERLOGSTRING4(w,x,y,z)
-
-#endif // BMADAPTER_LOGGING_METHOD
-
-#endif  // BMADAPTERLOGGER_H
-
-// End of File
--- a/omadm/omadmextensions/adapters/nsmldmbmadapter/inc/nsmldmbmadapter.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,887 +0,0 @@
-/*
-* Copyright (c) 2006 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:   Device management adapter handling bearer management related settings
-*
-*/
-
-
-
-
-#ifndef NSMLDMBMADAPTER_H
-#define NSMLDMBMADAPTER_H
-
-#include <smldmadapter.h>
-
-#include "nsmldmbmsettingstore.h"
-
-class CSmlDmBmCommandElement;
-class CSmlDmBmSettingsElement;
-class CNSmlDmBmSettingStore;
-
-/**  The DDF version must be changed if any changes in DDF structure 
-( built in DDFStructureL() function ) */
-_LIT8( KNSmlDmBMAdapterDDFVersion, "1.1" ); 
-_LIT8( KNSmlDmBMAdapterTextPlain, "text/plain" );
-
-/** Names of the nodes */
-/** When updating KNSmlDmBMAdapterBMURI also update 
-KNSmlDmBmAdapterURIMaxLength! */
-_LIT8(KNSmlDmBMAdapterBMURI, "./BearerManagementSNAP");
-_LIT8(KNSmlDmBMAdapterBM, "BearerManagementSNAP");
-_LIT8(KNSmlDmBMAdapterName, "Name");
-_LIT8(KNSmlDmBMAdapterIAPPriorityList, "IAPPriorityList");
-_LIT8(KNSmlDmBMAdapterEmbeddedSNAP, "EmbeddedSNAP");
-_LIT8(KNSmlDmBMAdapterMetadata, "Metadata");
-_LIT8(KNSmlDmBMAdapterProtected, "Protected");
-_LIT8(KNSmlDmBMAdapterHidden, "Hidden");
-
-/** Descriptions of the nodes */
-_LIT8( KNSmlDmBMAdapterBMDescription, 
-       "BearerManagement provides management of Access Point groups (SNAPs)");
-_LIT8( KNSmlDmBMAdapterDynamicDescription, 
-       "Node presents a group of Access Points (SNAP)");
-_LIT8( KNSmlDmBMAdapterNameDescription, 
-       "Name of the Access Point group");
-_LIT8( KNSmlDmBMAdapterIAPPriorityListDescription, 
-       "Comma separated list of Access Point URIs in priority order.");
-_LIT8( KNSmlDmBMAdapterEmbeddedSNAPDescription, 
-       "URI of embedded Access Point group. All Access points of the Embedded \
-       SNAP are seen as also belonging to this SNAP");
-_LIT8( KNSmlDmBMAdapterMetadataDescription, 
-       "32 bit integer representing SNAP metadata. Following bitmasks indicate \
-       meaning of the individual bits: \n 0x00000001 \t Internet: The SNAP is \
-       the Internet SNAP. This may only be set to one SNAP object.\n \
-       0x00000002\tHighlight: SNAP is highlighted in certain UI dialog.\n \
-       0x00000004\tHidden: SNAP is hidden in certain UI dialog.");
-_LIT8( KNSmlDmBMAdapterProtectedDescription, 
-       "SNAP is protected with one of the following protection levels. \
-       Protected object can not be modified without NetworkControl capability \n \
-       0 \t No protection \n 1 \t SNAP and related objects \n \
-       2 \t SNAP name is protected.");
-_LIT8( KNSmlDmBMAdapterHiddenDescription, 
-       "SNAP is set as hidden in the setting store");
-
-/** Leaf nodes of snap node */
-_LIT8( KNSmlDmBMAllLeafNodes, 
-       "Name/IAPPriorityList/Metadata/Protected/Hidden/EmbeddedSNAP");
-_LIT8( KNSmlDmBMAllLeafNodesNoEmbedded, 
-       "Name/IAPPriorityList/Metadata/Protected/Hidden");
-
-/** URI of for fetching IAP nodes */
-/** When updating KNSmlDmBMAdapterIAPURI also update 
-KNSmlDmBmAdapterAPURIMaxLength! */
-_LIT8( KNSmlDmBMAdapterIAPURI, "./AP" );
-/** Node name of AP adapter root */
-_LIT8( KNSmlDmBMAdapterIAPNode, "AP" );
-/** URI segment separator */
-/** When updating this literal also update 
-KNSmlDmBmAdapterAPURIMaxLength and KNSmlDmBmAdapterURIMaxLength! */
-_LIT8( KNSmlDmBmSeparator, "/" );
-/** URI segment separator */
-/** When updating KNSmlDmBMAdapterBMURI also update 
-KNSmlDmBmAdapterAPURIMaxLength and KNSmlDmBmAdapterURIMaxLength! */
-_LIT8( KNSmlDmBmUriListSeparator, "," );
-/** Prefix in URIs (removed for LUID mapping) */
-_LIT8( KNSmlDmBmAdapterURIPrefix, "./" );
-
-/** Name prefix for unnamed snap nodes */
-_LIT8( KNSmlDmBMSNAPNamePrefix, "SNAP" );
-_LIT8( KNSmlDmBMBooleanTrue, "True" );
-_LIT8( KNSmlDmBMBooleanFalse, "False" );
-
-
-const TInt KNSmlDmBMGranularity = 4;
-const TInt KNsmlDmBmSNAPNodeDepth = 2;
-const TInt KNSmlDmBmInvalidRef = -1;
-
-/** Maximum length of snap URI including a separator character in URI List.
-Node is not calculated here. KNSmlDmBMAdapterBMURI + KNSmlDmBmSeparator + 
-KNSmlDmBmUriListSeparator
-*/
-const TInt KNSmlDmBmAdapterURIMaxLength =  24;
-
-/** Maximum length of AP URI including a separator character in URI List.
-Node is not calculated here. KNSmlDmBMAdapterIAPURI + KNSmlDmBmSeparator + 
-KNSmlDmBmUriListSeparator
-*/
-const TInt KNSmlDmBmAdapterAPURIMaxLength = 6;
-
-/** Maximum length of 32bit integer */
-const TInt KMaxLengthOf32bitInteger = 10;
-
-/**
- *  Bearer Management device management adapter
- *
- *  Bearer Management device management adapter manages settings
- *  related to Service Network Access Points (SNAPs) which are
- *  used for groupin IAPs
- *
- *  @lib nsmldmbmadapter
- *  @since S60 v3.2
- */
-class CNSmlDmBmAdapter : public CSmlDmAdapter
-    {
-    
-public:
-
-/** Possible command types */
-enum TCommandType
-    {
-    EAddCmd,
-    EGetCmd,
-    EGetSizeCmd,
-    EDeleteCmd
-    };
-
-    /**
-     * Two-phased constructor.
-     */
-    static CNSmlDmBmAdapter* NewL( MSmlDmCallback* aDmCallback );
-
-    /**
-     * Destructor.
-     */
-    virtual ~CNSmlDmBmAdapter();
-
-
-// from base class CSmlDmAdapter
-
-    /**
-     *  The function returns current version of the DDF. 
-     *
-     *  @since S60 v3.2
-     *  @param aDDFVersion DDF version of the
-     *  adapter. (filled by the adapter) 
-     */
-    void DDFVersionL( CBufBase& aDDFVersion );
-
-    /**
-     *  The function for filling the DDF structure of the adapter
-     *
-     *  @since S60 v3.2
-     *  @param aDDF Reference to root object.
-    */
-    void DDFStructureL( MSmlDmDDFObject& aDDF );
-
-    /**
-     * The function creates new leaf objects, or replaces data in existing 
-     * leaf objects. The information about the success of the command is
-     * returned by calling SetStatusL function of MSmlDmCallback callback
-     * interface. 
-     *     
-     * @since S60 v3.2
-     * @param aURI         URI of the object
-     * @param aLUID        LUID of the object 
-     * @param aObject      Data of the object.
-     * @param aType        MIME type of the object
-     * @param aStatusRef   Reference to correct command, i.e. this reference
-     *                     must be used when calling the SetStatusL of this 
-     *                     command
-    */
-    void UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID,
-                            const TDesC8& aObject, const TDesC8& aType,
-                            TInt aStatusRef );
-    /**
-     * The function deletes an object and its child objects. 
-     *
-     * @since S60 v3.2
-     * @param aURI         URI of the object
-     * @param aLUID        LUID of the object (if the adapter have earlier 
-     *                     returned LUID to the DM Module).
-     * @param aStatusRef   Reference to correct command, i.e. this reference 
-     *                     must be used when calling the SetStatusL of this 
-     *                     command.
-    */
-    void DeleteObjectL( const TDesC8& aURI, const TDesC8& aLUID,
-                        TInt aStatusRef );
-
-    /**
-     * The function fetches data of a leaf object. The SetStatusL is used
-     * as described in UpdateLeafObjectL(). The data is returned by using the
-     * SetResultsL function of MSmlCallback callback interface.
-     *
-     * @since S60 v3.2
-     * @param aURI             URI of the object
-     * @param aLUID            LUID of the object (if the adapter have 
-     *                         earlier returned LUID to the DM Module). 
-     * @param aType            MIME type of the object
-     * @param aResultsRef      Reference to correct results, i.e. this 
-     *                         reference must be used when returning the 
-     *                         result by calling the SetResultsL.
-     * @param aStatusRef       Reference to correct command, i.e. this 
-     *                         reference must be used when calling the 
-     *                         SetStatusL of this command.
-    */
-    void FetchLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID,
-                           const TDesC8& aType, TInt aResultsRef,
-                           TInt aStatusRef );
-
-    /**
-     * The function fetches the size of the data of a leaf object. The size 
-     * is in bytes, and must reflect the number of bytes that will be 
-     * transferred when the framework calls FetchLeafObjectL. 
-     *
-     * @since S60 v3.2
-     * @param aURI             URI of the object
-     * @param aLUID            LUID of the object (if the adapter have 
-     *                         earlier returned LUID to the DM Module).   
-     * @param aType            MIME type of the object
-     * @param aResultsRef      Reference to correct results, i.e. this 
-     *                         reference must be used when returning the 
-     *                         result by calling the SetResultsL.
-     * @param aStatusRef       Reference to correct command, i.e. this 
-     *                         reference must be used when calling the 
-     *                         SetStatusL of this command.
-    */
-    void FetchLeafObjectSizeL( const TDesC8& aURI, const TDesC8& aLUID,
-                               const TDesC8& aType, TInt aResultsRef,
-                               TInt aStatusRef );
-
-    /**
-     * The function fetches URI list. An adapter returns the list of URI 
-     * segments under the given URI be separated by slash ("/"). The URI 
-     * segment names for new objects must be given by the adapter.
-     * The list is returned by calling the SetResultsL function of 
-     * MSmlCallback callback interface. 
-     *
-     * @since S60 v3.2
-     * @param aURI                     URI of the parent object
-     * @param aLUID                    LUID of the parent object (if the
-     *                                 adapter have earlier returned LUID to
-     *                                 the DM Module).   
-     * @param aPreviousURISegmentList  URI list with mapping LUID 
-     *                                 information, which is known by DM
-     *                                 engine.  
-     * @param aResultsRef              Reference to correct results, i.e. 
-     *                                 this reference must be used when 
-     *                                 returning the result by calling the 
-     *                                 SetResultsL.
-     * @param aStatusRef               Reference to correct command, i.e. 
-     *                                 this reference must be used when 
-     *                                 calling the SetStatusL of this 
-     *                                 command.
-    */
-    void ChildURIListL( const TDesC8& aURI, const TDesC8& aLUID,
-                        const CArrayFix<TSmlDmMappingInfo>& aPreviousURISegmentList,
-                        TInt aResultsRef, TInt aStatusRef );
-
-    /**
-     * The function adds node object. 
-     *
-     * @since S60 v3.2
-     * @param aURI             URI of the object
-     * @param aParentLUID      LUID of the parent object (if the adapter have
-     *                         earlier returned LUID to the DM Module).   
-     * @param aStatusRef       Reference to correct command, i.e. this 
-     *                         reference must be used when calling the 
-     *                         SetStatusL of this command.
-    */
-    void AddNodeObjectL( const TDesC8& aURI, const TDesC8& aParentLUID,
-                         TInt aStatusRef );
-    /**
-     * The adapter does not support streaming and no implementation is 
-     * provided for this function.
-     *
-     * @since S60 v3.2
-     * @param aURI         URI of the object
-     * @param aLUID        LUID of the object
-     * @param aStream      Data of the object. 
-     * @param aType        MIME type of the object
-     * @param aStatusRef   Reference to correct command, i.e. this reference
-     *                     must be used when calling the SetStatusL of this
-     *                     command.
-    */
-    void UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID,
-                            RWriteStream*& aStream, const TDesC8& aType,
-                            TInt aStatusRef );
-    /**
-     * The adapter does not support execute command and does not 
-     * provide implementation for this function. 
-     *
-     *  @since S60 v3.2
-     * @param aURI             URI of the command
-     * @param aLUID            LUID of the object
-     * @param aArgument        Argument for the command
-     * @param aType            MIME type of the object 
-     * @param aStatusRef       Reference to correct command, i.e. this 
-     *                         reference must be used when calling the 
-     *                         SetStatusL of this command.
-    */
-    void ExecuteCommandL( const TDesC8& aURI, const TDesC8& aLUID, 
-                          const TDesC8& aArgument, const TDesC8& aType, 
-                          TInt aStatusRef );
-    /**
-     * The adapter does not support execute command and does not 
-     * provide implementation for this function. 
-     *
-     * @since S60 v3.2
-     * @param aURI         URI of the command
-     * @param aLUID            LUID of the object 
-     * @param aStream      Argument for the command. 
-     * @param aType            MIME type of the object 
-     * @param aStatusRef       Reference to correct command, i.e. this 
-     *                         reference must be used when calling the 
-     *                         SetStatusL of this command.
-    */
-    void ExecuteCommandL( const TDesC8& aURI, const TDesC8& aLUID,
-                          RWriteStream*& aStream, const TDesC8& aType,
-                          TInt aStatusRef );
-    /**
-     * The adapter does not support copy command and does not 
-     * provide implementation for this function. 
-     *
-     * @since S60 v3.2
-     * @param aTargetURI       Target URI for the command
-     * @param aTargetLUID      LUID of the target object 
-     * @param aSourceURI       Source URI for the command
-     * @param aSourceLUID      LUID of the source object 
-     * @param aType            MIME type of the objects
-     * @param aStatusRef       Reference to correct command, i.e. this 
-     *                         reference must be used when calling the 
-     *                         SetStatusL of this command.
-    */
-    void CopyCommandL( const TDesC8& aTargetURI, const TDesC8& aTargetLUID, 
-                       const TDesC8& aSourceURI, const TDesC8& aSourceLUID, 
-                       const TDesC8& aType, TInt aStatusRef );
-    /**
-     * Not supported
-     *  @since S60 v3.2
-    */
-    void StartAtomicL();
-    /**
-     * Not Supported     
-     *  @since S60 v3.2
-     *
-    */
-    void CommitAtomicL();
-    /**
-     * Not supported.
-     *  @since S60 v3.2
-     */
-    void RollbackAtomicL();
-    /**
-     * Returns EFalse as the adapter does not support streaming
-     *
-     * @since S60 v3.2
-     * @param aItemSize size limit for stream usage
-     * @return TBool EFalse as streaming is not supported
-    */
-    TBool StreamingSupport( TInt& aItemSize );
-    /**
-     * Not supported
-     *
-     *  @since S60 v3.2
-    */  
-    void StreamCommittedL();
-    /**
-     * The function tells the adapter that all the commands of the message 
-     * that can be passed to the adapter have now been passed.  This 
-     * indciates that the adapter must supply status codes and results to 
-     * any buffered commands. This must be done at latest by the time this 
-     * function returns. This function is used at the end of SyncML messages, 
-     * and during processing of Atomic.  
-     *
-     *  @since S60 v3.2
-    */
-    void CompleteOutstandingCmdsL();
-    
-    /**
-     * Function checks if a SNAP with the argument URI is buffered for 
-     * later handling. If so, the function calls iSettingStore object 
-     * to store the SNAP. This function is called by the iSettingStore 
-     * object to check whether EmbeddedSNAP node referenced by a command is 
-     * still in the buffer and needs to be stored first.
-     *
-     * @since S60 v3.2
-     * @param aURI Descriptor containing the SNAP URI
-     */    
-    void StoreSnapIfBufferedL( const TDesC8& aURI );
-
-
-    /**
-     * Function returns a pointer to a HBufC object containing  a SNAP URI 
-     * which correcponds to the argument LUID.
-     *
-     * @since S60 v3.2
-     * @param aSnapId LUID of SNAP object
-     * @return Descriptor containing the SNAP URI. 
-     */    
-    HBufC8* GetSnapUriFromLuidL( const TUint aSnapId );
-
-
-    /**
-     * Function returns a pointer to HBufC object containing a 
-     * comma separated list of IAP URIs according to the IAP LUIDs
-     * contained in the argument array.
-     *
-     * @since S60 v3.2
-     * @param aIdArray Array of IAP LUIDs for which the URI list is formed.
-     * @return HBufC object containing a comma separated list of IAP URIs
-     */
-    HBufC8* GetIapListL( const RArray<TUint>& aIdArray );
-
-
-    /**
-     * Function returns an array containing the LUIDs of IAP URIs listed in 
-     * argument descriptor. 
-     *
-     *  @since S60 v3.2
-     * @param aIAPList TDesC object containing a comma separated list of IAP
-     *  URIs
-     * @return Array of IAP LUIDs that correspond to the argument URI list. 
-     */    
-    RArray<TUint> GetIdArrayL( const TDesC8& aIAPList);
-
-    
-    /**
-     * Converts integer to 8bit descriptor
-     *
-     *  @since S60 v3.2
-     * @param    aLuid The integer to be converted
-     * @return    The Integer as a descriptor
-     */
-    HBufC8* IntToDes8L( TInt aLuid) const;
-
-    /**
-     * Converts 8bit descriptor to integer
-     *
-     *  @since S60 v3.2
-     * @param    aLuid The descriptor to be converted
-     * @return    Integer value of the descriptor
-     */
-    TUint DesToIntL(const TDesC8& aLuid) const;
-
-    /**
-     * Converts 8bit descriptor to a boolean value
-     * @since S60 v3.2
-     * @param aBoolDes The descriptor to be converted
-     * @param aBool A pointer to a boolean where result is stored
-     * @return ETrue if conversion was succesful, otherwise EFalse
-     */
-    TBool DesToBool(const TDesC8& aBoolDes, TBool& aBool ) const;
-
-    /**
-     * Converts boolean value to 8bit descriptor
-     * @since S60 v3.2
-     * @param    aBool The boolean value to be converted
-     * @return    The boolean value as a descriptor
-     */
-    HBufC8* BoolToDes8LC( TBool aBool) const;
-
-
-    /**
-     * The function calls the GetLuidAllocL function of the MSmlDmCallback to 
-     * get the LUID which is mapped to aURI. This function LUID is not found,  
-     * the function allocates a null length string, i.e. the function
-     * allocates memory in every case.
-     * @since S60 v3.2
-     * @param aURI  URI of the object. 
-     */
-    HBufC8* GetLuidAllocL( const TDesC8& aURI );
-
-private:
-
-     /**
-     * Constructor
-     */
-    CNSmlDmBmAdapter();
-
-    /**
-     * Constructor
-     * @param aDmCallback Callback object to the framework
-     */
-    CNSmlDmBmAdapter( MSmlDmCallback* aDmCallback );
-
-    /**
-     * Second phase constructor
-     */
-    void ConstructL();
-    
-    
-    /**
-     * Searches the buffer for a SNAP with the parameter mapping name 
-     * @param aMappingName Mapping Name of this SNAP
-     * @return Pointer to the CSmlDmBmSettingsElement object in buffer. 
-     * The object is owned by the CNSmlDmBmAdapter.  
-     */
-     CSmlDmBmSettingsElement* GetSnapIfBuffered( const TDesC8& aMappingName);
-     
-    /**
-     * Returns the first URI from a list of URIs
-     * @param  aURIList Comma separated list of URIs
-     * @return    The first URI
-     */
-     TPtrC8 FirstURI(const TDesC8& aURIList) const;
-    
-    /**
-     * Returns the number of URIs in a list of URIs
-     * @param aURIList Comma-separated list of URIs
-     * @return Number of URIs in the list.  
-     */
-    TInt NumOfURIs(const TDesC8& aURIList) const;
-
-
-    /**
-     * Removes the first URI from a list of URIs
-     * @param  aURIList Comma separated list of URIs
-     * @return    The first URI
-     */
-     TPtrC8 RemoveFirstURI(const TDesC8& aURI) const;
-
-    /**
-     * Parses the last URI segment from URI
-     * @param    aURI The whole URI
-     * @return    The last URI segment
-     */
-    TPtrC8 LastURISeg(const TDesC8& aURI) const; 
-
-    /**
-     * Removes the last URI segment from URI
-     * @param    aURI The whole URI
-     * @return    The aURI without the last URI segment
-     */
-    TPtrC8 RemoveLastURISeg(const TDesC8& aURI) const;
-
-    /**
-     * Calculates the number of URI segments
-     * @param    aURI The whole URI
-     * @return    The number of URI segments
-     */
-    TInt NumOfURISegs(const TDesC8& aURI) const;
-
-    /**
-     * Checks if the URI refers to predefined SNAP (of format SNAPx) in which
-     * case operations should be successful even if passed LUID is empty.
-     * Maps the URI to found id.
-     * @param    aURI The whole URI
-     * @param    aLUID LUID
-     * @return    The SNAP ID if found
-     */
-    TInt MapPredefinedSnapsL( const TDesC8& aURI, const TDesC8& aLUID );
-    
-    /**
-     * Tries to find predefined URI string (SNAPx) fronm input
-     * returns the ID.
-     * @param    aURI The whole URI    
-     * @return    The SNAP ID if found
-     */
-    TInt GetPredefinedSnapIdFromUri( const TDesC8& aURI ) const;
-
-private: //data
-
-    /**
-     * Buffered commands. Contains a CSmlDmBmSettingsElement object 
-     * for each SNAP. THese in turn contain commands for the SNAP.
-     */
-    RPointerArray<CSmlDmBmSettingsElement> iBuffer;
-    
-    /**
-     * Setting store object, which is called for managing settings 
-     * in CommsDat. Own.
-     */
-     CNSmlDmBmSettingStore * iSettingStore;
-     
-     /**
-      * CmManager object for SNAP existence checking for
-      * direct accesses to pre-defined SNAPs    
-      */
-     RCmManagerExt iCmManagerExt;
-        
-    };
-
-
-/**
- *  CSmlDmBmCommandElement 
- *
- * Helper class, which stores a single buffered command for a SNAP. 
- *  @lib nsmldmbmadapter
- *  @since S60 v3.2
- */
-
-class CSmlDmBmCommandElement : public CBase
-    {
-
-public:
-
-    /**
-     * Two-phased constructor.
-     */
-    static CSmlDmBmCommandElement* NewLC( TBool aLeaf, 
-                                          TInt aStatusRef, 
-                                          TInt aResultRef, 
-                                          CNSmlDmBmAdapter::TCommandType  aCmdType, 
-                                          const TDesC8& aLastUriSeg, 
-                                          const TDesC8& aData );
-
-    /**
-     * Destructor.
-     */
-     ~CSmlDmBmCommandElement();
-
-    /**
-     * Returns the iExecuted member value of the object
-     *
-     * @since S60 v3.2
-     * @return The iExecuted member value of the object
-     */
-    inline TBool Executed();
-
-    /**
-     * Sets the iExecuted member value of the object
-     *
-     * @since S60 v3.2
-     * @param aExecuted Executed value for the object. 
-     */    
-    inline void SetExecuted( TBool aExecuted );
-    
-    /**
-     * Returns the iStatus member value of the object
-     *
-     * @since S60 v3.2
-     * @return The iStatus value of the object
-     */
-    inline CSmlDmAdapter::TError Status();
-    
-    /**
-     * Sets the iStatus member value of the object
-     *
-     * @since S60 v3.2
-     * @param aStatus Status value for the object. 
-     */    
-    inline void SetStatus( CSmlDmAdapter::TError aStatus ); 
-    
-    /**
-     * Returns the iLeaf member value of the object
-     *
-     * @since S60 v3.2
-     * @return The iLeaf member value of the object
-     */
-    inline TBool Leaf();
-    
-    /**
-     * Returns the iStatusRef member value of the object
-     *
-     * @since S60 v3.2
-     * @return The iStatusRef member value of the object
-     */
-    inline TInt StatusRef();
-    
-    /**
-     * Returns the iResultRef member value of the object
-     *
-     * @since S60 v3.2
-     * @return The iResultRef member value of the object
-     */
-    inline TInt ResultRef();
-    
-    /**
-     * Returns the iCmdType member value of the object
-     *
-     * @since S60 v3.2
-     * @return The iCmdType member value of the object
-     */
-    inline CNSmlDmBmAdapter::TCommandType  CmdType();
-    
-    /**
-     * Returns the iData member value of the object
-     *
-     * @since S60 v3.2
-     * @return The iData member value of the object
-     */
-    inline const HBufC8* Data();
-    
-    /**
-     * Returns the iLastUriSeg member value of the object
-     *
-     * @since S60 v3.2
-     * @return The iLastUriSeg member value of the object
-     */
-    inline const HBufC8* LastUriSeg();
-    
-    /**
-     * Sets the iData member value of the object
-     *
-     * @since S60 v3.2
-     * @param aData Data set to the object. The data will be owned by 
-     * the command object. 
-     */   
-    inline void SetDataL( const TDesC8& aData );
-
-private:
-
-    CSmlDmBmCommandElement( TBool aLeaf, 
-                            TInt aStatusRef, 
-                            TInt aResultRef, 
-                            CNSmlDmBmAdapter::TCommandType aCmdType );
-
-    void ConstructL( const TDesC8& aLastUriSeg, const TDesC8& aData );
-
-    
-private: //data
-
-    /**
-     * Has command been executed. 
-     * Set to ETrue when command is executed.
-     */
-    TBool iExecuted;
-    
-    /**
-     * The execution status of an exeuted command. 
-     * Filled in when command is executed.
-     */    
-    CSmlDmAdapter::TError iStatus;
-    
-    
-    /**
-     * True if commend is for a leaf node, False if it is for a Snap node.
-     */    
-    const TBool iLeaf;
-    
-    /**
-     * Reference for returning the status to DM framework.
-     */    
-    const TInt iStatusRef;
-    
-    /**
-     * Reference for returning result of Get command to the DM framework.
-     */    
-    const TInt iResultRef;
-    
-    /**
-     * Type of command.
-     */    
-    const CNSmlDmBmAdapter::TCommandType  iCmdType;
-    
-
-    /**
-     * Data which is either ment to be stored to setting store 
-     * or which has been fetched from there. 
-     */
-    HBufC8* iData;
-
-    /**
-     * Last segment in the command URI, which indicates the leaf node 
-     * in question. For non leaf command empty string. 
-     */    
-    HBufC8* iLastUriSeg;
-
-    };
-
-
-/**
- *  CSmlDmBmSettingsElement
- *
- * Helper class which stores information of a single SNAP object 
- * into buffer. Contains the buffered commands for the 
- * SNAP as a list of CSmlBmCommandElement objects.
- *
- *  @lib nsmldmbmadapter
- *  @since S60 v3.2
- */
-
-class CSmlDmBmSettingsElement : public CBase
-    {
- 
-public:
-
-    /**
-     * Two-phased constructor.
-     */
-     static CSmlDmBmSettingsElement* NewLC( const TDesC8& aMappingName );
-    
-    /**
-     * Destructor.
-     */
-    ~CSmlDmBmSettingsElement();
-     
-    /**
-     * Returns a reference to iNodeBuf member.  
-     * @since S60 v3.2
-     * @return Reference to iNodeBuf member of the object
-     */
-    inline RPointerArray<CSmlDmBmCommandElement>& NodeBuf(); 
-
-    /**
-     * Returns the iMappingName member value.  
-     * @since S60 v3.2
-     * @return The iMappingName member value of the object
-     */
-    inline const HBufC8* MappingName();
-
-    /**
-     * Returns the iExecuted member value.  
-     * @since S60 v3.2
-     * @return The iExecuted member value of the object
-     */
-    inline TBool Executed();
-    
-    /**
-     * Sets the iExecuted member value.  
-     * @since S60 v3.2
-     * @param aExecuted Value for the iExecuted member of the object
-     */
-    inline void SetExecuted( TBool aExecuted );
-
-    /**
-     * Returns the iLuid member value.  
-     * @since S60 v3.2
-     * @return The iLuid member value of the object
-     */
-    inline TInt Luid();
-    
-    /**
-     * Sets the iLuid member value.  
-     * @since S60 v3.2
-     * @param aLuid Value for the iLuid member of the object
-     */
-    inline void SetLuid( TInt aLuid );
-    
-        
-private:
-
-    CSmlDmBmSettingsElement();
-
-    void ConstructL( const TDesC8& aMappingName );
-
-private: //data
-
-    /**
-     * Buffer of commands for this SNAP object. Commands 
-     * are added as they come in from the framework and 
-     * executed by the setting store.
-     */
-    RPointerArray<CSmlDmBmCommandElement> iNodeBuf;
-
-    /**
-     * Indicates whether commands for this SNAP have been executed. 
-     * Set to Erue by CNsmlDmBmSettingStore when object is handled.
-     */    
-    TBool iExecuted;
-    
-    /**
-     * LUID (Local UID) is the CommsDat id of the SNAP node. This is 
-     * filled in when SNAP object is created in CommsDat. 
-     */
-    TInt iLuid;
-
-    /**
-     * Mapping name of this SNAP node. This is mapped to the 
-     * iLuid when the Snap is created and has id. 
-     */
-    HBufC8* iMappingName;
-    };
-
-#include "nsmldmbmadapter.inl"
-
-#endif // NSMLDMBMADAPTER_H
--- a/omadm/omadmextensions/adapters/nsmldmbmadapter/inc/nsmldmbmadapter.inl	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,173 +0,0 @@
-/*
-* Copyright (c) 2006 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:   Contains implementations of inline functions
-*
-*/
-
-
-
-// -----------------------------------------------------------------------------
-// Returns the iExecuted member of the object
-// -----------------------------------------------------------------------------
-//
-TBool CSmlDmBmCommandElement::Executed()
-    {
-    return iExecuted;
-    }
-
-// -----------------------------------------------------------------------------
-// Returns the iStatus member of the object
-// -----------------------------------------------------------------------------
-//
-CSmlDmAdapter::TError CSmlDmBmCommandElement::Status()
-    {
-    return iStatus;
-    }
-    
-// -----------------------------------------------------------------------------
-// Returns the iLeaf member of the object
-// -----------------------------------------------------------------------------
-//
-TBool CSmlDmBmCommandElement::Leaf()
-    {
-    return iLeaf;
-    }
-    
-// -----------------------------------------------------------------------------
-// Returns the iStatusRef member of the object
-// -----------------------------------------------------------------------------
-//
-TInt CSmlDmBmCommandElement::StatusRef()
-    {
-    return iStatusRef;    
-    }
-    
-// -----------------------------------------------------------------------------
-// Returns the iResultRef member of the object
-// -----------------------------------------------------------------------------
-//
-TInt CSmlDmBmCommandElement::ResultRef()
-    {
-    return iResultRef;
-    }
-    
-// -----------------------------------------------------------------------------
-// Returns the iCmdType member of the object
-// -----------------------------------------------------------------------------
-//
-CNSmlDmBmAdapter::TCommandType  CSmlDmBmCommandElement::CmdType()
-    {
-    return iCmdType;
-    }
-    
-// -----------------------------------------------------------------------------
-// Returns the iData member of the object
-// -----------------------------------------------------------------------------
-//
-const HBufC8* CSmlDmBmCommandElement::Data()
-    {
-    return iData;
-    }
-    
-// -----------------------------------------------------------------------------
-// Returns the iLastUriSeg member of the object
-// -----------------------------------------------------------------------------
-//
-const HBufC8* CSmlDmBmCommandElement::LastUriSeg()
-    {
-    return iLastUriSeg;
-    }
-    
-// -----------------------------------------------------------------------------
-// Sets the iExecuted member of the object
-// -----------------------------------------------------------------------------
-//
-void CSmlDmBmCommandElement::SetExecuted( TBool aExecuted )
-    {
-    iExecuted = aExecuted;
-    }
-
-// -----------------------------------------------------------------------------
-// Sets the iStatus member of the object
-// -----------------------------------------------------------------------------
-//
-void CSmlDmBmCommandElement::SetStatus( CSmlDmAdapter::TError aStatus )
-    {
-    iStatus = aStatus;
-    }
-    
-    
-// -----------------------------------------------------------------------------
-// Sets the iData member of the object. Ownership of aData argument will be 
-// transfered to the CSmlDmBmCommandElement
-// -----------------------------------------------------------------------------
-//
-void CSmlDmBmCommandElement::SetDataL( const TDesC8& aData )
-    {  
-    if ( aData.Length() > iData->Length() )
-        {
-        iData = iData->ReAllocL( aData.Length() );
-        }
-    *iData = aData;
-    }
-
-//Function definitions for CSmlDmBmSettingsElement
-// -----------------------------------------------------------------------------
-// Returns reference to iNodeBuf
-// -----------------------------------------------------------------------------
-RPointerArray<CSmlDmBmCommandElement>& CSmlDmBmSettingsElement::NodeBuf()
-    {
-    return iNodeBuf;
-    }
-
-// -----------------------------------------------------------------------------
-// Returns iMappingName
-// -----------------------------------------------------------------------------
-const HBufC8* CSmlDmBmSettingsElement::MappingName()
-    {
-    return iMappingName;
-    }
-
-// -----------------------------------------------------------------------------
-// Returns iExecuted
-// -----------------------------------------------------------------------------
-TBool CSmlDmBmSettingsElement::Executed()
-    {
-    return iExecuted;
-    }
-    
-// -----------------------------------------------------------------------------
-// Sets the iExecuted member value
-// -----------------------------------------------------------------------------
-void CSmlDmBmSettingsElement::SetExecuted( TBool aExecuted )
-    {
-    iExecuted = aExecuted;
-    }
-
-
-// -----------------------------------------------------------------------------
-// Returns iLuid
-// -----------------------------------------------------------------------------
-TBool CSmlDmBmSettingsElement::Luid()
-    {
-    return iLuid;
-    }
-    
-// -----------------------------------------------------------------------------
-// Sets the iExecuted member value
-// -----------------------------------------------------------------------------
-void CSmlDmBmSettingsElement::SetLuid( TInt aLuid )
-    {
-    iLuid = aLuid;
-    }
--- a/omadm/omadmextensions/adapters/nsmldmbmadapter/inc/nsmldmbmsettingstore.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,218 +0,0 @@
-/*
-* Copyright (c) 2006 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 class manages snap data in Commsdat using CMManager
-*
-*/
-
-
-
-
-#ifndef NSMLDMBMSETTINGSTORE_H
-#define NSMLDMBMSETTINGSTORE_H
-
-#include <cmmanagerext.h>
-
-#include "nsmldmbmadapter.h"
-
-const TInt KShift8 = 8;
-
-class CNSmlDmBmAdapter;
-class CSmlDmBmCommandElement;
-class CSmlDmBmSettingsElement;
-
-/**
- *  Setting Store is used for managing settings in CommsDat
- *
- *  The class provides functions for executing commands 
- *  and sets of commands that involve manipulation of 
- *  data in CommsDat. 
- *
- *  @lib nsmldmbmadapter
- *  @since S60 v3.2
- */
-class CNSmlDmBmSettingStore : public CBase
-    {
-
-public:
-
-    /**
-     * Two-phased constructor.
-     */
-    static CNSmlDmBmSettingStore * NewL( CNSmlDmBmAdapter* aAdapter );
-
-    /**
-     * Destructor.
-     */
-    virtual ~CNSmlDmBmSettingStore();
-
-
-    /**
-     * Executes all commands for the argument snap object.
-     * Executed commands are set as executed and status is filled 
-     * in. For Get commands also fetched data is filled in the command.
-     *
-     * @since S60 v3.2
-     * @param aSettings Settings object for the SNAP, contains all 
-     * commands to be executed for the SNAP
-     */
-    void StoreSnapL( CSmlDmBmSettingsElement& aSettings );
-
-    
-    /**
-     * Executes the argument command. Checks the node from 
-     * for which the command is intended and calls node specific functions.
-     *
-     * @since S60 v3.2
-     * @param aCmd Command to be executed
-     * @param aLuid LUID of the SNAP which command is referring.
-     */
-     void ExecuteCmdL( CSmlDmBmCommandElement& aCmd, TUint aLuid);
-
-    /**
-     * Fetches all SNAPs and inserts id of each SNAp into the argument array
-     *
-     * @since S60 v3.2
-     * @param aLUIDArray Array for SNAP ids
-     */
-    void GetSnapsL( RArray<TUint32>& aLUIDArray );
- 
-private:
-
-    CNSmlDmBmSettingStore( CNSmlDmBmAdapter * aAdapter );
-
-    void ConstructL();
-
-//----------- Commands for managing leaf nodes -------------------//
-
-    /**
-     * Executes snap commands. The valid commands include 
-     * get and delete. With get commands the iData 
-     * memeber is used to pass fetched data back to caller. 
-     * After execution of command the function fills in the status 
-     * in aCmd.iStatus memeber and sets aCmd.iExecuted as True. The function
-     * leaves if command can not be executed for some reason. 
-     *
-     * @param aCmd The command to be executed
-     * @param aLuid The id of the snap
-     */
-    void ExecuteSnapCmdL( CSmlDmBmCommandElement& aCmd, TUint aLuid );
-
-    /**
-     * Executes iap list commands. The valid commands include 
-     * update and get. With update commands data is read from the 
-     * iData memeber of the argument command. With get commands the iData 
-     * memeber is used to pass fetched data back to caller. 
-     * After execution of command the function fills in the status 
-     * in aCmd.iStatus memeber and sets aCmd.iExecuted as True. The function
-     * leaves if command can not be executed for some reason. 
-     *
-     * @param aCmd The command to be executed
-     * @param aSnap The snap object
-     */
-    void ExecuteIapsCmdL( CSmlDmBmCommandElement& aCmd, 
-                          RCmDestinationExt& aSnap );
-
-    /**
-     * Executes protection commands. The valid commands include 
-     * update and get. With update commands data is read from the 
-     * iData memeber of the argument command. With get commands the iData 
-     * memeber is used to pass fetched data back to caller. 
-     * After execution of command the function fills in the status 
-     * in aCmd.iStatus memeber and sets aCmd.iExecuted as True. The function
-     * leaves if command can not be executed for some reason. 
-     *
-     * @param aCmd The command to be executed
-     * @param aSnap The snap object
-     */
-    void ExecuteProtectionCmdL( CSmlDmBmCommandElement& aCmd, 
-                                RCmDestinationExt& aSnap );
-
-    /**
-     * Executes hidden commands. The valid commands include 
-     * update and get. With update commands data is read from the 
-     * iData memeber of the argument command. With get commands the iData 
-     * memeber is used to pass fetched data back to caller. 
-     * After execution of command the function fills in the status 
-     * in aCmd.iStatus memeber and sets aCmd.iExecuted as True. The function
-     * leaves if command can not be executed for some reason. 
-     *
-     * @param aCmd The command to be executed
-     * @param aSnap The snap object
-     */
-    void ExecuteHiddenCmdL( CSmlDmBmCommandElement& aCmd, 
-                            RCmDestinationExt& aSnap );
-
-    /**
-     * Executes metadata commands. The valid commands include 
-     * update and get. With update commands data is read from the 
-     * iData memeber of the argument command. With get commands the iData 
-     * memeber is used to pass fetched data back to caller. 
-     * After execution of command the function fills in the status 
-     * in aCmd.iStatus memeber and sets aCmd.iExecuted as True. The function
-     * leaves if command can not be executed for some reason. 
-     *
-     * @param aCmd The command to be executed
-     * @param aSnap The snap object
-     */
-    void ExecuteMetadataCmdL( CSmlDmBmCommandElement& aCmd, 
-                              RCmDestinationExt& aSnap );
-
-    /**
-     * Executes embedded snap commands. The valid commands include 
-     * update, get and delete. With update commands data is read from the 
-     * iData memeber of the argument command. With get commands the iData 
-     * memeber is used to pass fetched data back to caller. 
-     * After execution of command the function fills in the status 
-     * in aCmd.iStatus memeber and sets aCmd.iExecuted as True. The function
-     * leaves if command can not be executed for some reason. 
-     *
-     * @param aCmd The command to be executed
-     * @param aLuid The id of the snap
-     */
-    void ExecuteEmbeddedSnapCmdL( CSmlDmBmCommandElement& aCmd, 
-                                  RCmDestinationExt& aSnap );
-    /**
-     * Executes name commands. The valid commands include 
-     * update and get. With update commands data is read from the 
-     * iData memeber of the argument command. With get commands the iData 
-     * memeber is used to pass fetched data back to caller. 
-     * After execution of command the function fills in the status 
-     * in aCmd.iStatus memeber and sets aCmd.iExecuted as True. The function
-     * leaves if command can not be executed for some reason. 
-     *
-     * @param aCmd The command to be executed
-     * @param aSnap The snap object
-     */
-    void ExecuteNameCmdL( CSmlDmBmCommandElement& aCmd, 
-                          RCmDestinationExt& aSnap );
-
-
-private: //data
-
-    /**
-     * CmManager is used for accessing CommsDat.
-     */
-     RCmManagerExt iCmManagerExt;
-     
-    /**
-     * Pointer to the adapter. This is used for 
-     * querying data from DM framework when necessary
-     * and using helper functions. Not own.
-     */ 
-    CNSmlDmBmAdapter* iAdapter;
-
-  };
-
-
-#endif // NSmlDmBmSettingStore_H
--- a/omadm/omadmextensions/adapters/nsmldmbmadapter/rom/nsmldmbmadapter.iby	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-/*
-* Copyright (c) 2006 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:   Image description file for project nsmldmbmadapter
-*
-*/
-
-
-
-#ifndef NSMLDMBMADAPTER_IBY
-#define NSMLDMBMADAPTER_IBY
-
-#include <data_caging_paths_for_iby.hrh>
-
-#ifdef __SYNCML_DM
-
-ECOM_PLUGIN( nsmldmbmadapter.dll, nsmldmbmadapter.rsc )
-
-#endif // __SYNCML_DM
-
-#endif // NSMLDMBMADAPTER_IBY
--- a/omadm/omadmextensions/adapters/nsmldmbmadapter/src/nsmldmbmadapter.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1675 +0,0 @@
-/*
-* Copyright (c) 2006 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:   Bearer management DM adapter. Provides handling of 
-                Bearer management related settings in Device management
-*
-*/
-
-
-
-#include <ecom/implementationproxy.h>
-#include <cmdestinationext.h>
-
-#include "nsmldmbmadapter.h"
-#include "bmadapterlogger.h"
-
-// ======== MEMBER FUNCTIONS ========
-
-
-// --------------------------------------------------------------------------
-// Maps plugin UID to its factory function (constructor)
-// --------------------------------------------------------------------------
-const TImplementationProxy ImplementationTable[] =
-    {
-    IMPLEMENTATION_PROXY_ENTRY(0x101f6d2f, 
-                               CNSmlDmBmAdapter::NewL)
-    };
-
-// --------------------------------------------------------------------------
-// For ecom plugin implementation
-// -------------------------------------------------------------------------
-
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy( TInt& aTableCount )
-    {
-    aTableCount = sizeof(ImplementationTable) / sizeof(TImplementationProxy);
-    return ImplementationTable;
-    }
-
-// --------------------------------------------------------------------------
-// CNSmlDmBmAdapter::NewL
-// --------------------------------------------------------------------------
-CNSmlDmBmAdapter* CNSmlDmBmAdapter::NewL( MSmlDmCallback* aDmCallback )
-    {
-    BMADAPTERLOGSTRING("CNSmlDmBmAdapter::NewL: Start")
-    CNSmlDmBmAdapter* self = new (ELeave) CNSmlDmBmAdapter( aDmCallback );
-    CleanupStack::PushL(self);
-    self->ConstructL();
-    CleanupStack::Pop( self );
-    BMADAPTERLOGSTRING("CNSmlDmBmAdapter::NewL: End")
-    return self;
-    }
-
-// --------------------------------------------------------------------------
-// CNSmlDmBmAdapter::CNSmlDmBmAdapter
-// --------------------------------------------------------------------------
-
-CNSmlDmBmAdapter::CNSmlDmBmAdapter( MSmlDmCallback* aDmCallback ) 
-    : CSmlDmAdapter( aDmCallback )
-    {
-    }
-
-// --------------------------------------------------------------------------
-// CNSmlDmBmAdapter::ConstructL
-// --------------------------------------------------------------------------
-void CNSmlDmBmAdapter::ConstructL()
-    {
-    BMADAPTERLOGSTRING( "CNSmlDmBmAdapter::CNSmlDmBmAdapter: Start" )
-    iSettingStore = CNSmlDmBmSettingStore::NewL( this );
-    BMADAPTERLOGSTRING( "CNSmlDmBmAdapter::CNSmlDmBmAdapter: End" )
-    }
-
-// --------------------------------------------------------------------------
-// CNSmlDmBmAdapter::~CNSmlDmBmAdapter
-// --------------------------------------------------------------------------
-CNSmlDmBmAdapter::~CNSmlDmBmAdapter()
-    {
-    BMADAPTERLOGSTRING( "CNSmlDmBmAdapter::~CNSmlDmBmAdapter: Start" )
-    iBuffer.ResetAndDestroy();
-    iBuffer.Close();
-    delete iSettingStore;
-    BMADAPTERLOGSTRING( "CNSmlDmBmAdapter::~CNSmlDmBmAdapter: End" )
-    }
-    
-// --------------------------------------------------------------------------
-// CNSmlDmBmAdapter::DDFVersionL
-// Returns ddf version nr
-// --------------------------------------------------------------------------
-void CNSmlDmBmAdapter::DDFVersionL( CBufBase& aDDFVersion )
-    {
-    BMADAPTERLOGSTRING( "CNSmlDmBmAdapter::DDFVersionL: Start" )
-    aDDFVersion.InsertL( 0, KNSmlDmBMAdapterDDFVersion );
-    BMADAPTERLOGSTRING( "CNSmlDmBmAdapter::DDFVersionL:End" )
-    }
-   
-// --------------------------------------------------------------------------
-// CNSmlDmBmAdapter::DDFStructureL
-//  Constructs the DDF structure
-// --------------------------------------------------------------------------
-void CNSmlDmBmAdapter::DDFStructureL( MSmlDmDDFObject& aDDF )
-    {
-    BMADAPTERLOGSTRING( "CNSmlDmBmAdapter::DDFStructureL: Start" )
-    TSmlDmAccessTypes accessTypes;
-
-    // BearerManagementSNAP
-    MSmlDmDDFObject& bm = aDDF.AddChildObjectL( KNSmlDmBMAdapterBM );
-    accessTypes.SetGet();
-    accessTypes.SetAdd();
-    bm.SetAccessTypesL( accessTypes );
-    bm.SetOccurenceL( MSmlDmDDFObject::EOne );
-    bm.SetScopeL( MSmlDmDDFObject::EPermanent );
-    bm.SetDFFormatL( MSmlDmDDFObject::ENode );
-    bm.AddDFTypeMimeTypeL( KNSmlDmBMAdapterTextPlain );
-    bm.SetDescriptionL( KNSmlDmBMAdapterBMDescription );
-    accessTypes.Reset();
-
-    
-    // BearerManagementSNAP/<X>
-    MSmlDmDDFObject& dynamic1 = bm.AddChildObjectGroupL();
-    accessTypes.SetAdd();
-    accessTypes.SetDelete();
-    accessTypes.SetGet();
-    accessTypes.SetReplace();
-    dynamic1.SetAccessTypesL( accessTypes );
-    dynamic1.SetOccurenceL( MSmlDmDDFObject::EZeroOrMore );
-    dynamic1.SetScopeL( MSmlDmDDFObject::EDynamic );
-    dynamic1.SetDFFormatL( MSmlDmDDFObject::ENode );
-    dynamic1.AddDFTypeMimeTypeL( KNSmlDmBMAdapterTextPlain );
-    dynamic1.SetDescriptionL( KNSmlDmBMAdapterDynamicDescription );
-    accessTypes.Reset();
-
-
-    // BearerManagementSNAP/<X>/Name
-    MSmlDmDDFObject& name = dynamic1.AddChildObjectL( KNSmlDmBMAdapterName );
-    accessTypes.SetAdd();
-    accessTypes.SetGet();
-    accessTypes.SetReplace();
-    name.SetAccessTypesL( accessTypes );
-    name.SetOccurenceL( MSmlDmDDFObject::EOne );
-    name.SetScopeL( MSmlDmDDFObject::EDynamic );
-    name.SetDFFormatL( MSmlDmDDFObject::EChr );
-    name.SetDescriptionL( KNSmlDmBMAdapterNameDescription );
-    accessTypes.Reset();
-
-    // BearerManagementSNAP/<X>/IAPPrioityList
-    MSmlDmDDFObject& iapList = 
-    dynamic1.AddChildObjectL( KNSmlDmBMAdapterIAPPriorityList );
-    accessTypes.SetAdd();
-    accessTypes.SetGet();
-    accessTypes.SetReplace();
-    iapList.SetAccessTypesL( accessTypes );
-    iapList.SetOccurenceL( MSmlDmDDFObject::EOne );
-    iapList.SetScopeL( MSmlDmDDFObject::EDynamic );
-    iapList.SetDFFormatL( MSmlDmDDFObject::EChr );
-    iapList.SetDescriptionL( KNSmlDmBMAdapterIAPPriorityListDescription );
-    accessTypes.Reset();
-        
-    // BearerManagementSNAP/<X>/EmbeddedSNAP
-    MSmlDmDDFObject& embedded = 
-    dynamic1.AddChildObjectL( KNSmlDmBMAdapterEmbeddedSNAP );
-    accessTypes.SetAdd();
-    accessTypes.SetDelete();
-    accessTypes.SetGet();
-    accessTypes.SetReplace();
-    embedded.SetAccessTypesL( accessTypes );
-    embedded.SetOccurenceL( MSmlDmDDFObject::EZeroOrOne );
-    embedded.SetScopeL( MSmlDmDDFObject::EDynamic );
-    embedded.SetDFFormatL( MSmlDmDDFObject::EChr );
-    embedded.SetDescriptionL( KNSmlDmBMAdapterEmbeddedSNAPDescription );
-    accessTypes.Reset();
-
-    // BearerManagementSNAP/<X>/Metadata
-    MSmlDmDDFObject& metadata = 
-    dynamic1.AddChildObjectL( KNSmlDmBMAdapterMetadata );
-    accessTypes.SetAdd();
-    accessTypes.SetGet();
-    accessTypes.SetReplace();
-    metadata.SetAccessTypesL( accessTypes );
-    metadata.SetOccurenceL( MSmlDmDDFObject::EOne );
-    metadata.SetScopeL( MSmlDmDDFObject::EDynamic );
-    metadata.SetDFFormatL( MSmlDmDDFObject::EInt );
-    metadata.SetDescriptionL( KNSmlDmBMAdapterMetadataDescription );
-    accessTypes.Reset();
- 
- 
-    // BearerManagementSNAP/<X>/Protected
-    MSmlDmDDFObject& protection = 
-    dynamic1.AddChildObjectL( KNSmlDmBMAdapterProtected );
-    accessTypes.SetAdd();
-    accessTypes.SetGet();
-    accessTypes.SetReplace();
-    protection.SetAccessTypesL( accessTypes );
-    protection.SetOccurenceL( MSmlDmDDFObject::EOne );
-    protection.SetScopeL( MSmlDmDDFObject::EDynamic );
-    protection.SetDFFormatL( MSmlDmDDFObject::EInt );
-    protection.SetDescriptionL( KNSmlDmBMAdapterProtectedDescription );
-    accessTypes.Reset(); 
-    
-    // BearerManagementSNAP/<X>/Hidden
-    MSmlDmDDFObject& hidden = dynamic1.AddChildObjectL( KNSmlDmBMAdapterHidden );
-    accessTypes.SetAdd();
-    accessTypes.SetGet();
-    accessTypes.SetReplace();
-    hidden.SetAccessTypesL( accessTypes );
-    hidden.SetOccurenceL( MSmlDmDDFObject::EOne );
-    hidden.SetScopeL( MSmlDmDDFObject::EDynamic );
-    hidden.SetDFFormatL( MSmlDmDDFObject::EBool );
-    hidden.SetDescriptionL( KNSmlDmBMAdapterHiddenDescription );
-    accessTypes.Reset(); 
-    
-    BMADAPTERLOGSTRING( "CNSmlDmBmAdapter::DDFStructureL: End" )
-    }
-
-// -------------------------------------------------------------------------
-// CNSmlDmBmAdapter::UpdateLeafObjectL
-//  Adds or updates leaf node value. If snap object is 
-//  in buffer this command is also buffered. Also if leaf node 
-//  is embedded snap and that snap is buffered, the argument command
-//  is buffered.
-// -------------------------------------------------------------------------
-void CNSmlDmBmAdapter::UpdateLeafObjectL( const TDesC8& aURI, 
-                                          const TDesC8& aLUID, 
-                                          const TDesC8& aObject, 
-                                          const TDesC8& /*aType*/, 
-                                          TInt aStatusRef )
-    {
-    BMADAPTERLOGSTRING( "CNSmlDmBmAdapter::UpdateLeafObjectL: Start" )
-    BMADAPTERLOGSTRING4( "\tUpdateLeafObjectL  \tURI: %S, \n\tLUID: %S,\
-                         \tobject: %S ", 
-                        &aURI, &aLUID, &aObject )
-
-    TInt snapId = MapPredefinedSnapsL( aURI, aLUID );
-                        
-    // Check if parent snap node is found in the buffered settings
-    CSmlDmBmSettingsElement* snap = 
-    GetSnapIfBuffered( RemoveLastURISeg( aURI ) );
-
-    // data for buffered SNAP -> Store command into buffer    
-    if ( snap )
-        {
-        CSmlDmBmCommandElement* cmd = 
-        CSmlDmBmCommandElement::NewLC( ETrue, 
-                                       aStatusRef,
-                                       KNSmlDmBmInvalidRef, 
-                                       CNSmlDmBmAdapter::EAddCmd,
-                                       LastURISeg( aURI ), 
-                                       aObject);
-        snap->NodeBuf().AppendL(cmd);
-        CleanupStack::Pop( cmd );
-        BMADAPTERLOGSTRING2( "\tSnap %S found, buffering cmd", 
-                            snap->MappingName() )
-
-        }
-    // updates for an existing SNAP
-    else
-        {
-
-        // If setting embedded SNAP node and the embedded SNAP node is still 
-        // buffered -> Buffer also this command
-        if( !LastURISeg( aURI ).Compare( KNSmlDmBMAdapterEmbeddedSNAP ) )
-            {
-            snap = GetSnapIfBuffered( aObject );
-
-                // embedded SNAP is buffered
-                if ( snap )
-                    {
-                    CSmlDmBmCommandElement* cmd = 
-                    CSmlDmBmCommandElement::NewLC( ETrue, 
-                                                   aStatusRef,
-                                                   KNSmlDmBmInvalidRef, 
-                                                   CNSmlDmBmAdapter::EAddCmd,
-                                                   LastURISeg( aURI ), 
-                                                   aObject);
-
-                    // buffer this command
-                    CSmlDmBmSettingsElement* setting = 
-                    CSmlDmBmSettingsElement::NewLC( RemoveLastURISeg( aURI ) );
-                    
-                    // Check if SNAP was predefined or not
-                    if( snapId == KErrNotFound )
-                        {
-                        snapId = DesToIntL( aLUID );
-                        }
-                    setting->SetLuid( snapId );
-                    iBuffer.AppendL( setting );
-                    CleanupStack::Pop( setting );
-                    setting->NodeBuf().AppendL(cmd);
-                    CleanupStack::Pop( cmd );
-                    BMADAPTERLOGSTRING2( "\tEmbedded Snap %S buffered, buffering cmd", 
-                                         snap->MappingName() )
-                    BMADAPTERLOGSTRING( "CNSmlDmBmAdapter::UpdateLeafObjectL: End" )
-                    return;
-                    }
-            }
-        // execute command and return status  
-        CSmlDmBmCommandElement* cmd = 
-        CSmlDmBmCommandElement::NewLC( ETrue, 
-                                       aStatusRef,
-                                       KNSmlDmBmInvalidRef, 
-                                       CNSmlDmBmAdapter::EAddCmd,
-                                       LastURISeg( aURI ), 
-                                       aObject);
-        if( snapId == KErrNotFound )
-            {
-            snapId = DesToIntL( aLUID );
-            }
-        iSettingStore->ExecuteCmdL( *cmd, snapId );
-        BMADAPTERLOGSTRING2( "\tCmd executed with status: %d", 
-                              cmd->Status() )
-        Callback().SetStatusL( aStatusRef, cmd->Status() );
-        CleanupStack::PopAndDestroy( cmd );
-
-        }
-    BMADAPTERLOGSTRING( "CNSmlDmBmAdapter::UpdateLeafObjectL: End" )
-    }
-// --------------------------------------------------------------------------
-// CNSmlDmBmAdapter::DeleteObjectL
-//  Deletes node or leaf object. If the snap this command relates to is
-//  buffered, also the delete command is buffered.
-// --------------------------------------------------------------------------
-
-void CNSmlDmBmAdapter::DeleteObjectL( const TDesC8& aURI, 
-                                      const TDesC8& aLUID,
-                                      TInt aStatusRef )
-    {
-    BMADAPTERLOGSTRING( "CNSmlDmBmAdapter::DeleteObjectL: Start" )
-    BMADAPTERLOGSTRING3( "\tDeleteObjectL  \tURI: %S, \tLUID: %S", 
-                         &aURI, &aLUID )
-    
-    CSmlDmBmCommandElement* cmd;
-    
-    TInt snapId = MapPredefinedSnapsL( aURI, aLUID );
-    // check if node or leaf object and create command accordingly
-    // when updating, make sure that cmd is constructed
-    if ( NumOfURISegs( aURI  ) == KNsmlDmBmSNAPNodeDepth )
-        {
-        cmd = CSmlDmBmCommandElement::NewLC( EFalse, 
-                                             aStatusRef,
-                                             KNSmlDmBmInvalidRef, 
-                                             CNSmlDmBmAdapter::EDeleteCmd,
-                                             KNullDesC8, KNullDesC8 );
-        }
-    else if ( ! LastURISeg( aURI ).Compare( KNSmlDmBMAdapterEmbeddedSNAP() ) )
-        {
-        cmd = CSmlDmBmCommandElement::NewLC( ETrue, 
-                                             aStatusRef,
-                                             KNSmlDmBmInvalidRef, 
-                                             CNSmlDmBmAdapter::EDeleteCmd,
-                                             LastURISeg( aURI ), 
-                                             KNullDesC8 );
-        }
-    else
-        {
-        // unsupported node, framework should check this
-        Callback().SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-        BMADAPTERLOGSTRING( "\tCNSmlDmBmAdapter::DeleteObjectL: \
-        Error, unsupported node" )
-        return;
-        }
-
-    // If this SNAP still in buffer -> buffer command for later execution
-    // Check if SNAP is found in the buffered settings
-    CSmlDmBmSettingsElement* snap = NULL;
-    if( cmd->Leaf() )
-        {
-        snap = GetSnapIfBuffered( RemoveLastURISeg( aURI ) );
-        }
-    else
-        {
-        snap = GetSnapIfBuffered( aURI );
-        }
-    // when updating make sure that cmd is removed from cleanup 
-    // stack and deleted if necessary
-    
-    // if cmd for buffered snap append cmd to buffer
-    if ( snap )
-        {
-        snap->NodeBuf().AppendL( cmd );
-        CleanupStack::Pop( cmd );
-        BMADAPTERLOGSTRING2( "\tSnap %S found, buffering cmd", 
-                            snap->MappingName() )
-        }
-    // if existing node, execute command
-    else if( aLUID.Length() > 0 || snapId != KErrNotFound )
-        {
-        if( snapId == KErrNotFound )
-            {
-            snapId = DesToIntL( aLUID );
-            }
-        iSettingStore->ExecuteCmdL( *cmd, snapId );
-        BMADAPTERLOGSTRING2( "\tCmd executed with status: %d ", 
-                              cmd->Status() )
-        Callback().SetStatusL( aStatusRef, cmd->Status() );
-        CleanupStack::PopAndDestroy( cmd );
-        }
-        // unknown node    
-    else
-        {
-        BMADAPTERLOGSTRING( "\tUnknown node\n" )
-        Callback().SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-        CleanupStack::PopAndDestroy( cmd );
-        }
-    
-    BMADAPTERLOGSTRING( "CNSmlDmBmAdapter::DeleteObjectL: End" )
-    }
-// -------------------------------------------------------------------------
-// CNSmlDmBmAdapter::FetchLeafObjectL
-//  Fetches leaf object value. If the snap is buffered also this command 
-//  will
-//  be buffered.
-// -------------------------------------------------------------------------
-void CNSmlDmBmAdapter::FetchLeafObjectL( const TDesC8& aURI, 
-                                         const TDesC8& aLUID, 
-                                         const TDesC8& /*aType*/, 
-                                         const TInt aResultsRef, 
-                                         const TInt aStatusRef )
-    {
-    BMADAPTERLOGSTRING( "NSmlDmBMAdapter::FetchLeafObjectL: Start" )
-    BMADAPTERLOGSTRING3( "\tFetchLeafObjectL  \tURI: %S, \tLUID: %S,", 
-                        &aURI, &aLUID )
-
-    TInt snapId = MapPredefinedSnapsL( aURI, aLUID );                         
-                        
-    // check if parent snap node is buffered 
-    CSmlDmBmSettingsElement* snap = 
-    GetSnapIfBuffered( RemoveLastURISeg( aURI ) );
-
-    // data for buffered SNAP -> Store command into buffer    
-    if ( snap )
-        {
-        CSmlDmBmCommandElement* cmd = 
-        CSmlDmBmCommandElement::NewLC( ETrue, 
-                                       aStatusRef, 
-                                       aResultsRef, 
-                                       CNSmlDmBmAdapter::EGetCmd,
-                                       LastURISeg( aURI ), 
-                                       KNullDesC8);
-        snap->NodeBuf().AppendL( cmd );
-        CleanupStack::Pop( cmd );
-        BMADAPTERLOGSTRING2( "\tSnap %S found, buffering cmd", 
-                            snap->MappingName() )
-        }
-    // otherwise execute cmd right away
-    else
-        {
-                
-        CSmlDmBmCommandElement* cmd = 
-        CSmlDmBmCommandElement::NewLC( ETrue, 
-                                       aStatusRef, 
-                                       aResultsRef, 
-                                       CNSmlDmBmAdapter::EGetCmd,
-                                       LastURISeg( aURI ), 
-                                       KNullDesC8);
-        if( snapId == KErrNotFound )
-            {
-            snapId = DesToIntL( aLUID );
-            }
-
-        iSettingStore->ExecuteCmdL( *cmd, snapId );
-        BMADAPTERLOGSTRING2( "\tCmd executed with status: %d ", 
-                              cmd->Status() )
-        // if executed return status
-        if ( cmd->Executed() ) 
-            {
-            Callback().SetStatusL( aStatusRef, cmd->Status() );
-            // if successful set results
-            if ( cmd->Status() == CSmlDmAdapter::EOk )
-                {
-                BMADAPTERLOGSTRING2( "\tCmd executed with result: %S ", 
-                                      cmd->Data() )
-                CBufBase* result = CBufFlat::NewL( cmd->Data()->Size() );
-                CleanupStack::PushL( result );
-                result->InsertL( 0, *cmd->Data() );
-                Callback().SetResultsL( aResultsRef, *result, KNullDesC8 );
-                CleanupStack::PopAndDestroy( result );
-                }
-            }
-        else
-            {
-            // failed to execute command
-            Callback().SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-            }
-        CleanupStack::PopAndDestroy( cmd );
-        }
-    
-    BMADAPTERLOGSTRING( "NSmlDmBMAdapter::FetchLeafObjectL: End" )
-    }
-
-// --------------------------------------------------------------------------
-//  CNSmlDmBmAdapter::FetchLeafObjectSizeL
-//  Fetches leaf object size. If the snap is buffered also this command will
-//  be buffered.
-// -------------------------------------------------------------------------
-void CNSmlDmBmAdapter::FetchLeafObjectSizeL( const TDesC8& aURI, 
-                                             const TDesC8& aLUID,
-                                             const TDesC8& /* aType */, 
-                                             TInt aResultsRef,
-                                             TInt aStatusRef )
-    {
-    BMADAPTERLOGSTRING( "CNSmlDmBmAdapter::FetchLeafObjectSizeL: Start" )
-    BMADAPTERLOGSTRING3( "\tFetchLeafObjectSizeL  \tURI: %S, \tLUID: %S,", 
-                         &aURI, &aLUID )
-   
-    TInt snapId = MapPredefinedSnapsL( aURI, aLUID );
-    
-    // check if parent snap node is buffered 
-    CSmlDmBmSettingsElement* snap = 
-    GetSnapIfBuffered( RemoveLastURISeg( aURI ) );
-
-    // data for buffered SNAP -> Store command into buffer    
-    if ( snap )
-        {
-        CSmlDmBmCommandElement* cmd = 
-        CSmlDmBmCommandElement::NewLC( ETrue, 
-                                       aStatusRef, 
-                                       aResultsRef, 
-                                       CNSmlDmBmAdapter::EGetSizeCmd,
-                                       LastURISeg( aURI ), 
-                                       KNullDesC8);
-        snap->NodeBuf().AppendL( cmd );
-        CleanupStack::Pop( cmd ); 
-        BMADAPTERLOGSTRING2( "\tSnap %S found, buffering cmd", 
-                             snap->MappingName() )
-        }
-    // otherwise execute get size cmd right away
-    else
-        {
-        CSmlDmBmCommandElement* cmd = 
-        CSmlDmBmCommandElement::NewLC( ETrue, 
-                                       aStatusRef, 
-                                       aResultsRef, 
-                                       CNSmlDmBmAdapter::EGetSizeCmd,
-                                       LastURISeg( aURI ), 
-                                       KNullDesC8);
-        if( snapId == KErrNotFound )
-            {
-            snapId = DesToIntL( aLUID );
-            }
-        iSettingStore->ExecuteCmdL( *cmd, snapId );
-        BMADAPTERLOGSTRING2( "\tCmd executed with status: %d ", 
-                              cmd->Status() )
-        // if executed get status
-        if ( cmd->Executed() ) 
-            {
-            Callback().SetStatusL( aStatusRef, cmd->Status() );
-            // if successful get results
-            if ( cmd->Status() == CSmlDmAdapter::EOk )
-                {
-                BMADAPTERLOGSTRING2( "\tCmd executed with result: %S ", 
-                                      cmd->Data() )
-                CBufBase* result = CBufFlat::NewL( cmd->Data()->Size() );
-                CleanupStack::PushL( result );
-                result->InsertL( 0, *cmd->Data() );
-                Callback().SetResultsL( aResultsRef, *result, KNullDesC8 );
-                CleanupStack::PopAndDestroy( result );
-                }
-            }
-        else
-            {
-            // failed to execute command
-            Callback().SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-            }
-        
-        CleanupStack::PopAndDestroy( cmd );
-        }
-    BMADAPTERLOGSTRING( "CNSmlDmBmAdapter::FetchLeafObjectSizeL: End" )
-    }
-
-// ------------------------------------------------------------------------
-//  CNSmlDmBmAdapter::ChildURIListL
-//  Fetches child nodes of a node. these may be either all snap nodes
-//  or leaf nodes under a snap node. 
-// ------------------------------------------------------------------------
-void CNSmlDmBmAdapter::ChildURIListL( const TDesC8& aURI, 
-                                      const TDesC8& aLUID,
-                                      const CArrayFix<TSmlDmMappingInfo>& 
-                                      aPreviousURISegmentList,
-                                      TInt aResultsRef, 
-                                      TInt aStatusRef )
-    {
-    BMADAPTERLOGSTRING( "CNSmlDmBmAdapter::ChildURIListL: Start" )
-    BMADAPTERLOGSTRING3( "\tChildURIListL  URI: %S, LUID: %S ", 
-                        &aURI, &aLUID )
-                        
-    TInt snapId = MapPredefinedSnapsL( aURI, aLUID );
-    
-    CBufBase* resultList = CBufFlat::NewL( KSmlMaxURISegLen );
-    CleanupStack::PushL( resultList );
-    // get all snap nodes
-    if ( !aURI.Compare(KNSmlDmBMAdapterBM) )
-        {
-        RArray<TUint32> snaps = RArray<TUint32>( KNSmlDmBMGranularity );
-        CleanupClosePushL( snaps );
-        iSettingStore->GetSnapsL( snaps );
-        TInt currentSNAP( -1 );
-        for ( TInt i( 0 ); i < snaps.Count(); i++)
-            {
-            currentSNAP = snaps[i];
-            BMADAPTERLOGSTRING2( "\tSnap id: %d, ", currentSNAP )
-
-            // check that not previously mapped
-            TBool found = EFalse;
-            
-            for ( TInt j( 0 ); j < aPreviousURISegmentList.Count(); j++ )
-                {
-                TSmlDmMappingInfo mapping = aPreviousURISegmentList.At( j );
-                // snap already has mapping
-                if ( currentSNAP == DesToIntL( mapping.iURISegLUID ) )
-                    {
-                    BMADAPTERLOGSTRING2( " URI: %S exists ", &mapping.iURISeg )
-                    found = ETrue;
-                    // add to result list
-                    resultList->InsertL( resultList->Size(), 
-                                         mapping.iURISeg);
-                    break;
-                    }
-                }
-            if ( !found )
-                {
-                // This is new snap -> create URI and mapping and add 
-                // node name to result
-                HBufC8* uri = HBufC8::NewLC( aURI.Length() + 
-                                             KNSmlDmBmSeparator().Length() +
-                                             KSmlMaxURISegLen );
-                    
-                TPtr8 uriPtr = uri->Des(); 
-                uriPtr.Format( aURI );
-                uriPtr.Append( KNSmlDmBmSeparator );
-                uriPtr.Append( KNSmlDmBMSNAPNamePrefix ); 
-                HBufC8* luidBuf = IntToDes8L( currentSNAP );
-                CleanupStack::PushL( luidBuf );
-                uriPtr.Append( *luidBuf );
-
-                Callback().SetMappingL( uriPtr, *luidBuf );
-                resultList->InsertL( resultList->Size(), 
-                                     LastURISeg( uriPtr ) );
-                BMADAPTERLOGSTRING2( "Creating mapping for URI %S ", &uriPtr ) 
-                CleanupStack::PopAndDestroy( luidBuf );
-                CleanupStack::PopAndDestroy( uri );
-                }
-            // insert separator if not last    
-            if ( i < snaps.Count() - 1 )
-                {
-                resultList->InsertL( resultList->Size(), 
-                                     KNSmlDmBmSeparator );
-                }
-            }
-        CleanupStack::PopAndDestroy( &snaps );
-        Callback().SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
-        Callback().SetResultsL( aResultsRef, *resultList, KNullDesC8 );
-        }
-    // get child nodes of a snap node
-    else if ( NumOfURISegs( aURI ) == KNsmlDmBmSNAPNodeDepth )
-        {        
-        CSmlDmBmSettingsElement* snap = GetSnapIfBuffered( aURI );
-        // if buffered, add this command to buffer
-        if( snap )
-            {
-            CSmlDmBmCommandElement* cmd = 
-            CSmlDmBmCommandElement::NewLC( EFalse, 
-                                           aStatusRef,
-                                           aResultsRef, 
-                                           CNSmlDmBmAdapter::EGetCmd, 
-                                           KNullDesC8, 
-                                           KNullDesC8 );
-            snap->NodeBuf().AppendL( cmd );
-            CleanupStack::Pop( cmd );
-            BMADAPTERLOGSTRING2( "\tSnap %S found, buffering cmd", 
-                                 snap->MappingName() )
-            }
-        // existing snap must have luid mapped
-        else if( aLUID.Length() > 0 || snapId != KErrNotFound )
-            {
-            CSmlDmBmCommandElement* cmd = 
-            CSmlDmBmCommandElement::NewLC( EFalse, 
-                                           aStatusRef,
-                                           aResultsRef, 
-                                           CNSmlDmBmAdapter::EGetCmd, 
-                                           KNullDesC8, 
-                                           KNullDesC8 );
-            if( snapId == KErrNotFound )
-                {
-                snapId = DesToIntL( aLUID );
-                }
-            
-            iSettingStore->ExecuteCmdL( *cmd, snapId );
-            BMADAPTERLOGSTRING2( "\tCmd executed with status: %d ", 
-                                  cmd->Status() )
-            Callback().SetStatusL( aStatusRef, cmd->Status() );
-            if( cmd->Status() == CSmlDmAdapter::EOk )
-                {
-                resultList->InsertL( 0, *cmd->Data() );
-                Callback().SetResultsL( aResultsRef, 
-                                        *resultList, 
-                                        KNullDesC8 );
-                } 
-            CleanupStack::PopAndDestroy( cmd );
-            }
-        // invalid snap object
-        else
-            {
-            BMADAPTERLOGSTRING( "\tCNSmlDmBmAdapter::ChildURIListL: Error, \
-            invalid snap node" )
-            Callback().SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-            }           
-        }
-    else
-        {
-        BMADAPTERLOGSTRING( "\tChildURIListL: Invalid URI" )
-        }
-    CleanupStack::PopAndDestroy( resultList );
-    BMADAPTERLOGSTRING( "CNSmlDmBmAdapter::ChildURIListL: End" )
-    }
- 
-// --------------------------------------------------------------------------
-//  CNSmlDmBmAdapter::AddNodeObjectL
-//  Adds a snap node. The node is buffered until all data is received.
-// --------------------------------------------------------------------------
-void CNSmlDmBmAdapter::AddNodeObjectL( const TDesC8& aURI, 
-                                       const TDesC8& aParentLUID,
-                                       TInt aStatusRef )
-    {
-    BMADAPTERLOGSTRING( "CNSmlDmBmAdapter::AddNodeObjectL: Start" )
-    BMADAPTERLOGSTRING3( "\tAddNodeObjectL  \tURI: %S, \tparent LUID: %S,", 
-                        &aURI, &aParentLUID )
-    if ( NumOfURISegs( aURI ) == KNsmlDmBmSNAPNodeDepth )
-        {
-        // if same node already exists command fails
-        CSmlDmBmSettingsElement* setting = GetSnapIfBuffered( aURI );
-        if( setting || aParentLUID.Compare( KNullDesC8) )
-            {
-            BMADAPTERLOGSTRING( "\t Snap exists" )
-            Callback().SetStatusL( aStatusRef, CSmlDmAdapter::EAlreadyExists );
-            }
-        else if ( LastURISeg( aURI ).Length() > KSmlMaxURISegLen )
-            {
-            BMADAPTERLOGSTRING( "\t Node name too long" )
-            Callback().SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-            }
-        else
-            {
-            // Store command in buffer for later processing
-            setting = CSmlDmBmSettingsElement::NewLC( aURI );
-            iBuffer.AppendL( setting );
-            CleanupStack::Pop( setting );
-        
-            // store the add node command
-            CSmlDmBmCommandElement* command = 
-            CSmlDmBmCommandElement::NewLC( EFalse, 
-                                           aStatusRef,
-                                           KNSmlDmBmInvalidRef, 
-                                           CNSmlDmBmAdapter::EAddCmd, 
-                                           KNullDesC8, 
-                                           KNullDesC8 );
-            TInt index( iBuffer.Count() - 1 );
-            iBuffer[index]->NodeBuf().AppendL( command ); 
-            CleanupStack::Pop( command );
-            BMADAPTERLOGSTRING( "\t Cmd buffered" )
-            }
-        }
-      
-    BMADAPTERLOGSTRING( "CNSmlDmBmAdapter::AddNodeObjectL: End" )
-    }
-
-// -------------------------------------------------------------------------
-//  CNSmlDmBmAdapter::UpdateLeafObjectL
-//  Not supported
-// -------------------------------------------------------------------------
-void CNSmlDmBmAdapter::UpdateLeafObjectL( const TDesC8& /* aURI */, 
-                                          const TDesC8& /* aLUID */, 
-                                          RWriteStream*& /* aStream */, 
-                                          const TDesC8& /* aType */, 
-                                          TInt /* aStatusRef */ )
-    {
-    BMADAPTERLOGSTRING( "CNSmlDmBmAdapter::UpdateLeafObjectL: Start" )
-    BMADAPTERLOGSTRING( "CNSmlDmBmAdapter::UpdateLeafObjectL: End" )
-    }
-
-
-
-// -------------------------------------------------------------------------
-//  CNSmlDmBmAdapter::ExecuteCommandL
-//  Not supported
-// -------------------------------------------------------------------------
-void CNSmlDmBmAdapter::ExecuteCommandL( const TDesC8& /* aURI */, 
-                                        const TDesC8& /* aLUID */, 
-                                        const TDesC8& /* aArgument */, 
-                                        const TDesC8& /* aType */, 
-                                        TInt aStatusRef )
-    {
-    BMADAPTERLOGSTRING( "CNSmlDmBmAdapter::ExecuteCommandL: Start" )
-    Callback().SetStatusL(aStatusRef, CSmlDmAdapter::EError);
-    BMADAPTERLOGSTRING( "CNSmlDmBmAdapter::ExecuteCommandL: End" )
-    }
-// -------------------------------------------------------------------------
-//  CNSmlDmBmAdapter::ExecuteCommandL
-//  Not supported
-// -------------------------------------------------------------------------
-void CNSmlDmBmAdapter::ExecuteCommandL( const TDesC8& /* aURI */, 
-                                        const TDesC8& /* aLUID */, 
-                                        RWriteStream*& /* aStream */, 
-                                        const TDesC8& /* aType */, 
-                                        TInt aStatusRef )
-    {
-    BMADAPTERLOGSTRING( "CNSmlDmBmAdapter::ExecuteCommandL: Start" )
-    Callback().SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-    BMADAPTERLOGSTRING( "CNSmlDmBmAdapter::ExecuteCommandL: End" )
-    }
- 
-// -------------------------------------------------------------------------
-//  CNSmlDmBmAdapter::CopyCommandL
-//  Not supported
-// -------------------------------------------------------------------------
-void CNSmlDmBmAdapter::CopyCommandL( const TDesC8& /* aTargetURI */ , 
-                                     const TDesC8& /* aTargetLUID */ , 
-                                     const TDesC8& /* aSourceURI */ , 
-                                     const TDesC8& /* aSourceLUID */, 
-                                     const TDesC8& /* aType */ , 
-                                     TInt aStatusRef )
-    {
-    //not supported
-    BMADAPTERLOGSTRING( "CNSmlDmBmAdapter::CopyCommandL: Sart" )
-    Callback().SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-    BMADAPTERLOGSTRING( "CNSmlDmBmAdapter::CopyCommandL: End" )
-    }
-// -------------------------------------------------------------------------
-//  CNSmlDmBmAdapter::StartAtomicL
-//  Not supported
-// -------------------------------------------------------------------------
-void CNSmlDmBmAdapter::StartAtomicL()
-    {
-    BMADAPTERLOGSTRING( "CNSmlDmBmAdapter::StartAtomicL: Start" )
-    BMADAPTERLOGSTRING( "CNSmlDmBmAdapter::StartAtomicL: End" )
-    }
-// -------------------------------------------------------------------------
-//  CNSmlDmBmAdapter::CommitAtomicL
-//  Not supported
-// -------------------------------------------------------------------------
-void CNSmlDmBmAdapter::CommitAtomicL()
-    {
-    BMADAPTERLOGSTRING( "CNSmlDmBmAdapter::CommitAtomicL: Start" )
-    BMADAPTERLOGSTRING( "CNSmlDmBmAdapter::CommitAtomicL: End" )
-    }
-
-// -------------------------------------------------------------------------
-//  CNSmlDmBmAdapter::RollbackAtomicL
-//  Not supported
-// -------------------------------------------------------------------------
-void CNSmlDmBmAdapter::RollbackAtomicL()
-    {
-    BMADAPTERLOGSTRING( "CNSmlDmBmAdapter::RollbackAtomicL: Start" )
-    BMADAPTERLOGSTRING( "CNSmlDmBmAdapter::RollbackAtomicL: End" )
-    }
-
-TBool CNSmlDmBmAdapter::StreamingSupport( TInt& /* aItemSize */ )
-    {
-    BMADAPTERLOGSTRING( "CNSmlDmBmAdapter::StreamingSupport: Start" )
-    BMADAPTERLOGSTRING( "CNSmlDmBmAdapter::StreamingSupport: End" )
-    return EFalse;
-    }
-// -------------------------------------------------------------------------
-//  CNSmlDmBmAdapter::StreamCommittedL
-//  Not supported
-// -------------------------------------------------------------------------
-void CNSmlDmBmAdapter::StreamCommittedL()
-    {
-    BMADAPTERLOGSTRING( "CNSmlDmBmAdapter::StreamCommittedL: Start" )
-    BMADAPTERLOGSTRING( "CNSmlDmBmAdapter::StreamCommittedL: End" )
-    }
-
-// -------------------------------------------------------------------------
-// CNSmlDmBmAdapter::CompleteOutstandingCmdsL
-//  CNSmlDmBmAdapter::CompleteOutstandingCmdsL
-// -------------------------------------------------------------------------
-void CNSmlDmBmAdapter::CompleteOutstandingCmdsL()
-    {
-    BMADAPTERLOGSTRING( "CNSmlDmBmAdapter::CompleteOutstandingCmdsL: Start" )
-    CSmlDmBmSettingsElement* settings( NULL );
-    CSmlDmBmCommandElement* cmd( NULL );
-    TInt err(0);
-    // Read through the buffer and execute commands
-    for ( TInt i(0); i < iBuffer.Count(); )
-        {
-        settings = iBuffer[i];
-        if( settings->NodeBuf().Count() )
-            {
-            // the setting may be executed already if it has been an embedded
-            // snap for another snap
-            if ( !settings->Executed() ) 
-                {
-                //execute commands for snap
-                TRAP( err, iSettingStore->StoreSnapL( *settings )); 
-                } 
-            // if can't recover from error, don't continue processing 
-            // commands
-            if( err == KErrNoMemory || 
-                err == KErrDiskFull )
-                {
-                BMADAPTERLOGSTRING2( "\tCNSmlDmBmAdapter::\
-                CompleteOutstandingCmdsL: Error %d", err )
-                User::Leave( err );
-                }
-            // if this is a new snap and created successfully, map luid
-            if ( !settings->NodeBuf()[0]->Leaf() &&
-                 settings->NodeBuf()[0]->CmdType() == CNSmlDmBmAdapter::EAddCmd && 
-                 settings->NodeBuf()[0]->Executed() &&
-                 settings->NodeBuf()[0]->Status() == CSmlDmAdapter::EOk )
-                {
-                HBufC8* luid = IntToDes8L( settings->Luid() );
-                CleanupStack::PushL( luid );
-                Callback().SetMappingL( *settings->MappingName(), *luid );
-                BMADAPTERLOGSTRING3( "\t Setting mapping %S - %S ",
-                settings->MappingName(), luid )
-                CleanupStack::PopAndDestroy( luid );
-                }
-            // set status for all commands executed and remove the command
-            for ( TInt j( 0 ); j < settings->NodeBuf().Count(); )
-                {
-                
-                cmd = settings->NodeBuf()[j];
-                 
-                // return status values if executed
-                if ( cmd->Executed() )
-                    {
-                    
-                    Callback().SetStatusL( cmd->StatusRef(),
-                                  cmd->Status() );
-                    // for certain errors, don't continue command execution
-                    if( cmd->Status() == CSmlDmAdapter::ENoMemory )
-                        {
-                        // commands are deleted     
-                        iBuffer.ResetAndDestroy();
-                        BMADAPTERLOGSTRING( "\tCmd failed with CSmlDmAdapter::ENoMemory" )
-                        User::Leave( KErrNoMemory );
-                        }
-                   else if( cmd->Status() == CSmlDmAdapter::EDiskFull )
-                        {
-                        // commands are deleted   
-                        iBuffer.ResetAndDestroy();
-                        BMADAPTERLOGSTRING( "\tCmd failed with CSmlDmAdapter::EDiskFull" )
-                        User::Leave( KErrDiskFull );
-                        }
-                   else
-                        {
-                        BMADAPTERLOGSTRING2( 
-                            "\tCmd failed with CSmlDmAdapter::%d", 
-                            cmd->Status() )
-                        }
-                    // for get commands, also return the results
-                   if ( cmd->CmdType() == CNSmlDmBmAdapter::EGetCmd || 
-                        cmd->CmdType() == CNSmlDmBmAdapter::EGetSizeCmd )
-                       {
-                       CBufBase* result = CBufFlat::NewL( cmd->Data()->Size() );
-                       CleanupStack::PushL( result );
-                       result->InsertL( 0, *cmd->Data() ); 
-                       Callback().SetResultsL( cmd->ResultRef(), 
-                                               *result, 
-                                               KNullDesC8 );
-                       CleanupStack::PopAndDestroy( result );
-                       }
-                   }
-               else
-                   {
-                   Callback().SetStatusL( cmd->StatusRef(),
-                                 CSmlDmAdapter::EError );
-                   }
-               settings->NodeBuf().Remove( j );
-               delete cmd;
-               }
-            }
-            
-        // delete settings element and remove it from buffer 
-        delete settings;
-        iBuffer.Remove( i );
-        }
-    BMADAPTERLOGSTRING( "CNSmlDmBmAdapter::CompleteOutstandingCmdsL: End" )
-    }
-
-
-
-// -------------------------------------------------------------------------
-// CNSmlDmBmAdapter::StoreSnapIfBufferedL
-// If argument snap is found in the buffer iSettingStore->StoreSNAPL is 
-// called 
-// for it and LUID is mapped. SNAP is set as executed.
-// This is called when checking if snap has embedded snap reference to 
-// another 
-// snap which is stored further in the command buffer. 
-// All embedded snap commands of this type are buffered and execution only 
-// happens with CompleteOutstandingCmdsL call. 
-// -------------------------------------------------------------------------
-    
-void CNSmlDmBmAdapter::StoreSnapIfBufferedL( const TDesC8& aURI )
-    {
-    BMADAPTERLOGSTRING( "CNSmlDmBmAdapter::StoreSnapIfBufferedL: Start" )
-    CSmlDmBmSettingsElement* snap = GetSnapIfBuffered( aURI );
-    // if snap is in buffer and is a new snap
-    if( snap && !snap->Luid() )
-        {
-        iSettingStore->StoreSnapL( *snap );
-        // set mapping if succesfully executed
-        if ( snap->NodeBuf()[0]->Executed() &&
-             snap->NodeBuf()[0]->Status() == CSmlDmAdapter::EOk )
-            {
-            HBufC8* luid = IntToDes8L( snap->Luid() );
-            CleanupStack::PushL( luid );
-            Callback().SetMappingL( *snap->MappingName(), *luid);
-            CleanupStack::PopAndDestroy( luid );
-            }
-        }
-    BMADAPTERLOGSTRING( "CNSmlDmBmAdapter::StoreSnapIfBufferedL: End" )
-    }
-// -------------------------------------------------------------------------
-// CNSmlDmBmAdapter::GetSnapUriFromLuidL
-// Returns heap desciptor holding snap node URI matching the argument LUID
-// -------------------------------------------------------------------------
-HBufC8* CNSmlDmBmAdapter::GetSnapUriFromLuidL( const TUint aSnapId )
-    {
-    BMADAPTERLOGSTRING( "CNSmlDmBmAdapter::GetSnapURIFromLUIDL: Start" )
-    HBufC8* uri( NULL );
-    MSmlDmAdapter::TError err( MSmlDmAdapter::EOk );
-    CBufBase* fetchRes = CBufFlat::NewL( KSmlMaxURISegLen );
-    CleanupStack::PushL( fetchRes );
-    // fetch all snap nodes
-    Callback().FetchLinkL( KNSmlDmBMAdapterBMURI, *fetchRes, err );
-
-    TPtr8 snapNodes = fetchRes->Ptr( 0 );
-
-    TInt numSnaps = NumOfURISegs( snapNodes );
-        
-    // get uri-luid mappings for snap nodes
-    for ( TInt i( 0 ); i < numSnaps; i++ )
-        {
-        TPtrC8 node = LastURISeg( snapNodes );
-
-        HBufC8* uriSeg = HBufC8::NewLC( KNSmlDmBmAdapterURIMaxLength + 
-                                        node.Length());
-        uriSeg->Des().Append( KNSmlDmBMAdapterBM() );
-        uriSeg->Des().Append( KNSmlDmBmSeparator() );
-        uriSeg->Des().Append( node ); 
-
-        HBufC8* luid = Callback().GetLuidAllocL( *uriSeg );
-        CleanupStack::PopAndDestroy( uriSeg );
-        CleanupStack::PushL( luid );
-        // node may not have luid mapped if it's just created
-        if( luid->Size() )
-            {
-            TInt id = DesToIntL( *luid );
-            CleanupStack::PopAndDestroy( luid ); 
-            if ( aSnapId ==  id ) 
-                {
-                uri = HBufC8::NewLC( KNSmlDmBMAdapterBMURI().Size() + 
-                               KNSmlDmBmSeparator().Size() + 
-                               node.Size() );
-
-                uri->Des().Append( KNSmlDmBMAdapterBMURI() );
-                uri->Des().Append( KNSmlDmBmSeparator() );
-                uri->Des().Append( node );
-                break;
-                }
-            }
-        else
-            {
-            CleanupStack::PopAndDestroy( luid );
-            }
-        snapNodes = RemoveLastURISeg( snapNodes );
-        }
-          
-    if( uri )
-        {
-         CleanupStack::Pop( uri );
-        }
-
-    CleanupStack::PopAndDestroy( fetchRes );
-
-    BMADAPTERLOGSTRING( "CNSmlDmBmAdapter::IdArrayToIAPList: End" )
-    return uri;
-    }
-
-// -------------------------------------------------------------------------
-// CNSmlDmBmAdapter::GetIapListL
-// Returns heap desciptor holding a comma separated list of AP node URIs
-// matching the luids in the argument array.
-// -------------------------------------------------------------------------
-HBufC8* CNSmlDmBmAdapter::GetIapListL( const RArray<TUint>& aIdArray )
-    {
-    BMADAPTERLOGSTRING( "CNSmlDmBmAdapter::GetIapListL: Start" )
-    HBufC8* iapList = HBufC8::NewLC( aIdArray.Count() * 
-                                    ( KNSmlDmBmAdapterAPURIMaxLength + 
-                                      KSmlMaxURISegLen ) );
-    MSmlDmAdapter::TError err;
-    CBufBase* fetchRes = CBufFlat::NewL( KSmlMaxURISegLen );
-    CleanupStack::PushL( fetchRes );
-    // fetch dynamic AP nodes, so that LUID mapping is created
-    Callback().FetchLinkL( KNSmlDmBMAdapterIAPURI, *fetchRes, err );
-
-    // list of all nodes has a trailing '/' unlike regular uris, remove that
-    // for further handling 
-    TPtr8 iapNodes = fetchRes->Ptr( 0 );
-    if ( iapNodes.Length() > 0 && iapNodes[iapNodes.Length() - 1] == '/')
-        {
-        iapNodes = iapNodes.Left( iapNodes.Length() - 1 );
-        }
-
-    TInt numAPs = NumOfURISegs( iapNodes );
-    
-    CArrayFixFlat<TSmlDmMappingInfo>* mappings = 
-        new (ELeave) CArrayFixFlat<TSmlDmMappingInfo>( numAPs * 
-                                                       sizeof( TSmlDmMappingInfo ) );
-    CleanupStack::PushL( mappings );
-    
-   // get uri-luid mappings for all ap nodes
-    HBufC8* luid = NULL;
-    for ( TInt i( 0 ); i < numAPs; i++ )
-        {
-        TSmlDmMappingInfo m;
-        m.iURISeg = LastURISeg( iapNodes );
-        
-        HBufC8* uriSeg = HBufC8::NewLC( KNSmlDmBmAdapterAPURIMaxLength + 
-                                        m.iURISeg.Length() );
-        uriSeg->Des().Replace( 0, 
-                               uriSeg->Length(), 
-                               KNSmlDmBMAdapterIAPNode() );
-        uriSeg->Des().Append( KNSmlDmBmSeparator() );
-        uriSeg->Des().Append( m.iURISeg ); 
-
-        luid = Callback().GetLuidAllocL( *uriSeg );
-        CleanupStack::PopAndDestroy( uriSeg );
-        CleanupStack::PushL( luid );
-        m.iURISegLUID.Set( *luid );
-        mappings->AppendL( m ); 
-        iapNodes = RemoveLastURISeg( iapNodes );
-        }
-        
-    // find out URIs matching argument IAP ids
-    for (TInt i(0); i < aIdArray.Count(); i++)
-        {
-        TBool found = EFalse;
-
-        for ( TInt j( 0 ); j < mappings->Count(); j++ )
-            {
-            if ( aIdArray[i] == DesToIntL( mappings->At( j ).iURISegLUID ) )
-                {
-                // add to result
-                iapList->Des().Append( KNSmlDmBMAdapterIAPURI() );
-                iapList->Des().Append( KNSmlDmBmSeparator() );
-                iapList->Des().Append( mappings->At(j).iURISeg );
-                // not last -> add separator
-                if ( i < aIdArray.Count() - 1 )
-                    {
-                    iapList->Des().Append( KNSmlDmBmUriListSeparator );
-                    }
-                found = ETrue;
-                break;
-                }
-            }
-        if ( ! found )
-            {
-            BMADAPTERLOGSTRING( "CNSmlDmBmAdapter::GetIapListL: \
-            Error IAP matching id not found" )
-            User::Leave( KErrNotFound );
-            }
-        }
-  
-    // cleanup each allocated luid
-    CleanupStack::PopAndDestroy( numAPs ); 
-    CleanupStack::PopAndDestroy( mappings );
-    CleanupStack::PopAndDestroy( fetchRes );
-    CleanupStack::Pop( iapList );
-    BMADAPTERLOGSTRING( "CNSmlDmBmAdapter::GetIapListL: End" )
-    return iapList;
-    }
-    
-// -------------------------------------------------------------------------
-// CNSmlDmBmAdapter::GetIdArrayL
-// Returns array holding LUIDs matching the AP node in the argument list.
-// -------------------------------------------------------------------------
-RArray<TUint> CNSmlDmBmAdapter::GetIdArrayL( const TDesC8& aIAPList )
-    {
-    BMADAPTERLOGSTRING( "CNSmlDmBmAdapter::GetIdArrayL: Start" )
-    TPtrC8 uri;
-    RArray<TUint> iaps;
-    CleanupClosePushL( iaps );
-    uri.Set( aIAPList );
-    // fetch AP nodes so that mappings are created
-    MSmlDmAdapter::TError err;
-    CBufBase* fetchRes = CBufFlat::NewL( KSmlMaxURISegLen );
-    CleanupStack::PushL( fetchRes );
-    // fetch dynamic AP nodes, so that LUID mappings are created
-    Callback().FetchLinkL( KNSmlDmBMAdapterIAPURI, *fetchRes, err );
-    
-    for ( TInt i(0), n = NumOfURIs( aIAPList ); i < n; i++ )
-        {
-        TPtrC8 thisURI = FirstURI( uri );
-        // remove ./ from beginning
-        TPtrC8 apUri = thisURI.Mid( KNSmlDmBmAdapterURIPrefix().Length() );
-        HBufC8* luid = Callback().GetLuidAllocL( apUri );
-        CleanupStack::PushL( luid );
-        TInt id = DesToIntL( *luid );
-        CleanupStack::PopAndDestroy( luid );
-        iaps.Append( id );
-        uri.Set( RemoveFirstURI( uri ) );
-        }
-    
-    CleanupStack::PopAndDestroy( fetchRes );
-    CleanupStack::Pop( &iaps );
-    BMADAPTERLOGSTRING( "CNSmlDmBmAdapter::GetIdArrayL: End" )
-    return iaps;
-    }
-
-// --------------------------------------------------------------------------
-// CNSmlDmBmAdapter::IntToDes8L
-// Converts integer to 8bit descriptor
-// --------------------------------------------------------------------------
-HBufC8* CNSmlDmBmAdapter::IntToDes8L( TInt aLuid ) const
-    {
-    HBufC8* buf = HBufC8::NewL( KMaxLengthOf32bitInteger ); 
-    TPtr8 ptrBuf = buf->Des();
-
-    // Unless aLuid is casted as TInt64, PC-Lint reports: 
-    // Significant prototype coercion
-    // 
-    ptrBuf.Num( TInt64( aLuid ) );
-    return buf;
-    }
-
-// --------------------------------------------------------------------------
-// CNSmlDmBmAdapter::DesToIntL
-// Converts 8bit descriptor to int
-// --------------------------------------------------------------------------
-TUint CNSmlDmBmAdapter::DesToIntL( const TDesC8& aLuid ) const
-    {
-    __UHEAP_MARK;
-    TLex8 lex( aLuid );
-    TUint value( 0 );
-    User::LeaveIfError( lex.Val( value ) );
-    __UHEAP_MARKEND;
-    return value;
-    }
-    
-// --------------------------------------------------------------------------
-// CNSmlDmBmAdapter::DesToBool
-// Converts 8bit descriptor to a boolean value
-// --------------------------------------------------------------------------
-TBool CNSmlDmBmAdapter::DesToBool(const TDesC8& aBoolDes, TBool& aBool ) const
-    {
-    __UHEAP_MARK;
-    if ( !aBoolDes.Compare( KNSmlDmBMBooleanTrue ) )
-        {
-        aBool = ETrue;
-        }
-    else if ( !aBoolDes.Compare( KNSmlDmBMBooleanFalse ) )
-        {
-        aBool = EFalse;
-        }
-    else
-        {
-        __UHEAP_MARKEND;
-        return EFalse;
-        }
-    __UHEAP_MARKEND;
-    return ETrue;
-    }
-
-// --------------------------------------------------------------------------
-// CNSmlDmBmAdapter::BoolToDes8LC
-// Converts boolean value to 8bit descriptor
-// --------------------------------------------------------------------------
-
-HBufC8* CNSmlDmBmAdapter::BoolToDes8LC( TBool aBool) const
-    {
-    HBufC8* ret;
-    if( aBool )
-        {
-        ret = HBufC8::NewLC( KNSmlDmBMBooleanTrue().Size() );
-        ret->Des().Append( KNSmlDmBMBooleanTrue() ); 
-        }
-    else
-        {
-        ret = HBufC8::NewLC( KNSmlDmBMBooleanFalse().Size() );
-        ret->Des().Append( KNSmlDmBMBooleanFalse() ); 
-        }
-    return ret;
-    }
-
-
-// --------------------------------------------------------------------------
-// CNSmlDmBmAdapter::GetLuidAllocL
-// The function calls the GetLuidAllocL function of the MSmlDmCallback to get
-// the LUID which is mapped to aURI.
-// --------------------------------------------------------------------------
-HBufC8* CNSmlDmBmAdapter::GetLuidAllocL( const TDesC8& aURI )
-    {
-    return Callback().GetLuidAllocL( aURI );
-    }
-
-   
-// --------------------------------------------------------------------------
-// CNSmlDmBmAdapter::GetSnapIfBuffered
-// Returns a pointer to the snap CSmlDmBmSettingsElement object if found in 
-// the buffer 
-// --------------------------------------------------------------------------
-CSmlDmBmSettingsElement* CNSmlDmBmAdapter::GetSnapIfBuffered( const TDesC8& 
-                                                              aMappingName )
-    {
-    CSmlDmBmSettingsElement* settings = NULL;
-    for ( TInt i( 0 ); i<iBuffer.Count(); i++ )
-        {
-        if ( !iBuffer[i]->MappingName()->Compare( aMappingName ) )
-            {
-            settings = iBuffer[i];
-            break;
-            }
-        }
-    return settings;
-    }
-// -------------------------------------------------------------------------
-// CNSmlDmBmAdapter::FirstURI
-// Returns the first URI from a list of URIs
-// -------------------------------------------------------------------------
-TPtrC8 CNSmlDmBmAdapter::FirstURI( const TDesC8& aURIList ) const
-    {
-    __UHEAP_MARK;
-    TInt i;
-    for ( i = 0; i < aURIList.Length(); i++ )
-        {
-        if ( aURIList[i] == ',' )
-            {
-            break;
-            }
-        }
-    if ( i == aURIList.Length() - 1 )
-        {
-        __UHEAP_MARKEND;
-        return aURIList;
-        }
-    else
-        {
-        __UHEAP_MARKEND;
-        return aURIList.Mid( 0, i );
-        }
-    }
-    
-// --------------------------------------------------------------------------
-// CNSmlDmBmAdapter::NumOfURIs
-// Returns the num of uris
-// --------------------------------------------------------------------------
-TInt CNSmlDmBmAdapter::NumOfURIs( const TDesC8& aURIList ) const
-    {
-    __UHEAP_MARK;
-    if ( !aURIList.Length() )
-        {
-        return 0;
-        }
-    TInt numOfURIs( 1 );
-    for ( TInt i(0); i < aURIList.Length(); i++ )
-        {
-        if ( aURIList[i] == ',' )
-            {
-            numOfURIs++;
-            }
-        }
-    __UHEAP_MARKEND;
-    return numOfURIs;
-    }
-    
-// --------------------------------------------------------------------------
-// CNSmlDmBmAdapter::RemoveFirstURI
-// extracts first uri an returns the remaining part of the uri list 
-// --------------------------------------------------------------------------
-TPtrC8 CNSmlDmBmAdapter::RemoveFirstURI( const TDesC8& aURIList ) const
-    {
-    __UHEAP_MARK;
-    TInt i;
-    for ( i = 0; i < aURIList.Length(); i++ )
-        {
-        if ( aURIList[i] == ',' )
-            {
-            break;
-            }
-        }
-    if ( i <  aURIList.Length() ) 
-        {
-        __UHEAP_MARKEND;
-        return aURIList.Mid( i + 1 );
-        }
-    else
-        {
-        __UHEAP_MARKEND;
-        return aURIList.Mid( i ); 
-        }
-        
-    }
-// --------------------------------------------------------------------------
-// CNSmlDmBmAdapter::LastURISeg
-// Returns the last uri segemnt of a uri. 
-// --------------------------------------------------------------------------
-TPtrC8 CNSmlDmBmAdapter::LastURISeg( const TDesC8& aURI ) const
-    {
-    __UHEAP_MARK;
-    TInt i;
-    for ( i=aURI.Length()-1; i >= 0; i-- )
-        {
-        if ( aURI[i]=='/' )
-            {
-            break;
-            }
-        }
-    if ( i==0 )
-        {
-        __UHEAP_MARKEND;
-        return aURI;
-        }
-    else
-        {
-        __UHEAP_MARKEND;
-        return aURI.Mid( i + 1 );
-        }
-    }
-
-// --------------------------------------------------------------------------
-// CNSmlDmBmAdapter::RemoveLastURISeg
-// returns parent uri, i.e. removes last uri segment
-// --------------------------------------------------------------------------
-TPtrC8 CNSmlDmBmAdapter::RemoveLastURISeg( const TDesC8& aURI ) const
-    {
-    __UHEAP_MARK;
-    TInt i;
-    for ( i = aURI.Length()-1; i >= 0; i-- )
-        {
-        if ( aURI[i]=='/' )
-            {
-            break;
-            }
-        }
-    if ( i > -1 )
-        {
-        __UHEAP_MARKEND;
-        return aURI.Left( i );
-        }
-    else
-        {
-        __UHEAP_MARKEND;
-        return aURI;
-        }
-    
-    }
-
-
-
-// --------------------------------------------------------------------------
-// CNSmlDmBmAdapter::NumOfURISegs
-// Returns the num of uri segs
-// --------------------------------------------------------------------------
-TInt CNSmlDmBmAdapter::NumOfURISegs( const TDesC8& aURI ) const
-    {
-    __UHEAP_MARK;
-    TInt numOfURISegs( 1 );
-    for ( TInt i(0); i < aURI.Length(); i++ )
-        {
-        if ( aURI[i]=='/' )
-            {
-            numOfURISegs++;
-            }
-        }
-    __UHEAP_MARKEND;
-    return numOfURISegs;
-    }
-
-TInt CNSmlDmBmAdapter::MapPredefinedSnapsL( const TDesC8& aURI, const TDesC8& aLUID )
-{
-    TInt snapId( KErrNotFound ); 
-    // If this is an add to pre-defined SNAPs then LUID we get is empty, but we still need
-    // to handle it.
-    if( aLUID.Length() == 0 && ( ( snapId = GetPredefinedSnapIdFromUri( aURI ) ) != KErrNotFound ) )
-        {               
-        // Check if SNAP with given ID exists (from CmManager)
-        iCmManagerExt.OpenL();
-        TRAPD( err, RCmDestinationExt dest = iCmManagerExt.DestinationL( snapId ) );
-        iCmManagerExt.Close();
-        
-        // If exists -> Call SetMapping to set LUID.
-        if( err == KErrNone )
-            {
-            HBufC8* uri = HBufC8::NewLC( KNSmlDmBMAdapterBM().Length() + 
-                                         KNSmlDmBmSeparator().Length() +
-                                         KSmlMaxURISegLen );
-                
-            TPtr8 uriPtr = uri->Des(); 
-            uriPtr.Format( KNSmlDmBMAdapterBM );
-            uriPtr.Append( KNSmlDmBmSeparator );
-            uriPtr.Append( KNSmlDmBMSNAPNamePrefix ); 
-            HBufC8* luidBuf = IntToDes8L( snapId );
-            CleanupStack::PushL( luidBuf );
-            uriPtr.Append( *luidBuf );
-    
-            Callback().SetMappingL( uriPtr, *luidBuf );
-            
-            BMADAPTERLOGSTRING2( "Creating mapping for URI %S ", &uriPtr ) 
-            CleanupStack::PopAndDestroy( luidBuf );
-            CleanupStack::PopAndDestroy( uri );
-            }                                          
-        }                       
-    return snapId;
-}
-
-TInt CNSmlDmBmAdapter::GetPredefinedSnapIdFromUri( const TDesC8& aURI ) const
-    {    
-    TInt ret = KErrNotFound;
-    
-    // First check that URI starts with BearerManagementSNAP
-    TInt startIndex = aURI.Find( KNSmlDmBMAdapterBM );
-    
-    if( startIndex == KErrNotFound )
-        {
-        return KErrNotFound;
-        }
-    
-    // Then assume there is separator
-    startIndex += KNSmlDmBMAdapterBM().Length() + KNSmlDmBmSeparator().Length();
-    
-    if( startIndex >= aURI.Length() )
-        {
-        // No separator. This was an access to ./BearerManagementSNAP
-        return KErrNotFound;
-        }
-    
-    TPtrC8 predefinedUriStart = aURI.Mid( startIndex  );
-    
-    startIndex = predefinedUriStart.Find( KNSmlDmBMSNAPNamePrefix );
-    
-    // Result should be zero ( = start of string)
-    if( startIndex != 0 )
-        {
-        return KErrNotFound;
-        }
-    
-    startIndex += KNSmlDmBMSNAPNamePrefix().Length();     
-    
-    TInt endIndex = 0;
-    
-    endIndex = predefinedUriStart.Find( KNSmlDmBmSeparator );
-    
-    
-    
-    if ( endIndex == KErrNotFound )
-        {
-        TPtrC8 snapId = predefinedUriStart.Mid( startIndex );
-        TRAPD( err, ret = DesToIntL( snapId ) );
-        if( err != KErrNone )
-            {
-            ret = KErrNotFound;
-            }       
-        }
-    else
-        {
-        TPtrC8 snapId = predefinedUriStart.Mid( startIndex, endIndex - startIndex );
-        TRAPD( err, ret = DesToIntL( snapId ) );
-        if( err != KErrNone )
-            {
-            ret = KErrNotFound;
-            }       
-        }    
-    return ret;    
-    }
-
-
-
-//---------------------- CSmlDmBmCommandElement -------------------------//
-
-// --------------------------------------------------------------------------
-// CSmlDmBmCommandElement* CSmlDmBmCommandElement::NewLC
-// --------------------------------------------------------------------------
-
-CSmlDmBmCommandElement* CSmlDmBmCommandElement::NewLC( TBool aLeaf,
-                                                       TInt aStatusRef, 
-                                                       TInt aResultRef, 
-                                                       CNSmlDmBmAdapter::TCommandType aCmdType,
-                                                       const TDesC8& aLastUriSeg, 
-                                                       const TDesC8& aData )
-    {
-    CSmlDmBmCommandElement* self = new (ELeave) CSmlDmBmCommandElement( aLeaf, 
-                                                                        aStatusRef, 
-                                                                        aResultRef, 
-                                                                        aCmdType );
-    CleanupStack::PushL(self);
-    self->ConstructL( aLastUriSeg, aData );
-    return self;
-    }
-    
-// --------------------------------------------------------------------------
-// CSmlDmBmCommandElement::~CSmlDmBmCommandElement
-// --------------------------------------------------------------------------
-CSmlDmBmCommandElement::~CSmlDmBmCommandElement()
-    {
-    delete iLastUriSeg;
-    delete iData;
-    }
-    
-// --------------------------------------------------------------------------
-// CSmlDmBmCommandElement::CSmlDmBmCommandElement
-// --------------------------------------------------------------------------
-CSmlDmBmCommandElement::CSmlDmBmCommandElement( TBool aLeaf,
-                                                TInt aStatusRef, 
-                                                TInt aResultRef, 
-                                                CNSmlDmBmAdapter::TCommandType  aCmdType )
-                                                : iStatus( CSmlDmAdapter::EError ),
-                                                iLeaf( aLeaf ),
-                                                iStatusRef( aStatusRef ),
-                                                iResultRef( aResultRef ),
-                                                iCmdType( aCmdType ),
-                                                iData( NULL )
-                                                
-    {
-    }
-
-// --------------------------------------------------------------------------
-// CSmlDmBmCommandElement::ConstructL
-// --------------------------------------------------------------------------
-void CSmlDmBmCommandElement::ConstructL( const TDesC8& aLastUriSeg, 
-                                         const TDesC8& aData )
-    {
-    iLastUriSeg = aLastUriSeg.AllocL();
-    iData = aData.AllocL();
-    }
-
-//---------------------- CSmlDmBmSettingsElement -------------------------//
-
-// --------------------------------------------------------------------------
-// CSmlDmBmSettingsElement* CSmlDmBmSettingsElement::NewLC
-// --------------------------------------------------------------------------
-CSmlDmBmSettingsElement* CSmlDmBmSettingsElement::NewLC( const TDesC8& aMappingName )
-    {
-    CSmlDmBmSettingsElement* self = new (ELeave) CSmlDmBmSettingsElement();
-    CleanupStack::PushL(self);
-    self->ConstructL( aMappingName );
-    return self;
-    }
-// --------------------------------------------------------------------------
-// CSmlDmBmSettingsElement::~CSmlDmBmSettingsElement
-// --------------------------------------------------------------------------
-CSmlDmBmSettingsElement::~CSmlDmBmSettingsElement()
-    {
-    // deallocate all elements
-    iNodeBuf.ResetAndDestroy();
-    iNodeBuf.Close();
-    delete iMappingName;
-    }
-
-// --------------------------------------------------------------------------
-// CSmlDmBmSettingsElement::CSmlDmBmSettingsElement
-// --------------------------------------------------------------------------
-CSmlDmBmSettingsElement::CSmlDmBmSettingsElement()
-                                                : iExecuted( EFalse ),
-                                                  iLuid( 0 ),
-                                                  iMappingName( NULL ) 
-    {
-    
-    }
-// --------------------------------------------------------------------------
-// CSmlDmBmSettingsElement::ConstructL
-// --------------------------------------------------------------------------
-void CSmlDmBmSettingsElement::ConstructL( const TDesC8& aMappingName )
-    {
-    iMappingName = aMappingName.AllocL();
-    }
--- a/omadm/omadmextensions/adapters/nsmldmbmadapter/src/nsmldmbmadapter.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-CHARACTER_SET UTF8/*
-* Copyright (c) 2006 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:   Resource definitions for project nsmldmbmadapter
-*
-*/
-
-
-
-#include <ecom/registryinfo.rh>
-
-RESOURCE REGISTRY_INFO theRegistryInfo
-  {
-  dll_uid = 0x101f6d2f; //The DLL's 3rd UID.
-  interfaces = 
-      {
-      INTERFACE_INFO
-          {
-          interface_uid = 0x102018B4; //DM interface UID
-          implementations = 
-            {
-            IMPLEMENTATION_INFO
-                {
-                implementation_uid = 0x101f6d2f; // BM adapter implementation UID
-                version_no = 1; 
-                display_name = "";
-                default_data = "";
-                opaque_data = "";
-                }
-            };
-          }
-      };
-    }
-
-// End of File
--- a/omadm/omadmextensions/adapters/nsmldmbmadapter/src/nsmldmbmsettingstore.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,851 +0,0 @@
-/*
-* Copyright (c) 2006 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:   Provides settings management in CommsDat.
-*
-*/
-
-
-
-
-#include <utf.h>
-#include <cmdestinationext.h>
-#include <cmconnectionmethoddef.h>
-#include <cmmanagerdef.h>
-#include <commsdat.h>
-
-#include "nsmldmbmsettingstore.h"
-#include "nsmldmbmadapter.h"
-#include "bmadapterlogger.h"
-
-// -----------------------------------------------------------------------------
-// CNSmlDmBmSettingStore::NewL
-// -----------------------------------------------------------------------------
-CNSmlDmBmSettingStore* CNSmlDmBmSettingStore::NewL( CNSmlDmBmAdapter * aAdapter )
-    {
-    CNSmlDmBmSettingStore* self = new (ELeave) CNSmlDmBmSettingStore( aAdapter );
-    CleanupStack::PushL(self);
-    self->ConstructL();
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CNSmlDmBmSettingStore::CNSmlDmBmSettingStore
-// -----------------------------------------------------------------------------
-CNSmlDmBmSettingStore::CNSmlDmBmSettingStore( CNSmlDmBmAdapter * aAdapter ) 
-    : iAdapter( aAdapter )
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDmBmSettingStore::ConstructL
-// -----------------------------------------------------------------------------
-void CNSmlDmBmSettingStore::ConstructL()
-    {
-    iCmManagerExt.OpenL();
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDmBmSettingStore::~CNSmlDmBmSettingStore
-// -----------------------------------------------------------------------------
-CNSmlDmBmSettingStore::~CNSmlDmBmSettingStore()
-    {
-    iCmManagerExt.Close();
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDmBmSettingStore::StoreSnapL
-// Stores data related to a snap object. Executes commands for the snap and fills 
-// in status and for get commands result values.
-// -----------------------------------------------------------------------------
-void CNSmlDmBmSettingStore::StoreSnapL( CSmlDmBmSettingsElement& aSettings )
-    {
-    // this snap has been handled
-    aSettings.SetExecuted( ETrue );
-
-    // error empty settings object
-    if ( !aSettings.NodeBuf().Count() )
-      {
-      BMADAPTERLOGSTRING( "StoreSnapL: Error, No commands found" )
-        return;
-        }
-       
-    TInt nameCmdInd( -1 );
-    TInt startInd( 0 );
-    RCmDestinationExt snap;
-    TInt snapId( 0 );
-    
-    // New SNAP to be stored, first command is add node
-    if( !aSettings.NodeBuf()[0]->Leaf() && 
-      aSettings.NodeBuf()[0]->CmdType() == CNSmlDmBmAdapter::EAddCmd)
-        {
-        CSmlDmBmCommandElement* snapCmd( NULL );
-        CSmlDmBmCommandElement* nameCmd( NULL );
-      
-        snapCmd = aSettings.NodeBuf()[0];
-        startInd = 1;
-
-        // find name command
-        for ( TInt i( 0 ); i < aSettings.NodeBuf().Count(); i++)
-            {
-            if ( aSettings.NodeBuf()[i]->Leaf() && 
-                 !aSettings.NodeBuf()[i]->LastUriSeg()->Compare( KNSmlDmBMAdapterName ) )
-                {
-                nameCmd = aSettings.NodeBuf()[i];
-                nameCmdInd = i;
-                break;
-                }
-            }
-        // Snap can be created when name cmd exists
-        if ( snapCmd && nameCmd )
-            {
-            HBufC* name = HBufC::NewLC( nameCmd->Data()->Size() );
-            TPtr namePtr = name->Des();
-            CnvUtfConverter::ConvertToUnicodeFromUtf8( namePtr, *nameCmd->Data() );
-            snap = iCmManagerExt.CreateDestinationL( namePtr );
-            CleanupStack::PopAndDestroy( name );
-            CleanupClosePushL( snap );
-                              
-            snap.UpdateL();
-            snapCmd->SetStatus( CSmlDmAdapter::EOk );
-            nameCmd->SetStatus( CSmlDmAdapter::EOk );
-            snapCmd->SetExecuted( ETrue );
-            nameCmd->SetExecuted( ETrue );
-            aSettings.SetLuid( snap.Id() );
-            }
-        else
-            {
-            BMADAPTERLOGSTRING( "StoreSnapL: Error, SNAP doesn't have necessary data and can't be stored" )
-            return;
-            }
-        }
-    // existing SNAP
-    else
-        {
-        snap = iCmManagerExt.DestinationL( aSettings.Luid() );
-        CleanupClosePushL( snap );
-        }
-    snapId = snap.Id();
-    TInt err( KErrNone );
-    // execute all remaining commands for the snap 
-    // starting after add node cmd
-    for ( TInt i( startInd ); i < aSettings.NodeBuf().Count(); i++ )
-        {
-        // name command is already executed -> skipped
-        if ( i != nameCmdInd )
-            {
-            CSmlDmBmCommandElement* currentCmd = aSettings.NodeBuf()[i];
-            // handle leaf commands
-            // leaves are trapped and if possible 
-            // execution continues with remaining commands
-            if ( currentCmd->Leaf() )
-                {
-                // name
-                if ( !currentCmd->LastUriSeg()->Compare( KNSmlDmBMAdapterName() ) )
-                    {
-                    // name is set more than once within same message
-                    TRAP( err, ExecuteNameCmdL( *currentCmd, snap ) );
-                    }
-                // metadata 
-                else if ( !currentCmd->LastUriSeg()->Compare( KNSmlDmBMAdapterMetadata ) )
-                    {
-                    TRAP( err, ExecuteMetadataCmdL( *currentCmd, snap ) );
-                    }
-                // protected
-                else if ( !currentCmd->LastUriSeg()->Compare( KNSmlDmBMAdapterProtected ) )
-                    {
-                    TRAP( err, ExecuteProtectionCmdL( *currentCmd, snap ) );
-                    }
-                // hidden
-                else if ( !currentCmd->LastUriSeg()->Compare( KNSmlDmBMAdapterHidden ) )
-                    {
-                    TRAP( err, ExecuteHiddenCmdL( *currentCmd, snap ) );
-                    }
-                // iap list 
-                else if ( !currentCmd->LastUriSeg()->Compare( KNSmlDmBMAdapterIAPPriorityList ) )
-                    {
-                    TRAP( err, ExecuteIapsCmdL( *currentCmd, snap ) );
-                    }
-                // embedded snap  
-                else if ( !currentCmd->LastUriSeg()->Compare( KNSmlDmBMAdapterEmbeddedSNAP ) )
-                    {
-                    TRAP( err, ExecuteEmbeddedSnapCmdL( *currentCmd, snap ) );
-                    }
-                else
-                    {
-                    // invalid node
-                    BMADAPTERLOGSTRING( "StoreSnapL: Error, Invalid node name" )
-                    currentCmd->SetStatus( CSmlDmAdapter::ENotFound );
-                    err = KErrNone;
-                    }
-                }
-            // snap node    
-            else
-                {
-                TRAP( err, ExecuteSnapCmdL( *currentCmd, snap.Id() ) );
-                // no more commands will be executed
-                // after snap is deleted
-                if( currentCmd->CmdType() == CNSmlDmBmAdapter::EDeleteCmd )
-                    {
-                    break;
-                    }
-                }
-  
-            // handle errors, check if execution may continue
-            if( err != KErrNone )
-                {
-                // cases where not worth continuing
-                // attempt to return status codes however
-                if( err == KErrNoMemory )
-                    {
-                    currentCmd->SetStatus( CSmlDmAdapter::ENoMemory );
-                    currentCmd->SetExecuted( ETrue );
-                    break;
-                    }
-                else if( err == KErrDiskFull )
-                    {
-                    currentCmd->SetStatus( CSmlDmAdapter::EDiskFull );
-                    currentCmd->SetExecuted( ETrue );
-                    break;
-                    }
-                // cases where command execution continues
-                else if( err == KErrNotFound )
-                    {
-                    currentCmd->SetStatus( CSmlDmAdapter::ENotFound );
-                    }
-                else if( err == KErrArgument )
-                    {
-                    currentCmd->SetStatus( CSmlDmAdapter::EInvalidObject );
-                    }
-                else
-                    {
-                    currentCmd->SetStatus( CSmlDmAdapter::EError );
-                    }
-                // if error occurred, reopen snap to dismis any changes
-                // continue with rest of buffered commands    
-                CleanupStack::PopAndDestroy( &snap );
-                snap = iCmManagerExt.DestinationL( snapId );
-                CleanupClosePushL( snap );
-                }
-            // if leaf cmd execution was successful and data written -> update the snap
-            else if( currentCmd->Leaf() &&
-                currentCmd->Status() == CSmlDmAdapter::EOk && 
-                currentCmd->CmdType() != CNSmlDmBmAdapter::EGetCmd && 
-                currentCmd->CmdType() != CNSmlDmBmAdapter::EGetSizeCmd )
-                {
-                snap.UpdateL();
-                }
-            else
-                {
-                BMADAPTERLOGSTRING( 
-                    "StoreSnapL: Leaf cmd execution unsuccessful" )
-                }
-            currentCmd->SetExecuted( ETrue );
-
-            }
-        }
-    CleanupStack::PopAndDestroy( &snap );
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDmBmSettingStore::ExecuteCmdL
-// Executes a single command
-// -----------------------------------------------------------------------------
-void CNSmlDmBmSettingStore::ExecuteCmdL( CSmlDmBmCommandElement& aCmd, TUint aLuid)
-    {
-    if( !aCmd.Leaf() )
-        {
-        ExecuteSnapCmdL( aCmd, aLuid );
-        }
-    else 
-        {
-        // snap can be opened
-        RCmDestinationExt snap = iCmManagerExt.DestinationL( aLuid );
-        CleanupClosePushL( snap );
-        // name
-        if ( !aCmd.LastUriSeg()->Compare( KNSmlDmBMAdapterName ) )
-            {
-            ExecuteNameCmdL( aCmd, snap );
-            }
-        // iap list
-        else if ( !aCmd.LastUriSeg()->Compare( KNSmlDmBMAdapterIAPPriorityList ) )
-            {
-            ExecuteIapsCmdL( aCmd, snap );
-            } 
-        // metadata
-        else if ( !aCmd.LastUriSeg()->Compare( KNSmlDmBMAdapterMetadata ) )
-            {
-            ExecuteMetadataCmdL( aCmd, snap ); 
-            } 
-        // protected
-        else if ( !aCmd.LastUriSeg()->Compare( KNSmlDmBMAdapterProtected ) )
-            {
-            ExecuteProtectionCmdL( aCmd, snap ); 
-            }
-        // hidden 
-        else if ( !aCmd.LastUriSeg()->Compare( KNSmlDmBMAdapterHidden ) )
-            {
-            ExecuteHiddenCmdL( aCmd, snap ); 
-            }
-        // embedded snap
-        else if ( !aCmd.LastUriSeg()->Compare( KNSmlDmBMAdapterEmbeddedSNAP ) )
-            {
-            ExecuteEmbeddedSnapCmdL( aCmd, snap );
-            }
-        else
-            {
-            // invalid node
-            BMADAPTERLOGSTRING( "ExecuteCmdL: Error, Invalid node name" )
-            aCmd.SetStatus( CSmlDmAdapter::ENotFound );
-            }
-        // update snap if necessary              
-        if( aCmd.Status() == CSmlDmAdapter::EOk &&
-            aCmd.CmdType() != CNSmlDmBmAdapter::EGetCmd && 
-            aCmd.CmdType() != CNSmlDmBmAdapter::EGetSizeCmd)
-            {
-            snap.UpdateL();
-            }
-        aCmd.SetExecuted( ETrue );
-        CleanupStack::PopAndDestroy( &snap );
-        }
-    }
-
-   
-// -----------------------------------------------------------------------------
-// CNSmlDmBmSettingStore::GetSnapsL
-// Fetches all snap ids
-// -----------------------------------------------------------------------------
-void CNSmlDmBmSettingStore::GetSnapsL( RArray<TUint32>& aLUIDArray )
-        {
-        iCmManagerExt.AllDestinationsL( aLUIDArray);
-        }
- 
-// -----------------------------------------------------------------------------
-// CNSmlDmBmSettingStore::ExecuteSnapCmdL
-// Executes a command for snap node. Either delete or get, adds are handled 
-// in StoreSNAPL
-// -----------------------------------------------------------------------------
-void CNSmlDmBmSettingStore::ExecuteSnapCmdL( CSmlDmBmCommandElement& aCmd, TUint aLuid )
-    {
-    RCmDestinationExt snap = iCmManagerExt.DestinationL( aLuid );
-    CleanupClosePushL( snap );
-    if ( aCmd.CmdType() == CNSmlDmBmAdapter::EGetCmd )
-        {
-        TBool found( EFalse );
-        // get child node list
-
-        // check if snap has embedded snap        
-        for ( TInt i(0), c = snap.ConnectionMethodCount(); i < c; i++ )
-            {
-            RCmConnectionMethodExt cm = snap.ConnectionMethodL( i );
-            if ( cm.GetBoolAttributeL( CMManager::ECmDestination ) )
-                {
-                found = ETrue;
-                break;
-                }
-            }
-        if( found )
-            {
-            aCmd.SetDataL( KNSmlDmBMAllLeafNodes );
-            }
-        else
-            {
-            aCmd.SetDataL( KNSmlDmBMAllLeafNodesNoEmbedded );
-            }
-
-        aCmd.SetStatus( CSmlDmAdapter::EOk );
-        aCmd.SetExecuted( ETrue );
-        CleanupStack::PopAndDestroy( &snap );
-        }
-    else if ( aCmd.CmdType() == CNSmlDmBmAdapter::EDeleteCmd )
-        {
-        snap.DeleteLD();
-        aCmd.SetStatus( CSmlDmAdapter::EOk );
-        aCmd.SetExecuted( ETrue );
-        CleanupStack::Pop( &snap );
-        }
-    else
-        {
-        BMADAPTERLOGSTRING( "ExecuteSnapCmdL: Error, Invalid cmd type" )
-        aCmd.SetStatus( CSmlDmAdapter::EError );
-        CleanupStack::PopAndDestroy( &snap );
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// CNSmlDmBmSettingStore::ExecuteIapsCmdL
-// Executes an iap list command (add or get).
-// ---------------------------------------------------------------------------
-//    
-void CNSmlDmBmSettingStore::ExecuteIapsCmdL( CSmlDmBmCommandElement& aCmd, 
-                                             RCmDestinationExt& aSnap )
-    {
-    // for add command replace the list of iaps with the new one
-    if ( aCmd.CmdType() == CNSmlDmBmAdapter::EAddCmd )
-        {
-        // remove old iaps
-        for( TInt i(0); i < aSnap.ConnectionMethodCount(); )
-            {
-            RCmConnectionMethodExt cm = aSnap.ConnectionMethodL( i );
-            // if iap, remove
-            if ( !cm.GetBoolAttributeL( CMManager::ECmDestination ) )
-                {
-                aSnap.RemoveConnectionMethodL( cm );
-                }
-            // otherwise skip the ebedded snap entry  
-            else
-                {
-                i++;
-                }
-            }
-        // add new list of iaps 
-        RArray<TUint> iaps = iAdapter->GetIdArrayL( *aCmd.Data() );
-        CleanupClosePushL( iaps );
-        TInt wildcard(0);
-        for ( TInt i( 0 ); i < iaps.Count(); i++ )
-            {
-            RCmConnectionMethodExt cm = iCmManagerExt.ConnectionMethodL( iaps[i] );
-            aSnap.AddConnectionMethodL( cm );
-            if ( aSnap.PriorityL( cm ) != CMManager::KDataMobilitySelectionPolicyPriorityWildCard )
-                {
-                // set the priority of iap as it's index in the list
-                // but preceding any iaps with wildcard priority.
-                aSnap.ModifyPriorityL( cm, i - wildcard );
-                }
-            else
-                {
-                wildcard++;
-                }
-            }
-        aCmd.SetStatus( CSmlDmAdapter::EOk );
-        CleanupStack::PopAndDestroy( &iaps );
-        }
-    // for get command fetch the list of iaps
-    else if ( aCmd.CmdType() == CNSmlDmBmAdapter::EGetCmd || 
-              aCmd.CmdType() == CNSmlDmBmAdapter::EGetSizeCmd )
-        {
-        RArray<TUint> ids;
-        CleanupClosePushL( ids );
-        for ( TInt i(0), c = aSnap.ConnectionMethodCount(); i < c; i++ )
-            {
-            // if not embedded snap or hidden, insert into iap list 
-            // (hidden iaps not handled by internet adapter, so link won't be found)
-            if( !aSnap.ConnectionMethodL(i).GetBoolAttributeL( CMManager::ECmDestination ) &&
-                !aSnap.ConnectionMethodL(i).GetBoolAttributeL( CMManager::ECmHidden ) )
-                {
-                ids.Insert( aSnap.ConnectionMethodL(i).GetIntAttributeL( 
-                                                       CMManager::ECmIapId ), i );
-                }
-            }
-        if ( ids.Count() > 0)
-            {
-            HBufC8* iapList = iAdapter->GetIapListL( ids );
-            CleanupStack::PushL( iapList );
-            aCmd.SetDataL( *iapList );
-            CleanupStack::PopAndDestroy( iapList );
-            }
-        else
-            {
-            aCmd.SetDataL( KNullDesC8 );
-            }
-        CleanupStack::PopAndDestroy( &ids );
-        // for size command, set the command data to be the 
-        // size of the fetched data
-        if( aCmd.CmdType() == CNSmlDmBmAdapter::EGetSizeCmd )
-            {
-            HBufC8* size = iAdapter->IntToDes8L( aCmd.Data()->Size() );
-            CleanupStack::PushL( size );
-            aCmd.SetDataL( *size );
-            CleanupStack::PopAndDestroy( size );
-            }
-        aCmd.SetStatus( CSmlDmAdapter::EOk );
-        aCmd.SetExecuted( ETrue );
-        }
-    else
-        {
-        // unsupported command
-        // this is checked by framework
-        aCmd.SetStatus( CSmlDmAdapter::EError );
-        BMADAPTERLOGSTRING( "ExecuteIapsCmdL: Error, Only Add, Get and Get size commands supported" )
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// CNSmlDmBmSettingStore::ExecuteProtectionCmdL
-// Executes an protected command (add or get).
-// ---------------------------------------------------------------------------
-//
-void CNSmlDmBmSettingStore::ExecuteProtectionCmdL( CSmlDmBmCommandElement& aCmd, 
-                                                   RCmDestinationExt& aSnap )
-    {
-    if ( aCmd.CmdType() == CNSmlDmBmAdapter::EAddCmd )
-        {
-        __UHEAP_MARK;
-        TInt data( iAdapter->DesToIntL( *aCmd.Data() ) );
-        // is proper protection level
-        if ( data == CMManager::EProtLevel0 )
-            {
-            aSnap.SetProtectionL( CMManager::EProtLevel0 );
-            aCmd.SetStatus( CSmlDmAdapter::EOk );
-            }
-        else if ( data == CMManager::EProtLevel1 )
-            {
-            aSnap.SetProtectionL( CMManager::EProtLevel1 );
-            aCmd.SetStatus( CSmlDmAdapter::EOk );
-            }
-        else if ( data == CMManager::EProtLevel2 )
-            {
-            aSnap.SetProtectionL( CMManager::EProtLevel2 );
-            aCmd.SetStatus( CSmlDmAdapter::EOk );
-            }
-        else
-            {
-            aCmd.SetStatus( CSmlDmAdapter::EInvalidObject );
-            }
-        __UHEAP_MARKEND;
-        }
-    else if ( aCmd.CmdType() == CNSmlDmBmAdapter::EGetCmd ||
-              aCmd.CmdType() == CNSmlDmBmAdapter::EGetSizeCmd )
-        {
-        HBufC8* data = iAdapter->IntToDes8L( aSnap.ProtectionLevel() );
-        CleanupStack::PushL( data );
-        aCmd.SetDataL( *data );
-        CleanupStack::PopAndDestroy( data );
-        
-        // for size command, set the command data to be the 
-        // size of the fetched data
-        if( aCmd.CmdType() == CNSmlDmBmAdapter::EGetSizeCmd )
-            {
-            HBufC8* size = iAdapter->IntToDes8L( aCmd.Data()->Size() );
-            CleanupStack::PushL( size );
-            aCmd.SetDataL( *size );
-            CleanupStack::PopAndDestroy( size );
-            }
-
-        aCmd.SetStatus( CSmlDmAdapter::EOk );
-        aCmd.SetExecuted( ETrue );
-        }
-    else
-        {
-        // unsupported command
-        // this is checked by framework
-        aCmd.SetStatus( CSmlDmAdapter::EError );
-        BMADAPTERLOGSTRING( "ExecuteProtectionCmdL: Error, Only Add, Get and Get size commands supported" )
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// CNSmlDmBmSettingStore::ExecuteHiddenCmdL
-// Executes hidden command (add or get)
-// ---------------------------------------------------------------------------
-//
-void CNSmlDmBmSettingStore::ExecuteHiddenCmdL( CSmlDmBmCommandElement& aCmd, 
-                                               RCmDestinationExt& aSnap )
-    {
-    if ( aCmd.CmdType() == CNSmlDmBmAdapter::EAddCmd )
-        {
-        __UHEAP_MARK;
-        TBool data; 
-        if( iAdapter->DesToBool( *aCmd.Data(), data ) )
-            {
-            aSnap.SetHiddenL( data );
-            aCmd.SetStatus( CSmlDmAdapter::EOk );
-            }
-        else
-            {
-            aCmd.SetStatus( CSmlDmAdapter::EInvalidObject );
-            }
-        __UHEAP_MARKEND;
-        }
-    else if ( aCmd.CmdType() == CNSmlDmBmAdapter::EGetCmd ||
-              aCmd.CmdType() == CNSmlDmBmAdapter::EGetSizeCmd )
-        {
-        HBufC8* data = iAdapter->BoolToDes8LC( aSnap.IsHidden() );
-        aCmd.SetDataL( *data );
-        CleanupStack::PopAndDestroy( data ); 
-        // for size command, set the command data to be the 
-        // size of the fetched data
-        if( aCmd.CmdType() == CNSmlDmBmAdapter::EGetSizeCmd )
-            {
-            HBufC8* size = iAdapter->IntToDes8L( aCmd.Data()->Size() );
-            CleanupStack::PushL( size );
-            aCmd.SetDataL( *size );
-            CleanupStack::PopAndDestroy( size );
-            }
-        aCmd.SetStatus( CSmlDmAdapter::EOk );
-        aCmd.SetExecuted( ETrue );
-        }
-    else
-        {
-        // unsupported command
-        // this is checked by framework
-        aCmd.SetStatus( CSmlDmAdapter::EError );
-        BMADAPTERLOGSTRING( "ExecuteHiddenCmdL: Error, Only Add, Get and Get size commands supported" )
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// CNSmlDmBmSettingStore::ExecuteMetadataCmdL
-// Executes metadata command (add or get)
-// ---------------------------------------------------------------------------
-//
-void CNSmlDmBmSettingStore::ExecuteMetadataCmdL( CSmlDmBmCommandElement& aCmd, 
-                                                 RCmDestinationExt& aSnap )
-    {
-    if ( aCmd.CmdType() == CNSmlDmBmAdapter::EAddCmd )
-        {
-        __UHEAP_MARK;
-        
-        TInt data( iAdapter->DesToIntL( *aCmd.Data() ) );
-        // AND with inversed bit masks to check if data 
-        // has bits set that are not defined for metadata
-        if( ( data & 
-              ~CMManager::ESnapMetadataHighlight &
-              ~CMManager::ESnapMetadataHiddenAgent & 
-              ~CMManager::ESnapMetadataPurpose ) )
-            {
-            aCmd.SetStatus( CSmlDmAdapter::EError );
-            }
-        // set value for each metadata bit
-        else
-            {
-            aSnap.SetMetadataL( CMManager::ESnapMetadataHighlight, 
-                                CMManager::ESnapMetadataHighlight & data );
-            aSnap.SetMetadataL( CMManager::ESnapMetadataHiddenAgent, 
-                                CMManager::ESnapMetadataHiddenAgent & data );
-            aSnap.SetMetadataL( CMManager::ESnapMetadataPurpose, 
-                              ( CMManager::ESnapMetadataPurpose & data ) >> KShift8 );
-            aCmd.SetStatus( CSmlDmAdapter::EOk );
-            }
-        __UHEAP_MARKEND;
-        }
-    else if ( aCmd.CmdType() == CNSmlDmBmAdapter::EGetCmd ||
-              aCmd.CmdType() == CNSmlDmBmAdapter::EGetSizeCmd )
-        {
-        // get all metadata values
-        TInt metadata(0);
-        metadata = aSnap.MetadataL( CMManager::ESnapMetadataHighlight ) +
-                   aSnap.MetadataL( CMManager::ESnapMetadataHiddenAgent ) + 
-                 ( aSnap.MetadataL( CMManager::ESnapMetadataPurpose ) << KShift8 );
-        HBufC8* data = iAdapter->IntToDes8L( metadata );
-        CleanupStack::PushL( data );
-        aCmd.SetDataL( *data ); 
-        CleanupStack::PopAndDestroy( data );
-        
-        // for size command, set the command data to be the 
-        // size of the fetched data
-        if( aCmd.CmdType() == CNSmlDmBmAdapter::EGetSizeCmd )
-            {
-            HBufC8* size = iAdapter->IntToDes8L( aCmd.Data()->Size() );
-            CleanupStack::PushL( size );
-            aCmd.SetDataL( *size );
-            CleanupStack::PopAndDestroy( size );
-            }
-        aCmd.SetStatus( CSmlDmAdapter::EOk );
-        aCmd.SetExecuted( ETrue );
-        }
-    else
-        {
-        // unsupported command
-        // this is checked by framework
-        aCmd.SetStatus( CSmlDmAdapter::EError );
-        BMADAPTERLOGSTRING( "ExecuteMetadataCmdL: Error, Only Add, Get and Get size commands supported" )
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// CNSmlDmBmSettingStore::ExecuteEmbeddedSnapCmdL
-// Executes embedded snap command (add, get or delete)
-// ---------------------------------------------------------------------------
-//
-void CNSmlDmBmSettingStore::ExecuteEmbeddedSnapCmdL( CSmlDmBmCommandElement& aCmd, 
-                                                     RCmDestinationExt& aSnap )
-    {
-    if ( aCmd.CmdType() == CNSmlDmBmAdapter::EAddCmd )
-        {
-        // Remove ./ from beginning of the URI
-        TPtrC8 embeddedUri = aCmd.Data()->Mid( KNSmlDmBmAdapterURIPrefix().Length() );
-
-        // if the embedded snap is still in buffer it's stored here
-        iAdapter->StoreSnapIfBufferedL( embeddedUri );
-        // LUID mapping is assumed done by this time
-
-        // get SNAP id for the URI 
-        HBufC8* luid = iAdapter->GetLuidAllocL( embeddedUri );
-        CleanupStack::PushL( luid );
-        if ( luid->Size() > 0 )
-            {
-            TInt id = iAdapter->DesToIntL( *luid );
-
-            // open snap with the id
-            RCmDestinationExt embedded = iCmManagerExt.DestinationL( id );
-            CleanupClosePushL( embedded );
-
-            // check if snap has an existing embedded snap                       
-            for ( TInt i(0), c = aSnap.ConnectionMethodCount(); i < c; i++ )
-                {
-                RCmConnectionMethodExt cm = aSnap.ConnectionMethodL( i );
-                // remove existing embedded snap before adding new one
-                if ( cm.GetBoolAttributeL( CMManager::ECmDestination ) )
-                    {
-                    aSnap.DeleteConnectionMethodL( cm );
-                    break;
-                }
-            }
-            aSnap.AddEmbeddedDestinationL( embedded ); 
-            CleanupStack::PopAndDestroy( &embedded );
-            aCmd.SetStatus( CSmlDmAdapter::EOk );
-            }
-        else
-            {
-            // no luid for the uri
-            BMADAPTERLOGSTRING( "ExecuteEmbeddedSnapCmdL: No LUID found for embedded snap" )
-            aCmd.SetStatus( CSmlDmAdapter::EInvalidObject );
-            }
-        aCmd.SetExecuted( ETrue );
-        CleanupStack::PopAndDestroy( luid );
-        }
-    else if ( aCmd.CmdType() == CNSmlDmBmAdapter::EGetCmd ||
-              aCmd.CmdType() == CNSmlDmBmAdapter::EGetSizeCmd )
-        {
-        // get destination
-        TInt embeddedId( -1 );
-        for ( TInt i( 0 ), c = aSnap.ConnectionMethodCount(); i < c; i++ )
-            {
-            RCmConnectionMethodExt cm = aSnap.ConnectionMethodL( i );
-            // check if embedded
-            if ( cm.GetBoolAttributeL( CMManager::ECmDestination ) )
-                {
-                // get snap id
-                embeddedId = cm.GetIntAttributeL( CMManager::ECmId );
-
-                // CMManager::ECmId returns element id, 
-                // GetSnapUriFromLuidL needs record id
-                embeddedId = ( embeddedId & KCDMaskShowRecordId ) >> KShift8;
-
-                HBufC8* embeddedUri = iAdapter->GetSnapUriFromLuidL( embeddedId );
-                CleanupStack::PushL( embeddedUri );
-                
-                if( !embeddedUri )
-                    {
-                    embeddedId = -1;
-                    break;
-                    }
-                aCmd.SetDataL( *embeddedUri );
-                CleanupStack::PopAndDestroy( embeddedUri );
-                
-                // for size command, set the command data to be the 
-                // size of the fetched data
-                if( aCmd.CmdType() == CNSmlDmBmAdapter::EGetSizeCmd )
-                    {
-                    HBufC8* size = iAdapter->IntToDes8L( aCmd.Data()->Size() );
-                    CleanupStack::PushL( size );
-                    aCmd.SetDataL( *size );
-                    CleanupStack::PopAndDestroy( size );
-                    }
-                aCmd.SetStatus( CSmlDmAdapter::EOk );
-                aCmd.SetExecuted( ETrue );
-                break;
-                }
-            }
-        // if no embedded snap exists return not found
-        if ( embeddedId < 0 )
-            {
-            BMADAPTERLOGSTRING( "ExecuteEmbeddedSnapCmdL: Get, No embedded snap found" )
-            aCmd.SetStatus( CSmlDmAdapter::ENotFound );
-            aCmd.SetExecuted( ETrue );
-            }
-        }
-    else if ( aCmd.CmdType() == CNSmlDmBmAdapter::EDeleteCmd )
-        {
-        TBool found( EFalse);
-        for ( TInt i( 0 ), c = aSnap.ConnectionMethodCount(); i < c; i++ )
-            {
-            RCmConnectionMethodExt cm = aSnap.ConnectionMethodL( i );
-            // find embedded snap and delete it
-            if ( cm.GetBoolAttributeL( CMManager::ECmDestination ) )
-                {
-                found = ETrue;
-                aSnap.DeleteConnectionMethodL( cm );
-                aCmd.SetStatus( CSmlDmAdapter::EOk );
-                break;
-                }
-            }
-        if ( !found )
-            {
-            BMADAPTERLOGSTRING( "ExecuteEmbeddedSnapCmdL: Delete, No embedded snap found" )
-            aCmd.SetStatus( CSmlDmAdapter::ENotFound );
-            aCmd.SetExecuted( ETrue );
-            }
-        }
-    else    
-        {
-        // unsupported command
-        // this is checked by framework
-        aCmd.SetStatus( CSmlDmAdapter::EError );
-        aCmd.SetExecuted( ETrue );
-        BMADAPTERLOGSTRING( "ExecuteEmbeddedSnapCmdL: Error, command not supported" )
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// CNSmlDmBmSettingStore::ExecuteNameCmdL
-// Executes name command (add or get )
-// ---------------------------------------------------------------------------
-//
-void CNSmlDmBmSettingStore::ExecuteNameCmdL( CSmlDmBmCommandElement& aCmd, 
-                                             RCmDestinationExt& aSnap )
-    {
-    if ( aCmd.CmdType() == CNSmlDmBmAdapter::EAddCmd )
-        {
-        HBufC* name = HBufC::NewLC( aCmd.Data()->Size() );
-        TPtr namePtr = name->Des();
-        CnvUtfConverter::ConvertToUnicodeFromUtf8( namePtr, *aCmd.Data() );
-        aSnap.SetNameL( namePtr );
-        CleanupStack::PopAndDestroy( name );
-        aCmd.SetStatus( CSmlDmAdapter::EOk );
-        }
-    else if ( aCmd.CmdType() == CNSmlDmBmAdapter::EGetCmd ||
-              aCmd.CmdType() == CNSmlDmBmAdapter::EGetSizeCmd )
-        {
-        HBufC* data = aSnap.NameLC();
-        HBufC8* data8 = HBufC8::NewLC( data->Size() );
-        TPtr8 toPtr = data8->Des();
-        CnvUtfConverter::ConvertFromUnicodeToUtf8( toPtr, *data );
-        aCmd.SetDataL( *data8 );
-        CleanupStack::PopAndDestroy( data8 );
-        CleanupStack::PopAndDestroy( data );
-       
-        // for size command, set the command data to be the 
-        // size of the fetched data
-        if( aCmd.CmdType() == CNSmlDmBmAdapter::EGetSizeCmd )
-            {
-            HBufC8* size = iAdapter->IntToDes8L( aCmd.Data()->Size() );
-            CleanupStack::PushL( size );
-            aCmd.SetDataL( *size );
-            CleanupStack::PopAndDestroy( size );
-            }
-        aCmd.SetStatus( CSmlDmAdapter::EOk );
-        aCmd.SetExecuted( ETrue );
-        }
-    else    
-        {
-        // unsupported command
-        // this is checked by framework
-        aCmd.SetStatus( CSmlDmAdapter::EError );
-        BMADAPTERLOGSTRING( "ExecuteEmbeddedSnapCmdL: Error, Only Add, Get and Get size commands supported" )
-        }
-    }
-
--- a/omadm/omadmextensions/adapters/streamingadapter/bld/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-/*
-* ==============================================================================
-*  Name        : bld.inf
-*  Part of     : OMA DM Adapter
-*
-* 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:   build info file for streaming adapter
-*
-*/
-
-#include <platform_paths.hrh>
-
-PRJ_EXPORTS
-
-../conf/streamingadapter.confml                    APP_LAYER_CONFML(streamingadapter.confml)
-../conf/streamingadapter_20024310.crml 	        APP_LAYER_CRML(streamingadapter_20024310.crml)
-
-PRJ_MMPFILES
-nsmlstreamingadapter.mmp
-
-
-
-
--- a/omadm/omadmextensions/adapters/streamingadapter/bld/nsmlstreamingadapter.mmp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-/*
-* ==============================================================================
-*  Name        : nsmldmstreamingadapter.mmp
-*  Part of     : nsmldmstreamingadapter
-*
-* 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:  Implementation of dm adapters
-* 	This is part of omadmextensions.
-*
-*/
-
-
-#include "defaultcaps.hrh"
-#include  <platform_paths.hrh>
-
-CAPABILITY      CAP_ECOM_PLUGIN
-TARGET          nsmldmstreamingadapter.dll
-TARGETTYPE      PLUGIN
-UID             0x10009D8D 0x20024310
-VENDORID        VID_DEFAULT
-
-APP_LAYER_SYSTEMINCLUDE
-SYSTEMINCLUDE 	/epoc32/include/ecom
-SOURCEPATH      ../src
-
-USERINCLUDE     ../inc 
-
-
-SOURCE          nsmlstreamingadapter.cpp
-
-START RESOURCE nsmldmstreamingadapter.rss
-TARGET nsmldmstreamingadapter.rsc
-LANGUAGE_IDS
-END
-
-LIBRARY         euser.lib 
-LIBRARY         ecom.lib 
-LIBRARY         nsmldebug.lib
-LIBRARY         nsmlagentcommon.lib
-LIBRARY         centralrepository.lib
-LIBRARY 	commdb.lib apengine.lib 
-LIBRARY     nsmldmiapmatcher.lib
-LIBRARY         mpsettengine.lib
-
-
-
-SMPSAFE
Binary file omadm/omadmextensions/adapters/streamingadapter/conf/streamingadapter.confml has changed
Binary file omadm/omadmextensions/adapters/streamingadapter/conf/streamingadapter_20024310.crml has changed
--- a/omadm/omadmextensions/adapters/streamingadapter/inc/nsmlstreamingadapter.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,238 +0,0 @@
-/*
-*  Name        : nsmldmstreamingadapter.h
-*  Part of     : nsmldmstreamingadapter
-*
-* 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:  Implementation of dm adapters
-* 	This is part of omadmextensions.
-*
-*/
-
-
-#ifndef __NSMLDMSTREAMINGADAPTER_H__
-#define __NSMLDMSTREAMINGADAPTER_H__
-
-// INCLUDES
-#include <e32base.h>
-#include <smldmadapter.h>
-#include "nsmldmconstants.h"
-
-const TInt KMaxLengthStreamingName = 255;
-const TInt KMaxLengthToProxy = 255;
-const TInt KMaxLengthNetInfo = 255;
-const TInt KMaxLengthTempInfo = 10;
-
-const TInt KMinPort = 1024;
-const TInt KMaxPort = 65535;
-const TInt KPortDiff = 5;
-const TUint KNSmlDMStreamingAdapterImplUid = 0x20024311;
-
-const TInt KMnMaxBwGPRS = 9050;
-const TInt KMxMaxBwGPRS = 40200;
-const TInt KMnSusBwGPRS = 6335;
-const TInt KMxSusBwGPRS = 28140;
-
-const TInt KMnMaxBwEGPRS = 44800;
-const TInt KMxMaxBwEGPRS = 108800;
-const TInt KMnSusBwEGPRS = 26880;
-const TInt KMxSusBwEGPRS = 65280;
-
-const TInt KMnMaxBwWCDMA = 64000;
-const TInt KMxMaxBwWCDMA = 384000;
-const TInt KMnSusBwWCDMA = 44800;
-const TInt KMxSusBwWCDMA = 268800;
-
-const TInt KMnMaxBwHSDPA = 600000;
-const TInt KMxMaxBwHSDPA = 3600000;
-const TInt KMnSusBwHSDPA = 420000;
-const TInt KMxSusBwHSDPA = 2520000;
-
-const TInt KMnMaxBwWLAN = 64000;
-const TInt KMxMaxBwWLAN = 3000000;
-const TInt KMnSusBwWLAN = 44800;
-const TInt KMxSusBwWLAN = 2100000;
-
-const TInt KMnMaxBwCDMA = 9050;
-const TInt KMxMaxBwCDMA = 40200;
-const TInt KMnSusBwCDMA = 6335;
-const TInt KMxSusBwCDMA = 28140;
-
-const TInt KMnMaxBwCDMA2000 = 9050;
-const TInt KMxMaxBwCDMA2000 = 40200;
-const TInt KMnSusBwCDMA2000 = 6335;
-const TInt KMxSusBwCDMA2000 = 28140;
-
-
-/*
-const TInt KMnMaxBw = 5000;
-
-const TInt KMnMaxBwGPRS = 99995; // <
-const TInt KMnMaxBw3G = 1920001; // < 
-const TInt KMnMaxBwEGPRS = 199995; // < 
-const TInt KMnMaxBwWLAN = 4300001; // <
-const TInt KMnMaxBwHSDPA = 3999995; // < 
-const TInt KMnMaxBwCDMA = 99995; // <
-const TInt KMnMaxBwCDMA2000 = 153601; // < */
-
-
-
-
-// MACROS
-
-class CMPSettingsModel;
-
-// the DDF version must be changed if any changes in DDF structure 
-// ( built in DDFStructureL() function )
-_LIT8( KNSmlDMStreamingAdapterDDFVersion, "1.0" ); 
-
-_LIT8 (KNSmlURISeparator ,"/");
-
-_LIT8( KNSmlDMStreamingAdapterTextPlain, "text/plain" );
-_LIT8( KNSmlDMStreamingAdapterNodeName, "Streaming" );
-_LIT8( KNSmlDMStreamingAdapterDescription, "The parent object holding all Streaming Settings" );
-
-_LIT8( KNSmlDMStreamingAdapterVal, "Name/To-Proxy/To-NapID/NetInfo/MIN-UDP-PORT/MAX-UDP-PORT" );
-_LIT8( KNSmlDMStreamingAdapterName, "Name" );
-_LIT8( KNSmlDMStreamingAdapterNameDescription, "Streaming configuration name" );
-_LIT8( KNSmlDMStreamingAdapterToProxy, "To-Proxy" );
-_LIT8( KNSmlDMStreamingAdapterToProxyDescription, "Streaming proxy server ID" );
-_LIT8( KNSmlDMStreamingAdapterToNapID, "To-NapID" );
-_LIT8( KNSmlDMStreamingAdapterToNapIDDescription, "The APN that is used for Streaming" );
-_LIT8( KNSmlDMStreamingAdapterNetInfo, "NetInfo" );
-_LIT8( KNSmlDMStreamingAdapterNetInfoVal, "GPRS/EGPRS/WCDMA/CDMA/CDMA2000/WLAN/HSDPA" );
-
-_LIT8( KNSmlDMStreamingAdapterNetInfoGPRS, "GPRS" );
-_LIT8( KNSmlDMStreamingAdapterNetInfoEGPRS, "EGPRS" );
-_LIT8( KNSmlDMStreamingAdapterNetInfoWCDMA, "WCDMA" );
-_LIT8( KNSmlDMStreamingAdapterNetInfoCDMA2000, "CDMA2000" );
-_LIT8( KNSmlDMStreamingAdapterNetInfoWLAN, "WLAN" );
-_LIT8( KNSmlDMStreamingAdapterNetInfoCDMA, "CDMA" );
-_LIT8( KNSmlDMStreamingAdapterNetInfoHSDPA, "HSDPA" );
-
-_LIT8( KNSmlDMStreamingAdapterNetInfoDescription, "The parameter which contains networks information" );
-_LIT8( KNSmlDMStreamingAdapterMinUdpPort, "MIN-UDP-PORT" );
-_LIT8( KNSmlDMStreamingAdapterMinUdpPortDescription, "The min port number used for streaming" );
-_LIT8( KNSmlDMStreamingAdapterMaxUdpPort, "MAX-UDP-PORT" );
-_LIT8( KNSmlDMStreamingAdapterMaxUdpPortDescription, "The max port number used for streaming" );
-
-_LIT8( KCommaSep,",");
-
-
-
-// CLASS DECLARATION
-class CNSmlDmStreamingAdapter : public CSmlDmAdapter
-    {
-public: // constructors and destructor
-    static CNSmlDmStreamingAdapter* NewL(MSmlDmCallback* aDmCallback );
-    static CNSmlDmStreamingAdapter* NewLC(MSmlDmCallback* aDmCallback );
-
-    virtual ~CNSmlDmStreamingAdapter();
-
-//private: ///new functions
-public: ///new functions
-    
-    void SetNetInfoL(const TDesC8& aObject,const TDesC8 &aDes,TDataBearer aBearer,const TInt aStatusRef,const TInt aMnMaxBw, const TInt aMxMaxBw,const TInt aMnSusBw, const TInt aMxSusBw);
-		
-    CSmlDmAdapter::TError GetNetInfoL(CBufBase& aObject,TDataBearer aBearer,const TDesC8 &aDes);
-
-    void SetLeafPropertiesL( MSmlDmDDFObject& aObject, 
-                 const TSmlDmAccessTypes& aAccessTypes, 
-                 const TDesC8& aDescription ) const;
-    CNSmlDmStreamingAdapter(TAny* aEcomArguments);
-    /**
-     * Two-phased constructor.
-     */
-    void ConstructL();
-    CSmlDmAdapter::TError FetchLeafObjectL( const TDesC8& aURI, CBufBase& aObject );
-    
-    void SetMinUDPPortL(const TDesC8& aObject,const TInt aStatusRef);
-    
-    void SetMaxUDPPortL(const TDesC8& aObject,const TInt aStatusRef);
-    
-    void SetDefaultApL(const TDesC8& aObject,const TInt aStatusRef);
-    
-    CSmlDmAdapter::TError GetDefaultApL(CBufBase& aObject);
-    
-//private: // from base classes
-public: // from base classes
-    // Adapter interface from CSmlDmAdapter
-    void DDFVersionL( CBufBase& aDDFVersion );
-    void DDFStructureL( MSmlDmDDFObject& aDDF );
-    void UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, 
-                const TDesC8& aObject, const TDesC8& aType, 
-                const TInt aStatusRef );
-    void DeleteObjectL( const TDesC8& aURI, const TDesC8& aLUID, TInt aStatusRef ); 
-    void FetchLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, 
-                   const TDesC8& aType, const TInt aResultsRef, 
-                   const TInt aStatusRef ); 
-    void ChildURIListL( const TDesC8& aURI, const TDesC8& aLUID, 
-                const CArrayFix<TSmlDmMappingInfo>& aPreviousURISegmentList, 
-                const TInt aResultsRef, const TInt aStatusRef );  
-    void AddNodeObjectL( const TDesC8& aURI, const TDesC8& aParentLUID, 
-                 const TInt aStatusRef );
-    
-    void UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, 
-                RWriteStream*& aStream, const TDesC8& aType, 
-                const TInt aStatusRef );
-    void FetchLeafObjectSizeL( const TDesC8& aURI, const TDesC8& aLUID, 
-                   const TDesC8& aType, const TInt aResultsRef, 
-                   const TInt aStatusRef );
-     
-    void ExecuteCommandL( const TDesC8& aURI, const TDesC8& aLUID,
-                          const TDesC8& aArgument, 
-                          const TDesC8& aType,
-                          const TInt aStatusRef );
-                                  
-    void ExecuteCommandL( const TDesC8& aURI, const TDesC8& aLUID,
-                          RWriteStream*& aStream, 
-                          const TDesC8& aType,
-                          const TInt aStatusRef );
-    
-    void CopyCommandL( const TDesC8& aTargetURI, const TDesC8& aTargetLUID,
-                       const TDesC8& aSourceURI, 
-                       const TDesC8& aSourceLUID,
-                       const TDesC8& aType, TInt aStatusRef );
-    void StartAtomicL();
-    void CommitAtomicL();
-    void RollbackAtomicL();
-    TBool StreamingSupport( TInt& aItemSize );
-    void StreamCommittedL();
-    void CompleteOutstandingCmdsL();
-    
-    static void Cleanup( TAny* aAny );
-    
-    /**
-    * Fills the given information to a DDF Object node.
-    * @param aNode The node whose data is filled.
-    * @param aAccTypes The access types of the node.
-    * @param aOccurance Occurance of the node.
-    * @param aScope The scope of the node.
-    * @param aFormat The format of the node's data, i.e. node/chr/bin/...
-    * @param aDescription Informal description of the node.
-    */
-    void FillNodeInfoL( MSmlDmDDFObject& aNode, 
-                        const TSmlDmAccessTypes& aAccTypes, 
-                        MSmlDmDDFObject::TOccurence aOccurrence, 
-                        MSmlDmDDFObject::TScope aScope, 
-                        MSmlDmDDFObject::TDFFormat aFormat,
-                        const TDesC8& aDescription ) const;
-    
-private:
-    MSmlDmCallback* iDmCallback;
-    
-    CMPSettingsModel* iModel;
-    
-    };
-
-#endif // __NSMLDMSTREAMINGADAPTER_H__
--- a/omadm/omadmextensions/adapters/streamingadapter/inc/streamingadapterCRKeys.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-/*
-*  Name        : streamingadapterCRKeys.h
-*  Part of     : streamingadapter
-*
-* 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:  Implementation of dm adapters
-* 	This is part of omadmextensions.
-*
-*/
-
-#ifndef STREAMINGADAPTERCRKEYS_H
-#define STREAMINGADAPTERCRKEYS_H
-
-// CONSTANTS
-
-// key uid
-const TUid KCRUidStreamingAdapter = {0x20024310};
-
-// Configuration Name for Streaming Adapter
-const TUint32 KStreamingConfigurationName = 0x00000001;
-
-
-#endif // STREAMINGADAPTERCRKEYS_H
-            
-// End of File
--- a/omadm/omadmextensions/adapters/streamingadapter/src/nsmldmstreamingadapter.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-/*
-* ============================================================================
-*  Name     : nsmlstreaming.rss
-*  Part of  : streaming adapter
-*
-* 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:  Implementation of dm adapters
-* 	This is part of omadmextensions.
-*
-*/
-
-CHARACTER_SET UTF8
-
-#include <registryinfo.rh>
-#include "nsmldmconstants.h"
-
-RESOURCE REGISTRY_INFO theRegistryInfo
-  {
-  dll_uid = 0x20024310;//The DLL's 3rd UID.
-  interfaces = 
-      {
-      INTERFACE_INFO
-          {
-          interface_uid = KNSmlDMInterfaceUid; // DM interface UID
-          implementations = 
-            {
-            IMPLEMENTATION_INFO
-                {
-                implementation_uid = 0x20024311; // DM browser implementation UID
-                version_no = 1; 
-                display_name = "";
-                default_data = "";
-                opaque_data = "";
-                }
-            };
-          }
-      };
-    }
--- a/omadm/omadmextensions/adapters/streamingadapter/src/nsmlstreamingadapter.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1380 +0,0 @@
-/*
-*  Name        : nsmldmstreamingadapter.cpp
-*  Part of     : nsmldmstreamingadapter
-*  Interface   : ecom / SmlDmAdapter
-*
-* 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:  Implementation of dm adapters
-* 	This is part of omadmextensions.
-*
-*/
-
-
-//INCLUDE FILES
-#include <implementationproxy.h> // For TImplementationProxy definition
-#include <centralrepository.h>
-#include <commdb.h>
-#include <cdbcols.h>             // CommsDB columname defs
-#include <ApUtils.h>
-#include <e32base.h>
-#include <e32std.h>
-#include <e32const.h>
-#include <mpsettingsmodel.h>
-#include <e32msgqueue.h>
-
-
-#include "nsmldebug.h"
-#include "nsmlconstants.h"
-#include "nsmldmconst.h"
-#include "nsmlstreamingadapter.h"
-#include "nsmldmiapmatcher.h"
-#include "streamingadapterCRKeys.h"
-
-#ifndef __WINS__
-// This lowers the unnecessary compiler warning (armv5) to remark.
-// "Warning:  #174-D: expression has no effect..." is caused by 
-// DBG_ARGS8 macro in no-debug builds.
-#pragma diag_remark 174
-#endif
-
-
-// -----------------------------------------------------------------------------
-// CNSmlDmStreamingAdapter* CNSmlDmStreamingAdapter::NewL( )
-// -----------------------------------------------------------------------------
-CNSmlDmStreamingAdapter* CNSmlDmStreamingAdapter::NewL(MSmlDmCallback* aDmCallback )
-    {
-    _DBG_FILE("CNSmlDmStreamingAdapter::NewL(): begin");
-    CNSmlDmStreamingAdapter* self = NewLC( aDmCallback );
-    CleanupStack::Pop();
-    _DBG_FILE("CNSmlDmStreamingAdapter::NewL(): end");
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDmStreamingAdapter* CNSmlDmStreamingAdapter::NewLC( )
-// -----------------------------------------------------------------------------
-CNSmlDmStreamingAdapter* CNSmlDmStreamingAdapter::NewLC(MSmlDmCallback* aDmCallback )
-    {
-    _DBG_FILE("CNSmlDmStreamingAdapter::NewLC(): begin");
-    CNSmlDmStreamingAdapter* self = new (ELeave) CNSmlDmStreamingAdapter(aDmCallback);
-    CleanupStack::PushL(self);
-    self->ConstructL();
-    self->iDmCallback = aDmCallback;
-    _DBG_FILE("CNSmlDmStreamingAdapter::NewLC(): end");
-    return self;
-    }
-
-
-
-// -----------------------------------------------------------------------------
-// CNSmlDmStreamingAdapter::~CNSmlDmStreamingAdapter()
-// -----------------------------------------------------------------------------
-CNSmlDmStreamingAdapter::~CNSmlDmStreamingAdapter()
-    {
-    _DBG_FILE("CNSmlDmStreamingAdapter::~CNSmlDmStreamingAdapter(): begin");
-    if(iModel)
-        delete iModel;
-    _DBG_FILE("CNSmlDmStreamingAdapter::~CNSmlDmStreamingAdapter(): end");
-    }
-    
-// -----------------------------------------------------------------------------
-// CNSmlDmStreamingAdapter::CNSmlDmStreamingAdapter()
-// -----------------------------------------------------------------------------
-
-CNSmlDmStreamingAdapter::CNSmlDmStreamingAdapter(TAny* aEcomArguments):CSmlDmAdapter(aEcomArguments)
-    {
-    _DBG_FILE("CNSmlDmStreamingAdapter::CNSmlDmStreamingAdapter(aEcomArguments): begin");
-    _DBG_FILE("CNSmlDmStreamingAdapter::CNSmlDmStreamingAdapter(aEcomArguments): end"); 
-    }
-
-
-void CNSmlDmStreamingAdapter::ConstructL()
-    {
-    _DBG_FILE("CNSmlDmStreamingAdapter::ConstructL: begin");
-        if ( !iModel )
-                {
-                RImplInfoPtrArray impl; 
-                CleanupStack::PushL( TCleanupItem( Cleanup, &impl ) );
-                CMPSettingsModel::ListImplementationsL( impl );
-                if( impl.Count() > 0 )
-                    {
-                    _DBG_FILE("CStreamingAdapter::ConstructL: Creating CMPSettingsModel");
-                    // using the first available implementation
-                    iModel= CMPSettingsModel::NewL( impl[0]->ImplementationUid() );
-                    _DBG_FILE("CStreamingAdapter::ConstructL: Creating CMPSettingsModel Done" );
-                    }
-                CleanupStack::PopAndDestroy(); // implArray
-                // Load default values
-                //iModel->LoadSettingsL(EConfigDefault);
-                if(iModel)
-                	iModel->LoadSettingsL(EConfigUser);
-                }
-        _DBG_FILE("CNSmlDmStreamingAdapter::ConstructL: end");
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDmStreamingAdapter::SetLeafPropertiesL()
-// -----------------------------------------------------------------------------
-void CNSmlDmStreamingAdapter::SetLeafPropertiesL( MSmlDmDDFObject& aObject, 
-                                                const TSmlDmAccessTypes& aAccessTypes, 
-                                                const TDesC8& aDescription ) const
-    {
-    aObject.SetAccessTypesL( aAccessTypes );
-    aObject.SetScopeL( MSmlDmDDFObject::EPermanent );
-    aObject.SetDFFormatL( MSmlDmDDFObject::EChr );
-    aObject.AddDFTypeMimeTypeL( KNSmlDMStreamingAdapterTextPlain );
-    aObject.SetDescriptionL( aDescription );
-    }
-
-
-// -----------------------------------------------------------------------------
-//  CNSmlDmStreamingAdapter::DDFVersionL()
-// -----------------------------------------------------------------------------
-void CNSmlDmStreamingAdapter::DDFVersionL(CBufBase& aDDFVersion)
-    {
-    _DBG_FILE("CNSmlDmStreamingAdapter::DDFVersionL(TDes& aDDFVersion): begin");
-    aDDFVersion.InsertL(0,KNSmlDMStreamingAdapterDDFVersion);
-    _DBG_FILE("CNSmlDmStreamingAdapter::DDFVersionL(TDes& aDDFVersion): end");
-    }
-
-
-// -----------------------------------------------------------------------------
-//  CNSmlDmStreamingAdapter::DDFStructureL()
-//
-// -----------------------------------------------------------------------------
-void CNSmlDmStreamingAdapter::DDFStructureL( MSmlDmDDFObject& aDDF )
-    {
-    _DBG_FILE("CNSmlDmStreamingAdapter::DDFStructureL(): begin");
-    
-    TSmlDmAccessTypes accessTypes;
-    accessTypes.SetGet();
-    
-    TSmlDmAccessTypes accessNoDeleteTypes;
-    accessNoDeleteTypes.SetGet();
-    accessNoDeleteTypes.SetReplace();
-    
-    _DBG_FILE("CNSmlDmStreamingAdapter::DDFStructureL(): Creating Node KNSmlDMStreamingAdapterNodeName");
-    MSmlDmDDFObject& dmStreamingAdap = aDDF.AddChildObjectL( KNSmlDMStreamingAdapterNodeName );
-    dmStreamingAdap.SetAccessTypesL( accessTypes ); 
-    dmStreamingAdap.SetScopeL( MSmlDmDDFObject::EPermanent );
-    dmStreamingAdap.SetDescriptionL( KNSmlDMStreamingAdapterDescription );
-  
-  
-  	_DBG_FILE("CNSmlDmStreamingAdapter::DDFStructureL(): Creating Node KNSmlDMStreamingAdapterName");
-    MSmlDmDDFObject& confName = dmStreamingAdap.AddChildObjectL(KNSmlDMStreamingAdapterName);
-    FillNodeInfoL(  confName, 
-                    accessNoDeleteTypes,
-                    MSmlDmDDFObject::EOne,
-                    MSmlDmDDFObject::EPermanent,
-                    MSmlDmDDFObject::EChr,
-                    KNSmlDMStreamingAdapterNameDescription );
-    
-    
-    _DBG_FILE("CNSmlDmStreamingAdapter::DDFStructureL(): Creating Node KNSmlDMStreamingAdapterToProxy");
-    MSmlDmDDFObject& toProxyID = dmStreamingAdap.AddChildObjectL(KNSmlDMStreamingAdapterToProxy);
-    FillNodeInfoL(  toProxyID, 
-                    accessNoDeleteTypes,
-                    MSmlDmDDFObject::EOne,
-                    MSmlDmDDFObject::EPermanent,
-                    MSmlDmDDFObject::EChr,
-                    KNSmlDMStreamingAdapterToProxyDescription );
-    
-     
-    _DBG_FILE("CNSmlDmStreamingAdapter::DDFStructureL(): Creating Node KNSmlDMStreamingAdapterToNapID");
-    MSmlDmDDFObject& toNapID = dmStreamingAdap.AddChildObjectL(KNSmlDMStreamingAdapterToNapID);
-    FillNodeInfoL(  toNapID, 
-                    accessNoDeleteTypes,
-                    MSmlDmDDFObject::EOne,
-                    MSmlDmDDFObject::EPermanent,
-                    MSmlDmDDFObject::EChr,
-                    KNSmlDMStreamingAdapterToNapIDDescription );
-    
-    
-    
-    _DBG_FILE("CNSmlDmStreamingAdapter::DDFStructureL(): Creating Node KNSmlDMStreamingAdapterNetInfo");
-    MSmlDmDDFObject& netInfo = dmStreamingAdap.AddChildObjectL(KNSmlDMStreamingAdapterNetInfo);
-    FillNodeInfoL(  netInfo, 
-                    accessTypes,
-                    MSmlDmDDFObject::EOne,
-                    MSmlDmDDFObject::EPermanent,
-                    MSmlDmDDFObject::ENode,
-                    KNSmlDMStreamingAdapterNetInfo );
-    
-    
-    _DBG_FILE("CNSmlDmStreamingAdapter::DDFStructureL(): Creating Node KNSmlDMStreamingAdapterNetInfoGPRS");
-    MSmlDmDDFObject& netInfoGPRS = netInfo.AddChildObjectL(KNSmlDMStreamingAdapterNetInfoGPRS);
-    FillNodeInfoL(  netInfoGPRS, 
-                    accessNoDeleteTypes,
-                    MSmlDmDDFObject::EOne,
-                    MSmlDmDDFObject::EPermanent,
-                    MSmlDmDDFObject::EChr,
-                    KNSmlDMStreamingAdapterNetInfo );
-                    
-    
-    _DBG_FILE("CNSmlDmStreamingAdapter::DDFStructureL(): Creating Node KNSmlDMStreamingAdapterNetInfoEGPRS");
-    MSmlDmDDFObject& netInfoEGPRS = netInfo.AddChildObjectL(KNSmlDMStreamingAdapterNetInfoEGPRS);
-    FillNodeInfoL(  netInfoEGPRS, 
-                    accessNoDeleteTypes,
-                    MSmlDmDDFObject::EOne,
-                    MSmlDmDDFObject::EPermanent,
-                    MSmlDmDDFObject::EChr,
-                    KNSmlDMStreamingAdapterNetInfo );
-                    
-    
-    _DBG_FILE("CNSmlDmStreamingAdapter::DDFStructureL(): Creating Node KNSmlDMStreamingAdapterNetInfoWCDMA");
-    MSmlDmDDFObject& netInfoWCDMA = netInfo.AddChildObjectL(KNSmlDMStreamingAdapterNetInfoWCDMA);
-    FillNodeInfoL(  netInfoWCDMA, 
-                    accessNoDeleteTypes,
-                    MSmlDmDDFObject::EOne,
-                    MSmlDmDDFObject::EPermanent,
-                    MSmlDmDDFObject::EChr,
-                    KNSmlDMStreamingAdapterNetInfo );
-                    
-                    
-    
-    _DBG_FILE("CNSmlDmStreamingAdapter::DDFStructureL(): Creating Node KNSmlDMStreamingAdapterNetInfoCDMA2000");
-    MSmlDmDDFObject& netInfoCDMA2000 = netInfo.AddChildObjectL(KNSmlDMStreamingAdapterNetInfoCDMA2000);
-    FillNodeInfoL(  netInfoCDMA2000, 
-                    accessNoDeleteTypes,
-                    MSmlDmDDFObject::EOne,
-                    MSmlDmDDFObject::EPermanent,
-                    MSmlDmDDFObject::EChr,
-                    KNSmlDMStreamingAdapterNetInfo );
-                    
-    
-    _DBG_FILE("CNSmlDmStreamingAdapter::DDFStructureL(): Creating Node KNSmlDMStreamingAdapterNetInfoWLAN");
-    MSmlDmDDFObject& netInfoWLAN = netInfo.AddChildObjectL(KNSmlDMStreamingAdapterNetInfoWLAN);
-    FillNodeInfoL(  netInfoWLAN, 
-                    accessNoDeleteTypes,
-                    MSmlDmDDFObject::EOne,
-                    MSmlDmDDFObject::EPermanent,
-                    MSmlDmDDFObject::EChr,
-                    KNSmlDMStreamingAdapterNetInfo );
-                    
-    
-    _DBG_FILE("CNSmlDmStreamingAdapter::DDFStructureL(): Creating Node KNSmlDMStreamingAdapterNetInfoCDMA");
-    MSmlDmDDFObject& netInfoCDMA = netInfo.AddChildObjectL(KNSmlDMStreamingAdapterNetInfoCDMA);
-    FillNodeInfoL(  netInfoCDMA, 
-                    accessNoDeleteTypes,
-                    MSmlDmDDFObject::EOne,
-                    MSmlDmDDFObject::EPermanent,
-                    MSmlDmDDFObject::EChr,
-                    KNSmlDMStreamingAdapterNetInfo );
-    
-    
-    
-    _DBG_FILE("CNSmlDmStreamingAdapter::DDFStructureL(): Creating Node KNSmlDMStreamingAdapterNetInfoHSDPA");
-    MSmlDmDDFObject& netInfoHSDPA = netInfo.AddChildObjectL(KNSmlDMStreamingAdapterNetInfoHSDPA);
-    FillNodeInfoL(  netInfoHSDPA, 
-                    accessNoDeleteTypes,
-                    MSmlDmDDFObject::EOne,
-                    MSmlDmDDFObject::EPermanent,
-                    MSmlDmDDFObject::EChr,
-                    KNSmlDMStreamingAdapterNetInfo );
-    
-    
-    _DBG_FILE("CNSmlDmStreamingAdapter::DDFStructureL(): Creating Node KNSmlDMStreamingAdapterMinUdpPort");
-    MSmlDmDDFObject& minUdpPort = dmStreamingAdap.AddChildObjectL(KNSmlDMStreamingAdapterMinUdpPort);
-    FillNodeInfoL(  minUdpPort, 
-                    accessNoDeleteTypes,
-                    MSmlDmDDFObject::EOne,
-                    MSmlDmDDFObject::EPermanent,
-                    MSmlDmDDFObject::EInt,
-                    KNSmlDMStreamingAdapterMinUdpPortDescription );
-    
-    
-    _DBG_FILE("CNSmlDmStreamingAdapter::DDFStructureL(): Creating Node KNSmlDMStreamingAdapterMaxUdpPort");
-    MSmlDmDDFObject& maxUdpPort = dmStreamingAdap.AddChildObjectL(KNSmlDMStreamingAdapterMaxUdpPort);
-    FillNodeInfoL(  maxUdpPort, 
-                    accessNoDeleteTypes,
-                    MSmlDmDDFObject::EOne,
-                    MSmlDmDDFObject::EPermanent,
-                    MSmlDmDDFObject::EInt,
-                    KNSmlDMStreamingAdapterMaxUdpPortDescription );
-    
-    _DBG_FILE("CNSmlDmStreamingAdapter::DDFStructureL(): end");
-    }
-    
-void CNSmlDmStreamingAdapter::SetNetInfoL(const TDesC8& aObject,const TDesC8 &aDes,TDataBearer aBearer,const TInt aStatusRef,const TInt aMnMaxBw, const TInt aMxMaxBw,const TInt aMnSusBw,const TInt aMxSusBw)
-	{
-	TInt aSusBw;
-  TInt aMaxBw;
-  TLex8 aConv;      
-  TInt err;
-  //aConv = aObject;
-  TInt ret = aObject.Locate(KCommaSep()[0]);
-  TInt ret1 = aObject.LocateReverse(KCommaSep()[0]);
-  
-  TInt len = aObject.Length() - (ret1 + 1);
-  TPtrC8 segment1 = aObject.Right( len );
-  aConv = segment1;
- 
-  TPtrC8 firstSeg = aObject.Left( ret );
-  if(firstSeg.Compare(aDes))
-      {
-            DBG_ARGS8(_S8("CNSmlDmStreamingAdapter::SetNetInfoL() - %d:  Error in SetMaxBandwidth"), aBearer);
-      iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EInvalidObject);
-      return;
-      }
-  
-  
-  err = aConv.Val(aMaxBw);
-  if(err != KErrNone)
-      {
-            DBG_ARGS8(_S8("CNSmlDmStreamingAdapter::SetNetInfoL() - %d: Error in Conversion"), aBearer);
-      iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EError);
-      return;
-      }
-
-  if(aMaxBw > 0)
-  	{
-  	err = iModel->SetMaxBandwidth(aMaxBw,aBearer);
-  	}
-  else
-  	{
-  	_DBG_FILE("CNSmlDmStreamingAdapter::UpdateLeafObjectL(): Error in SetMaxBandwidth");
-    iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EError);
-    return;
-    }
-    
-  if(err != KErrNone)
-      {
-      DBG_ARGS8(_S8("CNSmlDmStreamingAdapter::SetNetInfoL() - %d: Error in SetMaxBandwidth"), aBearer);
-      iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EError);
-      return;
-      //return retValue;
-      }
-  
-
-  TBuf8<KMaxLengthTempInfo> aSusBf;
-  for(TInt i = (ret+1); i < (ret1); i++)
-      {
-      aSusBf.Append(aObject[i]);
-      }
-  aConv = aSusBf;
-  err = aConv.Val(aSusBw);
-  if(err != KErrNone)
-      {
-            DBG_ARGS8(_S8("CNSmlDmStreamingAdapter::SetNetInfoL() - %d: Error in Conversion"), aBearer);
-      iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EError);
-      return;
-      }
-  
-  if(aSusBw > 0)
-  	{
-  	err = iModel->SetSustainBandwidth(aSusBw,aBearer);
-  	}
-  else
-  	{
-  	_DBG_FILE("CNSmlDmStreamingAdapter::UpdateLeafObjectL(): Error in SetSustainBandwidth");
-    iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EError);
-    return;
-    }
-  
-    if(err != KErrNone)
-		    {
-		    DBG_ARGS8(_S8("CNSmlDmStreamingAdapter::SetNetInfoL() - %d: Error in SetSustainBandwidth"), aBearer);
-		    iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EError);
-		    return;
-		    }
-    if(aMaxBw > aMxMaxBw || aMaxBw < aMnMaxBw)
-  	    {
-        DBG_ARGS8(_S8("CNSmlDmStreamingAdapter::SetNetInfoL() - %d: Error Invalid aMaxBw"), aBearer);
-        iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EError);
-        return;
-        }
-    if(aSusBw > aMxSusBw || aSusBw < aMnSusBw)
-        {
-        DBG_ARGS8(_S8("CNSmlDmStreamingAdapter::SetNetInfoL() - %d: Error Invalid aSusBw"), aBearer);
-        iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EError);
-        return;
-        }
-
-  iModel->StoreSettingsL();
-  
-  iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EOk);
-	}
-
-// -----------------------------------------------------------------------------
-//  CNSmlDmStreamingAdapter::UpdateLeafObjectL()
-// -----------------------------------------------------------------------------
-void CNSmlDmStreamingAdapter::UpdateLeafObjectL( const TDesC8& aURI, 
-                                               const TDesC8& aLUID, 
-                                               const TDesC8& aObject, 
-                                               const TDesC8& aType, 
-                                               const TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlDmStreamingAdapter::UpdateLeafObjectL(): begin");
-    
-		//CSmlDmAdapter::TError retValue = CSmlDmAdapter::EOk;
-    TInt ret = aURI.LocateReverse(KNSmlURISeparator()[0]);
-    if ( ret == KErrNotFound ) 
-        {
-        //retValue = CSmlDmAdapter::EError;
-        iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-        }
-    else
-        {
-        //iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
-        TInt len = aURI.Length() - (ret + 1);
-        TPtrC8 segment = aURI.Right( len );
-        
-        if(segment == KNSmlDMStreamingAdapterName)
-            {
-            	// Set for Streaming Configuration Name
-            _DBG_FILE("CNSmlDmStreamingAdapter::UpdateLeafObjectL(): KNSmlDMStreamingAdapterName");
-            TBuf<KMaxLengthStreamingName> aBuf;
-            TInt aErr;
-            CRepository* centrep( NULL);
-            aBuf.Zero();
-            if(aObject.Length() <= KMaxLengthStreamingName)
-               {
-            aBuf.Copy(aObject);
-               }
-            else
-                {
-                _DBG_FILE("CNSmlDmStreamingAdapter::UpdateLeafObjectL(): Error in KMaxLengthStreamingName");
-                iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::ETooLargeObject);
-                return;
-                }
-   					
-            centrep = CRepository::NewLC( KCRUidStreamingAdapter );
-            if ( centrep )
-                {
-                _DBG_FILE("CNSmlDmStreamingAdapter::UpdateLeafObjectL(): Inside Cenrep Get");
-                aErr = centrep->Set( KStreamingConfigurationName, aBuf );
-                if(aErr != KErrNone)
-                    {
-                    _DBG_FILE("CNSmlDmStreamingAdapter::UpdateLeafObjectL(): Error in CenRep Get");
-                    iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EError);
-                    CleanupStack::PopAndDestroy(centrep);	
-                    return;
-                    }
-                CleanupStack::PopAndDestroy(centrep);
-                iModel->StoreSettingsL();
-                iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
-                }
-            else
-                {
-                _DBG_FILE("CNSmlDmStreamingAdapter::UpdateLeafObjectL(): Error in Creating the cenrep");
-                iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-                }
-            }
-        else if(segment == KNSmlDMStreamingAdapterToProxy)
-            {
-            	// Set for Streaming settings proxy address
-            _DBG_FILE("CNSmlDmStreamingAdapter::UpdateLeafObjectL(): KNSmlDMStreamingAdapterToProxy");
-            TBuf<KMaxLengthToProxy> aBuf;
-            if(aObject.Length() <= KMaxLengthToProxy)
-               {
-            aBuf.Copy(aObject);
-               }
-           else
-               {
-               _DBG_FILE("CNSmlDmStreamingAdapter::UpdateLeafObjectL(): Error in KMaxLengthToProxy");
-               iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::ETooLargeObject);
-               return;
-               }
-            ret = iModel->SetProxyHostNameL(aBuf);
-            if(ret != KErrNone)
-                {
-                DBG_ARGS8(_S8("CNSmlDmStreamingAdapter::UpdateLeafObjectL(): Error in SetProxyHostNameL %d"), ret);
-                iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-                return;
-                }
-            iModel->StoreSettingsL();    
-            iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );    
-            }
-        else if(segment == KNSmlDMStreamingAdapterToNapID)
-            {
-           	SetDefaultApL(aObject,aStatusRef);
-           	/*
-            TInt aNap;
-            TUint32 aNapId;
-            TLex8 aConv;
-            aConv = aObject;
-            CNSmlDMIAPMatcher* iapmatch = CNSmlDMIAPMatcher::NewL( &Callback() );
-            CleanupStack::PushL(iapmatch);
-            
-            aNap = iapmatch->IAPIdFromURIL(aObject);
-            
-            if(aNap == KErrNotFound)
-                {
-                DBG_ARGS8(_S8("CNSmlDmStreamingAdapter::UpdateLeafObjectL(): Error in IAPIdFromURIL %d"), aNap);
-                iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EInvalidObject );
-                return;
-                }
-                
-            aNapId = aNap;
-            CleanupStack::PopAndDestroy(); // iapMatch
-            
-            TInt ret;// = aConv.Val(aNapId,EDecimal);
-            ret = iModel->SetDefaultAp(aNapId);
-            if(ret == KErrNone)
-                {
-                DBG_ARGS8(_S8("CNSmlDmStreamingAdapter::UpdateLeafObjectL(): SetDefaultAp success %d"), ret);
-                iModel->StoreSettingsL();
-                iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );    
-                }
-            else
-                {
-                DBG_ARGS8(_S8("CNSmlDmStreamingAdapter::UpdateLeafObjectL(): Error in SetDefaultAp %d"), ret);
-                iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EInvalidObject );
-                }*/
-            }
-        else if(segment == KNSmlDMStreamingAdapterNetInfoGPRS)
-            {
-                // Set for the netwrok information when Databearer is GPRS
-            _DBG_FILE("CNSmlDmStreamingAdapter::UpdateLeafObjectL(): KNSmlDMStreamingAdapterNetInfoGPRS");
-            SetNetInfoL(aObject,KNSmlDMStreamingAdapterNetInfoGPRS,EBearerGPRS,aStatusRef,KMnMaxBwGPRS,KMxMaxBwGPRS,KMnSusBwGPRS,KMxSusBwGPRS);
-            }
-        else if(segment == KNSmlDMStreamingAdapterNetInfoEGPRS)
-            {
-                // Set for the netwrok information when Databearer is EGPRS
-            _DBG_FILE("CNSmlDmStreamingAdapter::UpdateLeafObjectL(): KNSmlDMStreamingAdapterNetInfoEGPRS");
-            SetNetInfoL(aObject,KNSmlDMStreamingAdapterNetInfoEGPRS,EBearerEGPRS,aStatusRef,KMnMaxBwEGPRS,KMxMaxBwEGPRS,KMnSusBwEGPRS,KMxSusBwEGPRS);
-            }
-        else if(segment == KNSmlDMStreamingAdapterNetInfoWCDMA)
-            {
-                // Set for the netwrok information when Databearer is  WCDMA
-            _DBG_FILE("CNSmlDmStreamingAdapter::UpdateLeafObjectL(): KNSmlDMStreamingAdapterNetInfoWCDMA");
-            SetNetInfoL(aObject,KNSmlDMStreamingAdapterNetInfoWCDMA,EBearerWCDMA,aStatusRef,KMnMaxBwWCDMA,KMxMaxBwWCDMA,KMnSusBwWCDMA,KMxSusBwWCDMA);
-            }
-        else if(segment == KNSmlDMStreamingAdapterNetInfoCDMA2000)
-            {
-                // Set for the netwrok information when Databearer is CDMA2000
-            _DBG_FILE("CNSmlDmStreamingAdapter::UpdateLeafObjectL(): KNSmlDMStreamingAdapterNetInfoCDMA2000");
-            SetNetInfoL(aObject,KNSmlDMStreamingAdapterNetInfoCDMA2000,EBearerCDMA2000,aStatusRef,KMnMaxBwCDMA2000,KMxMaxBwCDMA2000,KMnSusBwCDMA2000,KMxSusBwCDMA2000);
-            }
-        else if(segment == KNSmlDMStreamingAdapterNetInfoWLAN)
-            {
-                // Set for the netwrok information when Databearer is WLAN
-            _DBG_FILE("CNSmlDmStreamingAdapter::UpdateLeafObjectL(): KNSmlDMStreamingAdapterNetInfoWLAN");
-            SetNetInfoL(aObject,KNSmlDMStreamingAdapterNetInfoWLAN,EBearerWLAN,aStatusRef,KMnMaxBwWLAN,KMxMaxBwWLAN,KMnSusBwWLAN,KMxSusBwWLAN);
-            }
-        else if(segment == KNSmlDMStreamingAdapterNetInfoCDMA)
-            {
-                // Set for the netwrok information when Databearer is CDMA
-            _DBG_FILE("CNSmlDmStreamingAdapter::UpdateLeafObjectL(): KNSmlDMStreamingAdapterNetInfoCDMA");
-            SetNetInfoL(aObject,KNSmlDMStreamingAdapterNetInfoCDMA,EBearerCDMA,aStatusRef,KMnMaxBwCDMA,KMxMaxBwCDMA,KMnSusBwCDMA,KMxSusBwCDMA);
-            }
-        else if(segment == KNSmlDMStreamingAdapterNetInfoHSDPA)
-            {
-                // Set for the netwrok information when Databearer is HSDPA
-            _DBG_FILE("CNSmlDmStreamingAdapter::UpdateLeafObjectL(): KNSmlDMStreamingAdapterNetInfoHSDPA");
-            SetNetInfoL(aObject,KNSmlDMStreamingAdapterNetInfoHSDPA,EBearerHSDPA,aStatusRef,KMnMaxBwHSDPA,KMxMaxBwHSDPA,KMnSusBwHSDPA,KMxSusBwHSDPA);
-            }                
-        else if(segment == KNSmlDMStreamingAdapterMinUdpPort)
-            {
-            	// Set for the min udp port for streaming settings
-            	SetMinUDPPortL(aObject,aStatusRef);
-            	/*
-            _DBG_FILE("CNSmlDmStreamingAdapter::UpdateLeafObjectL(): KNSmlDMStreamingAdapterMinUdpPort");
-            TInt aMinPort;
-            TInt aMaxPort;
-            TLex8 aConv;
-            TInt ret = KErrNone;
-            aConv = aObject;
-            ret = iModel->GetMaxUDPPort(aMaxPort);
-            if(ret != KErrNone)
-                {
-                DBG_ARGS8(_S8("CNSmlDmStreamingAdapter::UpdateLeafObjectL(): Error in GetMaxUDPPort: %d"), ret);
-                iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EError);
-                return;
-                }
-            ret = aConv.Val(aMinPort);
-            if(ret != KErrNone)
-            	{
-      	      _DBG_FILE("CNSmlDmStreamingAdapter::UpdateLeafObjectL(): Error in conversion");
-              iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EError);
-              return;
-            	}
-            
-            
-            if(aMinPort < (aMaxPort - KPortDiff) && aMinPort >= KMinPort && aMinPort < KMaxPort)
-                {
-                ret = iModel->SetMinUDPPort(aMinPort);
-                if(ret != KErrNone)
-                    {
-                    DBG_ARGS8(_S8("CNSmlDmStreamingAdapter::UpdateLeafObjectL(): Error in SetMinUDPPort: %d"), ret);
-                    iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EError);
-                    return;
-                    }
-                iModel->StoreSettingsL();
-                iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EOk);
-                }
-            else
-                {
-                _DBG_FILE("CNSmlDmStreamingAdapter::UpdateLeafObjectL(): Invalid Port value");
-                iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EInvalidObject);
-                }
-                */
-            }
-        else if(segment == KNSmlDMStreamingAdapterMaxUdpPort)
-            {
-            	SetMaxUDPPortL(aObject,aStatusRef);
-            	// Set for the max udp port for streaming settings
-            	/*
-            _DBG_FILE("CNSmlDmStreamingAdapter::UpdateLeafObjectL(): begin");
-            TInt aMaxPort;
-            TInt aMinPort;
-            TLex8 aConv;
-            TInt ret = KErrNone;
-            aConv = aObject;
-            ret = iModel->GetMinUDPPort(aMinPort);
-            if(ret != KErrNone)
-                {
-                DBG_ARGS8(_S8("CNSmlDmStreamingAdapter::UpdateLeafObjectL(): Error in GetMinUDPPort: %d"), ret);
-                iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EError);
-                return;
-                }
-            ret = aConv.Val(aMaxPort);
-            if(ret != KErrNone)
-            	{
-      	      _DBG_FILE("CNSmlDmStreamingAdapter::UpdateLeafObjectL(): Error in conversion");
-              iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EError);
-              return;
-            	}
-            
-            if(aMaxPort > (aMinPort + KPortDiff) && aMaxPort >= KMinPort && aMaxPort <= KMaxPort )
-                {
-                ret = iModel->SetMaxUDPPort(aMaxPort);
-                if(ret != KErrNone)
-                    {
-                    DBG_ARGS8(_S8("CNSmlDmStreamingAdapter::UpdateLeafObjectL(): Error in SetMaxUDPPort: %d"), ret);
-                    iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EError);
-                    return;
-                    }
-                iModel->StoreSettingsL();
-                iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EOk);
-                }
-            else
-                {
-                _DBG_FILE("CNSmlDmStreamingAdapter::UpdateLeafObjectL(): Invalid Port value");
-                iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EInvalidObject);
-                } */    
-            }
-        }
-    _DBG_FILE("CNSmlDmStreamingAdapter::UpdateLeafObjectL(): end");
-    }
-    
-    void CNSmlDmStreamingAdapter::SetDefaultApL(const TDesC8& aObject,const TInt aStatusRef)
-    {
-    TInt aNap;
-    TUint32 aNapId;
-    TLex8 aConv;
-    aConv = aObject;
-    CNSmlDMIAPMatcher* iapmatch = CNSmlDMIAPMatcher::NewL( &Callback() );
-    CleanupStack::PushL(iapmatch);
-    
-    aNap = iapmatch->IAPIdFromURIL(aObject);
-    
-    if(aNap == KErrNotFound)
-        {
-        DBG_ARGS8(_S8("CNSmlDmStreamingAdapter::UpdateLeafObjectL(): Error in IAPIdFromURIL %d"), aNap);
-        iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EInvalidObject );
-        return;
-        }
-        
-    aNapId = aNap;
-    CleanupStack::PopAndDestroy(); // iapMatch
-    
-    TInt ret;// = aConv.Val(aNapId,EDecimal);
-    ret = iModel->SetDefaultAp(aNapId);
-    if(ret == KErrNone)
-        {
-        DBG_ARGS8(_S8("CNSmlDmStreamingAdapter::UpdateLeafObjectL(): SetDefaultAp success %d"), ret);
-        iModel->StoreSettingsL();
-        iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );    
-        }
-    else
-        {
-        DBG_ARGS8(_S8("CNSmlDmStreamingAdapter::UpdateLeafObjectL(): Error in SetDefaultAp %d"), ret);
-        iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EInvalidObject );
-        }
-    }
-    
-    void CNSmlDmStreamingAdapter::SetMinUDPPortL(const TDesC8& aObject,const TInt aStatusRef)
-    {
-    			_DBG_FILE("CNSmlDmStreamingAdapter::UpdateLeafObjectL(): KNSmlDMStreamingAdapterMinUdpPort");
-            TInt aMinPort;
-            TInt aMaxPort;
-            TLex8 aConv;
-            TInt ret = KErrNone;
-            aConv = aObject;
-            ret = iModel->GetMaxUDPPort(aMaxPort);
-            if(ret != KErrNone)
-                {
-                DBG_ARGS8(_S8("CNSmlDmStreamingAdapter::UpdateLeafObjectL(): Error in GetMaxUDPPort: %d"), ret);
-                iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EError);
-                return;
-                }
-            ret = aConv.Val(aMinPort);
-            if(ret != KErrNone)
-            	{
-      	      _DBG_FILE("CNSmlDmStreamingAdapter::UpdateLeafObjectL(): Error in conversion");
-              iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EError);
-              return;
-            	}
-            
-            
-            if(aMinPort < (aMaxPort - KPortDiff) && aMinPort >= KMinPort && aMinPort < KMaxPort)
-                {
-                ret = iModel->SetMinUDPPort(aMinPort);
-                if(ret != KErrNone)
-                    {
-                    DBG_ARGS8(_S8("CNSmlDmStreamingAdapter::UpdateLeafObjectL(): Error in SetMinUDPPort: %d"), ret);
-                    iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EError);
-                    return;
-                    }
-                iModel->StoreSettingsL();
-                iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EOk);
-                }
-            else
-                {
-                _DBG_FILE("CNSmlDmStreamingAdapter::UpdateLeafObjectL(): Invalid Port value");
-                iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EInvalidObject);
-                }
-    }
-    
-    void CNSmlDmStreamingAdapter::SetMaxUDPPortL(const TDesC8& aObject,const TInt aStatusRef)
-    {
-    			_DBG_FILE("CNSmlDmStreamingAdapter::UpdateLeafObjectL(): begin");
-            TInt aMaxPort;
-            TInt aMinPort;
-            TLex8 aConv;
-            TInt ret = KErrNone;
-            aConv = aObject;
-            ret = iModel->GetMinUDPPort(aMinPort);
-            if(ret != KErrNone)
-                {
-                DBG_ARGS8(_S8("CNSmlDmStreamingAdapter::UpdateLeafObjectL(): Error in GetMinUDPPort: %d"), ret);
-                iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EError);
-                return;
-                }
-            ret = aConv.Val(aMaxPort);
-            if(ret != KErrNone)
-            	{
-      	      _DBG_FILE("CNSmlDmStreamingAdapter::UpdateLeafObjectL(): Error in conversion");
-              iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EError);
-              return;
-            	}
-            
-            if(aMaxPort > (aMinPort + KPortDiff) && aMaxPort >= KMinPort && aMaxPort <= KMaxPort )
-                {
-                ret = iModel->SetMaxUDPPort(aMaxPort);
-                if(ret != KErrNone)
-                    {
-                    DBG_ARGS8(_S8("CNSmlDmStreamingAdapter::UpdateLeafObjectL(): Error in SetMaxUDPPort: %d"), ret);
-                    iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EError);
-                    return;
-                    }
-                iModel->StoreSettingsL();
-                iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EOk);
-                }
-            else
-                {
-                _DBG_FILE("CNSmlDmStreamingAdapter::UpdateLeafObjectL(): Invalid Port value");
-                iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EInvalidObject);
-                }
-      }
-
-
-// -----------------------------------------------------------------------------
-// CNSmlDmStreamingAdapter::DeleteObjectL()
-// -----------------------------------------------------------------------------
-void CNSmlDmStreamingAdapter::DeleteObjectL( const TDesC8& /*aURI*/, 
-                                           const TDesC8& /*aLUID*/, 
-                                           const TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlDmStreamingAdapter::DeleteLeafObjectL( ): begin");
-    _DBG_FILE("CNSmlDmStreamingAdapter::DeleteLeafObjectL( ): end");
-    iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::ENotAllowed );
-    }
-
-
-// -----------------------------------------------------------------------------
-//  CNSmlDmStreamingAdapter::FetchLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, 
-// const TDesC8& aType, const TInt aResultsRef, const TInt aStatusRef )
-// -----------------------------------------------------------------------------
-void CNSmlDmStreamingAdapter::FetchLeafObjectL( const TDesC8& aURI, 
-                                              const TDesC8& /*aLUID*/, 
-                                              const TDesC8& aType, 
-                                              const TInt aResultsRef, 
-                                              const TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlDmStreamingAdapter::FetchLeafObjectL(): begin");
-    
-    CBufBase *object = CBufFlat::NewL( 1 );
-    CleanupStack::PushL( object );
-    
-    CSmlDmAdapter::TError retValue = FetchLeafObjectL( aURI, *object );
-    
-    iDmCallback->SetStatusL( aStatusRef, retValue );
-    iDmCallback->SetResultsL( aResultsRef, *object, aType );
-    CleanupStack::PopAndDestroy(); //object
-    _DBG_FILE("CNSmlDmStreamingAdapter::FetchLeafObjectL(): end");
-    }
-
-
-// -----------------------------------------------------------------------------
-//  CNSmlDmStreamingAdapter::ChildURIListL( const TDesC& aURI, 
-// const TDesC& aParentLUID, const CArrayFix<TSmlDmMappingInfo>& aPreviousURISegmentList, 
-// const TInt aResultsRef, const TInt aStatusRef )
-// -----------------------------------------------------------------------------
-void CNSmlDmStreamingAdapter::ChildURIListL( const TDesC8& aURI, 
-                                           const TDesC8& /*aParentLUID*/, 
-                                           const CArrayFix<TSmlDmMappingInfo>& /*aPreviousURISegmentList*/, 
-                                           const TInt aResultsRef, 
-                                           const TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlDmStreamingAdapter::ChildURIListL(): begin");
-    CSmlDmAdapter::TError retValue = CSmlDmAdapter::EOk;
-    CBufBase* currentURISegmentList = CBufFlat::NewL( 1 );
-    CleanupStack::PushL( currentURISegmentList );
-    TInt ret = aURI.LocateReverse(KNSmlURISeparator()[0]);
-    if ( ret == KErrNotFound ) 
-        {
-        ret = -1;
-        }
-    TInt len = aURI.Length() - ( ret + 1 );
-    TPtrC8 segment = aURI.Right( len );
-
-    if ( segment == KNSmlDMStreamingAdapterNodeName )
-        {
-        _DBG_FILE("CNSmlDmStreamingAdapter::ChildURIListL(): begin");
-      	currentURISegmentList->InsertL( currentURISegmentList->Size(), KNSmlDMStreamingAdapterVal() );
-        }
-    else if ( segment == KNSmlDMStreamingAdapterNetInfo )
-        {
-        _DBG_FILE("CNSmlDmStreamingAdapter::ChildURIListL(): begin");
-      	currentURISegmentList->InsertL( currentURISegmentList->Size(), KNSmlDMStreamingAdapterNetInfoVal() );
-        }
-    
-    else
-        {
-        retValue = CSmlDmAdapter::EError;
-        }
-    iDmCallback->SetStatusL( aStatusRef, retValue );
-    iDmCallback->SetResultsL( aResultsRef, *currentURISegmentList, KNullDesC8 );
-    CleanupStack::PopAndDestroy(); //currentURISegmentList
-    _DBG_FILE("CNSmlDmStreamingAdapter::ChildURIListL(): end");
-    }
-
-
-// -----------------------------------------------------------------------------
-// CNSmlDmStreamingAdapter::AddNodeObjectL( const TDesC8& aURI, 
-// const TDesC8& aParentLUID, const TInt aStatusRef )
-// -----------------------------------------------------------------------------
-void CNSmlDmStreamingAdapter::AddNodeObjectL( const TDesC8& /*aURI*/, 
-                                            const TDesC8& /*aParentLUID*/, 
-                                            const TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlDmStreamingAdapter::AddNodeObjectL(): begin");
-    iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::ENotAllowed );
-    _DBG_FILE("CNSmlDmStreamingAdapter::AddNodeObjectL(): end");
-    }
-
-// -----------------------------------------------------------------------------
-//  CNSmlDmStreamingAdapter::UpdateLeafObjectL()
-// -----------------------------------------------------------------------------
-void CNSmlDmStreamingAdapter::UpdateLeafObjectL( const TDesC8& /*aURI*/, 
-                                               const TDesC8& /*aLUID*/, 
-                                               RWriteStream*& /*aStream*/, 
-                                               const TDesC8& /*aType*/, 
-                                               const TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlDmStreamingAdapter::UpdateLeafObjectL(): stream: begin");
-    iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-    _DBG_FILE("CNSmlDmStreamingAdapter::UpdateLeafObjectL(): stream: end");
-    }
-
-
-// -----------------------------------------------------------------------------
-//  CNSmlDmStreamingAdapter::FetchLeafObjectSizeL( const TDesC8& aURI, 
-//  const TDesC8& aLUID, const TDesC8& aType, TInt aResultsRef, TInt aStatusRef )
-// -----------------------------------------------------------------------------
-void CNSmlDmStreamingAdapter::FetchLeafObjectSizeL( const TDesC8& aURI, 
-                                                  const TDesC8& /*aLUID*/, 
-                                                  const TDesC8& aType, 
-                                                  const TInt aResultsRef, 
-                                                  const TInt aStatusRef )
-    {
-
-    _DBG_FILE("CNSmlDmStreamingAdapter::FetchLeafObjectSizeL(): begin");
-    
-    CBufBase *object = CBufFlat::NewL( 1 );
-    CleanupStack::PushL( object );
-    CSmlDmAdapter::TError retValue = FetchLeafObjectL( aURI, *object );
-        
-    TInt objSizeInBytes = object->Size();
-    TBuf8<2> stringObjSizeInBytes;
-    stringObjSizeInBytes.Num( objSizeInBytes );
-    object->Reset();
-    object->InsertL( 0, stringObjSizeInBytes );
-    
-    iDmCallback->SetStatusL( aStatusRef, retValue );
-    iDmCallback->SetResultsL( aResultsRef, *object, aType );
-    CleanupStack::PopAndDestroy(); //object
-    _DBG_FILE("CNSmlDmStreamingAdapter::FetchLeafObjectSizeL(): end");
-    }
-    
-
-// -----------------------------------------------------------------------------
-//  CNSmlDmStreamingAdapter::ExecuteCommandL( const TDesC8& aURI, 
-//  const TDesC8& aParentLUID, TDesC8& aArgument, const TDesC8& aType, TInt aStatusRef )
-// -----------------------------------------------------------------------------
-void CNSmlDmStreamingAdapter::ExecuteCommandL( const TDesC8& aURI, const TDesC8& aLUID, const TDesC8& aArgument, const TDesC8& aType, const TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlDmStreamingAdapter::ExecuteCommandL(): begin");
-    iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-    _DBG_FILE("CNSmlDmStreamingAdapter::ExecuteCommandL(): end");
-    }
-
-// -----------------------------------------------------------------------------
-//  CNSmlDmStreamingAdapter::ExecuteCommandL( const TDesC8& aURI, 
-//  const TDesC8& aParentLUID, RWriteStream*& aStream, const TDesC8& aType, 
-//  TInt aStatusRef )
-// -----------------------------------------------------------------------------
-void CNSmlDmStreamingAdapter::ExecuteCommandL( const TDesC8& /*aURI*/, 
-                                             const TDesC8& /*aParentLUID*/, 
-                                             RWriteStream*& /*aStream*/, 
-                                             const TDesC8& /*aType*/, 
-                                             const TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlDmStreamingAdapter::ExecuteCommandL(): stream: begin");
-    iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-    _DBG_FILE("CNSmlDmStreamingAdapter::ExecuteCommandL(): stream: end");
-    }
-
-// -----------------------------------------------------------------------------
-//  CNSmlDmStreamingAdapter::CopyCommandL( const TDesC8& aTargetURI, const TDesC8& 
-//  aSourceURI, const TDesC8& aSourceLUID, const TDesC8& /*aType*/, TInt aStatusRef )
-// -----------------------------------------------------------------------------
-void CNSmlDmStreamingAdapter::CopyCommandL( const TDesC8& /*aTargetURI*/, const TDesC8& 
-                                          /*aTargetLUID*/, const TDesC8& /*aSourceURI*/, 
-                                          const TDesC8& /*aSourceLUID*/, 
-                                          const TDesC8& /*aType*/, TInt aStatusRef )
-    {
-    _DBG_FILE("CNSmlDmStreamingAdapter::CopyCommandL(): begin");
-    iDmCallback->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-    _DBG_FILE("CNSmlDmStreamingAdapter::CopyCommandL(): end");
-    }
-
-// --------------------------------------
-//  CNSmlDmStreamingAdapter::StartAtomicL()
-// --------------------------------------
-void CNSmlDmStreamingAdapter::StartAtomicL()
-    {
-    _DBG_FILE("CNSmlDmStreamingAdapter::StartAtomicL(): begin");
-    _DBG_FILE("CNSmlDmStreamingAdapter::StartAtomicL(): end");
-    }
-    
-// ---------------------------------------
-//  CNSmlDmStreamingAdapter::CommitAtomicL()
-// ---------------------------------------
-void CNSmlDmStreamingAdapter::CommitAtomicL()
-    {
-    _DBG_FILE("CNSmlDmStreamingAdapter::CommitAtomicL(): begin");
-    _DBG_FILE("CNSmlDmStreamingAdapter::CommitAtomicL(): end");
-    }
-
-// -----------------------------------------
-//  CNSmlDmStreamingAdapter::RollbackAtomicL()
-// -----------------------------------------
-void CNSmlDmStreamingAdapter::RollbackAtomicL()
-    {
-    _DBG_FILE("CNSmlDmStreamingAdapter::RollbackAtomicL(): begin");
-    _DBG_FILE("CNSmlDmStreamingAdapter::RollbackAtomicL(): end");
-    }
-
-// -----------------------------------------------------------
-//  CNSmlDmStreamingAdapter::StreamingSupport( TInt& aItemSize )
-// -----------------------------------------------------------  
-TBool CNSmlDmStreamingAdapter::StreamingSupport( TInt& /*aItemSize*/ )
-    {
-    _DBG_FILE("CNSmlDmStreamingAdapter::StreamingSupport(): begin");
-    _DBG_FILE("CNSmlDmStreamingAdapter::StreamingSupport(): end");
-    return EFalse;
-    }
-
-// ------------------------------------------
-//  CNSmlDmStreamingAdapter::StreamCommittedL()
-// ------------------------------------------
-void CNSmlDmStreamingAdapter::StreamCommittedL()
-    {
-    _DBG_FILE("CNSmlDmStreamingAdapter::StreamCommittedL(): begin");
-    _DBG_FILE("CNSmlDmStreamingAdapter::StreamCommittedL(): end");
-    }
-
-// --------------------------------------------------
-//  CNSmlDmStreamingAdapter::CompleteOutstandingCmdsL()
-// --------------------------------------------------   
-void CNSmlDmStreamingAdapter::CompleteOutstandingCmdsL()
-    {
-    _DBG_FILE("CNSmlDmStreamingAdapter::CompleteOutstandingCmdsL(): begin");
-    _DBG_FILE("CNSmlDmStreamingAdapter::CompleteOutstandingCmdsL(): end");    
-    }
-
-
-CSmlDmAdapter::TError CNSmlDmStreamingAdapter::GetNetInfoL(CBufBase& aObject,TDataBearer aBearer,const TDesC8 &aDes)
-    {
-      TBuf8<KMaxLengthNetInfo> aNetInfoBuf;   
-      CSmlDmAdapter::TError retValue = CSmlDmAdapter::EOk;
-      TInt err;
-      aNetInfoBuf.Append(aDes);
-      aNetInfoBuf.Append(KCommaSep);
-              
-      TInt aSusBw = 0;
-      err = iModel->GetSustainBandwidth(aSusBw,aBearer);
-      if(err != KErrNone)
-          {
-          DBG_ARGS8(_S8("CNSmlDmStreamingAdapter::GetNetInfoL() - %d: Error in GetSustainBandwidth: %d"),aBearer,err);
-          retValue = CSmlDmAdapter::EError;
-          return retValue;
-          }
-      TBuf8<KMaxLengthTempInfo> aSusBwBuf;
-      aSusBwBuf.Num(aSusBw);
-      aNetInfoBuf.Append(aSusBwBuf);
-      aNetInfoBuf.Append(KCommaSep);
-      //aObject.InsertL(0,aSusBwBuf);
-      
-      
-      TInt aMaxBw;
-      err = iModel->GetMaxBandwidth(aMaxBw,aBearer);
-      if(err != KErrNone)
-          {
-          DBG_ARGS8(_S8("CNSmlDmStreamingAdapter::GetNetInfoL() - %d: Error in GetMaxBandwidth: %d"),aBearer,err);
-          retValue = CSmlDmAdapter::EError;
-          return retValue;
-          }
-      TBuf8<KMaxLengthTempInfo> aMaxBwBuf;
-      aMaxBwBuf.Num(aMaxBw);
-      aNetInfoBuf.Append(aMaxBwBuf);
-      
-      aObject.InsertL(0,aNetInfoBuf);
-      retValue= CSmlDmAdapter::EOk;
-      return retValue;
-    }
-// -----------------------------------------------------------------------------
-// CNSmlDmDevDetailAdapter::FetchLeafObjectL()
-// -----------------------------------------------------------------------------
-CSmlDmAdapter::TError CNSmlDmStreamingAdapter::FetchLeafObjectL( const TDesC8& aURI, 
-                                                               CBufBase& aObject )
-    {
-    _DBG_FILE("CNSmlDmInfoAdapter::FetchLeafObjectL(): begin");
-    CSmlDmAdapter::TError retValue = CSmlDmAdapter::EOk;
-    TInt ret = aURI.LocateReverse(KNSmlURISeparator()[0]);
-    TInt err = KErrNone;
-    if ( ret == KErrNotFound ) 
-        {
-        retValue = CSmlDmAdapter::EError;
-        }
-    else
-        {
-        TInt len = aURI.Length() - (ret + 1);
-        TPtrC8 segment = aURI.Right( len );
-        
-        if(segment == KNSmlDMStreamingAdapterName)
-            {
-            	// Get for Streaming Configuration Setting name(It is not displayed for the user).
-            _DBG_FILE("CNSmlDmStreamingAdapter::FetchLeafObjectL(): KNSmlDMStreamingAdapterName");
-            TBuf8<KMaxLengthStreamingName> aName;
-            CRepository* centrep( NULL);
-            aName.Zero();
-            centrep = CRepository::NewLC( KCRUidStreamingAdapter );
-
-            if ( centrep )
-                {
-                _DBG_FILE("CNSmlDmStreamingAdapter::FetchLeafObjectL(): Error in CenRep");
-                TFullName temp;
-                
-                if (centrep->Get( KStreamingConfigurationName, temp )==KErrNone && temp.Length() )
-                    {
-                    _DBG_FILE("CNSmlDmStreamingAdapter::FetchLeafObjectL(): Cenrep Get");
-                    temp.Trim();
-                    aName.Copy(temp);
-                    }
-                else
-                		{
-                		_DBG_FILE("CNSmlDmStreamingAdapter::FetchLeafObjectL(): Error in Cenrep Get");
-                		retValue = CSmlDmAdapter::EError;
-                		CleanupStack::PopAndDestroy(centrep);	
-                		return retValue;
-                		}
-                CleanupStack::PopAndDestroy(centrep);
-                }
-            aObject.InsertL(0,aName);
-            retValue= CSmlDmAdapter::EOk;    
-            }
-        else if(segment == KNSmlDMStreamingAdapterToProxy)
-            {
-            	// Get for Proxy Address of the streaming settings.
-            _DBG_FILE("CNSmlDmStreamingAdapter::FetchLeafObjectL(): KNSmlDMStreamingAdapterToProxy");
-            TBuf<KMaxLengthToProxy> uri;
-            err = iModel->GetProxyHostName(uri);
-            if(err != KErrNone)
-                {
-                DBG_ARGS8(_S8("CNSmlDmStreamingAdapter::FetchLeafObjectL(): Error in GetProxyHostName: %d"), err);
-                retValue = CSmlDmAdapter::EError;
-                return retValue;
-                }
-            TPtr8 ptr = uri.Collapse(); 
-            aObject.InsertL(0,ptr); 
-            retValue= CSmlDmAdapter::EOk;
-            }
-        else if(segment == KNSmlDMStreamingAdapterToNapID)
-            {
-            	// Get for Access Point that is set in the streaming settings
-            	retValue = GetDefaultApL(aObject);
-            	return retValue;
-            	/*
-            _DBG_FILE("CNSmlDmStreamingAdapter::FetchLeafObjectL(): KNSmlDMStreamingAdapterToNapID");
-            TUint32 aNapId;
-            err = iModel->GetDefaultAp(aNapId);
-            if(err != KErrNone)
-                {
-                DBG_ARGS8(_S8("CNSmlDmStreamingAdapter::FetchLeafObjectL(): Error in GetDefaultAp: %d"), err);
-                retValue = CSmlDmAdapter::EError;
-                return retValue;
-                }
-            CNSmlDMIAPMatcher* iapmatch = CNSmlDMIAPMatcher::NewL( &Callback() );
-            CleanupStack::PushL(iapmatch);
-
-            HBufC8* uri8 = iapmatch->URIFromIAPIdL( aNapId );
-            
-            if( uri8 )
-                {
-                CleanupStack::PushL(uri8);
-                aObject.InsertL(0,uri8->Des());
-                retValue= CSmlDmAdapter::EOk;
-                CleanupStack::PopAndDestroy(); // uri8
-                }
-            else
-                {
-                _DBG_FILE("CNSmlDmStreamingAdapter::FetchLeafObjectL(): Error in URIFromIAPIdL:ENotFound");
-                retValue= CSmlDmAdapter::ENotFound;
-                }    
-            CleanupStack::PopAndDestroy(); // iapMatch */
-            
-            }
-        else if(segment == KNSmlDMStreamingAdapterNetInfoHSDPA)
-            {
-            	// Get for network information when data bearer is HSDPA
-            _DBG_FILE("CNSmlDmStreamingAdapter::FetchLeafObjectL(): KNSmlDMStreamingAdapterNetInfoHSDPA");
-            retValue = GetNetInfoL(aObject,EBearerHSDPA,KNSmlDMStreamingAdapterNetInfoHSDPA);
-             return retValue;
-            
-           
-            }
-        else if(segment == KNSmlDMStreamingAdapterNetInfoGPRS)
-            {
-            	// Get for network information when data bearer is GPRS
-            _DBG_FILE("CNSmlDmInfoAdapter::FetchLeafObjectL(): KNSmlDMStreamingAdapterNetInfoGPRS");
-            retValue = GetNetInfoL(aObject,EBearerGPRS,KNSmlDMStreamingAdapterNetInfoGPRS);
-            return retValue;
-            }
-        else if(segment == KNSmlDMStreamingAdapterNetInfoEGPRS)
-            {
-            	// Get for network information when data bearer is EGPRS
-            _DBG_FILE("CNSmlDmInfoAdapter::FetchLeafObjectL(): KNSmlDMStreamingAdapterNetInfoEGPRS");
-            retValue = GetNetInfoL(aObject,EBearerEGPRS,KNSmlDMStreamingAdapterNetInfoEGPRS);
-            return retValue;
-            }
-        else if(segment == KNSmlDMStreamingAdapterNetInfoWCDMA)
-            {
-            	// Get for network information when data bearer is WCDMA
-            _DBG_FILE("CNSmlDmInfoAdapter::FetchLeafObjectL(): KNSmlDMStreamingAdapterNetInfoWCDMA");
-            retValue = GetNetInfoL(aObject,EBearerWCDMA,KNSmlDMStreamingAdapterNetInfoWCDMA);
-            return retValue;
-            }
-        else if(segment == KNSmlDMStreamingAdapterNetInfoCDMA)
-            {
-            	// Get for network information when data bearer is CDMA
-            _DBG_FILE("CNSmlDmInfoAdapter::FetchLeafObjectL(): KNSmlDMStreamingAdapterNetInfoCDMA");
-            retValue = GetNetInfoL(aObject,EBearerCDMA,KNSmlDMStreamingAdapterNetInfoCDMA);
-            return retValue;
-            }
-        else if(segment == KNSmlDMStreamingAdapterNetInfoCDMA2000)
-            {
-            	// Get for network information when data bearer is CDMA2000
-            _DBG_FILE("CNSmlDmInfoAdapter::FetchLeafObjectL(): KNSmlDMStreamingAdapterNetInfoCDMA2000");
-            retValue = GetNetInfoL(aObject,EBearerCDMA2000,KNSmlDMStreamingAdapterNetInfoCDMA2000);
-            return retValue;
-            }
-        else if(segment == KNSmlDMStreamingAdapterNetInfoWLAN)
-            {
-            	// Get for network information when data bearer is WLAN
-            _DBG_FILE("CNSmlDmInfoAdapter::FetchLeafObjectL(): KNSmlDMStreamingAdapterNetInfoWLAN");
-            retValue = GetNetInfoL(aObject,EBearerWLAN,KNSmlDMStreamingAdapterNetInfoWLAN);
-            return retValue;
-            }
-        else if(segment == KNSmlDMStreamingAdapterMinUdpPort)
-            {
-            	// Get for Min UDP port of streaming settings
-            _DBG_FILE("CNSmlDmInfoAdapter::FetchLeafObjectL(): KNSmlDMStreamingAdapterMinUdpPort");
-            TInt aMinPort;
-            err = iModel->GetMinUDPPort(aMinPort);
-            if(err != KErrNone)
-                {
-                DBG_ARGS8(_S8("CNSmlDmInfoAdapter::FetchLeafObjectL(): Error in GetMinUDPPort: %d"), err);
-                retValue = CSmlDmAdapter::EError;
-                return retValue;
-                }
-            TBuf8<10> aMinPortBuf;
-            aMinPortBuf.Num(aMinPort);
-            aObject.InsertL(0,aMinPortBuf);
-            retValue= CSmlDmAdapter::EOk;
-            }
-        else if(segment == KNSmlDMStreamingAdapterMaxUdpPort)
-            {
-            	// Get for Max UDP port of streaming settings
-            _DBG_FILE("CNSmlDmInfoAdapter::FetchLeafObjectL(): KNSmlDMStreamingAdapterMaxUdpPort");
-            TInt aMaxPort;
-            err = iModel->GetMaxUDPPort(aMaxPort);
-            if(err != KErrNone)
-                {
-                DBG_ARGS8(_S8("CNSmlDmInfoAdapter::FetchLeafObjectL(): Error in GetMaxUDPPort: %d"), err);
-                retValue= CSmlDmAdapter::EError;
-                return retValue;
-                }
-            TBuf8<10> aMaxPortBuf;
-            aMaxPortBuf.Num(aMaxPort);
-            aObject.InsertL(0,aMaxPortBuf);
-            retValue= CSmlDmAdapter::EOk;    
-            }
-        }
-    _DBG_FILE("CNSmlDmInfoAdapter::FetchLeafObjectL(): end");
-    return retValue;
-    }
-    
-    
-    CSmlDmAdapter::TError CNSmlDmStreamingAdapter::GetDefaultApL(CBufBase& aObject)
-    {
-    CSmlDmAdapter::TError retValue = CSmlDmAdapter::EOk;
-    _DBG_FILE("CNSmlDmStreamingAdapter::FetchLeafObjectL(): KNSmlDMStreamingAdapterToNapID");
-      TUint32 aNapId;
-      TInt err;
-      err = iModel->GetDefaultAp(aNapId);
-      if(err != KErrNone)
-          {
-          DBG_ARGS8(_S8("CNSmlDmStreamingAdapter::FetchLeafObjectL(): Error in GetDefaultAp: %d"), err);
-          retValue = CSmlDmAdapter::EError;
-          return retValue;
-          }
-      CNSmlDMIAPMatcher* iapmatch = CNSmlDMIAPMatcher::NewL( &Callback() );
-      CleanupStack::PushL(iapmatch);
-
-      HBufC8* uri8 = iapmatch->URIFromIAPIdL( aNapId );
-      
-      if( uri8 )
-          {
-          CleanupStack::PushL(uri8);
-          aObject.InsertL(0,uri8->Des());
-          retValue= CSmlDmAdapter::EOk;
-          CleanupStack::PopAndDestroy(); // uri8
-          }
-      else
-          {
-          _DBG_FILE("CNSmlDmStreamingAdapter::FetchLeafObjectL(): Error in URIFromIAPIdL:ENotFound");
-          retValue= CSmlDmAdapter::ENotFound;
-          }    
-      CleanupStack::PopAndDestroy(); // iapMatch
-      return retValue;
-      }
-
-
-// ---------------------------------------------------------------------------
-// CNSmlDmFotaAdapter::FillNodeInfoL()
-// Fills the DDF node info.
-// ---------------------------------------------------------------------------
-//
-void CNSmlDmStreamingAdapter::FillNodeInfoL( MSmlDmDDFObject& aNode, 
-                                        const TSmlDmAccessTypes& aAccTypes, 
-                                        MSmlDmDDFObject::TOccurence aOccurrence, 
-                                        MSmlDmDDFObject::TScope aScope, 
-                                        MSmlDmDDFObject::TDFFormat aFormat, 
-                                        const TDesC8& aDescription ) const
-    {
-    _DBG_FILE("CNSmlDmInfoAdapter::FillNodeInfoL(): end");
-    aNode.SetAccessTypesL( aAccTypes );
-    aNode.SetOccurenceL( aOccurrence );
-    aNode.SetScopeL( aScope );
-    aNode.SetDFFormatL( aFormat );
-    
-    if( aFormat != MSmlDmDDFObject::ENode )
-        {
-        aNode.AddDFTypeMimeTypeL( KNSmlDMStreamingAdapterTextPlain );
-        }
-    
-    aNode.SetDescriptionL( aDescription );
-   	_DBG_FILE("CNSmlDmInfoAdapter::FillNodeInfoL(): end");
-    }
-
-/*
-
-TInt CNSmlDmStreamingAdapter::ThreadFunction(TAny* aStarted)
-    {
-    _DBG_FILE("CNSmlDmInfoAdapter::ThreadFunction(): Start");
-    CTrapCleanup* cleanup = CTrapCleanup::New();
-    _DBG_FILE("CNSmlDmInfoAdapter::CTrapCleanup New");
-    RMsgQueueBase& aMsgQ= *(RMsgQueueBase*) aStarted;
-    CNetworkInfo * aNetInfo;
-    TRAPD(err,aNetInfo = CNetworkInfo::NewL());
-    _DBG_FILE("CNSmlDmInfoAdapter::CNetworkInfo New");
-    TRAP(err,aNetInfo->GetNetworkInfoL(aMsgQ));
-    _DBG_FILE("CNSmlDmInfoAdapter::ThreadFunction(): End");
-    delete aNetInfo;
-    delete cleanup;
-    }
-*/
-
-// -----------------------------------------------------------------------------
-// CStreamingAdapter::Cleanup
-// -----------------------------------------------------------------------------
-//
-void CNSmlDmStreamingAdapter::Cleanup( TAny* aAny )
-    {
-    RImplInfoPtrArray* implArray = 
-        reinterpret_cast< RImplInfoPtrArray*> ( aAny );
-    implArray->ResetAndDestroy();
-    implArray->Close();
-    }
-
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-#ifndef IMPLEMENTATION_PROXY_ENTRY
-#define IMPLEMENTATION_PROXY_ENTRY(aUid, aFuncPtr)  {{aUid},(aFuncPtr)}
-#endif
-
-const TImplementationProxy ImplementationTable[] = 
-    {
-        IMPLEMENTATION_PROXY_ENTRY(KNSmlDMStreamingAdapterImplUid, CNSmlDmStreamingAdapter::NewL)
-    };
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy( TInt& aTableCount )
-    {
-    _DBG_FILE("ImplementationGroupProxy() for CNSmlDmStreamingAdapter: begin");
-    aTableCount = sizeof(ImplementationTable) / sizeof(TImplementationProxy);
-    _DBG_FILE("ImplementationGroupProxy() for CNSmlDmStreamingAdapter: end");
-    return ImplementationTable;
-    }
-
-// End of file
-
--- a/omadm/omadmextensions/adapters/syncmldm/bld/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-/*
-* Copyright (c) 2002 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:    build info file for SyncML DM settings adapter
-*
-*/
-
-
-
-
-PRJ_MMPFILES
-./nsmldmsettingsadapter.mmp
-
-
-
-
--- a/omadm/omadmextensions/adapters/syncmldm/bld/nsmldmsettingsadapter.mmp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-/*
-* 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:    DM-settings adapter
-*
-*/
-
-
-
-
-#include "defaultcaps.hrh"
-#include  <platform_paths.hrh>
-
-TARGET          nsmldmsettingsadapter.dll
-TARGETTYPE      PLUGIN
-UID             0x10009D8D 0x101F6DE6
-VENDORID        VID_DEFAULT
-CAPABILITY      CAP_ECOM_PLUGIN
-
-APP_LAYER_SYSTEMINCLUDE
-SYSTEMINCLUDE 	/epoc32/include/ecom
-
-SOURCEPATH      ../src
-USERINCLUDE     ../inc ../../inc
-
-SOURCE          NSmlDmSettingsAdapter.cpp
-
-
-START RESOURCE 	nsmldmsettingsadapter.rss
-END
-
-LIBRARY         euser.lib ecom.lib charconv.lib nsmldebug.lib
-LIBRARY         nsmldmiapmatcher.lib
-LIBRARY         syncmlclientapi.lib
-LIBRARY         nsmltransporthandler.lib
-LIBRARY         nsmlprivateapi.lib
-LIBRARY         featmgr.lib
-
-
-SMPSAFE
-// End of File
--- a/omadm/omadmextensions/adapters/syncmldm/inc/NSmlDMSettingsAdapter.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,813 +0,0 @@
-/*
-* 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:    DM Settings adapter header file
-*
-*/
-
-
-
-
-#ifndef __NSMLDMSETTINGSADAPTER_H__
-#define __NSMLDMSETTINGSADAPTER_H__
-
-
-// INCLUDES
-#include <utf.h>
-#include <smldmadapter.h>
-#include <SyncMLClientDM.h>
-#include "NSmlPrivateAPI.h"
-
-// CONSTANTS
-const TInt KNSmlDMGranularity = 4;
-const TUint8 KNSmlDMColon = ':';
-const TUint8 KNSmlDMUriSeparator = '/';
-const TInt KPortMaxSize = 65535;
-const TInt KPortMinSize = 0;
-//Dynamic Node Posn Const --> SyncML/DMAcc/DMIDxxx
-const TInt KDynNodePosn = 3;
-
-//DDF accepted DM-fieldnames
-_LIT8( KNSmlDdfId,				"Id" );
-_LIT8( KNSmlDdfAddr,			"Addr" );
-_LIT8( KNSmlDdfAddrType,		"AddrType" );
-_LIT8( KNSmlDdfPortNbr,			"PortNbr" );
-_LIT8( KNSmlDdfAuthScheme,		"AuthPref" ); 
-_LIT8( KNSmlDdfServerId,		"ServerId" );
-_LIT8( KNSmlDdfServerPW,		"ServerPW" );
-_LIT8( KNSmlDdfServerNonce,		"ServerNonce" );
-_LIT8( KNSmlDdfClientUserName,	"UserName" );
-_LIT8( KNSmlDdfClientPW,		"ClientPW" );
-_LIT8( KNSmlDdfClientNonce,		"ClientNonce" );
-_LIT8( KNSmlDdfName,			"Name" );
-_LIT8( KNSmlDdfConRef,			"ConRef" );
-_LIT( KNSmlDdfMConRef,			"MConRef" );
-
-//DDF DM-field descriptions
-_LIT8( KNSmlDdfAddrDescription,				"Host address of the SyncML server, IP or URL" );
-_LIT8( KNSmlDdfAddrTypeDescription,			"The type of address specified in the Addr node" );
-_LIT8( KNSmlDdfPortNbrDescription,			"SyncML Server port" );
-_LIT8( KNSmlDdfAuthSchemeDescription,		"Scheme of authentication" );
-_LIT8( KNSmlDdfServerIdDescription,			"The ServerId value for this server" );
-_LIT8( KNSmlDdfServerPWDescription,			"The password or secret that the server will use to authenticate itself to the client" );
-_LIT8( KNSmlDdfServerNonceDescription,		"The next nonce that the server will use to authenticate itself to the client" );
-_LIT8( KNSmlDdfClientUserNameDescription,	"The username of the device (or user)" );
-_LIT8( KNSmlDdfClientPWDescription,			"The password or secret that the client will use to authenticate itself to the server" );
-_LIT8( KNSmlDdfClientNonceDescription,		"The next nonce that the client will use to authenticate itself to the server" );
-_LIT8( KNSmlDdfNameDescription,				"Displayable name for the SyncML setings" );
-_LIT8( KNSmlDdfConRefDescription,			"Logical reference to a connectivity node" );
-_LIT( KNSmlDdfMConRefDescription,			"Parent to Multiple Connection Reference objects" );
-
-//Default data values
-_LIT( KNSmlDefName,				"DMAdapterIns" );
-_LIT8( KNSmlDefDMAcc,			"DMAcc" );
-_LIT8( KNSmlDMStart,			"SyncML/DMAcc/DMId" );
-_LIT( KNSmlDefDMIAP,			"AP" );
-_LIT8( KNSmlDMUriDotSlash,      "./");
-_LIT8( KNSmlDMNullDesc8,        "");
-_LIT8(KNSmlIAPId,               "NSmlIapId");
-
-// AuthPref text values
-_LIT8( KNSmlDMAuthPrefNoAuth,"syncml:auth-none");
-_LIT8( KNSmlDMAuthPrefBasic, "syncml:auth-basic");
-_LIT8( KNSmlDMAuthPrefMD5,	 "syncml:auth-md5");
-
-_LIT8( KNSmlDMSettingsHTTP,  "http://" );
-_LIT8( KNSmlDMSettingsHTTPS, "https://" );
-
-_LIT8( KIAPid, "IAPid" );
-_LIT8( KSegmDMAcc,"Addr/AddrType/PortNbr/AuthPref/ServerId/ServerPW/ServerNonce/UserName/ClientPW/ClientNonce/Name/ConRef");
-_LIT8( KSmlDmSlash, "/");
-_LIT8( KVersion,"1.1" );
-_LIT8( KMimeType, "text/plain" );
-_LIT8( KSyncMLText, "SyncML" );
-_LIT8( KNSmlDMadapterDesc, "DM-Settings DDF description" );
-_LIT8( KNSmlDMadapterTitle,"DM-Settings title" );
-_LIT8( KDmAccMatch, "SyncML/DMAcc/*" );
-_LIT8( KDmAccMatch2, "SyncML/DMAcc" );
-
-
-// DATA TYPES
-enum TNSmlDMFieldType
-	{
-	EStr,
-	EInt,
-	EBin,
-	EWrong
-	};
-
-enum TNSmlDMLeafType
-	{
-	EDMUpdate,
-	EDMDelete,
-	EDMUnset
-	};
-
-enum TNSmlDMProfileData
-	{
-	EProfileId,
-	EProfileName,
-	EProfileIAPId,
-	EProfileMediumType,
-	EProfileDMServerUsername,
-	EProfileDMServerPassword,
-	EServerNonce,
-	ESharedSecret,
-	EClientNonce,
-	EProfileURL,
-	EProfilePort,
-	EServerId,
-	EAuthenticationRequired,
-	ESyncAccepted
-	};
-
-enum TAuthenticationType
-	{
-	ENoAuth,    //"syncml:auth-none"
-	EBasic,     //"syncml:auth-basic"
-	EMD5        //"syncml:auth-md5"
-	};
-
-enum TNSmlDMMediumType
-	{
-	ENone,
-    EHttp,
-	EWsp,
-    EObex
-	};
-
-struct TNSmlDMLeafElement
-	{
-	HBufC8 *iUri;
-	HBufC8 *iData;
-	TInt iStatusRef;
-	HBufC8* iLuid;
-	};
-
-struct TNSmlDMBufferElement
-	{
-	CArrayFixFlat<TNSmlDMLeafElement> *iLeafBuf;
-	HBufC8* iMappingName; //Holds the Dyn.Node URI
-	TBool iExecuted; //Node updated to dB or not
-	TInt iDMBuffStatusref; //Statusref for callback
-	TBool iAddr;
-	TBool iServerId; //Bools for Mandatory fields
-	TBool iUName;
-	TBool iServerName;
-	};
-// CLASS DECLARATION
-/**
-*  CNSmlDMSettingsAdapter class 
-*  Contains the whole implementation of the DM settings adapter.
-*
-*  @lib nsmldmsettingsadapter.dll
-*  @since Series 60 Series60_3.0
-*/
-class CNSmlDMSettingsAdapter : public CSmlDmAdapter
-	{
-    public: // Constructors and destructor
-        
-        /**
-        * Two-phased constructor.
-        */
-	    static CNSmlDMSettingsAdapter* NewL(MSmlDmCallback* aDmCallback );
-	    static CNSmlDMSettingsAdapter* NewLC(MSmlDmCallback* aDmCallback );
-
-	    void ConstructL();
-
-        /**
-        * Destructor.
-        */
-	    virtual ~CNSmlDMSettingsAdapter();
-
-    public: // Functions from base classes
-
-	    /**
-        * From      CSmlDmAdapter   DDFVersionL returns current version of the DDF.
-        * @since    Series60_3.0
-        * @param    aVersion        DDF version of the adapter.
-        * @return   none
-        */
-	    void DDFVersionL( CBufBase& aVersion );
-
-        /**
-        * From      CSmlDmAdapter   DDFStructureL for filling the DDF structure of the adapter.
-        * @since    Series60_3.0
-        * @param    aDDF            Reference to root object.
-        * @return   none
-        */
-	    void DDFStructureL( MSmlDmDDFObject& aDDF );
-
-        /**
-        * From      CSmlDmAdapter   UpdateLeafObjectL creates new leaf objects, or replaces 
-        *                           data in existing leaf objects.
-        * @since    Series60_3.0
-        * @param    aURI            URI of the object
-        * @param    aLUID           LUID of the object
-        * @param    aObject         Data of the object
-        * @param    aType           MIME type of the object
-        * @param    aStatusRef      Reference to correct command
-        * @return   none
-        */
-	    void UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, 
-                            const TDesC8& aObject, const TDesC8& aType, 
-                            TInt aStatusRef );
-        
-        /**
-        * From      CSmlDmAdapter   DeleteObjectL deletes an object and its child objects.
-        * @since    Series60_3.0
-        * @param    aURI            URI of the object
-        * @param    aLUID           LUID of the object
-        * @param    aStatusRef      Reference to correct command
-        * @return   none
-        */
-	    void DeleteObjectL( const TDesC8& aURI, const TDesC8& aLUID, 
-                        const TInt aStatusRef );
-        
-        /**
-        * From      CSmlDmAdapter   FetchLeafObjectL fetches data of a leaf object.
-        * @since    Series60_3.0
-        * @param    aURI            URI of the object
-        * @param    aLUID           LUID of the object
-        * @param    aType           MIME type of the object
-        * @param    aResultsRef    	Reference to correct results
-        * @param    aStatusRef      Reference to correct command
-        * @return   none
-        */
-	    void FetchLeafObjectL(  const TDesC8& aURI, 
-                            const TDesC8& aLUID, 
-                            const TDesC8& aType, 
-                            const TInt aResultsRef, 
-                            const TInt aStatusRef ); 
-        /**
-        * From      CSmlDmAdapter   ChildURIListL fetches URI list.
-        * @since    Series60_3.0
-        * @param    aURI                    URI of the object
-        * @param    aLUID                   LUID of the object
-        * @param    aPreviousURISegmentList URI list with mapping LUID information
-        * @param    aResultsRef    	        Reference to correct results
-        * @param    aStatusRef              Reference to correct command
-        * @return   none
-        */
-	    void ChildURIListL( const TDesC8& aURI, const TDesC8& aLUID, 
-                        const CArrayFix<TSmlDmMappingInfo>& aPreviousURISegmentList, 
-                        const TInt aResultsRef, const TInt aStatusRef );
-        
-        /**
-        * From      CSmlDmAdapter   AddNodeObjectL adds node object.
-        * @since    Series60_3.0
-        * @param    aURI            URI of the object
-        * @param    aParentLUID     LUID of the parent object
-        * @param    aStatusRef      Reference to correct command
-        * @return   none
-        */
-	    void AddNodeObjectL( const TDesC8& aURI, const TDesC8& aParentLUID, 
-                            const TInt aStatusRef );
-
-        /**
-        * From      CSmlDmAdapter   UpdateLeafObjectL creates new leaf objects, or replaces 
-        *                           data in existing leaf objects.
-        * @since    Series60_3.0
-        * @param    aURI            URI of the object
-        * @param    aLUID           LUID of the object
-        * @param    aStream         Data of the object
-        * @param    aType           MIME type of the object
-        * @param    aStatusRef      Reference to correct command
-        * @return   none
-        */
-        void UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, 
-                            RWriteStream*& aStream, const TDesC8& aType, 
-                            const TInt aStatusRef );
-        
-        /**
-        * From      CSmlDmAdapter   FetchLeafObjectSizeL fetches the size of a leaf object.
-        * @since    Series60_3.0
-        * @param    aURI            URI of the object
-        * @param    aLUID           LUID of the object
-        * @param    aType           MIME type of the object
-        * @param    aResultsRef    	Reference to correct results
-        * @param    aStatusRef      Reference to correct command
-        * @return   none
-        */
-	    void FetchLeafObjectSizeL( const TDesC8& aURI, const TDesC8& aLUID, 
-                                const TDesC8& aType, const TInt aResultsRef, 
-                                const TInt aStatusRef );
-
-        /**
-        * From      CSmlDmAdapter   The function implements execute command.
-        * @since    Series60_3.0
-        * @param    aURI            URI of the object
-        * @param    aLUID           LUID of the object
-        * @param    aArgument       Argument for the command
-        * @param    aType       	MIME type of the object
-        * @param    aStatusRef      Reference to correct command
-        * @return   none
-        */
-	    void ExecuteCommandL( const TDesC8& aURI, const TDesC8& aLUID, 
-                            const TDesC8& aArgument, const TDesC8& aType, 
-                            const TInt aStatusRef );
-
-        /**
-        * From      CSmlDmAdapter   The function implements execute command.
-        * @since    Series60_3.0
-        * @param    aURI            URI of the object
-        * @param    aLUID           LUID of the object
-        * @param    aStream         Argument for the command
-        * @param    aType       	MIME type of the object
-        * @param    aStatusRef      Reference to correct command
-        * @return   none
-        */
-	    void ExecuteCommandL( const TDesC8& aURI, const TDesC8& aLUID, 
-                            RWriteStream*& aStream, const TDesC8& aType, 
-                            const TInt aStatusRef );
-        
-        /**
-        * From      CSmlDmAdapter   The function implements execute command.
-        * @since    Series60_3.0
-        * @param    aTargetURI      Target URI for the command
-        * @param    aTargetLUID     LUID of the target object
-        * @param    aSourceURI      Source URI for the command
-        * @param    aSourceLUID    	LUID of the source object
-        * @param    aType           MIME type of the object
-        * @param    aStatusRef      Reference to correct command
-        * @return   none
-        */
-	    void CopyCommandL( const TDesC8& aTargetURI, const TDesC8& aTargetLUID, 
-                        const TDesC8& aSourceURI, const TDesC8& aSourceLUID, 
-                        const TDesC8& aType, TInt aStatusRef );
-	
-        /**
-        * From      CSmlDmAdapter   The function indicates start of Atomic command.
-        * @since    Series60_3.0
-        * @param    none
-        * @return   none
-        */
-        void StartAtomicL();
-
-        /**
-        * From      CSmlDmAdapter   The function indicates successful end of Atomic command.
-        * @since    Series60_3.0
-        * @param    none
-        * @return   none
-        */
-	    void CommitAtomicL();
-    
-        /**
-        * From      CSmlDmAdapter   The function indicates unsuccessful end of Atomic command.
-        * @since    Series60_3.0
-        * @param    none
-        * @return   none
-        */
-	    void RollbackAtomicL();
-
-        /**
-        * From      CSmlDmAdapter   Returns ETrue if adapter supports streaming otherwise EFalse.
-        * @since    Series60_3.0
-        * @param    aItemSize       Size limit for stream usage.
-        * @return   ETrue or EFalse
-        */
-	    TBool StreamingSupport( TInt& aItemSize );
-        
-        /**
-        * From      CSmlDmAdapter   Called when stream returned from UpdateLeafObjectL or 
-        *                           ExecuteCommandL has been written to and committed.
-        * @since    Series60_3.0
-        * @param    none
-        * @return   none
-        */
-	    void StreamCommittedL();
-
-        /**
-        * From      CSmlDmAdapter   The function tells the adapter that all the commands of the message that
-	    *                           can be passed to the adapter have now been passed.
-        * @since    Series60_3.0
-        * @param    none
-        * @return   none
-        */
-	    void CompleteOutstandingCmdsL();
-	
-    private:
-	    
-        /**
-        * C++ default constructor.
-        */
-        CNSmlDMSettingsAdapter();
-        CNSmlDMSettingsAdapter( TAny* aEcomArguments );
-	    
-        /**
-        * The function stores integer value to buffer and returns reference to it.
-        * @param    aObject     data to be stored to buffer.
-        * @return   reference to data buffer.
-        */
-        TDesC8& SetIntObjectLC( const TInt& aObject );
-        
-        /**
-        * The function finds out the last element of the uri.
-        * @param    aSource     Uri object that contains all elements.
-        * @return   KErrNone if successful.
-        */
-	    TInt SetField( const TDesC8& aSource );
-
-        /**
-        * The function converts data to integer and returns it.
-        * @param    aObject     Data object to be converted.
-        * @return   Integer value for an object.
-        */
-	    TInt GetIntObject( const TDesC8& aObject );
-
-        /**
-        * The function converts data to integer and returns it.
-        * @param    aObject     Data object to be converted.
-        * @return   16-bit integer value for an object.
-        */
-	    TInt GetIntObject16( const TDesC& aObject );
-
-        /**
-        * The function converts LUID to integer.
-        * @param    aLUID     LUID data to be converted.
-        * @return   Integer value for a LUID.
-        */    
-	    TInt IntLUID( const TDesC8& aLUID );
-
-        /**
-        * The function sets the IAP value acording the given URI.
-        * @param    aLUID     LUID for a profile.
-        * @param    aObject   Data object containing the URI.
-        * @return   KErrNone if successfull.
-        */    
-	    TInt  SetConRefL( const TInt aLUID, const TDesC8& aObject );
-    
-        /**
-        * The function gets the URI for profile IAP.
-        * @param    aObject   Object where the result will be stored.
-        * @return   KErrNone if successfull.
-        */    
-	    TInt GetConRefL( CBufBase& aObject );
-	
-        /**
-        * The function checks if field to be handled is valid.
-        * @param    none
-        * @return   ETrue if valid field otherwise EFalse.
-        */    
-    	TBool AcceptDMField();
-
-        /**
-        * The function checks if field type to be handled is valid.
-        * @param    none
-        * @return   enum value for a field type.
-        */ 
-	    TNSmlDMFieldType   GetDMFieldType() const;
-
-        /**
-        * The function returns enum value for a field to be handled.
-        * @param    none
-        * @return   enum value for a field to be handled.
-        */ 
-	    TNSmlDMProfileData GetDMField() const;
-
-        /**
-        * The function checks if data length is valid.
-        * @param    aProfileItem    Field / Leaf ID to be handled.
-        * @param    aSource         Data to be handled.
-        * @return   ETrue if data length is valid otherwise EFalse.
-        */ 
-	    TBool NotValidStrLenght( const TNSmlDMProfileData& aProfileItem, 
-                            const TDesC8& aSource );
-        
-        /**
-        * The function converts 16-bit data to 8-bit and returns reference to it.
-        * @param    aSource    Reference data to be converted.
-        * @return   Reference to 8-bit data buffer.
-        */ 
-	    TDesC8&  ConvertTo8LC( const TDesC& aSource );
-
-        /**
-        * The function converts 8-bit data to 16-bit and returns reference to it.
-        * @param    aSource    Reference data to be converted.
-        * @return   Reference to 16-bit data buffer.
-        */ 
-	    TDesC16& ConvertTo16LC( const TDesC8& aSource );
-
-        /**
-        * The function find out the port number from URL and stores it to aPort.
-        * @param    aRealURI    Reference data to be containing the whole URI.
-        * @param    aPort       Reference variable where port number will be stored.
-        * @return   KErrNone if successful otherwise KErrNotFound.
-        */ 
-	    TInt ParseUri( const TDesC8& aRealURI, TInt& aPort );
-
-        /**
-        * The function opens the server session and profile via client API.
-        * @param    aIntLUID    Integer value for a LUID of the profile.
-        * @param    aMode       Read or Read and Write mode for a profile data.
-        * @return   KErrNone if successful otherwise KErrNotFound.
-        */ 
-        TInt OpenSyncSessionAndProfileL( const TInt aIntLUID, TSmlOpenMode aMode );
-
-        /**
-        * The function checks if requested profile ID exits.
-        * @param    aIntLUID    Integer value for a LUID of the profile.
-        * @return   ETrue if profile exits otherwise EFalse.
-        */ 
-	    TBool FindProfileIdL( const TInt aIntLUID );
-
-        /**
-        * The function creates new DM profile.
-        * @param    aPID    Reference to variable where new profile will be stored.
-        * @return   KErrNone if successful otherwise error code.
-        */ 
-        TInt CreateNewProfileL( TInt& aPID );
-
-        /**
-        * The function stores the server URL for a profile.
-        * @param    aPID    Profile ID.
-        * @param    aObj    Reference to server URL data.
-        * @return   KErrNone if successful otherwise error code.
-        */ 
-        TInt SetProfileServerURIL( const TInt aPID, const TDesC8& aObj );
-
-        /**
-        * The function stores the display name for a profile.
-        * @param    aPID    Profile ID.
-        * @param    aObj    Reference to data.
-        * @return   KErrNone if successful otherwise error code.
-        */ 
-        TInt SetProfileDisplayNameL( const TInt aPID, const TDesC8& aObj );
-
-        /**
-        * The function stores the user name for a profile.
-        * @param    aPID    Profile ID.
-        * @param    aObj    Reference to data.
-        * @return   KErrNone if successful otherwise error code.
-        */ 
-        TInt SetProfileUserNameL( const TInt aPID, const TDesC8& aObj );
-
-        /**
-        * The function stores the protocol version for a profile.
-        * @param    aPID    Profile ID.
-        * @param    aObj    Reference to data.
-        * @return   KErrNone if successful otherwise error code.
-        */ 
-        TInt SetProfileProtocolVersionL( const TInt aPID, const TDesC8& aObj );
-
-        /**
-        * The function stores the ServerId value for a profile.
-        * @param    aPID    Profile ID.
-        * @param    aObj    Reference to data.
-        * @return   KErrNone if successful otherwise error code.
-        */ 
-        TInt SetProfileServerIdL( const TInt aPID, const TDesC8& aObj );
-
-        /**
-        * The function stores the Server password for a profile.
-        * @param    aPID    Profile ID.
-        * @param    aObj    Reference to data.
-        * @return   KErrNone if successful otherwise error code.
-        */ 
-        TInt SetProfileServerPasswordL( const TInt aPID, const TDesC8& aObj );
-
-        /**
-        * The function stores the password value for a profile.
-        * @param    aPID    Profile ID.
-        * @param    aObj    Reference to data.
-        * @return   KErrNone if successful otherwise error code.
-        */ 
-        TInt SetProfilePasswordL( const TInt aPID, const TDesC8& aObj );
-
-        /**
-        * The function stores the IAP id value for a profile.
-        * @param    aLUID   Profile ID.
-        * @param    aIAPid  Reference to data.
-        * @return   KErrNone if successful otherwise error code.
-        */ 
-        TInt SetProfileConnectionPropertyL( const TInt aLUID, const TInt aIAPid );
-
-        /**
-        * The function deleted the profile data.
-        * @param    aPID    Profile ID.
-        * @return   KErrNone if successful otherwise error code.
-        */ 
-        TInt DeleteProfileL( const TInt aPID );
-        
-        /**
-        * The function gets the profile data acoeding to aDMField.
-        * @param    aLUID       Profile ID.
-        * @param    aDMField    Data field ID to be handled.
-        * @param    aObject     Reference where fetched data to be stored.
-        * @return   KErrNone if successful otherwise error code.
-        */ 
-        TInt GetObjectL( TInt aLUID, TNSmlDMProfileData aDMField, 
-                        CBufBase& aObject );
-
-        /**
-        * The function adds port number to address URL.
-        * @param    aLUID       Profile ID.
-        * @param    aPort       Reference to port number data.
-        * @return   KErrNone if successful otherwise error code.
-        */ 
-        TInt SetProfileConnectionPortNrL( const TInt aLUID, const TDesC8& aPort );
-        
-        /**
-        * The function adds port number to address URL.
-        * @param    aSrvURI     Original address URI.
-        * @param    aNewURI     New URI when port number has been added or deleted.
-        * @param    aPort       Reference to port number data.
-        * @return   KErrNone if successful otherwise error code.
-        */ 
-        void SetPortNrToAddrStr( const TDesC8& aSrvURI, HBufC8* aNewURI, 
-                                const TDesC8& aPort );
-
-        /**
-        * General function which selects which leaf to be handled.
-        * @param    aLUID       Profile LUID.
-        * @param    aObject     Data to be stored.
-        * @param    aField      Leaf of field ID to be handled.
-        * @return   KErrNone if successful otherwise error code.
-        */ 
-        TInt SetDMFieldDataL( const TInt aLUID, const TDesC8& aObject, 
-                            const TNSmlDMProfileData aField );
-        /**
-        * The function fills the node info.
-        * @param    aNode           Reference to node or leaf which info to be filled.
-        * @param    aAccTypes       Access rights for a leaf / node.
-        * @param    aOccurrence     Occurance of the node / leaf.
-        * @param    aScope          Scope (dynamic / permanent) of the leaf / node.
-        * @param    aFormat         Data format of the leaf / node.
-        * @param    aDescription    Description of the node / leaf.
-        * @param    aDefaultValue   Default value for a leaf or node.
-        * @param    aMimeType       MIME type for a leaf / node.
-        * @return   none
-        */ 
-        void FillNodeInfoL( MSmlDmDDFObject& aNode, TSmlDmAccessTypes aAccTypes, 
-                        MSmlDmDDFObject::TOccurence aOccurrence, 
-                        MSmlDmDDFObject::TScope aScope, 
-                        MSmlDmDDFObject::TDFFormat aFormat, 
-                        const TDesC8& aDescription, 
-                        const TDesC8& aDefaultValue, const TDesC8& aMimeType );
-        
-        /**
-        * The function reads the authentication data via private API.
-        * @param    aLUID       LUID for a profile.
-        * @param    aField      Leaf id to be handled.
-        * @param    aObject     Reference where to store the data.
-        * @return   KErrNone if successful otherwise error code.
-        */ 
-        TInt GetDMAuthInfoL( const TInt aLUID, const TNSmlDMProfileData aField, 
-                            CBufBase& aObject );
-
-        /**
-        * The function delete's the authentication data via private API.
-        * @param    aLUID       LUID for a profile.
-        * @param    aField      Leaf id to be handled.
-        * @return   KErrNone if successful otherwise error code.
-        */ 
-        TInt DeleteDMAuthInfoL( const TInt aLUID, const TNSmlDMProfileData aField );
-        
-        /**
-        * The function set's the address type / medium type value for a profile.
-        * @param    aLUID       LUID for a profile.
-        * @param    aIntObj     Address type value.
-        * @return   KErrNone if successful otherwise error code.
-        */ 
-        TInt SetProfileAddrTypeL( const TInt aLUID, const TInt aIntObj );
-
-        /**
-        * The function gets the profile medium type value.
-        * @param    aObject     Reference where data to be stored.
-        * @return   KErrNone if successful otherwise error code.
-        */ 
-        TInt GetProfileConnectiontypeL( CBufBase& aObject );
-
-        /**
-        * The function gets the profile IAP value.
-        * @param    aIAPid     Reference where data to be stored.
-        * @return   KErrNone if successful otherwise error code.
-        */ 
-        TInt GetProfileIAPIdL( TInt& aIAPid );
-
-        /**
-        * The function gets the profile Server URL value.
-        * @param    aURL     Reference where data to be stored.
-        * @return   KErrNone if successful otherwise error code.
-        */ 
-        void GetProfileServerURLL( CBufBase& aURL );
-
-        /**
-        * The function checks the requested medium type if supported.
-        * @param    aIntObj         Medium type.
-        * @param    aMediumType     UID for medium type.
-        * @return   none
-        */         
-        void GetMediumTypeL( const TInt aIntObj, TInt& aMediumType );
-
-        /**
-        * The function gets the server id value.
-        * @param    aObject     Reference where data to be stored.
-        * @return   none
-        */       
-        void GetServerIdL( CBufBase& aObject );
-
-        /**
-        * The function gets the profile name value.
-        * @param    aObject     Reference where data to be stored.
-        * @return   none
-        */       
-        void GetProfileNameL( CBufBase& aObject );
-
-        /**
-        * The function gets the user name value.
-        * @param    aObject     Reference where data to be stored.
-        * @return   none
-        */ 
-        void GetProfileUserNameL( CBufBase& aObject );
-
-        /**
-        * The function gets the profile port number value.
-        * @param    aObject     Reference where data to be stored.
-        * @return   none
-        */ 
-        void GetProfilePortNumberL( CBufBase& aObject );
-
-        /**
-        * The function sets the profile authentication info via private API.
-        * @param    aLUID       Profile LUID.
-        * @param    aField      Leaf ID to be handled.
-        * @param    aObject     Data to be stored.
-        * @param    aStatus     Status of the function, KErrNone if successful.
-        * @return   none
-        */         
-        void SetAuthInfoL( const TInt aLUID, const TNSmlDMProfileData aField, 
-                        const TDesC8& aObject, TInt& aStatus );
-	//Buffers Node Object
-	void AddNodeBufferL( const TDesC8& aURI, const TInt aStatusRef);
-	//Buffers Leaf Object
-	void AddLeafBufferL( const TDesC8& aURI, const TDesC8& aObject,
-			const TInt aStatusRef);
-	// Executes Buffer
-	void ExecuteBufferL();
-	//Extracts the ParentURI
-	TPtrC8 ParentURI(const TDesC8& aURI);
-	// Clears the elements of the passed in LeafElement Structure
-	void ClearBuffer( CArrayFixFlat<TNSmlDMLeafElement>* aBuffer);
-    private:    // Data
-	
-        // Client API session class 
-        RSyncMLSession iSyncSession;
-        // Client API Device Management profile handling
-        RSyncMLDevManProfile iProfile;
-        // Callback interface for returning result or status
-	    MSmlDmCallback* iCallBack;
-	    
-	    TInt iCurrentProfile;
-	    
-        // Profile LUID
-        TInt iLUID;
-        // Parent LUID
-	    TInt iParentLUID;
-        // For handling profile medium type 
-	    TInt iObject;
-                  
-        // Buffer for URI leaf element
-	    HBufC8* iField;
-		
-        // Information about data type
-	    TNSmlDMFieldType  iFieldType;
-        // Information about leaf command
-	    TNSmlDMLeafType	  iLeafType;
-        // Status information if session allready opened
-        TBool iSyncSessionOpen;
-
-        // Buffer for storing port number
-        HBufC8* iPortNbr;
-    
-        // Private API interface for handling authebtication data
-        RNSmlPrivateAPI iPrivateApi;
-        
-        struct TPortBuffer
-            {
-            // buffered data for updating port number
-            TBufC8<5> iPortBuf;
-            TInt iPortBufLUID;
-            TInt iPortBufStatusRef;
-            };
-        RArray<TPortBuffer> iPortBuffer;    
-	TBool iBufOn;
-	TBool iComplete;
-	TInt iExecutionIndex;
-	CArrayFixFlat<TNSmlDMBufferElement> *iBuffer;
-    };
-
-#endif // __NSMLDMSETTINGSADAPTER_H__
-
-// End of File
-
--- a/omadm/omadmextensions/adapters/syncmldm/src/NSmlDmSettingsAdapter.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3011 +0,0 @@
-/*
-* 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:    DM-settings adapter
-*
-*/
-
-
-
-
-// INCLUDE FILES
-#include "NSmlDMSettingsAdapter.h"
-#include "nsmldebug.h"
-#include "nsmlconstants.h"
-#include "nsmldmconstants.h"
-#include "nsmldmimpluids.h"
-#include "nsmldmiapmatcher.h"
-#include "nsmldmauthinfo.h"
-#include <featmgr.h>
-#include <implementationproxy.h>
-#include <SyncMLClientDM.h>
-#include <SyncMLTransportProperties.h>
-
-
-#ifndef __WINS__
-// This lowers the unnecessary compiler warning (armv5) to remark.
-// "Warning:  #174-D: expression has no effect..." is caused by 
-// DBG_ARGS8 macro in no-debug builds.
-#pragma diag_remark 174
-#endif
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter::NewL
-//  Two-phased constructor.
-// -----------------------------------------------------------------------------
-CNSmlDMSettingsAdapter* CNSmlDMSettingsAdapter::NewL( MSmlDmCallback* aDmCallback )
-	{
-	_DBG_FILE("CNSmlDMSettingsAdapter::NewL(): begin");
-
-	CNSmlDMSettingsAdapter* self = NewLC( aDmCallback );
-	CleanupStack::Pop();
-
-	_DBG_FILE("CNSmlDMSettingsAdapter::NewL(): end");
-	return self;
-	}
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter::NewLC( )
-//  Loads the CNSmlDMSettingsAdapter class and pushes it to clenupstack.
-// -----------------------------------------------------------------------------
-CNSmlDMSettingsAdapter* CNSmlDMSettingsAdapter::NewLC( MSmlDmCallback* aDmCallback )
-	{
-	_DBG_FILE( "CNSmlDMSettingsAdapter::NewLC(): begin" );
-	CNSmlDMSettingsAdapter* self = new ( ELeave ) CNSmlDMSettingsAdapter( aDmCallback );
-	CleanupStack::PushL( self );
-    self->iCallBack = aDmCallback;
-	self->ConstructL();
-	self->iLeafType = EDMUnset;
-
-	_DBG_FILE( "CNSmlDMSettingsAdapter::NewLC(): end" );
-	return self;
-	}
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter::CNSmlDMSettingsAdapter()
-//  Default constructor.
-// -----------------------------------------------------------------------------
-CNSmlDMSettingsAdapter::CNSmlDMSettingsAdapter( TAny* aEcomArguments) : 
-                                                CSmlDmAdapter(aEcomArguments )
-	{
-	_DBG_FILE( "CNSmlDMSettingsAdapter::CNSmlDMSettingsAdapter(): begin" );
-	_DBG_FILE( "CNSmlDMSettingsAdapter::CNSmlDMSettingsAdapter(): end" );
-	}
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter::~CNSmlDMSettingsAdapter()
-//  Destructor.
-// -----------------------------------------------------------------------------
-CNSmlDMSettingsAdapter::~CNSmlDMSettingsAdapter()
-	{
-	_DBG_FILE( "CNSmlDMSettingsAdapter::~CNSmlDMSettingsAdapter(): begin" );
-
-    delete iField;
-
-    // Client API Session & Profile
-    iProfile.Close();
-	iSyncSession.Close();
-    iSyncSessionOpen = EFalse;
-    
-	// In Case the Buffer isnt cleared
-	if ( iBuffer)
-		{
-		for (TInt val =0; val<iBuffer->Count ();val++)
-			{
-			delete iBuffer->At(val).iMappingName;
-
-			ClearBuffer ( iBuffer->At(val).iLeafBuf);
-			delete iBuffer->At(val).iLeafBuf;
-			}
-
-		iBuffer->Reset ();
-		delete iBuffer;
-		}
-    delete iPortNbr;
-    iPortBuffer.Reset();
-    iPortBuffer.Close();    
-    iPrivateApi.Close();
-    
-    iCallBack = 0; 
-           
-	_DBG_FILE( "CNSmlDMSettingsAdapter::~CNSmlDMSettingsAdapter(): end" );
-	}
-
-// -----------------------------------------------------------------------------
-//		CNSmlDMSettingsAdapter::ConstructL()
-//		Second phase constructor.
-// -----------------------------------------------------------------------------
-void CNSmlDMSettingsAdapter::ConstructL()
-	{
-	iField = HBufC8::NewL( KNSmlMaxURLLength );
-    iSyncSessionOpen = EFalse;
-	// variables used for Buffering
-	iBufOn = EFalse;
-	iComplete = EFalse;
-	iExecutionIndex = -1;
-	// initialising iBuffer
-	iBuffer = new (ELeave) CArrayFixFlat <TNSmlDMBufferElement> (KNSmlDMGranularity);
-    }
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter::DDFVersionL()
-//  Returns the DDF version number.
-// -----------------------------------------------------------------------------
-void CNSmlDMSettingsAdapter::DDFVersionL( CBufBase& aVersion )
-	{
-	_DBG_FILE(
-            "CNSmlDMSettingsAdapter::DDFVersionL(CBufBase& aDDFVersion): begin" );
-	aVersion.InsertL( 0, KVersion );
-	_DBG_FILE(
-            "CNSmlDMSettingsAdapter::DDFVersionL(CBufBase& aDDFVersion): end" );
-	}
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter::DDFStructureL()
-//  Fills the DDF structure of the adapter.
-// -----------------------------------------------------------------------------
-void CNSmlDMSettingsAdapter::DDFStructureL( MSmlDmDDFObject& aDDF )
-	{
-	_DBG_FILE( "CNSmlDMSettingsAdapter::DDFStructureL(): begin" );
-      
-	MSmlDmDDFObject* ddfRoot = &aDDF;
-	MSmlDmDDFObject& ddf = ddfRoot->AddChildObjectL( KSyncMLText );
-
-	TSmlDmAccessTypes *aclTypes = new ( ELeave ) TSmlDmAccessTypes();
-	CleanupStack::PushL( aclTypes );
-    
-    // Set Get as acceptable operations
-    aclTypes->SetGet();
-	
-	ddf.SetDFTitleL( KNSmlDMadapterTitle );
-    FillNodeInfoL( ddf, *aclTypes, MSmlDmDDFObject::EOne, 
-                    MSmlDmDDFObject::EPermanent, MSmlDmDDFObject::ENode, 
-                    KNSmlDMadapterDesc, KNullDesC8, KNullDesC8 );
-
-
-	MSmlDmDDFObject& nDmDDF = ddf.AddChildObjectL( KNSmlDefDMAcc );
-    FillNodeInfoL( nDmDDF, *aclTypes, MSmlDmDDFObject::EOne, 
-                    MSmlDmDDFObject::EPermanent, MSmlDmDDFObject::ENode, 
-                    KNullDesC8, KNullDesC8, KNullDesC8 );
-    
-	aclTypes->SetAdd();
-	// Set rest acceptable operations for data itself
-	aclTypes->SetReplace();
-	aclTypes->SetDelete();
-
-	TSmlDmAccessTypes aclTypesNoGet;
-	aclTypesNoGet.SetReplace();
-	aclTypesNoGet.SetAdd();
-	aclTypesNoGet.SetDelete();
-
-	TSmlDmAccessTypes aclTypesAR;
-	aclTypesAR.SetReplace();
-	aclTypesAR.SetAdd();
-
-    TSmlDmAccessTypes aclTypesARG;
-	aclTypesARG.SetReplace();
-	aclTypesARG.SetAdd();
-    aclTypesARG.SetGet();
-    
-    TSmlDmAccessTypes aclTypesAG;
-	aclTypesAG.SetGet();
-	aclTypesAG.SetAdd();
-
-	MSmlDmDDFObject& nProDDF = nDmDDF.AddChildObjectGroupL();
-    FillNodeInfoL( nProDDF, *aclTypes, MSmlDmDDFObject::EZeroOrMore, 
-                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::ENode, 
-                    KNullDesC8, KNullDesC8, KMimeType );
-
-	MSmlDmDDFObject& nAddrDDF = nProDDF.AddChildObjectL( KNSmlDdfAddr );			// Addr
-    FillNodeInfoL( nAddrDDF, *aclTypes, MSmlDmDDFObject::EOne, 
-                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::EChr, 
-                    KNSmlDdfAddrDescription, KNullDesC8, KMimeType );
-
-	MSmlDmDDFObject& nAddrTypeDDF = nProDDF.AddChildObjectL( KNSmlDdfAddrType );	// AddrType
-    FillNodeInfoL( nAddrTypeDDF, *aclTypes, MSmlDmDDFObject::EOne, 
-                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::EChr, 
-                    KNSmlDdfAddrTypeDescription, KNullDesC8, KMimeType );
-
-	MSmlDmDDFObject& nPortNbrDDF = nProDDF.AddChildObjectL( KNSmlDdfPortNbr );	// PortNbr
-    FillNodeInfoL( nPortNbrDDF, *aclTypes, MSmlDmDDFObject::EZeroOrOne, 
-                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::EInt, 
-                    KNSmlDdfPortNbrDescription, KNullDesC8, KMimeType );
-
-	MSmlDmDDFObject& nAuthSchemeDDF = nProDDF.AddChildObjectL( KNSmlDdfAuthScheme );	// AuthPref
-    FillNodeInfoL( nAuthSchemeDDF, *aclTypes, MSmlDmDDFObject::EOne, 
-                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::EChr, 
-                    KNSmlDdfAuthSchemeDescription, KNullDesC8, KMimeType );
-
-	MSmlDmDDFObject& nServerIdDDF = nProDDF.AddChildObjectL( KNSmlDdfServerId );	// ServerId
-    FillNodeInfoL( nServerIdDDF, aclTypesAG, MSmlDmDDFObject::EOne, 
-                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::EChr, 
-                    KNSmlDdfServerIdDescription, KNullDesC8, KMimeType );
-
-	MSmlDmDDFObject& nServerPWDDF = nProDDF.AddChildObjectL( KNSmlDdfServerPW );	// ServerPW
-    FillNodeInfoL( nServerPWDDF, aclTypesNoGet, MSmlDmDDFObject::EOne, 
-                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::EChr, 
-                    KNSmlDdfServerPWDescription, KNullDesC8, KMimeType );
-
-	MSmlDmDDFObject& nServerNonceDDF = nProDDF.AddChildObjectL( KNSmlDdfServerNonce );// ServerNonce
-    FillNodeInfoL( nServerNonceDDF, aclTypesNoGet, MSmlDmDDFObject::EOne, 
-                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::EChr, 
-                    KNSmlDdfServerNonceDescription, KNullDesC8, KMimeType );
-
-	MSmlDmDDFObject& nClientUserNameDDF = nProDDF.AddChildObjectL( KNSmlDdfClientUserName ); // ClientUserName
-    FillNodeInfoL( nClientUserNameDDF, *aclTypes, MSmlDmDDFObject::EOne, 
-                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::EChr, 
-                    KNSmlDdfClientUserNameDescription, KNullDesC8, KMimeType );
-
-	MSmlDmDDFObject& nClientPWDDF = nProDDF.AddChildObjectL( KNSmlDdfClientPW );	// ClientPW
-    FillNodeInfoL( nClientPWDDF, aclTypesNoGet, MSmlDmDDFObject::EOne, 
-                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::EChr, 
-                    KNSmlDdfClientPWDescription, KNullDesC8, KMimeType );
-
-	MSmlDmDDFObject& nClientNonceDDF = nProDDF.AddChildObjectL( KNSmlDdfClientNonce );	// ClientNonce
-    FillNodeInfoL( nClientNonceDDF, aclTypesNoGet, MSmlDmDDFObject::EOne, 
-                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::EChr, 
-                    KNSmlDdfClientNonceDescription, KNullDesC8, KMimeType );
-
-	MSmlDmDDFObject& nNameDDF = nProDDF.AddChildObjectL( KNSmlDdfName );	// Name
-    FillNodeInfoL( nNameDDF, *aclTypes, MSmlDmDDFObject::EZeroOrOne, 
-                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::EChr, 
-                    KNSmlDdfNameDescription, KNullDesC8, KMimeType );
-
-	MSmlDmDDFObject& nConRefDDF = nProDDF.AddChildObjectL( KNSmlDdfConRef );	// ConRef
-    FillNodeInfoL( nConRefDDF, aclTypesARG, MSmlDmDDFObject::EOne, 
-                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::EChr, 
-                    KNSmlDdfConRefDescription, KNullDesC8, KMimeType );
-
-	CleanupStack::PopAndDestroy(); //aclTypes
-	
-	_DBG_FILE("CNSmlDMSettingsAdapter::DDFStructureL(): end");
-	}
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter::UpdateLeafObjectL
-//  Updates profile leaf object data based on URI.
-// -----------------------------------------------------------------------------
-void CNSmlDMSettingsAdapter::UpdateLeafObjectL( const TDesC8& aURI,
-                                                const TDesC8& aLUID, 
-                                                const TDesC8& aObject, 
-                                                const TDesC8& /*aType*/, 
-                                                const TInt aStatusRef )
-	{
-	_DBG_FILE("CNSmlDMSettingsAdapter::UpdateLeafObjectL(): begin");
-	TInt index = -1;
-	if ( !iBufOn)
-		{
-		for (TInt val = 0; val<iBuffer->Count (); val++)
-			{
-			TPtrC8 firstUri = ParentURI (aURI);
-			if ( iBuffer->At(val).iMappingName->Compare (firstUri)== 0)
-				{
-				index = iExecutionIndex = val;
-				break;
-				}
-			}
-		}
-	if ( index >= 0)
-		AddLeafBufferL (aURI, aObject, aStatusRef);
-	else
-		{
-	if( aLUID.Length() == 0 )
-		{
-		_DBG_FILE( "CNSmlDMSettingsAdapter::UpdateLeafObjectL( ): ENotFound end" );
-		iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-		return;
-		}
-	TInt parentLUID = GetIntObject( aLUID ); 
-	if( parentLUID != iParentLUID )
-		{
-		if( FindProfileIdL( parentLUID ) != EFalse )
-			{
-			iParentLUID = parentLUID;
-			}
-		else
-			{
-			iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-			return;
-			}
-		}
-	SetField( aURI );
-	if( !AcceptDMField() )
-		{
-		_DBG_FILE( "CNSmlDMSettingsAdapter::AddLeafObjectL(): KErr field end" );
-		iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EInvalidObject );
-		return;
-		}
-
-    //	Get Database field type 
-	TNSmlDMFieldType fType = GetDMFieldType();
-	if ( fType == EWrong )
-		{
-		_DBG_FILE( "CNSmlDMSettingsAdapter::AddLeafObjectL(): EError end" );
-		iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-		return;
-		}
-    TNSmlDMProfileData fData = GetDMField();
-    if( fData == ESyncAccepted )
-        {
-        _DBG_FILE( "CNSmlDMSettingsAdapter::AddLeafObjectL(): EError end" );
-		iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-		return;
-        }
-    if( NotValidStrLenght( fData, aObject ) )
-	    {
-		_DBG_FILE( "CNSmlDMSettingsAdapter::AddLeafObjectL(): KErr length end" );
-		iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ETooLargeObject );
-		return;
-		}
-    //Authentication data leafs to be handled
-    if ( fData == EAuthenticationRequired || fData == EClientNonce 
-        || fData == EServerNonce )
-        {
-        //Check if replace command and replace data as defined
-        
-        TInt replaceStatus = KErrGeneral; 
-        SetAuthInfoL( iParentLUID + KMaxDataSyncID, fData, aObject, replaceStatus );
-        if ( replaceStatus == KErrNone )
-            {
-            iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
-            }
-        else if ( replaceStatus == KErrNotFound )
-            {
-            iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-            }
-        else
-            {
-            iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-            }
-       
-        _DBG_FILE( "CNSmlDMSettingsAdapter::UpdateLeafObjectL():end" );
-        return;
-        }
-        
-    TInt rValue = SetDMFieldDataL( iParentLUID, aObject, fData );
-    if ( fData == EProfilePort )
-        {
-        // in case port is updated, save status ref to be used in 
-        // CompleteOutstandingCmdsL
-        if(rValue==KErrNone)
-            {
-            iPortBuffer[iPortBuffer.Count()-1].iPortBufStatusRef = aStatusRef; 
-            }
-        else if( rValue == KErrOverflow)
-        {
-        	iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ETooLargeObject );
-        }
-        else
-        {
-        	iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-            }
-        }
-    else
-        {
-        if( rValue != KErrNone )
-            {
-            if( rValue == KErrNotFound )
-                {
-                iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-                }
-            else if( rValue == KErrInUse )
-                {
-                iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EObjectInUse );
-                }
-            else if( rValue == KErrNoMemory )
-                {
-                iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENoMemory );
-                }
-            else
-                {
-                iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-                }
-            }
-        else
-            {
-            iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
-            }
-        }
-		}
-        
-	_DBG_FILE( "CNSmlDMSettingsAdapter::UpdateLeafObjectL():end" );
-        return;
-	}
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter::DeleteObjectL
-//  Deletes whole profile or leaf object data acording to aURI.
-// -----------------------------------------------------------------------------
-void CNSmlDMSettingsAdapter::DeleteObjectL( const TDesC8& aURI, 
-                                            const TDesC8& aLUID, 
-                                            const TInt aStatusRef )
-	{
-	_DBG_FILE( "CNSmlDMSettingsAdapter::DeleteObjectL( ): begin" );
-
-	if( aURI.Find( KNSmlDdfConRef ) != KErrNotFound )
-		{	
-		_DBG_FILE( "CNSmlDMSettingsAdapter::DeleteObjectL(): NOT ALLOWED end" );
-		iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-		return;
-		}
-
-    //	Check which field going to be handled
-	SetField( aURI );
-
-    //	Check if valid field
-	if( !AcceptDMField() )
-		{
-
-        // Delete whole profile if aURI called for node
-		TInt last = aURI.LocateReverse( '/' );
-		TInt pos  = aURI.Find( KNSmlDefDMAcc );
-		if( last - 5 == pos )
-			{
-
-            //	If called for node means that profile will deleted from database
-			iLUID = IntLUID( aLUID );
-			DBG_ARGS8( _S8("DeleteObjectL: URI %S LUID = %d"), &aURI, iLUID );
-
-			if( FindProfileIdL( iLUID ) == EFalse )
-				{
-				_DBG_FILE(
-                    "CNSmlDMSettingsAdapter::DeleteObjectL( ): notfound end");
-				
-                iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-				return;
-				}
-			else
-				{
-				TInt sRet = DeleteProfileL( iLUID + KMaxDataSyncID );
-				if ( sRet != KErrNone )
-					{
-                    if( sRet == KErrNotFound )
-                        {
-                        iCallBack->SetStatusL( aStatusRef,
-                                                CSmlDmAdapter::ENotFound );
-                        }
-                    else if( sRet == KErrInUse )
-                        {
-                        iCallBack->SetStatusL( aStatusRef,
-                                                CSmlDmAdapter::EObjectInUse );
-                        }
-                    else
-                        {
-                        iCallBack->SetStatusL( aStatusRef, 
-                                                CSmlDmAdapter::EError );
-					    }
-					return;
-					}
-				else
-					{
-					_DBG_FILE( "CNSmlDMSettingsAdapter::DeleteObjectL( ): EOk end" );
-					iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
-					return;
-					}
-				}
-			}
-		else
-			{
-			_DBG_FILE(
-                "CNSmlDMSettingsAdapter::DeleteObjectL( ): EInvalidObject end" );
-			iCallBack->SetStatusL( aStatusRef,CSmlDmAdapter::EInvalidObject );
-			return;
-			}
-		}//Delete whole Profile
-
-	iLUID = IntLUID( aLUID );
-	if ( iLUID != iParentLUID )
-		{
-		if( FindProfileIdL( iLUID ) == EFalse )
-			{
-			_DBG_FILE( "CNSmlDMSettingsAdapter::DeleteObjectL( ): end" );
-			iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-			return;
-			}
-		iParentLUID = iLUID;
-		}
-	
-	if ( iField->Compare( KNSmlDdfAuthScheme ) == 0 )
-    	{
-		DeleteDMAuthInfoL( iLUID, EAuthenticationRequired );
-        iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
-        return;
-		}
-    else if( iField->Compare( KNSmlDdfClientNonce ) == 0 )
-    	{
-		DeleteDMAuthInfoL( iLUID, EClientNonce );
-        iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
-        return;
-		}
-    else if( iField->Compare(KNSmlDdfServerNonce) == 0 )
-		{
-		DeleteDMAuthInfoL( iLUID, EServerNonce );
-        iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
-        return;
-		}
-
-    // Sets default value if not null field
-	HBufC8* dataObject = HBufC8::NewLC( 15 );
-	dataObject->Des().Format( KNullDesC8 );
-
-	_LIT8(aType,		"text/plain");
-	iLeafType = EDMDelete;
-	UpdateLeafObjectL( aURI, aLUID, *dataObject, aType, aStatusRef );
-    CleanupStack::PopAndDestroy(); //dataObject
-	iLeafType = EDMUnset;
-
-	_DBG_FILE( "CNSmlDMSettingsAdapter::DeleteObjectL( ): end" );
-	return;
-	}
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter::FetchLeafObjectL
-//  Fetches profile leaf object data acordint to aURI.
-// -----------------------------------------------------------------------------
-void CNSmlDMSettingsAdapter::FetchLeafObjectL( const TDesC8& aURI, 
-                                                const TDesC8& aLUID, 
-                                                const TDesC8& aType, 
-                                                const TInt aResultsRef, 
-                                                const TInt aStatusRef )
-	{
-
-	_DBG_FILE( "CNSmlDMSettingsAdapter::FetchLeafObjectL(): begin" );
-	DBG_ARGS(_S16( "DM:Fetch aURI    - %S - %S"), &aURI, &aLUID );
-		
-	iLUID = IntLUID( aLUID );
-	if ( iLUID >= 0 )
-		{
-		if( FindProfileIdL( iLUID ) == EFalse )
-			{
-			_DBG_FILE( "CNSmlDMSettingsAdapter::FetchLeafObjectL(): ENotFound end" );
-			iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-			return;
-			}
-		}
-	else
-		{
-		_DBG_FILE( "CNSmlDMSettingsAdapter::FetchLeafObjectL(): ENotFound end" );
-		iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-		return;
-		}
-
-    //	Check which field going to be handled
-	SetField(aURI);
-
-    //	Check if valid field
-	if( !AcceptDMField() )
-		{
-		_DBG_FILE( "CNSmlDMSettingsAdapter::FetchLeafObjectL(): EInvalidObject end" );
-		iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EInvalidObject );
-		return;
-		}
-
-    //	Get Database field type 
-	TInt fType = GetDMFieldType();
-	if ( fType == EWrong )
-		{
-		_DBG_FILE( "CNSmlDMSettingsAdapter::FetchLeafObjectL(): EError end" );
-		iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-		return;
-		}
-
-    TNSmlDMProfileData fieldId = GetDMField();
-    if( fieldId == ESyncAccepted )
-        {
-        _DBG_FILE( "CNSmlDMSettingsAdapter::AddLeafObjectL(): EError end" );
-		iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-		return;
-        }
-    CBufBase *lObject = CBufFlat::NewL( 128 );
-    CleanupStack::PushL( lObject );
-    lObject->Reset();
-    
-    CSmlDmAdapter::TError status;
-
-    if ( fType == EStr || fType == EInt || fType == EBin )
-		{ 
-        TInt rValue = GetObjectL( iLUID, fieldId, *lObject );
-		if( rValue != KErrNone )
-		    {
-            if( rValue == KErrNotFound )
-                {
-                status = CSmlDmAdapter::ENotFound;
-                }
-            else if( rValue == KErrInUse )
-                {
-                status = CSmlDmAdapter::EObjectInUse;
-                }
-            else if( rValue == KErrNoMemory )
-                {
-                status = CSmlDmAdapter::ENoMemory;
-                }
-            else
-                {
-                status = CSmlDmAdapter::EError;
-                }
-		    }
-        else
-            {
-            status = CSmlDmAdapter::EOk;
-            }
-		}
-	else 
-		{
-		CleanupStack::PopAndDestroy(); //lObject 
-        _DBG_FILE( "CNSmlDMSettingsAdapter::FetchLeafObjectL(): ENotFound end" );
-		iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-		iProfile.Close();
-        iSyncSession.Close();
-        iSyncSessionOpen = EFalse;
-		return;
-		}
-    iCallBack->SetStatusL( aStatusRef, status );
-    
-    if(status==CSmlDmAdapter::EOk)
-    	{
-		iCallBack->SetResultsL( aResultsRef, *lObject, aType );
-    	}
-  	
-    CleanupStack::PopAndDestroy(); //lObject 
-	iProfile.Close();
-    iSyncSession.Close();
-    iSyncSessionOpen = EFalse;
-	_DBG_FILE( "CNSmlDMSettingsAdapter::FetchLeafObjectL(): end" );
-	return;
-	}
-
-// -----------------------------------------------------------------------------
-//  CSmlDmSettingsAdapter::ChildURIListL
-//  Function returns the list of profiles or leafs of the profile 
-//  acording to aURI.
-// -----------------------------------------------------------------------------
-void CNSmlDMSettingsAdapter::ChildURIListL( const TDesC8& aURI, 
-                                            const TDesC8& aLUID, 
-                                            const CArrayFix<TSmlDmMappingInfo>& aPreviousURISegmentList, 
-                                            const TInt aResultsRef, 
-                                            const TInt aStatusRef  )
-	{
-	_DBG_FILE( "CNSmlDMSettingsAdapter::ChildURIListL(): begin" );
-	CBufBase *currentURISegmentList = CBufFlat::NewL( 128 );
-	CleanupStack::PushL( currentURISegmentList );
- 
-	if( aURI.Match( KDmAccMatch ) != KErrNotFound )
-		{
-		//	Check if Profile exists
-        TInt checkLUID = GetIntObject( aLUID );
-        if( FindProfileIdL( checkLUID ) )
-        	{
-            currentURISegmentList->InsertL( currentURISegmentList->Size(), KSegmDMAcc );
-			iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
-		    iCallBack->SetResultsL( aResultsRef, *currentURISegmentList, KNullDesC8 );
-        	}
-        else
-        	{
-			iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-        	}
-
-        CleanupStack::PopAndDestroy(  ); // currentURISegmentList
-        _DBG_FILE( "CNSmlDMSettingsAdapter::ChildURIListL(): end" );
-		return;
-		}
-    else if( aURI.Match( KDmAccMatch2 ) != KErrNotFound )
-        {
-        if( iSyncSessionOpen == EFalse )
-            {
-            iSyncSession.OpenL();
-            iSyncSessionOpen = ETrue;
-            }
-        RArray<TSmlProfileId> profileIdArray;
-        CleanupClosePushL( profileIdArray );
-        TSmlUsageType usageType = ESmlDevMan;
-        iSyncSession.ListProfilesL( profileIdArray, usageType );
-	    
-        for( TInt p = 0; p < profileIdArray.Count(); p++ )
-		    {
-		    TBool notInList = ETrue;
-		    TInt newline = 0;
-            TInt ddId = profileIdArray[p] - KMaxDataSyncID;
-            
-		    while( notInList && newline < aPreviousURISegmentList.Count() )
-			    {
-				TInt ppId = GetIntObject( aPreviousURISegmentList.At(newline).iURISegLUID );
-				if( ppId == ddId ) 
-				    {
-					notInList = EFalse;
-					break;
-					}
-				newline++;
-			    }
-		    if( notInList )
-			    {
-			    _LIT8( Kprev, "DMId" );
-			    TBuf8<7> addNAME(Kprev); // DMIdnnn , nnn = profileid
-                TInt fixedProfId = profileIdArray[p] - KMaxDataSyncID; //fit to 3 decimal
-			    addNAME.AppendNumFixedWidth( fixedProfId, EDecimal, 3 ); 
-
-    			currentURISegmentList->InsertL( currentURISegmentList->Size(), addNAME );
-	    		currentURISegmentList->InsertL( currentURISegmentList->Size(), KSmlDmSlash );
-		    	DBG_ARGS8( _S8("notInList: Id = %d Name %S"), p, &addNAME );
-
-			    // KNSmlDMStart includes start text for URISeg
-			    TBuf8<20> addURI; // SyncML/DMAcc/DMIdnnn , nnn = profileid
-			    addURI.Append( KNSmlDMStart );
-			    addURI.AppendNumFixedWidth( fixedProfId, EDecimal, 3 ); 
-
-    			TBuf8<3> addLUID;
-	    		addLUID.Num( fixedProfId );
-
-		    	// Also added to mapping
-			    iCallBack->SetMappingL( addURI, addLUID );
-    			}
-	    	else
-		    	{ // Add those in PreviousList which are on database
-			    currentURISegmentList->InsertL( currentURISegmentList->Size(),
-                                                aPreviousURISegmentList.At(newline).iURISeg );
-    			currentURISegmentList->InsertL( currentURISegmentList->Size(), KSmlDmSlash );
-//	    		DBG_ARGS8( _S8("InList: Id = %d Name %S"), newline, 
-//                          aPreviousURISegmentList.At(newline).iURISeg );
-		    	}
-		    }
-        CleanupStack::PopAndDestroy( 1 );//profileIdArray
-        }
-    else
-        {
-        iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EInvalidObject );
-        CleanupStack::PopAndDestroy( 1 ); // currentURISegmentList
-        return;
-        }
-
-	iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
-	iCallBack->SetResultsL( aResultsRef, *currentURISegmentList, KNullDesC8 );
-	CleanupStack::PopAndDestroy(); // currentURISegmentList
-	_DBG_FILE( "CNSmlDMSettingsAdapter::ChildURIListL(): end" );
-	return;
-	}
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter::AddNodeObjectL
-//  Adds new DM-settings profile to database
-// -----------------------------------------------------------------------------
-void CNSmlDMSettingsAdapter::AddNodeObjectL( const TDesC8& aURI, 
-                                            const TDesC8& aParentLUID, 
-                                            const TInt aStatusRef )
-	{
-	_DBG_FILE( "CNSmlDMSettingsAdapter::AddNodeObjectL(): begin" );
-
-	if( aParentLUID.Length() > 0 )
-		{
-		iParentLUID = GetIntObject( aParentLUID );
-        if( FindProfileIdL( iParentLUID ) != EFalse )// iProfile != NULL)
-		    {
-		    _DBG_FILE( "CNSmlDMSettingsAdapter::AddNodeObjectL(): EAlreadyExists end" );
-		    iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EAlreadyExists );
-		    return;
-		    }
-		}
-	AddNodeBufferL (aURI, aStatusRef);
-	_DBG_FILE( "CNSmlDMSettingsAdapter::AddNodeObjectL(): end" );
-	return;
-	}
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter::UpdateLeafObjectL()
-// -----------------------------------------------------------------------------
-void CNSmlDMSettingsAdapter::UpdateLeafObjectL( const TDesC8&, const TDesC8&, 
-                                                RWriteStream*&, const TDesC8&, 
-                                                const TInt )
-	{
-	//Not supported because data streaming is not supported by this adapter.
-	}
-	
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter::FetchLeafObjectSizeL
-//  This function fetches leaf object and returns its size.
-// -----------------------------------------------------------------------------
-void CNSmlDMSettingsAdapter::FetchLeafObjectSizeL( const TDesC8& aURI, 
-                                                    const TDesC8& aLUID, 
-                                                    const TDesC8& aType, 
-                                                    const TInt aResultsRef, 
-                                                    const TInt aStatusRef )
-	{
-	_DBG_FILE( "CNSmlDMSettingsAdapter::FetchLeafObjectSizeL() : begin" );
-    DBG_ARGS( _S16("DM:Fetch aURI    - %S - %S"), &aURI, &aLUID );
-	
-	iLUID = IntLUID( aLUID );
-	if ( iLUID >= 0 )
-		{
-		if( FindProfileIdL( iLUID ) == EFalse )
-			{
-			_DBG_FILE( "CNSmlDMSettingsAdapter::FetchLeafObjectL(): ENotFound end" );
-			iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-			return;
-			}
-		}
-	else
-		{
-		_DBG_FILE( "CNSmlDMSettingsAdapter::FetchLeafObjectL(): ENotFound end" );
-		iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-		return;
-		}
-
-    //	Check which field going to be handled
-	SetField( aURI );
-
-    //	Check if valid field
-	if( !AcceptDMField() )
-		{
-		_DBG_FILE( "CNSmlDMSettingsAdapter::FetchLeafObjectL(): EInvalidObject end" );
-		iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EInvalidObject );
-		return;
-		}
-
-    //	Get Database field type 
-	TInt fType = GetDMFieldType();
-	if ( fType == EWrong )
-		{
-		_DBG_FILE( "CNSmlDMSettingsAdapter::FetchLeafObjectL(): EError end" );
-		iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-		return;
-		}
-
-    CBufBase *lObject = CBufFlat::NewL( 128 );
-	CleanupStack::PushL( lObject );
-    lObject->Reset();
-
-	if ( fType == EStr || fType == EInt || fType == EBin )
-		{ 
-        TInt rValue = GetObjectL( iLUID, GetDMField(), *lObject );
-		if( lObject->Size() == 0 || rValue != KErrNone )
-		    {
-            if( rValue == KErrNotFound )
-                {
-                iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-                }
-            else if( rValue == KErrInUse )
-                {
-                iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EObjectInUse );
-                }
-            else if( rValue == KErrNoMemory )
-                {
-                iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENoMemory );
-                }
-            else
-                {
-                iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-                }
-		    }
-		}
-	else 
-		{
-		CleanupStack::PopAndDestroy();//lObject 
-		_DBG_FILE( "CNSmlDMSettingsAdapter::FetchLeafObjectL(): ENotFound end" );
-		iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-		return;
-		}
-    TInt objSizeInBytes = lObject->Size();
-	TBuf8<16> stringObjSizeInBytes;
-	stringObjSizeInBytes.Num( objSizeInBytes );
-
-	lObject->Reset();
-	lObject->InsertL( 0, stringObjSizeInBytes );
-    iCallBack->SetResultsL( aResultsRef, *lObject, aType );
-	iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EOk);
-
-	CleanupStack::PopAndDestroy( 1 ); //lObject
-	_DBG_FILE( "CNSmlDMSettingsAdapter::FetchLeafObjectSizeL(): end" );
-	return;
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSettingsAdapter::ExecuteCommandL()
-// -----------------------------------------------------------------------------
-void CNSmlDMSettingsAdapter::ExecuteCommandL( const TDesC8&, const TDesC8&,
-                                                const TDesC8&, const TDesC8&, 
-                                                const TInt )
-	{
-	//Not supported. Command execution via DM settings adapter not possible.	
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSettingsAdapter::ExecuteCommandL()
-// -----------------------------------------------------------------------------
-void CNSmlDMSettingsAdapter::ExecuteCommandL( const TDesC8&, const TDesC8&, 
-                                                RWriteStream*&, const TDesC8&, 
-                                                const TInt )
-	{
-	//Not supported. Command execution via DM settings adapter not possible.
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSettingsAdapter::CopyCommandL()
-// -----------------------------------------------------------------------------
-void CNSmlDMSettingsAdapter::CopyCommandL( const TDesC8&, const TDesC8&, 
-                                            const TDesC8&, const TDesC8&, 
-                                            const TDesC8&, TInt )
-	{
-	//Not supported.
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSettingsAdapter::StartAtomicL()
-// -----------------------------------------------------------------------------
-void CNSmlDMSettingsAdapter::StartAtomicL()
-	{
-	//Not supported. Handling Atomic command cycles not supported by the adapter.
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSettingsAdapter::CommitAtomicL()
-// -----------------------------------------------------------------------------
-void CNSmlDMSettingsAdapter::CommitAtomicL()
-	{
-	//Not supported. Handling Atomic command cycles not supported by the adapter.
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSettingsAdapter::RollbackAtomicL()
-// -----------------------------------------------------------------------------
-void CNSmlDMSettingsAdapter::RollbackAtomicL()
-	{
-	//Not supported. Handling Atomic command cycles not supported by the adapter.
-	}
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter::StreamingSupport()
-//  Indicates if streaming is supported.
-// -----------------------------------------------------------------------------
-TBool CNSmlDMSettingsAdapter::StreamingSupport( TInt& /*aItemSize*/ )
-	{
-	return EFalse;
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSettingsAdapter::StreamCommittedL()
-// -----------------------------------------------------------------------------
-void CNSmlDMSettingsAdapter::StreamCommittedL()
-	{
-	//Not supported. Streaming not supported by the DM settings adapter.
-	}
-// -----------------------------------------------------------------------------
-// CNSmlDMSettingsAdapter::CompleteOutstandingCmdsL()
-// If buffering used, commands must be executed before returning this function.
-// -----------------------------------------------------------------------------
-void CNSmlDMSettingsAdapter::CompleteOutstandingCmdsL()
-	{
-	// Check if Buffered
-	for (int val=0; val<iBuffer->Count ();val++)
-		{
-		if ( !iBuffer->At(val).iExecuted)
-			{
-			TInt count = iBuffer->At(val).iLeafBuf->Count ()-1;
-			iExecutionIndex = val;
-			iComplete = ETrue;
-			ExecuteBufferL ();
-			}
-		}
-	// if port was updated, set it
-	for (TInt i = 0;i<iPortBuffer.Count(); i++)
-	    {
-        TInt err = SetProfileConnectionPortNrL( iPortBuffer[i].iPortBufLUID, iPortBuffer[i].iPortBuf );
-        
-        // set status
-        if ( err != KErrNone )
-            {
-            iCallBack->SetStatusL( iPortBuffer[i].iPortBufStatusRef, CSmlDmAdapter::EError );
-            }
-        else
-            {
-            iCallBack->SetStatusL( iPortBuffer[i].iPortBufStatusRef, CSmlDmAdapter::EOk );
-            }
-	    
-	    }
-    iPortBuffer.Reset();	
-	iComplete = EFalse;
-	}
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter::AcceptDMField
-//  This function checks if field to be handled is valid.
-// -----------------------------------------------------------------------------
-TBool CNSmlDMSettingsAdapter::AcceptDMField()
-	{
-	_DBG_FILE("CNSmlDMSettingsAdapter::AcceptDMField(): begin");
-
-	if ( iField->Compare( KNSmlDdfAddrType ) == 0 )
-		{
-		return ETrue;
-		}
-	else if ( iField->Compare( KNSmlDdfAddr ) == 0 )
-		{
-		return ETrue;
-		}
-	else if ( iField->Compare( KNSmlDdfPortNbr ) == 0 )
-		{
-		return ETrue;
-		}
-	else if ( iField->Compare( KNSmlDdfAuthScheme ) == 0 )
-		{
-		return ETrue;
-		}
-	else if ( iField->Compare( KNSmlDdfServerId ) == 0 )
-		{
-		return ETrue;
-		}
-	else if ( iField->Compare( KNSmlDdfServerPW ) == 0 )
-		{
-		return ETrue;
-		}
-	else if ( iField->Compare( KNSmlDdfServerNonce ) == 0 )
-		{
-		return ETrue;
-		}
-	else if ( iField->Compare( KNSmlDdfClientUserName ) == 0 )
-		{
-		return ETrue;
-		}
-	else if ( iField->Compare( KNSmlDdfClientPW ) == 0 )
-		{
-		return ETrue;
-		}
-	else if ( iField->Compare( KNSmlDdfClientNonce ) == 0 )
-		{
-		return ETrue;
-		}
-	else if ( iField->Compare( KNSmlDdfName ) == 0 )
-		{
-		return ETrue;
-		}
-	else if ( iField->Compare( KNSmlDdfConRef ) == 0 )
-		{
-		return ETrue;
-		}
-	else if ( iField->Compare( KNSmlDdfId ) == 0 )
-		{
-		return ETrue;
-		}
-
-	_DBG_FILE( "CNSmlDMSettingsAdapter::AcceptDMField(): end" );
-	return EFalse; // Not a valid Type
-	}
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter::GetDMField
-//	Matches URI fieldname to DM-database. 
-// -----------------------------------------------------------------------------
-TNSmlDMProfileData CNSmlDMSettingsAdapter::GetDMField() const
-	{
-
-	if ( iField->Compare( KNSmlDdfAddrType ) == 0 )
-		{
-		return EProfileMediumType;
-		}
-	else if ( iField->Compare( KNSmlDdfAddr ) == 0 )
-		{
-		return EProfileURL;
-		}
-	else if ( iField->Compare( KNSmlDdfPortNbr ) == 0 )
-		{
-		return EProfilePort;
-		}
-	else if ( iField->Compare( KNSmlDdfAuthScheme ) == 0 )
-		{
-		return EAuthenticationRequired;
-		}
-	else if ( iField->Compare( KNSmlDdfServerId ) == 0 )
-		{
-		return EServerId;
-		}
-	else if ( iField->Compare( KNSmlDdfServerPW ) == 0 )
-		{
-		return ESharedSecret;
-		}
-	else if ( iField->Compare( KNSmlDdfServerNonce ) == 0 )
-		{
-		return EServerNonce;
-		}
-	else if ( iField->Compare( KNSmlDdfClientUserName ) == 0 )
-		{
-		return EProfileDMServerUsername;
-		}
-	else if ( iField->Compare( KNSmlDdfClientPW ) == 0 )
-		{
-		return EProfileDMServerPassword;
-		}
-	else if ( iField->Compare( KNSmlDdfClientNonce ) == 0 )
-		{
-		return EClientNonce;
-		}
-	else if ( iField->Compare( KNSmlDdfName ) == 0 )
-		{
-		return EProfileName;
-		}
-	else if ( iField->Compare( KNSmlDdfId ) == 0 )
-		{
-		return EProfileId;
-		}
-	else if ( iField->Compare( KNSmlDdfConRef ) == 0 )
-		{
-		return EProfileIAPId;
-		}
-	
-	_DBG_FILE( "CNSmlDMSettingsAdapter::GetDMField(): Error" );
-	return ESyncAccepted;
-	}
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter::GetDMFieldType
-//	Gets field data type. 
-// -----------------------------------------------------------------------------
-TNSmlDMFieldType CNSmlDMSettingsAdapter::GetDMFieldType() const
-	{
-	if ( iField->Compare( KNSmlDdfAddrType ) == 0 )
-		{
-		return EInt;
-		}
-	else if ( iField->Compare( KNSmlDdfAddr ) == 0 )
-		{
-		return EStr;
-		}
-	else if ( iField->Compare( KNSmlDdfPortNbr ) == 0 )
-		{
-		return EInt;
-		}
-	else if ( iField->Compare( KNSmlDdfAuthScheme ) == 0 )
-		{
-		return EInt;
-		}
-	else if ( iField->Compare( KNSmlDdfServerId ) == 0 )
-		{
-		return EStr;
-		}
-	else if ( iField->Compare( KNSmlDdfServerPW ) == 0 )
-		{
-		return EStr;
-		}
-	else if ( iField->Compare( KNSmlDdfServerNonce ) == 0 )
-		{
-		return EBin;
-		}
-	else if ( iField->Compare( KNSmlDdfClientUserName ) == 0 )
-		{
-		return EStr;
-		}
-	else if ( iField->Compare( KNSmlDdfClientPW ) == 0 )
-		{
-		return EStr;
-		}
-	else if (iField->Compare(KNSmlDdfClientNonce) == 0)
-		{
-		return EBin;
-		}
-	else if ( iField->Compare( KNSmlDdfName ) == 0 )
-		{
-		return EStr;
-		}
-	else if ( iField->Compare( KNSmlDdfConRef ) == 0 )
-		{
-		return EInt;
-		}
-	else if ( iField->Compare( KNSmlDdfId ) == 0 )
-		{
-		return EInt;
-		}
-
-	_DBG_FILE( "CNSmlDMSettingsAdapter::GetDMFieldType(): Error" );
-	return EWrong;
-	}
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter::IntLUID
-//	Returns integer value for a profile LUID.
-// -----------------------------------------------------------------------------
-TInt CNSmlDMSettingsAdapter::IntLUID( const TDesC8& aLUID )
-	{
-	TLex8 lLex( aLUID );
-
-	if( lLex.Val( iLUID ) == KErrNone )
-	    {
-	    return iLUID;
-	    }
-	else
-        {
-        return -1;
-        }
-	}
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter::GetIntObject
-//	Returns integer value for a aObject.
-// -----------------------------------------------------------------------------
-TInt CNSmlDMSettingsAdapter::GetIntObject( const TDesC8& aObject )
-	{
-	TLex8 lLex( aObject );
-
-	TInt value = 0;
-
-	if( lLex.Val( value ) != KErrNone )
-	    {
-	    return KErrNotFound;
-	    }
-	else
-        {
-        return value;
-        }
-	}
-
-// -----------------------------------------------------------------------------
-//	CNSmlDMSettingsAdapter::GetIntObject16()
-//	Returns Integer Value for a 16 bit data object.
-// -----------------------------------------------------------------------------
-TInt CNSmlDMSettingsAdapter::GetIntObject16( const TDesC& aObject )
-	{
-	TLex16 lLex( aObject );
-
-	TInt value = 0;
-
-	if( lLex.Val( value ) == KErrNone )
-	    {
-	    return value;
-	    }
-	else
-        {
-        return value;
-        }
-	}
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter::SetIntObjectLC
-//	Converts integer to HBufC8 type buffer and returns reference to it.
-// -----------------------------------------------------------------------------
-TDesC8& CNSmlDMSettingsAdapter::SetIntObjectLC( const TInt& aObject )
-	{
-	HBufC8* buf = HBufC8::NewLC( 8 );
-	TPtr8 ptrBuf = buf->Des();
-
-	ptrBuf.Num( aObject );
-    return *buf;
-	}
-
-// -----------------------------------------------------------------------------
-//	CNSmlDMSettingsAdapter::NotValidStrLenght
-//	Checks if data length is valid.
-// -----------------------------------------------------------------------------
-TBool CNSmlDMSettingsAdapter::NotValidStrLenght( const TNSmlDMProfileData& aProfileItem, 
-                                                const TDesC8& aSource )
-	{
-	TInt lLen = aSource.Length();
-	TBool lBool = EFalse;
-
-	switch ( aProfileItem )
-		{
-		case ( EProfileName ) :
-			{
-			if( lLen > KNSmlMaxProfileNameLength )
-			    {
-			    lBool = ETrue;	
-			    }
-			}
-		break;
-		
-		case ( EProfileDMServerUsername ) :
-			{
-			if( lLen > KNSmlMaxUsernameLength )
-			    {
-			    lBool = ETrue;
-			    }
-			}
-		break;
-
-		case ( EProfileDMServerPassword ) :
-			{
-			if( lLen > KNSmlMaxPasswordLength )
-			    {
-			    lBool = ETrue;	
-			    }
-			}
-		break;
-
-		case ( ESharedSecret ) :
-			{
-			if( lLen > KNSmlDmSharedSecretMaxLength )
-			    {
-			    lBool = ETrue;	
-			    }
-			}
-		break;
-
-		case ( EProfileURL ) :
-			{
-			if( lLen > KNSmlMaxURLLength )
-			    {
-			    lBool = ETrue;	
-			    }
-			}
-		break;
-
-		case ( EServerId ) :
-			{
-			if( lLen > KNSmlDmServerIdMaxLength )
-			    {
-			    lBool = ETrue;	
-			    }
-			}
-		break;
-
-		case ( EProfileIAPId ) :
-			{
-			if( lLen > KNSmlMaxURLLength )
-			    {
-			    lBool = ETrue;	
-			    }
-			}
-		break;
-
-		case ( EAuthenticationRequired ) :
-			{
-			if( lLen > 20 ) 
-			    {
-			    lBool = ETrue;	
-			    }
-			}
-		break;
-
-		case ( EProfileId ) :
-		case ( EProfilePort ) :
-		case ( EProfileMediumType ) :
-			{
-			if( lLen > 8 )
-			    {
-			    lBool = ETrue;	
-			    }
-			}
-		break;
-		
-        case ( EServerNonce ) :
-	    case ( EClientNonce ) :
-	        {
-            lBool = EFalse;
-	        }
-        break;
-
-		default:
-			{
-			lBool = ETrue;
-			}
-		}
-
-	return lBool;
-	}
-
-// -----------------------------------------------------------------------------
-//	CNSmlDMSettingsAdapter::SetField
-//	Last element of the URI (after last '/') is returned.
-// -----------------------------------------------------------------------------
-TInt CNSmlDMSettingsAdapter::SetField( const TDesC8& aSource )
-	{
-	if ( aSource.LocateReverse( KNSmlDMUriSeparator ) == KErrNotFound )
-	    {
-	    iField->Des().Format( aSource );
-	    }
-	else
-        {
-        iField->Des().Format( aSource.Mid( aSource.LocateReverse( KNSmlDMUriSeparator ) + 1 ) );
-        }
-
-    return KErrNone;
-	}
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter::ConvertTo8LC
-//	Converts string value to 8-bit and returns reference.
-// -----------------------------------------------------------------------------
-TDesC8& CNSmlDMSettingsAdapter::ConvertTo8LC( const TDesC& aSource )
-	{
-	HBufC8* buf = HBufC8::NewLC( aSource.Length() * 2 );
-	TPtr8 bufPtr = buf->Des();
-	CnvUtfConverter::ConvertFromUnicodeToUtf8( bufPtr, aSource );
-
-    return *buf;
-	}
-
-// -----------------------------------------------------------------------------
-//	CNSmlDMSettingsAdapter::ConvertTo16LC
-//	Converts string value to 16-bit and returns reference.
-// -----------------------------------------------------------------------------
-TDesC16& CNSmlDMSettingsAdapter::ConvertTo16LC( const TDesC8& aSource)
-	{
-	HBufC16* buf16 = HBufC16::NewLC( aSource.Length() );
-	TPtr16 bufPtr16 = buf16->Des();
-
-	CnvUtfConverter::ConvertToUnicodeFromUtf8( bufPtr16, aSource );
-
-    return *buf16; 
-	}
-
-// -------------------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter::GetConRefL
-//	Gets the URI for given aObject (IAP ID).
-// -------------------------------------------------------------------------------------
-TInt CNSmlDMSettingsAdapter::GetConRefL( CBufBase& aObject )
-	{
-	_DBG_FILE( "CNSmlDMSettingsAdapter::GetConRefL() : begin" );
-	TInt profIAPid = -1;
-    TInt apIdResponse = GetProfileIAPIdL( profIAPid );
-    if( profIAPid < 0 )
-    {
-    	return KErrNone;
-    }
-    if( apIdResponse != KErrNone )
-    {
-    	return KErrNotFound;
-    }
-    CNSmlDMIAPMatcher* apmatch = CNSmlDMIAPMatcher::NewL( iCallBack );
-    CleanupStack::PushL( apmatch );
-    HBufC8* uri8 = apmatch->URIFromIAPIdL( profIAPid );
-    if( uri8 )
-        {
-        CleanupStack::PushL( uri8 );
-        aObject.InsertL( aObject.Size(), uri8->Des() );
-        CleanupStack::PopAndDestroy(); // uri8
-        }
-    else
-        {
-        CleanupStack::PopAndDestroy(); // apMatch
-        return KErrGeneral;    
-        }
-    CleanupStack::PopAndDestroy(); // iapMatch
-	_DBG_FILE( "CNSmlDSSettingsAdapter::GetToNAPIDL() : end" );
-	return KErrNone;
-	}
-
-// -------------------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter::SetConRefL()
-//	Set the profile IAP Id value according to given URI.
-// -------------------------------------------------------------------------------------
-TInt CNSmlDMSettingsAdapter::SetConRefL( const TInt aLUID, const TDesC8& aObject )
-	{
-    _DBG_FILE( "CNSmlDMSettingsAdapter::SetConRefL() : begin" );
-    CNSmlDMIAPMatcher* apmatch = CNSmlDMIAPMatcher::NewL( iCallBack );
-    CleanupStack::PushL( apmatch );
-    TInt lIAPid = apmatch->IAPIdFromURIL( aObject ); 
-    CleanupStack::PopAndDestroy(); // iapmatch
-    if(aObject.Length() >0 && lIAPid == KErrNotFound) 
-    {
-    	return KErrGeneral;
-    }
-    TInt apIdResponse = SetProfileConnectionPropertyL( aLUID, lIAPid );    
-    _DBG_FILE( "CNSmlDMSettingsAdapter::SetConRefL() : end" );
-	return apIdResponse;
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter::ParseUri
-//  Resolves portnbr (separated with ':') as integer from Uri. 
-// ------------------------------------------------------------------------------------------------
-TInt CNSmlDMSettingsAdapter::ParseUri( const TDesC8& aRealURI, TInt& aPort )
-	{
-	TInt offset=0;
-    //http:
-	if( aRealURI.Find( KNSmlDMSettingsHTTP )==0 )//http:
-		{
-		offset = KNSmlDMSettingsHTTP().Length();
-		}
-	else if( aRealURI.Find( KNSmlDMSettingsHTTPS )==0 )//https:
-		{
-		offset = KNSmlDMSettingsHTTPS().Length();
-		}
-
-	TBool portFound=EFalse;
-    ////123.234.345.456:80/syncml
-	for( TInt i = offset; i < aRealURI.Length(); i++ )
-		{
-		if( aRealURI[i] == KNSmlDMColon )// ':'
-			{
-			portFound = ETrue;
-			offset=i;
-			}
-		if( portFound && aRealURI[i] == KNSmlDMUriSeparator ) // '/'
-			{
-			aPort = GetIntObject( aRealURI.Mid( (offset + 1), (i - offset-1) ) );
-			}
-		else if ( portFound && i == aRealURI.Length() - 1 ) // last char
-		    {
-		    // port is from offset to the end
-		    aPort = GetIntObject( aRealURI.Right( aRealURI.Length() - offset - 1 ) );
-		    }
-		}
-	
-	if( aPort != 0 )
-		{
-		return KErrNone;
-		}
-	else
-		{
-		return KErrNotFound;
-		}
-	}
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter::OpenSyncSessionAndDSProfileL
-//  The function opens the server session and DM profile.
-// -----------------------------------------------------------------------------
-TInt CNSmlDMSettingsAdapter::OpenSyncSessionAndProfileL( const TInt aIntLUID, 
-                                                        TSmlOpenMode aMode )
-    {
-    _DBG_FILE( "CNSmlDMSettingsAdapter::OpenSyncSessionAndProfileL(): begin" );
-    if( iSyncSessionOpen == EFalse )
-        {
-        iSyncSession.OpenL();
-        iSyncSessionOpen = ETrue;
-        }
-    TInt trueLuid = aIntLUID + KMaxDataSyncID;
-    TInt rValue(KErrNone);
-    
-    if(trueLuid!=iCurrentProfile)
-	    {
-	    RArray<TSmlProfileId> profileIdArray;
-	    CleanupClosePushL( profileIdArray );
-	    TSmlUsageType usageType = ESmlDevMan;
-	    iSyncSession.ListProfilesL( profileIdArray, usageType );
-	    TInt index = profileIdArray.Find( trueLuid );
-	    CleanupStack::PopAndDestroy(); //profileIdArray
-	    if( index == KErrNotFound )
-	        {
-	        return KErrNotFound;
-	        }
-	    TRAP( rValue, iProfile.OpenL( iSyncSession, trueLuid, aMode ) );
-	    iCurrentProfile = trueLuid;
-	    if( rValue != KErrNone )
-	        {
-	        iCurrentProfile = 0;
-	        iProfile.Close();
-			iSyncSession.Close();
-	        iSyncSessionOpen = EFalse;
-	        }
-    	}
-    _DBG_FILE( "CNSmlDMSettingsAdapter::OpenSyncSessionAndProfileL(): end" );
-    return rValue;
-    }
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter::FindProfileId
-//  Function checks if profile can be found.
-// -----------------------------------------------------------------------------
-TBool CNSmlDMSettingsAdapter::FindProfileIdL( const TInt aIntLUID )
-	{
-    _DBG_FILE( "CNSmlDMSettingsAdapter::FindProfileIdL(): begin" );
-	if( iSyncSessionOpen == EFalse )
-	    {
-        iSyncSession.OpenL();
-        iSyncSessionOpen = ETrue;
-	    }
-    
-	RArray <TSmlProfileId> profileList;
-    CleanupClosePushL( profileList );
-	TSmlUsageType usageType = ESmlDevMan;		
-	iSyncSession.ListProfilesL( profileList, usageType );
-	if( profileList.Count() == 0 ) 
-	    {
-        CleanupStack::PopAndDestroy(); //profileList
-        return EFalse;
-	    }		
-    TInt item = profileList.Find( aIntLUID + KMaxDataSyncID );
-    CleanupStack::PopAndDestroy(); //profileList
-    if( item != KErrNotFound )
-		{
-		_DBG_FILE( "CNSmlDMSettingsAdapter::FindProfileIdL(): end" );
-        return ETrue;
-		}
-    _DBG_FILE( "CNSmlDMSettingsAdapter::FindProfileIdL(): end" );
-	return EFalse;
-	}
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter::CreateNewProfileL
-//  The function creates new DM profile via client API.
-// -----------------------------------------------------------------------------
-TInt CNSmlDMSettingsAdapter::CreateNewProfileL( TInt& aPID )
-	{
-    _DBG_FILE("CNSmlDMSettingsAdapter::CreateNewProfileL(): begin");
-	if( iSyncSessionOpen == EFalse )
-	    {
-        iSyncSession.OpenL();
-        iSyncSessionOpen = ETrue;
-	    }
-    TRAPD( value1, iProfile.CreateL( iSyncSession ) );
-    if( value1 != KErrNone )
-        {
-   	    iCurrentProfile = 0;
-        iProfile.Close();
-        iSyncSession.Close();
-        iSyncSessionOpen = EFalse;
-        return value1;
-        }
-    
-    TRAPD( value2, iProfile.UpdateL() );
-    if( value2 != KErrNone )
-        {
-   	    iCurrentProfile = 0;
-        iProfile.Close();
-        iSyncSession.Close();
-        iSyncSessionOpen = EFalse;
-        return value2;
-        }
-    
-    aPID = iProfile.Identifier();
-    iCurrentProfile = 0;
-    iProfile.Close();
-    _DBG_FILE( "CNSmlDMSettingsAdapter::CreateNewProfileL(): end" );
-    return KErrNone;
-	}
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter::SetProfileServerURIL()
-//  The function sets the server URL for a profile.
-// -----------------------------------------------------------------------------
-TInt CNSmlDMSettingsAdapter::SetProfileServerURIL( const TInt aPID, 
-                                                    const TDesC8& aObj )
-	{
-    _DBG_FILE( "CNSmlDMSettingsAdapter::SetProfileServerURIL(): begin" );
-	TInt retVal = KErrNone;
-    retVal = OpenSyncSessionAndProfileL( aPID, ESmlOpenReadWrite );
-    if( retVal != KErrNone )
-		{
-	    iCurrentProfile = 0;
-	    iProfile.Close();
-        return retVal;	
-		}
-	RArray<TSmlTransportId> transportIdArray;
-    CleanupClosePushL( transportIdArray );
-	iProfile.ListConnectionsL( transportIdArray );
-    if( transportIdArray.Count() == 0 )
-	    {
-        CleanupStack::PopAndDestroy();//transportIdArray
-	    iCurrentProfile = 0;
-        iProfile.Close();
-        return KErrGeneral;
-	    }
-	    
-	TInt newPort(0);
-    
-    RSyncMLConnection conn;
-    CleanupClosePushL( conn );
-    conn.OpenL( iProfile, transportIdArray[0] );
-
-    if(ParseUri(aObj,newPort)==KErrNotFound)
-        {
-        TInt port = 0;
-        ParseUri(conn.ServerURI(),port);
-        if(port==0)
-        	{
-        	port = 80;
-        	}
-           	
-       	TBuf8<5> buf;
-    	buf.Num( port );
-        	
-        TInt totalSize = aObj.Length() + buf.Length() + 1;
-        HBufC8* newServerURI = HBufC8::NewLC( totalSize );
-        SetPortNrToAddrStr( aObj, newServerURI, buf );
-        conn.SetServerURIL( *newServerURI );
-        conn.UpdateL();
-    	CleanupStack::PopAndDestroy( newServerURI ); 
-        }
-    else
-        {
-        conn.SetServerURIL( aObj );
-        conn.UpdateL();
-        }
-	
-
-	iProfile.UpdateL();
-	
-	CleanupStack::PopAndDestroy( 2 ); //transportIdArray, conn
-    iCurrentProfile = 0;
-	iProfile.Close();
-    _DBG_FILE( "CNSmlDMSettingsAdapter::SetProfileServerURIL(): end" );
-	return KErrNone;
-	}
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter::SetProfileDisplayNameL()
-//  The function sets the display name for a profile.
-// -----------------------------------------------------------------------------
-TInt CNSmlDMSettingsAdapter::SetProfileDisplayNameL( const TInt aPID, 
-                                                        const TDesC8& aObj )
-	{
-    _DBG_FILE( "CNSmlDMSettingsAdapter::SetProfileDisplayNameL(): begin" );
-	TInt retVal = KErrNone;
-    retVal = OpenSyncSessionAndProfileL( aPID, ESmlOpenReadWrite );
-    if( retVal != KErrNone )
-		{
-	    iCurrentProfile = 0;
-		iProfile.Close();
-        return retVal;	
-		}
-    iProfile.SetDisplayNameL( ConvertTo16LC( aObj ) );
-    iProfile.UpdateL();
-	CleanupStack::PopAndDestroy(); //ConvertTo16LC
-    iCurrentProfile = 0;
-    iProfile.Close();
-    _DBG_FILE( "CNSmlDMSettingsAdapter::SetProfileDisplayNameL(): end" );
-	return KErrNone;
-	}
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter::SetProfileUserNameL
-//  The function sets the profile user name.
-// -----------------------------------------------------------------------------
-TInt CNSmlDMSettingsAdapter::SetProfileUserNameL( const TInt aPID, 
-                                                    const TDesC8& aObj )
-	{
-    _DBG_FILE( "CNSmlDMSettingsAdapter::SetProfileUserNameL(): begin" );
-	TInt retVal = OpenSyncSessionAndProfileL( aPID, ESmlOpenReadWrite );
-    if( retVal != KErrNone )
-		{
-	    iCurrentProfile = 0;
-		iProfile.Close();
-        return KErrGeneral;	
-		}
-    iProfile.SetUserNameL( aObj );
-    iProfile.UpdateL();
-    iCurrentProfile = 0;
-    iProfile.Close();
-    _DBG_FILE( "CNSmlDMSettingsAdapter::SetProfileUserNameL(): end" );
-	return KErrNone;
-	}
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter::SetProfileProtocolVersionL
-//  The function sets the protocol version to be supported.
-// -----------------------------------------------------------------------------
-TInt CNSmlDMSettingsAdapter::SetProfileProtocolVersionL( const TInt aPID, 
-                                                            const TDesC8& )
-	{
-    _DBG_FILE( "CNSmlDMSettingsAdapter::SetProfileProtocolVersionL(): begin" );
-	TInt retVal = KErrNone;
-    retVal = OpenSyncSessionAndProfileL( aPID, ESmlOpenReadWrite );
-    if( retVal != KErrNone )
-		{
-	    iCurrentProfile = 0;
-		iProfile.Close();
-        return retVal;	
-		}
-	//The syncSession to Sync server is open.
-    TSmlProtocolVersion protocol = ESmlVersion1_2;
-    iProfile.SetProtocolVersionL( protocol );
-	TRAPD( iError, iProfile.UpdateL() );
-    iCurrentProfile = 0;
-    iProfile.Close();
-    _DBG_FILE( "CNSmlDMSettingsAdapter::SetProfileProtocolVersionL(): begin" );
-	return iError;
-	}
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter::SetProfileServerIdL
-//  The function sets the profile ServerId value.
-// -----------------------------------------------------------------------------
-TInt CNSmlDMSettingsAdapter::SetProfileServerIdL( const TInt aPID, 
-                                                    const TDesC8& aObj )
-	{
-    _DBG_FILE("CNSmlDMSettingsAdapter::SetProfileServerIdL(): begin");
-	TInt retVal = OpenSyncSessionAndProfileL( aPID, ESmlOpenReadWrite );
-    if( retVal != KErrNone )
-		{
-	    iCurrentProfile = 0;
-		iProfile.Close();
-        return KErrGeneral;	
-		}
-	iProfile.SetServerIdL( aObj );
-    TRAP(retVal,iProfile.UpdateL() );
-    iCurrentProfile = 0;
-    iProfile.Close();
-    _DBG_FILE( "CNSmlDMSettingsAdapter::SetProfileServerIdL(): end" );
-	return retVal;
-	}
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter::SetProfileServerPasswordL
-//  The function sets the profile server password.
-// -----------------------------------------------------------------------------
-TInt CNSmlDMSettingsAdapter::SetProfileServerPasswordL( const TInt aPID, 
-                                                        const TDesC8& aObj )
-	{
-    _DBG_FILE( "CNSmlDMSettingsAdapter::SetProfileServerPasswordL(): begin" );
-	TInt retVal = OpenSyncSessionAndProfileL( aPID, ESmlOpenReadWrite );
-    if( retVal != KErrNone )
-		{
-	    iCurrentProfile = 0;
-		iProfile.Close();
-        return KErrGeneral;
-		}
-	iProfile.SetServerPasswordL( aObj );
-    iProfile.UpdateL();
-    iCurrentProfile = 0;
-    iProfile.Close();
-    _DBG_FILE( "CNSmlDMSettingsAdapter::SetProfileServerPasswordL(): end" );
-	return KErrNone;
-	}
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter::SetProfilePasswordL
-//  The function sets the profile password.
-// -----------------------------------------------------------------------------
-TInt CNSmlDMSettingsAdapter::SetProfilePasswordL( const TInt aPID, 
-                                                    const TDesC8& aObj )
-	{
-    _DBG_FILE( "CNSmlDMSettingsAdapter::SetProfilePasswordL(): begin" );
-	TInt retVal = KErrNone;
-    retVal = OpenSyncSessionAndProfileL( aPID, ESmlOpenReadWrite );
-    if( retVal != KErrNone )
-		{
-	    iCurrentProfile = 0;
-		iProfile.Close();
-        return retVal;	
-		}
-	iProfile.SetPasswordL( aObj );
-    iProfile.UpdateL();
-    iCurrentProfile = 0;
-    iProfile.Close();
-    _DBG_FILE( "CNSmlDMSettingsAdapter::SetProfilePasswordL(): begin" );
-	return KErrNone;
-	}
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter::SetProfileConnectionPropertyL
-//  This function sets the profile IAP id.
-// -----------------------------------------------------------------------------
-TInt CNSmlDMSettingsAdapter::SetProfileConnectionPropertyL( const TInt aLUID, 
-                                                            const TInt aIAPid )
-	{
-    TInt retVal = OpenSyncSessionAndProfileL( aLUID, ESmlOpenReadWrite );
-    if( retVal != KErrNone )
-		{
-	    iCurrentProfile = 0;
-		iProfile.Close();
-        return retVal;	
-		}
-    RArray<TSmlTransportId> connIdArray;
-    CleanupClosePushL( connIdArray );
-    iProfile.ListConnectionsL( connIdArray );
-    if( connIdArray.Count() == 1 )
-        {
-        RSyncMLTransport transport;
-        CleanupClosePushL( transport );
-	    transport.OpenL( iSyncSession, connIdArray[0] );
-	    const CSyncMLTransportPropertiesArray& props = transport.Properties();
-	    TInt index = props.Find( KNSmlIAPId );
-        if( index > 0 )
-            {
-            RSyncMLConnection conn;
-            CleanupClosePushL( conn );
-	        conn.OpenL( iProfile, connIdArray[0] );
-            HBufC8* apIdBuffer = HBufC8::NewLC( 4 );
-	        TPtr8 ptrIapIdBuf = apIdBuffer->Des();
-        	ptrIapIdBuf.Num( aIAPid );
-            conn.SetPropertyL( KNSmlIAPId, ptrIapIdBuf );
-            conn.UpdateL();
-            CleanupStack::PopAndDestroy( 2 ); //conn, apIdBuffer
-            retVal = KErrNone;
-            }
-        else
-            {
-            retVal = KErrNotFound;
-            }
-        CleanupStack::PopAndDestroy( 1 ); //transport
-        }
-    else
-        {
-        retVal = KErrNotFound;
-        }
-    iCurrentProfile = 0;
-    iProfile.Close();
-    CleanupStack::PopAndDestroy(); //connIdArray
-    return retVal;
-	}
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter::DeleteProfileL
-//  The function deleted the profile from DM database.
-// -----------------------------------------------------------------------------
-TInt CNSmlDMSettingsAdapter::DeleteProfileL( const TInt aPID )
-	{
-    _DBG_FILE( "CNSmlDMSettingsAdapter::DeleteProfileL(): begin" );
-	if( iSyncSessionOpen == EFalse )
-	    {
-        iSyncSession.OpenL();
-        iSyncSessionOpen = ETrue;
-	    }
-    
-	RArray<TSmlProfileId> profileIdArray;
-    CleanupClosePushL( profileIdArray );
-	TSmlUsageType usageType = ESmlDevMan;
-	iSyncSession.ListProfilesL( profileIdArray, usageType );
-	TInt index = profileIdArray.Find( aPID );
-	if ( index == KErrNotFound )
-		{
-        //No match
-        CleanupStack::PopAndDestroy();//profileIdArray
-		return KErrNotFound;		
-		}
-    iSyncSession.DeleteProfileL( aPID );
-    iSyncSession.Close();
-    iSyncSessionOpen = EFalse;
-    CleanupStack::PopAndDestroy();//profileIdArray
-    _DBG_FILE( "CNSmlDMSettingsAdapter::DeleteProfileL(): end" );
-	return KErrNone;
-	}
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter::GetObjectL
-//  The function checks which leaf data to be fetched.
-// -----------------------------------------------------------------------------
-TInt CNSmlDMSettingsAdapter::GetObjectL( TInt aLUID, TNSmlDMProfileData aDMField, 
-                                            CBufBase& aObject )
-    {
-    TInt retVal = OpenSyncSessionAndProfileL( aLUID, ESmlOpenRead );
-    if( retVal != KErrNone )
-		{
-	    iCurrentProfile = 0;
-		iProfile.Close();
-        return retVal;	
-		}
-    switch ( aDMField )
-		{
-		case ( EProfileName ) :
-			{
-            GetProfileNameL( aObject );
-            }
-		break;
-		
-		case ( EProfileDMServerUsername ) :
-			{
-			GetProfileUserNameL( aObject );
-            }
-		break;
-
-		case ( EProfileURL ) :
-			{
-			GetProfileServerURLL( aObject );
-			TInt port(0);
-			if(ParseUri(aObject.Ptr(0),port)==KErrNone)
-			    {
-			    HBufC8* addr = aObject.Ptr(0).AllocLC();
-			    aObject.Reset();
-			    TInt portStart = addr->LocateReverse(KNSmlDMColon);
-			    aObject.InsertL(aObject.Size(),addr->Left(portStart));
-			    
-			    TInt portLen=addr->Mid(portStart).Locate(KNSmlDMUriSeparator);
-			    if(portLen!=KErrNotFound)
-			        {
-			        aObject.InsertL(aObject.Size(),addr->Mid(portStart+portLen));
-			        }
-			    	    			    
-			    CleanupStack::PopAndDestroy(); //addr
-			    }
-            }
-		break;
-
-		case ( EServerId ) :
-			{
-            GetServerIdL( aObject );
-            }
-		break;
-
-		case ( EProfileIAPId ) :
-			{
-		    retVal = GetConRefL( aObject );
-            }
-		break;
-
-		case ( EProfilePort ) :
-            {
-            GetProfileServerURLL( aObject );
-            if ( aObject.Size() == 0 )
-                {
-                retVal = KErrNone;
-                break;
-                }
-            GetProfilePortNumberL ( aObject );
-            }
-        break;
-        
-   		case ( EProfileDMServerPassword ) :
-			{
-			retVal = EInvalidObject;
-            }
-		break;
-
-		case ( ESharedSecret ) :
-            {//ServerPW
-            retVal = EInvalidObject;
-            }
-        break;
-        case ( EProfileId ) :
-        break;
-		case ( EProfileMediumType ) :
-            {
-            retVal = GetProfileConnectiontypeL( aObject );
-            }
-        break;
-
-        case ( EAuthenticationRequired ) :
-        case ( EServerNonce ) :
-        case ( EClientNonce ) :
-            {
-            retVal = GetDMAuthInfoL( aLUID, aDMField, aObject );
-            }
-        break;
-		
-		default:
-			{
-			User::Panic( KNSmlIndexOutOfBoundStr, KNSmlPanicIndexOutOfBound );
-			}
-		}
-    iCurrentProfile = 0;
-    iProfile.Close();
-    return retVal;
-    }
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter::SetProfileConnectionPortNrL()
-//  The function sets the profile port number.
-// -----------------------------------------------------------------------------
-TInt CNSmlDMSettingsAdapter::SetProfileConnectionPortNrL( const TInt aLUID, 
-                                                            const TDesC8& aPort )
-    {
-    _DBG_FILE( "CNSmlDMSettingsAdapter::SetProfileConnectionPortNrL(): begin" );
-    TInt retVal = KErrNone;
-    
-    if( iPortNbr )
-        {
-        delete iPortNbr;
-        iPortNbr = NULL;
-        }
-    iPortNbr = HBufC8::NewL( aPort.Length() );
-    TPtr8 newPortNbr = iPortNbr->Des();
-    newPortNbr.Append( aPort );
-        
-    retVal = OpenSyncSessionAndProfileL( aLUID, ESmlOpenReadWrite );
-    if( retVal != KErrNone )
-		{
-	    iCurrentProfile = 0;
-		iProfile.Close();
-        _DBG_FILE( "CNSmlDMSettingsAdapter::SetProfileConnectionPortNrL(): end" );
-        return retVal;	
-		}
-    
-    RArray<TSmlTransportId> transportIdArray;
-    CleanupClosePushL( transportIdArray );
-    iProfile.ListConnectionsL( transportIdArray );
-    
-    RSyncMLConnection conn;
-    CleanupClosePushL( conn );
-    conn.OpenL( iProfile, transportIdArray[0] );
-        
-    HBufC8* serverURI = conn.ServerURI().AllocLC();
-    if( serverURI->Length() == 0 )
-        {
-	    iCurrentProfile = 0;
-        iProfile.Close();
-        CleanupStack::PopAndDestroy( 3 ); //transportIdArray, conn, serverURI
-        _DBG_FILE( "CNSmlDMSettingsAdapter::SetProfileConnectionPortNrL(): end" );
-        return retVal;
-	    }
-    TInt totalSize = serverURI->Size() + newPortNbr.Size() + 1;
-    HBufC8* newServerURI = HBufC8::NewL( totalSize );
-    CleanupStack::PushL( newServerURI );
-    SetPortNrToAddrStr( *serverURI, newServerURI, newPortNbr );
-    
-    conn.SetServerURIL( *newServerURI );
-    conn.UpdateL();
-    
-    CleanupStack::PopAndDestroy( 4 ); //transportIdArray, conn, serverURI, newServerURI
-    iCurrentProfile = 0;
-	iProfile.Close();
-    _DBG_FILE( "CNSmlDMSettingsAdapter::SetProfileConnectionPortNrL(): end" );
-    return retVal;	
-    }
-
-// ------------------------------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter::SetPortNrToAddrStr
-//  Sets a portnbr (separated with ':') to profile server URI. 
-// ------------------------------------------------------------------------------------------------
-void CNSmlDMSettingsAdapter::SetPortNrToAddrStr( const TDesC8& aSrvURI, HBufC8* aNewURI, 
-                                                    const TDesC8& aPort )
-	{
-	TInt offset=0;
-    if( aSrvURI.Find( KNSmlDMSettingsHTTP ) == 0 )//http://
-		{
-		offset = KNSmlDMSettingsHTTP().Length();
-		}
-	else if( aSrvURI.Find( KNSmlDMSettingsHTTPS ) == 0 )//https://
-		{
-		offset = KNSmlDMSettingsHTTPS().Length();
-		}
-	TInt portStart = -1;
-    TInt separatorPos = aSrvURI.Length();
-    TInt i = 0;
-    for( i = offset; i < aSrvURI.Length(); i++ )
-		{
-		if( aSrvURI[i] == KNSmlDMColon )// ':'
-			{
-			portStart = i;
-			}
-		if( aSrvURI[i] == KNSmlDMUriSeparator )// '/'
-			{
-            separatorPos = i;
-			break;
-			}
-		}
-	
-    TPtr8 ptrNewSrvURI = aNewURI->Des();
-    if( portStart < 0 && separatorPos > 0 && iLeafType != EDMDelete )
-        {
-        ptrNewSrvURI.Append( aSrvURI.Left( separatorPos ) );//http://123.234.345.456
-        ptrNewSrvURI.Append( KNSmlDMColon );
-        ptrNewSrvURI.Append( aPort );
-        ptrNewSrvURI.Append( aSrvURI.Right( aSrvURI.Length() - separatorPos ) );
-        }
-    else if ( portStart > 0 && separatorPos > 0 && iLeafType != EDMDelete )
-        {
-        ptrNewSrvURI.Append( aSrvURI.Left( portStart + 1 ) );//123.234.345.456:
-        ptrNewSrvURI.Append( aPort );//123.234.345.456:xx(x)
-        ptrNewSrvURI.Append( aSrvURI.Right( aSrvURI.Length() - separatorPos ) );
-        }
-    else if ( portStart > 0 &&  iLeafType == EDMDelete ) //delete port number from uri
-        {
-        ptrNewSrvURI.Append( aSrvURI.Left( portStart ) );//123.234.345.456
-        ptrNewSrvURI.Append( aSrvURI.Right( aSrvURI.Length() - separatorPos ) );
-        }
-    else
-        {
-        ptrNewSrvURI.Append( aSrvURI );
-        }
-    return;
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter::SetDMFieldDataL
-//  Selects and Sets value to a field based on field id got from URI.
-// ------------------------------------------------------------------------------------------------
-TInt CNSmlDMSettingsAdapter::SetDMFieldDataL( const TInt aLUID, const TDesC8& aObject, 
-                                                const TNSmlDMProfileData aField )
-    {
-    TInt rValue = KErrGeneral;
-    switch ( aField )
-		{
-		case ( EProfileURL ) :
-			{
-		    rValue = SetProfileServerURIL( aLUID, aObject );    
-			}
-		break;
-		case ( EServerId ) :
-			{
-		    rValue = SetProfileServerIdL( aLUID, aObject );
-			}
-		break;
-        case ( ESharedSecret ) :
-			{
-		    rValue = SetProfileServerPasswordL( aLUID, aObject );
-			}
-		break;
-        case ( EProfileDMServerUsername ) :
-			{
-		    rValue = SetProfileUserNameL( aLUID, aObject );
-			}
-		break;
-        case ( EProfileDMServerPassword ) :
-			{
-		    rValue = SetProfilePasswordL( aLUID, aObject );
-			}
-		break;
-        case ( EProfileName ) :
-			{
-		    rValue = SetProfileDisplayNameL( aLUID, aObject );
-			}
-		break;
-        case ( EProfileIAPId ) :
-			{
-            rValue = SetConRefL( aLUID, aObject );
-		    }
-		break;
-        case ( EProfileId ) :
-			{
-		    }
-		break;
-        case ( EProfilePort ) :
-			{
-            if(aObject.Size()<=5)
-                {
-			TInt port = GetIntObject(aObject);
-	        if( port > KPortMinSize && port < KPortMaxSize )
-		         {
-	    			TPortBuffer element;
-	    			element.iPortBuf=aObject;
-	    			element.iPortBufLUID = aLUID;
-	    			iPortBuffer.Append(element);
-	    			rValue=KErrNone;
-                 }
-                else
-                {
-				if (port <= KPortMinSize )
-				   rValue = KErrUnderflow;
-                	else
-                   rValue=KErrOverflow;
-                }
-			}
-			else
-			{
-					rValue=KErrOverflow;
-			}
-			// save information of the port
-		    }
-		break;
-        case ( EProfileMediumType ) :
-			{
-            if ( iLeafType == EDMDelete )
-			    {
-                return KErrNone;
-			    }
-            iObject = GetIntObject( aObject );
-            if(iObject<0)
-                {
-                iObject = EHttp;
-                }
-            rValue = SetProfileAddrTypeL( aLUID, iObject );
-		    }
-		break;
-        case ( EAuthenticationRequired ) :
-        case ( EClientNonce ) :
-        case ( EServerNonce ) :
-		break;
-        
-        default:
-            rValue = KErrNotSupported;
-        }
-    return rValue;
-    }
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter::FillNodeInfoL
-//  The function fills the node or leaf information.
-// -----------------------------------------------------------------------------
-void CNSmlDMSettingsAdapter::FillNodeInfoL( MSmlDmDDFObject& aNode, 
-                                            TSmlDmAccessTypes aAccTypes, 
-                                            MSmlDmDDFObject::TOccurence aOccurrence, 
-                                            MSmlDmDDFObject::TScope aScope, 
-                                            MSmlDmDDFObject::TDFFormat aFormat, 
-                                            const TDesC8& aDescription, 
-                                            const TDesC8& aDefaultValue, 
-                                            const TDesC8& aMimeType )
-    {
-    aNode.AddDFTypeMimeTypeL( aMimeType );
-    aNode.SetAccessTypesL( aAccTypes );
-	aNode.SetDescriptionL( aDescription );
-	aNode.SetOccurenceL( aOccurrence );
-	aNode.SetDefaultValueL( aDefaultValue );
-	aNode.SetScopeL( aScope );
-	aNode.SetDFFormatL( aFormat );
-    return;
-    }
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter::GetDMAuthInfoL
-//  This function gets authentication data from private API.
-// -----------------------------------------------------------------------------
-TInt CNSmlDMSettingsAdapter::GetDMAuthInfoL( const TInt aLUID, 
-                                                const TNSmlDMProfileData aField, 
-                                                CBufBase& aObject )
-    {
-    _DBG_FILE( "CNSmlDMSettingsAdapter::GetDMAuthInfoL(): begin" );
-   
-    CNSmlDMAuthInfo* authInfo = new (ELeave) CNSmlDMAuthInfo;
-    CleanupStack::PushL( authInfo );
-    
-    authInfo->iProfileId = aLUID + KMaxDataSyncID;
-    iPrivateApi.OpenL();
-    TInt ret = KErrNone;
-    
-    TRAPD(err,iPrivateApi.GetDMAuthInfoL( *authInfo ));
-
-    if(err==KErrNone)
-    	{
-	    if ( aField == EServerNonce )
-	        {
-	        aObject.InsertL( aObject.Size(), *authInfo->iServerNonce );
-	        }
-	    else if ( aField == EClientNonce )
-	        {
-	        aObject.InsertL( aObject.Size(), *authInfo->iClientNonce );
-	        }
-	    else if ( aField == EAuthenticationRequired )
-	        {
-	        TUint authPref = authInfo->iAuthPref;
-	        if( authPref == ENoAuth )
-	            {
-	            aObject.InsertL( aObject.Size(), KNSmlDMAuthPrefNoAuth ); 
-	            }
-	        else if( authPref == EBasic )
-	            {
-	            aObject.InsertL( aObject.Size(), KNSmlDMAuthPrefBasic );
-	            }
-	        else if( authPref == EMD5 )
-	            {
-	            aObject.InsertL( aObject.Size(), KNSmlDMAuthPrefMD5 );
-	            }
-	        else
-	            {
-	            aObject.InsertL( aObject.Size(), KNullDesC8 );
-	            ret = KErrGeneral;
-	            }
-	        }
-    	}
-    iPrivateApi.Close();
-    CleanupStack::PopAndDestroy(authInfo);
-    _DBG_FILE( "CNSmlDMSettingsAdapter::GetDMAuthInfoL(): end" );
-    return ret;
-    }
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter::DeleteDMAuthInfoL
-//  This function resets the authentication data.
-// -----------------------------------------------------------------------------
-TInt CNSmlDMSettingsAdapter::DeleteDMAuthInfoL( const TInt aLUID, 
-                                                const TNSmlDMProfileData aField )
-    {
-    _DBG_FILE( "CNSmlDMSettingsAdapter::DeleteDMAuthInfoL(): begin" );
-    CNSmlDMAuthInfo* authInfo = new (ELeave) CNSmlDMAuthInfo;;
-    CleanupStack::PushL( authInfo );
-    authInfo->iProfileId = aLUID;
-    iPrivateApi.OpenL();
-    iPrivateApi.GetDMAuthInfoL( *authInfo );
-    if( aField == EServerNonce )
-        {
-        authInfo->iServerNonce->Des().Delete( 0, authInfo->iServerNonce->Des().Size() );
-        authInfo->iServerNonce->Des().Insert( 0, KNullDesC8 );
-        }
-    else if( aField == EClientNonce )
-        {
-        authInfo->iClientNonce->Des().Delete( 0, authInfo->iClientNonce->Des().Size() );
-        authInfo->iClientNonce->Des().Insert( 0, KNullDesC8 );
-        }
-    else if( aField == EAuthenticationRequired )
-        {
-        authInfo->iAuthPref = 0;
-        }
-    iPrivateApi.SetDMAuthInfoL( *authInfo );
-    iPrivateApi.Close();
-    CleanupStack::PopAndDestroy(authInfo);
-	_DBG_FILE( "CNSmlDMSettingsAdapter::DeleteDMAuthInfoL(): end" );
-    return KErrNone;
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSettingsAdapter::SetProfileAddrTypeL
-// This function sets the AddrType value.    
-// -----------------------------------------------------------------------------
-TInt CNSmlDMSettingsAdapter::SetProfileAddrTypeL( const TInt aLUID, 
-                                                    const TInt aIntObj )
-    {
-    _DBG_FILE( "CNSmlDMSettingsAdapter::SetProfileAddrTypeL(): begin" );
-    TInt retVal = OpenSyncSessionAndProfileL( aLUID, ESmlOpenReadWrite );
-    if( retVal != KErrNone )
-		{
-	    iCurrentProfile = 0;
-		iProfile.Close();
-        _DBG_FILE( "CNSmlDMSettingsAdapter::SetProfileAddrTypeL(): end" );
-        return retVal;	
-		}
-    TInt mediumType = ENone;
-    GetMediumTypeL( aIntObj, mediumType );
-    if( mediumType == ENone )
-        {
-	    iCurrentProfile = 0;
-        iProfile.Close();    
-        return KErrGeneral;
-        }
-    RArray<TSmlTransportId> transportIdArray;
-    CleanupClosePushL( transportIdArray );
-    iProfile.ListConnectionsL( transportIdArray );
-    RSyncMLConnection conn;
-    CleanupClosePushL( conn );
-    conn.OpenL( iProfile, transportIdArray[0] );
-    if(mediumType!=transportIdArray[0])
-        {
-        if ( !FeatureManager::FeatureSupported( KFeatureIdSyncMlDmObex  ) )
-            {
-            CleanupStack::PopAndDestroy( 2 );//transportIdArray, conn
-            return EInvalidObject;
-            }
-        else
-            {
-            conn.CreateL(iProfile,mediumType);
-            }
-        }
-    HBufC8* sURI = conn.ServerURI().AllocLC();
-    conn.SetServerURIL( *sURI );
-    conn.UpdateL(); 	                    
-    CleanupStack::PopAndDestroy( 3 );//transportIdArray, conn, sURI
-    iCurrentProfile = 0;
-    iProfile.Close();
-    _DBG_FILE( "CNSmlDMSettingsAdapter::SetProfileAddrTypeL(): end" );
-    return KErrNone;
-    }
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter::GetProfileConnectiontypeL
-//  The function gets the profile medium type.
-// -----------------------------------------------------------------------------
-TInt CNSmlDMSettingsAdapter::GetProfileConnectiontypeL( CBufBase& aObject )
-	{
-    _DBG_FILE( "CNSmlDMSettingsAdapter::GetProfileConnectiontypeL(): begin" );
-	RArray<TSmlTransportId> transportIdArray;
-    CleanupClosePushL( transportIdArray );
-	iProfile.ListConnectionsL( transportIdArray );
-	TInt transportItems = transportIdArray.Count();
-    if( transportItems == 0 )
-		{
-		//No matching items
-        CleanupStack::PopAndDestroy(); //transportIdArray	
-		return KErrGeneral;
-		}
-	else if( transportItems > 1 )
-		{
-		//Error case : against specification
-        CleanupStack::PopAndDestroy(); //transportIdArray	
-		return KErrGeneral;
-		}
-	TInt mediumType = ENone;
-    if ( transportIdArray[0] == KUidNSmlMediumTypeInternet.iUid )
-        {
-        mediumType = EHttp;
-        }
-    else if ( transportIdArray[0] == KUidNSmlMediumTypeBluetooth.iUid ||
-              transportIdArray[0] == KUidNSmlMediumTypeUSB.iUid ||   
-              transportIdArray[0] == KUidNSmlMediumTypeIrDA.iUid  )
-        {
-        mediumType = EObex;
-        }
-    aObject.InsertL( aObject.Size(), SetIntObjectLC( mediumType ) );
-    CleanupStack::PopAndDestroy( 2 ); //transportIdArray, SetIntObjectLC
-	return KErrNone;
-	}
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter::GetProfileIAPIdL
-//  The function gets the profile IAP Id.
-// -----------------------------------------------------------------------------
-TInt CNSmlDMSettingsAdapter::GetProfileIAPIdL( TInt& aIAPid )
-	{
-    _DBG_FILE( "CNSmlDMSettingsAdapter::GetProfileIAPIdL(): begin" );
-    TInt retVal = KErrGeneral;
-    aIAPid = -1;
-    RArray<TSmlTransportId> connIdArray;
-    CleanupClosePushL( connIdArray );
-    iProfile.ListConnectionsL( connIdArray );
-    if( connIdArray.Count() == 1 )
-        {
-        RSyncMLTransport transport;
-        CleanupClosePushL( transport );
-	    transport.OpenL( iSyncSession, connIdArray[0] );
-	    const CSyncMLTransportPropertiesArray& props = transport.Properties();
-	    TInt index = props.Find( KNSmlIAPId );
-        if( index > 0 )
-            {
-            RSyncMLConnection conn;
-            CleanupClosePushL( conn );
-	        conn.OpenL( iProfile, connIdArray[0] );
-            HBufC8* apId = conn.GetPropertyL( KNSmlIAPId ).AllocLC();
-            aIAPid = GetIntObject( *apId );
-            CleanupStack::PopAndDestroy( 2 ); //conn, apId
-            retVal = KErrNone;
-            }
-        else
-            {
-            retVal = KErrNotFound;
-            }
-        CleanupStack::PopAndDestroy( 1 ); //transport
-	    iCurrentProfile = 0;
-        iProfile.Close();
-        }
-    else
-        {
-        retVal = KErrNotFound;
-        }
-    CleanupStack::PopAndDestroy(); //connIdArray
-    _DBG_FILE( "CNSmlDMSettingsAdapter::GetProfileIAPIdL(): end" );
-    return retVal;
-    }
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter::GetProfileServerURLL
-//  The function gets the profile Server URI.
-// -----------------------------------------------------------------------------
-void CNSmlDMSettingsAdapter::GetProfileServerURLL( CBufBase& aURL )
-	{
-    _DBG_FILE( "CNSmlDMSettingsAdapter::GetProfileServerURLL(): begin" );
-    RArray<TSmlTransportId> transportIdArray;
-    CleanupClosePushL( transportIdArray );
-	iProfile.ListConnectionsL( transportIdArray );
-    if( transportIdArray.Count() > 0 )
-        {
-        RSyncMLConnection profConn;
-        CleanupClosePushL( profConn );
-	    profConn.OpenL( iProfile, transportIdArray[0] );
-	    HBufC8* sURI = profConn.ServerURI().AllocL();
-        CleanupStack::PushL( sURI );
-        TPtr8 uriPtr = sURI->Des();
-        if( uriPtr.Length() > 0 )
-            {
-            aURL.InsertL( aURL.Size(),uriPtr );
-            }
-        else
-            {
-            aURL.InsertL( aURL.Size(), KNullDesC8 );
-            }
-        CleanupStack::PopAndDestroy( 2 );//profConn, sURI
-        }
-    CleanupStack::PopAndDestroy(); //transportIdArray
-    _DBG_FILE( "CNSmlDMSettingsAdapter::GetProfileServerURLL(): end" );
-    return;
-	}
-
-// -----------------------------------------------------------------------------
-//	CNSmlDMSettingsAdapter::GetMediumTypeL
-//	Checks the requested medium type.
-// -----------------------------------------------------------------------------
-void CNSmlDMSettingsAdapter::GetMediumTypeL( const TInt aIntObj, 
-                                            TInt& aMediumType )
-    {
-    _DBG_FILE( "CNSmlDMSettingsAdapter::GetMediumTypeL(): begin" );
-    if( aIntObj == EHttp || aIntObj == EWsp )
-        {
-        aMediumType = KUidNSmlMediumTypeInternet.iUid;
-        return;
-        }
-    RArray<TSmlTransportId> transportIdArray;
-    CleanupClosePushL( transportIdArray );
-    iSyncSession.ListTransportsL( transportIdArray );
-    
-    if ( transportIdArray.Find( KUidNSmlMediumTypeBluetooth.iUid ) != KErrNotFound )
-        {
-        aMediumType = KUidNSmlMediumTypeBluetooth.iUid;
-        }
-    else if ( transportIdArray.Find( KUidNSmlMediumTypeUSB.iUid ) != KErrNotFound )
-        {
-        aMediumType = KUidNSmlMediumTypeUSB.iUid;
-        }
-    else if ( transportIdArray.Find( KUidNSmlMediumTypeIrDA.iUid ) != KErrNotFound )
-        {
-        aMediumType = KUidNSmlMediumTypeIrDA.iUid;
-        }
-    CleanupStack::PopAndDestroy(); //transportIdArray
-    _DBG_FILE( "CNSmlDMSettingsAdapter::GetMediumTypeL(): end" );
-    return;    
-    }
-
-// -----------------------------------------------------------------------------
-//	CNSmlDMSettingsAdapter::GetServerIdL
-//	Gets the server id value.
-// -----------------------------------------------------------------------------
-void CNSmlDMSettingsAdapter::GetServerIdL( CBufBase& aObject )
-    {
-    _DBG_FILE( "CNSmlDMSettingsAdapter::GetServerIdL(): begin" );
-    HBufC8* serverId = iProfile.ServerId().AllocL();
-    CleanupStack::PushL( serverId );
-    aObject.InsertL( aObject.Size(), *serverId );
-    CleanupStack::PopAndDestroy( 1 ); //serverId
-    _DBG_FILE( "CNSmlDMSettingsAdapter::GetServerIdL(): end" );
-    return;
-    }
-
-// -----------------------------------------------------------------------------
-//	CNSmlDMSettingsAdapter::GetProfileNameL
-//	Gets the display name value.
-// -----------------------------------------------------------------------------
-void CNSmlDMSettingsAdapter::GetProfileNameL( CBufBase& aObject )
-    {
-    _DBG_FILE( "CNSmlDMSettingsAdapter::GetProfileNameL(): begin" );
-    HBufC16* dataBuf = iProfile.DisplayName().AllocL();
-    CleanupStack::PushL( dataBuf );
-    TPtr16 ptrDisplayName = dataBuf->Des();
-    HBufC8* dataBuf8 = HBufC8::NewL( ptrDisplayName.Length() * 2 );
-    CleanupStack::PushL( dataBuf8 );
-
-    TPtr8 ptrDisplayName8 = dataBuf8->Des();
-    ptrDisplayName8 = ConvertTo8LC( ptrDisplayName );
-    aObject.InsertL( aObject.Size(), ptrDisplayName8 );
-    CleanupStack::PopAndDestroy( 3 );//dataBuf, ConvertTo8LC
-    _DBG_FILE("CNSmlDMSettingsAdapter::GetProfileNameL(): end");
-    return;
-    }
-
-// -----------------------------------------------------------------------------
-//	CNSmlDMSettingsAdapter::GetProfileUserNameL
-//	Gets the profile user name value.
-// -----------------------------------------------------------------------------
-void CNSmlDMSettingsAdapter::GetProfileUserNameL( CBufBase& aObject )
-    {
-    _DBG_FILE( "CNSmlDMSettingsAdapter::GetProfileUserNameL(): begin" );
-    HBufC8* dataBuf = iProfile.UserName().AllocL();
-    CleanupStack::PushL( dataBuf );
-    TPtr8 ptrUserName = dataBuf->Des();
-    aObject.InsertL( aObject.Size(), ptrUserName );
-    CleanupStack::PopAndDestroy();//dataBuf
-    _DBG_FILE( "CNSmlDMSettingsAdapter::GetProfileUserNameL(): end" );
-    return;
-    }
-
-// -----------------------------------------------------------------------------
-//	CNSmlDMSettingsAdapter::GetProfilePortNumberL
-//	Gets the port number value.
-// -----------------------------------------------------------------------------
-void CNSmlDMSettingsAdapter::GetProfilePortNumberL( CBufBase& aObject )
-    {
-    _DBG_FILE( "CNSmlDMSettingsAdapter::GetProfilePortNumberL(): begin" );
-    TInt bSize = aObject.Size();
-    TInt portNum = 0;
-    HBufC8* bufStorage = HBufC8::NewLC( bSize );
-	TPtr8 bufStoragePtr = bufStorage->Des();
-	aObject.Read( 0, bufStoragePtr, aObject.Size() );
-	aObject.Reset();
-	
-    //find out the port number
-    ParseUri( *bufStorage, portNum );
-	aObject.InsertL( aObject.Size(), SetIntObjectLC( portNum ) );
-
-    CleanupStack::PopAndDestroy( 2 ); //bufStorage, SetIntObjectLC()
-    _DBG_FILE( "CNSmlDMSettingsAdapter::GetProfilePortNumberL(): end" );
-    return;
-    }
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter::SetAuthInfoL
-//  The function checks if authinfo already exits. If exits command is replace.
-// -----------------------------------------------------------------------------
-void CNSmlDMSettingsAdapter::SetAuthInfoL( const TInt aLUID, 
-                                            const TNSmlDMProfileData aField, 
-                                            const TDesC8& aObject, TInt& aStatus )
-    {
-    _DBG_FILE( "CNSmlDMSettingsAdapter::SetAuthInfoL(): begin" );
-    
-    CNSmlDMAuthInfo* authInfo = new (ELeave) CNSmlDMAuthInfo();
-    CleanupStack::PushL( authInfo );
-    authInfo->iProfileId = aLUID;
-    
-    iPrivateApi.OpenL();
-    TRAPD( err, iPrivateApi.GetDMAuthInfoL( *authInfo ) );
-    
-    if ( err )
-        {
-        CleanupStack::PopAndDestroy( authInfo );
-        iPrivateApi.Close();
-        aStatus = err;
-        return;
-        }
-    
-    CNSmlDMAuthInfo* newAuthInfo = new (ELeave) CNSmlDMAuthInfo();
-    CleanupStack::PushL( newAuthInfo );
-    newAuthInfo->iProfileId = aLUID;
-
-    if ( aField == EServerNonce )
-        {
-        newAuthInfo->iServerNonce = aObject.Alloc();
-        newAuthInfo->iClientNonce = authInfo->iClientNonce->Des().Alloc();
-        newAuthInfo->iAuthPref = authInfo->iAuthPref;
-        
-        iPrivateApi.SetDMAuthInfoL( *newAuthInfo );
-        }
-    else if ( aField == EClientNonce )
-        {
-        newAuthInfo->iServerNonce = authInfo->iServerNonce->Des().Alloc();
-        newAuthInfo->iClientNonce = aObject.Alloc();
-        newAuthInfo->iAuthPref = authInfo->iAuthPref;
-        
-        iPrivateApi.SetDMAuthInfoL( *newAuthInfo );
-        }
-    else if ( aField == EAuthenticationRequired )
-        {
-        if ( aObject.Match( KNSmlDMAuthPrefNoAuth ) !=  KErrNotFound )
-            {
-            newAuthInfo->iAuthPref = ENoAuth;
-            }
-        else if ( aObject.Match( KNSmlDMAuthPrefBasic ) !=  KErrNotFound )
-            {
-            newAuthInfo->iAuthPref = EBasic;
-            }
-        else if ( aObject.Match( KNSmlDMAuthPrefMD5 ) !=  KErrNotFound )
-            {
-            newAuthInfo->iAuthPref = EMD5;
-            }
-        newAuthInfo->iServerNonce = authInfo->iServerNonce->Des().Alloc();
-        newAuthInfo->iClientNonce = authInfo->iClientNonce->Des().Alloc();
-        
-        iPrivateApi.SetDMAuthInfoL( *newAuthInfo );
-        }
-    
-    CleanupStack::PopAndDestroy( newAuthInfo );
-    CleanupStack::PopAndDestroy( authInfo );
-    
-    iPrivateApi.Close();
-    aStatus = KErrNone;
-    _DBG_FILE( "CNSmlDMSettingsAdapter::SetAuthInfoL(): end" );
-    return;
-    }
-//------------------------------------------------------------------------------
-// CNSmlDMSettingsAdapter::AddNodeBufferL()
-// Buffers Node Object
-//------------------------------------------------------------------------------
-void CNSmlDMSettingsAdapter::AddNodeBufferL( const TDesC8& aURI,
-		const TInt aStatusRef)
-	{
-	_DBG_FILE( "CNSmlDMSettingsAdapter::AddNodeBufferL(): begin" );
-	TInt index = -1;
-
-	for (TInt i = 0; i<iBuffer->Count (); i++)
-		{
-		if ( iBuffer->At(i).iMappingName->Compare (aURI)== 0)
-			{
-			index = i;
-			//CallBack for duplicate
-			_DBG_FILE( "CNSmlDMSettingsAdapter::AddNodeBufferL(): EAlreadyExists end" );
-			iCallBack->SetStatusL ( aStatusRef, CSmlDmAdapter::EAlreadyExists);
-			break;
-			}
-		}
-
-	if ( index<0)
-		{
-		TNSmlDMBufferElement newNode;
-		newNode.iMappingName = aURI.AllocLC ();
-		newNode.iLeafBuf = new (ELeave) CArrayFixFlat <TNSmlDMLeafElement> (4);
-		newNode.iExecuted = EFalse;
-		newNode.iDMBuffStatusref = aStatusRef;
-		newNode.iAddr = EFalse;
-		newNode.iServerId = EFalse;
-		newNode.iUName = EFalse;
-		newNode.iServerName = EFalse;
-
-		iBuffer->AppendL (newNode);
-		//newNode.iMappingName
-		CleanupStack::Pop ();
-		}
-	_DBG_FILE( "CNSmlDMSettingsAdapter::AddNodeBufferL(): end" );
-	}
-//------------------------------------------------------------------------------
-// CNSmlDMSettingsAdapter::AddLeafBufferL()
-// Buffers Leaf Obj & checks for Mandatory fields
-//------------------------------------------------------------------------------
-void CNSmlDMSettingsAdapter::AddLeafBufferL( const TDesC8& aURI,
-		const TDesC8& aObject, const TInt aStatusRef)
-	{
-	_DBG_FILE( "CNSmlDMSettingsAdapter::AddLeafBufferL(): begin" );
-	TNSmlDMLeafElement newCommand;
-
-	newCommand.iUri = aURI.AllocLC ();
-	newCommand.iData = aObject.AllocLC ();
-	newCommand.iLuid = HBufC8::NewLC (8); //Allocate Mem. for iLUID
-	newCommand.iStatusRef = aStatusRef;
-	//Add Leaf to the index updated by UpdateLeafObj
-	iBuffer->At(iExecutionIndex).iLeafBuf->AppendL (newCommand);
-	// iUri, iData, ILuid
-	CleanupStack::Pop (3);
-	SetField ( aURI);
-
-	if ( iField->Compare (KNSmlDdfAddr)== 0)
-		{
-		iBuffer->At(iExecutionIndex).iAddr = ETrue;
-		}
-	else
-		if ( iField->Compare (KNSmlDdfServerId)== 0)
-			{
-			iBuffer->At(iExecutionIndex).iServerId = ETrue;
-			}
-		else
-			if ( iField->Compare (KNSmlDdfClientUserName)== 0)
-				{
-				iBuffer->At(iExecutionIndex).iUName = ETrue;
-				}
-			else
-				if ( iField->Compare (KNSmlDdfName)== 0)
-					{
-					iBuffer->At(iExecutionIndex).iServerName = ETrue;
-					}
-
-	//  If Address,ServerId,ServerName,UserName then Add
-
-	if ( iBuffer->At(iExecutionIndex).iAddr && iBuffer->At(iExecutionIndex).iServerId &&iBuffer->At(iExecutionIndex).iUName && iBuffer->At(iExecutionIndex).iServerName)
-		{
-		ExecuteBufferL ();
-		iExecutionIndex = -1;
-		}
-	_DBG_FILE( "CNSmlDMSettingsAdapter::AddLeafBufferL(): end" );
-	return;
-	}
-
-//------------------------------------------------------------------------------
-// CNSmlDMSettingsAdapter::ExecuteBufferL()
-// Adds the Node/Leaf obj to the db
-//------------------------------------------------------------------------------
-void CNSmlDMSettingsAdapter::ExecuteBufferL()
-	{
-	_DBG_FILE( "CNSmlDMSettingsAdapter::ExecuteBufferL(): begin" );
-	TBuf8<8> newLUID;
-	TInt rValue;
-	//Buffer is being Executed
-	iBufOn = ETrue;
-
-	// Robustness check
-	if ( iExecutionIndex<0)
-		{
-		return;
-		}
-
-	//Execute BufferL is called from CompleteOutstandingCmdsL only when
-	//Mandatory fields are not set. Dont update Node/Leaf to the db, return a failure
-
-	if ( !iComplete)
-		rValue = CreateNewProfileL (iLUID);
-	else
-		rValue = CSmlDmAdapter::EError;
-
-	iBuffer->At(iExecutionIndex).iExecuted = ETrue;
-
-	if ( rValue != KErrNone)
-		{
-		if ( rValue == KErrNoMemory)
-			{
-			iCallBack->SetStatusL ( iBuffer->At(iExecutionIndex).iDMBuffStatusref, CSmlDmAdapter::ENoMemory);
-			}
-		else
-			if ( rValue == KErrNotSupported)
-				{
-				iCallBack->SetStatusL ( iBuffer->At(iExecutionIndex).iDMBuffStatusref,
-						CSmlDmAdapter::EInvalidObject);
-				}
-			else
-				if ( rValue == KErrInUse)
-					{
-					iCallBack->SetStatusL ( iBuffer->At(iExecutionIndex).iDMBuffStatusref,
-							CSmlDmAdapter::EObjectInUse);
-					}
-				else
-					if ( rValue == KErrDiskFull)
-						{
-						iCallBack->SetStatusL ( iBuffer->At(iExecutionIndex).iDMBuffStatusref,
-								CSmlDmAdapter::EDiskFull);
-						}
-					else
-						{
-						iCallBack->SetStatusL ( iBuffer->At(iExecutionIndex).iDMBuffStatusref,
-								CSmlDmAdapter::EError);
-						}
-		// dont return, UpdateLeafObjectL will update the callback status for leaf Nodes 
-		}
-	else
-		{
-		if ( iLUID >= KMaxDataSyncID)
-			{
-			newLUID.Num ( iLUID - KMaxDataSyncID);
-			}
-		else
-			{
-			newLUID.Num ( iLUID);
-			}
-
-		iCallBack->SetMappingL ( *iBuffer->At(iExecutionIndex).iMappingName, newLUID);
-
-		iCallBack->SetStatusL (iBuffer->At(iExecutionIndex).iDMBuffStatusref, CSmlDmAdapter::EOk);
-		}
-
-	for (TInt val= 0; val < iBuffer->At(iExecutionIndex).iLeafBuf->Count ();val++)
-		{
-		//Update the LUID data in the Leaf structure with the Profile LUID before calling UpdateLeafObj
-		TPtr8 tempLUID(iBuffer->At(iExecutionIndex).iLeafBuf->At(val).iLuid->Des ());
-		tempLUID.Append (newLUID);
-		UpdateLeafObjectL (*iBuffer->At(iExecutionIndex).iLeafBuf->At(val).iUri, *iBuffer->At(iExecutionIndex).iLeafBuf->At(val).iLuid, *iBuffer->At(iExecutionIndex).iLeafBuf->At(val).iData, *iBuffer->At(iExecutionIndex).iMappingName, iBuffer->At(iExecutionIndex).iLeafBuf->At(val).iStatusRef);
-		}
-
-	// Delete the dynamically allocated buffers (Node/Leaf obj)
-
-	ClearBuffer ( iBuffer->At(iExecutionIndex).iLeafBuf);
-
-	delete iBuffer->At(iExecutionIndex).iLeafBuf;
-
-	if ( iBuffer->At(iExecutionIndex).iMappingName)
-		{
-		delete iBuffer->At(iExecutionIndex).iMappingName;
-		iBuffer->At(iExecutionIndex).iMappingName = NULL;
-		}
-
-	iBuffer->Delete (iExecutionIndex);
-	iBuffer->Compress ();
-
-	iBufOn = EFalse;
-	_DBG_FILE( "CNSmlDMSettingsAdapter::ExecuteBufferL(): end" );
-	}
-
-//------------------------------------------------------------------------------
-// TPtrC8 CNSmlDMSettingsAdapter::ParentURI(const TDesC8& aURI)
-// returns parent uri, i.e. removes last uri segment
-// Searches till the third "/" is reached
-//------------------------------------------------------------------------------
-TPtrC8 CNSmlDMSettingsAdapter::ParentURI(const TDesC8& aURI)
-	{
-	_DBG_FILE( "CNSmlDMSettingsAdapter::ParentURI(): begin" );
-	TInt count;
-	TInt flag = 0;
-	for (count=0; count<=aURI.Length ()-1;count++)
-		{
-
-		if ( aURI[count]=='/')
-			{
-			flag++;
-			if ( flag == KDynNodePosn) //KDynNodePosn =3 --> SyncML/DMAcc/DMIDxx
-				break;
-			}
-		}
-
-	_DBG_FILE( "CNSmlDMSettingsAdapter::ParentURI(): end" );
-	return aURI.Left (count);
-	}
-
-//-----------------------------------------------------------------------------------------    
-// Clears the elements of the passed in LeafElement Structure
-//----------------------------------------------------------------------------------------
-void CNSmlDMSettingsAdapter::ClearBuffer(
-		CArrayFixFlat<TNSmlDMLeafElement>* aBuffer)
-	{
-	_DBG_FILE( "CNSmlDMSettingsAdapter::ClearBuffer(): begin" );
-	for (TInt i = 0; i < aBuffer->Count (); i++)
-		{
-		delete aBuffer->At(i).iUri;
-		aBuffer->At(i).iUri = NULL;
-
-		delete aBuffer->At(i).iData;
-		aBuffer->At(i).iData = NULL;
-
-		delete aBuffer->At(i).iLuid;
-		aBuffer->At(i).iLuid = NULL;
-		}
-
-	aBuffer->Reset ();
-	_DBG_FILE( "CNSmlDMSettingsAdapter::ClearBuffer(): end" );
-	}
-// ========================== OTHER EXPORTED FUNCTIONS =========================
-
-#ifndef IMPLEMENTATION_PROXY_ENTRY
-#define IMPLEMENTATION_PROXY_ENTRY(aUid, aFuncPtr)	{{aUid},(aFuncPtr)}
-#endif
-
-const TImplementationProxy ImplementationTable[] = 
-    {
-		IMPLEMENTATION_PROXY_ENTRY( KNSmlDMSettingsAdapterImplUid, CNSmlDMSettingsAdapter::NewL )
-    };
-
-
-// -----------------------------------------------------------------------------
-// TImplementationProxy* ImplementationGroupProxy()
-// -----------------------------------------------------------------------------
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy( TInt& aTableCount )
-    {
-	_DBG_FILE( "ImplementationGroupProxy() for CNSmlDMSettingsAdapter: begin" );
-
-    aTableCount = sizeof(ImplementationTable) / sizeof(TImplementationProxy);
-
-	_DBG_FILE( "ImplementationGroupProxy() for CNSmlDMSettingsAdapter: end" );
-    return ImplementationTable;
-	}
-
-// End of File
-
--- a/omadm/omadmextensions/adapters/syncmldm/src/nsmldmsettingsadapter.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-CHARACTER_SET UTF8/*
-* 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:    Resource data for Device Management Settings Adapter
-*
-*/
-
-
-
-
-
-#include <registryinfo.rh>
-#include "nsmldmconstants.h"
-
-RESOURCE REGISTRY_INFO theRegistryInfo
-  {
-  dll_uid = 0x101F6DE6; //The DLL's 3rd UID.
-  interfaces = 
-      {
-      INTERFACE_INFO
-          {
-          interface_uid = KNSmlDMInterfaceUid; // DM interface UID
-          implementations = 
-            {
-            IMPLEMENTATION_INFO
-                {
-                implementation_uid = 0x101F6DEC; // DM interface implementation UID
-                version_no = 1; 
-                display_name = "";
-                default_data = "";
-                opaque_data = "";
-                }
-            };
-          }
-      };
-    }
-
-// End of File
--- a/omadm/omadmextensions/adapters/syncmldm/tsrc/bwins/syncmldmtestu.def	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	?LibEntryL@@YAPAVCScriptBase@@AAVCTestModuleIf@@@Z @ 1 NONAME ; class CScriptBase * LibEntryL(class CTestModuleIf &)
-
--- a/omadm/omadmextensions/adapters/syncmldm/tsrc/conf/syncmldmtest.cfg	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
-[Test]
-title DDF
-create syncmldmtest foobar jee
-foobar DDFStructure
-delete foobar
-[Endtest] 
-
-[Test]
-title StartAtomic
-create syncmldmtest foobar
-foobar StartAtomic
-delete foobar
-[Endtest]
-
-[Test]
-title CommitAtomic
-create syncmldmtest foobar
-foobar CommitAtomic
-delete foobar
-[Endtest]
-
-[Test]
-title RollbackAtomic
-create syncmldmtest foobar
-foobar RollbackAtomic
-delete foobar
-[Endtest]
-
-[Test]
-title AddDmAcc
-create syncmldmtest foobar
-foobar AddNode SyncML/DMAcc/DMId099
-foobar UpdateLeaf SyncML/DMAcc/DMId099/Name name99
-foobar UpdateLeaf SyncML/DMAcc/DMId099/ServerId server99
-foobar UpdateLeaf SyncML/DMAcc/DMId099/Addr http://a.com
-foobar UpdateLeaf SyncML/DMAcc/DMId099/UserName user99
-foobar CompleteCommands
-delete foobar
-[Endtest]
-
-[Test]
-title UpdateName
-create syncmldmtest foobar
-foobar UpdateLeaf SyncML/DMAcc/DMId099/Name newname99
-delete foobar
-[Endtest]
-
-[Test]
-title UpdateAddr
-create syncmldmtest foobar
-foobar UpdateLeaf SyncML/DMAcc/DMId099/Addr http://b.com
-delete foobar
-[Endtest]
-
-[Test]
-title UpdateUserName
-create syncmldmtest foobar
-foobar UpdateLeaf SyncML/DMAcc/DMId099/UserName user
-delete foobar
-[Endtest]
-
-[Test]
-title FetchNodeDmAcc
-create syncmldmtest foobar
-foobar FetchNode SyncML/DMAcc
-delete foobar
-[Endtest]
-
-[Test]
-title FetchLeafDmAcc
-create syncmldmtest foobar
-foobar FetchLeaf SyncML/DMAcc/DMId099/Name
-delete foobar
-[Endtest]
-
-[Test]
-title DeleteDmAcc
-create syncmldmtest foobar
-foobar DeleteNode SyncML/DMAcc/DMId005
-delete foobar
-[Endtest]
--- a/omadm/omadmextensions/adapters/syncmldm/tsrc/eabi/syncmldmtestu.def	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-EXPORTS
-	_Z9LibEntryLR13CTestModuleIf @ 1 NONAME
-	_ZTI13Csyncmldmtest @ 2 NONAME ; #<TI>#
-	_ZTI16CTestDmDDFObject @ 3 NONAME ; #<TI>#
-	_ZTI8Cdmatest @ 4 NONAME ; #<TI>#
-	_ZTV13Csyncmldmtest @ 5 NONAME ; #<VT>#
-	_ZTV16CTestDmDDFObject @ 6 NONAME ; #<VT>#
-	_ZTV8Cdmatest @ 7 NONAME ; #<VT>#
-
--- a/omadm/omadmextensions/adapters/syncmldm/tsrc/group/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-/*
-* Copyright (c) 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:  Implementation of DM adapter test component
-* 	This is part of omadmextensions/adapter test application.
-*
-*/
-
-
-
-
-
-
-PRJ_PLATFORMS
-// specify the platforms your component needs to be built for here
-// defaults to WINS MARM so you can ignore this if you just build these
-DEFAULT
-
-PRJ_TESTEXPORTS
-// NOTE: If using ARS requirements all export operations should be done under this.
-// 'abld test export'
-
-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
-// Example: 
-
-
-PRJ_TESTMMPFILES
-// NOTE: If using ARS requirements .mmp file operation should be done under this.
-// 'abld test build'
-syncmldmtest.mmp
-
-PRJ_MMPFILES
-// Specify the .mmp files required for building the important component
-// releasables.
-//
-// Specify "tidy" if the component you need to build doesn't need to be
-// released. Specify "ignore" if the MMP file exists but should be
-// ignored.
-// Example:
-
-//  End of File
--- a/omadm/omadmextensions/adapters/syncmldm/tsrc/group/syncmldmtest.mmp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-/*
-* Copyright (c) 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:  Implementation of DM adapter test component
-* 	This is part of omadmextensions/adapter test application.
-*
-*/
-
-
-
-
-#include <platform_paths.hrh>
-
-TARGET          syncmldmtest.dll
-TARGETTYPE      dll
-UID             0x1000008D 0x101FB3E3
-
-CAPABILITY	ALL -TCB
-/* Remove comments and replace 0x00000000 with correct vendor id */
-// VENDORID 	0x00000000
-
-//TARGETPATH      ?target_path
-DEFFILE         syncmldmtest.def
-
-SOURCEPATH      ../src
-SOURCE          dmatest.cpp
-SOURCE          TestDmDDFObject.cpp
-SOURCE          syncmldmtest.cpp
-SOURCE          syncmldmtestBlocks.cpp
-
-
-USERINCLUDE     ../inc 
-USERINCLUDE		  ../../inc
-
-SYSTEMINCLUDE   /epoc32/include/ecom
-APP_LAYER_SYSTEMINCLUDE
-
- 
-
-LIBRARY         apgrfx.lib apmime.lib
-LIBRARY         euser.lib ecom.lib
-LIBRARY         stiftestinterface.lib
-LIBRARY         stiftestengine.lib
-LIBRARY         efsrv.lib
-LIBRARY         estor.lib 
-LIBRARY         SWInstCli.lib
-
-LANG			SC
-
-
-
-SMPSAFE
-// End of File
-
--- a/omadm/omadmextensions/adapters/syncmldm/tsrc/group/syncmldmtest.pkg	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-;
-; Copyright (c) 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:  Implementation of DM adapter test component
-; 	This is part of omadmextensions/adapter test application.
-;
-
-;*Languages
-&EN
-;
-;*Standard SIS file header. This section specifies the package name,
-;application UID, and version/build numbers. Add the package TYPE here if needed.
-#{"syncmldmtest"},(0x101FB3E8),1,0,1;
-;
-
-;*Unique (Non-Localised) Vendor name
-;This is used in combination with signing to prevent the unauthroized
-;upgrade ofa a package by someone other than the rightful vendor.
-:"Nokia"
-
-;*Localized Vendor Name
-;This specifies the localised vendor name(s) correspodning to language(s).
-%{"Nokia Test EN"}
-
-;*Files To Copy...<src> <destination>
-"\epoc32\release\armv5\urel\syncmldmtest.dll" -"C:\sys\bin\syncmldmtest.dll"
-"..\conf\syncmldmtest.cfg"-"C:\TestFramework\syncmldmtest.cfg"
-"..\init\syncmldmtest.ini"-"C:\TestFramework\syncmldmtest.ini"
--- a/omadm/omadmextensions/adapters/syncmldm/tsrc/inc/TestDmDDFObject.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,203 +0,0 @@
-/*
-* Copyright (c) 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:  Implementation of DM adapter test component
-* 	This is part of omadmextensions/adapter test application.
-*
-*/
-
-
-
-
-
-
-#ifndef __TESTDMDDFOBJECT_H
-#define __TESTDMDDFOBJECT_H
-
-//  INCLUDES
-//#include <?include_file>
-#include <smldmadapter.h>
-
-// CONSTANTS
-//const ?type ?constant_var = ?constant;
-
-// MACROS
-//#define ?macro ?macro_def
-
-// DATA TYPES
-//enum ?declaration
-//typedef ?declaration
-//extern ?data_type;
-
-// FUNCTION PROTOTYPES
-//?type ?function_name(?arg_list);
-
-// FORWARD DECLARATIONS
-class CStifLogger;
-
-// CLASS DECLARATION
-
-/**
-*  ?one_line_short_description.
-*  ?other_description_lines
-*
-*  @lib ?library
-*  @since Series ?XX ?SeriesXX_version
-*/
-class CTestDmDDFObject : public CBase, public MSmlDmDDFObject
-    {
-    public:  // Constructors and destructor
-        
-        /**
-        * Two-phased constructor.
-        */
-        static CTestDmDDFObject* NewL( CStifLogger *aLog );
-        static CTestDmDDFObject* NewLC( CStifLogger *aLog );
-        
-        /**
-        * Destructor.
-        */
-        virtual ~CTestDmDDFObject();
-
-    public: // New functions
-        
-        /**
-        * ?member_description.
-        * @since Series ?XX ?SeriesXX_version
-        * @param ?arg1 ?description
-        * @return ?description
-        */
-        //?type ?member_function( ?type ?arg1 );
-
-		virtual void SetNameL( const TDesC8& aName );
-		
-		void DumpL( const TDesC8& aParentName, TBool aFullDump = ETrue );
-		void ExternalizeL(RWriteStream& aStream) const;
-		
-		
-
-    public: // Functions from base classes
-    
-//sf-    *********************************
-    
-		void SetAccessTypesL( TSmlDmAccessTypes aAccessTypes );
-		void SetDefaultValueL( const TDesC8& aDefaultValue );
-		void SetDescriptionL( const TDesC8& aDescription );
-		void SetDFFormatL( TDFFormat aFormat );
-		void SetOccurenceL( TOccurence aOccurence );
-		void SetScopeL( TScope aScope );
-		void SetDFTitleL( const TDesC8& aTitle );
-		void AddDFTypeMimeTypeL( const TDesC8& aMimeType );
-		void SetAsObjectGroup();
-		MSmlDmDDFObject& AddChildObjectL(const TDesC8& aNodeName);
-		MSmlDmDDFObject& AddChildObjectGroupL();
-
-//sf-    #############################
-
-		const TDesC8& Name();
-		TSmlDmAccessTypes  AccessTypes();
-		const TDesC8& DefaultValue();
-		const TDesC8& Description();
-		TDFFormat DFFormat();
-		TOccurence Occurence();
-		TScope Scope();
-		const TDesC8& DFTitle();
-		const TDesC8& DFTypeMimeType();
-		TBool ObjectGroup();
-		
-		TInt ChildObjectCount();
-		CTestDmDDFObject& ChildObject( TInt aIndex );
-
-		CTestDmDDFObject* FindChildObject( const TDesC8& aName );
-		TInt SubObjectsCount();
-
-
-    protected:  // New functions
-        
-        /**
-        * ?member_description.
-        * @since Series ?XX ?SeriesXX_version
-        * @param ?arg1 ?description
-        * @return ?description
-        */
-        //?type ?member_function( ?type ?arg1 );
-
-    protected:  // Functions from base classes
-        
-        /**
-        * From ?base_class ?member_description
-        */
-        //?type ?member_function();
-
-    private:
-
-        /**
-        * C++ default constructor.
-        */
-        CTestDmDDFObject( CStifLogger *aLog );
-
-        /**
-        * By default Symbian 2nd phase constructor is private.
-        */
-        void ConstructL();
-
-        // Prohibit copy constructor if not deriving from CBase.
-        // CTestDmDDFObject( const CTestDmDDFObject& );
-        // Prohibit assigment operator if not deriving from CBase.
-        // CTestDmDDFObject& operator=( const CTestDmDDFObject& );
-
-    public:     // Data
-        // ?one_line_short_description_of_data
-        //?data_declaration;
-    
-    protected:  // Data
-        // ?one_line_short_description_of_data
-        //?data_declaration;
-
-    private:    // Data
-        // ?one_line_short_description_of_data
-        //?data_declaration;
-		HBufC8* iName;
-
-		TSmlDmAccessTypes iAccessTypes;
-		HBufC8* iDefaultValue;
-		HBufC8* iDescription;
-		TDFFormat iFormat;
-		TOccurence iOccurence;
-		TScope iScope;
-		HBufC8* iTitle;
-		HBufC8* iMimeType;
-		TBool iObjectGroup;
-		
-		RPointerArray<CTestDmDDFObject> iChildren;
-
-         
-        // Reserved pointer for future extension
-        //TAny* iReserved;
-
-    public:     // Friend classes
-        //?friend_class_declaration;
-    protected:  // Friend classes
-        //?friend_class_declaration;
-    private:    // Friend classes
-        //?friend_class_declaration;
-        /**
-        * Logger.
-        */
-        CStifLogger*    iLog;
-
-    };
-
-#endif      // __TESTDMDDFOBJECT_H
-            
-// End of File
--- a/omadm/omadmextensions/adapters/syncmldm/tsrc/inc/dmatest.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,277 +0,0 @@
-/*
-* Copyright (c) 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:  Implementation of DM adapter test component
-* 	This is part of omadmextensions/adapter test application.
-*
-*/
-
-
-
-
-
-
-#ifndef __DMA_TEST_H__
-#define __DMA_TEST_H__
-
-//  INCLUDES
-#include <StifLogger.h>
-#include <TestScripterInternal.h>
-#include <StifTestModule.h>
-#include <apmstd.h>
-#include <smldmadapter.h>
-#include "NSmlDMSettingsAdapter.h"
-
-class Cdmatest;
-
-
-struct TMapping
-	{
-	TBuf8<256> iURI;
-	TBuf8<64> iLuid;
-	TMapping( const TDesC8 &aURI, const TDesC8 &aLuid )  : iURI( aURI ), iLuid( aLuid )
-	{
-		
-		}
-	};
-	
-typedef RArray<TMapping> RMappingArray;
-
-typedef void (Cdmatest::* ResultsFunction)( TInt , CBufBase& , const TDesC8&  ) ; 
-
-
-// CLASS DECLARATION
-
-/**
-*  ?one_line_short_description.
-*  ?other_description_lines
-*
-*  @lib ?library
-*  @since Series ?XX ?SeriesXX_version
-*/
-class Cdmatest : public CScriptBase, public MSmlDmCallback
-    {
-    
-    public:  // Constructors and destructor
-        
-        /**
-        * Destructor.
-        */
-        virtual ~Cdmatest();
-
-    public: // Functions from base classes
-
-        /**
-        * From CScriptBase Runs a script line.
-        * @since ?Series60_version
-        * @param aItem Script line containing method name and parameters
-        * @return Symbian OS error code
-        */
-        virtual TInt RunMethodL( CStifItemParser& aItem ) = 0;
-    
-
-	public:
-		/**
-		The function is used to return the data in case of FetchLeafObjectL(),
-		FetchLeafObjectSizeL() and ChildURIListL() functions. It should not be
-		called where the DM command has failed, i.e. the error code returned in
-		SetStatusL is something other than EOk.
-		@param aResultsRef	Reference to correct command
-		@param aObject		The data which should be returned
-		@param aType			MIME type of the object
-		@publishedPartner
-		@prototype
-		*/
-		void SetResultsL( TInt aResultsRef, CBufBase& aObject,
-								  const TDesC8& aType );
-		
-		/**
-		The function is used to return the data in case of FetchLeafObjectL() and
-		ChildURIListL() functions, where the size of the data being returned is
-		large enough for the Adapter to stream it. This function should not be
-		called when command was failed, i.e. the error code returned in SetStatusL
-		is something other than EOk.
-		@param aResultsRef	Reference to correct command
-		@param aStream		Large data which should be returned, DM engine
-								closes stream when it has read all the data
-		@param aType			MIME type of the object
-		@publishedPartner
-		@prototype
-		*/
-		void SetResultsL( TInt /*aResultsRef*/, RReadStream*& /*aStream*/,
-								  const TDesC8& /*aType*/ ) 
-		{
-			
-		}
-
-		/**
-		The function returns information about the Add,Update,Delete and Fetch
-		commands success to DM engine. The reference to correct command must be
-		used when calling the SetStatusL function, the reference is got from the
-		argument of the command functions. The SetStatusL function must be called
-		separately for every single command.
-		@param aStatusRef	Reference to correct command
-		@param aErrorCode	Information about the command success
-		@publishedPartner
-		@prototype
-		*/
-		void SetStatusL( TInt aStatusRef,
-								 MSmlDmAdapter::TError aErrorCode ) ;
-
-		/**
-		The function passes map information to DM Module. This function is called
-		for a new management object, both for node objects and for leaf objects.
-		In addition if ChildURIListL() function has returned new objects a mapping
-		information of the new objects must be passed. A mapping is treated as
-		inheritable. If the mapping is not set with this function, the mapping
-		LUID of the parent object is passed in following commands to the object.
-		@param aURI	URI of the object. 
-		@param aLUID	LUID of the object. LUID must contain the all information,
-						which is needed for retrieve the invidual object from the
-						database. Typically it is ID for the database table. In
-						more complicated structures it can be combination of IDs,
-						which represent path to the object.
-		@publishedPartner
-		@prototype
-		*/
-		void SetMappingL( const TDesC8& aURI, const TDesC8& aLUID );
-
-		/**
-		The function is used to make a fetch to other adapters. The most common
-		use is to make a fetch to the AP adapter, because when managing the access
-		points, the data comes as URI. For example, there are ToNAPId field in
-		some adapters, and data to it can be something like AP/IAPidx, and then
-		the link to AP adapter is needed.
-		Using FetchLinkL causes the DM Framework to make a Get request to the
-		appropriate DM adapter.  The receiving adapter MUST complete the Get
-		request synchronously.
-		@param aURI		URI of the object. 
-		@param aData		Reference to data, i.e. data is returned here
-		@param aStatus	The status of fetch command is returned here
-		@publishedPartner
-		@prototype
-		*/
-		void FetchLinkL( const TDesC8& /*aURI*/, CBufBase& /*aData*/,
-								 MSmlDmAdapter::TError& /*aStatus*/ ) 
-			{
-				
-			}
-
-		/**
-		The function returns the LUID which is mapped to aURI. If LUID is not
-		found, the function allocates a null length string, i.e. the function
-		allocates memory in every case.
-		@param aURI	URI of the object. 
-		@publishedPartner
-		@prototype
-		*/
-		HBufC8* GetLuidAllocL( const TDesC8& aURI ) ;
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-    
-    void GetMappingInfoListL( const TDesC8& aURI,
-								CArrayFix<TSmlDmMappingInfo>& aSegmentList );
-
-#else
-// nothing
-#endif
-		        
-    protected:  // New functions
-
-        
-		void FetchNodeResultsL( TInt aResultsRef, CBufBase& aObject,
-							  const TDesC8& aType );
-		void SaveDataL( TInt aResultsRef, CBufBase& aObject,
-							  const TDesC8& aType ) ;
-							  
-		TPtrC8 LastURISeg( const TDesC8& aURI );
-		TPtrC8 RemoveLastURISeg( const TDesC8& aURI );
-		TPtrC RemoveLastURISeg( const TDesC& aURI );
-		void SetURIL( const TDesC& aURI );
-		void SetURIL( const TDesC8& aURI );
-		void SetURIL( HBufC8* aURI );		
-		HBufC8 *LoadFileLC( const TDesC &aFileName, TDataType &aType );
-		HBufC8 *LoadFileLC( const TDesC8 &aFileName, TDataType &aType );
-		HBufC8 *GetNextStringLC ( CStifItemParser& aItem, const TDesC &aName );
-		HBufC8* GetLuidAllocLC( const TDesC8& aURI ) ;
-		TPtrC8 RemoveLastSeg(const TDesC8& aURI);
-		
-		TInt FetchNodeL( CStifItemParser& aItem ) ;
-		TInt FetchLeafL( CStifItemParser& aItem ) ;
-		TInt AddNodeL( CStifItemParser& aItem );
-		TInt DeleteObjectL( CStifItemParser& aItem );	
-		TInt UpdateLeafL( CStifItemParser& aItem )	;
-		TInt UpdateLeafDataL( CStifItemParser& aItem ) ;
-		TInt UpdateLeafDataURLL( CStifItemParser& aItem ) ;
-		
-		TInt ExecuteLeafL ( CStifItemParser& aItem ) ;
-		TInt ExecuteLeafDataL ( CStifItemParser& aItem ) ;
-		TInt StartAtomicL( CStifItemParser& aItem )	;
-		TInt CommitAtomicL( CStifItemParser& aItem )	;
-		TInt RollbackAtomicL( CStifItemParser& aItem )	;
-		TInt CompleteCommandsL( CStifItemParser& aItem );
-		TInt DDFStructureL( CStifItemParser& aItem )	;
-//        TInt DeliverL( CStifItemParser& aItem ) ;
-//        TInt DetailsL( CStifItemParser& aItem ) ;
-//		TInt InstallL( CStifItemParser& aItem ) ;
-//		TInt BareInstallL( CStifItemParser& aItem ) ;		
-
-    protected:
-
-        /**
-        * C++ default constructor.
-        */
-        Cdmatest( CTestModuleIf& aTestModuleIf, TUid aUid );
-
-        /**
-        * By default Symbian 2nd phase constructor is private.
-        */
-        void ConstructL();
-
-        // Prohibit copy constructor if not deriving from CBase.
-        // Cdmatest( const Cdmatest& );
-        // Prohibit assigment operator if not deriving from CBase.
-        // Cdmatest& operator=( const Cdmatest& );
-
-		/**
-        * Frees all resources allocated from test methods.
-        * @since ?Series60_version
-        */
-        virtual void Delete();
-        void LoadMappingsL();
-        void SaveMappingsL();
-    public:     // Data
-        // ?one_line_short_description_of_data
-        //?data_declaration;
-    
-    protected:  // Data
-        // ?one_line_short_description_of_data
-        //?data_declaration;
-		MSmlDmAdapter::TError iStatus ;
-        ResultsFunction iResultsFunction;
-        //CSmlDmAdapter *iAdapter ;
-        CNSmlDMSettingsAdapter *iAdapter ;
-        HBufC8 *iURI; 
-        CArrayFix<TSmlDmMappingInfo> *iEmptyMappingInfoArray;
-		TFileName iSaveFileName;
-		RMappingArray iMappingTable;
-		TUid iUid;
-		TInt iCounter;
-		//class CNSmlDmMgmtTree* iMgmtTree;
-		class CNSmlDmMgmtTree* iMgmtTree;
-		CNSmlDMSettingsAdapter *Adapter() ;
-    };
-
-#endif      // __DMA_TEST_H__
-            
-// End of File
--- a/omadm/omadmextensions/adapters/syncmldm/tsrc/inc/syncmldmtest.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,133 +0,0 @@
-/*
-* Copyright (c) 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:  Implementation of DM adapter test component
-* 	This is part of omadmextensions/adapter test application.
-*
-*/
-
-
-
-
-
-
-#ifndef TCTEST_H
-#define TCTEST_H
-
-//  INCLUDES
-#include <StifLogger.h>
-#include <TestScripterInternal.h>
-#include <StifTestModule.h>
-#include <smldmadapter.h>
-#include "dmatest.h"
-
-const TUint KNSmlDMSettingsAdapterImplUid = 0x101F6DEC;
-	
-
-const TUid KAdapterUid = 
-		{
-		KNSmlDMSettingsAdapterImplUid
-		};
-// Logging path
-_LIT( KamtestLogPath, "\\logs\\testframework\\tctest\\" ); 
-// Log file
-_LIT( KamtestLogFile, "tctest.txt" ); 
-
-
-// FORWARD DECLARATIONS
-class Csyncmldmtest;
-
-
-// CLASS DECLARATION
-
-/**
-*  Csyncmldmtest test class for STIF Test Framework TestScripter.
-*  ?other_description_lines
-*
-*  @lib ?library
-*  @since ?Series60_version
-*/
-class Csyncmldmtest : public Cdmatest
-    {
-    public:  // Constructors and destructor
-        
-        /**
-        * Two-phased constructor.
-        */
-        static Csyncmldmtest* NewL( CTestModuleIf& aTestModuleIf );
-        
-        /**
-        * Destructor.
-        */
-        virtual ~Csyncmldmtest();
-
-    public: // Functions from base classes
-
-        /**
-        * From CScriptBase Runs a script line.
-        * @since ?Series60_version
-        * @param aItem Script line containing method name and parameters
-        * @return Symbian OS error code
-        */
-        virtual TInt RunMethodL( CStifItemParser& aItem );
-                
-
-    private:
-
-        /**
-        * C++ default constructor.
-        */
-        Csyncmldmtest( CTestModuleIf& aTestModuleIf );
-
-        /**
-        * By default Symbian 2nd phase constructor is private.
-        */
-        void ConstructL();
-
-        // Prohibit copy constructor if not deriving from CBase.
-        // ?classname( const ?classname& );
-        // Prohibit assigment operator if not deriving from CBase.
-        // ?classname& operator=( const ?classname& );
-    
-        /**
-        * Frees all resources allocated from test methods.
-        * @since ?Series60_version
-        */
-        virtual void Delete();
-        
-        /**
-        * Test methods are listed below. 
-        */
-        
-        /**
-        * Example test method.
-        * @since ?Series60_version
-        * @param aItem Script line containing parameters.
-        * @return Symbian OS error code.
-        */
-/*        virtual TInt ExampleL( CStifItemParser& aItem ) ;
-        virtual TInt DeliverL( CStifItemParser& aItem ) ;
-        virtual TInt DetailsL( CStifItemParser& aItem ) ;
-		    virtual TInt InstallL( CStifItemParser& aItem ) ;
-		    virtual TInt BareInstallL( CStifItemParser& aItem ) ;*/
-		
-
-    private:    // Data
-        HBufC8 *GetNextStringLC ( CStifItemParser& aItem, const TDesC &aName );
-
-
-    };
-
-#endif      // TCTEST_H
-            
-// End of File
--- a/omadm/omadmextensions/adapters/syncmldm/tsrc/init/syncmldmtest.ini	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,204 +0,0 @@
-#
-# This is STIF initialization file
-# Comment lines start with '#'-character.
-# See STIF TestFramework users guide.doc for instructions
-
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-# Set following test engine settings:
-#	- Set Test Reporting mode. TestReportMode's possible values are:
-#		+ 'Summary': Summary of the tested test cases.
-#		+ 'Environment': Hardware and software info.
-#		+ 'TestCases': Test case report.
-#		+ 'FullReport': Set of all above ones.
-#		+ Example 'TestReportMode= Summary TestCases'
-#
-# 	- CreateTestReport setting controls report creation mode
-#		+ YES, Test report will created.
-#		+ NO, No Test report.
-#
-# 	- File path indicates the base path of the test report.
-# 	- File name indicates the name of the test report.
-#
-# 	- File format indicates the type of the test report.
-#		+ TXT, Test report file will be txt type, for example 'TestReport.txt'.
-#		+ HTML, Test report will be html type, for example 'TestReport.html'.
-#
-# 	- File output indicates output source of the test report.
-#		+ FILE, Test report logging to file.
-#		+ RDEBUG, Test report logging to using rdebug.
-#
-# 	- File Creation Mode indicates test report overwriting if file exist.
-#		+ OVERWRITE, Overwrites if the Test report file exist.
-#		+ APPEND, Continue logging after the old Test report information if
-#                 report exist.
-# 	- Sets a device reset module's dll name(Reboot).
-#		+ If Nokia specific reset module is not available or it is not correct one
-#		  StifHWResetStub module may use as a template for user specific reset
-#		  module.
-# 	- Sets STIF test measurement disable options. e.g. pluging1 and pluging2 disablation
-#		DisableMeasurement= stifmeasurementplugin01 stifmeasurementplugin02
-#
-
-[Engine_Defaults]
-
-TestReportMode= FullReport    # Possible values are: 'Empty', 'Summary', 'Environment',
-                                                     'TestCases' or 'FullReport'
-
-CreateTestReport= YES         # Possible values: YES or NO
-
-TestReportFilePath= C:\LOGS\TestFramework\
-TestReportFileName= TestReport
-
-TestReportFormat= TXT         # Possible values: TXT or HTML
-TestReportOutput= FILE        # Possible values: FILE or RDEBUG
-TestReportFileCreationMode= OVERWRITE # Possible values: OVERWRITE or APPEND
-
-DeviceResetDllName= StifResetForNokia.dll # e.g. 'StifHWResetStub.dll' for user specific reseting
-
-DisableMeasurement= stifmeasurementdisablenone  # Possible values are:
-              # 'stifmeasurementdisablenone', 'stifmeasurementdisableall'
-              # 'stifmeasurementplugin01', 'stifmeasurementplugin02',
-              # 'stifmeasurementplugin03', 'stifmeasurementplugin04',
-              # 'stifmeasurementplugin05' or 'stifbappeaprofiler'
-
-Timeout= 0                    # Default timeout value for each test case. In milliseconds
-#UITestingSupport= YES        # Possible values: YES or NO
-#SeparateProcesses= YES       # Possible values: YES or NO (default: NO)
-[End_Defaults]
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-
-
-
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-# Module configurations start
-# Modules are added between module tags
-# tags. Module name is specified after ModuleName= tag, like
-# ModuleName= XXXXXXXXX
-# Modules might have initialisation file, specified as
-# IniFile= c:\testframework\YYYYYY
-# Modules might have several configuration files, like
-# TestCaseFile= c:\testframework\NormalCases.txt
-# TestCaseFile= c:\testframework\SmokeCases.txt
-# TestCaseFile= c:\testframework\ManualCases.txt
-
-# (TestCaseFile is synonym for old term ConfigFile)
-
-# Following case specifies demo module settings. Demo module
-# does not read any settings from file, so tags 
-# IniFile and TestCaseFile are not used.
-# In the simplest case it is enough to specify only the
-# name of the test module when adding new test module
-
-#[New_Module]
-#ModuleName= demomodule
-#[End_Module]
-
-
-[New_Module]
-ModuleName= testscripter
-#DM
-TestCaseFile= c:\testframework\syncmldmtest.cfg
-[End_Module]
-
-
-# Load testmoduleXXX, optionally with initialization file and/or test case files
-#[New_Module]
-#ModuleName= testmodulexxx
-
-#TestModuleXXX used initialization file
-#IniFile= c:\testframework\init.txt
-
-#TestModuleXXX used configuration file(s)
-#TestCaseFile= c:\testframework\testcases1.cfg
-#TestCaseFile= c:\testframework\testcases2.cfg
-#TestCaseFile= c:\testframework\manualtestcases.cfg
-
-#[End_Module]
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-
-
-
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-# Set STIF logging overwrite parameters for Logger.
-# 	Hardware and emulator environment logging path and styles can
-# 	be configured from here to overwrite the Logger's implemented values.
-#	
-#	Settings description:
-#	- Indicates option for creation log directory/directories. If log directory/directories
-#         is/are not created by user they will make by software.
-#		+ YES, Create log directory/directories if not allready exist.
-#		+ NO, Log directory/directories not created. Only created one is used.
-#
-#	- Overwrite emulator path setting.
-#		+ Example: If 'EmulatorBasePath= C:\LOGS\TestFramework\' and in code is defined 
-#		           Logger's path 'D:\\LOGS\\Module\\' with those definition the path
-#		           will be 'C:\LOGS\TestFramework\LOGS\Module\'
-#
-#	- Overwrite emulator's logging format.
-#		+ TXT, Log file(s) will be txt type(s), for example 'Module.txt'.
-#		+ HTML, Log file(s) will be html type(s), for example 'Module.html'.
-#
-#	- Overwrited emulator logging output source.
-#		+ FILE, Logging to file(s).
-#		+ RDEBUG, Logging to using rdebug(s).
-#
-#	- Overwrite hardware path setting (Same description as above in emulator path).
-#	- Overwrite hardware's logging format(Same description as above in emulator format).
-#	- Overwrite hardware's logging output source(Same description as above in emulator output).
-#
-#	- File Creation Mode indicates file overwriting if file exist.
-#		+ OVERWRITE, Overwrites if file(s) exist.
-#		+ APPEND, Continue logging after the old logging information if file(s) exist.
-#
-#	- Will thread id include to the log filename.
-#		+ YES, Thread id to log file(s) name, Example filename 'Module_b9.txt'.
-#		+ NO, No thread id to log file(s), Example filename 'Module.txt'.
-#
-#	- Will time stamps include the to log file.
-#		+ YES, Time stamp added to each line in log file(s). Time stamp is 
-#                 for example'12.Nov.2003 115958    LOGGING INFO'
-#		+ NO, No time stamp(s).
-#
-#	- Will line breaks include to the log file.
-#		+ YES, Each logging event includes line break and next log event is in own line.
-#		+ NO, No line break(s).
-#
-#	- Will event ranking include to the log file.
-#		+ YES, Event ranking number added to each line in log file(s). Ranking number
-#                 depends on environment's tics, for example(includes time stamp also)
-#                 '012   12.Nov.2003 115958    LOGGING INFO'
-#		+ NO, No event ranking.
-#
-#	- Will write log file in unicode format.
-#		+ YES, Log file will be written in unicode format
-#		+ NO, Log will be written as normal, not unicode, file.
-#
-
-[Logger_Defaults]
-
-#NOTE: If you want to set Logger using next setting(s) remove comment(s)'#'
-#NOTE: TestEngine and TestServer logging settings cannot change here
-
-#CreateLogDirectories= YES    # Possible values: YES or NO
-
-#EmulatorBasePath= C:\LOGS\TestFramework\
-#EmulatorFormat= HTML         # Possible values: TXT or HTML
-#EmulatorOutput= FILE         # Possible values: FILE or RDEBUG
-
-#HardwareBasePath= D:\LOGS\TestFramework\
-#HardwareFormat= HTML         # Possible values: TXT or HTML
-#HardwareOutput= FILE         # Possible values: FILE or RDEBUG
-
-#FileCreationMode= OVERWRITE  # Possible values: OVERWRITE or APPEND
-
-#ThreadIdToLogFile= YES       # Possible values: YES or NO
-#WithTimeStamp= YES           # Possible values: YES or NO
-#WithLineBreak= YES           # Possible values: YES or NO
-#WithEventRanking= YES        # Possible values: YES or NO
-
-#FileUnicode= YES             # Possible values: YES or NO
-#AddTestCaseTitle= YES        # Possible values: YES or NO
-[End_Logger_Defaults]
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-
-# End of file
--- a/omadm/omadmextensions/adapters/syncmldm/tsrc/src/TestDmDDFObject.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,516 +0,0 @@
-/*
-* Copyright (c) 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:  Implementation of DM adapter test component
-* 	This is part of omadmextensions/adapter test application.
-*
-*/
-
-
-
-
-
-
-// INCLUDE FILES
-
-#include "TestDmDDFObject.h"
-#include "StifLogger.h"
-
-// EXTERNAL DATA STRUCTURES
-//extern  ?external_data;
-
-// EXTERNAL FUNCTION PROTOTYPES  
-//extern ?external_function( ?arg_type,?arg_type );
-
-// CONSTANTS
-//const ?type ?constant_var = ?constant;
-
-// MACROS
-//#define ?macro ?macro_def
-
-// LOCAL CONSTANTS AND MACROS
-//const ?type ?constant_var = ?constant;
-//#define ?macro_name ?macro_def
-
-// MODULE DATA STRUCTURES
-//enum ?declaration
-//typedef ?declaration
-
-// LOCAL FUNCTION PROTOTYPES
-//?type ?function_name( ?arg_type, ?arg_type );
-
-// FORWARD DECLARATIONS
-//class ?FORWARD_CLASSNAME;
-
-// ============================= LOCAL FUNCTIONS ===============================
-
-
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CTestDmDDFObject::CTestDmDDFObject
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CTestDmDDFObject::CTestDmDDFObject( CStifLogger *aLog )
-	: iName( 0 )
-	, iAccessTypes()
-	, iDefaultValue( 0 )
-	, iDescription( 0 )
-	, iFormat( (TDFFormat)0 )
-	, iOccurence( (TOccurence)0 )
-	, iScope( (TScope)0 )
-	, iTitle ( 0 )
-	, iMimeType( 0 )
-	, iObjectGroup( EFalse )
-	, iLog( aLog )
-//	RPointerArray<CTestDmDDFObject> iChildren;
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// CTestDmDDFObject::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CTestDmDDFObject::ConstructL()
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// CTestDmDDFObject::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CTestDmDDFObject* CTestDmDDFObject::NewL( CStifLogger *aLog )
-    {
-    CTestDmDDFObject* self = CTestDmDDFObject::NewLC( aLog );
-    CleanupStack::Pop( self );
-
-    return self;
-    }
-
-CTestDmDDFObject* CTestDmDDFObject::NewLC( CStifLogger *aLog )
-    {
-    CTestDmDDFObject* self = new( ELeave ) CTestDmDDFObject( aLog );
-    
-    CleanupStack::PushL( self );
-    self->ConstructL();
-
-    return self;
-    }
-
-    
-// Destructor
-CTestDmDDFObject::~CTestDmDDFObject()
-    {
-	delete iName;
-	delete iDefaultValue;
-	delete iDescription;
-	delete iTitle;
-	delete iMimeType;
-	iChildren.ResetAndDestroy();
-    }
-
-
-// -----------------------------------------------------------------------------
-// CTestDmDDFObject::?member_function
-// ?implementation_description
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-/*?type CTestDmDDFObject::?member_function(
-    ?arg_type arg,
-    ?arg_type arg )
-    {
-    
-    ?code
-    
-    }
-*/
-
-void CTestDmDDFObject::SetAccessTypesL( TSmlDmAccessTypes aAccessTypes )
-	{
-	iLog->Log( _L8( "SetAccessTypesL, aAccessTypes=%d" ), aAccessTypes.GetACL() );
-	iAccessTypes = aAccessTypes;
-	}
-
-void CTestDmDDFObject::SetDefaultValueL( const TDesC8& aDefaultValue )
-	{
-	iLog->Log( _L8( "SetDefaultValueL, aDefaultValue='%S'" ), &aDefaultValue );
-	delete iDefaultValue;
-	iDefaultValue = 0;
-	iDefaultValue = aDefaultValue.AllocL();
-	}
-
-void CTestDmDDFObject::SetDescriptionL( const TDesC8& aDescription )
-	{
-	iLog->Log( _L8( "SetDescriptionL, aDescription='%S'" ), &aDescription );
-	delete iDescription;
-	iDescription = 0;
-	iDescription = aDescription.AllocL();
-	}
-	
-void CTestDmDDFObject::SetDFFormatL( TDFFormat aFormat )
-	{
-	iLog->Log( _L8( "SetDFFormatL, aFormat=%d" ), aFormat );
-	iFormat = aFormat;
-	}
-	
-void CTestDmDDFObject::SetOccurenceL( TOccurence aOccurence )
-	{
-	iLog->Log( _L8( "SetOccurenceL, aOccurence=%d" ), aOccurence );
-	iOccurence = aOccurence;
-	}
-	
-void CTestDmDDFObject::SetScopeL( TScope aScope )
-	{
-	iLog->Log( _L8( "SetScopeL, aScope=%d" ), aScope );
-	iScope = aScope;
-	}
-	
-void CTestDmDDFObject::SetDFTitleL( const TDesC8& aTitle )
-	{
-	iLog->Log( _L8( "SetDFTitleL, aTitle='%S'" ), &aTitle );
-	delete iTitle;
-	iTitle = 0;
-	iTitle = aTitle.AllocL();
-	}
-	
-void CTestDmDDFObject::AddDFTypeMimeTypeL( const TDesC8& aMimeType )
-	{
-	iLog->Log( _L8( "AddDFTypeMimeTypeL, aMimeType='%S'" ), &aMimeType );
-	delete iMimeType;
-	iMimeType = 0;
-	iMimeType = aMimeType.AllocL();
-	}
-	
-void CTestDmDDFObject::SetAsObjectGroup()
-	{
-	iLog->Log( _L8( "SetAsObjectGroup, true" ) );
-	iObjectGroup = ETrue;
-	}
-	
-MSmlDmDDFObject& CTestDmDDFObject::AddChildObjectL(const TDesC8& aNodeName)
-	{
-	iLog->Log( _L8( "AddChildObjectL, aNodeName='%S'" ), &aNodeName );
-	CTestDmDDFObject* child = CTestDmDDFObject::NewLC( iLog ); //, aNodeName );
-	child->SetNameL( aNodeName );
-	iChildren.AppendL( child );
-	CleanupStack::Pop( child ); // Don't destroy
-	return *child;
-	}
-
-MSmlDmDDFObject& CTestDmDDFObject::AddChildObjectGroupL()
-	{
-	iLog->Log( _L8( "AddChildObjectGroupL, ''" ) );
-	CTestDmDDFObject* child = CTestDmDDFObject::NewLC( iLog ); //, KNullDesC );
-	child->SetAsObjectGroup();
-	iChildren.AppendL( child );
-	CleanupStack::Pop( child ); // Don't destroy
-	return *child;
-	}
-
-// Own functions
-
-void CTestDmDDFObject::SetNameL( const TDesC8& aName )
-	{
-	delete iName;
-	iName = 0;
-	iName = aName.AllocL();
-	}
-
-void CTestDmDDFObject::DumpL( const TDesC8& aParentName, TBool aFullDump )
-	{
-	TPtrC8 name( _L8("<X>") );
-	if (iName && iName->Length() > 0)
-		{
-		name.Set( *iName );
-		}
-
-	HBufC8* fullName = HBufC8::NewLC( aParentName.Length() + name.Length() + 1 );
-	*fullName = aParentName;
-	if (aParentName.Length() > 0 && aParentName[ aParentName.Length() - 1 ] != '/')
-		{
-		fullName->Des().Append( _L8("/"));
-		}
-	fullName->Des().Append( name );
-
-	/* Translate some members to text for dumping */
-	TBuf8<20> strAccessTypes;
-	TUint8 accessTypes = iAccessTypes.GetACL();
-	if ((accessTypes & iAccessTypes.EAccessType_Add) != 0)
-		{
-		strAccessTypes.Append( _L8("A") );
-		}
-	if ((accessTypes & iAccessTypes.EAccessType_Copy) != 0)
-		{
-		strAccessTypes.Append( _L8("C") );
-		}
-	if ((accessTypes & iAccessTypes.EAccessType_Delete) != 0)
-		{
-		strAccessTypes.Append( _L8("D") );
-		}
-	if ((accessTypes & iAccessTypes.EAccessType_Exec) != 0)
-		{
-		strAccessTypes.Append( _L8("E") );
-		}
-	if ((accessTypes & iAccessTypes.EAccessType_Get) != 0)
-		{
-		strAccessTypes.Append( _L8("G") );
-		}
-	if ((accessTypes & iAccessTypes.EAccessType_Replace) != 0)
-		{
-		strAccessTypes.Append( _L8("R") );
-		}
-	
-	TBuf8<20> strFormat;
-	switch( iFormat )
-		{
-	case EB64:
-		strFormat = _L8("Base64");
-		break;
-	case EBool:
-		strFormat = _L8("Bool");
-		break;
-	case EChr:
-		strFormat = _L8("Chr");
-		break;
-	case EInt:
-		strFormat = _L8("Int");
-		break;
-	case ENode:
-		strFormat = _L8("Node");
-		break;
-	case ENull:
-		strFormat = _L8("Null");
-		break;
-	case EXml:
-		strFormat = _L8("Xml");
-		break;
-	case EBin:
-		strFormat = _L8("Bin");
-		break;
-	default:
-		break;
-		}
-
-
-	TBuf8<20> strOccurence;
-	switch( iOccurence )
-		{
-	case EOne:
-		/** The node appears exactly once */
-		strOccurence = _L8("M:1");
-		break;
-	case EZeroOrOne:
-		/** The node is optional and may appear zero or once */
-		strOccurence = _L8("O:0-1");
-		break;
-	case EZeroOrMore:
-		/** The node is optional and may appear zero or more times */
-		strOccurence = _L8("O:0-*");
-		break;
-	case EOneOrMore:
-		/** The node is mandatory and may appear once or more times */
-		strOccurence = _L8("M:1-*");
-		break;
-	case EZeroOrN:
-		/** The node is optional and may appear between once and 'N' times */
-		strOccurence = _L8("O:1-N");
-		break;
-	case EOneOrN:
-		/** The node is mandatory and may appear between once and 'N' times */
-		strOccurence = _L8("M:1-N");
-		break;
-	default:
-		break;
-		}
-	
-	
-	TBuf8<20> strScope;
-	switch( iScope)
-		{
-	case EPermanent:
-		/** The node appears exactly once */
-		strScope = _L8("Permanent");
-		break;
-	case EDynamic:
-		/** The node is optional and may appear zero or once */
-		strScope = _L8("O:Dynamic");
-		break;
-	default:
-		break;
-		}
-
-	
-	/* Dump main data */
-	if (aFullDump)
-		{
-		iLog->Log( _L8( "DDFObject: '%S'" ), fullName );
-		}
-		else
-		{
-		iLog->Log( _L8( "DDFObject: '%S'   (%S), %S, %S, %S" ),
-					fullName, &strAccessTypes, &strFormat, &strOccurence, &strScope );
-		}
-	
-	/* Dump members */
-	if (aFullDump)
-		{
-		TPtrC8 empty( _L8( "<null>" ) );
-		#define CHK_NULL(a) ((a)==0?(TDesC8*)(&empty):(TDesC8*)(a))
-
-		iLog->Log( _L8( "    iName=='%S'" ), iName );
-		iLog->Log( _L8( "    iAccessTypes=%d (%S)" ), iAccessTypes.GetACL(), &strAccessTypes );
-		iLog->Log( _L8( "    iDefaultValue='%S'" ), CHK_NULL(iDefaultValue));
-		iLog->Log( _L8( "    iDescription='%S'" ), CHK_NULL(iDescription ));
-		iLog->Log( _L8( "    iFormat=%d (%S)" ), iFormat, &strFormat );
-		iLog->Log( _L8( "    iOccurence=%d (%S)" ), iOccurence, &strOccurence );
-		iLog->Log( _L8( "    iScope=%d (%S)" ), iScope, &strScope );
-		iLog->Log( _L8( "    iTitle='%S'" ), CHK_NULL(iTitle ));
-		iLog->Log( _L8( "    iMimeType='%S'" ), CHK_NULL(iMimeType ));
-		iLog->Log( _L8( "----------------------------------" ) );
-		}
-	
-	/* Dump children */
-	for (TInt i = 0 ; i < iChildren.Count() ; i++)
-		{
-		iChildren[i]->DumpL( *fullName, aFullDump );
-		}
-
-	CleanupStack::PopAndDestroy( fullName );
-	}
-
-/*
-void CTestDmDDFObject::ExternalizeL(RWriteStream& aStream) const
-	{
-	X;
-	aStream << *iName << eol;
-	}
-*/
-
-const TDesC8& CTestDmDDFObject::Name()
-	{
-	return (iName != 0) ? *iName : KNullDesC8();
-	}
-
-TSmlDmAccessTypes  CTestDmDDFObject::AccessTypes()
-	{
-	return iAccessTypes;
-	}
-
-const TDesC8& CTestDmDDFObject::DefaultValue()
-	{
-	return (iDefaultValue != 0) ? *iDefaultValue : KNullDesC8();
-	}
-
-const TDesC8& CTestDmDDFObject::Description()
-	{
-	return (iDescription != 0) ? *iDescription : KNullDesC8();
-	}
-
-CTestDmDDFObject::TDFFormat CTestDmDDFObject::DFFormat()
-	{
-	return iFormat;
-	}
-
-CTestDmDDFObject::TOccurence CTestDmDDFObject::Occurence()
-	{
-	return iOccurence;
-	}
-
-CTestDmDDFObject::TScope CTestDmDDFObject::Scope()
-	{
-	return iScope;
-	}
-
-const TDesC8& CTestDmDDFObject::DFTitle()
-	{
-	return (iTitle != 0) ? *iTitle : KNullDesC8();
-	}
-
-const TDesC8& CTestDmDDFObject::DFTypeMimeType()
-	{
-	return (iMimeType != 0) ? *iMimeType : KNullDesC8();
-	}
-
-TBool CTestDmDDFObject::ObjectGroup()
-	{
-	return iObjectGroup;
-	}
-
-TInt CTestDmDDFObject::ChildObjectCount()
-	{
-	return iChildren.Count();
-	}
-
-CTestDmDDFObject& CTestDmDDFObject::ChildObject( TInt aIndex )
-	{
-	return *iChildren[aIndex];
-	}
-
-CTestDmDDFObject* CTestDmDDFObject::FindChildObject( const TDesC8& aName )
-	{
-	CTestDmDDFObject* foundObject = 0;
-
-	for (TInt i = 0 ; i < iChildren.Count() ; i++)
-		{
-		if ( aName.CompareC( iChildren[i]->Name() ) == 0 )
-			{
-			foundObject = iChildren[i];
-			break;
-			}
-		}
-
-	return foundObject;
-	}
-
-TInt CTestDmDDFObject::SubObjectsCount()
-	{
-	TInt count = 0;
-
-	TInt i;
-	for (i = 0 ; i < iChildren.Count() ; i++)
-		{
-		count += iChildren[i]->SubObjectsCount();
-		}
-	count += i;
-
-	return count;
-	}
-
-/*
-// ========================== OTHER EXPORTED FUNCTIONS =========================
-
-// -----------------------------------------------------------------------------
-// ?function_name implements...
-// ?implementation_description.
-// Returns: ?value_1: ?description
-//          ?value_n: ?description
-//                    ?description
-// -----------------------------------------------------------------------------
-//
-?type  ?function_name(
-    ?arg_type arg,  // ?description
-    ?arg_type arg )  // ?description
-    {
-
-    ?code
-
-    }
-*/
-//  End of File  
--- a/omadm/omadmextensions/adapters/syncmldm/tsrc/src/dmatest.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,954 +0,0 @@
-/*
-* Copyright (c) 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:  Implementation of DM adapter test component
-* 	This is part of omadmextensions/adapter test application.
-*
-*/
-
-
-
-
-
-
-// INCLUDE FILES
-#include "dmatest.h"
-
-#include <StifParser.h>
-#include <Stiftestinterface.h>
-#include <S32FILE.H>
-#include <s32mem.h>
-#include <apgcli.h>
-#include <e32svr.h>
-#include <e32math.h>
-#include <f32file.h>
-#include <swinstapi.h>
-
-#include "TestDmDDFObject.h"
-
-_LIT8( KEmptyType, "" );
-_LIT8( KDefaultType, "text/plain" );
-_LIT( KMappingTableFile, "\\dmtestmappings.txt" );
-//_LIT8( KNSmlDMSeparator8, "/" );
-//const TUint8 KNSmlDMUriSeparator = 0x2f; //forward slash
-
-#define LEAVE_IF_ERROR(x,msg) \
-	{ TInt __xres = (x); if ( __xres < 0 ) { if ( iLog ) iLog->Log( (msg), __xres ); User::Leave( __xres );	} }
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// Cdmatest::Cdmatest
-// C++ default constructor can NOT contain any code, that
-// leave.
-// -----------------------------------------------------------------------------
-//
-Cdmatest::Cdmatest(CTestModuleIf& aTestModuleIf, TUid aUid ):
-        CScriptBase( aTestModuleIf ), iMappingTable(2), iUid( aUid )
-    {
-    
-    }
-
-// -----------------------------------------------------------------------------
-// Cdmatest::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void Cdmatest::ConstructL()
-    {    
-    Adapter();
-	iEmptyMappingInfoArray = new ( ELeave ) CArrayFixFlat<TSmlDmMappingInfo>(1);
-	
-	TRAPD( err, LoadMappingsL() );
-	if (err != KErrEof && err != KErrNone && err != KErrNotFound)
-		{
-		User::Leave( err );
-		}
-    }
-    
-CNSmlDMSettingsAdapter *Cdmatest::Adapter()  
-	{
-	if ( iAdapter == NULL )
-		{
-		if ( iLog )
-			{
-			iLog->Log( _L( "Loading Adapter" ) );
-			}
-  		
-  		TRAPD( err, iAdapter = (CNSmlDMSettingsAdapter*) CSmlDmAdapter::NewL( iUid,*this ) );
-	if ( err == KErrNone )
-		{
-		if (iLog )
-			{
-			iLog->Log( _L( "Loaded" ) );	
-			}
-		}
-	else
-		{
-		if (iLog)
-			{
-			iLog->Log( _L( "Failed to load adapter: %d" ), err );
-			}
-		}
-		}
-	return iAdapter;
-	}
-    
-    
-void Cdmatest::LoadMappingsL()
-	{
-	TDataType type; 
-	HBufC8 *data = LoadFileLC( KMappingTableFile,  type );
-	RDesReadStream buf( *data );
-	CleanupClosePushL( buf );
-
-	TInt len( data->Length() );
-	while (buf.Source()->TellL( MStreamBuf::ERead ).Offset() < len)
-		{
-		TUint32 val = buf.ReadUint32L();
-		TBuf8<256> uri;
-		TBuf8<64> luid;
-		buf.ReadL(uri, val);
-		val = buf.ReadUint32L();
-		buf.ReadL(luid, val);
-		TMapping m( uri, luid ) ;
-		TInt err( iMappingTable.Append( m )	);
-		if ( err == KErrNone )
-			{
-			iLog->Log( _L8( "Loaded mapping: '%S' : '%S'"), &m.iURI, &m.iLuid );
-			}
-		else
-			{
-			iLog->Log( _L8( "FAILED TO Load mapping: '%d' "), err );
-			}
-		}
-	CleanupStack::PopAndDestroy( &buf); // buf
-	CleanupStack::PopAndDestroy( data ); // data
-	}
-    	
-	
-
-void Cdmatest::SaveMappingsL()
-    {
-	TInt c( iMappingTable.Count() );
-	if ( c > 0 )
-	{
-    	RFs fs;
-    	User::LeaveIfError( fs.Connect() );
-    	CleanupClosePushL( fs );
-    	RFileWriteStream buf;
-    	User::LeaveIfError( buf.Replace( fs, KMappingTableFile, EFileWrite ) );
-    	CleanupClosePushL( buf );
-		
-		TInt i( 0 ) ;
-		do 
-			{
-			buf.WriteUint32L( iMappingTable[i].iURI.Length() );
-			buf.WriteL( iMappingTable[i].iURI );
-			buf.WriteUint32L( iMappingTable[i].iLuid.Length() );
-			buf.WriteL( iMappingTable[i].iLuid );
-			}
-		while ( ++i < c )	;
-		buf.CommitL();
-		buf.Close();
-	
-		CleanupStack::PopAndDestroy(); // buf
-		CleanupStack::PopAndDestroy(); // fs
-		}
-    }
-    	
-    
-// Destructor
-Cdmatest::~Cdmatest()
-    {
-    // Delete resources allocated from test methods
-    TRAPD(err, SaveMappingsL() );
-    if ( err != KErrNone )
-    	{
-    	if(iLog)
-    			iLog->Log( _L8( "Failed to save mappings!: %d"), err );
-    	}
-    Delete();
-    
-    // Delete logger
-    delete iLog;  
-    delete iEmptyMappingInfoArray;
-    delete iAdapter;
-    delete iURI;
-    iMappingTable.Reset();
-    REComSession::FinalClose();
-    }
-
-
-// -----------------------------------------------------------------------------
-// Camatest::Delete
-// Delete here all resources allocated and opened from test methods. 
-// Called from destructor. 
-// -----------------------------------------------------------------------------
-//
-void Cdmatest::Delete() 
-    {
-    
-    }
-
-// -----------------------------------------------------------------------------
-// Cdmatest::?member_function
-// ?implementation_description
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-
-
-        
-HBufC8 *Cdmatest::GetNextStringLC ( CStifItemParser& aItem, const TDesC &aName )
-	{
-	TPtrC nodename( KNullDesC );
-
-    TInt i( aItem.GetNextString ( nodename ) );
-    if ( i != KErrNone ) 
-	    {
-	    iLog->Log( _L( "ERROR Reading '%S' argument: 0x%X" ), &aName, i );
-	    }
-	else
-		{
-		iLog->Log( _L("%S: %S"), &aName, &nodename);
-		}
-	
-	HBufC8 *buf = HBufC8::NewLC( nodename.Length() ) ;
-	buf->Des().Copy( nodename );
-	return buf;
-	}
-	
-TInt Cdmatest::FetchNodeL( CStifItemParser& aItem )	
-	{
-
-    TInt ret( KErrNone );
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("Cdmatest"), _L("FetchNodeL") );
-
-	iResultsFunction = FetchNodeResultsL;
-	
-    TPtrC8 nodename( GetNextStringLC( aItem, _L(" nodename" ) )->Des() ) ;
-		
-	SetURIL(nodename) ;//
-	HBufC8 *luid = GetLuidAllocLC( *iURI );
-
-	Adapter()->ChildURIListL( *iURI, *luid, *iEmptyMappingInfoArray, 4, 5) ;
-
-	if ( iStatus == MSmlDmAdapter::EOk )
-		{
-		}
-	else
-		{
-		iLog->Log( _L("FetchNodeL: ChildUriList Error ! %d" ), iStatus );	
-		ret = KErrGeneral ;
-		}
-	CleanupStack::PopAndDestroy( luid ) ; 
-	CleanupStack::PopAndDestroy() ; // nodename
-	iLog->Log( _L("FetchNodeL: Test Complete with status %d" ), ret );	
-
-    return ret;
-	}
-	
-TInt Cdmatest::StartAtomicL( CStifItemParser& /*aItem*/ )	
-	{
-	TRAPD( err, Adapter()->StartAtomicL() ) ;
-	iLog->Log( _L("StartAtomicL: Atomic started resulting error %d" ), err );	
-    return err;
-	}
-
-TInt Cdmatest::RollbackAtomicL( CStifItemParser& /*aItem*/ )	
-	{
-	TRAPD( err, Adapter()->RollbackAtomicL() ) ;
-	iLog->Log( _L("RollbackAtomicL: Atomic rolled back resulting error %d" ), err );	
-    return err;
-	}
-	
-TInt Cdmatest::CommitAtomicL( CStifItemParser& /*aItem*/ )	
-	{
-	TRAPD( err, Adapter()->CommitAtomicL() ) ;
-	iLog->Log( _L("RollbackAtomicL: Atomic commited resulting error %d" ), err );	
-    return err;
-	}
-	
-
-TInt Cdmatest::DDFStructureL( CStifItemParser& /*aItem*/ )	
-	{
-	CTestDmDDFObject* ddfRoot = CTestDmDDFObject::NewLC( iLog ); //, aNodeName );
-
-	TRAPD( err, iAdapter->DDFStructureL( *ddfRoot ) ) ;
-	CleanupStack::PopAndDestroy( ddfRoot );
-	iLog->Log( _L("DDFStructureL: method called resulting error %d" ), err );	
-    return err;
-	}
-		
-		
-TInt Cdmatest::AddNodeL( CStifItemParser& aItem )	
-	{
-
-    TInt ret( KErrNone );
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("Cdmatest"), _L("AddNodeL") );
-
-    
-    TPtrC8 nodename( GetNextStringLC ( aItem, _L("nodename" ) )->Des() ) ;
-    SetURIL( nodename );
-
-	Adapter()->AddNodeObjectL( *iURI, KEmptyType, 8 ) ;
-	
-	if ( iStatus == MSmlDmAdapter::EOk )
-		{
-		iLog->Log( _L("AddNodeL: AddNodeObjectL Successful! %d" ), iStatus );	
-		}
-	else
-		{
-		iLog->Log( _L("AddNodeL: AddNodeObjectL Error ! %d" ), iStatus );	
-		ret = KErrGeneral ;
-		}
-		
-	CleanupStack::PopAndDestroy() ; // nodename
-	iLog->Log( _L("AddNodeL Test Complete with status %d" ), ret );	
-
-    return ret;
-	}	
-		
-TInt Cdmatest::UpdateLeafL( CStifItemParser& aItem )	
-	{
-
-    TInt ret( KErrNone );
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("Cdmatest"), _L("UpdateLeafL") );
-
-    TPtrC8 nodename( GetNextStringLC ( aItem, _L("Node name") )->Des() ) ;
-    TPtrC8 data (GetNextStringLC( aItem, _L("datafile"))->Des() );
-    
-	HBufC8 *mime = GetNextStringLC( aItem, _L("mime") ) ;
-    SetURIL( nodename );
-    
-    TPtrC8 parentURI(RemoveLastSeg(nodename));
-    HBufC8 *luid = GetLuidAllocLC( parentURI );
-    
-    TDataType type; 
-
-	TPtrC8 mimePtr( *mime == KNullDesC8 ? type.Des8() : mime->Des() );
-
-    /**
-    virtual void UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID,
-									const TDesC8& aObject, const TDesC8& aType,
-									TInt aStatusRef ) = 0;
-    */
-    
-	Adapter()->UpdateLeafObjectL( *iURI , *luid, data, mimePtr, 3);
-
-	if ( iStatus == MSmlDmAdapter::EOk )
-	{
-		iLog->Log( _L("UpdateLeafL: UpdateLeafObjectL Successful! %d" ), iStatus );	
-	}
-	else
-	{
-		iLog->Log( _L("UpdateLeafL UpdateLeafObjectL Error ! %d" ), iStatus );	
-		ret = KErrGeneral ;
-	}
-
-	CleanupStack::PopAndDestroy(); // loadfile
-	CleanupStack::PopAndDestroy(); // luid
-	CleanupStack::PopAndDestroy(); // mime
-	CleanupStack::PopAndDestroy(); // nodename
-
-	iLog->Log( _L("UpdateLeafL Test Complete with status %d" ), ret );	
-
-    return ret;
-	}	
-	
-
-TInt Cdmatest::UpdateLeafDataURLL( CStifItemParser& aItem )	
-	{
-
-    TInt ret( KErrNone );
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("Cdmatest"), _L("UpdateLeafDataL") );
-
-    TPtrC8 nodename( GetNextStringLC ( aItem, _L("Node name") )->Des() ) ;
-    TPtrC8 http (GetNextStringLC( aItem, _L("http"))->Des() );
-    TPtrC8 url (GetNextStringLC( aItem, _L("rest of url"))->Des() );
-	HBufC8 *mime = GetNextStringLC( aItem, _L("mime") ) ;
-    SetURIL( nodename );
-    
-    _LIT8( KTag, "://" );
-    
-    HBufC8 *fullurl = HBufC8::NewLC( http.Length() + KTag().Length() + url.Length() );
-    TPtr8 pfullurl( fullurl->Des() );
-    pfullurl.Copy( http ) ;
-    pfullurl.Append( KTag );
-    pfullurl.Append( url );
-    TPtrC8 mimePtr( *mime == KNullDesC8 ? KDefaultType() : mime->Des() );
-    
-    HBufC8 *luid = GetLuidAllocLC( *iURI );
-    /**
-    virtual void UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID,
-									const TDesC8& aObject, const TDesC8& aType,
-									TInt aStatusRef ) = 0;
-    */
-	Adapter()->UpdateLeafObjectL( *iURI , *luid, pfullurl, mimePtr, 3);
-	if ( iStatus == MSmlDmAdapter::EOk )
-		{
-		iLog->Log( _L("UpdateLeafDataL: UpdateLeafObjectL Successful! %d" ), iStatus );	
-		}
-	else
-		{
-		iLog->Log( _L("UpdateLeafDataL UpdateLeafObjectL Error ! %d" ), iStatus );	
-		ret = KErrGeneral ;
-		}
-	CleanupStack::PopAndDestroy( luid ); // 
-	CleanupStack::PopAndDestroy( mime ); // mime
-	CleanupStack::PopAndDestroy(); // url
-	CleanupStack::PopAndDestroy(); // http
-	CleanupStack::PopAndDestroy(); // nodename
-	iLog->Log( _L("UpdateLeafDataL Test Complete with status %d" ), ret );	
-
-    return ret;
-	}
-    
-TInt Cdmatest::UpdateLeafDataL( CStifItemParser& aItem )	
-	{
-
-    TInt ret( KErrNone );
-    // Print to UI
-   TestModuleIf().Printf( 0, _L("Camtest"), _L("UpdateLeafDataL") );
-
-    TPtrC8 nodename( GetNextStringLC ( aItem, _L("Node name") )->Des() ) ;
-    TPtrC8 data (GetNextStringLC( aItem, _L("data"))->Des() );
-	HBufC8 *mime = GetNextStringLC( aItem, _L("mime") ) ;
-	
-    SetURIL( nodename );
-    
-        
-    TPtrC8 mimePtr( *mime == KNullDesC8 ? KDefaultType() : mime->Des() );
-    
-    TPtrC8 parentURI(RemoveLastSeg(nodename));
-    HBufC8 *luid = GetLuidAllocLC( parentURI );
-     
-//    
-//    virtual void UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID,
-//									const TDesC8& aObject, const TDesC8& aType,
-//									TInt aStatusRef ) = 0;
-//   
-	Adapter()->UpdateLeafObjectL( *iURI , *luid, data, mimePtr, 3);
-	if ( iStatus == MSmlDmAdapter::EOk )
-		{
-		iLog->Log( _L("UpdateLeafDataL: UpdateLeafObjectL Successful! %d" ), iStatus );	
-		}
-	else
-		{
-		iLog->Log( _L("UpdateLeafDataL UpdateLeafObjectL Error ! %d" ), iStatus );	
-		ret = KErrGeneral ;
-		}
-	
-	CleanupStack::PopAndDestroy(); // mime
-	CleanupStack::PopAndDestroy(); // luid
-	CleanupStack::PopAndDestroy(); // data
-	CleanupStack::PopAndDestroy(); // nodename
-	iLog->Log( _L("UpdateLeafDataL Test Complete with status %d" ), ret );	
-
-    return ret;
-	}	
-			
-TInt Cdmatest::FetchLeafL( CStifItemParser& aItem )	
-	{
-
-    TInt ret( KErrNone );
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("Camtest"), _L("FetchLeafL") );
-
-	iResultsFunction = NULL;
-	
-    TInt i( 0 );
-    TPtrC8 nodename ( GetNextStringLC( aItem, _L( "nodename" ) )->Des() ) ;
-    
-    //TPtrC datafile;
-    TPtrC datafile( KNullDesC );
-    i = aItem.GetNextString ( datafile ) ;
-    if ( i != KErrNone ) 
-	    {
-	    iLog->Log(_L("FetchLeafL: ERROR Reading outfile argument: 0x%X"), i );
-	    //return i;
-	    }
-	else
-		{
-		iSaveFileName = datafile;
-		iLog->Log( _L( " Save file nameis '%S'" ), &iSaveFileName );
-		iResultsFunction = SaveDataL;
-		}
-    
-	SetURIL(nodename) ;
-		
-		/*
-			void FetchLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID,
-								   const TDesC8& aType, TInt aResultsRef,
-								   TInt aStatusRef );
-		*/
-    TPtrC8 parentURI(RemoveLastSeg(nodename));
-    HBufC8 *luid = GetLuidAllocLC( parentURI );
-
-	Adapter()->FetchLeafObjectL( *iURI, *luid, KEmptyType, 7, 8 ) ;
-	if ( iStatus == MSmlDmAdapter::EOk )
-		{
-		iLog->Log( _L("FetchLeafL: FetchLeafObjectL Successful! %d" ), iStatus );	
-		}
-	else
-		{
-		iLog->Log( _L("FetchLeafL: FetchLeafObjectL Error ! %d" ), iStatus );	
-		ret = KErrGeneral ;
-		}
-	CleanupStack::PopAndDestroy( luid );
-	CleanupStack::PopAndDestroy(  ); // nodename
-	iLog->Log( _L("FetchLeafL Test Complete with status %d" ), ret );	
-    return ret;
-	}	
-
-
-TInt Cdmatest::ExecuteLeafL( CStifItemParser& aItem )		
-	{
-	TInt ret( KErrNone );
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("Camtest"), _L("ExecuteLeafL") );
-
-	iResultsFunction = NULL;
-	
-    TPtrC8 nodename( GetNextStringLC ( aItem, _L("Nodename") )->Des() ) ;
-    TPtrC8 data( GetNextStringLC ( aItem, _L("Input file") )->Des() ) ;
-	
-	SetURIL(nodename) ;
-
-		/*
-			virtual void ExecuteCommandL( const TDesC8& aURI, const TDesC8& aLUID,
-							      const TDesC8& aArgument, const TDesC8& aType,
-								  TInt aStatusRef ) = 0;
-		*/
-	TDataType type;
-	
-    TPtrC8 parentURI(RemoveLastSeg(nodename));
-    HBufC8 *luid = GetLuidAllocLC( parentURI );
-
-	Adapter()->ExecuteCommandL( *iURI, *luid, data, KEmptyType, 11 ) ;
-	if ( iStatus == MSmlDmAdapter::EOk )
-		{
-		iLog->Log( _L("ExecuteLeafL: ExecuteCommandL Successful! %d" ), iStatus );	
-		}
-	else
-		{
-		iLog->Log( _L("ExecuteLeafL: ExecuteCommandL FetchLeafObjectL Error ! %d" ), iStatus );	
-		ret = KErrGeneral ;
-		}
-	CleanupStack::PopAndDestroy( luid ); // luid
-	CleanupStack::PopAndDestroy(); // data
-	CleanupStack::PopAndDestroy(); // nodename
-	
-	iLog->Log( _L("ExecuteLeafL: Test Complete with status %d" ), ret );	
-
-    return ret;
-	}
-	
-TInt Cdmatest::CompleteCommandsL( CStifItemParser& /*aItem*/ )
-	{
-	TRAPD( err, Adapter()->CompleteOutstandingCmdsL() );
-	delete iAdapter;
-	iAdapter = NULL;
-	return err;
-	}
-TInt Cdmatest::DeleteObjectL( CStifItemParser& aItem )
-{
-	TInt ret( KErrNone );
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("Camtest"), _L("DeleteObjectL") );
-
-    TPtrC8 nodename( GetNextStringLC ( aItem, _L("Nodename") )->Des() ) ;
-
-	SetURIL(nodename) ;
-
-	HBufC8 *luid = GetLuidAllocLC( *iURI );
-	Adapter()->DeleteObjectL( *iURI, *luid, 11 ) ;
-	if ( iStatus == MSmlDmAdapter::EOk )
-		{
-		iLog->Log( _L("DeleteNode: DeleteObjectL Successful! %d" ), iStatus );	
-		}
-	else
-		{
-		iLog->Log( _L("DeleteNode: DeleteObjectL FetchLeafObjectL Error ! %d" ), iStatus );	
-		ret = KErrGeneral ;
-		}
-	CleanupStack::PopAndDestroy( luid ); // luid
-	CleanupStack::PopAndDestroy(); // nodename	
-	iLog->Log( _L("ExecuteLeafDataL Test Complete with status %d" ), ret );	
-
-    return ret;	
-}
-	
-TInt Cdmatest::ExecuteLeafDataL( CStifItemParser& aItem )		
-	{
-	TInt ret( KErrNone );
-
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("Camtest"), _L("ExecuteLeafL") );
-
-	iResultsFunction = NULL;
-	
-    TPtrC8 nodename( GetNextStringLC ( aItem, _L("Nodename") )->Des() ) ;
-    TPtrC8 data( GetNextStringLC ( aItem, _L("Input data") )->Des() ) ;
-    
-	SetURIL(nodename) ;
-
-		/*
-			virtual void ExecuteCommandL( const TDesC8& aURI, const TDesC8& aLUID,
-							      const TDesC8& aArgument, const TDesC8& aType,
-								  TInt aStatusRef ) = 0;
-		*/
-	HBufC8 *luid = GetLuidAllocLC( *iURI );
-	Adapter()->ExecuteCommandL( *iURI, *luid, data, KEmptyType, 11 ) ;
-	if ( iStatus == MSmlDmAdapter::EOk )
-		{
-		iLog->Log( _L("ExecuteLeafDataL: ExecuteCommandL Successful! %d" ), iStatus );	
-		}
-	else
-		{
-		iLog->Log( _L("ExecuteLeafDataL: ExecuteCommandL FetchLeafObjectL Error ! %d" ), iStatus );	
-		ret = KErrGeneral ;
-		}
-	CleanupStack::PopAndDestroy(); // luid
-	CleanupStack::PopAndDestroy(); // data		
-	CleanupStack::PopAndDestroy(); // nodename	
-	iLog->Log( _L("ExecuteLeafDataL Test Complete with status %d" ), ret );	
-
-    return ret;
-	}
-
-
-HBufC8 *Cdmatest::LoadFileLC( const TDesC &aFileName, TDataType &aType )	
-	{
-	RFs fs ;
-	LEAVE_IF_ERROR( fs.Connect(), _L( "Could not connect fileserver: %d"  ) );
-	
-	CleanupClosePushL( fs );
-	RFile file ;
-	LEAVE_IF_ERROR( file.Open(fs,aFileName,EFileRead), _L( "Could not open file: %d" ) );
-	
-	
-	
-	CleanupClosePushL( file );
-	TInt dataSize ;
-	LEAVE_IF_ERROR( file.Size( dataSize ), _L( "Could not get file size: %d" ) );
-	HBufC8 *nodedata = HBufC8::NewL ( dataSize );
-	CleanupStack::PushL( nodedata );
-	TPtr8 nodedataptr( nodedata->Des() );
-	LEAVE_IF_ERROR( file.Read( nodedataptr ), _L( "Could not read file: %d" ) );
-	TDataRecognitionResult aDataType;
-	RApaLsSession ls ;
-	TInt err( ls.Connect() );
-	if ( err == KErrNone )
-		{
-		CleanupClosePushL( ls );
-		err = ls.RecognizeData(aFileName, nodedataptr, aDataType)  ;
-		if ( err == KErrNone )
-			{
-			aType = aDataType.iDataType;
-			}
-		else
-			{
-			iLog->Log( _L("LoadFileLC: WARNING Failed to get type: %d" ), err );
-			aType = TDataType( KDefaultType );
-			}	
-		CleanupStack::PopAndDestroy( &ls ); 
-		}
-	else
-		{
-		iLog->Log( _L("LoadFileLC: WARNING Failed to connect rapalssession: %d" ), err );
-		}	
-	CleanupStack::Pop( nodedata );
-	CleanupStack::PopAndDestroy( &file ); 
-	CleanupStack::PopAndDestroy( &fs ); 
-	CleanupStack::PushL( nodedata );
-	return nodedata ;
-	}
-
-HBufC8 *Cdmatest::LoadFileLC( const TDesC8 &aFileName, TDataType &aType )	
-	{
-	TFileName fn ;
-	fn.Copy( aFileName );
-	return LoadFileLC( fn, aType );
-	}
-	
-
-void Cdmatest::SaveDataL( TInt /*aResultsRef*/, CBufBase& aObject,
-							  const TDesC8& aType ) 
-	{
-	iLog->Log( _L8( "Saving data of type: '%S'" ), &aType );
-	RFs fs;
-	User::LeaveIfError( fs.Connect() );
-	CleanupClosePushL( fs );
-	RFile file;
-	User::LeaveIfError( file.Replace ( fs, iSaveFileName, EFileWrite ) );
-	CleanupClosePushL( file );
-	TPtrC8 p( aObject.Ptr( 0 ) );
-	User::LeaveIfError( file.Write( p ) );
-	CleanupStack::PopAndDestroy( 2 ); // file, fs
-	}
-							  
-		
-	
-void Cdmatest::FetchNodeResultsL( TInt /*aResultsRef*/, CBufBase& aObject,
-							  const TDesC8& /*aType*/ )
-	{
-	TPtrC8 ptr( aObject.Ptr( 0 ) );	
-	iLog->Log( _L8("FetchNodeResultsL for '%S': '%S'" ), iURI, &ptr );
-	
-	if ( ptr.Length() > 0 )
-		{
-		TPtrC8 last( LastURISeg( ptr ) );
-		HBufC8 *oldUri = HBufC8::NewL( iURI->Length() );
-		(*oldUri) = *iURI; 
-		do 
-			{
-			iLog->Log ( _L8( " Node: '%S' "), &last );
-			HBufC8 *nUri = HBufC8::NewLC( oldUri->Length() + 1 + last.Length() );
-			nUri->Des().Copy( *oldUri ) ;
-			nUri->Des().Append( '/' );
-			nUri->Des().Append( last );
-			
-			SetURIL( nUri );
-			//iResultsFunction = FetchNodeResultsL;
-			
-		    //TPtrC8 parentURI(RemoveLastSeg(*nUri));
-		    //HBufC8 *luid = GetLuidAllocLC( parentURI );
-		    CleanupStack::Pop( nUri );
-			
-			HBufC8 *luid = GetLuidAllocLC( *iURI );
-			
-			Adapter()->ChildURIListL( *nUri, KNullDesC8, *iEmptyMappingInfoArray, 4, 5 );//Dipak
-			
-			CleanupStack::PopAndDestroy( luid ); 			
-			
-			ptr.Set( RemoveLastURISeg( ptr ) );
-			last.Set( LastURISeg( ptr ) );
-			
-			}
-		while (last != KNullDesC8);	
-		}
-	
-	}
-	
-
-	
-TPtrC8 Cdmatest::LastURISeg( const TDesC8& aURI )
-	{
-	TInt i;
-	for( i = aURI.Length() - 1; i >= 0; i-- ) 
-		{
-		if( aURI[i] == '/' )
-			{
-			break;
-			}
-		}
-
-	if( i == 0 )
-		{
-		return aURI;
-		}
-	else
-		{
-		return aURI.Mid( i+1 );
-		}
-	}
-TPtrC8 Cdmatest::RemoveLastSeg(const TDesC8& aURI)
-	{
-	TInt i;
-	for(i=aURI.Length()-1;i>=0;i--)
-		{
-		if(aURI[i]==KNSmlDMUriSeparator)
-			{
-			break;
-			}
-		}
-
-	if(i>0)
-		{
-		return aURI.Left(i);
-		}
-	else
-		{
-		return KNullDesC8();
-		}
-	}
-
-// ------------------------------------------------------------------------------------------------
-// TPtrC8 Cdmatest::RemoveLastURISeg(const TDesC8& aURI)
-// returns parent uri, i.e. removes last uri segment
-// ------------------------------------------------------------------------------------------------
-TPtrC8 Cdmatest::RemoveLastURISeg( const TDesC8& aURI )
-	{
-	TInt i;
-	for ( i = aURI.Length() - 1; i >= 0 ; i-- )
-		{
-		if( aURI[i] == '/' )
-			{
-			break;
-			}
-		}
-	if ( i > -1 )
-		{
-		return aURI.Left( i );	
-		}
-	else
-		{
-		return KNullDesC8();
-		}
-	}	
-	
-TPtrC Cdmatest::RemoveLastURISeg( const TDesC& aURI )
-	{
-	TInt i;
-	for ( i = aURI.Length() - 1; i >= 0 ; i-- )
-		{
-		if( aURI[i] == '/' )
-			{
-			break;
-			}
-		}
-	if ( i > -1 )
-		{
-		return aURI.Left( i );	
-		}
-	else
-
-		{
-		return KNullDesC();
-		}
-	}		
-	
-void Cdmatest::SetURIL( const TDesC& aURI )
-	{
-	if ( iURI != NULL )
-		{
-		delete iURI ;
-		iURI = NULL;
-		}
-	iURI = HBufC8::NewL( aURI.Length() ) ;
-	iURI->Des().Copy( aURI );
-	}
-	
-void Cdmatest::SetURIL( const TDesC8& aURI )
-	{
-	if ( iURI != NULL )
-		{
-		delete iURI ;
-		iURI = NULL;
-		}
-	iURI = HBufC8::NewL( aURI.Length() ) ;
-	iURI->Des().Copy( aURI );
-	}	
-
-void Cdmatest::SetURIL( HBufC8* aURI )
-	{
-	if ( iURI != NULL )
-		{
-		delete iURI ;
-		iURI = NULL;
-		}
-	iURI = aURI ;
-	}
-		
-		
-		
-void Cdmatest::SetResultsL( 
-	TInt aResultsRef, 
-	CBufBase& aObject,
-	const TDesC8& aType )
-	{
-	TPtrC8 ptr( aObject.Ptr(0) );
-	iLog->Log( _L8( "SetResults, ref=%d, object='%S', type='%S'" ), aResultsRef, &ptr, &aType );
-	if ( iResultsFunction )
-		{
-		(this->*iResultsFunction)( aResultsRef, aObject, aType );
-		iResultsFunction = NULL ;
-		}
-	
-	}
-
-
-void Cdmatest::SetStatusL( TInt aStatusRef,
-							 MSmlDmAdapter::TError aErrorCode ) 
-	{
-	iStatus = aErrorCode ;
-	iLog->Log( _L( "SetStatusL, ref=%d, code=%d" ), aStatusRef, aErrorCode );
-	
-	
-	}
-	
-void Cdmatest::SetMappingL( const TDesC8& aURI, const TDesC8& aLUID ) 
-	{
-	iLog->Log( _L8( "SetMappingL, aURI='%s', aLUID='%s'" ), aURI.Ptr(), aLUID.Ptr() );	
-	
-	iMappingTable.Append(TMapping( aURI, aLUID ) )	;
-	}
-	
-HBufC8* Cdmatest::GetLuidAllocL( const TDesC8& aURI ) 
-	{
-	iLog->Log( _L8( "GetLuidAllocL, aURI='%S'" ), &aURI );		
-	HBufC8 *res = NULL;		
-	for( TInt i(0); i < iMappingTable.Count(); i++ )	
-		{
-		if ( aURI == iMappingTable[i].iURI )
-			{
-			res = iMappingTable[i].iLuid.AllocL();
-			}
-		}
-	if ( res == NULL )
-		{
-		res = HBufC8::NewL( 0 );
-		}
-	iLog->Log( _L8( "GetLuidAllocL, response='%S'" ), res );
-	return res;
-	}	    
-    
-HBufC8* Cdmatest::GetLuidAllocLC( const TDesC8& aURI ) 
-	{
-	iLog->Log( _L8( "GetLuidAllocL, aURI='%S'" ), &aURI );
-	HBufC8 *res = NULL;		
-	for( TInt i(0); i < iMappingTable.Count(); i++ )	
-		{
-		if ( aURI == iMappingTable[i].iURI )
-			{
-			res = iMappingTable[i].iLuid.AllocLC();
-			break;
-			}
-		}
-	if ( res == NULL )
-		{
-		res = HBufC8::NewLC( 0 );
-		}
-	iLog->Log( _L8( "GetLuidAllocLC, response='%S'" ), res );
-	return res ;
-	}	
-    	
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-    
-void Cdmatest::GetMappingInfoListL( const TDesC8& /*aURI*/,
-								CArrayFix<TSmlDmMappingInfo>& /*aSegmentList*/ )
-	{
-	// do nothing
-	}								
-
-#else
-// nothing
-#endif
-//***************************************************************************
-//  End of File
--- a/omadm/omadmextensions/adapters/syncmldm/tsrc/src/syncmldmtest.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,117 +0,0 @@
-/*
-* Copyright (c) 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:  Implementation of DM adapter test component
-* 	This is part of omadmextensions/adapter test application.
-*
-*/
-
-
-
-
-
-
-// INCLUDE FILES
-#include <Stiftestinterface.h>
-#include "syncmldmtest.h"
-#include <stiflogger.h>
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// Csyncmldmtest::Csyncmldmtest
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-/*Csyncmldmtest::Csyncmldmtest( 
-    CTestModuleIf& aTestModuleIf ):
-        CScriptBase( aTestModuleIf )
-    {
-    }*/
-Csyncmldmtest::Csyncmldmtest( CTestModuleIf& aTestModuleIf )
-		: Cdmatest( aTestModuleIf, KAdapterUid )
-    {
-    }
-// -----------------------------------------------------------------------------
-// Csyncmldmtest::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void Csyncmldmtest::ConstructL()
-    {
-/*    iLog = CStifLogger::NewL( KamtestLogPath, 
-                          KamtestLogFile,
-                          CStifLogger::ETxt,
-                          CStifLogger::EFile,
-                          EFalse );*///Commented the Part for syncmldmtest Dipak
-    iLog = CStifLogger::NewL( KamtestLogPath, 
-                          KamtestLogFile,
-                          CStifLogger::ETxt,
-                          CStifLogger::EFile );
-                          
-    iLog->Log( _L( "Loading Adapter" ) );
-    
-	Cdmatest::ConstructL();                         	
-
-    }
-
-// -----------------------------------------------------------------------------
-// Csyncmldmtest::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-Csyncmldmtest* Csyncmldmtest::NewL( 
-    CTestModuleIf& aTestModuleIf )
-    {
-    Csyncmldmtest* self = new (ELeave) Csyncmldmtest( aTestModuleIf );
-    
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop();
-
-    return self;
-    
-    }
-    
-// Destructor
-Csyncmldmtest::~Csyncmldmtest()
-    { 
-    
-    // Delete resources allocated from test methods
-//    Delete();
-    
-    // Delete logger
-//    delete iLog;  
-    
-    }
-
-// ========================== OTHER EXPORTED FUNCTIONS =========================
-
-// -----------------------------------------------------------------------------
-// LibEntryL is a polymorphic Dll entry point.
-// Returns: CScriptBase: New CScriptBase derived object
-// -----------------------------------------------------------------------------
-//
-EXPORT_C CScriptBase* LibEntryL( 
-    CTestModuleIf& aTestModuleIf ) // Backpointer to STIF Test Framework
-    {
-    
-    return ( CScriptBase* ) Csyncmldmtest::NewL( aTestModuleIf );
-        
-    }
-
-
-    
-//  End of File
--- a/omadm/omadmextensions/adapters/syncmldm/tsrc/src/syncmldmtestBlocks.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,110 +0,0 @@
-/*
-* Copyright (c) 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:  Implementation of DM adapter test component
-* 	This is part of omadmextensions/adapter test application.
-*
-*/
-
-
-
-
-
-
-// INCLUDE FILES
-#include <e32svr.h>
-#include <StifParser.h>
-#include <Stiftestinterface.h>
-#include "syncmldmtest.h"
-#include <e32math.h>
-#include <f32file.h>
-#include <swinstapi.h>
-
-
-//using namespace NApplicationManagement;//Dipak
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// Csyncmldmtest::Delete
-// Delete here all resources allocated and opened from test methods. 
-// Called from destructor. 
-// -----------------------------------------------------------------------------
-//
-void Csyncmldmtest::Delete() 
-    {
-    
-    }
-    
-// -----------------------------------------------------------------------------
-// Csyncmldmtest::RunMethodL
-// Run specified method. Contains also table of test mothods and their names.
-// -----------------------------------------------------------------------------
-//
-TInt Csyncmldmtest::RunMethodL( 
-    CStifItemParser& aItem ) 
-    {
-   
-    TStifFunctionInfo const KFunctions[] =
-        {  
-        // Copy this line for every implemented function.
-        // First string is the function name used in TestScripter script file.
-        // Second is the actual implementation member function. 
-        ENTRY( "DDFStructure", Csyncmldmtest::DDFStructureL),
-        ENTRY( "FetchNode", Csyncmldmtest::FetchNodeL ),
-        ENTRY( "FetchLeaf", Csyncmldmtest::FetchLeafL ),
-        ENTRY( "AddNode", Csyncmldmtest::AddNodeL ),
-        ENTRY( "UpdateLeaf", Csyncmldmtest::UpdateLeafL ),
-        ENTRY( "UpdateLeafData", Csyncmldmtest::UpdateLeafDataL ),
-        ENTRY( "Execute", Csyncmldmtest::ExecuteLeafL ),
-        ENTRY( "ExecuteData", Csyncmldmtest::ExecuteLeafDataL ),
-        ENTRY( "DeleteNode", Csyncmldmtest::DeleteObjectL ),
-        ENTRY( "StartAtomic", Csyncmldmtest::StartAtomicL),
-	    ENTRY( "CommitAtomic", Csyncmldmtest::CommitAtomicL),
-	    ENTRY( "RollbackAtomic", Csyncmldmtest::RollbackAtomicL),
-	    ENTRY( "CompleteCommands", Csyncmldmtest::CompleteCommandsL),
-        };
-
-    const TInt count = sizeof( KFunctions ) / 
-                        sizeof( TStifFunctionInfo );
-
-    return RunInternalL( KFunctions, count, aItem );
-
-    }    
-
-        
-        
-HBufC8 *Csyncmldmtest::GetNextStringLC ( CStifItemParser& aItem, const TDesC &aName )
-	{
-	TPtrC nodename;
-	nodename.Set( KNullDesC );
-
-    TInt i( aItem.GetNextString ( nodename ) );
-    if ( i != KErrNone ) 
-	    {
-	    iLog->Log( _L( "ERROR Reading '%S' argument: 0x%X" ), &aName, i );
-	    }
-	else
-		{
-		iLog->Log( _L("%S: %S"), &aName, &nodename);
-		}
-	
-	HBufC8 *buf = HBufC8::NewLC( nodename.Length() ) ;
-	buf->Des().Copy( nodename );
-	
-	return buf;
-	}
-	
- 
-
-//  End of File
--- a/omadm/omadmextensions/adapters/syncmldm12/bld/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-/*
-* Copyright (c) 2002 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:    build info file for SyncML DM settings adapter
-*
-*/
-
-
-
-
-PRJ_MMPFILES
-./nsmldmsettingsadapter12.mmp
-
-
-
-
--- a/omadm/omadmextensions/adapters/syncmldm12/bld/nsmldmsettingsadapter12.mmp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-/*
-* 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:    DM-settings adapter
-*
-*/
-
-
-
-
-#include "defaultcaps.hrh"
-#include  <platform_paths.hrh>
-
-TARGET          nsmldmsettingsadapter12.dll
-TARGETTYPE      PLUGIN
-UID             0x10009D8D 0x10282CE7
-VENDORID        VID_DEFAULT
-CAPABILITY      CAP_ECOM_PLUGIN
-
-APP_LAYER_SYSTEMINCLUDE
-SYSTEMINCLUDE 	/epoc32/include/ecom
-
-SOURCEPATH      ../src
-USERINCLUDE     ../inc ../../inc
-
-SOURCE          NSmlDmSettingsAdapter12.cpp
-
-
-START RESOURCE 	nsmldmsettingsadapter12.rss
-END
-
-LIBRARY         euser.lib ecom.lib charconv.lib nsmldebug.lib
-LIBRARY         nsmldmiapmatcher.lib
-LIBRARY         syncmlclientapi.lib
-LIBRARY         nsmltransporthandler.lib
-LIBRARY         nsmlprivateapi.lib
-LIBRARY			featmgr.lib
-
-
-SMPSAFE
-// End of File
--- a/omadm/omadmextensions/adapters/syncmldm12/inc/NSmlDMSettingsAdapter12.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1021 +0,0 @@
-/*
-* 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:    DM Settings adapter header file
-*
-*/
-
-
-
-
-#ifndef __NSMLDMSETTINGSADAPTER12_H__
-#define __NSMLDMSETTINGSADAPTER12_H__
-
-
-// INCLUDES
-#include <utf.h>
-#include <smldmadapter.h>
-#include <SyncMLClientDM.h>
-#include "NSmlPrivateAPI.h"
-
-// CONSTANTS
-const TInt KNSmlDMGranularity = 4;
-const TUint8 KNSmlDMColon = ':';
-const TUint8 KNSmlDMUriSeparator = '/';
-const TInt KPortMaxSize = 65535;
-const TInt KPortMinSize = 0;
-//Dynamic Node Posn Const --> DMAcc/DMIDxxx
-const TInt KDynNodePosn = 2;
-
-_LIT8( KNSmlTrueVal, "1" );
-_LIT8( KNSmlFalseVal, "0" );
-_LIT8( KNSmlHTTPAuth, 		"NSmlHTTPAuth" );
-_LIT8( KNSmlHTTPUsername,	"NSmlHTTPUsername" );
-_LIT8( KNSmlHTTPPassword, 	"NSmlHTTPPassword" );
-
-
-//DDF accepted DM-fieldnames
-_LIT8( KNSmlDdfId,				"Id" );
-_LIT8( KNSmlDdfAppId,				"AppID" );
-_LIT8( KNSmlDdfServerId,		"ServerID" );
-_LIT8( KNSmlDdfName,			"Name" );
-_LIT8( KNSmlDdfPrefConRef,			"PrefConRef" );
-_LIT8( KNSmlDdfToConRef,			"ToConRef" );
-_LIT8( KNSmlDdfConRef,			"ConRef" );
-_LIT8( KNSmlDdfAppAddr,			"AppAddr" );
-_LIT8( KNSmlDdfAddr,			"Addr" );
-_LIT8( KNSmlDdfAddrType,		"AddrType" );
-_LIT8( KNSmlDdfPort,			"Port" );
-_LIT8( KNSmlDdfPortNbr,			"PortNbr" );
-_LIT8( KNSmlDdfAuthScheme,		"AAuthPref" ); 
-_LIT8( KNSmlDdfAppAuth,		"AppAuth" );
-_LIT8( KNSmlDdfAAuthLevel,		"AAuthLevel" );
-_LIT8( KNSmlDdfAAuthType,		"AAuthType" );
-_LIT8( KNSmlDdfAAuthName,		"AAuthName" );
-_LIT8( KNSmlDdfAAuthSecret,		"AAuthSecret" );
-_LIT8( KNSmlDdfAAuthData,		"AAuthData" );
-_LIT8( KNSmlDdfExt,		"Ext" );
-_LIT8( KNSmlDdfServerPW,		"ServerPW" );
-_LIT8( KNSmlDdfServerNonce,		"ServerNonce" );
-_LIT8( KNSmlDdfClientUserName,	"UserName" );
-_LIT8( KNSmlDdfClientPW,		"ClientPW" );
-_LIT8( KNSmlDdfClientNonce,		"ClientNonce" );
-_LIT8( KNSmlDdfLocked,		"ProfileLock" );
-
-
-
-_LIT( KNSmlDdfMConRef,			"MConRef" );
-
-//Constant strings 
-
-
-_LIT8( KNSmlDdfAppIdValue,				"w7" );
-
-
-//DDF DM-field descriptions
-_LIT8( KNSmlDdfAppIdDescription,				"AppID of DMSettings " );
-_LIT8( KNSmlDdfAddrDescription,				"Host address of the SyncML server, IP or URL" );
-_LIT8( KNSmlDdfAddrTypeDescription,			"The type of address specified in the Addr node" );
-_LIT8( KNSmlDdfPortNbrDescription,			"SyncML Server port" );
-_LIT8( KNSmlDdfAuthSchemeDescription,		"Scheme of authentication" );
-_LIT8( KNSmlDdfServerIdDescription,			"The ServerId value for this server" );
-_LIT8( KNSmlDdfNameDescription,				"Displayable name for the SyncML setings" );
-_LIT8( KNSmlDdfConRefDescription,			"Logical reference to a connectivity node" );
-_LIT8( KNSmlDdfAuthLevelDescription ,       "AuthLevel of the AppAuth node " );
-_LIT8( KNSmlDdfAuthNameDescription ,       "AuthName of the AppAuth node " );
-_LIT8( KNSmlDdfAuthSecretDescription ,       "AuthSecret of the AppAuth node " );
-_LIT8( KNSmlDdfAuthDataDescription ,       "AuthData of the AppAuth node " );
-_LIT( KNSmlDdfMConRefDescription,			"Parent to Multiple Connection Reference objects" );
-
-
-//Default data values
-_LIT( KNSmlDefName,				"DMAdapterIns" );
-_LIT8( KNSmlDefDMAcc,			"DMAcc" );
-_LIT8( KNSmlDMStart,			"DMAcc/DMId" );
-_LIT( KNSmlDefDMIAP,			"AP" );
-_LIT8( KNSmlDMUriDotSlash,      "./");
-_LIT8( KNSmlDMNullDesc8,        "");
-_LIT8(KNSmlIAPId,               "NSmlIapId");
-
-_LIT8(KNSmlAddrtype,               "URI");
-
-
-// AuthPref text values
-_LIT8( KNSmlDMAuthPrefNoAuth,"syncml:auth-none");
-_LIT8( KNSmlDMAuthPrefBasic, "syncml:auth-basic");
-_LIT8( KNSmlDMAuthPrefMD5,	 "syncml:auth-md5");
-_LIT8( KNSmlDMAuthPrefTransport,	 "transport");
-
-_LIT8( KNSmlDMAuthTypeBasic, "BASIC");
-_LIT8( KNSmlDMAuthTypeMD5,	 "DIGEST");
-_LIT8( KNSmlDMAuthTypeTransport,	 "TRANSPORT");
-_LIT8( KNSmlDMSettingsHTTP,  "http://" );
-_LIT8( KNSmlDMSettingsHTTPS, "https://" );
-
-_LIT8( KIAPid, "IAPid" );
-_LIT8( KSegmDMAcc,"AppID/ServerID/Name/PrefConRef/AppAddr/AAuthPref/AppAuth/Ext");
-_LIT8( KSegmDMAccAppAddr,"Addr/AddrType/Port");
-_LIT8( KSegmDMAccPortRT,"Port001");
-_LIT8( KSegmDMAccport,"PortNbr");
-_LIT8( KSegmDMAccAppAuth,"AAuthLevel/AAuthType/AAuthName/AAuthSecret/AAuthData");
-_LIT8( KSegmDMAccLocked,"ProfileLock");
-_LIT8( KSmlDmSlash, "/");
-_LIT8( KVersion,"1.1" );
-_LIT8( KMimeType, "text/plain" );
-_LIT8( KSyncMLText, "SyncML" );
-_LIT8( KNSmlDMadapterDesc, "DM-Settings DDF description" );
-_LIT8( KNSmlDMadapterTitle,"DM-Settings title" );
-
-_LIT8( KDmAccMatch, "DMAcc/*" );
-_LIT8( KDmAccMatch3, "DMAcc/*/*" );
-
-_LIT8( KDmAccMatch2, "DMAcc" );
-_LIT8 (KDmAccToConRefMatch, "DMAcc/*/ToConRef");
-_LIT8 (KDmAccToConRefId, "ConRef001");
-_LIT8 (KDmAccToConRefFullMatch, "DMAcc/*/ToConRef/ConRef001");
-_LIT8 (KDmAccAppAddrMatch, "DMAcc/*/AppAddr");
-_LIT8 (KDmAccAppAddrFullMatch, "DMAcc/*/AppAddr/*");
-_LIT8 (KDmAccPortMatch, "DMAcc/*/AppAddr/*/Port");
-_LIT8 (KDmAccExtMatch, "DMAcc/*/Ext");
-//_LIT8 (KDmAccExtFullMatch, "DMAcc/*/Ext/*");
-_LIT8 (KDmAccPortFullMatch, "DMAcc/*/AppAddr/*/Port/Port001");
-_LIT8 (KDmAccAppAuthMatch, "DMAcc/*/AppAuth");
-_LIT8 (KDmAccAppAuthFullMatch, "DMAcc/*/AppAuth/*");
-_LIT8 (KDmAccAppAuthSrvMatch, "DMAcc/*/AppAuth/AppAuthSrv");
-_LIT8 (KDmAccAppAuthCliMatch, "DMAcc/*/AppAuth/AppAuthCli");
-_LIT8 (KDmAccAppAuthObexMatch, "DMAcc/*/AppAuth/AppAuthObex");
-_LIT8 (KDmAccAppAuthHttpMatch, "DMAcc/*/AppAuth/AppAuthHttp");
-_LIT8 (KDmAccAppAuthTransMatch, "DMAcc/*/AppAuth/AppAuthTransport");
-
-
-
-//_LIT8 (KDmAccAppAuthNodes, "AppAuthSrv/AppAuthCli/AppAuthObex/AppAuthHttp");
-_LIT8 (KDmAccAppAuthNodes, "AppAuthSrv/AppAuthCli/AppAuthTransport");
-_LIT8 (KDmAccAppAuthDyn1, "AppAuthSrv"); // serv
-_LIT8 (KDmAccAppAuthDyn2, "AppAuthCli"); //client
-_LIT8 (KDmAccAppAuthDyn3, "AppAuthObex"); //obex
-_LIT8 (KDmAccAppAuthDyn4, "AppAuthHttp");
-
-_LIT8 (KDmAccAppAuthTransport, "AppAuthTransport");
-
-_LIT8 (KDmAccAppAuthDyn1LUid, "SRVCRED");
-_LIT8 (KDmAccAppAuthDyn2LUid, "CLCRED");
-_LIT8 (KDmAccAppAuthDyn3LUid, "OBEX");
-_LIT8 (KDmAccAppAuthDyn4LUid, "HTTP");
-
-_LIT8 (KDmAccAppAuthLevelSrv, "SRVCRED");
-_LIT8 (KDmAccAppAuthLevelCli, "CLCRED");
-_LIT8 (KDmAccAppAuthLevelObx, "OBEX");
-_LIT8 (KDmAccAppAuthLevelHttp, "HTTP");
-_LIT8(KDmProfileLocked, "Locked");
-_LIT8(KDmProfileUnLocked, "Unlocked");
-const TInt KHttpUsed  = 1;
-const TInt KHttpNotUsed  = 0;
-
-
-// temporary
-
-_LIT8 (KDmAccAppAddrId, "Addr001");
-
-// NOTE: this enum must match with property array described in 
-// SyncML_Sync_Agent_Client_API_Specification.doc.
-enum TNSmlSyncTransportProperties
-	{
-	EPropertyIntenetAccessPoint = 0,
-	EPropertyHttpUsed = 5,
-	EPropertyHttpUserName = 6,
-	EPropertyHttpPassword = 7
-	};
-
-
-// DATA TYPES
-enum TNSmlDMFieldType
-	{
-	EStr,
-	EInt,
-	EBin,
-	EWrong
-	};
-
-enum TNSmlDMLeafType
-	{
-	EDMUpdate,
-	EDMDelete,
-	EDMUnset
-	};
-
-enum TNSmlDMProfileData
-	{
-	EProfileId,
-	EProfileName,
-	EProfileIAPId,
-	EProfileMediumType,
-	EProfileDMServerUsername,
-	EProfileDMServerPassword,
-	EServerNonce,
-	ESharedSecret,
-	EClientNonce,
-	EProfileURL,
-	EProfilePort,
-	EServerId,
-	EAuthenticationRequired,
-	ESyncAccepted,
-	EProfileAddrType,
-	EPRofileServerCred,
-	EPRofileClientCred,
-	EProfileHttpUsername,
-	EProfileHttpPassword,
-	EProfileAAuthType,
-	EProfileTransport,
-	EProfileObexUsername,
-	EProfileObexPassword,
-	ETransportAuthName,
-	EProfileTransportPassword,
-	EProfileTransportAuthData,
-	EProfileLock
-	};
-
-enum TAuthenticationType
-	{
-	ENoAuth,    //"syncml:auth-none"
-	EBasic,     //"syncml:auth-basic"
-	EMD5        //"syncml:auth-md5"
-	};
-
-enum TNSmlDMMediumType
-	{
-	ENone,
-    EHttp,
-	EWsp,
-    EObex
-	};
-
-struct TNSmlDMLeafElement
-	{
-	HBufC8 *iUri;
-	HBufC8 *iData;
-	TInt iStatusRef;
-	HBufC8* iLuid;
-	};
-
-struct TNSmlDMBufferElement
-	{
-	CArrayFixFlat<TNSmlDMLeafElement> *iLeafBuf;
-	HBufC8* iMappingName; //Holds the Dyn.Node URI       
-	TBool iExecuted; //Node updated to dB or not       
-	TInt iDMBuffStatusref; //Statusref for callback       
-	TBool iAddr;
-	TBool iServerId; //Bools for Mandatory fields       
-	TBool iUName;
-	TBool iServerName;
-	};
-
-// CLASS DECLARATION
-/**
-*  CNSmlDMSettingsAdapter12 class 
-*  Contains the whole implementation of the DM settings adapter.
-*
-*  @lib nsmldmsettingsadapter.dll
-*  @since Series 60 Series60_3.0
-*/
-class CNSmlDMSettingsAdapter12 : public CSmlDmAdapter
-	{
-    public: // Constructors and destructor
-        
-        /**
-        * Two-phased constructor.
-        */
-	    static CNSmlDMSettingsAdapter12* NewL(MSmlDmCallback* aDmCallback );
-	    static CNSmlDMSettingsAdapter12* NewLC(MSmlDmCallback* aDmCallback );
-
-	    void ConstructL();
-
-        /**
-        * Destructor.
-        */
-	    virtual ~CNSmlDMSettingsAdapter12();
-
-    public: // Functions from base classes
-
-	    /**
-        * From      CSmlDmAdapter   DDFVersionL returns current version of the DDF.
-        * @since    Series60_3.0
-        * @param    aVersion        DDF version of the adapter.
-        * @return   none
-        */
-	    void DDFVersionL( CBufBase& aVersion );
-
-        /**
-        * From      CSmlDmAdapter   DDFStructureL for filling the DDF structure of the adapter.
-        * @since    Series60_3.0
-        * @param    aDDF            Reference to root object.
-        * @return   none
-        */
-	    void DDFStructureL( MSmlDmDDFObject& aDDF );
-
-        /**
-        * From      CSmlDmAdapter   UpdateLeafObjectL creates new leaf objects, or replaces 
-        *                           data in existing leaf objects.
-        * @since    Series60_3.0
-        * @param    aURI            URI of the object
-        * @param    aLUID           LUID of the object
-        * @param    aObject         Data of the object
-        * @param    aType           MIME type of the object
-        * @param    aStatusRef      Reference to correct command
-        * @return   none
-        */
-	    void UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, 
-                            const TDesC8& aObject, const TDesC8& aType, 
-                            TInt aStatusRef );
-        
-        /**
-        * From      CSmlDmAdapter   DeleteObjectL deletes an object and its child objects.
-        * @since    Series60_3.0
-        * @param    aURI            URI of the object
-        * @param    aLUID           LUID of the object
-        * @param    aStatusRef      Reference to correct command
-        * @return   none
-        */
-	    void DeleteObjectL( const TDesC8& aURI, const TDesC8& aLUID, 
-                        const TInt aStatusRef );
-        
-        /**
-        * From      CSmlDmAdapter   FetchLeafObjectL fetches data of a leaf object.
-        * @since    Series60_3.0
-        * @param    aURI            URI of the object
-        * @param    aLUID           LUID of the object
-        * @param    aType           MIME type of the object
-        * @param    aResultsRef    	Reference to correct results
-        * @param    aStatusRef      Reference to correct command
-        * @return   none
-        */
-	    void FetchLeafObjectL(  const TDesC8& aURI, 
-                            const TDesC8& aLUID, 
-                            const TDesC8& aType, 
-                            const TInt aResultsRef, 
-                            const TInt aStatusRef ); 
-        /**
-        * From      CSmlDmAdapter   ChildURIListL fetches URI list.
-        * @since    Series60_3.0
-        * @param    aURI                    URI of the object
-        * @param    aLUID                   LUID of the object
-        * @param    aPreviousURISegmentList URI list with mapping LUID information
-        * @param    aResultsRef    	        Reference to correct results
-        * @param    aStatusRef              Reference to correct command
-        * @return   none
-        */
-	    void ChildURIListL( const TDesC8& aURI, const TDesC8& aLUID, 
-                        const CArrayFix<TSmlDmMappingInfo>& aPreviousURISegmentList, 
-                        const TInt aResultsRef, const TInt aStatusRef );
-        
-        /**
-        * From      CSmlDmAdapter   AddNodeObjectL adds node object.
-        * @since    Series60_3.0
-        * @param    aURI            URI of the object
-        * @param    aParentLUID     LUID of the parent object
-        * @param    aStatusRef      Reference to correct command
-        * @return   none
-        */
-	    void AddNodeObjectL( const TDesC8& aURI, const TDesC8& aParentLUID, 
-                            const TInt aStatusRef );
-
-        /**
-        * From      CSmlDmAdapter   UpdateLeafObjectL creates new leaf objects, or replaces 
-        *                           data in existing leaf objects.
-        * @since    Series60_3.0
-        * @param    aURI            URI of the object
-        * @param    aLUID           LUID of the object
-        * @param    aStream         Data of the object
-        * @param    aType           MIME type of the object
-        * @param    aStatusRef      Reference to correct command
-        * @return   none
-        */
-        void UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, 
-                            RWriteStream*& aStream, const TDesC8& aType, 
-                            const TInt aStatusRef );
-        
-        /**
-        * From      CSmlDmAdapter   FetchLeafObjectSizeL fetches the size of a leaf object.
-        * @since    Series60_3.0
-        * @param    aURI            URI of the object
-        * @param    aLUID           LUID of the object
-        * @param    aType           MIME type of the object
-        * @param    aResultsRef    	Reference to correct results
-        * @param    aStatusRef      Reference to correct command
-        * @return   none
-        */
-	    void FetchLeafObjectSizeL( const TDesC8& aURI, const TDesC8& aLUID, 
-                                const TDesC8& aType, const TInt aResultsRef, 
-                                const TInt aStatusRef );
-
-        /**
-        * From      CSmlDmAdapter   The function implements execute command.
-        * @since    Series60_3.0
-        * @param    aURI            URI of the object
-        * @param    aLUID           LUID of the object
-        * @param    aArgument       Argument for the command
-        * @param    aType       	MIME type of the object
-        * @param    aStatusRef      Reference to correct command
-        * @return   none
-        */
-	    void ExecuteCommandL( const TDesC8& aURI, const TDesC8& aLUID, 
-                            const TDesC8& aArgument, const TDesC8& aType, 
-                            const TInt aStatusRef );
-
-        /**
-        * From      CSmlDmAdapter   The function implements execute command.
-        * @since    Series60_3.0
-        * @param    aURI            URI of the object
-        * @param    aLUID           LUID of the object
-        * @param    aStream         Argument for the command
-        * @param    aType       	MIME type of the object
-        * @param    aStatusRef      Reference to correct command
-        * @return   none
-        */
-	    void ExecuteCommandL( const TDesC8& aURI, const TDesC8& aLUID, 
-                            RWriteStream*& aStream, const TDesC8& aType, 
-                            const TInt aStatusRef );
-        
-        /**
-        * From      CSmlDmAdapter   The function implements execute command.
-        * @since    Series60_3.0
-        * @param    aTargetURI      Target URI for the command
-        * @param    aTargetLUID     LUID of the target object
-        * @param    aSourceURI      Source URI for the command
-        * @param    aSourceLUID    	LUID of the source object
-        * @param    aType           MIME type of the object
-        * @param    aStatusRef      Reference to correct command
-        * @return   none
-        */
-	    void CopyCommandL( const TDesC8& aTargetURI, const TDesC8& aTargetLUID, 
-                        const TDesC8& aSourceURI, const TDesC8& aSourceLUID, 
-                        const TDesC8& aType, TInt aStatusRef );
-	
-        /**
-        * From      CSmlDmAdapter   The function indicates start of Atomic command.
-        * @since    Series60_3.0
-        * @param    none
-        * @return   none
-        */
-        void StartAtomicL();
-
-        /**
-        * From      CSmlDmAdapter   The function indicates successful end of Atomic command.
-        * @since    Series60_3.0
-        * @param    none
-        * @return   none
-        */
-	    void CommitAtomicL();
-    
-        /**
-        * From      CSmlDmAdapter   The function indicates unsuccessful end of Atomic command.
-        * @since    Series60_3.0
-        * @param    none
-        * @return   none
-        */
-	    void RollbackAtomicL();
-
-        /**
-        * From      CSmlDmAdapter   Returns ETrue if adapter supports streaming otherwise EFalse.
-        * @since    Series60_3.0
-        * @param    aItemSize       Size limit for stream usage.
-        * @return   ETrue or EFalse
-        */
-	    TBool StreamingSupport( TInt& aItemSize );
-        
-        /**
-        * From      CSmlDmAdapter   Called when stream returned from UpdateLeafObjectL or 
-        *                           ExecuteCommandL has been written to and committed.
-        * @since    Series60_3.0
-        * @param    none
-        * @return   none
-        */
-	    void StreamCommittedL();
-
-        /**
-        * From      CSmlDmAdapter   The function tells the adapter that all the commands of the message that
-	    *                           can be passed to the adapter have now been passed.
-        * @since    Series60_3.0
-        * @param    none
-        * @return   none
-        */
-	    void CompleteOutstandingCmdsL();
-	    
-	     /**
-        * From      CSmlDmAdapter   The function to set profile lock
-        * @since    Series60_3.0
-        * @param    profileId  lockvalue
-        * @return   TInt
-        */
-	    TInt SetProfileLockL(const TInt aPID, TInt aLockValue);
-	
-    private:
-	    
-        /**
-        * C++ default constructor.
-        */
-        CNSmlDMSettingsAdapter12();
-        CNSmlDMSettingsAdapter12( TAny* aEcomArguments );
-	    
-        /**
-        * The function stores integer value to buffer and returns reference to it.
-        * @param    aObject     data to be stored to buffer.
-        * @return   reference to data buffer.
-        */
-        TDesC8& SetIntObjectLC( const TInt& aObject );
-        
-        /**
-        * The function finds out the last element of the uri.
-        * @param    aSource     Uri object that contains all elements.
-        * @return   KErrNone if successful.
-        */
-	    TInt SetField( const TDesC8& aSource );
-	    
-	    /**
-        * The function sets the uri being set ot get
-        * @param    aSource     Uri object that contains all elements.
-        * @return   KErrNone if successful.
-        */
-	    TInt SetURIInProcessL( const TDesC8& aSource );
-	    
-
-        /**
-        * The function converts data to integer and returns it.
-        * @param    aObject     Data object to be converted.
-        * @return   Integer value for an object.
-        */
-	    TInt GetIntObject( const TDesC8& aObject );
-
-        /**
-        * The function converts data to integer and returns it.
-        * @param    aObject     Data object to be converted.
-        * @return   16-bit integer value for an object.
-        */
-	    TInt GetIntObject16( const TDesC& aObject );
-
-        /**
-        * The function converts LUID to integer.
-        * @param    aLUID     LUID data to be converted.
-        * @return   Integer value for a LUID.
-        */    
-	    TInt IntLUID( const TDesC8& aLUID );
-
-        /**
-        * The function sets the IAP value acording the given URI.
-        * @param    aLUID     LUID for a profile.
-        * @param    aObject   Data object containing the URI.
-        * @return   KErrNone if successfull.
-        */    
-	    TInt  SetConRefL( const TInt aLUID, const TDesC8& aObject );
-    
-        /**
-        * The function gets the URI for profile IAP.
-        * @param    aObject   Object where the result will be stored.
-        * @return   KErrNone if successfull.
-        */    
-	    TInt GetConRefL( CBufBase& aObject );
-	
-        /**
-        * The function checks if field to be handled is valid.
-        * @param    none
-        * @return   ETrue if valid field otherwise EFalse.
-        */    
-    	TBool AcceptDMField();
-
-        /**
-        * The function checks if field type to be handled is valid.
-        * @param    none
-        * @return   enum value for a field type.
-        */ 
-	    TNSmlDMFieldType   GetDMFieldType() const;
-
-        /**
-        * The function returns enum value for a field to be handled.
-        * @param    none
-        * @return   enum value for a field to be handled.
-        */ 
-	    TNSmlDMProfileData GetDMField() ;
-
-        /**
-        * The function checks if data length is valid.
-        * @param    aProfileItem    Field / Leaf ID to be handled.
-        * @param    aSource         Data to be handled.
-        * @return   ETrue if data length is valid otherwise EFalse.
-        */ 
-	    TBool NotValidStrLenght( const TNSmlDMProfileData& aProfileItem, 
-                            const TDesC8& aSource );
-        
-        /**
-        * The function converts 16-bit data to 8-bit and returns reference to it.
-        * @param    aSource    Reference data to be converted.
-        * @return   Reference to 8-bit data buffer.
-        */ 
-	    TDesC8&  ConvertTo8LC( const TDesC& aSource );
-
-        /**
-        * The function converts 8-bit data to 16-bit and returns reference to it.
-        * @param    aSource    Reference data to be converted.
-        * @return   Reference to 16-bit data buffer.
-        */ 
-	    TDesC16& ConvertTo16LC( const TDesC8& aSource );
-
-        /**
-        * The function find out the port number from URL and stores it to aPort.
-        * @param    aRealURI    Reference data to be containing the whole URI.
-        * @param    aPort       Reference variable where port number will be stored.
-        * @return   KErrNone if successful otherwise KErrNotFound.
-        */ 
-	    TInt ParseUri( const TDesC8& aRealURI, TInt& aPort );
-
-        /**
-        * The function opens the server session and profile via client API.
-        * @param    aIntLUID    Integer value for a LUID of the profile.
-        * @param    aMode       Read or Read and Write mode for a profile data.
-        * @return   KErrNone if successful otherwise KErrNotFound.
-        */ 
-        TInt OpenSyncSessionAndProfileL( const TInt aIntLUID, TSmlOpenMode aMode );
-
-        /**
-        * The function checks if requested profile ID exits.
-        * @param    aIntLUID    Integer value for a LUID of the profile.
-        * @return   ETrue if profile exits otherwise EFalse.
-        */ 
-	    TBool FindProfileIdL( const TInt aIntLUID );
-
-        /**
-        * The function creates new DM profile.
-        * @param    aPID    Reference to variable where new profile will be stored.
-        * @return   KErrNone if successful otherwise error code.
-        */ 
-        TInt CreateNewProfileL( TInt& aPID );
-
-        /**
-        * The function stores the server URL for a profile.
-        * @param    aPID    Profile ID.
-        * @param    aObj    Reference to server URL data.
-        * @return   KErrNone if successful otherwise error code.
-        */ 
-        TInt SetProfileServerURIL( const TInt aPID, const TDesC8& aObj );
-
-        /**
-        * The function stores the display name for a profile.
-        * @param    aPID    Profile ID.
-        * @param    aObj    Reference to data.
-        * @return   KErrNone if successful otherwise error code.
-        */ 
-        TInt SetProfileDisplayNameL( const TInt aPID, const TDesC8& aObj );
-
-        /**
-        * The function stores the user name for a profile.
-        * @param    aPID    Profile ID.
-        * @param    aObj    Reference to data.
-        * @return   KErrNone if successful otherwise error code.
-        */ 
-        TInt SetProfileUserNameL( const TInt aPID, const TDesC8& aObj );
-        
-        /**
-        * The function stores the profile http user name for a profile.
-        * @param    aPID    Profile ID.
-        * @param    aObj    Reference to data.
-        * @return   KErrNone if successful otherwise error code.
-        */ 
-        TInt SetProfileHttpUserNameL( const TInt aPID, const TDesC8& aObj );
-        
-
-        /**
-        * The function stores the protocol version for a profile.
-        * @param    aPID    Profile ID.
-        * @param    aObj    Reference to data.
-        * @return   KErrNone if successful otherwise error code.
-        */ 
-        TInt SetProfileProtocolVersionL( const TInt aPID, const TDesC8& aObj );
-
-        /**
-        * The function stores the ServerId value for a profile.
-        * @param    aPID    Profile ID.
-        * @param    aObj    Reference to data.
-        * @return   KErrNone if successful otherwise error code.
-        */ 
-        TInt SetProfileServerIdL( const TInt aPID, const TDesC8& aObj );
-
-        /**
-        * The function stores the Server password for a profile.
-        * @param    aPID    Profile ID.
-        * @param    aObj    Reference to data.
-        * @return   KErrNone if successful otherwise error code.
-        */ 
-        TInt SetProfileServerPasswordL( const TInt aPID, const TDesC8& aObj );
-        
-        /**
-        * The function stores the network/http password for a profile.
-        * @param    aPID    Profile ID.
-        * @param    aObj    Reference to data.
-        * @return   KErrNone if successful otherwise error code.
-        */ 
-        TInt SetProfileHttpPasswordL( const TInt aPID, const TDesC8& aObj );
-        
-
-        /**
-        * The function stores the password value for a profile.
-        * @param    aPID    Profile ID.
-        * @param    aObj    Reference to data.
-        * @return   KErrNone if successful otherwise error code.
-        */ 
-        TInt SetProfilePasswordL( const TInt aPID, const TDesC8& aObj );
-
-        /**
-        * The function stores the IAP id value for a profile.
-        * @param    aLUID   Profile ID.
-        * @param    aIAPid  Reference to data.
-        * @return   KErrNone if successful otherwise error code.
-        */ 
-        TInt SetProfileConnectionPropertyL( const TInt aLUID, const TInt aIAPid );
-
-        /**
-        * The function deleted the profile data.
-        * @param    aPID    Profile ID.
-        * @return   KErrNone if successful otherwise error code.
-        */ 
-        TInt DeleteProfileL( const TInt aPID );
-        
-        /**
-        * The function to tell whether the profile is locked.
-        * @param    aPID   
-        * @return   1 if locked otherwise 0
-        */ 
-        TBool IsProfileLockedL(const TInt aPID);
-        
-        /**
-        * The function gets the profile data acoeding to aDMField.
-        * @param    aLUID       Profile ID.
-        * @param    aDMField    Data field ID to be handled.
-        * @param    aObject     Reference where fetched data to be stored.
-        * @return   KErrNone if successful otherwise error code.
-        */ 
-        TInt GetObjectL( TInt aLUID, TNSmlDMProfileData aDMField, 
-                        CBufBase& aObject );
-
-        /**
-        * The function adds port number to address URL.
-        * @param    aLUID       Profile ID.
-        * @param    aPort       Reference to port number data.
-        * @return   KErrNone if successful otherwise error code.
-        */ 
-        TInt SetProfileConnectionPortNrL( const TInt aLUID, const TDesC8& aPort );
-        
-        /**
-        * The function adds port number to address URL.
-        * @param    aSrvURI     Original address URI.
-        * @param    aNewURI     New URI when port number has been added or deleted.
-        * @param    aPort       Reference to port number data.
-        * @return   KErrNone if successful otherwise error code.
-        */ 
-        void SetPortNrToAddrStr( const TDesC8& aSrvURI, HBufC8* aNewURI, 
-                                const TDesC8& aPort );
-
-        /**
-        * General function which selects which leaf to be handled.
-        * @param    aLUID       Profile LUID.
-        * @param    aObject     Data to be stored.
-        * @param    aField      Leaf of field ID to be handled.
-        * @return   KErrNone if successful otherwise error code.
-        */ 
-        TInt SetDMFieldDataL( const TInt aLUID, const TDesC8& aObject, 
-                            const TNSmlDMProfileData aField );
-        /**
-        * The function fills the node info.
-        * @param    aNode           Reference to node or leaf which info to be filled.
-        * @param    aAccTypes       Access rights for a leaf / node.
-        * @param    aOccurrence     Occurance of the node / leaf.
-        * @param    aScope          Scope (dynamic / permanent) of the leaf / node.
-        * @param    aFormat         Data format of the leaf / node.
-        * @param    aDescription    Description of the node / leaf.
-        * @param    aDefaultValue   Default value for a leaf or node.
-        * @param    aMimeType       MIME type for a leaf / node.
-        * @return   none
-        */ 
-        void FillNodeInfoL( MSmlDmDDFObject& aNode, TSmlDmAccessTypes aAccTypes, 
-                        MSmlDmDDFObject::TOccurence aOccurrence, 
-                        MSmlDmDDFObject::TScope aScope, 
-                        MSmlDmDDFObject::TDFFormat aFormat, 
-                        const TDesC8& aDescription, 
-                        const TDesC8& aDefaultValue, const TDesC8& aMimeType );
-        
-        /**
-        * The function reads the authentication data via private API.
-        * @param    aLUID       LUID for a profile.
-        * @param    aField      Leaf id to be handled.
-        * @param    aObject     Reference where to store the data.
-        * @return   KErrNone if successful otherwise error code.
-        */ 
-        TInt GetDMAuthInfoL( const TInt aLUID, const TNSmlDMProfileData aField, 
-                            CBufBase& aObject );
-
-        /**
-        * The function delete's the authentication data via private API.
-        * @param    aLUID       LUID for a profile.
-        * @param    aField      Leaf id to be handled.
-        * @return   KErrNone if successful otherwise error code.
-        */ 
-        TInt DeleteDMAuthInfoL( const TInt aLUID, const TNSmlDMProfileData aField );
-        
-        /**
-        * The function set's the address type / medium type value for a profile.
-        * @param    aLUID       LUID for a profile.
-        * @param    aIntObj     Address type value.
-        * @return   KErrNone if successful otherwise error code.
-        */ 
-        TInt SetProfileAddrTypeL( const TInt aLUID, const TInt aIntObj );
-
-        /**
-        * The function gets the profile medium type value.
-        * @param    aObject     Reference where data to be stored.
-        * @return   KErrNone if successful otherwise error code.
-        */ 
-        TInt GetProfileConnectiontypeL( TInt& aMediumTYpe );
-        
-        /**
-        * The function gets the profile http user name of value.
-        * @param    aObject     Reference where data to be stored.
-        * @return   KErrNone if successful otherwise error code.
-        */ 
-        TInt GetHttpUsernameL( CBufBase& aObject );
-        
-       
-        /**
-        * The function gets the profile IAP value.
-        * @param    aIAPid     Reference where data to be stored.
-        * @return   KErrNone if successful otherwise error code.
-        */ 
-        TInt GetProfileIAPIdL( TInt& aIAPid );
-
-        /**
-        * The function gets the profile Server URL value.
-        * @param    aURL     Reference where data to be stored.
-        * @return   KErrNone if successful otherwise error code.
-        */ 
-        void GetProfileServerURLL( CBufBase& aURL );
-
-        /**
-        * The function checks the requested medium type if supported.
-        * @param    aIntObj         Medium type.
-        * @param    aMediumType     UID for medium type.
-        * @return   none
-        */         
-        void GetMediumTypeL( const TInt aIntObj, TInt& aMediumType );
-
-        /**
-        * The function gets the server id value.
-        * @param    aObject     Reference where data to be stored.
-        * @return   none
-        */       
-        void GetServerIdL( CBufBase& aObject );
-
-        /**
-        * The function gets the profile name value.
-        * @param    aObject     Reference where data to be stored.
-        * @return   none
-        */       
-        void GetProfileNameL( CBufBase& aObject );
-
-        /**
-        * The function gets the user name value.
-        * @param    aObject     Reference where data to be stored.
-        * @return   none
-        */ 
-        void GetProfileUserNameL( CBufBase& aObject );
-
-        /**
-        * The function gets the profile port number value.
-        * @param    aObject     Reference where data to be stored.
-        * @return   none
-        */ 
-        void GetProfilePortNumberL( CBufBase& aObject );
-
-        /**
-        * The function sets the profile authentication info via private API.
-        * @param    aLUID       Profile LUID.
-        * @param    aField      Leaf ID to be handled.
-        * @param    aObject     Data to be stored.
-        * @param    aStatus     Status of the function, KErrNone if successful.
-        * @return   none
-        */         
-        void SetAuthInfoL( const TInt aLUID, const TNSmlDMProfileData aField, 
-                        const TDesC8& aObject, TInt& aStatus );
-	//Buffers Node Object <>     
-	void AddNodeBufferL( const TDesC8& aURI, const TInt aStatusRef);
-
-	//Buffers Leaf Object       
-	void AddLeafBufferL( const TDesC8& aURI, const TDesC8& aObject,
-			const TInt aStatusRef);
-	// Executes Buffer       
-	void ExecuteBufferL();
-	//Extracts the ParentURI       
-	TPtrC8 ParentURI(const TDesC8& aURI);
-	// Clears the elements of the passed in LeafElement Structure
-	void ClearBuffer( CArrayFixFlat<TNSmlDMLeafElement>* aBuffer);
-	/**
-        * The function checks if requested ServerID ID exits.
-        * @param    aServerid    ServerID.
-        * @return   ETrue if ServerID exits otherwise EFalse.
-  */ 
-	TBool IsServerIDExistL( const TDesC8& aServerid );
-	
-	/**
-        * The function checks if the URI is of format ./DMAcc/DMId<num>
-        * Example ./DMAcc/DMId000 
-        * @param    aURI       aURI.
-        * @return   true/false
-  */                          
-  TBool IsDMAccUriFormatMatchPredefined(const TDesC8 & aURI);
-        
-  /**
-        * The function constructs ./DMAcc/x nodes and
-        * returns the profile ID matching the aURI.
-        * @param    aURI       aURI.
-        * @return   KErrNotFound/ProfileID
-  */  
-        
-  TInt ConstructTreeL(const TDesC8& aURI);
-  
-    /**
-        * The function extracts DMAcc/x node from aURI		        
-        * @param    aURI     DMAcc aURI.
-        * @return   DMAcc/x node.
-    */ 
-  TPtrC8 GetDynamicDMNodeUri(const TDesC8& aURI);
-
-    private:    // Data
-	
-        // Client API session class 
-        RSyncMLSession iSyncSession;
-        // Client API Device Management profile handling
-        RSyncMLDevManProfile iProfile;
-        // Callback interface for returning result or status
-	    MSmlDmCallback* iCallBack;
-	    
-	    TInt iCurrentProfile;
-	    
-        // Profile LUID
-        TInt iLUID;
-        // Parent LUID
-	    TInt iParentLUID;
-        // For handling profile medium type 
-	    TInt iObject;
-                  
-        // Buffer for URI leaf element
-	    HBufC8* iField;
-	    
-        HBufC8* iURIField;
-        TBool iNewProfile;
-        // Information about data type
-	    TNSmlDMFieldType  iFieldType;
-        // Information about leaf command
-	    TNSmlDMLeafType	  iLeafType;
-        // Status information if session allready opened
-        TBool iSyncSessionOpen;
-
-        // Buffer for storing port number
-        HBufC8* iPortNbr;
-    
-        // Private API interface for handling authebtication data
-        RNSmlPrivateAPI iPrivateApi;
-        
-        struct TPortBuffer
-            {
-            // buffered data for updating port number
-            TBufC8<5> iPortBuf;
-            TInt iPortBufLUID;
-            TInt iPortBufStatusRef;
-            };
-        RArray<TPortBuffer> iPortBuffer;
-        
-        struct TLockBuffer
-            {
-            // buffered data for profile lock
-            TInt iProfileLock;
-            TInt iProfileLockLUID;
-            TInt iProfileLockStatusRef;
-            };   
-        RArray<TLockBuffer> iProfileLockBuffer; 
-            
-	TBool iBufOn;
-	TBool iComplete;
-	TInt iExecutionIndex;
-	CArrayFixFlat<TNSmlDMBufferElement> *iBuffer;
-    };
-
-#endif // __NSMLDMSETTINGSADAPTER12_H__
-
-// End of File
-
--- a/omadm/omadmextensions/adapters/syncmldm12/src/NSmlDmSettingsAdapter12.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3993 +0,0 @@
-/*
-* 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:    DM-settings adapter
-*
-*/
-
-
-
-
-// INCLUDE FILES
-#include "NSmlDMSettingsAdapter12.h"
-#include "nsmldebug.h"
-#include "nsmlconstants.h"
-#include "nsmldmconstants.h"
-#include "nsmldmiapmatcher.h"
-#include "nsmldmauthinfo.h"
-#include <featmgr.h>
-#include <implementationproxy.h>
-#include <SyncMLClientDM.h>
-#include <SyncMLTransportProperties.h>
-#include <e32base.h>
-#include <DevManInternalCRKeys.h>
-#include <centralrepository.h>
-#ifndef __WINS__
-// This lowers the unnecessary compiler warning (armv5) to remark.
-// "Warning:  #174-D: expression has no effect..." is caused by 
-// DBG_ARGS8 macro in no-debug builds.
-#pragma diag_remark 174
-#endif
-
-const TUint KNSmlDMSettingsAdapterImplUid = 0x10282CE8;
-
-const TInt KBufSize32   = 32;
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter12::NewL
-//  Two-phased constructor.
-// -----------------------------------------------------------------------------
-CNSmlDMSettingsAdapter12* CNSmlDMSettingsAdapter12::NewL( MSmlDmCallback* aDmCallback )
-	{
-	_DBG_FILE("CNSmlDMSettingsAdapter12::NewL(): begin");
-
-	CNSmlDMSettingsAdapter12* self = NewLC( aDmCallback );
-	CleanupStack::Pop();
-
-	_DBG_FILE("CNSmlDMSettingsAdapter12::NewL(): end");
-	return self;
-	}
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter12::NewLC( )
-//  Loads the CNSmlDMSettingsAdapter12 class and pushes it to clenupstack.
-// -----------------------------------------------------------------------------
-CNSmlDMSettingsAdapter12* CNSmlDMSettingsAdapter12::NewLC( MSmlDmCallback* aDmCallback )
-	{
-	_DBG_FILE( "CNSmlDMSettingsAdapter12::NewLC(): begin" );
-	CNSmlDMSettingsAdapter12* self = new ( ELeave ) CNSmlDMSettingsAdapter12( aDmCallback );
-	CleanupStack::PushL( self );
-    self->iCallBack = aDmCallback;
-	self->ConstructL();
-	self->iLeafType = EDMUnset;
-
-	_DBG_FILE( "CNSmlDMSettingsAdapter12::NewLC(): end" );
-	return self;
-	}
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter12::CNSmlDMSettingsAdapter()
-//  Default constructor.
-// -----------------------------------------------------------------------------
-CNSmlDMSettingsAdapter12::CNSmlDMSettingsAdapter12( TAny* aEcomArguments) : 
-                                                CSmlDmAdapter(aEcomArguments )
-	{
-	_DBG_FILE( "CNSmlDMSettingsAdapter12::CNSmlDMSettingsAdapter(): begin" );
-	_DBG_FILE( "CNSmlDMSettingsAdapter12::CNSmlDMSettingsAdapter(): end" );
-	}
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter12::~CNSmlDMSettingsAdapter()
-//  Destructor.
-// -----------------------------------------------------------------------------
-CNSmlDMSettingsAdapter12::~CNSmlDMSettingsAdapter12()
-	{
-	_DBG_FILE( "CNSmlDMSettingsAdapter12::~CNSmlDMSettingsAdapter(): begin" );
-
-    delete iField;
-	delete iURIField;
-    // Client API Session & Profile
-    iProfile.Close();
-	iSyncSession.Close();
-    iSyncSessionOpen = EFalse;
-	// In Case the Buffer isnt cleared
-	if ( iBuffer)
-		{
-		for (TInt val =0; val<iBuffer->Count ();val++)
-			{
-			delete iBuffer->At(val).iMappingName;
-
-			ClearBuffer ( iBuffer->At(val).iLeafBuf);
-			delete iBuffer->At(val).iLeafBuf;
-			}
-
-		iBuffer->Reset ();
-		delete iBuffer;
-		}
-    delete iPortNbr;
-    iPortBuffer.Reset();
-    iPortBuffer.Close();
-    iProfileLockBuffer.Reset();
-    iProfileLockBuffer.Close();
-        
-    iPrivateApi.Close();
-    
-    iCallBack = 0; 
-    FeatureManager::UnInitializeLib();            
-	_DBG_FILE( "CNSmlDMSettingsAdapter12::~CNSmlDMSettingsAdapter(): end" );
-	}
-
-// -----------------------------------------------------------------------------
-//		CNSmlDMSettingsAdapter12::ConstructL()
-//		Second phase constructor.
-// -----------------------------------------------------------------------------
-void CNSmlDMSettingsAdapter12::ConstructL()
-	{
-	iField = HBufC8::NewL( KNSmlMaxURLLength );
-	iURIField = NULL;	
-    iSyncSessionOpen = EFalse;
-	FeatureManager::InitializeLibL();
-	// variables used for Buffering
-	iBufOn = EFalse;
-	iComplete = EFalse;
-	iExecutionIndex = -1;
-	iNewProfile = EFalse;
-	// initialising iBuffer
-	iBuffer = new (ELeave) CArrayFixFlat <TNSmlDMBufferElement> (KNSmlDMGranularity);
-    }
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter12::DDFVersionL()
-//  Returns the DDF version number.
-// -----------------------------------------------------------------------------
-void CNSmlDMSettingsAdapter12::DDFVersionL( CBufBase& aVersion )
-	{
-	_DBG_FILE(
-            "CNSmlDMSettingsAdapter12::DDFVersionL(CBufBase& aDDFVersion): begin" );
-	aVersion.InsertL( 0, KVersion );
-	_DBG_FILE(
-            "CNSmlDMSettingsAdapter12::DDFVersionL(CBufBase& aDDFVersion): end" );
-	}
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter12::DDFStructureL()
-//  Fills the DDF structure of the adapter.
-// -----------------------------------------------------------------------------
-void CNSmlDMSettingsAdapter12::DDFStructureL( MSmlDmDDFObject& aDDF )
-	{
-	_DBG_FILE( "CNSmlDMSettingsAdapter12::DDFStructureL(): begin" );
-      
-    //Making DMAcc as root 
-    
-	MSmlDmDDFObject* ddfRoot = &aDDF;
-	MSmlDmDDFObject& nDmDDF = ddfRoot->AddChildObjectL( KNSmlDefDMAcc );
-
-	TSmlDmAccessTypes *aclTypes = new ( ELeave ) TSmlDmAccessTypes();
-	CleanupStack::PushL( aclTypes );
-    
-    // Set Get as acceptable operations
-    aclTypes->SetGet();
-	
-	nDmDDF.SetDFTitleL( KNSmlDMadapterTitle );
-	
-    FillNodeInfoL( nDmDDF, *aclTypes, MSmlDmDDFObject::EOne, 
-                    MSmlDmDDFObject::EPermanent, MSmlDmDDFObject::ENode, 
-                    KNullDesC8, KNullDesC8, KNullDesC8 );
-    
-	aclTypes->SetAdd();
-	// Set rest acceptable operations for data itself
-	aclTypes->SetReplace();
-	aclTypes->SetDelete();
-
-	TSmlDmAccessTypes aclTypesNoGet;
-	aclTypesNoGet.SetReplace();
-	aclTypesNoGet.SetAdd();
-	aclTypesNoGet.SetDelete();
-
-	TSmlDmAccessTypes aclTypesAR;
-	aclTypesAR.SetReplace();
-	aclTypesAR.SetAdd();
-
-    TSmlDmAccessTypes aclTypesARG;
-	aclTypesARG.SetReplace();
-	aclTypesARG.SetAdd();
-    aclTypesARG.SetGet();
-
-    TSmlDmAccessTypes aclTypesG;
-    aclTypesG.SetGet();
-    
-    TSmlDmAccessTypes aclTypesAG;
-    aclTypesAG.SetGet();
-    aclTypesAG.SetAdd();
-    
-    TSmlDmAccessTypes aclTypesAGD;
-    aclTypesAGD.SetGet();
-    aclTypesAGD.SetAdd();
-    aclTypesAGD.SetDelete();
-    
-        
-	MSmlDmDDFObject& nProDDF = nDmDDF.AddChildObjectGroupL();
-    FillNodeInfoL( nProDDF, *aclTypes, MSmlDmDDFObject::EZeroOrMore, 
-                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::ENode, 
-                    KNullDesC8, KNullDesC8, KMimeType );
-
-    MSmlDmDDFObject& nAppIdDDF = nProDDF.AddChildObjectL( KNSmlDdfAppId );			// Addr
-    FillNodeInfoL( nAppIdDDF, aclTypesG, MSmlDmDDFObject::EOne, 
-                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::EChr, 
-                    KNSmlDdfAppIdDescription, KNullDesC8, KMimeType );
-
-      //PrefConRef 
-    MSmlDmDDFObject& nPrefConRefDDF = nProDDF.AddChildObjectL( KNSmlDdfPrefConRef );	// PrefConRef
-    FillNodeInfoL( nPrefConRefDDF, aclTypesARG, MSmlDmDDFObject::EOne, 
-                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::EChr, 
-                    KNSmlDdfConRefDescription, KNullDesC8, KMimeType );
-
-           
-                    
-   // App Address nodes 
-    MSmlDmDDFObject& nAppAddrDDF = nProDDF.AddChildObjectL( KNSmlDdfAppAddr );	// AppAddr
-    FillNodeInfoL( nAppAddrDDF, aclTypesG, MSmlDmDDFObject::EOne, 
-                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::ENode, 
-                    KNSmlDdfAddrDescription, KNullDesC8, KMimeType );
-   
-    MSmlDmDDFObject& rtToAppAddrRef = nAppAddrDDF.AddChildObjectGroupL();  //AppAddr/<X>
-    FillNodeInfoL(rtToAppAddrRef,aclTypesG,MSmlDmDDFObject::EOneOrMore,
-                  MSmlDmDDFObject::EDynamic,MSmlDmDDFObject::ENode,
-                  KNSmlDdfAddrDescription,KNullDesC8, KMimeType );
-
-
-    MSmlDmDDFObject& nAddrForAppAddrDDF = rtToAppAddrRef.AddChildObjectL( KNSmlDdfAddr );			// Addr
-    FillNodeInfoL( nAddrForAppAddrDDF, aclTypesARG, MSmlDmDDFObject::EOne, 
-                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::EChr, 
-                    KNSmlDdfAddrDescription, KNullDesC8, KMimeType );
-
-	MSmlDmDDFObject& nAddrTypeForAppAddrDDF = rtToAppAddrRef.AddChildObjectL( KNSmlDdfAddrType );	// AddrType
-    FillNodeInfoL( nAddrTypeForAppAddrDDF, aclTypesG, MSmlDmDDFObject::EOne, 
-                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::EChr, 
-                    KNSmlDdfAddrTypeDescription, KNullDesC8, KMimeType );
-
-	MSmlDmDDFObject& nPortForAppAddrDDF = rtToAppAddrRef.AddChildObjectL( KNSmlDdfPort );	// PortNbr
-    FillNodeInfoL( nPortForAppAddrDDF, aclTypesG, MSmlDmDDFObject::EOne, 
-                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::ENode, 
-                    KNSmlDdfPortNbrDescription, KNullDesC8, KMimeType );
-
-    //Runtime port address
-    MSmlDmDDFObject& nrtToPortDDF = nPortForAppAddrDDF.AddChildObjectGroupL();	// PortNbr
-    FillNodeInfoL( nrtToPortDDF, aclTypesG, MSmlDmDDFObject::EOneOrMore, 
-                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::ENode, 
-                    KNSmlDdfPortNbrDescription, KNullDesC8, KMimeType );
-    
-    MSmlDmDDFObject& nPortNbrToPortDDF = nrtToPortDDF.AddChildObjectL( KNSmlDdfPortNbr );	// PortNbr
-    FillNodeInfoL( nPortNbrToPortDDF, aclTypesARG, MSmlDmDDFObject::EZeroOrOne, 
-                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::EInt, 
-                    KNSmlDdfPortNbrDescription, KNullDesC8, KMimeType );
-                    
-
-    MSmlDmDDFObject& nAuthSchemeDDF = nProDDF.AddChildObjectL( KNSmlDdfAuthScheme );	// AuthPref
-    FillNodeInfoL( nAuthSchemeDDF, aclTypesARG, MSmlDmDDFObject::EOne, 
-                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::EChr, 
-                    KNSmlDdfAuthSchemeDescription, KNullDesC8, KMimeType );                     
-   //APPAUthNodes 
-   
-   MSmlDmDDFObject& nAppAuthDDF = nProDDF.AddChildObjectL( KNSmlDdfAppAuth );	// AppAuth
-    FillNodeInfoL( nAppAuthDDF, aclTypesG, MSmlDmDDFObject::EOne, 
-                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::ENode, 
-                    KNSmlDdfAuthSchemeDescription, KNullDesC8, KMimeType ); 
-                    
-   
-   MSmlDmDDFObject& nrtToAppAuthDDF = nAppAuthDDF.AddChildObjectGroupL();	// appauth/<x>
-    FillNodeInfoL( nrtToAppAuthDDF, aclTypesG, MSmlDmDDFObject::EOne, 
-                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::ENode, 
-                    KNSmlDdfAuthSchemeDescription, KNullDesC8, KMimeType ); 
-
-
-   MSmlDmDDFObject& nAauthLevelDDF = nrtToAppAuthDDF.AddChildObjectL( KNSmlDdfAAuthLevel );	// AAuthLevel
-    FillNodeInfoL( nAauthLevelDDF, aclTypesARG, MSmlDmDDFObject::EOne, 
-                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::EChr, 
-                    KNSmlDdfAuthLevelDescription, KNullDesC8, KMimeType );
-                    
-    
-   MSmlDmDDFObject& nAauthtypeDDF = nrtToAppAuthDDF.AddChildObjectL( KNSmlDdfAAuthType );	// AAuthType
-    FillNodeInfoL( nAauthtypeDDF, aclTypesG, MSmlDmDDFObject::EOne, 
-                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::EChr, 
-                    KNSmlDdfAddrTypeDescription, KNullDesC8, KMimeType );
-                    
-
-   MSmlDmDDFObject& nAauthNameDDF = nrtToAppAuthDDF.AddChildObjectL( KNSmlDdfAAuthName );	// AddrType
-    FillNodeInfoL( nAauthNameDDF, aclTypesARG, MSmlDmDDFObject::EOne, 
-                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::EChr, 
-                    KNSmlDdfAuthNameDescription, KNullDesC8, KMimeType );
-                    
-
-   MSmlDmDDFObject& nAauthSecretDDF = nrtToAppAuthDDF.AddChildObjectL( KNSmlDdfAAuthSecret );	// AddrType
-    FillNodeInfoL( nAauthSecretDDF, aclTypesAR, MSmlDmDDFObject::EOne, 
-                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::EChr, 
-                    KNSmlDdfAuthSecretDescription, KNullDesC8, KMimeType );                     
-
-    MSmlDmDDFObject& nAauthDataDDF = nrtToAppAuthDDF.AddChildObjectL( KNSmlDdfAAuthData );	// AddrType
-    FillNodeInfoL( nAauthDataDDF, aclTypesAR, MSmlDmDDFObject::EOne, 
-                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::EChr, 
-                    KNSmlDdfAuthDataDescription, KNullDesC8, KMimeType ); 
-                    
-
-	MSmlDmDDFObject& nNameDDF = nProDDF.AddChildObjectL( KNSmlDdfName );	// Name
-    FillNodeInfoL( nNameDDF, aclTypesARG, MSmlDmDDFObject::EZeroOrOne, 
-                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::EChr, 
-                    KNSmlDdfNameDescription, KNullDesC8, KMimeType );
-                    
-	
-
-	MSmlDmDDFObject& nServerIdDDF = nProDDF.AddChildObjectL( KNSmlDdfServerId );	// ServerId
-    FillNodeInfoL( nServerIdDDF, aclTypesAG, MSmlDmDDFObject::EOne, 
-                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::EChr, 
-                    KNSmlDdfServerIdDescription, KNullDesC8, KMimeType );
-
-   	MSmlDmDDFObject& nextDDF = nProDDF.AddChildObjectL( KNSmlDdfExt );	// Ext
-    FillNodeInfoL( nextDDF, aclTypesG, MSmlDmDDFObject::EOne, 
-                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::ENode, 
-                    KNSmlDdfServerIdDescription, KNullDesC8, KMimeType );
-                    
-   MSmlDmDDFObject& nlockedDDF = nextDDF.AddChildObjectL( KNSmlDdfLocked );	// locked
-    FillNodeInfoL( nlockedDDF, aclTypesARG, MSmlDmDDFObject::EOne, 
-                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::EChr, 
-                    KNSmlDdfServerIdDescription, KNullDesC8, KMimeType );                 
-
-	CleanupStack::PopAndDestroy(); //aclTypes
-	
-	_DBG_FILE("CNSmlDMSettingsAdapter12::DDFStructureL(): end");
-	}
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter12::UpdateLeafObjectL
-//  Updates profile leaf object data based on URI.
-// -----------------------------------------------------------------------------
-void CNSmlDMSettingsAdapter12::UpdateLeafObjectL( const TDesC8& aURI,
-                                                const TDesC8& aLUID, 
-                                                const TDesC8& aObject, 
-                                                const TDesC8& /*aType*/, 
-                                                const TInt aStatusRef )
-	{
-	_DBG_FILE("CNSmlDMSettingsAdapter12::UpdateLeafObjectL(): begin");
-	TInt index = -1;
-	if ( !iBufOn)
-		{
-		for (TInt val = 0; val<iBuffer->Count (); val++)
-			{
-			TPtrC8 firstUri = ParentURI (aURI);
-			if ( iBuffer->At(val).iMappingName->Compare (firstUri)== 0)
-				{
-				index = iExecutionIndex = val;
-				break;
-				}
-			}
-		}
-	if ( index >= 0)
-		AddLeafBufferL (aURI, aObject, aStatusRef);
-	else
-		{
-			TInt parentLUID = GetIntObject( aLUID ); 
-			if( parentLUID < 0 )
-			{
-				if( IsDMAccUriFormatMatchPredefined(aURI) )
-    		{
-    			parentLUID = ConstructTreeL(aURI);
-    		}
-    		}
-		if( parentLUID < 0 )
-		{
-		_DBG_FILE( "CNSmlDMSettingsAdapter12::UpdateLeafObjectL( ): ENotFound end" );
-		iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-		return;
-		}
-
-	if( parentLUID != iParentLUID )
-		{
-		if( FindProfileIdL( parentLUID ) != EFalse )
-			{
-			iParentLUID = parentLUID;
-			}
-		else
-			{
-			iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-			return;
-			}
-		}
-	SetField( aURI );
-	SetURIInProcessL( aURI);
-	if( !AcceptDMField() )
-		{
-		_DBG_FILE( "CNSmlDMSettingsAdapter12::AddLeafObjectL(): KErr field end" );
-		iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EInvalidObject );
-		return;
-		}
-
-    //	Get Database field type 
-	TNSmlDMFieldType fType = GetDMFieldType();
-	if ( fType == EWrong )
-		{
-		_DBG_FILE( "CNSmlDMSettingsAdapter12::AddLeafObjectL(): EError end" );
-		iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-		return;
-		}
- 	
-    TNSmlDMProfileData fData = GetDMField();
-    if( fData == ESyncAccepted )
-        {
-        _DBG_FILE( "CNSmlDMSettingsAdapter12::AddLeafObjectL(): EError end" );
-		iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-		return;
-        }
-    if( NotValidStrLenght( fData, aObject ) )
-	    {
-		_DBG_FILE( "CNSmlDMSettingsAdapter12::AddLeafObjectL(): KErr length end" );
-		iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ETooLargeObject );
-		return;
-		}
-    //Authentication data leafs to be handled
-    if ( fData == EAuthenticationRequired || fData == EClientNonce 
-        || fData == EServerNonce )
-        {
-        //Check if replace command and replace data as defined
-        
-        TInt replaceStatus = KErrGeneral; 
-        SetAuthInfoL( iParentLUID + KMaxDataSyncID, fData, aObject, replaceStatus );
-        if ( replaceStatus == KErrNone )
-            {
-            iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
-            }
-        else if ( replaceStatus == KErrNotFound )
-            {
-            iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-            }
-        else
-            {
-            iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-            }
-       
-        _DBG_FILE( "CNSmlDMSettingsAdapter12::UpdateLeafObjectL():end" );
-        return;
-        }
-        
-    TInt rValue = SetDMFieldDataL( iParentLUID, aObject, fData );
-    if ( fData == EProfilePort )
-        {
-        // in case port is updated, save status ref to be used in 
-        // CompleteOutstandingCmdsL
-        if(rValue==KErrNone)
-            {
-            iPortBuffer[iPortBuffer.Count()-1].iPortBufStatusRef = aStatusRef; 
-            }
-        else if( rValue == KErrOverflow)
-        {
-        	iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ETooLargeObject );
-        }
-        else
-        {
-        	iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-        }
-        }
-    else if ( fData == EProfileLock && iNewProfile )
-    {
-        if(rValue == KErrNone)
-         iProfileLockBuffer[iProfileLockBuffer.Count()-1].iProfileLockStatusRef = aStatusRef; 	
-        else
-         iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotAllowed);
-    }
-    else
-        {
-        if( rValue != KErrNone )
-            {
-            if( rValue == KErrNotFound )
-                {
-                iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-                }
-            else if( rValue == KErrInUse )
-                {
-                iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EObjectInUse );
-                }
-            else if( rValue == KErrNoMemory )
-                {
-                iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENoMemory );
-                }
-            else if(rValue == KErrAccessDenied) 
-               {
-                iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotAllowed);
-
-               }
-            else if (  rValue == KErrArgument)
-             {
-             	iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EInvalidObject);
-             	
-             } 
-            else
-                {
-                iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-                }
-            }
-        else
-            {
-            iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
-            }
-        }
-      }        
-	_DBG_FILE( "CNSmlDMSettingsAdapter12::UpdateLeafObjectL():end" );
-    return;
-	}
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter12::DeleteObjectL
-//  Deletes whole profile or leaf object data acording to aURI.
-// -----------------------------------------------------------------------------
-void CNSmlDMSettingsAdapter12::DeleteObjectL( const TDesC8& aURI, 
-                                            const TDesC8& aLUID, 
-                                            const TInt aStatusRef )
-	{
-	_DBG_FILE( "CNSmlDMSettingsAdapter12::DeleteObjectL( ): begin" );
-
-	if( aURI.Find( KNSmlDdfConRef ) != KErrNotFound )
-		{	
-		_DBG_FILE( "CNSmlDMSettingsAdapter12::DeleteObjectL(): NOT ALLOWED end" );
-		iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-		return;
-		}
-	iLUID = IntLUID( aLUID );
-	if(IsProfileLockedL(iLUID))
-	{
-	  _DBG_FILE( "CNSmlDMSettingsAdapter12::DeleteObjectL(): NOT ALLOWED end" );
-	  
-		iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotAllowed );
-		return;	
-	}
-		
-
-    //	Check which field going to be handled
-	SetField( aURI );
-	SetURIInProcessL(aURI);
-
-    //	Check if valid field
-	if( !AcceptDMField() )
-		{
-
-        // Delete whole profile if aURI called for node
-		TInt last = aURI.LocateReverse( '/' );
-		TInt pos  = aURI.Find( KNSmlDefDMAcc );
-		if( last - 5 == pos )
-			{
-
-            //	If called for node means that profile will deleted from database
-			iLUID = IntLUID( aLUID );
-			DBG_ARGS8( _S8("DeleteObjectL: URI %S LUID = %d"), &aURI, iLUID );
-
-			if( FindProfileIdL( iLUID ) == EFalse )
-				{
-				_DBG_FILE(
-                    "CNSmlDMSettingsAdapter12::DeleteObjectL( ): notfound end");
-				
-                iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-				return;
-				}
-			else
-				{
-				TInt sRet = DeleteProfileL( iLUID + KMaxDataSyncID );
-				if ( sRet != KErrNone )
-					{
-                    if( sRet == KErrNotFound )
-                        {
-                        iCallBack->SetStatusL( aStatusRef,
-                                                CSmlDmAdapter::ENotFound );
-                        }
-                    else if( sRet == KErrInUse )
-                        {
-                        iCallBack->SetStatusL( aStatusRef,
-                                                CSmlDmAdapter::EObjectInUse );
-                        }
-                    else
-                        {
-                        iCallBack->SetStatusL( aStatusRef, 
-                                                CSmlDmAdapter::EError );
-					    }
-					return;
-					}
-				else
-					{
-					_DBG_FILE( "CNSmlDMSettingsAdapter12::DeleteObjectL( ): EOk end" );
-					iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
-					return;
-					}
-				}
-			}
-		else
-			{
-			_DBG_FILE(
-                "CNSmlDMSettingsAdapter12::DeleteObjectL( ): EInvalidObject end" );
-			iCallBack->SetStatusL( aStatusRef,CSmlDmAdapter::EInvalidObject );
-			return;
-			}
-		}//Delete whole Profile
-
-	iLUID = IntLUID( aLUID );
-	if ( iLUID != iParentLUID )
-		{
-		if( FindProfileIdL( iLUID ) == EFalse )
-			{
-			_DBG_FILE( "CNSmlDMSettingsAdapter12::DeleteObjectL( ): end" );
-			iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-			return;
-			}
-		iParentLUID = iLUID;
-		}
-	
-	if ( iField->Compare( KNSmlDdfAuthScheme ) == 0 )
-    	{
-		DeleteDMAuthInfoL( iLUID, EAuthenticationRequired );
-        iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
-        return;
-		}
-    else if( iField->Compare( KNSmlDdfClientNonce ) == 0 )
-    	{
-		DeleteDMAuthInfoL( iLUID, EClientNonce );
-        iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
-        return;
-		}
-    else if( iField->Compare(KNSmlDdfServerNonce) == 0 )
-		{
-		DeleteDMAuthInfoL( iLUID, EServerNonce );
-        iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
-        return;
-		}
-
-    // Sets default value if not null field
-	HBufC8* dataObject = HBufC8::NewLC( 15 );
-	dataObject->Des().Format( KNullDesC8 );
-
-	_LIT8(aType,		"text/plain");
-	iLeafType = EDMDelete;
-	UpdateLeafObjectL( aURI, aLUID, *dataObject, aType, aStatusRef );
-    CleanupStack::PopAndDestroy(); //dataObject
-	iLeafType = EDMUnset;
-
-	_DBG_FILE( "CNSmlDMSettingsAdapter12::DeleteObjectL( ): end" );
-	return;
-	}
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter12::FetchLeafObjectL
-//  Fetches profile leaf object data acordint to aURI.
-// -----------------------------------------------------------------------------
-void CNSmlDMSettingsAdapter12::FetchLeafObjectL( const TDesC8& aURI, 
-                                                const TDesC8& aLUID, 
-                                                const TDesC8& aType, 
-                                                const TInt aResultsRef, 
-                                                const TInt aStatusRef )
-	{
-
-	_DBG_FILE( "CNSmlDMSettingsAdapter12::FetchLeafObjectL(): begin" );
-	DBG_ARGS(_S16( "DM:Fetch aURI    - %S - %S"), &aURI, &aLUID );
-		
-	iLUID = IntLUID( aLUID );
-	if ( iLUID >= 0 )
-		{
-		if( FindProfileIdL( iLUID ) == EFalse )
-			{
-			_DBG_FILE( "CNSmlDMSettingsAdapter12::FetchLeafObjectL(): ENotFound end" );
-			iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-			return;
-			}
-		}
-	else
-		{
-		
-		// Static node feature start
-		iLUID = -1;
-		if( IsDMAccUriFormatMatchPredefined(aURI) )
-    	{
-    		iLUID = ConstructTreeL(aURI);
-    	}
-    	
-    	if (iLUID == -1) 
-    	{
-    			_DBG_FILE( "CNSmlDMSettingsAdapter::FetchLeafObjectL(): ENotFound end" );
-				iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-				return;
-    	}
-		// Static node feature end
-		}
-
-    //	Check which field going to be handled
-	SetField(aURI);
-	SetURIInProcessL(aURI);
-
-    //	Check if valid field
-	if( !AcceptDMField() )
-		{
-		_DBG_FILE( "CNSmlDMSettingsAdapter12::FetchLeafObjectL(): EInvalidObject end" );
-		iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EInvalidObject );
-		return;
-		}
-    /*if(iField->Compare(KNSmlDdfExt) == 0)
-        {
-        iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
-        CBufBase* extNode = CBufFlat::NewL(128);
-        CleanupStack::PushL(extNode);
-        iCallBack->SetResultsL( aResultsRef, *extNode, KNullDesC8 );
-        CleanupStack::PopAndDestroy(extNode);
-        return;
-        }*/
-         
-    //	Get Database field type 
-	TInt fType = GetDMFieldType();
-	if ( fType == EWrong )
-		{
-		_DBG_FILE( "CNSmlDMSettingsAdapter12::FetchLeafObjectL(): EError end" );
-		iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-		return;
-		}
-
-    TNSmlDMProfileData fieldId = GetDMField();
-    if( fieldId == ESyncAccepted )
-        {
-        _DBG_FILE( "CNSmlDMSettingsAdapter12::AddLeafObjectL(): EError end" );
-		iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-		return;
-        }
-    CBufBase *lObject = CBufFlat::NewL( 128 );
-    CleanupStack::PushL( lObject );
-    lObject->Reset();
-    
-    CSmlDmAdapter::TError status;
-
-    if ( fType == EStr || fType == EInt || fType == EBin )
-		{ 
-		//  Check for APPId and return w7 
-		TInt rValue = KErrNone;
-       /* if( iField->Compare(KNSmlDdfAppId ) ==0 )
-        {
-        	status = CSmlDmAdapter::EOk;
-        	lObject->InsertL(lObject->Size(),KNSmlDdfAppIdValue);
-        	
-        }*/
-        
-        rValue = GetObjectL( iLUID, fieldId, *lObject );
-		if( rValue != KErrNone )
-		    {
-            if( rValue == KErrNotFound )
-                {
-                status = CSmlDmAdapter::ENotFound;
-                }
-            else if( rValue == KErrInUse )
-                {
-                status = CSmlDmAdapter::EObjectInUse;
-                }
-            else if( rValue == KErrNoMemory )
-                {
-                status = CSmlDmAdapter::ENoMemory;
-                }
-            else
-                {
-                status = CSmlDmAdapter::EError;
-                }
-		    }
-        else
-            {
-            status = CSmlDmAdapter::EOk;
-            }
-		}
-	else 
-		{
-		CleanupStack::PopAndDestroy(); //lObject 
-        _DBG_FILE( "CNSmlDMSettingsAdapter12::FetchLeafObjectL(): ENotFound end" );
-		iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-		iProfile.Close();
-        iSyncSession.Close();
-        iSyncSessionOpen = EFalse;
-		return;
-		}
-    iCallBack->SetStatusL( aStatusRef, status );
-    
-    if(status==CSmlDmAdapter::EOk)
-    	{
-		iCallBack->SetResultsL( aResultsRef, *lObject, aType );
-    	}
-  	
-    CleanupStack::PopAndDestroy(); //lObject 
-	iProfile.Close();
-    iSyncSession.Close();
-    iSyncSessionOpen = EFalse;
-	_DBG_FILE( "CNSmlDMSettingsAdapter12::FetchLeafObjectL(): end" );
-	return;
-	}
-
-// -----------------------------------------------------------------------------
-//  CSmlDmSettingsAdapter::ChildURIListL
-//  Function returns the list of profiles or leafs of the profile 
-//  acording to aURI.
-// -----------------------------------------------------------------------------
-void CNSmlDMSettingsAdapter12::ChildURIListL( const TDesC8& aURI, 
-                                            const TDesC8& aLUID, 
-                                            const CArrayFix<TSmlDmMappingInfo>& aPreviousURISegmentList, 
-                                            const TInt aResultsRef, 
-                                            const TInt aStatusRef  )
-	{
-	_DBG_FILE( "CNSmlDMSettingsAdapter12::ChildURIListL(): begin" );
-	CBufBase *currentURISegmentList = CBufFlat::NewL( 128 );
-	CleanupStack::PushL( currentURISegmentList );
- 
-	if(( aURI.Match( KDmAccMatch ) != KErrNotFound ) &&
-	 (aURI.Match( KDmAccMatch3 ) == KErrNotFound ))
-		{
-		//	Check if Profile exists
-        TInt checkLUID = GetIntObject( aLUID );
-        if( FindProfileIdL( checkLUID ) )
-        	{
-            currentURISegmentList->InsertL( currentURISegmentList->Size(), KSegmDMAcc );
-			iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
-		    iCallBack->SetResultsL( aResultsRef, *currentURISegmentList, KNullDesC8 );
-        	}
-        else
-        	{
-        		// Static node feature start
-				checkLUID = -1;
-				if( IsDMAccUriFormatMatchPredefined(aURI) )
-		    	{
-		    		checkLUID = ConstructTreeL(aURI);
-		    	}
-		    	
-		    	if (checkLUID == -1) 
-		    	{
-		    			_DBG_FILE( "CNSmlDMSettingsAdapter::childURI(): ENotFound end" );
-						iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-						 CleanupStack::PopAndDestroy(  ); // currentURISegmentList
-        			_DBG_FILE( "CNSmlDMSettingsAdapter::ChildURIListL(): end" );
-						return;
-		    	}
-		    	else
-		    	{
-		    		currentURISegmentList->InsertL( currentURISegmentList->Size(), KSegmDMAcc );
-				iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
-			    iCallBack->SetResultsL( aResultsRef, *currentURISegmentList, KNullDesC8 );
-		    
-		    	}
-    	
-    	
-		//	iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-		// Static node feature start end
-        	}
-
-        CleanupStack::PopAndDestroy(  ); // currentURISegmentList
-        _DBG_FILE( "CNSmlDMSettingsAdapter12::ChildURIListL(): end" );
-		return;
-		}
-    else if(( aURI.Match( KDmAccMatch2 ) != KErrNotFound ) &&
-              (aURI.Match( KDmAccMatch ) == KErrNotFound ))
-        {   
-        if( iSyncSessionOpen == EFalse )
-            {
-            iSyncSession.OpenL();
-            iSyncSessionOpen = ETrue;
-            }
-        RArray<TSmlProfileId> profileIdArray;
-        CleanupClosePushL( profileIdArray );
-        TSmlUsageType usageType = ESmlDevMan;
-        iSyncSession.ListProfilesL( profileIdArray, usageType );
-	    
-        for( TInt p = 0; p < profileIdArray.Count(); p++ )
-		    {
-		    TBool notInList = ETrue;
-		    TInt newline = 0;
-            TInt ddId = profileIdArray[p] - KMaxDataSyncID;
-            
-		    while( notInList && newline < aPreviousURISegmentList.Count() )
-			    {
-				TInt ppId = GetIntObject( aPreviousURISegmentList.At(newline).iURISegLUID );
-				if( ppId == ddId ) 
-				    {
-					notInList = EFalse;
-					break;
-					}
-				newline++;
-			    }
-		    if( notInList )
-			    {
-			    _LIT8( Kprev, "DMId" );
-			    TBuf8<7> addNAME(Kprev); // DMIdnnn , nnn = profileid
-                TInt fixedProfId = profileIdArray[p] - KMaxDataSyncID; //fit to 3 decimal
-			    addNAME.AppendNumFixedWidth( fixedProfId, EDecimal, 3 ); 
-
-    			currentURISegmentList->InsertL( currentURISegmentList->Size(), addNAME );
-	    		currentURISegmentList->InsertL( currentURISegmentList->Size(), KSmlDmSlash );
-		    	DBG_ARGS8( _S8("notInList: Id = %d Name %S"), p, &addNAME );
-
-			    // KNSmlDMStart includes start text for URISeg
-			    TBuf8<20> addURI; // SyncML/DMAcc/DMIdnnn , nnn = profileid
-			    addURI.Append( KNSmlDMStart );
-			    addURI.AppendNumFixedWidth( fixedProfId, EDecimal, 3 ); 
-
-    			TBuf8<3> addLUID;
-	    		addLUID.Num( fixedProfId );
-
-		    	// Also added to mapping
-			    iCallBack->SetMappingL( addURI, addLUID );
-    			}
-	    	else
-		    	{ // Add those in PreviousList which are on database
-			    currentURISegmentList->InsertL( currentURISegmentList->Size(),
-                                                aPreviousURISegmentList.At(newline).iURISeg );
-    			currentURISegmentList->InsertL( currentURISegmentList->Size(), KSmlDmSlash );
-//	    		DBG_ARGS8( _S8("InList: Id = %d Name %S"), newline, 
-//                          aPreviousURISegmentList.At(newline).iURISeg );
-		    	}
-		    }
-        CleanupStack::PopAndDestroy( 1 );//profileIdArray
-        }
-        
-    // AppAddr subtree
-    else if( ( aURI.Match( KDmAccAppAddrMatch ) != KErrNotFound ) && (aURI.Match( KDmAccPortMatch ) == KErrNotFound ) && (aURI.Match( KDmAccPortFullMatch ) == KErrNotFound ))
-        {
-          currentURISegmentList->InsertL( currentURISegmentList->Size(), KDmAccAppAddrId );
-        }
-    else if(( aURI.Match( KDmAccAppAddrFullMatch ) != KErrNotFound ) && (aURI.Match( KDmAccPortMatch ) == KErrNotFound ) && (aURI.Match( KDmAccPortFullMatch ) == KErrNotFound ))
-        {
-          currentURISegmentList->InsertL( currentURISegmentList->Size(), KSegmDMAccAppAddr );
-        }   
-    else if(( aURI.Match( KDmAccPortMatch ) != KErrNotFound ) && (aURI.Match( KDmAccPortFullMatch ) == KErrNotFound ))
-        {
-          currentURISegmentList->InsertL( currentURISegmentList->Size(), KSegmDMAccPortRT );
-        } 
-   else if( aURI.Match( KDmAccPortFullMatch ) != KErrNotFound )
-        {
-          currentURISegmentList->InsertL( currentURISegmentList->Size(), KSegmDMAccport );
-        } 
-          
-   else if(( aURI.Match( KDmAccAppAuthMatch ) != KErrNotFound ) && (aURI.Match( KDmAccAppAuthFullMatch ) == KErrNotFound ))
-        {
-          currentURISegmentList->InsertL( currentURISegmentList->Size(), KDmAccAppAuthNodes );
-        } 
-    else if((aURI.Match(KDmAccAppAuthSrvMatch) != KErrNotFound) || (aURI.Match(KDmAccAppAuthCliMatch) != KErrNotFound) || (aURI.Match(KDmAccAppAuthTransMatch) != KErrNotFound)) //|| (aURI.Match(KDmAccAppAuthObexMatch) != KErrNotFound) || (aURI.Match(KDmAccAppAuthHttpMatch) != KErrNotFound))
-        {
-           currentURISegmentList->InsertL( currentURISegmentList->Size(), KSegmDMAccAppAuth );
-        }
-    else if(( aURI.Match( KDmAccAppAuthFullMatch ) != KErrNotFound ) && (aURI.Find( KDmAccAppAuthNodes ) != KErrNotFound))
-        {
-          currentURISegmentList->InsertL( currentURISegmentList->Size(), KSegmDMAccAppAuth );
-        } 
-                         
-    else if( aURI.Match( KDmAccExtMatch ) != KErrNotFound )
-        {
-          currentURISegmentList->InsertL( currentURISegmentList->Size(), KSegmDMAccLocked );
-        }                      
-    else
-        {
-        iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EInvalidObject );
-        CleanupStack::PopAndDestroy( 1 ); // currentURISegmentList
-        return;
-        }
-
-	iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
-	iCallBack->SetResultsL( aResultsRef, *currentURISegmentList, KNullDesC8 );
-	CleanupStack::PopAndDestroy(); // currentURISegmentList
-	_DBG_FILE( "CNSmlDMSettingsAdapter12::ChildURIListL(): end" );
-	return;
-	}
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter12::AddNodeObjectL
-//  Adds new DM-settings profile to database
-// -----------------------------------------------------------------------------
-void CNSmlDMSettingsAdapter12::AddNodeObjectL( const TDesC8& aURI, 
-                                            const TDesC8& aParentLUID, 
-                                            const TInt aStatusRef )
-	{
-	_DBG_FILE( "CNSmlDMSettingsAdapter12::AddNodeObjectL(): begin" );
-
-	if( aParentLUID.Length() > 0 )
-		{
-		iParentLUID = GetIntObject( aParentLUID );
-        if( FindProfileIdL( iParentLUID ) != EFalse )// iProfile != NULL)
-		    {
-		    _DBG_FILE( "CNSmlDMSettingsAdapter12::AddNodeObjectL(): EAlreadyExists end" );
-		    iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EAlreadyExists );
-		    return;
-		    }
-		else
-			{						
-			TInt ret = iCallBack->RemoveMappingL(KNSmlDMSettingsAdapterImplUid,
-							GetDynamicDMNodeUri( aURI ), ETrue );
-			if(ret != KErrNone)
-				{
-			    iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-		    	return;
-				}			
-			}		
-		}
-	iNewProfile = ETrue; 
-	AddNodeBufferL (aURI, aStatusRef);
-	_DBG_FILE( "CNSmlDMSettingsAdapter12::AddNodeObjectL(): end" );
-	return;
-	}
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter12::UpdateLeafObjectL()
-// -----------------------------------------------------------------------------
-void CNSmlDMSettingsAdapter12::UpdateLeafObjectL( const TDesC8&, const TDesC8&, 
-                                                RWriteStream*&, const TDesC8&, 
-                                                const TInt )
-	{
-	//Not supported because data streaming is not supported by this adapter.
-	}
-	
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter12::FetchLeafObjectSizeL
-//  This function fetches leaf object and returns its size.
-// -----------------------------------------------------------------------------
-void CNSmlDMSettingsAdapter12::FetchLeafObjectSizeL( const TDesC8& aURI, 
-                                                    const TDesC8& aLUID, 
-                                                    const TDesC8& aType, 
-                                                    const TInt aResultsRef, 
-                                                    const TInt aStatusRef )
-	{
-	_DBG_FILE( "CNSmlDMSettingsAdapter12::FetchLeafObjectSizeL() : begin" );
-    DBG_ARGS( _S16("DM:Fetch aURI    - %S - %S"), &aURI, &aLUID );
-	
-	iLUID = IntLUID( aLUID );
-	if ( iLUID >= 0 )
-		{
-		if( FindProfileIdL( iLUID ) == EFalse )
-			{
-			_DBG_FILE( "CNSmlDMSettingsAdapter12::FetchLeafObjectL(): ENotFound end" );
-			iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-			return;
-			}
-		}
-	else
-		{
-		_DBG_FILE( "CNSmlDMSettingsAdapter12::FetchLeafObjectL(): ENotFound end" );
-		iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-		return;
-		}
-
-    //	Check which field going to be handled
-	SetField( aURI );
-	SetURIInProcessL (aURI);
-     
-    //	Check if valid field
-	if( !AcceptDMField() )
-		{
-		_DBG_FILE( "CNSmlDMSettingsAdapter12::FetchLeafObjectL(): EInvalidObject end" );
-		iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EInvalidObject );
-		return;
-		}
-    /*if(aURI.Find( KNSmlDdfExt ) != KErrNotFound)
-        {
-        return;
-        }*/
-    
-    //	Get Database field type 
-	TInt fType = GetDMFieldType();
-	if ( fType == EWrong )
-		{
-		_DBG_FILE( "CNSmlDMSettingsAdapter12::FetchLeafObjectL(): EError end" );
-		iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-		return;
-		}
-
-    CBufBase *lObject = CBufFlat::NewL( 128 );
-	CleanupStack::PushL( lObject );
-    lObject->Reset();
-
-	if ( fType == EStr || fType == EInt || fType == EBin )
-		{ 
-        TInt rValue = GetObjectL( iLUID, GetDMField(), *lObject );
-		if( lObject->Size() == 0 || rValue != KErrNone )
-		    {
-            if( rValue == KErrNotFound )
-                {
-                iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-                }
-            else if( rValue == KErrInUse )
-                {
-                iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EObjectInUse );
-                }
-            else if( rValue == KErrNoMemory )
-                {
-                iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENoMemory );
-                }
-            else
-                {
-                iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-                }
-		    }
-		}
-	else 
-		{
-		CleanupStack::PopAndDestroy();//lObject 
-		_DBG_FILE( "CNSmlDMSettingsAdapter12::FetchLeafObjectL(): ENotFound end" );
-		iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-		return;
-		}
-    TInt objSizeInBytes = lObject->Size();
-	TBuf8<16> stringObjSizeInBytes;
-	stringObjSizeInBytes.Num( objSizeInBytes );
-
-	lObject->Reset();
-	lObject->InsertL( 0, stringObjSizeInBytes );
-    iCallBack->SetResultsL( aResultsRef, *lObject, aType );
-	iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EOk);
-
-	CleanupStack::PopAndDestroy( 1 ); //lObject
-	_DBG_FILE( "CNSmlDMSettingsAdapter12::FetchLeafObjectSizeL(): end" );
-	return;
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSettingsAdapter12::ExecuteCommandL()
-// -----------------------------------------------------------------------------
-void CNSmlDMSettingsAdapter12::ExecuteCommandL( const TDesC8&, const TDesC8&,
-                                                const TDesC8&, const TDesC8&, 
-                                                const TInt )
-	{
-	//Not supported. Command execution via DM settings adapter not possible.	
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSettingsAdapter12::ExecuteCommandL()
-// -----------------------------------------------------------------------------
-void CNSmlDMSettingsAdapter12::ExecuteCommandL( const TDesC8&, const TDesC8&, 
-                                                RWriteStream*&, const TDesC8&, 
-                                                const TInt )
-	{
-	//Not supported. Command execution via DM settings adapter not possible.
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSettingsAdapter12::CopyCommandL()
-// -----------------------------------------------------------------------------
-void CNSmlDMSettingsAdapter12::CopyCommandL( const TDesC8&, const TDesC8&, 
-                                            const TDesC8&, const TDesC8&, 
-                                            const TDesC8&, TInt )
-	{
-	//Not supported.
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSettingsAdapter12::StartAtomicL()
-// -----------------------------------------------------------------------------
-void CNSmlDMSettingsAdapter12::StartAtomicL()
-	{
-	//Not supported. Handling Atomic command cycles not supported by the adapter.
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSettingsAdapter12::CommitAtomicL()
-// -----------------------------------------------------------------------------
-void CNSmlDMSettingsAdapter12::CommitAtomicL()
-	{
-	//Not supported. Handling Atomic command cycles not supported by the adapter.
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSettingsAdapter12::RollbackAtomicL()
-// -----------------------------------------------------------------------------
-void CNSmlDMSettingsAdapter12::RollbackAtomicL()
-	{
-	//Not supported. Handling Atomic command cycles not supported by the adapter.
-	}
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter12::StreamingSupport()
-//  Indicates if streaming is supported.
-// -----------------------------------------------------------------------------
-TBool CNSmlDMSettingsAdapter12::StreamingSupport( TInt& /*aItemSize*/ )
-	{
-	return EFalse;
-	}
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSettingsAdapter12::StreamCommittedL()
-// -----------------------------------------------------------------------------
-void CNSmlDMSettingsAdapter12::StreamCommittedL()
-	{
-	//Not supported. Streaming not supported by the DM settings adapter.
-	}
-// -----------------------------------------------------------------------------
-// CNSmlDMSettingsAdapter12::CompleteOutstandingCmdsL()
-// If buffering used, commands must be executed before returning this function.
-// -----------------------------------------------------------------------------
-void CNSmlDMSettingsAdapter12::CompleteOutstandingCmdsL()
-	{
-	// Check if Buffered
-	for (int val=0; val<iBuffer->Count ();val++)
-		{
-		if ( !iBuffer->At(val).iExecuted)
-			{
-			TInt count = iBuffer->At(val).iLeafBuf->Count ()-1;
-			iExecutionIndex = val;
-			iComplete = ETrue;
-			ExecuteBufferL ();
-			}
-		}
- for (TInt i = 0;i<iProfileLockBuffer.Count(); i++)
-	    {
-	       TInt err = SetProfileLockL(iProfileLockBuffer[i].iProfileLockLUID, iProfileLockBuffer[i].iProfileLock) ;
-   
-	    }
-
-	// if port was updated, set it
-	for (TInt i = 0;i<iPortBuffer.Count(); i++)
-	    {
-        TInt err = SetProfileConnectionPortNrL( iPortBuffer[i].iPortBufLUID, iPortBuffer[i].iPortBuf );
-        
-        // set status
-        if ( err != KErrNone )
-            {
-            iCallBack->SetStatusL( iPortBuffer[i].iPortBufStatusRef, CSmlDmAdapter::EError );
-            }
-        else
-            {
-            iCallBack->SetStatusL( iPortBuffer[i].iPortBufStatusRef, CSmlDmAdapter::EOk );
-            }
-	    
-	    }
-    iPortBuffer.Reset();	
-	}
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter12::AcceptDMField
-//  This function checks if field to be handled is valid.
-// -----------------------------------------------------------------------------
-TBool CNSmlDMSettingsAdapter12::AcceptDMField()
-	{
-	_DBG_FILE("CNSmlDMSettingsAdapter12::AcceptDMField(): begin");
-
-	if ( iField->Compare( KNSmlDdfAddrType ) == 0 )
-		{
-		return ETrue;
-		}
-	else if ( iField->Compare( KNSmlDdfAddr ) == 0 )
-		{
-		return ETrue;
-		}
-	else if ( iField->Compare( KNSmlDdfPortNbr ) == 0 )
-		{
-		return ETrue;
-		}
-	else if ( iField->Compare( KNSmlDdfAuthScheme ) == 0 )
-		{
-		return ETrue;
-		}
-	else if ( iField->Compare( KNSmlDdfServerId ) == 0 )
-		{
-		return ETrue;
-		}
-	else if ( iField->Compare( KNSmlDdfServerPW ) == 0 )
-		{
-		return ETrue;
-		}
-	else if ( iField->Compare( KNSmlDdfServerNonce ) == 0 )
-		{
-		return ETrue;
-		}
-	else if ( iField->Compare( KNSmlDdfClientUserName ) == 0 )
-		{
-		return ETrue;
-		}
-	else if ( iField->Compare( KNSmlDdfClientPW ) == 0 )
-		{
-		return ETrue;
-		}
-	else if ( iField->Compare( KNSmlDdfClientNonce ) == 0 )
-		{
-		return ETrue;
-		}
-	else if ( iField->Compare( KNSmlDdfName ) == 0 )
-		{
-		return ETrue;
-		}
-		
-	else if ( iField->Compare( KNSmlDdfId ) == 0 )
-		{
-		return ETrue;
-		}
-	else if ( iField->Compare(KNSmlDdfAppId) == 0 )
-	    {
-	    return ETrue;
-	    }
-	else if ( iField->Compare(KNSmlDdfPrefConRef) == 0 )
-	    {
-	    return ETrue;
-	    }
-	else if (iField->Compare(KNSmlDdfAAuthLevel) == 0 )
-	    {
-	    return ETrue;
-	    }
-  	    
-    else if (iField->Compare(KNSmlDdfAAuthType) == 0 )
-        {
-        return ETrue;
-        }
-    else if (iField->Compare(KNSmlDdfAAuthName) == 0 )
-        {
-        return ETrue;
-        }
-        
-    else if (iField->Compare(KNSmlDdfAAuthSecret) == 0 )
-        {
-        return ETrue;
-        }
-    else if (iField->Compare(KNSmlDdfAAuthData) == 0 )
-        {
-        return ETrue;
-        }
-    else if (iField->Compare(KNSmlDdfLocked) == 0 )
-        {
-        return ETrue;
-        }    
-
-	_DBG_FILE( "CNSmlDMSettingsAdapter12::AcceptDMField(): end" );
-	return EFalse; // Not a valid Type
-	}
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter12::GetDMField
-//	Matches URI fieldname to DM-database. 
-// -----------------------------------------------------------------------------
-TNSmlDMProfileData CNSmlDMSettingsAdapter12::GetDMField() 
-	{
-
-	if ( iField->Compare( KNSmlDdfAddrType ) == 0 )
-		{
-	
-	     return EProfileAddrType;
-	      
-		}
-	else if ( iField->Compare( KNSmlDdfAddr ) == 0 )
-		{
-		return EProfileURL;
-		}
-	else if ( iField->Compare( KNSmlDdfPortNbr ) == 0 )
-		{
-		return EProfilePort;
-		}
-	else if ( iField->Compare( KNSmlDdfAuthScheme ) == 0 )
-		{
-		return EAuthenticationRequired;
-		}
-	else if ( iField->Compare( KNSmlDdfServerId ) == 0 )
-		{
-		return EServerId;
-		}
-	else if ( iField->Compare( KNSmlDdfServerPW ) == 0 )
-		{
-		return ESharedSecret;
-		}
-	else if ( iField->Compare( KNSmlDdfServerNonce ) == 0 )
-		{
-		return EServerNonce;
-		}
-	else if ( iField->Compare( KNSmlDdfClientUserName ) == 0 )
-		{
-		return EProfileDMServerUsername;
-		}
-	else if ( iField->Compare( KNSmlDdfClientPW ) == 0 )
-		{
-		return EProfileDMServerPassword;
-		}
-	else if ( iField->Compare( KNSmlDdfClientNonce ) == 0 )
-		{
-		return EClientNonce;
-		}
-	else if ( iField->Compare( KNSmlDdfName ) == 0 )
-		{
-		return EProfileName;
-		}
-	else if ( iField->Compare( KNSmlDdfId ) == 0 )
-		{
-		return EProfileId;
-		}
-	
-	else if ( iField->Compare( KNSmlDdfPrefConRef ) == 0 )
-		{
-		return EProfileIAPId;
-		}
-	
-    else if ( iField->Compare( KNSmlDdfAppId ) == 0 )
-		{
-		return EProfileIAPId;
-		}
-    else if ( iField->Compare( KNSmlDdfLocked) == 0 )
-		{
-		return EProfileLock;
-		}
-
-    else if (iField->Compare(KNSmlDdfAAuthLevel) == 0 )
-	    {
-	     if(iURIField->Find(KDmAccAppAuthDyn1) != KErrNotFound)
-	    return EPRofileServerCred;
-	     else if (iURIField->Find(KDmAccAppAuthDyn2)!= KErrNotFound)
-	    return EPRofileClientCred;
-		else if (iURIField->Find(KDmAccAppAuthTransport)!= KErrNotFound)
-	    return EProfileTransport;		     
-	    }
-  	    
-    else if (iField->Compare(KNSmlDdfAAuthType) == 0 )
-        {
-        return EProfileAAuthType;
-        }
-    else if (iField->Compare(KNSmlDdfAAuthName) == 0 )
-        {
-        if(iURIField->Find(KDmAccAppAuthDyn1) != KErrNotFound)
-	    return EProfileName;
-	    else if (iURIField->Find(KDmAccAppAuthDyn2)!= KErrNotFound)
-	    return EProfileDMServerUsername;
-	    else if (iURIField->Find(KDmAccAppAuthTransport)!= KErrNotFound)
-	    {
-	       return ETransportAuthName;
-	    }
-	    
-        // return ETrue;
-        }
-        
-    else if (iField->Compare(KNSmlDdfAAuthSecret) == 0 )
-        {
-         if(iURIField->Find(KDmAccAppAuthDyn1) != KErrNotFound)
-	    return ESharedSecret;
-	        else if (iURIField->Find(KDmAccAppAuthDyn2)!= KErrNotFound)
-	    return EProfileDMServerPassword;
-		else if (iURIField->Find(KDmAccAppAuthTransport)!= KErrNotFound)
-	    {
-	       return EProfileTransportPassword;
-	    }
-        }
-    else if (iField->Compare(KNSmlDdfAAuthData) == 0 )
-        {
-          if(iURIField->Find(KDmAccAppAuthDyn1) != KErrNotFound)
-	    return EServerNonce;
-	     else if (iURIField->Find(KDmAccAppAuthDyn2)!= KErrNotFound)
-	    return EClientNonce;
-	    else if (iURIField->Find(KDmAccAppAuthTransport)!= KErrNotFound)
-	     return EProfileTransportAuthData;
-        }
-        		
-	
-	_DBG_FILE( "CNSmlDMSettingsAdapter12::GetDMField(): Error" );
-	return ESyncAccepted;
-	}
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter12::GetDMFieldType
-//	Gets field data type. 
-// -----------------------------------------------------------------------------
-TNSmlDMFieldType CNSmlDMSettingsAdapter12::GetDMFieldType() const
-	{
-	if ( iField->Compare( KNSmlDdfAddrType ) == 0 )
-		{
-		return EInt;
-		}
-	else if ( iField->Compare( KNSmlDdfAddr ) == 0 )
-		{
-		return EStr;
-		}
-	else if ( iField->Compare( KNSmlDdfPortNbr ) == 0 )
-		{
-		return EInt;
-		}
-	else if ( iField->Compare( KNSmlDdfAuthScheme ) == 0 )
-		{
-		return EInt;
-		}
-	else if ( iField->Compare( KNSmlDdfServerId ) == 0 )
-		{
-		return EStr;
-		}
-	else if ( iField->Compare( KNSmlDdfServerPW ) == 0 )
-		{
-		return EStr;
-		}
-	else if ( iField->Compare( KNSmlDdfServerNonce ) == 0 )
-		{
-		return EBin;
-		}
-	else if ( iField->Compare( KNSmlDdfClientUserName ) == 0 )
-		{
-		return EStr;
-		}
-	else if ( iField->Compare( KNSmlDdfClientPW ) == 0 )
-		{
-		return EStr;
-		}
-	else if (iField->Compare(KNSmlDdfClientNonce) == 0)
-		{
-		return EBin;
-		}
-	else if ( iField->Compare( KNSmlDdfName ) == 0 )
-		{
-		return EStr;
-		}
-		
-	else if ( iField->Compare( KNSmlDdfId ) == 0 )
-		{
-		return EInt;
-		}
-    else if( iField->Compare(KNSmlDdfAppId ) ==0 ) 
-        {
-        	return EStr;
-        }
-	else if ( iField->Compare( KNSmlDdfPrefConRef ) == 0 )
-		{
-		return EInt;
-		}
-	else if (iField->Compare(KNSmlDdfAAuthLevel) == 0 )
-	    {
-	    return EStr;
-	    }
-  	    
-    else if (iField->Compare(KNSmlDdfAAuthType) == 0 )
-        {
-        return EStr;
-        }
-    else if (iField->Compare(KNSmlDdfAAuthName) == 0 )
-        {
-        return EStr;
-        }
-        
-    else if (iField->Compare(KNSmlDdfAAuthSecret) == 0 )
-        {
-        return EStr;
-        }
-    else if (iField->Compare(KNSmlDdfAAuthData) == 0 )
-        {
-        return EBin;
-        }
-        
-	else if(iField->Compare(KNSmlDdfLocked)==0)
-	    {
-	    return EStr;
-	    }
-		        
-
-	_DBG_FILE( "CNSmlDMSettingsAdapter12::GetDMFieldType(): Error" );
-	return EWrong;
-	}
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter12::IntLUID
-//	Returns integer value for a profile LUID.
-// -----------------------------------------------------------------------------
-TInt CNSmlDMSettingsAdapter12::IntLUID( const TDesC8& aLUID )
-	{
-	TLex8 lLex( aLUID );
-
-	if( lLex.Val( iLUID ) == KErrNone )
-	    {
-	    return iLUID;
-	    }
-	else
-        {
-        return -1;
-        }
-	}
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter12::GetIntObject
-//	Returns integer value for a aObject.
-// -----------------------------------------------------------------------------
-TInt CNSmlDMSettingsAdapter12::GetIntObject( const TDesC8& aObject )
-	{
-	TLex8 lLex( aObject );
-
-	TInt value = 0;
-
-	if( lLex.Val( value ) != KErrNone )
-	    {
-	    return KErrNotFound;
-	    }
-	else
-        {
-        return value;
-        }
-	}
-
-// -----------------------------------------------------------------------------
-//	CNSmlDMSettingsAdapter12::GetIntObject16()
-//	Returns Integer Value for a 16 bit data object.
-// -----------------------------------------------------------------------------
-TInt CNSmlDMSettingsAdapter12::GetIntObject16( const TDesC& aObject )
-	{
-	TLex16 lLex( aObject );
-
-	TInt value = 0;
-
-	if( lLex.Val( value ) == KErrNone )
-	    {
-	    return value;
-	    }
-	else
-        {
-        return value;
-        }
-	}
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter12::SetIntObjectLC
-//	Converts integer to HBufC8 type buffer and returns reference to it.
-// -----------------------------------------------------------------------------
-TDesC8& CNSmlDMSettingsAdapter12::SetIntObjectLC( const TInt& aObject )
-	{
-	HBufC8* buf = HBufC8::NewLC( 8 );
-	TPtr8 ptrBuf = buf->Des();
-
-	ptrBuf.Num( aObject );
-    return *buf;
-	}
-
-// -----------------------------------------------------------------------------
-//	CNSmlDMSettingsAdapter12::NotValidStrLenght
-//	Checks if data length is valid.
-// -----------------------------------------------------------------------------
-TBool CNSmlDMSettingsAdapter12::NotValidStrLenght( const TNSmlDMProfileData& aProfileItem, 
-                                                const TDesC8& aSource )
-	{
-	TInt lLen = aSource.Length();
-	TBool lBool = EFalse;
-
-	switch ( aProfileItem )
-		{
-		case ( EProfileName ) :
-			{
-			if( lLen > KNSmlMaxProfileNameLength )
-			    {
-			    lBool = ETrue;	
-			    }
-			}
-		break;
-		
-		case ( EProfileDMServerUsername ) :
-			{
-			if( lLen > KNSmlMaxUsernameLength )
-			    {
-			    lBool = ETrue;
-			    }
-			}
-		break;
-        
-		case ( EProfileHttpUsername ) :
-		case (ETransportAuthName):
-			{
-				if( lLen > KNSmlDmMaxHttpAuthUsernameLength )
-			    {
-			    lBool = ETrue;
-			    }
-			}
-		break;
-		case ( EProfileHttpPassword ) :
-		case (EProfileTransportPassword):
-			{
-				if( lLen > KNSmlDmMaxHttpAuthPasswordLength )
-			    {
-			    lBool = ETrue;
-			    }
-			}
-		break;
-		case ( EProfileDMServerPassword ) :
-			{
-			if( lLen > KNSmlMaxPasswordLength )
-			    {
-			    lBool = ETrue;	
-			    }
-			}
-		break;
-
-		case ( ESharedSecret ) :
-			{
-			if( lLen > KNSmlDmSharedSecretMaxLength )
-			    {
-			    lBool = ETrue;	
-			    }
-			}
-		break;
-
-		case ( EProfileURL ) :
-			{
-			if( lLen > KNSmlMaxURLLength )
-			    {
-			    lBool = ETrue;	
-			    }
-			}
-		break;
-
-		case ( EServerId ) :
-			{
-			if( lLen > KNSmlDmServerIdMaxLength )
-			    {
-			    lBool = ETrue;	
-			    }
-			}
-		break;
-
-		case ( EProfileIAPId ) :
-			{
-			if( lLen > KNSmlMaxURLLength )
-			    {
-			    lBool = ETrue;	
-			    }
-			}
-		break;
-
-		case ( EAuthenticationRequired ) :
-		case ( EProfileAAuthType ) :
-			{
-			if( lLen > 20 ) 
-			    {
-			    lBool = ETrue;	
-			    }
-			}
-		break;
-
-		case ( EProfileId ) :
-		case ( EProfilePort ) :
-		case ( EProfileMediumType ) :
-		case ( EProfileAddrType ) :
-	
-			{
-			if( lLen > 8 )
-			    {
-			    lBool = ETrue;	
-			    }
-			}
-		break;
-		
-        case ( EServerNonce ) :
-	    case ( EClientNonce ) :
-		case (EProfileTransportAuthData):
-	        {
-            lBool = EFalse;
-	        }
-        break;
-		case ( EProfileTransport ):
-		{
-			lBool = EFalse;
-		}
-		break;
-		case EProfileLock :
-		 {
-		 	if(lLen > 6 )
-		 	{
-			    lBool = ETrue;	
-			}
-		 	
-		 }
-		  break;
-		default:
-			{
-			lBool = ETrue;
-			}
-		}
-
-	return lBool;
-	}
-
-// -----------------------------------------------------------------------------
-//	CNSmlDMSettingsAdapter12::SetField
-//	Last element of the URI (after last '/') is returned.
-// -----------------------------------------------------------------------------
-TInt CNSmlDMSettingsAdapter12::SetField( const TDesC8& aSource )
-	{
-	if ( aSource.LocateReverse( KNSmlDMUriSeparator ) == KErrNotFound )
-	    {
-	    iField->Des().Format( aSource );
-	    }
-	else
-        {
-        iField->Des().Format( aSource.Mid( aSource.LocateReverse( KNSmlDMUriSeparator ) + 1 ) );
-        }
-
-    return KErrNone;
-	}
-
-// -----------------------------------------------------------------------------
-//	CNSmlDMSettingsAdapter12::SetField
-//	Last element of the URI (after last '/') is returned.
-// -----------------------------------------------------------------------------
-TInt CNSmlDMSettingsAdapter12::SetURIInProcessL( const TDesC8& aSource )
-	{
-    
-    if( iURIField )
-    {
-    	delete iURIField;
-    	iURIField = NULL;
-    }
-    iURIField = HBufC8::NewL( aSource.Length() );
-    TPtr8 newPortNbr = iURIField->Des();
-    newPortNbr.Append( aSource );          
-
-    return KErrNone;
-	}
-	
-
-
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter12::ConvertTo8LC
-//	Converts string value to 8-bit and returns reference.
-// -----------------------------------------------------------------------------
-TDesC8& CNSmlDMSettingsAdapter12::ConvertTo8LC( const TDesC& aSource )
-	{
-	HBufC8* buf = HBufC8::NewLC( aSource.Length() * 2 );
-	TPtr8 bufPtr = buf->Des();
-	CnvUtfConverter::ConvertFromUnicodeToUtf8( bufPtr, aSource );
-
-    return *buf;
-	}
-
-// -----------------------------------------------------------------------------
-//	CNSmlDMSettingsAdapter12::ConvertTo16LC
-//	Converts string value to 16-bit and returns reference.
-// -----------------------------------------------------------------------------
-TDesC16& CNSmlDMSettingsAdapter12::ConvertTo16LC( const TDesC8& aSource)
-	{
-	HBufC16* buf16 = HBufC16::NewLC( aSource.Length() );
-	TPtr16 bufPtr16 = buf16->Des();
-
-	CnvUtfConverter::ConvertToUnicodeFromUtf8( bufPtr16, aSource );
-
-    return *buf16; 
-	}
-
-// -------------------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter12::GetConRefL
-//	Gets the URI for given aObject (IAP ID).
-// -------------------------------------------------------------------------------------
-TInt CNSmlDMSettingsAdapter12::GetConRefL( CBufBase& aObject )
-	{
-	_DBG_FILE( "CNSmlDMSettingsAdapter12::GetConRefL() : begin" );
-	TInt profIAPid = -1;
-    TInt apIdResponse = GetProfileIAPIdL( profIAPid );
-    if( profIAPid < 0 )
-    {
-    	return KErrNone;
-    }    
-    if( apIdResponse != KErrNone )
-    {
-    	return KErrNotFound;
-    }
-    CNSmlDMIAPMatcher* apmatch = CNSmlDMIAPMatcher::NewL( iCallBack );
-    CleanupStack::PushL( apmatch );
-    HBufC8* uri8 = apmatch->URIFromIAPIdL( profIAPid );
-    if( uri8 )
-        {
-        CleanupStack::PushL( uri8 );
-        aObject.InsertL( aObject.Size(), uri8->Des() );
-        CleanupStack::PopAndDestroy(); // uri8
-        }
-    else
-        {
-        CleanupStack::PopAndDestroy(); // apMatch
-        return KErrGeneral;    
-        }
-    CleanupStack::PopAndDestroy(); // iapMatch
-	_DBG_FILE( "CNSmlDSSettingsAdapter::GetToNAPIDL() : end" );
-	return KErrNone;
-	}
-
-// -------------------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter12::SetConRefL()
-//	Set the profile IAP Id value according to given URI.
-// -------------------------------------------------------------------------------------
-TInt CNSmlDMSettingsAdapter12::SetConRefL( const TInt aLUID, const TDesC8& aObject )
-	{
-    _DBG_FILE( "CNSmlDMSettingsAdapter12::SetConRefL() : begin" );
-    CNSmlDMIAPMatcher* apmatch = CNSmlDMIAPMatcher::NewL( iCallBack );
-    CleanupStack::PushL( apmatch );
-    TInt lIAPid = apmatch->IAPIdFromURIL( aObject );
-    CleanupStack::PopAndDestroy(); // iapmatch
-    if(aObject.Length() >0 && lIAPid == KErrNotFound) 
-    {
-    	return KErrGeneral;
-    }
-    TInt apIdResponse = SetProfileConnectionPropertyL( aLUID, lIAPid );    
-    _DBG_FILE( "CNSmlDMSettingsAdapter12::SetConRefL() : end" );
-	return apIdResponse;
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter12::ParseUri
-//  Resolves portnbr (separated with ':') as integer from Uri. 
-// ------------------------------------------------------------------------------------------------
-TInt CNSmlDMSettingsAdapter12::ParseUri( const TDesC8& aRealURI, TInt& aPort )
-	{
-	TInt offset=0;
-    //http:
-	if( aRealURI.Find( KNSmlDMSettingsHTTP )==0 )//http:
-		{
-		offset = KNSmlDMSettingsHTTP().Length();
-		}
-	else if( aRealURI.Find( KNSmlDMSettingsHTTPS )==0 )//https:
-		{
-		offset = KNSmlDMSettingsHTTPS().Length();
-		}
-
-	TBool portFound=EFalse;
-    ////123.234.345.456:80/syncml
-	for( TInt i = offset; i < aRealURI.Length(); i++ )
-		{
-		if( aRealURI[i] == KNSmlDMColon )// ':'
-			{
-			portFound = ETrue;
-			offset=i;
-			}
-		if( portFound && aRealURI[i] == KNSmlDMUriSeparator ) // '/'
-			{
-			aPort = GetIntObject( aRealURI.Mid( (offset + 1), (i - offset-1) ) );
-			}
-		else if ( portFound && i == aRealURI.Length() - 1 ) // last char
-		    {
-		    // port is from offset to the end
-		    aPort = GetIntObject( aRealURI.Right( aRealURI.Length() - offset - 1 ) );
-		    }
-		}
-	
-	if( aPort != 0 )
-		{
-		return KErrNone;
-		}
-	else
-		{
-		return KErrNotFound;
-		}
-	}
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter12::OpenSyncSessionAndDSProfileL
-//  The function opens the server session and DM profile.
-// -----------------------------------------------------------------------------
-TInt CNSmlDMSettingsAdapter12::OpenSyncSessionAndProfileL( const TInt aIntLUID, 
-                                                        TSmlOpenMode aMode )
-    {
-    _DBG_FILE( "CNSmlDMSettingsAdapter12::OpenSyncSessionAndProfileL(): begin" );
-    if( iSyncSessionOpen == EFalse )
-        {
-        iSyncSession.OpenL();
-        iSyncSessionOpen = ETrue;
-        }
-    TInt trueLuid = aIntLUID + KMaxDataSyncID;
-    TInt rValue(KErrNone);
-    
-    if(trueLuid!=iCurrentProfile)
-	    {
-	    RArray<TSmlProfileId> profileIdArray;
-	    CleanupClosePushL( profileIdArray );
-	    TSmlUsageType usageType = ESmlDevMan;
-	    iSyncSession.ListProfilesL( profileIdArray, usageType );
-	    TInt index = profileIdArray.Find( trueLuid );
-	    CleanupStack::PopAndDestroy(); //profileIdArray
-	    if( index == KErrNotFound )
-	        {
-	        return KErrNotFound;
-	        }
-	    TRAP( rValue, iProfile.OpenL( iSyncSession, trueLuid, aMode ) );
-	    iCurrentProfile = trueLuid;
-	    if( rValue != KErrNone )
-	        {
-	        iCurrentProfile = 0;
-	        iProfile.Close();
-			iSyncSession.Close();
-	        iSyncSessionOpen = EFalse;
-	        }
-    	}
-    _DBG_FILE( "CNSmlDMSettingsAdapter12::OpenSyncSessionAndProfileL(): end" );
-    return rValue;
-    }
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter12::FindProfileId
-//  Function checks if profile can be found.
-// -----------------------------------------------------------------------------
-TBool CNSmlDMSettingsAdapter12::FindProfileIdL( const TInt aIntLUID )
-	{
-    _DBG_FILE( "CNSmlDMSettingsAdapter12::FindProfileIdL(): begin" );
-	if( iSyncSessionOpen == EFalse )
-	    {
-        iSyncSession.OpenL();
-        iSyncSessionOpen = ETrue;
-	    }
-    
-	RArray <TSmlProfileId> profileList;
-    CleanupClosePushL( profileList );
-	TSmlUsageType usageType = ESmlDevMan;		
-	iSyncSession.ListProfilesL( profileList, usageType );
-	if( profileList.Count() == 0 ) 
-	    {
-        CleanupStack::PopAndDestroy(); //profileList
-        return EFalse;
-	    }		
-    TInt item = profileList.Find( aIntLUID + KMaxDataSyncID );
-    CleanupStack::PopAndDestroy(); //profileList
-    if( item != KErrNotFound )
-		{
-		_DBG_FILE( "CNSmlDMSettingsAdapter12::FindProfileIdL(): end" );
-        return ETrue;
-		}
-    _DBG_FILE( "CNSmlDMSettingsAdapter12::FindProfileIdL(): end" );
-	return EFalse;
-	}
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter12::IsServerIDExistL
-//  Function checks if serverid exist.
-// -----------------------------------------------------------------------------
-TBool CNSmlDMSettingsAdapter12::IsServerIDExistL( const TDesC8& aServerid )
-{
-	_DBG_FILE( "CNSmlDMSettingsAdapter12::IsServerIDExistL(): begin" );
-	if( iSyncSessionOpen == EFalse )
-	{
-       	iSyncSession.OpenL();
-       	iSyncSessionOpen = ETrue;
-	}
-    TBool ret(EFalse);
-	RArray <TSmlProfileId> profileList;
-    CleanupClosePushL( profileList );
-	TSmlUsageType usageType = ESmlDevMan;		
-	iSyncSession.ListProfilesL( profileList, usageType );
-	TInt count = profileList.Count();
-	if( count > 0 ) 
-	{
-		for(TInt i =0; i< count; i++)
-		{
-			TInt pid = i + KMaxDataSyncID;
-			TInt index = profileList.Find(pid );
-			if( index >= i  )
-			{	    		
-	        	TInt rValue(KErrNone);
-	        	RSyncMLDevManProfile profile;
-	    		TRAP( rValue, profile.OpenL( iSyncSession, pid, ESmlOpenRead ) );
-	    		if( rValue == KErrNone )
-	        	{
-			        CleanupClosePushL(profile);
-	        		if(((aServerid.Compare(profile.ServerId())) == 0) &&
-						((profile.ServerId()).Length() == aServerid.Length()))
-	        		{
-	        			ret = ETrue;
-			            CleanupStack::PopAndDestroy(&profile);//profile
-						break;	        			
-	        		}						
-			        CleanupStack::PopAndDestroy(&profile);//profile
-				}				
-			}	
-		}        
-	}		
-    CleanupStack::PopAndDestroy(); //profileList
-    _DBG_FILE( "CNSmlDMSettingsAdapter12::IsServerIDExistL(): end" );
-	return ret;
-	}
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter12::CreateNewProfileL
-//  The function creates new DM profile via client API.
-// -----------------------------------------------------------------------------
-TInt CNSmlDMSettingsAdapter12::CreateNewProfileL( TInt& aPID )
-	{
-    _DBG_FILE("CNSmlDMSettingsAdapter12::CreateNewProfileL(): begin");
-	if( iSyncSessionOpen == EFalse )
-	    {
-        iSyncSession.OpenL();
-        iSyncSessionOpen = ETrue;
-	    }
-    TRAPD( value1, iProfile.CreateL( iSyncSession ) );
-    if( value1 != KErrNone )
-        {
-   	    iCurrentProfile = 0;
-        iProfile.Close();
-        iSyncSession.Close();
-        iSyncSessionOpen = EFalse;
-        return value1;
-        }
-    
-    TRAPD( value2, iProfile.UpdateL() );
-    if( value2 != KErrNone )
-        {
-   	    iCurrentProfile = 0;
-        iProfile.Close();
-        iSyncSession.Close();
-        iSyncSessionOpen = EFalse;
-        return value2;
-        }
-    
-    aPID = iProfile.Identifier();
-    iCurrentProfile = 0;
-    iProfile.Close();
-    _DBG_FILE( "CNSmlDMSettingsAdapter12::CreateNewProfileL(): end" );
-    return KErrNone;
-	}
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter12::SetProfileServerURIL()
-//  The function sets the server URL for a profile.
-// -----------------------------------------------------------------------------
-TInt CNSmlDMSettingsAdapter12::SetProfileServerURIL( const TInt aPID, 
-                                                    const TDesC8& aObj )
-	{
-    _DBG_FILE( "CNSmlDMSettingsAdapter12::SetProfileServerURIL(): begin" );
-	TInt retVal = KErrNone;
-    retVal = OpenSyncSessionAndProfileL( aPID, ESmlOpenReadWrite );
-    if( retVal != KErrNone )
-		{
-	    iCurrentProfile = 0;
-	    iProfile.Close();
-        return retVal;	
-		}
-	RArray<TSmlTransportId> transportIdArray;
-    CleanupClosePushL( transportIdArray );
-	iProfile.ListConnectionsL( transportIdArray );
-    if( transportIdArray.Count() == 0 )
-	    {
-        CleanupStack::PopAndDestroy();//transportIdArray
-	    iCurrentProfile = 0;
-        iProfile.Close();
-        return KErrGeneral;
-	    }
-	    
-	TInt newPort(0);
-    
-    RSyncMLConnection conn;
-    CleanupClosePushL( conn );
-    conn.OpenL( iProfile, transportIdArray[0] );
-
-    if(ParseUri(aObj,newPort)==KErrNotFound)
-        {
-        TInt port = 0;
-        ParseUri(conn.ServerURI(),port);
-        if(port==0)
-        	{
-        	port = 80;
-        	}
-           	
-       	TBuf8<5> buf;
-    	buf.Num( port );
-        	
-        TInt totalSize = aObj.Length() + buf.Length() + 1;
-        HBufC8* newServerURI = HBufC8::NewLC( totalSize );
-        SetPortNrToAddrStr( aObj, newServerURI, buf );
-        conn.SetServerURIL( *newServerURI );
-        conn.UpdateL();
-    	CleanupStack::PopAndDestroy( newServerURI ); 
-        }
-    else
-        {
-        conn.SetServerURIL( aObj );
-        conn.UpdateL();
-        }
-	
-
-	iProfile.UpdateL();
-	
-	CleanupStack::PopAndDestroy( 2 ); //transportIdArray, conn
-    iCurrentProfile = 0;
-	iProfile.Close();
-    _DBG_FILE( "CNSmlDMSettingsAdapter12::SetProfileServerURIL(): end" );
-	return KErrNone;
-	}
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter12::SetProfileDisplayNameL()
-//  The function sets the display name for a profile.
-// -----------------------------------------------------------------------------
-TInt CNSmlDMSettingsAdapter12::SetProfileDisplayNameL( const TInt aPID, 
-                                                        const TDesC8& aObj )
-	{
-    _DBG_FILE( "CNSmlDMSettingsAdapter12::SetProfileDisplayNameL(): begin" );
-	TInt retVal = KErrNone;
-    retVal = OpenSyncSessionAndProfileL( aPID, ESmlOpenReadWrite );
-    if( retVal != KErrNone )
-		{
-	    iCurrentProfile = 0;
-		iProfile.Close();
-        return retVal;	
-		}
-    iProfile.SetDisplayNameL( ConvertTo16LC( aObj ) );
-    iProfile.UpdateL();
-	CleanupStack::PopAndDestroy(); //ConvertTo16LC
-    iCurrentProfile = 0;
-    iProfile.Close();
-    _DBG_FILE( "CNSmlDMSettingsAdapter12::SetProfileDisplayNameL(): end" );
-	return KErrNone;
-	}
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter12::IsProfileLockedL()
-//  The function to tell whether the profile is locked
-// -----------------------------------------------------------------------------
-TInt CNSmlDMSettingsAdapter12::IsProfileLockedL(const TInt aPID)
-{
-   _DBG_FILE( "CNSmlDMSettingsAdapter12::SetProfileDisplayNameL(): begin" );
-	TInt retVal = KErrNone;
-    retVal = OpenSyncSessionAndProfileL( aPID, ESmlOpenRead );
-     if( retVal != KErrNone )
-		{
-	    iCurrentProfile = 0;
-		iProfile.Close();
-        return retVal;	
-		}
-		
-	retVal=iProfile.ProfileLocked(EFalse, EFalse);
-	iCurrentProfile = 0;
-    iProfile.Close();
-    if(retVal)
-      {
-      /* CRepository* centrep = NULL;
-       TRAPD( err, centrep = CRepository::NewL( KCRUidDeviceManagementInternalKeys) );    
-       TInt IsPrfoileEditable = 0;
-       if(!err)
-         centrep->Get( KDevOverrideProfileLock, IsPrfoileEditable );
-       delete centrep;
-       if (!IsPrfoileEditable)
-          retVal=  KErrAccessDenied;
-       else
-         retVal= KErrNone;*/
-       retVal=  KErrAccessDenied;
-      }
-      
-      
-       
-    return retVal;
-    
-}
-
-
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter12::SetProfileLockL()
-//  The function to setor reset the profile lock.
-// -----------------------------------------------------------------------------
-
-TInt CNSmlDMSettingsAdapter12::SetProfileLockL( const TInt aPID, TInt aLockValue)
-	{
-    _DBG_FILE( "CNSmlDMSettingsAdapter12::SetProfileLockL(): begin" );
-	TInt retVal = KErrNone;
-    retVal = OpenSyncSessionAndProfileL( aPID, ESmlOpenReadWrite );
-    if( retVal != KErrNone )
-		{
-	    iCurrentProfile = 0;
-		iProfile.Close();
-        return retVal;	
-		}
-		 
-		iProfile.ProfileLocked(ETrue, aLockValue );
-    iProfile.UpdateL();
-	  iCurrentProfile = 0;
-    iProfile.Close();
-    _DBG_FILE( "CNSmlDMSettingsAdapter12::SetProfileLockL(): end" );
-	return KErrNone;
-	}
-
-
-
-
-
-
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter12::SetProfileHttpUserNameL
-//  The function sets the profile http/network name.
-// -----------------------------------------------------------------------------
-
-TInt CNSmlDMSettingsAdapter12::SetProfileHttpUserNameL( const TInt aPID, const TDesC8& aObj )
-{
-	TInt retVal = KErrNone;
-	 retVal = OpenSyncSessionAndProfileL( aPID, ESmlOpenReadWrite );
-    if( retVal != KErrNone )
-		{
-	    iCurrentProfile = 0;
-		iProfile.Close();
-        return KErrGeneral;	
-		}
-        
-	  RSyncMLConnection connection;
-	  TBuf8<KBufSize32> key; 
-      RArray<TSmlTransportId> connIdArray;
-      CleanupClosePushL( connIdArray );
-	  iProfile.ListConnectionsL( connIdArray );
-      if( connIdArray.Count() == 1 )
-        {
-        
-		connection.OpenL( iProfile, KUidNSmlMediumTypeInternet.iUid );
-		CleanupClosePushL( connection );
-		
-		connection.SetPropertyL( KNSmlHTTPAuth, KNSmlTrueVal );
-		connection.SetPropertyL( KNSmlHTTPUsername, aObj );
-		connection.UpdateL();
-		CleanupStack::PopAndDestroy(  );
-		}
-	  else
-		{
-		connection.SetPropertyL( KNSmlHTTPAuth, KNSmlFalseVal );
-		connection.UpdateL();
-		}
-		
-		       
-        CleanupStack::PopAndDestroy(   );
-    
-	return retVal;
-	
-}
-    
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter12::SetProfileUserNameL
-//  The function sets the profile user name.
-// -----------------------------------------------------------------------------
-TInt CNSmlDMSettingsAdapter12::SetProfileUserNameL( const TInt aPID, 
-                                                    const TDesC8& aObj )
-	{
-    _DBG_FILE( "CNSmlDMSettingsAdapter12::SetProfileUserNameL(): begin" );
-	TInt retVal = OpenSyncSessionAndProfileL( aPID, ESmlOpenReadWrite );
-    if( retVal != KErrNone )
-		{
-	    iCurrentProfile = 0;
-		iProfile.Close();
-        return KErrGeneral;	
-		}
-    iProfile.SetUserNameL( aObj );
-    iProfile.UpdateL();
-    iCurrentProfile = 0;
-    iProfile.Close();
-    _DBG_FILE( "CNSmlDMSettingsAdapter12::SetProfileUserNameL(): end" );
-	return KErrNone;
-	}
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter12::SetProfileProtocolVersionL
-//  The function sets the protocol version to be supported.
-// -----------------------------------------------------------------------------
-TInt CNSmlDMSettingsAdapter12::SetProfileProtocolVersionL( const TInt aPID, 
-                                                            const TDesC8& )
-	{
-    _DBG_FILE( "CNSmlDMSettingsAdapter12::SetProfileProtocolVersionL(): begin" );
-	TInt retVal = KErrNone;
-    retVal = OpenSyncSessionAndProfileL( aPID, ESmlOpenReadWrite );
-    if( retVal != KErrNone )
-		{
-	    iCurrentProfile = 0;
-		iProfile.Close();
-        return retVal;	
-		}
-	//The syncSession to Sync server is open.
-    TSmlProtocolVersion protocol = ESmlVersion1_2;
-    iProfile.SetProtocolVersionL( protocol );
-	TRAPD( iError, iProfile.UpdateL() );
-    iCurrentProfile = 0;
-    iProfile.Close();
-    _DBG_FILE( "CNSmlDMSettingsAdapter12::SetProfileProtocolVersionL(): begin" );
-	return iError;
-	}
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter12::SetProfileServerIdL
-//  The function sets the profile ServerId value.
-// -----------------------------------------------------------------------------
-TInt CNSmlDMSettingsAdapter12::SetProfileServerIdL( const TInt aPID, 
-                                                    const TDesC8& aObj )
-	{
-    _DBG_FILE("CNSmlDMSettingsAdapter12::SetProfileServerIdL(): begin");
-	TInt retVal = OpenSyncSessionAndProfileL( aPID, ESmlOpenReadWrite );
-    if( retVal != KErrNone )
-		{
-	    iCurrentProfile = 0;
-		iProfile.Close();
-        return KErrGeneral;	
-		}
-	iProfile.SetServerIdL( aObj );
-    TRAP(retVal,iProfile.UpdateL() );
-    iCurrentProfile = 0;
-    iProfile.Close();
-    _DBG_FILE( "CNSmlDMSettingsAdapter12::SetProfileServerIdL(): end" );
-	return retVal;
-	}
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter12::SetProfileServerPasswordL
-//  The function sets the profile server password.
-// -----------------------------------------------------------------------------
-TInt CNSmlDMSettingsAdapter12::SetProfileServerPasswordL( const TInt aPID, 
-                                                        const TDesC8& aObj )
-	{
-    _DBG_FILE( "CNSmlDMSettingsAdapter12::SetProfileServerPasswordL(): begin" );
-	TInt retVal = OpenSyncSessionAndProfileL( aPID, ESmlOpenReadWrite );
-    if( retVal != KErrNone )
-		{
-	    iCurrentProfile = 0;
-		iProfile.Close();
-        return KErrGeneral;
-		}
-	iProfile.SetServerPasswordL( aObj );
-    iProfile.UpdateL();
-    iCurrentProfile = 0;
-    iProfile.Close();
-    _DBG_FILE( "CNSmlDMSettingsAdapter12::SetProfileServerPasswordL(): end" );
-	return KErrNone;
-	}
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter12::SetProfileHttpPasswordL
-//  The function sets the profile network/http password.
-// -----------------------------------------------------------------------------
-
-
-  TInt CNSmlDMSettingsAdapter12::SetProfileHttpPasswordL( const TInt aPID, const TDesC8& aObj )
-  {
- TInt retVal = KErrNone;
-	 retVal = OpenSyncSessionAndProfileL( aPID, ESmlOpenReadWrite );
-    if( retVal != KErrNone )
-		{
-	    iCurrentProfile = 0;
-		iProfile.Close();
-        return KErrGeneral;	
-		}
-        
-	  RSyncMLConnection connection;
-	  TBuf8<KBufSize32> key; 
-      RArray<TSmlTransportId> connIdArray;
-      CleanupClosePushL( connIdArray );
-	  iProfile.ListConnectionsL( connIdArray );
-      if( connIdArray.Count() == 1 )
-        {
-        
-		connection.OpenL( iProfile, KUidNSmlMediumTypeInternet.iUid );
-		CleanupClosePushL( connection );
-		
-		connection.SetPropertyL( KNSmlHTTPAuth, KNSmlTrueVal );
-		connection.SetPropertyL( KNSmlHTTPPassword, aObj );
-		connection.UpdateL();
-		CleanupStack::PopAndDestroy(  );
-		}
-	  else
-		{
-	//	connection.SetPropertyL( KNSmlHTTPAuth, KNSmlFalseVal );
-		connection.UpdateL();
-		}
-		
-		       
-        CleanupStack::PopAndDestroy(   );
-    
-	return retVal;
-	
-	
-  	
-  }
-  
-  
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter12::SetProfilePasswordL
-//  The function sets the profile password.
-// -----------------------------------------------------------------------------
-TInt CNSmlDMSettingsAdapter12::SetProfilePasswordL( const TInt aPID, 
-                                                    const TDesC8& aObj )
-	{
-    _DBG_FILE( "CNSmlDMSettingsAdapter12::SetProfilePasswordL(): begin" );
-	TInt retVal = KErrNone;
-    retVal = OpenSyncSessionAndProfileL( aPID, ESmlOpenReadWrite );
-    if( retVal != KErrNone )
-		{
-	    iCurrentProfile = 0;
-		iProfile.Close();
-        return retVal;	
-		}
-	iProfile.SetPasswordL( aObj );
-    iProfile.UpdateL();
-    iCurrentProfile = 0;
-    iProfile.Close();
-    _DBG_FILE( "CNSmlDMSettingsAdapter12::SetProfilePasswordL(): begin" );
-	return KErrNone;
-	}
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter12::SetProfileConnectionPropertyL
-//  This function sets the profile IAP id.
-// -----------------------------------------------------------------------------
-TInt CNSmlDMSettingsAdapter12::SetProfileConnectionPropertyL( const TInt aLUID, 
-                                                            const TInt aIAPid )
-	{
-    TInt retVal = OpenSyncSessionAndProfileL( aLUID, ESmlOpenReadWrite );
-    if( retVal != KErrNone )
-		{
-	    iCurrentProfile = 0;
-		iProfile.Close();
-        return retVal;	
-		}
-    RArray<TSmlTransportId> connIdArray;
-    CleanupClosePushL( connIdArray );
-    iProfile.ListConnectionsL( connIdArray );
-    if( connIdArray.Count() == 1 )
-        {
-        RSyncMLTransport transport;
-        CleanupClosePushL( transport );
-	    transport.OpenL( iSyncSession, connIdArray[0] );
-	    const CSyncMLTransportPropertiesArray& props = transport.Properties();
-	    TInt index = props.Find( KNSmlIAPId );
-        if( index > 0 )
-            {
-            RSyncMLConnection conn;
-            CleanupClosePushL( conn );
-	        conn.OpenL( iProfile, connIdArray[0] );
-            HBufC8* apIdBuffer = HBufC8::NewLC( 4 );
-	        TPtr8 ptrIapIdBuf = apIdBuffer->Des();
-        	ptrIapIdBuf.Num( aIAPid );
-            conn.SetPropertyL( KNSmlIAPId, ptrIapIdBuf );
-            conn.UpdateL();
-            CleanupStack::PopAndDestroy( 2 ); //conn, apIdBuffer
-            retVal = KErrNone;
-            }
-        else
-            {
-            retVal = KErrNotFound;
-            }
-        CleanupStack::PopAndDestroy( 1 ); //transport
-        }
-    else
-        {
-        retVal = KErrNotFound;
-        }
-    iCurrentProfile = 0;
-    iProfile.Close();
-    CleanupStack::PopAndDestroy(); //connIdArray
-    return retVal;
-	}
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter12::DeleteProfileL
-//  The function deleted the profile from DM database.
-// -----------------------------------------------------------------------------
-TInt CNSmlDMSettingsAdapter12::DeleteProfileL( const TInt aPID )
-	{
-    _DBG_FILE( "CNSmlDMSettingsAdapter12::DeleteProfileL(): begin" );
-	if( iSyncSessionOpen == EFalse )
-	    {
-        iSyncSession.OpenL();
-        iSyncSessionOpen = ETrue;
-	    }
-    
-	RArray<TSmlProfileId> profileIdArray;
-    CleanupClosePushL( profileIdArray );
-	TSmlUsageType usageType = ESmlDevMan;
-	iSyncSession.ListProfilesL( profileIdArray, usageType );
-	TInt index = profileIdArray.Find( aPID );
-	if ( index == KErrNotFound )
-		{
-        //No match
-        CleanupStack::PopAndDestroy();//profileIdArray
-		return KErrNotFound;		
-		}
-    iSyncSession.DeleteProfileL( aPID );
-    iSyncSession.Close();
-    iSyncSessionOpen = EFalse;
-    CleanupStack::PopAndDestroy();//profileIdArray
-    _DBG_FILE( "CNSmlDMSettingsAdapter12::DeleteProfileL(): end" );
-	return KErrNone;
-	}
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter12::GetObjectL
-//  The function checks which leaf data to be fetched.
-// -----------------------------------------------------------------------------
-TInt CNSmlDMSettingsAdapter12::GetObjectL( TInt aLUID, TNSmlDMProfileData aDMField, 
-                                            CBufBase& aObject )
-    {
-    TInt retVal = KErrNone;
-    if( iField->Compare(KNSmlDdfAppId ) ==0 )
-        {
-         	aObject.InsertL(aObject.Size(),KNSmlDdfAppIdValue);
-         	return retVal;
-        	
-        }
-        
-    retVal = OpenSyncSessionAndProfileL( aLUID, ESmlOpenRead );
-    if( retVal != KErrNone )
-		{
-	    iCurrentProfile = 0;
-		iProfile.Close();
-        return retVal;	
-		}
-    switch ( aDMField )
-		{
-		case ( EProfileName ) :
-			{
-            GetProfileNameL( aObject );
-            }
-		break;
-		
-		case ( EProfileDMServerUsername ) :
-			{
-			GetProfileUserNameL( aObject );
-            }
-		break;
-
-		case ( EProfileURL ) :
-			{
-			GetProfileServerURLL( aObject );
-			TInt port(0);
-			if(ParseUri(aObject.Ptr(0),port)==KErrNone)
-			    {
-			    HBufC8* addr = aObject.Ptr(0).AllocLC();
-			    aObject.Reset();
-			    TInt portStart = addr->LocateReverse(KNSmlDMColon);
-			    aObject.InsertL(aObject.Size(),addr->Left(portStart));
-			    
-			    TInt portLen=addr->Mid(portStart).Locate(KNSmlDMUriSeparator);
-			    if(portLen!=KErrNotFound)
-			        {
-			        aObject.InsertL(aObject.Size(),addr->Mid(portStart+portLen));
-			        }
-			    	    			    
-			    CleanupStack::PopAndDestroy(); //addr
-			    }
-            }
-		break;
-
-		case ( EServerId ) :
-			{
-            GetServerIdL( aObject );
-            }
-		break;
-
-		case ( EProfileIAPId ) :
-			{
-		    retVal = GetConRefL( aObject );
-            }
-		break;
-
-		case ( EProfilePort ) :
-            {
-            GetProfileServerURLL( aObject );
-            if ( aObject.Size() == 0 )
-                {
-                retVal = KErrNone;
-                break;
-                }
-            GetProfilePortNumberL ( aObject );
-            }
-        break;
-        
-   		case ( EProfileDMServerPassword ) :
-			{
-			retVal = EInvalidObject;
-            }
-		break;
-
-		case ( ESharedSecret ) :
-            {//ServerPW
-            retVal = EInvalidObject;
-            }
-        break;
-        case ( EProfileId ) :
-        break;
-		case ( EProfileAddrType ) :
-		    {
-		    aObject.InsertL(aObject.Size(),KNSmlAddrtype);
-		    }
-		   break;
-		case (EProfileHttpUsername ):
-		    {
-		       retVal = GetHttpUsernameL(aObject);
-		    }
-		break;
-		case (EPRofileServerCred) :
-		    {
-		    aObject.InsertL(aObject.Size(),KDmAccAppAuthLevelSrv);
-		    
-		    }
-		  break;
-        case (EPRofileClientCred) :
-		    {
-		    aObject.InsertL(aObject.Size(),KDmAccAppAuthLevelCli);
-		    }
-		  break;
-		  
-		case (ETransportAuthName) :
-		    {
-    			TInt mediumType= ENone;
-    			GetProfileConnectiontypeL( mediumType );
-    			if( mediumType == EHttp)
-    			{
-    		    retVal = GetHttpUsernameL(aObject);
-    		    }
-    		    else if(mediumType == EObex)
-    		    {
-    		      aObject.InsertL(aObject.Size(),KNSmlDMNullDesc8);
-    		    }
-		    
-		    }
-		break;
-		
-		
-		case (EProfileTransport) :
-		{
-			TInt mediumType= ENone;
-			GetProfileConnectiontypeL( mediumType );
-			if( mediumType == EHttp)
-			{
-		    aObject.InsertL(aObject.Size(),KDmAccAppAuthLevelHttp);
-		    }
-		    else if(mediumType == EObex)
-		    {
-		      aObject.InsertL(aObject.Size(),KDmAccAppAuthLevelObx);
-		    }
-            
-		}
-
-       break;
-        case ( EAuthenticationRequired ) :
-		case ( EProfileAAuthType ):
-        case ( EServerNonce ) :
-        case ( EClientNonce ) :
-            {
-            retVal = GetDMAuthInfoL( aLUID, aDMField, aObject );
-            }
-        break;
-        
-     case EProfileLock :
-      {
-        	
-       TBool isProfileLocked = iProfile.ProfileLocked(EFalse, EFalse);
-       if(isProfileLocked)
-       {
-       	aObject.InsertL(aObject.Size(),KDmProfileLocked);
-       }
-       else
-       {
-       	aObject.InsertL(aObject.Size(),KDmProfileUnLocked);
-       }
-       
-      }   
-     break;		
-		default:
-			{
-			User::Panic( KNSmlIndexOutOfBoundStr, KNSmlPanicIndexOutOfBound );
-			}
-		}
-    iCurrentProfile = 0;
-    iProfile.Close();
-    return retVal;
-    }
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter12::SetProfileConnectionPortNrL()
-//  The function sets the profile port number.
-// -----------------------------------------------------------------------------
-TInt CNSmlDMSettingsAdapter12::SetProfileConnectionPortNrL( const TInt aLUID, 
-                                                            const TDesC8& aPort )
-    {
-    _DBG_FILE( "CNSmlDMSettingsAdapter12::SetProfileConnectionPortNrL(): begin" );
-    TInt retVal = KErrNone;
-    
-    if( iPortNbr )
-        {
-        delete iPortNbr;
-        iPortNbr = NULL;
-        }
-    iPortNbr = HBufC8::NewL( aPort.Length() );
-    TPtr8 newPortNbr = iPortNbr->Des();
-    newPortNbr.Append( aPort );
-        
-    retVal = OpenSyncSessionAndProfileL( aLUID, ESmlOpenReadWrite );
-    if( retVal != KErrNone )
-		{
-	    iCurrentProfile = 0;
-		iProfile.Close();
-        _DBG_FILE( "CNSmlDMSettingsAdapter12::SetProfileConnectionPortNrL(): end" );
-        return retVal;	
-		}
-    
-    RArray<TSmlTransportId> transportIdArray;
-    CleanupClosePushL( transportIdArray );
-    iProfile.ListConnectionsL( transportIdArray );
-    
-    RSyncMLConnection conn;
-    CleanupClosePushL( conn );
-    conn.OpenL( iProfile, transportIdArray[0] );
-        
-    HBufC8* serverURI = conn.ServerURI().AllocLC();
-    if( serverURI->Length() == 0 )
-        {
-	    iCurrentProfile = 0;
-        iProfile.Close();
-        CleanupStack::PopAndDestroy( 3 ); //transportIdArray, conn, serverURI
-        _DBG_FILE( "CNSmlDMSettingsAdapter12::SetProfileConnectionPortNrL(): end" );
-        return retVal;
-	    }
-    TInt totalSize = serverURI->Size() + newPortNbr.Size() + 1;
-    HBufC8* newServerURI = HBufC8::NewL( totalSize );
-    CleanupStack::PushL( newServerURI );
-    SetPortNrToAddrStr( *serverURI, newServerURI, newPortNbr );
-    
-    conn.SetServerURIL( *newServerURI );
-    conn.UpdateL();
-    
-    CleanupStack::PopAndDestroy( 4 ); //transportIdArray, conn, serverURI, newServerURI
-    iCurrentProfile = 0;
-	iProfile.Close();
-    _DBG_FILE( "CNSmlDMSettingsAdapter12::SetProfileConnectionPortNrL(): end" );
-    return retVal;	
-    }
-
-// ------------------------------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter12::SetPortNrToAddrStr
-//  Sets a portnbr (separated with ':') to profile server URI. 
-// ------------------------------------------------------------------------------------------------
-void CNSmlDMSettingsAdapter12::SetPortNrToAddrStr( const TDesC8& aSrvURI, HBufC8* aNewURI, 
-                                                    const TDesC8& aPort )
-	{
-	TInt offset=0;
-    if( aSrvURI.Find( KNSmlDMSettingsHTTP ) == 0 )//http://
-		{
-		offset = KNSmlDMSettingsHTTP().Length();
-		}
-	else if( aSrvURI.Find( KNSmlDMSettingsHTTPS ) == 0 )//https://
-		{
-		offset = KNSmlDMSettingsHTTPS().Length();
-		}
-	TInt portStart = -1;
-    TInt separatorPos = aSrvURI.Length();
-    TInt i = 0;
-    for( i = offset; i < aSrvURI.Length(); i++ )
-		{
-		if( aSrvURI[i] == KNSmlDMColon )// ':'
-			{
-			portStart = i;
-			}
-		if( aSrvURI[i] == KNSmlDMUriSeparator )// '/'
-			{
-            separatorPos = i;
-			break;
-			}
-		}
-	
-    TPtr8 ptrNewSrvURI = aNewURI->Des();
-    if( portStart < 0 && separatorPos > 0 && iLeafType != EDMDelete )
-        {
-        ptrNewSrvURI.Append( aSrvURI.Left( separatorPos ) );//http://123.234.345.456
-        ptrNewSrvURI.Append( KNSmlDMColon );
-        ptrNewSrvURI.Append( aPort );
-        ptrNewSrvURI.Append( aSrvURI.Right( aSrvURI.Length() - separatorPos ) );
-        }
-    else if ( portStart > 0 && separatorPos > 0 && iLeafType != EDMDelete )
-        {
-        ptrNewSrvURI.Append( aSrvURI.Left( portStart + 1 ) );//123.234.345.456:
-        ptrNewSrvURI.Append( aPort );//123.234.345.456:xx(x)
-        ptrNewSrvURI.Append( aSrvURI.Right( aSrvURI.Length() - separatorPos ) );
-        }
-    else if ( portStart > 0 &&  iLeafType == EDMDelete ) //delete port number from uri
-        {
-        ptrNewSrvURI.Append( aSrvURI.Left( portStart ) );//123.234.345.456
-        ptrNewSrvURI.Append( aSrvURI.Right( aSrvURI.Length() - separatorPos ) );
-        }
-    else
-        {
-        ptrNewSrvURI.Append( aSrvURI );
-        }
-    return;
-	}
-
-// ------------------------------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter12::SetDMFieldDataL
-//  Selects and Sets value to a field based on field id got from URI.
-// ------------------------------------------------------------------------------------------------
-TInt CNSmlDMSettingsAdapter12::SetDMFieldDataL( const TInt aLUID, const TDesC8& aObject, 
-                                                const TNSmlDMProfileData aField )
-    {
-    TInt rValue = KErrGeneral;
-    TInt lockvalue =0;
-     if(aField != EProfileLock)
-    {
-      rValue=IsProfileLockedL(aLUID);	
-      if (rValue!= KErrNone)
-      {
-       return rValue;
-      }
-         
-     }
-     else if (aField == EProfileLock)
-     {
-     	 if (! iNewProfile)
-     	  {
-     	  	 lockvalue =0;
-     	  	  if(aObject.Length()> 1)
-     	  	  {
-     	  	    rValue = KErrArgument;
-              	 return rValue;
-     	  	  }
-           lockvalue = GetIntObject(aObject);
-           if(lockvalue != 0 && lockvalue != 1)
-               {
-               	  //lockvalue = 0; 
-               	  rValue = KErrArgument;
-               	 return rValue;
-               }  
-     	  	 rValue  = SetProfileLockL(aLUID , lockvalue);
-     	  	 return rValue;
-     	  }
-      
-     }
-      
-    switch ( aField )
-		{
-		case ( EProfileURL ) :
-			{
-		    rValue = SetProfileServerURIL( aLUID, aObject );    
-			}
-		break;
-		case ( EServerId ) :
-			{
-		    rValue = SetProfileServerIdL( aLUID, aObject );
-			}
-		break;
-        case ( ESharedSecret ) :
-			{
-		    rValue = SetProfileServerPasswordL( aLUID, aObject );
-			}
-		break;
-        case ( EProfileDMServerUsername ) :
-			{
-		    rValue = SetProfileUserNameL( aLUID, aObject );
-			}
-		break;
-        case ( EProfileDMServerPassword ) :
-			{
-		    rValue = SetProfilePasswordL( aLUID, aObject );
-			}
-		break;
-        case ( EProfileName ) :
-			{
-		    rValue = SetProfileDisplayNameL( aLUID, aObject );
-			}
-		break;
-        case ( EProfileIAPId ) :
-			{
-            rValue = SetConRefL( aLUID, aObject );
-		    }
-		break;
-		case ( ETransportAuthName ):
-		{
-		    OpenSyncSessionAndProfileL( aLUID, ESmlOpenReadWrite );
-		  	TInt mediumType = ENone;
-	    	GetProfileConnectiontypeL( mediumType );
-			if( mediumType == EHttp)
-			{
-		    rValue = SetProfileHttpUserNameL ( aLUID, aObject );
-		    }
-		    else if(mediumType == EObex)
-		    {
-		      rValue = KErrNone;
-		      
-		    }
-			
-	
-		//break;
-		}
-		break;
-		case ( EProfileTransportPassword ):
-		{
-		 TInt mediumType = ENone;
-		  OpenSyncSessionAndProfileL( aLUID, ESmlOpenReadWrite );
-	    	GetProfileConnectiontypeL( mediumType );
-			if( mediumType == EHttp)
-			{
-		    rValue = SetProfileHttpPasswordL ( aLUID, aObject );
-		    }
-		    else if(mediumType == EObex)
-		    {
-		      rValue = KErrNone;
-		      
-		    }		
-		}
-		break;
-		case (EProfileTransportAuthData) :
-			{
-				rValue = KErrNone;
-			}
-		break;
-		
-		case ( EProfileHttpUsername ) :
-		{
-			rValue = SetProfileHttpUserNameL ( aLUID, aObject );
-		}
-		break;
-		case ( EProfileHttpPassword ) :
-		{
-			rValue = SetProfileHttpPasswordL ( aLUID, aObject );
-		}
-		break;
-        case ( EProfileId ) :
-			{
-		    }
-		break;
-        case ( EProfilePort ) :
-			{
-			if(aObject.Size()<=5)
-			{
-			TInt port = GetIntObject(aObject);
-	        if( port > KPortMinSize && port < KPortMaxSize )
-		         {
-	    			TPortBuffer element;
-	    			element.iPortBuf=aObject;
-	    			element.iPortBufLUID = aLUID;
-	    			iPortBuffer.Append(element);
-	    			rValue=KErrNone;
-                 }
-                else
-                {
-				if (port <= KPortMinSize )
-				   rValue = KErrUnderflow;
-                	else
-                   rValue=KErrOverflow;
-                }
-			}
-			else
-			{
-					rValue=KErrOverflow;
-			}
-			// save information of the port
-		    }
-		break;
-		
-		case ( EProfileAddrType ) :
-			{
-			  if (aObject.Match(KNSmlAddrtype)!=KErrNotFound)
-			  rValue=KErrNone;
-			  
-			}
-		break;
-		
-		
-        case ( EProfileMediumType ) :
-			{
-            if ( iLeafType == EDMDelete )
-			    {
-                return KErrNone;
-			    }
-            iObject = GetIntObject( aObject );
-            if(iObject<0)
-                {
-                iObject = EHttp;
-                }
-            rValue = SetProfileAddrTypeL( aLUID, iObject );
-		    }
-		break;
-		case ( EProfileTransport) :
-		{
-			if (aObject.Match(KDmAccAppAuthLevelHttp)!=KErrNotFound)
-			{
-				iObject = EHttp;
-			}
-			else if (aObject.Match(KDmAccAppAuthLevelObx)!=KErrNotFound)
-			{
-				iObject = EObex;
-			}
-		 rValue = SetProfileAddrTypeL( aLUID, iObject );	
-		}
-		break;
-        case ( EAuthenticationRequired ) :
-        case ( EClientNonce ) :
-        case ( EServerNonce ) :
-		break;
-     case ( EProfileLock ) :
-              lockvalue =0;
-              lockvalue = GetIntObject(aObject);
-             if(lockvalue != 0 && lockvalue != 1)
-                   lockvalue = 0; 
-            
-            TLockBuffer element;
-	    	element.iProfileLock=lockvalue;
-	    	element.iProfileLockLUID = aLUID;
-	    	iProfileLockBuffer.Append(element);
-	    	rValue=KErrNone;
-           
-             
-          // rValue  = SetProfileLock(aLUID , lockvalue);
-     break;               
-        default:
-            rValue = KErrNotSupported;
-        }
-    return rValue;
-    }
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter12::FillNodeInfoL
-//  The function fills the node or leaf information.
-// -----------------------------------------------------------------------------
-void CNSmlDMSettingsAdapter12::FillNodeInfoL( MSmlDmDDFObject& aNode, 
-                                            TSmlDmAccessTypes aAccTypes, 
-                                            MSmlDmDDFObject::TOccurence aOccurrence, 
-                                            MSmlDmDDFObject::TScope aScope, 
-                                            MSmlDmDDFObject::TDFFormat aFormat, 
-                                            const TDesC8& aDescription, 
-                                            const TDesC8& aDefaultValue, 
-                                            const TDesC8& aMimeType )
-    {
-    aNode.AddDFTypeMimeTypeL( aMimeType );
-    aNode.SetAccessTypesL( aAccTypes );
-	aNode.SetDescriptionL( aDescription );
-	aNode.SetOccurenceL( aOccurrence );
-	aNode.SetDefaultValueL( aDefaultValue );
-	aNode.SetScopeL( aScope );
-	aNode.SetDFFormatL( aFormat );
-    return;
-    }
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter12::GetDMAuthInfoL
-//  This function gets authentication data from private API.
-// -----------------------------------------------------------------------------
-TInt CNSmlDMSettingsAdapter12::GetDMAuthInfoL( const TInt aLUID, 
-                                                const TNSmlDMProfileData aField, 
-                                                CBufBase& aObject )
-    {
-    _DBG_FILE( "CNSmlDMSettingsAdapter12::GetDMAuthInfoL(): begin" );
-   
-    CNSmlDMAuthInfo* authInfo = new (ELeave) CNSmlDMAuthInfo;
-    CleanupStack::PushL( authInfo );
-    
-    authInfo->iProfileId = aLUID + KMaxDataSyncID;
-    iPrivateApi.OpenL();
-    TInt ret = KErrNone;
-    
-    TRAPD(err,iPrivateApi.GetDMAuthInfoL( *authInfo ));
-
-    if(err==KErrNone)
-    	{
-	    if ( aField == EServerNonce )
-	        {
-	        aObject.InsertL( aObject.Size(), *authInfo->iServerNonce );
-	        }
-	    else if ( aField == EClientNonce )
-	        {
-	        aObject.InsertL( aObject.Size(), *authInfo->iClientNonce );
-	        }
-	    else if (( aField == EAuthenticationRequired ) || (aField == EProfileAAuthType))
-	        {
-	        TUint authPref = authInfo->iAuthPref;
-	        /*if( authPref == ENoAuth )
-	            {
-	            aObject.InsertL( aObject.Size(), KNSmlDMAuthPrefNoAuth ); 
-	            }*/
-	         if( authPref == EBasic )
-	            {
-	            if(aField == EAuthenticationRequired)
-	            {
-	            aObject.InsertL( aObject.Size(), KNSmlDMAuthPrefBasic );	
-	            }
-	            else
-	            {
-	            aObject.InsertL( aObject.Size(), KNSmlDMAuthTypeBasic );	
-	            }
-	            
-	            }
-	        else if( authPref == EMD5 )
-	            {
-	            if(aField == EAuthenticationRequired)
-	            {
-	            aObject.InsertL( aObject.Size(), KNSmlDMAuthPrefMD5 );	
-	            }
-	            else
-	            {
-				aObject.InsertL( aObject.Size(), KNSmlDMAuthTypeMD5 );
-	            }
-	            
-	            }
-	        else
-	            {
-	            aObject.InsertL( aObject.Size(), KNullDesC8 );
-	            }
-	        }
-    	}
-    iPrivateApi.Close();
-    CleanupStack::PopAndDestroy(authInfo);
-    _DBG_FILE( "CNSmlDMSettingsAdapter12::GetDMAuthInfoL(): end" );
-    return ret;
-    }
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter12::DeleteDMAuthInfoL
-//  This function resets the authentication data.
-// -----------------------------------------------------------------------------
-TInt CNSmlDMSettingsAdapter12::DeleteDMAuthInfoL( const TInt aLUID, 
-                                                const TNSmlDMProfileData aField )
-    {
-    _DBG_FILE( "CNSmlDMSettingsAdapter12::DeleteDMAuthInfoL(): begin" );
-    CNSmlDMAuthInfo* authInfo = new (ELeave) CNSmlDMAuthInfo;;
-    CleanupStack::PushL( authInfo );
-    authInfo->iProfileId = aLUID;
-    iPrivateApi.OpenL();
-    iPrivateApi.GetDMAuthInfoL( *authInfo );
-    if( aField == EServerNonce )
-        {
-        authInfo->iServerNonce->Des().Delete( 0, authInfo->iServerNonce->Des().Size() );
-        authInfo->iServerNonce->Des().Insert( 0, KNullDesC8 );
-        }
-    else if( aField == EClientNonce )
-        {
-        authInfo->iClientNonce->Des().Delete( 0, authInfo->iClientNonce->Des().Size() );
-        authInfo->iClientNonce->Des().Insert( 0, KNullDesC8 );
-        }
-    else if( aField == EAuthenticationRequired )
-        {
-        authInfo->iAuthPref = 0;
-        }
-    iPrivateApi.SetDMAuthInfoL( *authInfo );
-    iPrivateApi.Close();
-    CleanupStack::PopAndDestroy(authInfo);
-	_DBG_FILE( "CNSmlDMSettingsAdapter12::DeleteDMAuthInfoL(): end" );
-    return KErrNone;
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSettingsAdapter12::SetProfileAddrTypeL
-// This function sets the AddrType value.    
-// -----------------------------------------------------------------------------
-TInt CNSmlDMSettingsAdapter12::SetProfileAddrTypeL( const TInt aLUID, 
-                                                    const TInt aIntObj )
-    {
-    _DBG_FILE( "CNSmlDMSettingsAdapter12::SetProfileAddrTypeL(): begin" );
-    TInt retVal = OpenSyncSessionAndProfileL( aLUID, ESmlOpenReadWrite );
-    if( retVal != KErrNone )
-		{
-	    iCurrentProfile = 0;
-		iProfile.Close();
-        _DBG_FILE( "CNSmlDMSettingsAdapter12::SetProfileAddrTypeL(): end" );
-        return retVal;	
-		}
-    TInt mediumType = ENone;
-    GetMediumTypeL( aIntObj, mediumType );
-    if( mediumType == ENone )
-        {
-	    iCurrentProfile = 0;
-        iProfile.Close();    
-        return KErrGeneral;
-        }
-    RArray<TSmlTransportId> transportIdArray;
-    CleanupClosePushL( transportIdArray );
-    iProfile.ListConnectionsL( transportIdArray );
-    RSyncMLConnection conn;
-    CleanupClosePushL( conn );
-    conn.OpenL( iProfile, transportIdArray[0] );
-    HBufC8* sURI = conn.ServerURI().AllocLC();
-    if(mediumType!=transportIdArray[0])
-        {
-        if ( !FeatureManager::FeatureSupported( KFeatureIdSyncMlDmObex  ) )
-            {
-            CleanupStack::PopAndDestroy( 3 );//transportIdArray, conn, sURI
-            return EInvalidObject;
-            }
-        else
-            {
-            conn.CreateL(iProfile,mediumType);
-            }
-        }
-    conn.SetServerURIL( *sURI );
-    conn.UpdateL(); 	                    
-    CleanupStack::PopAndDestroy( 3 );//transportIdArray, conn, sURI
-    iCurrentProfile = 0;
-    iProfile.Close();
-    _DBG_FILE( "CNSmlDMSettingsAdapter12::SetProfileAddrTypeL(): end" );
-    return KErrNone;
-    }
-
-// -----------------------------------------------------------------------------
-// CNSmlDMSettingsAdapter12::GetHttpUsernameL
-// This function gets the httpuser value.    
-// -----------------------------------------------------------------------------
-	
-
-TInt CNSmlDMSettingsAdapter12::GetHttpUsernameL( CBufBase& aObject )
-	{
-	
-	  TInt retVal = KErrNone;
-      TBuf8<KBufSize32> key; 
-      TInt intValue;
-      
-      RArray<TSmlTransportId> connIdArray;
-      CleanupClosePushL( connIdArray );
-	  iProfile.ListConnectionsL( connIdArray );
-      if( connIdArray.Count() == 1 )
-        {
-        RSyncMLTransport transport;
-        CleanupClosePushL( transport );
-	    transport.OpenL( iSyncSession, connIdArray[0] );
-    	const CSyncMLTransportPropertiesArray&  arr = transport.Properties();
-		const TSyncMLTransportPropertyInfo& info = arr.At( EPropertyHttpUsed );
-		key = info.iName;
-		RSyncMLConnection conn;
-        CleanupClosePushL( conn );
-	    conn.OpenL( iProfile, connIdArray[0] );
-       	HBufC8* value = conn.GetPropertyL( key ).AllocLC();
-        intValue = GetIntObject( *value );
-        CleanupStack::PopAndDestroy(  ); //value
-        if ( intValue == 1 )
-        	{
-                retVal = KErrNone;
-                const TSyncMLTransportPropertyInfo& info2 = arr.At( EPropertyHttpUserName );
-                key= info2.iName;
-                HBufC8* value = conn.GetPropertyL( key ).AllocLC();
-                aObject.InsertL(aObject.Size(),value->Des());
-                CleanupStack::PopAndDestroy(  ); //value
-                }
-                else
-                    {
-                    retVal = KErrNotFound;
-                    }
-               CleanupStack::PopAndDestroy( 2 ); //  conn, transport
-        }
-        CleanupStack::PopAndDestroy(  ); //connIdArray
-    
-	return retVal;
-	}
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter12::GetProfileConnectiontypeL
-//  The function gets the profile medium type.
-// -----------------------------------------------------------------------------
-TInt CNSmlDMSettingsAdapter12::GetProfileConnectiontypeL( TInt& aMediumTYpe )
-	{
-    _DBG_FILE( "CNSmlDMSettingsAdapter12::GetProfileConnectiontypeL(): begin" );
-	RArray<TSmlTransportId> transportIdArray;
-    CleanupClosePushL( transportIdArray );
-	iProfile.ListConnectionsL( transportIdArray );
-	TInt transportItems = transportIdArray.Count();
-    if( transportItems == 0 )
-		{
-		//No matching items
-        CleanupStack::PopAndDestroy(); //transportIdArray	
-		return KErrGeneral;
-		}
-	else if( transportItems > 1 )
-		{
-		//Error case : against specification
-        CleanupStack::PopAndDestroy(); //transportIdArray	
-		return KErrGeneral;
-		}
-	aMediumTYpe = 0;
-    if ( transportIdArray[0] == KUidNSmlMediumTypeInternet.iUid )
-        {
-        aMediumTYpe = 1; //EHttp;
-        }
-    else if ( transportIdArray[0] == KUidNSmlMediumTypeBluetooth.iUid ||
-              transportIdArray[0] == KUidNSmlMediumTypeUSB.iUid ||   
-              transportIdArray[0] == KUidNSmlMediumTypeIrDA.iUid  )
-        {
-        aMediumTYpe = 3; //EObex;
-        }
-    CleanupStack::PopAndDestroy( 1 ); //transportIdArray, SetIntObjectLC
-	return KErrNone;
-	}
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter12::GetProfileIAPIdL
-//  The function gets the profile IAP Id.
-// -----------------------------------------------------------------------------
-TInt CNSmlDMSettingsAdapter12::GetProfileIAPIdL( TInt& aIAPid )
-	{
-    _DBG_FILE( "CNSmlDMSettingsAdapter12::GetProfileIAPIdL(): begin" );
-    TInt retVal = KErrGeneral;
-    aIAPid = -1;
-    RArray<TSmlTransportId> connIdArray;
-    CleanupClosePushL( connIdArray );
-    iProfile.ListConnectionsL( connIdArray );
-    if( connIdArray.Count() == 1 )
-        {
-        RSyncMLTransport transport;
-        CleanupClosePushL( transport );
-	    transport.OpenL( iSyncSession, connIdArray[0] );
-	    const CSyncMLTransportPropertiesArray& props = transport.Properties();
-	    TInt index = props.Find( KNSmlIAPId );
-        if( index > 0 )
-            {
-            RSyncMLConnection conn;
-            CleanupClosePushL( conn );
-	        conn.OpenL( iProfile, connIdArray[0] );
-            HBufC8* apId = conn.GetPropertyL( KNSmlIAPId ).AllocLC();
-            aIAPid = GetIntObject( *apId );
-            CleanupStack::PopAndDestroy( 2 ); //conn, apId
-            retVal = KErrNone;
-            }
-        else
-            {
-            retVal = KErrNotFound;
-            }
-        CleanupStack::PopAndDestroy( 1 ); //transport
-	    iCurrentProfile = 0;
-        iProfile.Close();
-        }
-    else
-        {
-        retVal = KErrNotFound;
-        }
-    CleanupStack::PopAndDestroy(); //connIdArray
-    _DBG_FILE( "CNSmlDMSettingsAdapter12::GetProfileIAPIdL(): end" );
-    return retVal;
-    }
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter12::GetProfileServerURLL
-//  The function gets the profile Server URI.
-// -----------------------------------------------------------------------------
-void CNSmlDMSettingsAdapter12::GetProfileServerURLL( CBufBase& aURL )
-	{
-    _DBG_FILE( "CNSmlDMSettingsAdapter12::GetProfileServerURLL(): begin" );
-    RArray<TSmlTransportId> transportIdArray;
-    CleanupClosePushL( transportIdArray );
-	iProfile.ListConnectionsL( transportIdArray );
-    if( transportIdArray.Count() > 0 )
-        {
-        RSyncMLConnection profConn;
-        CleanupClosePushL( profConn );
-	    profConn.OpenL( iProfile, transportIdArray[0] );
-	    HBufC8* sURI = profConn.ServerURI().AllocL();
-        CleanupStack::PushL( sURI );
-        TPtr8 uriPtr = sURI->Des();
-        if( uriPtr.Length() > 0 )
-            {
-            aURL.InsertL( aURL.Size(),uriPtr );
-            }
-        else
-            {
-            aURL.InsertL( aURL.Size(), KNullDesC8 );
-            }
-        CleanupStack::PopAndDestroy( 2 );//profConn, sURI
-        }
-    CleanupStack::PopAndDestroy(); //transportIdArray
-    _DBG_FILE( "CNSmlDMSettingsAdapter12::GetProfileServerURLL(): end" );
-    return;
-	}
-
-// -----------------------------------------------------------------------------
-//	CNSmlDMSettingsAdapter12::GetMediumTypeL
-//	Checks the requested medium type.
-// -----------------------------------------------------------------------------
-void CNSmlDMSettingsAdapter12::GetMediumTypeL( const TInt aIntObj, 
-                                            TInt& aMediumType )
-    {
-    _DBG_FILE( "CNSmlDMSettingsAdapter12::GetMediumTypeL(): begin" );
-    if( aIntObj == EHttp || aIntObj == EWsp )
-        {
-        aMediumType = KUidNSmlMediumTypeInternet.iUid;
-        return;
-        }
-    RArray<TSmlTransportId> transportIdArray;
-    CleanupClosePushL( transportIdArray );
-    iSyncSession.ListTransportsL( transportIdArray );
-    
-    if ( transportIdArray.Find( KUidNSmlMediumTypeBluetooth.iUid ) != KErrNotFound )
-        {
-        aMediumType = KUidNSmlMediumTypeBluetooth.iUid;
-        }
-    else if ( transportIdArray.Find( KUidNSmlMediumTypeUSB.iUid ) != KErrNotFound )
-        {
-        aMediumType = KUidNSmlMediumTypeUSB.iUid;
-        }
-    else if ( transportIdArray.Find( KUidNSmlMediumTypeIrDA.iUid ) != KErrNotFound )
-        {
-        aMediumType = KUidNSmlMediumTypeIrDA.iUid;
-        }
-    CleanupStack::PopAndDestroy(); //transportIdArray
-    _DBG_FILE( "CNSmlDMSettingsAdapter12::GetMediumTypeL(): end" );
-    return;    
-    }
-
-// -----------------------------------------------------------------------------
-//	CNSmlDMSettingsAdapter12::GetServerIdL
-//	Gets the server id value.
-// -----------------------------------------------------------------------------
-void CNSmlDMSettingsAdapter12::GetServerIdL( CBufBase& aObject )
-    {
-    _DBG_FILE( "CNSmlDMSettingsAdapter12::GetServerIdL(): begin" );
-    HBufC8* serverId = iProfile.ServerId().AllocL();
-    CleanupStack::PushL( serverId );
-    aObject.InsertL( aObject.Size(), *serverId );
-    CleanupStack::PopAndDestroy( 1 ); //serverId
-    _DBG_FILE( "CNSmlDMSettingsAdapter12::GetServerIdL(): end" );
-    return;
-    }
-
-// -----------------------------------------------------------------------------
-//	CNSmlDMSettingsAdapter12::GetProfileNameL
-//	Gets the display name value.
-// -----------------------------------------------------------------------------
-void CNSmlDMSettingsAdapter12::GetProfileNameL( CBufBase& aObject )
-    {
-    _DBG_FILE( "CNSmlDMSettingsAdapter12::GetProfileNameL(): begin" );
-    HBufC16* dataBuf = iProfile.DisplayName().AllocL();
-    CleanupStack::PushL( dataBuf );
-    TPtr16 ptrDisplayName = dataBuf->Des();
-    HBufC8* dataBuf8 = HBufC8::NewL( ptrDisplayName.Length() * 2 );
-    CleanupStack::PushL( dataBuf8 );
-
-    TPtr8 ptrDisplayName8 = dataBuf8->Des();
-    ptrDisplayName8 = ConvertTo8LC( ptrDisplayName );
-    aObject.InsertL( aObject.Size(), ptrDisplayName8 );
-    CleanupStack::PopAndDestroy( 3 );//dataBuf, ConvertTo8LC
-    _DBG_FILE("CNSmlDMSettingsAdapter12::GetProfileNameL(): end");
-    return;
-    }
-
-// -----------------------------------------------------------------------------
-//	CNSmlDMSettingsAdapter12::GetProfileUserNameL
-//	Gets the profile user name value.
-// -----------------------------------------------------------------------------
-void CNSmlDMSettingsAdapter12::GetProfileUserNameL( CBufBase& aObject )
-    {
-    _DBG_FILE( "CNSmlDMSettingsAdapter12::GetProfileUserNameL(): begin" );
-    HBufC8* dataBuf = iProfile.UserName().AllocL();
-    CleanupStack::PushL( dataBuf );
-    TPtr8 ptrUserName = dataBuf->Des();
-    aObject.InsertL( aObject.Size(), ptrUserName );
-    CleanupStack::PopAndDestroy();//dataBuf
-    _DBG_FILE( "CNSmlDMSettingsAdapter12::GetProfileUserNameL(): end" );
-    return;
-    }
-
-// -----------------------------------------------------------------------------
-//	CNSmlDMSettingsAdapter12::GetProfilePortNumberL
-//	Gets the port number value.
-// -----------------------------------------------------------------------------
-void CNSmlDMSettingsAdapter12::GetProfilePortNumberL( CBufBase& aObject )
-    {
-    _DBG_FILE( "CNSmlDMSettingsAdapter12::GetProfilePortNumberL(): begin" );
-    TInt bSize = aObject.Size();
-    TInt portNum = 0;
-    HBufC8* bufStorage = HBufC8::NewLC( bSize );
-	TPtr8 bufStoragePtr = bufStorage->Des();
-	aObject.Read( 0, bufStoragePtr, aObject.Size() );
-	aObject.Reset();
-	
-    //find out the port number
-    ParseUri( *bufStorage, portNum );
-	aObject.InsertL( aObject.Size(), SetIntObjectLC( portNum ) );
-
-    CleanupStack::PopAndDestroy( 2 ); //bufStorage, SetIntObjectLC()
-    _DBG_FILE( "CNSmlDMSettingsAdapter12::GetProfilePortNumberL(): end" );
-    return;
-    }
-
-// -----------------------------------------------------------------------------
-//  CNSmlDMSettingsAdapter12::SetAuthInfoL
-//  The function checks if authinfo already exits. If exits command is replace.
-// -----------------------------------------------------------------------------
-void CNSmlDMSettingsAdapter12::SetAuthInfoL( const TInt aLUID, 
-                                            const TNSmlDMProfileData aField, 
-                                            const TDesC8& aObject, TInt& aStatus )
-    {
-    _DBG_FILE( "CNSmlDMSettingsAdapter12::SetAuthInfoL(): begin" );
-    
-    CNSmlDMAuthInfo* authInfo = new (ELeave) CNSmlDMAuthInfo();
-    CleanupStack::PushL( authInfo );
-    authInfo->iProfileId = aLUID;
-    
-    iPrivateApi.OpenL();
-    TRAPD( err, iPrivateApi.GetDMAuthInfoL( *authInfo ) );
-    
-    if ( err )
-        {
-        CleanupStack::PopAndDestroy( authInfo );
-        iPrivateApi.Close();
-        aStatus = err;
-        return;
-        }
-    
-    CNSmlDMAuthInfo* newAuthInfo = new (ELeave) CNSmlDMAuthInfo();
-    CleanupStack::PushL( newAuthInfo );
-    newAuthInfo->iProfileId = aLUID;
-
-    if ( aField == EServerNonce )
-        {
-        newAuthInfo->iServerNonce = aObject.Alloc();
-        newAuthInfo->iClientNonce = authInfo->iClientNonce->Des().Alloc();
-        newAuthInfo->iAuthPref = authInfo->iAuthPref;
-        
-        iPrivateApi.SetDMAuthInfoL( *newAuthInfo );
-        }
-    else if ( aField == EClientNonce )
-        {
-        newAuthInfo->iServerNonce = authInfo->iServerNonce->Des().Alloc();
-        newAuthInfo->iClientNonce = aObject.Alloc();
-        newAuthInfo->iAuthPref = authInfo->iAuthPref;
-        
-        iPrivateApi.SetDMAuthInfoL( *newAuthInfo );
-        }
-    else if ( aField == EAuthenticationRequired )
-        {
-        if ( aObject.Match( KNSmlDMAuthPrefNoAuth ) !=  KErrNotFound )
-            {
-            newAuthInfo->iAuthPref = ENoAuth;
-            }
-        else if ( aObject.Match( KNSmlDMAuthPrefBasic ) !=  KErrNotFound )
-            {
-            newAuthInfo->iAuthPref = EBasic;
-            }
-        else if ( aObject.Match( KNSmlDMAuthPrefMD5 ) !=  KErrNotFound )
-            {
-            newAuthInfo->iAuthPref = EMD5;
-            }
-        newAuthInfo->iServerNonce = authInfo->iServerNonce->Des().Alloc();
-        newAuthInfo->iClientNonce = authInfo->iClientNonce->Des().Alloc();
-        
-        iPrivateApi.SetDMAuthInfoL( *newAuthInfo );
-        }
-    
-    CleanupStack::PopAndDestroy( newAuthInfo );
-    CleanupStack::PopAndDestroy( authInfo );
-    
-    iPrivateApi.Close();
-    aStatus = KErrNone;
-    _DBG_FILE( "CNSmlDMSettingsAdapter12::SetAuthInfoL(): end" );
-    return;
-	}
-
-//------------------------------------------------------------------------------
-// CNSmlDMSettingsAdapter12::AddNodeBufferL()
-// Buffers Node Object
-//------------------------------------------------------------------------------
-void CNSmlDMSettingsAdapter12::AddNodeBufferL( const TDesC8& aURI,
-		const TInt aStatusRef)
-	{
-	_DBG_FILE( "CNSmlDMSettingsAdapter12::AddNodeBufferL(): begin" );
-	TInt index = -1;
-
-	for (TInt i = 0; i<iBuffer->Count (); i++)
-		{
-		if ( iBuffer->At(i).iMappingName->Compare (aURI)== 0)
-			{
-			index = i;
-			//CallBack for duplicate
-			_DBG_FILE( "CNSmlDMSettingsAdapter12::AddNodeBufferL(): EAlreadyExists end" );
-			iCallBack->SetStatusL ( aStatusRef, CSmlDmAdapter::EAlreadyExists);
-			break;
-			}
-		}
-
-	if ( index<0)
-		{
-		TNSmlDMBufferElement newNode;
-		newNode.iMappingName = aURI.AllocLC ();
-		newNode.iLeafBuf = new (ELeave) CArrayFixFlat <TNSmlDMLeafElement> (4);
-		newNode.iExecuted = EFalse;
-		newNode.iDMBuffStatusref = aStatusRef;
-		newNode.iAddr = EFalse;
-		newNode.iServerId = EFalse;
-		newNode.iUName = EFalse;
-		newNode.iServerName = EFalse;
-
-		iBuffer->AppendL (newNode);
-		//newNode.iMappingName
-		CleanupStack::Pop ();
-		}
-	_DBG_FILE( "CNSmlDMSettingsAdapter12::AddNodeBufferL(): end" );
-	}
-
-//------------------------------------------------------------------------------
-// CNSmlDMSettingsAdapter12::AddLeafBufferL()
-// Buffers Leaf Obj & checks for Mandatory fields
-//------------------------------------------------------------------------------
-void CNSmlDMSettingsAdapter12::AddLeafBufferL( const TDesC8& aURI,
-		const TDesC8& aObject, const TInt aStatusRef)
-	{
-	_DBG_FILE( "CNSmlDMSettingsAdapter12::AddLeafBufferL(): begin" );
-	TNSmlDMLeafElement newCommand;
-
-	newCommand.iUri = aURI.AllocLC ();
-	newCommand.iData = aObject.AllocLC ();
-	newCommand.iLuid = HBufC8::NewLC (8); //Allocate Mem. for iLUID
-	newCommand.iStatusRef = aStatusRef;
-	//Add Leaf to the index updated by UpdateLeafObj
-	iBuffer->At(iExecutionIndex).iLeafBuf->AppendL (newCommand);
-	// iUri, iData, ILuid
-	CleanupStack::Pop (3);
-	SetField ( aURI);
-	SetURIInProcessL ( aURI);
-	if ( iField->Compare (KNSmlDdfAddr)== 0)
-		{
-		iBuffer->At(iExecutionIndex).iAddr = ETrue;
-		}
-	else
-		if ( iField->Compare (KNSmlDdfServerId)== 0)
-			{
-			if(!IsServerIDExistL(aObject))
-				iBuffer->At(iExecutionIndex).iServerId = ETrue;
-			}
-		else
-			if ( iField->Compare (KNSmlDdfAAuthName)== 0)
-				{
-				//AAuthName under AppAuthCli
-				if ( iURIField->Find (KDmAccAppAuthDyn2)!= KErrNotFound)
-					iBuffer->At(iExecutionIndex).iUName = ETrue;
-				}
-			else
-				if ( iField->Compare (KNSmlDdfName)== 0)
-					{
-					iBuffer->At(iExecutionIndex).iServerName = ETrue;
-					}
-
-	//  If Address,ServerId,ServerName,UserName then Add
-
-	if ( iBuffer->At(iExecutionIndex).iAddr && iBuffer->At(iExecutionIndex).iServerId &&iBuffer->At(iExecutionIndex).iUName && iBuffer->At(iExecutionIndex).iServerName)
-		{
-		ExecuteBufferL ();
-		iExecutionIndex = -1;
-		}
-	_DBG_FILE( "CNSmlDMSettingsAdapter12::AddLeafBufferL(): end" );
-	return;
-	}
-
-//------------------------------------------------------------------------------
-// CNSmlDMSettingsAdapter12::ExecuteBufferL()
-// Adds the Node/Leaf obj to the db
-//------------------------------------------------------------------------------
-void CNSmlDMSettingsAdapter12::ExecuteBufferL()
-	{
-	_DBG_FILE( "CNSmlDMSettingsAdapter12::ExecuteBufferL(): begin" );
-	TBuf8<8> newLUID;
-	TInt rValue;
-	//Buffer is being Executed
-	iBufOn = ETrue;
-
-	// Robustness check for Execution Index
-	if ( iExecutionIndex<0)
-		{
-		return;
-		}
-
-	//Execute BufferL is called from CompleteOutstandingCmdsL only when -
-	//mandatory fields are not set. Dont update Node/Leaf to the db, return a failure
-
-	if ( !iComplete)
-		rValue = CreateNewProfileL (iLUID);
-	else
-		rValue = CSmlDmAdapter::EError;
-
-	iBuffer->At(iExecutionIndex).iExecuted = ETrue;
-
-	if ( rValue != KErrNone)
-		{
-		if ( rValue == KErrNoMemory)
-			{
-			iCallBack->SetStatusL ( iBuffer->At(iExecutionIndex).iDMBuffStatusref, CSmlDmAdapter::ENoMemory);
-			}
-		else
-			if ( rValue == KErrNotSupported)
-				{
-				iCallBack->SetStatusL ( iBuffer->At(iExecutionIndex).iDMBuffStatusref,
-						CSmlDmAdapter::EInvalidObject);
-				}
-			else
-				if ( rValue == KErrInUse)
-					{
-					iCallBack->SetStatusL ( iBuffer->At(iExecutionIndex).iDMBuffStatusref,
-							CSmlDmAdapter::EObjectInUse);
-					}
-				else
-					if ( rValue == KErrDiskFull)
-						{
-						iCallBack->SetStatusL ( iBuffer->At(iExecutionIndex).iDMBuffStatusref,
-								CSmlDmAdapter::EDiskFull);
-						}
-					else
-						{
-						iCallBack->SetStatusL ( iBuffer->At(iExecutionIndex).iDMBuffStatusref,
-								CSmlDmAdapter::EError);
-						}
-		// dont return, UpdateLeafObjectL will update the callback status for leaf Nodes 
-		}
-	else
-		{
-		if ( iLUID >= KMaxDataSyncID)
-			{
-			newLUID.Num ( iLUID - KMaxDataSyncID);
-			}
-		else
-			{
-			newLUID.Num ( iLUID);
-			}
-
-		iCallBack->SetMappingL ( *iBuffer->At(iExecutionIndex).iMappingName, newLUID);
-
-		iCallBack->SetStatusL (iBuffer->At(iExecutionIndex).iDMBuffStatusref, CSmlDmAdapter::EOk);
-		}
-
-	for (TInt val= 0; val < iBuffer->At(iExecutionIndex).iLeafBuf->Count ();val++)
-		{
-		//Update the LUID data in the Leaf structure with the Profile LUID before calling UpdateLeafObj
-		TPtr8 tempLUID(iBuffer->At(iExecutionIndex).iLeafBuf->At(val).iLuid->Des ());
-		tempLUID.Append (newLUID);
-		UpdateLeafObjectL (*iBuffer->At(iExecutionIndex).iLeafBuf->At(val).iUri, *iBuffer->At(iExecutionIndex).iLeafBuf->At(val).iLuid, *iBuffer->At(iExecutionIndex).iLeafBuf->At(val).iData, *iBuffer->At(iExecutionIndex).iMappingName, iBuffer->At(iExecutionIndex).iLeafBuf->At(val).iStatusRef);
-
-		}
-
-	// Delete the dynamically allocated buffers (Node/Leaf obj)
-
-	ClearBuffer ( iBuffer->At(iExecutionIndex).iLeafBuf);
-
-	delete iBuffer->At(iExecutionIndex).iLeafBuf;
-
-	if ( iBuffer->At(iExecutionIndex).iMappingName)
-		{
-		delete iBuffer->At(iExecutionIndex).iMappingName;
-		iBuffer->At(iExecutionIndex).iMappingName = NULL;
-		}
-
-	iBuffer->Delete (iExecutionIndex);
-	iBuffer->Compress ();
-	//Buffer Execution Complete
-	iBufOn = EFalse;
-    _DBG_FILE( "CNSmlDMSettingsAdapter12::ExecuteBufferL(): end" );
-	}
-
-//------------------------------------------------------------------------------
-// TPtrC8 CNSmlDMSettingsAdapter12::ParentURI(const TDesC8& aURI)
-// returns parent uri 
-// Searches till the 2nd "/" is reached
-//------------------------------------------------------------------------------
-TPtrC8 CNSmlDMSettingsAdapter12::ParentURI(const TDesC8& aURI)
-	{
-	_DBG_FILE( "CNSmlDMSettingsAdapter12::ParentURI(): begin" );
-	TInt count;
-	TInt flag = 0;
-	for (count=0; count<=aURI.Length ()-1;count++)
-		{
-
-		if ( aURI[count]=='/')
-			{
-			flag++;
-			if ( flag == KDynNodePosn)   // KDynNodePosn =2 --> DMAcc/DMIDxxx
-				break;
-			}
-		}
-        _DBG_FILE( "CNSmlDMSettingsAdapter12::ParentURI(): end" ); 
-	return aURI.Left (count);
-	}
-
-//-----------------------------------------------------------------------------------------    
-// Clears the elements of the passed in LeafElement Structure
-//-----------------------------------------------------------------------------------------
-void CNSmlDMSettingsAdapter12::ClearBuffer(
-		CArrayFixFlat<TNSmlDMLeafElement>* aBuffer)
-	{
-	_DBG_FILE( "CNSmlDMSettingsAdapter12::ClearBuffer(): begin" );
-	for (TInt i = 0; i < aBuffer->Count (); i++)
-		{
-		delete aBuffer->At(i).iUri;
-		aBuffer->At(i).iUri = NULL;
-
-		delete aBuffer->At(i).iData;
-		aBuffer->At(i).iData = NULL;
-
-		delete aBuffer->At(i).iLuid;
-		aBuffer->At(i).iLuid = NULL;
-		}
-
-	aBuffer->Reset ();
-	_DBG_FILE( "CNSmlDMSettingsAdapter12::ClearBuffer(): end" );
-	}
-
-//--------------------------------------------------------------------
-//TInt CNSmlDMSettingsAdapter::IsDMAccUriFormatMatchPredefined(const TDesC8 & aURI)
-//
-//-------------------------------------------------------------------
-
-
-TBool CNSmlDMSettingsAdapter12::IsDMAccUriFormatMatchPredefined(const TDesC8 & aURI)
-{
-	
-	// include strings for  tree for Bearer , DNS related Dynamic nodes . 
-	
-	if(aURI.Match(_L8("DMAcc/DMId*"))   != KErrNotFound )
-	{
-		return ETrue;
-	}
-	else
-	{
-		return EFalse;
-	}
-	
-	
-}
-
-//--------------------------------------------------------------------
-//TInt CNSmlDMSettingsAdapter::ConstructTreeL(const TDesC8& aURI)
-//
-//-------------------------------------------------------------------
-
-TInt CNSmlDMSettingsAdapter12::ConstructTreeL(const TDesC8& aURI)
-{
-		TInt profileID = KErrNotFound;
-	  if( iSyncSessionOpen == EFalse )
-    {
-    	iSyncSession.OpenL();
-      iSyncSessionOpen = ETrue;
-    }
-    RArray<TSmlProfileId> profileIdArray;
-    CleanupClosePushL( profileIdArray );
-    TSmlUsageType usageType = ESmlDevMan;
-    iSyncSession.ListProfilesL( profileIdArray, usageType );
-	   
-    for( TInt p = 0; p < profileIdArray.Count(); p++ )
-		{
-      TInt ddId = profileIdArray[p] - KMaxDataSyncID;
-           
-		  _LIT8( Kprev, "DMId" );
-		  TBuf8<7> addNAME(Kprev); // DMIdnnn , nnn = profileid
-      TInt fixedProfId = profileIdArray[p] - KMaxDataSyncID; //fit to 3 decimal
-		  addNAME.AppendNumFixedWidth( fixedProfId, EDecimal, 3 ); 
-   		DBG_ARGS8( _S8("notInList: Id = %d Name %S"), p, &addNAME );
-		  // KNSmlDMStart includes start text for URISeg
-			TBuf8<20> addURI; // DMAcc/DMIdnnn , nnn = profileid
-			addURI.Append( KNSmlDMStart );
-			addURI.AppendNumFixedWidth( fixedProfId, EDecimal, 3 ); 
-			TBuf8<3> addLUID;
-	    addLUID.Num( fixedProfId );
-
-			HBufC8* mapInfo = iCallBack->GetLuidAllocL(addURI);
-					
-			if (mapInfo->Length() == 0)
-			{
-				iCallBack->SetMappingL(addURI,addLUID);
-				if( aURI.Find(addURI) >= 0 )
-        { 
-         	profileID = fixedProfId;
-        }
-			}
-			else
-			{
-				delete mapInfo;
-			}
- 		}
-	    	
-    CleanupStack::PopAndDestroy( 1 );//profileIdArray
-    return profileID;
-}
-
-// ========================== OTHER EXPORTED FUNCTIONS =========================
-
-#ifndef IMPLEMENTATION_PROXY_ENTRY
-#define IMPLEMENTATION_PROXY_ENTRY(aUid, aFuncPtr)	{{aUid},(aFuncPtr)}
-#endif
-
-const TImplementationProxy ImplementationTable[] = 
-    {
-		IMPLEMENTATION_PROXY_ENTRY( KNSmlDMSettingsAdapterImplUid, CNSmlDMSettingsAdapter12::NewL )
-    };
-
-
-// -----------------------------------------------------------------------------
-// TImplementationProxy* ImplementationGroupProxy()
-// -----------------------------------------------------------------------------
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy( TInt& aTableCount )
-    {
-	_DBG_FILE( "ImplementationGroupProxy() for CNSmlDMSettingsAdapter: begin" );
-
-    aTableCount = sizeof(ImplementationTable) / sizeof(TImplementationProxy);
-
-	_DBG_FILE( "ImplementationGroupProxy() for CNSmlDMSettingsAdapter: end" );
-    return ImplementationTable;
-	}
-
-//------------------------------------------------------------------------------
-// TPtrC8 CNSmlDMSettingsAdapter12::GetDynamicDMNodeUri( const TDesC8& aURI )
-// returns DM/xxx URI
-//------------------------------------------------------------------------------
-TPtrC8 CNSmlDMSettingsAdapter12::GetDynamicDMNodeUri(const TDesC8& aURI)
-    {    
-    TInt i= 0;
-	TBuf8<50> DmAccRoot(KNSmlDefDMAcc);
-    for ( i = aURI.Find( KNSmlDefDMAcc ) + DmAccRoot.Length() + 1; i < aURI.Length(); i++ )
-        {
-        if( aURI[i] == '/' )
-            {
-            break;
-            }
-        }
-    
-    return aURI.Left( i );
-    }
-// End of File
-
--- a/omadm/omadmextensions/adapters/syncmldm12/src/nsmldmsettingsadapter12.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-CHARACTER_SET UTF8/*
-* 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:    Resource data for Device Management Settings Adapter
-*
-*/
-
-
-
-
-
-#include <registryinfo.rh>
-#include "nsmldmconstants.h"
-
-RESOURCE REGISTRY_INFO theRegistryInfo
-  {
-  dll_uid = 0x10282CE7; //The DLL's 3rd UID.
-  interfaces = 
-      {
-      INTERFACE_INFO
-          {
-          interface_uid = KNSmlDMInterfaceUid; // DM interface UID
-          implementations = 
-            {
-            IMPLEMENTATION_INFO
-                {
-                implementation_uid = 0x10282CE8; // DM interface implementation UID
-                version_no = 1; 
-                display_name = "";
-                default_data = "";
-                opaque_data = "";
-                }
-            };
-          }
-      };
-    }
-
-// End of File
--- a/omadm/omadmextensions/adapters/syncmldm12/tsrc/bwins/syncmldm12testu.def	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	?LibEntryL@@YAPAVCScriptBase@@AAVCTestModuleIf@@@Z @ 1 NONAME ; class CScriptBase * LibEntryL(class CTestModuleIf &)
-
--- a/omadm/omadmextensions/adapters/syncmldm12/tsrc/conf/syncmldm12test.cfg	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,125 +0,0 @@
-[Test]
-title DDF
-create syncmldm12test foobar jee
-foobar DDFStructure
-delete foobar
-[Endtest] 
-
-[Test]
-title StartAtomic
-create syncmldm12test foobar
-foobar StartAtomic
-delete foobar
-[Endtest]
-
-[Test]
-title CommitAtomic
-create syncmldm12test foobar
-foobar CommitAtomic
-delete foobar
-[Endtest]
-
-[Test]
-title RollbackAtomic
-create syncmldm12test foobar
-foobar RollbackAtomic
-delete foobar
-[Endtest]
-
-[Test]
-title AddDmAcc
-create syncmldm12test foobar
-foobar AddNode DMAcc/DMId099
-foobar UpdateLeaf DMAcc/DMId099/Name name99
-foobar UpdateLeaf DMAcc/DMId099/ServerID server99
-foobar UpdateLeaf DMAcc/DMId099/AppAddr/Addr001/Addr http://a.com
-foobar UpdateLeaf DMAcc/DMId099/AppAuth/AppAuthCli/AAuthName user99
-foobar CompleteCommands
-delete foobar
-[Endtest]
-
-[Test]
-title UpdateLeafDmAcc
-create syncmldm12test foobar
-foobar UpdateLeaf DMAcc/DMId099/Name newname99
-delete foobar
-[Endtest]
-
-[Test]
-title FetchNodeDmAcc
-create syncmldm12test foobar
-foobar FetchNode DMAcc/DMId099
-delete foobar
-[Endtest]
-
-[Test]
-title FetchLeafDmAcc
-create syncmldm12test foobar
-foobar FetchLeaf DMAcc/DMId099/Name
-delete foobar
-[Endtest]
-
-[Test]
-title DeleteDmAcc
-create syncmldm12test foobar
-foobar DeleteNode DMAcc/DMId099
-delete foobar
-[Endtest]
-
-[Test]
-title AddDmAccAllInfo
-create syncmldm12test foobar
-foobar AddNode DMAcc/DMId090  	 
-foobar AddNode DMAcc/DMId090/AAuthPref 	 
-foobar AddNode DMAcc/DMId090/AppAddr 	 
-foobar AddNode DMAcc/DMId090/AppAddr/Addr001 	 
-foobar UpdateLeaf DMAcc/DMId090/AppAddr/Addr001/Addr 	https://b.com/abc
-foobar UpdateLeaf DMAcc/DMId090/AppAddr/Addr001/AddrType 	URI
-foobar AddNode DMAcc/DMId090/AppAddr/Addr001/Port 	 
-foobar AddNode DMAcc/DMId090/AppAddr/Addr001/Port/Port001 	 
-foobar UpdateLeaf DMAcc/DMId090/AppAddr/Addr001/Port/Port001/PortNbr 	443
-foobar AddNode DMAcc/DMId090/AppAuth 	 
-foobar AddNode DMAcc/DMId090/AppAuth/AppAuthCli 	 
-foobar AddNode DMAcc/DMId090/AppAuth/AppAuthCli/AAuthData 	 
-foobar UpdateLeaf DMAcc/DMId090/AppAuth/AppAuthCli/AAuthLevel 	CLCRED
-foobar UpdateLeaf DMAcc/DMId090/AppAuth/AppAuthCli/AAuthName 	userx
-foobar AddNode DMAcc/DMId090/AppAuth/AppAuthSrv 	 
-foobar AddNode DMAcc/DMId090/AppAuth/AppAuthSrv/AAuthData 	 
-foobar UpdateLeaf DMAcc/DMId090/AppAuth/AppAuthSrv/AAuthLevel 	SRVCRED
-foobar UpdateLeaf DMAcc/DMId090/AppAuth/AppAuthSrv/AAuthName 	userx
-foobar AddNode DMAcc/DMId090/AppAuth/AppAuthTransport 	 
-foobar AddNode DMAcc/DMId090/AppAuth/AppAuthTransport/AAuthData 	 
-foobar UpdateLeaf DMAcc/DMId090/AppAuth/AppAuthTransport/AAuthLevel 	HTTP
-foobar UpdateLeaf DMAcc/DMId090/AppAuth/AppAuthTransport/AAuthName 		user
-foobar UpdateLeaf DMAcc/DMId090/AppID 	w7
-foobar UpdateLeaf DMAcc/DMId090/Name 	InteliSync
-foobar UpdateLeaf DMAcc/DMId090/PrefConRef 	AP/APId000 
-foobar UpdateLeaf DMAcc/DMId090/ServerID 	userx
-foobar CompleteCommands
-delete foobar
-[Endtest]
-
-[Test]
-title FetchAllLeafDmAcc
-create syncmldm12test foobarfoobar FetchLeaf DMAcc/DMId090/AppAddr/Addr001/Addr
-foobar FetchLeaf DMAcc/DMId090/AppAddr/Addr001/AddrType
-foobar FetchLeaf DMAcc/DMId090/AppAddr/Addr001/Port/Port001/PortNbr
-foobar FetchLeaf DMAcc/DMId090/AppAuth/AppAuthCli/AAuthLevel
-foobar FetchLeaf DMAcc/DMId090/AppAuth/AppAuthCli/AAuthName 
-foobar FetchLeaf DMAcc/DMId090/AppAuth/AppAuthSrv/AAuthLevel
-foobar FetchLeaf DMAcc/DMId090/AppAuth/AppAuthSrv/AAuthName 
-foobar FetchLeaf DMAcc/DMId090/AppAuth/AppAuthTransport/AAuthLevel 
-foobar FetchLeaf DMAcc/DMId090/AppAuth/AppAuthTransport/AAuthName 
-foobar FetchLeaf DMAcc/DMId090/AppID 
-foobar FetchLeaf DMAcc/DMId090/Name 
-foobar FetchLeaf DMAcc/DMId090/PrefConRef 
-foobar FetchLeaf DMAcc/DMId090/ServerID 
-delete foobar
-[Endtest]
-
-[Test]
-title DeleteDmAcc
-create syncmldm12test foobar
-foobar DeleteNode DMAcc/DMId090
-delete foobar
-[Endtest]
--- a/omadm/omadmextensions/adapters/syncmldm12/tsrc/eabi/syncmldm12testu.def	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-EXPORTS
-	_Z9LibEntryLR13CTestModuleIf @ 1 NONAME
-	_ZTI15Csyncmldm12Test @ 2 NONAME ; #<TI>#
-	_ZTI16CTestDmDDFObject @ 3 NONAME ; #<TI>#
-	_ZTI8Cdmatest @ 4 NONAME ; #<TI>#
-	_ZTV15Csyncmldm12Test @ 5 NONAME ; #<VT>#
-	_ZTV16CTestDmDDFObject @ 6 NONAME ; #<VT>#
-	_ZTV8Cdmatest @ 7 NONAME ; #<VT>#
-
--- a/omadm/omadmextensions/adapters/syncmldm12/tsrc/group/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-/*
-* Copyright (c) 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:  Implementation of DM adapter test component
-* 	This is part of omadmextensions/adapter test application.
-*
-*/
-
-
-
-
-
-
-PRJ_PLATFORMS
-// specify the platforms your component needs to be built for here
-// defaults to WINS MARM so you can ignore this if you just build these
-DEFAULT
-
-PRJ_TESTEXPORTS
-// NOTE: If using ARS requirements all export operations should be done under this.
-// 'abld test export'
-
-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
-// Example: 
-
-
-PRJ_TESTMMPFILES
-// NOTE: If using ARS requirements .mmp file operation should be done under this.
-// 'abld test build'
-syncmldm12test.mmp
-
-PRJ_MMPFILES
-// Specify the .mmp files required for building the important component
-// releasables.
-//
-// Specify "tidy" if the component you need to build doesn't need to be
-// released. Specify "ignore" if the MMP file exists but should be
-// ignored.
-// Example:
-
-//  End of File
--- a/omadm/omadmextensions/adapters/syncmldm12/tsrc/group/syncmldm12test.mmp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-/*
-* Copyright (c) 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:  Implementation of DM adapter test component
-* 	This is part of omadmextensions/adapter test application.
-*
-*/
-
-
-
-
-#include <platform_paths.hrh>
-
-TARGET          syncmldm12test.dll
-TARGETTYPE      dll
-UID             0x1000008D 0x101FB3E3
-
-CAPABILITY	ALL -TCB
-/* Remove comments and replace 0x00000000 with correct vendor id */
-// VENDORID 	0x00000000
-
-//TARGETPATH      ?target_path
-DEFFILE         syncmldm12test.def
-
-SOURCEPATH      ../src
-SOURCE          dmatest.cpp
-SOURCE          TestDmDDFObject.cpp
-SOURCE          syncmldm12test.cpp
-SOURCE          syncmldm12testBlocks.cpp
-
-
-USERINCLUDE     ../inc 
-USERINCLUDE		  ../../inc
-
-APP_LAYER_SYSTEMINCLUDE
-SYSTEMINCLUDE   /epoc32/include/ecom
-
-
- 
-
-LIBRARY         apgrfx.lib apmime.lib
-LIBRARY         euser.lib ecom.lib
-LIBRARY         stiftestinterface.lib
-LIBRARY         stiftestengine.lib
-LIBRARY         efsrv.lib
-LIBRARY         estor.lib 
-LIBRARY         SWInstCli.lib
-
-LANG			SC
-
-
-
-SMPSAFE
-// End of File
-
--- a/omadm/omadmextensions/adapters/syncmldm12/tsrc/group/syncmldm12test.pkg	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-;
-; Copyright (c) 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:  Implementation of DM adapter test component
-; 	This is part of omadmextensions/adapter test application.
-;
-
-;*Languages
-&EN
-;
-;*Standard SIS file header. This section specifies the package name,
-;application UID, and version/build numbers. Add the package TYPE here if needed.
-#{"syncmldm12test"},(0x101FB3E8),1,0,1;
-;
-
-;*Unique (Non-Localised) Vendor name
-;This is used in combination with signing to prevent the unauthroized
-;upgrade ofa a package by someone other than the rightful vendor.
-:"Nokia"
-
-;*Localized Vendor Name
-;This specifies the localised vendor name(s) correspodning to language(s).
-%{"Nokia Test EN"}
-
-;*Files To Copy...<src> <destination>
-"\epoc32\release\armv5\urel\syncmldm12test.dll" -"C:\sys\bin\syncmldm12test.dll"
-"..\conf\syncmldm12test.cfg"-"C:\TestFramework\syncmldm12test.cfg"
-"..\init\syncmldm12test.ini"-"C:\TestFramework\syncmldm12test.ini"
--- a/omadm/omadmextensions/adapters/syncmldm12/tsrc/inc/TestDmDDFObject.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,203 +0,0 @@
-/*
-* Copyright (c) 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:  Implementation of DM adapter test component
-* 	This is part of omadmextensions/adapter test application.
-*
-*/
-
-
-
-
-
-
-#ifndef __TESTDMDDFOBJECT_H
-#define __TESTDMDDFOBJECT_H
-
-//  INCLUDES
-//#include <?include_file>
-#include <smldmadapter.h>
-
-// CONSTANTS
-//const ?type ?constant_var = ?constant;
-
-// MACROS
-//#define ?macro ?macro_def
-
-// DATA TYPES
-//enum ?declaration
-//typedef ?declaration
-//extern ?data_type;
-
-// FUNCTION PROTOTYPES
-//?type ?function_name(?arg_list);
-
-// FORWARD DECLARATIONS
-class CStifLogger;
-
-// CLASS DECLARATION
-
-/**
-*  ?one_line_short_description.
-*  ?other_description_lines
-*
-*  @lib ?library
-*  @since Series ?XX ?SeriesXX_version
-*/
-class CTestDmDDFObject : public CBase, public MSmlDmDDFObject
-    {
-    public:  // Constructors and destructor
-        
-        /**
-        * Two-phased constructor.
-        */
-        static CTestDmDDFObject* NewL( CStifLogger *aLog );
-        static CTestDmDDFObject* NewLC( CStifLogger *aLog );
-        
-        /**
-        * Destructor.
-        */
-        virtual ~CTestDmDDFObject();
-
-    public: // New functions
-        
-        /**
-        * ?member_description.
-        * @since Series ?XX ?SeriesXX_version
-        * @param ?arg1 ?description
-        * @return ?description
-        */
-        //?type ?member_function( ?type ?arg1 );
-
-		virtual void SetNameL( const TDesC8& aName );
-		
-		void DumpL( const TDesC8& aParentName, TBool aFullDump = ETrue );
-		void ExternalizeL(RWriteStream& aStream) const;
-		
-		
-
-    public: // Functions from base classes
-    
-//sf-    *********************************
-    
-		void SetAccessTypesL( TSmlDmAccessTypes aAccessTypes );
-		void SetDefaultValueL( const TDesC8& aDefaultValue );
-		void SetDescriptionL( const TDesC8& aDescription );
-		void SetDFFormatL( TDFFormat aFormat );
-		void SetOccurenceL( TOccurence aOccurence );
-		void SetScopeL( TScope aScope );
-		void SetDFTitleL( const TDesC8& aTitle );
-		void AddDFTypeMimeTypeL( const TDesC8& aMimeType );
-		void SetAsObjectGroup();
-		MSmlDmDDFObject& AddChildObjectL(const TDesC8& aNodeName);
-		MSmlDmDDFObject& AddChildObjectGroupL();
-
-//sf-    #############################
-
-		const TDesC8& Name();
-		TSmlDmAccessTypes  AccessTypes();
-		const TDesC8& DefaultValue();
-		const TDesC8& Description();
-		TDFFormat DFFormat();
-		TOccurence Occurence();
-		TScope Scope();
-		const TDesC8& DFTitle();
-		const TDesC8& DFTypeMimeType();
-		TBool ObjectGroup();
-		
-		TInt ChildObjectCount();
-		CTestDmDDFObject& ChildObject( TInt aIndex );
-
-		CTestDmDDFObject* FindChildObject( const TDesC8& aName );
-		TInt SubObjectsCount();
-
-
-    protected:  // New functions
-        
-        /**
-        * ?member_description.
-        * @since Series ?XX ?SeriesXX_version
-        * @param ?arg1 ?description
-        * @return ?description
-        */
-        //?type ?member_function( ?type ?arg1 );
-
-    protected:  // Functions from base classes
-        
-        /**
-        * From ?base_class ?member_description
-        */
-        //?type ?member_function();
-
-    private:
-
-        /**
-        * C++ default constructor.
-        */
-        CTestDmDDFObject( CStifLogger *aLog );
-
-        /**
-        * By default Symbian 2nd phase constructor is private.
-        */
-        void ConstructL();
-
-        // Prohibit copy constructor if not deriving from CBase.
-        // CTestDmDDFObject( const CTestDmDDFObject& );
-        // Prohibit assigment operator if not deriving from CBase.
-        // CTestDmDDFObject& operator=( const CTestDmDDFObject& );
-
-    public:     // Data
-        // ?one_line_short_description_of_data
-        //?data_declaration;
-    
-    protected:  // Data
-        // ?one_line_short_description_of_data
-        //?data_declaration;
-
-    private:    // Data
-        // ?one_line_short_description_of_data
-        //?data_declaration;
-		HBufC8* iName;
-
-		TSmlDmAccessTypes iAccessTypes;
-		HBufC8* iDefaultValue;
-		HBufC8* iDescription;
-		TDFFormat iFormat;
-		TOccurence iOccurence;
-		TScope iScope;
-		HBufC8* iTitle;
-		HBufC8* iMimeType;
-		TBool iObjectGroup;
-		
-		RPointerArray<CTestDmDDFObject> iChildren;
-
-         
-        // Reserved pointer for future extension
-        //TAny* iReserved;
-
-    public:     // Friend classes
-        //?friend_class_declaration;
-    protected:  // Friend classes
-        //?friend_class_declaration;
-    private:    // Friend classes
-        //?friend_class_declaration;
-        /**
-        * Logger.
-        */
-        CStifLogger*    iLog;
-
-    };
-
-#endif      // __TESTDMDDFOBJECT_H
-            
-// End of File
--- a/omadm/omadmextensions/adapters/syncmldm12/tsrc/inc/dmatest.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,277 +0,0 @@
-/*
-* Copyright (c) 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:  Implementation of DM adapter test component
-* 	This is part of omadmextensions/adapter test application.
-*
-*/
-
-
-
-
-
-
-#ifndef __DMA_TEST_H__
-#define __DMA_TEST_H__
-
-//  INCLUDES
-#include <StifLogger.h>
-#include <TestScripterInternal.h>
-#include <StifTestModule.h>
-#include <apmstd.h>
-#include <smldmadapter.h>
-#include "NSmlDMSettingsAdapter12.h"
-
-class Cdmatest;
-
-
-struct TMapping
-	{
-	TBuf8<256> iURI;
-	TBuf8<64> iLuid;
-	TMapping( const TDesC8 &aURI, const TDesC8 &aLuid )  : iURI( aURI ), iLuid( aLuid )
-	{
-		
-		}
-	};
-	
-typedef RArray<TMapping> RMappingArray;
-
-typedef void (Cdmatest::* ResultsFunction)( TInt , CBufBase& , const TDesC8&  ) ; 
-
-
-// CLASS DECLARATION
-
-/**
-*  ?one_line_short_description.
-*  ?other_description_lines
-*
-*  @lib ?library
-*  @since Series ?XX ?SeriesXX_version
-*/
-class Cdmatest : public CScriptBase, public MSmlDmCallback
-    {
-    
-    public:  // Constructors and destructor
-        
-        /**
-        * Destructor.
-        */
-        virtual ~Cdmatest();
-
-    public: // Functions from base classes
-
-        /**
-        * From CScriptBase Runs a script line.
-        * @since ?Series60_version
-        * @param aItem Script line containing method name and parameters
-        * @return Symbian OS error code
-        */
-        virtual TInt RunMethodL( CStifItemParser& aItem ) = 0;
-    
-
-	public:
-		/**
-		The function is used to return the data in case of FetchLeafObjectL(),
-		FetchLeafObjectSizeL() and ChildURIListL() functions. It should not be
-		called where the DM command has failed, i.e. the error code returned in
-		SetStatusL is something other than EOk.
-		@param aResultsRef	Reference to correct command
-		@param aObject		The data which should be returned
-		@param aType			MIME type of the object
-		@publishedPartner
-		@prototype
-		*/
-		void SetResultsL( TInt aResultsRef, CBufBase& aObject,
-								  const TDesC8& aType );
-		
-		/**
-		The function is used to return the data in case of FetchLeafObjectL() and
-		ChildURIListL() functions, where the size of the data being returned is
-		large enough for the Adapter to stream it. This function should not be
-		called when command was failed, i.e. the error code returned in SetStatusL
-		is something other than EOk.
-		@param aResultsRef	Reference to correct command
-		@param aStream		Large data which should be returned, DM engine
-								closes stream when it has read all the data
-		@param aType			MIME type of the object
-		@publishedPartner
-		@prototype
-		*/
-		void SetResultsL( TInt /*aResultsRef*/, RReadStream*& /*aStream*/,
-								  const TDesC8& /*aType*/ ) 
-		{
-			
-		}
-
-		/**
-		The function returns information about the Add,Update,Delete and Fetch
-		commands success to DM engine. The reference to correct command must be
-		used when calling the SetStatusL function, the reference is got from the
-		argument of the command functions. The SetStatusL function must be called
-		separately for every single command.
-		@param aStatusRef	Reference to correct command
-		@param aErrorCode	Information about the command success
-		@publishedPartner
-		@prototype
-		*/
-		void SetStatusL( TInt aStatusRef,
-								 MSmlDmAdapter::TError aErrorCode ) ;
-
-		/**
-		The function passes map information to DM Module. This function is called
-		for a new management object, both for node objects and for leaf objects.
-		In addition if ChildURIListL() function has returned new objects a mapping
-		information of the new objects must be passed. A mapping is treated as
-		inheritable. If the mapping is not set with this function, the mapping
-		LUID of the parent object is passed in following commands to the object.
-		@param aURI	URI of the object. 
-		@param aLUID	LUID of the object. LUID must contain the all information,
-						which is needed for retrieve the invidual object from the
-						database. Typically it is ID for the database table. In
-						more complicated structures it can be combination of IDs,
-						which represent path to the object.
-		@publishedPartner
-		@prototype
-		*/
-		void SetMappingL( const TDesC8& aURI, const TDesC8& aLUID );
-
-		/**
-		The function is used to make a fetch to other adapters. The most common
-		use is to make a fetch to the AP adapter, because when managing the access
-		points, the data comes as URI. For example, there are ToNAPId field in
-		some adapters, and data to it can be something like AP/IAPidx, and then
-		the link to AP adapter is needed.
-		Using FetchLinkL causes the DM Framework to make a Get request to the
-		appropriate DM adapter.  The receiving adapter MUST complete the Get
-		request synchronously.
-		@param aURI		URI of the object. 
-		@param aData		Reference to data, i.e. data is returned here
-		@param aStatus	The status of fetch command is returned here
-		@publishedPartner
-		@prototype
-		*/
-		void FetchLinkL( const TDesC8& /*aURI*/, CBufBase& /*aData*/,
-								 MSmlDmAdapter::TError& /*aStatus*/ ) 
-			{
-				
-			}
-
-		/**
-		The function returns the LUID which is mapped to aURI. If LUID is not
-		found, the function allocates a null length string, i.e. the function
-		allocates memory in every case.
-		@param aURI	URI of the object. 
-		@publishedPartner
-		@prototype
-		*/
-		HBufC8* GetLuidAllocL( const TDesC8& aURI ) ;
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-    
-    void GetMappingInfoListL( const TDesC8& aURI,
-								CArrayFix<TSmlDmMappingInfo>& aSegmentList );
-
-#else
-// nothing
-#endif
-		        
-    protected:  // New functions
-
-        
-		void FetchNodeResultsL( TInt aResultsRef, CBufBase& aObject,
-							  const TDesC8& aType );
-		void SaveDataL( TInt aResultsRef, CBufBase& aObject,
-							  const TDesC8& aType ) ;
-							  
-		TPtrC8 LastURISeg( const TDesC8& aURI );
-		TPtrC8 RemoveLastURISeg( const TDesC8& aURI );
-		TPtrC RemoveLastURISeg( const TDesC& aURI );
-		void SetURIL( const TDesC& aURI );
-		void SetURIL( const TDesC8& aURI );
-		void SetURIL( HBufC8* aURI );		
-		HBufC8 *LoadFileLC( const TDesC &aFileName, TDataType &aType );
-		HBufC8 *LoadFileLC( const TDesC8 &aFileName, TDataType &aType );
-		HBufC8 *GetNextStringLC ( CStifItemParser& aItem, const TDesC &aName );
-		HBufC8* GetLuidAllocLC( const TDesC8& aURI ) ;
-		TPtrC8 RemoveLastSeg(const TDesC8& aURI);
-		
-		TInt FetchNodeL( CStifItemParser& aItem ) ;
-		TInt FetchLeafL( CStifItemParser& aItem ) ;
-		TInt AddNodeL( CStifItemParser& aItem );
-		TInt DeleteObjectL( CStifItemParser& aItem );	
-		TInt UpdateLeafL( CStifItemParser& aItem )	;
-		TInt UpdateLeafDataL( CStifItemParser& aItem ) ;
-		TInt UpdateLeafDataURLL( CStifItemParser& aItem ) ;
-		
-		TInt ExecuteLeafL ( CStifItemParser& aItem ) ;
-		TInt ExecuteLeafDataL ( CStifItemParser& aItem ) ;
-		TInt StartAtomicL( CStifItemParser& aItem )	;
-		TInt CommitAtomicL( CStifItemParser& aItem )	;
-		TInt RollbackAtomicL( CStifItemParser& aItem )	;
-		TInt CompleteCommandsL( CStifItemParser& aItem );
-		TInt DDFStructureL( CStifItemParser& aItem )	;
-//        TInt DeliverL( CStifItemParser& aItem ) ;
-//        TInt DetailsL( CStifItemParser& aItem ) ;
-//		TInt InstallL( CStifItemParser& aItem ) ;
-//		TInt BareInstallL( CStifItemParser& aItem ) ;		
-
-    protected:
-
-        /**
-        * C++ default constructor.
-        */
-        Cdmatest( CTestModuleIf& aTestModuleIf, TUid aUid );
-
-        /**
-        * By default Symbian 2nd phase constructor is private.
-        */
-        void ConstructL();
-
-        // Prohibit copy constructor if not deriving from CBase.
-        // Cdmatest( const Cdmatest& );
-        // Prohibit assigment operator if not deriving from CBase.
-        // Cdmatest& operator=( const Cdmatest& );
-
-		/**
-        * Frees all resources allocated from test methods.
-        * @since ?Series60_version
-        */
-        virtual void Delete();
-        void LoadMappingsL();
-        void SaveMappingsL();
-    public:     // Data
-        // ?one_line_short_description_of_data
-        //?data_declaration;
-    
-    protected:  // Data
-        // ?one_line_short_description_of_data
-        //?data_declaration;
-		MSmlDmAdapter::TError iStatus ;
-        ResultsFunction iResultsFunction;
-        //CSmlDmAdapter *iAdapter ;
-        CNSmlDMSettingsAdapter12 *iAdapter ;
-        HBufC8 *iURI; 
-        CArrayFix<TSmlDmMappingInfo> *iEmptyMappingInfoArray;
-		TFileName iSaveFileName;
-		RMappingArray iMappingTable;
-		TUid iUid;
-		TInt iCounter;
-		//class CNSmlDmMgmtTree* iMgmtTree;
-		class CNSmlDmMgmtTree* iMgmtTree;
-		CNSmlDMSettingsAdapter12 *Adapter() ;
-    };
-
-#endif      // __DMA_TEST_H__
-            
-// End of File
--- a/omadm/omadmextensions/adapters/syncmldm12/tsrc/inc/syncmldm12test.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,133 +0,0 @@
-/*
-* Copyright (c) 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:  Implementation of DM adapter test component
-* 	This is part of omadmextensions/adapter test application.
-*
-*/
-
-
-
-
-
-
-#ifndef TCTEST_H
-#define TCTEST_H
-
-//  INCLUDES
-#include <StifLogger.h>
-#include <TestScripterInternal.h>
-#include <StifTestModule.h>
-#include <smldmadapter.h>
-#include "dmatest.h"
-
-const TUint KNSmlDMSettings12AdapterImplUid = 0x10282CE8;
-	
-
-const TUid KAdapterUid = 
-		{
-		KNSmlDMSettings12AdapterImplUid
-		};
-// Logging path
-_LIT( KamtestLogPath, "\\logs\\testframework\\tctest\\" ); 
-// Log file
-_LIT( KamtestLogFile, "tctest.txt" ); 
-
-
-// FORWARD DECLARATIONS
-class Csyncmldm12Test;
-
-
-// CLASS DECLARATION
-
-/**
-*  Csyncmldm12Test test class for STIF Test Framework TestScripter.
-*  ?other_description_lines
-*
-*  @lib ?library
-*  @since ?Series60_version
-*/
-class Csyncmldm12Test : public Cdmatest
-    {
-    public:  // Constructors and destructor
-        
-        /**
-        * Two-phased constructor.
-        */
-        static Csyncmldm12Test* NewL( CTestModuleIf& aTestModuleIf );
-        
-        /**
-        * Destructor.
-        */
-        virtual ~Csyncmldm12Test();
-
-    public: // Functions from base classes
-
-        /**
-        * From CScriptBase Runs a script line.
-        * @since ?Series60_version
-        * @param aItem Script line containing method name and parameters
-        * @return Symbian OS error code
-        */
-        virtual TInt RunMethodL( CStifItemParser& aItem );
-                
-
-    private:
-
-        /**
-        * C++ default constructor.
-        */
-        Csyncmldm12Test( CTestModuleIf& aTestModuleIf );
-
-        /**
-        * By default Symbian 2nd phase constructor is private.
-        */
-        void ConstructL();
-
-        // Prohibit copy constructor if not deriving from CBase.
-        // ?classname( const ?classname& );
-        // Prohibit assigment operator if not deriving from CBase.
-        // ?classname& operator=( const ?classname& );
-    
-        /**
-        * Frees all resources allocated from test methods.
-        * @since ?Series60_version
-        */
-        virtual void Delete();
-        
-        /**
-        * Test methods are listed below. 
-        */
-        
-        /**
-        * Example test method.
-        * @since ?Series60_version
-        * @param aItem Script line containing parameters.
-        * @return Symbian OS error code.
-        */
-/*        virtual TInt ExampleL( CStifItemParser& aItem ) ;
-        virtual TInt DeliverL( CStifItemParser& aItem ) ;
-        virtual TInt DetailsL( CStifItemParser& aItem ) ;
-		    virtual TInt InstallL( CStifItemParser& aItem ) ;
-		    virtual TInt BareInstallL( CStifItemParser& aItem ) ;*/
-		
-
-    private:    // Data
-        HBufC8 *GetNextStringLC ( CStifItemParser& aItem, const TDesC &aName );
-
-
-    };
-
-#endif      // TCTEST_H
-            
-// End of File
--- a/omadm/omadmextensions/adapters/syncmldm12/tsrc/init/syncmldm12test.ini	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,204 +0,0 @@
-#
-# This is STIF initialization file
-# Comment lines start with '#'-character.
-# See STIF TestFramework users guide.doc for instructions
-
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-# Set following test engine settings:
-#	- Set Test Reporting mode. TestReportMode's possible values are:
-#		+ 'Summary': Summary of the tested test cases.
-#		+ 'Environment': Hardware and software info.
-#		+ 'TestCases': Test case report.
-#		+ 'FullReport': Set of all above ones.
-#		+ Example 'TestReportMode= Summary TestCases'
-#
-# 	- CreateTestReport setting controls report creation mode
-#		+ YES, Test report will created.
-#		+ NO, No Test report.
-#
-# 	- File path indicates the base path of the test report.
-# 	- File name indicates the name of the test report.
-#
-# 	- File format indicates the type of the test report.
-#		+ TXT, Test report file will be txt type, for example 'TestReport.txt'.
-#		+ HTML, Test report will be html type, for example 'TestReport.html'.
-#
-# 	- File output indicates output source of the test report.
-#		+ FILE, Test report logging to file.
-#		+ RDEBUG, Test report logging to using rdebug.
-#
-# 	- File Creation Mode indicates test report overwriting if file exist.
-#		+ OVERWRITE, Overwrites if the Test report file exist.
-#		+ APPEND, Continue logging after the old Test report information if
-#                 report exist.
-# 	- Sets a device reset module's dll name(Reboot).
-#		+ If Nokia specific reset module is not available or it is not correct one
-#		  StifHWResetStub module may use as a template for user specific reset
-#		  module.
-# 	- Sets STIF test measurement disable options. e.g. pluging1 and pluging2 disablation
-#		DisableMeasurement= stifmeasurementplugin01 stifmeasurementplugin02
-#
-
-[Engine_Defaults]
-
-TestReportMode= FullReport    # Possible values are: 'Empty', 'Summary', 'Environment',
-                                                     'TestCases' or 'FullReport'
-
-CreateTestReport= YES         # Possible values: YES or NO
-
-TestReportFilePath= C:\LOGS\TestFramework\
-TestReportFileName= TestReport
-
-TestReportFormat= TXT         # Possible values: TXT or HTML
-TestReportOutput= FILE        # Possible values: FILE or RDEBUG
-TestReportFileCreationMode= OVERWRITE # Possible values: OVERWRITE or APPEND
-
-DeviceResetDllName= StifResetForNokia.dll # e.g. 'StifHWResetStub.dll' for user specific reseting
-
-DisableMeasurement= stifmeasurementdisablenone  # Possible values are:
-              # 'stifmeasurementdisablenone', 'stifmeasurementdisableall'
-              # 'stifmeasurementplugin01', 'stifmeasurementplugin02',
-              # 'stifmeasurementplugin03', 'stifmeasurementplugin04',
-              # 'stifmeasurementplugin05' or 'stifbappeaprofiler'
-
-Timeout= 0                    # Default timeout value for each test case. In milliseconds
-#UITestingSupport= YES        # Possible values: YES or NO
-#SeparateProcesses= YES       # Possible values: YES or NO (default: NO)
-[End_Defaults]
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-
-
-
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-# Module configurations start
-# Modules are added between module tags
-# tags. Module name is specified after ModuleName= tag, like
-# ModuleName= XXXXXXXXX
-# Modules might have initialisation file, specified as
-# IniFile= c:\testframework\YYYYYY
-# Modules might have several configuration files, like
-# TestCaseFile= c:\testframework\NormalCases.txt
-# TestCaseFile= c:\testframework\SmokeCases.txt
-# TestCaseFile= c:\testframework\ManualCases.txt
-
-# (TestCaseFile is synonym for old term ConfigFile)
-
-# Following case specifies demo module settings. Demo module
-# does not read any settings from file, so tags 
-# IniFile and TestCaseFile are not used.
-# In the simplest case it is enough to specify only the
-# name of the test module when adding new test module
-
-#[New_Module]
-#ModuleName= demomodule
-#[End_Module]
-
-
-[New_Module]
-ModuleName= testscripter
-#DM
-TestCaseFile= c:\testframework\syncmldm12test.cfg
-[End_Module]
-
-
-# Load testmoduleXXX, optionally with initialization file and/or test case files
-#[New_Module]
-#ModuleName= testmodulexxx
-
-#TestModuleXXX used initialization file
-#IniFile= c:\testframework\init.txt
-
-#TestModuleXXX used configuration file(s)
-#TestCaseFile= c:\testframework\testcases1.cfg
-#TestCaseFile= c:\testframework\testcases2.cfg
-#TestCaseFile= c:\testframework\manualtestcases.cfg
-
-#[End_Module]
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-
-
-
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-# Set STIF logging overwrite parameters for Logger.
-# 	Hardware and emulator environment logging path and styles can
-# 	be configured from here to overwrite the Logger's implemented values.
-#	
-#	Settings description:
-#	- Indicates option for creation log directory/directories. If log directory/directories
-#         is/are not created by user they will make by software.
-#		+ YES, Create log directory/directories if not allready exist.
-#		+ NO, Log directory/directories not created. Only created one is used.
-#
-#	- Overwrite emulator path setting.
-#		+ Example: If 'EmulatorBasePath= C:\LOGS\TestFramework\' and in code is defined 
-#		           Logger's path 'D:\\LOGS\\Module\\' with those definition the path
-#		           will be 'C:\LOGS\TestFramework\LOGS\Module\'
-#
-#	- Overwrite emulator's logging format.
-#		+ TXT, Log file(s) will be txt type(s), for example 'Module.txt'.
-#		+ HTML, Log file(s) will be html type(s), for example 'Module.html'.
-#
-#	- Overwrited emulator logging output source.
-#		+ FILE, Logging to file(s).
-#		+ RDEBUG, Logging to using rdebug(s).
-#
-#	- Overwrite hardware path setting (Same description as above in emulator path).
-#	- Overwrite hardware's logging format(Same description as above in emulator format).
-#	- Overwrite hardware's logging output source(Same description as above in emulator output).
-#
-#	- File Creation Mode indicates file overwriting if file exist.
-#		+ OVERWRITE, Overwrites if file(s) exist.
-#		+ APPEND, Continue logging after the old logging information if file(s) exist.
-#
-#	- Will thread id include to the log filename.
-#		+ YES, Thread id to log file(s) name, Example filename 'Module_b9.txt'.
-#		+ NO, No thread id to log file(s), Example filename 'Module.txt'.
-#
-#	- Will time stamps include the to log file.
-#		+ YES, Time stamp added to each line in log file(s). Time stamp is 
-#                 for example'12.Nov.2003 115958    LOGGING INFO'
-#		+ NO, No time stamp(s).
-#
-#	- Will line breaks include to the log file.
-#		+ YES, Each logging event includes line break and next log event is in own line.
-#		+ NO, No line break(s).
-#
-#	- Will event ranking include to the log file.
-#		+ YES, Event ranking number added to each line in log file(s). Ranking number
-#                 depends on environment's tics, for example(includes time stamp also)
-#                 '012   12.Nov.2003 115958    LOGGING INFO'
-#		+ NO, No event ranking.
-#
-#	- Will write log file in unicode format.
-#		+ YES, Log file will be written in unicode format
-#		+ NO, Log will be written as normal, not unicode, file.
-#
-
-[Logger_Defaults]
-
-#NOTE: If you want to set Logger using next setting(s) remove comment(s)'#'
-#NOTE: TestEngine and TestServer logging settings cannot change here
-
-#CreateLogDirectories= YES    # Possible values: YES or NO
-
-#EmulatorBasePath= C:\LOGS\TestFramework\
-#EmulatorFormat= HTML         # Possible values: TXT or HTML
-#EmulatorOutput= FILE         # Possible values: FILE or RDEBUG
-
-#HardwareBasePath= D:\LOGS\TestFramework\
-#HardwareFormat= HTML         # Possible values: TXT or HTML
-#HardwareOutput= FILE         # Possible values: FILE or RDEBUG
-
-#FileCreationMode= OVERWRITE  # Possible values: OVERWRITE or APPEND
-
-#ThreadIdToLogFile= YES       # Possible values: YES or NO
-#WithTimeStamp= YES           # Possible values: YES or NO
-#WithLineBreak= YES           # Possible values: YES or NO
-#WithEventRanking= YES        # Possible values: YES or NO
-
-#FileUnicode= YES             # Possible values: YES or NO
-#AddTestCaseTitle= YES        # Possible values: YES or NO
-[End_Logger_Defaults]
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-
-# End of file
--- a/omadm/omadmextensions/adapters/syncmldm12/tsrc/src/TestDmDDFObject.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,516 +0,0 @@
-/*
-* Copyright (c) 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:  Implementation of DM adapter test component
-* 	This is part of omadmextensions/adapter test application.
-*
-*/
-
-
-
-
-
-
-// INCLUDE FILES
-
-#include "TestDmDDFObject.h"
-#include "StifLogger.h"
-
-// EXTERNAL DATA STRUCTURES
-//extern  ?external_data;
-
-// EXTERNAL FUNCTION PROTOTYPES  
-//extern ?external_function( ?arg_type,?arg_type );
-
-// CONSTANTS
-//const ?type ?constant_var = ?constant;
-
-// MACROS
-//#define ?macro ?macro_def
-
-// LOCAL CONSTANTS AND MACROS
-//const ?type ?constant_var = ?constant;
-//#define ?macro_name ?macro_def
-
-// MODULE DATA STRUCTURES
-//enum ?declaration
-//typedef ?declaration
-
-// LOCAL FUNCTION PROTOTYPES
-//?type ?function_name( ?arg_type, ?arg_type );
-
-// FORWARD DECLARATIONS
-//class ?FORWARD_CLASSNAME;
-
-// ============================= LOCAL FUNCTIONS ===============================
-
-
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CTestDmDDFObject::CTestDmDDFObject
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CTestDmDDFObject::CTestDmDDFObject( CStifLogger *aLog )
-	: iName( 0 )
-	, iAccessTypes()
-	, iDefaultValue( 0 )
-	, iDescription( 0 )
-	, iFormat( (TDFFormat)0 )
-	, iOccurence( (TOccurence)0 )
-	, iScope( (TScope)0 )
-	, iTitle ( 0 )
-	, iMimeType( 0 )
-	, iObjectGroup( EFalse )
-	, iLog( aLog )
-//	RPointerArray<CTestDmDDFObject> iChildren;
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// CTestDmDDFObject::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CTestDmDDFObject::ConstructL()
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// CTestDmDDFObject::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CTestDmDDFObject* CTestDmDDFObject::NewL( CStifLogger *aLog )
-    {
-    CTestDmDDFObject* self = CTestDmDDFObject::NewLC( aLog );
-    CleanupStack::Pop( self );
-
-    return self;
-    }
-
-CTestDmDDFObject* CTestDmDDFObject::NewLC( CStifLogger *aLog )
-    {
-    CTestDmDDFObject* self = new( ELeave ) CTestDmDDFObject( aLog );
-    
-    CleanupStack::PushL( self );
-    self->ConstructL();
-
-    return self;
-    }
-
-    
-// Destructor
-CTestDmDDFObject::~CTestDmDDFObject()
-    {
-	delete iName;
-	delete iDefaultValue;
-	delete iDescription;
-	delete iTitle;
-	delete iMimeType;
-	iChildren.ResetAndDestroy();
-    }
-
-
-// -----------------------------------------------------------------------------
-// CTestDmDDFObject::?member_function
-// ?implementation_description
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-/*?type CTestDmDDFObject::?member_function(
-    ?arg_type arg,
-    ?arg_type arg )
-    {
-    
-    ?code
-    
-    }
-*/
-
-void CTestDmDDFObject::SetAccessTypesL( TSmlDmAccessTypes aAccessTypes )
-	{
-	iLog->Log( _L8( "SetAccessTypesL, aAccessTypes=%d" ), aAccessTypes.GetACL() );
-	iAccessTypes = aAccessTypes;
-	}
-
-void CTestDmDDFObject::SetDefaultValueL( const TDesC8& aDefaultValue )
-	{
-	iLog->Log( _L8( "SetDefaultValueL, aDefaultValue='%S'" ), &aDefaultValue );
-	delete iDefaultValue;
-	iDefaultValue = 0;
-	iDefaultValue = aDefaultValue.AllocL();
-	}
-
-void CTestDmDDFObject::SetDescriptionL( const TDesC8& aDescription )
-	{
-	iLog->Log( _L8( "SetDescriptionL, aDescription='%S'" ), &aDescription );
-	delete iDescription;
-	iDescription = 0;
-	iDescription = aDescription.AllocL();
-	}
-	
-void CTestDmDDFObject::SetDFFormatL( TDFFormat aFormat )
-	{
-	iLog->Log( _L8( "SetDFFormatL, aFormat=%d" ), aFormat );
-	iFormat = aFormat;
-	}
-	
-void CTestDmDDFObject::SetOccurenceL( TOccurence aOccurence )
-	{
-	iLog->Log( _L8( "SetOccurenceL, aOccurence=%d" ), aOccurence );
-	iOccurence = aOccurence;
-	}
-	
-void CTestDmDDFObject::SetScopeL( TScope aScope )
-	{
-	iLog->Log( _L8( "SetScopeL, aScope=%d" ), aScope );
-	iScope = aScope;
-	}
-	
-void CTestDmDDFObject::SetDFTitleL( const TDesC8& aTitle )
-	{
-	iLog->Log( _L8( "SetDFTitleL, aTitle='%S'" ), &aTitle );
-	delete iTitle;
-	iTitle = 0;
-	iTitle = aTitle.AllocL();
-	}
-	
-void CTestDmDDFObject::AddDFTypeMimeTypeL( const TDesC8& aMimeType )
-	{
-	iLog->Log( _L8( "AddDFTypeMimeTypeL, aMimeType='%S'" ), &aMimeType );
-	delete iMimeType;
-	iMimeType = 0;
-	iMimeType = aMimeType.AllocL();
-	}
-	
-void CTestDmDDFObject::SetAsObjectGroup()
-	{
-	iLog->Log( _L8( "SetAsObjectGroup, true" ) );
-	iObjectGroup = ETrue;
-	}
-	
-MSmlDmDDFObject& CTestDmDDFObject::AddChildObjectL(const TDesC8& aNodeName)
-	{
-	iLog->Log( _L8( "AddChildObjectL, aNodeName='%S'" ), &aNodeName );
-	CTestDmDDFObject* child = CTestDmDDFObject::NewLC( iLog ); //, aNodeName );
-	child->SetNameL( aNodeName );
-	iChildren.AppendL( child );
-	CleanupStack::Pop( child ); // Don't destroy
-	return *child;
-	}
-
-MSmlDmDDFObject& CTestDmDDFObject::AddChildObjectGroupL()
-	{
-	iLog->Log( _L8( "AddChildObjectGroupL, ''" ) );
-	CTestDmDDFObject* child = CTestDmDDFObject::NewLC( iLog ); //, KNullDesC );
-	child->SetAsObjectGroup();
-	iChildren.AppendL( child );
-	CleanupStack::Pop( child ); // Don't destroy
-	return *child;
-	}
-
-// Own functions
-
-void CTestDmDDFObject::SetNameL( const TDesC8& aName )
-	{
-	delete iName;
-	iName = 0;
-	iName = aName.AllocL();
-	}
-
-void CTestDmDDFObject::DumpL( const TDesC8& aParentName, TBool aFullDump )
-	{
-	TPtrC8 name( _L8("<X>") );
-	if (iName && iName->Length() > 0)
-		{
-		name.Set( *iName );
-		}
-
-	HBufC8* fullName = HBufC8::NewLC( aParentName.Length() + name.Length() + 1 );
-	*fullName = aParentName;
-	if (aParentName.Length() > 0 && aParentName[ aParentName.Length() - 1 ] != '/')
-		{
-		fullName->Des().Append( _L8("/"));
-		}
-	fullName->Des().Append( name );
-
-	/* Translate some members to text for dumping */
-	TBuf8<20> strAccessTypes;
-	TUint8 accessTypes = iAccessTypes.GetACL();
-	if ((accessTypes & iAccessTypes.EAccessType_Add) != 0)
-		{
-		strAccessTypes.Append( _L8("A") );
-		}
-	if ((accessTypes & iAccessTypes.EAccessType_Copy) != 0)
-		{
-		strAccessTypes.Append( _L8("C") );
-		}
-	if ((accessTypes & iAccessTypes.EAccessType_Delete) != 0)
-		{
-		strAccessTypes.Append( _L8("D") );
-		}
-	if ((accessTypes & iAccessTypes.EAccessType_Exec) != 0)
-		{
-		strAccessTypes.Append( _L8("E") );
-		}
-	if ((accessTypes & iAccessTypes.EAccessType_Get) != 0)
-		{
-		strAccessTypes.Append( _L8("G") );
-		}
-	if ((accessTypes & iAccessTypes.EAccessType_Replace) != 0)
-		{
-		strAccessTypes.Append( _L8("R") );
-		}
-	
-	TBuf8<20> strFormat;
-	switch( iFormat )
-		{
-	case EB64:
-		strFormat = _L8("Base64");
-		break;
-	case EBool:
-		strFormat = _L8("Bool");
-		break;
-	case EChr:
-		strFormat = _L8("Chr");
-		break;
-	case EInt:
-		strFormat = _L8("Int");
-		break;
-	case ENode:
-		strFormat = _L8("Node");
-		break;
-	case ENull:
-		strFormat = _L8("Null");
-		break;
-	case EXml:
-		strFormat = _L8("Xml");
-		break;
-	case EBin:
-		strFormat = _L8("Bin");
-		break;
-	default:
-		break;
-		}
-
-
-	TBuf8<20> strOccurence;
-	switch( iOccurence )
-		{
-	case EOne:
-		/** The node appears exactly once */
-		strOccurence = _L8("M:1");
-		break;
-	case EZeroOrOne:
-		/** The node is optional and may appear zero or once */
-		strOccurence = _L8("O:0-1");
-		break;
-	case EZeroOrMore:
-		/** The node is optional and may appear zero or more times */
-		strOccurence = _L8("O:0-*");
-		break;
-	case EOneOrMore:
-		/** The node is mandatory and may appear once or more times */
-		strOccurence = _L8("M:1-*");
-		break;
-	case EZeroOrN:
-		/** The node is optional and may appear between once and 'N' times */
-		strOccurence = _L8("O:1-N");
-		break;
-	case EOneOrN:
-		/** The node is mandatory and may appear between once and 'N' times */
-		strOccurence = _L8("M:1-N");
-		break;
-	default:
-		break;
-		}
-	
-	
-	TBuf8<20> strScope;
-	switch( iScope)
-		{
-	case EPermanent:
-		/** The node appears exactly once */
-		strScope = _L8("Permanent");
-		break;
-	case EDynamic:
-		/** The node is optional and may appear zero or once */
-		strScope = _L8("O:Dynamic");
-		break;
-	default:
-		break;
-		}
-
-	
-	/* Dump main data */
-	if (aFullDump)
-		{
-		iLog->Log( _L8( "DDFObject: '%S'" ), fullName );
-		}
-		else
-		{
-		iLog->Log( _L8( "DDFObject: '%S'   (%S), %S, %S, %S" ),
-					fullName, &strAccessTypes, &strFormat, &strOccurence, &strScope );
-		}
-	
-	/* Dump members */
-	if (aFullDump)
-		{
-		TPtrC8 empty( _L8( "<null>" ) );
-		#define CHK_NULL(a) ((a)==0?(TDesC8*)(&empty):(TDesC8*)(a))
-
-		iLog->Log( _L8( "    iName=='%S'" ), iName );
-		iLog->Log( _L8( "    iAccessTypes=%d (%S)" ), iAccessTypes.GetACL(), &strAccessTypes );
-		iLog->Log( _L8( "    iDefaultValue='%S'" ), CHK_NULL(iDefaultValue));
-		iLog->Log( _L8( "    iDescription='%S'" ), CHK_NULL(iDescription ));
-		iLog->Log( _L8( "    iFormat=%d (%S)" ), iFormat, &strFormat );
-		iLog->Log( _L8( "    iOccurence=%d (%S)" ), iOccurence, &strOccurence );
-		iLog->Log( _L8( "    iScope=%d (%S)" ), iScope, &strScope );
-		iLog->Log( _L8( "    iTitle='%S'" ), CHK_NULL(iTitle ));
-		iLog->Log( _L8( "    iMimeType='%S'" ), CHK_NULL(iMimeType ));
-		iLog->Log( _L8( "----------------------------------" ) );
-		}
-	
-	/* Dump children */
-	for (TInt i = 0 ; i < iChildren.Count() ; i++)
-		{
-		iChildren[i]->DumpL( *fullName, aFullDump );
-		}
-
-	CleanupStack::PopAndDestroy( fullName );
-	}
-
-/*
-void CTestDmDDFObject::ExternalizeL(RWriteStream& aStream) const
-	{
-	X;
-	aStream << *iName << eol;
-	}
-*/
-
-const TDesC8& CTestDmDDFObject::Name()
-	{
-	return (iName != 0) ? *iName : KNullDesC8();
-	}
-
-TSmlDmAccessTypes  CTestDmDDFObject::AccessTypes()
-	{
-	return iAccessTypes;
-	}
-
-const TDesC8& CTestDmDDFObject::DefaultValue()
-	{
-	return (iDefaultValue != 0) ? *iDefaultValue : KNullDesC8();
-	}
-
-const TDesC8& CTestDmDDFObject::Description()
-	{
-	return (iDescription != 0) ? *iDescription : KNullDesC8();
-	}
-
-CTestDmDDFObject::TDFFormat CTestDmDDFObject::DFFormat()
-	{
-	return iFormat;
-	}
-
-CTestDmDDFObject::TOccurence CTestDmDDFObject::Occurence()
-	{
-	return iOccurence;
-	}
-
-CTestDmDDFObject::TScope CTestDmDDFObject::Scope()
-	{
-	return iScope;
-	}
-
-const TDesC8& CTestDmDDFObject::DFTitle()
-	{
-	return (iTitle != 0) ? *iTitle : KNullDesC8();
-	}
-
-const TDesC8& CTestDmDDFObject::DFTypeMimeType()
-	{
-	return (iMimeType != 0) ? *iMimeType : KNullDesC8();
-	}
-
-TBool CTestDmDDFObject::ObjectGroup()
-	{
-	return iObjectGroup;
-	}
-
-TInt CTestDmDDFObject::ChildObjectCount()
-	{
-	return iChildren.Count();
-	}
-
-CTestDmDDFObject& CTestDmDDFObject::ChildObject( TInt aIndex )
-	{
-	return *iChildren[aIndex];
-	}
-
-CTestDmDDFObject* CTestDmDDFObject::FindChildObject( const TDesC8& aName )
-	{
-	CTestDmDDFObject* foundObject = 0;
-
-	for (TInt i = 0 ; i < iChildren.Count() ; i++)
-		{
-		if ( aName.CompareC( iChildren[i]->Name() ) == 0 )
-			{
-			foundObject = iChildren[i];
-			break;
-			}
-		}
-
-	return foundObject;
-	}
-
-TInt CTestDmDDFObject::SubObjectsCount()
-	{
-	TInt count = 0;
-
-	TInt i;
-	for (i = 0 ; i < iChildren.Count() ; i++)
-		{
-		count += iChildren[i]->SubObjectsCount();
-		}
-	count += i;
-
-	return count;
-	}
-
-/*
-// ========================== OTHER EXPORTED FUNCTIONS =========================
-
-// -----------------------------------------------------------------------------
-// ?function_name implements...
-// ?implementation_description.
-// Returns: ?value_1: ?description
-//          ?value_n: ?description
-//                    ?description
-// -----------------------------------------------------------------------------
-//
-?type  ?function_name(
-    ?arg_type arg,  // ?description
-    ?arg_type arg )  // ?description
-    {
-
-    ?code
-
-    }
-*/
-//  End of File  
--- a/omadm/omadmextensions/adapters/syncmldm12/tsrc/src/dmatest.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,954 +0,0 @@
-/*
-* Copyright (c) 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:  Implementation of DM adapter test component
-* 	This is part of omadmextensions/adapter test application.
-*
-*/
-
-
-
-
-
-
-// INCLUDE FILES
-#include "dmatest.h"
-
-#include <StifParser.h>
-#include <Stiftestinterface.h>
-#include <S32FILE.H>
-#include <s32mem.h>
-#include <apgcli.h>
-#include <e32svr.h>
-#include <e32math.h>
-#include <f32file.h>
-#include <swinstapi.h>
-
-#include "TestDmDDFObject.h"
-
-_LIT8( KEmptyType, "" );
-_LIT8( KDefaultType, "text/plain" );
-_LIT( KMappingTableFile, "\\dmtestmappings.txt" );
-//_LIT8( KNSmlDMSeparator8, "/" );
-//const TUint8 KNSmlDMUriSeparator = 0x2f; //forward slash
-
-#define LEAVE_IF_ERROR(x,msg) \
-	{ TInt __xres = (x); if ( __xres < 0 ) { if ( iLog ) iLog->Log( (msg), __xres ); User::Leave( __xres );	} }
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// Cdmatest::Cdmatest
-// C++ default constructor can NOT contain any code, that
-// leave.
-// -----------------------------------------------------------------------------
-//
-Cdmatest::Cdmatest(CTestModuleIf& aTestModuleIf, TUid aUid ):
-        CScriptBase( aTestModuleIf ), iMappingTable(2), iUid( aUid )
-    {
-    
-    }
-
-// -----------------------------------------------------------------------------
-// Cdmatest::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void Cdmatest::ConstructL()
-    {    
-    Adapter();
-	iEmptyMappingInfoArray = new ( ELeave ) CArrayFixFlat<TSmlDmMappingInfo>(1);
-	
-	TRAPD( err, LoadMappingsL() );
-	if (err != KErrEof && err != KErrNone && err != KErrNotFound)
-		{
-		User::Leave( err );
-		}
-    }
-    
-CNSmlDMSettingsAdapter12 *Cdmatest::Adapter()  
-	{
-	if ( iAdapter == NULL )
-		{
-		if ( iLog )
-			{
-			iLog->Log( _L( "Loading Adapter" ) );
-			}
-  		
-  		TRAPD( err, iAdapter = (CNSmlDMSettingsAdapter12*) CSmlDmAdapter::NewL( iUid,*this ) );
-	if ( err == KErrNone )
-		{
-		if (iLog )
-			{
-			iLog->Log( _L( "Loaded" ) );	
-			}
-		}
-	else
-		{
-		if (iLog)
-			{
-			iLog->Log( _L( "Failed to load adapter: %d" ), err );
-			}
-		}
-		}
-	return iAdapter;
-	}
-    
-    
-void Cdmatest::LoadMappingsL()
-	{
-	TDataType type; 
-	HBufC8 *data = LoadFileLC( KMappingTableFile,  type );
-	RDesReadStream buf( *data );
-	CleanupClosePushL( buf );
-
-	TInt len( data->Length() );
-	while (buf.Source()->TellL( MStreamBuf::ERead ).Offset() < len)
-		{
-		TUint32 val = buf.ReadUint32L();
-		TBuf8<256> uri;
-		TBuf8<64> luid;
-		buf.ReadL(uri, val);
-		val = buf.ReadUint32L();
-		buf.ReadL(luid, val);
-		TMapping m( uri, luid ) ;
-		TInt err( iMappingTable.Append( m )	);
-		if ( err == KErrNone )
-			{
-			iLog->Log( _L8( "Loaded mapping: '%S' : '%S'"), &m.iURI, &m.iLuid );
-			}
-		else
-			{
-			iLog->Log( _L8( "FAILED TO Load mapping: '%d' "), err );
-			}
-		}
-	CleanupStack::PopAndDestroy( &buf); // buf
-	CleanupStack::PopAndDestroy( data ); // data
-	}
-    	
-	
-
-void Cdmatest::SaveMappingsL()
-    {
-	TInt c( iMappingTable.Count() );
-	if ( c > 0 )
-	{
-    	RFs fs;
-    	User::LeaveIfError( fs.Connect() );
-    	CleanupClosePushL( fs );
-    	RFileWriteStream buf;
-    	User::LeaveIfError( buf.Replace( fs, KMappingTableFile, EFileWrite ) );
-    	CleanupClosePushL( buf );
-		
-		TInt i( 0 ) ;
-		do 
-			{
-			buf.WriteUint32L( iMappingTable[i].iURI.Length() );
-			buf.WriteL( iMappingTable[i].iURI );
-			buf.WriteUint32L( iMappingTable[i].iLuid.Length() );
-			buf.WriteL( iMappingTable[i].iLuid );
-			}
-		while ( ++i < c )	;
-		buf.CommitL();
-		buf.Close();
-	
-		CleanupStack::PopAndDestroy(); // buf
-		CleanupStack::PopAndDestroy(); // fs
-		}
-    }
-    	
-    
-// Destructor
-Cdmatest::~Cdmatest()
-    {
-    // Delete resources allocated from test methods
-    TRAPD(err, SaveMappingsL() );
-    if ( err != KErrNone )
-    	{
-    	if(iLog)
-    			iLog->Log( _L8( "Failed to save mappings!: %d"), err );
-    	}
-    Delete();
-    
-    // Delete logger
-    delete iLog;  
-    delete iEmptyMappingInfoArray;
-    delete iAdapter;
-    delete iURI;
-    iMappingTable.Reset();
-    REComSession::FinalClose();
-    }
-
-
-// -----------------------------------------------------------------------------
-// Camatest::Delete
-// Delete here all resources allocated and opened from test methods. 
-// Called from destructor. 
-// -----------------------------------------------------------------------------
-//
-void Cdmatest::Delete() 
-    {
-    
-    }
-
-// -----------------------------------------------------------------------------
-// Cdmatest::?member_function
-// ?implementation_description
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-
-
-        
-HBufC8 *Cdmatest::GetNextStringLC ( CStifItemParser& aItem, const TDesC &aName )
-	{
-	TPtrC nodename( KNullDesC );
-
-    TInt i( aItem.GetNextString ( nodename ) );
-    if ( i != KErrNone ) 
-	    {
-	    iLog->Log( _L( "ERROR Reading '%S' argument: 0x%X" ), &aName, i );
-	    }
-	else
-		{
-		iLog->Log( _L("%S: %S"), &aName, &nodename);
-		}
-	
-	HBufC8 *buf = HBufC8::NewLC( nodename.Length() ) ;
-	buf->Des().Copy( nodename );
-	return buf;
-	}
-	
-TInt Cdmatest::FetchNodeL( CStifItemParser& aItem )	
-	{
-
-    TInt ret( KErrNone );
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("Cdmatest"), _L("FetchNodeL") );
-
-	iResultsFunction = FetchNodeResultsL;
-	
-    TPtrC8 nodename( GetNextStringLC( aItem, _L(" nodename" ) )->Des() ) ;
-		
-	SetURIL(nodename) ;//
-	HBufC8 *luid = GetLuidAllocLC( *iURI );
-
-	Adapter()->ChildURIListL( *iURI, *luid, *iEmptyMappingInfoArray, 4, 5) ;
-
-	if ( iStatus == MSmlDmAdapter::EOk )
-		{
-		}
-	else
-		{
-		iLog->Log( _L("FetchNodeL: ChildUriList Error ! %d" ), iStatus );	
-		ret = KErrGeneral ;
-		}
-	CleanupStack::PopAndDestroy( luid ) ; 
-	CleanupStack::PopAndDestroy() ; // nodename
-	iLog->Log( _L("FetchNodeL: Test Complete with status %d" ), ret );	
-
-    return ret;
-	}
-	
-TInt Cdmatest::StartAtomicL( CStifItemParser& /*aItem*/ )	
-	{
-	TRAPD( err, Adapter()->StartAtomicL() ) ;
-	iLog->Log( _L("StartAtomicL: Atomic started resulting error %d" ), err );	
-    return err;
-	}
-
-TInt Cdmatest::RollbackAtomicL( CStifItemParser& /*aItem*/ )	
-	{
-	TRAPD( err, Adapter()->RollbackAtomicL() ) ;
-	iLog->Log( _L("RollbackAtomicL: Atomic rolled back resulting error %d" ), err );	
-    return err;
-	}
-	
-TInt Cdmatest::CommitAtomicL( CStifItemParser& /*aItem*/ )	
-	{
-	TRAPD( err, Adapter()->CommitAtomicL() ) ;
-	iLog->Log( _L("RollbackAtomicL: Atomic commited resulting error %d" ), err );	
-    return err;
-	}
-	
-
-TInt Cdmatest::DDFStructureL( CStifItemParser& /*aItem*/ )	
-	{
-	CTestDmDDFObject* ddfRoot = CTestDmDDFObject::NewLC( iLog ); //, aNodeName );
-
-	TRAPD( err, iAdapter->DDFStructureL( *ddfRoot ) ) ;
-	CleanupStack::PopAndDestroy( ddfRoot );
-	iLog->Log( _L("DDFStructureL: method called resulting error %d" ), err );	
-    return err;
-	}
-		
-		
-TInt Cdmatest::AddNodeL( CStifItemParser& aItem )	
-	{
-
-    TInt ret( KErrNone );
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("Cdmatest"), _L("AddNodeL") );
-
-    
-    TPtrC8 nodename( GetNextStringLC ( aItem, _L("nodename" ) )->Des() ) ;
-    SetURIL( nodename );
-
-	Adapter()->AddNodeObjectL( *iURI, KEmptyType, 8 ) ;
-	
-	if ( iStatus == MSmlDmAdapter::EOk )
-		{
-		iLog->Log( _L("AddNodeL: AddNodeObjectL Successful! %d" ), iStatus );	
-		}
-	else
-		{
-		iLog->Log( _L("AddNodeL: AddNodeObjectL Error ! %d" ), iStatus );	
-		ret = KErrGeneral ;
-		}
-		
-	CleanupStack::PopAndDestroy() ; // nodename
-	iLog->Log( _L("AddNodeL Test Complete with status %d" ), ret );	
-
-    return ret;
-	}	
-		
-TInt Cdmatest::UpdateLeafL( CStifItemParser& aItem )	
-	{
-
-    TInt ret( KErrNone );
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("Cdmatest"), _L("UpdateLeafL") );
-
-    TPtrC8 nodename( GetNextStringLC ( aItem, _L("Node name") )->Des() ) ;
-    TPtrC8 data (GetNextStringLC( aItem, _L("datafile"))->Des() );
-    
-	HBufC8 *mime = GetNextStringLC( aItem, _L("mime") ) ;
-    SetURIL( nodename );
-    
-    TPtrC8 parentURI(RemoveLastSeg(nodename));
-    HBufC8 *luid = GetLuidAllocLC( parentURI );
-    
-    TDataType type; 
-
-	TPtrC8 mimePtr( *mime == KNullDesC8 ? type.Des8() : mime->Des() );
-
-    /**
-    virtual void UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID,
-									const TDesC8& aObject, const TDesC8& aType,
-									TInt aStatusRef ) = 0;
-    */
-    
-	Adapter()->UpdateLeafObjectL( *iURI , *luid, data, mimePtr, 3);
-
-	if ( iStatus == MSmlDmAdapter::EOk )
-	{
-		iLog->Log( _L("UpdateLeafL: UpdateLeafObjectL Successful! %d" ), iStatus );	
-	}
-	else
-	{
-		iLog->Log( _L("UpdateLeafL UpdateLeafObjectL Error ! %d" ), iStatus );	
-		ret = KErrGeneral ;
-	}
-
-	CleanupStack::PopAndDestroy(); // loadfile
-	CleanupStack::PopAndDestroy(); // luid
-	CleanupStack::PopAndDestroy(); // mime
-	CleanupStack::PopAndDestroy(); // nodename
-
-	iLog->Log( _L("UpdateLeafL Test Complete with status %d" ), ret );	
-
-    return ret;
-	}	
-	
-
-TInt Cdmatest::UpdateLeafDataURLL( CStifItemParser& aItem )	
-	{
-
-    TInt ret( KErrNone );
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("Cdmatest"), _L("UpdateLeafDataL") );
-
-    TPtrC8 nodename( GetNextStringLC ( aItem, _L("Node name") )->Des() ) ;
-    TPtrC8 http (GetNextStringLC( aItem, _L("http"))->Des() );
-    TPtrC8 url (GetNextStringLC( aItem, _L("rest of url"))->Des() );
-	HBufC8 *mime = GetNextStringLC( aItem, _L("mime") ) ;
-    SetURIL( nodename );
-    
-    _LIT8( KTag, "://" );
-    
-    HBufC8 *fullurl = HBufC8::NewLC( http.Length() + KTag().Length() + url.Length() );
-    TPtr8 pfullurl( fullurl->Des() );
-    pfullurl.Copy( http ) ;
-    pfullurl.Append( KTag );
-    pfullurl.Append( url );
-    TPtrC8 mimePtr( *mime == KNullDesC8 ? KDefaultType() : mime->Des() );
-    
-    HBufC8 *luid = GetLuidAllocLC( *iURI );
-    /**
-    virtual void UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID,
-									const TDesC8& aObject, const TDesC8& aType,
-									TInt aStatusRef ) = 0;
-    */
-	Adapter()->UpdateLeafObjectL( *iURI , *luid, pfullurl, mimePtr, 3);
-	if ( iStatus == MSmlDmAdapter::EOk )
-		{
-		iLog->Log( _L("UpdateLeafDataL: UpdateLeafObjectL Successful! %d" ), iStatus );	
-		}
-	else
-		{
-		iLog->Log( _L("UpdateLeafDataL UpdateLeafObjectL Error ! %d" ), iStatus );	
-		ret = KErrGeneral ;
-		}
-	CleanupStack::PopAndDestroy( luid ); // 
-	CleanupStack::PopAndDestroy( mime ); // mime
-	CleanupStack::PopAndDestroy(); // url
-	CleanupStack::PopAndDestroy(); // http
-	CleanupStack::PopAndDestroy(); // nodename
-	iLog->Log( _L("UpdateLeafDataL Test Complete with status %d" ), ret );	
-
-    return ret;
-	}
-    
-TInt Cdmatest::UpdateLeafDataL( CStifItemParser& aItem )	
-	{
-
-    TInt ret( KErrNone );
-    // Print to UI
-   TestModuleIf().Printf( 0, _L("Camtest"), _L("UpdateLeafDataL") );
-
-    TPtrC8 nodename( GetNextStringLC ( aItem, _L("Node name") )->Des() ) ;
-    TPtrC8 data (GetNextStringLC( aItem, _L("data"))->Des() );
-	HBufC8 *mime = GetNextStringLC( aItem, _L("mime") ) ;
-	
-    SetURIL( nodename );
-    
-        
-    TPtrC8 mimePtr( *mime == KNullDesC8 ? KDefaultType() : mime->Des() );
-    
-    TPtrC8 parentURI(RemoveLastSeg(nodename));
-    HBufC8 *luid = GetLuidAllocLC( parentURI );
-     
-//    
-//    virtual void UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID,
-//									const TDesC8& aObject, const TDesC8& aType,
-//									TInt aStatusRef ) = 0;
-//   
-	Adapter()->UpdateLeafObjectL( *iURI , *luid, data, mimePtr, 3);
-	if ( iStatus == MSmlDmAdapter::EOk )
-		{
-		iLog->Log( _L("UpdateLeafDataL: UpdateLeafObjectL Successful! %d" ), iStatus );	
-		}
-	else
-		{
-		iLog->Log( _L("UpdateLeafDataL UpdateLeafObjectL Error ! %d" ), iStatus );	
-		ret = KErrGeneral ;
-		}
-	
-	CleanupStack::PopAndDestroy(); // mime
-	CleanupStack::PopAndDestroy(); // luid
-	CleanupStack::PopAndDestroy(); // data
-	CleanupStack::PopAndDestroy(); // nodename
-	iLog->Log( _L("UpdateLeafDataL Test Complete with status %d" ), ret );	
-
-    return ret;
-	}	
-			
-TInt Cdmatest::FetchLeafL( CStifItemParser& aItem )	
-	{
-
-    TInt ret( KErrNone );
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("Camtest"), _L("FetchLeafL") );
-
-	iResultsFunction = NULL;
-	
-    TInt i( 0 );
-    TPtrC8 nodename ( GetNextStringLC( aItem, _L( "nodename" ) )->Des() ) ;
-    
-    //TPtrC datafile;
-    TPtrC datafile( KNullDesC );
-    i = aItem.GetNextString ( datafile ) ;
-    if ( i != KErrNone ) 
-	    {
-	    iLog->Log(_L("FetchLeafL: ERROR Reading outfile argument: 0x%X"), i );
-	    //return i;
-	    }
-	else
-		{
-		iSaveFileName = datafile;
-		iLog->Log( _L( " Save file nameis '%S'" ), &iSaveFileName );
-		iResultsFunction = SaveDataL;
-		}
-    
-	SetURIL(nodename) ;
-		
-		/*
-			void FetchLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID,
-								   const TDesC8& aType, TInt aResultsRef,
-								   TInt aStatusRef );
-		*/
-    TPtrC8 parentURI(RemoveLastSeg(nodename));
-    HBufC8 *luid = GetLuidAllocLC( parentURI );
-
-	Adapter()->FetchLeafObjectL( *iURI, *luid, KEmptyType, 7, 8 ) ;
-	if ( iStatus == MSmlDmAdapter::EOk )
-		{
-		iLog->Log( _L("FetchLeafL: FetchLeafObjectL Successful! %d" ), iStatus );	
-		}
-	else
-		{
-		iLog->Log( _L("FetchLeafL: FetchLeafObjectL Error ! %d" ), iStatus );	
-		ret = KErrGeneral ;
-		}
-	CleanupStack::PopAndDestroy( luid );
-	CleanupStack::PopAndDestroy(  ); // nodename
-	iLog->Log( _L("FetchLeafL Test Complete with status %d" ), ret );	
-    return ret;
-	}	
-
-
-TInt Cdmatest::ExecuteLeafL( CStifItemParser& aItem )		
-	{
-	TInt ret( KErrNone );
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("Camtest"), _L("ExecuteLeafL") );
-
-	iResultsFunction = NULL;
-	
-    TPtrC8 nodename( GetNextStringLC ( aItem, _L("Nodename") )->Des() ) ;
-    TPtrC8 data( GetNextStringLC ( aItem, _L("Input file") )->Des() ) ;
-	
-	SetURIL(nodename) ;
-
-		/*
-			virtual void ExecuteCommandL( const TDesC8& aURI, const TDesC8& aLUID,
-							      const TDesC8& aArgument, const TDesC8& aType,
-								  TInt aStatusRef ) = 0;
-		*/
-	TDataType type;
-	
-    TPtrC8 parentURI(RemoveLastSeg(nodename));
-    HBufC8 *luid = GetLuidAllocLC( parentURI );
-
-	Adapter()->ExecuteCommandL( *iURI, *luid, data, KEmptyType, 11 ) ;
-	if ( iStatus == MSmlDmAdapter::EOk )
-		{
-		iLog->Log( _L("ExecuteLeafL: ExecuteCommandL Successful! %d" ), iStatus );	
-		}
-	else
-		{
-		iLog->Log( _L("ExecuteLeafL: ExecuteCommandL FetchLeafObjectL Error ! %d" ), iStatus );	
-		ret = KErrGeneral ;
-		}
-	CleanupStack::PopAndDestroy( luid ); // luid
-	CleanupStack::PopAndDestroy(); // data
-	CleanupStack::PopAndDestroy(); // nodename
-	
-	iLog->Log( _L("ExecuteLeafL: Test Complete with status %d" ), ret );	
-
-    return ret;
-	}
-	
-TInt Cdmatest::CompleteCommandsL( CStifItemParser& /*aItem*/ )
-	{
-	TRAPD( err, Adapter()->CompleteOutstandingCmdsL() );
-	delete iAdapter;
-	iAdapter = NULL;
-	return err;
-	}
-TInt Cdmatest::DeleteObjectL( CStifItemParser& aItem )
-{
-	TInt ret( KErrNone );
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("Camtest"), _L("DeleteObjectL") );
-
-    TPtrC8 nodename( GetNextStringLC ( aItem, _L("Nodename") )->Des() ) ;
-
-	SetURIL(nodename) ;
-
-	HBufC8 *luid = GetLuidAllocLC( *iURI );
-	Adapter()->DeleteObjectL( *iURI, *luid, 11 ) ;
-	if ( iStatus == MSmlDmAdapter::EOk )
-		{
-		iLog->Log( _L("DeleteNode: DeleteObjectL Successful! %d" ), iStatus );	
-		}
-	else
-		{
-		iLog->Log( _L("DeleteNode: DeleteObjectL FetchLeafObjectL Error ! %d" ), iStatus );	
-		ret = KErrGeneral ;
-		}
-	CleanupStack::PopAndDestroy( luid ); // luid
-	CleanupStack::PopAndDestroy(); // nodename	
-	iLog->Log( _L("ExecuteLeafDataL Test Complete with status %d" ), ret );	
-
-    return ret;	
-}
-	
-TInt Cdmatest::ExecuteLeafDataL( CStifItemParser& aItem )		
-	{
-	TInt ret( KErrNone );
-
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("Camtest"), _L("ExecuteLeafL") );
-
-	iResultsFunction = NULL;
-	
-    TPtrC8 nodename( GetNextStringLC ( aItem, _L("Nodename") )->Des() ) ;
-    TPtrC8 data( GetNextStringLC ( aItem, _L("Input data") )->Des() ) ;
-    
-	SetURIL(nodename) ;
-
-		/*
-			virtual void ExecuteCommandL( const TDesC8& aURI, const TDesC8& aLUID,
-							      const TDesC8& aArgument, const TDesC8& aType,
-								  TInt aStatusRef ) = 0;
-		*/
-	HBufC8 *luid = GetLuidAllocLC( *iURI );
-	Adapter()->ExecuteCommandL( *iURI, *luid, data, KEmptyType, 11 ) ;
-	if ( iStatus == MSmlDmAdapter::EOk )
-		{
-		iLog->Log( _L("ExecuteLeafDataL: ExecuteCommandL Successful! %d" ), iStatus );	
-		}
-	else
-		{
-		iLog->Log( _L("ExecuteLeafDataL: ExecuteCommandL FetchLeafObjectL Error ! %d" ), iStatus );	
-		ret = KErrGeneral ;
-		}
-	CleanupStack::PopAndDestroy(); // luid
-	CleanupStack::PopAndDestroy(); // data		
-	CleanupStack::PopAndDestroy(); // nodename	
-	iLog->Log( _L("ExecuteLeafDataL Test Complete with status %d" ), ret );	
-
-    return ret;
-	}
-
-
-HBufC8 *Cdmatest::LoadFileLC( const TDesC &aFileName, TDataType &aType )	
-	{
-	RFs fs ;
-	LEAVE_IF_ERROR( fs.Connect(), _L( "Could not connect fileserver: %d"  ) );
-	
-	CleanupClosePushL( fs );
-	RFile file ;
-	LEAVE_IF_ERROR( file.Open(fs,aFileName,EFileRead), _L( "Could not open file: %d" ) );
-	
-	
-	
-	CleanupClosePushL( file );
-	TInt dataSize ;
-	LEAVE_IF_ERROR( file.Size( dataSize ), _L( "Could not get file size: %d" ) );
-	HBufC8 *nodedata = HBufC8::NewL ( dataSize );
-	CleanupStack::PushL( nodedata );
-	TPtr8 nodedataptr( nodedata->Des() );
-	LEAVE_IF_ERROR( file.Read( nodedataptr ), _L( "Could not read file: %d" ) );
-	TDataRecognitionResult aDataType;
-	RApaLsSession ls ;
-	TInt err( ls.Connect() );
-	if ( err == KErrNone )
-		{
-		CleanupClosePushL( ls );
-		err = ls.RecognizeData(aFileName, nodedataptr, aDataType)  ;
-		if ( err == KErrNone )
-			{
-			aType = aDataType.iDataType;
-			}
-		else
-			{
-			iLog->Log( _L("LoadFileLC: WARNING Failed to get type: %d" ), err );
-			aType = TDataType( KDefaultType );
-			}	
-		CleanupStack::PopAndDestroy( &ls ); 
-		}
-	else
-		{
-		iLog->Log( _L("LoadFileLC: WARNING Failed to connect rapalssession: %d" ), err );
-		}	
-	CleanupStack::Pop( nodedata );
-	CleanupStack::PopAndDestroy( &file ); 
-	CleanupStack::PopAndDestroy( &fs ); 
-	CleanupStack::PushL( nodedata );
-	return nodedata ;
-	}
-
-HBufC8 *Cdmatest::LoadFileLC( const TDesC8 &aFileName, TDataType &aType )	
-	{
-	TFileName fn ;
-	fn.Copy( aFileName );
-	return LoadFileLC( fn, aType );
-	}
-	
-
-void Cdmatest::SaveDataL( TInt /*aResultsRef*/, CBufBase& aObject,
-							  const TDesC8& aType ) 
-	{
-	iLog->Log( _L8( "Saving data of type: '%S'" ), &aType );
-	RFs fs;
-	User::LeaveIfError( fs.Connect() );
-	CleanupClosePushL( fs );
-	RFile file;
-	User::LeaveIfError( file.Replace ( fs, iSaveFileName, EFileWrite ) );
-	CleanupClosePushL( file );
-	TPtrC8 p( aObject.Ptr( 0 ) );
-	User::LeaveIfError( file.Write( p ) );
-	CleanupStack::PopAndDestroy( 2 ); // file, fs
-	}
-							  
-		
-	
-void Cdmatest::FetchNodeResultsL( TInt /*aResultsRef*/, CBufBase& aObject,
-							  const TDesC8& /*aType*/ )
-	{
-	TPtrC8 ptr( aObject.Ptr( 0 ) );	
-	iLog->Log( _L8("FetchNodeResultsL for '%S': '%S'" ), iURI, &ptr );
-	
-	if ( ptr.Length() > 0 )
-		{
-		TPtrC8 last( LastURISeg( ptr ) );
-		HBufC8 *oldUri = HBufC8::NewL( iURI->Length() );
-		(*oldUri) = *iURI; 
-		do 
-			{
-			iLog->Log ( _L8( " Node: '%S' "), &last );
-			HBufC8 *nUri = HBufC8::NewLC( oldUri->Length() + 1 + last.Length() );
-			nUri->Des().Copy( *oldUri ) ;
-			nUri->Des().Append( '/' );
-			nUri->Des().Append( last );
-			
-			SetURIL( nUri );
-			//iResultsFunction = FetchNodeResultsL;
-			
-		    //TPtrC8 parentURI(RemoveLastSeg(*nUri));
-		    //HBufC8 *luid = GetLuidAllocLC( parentURI );
-		    CleanupStack::Pop( nUri );
-			
-			HBufC8 *luid = GetLuidAllocLC( *iURI );
-			
-			Adapter()->ChildURIListL( *nUri, KNullDesC8, *iEmptyMappingInfoArray, 4, 5 );//Dipak
-			
-			CleanupStack::PopAndDestroy( luid ); 			
-			
-			ptr.Set( RemoveLastURISeg( ptr ) );
-			last.Set( LastURISeg( ptr ) );
-			
-			}
-		while (last != KNullDesC8);	
-		}
-	
-	}
-	
-
-	
-TPtrC8 Cdmatest::LastURISeg( const TDesC8& aURI )
-	{
-	TInt i;
-	for( i = aURI.Length() - 1; i >= 0; i-- ) 
-		{
-		if( aURI[i] == '/' )
-			{
-			break;
-			}
-		}
-
-	if( i == 0 )
-		{
-		return aURI;
-		}
-	else
-		{
-		return aURI.Mid( i+1 );
-		}
-	}
-TPtrC8 Cdmatest::RemoveLastSeg(const TDesC8& aURI)
-	{
-	TInt i;
-	for(i=aURI.Length()-1;i>=0;i--)
-		{
-		if(aURI[i]==KNSmlDMUriSeparator)
-			{
-			break;
-			}
-		}
-
-	if(i>0)
-		{
-		return aURI.Left(i);
-		}
-	else
-		{
-		return KNullDesC8();
-		}
-	}
-
-// ------------------------------------------------------------------------------------------------
-// TPtrC8 Cdmatest::RemoveLastURISeg(const TDesC8& aURI)
-// returns parent uri, i.e. removes last uri segment
-// ------------------------------------------------------------------------------------------------
-TPtrC8 Cdmatest::RemoveLastURISeg( const TDesC8& aURI )
-	{
-	TInt i;
-	for ( i = aURI.Length() - 1; i >= 0 ; i-- )
-		{
-		if( aURI[i] == '/' )
-			{
-			break;
-			}
-		}
-	if ( i > -1 )
-		{
-		return aURI.Left( i );	
-		}
-	else
-		{
-		return KNullDesC8();
-		}
-	}	
-	
-TPtrC Cdmatest::RemoveLastURISeg( const TDesC& aURI )
-	{
-	TInt i;
-	for ( i = aURI.Length() - 1; i >= 0 ; i-- )
-		{
-		if( aURI[i] == '/' )
-			{
-			break;
-			}
-		}
-	if ( i > -1 )
-		{
-		return aURI.Left( i );	
-		}
-	else
-
-		{
-		return KNullDesC();
-		}
-	}		
-	
-void Cdmatest::SetURIL( const TDesC& aURI )
-	{
-	if ( iURI != NULL )
-		{
-		delete iURI ;
-		iURI = NULL;
-		}
-	iURI = HBufC8::NewL( aURI.Length() ) ;
-	iURI->Des().Copy( aURI );
-	}
-	
-void Cdmatest::SetURIL( const TDesC8& aURI )
-	{
-	if ( iURI != NULL )
-		{
-		delete iURI ;
-		iURI = NULL;
-		}
-	iURI = HBufC8::NewL( aURI.Length() ) ;
-	iURI->Des().Copy( aURI );
-	}	
-
-void Cdmatest::SetURIL( HBufC8* aURI )
-	{
-	if ( iURI != NULL )
-		{
-		delete iURI ;
-		iURI = NULL;
-		}
-	iURI = aURI ;
-	}
-		
-		
-		
-void Cdmatest::SetResultsL( 
-	TInt aResultsRef, 
-	CBufBase& aObject,
-	const TDesC8& aType )
-	{
-	TPtrC8 ptr( aObject.Ptr(0) );
-	iLog->Log( _L8( "SetResults, ref=%d, object='%S', type='%S'" ), aResultsRef, &ptr, &aType );
-	if ( iResultsFunction )
-		{
-		(this->*iResultsFunction)( aResultsRef, aObject, aType );
-		iResultsFunction = NULL ;
-		}
-	
-	}
-
-
-void Cdmatest::SetStatusL( TInt aStatusRef,
-							 MSmlDmAdapter::TError aErrorCode ) 
-	{
-	iStatus = aErrorCode ;
-	iLog->Log( _L( "SetStatusL, ref=%d, code=%d" ), aStatusRef, aErrorCode );
-	
-	
-	}
-	
-void Cdmatest::SetMappingL( const TDesC8& aURI, const TDesC8& aLUID ) 
-	{
-	iLog->Log( _L8( "SetMappingL, aURI='%s', aLUID='%s'" ), aURI.Ptr(), aLUID.Ptr() );	
-	
-	iMappingTable.Append(TMapping( aURI, aLUID ) )	;
-	}
-	
-HBufC8* Cdmatest::GetLuidAllocL( const TDesC8& aURI ) 
-	{
-	iLog->Log( _L8( "GetLuidAllocL, aURI='%S'" ), &aURI );		
-	HBufC8 *res = NULL;		
-	for( TInt i(0); i < iMappingTable.Count(); i++ )	
-		{
-		if ( aURI == iMappingTable[i].iURI )
-			{
-			res = iMappingTable[i].iLuid.AllocL();
-			}
-		}
-	if ( res == NULL )
-		{
-		res = HBufC8::NewL( 0 );
-		}
-	iLog->Log( _L8( "GetLuidAllocL, response='%S'" ), res );
-	return res;
-	}	    
-    
-HBufC8* Cdmatest::GetLuidAllocLC( const TDesC8& aURI ) 
-	{
-	iLog->Log( _L8( "GetLuidAllocL, aURI='%S'" ), &aURI );
-	HBufC8 *res = NULL;		
-	for( TInt i(0); i < iMappingTable.Count(); i++ )	
-		{
-		if ( aURI == iMappingTable[i].iURI )
-			{
-			res = iMappingTable[i].iLuid.AllocLC();
-			break;
-			}
-		}
-	if ( res == NULL )
-		{
-		res = HBufC8::NewLC( 0 );
-		}
-	iLog->Log( _L8( "GetLuidAllocLC, response='%S'" ), res );
-	return res ;
-	}	
-    	
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-    
-void Cdmatest::GetMappingInfoListL( const TDesC8& /*aURI*/,
-								CArrayFix<TSmlDmMappingInfo>& /*aSegmentList*/ )
-	{
-	// do nothing
-	}								
-
-#else
-// nothing
-#endif
-//***************************************************************************
-//  End of File
--- a/omadm/omadmextensions/adapters/syncmldm12/tsrc/src/syncmldm12test.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,117 +0,0 @@
-/*
-* Copyright (c) 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:  Implementation of DM adapter test component
-* 	This is part of omadmextensions/adapter test application.
-*
-*/
-
-
-
-
-
-
-// INCLUDE FILES
-#include <Stiftestinterface.h>
-#include "syncmldm12Test.h"
-#include <stiflogger.h>
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// Csyncmldm12Test::Csyncmldm12Test
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-/*Csyncmldm12Test::Csyncmldm12Test( 
-    CTestModuleIf& aTestModuleIf ):
-        CScriptBase( aTestModuleIf )
-    {
-    }*/
-Csyncmldm12Test::Csyncmldm12Test( CTestModuleIf& aTestModuleIf )
-		: Cdmatest( aTestModuleIf, KAdapterUid )
-    {
-    }
-// -----------------------------------------------------------------------------
-// Csyncmldm12Test::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void Csyncmldm12Test::ConstructL()
-    {
-/*    iLog = CStifLogger::NewL( KamtestLogPath, 
-                          KamtestLogFile,
-                          CStifLogger::ETxt,
-                          CStifLogger::EFile,
-                          EFalse );*///Commented the Part for syncmldm12Test Dipak
-    iLog = CStifLogger::NewL( KamtestLogPath, 
-                          KamtestLogFile,
-                          CStifLogger::ETxt,
-                          CStifLogger::EFile );
-                          
-    iLog->Log( _L( "Loading Adapter" ) );
-    
-	Cdmatest::ConstructL();                         	
-
-    }
-
-// -----------------------------------------------------------------------------
-// Csyncmldm12Test::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-Csyncmldm12Test* Csyncmldm12Test::NewL( 
-    CTestModuleIf& aTestModuleIf )
-    {
-    Csyncmldm12Test* self = new (ELeave) Csyncmldm12Test( aTestModuleIf );
-    
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop();
-
-    return self;
-    
-    }
-    
-// Destructor
-Csyncmldm12Test::~Csyncmldm12Test()
-    { 
-    
-    // Delete resources allocated from test methods
-//    Delete();
-    
-    // Delete logger
-//    delete iLog;  
-    
-    }
-
-// ========================== OTHER EXPORTED FUNCTIONS =========================
-
-// -----------------------------------------------------------------------------
-// LibEntryL is a polymorphic Dll entry point.
-// Returns: CScriptBase: New CScriptBase derived object
-// -----------------------------------------------------------------------------
-//
-EXPORT_C CScriptBase* LibEntryL( 
-    CTestModuleIf& aTestModuleIf ) // Backpointer to STIF Test Framework
-    {
-    
-    return ( CScriptBase* ) Csyncmldm12Test::NewL( aTestModuleIf );
-        
-    }
-
-
-    
-//  End of File
--- a/omadm/omadmextensions/adapters/syncmldm12/tsrc/src/syncmldm12testBlocks.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,108 +0,0 @@
-/*
-* Copyright (c) 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:  Implementation of DM adapter test component
-* 	This is part of omadmextensions/adapter test application.
-*
-*/
-
-
-
-
-
-
-// INCLUDE FILES
-#include <e32svr.h>
-#include <StifParser.h>
-#include <Stiftestinterface.h>
-#include "syncmldm12Test.h"
-#include <e32math.h>
-#include <f32file.h>
-#include <swinstapi.h>
-
-
-//using namespace NApplicationManagement;//Dipak
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// Csyncmldm12Test::Delete
-// Delete here all resources allocated and opened from test methods. 
-// Called from destructor. 
-// -----------------------------------------------------------------------------
-//
-void Csyncmldm12Test::Delete() 
-    {
-    
-    }
-    
-// -----------------------------------------------------------------------------
-// Csyncmldm12Test::RunMethodL
-// Run specified method. Contains also table of test mothods and their names.
-// -----------------------------------------------------------------------------
-//
-TInt Csyncmldm12Test::RunMethodL( 
-    CStifItemParser& aItem ) 
-    {
-   
-    TStifFunctionInfo const KFunctions[] =
-        {  
-        // Copy this line for every implemented function.
-        // First string is the function name used in TestScripter script file.
-        // Second is the actual implementation member function. 
-        ENTRY( "DDFStructure", Csyncmldm12Test::DDFStructureL),
-        ENTRY( "FetchNode", Csyncmldm12Test::FetchNodeL ),
-        ENTRY( "FetchLeaf", Csyncmldm12Test::FetchLeafL ),
-        ENTRY( "AddNode", Csyncmldm12Test::AddNodeL ),
-        ENTRY( "UpdateLeaf", Csyncmldm12Test::UpdateLeafL ),
-        ENTRY( "UpdateLeafData", Csyncmldm12Test::UpdateLeafDataL ),
-        ENTRY( "Execute", Csyncmldm12Test::ExecuteLeafL ),
-        ENTRY( "ExecuteData", Csyncmldm12Test::ExecuteLeafDataL ),
-        ENTRY( "DeleteNode", Csyncmldm12Test::DeleteObjectL ),
-        ENTRY( "StartAtomic", Csyncmldm12Test::StartAtomicL),
-	    ENTRY( "CommitAtomic", Csyncmldm12Test::CommitAtomicL),
-	    ENTRY( "RollbackAtomic", Csyncmldm12Test::RollbackAtomicL),
-	    ENTRY( "CompleteCommands", Csyncmldm12Test::CompleteCommandsL),
-        };
-
-    const TInt count = sizeof( KFunctions ) / 
-                        sizeof( TStifFunctionInfo );
-
-    return RunInternalL( KFunctions, count, aItem );
-
-    }    
-
-        
-        
-HBufC8 *Csyncmldm12Test::GetNextStringLC ( CStifItemParser& aItem, const TDesC &aName )
-	{
-	TPtrC nodename;
-	nodename.Set( KNullDesC );
-
-    TInt i( aItem.GetNextString ( nodename ) );
-    if ( i != KErrNone ) 
-	    {
-	    iLog->Log( _L( "ERROR Reading '%S' argument: 0x%X" ), &aName, i );
-	    }
-	else
-		{
-		iLog->Log( _L("%S: %S"), &aName, &nodename);
-		}
-	
-	HBufC8 *buf = HBufC8::NewLC( nodename.Length() ) ;
-	buf->Des().Copy( nodename );
-	
-	return buf;
-	}
-	
-//  End of File
--- a/omadm/omadmextensions/adapters/syncmlds/bld/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-/*
-* Copyright (c) 2002 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:    build info file for SyncML DS settings adapter
-*
-*/
-
-
-
-
-PRJ_MMPFILES
-./nsmldssettingsadapter.mmp
-
-
-
-
--- a/omadm/omadmextensions/adapters/syncmlds/bld/nsmldssettingsadapter.mmp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-/*
-* 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:    DS-settings 
-*
-*/
-
-
-
-
-#include "defaultcaps.hrh"
-#include  <platform_paths.hrh>
-
-
-TARGET          nsmldssettingsadapter.dll
-TARGETTYPE      PLUGIN
-UID             0x10009D8D 0x101F6DE7
-VENDORID        VID_DEFAULT
-CAPABILITY      CAP_ECOM_PLUGIN
-
-
-APP_LAYER_SYSTEMINCLUDE
-SYSTEMINCLUDE 	/epoc32/include/ecom
-
-SOURCEPATH      ../src
-USERINCLUDE     ../inc ../../inc
-
-SOURCE          NSmlDsSettingsAdapter.cpp
-
-
-START RESOURCE  nsmldssettingsadapter.rss
-LANGUAGE_IDS
-END
-
-
-LIBRARY         euser.lib ecom.lib charconv.lib commdb.lib nsmldebug.lib 
-LIBRARY         nsmldmiapmatcher.lib
-LIBRARY			bafl.lib
-LIBRARY         syncmlclientapi.lib
-LIBRARY         nsmltransporthandler.lib
-
-
-SMPSAFE
-// End of File
--- a/omadm/omadmextensions/adapters/syncmlds/inc/NSmlDSSettingsAdapter.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,974 +0,0 @@
-/*
-* 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:    Device Management DS Settings adapter header file
-*
-*/
-
-
-
-
-#ifndef __NSMLDSSETTINGSADAPTER_H__
-#define __NSMLDSSETTINGSADAPTER_H__
-
-// INCLUDES
-#include <smldmadapter.h>   //adapter interface
-#include <SyncMLClientDS.h> //DS Client API
-
-// CONSTANTS
-const TInt KNSmlDSGranularity = 4;
-const TUint8 KNSmlDMColon = ':';
-const TUint8 KNSmlDMUriSeparator = '/';
-
-//DDF accepted DS-fieldnames for DS-profile
-_LIT8( KNSmlDdfRoot,            "SyncML");
-_LIT8( KNSmlDdfAddr,				"Addr" );
-_LIT8( KNSmlDdfAddrType,			"AddrType" );
-_LIT8( KNSmlDdfPortNbr,			"PortNbr" );
-_LIT8( KNSmlDdfName,				"Name" );
-
-_LIT8( KNSmlDdfDB,				"DB" );
-_LIT8( KNSmlDdfCTType,			"CTType" );
-_LIT( KNSmlDdfCTVer,			"CTVer" );
-_LIT8( KNSmlDdfCTVerL,			"CTVerL" );
-
-_LIT8( KNSmlDdfRDBURI,			"RDBURI" );
-_LIT8( KNSmlDdfLDBURI,			"LDBURI" );
-
-_LIT8( KNSmlDdfClientUserName,	"ClientUserName" );
-_LIT8( KNSmlDdfClientPW,			"ClientPW" );
-_LIT( KNSmlDdfClientNonce,		"ClientNonce" );
-_LIT8( KNSmlDdfServerId,			"ServerId" );
-_LIT8( KNSmlDdfHidden,			"Hidden" );
-
-
-_LIT( KNSmlADdfAdapterId,		"AdapterId" );
-
-_LIT8( KNSmlDdfToNAPID,			"ToNapID" );
-_LIT( KNSmlDdfAdapterType,		"/DB/" );
-
-//DDF DS-field descriptions
-_LIT8( KNSmlDdfRootDescription,     "DS-Settings DDF description");
-_LIT8( KNSmlDdfAddrDescription,	    "DS server address" );
-_LIT8( KNSmlDdfAddrTypeDescription,	"Type of used DS server address" );
-_LIT8( KNSmlDdfPortNbrDescription,	"DS Server port number" );
-_LIT8( KNSmlDdfNameDescription,		"Displayable name for the management account" );
-
-_LIT8( KNSmlDdfDBDescription,		"DB node is parent to all Database objects" );
-_LIT( KNSmlDdfCTDescription,		"CT node is parent to all Content objects" );
-_LIT8( KNSmlDdfCTTypeDescription,	"CTType define supported media content of database" );
-_LIT( KNSmlDdfCTVerDescription,		"CTVer node is a parent to all Content Version objects" );
-_LIT( KNSmlDdfCTVerLDescription,	"CTVerL define version of supported contenttype" );
-
-_LIT8( KNSmlDdfRDBURIDescription,	"The relative or absolute URI of remote database" );
-_LIT8( KNSmlDdfLDBURIDescription,	"The relative or absolute URI of local database" );
-
-_LIT8( KNSmlDdfClientUserNameDescription,	"DS username" );
-_LIT8( KNSmlDdfServerIdDescription,     	"Server identifier" );
-_LIT8( KNSmlDdfClientPWDescription,			"A password or secret to authenticate to the server" );
-_LIT8( KNSmlDdfToNAPIDDescription,			"Logical reference to connectivity information" );
-_LIT8( KNSmlDdfHiddenDescription,			"Hidden profile (not shown on UI)" );
-
-_LIT8( KNSmlBufExe,				"BufExe" );
-
-//Default data values
-_LIT( KNSmlDefName,				"DSAdapterIns" );
-_LIT8( KNSmlDefDSAcc,			"DSAcc" );
-_LIT8( KNSmlDSStart,			"SyncML/DSAcc/DSId" );
-_LIT( KNSmlDSStartDB,			"/DB/" );
-_LIT( KNSmlDefDSIAP,			"AP" );
-_LIT8( KNSmlIAPId,			    "NSmlIapId" );
-_LIT8( KSegmDSAcc2,              "CTType/RDBURI/LDBURI" );
-
-_LIT8( KNSmlDSSettingsHTTP,  "http://" );
-_LIT8( KNSmlDSSettingsHTTPS, "https://" );
-const TInt KNSmlDSSettingsHTTPPort = 80;
-const TInt KNSmlDSSettingsHTTPSPort = 443;
-_LIT8( KNSmlDSUriDotSlash, "./");
-_LIT8( KNSmlDSSlash, "/");
-_LIT8(KVersion, "1.1");
-_LIT8( KMimeType, "text/plain" );
-_LIT8( KDSSettingsTitle, "DS-settings title" );
-
-_LIT8( KDBUri1, "SyncML/DSAcc/*/DB/*" );
-_LIT8( KDSAccMatch, "SyncML/DSAcc/*" );
-_LIT8( KDSAccMatch2, "SyncML/DSAcc/*/*" );
-_LIT8( KDSDBMatch, "SyncML/DSAcc/*/DB/*" );
-_LIT8( KDSDBMatch2, "SyncML/DSAcc/*/DB" );
-_LIT8( KSegmDSAcc,"Addr/AddrType/PortNbr/Name/DB/ClientUserName/ClientPW/ToNapID/ServerId" );
-_LIT8( KDSDBAddMatch, "*DSAcc/*/DB/*" );
-_LIT8( KDSDBAddMatch2, "*DSAcc/*/DB/*/*" );
-_LIT8( KDSDBAddMatch3, "*DSAcc/*/DB" );
-
-_LIT8( KCTTypeMatch, "*/CTType*" );
-_LIT8( KRDBUriMatch, "*/RDBURI*" );
-_LIT8( KLDBUriMatch, "*/LDBURI*" );
-
-_LIT8( KDummyTxt, "/Dummy" );
-_LIT8( KFormat, "%d" );
-_LIT8( KDSAcc1, "SyncML/DSAcc" );
-_LIT8( Kprev,"CTId" );
-_LIT8( Kprev2, "/CTId" );
-_LIT8( KDSprev,"DSId" );
-
-
-// DATA TYPES
-enum TNSmlDSFieldType
-	{
-	EStr,
-	EInt,
-	EParam,
-	EWrong
-	};
-
-enum TNSmlDSLeafType
-	{
-	EDSDelete,
-	EDSUnset
-	};
-
-enum TNSmlDSProfileDataID
-	{
-	EProfileName,
-	EProfileIAPId,
-	EProfileMediumType,
-	EProfileSyncServerUsername,
-	EProfileSyncServerPassword,
-	EProfileURL,
-	EProfilePort,
-	EProfileServerId,
-	EHiddenProfile,
-	ESyncAccepted
-	};
-
-enum TNSmlDSMediumType
-	{
-	ENone,
-    EHttp,
-	EWsp,
-    EObex
-	};
-	
-struct TNSmlDSAddElement
-	{
-	HBufC8  *iUri;
-	HBufC8 *iData;
-	TInt iStatusRef;
-	TBool iLeaf;
-	TBool iDone;
-	};
-
-struct TNSmlDSBufferElement
-	{
-	CArrayFixFlat<TNSmlDSAddElement> *iNodeBuf;
-	HBufC8* iMappingName;
-	HBufC8* iName;
-	TBool iExecuted;
-	TInt  iLuid;
-	};
-
-// FORWARD DECLARATIONS
-class CNSmlDSSettingsAdapter;
-
-/**
-*  CNSmlDSSettingsAdapter class 
-*  Contains the whole implementation of the Device Management DS settings adapter.
-*
-*  @lib nsmldssettingsadapter.dll
-*/
-class CNSmlDSSettingsAdapter : public CSmlDmAdapter
-	{
-    public: // Constructors and destructor
-	    /**
-        * Two-phased constructor.
-        */
-        static CNSmlDSSettingsAdapter* NewL(MSmlDmCallback* aDmCallback );
-	    static CNSmlDSSettingsAdapter* NewLC(MSmlDmCallback* aDmCallback );
-
-	    void ConstructL();
-    
-        /**
-        * Destructor.
-        */
-	    virtual ~CNSmlDSSettingsAdapter();
-
-    public: // Functions from base classes
-        
-        /**
-        * From      CSmlDmAdapter   DDFVersionL returns current version of the DDF.
-        * @since    Series60_3.0
-        * @param    aVersion        DDF version of the adapter.
-        * @return   none
-        */
-	    void DDFVersionL( CBufBase& aVersion );
-
-        /**
-        * From      CSmlDmAdapter   DDFStructureL for filling the DDF structure of the adapter.
-        * @since    Series60_3.0
-        * @param    aDDF            Reference to root object.
-        * @return   none
-        */
-	    void DDFStructureL( MSmlDmDDFObject& aDDF );
-
-        /**
-        * From      CSmlDmAdapter   UpdateLeafObjectL creates new leaf objects, or replaces 
-        *                           data in existing leaf objects.
-        * @since    Series60_3.0
-        * @param    aURI            URI of the object
-        * @param    aLUID           LUID of the object
-        * @param    aObject         Data of the object
-        * @param    aType           MIME type of the object
-        * @param    aStatusRef      Reference to correct command
-        * @return   none
-        */
-	    void UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, 
-                                const TDesC8& aObject, const TDesC8& aType, 
-                                const TInt aStatusRef );
-        
-        /**
-        * From      CSmlDmAdapter   DeleteObjectL deletes an object and its child objects.
-        * @since    Series60_3.0
-        * @param    aURI            URI of the object
-        * @param    aLUID           LUID of the object
-        * @param    aStatusRef      Reference to correct command
-        * @return   none
-        */
-	    void DeleteObjectL( const TDesC8& aURI, const TDesC8& aLUID, 
-                            const TInt aStatusRef ); 
-
-        /**
-        * From      CSmlDmAdapter   FetchLeafObjectL fetches data of a leaf object.
-        * @since    Series60_3.0
-        * @param    aURI            URI of the object
-        * @param    aLUID           LUID of the object
-        * @param    aType           MIME type of the object
-        * @param    aResultsRef    	Reference to correct results
-        * @param    aStatusRef      Reference to correct command
-        * @return   none
-        */
-	    void FetchLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, 
-                                const TDesC8& aType, const TInt aResultsRef, 
-                                const TInt aStatusRef ); 
-        
-        /**
-        * From      CSmlDmAdapter   ChildURIListL fetches URI list.
-        * @since    Series60_3.0
-        * @param    aURI                    URI of the object
-        * @param    aLUID                   LUID of the object
-        * @param    aPreviousURISegmentList URI list with mapping LUID information
-        * @param    aResultsRef    	        Reference to correct results
-        * @param    aStatusRef              Reference to correct command
-        * @return   none
-        */
-	    void ChildURIListL( const TDesC8& aURI, const TDesC8& aLUID, 
-                            const CArrayFix<TSmlDmMappingInfo>& aPreviousURISegmentList, 
-                            const TInt aResultsRef, const TInt aStatusRef );  
-
-        /**
-        * From      CSmlDmAdapter   AddNodeObjectL adds node object.
-        * @since    Series60_3.0
-        * @param    aURI            URI of the object
-        * @param    aParentLUID     LUID of the parent object
-        * @param    aStatusRef      Reference to correct command
-        * @return   none
-        */
-	    void AddNodeObjectL( const TDesC8& aURI, const TDesC8& aParentLUID, 
-                                const TInt aStatusRef );
-
-        /**
-        * From      CSmlDmAdapter   UpdateLeafObjectL creates new leaf objects, or replaces 
-        *                           data in existing leaf objects.
-        * @since    Series60_3.0
-        * @param    aURI            URI of the object
-        * @param    aLUID           LUID of the object
-        * @param    aStream         Data of the object
-        * @param    aType           MIME type of the object
-        * @param    aStatusRef      Reference to correct command
-        * @return   none
-        */
-	    void UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID, 
-                                RWriteStream*& aStream, const TDesC8& aType, 
-                                const TInt aStatusRef );
-
-        /**
-        * From      CSmlDmAdapter   FetchLeafObjectSizeL fetches the size of a leaf object.
-        * @since    Series60_3.0
-        * @param    aURI            URI of the object
-        * @param    aLUID           LUID of the object
-        * @param    aType           MIME type of the object
-        * @param    aResultsRef    	Reference to correct results
-        * @param    aStatusRef      Reference to correct command
-        * @return   none
-        */
-	    void FetchLeafObjectSizeL( const TDesC8& aURI, const TDesC8& aLUID, 
-                                    const TDesC8& aType, const TInt aResultsRef, 
-                                    const TInt aStatusRef );
-        
-        /**
-        * From      CSmlDmAdapter   The function implements execute command.
-        * @since    Series60_3.0
-        * @param    aURI            URI of the object
-        * @param    aLUID           LUID of the object
-        * @param    aArgument       Argument for the command
-        * @param    aType       	MIME type of the object
-        * @param    aStatusRef      Reference to correct command
-        * @return   none
-        */
-	    void ExecuteCommandL( const TDesC8& aURI, const TDesC8& aLUID, 
-                                const TDesC8& aArgument, const TDesC8& aType, 
-                                const TInt aStatusRef );
-
-        /**
-        * From      CSmlDmAdapter   The function implements execute command.
-        * @since    Series60_3.0
-        * @param    aURI            URI of the object
-        * @param    aLUID           LUID of the object
-        * @param    aStream         Argument for the command
-        * @param    aType       	MIME type of the object
-        * @param    aStatusRef      Reference to correct command
-        * @return   none
-        */
-	    void ExecuteCommandL( const TDesC8& aURI, const TDesC8& aLUID, 
-                                RWriteStream*& aStream, const TDesC8& aType, 
-                                const TInt aStatusRef );
-
-         /**
-        * From      CSmlDmAdapter   The function implements execute command.
-        * @since    Series60_3.0
-        * @param    aTargetURI      Target URI for the command
-        * @param    aTargetLUID     LUID of the target object
-        * @param    aSourceURI      Source URI for the command
-        * @param    aSourceLUID    	LUID of the source object
-        * @param    aType           MIME type of the object
-        * @param    aStatusRef      Reference to correct command
-        * @return   none
-        */
-	    void CopyCommandL( const TDesC8& aTargetURI, const TDesC8& aTargetLUID, 
-                                const TDesC8& aSourceURI, const TDesC8& aSourceLUID, 
-                                const TDesC8& aType, TInt aStatusRef );
-        
-        /**
-        * From      CSmlDmAdapter   The function indicates start of Atomic command.
-        * @since    Series60_3.0
-        * @param    none
-        * @return   none
-        */
-	    void StartAtomicL();
-
-        /**
-        * From      CSmlDmAdapter   The function indicates successful end of Atomic command.
-        * @since    Series60_3.0
-        * @param    none
-        * @return   none
-        */
-	    void CommitAtomicL();
-
-        /**
-        * From      CSmlDmAdapter   The function indicates unsuccessful end of Atomic command.
-        * @since    Series60_3.0
-        * @param    none
-        * @return   none
-        */
-	    void RollbackAtomicL();
-
-        /**
-        * From      CSmlDmAdapter   Returns ETrue if adapter supports streaming otherwise EFalse.
-        * @since    Series60_3.0
-        * @param    aItemSize       Size limit for stream usage.
-        * @return   ETrue or EFalse
-        */
-	    TBool StreamingSupport( TInt& aItemSize );
-
-        /**
-        * From      CSmlDmAdapter   Called when stream returned from UpdateLeafObjectL or 
-        *                           ExecuteCommandL has been written to and committed.
-        * @since    Series60_3.0
-        * @param    none
-        * @return   none
-        */
-	    void StreamCommittedL();
-
-        /**
-        * From      CSmlDmAdapter   The function tells the adapter that all the commands of the message that
-	    *                           can be passed to the adapter have now been passed.
-        * @since    Series60_3.0
-        * @param    none
-        * @return   none
-        */
-	    void CompleteOutstandingCmdsL();
-
-    private:
-
-        /**
-        * C++ default constructor.
-        */
-        CNSmlDSSettingsAdapter();
-	    CNSmlDSSettingsAdapter( TAny* aEcomArguments );
-        
-        /**
-        * The function checks if field to be handled is valid.
-        * @param    none
-        * @return   ETrue if valid field otherwise EFalse.
-        */   
-	    TBool AcceptDSField();
-
-        /**
-        * The function returns enum value for a field to be handled.
-        * @param    none
-        * @return   enum value for a field to be handled.
-        */ 
-        TInt GetDSField() const;
-
-        /**
-        * The function checks if field type to be handled is valid.
-        * @param    none
-        * @return   enum value for a field type.
-        */ 
-        TInt GetDSFieldTypeL() const;
-
-        /**
-        * The function converts LUID to integer.
-        * @param    aLUID     LUID data to be converted.
-        * @return   Integer value for a LUID.
-        */    
-        TInt IntLUID(const TDesC8& aLUID);
-
-         /**
-        * The function converts data to integer and returns it.
-        * @param    aObject     Data object to be converted.
-        * @return   Integer value for an object.
-        */
-        TInt GetIntObject( const TDesC8& aObject );
-
-        /**
-        * The function converts data to integer and returns it.
-        * @param    aObject     Data object to be converted.
-        * @return   16-bit integer value for an object.
-        */
-	    TInt GetIntObject16( const TDesC& aObject );
-
-        /**
-        * The function stores integer value to buffer and returns reference to it.
-        * @param    aObject     data to be stored to buffer.
-        * @return   reference to data buffer.
-        */
-        TDesC8& SetIntObjectLC( const TInt& aObject );
-
-        /**
-        * The function checks if data length is valid.
-        * @param    aProfileItem    Field / Leaf ID to be handled.
-        * @param    aSource         Data to be handled.
-        * @return   ETrue if data length is not valid otherwise EFalse.
-        */ 
-        TBool NotValidStrLenght( const TInt& aProfileItem, const TDesC8& aSource );
-
-        /**
-        * The function finds out the last element of the uri.
-        * @param    aSource     Uri object that contains all elements.
-        * @return   KErrNone if successful.
-        */
-        TInt    SetField( const TDesC8& aSource );
-
-        /**
-        * The function converts 16-bit data to 8-bit and returns reference to it.
-        * @param    aSource    Reference data to be converted.
-        * @return   Reference to 8-bit data buffer.
-        */ 
-        TDesC8&  ConvertTo8LC( const TDesC& aSource );
-
-        /**
-        * The function converts 8-bit data to 16-bit and returns reference to it.
-        * @param    aSource    Reference data to be converted.
-        * @return   Reference to 16-bit data buffer.
-        */ 
-	    TDesC16& ConvertTo16LC( const TDesC8& aSource );
-
-        /**
-        * The function adds new dataprovider for a profile.
-        * @param    aIntLUID        Profile integer LUID.
-        * @param    aMIMEType       Requested MIME type of the data provider.
-        * @param    aDataProviderId Reference to object where new data provider id to be saved.
-        * @return   KErrNone if successful otherwise error code.
-        */ 
-        TInt AddNewDataProviderL( TInt aIntLUID, const TDesC8& aMIMEType, TInt& aDataProviderId );
-
-        /**
-        * The function gets the uri for profile IAP ID.
-        * @param    aLUID       Profile integer LUID.
-        * @param    aObject     Reference to object where URI to be stored.
-        * @return   KErrNone if successful otherwise error code.
-        */ 
-        TInt GetToNAPIDL( const TInt aLUID, CBufBase& aObject );
-
-        /**
-        * The function sets the profile IAP id based on URI.
-        * @param    aLUID       Profile integer LUID.
-        * @param    aObject     Access point URI.
-        * @return   KErrNone if successful otherwise error code.
-        */ 
-        TInt SetToNAPIDL( const TInt aLUID, const TDesC8& aObject );
-
-        /**
-        * The function sets the new node to buffer (in case of content type).
-        * @param    aURI            URI of the node.
-        * @param    aParentLUID     LUID for the parent object.
-        * @param    aStatusRef      Command status reply reference.
-        * @return   none
-        */ 
-        void AddNodeBufferL( const TDesC8& aURI, const TDesC8& aParentLUID, 
-                                const TInt aStatusRef );
-
-        /**
-        * The function sets new leaf object to buffer (in case DB level object).
-        * @param    aURI            URI of the node.
-        * @param    aParentLUID     LUID for the parent object.
-        * @param    aStatusRef      Command status reply reference.
-        * @return   none
-        */ 
-        void AddLeafBufferL( const TDesC8& aURI,const TDesC8& aParentLUID, 
-                                const TDesC8& aObject, const TInt aStatusRef );
-
-        /**
-        * The function finds out the last segment of the URI.
-        * @param    aURI        URI to be handled.
-        * @return   Pointer to last URI segment.
-        */ 
-        TPtrC8 LastURISeg( const TDesC8& aURI );
-
-        /**
-        * The function removes the last segment of the URI.
-        * @param    aURI        URI to be handled.
-        * @return   Pointer to recontructed URI.
-        */ 
-        TPtrC8 RemoveLastURISeg( const TDesC8& aURI );
-
-        /**
-        * The function executes command from the buffer based on URI.
-        * @param    aURI        URI to be handled first.
-        * @return   none
-        */ 
-        void ExecuteBufferL( const TDesC8& aURI );
-
-        /**
-        * The function gets the profile Id (LUID) for given URI.
-        * @param    aURI        URI which LUID to be fetched.
-        * @return   LUID for the URI.
-        */ 
-        TInt GetProfileIdFromURIL( const TDesC8& aURI );
-
-        /**
-        * The function gets the MIME type for given data provider.
-        * @param    aDataProviderId Data provider ID.
-        * @param    aProfileLUID    Profile LUID.
-        * @param    aObject         Reference where fetched MIME type to be stored.
-        * @return   KErrNone if successful otherwise error cose.
-        */ 
-        TInt GetContentTypeL( const TInt aDataProviderId, const TInt aProfileLUID, 
-                                CBufBase*& aObject );
-
-	    /**
-        * The function find out the buffer index for given URI.
-        * @param    aURI        URI which position in the buffer to be solved.
-        * @return   Buffer position for given URI. If not found value is -1.
-        */ 
-        TInt GetBufferIndex( const TDesC8& aURI );
-
-        /**
-        * The function sets the LUID to buffer for given URI.
-        * @param    aURI        URI which position in the buffer to be solved.
-        * @param    aLUID       LUID for an URI.
-        * @return   Value > 0 if URI found, otherwise value is 0.
-        */ 
-	    TInt SetBufferLUID( const TDesC8& aURI, const TInt aLUID );
-
-        /**
-        * The function find out the port number from URL and stores it to aPort.
-        * @param    aRealURI    Reference data to be containing the whole URI.
-        * @param    aPort       Reference variable where port number will be stored.
-        * @return   KErrNone if successful otherwise KErrNotFound.
-        */ 
-	    TInt  ParseUri( const TDesC8& aRealURI, TInt& aPort );
-        
-        /**
-        * The function checks if requested profile ID exits.
-        * @param    aIntLUID    Integer value for a LUID of the profile.
-        * @return   ETrue if profile exits otherwise EFalse.
-        */ 
-	    TBool FindProfileIdL( const TInt aIntLUID );
-
-        /**
-        * The function gets the profile ID from Client API.
-        * @param    aIntLUID    Integer value for a LUID of the profile.
-        * @param    aProfileID  Reference to object where profile ID to be stored.
-        * @return   KErrNone if successful otherwise KErrNotFound.
-        */ 
-        TInt GetProfileIdentifierL( const TInt aIntLUID, TInt& aProfileID );
-
-        /**
-        * The function gets the profile data acording to URI leaf.
-        * @param    aIntLUID    Profile ID.
-        * @param    aObject     Reference where fetched data to be stored.
-        * @return   KErrNone if successful otherwise error code.
-        */ 
-        TInt GetDSFieldDataL( const TInt aIntLUID, CBufBase*& aObject );
-
-        /**
-        * The function gets the profile medium type value.
-        * @param    aIntLUID     Reference where data to be stored.
-        * @return   Medium type for profile connection.
-        */ 
-        TInt GetProfileConnectiontypeL( const TInt aIntLUID );
-
-        /**
-        * The function gets the profile Addr leaf value.
-        * @param    aIntLUID    Profile ID.
-        * @param    aURL        Reference where fetched data to be stored.
-        * @return   KErrNone if successful otherwise error code.
-        */ 
-        TInt GetProfileServerURLL( const TInt aIntLUID, CBufBase*& aURL );
-
-        /**
-        * The function gets the profile user name value.
-        * @param    aIntLUID    Profile ID.
-        * @param    aUserName   Reference where fetched data to be stored.
-        * @return   KErrNone if successful otherwise error code.
-        */ 
-	    TInt GetProfileUserNameL( const TInt aIntLUID, CBufBase*& aUserName );
-
-        /**
-        * The function gets the profile user name value.
-        * @param    aIntLUID    Profile ID.
-        * @param    aServerId   Reference where fetched data to be stored.
-        * @return   KErrNone if successful otherwise error code.
-        */ 
-	    TInt GetProfileServerIdL( const TInt aIntLUID, CBufBase*& aServerId );
-
-        /**
-        * The function gets the profile IAP Id (ToNAPID) value.
-        * @param    aIntLUID    Profile ID.
-        * @param    aIAPid      Reference where fetched data to be stored.
-        * @return   KErrNone if successful otherwise error code.
-        */ 
-	    TInt GetProfileIAPIdL( const TInt aIntLUID, TInt& aIAPid );		
-
-        /**
-        * The function gets the profile Name value.
-        * @param    aIntLUID        Profile ID.
-        * @param    aDisplayName    Reference where fetched data to be stored.
-        * @return   KErrNone if successful otherwise error code.
-        */ 
-	    TInt GetProfileDisplayNameL( const TInt aIntLUID, CBufBase*& aDisplayName );
-
-        /**
-        * The function creates new DM profile.
-        * @param    aPID    Reference to variable where new profile Id will be stored.
-        * @return   KErrNone if successful otherwise error code.
-        */ 
-	    TInt CreateNewProfileL( TInt& aPID );
-
-        /**
-        * The function sets the profile Addr leaf value.
-        * @param    aPID        Profile ID.
-        * @param    aObj        Data to be stored for a profile.
-        * @return   KErrNone if successful otherwise error code.
-        */ 
-        TInt SetProfileServerURIL( const TInt aPID, const TDesC8& aObj );
-
-        /**
-        * The function sets the profile Name leaf value.
-        * @param    aPID        Profile ID.
-        * @param    aObj        Data to be stored for a profile.
-        * @return   KErrNone if successful otherwise error code.
-        */     
-        TInt SetProfileDisplayNameL( const TInt aPID, const TDesC8& aObj );
-
-        /**
-        * The function sets the profile UserName leaf value.
-        * @param    aPID        Profile ID.
-        * @param    aObj        Data to be stored for a profile.
-        * @return   KErrNone if successful otherwise error code.
-        */ 
-	    TInt SetProfileUserNameL( const TInt aPID, const TDesC8& aObj );
-
-        /**
-        * The function sets the profile UserName leaf value.
-        * @param    aPID        Profile ID.
-        * @param    aObj        Data to be stored for a profile.
-        * @return   KErrNone if successful otherwise error code.
-        */ 
-	    TInt SetProfileServerIdL( const TInt aPID, const TDesC8& aObj );
-
-        /**
-        * The function sets the profile password leaf value.
-        * @param    aPID        Profile ID.
-        * @param    aObj        Data to be stored for a profile.
-        * @return   KErrNone if successful otherwise error code.
-        */ 
-        TInt SetProfilePasswordL( const TInt aPID, const TDesC8& aObj );
-
-        /**
-        * General function that checks which leaf to be handled based on field id.
-        * @param    aPID        Profile ID.
-        * @param    aObj        Data to be stored for a profile.
-        * @param    aFieldID    Internal value for a leaf to be handled.
-        * @return   KErrNone if successful otherwise error code.
-        */ 
-        TInt SetProfileStrValueL( const TInt aPID, const TDesC8& aObj, 
-                                    const TInt aFieldID );
-
-        /**
-        * The function deletes the profile data.
-        * @param    aPID    Profile ID.
-        * @return   KErrNone if successful otherwise error code.
-        */ 
-        TInt DeleteProfileL( const TInt aPID );
-
-        /**
-        * The function creates list of the content types that profile supports.
-        * @param    aURI                    URI that contains content types.
-        * @param    aPID                    Profile ID.
-        * @param    aCurrentURISegmentList  Reference to list to be filled.
-        * @param    aPreviousURISegmentList Previous, existing list for content types.
-        * @return   KErrNone if successful otherwise error code.
-        */ 
-        TInt CreateURITaskSegmentListL( const TDesC8& aURI, const TInt aPID, 
-                                    CBufBase*& aCurrentURISegmentList, 
-                                    const CArrayFix<TSmlDmMappingInfo>& aPreviousURISegmentList );
-
-        /**
-        * The function creates list of the existing profiles.
-        * @param    aCurrentURISegmentList  Reference to list to be filled.
-        * @param    aPreviousURISegmentList Previous, existing list for profiles.
-        * @return   KErrNone if successful otherwise error code.
-        */ 
-        TInt CreateURIProfileSegmentListL( CBufBase*& aCurrentURISegmentList, 
-                                    const CArrayFix<TSmlDmMappingInfo>& aPreviousURISegmentList );
-        
-        /**
-        * The function opens the server session and profile via client API.
-        * @param    aIntLUID    Integer value for a LUID of the profile.
-        * @param    aMode       Read or Read and Write mode for a profile data.
-        * @return   KErrNone if successful otherwise KErrNotFound.
-        */ 
-        TInt OpenSyncSessionAndDSProfileL( const TInt aIntLUID, TSmlOpenMode aMode );
-
-        /**
-        * The function closes the DS profile session.
-        * @param    none.
-        * @return   none.
-        */ 
-	    void CloseDSProfile();
-
-        /**
-        * The function checks if profile has the requested task id.
-        * @param    aProfLUID       Integer value for a LUID of the profile.
-        * @param    aDataProviderId DataProvider id to be searched.
-        * @return   ETrue if task found otherwise EFalse.
-        */ 
-        TBool FindTaskIDL( const TInt aProfLUID, const TInt aDataProviderId );
-
-        /**
-        * The function deletes task for given profile.
-        * @param    aLUID           Integer value for a LUID of the profile.
-        * @param    aDataProviderId DataProvider id to be searched.
-        * @return   KErrNone if successful otherwise error code.
-        */ 
-	    TInt DeleteTaskByIDL( const TInt aLUID, const TInt aDataProviderId );
-
-        /**
-        * The function gets the LDBURI (local datastore) for given profile.
-        * @param    aDataProviderId DataProvider id to be searched.
-        * @param    aProfileLUID    Profile Id.
-        * @param    aObject         Reference to object where fetched value to be saved.
-        * @return   KErrNone if successful otherwise error code.
-        */ 
-        TInt GetClientDataSourceL( const TInt aDataProviderId, const TInt aProfileLUID, 
-                                    CBufBase*& aObject );
-        /**
-        * The function gets the RDBURI (remote datastore) for given profile.
-        * @param    aDataProviderId DataProvider id to be searched.
-        * @param    aProfileLUID    Profile Id.
-        * @param    aObject         Reference to object where fetched value to be saved.
-        * @return   KErrNone if successful otherwise error code.
-        */ 
-        TInt GetServerDataSourceL( const TInt aDataProviderId, const TInt aProfileLUID, 
-                                    CBufBase*& aObject );
-
-        /**
-        * The function replaces the LDBURI or RDBURI values for given profile.
-        * @param    aProfileLUID    Profile Id.
-        * @param    aDataProviderId DataProvider id to be searched.
-        * @param    aObject         Data to be stored.
-        * @param    aField          Field Id to be handled.
-        * @return   KErrNone if successful otherwise error code.
-        */ 
-        TInt UpdateDataSourceL( const TInt aProfileLUID, const TInt aDataProviderId, 
-                                    const TDesC8& aObject, const HBufC8& aField );
-
-        /**
-        * The function fetches the object (leaf) data based on given URI.
-        * @param    aURI            URI of the object
-        * @param    aLUID           LUID of the object
-        * @param    aObj            Reference to object where fetched data to be saved.
-        * @param    aStatusRef      Reference to correct command
-        * @return   none
-        */
-        TInt FetchObjectL( const TDesC8& aURI, const TDesC8& aLUID, CBufBase*& aObj, 
-                                    const TInt aStatusRef );
-        
-        /**
-        * The function fills the node info.
-        * @param    aNode           Reference to node or leaf which info to be filled.
-        * @param    aAccTypes       Access rights for a leaf / node.
-        * @param    aOccurrence     Occurance of the node / leaf.
-        * @param    aScope          Scope (dynamic / permanent) of the leaf / node.
-        * @param    aFormat         Data format of the leaf / node.
-        * @param    aDescription    Description of the node / leaf.
-        * @param    aDefaultValue   Default value for a leaf or node.
-        * @param    aMimeType       MIME type for a leaf / node.
-        * @return   none
-        */ 
-        void FillNodeInfoL( MSmlDmDDFObject& aNode, TSmlDmAccessTypes aAccTypes, 
-                                MSmlDmDDFObject::TOccurence aOccurrence, 
-                                MSmlDmDDFObject::TScope aScope, 
-                                MSmlDmDDFObject::TDFFormat aFormat, 
-                                const TDesC8& aDescription, 
-                                const TDesC8& aDefaultValue, const TDesC8& aMimeType );
-        
-        /**
-        * The function set's the address type / medium type value for a profile.
-        * @param    aLUID       LUID for a profile.
-        * @param    aIntObj     Address type value.
-        * @return   KErrNone if successful otherwise error code.
-        */ 
-        TInt SetProfileAddrTypeL( const TInt aLUID, const TInt aIntObj );
-
-        /**
-        * The function adds port number to address URL.
-        * @param    aLUID       Profile ID.
-        * @param    aPort       Reference to port number data.
-        * @return   KErrNone if successful otherwise error code.
-        */ 
-        TInt SetProfileConnectionPortNrL( const TInt aLUID, const TDesC8& aPort );
-
-        /**
-        * The function adds port number to address URL.
-        * @param    aSrvURI     Original address URI.
-        * @param    aNewURI     New URI when port number has been added or deleted.
-        * @param    aPort       Reference to port number data.
-        * @return   KErrNone if successful otherwise error code.
-        */ 
-        void SetPortNrToAddrStr( const TDesC8& aSrvURI, HBufC8* aNewURI, 
-                                    const TDesC8& aPort );
-        
-        /**
-        * The function checks if MIME type allready exits.
-        * @param    aLuid       Profile LUID.
-        * @param    aMimeType   MIME type to be searched.
-        * @return   ETrue if MIME type found else EFalse.
-        */ 
-        TBool MimeTypeAllreadyExitsL( const TInt aLuid, const TDesC8& aMimeType );
-
-        /**
-        * The function sets the RDBURI (remote datastore) to memeber variable.
-        * @param    aStore       Value for a RDBURI.
-        * @return   none.
-        */ 
-        void SetRDBDataStore( const TDesC8& aStore );
-
-        /**
-        * The function sets the IAP Id value to profile connection data.
-        * @param    aLuid       Profile LUID.
-        * @param    aIAPid      Id for an IAP.
-        * @return   KErrNone if successful otherwise error code.
-        */ 
-        TInt SetProfileIAPIdL( const TInt aLUID, const TInt aIAPid );
-
-        /**
-        * The function gets UID for the profile medium type.
-        * @param    aIntObj         Profile LUID.
-        * @param    aMediumType     Requested medium type.
-        * @return   none.
-        */ 
-        void GetMediumTypeL(const TInt aIntObj, TSmlTransportId& aMediumType);
-        
-        /**
-        * The function checks if the URI is of format ./SyncML/DMAcc/DMId<num>
-        * Example ./SyncML/DMAcc/DMId000 
-        * @param    aURI       aURI.
-        * @return   true/false
-        */                          
-        TBool IsDSAccUriFormatMatchPredefined(const TDesC8 & aURI);
-        
-         /**
-        * The function constructs ./SyncML/DMAcc/x nodes and
-        * returns the profile ID matching the aURI.
-        * @param    aURI       aURI.
-        * @return   KErrNotFound/ProfileID
-        */  
-        
-        TInt ConstructTreeL(const TDesC8& aURI);
-
-   /**
-        * The function extracts Syncml/DSAcc/x node from aURI		        
-        * @param    aURI     Syncml/DSAcc aURI.
-        * @return   Syncml/DSAcc/x node.
-    */ 
-		TPtrC8 GetDynamicDSNodeUri(const TDesC8& aURI);
-
-    private:    // Data
-	    
-        // Callback interface for returning result or status
-	    MSmlDmCallback*	iCallBack;
-        // Client API session class 
-        RSyncMLSession iSyncSession;
-        // Client API DS profile handling
-        RSyncMLDataSyncProfile iDSProfile;
-  
-        // Buffer for URI leaf element
-        HBufC8* iField;
-        // Pointer to buffer structure
-        CArrayFixFlat<TNSmlDSBufferElement> *iBuffer;
-        
-        // Buffer for URI leaf element
-        HBufC8* iPrevURI;
-        // Buffer for profile port number handling
-        HBufC8* iPortNbr;
-        // Buffer for profile remote data store handling
-        HBufC16* iRdbDataStore;
-        // Information about leaf command
-        TNSmlDSLeafType	  iLeafType;
-
-        // LUID to be handled
-	    TInt iLUID;
-        // Parent LUID
-	    TInt iParentLUID;
-        // For handling profile medium type 
-	    TInt iObject;
-        // Previously handled LUID
-        TInt iPrevLUID;
-        
-        // Status information if session allready opened
-        TBool iSyncSessionOpen;
-        // Status of command was inside the module from buffer execution
-        TBool iBufferExecution;
-        
-        // buffered data for updating port number
-        HBufC8* iPortBuf;
-        TInt iPortBufLUID;
-        TInt iPortBufStatusRef;
-   };
-
-#endif // __NSmlDSSETTINGSADAPTER_H__
-
-// End of File
\ No newline at end of file
--- a/omadm/omadmextensions/adapters/syncmlds/src/NSmlDsSettingsAdapter.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3850 +0,0 @@
-/*
-* 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:    DS-settings adapter
-*
-*/
-
-
-
-
-// INCLUDE FILES
-#include "NSmlDSSettingsAdapter.h"
-#include "nsmldebug.h"
-#include "nsmlconstants.h"
-#include "nsmldmconstants.h"
-#include "nsmldmimpluids.h"
-#include "nsmldmiapmatcher.h"
-
-#include <implementationproxy.h>
-#include <badesca.h>
-#include <utf.h>
-#include <SyncMLTransportProperties.h>
-
-#ifndef __WINS__
-// This lowers the unnecessary compiler warning (armv5) to remark.
-// "Warning:  #174-D: expression has no effect..." is caused by 
-// DBG_ARGS8 macro in no-debug builds.
-#pragma diag_remark 174
-#endif
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-//  CNSmlDSSettingsAdapter::NewL
-//  Two-phased constructor.
-// -----------------------------------------------------------------------------
-CNSmlDSSettingsAdapter* CNSmlDSSettingsAdapter::NewL( MSmlDmCallback* aDmCallback )
-	{
-	_DBG_FILE("CNSmlDSSettingsAdapter::NewL(): begin");
-
-	CNSmlDSSettingsAdapter* self = NewLC( aDmCallback );
-	CleanupStack::Pop();
-
-	_DBG_FILE("CNSmlDSSettingsAdapter::NewL(): end");
-	return self;
-	}
-
-// -----------------------------------------------------------------------------
-//  CNSmlDSSettingsAdapter::NewLC
-// -----------------------------------------------------------------------------
-CNSmlDSSettingsAdapter* CNSmlDSSettingsAdapter::NewLC(MSmlDmCallback* aDmCallback )
-	{
-	_DBG_FILE("CNSmlDSSettingsAdapter::NewLC(): begin");
-	CNSmlDSSettingsAdapter* self = new ( ELeave ) CNSmlDSSettingsAdapter( aDmCallback );
-	CleanupStack::PushL( self );
-	self->iCallBack = aDmCallback;
-
-	self->ConstructL();
-	self->iLeafType = EDSUnset;
-    
-	_DBG_FILE("CNSmlDSSettingsAdapter::NewLC(): end");
-	return self;
-	}
-
-//------------------------------------------------------------------------------
-// CNSmlDSSettingsAdapter::CNSmlDSSettingsAdapter
-//------------------------------------------------------------------------------
-CNSmlDSSettingsAdapter::CNSmlDSSettingsAdapter(TAny* aEcomArguments) : CSmlDmAdapter(aEcomArguments)
-	{
-	_DBG_FILE("CNSmlDSSettingsAdapter::CNSmlDSSettingsAdapter(): begin");
-	_DBG_FILE("CNSmlDSSettingsAdapter::CNSmlDSSettingsAdapter(): end");
-	}
-
-//------------------------------------------------------------------------------
-//  CNSmlDSSettingsAdapter::~CNSmlDSSettingsAdapter()
-//  Class destructor.
-//------------------------------------------------------------------------------
-CNSmlDSSettingsAdapter::~CNSmlDSSettingsAdapter()
-	{
-	_DBG_FILE("CNSmlDSSettingsAdapter::~CNSmlDSSettingsAdapter(): begin");
-    delete iPrevURI;
-    delete iField;
-    
-	// Command buffer cleaning
-	if ( iBuffer )
-		{
-		
-		for( TInt i=0; i<iBuffer->Count(); i++ )
-			{
-			delete iBuffer->At(i).iMappingName;
-			delete iBuffer->At(i).iName;
-
-			for( TInt j=0; j<iBuffer->At(i).iNodeBuf->Count(); j++ )
-				{
-				delete iBuffer->At(i).iNodeBuf->At(j).iUri;
-				if( iBuffer->At(i).iNodeBuf->At(j).iData )
-					{
-					delete iBuffer->At(i).iNodeBuf->At(j).iData;
-					}
-				}
-			iBuffer->At(i).iNodeBuf->Reset();
-			delete iBuffer->At(i).iNodeBuf;
-			}
-
-		iBuffer->Reset();
-		delete iBuffer;
-		}
-    
-    iDSProfile.Close();
-    iSyncSession.Close();
-    iSyncSessionOpen = EFalse;
-        
-    delete iPortNbr;
-    delete iPortBuf;
-    delete iRdbDataStore;
-    
-    iBufferExecution = EFalse;
-    
-    iCallBack = 0;
-
-	_DBG_FILE("CNSmlDSSettingsAdapter::~CNSmlDSSettingsAdapter(): end");
-	}
-
-//------------------------------------------------------------------------------
-//		CNSmlDSSettingsAdapter::ConstructL
-//		Second phase constructor.
-//------------------------------------------------------------------------------
-void CNSmlDSSettingsAdapter::ConstructL()
-	{
-	iField = HBufC8::NewL( KNSmlMaxURLLength );
-	iPrevURI = HBufC8::NewL( KNSmlMaxURLLength );
-    iRdbDataStore = HBufC16::NewL( KNSmlMaxRemoteNameLength );
-//
-//	Command buffering used for AddNode + AddLeaf
-//
-	iBuffer = new ( ELeave ) CArrayFixFlat <TNSmlDSBufferElement> ( KNSmlDSGranularity );
-
-    iSyncSessionOpen = EFalse;
-
-    iPortNbr = 0;
-    iBufferExecution = EFalse;
-	}
-	
-//------------------------------------------------------------------------------
-//  CNSmlDSSettingsAdapter::DDFVersionL
-//------------------------------------------------------------------------------
-void CNSmlDSSettingsAdapter::DDFVersionL(CBufBase& aVersion)
-	{
-	aVersion.InsertL( 0, KVersion );
-    }
-
-//------------------------------------------------------------------------------
-//  CNSmlDSSettingsAdapter::DDFStructureL
-//  Fills the DDF structure of the adapter.
-//------------------------------------------------------------------------------
-void CNSmlDSSettingsAdapter::DDFStructureL( MSmlDmDDFObject& aDDF )
-	{
-	_DBG_FILE("CNSmlDSSettingsAdapter::DDFStructureL(): begin");
-
-	TSmlDmAccessTypes *aclTypes = new ( ELeave ) TSmlDmAccessTypes();
-	CleanupStack::PushL( aclTypes );
-
-    //  Set Get as acceptable operations
-	aclTypes->SetGet();
-
-    MSmlDmDDFObject* ddfRoot = &aDDF;
-    MSmlDmDDFObject& ddf = ddfRoot->AddChildObjectL( KNSmlDdfRoot );
-    FillNodeInfoL( ddf, *aclTypes, MSmlDmDDFObject::EOne, 
-                    MSmlDmDDFObject::EPermanent, MSmlDmDDFObject::ENode, 
-                    KNSmlDdfRootDescription, KNullDesC8, KMimeType );
-    
-    ddf.SetDFTitleL( KDSSettingsTitle );
-
-
-	MSmlDmDDFObject& nDSAcc = ddf.AddChildObjectL( KNSmlDefDSAcc );
-	nDSAcc.SetOccurenceL( MSmlDmDDFObject::EOne );
-	nDSAcc.SetDefaultValueL( KNullDesC8 );
-	nDSAcc.SetScopeL( MSmlDmDDFObject::EPermanent );
-	nDSAcc.SetAccessTypesL( *aclTypes );
-	nDSAcc.SetDFFormatL( MSmlDmDDFObject::ENode );
-//
-//  Set rest acceptable operations for data itself
-//
-    aclTypes->SetAdd();
-	aclTypes->SetReplace();
-	aclTypes->SetDelete();
-
-	TSmlDmAccessTypes aclTypesLimit;
-	aclTypesLimit.SetGet();
-	aclTypesLimit.SetAdd();
-
-	TSmlDmAccessTypes aclTypesGet;
-	aclTypesGet.SetGet();
-
-	TSmlDmAccessTypes aclTypesNoGet;
-	aclTypesNoGet.SetReplace();
-	aclTypesNoGet.SetAdd();
-	aclTypesNoGet.SetDelete();
-
-	TSmlDmAccessTypes aclTypesNoDelete;
-	aclTypesNoDelete.SetGet();
-	aclTypesNoDelete.SetAdd();
-	aclTypesNoDelete.SetReplace();
-
-	MSmlDmDDFObject& nProDDF = nDSAcc.AddChildObjectGroupL();
-    FillNodeInfoL( nProDDF, *aclTypes, MSmlDmDDFObject::EZeroOrMore, 
-                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::ENode, 
-                    KNullDesC8, KNullDesC8, KMimeType );
-
-	MSmlDmDDFObject& nAddrDDF = nProDDF.AddChildObjectL(KNSmlDdfAddr);	// Addr
-	FillNodeInfoL( nAddrDDF, *aclTypes, MSmlDmDDFObject::EOne, 
-                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::EChr, 
-                    KNSmlDdfAddrDescription, KNullDesC8, KMimeType );
-
-	MSmlDmDDFObject& nAddrTypeDDF = nProDDF.AddChildObjectL(KNSmlDdfAddrType);	// AddrType
-    FillNodeInfoL( nAddrTypeDDF, *aclTypes, MSmlDmDDFObject::EZeroOrOne, 
-                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::EChr, 
-                    KNSmlDdfAddrTypeDescription, KNullDesC8, KMimeType );
-
-	MSmlDmDDFObject& nPortNbrDDF = nProDDF.AddChildObjectL(KNSmlDdfPortNbr);// PortNbr
-	FillNodeInfoL( nPortNbrDDF, *aclTypes, MSmlDmDDFObject::EZeroOrOne, 
-                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::EInt, 
-                    KNSmlDdfPortNbrDescription, KNullDesC8, KMimeType );
-
-	MSmlDmDDFObject& nNameDDF = nProDDF.AddChildObjectL(KNSmlDdfName);	// Name
-	FillNodeInfoL( nNameDDF, *aclTypes, MSmlDmDDFObject::EZeroOrOne, 
-                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::EChr, 
-                    KNSmlDdfNameDescription, KNullDesC8, KMimeType );
-
-	MSmlDmDDFObject& nDBrootDDF = nProDDF.AddChildObjectL(KNSmlDdfDB);	// DB
-    FillNodeInfoL( nDBrootDDF, *aclTypes, MSmlDmDDFObject::EZeroOrOne, 
-                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::ENode, 
-                    KNSmlDdfDBDescription, KNullDesC8, KMimeType );
-
-	MSmlDmDDFObject& nDBDDF = nDBrootDDF.AddChildObjectGroupL(); // DB/<X>
-    FillNodeInfoL( nDBDDF, *aclTypes, MSmlDmDDFObject::EZeroOrMore, 
-                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::ENode, 
-                    KNullDesC8, KNullDesC8, KMimeType );
-
-	MSmlDmDDFObject& nCTTypeDDF = nDBDDF.AddChildObjectL(KNSmlDdfCTType);	// CTType
-	FillNodeInfoL( nCTTypeDDF, aclTypesLimit, MSmlDmDDFObject::EOne, 
-                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::EChr, 
-                    KNSmlDdfCTTypeDescription, KNullDesC8, KMimeType );
-
-	MSmlDmDDFObject& nRDBURIDDF = nDBDDF.AddChildObjectL(KNSmlDdfRDBURI);	// RDBURI
-	FillNodeInfoL( nRDBURIDDF, aclTypesNoDelete, MSmlDmDDFObject::EOne, 
-                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::EChr, 
-                    KNSmlDdfRDBURIDescription, KNullDesC8, KMimeType );
-
-	MSmlDmDDFObject& nLDBURIDDF = nDBDDF.AddChildObjectL(KNSmlDdfLDBURI);	// LDBURI
-    FillNodeInfoL( nLDBURIDDF, aclTypesNoDelete, MSmlDmDDFObject::EOne, 
-                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::EChr, 
-                    KNSmlDdfLDBURIDescription, KNullDesC8, KMimeType );
-
-	MSmlDmDDFObject& nClientUserNameDDF = nProDDF.AddChildObjectL(KNSmlDdfClientUserName);
-    FillNodeInfoL( nClientUserNameDDF, *aclTypes, MSmlDmDDFObject::EZeroOrOne, 
-                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::EChr, 
-                    KNSmlDdfClientUserNameDescription, KNullDesC8, KMimeType );
-
-	MSmlDmDDFObject& nServerIdDDF = nProDDF.AddChildObjectL(KNSmlDdfServerId);
-    FillNodeInfoL( nServerIdDDF, *aclTypes, MSmlDmDDFObject::EZeroOrOne, 
-                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::EChr, 
-                    KNSmlDdfServerIdDescription, KNullDesC8, KMimeType );
-
-	MSmlDmDDFObject& nClientPWDDF = nProDDF.AddChildObjectL(KNSmlDdfClientPW);// ClientPW
-	FillNodeInfoL( nClientPWDDF, aclTypesNoGet, MSmlDmDDFObject::EOne, 
-                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::EChr, 
-                    KNSmlDdfClientPWDescription, KNullDesC8, KMimeType );
-
-	MSmlDmDDFObject& nToNAPIDDDF = nProDDF.AddChildObjectL(KNSmlDdfToNAPID);// ToNAPID
-    FillNodeInfoL( nToNAPIDDDF, aclTypesNoDelete, MSmlDmDDFObject::EOne, 
-                    MSmlDmDDFObject::EDynamic, MSmlDmDDFObject::EChr, 
-                    KNSmlDdfToNAPIDDescription, KNullDesC8, KMimeType );
-
-	CleanupStack::PopAndDestroy(); //aclTypes
-	_DBG_FILE("CNSmlDSSettingsAdapter::DDFStructureL(): end");
-	}
-
-//------------------------------------------------------------------------------
-//  CNSmlDSSettingsAdapter::UpdateLeafObjectL
-//  The function updates the leaf object data.
-//------------------------------------------------------------------------------
-void CNSmlDSSettingsAdapter::UpdateLeafObjectL( const TDesC8& aURI, 
-                                                const TDesC8& aParentLUID, 
-                                                const TDesC8& aObject, 
-                                                const TDesC8& /*aType*/, 
-                                                const TInt aStatusRef )
-	{
-	_DBG_FILE("CNSmlDSSettingsAdapter::UpdateLeafObjectL(): begin");
-//
-//	Check which field going to be handled
-//
-	// Static node feature start
-		TInt profileLUID = -1;
-		if(aParentLUID.Length() == 0 )
-		{
-			iLUID = -1;
-			if( IsDSAccUriFormatMatchPredefined(aURI) )
-    	{
-    		iLUID = ConstructTreeL(aURI);
-    		profileLUID = GetProfileIdFromURIL( aURI ); 
-    	}    	
-    	if ((iLUID == 0 ) && (aURI.Match(_L8("SyncML/DSAcc/DSId*/DB/CTId*"))  == KErrNone))
-			{
-				_DBG_FILE("CNSmlDSSettingsAdapter::FetchObjectL(): ENotFound end");
-				iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-				return;
-    	}
-    }
-		// Static node feature end
-	SetField( aURI );
-    TInt fieldID = GetDSField();
-	TInt fieldType = GetDSFieldTypeL();
-	if ( fieldType == EWrong || fieldID < 0 )
-		{
-		_DBG_FILE("CNSmlDSSettingsAdapter::UpdateLeafObjectL(): EError end");
-		iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-		return;
-		}
-	if(profileLUID == -1)
-    	profileLUID = GetIntObject( aParentLUID );
-	
-	if( profileLUID == -1 && fieldType != EParam )
-		{
-		_DBG_FILE("CNSmlDSSettingsAdapter::UpdateLeafObjectL( ): ENotFound end");
-		iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-		return;
-		}	
-    
-    if ( fieldType == EParam )
-		{
-		if( GetBufferIndex( aURI ) >= 0 && iBufferExecution == EFalse )
-			{
-			AddLeafBufferL( aURI, aParentLUID, aObject, aStatusRef );
-            return;
-			}
-		profileLUID = GetProfileIdFromURIL( aURI );
-        if( FindProfileIdL( profileLUID ) == EFalse )
-            {
-            iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-			return;
-            }
-        if( iField->Compare( KNSmlDdfCTType ) == 0 )
-            {
-            if( MimeTypeAllreadyExitsL( profileLUID, aObject ) )
-                {
-                iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EAlreadyExists );
-                return;
-                }
-            if( aObject.Length() == 0 )
-                {
-                iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EInvalidObject );
-                return;
-                }
-            }
-        }
-
-	if( profileLUID != iParentLUID && fieldType != EParam )
-		{											    
-		if( FindProfileIdL( profileLUID ) )
-			{
-			iParentLUID = profileLUID;
-			}
-		else
-			{
-			iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-			return;
-			}
-		}
-	if ( fieldType == EStr || fieldType == EInt )
-		{
-//
-//		Check if Object length id valid
-//
-		if( NotValidStrLenght( fieldID, aObject ) )
-			{
-			_DBG_FILE("CNSmlDSSettingsAdapter::AddLeafObjectL(): KErr length end");
-			iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ETooLargeObject );
-			return;
-			}
-		}
-
-    TInt ret = 0;
-	if ( fieldType == EStr || fieldType == EInt )
-		{
-		if( fieldID == EProfileURL )
-			{
-			TInt num=0;
-            ret = ParseUri( aObject, num );
-            if( ret == KErrNone )
-				{
-			    ret = SetProfileServerURIL( iParentLUID, aObject );
-                if( ret != 0 )
-					{
-					_DBG_FILE("CNSmlDSSettingsAdapter::AddLeafObjectL(): URI set failed");
-					iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-					return;
-					}
-				}
-			else //if port number not included in URL
-				{
-                ret = SetProfileServerURIL( iParentLUID, aObject );
-                if( ret != 0 )
-					{
-					_DBG_FILE("CNSmlDSSettingsAdapter::AddLeafObjectL(): URI set failed");
-					iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-					return;
-					}
-				}
-		    		    
-			}
-		else if( fieldID == EProfileURL )
-			{
-			ret = SetProfileServerURIL( iParentLUID, aObject );
-            }
-        else if( fieldID == EProfileMediumType )//AddrType
-			{
-			if ( iLeafType == EDSDelete )
-			    {
-                iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
-	            return;            
-			    }
-            iObject = GetIntObject( aObject );
-            ret = SetProfileAddrTypeL( iParentLUID, iObject );
-			}
-        else
-			{
-			ret = SetProfileStrValueL( iParentLUID, aObject, fieldID );
-			}
-		}
-	else if ( fieldType == EParam )
-		{
-        TInt sRet = KErrGeneral;
-        if( iField->Compare( KNSmlDdfCTType ) == 0 ) //Task Mime Type
-			{
-//			DBG_ARGS8(_S8("NEW: Object <%S>"), &aObject);
-			TInt dataProviderId(-1);
-			if(aParentLUID.Length() == 0 )
-			{
-				dataProviderId = iLUID ;
-			}
-			else
-			{
-				dataProviderId = GetIntObject( aParentLUID );
-			}
-            if( FindTaskIDL( profileLUID, dataProviderId ) == EFalse )
-                {
-                sRet = AddNewDataProviderL( profileLUID, aObject, dataProviderId );
-                }
-            else
-                {
-                sRet = KErrAlreadyExists;
-                }
-            if( sRet == KErrDiskFull )
-			    {
-				iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EDiskFull );
-				}
-			else if( sRet == KErrNotFound )
-                {
-                iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-                }
-            else if( sRet == KErrAlreadyExists )
-                {
-                iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EAlreadyExists );
-                }
-            else if( sRet != KErrNone )
-			    {
-				iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-				}
-            else
-                {
-                TPtrC8 addDBURI = RemoveLastURISeg( aURI ); 
-				TBuf8<16> dataProvider;
-				dataProvider.Num( dataProviderId );
-		    	iCallBack->SetMappingL( addDBURI, dataProvider );
-				SetBufferLUID( aURI,dataProviderId );
-				iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EOk ); 
-				
-				
-                }                        
-            return;
-            }
-        //
-        // Only database values handled
-        //
-/*		if( iField->Compare( KNSmlDdfLDBURI ) == 0 )
-		    {
-			iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-			return;
-		    }
-*/
-		if( !(iField->Compare( KNSmlDdfLDBURI ) == 0) &&
-		    !(iField->Compare( KNSmlDdfRDBURI ) == 0) )	
-		    {
-			_DBG_FILE("CNSmlDSSettingsAdapter::AddLeafObjectL(): Param header end");
-			iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
-			return;
-			}
-
-
-        TInt dataProviderId(-1);
-		if(aParentLUID.Length() == 0 )
-		{
-			dataProviderId = iLUID ;
-		}
-		else
-		{
-        	dataProviderId = GetIntObject( aParentLUID );
-		}
-        if( FindTaskIDL( profileLUID, dataProviderId ) )
-            {
-            ret = UpdateDataSourceL( profileLUID, dataProviderId, aObject, *iField);
-            if( ret != KErrNone )
-                {
-                ret = KErrGeneral;
-                }
-            TPtrC8 dbURI = RemoveLastURISeg( aURI ); 
-		    TBuf8<16> dataProvider;
-		    dataProvider.Num( dataProviderId );
-		    iCallBack->SetMappingL( dbURI, dataProvider );
-			}
-		else
-		    {
-		    ret = KErrNone;
-		    //ret = KErrNotFound;
-			}
-        }
-	
-    if ( ret != KErrNone )
-		{
-		if( ret == KErrDiskFull)
-			{
-			iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EDiskFull );
-			}
-        else if( ret == KErrNotFound )
-            {
-            iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-            }
-        else if( ret == KErrArgument )
-            {
-            iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EInvalidObject );
-            }
-        else if( ret == KErrOverflow)
-            {
-            iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ETooLargeObject  );
-            }
-		else
-			{
-			iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-			}
-		}
-	else if ( fieldID == EProfilePort )
-	    {
-        // in case port is updated, save status ref to be used in 
-        // CompleteOutstandingCmdsL (i.e. status not set yet)
-        iPortBufStatusRef = aStatusRef;
-	    }
-	else
-	    {
-    	iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
-	    }
-	
-	_DBG_FILE("CNSmlDSSettingsAdapter::AddLeafObjectL(): end");
-	return;
-	}
-
-//------------------------------------------------------------------------------
-//  CNSmlDSSettingsAdapter::DeleteObjectL
-//  The function Deletes leaf object data or node data content.
-//------------------------------------------------------------------------------
-void CNSmlDSSettingsAdapter::DeleteObjectL( const TDesC8& aURI, 
-                                            const TDesC8& aLUID, 
-                                            const TInt aStatusRef )
-	{
-    _DBG_FILE("CNSmlDSSettingsAdapter::DeleteObjectL( ): begin");
-	iLUID = IntLUID( aLUID );
-	if( aLUID.Length() == 0 )
-		{
-		_DBG_FILE("CNSmlDSSettingsAdapter DELETE::DeleteObjectL( ): ENotFound end");
-		iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-		return;
-		}
-
-//
-//	Check which field going to be handled
-//
-	SetField( aURI );
-    if ( iField->Compare( KNSmlDdfCTType ) == 0 
-        || iField->Compare( KNSmlDdfRDBURI ) == 0 
-        || iField->Compare( KNSmlDdfLDBURI ) == 0 
-        || iField->Compare( KNSmlDdfToNAPID ) == 0 )
-		{
-		_DBG_FILE("CNSmlDSSettingsAdapter DELETE::DeleteObjectL( ): EError end");
-		iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-		return;
-		}
-	
-	TInt last = aURI.LocateReverse( KNSmlDMUriSeparator );
-	TInt pos  = aURI.Find( KNSmlDefDSAcc );
-
-	if(last - 5 == pos )
-		{
-		iLUID = IntLUID( aLUID );
-		if( !FindProfileIdL( iLUID ) )
-			{
-			_DBG_FILE("CNSmlDSSettingsAdapter::DeleteObjectL( ): notfound end");
-			iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-			return;
-			}
-		else
-			{
-			TInt sRet = DeleteProfileL( iLUID );
-			if( sRet!=KErrNone )
-				{
-				_DBG_FILE("CNSmlDSSettingsAdapter::DeleteObjectL( ): ENotCommitted end");
-				if( sRet == KErrNotFound )
-				    {
-                    iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-				    }
-				else if( sRet == KErrInUse )
-				    {
-                    iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EObjectInUse );
-				    }
-				else
-                    {
-                    iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-                    }
-				return;
-				}
-			else
-				{
-				iPrevURI->Des().Format( KNullDesC8 );
-				iPrevLUID = 0;
-				_DBG_FILE("CNSmlDSSettingsAdapter::DeleteObjectL( ): EOk end");
-				iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
-				return;
-				}
-			}
-		}
-	else if( aURI.Match( KDBUri1 ) != KErrNotFound )
-		{
-		iLUID = GetProfileIdFromURIL( aURI ); // Get profile Id for DB-level
-		if (iLUID < 0)
-			{
-			_DBG_FILE("CNSmlDSSettingsAdapter::DeleteObjectL( ): EError end");
-			iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-			return;
-			}
-
-		if( !FindProfileIdL( iLUID ) )
-			{
-			_DBG_FILE("CNSmlDSSettingsAdapter::DeleteObjectL( ): ENotFound end");
-			iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-			return;
-			}
-		TInt adapterId = GetIntObject( aLUID );//Get task ID
-        TInt retval =  DeleteTaskByIDL( iLUID, adapterId );
-        if( retval != KErrNone )
-            {
-            if( retval == KErrNotFound )
-                {
-                _DBG_FILE("CNSmlDSSettingsAdapter::DeleteObjectL( ): ENotFound end");
-                iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-                }
-            else
-				{
-				_DBG_FILE("CNSmlDSSettingsAdapter::DeleteObjectL( ): EError end");
-                iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-               	}
-            }
-		else
-            {
-            _DBG_FILE("CNSmlDSSettingsAdapter::DeleteObjectL( ): EOk end");
-		    iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
-            }
-        return;
-		}
-
-	iLUID = IntLUID( aLUID );
-
-	if ( iLUID != iParentLUID )
-		{
-		if( !FindProfileIdL( iLUID ) )
-			{
-			_DBG_FILE("CNSmlDSSettingsAdapter::DeleteObjectL( ): end");
-			iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-			return;
-			}
-		iParentLUID = iLUID;
-		}
-
-	HBufC8* lObject = HBufC8::NewLC( 15 );
-    lObject->Des().Format( KNullDesC8 );
-	
-	iLeafType = EDSDelete;
-	UpdateLeafObjectL( aURI, aLUID, *lObject, KMimeType, aStatusRef );
-	iLeafType = EDSUnset;
-
-	_DBG_FILE("CNSmlDSSettingsAdapter::DeleteObjectL( ): end");
-	CleanupStack::PopAndDestroy(); //lObject 
-	return;
-	}
-
-//------------------------------------------------------------------------------
-//  CNSmlDSSettingsAdapter::FetchLeafObjectL
-//  The function fetches the leaf object data.
-//------------------------------------------------------------------------------
-void CNSmlDSSettingsAdapter::FetchLeafObjectL( const TDesC8& aURI, 
-                                                const TDesC8& aLUID, 
-                                                const TDesC8& aType, 
-                                                const TInt aResultsRef, 
-                                                const TInt aStatusRef )
-	{
-	_DBG_FILE("CNSmlDSSettingsAdapter::FetchLeafObjectL(): begin");
-	DBG_ARGS(_S16("DS:Fetch aURI    - %S - %S"), &aURI, &aLUID);
-
-    CBufBase *lObject = CBufFlat::NewL( 128 );
-	CleanupStack::PushL( lObject );
-	lObject->Reset();
-    if( FetchObjectL( aURI, aLUID, lObject, aStatusRef ) != KErrNone )
-        {
-        CleanupStack::PopAndDestroy(); //lObject
-        _DBG_FILE("CNSmlDSSettingsAdapter::FetchLeafObjectL() : Error end");
-        return;
-        };
-    iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
-    iCallBack->SetResultsL( aResultsRef, *lObject, aType );
-	CleanupStack::PopAndDestroy(); //object    
-    _DBG_FILE("CNSmlDSSettingsAdapter::FetchLeafObjectL() : end");
-    return;
-	}
-
-//------------------------------------------------------------------------------
-//  CSmlDSSettingsAdapter::ChildURIListL
-//  Function returns the list of profiles or leafs of the profile 
-//  acording to aURI.
-//------------------------------------------------------------------------------
-void CNSmlDSSettingsAdapter::ChildURIListL( const TDesC8& aURI, 
-                                            const TDesC8& aLUID, 
-                                            const CArrayFix<TSmlDmMappingInfo>& aPreviousURISegmentList, 
-                                            const TInt aResultsRef, const TInt aStatusRef )
-	{
-    _DBG_FILE("CNSmlDSSettingsAdapter::ChildURIListL(): begin");
-//	DBG_ARGS(_S16("ChildURIListL URI - <%S>"), &aURI);
-
-	CBufBase *currentURISegmentList = CBufFlat::NewL( 128 );
-	CleanupStack::PushL( currentURISegmentList );
-
-	if( aURI.Match( KDSAccMatch ) != KErrNotFound &&
-	   aURI.Match( KDSAccMatch2 ) == KErrNotFound )
-		{
-		//
-		//	Check if Profile exists
-		//
-		TInt checkLUID = GetIntObject( aLUID ); 
-		if( FindProfileIdL( checkLUID ) )
-		{
-			currentURISegmentList->InsertL( currentURISegmentList->Size(), KSegmDSAcc );
-			iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
-		   	iCallBack->SetResultsL( aResultsRef, *currentURISegmentList, KNullDesC8 );
-        }
-        else
-        {
-			checkLUID = -1;
-			if( IsDSAccUriFormatMatchPredefined(aURI) )
-		    {
-		    	checkLUID = ConstructTreeL(aURI); 
-    		}    	
-    		if (checkLUID == -1 ) 
-		    {
-		    	_DBG_FILE( "CNSmlDMSettingsAdapter::childURI(): ENotFound end" );
-				iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-				CleanupStack::PopAndDestroy(  ); // currentURISegmentList
-        		_DBG_FILE( "CNSmlDMSettingsAdapter::ChildURIListL(): end" );
-			    return;
-		   	}
-		    else
-		    {
-       		    currentURISegmentList->InsertL( currentURISegmentList->Size(), KSegmDSAcc );
- 				iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
-			    iCallBack->SetResultsL( aResultsRef, *currentURISegmentList, KNullDesC8 );
-		    	}
-    	
-			// Static node feature start end
-
-			_DBG_FILE("CNSmlDSSettingsAdapter::ChildURIListL(): end");
-			CleanupStack::PopAndDestroy(); //currentURISegmentList 
-			return;
-		}
-		}		
-	else if( aURI.Match( KDSDBMatch ) != KErrNotFound )
-		{
-		//
-		//	Check if ContenType exists (profileId from adapters)
-		// 
-		TInt profileLUID = GetProfileIdFromURIL( aURI ); // ProfileId for DB-level
-        if( OpenSyncSessionAndDSProfileL( profileLUID, ESmlOpenRead ) == KErrNone )
-            {
-            RArray<TSmlTaskId> taskIdArray;
-            CleanupClosePushL( taskIdArray );
-            iDSProfile.ListTasksL( taskIdArray );
-            if( taskIdArray.Count() == 0 )
-                {
-                currentURISegmentList->InsertL( currentURISegmentList->Size(), KNullDesC8 );
-                }
-            else
-                {
-                currentURISegmentList->InsertL( currentURISegmentList->Size(), KSegmDSAcc2 );
-                }
-            CloseDSProfile();
-            CleanupStack::PopAndDestroy();//taskIdArray
-            }
-        else
-            { 
-            iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-		    _DBG_FILE("CNSmlDSSettingsAdapter::ChildURIListL(): CT-NOTFOUND end");
-			CleanupStack::PopAndDestroy();//currentURISegmentList 
-			return;
-            }
-            
-        iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
-		iCallBack->SetResultsL( aResultsRef, *currentURISegmentList, KNullDesC8 );
-		_DBG_FILE("CNSmlDSSettingsAdapter::ChildURIListL(): end");
-		CleanupStack::PopAndDestroy(); //currentURISegmentList
-		return;
-		}
-//
-//	Handle ContentType (DB) request -> TASKS of the profile
-//
-	if( aURI.Match( KDSDBMatch2 ) != KErrNotFound )
-		{
-		TInt lProfileId = GetIntObject( aLUID ); 
-		
-		if( ! FindProfileIdL( lProfileId ) )
-			{
-			_DBG_FILE("CNSmlDSSettingsAdapter::ChildURIListL(): NOTFOUND CTTYPE end");
-			CleanupStack::PopAndDestroy();// currentURISegmentList
-			iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-			return;
-			}
-		
-        TInt ret = CreateURITaskSegmentListL( aURI, lProfileId, currentURISegmentList, 
-                                                aPreviousURISegmentList );
-		if( ret != KErrNone && ret != KErrNotFound )
-			{
-			_DBG_FILE("CNSmlDSSettingsAdapter::ChildURIListL(): ContentType error end");
-			CleanupStack::PopAndDestroy();// currentURISegmentList
-			iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-			return;
-			}
-		_DBG_FILE("CNSmlDSSettingsAdapter::ChildURIListL(): CTTYPE-OK end");
-		iCallBack->SetResultsL( aResultsRef, *currentURISegmentList, KNullDesC8);
-		iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );	
-		CleanupStack::PopAndDestroy();// currentURISegmentList
-		return;
-		}
-
-	
-    TInt ret = CreateURIProfileSegmentListL( currentURISegmentList, aPreviousURISegmentList );
-
-    if( ret != KErrNone )
-	    {
-		_DBG_FILE("CNSmlDSSettingsAdapter::ChildURIListL(): Profile not found end");
-		CleanupStack::PopAndDestroy();// currentURISegmentList
-		iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-		return;
-		}
-   
-	iCallBack->SetResultsL( aResultsRef, *currentURISegmentList, KNullDesC8 );
-	CleanupStack::PopAndDestroy(); // currentURISegmentList
-	iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
-	_DBG_FILE("CNSmlDSSettingsAdapter::ChildURIListL(): end");
-	return;
-    }
-
-//------------------------------------------------------------------------------
-//  CNSmlDSSettingsAdapter::AddNodeObjectL
-//  The function adds the new node object.
-//------------------------------------------------------------------------------
-void CNSmlDSSettingsAdapter::AddNodeObjectL( const TDesC8& aURI, 
-                                                const TDesC8& aParentLUID, 
-                                                const TInt aStatusRef )
-	{
-	_DBG_FILE("CNSmlDSSettingsAdapter::AddNodeObjectL(): begin");
-//
-//	Check if ContentType-add and insert to Buffer
-//
-    iParentLUID = GetIntObject( aParentLUID );
-    
-	if( aURI.Match( KDSDBAddMatch )!= KErrNotFound &&
-		aURI.Match( KDSDBAddMatch2 )== KErrNotFound )
-		{
-		if( aParentLUID.Length() > 0 && iParentLUID >= 0 && iBufferExecution == EFalse )
-			{
-            AddNodeBufferL( aURI, aParentLUID, aStatusRef );
-            }
-		else if( iParentLUID < 0 )
-			{
-			iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
-			_DBG_FILE("CNSmlDSSettingsAdapter::AddNodeObjectL(): end");
-			}
-		else
-			{
-			iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-			_DBG_FILE("CNSmlDSSettingsAdapter::AddNodeObjectL(): end");
-			}
-		return;
-		}
-    
-	if( aURI.Match(KDSDBAddMatch3) != KErrNotFound )
-		{
-		if( FindProfileIdL( iParentLUID ) ) // Profile on database
-			{
-			iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
-			_DBG_FILE("CNSmlDSSettingsAdapter::AddNodeObjectL(): end");
-			}
-		else
-			{
-			iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-			_DBG_FILE("CNSmlDSSettingsAdapter::AddNodeObjectL(): end");
-			}
-		return;
-		}
-   
-	if( FindProfileIdL( iParentLUID ) )
-		{
-		iCallBack->SetStatusL(aStatusRef,CSmlDmAdapter::EAlreadyExists);
-		_DBG_FILE("CNSmlDSSettingsAdapter::AddNodeObjectL(): EAlreadyExists end");
-		return;
-		}
-	else
-		{
-		if( aParentLUID.Length() > 0 )
-		{		
-			TInt ret = iCallBack->RemoveMappingL(KNSmlDSSettingsAdapterImplUid,
-						GetDynamicDSNodeUri( aURI ), ETrue );
-			if(ret)
-				{
-				iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-				return;
-				}
-		}		
-        //
-        //	Create new profile
-        //
-   	    TInt newPID = -1;
-        TInt sRet = CreateNewProfileL( newPID );
-        if( sRet != KErrNone || newPID < 0 )
-		    {	
-		    if( sRet == KErrDiskFull )
-			    {
-			    iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EDiskFull );
-			    }
-		    else if( sRet == KErrInUse )
-			    {
-			    iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EObjectInUse );
-			    }
-		    else
-			    {
-			    iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EError );
-			    }
-		    return;
-		    }
-		//
-        //	Get new ProfileId from database
-        //
-	    iLUID = newPID;
-        //
-   	    TBuf8<8> newLUID;
-	    newLUID.Num( iLUID );
-	    iCallBack->SetMappingL( aURI, newLUID );
-        newLUID.Delete( 0, newLUID.Size() );
-        }
-	iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
-	_DBG_FILE("CNSmlDSSettingsAdapter::AddNodeObjectL(): end");
-    return;
-	}
-
-//------------------------------------------------------------------------------
-//  CNSmlDSSettingsAdapter::UpdateLeafObjectL
-//------------------------------------------------------------------------------
-void CNSmlDSSettingsAdapter::UpdateLeafObjectL( const TDesC8& /*aURI*/, 
-                                                const TDesC8& /*aLUID*/, 
-                                                RWriteStream*& /*aStream*/, 
-                                                const TDesC8& /*aType*/, 
-                                                const TInt /*aStatusRef*/ )
-	{
-	//Not supported since streaming is not supported by the adapter.
-	}
-	
-//------------------------------------------------------------------------------
-//  CNSmlDSSettingsAdapter::FetchLeafObjectSizeL
-//  The function fetches the size of the leaf object data.
-//------------------------------------------------------------------------------
-void CNSmlDSSettingsAdapter::FetchLeafObjectSizeL( const TDesC8& aURI, 
-                                                    const TDesC8& aLUID, 
-                                                    const TDesC8& aType, 
-                                                    const TInt aResultsRef, 
-                                                    const TInt aStatusRef )
-	{
-	_DBG_FILE("CNSmlDSSettingsAdapter::FetchLeafObjectSizeL() : begin");
-    CBufBase *lObject = CBufFlat::NewL( 128 );
-	CleanupStack::PushL( lObject );
-	lObject->Reset();
-    if( FetchObjectL( aURI, aLUID, lObject, aStatusRef ) != KErrNone )
-        {
-        CleanupStack::PopAndDestroy(); //lObject
-        _DBG_FILE("CNSmlDSSettingsAdapter::FetchLeafObjectSizeL() : Error end");
-        return;
-        };
-    TInt objSizeInBytes = lObject->Size();
-	TBuf8<16> stringObjSizeInBytes;
-	stringObjSizeInBytes.Num( objSizeInBytes );
-	lObject->Reset();
-    lObject->InsertL( 0, stringObjSizeInBytes );
-	
-	iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EOk );
-	iCallBack->SetResultsL( aResultsRef, *lObject, aType );
-	CleanupStack::PopAndDestroy(); //object
-    _DBG_FILE("CNSmlDSSettingsAdapter::FetchLeafObjectSizeL() : end");
-    return;
-    }
-
-//------------------------------------------------------------------------------
-//  CNSmlDSSettingsAdapter::ExecuteCommandL
-//------------------------------------------------------------------------------
-void CNSmlDSSettingsAdapter::ExecuteCommandL( const TDesC8& /*aURI*/, 
-                                                const TDesC8& /*aLUID*/, 
-                                                const TDesC8& /*aArgument*/, 
-                                                const TDesC8& /*aType*/, 
-                                                const TInt /*aStatusRef*/ )
-	{
-	// Not supported	
-	}
-
-//------------------------------------------------------------------------------
-//  CNSmlDSSettingsAdapter::ExecuteCommandL
-//------------------------------------------------------------------------------
-void CNSmlDSSettingsAdapter::ExecuteCommandL( const TDesC8& /*aURI*/, 
-                                                const TDesC8& /*aLUID*/, 
-                                                RWriteStream*& /*aStream*/, 
-                                                const TDesC8& /*aType*/, 
-                                                const TInt /*aStatusRef*/ )
-	{
-	// Not supported by the adapter.
-	}
-
-//------------------------------------------------------------------------------
-//  CNSmlDSSettingsAdapter::CopyCommandL
-//------------------------------------------------------------------------------
-void CNSmlDSSettingsAdapter::CopyCommandL( const TDesC8& /*aTargetURI*/, 
-                                            const TDesC8& /*aTargetLUID*/, 
-                                            const TDesC8& /*aSourceURI*/, 
-                                            const TDesC8& /*aSourceLUID*/, 
-                                            const TDesC8& /*aType*/, 
-                                            TInt /*aStatusRef*/ )
-	{
-	// Not supported by the adapter.
-	}
-
-//------------------------------------------------------------------------------
-//  CNSmlDSSettingsAdapter::StartAtomicL
-//------------------------------------------------------------------------------
-void CNSmlDSSettingsAdapter::StartAtomicL()
-	{
-	// Atomic commands not supported by the adapter.
-	}
-
-//------------------------------------------------------------------------------
-//  CNSmlDSSettingsAdapter::CommitAtomicL
-//------------------------------------------------------------------------------
-void CNSmlDSSettingsAdapter::CommitAtomicL()
-	{
-	// Atomic commands not supported by the adapter.
-	}
-
-//------------------------------------------------------------------------------
-//  CNSmlDSSettingsAdapter::RollbackAtomicL
-//------------------------------------------------------------------------------
-void CNSmlDSSettingsAdapter::RollbackAtomicL()
-	{
-	// Atomic commands not supported by the adapter.
-	}
-
-//------------------------------------------------------------------------------
-//  CNSmlDSSettingsAdapter::StreamingSupport()
-//  Indicates if streaming is supported.
-//------------------------------------------------------------------------------
-TBool CNSmlDSSettingsAdapter::StreamingSupport( TInt& /*aItemSize*/ )
-	{
-	return EFalse;
-	}
-
-//------------------------------------------------------------------------------
-//  CNSmlDSSettingsAdapter::StreamCommittedL
-//------------------------------------------------------------------------------
-void CNSmlDSSettingsAdapter::StreamCommittedL()
-	{
-	//  Not supported since streaming not supported by the adapter.
-	}
-//------------------------------------------------------------------------------
-//  CNSmlDSSettingsAdapter::CompleteOutstandingCmdsL
-//  The function completes all buffered command from the buffer.
-//------------------------------------------------------------------------------
-void CNSmlDSSettingsAdapter::CompleteOutstandingCmdsL()
-	{
-    
-//
-//	Handle unhandled nodes if any
-//
-    TInt count = iBuffer->Count();
-	for( TInt h = 0; h < count ; h++ )
-		{
-		TBuf8<150> commandURI;
-		commandURI.Append( iBuffer->At(0).iMappingName->Des() );
-		commandURI.Append( KDummyTxt );
-		TRAP_IGNORE( ExecuteBufferL( commandURI ) );
-		}
-	iBuffer->Reset();
-	CloseDSProfile();
-	
-	// if port was updated, set it
-    if ( iPortBuf )
-        {
-        TInt err = SetProfileConnectionPortNrL( iPortBufLUID, *iPortBuf );
-        
-        // set status
-        if ( err != KErrNone )
-            {
-            iCallBack->SetStatusL( iPortBufStatusRef, CSmlDmAdapter::EError );
-            }
-        else
-            {
-            iCallBack->SetStatusL( iPortBufStatusRef, CSmlDmAdapter::EOk );
-            }
-
-        delete iPortBuf;
-        iPortBuf = NULL;
-        }
-	}
-
-//------------------------------------------------------------------------------
-//  TBool CNSmlDSSettingsAdapter::AcceptDSField
-//  The function checks if leaf to be handled is valid for the adapter.
-//------------------------------------------------------------------------------
-TBool CNSmlDSSettingsAdapter::AcceptDSField()
-	{
-	_DBG_FILE("CNSmlDSSettingsAdapter::AcceptDSField(): begin");
-
-	if ( iField->Compare( KNSmlDdfAddrType ) == 0 )
-		{
-		return ETrue;
-		}
-	else if ( iField->Compare( KNSmlDdfAddr ) == 0 )
-		{
-		return ETrue;
-		}
-	else if ( iField->Compare( KNSmlDdfPortNbr ) == 0 )
-		{
-		return ETrue;
-		}
-	else if ( iField->Compare( KNSmlDdfClientUserName ) == 0 )
-		{
-		return ETrue;
-		}
-	else if ( iField->Compare( KNSmlDdfName ) == 0 )
-		{
-		return ETrue;
-		}
-	else if ( iField->Compare( KNSmlDdfCTType ) == 0 )
-		{
-		return ETrue;
-		}
-	else if ( iField->Compare( KNSmlDdfRDBURI ) == 0 )
-		{
-		return ETrue;
-		}
-	else if ( iField->Compare( KNSmlDdfLDBURI ) == 0 )
-		{
-		return ETrue;
-		}
-	else if ( iField->Compare( KNSmlDdfClientPW ) == 0 )
-		{
-		return ETrue;
-		}
-	else if ( iField->Compare( KNSmlDdfToNAPID ) == 0 )
-		{
-		return ETrue;
-		}
-	else if ( iField->Compare( KNSmlDdfHidden ) == 0 )
-		{
-		return EFalse;
-		}
-
-	_DBG_FILE("CNSmlDSSettingsAdapter::AcceptDSField(): end");
-	return EFalse;
-	}
-
-//------------------------------------------------------------------------------
-//  CNSmlDSSettingsAdapter::GetDSField
-//  The function checks what leaf to handled and returns enum value for the leaf.
-//------------------------------------------------------------------------------
-TInt CNSmlDSSettingsAdapter::GetDSField() const
-	{
-	_DBG_FILE("CNSmlDSSettingsAdapter::GetDSField(): begin");
-
-	if ( iField->Compare( KNSmlDdfAddrType ) == 0 )
-		{
-		return EProfileMediumType;
-		}
-	else if ( iField->Compare( KNSmlDdfAddr ) == 0 )
-		{
-		return EProfileURL;
-		}
-	else if ( iField->Compare( KNSmlDdfPortNbr ) == 0 )
-		{
-		return EProfilePort;
-		}
-	else if ( iField->Compare( KNSmlDdfClientUserName ) == 0 )
-		{
-		return EProfileSyncServerUsername;
-		}
-	else if ( iField->Compare( KNSmlDdfServerId ) == 0 )
-		{
-		return EProfileServerId;
-		}
-	else if ( iField->Compare( KNSmlDdfClientPW ) == 0 )
-		{
-		return EProfileSyncServerPassword;
-		}
-	else if ( iField->Compare( KNSmlDdfName ) == 0 )
-		{
-		return EProfileName;
-		}
-	else if ( iField->Compare( KNSmlDdfToNAPID ) == 0 )
-		{
-		return EProfileIAPId;
-		}
-	else if ( iField->Compare( KNSmlDdfHidden ) == 0 )
-		{
-		return EHiddenProfile;
-		}
-    else if ( iField->Compare( KNSmlDdfDB ) == 0 ||
-            iField->Compare( KNSmlDdfCTType ) == 0 ||
-            iField->Compare( KNSmlDdfCTVerL ) == 0 ||
-            iField->Compare( KNSmlDdfRDBURI ) == 0 ||
-            iField->Compare( KNSmlDdfLDBURI ) == 0 )
-		{
-		return ESyncAccepted;
-		}
-	
-	_DBG_FILE("CNSmlDSSettingsAdapter::GetDSField(): end");
-	return KErrNotFound;
-	}
-
-//------------------------------------------------------------------------------
-//  CNSmlDSSettingsAdapter::GetDSFieldTypeL
-//  The function return the data type for the leaf.
-//------------------------------------------------------------------------------
-TInt CNSmlDSSettingsAdapter::GetDSFieldTypeL() const
-	{
-	_DBG_FILE("CNSmlDSSettingsAdapter::GetDSFieldTypeL(): begin");
-
-	if ( iField->Compare( KNSmlDdfAddrType ) == 0 ||
-        iField->Compare( KNSmlDdfPortNbr ) == 0 ||
-        iField->Compare( KNSmlDdfToNAPID ) == 0 ||
-        iField->Compare( KNSmlDdfHidden ) == 0 )
-		{
-		return EInt;
-		}
-	else if ( iField->Compare( KNSmlDdfAddr ) == 0 ||
-            iField->Compare( KNSmlDdfClientUserName ) == 0 ||
-            iField->Compare( KNSmlDdfServerId ) == 0 ||
-            iField->Compare( KNSmlDdfClientPW ) == 0 ||
-            iField->Compare( KNSmlDdfName ) == 0 )
-		{
-		return EStr;
-		}
-	else if ( iField->Compare( KNSmlDdfDB ) == 0 ||
-            iField->Compare( KNSmlDdfCTType ) == 0 ||
-            iField->Compare( KNSmlDdfCTVerL ) == 0 ||
-            iField->Compare( KNSmlDdfRDBURI ) == 0 ||
-            iField->Compare( KNSmlDdfLDBURI ) == 0 )
-		{
-		return EParam;
-		}
-
-	_DBG_FILE("CNSmlDSSettingsAdapter::GetDSFieldTypeL(): end");
-	return EWrong;
-	}
-
-//------------------------------------------------------------------------------
-//  CNSmlDSSettingsAdapter::IntLUID
-//	Returns IntValue for aLUID.
-//------------------------------------------------------------------------------
-TInt CNSmlDSSettingsAdapter::IntLUID( const TDesC8& aLUID )
-	{
-
-	TLex8 lLex( aLUID );
-
-	if ( lLex.Val( iLUID ) == KErrNone )
-	    {
-	    return iLUID;
-	    }
-	else
-        {
-        return 0;
-        }
-	}
-
-//------------------------------------------------------------------------------
-//	CNSmlDSSettingsAdapter::GetIntObject
-//	Returns IntValue for a aObject
-//------------------------------------------------------------------------------
-TInt CNSmlDSSettingsAdapter::GetIntObject( const TDesC8& aObject )
-	{
-	TLex8 lLex( aObject );
-
-	TInt value = 0;
-
-	if ( lLex.Val( value ) == KErrNone )
-	    {
-	    return value;
-	    }
-	else
-        {
-        return KErrGeneral;
-        }
-	}
-
-//------------------------------------------------------------------------------
-//	CNSmlDSSettingsAdapter::GetIntObject16()
-//	Returns IntValue for a 16-bit aObject
-//------------------------------------------------------------------------------
-TInt CNSmlDSSettingsAdapter::GetIntObject16( const TDesC& aObject )
-	{
-	TLex lLex( aObject );
-
-	TInt value = 0;
-
-	if ( lLex.Val( value ) == KErrNone )
-	    {
-	    return value;
-	    }
-	else
-        {
-        return KErrGeneral;
-        }
-	}
-//------------------------------------------------------------------------------
-//	CNSmlDSSettingsAdapter::SetIntObjectLC
-//	Converts integer to HBufC8 type buffer and returns reference to it.
-//------------------------------------------------------------------------------
-TDesC8& CNSmlDSSettingsAdapter::SetIntObjectLC( const TInt& aObject )
-	{
-	HBufC8* buf = HBufC8::NewLC( 8 );
-	TPtr8 ptrBuf = buf->Des();
-
-	ptrBuf.Num( aObject );
-
-	return *buf;
-	}
-
-//------------------------------------------------------------------------------
-//	CNSmlDSSettingsAdapter::NotValidStrLenght
-//	The function checks if data length for a leaf is valid.
-//------------------------------------------------------------------------------
-
-TBool CNSmlDSSettingsAdapter::NotValidStrLenght( const TInt& aProfileItem, 
-                                                const TDesC8& aSource )
-	{
-	TInt lLen = aSource.Length();
-	TBool lBool = EFalse;
-	
-	switch ( aProfileItem )
-		{
-		case ( EProfileName ) :
-			{
-			if( lLen > KNSmlMaxProfileNameLength )
-				lBool = ETrue;	
-			}
-		break;
-		
-		case ( EProfileSyncServerUsername ) :
-			{
-			if( lLen > KNSmlMaxUsernameLength )
-				lBool = ETrue;	
-			}
-		break;
-
-		case ( EProfileSyncServerPassword ) :
-			{
-			if( lLen > KNSmlMaxPasswordLength )
-				lBool = ETrue;	
-			}
-		break;
-
-		case ( EProfileURL ) :
-			{
-			if( lLen > KNSmlMaxURLLength )
-				lBool = ETrue;	
-			}
-		break;
-
-		case ( EProfileIAPId ) :
-			{
-			if( lLen > KNSmlMaxURLLength )// Value from InternetAdapter for
-				lBool = ETrue;			// given URI ./AP/xxx
-			}
-		break;
-
-		case ( EProfilePort ) :
-		case ( EHiddenProfile ) :
-		case ( EProfileMediumType ) :
-			{
-			if( lLen > 8 )
-				lBool = ETrue;	
-			}
-		break;
-
-		case ( EProfileServerId ) :
-			{
-			if( lLen > KNSmlMaxUsernameLength )
-				lBool = ETrue;			
-			}
-		break;
-
-		default:
-			{
-			return ETrue;
-			}
-		}
-
-	return lBool;
-	}
-
-//------------------------------------------------------------------------------
-//	CNSmlDSSettingsAdapter::SetField
-//	The function finds out the last element of the URI.
-//------------------------------------------------------------------------------
-TInt CNSmlDSSettingsAdapter::SetField( const TDesC8& aSource )
-	{
-	if ( aSource.LocateReverse( KNSmlDMUriSeparator ) == KErrNotFound )
-	    {
-	    iField->Des().Format( aSource );
-	    }
-	else
-        {
-        iField->Des().Format( aSource.Mid( aSource.LocateReverse( KNSmlDMUriSeparator ) + 1 ) );
-        }
-
-    return KErrNone;
-	}
-
-//------------------------------------------------------------------------------
-//	CNSmlDSSettingsAdapter::ConvertTo8LC
-//	Converts 16-bit string value to 8-bit.
-//------------------------------------------------------------------------------
-TDesC8& CNSmlDSSettingsAdapter::ConvertTo8LC( const TDesC& aSource )
-	{
-	HBufC8* buf = HBufC8::NewLC( aSource.Length() * 2 );
-	TPtr8 bufPtr = buf->Des();
-	CnvUtfConverter::ConvertFromUnicodeToUtf8( bufPtr, aSource );
-    return *buf;
-	}
-
-//------------------------------------------------------------------------------
-//	CNSmlDSSettingsAdapter::ConvertTo16LC
-//	Converts 8-bit string value to 16-bit.
-//------------------------------------------------------------------------------
-TDesC16& CNSmlDSSettingsAdapter::ConvertTo16LC( const TDesC8& aSource )
-	{
-	HBufC16* buf16 = HBufC16::NewLC( aSource.Length() );
-	TPtr16 bufPtr16 = buf16->Des();
-	CnvUtfConverter::ConvertToUnicodeFromUtf8( bufPtr16, aSource );
-    return *buf16;
-	}
-
-//------------------------------------------------------------------------------
-//	CNSmlDSSettingsAdapter::AddNewDataProviderL
-//	Check if data provider exits and required MIME type is supported by the 
-//  data provider. If supported new task will be created.
-//------------------------------------------------------------------------------
-TInt CNSmlDSSettingsAdapter::AddNewDataProviderL( TInt aIntLUID, 
-                                                    const TDesC8& aMIMEType, 
-                                                    TInt& aDataProviderId )
-	{
-	_DBG_FILE("CNSmlDSSettingsAdapter::AddNewDataProviderL(): begin");
-    
-    TInt retVal = OpenSyncSessionAndDSProfileL( aIntLUID, ESmlOpenReadWrite );
-    if( retVal != KErrNone )
-		{
-        CloseDSProfile();
-        return KErrGeneral;	
-		}
-    if( iRdbDataStore->Size() <= 0 )
-        {
-        CloseDSProfile();
-        return KErrGeneral;
-        }
-    RArray<TSmlDataProviderId> dataProviderArray;
-    CleanupClosePushL( dataProviderArray );
-    iSyncSession.ListDataProvidersL( dataProviderArray );
-    TInt dataProviderCount = dataProviderArray.Count();
-    if( dataProviderCount == 0 )
-        {
-        CloseDSProfile();
-        CleanupStack::PopAndDestroy(); // dataProviderIdArray
-    	_DBG_FILE("CNSmlDSSettingsAdapter::AddNewDataProviderL(): dataprovirdercount == 0 End");
-        return KErrNotFound;   
-        }
-    HBufC8* object = aMIMEType.AllocLC();
-    TPtr8 objectPtr = object->Des();
-	objectPtr.LowerCase();
-    RSyncMLDataProvider dataProvider;
-        
-    for ( TInt i= 0; i < dataProviderCount; i++ )
-        {
-        dataProvider.OpenL( iSyncSession, dataProviderArray[i] );
-        CleanupClosePushL( dataProvider );   
-        for ( TInt n = 0; n < dataProvider.MimeTypeCount(); n++ )
-            {
-            HBufC* mimeType = dataProvider.MimeType(n).AllocLC();
-            if( objectPtr.CompareF( ConvertTo8LC( *mimeType ) ) == 0 ) //if MIME match
-                {
-               	_DBG_FILE("CNSmlDSSettingsAdapter::AddNewDataProviderL(): Mimetype found");
-
-                aDataProviderId = dataProvider.Identifier();
-                RSyncMLTask task;
-                CleanupClosePushL( task ); 
-                if( dataProvider.AllowsMultipleDataStores() )
-                    {
-                   	_DBG_FILE("CNSmlDSSettingsAdapter::AddNewDataProviderL(): AllowsMultipleDataStores");
-                    CDesCArray* dataStoreName = new ( ELeave ) CDesCArrayFlat( 1 );
-                    CleanupStack::PushL( dataStoreName );
-                    dataProvider.GetDataStoreNamesL( *dataStoreName );
-                    if ( dataStoreName->Count() == 0 )
-                        {
-                        // Get default if there are no databases
-                        _DBG_FILE("CNSmlDSSettingsAdapter::AddNewDataProviderL():  no databases -> get default");
-                        HBufC* localDataStoreName = dataProvider.DefaultDataStoreName().AllocLC();
-                        task.CreateL( iDSProfile, aDataProviderId, *iRdbDataStore, 
-                                    *localDataStoreName );
-					    task.UpdateL();
-						CleanupStack::PopAndDestroy();  //localDataStoreName
-                        }
-                    else
-                        {
-                        TPtrC16 ptrDataStoreName = dataStoreName->MdcaPoint(0);
-                        task.CreateL( iDSProfile, aDataProviderId, *iRdbDataStore, 
-		                            ptrDataStoreName );
-		                task.UpdateL();
-                        }
-                    CleanupStack::PopAndDestroy();//dataStoreName
-                    }
-                else
-                    {
-                   	_DBG_FILE("CNSmlDSSettingsAdapter::AddNewDataProviderL():  MultipleDataStores not allowed");
-                    HBufC* localDataStoreName = dataProvider.DefaultDataStoreName().AllocLC();
-                    task.CreateL( iDSProfile, aDataProviderId, *iRdbDataStore, 
-                                    *localDataStoreName );
-                    task.UpdateL();
-                    CleanupStack::PopAndDestroy();  //localDataStoreName
-                    }
-                iDSProfile.UpdateL();
-                CleanupStack::PopAndDestroy( 6 ); //dataProviderArray, dataProvider, 
-                                                //object, mimeType, ConvertTo8LC, 
-                                                //task
-                CloseDSProfile();
-                _DBG_FILE("CNSmlDSSettingsAdapter::AddNewDataProviderL(): end KErrNone");
-                return KErrNone;
-                }
-            CleanupStack::PopAndDestroy( 2 ); //mimeType, ConvertTo8LC    
-            }
-        CleanupStack::PopAndDestroy(  ); //dataProvider
-        }
-    
-    CleanupStack::PopAndDestroy( 2 ); //dataProviderArray, object
-    CloseDSProfile();
-    _DBG_FILE("CNSmlDSSettingsAdapter::AddNewDataProviderL(): end KErrNotFound");
-    return KErrNotFound;
-	}
-
-//------------------------------------------------------------------------------
-//  CNSmlDSSettingsAdapter::GetToNAPIDL
-//	The function gets URI for given aObject.
-//------------------------------------------------------------------------------
-TInt CNSmlDSSettingsAdapter::GetToNAPIDL( const TInt aLUID, CBufBase& aObject )
-	{
-	_DBG_FILE("CNSmlDSSettingsAdapter::GetToNAPIDL() : begin");
-		
-    TInt profIAPid = -1;
-    TInt apIdResponse = GetProfileIAPIdL(aLUID, profIAPid);
-    if( profIAPid < 0 || apIdResponse != KErrNone )
-        {
-        return KErrNotFound;
-        }
-    CNSmlDMIAPMatcher* apmatch = CNSmlDMIAPMatcher::NewL( iCallBack );
-    CleanupStack::PushL( apmatch );
-    HBufC8* uri8 = apmatch->URIFromIAPIdL( profIAPid );
-    if( uri8 )
-        {
-        CleanupStack::PushL( uri8 );
-        aObject.InsertL(aObject.Size(),uri8->Des());
-        CleanupStack::PopAndDestroy(); // uri8
-        }
-    else
-        {
-        CleanupStack::PopAndDestroy(); // apMatch
-        return KErrGeneral;    
-        }
-    CleanupStack::PopAndDestroy(); // apMatch
-	_DBG_FILE("CNSmlDSSettingsAdapter::GetToNAPIDL() : end");
-	return KErrNone;
-	}
-
-//------------------------------------------------------------------------------
-//  CNSmlDSSettingsAdapter::SetToNAPIDL
-//	The function sets NAPId value according given URI.
-//------------------------------------------------------------------------------
-TInt CNSmlDSSettingsAdapter::SetToNAPIDL( const TInt aLUID, const TDesC8& aObject )
-	{
-	_DBG_FILE("CNSmlDSSettingsAdapter::SetToNAPIDL() : begin");
-    CNSmlDMIAPMatcher* apmatch = CNSmlDMIAPMatcher::NewL( iCallBack );
-    CleanupStack::PushL( apmatch );
-    TInt lIAPid = apmatch->IAPIdFromURIL( aObject );
-    TInt apIdResponse = SetProfileIAPIdL( aLUID, lIAPid );
-	CleanupStack::PopAndDestroy(); // apmatch
-    _DBG_FILE("CNSmlDSSettingsAdapter::SetToNAPIDL() : end");
-	return apIdResponse;
-	}
-
-//------------------------------------------------------------------------------
-//  CNSmlDSSettingsAdapter::AddNodeBufferL
-//	The function sets the new node to buffer.	
-//------------------------------------------------------------------------------
-void CNSmlDSSettingsAdapter::AddNodeBufferL( const TDesC8& aURI, 
-                                                const TDesC8& aParentLUID,
-                                                const TInt aStatusRef )
-	{
-	TNSmlDSBufferElement newNode;
-	newNode.iMappingName = aURI.AllocLC();
-	newNode.iName = LastURISeg(aURI).AllocLC(); 
-	newNode.iNodeBuf = new (ELeave) CArrayFixFlat <TNSmlDSAddElement> ( KNSmlDSGranularity );
-	newNode.iExecuted = EFalse;
-	newNode.iLuid = GetIntObject( aParentLUID );
-	iBuffer->AppendL( newNode );
-	CleanupStack::Pop( 2 ); //newNode.iMappingName,newNode.iName
-
-	TNSmlDSAddElement newCommand;
-
-	newCommand.iUri = aURI.AllocLC();
-	newCommand.iData = 0;
-	newCommand.iStatusRef = aStatusRef;
-	newCommand.iLeaf = EFalse;
-	newCommand.iDone = EFalse;
-
-	TInt index = iBuffer->Count() - 1;
-	iBuffer->At(index).iNodeBuf->AppendL( newCommand );
-	CleanupStack::Pop(); //newCommand.iUri
-	}
-
-//------------------------------------------------------------------------------
-//  CNSmlDSSettingsAdapter::AddLeafBufferL
-//  The function sets the new leaf to buffer.
-//------------------------------------------------------------------------------
-void CNSmlDSSettingsAdapter::AddLeafBufferL( const TDesC8& aURI, 
-                                                const TDesC8& aParentLUID, 
-                                                const TDesC8& aObject, 
-                                                const TInt aStatusRef )
-	{
-    TInt index = GetBufferIndex( aURI );
-    if(index<0)
-		{
-		DBG_ARGS(_S16("DS-adapter:AddLeafBufferL URI - <%S> <%S> NOTFOUND"), &aURI, &aParentLUID );
-		iCallBack->SetStatusL(aStatusRef,  CSmlDmAdapter::ENotFound);
-		return;
-        }
-
-	TNSmlDSAddElement newCommand;
-	newCommand.iUri = aURI.AllocLC();
-	newCommand.iData = aObject.AllocLC();
-	newCommand.iStatusRef = aStatusRef;
-	newCommand.iLeaf = ETrue;
-	newCommand.iDone = EFalse;
-    iBuffer->At(index).iNodeBuf->AppendL( newCommand );
-	CleanupStack::Pop( 2 ); //newCommand.iUri, newCommand.iData
-    }
-
-//------------------------------------------------------------------------------
-//  CNSmlDSSettingsAdapter::LastURISeg
-//  The function returns only the last uri segment.
-//------------------------------------------------------------------------------
-TPtrC8 CNSmlDSSettingsAdapter::LastURISeg(const TDesC8& aURI)
-	{
-	TInt i;
-	for( i=aURI.Length() - 1; i >= 0; i-- )
-		{
-		if( aURI[i] == KNSmlDMUriSeparator )
-			{
-			break;
-			}
-		}
-	if( i == 0 )
-		{
-		return aURI;
-		}
-	else
-		{
-		return aURI.Mid( i + 1 );
-		}
-	}
-
-//------------------------------------------------------------------------------
-//  CNSmlDSSettingsAdapter::RemoveLastURISeg
-//  The function removes the last URI segment.
-//------------------------------------------------------------------------------
-TPtrC8 CNSmlDSSettingsAdapter::RemoveLastURISeg( const TDesC8& aURI )
-	{
-	TInt i;
-	for( i = aURI.Length() - 1; i >= 0; i-- )
-		{
-		if( aURI[i] == KNSmlDMUriSeparator )
-			{
-			break;
-			}
-		}
-	if( i == 0 )
-		{
-		return aURI;
-		}
-	else
-		{
-		return aURI.Left( i );
-		}
-	}
-
-//------------------------------------------------------------------------------
-//  CNSmlDSSettingsAdapter::ExecuteBufferL
-//  Executes commands which have not been executed.
-//------------------------------------------------------------------------------
-void CNSmlDSSettingsAdapter::ExecuteBufferL( const TDesC8& aURI )
-	{
-	TInt index = GetBufferIndex( aURI );
-	if( index < 0 )
-		{
-		return;
-		}
-	//
-	// Execute all commands for Profiles new ContentType
-	//
-    TBool rdburinotfound = ETrue;
-    TInt newcmd = 1;
-    
-    TNSmlDSBufferElement& bufElem = iBuffer->At(index); 
-    
-	for( TInt cmd = bufElem.iNodeBuf->Count() - 1; cmd >= 0; cmd-- )
-		{
-		TBuf8<16> addLUID;
-		
-		TNSmlDSAddElement& addElem = bufElem.iNodeBuf->At(cmd); 
-			
-		if( cmd == 0 )
-			{
-			if( bufElem.iLuid > 0 )
-			    {
-			    addLUID.Format( KFormat, -1 ); // Set status for addnode command
-			    }
-			else
-                {
-                addLUID.Format( KFormat, 0 );
-                }
-            iBufferExecution = ETrue;
-            AddNodeObjectL( addElem.iUri->Des(), 
-                            addLUID, addElem.iStatusRef );
-
-			bufElem.iExecuted = ETrue;
-            iBufferExecution = EFalse;
-            }
-		else 
-			{
-            //First RDBURI leaf must be stored
-            while( rdburinotfound && newcmd < iBuffer->At(index).iNodeBuf->Count() )
-    			{
-	    		if( bufElem.iNodeBuf->At(newcmd).iUri->Des().Find( KNSmlDdfRDBURI ) >= 0 )
-				    {
-                    SetRDBDataStore( bufElem.iNodeBuf->At(newcmd).iData->Des() );
-				    rdburinotfound = EFalse;
-				    break;
-				    }
-			    newcmd++;
-			    }//while
-			addLUID.Format( KFormat, bufElem.iLuid );
-			iBufferExecution = ETrue;
-            UpdateLeafObjectL( addElem.iUri->Des(),
-				addLUID,
-				addElem.iData->Des(),
-				KNullDesC8,
-				addElem.iStatusRef );
-            iBufferExecution = EFalse;
-			}
-
-		addElem.iDone = ETrue;
-
-		delete addElem.iUri;
-		addElem.iUri=NULL;
-		if( addElem.iData )
-			{
-			delete addElem.iData;
-			addElem.iData=NULL;
-			}
-		bufElem.iNodeBuf->Delete(cmd);
-		}
-//
-//	Remove data from handled ContentType-commands
-//
-	bufElem.iNodeBuf->Reset();
-	delete bufElem.iNodeBuf;
-
-	if( bufElem.iMappingName )
-		{
-		delete bufElem.iMappingName;
-		bufElem.iMappingName=NULL;
-		}
-
-	if( bufElem.iName )
-		{
-		delete bufElem.iName;
-		bufElem.iName=NULL;
-		}
-
-	iBuffer->Delete( index ); 
-	iBuffer->Compress();
-	}
-
-
-//------------------------------------------------------------------------------
-//  CNSmlDSSettingsAdapter::GetProfileIdFromURIL
-//	The function gets the Profile Id for given aURI.
-//------------------------------------------------------------------------------
-TInt CNSmlDSSettingsAdapter::GetProfileIdFromURIL( const TDesC8& aURI )
-	{
-	HBufC8* apURI = HBufC8::NewLC( aURI.Size() );
-//
-//  Second slash after SyncML/DSAcc/XXXX/
-//
-	TInt i = 0;
-	
-	for( i = aURI.Find( KDSAcc1 ) + 13; i < aURI.Length(); i++ )
-		{
-		if( aURI[i] == KNSmlDMUriSeparator )
-			{
-			break;
-			}
-		}
-	if( i > 0 )
-		{
-		apURI->Des().Format( aURI.Left(i) );
-		}
-//
-//	Same profile as previous
-//
-	if( iPrevURI->Match( *apURI ) != KErrNotFound )
-		{
-		CleanupStack::PopAndDestroy(); // apURI
-		return iPrevLUID;
-		}
-//
-//	Fetch Profile-id for URI
-//
-
-    HBufC8* apLUID = iCallBack->GetLuidAllocL( *apURI );
-	CleanupStack::PushL( apLUID );
-    if( apLUID->Length() == 0 )
-        {
-        CleanupStack::PopAndDestroy( 2 );//apURI, apLUID
-        return KErrGeneral;
-        }
-	TInt resLUID = GetIntObject( *apLUID );
-	iPrevURI->Des().Format( *apURI );
-	iPrevLUID = resLUID;
-	CleanupStack::PopAndDestroy(2); //apURI,apLUID
-
-	return resLUID;
-	}
-
-//------------------------------------------------------------------------------
-//  CNSmlDSSettingsAdapter::GetContentTypeL
-//  Get CTType (MimeType) for given adapter.
-//------------------------------------------------------------------------------
-TInt CNSmlDSSettingsAdapter::GetContentTypeL( const TInt aDataProviderId, 
-                                              const TInt aProfileLUID, 
-                                              CBufBase*& aObject )
-	{
-    _DBG_FILE("CNSmlDSSettingsAdapter::GetContentTypeL(): begin");
-    TInt retVal = OpenSyncSessionAndDSProfileL( aProfileLUID, ESmlOpenRead );
-    if( retVal != KErrNone )
-		{
-        CloseDSProfile();
-		return retVal;
-		}
-
-    RArray<TSmlDataProviderId> dataProviderIdArray;
-    CleanupClosePushL( dataProviderIdArray );
-    iSyncSession.ListDataProvidersL( dataProviderIdArray );
-    
-    TInt dpIndex = dataProviderIdArray.Find( aDataProviderId );
-    if( dpIndex == KErrNotFound )
-        {
-        CloseDSProfile();
-        CleanupStack::PopAndDestroy( 1 ); // dataProviderIdArray
-        return KErrNotFound;
-        }
-    RSyncMLDataProvider dataProvider;
-    CleanupClosePushL( dataProvider );
-    dataProvider.OpenL( iSyncSession, dataProviderIdArray[dpIndex] );
-    for( TInt i = 0; i < dataProvider.MimeTypeCount(); i++ )
-        {
-        //first mime type will be returned now
-        HBufC* mimeType = dataProvider.MimeType(i).AllocLC();
-        aObject->InsertL( aObject->Size(), ConvertTo8LC( *mimeType ) );  
-        CleanupStack::PopAndDestroy( 2 ); //mimeType, ConvertTo8LC
-        break;
-        }
-    CleanupStack::PopAndDestroy( 2 ); // dataProviderIdArray, dataProvider
-    CloseDSProfile();
-    _DBG_FILE("CNSmlDSSettingsAdapter::GetContentTypeL(): end");
-    return KErrNone;
-	}
-
-//------------------------------------------------------------------------------
-//  CNSmlDSSettingsAdapter::GetBufferIndex
-//  The function resolves buffer index for given URI.
-//------------------------------------------------------------------------------
-TInt CNSmlDSSettingsAdapter::GetBufferIndex( const TDesC8& aURI )
-	{
-	TInt index = -1;
-	for( TInt i = 0; i<iBuffer->Count(); i++ )
-		{
-		TPtrC8 parentUri = RemoveLastURISeg( aURI );
-		if( iBuffer->At(i).iMappingName->Compare( parentUri ) == 0 )
-			{
-			index = i;
-			break;
-			}
-		}
-	return index;
-	}
-
-//------------------------------------------------------------------------------
-//  CNSmlDSSettingsAdapter::SetBufferLUID
-//  The function sets the LUID to buffer for given URI.
-//------------------------------------------------------------------------------
-TInt CNSmlDSSettingsAdapter::SetBufferLUID( const TDesC8& aURI, const TInt aLUID )
-	{
-	TInt index = GetBufferIndex( aURI );
-	if( index < 0 )
-		{
-		return 0;
-		}
-	iBuffer->At(index).iLuid = aLUID;
-	return 1;
-	}
-
-//------------------------------------------------------------------------------
-//  CNSmlDSSettingsAdapter::ParseUri
-//  Resolves portnbr (separated with ':') as integer from URI.
-//------------------------------------------------------------------------------
-TInt CNSmlDSSettingsAdapter::ParseUri( const TDesC8& aRealURI, TInt& aPort )
-	{
-    TInt offset=0;
-    //http:
-	if( aRealURI.Find( KNSmlDSSettingsHTTP )==0 )//http:
-		{
-		offset = KNSmlDSSettingsHTTP().Length();
-		}
-	else if( aRealURI.Find( KNSmlDSSettingsHTTPS )==0 )//https:
-		{
-		offset = KNSmlDSSettingsHTTPS().Length();
-		}
-
-	TBool portFound=EFalse;
-	TBool portExtracted = EFalse;
-    ////123.234.345.456:80/syncml
-	for( TInt i = offset; i < aRealURI.Length() && !portExtracted; i++ )
-		{
-		if( aRealURI[i] == KNSmlDMColon )// ':'
-			{
-			portFound = ETrue;
-			offset=i;
-			}
-		if( portFound && aRealURI[i] == KNSmlDMUriSeparator )// '/'
-			{
-			aPort = GetIntObject( aRealURI.Mid( (offset + 1), (i - offset-1) ) );
-			portExtracted = ETrue;
-			}
-		else if ( portFound && i == aRealURI.Length() - 1 ) // last char
-		    {
-		    // port is from offset to the end
-		    aPort = GetIntObject( aRealURI.Right( aRealURI.Length() - offset - 1 ) );
-			portExtracted = ETrue;
-		    }
-		}
-	
-	if( aPort != 0 )
-		{
-		return KErrNone;
-		}
-	else
-		{
-		return KErrNotFound;
-		}
-	}
-
-//------------------------------------------------------------------------------
-//  CNSmlDSSettingsAdapter::FindProfileIdL
-//  The function checkd if profile can be found.
-//------------------------------------------------------------------------------
-TBool CNSmlDSSettingsAdapter::FindProfileIdL( const TInt aIntLUID )
-	{
-	if( iSyncSessionOpen == EFalse )
-	    {
-        iSyncSession.OpenL();
-        iSyncSessionOpen = ETrue;
-	    }
-    RArray <TSmlProfileId> profileList;
-    CleanupClosePushL( profileList );
-	TSmlUsageType usageType = ESmlDataSync;		
-	iSyncSession.ListProfilesL( profileList, usageType );
-	if( profileList.Count() == 0 )
-	    {
-        CleanupStack::PopAndDestroy(); //profileList
-        return EFalse;
-	    }
-    TInt item = profileList.Find( aIntLUID );
-    CleanupStack::PopAndDestroy(); //profileList
-    if( item != KErrNotFound )
-		{
-		return ETrue;
-		}
-	return EFalse;
-	}
-
-//------------------------------------------------------------------------------
-//  CNSmlDSSettingsAdapter::GetProfileIdentifierL
-//  The function gets profile Id from Client API.
-//------------------------------------------------------------------------------
-TInt CNSmlDSSettingsAdapter::GetProfileIdentifierL( const TInt aIntLUID, 
-                                                    TInt& aProfileID )
-	{
-	TInt retVal = OpenSyncSessionAndDSProfileL( aIntLUID, ESmlOpenRead );
-    if( retVal != KErrNone )
-		{
-        CloseDSProfile();
-		return retVal;	
-		}
-	aProfileID = iDSProfile.Identifier();
-	CloseDSProfile();
-    return retVal;
-	}
-//------------------------------------------------------------------------------
-//  CNSmlDSSettingsAdapter::GetDSFieldDataL
-//  The function checks what leaf to be handled and fetches the data for a leaf.
-//------------------------------------------------------------------------------
-TInt CNSmlDSSettingsAdapter::GetDSFieldDataL( const TInt aIntLUID, 
-                                                CBufBase*& aObject )
-	{
-	_DBG_FILE("CNSmlDSSettingsAdapter::GetDSFieldData(): begin");
-    
-	if ( iField->Compare( KNSmlDdfAddrType ) == 0 )
-		{
-        TSmlTransportId connType = -1;
-		connType = GetProfileConnectiontypeL( aIntLUID );
-        if ( connType <= 0 )
-			{
-            return KErrNotFound;
-			}
-		aObject->InsertL( aObject->Size(), SetIntObjectLC( connType ) );
-		CleanupStack::PopAndDestroy();//SetIntObjectLC
-        return KErrNone;
-		}
-	else if ( iField->Compare( KNSmlDdfAddr ) == 0 ) //Server URL
-		{
-		TInt retValue1 = GetProfileServerURLL( aIntLUID, aObject );
-		TInt port(0);
-		if(ParseUri(aObject->Ptr(0),port)==KErrNone)
-		    {
-		    HBufC8* addr = aObject->Ptr(0).AllocLC();
-		    aObject->Reset();
-		    TInt portStart = addr->LocateReverse(KNSmlDMColon);		    
-		    aObject->InsertL(aObject->Size(),addr->Left(portStart));
-		    
-		    TInt portLen=addr->Mid(portStart).Locate(KNSmlDMUriSeparator);
-		    if(portLen!=KErrNotFound)
-		        {
-		        aObject->InsertL(aObject->Size(),addr->Mid(portStart+portLen));
-		        }
-		    	    			    
-		    CleanupStack::PopAndDestroy(); //addr
-		    }
-
-        if( retValue1 != KErrNone )
-		    {
-		    return KErrNotFound;
-		    }
-		return KErrNone;
-		}
-	else if ( iField->Compare( KNSmlDdfPortNbr ) == 0 )
-		{
-		TInt retValue2 = GetProfileServerURLL( aIntLUID, aObject );
-        if( retValue2 != KErrNone )
-		    {
-		    return KErrNotFound;
-            }
-        if ( aObject->Size() == 0 )
-            {
-            return KErrNone;
-            }
-        TInt bSize = aObject->Size();
-        HBufC8* buf = HBufC8::NewLC( bSize );
-		TPtr8 bufPtr = buf->Des();
-		aObject->Read( 0, bufPtr, aObject->Size() );
-		aObject->Reset();
-		
-        TInt pnum = 0;
-		//find out the port number
-        ParseUri( *buf, pnum );
-        if(pnum)
-            {
-    		aObject->InsertL( aObject->Size(), SetIntObjectLC( pnum ) );
-            CleanupStack::PopAndDestroy(  ); //SetIntObjectLC( pnum )
-            }
-        CleanupStack::PopAndDestroy(  ); //buf
-        return KErrNone;
-		}
-	else if ( iField->Compare( KNSmlDdfClientUserName ) == 0 )
-		{
-		if( GetProfileUserNameL( aIntLUID, aObject ) != KErrNone )
-            {
-            return KErrGeneral;
-            }
-		return KErrNone;
-		}
-	else if ( iField->Compare( KNSmlDdfServerId ) == 0 )
-		{
-		if( GetProfileServerIdL( aIntLUID, aObject ) != KErrNone )
-            {
-            return KErrGeneral;
-            }
-		return KErrNone;
-		}
-	else if ( iField->Compare( KNSmlDdfClientPW ) == 0 ) //Not allowed
-		{
-		return KErrGeneral;
-        }
-	else if ( iField->Compare( KNSmlDdfName ) == 0 )
-		{
-		TInt retValue = GetProfileDisplayNameL( aIntLUID, aObject );
-		if( retValue != KErrNone )
-		    {
-            return KErrGeneral;
-		    }
-		return KErrNone;
-		}
-	else if ( iField->Compare( KNSmlDdfToNAPID ) == 0 )
-		{
-		TInt retToNaPID = GetToNAPIDL( aIntLUID, *aObject );
-		if ( retToNaPID == KErrNone || retToNaPID == KErrNotFound )
-			{
-			return retToNaPID;
-			}
-		return KErrGeneral;			
-		}
-	else if ( iField->Compare( KNSmlDdfHidden ) == 0 )
-		{
-		//Hidden profile not supported
-		return KErrGeneral;
-		}
-    _DBG_FILE("CNSmlDSSettingsAdapter::GetDSFieldData(): end");
-    return KErrGeneral;
-	}
-
-//------------------------------------------------------------------------------
-//  CNSmlDSSettingsAdapter::GetProfileConnectiontypeL()
-//  The function what medium type is supported and returns it.
-//------------------------------------------------------------------------------
-TInt CNSmlDSSettingsAdapter::GetProfileConnectiontypeL( const TInt aIntLUID )
-	{
-	TInt retVal = OpenSyncSessionAndDSProfileL( aIntLUID, ESmlOpenRead );
-    if( retVal != KErrNone )
-		{
-        CloseDSProfile();
-		return retVal;	
-		}
-	RArray<TSmlTransportId> transportIdArray;
-    CleanupClosePushL( transportIdArray );
-	iDSProfile.ListConnectionsL( transportIdArray );
-	TInt transportItems = transportIdArray.Count();
-    if( transportItems == 0 )
-		{
-		//No matching items
-        CleanupStack::PopAndDestroy(); //transportIdArray	
-		CloseDSProfile();
-		return KErrGeneral;
-		}
-	else if( transportItems > 1 )
-		{
-		//Error case : against specification
-        CleanupStack::PopAndDestroy(); //transportIdArray	
-		CloseDSProfile();
-		return KErrGeneral;
-		}
-	
-    TInt mediumType = ENone;	
-    if ( transportIdArray[0] == KUidNSmlMediumTypeInternet.iUid )
-        {
-        mediumType = EHttp;
-        }
-    else if ( transportIdArray[0] == KUidNSmlMediumTypeBluetooth.iUid ||
-              transportIdArray[0] == KUidNSmlMediumTypeUSB.iUid ||   
-              transportIdArray[0] == KUidNSmlMediumTypeIrDA.iUid  )
-        {
-        mediumType = EObex;
-        }
-    
-    CleanupStack::PopAndDestroy(); //transportIdArray
-	CloseDSProfile();
-	return mediumType;
-	}
-
-//------------------------------------------------------------------------------
-//  CNSmlDSSettingsAdapter::GetProfileServerURLL
-//  The function gets the profile Addr leaf value.
-//------------------------------------------------------------------------------
-TInt CNSmlDSSettingsAdapter::GetProfileServerURLL( const TInt aIntLUID, 
-                                                    CBufBase*& aURL )
-	{
-	TInt retVal = OpenSyncSessionAndDSProfileL( aIntLUID, ESmlOpenRead );
-    if( retVal != KErrNone )
-		{
-        CloseDSProfile();
-		return retVal;	
-		}
-	RArray<TSmlTransportId> transportIdArray;
-    CleanupClosePushL( transportIdArray );
-	iDSProfile.ListConnectionsL( transportIdArray );
-    if( transportIdArray.Count() > 0 )
-        {
-        RSyncMLConnection profConn;
-        CleanupClosePushL( profConn );
-	    profConn.OpenL( iDSProfile, transportIdArray[0] );
-
-	    HBufC8* sURI = profConn.ServerURI().AllocL();
-        CleanupStack::PushL( sURI );
-        TPtr8 uriPtr = sURI->Des();
-        if( uriPtr.Length() > 0 )
-            {
-            aURL->InsertL( aURL->Size(),uriPtr );
-            }
-        else
-            {
-            aURL->InsertL( aURL->Size(), KNullDesC8 );
-            }
-        CleanupStack::PopAndDestroy( 2 );//profConn, sURI
-        retVal = KErrNone;
-        }
-    else
-        {
-        retVal = KErrNotFound;
-        }
-    CleanupStack::PopAndDestroy(); //transportIdArray
-    CloseDSProfile();
-    return retVal;
-	}
-//------------------------------------------------------------------------------
-//  CNSmlDSSettingsAdapter::GetProfileUserNameL
-//  The function gets the ClientUserName leaf value.
-//------------------------------------------------------------------------------
-TInt CNSmlDSSettingsAdapter::GetProfileUserNameL( const TInt aIntLUID, 
-                                                    CBufBase*& aUserName )
-	{
-	TInt retVal = OpenSyncSessionAndDSProfileL( aIntLUID, ESmlOpenRead );
-    if( retVal != KErrNone )
-		{
-        CloseDSProfile();
-		return retVal;	
-		}
-	HBufC8* userName = iDSProfile.UserName().AllocL();
-    CleanupStack::PushL( userName );
-    TPtr8 ptrUserName = userName->Des();
-    CloseDSProfile();
-    aUserName->InsertL( aUserName->Size(), ptrUserName );
-    CleanupStack::PopAndDestroy(); //userName
-    return KErrNone;
-	}
-	
-//------------------------------------------------------------------------------
-//  CNSmlDSSettingsAdapter::GetProfileServerIdL
-//  The function gets the ClientUserName leaf value.
-//------------------------------------------------------------------------------
-TInt CNSmlDSSettingsAdapter::GetProfileServerIdL( const TInt aIntLUID, 
-                                                    CBufBase*& aUserName )
-	{
-	TInt retVal = OpenSyncSessionAndDSProfileL( aIntLUID, ESmlOpenRead );
-    if( retVal != KErrNone )
-		{
-        CloseDSProfile();
-		return retVal;	
-		}
-    aUserName->InsertL( aUserName->Size(), iDSProfile.ServerId() );
-    CloseDSProfile();
-    return KErrNone;
-	}
-	
-//------------------------------------------------------------------------------
-//  CNSmlDSSettingsAdapter::GetProfileIAPIdL
-//  The function gets the IAP id value from Client API.
-//------------------------------------------------------------------------------
-TInt CNSmlDSSettingsAdapter::GetProfileIAPIdL( const TInt aIntLUID, TInt& aIAPid )
-	{
-    aIAPid = -1;
-    TInt retVal = OpenSyncSessionAndDSProfileL( aIntLUID, ESmlOpenRead );
-    if( retVal != KErrNone )
-		{
-		CloseDSProfile();
-        return retVal;	
-		}
-    RArray<TSmlTransportId> connIdArray;
-    CleanupClosePushL( connIdArray );
-    iDSProfile.ListConnectionsL( connIdArray );
-    if( connIdArray.Count() == 1 )
-        {
-        RSyncMLTransport transport;
-        CleanupClosePushL( transport );
-	    transport.OpenL( iSyncSession, connIdArray[0] );
-	    const CSyncMLTransportPropertiesArray& props = transport.Properties();
-	    TInt index = props.Find( KNSmlIAPId );
-        if( index > 0 )
-            {
-            RSyncMLConnection conn;
-            CleanupClosePushL( conn );
-	        conn.OpenL( iDSProfile, connIdArray[0] );
-            HBufC8* iapId = conn.GetPropertyL( KNSmlIAPId ).AllocLC();
-            aIAPid = GetIntObject( *iapId );
-            CleanupStack::PopAndDestroy( 2 ); //conn, iapId
-            retVal = KErrNone;
-            }
-        else
-            {
-            retVal = KErrNotFound;
-            }
-        CleanupStack::PopAndDestroy(); //transport
-        CloseDSProfile();
-        }
-    else
-        {
-        retVal = KErrNotFound;
-        }
-    CleanupStack::PopAndDestroy(); //connIdArray
-    return retVal;
-    }
-
-//------------------------------------------------------------------------------
-//  CNSmlDSSettingsAdapter::GetProfileDisplayNameL
-//  The function gets the Name leaf value for a profile.
-//------------------------------------------------------------------------------
-TInt CNSmlDSSettingsAdapter::GetProfileDisplayNameL( const TInt aIntLUID, 
-                                                        CBufBase*& aDisplayName )
-	{
-	TInt retVal = OpenSyncSessionAndDSProfileL( aIntLUID, ESmlOpenRead );
-    if(retVal != KErrNone)
-		{
-		CloseDSProfile();
-        return retVal;	
-		}
-	HBufC* dataBuf = iDSProfile.DisplayName().AllocL();
-    CleanupStack::PushL( dataBuf );
-    TPtr16 ptrDisplayName = dataBuf->Des();
-    aDisplayName->InsertL( aDisplayName->Size(), ConvertTo8LC( ptrDisplayName ) );
-    CleanupStack::PopAndDestroy( 2 );//dataBuf, ConvertTo8LC
-    CloseDSProfile();
-    return KErrNone;
-	}
-
-//------------------------------------------------------------------------------
-//  CNSmlDSSettingsAdapter::CreateNewProfileL
-//  The function creates new profile through Client API.
-//------------------------------------------------------------------------------
-TInt CNSmlDSSettingsAdapter::CreateNewProfileL( TInt& aPID )
-	{
-    if( iSyncSessionOpen == EFalse )
-	    {
-        iSyncSession.OpenL();
-        iSyncSessionOpen = ETrue;
-	    }
-    TRAPD( trapValue1, iDSProfile.CreateL( iSyncSession ) );
-    if( trapValue1 != KErrNone )
-        {
-        return trapValue1;
-        }
-    //iDSProfile.SetProtocolVersionL(ESmlVersion1_1_2);
-    TRAPD( trapValue2, iDSProfile.UpdateL() );
-    if( trapValue2 != KErrNone )
-        {
-        return trapValue2;
-        }
-    aPID = iDSProfile.Identifier();
-   	
-
-    CloseDSProfile();
-    return KErrNone;
-    }
-
-//------------------------------------------------------------------------------
-//  CNSmlDSSettingsAdapter::SetProfileServerURIL
-//  The function sets the Addr leaf value.
-//------------------------------------------------------------------------------
-TInt CNSmlDSSettingsAdapter::SetProfileServerURIL( const TInt aPID, 
-                                                    const TDesC8& aObj )
-	{
-	TInt retVal = OpenSyncSessionAndDSProfileL( aPID, ESmlOpenReadWrite );
-    if(retVal != KErrNone)
-		{
-		CloseDSProfile();
-        return retVal;	
-		}
-	RArray<TSmlTransportId> transportIdArray;
-    CleanupClosePushL( transportIdArray );
-	iDSProfile.ListConnectionsL( transportIdArray );
-	if( transportIdArray.Count() == 0 )
-	    {
-        CleanupStack::PopAndDestroy();//transportIdArray
-        CloseDSProfile();
-        return KErrGeneral;
-	    }
-	    
-	TInt newPort(0);
-	
-	RSyncMLConnection conn;
-    CleanupClosePushL( conn );
-    conn.OpenL( iDSProfile, transportIdArray[0] );
-    
-    if( transportIdArray[0] == KUidNSmlMediumTypeInternet.iUid )
-        {
-        if(ParseUri(aObj,newPort)==KErrNotFound)
-            {
-            TInt port(0);
-            ParseUri(conn.ServerURI(),port);
-            if(port==0)
-            	{
-            	// set default port
-            	if( aObj.Find( KNSmlDSSettingsHTTPS ) == 0 ) //https://
-            		{
-            		port = KNSmlDSSettingsHTTPSPort;
-            		}
-            	else //http://
-        	        {
-        	        port = KNSmlDSSettingsHTTPPort;
-        	        }
-            	}
-
-           	TBuf8<5> buf;
-        	buf.Num( port );
-            	
-            TInt totalSize = aObj.Length() + buf.Length() + 1;
-            HBufC8* newServerURI = HBufC8::NewLC( totalSize );
-            SetPortNrToAddrStr( aObj, newServerURI, buf );
-
-            conn.SetServerURIL( *newServerURI );
-        	conn.UpdateL();
-            CleanupStack::PopAndDestroy( newServerURI ); 
-            
-            }
-        else
-            {
-            conn.SetServerURIL( aObj );
-    	    conn.UpdateL();
-            }
-        }
-    else // medium type not internet, no port allowed
-        {
-        if(ParseUri(aObj,newPort)==KErrNotFound)
-            {
-            conn.SetServerURIL( aObj );
-    	    conn.UpdateL();
-            }
-        else
-            {
-            // remove port from uri
-            HBufC8* newServerURI = HBufC8::NewL( aObj.Length() );
-            CleanupStack::PushL( newServerURI );
-            TBuf8<5> buf;
-        	buf.Num( 0 );
-            // change iLeafType to EDSDelete -> deleting port
-            TNSmlDSLeafType	tmpType(iLeafType); // store current value
-            iLeafType = EDSDelete;
-            SetPortNrToAddrStr( aObj, newServerURI, buf );
-            iLeafType = tmpType; // restore original value
-            
-            conn.SetServerURIL( *newServerURI );
-            conn.UpdateL();
-            CleanupStack::PopAndDestroy( newServerURI );
-            }
-        }
-
-     
-    iDSProfile.UpdateL();
-    CleanupStack::PopAndDestroy( 2 ); //transportIdArray, conn
-	CloseDSProfile();
-	return retVal;
-	}
-
-//------------------------------------------------------------------------------
-//  CNSmlDSSettingsAdapter::SetProfileDisplayNameL
-//  The function sets the Name leaf value for a profile.
-//------------------------------------------------------------------------------
-TInt CNSmlDSSettingsAdapter::SetProfileDisplayNameL( const TInt aPID, 
-                                                        const TDesC8& aObj )
-	{
-	TInt retVal = OpenSyncSessionAndDSProfileL( aPID, ESmlOpenReadWrite );
-    if( retVal != KErrNone )
-		{
-		CloseDSProfile();
-        return retVal;
-		}
-	iDSProfile.SetDisplayNameL( ConvertTo16LC( aObj ) );
-	iDSProfile.UpdateL();
-    CleanupStack::PopAndDestroy();//ConvertTo16LC
-	CloseDSProfile();
-	return retVal;
-	}
-//------------------------------------------------------------------------------
-//  CNSmlDSSettingsAdapter::SetProfileUserNameL
-//  The function sets the ClientUserName leaf value for a profile.
-//------------------------------------------------------------------------------
-TInt CNSmlDSSettingsAdapter::SetProfileUserNameL( const TInt aPID,  
-                                                    const TDesC8& aObj )
-	{
-	TInt retVal = OpenSyncSessionAndDSProfileL( aPID, ESmlOpenReadWrite );
-    if( retVal != KErrNone )
-		{
-		CloseDSProfile();
-        return retVal;	
-		}
-	iDSProfile.SetUserNameL( aObj );
-	iDSProfile.UpdateL();
-	CloseDSProfile();
-	return retVal;
-	}
-//------------------------------------------------------------------------------
-//  CNSmlDSSettingsAdapter::SetProfileServerIdL
-//  The function sets the ClientUserName leaf value for a profile.
-//------------------------------------------------------------------------------
-TInt CNSmlDSSettingsAdapter::SetProfileServerIdL( const TInt aPID,  
-                                                    const TDesC8& aObj )
-	{
-	TInt retVal = OpenSyncSessionAndDSProfileL( aPID, ESmlOpenReadWrite );
-    if( retVal != KErrNone )
-		{
-		CloseDSProfile();
-        return retVal;	
-		}
-	iDSProfile.SetServerIdL( aObj );
-	if(aObj.Length())
-	    {
-    	iDSProfile.SetProtocolVersionL(ESmlVersion1_2);
-	    }
-	else
-	    {
-    	iDSProfile.SetProtocolVersionL(ESmlVersion1_1_2);	    
-	    }
-	iDSProfile.UpdateL();
-	CloseDSProfile();
-	return retVal;
-	}
-//------------------------------------------------------------------------------
-//  CNSmlDSSettingsAdapter::SetProfilePasswordL
-//  The function sets the ClientPW leaf value for a profile.
-//------------------------------------------------------------------------------
-TInt CNSmlDSSettingsAdapter::SetProfilePasswordL( const TInt aPID, 
-                                                    const TDesC8& aObj )
-	{
-	TInt retVal = OpenSyncSessionAndDSProfileL( aPID, ESmlOpenReadWrite );
-    if( retVal != KErrNone )
-		{
-		CloseDSProfile();
-        return retVal;	
-		}
-	iDSProfile.SetPasswordL( aObj );
-	iDSProfile.UpdateL();
-	CloseDSProfile();
-	return retVal;
-	}
-//------------------------------------------------------------------------------
-//  CNSmlDSSettingsAdapter::SetProfileStrValueL
-//  The function checks what leaf to be handles and calls the proper function to
-//  set leaf data.
-//------------------------------------------------------------------------------
-TInt CNSmlDSSettingsAdapter::SetProfileStrValueL( const TInt aPID, 
-                                                    const TDesC8& aObj, 
-                                                    const TInt aFieldID )
-	{
-	TInt ret = 0;
-	switch ( aFieldID )
-		{
-		case ( EProfileName ) :
-			{
-			ret = SetProfileDisplayNameL( aPID, aObj );
-			}
-		break;
-		
-		case ( EProfileSyncServerUsername ) :
-			{
-			ret = SetProfileUserNameL( aPID, aObj );
-			}
-		break;
-
-		case ( EProfileServerId ) :
-			{
-			ret = SetProfileServerIdL( aPID, aObj );
-			}
-		break;
-
-
-		case ( EProfileSyncServerPassword ) :
-			{
-			ret = SetProfilePasswordL( aPID, aObj );
-			}
-		break;
-        case ( EProfileIAPId ) :
-			{
-			ret = SetToNAPIDL( aPID, aObj );
-			}
-		break;
-		case ( EProfilePort ) :
-            {
-			delete iPortBuf;
-			iPortBuf = NULL;
-			
-            // check that port is a valid integer
-            TLex8 lex( aObj );
-            TInt port = KErrNotFound;
-            TInt err = lex.Val( port );
-            
-            if ( err != KErrNone || !lex.Eos() )
-                {
-                ret = KErrArgument;
-                }
-            else
-                {
-    			TInt portval = GetIntObject(aObj);
-			if(portval<0)
-			{
-				ret=KErrArgument;
-			}
-			else if(portval>65535)
-			{
-			    	ret=KErrOverflow;	
-			}
-			
-			else
-			{
-			// save information of the port
-    			iPortBuf = aObj.AllocL();
-    			iPortBufLUID = aPID;
-    			SetProfileConnectionPortNrL( iPortBufLUID, *iPortBuf );
-			}
-                }
-            }
-        break;
-        case ( EProfileURL ) :
-		case ( EHiddenProfile ) :
-		case ( EProfileMediumType ) :
-		default:
-			{
-			User::Panic( KNSmlIndexOutOfBoundStr, KNSmlPanicIndexOutOfBound );
-			}
-		}
-	return ret;
-	}
-//------------------------------------------------------------------------------
-//  CNSmlDSSettingsAdapter::DeleteProfileL
-//  The function deletes profile data content.
-//------------------------------------------------------------------------------
-TInt CNSmlDSSettingsAdapter::DeleteProfileL( const TInt aPID )
-	{
-	TInt retVal = OpenSyncSessionAndDSProfileL( aPID, ESmlOpenReadWrite );
-    if( retVal != KErrNone )
-		{
-		CloseDSProfile();
-        return KErrGeneral;	
-		}
-    RArray<TSmlTaskId> taskIdArray;
-    CleanupClosePushL( taskIdArray );
-    iDSProfile.ListTasksL( taskIdArray );
-    if( taskIdArray.Count() > 0 )
-        {
-        for ( TInt i = 0; i < taskIdArray.Count(); i++ )
-            {
-            iDSProfile.DeleteTaskL( taskIdArray[i] );
-            iDSProfile.UpdateL();
-            }
-        }
-    CloseDSProfile();
-    RArray<TSmlProfileId> profileIdArray;
-    CleanupClosePushL( profileIdArray );
-    TSmlUsageType usageType = ESmlDataSync;
-    iSyncSession.ListProfilesL( profileIdArray, usageType );
-    TInt index = profileIdArray.Find( aPID );
-    iSyncSession.DeleteProfileL( profileIdArray[index] );
-    CleanupStack::PopAndDestroy( 2 ); //profileIdArray, taskIdArray
-    iSyncSession.Close();
-    iSyncSessionOpen = EFalse;
-    return KErrNone;
-	}
-
-//------------------------------------------------------------------------------
-//  CNSmlDSSettingsAdapter::CreateURITaskSegmentListL
-//  The function creates list of the content types that profile supports.
-//------------------------------------------------------------------------------
-TInt CNSmlDSSettingsAdapter::CreateURITaskSegmentListL( const TDesC8& aURI, 
-                                                        const TInt aPID, 
-                                                        CBufBase*& aCurrentURISegmentList, 
-                                                        const CArrayFix<TSmlDmMappingInfo>& aPreviousURISegmentList )
-	{
-	TInt retVal = OpenSyncSessionAndDSProfileL( aPID, ESmlOpenRead );
-    if( retVal != KErrNone )
-		{
-		CloseDSProfile();
-        return KErrGeneral;	
-		}
-    RArray<TSmlTaskId> taskIdArray;
-    CleanupClosePushL( taskIdArray );
-    iDSProfile.ListTasksL( taskIdArray );
-	if( taskIdArray.Count() == 0 )
-		{
-		CloseDSProfile();
-		CleanupStack::PopAndDestroy();//taskIdArray
-    	return KErrNotFound;
-		}
-	
-	RSyncMLTask task;
-    CleanupClosePushL( task );
-            
-    for ( TInt i = 0; i < taskIdArray.Count(); i++ )
-		{			
-		//	
-		//	Check if ContentType -> Task ID on list
-		//
-		TBool notInList( ETrue );
-		TInt newline( 0 );
-		TInt ddId( 0 );
-		task.OpenL( iDSProfile, taskIdArray[i] );
-        ddId = task.DataProvider();
-        task.Close();
-		while( notInList && newline <aPreviousURISegmentList.Count() )
-			{
-			TInt ppId = GetIntObject( aPreviousURISegmentList.At(newline).iURISegLUID );
-			if( ppId == ddId )
-				{
-				notInList = EFalse;
-				break;
-				}
-			newline++;
-			}//while
-
-		if( notInList )
-			{
-			TBuf8<9> addNAME( Kprev );
-			//Get Task ID
-			addNAME.AppendNumFixedWidth( taskIdArray[i], EDecimal,3 ); 
-			aCurrentURISegmentList->InsertL( aCurrentURISegmentList->Size(), addNAME );
-			aCurrentURISegmentList->InsertL( aCurrentURISegmentList->Size(), KNSmlDSSlash );
-	
-			TBuf8<80> addURI;
-			
-			addURI.Append( aURI );
-			addURI.Append( Kprev2 );
-			addURI.AppendNumFixedWidth( taskIdArray[i], EDecimal, 3 ); 
-
-			TBuf8<16> addLUID;
-			addLUID.Num( ddId );
-				
-			iCallBack->SetMappingL( addURI, addLUID );
-			}
-		else //not a new object
-			{
-			aCurrentURISegmentList->InsertL( aCurrentURISegmentList->Size(), 
-                                            aPreviousURISegmentList.At(newline).iURISeg );
-
-			aCurrentURISegmentList->InsertL( aCurrentURISegmentList->Size(), KNSmlDSSlash );
-
-//			DBG_ARGS8(_S8("InList: Id = %d Name %S"), newline, 
-//                            aPreviousURISegmentList.At(newline).iURISeg);
-			}
-		} //For
-	CloseDSProfile();
-	CleanupStack::PopAndDestroy(2);// task, taskIdArray
-	return KErrNone;
-	}
-//------------------------------------------------------------------------------
-//  CNSmlDSSettingsAdapter::CreateURIProfileSegmentListL
-//  The function creates list of the profiles.
-//------------------------------------------------------------------------------
-TInt CNSmlDSSettingsAdapter::CreateURIProfileSegmentListL( CBufBase*& aCurrentURISegmentList, 
-                                                            const CArrayFix<TSmlDmMappingInfo>& aPreviousURISegmentList )
-	{
-	if( iSyncSessionOpen == EFalse )
-	    {
-        iSyncSession.OpenL();
-        iSyncSessionOpen = ETrue;
-	    }
-    RArray<TSmlProfileId> profileIdArray;
-    CleanupClosePushL( profileIdArray );
-	TSmlUsageType usageType = ESmlDataSync;
-	iSyncSession.ListProfilesL( profileIdArray, usageType );
-		
-    if(profileIdArray.Count() == 0)
-		{
-        CleanupStack::PopAndDestroy();//profileIdArray
-		return KErrNotFound;
-		}
-		
-	for(TInt p = 0; p < profileIdArray.Count(); p++ )
-		{
-		TBool notInList = ETrue;
-		TInt newline = 0;
-		while( notInList && newline < aPreviousURISegmentList.Count() )
-			{
-				TInt ddId = profileIdArray[p];
-				TInt ppId = GetIntObject( aPreviousURISegmentList.At(newline).iURISegLUID );
-				if( ppId == ddId ) 
-					{
-					notInList = EFalse;
-					break;
-					}
-				newline++;
-			}
-
-		if( notInList )
-			{ // Those which not have mapping data
-			
-			TBuf8<9> addNAME( KDSprev );
-			addNAME.AppendNumFixedWidth( profileIdArray[p], EDecimal, 3 ); 
-
-			aCurrentURISegmentList->InsertL( aCurrentURISegmentList->Size(), addNAME );
-			aCurrentURISegmentList->InsertL( aCurrentURISegmentList->Size(), KNSmlDSSlash );
-            
-			// KNSmlDSStart includes start text for URISeg
-			TBuf8<20> addURI; // SyncML/DSAcc/DSIdnnn , nnn = profileid
-			addURI.Append( KNSmlDSStart );
-			addURI.AppendNumFixedWidth( profileIdArray[p], EDecimal, 3 ); 
-			
-			TBuf8<16> addLUID;
-			addLUID.Num( profileIdArray[p] );
-			
-			iCallBack->SetMappingL( addURI,addLUID );
-            }
-		else
-			{ // Add those in PreviousList which are on database
-			aCurrentURISegmentList->InsertL( aCurrentURISegmentList->Size(), 
-                                            aPreviousURISegmentList.At(newline).iURISeg );
-
-			aCurrentURISegmentList->InsertL( aCurrentURISegmentList->Size(), KNSmlDSSlash );
-//			DBG_ARGS8(_S8("InList: Id = %d Name %S"), newline, 
-//                           aPreviousURISegmentList.At(newline).iURISeg);
-			}
-		}
-    CleanupStack::PopAndDestroy();//profileIdArray
-	return KErrNone;
-	}
-
-//------------------------------------------------------------------------------
-//  CNSmlDSSettingsAdapter::OpenSyncSessionAndDSProfileL
-//  The function opens the server session and DS profile.
-//------------------------------------------------------------------------------
-TInt CNSmlDSSettingsAdapter::OpenSyncSessionAndDSProfileL( const TInt aIntLUID, 
-                                                            TSmlOpenMode aMode )
-    {
-    if( iSyncSessionOpen == EFalse )
-        {
-        iSyncSession.OpenL();
-        iSyncSessionOpen = ETrue;
-        }
-    RArray<TSmlProfileId> profileIdArray;
-    CleanupClosePushL( profileIdArray );
-    TSmlUsageType usageType = ESmlDataSync;
-    iSyncSession.ListProfilesL( profileIdArray, usageType );
-    TInt index = profileIdArray.Find( aIntLUID );
-    CleanupStack::PopAndDestroy(); //profileIdArray
-    if( index == KErrNotFound )
-        {
-        return KErrNotFound;
-        }
-    TRAPD( rValue, iDSProfile.OpenL( iSyncSession, aIntLUID, aMode ) );
-    if( rValue != KErrNone )
-        {
-        iDSProfile.Close();
-		iSyncSession.Close();
-        iSyncSessionOpen = EFalse;
-        }
-    return rValue;
-    }
-//------------------------------------------------------------------------------
-//  CNSmlDSSettingsAdapter::CloseDSProfile
-//  The function closes the DS profile connection.
-//------------------------------------------------------------------------------
-void CNSmlDSSettingsAdapter::CloseDSProfile()
-    {
-    iDSProfile.Close();
-    }
-
-//------------------------------------------------------------------------------
-//  CNSmlDSSettingsAdapter::FindTaskIDL
-//  The function searches if task can be found from the profile task list.
-//------------------------------------------------------------------------------
-TBool CNSmlDSSettingsAdapter::FindTaskIDL( const TInt aProfLUID, const TInt aDataProviderId )
-    {
-    TInt retVal = OpenSyncSessionAndDSProfileL( aProfLUID, ESmlOpenRead );
-    if( retVal != KErrNone )
-		{
-		CloseDSProfile();
-        return EFalse;	
-		}
-    RArray<TSmlTaskId> taskIdArray;
-    CleanupClosePushL( taskIdArray );//taskIdArray
-    iDSProfile.ListTasksL( taskIdArray );
-    
-    RSyncMLTask task;
-    CleanupClosePushL( task );
-    // find task
-    for (TInt i=0; i<taskIdArray.Count(); i++)
-        {
-        task.OpenL( iDSProfile, taskIdArray[i] );
-        if (task.DataProvider() == aDataProviderId)
-            {
-            CleanupStack::PopAndDestroy(2); //taskIdArray, task
-            CloseDSProfile();
-            return ETrue;
-            }
-        task.Close();
-        }
-    // task not found
-    CleanupStack::PopAndDestroy(2); //taskIdArray, task
-    CloseDSProfile();
-    return EFalse;
-    }
-//------------------------------------------------------------------------------
-//  CNSmlDSSettingsAdapter::DeleteTaskByIDL
-//  The function deletes the task by given id.
-//------------------------------------------------------------------------------
-TInt CNSmlDSSettingsAdapter::DeleteTaskByIDL( const TInt aLUID, const TInt aDataProviderId )
-    {
-    TInt retVal = OpenSyncSessionAndDSProfileL( aLUID, ESmlOpenReadWrite );
-    if( retVal != KErrNone )
-		{
-		CloseDSProfile();
-        return retVal;	
-		}
-    RArray<TSmlTaskId> taskIdArray;
-    CleanupClosePushL( taskIdArray );
-    iDSProfile.ListTasksL( taskIdArray );
-    
-    RSyncMLTask task;
-    CleanupClosePushL( task );
-    // find task
-    for (TInt i=0; i<taskIdArray.Count(); i++)
-        {
-        task.OpenL( iDSProfile, taskIdArray[i] );
-        if (task.DataProvider() == aDataProviderId)
-            {
-            task.Close();
-            CleanupStack::PopAndDestroy(); // task
-            iDSProfile.DeleteTaskL( taskIdArray[i] );
-            iDSProfile.UpdateL();
-            CleanupStack::PopAndDestroy(); //taskIdArray
-            CloseDSProfile();
-            return KErrNone;
-            }
-        task.Close();
-        }
-    // task not found
-    CleanupStack::PopAndDestroy(2); //taskIdArray, task
-    CloseDSProfile();
-    return KErrNotFound;
-    }
-//------------------------------------------------------------------------------
-//  CNSmlDSSettingsAdapter::GetClientDataSourceL
-//  The function gets the local data store (LDBURI).
-//------------------------------------------------------------------------------
-TInt CNSmlDSSettingsAdapter::GetClientDataSourceL( const TInt aDataProviderId, 
-                                                    const TInt aProfileLUID, 
-                                                    CBufBase*& aObject )
-    {
-    TInt retVal = OpenSyncSessionAndDSProfileL( aProfileLUID, ESmlOpenRead );
-    if( retVal != KErrNone )
-		{
-		CloseDSProfile();
-        return retVal;	
-		}
-    RArray<TSmlTaskId> taskArray;
-    CleanupClosePushL( taskArray );
-    iDSProfile.ListTasksL( taskArray );
-    
-    RSyncMLTask task;
-    CleanupClosePushL( task );
-    // find task
-    for (TInt i=0; i<taskArray.Count(); i++)
-        {
-        task.OpenL( iDSProfile, taskArray[i] );
-        if (task.DataProvider() == aDataProviderId)
-            {
-            HBufC* localDataStore = task.ClientDataSource().AllocLC();
-            aObject->InsertL( aObject->Size(), ConvertTo8LC( *localDataStore ) );
-            CloseDSProfile();
-            CleanupStack::PopAndDestroy(4); //taskIdArray, task, localDataStore, ConvertTo8LC
-            
-            return KErrNone;
-            }
-        task.Close();
-        }
-    // task not found
-    CleanupStack::PopAndDestroy(2); //taskArray, task
-    CloseDSProfile();
-    return KErrNotFound;
-    }
-//------------------------------------------------------------------------------
-//  CNSmlDSSettingsAdapter::GetServerDataSourceL
-//  The function gets the remote data store (RDBURI).
-//------------------------------------------------------------------------------
-TInt CNSmlDSSettingsAdapter::GetServerDataSourceL( const TInt aDataProviderId, 
-                                                    const TInt aProfileLUID, 
-                                                    CBufBase*& aObject )
-    {
-    TInt retVal = OpenSyncSessionAndDSProfileL( aProfileLUID, ESmlOpenRead );
-    if( retVal != KErrNone )
-		{
-		CloseDSProfile();
-        return retVal;	
-		}
-    RArray<TSmlTaskId> taskArray;
-    CleanupClosePushL( taskArray );
-    iDSProfile.ListTasksL( taskArray );
-    
-    RSyncMLTask task;
-    CleanupClosePushL( task );
-    // find task
-    for (TInt i=0; i<taskArray.Count(); i++)
-        {
-        task.OpenL( iDSProfile, taskArray[i] );
-        if (task.DataProvider() == aDataProviderId)
-            {
-            HBufC* serverDataStore = task.ServerDataSource().AllocLC();
-            aObject->InsertL( aObject->Size(), ConvertTo8LC( *serverDataStore ) );
-            CloseDSProfile();
-            CleanupStack::PopAndDestroy(4); //taskIdArray, task, serverDataStore, ConvertTo8LC
-            
-            return KErrNone;
-            }
-        task.Close();
-        }
-    // task not found
-    CleanupStack::PopAndDestroy(2); //taskIdArray, task
-    CloseDSProfile();
-    return KErrNotFound;
-    }
-//------------------------------------------------------------------------------
-//  CNSmlDSSettingsAdapter::UpdateDataSourceL
-//  The function updates the LDBURI or RDBURI leaf value.
-//------------------------------------------------------------------------------
-TInt CNSmlDSSettingsAdapter::UpdateDataSourceL( const TInt aProfileLUID, 
-                                                const TInt aDataProviderId, 
-                                                const TDesC8& aObject, 
-                                                const HBufC8& aField)
-    {
-    // check that aField is RemoteDB or LocalDB
-    if( aField.Compare( KNSmlDdfRDBURI ) != 0 && aField.Compare( KNSmlDdfLDBURI ) != 0)
-        {
-        return KErrGeneral;
-        }
-    
-    TInt retVal = OpenSyncSessionAndDSProfileL( aProfileLUID, ESmlOpenReadWrite );
-    if( retVal != KErrNone )
-		{
-		CloseDSProfile();
-        return retVal;	
-		}
-    RArray<TSmlTaskId> taskArray;
-    CleanupClosePushL( taskArray );
-    iDSProfile.ListTasksL( taskArray );
-    
-    RSyncMLTask task;
-    CleanupClosePushL( task );
-    // find correct task
-    for (TInt i=0; i<taskArray.Count(); i++)
-        {
-        task.OpenL( iDSProfile, taskArray[i] );
-        if (task.DataProvider() == aDataProviderId)
-            {
-            // task found, get current localDataStore and remoteDataStore
-            HBufC* localDataStore = task.ClientDataSource().AllocLC();
-            HBufC* remoteDataStore = task.ServerDataSource().AllocLC();
-            task.Close();
-            
-            HBufC16* objectBuffer = HBufC16::NewLC( aObject.Size() );
-            TPtr16 ptrDataObject = objectBuffer->Des();
-            CnvUtfConverter::ConvertToUnicodeFromUtf8( ptrDataObject, aObject );
-            iDSProfile.DeleteTaskL( taskArray[i] );
-            iDSProfile.UpdateL();
-            
-            // create new task with new values
-            RSyncMLTask newTask;
-            CleanupClosePushL( newTask );
-            if( aField.Compare( KNSmlDdfRDBURI ) == 0 ) //Remote DB, Mandatory
-                {
-                newTask.CreateL( iDSProfile, aDataProviderId, ptrDataObject, *localDataStore );
-                }
-            else if( aField.Compare( KNSmlDdfLDBURI ) == 0 )
-                {
-                newTask.CreateL( iDSProfile, aDataProviderId, *remoteDataStore, ptrDataObject );
-                }
-            newTask.UpdateL();
-            
-            CloseDSProfile();
-            CleanupStack::PopAndDestroy( 6 ); //taskArray, task, localDataStore, 
-                                            //remoteDataStore, objectBuffer, newTask
-            return retVal;
-            }
-        task.Close();
-        }
-    // task not found
-    CleanupStack::PopAndDestroy(2);//taskArray, task
-    CloseDSProfile();
-    return KErrNotFound;
-    }
-//------------------------------------------------------------------------------
-//  CNSmlDSSettingsAdapter::FetchObjectL
-//  The function fetches the requested leaf object data.
-//------------------------------------------------------------------------------
-TInt CNSmlDSSettingsAdapter::FetchObjectL( const TDesC8& aURI, const TDesC8& aLUID, 
-                                            CBufBase*& aObj, const TInt aStatusRef )
-	{
-	_DBG_FILE("CNSmlDSSettingsAdapter::FetchObjectL(): begin");
-//
-	DBG_ARGS(_S16("DS:Fetch aURI    - %S - %S"), &aURI, &aLUID);
-
-    TInt retVal = KErrNone;
-    TInt profileLUID = -1;
-
-	iLUID = IntLUID( aLUID );
-
-    if ( aLUID.Length() > 0 && 
-	   ( aURI.Match( KCTTypeMatch ) != KErrNotFound ||
-	    aURI.Match( KRDBUriMatch ) != KErrNotFound ||
-	    aURI.Match( KLDBUriMatch ) != KErrNotFound ) )
-	   {
-		profileLUID = GetProfileIdFromURIL( aURI ); // ProfileId for DB-level
-        if( FindTaskIDL( profileLUID, iLUID ) == EFalse )
-            {
-            _DBG_FILE("CNSmlDSSettingsAdapter::FetchObjectL(): ENotFound end");
-			iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-			return KErrNotFound;
-			}
-        }
-	else if ( aLUID.Length() > 0 ) //Profile
-		{
-		TInt profileID = -1; 
-        TInt retValue = GetProfileIdentifierL( iLUID, profileID );
-		if( retValue != KErrNone || profileID < 0 )
-			{
-			_DBG_FILE("CNSmlDSSettingsAdapter::FetchObjectL(): ENotFound end");
-			iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-			return KErrNotFound;
-			}
-		iLUID = profileID;
-		}
-	else
-		{
-		// Static node feature start
-		iLUID = -1;
-		if( IsDSAccUriFormatMatchPredefined(aURI) )
-    	{
-    		iLUID = ConstructTreeL(aURI);
-    		profileLUID = GetProfileIdFromURIL( aURI ); 
-    	}
-    	
-    	if ((iLUID == 0 ) && (aURI.Match(_L8("SyncML/DSAcc/DSId*/DB/CTId*"))  == KErrNone))
-		{
-		_DBG_FILE("CNSmlDSSettingsAdapter::FetchObjectL(): ENotFound end");
-		iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-		return KErrNotFound;
-    	}
-		// Static node feature end
-		}
-
-	SetField( aURI );
-//
-//	Check if valid field
-//
-/*	if( !AcceptDSField() )
-		{
-		_DBG_FILE("CNSmlDSSettingsAdapter::FetchObjectL(): EInvalidObject end");
-		iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EInvalidObject );
-		return KErrGeneral;
-		}
-*/
-//
-//	Check which field going to be handled
-//
-    TInt fType = GetDSFieldTypeL();
-    if ( fType == EInt || fType == EStr )
-		{
-		retVal = GetDSFieldDataL( iLUID, aObj );
-        }
-	else if ( fType == EParam )
-		{ // DB and CTType (dataprovider info / MIME type)
-		  // RDBURI + LDBURI (dataprovider data paths)
-	    if( iField->Compare( KNSmlDdfCTType ) == 0 )
-		    {
-		    retVal = GetContentTypeL( iLUID, profileLUID, aObj );
-		    }
-        else if( iField->Compare( KNSmlDdfLDBURI ) == 0 ) // Local database (optional)
-			{
-			//ClientDataSource
-            retVal = GetClientDataSourceL( iLUID, profileLUID, aObj );
-            }
-		else if( iField->Compare( KNSmlDdfRDBURI ) == 0 ) // Remote database 
-			{
-            //ServerDataSource
-		    retVal = GetServerDataSourceL( iLUID, profileLUID, aObj );
-            }
-		}
-	else 
-		{
-		_DBG_FILE("CNSmlDSSettingsAdapter::FetchObjectL(): Unknown type end");
-		iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-		return KErrNotFound;
-		}
-    if( retVal != KErrNone )
-        {
-        if ( retVal == KErrNotFound )
-            {
-			_DBG_FILE("CNSmlDSSettingsAdapter::FetchObjectL(): ENotFound end");
-			iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound );
-            }
-        else
-            {
-			_DBG_FILE("CNSmlDSSettingsAdapter::FetchObjectL(): retVal != KErrNone");
-            iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EError );        
-            }            
-        }
-    return retVal;
-    
-	}
-//------------------------------------------------------------------------------
-//  CNSmlDSSettingsAdapter::FillNodeInfoL
-//  The function fills the node or leaf information.
-//------------------------------------------------------------------------------
-void CNSmlDSSettingsAdapter::FillNodeInfoL( MSmlDmDDFObject& aNode, 
-                                            TSmlDmAccessTypes aAccTypes, 
-                                            MSmlDmDDFObject::TOccurence aOccurrence, 
-                                            MSmlDmDDFObject::TScope aScope, 
-                                            MSmlDmDDFObject::TDFFormat aFormat, 
-                                            const TDesC8& aDescription, 
-                                            const TDesC8& aDefaultValue, 
-                                            const TDesC8& aMimeType )
-    {
-    aNode.AddDFTypeMimeTypeL( aMimeType );
-    aNode.SetAccessTypesL( aAccTypes );
-	aNode.SetDescriptionL( aDescription );
-	aNode.SetOccurenceL( aOccurrence );
-	aNode.SetDefaultValueL( aDefaultValue );
-	aNode.SetScopeL( aScope );
-	aNode.SetDFFormatL( aFormat );
-    return;
-    }
-//------------------------------------------------------------------------------
-//  CNSmlDSSettingsAdapter::SetProfileAddrTypeL
-//  The function sets the medium type for a profile.
-//------------------------------------------------------------------------------
-TInt CNSmlDSSettingsAdapter::SetProfileAddrTypeL( const TInt aLUID, 
-                                                    const TInt aIntObj )
-    {
-    _DBG_FILE("CNSmlDSSettingsAdapter::SetProfileAddrTypeL(): begin");
-    TInt retVal = OpenSyncSessionAndDSProfileL( aLUID, ESmlOpenReadWrite );
-    if( retVal != KErrNone )
-		{
-		CloseDSProfile();
-        _DBG_FILE("CNSmlDSSettingsAdapter::SetProfileAddrTypeL(): end");
-        return retVal;	
-		}
-    TSmlTransportId mediumType = ENone;
-    GetMediumTypeL( aIntObj, mediumType );
-    if( mediumType == ENone )
-        {
-        return KErrGeneral;
-        }
-    RArray<TSmlTransportId> transportIdArray;
-    CleanupClosePushL( transportIdArray );
-    iDSProfile.ListConnectionsL( transportIdArray );
-
-    RSyncMLConnection conn;
-    conn.OpenL( iDSProfile, transportIdArray[0] );
-    CleanupClosePushL( conn );
-
-    HBufC8* sURI = conn.ServerURI().AllocLC();
-    if(mediumType!=transportIdArray[0])
-        {
-        conn.CreateL( iDSProfile, mediumType ); //changes medium type and clears the buffer
-        }
-        
-    if(mediumType!=KUidNSmlMediumTypeInternet.iUid && sURI->Length() > 0)
-        {
-        // remove port
-        HBufC8* newServerURI = HBufC8::NewL( sURI->Size() );
-        CleanupStack::PushL( newServerURI );
-        TBuf8<5> buf;
-    	buf.Num( 0 );
-        // change iLeafType to EDSDelete -> deleting port
-        TNSmlDSLeafType	tmpType(iLeafType); // store old value
-        iLeafType = EDSDelete;
-        SetPortNrToAddrStr( *sURI, newServerURI, buf );
-        iLeafType = tmpType; // restore original value
-        
-        conn.SetServerURIL( *newServerURI );
-        conn.UpdateL();
-        
-        CleanupStack::PopAndDestroy( newServerURI );
-        }
-    else
-        {
-        conn.SetServerURIL( *sURI );
-        conn.UpdateL();
-        }
-                      
-    CleanupStack::PopAndDestroy( 3 );//transportIdArray, conn, sURI
-    CloseDSProfile();
-    _DBG_FILE("CNSmlDSSettingsAdapter::SetProfileAddrTypeL(): end");
-    return KErrNone;
-    }
-//------------------------------------------------------------------------------
-//  CNSmlDSSettingsAdapter::SetProfileConnectionPortNrL
-//  The function sets the port number (PortNbr) for a profile.
-//------------------------------------------------------------------------------
-TInt CNSmlDSSettingsAdapter::SetProfileConnectionPortNrL( const TInt aLUID, 
-                                                            const TDesC8& aPort )
-    {
-    _DBG_FILE("CNSmlDSSettingsAdapter::SetProfileConnectionPortNrL(): begin");
-    TInt retVal = KErrNone;
-    
-    if( iPortNbr )
-        {
-        delete iPortNbr;
-        iPortNbr = NULL;
-        }
-    iPortNbr = HBufC8::NewL( aPort.Length() );
-    TPtr8 newPortNbr = iPortNbr->Des();
-    newPortNbr.Append( aPort );
-        
-    retVal = OpenSyncSessionAndDSProfileL( aLUID, ESmlOpenReadWrite );
-    if( retVal != KErrNone )
-		{
-		CloseDSProfile();
-        _DBG_FILE("CNSmlDSSettingsAdapter::SetProfileConnectionPortNrL(): end");
-        return retVal;	
-		}
-    
-    RArray<TSmlTransportId> transportIdArray;
-    CleanupClosePushL( transportIdArray );
-    iDSProfile.ListConnectionsL( transportIdArray );
-    
-    RSyncMLConnection conn;
-    CleanupClosePushL( conn );
-    conn.OpenL( iDSProfile, transportIdArray[0] );
-    
-    // if medium type is not internet -> do not add port
-    if( transportIdArray[0] != KUidNSmlMediumTypeInternet.iUid )
-        {
-        CloseDSProfile();
-        CleanupStack::PopAndDestroy( 2 ); //transportIdArray, conn
-        _DBG_FILE("CNSmlDSSettingsAdapter::SetProfileConnectionPortNrL(): end");
-        return retVal;
-        }
-        
-    HBufC8* serverURI = conn.ServerURI().AllocLC();
-    if( serverURI->Length() == 0 )
-        {
-        CloseDSProfile();
-        CleanupStack::PopAndDestroy( 3 ); //transportIdArray, conn, serverURI
-        _DBG_FILE("CNSmlDSSettingsAdapter::SetProfileConnectionPortNrL(): end");
-        return retVal;
-	    }
-    TInt totalSize = serverURI->Size() + newPortNbr.Size() + 1;
-    HBufC8* newServerURI = HBufC8::NewL( totalSize );
-    CleanupStack::PushL( newServerURI );
-    SetPortNrToAddrStr( *serverURI, newServerURI, newPortNbr );
-    
-    conn.SetServerURIL( *newServerURI );
-    conn.UpdateL();
-    
-    CleanupStack::PopAndDestroy( 4 ); //transportIdArray, conn, serverURI, newServerURI
-    CloseDSProfile();
-    _DBG_FILE("CNSmlDSSettingsAdapter::SetProfileConnectionPortNrL(): end");
-    return KErrNone;	
-    }
-//------------------------------------------------------------------------------
-//  CNSmlDSSettingsAdapter::SetPortNrToAddrStr
-//  The function sets or replaces a portnbr (separated with ':') to Addr Uri.
-//------------------------------------------------------------------------------
-void CNSmlDSSettingsAdapter::SetPortNrToAddrStr( const TDesC8& aSrvURI, 
-                                                    HBufC8* aNewURI, 
-                                                    const TDesC8& aPort )
-	{
-	TInt offset=0;
-    if( aSrvURI.Find( KNSmlDSSettingsHTTP ) == 0 )//http://
-		{
-		offset = KNSmlDSSettingsHTTP().Length();
-		}
-	else if( aSrvURI.Find( KNSmlDSSettingsHTTPS ) == 0 )//https://
-		{
-		offset = KNSmlDSSettingsHTTPS().Length();
-		}
-	
-	TInt portStart = -1;
-    TInt separatorPos = aSrvURI.Length();
-    
-    TInt i = 0;
-    for( i = offset; i < aSrvURI.Length(); i++ )
-		{
-		if( aSrvURI[i] == KNSmlDMColon )// ':'
-			{
-			portStart = i;
-			}
-		if( aSrvURI[i] == KNSmlDMUriSeparator )// '/'
-			{
-            separatorPos = i;
-			break;
-			}
-		}
-    
-    TPtr8 ptrNewSrvURI = aNewURI->Des();
-    if( portStart < 0 && separatorPos > 0 && iLeafType != EDSDelete )
-        {
-        ptrNewSrvURI.Append( aSrvURI.Left( separatorPos ) );//http://123.234.345.456
-        ptrNewSrvURI.Append( KNSmlDMColon );
-        ptrNewSrvURI.Append( aPort );
-        ptrNewSrvURI.Append( aSrvURI.Right( aSrvURI.Length() - separatorPos ) );//123.234.345.456:xx(x)/syncml    
-        }
-    else if ( portStart > 0 && separatorPos > 0 && iLeafType != EDSDelete )
-        {
-        ptrNewSrvURI.Append( aSrvURI.Left( portStart + 1 ) );//123.234.345.456:
-        ptrNewSrvURI.Append( aPort );//123.234.345.456:xx(x)
-        ptrNewSrvURI.Append( aSrvURI.Right( aSrvURI.Length() - separatorPos ) );//123.234.345.456:xx(x)/syncml
-        }
-    else if ( portStart > 0 &&  iLeafType == EDSDelete ) //delete port number from uri
-        {
-        ptrNewSrvURI.Append( aSrvURI.Left( portStart ) );//123.234.345.456
-        ptrNewSrvURI.Append( aSrvURI.Right( aSrvURI.Length() - separatorPos ) );//123.234.345.456:xx(x)/syncml
-        }
-    else
-        {
-        ptrNewSrvURI.Append( aSrvURI );
-        }
-    return;
-	}
-//------------------------------------------------------------------------------
-//  CNSmlDSSettingsAdapter::MimeTypeAllreadyExitsL
-//  The function checks if mime type allready exits in this profile.
-//------------------------------------------------------------------------------
-TBool CNSmlDSSettingsAdapter::MimeTypeAllreadyExitsL( const TInt aLuid, 
-                                                        const TDesC8& aMimeType )
-    {
-    TInt retVal = OpenSyncSessionAndDSProfileL( aLuid, ESmlOpenRead );
-    if( retVal != KErrNone )
-		{
-		CloseDSProfile();
-        return EFalse;	
-		}
-    RArray<TSmlDataProviderId> dataProviderArray;
-    CleanupClosePushL( dataProviderArray );
-    iSyncSession.ListDataProvidersL( dataProviderArray );
-    TInt dataProviderCount = dataProviderArray.Count();
-    if( dataProviderCount == 0 )
-        {//error case, data provider not found
-        CloseDSProfile();
-        CleanupStack::PopAndDestroy();//dataProviderIdArray
-        return EFalse;   
-        }
-
-    RSyncMLTask task;
-    RSyncMLDataProvider dataProvider;
-    RArray<TSmlTaskId> taskIdArray;
-    iDSProfile.ListTasksL( taskIdArray );
-    CleanupClosePushL(taskIdArray);
-    
-    HBufC8* object = aMimeType.AllocLC();
-    TPtr8 objectPtr = object->Des();
-	objectPtr.LowerCase();
-    
-    for( TInt i = 0; i<taskIdArray.Count(); i++ )
-        {
-        task.OpenL( iDSProfile, taskIdArray[i] );
-        CleanupClosePushL(task);
-        TInt dataProviderUID = task.DataProvider();
-        TInt dataProviderIndex = dataProviderArray.Find( dataProviderUID );
-        if( dataProviderIndex != KErrNotFound )
-            {
-            dataProvider.OpenL( iSyncSession, dataProviderArray[dataProviderIndex] );
-            CleanupClosePushL(dataProvider);
-            for ( TInt n = 0; n < dataProvider.MimeTypeCount(); n++ )
-                {
-                HBufC* mimeType = dataProvider.MimeType(n).AllocLC();
-                if( objectPtr.Compare( ConvertTo8LC( *mimeType ) ) == 0 ) //if MIME match
-                    {
-                    CleanupStack::PopAndDestroy( 7 ); //dataProviderArray, task, dataProvider,
-                                                    //taskIdArray, object, mimeType, ConvertTo8LC    
-                    CloseDSProfile();            
-                    return ETrue;
-                    }
-                CleanupStack::PopAndDestroy( 2 ); //mimeType, ConvertTo8LC
-                }
-            CleanupStack::PopAndDestroy( ); //dataProvider
-            }
-        CleanupStack::PopAndDestroy( ); //task
-        }
-    CleanupStack::PopAndDestroy( 3 ); //dataProviderArray,taskIdArray, object
-    CloseDSProfile();
-    return EFalse;
-    }
-
-//------------------------------------------------------------------------------
-//  CNSmlDSSettingsAdapter::SetRDBDataStore
-//  The function sets the RDMURI to memeber variable.
-//------------------------------------------------------------------------------
-void CNSmlDSSettingsAdapter::SetRDBDataStore( const TDesC8& aStore )
-    {
-	TPtr16 bufPtr16 = iRdbDataStore->Des();
-    bufPtr16.Delete(0, bufPtr16.Size());
-	CnvUtfConverter::ConvertToUnicodeFromUtf8( bufPtr16, aStore );
-    }
-
-//------------------------------------------------------------------------------
-//	CNSmlDSSettingsAdapter::SetProfileIAPIdL
-//	The function sets the IAPId value to profile connection properties.
-//------------------------------------------------------------------------------
-TInt CNSmlDSSettingsAdapter::SetProfileIAPIdL( const TInt aLUID, const TInt aIAPid )
-    {
-    TInt retVal = OpenSyncSessionAndDSProfileL( aLUID, ESmlOpenReadWrite );
-    if( retVal != KErrNone )
-		{
-		CloseDSProfile();
-        return retVal;	
-		}
-    RArray<TSmlTransportId> connIdArray;
-    CleanupClosePushL( connIdArray );
-    iDSProfile.ListConnectionsL( connIdArray );
-    if( connIdArray.Count() == 1 )
-        {
-        RSyncMLTransport transport;
-        CleanupClosePushL( transport );
-	    transport.OpenL( iSyncSession, connIdArray[0] );
-	    const CSyncMLTransportPropertiesArray& props = transport.Properties();
-	    TInt index = props.Find( KNSmlIAPId );
-        if( index > 0 )
-            {
-            RSyncMLConnection conn;
-            CleanupClosePushL( conn );
-	        conn.OpenL( iDSProfile, connIdArray[0] );
-            HBufC8* apIdBuffer = HBufC8::NewLC( 4 );
-	        TPtr8 ptrIapIdBuf = apIdBuffer->Des();
-        	ptrIapIdBuf.Num( aIAPid );
-            conn.SetPropertyL( KNSmlIAPId, ptrIapIdBuf );
-            conn.UpdateL();
-            CleanupStack::PopAndDestroy( 2 ); //conn, apIdBuffer
-            retVal = KErrNone;
-            }
-        else
-            {
-            retVal = KErrNotFound;
-            }
-        CleanupStack::PopAndDestroy(); //transport
-        }
-    else
-        {
-        retVal = KErrNotFound;
-        }
-    CloseDSProfile();
-    CleanupStack::PopAndDestroy(); //connIdArray
-    return retVal;
-    }
-
-//------------------------------------------------------------------------------
-//	CNSmlDSSettingsAdapter::GetMediumTypeL
-//	The function checks the requested medium type and gets it UID.
-//------------------------------------------------------------------------------
-void CNSmlDSSettingsAdapter::GetMediumTypeL( const TInt aIntObj, 
-                                            TSmlTransportId& aMediumType )
-    {
-    if( aIntObj == EHttp|| aIntObj == ENone || aIntObj == EWsp)
-        {
-        aMediumType = KUidNSmlMediumTypeInternet.iUid;
-        return;
-        }
-    RArray<TSmlTransportId> transportIdArray;
-    CleanupClosePushL( transportIdArray );
-    iSyncSession.ListTransportsL( transportIdArray );
-    if ( transportIdArray.Find( KUidNSmlMediumTypeBluetooth.iUid ) != KErrNotFound )
-        {
-        aMediumType = KUidNSmlMediumTypeBluetooth.iUid;
-        }
-    else if ( transportIdArray.Find( KUidNSmlMediumTypeUSB.iUid ) != KErrNotFound )
-        {
-        aMediumType = KUidNSmlMediumTypeUSB.iUid;
-        }
-    else if ( transportIdArray.Find( KUidNSmlMediumTypeIrDA.iUid ) != KErrNotFound )
-        {
-        aMediumType = KUidNSmlMediumTypeIrDA.iUid;
-        }
-    CleanupStack::PopAndDestroy(); //transportIdArray
-    return;    
-    }
-
-
-// ========================== OTHER EXPORTED FUNCTIONS =========================
-
-//------------------------------------------------------------------------------
-// TImplementationProxy ImplementationTable[]
-//------------------------------------------------------------------------------
-
-#ifndef IMPLEMENTATION_PROXY_ENTRY
-#define IMPLEMENTATION_PROXY_ENTRY(aUid, aFuncPtr)	{{aUid},(aFuncPtr)}
-#endif
-
-const TImplementationProxy ImplementationTable[] = 
-    {
-	IMPLEMENTATION_PROXY_ENTRY( KNSmlDSSettingsAdapterImplUid, CNSmlDSSettingsAdapter::NewL )
-    };
-
-//------------------------------------------------------------------------------
-// TImplementationProxy* ImplementationGroupProxy()
-//------------------------------------------------------------------------------
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy( TInt& aTableCount )
-    {
-	_DBG_FILE("ImplementationGroupProxy() for CNSmlDSSettingsAdapter: begin");
-
-    aTableCount = sizeof(ImplementationTable) / sizeof(TImplementationProxy);
-
-	_DBG_FILE("ImplementationGroupProxy() for CNSmlDSSettingsAdapter: end");
-    return ImplementationTable;
-	}
-
-
-//--------------------------------------------------------------------
-//TInt CNSmlDMSettingsAdapter::IsDSAccUriFormatMatchPredefined(const TDesC8 & aURI)
-//
-//-------------------------------------------------------------------
-
-TBool CNSmlDSSettingsAdapter::IsDSAccUriFormatMatchPredefined(const TDesC8 & aURI)
-{
-	
-	// include strings for  tree for Bearer , DNS related Dynamic nodes . 
-	
-	if(aURI.Match(_L8("SyncML/DSAcc/DSId*"))  != KErrNotFound ||
-         aURI.Match(_L8("SyncML/DSAcc/DSId*/DB/CTId*"))  != KErrNotFound)
-	{
-		return ETrue;
-	}
-	else
-	{
-		return EFalse;
-	}
-	
-	
-}
-
-//--------------------------------------------------------------------
-//TInt CNSmlDMSettingsAdapter::ConstructTreeL(const TDesC8& aURI)
-//
-//-------------------------------------------------------------------
-
-TInt CNSmlDSSettingsAdapter::ConstructTreeL(const TDesC8& aURI)
-{
-		TInt profileID = KErrNotFound;
-RDebug::Print( _L("jshong FOTA : ConstructTreeL 1 ")) ;
-		TBool notDBSet(EFalse);
-        if( iSyncSessionOpen == EFalse )
-            {
-            iSyncSession.OpenL();
-            iSyncSessionOpen = ETrue;
-            }
-        RArray<TSmlProfileId> profileIdArray;
-        CleanupClosePushL( profileIdArray );
-        TSmlUsageType usageType = ESmlDataSync;
-        iSyncSession.ListProfilesL( profileIdArray, usageType );
-RDebug::Print( _L("jshong FOTA : ConstructTreeL 1-2 ") );
-	    
-        for( TInt p = 0; p < profileIdArray.Count(); p++ )
-		    {
-            TInt ddId = profileIdArray[p] ; // update remove KMAxDatasyncID - KMaxDataSyncID;
-RDebug::Print( _L("jshong FOTA : ConstructTreeL 1-3 ") );
-            
-		    _LIT8( Kprev, "DSId" );//  update changed from DMId to DSId
-		    TBuf8<7> addNAME(Kprev); // DMIdnnn , nnn = profileid
-            TInt fixedProfId = profileIdArray[p] ; // update remove KMAxDatasyncID // - KMaxDataSyncID; //fit to 3 decimal
-		    addNAME.AppendNumFixedWidth( fixedProfId, EDecimal, 3 ); 
-   		   	DBG_ARGS8( _S8("notInList: Id = %d Name %S"), p, &addNAME );
-   		   	RDebug::Print( _L("notInList: Id = %d Name %S"), p, &addNAME );
-		    // KNSmlDMStart includes start text for URISeg
-			    TBuf8<20> addURI; // SyncML/DMAcc/DMIdnnn , nnn = profileid
-			    addURI.Append( KNSmlDSStart );
-			    addURI.AppendNumFixedWidth( fixedProfId, EDecimal, 3 ); 
-				TBuf8<3> addLUID;
-	    		addLUID.Num( fixedProfId );
-
-			HBufC8* mapInfo = iCallBack->GetLuidAllocL(addURI);
-RDebug::Print( _L("jshong FOTA : ConstructTreeL 1-4 addURI = %S"), &addURI );
-					
-						 if (mapInfo->Length() == 0)
-						 {
-						 	 iCallBack->SetMappingL(addURI,addLUID);
-							 
-RDebug::Print( _L("jshong FOTA : ConstructTreeL 1-5 ") );
-						 	 	 
-						 	 if(( aURI.Find(addURI) >= 0 ) && !notDBSet)
-                    			{ 
-                    				profileID = fixedProfId;
-                    			}
-                    			
-						 	 // update , Update ../DB/CTId also 
-						 	 	TInt retVal = OpenSyncSessionAndDSProfileL( fixedProfId, ESmlOpenRead );
-						    if( retVal == KErrNone )
-								{
-							
-RDebug::Print( _L("jshong FOTA : ConstructTreeL 2 ") );
-						        
-						 	 						 	 
-						    RArray<TSmlTaskId> taskIdArray;
-						    CleanupClosePushL( taskIdArray );
-						    iDSProfile.ListTasksL( taskIdArray );
-							if( taskIdArray.Count() == 0 )
-								{
-RDebug::Print( _L("jshong FOTA : ConstructTreeL 3 ")) ;
-								CloseDSProfile();
-								CleanupStack::PopAndDestroy();//taskIdArray
-						    //	return KErrNotFound;
-								}
-							else
-							{
-								RSyncMLTask task;
-RDebug::Print( _L("jshong FOTA : ConstructTreeL 4 ")) ;
-
-						    CleanupClosePushL( task );
-						            
-						    for ( TInt i = 0; i < taskIdArray.Count(); i++ )
-								{			
-								//	
-								//	Check if ContentType -> Task ID on list
-								//
-								TInt ddId( 0 );
-RDebug::Print( _L("jshong FOTA : ConstructTreeL 5 ")) ;
-								
-								task.OpenL( iDSProfile, taskIdArray[i] );
-						        ddId = task.DataProvider();
-						        task.Close();
-								
-									//Get Task ID
-								//	addNAME.AppendNumFixedWidth( taskIdArray[i], EDecimal,3 ); 
-RDebug::Print( _L("jshong FOTA : ConstructTreeL 6 ") );
-							
-									TBuf8<80> addDBURI;
-									
-									addDBURI.Append( addURI );
-									_LIT8( KDB, "/DB" );// addDb also 
-									addDBURI.Append( KDB );
-									addDBURI.Append( Kprev2 );
-									addDBURI.AppendNumFixedWidth( taskIdArray[i], EDecimal, 3 ); 
-RDebug::Print( _L("jshong FOTA : ConstructTreeL 7 ")) ;
-
-									TBuf8<16> addDBLUID;
-									addDBLUID.Num( ddId );
-									HBufC8* mapInfo = iCallBack->GetLuidAllocL(addDBURI);
-								 	if (mapInfo->Length() == 0)
-						 			{
-						 	 			iCallBack->SetMappingL(addDBURI,addDBLUID);
-					 	 	 
-						 	 			if( aURI.Find(addDBURI) >= 0 )
-                    					{ 
-                    						profileID = ddId;
-                    						notDBSet = ETrue;
-                    					}
-						 			}							
-								
-								} //For
-							CloseDSProfile();
-							CleanupStack::PopAndDestroy(2);// task, taskIdArray
-							}
-							
-						 //return KErrGeneral;	
-								}	 
-							else
-							{
-									CloseDSProfile();
-						 }
-						 
-						 }
-						 else
-						 {
-RDebug::Print( _L("jshong FOTA : ConstructTreeL 1-5 ") );
-						 
-						 	delete mapInfo;
-						 }
-						 
-	    			
-    			}
-	    	
-         CleanupStack::PopAndDestroy( 1 );//profileIdArray
-        return profileID;
-}
-
-//------------------------------------------------------------------------------
-// TPtrC8 CUtils::GetDynamicDSNodeUri( const TDesC8& aURI )
-// returns Syncml/DSAcc/xxx URI
-//------------------------------------------------------------------------------
-TPtrC8 CNSmlDSSettingsAdapter::GetDynamicDSNodeUri(const TDesC8& aURI)
-    {    
-    TInt i= 0;
-    TBuf8<50> DsAccRoot(KDSAcc1);
-    for ( i = aURI.Find( KDSAcc1 ) + DsAccRoot.Length() + 1 ; i < aURI.Length(); i++ )
-        {
-        if( aURI[i] == '/'  )            
-			{            break;            
-			}
-        }    
-		
-    return aURI.Left( i );
-    }
-	
-// End of File
-
--- a/omadm/omadmextensions/adapters/syncmlds/src/nsmldssettingsadapter.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-CHARACTER_SET UTF8/*
-* 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:    Resource data for Device Management DS Settings Adapter
-*
-*/
-
-
-
-
-
-#include <registryinfo.rh>
-#include "nsmldmconstants.h"
-
-RESOURCE REGISTRY_INFO theRegistryInfo
-  {
-  dll_uid = 0x101F6DE7; //The DLL's 3rd UID.
-  interfaces = 
-      {
-      INTERFACE_INFO
-          {
-          interface_uid = KNSmlDMInterfaceUid; // DM interface UID
-          implementations = 
-            {
-            IMPLEMENTATION_INFO
-                {
-                implementation_uid = 0x101F6DED; // DM interface implementation UID
-                version_no = 1; 
-                display_name = "";
-                default_data = "";
-                opaque_data = "";
-                }
-            };
-          }
-      };
-    }
-
-// End of File
--- a/omadm/omadmextensions/adapters/syncmlds/tsrc/bwins/syncmldstestu.def	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	?LibEntryL@@YAPAVCScriptBase@@AAVCTestModuleIf@@@Z @ 1 NONAME ; class CScriptBase * LibEntryL(class CTestModuleIf &)
-
--- a/omadm/omadmextensions/adapters/syncmlds/tsrc/conf/syncmldstest.cfg	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,168 +0,0 @@
-[Test]
-title DDF
-create syncmldstest foobar jee
-foobar DDFStructure
-delete foobar
-[Endtest] 
-
-[Test]
-title StartAtomic
-create syncmldstest foobar
-foobar StartAtomic
-delete foobar
-[Endtest]
-
-[Test]
-title CommitAtomic
-create syncmldstest foobar
-foobar CommitAtomic
-delete foobar
-[Endtest]
-
-[Test]
-title RollbackAtomic
-create syncmldstest foobar
-foobar RollbackAtomic
-delete foobar
-[Endtest]
-
-[Test]
-title AddDSAcc099
-create syncmldstest foobar
-foobar AddNode SyncML/DSAcc/DSId099
-foobar UpdateLeaf SyncML/DSAcc/DSId099/Name name99
-foobar UpdateLeaf SyncML/DSAcc/DSId099/ServerId server99
-foobar UpdateLeaf SyncML/DSAcc/DSId099/Addr Test
-foobar UpdateLeaf SyncML/DSAcc/DSId099/ClientUserName user99
-foobar CompleteCommands
-delete foobar
-[Endtest]
-
-[Test]
-title UpdateName
-create syncmldstest foobar
-foobar UpdateLeaf SyncML/DSAcc/DSId099/Name newname99
-delete foobar
-[Endtest]
-
-[Test]
-title UpdateAddr
-create syncmldstest foobar
-foobar UpdateLeaf SyncML/DSAcc/DSId099/Addr Dummy
-delete foobar
-[Endtest]
-
-[Test]
-title UpdateClientUserName
-create syncmldstest foobar
-foobar UpdateLeaf SyncML/DSAcc/DSId099/ClientUserName dummy99
-delete foobar
-[Endtest]
-
-[Test]
-title FetchNodeDSAcc
-create syncmldstest foobar
-foobar FetchNode SyncML/DSAcc
-delete foobar
-[Endtest]
-
-[Test]
-title FetchLeafDSAccName
-create syncmldstest foobar
-foobar FetchLeaf SyncML/DSAcc/DSId099/Name
-delete foobar
-[Endtest]
-
-[Test]
-title FetchLeafDSAccServerId
-create syncmldstest foobar
-foobar FetchLeaf SyncML/DSAcc/DSId099/ServerId
-delete foobar
-[Endtest]
-
-[Test]
-title FetchLeafDSAccAddr
-create syncmldstest foobar
-foobar FetchLeaf SyncML/DSAcc/DSId099/Addr
-delete foobar
-[Endtest]
-
-[Test]
-title FetchLeafDSAccClientUserName
-create syncmldstest foobar
-foobar FetchLeaf SyncML/DSAcc/DSId099/ClientUserName
-delete foobar
-[Endtest]
-
-[Test]
-title DeleteDSAcc
-create syncmldstest foobar
-foobar DeleteNode SyncML/DSAcc/DSId099
-delete foobar
-[Endtest]
-
-[Test]
-title AddDSAcc090
-create syncmldstest foobar
-foobar AddNode SyncML/DSAcc/DSId090
-foobar UpdateLeaf SyncML/DSAcc/DSId090/Addr NewAcc 
-foobar UpdateLeaf SyncML/DSAcc/DSId090/AddrType 3 
-foobar UpdateLeaf SyncML/DSAcc/DSId090/ClientPW passwd  
-foobar UpdateLeaf SyncML/DSAcc/DSId090/ClientUserName uname  
-foobar AddNode SyncML/DSAcc/DSId090/DB   
-foobar AddNode SyncML/DSAcc/DSId090/DB/CTId090   
-foobar UpdateLeaf SyncML/DSAcc/DSId090/DB/CTId090/CTType text/x-vcalendar 
-foobar AddNode SyncML/DSAcc/DSId090/DB/CTId090/LDBURI 	 C:\calender	
-foobar UpdateLeaf SyncML/DSAcc/DSId090/DB/CTId090/RDBURI Calendar 
-foobar AddNode SyncML/DSAcc/DSId090/DB/CTId091   
-foobar UpdateLeaf SyncML/DSAcc/DSId090/DB/CTId091/CTType text/x-vcard 
-foobar AddNode SyncML/DSAcc/DSId090/DB/CTId091/LDBURI   C:\contacts
-foobar UpdateLeaf SyncML/DSAcc/DSId090/DB/CTId091/RDBURI Contacts 
-foobar AddNode SyncML/DSAcc/DSId090/DB/CTId092   
-foobar UpdateLeaf SyncML/DSAcc/DSId090/DB/CTId092/CTType application/vnd.omads-email+xml 
-foobar AddNode SyncML/DSAcc/DSId090/DB/CTId092/LDBURI   C:\email
-foobar UpdateLeaf SyncML/DSAcc/DSId090/DB/CTId092/RDBURI Email
-foobar AddNode SyncML/DSAcc/DSId090/DB/CTId093   
-foobar UpdateLeaf SyncML/DSAcc/DSId090/DB/CTId093/CTType text/plain 
-foobar AddNode SyncML/DSAcc/DSId090/DB/CTId093/LDBURI   C:\notes
-foobar UpdateLeaf SyncML/DSAcc/DSId090/DB/CTId093/RDBURI Notes 
-foobar AddNode SyncML/DSAcc/DSId090/DB/CTId094   
-foobar UpdateLeaf SyncML/DSAcc/DSId090/DB/CTId094/CTType text/x-vBookmark 
-foobar AddNode SyncML/DSAcc/DSId090/DB/CTId094/LDBURI   C:\bookmarks
-foobar UpdateLeaf SyncML/DSAcc/DSId090/DB/CTId094/RDBURI Bookmarks
-foobar UpdateLeaf SyncML/DSAcc/DSId090/Name TestDummy 
-foobar UpdateLeaf SyncML/DSAcc/DSId090/ServerId TestDummy 
-foobar UpdateLeaf SyncML/DSAcc/DSId090/ToNapID  AP/APId000
-foobar CompleteCommands
-delete foobar
-[Endtest]
-
-[Test]
-title FetchAllLeafDsAcc
-create syncmldstest foobar
-foobar FetchLeaf SyncML/DSAcc/DSId090/Addr
-foobar FetchLeaf SyncML/DSAcc/DSId090/AddrType
-foobar FetchLeaf SyncML/DSAcc/DSId090/ClientPW   
-foobar FetchLeaf SyncML/DSAcc/DSId090/ClientUserName   
-foobar FetchLeaf SyncML/DSAcc/DSId090/DB/CTId090/CTType
-foobar FetchLeaf SyncML/DSAcc/DSId090/DB/CTId090/RDBURI
-foobar FetchLeaf SyncML/DSAcc/DSId090/DB/CTId091/CTType
-foobar FetchLeaf SyncML/DSAcc/DSId090/DB/CTId091/RDBURI
-foobar FetchLeaf SyncML/DSAcc/DSId090/DB/CTId092/CTType
-foobar FetchLeaf SyncML/DSAcc/DSId090/DB/CTId092/RDBURI
-foobar FetchLeaf SyncML/DSAcc/DSId090/DB/CTId093/CTType
-foobar FetchLeaf SyncML/DSAcc/DSId090/DB/CTId093/RDBURI 
-foobar FetchLeaf SyncML/DSAcc/DSId090/DB/CTId094/CTType
-foobar FetchLeaf SyncML/DSAcc/DSId090/DB/CTId094/RDBURI
-foobar FetchLeaf SyncML/DSAcc/DSId090/Name 
-foobar FetchLeaf SyncML/DSAcc/DSId090/ServerId
-foobar FetchLeaf SyncML/DSAcc/DSId090/ToNapID 
-delete foobar
-[Endtest]
-
-[Test]
-title DeleteDSAcc90
-create syncmldstest foobar
-foobar DeleteNode SyncML/DSAcc/DSId090
-delete foobar
-[Endtest]
--- a/omadm/omadmextensions/adapters/syncmlds/tsrc/eabi/syncmldstestu.def	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-EXPORTS
-	_Z9LibEntryLR13CTestModuleIf @ 1 NONAME
-	_ZTI13CsyncmldsTest @ 2 NONAME ; #<TI>#
-	_ZTI16CTestDmDDFObject @ 3 NONAME ; #<TI>#
-	_ZTI8Cdmatest @ 4 NONAME ; #<TI>#
-	_ZTV13CsyncmldsTest @ 5 NONAME ; #<VT>#
-	_ZTV16CTestDmDDFObject @ 6 NONAME ; #<VT>#
-	_ZTV8Cdmatest @ 7 NONAME ; #<VT>#
-
--- a/omadm/omadmextensions/adapters/syncmlds/tsrc/group/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-/*
-* Copyright (c) 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:  Implementation of DM adapter test component
-* 	This is part of omadmextensions/adapter test application.
-*
-*/
-
-
-
-
-
-
-PRJ_PLATFORMS
-// specify the platforms your component needs to be built for here
-// defaults to WINS MARM so you can ignore this if you just build these
-DEFAULT
-
-PRJ_TESTEXPORTS
-// NOTE: If using ARS requirements all export operations should be done under this.
-// 'abld test export'
-
-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
-// Example: 
-
-
-PRJ_TESTMMPFILES
-// NOTE: If using ARS requirements .mmp file operation should be done under this.
-// 'abld test build'
-syncmldstest.mmp
-
-PRJ_MMPFILES
-// Specify the .mmp files required for building the important component
-// releasables.
-//
-// Specify "tidy" if the component you need to build doesn't need to be
-// released. Specify "ignore" if the MMP file exists but should be
-// ignored.
-// Example:
-
-//  End of File
--- a/omadm/omadmextensions/adapters/syncmlds/tsrc/group/syncmldstest.mmp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-/*
-* Copyright (c) 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:  Implementation of DM adapter test component
-* 	This is part of omadmextensions/adapter test application.
-*
-*/
-
-
-
-
-#include <platform_paths.hrh>
-
-TARGET          syncmldstest.dll
-TARGETTYPE      dll
-UID             0x1000008D 0x101FB3E3
-
-CAPABILITY	ALL -TCB
-/* Remove comments and replace 0x00000000 with correct vendor id */
-// VENDORID 	0x00000000
-
-//TARGETPATH      ?target_path
-DEFFILE         syncmldstest.def
-
-SOURCEPATH      ../src
-SOURCE          dmatest.cpp
-SOURCE          TestDmDDFObject.cpp
-SOURCE          syncmldstest.cpp
-SOURCE          syncmldstestBlocks.cpp
-
-
-USERINCLUDE     ../inc 
-USERINCLUDE		  ../../inc
-
-SYSTEMINCLUDE   /epoc32/include/ecom
-APP_LAYER_SYSTEMINCLUDE
-
-
-LIBRARY         apgrfx.lib apmime.lib
-LIBRARY         euser.lib ecom.lib
-LIBRARY         stiftestinterface.lib
-LIBRARY         stiftestengine.lib
-LIBRARY         efsrv.lib
-LIBRARY         estor.lib 
-LIBRARY         SWInstCli.lib
-
-LANG			SC
-
-
-
-SMPSAFE
-// End of File
-
--- a/omadm/omadmextensions/adapters/syncmlds/tsrc/group/syncmldstest.pkg	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-;
-; Copyright (c) 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:  Implementation of DM adapter test component
-; 	This is part of omadmextensions/adapter test application.
-;
-
-;*Languages
-&EN
-;
-;*Standard SIS file header. This section specifies the package name,
-;application UID, and version/build numbers. Add the package TYPE here if needed.
-#{"syncmldstest"},(0x101FB3E8),1,0,1;
-;
-
-;*Unique (Non-Localised) Vendor name
-;This is used in combination with signing to prevent the unauthroized
-;upgrade ofa a package by someone other than the rightful vendor.
-:"Nokia"
-
-;*Localized Vendor Name
-;This specifies the localised vendor name(s) correspodning to language(s).
-%{"Nokia Test EN"}
-
-;*Files To Copy...<src> <destination>
-"\epoc32\release\armv5\urel\syncmldstest.dll" -"C:\sys\bin\syncmldstest.dll"
-"..\conf\syncmldstest.cfg"-"C:\TestFramework\syncmldstest.cfg"
-"..\init\syncmldstest.ini"-"C:\TestFramework\syncmldstest.ini"
--- a/omadm/omadmextensions/adapters/syncmlds/tsrc/inc/TestDmDDFObject.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,203 +0,0 @@
-/*
-* Copyright (c) 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:  Implementation of DM adapter test component
-* 	This is part of omadmextensions/adapter test application.
-*
-*/
-
-
-
-
-
-
-#ifndef __TESTDMDDFOBJECT_H
-#define __TESTDMDDFOBJECT_H
-
-//  INCLUDES
-//#include <?include_file>
-#include <smldmadapter.h>
-
-// CONSTANTS
-//const ?type ?constant_var = ?constant;
-
-// MACROS
-//#define ?macro ?macro_def
-
-// DATA TYPES
-//enum ?declaration
-//typedef ?declaration
-//extern ?data_type;
-
-// FUNCTION PROTOTYPES
-//?type ?function_name(?arg_list);
-
-// FORWARD DECLARATIONS
-class CStifLogger;
-
-// CLASS DECLARATION
-
-/**
-*  ?one_line_short_description.
-*  ?other_description_lines
-*
-*  @lib ?library
-*  @since Series ?XX ?SeriesXX_version
-*/
-class CTestDmDDFObject : public CBase, public MSmlDmDDFObject
-    {
-    public:  // Constructors and destructor
-        
-        /**
-        * Two-phased constructor.
-        */
-        static CTestDmDDFObject* NewL( CStifLogger *aLog );
-        static CTestDmDDFObject* NewLC( CStifLogger *aLog );
-        
-        /**
-        * Destructor.
-        */
-        virtual ~CTestDmDDFObject();
-
-    public: // New functions
-        
-        /**
-        * ?member_description.
-        * @since Series ?XX ?SeriesXX_version
-        * @param ?arg1 ?description
-        * @return ?description
-        */
-        //?type ?member_function( ?type ?arg1 );
-
-		virtual void SetNameL( const TDesC8& aName );
-		
-		void DumpL( const TDesC8& aParentName, TBool aFullDump = ETrue );
-		void ExternalizeL(RWriteStream& aStream) const;
-		
-		
-
-    public: // Functions from base classes
-    
-//sf-    *********************************
-    
-		void SetAccessTypesL( TSmlDmAccessTypes aAccessTypes );
-		void SetDefaultValueL( const TDesC8& aDefaultValue );
-		void SetDescriptionL( const TDesC8& aDescription );
-		void SetDFFormatL( TDFFormat aFormat );
-		void SetOccurenceL( TOccurence aOccurence );
-		void SetScopeL( TScope aScope );
-		void SetDFTitleL( const TDesC8& aTitle );
-		void AddDFTypeMimeTypeL( const TDesC8& aMimeType );
-		void SetAsObjectGroup();
-		MSmlDmDDFObject& AddChildObjectL(const TDesC8& aNodeName);
-		MSmlDmDDFObject& AddChildObjectGroupL();
-
-//sf-    #############################
-
-		const TDesC8& Name();
-		TSmlDmAccessTypes  AccessTypes();
-		const TDesC8& DefaultValue();
-		const TDesC8& Description();
-		TDFFormat DFFormat();
-		TOccurence Occurence();
-		TScope Scope();
-		const TDesC8& DFTitle();
-		const TDesC8& DFTypeMimeType();
-		TBool ObjectGroup();
-		
-		TInt ChildObjectCount();
-		CTestDmDDFObject& ChildObject( TInt aIndex );
-
-		CTestDmDDFObject* FindChildObject( const TDesC8& aName );
-		TInt SubObjectsCount();
-
-
-    protected:  // New functions
-        
-        /**
-        * ?member_description.
-        * @since Series ?XX ?SeriesXX_version
-        * @param ?arg1 ?description
-        * @return ?description
-        */
-        //?type ?member_function( ?type ?arg1 );
-
-    protected:  // Functions from base classes
-        
-        /**
-        * From ?base_class ?member_description
-        */
-        //?type ?member_function();
-
-    private:
-
-        /**
-        * C++ default constructor.
-        */
-        CTestDmDDFObject( CStifLogger *aLog );
-
-        /**
-        * By default Symbian 2nd phase constructor is private.
-        */
-        void ConstructL();
-
-        // Prohibit copy constructor if not deriving from CBase.
-        // CTestDmDDFObject( const CTestDmDDFObject& );
-        // Prohibit assigment operator if not deriving from CBase.
-        // CTestDmDDFObject& operator=( const CTestDmDDFObject& );
-
-    public:     // Data
-        // ?one_line_short_description_of_data
-        //?data_declaration;
-    
-    protected:  // Data
-        // ?one_line_short_description_of_data
-        //?data_declaration;
-
-    private:    // Data
-        // ?one_line_short_description_of_data
-        //?data_declaration;
-		HBufC8* iName;
-
-		TSmlDmAccessTypes iAccessTypes;
-		HBufC8* iDefaultValue;
-		HBufC8* iDescription;
-		TDFFormat iFormat;
-		TOccurence iOccurence;
-		TScope iScope;
-		HBufC8* iTitle;
-		HBufC8* iMimeType;
-		TBool iObjectGroup;
-		
-		RPointerArray<CTestDmDDFObject> iChildren;
-
-         
-        // Reserved pointer for future extension
-        //TAny* iReserved;
-
-    public:     // Friend classes
-        //?friend_class_declaration;
-    protected:  // Friend classes
-        //?friend_class_declaration;
-    private:    // Friend classes
-        //?friend_class_declaration;
-        /**
-        * Logger.
-        */
-        CStifLogger*    iLog;
-
-    };
-
-#endif      // __TESTDMDDFOBJECT_H
-            
-// End of File
--- a/omadm/omadmextensions/adapters/syncmlds/tsrc/inc/dmatest.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,278 +0,0 @@
-/*
-* Copyright (c) 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:  Implementation of DM adapter test component
-* 	This is part of omadmextensions/adapter test application.
-*
-*/
-
-
-
-
-
-
-#ifndef __DMA_TEST_H__
-#define __DMA_TEST_H__
-
-//  INCLUDES
-#include <StifLogger.h>
-#include <TestScripterInternal.h>
-#include <StifTestModule.h>
-#include <apmstd.h>
-#include <smldmadapter.h>
-
-#include "NSmlDSSettingsAdapter.h"
-
-class Cdmatest;
-
-
-struct TMapping
-	{
-	TBuf8<256> iURI;
-	TBuf8<64> iLuid;
-	TMapping( const TDesC8 &aURI, const TDesC8 &aLuid )  : iURI( aURI ), iLuid( aLuid )
-	{
-		
-		}
-	};
-	
-typedef RArray<TMapping> RMappingArray;
-
-typedef void (Cdmatest::* ResultsFunction)( TInt , CBufBase& , const TDesC8&  ) ; 
-
-
-// CLASS DECLARATION
-
-/**
-*  ?one_line_short_description.
-*  ?other_description_lines
-*
-*  @lib ?library
-*  @since Series ?XX ?SeriesXX_version
-*/
-class Cdmatest : public CScriptBase, public MSmlDmCallback
-    {
-    
-    public:  // Constructors and destructor
-        
-        /**
-        * Destructor.
-        */
-        virtual ~Cdmatest();
-
-    public: // Functions from base classes
-
-        /**
-        * From CScriptBase Runs a script line.
-        * @since ?Series60_version
-        * @param aItem Script line containing method name and parameters
-        * @return Symbian OS error code
-        */
-        virtual TInt RunMethodL( CStifItemParser& aItem ) = 0;
-    
-
-	public:
-		/**
-		The function is used to return the data in case of FetchLeafObjectL(),
-		FetchLeafObjectSizeL() and ChildURIListL() functions. It should not be
-		called where the DM command has failed, i.e. the error code returned in
-		SetStatusL is something other than EOk.
-		@param aResultsRef	Reference to correct command
-		@param aObject		The data which should be returned
-		@param aType			MIME type of the object
-		@publishedPartner
-		@prototype
-		*/
-		void SetResultsL( TInt aResultsRef, CBufBase& aObject,
-								  const TDesC8& aType );
-		
-		/**
-		The function is used to return the data in case of FetchLeafObjectL() and
-		ChildURIListL() functions, where the size of the data being returned is
-		large enough for the Adapter to stream it. This function should not be
-		called when command was failed, i.e. the error code returned in SetStatusL
-		is something other than EOk.
-		@param aResultsRef	Reference to correct command
-		@param aStream		Large data which should be returned, DM engine
-								closes stream when it has read all the data
-		@param aType			MIME type of the object
-		@publishedPartner
-		@prototype
-		*/
-		void SetResultsL( TInt /*aResultsRef*/, RReadStream*& /*aStream*/,
-								  const TDesC8& /*aType*/ ) 
-		{
-			
-		}
-
-		/**
-		The function returns information about the Add,Update,Delete and Fetch
-		commands success to DM engine. The reference to correct command must be
-		used when calling the SetStatusL function, the reference is got from the
-		argument of the command functions. The SetStatusL function must be called
-		separately for every single command.
-		@param aStatusRef	Reference to correct command
-		@param aErrorCode	Information about the command success
-		@publishedPartner
-		@prototype
-		*/
-		void SetStatusL( TInt aStatusRef,
-								 MSmlDmAdapter::TError aErrorCode ) ;
-
-		/**
-		The function passes map information to DM Module. This function is called
-		for a new management object, both for node objects and for leaf objects.
-		In addition if ChildURIListL() function has returned new objects a mapping
-		information of the new objects must be passed. A mapping is treated as
-		inheritable. If the mapping is not set with this function, the mapping
-		LUID of the parent object is passed in following commands to the object.
-		@param aURI	URI of the object. 
-		@param aLUID	LUID of the object. LUID must contain the all information,
-						which is needed for retrieve the invidual object from the
-						database. Typically it is ID for the database table. In
-						more complicated structures it can be combination of IDs,
-						which represent path to the object.
-		@publishedPartner
-		@prototype
-		*/
-		void SetMappingL( const TDesC8& aURI, const TDesC8& aLUID );
-
-		/**
-		The function is used to make a fetch to other adapters. The most common
-		use is to make a fetch to the AP adapter, because when managing the access
-		points, the data comes as URI. For example, there are ToNAPId field in
-		some adapters, and data to it can be something like AP/IAPidx, and then
-		the link to AP adapter is needed.
-		Using FetchLinkL causes the DM Framework to make a Get request to the
-		appropriate DM adapter.  The receiving adapter MUST complete the Get
-		request synchronously.
-		@param aURI		URI of the object. 
-		@param aData		Reference to data, i.e. data is returned here
-		@param aStatus	The status of fetch command is returned here
-		@publishedPartner
-		@prototype
-		*/
-		void FetchLinkL( const TDesC8& /*aURI*/, CBufBase& /*aData*/,
-								 MSmlDmAdapter::TError& /*aStatus*/ ) 
-			{
-				
-			}
-
-		/**
-		The function returns the LUID which is mapped to aURI. If LUID is not
-		found, the function allocates a null length string, i.e. the function
-		allocates memory in every case.
-		@param aURI	URI of the object. 
-		@publishedPartner
-		@prototype
-		*/
-		HBufC8* GetLuidAllocL( const TDesC8& aURI ) ;
-
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-    
-    void GetMappingInfoListL( const TDesC8& aURI,
-								CArrayFix<TSmlDmMappingInfo>& aSegmentList );
-
-#else
-// nothing
-#endif
-		        
-    protected:  // New functions
-
-        
-		void FetchNodeResultsL( TInt aResultsRef, CBufBase& aObject,
-							  const TDesC8& aType );
-		void SaveDataL( TInt aResultsRef, CBufBase& aObject,
-							  const TDesC8& aType ) ;
-							  
-		TPtrC8 LastURISeg( const TDesC8& aURI );
-		TPtrC8 RemoveLastURISeg( const TDesC8& aURI );
-		TPtrC RemoveLastURISeg( const TDesC& aURI );
-		void SetURIL( const TDesC& aURI );
-		void SetURIL( const TDesC8& aURI );
-		void SetURIL( HBufC8* aURI );		
-		HBufC8 *LoadFileLC( const TDesC &aFileName, TDataType &aType );
-		HBufC8 *LoadFileLC( const TDesC8 &aFileName, TDataType &aType );
-		HBufC8 *GetNextStringLC ( CStifItemParser& aItem, const TDesC &aName );
-		HBufC8* GetLuidAllocLC( const TDesC8& aURI ) ;
-		TPtrC8 RemoveLastSeg(const TDesC8& aURI);
-		
-		TInt FetchNodeL( CStifItemParser& aItem ) ;
-		TInt FetchLeafL( CStifItemParser& aItem ) ;
-		TInt AddNodeL( CStifItemParser& aItem );
-		TInt DeleteObjectL( CStifItemParser& aItem );	
-		TInt UpdateLeafL( CStifItemParser& aItem )	;
-		TInt UpdateLeafDataL( CStifItemParser& aItem ) ;
-		TInt UpdateLeafDataURLL( CStifItemParser& aItem ) ;
-		
-		TInt ExecuteLeafL ( CStifItemParser& aItem ) ;
-		TInt ExecuteLeafDataL ( CStifItemParser& aItem ) ;
-		TInt StartAtomicL( CStifItemParser& aItem )	;
-		TInt CommitAtomicL( CStifItemParser& aItem )	;
-		TInt RollbackAtomicL( CStifItemParser& aItem )	;
-		TInt CompleteCommandsL( CStifItemParser& aItem );
-		TInt DDFStructureL( CStifItemParser& aItem )	;
-//        TInt DeliverL( CStifItemParser& aItem ) ;
-//        TInt DetailsL( CStifItemParser& aItem ) ;
-//		TInt InstallL( CStifItemParser& aItem ) ;
-//		TInt BareInstallL( CStifItemParser& aItem ) ;		
-
-    protected:
-
-        /**
-        * C++ default constructor.
-        */
-        Cdmatest( CTestModuleIf& aTestModuleIf, TUid aUid );
-
-        /**
-        * By default Symbian 2nd phase constructor is private.
-        */
-        void ConstructL();
-
-        // Prohibit copy constructor if not deriving from CBase.
-        // Cdmatest( const Cdmatest& );
-        // Prohibit assigment operator if not deriving from CBase.
-        // Cdmatest& operator=( const Cdmatest& );
-
-		/**
-        * Frees all resources allocated from test methods.
-        * @since ?Series60_version
-        */
-        virtual void Delete();
-        void LoadMappingsL();
-        void SaveMappingsL();
-    public:     // Data
-        // ?one_line_short_description_of_data
-        //?data_declaration;
-    
-    protected:  // Data
-        // ?one_line_short_description_of_data
-        //?data_declaration;
-		MSmlDmAdapter::TError iStatus ;
-        ResultsFunction iResultsFunction;
-        //CSmlDmAdapter *iAdapter ;
-        CNSmlDSSettingsAdapter *iAdapter ;
-        HBufC8 *iURI; 
-        CArrayFix<TSmlDmMappingInfo> *iEmptyMappingInfoArray;
-		TFileName iSaveFileName;
-		RMappingArray iMappingTable;
-		TUid iUid;
-		TInt iCounter;
-		//class CNSmlDmMgmtTree* iMgmtTree;
-		class CNSmlDmMgmtTree* iMgmtTree;
-		CNSmlDSSettingsAdapter *Adapter() ;
-    };
-
-#endif      // __DMA_TEST_H__
-            
-// End of File
--- a/omadm/omadmextensions/adapters/syncmlds/tsrc/inc/syncmldstest.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,133 +0,0 @@
-/*
-* Copyright (c) 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:  Implementation of DM adapter test component
-* 	This is part of omadmextensions/adapter test application.
-*
-*/
-
-
-
-
-
-
-#ifndef TCTEST_H
-#define TCTEST_H
-
-//  INCLUDES
-#include <StifLogger.h>
-#include <TestScripterInternal.h>
-#include <StifTestModule.h>
-#include <smldmadapter.h>
-#include "dmatest.h"
-
-const TUint KNSmlDSSettingsAdapterImplUid = 0x101F6DED;
-	
-
-const TUid KAdapterUid = 
-		{
-		KNSmlDSSettingsAdapterImplUid
-		};
-// Logging path
-_LIT( KamtestLogPath, "\\logs\\testframework\\tctest\\" ); 
-// Log file
-_LIT( KamtestLogFile, "tctest.txt" ); 
-
-
-// FORWARD DECLARATIONS
-class CsyncmldsTest;
-
-
-// CLASS DECLARATION
-
-/**
-*  CsyncmldsTest test class for STIF Test Framework TestScripter.
-*  ?other_description_lines
-*
-*  @lib ?library
-*  @since ?Series60_version
-*/
-class CsyncmldsTest : public Cdmatest
-    {
-    public:  // Constructors and destructor
-        
-        /**
-        * Two-phased constructor.
-        */
-        static CsyncmldsTest* NewL( CTestModuleIf& aTestModuleIf );
-        
-        /**
-        * Destructor.
-        */
-        virtual ~CsyncmldsTest();
-
-    public: // Functions from base classes
-
-        /**
-        * From CScriptBase Runs a script line.
-        * @since ?Series60_version
-        * @param aItem Script line containing method name and parameters
-        * @return Symbian OS error code
-        */
-        virtual TInt RunMethodL( CStifItemParser& aItem );
-                
-
-    private:
-
-        /**
-        * C++ default constructor.
-        */
-        CsyncmldsTest( CTestModuleIf& aTestModuleIf );
-
-        /**
-        * By default Symbian 2nd phase constructor is private.
-        */
-        void ConstructL();
-
-        // Prohibit copy constructor if not deriving from CBase.
-        // ?classname( const ?classname& );
-        // Prohibit assigment operator if not deriving from CBase.
-        // ?classname& operator=( const ?classname& );
-    
-        /**
-        * Frees all resources allocated from test methods.
-        * @since ?Series60_version
-        */
-        virtual void Delete();
-        
-        /**
-        * Test methods are listed below. 
-        */
-        
-        /**
-        * Example test method.
-        * @since ?Series60_version
-        * @param aItem Script line containing parameters.
-        * @return Symbian OS error code.
-        */
-/*        virtual TInt ExampleL( CStifItemParser& aItem ) ;
-        virtual TInt DeliverL( CStifItemParser& aItem ) ;
-        virtual TInt DetailsL( CStifItemParser& aItem ) ;
-		    virtual TInt InstallL( CStifItemParser& aItem ) ;
-		    virtual TInt BareInstallL( CStifItemParser& aItem ) ;*/
-		
-
-    private:    // Data
-        HBufC8 *GetNextStringLC ( CStifItemParser& aItem, const TDesC &aName );
-
-
-    };
-
-#endif      // TCTEST_H
-            
-// End of File
--- a/omadm/omadmextensions/adapters/syncmlds/tsrc/init/syncmldstest.ini	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,204 +0,0 @@
-#
-# This is STIF initialization file
-# Comment lines start with '#'-character.
-# See STIF TestFramework users guide.doc for instructions
-
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-# Set following test engine settings:
-#	- Set Test Reporting mode. TestReportMode's possible values are:
-#		+ 'Summary': Summary of the tested test cases.
-#		+ 'Environment': Hardware and software info.
-#		+ 'TestCases': Test case report.
-#		+ 'FullReport': Set of all above ones.
-#		+ Example 'TestReportMode= Summary TestCases'
-#
-# 	- CreateTestReport setting controls report creation mode
-#		+ YES, Test report will created.
-#		+ NO, No Test report.
-#
-# 	- File path indicates the base path of the test report.
-# 	- File name indicates the name of the test report.
-#
-# 	- File format indicates the type of the test report.
-#		+ TXT, Test report file will be txt type, for example 'TestReport.txt'.
-#		+ HTML, Test report will be html type, for example 'TestReport.html'.
-#
-# 	- File output indicates output source of the test report.
-#		+ FILE, Test report logging to file.
-#		+ RDEBUG, Test report logging to using rdebug.
-#
-# 	- File Creation Mode indicates test report overwriting if file exist.
-#		+ OVERWRITE, Overwrites if the Test report file exist.
-#		+ APPEND, Continue logging after the old Test report information if
-#                 report exist.
-# 	- Sets a device reset module's dll name(Reboot).
-#		+ If Nokia specific reset module is not available or it is not correct one
-#		  StifHWResetStub module may use as a template for user specific reset
-#		  module.
-# 	- Sets STIF test measurement disable options. e.g. pluging1 and pluging2 disablation
-#		DisableMeasurement= stifmeasurementplugin01 stifmeasurementplugin02
-#
-
-[Engine_Defaults]
-
-TestReportMode= FullReport    # Possible values are: 'Empty', 'Summary', 'Environment',
-                                                     'TestCases' or 'FullReport'
-
-CreateTestReport= YES         # Possible values: YES or NO
-
-TestReportFilePath= C:\LOGS\TestFramework\
-TestReportFileName= TestReport
-
-TestReportFormat= TXT         # Possible values: TXT or HTML
-TestReportOutput= FILE        # Possible values: FILE or RDEBUG
-TestReportFileCreationMode= OVERWRITE # Possible values: OVERWRITE or APPEND
-
-DeviceResetDllName= StifResetForNokia.dll # e.g. 'StifHWResetStub.dll' for user specific reseting
-
-DisableMeasurement= stifmeasurementdisablenone  # Possible values are:
-              # 'stifmeasurementdisablenone', 'stifmeasurementdisableall'
-              # 'stifmeasurementplugin01', 'stifmeasurementplugin02',
-              # 'stifmeasurementplugin03', 'stifmeasurementplugin04',
-              # 'stifmeasurementplugin05' or 'stifbappeaprofiler'
-
-Timeout= 0                    # Default timeout value for each test case. In milliseconds
-#UITestingSupport= YES        # Possible values: YES or NO
-#SeparateProcesses= YES       # Possible values: YES or NO (default: NO)
-[End_Defaults]
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-
-
-
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-# Module configurations start
-# Modules are added between module tags
-# tags. Module name is specified after ModuleName= tag, like
-# ModuleName= XXXXXXXXX
-# Modules might have initialisation file, specified as
-# IniFile= c:\testframework\YYYYYY
-# Modules might have several configuration files, like
-# TestCaseFile= c:\testframework\NormalCases.txt
-# TestCaseFile= c:\testframework\SmokeCases.txt
-# TestCaseFile= c:\testframework\ManualCases.txt
-
-# (TestCaseFile is synonym for old term ConfigFile)
-
-# Following case specifies demo module settings. Demo module
-# does not read any settings from file, so tags 
-# IniFile and TestCaseFile are not used.
-# In the simplest case it is enough to specify only the
-# name of the test module when adding new test module
-
-#[New_Module]
-#ModuleName= demomodule
-#[End_Module]
-
-
-[New_Module]
-ModuleName= testscripter
-#DM
-TestCaseFile= c:\testframework\syncmldstest.cfg
-[End_Module]
-
-
-# Load testmoduleXXX, optionally with initialization file and/or test case files
-#[New_Module]
-#ModuleName= testmodulexxx
-
-#TestModuleXXX used initialization file
-#IniFile= c:\testframework\init.txt
-
-#TestModuleXXX used configuration file(s)
-#TestCaseFile= c:\testframework\testcases1.cfg
-#TestCaseFile= c:\testframework\testcases2.cfg
-#TestCaseFile= c:\testframework\manualtestcases.cfg
-
-#[End_Module]
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-
-
-
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-# Set STIF logging overwrite parameters for Logger.
-# 	Hardware and emulator environment logging path and styles can
-# 	be configured from here to overwrite the Logger's implemented values.
-#	
-#	Settings description:
-#	- Indicates option for creation log directory/directories. If log directory/directories
-#         is/are not created by user they will make by software.
-#		+ YES, Create log directory/directories if not allready exist.
-#		+ NO, Log directory/directories not created. Only created one is used.
-#
-#	- Overwrite emulator path setting.
-#		+ Example: If 'EmulatorBasePath= C:\LOGS\TestFramework\' and in code is defined 
-#		           Logger's path 'D:\\LOGS\\Module\\' with those definition the path
-#		           will be 'C:\LOGS\TestFramework\LOGS\Module\'
-#
-#	- Overwrite emulator's logging format.
-#		+ TXT, Log file(s) will be txt type(s), for example 'Module.txt'.
-#		+ HTML, Log file(s) will be html type(s), for example 'Module.html'.
-#
-#	- Overwrited emulator logging output source.
-#		+ FILE, Logging to file(s).
-#		+ RDEBUG, Logging to using rdebug(s).
-#
-#	- Overwrite hardware path setting (Same description as above in emulator path).
-#	- Overwrite hardware's logging format(Same description as above in emulator format).
-#	- Overwrite hardware's logging output source(Same description as above in emulator output).
-#
-#	- File Creation Mode indicates file overwriting if file exist.
-#		+ OVERWRITE, Overwrites if file(s) exist.
-#		+ APPEND, Continue logging after the old logging information if file(s) exist.
-#
-#	- Will thread id include to the log filename.
-#		+ YES, Thread id to log file(s) name, Example filename 'Module_b9.txt'.
-#		+ NO, No thread id to log file(s), Example filename 'Module.txt'.
-#
-#	- Will time stamps include the to log file.
-#		+ YES, Time stamp added to each line in log file(s). Time stamp is 
-#                 for example'12.Nov.2003 115958    LOGGING INFO'
-#		+ NO, No time stamp(s).
-#
-#	- Will line breaks include to the log file.
-#		+ YES, Each logging event includes line break and next log event is in own line.
-#		+ NO, No line break(s).
-#
-#	- Will event ranking include to the log file.
-#		+ YES, Event ranking number added to each line in log file(s). Ranking number
-#                 depends on environment's tics, for example(includes time stamp also)
-#                 '012   12.Nov.2003 115958    LOGGING INFO'
-#		+ NO, No event ranking.
-#
-#	- Will write log file in unicode format.
-#		+ YES, Log file will be written in unicode format
-#		+ NO, Log will be written as normal, not unicode, file.
-#
-
-[Logger_Defaults]
-
-#NOTE: If you want to set Logger using next setting(s) remove comment(s)'#'
-#NOTE: TestEngine and TestServer logging settings cannot change here
-
-#CreateLogDirectories= YES    # Possible values: YES or NO
-
-#EmulatorBasePath= C:\LOGS\TestFramework\
-#EmulatorFormat= HTML         # Possible values: TXT or HTML
-#EmulatorOutput= FILE         # Possible values: FILE or RDEBUG
-
-#HardwareBasePath= D:\LOGS\TestFramework\
-#HardwareFormat= HTML         # Possible values: TXT or HTML
-#HardwareOutput= FILE         # Possible values: FILE or RDEBUG
-
-#FileCreationMode= OVERWRITE  # Possible values: OVERWRITE or APPEND
-
-#ThreadIdToLogFile= YES       # Possible values: YES or NO
-#WithTimeStamp= YES           # Possible values: YES or NO
-#WithLineBreak= YES           # Possible values: YES or NO
-#WithEventRanking= YES        # Possible values: YES or NO
-
-#FileUnicode= YES             # Possible values: YES or NO
-#AddTestCaseTitle= YES        # Possible values: YES or NO
-[End_Logger_Defaults]
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-
-# End of file
--- a/omadm/omadmextensions/adapters/syncmlds/tsrc/src/TestDmDDFObject.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,516 +0,0 @@
-/*
-* Copyright (c) 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:  Implementation of DM adapter test component
-* 	This is part of omadmextensions/adapter test application.
-*
-*/
-
-
-
-
-
-
-// INCLUDE FILES
-
-#include "TestDmDDFObject.h"
-#include "StifLogger.h"
-
-// EXTERNAL DATA STRUCTURES
-//extern  ?external_data;
-
-// EXTERNAL FUNCTION PROTOTYPES  
-//extern ?external_function( ?arg_type,?arg_type );
-
-// CONSTANTS
-//const ?type ?constant_var = ?constant;
-
-// MACROS
-//#define ?macro ?macro_def
-
-// LOCAL CONSTANTS AND MACROS
-//const ?type ?constant_var = ?constant;
-//#define ?macro_name ?macro_def
-
-// MODULE DATA STRUCTURES
-//enum ?declaration
-//typedef ?declaration
-
-// LOCAL FUNCTION PROTOTYPES
-//?type ?function_name( ?arg_type, ?arg_type );
-
-// FORWARD DECLARATIONS
-//class ?FORWARD_CLASSNAME;
-
-// ============================= LOCAL FUNCTIONS ===============================
-
-
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CTestDmDDFObject::CTestDmDDFObject
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CTestDmDDFObject::CTestDmDDFObject( CStifLogger *aLog )
-	: iName( 0 )
-	, iAccessTypes()
-	, iDefaultValue( 0 )
-	, iDescription( 0 )
-	, iFormat( (TDFFormat)0 )
-	, iOccurence( (TOccurence)0 )
-	, iScope( (TScope)0 )
-	, iTitle ( 0 )
-	, iMimeType( 0 )
-	, iObjectGroup( EFalse )
-	, iLog( aLog )
-//	RPointerArray<CTestDmDDFObject> iChildren;
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// CTestDmDDFObject::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CTestDmDDFObject::ConstructL()
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// CTestDmDDFObject::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CTestDmDDFObject* CTestDmDDFObject::NewL( CStifLogger *aLog )
-    {
-    CTestDmDDFObject* self = CTestDmDDFObject::NewLC( aLog );
-    CleanupStack::Pop( self );
-
-    return self;
-    }
-
-CTestDmDDFObject* CTestDmDDFObject::NewLC( CStifLogger *aLog )
-    {
-    CTestDmDDFObject* self = new( ELeave ) CTestDmDDFObject( aLog );
-    
-    CleanupStack::PushL( self );
-    self->ConstructL();
-
-    return self;
-    }
-
-    
-// Destructor
-CTestDmDDFObject::~CTestDmDDFObject()
-    {
-	delete iName;
-	delete iDefaultValue;
-	delete iDescription;
-	delete iTitle;
-	delete iMimeType;
-	iChildren.ResetAndDestroy();
-    }
-
-
-// -----------------------------------------------------------------------------
-// CTestDmDDFObject::?member_function
-// ?implementation_description
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-/*?type CTestDmDDFObject::?member_function(
-    ?arg_type arg,
-    ?arg_type arg )
-    {
-    
-    ?code
-    
-    }
-*/
-
-void CTestDmDDFObject::SetAccessTypesL( TSmlDmAccessTypes aAccessTypes )
-	{
-	iLog->Log( _L8( "SetAccessTypesL, aAccessTypes=%d" ), aAccessTypes.GetACL() );
-	iAccessTypes = aAccessTypes;
-	}
-
-void CTestDmDDFObject::SetDefaultValueL( const TDesC8& aDefaultValue )
-	{
-	iLog->Log( _L8( "SetDefaultValueL, aDefaultValue='%S'" ), &aDefaultValue );
-	delete iDefaultValue;
-	iDefaultValue = 0;
-	iDefaultValue = aDefaultValue.AllocL();
-	}
-
-void CTestDmDDFObject::SetDescriptionL( const TDesC8& aDescription )
-	{
-	iLog->Log( _L8( "SetDescriptionL, aDescription='%S'" ), &aDescription );
-	delete iDescription;
-	iDescription = 0;
-	iDescription = aDescription.AllocL();
-	}
-	
-void CTestDmDDFObject::SetDFFormatL( TDFFormat aFormat )
-	{
-	iLog->Log( _L8( "SetDFFormatL, aFormat=%d" ), aFormat );
-	iFormat = aFormat;
-	}
-	
-void CTestDmDDFObject::SetOccurenceL( TOccurence aOccurence )
-	{
-	iLog->Log( _L8( "SetOccurenceL, aOccurence=%d" ), aOccurence );
-	iOccurence = aOccurence;
-	}
-	
-void CTestDmDDFObject::SetScopeL( TScope aScope )
-	{
-	iLog->Log( _L8( "SetScopeL, aScope=%d" ), aScope );
-	iScope = aScope;
-	}
-	
-void CTestDmDDFObject::SetDFTitleL( const TDesC8& aTitle )
-	{
-	iLog->Log( _L8( "SetDFTitleL, aTitle='%S'" ), &aTitle );
-	delete iTitle;
-	iTitle = 0;
-	iTitle = aTitle.AllocL();
-	}
-	
-void CTestDmDDFObject::AddDFTypeMimeTypeL( const TDesC8& aMimeType )
-	{
-	iLog->Log( _L8( "AddDFTypeMimeTypeL, aMimeType='%S'" ), &aMimeType );
-	delete iMimeType;
-	iMimeType = 0;
-	iMimeType = aMimeType.AllocL();
-	}
-	
-void CTestDmDDFObject::SetAsObjectGroup()
-	{
-	iLog->Log( _L8( "SetAsObjectGroup, true" ) );
-	iObjectGroup = ETrue;
-	}
-	
-MSmlDmDDFObject& CTestDmDDFObject::AddChildObjectL(const TDesC8& aNodeName)
-	{
-	iLog->Log( _L8( "AddChildObjectL, aNodeName='%S'" ), &aNodeName );
-	CTestDmDDFObject* child = CTestDmDDFObject::NewLC( iLog ); //, aNodeName );
-	child->SetNameL( aNodeName );
-	iChildren.AppendL( child );
-	CleanupStack::Pop( child ); // Don't destroy
-	return *child;
-	}
-
-MSmlDmDDFObject& CTestDmDDFObject::AddChildObjectGroupL()
-	{
-	iLog->Log( _L8( "AddChildObjectGroupL, ''" ) );
-	CTestDmDDFObject* child = CTestDmDDFObject::NewLC( iLog ); //, KNullDesC );
-	child->SetAsObjectGroup();
-	iChildren.AppendL( child );
-	CleanupStack::Pop( child ); // Don't destroy
-	return *child;
-	}
-
-// Own functions
-
-void CTestDmDDFObject::SetNameL( const TDesC8& aName )
-	{
-	delete iName;
-	iName = 0;
-	iName = aName.AllocL();
-	}
-
-void CTestDmDDFObject::DumpL( const TDesC8& aParentName, TBool aFullDump )
-	{
-	TPtrC8 name( _L8("<X>") );
-	if (iName && iName->Length() > 0)
-		{
-		name.Set( *iName );
-		}
-
-	HBufC8* fullName = HBufC8::NewLC( aParentName.Length() + name.Length() + 1 );
-	*fullName = aParentName;
-	if (aParentName.Length() > 0 && aParentName[ aParentName.Length() - 1 ] != '/')
-		{
-		fullName->Des().Append( _L8("/"));
-		}
-	fullName->Des().Append( name );
-
-	/* Translate some members to text for dumping */
-	TBuf8<20> strAccessTypes;
-	TUint8 accessTypes = iAccessTypes.GetACL();
-	if ((accessTypes & iAccessTypes.EAccessType_Add) != 0)
-		{
-		strAccessTypes.Append( _L8("A") );
-		}
-	if ((accessTypes & iAccessTypes.EAccessType_Copy) != 0)
-		{
-		strAccessTypes.Append( _L8("C") );
-		}
-	if ((accessTypes & iAccessTypes.EAccessType_Delete) != 0)
-		{
-		strAccessTypes.Append( _L8("D") );
-		}
-	if ((accessTypes & iAccessTypes.EAccessType_Exec) != 0)
-		{
-		strAccessTypes.Append( _L8("E") );
-		}
-	if ((accessTypes & iAccessTypes.EAccessType_Get) != 0)
-		{
-		strAccessTypes.Append( _L8("G") );
-		}
-	if ((accessTypes & iAccessTypes.EAccessType_Replace) != 0)
-		{
-		strAccessTypes.Append( _L8("R") );
-		}
-	
-	TBuf8<20> strFormat;
-	switch( iFormat )
-		{
-	case EB64:
-		strFormat = _L8("Base64");
-		break;
-	case EBool:
-		strFormat = _L8("Bool");
-		break;
-	case EChr:
-		strFormat = _L8("Chr");
-		break;
-	case EInt:
-		strFormat = _L8("Int");
-		break;
-	case ENode:
-		strFormat = _L8("Node");
-		break;
-	case ENull:
-		strFormat = _L8("Null");
-		break;
-	case EXml:
-		strFormat = _L8("Xml");
-		break;
-	case EBin:
-		strFormat = _L8("Bin");
-		break;
-	default:
-		break;
-		}
-
-
-	TBuf8<20> strOccurence;
-	switch( iOccurence )
-		{
-	case EOne:
-		/** The node appears exactly once */
-		strOccurence = _L8("M:1");
-		break;
-	case EZeroOrOne:
-		/** The node is optional and may appear zero or once */
-		strOccurence = _L8("O:0-1");
-		break;
-	case EZeroOrMore:
-		/** The node is optional and may appear zero or more times */
-		strOccurence = _L8("O:0-*");
-		break;
-	case EOneOrMore:
-		/** The node is mandatory and may appear once or more times */
-		strOccurence = _L8("M:1-*");
-		break;
-	case EZeroOrN:
-		/** The node is optional and may appear between once and 'N' times */
-		strOccurence = _L8("O:1-N");
-		break;
-	case EOneOrN:
-		/** The node is mandatory and may appear between once and 'N' times */
-		strOccurence = _L8("M:1-N");
-		break;
-	default:
-		break;
-		}
-	
-	
-	TBuf8<20> strScope;
-	switch( iScope)
-		{
-	case EPermanent:
-		/** The node appears exactly once */
-		strScope = _L8("Permanent");
-		break;
-	case EDynamic:
-		/** The node is optional and may appear zero or once */
-		strScope = _L8("O:Dynamic");
-		break;
-	default:
-		break;
-		}
-
-	
-	/* Dump main data */
-	if (aFullDump)
-		{
-		iLog->Log( _L8( "DDFObject: '%S'" ), fullName );
-		}
-		else
-		{
-		iLog->Log( _L8( "DDFObject: '%S'   (%S), %S, %S, %S" ),
-					fullName, &strAccessTypes, &strFormat, &strOccurence, &strScope );
-		}
-	
-	/* Dump members */
-	if (aFullDump)
-		{
-		TPtrC8 empty( _L8( "<null>" ) );
-		#define CHK_NULL(a) ((a)==0?(TDesC8*)(&empty):(TDesC8*)(a))
-
-		iLog->Log( _L8( "    iName=='%S'" ), iName );
-		iLog->Log( _L8( "    iAccessTypes=%d (%S)" ), iAccessTypes.GetACL(), &strAccessTypes );
-		iLog->Log( _L8( "    iDefaultValue='%S'" ), CHK_NULL(iDefaultValue));
-		iLog->Log( _L8( "    iDescription='%S'" ), CHK_NULL(iDescription ));
-		iLog->Log( _L8( "    iFormat=%d (%S)" ), iFormat, &strFormat );
-		iLog->Log( _L8( "    iOccurence=%d (%S)" ), iOccurence, &strOccurence );
-		iLog->Log( _L8( "    iScope=%d (%S)" ), iScope, &strScope );
-		iLog->Log( _L8( "    iTitle='%S'" ), CHK_NULL(iTitle ));
-		iLog->Log( _L8( "    iMimeType='%S'" ), CHK_NULL(iMimeType ));
-		iLog->Log( _L8( "----------------------------------" ) );
-		}
-	
-	/* Dump children */
-	for (TInt i = 0 ; i < iChildren.Count() ; i++)
-		{
-		iChildren[i]->DumpL( *fullName, aFullDump );
-		}
-
-	CleanupStack::PopAndDestroy( fullName );
-	}
-
-/*
-void CTestDmDDFObject::ExternalizeL(RWriteStream& aStream) const
-	{
-	X;
-	aStream << *iName << eol;
-	}
-*/
-
-const TDesC8& CTestDmDDFObject::Name()
-	{
-	return (iName != 0) ? *iName : KNullDesC8();
-	}
-
-TSmlDmAccessTypes  CTestDmDDFObject::AccessTypes()
-	{
-	return iAccessTypes;
-	}
-
-const TDesC8& CTestDmDDFObject::DefaultValue()
-	{
-	return (iDefaultValue != 0) ? *iDefaultValue : KNullDesC8();
-	}
-
-const TDesC8& CTestDmDDFObject::Description()
-	{
-	return (iDescription != 0) ? *iDescription : KNullDesC8();
-	}
-
-CTestDmDDFObject::TDFFormat CTestDmDDFObject::DFFormat()
-	{
-	return iFormat;
-	}
-
-CTestDmDDFObject::TOccurence CTestDmDDFObject::Occurence()
-	{
-	return iOccurence;
-	}
-
-CTestDmDDFObject::TScope CTestDmDDFObject::Scope()
-	{
-	return iScope;
-	}
-
-const TDesC8& CTestDmDDFObject::DFTitle()
-	{
-	return (iTitle != 0) ? *iTitle : KNullDesC8();
-	}
-
-const TDesC8& CTestDmDDFObject::DFTypeMimeType()
-	{
-	return (iMimeType != 0) ? *iMimeType : KNullDesC8();
-	}
-
-TBool CTestDmDDFObject::ObjectGroup()
-	{
-	return iObjectGroup;
-	}
-
-TInt CTestDmDDFObject::ChildObjectCount()
-	{
-	return iChildren.Count();
-	}
-
-CTestDmDDFObject& CTestDmDDFObject::ChildObject( TInt aIndex )
-	{
-	return *iChildren[aIndex];
-	}
-
-CTestDmDDFObject* CTestDmDDFObject::FindChildObject( const TDesC8& aName )
-	{
-	CTestDmDDFObject* foundObject = 0;
-
-	for (TInt i = 0 ; i < iChildren.Count() ; i++)
-		{
-		if ( aName.CompareC( iChildren[i]->Name() ) == 0 )
-			{
-			foundObject = iChildren[i];
-			break;
-			}
-		}
-
-	return foundObject;
-	}
-
-TInt CTestDmDDFObject::SubObjectsCount()
-	{
-	TInt count = 0;
-
-	TInt i;
-	for (i = 0 ; i < iChildren.Count() ; i++)
-		{
-		count += iChildren[i]->SubObjectsCount();
-		}
-	count += i;
-
-	return count;
-	}
-
-/*
-// ========================== OTHER EXPORTED FUNCTIONS =========================
-
-// -----------------------------------------------------------------------------
-// ?function_name implements...
-// ?implementation_description.
-// Returns: ?value_1: ?description
-//          ?value_n: ?description
-//                    ?description
-// -----------------------------------------------------------------------------
-//
-?type  ?function_name(
-    ?arg_type arg,  // ?description
-    ?arg_type arg )  // ?description
-    {
-
-    ?code
-
-    }
-*/
-//  End of File  
--- a/omadm/omadmextensions/adapters/syncmlds/tsrc/src/dmatest.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,954 +0,0 @@
-/*
-* Copyright (c) 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:  Implementation of DM adapter test component
-* 	This is part of omadmextensions/adapter test application.
-*
-*/
-
-
-
-
-
-
-// INCLUDE FILES
-#include "dmatest.h"
-
-#include <StifParser.h>
-#include <Stiftestinterface.h>
-#include <S32FILE.H>
-#include <s32mem.h>
-#include <apgcli.h>
-#include <e32svr.h>
-#include <e32math.h>
-#include <f32file.h>
-#include <swinstapi.h>
-
-#include "TestDmDDFObject.h"
-
-_LIT8( KEmptyType, "" );
-_LIT8( KDefaultType, "text/plain" );
-_LIT( KMappingTableFile, "\\dmtestmappings.txt" );
-//_LIT8( KNSmlDMSeparator8, "/" );
-//const TUint8 KNSmlDMUriSeparator = 0x2f; //forward slash
-
-#define LEAVE_IF_ERROR(x,msg) \
-	{ TInt __xres = (x); if ( __xres < 0 ) { if ( iLog ) iLog->Log( (msg), __xres ); User::Leave( __xres );	} }
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// Cdmatest::Cdmatest
-// C++ default constructor can NOT contain any code, that
-// leave.
-// -----------------------------------------------------------------------------
-//
-Cdmatest::Cdmatest(CTestModuleIf& aTestModuleIf, TUid aUid ):
-        CScriptBase( aTestModuleIf ), iMappingTable(2), iUid( aUid )
-    {
-    
-    }
-
-// -----------------------------------------------------------------------------
-// Cdmatest::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void Cdmatest::ConstructL()
-    {    
-    Adapter();
-	iEmptyMappingInfoArray = new ( ELeave ) CArrayFixFlat<TSmlDmMappingInfo>(1);
-	
-	TRAPD( err, LoadMappingsL() );
-	if (err != KErrEof && err != KErrNone && err != KErrNotFound)
-		{
-		User::Leave( err );
-		}
-    }
-    
-CNSmlDSSettingsAdapter *Cdmatest::Adapter()  
-	{
-	if ( iAdapter == NULL )
-		{
-		if ( iLog )
-			{
-			iLog->Log( _L( "Loading Adapter" ) );
-			}
-  		
-  		TRAPD( err, iAdapter = (CNSmlDSSettingsAdapter*) CSmlDmAdapter::NewL( iUid,*this ) );
-	if ( err == KErrNone )
-		{
-		if (iLog )
-			{
-			iLog->Log( _L( "Loaded" ) );	
-			}
-		}
-	else
-		{
-		if (iLog)
-			{
-			iLog->Log( _L( "Failed to load adapter: %d" ), err );
-			}
-		}
-		}
-	return iAdapter;
-	}
-    
-    
-void Cdmatest::LoadMappingsL()
-	{
-	TDataType type; 
-	HBufC8 *data = LoadFileLC( KMappingTableFile,  type );
-	RDesReadStream buf( *data );
-	CleanupClosePushL( buf );
-
-	TInt len( data->Length() );
-	while (buf.Source()->TellL( MStreamBuf::ERead ).Offset() < len)
-		{
-		TUint32 val = buf.ReadUint32L();
-		TBuf8<256> uri;
-		TBuf8<64> luid;
-		buf.ReadL(uri, val);
-		val = buf.ReadUint32L();
-		buf.ReadL(luid, val);
-		TMapping m( uri, luid ) ;
-		TInt err( iMappingTable.Append( m )	);
-		if ( err == KErrNone )
-			{
-			iLog->Log( _L8( "Loaded mapping: '%S' : '%S'"), &m.iURI, &m.iLuid );
-			}
-		else
-			{
-			iLog->Log( _L8( "FAILED TO Load mapping: '%d' "), err );
-			}
-		}
-	CleanupStack::PopAndDestroy( &buf); // buf
-	CleanupStack::PopAndDestroy( data ); // data
-	}
-    	
-	
-
-void Cdmatest::SaveMappingsL()
-    {
-	TInt c( iMappingTable.Count() );
-	if ( c > 0 )
-	{
-    	RFs fs;
-    	User::LeaveIfError( fs.Connect() );
-    	CleanupClosePushL( fs );
-    	RFileWriteStream buf;
-    	User::LeaveIfError( buf.Replace( fs, KMappingTableFile, EFileWrite ) );
-    	CleanupClosePushL( buf );
-		
-		TInt i( 0 ) ;
-		do 
-			{
-			buf.WriteUint32L( iMappingTable[i].iURI.Length() );
-			buf.WriteL( iMappingTable[i].iURI );
-			buf.WriteUint32L( iMappingTable[i].iLuid.Length() );
-			buf.WriteL( iMappingTable[i].iLuid );
-			}
-		while ( ++i < c )	;
-		buf.CommitL();
-		buf.Close();
-	
-		CleanupStack::PopAndDestroy(); // buf
-		CleanupStack::PopAndDestroy(); // fs
-		}
-    }
-    	
-    
-// Destructor
-Cdmatest::~Cdmatest()
-    {
-    // Delete resources allocated from test methods
-    TRAPD(err, SaveMappingsL() );
-    if ( err != KErrNone )
-    	{
-    	if(iLog)
-    			iLog->Log( _L8( "Failed to save mappings!: %d"), err );
-    	}
-    Delete();
-    
-    // Delete logger
-    delete iLog;  
-    delete iEmptyMappingInfoArray;
-    delete iAdapter;
-    delete iURI;
-    iMappingTable.Reset();
-    REComSession::FinalClose();
-    }
-
-
-// -----------------------------------------------------------------------------
-// Camatest::Delete
-// Delete here all resources allocated and opened from test methods. 
-// Called from destructor. 
-// -----------------------------------------------------------------------------
-//
-void Cdmatest::Delete() 
-    {
-    
-    }
-
-// -----------------------------------------------------------------------------
-// Cdmatest::?member_function
-// ?implementation_description
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-
-
-        
-HBufC8 *Cdmatest::GetNextStringLC ( CStifItemParser& aItem, const TDesC &aName )
-	{
-	TPtrC nodename( KNullDesC );
-
-    TInt i( aItem.GetNextString ( nodename ) );
-    if ( i != KErrNone ) 
-	    {
-	    iLog->Log( _L( "ERROR Reading '%S' argument: 0x%X" ), &aName, i );
-	    }
-	else
-		{
-		iLog->Log( _L("%S: %S"), &aName, &nodename);
-		}
-	
-	HBufC8 *buf = HBufC8::NewLC( nodename.Length() ) ;
-	buf->Des().Copy( nodename );
-	return buf;
-	}
-	
-TInt Cdmatest::FetchNodeL( CStifItemParser& aItem )	
-	{
-
-    TInt ret( KErrNone );
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("Cdmatest"), _L("FetchNodeL") );
-
-	iResultsFunction = FetchNodeResultsL;
-	
-    TPtrC8 nodename( GetNextStringLC( aItem, _L(" nodename" ) )->Des() ) ;
-		
-	SetURIL(nodename) ;//
-	HBufC8 *luid = GetLuidAllocLC( *iURI );
-
-	Adapter()->ChildURIListL( *iURI, *luid, *iEmptyMappingInfoArray, 4, 5) ;
-
-	if ( iStatus == MSmlDmAdapter::EOk )
-		{
-		}
-	else
-		{
-		iLog->Log( _L("FetchNodeL: ChildUriList Error ! %d" ), iStatus );	
-		ret = KErrGeneral ;
-		}
-	CleanupStack::PopAndDestroy( luid ) ; 
-	CleanupStack::PopAndDestroy() ; // nodename
-	iLog->Log( _L("FetchNodeL: Test Complete with status %d" ), ret );	
-
-    return ret;
-	}
-	
-TInt Cdmatest::StartAtomicL( CStifItemParser& /*aItem*/ )	
-	{
-	TRAPD( err, Adapter()->StartAtomicL() ) ;
-	iLog->Log( _L("StartAtomicL: Atomic started resulting error %d" ), err );	
-    return err;
-	}
-
-TInt Cdmatest::RollbackAtomicL( CStifItemParser& /*aItem*/ )	
-	{
-	TRAPD( err, Adapter()->RollbackAtomicL() ) ;
-	iLog->Log( _L("RollbackAtomicL: Atomic rolled back resulting error %d" ), err );	
-    return err;
-	}
-	
-TInt Cdmatest::CommitAtomicL( CStifItemParser& /*aItem*/ )	
-	{
-	TRAPD( err, Adapter()->CommitAtomicL() ) ;
-	iLog->Log( _L("RollbackAtomicL: Atomic commited resulting error %d" ), err );	
-    return err;
-	}
-	
-
-TInt Cdmatest::DDFStructureL( CStifItemParser& /*aItem*/ )	
-	{
-	CTestDmDDFObject* ddfRoot = CTestDmDDFObject::NewLC( iLog ); //, aNodeName );
-
-	TRAPD( err, iAdapter->DDFStructureL( *ddfRoot ) ) ;
-	CleanupStack::PopAndDestroy( ddfRoot );
-	iLog->Log( _L("DDFStructureL: method called resulting error %d" ), err );	
-    return err;
-	}
-		
-		
-TInt Cdmatest::AddNodeL( CStifItemParser& aItem )	
-	{
-
-    TInt ret( KErrNone );
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("Cdmatest"), _L("AddNodeL") );
-
-    
-    TPtrC8 nodename( GetNextStringLC ( aItem, _L("nodename" ) )->Des() ) ;
-    SetURIL( nodename );
-
-	Adapter()->AddNodeObjectL( *iURI, KEmptyType, 8 ) ;
-	
-	if ( iStatus == MSmlDmAdapter::EOk )
-		{
-		iLog->Log( _L("AddNodeL: AddNodeObjectL Successful! %d" ), iStatus );	
-		}
-	else
-		{
-		iLog->Log( _L("AddNodeL: AddNodeObjectL Error ! %d" ), iStatus );	
-		ret = KErrGeneral ;
-		}
-		
-	CleanupStack::PopAndDestroy() ; // nodename
-	iLog->Log( _L("AddNodeL Test Complete with status %d" ), ret );	
-
-    return ret;
-	}	
-		
-TInt Cdmatest::UpdateLeafL( CStifItemParser& aItem )	
-	{
-
-    TInt ret( KErrNone );
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("Cdmatest"), _L("UpdateLeafL") );
-
-    TPtrC8 nodename( GetNextStringLC ( aItem, _L("Node name") )->Des() ) ;
-    TPtrC8 data (GetNextStringLC( aItem, _L("datafile"))->Des() );
-    
-	HBufC8 *mime = GetNextStringLC( aItem, _L("mime") ) ;
-    SetURIL( nodename );
-    
-    TPtrC8 parentURI(RemoveLastSeg(nodename));
-    HBufC8 *luid = GetLuidAllocLC( parentURI );
-    
-    TDataType type; 
-
-	TPtrC8 mimePtr( *mime == KNullDesC8 ? type.Des8() : mime->Des() );
-
-    /**
-    virtual void UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID,
-									const TDesC8& aObject, const TDesC8& aType,
-									TInt aStatusRef ) = 0;
-    */
-    
-	Adapter()->UpdateLeafObjectL( *iURI , *luid, data, mimePtr, 3);
-
-	if ( iStatus == MSmlDmAdapter::EOk )
-	{
-		iLog->Log( _L("UpdateLeafL: UpdateLeafObjectL Successful! %d" ), iStatus );	
-	}
-	else
-	{
-		iLog->Log( _L("UpdateLeafL UpdateLeafObjectL Error ! %d" ), iStatus );	
-		ret = KErrGeneral ;
-	}
-
-	CleanupStack::PopAndDestroy(); // loadfile
-	CleanupStack::PopAndDestroy(); // luid
-	CleanupStack::PopAndDestroy(); // mime
-	CleanupStack::PopAndDestroy(); // nodename
-
-	iLog->Log( _L("UpdateLeafL Test Complete with status %d" ), ret );	
-
-    return ret;
-	}	
-	
-
-TInt Cdmatest::UpdateLeafDataURLL( CStifItemParser& aItem )	
-	{
-
-    TInt ret( KErrNone );
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("Cdmatest"), _L("UpdateLeafDataL") );
-
-    TPtrC8 nodename( GetNextStringLC ( aItem, _L("Node name") )->Des() ) ;
-    TPtrC8 http (GetNextStringLC( aItem, _L("http"))->Des() );
-    TPtrC8 url (GetNextStringLC( aItem, _L("rest of url"))->Des() );
-	HBufC8 *mime = GetNextStringLC( aItem, _L("mime") ) ;
-    SetURIL( nodename );
-    
-    _LIT8( KTag, "://" );
-    
-    HBufC8 *fullurl = HBufC8::NewLC( http.Length() + KTag().Length() + url.Length() );
-    TPtr8 pfullurl( fullurl->Des() );
-    pfullurl.Copy( http ) ;
-    pfullurl.Append( KTag );
-    pfullurl.Append( url );
-    TPtrC8 mimePtr( *mime == KNullDesC8 ? KDefaultType() : mime->Des() );
-    
-    HBufC8 *luid = GetLuidAllocLC( *iURI );
-    /**
-    virtual void UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID,
-									const TDesC8& aObject, const TDesC8& aType,
-									TInt aStatusRef ) = 0;
-    */
-	Adapter()->UpdateLeafObjectL( *iURI , *luid, pfullurl, mimePtr, 3);
-	if ( iStatus == MSmlDmAdapter::EOk )
-		{
-		iLog->Log( _L("UpdateLeafDataL: UpdateLeafObjectL Successful! %d" ), iStatus );	
-		}
-	else
-		{
-		iLog->Log( _L("UpdateLeafDataL UpdateLeafObjectL Error ! %d" ), iStatus );	
-		ret = KErrGeneral ;
-		}
-	CleanupStack::PopAndDestroy( luid ); // 
-	CleanupStack::PopAndDestroy( mime ); // mime
-	CleanupStack::PopAndDestroy(); // url
-	CleanupStack::PopAndDestroy(); // http
-	CleanupStack::PopAndDestroy(); // nodename
-	iLog->Log( _L("UpdateLeafDataL Test Complete with status %d" ), ret );	
-
-    return ret;
-	}
-    
-TInt Cdmatest::UpdateLeafDataL( CStifItemParser& aItem )	
-	{
-
-    TInt ret( KErrNone );
-    // Print to UI
-   TestModuleIf().Printf( 0, _L("Camtest"), _L("UpdateLeafDataL") );
-
-    TPtrC8 nodename( GetNextStringLC ( aItem, _L("Node name") )->Des() ) ;
-    TPtrC8 data (GetNextStringLC( aItem, _L("data"))->Des() );
-	HBufC8 *mime = GetNextStringLC( aItem, _L("mime") ) ;
-	
-    SetURIL( nodename );
-    
-        
-    TPtrC8 mimePtr( *mime == KNullDesC8 ? KDefaultType() : mime->Des() );
-    
-    TPtrC8 parentURI(RemoveLastSeg(nodename));
-    HBufC8 *luid = GetLuidAllocLC( parentURI );
-     
-//    
-//    virtual void UpdateLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID,
-//									const TDesC8& aObject, const TDesC8& aType,
-//									TInt aStatusRef ) = 0;
-//   
-	Adapter()->UpdateLeafObjectL( *iURI , *luid, data, mimePtr, 3);
-	if ( iStatus == MSmlDmAdapter::EOk )
-		{
-		iLog->Log( _L("UpdateLeafDataL: UpdateLeafObjectL Successful! %d" ), iStatus );	
-		}
-	else
-		{
-		iLog->Log( _L("UpdateLeafDataL UpdateLeafObjectL Error ! %d" ), iStatus );	
-		ret = KErrGeneral ;
-		}
-	
-	CleanupStack::PopAndDestroy(); // mime
-	CleanupStack::PopAndDestroy(); // luid
-	CleanupStack::PopAndDestroy(); // data
-	CleanupStack::PopAndDestroy(); // nodename
-	iLog->Log( _L("UpdateLeafDataL Test Complete with status %d" ), ret );	
-
-    return ret;
-	}	
-			
-TInt Cdmatest::FetchLeafL( CStifItemParser& aItem )	
-	{
-
-    TInt ret( KErrNone );
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("Camtest"), _L("FetchLeafL") );
-
-	iResultsFunction = NULL;
-	
-    TInt i( 0 );
-    TPtrC8 nodename ( GetNextStringLC( aItem, _L( "nodename" ) )->Des() ) ;
-    
-    //TPtrC datafile;
-    TPtrC datafile( KNullDesC );
-    i = aItem.GetNextString ( datafile ) ;
-    if ( i != KErrNone ) 
-	    {
-	    iLog->Log(_L("FetchLeafL: ERROR Reading outfile argument: 0x%X"), i );
-	    //return i;
-	    }
-	else
-		{
-		iSaveFileName = datafile;
-		iLog->Log( _L( " Save file nameis '%S'" ), &iSaveFileName );
-		iResultsFunction = SaveDataL;
-		}
-    
-	SetURIL(nodename) ;
-		
-		/*
-			void FetchLeafObjectL( const TDesC8& aURI, const TDesC8& aLUID,
-								   const TDesC8& aType, TInt aResultsRef,
-								   TInt aStatusRef );
-		*/
-    TPtrC8 parentURI(RemoveLastSeg(nodename));
-    HBufC8 *luid = GetLuidAllocLC( parentURI );
-
-	Adapter()->FetchLeafObjectL( *iURI, *luid, KEmptyType, 7, 8 ) ;
-	if ( iStatus == MSmlDmAdapter::EOk )
-		{
-		iLog->Log( _L("FetchLeafL: FetchLeafObjectL Successful! %d" ), iStatus );	
-		}
-	else
-		{
-		iLog->Log( _L("FetchLeafL: FetchLeafObjectL Error ! %d" ), iStatus );	
-		ret = KErrGeneral ;
-		}
-	CleanupStack::PopAndDestroy( luid );
-	CleanupStack::PopAndDestroy(  ); // nodename
-	iLog->Log( _L("FetchLeafL Test Complete with status %d" ), ret );	
-    return ret;
-	}	
-
-
-TInt Cdmatest::ExecuteLeafL( CStifItemParser& aItem )		
-	{
-	TInt ret( KErrNone );
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("Camtest"), _L("ExecuteLeafL") );
-
-	iResultsFunction = NULL;
-	
-    TPtrC8 nodename( GetNextStringLC ( aItem, _L("Nodename") )->Des() ) ;
-    TPtrC8 data( GetNextStringLC ( aItem, _L("Input file") )->Des() ) ;
-	
-	SetURIL(nodename) ;
-
-		/*
-			virtual void ExecuteCommandL( const TDesC8& aURI, const TDesC8& aLUID,
-							      const TDesC8& aArgument, const TDesC8& aType,
-								  TInt aStatusRef ) = 0;
-		*/
-	TDataType type;
-	
-    TPtrC8 parentURI(RemoveLastSeg(nodename));
-    HBufC8 *luid = GetLuidAllocLC( parentURI );
-
-	Adapter()->ExecuteCommandL( *iURI, *luid, data, KEmptyType, 11 ) ;
-	if ( iStatus == MSmlDmAdapter::EOk )
-		{
-		iLog->Log( _L("ExecuteLeafL: ExecuteCommandL Successful! %d" ), iStatus );	
-		}
-	else
-		{
-		iLog->Log( _L("ExecuteLeafL: ExecuteCommandL FetchLeafObjectL Error ! %d" ), iStatus );	
-		ret = KErrGeneral ;
-		}
-	CleanupStack::PopAndDestroy( luid ); // luid
-	CleanupStack::PopAndDestroy(); // data
-	CleanupStack::PopAndDestroy(); // nodename
-	
-	iLog->Log( _L("ExecuteLeafL: Test Complete with status %d" ), ret );	
-
-    return ret;
-	}
-	
-TInt Cdmatest::CompleteCommandsL( CStifItemParser& /*aItem*/ )
-	{
-	TRAPD( err, Adapter()->CompleteOutstandingCmdsL() );
-	delete iAdapter;
-	iAdapter = NULL;
-	return err;
-	}
-TInt Cdmatest::DeleteObjectL( CStifItemParser& aItem )
-{
-	TInt ret( KErrNone );
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("Camtest"), _L("DeleteObjectL") );
-
-    TPtrC8 nodename( GetNextStringLC ( aItem, _L("Nodename") )->Des() ) ;
-
-	SetURIL(nodename) ;
-
-	HBufC8 *luid = GetLuidAllocLC( *iURI );
-	Adapter()->DeleteObjectL( *iURI, *luid, 11 ) ;
-	if ( iStatus == MSmlDmAdapter::EOk )
-		{
-		iLog->Log( _L("DeleteNode: DeleteObjectL Successful! %d" ), iStatus );	
-		}
-	else
-		{
-		iLog->Log( _L("DeleteNode: DeleteObjectL FetchLeafObjectL Error ! %d" ), iStatus );	
-		ret = KErrGeneral ;
-		}
-	CleanupStack::PopAndDestroy( luid ); // luid
-	CleanupStack::PopAndDestroy(); // nodename	
-	iLog->Log( _L("ExecuteLeafDataL Test Complete with status %d" ), ret );	
-
-    return ret;	
-}
-	
-TInt Cdmatest::ExecuteLeafDataL( CStifItemParser& aItem )		
-	{
-	TInt ret( KErrNone );
-
-    // Print to UI
-    TestModuleIf().Printf( 0, _L("Camtest"), _L("ExecuteLeafL") );
-
-	iResultsFunction = NULL;
-	
-    TPtrC8 nodename( GetNextStringLC ( aItem, _L("Nodename") )->Des() ) ;
-    TPtrC8 data( GetNextStringLC ( aItem, _L("Input data") )->Des() ) ;
-    
-	SetURIL(nodename) ;
-
-		/*
-			virtual void ExecuteCommandL( const TDesC8& aURI, const TDesC8& aLUID,
-							      const TDesC8& aArgument, const TDesC8& aType,
-								  TInt aStatusRef ) = 0;
-		*/
-	HBufC8 *luid = GetLuidAllocLC( *iURI );
-	Adapter()->ExecuteCommandL( *iURI, *luid, data, KEmptyType, 11 ) ;
-	if ( iStatus == MSmlDmAdapter::EOk )
-		{
-		iLog->Log( _L("ExecuteLeafDataL: ExecuteCommandL Successful! %d" ), iStatus );	
-		}
-	else
-		{
-		iLog->Log( _L("ExecuteLeafDataL: ExecuteCommandL FetchLeafObjectL Error ! %d" ), iStatus );	
-		ret = KErrGeneral ;
-		}
-	CleanupStack::PopAndDestroy(); // luid
-	CleanupStack::PopAndDestroy(); // data		
-	CleanupStack::PopAndDestroy(); // nodename	
-	iLog->Log( _L("ExecuteLeafDataL Test Complete with status %d" ), ret );	
-
-    return ret;
-	}
-
-
-HBufC8 *Cdmatest::LoadFileLC( const TDesC &aFileName, TDataType &aType )	
-	{
-	RFs fs ;
-	LEAVE_IF_ERROR( fs.Connect(), _L( "Could not connect fileserver: %d"  ) );
-	
-	CleanupClosePushL( fs );
-	RFile file ;
-	LEAVE_IF_ERROR( file.Open(fs,aFileName,EFileRead), _L( "Could not open file: %d" ) );
-	
-	
-	
-	CleanupClosePushL( file );
-	TInt dataSize ;
-	LEAVE_IF_ERROR( file.Size( dataSize ), _L( "Could not get file size: %d" ) );
-	HBufC8 *nodedata = HBufC8::NewL ( dataSize );
-	CleanupStack::PushL( nodedata );
-	TPtr8 nodedataptr( nodedata->Des() );
-	LEAVE_IF_ERROR( file.Read( nodedataptr ), _L( "Could not read file: %d" ) );
-	TDataRecognitionResult aDataType;
-	RApaLsSession ls ;
-	TInt err( ls.Connect() );
-	if ( err == KErrNone )
-		{
-		CleanupClosePushL( ls );
-		err = ls.RecognizeData(aFileName, nodedataptr, aDataType)  ;
-		if ( err == KErrNone )
-			{
-			aType = aDataType.iDataType;
-			}
-		else
-			{
-			iLog->Log( _L("LoadFileLC: WARNING Failed to get type: %d" ), err );
-			aType = TDataType( KDefaultType );
-			}	
-		CleanupStack::PopAndDestroy( &ls ); 
-		}
-	else
-		{
-		iLog->Log( _L("LoadFileLC: WARNING Failed to connect rapalssession: %d" ), err );
-		}	
-	CleanupStack::Pop( nodedata );
-	CleanupStack::PopAndDestroy( &file ); 
-	CleanupStack::PopAndDestroy( &fs ); 
-	CleanupStack::PushL( nodedata );
-	return nodedata ;
-	}
-
-HBufC8 *Cdmatest::LoadFileLC( const TDesC8 &aFileName, TDataType &aType )	
-	{
-	TFileName fn ;
-	fn.Copy( aFileName );
-	return LoadFileLC( fn, aType );
-	}
-	
-
-void Cdmatest::SaveDataL( TInt /*aResultsRef*/, CBufBase& aObject,
-							  const TDesC8& aType ) 
-	{
-	iLog->Log( _L8( "Saving data of type: '%S'" ), &aType );
-	RFs fs;
-	User::LeaveIfError( fs.Connect() );
-	CleanupClosePushL( fs );
-	RFile file;
-	User::LeaveIfError( file.Replace ( fs, iSaveFileName, EFileWrite ) );
-	CleanupClosePushL( file );
-	TPtrC8 p( aObject.Ptr( 0 ) );
-	User::LeaveIfError( file.Write( p ) );
-	CleanupStack::PopAndDestroy( 2 ); // file, fs
-	}
-							  
-		
-	
-void Cdmatest::FetchNodeResultsL( TInt /*aResultsRef*/, CBufBase& aObject,
-							  const TDesC8& /*aType*/ )
-	{
-	TPtrC8 ptr( aObject.Ptr( 0 ) );	
-	iLog->Log( _L8("FetchNodeResultsL for '%S': '%S'" ), iURI, &ptr );
-	
-	if ( ptr.Length() > 0 )
-		{
-		TPtrC8 last( LastURISeg( ptr ) );
-		HBufC8 *oldUri = HBufC8::NewL( iURI->Length() );
-		(*oldUri) = *iURI; 
-		do 
-			{
-			iLog->Log ( _L8( " Node: '%S' "), &last );
-			HBufC8 *nUri = HBufC8::NewLC( oldUri->Length() + 1 + last.Length() );
-			nUri->Des().Copy( *oldUri ) ;
-			nUri->Des().Append( '/' );
-			nUri->Des().Append( last );
-			
-			SetURIL( nUri );
-			//iResultsFunction = FetchNodeResultsL;
-			
-		    //TPtrC8 parentURI(RemoveLastSeg(*nUri));
-		    //HBufC8 *luid = GetLuidAllocLC( parentURI );
-		    CleanupStack::Pop( nUri );
-			
-			HBufC8 *luid = GetLuidAllocLC( *iURI );
-			
-			Adapter()->ChildURIListL( *nUri, KNullDesC8, *iEmptyMappingInfoArray, 4, 5 );//Dipak
-			
-			CleanupStack::PopAndDestroy( luid ); 			
-			
-			ptr.Set( RemoveLastURISeg( ptr ) );
-			last.Set( LastURISeg( ptr ) );
-			
-			}
-		while (last != KNullDesC8);	
-		}
-	
-	}
-	
-
-	
-TPtrC8 Cdmatest::LastURISeg( const TDesC8& aURI )
-	{
-	TInt i;
-	for( i = aURI.Length() - 1; i >= 0; i-- ) 
-		{
-		if( aURI[i] == '/' )
-			{
-			break;
-			}
-		}
-
-	if( i == 0 )
-		{
-		return aURI;
-		}
-	else
-		{
-		return aURI.Mid( i+1 );
-		}
-	}
-TPtrC8 Cdmatest::RemoveLastSeg(const TDesC8& aURI)
-	{
-	TInt i;
-	for(i=aURI.Length()-1;i>=0;i--)
-		{
-		if(aURI[i]==KNSmlDMUriSeparator)
-			{
-			break;
-			}
-		}
-
-	if(i>0)
-		{
-		return aURI.Left(i);
-		}
-	else
-		{
-		return KNullDesC8();
-		}
-	}
-
-// ------------------------------------------------------------------------------------------------
-// TPtrC8 Cdmatest::RemoveLastURISeg(const TDesC8& aURI)
-// returns parent uri, i.e. removes last uri segment
-// ------------------------------------------------------------------------------------------------
-TPtrC8 Cdmatest::RemoveLastURISeg( const TDesC8& aURI )
-	{
-	TInt i;
-	for ( i = aURI.Length() - 1; i >= 0 ; i-- )
-		{
-		if( aURI[i] == '/' )
-			{
-			break;
-			}
-		}
-	if ( i > -1 )
-		{
-		return aURI.Left( i );	
-		}
-	else
-		{
-		return KNullDesC8();
-		}
-	}	
-	
-TPtrC Cdmatest::RemoveLastURISeg( const TDesC& aURI )
-	{
-	TInt i;
-	for ( i = aURI.Length() - 1; i >= 0 ; i-- )
-		{
-		if( aURI[i] == '/' )
-			{
-			break;
-			}
-		}
-	if ( i > -1 )
-		{
-		return aURI.Left( i );	
-		}
-	else
-
-		{
-		return KNullDesC();
-		}
-	}		
-	
-void Cdmatest::SetURIL( const TDesC& aURI )
-	{
-	if ( iURI != NULL )
-		{
-		delete iURI ;
-		iURI = NULL;
-		}
-	iURI = HBufC8::NewL( aURI.Length() ) ;
-	iURI->Des().Copy( aURI );
-	}
-	
-void Cdmatest::SetURIL( const TDesC8& aURI )
-	{
-	if ( iURI != NULL )
-		{
-		delete iURI ;
-		iURI = NULL;
-		}
-	iURI = HBufC8::NewL( aURI.Length() ) ;
-	iURI->Des().Copy( aURI );
-	}	
-
-void Cdmatest::SetURIL( HBufC8* aURI )
-	{
-	if ( iURI != NULL )
-		{
-		delete iURI ;
-		iURI = NULL;
-		}
-	iURI = aURI ;
-	}
-		
-		
-		
-void Cdmatest::SetResultsL( 
-	TInt aResultsRef, 
-	CBufBase& aObject,
-	const TDesC8& aType )
-	{
-	TPtrC8 ptr( aObject.Ptr(0) );
-	iLog->Log( _L8( "SetResults, ref=%d, object='%S', type='%S'" ), aResultsRef, &ptr, &aType );
-	if ( iResultsFunction )
-		{
-		(this->*iResultsFunction)( aResultsRef, aObject, aType );
-		iResultsFunction = NULL ;
-		}
-	
-	}
-
-
-void Cdmatest::SetStatusL( TInt aStatusRef,
-							 MSmlDmAdapter::TError aErrorCode ) 
-	{
-	iStatus = aErrorCode ;
-	iLog->Log( _L( "SetStatusL, ref=%d, code=%d" ), aStatusRef, aErrorCode );
-	
-	
-	}
-	
-void Cdmatest::SetMappingL( const TDesC8& aURI, const TDesC8& aLUID ) 
-	{
-	iLog->Log( _L8( "SetMappingL, aURI='%s', aLUID='%s'" ), aURI.Ptr(), aLUID.Ptr() );	
-	
-	iMappingTable.Append(TMapping( aURI, aLUID ) )	;
-	}
-	
-HBufC8* Cdmatest::GetLuidAllocL( const TDesC8& aURI ) 
-	{
-	iLog->Log( _L8( "GetLuidAllocL, aURI='%S'" ), &aURI );		
-	HBufC8 *res = NULL;		
-	for( TInt i(0); i < iMappingTable.Count(); i++ )	
-		{
-		if ( aURI == iMappingTable[i].iURI )
-			{
-			res = iMappingTable[i].iLuid.AllocL();
-			}
-		}
-	if ( res == NULL )
-		{
-		res = HBufC8::NewL( 0 );
-		}
-	iLog->Log( _L8( "GetLuidAllocL, response='%S'" ), res );
-	return res;
-	}	    
-    
-HBufC8* Cdmatest::GetLuidAllocLC( const TDesC8& aURI ) 
-	{
-	iLog->Log( _L8( "GetLuidAllocL, aURI='%S'" ), &aURI );
-	HBufC8 *res = NULL;		
-	for( TInt i(0); i < iMappingTable.Count(); i++ )	
-		{
-		if ( aURI == iMappingTable[i].iURI )
-			{
-			res = iMappingTable[i].iLuid.AllocLC();
-			break;
-			}
-		}
-	if ( res == NULL )
-		{
-		res = HBufC8::NewLC( 0 );
-		}
-	iLog->Log( _L8( "GetLuidAllocLC, response='%S'" ), res );
-	return res ;
-	}	
-    	
-#ifdef __TARM_SYMBIAN_CONVERGENCY
-    
-void Cdmatest::GetMappingInfoListL( const TDesC8& /*aURI*/,
-								CArrayFix<TSmlDmMappingInfo>& /*aSegmentList*/ )
-	{
-	// do nothing
-	}								
-
-#else
-// nothing
-#endif
-//***************************************************************************
-//  End of File
--- a/omadm/omadmextensions/adapters/syncmlds/tsrc/src/syncmldstest.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,117 +0,0 @@
-/*
-* Copyright (c) 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:  Implementation of DM adapter test component
-* 	This is part of omadmextensions/adapter test application.
-*
-*/
-
-
-
-
-
-
-// INCLUDE FILES
-#include <Stiftestinterface.h>
-#include "syncmldsTest.h"
-#include <stiflogger.h>
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CsyncmldsTest::CsyncmldsTest
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-/*CsyncmldsTest::CsyncmldsTest( 
-    CTestModuleIf& aTestModuleIf ):
-        CScriptBase( aTestModuleIf )
-    {
-    }*/
-CsyncmldsTest::CsyncmldsTest( CTestModuleIf& aTestModuleIf )
-		: Cdmatest( aTestModuleIf, KAdapterUid )
-    {
-    }
-// -----------------------------------------------------------------------------
-// CsyncmldsTest::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CsyncmldsTest::ConstructL()
-    {
-/*    iLog = CStifLogger::NewL( KamtestLogPath, 
-                          KamtestLogFile,
-                          CStifLogger::ETxt,
-                          CStifLogger::EFile,
-                          EFalse );*///Commented the Part for syncmldsTest Dipak
-    iLog = CStifLogger::NewL( KamtestLogPath, 
-                          KamtestLogFile,
-                          CStifLogger::ETxt,
-                          CStifLogger::EFile );
-                          
-    iLog->Log( _L( "Loading Adapter" ) );
-    
-	Cdmatest::ConstructL();                         	
-
-    }
-
-// -----------------------------------------------------------------------------
-// CsyncmldsTest::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CsyncmldsTest* CsyncmldsTest::NewL( 
-    CTestModuleIf& aTestModuleIf )
-    {
-    CsyncmldsTest* self = new (ELeave) CsyncmldsTest( aTestModuleIf );
-    
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop();
-
-    return self;
-    
-    }
-    
-// Destructor
-CsyncmldsTest::~CsyncmldsTest()
-    { 
-    
-    // Delete resources allocated from test methods
-//    Delete();
-    
-    // Delete logger
-//    delete iLog;  
-    
-    }
-
-// ========================== OTHER EXPORTED FUNCTIONS =========================
-
-// -----------------------------------------------------------------------------
-// LibEntryL is a polymorphic Dll entry point.
-// Returns: CScriptBase: New CScriptBase derived object
-// -----------------------------------------------------------------------------
-//
-EXPORT_C CScriptBase* LibEntryL( 
-    CTestModuleIf& aTestModuleIf ) // Backpointer to STIF Test Framework
-    {
-    
-    return ( CScriptBase* ) CsyncmldsTest::NewL( aTestModuleIf );
-        
-    }
-
-
-    
-//  End of File
--- a/omadm/omadmextensions/adapters/syncmlds/tsrc/src/syncmldstestBlocks.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,108 +0,0 @@
-/*
-* Copyright (c) 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:  Implementation of DM adapter test component
-* 	This is part of omadmextensions/adapter test application.
-*
-*/
-
-
-
-
-
-
-// INCLUDE FILES
-#include <e32svr.h>
-#include <StifParser.h>
-#include <Stiftestinterface.h>
-#include "syncmldsTest.h"
-#include <e32math.h>
-#include <f32file.h>
-#include <swinstapi.h>
-
-
-//using namespace NApplicationManagement;//Dipak
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CsyncmldsTest::Delete
-// Delete here all resources allocated and opened from test methods. 
-// Called from destructor. 
-// -----------------------------------------------------------------------------
-//
-void CsyncmldsTest::Delete() 
-    {
-    
-    }
-    
-// -----------------------------------------------------------------------------
-// CsyncmldsTest::RunMethodL
-// Run specified method. Contains also table of test mothods and their names.
-// -----------------------------------------------------------------------------
-//
-TInt CsyncmldsTest::RunMethodL( 
-    CStifItemParser& aItem ) 
-    {
-   
-    TStifFunctionInfo const KFunctions[] =
-        {  
-        // Copy this line for every implemented function.
-        // First string is the function name used in TestScripter script file.
-        // Second is the actual implementation member function. 
-        ENTRY( "DDFStructure", CsyncmldsTest::DDFStructureL),
-        ENTRY( "FetchNode", CsyncmldsTest::FetchNodeL ),
-        ENTRY( "FetchLeaf", CsyncmldsTest::FetchLeafL ),
-        ENTRY( "AddNode", CsyncmldsTest::AddNodeL ),
-        ENTRY( "UpdateLeaf", CsyncmldsTest::UpdateLeafL ),
-        ENTRY( "UpdateLeafData", CsyncmldsTest::UpdateLeafDataL ),
-        ENTRY( "Execute", CsyncmldsTest::ExecuteLeafL ),
-        ENTRY( "ExecuteData", CsyncmldsTest::ExecuteLeafDataL ),
-        ENTRY( "DeleteNode", CsyncmldsTest::DeleteObjectL ),
-        ENTRY( "StartAtomic", CsyncmldsTest::StartAtomicL),
-	    ENTRY( "CommitAtomic", CsyncmldsTest::CommitAtomicL),
-	    ENTRY( "RollbackAtomic", CsyncmldsTest::RollbackAtomicL),
-	    ENTRY( "CompleteCommands", CsyncmldsTest::CompleteCommandsL),
-        };
-
-    const TInt count = sizeof( KFunctions ) / 
-                        sizeof( TStifFunctionInfo );
-
-    return RunInternalL( KFunctions, count, aItem );
-
-    }    
-
-        
-        
-HBufC8 *CsyncmldsTest::GetNextStringLC ( CStifItemParser& aItem, const TDesC &aName )
-	{
-	TPtrC nodename;
-	nodename.Set( KNullDesC );
-
-    TInt i( aItem.GetNextString ( nodename ) );
-    if ( i != KErrNone ) 
-	    {
-	    iLog->Log( _L( "ERROR Reading '%S' argument: 0x%X" ), &aName, i );
-	    }
-	else
-		{
-		iLog->Log( _L("%S: %S"), &aName, &nodename);
-		}
-	
-	HBufC8 *buf = HBufC8::NewLC( nodename.Length() ) ;
-	buf->Des().Copy( nodename );
-	
-	return buf;
-	}
-
-//  End of File
--- a/omadm/omadmextensions/adapters/wlanctrldcmoadapter/data/wlanctrldcmoadapter.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +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 "Eclipse Public License v1.0"
- * which accompanies 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 "registryinfo.rh"
-
-// Declares info for two implementations
-RESOURCE REGISTRY_INFO theInfo
-	{
-	// UID for the DLL
-	dll_uid = 0x20022FB5;
-	// Declare array of interface info
-	interfaces = 
-		{
-		INTERFACE_INFO
-			{
-			// UID of interface that is implemented
-			interface_uid = 0x2001FD40;
-			implementations = 
-				{
-				// Info for WlanCtrlDCMOAdapter
-				IMPLEMENTATION_INFO
-					{
-					implementation_uid = 0x20022FB4;
-					version_no = 1;
-					display_name = "WlanCtrlDCMOAdapter";
-					default_data = "text/wml||Allow/Disallow Wifi.";
-					opaque_data = "WLAN";
-					}
-				};
-			}
-		};
-	}
-
--- a/omadm/omadmextensions/adapters/wlanctrldcmoadapter/group/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +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 "Eclipse Public License v1.0"
- * which accompanies 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 <platform_paths.hrh>
-
-PRJ_PLATFORMS
-
-DEFAULT
-
-PRJ_EXPORTS
-
-
-PRJ_MMPFILES
-wlanctrldcmoadapter.mmp
-
-
--- a/omadm/omadmextensions/adapters/wlanctrldcmoadapter/group/wlanctrldcmoadapter.mmp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +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 "Eclipse Public License v1.0"
- * which accompanies 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 <platform_paths.hrh>
-
-//CAPABILITY  	CAP_ECOM_PLUGIN
-CAPABILITY  	CAP_GENERAL_DLL
-TARGET 			wlanctrldcmoadapter.dll
-TARGETTYPE 		PLUGIN
-UID 			0x10009D8D 0x20022FB5
-VENDORID 		VID_DEFAULT
-
-MW_LAYER_SYSTEMINCLUDE
-SYSTEMINCLUDE 	/epoc32/include/ecom 
-
-USERINCLUDE 	../inc 
-
-SOURCEPATH	../data
-START RESOURCE wlanctrldcmoadapter.rss
-TARGET wlanctrldcmoadapter.rsc
-END
-
-LIBRARY 		euser.lib ECom.lib featmgr.lib
-LIBRARY			efsrv.lib commonengine.lib
-
-SOURCEPATH ../src
-SOURCE wlanctrldcmoadapterproxy.cpp wlanctrldcmoadapter.cpp
--- a/omadm/omadmextensions/adapters/wlanctrldcmoadapter/inc/wlanctrldcmoadapter.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +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 "Eclipse Public License v1.0"
- * which accompanies 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 _WlanCtrlDCMOAdapter__
-#define _WlanCtrlDCMOAdapter__
-
-#include "dcmointerface.h"
-#include "dcmoconst.h"
-
-// An implementation of the CDCMOInterface definition
-class CWLanCtrlDCMOAdapter : public CDCMOInterface
-	{
-public:
-	// Standardised safe construction which leaves nothing the cleanup stack.
-	static CWLanCtrlDCMOAdapter* NewL(TAny* aInitParams);
-
-	// Destructor	
-	~CWLanCtrlDCMOAdapter();
-
-	// Implementation of CDCMOInterface
-    virtual TDCMOStatus  GetDCMOPluginIntAttributeValueL( TDCMONode aId, TInt& aValue); 
-    virtual TDCMOStatus  GetDCMOPluginStrAttributeValueL( TDCMONode aId, TDes& aStrValue);
-    virtual TDCMOStatus  SetDCMOPluginIntAttributeValueL( TDCMONode aId, TInt aValue);
-    virtual TDCMOStatus  SetDCMOPluginStrAttributeValueL( TDCMONode aId, const TDes& aStrValue);
-    virtual void GetLocalizedNameL( HBufC*& aLocName );
-	
-private:
-	// Construction
-	CWLanCtrlDCMOAdapter(TAny* aInitParams);
-	void ConstructL();
-	TDCMOStatus MapFeatureControlError( TInt aErrorCode );
-
-private:
-	// Data to pass back from implementation to client
-	HBufC* iProperty;
-	HBufC* iDescription;
-	// Parameters taken from client
-	CDCMOInterface::TDCMOInterfaceInitParams* iInitParams;
-	
-	
-	};  
-
-#endif
--- a/omadm/omadmextensions/adapters/wlanctrldcmoadapter/rom/wlanctrldcmoadapter.iby	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +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 "Eclipse Public License v1.0"
-* which accompanies 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 <bldvariant.hrh>
-
-#ifndef __WLANCTRLDCMOADAPTER_IBY__
-#define __WLANCTRLDCMOADAPTER_IBY__
-
-#ifdef __SYNCML_DM // nothing should be installed from this .iby file if __SYNCML_DM feature is not selected
-
-ECOM_PLUGIN(wlanctrldcmoadapter.dll,wlanctrldcmoadapter.rsc)
-
-#endif // __SYNCML_DM 
-
-#endif //__WLANCTRLDCMOADAPTER_IBY__
\ No newline at end of file
--- a/omadm/omadmextensions/adapters/wlanctrldcmoadapter/src/wlanctrldcmoadapter.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,208 +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 "Eclipse Public License v1.0"
- * which accompanies 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 <featurecontrol.h>
-#include <featmgr.h>
-#include <stringresourcereader.h>
-#include <data_caging_path_literals.hrh> 
-#include <bautils.h>
-
-#include <dcmo.rsg>
-
-#include "wlanctrldcmoadapter.h"
-
-_LIT( KWlanCtrlProperty, "WLAN" );
-_LIT( KDisableWlanDescription, "Used to enable/disable the WLAN connectivity." ); // Description
-_LIT( KRuntimeResourceFileName, "z:dcmo.rsc" );
-
-TDCMOStatus CWLanCtrlDCMOAdapter::MapFeatureControlError( TInt aErrorCode )
-    {
-    TDCMOStatus status( EDcmoFail );
-    
-    switch ( aErrorCode )
-        {
-        case KErrNone:
-            status = EDcmoSuccess;
-            break;
-        case KErrPermissionDenied:
-        case KErrAccessDenied:
-            status = EDcmoAccessDenied;
-            break;
-        case KErrNotFound:
-            status = EDcmoNotFound;
-            break;
-        default:
-            break;
-        }
-    return status;
-    }
-
-// Construction and destruction functions
-
-CWLanCtrlDCMOAdapter* CWLanCtrlDCMOAdapter::NewL( TAny* aParams )
-	{
-	CWLanCtrlDCMOAdapter* self = new ( ELeave ) CWLanCtrlDCMOAdapter( aParams );  
-	CleanupStack::PushL( self );
-	self->ConstructL(); 
-	CleanupStack::Pop();
-	return self;
-	}
-
-CWLanCtrlDCMOAdapter::~CWLanCtrlDCMOAdapter()
-	{	
-	FeatureManager::UnInitializeLib();
-	
-	delete iProperty;
-	delete iDescription;
-	}
-
-CWLanCtrlDCMOAdapter::CWLanCtrlDCMOAdapter( TAny* aInitParams )
-:  iInitParams( ( CDCMOInterface::TDCMOInterfaceInitParams* ) aInitParams )
-	{
-	// See ConstructL() for initialisation completion.
-	}
-
-void CWLanCtrlDCMOAdapter::ConstructL()
-	{	
-	// Set up the data to pass back
-	iProperty = KWlanCtrlProperty().AllocL();
-	iDescription = KDisableWlanDescription().AllocL();
-	
-    FeatureManager::InitializeLibL();
-
-	}
-
-
-// Implementation of CDCMOInterface
-TDCMOStatus CWLanCtrlDCMOAdapter::SetDCMOPluginIntAttributeValueL(TDCMONode aId, TInt aValue)
-{
-	TDCMOStatus status(EDcmoFail);
-	TInt err( KErrNone );
-	
-	switch( aId )
-	{
-		case EDenyUserEnable:
-		    status = EDcmoNotSupported;
-		    break;
-		case ENotifyUser:
-		    status = EDcmoNotSupported;
-			break;
-		case EEnable:	
-		    {
-            RFeatureControl featureControl;
-            TUid wlanUid( TUid::Uid( KFeatureIdProtocolWlan ) ); 
-            err = featureControl.Connect();
-            
-            if ( err == KErrNone )
-                {
-                if( aValue == 0 )
-                    {
-                    // Disable WLAN
-                    err = featureControl.DisableFeature( wlanUid );
-		            }
-                else if ( aValue == 1 )
-                    {
-                    // Enable WLAN
-                    err = featureControl.EnableFeature( wlanUid );
-                    }
-                status = MapFeatureControlError( err );
-                featureControl.Close();
-                }
-            
-		    }
-		    break;
-		default:
-		    break;
-	}
-	
-	return status;
-}
-
-TDCMOStatus CWLanCtrlDCMOAdapter::GetDCMOPluginIntAttributeValueL(TDCMONode aId, TInt& aValue)
-{
-	TDCMOStatus status( EDcmoSuccess );
-	
-	switch(aId)
-	{
-		case EGroup: 
-		    aValue = EConnectivity;
-		    break;
-		case EAttached:
-		    aValue = EFalse;
-		    break;
-		case EEnabled:	
-		    aValue = FeatureManager::FeatureSupported( KFeatureIdProtocolWlan );		    
-		    break;    
-		case EDenyUserEnable:
-		    aValue = EFalse;
-		    break; 
-		case ENotifyUser:
-		    aValue = ETrue;
-		    break;
-		case EEnable:
-		    status = EDcmoAccessDenied;
-		    break;
-		default:
-		    break;
-	}
-	
-	return status;
-}
-
-TDCMOStatus CWLanCtrlDCMOAdapter::SetDCMOPluginStrAttributeValueL( TDCMONode   /* aId */, 
-                                                                   const TDes& /* aStrValue */ )
-{
-	// Nothing to do
-	TDCMOStatus status( EDcmoFail );
-	
-	return status;	
-}
-
-TDCMOStatus CWLanCtrlDCMOAdapter::GetDCMOPluginStrAttributeValueL( TDCMONode aId, TDes& aStrValue ) 
-{
-	TDCMOStatus status( EDcmoSuccess );
-	switch( aId )
-	{
-		case EProperty: 	
-		    aStrValue = *iProperty;
-		    break;
-		case EDescription:	
-		    aStrValue = *iDescription;
-		    break;
-		default:			
-		    status = EDcmoNotFound;
-		    break;
-	}
-		
-	return status;
-}
-
-void CWLanCtrlDCMOAdapter::GetLocalizedNameL( HBufC*& aLocName )
-    {
-    TFileName myFileName;
-    TParse* parseObj = new(ELeave) TParse();
-    TInt errInt = parseObj->Set( KRuntimeResourceFileName(), &KDC_RESOURCE_FILES_DIR, NULL );
-    myFileName = parseObj->FullName();
-    delete parseObj;
-    CStringResourceReader* resReader = CStringResourceReader::NewL( myFileName );
-    TPtrC buf;
-    buf.Set(resReader->ReadResourceString(R_DM_RUN_TIME_VAR_WLAN)); 
-    aLocName = buf.AllocL() ; 
-    delete resReader;
-    }
--- a/omadm/omadmextensions/adapters/wlanctrldcmoadapter/src/wlanctrldcmoadapterproxy.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +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 "Eclipse Public License v1.0"
- * which accompanies 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 <e32std.h>
-#include <implementationproxy.h>
-
-#include "wlanctrldcmoadapter.h"
-
-#ifndef IMPLEMENTATION_PROXY_ENTRY
-#define IMPLEMENTATION_PROXY_ENTRY( aUid, aFuncPtr )  {{aUid},(aFuncPtr)}
-#endif
-
-
-// Map the interface UIDs to implementation factory functions
-const TImplementationProxy ImplementationTable[] = 
-	{
-		IMPLEMENTATION_PROXY_ENTRY(0x20022FB4, CWLanCtrlDCMOAdapter::NewL),
-	};
-
-// Exported proxy for instantiation method resolution
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy(TInt& aTableCount)
-	{
-	aTableCount = sizeof(ImplementationTable) / sizeof(TImplementationProxy);
-
-	return ImplementationTable;
-	}
-
--- a/omadm/omadmextensions/group/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-/*
-* Copyright (c) 2002 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:    for building Components under DM adapters
-*				 includes DM Adapters
-*
-*/
-
-
-
-
-
-#include "../adapters/bld/bld.inf"
\ No newline at end of file
--- a/package_definition.xml	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
-  <package id="devicecontrol" name="Device Control Daemons" levels="oma mid app">
-    <collection id="devicediagnostics" name="Device Diagnostics" level="app">
-      <component id="devdiagapp" filter="s60" name="Device Diagnostics App">
-        <unit bldFile="devicediagnostics/devdiagapp/group"/>
-      </component>
-      <component id="devdiaggsplugin" filter="s60" name="Device Diagnostics GS Plugin" class="plugin">
-        <unit bldFile="devicediagnostics/devdiaggsplugin/group"/>
-      </component>
-      <component id="diagplugins" filter="s60" name="Diagnostics Plugins" class="plugin">
-        <unit bldFile="devicediagnostics/diagplugins/group"/>
-      </component>
-      <component id="diagsuites" filter="s60" name="Diagnostics Suites" class="plugin">
-        <unit bldFile="devicediagnostics/diagsuites/group"/>
-      </component>
-      <component id="devicediagnostics_build" filter="s60" name="Device Diagnostics Build">
-      	<!-- can the exports be moved to one of the other components? -->
-        <unit bldFile="devicediagnostics/group"/>
-      </component>
-    </collection>
-    <collection id="omadm" name="OMA Device Management" level="oma">
-      <component id="omadmappui" filter="s60" name="OMA DM Application UI">
-        <unit bldFile="omadm/omadmappui/group"/>
-        	<!--  can this test unit be safely removed from here? -->
-        <!-- <unit bldFile="omadm/omadmappui/tsrc/group"/> -->
-      </component>
-      <component id="omadmextensions" filter="s60" name="OMA DM Extensions" class="plugin">
-        <unit bldFile="omadm/omadmextensions/group"/>
-        	<!--  can these test units be safely removed from here? -->
-        <!-- <unit bldFile="omadm/omadmextensions/adapters/email/tsrc/group"/> -->
-        <!-- <unit bldFile="omadm/omadmextensions/adapters/mms/tsrc/group"/> -->
-        <!-- <unit bldFile="omadm/omadmextensions/adapters/syncmldm/tsrc/group"/> -->
-        <!-- <unit bldFile="omadm/omadmextensions/adapters/syncmldm12/tsrc/group"/> -->
-        <!-- <unit bldFile="omadm/omadmextensions/adapters/syncmlds/tsrc/group"/> -->
-      </component>
-    </collection>
-    <collection id="pnpmobileservices" name="PnP Mobile Services" level="mid">
-      <component id="pnpms" filter="s60" name="PnP MS">
-        <unit bldFile="pnpmobileservices/pnpms/group"/>
-        	<!-- can the unit be #included or removed? -->  
-        <!-- <unit bldFile="pnpmobileservices/pnpms/tsrc/group"/> -->
-      </component>
-    </collection>
-    <collection id="omacp" name="OMA Content Provisioning" level="oma">
-      <component id="omacpadapters" filter="s60" name="OMA CP Adapters" class="plugin">
-        <unit bldFile="omacp/omacpadapters/group"/>
-      </component>
-    </collection>
-  </package>
-</SystemDefinition>
--- a/pnpmobileservices/group/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-/*
-* Copyright (c) 2006 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 "../pnpms/group/bld.inf"
--- a/pnpmobileservices/pnpms/BMARM/NHWRPARSER.DEF	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-EXPORTS
-	"_._19CNHeadWrapperParser" @ 1 NONAME R3UNUSED ; CNHeadWrapperParser::~CNHeadWrapperParser(void)
-	GetContentTypeL__C19CNHeadWrapperParser @ 2 NONAME R3UNUSED ; CNHeadWrapperParser::GetContentTypeL(void) const
-	GetHeadersL__C19CNHeadWrapperParser @ 3 NONAME R3UNUSED ; CNHeadWrapperParser::GetHeadersL(void) const
-	GetProvisioningActivation__C19CNHeadWrapperParser @ 4 NONAME R3UNUSED ; CNHeadWrapperParser::GetProvisioningActivation(void) const
-	GetReportUrlL__C19CNHeadWrapperParser @ 5 NONAME R3UNUSED ; CNHeadWrapperParser::GetReportUrlL(void) const
-	GetUserInteraction__C19CNHeadWrapperParser @ 6 NONAME R3UNUSED ; CNHeadWrapperParser::GetUserInteraction(void) const
-	NewL__19CNHeadWrapperParserRC6TPtrC8 @ 7 NONAME R3UNUSED ; CNHeadWrapperParser::NewL(TPtrC8 const &)
-	Parse__19CNHeadWrapperParser @ 8 NONAME R3UNUSED ; CNHeadWrapperParser::Parse(void)
-	GetContentL__C19CNHeadWrapperParser @ 9 NONAME R3UNUSED ; CNHeadWrapperParser::GetContentL(void) const
-
--- a/pnpmobileservices/pnpms/BMARM/PNP.DEF	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-EXPORTS
-	NewPnpUtilLC__Fv @ 1 NONAME R3UNUSED ; NewPnpUtilLC(void)
-	"_._12CPnpUtilImpl" @ 2 NONAME R3UNUSED ; CPnpUtilImpl::~CPnpUtilImpl(void)
-	CreateNewToken__12CPnpUtilImplUlRi @ 3 NONAME R3UNUSED ; CPnpUtilImpl::CreateNewToken(unsigned long, int &)
-	FetchHomeNetworkInfoL__12CPnpUtilImpl @ 4 NONAME R3UNUSED ; CPnpUtilImpl::FetchHomeNetworkInfoL(void)
-	FetchNetworkInfoL__12CPnpUtilImpl @ 5 NONAME R3UNUSED ; CPnpUtilImpl::FetchNetworkInfoL(void)
-	FormatMncCodeL__C12CPnpUtilImplGt4TBuf1i4Gt4TBuf1i8Rt4TBuf1i8 @ 6 NONAME ; CPnpUtilImpl::FormatMncCodeL(TBuf<4>, TBuf<8>, TBuf<8> &) const
-	GetKeyInfoL__12CPnpUtilImplR5TDes8 @ 7 NONAME R3UNUSED ; CPnpUtilImpl::GetKeyInfoL(TDes8 &)
-	GetNonceL__12CPnpUtilImplR5TDes8 @ 8 NONAME R3UNUSED ; CPnpUtilImpl::GetNonceL(TDes8 &)
-	GetNonceValidityTimeL__12CPnpUtilImpl @ 9 NONAME R3UNUSED ; CPnpUtilImpl::GetNonceValidityTimeL(void)
-	GetTokenValidityTime__12CPnpUtilImpl @ 10 NONAME R3UNUSED ; CPnpUtilImpl::GetTokenValidityTime(void)
-	GetTokenValue__12CPnpUtilImplRi @ 11 NONAME R3UNUSED ; CPnpUtilImpl::GetTokenValue(int &)
-	HomeMccL__C12CPnpUtilImpl @ 12 NONAME R3UNUSED ; CPnpUtilImpl::HomeMccL(void) const
-	HomeMncL__C12CPnpUtilImpl @ 13 NONAME R3UNUSED ; CPnpUtilImpl::HomeMncL(void) const
-	ImsiL__C12CPnpUtilImplRt4TBuf1i15 @ 14 NONAME R3UNUSED ; CPnpUtilImpl::ImsiL(TBuf<15> &) const
-	NetworkMccL__C12CPnpUtilImpl @ 15 NONAME R3UNUSED ; CPnpUtilImpl::NetworkMccL(void) const
-	NetworkMncL__C12CPnpUtilImpl @ 16 NONAME R3UNUSED ; CPnpUtilImpl::NetworkMncL(void) const
-	NewLC__12CPnpUtilImpl @ 17 NONAME R3UNUSED ; CPnpUtilImpl::NewLC(void)
-	OperatorLongName__12CPnpUtilImplRt4TBuf1i20 @ 18 NONAME R3UNUSED ; CPnpUtilImpl::OperatorLongName(TBuf<20> &)
-	RegisteredInHomeNetworkL__12CPnpUtilImpl @ 19 NONAME R3UNUSED ; CPnpUtilImpl::RegisteredInHomeNetworkL(void)
-	SetHomeMccL__12CPnpUtilImplGt4TBuf1i4 @ 20 NONAME ; CPnpUtilImpl::SetHomeMccL(TBuf<4>)
-	SetHomeMncL__12CPnpUtilImplGt4TBuf1i8 @ 21 NONAME ; CPnpUtilImpl::SetHomeMncL(TBuf<8>)
-	SetNetworkMccL__12CPnpUtilImplGt4TBuf1i4 @ 22 NONAME ; CPnpUtilImpl::SetNetworkMccL(TBuf<4>)
-	SetNetworkMncL__12CPnpUtilImplGt4TBuf1i8 @ 23 NONAME ; CPnpUtilImpl::SetNetworkMncL(TBuf<8>)
-	StoreAccessPoint__12CPnpUtilImplUl @ 24 NONAME R3UNUSED ; CPnpUtilImpl::StoreAccessPoint(unsigned long)
-	VerifySignatureL__12CPnpUtilImplRC6TDesC8N31 @ 25 NONAME ; CPnpUtilImpl::VerifySignatureL(TDesC8 const &, TDesC8 const &, TDesC8 const &, TDesC8 const &)
-	Version__12CPnpUtilImplR6TDes16 @ 26 NONAME R3UNUSED ; CPnpUtilImpl::Version(TDes16 &)
-	CreateNewNonceL__12CPnpUtilImplUiR5TDes8 @ 27 NONAME R3UNUSED ; CPnpUtilImpl::CreateNewNonceL(unsigned int, TDes8 &)
-
--- a/pnpmobileservices/pnpms/BWINS/NHWRPARSER.DEF	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-EXPORTS
-	??1CNHeadWrapperParser@@UAE@XZ @ 1 NONAME ; CNHeadWrapperParser::~CNHeadWrapperParser(void)
-	?GetContentL@CNHeadWrapperParser@@QBEABVTDesC8@@XZ @ 2 NONAME ; class TDesC8 const & CNHeadWrapperParser::GetContentL(void) const
-	?GetContentTypeL@CNHeadWrapperParser@@QBEABVTDesC8@@XZ @ 3 NONAME ; class TDesC8 const & CNHeadWrapperParser::GetContentTypeL(void) const
-	?GetHeadersL@CNHeadWrapperParser@@QBEABVTDesC8@@XZ @ 4 NONAME ; class TDesC8 const & CNHeadWrapperParser::GetHeadersL(void) const
-	?GetProvisioningActivation@CNHeadWrapperParser@@QBE?AW4TProvisioningActivation@@XZ @ 5 NONAME ; enum TProvisioningActivation CNHeadWrapperParser::GetProvisioningActivation(void) const
-	?GetReportUrlL@CNHeadWrapperParser@@QBEABVTDesC8@@XZ @ 6 NONAME ; class TDesC8 const & CNHeadWrapperParser::GetReportUrlL(void) const
-	?GetUserInteraction@CNHeadWrapperParser@@QBEHXZ @ 7 NONAME ; int CNHeadWrapperParser::GetUserInteraction(void) const
-	?NewL@CNHeadWrapperParser@@SAPAV1@ABVTPtrC8@@@Z @ 8 NONAME ; class CNHeadWrapperParser * CNHeadWrapperParser::NewL(class TPtrC8 const &)
-	?Parse@CNHeadWrapperParser@@QAE?AW4TProvisioningStatus@THttpProvStates@@XZ @ 9 NONAME ; enum THttpProvStates::TProvisioningStatus CNHeadWrapperParser::Parse(void)
-
--- a/pnpmobileservices/pnpms/BWINS/PNP.DEF	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-EXPORTS
-	?NewPnpUtilLC@@YAPAVCPnpUtilImpl@@XZ @ 1 NONAME ; class CPnpUtilImpl * NewPnpUtilLC(void)
-	??1CPnpUtilImpl@@UAE@XZ @ 2 NONAME ; CPnpUtilImpl::~CPnpUtilImpl(void)
-	?CreateNewNonceL@CPnpUtilImpl@@UAEXIAAVTDes8@@@Z @ 3 NONAME ; void CPnpUtilImpl::CreateNewNonceL(unsigned int, class TDes8 &)
-	?CreateNewToken@CPnpUtilImpl@@QAEHKAAH@Z @ 4 NONAME ; int CPnpUtilImpl::CreateNewToken(unsigned long, int &)
-	?FetchAccessPoint@CPnpUtilImpl@@QAEHAAK@Z @ 5 NONAME ; int CPnpUtilImpl::FetchAccessPoint(unsigned long &)
-	?FetchHomeNetworkInfoL@CPnpUtilImpl@@UAEXXZ @ 6 NONAME ; void CPnpUtilImpl::FetchHomeNetworkInfoL(void)
-	?FetchNetworkInfoL@CPnpUtilImpl@@UAEXXZ @ 7 NONAME ; void CPnpUtilImpl::FetchNetworkInfoL(void)
-	?FormatMncCodeL@CPnpUtilImpl@@QBEXV?$TBuf@$03@@V?$TBuf@$07@@AAV3@@Z @ 8 NONAME ; void CPnpUtilImpl::FormatMncCodeL(class TBuf<4>, class TBuf<8>, class TBuf<8> &) const
-	?GetKeyInfoL@CPnpUtilImpl@@UAEXAAVTDes8@@@Z @ 9 NONAME ; void CPnpUtilImpl::GetKeyInfoL(class TDes8 &)
-	?GetNonceL@CPnpUtilImpl@@UAEXAAVTDes8@@@Z @ 10 NONAME ; void CPnpUtilImpl::GetNonceL(class TDes8 &)
-	?GetNonceValidityTimeL@CPnpUtilImpl@@QAEHXZ @ 11 NONAME ; int CPnpUtilImpl::GetNonceValidityTimeL(void)
-	?GetTokenValidityTime@CPnpUtilImpl@@QAEHXZ @ 12 NONAME ; int CPnpUtilImpl::GetTokenValidityTime(void)
-	?GetTokenValue@CPnpUtilImpl@@QAEHAAH@Z @ 13 NONAME ; int CPnpUtilImpl::GetTokenValue(int &)
-	?HomeMccL@CPnpUtilImpl@@UBE?BV?$TBuf@$03@@XZ @ 14 NONAME ; class TBuf<4> const CPnpUtilImpl::HomeMccL(void) const
-	?HomeMncL@CPnpUtilImpl@@UBE?BV?$TBuf@$07@@XZ @ 15 NONAME ; class TBuf<8> const CPnpUtilImpl::HomeMncL(void) const
-	?ImsiL@CPnpUtilImpl@@QBEXAAV?$TBuf@$0P@@@@Z @ 16 NONAME ; void CPnpUtilImpl::ImsiL(class TBuf<15> &) const
-	?NetworkMccL@CPnpUtilImpl@@UBE?BV?$TBuf@$03@@XZ @ 17 NONAME ; class TBuf<4> const CPnpUtilImpl::NetworkMccL(void) const
-	?NetworkMncL@CPnpUtilImpl@@UBE?BV?$TBuf@$07@@XZ @ 18 NONAME ; class TBuf<8> const CPnpUtilImpl::NetworkMncL(void) const
-	?NewLC@CPnpUtilImpl@@SAPAV1@XZ @ 19 NONAME ; class CPnpUtilImpl * CPnpUtilImpl::NewLC(void)
-	?OperatorLongName@CPnpUtilImpl@@QAEHAAV?$TBuf@$0BE@@@@Z @ 20 NONAME ; int CPnpUtilImpl::OperatorLongName(class TBuf<20> &)
-	?RegisteredInHomeNetworkL@CPnpUtilImpl@@QAEHXZ @ 21 NONAME ; int CPnpUtilImpl::RegisteredInHomeNetworkL(void)
-	?SetHomeMccL@CPnpUtilImpl@@QAEXV?$TBuf@$03@@@Z @ 22 NONAME ; void CPnpUtilImpl::SetHomeMccL(class TBuf<4>)
-	?SetHomeMncL@CPnpUtilImpl@@QAEXV?$TBuf@$07@@@Z @ 23 NONAME ; void CPnpUtilImpl::SetHomeMncL(class TBuf<8>)
-	?SetNetworkMccL@CPnpUtilImpl@@UAEXV?$TBuf@$03@@@Z @ 24 NONAME ; void CPnpUtilImpl::SetNetworkMccL(class TBuf<4>)
-	?SetNetworkMncL@CPnpUtilImpl@@UAEXV?$TBuf@$07@@@Z @ 25 NONAME ; void CPnpUtilImpl::SetNetworkMncL(class TBuf<8>)
-	?StoreAccessPoint@CPnpUtilImpl@@QAEHK@Z @ 26 NONAME ; int CPnpUtilImpl::StoreAccessPoint(unsigned long)
-	?VerifySignatureL@CPnpUtilImpl@@QAEHABVTDesC8@@000@Z @ 27 NONAME ; int CPnpUtilImpl::VerifySignatureL(class TDesC8 const &, class TDesC8 const &, class TDesC8 const &, class TDesC8 const &)
-	?Version@CPnpUtilImpl@@UAEHAAVTDes16@@@Z @ 28 NONAME ; int CPnpUtilImpl::Version(class TDes16 &)
-	?ConstructUriWithPnPUtilL@CPnpProvUtil@@QAEXAAVTDes16@@W4TServers@@@Z @ 29 NONAME ; void CPnpProvUtil::ConstructUriWithPnPUtilL(class TDes16 &, enum TServers)
-	?GetApplicationUidL@CPnpProvUtil@@QAEKXZ @ 30 NONAME ; unsigned long CPnpProvUtil::GetApplicationUidL(void)
-	?GetProvAdapterAppIdsL@CPnpProvUtil@@QAEXAAV?$RPointerArray@VHBufC16@@@@@Z @ 31 NONAME ; void CPnpProvUtil::GetProvAdapterAppIdsL(class RPointerArray<class HBufC16> &)
-	?LaunchOnlineSupportL@CPnpProvUtil@@QAEXAAVTDesC16@@W4TConnectReason@@W4TStartMode@@H0@Z @ 32 NONAME ; void CPnpProvUtil::LaunchOnlineSupportL(class TDesC16 &, enum TConnectReason, enum TStartMode, int, class TDesC16 &)
-	?NewL@CPnpProvUtil@@SAPAV1@XZ @ 33 NONAME ; class CPnpProvUtil * CPnpProvUtil::NewL(void)
-	?NewLC@CPnpProvUtil@@SAPAV1@XZ @ 34 NONAME ; class CPnpProvUtil * CPnpProvUtil::NewLC(void)
-	?SetApplicationUidL@CPnpProvUtil@@QAEXK@Z @ 35 NONAME ; void CPnpProvUtil::SetApplicationUidL(unsigned long)
-	?SetProvAdapterAppIdL@CPnpProvUtil@@QAEXAAVTDesC16@@@Z @ 36 NONAME ; void CPnpProvUtil::SetProvAdapterAppIdL(class TDesC16 &)
-
--- a/pnpmobileservices/pnpms/OnlineSupport/aif/OnlineSupportAif.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-/*
-* Copyright (c) 2003-2006 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:  Resource definitions for OnlineSupport 
-*
-*/
-
-
-#include <aiftool.rh>
-
-RESOURCE AIF_DATA
-    {
-    app_uid=0x10204338;
-    num_icons=0;
-    }
-
-// End of File
--- a/pnpmobileservices/pnpms/OnlineSupport/aif/OnlineSupport_reg.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-/*
-* Copyright (c) 2004-2006 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:   Resource definitions for OnlineSupport 
-*
-*/
-
-
-#include <appinfo.rh>
-#include <OnlineSupport.rsg>
-#include <data_caging_paths_strings.hrh>
-
-UID2 KUidAppRegistrationResourceFile
-UID3 0x10204338
-
-RESOURCE APP_REGISTRATION_INFO
-{
-    app_file = "OnlineSupport";
-    localisable_resource_file = APP_RESOURCE_DIR"\\OnlineSupport";
-    localisable_resource_id = R_ONLINESUPPORT_LOCALISABLE_APP_INFO;
-    hidden        = KAppIsHidden;
-    embeddability = KAppNotEmbeddable;
-}
-
-// End of File
--- a/pnpmobileservices/pnpms/OnlineSupport/data/OnlineSupport.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,118 +0,0 @@
-/*
-* Copyright (c) 2004-2006 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:  Resource definitions for OnlineSupport 
-*
-*/
-
-
-
-//  RESOURCE IDENTIFIER
-NAME    COMA // 4 letter ID
-
-//  INCLUDES
-
-#include <eikon.rh>
-#include <avkon.rsg>
-#include <avkon.rh>
-#include <avkon.mbg>
-#include <avkon.hrh>
-#include <FileListModel.hrh>
-#include <FileListModel.rh>
-#include <avkon.loc>
-#include "OnlineSupport.hrh"
-
-// defined if building the resource with compile_localization_resources.bat
-//#ifdef SIS_RESOURCE_COMPILATION
-//	#include "LocalizedFiles\OnlineSupport.loc"
-//#else
-	#include <onlinesupport.loc>
-//#endif
-
-
-#include <appinfo.rh>
-#include <data_caging_paths_strings.hrh>
-
-//  CONSTANTS  
-
-
-//  RESOURCE DEFINITIONS 
-
-
-RESOURCE RSS_SIGNATURE { }
-
-RESOURCE TBUF32
-    {
-    buf = "\\System\\Data\\OnlineSupport";    // Default FileName.
-    }
-
-
-//  RESOURCE DEFINITIONS 
-// -----------------------------------------------------------------------------
-//   
-// 
-// application information 
-//
-// -----------------------------------------------------------------------------
-//
-
-RESOURCE EIK_APP_INFO
-    {
-    hotkeys = r_confmanager_hotkeys;  
-    }
-
-//------------------------------------------------------------------------------
-//   
-// r_confmanager_hotkeys
-// Hotkeys for Configuration Manager
-//
-//------------------------------------------------------------------------------
-//
-RESOURCE HOTKEYS r_confmanager_hotkeys
-    {
-    control=
-        {
-        HOTKEY { command=EAknCmdExit; key='e'; }
-        };
-    }
-
-RESOURCE TBUF r_confmanager_confirmation
-    {
-    buf = qtn_op_pnp_query;
-    }
-
-RESOURCE TBUF r_confmanager_errornote
-    {
-    buf = qtn_op_pnp_error;
-    }
-
-RESOURCE TBUF r_confmanager_waitnote
-    {
-    buf = qtn_op_pnp_wait;
-    }
-
-RESOURCE LOCALISABLE_APP_INFO r_onlinesupport_localisable_app_info
-    {
-    caption_and_icon = 
-    CAPTION_AND_ICON_INFO
-        {
-        number_of_icons = 0;
-        };
-    }
-
-RESOURCE TBUF r_offline_mode
-   {
-   buf = qtn_offline_not_possible;
-   }
-   
-// End of File
--- a/pnpmobileservices/pnpms/OnlineSupport/data/OnlineSupport_caption.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-/*
-* Copyright (c) 2003 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:  Resource file for the caption of Configuration Manager 
-*                application
-*
-*/
-
-
-// INCLUDES
-
-#include <apcaptionfile.rh>
-#include <onlinesupport.loc>
-
-RESOURCE CAPTION_DATA
-{
-    //caption=qtn_apps_confm_long_caption;
-    //shortcaption=qtn_apps_confm_short_caption;
-}
Binary file pnpmobileservices/pnpms/OnlineSupport/data/Thumbs.db has changed
Binary file pnpmobileservices/pnpms/OnlineSupport/data/online_icon42x29.bmp has changed
Binary file pnpmobileservices/pnpms/OnlineSupport/data/online_icon42x29mask.bmp has changed
Binary file pnpmobileservices/pnpms/OnlineSupport/data/online_icon44x44.bmp has changed
Binary file pnpmobileservices/pnpms/OnlineSupport/data/online_icon44x44mask.bmp has changed
--- a/pnpmobileservices/pnpms/OnlineSupport/group/Icons2.mk	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,71 +0,0 @@
-#
-# Copyright (c) 2004 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: Implementation of PnPMS components
-#
-
-ifeq (WINS,$(findstring WINS, $(PLATFORM)))
-ZDIR=\epoc32\release\$(PLATFORM)\$(CFG)\Z
-else
-ZDIR=\epoc32\data\z
-endif
-
-# ----------------------------------------------------------------------------
-# Configure these
-# ----------------------------------------------------------------------------
-
-TARGETDIR=$(ZDIR)\SYSTEM\data
-HEADERDIR=\epoc32\include
-ICONTARGETFILENAME=$(TARGETDIR)\OnlineSupport.MIF
-HEADERFILENAME=$(HEADERDIR)\OnlineSupport.MBG
-
-do_nothing :
-	@rem do_nothing
-
-MAKMAKE : do_nothing
-
-BLD : do_nothing
-
-CLEAN : do_nothing
-
-LIB : do_nothing
-
-CLEANLIB : do_nothing
-
-# ----------------------------------------------------------------------------
-# Configure these.
-#
-# NOTE 1: DO NOT DEFINE MASK FILE NAMES! They are included automatically by
-# MifConv if the mask detph is defined.
-#
-# NOTE 2: Usually, source paths should not be included in the bitmap
-# definitions. MifConv searches for the icons in all icon directories in a
-# predefined order, which is currently \s60\icons, \s60\bitmaps2.
-# The directory \s60\icons is included in the search only if the feature flag
-# __SCALABLE_ICONS is defined.
-# ----------------------------------------------------------------------------
-
-RESOURCE :
-	mifconv $(ICONTARGETFILENAME) /h$(HEADERFILENAME) \
-		/c8,8 online_icon44x44.bmp \
-		/c8,8 online_icon42x29.bmp
-
-FREEZE : do_nothing
-
-SAVESPACE : do_nothing
-
-RELEASABLES :
-	@echo $(HEADERFILENAME)&& \
-	@echo $(ICONTARGETFILENAME)
-
-FINAL : do_nothing
--- a/pnpmobileservices/pnpms/OnlineSupport/group/Icons2_aif_bitmaps.mk	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +0,0 @@
-#
-# Copyright (c) 2004 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: Implementation of PnPMS components
-#
-
-ifeq (WINS,$(findstring WINS, $(PLATFORM)))
-ZDIR=\epoc32\release\$(PLATFORM)\$(CFG)\Z
-else
-ZDIR=\epoc32\data\z
-endif
-
-# ----------------------------------------------------------------------------
-# Configure these
-# ----------------------------------------------------------------------------
-
-TARGETDIR=$(ZDIR)\SYSTEM\APPS\OnlineSupport
-ICONTARGETFILENAME=$(TARGETDIR)\OnlineSupport_aif.MBM
-
-do_nothing :
-	@rem do_nothing
-
-MAKMAKE : do_nothing
-
-BLD : do_nothing
-
-CLEAN : do_nothing
-
-LIB : do_nothing
-
-CLEANLIB : do_nothing
-
-# ----------------------------------------------------------------------------
-# Configure these.
-#
-# NOTE 1: DO NOT DEFINE MASK FILE NAMES! They are included automatically by
-# MifConv if the mask detph is defined.
-#
-# NOTE 2: Usually, source paths should not be included in the bitmap
-# definitions. MifConv searches for the icons in all icon directories in a
-# predefined order, which is currently \s60\icons, \s60\bitmaps2.
-# The directory \s60\icons is included in the search only if the feature flag
-# __SCALABLE_ICONS is defined.
-# ----------------------------------------------------------------------------
-
-RESOURCE :
-	mifconv $(ICONTARGETFILENAME) \
-		/c8,8 online_icon44x44.bmp \
-		/c8,8 online_icon42x29.bmp
-
-FREEZE : do_nothing
-
-SAVESPACE : do_nothing
-
-RELEASABLES :
-	@echo $(ICONTARGETFILENAME)
-
-FINAL : do_nothing
--- a/pnpmobileservices/pnpms/OnlineSupport/group/Icons2_aif_bitmaps_dc.mk	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +0,0 @@
-#
-# Copyright (c) 2004 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: Implementation of PnPMS components
-#
-
-ifeq (WINS,$(findstring WINS, $(PLATFORM)))
-ZDIR=\epoc32\release\$(PLATFORM)\$(CFG)\Z
-else
-ZDIR=\epoc32\data\z
-endif
-
-# ----------------------------------------------------------------------------
-# Configure these
-# ----------------------------------------------------------------------------
-
-TARGETDIR=$(ZDIR)\RESOURCE\APPS
-ICONTARGETFILENAME=$(TARGETDIR)\OnlineSupport_aif.MBM
-
-do_nothing :
-	@rem do_nothing
-
-MAKMAKE : do_nothing
-
-BLD : do_nothing
-
-CLEAN : do_nothing
-
-LIB : do_nothing
-
-CLEANLIB : do_nothing
-
-# ----------------------------------------------------------------------------
-# Configure these.
-#
-# NOTE 1: DO NOT DEFINE MASK FILE NAMES! They are included automatically by
-# MifConv if the mask detph is defined.
-#
-# NOTE 2: Usually, source paths should not be included in the bitmap
-# definitions. MifConv searches for the icons in all icon directories in a
-# predefined order, which is currently \s60\icons, \s60\bitmaps2.
-# The directory \s60\icons is included in the search only if the feature flag
-# __SCALABLE_ICONS is defined.
-# ----------------------------------------------------------------------------
-
-RESOURCE :
-#	mifconv $(ICONTARGETFILENAME) /h$(HEADERFILENAME) \
-#		/c8,8 online_icon44x44.bmp \
-#		/c8,8 online_icon42x29.bmp
-	mifconv $(ICONTARGETFILENAME) \
-		/c8,1 online_icon44x44.bmp \
-		/c8,1 online_icon42x29.bmp
-#	mifconv $(ICONTARGETFILENAME)  \
-#		/c8,8 online_icon42x29.bmp \
-#		/c8,8 online_icon44x44.bmp
-
-FREEZE : do_nothing
-
-SAVESPACE : do_nothing
-
-RELEASABLES :
-	@echo $(ICONTARGETFILENAME)
-
-FINAL : do_nothing
--- a/pnpmobileservices/pnpms/OnlineSupport/group/Icons2_aif_scalable.mk	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +0,0 @@
-#
-# Copyright (c) 2004 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: Implementation of PnPMS components
-#
-
-ifeq (WINS,$(findstring WINS, $(PLATFORM)))
-ZDIR=\epoc32\release\$(PLATFORM)\$(CFG)\Z
-else
-ZDIR=\epoc32\data\z
-endif
-
-# ----------------------------------------------------------------------------
-# Configure these
-# ----------------------------------------------------------------------------
-
-TARGETDIR=$(ZDIR)\SYSTEM\APPS\OnlineSupport
-ICONTARGETFILENAME=$(TARGETDIR)\OnlineSupport_AIF.MIF
-
-do_nothing :
-	@rem do_nothing
-
-MAKMAKE : do_nothing
-
-BLD : do_nothing
-
-CLEAN : do_nothing
-
-LIB : do_nothing
-
-CLEANLIB : do_nothing
-
-# ----------------------------------------------------------------------------
-# Configure these.
-#
-# NOTE 1: DO NOT DEFINE MASK FILE NAMES! They are included automatically by
-# MifConv if the mask detph is defined.
-#
-# NOTE 2: Usually, source paths should not be included in the bitmap
-# definitions. MifConv searches for the icons in all icon directories in a
-# predefined order, which is currently \s60\icons, \s60\bitmaps2.
-# The directory \s60\icons is included in the search only if the feature flag
-# __SCALABLE_ICONS is defined.
-# ----------------------------------------------------------------------------
-
-RESOURCE :
-#	mifconv $(ICONTARGETFILENAME) \
-#		/c8,8 qgn_menu_am.svg
-	mifconv $(ICONTARGETFILENAME) \
-		/c8,8 online_icon44x44.bmp \
-		/c8,8 online_icon42x29.bmp
-
-FREEZE : do_nothing
-
-SAVESPACE : do_nothing
-
-RELEASABLES :
-	@echo $(ICONTARGETFILENAME)
-
-FINAL : do_nothing
--- a/pnpmobileservices/pnpms/OnlineSupport/group/Icons2_aif_scalable_dc.mk	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +0,0 @@
-#
-# Copyright (c) 2004 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: Implementation of PnPMS components
-#
-
-ifeq (WINS,$(findstring WINS, $(PLATFORM)))
-ZDIR=\epoc32\release\$(PLATFORM)\$(CFG)\Z
-else
-ZDIR=\epoc32\data\z
-endif
-
-# ----------------------------------------------------------------------------
-# Configure these
-# ----------------------------------------------------------------------------
-
-TARGETDIR=$(ZDIR)\RESOURCE\APPS
-ICONTARGETFILENAME=$(TARGETDIR)\OnlineSupport_aif.MIF
-//ICONTARGETFILENAME=$(TARGETDIR)\OnlineSupport_aif.MBM
-
-do_nothing :
-	@rem do_nothing
-
-MAKMAKE : do_nothing
-
-BLD : do_nothing
-
-CLEAN : do_nothing
-
-LIB : do_nothing
-
-CLEANLIB : do_nothing
-
-# ----------------------------------------------------------------------------
-# Configure these.
-#
-# NOTE 1: DO NOT DEFINE MASK FILE NAMES! They are included automatically by
-# MifConv if the mask detph is defined.
-#
-# NOTE 2: Usually, source paths should not be included in the bitmap
-# definitions. MifConv searches for the icons in all icon directories in a
-# predefined order, which is currently \s60\icons, \s60\bitmaps2.
-# The directory \s60\icons is included in the search only if the feature flag
-# __SCALABLE_ICONS is defined.
-# ----------------------------------------------------------------------------
-
-RESOURCE :
-	mifconv $(ICONTARGETFILENAME) \
-		/c8,8 online_icon44x44.bmp \
-		/c8,8 online_icon42x29.bmp
-
-FREEZE : do_nothing
-
-SAVESPACE : do_nothing
-
-RELEASABLES :
-	@echo $(ICONTARGETFILENAME)
-
-FINAL : do_nothing
--- a/pnpmobileservices/pnpms/OnlineSupport/group/Icons2_dc.mk	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +0,0 @@
-#
-# Copyright (c) 2004 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: Implementation of PnPMS components
-#
-
-ifeq (WINS,$(findstring WINS, $(PLATFORM)))
-ZDIR=\epoc32\release\$(PLATFORM)\$(CFG)\Z
-else
-ZDIR=\epoc32\data\z
-endif
-
-# ----------------------------------------------------------------------------
-# Configure these
-# ----------------------------------------------------------------------------
-
-TARGETDIR=$(ZDIR)\RESOURCE\APPS
-ICONTARGETFILENAME=$(TARGETDIR)\OnlineSupport.MIF
-
-do_nothing :
-	@rem do_nothing
-
-MAKMAKE : do_nothing
-
-BLD : do_nothing
-
-CLEAN : do_nothing
-
-LIB : do_nothing
-
-CLEANLIB : do_nothing
-
-# ----------------------------------------------------------------------------
-# Configure these.
-#
-# NOTE 1: DO NOT DEFINE MASK FILE NAMES! They are included automatically by
-# MifConv if the mask detph is defined.
-#
-# NOTE 2: Usually, source paths should not be included in the bitmap
-# definitions. MifConv searches for the icons in all icon directories in a
-# predefined order, which is currently \s60\icons, \s60\bitmaps2.
-# The directory \s60\icons is included in the search only if the feature flag
-# __SCALABLE_ICONS is defined.
-# ----------------------------------------------------------------------------
-
-RESOURCE :
-	mifconv $(ICONTARGETFILENAME) \
-		/c8,8 online_icon44x44.bmp \
-		/c8,8 online_icon42x29.bmp
-
-FREEZE : do_nothing
-
-SAVESPACE : do_nothing
-
-RELEASABLES :
-	@echo $(ICONTARGETFILENAME)
-
-FINAL : do_nothing
--- a/pnpmobileservices/pnpms/OnlineSupport/group/bldsis.mk	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,282 +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 "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description:
-#
-#
-# Build a stub SIS file to go into ROM to allow installing an update.
-#
-
-ifeq (WINS,$(findstring WINS, $(PLATFORM)))
-INSTALLDIR=..\..\install\wins
-SISNAME=Support_S3-0_stub_winscw_udeb
-PKGNAME=Support_S3-0_stub_winscw_udeb
-else
-INSTALLDIR=..\..\install\udeb
-ifeq (UDEB,$(findstring UDEB, $(CFG)))
-SISNAME=Support_S3-0_stub_udeb
-PKGNAME=Support_S3-0_stub_udeb
-else
-INSTALLDIR=..\..\install
-SISNAME=Support_S3-0_stub
-PKGNAME=Support_S3-0_stub
-endif
-endif
-
-# for handling dummy localization resources
-LOCALIZATION_RESOURCE_DIR=\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir
-
-ifeq (WINS,$(findstring WINS, $(PLATFORM)))
-TARGETDIR=$(EPOCROOT)EPOC32\RELEASE\$(PLATFORM)\$(CFG)\Z\System\Install
-else
-TARGETDIR=$(EPOCROOT)EPOC32\Data\Z\System\Install
-endif
-
-$(TARGETDIR) :
-	@perl -S emkdir.pl "$(TARGETDIR)"
-
-do_nothing :
-	rem do_nothing
-
-SISFILE=$(TARGETDIR)\$(SISNAME).sis
-
-$(SISFILE) : $(INSTALLDIR)\$(PKGNAME).pkg
-	@echo "
-	@echo pkg-file: $? 
-	@echo sis-file: $@
-	@echo "
-#Copy dummy language resources to allow making a sisx-stub
-	-mkdir $(LOCALIZATION_RESOURCE_DIR)
-	-copy onlinesupport.rsc $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r00
-	-copy onlinesupport.rsc $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r01
-	-copy onlinesupport.rsc $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r02
-	-copy onlinesupport.rsc $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r03
-	-copy onlinesupport.rsc $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r04
-	-copy onlinesupport.rsc $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r05
-	-copy onlinesupport.rsc $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r06
-	-copy onlinesupport.rsc $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r07
-	-copy onlinesupport.rsc $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r08
-	-copy onlinesupport.rsc $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r09
-	-copy onlinesupport.rsc $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r10
-	-copy onlinesupport.rsc $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r13
-	-copy onlinesupport.rsc $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r14
-	-copy onlinesupport.rsc $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r15
-	-copy onlinesupport.rsc $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r16
-	-copy onlinesupport.rsc $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r17
-	-copy onlinesupport.rsc $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r18
-	-copy onlinesupport.rsc $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r25
-	-copy onlinesupport.rsc $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r26
-	-copy onlinesupport.rsc $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r27
-	-copy onlinesupport.rsc $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r28
-	-copy onlinesupport.rsc $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r29
-	-copy onlinesupport.rsc $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r30
-	-copy onlinesupport.rsc $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r31
-	-copy onlinesupport.rsc $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r32
-	-copy onlinesupport.rsc $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r33
-	-copy onlinesupport.rsc $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r37
-	-copy onlinesupport.rsc $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r39
-	-copy onlinesupport.rsc $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r42
-	-copy onlinesupport.rsc $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r45
-	-copy onlinesupport.rsc $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r49
-	-copy onlinesupport.rsc $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r51
-	-copy onlinesupport.rsc $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r54
-	-copy onlinesupport.rsc $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r57
-	-copy onlinesupport.rsc $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r59
-	-copy onlinesupport.rsc $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r67
-	-copy onlinesupport.rsc $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r68
-	-copy onlinesupport.rsc $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r70
-	-copy onlinesupport.rsc $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r76
-	-copy onlinesupport.rsc $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r78
-	-copy onlinesupport.rsc $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r79
-	-copy onlinesupport.rsc $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r83
-	-copy onlinesupport.rsc $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r93
-	-copy onlinesupport.rsc $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r157
-	-copy onlinesupport.rsc $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r158
-	-copy onlinesupport.rsc $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r159
-	-copy onlinesupport.rsc $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r160
-	-copy onlinesupport.rsc $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r161
-	-copy pnpprovisioning.rsc $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r00
-	-copy pnpprovisioning.rsc $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r01
-	-copy pnpprovisioning.rsc $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r02
-	-copy pnpprovisioning.rsc $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r03
-	-copy pnpprovisioning.rsc $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r04
-	-copy pnpprovisioning.rsc $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r05
-	-copy pnpprovisioning.rsc $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r06
-	-copy pnpprovisioning.rsc $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r07
-	-copy pnpprovisioning.rsc $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r08
-	-copy pnpprovisioning.rsc $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r09
-	-copy pnpprovisioning.rsc $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r10
-	-copy pnpprovisioning.rsc $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r13
-	-copy pnpprovisioning.rsc $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r14
-	-copy pnpprovisioning.rsc $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r15
-	-copy pnpprovisioning.rsc $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r16
-	-copy pnpprovisioning.rsc $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r17
-	-copy pnpprovisioning.rsc $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r18
-	-copy pnpprovisioning.rsc $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r25
-	-copy pnpprovisioning.rsc $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r26
-	-copy pnpprovisioning.rsc $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r27
-	-copy pnpprovisioning.rsc $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r28
-	-copy pnpprovisioning.rsc $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r29
-	-copy pnpprovisioning.rsc $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r30
-	-copy pnpprovisioning.rsc $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r31
-	-copy pnpprovisioning.rsc $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r32
-	-copy pnpprovisioning.rsc $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r33
-	-copy pnpprovisioning.rsc $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r37
-	-copy pnpprovisioning.rsc $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r39
-	-copy pnpprovisioning.rsc $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r42
-	-copy pnpprovisioning.rsc $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r45
-	-copy pnpprovisioning.rsc $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r49
-	-copy pnpprovisioning.rsc $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r51
-	-copy pnpprovisioning.rsc $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r54
-	-copy pnpprovisioning.rsc $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r57
-	-copy pnpprovisioning.rsc $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r59
-	-copy pnpprovisioning.rsc $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r67
-	-copy pnpprovisioning.rsc $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r68
-	-copy pnpprovisioning.rsc $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r70
-	-copy pnpprovisioning.rsc $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r76
-	-copy pnpprovisioning.rsc $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r78
-	-copy pnpprovisioning.rsc $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r79
-	-copy pnpprovisioning.rsc $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r83
-	-copy pnpprovisioning.rsc $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r93
-	-copy pnpprovisioning.rsc $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r157
-	-copy pnpprovisioning.rsc $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r158
-	-copy pnpprovisioning.rsc $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r159
-	-copy pnpprovisioning.rsc $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r160
-	-copy pnpprovisioning.rsc $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r161
-# Make a SISX-stub file
-	makesis -s $? $@ 
-	-erase $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r00
-	-erase $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r01
-	-erase $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r02
-	-erase $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r03
-	-erase $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r04
-	-erase $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r05
-	-erase $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r06
-	-erase $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r07
-	-erase $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r08
-	-erase $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r09
-	-erase $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r10
-	-erase $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r13
-	-erase $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r14
-	-erase $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r15
-	-erase $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r16
-	-erase $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r17
-	-erase $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r18
-	-erase $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r25
-	-erase $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r26
-	-erase $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r27
-	-erase $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r28
-	-erase $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r29
-	-erase $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r30
-	-erase $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r31
-	-erase $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r32
-	-erase $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r33
-	-erase $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r37
-	-erase $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r39
-	-erase $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r42
-	-erase $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r45
-	-erase $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r49
-	-erase $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r51
-	-erase $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r54
-	-erase $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r57
-	-erase $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r59
-	-erase $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r67
-	-erase $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r68
-	-erase $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r70
-	-erase $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r76
-	-erase $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r78
-	-erase $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r79
-	-erase $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r83
-	-erase $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r93
-	-erase $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r157
-	-erase $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r158
-	-erase $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r159
-	-erase $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r160
-	-erase $(LOCALIZATION_RESOURCE_DIR)\onlinesupport.r161
-	-erase $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r00
-	-erase $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r01
-	-erase $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r02
-	-erase $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r03
-	-erase $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r04
-	-erase $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r05
-	-erase $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r06
-	-erase $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r07
-	-erase $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r08
-	-erase $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r09
-	-erase $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r10
-	-erase $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r13
-	-erase $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r14
-	-erase $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r15
-	-erase $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r16
-	-erase $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r17
-	-erase $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r18
-	-erase $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r25
-	-erase $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r26
-	-erase $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r27
-	-erase $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r28
-	-erase $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r29
-	-erase $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r30
-	-erase $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r31
-	-erase $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r32
-	-erase $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r33
-	-erase $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r37
-	-erase $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r39
-	-erase $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r42
-	-erase $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r45
-	-erase $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r49
-	-erase $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r51
-	-erase $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r54
-	-erase $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r57
-	-erase $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r59
-	-erase $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r67
-	-erase $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r68
-	-erase $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r70
-	-erase $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r76
-	-erase $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r78
-	-erase $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r79
-	-erase $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r83
-	-erase $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r93
-	-erase $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r157
-	-erase $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r158
-	-erase $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r159
-	-erase $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r160
-	-erase $(LOCALIZATION_RESOURCE_DIR)\pnpprovisioning.r161
-	-rmdir $(LOCALIZATION_RESOURCE_DIR)
-
-#
-# The targets invoked by bld...
-#
-
-MAKMAKE : do_nothing
-
-RESOURCE : do_nothing
-
-SAVESPACE : do_nothing
-
-BLD :
-#Remove the old sis-files to allow creating new ones
-	-erase $(SISFILE)
-
-FREEZE : do_nothing
-
-LIB : do_nothing
-
-CLEANLIB : do_nothing
-
-FINAL : $(TARGETDIR) $(SISFILE)
-
-CLEAN : 
-	-erase $(SISFILE)
-
-RELEASABLES : 
-	@echo $(SISFILE)
Binary file pnpmobileservices/pnpms/OnlineSupport/group/online_icon42x29.bmp has changed
Binary file pnpmobileservices/pnpms/OnlineSupport/group/online_icon42x29_mask.bmp has changed
Binary file pnpmobileservices/pnpms/OnlineSupport/group/online_icon42x29_mask_soft.bmp has changed
Binary file pnpmobileservices/pnpms/OnlineSupport/group/online_icon44x44.bmp has changed
Binary file pnpmobileservices/pnpms/OnlineSupport/group/online_icon44x44_mask.bmp has changed
Binary file pnpmobileservices/pnpms/OnlineSupport/group/online_icon44x44_mask_soft.bmp has changed
--- a/pnpmobileservices/pnpms/OnlineSupport/inc/CCMAppUi.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,626 +0,0 @@
-/*
-* Copyright (c) 2003-2006 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:  Header file for Ui class
-*
-*/
-
-
-
-#ifndef CCMAPPUI_H
-#define CCMAPPUI_H
-
-//  INCLUDES
-#include <eikapp.h>
-#include <eikdoc.h>
-#include <e32std.h>
-#include <coeccntx.h>
-#include <aknappui.h>
-#include <favouriteslimits.h>   // for KFavouritesMaxUrl
-#include <sysutil.h>
-#include <ApDataHandler.h>      // for creating new Init Access
-#include <ApAccessPointItem.h>  // for creating new Init Access
-
-#include "MCMSocketsEngineNotifier.h"
-#include "MCMRegisterationStatusNotifier.h"
-#include "MiniBrowserObserver.h"
-#include "mcmdialogstatusnotifier.h"
-#include "ccmdialogmonitor.h"
-
-
-// CONSTANTS
-//Maximun length of WAP address
-const TInt KMaximumLengthOfWapAddress = KFavouritesMaxUrl;
-const TInt KMaxServerString = 20;
-const TInt KMaxPageString = 20;
-const TInt KMaxQueryString = 256;
-
-// MACROS
-// None
-
-// DATA TYPES
-// None
-
-// FUNCTION PROTOTYPES
-// None
-
-// FORWARD DECLARATIONS
-class CRepository;
-class CCMRegistrationMonitor;
-class CCMSocketsEngine;
-class CMiniBrowser;
-class CCMDialogMonitor;
-class CAknGlobalConfirmationQuery;
-class CAknGlobalNote;
-// CLASS DECLARATION
-
-/**
-*  CCMAppUi application class.
-*
-*  @lib ConfManager.app
-*  @since 2.0
-*/
-class CCMAppUi : public CAknAppUi,
-                    /*public MProgressDialogCallback,*/ 
-                    public MCMSocketsEngineNotifier,
-                    public MCMRegisterationStatusNotifier,
-                    public MCoeForegroundObserver,
-                    public MMiniBrowserObserver,
-                    public MCMDialogStatusNotifier
-    {
-    public:  // Constructors and destructor
-        CCMAppUi();
-             
-        /**
-        * Destructor.
-        */      
-        ~CCMAppUi();
-
-    public: // New methods
-
-        /**
-        * ApplicationStatus used when the timer expires
-        */
-        enum TApplicationStatus 
-            {
-            EAppStatusMonitoring,
-            EAppStatusConnecting,
-            EAppStatusWaitingDisconnect,
-            EAppStatusInactive,
-            EAppStatusStartingUp,
-            /*(if the app is closed immediately, it crashes after calling the destructor.
-            Seems like CAknMessageQueryDialog releases some of it's resources after some
-            kind of delay and this causes the crash)
-            */
-            EAppStatusClosing
-            };
-
-        /**
-        * ApplicationStatus used when the timer expires
-        */
-        enum TConnectingVia 
-            {
-            EConnectingViaNull, // Initial state, no connection has been tried yet
-            EConnectingViaInit, // Trying to connect via Init Access
-            EConnectingViaDefault, // Trying to connect via Browser default AP
-            EConnectingViaUser // Trying to connect via AP asked from user
-            };
-
-
-        /**
-        * ConnectReason used to inform help-portal
-        */
-        enum TConnectReason
-            {
-            EConnectReasonUnknown               = 0,
-            EConnectReasonFirstBoot             = 1,
-            EConnectReasonNewSim                = 2,
-            EConnectReasonUserTriggered         = 3,
-            EConnectReasonApplicationTriggered  = 4,
-            EConnectReasonRemoteTriggered       = 5
-            };
-        
-        /**
-        * Activates confirmation dialog
-        * @since 2.0
-        */
-        void ConfirmationDialogL();
-
-        /**
-        * Activates error note
-        * @since 2.0
-        * @return void
-        */
-        void ErrorNoteConnectionL();
-
-        /**
-        * Activates error note, displaying the error value
-        * @since 2.0
-        * @param aError errorvalue, will displayed in the note
-        * @return void
-        */
-        void ErrorNoteUnknownL( TInt aError );
-
-        /**
-        * StartUp starting sequence.
-        * @since 2.0
-        * @return errorcode.
-        */
-        TInt StartUpStartL();
-
-        /**
-        * Checks if there is accesspoint available
-        * @since 2.0
-        * @return errorcode
-        */ 
-        TInt CheckSettingsL();
-
-        /**
-        * opens wap browser
-        * @since 2.0
-        * @return void
-        */ 
-        void OpenWapBrowserL( );
-
-        /**
-        * Checks if there is defaul accesspoint available
-        * @since 2.0
-        * @returns ID of the accesspoint or KErrNotFound
-        */ 
-        TUint32 CheckDefaultAccessPointL();
-
-        /**
-        * Checks if there is init accesspoint available
-        * @since 2.0
-        * @returns ID of the accesspoint or KErrNotFound
-        */ 
-        TUint32 InitAccessPointL();
-
-        /**
-        * Checks the settings of init access point
-        * @since 2.0
-        * @param aDb Commsdb connection
-        * @param aAccessPoint id of the AP to be checked
-        * @returns ETrue if the AP was ok, EFalse if not
-        */ 
-        TBool CheckInitAccessPointL( CCommsDatabase& aDb, TUint32& aAccessPoint );
-        
-        /**
-        * Creates the init accesspoint
-        * @since 2.0
-        * @param aDb Commsdb connection
-        * @returns ID of the accesspoint or KErrNotFound
-        */ 
-        TUint32 CreateInitAccessPointL( CCommsDatabase& aDb );
-
-        /**
-        * Initiates next test
-        * @since 2.0
-        * @returns void
-        */ 
-        void InitiateNextConnectionTestL();
-
-        /**
-        * Checks if init access is ok in the comms db
-        *   if not creates one and cheks again
-        *   if init access AP is ok initiates the init access test
-        *   otherwise returns EFalse
-        * @since 2.0
-        * @returns ETrue if connection test was initiated, EFalse if not
-        */ 
-        TBool TryInitAccessL();
-
-        /**
-        * Checks if browser default access is ok in the comms db
-        *   if so initiates the default access test
-        *   otherwise returns EFalse
-        * @since 2.0
-        * @returns ETrue if connection test was initiated or EFalse
-        */ 
-        TBool TryDefaultAccessL();
-
-        /**
-        * Prompts the user to select an ap to test
-        * @since 2.0
-        * @returns ETrue if connection test was initiated or EFalse
-        */ 
-        TBool TryUserAccessL();
-
-        /**
-        * Reads the accesspoint id from the preferences table and changes
-        * iAccessPoint to refer to the id in the WAP_ACCESS_POINT table.
-        * @since 2.0
-        * @returns ID of the accesspoint or KErrNotFound
-        */ 
-        TInt ReadAccessPointFromPreferencesL();
-
-        /**
-        * function checks the settings in the ini file
-        * @since 2.0
-        * @return void
-        */ 
-        void CheckIniFileSettingsL();
-
-        /**
-        * Shows wait Dialog
-        * @since 2.0
-        * @return void
-        */ 
-        void ShowWaitDialogL();
-
-        /**
-        * Starts the real functionality of the configuration Manager
-        * @since 2.0
-        * @return void
-        */ 
-        void StartUpOperationL();
-
-        /**
-        * Sets server string (http://<server>.help-portal.com)
-        * @param aServer the server string, max length KMaxServerString
-        * @since 2.0
-        * @return void
-        */ 
-        void SetServerString(const TDesC& aServer);
-
-        /**
-        * Sets page string (http://server.help-portal.com/<page>)
-        * @param aPage the page string, max length KMaxPageString
-        * @since 2.0
-        * @return void
-        */ 
-        void SetPageString(const TDesC& aPage);
-
-        /**
-        * Sets connect reason 
-        * @param aReason the connect reason
-        * @since 2.0
-        * @return void
-        */ 
-        void SetConnectReason(TConnectReason aReason);
-
-        /**
-        * Sets query string 
-        * @param aQuery the query string, max length KMaxQueryString
-        * @since 2.0
-        * @return void
-        */ 
-        void SetQueryString(const TDesC& aQuery);
-
-        /**
-        * Sets iAtBoot
-        * @param aAtBoot if ETrue indicates that Support is started as part
-        *                of boot process
-        * @return voi
-        */
-        void SetAtBoot( TBool aAtBoot);
-
-        /**
-        * Fetch product model and sw version
-        * @since 2.0
-        * @return void
-        */ 
-        void FetchProductModelAndSwVersionL();
-
-
-        /**
-        * Exit application. The implementation depends on the platform.
-        * On 3.0 a short delay is needed on exit because dialogs do not release
-        * all resources when ExecuteLD function completes. The delay is needed
-        * since the app panics on exit if all resources has not been freed.
-        */ 
-        void DelayedExit();
-
-    public: //Functions from base classes
-
-        /**
-        * TimerExpired function was replaced by TimeOutCallBack
-        * after replacing class CCMTimer with CPeriodic. Calls DoTimeOutCallBack.
-        * @return TInt KErrNone in case everything was Ok.
-        */
-        static TInt TimeOutCallBack( TAny* aCCMAppUi );
-
-        /**
-        * The functionality from TimerExpired function was moved here
-        */
-        void DoTimeOutCallBackL();
-
-        /**
-        Starts a time-out period of aTimeOut micro seconds. Calls TimeOutCallBack
-        after that.
-        */
-        void StartTimeOut( const TInt aTimeOut );
-
-        /**
-        * From MCMSocketsEngineNotifier notifies the connection result
-        * @since 2.0
-        * @param aErrorCode error code of the connection test
-        * @return void
-        */    
-        void ConnectionResultL( TInt aErrorCode );
-        
-        /**
-        * A method for CCMSocketEngine to tell that a unhandled
-        * leave has occurred during it's RunL handling.
-        * Displays a Unknown Error note
-        * @param aErrorCode the errorcode of the unhandled leave
-        * @return voi
-        */
-        void UnhandledLeave( TInt aErrorCode );
-
-        /**
-        * From MCMRegisterationStatusNotifier
-        * @param aNetworkStatus
-        */
-        void RegistrationMonitoringDoneL( CCMRegistrationMonitor::TNetworkStatus aNetworkStatus );
-
-        /**
-        * From MCMRegisterationStatusNotifier
-        * @param aStatus 
-        * @param aError
-        */
-        void RegistrationReportErrorL( const CCMRegistrationMonitor::TMonitoringStatus aStatus, const TInt aError );
-
-        /**
-        * From CEikAppui
-        * Handles commandline params
-        * @since 2.0
-        * @param aCommand see sdk help
-        * @param aDocumentName see sdk help
-        * @return void
-        */    
-        TBool ProcessCommandParametersL( TApaCommand aCommand, TFileName& aDocumentName );
-
-        /**
-        * From CEikAppui
-        * Handles commandline params
-        * @since 2.0
-        * @param aCommand see sdk help
-        * @param aDocumentName see sdk help
-        * @param aTail see sdk help
-        * @return void
-        */    
-        TBool ProcessCommandParametersL( TApaCommand aCommand, TFileName& aDocumentName, const TDesC8& aTail );
-
-        /**
-        * takes care of wait dialog command handling.
-        * @since 2.0
-        * @param aCommand command
-        * @return void
-        */
-        void WaitDialogDismissedL( TInt aButtonId );
-
-    public: // from MMiniBrowserObserver
-
-        /**
-        Called after MiniBrowser has handled a request for an URL
-        (a call to HttpGetL successfully done)
-        */      
-        void MiniBrowserRequestDoneL();
-
-        /**
-        Called if RunL of CMiniBrowser leaves.
-        @param aError The leave code.
-        */      
-        void MiniBrowserErrorL( const TInt aError );
-
-        /**
-        Called if a call to MiniBrowserRequestDoneL or MiniBrowserErrorL leaves
-        @param aError The leave code
-        */      
-        void MiniBrowserUnhandledLeave( const TInt aError );
-
-    public: // from MCoeForegroundObserver
-        void HandleGainingForeground();
-        void HandleLosingForeground();
-        
-    public: // from MCMDialogStatusNotifier
-        void CommonDialogDismissedL( const CCMDialogMonitor::TDialogMode aDialog, const TInt aStatusCode );
-
-    private: // Functions from base classes
-        
-
-        /**
-        * Checks if network connections are allowed. The current implementation
-        * checks the value of KCoreAppUIsNetworkConnectionAllowed central 
-        * repository key in KCRUidCoreApplicationUIs.
-        * @return TBool ETrue if network connections are allowed
-        */    
-        TBool IsNetworkConnectionsAllowedL();
-
-        /**
-        * From MEikMenuObserver takes care of menu handling.
-        * @since 2.0
-        * @param aResourceId resourceid
-        * @param aMenuPane menu
-        * @return void
-        */    
-        void DynInitMenuPaneL( TInt aResourceId, CEikMenuPane* aMenuPane );
-
-        /**
-        * From CEikAppUi takes care of command handling.
-        * @since 2.0
-        * @param aCommand command
-        * @return void
-        */
-        void HandleCommandL( TInt aCommand );
-
-        /**
-        * From CEikAppUi handles key events.
-        * @since 1.0
-        * @param aKeyEvent key event
-        * @param aType event type code
-        * @return Response code (EKeyWasConsumed, EKeyWasNotConsumed).
-        */
-        virtual TKeyResponse HandleKeyEventL
-            (
-            const TKeyEvent& aKeyEvent, TEventCode aType 
-            );
-
-        /**
-        For storing an integer value.
-        */
-        TInt StoreIntValue( const TUint32 aCrKey, const TInt aValue );
-
-        /**
-        For storing a string value.
-        */
-        TInt StoreStringValue( const TUint32 aCrKey, const TDesC& aValue );
-
-        /**
-        For restoring an integer value that was stored by using StoreIntValue.
-        */
-        TInt GetIntValue( const TUint32 aCrKey, TInt& aValue );
-
-        /**
-        For restoring a string value that was stored by using StoreStringValue.
-        */
-        TInt GetStringValue( const TUint32 aCrKey, TDes& aValue );
-
-        /**
-        Appends the domain to be used for redirecting browser (for example
-        www.help-portal.com)
-        @param aUrl The descriptor the domain is appended to.
-        */
-        void AppendDomainL( TDes& aUrl );
-        
-        /**
-        Clear Service Activation Information if there are any, online support should not read
-        */
-        void DeleteServiceActivationInfoL();
-        
-        /**
-        Append Token And Nonce Value to WAPPage
-        */
-        void AppendTokenAndNonceValL();
-        
-        /**
-        Append Device Information to URL
-        */
-        void AppendDeviceInfoL();
-        
-        /**
-        Create Minibrowser and Launch
-        */
-        void LaunchMiniBrowserL();
-        
-        /*
-        Launch s60 Web browser using command line parameters
-        */
-        void LaunchS60WebBrowserL();
-        
-        /*
-        Append parameters to URL required from Server
-        */
-        void AppendWebUtilParamsL(); 
-        
-        /*
-        Create Online Help for settings based on Autostart value
-        Can be either Silent or Non Silent.
-        In case of Silent settings are downloaded settings silently
-        connecting to browser in background
-        In case of Non-Silent Browser will be opened with display of
-        webpage where user can select settings based on his wish
-        */
-        void OnlineHelpL();
-
-    private:
-        /**
-        * By default EPOC constructor is private.
-        */
-        void ConstructL();
-
-    private: //Data
-        
-        // RegistrarionMonitor
-        CCMRegistrationMonitor* iRegistrationMonitor;
-        // Sockets engine
-        CCMSocketsEngine* iEngine;
-        // Timer
-        CPeriodic* iTimer;
-        // WAP page address
-        TBuf <KMaximumLengthOfWapAddress> iWapPage;
-        // if this is true the application has changed the preferences
-        TBool iPreferencesChanged;
-        // If this is true the phone is in homenetwork
-        TBool iNetworkStatusOk;
-        // This is set to true if the phone has been started before while it 
-        //hasn't been registered to it's homenetwork and now the phone has 
-        //been started in the homenetework.
-        TBool iFirstStartInHomeNetwork;
-        // if this is true the application knows that the confirmation dialog will be showed
-        TBool iShowConfirmation;
-        /** Id for the current AccessPoint this id refers to the WAP_ACCESS_POINT table. */
-        TUint32 iAccessPoint;
-        // Application status
-        TApplicationStatus iApplicationStatus;
-        // This is for the initAccess
-        TBool iInitAccessPointUsed;
-
-        // Connection reason (EConnectReasonUnknown if not started with parameters)
-        TConnectReason iConnectReason;
-        // Page string (http://<server>.help-portal.com/)
-        TBuf<KMaxServerString> iServer;
-        // Page string (http://server.help-portal.com/<page>)
-        TBuf<KMaxPageString> iPage;
-        // SW version
-        TBuf<KSysUtilVersionTextLength>    iSwVersion;
-        // Product model
-        TBuf<KSysUtilVersionTextLength>    iProductModel;
-        // Query string
-        TBuf<KMaxQueryString> iQuery;        
-
-        // Tells by which AP the connection is tried, so that the state machine in
-        //   TimerExpired can try the next AP if the current did not work
-        TConnectingVia iConnectingVia;
-        // The number to show in wait dialog
-        TInt iWaitDialogProgressVal;
-        
-        // Last configured IMSI from ini file
-        RMobilePhone::TMobilePhoneSubscriberId iLastConfIMSI;
-
-        CCMRegistrationMonitor::TNetworkStatus iNetworkStatus;
-
-        /** Tells if the application was started in auto start (quiet) mode */
-        TBool iAutoStart;
-        /** Tells if we should override need for initAccess in order to use TOKEN (TokenOverride).
-        set to ETrue to append TOKEN and tValid parameters even if not using initAccess */
-        TBool iTokenOverride;
-        /** Tells if we started Browser (needed in considering whether a long exit delay is needed) */
-        TBool iStartingBrowser;
-
-        CRepository* iRepository;
-        
-        /*!
-        Note that iMiniBrowser must have an opened RSocketServ handle and an
-        opened and started RConnection handle until it is destroyed. This means
-        that it has to be deleted after iEngine (iMiniBrowser uses the RSocketServ
-        and RConnection handles of iEngine).
-        */
-        CMiniBrowser* iMiniBrowser;
-
-        CCMDialogMonitor* iCommonDialogMonitor;
-        /*!
-        To prevent infinite redirects in silent mode
-        */
-        TInt iRedirectsLeft;
-        
-        CAknGlobalConfirmationQuery* iGlobalConfirmationQuery;
-        CAknGlobalNote* iGlobalWaitNote;
-        TInt iWaitNoteId;
-        TInt iInitAccessOn;
-    };
-
-#endif  // CCMAPPUI_H
-
-// End of File
--- a/pnpmobileservices/pnpms/OnlineSupport/inc/CCMApplication.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,76 +0,0 @@
-/*
-* Copyright (c) 2003 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:  Header file for Application class.
-*
-*/
-
-
-
-
-#ifndef CCMAPPLICATION_H
-#define CCMAPPLICATION_H
-
-//  INCLUDES
-#include <aknapp.h>
-
-// CONSTANTS
-const TUid KUidConfigurationManager = { 0x10204338 }; // UID of the application
-
-
-// MACROS
-// None
-
-// DATA TYPES
-// None
-
-// FUNCTION PROTOTYPES
-// None
-
-// FORWARD DECLARATIONS
-// None
-
-// CLASS DECLARATION
-// None
-
-/**
-*  Application class.
-*  Provides factory to create concrete document object.
-*
-*  @lib ConfManager.app
-*  @since 2.0
-*/
-
-class CCMApplication : public CAknApplication
-    {
-    private: // Functions from base classes
-        
-        /**
-        * From CApaApplication Creates COCDocument document object.
-        * @since 2.0
-        * @return pointer to created document.
-        */
-        CApaDocument* CreateDocumentL();
-
-        /**
-        * From CApaApplication Returns application's UID.
-        * @since 2.0
-        * @return KUidConfigurationManager
-        */
-        TUid AppDllUid() const;
-    };
-
-#endif // CCMAPPLICATION_H
-
-// End of File
-
--- a/pnpmobileservices/pnpms/OnlineSupport/inc/CCMDocument.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +0,0 @@
-/*
-* Copyright (c) 2003 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 file contains the header file of the CCMDocument object.
-*
-*/
-
-
-
-#ifndef CCMDOCUMENT_H
-#define CCMDOCUMENT_H
-
-// INCLUDES
-#include <AknDoc.h>
-
-// CONSTANTS
-// None
-
-// MACROS
-// None
-
-// DATA TYPES
-// None
-
-// FUNCTION PROTOTYPES
-// None
-
-// FORWARD DECLARATIONS
-class  CEikAppUi;
-
-
-// CLASS DECLARATION
-
-/**
-*  CCMDocument application class.
-*
-*  @lib ConfManager.app
-*  @since 2.0
-*/
-
-class CCMDocument : public CAknDocument
-    {
-    public: // Constructors and destructor
-
-        /**
-        * EPOC default constructor.
-        */
-        CCMDocument( CEikApplication& aApp );
-
-        /**
-        * Destructor.
-        */
-        virtual ~CCMDocument();
-
-    private: // Functions from base classes
-
-        /**
-        * From CEikDocument Creates CCMAppUi object.
-        * @since 2.0
-        * @return Pointer to CEikAppUi object
-        */
-        CEikAppUi* CreateAppUiL();
-        
-   };
-
-#endif  // CCMDOCUMENT_H
-
-// End of File
-
--- a/pnpmobileservices/pnpms/OnlineSupport/inc/CCMRegistrationMonitor.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,199 +0,0 @@
-/*
-* Copyright (c) 2003-2006 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:  Header file for the registeration monitor class, This class is 
-*                is used to monitor the registeration status between the phone 
-*                and network.
-*
-*/
-
-
-
-#ifndef CCMREGISTRATIONMONITOR_H
-#define CCMREGISTRATIONMONITOR_H
-
-//  INCLUDES
-#include <e32base.h>
-#include <etelmm.h>
-
-// CONSTANTS
-//None
-
-// MACROS
-// None
-
-// DATA TYPES
-// None
-
-// FUNCTION PROTOTYPES
-// None
-
-// FORWARD DECLARATIONS
-class MCMRegisterationStatusNotifier;
-
-// CLASS DECLARATION
-
-/**
-*  CCMRegistrationMonitor.
-*  Monitors the registeration status of the phone
-*
-*  @lib Confmanager.app
-*  @since 2.0
-*/
-class CCMRegistrationMonitor : public CActive
-    {
-    public:  // Constructors and destructor
-        /**
-        * Registeration status.
-        */
-        enum TNetworkStatus 
-            {
-            EStatusUnknown = 0,
-            EHomenetwork,
-            ERoaming,
-            ERequestCancelled
-            };
-
-        enum TMonitoringStatus
-            {
-            EInactive = 0,
-            ERequestingNetworkStatus,
-            EWaitingForChangesInNetworkStatus,
-            ERequestingServiceProviderName,
-            ERequestingHomeNetworkInfo,
-            ERequestingCurrentNetworkInfo,
-            ERequestingOwnNumberInfo,
-            ERequestingPhoneIdentity,
-            ERequestingIMSI,
-            EDone
-            };
-
-        /**
-        * Two-phased constructor.
-        */
-        static CCMRegistrationMonitor* NewL( MCMRegisterationStatusNotifier& aNotifier );
-        
-        /**
-        * Destructor.
-        */
-        ~CCMRegistrationMonitor();
-
-    public: // New functions
-            
-
-        /**
-        * StartMonitoring.
-        * @since 2.0
-        * @return void
-        */
-        void StartMonitoring( );
-        
-        /**
-        * StopMonitoring.
-        * @since 2.0
-        * @return void
-        */
-        void StopMonitoring( );
-
-    public: // Functions from base classes
-        
-    protected:  // New functions
-
-    protected:  // Functions from base classes
-
-    private: // Functions from base classes
-        
-        /**
-        * From CActive Handles an active object’s request completion event.
-        * @since 2.0
-        * @return void
-        */
-        void RunL();
-        
-        /**
-        * From CActive Cancels any outstanding request.
-        * @since 2.0
-        * @return void
-        */
-        void DoCancel();
-
-        /**
-        * From CActive Handles a leave occurring in the request completion event handler RunL().
-        */
-        TInt RunError( TInt aError );
-    private:
-
-        /**
-        * C++ default constructor.
-        */
-        CCMRegistrationMonitor( MCMRegisterationStatusNotifier& aNotifier );
-
-        /**
-        * By default Symbian 2nd phase constructor is private.
-        */
-        void ConstructL();
-    
-    public:     // Data
-        TBool IsReady(){ return iMonitoringStatus == EDone; };
-        RMobilePhone::TMobilePhoneNetworkInfoV1 GetHomeNetworkInfo(){ return iHomeNetworkInfo; };
-        RMobilePhone::TMobilePhoneNetworkInfoV1 GetCurrentNetworkInfo(){ return iCurrentNetworkInfo; };
-        RMobileONStore::TMobileONEntryV1 GetOwnNumberInfo(){ return iOwnNumberInfo; };
-        RMobilePhone::TMobilePhoneSubscriberId GetImsi(){ return iIMSI; };
-        RMobilePhone::TMobilePhoneServiceProviderNameV2 GetServiceProviderName(){ return iServiceProviderName; };
-        RMobilePhone::TMobilePhoneIdentityV1 GetPhoneIdentity(){ return iPhoneIdentity; };
-    protected:  // Data        
-
-    private:    // Data
-        TMonitoringStatus iMonitoringStatus;
-        MCMRegisterationStatusNotifier& iNotifier;
-
-        // Telephony Server
-        RTelServer iServer;
-        // Phone Object
-        RMobilePhone iPhone;
-        // Network registeration status
-        RMobilePhone::TMobilePhoneRegistrationStatus iRegisterationStatus;
-        // Phone info object
-        RTelServer::TPhoneInfo iPhoneInfo;
-        // Time when the monitor is started
-        TTime iStartTime;
-        // Current network info packaged
-        RMobilePhone::TMobilePhoneNetworkInfoV1 iCurrentNetworkInfo;
-        RMobilePhone::TMobilePhoneNetworkInfoV1Pckg iCurrentNetworkInfoPckg;
-        // Home network info packaged
-        RMobilePhone::TMobilePhoneNetworkInfoV1 iHomeNetworkInfo;
-        RMobilePhone::TMobilePhoneNetworkInfoV1Pckg iHomeNetworkInfoPckg;
-        RMobileONStore iONStore;
-        // Own number 
-        RMobileONStore::TMobileONEntryV1 iOwnNumberInfo;
-        RMobileONStore::TMobileONEntryV1Pckg iOwnNumberInfoPckg;
-        // IMSI
-        RMobilePhone::TMobilePhoneSubscriberId iIMSI;
-        // sp name
-        RMobilePhone::TMobilePhoneServiceProviderNameV2 iServiceProviderName;
-        RMobilePhone::TMobilePhoneServiceProviderNameV2Pckg iServiceProviderNamePckg;
-
-        // to get IMEI
-        RMobilePhone::TMobilePhoneIdentityV1 iPhoneIdentity;
-
-    public:     // Friend classes
-        
-    protected:  // Friend classes
-        
-    private:    // Friend classes
-
-    };
-
-#endif      // CCMREGISTRATIONMONITOR_H   
-            
-// End of File
--- a/pnpmobileservices/pnpms/OnlineSupport/inc/CCMSocketsEngine.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,249 +0,0 @@
-/*
-* Copyright (c) 2003-2006 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:  Socket engine class used for the DNS query
-*
-*/
-
-
-
-#ifndef CCMSOCKETSENGINE_H
-#define CCMSOCKETSENGINE_H
-
-//  INCLUDES
-#include <e32base.h>
-#include <es_sock.h>
-#include <http/mhttptransactioncallback.h>
-#include <http/rhttpsession.h>
-#include <http/rhttptransaction.h>
-
-// CONSTANTS
-const TInt KMaximumLengthOfAddress = 100;
-
-// MACROS
-// None
-
-// DATA TYPES
-// None
-
-// FUNCTION PROTOTYPES
-// None
-
-// FORWARD DECLARATIONS
-// None
-
-// CLASS DECLARATION
-class MCMSocketsEngineNotifier;
-
-/**
-*  Sockets engine class 
-*  Used to test the DNS connection 
-*
-*  @lib Confmanager.app
-*  @since 2.0
-*/
-class CCMSocketsEngine :
-    public CActive,
-    public MHTTPTransactionCallback
-    {
-    public:  // Constructors and destructor
-        
-        enum TEngineStatus 
-            {
-            EStatusUnknown,
-            EStatusConnecting,
-            EStatusResolving,
-            EStatusMakingHttpHeadRequest,
-            EStatusReady
-            };
-        /**
-        * Two-phased constructor.
-        */
-        static CCMSocketsEngine* NewL( MCMSocketsEngineNotifier& aNotifier);
-        
-        /**
-        * Destructor.
-        */
-        ~CCMSocketsEngine();
-
-    public: // New functions
-
-        /**
-        * Starts the DNS query
-        * @since 2.0
-        * @param aAp the access point id to use for the connection
-        * @param aAddress address 
-        */
-        void ConnectL( TUint32 aAp, const TDesC& aAddress );
-
-        /**
-        * Starts the DNS query
-        * @since 2.0
-        * @param aAp the access point id to use for the connection
-        * @param aAddress address 
-        */
-        void ConnectL( const TDesC& aAddress );
-        
-        /**
-        * Ends the DNS query
-        * @since 2.0
-        */
-        void Disconnect( );
-
-        /**
-        * Sets the value for the iLeaveOpen
-        * @since 2.0
-        */
-        void SetOpen( TBool aOpen );
-
-        const TDesC& ProxyIp(){ return *iProxyIp; };
-        const TInt ProxyPort(){ return iProxyPort; };
-        const TUint32 IapId(){ return iIapId; };
-        const TBool ProxyDefined(){ return iProxyIp->Length() > 0; };
-
-        /*!
-        @return iSocketServ
-        */
-        RSocketServ& SocketServ(){ return iSocketServ; };
-
-        /*!
-        @return iConnection
-        */
-        RConnection& Connection(){ return iConnection; };
-        
-	/*!
-        @return IAPID
-        */
-
-        TUint32 ReturnIAPID();
-
-    public: // from MHTTPTransactionCallback
-
-        /*!
-        Called when the filter's registration conditions are satisfied
-        for events that    occur on a transaction.    Note that this function
-        is not allowed to leave if called with certain events
-        */
-        void MHFRunL( RHTTPTransaction aTransaction, const THTTPEvent &aEvent );
-        /*!
-        Called when RunL leaves from a transaction event. This works
-        in the same way as CActve::RunError; return KErrNone if you
-        have handled the error. If you don't completely handle the
-        error, a panic will occur.
-        */
-        TInt MHFRunError( TInt aError, RHTTPTransaction aTransaction, const THTTPEvent& aEvent );
-
-    protected:  // New functions
-        
-        
-
-    protected:  // Functions from base classes
-        
-       
-
-    private: // Functions from base classes
-        
-        /**
-        * From CActive Handles an active object’s request completion event.
-        * @since 2.0
-        * @return void
-        */
-        void RunL();
-
-        /**
-        * From CActive  Cancels any outstanding request
-        * @return void
-        */
-        void DoCancel();
-
-        /**
-        * From CActive  Cancels any outstanding request
-        * @return TInt should be always KErrNone
-        */
-        TInt RunError(TInt aError);    
-
-    private:
-
-        /**
-        * C++ default constructor.
-        */
-        CCMSocketsEngine( MCMSocketsEngineNotifier& aNotifier);
-
-        /**
-        * By default Symbian 2nd phase constructor is private.
-        */
-        void ConstructL();
-
-        void MakeHttpHeadRequestL( const TDesC& aProxyAddress, const TUint aProxyPort );
-        TBool CheckForProxyL( const TUint32 aIapId );
-    public:     // Data
-        
-    protected:  // Data
-        
-
-    private:    // Data
-        /*! Interface to UI class */
-        MCMSocketsEngineNotifier& iSocketsEngineNotifier; 
-        // Socket server
-        RSocketServ iSocketServ;
-        //  host name resolution (DNS)
-        RHostResolver iResolver;
-        /*! Connection */
-        RConnection iConnection;
-        /*! Connection open flag */
-        TBool iConnectionOpen;
-        // Name entry for the resolver
-        TNameEntry iNameEntry;
-        // if This is true then the iResolver exsists
-        TBool iResolverExsists;
-        // Status of the engine
-        TEngineStatus iEngineStatus;
-        // address to be resolved
-        TBuf <KMaximumLengthOfAddress> iWapPage;
-        // If this is true then the connection will be left open after the engine is deleted
-        TBool iLeaveOpen;
-        // if this is true then the connection exsists
-        TBool iConnectionExsists;     
-        /*! Proxy IP, empty descriptor for none */
-        HBufC* iProxyIp;
-        /*! Proxy port, 0 for none */
-        TInt iProxyPort;
-        /*! Tells if there is a proxy defined for the current AP */
-        TBool iProxyDefined;
-
-        /*! Http session */
-        RHTTPSession iSession;
-        /*! Http session open flag */
-        TBool iHttpSessionOpen;
-        /*! String pool for http session */
-        RStringPool iSessionStringPool;
-        /*! Http transaction*/
-        RHTTPTransaction iTransaction;
-        /*! Http transaction open flag */
-        TBool iTransactionOpen;
-
-        /** Id for the current AccessPoint this id refers to the WAP_IAP table.*/
-        TUint32 iIapId;
-
-    public:     // Friend classes
-            
-    protected:  // Friend classes
-        
-    private:    // Friend classes
-        
-
-    };
-
-#endif      // CCMSocketsEngine_H   
-            
-// End of File
--- a/pnpmobileservices/pnpms/OnlineSupport/inc/DeviceParameterDefs.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,93 +0,0 @@
-/*
-* Copyright (c) 2005-2006 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:  Definitions for device parameter names and values
-*
-*/
-
-
-#ifndef DEVICE_PARAMETER_DEFS_H
-#define DEVICE_PARAMETER_DEFS_H
-
-#include <e32base.h>
-
-// Delimeter for URL parameters
-_LIT( KParameterDelimeter,"&" );
-_LIT( KQuestionMark,"?" );
-_LIT( KParenthesisOpen, "(");
-_LIT( KParenthesisClose, ")");
-_LIT( KSpace," " );
-
-// Version parameter
-_LIT( KPnpVersionParameter,"cVersion=" );
-
-// Query parameter
-_LIT( KQueryParameter, "hQuery=" );
-
-// Sim MMC parameter
-_LIT( KSimMccParameter,"MCC=" );
-
-// Sim MNC parameter
-_LIT( KSimMncParameter,"MNC=" );
-
-// current MMC parameter
-_LIT( KCurrentMccParameter,"cMCC=" );
-
-// current MNC parameter
-_LIT( KCurrentMncParameter,"cMNC=" );
-
-// Token related parameters parameter
-_LIT( KTokenParameter,"TOKEN=" );
-_LIT( KTokenValidityTimeParameter,"tValid=" );
-
-// PKI related parameters
-_LIT( KNonceParameter,"Nonce=" );
-_LIT( KKeyInfoParameter,"Key=" );
-
-// Connection reason parameter
-_LIT( KConnectReasonParameter,"cReason=" );
-
-// Operator name (from SIM)
-_LIT( KOperatorNameParameter,"Oper=" );
-
-// Current Operator name
-_LIT( KCurrentOperatorNameParameter,"cOper=" );
-
-// Preferred language
-_LIT( KLanguageParameter, "Lang=" );
-
-// MSISDN parameter
-_LIT( KMSISDNParameter, "MSISDN=" );
-
-// User Agent profile
-_LIT( KUAProfParameter, "UAProf=" );
-
-// Device type parameter
-_LIT( KDeviceTypeParameter,"dType=" );
-_LIT( KSymbianOs, "Symbian%20" ); // Url encoded format
-
-_LIT(KSW, "SW=" );
-_LIT(KHW, "HW=" );
-
-// AutoStart (silent mode) parameters
-_LIT( KInteractiveSessionParameter, "iActive=" );
-_LIT( KInteractiveSession, "1" );        // the client can display markup pages (this is the default). 
-_LIT( KNonInteractiveSession, "0" );    // non-interactive provisioning operation is expected
-
-// IMEI
-//_LIT( KImei, "DeviceId=" );
-
-_LIT( KPhoneAlias, "dAlias=" );
-_LIT( KPhoneAliasValue, "NOKIA6600" );
-
-#endif // DEVICE_PARAMETER_DEFS_H
--- a/pnpmobileservices/pnpms/OnlineSupport/inc/MCMRegisterationStatusNotifier.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +0,0 @@
-/*
-* Copyright (c) 2003-2006 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: Implementation of PnPMS components
-*
-*/
-
-
-
-
-#ifndef MCMREGISTERATIONSTATUSNOTIFIER_H
-#define MCMREGISTERATIONSTATUSNOTIFIER_H
-
-//  INCLUDES
-#include <e32base.h>
-#include <etelmm.h>
-#include "CCMRegistrationMonitor.h"
-
-// CONSTANTS
-// None
-
-// MACROS
-// None
-
-// DATA TYPES
-// None
-
-// FUNCTION PROTOTYPES
-// None
-
-// FORWARD DECLARATIONS
-// None
-
-// CLASS DECLARATION
-// None
-
-/**
-*  MCMRegisterationStatusNotifier.
-*
-*  @since 2.0
-*/
-class MCMRegisterationStatusNotifier
-    {
-    public:  // Constructors and destructor
-        
-    public: // New functions
-        /**
-        * @param aNetworkStatus
-        */
-        virtual void RegistrationMonitoringDoneL( CCMRegistrationMonitor::TNetworkStatus aNetworkStatus ) = 0;
-        /**
-        * @param aStatus 
-        * @param aError
-        */
-        virtual void RegistrationReportErrorL( const CCMRegistrationMonitor::TMonitoringStatus aStatus, const TInt aError ) = 0;
-    };
-
-#endif      // MCMREGISTERATIONSTATUSNOTIFIER_H  
-            
-// End of File
--- a/pnpmobileservices/pnpms/OnlineSupport/inc/MCMSocketsEngineNotifier.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,86 +0,0 @@
-/*
-* Copyright (c) 2003-2006 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:  Interface between the sockets engine and UI
-*
-*/
-
-
-
-
-#ifndef MCMSOCKETSENGINENOTIFER_H
-#define MCMSOCKETSENGINENOTIFER_H
-
-//  INCLUDES
-#include <e32base.h>
-
-// CONSTANTS
-// None
-
-// MACROS
-// None
-
-// DATA TYPES
-// None
-
-// FUNCTION PROTOTYPES
-// None
-
-// FORWARD DECLARATIONS
-// None
-
-// CLASS DECLARATION
-
-/**
-*  MCMSocketsEngineNotifier
-*  Notifier class 
-*
-*  @lib Configuration Manager application
-*  @since 2.0
-*/
-class MCMSocketsEngineNotifier
-    {
-    public:  // Constructors and destructor
-             
-    public: // New functions
-        
-        virtual void ConnectionResultL(TInt aErrorCode ) = 0;
-
-        virtual void UnhandledLeave( TInt aErrorCode ) = 0;
-        
-    public: // Functions from base classes
-    
-    protected:  // New functions
-        
-    protected:  // Functions from base classes
-        
-    private:
-
-    public:     // Data
-        
-    protected:  // Data
-        
-    private:    // Data
-        
-    public:     // Friend classes
-       
-    protected:  // Friend classes
-         
-    private:    // Friend classes
-         
-
-    };
-
-#endif      // MCMSOCKETSENGINENOTIFER_H   
-            
-// End of File
--- a/pnpmobileservices/pnpms/OnlineSupport/inc/MiniBrowser.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,258 +0,0 @@
-/*
-* Copyright (c) 2005-2006 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:  Header file CMiniBrowser class
-*
-*/
-
-
-#ifndef MINI_BROWSER_H
-#define MINI_BROWSER_H
-
-//  INCLUDES
-#include <http/mhttptransactioncallback.h>
-#include <http/mhttpdatasupplier.h>
-#include <http/rhttpsession.h>
-#include <http/rhttptransaction.h>
-
-
-#include "MiniBrowserObserver.h"
-#include "HttpProvStates.h"
-
-// FORWARD DECLARATIONS
-class CNHeadWrapperParser;
-    
-// CLASS DECLARATION
-
-/**
-*  CMiniBrowser class
-*
-*  @since 3.1?
-*/
-class CMiniBrowser :
-    public CBase,
-    public MHTTPTransactionCallback,
-    public MHTTPDataSupplier
-    {
-public:
-    enum TContentType
-        {
-        EContentTypeUnknown = 0,
-        EContentTypeTextPlain,
-        EContentTypeNokiaHeadWrapper
-        };
-    /**
-    Standard Symbian 2 phase constructor. The returned object is left
-    to the CleanupStack.
-    @param    aObserver Listens for events/errors
-    @param    aSocketServ RSocketServ. Note! This must be opened until
-            the CMiniBrowser object has been destroyed.
-    @param    aSocketServ RSocketServ. Note! This must be opened and
-            started until the CMiniBrowser object has been destroyed.
-    */      
-    static CMiniBrowser* NewLC( MMiniBrowserObserver& aObserver,
-        RSocketServ& aSocketServ, RConnection& aConnection );
-
-    /**
-    Standard Symbian 2 phase constructor.
-    @param aObserver Listens for events/errors
-    @param    aSocketServ RSocketServ. Note! This must be opened until
-            the CMiniBrowser object has been destroyed.
-    @param    aSocketServ RSocketServ. Note! This must be opened and
-            started until the CMiniBrowser object has been destroyed.
-    */      
-    static CMiniBrowser* NewL( MMiniBrowserObserver& aObserver, RSocketServ&
-        aSocketServ, RConnection& aConnection );
-
-    /**
-    * Destructor.
-    */      
-    virtual ~CMiniBrowser();
-
-    /**
-    Make a HTTP GET request to the url defined.
-    Use this override if the AP used does not have proxy defined.
-    @param aUri 
-    @param aProxyAddress Proxy server address.
-    @param aProxyPort Port to be used for proxy server
-    */      
-    void HttpGetL( const TDesC& aUri );
-
-    /**
-    Make a HTTP GET request to the url defined.
-    Use this override if the AP used has a proxy defined.
-    @param aUri 
-    @param aProxyAddress Proxy server address.
-    @param aProxyPort Port to be used for proxy server
-    */      
-    void HttpGetL( const TDesC& aUri, const TDesC& aProxyAddress,
-        const TUint aProxyPort );
-
-    /**
-    Returns the report URL that was in the previously received HeadWrapper document.
-    Leaves with KErrNotFound if there was no valid report url or no HeadWrapper document
-    has been received.
-    @return Report Url. Left to CleanupStack.
-    */
-    HBufC* GetReportUrlLC();
-
-private:
-    CMiniBrowser( MMiniBrowserObserver& aObserver );
-    void ConstructL( RSocketServ& aSocketServ, RConnection& aConnection );
-
-    /**
-    Called from HttpGetL.
-    @see HttpGetL
-    */
-    void CMiniBrowser::DoHttpGetL(
-        const TDesC& aUri,
-        const TBool aUseProxy,
-        const TDesC& aProxyAddress,
-        const TUint aProxyPort );
-
-
-public: // from MHTTPTransactionCallback
-
-    /*!
-    Called when the filter's registration conditions are satisfied
-    for events that    occur on a transaction.    Note that this function
-    is not allowed to leave if called with certain events
-    */
-    void MHFRunL( RHTTPTransaction aTransaction, const THTTPEvent &aEvent );
-    /*!
-    Called when RunL leaves from a transaction event. This works
-    in the same way as CActve::RunError; return KErrNone if you
-    have handled the error. If you don't completely handle the
-    error, a panic will occur.
-    */
-    TInt MHFRunError( TInt aError, RHTTPTransaction aTransaction,
-        const THTTPEvent& aEvent );
-
-public: // from MHTTPDataSupplier
-
-    /*!
-    Obtain a data part from the supplier. The data is guaranteed to
-    survive until a call is made to ReleaseData(). 
-    */
-    TBool GetNextDataPart( TPtrC8 &aDataPart );
-
-    /*!
-    Release the current data part being held at the data supplier.
-    This call indicates to the supplier that the part is no longer
-    needed, and another one can be supplied, if appropriate. 
-    */
-    void ReleaseData();
-
-    /*!
-    Obtain the overall size of the data being supplied, if known to
-    the supplier. Where a body of data is supplied in several parts
-    this size will be the sum of all the part sizes. If the size is
-    not known, KErrNotFound is returned; in this case the client must
-    use the return code of GetNextDataPart to find out when the data
-    is complete.
-    */
-    TInt OverallDataSize();
-
-    /*!
-    Reset the data supplier. This indicates to the data supplier that
-    it should return to the first part of the data. This could be used
-    in a situation where the data consumer has encountered an error and
-    needs the data to be supplied afresh. Even if the last part has
-    been supplied (i.e. GetNextDataPart has returned ETrue), the data
-    supplier should reset to the first part.
-
-    If the supplier cannot reset it should return an error code;
-    otherwise it should return KErrNone, where the reset will be
-    assumed to have succeeded 
-    */
-    TInt Reset();
-
-private:
-    /*
-    @return TInt KErrNone in case everything was Ok.
-    */
-    static TInt TimeOutCallBack( TAny* aMiniBrowser);
-    /*
-    Called by TimeOutCallBack
-    */
-    void DoTimeOutCallBackL();
-
-    /*!
-    Appends aData to iResponseData. If aData does not fit in, iResponseData
-    is reallocated.
-    */
-    void AppendResponseDataL( const TDesC8& aData );
-
-    /*!
-    Deletes and allocates an empty buffer for iResponseData and iReportUrl.
-    This is called from DoHttpGetL to prevent using same response data and
-    report url twice.
-    */
-    void ResetResponseDataL();
-
-    /**
-    Currently not supported
-    Shows the response text (from iResponseData) in a dialog. 
-    */
-//    void ShowMessageDialogL( const TDesC8& aMessage );
-
-    /**
-    Parses received data and saves provisioned settings if the data is a
-    HeadWrapper document.
-    */
-    void ParseAndSaveProvisionedSettingsL();
-
-    /**
-    Saves provisioned settings.
-    */
-    void SaveProvisionedSettingsL( const TDesC8& aContent );
-
-    /*!
-    Get special user agent string for ServiceHelp silent mode.
-    */
-    HBufC8* GetUserAgentStringL();
-
-    /*!
-    Get report Url from CNHeadWrapperParser and store it into iReportUrl
-    buffer for later reference.
-    */
-    void GetReportUrlL( const CNHeadWrapperParser& aNHwrParser );
-
-private:
-    /*! Time-out timer */
-    CPeriodic* iPeriodic;
-    /*! Observer is notified when transaction was successful or failed */
-    MMiniBrowserObserver& iObserver;
-    /*! Internet access point id */
-    TInt iIapId;
-    /*! buffer for URI */
-    HBufC8* iUri;
-    /*! buffer for received data */
-    HBufC8* iResponseData;
-    /*! buffer for report/next url parameter of received HeadWrapper document */
-    HBufC8* iReportUrl;
-    /*! The content type header value of the received data */
-    TContentType iContentType;
-    /*! Http session */
-    RHTTPSession iSession;
-    /*! String pool for http session */
-    RStringPool iSessionStringPool;
-    /*! Http transaction*/
-    RHTTPTransaction iTransaction;
-    /*! The status of last provisioning, default is EStatusUnknown */
-    THttpProvStates::TProvisioningStatus iProvisioningStatus;
-    };
-
-#endif  // MINI_BROWSER_H
-
-// End of File
--- a/pnpmobileservices/pnpms/OnlineSupport/inc/MiniBrowserObserver.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +0,0 @@
-/*
-* 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:  Header file CMiniBrowser class
-*
-*/
-
-
-
-#ifndef MINI_BROWSER_OBSERVER_H
-#define MINI_BROWSER_OBSERVER_H
-
-//  INCLUDES
-// None
-
-// CONSTANTS
-// None
-
-// MACROS
-// None
-
-// DATA TYPES
-// None
-
-// FUNCTION PROTOTYPES
-// None
-
-// FORWARD DECLARATIONS
-// None
-    
-// CLASS DECLARATION
-
-/**
-*  CMiniBrowser class
-*
-*  @since 3.1?
-*/
-class MMiniBrowserObserver
-    {
-    public:
-        /**
-        Called after MiniBrowser has handled a request for an URL
-        (a call to HttpGetL resulted a successful http request-response)
-        */
-        virtual void MiniBrowserRequestDoneL() = 0;
-
-        /**
-        Called if RunL of CMiniBrowser leaves.
-        @param aError The leave code.
-        */
-        virtual void MiniBrowserErrorL( const TInt aError ) = 0;
-
-        /**
-        Called if a call to MiniBrowserRequestDoneL or MiniBrowserErrorL leaves
-        @param aError The leave code
-        */
-        virtual void MiniBrowserUnhandledLeave( const TInt aError ) = 0;
-    };
-
-#endif  // MINI_BROWSER_OBSERVER_H
-
-// End of File
--- a/pnpmobileservices/pnpms/OnlineSupport/inc/OnlineSupport.hrh	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-/*
-* Copyright (c) 2003 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:  HRH-file for OnlineSupport application
-*
-*/
-
-
-#ifndef ONLINESUPPORT_HRH
-#define ONLINESUPPORT_HRH
-
-// DATA TYPES 
-
-enum TConfManagerCommandIds
-    {
-    EConfmSoftkeyOk = -5,
-    EConfmSoftkeyCancel = -6
-    };
-
-enum TConfManagerNoteControlIds
-    {
-    EConfmWaitNote = 0x100
-    };
-
-#endif      // ONLINESUPPORT
-
-// End of File
--- a/pnpmobileservices/pnpms/OnlineSupport/inc/OnlineSupportLogger.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,135 +0,0 @@
-/*
-* Copyright (c) 2003 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 file defines logging interface macros
-*
-*/
-
-
-#ifndef __LOGGER_H__
-#define __LOGGER_H__
-
-#ifdef _DEBUG
-    #define LOGGING_ENABLED
-#endif
-#ifdef LOGGING_ENABLED          // This must be enabled to use logging system
-
-#define LOGGER_LOGGING          // Log to Logger
-
-
-
-#ifdef LOGGER_LOGGING
-
-//  INCLUDES
-#include <flogger.h>
-
-// LOG SETTINGS 
-_LIT( KConfManagerLogFolder, "PnP" );
-_LIT( KConfManagerLogFile, "ServiceHelp.TXT" );
-
-#endif
-
-// CONSTANTS  
-// None.
-
-// MACROS
-/*
------------------------------------------------------------------------------
-
-    INTERNAL MACROs. 
-
-    DO NOT USE THESE DIRECTLY !!! 
-    SEE EXTERNAL MACROS
-
------------------------------------------------------------------------------
-*/
-
-#ifdef LOGGER_LOGGING
-
-
-#define INTRLOGTEXT( AAA )                                                                                        \
-    {                                                                                                            \
-    RFileLogger::Write( KConfManagerLogFolder(), KConfManagerLogFile(), EFileLoggingModeAppend, AAA );            \
-    }
-#define INTRLOGSTRING( AAA )                                                                                    \
-    {                                                                                                            \
-    _LIT( tempLogDes, AAA );                                                                                    \
-    RFileLogger::Write( KConfManagerLogFolder(), KConfManagerLogFile(), EFileLoggingModeAppend, tempLogDes() );    \
-    }
-#define INTRLOGSTRING2( AAA, BBB )                                                                                \
-    {                                                                                                            \
-    _LIT( tempLogDes, AAA );                                                                                    \
-    RFileLogger::WriteFormat( KConfManagerLogFolder(), KConfManagerLogFile(), EFileLoggingModeAppend, TRefByValue<const TDesC>( tempLogDes()), BBB ); \
-    }
-#define INTRLOGSTRING3( AAA, BBB, CCC )                                                                            \
-    {                                                                                                            \
-    _LIT( tempLogDes, AAA );                                                                                    \
-    RFileLogger::WriteFormat( KConfManagerLogFolder(), KConfManagerLogFile(), EFileLoggingModeAppend, TRefByValue<const TDesC>( tempLogDes()), BBB, CCC ); \
-    }
-#else
-#define INTRLOGTEXT( AAA )
-#define INTRLOGSTRING( AAA )
-#define INTRLOGSTRING2( AAA, BBB )
-#define INTRLOGSTRING3( AAA, BBB, CCC )
-#endif
-
-/*
------------------------------------------------------------------------------
-
-    EXTERNAL MACROs
-
-    USE THESE MACROS IN YOUR CODE !
-
------------------------------------------------------------------------------
-*/
-
-
-#define LOGTEXT( AAA )                { \
-                                    INTRLOGTEXT( AAA ); \
-                                    }   // Example: LOGTEXT( own_desc );
-
-#define LOGSTRING( AAA )            { \
-                                    INTRLOGSTRING( AAA ); \
-                                    }   // Example: LOGSTRING( "Test" );
-
-#define LOGSTRING2( AAA, BBB )        { \
-                                    INTRLOGSTRING2( AAA, BBB ); \
-                                    }  // Example: LOGSTRING( "Test %i", aValue );
-
-#define LOGSTRING3( AAA, BBB, CCC )    { \
-                                    INTRLOGSTRING3( AAA, BBB, CCC ); \
-                                    } // Example: LOGSTRING( "Test %i %i", aValue1, aValue2 );
-
-
-#else   // LOGGING_ENABLED
-
-#define LOGTEXT( AAA ) 
-#define LOGSTRING( AAA ) 
-#define LOGSTRING2( AAA, BBB )    
-#define LOGSTRING3( AAA, BBB, CCC )    
-
-#endif  // LOGGING_ENABLED
-
-// DATA TYPES
-// None.
-
-// FUNCTION PROTOTYPES
-// None.
-
-// FORWARD DECLARATIONS
-// None.
-
-// CLASS DECLARATION
-// None.
-
-#endif  // __LOGGER_H__
\ No newline at end of file
--- a/pnpmobileservices/pnpms/OnlineSupport/inc/OnlineSupportPrivateCRKeys.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-/*
-* Copyright (c) 2006 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:  Header file for OnlineSupport Private CR Keys
-*
-*/
-
-
-#ifndef ONLINESUPPORTPRIVATECRKEYS_H
-#define ONLINESUPPORTPRIVATECRKEYS_H
-
-const TUid    KCRUidConfigurationManager = {0x10204338};
-
-const TUint32 KOnlineSupportRoaming         = 0x00000000;
-const TUint32 KOnlineSupportHiddenEnabled   = 0x00000001;
-const TUint32 KOnlineSupportInitAccessOn   = 0x00000002;
-
-
-
-#endif      // ONLINESUPPORTPRIVATECRKEYS_H
--- a/pnpmobileservices/pnpms/OnlineSupport/inc/VersionStrings.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,197 +0,0 @@
-/*
-* Copyright (c) 2005-2006 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:  A helper class for reading Series 60 and Symbian OS versions
-*
-*/
-
-
-
-#ifndef VERSION_STRINGS_H
-#define VERSION_STRINGS_H
-
-//  INCLUDES
-#include <e32base.h>
-#include <sysutil.h>
-
-#include "OnlineSupportLogger.h"
-
-// CONSTANTS
-const TInt KMaxVersionBufLength(10);
-
-// MACROS
-// None
-
-// DATA TYPES
-typedef TBuf8<KMaxVersionBufLength> TVersionBuf;
-
-// FUNCTION PROTOTYPES
-// None
-
-// FORWARD DECLARATIONS
-// None
-    
-// CLASS DECLARATION
-
-/**
-*  CMiniBrowser class
-*
-*  @since 3.1?
-*/
-class TVersionStrings
-    {
-public:
-    /*!
-    Get the beging index and length of a token in the descriptor.
-    @param    aDescriptor
-    @param    aSeparator Token separator, for example 0xA for a line feed.
-    @param    aToken The token number, zero is the index of the first token.
-    @param    aMaxLength The maximum length of the token. If the token length is bigger
-            than aMaxLength the function leaves with KErrTooBig. Give KErrNotFound
-            to not to check the maximum length.
-    @param    aBegin On return contains the begin index of the token.
-            The value is unspecified if the function leaves.
-    @param    aLength On return contains the length of the token.
-            The value is unspecified if the function leaves.
-    */
-    static void TokenLocationL(
-        const TDesC& aDescriptor, const TChar aSeparator, const TInt aToken,
-        const TInt aMaxLength, TInt& aBegin, TInt& aLength )
-        {
-        LOGSTRING( "TokenLocationL" );
-
-        TInt locate = aDescriptor.Locate( aSeparator );
-        if( locate == KErrNotFound )
-            {
-            User::Leave( KErrNotFound );
-            }
-        
-        if( aToken )
-            {
-            // not the last row
-            TokenLocationL( aDescriptor.Right( aDescriptor.Length() - locate - 1 ),
-                aSeparator, aToken - 1, aMaxLength, aBegin, aLength );
-            aBegin = aBegin + locate + 1;
-            }
-        else
-            {
-            if( aMaxLength != KErrNotFound && locate > aMaxLength )
-                {
-                User::Leave( KErrTooBig );
-                }
-            // the last row
-            aBegin = 0;
-            aLength = locate;
-            }
-        LOGSTRING( "TokenLocationL - done" );
-        };
-
-    /*!
-    Gives Series 60 version and SymbianOS version based on product model.
-    Leaves with KErrCorrupt if the version strings could not be read.
-    @aS60Version On return contains Series 60 version, for example 2.6
-    @aSymbianVersion On return contains Symbian OS version, for example 8.1
-    */
-    static void GetUserAgentVersionsL( TVersionBuf& aS60Version, TVersionBuf& aSymbianVersion )
-        {
-        LOGSTRING( "GetUserAgentVersionsL" );
-
-        TBuf<KSysUtilVersionTextLength> versions;
-        TInt err = SysUtil::GetSWVersion( versions );
-        if( err != KErrNone )
-            {
-            User::Leave( KErrCorrupt );
-            }
-        LOGSTRING( "SW:" );
-        LOGTEXT( versions );
-
-
-        const TChar lineFeedChar( 0xA );
-        TInt begin(0);
-        TInt len(0);
-        // Since the Series 60 3.0 the Series 60 version is assumed to be in the SW version string
-        TRAP( err, TVersionStrings::TokenLocationL( versions, lineFeedChar, 2,
-            aS60Version.MaxLength(), begin, len ) );
-        if( err != KErrNone )
-            {
-            User::Leave( KErrCorrupt );
-            }
-        aS60Version.Copy( versions.Mid( begin, len ) );
-
-        GetSymbianOsVersionL( aS60Version, aSymbianVersion );
-        LOGSTRING( "S60:" );
-        LOGTEXT( aS60Version );
-        LOGSTRING( "Symbian OS:" );
-        LOGTEXT( aSymbianVersion );
-        LOGSTRING( "GetUserAgentVersionsL - done" );
-        }
-
-    /*!
-    Gives Series 60 version and SymbianOS version based on product model.
-    @aProduct Product, for example RM-1.
-    @aS60Version Series 60 version, for example 2.6
-    @aSymbianVersion On return contains Symbian OS version, for example 8.1
-    */
-    static void GetSymbianOsVersionL( const TDesC8& aS60Version, TVersionBuf& aSymbianVersion )
-        {
-        _LIT8( KSeries6020, "2.0");
-        _LIT8( KSeries6021, "2.1");
-        _LIT8( KSeries6026, "2.6");
-        _LIT8( KSeries6026m, "2.6m");
-        _LIT8( KSeries6028, "2.8");
-        _LIT8( KSeries6030, "S60-30");
-        _LIT8( KSeries6031, "S60-31");
-        _LIT8( KSeries6040, "S60-40");
-
-        _LIT8( KSymbianOS70s, "7.0s");
-        _LIT8( KSymbianOS80a, "8.0a");
-        _LIT8( KSymbianOS81a, "8.1a");
-        _LIT8( KSymbianOS91, "9.1");
-        _LIT8( KSymbianOS92, "9.2");
-        _LIT8( KSymbianOS9x, "9.x");
-
-        if( aS60Version.Compare( KSeries6040 ) == 0 )
-            {
-            aSymbianVersion.Copy( KSymbianOS9x );
-            }
-        else if( aS60Version.Compare( KSeries6031 ) == 0 )
-            {
-            aSymbianVersion.Copy( KSymbianOS92 );
-            }
-        else if( aS60Version.Compare( KSeries6030 ) == 0 )
-            {
-            aSymbianVersion.Copy( KSymbianOS91 );
-            }
-        else if( aS60Version.Compare( KSeries6028 ) == 0 )
-            {
-            aSymbianVersion.Copy( KSymbianOS81a );
-            }
-        else if( aS60Version.Compare( KSeries6026 ) == 0 || aS60Version.Compare( KSeries6026m ) == 0 )
-            {
-            aSymbianVersion.Copy( KSymbianOS80a );
-            }
-        else if( aS60Version.Compare( KSeries6021 ) == 0 || aS60Version.Compare( KSeries6020 ) == 0 )
-            {
-            aSymbianVersion.Copy( KSymbianOS70s );
-            }
-        else
-            {
-            User::Leave( KErrNotFound );
-            }
-        };
-
-    };
-
-#endif  // VERSION_STRINGS_H
-
-// End of File
--- a/pnpmobileservices/pnpms/OnlineSupport/inc/ccmdialogmonitor.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,145 +0,0 @@
-/*
-* Copyright (c) 2006 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:  Header file for dialog monitor
-*
-*/
-
-
-
-#ifndef CCMDIALOGMONITOR_H
-#define CCMDIALOGMONITOR_H
-
-//  INCLUDES
-#include <e32base.h>
-//#include <etelmm.h>
-
-// CONSTANTS
-//None
-
-// MACROS
-// None
-
-// DATA TYPES
-// None
-
-// FUNCTION PROTOTYPES
-// None
-
-// FORWARD DECLARATIONS
-//class MCMRegisterationStatusNotifier;
-class MCMDialogStatusNotifier;
-
-// CLASS DECLARATION
-
-/**
-*  CCMDialogMonitor.
-*  Monitors the dialog status
-*
-*  @lib Confmanager.app
-*  @since 2.0
-*/
-class CCMDialogMonitor : public CActive
-    {
-    public:  // Constructors and destructor
-        /**
-        * Registeration status.
-        */
-        enum TDialogMode
-            {
-            EConfirmation = 0,
-            EWait,
-            EError,
-            EUnknown
-            };
-
-        void SetDialogMode(TDialogMode aMode);
-        /**
-        * Two-phased constructor.
-        */
-        static CCMDialogMonitor* NewL( MCMDialogStatusNotifier& aNotifier );
-        
-        /**
-        * Destructor.
-        */
-        ~CCMDialogMonitor();
-
-    public: // New functions
-            
-
-        /**
-        * StartMonitoring.
-        * @since 2.0
-        * @return void
-        */
-        //void StartMonitoring( );
-        void Start();
-        
-        /**
-        * StopMonitoring.
-        * @since 2.0
-        * @return void
-        */
-        //void StopMonitoring( );
-
-    public: // Functions from base classes
-        
-    protected:  // New functions
-
-    protected:  // Functions from base classes
-
-    private: // Functions from base classes
-        
-        /**
-        * From CActive Handles an active object’s request completion event.
-        * @since 2.0
-        * @return void
-        */
-        void RunL();
-        
-        /**
-        * From CActive Cancels any outstanding request.
-        * @since 2.0
-        * @return void
-        */
-        void DoCancel();
-
-        /**
-        * From CActive Handles a leave occurring in the request completion event handler RunL().
-        */
-        //TInt RunError( TInt aError );
-    private:
-
-        /**
-        * C++ default constructor.
-        */
-        CCMDialogMonitor( MCMDialogStatusNotifier& aNotifier );
-
-        /**
-        * By default Symbian 2nd phase constructor is private.
-        */
-        void ConstructL();
-    
-    public:     // Data
-
-    protected:  // Data        
-
-    private:    // Data
-        TDialogMode iDialogMode;
-        MCMDialogStatusNotifier& iNotifier;
-
-    };
-
-#endif      // CCMDIALOGMONITOR_H   
-            
-// End of File
--- a/pnpmobileservices/pnpms/OnlineSupport/inc/mcmdialogstatusnotifier.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,71 +0,0 @@
-/*
-* Copyright (c) 2006 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: Implementation of PnPMS components
-*
-*/
-
-
-
-
-#ifndef MCMDIALOGSTATUSNOTIFIER_H
-#define MCMDIALOGSTATUSNOTIFIER_H
-
-//  INCLUDES
-#include <e32base.h>
-//#include <etelmm.h>
-#include "ccmdialogmonitor.h"
-
-// CONSTANTS
-// None
-
-// MACROS
-// None
-
-// DATA TYPES
-// None
-
-// FUNCTION PROTOTYPES
-// None
-
-// FORWARD DECLARATIONS
-// None
-
-// CLASS DECLARATION
-// None
-
-/**
-*  MCMDialogStatusNotifier.
-*
-*  @since 2.0
-*/
-class MCMDialogStatusNotifier
-    {
-    public:  // Constructors and destructor
-        
-    public: // New functions
-        /**
-        * @param aDialog
-        */
-        virtual void CommonDialogDismissedL( const CCMDialogMonitor::TDialogMode aDialog, const TInt aStatusCode ) = 0;
-
-        /**
-        * @param aStatus 
-        * @param aError
-        */
-        //virtual void RegistrationReportErrorL( const CCMRegistrationMonitor::TMonitoringStatus aStatus, const TInt aError ) = 0;
-    };
-
-#endif      // MCMREGISTERATIONSTATUSNOTIFIER_H  
-            
-// End of File
--- a/pnpmobileservices/pnpms/OnlineSupport/loc/OnlineSupport.loc	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-/*
-* Copyright (c) 2003-2006 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:  Localization strings for OnlineSupport
-*
-*/
-
-
-
-// LOCALISATION STRINGS
-
-// d: When the phone is started for the first time, following confirmation query is shown.
-// d: If user cancels the query startup is continued. If the user accepts the query,
-// d: Browser is launched and Plug and Play Mobile Services URL is loaded.
-// l: popup_note_window/opt2
-// r: 3.1
-#define qtn_op_pnp_query "Open Service Help for fetching phone settings?"
-
-// d: If opening browser and loading Plug and Play Mobile Services URL takes more than
-// d: 1 second, a wait note is displayed until the URL can be displayed in the Browser.
-// l: popup_note_wait_window
-// r: 3.1
-#define qtn_op_pnp_wait "Opening Service Help"
-
-// d: If Plug and Play Mobile Services URL cannot be loaded for some reason e.g.
-// d: incorrect Browser settings, an error note is displayed and startup is continued.
-// l: popup_note_window/opt2
-// r: 3.1
-#define qtn_op_pnp_error "Unable to open Service Help"
-
-
-// End of File
--- a/pnpmobileservices/pnpms/OnlineSupport/src/CCMAppUi.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2651 +0,0 @@
-/*
-* Copyright (c) 2003-2006 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 module contains the implementation of CCMAppUi class
-*                methods
-*
-*/
-
-
-// INCLUDE FILES
-#include <avkon.hrh>
-#include <apgcli.h>                     // for RApaLsSession
-#include <commdb.h>                     // for CCommsDatabase
-#include <cdbpreftable.h>               // for CCommsDbConnectionPrefTableView
-#include <AknGlobalNote.h>              // for CAknGlobalNote
-#include <AknGlobalConfirmationQuery.h> // for CAknGlobalConfirmationQuery
-#include <escapeutils.h>
-#include <etelmm.h>
-#include <textresolver.h>
-#include <sysutil.h>
-#include <httpfiltercommonstringsext.h>
-#include <OnlineSupport.rsg>            // has to be system include.
-#include <centralrepository.h>          // link against centralrepository.lib
-#include <BrowserUiSDKCRKeys.h>         // for KCRUidBrowser
-#include <CoreApplicationUIsSDKCRKeys.h>// for KCRUidCoreApplicationUIs
-//#include <BrowserUiInternalCRKeys.h>    //  BrowserUiSDKCRKeys.h file can replace this header file
-#include <WebUtilsInternalCRKeys.h>     // for the profile strings
-
-#include "OnlineSupportLogger.h"
-#include "CCMAppUi.h"
-#include "CCMRegistrationMonitor.h"
-#include "CCMSocketsEngine.h"
-#include "OnlineSupport.hrh"
-#include "PnpUtilImpl.h"
-#include "CCMDocument.h"
-#include "MiniBrowser.h"
-#include "DeviceParameterDefs.h"
-#include "VersionStrings.h"
-#include "OnlineSupportPrivateCRKeys.h" // Own central repository keys
-#include <PnpProvUtil.h>
-#include <aknnotewrappers.h>
-#include <StringLoader.h>
-
-// EXTERNAL DATA STRUCTURES
-// None
-
-// EXTERNAL FUNCTION PROTOTYPES  
-// None
-
-// CONSTANTS
-
-// UID of the application
-const TUid KUidConfigurationManager = { 0x10204338 }; 
-// TimeoutValue for the RegistrationMonitor,
-// Registration monitor itself has a time-out of 15 seconds
-const TInt KMonitoringTimeOut = 20000000;
-// TimeoutValue for the ConnectionTest
-const TInt KConnectionTimeOut = 35000000;
-// Timeout after the startupOperation will continue after ConstructL()
-const TInt KStartUpTimeOut = 20;
-
-// 0.1s Timeout for closing the app after the user has selected "Cancel" to
-// ConfirmationDialogL or to iWaitDialog.
-// See comments on TApplicationStatus (CCMAppUi.h)
-const TInt KExitTimeOut = 100000;
-
-_LIT( KInitAccess, "initAccess" );
-
-_LIT( KSlash,"/");
-
-// Help portal 
-_LIT(KHelpPortal,".help-portal.com");
-
-// Nokia
-_LIT( KServerNokia,"nokia" );
-_LIT( KNokia,"pnpms.nokia.com");
-
-// HTTP
-_LIT(KHttp, "http://");
-
-// Default server string
-_LIT(KDefaultServerString,"www");
-
-// Default page string
-_LIT(KDefaultPageString,"page1");
-
-_LIT( KMNC0, "mnc0" );
-_LIT( KMCC, "mcc" );
-_LIT( KGprs, "gprs" );
-_LIT( KDot, "." );
-
-const TInt KMaxAPNLength = 256;
-
-_LIT( KDefaultRoamingName, "PNP Default Roaming" );
-
-_LIT( KInitAccessRoamingName, "PNP InitAccess Roaming" );
-
-const TInt KMaxSilentModeRedirectCount(3);
-
-
-// MACROS
-// None
-
-// LOCAL CONSTANTS AND MACROS
-// None
-
-// MODULE DATA STRUCTURES
-// None
-
-// LOCAL FUNCTION PROTOTYPES
-// None
-
-// FORWARD DECLARATIONS
-// None
-
-// ============================= LOCAL FUNCTIONS ===============================
-// None
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-// -----------------------------------------------------------------------------
-// CCMAppUI::CCMAppUi
-// -----------------------------------------------------------------------------
-//
-CCMAppUi::CCMAppUi():
-    iAccessPoint(0),
-    iAutoStart( EFalse),
-    iTokenOverride( EFalse ),
-    iStartingBrowser( EFalse ),
-    iRedirectsLeft( KMaxSilentModeRedirectCount ),
-    iInitAccessOn(KErrNone)
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// CCMAppUi::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CCMAppUi::ConstructL()
-    {
-    LOGSTRING( "Enter to CCMAppUi::ConstrtuctL" );
-    // Send to background
-    BaseConstructL(ENoScreenFurniture);
-    TApaTaskList taskList( CEikonEnv::Static()->WsSession() );
-    TApaTask task = taskList.FindApp( KUidConfigurationManager );
-    task.SendToBackground();
-    
-    HideApplicationFromFSW();
-
-    iPreferencesChanged = EFalse;
-    iFirstStartInHomeNetwork = EFalse;
-    iNetworkStatusOk = EFalse; 
-    iNetworkStatus = CCMRegistrationMonitor::EStatusUnknown;
-    iApplicationStatus = EAppStatusInactive;
-    iInitAccessPointUsed = EFalse;
-    
-    iWaitDialogProgressVal = 1;
-
-    LOGSTRING( "BaseConstructOk" );
-    
-    //this->StatusPane()->SwitchLayoutL(R_AVKON_STATUS_PANE_LAYOUT_USUAL_EXT);
-    this->StatusPane()->MakeVisible( EFalse );
-
-    CEikonEnv::Static()->AddForegroundObserverL( *this );
-
-    TRAPD( err, iRepository = CRepository::NewL( KCRUidConfigurationManager ) );
-    if( err != KErrNone )
-        {
-        LOGSTRING2( "Central repository init: %i", err );
-        User::Leave( err );
-        }
-    err = GetIntValue(KOnlineSupportInitAccessOn,iInitAccessOn);
-    if( KErrNone == err && iInitAccessOn == KErrNone)
-    	{//Fetaure off
-    	iConnectingVia = EConnectingViaInit;
-    	}
-    else //feature off or Issue in reading cenrep key
-    	{
-    	iConnectingVia = EConnectingViaNull;
-    	}
-    // The default values; these might change later in ProcessCommandParametersL
-    SetServerString( KDefaultServerString );
-    SetPageString( KDefaultPageString );
-    SetConnectReason( EConnectReasonUnknown );
-
-    FetchProductModelAndSwVersionL();
-
-    iTimer = CPeriodic::NewL( CActive::EPriorityStandard );
-    iEngine = CCMSocketsEngine::NewL( *this );
-    iRegistrationMonitor = CCMRegistrationMonitor::NewL( *this );
-    iApplicationStatus = EAppStatusStartingUp;
-    LOGSTRING( "Exit from ConstructL()" );
-    }
-
-// -----------------------------------------------------------------------------
-// CCMAppUI::IsNetworkConnectionsAllowedL
-// -----------------------------------------------------------------------------
-//
-TBool CCMAppUi::IsNetworkConnectionsAllowedL()
-    {
-    LOGSTRING( "Enter to CCMAppUi::IsNetworkConnectionsAllowedL()" );
-    TBool networkConnectionsAllowed( EFalse );
-    TInt allowed(0);
-    CRepository* coreAppUisCr = CRepository::NewLC( KCRUidCoreApplicationUIs );
-    User::LeaveIfError( coreAppUisCr->Get( KCoreAppUIsNetworkConnectionAllowed, allowed ) );
-    CleanupStack::PopAndDestroy( coreAppUisCr );
-    if( allowed == ECoreAppUIsNetworkConnectionAllowed )
-        {
-        LOGSTRING( "ConnectionAllowed" );
-        networkConnectionsAllowed = ETrue;
-        }
-    else
-        {
-	// display dialog that operation that possible in offline mode
-   	HBufC* string = StringLoader::LoadLC( R_OFFLINE_MODE );
-        CAknGlobalNote* globalNote = CAknGlobalNote::NewL();
-        CleanupStack::PushL( globalNote );
-        globalNote->ShowNoteL( EAknGlobalErrorNote , *string );
-        CleanupStack::PopAndDestroy(2 );
-	}
-
-    LOGSTRING( "Exit from CCMAppUi::IsNetworkConnectionsAllowedL()" );
-    return networkConnectionsAllowed;
-    }
-
-// Destructor
-// -----------------------------------------------------------------------------
-// CCMAppUI::~CCMAppUi
-// -----------------------------------------------------------------------------
-//
-CCMAppUi::~CCMAppUi()
-    {
-    LOGSTRING( "Enter ~CCMAppUI" );
-
-    CEikonEnv::Static()->RemoveForegroundObserver( *this );
-
-    if (iTimer)
-        {
-        iTimer->Cancel();
-        }
-    delete iTimer;
-    LOGSTRING( "Timer deleted" );
-
-    if (iRegistrationMonitor)
-        {
-        iRegistrationMonitor->StopMonitoring();
-        }
-    delete iRegistrationMonitor;
-    LOGSTRING( "Monitor deleted" );
-
-    delete iRepository;
-
-    delete iMiniBrowser;
-    // Must be deleted after iMiniBrowser since iMiniBrowser uses RSocketServ and
-    // RConnection instances of iEngine
-    delete iEngine;
-    
-    if (iCommonDialogMonitor)
-        {
-        iCommonDialogMonitor->Cancel();
-        delete iCommonDialogMonitor;
-        }
-    if (iGlobalConfirmationQuery)
-        {
-        delete iGlobalConfirmationQuery;
-        }
-    if( iGlobalWaitNote )
-        {
-        //iGlobalWaitNote->CancelNoteL(iWaitNoteId);
-        delete iGlobalWaitNote;
-        }
-
-    LOGSTRING( "Exit ~CCMAppUI" );
-    }
-
-
-
-// -----------------------------------------------------------------------------
-// CCMAppUI::ConfirmationDialogL
-// Activates Confirmation dialog
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CCMAppUi::ConfirmationDialogL()
-    {
-    LOGSTRING("CCMAppUi::ConfirmationDialogL");
-    if( !iAutoStart ) 
-        {
-        HBufC* msgText = CEikonEnv::Static()->AllocReadResourceLC(
-            R_CONFMANAGER_CONFIRMATION ); 
-        
-        if (iCommonDialogMonitor)
-        {
-            iCommonDialogMonitor->Cancel();
-            delete iCommonDialogMonitor;
-            iCommonDialogMonitor = NULL;
-        }
-        // instantiate the active object CGlobalConfirmationObserver
-        iCommonDialogMonitor = CCMDialogMonitor::NewL( *this );
-        iCommonDialogMonitor->SetDialogMode( CCMDialogMonitor::EConfirmation );
-        // SetActive
-        iCommonDialogMonitor->Start();
-        // iGlobalConfirmationQuery is an instance of the global
-        // confirmation query class CAknGlobalConfirmationQuery.
-        // show the global confirmation query, set the iStatus variable
-        // of the active object as a parameter.
-        if (!iGlobalConfirmationQuery)
-            {
-            iGlobalConfirmationQuery = CAknGlobalConfirmationQuery::NewL();
-            }
-        
-        iGlobalConfirmationQuery->ShowConfirmationQueryL(
-            iCommonDialogMonitor->iStatus,
-            *msgText,
-            R_AVKON_SOFTKEYS_YES_NO__YES,
-            R_QGN_NOTE_QUERY_ANIM);
-            
-        CleanupStack::PopAndDestroy( msgText );
-        }
-    }
-
-
-// -----------------------------------------------------------------------------
-// CCMAppUI::ErrorNoteConnectionL()
-// Activates error note.
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CCMAppUi::ErrorNoteConnectionL()
-    {
-    LOGSTRING( "CCMAppUi::ErrorNoteConnectionL" );
-    if( !iAutoStart ) 
-        {
-        HBufC* msgText = CEikonEnv::Static()->
-            AllocReadResourceLC( R_CONFMANAGER_ERRORNOTE ); 
-
-        CAknGlobalNote* globalNote = CAknGlobalNote::NewL();
-        CleanupStack::PushL( globalNote );
-        globalNote->ShowNoteL( EAknGlobalErrorNote , *msgText );
-        CleanupStack::PopAndDestroy( 2 );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// CCMAppUI::ErrorNoteUnknownL
-// -----------------------------------------------------------------------------
-//
-void CCMAppUi::ErrorNoteUnknownL( TInt aError )
-    {
-    LOGSTRING2( "CCMAppUi::ErrorNoteUnknownL %i", aError );
-    if( !iAutoStart ) 
-        {
-        CTextResolver* textResolver = CTextResolver::NewLC();
-        TPtrC errMsg = textResolver->ResolveErrorString( aError );
-        HBufC* errMsgBuf = HBufC::NewLC( errMsg.Length() );
-        errMsgBuf->Des().Append( errMsg );
-
-        CAknGlobalNote* globalNote = CAknGlobalNote::NewL();
-        CleanupStack::PushL( globalNote );
-        globalNote->ShowNoteL( EAknGlobalErrorNote , *errMsgBuf );
-        
-        CleanupStack::PopAndDestroy( globalNote );
-        CleanupStack::PopAndDestroy( errMsgBuf );
-        CleanupStack::PopAndDestroy( textResolver );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// CCMAppUI::ProcessCommandParametersL
-// 2 params
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-TBool CCMAppUi::ProcessCommandParametersL( TApaCommand /*aCommand*/, TFileName& /*aDocumentName*/ )
-    {
-    LOGSTRING( "CCMAppUi::ProcessCommandParametersL 2 params" );
-    return( ETrue );
-    }
-
-// -----------------------------------------------------------------------------
-// CCMAppUI::ProcessCommandParametersL
-// 3 params
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-TBool CCMAppUi::ProcessCommandParametersL( TApaCommand /*aCommand*/, TFileName& /*aDocumentName*/, const TDesC8& aTail )
-    {
-    LOGSTRING( "CCMAppUi::ProcessCommandParametersL 3 params" );
-    LOGSTRING( "aTail:" );
-    LOGTEXT( aTail );
-    if( !IsNetworkConnectionsAllowedL() )
-        {
-        // network connections not allowed
-        LOGSTRING( "Network connections not allowed" );
-        //DelayedExit();
-        Exit();
-        return ETrue;
-        }
-
-    if( aTail.Length() == 0 )
-        {
-        LOGSTRING( "no params" )
-        }
-    else
-        {
-        // aTail is in 8-bit format, cast
-        // (The format was changed from 16-bit to 8-bit because of 3.0 porting;
-        // there is not CApaCommandLine::SetFullCommandLine in 3.0, SetTailEndL
-        // is used instead and it uses 8-bit format)
-        HBufC* paramsBuf = HBufC::NewLC( aTail.Length() );
-        TPtr paramsBufPtr = paramsBuf->Des();
-        paramsBufPtr.Copy( aTail );
-        TLex lexx( *paramsBuf );
-        TChar getchar;
-
-        for( ;; )
-            {
-            lexx.SkipSpace();
-            lexx.Mark();
-            TPtrC token = lexx.NextToken();
-
-            if( token.Length() == 0 )
-                {
-                LOGSTRING( "token length == 0");
-                break;
-                }
-            else if( token.Length() == 1 )
-                {
-                LOGSTRING( "token length == 1");
-                break;
-                }
-
-            // s"www"
-            // 012345
-
-            if( token[1] == '\"' && token[token.Length()-1] != '\"' )
-                {
-                do
-                    {
-                    getchar = lexx.Get();
-                    } while( (getchar != '\"') && (getchar != 0) );
-                token.Set( lexx.MarkedToken() );
-                }
-
-            LOGSTRING( "token:" );
-            LOGTEXT( token );
-
-            TChar param = token[0];
-            TPtrC paramVal;
-            if( token[1] == '\"' )
-                {
-                if( token[2] == '\"' )
-                    {
-                    // just quotes, e.g. q""
-                    }
-                else
-                    {
-                    paramVal.Set( token.Mid(2,token.Length()-3) );
-                    }
-                }
-            else
-                {
-                paramVal.Set( token.Mid(1) );
-                }
-            
-            LOGSTRING( "paramVal:" );
-            LOGTEXT( paramVal );
-
-            switch( param )
-                {
-                case 's':
-                    {
-                    LOGSTRING( "setting server to:" );
-                    LOGTEXT( paramVal );
-                    SetServerString( paramVal );
-                    break;
-                    }
-                case 'p':
-                    {
-                    LOGSTRING( "setting page to:" );
-                    LOGTEXT( paramVal );
-                    SetPageString( paramVal );
-                    break;
-                    }
-                case 'r':
-                    {
-                    TLex lexx2( paramVal );
-                    TInt reason = 0;
-                    lexx2.Val(reason);
-                    // Store connect reason
-                    switch(reason)
-                        {
-                        case 0:
-                            SetConnectReason(CCMAppUi::EConnectReasonUnknown);
-                            LOGSTRING( "Unknown connection reason" );
-                            break;
-                        case 1:
-                            SetConnectReason(CCMAppUi::EConnectReasonFirstBoot);
-                            LOGSTRING( "Connection reason first boot" );
-                            break;
-                        case 2:
-                            SetConnectReason(CCMAppUi::EConnectReasonNewSim);
-                            LOGSTRING( "Connection reason new sim" );
-                            break;
-                        case 3:
-                            SetConnectReason(CCMAppUi::EConnectReasonUserTriggered);
-                            LOGSTRING( "Connection reason user triggered" );
-                            break;
-                        case 4:
-                            SetConnectReason(CCMAppUi::EConnectReasonApplicationTriggered);
-                            LOGSTRING( "Connection reason application triggered" );
-                            break;
-                        case 5:
-                            SetConnectReason(CCMAppUi::EConnectReasonRemoteTriggered);
-                            LOGSTRING( "Connection reason remote triggered" );
-                            break;
-                        default:
-                            LOGSTRING( "Invalid connect reason parameter" );
-                            break;
-                        }
-                    break;
-                    }
-                case 'q':
-                    {
-                    LOGSTRING( "setting query string to:" );
-                    LOGTEXT( paramVal );
-                    SetQueryString( paramVal );
-                    break;
-                    }
-                case 'a':
-                    {
-                    LOGSTRING( "setting autostart to:" );
-                    TLex lexx2( paramVal );
-                    TInt autostart = 0; // Default is "off"
-                    TInt hiddenEnabled(0);
-                    TInt err(KErrNone);
-                    lexx2.Val( autostart );
-                    LOGTEXT( paramVal );
-                    switch( autostart )
-                        {
-                        case 0:
-                            iAutoStart = EFalse;
-                            break;
-                        case 1:
-                            // check that autostart mode is allowed
-                            err = GetIntValue( KOnlineSupportHiddenEnabled, hiddenEnabled );
-                            if (err != KErrNone)
-                                {
-                                LOGSTRING2( "GetIntValue(KOnlineSupportHiddenEnabled) errorcode %i", err  );
-                                }
-                                
-                            if(hiddenEnabled == 1)
-                                {
-                                iAutoStart = ETrue;
-                                }
-                            else
-                                {
-                                LOGSTRING( "Autostart not allowed" );
-                                iAutoStart = EFalse;
-                                }
-                            break;
-                        default:
-                            iAutoStart = EFalse;
-                            break;
-                        }
-                    break;
-                    }
-                case 't':
-                    {
-                    LOGSTRING( "setting TOKEN override to:" );
-                    TLex lexx2( paramVal );
-                    TInt tokenOverride = 0; // Default is "off"
-                    lexx2.Val( tokenOverride );
-                    LOGTEXT( paramVal );
-                    switch( tokenOverride )
-                        {
-                        case 0:
-                            iTokenOverride = EFalse;
-                            break;
-                        case 1:
-                            iTokenOverride = ETrue;
-                            break;
-                        default:
-                            iTokenOverride = EFalse;
-                            break;
-                        }
-                    break;
-                    }
-                default:
-                    {
-                    LOGSTRING( "commandline parse error, unrecognized param indentifier" );
-                    break;
-                    }
-                }
-            lexx.SkipCharacters();    
-
-            }
-        LOGSTRING( "cmdline parsing done" );
-
-        CleanupStack::PopAndDestroy( paramsBuf );
-        } // else
-
-       
-    if( iAutoStart )
-        {
-        // do not show confirmation dialog, but call "ok"-button handler
-        CommonDialogDismissedL(CCMDialogMonitor::EConfirmation, EAknSoftkeyYes);
-        }
-    else
-        {
-        // show confirmation dialog to user, after user has accepted or cancelled
-        // CommonDialogDismissedL -function is called
-        ConfirmationDialogL();
-
-        }
-
-    
-    //StartTimeOut( KStartUpTimeOut );
-
-    //TRAP_IGNORE( WaitDialogL( iWaitDialogProgressVal ) );
-    return ETrue;
-    }
-
-// -----------------------------------------------------------------------------
-// CCMAppUI::DelayedExit
-// -----------------------------------------------------------------------------
-//
-void CCMAppUi::DelayedExit()
-    {
-    LOGSTRING("CCMAppUi::DelayedExit - begin");
-    StartTimeOut( KExitTimeOut );
-    iApplicationStatus = EAppStatusClosing;
-
-    // In case doing a delayed exit, iWaitDialog has not been deleted yet
-    // (except if delayed exit is being done via iWaitDialog "Cancel" selection
-    // -> see DialogDismissedL)
-    /*if( iWaitDialog && !iWaitDialogProcessFinished )
-        {
-        LOGSTRING( "iWaitDialog->ProcessFinishedL" );
-        iWaitDialogProcessFinished = ETrue;
-        TRAP_IGNORE( iWaitDialog->ProcessFinishedL() );
-        LOGSTRING( "iWaitDialog->ProcessFinishedL - done" );
-        }*/
-
-    LOGSTRING("DelayedExit - done");
-    }
-
-// -----------------------------------------------------------------------------
-// CCMAppUI::TimeOutCallBack
-// -----------------------------------------------------------------------------
-//
-TInt CCMAppUi::TimeOutCallBack( TAny* aCCMAppUi )
-    {
-    TRAPD( err, ( ( CCMAppUi* )aCCMAppUi )->DoTimeOutCallBackL() );
-    // DoTimeOutCallBackL might have called Exit()
-    if( err == KLeaveExit )
-        {
-        User::Leave( KLeaveExit );
-        }
-    return err;
-    }
-
-// -----------------------------------------------------------------------------
-// CCMAppUI::DoTimeOutCallBackL
-// -----------------------------------------------------------------------------
-//
-void CCMAppUi::DoTimeOutCallBackL()
-    {
-    LOGSTRING( "CCMAppUi::DoTimeOutCallBackL()" );
-    LOGSTRING2( "application status %i", iApplicationStatus  )
-    if( iTimer->IsActive() ) 
-        {
-        iTimer->Cancel();
-        }
-
-    switch( iApplicationStatus )
-        {
-        case EAppStatusMonitoring:
-            LOGSTRING("CCMAppUi calls StopMonitoring ");
-            iRegistrationMonitor->StopMonitoring();
-            iApplicationStatus = EAppStatusInactive;
-            //ErrorNoteNetworkL();
-            ErrorNoteConnectionL();
-            //DelayedExit();
-            Exit();
-            break;
-        case EAppStatusConnecting:
-            LOGSTRING("CCMAppUi calls disconnect");
-            iEngine->Disconnect();
-            iApplicationStatus = EAppStatusInactive;
-            ConnectionResultL( KErrTimedOut );
-            break;
-        case EAppStatusWaitingDisconnect:
-            LOGSTRING("Connection will be disconnected");
-            iEngine->Disconnect();
-            iApplicationStatus = EAppStatusInactive;
-            break;
-        case EAppStatusStartingUp:
-            LOGSTRING("Starting up");
-            StartUpOperationL();
-            break;
-        case EAppStatusClosing:
-            LOGSTRING("EAppStatusClosing");
-            LOGSTRING("Restore settings");
-            // Exit immediately, a call to DelayedExit has been made
-            // (and the exit timeout has already been passed)
-            Exit(); // Leaves with KLeaveExit
-            break;
-        default:
-            LOGSTRING("Restore settings");
-            //DelayedExit();
-            Exit();
-            break;
-        };
-
-    LOGSTRING( "DoTimeOutCallBack - done" );
-    }
-
-// -----------------------------------------------------------------------------
-// CCMAppUI::InitiateNextConnectionTestL()
-// -----------------------------------------------------------------------------
-//
-void CCMAppUi::InitiateNextConnectionTestL()
-    {
-    LOGSTRING( "CCMAppUi::InitiateNextConnectionTestL" );
-    TInt err( KErrNone );
-
-    if( iNetworkStatus != CCMRegistrationMonitor::EHomenetwork &&
-        iNetworkStatus != CCMRegistrationMonitor::ERoaming )
-        {
-        LOGSTRING( "InitiateNextConnectionTestL, network NOT ok" );
-        if( iGlobalWaitNote )
-            {
-            iGlobalWaitNote->CancelNoteL(iWaitNoteId);
-            delete iGlobalWaitNote;
-            iGlobalWaitNote = NULL;
-            }
-        /*if( iWaitDialog && !iWaitDialogProcessFinished )
-            {
-            LOGSTRING("iWaitDialog->ProcessFinishedL()");
-            iWaitDialogProcessFinished = ETrue;
-            iWaitDialog->ProcessFinishedL();
-            }*/
-        if( iConnectReason == CCMAppUi::EConnectReasonFirstBoot )
-            {
-            LOGSTRING( "...startupstart" );
-            //Roaming information to confmanager's ini file
-            if ( iNetworkStatusOk == EFalse )
-                {
-                StoreIntValue( KOnlineSupportRoaming, EFalse );
-                }
-            Exit();
-            //DelayedExit();
-            return;
-            }
-        else // menu start, show error note
-            {
-            LOGSTRING( "ErrorNoteConnectionL" );
-            //ErrorNoteNetworkL();
-            ErrorNoteConnectionL();
-            Exit();
-            //DelayedExit();
-            return;
-            }
-        }
-    if( iConnectingVia == EConnectingViaNull && iInitAccessOn )
-        {
-        iConnectingVia = EConnectingViaInit;
-        if( TryInitAccessL() ) 
-            {
-            return;
-            }
-        }
-    if( iConnectingVia == EConnectingViaInit )
-        {
-        iConnectingVia = EConnectingViaDefault;
-        __UHEAP_MARK;
-        TBool value( EFalse );
-        TRAP( err, value = TryDefaultAccessL() );
-        __UHEAP_MARKEND;
-        if( value )
-            {
-            return;
-            }
-        }
-    if( iConnectingVia == EConnectingViaDefault )
-        {
-        iConnectingVia = EConnectingViaUser;
-        TBool value( EFalse );
-        TRAP( err, value = TryUserAccessL() );
-        if( value )
-            {
-            LOGSTRING( "User access test initiated" );
-            return;
-            }
-        else
-            {
-            LOGSTRING2( "TryUserAccessL err: %i", err );
-            LOGSTRING( "ErrorNoteConnectionL" )
-            ErrorNoteConnectionL();
-            LOGSTRING( "Exit" )
-            //DelayedExit();
-            Exit();
-            }
-        }
-    }    
-
-// -----------------------------------------------------------------------------
-// CCMAppUI::TryInitAccessL()
-// -----------------------------------------------------------------------------
-//
-TBool CCMAppUi::TryInitAccessL()
-    {
-    LOGSTRING( "CCMAppUi::TryInitAccessL()" );
-    if( iInitAccessOn )
-    	{
-    TUint32 ap = InitAccessPointL();
-    iInitAccessPointUsed = ETrue;
-
-    if ( ap != 0 )
-        {
-        TBuf<255> domain;
-        AppendDomainL( domain );
-        LOGSTRING( "Starting Init access test" );
-        iEngine->ConnectL( ap, domain );
-        
-        StartTimeOut( KConnectionTimeOut );
-        iApplicationStatus = EAppStatusConnecting;
-        return( ETrue );
-        }
-
-    LOGSTRING( "Init access failed in db" );
-    return( EFalse );
-    	}
-    else
-    	{
-    	LOGSTRING( "CCMAppUi::TryInitAccessL() InitAccess feature off " );
-    	return EFalse;
-    	}
-    }
-
-// -----------------------------------------------------------------------------
-// CCMAppUI::StartTimeOut
-// -----------------------------------------------------------------------------
-//
-void CCMAppUi::StartTimeOut( const TInt aTimeOut )
-    {
-    LOGSTRING2( "CCMAppUi::StartTimeOut: %i", aTimeOut );
-    // EAppStatusClosing means we are already waiting for the timer to
-    // trigger application exit, no need for a new time-out in that case
-    if( iApplicationStatus != EAppStatusClosing )
-        {
-        TCallBack callBack( TimeOutCallBack, this );
-        if( iTimer->IsActive() )
-            {
-            iTimer->Cancel();
-            }
-        iTimer->Start( aTimeOut, aTimeOut, callBack );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// CCMAppUI::TryDefaultAccessL()
-// -----------------------------------------------------------------------------
-//
-TBool CCMAppUi::TryDefaultAccessL()
-    {
-    LOGSTRING( "CCMAppUi::TryDefaultAccessL" );
-    TUint32 ap = CheckDefaultAccessPointL();
-    iInitAccessPointUsed = EFalse;
-
-    if ( ap != 0 )
-        {
-        TBuf<255> domain;
-        AppendDomainL( domain );
-        LOGSTRING( "Starting default access test" );
-        iEngine->ConnectL( ap, domain );
-
-        StartTimeOut( KConnectionTimeOut );
-        iApplicationStatus = EAppStatusConnecting;
-        return( ETrue );
-        }
-
-    LOGSTRING( "Default access failed in db" );
-    return( EFalse );
-    }
-
-
-// -----------------------------------------------------------------------------
-// CCMAppUI::TryUserAccessL()
-// -----------------------------------------------------------------------------
-//
-TBool CCMAppUi::TryUserAccessL()
-    {
-    LOGSTRING( "CCMAppUi::TryUserAccessL" );
-    TInt accessPoints = CheckSettingsL();
-    iInitAccessPointUsed = EFalse;
-
-    // initAccess and browser default is tested, if more ap then ask from user
-    if ( !iAutoStart )
-        {
-        	if( (iInitAccessOn && accessPoints > 2) || !iInitAccessOn)
-        	{
-        	  LOGSTRING( "Starting user access test" );
-
-        		TBuf<255> domain;
-        		AppendDomainL( domain );
-        		iEngine->ConnectL( 0, domain );         
-
-        		StartTimeOut( KConnectionTimeOut );
-        		iApplicationStatus = EAppStatusConnecting;
-
-        		return( ETrue );
-        	}
-        }	
-
-    LOGSTRING( "User access test not started" );
-    return( EFalse );
-    }
-
-/// -----------------------------------------------------------------------------
-// CCMAppUI::CheckSettingsL
-// Cheks if there is wap setting available.
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-TInt CCMAppUi::CheckSettingsL()
-    {
-    CCommsDatabase*    theDb;
-    CCommsDbTableView* theView;
-    TInt settings( 0 );
-    TInt errorCode( KErrNone );
-    theDb = CCommsDatabase::NewL( );
-    CleanupStack::PushL( theDb );
-    theView = theDb->OpenTableLC( TPtrC( IAP ) );
-    errorCode = theView->GotoFirstRecord();
-    if ( errorCode != KErrNotFound )
-        {
-        settings = 1;
-        while ( errorCode != KErrNotFound )
-            {
-            errorCode = theView->GotoNextRecord();
-            if ( errorCode == KErrNone )
-                {
-                settings++;
-                }
-            }
-        }
-    CleanupStack::PopAndDestroy( 2 );
-    return settings;    
-    }
-
-// -----------------------------------------------------------------------------
-// CCMAppUI::AppendDomainL
-// -----------------------------------------------------------------------------
-//
-void CCMAppUi::AppendDomainL( TDes& aUrl )
-    {
-    if( iServer.Compare( KServerNokia ) == 0 )
-        {
-        if( aUrl.MaxLength() < aUrl.Length() + KNokia().Length() )
-            {
-            User::Leave( KErrArgument );
-            }
-        aUrl.Append( KNokia );
-        }
-    else
-        {
-        if( aUrl.MaxLength() < aUrl.Length() + iServer.Length() + KHelpPortal().Length() )
-            {
-            User::Leave( KErrArgument );
-            }
-        aUrl.Append( iServer );
-        aUrl.Append( KHelpPortal );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// CCMAppUI::OpenWapBrowserL
-// Opens WAP browser
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CCMAppUi::OpenWapBrowserL()
-    {
-    LOGSTRING( "Enter to CCMAppUi::OpenWapBrowserL" );
-    iWapPage.Zero();
-
-    DeleteServiceActivationInfoL();
-    
-    CPnpUtilImpl* pnpUtil = CPnpUtilImpl::NewLC();
-
-    LOGSTRING( "OpenWapBrowserL 2" );
-
-    if( !iAutoStart )
-        {
-        // Help portal address and type
-        // 4 means Url address. (see Browser API documentation)
-        _LIT ( KAddressType, "4 " ); 
-        iWapPage.Copy( KAddressType );
-        }
-
-    LOGSTRING( "OpenWapBrowserL 3" );
-
-    iWapPage.Append( KHttp );
-    AppendDomainL( iWapPage );
-    iWapPage.Append( KSlash );
-
-    LOGSTRING( "OpenWapBrowserL 4" );
-    iWapPage.Append( iPage );
-    iWapPage.Append( KQuestionMark );
-
-#ifdef __WINS__
-    RMobilePhone::TMobilePhoneNetworkInfoV1 homeNetworkInfo;
-    homeNetworkInfo.iCountryCode.Copy( _L("244") );
-    homeNetworkInfo.iNetworkId.Copy( _L("05") );
-#else
-    const RMobilePhone::TMobilePhoneNetworkInfoV1& homeNetworkInfo = iRegistrationMonitor->GetHomeNetworkInfo();
-#endif
-    // Home MCC
-    //iWapPage.Append( KParameterDelimeter );
-    iWapPage.Append( KSimMccParameter );
-    iWapPage.Append( homeNetworkInfo.iCountryCode );
-    pnpUtil->SetHomeMccL( homeNetworkInfo.iCountryCode );
-
-    LOGSTRING( "OpenWapBrowserL 5" );
-    // Home MNC
-    RMobilePhone::TMobilePhoneNetworkIdentity formattedMnc;
-    pnpUtil->FormatMncCodeL( homeNetworkInfo.iCountryCode, homeNetworkInfo.iNetworkId, formattedMnc );
-    iWapPage.Append( KParameterDelimeter );
-    iWapPage.Append( KSimMncParameter );
-    iWapPage.Append( formattedMnc );
-    pnpUtil->SetHomeMncL( formattedMnc );
-
-    LOGSTRING( "OpenWapBrowserL 6" );
-#ifdef __WINS__
-    RMobilePhone::TMobilePhoneNetworkInfoV1 currentNetworkInfo;
-    currentNetworkInfo.iCountryCode.Copy( _L("244") );
-    currentNetworkInfo.iNetworkId.Copy( _L("05") );
-#else
-    const RMobilePhone::TMobilePhoneNetworkInfoV1& currentNetworkInfo = iRegistrationMonitor->GetCurrentNetworkInfo();
-#endif
-    // current MCC
-    iWapPage.Append( KParameterDelimeter );
-    iWapPage.Append( KCurrentMccParameter );
-    iWapPage.Append( currentNetworkInfo.iCountryCode );
-    pnpUtil->SetNetworkMccL( currentNetworkInfo.iCountryCode );
-
-    LOGSTRING( "OpenWapBrowserL 7" );
-    // current MNC
-    TRAPD( err, pnpUtil->FormatMncCodeL( currentNetworkInfo.iCountryCode, currentNetworkInfo.iNetworkId, formattedMnc ) );
-    if( err != KErrNone )
-        {
-        LOGSTRING2( "FormatMncCodeL err: %i", err );
-        pnpUtil->SetNetworkMncL( currentNetworkInfo.iNetworkId );
-        }
-    else
-        {
-        iWapPage.Append( KParameterDelimeter );
-        iWapPage.Append( KCurrentMncParameter );
-        iWapPage.Append( formattedMnc );
-        pnpUtil->SetNetworkMncL( formattedMnc );
-        }
-
-    LOGSTRING( "OpenWapBrowserL 8" );
-    //pnpUtil->StoreAccessPoint( iAccessPoint ); // not needed anymore
-
-    // Init AP, use token
-    LOGSTRING( "iServer:" );
-    LOGTEXT( iServer );
-
-	// AppendTokenAndNonceVal
-	AppendTokenAndNonceValL();
-
-     // Connection reason
-    LOGSTRING( "connection reason" );
-    iWapPage.Append( KParameterDelimeter );
-    iWapPage.Append( KConnectReasonParameter );
-    if( iConnectReason == EConnectReasonUnknown )
-        {
-        iWapPage.AppendNum( (TInt)EConnectReasonUserTriggered );
-        }
-    else
-        {
-        iWapPage.AppendNum( (TInt)iConnectReason );
-        }   
-
-    // PnpVersion
-    TBuf<KMaxVersionStringLength> pnpversion;
-    User::LeaveIfError( pnpUtil->Version( pnpversion ) );
-    LOGSTRING( "PnPVersion" );
-    iWapPage.Append( KParameterDelimeter );
-    iWapPage.Append( KPnpVersionParameter );
-    iWapPage.Append( pnpversion );
-    LOGSTRING( "PopAndDestroy pnpUtil" )
-    CleanupStack::PopAndDestroy( pnpUtil );
-
-    // help query string
-    if( iQuery.Length() > 0 )
-        {
-        LOGSTRING( "query" );
-        HBufC16* param = EscapeUtils::EscapeEncodeL(iQuery,EscapeUtils::EEscapeUrlEncoded);
-        if(param)
-            {
-            LOGSTRING( "converted:" );
-            LOGTEXT( *param );
-            iWapPage.Append( KParameterDelimeter );
-            iWapPage.Append( KQueryParameter );
-            iWapPage.Append( *param );
-            delete param;
-            }
-
-        }
-
-    
-
-    // Append Device Information to URL
-    
-    AppendDeviceInfoL();
-    
-    
-    // Operator name, service provider
-    const RMobilePhone::TMobilePhoneServiceProviderNameV2& serviceProviderName = iRegistrationMonitor->GetServiceProviderName();
-    if( serviceProviderName.iSPName.Length() > 0 )
-        {
-        LOGSTRING( "spname" );
-        HBufC16* param = EscapeUtils::EscapeEncodeL( serviceProviderName.iSPName, EscapeUtils::EEscapeUrlEncoded );
-        if(param)
-            {
-            LOGSTRING( "converted:" );
-            LOGTEXT( *param );
-            iWapPage.Append( KParameterDelimeter );
-            iWapPage.Append( KOperatorNameParameter );
-            iWapPage.Append( *param );
-            delete param;
-            }
-        }
-    LOGTEXT( currentNetworkInfo.iShortName );
-    LOGTEXT( currentNetworkInfo.iLongName );
-
-    // Current operator name
-    if( currentNetworkInfo.iLongName.Length() > 0 )
-        {
-        LOGSTRING( "current operator name" );
-        HBufC16* param = EscapeUtils::EscapeEncodeL( currentNetworkInfo.iLongName, EscapeUtils::EEscapeUrlEncoded );
-        if(param)
-            {
-            LOGSTRING( "converted:" );
-            LOGTEXT( *param );
-            iWapPage.Append( KParameterDelimeter );
-            iWapPage.Append( KCurrentOperatorNameParameter );
-            iWapPage.Append( *param );
-            delete param;
-            }
-        }
-
-    //Append WebUtils Params to URL
-    AppendWebUtilParamsL();
-    
-    
-    
-    // MSISDN
-    const RMobileONStore::TMobileONEntryV1& ownNumberInfo = iRegistrationMonitor->GetOwnNumberInfo();
-    if( ownNumberInfo.iNumber.iTelNumber.Length() )
-        {
-        LOGSTRING( "ownNumberInfo.iNumber.iTelNumber" );
-        iWapPage.Append( KParameterDelimeter );
-        iWapPage.Append( KMSISDNParameter );
-        iWapPage.Append( ownNumberInfo.iNumber.iTelNumber );
-        }
-
-    // Phone alias
-    iWapPage.Append( KParameterDelimeter );
-    iWapPage.Append( KPhoneAlias );
-    iWapPage.Append( KPhoneAliasValue );
-
-	//Create online help based on Interactive or NonInteractive feature
-    OnlineHelpL();
-
-    LOGSTRING( "Exit from OpenWapBrowser" );
-    }
- 
- 
-// -----------------------------------------------------------------------------
-// CCMAppUI::DeleteServiceActivationInfoL
-//
-// -----------------------------------------------------------------------------
-//
-   
-void CCMAppUi::DeleteServiceActivationInfoL()
-{
-	
-	// Reset values for service activation. Service activation should not be supported 
-    // by online support since WDS Global server URL is hardcoded (help-portal server 
-    // connecting to WDS) if service activation required for onlinesupport comment below
-    // statements for PnpProvUtil.
-
-    CPnpProvUtil* prov = CPnpProvUtil::NewLC();
-    
-    const TUint32 uidval = 0;
-    prov->SetApplicationUidL(uidval);
-	
-	
-    TBuf<2> buf(_L(""));
-    prov->SetProvAdapterAppIdL(buf);
-
-    CleanupStack::PopAndDestroy();
-	
-}
-
-
-// -----------------------------------------------------------------------------
-// CCMAppUI::AppendTokenAndNonceValL
-//
-// -----------------------------------------------------------------------------
-//
-   
-void CCMAppUi::AppendTokenAndNonceValL()
-{
-
-
-	CPnpUtilImpl *pnpUtil = CPnpUtilImpl::NewLC();
-
-	    
-    // TOKEN has to be sent:
-    // - When connecting through "initAccess" to www.help-portal.com/page1
-    // - When connecting through the fallback APN to *.help-portal.com EXCEPT to www.help-portal.com
-    //     -- This feature is needed for testing of provisioning over HTTP
-    // TOKEN should NOT be sent:
-    // - When connecting through "initAccess" to any other URL
-    // - When connecting through the fallback APN to pnpms.nokia.com
-
-    // Changed:
-    // Token override allows now giving token even when not connecting through initAccess,
-    // so there is no need to allow TOKEN for demo purposes if token override is not on
-
-    if( iTokenOverride    // token override set on commandline params
-        ||
-        // No token override:
-        ( iInitAccessPointUsed
-          && iServer.Compare( KDefaultServerString ) == 0 ) // connecting to www.help-portal.com
-        )
-        {
-        // Add Token
-        LOGSTRING( "token" );
-        TInt validitytime = pnpUtil->GetTokenValidityTime();
-        TInt tokenvalue = 0;
-        TInt err = pnpUtil->CreateNewToken( validitytime, tokenvalue );
-        if( err != KErrNone )
-            {
-            LOGSTRING2( "CreateNewToken returned: %i", err );
-            User::Leave( err );
-            }
-        iWapPage.Append( KParameterDelimeter );
-        iWapPage.Append( KTokenParameter );
-        iWapPage.AppendNum( tokenvalue );
-        // Token validity 
-        LOGSTRING( "token validity" );
-        iWapPage.Append( KParameterDelimeter );
-        iWapPage.Append( KTokenValidityTimeParameter );
-        iWapPage.AppendNum( validitytime );
-        }
-
-   
-    // The KEYINFO and NONCE should be SENT:
-    // - in all cases, also to "*help-portal.com" and through "initAccess".
- 
-    // Nonce
-    LOGSTRING( "nonce" );
-    // validity time not used
-    TBuf8<KNonceLength> nonce8;
-    TBuf<KNonceLength> nonce;
-    TRAPD( err, pnpUtil->CreateNewNonceL( 0, nonce8 ) );
-    if( err != KErrNone )
-        {
-        LOGSTRING2( "CreateNewNonceL leave code: %i", err );
-        User::Leave( err );
-        }
-    nonce.Copy( nonce8 );
-
-    iWapPage.Append( KParameterDelimeter );
-    iWapPage.Append( KNonceParameter );
-    iWapPage.Append( nonce );
-
-    TBuf8<KMaxKeyInfoLength> keyInfo8;
-    TBuf<KMaxKeyInfoLength> keyInfo;
-    pnpUtil->GetKeyInfoL( keyInfo8 );
-    keyInfo.Copy( keyInfo8 );
-
-    iWapPage.Append( KParameterDelimeter );
-    iWapPage.Append( KKeyInfoParameter );
-    iWapPage.Append( keyInfo );
-
-	CleanupStack::PopAndDestroy();
-	
-}
-
-
-// -----------------------------------------------------------------------------
-// CCMAppUI::AppendSWandProductVersionL
-//
-// -----------------------------------------------------------------------------
-//
-  
-void CCMAppUi::AppendDeviceInfoL()
-{
-
-	const RMobilePhone::TMobilePhoneIdentityV1& phoneIdentity = iRegistrationMonitor->GetPhoneIdentity();
-
-    const TInt KManufLength = 128;
-
-    // Device type (for example dType=NOKIAE60)
-    iWapPage.Append( KParameterDelimeter );
-    iWapPage.Append( KDeviceTypeParameter );
-    
-    _LIT(KManufacturer, "Nokia");    
-
-    TBuf<KManufLength> manfacturer;
-    manfacturer.Append(phoneIdentity.iManufacturer);
-
-    TBuf<KManufLength> model;
-    
-    if(manfacturer.MatchF(KManufacturer)==KErrNotFound)
-	 model.Append( phoneIdentity.iManufacturer );	
-
-
-    model.Append( phoneIdentity.iModel );
-    
-    HBufC16* param_manf = EscapeUtils::EscapeEncodeL(model, EscapeUtils::EEscapeUrlEncoded );
-    iWapPage.Append( *param_manf );
-    delete param_manf;
-    
-
-    //iWapPage.Append( phoneIdentity.iModel );
-
-    // Add symbian os version, for example: dType=NOKIAE60(Symbian 9.1)
-    LOGSTRING("Reading OS versions");
-    TVersionBuf s60Version;
-    TVersionBuf symbianVersion;
-    TRAPD( err, TVersionStrings::GetUserAgentVersionsL( s60Version, symbianVersion ) );
-    LOGSTRING2( "Error: %i", err );
-    if( err == KErrNone )
-        {
-        TBuf<KMaxVersionBufLength> symbian;
-        symbian.Copy( symbianVersion );
-        iWapPage.Append( KParenthesisOpen );
-        iWapPage.Append( KSymbianOs );
-        iWapPage.Append( symbian );
-        iWapPage.Append( KParenthesisClose );
-        }
-
-
-	if( iSwVersion.Length() > 0 )
-        {
-        iWapPage.Append( KParameterDelimeter );
-        iWapPage.Append( KSW );
-	HBufC16* param_swversion = EscapeUtils::EscapeEncodeL(iSwVersion, EscapeUtils::EEscapeUrlEncoded );
-	iWapPage.Append( *param_swversion );
-	delete param_swversion;
-	}
-	LOGTEXT(iSwVersion);
-
-    // Product model
-    if( iProductModel.Length() > 0 )
-        {
-        iWapPage.Append( KParameterDelimeter );
-        iWapPage.Append( KHW );
-        iWapPage.Append( iProductModel );
-        }	
-}
-
-
-// -----------------------------------------------------------------------------
-// CCMAppUI::LaunchMiniBrowserL()
-//
-// -----------------------------------------------------------------------------
-//
-  
-void CCMAppUi::LaunchMiniBrowserL()
-{
-		// create a mini browser for downloading provisioned settings
-        // from a supporting service
-        // mini browser has to be a member object as it has to exist
-        // during the async http request-response cycle
-        LOGSTRING2( "opening mini-browser, using AP: %i", iEngine->IapId() );
-        if( !iMiniBrowser )
-            {
-            RSocketServ& socketServ = iEngine->SocketServ();
-            RConnection& connection = iEngine->Connection();
-            iMiniBrowser = CMiniBrowser::NewL( *this, socketServ, connection );
-            }
-
-        LOGSTRING( "Calling HttpGetL" );
-        if( iEngine->ProxyDefined() )
-            {
-            iMiniBrowser->HttpGetL( iWapPage, iEngine->ProxyIp(), iEngine->ProxyPort() );
-            }
-        else
-            {
-            iMiniBrowser->HttpGetL( iWapPage );
-            }
-}
-
-
-
-// -----------------------------------------------------------------------------
-// CCMAppUI::LaunchS60WebBrowser()
-//
-// -----------------------------------------------------------------------------
-//
-void CCMAppUi::LaunchS60WebBrowserL()
-{
-	LOGSTRING2( "opening browser, using AP: %i", iAccessPoint );
-        iEngine->Disconnect();
-        
-		// Append access point
-        
-		#if ( !defined (__WINS__) && !defined (__WINSCW) ) 
-			iAccessPoint = iEngine->ReturnIAPID();
-			iWapPage.Append( KSpace );
-        	iWapPage.AppendNumUC( iAccessPoint );
-		#endif
-	
-		
-
-        TApaTaskList taskList( CEikonEnv::Static()->WsSession() );
-        TApaTask task = taskList.FindApp( KCRUidBrowser );
-
-        if ( task.Exists() )
-            {
-            TBuf8<1024> wapPage;
-            wapPage.Copy( iWapPage.Left( 1024 ) );
-            LOGSTRING( "OpenWapBrowserL sending message to Browser" );
-            task.SendMessage( TUid::Uid( 0 ), wapPage ); // Uid is not used
-            }
-        else
-            {
-            LOGSTRING( "OpenWapBrowserL Launching Browser" );
-            RApaLsSession appArcSession;
-            User::LeaveIfError( appArcSession.Connect() );
-            CleanupClosePushL( appArcSession );
-            TThreadId tid;
-            LOGSTRING( "before startDocument" );
-	    LOGTEXT(iWapPage);
-	
-            appArcSession.StartDocument( iWapPage, KCRUidBrowser, tid );
-            LOGSTRING( "Document started" );
-            CleanupStack::PopAndDestroy( &appArcSession );
-            }
-
-        // Browser was started, we are free to exit
-        iStartingBrowser = ETrue;
-        //DelayedExit();
-        Exit();
-}
-
-
-// -----------------------------------------------------------------------------
-// CCMAppUI::AppendWebUtilParamsL()
-//
-// -----------------------------------------------------------------------------
-//
-
-void CCMAppUi::AppendWebUtilParamsL()
-{
-    // language
-    // HttpFilterCommonStringsExt::GetLanguageString is introduced in S60 2.6
-    RStringPool stringPool;
-    LOGSTRING("open string pool");
-    stringPool.OpenL( HttpFilterCommonStringsExt::GetLanguageTable() );
-    CleanupClosePushL( stringPool );
-    LOGSTRING("GetLanguageString");
-    RStringF languageString = HttpFilterCommonStringsExt::GetLocaleLanguage( stringPool );
-    CleanupClosePushL( languageString );
-    LOGSTRING("GetLanguageString - done");
-    LOGTEXT( languageString.DesC() );
-    const TPtrC8& language = languageString.DesC();
-    LOGSTRING("languageString.DesC - done");
-    LOGTEXT( language );
-    if( language.Length() )
-        {
-        const TInt KMaxLanguageLength(5);
-        TBuf<KMaxLanguageLength> lang;
-        lang.Copy( language.Left( KMaxLanguageLength ) );
-        iWapPage.Append( KParameterDelimeter );
-        iWapPage.Append( KLanguageParameter );
-        iWapPage.Append( lang );
-        }
-    CleanupStack::PopAndDestroy(); // languageString.Close
-    CleanupStack::PopAndDestroy(); // stringPool.Close
-
-    // User Agent profile
-    // Example value: "http://nds1.nds.nokia.com/uaprof/N6600r100.xml"
-    LOGSTRING( "uaProf" );
-    // Assume 128 chars is big enough
-    TBuf<128> uaProf;
-    CRepository* cenRep = CRepository::NewL( KCRUidWebUtils );
-    CleanupStack::PushL( cenRep );
-    TInt err = cenRep->Get( KWebUtilsUaProf, uaProf );
-    CleanupStack::PopAndDestroy( cenRep );
-    LOGSTRING2( "cenRep->Get err: %i", err );
-    LOGTEXT( uaProf );
-    if( uaProf.Length() )
-        {
-        HBufC16* param = EscapeUtils::EscapeEncodeL( uaProf, EscapeUtils::EEscapeUrlEncoded );
-        LOGSTRING( "converted:" );
-        LOGTEXT( *param );
-        if( param )
-            {
-            iWapPage.Append( KParameterDelimeter );
-            iWapPage.Append( KUAProfParameter );
-            iWapPage.Append( *param );
-            delete param;
-            }
-        }
-
-        }
-
-// -----------------------------------------------------------------------------
-// CCMAppUI::OnlineHelpL()
-//
-// -----------------------------------------------------------------------------
-//
-
-void CCMAppUi::OnlineHelpL()
-{
-    // Interactive option (silent mode)
-    iWapPage.Append( KParameterDelimeter );
-    iWapPage.Append( KInteractiveSessionParameter );
-    if( iAutoStart )
-        {
-        iWapPage.Append( KNonInteractiveSession );
-        }
-    else
-        {
-        iWapPage.Append( KInteractiveSession );
-        }
-
-#ifdef _DEBUG
-    for( TInt i(0); i < iWapPage.Length(); i += 128 )
-        {
-        LOGTEXT( iWapPage.Right( iWapPage.Length() - i ) );
-        }
-#endif
-
-    if( iAutoStart )
-        {
-        	LaunchMiniBrowserL();
-        }
-    else
-        {
-        	LaunchS60WebBrowserL();
-        }
-}
-      
-// -----------------------------------------------------------------------------
-// CCMAppUI::MiniBrowserRequestDoneL
-// Called after MiniBrowser has handled a request for an URL
-// (a call to HttpGetL resulted a successful http request-response)
-// -----------------------------------------------------------------------------
-//
-void CCMAppUi::MiniBrowserRequestDoneL()
-    {
-    LOGSTRING( "CCMAppUi::MiniBrowserRequestDoneL" );
-
-    // Leaves from here propagate to MiniBrowserUnhandledLeave (which causes app exit)
-
-    // Check we have not exceed the limit for maximum number of redirects
-    if( iRedirectsLeft <= 0 )
-        {
-        User::Leave( KErrOverflow );
-        }
-
-    iRedirectsLeft--;
-
-    // Leaves with KErrNotFound if there is no valid report URL
-    HBufC* reportUrl = iMiniBrowser->GetReportUrlLC();
-    LOGSTRING( "Calling HttpGetL" );
-    if( iEngine->ProxyDefined() )
-        {
-        iMiniBrowser->HttpGetL( *reportUrl, iEngine->ProxyIp(), iEngine->ProxyPort() );
-        }
-    else
-        {
-        iMiniBrowser->HttpGetL( *reportUrl );
-        }
-    CleanupStack::PopAndDestroy( reportUrl );
-    }
-
-  
-// -----------------------------------------------------------------------------
-// CCMAppUI::MiniBrowserErrorL
-// -----------------------------------------------------------------------------
-//
-void CCMAppUi::MiniBrowserErrorL( const TInt aError )
-    {
-    LOGSTRING2( "CCMAppUi::MiniBrowserErrorL: %i", aError );
-
-    // If there is no valid report url the KErrNotFound from GetReportUrlLC
-    // propagates to MiniBrowserUnhandledLeave and causes an Exit
-    HBufC* reportUrl = iMiniBrowser->GetReportUrlLC();
-    if( iEngine->ProxyDefined() )
-        {
-        iMiniBrowser->HttpGetL( *reportUrl, iEngine->ProxyIp(), iEngine->ProxyPort() );
-        }
-    else
-        {
-        iMiniBrowser->HttpGetL( *reportUrl );
-        }
-    CleanupStack::PopAndDestroy( reportUrl );
-    // Keep compiler happy
-    (void)aError;
-    }
-
-// -----------------------------------------------------------------------------
-// CCMAppUI::MiniBrowserErrorL
-// Called if a call to MiniBrowserRequestDoneL or MiniBrowserErrorL leaves
-// -----------------------------------------------------------------------------
-//
-void CCMAppUi::MiniBrowserUnhandledLeave( const TInt aError )
-    {
-    LOGSTRING2( "CCMAppUi::MiniBrowserUnhandledLeave: %i", aError );
-    //DelayedExit();
-    Exit();
-    // Keep compiler happy
-    (void)aError;  
-    }
-
-// -----------------------------------------------------------------------------
-// CCMAppUI::CheckDefaultAccessPointL()
-// Checks defaul access point for the browser
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-TUint32 CCMAppUi::CheckDefaultAccessPointL()
-    {
-    LOGSTRING( "CCMAppUi::CheckDefaultAccessPointL()" );
-    TInt errorCode( KErrNone ) ;
-    TUint32 accessPoint;
-    TInt defaultAccessPoint( KErrNotFound );
-    CCommsDatabase*    theDb;
-    CCommsDbTableView* theView;
-    CCommsDbTableView* theDefaultRoamingView;
-
-    TUint32 returnValue( 0 );
-    TInt selectionMode = 0;
-
-    CRepository* browserRepository = CRepository::NewLC( KCRUidBrowser );
-    User::LeaveIfError( browserRepository->Get( KBrowserDefaultAccessPoint, defaultAccessPoint ) );
-  
-    // Also check with Selection mode if selection mode is always ask then go for User Access   
-    User::LeaveIfError(browserRepository->Get( KBrowserAccessPointSelectionMode, selectionMode ));
-       
-    CleanupStack::PopAndDestroy( browserRepository );
-    
-    if(selectionMode == 1)
-    User::Leave(KErrNotSupported);
-    
-
-    theDb = CCommsDatabase::NewL( );
-    CleanupStack::PushL( theDb ); 
-
-    theView = theDb->OpenViewMatchingUintLC( TPtrC( WAP_IP_BEARER ),
-                                     TPtrC( WAP_ACCESS_POINT_ID ), 
-                                     defaultAccessPoint );
-
-    User::LeaveIfError( theView->GotoFirstRecord() );
-
-    theView->ReadUintL( TPtrC( WAP_IAP ),  accessPoint);
-    returnValue = accessPoint;
-    iAccessPoint = defaultAccessPoint;
-    
-    CleanupStack::PopAndDestroy( theView );
-
-    // check type
-    theView = theDb->OpenViewMatchingUintLC( TPtrC(IAP),
-                                             TPtrC(COMMDB_ID),
-                                             accessPoint );                
-    errorCode = theView->GotoFirstRecord();
-    if ( errorCode == KErrNone )
-        {
-        TUint32 bearerId;
-        theView->ReadUintL( TPtrC(IAP_BEARER), bearerId );
-        CleanupStack::PopAndDestroy( theView );
-        
-        theView = theDb->OpenViewMatchingUintLC( TPtrC(OUTGOING_GPRS),
-                                                TPtrC(COMMDB_ID),
-                                                bearerId );
-        errorCode = theView->GotoFirstRecord();
-        if ( errorCode == KErrNone )
-            {
-            TUint32 apType;
-            theView->ReadUintL( TPtrC(GPRS_AP_TYPE), apType );
-            CleanupStack::PopAndDestroy( theView );
-            LOGSTRING2( "apType:%i", apType );
-            }
-        else
-            {
-            LOGSTRING2( "error in opening OUTGOING_GPRS:%i", errorCode );
-            CleanupStack::PopAndDestroy( theView );
-            }
-        }
-    else
-        {
-        LOGSTRING2( "error in opening WAP_IAP:%i", errorCode );
-        CleanupStack::PopAndDestroy( theView );
-        }
-    // type check done
-
-    if( iNetworkStatus == CCMRegistrationMonitor::ERoaming )
-        {    
-        // check the name for roaming support
-        CApAccessPointItem* apItem = CApAccessPointItem::NewLC();
-        CApDataHandler* apDataHandler = CApDataHandler::NewLC( *theDb );
-        apDataHandler->AccessPointDataL( defaultAccessPoint, *apItem );
-        const HBufC* apName = apItem->ReadConstLongTextL( EApGprsAccessPointName ); 
-        // ownership of apName stays in apItem, so no delete here for apName
-        LOGSTRING( "default apn:" );
-        LOGTEXT( *apName );
-        // check if it ends with ".gprs" == roaming safe
-        TBuf<10> dotGprs;
-        dotGprs.Append( KDot );
-        dotGprs.Append( KGprs );
-        TInt offset = apName->Find( dotGprs );
-        TInt expectedOffset = apName->Length() - dotGprs.Length();
-        if( offset != expectedOffset )
-            {
-            // we need to use a roaming safe version of the ap
-            // check if allready have made it
-            LOGSTRING( "Checking for existing KDefaultRoamingName" );
-            theDefaultRoamingView = theDb->OpenViewMatchingTextLC( TPtrC( WAP_ACCESS_POINT ),
-                                                 TPtrC( COMMDB_NAME ), 
-                                                 KDefaultRoamingName );
-            errorCode = theDefaultRoamingView->GotoFirstRecord();
-            if( errorCode == KErrNone )
-                {
-                LOGSTRING( "found, removing it" );
-                TUint32 defaultRoamingId;
-                theDefaultRoamingView->ReadUintL( TPtrC(COMMDB_ID),  defaultRoamingId);
-                LOGSTRING( "accesspoint id read done" );
-                
-                apDataHandler->RemoveAPL( defaultRoamingId );
-                }
-                
-            LOGSTRING( "create it" );
-            CApAccessPointItem* newAp = CApAccessPointItem::NewLC();
-            
-            newAp->CopyFromL( *apItem );
-
-            const RMobilePhone::TMobilePhoneSubscriberId& imsi = iRegistrationMonitor->GetImsi();
-            TBuf<KMaxAPNLength> newName;
-            newName.Append( *apName );
-            newName.Append( KDot );
-            newName.Append( KMNC0 );
-            newName.Append( imsi.Mid(3,2) );
-            newName.Append( KDot );
-            newName.Append( KMCC );
-            newName.Append( imsi.Mid(0,3) );
-            newName.Append( KDot );
-            newName.Append( KGprs );
-            newAp->SetNamesL( KDefaultRoamingName  );
-            newAp->WriteTextL( EApWapAccessPointName, KDefaultRoamingName );
-            newAp->WriteLongTextL( EApGprsAccessPointName, newName );
-            LOGSTRING( "calling update" );
-            TInt retries = KRetryCount;
-            TRAPD( err, apDataHandler->CreateFromDataL(*newAp) );
-            while( (err == KErrLocked) && retries-- )
-                {
-                User::After( KRetryWait );
-                TRAP( err, apDataHandler->CreateFromDataL(*newAp) );
-                }
-            if( err != KErrNone )
-                {
-                User::Leave( err );
-                }
-            LOGSTRING( "calling update done" );
-            
-            newAp->ReadUint( EApWapIap, returnValue );
-            newAp->ReadUint( EApWapAccessPointID, iAccessPoint );
-
-            LOGSTRING( "update done" );
-            CleanupStack::PopAndDestroy( newAp );
-            CleanupStack::PopAndDestroy( theDefaultRoamingView );
-            }
-        CleanupStack::PopAndDestroy( apDataHandler );
-        CleanupStack::PopAndDestroy( apItem );
-        }
-    CleanupStack::PopAndDestroy( theDb );
-
-
-    LOGSTRING2( "Check default access point returns %i", returnValue );
-    LOGSTRING2( "iAccessPoint %i", iAccessPoint );
-
-    return returnValue;
-    }
-
-// -----------------------------------------------------------------------------
-// CCMAppUI::InitAccessPointL()
-// Cheks the id of accesspoint which APN is initAccess
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-TUint32 CCMAppUi::InitAccessPointL()
-    {
-    LOGSTRING( "CCMAppUi::InitAccessPointL()" );
-    if(iInitAccessOn)
-    	{
-    CCommsDatabase*    theDb;
-
-    theDb = CCommsDatabase::NewL();
-    CleanupStack::PushL( theDb );
-
-    TUint32 initAP( 0 );
-
-    TBool value( EFalse );
-    TRAPD( err, value = CheckInitAccessPointL(*theDb, initAP) );
-
-    if( value == EFalse )
-        {
-        CreateInitAccessPointL( *theDb );
-        TRAP( err, CheckInitAccessPointL( *theDb, initAP ) );
-        }
-    else
-        {
-        LOGSTRING( "Init AP was ok" );
-        }
-        
-
-    CleanupStack::PopAndDestroy( theDb );
-
-    return( initAP );
-    }
-    else
-    	{
-    	LOGSTRING( "CCMAppUi::InitAccessPointL Init Access feature off" );
-    	return KErrNone;
-    	}
-    }
-
-// -----------------------------------------------------------------------------
-// CCMAppUI::CheckInitAccessPointL()
-// Cheks the settings of accesspoint which APN is initAccess
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-TBool CCMAppUi::CheckInitAccessPointL( CCommsDatabase& aDb, TUint32& aAccessPoint )
-    {
-    LOGSTRING( "CCMAppUi::CheckInitAccessPointL" ); 
-if(iInitAccessOn)
-	{
-    CCommsDbTableView* theView;
-    CCommsDbTableView* iapView;
-    CCommsDbTableView* wapIpBearerView;
-    TInt errorCode;
-    TBool firstTime = ETrue; // crude solution
-    TUint32 tableId;
-
-    TBuf<KMaxAPNLength> initAccess;
-    initAccess.Append( KInitAccess );
-
-    const RMobilePhone::TMobilePhoneSubscriberId& imsi = iRegistrationMonitor->GetImsi();
-    if( iNetworkStatus == CCMRegistrationMonitor::ERoaming )
-        {
-        initAccess.Append( KDot );
-        initAccess.Append( KMNC0 );
-        initAccess.Append( imsi.Mid(3,2) );
-        initAccess.Append( KDot );
-        initAccess.Append( KMCC );
-        initAccess.Append( imsi.Mid(0,3) );
-        initAccess.Append( KDot );
-        initAccess.Append( KGprs );
-        }
-    
-    theView = aDb.OpenViewMatchingTextLC( TPtrC( OUTGOING_GPRS),
-                                         TPtrC( GPRS_APN ), 
-                                         initAccess );
-    errorCode = theView->GotoFirstRecord();
-
-    FOREVER // will exit when no more records found or the first one not found or a valid found
-        {
-        if( !firstTime )
-            {
-            LOGSTRING( "trying to get next record" );
-            errorCode = theView->GotoNextRecord();
-            if( errorCode != KErrNone )
-                {
-                CleanupStack::PopAndDestroy( theView ); 
-                return( EFalse );
-                }
-            LOGSTRING( "checking next record" );    
-            }
-        firstTime = EFalse;
-
-        if ( errorCode == KErrNone )
-            {
-            theView->ReadUintL( TPtrC( COMMDB_ID ), tableId );
-            iapView = aDb.OpenViewMatchingUintLC(TPtrC( IAP ),
-                                             TPtrC( IAP_SERVICE ), 
-                                             tableId );
-            errorCode = iapView->GotoFirstRecord();
-
-            if ( errorCode == KErrNone )
-                {
-                iapView->ReadUintL( TPtrC( COMMDB_ID ), aAccessPoint );
-                wapIpBearerView = aDb.OpenViewMatchingUintLC(TPtrC( WAP_IP_BEARER ),
-                                             TPtrC( WAP_IAP ), 
-                                             aAccessPoint );
-                errorCode = wapIpBearerView->GotoFirstRecord();
-                if ( errorCode == KErrNone )
-                    {
-                    wapIpBearerView->ReadUintL( TPtrC( WAP_ACCESS_POINT_ID ), iAccessPoint );
-                    }
-                else
-                    {
-                    LOGSTRING( "wapIpBearerView->GotoFirstRecord()" );
-                    CleanupStack::PopAndDestroy( wapIpBearerView ); // wapIpBearerView
-                    CleanupStack::PopAndDestroy( iapView ); // iapView
-                    continue;
-                    }
-                CleanupStack::PopAndDestroy(); // wapIpBearerView
-                }
-            else
-                {
-                LOGSTRING( "iapView->GotoFirstRecord() failed" );
-                CleanupStack::PopAndDestroy( iapView ); // iapView
-                continue;
-                }
-
-            CleanupStack::PopAndDestroy( iapView ); // iapView
-            }
-        else
-            {
-            LOGSTRING( "theView->GotoFirstRecord() failed" );
-            CleanupStack::PopAndDestroy( theView );
-            return( EFalse );
-            }
-
-        if( iServer == KDefaultServerString )
-            {
-            LOGSTRING( "checking that init access not modified" );
-            // check also user name, prompt password, password, authentication, homepage
-            TBuf8<100> userName;
-            theView->ReadTextL( TPtrC(GPRS_IF_AUTH_NAME), userName );
-            if( userName.Length() != 0 )
-                {
-                LOGSTRING( "username length was not 0" );
-                continue;
-                }
-            TBool promptPasswd;
-            theView->ReadBoolL( TPtrC(GPRS_IF_PROMPT_FOR_AUTH), promptPasswd );
-            if( promptPasswd != EFalse )
-                {
-                LOGSTRING( "promptPasswd was not EFalse" );
-                continue;
-                }
-            TBuf8<100> passwd;
-            theView->ReadTextL( TPtrC(GPRS_IF_AUTH_PASS), passwd );
-            if( passwd.Length() != 0 )
-                {
-                LOGSTRING( "passwd length was not 0" );
-                continue;
-                }
-            LOGSTRING( "init access not modified" );
-            }
-
-        CleanupStack::PopAndDestroy( theView );
-        return( ETrue );
-        }
-    }
-    else
-    	{
-    	LOGSTRING( "CCMAppUi::CheckInitAccessPointL Init Access feature off" );
-    	return EFalse;
-    	}
-    }
-
-// -----------------------------------------------------------------------------
-// CCMAppUI::CreateInitAccessPointL( CCommsDatabase& aDb )
-// Creates the Init Access point to comms db
-// -----------------------------------------------------------------------------
-//
-TUint32 CCMAppUi::CreateInitAccessPointL( CCommsDatabase& aDb )
-    {
-    if(iInitAccessOn)
-    {
-    CApDataHandler* apDataHandler = CApDataHandler::NewLC( aDb );
-    CApAccessPointItem* apItem = CApAccessPointItem::NewLC();
-
-    TBuf<KMaxAPNLength> initAccess;
-    initAccess.Append( KInitAccess );
-
-    if( iNetworkStatus == CCMRegistrationMonitor::ERoaming )
-        {
-        const RMobilePhone::TMobilePhoneSubscriberId& imsi = iRegistrationMonitor->GetImsi();
-        initAccess.Append( KDot );
-        initAccess.Append( KMNC0 );
-        initAccess.Append( imsi.Mid(3,2) );
-        initAccess.Append( KDot );
-        initAccess.Append( KMCC );
-        initAccess.Append( imsi.Mid(0,3) );
-        initAccess.Append( KDot );
-        initAccess.Append( KGprs );
-        }
-
-    if( iNetworkStatus == CCMRegistrationMonitor::ERoaming )
-        {
-        apItem->SetNamesL( KInitAccessRoamingName  );
-        }
-    else
-        {
-        apItem->SetNamesL( KInitAccess );
-        }
-    
-    apItem->WriteLongTextL( EApGprsAccessPointName, initAccess );
-
-    LOGSTRING( "CreateInitAccessPointL, setting bearer type" );
-    apItem->SetBearerTypeL( EApBearerTypeGPRS );
-    LOGSTRING( "CreateInitAccessPointL, setting isp type type" );
-    apItem->WriteUint( EApIspIspType, EIspTypeInternetOnly );
-    LOGSTRING( "CreateInitAccessPointL, creating" );
-    apDataHandler->CreateFromDataL( *apItem );
-
-    CleanupStack::PopAndDestroy( apItem );
-    CleanupStack::PopAndDestroy( apDataHandler );
-    
-    return apItem->WapUid();
-    	}
-    else
-    	{
-    	LOGSTRING( "CCMAppUi::CreateInitAccessPointL Init Access feature off" );
-    	return KErrNone;
-    	}
-    }
-
-// -----------------------------------------------------------------------------
-// CCMAppUI::ReadAccessPointFromPreferencesL()
-// Reads the accesspoint value from Connection preferences table
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-TInt CCMAppUi::ReadAccessPointFromPreferencesL()
-    {
-    LOGSTRING( "CCMAppUi::ReadAccessPointFromPreferencesL()" );
-    TInt errorCode( KErrGeneral );
-    TInt returnValue;
-    CCommsDatabase*    theDb;
-    CCommsDbConnectionPrefTableView* thePrefView;
-    CCommsDbTableView* theView;
-    CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref;
-    CCommsDbConnectionPrefTableView::TCommDbIapBearer bearer;
-
-    theDb = CCommsDatabase::NewL( );
-    CleanupStack::PushL( theDb );
-    thePrefView = theDb->
-        OpenConnectionPrefTableViewOnRankLC( ECommDbConnectionDirectionOutgoing, TUint( 1 ));
-    returnValue = thePrefView -> GotoFirstRecord();
-    if ( returnValue == KErrNone )
-        {
-        thePrefView->ReadConnectionPreferenceL( pref );
-        bearer = pref.iBearer;
-        LOGSTRING2("ReadAccessPointFromPreferencesL: iap %i", bearer.iIapId );
-        
-        theView = theDb->OpenViewMatchingUintLC( TPtrC( WAP_IP_BEARER ),
-                                         TPtrC( WAP_IAP ), 
-                                         bearer.iIapId );
-        errorCode = theView->GotoFirstRecord();
-        if ( errorCode == KErrNone )
-            {
-            theView->ReadUintL( TPtrC( WAP_ACCESS_POINT_ID ),  iAccessPoint );
-            }
-
-        CleanupStack::PopAndDestroy( theView );
-        CleanupStack::PopAndDestroy( thePrefView );
-        CleanupStack::PopAndDestroy( theDb );
-        }
-
-    return returnValue;
-    }
-
-// -----------------------------------------------------------------------------
-// CCMAppUI::CheckIniFileSettings
-// cheks what kind of information exsist in configuration managers ini file
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CCMAppUi::CheckIniFileSettingsL()
-    {
-    LOGSTRING( "CCMAppUi::CheckIniFileSettingsL()" );
-    TInt roaming(0);
-
-    TInt errorCodeRoaming = GetIntValue( KOnlineSupportRoaming, roaming );
-    LOGSTRING2("Errorcode roaming %i", errorCodeRoaming );    
-    
-    if ( errorCodeRoaming == KErrNone )
-        {
-        iFirstStartInHomeNetwork = ETrue;
-        }
-    }
-
-
-TInt CCMAppUi::StoreIntValue( const TUint32 aCrKey, const TInt aValue )
-    {
-    return iRepository->Set( aCrKey, aValue );
-    }
-
-TInt CCMAppUi::StoreStringValue( const TUint32 aCrKey, const TDesC& aValue )
-    {
-    return iRepository->Set( aCrKey, aValue );
-    }
-
-TInt CCMAppUi::GetIntValue( const TUint32 aCrKey, TInt& aValue )
-    {
-    return iRepository->Get( aCrKey, aValue );
-    }
-
-TInt CCMAppUi::GetStringValue( const TUint32 aCrKey, TDes& aValue )
-    {
-    return iRepository->Get( aCrKey, aValue );
-    }
-
-
-// -----------------------------------------------------------------------------
-// CCMAppUI::ShowWaitDialogL
-// Shows wait note
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CCMAppUi::ShowWaitDialogL()
-    {
-    LOGSTRING( "Enter to CCMAppUi::ShowWaitDialogL");
-    if( !iAutoStart ) 
-        {
-        HBufC* msgText = CEikonEnv::Static()->
-            AllocReadResourceLC( R_CONFMANAGER_WAITNOTE ); 
-
-        if (iCommonDialogMonitor)
-            {
-            iCommonDialogMonitor->Cancel();
-            delete iCommonDialogMonitor;
-            iCommonDialogMonitor = NULL;
-            }
-        // instantiate the active object CGlobalConfirmationObserver
-        iCommonDialogMonitor = CCMDialogMonitor::NewL( *this );
-        
-        iCommonDialogMonitor->SetDialogMode(CCMDialogMonitor::EWait);
-        // SetActive
-        iCommonDialogMonitor->Start();
-        
-        if (!iGlobalWaitNote)
-            {
-            iGlobalWaitNote = CAknGlobalNote::NewL();
-            }
-
-        iWaitNoteId = iGlobalWaitNote->ShowNoteL(
-            iCommonDialogMonitor->iStatus,
-            EAknGlobalWaitNote,
-            *msgText );
-        
-        CleanupStack::PopAndDestroy( msgText );
-        }
-    LOGSTRING( "Exit from ShowWaitDialogL" );
-    }
-
-// -----------------------------------------------------------------------------
-// CCMAppUI::StartUpOperationL()
-// Shows wait note
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CCMAppUi::StartUpOperationL()
-    {
-    LOGSTRING( "CCMAppUi::StartUpOperationL" );
-    CheckIniFileSettingsL();
-
-    iApplicationStatus = EAppStatusMonitoring;
-    iRegistrationMonitor->StartMonitoring();
-
-    // Start time-out timer
-    StartTimeOut( KMonitoringTimeOut );
-    LOGSTRING( "Monitoring started" );
-    }
-
-// -----------------------------------------------------------------------------
-// CCMAppUi::SetServerString()
-// Sets server string
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CCMAppUi::SetServerString(const TDesC& aServer)
-    {
-    if (aServer.Length()>KMaxServerString)
-        {
-        iServer.Copy( TPtrC( aServer.Left( KMaxServerString ) ) );
-        }
-    else
-        {
-        iServer.Copy( TPtrC( aServer ) );
-        }
-    LOGTEXT (iServer);
-    }
-
-// -----------------------------------------------------------------------------
-// CCMAppUi::SetPageString()
-// Sets page string
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CCMAppUi::SetPageString(const TDesC& aPage)
-    {
-    if (aPage.Length() > KMaxPageString)
-        {
-        iPage = TPtrC( aPage.Left( KMaxPageString ) );
-        }
-    else
-        {
-        iPage = TPtrC( aPage );
-        }
-    LOGTEXT (iPage);
-    }
-
-// -----------------------------------------------------------------------------
-// CCMAppUi::SetConnectReason()
-// Sets connect reason
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CCMAppUi::SetConnectReason(TConnectReason aReason)
-    {
-    iConnectReason = aReason;
-    }
-
-// -----------------------------------------------------------------------------
-// CCMAppUi::SetQueryString()
-// Sets query string
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CCMAppUi::SetQueryString(const TDesC& aQuery)
-    {
-    if ( aQuery.Length() > KMaxQueryString )
-        {
-        iQuery = TPtrC( aQuery.Left( KMaxQueryString ) );
-        }
-    else
-        {
-        iQuery = TPtrC( aQuery );
-        }
-    LOGTEXT (iQuery);
-    }
-
-// -----------------------------------------------------------------------------
-// CCMAppUI::ConnectionResultL
-// -----------------------------------------------------------------------------
-//
-void CCMAppUi::ConnectionResultL( const TInt aErrorCode )
-    {
-    if( iApplicationStatus == EAppStatusClosing )
-        {
-        return;
-        }
-        
-    if( iTimer->IsActive() )
-        {
-        iTimer->Cancel();
-        }
-        
-    iApplicationStatus = EAppStatusInactive;
-
-    LOGSTRING( "CCMAppUi::ConnectionResultL" );
-    LOGSTRING2( "iConnectingVia:%i", iConnectingVia );
-    LOGSTRING2( "aErrrorCode:%i", aErrorCode );
-
-    
-    if( iConnectingVia == EConnectingViaUser ) // this was the last access point to test
-        {
-        if( aErrorCode != KErrNone )
-            {
-            LOGSTRING( "ErrorNoteConnectionL" );
-            ErrorNoteConnectionL();
-            LOGSTRING( "RestoreSettings done" );
-            //DelayedExit();
-            Exit();
-            return;
-            }
-        else
-            {
-            ReadAccessPointFromPreferencesL();
-            }
-        }
-
-    if( aErrorCode == KErrNone )
-        {
-        if( iGlobalWaitNote )
-            {
-            iGlobalWaitNote->CancelNoteL(iWaitNoteId);
-            delete iGlobalWaitNote;
-            iGlobalWaitNote = NULL;
-            }
-        /*        
-        if( iConnectReason == CCMAppUi::EConnectReasonFirstBoot )
-            {
-            TApaTaskList taskList( CEikonEnv::Static()->WsSession() );
-            TApaTask task = taskList.FindApp( KUidConfigurationManager );
-            if( iWaitDialog && !iWaitDialogProcessFinished )
-                {
-                LOGSTRING("iWaitDialog->ProcessFinishedL()");
-                iWaitDialogProcessFinished = ETrue;
-                iWaitDialog->ProcessFinishedL();
-                }
-            
-            
-            task.BringToForeground();
-            }
-
-        // this test succeeded, open the browser
-        LOGSTRING( "Test succeeded, closing waitdialog" )
-        if( iWaitDialog && !iWaitDialogProcessFinished )
-            {
-            LOGSTRING("iWaitDialog->ProcessFinishedL()");
-            iWaitDialogProcessFinished = ETrue;
-            iWaitDialog->ProcessFinishedL();
-            }*/
-        OpenWapBrowserL();
-        }
-    else
-        {
-        // failed, continue to next test
-        iEngine->Disconnect();
-        InitiateNextConnectionTestL();
-        LOGSTRING( "InitiateNextConnectionTestL done" );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// CCMAppUI::UnhandledLeave
-//
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CCMAppUi::UnhandledLeave( TInt aErrorCode )
-    {
-    LOGSTRING2( "CCMAppUi::UnhandledLeave: %i", aErrorCode );
-
-    TRAP_IGNORE( ErrorNoteUnknownL( aErrorCode ) );
-    //DelayedExit();
-    Exit();
-    }
-
-// -----------------------------------------------------------------------------
-// CCMAppUI::StatusChanged
-// 
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CCMAppUi::RegistrationMonitoringDoneL( CCMRegistrationMonitor::TNetworkStatus aNetworkStatus )
-    {    
-    LOGSTRING2( "CCMAppUi::RegistrationMonitoringDoneL %i", aNetworkStatus );
-
-    iNetworkStatus = aNetworkStatus;
-
-    switch( aNetworkStatus )
-        {
-        case CCMRegistrationMonitor::EStatusUnknown:
-        case CCMRegistrationMonitor::ERequestCancelled:
-        case CCMRegistrationMonitor::ERoaming:
-        case CCMRegistrationMonitor::EHomenetwork:
-            {
-            iNetworkStatusOk = ETrue;
-            if( iApplicationStatus == EAppStatusClosing )
-                {
-                return;
-                }   
-            if( iTimer->IsActive() )
-                {
-                iTimer->Cancel();
-                }
-            iRegistrationMonitor->StopMonitoring(); 
-            break;
-            }
-        default:
-            break;
-        };
-    LOGSTRING( "Status changed" );
-    InitiateNextConnectionTestL();
-    }
-
-// -----------------------------------------------------------------------------
-// CCMAppUI::RegistrationReportErrorL
-// 
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CCMAppUi::RegistrationReportErrorL( const CCMRegistrationMonitor::TMonitoringStatus aStatus, const TInt aError )
-    {
-    LOGSTRING( "CCMAppUi::RegistrationReportErrorL " );
-    LOGSTRING2( "Registration monitor failed: %i", aStatus );
-    LOGSTRING2( "error: %i", aError );
-    LOGSTRING2( "iApplicationStatus: %i", iApplicationStatus );
-
-    if( iApplicationStatus != EAppStatusClosing )
-        {
-        iApplicationStatus = EAppStatusInactive;
-        if( aError == KErrCancel )
-            {
-            //ErrorNoteNetworkL();
-            ErrorNoteConnectionL();
-            }
-        else
-            {
-            ErrorNoteUnknownL(aError);
-            }
-        //DelayedExit();
-        Exit();
-        }
-    // Keep compiler happy
-    (void)aStatus;
-    }
-
-// -----------------------------------------------------------------------------
-// CCMAppUI::DynInitMenuPaneL
-// Takes care of menu handling.
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CCMAppUi::DynInitMenuPaneL(
-        TInt /*aResourceId*/,
-        CEikMenuPane* /*aMenuPane*/
-        )
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// CCMAppUI::HandleCommandL
-// Handles commands
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CCMAppUi::HandleCommandL( TInt  /*aCommand*/ )
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// CCMAppUI::HandleKeyEventL
-// Handles key events
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-TKeyResponse CCMAppUi::HandleKeyEventL(
-        const TKeyEvent& /*aKeyEvent*/, // aKeyEvent Event to handled.
-        TEventCode /*aType*/)           // aType Type of the key event.
-    {
-    return EKeyWasNotConsumed;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CCMAppUI::WaitDialogDismissedL
-// Handles key events
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CCMAppUi::WaitDialogDismissedL( TInt aButtonId )
-    {
-    LOGSTRING2( "CCMAppUi::WaitDialogDismissedL %i", aButtonId );
-    LOGSTRING2( "iApplicationStatus %i", iApplicationStatus );
-
-    if( iApplicationStatus == EAppStatusClosing )
-        {
-        LOGSTRING("Already closing");
-        return;
-        }
-
-    if( iTimer->IsActive() )
-        {
-        iTimer->Cancel();
-        }
-
-    if( aButtonId == EAknSoftkeyCancel /*EConfmSoftkeyCancel*/
-        || aButtonId == EAknSoftkeyExit )
-        {
-        // User pressed Cancel to iWaitDialog
-        LOGSTRING("EConfmSoftkeyCancel");
-
-        // iWaitDialog is already being destroyed, do not destroy again
-        //iWaitDialogProcessFinished = ETrue;
-
-        iEngine->Disconnect();
-        //DelayedExit();
-        Exit();
-        return;
-        }
-
-    if ( iApplicationStatus == EAppStatusMonitoring )
-        {
-        LOGSTRING("EAppStatusMonitoring");
-        //DelayedExit();
-        Exit();
-        }
-    else if ( iApplicationStatus == EAppStatusConnecting )
-        {
-        LOGSTRING("EAppStatusConnecting");
-        iEngine->Disconnect();
-        //DelayedExit();
-        Exit();
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// CCMAppUI::HandleGainingForeground
-//
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CCMAppUi::HandleGainingForeground()
-    {
-    LOGSTRING( "CCMAppUi::HandleGainingForeground" );
-    #ifndef _DEBUG // if urel -> hide application in silent mode
-    if( iAutoStart )
-        {
-        // prevent user from switching to ServiceHelp application
-        // when using silent mode by always sending ServiceHelp to background
-        TApaTaskList taskList( CEikonEnv::Static()->WsSession() );
-        TApaTask task = taskList.FindApp( KUidConfigurationManager );
-        if( task.Exists() )
-            {
-            task.SendToBackground();
-            }
-        }
-    #endif
-    }
-
-// -----------------------------------------------------------------------------
-// CCMAppUI::HandleLosingForeground
-//
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CCMAppUi::HandleLosingForeground()
-    {
-    LOGSTRING( "CCMAppUi::HandleLosingForeground" );
-    }
-    
-void CCMAppUi::CommonDialogDismissedL( const CCMDialogMonitor::TDialogMode aDialog, const TInt aStatusCode )
-    {
-    LOGSTRING( "CCMAppUi::CommonDialogDismissedL" );
-    if( aDialog == CCMDialogMonitor::EConfirmation )
-        {
-        if( aStatusCode == EAknSoftkeyYes )
-            {
-            StartTimeOut( KStartUpTimeOut );
-            ShowWaitDialogL();
-            }
-        else
-            {
-            Exit();
-            }
-        }
-    else if ( aDialog == CCMDialogMonitor::EWait )
-        {
-        // cancel
-        WaitDialogDismissedL( aStatusCode );
-        }
-    }
-
-
-// -----------------------------------------------------------------------------
-// CCMAppUI::FetchProductModelAndSwVersionL
-//
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CCMAppUi::FetchProductModelAndSwVersionL()
-    {
-    LOGSTRING( "CCMAppUi::FetchProductModelAndSwVersionL - begin" );
-    iSwVersion.Zero();
-    iProductModel.Zero();
-
-    HBufC* tmpVersion = HBufC::NewLC( KSysUtilVersionTextLength );
-    TPtr ptr( tmpVersion->Des() );
-    User::LeaveIfError( SysUtil::GetSWVersion( ptr ) );
-    LOGTEXT(ptr);
-
-    _LIT(KVerStrStart,"V ");
-    _LIT(KVerStrEnd,"\n");
-
-    TInt pos1 = tmpVersion->Find(KVerStrStart);
-    TInt pos2 = tmpVersion->Find(KVerStrEnd);
-    TInt verlen = ((TDesC)(KVerStrStart)).Length();
-    
-    if( pos1==KErrNotFound) // Version does not start with "V "
-        {
-        pos1=0;
-        verlen=0;
-        }
-
-    if(    (pos1!=KErrNotFound) 
-        && (pos2!=KErrNotFound) 
-        && (pos2 > (pos1 + verlen) ) 
-      )
-        {
-        pos2 -= (verlen + pos1);
-        TPtrC ptrSw = ptr.Mid(pos1+verlen,pos2);
-        iSwVersion.Append(ptrSw);
-        LOGTEXT( iSwVersion);
-
-        TPtrC ptrSeek(ptr);
-        pos1 = ptrSeek.Find(KVerStrEnd);
-        if(pos1>=0)
-            {
-            ptrSeek.Set(ptrSeek.Mid(pos1+1));
-            pos1 = ptrSeek.Find(KVerStrEnd);
-            if( pos1 >= 0 )
-                {
-                ptrSeek.Set(ptrSeek.Mid(pos1+1));
-                pos1 = ptrSeek.Find(KVerStrEnd);
-                if( pos1 < 0 )
-                    {
-                    ptrSeek.Set(ptrSeek.Mid(1));
-                    iProductModel.Append(ptrSeek);
-                    }
-                else if( pos1 > 0 )
-                    {
-                    ptrSeek.Set(ptrSeek.Mid(1,pos1-1));
-                    iProductModel.Append(ptrSeek);
-                    }
-                LOGTEXT(iProductModel);
-                }
-            }
-        
-        }
-
-    CleanupStack::PopAndDestroy();
-    LOGSTRING( "CCMAppUi::FetchProductModelAndSwVersionL - end" );
-    }
-
-// ========================== OTHER EXPORTED FUNCTIONS =========================
-// None
-
-
-// End of File  
--- a/pnpmobileservices/pnpms/OnlineSupport/src/CCMApplication.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,111 +0,0 @@
-/*
-* Copyright (c) 2003-2006 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:  Source file for class CCMApplication
-*
-*/
-
-
-
-// INCLUDE FILES
-#include "CCMApplication.h"
-#include "CCMDocument.h"
-#include "OnlineSupportLogger.h"
-
-// EXTERNAL DATA STRUCTURES
-// None
-
-// EXTERNAL FUNCTION PROTOTYPES  
-// None
-
-// CONSTANTS
-// None
-
-// MACROS
-// None
-
-// LOCAL CONSTANTS AND MACROS
-// None
-
-// MODULE DATA STRUCTURES
-// None
-
-// LOCAL FUNCTION PROTOTYPES
-// None
-
-// FORWARD DECLARATIONS
-// None
-
-// EXTERNAL FUNCTION PROTOTYPES  
-// None
-
-// LOCAL CONSTANTS AND MACROS
-// None
-
-// MODULE DATA STRUCTURES
-// None
-
-// LOCAL FUNCTION PROTOTYPES
-// None
-
-
-// ============================= LOCAL FUNCTIONS ===============================
-// None
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-    
-
-#include <eikstart.h>
-
-LOCAL_C CApaApplication* NewApplication()
-    {
-    return new CCMApplication;
-    }
-
-GLDEF_C TInt E32Main()
-    {
-    return EikStart::RunApplication(NewApplication);
-    }
-
-
-// -----------------------------------------------------------------------------
-// CCMApplication::CreateDocumentL
-// Creates CCMDocument object
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-CApaDocument* CCMApplication::CreateDocumentL()
-    {
-    CCMDocument* self = new CCMDocument( *this );
-    return self; 
-    }
-
-
-// -----------------------------------------------------------------------------
-// CCMApplication::AppDllUid()
-// Returns application UID
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-TUid CCMApplication::AppDllUid() const
-    {
-    return KUidConfigurationManager;
-    }
-
-// ========================== OTHER EXPORTED FUNCTIONS =========================
-
-
-
-// End of File  
-
--- a/pnpmobileservices/pnpms/OnlineSupport/src/CCMDocument.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,91 +0,0 @@
-/*
-* Copyright (c) 2003 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:  Contains the implementation of CCMDocument class methods
-*
-*/
-
-
-
-// INCLUDE FILES
-#include "CCMDocument.h"
-#include "CCMAppUi.h"
-/*** Begin added by Jarmo Pyrro ***/
-#include "OnlineSupportLogger.h"
-#include <bacline.h>
-/*** End added by Jarmo Pyrro ***/
-
-// EXTERNAL DATA STRUCTURES
-// None
-
-// EXTERNAL FUNCTION PROTOTYPES  
-// None
-
-// CONSTANTS
-// None
-
-// MACROS
-// None
-
-// LOCAL CONSTANTS AND MACROS
-// None
-
-
-// MODULE DATA STRUCTURES
-// None
-
-// LOCAL FUNCTION PROTOTYPES
-// None
-
-// FORWARD DECLARATIONS
-// None
-
-// ============================= LOCAL FUNCTIONS ===============================
-// None
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CCMDocument::CCMDocument
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CCMDocument::CCMDocument(
-        CEikApplication& aApp  // CEikApplication reference
-        ) : CAknDocument(aApp)
-    {
-    }
-
-// destructor
-CCMDocument::~CCMDocument()
-    {
-    }
-    
-// -----------------------------------------------------------------------------
-// CCMDocument::CreateAppUiL
-// Creates CCMAppUi object
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-CEikAppUi* CCMDocument::CreateAppUiL()
-    {
-    return new (ELeave) CCMAppUi;
-    }
-
-
-
-// ========================== OTHER EXPORTED FUNCTIONS =========================
-// None
-
-// End of File  
--- a/pnpmobileservices/pnpms/OnlineSupport/src/Ccmregistrationmonitor.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,387 +0,0 @@
-/*
-* Copyright (c) 2003-2006 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:  Contains the implementation of the CCMRegistrationMonitor class
-*                the class is used to monitor the registeration status between 
-*                the network and phone.
-*
-*/
-
-
-
-// INCLUDE FILES
-#include    <basched.h>
-#include    "OnlineSupportLogger.h"
-#include    "CCMRegistrationMonitor.h"
-#include    "MCMRegisterationStatusNotifier.h"
-
-// EXTERNAL DATA STRUCTURES
-// None
-
-// EXTERNAL FUNCTION PROTOTYPES  
-// None
-
-// CONSTANTS
-// PhoneModule name
-_LIT( KPhoneModuleName, "Phonetsy.tsy");
-
-_LIT( KPhoneName, "DefaultPhone");
-
-// Time out for the registeration status check
-// 15 seconds time-out if the phone was first time unable to receive the network
-// status the application will wait 5 seconds for the change of the status
-const TInt KMaxInterval = 5; 
-
-// MACROS
-// None
-
-// LOCAL CONSTANTS AND MACROS
-// None
-
-// MODULE DATA STRUCTURES
-// None
-
-// LOCAL FUNCTION PROTOTYPES
-// None
-
-// FORWARD DECLARATIONS
-// None
-
-// ============================= LOCAL FUNCTIONS ===============================
-// None
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CCMRegistrationMonitor::CCMRegistrationMonitor
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-
-CCMRegistrationMonitor::CCMRegistrationMonitor( MCMRegisterationStatusNotifier& aNotifier ) :
-    CActive( CActive::EPriorityStandard ),
-    iMonitoringStatus( EInactive ),
-    iNotifier( aNotifier ),
-    iRegisterationStatus( RMobilePhone::ERegistrationUnknown ),
-    iCurrentNetworkInfoPckg( iCurrentNetworkInfo ),
-    iHomeNetworkInfoPckg( iHomeNetworkInfo ),
-    iOwnNumberInfoPckg( iOwnNumberInfo ),
-    iServiceProviderNamePckg( iServiceProviderName )
-    {
-    }
-
-
-// -----------------------------------------------------------------------------
-// CCMRegistrationMonitor::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CCMRegistrationMonitor::ConstructL()
-    {
-    User::LeaveIfError( iServer.Connect() );
-    User::LeaveIfError( iServer.LoadPhoneModule( KPhoneModuleName ) );
-    iServer.SetExtendedErrorGranularity( RTelServer::EErrorExtended );
-    User::LeaveIfError( iPhone.Open( iServer, KPhoneName ) );
-    CActiveScheduler::Add(this); 
-    }
-
-// -----------------------------------------------------------------------------
-// CCMRegistrationMonitor::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CCMRegistrationMonitor* CCMRegistrationMonitor::NewL( MCMRegisterationStatusNotifier& aNotifier )
-    {
-    CCMRegistrationMonitor* self = new( ELeave ) CCMRegistrationMonitor( aNotifier );    
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop();
-    return self;
-    }
-    
-// Destructor
-CCMRegistrationMonitor::~CCMRegistrationMonitor()
-    {
-    if( IsActive() )
-        {
-        Cancel();
-        }
-    iPhone.Close();
-    iServer.Close();
-    }
-
-
-// -----------------------------------------------------------------------------
-// CCMRegistrationMonitor::StartMonitoring()
-// Starts monitoring of the network registeration status
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CCMRegistrationMonitor::StartMonitoring()
-    {
-    if( IsActive() )
-        {
-        Cancel();
-        }
-    iStartTime.HomeTime();
-#ifdef __WINS__ // do not try to connect on the emulator
-    iRegisterationStatus = RMobilePhone::ERegisteredOnHomeNetwork;
-    TRequestStatus* status = &iStatus;
-    User::RequestComplete( status, KErrNone );
-#else
-    iPhone.GetNetworkRegistrationStatus( iStatus, iRegisterationStatus );
-#endif
-    iMonitoringStatus = ERequestingNetworkStatus;
-    SetActive();
-    }
-
-// -----------------------------------------------------------------------------
-// CCMRegistrationMonitor::StopMonitoring()
-// Stops the registeration monitor
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CCMRegistrationMonitor::StopMonitoring()
-    {
-    LOGSTRING( "Enter to CCMRegistrationMonitor::StopMonitoring " );
-    if( IsActive() )
-        {
-        Cancel();
-        }
-    LOGSTRING( "Exit from CCMRegistrationMonitor::StopMonitoring " );
-    }
-
-// -----------------------------------------------------------------------------
-// CCMRegistrationMonitor::DoCancel()
-// Cancels the monitoring
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CCMRegistrationMonitor::DoCancel()
-    {
-    LOGSTRING("CCMRegistrationMonitor::DoCancel");
-    switch( iMonitoringStatus )
-        {
-        case EInactive:
-            User::Leave( KErrUnderflow );
-            break;
-        case ERequestingNetworkStatus:
-            iPhone.CancelAsyncRequest( EMobilePhoneGetNetworkRegistrationStatus );
-            iMonitoringStatus = EInactive;
-            break;
-        case EWaitingForChangesInNetworkStatus:
-            iPhone.CancelAsyncRequest( EMobilePhoneNotifyNetworkRegistrationStatusChange );
-            iMonitoringStatus = EInactive;
-            break;
-        case ERequestingServiceProviderName:
-            iPhone.CancelAsyncRequest( EMobilePhoneGetServiceProviderName );
-            iMonitoringStatus = EInactive;
-            break;
-        case ERequestingHomeNetworkInfo:
-            iPhone.CancelAsyncRequest( EMobilePhoneGetHomeNetwork );
-            iMonitoringStatus = EInactive;
-            break;
-        case ERequestingCurrentNetworkInfo:
-            iPhone.CancelAsyncRequest( EMobilePhoneGetCurrentNetworkNoLocation );
-            iMonitoringStatus = EInactive;
-            break;
-        case ERequestingOwnNumberInfo:
-            iMonitoringStatus = EInactive;
-            break;
-        case ERequestingPhoneIdentity:
-            iPhone.CancelAsyncRequest( EMobilePhoneGetPhoneId );
-            iMonitoringStatus = EInactive;
-            break;
-        case ERequestingIMSI:
-            iPhone.CancelAsyncRequest( EMobilePhoneGetSubscriberId );
-            iMonitoringStatus = EInactive;
-            break;
-        default:
-            User::Leave( KErrOverflow );
-            break;
-        }
-
-    TInt err( KErrNone );
-    TRAP( err, iNotifier.RegistrationReportErrorL( iMonitoringStatus, KErrCancel ) );
-    LOGSTRING("Monitoring Cancelled");
-    }
-
-TInt CCMRegistrationMonitor::RunError( TInt aError )
-    {
-    LOGSTRING2( "CCMRegistrationMonitor::RunError %i", aError );
-    TInt err( KErrNone );
-    TRAP( err, iNotifier.RegistrationReportErrorL( iMonitoringStatus, aError ) );
-    if( err == KLeaveExit )
-        {
-        User::Leave( KLeaveExit );
-        }
-    if( aError == KLeaveExit )
-        {
-        User::Leave( KLeaveExit );
-        }
-    LOGSTRING( "CCMRegistrationMonitor::RunError - done" );
-    return KErrNone;
-    }
-
-// -----------------------------------------------------------------------------
-// CCMRegistrationMonitor::RunL()
-// Handles object’s request completion event
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CCMRegistrationMonitor::RunL()
-    {
-    LOGSTRING("Enter to CCMRegistrationMonitor::RunL() ");
-    LOGSTRING2( "CCMRegistrationMonitor status %i" , iStatus.Int() );
-    TTime currentTime;
-    TTimeIntervalSeconds interval;
-    TInt seconds;
-
-    switch( iMonitoringStatus )
-        {
-        case EInactive:
-            User::Leave( KErrUnderflow );
-            break;
-        case ERequestingNetworkStatus:
-        case EWaitingForChangesInNetworkStatus:
-            {
-            LOGSTRING( "ERequestingNetworkStatus | EWaitingForChangesInNetworkStatus" );
-            switch( iRegisterationStatus )
-                {
-                // Not Ok cases
-                case RMobilePhone::ERegistrationUnknown:
-                case RMobilePhone::ENotRegisteredNoService:
-                case RMobilePhone::ENotRegisteredEmergencyOnly:
-                case RMobilePhone::ENotRegisteredSearching:
-                case RMobilePhone::ERegisteredBusy:
-                case RMobilePhone::ERegistrationDenied:
-                    currentTime.HomeTime();
-                    currentTime.SecondsFrom( iStartTime, interval );
-                    seconds = interval.Int();
-                    if ( seconds > KMaxInterval )
-                        {
-                        iMonitoringStatus = EInactive;
-                        // Report error
-                        iNotifier.RegistrationMonitoringDoneL( EStatusUnknown );
-                        }
-                    else
-                        {
-                        iMonitoringStatus = EWaitingForChangesInNetworkStatus;
-                        iPhone.NotifyNetworkRegistrationStatusChange( iStatus, iRegisterationStatus );
-                        LOGSTRING( "Network registration status change notification started " );
-                        SetActive();
-                        }
-                    break;
-                // These are Ok
-                case RMobilePhone::ERegisteredOnHomeNetwork:
-                case RMobilePhone::ERegisteredRoaming:
-                    iMonitoringStatus = ERequestingServiceProviderName;
-                    iPhone.GetServiceProviderName( iStatus, iServiceProviderNamePckg );
-                    SetActive();
-                    break;
-                // Some mysterious error
-                default:
-                    LOGSTRING2( "Unknown network status code! %i", iRegisterationStatus );
-                    LOGSTRING2( "ERegisteredOnHomeNetwork: %i", RMobilePhone::ERegisteredOnHomeNetwork );
-                    User::Leave( KErrOverflow );
-                    break;
-                }
-            break;
-            }
-        case ERequestingServiceProviderName:
-            LOGSTRING( "ERequestingServiceProviderName" );
-            iMonitoringStatus = ERequestingHomeNetworkInfo;
-            iPhone.GetHomeNetwork( iStatus, iHomeNetworkInfoPckg );
-            SetActive();
-            break;
-        case ERequestingHomeNetworkInfo:
-            LOGSTRING( "ERequestingHomeNetworkInfo" );
-            iMonitoringStatus = ERequestingCurrentNetworkInfo;
-
-            // Use the override that does not need Location capability
-            iPhone.GetCurrentNetwork(
-                iStatus,
-                iCurrentNetworkInfoPckg );
-                
-            SetActive();
-            break;
-        case ERequestingCurrentNetworkInfo:
-            {
-            LOGSTRING( "ERequestingCurrentNetworkInfo" );
-            iMonitoringStatus = ERequestingOwnNumberInfo;
-
-#ifdef __WINS__
-            TRequestStatus* status = &iStatus;
-            User::RequestComplete( status, KErrNone );
-#else
-            TInt err;
-            err = iONStore.Open( iPhone );
-            if (err != KErrNone) // error occured
-                {
-                LOGSTRING2( "iONStore.Open err: %i", err );
-                User::Leave( err );
-                }
-            iOwnNumberInfo.iIndex = 0;
-            iONStore.Read( iStatus, iOwnNumberInfoPckg );
-#endif
-            SetActive();
-            }
-            break;
-        case ERequestingOwnNumberInfo:
-            {
-            LOGSTRING( "ERequestingOwnNumberInfo" );
-            iMonitoringStatus = ERequestingPhoneIdentity;
-#ifdef __WINS__
-            TRequestStatus* status = &iStatus;
-            User::RequestComplete( status, KErrNone );
-#else
-            iPhone.GetPhoneId( iStatus, iPhoneIdentity );
-#endif
-            SetActive();
-            }
-            break;
-        case ERequestingPhoneIdentity:
-            LOGSTRING( "ERequestingPhoneIdentity" );
-            iMonitoringStatus = ERequestingIMSI;
-            iPhone.GetSubscriberId( iStatus, iIMSI );
-            SetActive();
-            break;
-        case ERequestingIMSI:
-            LOGSTRING( "ERequestingIMSI" );
-            iMonitoringStatus = EDone;
-            switch( iRegisterationStatus )
-                {
-                case RMobilePhone::ERegisteredOnHomeNetwork:
-                    iNotifier.RegistrationMonitoringDoneL( EHomenetwork );
-                    break;
-                case RMobilePhone::ERegisteredRoaming:
-                    iNotifier.RegistrationMonitoringDoneL( ERoaming );
-                    break;
-                default:
-                    iNotifier.RegistrationMonitoringDoneL( EStatusUnknown );
-                    break;
-                }
-            break;
-        default:
-            LOGSTRING( "default" );
-            User::Leave( KErrOverflow );
-            break;
-        }
-    }
-
-// ========================== OTHER EXPORTED FUNCTIONS =========================
-
-// None
-
-//  End of File  
--- a/pnpmobileservices/pnpms/OnlineSupport/src/Ccmsocketsengine.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,632 +0,0 @@
-/*
-* Copyright (c) 2003-2006 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:  Class for the DNS query
-*
-*/
-
-
-
-
-// INCLUDE FILES
-#include <in_sock.h> 
-#include <commdbconnpref.h>
-#include <http.h>
-#include <commdb.h>
-#include <ApDataHandler.h>        // for CApDataHandler
-#include <ApAccessPointItem.h>    // for EApHasProxySettings
-#include <ApUtils.h>            // for CApUtils
-#include <basched.h>            // for KLeaveExit
-#include "CCMSocketsEngine.h"
-#include "MCMSocketsEngineNotifier.h"
-#include "OnlineSupportLogger.h"
-
-// EXTERNAL DATA STRUCTURES
-// None
-
-// EXTERNAL FUNCTION PROTOTYPES  
-// None
-
-// CONSTANTS
-// None
-
-// MACROS
-// None
-
-// LOCAL CONSTANTS AND MACROS
-// None
-
-// MODULE DATA STRUCTURES
-// None
-
-// LOCAL FUNCTION PROTOTYPES
-// None
-
-// FORWARD DECLARATIONS
-// None
-
-// ============================= LOCAL FUNCTIONS ===============================
-// None
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CCMSocketsEngine::CCMSocketsEngine
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-
-CCMSocketsEngine::CCMSocketsEngine( MCMSocketsEngineNotifier& aNotifier ) 
-    : CActive( CActive::EPriorityStandard ),
-    iSocketsEngineNotifier( aNotifier ),
-    iConnectionOpen( EFalse ),
-    iResolverExsists( EFalse ),
-    iLeaveOpen( EFalse ),
-    iProxyPort(0),
-    iProxyDefined( EFalse ),
-    iHttpSessionOpen( EFalse ),
-    iTransactionOpen( EFalse ),
-    iIapId(0)
-    {
-    }
-
-
-// -----------------------------------------------------------------------------
-// CCMSocketsEngine::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CCMSocketsEngine::ConstructL()
-    {
-    // Open channel to Socket Server
-    User::LeaveIfError( iSocketServ.Connect() );
-    CActiveScheduler::Add(this);
-    iProxyIp = HBufC::NewL(1);
-    }
-
-// -----------------------------------------------------------------------------
-// CCMSocketsEngine::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CCMSocketsEngine* CCMSocketsEngine::NewL( MCMSocketsEngineNotifier& aNotifier)
-    {
-    LOGSTRING( "Enter to CCMSocketsEngine::NewL " );
-    CCMSocketsEngine* self = new( ELeave ) CCMSocketsEngine( aNotifier );
-    
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop();
-    LOGSTRING( "Exit from CCMSocketsEngine::NewL " );
-    return self;
-    }
-
-    
-// Destructor
-CCMSocketsEngine::~CCMSocketsEngine()
-    {
-    LOGSTRING( "Enter to CCMSocketsEngine::~CCMSocketsEngine()" );
-    if( IsActive() )
-        {
-        Cancel();
-        }
-
-    LOGSTRING( "CCMSocketsEngine::~CCMSocketsEngine() - 2" );
-
-    if( iTransactionOpen )
-        {
-        LOGSTRING("Canceling transaction");
-        iTransaction.Cancel();
-        LOGSTRING("Closing transaction");
-        iTransaction.Close();
-        iTransactionOpen = EFalse;
-        LOGSTRING("closed");
-        }
-    if( iHttpSessionOpen )
-        {
-        LOGSTRING("Closing session");
-        iSession.Close();
-        iHttpSessionOpen = EFalse;
-        LOGSTRING("closed");
-        }
-    delete iProxyIp;
-    if ( !iLeaveOpen )
-        {
-        LOGSTRING( "CCMSocketsEngine::~CCMSocketsEngine() - 3" );
-        if( iConnectionOpen )
-            {
-            LOGSTRING("Closing connection");
-            iConnection.Close();
-            iConnectionOpen = EFalse;
-            LOGSTRING("closed");
-            }
-        LOGSTRING( "CCMSocketsEngine::~CCMSocketsEngine() - 4" );
-        iSocketServ.Close();
-        }
-    LOGSTRING( "Exit from CCMSocketsEngine::~CCMSocketsEngine()" );
-    }
-
-// -----------------------------------------------------------------------------
-// CCMSocketsEngine::Connect( const TDesC& aAddress )
-// starts the DNS query for the address
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CCMSocketsEngine::ConnectL( TUint32 aAp, const TDesC& aAddress )
-    {
-    LOGSTRING( "CCMSocketsEngine::ConnectL" );
-    LOGSTRING2( "Enter iEngine.Connect() %i", aAp );
-
-    if ( IsActive() )
-        {
-        Cancel();
-        }
-
-    TCommDbConnPref prefs;
-    if( aAp == 0 )
-        {
-        prefs.SetDialogPreference(ECommDbDialogPrefPrompt);
-        }
-    else
-        {
-        prefs.SetDialogPreference(ECommDbDialogPrefDoNotPrompt);
-        }
-    prefs.SetIapId( aAp );
-
-#ifdef __WINS__ // do not try to connect on the emulator
-    TRequestStatus* status = &iStatus;
-    User::RequestComplete( status, KErrNone );
-#else
-    // Open connection
-    TInt err;
-    err = iConnection.Open( iSocketServ );
-    if (err != KErrNone) // error occured
-        {
-        LOGSTRING2( "iConnection.Open err: %i", err );
-        User::Leave( err );
-        }
-    iConnectionOpen = ETrue;
-    iConnection.Start( prefs, iStatus );
-#endif
-
-    iEngineStatus = EStatusConnecting;
-    iWapPage = aAddress;
-    SetActive();
-
-    LOGSTRING( "Exit from CCMSocketsEngine::Connect(). " );
-    }
-
-
-void CCMSocketsEngine::ConnectL( const TDesC& aAddress )
-    {
-    LOGSTRING( "CCMSocketsEngine::ConnectL. " );
-     if ( IsActive() )
-        {
-        Cancel();
-        }
-
-#ifdef __WINS__ // do not try to connect on the emulator
-    TRequestStatus* status = &iStatus;
-    User::RequestComplete( status, KErrNone );
-#else
-    // Open connection
-    TInt err;
-    err = iConnection.Open( iSocketServ );
-    if (err != KErrNone) // error occured
-        {
-        LOGSTRING2( "iConnection.Open err: %i", err );
-        User::Leave( err );
-        }
-    iConnectionOpen = ETrue;
-    iConnection.Start( iStatus );
-#endif
-
-    iEngineStatus = EStatusConnecting;
-    iWapPage = aAddress;
-    SetActive();
-
-    LOGSTRING( "Exit ftom CCMSocketsEngine::Connect(). " );
-    }
-
-// -----------------------------------------------------------------------------
-// CCMSocketsEngine::Disconnect()
-// Disconnects the engine
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CCMSocketsEngine::Disconnect()
-    {
-    LOGSTRING( "CCMSocketsEngine::Disconnect()" );
-    if ( IsActive() )
-        {
-        LOGSTRING("Canceling");
-        Cancel();
-        LOGSTRING("Canceled");
-        }
-    if( iTransactionOpen )
-        {
-        LOGSTRING("Closing transaction");
-        iTransaction.Close();
-        iTransactionOpen = EFalse;
-        LOGSTRING("closed");
-        }
-    if( iHttpSessionOpen )
-        {
-        LOGSTRING("Closing session");
-        iSession.Close();
-        iHttpSessionOpen = EFalse;
-        LOGSTRING("closed");
-        }
-    if ( iEngineStatus == EStatusResolving || iEngineStatus == EStatusReady )
-        {
-        if( iResolverExsists )
-            {
-            LOGSTRING( "CCMSocketsEngine::Disconnect() resolver exists" );
-            iResolver.Cancel();
-            iResolver.Close();
-            iResolverExsists = EFalse;
-            }
-        iEngineStatus = EStatusUnknown;
-        }
-    if( iConnectionOpen )
-        {
-        LOGSTRING("Closing connection");
-        iConnection.Close();
-        iConnectionOpen = EFalse;
-        LOGSTRING("closed");
-        }
-
-    iEngineStatus = EStatusUnknown;
-    LOGSTRING( "CCMSocketsEngine::Disconnect() - done" );
-    }
-
-// -----------------------------------------------------------------------------
-// CCMSocketsEngine::SetOpen()
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CCMSocketsEngine::SetOpen( TBool aOpen )
-    {
-    iLeaveOpen = aOpen;
-    }
-
-// -----------------------------------------------------------------------------
-// CCMSocketsEngine::DoCancel()
-// Cancels the DNS query
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CCMSocketsEngine::DoCancel()
-    {
-    LOGSTRING( "CCMSocketsEngine::DoCancel()" );
-    if( iTransactionOpen )
-        {
-        LOGSTRING("completing requeststatus");
-        TRequestStatus* status = &iStatus;
-        User::RequestComplete( status, KErrCancel );
-        LOGSTRING("Closing transaction");
-        iTransaction.Close();
-        iTransactionOpen = EFalse;
-        LOGSTRING("closed");
-        }
-    if( iHttpSessionOpen )
-        {
-        LOGSTRING("Closing session");
-        iSession.Close();
-        iHttpSessionOpen = EFalse;
-        LOGSTRING("closed");
-        }
-    if( iResolverExsists )
-        {
-        LOGSTRING( "iResolver.Cancel()" );
-        iResolver.Cancel();
-        LOGSTRING( "iResolver.Close()" );
-        iResolver.Close();
-        iResolverExsists= EFalse;
-        }
-    if( iConnectionOpen )
-        {
-        LOGSTRING("Closing connection");
-        iConnection.Close();
-        iConnectionOpen = EFalse;
-        LOGSTRING("closed");
-        }
-    iEngineStatus = EStatusUnknown;
-    }
-
-// -----------------------------------------------------------------------------
-// CCMSocketsEngine::RunL()
-// Handles object’s request completion event
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CCMSocketsEngine::RunL()
-    {
-    LOGSTRING( "CCMSocketsEngine::RunL()" );
-    if ( iStatus.Int() != KErrNone )
-        {
-        iSocketsEngineNotifier.ConnectionResultL( iStatus.Int() );
-        }
-    else
-        {
-        switch( iEngineStatus )
-            {
-            case EStatusUnknown:
-                LOGSTRING( "EStatusUnknown" );
-            case EStatusConnecting:
-                {
-                LOGSTRING( "EStatusConnecting" );
-#ifdef __WINS__ // do not try to connect on the emulator
-                iSocketsEngineNotifier.ConnectionResultL( iStatus.Int() );
-                iEngineStatus = EStatusReady;
-                break;
-#else
-                _LIT( KIapId, "IAP\\Id" );
-                User::LeaveIfError( iConnection.GetIntSetting( KIapId, iIapId ) );
-                const TBool proxyDefined = CheckForProxyL( iIapId );
-
-                if( proxyDefined )
-                    {
-                    MakeHttpHeadRequestL( *iProxyIp, iProxyPort );
-                    iStatus = KRequestPending;
-                    SetActive();
-                    }
-                else
-                    {                
-                    // Initiate a DNS query
-                    LOGSTRING( "opening resolver, using udp protocol" );
-                    TInt errorCode = iResolver.Open( iSocketServ, KAfInet, KProtocolInetUdp, iConnection );
-                    //LOGSTRING( "opening resolver, using icmp protocol" );
-                    //TInt errorCode = iResolver.Open( iSocketServ, KAfInet, KProtocolInetIcmp, iConnection );
-                    //LOGSTRING( "opening resolver, using tcp protocol" );
-                    //TInt errorCode = iResolver.Open( iSocketServ, KAfInet, KProtocolInetTcp, iConnection );
-                    
-                    if ( errorCode != KErrNone )
-                        {
-                        LOGSTRING( "Error while opening resolver" );
-                        iSocketsEngineNotifier.ConnectionResultL( errorCode );
-                        break;
-                        }
-                    else
-                        {
-                        LOGSTRING( "Resolver exists" );
-                        iResolverExsists = ETrue;
-                        // DNS request for name resolution
-                        LOGSTRING( "Querying url:" );
-                        LOGTEXT( iWapPage );
-                        iResolver.GetByName( iWapPage, iNameEntry, iStatus );
-                        SetActive();
-                        iEngineStatus = EStatusResolving;
-                        }
-                    }
-                break;
-#endif
-                }
-            case EStatusMakingHttpHeadRequest:
-                LOGSTRING( "EStatusMakingHttpHeadRequest" );
-                iSocketsEngineNotifier.ConnectionResultL( iStatus.Int() );
-                iEngineStatus = EStatusReady;
-                break;
-            case EStatusResolving:
-                LOGSTRING( "EStatusResolving" );
-                iSocketsEngineNotifier.ConnectionResultL( iStatus.Int() );
-                iEngineStatus = EStatusReady;
-                break;
-            case EStatusReady:
-                LOGSTRING( "EStatusReady" );
-            default:
-                break;
-            };
-        }   
-        //iSocketsEngineNotifier.ConnectionResultL( iStatus.Int() );
-    LOGSTRING( " Exit from CCMSocketsEngine::runL " );
-    }
-
-// -----------------------------------------------------------------------------
-// CCMSocketsEngine::ReturnIAPID()
-// Returns IAPID set when user selects access point before launching browser
-// 
-// -----------------------------------------------------------------------------
-//
-
-TUint32 CCMSocketsEngine::ReturnIAPID()
-{
-	
-	return iIapId;
-}
-
-
-// -----------------------------------------------------------------------------
-// CCMSocketsEngine::RunError()
-// Handles leaves from RunL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-TInt CCMSocketsEngine::RunError(TInt aError)
-    {
-    LOGSTRING2( "CCMSocketsEngine::RunError: %i", aError );
-    if( aError == KLeaveExit )
-        {
-        return aError;
-        }
-    iSocketsEngineNotifier.UnhandledLeave( aError );
-    return KErrNone;
-    }
-
-
-TBool CCMSocketsEngine::CheckForProxyL( const TUint32 aIapId )
-    {
-    LOGSTRING("CCMSocketsEngine::CheckForProxyL")
-
-    // Check for proxy usage
-    CCommsDatabase* commDb = CCommsDatabase::NewL( EDatabaseTypeIAP );
-    CleanupStack::PushL( commDb );
-
-    CApDataHandler* dataHandler = CApDataHandler::NewLC( *commDb );
-    CApAccessPointItem* apItem = CApAccessPointItem::NewLC();
-    CApUtils* utils = CApUtils::NewLC( *commDb );
-
-    TUint32 id = utils->WapIdFromIapIdL( aIapId );
-    dataHandler->AccessPointDataL( id, *apItem );
-
-    TBool hasProxySettings;
-    User::LeaveIfError( apItem->ReadBool( EApHasProxySettings, hasProxySettings ) );
-
-    if( hasProxySettings )
-        {
-        LOGSTRING("HasProxySettings, reading proxy params");
-
-        // Ownership not transferred
-        const HBufC* proxyIp = apItem->ReadConstLongTextL( EApProxyServerAddress );
-        delete iProxyIp;
-        iProxyIp = 0;
-        iProxyIp = HBufC::NewL( proxyIp->Length() );
-        iProxyIp->Des().Copy( *proxyIp );
-        LOGTEXT( *iProxyIp );
-
-        TUint32 temp(0);
-        apItem->ReadUint( EApProxyPortNumber, temp );
-        iProxyPort = temp;
-        }
-
-    CleanupStack::PopAndDestroy( utils );
-    CleanupStack::PopAndDestroy( apItem );
-    CleanupStack::PopAndDestroy( dataHandler );
-    CleanupStack::PopAndDestroy( commDb );
-
-    LOGSTRING("CCMSocketsEngine::CheckForProxyL - done")
-    return hasProxySettings;
-    }
-
-void CCMSocketsEngine::MakeHttpHeadRequestL(
-    const TDesC& aProxyAddress,
-    const TUint aProxyPort )
-    {
-    LOGSTRING( "CCMSocketsEngine::MakeHttpHeadRequestL" );
-    _LIT8( KHttpProtString, "HTTP/TCP" );
-    // Opens session using protocol HTTP/TCP
-    LOGSTRING( "CCMSocketsEngine: iSession.OpenL" );
-    iSession.OpenL( KHttpProtString );
-    iHttpSessionOpen = ETrue;
-    LOGSTRING( "CCMSocketsEngine: iSession.OpenL - done" );
-    iSessionStringPool = iSession.StringPool();
-
-    RHTTPConnectionInfo connectionInfo = iSession.ConnectionInfo();
-
-    // Set SocketServ and Connection explicitly as we do not want to show
-    // the AP selection list to the user when making submit for the request
-    connectionInfo.SetPropertyL(
-        iSessionStringPool.StringF( HTTP::EHttpSocketServ, RHTTPSession::GetTable() ),
-        iSocketServ.Handle() );
-    connectionInfo.SetPropertyL(
-        iSessionStringPool.StringF( HTTP::EHttpSocketConnection, RHTTPSession::GetTable() ),
-        reinterpret_cast< TInt > ( &iConnection ) );
-    connectionInfo.SetPropertyL(
-        iSessionStringPool.StringF( HTTP::EProxyUsage, RHTTPSession::GetTable() ),
-        iSessionStringPool.StringF( HTTP::EUseProxy, RHTTPSession::GetTable() ) );
-
-    LOGSTRING("Set Proxy address");
-    HBufC8* proxy = HBufC8::NewLC( 100 );
-    TPtr8 proxyPtr = proxy->Des();
-    proxyPtr.Copy( aProxyAddress );
-    proxyPtr.Append( _L8( ":" ) );
-    proxyPtr.AppendNum( aProxyPort );
-    LOGTEXT( proxyPtr );
-
-    RStringF proxyF = iSessionStringPool.OpenFStringL( *proxy );
-    CleanupClosePushL( proxyF );
-
-    connectionInfo.SetPropertyL(
-        iSessionStringPool.StringF( HTTP::EProxyAddress, RHTTPSession::GetTable() ),
-        proxyF );
-
-    CleanupStack::PopAndDestroy(1); // proxyF.Close()
-    CleanupStack::PopAndDestroy( proxy );
-
-    TUriParser8 uriParser;
-    LOGSTRING( "CCMSocketsEngine uri:" );
-    _LIT( KHttp, "http://" );
-    TBuf8<128> uri;
-    if( iWapPage.Find( KHttp ) != 0 )
-        {
-        uri.Append( KHttp );
-        }
-    uri.Append( iWapPage.Left(100) );
-    LOGTEXT( uri );
-    User::LeaveIfError( uriParser.Parse( uri ) );
-
-    LOGSTRING( "CCMSocketsEngine: iSession.OpenTransactionL" );
-    iTransaction = iSession.OpenTransactionL( uriParser, *this, iSessionStringPool.StringF( HTTP::EHEAD, RHTTPSession::GetTable() ) );
-    iTransactionOpen = ETrue;
-    LOGSTRING( "CCMSocketsEngine: iSession.OpenTransactionL - done" );
-
-    iTransaction.SubmitL();
-    LOGSTRING( "CCMSocketsEngine: SubmitL - done" );
-
-    iEngineStatus = EStatusMakingHttpHeadRequest;
-    }
-
-
-void CCMSocketsEngine::MHFRunL( RHTTPTransaction aTransaction, const THTTPEvent &aEvent )
-    {
-    LOGSTRING( "CCMSocketsEngine::MHFRunL" );
-
-    switch( aEvent.iStatus )
-        {
-        case THTTPEvent::ESubmit:
-            {
-            LOGSTRING( "CCMSocketsEngine::MHFRunL:ESubmit" );
-            LOGTEXT( aTransaction.Request().URI().UriDes() );
-            break;
-            }
-        case THTTPEvent::EGotResponseHeaders:
-            {
-            LOGSTRING( "CCMSocketsEngine::MHFRunL:EGotResponseHeaders" );
-            // Success
-            TRequestStatus* status = &iStatus;
-            User::RequestComplete( status, KErrNone );
-            break;
-            }
-        case THTTPEvent::EFailed:
-            LOGSTRING( "CCMSocketsEngine::MHFRunL:EFailed" );
-            // Failed
-            User::Leave( KErrGeneral );
-            break;
-        default:
-            {
-            LOGSTRING2( "CCMSocketsEngine::MHFRunL:event: %i", aEvent.iStatus );
-            break;
-            }
-        }
-    // Keep compiler happy
-    (void)aTransaction;
-    LOGSTRING( "CCMSocketsEngine::MHFRunL - done" );
-    }
-
-TInt CCMSocketsEngine::MHFRunError( TInt aError, RHTTPTransaction /*aTransaction*/, const THTTPEvent& /*aEvent*/ )
-    {
-    LOGSTRING2( "CCMSocketsEngine::MHFRunError %i", aError );
-    if( iTransactionOpen )
-        {
-        LOGSTRING("Closing transaction");
-        iTransaction.Close();
-        iTransactionOpen = EFalse;
-        LOGSTRING("closed");
-        }
-    TRequestStatus* status = &iStatus;
-    User::RequestComplete( status, aError );
-    return KErrNone;
-    }
-
-//  End of File  
--- a/pnpmobileservices/pnpms/OnlineSupport/src/MiniBrowser.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,801 +0,0 @@
-/*
-* Copyright (c) 2005-2006 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:  Mini web browser for downloading settings files
-*
-*/
-
-
-// INCLUDE FILES
-#include <in_sock.h>
-#include <uri8.h>
-#include <http.h>
-#include <CWPEngine.h>
-#include <commdbconnpref.h>
-#include <etelmm.h>
-#include <basched.h>            // For KLeaveExit
-#include <AknGlobalNote.h> 
-#include <avkon.rsg>            // For R_AVKON_SOFTKEYS_CLOSE
-
-#include "MiniBrowser.h"
-#include "OnlineSupportLogger.h"
-#include "NHeadWrapperParser.h"
-#include "SupportedContentTypes.h"
-#include "VersionStrings.h"
-
-// 50 secs time-out
-const TInt KTimeOut( 50000000 );
-const TInt KInitialDataBufferSize( 2048 );
-const TInt KInitialReportUrlBufferSize( 512 );
-// maximum length of the info message (currently not supported)
-//const TInt KMaxMessageLength(256);
-//_LIT( KMiniBrowserPanic, "CMiniBrowser" );
-_LIT8( KHttpProtString, "HTTP/TCP" );
-_LIT8( KNokiaHeadWrapper, "application/vnd.nokia.headwrapper" );
-
-_LIT( KAmpersand, "&" );
-_LIT( KQuestionMark, "?" );
-_LIT( KStatus, "Status=" );
-
-CMiniBrowser* CMiniBrowser::NewLC(
-    MMiniBrowserObserver& aObserver,
-    RSocketServ& aSockerServ,
-    RConnection& aConnection )
-    {
-    CMiniBrowser* self = new (ELeave) CMiniBrowser( aObserver );
-    CleanupStack::PushL( self );
-    self->ConstructL( aSockerServ, aConnection );
-    return self;
-    }
-
-CMiniBrowser* CMiniBrowser::NewL(
-    MMiniBrowserObserver& aObserver,
-    RSocketServ& aSockerServ,
-    RConnection& aConnection )
-    {
-    CMiniBrowser* self = NewLC( aObserver, aSockerServ, aConnection );
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-CMiniBrowser::~CMiniBrowser()
-    {
-    LOGSTRING( "CMiniBrowser::~CMiniBrowser" );
-    if( iPeriodic->IsActive() )
-        {
-        iPeriodic->Cancel();
-        }
-
-    delete iUri;
-    delete iPeriodic;
-    delete iResponseData;
-    delete iReportUrl;
-    iTransaction.Close();
-    iSession.Close();
-
-    LOGSTRING( "CMiniBrowser::~CMiniBrowser - done" );
-    }
-
-CMiniBrowser::CMiniBrowser( MMiniBrowserObserver& aObserver ) :
-    iObserver( aObserver ),
-    iContentType( EContentTypeUnknown ),
-    iProvisioningStatus( THttpProvStates::EStatusUnknown )
-    {
-    }
-
-void CMiniBrowser::ConstructL( RSocketServ& aSockerServ, RConnection& aConnection )
-    {
-    LOGSTRING( "CMiniBrowser::ConstructL" );
-
-    iUri = HBufC8::NewL(1);
-    iPeriodic = CPeriodic::NewL( CActive::EPriorityStandard );
-    iResponseData = HBufC8::NewL( KInitialDataBufferSize );
-    iReportUrl = HBufC8::NewL( KInitialReportUrlBufferSize );
-
-    // Opens session using protocol HTTP/TCP
-    LOGSTRING( "CMiniBrowser: iSession.OpenL" );
-    iSession.OpenL( KHttpProtString );
-    LOGSTRING( "CMiniBrowser: iSession.OpenL - done" );
-    iSessionStringPool = iSession.StringPool();
-
-    RHTTPConnectionInfo connectionInfo = iSession.ConnectionInfo();
-
-    // Set SocketServ and Connection explicitly as we do not want to show
-    // the AP selection list to the user when making submit for the request
-    connectionInfo.SetPropertyL(
-        iSessionStringPool.StringF( HTTP::EHttpSocketServ,
-        RHTTPSession::GetTable() ),
-        aSockerServ.Handle() );
-    connectionInfo.SetPropertyL(
-        iSessionStringPool.StringF( HTTP::EHttpSocketConnection,
-        RHTTPSession::GetTable() ),
-        reinterpret_cast< TInt > ( &aConnection ) );
-    LOGSTRING( "CMiniBrowser::ConstructL - done" );
-    }
-
-void CMiniBrowser::HttpGetL( const TDesC& aUri )
-    {
-    DoHttpGetL( aUri, EFalse, KNullDesC, 0 );
-    }
-
-void CMiniBrowser::HttpGetL( const TDesC& aUri, const TDesC& aProxyAddress,
-    const TUint aProxyPort )
-    {
-    DoHttpGetL( aUri, ETrue, aProxyAddress, aProxyPort );
-    }
-
-void CMiniBrowser::DoHttpGetL(
-    const TDesC& aUri,
-    const TBool aUseProxy,
-    const TDesC& aProxyAddress,
-    const TUint aProxyPort )
-    {
-    LOGSTRING( "CMiniBrowser::DoHttpGetL" );
-
-    ResetResponseDataL();
-
-    delete iUri;
-    iUri = 0;
-    iUri = HBufC8::NewL( aUri.Length() );
-    iUri->Des().Copy( aUri );
-
-    TUriParser8 uriParser;
-
-    // In case URL is not valid the transaction will fail with code KErrHttpInvalidUri
-    // uriParser does not leave in all invalid uri cases
-#ifdef _DEBUG
-    LOGSTRING( "CMiniBrowser::HttpGetL uri:" );
-    //LOGTEXT( aUri );
-    for( TInt i(0); i < aUri.Length(); i += 128 )
-        {
-        LOGTEXT( aUri.Right( aUri.Length() - i ) );
-        }
-#endif
-    User::LeaveIfError( uriParser.Parse( *iUri ) );
-
-    RHTTPConnectionInfo connectionInfo = iSession.ConnectionInfo();
-
-    // The default value is HTTP::EDoNotUseProxy
-    if( aUseProxy )
-        {
-        LOGSTRING("CMiniBrowser: using proxy");
-        connectionInfo.SetPropertyL(
-            iSessionStringPool.StringF( HTTP::EProxyUsage, RHTTPSession::GetTable() ),
-            iSessionStringPool.StringF( HTTP::EUseProxy, RHTTPSession::GetTable() ) );
-
-        LOGSTRING("Set Proxy address")
-        HBufC8* proxy = HBufC8::NewLC( aProxyAddress.Length() + 1 + 16 );
-        TPtr8 proxyPtr = proxy->Des();
-        proxyPtr.Copy( aProxyAddress );
-        proxyPtr.Append( _L8( ":" ) );
-        proxyPtr.AppendNum( aProxyPort );
-        LOGTEXT( proxyPtr );
-
-        RStringF proxyF = iSessionStringPool.OpenFStringL( *proxy );
-        CleanupClosePushL( proxyF );
-
-        connectionInfo.SetPropertyL(
-            iSessionStringPool.StringF( HTTP::EProxyAddress, RHTTPSession::GetTable() ),
-            proxyF );
-
-        CleanupStack::PopAndDestroy(1); // proxyF.Close()
-        CleanupStack::PopAndDestroy( proxy );
-        }
-    else
-        {
-        LOGSTRING("CMiniBrowser: NOT using proxy");
-        connectionInfo.SetPropertyL(
-            iSessionStringPool.StringF( HTTP::EProxyUsage, RHTTPSession::GetTable() ),
-            iSessionStringPool.StringF( HTTP::EDoNotUseProxy, RHTTPSession::GetTable() ) );
-        }
-
-    LOGSTRING( "CMiniBrowser: iSession.OpenTransactionL" );
-    iTransaction = iSession.OpenTransactionL( uriParser, *this,
-        iSessionStringPool.StringF( HTTP::EGET, RHTTPSession::GetTable() ) );
-    LOGSTRING( "CMiniBrowser: iSession.OpenTransactionL - done" );
-
-
-    // Set user agent string (we have our own user agent string definition,
-    // not Mozilla compatible)
-    HBufC8* userAgent = NULL;
-    TRAPD( err, userAgent = GetUserAgentStringL() );
-    if( err != KErrNone )
-        {
-        LOGSTRING2( "Error in GetUserAgentStringL: %i", err );
-        }
-    else
-        {
-        CleanupStack::PushL( userAgent );
-        LOGTEXT( *userAgent );
-        RHTTPHeaders headers = iTransaction.Request().GetHeaderCollection();
-        RStringF str = iSessionStringPool.OpenFStringL( *userAgent );
-        CleanupClosePushL( str );
-        headers.SetFieldL(
-            iSessionStringPool.StringF( HTTP::EUserAgent, RHTTPSession::GetTable() ),
-            str );
-        CleanupStack::PopAndDestroy(); // str.Close()
-        CleanupStack::PopAndDestroy( userAgent );
-        }
-
-
-    TCallBack callBack( TimeOutCallBack, this );
-    if( iPeriodic->IsActive() )
-        {
-        iPeriodic->Cancel();
-        }
-    iPeriodic->Start( KTimeOut, KTimeOut, callBack );
-
-    iTransaction.SubmitL();
-    LOGSTRING( "CMiniBrowser::HttpGetL - done" );
-    }
-
-HBufC8* CMiniBrowser::GetUserAgentStringL()
-    {
-    LOGSTRING("CMiniBrowser::GetUserAgentStringL");
-
-    _LIT8( KUserAgentName, "OnlineSupport");
-    _LIT8( KSlash, "/");
-    _LIT8( KSpace, " ");
-    _LIT8( KSymbianOS, "SymbianOS");
-    _LIT8( KS60, "Series60");
-    _LIT8( KQuestionMark, "?" );
-    _LIT( KPhoneModuleName, "Phonetsy.tsy");
-    _LIT( KPhoneName, "DefaultPhone");
-    const TChar lineFeedChar( 0xA );
-
-    RTelServer telServer;
-    User::LeaveIfError( telServer.Connect() );
-    CleanupClosePushL( telServer );
-    User::LeaveIfError( telServer.LoadPhoneModule( KPhoneModuleName ) );
-    RMobilePhone phone;
-    User::LeaveIfError( phone.Open( telServer, KPhoneName ) );
-    CleanupClosePushL( phone );
-    LOGSTRING("CMiniBrowser::GetUserAgentStringL 2");
-
-    RMobilePhone::TMobilePhoneIdentityV1 phoneIdentity;
-    TRequestStatus status( KRequestPending );
-    phone.GetPhoneId( status, phoneIdentity );
-    User::WaitForRequest( status );
-
-
-    // parse sw version from the string
-    // sw version is assumed to be string between first "V" and "\n"
-    LOGSTRING("Reading sw version info");
-    TBuf<KSysUtilVersionTextLength> versions;
-    User::LeaveIfError( SysUtil::GetSWVersion( versions ) );
-    LOGTEXT( versions );
-
-    // SW version
-    LOGSTRING("Locating sw version from the string");
-    TInt begin(0);
-    TInt len(0);
-    // Assume sw version is in the first row (use line feed as a token separator)
-    TBuf8<KSysUtilVersionTextLength> sw;
-    TVersionStrings::TokenLocationL( versions, lineFeedChar, 0, sw.MaxLength(), begin, len );
-    if( len <= 2 )
-        {
-        User::Leave( KErrNotFound );
-        }
-
-    _LIT(KVerStrStart,"V ");
-    TInt pos1 = versions.Find(KVerStrStart);
-    if (pos1 != KErrNotFound)
-        {
-        sw.Copy( versions.Mid( begin + 2, len - 2 ) ); // remove "V "
-        }
-    else
-        {
-        // SW version does not always start with "V "
-        sw.Copy( versions.Mid( begin, len ) );
-        }
-    
-    LOGTEXT( sw );
-
-
-    // Series 60 and Symbian OS versions
-    LOGSTRING("Reading OS versions");
-    TVersionBuf s60Version;
-    s60Version.Copy( KQuestionMark );
-    TVersionBuf symbianVersion;
-    symbianVersion.Copy( KQuestionMark );
-    TRAPD( err, TVersionStrings::GetUserAgentVersionsL( s60Version, symbianVersion ) );
-    if( err != KErrNone )
-        {
-        LOGSTRING2( "Error: %i", err );
-        }
-
-    LOGSTRING("Series60 version");
-    LOGTEXT( s60Version );
-    LOGSTRING("SymbianOS version");
-    LOGTEXT( symbianVersion );
-
-
-    LOGSTRING("CMiniBrowser::GetUserAgentStringL 3");
-    // The string is of format:
-    // OnlineSupport <manufacturer><model>/<sw> SymbianOS/<symbian_os_version> S60/<S60_version>
-    HBufC8* agent = HBufC8::NewLC(
-        KUserAgentName().Length() +
-        phoneIdentity.iManufacturer.Length() +
-        phoneIdentity.iModel.Length() +
-        sw.Length() +
-        KSymbianOS().Length() +
-        symbianVersion.Length() +
-        KS60().Length() +
-        s60Version.Length() +
-        3 * KSlash().Length() +      /* three slasles in the string */
-        3 * KSpace().Length()        /* three spaces in the string */
-        );
-    LOGSTRING("CMiniBrowser::GetUserAgentStringL 3.5");
-    TPtr8 agentPtr = agent->Des();
-    agentPtr.Append( KUserAgentName );
-    agentPtr.Append( KSpace);
-    agentPtr.Append( phoneIdentity.iManufacturer );
-    agentPtr.Append( phoneIdentity.iModel );
-    agentPtr.Append( KSlash );
-    agentPtr.Append( sw );
-    agentPtr.Append( KSpace);
-    agentPtr.Append( KSymbianOS );
-    agentPtr.Append( KSlash);
-    agentPtr.Append( symbianVersion );
-    agentPtr.Append( KSpace);
-    agentPtr.Append( KS60 );
-    agentPtr.Append( KSlash);
-    agentPtr.Append( s60Version );
-
-    LOGSTRING("CMiniBrowser::GetUserAgentStringL 4");
-    CleanupStack::Pop( agent );
-    CleanupStack::PopAndDestroy(); // phone.Close()
-    CleanupStack::PopAndDestroy(); // telServer.Close()
-    LOGSTRING("CMiniBrowser::GetUserAgentStringL - done");
-    return agent;
-    }
-
-
-TInt CMiniBrowser::TimeOutCallBack( TAny* aMiniBrowser)
-    {
-    TRAPD( err, ( ( CMiniBrowser* ) aMiniBrowser )->DoTimeOutCallBackL() );
-    if( err == KLeaveExit )
-        {
-        User::Leave( KLeaveExit );
-        }
-    return err;
-    }
-
-void CMiniBrowser::DoTimeOutCallBackL()
-    {
-    LOGSTRING( "CMiniBrowser::DoTimeOutCallBackL" );
-    if( iPeriodic->IsActive() )
-        {
-        iPeriodic->Cancel();
-        }
-
-    TRAPD( err, iObserver.MiniBrowserErrorL( KErrTimedOut ) );
-    if( err != KErrNone )
-        {
-        iObserver.MiniBrowserUnhandledLeave( err );
-        }
-    if( err == KLeaveExit )
-        {
-        User::Leave( err ); 
-        }
-
-    LOGSTRING( "CMiniBrowser::DoTimeOut - done" );
-    }
-
-void CMiniBrowser::MHFRunL( RHTTPTransaction aTransaction, const THTTPEvent &aEvent )
-    {
-    LOGSTRING( "CMiniBrowser::MHFRunL" );
-    if( iPeriodic->IsActive() )
-        {
-        iPeriodic->Cancel();
-        }
-
-    switch( aEvent.iStatus )
-        {
-        case THTTPEvent::ESubmit:
-            {
-            LOGSTRING( "CMiniBrowser::MHFRunL:ESubmit" );
-            LOGTEXT( aTransaction.Request().URI().UriDes() );
-
-            LOGSTRING( "CMiniBrowser: reset ResponseData" );
-            ResetResponseDataL();
-            break;
-            }
-        case THTTPEvent::EGotResponseHeaders:
-            {
-            LOGSTRING( "CMiniBrowser::MHFRunL:EGotResponseHeaders" );
-            THTTPHdrVal value;
-            TInt err = aTransaction.Response().GetHeaderCollection().GetField(
-                iSessionStringPool.StringF( HTTP::EContentType, RHTTPSession::GetTable() ), 0, value );
-
-            if( err == KErrNone )
-            {
-                LOGSTRING("Content type:");
-                const TDesC8& contentType = value.StrF().DesC();
-                LOGTEXT( contentType );
-                if( contentType.Compare( KNokiaHeadWrapper ) == 0 )
-                    {
-                    iContentType = EContentTypeNokiaHeadWrapper;
-                    }
-                else
-                    {
-                    iContentType = EContentTypeUnknown;
-                    }
-            }
-
-            TCallBack callBack( TimeOutCallBack, this );
-            if( iPeriodic->IsActive() )
-                {
-                iPeriodic->Cancel();
-                }
-            iPeriodic->Start( KTimeOut, KTimeOut, callBack );
-            break;
-            }
-        case THTTPEvent::EGotResponseBodyData:
-            {
-            LOGSTRING( "CMiniBrowser::MHFRunL:EGotResponseBodyData" );
-            MHTTPDataSupplier* pBody = aTransaction.Response().Body();
-            if( pBody )
-                {
-                TPtrC8 dataChunk;
-                pBody->GetNextDataPart( dataChunk );
-                // Log
-                LOGSTRING( "CMiniBrowser: MHTTPDataSupplier:" );
-#ifdef _DEBUG
-                for( TInt i(0); i < dataChunk.Length(); i += 128 )
-                    {
-                    LOGTEXT( dataChunk.Right( dataChunk.Length() - i ) );
-                    }
-#endif
-                AppendResponseDataL( dataChunk );
-                pBody->ReleaseData();
-                }
-            LOGSTRING( "CMiniBrowser::MHFRunL:EGotResponseBodyData - 2" );
-
-            TCallBack callBack( TimeOutCallBack, this );
-            if( iPeriodic->IsActive() )
-                {
-                iPeriodic->Cancel();
-                }
-            iPeriodic->Start( KTimeOut, KTimeOut, callBack );
-            break;
-            }
-        case THTTPEvent::EResponseComplete:
-            {
-            LOGSTRING( "CMiniBrowser::MHFRunL:EResponseComplete" );
-            break;
-            }
-        case THTTPEvent::ESucceeded:
-            {
-            LOGSTRING( "CMiniBrowser::MHFRunL:ESucceeded" );
-
-            if( iContentType == EContentTypeNokiaHeadWrapper )
-                {
-                TRAPD( err, ParseAndSaveProvisionedSettingsL() );
-                if( err != THttpProvStates::EStatusOk )
-                    {
-                    User::Leave( err );
-                    }
-                }
-            else if( iContentType == EContentTypeUnknown )
-                {
-                TRAPD( err, ParseAndSaveProvisionedSettingsL() );
-                if( err != THttpProvStates::EStatusOk )
-                    {
-                    User::Leave( err );
-                    }
-                }
-            iObserver.MiniBrowserRequestDoneL();
-            }
-            break;
-        case THTTPEvent::EFailed:
-            LOGSTRING( "CMiniBrowser::MHFRunL:EFailed" );
-            ResetResponseDataL();
-            User::Leave( KErrGeneral );
-            break;
-        default:
-            {
-            LOGSTRING2( "CMiniBrowser::MHFRunL:event: %i", aEvent.iStatus );
-            break;
-            }
-        }
-
-    LOGSTRING( "CMiniBrowser::MHFRunL - done" );
-    }
-
-// currently not supported
-//void CMiniBrowser::ShowMessageDialogL( const TDesC8& aMessage )
-//    {
-//    LOGSTRING( "ShowMessageDialogL" );
-//    LOGTEXT( aMessage );
-//    TInt length = aMessage.Length();
-//    if( length > KMaxMessageLength )
-//        {
-//        length = KMaxMessageLength;
-//        }
-//    HBufC* message = HBufC::NewLC( length );
-//    message->Des().Copy( aMessage.Left( length ) );
-//
-//    CAknGlobalNote* globalNote = CAknGlobalNote::NewL();
-//    CleanupStack::PushL( globalNote );
-//    globalNote->SetSoftkeys( R_AVKON_SOFTKEYS_CLOSE );
-//    globalNote->ShowNoteL( EAknGlobalInformationNote , *message );
-//
-//    LOGSTRING( "deleting globalNote" );
-//    CleanupStack::PopAndDestroy( globalNote );
-//    CleanupStack::PopAndDestroy( message );
-//    LOGSTRING( "ShowMessageDialogL - done" );
-//    }
-
-
-void CMiniBrowser::ParseAndSaveProvisionedSettingsL()
-    {
-    LOGSTRING( "CMiniBrowser::ParseAndSaveProvisionedSettingsL - begin" );
-    if( !iResponseData )
-        {
-        User::Leave( THttpProvStates::EStatusWrapperParsingFailed );
-        }
-    LOGSTRING( "CMiniBrowser::SaveProvisionedSettingsL - 2" );
-    CNHeadWrapperParser* NHwrParser = CNHeadWrapperParser::NewL( *iResponseData );
-    CleanupStack::PushL( NHwrParser );
-    LOGSTRING( "CMiniBrowser::SaveProvisionedSettingsL - 3" );
-    iProvisioningStatus = NHwrParser->Parse();
-    LOGSTRING( "CMiniBrowser::SaveProvisionedSettingsL - 4" );
-    if( iProvisioningStatus != THttpProvStates::EStatusOk )
-        {
-        LOGSTRING2( "status from parse:%i", iProvisioningStatus ); 
-        // Try to get report url anyways, this should succeed at leat in case
-        // Nokia HeadWrapper authentication failed while parsing an otherwise valid
-        // HeadWrapper document
-        GetReportUrlL( *NHwrParser );
-        User::Leave( iProvisioningStatus );
-        }
-    LOGSTRING( "CMiniBrowser::SaveProvisionedSettingsL - 5" );
-    GetReportUrlL( *NHwrParser );
-    LOGSTRING( "CMiniBrowser::SaveProvisionedSettingsL - 6" );
-    // Get provisioned data
-    TPtrC8 content;
-    TRAPD( err, content.Set( NHwrParser->GetContentL() ) );
-    if( err != KErrNone )
-        {
-        LOGSTRING2( "err from GetContentL:%i", err );
-        iProvisioningStatus = THttpProvStates::EStatusDocumentParsingFailed;
-        User::Leave( err );
-        }
-
-    LOGSTRING( "Response parsed" ); 
-
-    TPtrC8 contentType;
-    TRAP( err, contentType.Set( NHwrParser->GetContentTypeL() ) );
-    if( err != KErrNone )
-        {
-        LOGSTRING2( "err from GetContentTypeL:%i", err );
-        iProvisioningStatus = THttpProvStates::EStatusDocumentParsingFailed;
-        User::Leave( err );
-        }
-
-    if( contentType.Compare( KContentTypeApplicationWapConnectivityWbxml ) == 0 )
-        {
-        LOGSTRING( "CMiniBrowser: content type application/vnd.wap.connectivity-wbxml" );
-        TRAP( err, SaveProvisionedSettingsL( content ) );
-        iProvisioningStatus = (THttpProvStates::TProvisioningStatus) err;
-        if( iProvisioningStatus != THttpProvStates::EStatusOk )
-            {
-            LOGSTRING2( "ProvisioningStatus from SaveProvisionedSettingsL:%i", iProvisioningStatus ); 
-            User::Leave( iProvisioningStatus );
-            }
-        }
-// currently not supported
-//    else if( contentType.Compare( KContentTypeTextPlain ) == 0 )
-//        {
-//        LOGSTRING( "CMiniBrowser: content type text/plain" );
-//        ShowMessageDialogL( content );
-//        }
-    else
-        {
-        LOGSTRING( "CMiniBrowser: Unknown content type" );
-        User::Leave( THttpProvStates::EStatusWrapperParsingFailed );
-        }
-
-    CleanupStack::PopAndDestroy( NHwrParser );
-    LOGSTRING( "CMiniBrowser::SaveProvisionedSettingsL - done" );
-    }
-
-void CMiniBrowser::GetReportUrlL( const CNHeadWrapperParser& aNHwrParser )
-    {
-    LOGSTRING( "CMiniBrowser::GetReportUrlL - begin" );
-    // Store report URL for later reference
-    const TDesC8& reportUrl = aNHwrParser.GetReportUrlL();
-    if( iReportUrl->Des().MaxLength() < reportUrl.Length() )
-        {
-        delete iReportUrl;
-        iReportUrl = 0;
-        iReportUrl = HBufC8::NewL( reportUrl.Length() );
-        }
-    TPtr8 reportUrlPtr = iReportUrl->Des();
-    reportUrlPtr.Copy( reportUrl );
-    LOGTEXT( *iReportUrl );
-    LOGSTRING( "CMiniBrowser::GetReportUrlL - end" );
-    }
-
-HBufC* CMiniBrowser::GetReportUrlLC()
-    {
-    LOGSTRING( "CMiniBrowser::GetReportUrlLC - begin" );
-    if( iReportUrl && iReportUrl->Length() )
-        {
-        HBufC* url = HBufC::NewLC(
-            iReportUrl->Length() +
-            KAmpersand().Length() +
-            KQuestionMark().Length() +
-            KStatus().Length() );
-
-        TPtr urlPtr = url->Des();
-        urlPtr.Copy( *iReportUrl );
-
-        // Add provisioning status to the url if known
-        if( iProvisioningStatus != THttpProvStates::EStatusUnknown )
-            {
-            // Assume there might already be parameters in the URL given
-            if( urlPtr.Find( KQuestionMark ) != KErrNotFound )
-                {
-                urlPtr.Append( KAmpersand );
-                }
-            else
-                {
-                urlPtr.Append( KQuestionMark );
-                }
-            urlPtr.Append( KStatus );
-            urlPtr.AppendNum( (TInt) iProvisioningStatus );
-            }
-        LOGSTRING( "CMiniBrowser::GetReportUrlLC - end" );
-        return url;
-        }
-    else
-        {
-        LOGSTRING( "CMiniBrowser::GetReportUrlLC Leave KErrNotFound" );
-        User::Leave( KErrNotFound );
-        }
-    return NULL; // Not possible to end up here
-    }
-
-void CMiniBrowser::SaveProvisionedSettingsL( const TDesC8& aContent )
-    {
-    LOGSTRING( "CMiniBrowser::SaveProvisionedSettingsL" );
-    TInt status = THttpProvStates::EStatusOk;
-    // Create WPEngine
-    CWPEngine* wpengine = CWPEngine::NewL();
-    CleanupStack::PushL( wpengine );
-
-    LOGSTRING( "wpengine->ImportDocumentL" );   
-    TRAPD( err, wpengine->ImportDocumentL( aContent ) );
-    User::LeaveIfError( err );
-
-    LOGSTRING( "wpengine->PopulateL" );
-    TRAP( err, wpengine->PopulateL() );
-    if( err != KErrNone )
-        {
-        LOGSTRING2( "PopulateL err: %i", err );
-        User::Leave( err );
-        }
-    LOGSTRING( "wpengine->PopulateL success" );
-
-    TInt itemCount = wpengine->ItemCount();
-    // Empty messages are not supported
-    if( itemCount == 0 )
-        {
-        LOGSTRING("No items in provisioning message!");
-        User::Leave( THttpProvStates::EStatusWrapperParsingFailed );
-        }
-
-    for( TInt i(0); i < itemCount; i++ )
-        {
-        LOGSTRING( "Saving" );
-        TRAP( err, wpengine->SaveL( i ) );
-        if( wpengine->CanSetAsDefault( i ) )
-            {
-            LOGSTRING( "Setting as default" );
-            TRAP( err, wpengine->SetAsDefaultL( i ) );
-            }
-        else
-            {
-            LOGSTRING( "Cannot set as default" );
-            }
-        if( err != KErrNone )
-            {
-            LOGSTRING2( "Error while saving: %i", err );
-            status = THttpProvStates::EStatusStorageFailed;
-            }
-        }
-
-    if( status != THttpProvStates::EStatusOk )
-        {
-        User::Leave( status );
-        }
-    }
-
-TInt CMiniBrowser::MHFRunError( TInt aError, RHTTPTransaction /*aTransaction*/, const THTTPEvent& /*aEvent*/ )
-    {
-    LOGSTRING2( "CMiniBrowser::MHFRunError %i", aError );
-    iTransaction.Close();
-    TRAPD( err, iObserver.MiniBrowserErrorL( aError ) );
-    if( err != KErrNone )
-        {
-        iObserver.MiniBrowserUnhandledLeave( err );
-        }
-    LOGSTRING( "CMiniBrowser::MHFRunError - done" );
-    if( err == KLeaveExit )
-        {
-        return err;
-        }
-    return KErrNone;
-    }
-
-
-void CMiniBrowser::AppendResponseDataL( const TDesC8& aData )
-    {
-    LOGSTRING( "CMiniBrowser::AppendResponseDataL()" );
-    if( ( iResponseData->Des().MaxLength() - iResponseData->Length() ) < aData.Length() )
-        {
-        // ReAlloc
-        HBufC8* tempBuf = HBufC8::NewL( iResponseData->Length() + aData.Length() );
-        TPtr8 tempBufPtr = tempBuf->Des();
-        tempBufPtr.Append( *iResponseData );
-        delete iResponseData;
-        iResponseData = tempBuf; 
-        }
-
-    TPtr8 ptr = iResponseData->Des();
-    ptr.Append( aData );
-    LOGSTRING( "CMiniBrowser::AppendResponseDataL() - done" );
-    }
-
-void CMiniBrowser::ResetResponseDataL()
-    {
-    LOGSTRING( "CMiniBrowser::ResetResponseDataL()" );
-    if( iResponseData && iResponseData->Length() )
-        {
-        delete iResponseData;
-        iResponseData = 0;
-        iResponseData = HBufC8::NewL( KInitialDataBufferSize );
-        }
-    if( iReportUrl && iReportUrl->Length() )
-        {
-        delete iReportUrl;
-        iReportUrl = 0;
-        iReportUrl = HBufC8::NewL( KInitialReportUrlBufferSize );
-        }
-    iContentType = EContentTypeUnknown;
-    iProvisioningStatus = THttpProvStates::EStatusUnknown;
-    LOGSTRING( "CMiniBrowser::ResetResponseDataL() - done" );
-    }
-
-TBool CMiniBrowser::GetNextDataPart( TPtrC8 &aDataPart )
-    {
-    _LIT8( KEmpty, "");
-    aDataPart.Set( KEmpty() );
-    return ETrue;
-    }
-
-void CMiniBrowser::ReleaseData()
-    {
-    }
-
-TInt CMiniBrowser::OverallDataSize()
-    {
-    return KErrNotFound;
-    }
-
-TInt CMiniBrowser::Reset()
-    {
-    return KErrNone;
-    }
--- a/pnpmobileservices/pnpms/OnlineSupport/src/ccmdialogmonitor.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,392 +0,0 @@
-/*
-* Copyright (c) 2006 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:  Contains the implementation of dialog monitor
-*
-*/
-
-
-
-// INCLUDE FILES
-//#include    <basched.h>
-#include    "OnlineSupportLogger.h"
-#include    "ccmdialogmonitor.h"
-#include    "mcmdialogstatusnotifier.h"
-
-// EXTERNAL DATA STRUCTURES
-// None
-
-// EXTERNAL FUNCTION PROTOTYPES  
-// None
-
-// CONSTANTS
-// PhoneModule name
-
-
-// MACROS
-// None
-
-// LOCAL CONSTANTS AND MACROS
-// None
-
-// MODULE DATA STRUCTURES
-// None
-
-// LOCAL FUNCTION PROTOTYPES
-// None
-
-// FORWARD DECLARATIONS
-// None
-
-// ============================= LOCAL FUNCTIONS ===============================
-// None
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CCMDialogMonitor::CCMDialogMonitor
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-
-CCMDialogMonitor::CCMDialogMonitor( MCMDialogStatusNotifier& aNotifier ) :
-    CActive( CActive::EPriorityStandard ),
-    iNotifier( aNotifier )
-    {
-    }
-
-
-// -----------------------------------------------------------------------------
-// CCMDialogMonitor::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CCMDialogMonitor::ConstructL()
-    {
-    CActiveScheduler::Add(this); 
-    }
-
-// -----------------------------------------------------------------------------
-// CCMDialogMonitor::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CCMDialogMonitor* CCMDialogMonitor::NewL( MCMDialogStatusNotifier& aNotifier )
-    {
-    CCMDialogMonitor* self = new( ELeave ) CCMDialogMonitor( aNotifier );    
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop();
-    return self;
-    }
-    
-// Destructor
-CCMDialogMonitor::~CCMDialogMonitor()
-    {
-    if( IsActive() )
-        {
-        Cancel();
-        }
-    }
-    
-void CCMDialogMonitor::SetDialogMode(TDialogMode aMode)
-    {
-    iDialogMode = aMode;
-    }
-
-void CCMDialogMonitor::Start()
-    {
-    if( IsActive() )
-        {
-        Cancel();
-        }
-    SetActive();
-    }
-
-void CCMDialogMonitor::DoCancel()
-    {
-    }
-    
-//TInt CCMDialogMonitor::RunError( TInt aError )
-//    {
-//    return aError;
-//    }
-
-// -----------------------------------------------------------------------------
-// CCMDialogMonitor::StartMonitoring()
-// Starts monitoring of the network registeration status
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-/*
-void CCMDialogMonitor::StartMonitoring()
-    {
-    if( IsActive() )
-        {
-        Cancel();
-        }
-    iStartTime.HomeTime();
-#ifdef __WINS__ // do not try to connect on the emulator
-    iRegisterationStatus = RMobilePhone::ERegisteredOnHomeNetwork;
-    TRequestStatus* status = &iStatus;
-    User::RequestComplete( status, KErrNone );
-#else
-    iPhone.GetNetworkRegistrationStatus( iStatus, iRegisterationStatus );
-#endif
-    iMonitoringStatus = ERequestingNetworkStatus;
-    SetActive();
-    }
-*/
-// -----------------------------------------------------------------------------
-// CCMDialogMonitor::StopMonitoring()
-// Stops the registeration monitor
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-/*
-void CCMDialogMonitor::StopMonitoring()
-    {
-    LOGSTRING( "Enter to CCMDialogMonitor::StopMonitoring " );
-    if( IsActive() )
-        {
-        Cancel();
-        }
-    LOGSTRING( "Exit from CCMDialogMonitor::StopMonitoring " );
-    }
-*/
-// -----------------------------------------------------------------------------
-// CCMDialogMonitor::DoCancel()
-// Cancels the monitoring
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-/*
-void CCMDialogMonitor::DoCancel()
-    {
-    LOGSTRING("CCMDialogMonitor::DoCancel");
-    switch( iMonitoringStatus )
-        {
-        case EInactive:
-            User::Leave( KErrUnderflow );
-            break;
-        case ERequestingNetworkStatus:
-            iPhone.CancelAsyncRequest( EMobilePhoneGetNetworkRegistrationStatus );
-            iMonitoringStatus = EInactive;
-            break;
-        case EWaitingForChangesInNetworkStatus:
-            iPhone.CancelAsyncRequest( EMobilePhoneNotifyNetworkRegistrationStatusChange );
-            iMonitoringStatus = EInactive;
-            break;
-        case ERequestingServiceProviderName:
-            iPhone.CancelAsyncRequest( EMobilePhoneGetServiceProviderName );
-            iMonitoringStatus = EInactive;
-            break;
-        case ERequestingHomeNetworkInfo:
-            iPhone.CancelAsyncRequest( EMobilePhoneGetHomeNetwork );
-            iMonitoringStatus = EInactive;
-            break;
-        case ERequestingCurrentNetworkInfo:
-            iPhone.CancelAsyncRequest( EMobilePhoneGetCurrentNetworkNoLocation );
-            iMonitoringStatus = EInactive;
-            break;
-        case ERequestingOwnNumberInfo:
-            iMonitoringStatus = EInactive;
-            break;
-        case ERequestingPhoneIdentity:
-            iPhone.CancelAsyncRequest( EMobilePhoneGetPhoneId );
-            iMonitoringStatus = EInactive;
-            break;
-        case ERequestingIMSI:
-            iPhone.CancelAsyncRequest( EMobilePhoneGetSubscriberId );
-            iMonitoringStatus = EInactive;
-            break;
-        default:
-            User::Leave( KErrOverflow );
-            break;
-        }
-
-    TInt err( KErrNone );
-    TRAP( err, iNotifier.RegistrationReportErrorL( iMonitoringStatus, KErrCancel ) );
-    LOGSTRING("Monitoring Cancelled");
-    }
-*/
-/*
-TInt CCMDialogMonitor::RunError( TInt aError )
-    {
-    LOGSTRING2( "CCMDialogMonitor::RunError %i", aError );
-    TInt err( KErrNone );
-    TRAP( err, iNotifier.RegistrationReportErrorL( iMonitoringStatus, aError ) );
-    if( err == KLeaveExit )
-        {
-        User::Leave( KLeaveExit );
-        }
-    if( aError == KLeaveExit )
-        {
-        User::Leave( KLeaveExit );
-        }
-    LOGSTRING( "CCMDialogMonitor::RunError - done" );
-    return KErrNone;
-    }
-*/
-// -----------------------------------------------------------------------------
-// CCMDialogMonitor::RunL()
-// Handles object’s request completion event
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CCMDialogMonitor::RunL()
-    {
-    LOGSTRING("Enter to CCMDialogMonitor::RunL() ");
-    LOGSTRING2( "CCMDialogMonitor status %i" , iStatus.Int() );
-
-    iNotifier.CommonDialogDismissedL( iDialogMode, iStatus.Int() );
-    /*
-    switch( iMonitoringStatus )
-        {
-        case EInactive:
-            User::Leave( KErrUnderflow );
-            break;
-        case ERequestingNetworkStatus:
-        case EWaitingForChangesInNetworkStatus:
-            {
-            LOGSTRING( "ERequestingNetworkStatus | EWaitingForChangesInNetworkStatus" );
-            switch( iRegisterationStatus )
-                {
-                // Not Ok cases
-                case RMobilePhone::ERegistrationUnknown:
-                case RMobilePhone::ENotRegisteredNoService:
-                case RMobilePhone::ENotRegisteredEmergencyOnly:
-                case RMobilePhone::ENotRegisteredSearching:
-                case RMobilePhone::ERegisteredBusy:
-                case RMobilePhone::ERegistrationDenied:
-                    currentTime.HomeTime();
-                    currentTime.SecondsFrom( iStartTime, interval );
-                    seconds = interval.Int();
-                    if ( seconds > KMaxInterval )
-                        {
-                        iMonitoringStatus = EInactive;
-                        // Report error
-                        iNotifier.RegistrationMonitoringDoneL( EStatusUnknown );
-                        }
-                    else
-                        {
-                        iMonitoringStatus = EWaitingForChangesInNetworkStatus;
-                        iPhone.NotifyNetworkRegistrationStatusChange( iStatus, iRegisterationStatus );
-                        LOGSTRING( "Network registration status change notification started " );
-                        SetActive();
-                        }
-                    break;
-                // These are Ok
-                case RMobilePhone::ERegisteredOnHomeNetwork:
-                case RMobilePhone::ERegisteredRoaming:
-                    iMonitoringStatus = ERequestingServiceProviderName;
-                    iPhone.GetServiceProviderName( iStatus, iServiceProviderNamePckg );
-                    SetActive();
-                    break;
-                // Some mysterious error
-                default:
-                    LOGSTRING2( "Unknown network status code! %i", iRegisterationStatus );
-                    LOGSTRING2( "ERegisteredOnHomeNetwork: %i", RMobilePhone::ERegisteredOnHomeNetwork );
-                    User::Leave( KErrOverflow );
-                    break;
-                }
-            break;
-            }
-        case ERequestingServiceProviderName:
-            LOGSTRING( "ERequestingServiceProviderName" );
-            iMonitoringStatus = ERequestingHomeNetworkInfo;
-            iPhone.GetHomeNetwork( iStatus, iHomeNetworkInfoPckg );
-            SetActive();
-            break;
-        case ERequestingHomeNetworkInfo:
-            LOGSTRING( "ERequestingHomeNetworkInfo" );
-            iMonitoringStatus = ERequestingCurrentNetworkInfo;
-
-            // Use the override that does not need Location capability
-            iPhone.GetCurrentNetwork(
-                iStatus,
-                iCurrentNetworkInfoPckg );
-                
-            SetActive();
-            break;
-        case ERequestingCurrentNetworkInfo:
-            {
-            LOGSTRING( "ERequestingCurrentNetworkInfo" );
-            iMonitoringStatus = ERequestingOwnNumberInfo;
-
-#ifdef __WINS__
-            TRequestStatus* status = &iStatus;
-            User::RequestComplete( status, KErrNone );
-#else
-            TInt err;
-            err = iONStore.Open( iPhone );
-            if (err != KErrNone) // error occured
-                {
-                LOGSTRING2( "iONStore.Open err: %i", err );
-                User::Leave( err );
-                }
-            iOwnNumberInfo.iIndex = 0;
-            iONStore.Read( iStatus, iOwnNumberInfoPckg );
-#endif
-            SetActive();
-            }
-            break;
-        case ERequestingOwnNumberInfo:
-            {
-            LOGSTRING( "ERequestingOwnNumberInfo" );
-            iMonitoringStatus = ERequestingPhoneIdentity;
-#ifdef __WINS__
-            TRequestStatus* status = &iStatus;
-            User::RequestComplete( status, KErrNone );
-#else
-            iPhone.GetPhoneId( iStatus, iPhoneIdentity );
-#endif
-            SetActive();
-            }
-            break;
-        case ERequestingPhoneIdentity:
-            LOGSTRING( "ERequestingPhoneIdentity" );
-            iMonitoringStatus = ERequestingIMSI;
-            iPhone.GetSubscriberId( iStatus, iIMSI );
-            SetActive();
-            break;
-        case ERequestingIMSI:
-            LOGSTRING( "ERequestingIMSI" );
-            iMonitoringStatus = EDone;
-            switch( iRegisterationStatus )
-                {
-                case RMobilePhone::ERegisteredOnHomeNetwork:
-                    iNotifier.RegistrationMonitoringDoneL( EHomenetwork );
-                    break;
-                case RMobilePhone::ERegisteredRoaming:
-                    iNotifier.RegistrationMonitoringDoneL( ERoaming );
-                    break;
-                default:
-                    iNotifier.RegistrationMonitoringDoneL( EStatusUnknown );
-                    break;
-                }
-            break;
-        default:
-            LOGSTRING( "default" );
-            User::Leave( KErrOverflow );
-            break;
-        }
-    */
-    }
-
-// ========================== OTHER EXPORTED FUNCTIONS =========================
-
-// None
-
-//  End of File  
--- a/pnpmobileservices/pnpms/PnP/NHwrParser/HttpProvContent.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,361 +0,0 @@
-/*
-* Copyright (c) 2004 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: Implementation of PnPMS components
-*
-*/
-
-
-
-// INCLUDE FILES
-#include <hash.h>
-
-#include "HttpProvContent.h"
-#include "HttpProvContentType.h"
-#include "NHwrParserLogger.h"
-#include "HttpProvHeaders.h"
-#include "PnpUtilImpl.h"
-
-// CONSTANTS
-
-// Number of BCD digits in byte
-const TInt KNumDigitsInByte = 2;
-
-// Number of bits in half-byte
-const TInt KNumBitsInNibble = 4;
-
-// Ascii code for zero
-const TUint8 KZero = '0';
-
-// Padding half-byte
-const TUint8 KPadNibble = 0xf;
-
-// First nibble
-const TUint8 KFirstNibble = 0x1;
-
-// Parity bit number in first nibble
-const TUint KParityBitNum = 3;
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CHttpProvContent::CHttpProvContent
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CHttpProvContent::CHttpProvContent() : iAuthenticated( EFalse)
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// CHttpProvContent::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CHttpProvContent::ConstructL( const TPtrC8 aContent )
-    {
-    iContent.Set( aContent );
-    }
-
-// -----------------------------------------------------------------------------
-// CHttpProvContent::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CHttpProvContent* CHttpProvContent::NewL(const TPtrC8 aContent)
-    {
-    LOGSTRING( "CHttpProvContent::NewL()" );
-    CHttpProvContent* self = NewLC(aContent);
-    CleanupStack::Pop();
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// CHttpProvContent::NewLC
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CHttpProvContent* CHttpProvContent::NewLC(const TPtrC8 aContent)
-    {
-    LOGSTRING( "CHttpProvContent::NewLC()" );
-    CHttpProvContent* self = new(ELeave) CHttpProvContent; 
-    CleanupStack::PushL(self);
-    self->ConstructL(aContent);
-    return self;
-    }
-
-// Destructor
-CHttpProvContent::~CHttpProvContent()
-    {
-    LOGSTRING( "~CHttpProvContent - done" );
-    }
-
-// -----------------------------------------------------------------------------
-// CHttpProvContent::AuthenticateL
-// -----------------------------------------------------------------------------
-//
-TInt CHttpProvContent::AuthenticateL( const CHttpProvHeaders& aHeaders, CHttpProvContentType& aContentType )
-    {
-    LOGSTRING( "CHttpProvContent::AuthenticateL" );
-
-    TInt result( KHttpProvAuthResultAuthenticated );
-
-    CPnpUtilImpl* pnpUtil = CPnpUtilImpl::NewLC();
-
-    TInt token = 0;
-    TBuf8<4> tokenbuf;    // Token cannot be more the 4 characters long
-    tokenbuf.Zero();
-
-    RMobilePhone::TMobilePhoneSubscriberId imsi;
-    //    util->Imsi(imsi);
-    //    RDebug::Print(imsi);
-    
-    // Create space for key
-    HBufC8* key = HBufC8::NewLC( Max( 1, imsi.MaxLength() + tokenbuf.MaxLength() ) );
-    TPtr8 keyPtr( key->Des() );
-
-    LOGSTRING2( "Content type SEC: %i", aContentType.SEC() );
-
-    // We support only security type NETWPIN
-    switch( aContentType.SEC() )
-        {
-        case KSECUSERPIN:
-            {
-            LOGSTRING("KSECUSERPIN");
-            // Get token saved by ConfManager    
-            TInt err = pnpUtil->GetTokenValue( token );
-            tokenbuf.AppendNum(token);
-            if( err != KErrNone )
-                {
-                result = KHttpProvAuthResultTokenExpired;
-                }
-            else if( tokenbuf.Length() == 0 )
-                {
-                result = KHttpProvAuthResultPinRequired;
-                }
-
-            keyPtr.Copy( tokenbuf );
-            if( result == KHttpProvAuthResultAuthenticated )
-                AuthenticateSenderL( *key, aContentType, result );
-            break;
-            }
-
-        case KSECUSERNETWPIN:
-            {
-            LOGSTRING("KSECUSERNETWPIN");
-            // Get token saved by ConfManager    
-            TInt err = pnpUtil->GetTokenValue( token );
-            tokenbuf.AppendNum(token);
-            if( err != KErrNone )
-                {
-                result = KHttpProvAuthResultTokenExpired;
-                }
-            else if( tokenbuf.Length() == 0 )
-                {
-                result = KHttpProvAuthResultPinRequired;
-                }
-
-            ConvertIMSIL( imsi, keyPtr );
-            keyPtr.Append( tokenbuf );
-
-            if( result == KHttpProvAuthResultAuthenticated )
-                AuthenticateSenderL( *key, aContentType, result );
-            break;
-            }
-
-        case KSECUSERPINMAC:
-            {
-            LOGSTRING("KSECUSERPINMAC");
-            // Get token saved by ConfManager    
-            TInt err = pnpUtil->GetTokenValue( token );
-            tokenbuf.AppendNum(token);
-            if( err != KErrNone )
-                {
-                result = KHttpProvAuthResultTokenExpired;
-                }
-            else if( tokenbuf.Length() == 0 )
-                {
-                result = KHttpProvAuthResultPinRequired;
-                }
-
-            keyPtr.Copy( tokenbuf );
-
-            if( result == KHttpProvAuthResultAuthenticated )
-                AuthenticateSenderL( *key, aContentType, result );
-            break;
-            }
-        case KSECPKA:
-            {
-            LOGSTRING("KSECPKA");
-            LOGSTRING( "Get nonce" );
-            TBuf8<KNonceLength> nonce;
-            pnpUtil->GetNonceL( nonce );
-
-            LOGSTRING( "Verify signature" );
-            // Verify digest (Hash value of "nonce:data") and signature of the sender
-            if( !pnpUtil->VerifySignatureL(
-                    aHeaders.GetParamValL( KDigestValue ),
-                    aHeaders.GetParamValL( KSignatureValue ),
-                    iContent,
-                    nonce ) )
-                {
-                LOGSTRING("Signature verify failed");
-                result = KHttpProvAuthResultAuthenticationFailed;
-                }
-            else
-                {
-                LOGSTRING("Signature verified");
-                }
-            break;
-            }
-        default:
-            {
-            LOGSTRING("No authentication");
-            result = KHttpProvAuthResultNoAuthentication;
-            }
-        }
-
-
-    CleanupStack::PopAndDestroy( key ); // key, headerMac
-
-    CleanupStack::PopAndDestroy( pnpUtil );
-
-    LOGSTRING2( "CHttpProvContent::AuthenticateL - done: %i", result );
-    
-    return result;
-    }
-
-void CHttpProvContent::AuthenticateSenderL( const TDesC8& aKey, CHttpProvContentType& aContentType, TInt& aResult )
-    {
-    LOGSTRING( "CHttpProvContent::AuthenticateSenderL" );
-    // The HMAC is in ASCII HEX format. Convert to binary.
-    TPtrC8 mac;
-    aContentType.MACL(mac);
-    LOGSTRING( "mac:" );
-    LOGTEXT( mac );
-    HBufC8* headerMac = PackLC( mac );
-    CMessageDigest* digest = CSHA1::NewL();
-    CleanupStack::PushL( digest );
-
-    if( aContentType.SEC() == KSECUSERPINMAC )
-        {
-        // key C is a concatenation of pin K and digest m
-        TPtrC8 K( aKey.Left( aKey.Length()/2 ) );
-        TPtrC8 m( aKey.Right( aKey.Length()/2 ) );
-
-        // M' = HMAC-SHA(K, A)
-        CHMAC* hmac = CHMAC::NewL( K, digest );
-        // Ownership of digest is transferred to hmac created above
-        CleanupStack::Pop( digest );
-        CleanupStack::PushL( hmac );
-        TPtrC8 MM( hmac->Hash( iContent ) );
-
-        // Create m' (renamed to mm)
-        HBufC8* mm = HBufC8::NewLC( m.Length() );
-        TPtr8 ptr( mm->Des() );
-        for( TInt i( 0 ); i < m.Length(); i++ )
-            {
-            ptr.Append( (MM[i]%10)+KZero );
-            }
-
-        // Compare the MACs and mark the message as authenticated
-        if( *mm != m )
-            {
-            aResult = KHttpProvAuthResultAuthenticationFailed;
-            }
-        CleanupStack::PopAndDestroy( mm );
-        CleanupStack::PopAndDestroy( hmac );
-        }
-    else
-        {
-        // Create the HMAC from body
-        CHMAC* hmac = CHMAC::NewL( aKey, digest );
-        LOGTEXT( aKey );
-        // Ownership of digest is transferred to hmac created above
-        CleanupStack::Pop( digest );
-        CleanupStack::PushL( hmac );
-
-        // Compare the MACs and mark the message as authenticated
-        TPtrC8 temp = hmac->Hash( iContent );
-        if( headerMac->Length() == 0 
-            || temp != *headerMac )
-            {
-            LOGSTRING( "KHttpProvAuthResultAuthenticationFailed" );
-            aResult = KHttpProvAuthResultAuthenticationFailed;
-            }
-        CleanupStack::PopAndDestroy( hmac );
-        }
-    CleanupStack::PopAndDestroy( headerMac );
-    }
-
-// -----------------------------------------------------------------------------
-// CHttpProvContent::PackLC
-// -----------------------------------------------------------------------------
-//
-HBufC8* CHttpProvContent::PackLC( const TDesC8& aHex ) const
-    {
-    HBufC8* bin = HBufC8::NewLC( aHex.Length()/2 );
-    TPtr8 binPtr( bin->Des() );
-    for( TInt i( 0 ); i < aHex.Length()/2; i++ )
-        {
-        TLex8 lex( aHex.Mid( i*2, 2 ) );
-        TUint8 byte( 0 );
-        User::LeaveIfError( lex.Val( byte, EHex ) );
-        binPtr.Append( TUint8( byte ) );
-        }
-
-    return bin;
-    }
-
-// -----------------------------------------------------------------------------
-// CHttpProvContent::ConvertIMSIL
-// -----------------------------------------------------------------------------
-//
-void CHttpProvContent::ConvertIMSIL( const TDesC& aIMSI, TPtr8& aKey ) const
-    {
-    TUint8 parity( TUint8((aIMSI.Length() % 2) << KParityBitNum) );
-
-    if( aIMSI.Length() == 0 )
-        {
-        aKey.Append( (KPadNibble<<KNumBitsInNibble) + KFirstNibble + parity );
-        return;
-        }
-
-    // First byte contains just a header and one digit
-    TInt first( aIMSI[0] - KZero );
-    aKey.Append( (first<<KNumBitsInNibble) | KFirstNibble | parity );
-
-    // Use semi-octet or BCD packing of IMSI. It means that one byte contains two
-    // decimal numbers, each in its own nibble.
-    for( TInt i( 1 ); i < aIMSI.Length(); i += KNumDigitsInByte )
-        {
-        TInt first( aIMSI[i] - KZero );
-        TInt second( 0 );
-
-        if( aIMSI.Length() == i+1 )
-            {
-            second = KPadNibble;
-            }
-        else
-            {
-            second = aIMSI[i+1] - KZero;
-            }
-
-        aKey.Append( (second<<KNumBitsInNibble) + first );
-        }
-    }
-
-
-//  End of File  
--- a/pnpmobileservices/pnpms/PnP/NHwrParser/HttpProvContent.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,113 +0,0 @@
-/*
-* Copyright (c) 2004 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: Implementation of PnPMS components
-*
-*/
-
-
-#ifndef __HTTP_PROV_CONTENT__H
-#define __HTTP_PROV_CONTENT__H
-
-// INCLUDES
-#include <e32base.h>
-
-// Authentication result: Authenticated
-const TInt KHttpProvAuthResultAuthenticated = 0;
-
-// Authentication result: PIN required, but not supplied
-const TInt KHttpProvAuthResultPinRequired = 1;
-
-// Authentication result: Authentication failed
-const TInt KHttpProvAuthResultAuthenticationFailed = 2;
-
-// Authentication result: No authentication contained in message
-const TInt KHttpProvAuthResultNoAuthentication = 3;
-
-// Authentication result: The token has expired
-const TInt KHttpProvAuthResultTokenExpired = 4;
-
-// FORWARD DECLARATIONS
-class CHttpProvContentType;
-class CHttpProvHeaders;
-// CLASS DECLARATION
-
-/**
- * CHttpProvContent holds http provisioning content
- */ 
-class CHttpProvContent : public CBase
-    {
-    public:  // Constructors and destructor
-
-        /**
-        * Two-phased constructor.
-        */
-        static CHttpProvContent* NewL(const TPtrC8 aContent);
-
-        /**
-        * Two-phased constructor.
-        */
-        static CHttpProvContent* NewLC(const TPtrC8 aContent);
-
-        /**
-        * Destructor.
-        */
-        virtual ~CHttpProvContent();
-
-    public: 
-
-        /**
-        * Return state of authetication
-        * @returns ETrue if authenticated
-        */
-        TBool Authenticated();
-
-        /**
-        * Authenticates mcontent
-        * @returns error value defined at start of this file
-        */
-        TInt AuthenticateL( const CHttpProvHeaders& aHeaders, CHttpProvContentType& aContentType );
-
-    private:
-        /**
-        * C++ default constructor.
-        */
-        CHttpProvContent();
-
-        /**
-        * By default Symbian 2nd phase constructor is private.
-        */
-        void ConstructL(const TPtrC8 aContent);
-
-        void AuthenticateSenderL( const TDesC8& aKey, CHttpProvContentType& aContentType, TInt& aResult );
-
-        /**
-        * Converter
-        */
-        HBufC8* PackLC( const TDesC8& aHex ) const;
-        
-        /**
-        * Converts IMSI code
-        */
-        void ConvertIMSIL( const TDesC& aIMSI, TPtr8& aKey ) const;
-
-    private:  // Data
-        // Authentication status
-        TBool        iAuthenticated;
-        // Content
-        TPtrC8        iContent;
-    };
-
-#endif    // __HTTP_PROV_CONTENT__H
-            
-// End of File
--- a/pnpmobileservices/pnpms/PnP/NHwrParser/HttpProvContentType.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,307 +0,0 @@
-/*
-* Copyright (c) 2004-2006 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: Implementation of PnPMS components
-*
-*/
-
-
-
-// INCLUDE FILES
-#include "HttpProvContentType.h"
-#include "NHwrParserLogger.h"
-
-// CONSTANTS
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CHttpProvContentType::CHttpProvContentType
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CHttpProvContentType::CHttpProvContentType() :
-    iSEC(KSECNONE),
-    iContentType( KNullDesC8 ),
-    iMAC( KNullDesC8 )
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// CHttpProvContentType::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CHttpProvContentType::ConstructL(const TDesC8& aContentTypeField)
-    {
-    ParseL( aContentTypeField );
-    }
-
-// -----------------------------------------------------------------------------
-// CHttpProvContentType::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CHttpProvContentType* CHttpProvContentType::NewL(const TDesC8& aContentTypeField)
-    {
-    LOGSTRING( "CHttpProvContentType::NewL()" );
-    CHttpProvContentType* self = NewLC(aContentTypeField);
-    CleanupStack::Pop();
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// CHttpProvContentType::NewLC
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CHttpProvContentType* CHttpProvContentType::NewLC(const TDesC8& aContentTypeField)
-    {
-    LOGSTRING( "CHttpProvContentType::NewLC()" );
-    CHttpProvContentType* self = new(ELeave) CHttpProvContentType; 
-    CleanupStack::PushL(self);
-    self->ConstructL(aContentTypeField);
-    return self;
-    }
-
-// Destructor
-CHttpProvContentType::~CHttpProvContentType()
-    {
-    LOGSTRING( "~CHttpProvContentType" );
-    }
-
-// -----------------------------------------------------------------------------
-// CHttpProvContentType::ParseL
-// -----------------------------------------------------------------------------
-//
-void CHttpProvContentType::ParseL( const TDesC8& aContentTypeField )
-    {
-    LOGSTRING( "CHttpProvContentType::ParseL" );
-    iContentType.Set( aContentTypeField );
-
-    // Check MIME type
-    if( iContentType.Find( KContentTypeApplicationWapConnectivityWbxml ) == 0 )
-        {
-        LOGSTRING("CHttpProvContentType Content type application/vnd.wap.connectivity-wbxml");
-        iContentType.Set( KContentTypeApplicationWapConnectivityWbxml );
-        }
-    else if( iContentType.Find( KContentTypeTextPlain ) == 0 )
-        {
-        LOGSTRING("CHttpProvContentType Content type text/plain");
-        iContentType.Set( KContentTypeTextPlain );
-        }
-    else
-        {
-        LOGSTRING("CHttpProvContentType::ParseL->Invalid contentType");
-        LOGTEXT( aContentTypeField );
-        User::Leave( KErrNotSupported );
-        }
-
-    // contentTypeFieldLen is at least the lentgh of KContentTypeApplicationWapConnectivityWbxml
-    TInt contentTypeFieldLen( aContentTypeField.Length() );
-
-    // remove line feed/carriage return
-    _LIT8( KNewLine, "\n" );
-    _LIT8( KCarriageReturn, "\r" );
-    _LIT8( KLineFeed, "\r\n" );
-    if( aContentTypeField.Mid( contentTypeFieldLen - 1 ) == KNewLine ||
-        aContentTypeField.Mid( contentTypeFieldLen - 1 ) == KCarriageReturn )
-        {
-        LOGSTRING("New line / Carriage return found");
-        contentTypeFieldLen--;
-        }
-    else if( aContentTypeField.Mid( contentTypeFieldLen - 2 ) == KLineFeed )
-        {
-        LOGSTRING("Line feed found");
-        contentTypeFieldLen -= 2;
-        }
-    LOGSTRING2( "CHttpProvContentType::contentTypeFieldLen: %i", contentTypeFieldLen );
-    if( contentTypeFieldLen <= iContentType.Length() )
-        {
-        LOGSTRING("iSEC = KSECNONE");
-        // No possibility for a security breach since CHttpProvContent::AuthenticateL
-        // returns KHttpProvAuthResultNoAuthentication in this case
-        iSEC = KSECNONE;
-        return;
-        }
-    // aContentTypeField minus possible line feed / carriage return chars 
-    TPtrC8 contentTypeField = aContentTypeField.Left( contentTypeFieldLen );
-
-
-    // Parse all parameteres
-    _LIT8(KDelimeter, ";");
-    _LIT8(KEqual,"=");
-    // runner is aContentTypeField without the content type (in the beginning)
-    // and without the line feed / carriage return chars (at the end)
-    TPtrC8 runner( contentTypeField.Mid( iContentType.Length() ) );
-    TBool eot(EFalse);
-    while(runner.Length()>0 && !eot)
-        {
-        // Find delimeter and seek over it
-        if(runner.Left(1).Compare(KDelimeter)!=0)
-            {
-            LOGSTRING("CHttpProvContentType::ParseL->Delimeter not found");
-            User::Leave(KErrCorrupt);
-            }
-        runner.Set(runner.Mid(1));
-        // new code
-        LOGSTRING( "skip leading space" );
-        // skip leading space
-        FOREVER
-            {
-            LOGSTRING( "FOREVER" );
-            if( runner.Length() && runner[0] == ' ' )
-                {
-                LOGSTRING( "skipping leading space" );
-                runner.Set( runner.Mid(1) );
-                LOGSTRING( "runner now:" );
-                LOGTEXT( runner );
-                }
-            else
-                {
-                LOGSTRING( "break" );
-                break;
-                }
-            }
-        LOGSTRING( "skip trailing space" );
-        // skip trailing space
-        FOREVER
-            {
-            if( runner.Length() && runner[runner.Length()-1] == ' ' )
-                {
-                LOGSTRING( "skipping trailing space" );
-                runner.Set( runner.Left(runner.Length()-1) );
-                LOGSTRING( "runner now:" );
-                LOGTEXT( runner );
-                }
-            else
-                {
-                LOGSTRING( "break" );
-                break;
-                }
-            }
-
-        // Parse parameter name and value
-        TInt pos = runner.Find(KEqual);
-        if(pos<1)
-            {
-            LOGSTRING("CHttpProvContentType::ParseL->Parameters corrupted");
-            User::Leave(KErrCorrupt);
-            }
-        TPtrC8 paramName(runner.Left(pos));
-        TPtrC8 paramValue(runner.Mid(pos+1));
-        TInt endpos = paramValue.Find(KDelimeter);
-        if(endpos>0)
-            {
-            paramValue.Set(paramValue.Left(endpos));
-            if(runner.Length()<=pos+1+endpos)
-                {
-                LOGSTRING("CHttpProvContentType::ParseL->Delimeter found at the end (corrupt)");
-                User::Leave(KErrCorrupt);
-                }
-            runner.Set(runner.Mid(pos+1+endpos));
-            }
-        else
-            {
-            eot = ETrue;
-            }
-
-        // Store SEC & MAC parameters
-        // We could store other parameters as well, but we don't need them
-        _LIT8(KSec,"SEC");
-        _LIT8(KMac,"MAC");
-        LOGTEXT( paramName );
-        LOGTEXT( paramValue );
-        if(paramName == KSec)
-            {
-            // parse SEC type
-            _LIT8(KNetWPin,"NETWPIN");
-            _LIT8(KUserPin,"USERPIN");
-            _LIT8(KUserNetWPin,"USERNETWPIN");
-            _LIT8(KUserPinMac,"USERPINMAC");
-            _LIT8( KPublicKeyAuthentication, "PKA" );
-
-            if(paramValue.Compare(KNetWPin)==0)
-                {
-                iSEC = KSECNETWPIN;
-                }
-            else if(paramValue.Compare(KUserPin)==0)
-                {
-                iSEC = KSECUSERPIN;
-                }
-            else if(paramValue.Compare(KUserNetWPin)==0)
-                {
-                iSEC = KSECUSERNETWPIN;
-                }
-            else if(paramValue.Compare(KUserPinMac)==0)
-                {
-                iSEC = KSECUSERPINMAC;
-                }
-            else if( paramValue.Compare( KPublicKeyAuthentication ) == 0
-                || paramValue.Compare( _L8("PKI") ) == 0 /*temporary*/ )
-                {
-                iSEC = KSECPKA;
-                }
-            else 
-                {
-                // Assume PKA method in case iSEC-parameter is missing
-                iSEC = KSECPKA;
-                //iSEC = KSECNONE;
-                }
-            }
-        else if(paramName == KMac)
-            {
-            // Store MAC
-            iMAC.Set( paramValue );
-            }
-        }    
-
-    LOGSTRING( "ParseL - done" );
-    }
-
-// -----------------------------------------------------------------------------
-// CHttpProvContentType::MAC
-// -----------------------------------------------------------------------------
-//
-void CHttpProvContentType::MACL(TPtrC8& aMAC)
-    {
-    if( iMAC.Length() )
-        {
-        aMAC.Set( iMAC );
-        }
-    else
-        {
-        User::Leave( KErrNotFound );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// CHttpProvContentType::SEC
-// -----------------------------------------------------------------------------
-//
-TUint8 CHttpProvContentType::SEC()
-    {
-    return iSEC;
-    }
-
-const TDesC8& CHttpProvContentType::ContentTypeL() const
-    {
-    if( iContentType.Length() < 1 )
-        {
-        User::Leave( KErrNotFound );
-        }
-    return iContentType;
-    }
-
-//  End of File  
--- a/pnpmobileservices/pnpms/PnP/NHwrParser/HttpProvContentType.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,117 +0,0 @@
-/*
-* Copyright (c) 2004 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: Implementation of PnPMS components
-*
-*/
-
-
-#ifndef __HTTP_PROV_CONTENT_TYPE__H
-#define __HTTP_PROV_CONTENT_TYPE__H
-
-// INCLUDES
-#include <e32base.h>
-#include "SupportedContentTypes.h"
-
-// Security parameter NETWPIN
-const TUint8 KSECNETWPIN = 0x00;
-
-// Security parameter USERPIN
-const TUint8 KSECUSERPIN = 0x01;
-
-// Security parameter USERNETWPIN
-const TUint8 KSECUSERNETWPIN = 0x02;
-
-// Security parameter USERPINMAC
-const TUint8 KSECUSERPINMAC = 0x03;
-
-// Securirty parameter PKA (or PKI)
-const TUint8 KSECPKA = 0x04;
-
-// No security parameter
-const TUint8 KSECNONE = 0xff;
-
-// FORWARD DECLARATIONS
-
-// CLASS DECLARATION
-
-/**
- * CHttpProvContentType holds http provisioning content
- */ 
-class CHttpProvContentType : public CBase
-    {
-    public:  // Constructors and destructor
-
-        /**
-        * Two-phased constructor.
-        */
-        static CHttpProvContentType* NewL(const TDesC8& aContentTypeField);
-
-        /**
-        * Two-phased constructor.
-        */
-        static CHttpProvContentType* NewLC(const TDesC8& aContentTypeField);
-
-        /**
-        * Destructor.
-        */
-        virtual ~CHttpProvContentType();
-
-    public: 
-
-        /**
-        * Get MAC
-        */
-        void MACL( TPtrC8& aMac );
-
-        /**
-        * Returns SEC type.
-        * @return SEC
-        */
-        TUint8 SEC();
-
-        /**
-        * Get content type.
-        */
-        const TDesC8& ContentTypeL() const;
-
-    private:
-        /**
-        * C++ default constructor.
-        */
-        CHttpProvContentType();
-
-        /**
-        * By default Symbian 2nd phase constructor is private.
-        * Descriptor aContentTypeField must remain in the scope until CHttpProvContentType
-        * is deleted.
-        */
-        void ConstructL(const TDesC8& aContentTypeField);
-
-        /**
-        * Parses content type
-        */
-        void ParseL(const TDesC8& aContentTypeField);
-
-    private:  // Data
-        // SEC type
-        TUint8        iSEC;
-        // Content type
-        TPtrC8        iContentType;
-        // MAC
-        TPtrC8        iMAC;
-    };
-
-#endif    // __HTTP_PROV_CONTENT_TYPE__H
-            
-// End of File
--- a/pnpmobileservices/pnpms/PnP/NHwrParser/HttpProvHeaders.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,240 +0,0 @@
-/*
-* Copyright (c) 2007-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: Implementation of PnPMS components
- *
-*/
-
-
-#include "HttpProvHeaders.h"
-#include "NHwrParserLogger.h"
-
-
-CHttpProvHeaders* CHttpProvHeaders::NewL( const TDesC8& aHeaders )
-    {
-    CHttpProvHeaders* self = NewLC( aHeaders );
-    CleanupStack::Pop(self);
-    return self;
-    }
-
-    
-CHttpProvHeaders* CHttpProvHeaders::NewLC( const TDesC8& aHeaders )
-    {
-    CHttpProvHeaders* self = new (ELeave) CHttpProvHeaders();
-    CleanupStack::PushL(self);
-    self->ConstructL( aHeaders );
-    return self;
-    }
-
-
-CHttpProvHeaders::CHttpProvHeaders() :
-    iReportUrl( KNullDesC8 ),
-    iSignatureValue( KNullDesC8 ),
-    iDigestValue( KNullDesC8 ),
-    iProvisioningActivation( KNullDesC8 ),
-    iUserInteraction( KNullDesC8 )
-    {
-    }
-
-
-CHttpProvHeaders::~CHttpProvHeaders()
-    {
-    LOGSTRING( "~CHttpProvHeaders - done" );
-    }
-
-
-void CHttpProvHeaders::ConstructL( const TDesC8& aHeaders )
-    {
-    ParseL( aHeaders );
-    }
-
-void CHttpProvHeaders::ParseL( const TDesC8& aHeaders  )
-    {
-    LOGSTRING( "CHttpProvHeaders::ParseL" );
-    TPtrC8 work( aHeaders );
-    TPtrC8 line( aHeaders );
-    TInt nextLinePos = 0;
-    TBool firstLine = ETrue;
-
-    TInt err;
-    FOREVER
-        {
-        TRAP( err, GetLineL(work, line, nextLinePos) );
-        LOGSTRING2( "got line with len:%i", line.Length() );
-        if( err == KErrNotFound )
-            {
-            // if thre is a single line in the headers it currently does not end with CRLF
-            //   as COULD be assumed from the specs
-            //   so continue to the length check...
-            if( !firstLine )
-                {
-                break;
-                }
-            firstLine = EFalse;
-            }
-        if( line.Length() == 0 )
-            {
-            break;
-            }
-
-        LOGSTRING( "line:" );
-        LOGTEXT( line );
-
-        HandleHeaderLineL( line );
-            
-        if( nextLinePos == KErrNotFound )
-            {
-            break;
-            }
-        LOGSTRING( "work.Set( work.Mid(nextLinePos) )" );
-LOGSTRING2( "nextLinePos: %i", nextLinePos );
-        work.Set( work.Mid(nextLinePos) );
-        }
-LOGSTRING( "end" );
-    }
-
-void CHttpProvHeaders::GetLineL( const TDesC8& aBuffer, TPtrC8& aLine, TInt& aNextLinePos )
-    {
-LOGSTRING("*1");
-    TInt newlinePos = aBuffer.Locate( '\n' );
-    if( newlinePos == KErrNotFound )
-        {
-LOGSTRING("*2");
-        aNextLinePos = KErrNotFound;
-        if( aBuffer.Length() )
-            aLine.Set( aBuffer );
-        User::Leave( KErrNotFound );
-        }
-    if( aBuffer.Length() > (newlinePos+1) )
-        {    
-LOGSTRING("*3");
-        aNextLinePos = newlinePos + 1;
-        }
-    else
-        {
-LOGSTRING("*4");
-        aNextLinePos = KErrNotFound;
-        }
-    if( newlinePos > 0 ) // 
-        {
-LOGSTRING("*5");
-        if( aBuffer[newlinePos-1] == '\r' )
-            {
-            LOGSTRING( "aLine.Set( aBuffer.Left(newlinePos-1) )" );
-            aLine.Set( aBuffer.Left(newlinePos-1) );
-            return;
-            }
-        }
-    LOGSTRING( "aLine.Set( aBuffer.Left(newlinePos) )" );
-    aLine.Set( aBuffer.Left(newlinePos) );
-    }
-
-void CHttpProvHeaders::HandleHeaderLineL( const TDesC8& aLine )
-    {
-    LOGSTRING( "HandleHeaderLineL" );
-
-    TBuf8<1> empty;
-    TPtrC8 left( empty );
-    TPtrC8 right( empty );
-
-    LOGSTRING( "splitting" );    
-    SplitLineL(aLine, ':', left, right );
-    
-    LOGSTRING( "left:" );
-    LOGTEXT( left );
-    LOGSTRING( "right:" );
-    LOGTEXT( right );
-
-    while( left[left.Length()-1] == ' ' )
-        {
-        left.Set( left.Left(left.Length()-1) );
-        }
-        
-    if( right.Length() > 1 )
-        {
-        right.Set( right.Mid(0) ); // no space in this spec
-        }
-    SetParamL( left, right );
-    }
-
-void CHttpProvHeaders::SetParamL( const TDesC8& aName, const TPtrC8& aVal )
-    {
-    LOGSTRING( "SetParamL" );
-    LOGSTRING( "aName:" );
-    LOGTEXT( aName );
-    LOGSTRING( "aVal:" );
-    LOGTEXT( aVal );
-
-    if( aName.Compare( KReportUrl ) == 0 ) 
-        iReportUrl.Set( aVal );
-    else if( aName.Compare( KSignatureValue ) == 0 ) 
-        iSignatureValue.Set( aVal );
-    else if( aName.Compare( KDigestValue ) == 0 )
-        iDigestValue.Set( aVal );
-    else if( aName.Compare( KProvisioningActivation ) == 0 )
-        iProvisioningActivation.Set( aVal );
-    else if( aName.Compare( KUserInteraction ) == 0 )
-        iUserInteraction.Set( aVal );
-    }
-
-const TDesC8& CHttpProvHeaders::GetParamValL( const TDesC8& aName ) const
-    {
-    LOGSTRING( "GetParamValL" );
-    if( aName.Compare( KReportUrl ) == 0 ) 
-        {
-        if( iReportUrl.Length() == 0 ) User::Leave( KErrNotFound );
-        return( iReportUrl);
-        }
-    else if( aName.Compare( KSignatureValue ) == 0 ) 
-        {
-        if( iSignatureValue.Length() == 0 ) User::Leave( KErrNotFound );
-        return iSignatureValue;
-        }
-    else if( aName.Compare( KDigestValue ) == 0 )
-        {
-        if( iDigestValue.Length() == 0 ) User::Leave( KErrNotFound );
-        return iDigestValue;
-        }
-    else if( aName.Compare( KProvisioningActivation ) == 0 )
-        {
-        LOGTEXT( KProvisioningActivation );
-        if( iProvisioningActivation.Length() == 0 ) User::Leave( KErrNotFound );
-        LOGTEXT( iProvisioningActivation );
-        return iProvisioningActivation;
-        }
-    else if( aName.Compare( KUserInteraction ) == 0 )
-        {
-        LOGTEXT( KUserInteraction );
-        if( iUserInteraction.Length() == 0 ) User::Leave( KErrNotFound );
-        return iUserInteraction;
-        }
-    else 
-        {
-        LOGSTRING( "GetParamValL error" );
-        return KNullDesC8;
-        }
-    }
-
-void CHttpProvHeaders::SplitLineL( const TDesC8& aLine, TChar aSplitBy, TPtrC8& aLeft, TPtrC8& aRight )
-    {
-    TInt splitIdx = aLine.Locate( aSplitBy );
-    if( splitIdx == KErrNotFound )
-        {
-        User::Leave( splitIdx );
-        }
-    aLeft.Set( aLine.Left(splitIdx) );
-    if( aLine.Length() >= splitIdx+2 )
-        {
-        aRight.Set( aLine.Mid(splitIdx+1) );
-        }
-    }
--- a/pnpmobileservices/pnpms/PnP/NHwrParser/HttpProvHeaders.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,97 +0,0 @@
-/*
-* Copyright (c) 2007-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: Implementation of PnPMS components
- *
-*/
-
-
-#ifndef __HTTPPROVHEADERS_H__
-#define __HTTPPROVHEADERS_H__
-
-#include <e32base.h>
-
-_LIT8( KReportUrl, "Report-URL" ); 
-_LIT8( KSignatureValue, "SignValue" );
-_LIT8( KDigestValue, "DigValue" );
-_LIT8( KProvisioningActivation, "Provisioning-Activation" );
-_LIT8( KUserInteraction, "User-Interaction" );
-_LIT8( KStringValueTrue, "1" );
-
-class CHttpProvHeaders : public CBase
-{
-public:
-
-/*!
-  @function NewL
-   
-  @discussion Create a CHttpProvHeaders object
-  @param aHeaders A descriptor containing headers of Nokia HeadWrapper.
-  Should remain in the scope during the lifetime of the CHttpProvHeaders object
-  @result a pointer to the created instance of CHttpProvHeaders
-  */
-    static CHttpProvHeaders* NewL(const TDesC8& aHeaders);
-
-/*!
-  @function NewLC
-   
-  @discussion Create a CHttpProvHeaders object
-  @param aHeaders A descriptor containing headers of Nokia HeadWrapper.
-  Should remain in the scope during the lifetime of the CHttpProvHeaders object
-  @result a pointer to the created instance of CHttpProvHeaders
-  */
-    static CHttpProvHeaders* NewLC(const TDesC8& aHeaders);
-
-/*!
-  @function ~CHttpProvHeaders
-  
-  @discussion Destroy the object and release all memory objects
-  */
-    ~CHttpProvHeaders();
-
-    const TDesC8& GetParamValL( const TDesC8& aName ) const;
-
-private:
-
-/*!
-  @function CHttpProvHeaders
-
-  @discussion Constructs this object
-  */
-    CHttpProvHeaders();
-
-/*!
-  @function ConstructL
-
-  @discussion Performs second phase construction of this object
-  */
-    void ConstructL(const TDesC8& aHeaders);
-
-    void ParseL( const TDesC8& aHeaders  );
-    void GetLineL( const TDesC8& aBuffer, TPtrC8& aLine, TInt& aNextLinePos );
-    void HandleHeaderLineL( const TDesC8& aLine );
-    void SetParamL( const TDesC8& aName, const TPtrC8& aVal );
-    void SplitLineL( const TDesC8& aLine, TChar aSplitBy, TPtrC8& aLeft, TPtrC8& aRight );
-
-
-private:
-    // Member variables
-    TPtrC8 iReportUrl;
-    TPtrC8 iSignatureValue;
-    TPtrC8 iDigestValue;
-    TPtrC8 iProvisioningActivation;
-    TPtrC8 iUserInteraction;
-};
-
-#endif // __HTTPPROVHEADERS_H__
-
--- a/pnpmobileservices/pnpms/PnP/NHwrParser/HttpProvStates.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-/*
-* 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: Implementation of PnPMS components
-*
-*/
-
-
-#ifndef HTTP_PROV_STATES_H
-#define HTTP_PROV_STATES_H
-
-// INCLUDES
-#include <e32base.h>
-
-class THttpProvStates
-    {
-public:
-    /*!
-    The available status codes from the specs
-    OK = "0"
-    User rejected Document = "1"
-    Signature failed = "2"
-    Document parsing failed = "3"
-    Wrapper parsing failed = "4"
-    Document storage failed = "5"
-    Document activation failed = "6"
-    TOKEN validity expired = "7"
-
-    EStatusUnknown should not be sent to the service at all.
-    If the status is unknown do not send any status code.
-    */
-    enum TProvisioningStatus
-        {
-        EStatusUnknown = -1,
-        EStatusOk = 0,
-        EStatusRejected = 1,
-        EStatusSignatureFailed = 2,
-        EStatusDocumentParsingFailed = 3,
-        EStatusWrapperParsingFailed = 4,
-        EStatusStorageFailed = 5,
-        EStatusActivationFailed = 6,
-        EStatusTokenExpired = 7
-        };
-    };
-
-#endif // HTTP_PROV_STATES_H
--- a/pnpmobileservices/pnpms/PnP/NHwrParser/NHeadWrapperParser.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,462 +0,0 @@
-/*
-* Copyright (c) 2004-2006 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: Implementation of PnPMS components
-*
-*/
-
-
-// INCLUDE FILES
-#include <e32svr.h>
-#include "NHeadWrapperParser.h"
-#include "NHwrParserLogger.h"
-#include "HttpProvHeaders.h"
-#include "HttpProvContent.h"
-#include "HttpProvContentType.h"
-#include "SupportedContentTypes.h"
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CNHeadWrapperParser::CNHeadWrapperParser
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CNHeadWrapperParser::CNHeadWrapperParser()
-    {
-    }
-    
-// Destructor
-EXPORT_C CNHeadWrapperParser::~CNHeadWrapperParser()
-    {
-    LOGSTRING("~CNHeadWrapperParser");
-    delete iHttpProvHeaders;
-    delete iHttpProvContentType;
-    LOGSTRING("~CNHeadWrapperParser - done");
-    }
-
-// -----------------------------------------------------------------------------
-// CNHeadWrapperParser::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-EXPORT_C CNHeadWrapperParser* CNHeadWrapperParser::NewL(const TPtrC8& aWrapperData)
-    {
-    CNHeadWrapperParser* self = new (ELeave) CNHeadWrapperParser;
-    CleanupStack::PushL( self );
-    self->ConstructL( aWrapperData );
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// CNHeadWrapperParser::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CNHeadWrapperParser::ConstructL( const TPtrC8& aWrapperData )
-    {
-    iWrapperData.Set( aWrapperData );
-    }
-
-// -----------------------------------------------------------------------------
-// CNHeadWrapperParser::ParseL
-// -----------------------------------------------------------------------------
-//
-EXPORT_C THttpProvStates::TProvisioningStatus CNHeadWrapperParser::Parse()
-    {
-    LOGSTRING("CNHeadWrapperParser::Parse - begin");
-    TRAPD( err, DoParseL() );
-    if( err != KErrNone )
-        {
-        LOGSTRING("CNHeadWrapperParser::Parse ret: EStatusWrapperParsingFailed");
-        return THttpProvStates::EStatusWrapperParsingFailed; // Do not continue
-        }
-        
-    TRAP( err, CheckHeadWrapperL() );
-
-    // CheckHeadWrapperL might leave with one of TProvisioningStatus codes
-    // or with standard error codes
-    if( err < 0 )    // standar error codes
-        {
-        LOGSTRING("CNHeadWrapperParser::Parse ret: EStatusWrapperParsingFailed");
-        return THttpProvStates::EStatusWrapperParsingFailed;
-        }
-    else            // one of TProvisioningStatus
-        {
-        LOGSTRING2("CNHeadWrapperParser::Parse ret: %d", err);
-        return (THttpProvStates::TProvisioningStatus) err;
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// CNHeadWrapperParser::DoParseL
-// -----------------------------------------------------------------------------
-//
-void CNHeadWrapperParser::DoParseL()
-    {
-    LOGSTRING( "CNHeadWrapperParser::DoParseL - begin" );
-    LOGSTRING( "Check wrapper length " );
-    // Check wrapper length min 6 bytes
-    if( iWrapperData.Length() < 6 )
-        {
-        User::Leave( KErrCorrupt );
-        }
-
-    LOGSTRING( "Check signature" );
-    // Check signature
-    _LIT8( KHeadWrapperSignature, "NHWR" );
-    if( iWrapperData.Left(4).Compare( KHeadWrapperSignature ) != 0 )
-        {
-        User::Leave( KErrCorrupt );
-        }
-
-    // Parse version
-    TUint8 version = (iWrapperData)[4];
-    if( version != 1 )
-        {
-        User::Leave( KErrNotSupported );
-        }
-        
-    LOGSTRING( "Parse content type" );
-    // Parse content type
-    TUint8 contentTypeLen = (iWrapperData)[5];
-    LOGSTRING2( "content type len: %i", contentTypeLen );
-
-    if( iWrapperData.Length() < 6 + contentTypeLen )
-        {   
-        User::Leave( KErrCorrupt );
-        }
-
-    if( contentTypeLen < 1 )
-        {
-        User::Leave( KErrCorrupt );
-        }
-
-    iContentTypeField.Set( iWrapperData.Mid( 6, contentTypeLen ) );
-
-    // Parse Headers and Content Length
-    LOGSTRING( "Parse headers and data length" );
-    if( iWrapperData.Length() < 6+contentTypeLen+2 ) //  +2 min for length datas
-        {
-        User::Leave( KErrCorrupt );
-        }
-    TUint32    headersLen = 0; //(*iWrapperData)[6+contentTypeLen+1];
-    TUint32    contentLen = 0; //(*iWrapperData)[6+contentTypeLen+2];
-    TUint headersVarLen = 0;
-    TUint contentVarLen = 0;
-
-    if( ParseUintVar( iWrapperData.Mid( 6+contentTypeLen ),
-                      headersLen, headersVarLen ) != KErrNone )
-        {
-        User::Leave( KErrCorrupt );
-        }
-    LOGSTRING2( "headersLen %i", headersLen );
-    LOGSTRING2( "headersVarLen %i", headersLen );
-
-    if( ParseUintVar( iWrapperData.Mid( 6+contentTypeLen+headersVarLen ),
-                      contentLen, contentVarLen ) != KErrNone )
-        {
-        LOGSTRING( "content length failed" );
-        User::Leave( KErrCorrupt );
-        }
-    LOGSTRING2( "contentLen %i", contentLen );
-    LOGSTRING2( "contentVarLen %i", contentVarLen );
-
-    // Final check for sizes
-    if( iWrapperData.Length() != (TInt)( 6+contentTypeLen+headersVarLen
-        +contentVarLen+headersLen+contentLen ) )
-        {
-        LOGSTRING( "Lengths do not match" );
-        LOGSTRING2( "Expected length %i", (TInt)( 6+contentTypeLen+headersVarLen
-                                            +contentVarLen+headersLen+contentLen ) );
-        LOGSTRING2( "Actual data length %i", iWrapperData.Length() );
-        User::Leave( KErrCorrupt );
-        }
-
-    if( headersLen > 0 )
-        {
-        iHeaders.Set( iWrapperData.Mid( 6+contentTypeLen+headersVarLen
-                                         +contentVarLen, headersLen ) ); 
-        }
-
-    LOGSTRING( "Parse content" );
-    iContent.Set( iWrapperData.Mid( 6+contentTypeLen+headersVarLen+contentVarLen+headersLen,contentLen ) );
-
-    // Log
-#ifdef _DEBUG
-    TInt i(0);
-    LOGSTRING( "Content type:" );
-    for( i = 0; i < iContentTypeField.Length(); i += 128 )
-        {
-        TPtrC8 logText = iContentTypeField.Right( iContentTypeField.Length() - i );
-        LOGTEXT( logText );
-        }
-
-    if( iHeaders.Length() )
-        {
-        LOGSTRING( "Headers:" );
-        for( i = 0; i < iHeaders.Length(); i += 128 )
-            {
-            TPtrC8 logText = iHeaders.Right( iHeaders.Length() - i );
-            LOGTEXT( logText );
-            }
-        }
-
-    LOGSTRING( "Content:" );
-    for( i = 0; i < iContent.Length(); i += 128 )
-        {
-        TPtrC8 logText = iContent.Right( iContent.Length() - i );
-        LOGTEXT( logText );
-        }
-#endif
-    LOGSTRING( "CNHeadWrapperParser::DoParseL - end" );
-    }
-
-// -----------------------------------------------------------------------------
-// CNHeadWrapperParser::CheckHeadWrapperL
-// -----------------------------------------------------------------------------
-//
-void CNHeadWrapperParser::CheckHeadWrapperL()
-    {
-    LOGSTRING( "CNHeadWrapperParser::CheckHeadWrapperL()" );
-    LOGSTRING( "Get content type" );
-    if( iContentTypeField.Length() < 1 )
-        {
-        User::Leave( THttpProvStates::EStatusWrapperParsingFailed );
-        }
-
-    LOGSTRING( "Create CHttpProvContentType" );
-    if( iHttpProvContentType )
-        {
-        delete iHttpProvContentType;
-        iHttpProvContentType = 0;
-        }
-    TRAPD( err, iHttpProvContentType = CHttpProvContentType::NewL( iContentTypeField ) );
-    LOGSTRING( "Create CHttpProvContentType 2" );
-    if( err != KErrNone )
-        {
-        LOGSTRING2( "Content type, create failed: %i", err );
-        User::Leave( THttpProvStates::EStatusWrapperParsingFailed );
-        }
-
-    LOGSTRING( "Get headers" );
-    if( iHeaders.Length() < 1 )
-        {
-        LOGSTRING( "no headers" );
-        // Plug and Play Mobile Services Specification.doc:
-        // "The Headers field MAY contain headers defining additional
-        // Meta data about the content"
-        // if there is no headers in the wrapper we will just leave,
-        // we do not want to open any unauthorized content:
-        User::Leave( THttpProvStates::EStatusWrapperParsingFailed );
-        }
-
-    delete iHttpProvHeaders;
-    iHttpProvHeaders = 0;
-    iHttpProvHeaders = CHttpProvHeaders::NewL( iHeaders );
-    
-    LOGSTRING( "Get wrapper content" );
-    if( iContent.Length() < 1 )
-        {
-        User::Leave( THttpProvStates::EStatusWrapperParsingFailed );
-        }
-
-    CHttpProvContent* c = CHttpProvContent::NewLC( iContent );
-
-    TInt res( KErrNone );
-    TRAP( err, res = c->AuthenticateL( *iHttpProvHeaders, *iHttpProvContentType ) );
-    if( res == KHttpProvAuthResultTokenExpired )
-        {
-        User::Leave( THttpProvStates::EStatusTokenExpired );
-        }
-    else if( res!=KHttpProvAuthResultAuthenticated || err != KErrNone )
-        {
-        LOGSTRING2("AuthenticationFailed, res: %i", res );
-        LOGSTRING2("err: %i", err );
-        User::Leave( THttpProvStates::EStatusSignatureFailed );
-        }
-
-    CleanupStack::PopAndDestroy(c);
-    LOGSTRING( "CNHeadWrapperParser::CheckHeadWrapperL() - done" );
-    }
-
-// -----------------------------------------------------------------------------
-// CNHeadWrapperParser::ParseUintVar
-// -----------------------------------------------------------------------------
-//
-TInt CNHeadWrapperParser::ParseUintVar(const TDesC8& aVarDes, TUint32& aVar, TUint &aVarLength)
-    {
-    TUint32 finalValue = 0;
-    TInt i;
-    for(i=0; i<5; i++)
-        {
-        if(aVarDes.Length()<=i)
-            {
-            return KErrCorrupt;
-            }
-
-        TUint8 val = aVarDes[i];
-        finalValue <<= 7;
-        finalValue |= (((TUint32)val)&0x7F);
-        if( !(val&0x80 ) )
-            {
-            break;
-            }
-        }
-
-    if(i==5)
-        {
-        return KErrCorrupt;
-        }
-    else
-        {
-        aVar = finalValue;
-        aVarLength = i+1;
-        return KErrNone;
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// CNHeadWrapperParser::GetHeaders
-// -----------------------------------------------------------------------------
-//
-EXPORT_C const TDesC8& CNHeadWrapperParser::GetHeadersL() const
-    {
-    if( iHeaders.Length() < 1 )
-        {
-        User::Leave( KErrNotFound );
-        }
-    return iHeaders;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CNHeadWrapperParser::GetContentType
-// -----------------------------------------------------------------------------
-//
-EXPORT_C const TDesC8& CNHeadWrapperParser::GetContentTypeL() const
-    {
-    if( !iHttpProvContentType )
-        {
-        User::Leave( KErrNotFound );
-        }
-    return iHttpProvContentType->ContentTypeL();
-    }
-
-// -----------------------------------------------------------------------------
-// CNHeadWrapperParser::GetContent
-// -----------------------------------------------------------------------------
-//
-EXPORT_C const TDesC8& CNHeadWrapperParser::GetContentL() const
-    {
-    if( iContent.Length() < 1 )
-        {
-        User::Leave( KErrNotFound );
-        }
-    return iContent;
-    }
-
-// -----------------------------------------------------------------------------
-// CNHeadWrapperParser::GetReportUrlL
-// -----------------------------------------------------------------------------
-//
-EXPORT_C const TDesC8& CNHeadWrapperParser::GetReportUrlL() const
-    {
-    if( !iHttpProvHeaders )
-        {
-        User::Leave( KErrNotFound );
-        }
-    return iHttpProvHeaders->GetParamValL( KReportUrl );
-    }
-
-// -----------------------------------------------------------------------------
-// CNHeadWrapperParser::GetProvisioningActivation
-// -----------------------------------------------------------------------------
-//
-EXPORT_C TProvisioningActivation CNHeadWrapperParser::GetProvisioningActivation() const
-    {
-    // The default value is "User selects"
-    TProvisioningActivation value( EProvisioningActivationUser );
-
-    if( !iHttpProvHeaders )
-        {
-        return value;
-        }
-
-    TInt err( KErrNone );
-    TPtrC8 descValue( KNullDesC8 );
-    TRAP( err, descValue.Set( iHttpProvHeaders->GetParamValL( KProvisioningActivation ) ) );
-    if( err != KErrNone )
-        {
-        return value;
-        }
-
-    TInt intValue(0);
-    TLex8 parser( descValue );
-    err = parser.Val( intValue );
-
-    // ignore illegal values
-    if( err != KErrNone )
-        {
-        return value;
-        }
-
-    if( intValue < EProvisioningActivationUser || intValue > EProvisioningActivationOff )
-        {
-        return value;
-        }
-
-    // cast
-    value = (TProvisioningActivation) intValue;
-    return value;
-    }
-
-// -----------------------------------------------------------------------------
-// CNHeadWrapperParser::GetUserInteraction
-// -----------------------------------------------------------------------------
-//
-EXPORT_C TBool CNHeadWrapperParser::GetUserInteraction() const
-    {
-    // The default value is EFalse
-    TBool value( EFalse );
-
-    if( !iHttpProvHeaders )
-        {
-        return value;
-        }
-
-    TInt err( KErrNone );
-    TRAP( err, value = GetBoolParamValueL( KUserInteraction ) );
-    return value;
-    }
-
-// -----------------------------------------------------------------------------
-// CNHeadWrapperParser::GetBoolParamValueL
-// -----------------------------------------------------------------------------
-//
-TBool CNHeadWrapperParser::GetBoolParamValueL( const TDesC8& aParam ) const
-    {
-    LOGSTRING("CNHeadWrapperParser::GetBoolParamValueL");
-    LOGTEXT( aParam );
-    const TDesC8& paramVal = iHttpProvHeaders->GetParamValL( aParam );
-    LOGTEXT( paramVal );
-    if( paramVal.Compare( KStringValueTrue ) == 0 )
-        {
-        return ETrue;
-        }
-    return EFalse;        
-    }
-
-// End of File  
--- a/pnpmobileservices/pnpms/PnP/NHwrParser/NHeadWrapperParser.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,122 +0,0 @@
-/*
-* Copyright (c) 2004-2006 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: Implementation of PnPMS components
-*
-*/
-
-
-#ifndef NHEADWRAPPER_PARSER_H
-#define NHEADWRAPPER_PARSER_H
-
-// INCLUDES
-#include <e32base.h>
-#include "HttpProvStates.h"
-
-class CHttpProvHeaders;
-class CHttpProvContentType;
-
-enum TProvisioningActivation
-    {
-    EProvisioningActivationUser = 0,
-    EProvisioningActivationOn,
-    EProvisioningActivationOff
-    };
-
-class CNHeadWrapperParser : public CBase
-    {
-public:
-    IMPORT_C ~CNHeadWrapperParser();
-
-    /*!
-    Constructor
-    Does not make an own copy of the data, so aWrapperData should remain
-    in the scope during the lifetime of the CNHeadWrapperParser object.
-    @param aWrapperData Pointer to a buffer containing HeadWrapper data. 
-    */
-    IMPORT_C static CNHeadWrapperParser* NewL( const TPtrC8& aWrapperData );
-
-    /*!
-    Parses Oma Content provisioning data from wrapper
-    */
-    IMPORT_C THttpProvStates::TProvisioningStatus Parse();
-
-    /*!
-    @return headers
-    Leaves with KErrNotFound if there was no headers in the HeadWrapper.
-    */
-    IMPORT_C const TDesC8& GetHeadersL() const;
-    
-    /*!
-    @return  content type
-    Leaves with KErrNotFound if there was no content type in the HeadWrapper.
-    */
-    IMPORT_C const TDesC8& GetContentTypeL() const;
-
-    /*!
-    @return content data
-    */
-    IMPORT_C const TDesC8& GetContentL() const;
-
-    /*!
-    @return report URL from the provisioned data
-    */
-    IMPORT_C const TDesC8& GetReportUrlL() const;
-
-    /*!
-    @return 
-    ETrue if there was no "Provisioning Activation" header
-    in the provisioned head wrapper or if the header was set to value "1"
-    */
-    IMPORT_C TProvisioningActivation GetProvisioningActivation() const;
-
-    /*!
-    @return ETrue if there was "User Interaction" header in the
-    provisioned head wrapper and it was set to value "1". EFalse
-    otherwise.
-    */
-    IMPORT_C TBool GetUserInteraction() const;
-
-private:
-    CNHeadWrapperParser();
-    void ConstructL(const TPtrC8& aWrapperData);
-
-    void DoParseL();
-    void CheckHeadWrapperL();
-
-    /*
-    * Parses Uintvar from beginning of descriptor
-    */
-    TInt ParseUintVar(const TDesC8& aVarDes, TUint32& aVar, TUint &aVarLength);
-    TBool GetBoolParamValueL( const TDesC8& aParam ) const;
-
-private:
-
-    // Wrapper data
-    TPtrC8  iWrapperData;
-
-    CHttpProvHeaders*       iHttpProvHeaders;
-    CHttpProvContentType*   iHttpProvContentType;
-
-    // headers
-    TPtrC8  iHeaders;
-    
-    // Content type
-    TPtrC8  iContentTypeField;
-
-    // Content of wrapper
-    TPtrC8  iContent;            
-    
-    };
-
-#endif // NHEADWRAPPER_PARSER_H
--- a/pnpmobileservices/pnpms/PnP/NHwrParser/NHwrParserLogger.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,135 +0,0 @@
-/*
-* Copyright (c) 2004 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 file defines logging interface macros
-*
-*/
-
-
-#ifndef __LOGGER_H__
-#define __LOGGER_H__
-
-#ifdef _DEBUG
-    #define LOGGING_ENABLED
-#endif
-#ifdef LOGGING_ENABLED          // This must be enabled to use logging system
-
-#define LOGGER_LOGGING          // Log to Logger
-
-
-
-#ifdef LOGGER_LOGGING
-
-//  INCLUDES
-#include <flogger.h>
-
-// LOG SETTINGS 
-_LIT( KPnpLogFolder, "PnP" );
-_LIT( KPnpLogFile, "NHwrParser.TXT" );
-
-#endif
-
-// CONSTANTS  
-// None.
-
-// MACROS
-/*
------------------------------------------------------------------------------
-
-    INTERNAL MACROs. 
-
-    DO NOT USE THESE DIRECTLY !!! 
-    SEE EXTERNAL MACROS
-
------------------------------------------------------------------------------
-*/
-
-#ifdef LOGGER_LOGGING
-
-
-#define INTRLOGTEXT( AAA )                                                                        \
-    {                                                                                            \
-    RFileLogger::Write( KPnpLogFolder(), KPnpLogFile(), EFileLoggingModeAppend, AAA );            \
-    }
-#define INTRLOGSTRING( AAA )                                                                    \
-    {                                                                                            \
-    _LIT( tempLogDes, AAA );                                                                    \
-    RFileLogger::Write( KPnpLogFolder(), KPnpLogFile(), EFileLoggingModeAppend, tempLogDes() ); \
-    }
-#define INTRLOGSTRING2( AAA, BBB )                                                                \
-    {                                                                                            \
-    _LIT( tempLogDes, AAA );                                                                    \
-    RFileLogger::WriteFormat( KPnpLogFolder(), KPnpLogFile(), EFileLoggingModeAppend, TRefByValue<const TDesC>( tempLogDes()), BBB ); \
-    }
-#define INTRLOGSTRING3( AAA, BBB, CCC )                                                            \
-    {                                                                                            \
-    _LIT( tempLogDes, AAA );                                                                    \
-    RFileLogger::WriteFormat( KPnpLogFolder(), KPnpLogFile(), EFileLoggingModeAppend, TRefByValue<const TDesC>( tempLogDes()), BBB, CCC ); \
-    }
-#else
-#define INTRLOGTEXT( AAA )
-#define INTRLOGSTRING( AAA )
-#define INTRLOGSTRING2( AAA, BBB )
-#define INTRLOGSTRING3( AAA, BBB, CCC )
-#endif
-
-/*
------------------------------------------------------------------------------
-
-    EXTERNAL MACROs
-
-    USE THESE MACROS IN YOUR CODE !
-
------------------------------------------------------------------------------
-*/
-
-
-#define LOGTEXT( AAA )                { \
-                                    INTRLOGTEXT( AAA ); \
-                                    }   // Example: LOGTEXT( own_desc );
-
-#define LOGSTRING( AAA )            { \
-                                    INTRLOGSTRING( AAA ); \
-                                    }   // Example: LOGSTRING( "Test" );
-
-#define LOGSTRING2( AAA, BBB )        { \
-                                    INTRLOGSTRING2( AAA, BBB ); \
-                                    }  // Example: LOGSTRING( "Test %i", aValue );
-
-#define LOGSTRING3( AAA, BBB, CCC )    { \
-                                    INTRLOGSTRING3( AAA, BBB, CCC ); \
-                                    } // Example: LOGSTRING( "Test %i %i", aValue1, aValue2 );
-
-
-#else   // LOGGING_ENABLED
-
-#define LOGTEXT( AAA ) 
-#define LOGSTRING( AAA ) 
-#define LOGSTRING2( AAA, BBB )    
-#define LOGSTRING3( AAA, BBB, CCC )    
-
-#endif  // LOGGING_ENABLED
-
-// DATA TYPES
-// None.
-
-// FUNCTION PROTOTYPES
-// None.
-
-// FORWARD DECLARATIONS
-// None.
-
-// CLASS DECLARATION
-// None.
-
-#endif  // __LOGGER_H__
--- a/pnpmobileservices/pnpms/PnP/NHwrParser/SupportedContentTypes.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-/*
-* Copyright (c) 2005-2006 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: Implementation of PnPMS components
-*
-*/
-
-
-
-#ifndef SUPPORTED_CONTENT_TYPES_H
-#define SUPPORTED_CONTENT_TYPES_H
-
-// INCLUDES
-#include <e32base.h>
-
-_LIT8( KContentTypeApplicationWapConnectivityWbxml, "application/vnd.wap.connectivity-wbxml" );
-_LIT8( KContentTypeTextPlain, "text/plain" );
-
-#endif // SUPPORTED_CONTENT_TYPES_H
--- a/pnpmobileservices/pnpms/PnP/PnpProvisioningAppAif/PnpProvisioning_reg.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-/*
-* Copyright (c) 2004-2006 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:  Resource definitions for project PnpProvisioningApp
-*
-*/
-
-
-#include <appinfo.rh>
-#include <PnpProvisioning.rsg>
-#include <data_caging_paths_strings.hrh>
-
-UID2 KUidAppRegistrationResourceFile
-UID3 0x10204339
-
-RESOURCE APP_REGISTRATION_INFO
-    {
-    app_file = "PnpProvisioning";
-    localisable_resource_file = APP_RESOURCE_DIR"\\PnpProvisioning";
-    localisable_resource_id = R_PNPPROVISIONING_LOCALISABLE_APP_INFO;
-    hidden        = KAppIsHidden;
-    //embeddability = KAppEmbeddableOnly;
-    embeddability = KAppNotEmbeddable;
-
-    datatype_list =
-        { 
-        DATATYPE { priority= EDataTypePriorityHigh; type="application/vnd.nokia.headwrapper";} 
-        };
-    }
-
-// End of File
--- a/pnpmobileservices/pnpms/PnP/PnpProvisioningAppAif/PnpProvisioningaif.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-/*
-* Copyright (c) 2004-2006 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:  Resource definitions for project PnpProvisioningApp
-*
-*/
-
-
-#include <aiftool.rh>
-
-RESOURCE AIF_DATA
-    {
-    app_uid=0x10204339;
-    num_icons = 0; //1;
-    //embeddability = KAppEmbeddableOnly;
-    embeddability = KAppNotEmbeddable;
-    newfile = KAppDoesNotSupportNewFile;
-    hidden = KAppIsHidden;
-
-    datatype_list= { 
-        DATATYPE { priority= EDataTypePriorityHigh; type="application/vnd.nokia.headwrapper";} 
-        };
-    }
-
-// End of File
Binary file pnpmobileservices/pnpms/PnP/PnpProvisioningAppAif/context_pane_icon.bmp has changed
Binary file pnpmobileservices/pnpms/PnP/PnpProvisioningAppAif/context_pane_icon_mask.bmp has changed
Binary file pnpmobileservices/pnpms/PnP/PnpProvisioningAppAif/context_pane_icon_mask_soft.bmp has changed
Binary file pnpmobileservices/pnpms/PnP/PnpProvisioningAppAif/list_icon.bmp has changed
Binary file pnpmobileservices/pnpms/PnP/PnpProvisioningAppAif/list_icon_mask.bmp has changed
Binary file pnpmobileservices/pnpms/PnP/PnpProvisioningAppAif/list_icon_mask_soft.bmp has changed
--- a/pnpmobileservices/pnpms/PnP/PnpProvisioningAppData/PnpProvisioning.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,139 +0,0 @@
-/*
-* Copyright (c) 2004-2006 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:  Resource definitions for PnPProvisioning 
-*
-*/
-
-
-//  RESOURCE IDENTIFIER
-NAME    PNPP // 4 letter ID
-
-//  INCLUDES
-
-#include <eikon.rh>
-#include "pnpprovisioning.hrh"
-
-#include <pnpprovisioning.loc>
-
-#include <avkon.rsg>
-#include <avkon.rh>
-#include <avkon.mbg>
-#include <avkon.loc>
-#include <appinfo.rh>
-#include <data_caging_paths_strings.hrh>
-
-
-//  RESOURCE DEFINITIONS 
-
-RESOURCE RSS_SIGNATURE { }
-
-RESOURCE TBUF { buf = "PnpProvisioning"; }
-
-RESOURCE EIK_APP_INFO
-    {
-    cba = R_AVKON_SOFTKEYS_EMPTY;     
-    }
-
-
-RESOURCE LOCALISABLE_APP_INFO r_pnpprovisioning_localisable_app_info
-    {
-    caption_and_icon = 
-    CAPTION_AND_ICON_INFO
-        {
-        number_of_icons = 0;
-        };
-    }
-
-
-//----------------------------------------------------
-//   
-//    r_pnpprovisioning_hotkeys
-//
-//----------------------------------------------------
-//
-RESOURCE HOTKEYS r_pnpprovisioning_hotkeys
-    {
-    control =
-        {
-        HOTKEY { command = EAknCmdExit; key='e'; }
-        };
-    }
-
-
-RESOURCE TBUF r_text_query
-    {
-    buf = qtn_op_pnp_query_save;
-    }
-
-RESOURCE TBUF r_text_set_default
-    {
-    buf = qtn_op_pnp_query_set_sefault;
-    }
-
-RESOURCE TBUF r_text_wait_saving
-    {
-    buf = qtn_op_pnp_wait_saving;
-    }
-
-// ---------------------------------------------------------
-//   
-//    r_text_saved
-//    All settings were saved
-//
-// ---------------------------------------------------------
-//
-RESOURCE TBUF r_text_saved
-    {
-    buf = qtn_op_pnp_info_saved;
-    }
-
-// ---------------------------------------------------------
-//   
-//    r_text_cannot_save
-//    Setting cannot save
-//
-// ---------------------------------------------------------
-//
-RESOURCE TBUF r_text_cannot_save
-    {
-    buf = qtn_op_pnp_error_not_saved;
-    }
-
-// ---------------------------------------------------------
-//   
-//    r_text_plugin_caption
-//    Caption for Service Help Plugin
-//
-// ---------------------------------------------------------
-//
-RESOURCE TBUF r_text_plugin_caption
-    {
-    buf = qtn_cp_fetch_settings;
-    }
-
-// ---------------------------------------------------------
-//   
-//    r_text_email_service_note
-//    Note displayed after mailbox settings saved 
-//
-// ---------------------------------------------------------
-//
-RESOURCE TBUF r_text_email_service_note
-    {
-    buf = qtn_op_pnp_mailbox_saved_default;
-    }
-   
-
-
-// End of File
Binary file pnpmobileservices/pnpms/PnP/PnpProvisioningAppData/PnpProvisioningTest.wbf has changed
--- a/pnpmobileservices/pnpms/PnP/PnpProvisioningAppData/PnpProvisioning_caption.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-/*
-* Copyright (c) 2004 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: Implementation of PnPMS components
-*
-*/
-
-
-#include <pnpprovisioning.loc>
-#include <apcaptionfile.rh>
-
-RESOURCE CAPTION_DATA
-{
-    //caption = qtn_app_caption_string;
-    //shortcaption = qtn_app_short_caption_string;
-}
--- a/pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning.loc	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,209 +0,0 @@
-/*
-* Copyright (c) 2007-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: Implementation of PnPMS components
- *
-*/
-
-
-#ifdef LANGUAGE_00
-#include "pnpprovisioning_00.loc"
-#endif
-
-#ifdef LANGUAGE_01
-#include "pnpprovisioning_01.loc"
-#endif
-
-#ifdef LANGUAGE_02
-#include "pnpprovisioning_02.loc"
-#endif
-
-#ifdef LANGUAGE_03
-#include "pnpprovisioning_03.loc"
-#endif
-
-#ifdef LANGUAGE_04
-#include "pnpprovisioning_04.loc"
-#endif
-
-#ifdef LANGUAGE_05
-#include "pnpprovisioning_05.loc"
-#endif
-
-#ifdef LANGUAGE_06
-#include "pnpprovisioning_06.loc"
-#endif
-
-#ifdef LANGUAGE_07
-#include "pnpprovisioning_07.loc"
-#endif
-
-#ifdef LANGUAGE_08
-#include "pnpprovisioning_08.loc"
-#endif
-
-#ifdef LANGUAGE_09
-#include "pnpprovisioning_09.loc"
-#endif
-
-#ifdef LANGUAGE_10
-#include "pnpprovisioning_10.loc"
-#endif
-
-#ifdef LANGUAGE_13
-#include "pnpprovisioning_13.loc"
-#endif
-
-#ifdef LANGUAGE_14
-#include "pnpprovisioning_14.loc"
-#endif
-
-#ifdef LANGUAGE_15
-#include "pnpprovisioning_15.loc"
-#endif
-
-#ifdef LANGUAGE_16
-#include "pnpprovisioning_16.loc"
-#endif
-
-#ifdef LANGUAGE_17
-#include "pnpprovisioning_17.loc"
-#endif
-
-#ifdef LANGUAGE_18
-#include "pnpprovisioning_18.loc"
-#endif
-
-#ifdef LANGUAGE_25
-#include "pnpprovisioning_25.loc"
-#endif
-
-#ifdef LANGUAGE_26
-#include "pnpprovisioning_26.loc"
-#endif
-
-#ifdef LANGUAGE_27
-#include "pnpprovisioning_27.loc"
-#endif
-
-#ifdef LANGUAGE_28
-#include "pnpprovisioning_28.loc"
-#endif
-
-#ifdef LANGUAGE_29
-#include "pnpprovisioning_29.loc"
-#endif
-
-#ifdef LANGUAGE_30
-#include "pnpprovisioning_30.loc"
-#endif
-
-#ifdef LANGUAGE_31
-#include "pnpprovisioning_31.loc"
-#endif
-
-#ifdef LANGUAGE_32
-#include "pnpprovisioning_32.loc"
-#endif
-
-#ifdef LANGUAGE_33
-#include "pnpprovisioning_33.loc"
-#endif
-
-#ifdef LANGUAGE_37
-#include "pnpprovisioning_37.loc"
-#endif
-
-#ifdef LANGUAGE_39
-#include "pnpprovisioning_39.loc"
-#endif
-
-#ifdef LANGUAGE_42
-#include "pnpprovisioning_42.loc"
-#endif
-
-#ifdef LANGUAGE_45
-#include "pnpprovisioning_45.loc"
-#endif
-
-#ifdef LANGUAGE_49
-#include "pnpprovisioning_49.loc"
-#endif
-
-#ifdef LANGUAGE_51
-#include "pnpprovisioning_51.loc"
-#endif
-
-#ifdef LANGUAGE_54
-#include "pnpprovisioning_54.loc"
-#endif
-
-#ifdef LANGUAGE_57
-#include "pnpprovisioning_57.loc"
-#endif
-
-#ifdef LANGUAGE_59
-#include "pnpprovisioning_59.loc"
-#endif
-
-#ifdef LANGUAGE_67
-#include "pnpprovisioning_67.loc"
-#endif
-
-#ifdef LANGUAGE_68
-#include "pnpprovisioning_68.loc"
-#endif
-
-#ifdef LANGUAGE_70
-#include "pnpprovisioning_70.loc"
-#endif
-
-#ifdef LANGUAGE_76
-#include "pnpprovisioning_76.loc"
-#endif
-
-#ifdef LANGUAGE_78
-#include "pnpprovisioning_78.loc"
-#endif
-
-#ifdef LANGUAGE_79
-#include "pnpprovisioning_79.loc"
-#endif
-
-#ifdef LANGUAGE_83
-#include "pnpprovisioning_83.loc"
-#endif
-
-#ifdef LANGUAGE_93
-#include "pnpprovisioning_93.loc"
-#endif
-
-#ifdef LANGUAGE_157
-#include "pnpprovisioning_157.loc"
-#endif
-
-#ifdef LANGUAGE_158
-#include "pnpprovisioning_158.loc"
-#endif
-
-#ifdef LANGUAGE_159
-#include "pnpprovisioning_159.loc"
-#endif
-
-#ifdef LANGUAGE_160
-#include "pnpprovisioning_160.loc"
-#endif
-
-#ifdef LANGUAGE_161
-#include "pnpprovisioning_161.loc"
-#endif
--- a/pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_00.loc	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of PnPMS components
-*
-*/
-
-// LOCALISATION STRINGS
-
-// d:caption string for app
-// l:list_single_large_graphic_pane_t1
-//
-#define qtn_app_caption_string "PnP Provisioning"
-
-// d:caption string for app
-// l:cell_app_pane_t1
-//
-#define qtn_app_short_caption_string "PnP"
-
-//d:Set as default query
-//l:popup_note_window/opt2
-//
-#define qtn_op_conf_setdef "Set the new settings as default settings?"
-
-//d: Save downloaded settings query
-//d: A confirmation is asked before saving settings when they have been downloaded
-//l: popup_note_window/opt2
-//
-#define qtn_op_conf_save "Save settings?"
-
-//d:Heading text for a wait note in "save all settings"-operation
-//l:popup_note_wait_window
-//
-#define qtn_sm_wait_saving_servsett "Saving service settings "
-
-//d:All settings have been saved
-//l:popup_note_window/opt2
-//
-#define qtn_sm_all_serv_settings_copied "Saved"
-
-
-// End of File
--- a/pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_01.loc	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of PnPMS components
-*
-*/
-
-CHARACTER_SET UTF8
-#define qtn_app_caption_string "PnP Provisioning"
-#define qtn_app_short_caption_string "PnP"
-#define qtn_op_conf_save "Save settings?"
-#define qtn_op_conf_setdef "Set new settings as default settings?"
-#define qtn_sm_all_serv_settings_copied "Saved"
-#define qtn_sm_wait_saving_servsett "Saving service settings"
--- a/pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_02.loc	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of PnPMS components
-*
-*/
-
-CHARACTER_SET UTF8
-#define qtn_app_caption_string "PnP Provisioning"
-#define qtn_app_short_caption_string "PnP"
-#define qtn_op_conf_save "Enregistrer les paramètres?"
-#define qtn_op_conf_setdef "Définir les nouveaux paramètres comme paramètres par défaut?"
-#define qtn_sm_all_serv_settings_copied "Enregistrés"
-#define qtn_sm_wait_saving_servsett "Enregistrement des paramètres de service en cours"
--- a/pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_03.loc	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of PnPMS components
-*
-*/
-
-CHARACTER_SET UTF8
-#define qtn_app_caption_string "PnP Provisioning"
-#define qtn_app_short_caption_string "PnP"
-#define qtn_op_conf_save "Einstellungen speichern?"
-#define qtn_op_conf_setdef "Neue Einstellungen als Standard-einstellungen festlegen?"
-#define qtn_sm_all_serv_settings_copied "Gespeichert"
-#define qtn_sm_wait_saving_servsett "Diensteinstellungen werden gespeichert"
--- a/pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_04.loc	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of PnPMS components
-*
-*/
-
-CHARACTER_SET UTF8
-#define qtn_app_caption_string "PnP Provisioning"
-#define qtn_app_short_caption_string "PnP"
-#define qtn_op_conf_save "¿Guardar los ajustes?"
-#define qtn_op_conf_setdef "¿Establecer los ajustes nuevos como ajustes predeterminados?"
-#define qtn_sm_all_serv_settings_copied "Guardados"
-#define qtn_sm_wait_saving_servsett "Guardando los ajustes del servicio"
--- a/pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_05.loc	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of PnPMS components
-*
-*/
-
-CHARACTER_SET UTF8
-#define qtn_app_caption_string "PnP Provisioning"
-#define qtn_app_short_caption_string "PnP"
-#define qtn_op_conf_save "Salvare le impostazioni?"
-#define qtn_op_conf_setdef "Specificare le nuove impostazioni come predefinite?"
-#define qtn_sm_all_serv_settings_copied "Salvate"
-#define qtn_sm_wait_saving_servsett "Salvataggio delle impostazioni del servizio in corso"
--- a/pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_06.loc	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of PnPMS components
-*
-*/
-
-CHARACTER_SET UTF8
-#define qtn_app_caption_string "PnP Provisioning"
-#define qtn_app_short_caption_string "PnP"
-#define qtn_op_conf_save "Spara inställningar?"
-#define qtn_op_conf_setdef "Spara nya inställningar som standardinställningar?"
-#define qtn_sm_all_serv_settings_copied "Sparat"
-#define qtn_sm_wait_saving_servsett "Sparar tjänstinställningar"
--- a/pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_07.loc	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of PnPMS components
-*
-*/
-
-CHARACTER_SET UTF8
-#define qtn_app_caption_string "PnP Provisioning"
-#define qtn_app_short_caption_string "PnP"
-#define qtn_op_conf_save "Vil du gemme indstillingerne?"
-#define qtn_op_conf_setdef "Vil du gemme de nye indstillinger som standard­indstillinger?"
-#define qtn_sm_all_serv_settings_copied "Gemt"
-#define qtn_sm_wait_saving_servsett "Gemmer tjeneste­indstillinger"
--- a/pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_08.loc	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of PnPMS components
-*
-*/
-
-CHARACTER_SET UTF8
-#define qtn_app_caption_string "PnP Provisioning"
-#define qtn_app_short_caption_string "PnP"
-#define qtn_op_conf_save "Lagre innstillinger?"
-#define qtn_op_conf_setdef "Bruke nye innstillinger som standardinnstillinger?"
-#define qtn_sm_all_serv_settings_copied "Lagret"
-#define qtn_sm_wait_saving_servsett "Lagrer tjeneste-\ninnstillinger"
--- a/pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_09.loc	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of PnPMS components
-*
-*/
-
-CHARACTER_SET UTF8
-#define qtn_app_caption_string "PnP Provisioning"
-#define qtn_app_short_caption_string "PnP"
-#define qtn_op_conf_save "Tallennetaanko asetukset?"
-#define qtn_op_conf_setdef "Asetetaanko uudet asetukset oletusasetuksiksi?"
-#define qtn_sm_all_serv_settings_copied "Tallennettu"
-#define qtn_sm_wait_saving_servsett "Tallennetaan palveluasetuksia"
--- a/pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_10.loc	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of PnPMS components
-*
-*/
-
-CHARACTER_SET UTF8
-#define qtn_app_caption_string "PnP Provisioning"
-#define qtn_app_short_caption_string "PnP"
-#define qtn_op_conf_save "Save settings?"
-#define qtn_op_conf_setdef "Set new settings as default settings?"
-#define qtn_sm_all_serv_settings_copied "Saved"
-#define qtn_sm_wait_saving_servsett "Saving service settings"
--- a/pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_13.loc	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of PnPMS components
-*
-*/
-
-CHARACTER_SET UTF8
-#define qtn_app_caption_string "PnP Provisioning"
-#define qtn_app_short_caption_string "PnP"
-#define qtn_op_conf_save "Guardar definições?"
-#define qtn_op_conf_setdef "Predefinir a configuração?"
-#define qtn_sm_all_serv_settings_copied "Guardadas"
-#define qtn_sm_wait_saving_servsett "A guardar definições do serviço"
--- a/pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_14.loc	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of PnPMS components
-*
-*/
-
-CHARACTER_SET UTF8
-#define qtn_app_caption_string "PnP Provisioning"
-#define qtn_app_short_caption_string "PnP"
-#define qtn_op_conf_save "Ayarlar kaydedilsin mi?"
-#define qtn_op_conf_setdef "Yeni ayarlar varsayılan ayarlar olarak belirlensin mi?"
-#define qtn_sm_all_serv_settings_copied "Kaydedildi"
-#define qtn_sm_wait_saving_servsett "Servis ayarları kaydediliyor"
--- a/pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_15.loc	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of PnPMS components
-*
-*/
-
-CHARACTER_SET UTF8
-#define qtn_app_caption_string "PnP Provisioning"
-#define qtn_app_short_caption_string "PnP"
-#define qtn_op_conf_save "Vista stillingar?"
-#define qtn_op_conf_setdef "Nota nýju stillingarnar sem sjálfvaldar stillingar?"
-#define qtn_sm_all_serv_settings_copied "Vistaðar"
-#define qtn_sm_wait_saving_servsett "Vista þjónustustillingar"
--- a/pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_157.loc	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of PnPMS components
-*
-*/
-
-CHARACTER_SET UTF8
-#define qtn_app_caption_string "PnP Provisioning"
-#define qtn_app_short_caption_string "PnP"
-#define qtn_op_conf_save "Save settings?"
-#define qtn_op_conf_setdef "Set new settings as default settings?"
-#define qtn_sm_all_serv_settings_copied "Saved"
-#define qtn_sm_wait_saving_servsett "Saving service settings"
--- a/pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_158.loc	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of PnPMS components
-*
-*/
-
-CHARACTER_SET UTF8
-#define qtn_app_caption_string "PnP Provisioning"
-#define qtn_app_short_caption_string "PnP"
-#define qtn_op_conf_save "Save settings?"
-#define qtn_op_conf_setdef "Set new settings as default settings?"
-#define qtn_sm_all_serv_settings_copied "Saved"
-#define qtn_sm_wait_saving_servsett "Saving service settings"
--- a/pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_159.loc	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of PnPMS components
-*
-*/
-
-CHARACTER_SET UTF8
-#define qtn_app_caption_string "PnP Provisioning"
-#define qtn_app_short_caption_string "PnP"
-#define qtn_op_conf_save "Save settings?"
-#define qtn_op_conf_setdef "Set new settings as default settings?"
-#define qtn_sm_all_serv_settings_copied "Saved"
-#define qtn_sm_wait_saving_servsett "Saving service settings"
--- a/pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_16.loc	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of PnPMS components
-*
-*/
-
-CHARACTER_SET UTF8
-#define qtn_app_caption_string "PnP Provisioning"
-#define qtn_app_short_caption_string "PnP"
-#define qtn_op_conf_save "Сохранить наÑтройки?"
-#define qtn_op_conf_setdef "Сделать новые наÑтройки наÑтройками по умолчанию?"
-#define qtn_sm_all_serv_settings_copied "Сохранено"
-#define qtn_sm_wait_saving_servsett "Сохранение наÑтроек Ñлужбы"
--- a/pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_160.loc	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of PnPMS components
-*
-*/
-
-CHARACTER_SET UTF8
-#define qtn_app_caption_string "PnP Provisioning"
-#define qtn_app_short_caption_string "PnP"
-#define qtn_op_conf_save "Save settings?"
-#define qtn_op_conf_setdef "Set new settings as default settings?"
-#define qtn_sm_all_serv_settings_copied "Saved"
-#define qtn_sm_wait_saving_servsett "Saving service settings"
--- a/pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_161.loc	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of PnPMS components
-*
-*/
-
-CHARACTER_SET UTF8
-#define qtn_app_caption_string "PnP Provisioning"
-#define qtn_app_short_caption_string "PnP"
-#define qtn_op_conf_save "Save settings?"
-#define qtn_op_conf_setdef "Set new settings as default settings?"
-#define qtn_sm_all_serv_settings_copied "Saved"
-#define qtn_sm_wait_saving_servsett "Saving service settings"
--- a/pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_17.loc	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of PnPMS components
-*
-*/
-
-CHARACTER_SET UTF8
-#define qtn_app_caption_string "PnP Provisioning"
-#define qtn_app_short_caption_string "PnP"
-#define qtn_op_conf_save "Menti a beállításokat?"
-#define qtn_op_conf_setdef "Beállítja alapértelme­zettként az új beállításokat?"
-#define qtn_sm_all_serv_settings_copied "Mentve"
-#define qtn_sm_wait_saving_servsett "Szolgáltatásbeállítá­sok mentése"
--- a/pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_18.loc	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of PnPMS components
-*
-*/
-
-CHARACTER_SET UTF8
-#define qtn_app_caption_string "PnP Provisioning"
-#define qtn_app_short_caption_string "PnP"
-#define qtn_op_conf_save "Instellingen opslaan?"
-#define qtn_op_conf_setdef "Nieuwe instellingen als standaard instellen?"
-#define qtn_sm_all_serv_settings_copied "Opgeslagen"
-#define qtn_sm_wait_saving_servsett "Dienstinstellingen worden opgeslagen"
--- a/pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_25.loc	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of PnPMS components
-*
-*/
-
-CHARACTER_SET UTF8
-#define qtn_app_caption_string "PnP Provisioning"
-#define qtn_app_short_caption_string "PnP"
-#define qtn_op_conf_save "Chcete nastavení uložit?"
-#define qtn_op_conf_setdef "Chcete nové nastavení používat jako výchozí?"
-#define qtn_sm_all_serv_settings_copied "Uloženo"
-#define qtn_sm_wait_saving_servsett "Ukládání nastavení služby"
--- a/pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_26.loc	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of PnPMS components
-*
-*/
-
-CHARACTER_SET UTF8
-#define qtn_app_caption_string "PnP Provisioning"
-#define qtn_app_short_caption_string "PnP"
-#define qtn_op_conf_save "Uložiť nastavenia?"
-#define qtn_op_conf_setdef "Použiť nové nastavenia ako predvolené?"
-#define qtn_sm_all_serv_settings_copied "Uložené"
-#define qtn_sm_wait_saving_servsett "Ukladajú sa nastavenia služby"
--- a/pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_27.loc	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of PnPMS components
-*
-*/
-
-CHARACTER_SET UTF8
-#define qtn_app_caption_string "PnP Provisioning"
-#define qtn_app_short_caption_string "PnP"
-#define qtn_op_conf_save "Zapisać ustawienia?"
-#define qtn_op_conf_setdef "Czy nowe ustawienia mają być domyślne?"
-#define qtn_sm_all_serv_settings_copied "Zapisano"
-#define qtn_sm_wait_saving_servsett "Zapisywanie ustawień usługi"
--- a/pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_28.loc	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of PnPMS components
-*
-*/
-
-CHARACTER_SET UTF8
-#define qtn_app_caption_string "PnP Provisioning"
-#define qtn_app_short_caption_string "PnP"
-#define qtn_op_conf_save "Shranim nastavitve?"
-#define qtn_op_conf_setdef "Uporabim nove nastavitve za privzete?"
-#define qtn_sm_all_serv_settings_copied "Shranjeno"
-#define qtn_sm_wait_saving_servsett "Shranjujem nastavitve storitve"
--- a/pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_29.loc	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of PnPMS components
-*
-*/
-
-CHARACTER_SET UTF8
-#define qtn_app_caption_string "PnP Provisioning"
-#define qtn_app_short_caption_string "PnP"
-#define qtn_op_conf_save "是å¦å„²å­˜è¨­å®šï¼Ÿ"
-#define qtn_op_conf_setdef "將新的設定設為é è¨­è¨­å®šï¼Ÿ"
-#define qtn_sm_all_serv_settings_copied "已儲存"
-#define qtn_sm_wait_saving_servsett "æœå‹™è¨­å®šå„²å­˜ä¸­"
--- a/pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_30.loc	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of PnPMS components
-*
-*/
-
-CHARACTER_SET UTF8
-#define qtn_app_caption_string "PnP Provisioning"
-#define qtn_app_short_caption_string "PnP"
-#define qtn_op_conf_save "是å¦å„²å­˜è¨­å®šï¼Ÿ"
-#define qtn_op_conf_setdef "將新的設定設為é è¨­è¨­å®šï¼Ÿ"
-#define qtn_sm_all_serv_settings_copied "已儲存"
-#define qtn_sm_wait_saving_servsett "æœå‹™è¨­å®šå„²å­˜ä¸­"
--- a/pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_31.loc	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of PnPMS components
-*
-*/
-
-CHARACTER_SET UTF8
-#define qtn_app_caption_string "PnP Provisioning"
-#define qtn_app_short_caption_string "PnP"
-#define qtn_op_conf_save "储存设置?"
-#define qtn_op_conf_setdef "将新设置设为\n默认设置?"
-#define qtn_sm_all_serv_settings_copied "已存"
-#define qtn_sm_wait_saving_servsett "正在储存设置"
--- a/pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_32.loc	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of PnPMS components
-*
-*/
-
-CHARACTER_SET UTF8
-#define qtn_app_caption_string "PnP Provisioning"
-#define qtn_app_short_caption_string "PnP"
-#define qtn_op_conf_save "設定をä¿å­˜ã—ã¾ã™ã‹ï¼Ÿ"
-#define qtn_op_conf_setdef "æ–°ã—ã„設定をデフォルトã¨ã—ã¦è¨­å®šã—ã¾ã™ã‹ï¼Ÿ"
-#define qtn_sm_all_serv_settings_copied "ä¿å­˜ã—ã¾ã—ãŸ"
-#define qtn_sm_wait_saving_servsett "サービス設定をä¿å­˜ä¸­"
--- a/pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_33.loc	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of PnPMS components
-*
-*/
-
-CHARACTER_SET UTF8
-#define qtn_app_caption_string "PnP Provisioning"
-#define qtn_app_short_caption_string "PnP"
-#define qtn_op_conf_save "จัดเà¸à¹‡à¸šà¸à¸²à¸£à¸•à¸±à¹‰à¸‡à¸„่า?"
-#define qtn_op_conf_setdef "à¸à¸³à¸«à¸™à¸”à¸à¸²à¸£à¸•à¸±à¹‰à¸‡à¸„่าใหม่\nเป็นค่าที่ตั้งไว้?"
-#define qtn_sm_all_serv_settings_copied "จัดเà¸à¹‡à¸šà¹à¸¥à¹‰à¸§"
-#define qtn_sm_wait_saving_servsett "à¸à¸³à¸¥à¸±à¸‡à¸ˆà¸±à¸”เà¸à¹‡à¸šà¸à¸²à¸£à¸•à¸±à¹‰à¸‡à¸„่า\nบริà¸à¸²à¸£"
--- a/pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_37.loc	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of PnPMS components
-*
-*/
-
-CHARACTER_SET UTF8
-#define qtn_app_caption_string "PnP Provisioning"
-#define qtn_app_short_caption_string "PnP"
-#define qtn_op_conf_save "Ø­Ùظ الضبط؟"
-#define qtn_op_conf_setdef "إعداد الضبط الجديد على الضبط الاÙتراضي؟"
-#define qtn_sm_all_serv_settings_copied "تم الحÙظ"
-#define qtn_sm_wait_saving_servsett "جار Ø­Ùظ ضبط الخدمة"
--- a/pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_39.loc	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of PnPMS components
-*
-*/
-
-CHARACTER_SET UTF8
-#define qtn_app_caption_string "PnP Provisioning"
-#define qtn_app_short_caption_string "PnP"
-#define qtn_op_conf_save "I-save ang mga setting?"
-#define qtn_op_conf_setdef "Itakda ang mga bagong setting bilang mga default ng setting?"
-#define qtn_sm_all_serv_settings_copied "Nai-save"
-#define qtn_sm_wait_saving_servsett "Sini-save ang mga setting ng serbisyo"
--- a/pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_42.loc	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of PnPMS components
-*
-*/
-
-CHARACTER_SET UTF8
-#define qtn_app_caption_string "PnP Provisioning"
-#define qtn_app_short_caption_string "PnP"
-#define qtn_op_conf_save "ЗапаметÑване на наÑтройките?"
-#define qtn_op_conf_setdef "Задаване новите наÑтройки да Ñа по подразбиране?"
-#define qtn_sm_all_serv_settings_copied "Запаметено"
-#define qtn_sm_wait_saving_servsett "ЗапаметÑване на наÑтройките за уÑлуги"
--- a/pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_45.loc	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of PnPMS components
-*
-*/
-
-CHARACTER_SET UTF8
-#define qtn_app_caption_string "PnP Provisioning"
-#define qtn_app_short_caption_string "PnP"
-#define qtn_op_conf_save "Spremiti postavke?"
-#define qtn_op_conf_setdef "Postaviti nove postavke kao zadane?"
-#define qtn_sm_all_serv_settings_copied "Spremljeno"
-#define qtn_sm_wait_saving_servsett "Spremanje postavki usluge"
--- a/pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_49.loc	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of PnPMS components
-*
-*/
-
-CHARACTER_SET UTF8
-#define qtn_app_caption_string "PnP Provisioning"
-#define qtn_app_short_caption_string "PnP"
-#define qtn_op_conf_save "Kas soovite seaded salvestada?"
-#define qtn_op_conf_setdef "Kas soovite uued seaded vaikeseadeteks määrata?"
-#define qtn_sm_all_serv_settings_copied "Salvestatud"
-#define qtn_sm_wait_saving_servsett "Teenuseseadete salvestamine"
--- a/pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_51.loc	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of PnPMS components
-*
-*/
-
-CHARACTER_SET UTF8
-#define qtn_app_caption_string "PnP Provisioning"
-#define qtn_app_short_caption_string "PnP"
-#define qtn_op_conf_save "Enregistrer les paramètres?"
-#define qtn_op_conf_setdef "Définir les nouveaux paramètres comme paramètres par défaut?"
-#define qtn_sm_all_serv_settings_copied "Enregistrés"
-#define qtn_sm_wait_saving_servsett "Enregistrement des paramètres de service en cours"
--- a/pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_54.loc	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of PnPMS components
-*
-*/
-
-CHARACTER_SET UTF8
-#define qtn_app_caption_string "PnP Provisioning"
-#define qtn_app_short_caption_string "PnP"
-#define qtn_op_conf_save "Αποθήκευση των Ïυθμίσεων;"
-#define qtn_op_conf_setdef "Θέλετε να οÏίσετε τις νέες Ïυθμίσεις ως Ï€Ïοεπιλεγμένες;"
-#define qtn_sm_all_serv_settings_copied "Οι Ïυθμίσεις αποθηκεÏτηκαν"
-#define qtn_sm_wait_saving_servsett "Αποθήκευση των Ïυθμίσεων υπηÏεσιών"
--- a/pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_57.loc	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of PnPMS components
-*
-*/
-
-CHARACTER_SET UTF8
-#define qtn_app_caption_string "PnP Provisioning"
-#define qtn_app_short_caption_string "PnP"
-#define qtn_op_conf_save "לשמור הגדרות?"
-#define qtn_op_conf_setdef "לקבוע ×ת ההגדרות החדשות כהגדרות ברירת המחדל?"
-#define qtn_sm_all_serv_settings_copied "נשמרו"
-#define qtn_sm_wait_saving_servsett "שומר הגדרות שירות"
--- a/pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_59.loc	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of PnPMS components
-*
-*/
-
-CHARACTER_SET UTF8
-#define qtn_app_caption_string "PnP Provisioning"
-#define qtn_app_short_caption_string "PnP"
-#define qtn_op_conf_save "Simpan pengaturan?"
-#define qtn_op_conf_setdef "Tetapkan pengaturan baru sebagai pengaturan default?"
-#define qtn_sm_all_serv_settings_copied "Disimpan"
-#define qtn_sm_wait_saving_servsett "Menyimpan pengaturan layanan"
--- a/pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_67.loc	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of PnPMS components
-*
-*/
-
-CHARACTER_SET UTF8
-#define qtn_app_caption_string "PnP Provisioning"
-#define qtn_app_short_caption_string "PnP"
-#define qtn_op_conf_save "Vai saglabÄt uzstÄdÄ«jumus?"
-#define qtn_op_conf_setdef "Vai uzstÄdÄ«t jaunos uzstÄdÄ«jumus kÄ noklusÄ“tos?"
-#define qtn_sm_all_serv_settings_copied "SaglabÄti"
-#define qtn_sm_wait_saving_servsett "SaglabÄ pakalpojuma uzstÄdÄ«jumus"
--- a/pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_68.loc	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of PnPMS components
-*
-*/
-
-CHARACTER_SET UTF8
-#define qtn_app_caption_string "PnP Provisioning"
-#define qtn_app_short_caption_string "PnP"
-#define qtn_op_conf_save "IÅ¡saugoti parametrus?"
-#define qtn_op_conf_setdef "Nustatyti naujus parametrus kaip numatytuosius?"
-#define qtn_sm_all_serv_settings_copied "IÅ¡saugota"
-#define qtn_sm_wait_saving_servsett "IÅ¡saugomi paslaugos parametrai"
--- a/pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_70.loc	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of PnPMS components
-*
-*/
-
-CHARACTER_SET UTF8
-#define qtn_app_caption_string "PnP Provisioning"
-#define qtn_app_short_caption_string "PnP"
-#define qtn_op_conf_save "Simpan tetapan?"
-#define qtn_op_conf_setdef "Tetapkan tetapan baru sebagai tetapan lalai?"
-#define qtn_sm_all_serv_settings_copied "Disimpan"
-#define qtn_sm_wait_saving_servsett "Menyimpan tetapan perkhidmatan"
--- a/pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_76.loc	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of PnPMS components
-*
-*/
-
-CHARACTER_SET UTF8
-#define qtn_app_caption_string "PnP Provisioning"
-#define qtn_app_short_caption_string "PnP"
-#define qtn_op_conf_save "Salvar configurações?"
-#define qtn_op_conf_setdef "Definir novas configurações como configurações padrão?"
-#define qtn_sm_all_serv_settings_copied "Salvo(a)"
-#define qtn_sm_wait_saving_servsett "Salvando configurações de serviço"
--- a/pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_78.loc	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of PnPMS components
-*
-*/
-
-CHARACTER_SET UTF8
-#define qtn_app_caption_string "PnP Provisioning"
-#define qtn_app_short_caption_string "PnP"
-#define qtn_op_conf_save "Memoraţi setările?"
-#define qtn_op_conf_setdef "Setaţi noile setări ca setări implicite?"
-#define qtn_sm_all_serv_settings_copied "Memorate"
-#define qtn_sm_wait_saving_servsett "Se memorează setările serviciului"
--- a/pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_79.loc	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of PnPMS components
-*
-*/
-
-CHARACTER_SET UTF8
-#define qtn_app_caption_string "PnP Provisioning"
-#define qtn_app_short_caption_string "PnP"
-#define qtn_op_conf_save "SaÄuvati podeÅ¡avanja?"
-#define qtn_op_conf_setdef "Postaviti nova podešavanja kao podrazumevana?"
-#define qtn_sm_all_serv_settings_copied "SaÄuvano"
-#define qtn_sm_wait_saving_servsett "Čuvanje podešavanja servisa"
--- a/pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_83.loc	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of PnPMS components
-*
-*/
-
-CHARACTER_SET UTF8
-#define qtn_app_caption_string "PnP Provisioning"
-#define qtn_app_short_caption_string "PnP"
-#define qtn_op_conf_save "¿Guardar configuraciones?"
-#define qtn_op_conf_setdef "¿Definir nuevas configuraciones como predeterminadas?"
-#define qtn_sm_all_serv_settings_copied "Guardadas"
-#define qtn_sm_wait_saving_servsett "Guardando configuraciones de servicio"
--- a/pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/LocalizedFiles/pnpprovisioning_93.loc	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of PnPMS components
-*
-*/
-
-CHARACTER_SET UTF8
-#define qtn_app_caption_string "PnP Provisioning"
-#define qtn_app_short_caption_string "PnP"
-#define qtn_op_conf_save "Зберегти уÑтановки?"
-#define qtn_op_conf_setdef "Ð’Ñтановити нові уÑтановки Ñк уÑтановки за умовчаннÑм?"
-#define qtn_sm_all_serv_settings_copied "Збережено"
-#define qtn_sm_wait_saving_servsett "Ð—Ð±ÐµÑ€ÐµÐ¶ÐµÐ½Ð½Ñ ÑƒÑтановок Ñлужби"
--- a/pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/PnpLogger.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,134 +0,0 @@
-/*
-* Copyright (c) 2004 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 file defines logging interface macros
-*
-*/
-
-
-#ifndef __LOGGER_H__
-#define __LOGGER_H__
-
-#ifdef _DEBUG
-    #define LOGGING_ENABLED
-#endif
-#ifdef LOGGING_ENABLED          // This must be enabled to use logging system
-
-#define LOGGER_LOGGING          // Log to Logger
-
-
-
-#ifdef LOGGER_LOGGING
-
-//  INCLUDES
-#include <flogger.h>
-
-// LOG SETTINGS 
-_LIT( KPnpLogFolder, "PnP" );
-_LIT( KPnpLogFile, "PnPProvisioning.TXT" );
-
-#endif
-
-// CONSTANTS  
-// None.
-
-// MACROS
-/*
------------------------------------------------------------------------------
-
-    INTERNAL MACROs. 
-
-    DO NOT USE THESE DIRECTLY !!! 
-    SEE EXTERNAL MACROS
-
------------------------------------------------------------------------------
-*/
-
-#ifdef LOGGER_LOGGING
-
-#define INTRLOGTEXT( AAA )                                                                        \
-    {                                                                                            \
-    RFileLogger::Write( KPnpLogFolder(), KPnpLogFile(), EFileLoggingModeAppend, AAA );            \
-    }
-#define INTRLOGSTRING( AAA )                                                                    \
-    {                                                                                            \
-    _LIT( tempLogDes, AAA );                                                                    \
-    RFileLogger::Write( KPnpLogFolder(), KPnpLogFile(), EFileLoggingModeAppend, tempLogDes() ); \
-    }
-#define INTRLOGSTRING2( AAA, BBB )                                                                \
-    {                                                                                            \
-    _LIT( tempLogDes, AAA );                                                                    \
-    RFileLogger::WriteFormat( KPnpLogFolder(), KPnpLogFile(), EFileLoggingModeAppend, TRefByValue<const TDesC>( tempLogDes()), BBB ); \
-    }
-#define INTRLOGSTRING3( AAA, BBB, CCC )                                                            \
-    {                                                                                            \
-    _LIT( tempLogDes, AAA );                                                                    \
-    RFileLogger::WriteFormat( KPnpLogFolder(), KPnpLogFile(), EFileLoggingModeAppend, TRefByValue<const TDesC>( tempLogDes()), BBB, CCC ); \
-    }
-#else
-#define INTRLOGTEXT( AAA )
-#define INTRLOGSTRING( AAA )
-#define INTRLOGSTRING2( AAA, BBB )
-#define INTRLOGSTRING3( AAA, BBB, CCC )
-#endif
-
-/*
------------------------------------------------------------------------------
-
-    EXTERNAL MACROs
-
-    USE THESE MACROS IN YOUR CODE !
-
------------------------------------------------------------------------------
-*/
-
-
-#define LOGTEXT( AAA )                { \
-                                    INTRLOGTEXT( AAA ); \
-                                    }   // Example: LOGTEXT( own_desc );
-
-#define LOGSTRING( AAA )            { \
-                                    INTRLOGSTRING( AAA ); \
-                                    }   // Example: LOGSTRING( "Test" );
-
-#define LOGSTRING2( AAA, BBB )        { \
-                                    INTRLOGSTRING2( AAA, BBB ); \
-                                    }  // Example: LOGSTRING( "Test %i", aValue );
-
-#define LOGSTRING3( AAA, BBB, CCC )    { \
-                                    INTRLOGSTRING3( AAA, BBB, CCC ); \
-                                    } // Example: LOGSTRING( "Test %i %i", aValue1, aValue2 );
-
-
-#else   // LOGGING_ENABLED
-
-#define LOGTEXT( AAA ) 
-#define LOGSTRING( AAA ) 
-#define LOGSTRING2( AAA, BBB )    
-#define LOGSTRING3( AAA, BBB, CCC )    
-
-#endif  // LOGGING_ENABLED
-
-// DATA TYPES
-// None.
-
-// FUNCTION PROTOTYPES
-// None.
-
-// FORWARD DECLARATIONS
-// None.
-
-// CLASS DECLARATION
-// None.
-
-#endif  // __LOGGER_H__
\ No newline at end of file
--- a/pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/PnpProvisioningApp.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-/*
-* Copyright (c) 2004 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: Implementation of PnPMS components
-*
-*/
-
-
-#ifndef PNPPROVISIONINGAPP_H
-#define PNPPROVISIONINGAPP_H
-
-// INCLUDES
-#include <aknapp.h>
-
-// CONSTANTS
-// UID of the application
-const TUid KUidPnpProvisioning = { 0x10204339 };
-
-// CLASS DECLARATION
-
-/**
-* CPnpProvisioningApp application class.
-* Provides factory to create concrete document object.
-* 
-*/
-class CPnpProvisioningApp : public CAknApplication
-    {
-    
-    public: // Functions from base classes
-    private:
-
-        /**
-        * From CApaApplication, creates CPnpProvisioningDocument document object.
-        * @return A pointer to the created document object.
-        */
-        CApaDocument* CreateDocumentL();
-        
-        /**
-        * From CApaApplication, returns application's UID (KUidPnpProvisioning).
-        * @return The value of KUidPnpProvisioning.
-        */
-        TUid AppDllUid() const;
-    };
-
-#endif
-
-// End of File
-
--- a/pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/PnpProvisioningAppUi.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,128 +0,0 @@
-/*
-* Copyright (c) 2004-2006 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: Implementation of PnPMS components
-*
-*/
-
-
-#ifndef PNPPROVISIONINGAPPUI_H
-#define PNPPROVISIONINGAPPUI_H
-
-// INCLUDES
-#include <eikapp.h>
-#include <eikdoc.h>
-#include <e32std.h>
-#include <coeccntx.h>
-#include <aknappui.h>
-#include "PnpProvisioningDocument.h"
-#include "mwaitdialogstatusnotifier.h"  // for MWaitDialogStatusNotifier
-#include <PnpProvUtil.h>
-#include "PnpServiceActivation.h"
-
-
-// FORWARD DECLARATIONS
-//class CPnpProvisioningContainer;
-class CWaitDialogMonitor;
-
-// CLASS DECLARATION
-
-/**
-* Application UI class.
-* Provides support for the following features:
-* - EIKON control architecture
-* 
-*/
-class CPnpProvisioningAppUi : 
-    public CAknAppUi,
-    public MCoeForegroundObserver,
-    private MWaitDialogStatusNotifier
-    {
-    public: // // Constructors and destructor
-
-        /**
-        * EPOC default constructor.
-        */      
-        void ConstructL();
-
-        /**
-        * Destructor.
-        */      
-        ~CPnpProvisioningAppUi();
-        
-    public: // New functions
-
-        /**
-        * From Exits app.
-        */
-        void DoExit();
-        void RedirectL( const TDesC& aUrl, THttpProvStates::TProvisioningStatus aStatus );
-        static TInt PeriodicCallback( TAny* aPtr );
-
-    public: // from MCoeForegroundObserver
-        void HandleGainingForeground();
-        void HandleLosingForeground();
-        
-    private:
-        // From MEikMenuObserver
-        void DynInitMenuPaneL(TInt aResourceId,CEikMenuPane* aMenuPane);
-    
-    public: // from MCMDialogStatusNotifier
-        void WaitDialogDismissedL( const TInt aStatusCode );
-
-    public:
-	TBool ServiceActivationEnabledL();
-        
-    private:
-        /**
-        * From CEikAppUi, takes care of command handling.
-        * @param aCommand command to be handled
-        */
-        void HandleCommandL(TInt aCommand);
-
-        /**
-        * From CEikAppUi, handles key events.
-        * @param aKeyEvent Event to handled.
-        * @param aType Type of the key event. 
-        * @return Response code (EKeyWasConsumed, EKeyWasNotConsumed). 
-        */
-        virtual TKeyResponse HandleKeyEventL(
-            const TKeyEvent& aKeyEvent,TEventCode aType);
-            
-        void ShowWaitNoteL();
-        
-        void TerminateBrowserL(TInt aError, TInt& aNoRedirect);
-
-    private: //Data
-        void DoPeriodicCallbackL( TAny* aPtr );
-        /**
-        Tries to read AP id from a connection (that is currently in use)
-        that RConnectionMonitor::GetConnectionInfo gives first.
-        */
-        void ResolveApL( TUint32& aAp );
-        
-        void ShowErrorNoteL();
-
-        //CPnpProvisioningContainer* iAppContainer; 
-        CPeriodic* iPeriodic;
-        TUint32 iApInUse;
-        
-         // wait note dialog monitor
-        CWaitDialogMonitor* iWaitDialogMonitor;
-        // wait note dialog
-        CAknGlobalNote* iGlobalWaitNote;
-    };
-
-#endif
-
-// End of File
--- a/pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/PnpProvisioningDocument.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,116 +0,0 @@
-/*
-* Copyright (c) 2004-2006 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: Implementation of PnPMS components
-*
-*/
-
-
-
-#ifndef PNPPROVISIONINGDOCUMENT_H
-#define PNPPROVISIONINGDOCUMENT_H
-
-// INCLUDES
-#include <AknDoc.h>
-#include "HttpProvStates.h"
-
-// CONSTANTS
-
-// FORWARD DECLARATIONS
-class  CEikAppUi;
-class  CPnpProvisioningAppUi;
-class  CNHeadWrapperParser;
-// CLASS DECLARATION
-
-/**
-*  CPnpProvisioningDocument application class.
-*/
-class CPnpProvisioningDocument : public CAknDocument
-    {
-    public: // Constructors and destructor
-        /**
-        * Two-phased constructor.
-        */
-        static CPnpProvisioningDocument* NewL(CEikApplication& aApp);
-
-        /**
-        * Destructor.
-        */
-        virtual ~CPnpProvisioningDocument();
-
-    public: // New functions
-
-        /**
-        * Handles provisioning file
-        */
-        void HandleFileL(TBool aDoOpen,const TDesC& aFilename,RFs& aFs);
-        void DoHandleFileL( RFile& aFile );
-
-        /**
-        * Saves settings
-        */
-        THttpProvStates::TProvisioningStatus SaveSettingsL();
-
-        inline TBool Ready() { return(iReady); }
-
-        /**
-        * Get report url
-        */
-        const TDesC8& GetReportUrlL(); 
-
-    public: // Functions from base classes
-        
-        /**
-        * From CApaDocument: This is called by framework to restore saved data
-        * from persistent store to document
-        */
-        void RestoreL(const CStreamStore& aStore, const CStreamDictionary& aStreamDic);
-
-        /**
-        * From CApaDocument: This is called by framework to store data
-        * to persistent store
-        */
-        void StoreL(CStreamStore& aStore, CStreamDictionary& aStreamDic) const;
-
-        // from CEikDocument
-        void OpenFileL( CFileStore*& aFileStore, RFile& aFile );
-
-        // from CEikDocument
-        CFileStore* OpenFileL(TBool aDoOpen,const TDesC& aFilename,RFs& aFs);
-
-    private:
-
-        /**
-        * EPOC default constructor.
-        */
-        CPnpProvisioningDocument(CEikApplication& aApp);
-        void ConstructL();
-
-    private:
-
-        /**
-        * From CEikDocument, create CPnpProvisioningAppUi "App UI" object.
-        */
-        CEikAppUi* CreateAppUiL();
-        CPnpProvisioningAppUi* iAppUi;
-        HBufC8* iProvisioningData; 
-        CNHeadWrapperParser* iNHwrParser;
-        THttpProvStates::TProvisioningStatus iProvisioningStatus; 
-        TBool iReady;
-        //CPeriodic* iPeriodic;    
-    };
-
-#endif
-
-// End of File
-
--- a/pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/PnpProvisioningSaver.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,167 +0,0 @@
-/*
-* Copyright (c) 2002-2006 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:  Settings saver with progress note.
-*
-*/
-
-
-
-#ifndef CPNPPROVISIONINGSAVER_H
-#define CPNPPROVISIONINGSAVER_H
-
-// INCLUDES
-#include <msgbiocontrol.h>                // for CMsgBioControl
-#include <ActiveApDb.h>
-#include <FavouritesDbObserver.h>
-#include "mwaitdialogstatusnotifier.h"  // for MWaitDialogStatusNotifier
-
-// FORWARD DECLARATIONS
-class CWPEngine;
-class CActiveFavouritesDbNotifier;
-class CBookmarkDb;
-class CWaitDialogMonitor;
-// CLASS DECLARATION
-
-/**
- * Helper class for saving Provisioning settings. Provides a progress note.
- */
-class CPnpProvisioningSaver :
-    public CActive,
-    private MActiveApDbObserver,
-    private MFavouritesDbObserver,
-    private MWaitDialogStatusNotifier
-    {
-    public:
-        /**
-        * C++ default constructor.
-        * @param aEngine Engine to be used for saving
-        */
-        CPnpProvisioningSaver( CWPEngine& aEngine, TBool aSetAsDefault, TBool aWaitNote );
-
-        /**
-        * Destructor.
-        */
-        ~CPnpProvisioningSaver();
-
-    public:
-        /**
-        * Prepares the object for saving.
-        */
-        void PrepareLC();
-
-        /**
-        * Executes save with a progress note. Ownership of the
-        * CPnpProvisioningSaver object is transferred.
-        * @param aNumSaved When returns, contains number of settings saved.
-        * @return Status code. >= 0 if saving was completed
-        */
-        TInt ExecuteLD( TInt& aNumSaved );
-
-    protected: // From CActive
-
-        void DoCancel();
-        void RunL();
-        TInt RunError( TInt aError );
-
-    private: // from MActiveApDbObserver
-
-        void HandleApDbEventL( TEvent anEvent );
-
-    private: // from MFavouritesDbObserver
-
-        void HandleFavouritesDbEventL( RDbNotifier::TEvent aEvent );
-        
-    private: // from MCMDialogStatusNotifier
-        void WaitDialogDismissedL( const TInt aStatusCode );
-    private:
-        /**
-        * Complete the request so that RunL() gets called.
-        */
-        void CompleteRequest();
-
-        /**
-        * Complete the request so that Timeout() gets called after
-        * a delay.
-        */
-        void DelayedCompleteRequest();
-
-        /**
-        * Retry save now.
-        */
-        void Retry();
-
-        /**
-        * Timer timed-out.
-        */
-        static TInt Timeout(TAny* aSelf);
-
-        /*
-        * Process is finished. Deletes wait dialog.
-        */
-        void ProcessFinishedL();
-        
-        /*
-        * Show wait note dialog
-        */
-        void ShowWaitNoteL();
-
-    private:
-        // The engine used for performing the save. Refs.
-        CWPEngine& iEngine;
-
-        // ETrue if setting as default
-        TBool iSetAsDefault;
-
-        // The item to be saved next
-        TInt iCurrentItem;
-
-        // Contains result to be passed to the called of ExecuteLD
-        TInt iResult;
-
-        // Active AP database
-        CActiveApDb* iApDbNotifier;
-
-        // Active Favourites Database
-        CActiveFavouritesDbNotifier* iFavouritesNotifier;
-
-        // Bookmarks database
-        CBookmarkDb* iBookmarkDb;
-
-        // Contains ETrue if commsdb is being waited on
-        TBool iWaitCommsDb;
-
-        // Contains ETrue if favourites db is being waited on
-        TBool iWaitFavourites;
-
-        // Active scheduler.
-        CActiveSchedulerWait iWait;
-
-        // Timer for retry
-        CPeriodic* iRetryTimer;
-        
-        // wait note dialog monitor
-        CWaitDialogMonitor* iWaitDialogMonitor;
-        // wait note dialog
-        CAknGlobalNote* iGlobalWaitNote;
-        
-        //End key pressed or not
-        TBool iEndKeyPressed;
-        
-        TBool iShowWaitNote;
-    };
-
-
-#endif // CPNPPROVISIONINGSAVER_H
-
-// End of File
--- a/pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/PnpServiceActivation.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,93 +0,0 @@
-/*
-* Copyright (c) 2007-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:  PnpServiceActivation header file
-*
-*/
-
-
-#ifndef PNP_SERVICE_ACTIVATION_H
-#define PNP_SERVICE_ACTIVATION_H
-
-#include <e32base.h>
-
-class CPnpServiceActivation: public CBase
-{
-
-public:  // Constructors and destructor
-        
-       /**
-        * Two-phased constructor.
-        */
-        static CPnpServiceActivation* NewL();
-
-       /**
-        * Two-phased constructor.
-        */
-        static CPnpServiceActivation* NewLC();
-
-       /**
-        * Destructor.
-        */
-        ~CPnpServiceActivation();
-private:
-        /**
-         * C++ default constructor.
-         */
-         CPnpServiceActivation();
-
-        /** 
-         *By default Symbian 2nd phase constructor is private.
-         */
-         void ConstructL();
-private:
-
-  	   /** 
-  	     * Mapping Application ID launched PNPMS client with that of 
-  	     * provisioning setting application ID. 
-  	     * This function validates the application ID with provisioning 
-  	     * settings ID 
-  	     */ 
-  	     TBool ValidateAppUidWithProvappIDL();
-  	     TUint32 iLaunchUid;
-  	     TUint32 iPosition;
-
-public:
-
-	  /** 	    
-	    * Launch Application using command line Symbian Fw 
-	    */ 
-	    void LaunchApplicationL();
-
-	  /** 
-	    * kill browser after settings are downloded and launching application 
-	    */ 
-	    void KillBrowserL();
-
-	  /** 	      	
-	    *Display note specific to Service 
-	    */ 
-	    void DisplayAppSpecNoteL();
-	// Additional  functions can be added if new functions are required
-        // for service activation
-
-		TBool isPresent(TDesC& p );
-
-		void ParseValues(RPointerArray<HBufC>& array, TDesC& aValue);
-		void GetCenrepValueL(const TUid aRepositoryUid,TUint32 aKey, TDes16& aValue);
-		TBool Search(RPointerArray<HBufC>& array,TDesC& p);
-		TBool isFound(TDesC& p,TUint32 position);
-};
-
-
-#endif PNP_SERVICE_ACTIVATION_H
\ No newline at end of file
--- a/pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/cwaitdialogmonitor.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,119 +0,0 @@
-/*
-* Copyright (c) 2006 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:  Header file for dialog monitor
-*
-*/
-
-
-
-#ifndef CWAITDIALOGMONITOR_H
-#define CWAITDIALOGMONITOR_H
-
-//  INCLUDES
-#include <e32base.h>
-//#include <etelmm.h>
-
-// CONSTANTS
-//None
-
-// MACROS
-// None
-
-// DATA TYPES
-// None
-
-// FUNCTION PROTOTYPES
-// None
-
-// FORWARD DECLARATIONS
-
-class MWaitDialogStatusNotifier;
-
-// CLASS DECLARATION
-
-/**
-*  CWaitDialogMonitor.
-*  Monitors the dialog status
-*
-*  @lib Confmanager.app
-*  @since 2.0
-*/
-class CWaitDialogMonitor : public CActive
-    {
-    public:  // Constructors and destructor
-
-        /**
-        * Two-phased constructor.
-        */
-        static CWaitDialogMonitor* NewL( MWaitDialogStatusNotifier& aNotifier );
-        
-        /**
-        * Destructor.
-        */
-        ~CWaitDialogMonitor();
-
-    public: // New functions
-            
-
-        /**
-        * StartMonitoring.
-        * @since 2.0
-        * @return void
-        */
-        void Start();
-
-    private: // Functions from base classes
-        
-        /**
-        * From CActive Handles an active object’s request completion event.
-        * @since 2.0
-        * @return void
-        */
-        void RunL();
-        
-        /**
-        * From CActive Cancels any outstanding request.
-        * @since 2.0
-        * @return void
-        */
-        void DoCancel();
-
-        /**
-        * From CActive Handles a leave occurring in the request completion event handler RunL().
-        */
-        //TInt RunError( TInt aError );
-    private:
-
-        /**
-        * C++ default constructor.
-        */
-        CWaitDialogMonitor( MWaitDialogStatusNotifier& aNotifier );
-
-        /**
-        * By default Symbian 2nd phase constructor is private.
-        */
-        void ConstructL();
-    
-    public:     // Data
-
-    protected:  // Data        
-
-    private:    // Data
-        MWaitDialogStatusNotifier& iNotifier;
-
-    };
-
-#endif      // CWaitDialogMonitor_H   
-            
-// End of File
--- a/pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/mwaitdialogstatusnotifier.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-/*
-* Copyright (c) 2006 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: Implementation of PnPMS components
-*
-*/
-
-
-
-
-#ifndef MWAITDIALOGSTATUSNOTIFIER_H
-#define MWAITDIALOGSTATUSNOTIFIER_H
-
-//  INCLUDES
-#include <e32base.h>
-//#include <etelmm.h>
-//#include "cwaitdialogmonitor.h"
-
-// CONSTANTS
-// None
-
-// MACROS
-// None
-
-// DATA TYPES
-// None
-
-// FUNCTION PROTOTYPES
-// None
-
-// FORWARD DECLARATIONS
-// None
-
-// CLASS DECLARATION
-// None
-
-/**
-*  MWaitDialogStatusNotifier.
-*
-*  @since 3.1
-*/
-class MWaitDialogStatusNotifier
-    {
-    public:  // Constructors and destructor
-        
-    public: // New functions
-        /**
-        * @param aDialog
-        */
-        virtual void WaitDialogDismissedL( const TInt aStatusCode ) = 0;
-    };
-
-#endif      // MWAITDIALOGSTATUSNOTIFIER_H  
-            
-// End of File
--- a/pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/pnpprovisioning.hrh	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-/*
-* Copyright (c) 2004 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: Implementation of PnPMS components
-*
-*/
-
-
-#ifndef PNPPROVISIONING_HRH
-#define PNPPROVISIONING_HRH
-
-#endif      // PNPPROVISIONING_HRH
--- a/pnpmobileservices/pnpms/PnP/PnpProvisioningAppSrc/PnpProvisioningApp.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-/*
-* Copyright (c) 2004-2006 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: Implementation of PnPMS components
-*
-*/
-
-
-// INCLUDE FILES
-#include    <eikstart.h>
-
-#include    "PnpProvisioningApp.h"
-#include    "PnpProvisioningDocument.h"
-#include    "PnpLogger.h"
-
-
-LOCAL_C CApaApplication* NewApplication()
-    {
-    LOGSTRING( "NewApplication" );
-    return new CPnpProvisioningApp;
-    }
-
-GLDEF_C TInt E32Main()
-    {
-    LOGSTRING( "E32Main" );
-    return EikStart::RunApplication(NewApplication);
-    }
-    
-
-// ================= MEMBER FUNCTIONS =======================
-
-// ---------------------------------------------------------
-// CPnpProvisioningApp::AppDllUid()
-// Returns application UID
-// ---------------------------------------------------------
-//
-TUid CPnpProvisioningApp::AppDllUid() const
-    {
-    LOGSTRING( "AppDllUid" );
-    return KUidPnpProvisioning;
-    }
-
-// ---------------------------------------------------------
-// CPnpProvisioningApp::CreateDocumentL()
-// Creates CPnpProvisioningDocument object
-// ---------------------------------------------------------
-//
-CApaDocument* CPnpProvisioningApp::CreateDocumentL()
-    {
-    LOGSTRING( "CreateDocumentL" );
-    return CPnpProvisioningDocument::NewL( *this );
-    }
-
-// End of File  
-
--- a/pnpmobileservices/pnpms/PnP/PnpProvisioningAppSrc/PnpProvisioningAppUi.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,640 +0,0 @@
-/*
-* Copyright (c) 2004-2006 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: Implementation of PnPMS components
-*
-*/
-
-
-
-// INCLUDE FILES
-#include <avkon.hrh>
-#include <apgcli.h>
-#include <textresolver.h>
-#include <rconnmon.h>
-#include <ApUtils.h>
-#include <PnpProvisioning.rsg>
-#include <browseruisdkcrkeys.h>         // for KCRUidBrowser
-#include <AknGlobalNote.h>              // for CAknGlobalNote
-#include <AknGlobalConfirmationQuery.h> // for CAknGlobalConfirmationQuery
-
-#include "PnpProvisioningApp.h"
-#include "PnpProvisioningAppUi.h"
-#include "PnpProvisioningDocument.h"
-#include "pnpprovisioning.hrh"
-#include "PnpLogger.h"
-#include "cwaitdialogmonitor.h"
-
-
-_LIT( KQuestionMark, "?" );
-_LIT( KAmpersand, "&" );
-_LIT( KStatus, "Status=" );
-_LIT( KSpace, " " );
-
-const TUint KCallbackDelay = 1000000;
-
-
-
-// ================= MEMBER FUNCTIONS =======================
-//
-// ----------------------------------------------------------
-// CPnpProvisioningAppUi::ConstructL()
-// 
-// ----------------------------------------------------------
-//
-void CPnpProvisioningAppUi::ConstructL()
-    {
-    LOGSTRING( "CPnpProvisioningAppUi::ConstructL" );
-    BaseConstructL( ENoScreenFurniture );
-    //send to backround
-    TApaTaskList taskList( CEikonEnv::Static()->WsSession() );
-    TApaTask task = taskList.FindApp( KUidPnpProvisioning );
-    task.SendToBackground();
-    this->StatusPane()->MakeVisible( EFalse );
-    HideApplicationFromFSW();
-    
-    CEikonEnv::Static()->AddForegroundObserverL( *this );
-    
-    // if service activation enabled allow automatic settings configuration instead
-    // of showing confirmation notes
-
-    TBool activationenabled = ServiceActivationEnabledL();
-    
-    if(!activationenabled)
-    {
-    HBufC* msgConfirmSave = CEikonEnv::Static()->AllocReadResourceLC(
-            R_TEXT_QUERY); 
-            
-        CAknGlobalConfirmationQuery* query = CAknGlobalConfirmationQuery::NewL();
-        CleanupStack::PushL( query );
-        TRequestStatus statusSave;
-        query->ShowConfirmationQueryL(
-            statusSave, 
-            *msgConfirmSave, 
-            R_AVKON_SOFTKEYS_YES_NO__YES,
-            R_QGN_NOTE_QUERY_ANIM);
-            
-        User::WaitForRequest( statusSave );
-        CleanupStack::PopAndDestroy( 2 );
-        
-        if( statusSave != EAknSoftkeyYes )
-            {
-            LOGSTRING("User rejected");
-            Exit();
-            }
-    }
-    ResolveApL( iApInUse );
-    
-    ShowWaitNoteL();
-
-    iPeriodic = CPeriodic::NewL( CActive::EPriorityStandard  );
-    iPeriodic->Start( KCallbackDelay, KCallbackDelay, TCallBack(CPnpProvisioningAppUi::PeriodicCallback, this) );
-    LOGSTRING( "CPnpProvisioningAppUi::ConstructL - done" );
-    }
-
-// ----------------------------------------------------
-// CPnpProvisioningAppUi::~CPnpProvisioningAppUi()
-// Destructor
-// Frees reserved resources
-// ----------------------------------------------------
-//
-CPnpProvisioningAppUi::~CPnpProvisioningAppUi()
-    {
-    LOGSTRING( "~CPnpProvisioningAppUi" );
-
-    // iPeriodic is deleted in the document's destructor
-    if( iPeriodic )
-        {
-        iPeriodic->Cancel();
-        delete iPeriodic;
-        }
-    if (iDoorObserver)
-        {
-        LOGSTRING( "calling iDoorObserver->NotifyExit" );
-        iDoorObserver->NotifyExit(MApaEmbeddedDocObserver::ENoChanges);
-        }
-        
-    if( iGlobalWaitNote )
-        {
-        delete iGlobalWaitNote;
-        }
-        
-    if( iWaitDialogMonitor )
-        {
-        iWaitDialogMonitor->Cancel();
-        delete iWaitDialogMonitor;
-        }
-    LOGSTRING( "~CPnpProvisioningAppUi done" );
-   }
-
-// ------------------------------------------------------------------------------
-// CPnpProvisioningAppUi::DynInitMenuPaneL(TInt aResourceId,CEikMenuPane* aMenuPane)
-//  This function is called by the EIKON framework just before it displays
-//  a menu pane. Its default implementation is empty, and by overriding it,
-//  the application can set the state of menu items dynamically according
-//  to the state of application data.
-// ------------------------------------------------------------------------------
-//
-void CPnpProvisioningAppUi::DynInitMenuPaneL(
-    TInt /*aResourceId*/,CEikMenuPane* /*aMenuPane*/)
-    {
-    }
-
-// ----------------------------------------------------
-// CPnpProvisioningAppUi::HandleKeyEventL(
-//     const TKeyEvent& aKeyEvent,TEventCode /*aType*/)
-// takes care of key event handling
-// ----------------------------------------------------
-//
-TKeyResponse CPnpProvisioningAppUi::HandleKeyEventL(
-    const TKeyEvent& /*aKeyEvent*/,TEventCode /*aType*/)
-    {
-    return EKeyWasNotConsumed;
-    }
-
-// ----------------------------------------------------
-// CPnpProvisioningAppUi::HandleCommandL(TInt aCommand)
-// takes care of command handling
-// ----------------------------------------------------
-//
-void CPnpProvisioningAppUi::HandleCommandL(TInt aCommand)
-    {
-    switch ( aCommand )
-        {
-        case EAknSoftkeyBack:
-        case EEikCmdExit:
-            {
-            Exit();
-            break;
-            }
-
-        default:
-            break;      
-        }
-    }
-    
-// -----------------------------------------------------------------------------
-// CPnpProvisioningAppUi::HandleGainingForeground
-//
-// -----------------------------------------------------------------------------
-//
-void CPnpProvisioningAppUi::HandleGainingForeground()
-    {
-    LOGSTRING( "CPnpProvisioningAppUi::HandleGainingForeground" );
-    TApaTaskList taskList( CEikonEnv::Static()->WsSession() );
-    TApaTask task = taskList.FindApp( KUidPnpProvisioning );
-    if( task.Exists() )
-        {
-        task.SendToBackground();
-        }
-    }
-    
-// -----------------------------------------------------------------------------
-// CPnpProvisioningAppUi::HandleLosingForeground
-//
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CPnpProvisioningAppUi::HandleLosingForeground()
-    {
-    LOGSTRING( "CPnpProvisioningAppUi::HandleLosingForeground" );
-    }
-
-// ----------------------------------------------------
-// CPnpProvisioningAppUi::RedirectL
-// ----------------------------------------------------
-//
-void CPnpProvisioningAppUi::RedirectL( const TDesC& aUrl, THttpProvStates::TProvisioningStatus  aStatus )
-    {
-    // do the redirect thing
-    LOGSTRING( "RedirectL" );
-
-    // Parameters are separated by space
-    // 1st parameter: type of the further parameters
-    // 2nd parameter: URL or  the uid of bookmark/saved deck/pushed deck.
-    // 3rd parameter: Access point Uid (in decimal format).
-    // the 3rd parameter is optional, and only for specifying AP for URL-s
-
-    HBufC* param = HBufC::NewLC( 300 );
-    TPtr paramPtr = param->Des();
-    paramPtr.Copy( _L( "4 " ) );
-    
-    
-    paramPtr.Append( aUrl );
-
-    // Assume there might already be parameters in the URL given
-    if( aUrl.Find( KQuestionMark ) != KErrNotFound )
-        {
-        paramPtr.Append( KAmpersand );
-        }
-    else
-        {
-        paramPtr.Append( KQuestionMark );
-        }
-
-    paramPtr.Append( KStatus );
-    paramPtr.AppendNum( (TInt) aStatus );
-
-    // Only give a valid AP
-    if( iApInUse != 0 )
-        {
-        paramPtr.Append( KSpace );
-        paramPtr.AppendNumUC( iApInUse );
-        }
-
-#ifdef _DEBUG
-    LOGSTRING( "redirecting params:" );
-    for( TInt i(0); i < paramPtr.Length(); i += 128 )
-        {
-        LOGTEXT( paramPtr .Right( paramPtr .Length() - i ) );
-        }
-#endif
-
-    TApaTaskList taskList( CEikonEnv::Static()->WsSession() );
-    TApaTask task = taskList.FindApp( KCRUidBrowser );
-    if ( task.Exists() )
-        {
-        LOGSTRING( "redirecting browser" );
-        HBufC8* param8 = HBufC8::NewLC( param->Length() );
-        param8->Des().Append( *param );
-        task.SendMessage( TUid::Uid( 0 ), *param8 ); // Uid is not used
-        //task.BringToForeground();     
-        CleanupStack::PopAndDestroy( param8 );
-        }
-    else 
-        {
-        LOGSTRING( "Could not find browser" );
-        RApaLsSession   appArcSession;
-        User::LeaveIfError(appArcSession.Connect());    // connect to AppArc server
-        TThreadId id;
-        appArcSession.StartDocument( *param, KCRUidBrowser, id );
-        appArcSession.Close();
-        }
-    CleanupStack::PopAndDestroy( param ); // param
-    LOGSTRING( "calling Exit()" ); 
-    Exit();
-    }
-
-// ----------------------------------------------------
-// CPnpProvisioningAppUi::ResolveApL
-// ----------------------------------------------------
-//
-void CPnpProvisioningAppUi::ResolveApL( TUint32& aAp )
-    {
-    LOGSTRING("Trying to get AP used");
-
-
-    // PnPProvisioning app might be started by browsing to a service using
-    // PAOS filter 
-    // -> OnlineSupport app that normally sets the AP to DB might not have been
-    // used. It is also possible that the AP that OnlineSupport app used has
-    // been removed.
-
-    // So we try to use the AP currently in use first; if none is in use read the AP
-    // from shared data / cenrep.
-
-    RConnectionMonitor connMon;
-    connMon.ConnectL();
-    CleanupClosePushL( connMon );
-    TUint connectionCount(0);
-    TRequestStatus status( KRequestPending );
-    connMon.GetConnectionCount( connectionCount, status );
-    // No user interaction possible at this point so no need to make the call asynchronously
-    User::WaitForRequest( status );
-    LOGSTRING("Trying to get AP used - 2");
-
-    for( TUint i(1); i <= connectionCount; i++ )
-        {
-        LOGSTRING("Trying to get AP used - 3");
-        TUint connectionId(0);
-        TUint subConnectionCount(0);
-        TInt err = connMon.GetConnectionInfo( i, connectionId, subConnectionCount );
-        if( err != KErrNone )
-            {
-            LOGSTRING2( "err %i", err );
-            }
-
-        LOGSTRING("Trying to get AP used - 4");
-        TUint ap(0);
-        TRequestStatus status2( KRequestPending );
-        connMon.GetUintAttribute( connectionId, 0, KIAPId, ap, status2 );
-        User::WaitForRequest( status2 );
-        if( status2.Int() != KErrNone )
-            {
-            LOGSTRING2( "err %i", status2.Int() );
-            }
-        LOGSTRING("Trying to get AP used - 5");
-        if( ap != 0 )
-            {
-            LOGSTRING2("Trying to get AP used - found: %i", ap );
-
-            CCommsDatabase* commDb = CCommsDatabase::NewL( EDatabaseTypeIAP );
-            CleanupStack::PushL( commDb );
-            CApUtils* utils = CApUtils::NewLC( *commDb );
-            //aAp = utils->WapIdFromIapIdL( ap );
-            LOGSTRING2( "wap id: %i", aAp );
-            
-            // In some cases the connection has to be reset after saving
-            // provisioned settings
-            TInt err = connMon.SetBoolAttribute( 0, 0, KConnectionStopAll, ETrue );
-            LOGSTRING2( "Connection stop error: %i", err );
-            CleanupStack::PopAndDestroy( utils );
-            CleanupStack::PopAndDestroy( commDb );
-            CleanupStack::PopAndDestroy(); // connMon.Close()
-            LOGSTRING("Trying to get AP used - done");
-            return;
-            }
-        }
-    CleanupStack::PopAndDestroy(); // connMon.Close()
-    }
-    
-// ----------------------------------------------------
-// CPnpProvisioningAppUi::DoExit()
-// exits app.
-// ----------------------------------------------------
-//
-void CPnpProvisioningAppUi::DoExit()
-    {
-    LOGSTRING( "DoExit" );
-    Exit();
-    }
-
-// ----------------------------------------------------
-// CPnpProvisioningAppUi::PeriodicCallback
-// ----------------------------------------------------
-//
-TInt CPnpProvisioningAppUi::PeriodicCallback( TAny* aPtr )
-    {
-    TRAPD( err, ( (CPnpProvisioningAppUi*)aPtr )->DoPeriodicCallbackL( aPtr ) );
-    if( err != KErrNone )
-        {
-        LOGSTRING2( "Error in DoPeriodicCallBackL: %i", err );
-        if( err == KLeaveExit )
-            User::Leave( KLeaveExit );
-        }
-    return KErrNone;
-    }
-
-// ----------------------------------------------------
-// CPnpProvisioningAppUi::DoPeriodicCallbackL
-// ----------------------------------------------------
-//
-void CPnpProvisioningAppUi::DoPeriodicCallbackL( TAny* aPtr )
-    {
-    LOGSTRING( "CPnpProvisioningAppUi::PeriodicCallback" );
-
-    CPnpProvisioningAppUi* ui = (CPnpProvisioningAppUi*)aPtr;
-    CPnpProvisioningDocument* document = (CPnpProvisioningDocument*)ui->Document();
-    TInt leavestatus = KErrNone;
-    TInt noRedirect = 0;
-    THttpProvStates::TProvisioningStatus status = THttpProvStates::EStatusOk;
-
-    LOGSTRING( "CPnpProvisioningAppUi::PeriodicCallback - Is doc ready?" );
-
-    if( !(document->Ready()) )
-        {
-        LOGSTRING( "Document not ready yet" );
-        User::Leave( KErrNotReady );
-        }
-
-    ui->iPeriodic->Cancel();
-    // document->SetPeriodic( ui->iPeriodic );
-    TRAP( leavestatus, status = document->SaveSettingsL() );
-    if( leavestatus != KErrNone )
-        {
-        LOGSTRING2( "SaveSettingsL leave code: %i", leavestatus );
-        
-        if( leavestatus == THttpProvStates::EStatusRejected )
-            {
-            // user has cancelled
-            ui->DoExit();
-            }
-        else
-            {
-            ui->ShowErrorNoteL();
-            }
-        }
-
-    LOGSTRING( "CPnpProvisioningAppUi::PeriodicCallback - get report url" );
-
-    // try to get the redirect url
-    TBuf<512> url;
-    TRAPD( err, url.Copy( document->GetReportUrlL().Left(512) ) );
-    if( err != KErrNone )
-        {
-        LOGSTRING2( "no report url:%i", err );
-        
-        TerminateBrowserL(err, noRedirect);
-        
-        ui->DoExit();
-        }
-    else
-        {
-        if( status != THttpProvStates::EStatusOk )
-            {
-            LOGSTRING( "CPnpProvisioningAppUi::PeriodicCallback - do redirect" );
-            
-            TerminateBrowserL(KErrGeneral, noRedirect);
-            if(noRedirect == 1)
-            ui->DoExit();
-            ui->RedirectL( url, status );
-            }
-        else if( leavestatus != KErrNone )
-            {
-            LOGSTRING( "CPnpProvisioningAppUi::PeriodicCallback - do redirect with leave status" );
-            
-            TerminateBrowserL(leavestatus, noRedirect);
-            if(noRedirect == 1)
-            ui->DoExit();
-            
-            ui->RedirectL( url, THttpProvStates::TProvisioningStatus( leavestatus ) );
-            }
-        else
-            {
-            LOGSTRING2( "Provisioning status: %i", status );
-
-            // Since Plat sec there is no need to restart Browser after provisioning
-            // has been done.
-            // In some cases the connection has to be reset, though
-            // (it is done in ResolveApL)
-            LOGSTRING( "Making redirect" );
-            
-           //Before Making redirect check if application launched PNPMS.
-           //If application has not launched PNPMS client then do redirect
-           // otherwise call for Service Activation and launch choosen application
-           // closing browser
-           
-        
-          		TerminateBrowserL(KErrNone,noRedirect);
-          		
-	    		if(noRedirect == 1)
-            		  ui->DoExit();
-	    		
-            
-            ui->RedirectL( url, THttpProvStates::EStatusOk );
-            }
-        }
-
-    LOGSTRING( "CPnpProvisioningAppUi::PeriodicCallback - done" );
-    }
-    
-//// ----------------------------------------------------
-// CPnpProvisioningAppUi::ServiceActivationEnabled()
-// ----------------------------------------------------
-//
-TBool CPnpProvisioningAppUi::ServiceActivationEnabledL()
-{
-	CPnpProvUtil *provUtil = CPnpProvUtil::NewLC();
-	TUint32 uidval = 0;
-	TRAPD(err, uidval = provUtil->GetApplicationUidL());
-		              
-	CleanupStack::PopAndDestroy();    //provutil     
-
-	if(uidval && !err)
-        {
-	 	return ETrue;
-	}
-	
-	return EFalse;
-	
-}
-
-
-// ----------------------------------------------------
-// CPnpProvisioningAppUi::TerminateBrowserIfErrorL()
-// ----------------------------------------------------
-//
-
-void CPnpProvisioningAppUi::TerminateBrowserL(TInt aError, TInt& aNoRedirect)
-{
-	    // Terminate browser and launch choosen application based on status of
-      // aNoRedirect status
-      // If error status is KErrNone  the application is launched closing browser
-      // If there are errors then terminate browser without launching application
-	
-	    	CPnpProvUtil *provUtil = CPnpProvUtil::NewLC();
-        CPnpServiceActivation *serviceActivate = CPnpServiceActivation::NewLC();
-    		TUint32 uidval = 0;
-		
-				TRAPD(err, uidval = provUtil->GetApplicationUidL());
-                      
-        if(uidval && !err)
-        {
-            if(aError == KErrNone)
-            	TRAP_IGNORE(serviceActivate->LaunchApplicationL());
-          	
-          	TRAP_IGNORE(serviceActivate->KillBrowserL());
-						TRAP_IGNORE(provUtil -> SetApplicationUidL(0));
-			
-	   				// Interger value is required in case of handling multiple cases in redirection
-	   				// With current implementation only 2 values are supported 0 and 1
-	   				aNoRedirect = 1;	
-			
-			 	
-        }
-        
-        CleanupStack::PopAndDestroy(2);
-        
-        
-}
-
-
-// ----------------------------------------------------
-// CPnpProvisioningAppUi::ShowErrorNoteL()
-// ----------------------------------------------------
-//
-void CPnpProvisioningAppUi::ShowErrorNoteL()
-    {
-    HBufC* msgTextSaved = CEikonEnv::Static()->
-            AllocReadResourceLC( R_TEXT_CANNOT_SAVE ); 
-
-    CAknGlobalNote* globalNote = CAknGlobalNote::NewL();
-    CleanupStack::PushL( globalNote );
-    globalNote->ShowNoteL( EAknGlobalErrorNote , *msgTextSaved );
-    CleanupStack::PopAndDestroy( 2 );
-    }
-    
-// ----------------------------------------------------
-// CPnpProvisioningAppUi::ShowWaitNoteL()
-// ----------------------------------------------------
-//
-void CPnpProvisioningAppUi::ShowWaitNoteL()
-    {
-    HBufC* msgText = CEikonEnv::Static()->
-        AllocReadResourceLC( R_TEXT_WAIT_SAVING ); 
-
-    if (iWaitDialogMonitor)
-        {
-        iWaitDialogMonitor->Cancel();
-        delete iWaitDialogMonitor;
-        iWaitDialogMonitor = NULL;
-        }
-    // instantiate the active object CGlobalConfirmationObserver
-    iWaitDialogMonitor = CWaitDialogMonitor::NewL( *this );
-    
-    // SetActive
-    iWaitDialogMonitor->Start();
-    
-    if (!iGlobalWaitNote)
-        {
-        iGlobalWaitNote = CAknGlobalNote::NewL();
-        }
-
-     iGlobalWaitNote->SetSoftkeys( R_AVKON_SOFTKEYS_EMPTY);
-    iGlobalWaitNote->ShowNoteL(
-        iWaitDialogMonitor->iStatus,
-        EAknGlobalWaitNote,
-        *msgText );
-    
-    CleanupStack::PopAndDestroy( msgText );
-    }
-    
-// ----------------------------------------------------
-// CPnpProvisioningAppUi::WaitDialogDismissedL()
-// ----------------------------------------------------
-//
-void CPnpProvisioningAppUi::WaitDialogDismissedL( const TInt aStatusCode )
-    {
-    LOGSTRING2( "CPnpProvisioningAppUi::WaitDialogDismissedL aStatus is %i",aStatusCode );
-    LOGSTRING2( "iWaitDialogMonitor->iStatus is %i" , iWaitDialogMonitor->iStatus.Int() );
-    if( aStatusCode == EAknSoftkeyCancel || aStatusCode == EAknSoftkeyExit ||
-    			aStatusCode == KErrCancel ) //End key results in KErrCancel
-        {
-        // user cancelled
-        LOGSTRING( "CPnpProvisioningAppUi::WaitDialogDismissedL - user cancelled" );
-        Exit();
-        }
-//Handling End Key
-    if(aStatusCode == EAknSoftkeyEmpty && iWaitDialogMonitor->iStatus == KErrCancel )
-    	{
-    	LOGSTRING( "End key or User cancel done, but DOc tries to close instead of RunL of iWaitDialogMonitor " );
-    	//Exit();
-    	iWaitDialogMonitor->Cancel();
-    	User::Leave( THttpProvStates::EStatusRejected );
-    	}
-        
-    if( iGlobalWaitNote )
-        {
-        delete iGlobalWaitNote;
-        iGlobalWaitNote = NULL;
-        }
-        
-    if( iWaitDialogMonitor )
-        {
-        iWaitDialogMonitor->Cancel();
-        delete iWaitDialogMonitor;
-        iWaitDialogMonitor = NULL;
-        }
-    }
-
-// End of File  
--- a/pnpmobileservices/pnpms/PnP/PnpProvisioningAppSrc/PnpProvisioningDocument.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,382 +0,0 @@
-/*
-* Copyright (c) 2004-2006 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: Implementation of PnPMS components
-*
-*/
-
-
-// INCLUDE FILES
-#include <AknGlobalNote.h>              // for CAknGlobalNote
-#include <AknGlobalConfirmationQuery.h> // for CAknGlobalConfirmationQuery
-#include <textresolver.h>
-#include <AknQueryDialog.h>
-#include <aknnotewrappers.h>
-#include <StringLoader.h>
-#include <PnpProvisioning.rsg>
-#include <apgcli.h>
-#include <e32uid.h>
-#include <CWPEngine.h>      // Using WAP provisioning engine
-#include <e32math.h>
-
-#include "PnpProvisioningDocument.h"
-#include "PnpProvisioningAppUi.h"
-#include "NHeadWrapperParser.h"
-#include "PnpLogger.h"
-#include "PnpProvisioningSaver.h"
-
-
-
-
-
-// ================= MEMBER FUNCTIONS =======================
-
-// constructor
-CPnpProvisioningDocument::CPnpProvisioningDocument(CEikApplication& aApp)
-: CAknDocument(aApp)    
-    {
-    LOGSTRING( "CPnpProvisioningDocument()" );
-    }
-
-// destructor
-CPnpProvisioningDocument::~CPnpProvisioningDocument()
-    {
-    LOGSTRING( "~CPnpProvisioningDocument()" );
-    delete iProvisioningData;
-    delete iNHwrParser;
-    //delete iPeriodic;
-    LOGSTRING( "~CPnpProvisioningDocument() done" );
-    }
-
-// EPOC default constructor can leave.
-void CPnpProvisioningDocument::ConstructL()
-    {
-    LOGSTRING( "CPnpProvisioningDocument::ConstructL" );
-    }
-
-// Two-phased constructor.
-CPnpProvisioningDocument* CPnpProvisioningDocument::NewL(
-        CEikApplication& aApp)     // CPnpProvisioningApp reference
-    {
-    LOGSTRING( "CPnpProvisioningDocument::NewL" );
-    CPnpProvisioningDocument* self = new (ELeave) CPnpProvisioningDocument( aApp );
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop();
-
-    return self;
-    }
-    
-// ----------------------------------------------------
-// CPnpProvisioningDocument::CreateAppUiL()
-// constructs CPnpProvisioningAppUi
-// ----------------------------------------------------
-//
-CEikAppUi* CPnpProvisioningDocument::CreateAppUiL()
-    {
-    LOGSTRING( "CreateAppUiL" );
-    iAppUi = new (ELeave) CPnpProvisioningAppUi;
-    return iAppUi;
-    }
-
-
-void CPnpProvisioningDocument::OpenFileL( CFileStore*& /*aFileStore*/, RFile& aFile )
-    {
-    LOGSTRING( "CPnpProvisioningDocument::OpenFileL (CFileStore*& /*aFileStore*/, RFile& aFile)" );
-    TFileName fileName;
-    aFile.Name( fileName );
-    LOGTEXT( fileName );
-
-    TRAPD( err, DoHandleFileL( aFile ) );
-    if( err != KErrNone )
-        {
-        LOGSTRING2( "error in DoHandleFileL: %i", err );
-        User::Leave( err );
-        }
-    iReady = ETrue;
-    }
-
-
-// ----------------------------------------------------
-// CPnpProvisioningDocument::OpenFileL
-// Overrides CAknDocument::OpenFileL to support document file
-// ----------------------------------------------------
-//
-CFileStore* CPnpProvisioningDocument::OpenFileL(TBool aDoOpen,const TDesC& aFilename,RFs& aFs)
-    {
-    LOGSTRING( "CPnpProvisioningDocument::OpenFileL (TBool aDoOpen,const TDesC& aFilename,RFs& aFs)" );
-
-    CFileStore* store = NULL;
-    store = CAknDocument::OpenFileL( aDoOpen, aFilename, aFs );
-    LOGSTRING2( "store:%i", store );
-    LOGSTRING2( "aDoOpen:%i", aDoOpen );
-    
-    iReady = ETrue;
-
-    return store;
-    }
-
-// ----------------------------------------------------
-// CPnpProvisioningDocument::RestoreL()
-// restore data from persistent store
-// ----------------------------------------------------
-//      
-void CPnpProvisioningDocument::RestoreL(const CStreamStore& /*aStore*/, const CStreamDictionary& /*aStreamDic*/)
-    {
-    }
-
-// ----------------------------------------------------
-// CPnpProvisioningDocument::StoreL()
-// store data to persistent store
-// ----------------------------------------------------
-//          
-void CPnpProvisioningDocument::StoreL(CStreamStore& /*aStore*/, CStreamDictionary& /*aStreamDic*/) const
-    {
-    }
-
-// ----------------------------------------------------
-// CPnpProvisioningDocument::HandleFileL
-// ----------------------------------------------------
-void CPnpProvisioningDocument::HandleFileL(TBool aDoOpen,const TDesC& aFilename,RFs& aFs)
-    {
-    LOGSTRING( "CPnpProvisioningDocument::HandleFileL" );
-    LOGSTRING( "aFilename:" );
-    LOGTEXT( aFilename );
-
-    if(aDoOpen)
-        {
-        LOGSTRING( "aDoOpen" );
-
-        RFile file;
-        if(file.Open(aFs, aFilename,EFileRead)==KErrNone)
-            {
-            LOGSTRING( "File opened" );
-            CleanupClosePushL( file );
-            DoHandleFileL( file );
-            CleanupStack::PopAndDestroy(); // file.Close();
-            }
-        }
-    else
-        {
-        LOGSTRING( "aDoOpen was false" );
-        User::Leave( KErrGeneral );
-        }
-    LOGSTRING( "Exiting HandleFileL" );
-    }
-
-// ----------------------------------------------------
-// CPnpProvisioningDocument::DoHandleFileL
-// ----------------------------------------------------
-void CPnpProvisioningDocument::DoHandleFileL( RFile& aFile )
-    {
-    LOGSTRING( "CPnpProvisioningDocument::DoHandleFileL" );
-    TInt filesize = 0;
-    aFile.Size( filesize );
-    delete iProvisioningData;
-    iProvisioningData = 0;
-    iProvisioningData = HBufC8::NewL( filesize );
-    TPtr8 ptr = iProvisioningData->Des();
-    User::LeaveIfError( aFile.Read( ptr, filesize ) );
-    LOGSTRING( "Exiting DoHandleFileL" );
-    }
-
-// ----------------------------------------------------
-// CPnpProvisioningDocument::SaveSettingsL
-// ----------------------------------------------------
-
-THttpProvStates::TProvisioningStatus CPnpProvisioningDocument::SaveSettingsL()
-    {
-    LOGSTRING( "CPnpProvisioningDocument::SaveSettingsL" ); 
-    
-    THttpProvStates::TProvisioningStatus status = THttpProvStates::EStatusOk;
-
-    if( !iProvisioningData )
-        {
-        User::Leave( THttpProvStates::EStatusWrapperParsingFailed );
-        }
-
-    iNHwrParser = CNHeadWrapperParser::NewL( *iProvisioningData );
-    TInt err = iNHwrParser->Parse();
-    if( err != THttpProvStates::EStatusOk )
-        {
-        LOGSTRING2( "err from parse:%i", err ); 
-        User::Leave( err );
-        }
-
-    TPtrC8 content = iNHwrParser->GetContentL();
-
-    // Create WPEngine
-    CWPEngine* wpengine = CWPEngine::NewL();
-    CleanupStack::PushL( wpengine );
-
-    LOGSTRING( "wpengine->ImportDocumentL" );
-    TRAPD( result, wpengine->ImportDocumentL( content ) );
-    User::LeaveIfError( result );
-    LOGSTRING( "wpengine->ImportDocumentL ok" );
-
-    LOGSTRING( "wpengine->PopulateL" );
-    wpengine->PopulateL();
-    LOGSTRING( "wpengine->PopulateL success" );
-
-    // Empty messages are not supported
-    if( wpengine->ItemCount() == 0 )
-        {
-        LOGSTRING("No items in provisioning message!");
-        User::Leave( THttpProvStates::EStatusWrapperParsingFailed );
-        }
-        
-
-    TInt numSaved( 0 );
-    CPnpProvisioningSaver* saver = new(ELeave) CPnpProvisioningSaver( *wpengine, EFalse, EFalse );
-    TInt retValue( KErrNone );
-    LOGSTRING("saver created");
-    // dismiss waitdialog, saver will show own waitdialog
-    //iAppUi->WaitDialogDismissedL(EAknSoftkeyEmpty);
-  
-    TRAPD( saverErr, retValue = saver->ExecuteLD( numSaved ) );
-    
-    if( retValue == KErrCancel )
-        {
-        User::Leave( THttpProvStates::EStatusRejected ); // User cancelled
-        }
-    else if( saverErr != KErrNone || retValue != KErrNone )
-        {
-        User::Leave( THttpProvStates::EStatusStorageFailed );
-        }    
-
-    // check if service activation is enabled if yes then display notes specific to application
-    // settings
-	TBool activate(EFalse);
-     
-    // If activation enable follow different UI Flow
-    // UI Flow requires changes if any other application requires
-    // service UI flow to be changed as of now applicable only for
-    // Email service activation
-    activate =  iAppUi -> ServiceActivationEnabledL();
-
-
-    LOGSTRING( "saver executed" );
-    if( numSaved >= 0 )
-        {
-        LOGSTRING( "numSaved >= 0" );
-        // Check if any setting should be made default
-        TBool setAsDefault( EFalse );
-        TInt itemCount( wpengine->ItemCount() );
-        for( TInt i( 0 ); i < itemCount && !setAsDefault; i++ )
-            {
-            // 1. Set as default if there was no "Provisioning Activation" header
-            // in the head wrapper or if the header asks to make the settings default
-            // 2. Also check if the settings _can_ be set as default at all
-            if( wpengine->CanSetAsDefault( i ) )
-                {
-                LOGSTRING( "set as default" );
-                setAsDefault = ETrue;
-                }
-            }
-
-        // The default value is "ask from user" (if there is no Provisioning-Activation
-        // header in the head wrapper, it should be asked from the user)
-        TProvisioningActivation activation = iNHwrParser->GetProvisioningActivation();
-
-        if( activation == EProvisioningActivationOff )
-            {
-            setAsDefault = EFalse;
-            }
-        else if( activation == EProvisioningActivationUser )
-            {
-            LOGSTRING( "Ask confirmation for saving as default" );
-	     		
-	     		if(!activate)
- 	     		{
-            // Ask confirmation from the user before saving as default settings
-            HBufC* msgDefault = CEikonEnv::Static()->AllocReadResourceLC(
-                R_TEXT_SET_DEFAULT ); 
-                
-            CAknGlobalConfirmationQuery* query2 = CAknGlobalConfirmationQuery::NewL();
-            CleanupStack::PushL( query2 );
-            TRequestStatus status2;
-            query2->ShowConfirmationQueryL(
-                status2, 
-                *msgDefault, 
-                R_AVKON_SOFTKEYS_YES_NO__YES,
-                R_QGN_NOTE_QUERY_ANIM);
-                
-            User::WaitForRequest( status2 );
-            CleanupStack::PopAndDestroy( 2 );
-            
-            if( status2 != EAknSoftkeyYes )
-                {
-                setAsDefault = EFalse; // User rejected
-                }
-	      	}
-	      	else // service activation enabled
-	      	{
-			   	setAsDefault = ETrue;	
-	      	}
-            }
-
-        if( setAsDefault )
-            {
-            LOGSTRING( "create setter" );
-            CPnpProvisioningSaver* setter = NULL;
-            TInt numSet( 0 );
-            if(!activate)
-            {
-            setter = new(ELeave) CPnpProvisioningSaver( *wpengine, ETrue, ETrue );          
-            iAppUi->WaitDialogDismissedL(EAknSoftkeyEmpty);
-            }
-            else
-            {
-            setter = new(ELeave) CPnpProvisioningSaver( *wpengine, ETrue, EFalse );          
-            }
-            LOGSTRING( "setter->ExecuteLD" );
-            setter->ExecuteLD( numSet );
-            }
-
-		// Display note to user that settings are saved successfully
-		// This note is generic not incase service activation is disabled
-		if(!activate)
-		{
-        // All settings saved
-        HBufC* msgTextSaved = CEikonEnv::Static()->
-            AllocReadResourceLC( R_TEXT_SAVED ); 
-
-        CAknGlobalNote* globalNote = CAknGlobalNote::NewL();
-        CleanupStack::PushL( globalNote );
-        globalNote->ShowNoteL( EAknGlobalInformationNote , *msgTextSaved );
-        CleanupStack::PopAndDestroy( 2 );
-        }
-         
-    }
-    else
-        {
-        User::Leave( THttpProvStates::EStatusStorageFailed );
-        }
-
-    LOGSTRING( "exiting SaveSettingsL" );
-    CleanupStack::PopAndDestroy(wpengine);
-    LOGSTRING( "PopAndDestroy(wpengine) done" );
-
-    return status;
-    }
-
-const TDesC8& CPnpProvisioningDocument::GetReportUrlL()
-    {
-    if( !iNHwrParser )
-        {
-        User::Leave( KErrNotFound );
-        }
-    return( iNHwrParser->GetReportUrlL() );
-    }
-
-// End of File  
--- a/pnpmobileservices/pnpms/PnP/PnpProvisioningAppSrc/PnpProvisioningSaver.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,407 +0,0 @@
-/*
-* Copyright (c) 2002-2006 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:  Helper class for saving Provisioning settings. 
-*                Provides a progress note.
-*
-*/
-
-
-
-// INCLUDE FILES
-#include <AknQueryDialog.h>
-#include <eikprogi.h>
-#include <PnpProvisioning.rsg>
-#include <commdb.h>
-#include <CWPEngine.h>
-#include <CWPAdapter.h>
-#include <ActiveFavouritesDbNotifier.h>
-
-#include "PnpProvisioningSaver.h"
-#include "PnpLogger.h"
-#include "cwaitdialogmonitor.h"
-
-// CONSTANTS
-const TInt KMaxWaitTime = 1000000;
-
-// CLASS DECLARATION
-
-// ================= MEMBER FUNCTIONS =======================
-
-// C++ default constructor.
-CPnpProvisioningSaver::CPnpProvisioningSaver( CWPEngine& aEngine, TBool aSetAsDefault, TBool aWaitNote )
-: CActive( EPriorityStandard ), iEngine( aEngine ), 
-  iSetAsDefault( aSetAsDefault ),
-  iCurrentItem( 0 ), iResult( KErrNone ),iEndKeyPressed(EFalse), iShowWaitNote(aWaitNote)
-    {
-    CActiveScheduler::Add( this );
-    }
-
-// ---------------------------------------------------------
-// CPnpProvisioningSaver::ExecuteLD
-// ---------------------------------------------------------
-//
-void CPnpProvisioningSaver::PrepareLC()
-    {
-    // Assume ownership of this.
-    CleanupStack::PushL( this );
-
-    iApDbNotifier = CActiveApDb::NewL( EDatabaseTypeIAP );
-    iApDbNotifier->AddObserverL( this );
-
-    iRetryTimer = CPeriodic::NewL( EPriorityStandard );
-
-    LOGSTRING("Constructing dialog");
-    
-    // Set up the dialog and callback mechanism.
-    if(iSetAsDefault && iShowWaitNote)
-    ShowWaitNoteL();
-    }
-
-// ---------------------------------------------------------
-// CPnpProvisioningSaver::ExecuteLD
-// ---------------------------------------------------------
-//
-TInt CPnpProvisioningSaver::ExecuteLD( TInt& aNumSaved )
-    {
-    LOGSTRING( "ExecuteLD" );
-    PrepareLC();
-
-    // make sure RunL() gets called.
-    CompleteRequest();
-    iWait.Start();
-
-    LOGSTRING("iWait.Start done");
-    // Progress note has been finished/cancelled. Cache the result
-    // and delete this.
-    TInt result( iResult );
-    aNumSaved = iCurrentItem;
-    CleanupStack::PopAndDestroy( this ); // this
-    LOGSTRING( "PopAndDestroy( this ), done" );
-
-    return result;
-    }
-
-// Destructor
-// ---------------------------------------------------------
-// CPnpProvisioningSaver::~CPnpProvisioningSaver
-// ---------------------------------------------------------
-//
-CPnpProvisioningSaver::~CPnpProvisioningSaver()
-    {
-    LOGSTRING( "~CPnpProvisioningSaver" );
-
-    if( IsActive() )
-        {
-        Cancel();
-        }
-
-    if( iApDbNotifier )
-        {
-        iApDbNotifier->RemoveObserver( this );
-        delete iApDbNotifier;
-        }
-
-    if( iRetryTimer )
-        {
-        if( iRetryTimer->IsActive() )
-            {
-            iRetryTimer->Cancel();
-            }
-        delete iRetryTimer;
-        }
-        
-    
-    if( iGlobalWaitNote )
-        {
-        delete iGlobalWaitNote;
-        }
-        
-    if( iWaitDialogMonitor )
-        {
-        iWaitDialogMonitor->Cancel();
-        delete iWaitDialogMonitor;
-        }
-        
-    LOGSTRING( "~CPnpProvisioningSaver - done" );
-    }
-
-// ---------------------------------------------------------
-// CPnpProvisioningSaver::DoCancel
-// ---------------------------------------------------------
-//
-void CPnpProvisioningSaver::DoCancel()
-    {
-    }
-
-// ---------------------------------------------------------
-// CPnpProvisioningSaver::RunL
-// ---------------------------------------------------------
-//
-void CPnpProvisioningSaver::RunL()
-    {
-    // Choose whether to save or set as default
-    TInt err( KErrNone );
-    if( iSetAsDefault )
-        {
-        TRAP( err, 
-            if( iEngine.CanSetAsDefault( iCurrentItem ) )
-                {
-                iEngine.SetAsDefaultL( iCurrentItem );
-                } );
-        }
-    else
-        {
-
-        LOGSTRING2("Saving item: %i", iCurrentItem );
-        TRAP( err, iEngine.SaveL( iCurrentItem ) );
-        
-        }
-
-    // If CommsDB or BookmarkDB are locked, schedule a retry
-    if( err == EWPCommsDBLocked )
-        {
-        LOGSTRING( "CPnpProvisioningSaver: EWPCommsDBLocked" );
-        iWaitCommsDb = ETrue;
-        DelayedCompleteRequest();
-        return;
-        }
-    else if( err == EWPBookmarksLocked )
-        {
-        LOGSTRING( "CPnpProvisioningSaver: EWPBookmarksLocked" );
-        iWaitFavourites = ETrue;
-        DelayedCompleteRequest();
-        return;
-        }
-    else if( err == KErrLocked )
-        {
-        LOGSTRING( "CPnpProvisioningSaver: KErrLocked" );
-        // Assume that commsdb caused the error
-        iWaitCommsDb = ETrue;
-        DelayedCompleteRequest();
-        return;
-        }
-    // For all other errors, pass them through.
-    User::LeaveIfError( err );
-
-    // Normal progress
-    if( iCurrentItem == iEngine.ItemCount()-1 )
-        {
-        LOGSTRING("All saved");
-        //LOGSTRING2( "Saver RunL iWaitDialogMonitor->iStatus %i", iWaitDialogMonitor->iStatus.Int() );        
-        ProcessFinishedL();
-        }
-    else
-        {
-        //LOGSTRING2( "Saver RunL 2nd iWaitDialogMonitor->iStatus %i", iWaitDialogMonitor->iStatus.Int() );
-        iCurrentItem++;
-        CompleteRequest();
-        }
-    }
-
-// ---------------------------------------------------------
-// CPnpProvisioningSaver::ProcessFinishedL
-// ---------------------------------------------------------
-//
-void CPnpProvisioningSaver::ProcessFinishedL()
-    {
-    //LOGSTRING2( "Saver iWaitDialogMonitor->iStatus %i", iWaitDialogMonitor->iStatus.Int() );
-    iWait.AsyncStop();
-    if(iWaitDialogMonitor)
-    {
-    //End key or cancel pressed after saving settings
-    if(iWaitDialogMonitor->iStatus == KErrCancel)
-    	{
-    	iEndKeyPressed = ETrue;
-    	}
-    if( iGlobalWaitNote )
-        {
-        delete iGlobalWaitNote;
-        iGlobalWaitNote = NULL;
-        }
-     }
-    }
-
-// ---------------------------------------------------------
-// CPnpProvisioningSaver::RunError
-// ---------------------------------------------------------
-//
-TInt CPnpProvisioningSaver::RunError( TInt aError )
-    {
-    LOGSTRING2( "RunError: %i", aError );
-    // There was a leave in RunL(). Store the error and
-    // stop the dialog.
-    iResult = aError;
-    TInt err(KErrNone);
-    TRAP( err, ProcessFinishedL() );
-
-    return KErrNone;
-    }
-    
-// ---------------------------------------------------------
-// CPnpProvisioningSaver::ShowWaitNoteL
-// ---------------------------------------------------------
-//
-void CPnpProvisioningSaver::ShowWaitNoteL()
-    {
-    HBufC* msgText = CEikonEnv::Static()->
-        AllocReadResourceLC( R_TEXT_WAIT_SAVING ); 
-
-    if (iWaitDialogMonitor)
-        {
-        iWaitDialogMonitor->Cancel();
-        delete iWaitDialogMonitor;
-        iWaitDialogMonitor = NULL;
-        }
-    // instantiate the active object CGlobalConfirmationObserver
-    iWaitDialogMonitor = CWaitDialogMonitor::NewL( *this );
-    
-    // SetActive
-    iWaitDialogMonitor->Start();
-    
-    if (!iGlobalWaitNote)
-        {
-        iGlobalWaitNote = CAknGlobalNote::NewL();
-        }
-        
-    iGlobalWaitNote->SetSoftkeys( R_AVKON_SOFTKEYS_EMPTY);
-
-    iGlobalWaitNote->ShowNoteL(
-        iWaitDialogMonitor->iStatus,
-        EAknGlobalWaitNote,
-        *msgText );
-    
-    CleanupStack::PopAndDestroy( msgText );
-    }
-
-// ---------------------------------------------------------
-// CPnpProvisioningSaver::WaitDialogDismissedL
-// ---------------------------------------------------------
-//
-void CPnpProvisioningSaver::WaitDialogDismissedL( const TInt aStatusCode )
-    {
-    LOGSTRING( "DialogDismissedL" );
-    if( aStatusCode == EAknSoftkeyCancel || aStatusCode == EAknSoftkeyExit )
-        {
-        LOGSTRING( "setting to KErrCancel" );  
-        iResult = KErrCancel;
-        }
-    //pressed end key and not all settings saved
-    if( aStatusCode== KErrCancel && iEndKeyPressed )
-    	{
-    	LOGSTRING( "End key pressed" );    	
-        iResult = KErrCancel;
-        }
-
-    iWait.AsyncStop();
-    }
-    
-
-// ---------------------------------------------------------
-// CPnpProvisioningSaver::CompleteRequest
-// ---------------------------------------------------------
-//
-void CPnpProvisioningSaver::CompleteRequest()
-    {
-    // Schedule an immediate complete. Make sure that there
-    // is no timer alive first
-    if( IsActive() )
-        {
-        Cancel();
-        }
-    if( iRetryTimer->IsActive() )
-        {
-        iRetryTimer->Cancel();
-        }
-    SetActive();
-    TRequestStatus* sp = &iStatus;
-    User::RequestComplete( sp, KErrNone );
-    }
-
-// ---------------------------------------------------------
-// CPnpProvisioningSaver::DelayedCompleteRequest
-// ---------------------------------------------------------
-//
-void CPnpProvisioningSaver::DelayedCompleteRequest()
-    {
-    // Schedule a delayed complete. Cancel first in case
-    // an immediate request was scheduled.
-    if( IsActive() )
-        {
-        Cancel();
-        }
-    if( iRetryTimer->IsActive() )
-        {
-        iRetryTimer->Cancel();
-        }
-
-    iRetryTimer->Start( KMaxWaitTime, 0, TCallBack( Timeout, this ) );
-    }
-
-// ---------------------------------------------------------
-// CPnpProvisioningSaver::Retry
-// ---------------------------------------------------------
-//
-void CPnpProvisioningSaver::Retry()
-    {
-    // Immediate retry. Mark that we're not waiting
-    // for an event and complete request.
-    iWaitCommsDb = EFalse;
-    iWaitFavourites = EFalse;
-    CompleteRequest();
-    }
-
-// ---------------------------------------------------------
-// CPnpProvisioningSaver::Timeout
-// ---------------------------------------------------------
-//
-TInt CPnpProvisioningSaver::Timeout(TAny* aSelf)
-    {
-    // There was a time-out. Retry saving even though we
-    // didn't get a notify from database.
-    CPnpProvisioningSaver* self = STATIC_CAST(CPnpProvisioningSaver*, aSelf);
-    self->Retry();
-
-    return KErrNone;
-    }
-
-// ---------------------------------------------------------
-// CPnpProvisioningSaver::HandleApDbEventL
-// ---------------------------------------------------------
-//
-void CPnpProvisioningSaver::HandleApDbEventL( TEvent aEvent )
-    {
-    // We received an event from CommsDB. Retry if we're
-    // waiting for it.
-    if( iWaitCommsDb && aEvent == EDbAvailable )
-        {
-        Retry();
-        }
-    }
-
-// ---------------------------------------------------------
-// CPnpProvisioningSaver::HandleFavouritesDbEventL
-// ---------------------------------------------------------
-//
-void CPnpProvisioningSaver::HandleFavouritesDbEventL( RDbNotifier::TEvent /*aEvent*/ )
-    {
-    // We received an event from BookmarkDB. Retry if we're
-    // waiting for it.
-    if( iWaitFavourites )
-        {
-        Retry();
-        }
-    }
-
-//  End of File
-
--- a/pnpmobileservices/pnpms/PnP/PnpProvisioningAppSrc/PnpServiceActivation.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,313 +0,0 @@
-/*
-* Copyright (c) 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:  Service Activation this feature provided if service 
-*                to be enabled from PNPMS application
-*
-*/
-
-
-#include <PnpProvUtil.h>
-#include "PnpServiceActivation.h"
-#include <apacmdln.h> 
-#include <apgcli.h>
-#include <w32std.h>
-#include <apgtask.h>
-#include <w32std.h>
-#include <StringLoader.h>
-#include <PnpProvisioning.rsg>
-#include <AknGlobalNote.h>
-#include <centralrepository.h>
-
-#include <e32svr.h>
-#include <centralrepository.h>
-#include "PnpLogger.h"
-
-
-const TUid    KCRUidPnPProvisioning = {0x10204338};
-// Browser UID
-const TUid KWAPBrowserUID = { 0x10008d39 };
-const TInt KMaxLength = 255;
-// POP3 and IMAP4 provisioning settings application ID
-
-// Literal constants
-
-const TUint32 KServiceAct1  = 0x00000100;
-
-// INCLUDE FILES
-
-// -----------------------------------------------------------------------------
-// CPnpServiceActivation::CPnpServiceActivation
-// C++ default constructor can NOT contain any code, that
-//  -----------------------------------------------------------------------------
-//
-CPnpServiceActivation::CPnpServiceActivation()
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// CPnpProvUtil::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CPnpServiceActivation::ConstructL()
-    {
-     //No values to assign	
-    }  
- 
-// -----------------------------------------------------------------------------
-// CPnpProvUtil::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CPnpServiceActivation* CPnpServiceActivation::NewL()
-    {
-    CPnpServiceActivation* self = NewLC();
-    CleanupStack::Pop();
-    
-    return self; 
-    }
-
-// -----------------------------------------------------------------------------
-// CPnpServiceActivation::NewLC
-// -----------------------------------------------------------------------------
-//
-CPnpServiceActivation* CPnpServiceActivation::NewLC()
-    {
-    CPnpServiceActivation* self = new( ELeave ) CPnpServiceActivation;
-    
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    
-    return self; 
-    } 
-
-// -----------------------------------------------------------------------------
-// Destructor
-// -----------------------------------------------------------------------------
-CPnpServiceActivation::~CPnpServiceActivation()
-    {   
-    }
-// -----------------------------------------------------------------------------
-// CPnpServiceActivation::LaunchApplicationL
-// -----------------------------------------------------------------------------
-//
-void CPnpServiceActivation::LaunchApplicationL()
-    {
-    
-    // For email service activation Messaging launcher is activated
-    TBool validApp = ValidateAppUidWithProvappIDL();
-    
-    if(validApp) 
-    {
-    	
-    
-     
-     
-     RApaLsSession appArcSession;
-	
-     User::LeaveIfError( appArcSession.Connect() );
-       CleanupClosePushL( appArcSession );
-       TApaAppInfo appInfo; 
-       User::LeaveIfError(appArcSession.GetAppInfo( appInfo, TUid::Uid( iLaunchUid) ) );        
-       CApaCommandLine* cmdLine = CApaCommandLine::NewLC();
-       cmdLine->SetCommandL( EApaCommandRun );
-       cmdLine->SetExecutableNameL( appInfo.iFullName );
-       User::LeaveIfError( appArcSession.StartApp( *cmdLine ) );
-       CleanupStack::PopAndDestroy( 2 ); // cmdLine, appArcSession 
-    }
-
-    }
-
-
-// -----------------------------------------------------------------------------
-// CPnpServiceActivation::ValidateAppUidWithProvappIDL()
-// -----------------------------------------------------------------------------
-//
-TBool CPnpServiceActivation::ValidateAppUidWithProvappIDL()
-    {
-    
-    // Get application ID and Provisioning settings application
-    // ID and validate the application launcher	
-   
-    RPointerArray<HBufC> appID;
-    TBuf<16> pLaunchUid;
-    TBool returnFlag (EFalse);
-    TBool FoundUid(EFalse);
-    TBool FoundAppid(EFalse);
-	
-    CPnpProvUtil *provutil = CPnpProvUtil::NewLC();
-    
-    iLaunchUid = provutil->GetApplicationUidL();
- 
-	provutil->GetProvAdapterAppIdsL(appID);
-    pLaunchUid.Num(iLaunchUid);
-    
-    FoundUid = isPresent(pLaunchUid);
-    TUint32 secondPosition = iPosition+200;
-    if(FoundUid)
-        {
-    	for(TInt i=0; i<appID.Count(); i++)
-    	{
-		TPtrC ptr(*appID[i]);
-    	    FoundAppid = isFound(ptr,secondPosition);
-            if(FoundAppid)
-                {
-                if(iPosition == KServiceAct1){
-                DisplayAppSpecNoteL();
-                }
-                returnFlag = ETrue;
-                }
-    	}
-     }
-    
-    
-    CleanupStack::PopAndDestroy();
-     
-    appID.ResetAndDestroy();
-    appID.Close();
-    return returnFlag; 
-    }
-
-
-// -----------------------------------------------------------------------------
-// CPnpServiceActivation::KillBrowserL()
-// -----------------------------------------------------------------------------
-//
-void CPnpServiceActivation::KillBrowserL()
-    {
-     
-    // Get the correct application data 
-    RWsSession ws;
-    User::LeaveIfError(ws.Connect()); 
-    CleanupClosePushL(ws);
-
-    // Find the task with uid of browser. If task exists then 
-    // kill browser
-    TApaTaskList taskList(ws);
-    TApaTask task = taskList.FindApp( KWAPBrowserUID );
-    if(task.Exists())
-    task.EndTask();
-
-    CleanupStack::PopAndDestroy(); // ws, lsSession
-
-    
-    }
-    
-// -----------------------------------------------------------------------------
-// CPnpServiceActivation::DisplayAppSpecNote()
-// -----------------------------------------------------------------------------
-//
-
-void CPnpServiceActivation::DisplayAppSpecNoteL()
-{
-    HBufC* text = StringLoader::LoadLC(R_TEXT_EMAIL_SERVICE_NOTE);
-
-    CAknGlobalNote* globalNote = CAknGlobalNote::NewL();
-    CleanupStack::PushL( globalNote );
-    globalNote->ShowNoteL( EAknGlobalInformationNote , *text );
-    CleanupStack::PopAndDestroy( 2 );
-}
-
-TBool CPnpServiceActivation::isPresent(TDesC& p)
-{
-   TBool flag(EFalse);
-   TUint32 position = KServiceAct1;
-   for(TInt i=0;i<=299;i++)
-        {
-        TBool val = isFound(p,position);
-        if(val)
-            {
-            iPosition = position;
-            flag = ETrue;
-            break;
-            }   
-        position++;
-        }
-      return flag;
-     }
-TBool CPnpServiceActivation::isFound(TDesC& p,TUint32 position)
-{
-    TBool val(EFalse);     
-    TBuf16<KMaxLength> keys;
-    HBufC* heapBuf = HBufC::NewLC(20);
-    TPtr ptr(heapBuf->Des());
-    ptr = keys;
-    RPointerArray<HBufC> array;    
-    TRAPD( errVal,GetCenrepValueL(KCRUidPnPProvisioning,position,keys));
-//  End of File
-    if(errVal != KErrNone)
-            {
-            CleanupStack::PopAndDestroy();
-            return val;
-            }
-    ParseValues(array, keys);
-    val = Search(array,p);
-    CleanupStack::PopAndDestroy(heapBuf);
-    array.ResetAndDestroy();
-    array.Close();
-    return val;    
-}
-
-TBool CPnpServiceActivation::Search(RPointerArray<HBufC>& array,TDesC& p)
-{
-    TBool flag(EFalse);
-    for(TInt j=0; j<array.Count(); j++)
-        {
-        TPtrC ptr(*array[j]);
-	if(!ptr.Compare(p))
-            {
-            flag = ETrue;
-            }
-        }
-    return flag;
-}
-void CPnpServiceActivation::ParseValues(RPointerArray<HBufC>& array, TDesC& aValue)
-{
-     TLex aLex(aValue);
-     while(aLex.Peek() != '\x00')
-        {
-        aLex.Mark();
-        while(aLex.Peek()!=',' && aLex.Peek()!='\x00')
-            aLex.Inc();
-        TPtrC aPtr = aLex.MarkedToken(); 
-        HBufC *buf18 = aPtr.AllocL();
-        array.Append(buf18); 
-        if(aLex.Peek()=='\x00') // end of string
-            break; 
-        aLex.Inc();
-    }
-}
-void CPnpServiceActivation::GetCenrepValueL(const TUid aRepositoryUid,TUint32 aKey, TDes16& aValue)
-    {
-    CRepository * rep = NULL;
-    TInt errorStatus = KErrNone;
-    TRAPD( errVal, rep = CRepository::NewL(aRepositoryUid));
-    if(errVal == KErrNone)
-        {
-        errorStatus =  rep->Get( aKey , aValue );
-        }
-        else
-        {
-        errorStatus =  errVal;
-        }
-    
-    if(rep)     
-        {
-        delete rep;
-        }
-    if(errorStatus != KErrNone )
-        {
-        User::Leave(errorStatus);
-        }
-    }
--- a/pnpmobileservices/pnpms/PnP/PnpProvisioningAppSrc/cwaitdialogmonitor.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,134 +0,0 @@
-/*
-* Copyright (c) 2006 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:  Contains the implementation of dialog monitor
-*
-*/
-
-
-
-// INCLUDE FILES
-//#include    <basched.h>
-#include    "PnpProvisioningSaver.h"
-#include    "cwaitdialogmonitor.h"
-#include    "mwaitdialogstatusnotifier.h"
-
-// EXTERNAL DATA STRUCTURES
-// None
-
-// EXTERNAL FUNCTION PROTOTYPES  
-// None
-
-// CONSTANTS
-// PhoneModule name
-
-
-// MACROS
-// None
-
-// LOCAL CONSTANTS AND MACROS
-// None
-
-// MODULE DATA STRUCTURES
-// None
-
-// LOCAL FUNCTION PROTOTYPES
-// None
-
-// FORWARD DECLARATIONS
-// None
-
-// ============================= LOCAL FUNCTIONS ===============================
-// None
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CWaitDialogMonitor::CWaitDialogMonitor
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-
-CWaitDialogMonitor::CWaitDialogMonitor( MWaitDialogStatusNotifier& aNotifier ) :
-    CActive( CActive::EPriorityStandard ),
-    iNotifier( aNotifier )
-    {
-    }
-
-
-// -----------------------------------------------------------------------------
-// CWaitDialogMonitor::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CWaitDialogMonitor::ConstructL()
-    {
-    CActiveScheduler::Add(this); 
-    }
-
-// -----------------------------------------------------------------------------
-// CWaitDialogMonitor::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CWaitDialogMonitor* CWaitDialogMonitor::NewL( MWaitDialogStatusNotifier& aNotifier )
-    {
-    CWaitDialogMonitor* self = new( ELeave ) CWaitDialogMonitor( aNotifier );    
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop();
-    return self;
-    }
-    
-// Destructor
-CWaitDialogMonitor::~CWaitDialogMonitor()
-    {
-    if( IsActive() )
-        {
-        Cancel();
-        }
-    }
-
-void CWaitDialogMonitor::Start()
-    {
-    if( IsActive() )
-        {
-        Cancel();
-        }
-    SetActive();
-    }
-
-void CWaitDialogMonitor::DoCancel()
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// CWaitDialogMonitor::RunL()
-// Handles object’s request completion event
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CWaitDialogMonitor::RunL()
-    {
-    //LOGSTRING("Enter to CWaitDialogMonitor::RunL() ");
-    //LOGSTRING2( "CWaitDialogMonitor status %i" , iStatus.Int() );
-
-    iNotifier.WaitDialogDismissedL( iStatus.Int() );
-    }
-
-// ========================== OTHER EXPORTED FUNCTIONS =========================
-
-// None
-
-//  End of File  
--- a/pnpmobileservices/pnpms/PnP/group/Icons.mk	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,71 +0,0 @@
-#
-# Copyright (c) 2004 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: Implementation of PnPMS components
-#
-
-ifeq (WINS,$(findstring WINS, $(PLATFORM)))
-ZDIR=\epoc32\release\$(PLATFORM)\$(CFG)\Z
-else
-ZDIR=\epoc32\data\z
-endif
-
-# ----------------------------------------------------------------------------
-# Configure these
-# ----------------------------------------------------------------------------
-
-TARGETDIR=$(ZDIR)\SYSTEM\data
-HEADERDIR=\epoc32\include
-ICONTARGETFILENAME=$(TARGETDIR)\PnpProvisioning.MIF
-HEADERFILENAME=$(HEADERDIR)\PnpProvisioning.MBG
-
-do_nothing :
-	@rem do_nothing
-
-MAKMAKE : do_nothing
-
-BLD : do_nothing
-
-CLEAN : do_nothing
-
-LIB : do_nothing
-
-CLEANLIB : do_nothing
-
-# ----------------------------------------------------------------------------
-# Configure these.
-#
-# NOTE 1: DO NOT DEFINE MASK FILE NAMES! They are included automatically by
-# MifConv if the mask detph is defined.
-#
-# NOTE 2: Usually, source paths should not be included in the bitmap
-# definitions. MifConv searches for the icons in all icon directories in a
-# predefined order, which is currently \s60\icons, \s60\bitmaps2.
-# The directory \s60\icons is included in the search only if the feature flag
-# __SCALABLE_ICONS is defined.
-# ----------------------------------------------------------------------------
-
-RESOURCE :
-	mifconv $(ICONTARGETFILENAME) /h$(HEADERFILENAME) \
-		/c8,8 context_pane_icon.bmp \
-		/c8,8 list_icon.bmp
-
-FREEZE : do_nothing
-
-SAVESPACE : do_nothing
-
-RELEASABLES :
-	@echo $(HEADERFILENAME)&& \
-	@echo $(ICONTARGETFILENAME)
-
-FINAL : do_nothing
--- a/pnpmobileservices/pnpms/PnP/group/Icons_aif_scalable.mk	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +0,0 @@
-#
-# Copyright (c) 2004 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: Implementation of PnPMS components
-#
-
-ifeq (WINS,$(findstring WINS, $(PLATFORM)))
-ZDIR=\epoc32\release\$(PLATFORM)\$(CFG)\Z
-else
-ZDIR=\epoc32\data\z
-endif
-
-# ----------------------------------------------------------------------------
-# Configure these
-# ----------------------------------------------------------------------------
-
-TARGETDIR=$(ZDIR)\SYSTEM\APPS\PnpProvisioning
-ICONTARGETFILENAME=$(TARGETDIR)\PnpProvisioning_AIF.MIF
-
-do_nothing :
-	@rem do_nothing
-
-MAKMAKE : do_nothing
-
-BLD : do_nothing
-
-CLEAN : do_nothing
-
-LIB : do_nothing
-
-CLEANLIB : do_nothing
-
-# ----------------------------------------------------------------------------
-# Configure these.
-#
-# NOTE 1: DO NOT DEFINE MASK FILE NAMES! They are included automatically by
-# MifConv if the mask detph is defined.
-#
-# NOTE 2: Usually, source paths should not be included in the bitmap
-# definitions. MifConv searches for the icons in all icon directories in a
-# predefined order, which is currently \s60\icons, \s60\bitmaps2.
-# The directory \s60\icons is included in the search only if the feature flag
-# __SCALABLE_ICONS is defined.
-# ----------------------------------------------------------------------------
-
-RESOURCE :
-	mifconv $(ICONTARGETFILENAME) \
-		/c8,8 context_pane_icon.bmp \
-		/c8,8 list_icon.bmp
-
-FREEZE : do_nothing
-
-SAVESPACE : do_nothing
-
-RELEASABLES :
-	@echo $(ICONTARGETFILENAME)
-
-FINAL : do_nothing
--- a/pnpmobileservices/pnpms/PnP/group/Icons_aif_scalable_dc.mk	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +0,0 @@
-#
-# Copyright (c) 2004 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: Implementation of PnPMS components
-#
-
-ifeq (WINS,$(findstring WINS, $(PLATFORM)))
-ZDIR=\epoc32\release\$(PLATFORM)\$(CFG)\Z
-else
-ZDIR=\epoc32\data\z
-endif
-
-# ----------------------------------------------------------------------------
-# Configure these
-# ----------------------------------------------------------------------------
-
-TARGETDIR=$(ZDIR)\RESOURCE\APPS
-ICONTARGETFILENAME=$(TARGETDIR)\PnpProvisioning_aif.MIF
-//ICONTARGETFILENAME=$(TARGETDIR)\PnpProvisioning_aif.MBM
-
-do_nothing :
-	@rem do_nothing
-
-MAKMAKE : do_nothing
-
-BLD : do_nothing
-
-CLEAN : do_nothing
-
-LIB : do_nothing
-
-CLEANLIB : do_nothing
-
-# ----------------------------------------------------------------------------
-# Configure these.
-#
-# NOTE 1: DO NOT DEFINE MASK FILE NAMES! They are included automatically by
-# MifConv if the mask detph is defined.
-#
-# NOTE 2: Usually, source paths should not be included in the bitmap
-# definitions. MifConv searches for the icons in all icon directories in a
-# predefined order, which is currently \s60\icons, \s60\bitmaps2.
-# The directory \s60\icons is included in the search only if the feature flag
-# __SCALABLE_ICONS is defined.
-# ----------------------------------------------------------------------------
-
-RESOURCE :
-	mifconv $(ICONTARGETFILENAME) \
-		/c8,8 context_pane_icon.bmp \
-		/c8,8 list_icon.bmp
-
-FREEZE : do_nothing
-
-SAVESPACE : do_nothing
-
-RELEASABLES :
-	@echo $(ICONTARGETFILENAME)
-
-FINAL : do_nothing
--- a/pnpmobileservices/pnpms/PnP/group/Icons_dc.mk	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +0,0 @@
-#
-# Copyright (c) 2004 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: Implementation of PnPMS components
-#
-
-ifeq (WINS,$(findstring WINS, $(PLATFORM)))
-ZDIR=\epoc32\release\$(PLATFORM)\$(CFG)\Z
-else
-ZDIR=\epoc32\data\z
-endif
-
-# ----------------------------------------------------------------------------
-# Configure these
-# ----------------------------------------------------------------------------
-
-TARGETDIR=$(ZDIR)\RESOURCE\APPS
-ICONTARGETFILENAME=$(TARGETDIR)\PnpProvisioning.MIF
-
-do_nothing :
-	@rem do_nothing
-
-MAKMAKE : do_nothing
-
-BLD : do_nothing
-
-CLEAN : do_nothing
-
-LIB : do_nothing
-
-CLEANLIB : do_nothing
-
-# ----------------------------------------------------------------------------
-# Configure these.
-#
-# NOTE 1: DO NOT DEFINE MASK FILE NAMES! They are included automatically by
-# MifConv if the mask detph is defined.
-#
-# NOTE 2: Usually, source paths should not be included in the bitmap
-# definitions. MifConv searches for the icons in all icon directories in a
-# predefined order, which is currently \s60\icons, \s60\bitmaps2.
-# The directory \s60\icons is included in the search only if the feature flag
-# __SCALABLE_ICONS is defined.
-# ----------------------------------------------------------------------------
-
-RESOURCE :
-	mifconv $(ICONTARGETFILENAME) \
-		/c8,8 context_pane_icon.bmp \
-		/c8,8 list_icon.bmp
-
-FREEZE : do_nothing
-
-SAVESPACE : do_nothing
-
-RELEASABLES :
-	@echo $(ICONTARGETFILENAME)
-
-FINAL : do_nothing
Binary file pnpmobileservices/pnpms/PnP/group/context_pane_icon.bmp has changed
Binary file pnpmobileservices/pnpms/PnP/group/context_pane_icon_mask.bmp has changed
Binary file pnpmobileservices/pnpms/PnP/group/context_pane_icon_mask_soft.bmp has changed
Binary file pnpmobileservices/pnpms/PnP/group/list_icon.bmp has changed
Binary file pnpmobileservices/pnpms/PnP/group/list_icon_mask.bmp has changed
Binary file pnpmobileservices/pnpms/PnP/group/list_icon_mask_soft.bmp has changed
--- a/pnpmobileservices/pnpms/PnP/loc/pnpprovisioning.loc	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-/*
-* Copyright (c) 2004-2006 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:  Localization strings for PnpProvisioning
-*
-*/
-
-
-// LOCALISATION STRINGS
-
-// d: When user has downloaded settings from Plug and Play Mobile Services following
-// d: confirmation query is shown. If the user cancels the query settings are not saved. 
-// d: If the user accepts the query settings are saved.
-// l: popup_note_window/opt2
-// r: 3.1
-#define qtn_op_pnp_query_save "Save settings?"
-
-
-// d: If setting as default is not automatically possible following confirmation
-// d: query is shown. If the user cancels the query settings are not set as default
-// d: settings. If the user accepts the query settings are set as default settings.
-// l: popup_note_window/opt2
-// r: 3.1
-#define qtn_op_pnp_query_set_sefault "Set downloaded settings as default settings?"
-
-
-// d: If saving settings takes more than 1 second, a wait note is displayed until settings are saved.
-// l: popup_note_wait_window
-// r: 3.1
-#define qtn_op_pnp_wait_saving "Saving settings"
-
-
-// d: When settings are saved information note is displayed.
-// l: popup_note_window/opt2
-// r: 3.1
-#define qtn_op_pnp_info_saved "Settings saved"
-
-
-// d: If settings cannot be saved error note is displayed.
-// l: popup_note_window/opt2
-// r: 3.1
-#define qtn_op_pnp_error_not_saved "Settings cannot be saved"
-
-//d:Caption for Service Help Plugin
-//l:list_single_large_graphic_pane_t1
-//r:3.2.3
-#define qtn_cp_fetch_settings "Fetch settings"
-
-//d: After settings are saved this New mailbox created will be the default mailbox
-// : currently in use.
-//l: popup_note_window/opt1
-//r: 3.2.3
-#define qtn_op_pnp_mailbox_saved_default "Mailbox settings saved as Default"
-
-
-
-// End of File
--- a/pnpmobileservices/pnpms/PnP/recnhwr/1020433B.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-/*
-* Copyright (c) 1020 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: Implementation of PnPMS components
-*
-*/
-
-
-#ifdef RD_SECURE_BIN_RES
-	#include "registryinfov2.rh"
-#else
-	#include "RegistryInfo.rh"
-#endif
-
-RESOURCE REGISTRY_INFO r_registry
-	{
-#ifdef RD_SECURE_BIN_RES
-		resource_format_version = RESOURCE_FORMAT_VERSION_2;
-#endif
-
-	dll_uid = 0x1020433B; // should match name of this file
-	interfaces =
-		{
-		INTERFACE_INFO
-			{
-			interface_uid = 0x101F7D87;  // const for all Data Recognizers
-			implementations =
-				{
-			    IMPLEMENTATION_INFO
-					{
-					implementation_uid = 0x1020433B;
-					version_no = 1;
-					display_name = "PnPProvisioning";
-					default_data = "";
-					opaque_data = "";
-
-					// Allow updating a ROM component with the corresponding
-					// RAM component
-					#ifdef RD_SECURE_BIN_RES
-						rom_only = 0;
-					#endif
-					}
-				};
-			}
-		};
-	}
-
-// End of File
--- a/pnpmobileservices/pnpms/PnP/recnhwr/PnpRecnhwrLogger.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,118 +0,0 @@
-/*
-* Copyright (c) 2004 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 file defines logging interface macros
-*
-*/
-
-
-#ifndef __LOGGER_H__
-#define __LOGGER_H__
-
-#ifdef _DEBUG
-    #define LOGGING_ENABLED
-#endif
-#ifdef LOGGING_ENABLED          // This must be enabled to use logging system
-
-#define LOGGER_LOGGING          // Log to Logger
-
-
-
-#ifdef LOGGER_LOGGING
-
-//  INCLUDES
-#include <flogger.h>
-
-// LOG SETTINGS 
-_LIT( KPnpLogFolder, "PnP" );
-_LIT( KPnpLogFile, "RecNhwr.TXT" );
-
-#endif
-
-// CONSTANTS  
-// None.
-
-// MACROS
-/*
------------------------------------------------------------------------------
-
-    INTERNAL MACROs. 
-
-    DO NOT USE THESE DIRECTLY !!! 
-    SEE EXTERNAL MACROS
-
------------------------------------------------------------------------------
-*/
-
-#ifdef LOGGER_LOGGING
-#define INTRLOGTEXT( AAA )                  { RFileLogger::Write( KPnpLogFolder(), KPnpLogFile(), EFileLoggingModeAppend, AAA ); }
-#define INTRLOGSTRING( AAA )                { _LIT( tempLogDes, AAA ); RFileLogger::Write( KPnpLogFolder(), KPnpLogFile(), EFileLoggingModeAppend, tempLogDes()); }
-#define INTRLOGSTRING2( AAA, BBB )            { _LIT( tempLogDes, AAA ); RFileLogger::WriteFormat( KPnpLogFolder(), KPnpLogFile(), EFileLoggingModeAppend, TRefByValue<const TDesC>( tempLogDes()), BBB ); }
-#define INTRLOGSTRING3( AAA, BBB, CCC )        { _LIT( tempLogDes, AAA ); RFileLogger::WriteFormat( KPnpLogFolder(), KPnpLogFile(), EFileLoggingModeAppend, TRefByValue<const TDesC>( tempLogDes()), BBB, CCC ); }
-#else
-#define INTRLOGTEXT( AAA )
-#define INTRLOGSTRING( AAA )
-#define INTRLOGSTRING2( AAA, BBB )
-#define INTRLOGSTRING3( AAA, BBB, CCC )
-#endif
-
-/*
------------------------------------------------------------------------------
-
-    EXTERNAL MACROs
-
-    USE THESE MACROS IN YOUR CODE !
-
------------------------------------------------------------------------------
-*/
-
-
-#define LOGTEXT( AAA )                { \
-                                    INTRLOGTEXT( AAA ); \
-                                    }   // Example: LOGTEXT( own_desc );
-
-#define LOGSTRING( AAA )            { \
-                                    INTRLOGSTRING( AAA ); \
-                                    }   // Example: LOGSTRING( "Test" );
-
-#define LOGSTRING2( AAA, BBB )        { \
-                                    INTRLOGSTRING2( AAA, BBB ); \
-                                    }  // Example: LOGSTRING( "Test %i", aValue );
-
-#define LOGSTRING3( AAA, BBB, CCC )    { \
-                                    INTRLOGSTRING3( AAA, BBB, CCC ); \
-                                    } // Example: LOGSTRING( "Test %i %i", aValue1, aValue2 );
-
-
-#else   // LOGGING_ENABLED
-
-#define LOGTEXT( AAA ) 
-#define LOGSTRING( AAA ) 
-#define LOGSTRING2( AAA, BBB )    
-#define LOGSTRING3( AAA, BBB, CCC )    
-
-#endif  // LOGGING_ENABLED
-
-// DATA TYPES
-// None.
-
-// FUNCTION PROTOTYPES
-// None.
-
-// FORWARD DECLARATIONS
-// None.
-
-// CLASS DECLARATION
-// None.
-
-#endif  // __LOGGER_H__
--- a/pnpmobileservices/pnpms/PnP/recnhwr/recnhwr.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,145 +0,0 @@
-/*
-* Copyright (c) 2004-2006 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: Implementation of PnPMS components
-*
-*/
-
-
-// INCLUDE FILES
-#include <apmrec.h>
-#include <apmstd.h>
-
-#include <f32file.h>
-#include <implementationproxy.h>
-
-#include "recnhwr.h"
-
-// CONSTANTS
-const TInt KNhwrRecognizerValue=0x1020433B;
-const TUid KUidNhwrRecognizer={KNhwrRecognizerValue};
-_LIT8(KDataTypeNhwr, "application/vnd.nokia.headwrapper");
-_LIT(KNhwrExtension,".wbf");
-_LIT8(KHeader,"NHWR");
-const TInt KHeaderLength = 4;
-
-// Constructor
-CApaNhwrRecognizer::CApaNhwrRecognizer()
-    :CApaDataRecognizerType( KUidNhwrRecognizer,CApaDataRecognizerType::ENormal )
-{
-    //LOGSTRING( "Constructor" );
-    iCountDataTypes = 1;
-}
-
-// Destructor
-CApaNhwrRecognizer::~CApaNhwrRecognizer()
-{
-    //LOGSTRING( "Destructor" );
-}
-
-// -----------------------------------------------------------------------------
-// CApaNhwrRecognizer::PreferredBufSize
-// -----------------------------------------------------------------------------
-//
-TUint CApaNhwrRecognizer::PreferredBufSize()
-{
-    //LOGSTRING( "PreferredBufSize" );
-    return KHeaderLength;
-}
-
-// -----------------------------------------------------------------------------
-// CApaNhwrRecognizer::SupportedDataTypeL
-// -----------------------------------------------------------------------------
-//
-TDataType CApaNhwrRecognizer::SupportedDataTypeL( TInt aIndex ) const
-{
-    //LOGSTRING( "SupportedDataTypeL" );
-    __ASSERT_DEBUG( aIndex >= 0 && aIndex < 1, User::Invariant() );
-    
-     switch ( aIndex )
-        {
-        case 0:
-            //LOGSTRING( "SupportedDataTypeL - done" );
-            return TDataType(KDataTypeNhwr);
-        default:
-            //LOGSTRING( "SupportedDataTypeL - done" );
-            return TDataType();
-        }
-}
-
-// -----------------------------------------------------------------------------
-// CApaNhwrRecognizer::DoRecognizeL
-// -----------------------------------------------------------------------------
-//
-void CApaNhwrRecognizer::DoRecognizeL( const TDesC& aName, const TDesC8& aBuffer )
-{
-    //LOGSTRING( "DoRecognizeL" );
-
-    if(aName.Length()>0)
-        {
-        TParse parse;
-        parse.Set(aName,NULL,NULL);
-        if(parse.Ext().Compare(KNhwrExtension)==0)
-            {
-            iDataType   = TDataType(KDataTypeNhwr);
-            //LOGSTRING( "confidence EProbable" );
-            iConfidence = EProbable;
-            }
-        }
-    
-    // File content
-    if (aBuffer.Length() >= KHeaderLength)
-        {
-    
-        if ( aBuffer.FindF(KHeader) == 0)
-            {
-            iDataType   = TDataType(KDataTypeNhwr);
-            //LOGSTRING( "confidence ECertain" );
-            iConfidence = ECertain;
-            //LOGSTRING( "DoRecognizeL - done" );
-            return;
-            }
-        }
-
-    //LOGSTRING( "DoRecognizeL - done" );
-    return;
-}
-
-// -----------------------------------------------------------------------------
-// CApaNhwrRecognizer::CreateRecognizerL
-// -----------------------------------------------------------------------------
-//
-CApaDataRecognizerType* CApaNhwrRecognizer::CreateRecognizerL()
-    {
-    //LOGSTRING( "CreateRecognizerL" );
-    return new (ELeave) CApaNhwrRecognizer();
-    }
-
-// CApaNhwrRecognizer::ImplementationTable
-// -----------------------------------------------------------------------------
-//
-const TImplementationProxy ImplementationTable[] =
-    {
-    IMPLEMENTATION_PROXY_ENTRY( KNhwrRecognizerValue, CApaNhwrRecognizer::CreateRecognizerL)
-    };
-
-// -----------------------------------------------------------------------------
-// CApaNhwrRecognizer::ImplementationGroupProxy
-// -----------------------------------------------------------------------------
-//
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy(TInt& aTableCount)
-    {
-    //LOGSTRING( "ImplementationGroupProxy" );
-    aTableCount = sizeof(ImplementationTable) / sizeof(TImplementationProxy);
-    return ImplementationTable;
-    }
--- a/pnpmobileservices/pnpms/PnP/recnhwr/recnhwr.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-/*
-* Copyright (c) 2004-2006 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: Implementation of PnPMS components
-*
-*/
-
-
-
-#ifndef __REC_NHWR_H__
-#define __REC_NHWR_H__
-
-class CApaNhwrRecognizer : public CApaDataRecognizerType
-    {
-public: // from CApaDataRecognizerType
-    CApaNhwrRecognizer();
-    ~CApaNhwrRecognizer();
-    TUint PreferredBufSize();
-    TDataType SupportedDataTypeL(TInt aIndex) const;
-
-    static CApaDataRecognizerType* CreateRecognizerL();
-
-private: // from CApaDataRecognizerType
-    void DoRecognizeL(const TDesC& aName, const TDesC8& aBuffer);
-
-    };
-
-#endif // #ifndef __REC_NHWR_H__
--- a/pnpmobileservices/pnpms/PnpPaosFilter/data/10272D33.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,87 +0,0 @@
-/*
-* Copyright (c) 1027 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 file contains resource definitions for PnP Paos filter. 
-*
-*/
-
-
-//  RESOURCE IDENTIFIER
-
-//  INCLUDES
-#ifdef RD_SECURE_BIN_RES
-	#include "registryinfov2.rh"
-#else
-	#include "RegistryInfo.rh"
-#endif
-
-//  CONSTANTS
-
-//  MACROS
-
-//  RESOURCE DEFINITIONS
-// -----------------------------------------------------------------------------
-//
-// REGISTRY_INFO
-// Contains the registry information for the WsPaosFilter
-//
-// -----------------------------------------------------------------------------
-//
-RESOURCE REGISTRY_INFO theInfo
-    {
-#ifdef RD_SECURE_BIN_RES
-		resource_format_version = RESOURCE_FORMAT_VERSION_2;
-#endif
-
-    dll_uid = 0x10272D33;
-    interfaces=
-        {
-        INTERFACE_INFO
-            {
-            // Ecom plugin interface_uid value MUST NOT be modified
-            interface_uid = 0x101F446D;
-            implementations =
-                {
-                IMPLEMENTATION_INFO
-                    {
-                    implementation_uid = 0x10272D33;
-                    version_no = 1;
-                    display_name = "PnpPaosFilter";
-
-                    // For HTTP-TF the default_data must be defined as follows
-                    // 1.Protocol identifier
-                    //    HTTP-TF uses first part (separated with /-character) to identify
-                    //    what protocol this filter will support. It could also be WSP but
-                    //    then HTTP-TF does not load it with any sessions that based on HTTP.
-                    // 2.Separator
-                    //    /-separator must be always there
-                    // 3.Filter category
-                    //    + = mandatory (HTTP-TF will panic if installation of this filter fails)
-                    //    - = Explicit (Does not install filter)
-                    //      = Implicit (Installs filter but traps possible errors and continues)
-
-                    default_data = "HTTP/+PAOS||WSP/+PAOS";
-                    opaque_data = "";
-
-										// Allow updating a ROM component with the corresponding
-										// RAM component
-										#ifdef RD_SECURE_BIN_RES
-											rom_only = 0;
-										#endif
-                    }
-                };
-            }
-        };
-    }
-
-// End of File
--- a/pnpmobileservices/pnpms/PnpPaosFilter/group/bld_paos_sis_stub.mk	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,83 +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 "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description:
-#
-#
-# Build a stub SIS file to go into ROM to allow installing an update.
-#
-
-ifeq (WINS,$(findstring WINS, $(PLATFORM)))
-INSTALLDIR=..\..\install\wins
-SISNAME=PnpPaos_S3-0_stub_winscw_udeb
-PKGNAME=PnpPaos_S3-0_stub_winscw_udeb
-else
-ifeq (UDEB,$(findstring UDEB, $(CFG)))
-INSTALLDIR=..\..\install\udeb
-SISNAME=PnpPaos_S3-0_stub_udeb
-PKGNAME=PnpPaos_S3-0_stub_udeb
-else
-INSTALLDIR=..\..\install
-SISNAME=PnpPaos_S3-0_stub
-PKGNAME=PnpPaos_S3-0_stub
-endif
-endif
-
-ifeq (WINS,$(findstring WINS, $(PLATFORM)))
-TARGETDIR=$(EPOCROOT)EPOC32\RELEASE\$(PLATFORM)\$(CFG)\Z\System\Install
-else
-TARGETDIR=$(EPOCROOT)EPOC32\Data\Z\System\Install
-endif
-
-$(TARGETDIR) :
-	@perl -S emkdir.pl "$(TARGETDIR)"
-
-do_nothing :
-	rem do_nothing
-
-SISFILE=$(TARGETDIR)\$(SISNAME).sis
-
-$(SISFILE) : $(INSTALLDIR)\$(PKGNAME).pkg
-	@echo "
-	@echo pkg-file: $? 
-	@echo sis-file: $@
-	@echo "
-	makesis -s $? $@ 
-
-#
-# The targets invoked by bld...
-#
-
-MAKMAKE : do_nothing
-
-RESOURCE : do_nothing
-
-SAVESPACE : do_nothing
-
-BLD :
-#Remove the old sis-files to allow creating new ones
-	-erase $(SISFILE)
-
-FREEZE : do_nothing
-
-LIB : do_nothing
-
-CLEANLIB : do_nothing
-
-FINAL : $(TARGETDIR) $(SISFILE)
-
-CLEAN : 
-	-erase $(SISFILE)
-
-RELEASABLES : 
-	@echo $(SISFILE)
--- a/pnpmobileservices/pnpms/PnpPaosFilter/src/HdcToPaosInterface.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,87 +0,0 @@
-/*
-* 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:  A interface definition for reading HDC related parameters
-*
-*/
-
-
-
-
-#ifndef HDC_TO_PAOS_INTERFACE_H
-#define HDC_TO_PAOS_INTERFACE_H
-
-//INCLUDES
-#include <e32base.h>
-
-const TInt KMaxHdcVersionStringLength(40); 
-const TInt KHdcNonceLength(8); 
-_LIT( KHdcDllFileName, "hdcutil.dll" ); 
-const TUid KHdcUtilDllUid = { 0x10272D3A };
-
-const TInt KMaxHdcKeyInfoLength(20);
-typedef TBuf8<KMaxHdcKeyInfoLength> HdcKeyInfo;
-typedef RArray<HdcKeyInfo> HdcKeyInfoList;
-
-const TInt KMaxURLLength(255);
-typedef TBuf8<KMaxURLLength> HdcTrustedDomain;
-typedef RArray<HdcTrustedDomain> HdcTrustedDomainList;
-
-
-/*!
-MHdcToPaosInterface implementor is assumed to be part of a DLL that can be
-loaded dynamically using RLibrary::Load. It should have <KHdcUtilDllUid> as
-its uid3 and it should be named <KHdcDllFileName>. There should be a NewLC
-implementation in the first ordinal of the DLL that returns a pointer to
-a CHdcToPaosInterface derived object to allow dynamic loading.
-*/
-
-class CHdcToPaosInterface : public CBase
-    {
-    public:
-    
-        /**
-        * Returns HDC version string
-        * @param aVersion Current version of the HDC. max length of version is 
-        *    KMaxHdcVersionStringLength
-        * @return KErrNone, KErrArgument
-        */
-        virtual TInt Version( TDes8& aVersion ) const = 0;
-
-        /**
-        * Create and save new nonce. 
-        * @param aNonce Nonce. Length of nonce is KHdcNonceLength
-        */
-        virtual void CreateNewNonceL( TDes8& aNonce ) = 0;
-        
-        /**
-        * Get current nonce value from the database which has been created using
-        *    CreateNonceL().
-        * @param aNonce Nonce. Length of nonce is KHdcNonceLength
-        */
-        virtual void NonceL( TDes8& aNonce ) const = 0;
-        
-        /**
-        * Return Keyinfo list array which are defined in HDCKeyInfo.h
-        * @param aList Keyinfo list. 0..N keyinfos. See typedefinitions.
-        */
-        virtual void HdcKeyInfos( HdcKeyInfoList& aList) = 0;
-        
-        /**
-        * Get a list of trusted domains which PAOS can use to determine valid domains.
-        * @param aList See typedefinitions.
-        **/
-        virtual void TrustedDomainsL( HdcTrustedDomainList& aList ) = 0;    
-    };
-
-#endif // HDC_TO_PAOS_INTERFACE_H
--- a/pnpmobileservices/pnpms/PnpPaosFilter/src/PnpPaosFilter.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,817 +0,0 @@
-/*
-* Copyright (c) 2005-2006 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:  PnP Paos filter implementation
-*
-*/
-
-
-#include <e32std.h>
-#include <http.h>
-#include <apgcli.h>             // for RApaLsSession
-#include <apacmdln.h>           // for CApaCommandLine
-#include <centralrepository.h>  // link against centralrepository.lib
-
-#include "PnpPaosFilter.h"
-#include "PnpPaosLogger.h"
-#include "PnpPaosXml.h"
-#include "PnpPaosFilterPrivateCRKeys.h"
-
-
-
-_LIT8( KPaosContentType, "application/vnd.paos+xml" );
-_LIT8( KPnpPaosFilterName, "PnpPaosFilter" );
-_LIT8( KPaosHeaderName, "PAOS" );
-_LIT8( KPaosHeader, "ver=\"urn:liberty:paos:2003-08\"; urn:\"http://pnpms.nokia.com/signkey\"" );
-_LIT8( KDummyResponse, "<!-- Dummy -->" );
-_LIT8( KHttp, "http://" );
-_LIT8( KHttps, "https://" );
-
-CEComFilter* CPnpPaosFilter::InstantiateL( TAny* aSession )
-    {
-    LOGSTRING("CPnpPaosFilter::InstantiateL()");
-    // Cast TAny to RHTTPSession
-    RHTTPSession* pSession = static_cast<RHTTPSession*>(aSession);
-    CPnpPaosFilter* filter = CPnpPaosFilter::NewL( pSession );
-    LOGSTRING("CPnpPaosFilter::InstantiateL() - done");
-    return filter;
-    }
-
-CPnpPaosFilter* CPnpPaosFilter::NewL( RHTTPSession* pSession )
-    {
-    LOGSTRING("CPnpPaosFilter::NewL()");
-    CPnpPaosFilter* pNew = new (ELeave) CPnpPaosFilter( pSession);
-    CleanupStack::PushL(pNew);
-    pNew->ConstructL();
-    CleanupStack::Pop();
-    LOGSTRING("CPnpPaosFilter::NewL() - done");
-    return pNew;
-    }
-
-CPnpPaosFilter::CPnpPaosFilter( RHTTPSession* pSession ) :
-    iTransactionId(-1),
-    iSession( pSession ),
-    iMakePaosResponse( EFalse )
-#ifndef __SERIES60_ 
-    ,iHdcPaosPostDone( EFalse )
-#endif
-    {
-    LOGSTRING("constructor CPnpPaosFilter()");
-    }
-
-void CPnpPaosFilter::ReadAllowedDomainsL()
-    {
-    LOGSTRING("CPnpPaosFilter::ReadAllowedDomainsL()");
-    RLibrary library;
-    const TUidType hdcuid( KNullUid, KNullUid, KHdcUtilDllUid );
-    TInt result = library.Load( KHdcDllFileName, hdcuid );
-    LOGSTRING2( "Hdc Library load result: %i", result );
-    // If there is no HDC installed, cannot add allowed HDC domains
-    if( result == KErrNone )
-        {
-        CleanupClosePushL( library );
-        LOGSTRING("CPnpPaosFilter::ReadAllowedDomainsL() 2");
-        // Function at ordinal 1 is NewLC
-        TLibraryFunction entry = library.Lookup(1);
-        // Call the function to create new hdc dll object
-        LOGSTRING("CPnpPaosFilter::ReadAllowedDomainsL() 3");
-        CHdcToPaosInterface* hdcUtil = ( CHdcToPaosInterface* ) entry();
-        hdcUtil->TrustedDomainsL( iTrustedHdcDomains );
-        LOGSTRING("CPnpPaosFilter::ReadAllowedDomainsL() 4");
-        CleanupStack::PopAndDestroy( hdcUtil );
-        CleanupStack::PopAndDestroy(); // library.Close()
-        LOGSTRING("CPnpPaosFilter::ReadAllowedDomainsL() 5");
-        }
-
-    // PnP trusted domains could be handled as in HDC case, by maintaining
-    // a list of trusted domains as browser bookmarks (changeable only 
-    // in a Device Managament session, not by the user)
-    //AllowedDomainsArray pnpDomains = pnpUtil->AllowedDomainsL();
-    LOGSTRING("CPnpPaosFilter::ReadAllowedDomainsL() - done");
-    }
-    
-void CPnpPaosFilter::ReadAllowedPnpDomainsL()
-    {
-    LOGSTRING("CPnpPaosFilter::ReadAllowedPnpDomainsL()");
-    // Create PnP-MS home domain filter
-    // Read allowed pnp domains from cenrep
-    CRepository* repository = CRepository::NewLC( KCRUidPnpPaosFilter );
-    
-    TBuf<KMaxURLLength> buffer;
-    TUint32 domainNbr;
-    TrustedDomain domain;
-    for (domainNbr = KPnPPaosFilterHomeDomain1; domainNbr <= KPnPPaosFilterHomeDomainLast; domainNbr++)
-        {
-        User::LeaveIfError( repository->Get( domainNbr, buffer ) );
-        if(buffer.Length() > 0)
-            {
-            domain.Copy( buffer );
-            iTrustedPnpDomains.Append( domain );
-            }
-        }
-    CleanupStack::PopAndDestroy( repository );
-    LOGSTRING("CPnpPaosFilter::ReadAllowedPnpDomainsL() - done");
-    }
-
-void CPnpPaosFilter::ConstructL()
-    {
-    LOGSTRING("CPnpPaosFilter::ConstructL()");
-
-    iSessionStringPool = iSession->StringPool();
-    iFilterName = iSessionStringPool.OpenFStringL( KPnpPaosFilterName );
-    TInt err( KErrNone );
-    TRAP( err, iPnpPaosXml = CPnpPaosXml::NewL() );
-    LOGSTRING2( "iPnpPaosXml err: %i", err );
-
-    TRAP( err, ReadAllowedDomainsL() );
-    if( err != KErrNone )
-        {
-        LOGSTRING2( "Could not read allowed domains for HelpDeskConnect PAOS: %i", err );
-        }
-        
-    TRAP( err, ReadAllowedPnpDomainsL() );
-    if( err != KErrNone )
-        {
-        LOGSTRING2( "Could not read allowed domains for PnP PAOS: %i", err );
-        }
-
-
-    LOGSTRING("CPnpPaosFilter::ConstructL() add filters");
-
-    // Add the filter to the queue and register for selected incoming and
-    // outgoing events.
-    iSession->FilterCollection().AddFilterL(
-        *this,
-        THTTPEvent::ESubmit,              // Transaction event
-        RStringF(),                       // Any header field
-        KAnyStatusCode,                   // HTTP status code
-        MHTTPFilter::EClientFilters,      // Position in filter chain
-        //MHTTPFilter::EProtocolHandler,      // Position in filter chain
-        iFilterName );                    // Filter name
-
-    iSession->FilterCollection().AddFilterL(
-        *this,
-        THTTPEvent::EGotResponseHeaders,
-        RStringF(),
-        200,
-        MHTTPFilter::EClientFilters,      // Position in filter chain
-        //MHTTPFilter::EProtocolHandler,      // Position in filter chain
-        iFilterName );
-
-    iSession->FilterCollection().AddFilterL(
-        *this,
-        THTTPEvent::EGotResponseBodyData,
-        RStringF(),
-        200,
-        MHTTPFilter::EClientFilters,      // Position in filter chain
-        //MHTTPFilter::EProtocolHandler,      // Position in filter chain
-        iFilterName );
-
-    iSession->FilterCollection().AddFilterL(
-        *this,
-        THTTPEvent::EResponseComplete,
-        RStringF(),
-        200,
-        MHTTPFilter::EClientFilters,      // Position in filter chain
-        //MHTTPFilter::EProtocolHandler,      // Position in filter chain
-        iFilterName );
-
-    LOGSTRING("CPnpPaosFilter::ConstructL() - done");
-    }
-
-CPnpPaosFilter::~CPnpPaosFilter()
-    {
-    LOGSTRING("CPnpPaosFilter::~CPnpPaosFilter()");
-
-    if( iLoadCount )
-        {
-        // As we're already in a destructor, MHFUnload must not delete us again
-        iLoadCount = -1;
-        if (iSession)
-            {
-            // Removes all registrations of this filter:
-            iSession->FilterCollection().RemoveFilter( iFilterName );
-            }
-        }
-    iFilterName.Close();
-    iTrustedPnpDomains.Close();
-
-    delete iPaosPostUrl;
-    delete iPnpPaosXml;
-
-    // RArray must be closed before destructing
-    iTrustedHdcDomains.Close();
-
-    // we do not own iSessionStringPool, we do not close it.
-    // we do not own iSession
-
-    LOGSTRING("CPnpPaosFilter::~CPnpPaosFilter() - done");
-    }
-
-void CPnpPaosFilter::HostFromUriL( CUri8* aUri )
-    {
-    LOGSTRING( "Original URI:" );
-    LOGTEXT( aUri->Uri().UriDes() );
-
-    /** The userinfo component specifier */
-    aUri->RemoveComponentL( EUriUserinfo );
-    LOGTEXT( aUri->Uri().UriDes() );
-    /** The path component specifier */
-    aUri->RemoveComponentL( EUriPath );
-    LOGTEXT( aUri->Uri().UriDes() );
-    /** The query component specifier */
-    aUri->RemoveComponentL( EUriQuery );
-    LOGTEXT( aUri->Uri().UriDes() );
-    /** The fragment component specifier */
-    aUri->RemoveComponentL( EUriFragment );
-    LOGTEXT( aUri->Uri().UriDes() );
-
-    // Only EUriHost (The host component specifier) and
-    // EUriPort (The port component specifier) are left
-    }
-
-void CPnpPaosFilter::MHFRunL( RHTTPTransaction aTransaction,
-                             const THTTPEvent& aEvent)
-    {
-    LOGSTRING3( "CPnpPaosFilter::MHFRunL( TxnId: %d, event: %d )", aTransaction.Id(), aEvent.iStatus );
-    switch( aEvent.iStatus )
-        {
-        case THTTPEvent::ESubmit:
-            {
-            LOGSTRING( "CPnpPaosFilter::MHFRunL:ESubmit");
-
-            // Generate as little overhead as possible:
-
-            // If this is the case maybe PAOS requests should be allowed only from certain URLs...
-            // Now only nokia.com or help-portal.com are allowed URLs
-            CUri8* uri = CUri8::NewLC( aTransaction.Request().URI() );
-            HostFromUriL( uri );
-            TPtrC8 host = uri->Uri().UriDes();
-
-            // Check if a PAOS query is allowed from the domain
-            
-            if( IsPaosHomeDomainL( host ) )
-                {
-                LOGSTRING("PnP Mobile Services Allows PAOS-requests from the domain");
-                RHTTPHeaders headers = aTransaction.Request().GetHeaderCollection();
-                AddPaosHeadersL( headers );
-                // From HTTP stack documentation:
-                // It's important to note that a filter object is per-session, and so might be shared by several 
-                // transactions. This means that if you have per-transaction state that you need to store, it 
-                // must be stored in the transaction's property set. DO NOT STORE ANY PER-TRANSACTION INFORMATION 
-                // IN THE FILTER OBJECT. 
-
-                iMakePaosResponse = ETrue;
-                }
-            else
-                {		    				
-                if( host.Size() <= 255) 	   
-                    { 
-                    if( iTrustedHdcDomains.Find( host ) != KErrNotFound )
-                        {
-                        LOGSTRING("HelpDeskConnect Allows PAOS-requests from the domain");
-                        RHTTPHeaders headers = aTransaction.Request().GetHeaderCollection();
-                        AddPaosHeadersL( headers );
-                        iMakePaosResponse = ETrue;
-                        }
-                    else
-                        {
-                        iMakePaosResponse = EFalse;
-                        }
-                    }
-                } 
-            CleanupStack::PopAndDestroy( uri );
-            break;
-            }
-        case THTTPEvent::EGotResponseHeaders:
-            {
-            LOGSTRING( "CPnpPaosFilter::MHFRunL:EGotResponseHeaders" );
-
-            if( !iMakePaosResponse ) break;
-
-            RHTTPHeaders headers = aTransaction.Response().GetHeaderCollection();
-            if( IsPaosContentTypeL( headers ) )
-                {
-                iTransactionId = aTransaction.Id();
-
-                delete iPaosPostUrl;
-                iPaosPostUrl = 0;
-                iPaosPostUrl = CUri8::NewL( aTransaction.Request().URI() );
-                HostFromUriL( iPaosPostUrl );
-                }
-            else
-                {
-                iMakePaosResponse = EFalse;
-                }
-            break;
-            }
-        case THTTPEvent::EGotResponseBodyData:
-            {
-            LOGSTRING( "CPnpPaosFilter::MHFRunL:EGotResponseBodyData" );
-
-            // Check if we are allowed to make a PAOS response
-            if( iMakePaosResponse && aTransaction.Id() == iTransactionId )
-                {
-                if( !iPnpPaosXml ) 
-                    {
-                    User::Leave( KErrGeneral );
-                    }
-                TBool lastPart( EFalse );
-                // Received another body data chunk
-                MHTTPDataSupplier* pBody = aTransaction.Response().Body();
-                if( pBody )
-                    {
-                    lastPart = iPnpPaosXml->CollectResponseBodyL( *pBody );
-                    }
-
-                // check if more data is expected
-                if( lastPart )
-                    {
-                    PostPaosResponseL( aTransaction );
-                    }
-                }
-#ifndef __SERIES60_ 
-            // check if expecting a HDC trigger file
-            else if( iHdcPaosPostDone )
-                {
-                // Received another body data chunk
-                MHTTPDataSupplier* pBody = aTransaction.Response().Body();
-                if( pBody )
-                    {
-                    iPnpPaosXml->CollectResponseBodyL( *pBody );
-                    }
-                }
-#endif
-            break;
-            }
-        case THTTPEvent::EResponseComplete:
-            {
-            LOGSTRING( "CPnpPaosFilter::MHFRunL:EResponseComplete" );
-
-#ifndef __SERIES60_ 
-            // if( contenttype == trigger )
-            if( iHdcPaosPostDone )
-                {
-                HandleHdcTriggerL();
-                aTransaction.Cancel( THTTPFilterHandle::ECurrentFilter );
-                }
-#endif
-            break;
-            }
-        default:
-            {
-            // We ignore other events. We shouldn't receive other events though.
-            break;
-            }
-        }
-    LOGSTRING( "CPnpPaosFilter::MHFRunL - done" );
-    }
-
-
-void CPnpPaosFilter::PostPaosResponseL( RHTTPTransaction& aTransaction )
-    {
-    // For some mysterious reason the http transaction has to be cancelled here (EGotResponseBodyData),
-    // otherwise browser will have the PAOS request concatenated with the resulting
-    // html page (or at least the resulting html page shows an extra text "setOfKeys"
-    // so it seems to concatenate at least part of the PAOS request)
-
-    // Since transaction is cancelled in EGotResponseBodyData event, there is no
-    // point in listening for EResponseComplete event anymore
-
-    CPnpPaosXml::TPaosStates status( CPnpPaosXml::EPaosStatusUnknown );
-
-    TRAPD( err, iPnpPaosXml->ParseL( status ) );
-    if( err == KErrNone )
-        {
-        iMakePaosResponse = EFalse;
-        iTransactionId = -1;
-        LOGSTRING( "PAOS post URL:" );
-        /*
-        "responseConsumerURL attribute, with a URL as its value.This URL SHOULD be relative to the URL that
-        was requested by the user agent (in the HTTP request that resulted in the creation of the SOAP message). If the
-        URL nevertheless is absolute it MUST have http or https as the protocol and SHOULD have a domain that is
-        owned by the same party as the owner of the domain in the URL of the HTTP request."
-        [Liberty Reverse HTTP binding for SOAP Specification]
-        */
-        const TDesC8& paosPostUrl = iPnpPaosXml->GetPaosPostUrlL();
-        if( paosPostUrl.Find( KHttp ) != KErrNotFound || paosPostUrl.Find( KHttps ) != KErrNotFound )
-            {
-            LOGSTRING( "Absolute URL" );
-            delete iPaosPostUrl;
-            iPaosPostUrl = 0;
-            TUriParser8 uriParser;
-            User::LeaveIfError( uriParser.Parse( paosPostUrl ) );
-            iPaosPostUrl = CUri8::NewL( uriParser );
-            }
-        else
-            {
-            LOGSTRING( "Relative URL" );
-            iPaosPostUrl->SetComponentL( paosPostUrl, EUriPath );
-            }
-        LOGTEXT( iPaosPostUrl->Uri().UriDes() );
-
-        switch( status )
-            {
-        case CPnpPaosXml::EPaosStatusUnknown:
-            LOGSTRING( "EPaosStatusUnknown" );
-            // Do nothing, was: User::Leave( KErrArgument );
-            break;
-        case CPnpPaosXml::EPaosStatusRequestingPnPKeys:
-            {
-            LOGSTRING( "EPaosStatusRequestingPnPKeys" );
-            CUri8* uri = CUri8::NewLC( aTransaction.Request().URI() );
-            HostFromUriL( uri );
-            // Also remove scheme
-            uri->RemoveComponentL( EUriScheme );
-            LOGTEXT( uri->Uri().UriDes() );
-
-            TPtrC8 host = uri->Uri().UriDes();
-            // check the domain was an allowed domain of PnP-MS home domain filter
-            if( IsPaosHomeDomainL( host ) )
-                {
-                PaosPostL( aTransaction );
-                }
-            CleanupStack::PopAndDestroy( uri );
-            break;
-            }
-        case CPnpPaosXml::EPaosStatusRequestingHdcKeys:
-            {
-            LOGSTRING( "EPaosStatusRequestingHdcKeys" );
-            CUri8* uri = CUri8::NewLC( aTransaction.Request().URI() );
-            HostFromUriL( uri );
-            TPtrC8 host = uri->Uri().UriDes();
-            
-            TBool isTrusted( EFalse );
-            for( TInt i(0); i < iTrustedHdcDomains.Count(); i++ )
-                {
-                HdcTrustedDomain trustedDomain = iTrustedHdcDomains[i];
-                if( host.Find( trustedDomain ) != KErrNotFound )
-                    isTrusted = ETrue;
-                }
-            // check the domain was an allowed domain of HDC home domain filter
-            if( isTrusted )
-                {
-                PaosPostL( aTransaction );
-#ifndef __SERIES60_ 
-                iHdcPaosPostDone = ETrue;
-#endif
-                }
-#ifdef _DEBUG
-            else
-                {
-                LOGSTRING("Not an allowed domain!");
-                LOGTEXT( host );
-                LOGSTRING("domains:");
-                for( TInt j(0); j < iTrustedHdcDomains.Count(); j++ )
-                    {
-                    LOGTEXT( iTrustedHdcDomains[j] );
-                    }
-                }
-#endif
-            CleanupStack::PopAndDestroy( uri );
-            break;
-            }
-        default:
-            {
-            // We ignore other events. We shouldn't receive other events though.
-            break;
-            }
-            }
-        }
-    else
-        {
-        LOGSTRING2( "Error in ParseL: %i", err );
-        }
-
-    LOGSTRING("iPnpPaosXml->ResetPaosRequest()");
-    iPnpPaosXml->ResetPaosRequest();
-    }
-
-#ifndef __SERIES60_ 
-void CPnpPaosFilter::HandleHdcTriggerL()
-    {
-    LOGSTRING("Create file");
-    iHdcPaosPostDone = EFalse;
-
-    _LIT( KTempDocumentName, "C:\\Temp\\trigger.trg" );
-
-    RFs rfs;
-    User::LeaveIfError( rfs.Connect() );
-    CleanupClosePushL( rfs );
-    TInt err = rfs.MkDir( KTempDocumentName );
-    // The folder may already exist, do not leave in that case
-    if( err != KErrNone && err != KErrAlreadyExists )
-        {
-        User::Leave( err ); 
-        }
-
-    RFile file;
-    User::LeaveIfError( file.Replace( rfs, KTempDocumentName, EFileWrite ) );
-    CleanupClosePushL( file );
-    LOGSTRING("File created");
-    // A HDC PAOS post was made and we expect the response to be a HDC trigger file
-    const TPtrC8 hdcTriggerData = iPnpPaosXml->ResponseBodyL();
-    file.Write( hdcTriggerData );
-    LOGSTRING("File written");
-    iPnpPaosXml->ResetPaosRequest();
-
-    CleanupStack::PopAndDestroy(); // rfs
-    CleanupStack::PopAndDestroy(); // file
-
-    LOGSTRING("Starting app");
-    RApaLsSession appArcSession;
-    User::LeaveIfError( appArcSession.Connect() );
-    CleanupClosePushL( appArcSession );
-
-    CApaCommandLine* cmdLine = CApaCommandLine::NewLC();
-    TApaAppInfo info;
-    const TUid KHdcUid = { 0x1020433F };
-    User::LeaveIfError( appArcSession.GetAppInfo( info, KHdcUid ) );
-#ifdef RD_APPS_TO_EXES
-    cmdLine->SetExecutableNameL( info.iFullName );
-#else
-    cmdLine->SetLibraryNameL( info.iFullName );
-#endif
-    cmdLine->SetCommandL( EApaCommandOpen );
-    cmdLine->SetDocumentNameL( KTempDocumentName );
-    err = appArcSession.StartApp( *cmdLine );
-    if( err != KErrNone )
-        {
-        LOGSTRING2( "StartApp err %i", err );
-        User::Leave( err );
-        }
-    LOGSTRING("Cancel transaction");
-    CleanupStack::PopAndDestroy( cmdLine );
-    CleanupStack::PopAndDestroy(); // appArcSession
-    LOGSTRING("done");
-    }
-#endif 
-
-
-TBool CPnpPaosFilter::GetNextDataPart( TPtrC8& aDataPart )
-    {
-    LOGSTRING("CPnpPaosFilter::GetNextDataPart");
-    aDataPart.Set( KDummyResponse );
-    return ETrue;
-    }
-
-void CPnpPaosFilter::ReleaseData()
-    {
-    LOGSTRING("CPnpPaosFilter::ReleaseData");
-    }
-
-TInt CPnpPaosFilter::OverallDataSize()
-    {
-    LOGSTRING("CPnpPaosFilter::OverallDataSize");
-    return KDummyResponse().Length();
-    }
-
-TInt CPnpPaosFilter::Reset()
-    {
-    LOGSTRING("CPnpPaosFilter::Reset");
-    return KErrNone;
-    }
-
-void CPnpPaosFilter::AddPaosHeadersL( RHTTPHeaders& requestHeaders )
-    {
-    LOGSTRING( "CPnpPaosFilter::AddPaosHeadersL" );
-
-    // Add PAOS header
-    THTTPHdrVal paosVer;
-    RStringF paosVerStr = iSessionStringPool.OpenFStringL( KPaosHeader );
-    CleanupClosePushL( paosVerStr );
-    paosVer.SetStrF( paosVerStr );
-    RStringF paosStr = iSessionStringPool.OpenFStringL( KPaosHeaderName );
-    CleanupClosePushL( paosStr );
-    requestHeaders.SetFieldL( paosStr, paosVerStr );
-    CleanupStack::PopAndDestroy(); // paosStr.Close()
-    CleanupStack::PopAndDestroy(); // paosVerStr.Close()
-
-    // Add PAOS content type to accept header
-    THTTPHdrVal acceptHdr;
-    requestHeaders.GetField(
-        iSessionStringPool.StringF( HTTP::EAccept, RHTTPSession::GetTable() ), 0, acceptHdr );
-
-    if (acceptHdr.Type() == 0x04) //Worst case scenario, if transaction does not have accept header.
-    {
-        RStringF valStr = iSessionStringPool.OpenFStringL(_L8("*/*"));
-   		THTTPHdrVal val(valStr);
-    	requestHeaders.SetFieldL(iSessionStringPool.StringF(HTTP::EAccept, RHTTPSession::GetTable() ), val);
-    	valStr.Close();
-   	    requestHeaders.GetField(
- 	       iSessionStringPool.StringF( HTTP::EAccept, RHTTPSession::GetTable() ), 0, acceptHdr );
-
-    }
-
-
-    RStringF acceptStr = acceptHdr.StrF();
-    TPtrC8 accept = acceptStr.DesC();
-    if( accept.Find( KPaosContentType ) == KErrNotFound )
-        {
-        HBufC8* acceptBuf = HBufC8::NewLC( KPaosContentType().Length() );
-        TPtr8 acceptBufPtr = acceptBuf->Des();
-        acceptBufPtr.Append( KPaosContentType );
-        SetHttpHeaderL( requestHeaders, HTTP::EAccept, *acceptBuf );
-
-#ifdef LOGGING_ENABLED
-        LOGSTRING( "Accept header:" );
-            for( TInt i(0); i < acceptBufPtr.Length(); i += 128 )
-                {
-                TPtrC8 logText = acceptBufPtr.Right( acceptBufPtr.Length() - i );
-                LOGTEXT( logText );
-                }
-#endif
-        CleanupStack::PopAndDestroy( acceptBuf );
-        }
-#ifdef LOGGING_ENABLED
-    else
-        {
-        LOGSTRING( "Accept header already includes PAOS:" );
-        for( TInt i(0); i < accept.Length(); i += 128 )
-            {
-            TPtrC8 logText = accept.Right( accept.Length() - i );
-            LOGTEXT( logText );
-            }
-        }
-#endif
-
-    LOGSTRING( "CPnpPaosFilter::AddPaosHeadersL - done" );
-    }
-
-TBool CPnpPaosFilter::IsPaosContentTypeL( RHTTPHeaders& aHeaders )
-    {
-    LOGSTRING( "CPnpPaosFilter::IsPaosContentTypeL" );
-
-    // get the Content-Type string
-    RStringF content = iSessionStringPool.StringF( HTTP::EContentType,
-                                            RHTTPSession::GetTable() );
-
-    THTTPHdrVal fieldVal;
-    // now retrieve the Content-Type field
-    if( KErrNone == aHeaders.GetField( content, 0, fieldVal ) )
-        {
-        TPtrC8 contentType;
-        // get the field value
-        if( THTTPHdrVal::KStrFVal == fieldVal.Type() )
-            {
-            contentType.Set( fieldVal.StrF().DesC() );
-            LOGSTRING( "ContentType:" );
-            LOGTEXT( contentType );
-            }
-        else if( THTTPHdrVal::KStrVal == fieldVal.Type() )
-            {
-            contentType.Set( fieldVal.Str().DesC() );
-            LOGSTRING( "ContentType:" );
-            LOGTEXT( contentType );
-            }
-        else
-            {
-            return EFalse;
-            }
-
-        if( contentType.Compare( KPaosContentType ) == 0 )
-            {
-            LOGSTRING("Content type matches");
-
-            // 3.0 does not handle the resulting html right, it is stored by DL manager.
-            // This means that it does not recognize the incoming text/html data correctly.
-            // So try replacing content type field with text/html, maybe PAOS content type is
-            // cached somewhere even if the transaction has been canceled.
-            LOGSTRING("Resetting Content type to text/html");
-            aHeaders.RemoveField( iSessionStringPool.StringF( HTTP::EContentType , RHTTPSession::GetTable() ) );
-            SetHttpHeaderL( aHeaders, HTTP::EContentType, _L8("text/html") );
-
-            return ETrue;
-            }
-        }
-    return EFalse;
-    }
-
-void CPnpPaosFilter::PaosPostL( RHTTPTransaction& aTransaction )
-    {
-    LOGSTRING( "CPnpPaosFilter::PaosPostL" );
-
-    RHTTPRequest request = aTransaction.Request();
-
-    aTransaction.Cancel( THTTPFilterHandle::ECurrentFilter );
-    RHTTPHeaders requestHeaders = request.GetHeaderCollection();
-    request.RemoveBody();
-    // Remove Content-Type header
-    requestHeaders.RemoveField( iSessionStringPool.StringF( HTTP::EContentType, RHTTPSession::GetTable() ) );
-    // Remove Content-Length header
-    requestHeaders.RemoveField( iSessionStringPool.StringF( HTTP::EContentLength, RHTTPSession::GetTable() ) );
-    // Remove Host header
-    requestHeaders.RemoveField( iSessionStringPool.StringF( HTTP::EHost, RHTTPSession::GetTable() ) );
-
-    // PAOS header
-    THTTPHdrVal paosVer;
-    RStringF paosVerStr = iSessionStringPool.OpenFStringL( KPaosHeader );
-    CleanupClosePushL( paosVerStr );
-    paosVer.SetStrF( paosVerStr );
-    RStringF paosStr = iSessionStringPool.OpenFStringL( KPaosHeaderName );
-    CleanupClosePushL( paosStr );
-    requestHeaders.SetFieldL( paosStr, paosVerStr );
-    CleanupStack::PopAndDestroy(); // paosStr
-    CleanupStack::PopAndDestroy(); // paosVerStr
-
-    // Content headers
-    SetHttpHeaderL( requestHeaders, HTTP::EContentType, _L8("application/vnd.paos+xml") );
-
-    request.SetMethod( iSessionStringPool.StringF( HTTP::EPOST, RHTTPSession::GetTable() ) );
-
-    // Set the URI of the request
-    request.SetURIL( iPaosPostUrl->Uri() );
-
-    LOGSTRING( "Uri:" );
-    LOGTEXT( iPaosPostUrl->Uri().UriDes() );
-
-    // Provide Response
-    if( !iPnpPaosXml )
-        {
-        User::Leave( KErrGeneral );
-        }
-    request.SetBody( *iPnpPaosXml );
-
-    aTransaction.Cancel();
-    aTransaction.SubmitL();
-    LOGSTRING( "CPnpPaosFilter::PaosPostL - done" );
-    }
-
-void CPnpPaosFilter::SetHttpHeaderL( RHTTPHeaders& aMessage, const HTTP::TStrings aIndex, const TDesC8& aString )
-    {
-    LOGSTRING( "CPnpPaosFilter::SetHttpHeaderL" );
-    
-    THTTPHdrVal hdrVal;
-    RStringF str = iSessionStringPool.OpenFStringL( aString );
-    CleanupClosePushL( str );
-    hdrVal.SetStrF( str );
-    aMessage.SetFieldL( iSessionStringPool.StringF( aIndex, RHTTPSession::GetTable() ), hdrVal );
-    CleanupStack::PopAndDestroy();
-    
-    LOGSTRING( "CPnpPaosFilter::SetHttpHeaderL - done" );
-    }
-
-TInt CPnpPaosFilter::MHFRunError( TInt aError,
-                                 RHTTPTransaction aTransaction,
-                                 const THTTPEvent& aEvent )
-    {
-    LOGSTRING( "CPnpPaosFilter::MHFRunError()" );
-
-    LOGSTRING3( "error: %d, event: %d", aError, aEvent.iStatus );
-    // If anything left, we've run out of memory or something
-    // similarly catastrophic has gone wrong.
-    // Remove the body to prevent other client from accessing
-    // the contents.
-    aTransaction.Response().RemoveBody();
-    // Set the transaction to failed
-    aTransaction.Fail();
-    // Keep compiler happy
-    (void)aError;
-    (void)aEvent;
-    LOGSTRING( "CPnpPaosFilter::MHFRunError() - done" );
-    return KErrNone;
-    }
-
-void CPnpPaosFilter::MHFLoad(RHTTPSession /*aSession*/,
-                                         THTTPFilterHandle /*aHandle*/)
-    {
-    LOGSTRING("CPnpPaosFilter::MHFLoad");
-    iLoadCount++;
-    }
-
-void CPnpPaosFilter::MHFUnload(RHTTPSession /*aSession*/,
-                                           THTTPFilterHandle /*aHandle*/)
-    {
-    LOGSTRING("CPnpPaosFilter::MHFUnload");
-    if( --iLoadCount > 0 )
-        {
-        LOGSTRING("CPnpPaosFilter::MHFUnload - done");
-        return;
-        }
-    delete this; // Delete object itself
-    LOGSTRING("CPnpPaosFilter::MHFUnload - done");
-    }
-
-TBool CPnpPaosFilter::IsPaosHomeDomainL( const TPtrC8 aHost )
-    {
-    LOGSTRING("CPnpPaosFilter::IsPaosHomeDomainL");
-    // check is the host in trusted domains list
-    for (TInt i=0; i < iTrustedPnpDomains.Count(); i++)
-        {
-        if (aHost.Find(iTrustedPnpDomains[i]) != KErrNotFound )
-            {
-            return ETrue;
-            }
-        }
-    return EFalse;
-    }
--- a/pnpmobileservices/pnpms/PnpPaosFilter/src/PnpPaosFilter.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,239 +0,0 @@
-/*
-* Copyright (c) 2005-2006 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:  PnP Paos filter definitions
-*
-*/
-
-
-
-#ifndef WSPAOSFILTER_H
-#define WSPAOSFILTER_H
-
-
-#include <flogger.h>
-//#include <RXMLReader.h>
-#include <http/mhttpfilter.h>
-#include <http/cecomfilter.h>
-#include <http/mhttptransactioncallback.h>
-#include <httpstringconstants.h>
-#include <http/mhttpdatasupplier.h>    // for MHTTPDataSupplier
-//#include <HDCUtil.h>                // for HdcTrustedDomainList
-#include "HdcToPaosInterface.h"                // for HdcTrustedDomainList
-
-//const TInt KMaxURLLength(255);
-typedef TBuf8<KMaxURLLength> TrustedDomain;
-typedef RArray<TrustedDomain> PaosTrustedDomainList;
-
-class CEComFilter;
-class CPnpPaosXml;
-
-/**
-PnP Mobile Services PAOS filter class. Adds PAOS content type to the outgoing
-http GET requests. Catches incoming PAOS requests and responds (with HTTP SOAP 
-posts) giving the parameters the server asked for. Only accepts PAOS requests
-from certain URLs (for example help-portal.com, nokia.com).
-
-Message exchange pattern:
-1. HTTP GET (by the client)
-   * includes PAOS headers
-2. HTTP 200 (server responds by making a PAOS reques)
-   * Content type: application/vnd.paos+xml
-   * SOAP envelope
-3. HTTP POST
-   * Content type: application/vnd.paos+xml
-4. HTTP 200
-
-@see Liberty Reverse HTTP binding for SOAP specification 1.1
-*/
-
-class CPnpPaosFilter :
-    public CEComFilter, 
-    public MHTTPFilter,
-    public MHTTPDataSupplier
-    /* public MHTTPTransactionCallback, to close a transaction
-     * and open a new transaction 
-     */
-    {
-public:
-    /**
-     * This method creates an instance of the filter and
-     * installs it to the HTTP session's filter queue.
-     * This method is called by the ECOM framework.
-     *
-     * @param  aSession a handle to the http session.
-     * @return pointer to the newly installed filter.
-     */
-    static CEComFilter* InstantiateL( TAny* aSession );
-
-    static CPnpPaosFilter* NewL( RHTTPSession* pSession );
-    virtual ~CPnpPaosFilter();
-
-public: // from MHTTPDataSupplier
-
-    TBool GetNextDataPart( TPtrC8& aDataPart );
-    void ReleaseData();
-    TInt OverallDataSize();
-    TInt Reset();
-
-public:
-
-    /**
-     * From MHTTPFilterBase::MHFRunL.
-     * Called when the filter's registration conditions are satisfied
-     * for events that occur on a transaction.
-     * Leaves with KErrNotSupported if making a PAOS request from
-     * an untrusted domain. (other but nokia.com and help-portal.com)
-     * , KErrArgument if PAOS request could not be parsed.
-     *
-     * @param aTransaction The transaction that the event has occurred on
-     * @param aEvent The event that has occurred
-     */
-    virtual void MHFRunL( RHTTPTransaction aTransaction,
-        const THTTPEvent& aEvent);
-
-    /**
-     * From MHTTPFilterBase::MHFRunError.
-     * Called when RunL leaves from a transaction event.
-     *
-     * @param aError The leave code that RunL left with
-     * @param aTransaction The transaction that was being processed
-     * @param aEvent The Event that was being processed
-     * @return KErrNone if the error has been cancelled or the code
-     *         of the continuing error otherwise
-     */
-    virtual TInt MHFRunError( TInt aError,
-                              RHTTPTransaction aTransaction,
-                              const THTTPEvent& aEvent);
-    
-    
-    /**
-     * From MHTTPFilter::MHFUnload.
-     * Called when the filter is being removed from a session's
-     * filter queue.
-     *
-     * @param aSession The session it's being removed from
-     * @param aHandle The filter handle. Complex filters may need to
-     *        refer to this to keep track of which particular registration
-     *        is being unloaded
-     */
-    virtual void MHFUnload( RHTTPSession aSession, THTTPFilterHandle aHandle);
-
-    /**
-     * From MHTTPFilter::MHFLoad.
-     * Called when the filter is being added to the session's
-     * filter queue.
-     *
-     * @param aSession The session it's being added to
-     * @param aHandle The filter handle. Complex filters may need to keep
-     *        track of this, for instance if generating events in
-     *        response to external stimuli.
-     */
-    virtual void MHFLoad( RHTTPSession aSession, THTTPFilterHandle aHandle );
-
-private:
-    CPnpPaosFilter( RHTTPSession* pSession );
-    void ConstructL();
-
-private:
-    /**
-    Read allowed domains into iTrustedHdcDomains
-    */
-    void ReadAllowedDomainsL();
-    
-    /**
-    Read allowed domains into iTrustedPnpDomains
-    */
-    void ReadAllowedPnpDomainsL();
-
-    /**
-    Add PAOS header and paos content type to accept header.
-    */
-    void AddPaosHeadersL( RHTTPHeaders& requestHeaders );
-
-    /**
-    Append the received data chunk to an internal buffer
-    */
-    void CollectResponseBodyL( MHTTPDataSupplier& aBody );
-
-    /**
-    Removes components EUriUserinfo, EUriPath, EUriQuery and EUriFragment
-    from the uri. Only EUriScheme, EUriHost and EUriPort are left.
-    */
-    void HostFromUriL( CUri8* aUri );
-
-    /**
-    Check whether the content type of http headers match to the PAOS content
-    type.
-    */
-    TBool IsPaosContentTypeL( RHTTPHeaders& aHeaders );
-
-    /**
-    Read PAOS request from iPnpPaosXml, construct a PAOS response and
-    post it using PaosPostL.
-    */
-    void PostPaosResponseL( RHTTPTransaction& aTransaction );
-
-    /**
-    Cancels the current transaction and makes 
-    a HTTP Post with iPaosResponse as a body.
-    */
-    void PaosPostL( RHTTPTransaction& aTransaction );
-
-    /**
-    Save HDC trigger response to a file and open it with HelpDeskConnect client
-    */
-    void HandleHdcTriggerL();
-
-    /**
-    Add/Replace a header in RHTTPHeaders
-    */
-    void SetHttpHeaderL( RHTTPHeaders& aMessage, const HTTP::TStrings aIndex,
-        const TDesC8& aString );
-
-    TBool IsPaosHomeDomainL( const TPtrC8 aHost );
-
-private:
-    /** A counter for tracking filter usage. */
-    TInt iLoadCount;
-    /** Transaction id of the current PAOS request. */
-    TInt iTransactionId;
-    /** Filter name for filter listening for events */
-    RStringF iFilterName;
-    /** The URL (exluding path info) in the current PAOS request */
-    CUri8* iPaosPostUrl;
-    /** Parses the received XML documents and constructs a response */
-    CPnpPaosXml* iPnpPaosXml;
-    /** http session */
-    RHTTPSession* iSession;
-    /** string pool for storing RStrings */
-    RStringPool iSessionStringPool;
-    /** Set to ETrue if a request made to nokia.com or help-portal.com
-    This member tells if a PAOS request is allowed or not */
-    TBool iMakePaosResponse;
-#ifndef __SERIES60_ 
-    /** 
-    Set to ETrue when a HelpDeskConnect PAOS post has been successfully done.
-    May be used    to check if a HDC trigger file should be expected next 
-    */
-    TBool iHdcPaosPostDone;
-#endif
-    /** Domains that are allowed to make PAOS requests for HDC parameters */
-    HdcTrustedDomainList iTrustedHdcDomains;
-    
-    PaosTrustedDomainList iTrustedPnpDomains;
-    };
-
-
-#endif // WSPAOSFILTER_H
-
--- a/pnpmobileservices/pnpms/PnpPaosFilter/src/PnpPaosFilterDll.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-/*
-* Copyright (c) 2005-2006 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:  Dll entry point
-*
-*/
-
-
-#include <e32std.h>
-#include <ecom/implementationproxy.h>
-
-#include "PnpPaosFilter.h"
-#include "PnpPaosLogger.h"
-
-
-const TImplementationProxy KImplementationTable[] =
-    {
-        { {0x10272D33}, (TProxyNewLPtr) CPnpPaosFilter::InstantiateL }
-    };
-
-
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy(TInt& aTableCount)
-    {
-    LOGSTRING("ImplementationGroupProxy");
-    aTableCount = sizeof(KImplementationTable) / sizeof(TImplementationProxy);
-    return KImplementationTable;
-    }
--- a/pnpmobileservices/pnpms/PnpPaosFilter/src/PnpPaosFilterPrivateCRKeys.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-/*
-* Copyright (c) 2006 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:  Header file for PnpPaosFilter Private CR Keys
-*
-*/
-
-
-#ifndef PNPPAOSFILTERPRIVATECRKEYS_H
-#define PNPPAOSFILTERPRIVATECRKEYS_H
-
-const TUid    KCRUidPnpPaosFilter = {0x10272D33};
-	
-
-// Range of home domain values 0..F (0-16)
-
-const TUint32 KPnPPaosFilterHomeDomain1 = 0x00000000;
-
-const TUint32 KPnPPaosFilterHomeDomainLast = 0x0000000F;
-
-
-#endif  // PNPPAOSFILTERPRIVATECRKEYS_H
-
--- a/pnpmobileservices/pnpms/PnpPaosFilter/src/PnpPaosLogger.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,152 +0,0 @@
-/*
-* 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:  This file defines logging interface macros
-*
-*/
-
-
-#ifndef __LOGGER_H__
-#define __LOGGER_H__
-
-// Set logging on only for debug builds as Paos filter is a critical component
-// when considering browser performance
-#ifdef _DEBUG
-    #define LOGGING_ENABLED
-#endif
-#ifdef LOGGING_ENABLED          // This must be enabled to use logging system
-
-#define LOGGER_LOGGING          // Log to Logger
-
-
-
-#ifdef LOGGER_LOGGING
-
-//  INCLUDES
-#include <flogger.h>
-
-// LOG SETTINGS 
-_LIT( KLogFolder, "PnP" );
-_LIT( KLogFile, "PnpPaos.TXT" );
-
-#endif
-
-// CONSTANTS  
-// None.
-
-// MACROS
-/*
------------------------------------------------------------------------------
-
-    INTERNAL MACROs. 
-
-    DO NOT USE THESE DIRECTLY !!! 
-    SEE EXTERNAL MACROS
-
------------------------------------------------------------------------------
-*/
-
-#ifdef LOGGER_LOGGING
-
-
-#define INTRLOGTEXT( AAA )                                                                                        \
-    {                                                                                                            \
-    RFileLogger::Write( KLogFolder(), KLogFile(), EFileLoggingModeAppend, AAA );            \
-    }
-#define INTRLOGSTRING( AAA )                                                                                    \
-    {                                                                                                            \
-    _LIT( tempLogDes, AAA );                                                                                    \
-    RFileLogger::Write( KLogFolder(), KLogFile(), EFileLoggingModeAppend, tempLogDes() );    \
-    }
-#define INTRLOGSTRING2( AAA, BBB )                                                                                \
-    {                                                                                                            \
-    _LIT( tempLogDes, AAA );                                                                                    \
-    RFileLogger::WriteFormat( KLogFolder(), KLogFile(), EFileLoggingModeAppend, TRefByValue<const TDesC>( tempLogDes()), BBB ); \
-    }
-#define INTRLOGSTRING3( AAA, BBB, CCC )                                                                            \
-    {                                                                                                            \
-    _LIT( tempLogDes, AAA );                                                                                    \
-    RFileLogger::WriteFormat( KLogFolder(), KLogFile(), EFileLoggingModeAppend, TRefByValue<const TDesC>( tempLogDes()), BBB, CCC ); \
-    }
-
-#define INTRLOGRSTRING( AAA, BBB ) \
-    { \
-    TPtrC8 string8 = BBB.DesC(); \
-    HBufC* buf = HBufC::NewLC( string8.Length() ); \
-    buf->Des().Copy( string8 ); \
-    LOGSTRING2( AAA, buf ); \
-    CleanupStack::PopAndDestroy( buf ); \
-    }
-
-#else
-#define INTRLOGTEXT( AAA )
-#define INTRLOGSTRING( AAA )
-#define INTRLOGSTRING2( AAA, BBB )
-#define INTRLOGSTRING3( AAA, BBB, CCC )
-#define INTRLOGRSTRING( AAA, BBB )
-#endif
-
-/*
------------------------------------------------------------------------------
-
-    EXTERNAL MACROs
-
-    USE THESE MACROS IN YOUR CODE !
-
------------------------------------------------------------------------------
-*/
-
-
-#define LOGTEXT( AAA )                { \
-                                    INTRLOGTEXT( AAA ); \
-                                    }   // Example: LOGTEXT( own_desc );
-
-#define LOGSTRING( AAA )            { \
-                                    INTRLOGSTRING( AAA ); \
-                                    }   // Example: LOGSTRING( "Test" );
-
-#define LOGSTRING2( AAA, BBB )        { \
-                                    INTRLOGSTRING2( AAA, BBB ); \
-                                    }  // Example: LOGSTRING( "Test %i", aValue );
-
-#define LOGSTRING3( AAA, BBB, CCC )    { \
-                                    INTRLOGSTRING3( AAA, BBB, CCC ); \
-                                    } // Example: LOGSTRING( "Test %i %i", aValue1, aValue2 );
-
-#define LOGRSTRING( AAA, BBB )    { \
-                                    INTRLOGRSTRING( AAA, BBB ); \
-                                    } // Example: LOGRSTRING( "Test %i", RString1 );
-
-#else   // LOGGING_ENABLED
-
-#define LOGTEXT( AAA ) 
-#define LOGSTRING( AAA ) 
-#define LOGSTRING2( AAA, BBB )    
-#define LOGSTRING3( AAA, BBB, CCC )    
-#define LOGRSTRING( AAA, BBB )
-
-#endif  // LOGGING_ENABLED
-
-// DATA TYPES
-// None.
-
-// FUNCTION PROTOTYPES
-// None.
-
-// FORWARD DECLARATIONS
-// None.
-
-// CLASS DECLARATION
-// None.
-
-#endif  // __LOGGER_H__
--- a/pnpmobileservices/pnpms/PnpPaosFilter/src/PnpPaosXml.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,960 +0,0 @@
-/*
-* Copyright (c) 2005-2006 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:  For parsing PAOS XML documents
-*
-*/
-
-
-
-#include <e32std.h>
-#include <xml/parser.h> // for compact XML parser
-#include <xml/documentparameters.h> // for RDocumentParameters
-#include <sysutil.h>
-#include <PnpToPaosInterface.h>
-#include "HdcToPaosInterface.h"
-
-#include "PnpPaosXml.h"
-#include "PnpPaosLogger.h"
-#include <PnpProvUtil.h>
-
-const TInt KMessageIdLength(12);
-const TInt KInitialResponseLength(512);
-const TInt KInitialReferenceMessageIdLength(32);
-const TInt KInitialUrlLength(128);
-
-_LIT8( KParserDataType, "text/xml" );
-_LIT8( KUriPaosLiberty, "urn:liberty:paos:2003-08" );
-_LIT8( KLocalNameRequest, "Request" );
-_LIT8( KUriSbLiberty, "urn:liberty:sb:2003-08" );
-_LIT8( KLocalNameCorrelation, "Correlation" );
-_LIT8( KAttributeResponseConsumerUrl, "responseConsumerURL" );
-_LIT8( KPnpMsNokiaUri, "http://pnpms.nokia.com/signkey" );
-_LIT8( KAttributeMessageId, "messageID" );
-_LIT8( KElementGetKey, "getkey" );
-_LIT8( KKeyRequest, "Keyrequest" );
-_LIT8( KContentSetOfKeys, "SetOfKeys" );
-_LIT8( KContentHdcSetOfKeys, "HdcSetOfKeys" );
-_LIT8( KContentHdcSetOfKeys2, "HDCSetOfKeys" );
-
-
-enum TElementIds
-    {
-    EElementUnrecognized = 0,
-    EElementKeyRequest,
-    EElementGetKey
-    };
-
-// Panic texts
-_LIT( KResponseEmpty, "PnPMS PAOS Response" );
-
-// PAOS data sent to the PnP MS server
-_LIT8(
-    KPnpPaosResponse,
-    "<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\">"
-      "<soap:Header>"
-      "%S" /* Add a KPaosResponseMessageIds here if the request has messageid field */
-      "</soap:Header>"
-      "<soap:Body>"
-        "<pp:Signkey xmlns:pp=\"http://pnpms.nokia.com/signkey\">"
-            "<Keyinfo>%S</Keyinfo>"
-            "<nonce>%S</nonce>"
-            "<mcc>%S</mcc>"
-            "<mnc>%S</mnc>"
-            "<cmcc>%S</cmcc>"
-            "<cmnc>%S</cmnc>"
-            "<cVersion>%S</cVersion>"
-            "<deviceinfo>%S</deviceinfo>"
-        "</pp:Signkey>"
-      "</soap:Body>"
-    "</soap:Envelope>"
-    );
-
-// PAOS data sent to the HelpDeskConnect server
-_LIT8(
-    KHdcPaosResponse,
-    "<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\">"
-      "<soap:Header>"
-      "%S" /* Add a KPaosResponseMessageIds here if the request has messageid field */
-      "</soap:Header>"
-      "<soap:Body>"
-        "<pp:Signkey xmlns:pp=\"http://pnpms.nokia.com/signkey\">"
-            "%S" /* Add a list of KHdcKeyInfoElement's here */
-            "<nonce>%S</nonce>"
-            "<hdcVersion>%S</hdcVersion>"
-        "</pp:Signkey>"
-      "</soap:Body>"
-    "</soap:Envelope>"
-    );
-
-_LIT8(
-    KHdcKeyInfoElement,
-    "<Keyinfo>%S</Keyinfo>"
-    );
-const TInt KHdcKeyInfoElementLength( 21 );
-
-_LIT8(
-    KPaosResponseMessageIds,
-    "<sb:Correlation xmlns:sb=\"urn:liberty:paos:2003-08\" "
-    "messageID=\"%S\" "
-    "refToMessageID=\"%S\"/>"
-    );
-
-
-CPnpPaosXml* CPnpPaosXml::NewL()
-    {
-    LOGSTRING("CPnpPaosXml::NewL()");
-    CPnpPaosXml* self = new (ELeave) CPnpPaosXml();
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );
-    LOGSTRING("CPnpPaosXml::NewL() - done");
-    return self;
-    }
-
-CPnpPaosXml::CPnpPaosXml() :
-    iPaosStatus( EPaosStatusUnknown ),
-    iResponseConsumerUrlFound( EFalse ),
-    iErrorFound( EFalse ),
-    iCurrentElement( EElementUnrecognized )
-    {
-    LOGSTRING("constructor CPnpPaosXml()");
-    }
-
-void CPnpPaosXml::ConstructL()
-    {
-    LOGSTRING("CPnpPaosXml::ConstructL()");
-
-    iParser = Xml::CParser::NewL( KParserDataType, *this );
-
-    LOGSTRING("CPnpPaosXml::ConstructL() - 2");
-    iPaosPostUrlPath = HBufC8::NewL( KInitialUrlLength );
-
-    iMessageId = HBufC8::NewL( KMessageIdLength );
-    // We do not know the length of refToMessageID until we get it
-    // from the service
-    iReferenceMessageId = HBufC8::NewL( KInitialReferenceMessageIdLength );
-    iPaosResponse = HBufC8::NewL( KInitialResponseLength );
-
-    LOGSTRING("CPnpPaosXml::ConstructL() - done");
-    }
-
-CPnpPaosXml::~CPnpPaosXml()
-    {
-    LOGSTRING("CPnpPaosXml::~CPnpPaosXml()");
-    delete iParser;
-    delete iPaosRequest;
-    delete iPaosResponse;
-    delete iMessageId;
-    delete iReferenceMessageId;
-    delete iPaosPostUrlPath;
-    LOGSTRING("CPnpPaosXml::~CPnpPaosXml() - done");
-    }
-
-void CPnpPaosXml::OnOutOfData() 
-    {
-    }
-
-void CPnpPaosXml::ParseL( TPaosStates& aPaosStatus )
-    {
-    LOGSTRING("CPnpPaosXml::ParseL()");
-
-    // Reset possible previous paos response
-    ReleaseData();
-
-    // Reset state variables
-    iPaosStatus = EPaosStatusUnknown;
-    iErrorFound = EFalse;
-    iCurrentElement = EElementUnrecognized;
-    iResponseConsumerUrlFound = EFalse;
-
-    LOGSTRING("ParseBeginL()");
-
-    iParser->ParseBeginL();
-    Xml::ParseL( *iParser, *iPaosRequest );
-    
-    aPaosStatus = iPaosStatus; // Store status
-    LOGSTRING("ParseL() - done");
-
-    // There has to be a consumer URL in the document
-    if( !iResponseConsumerUrlFound )
-        {
-        LOGSTRING( "responseCosumerURL not found!" );
-        User::Leave( KErrArgument );
-        }
-
-    // No errors allowed in the XML
-    if( iErrorFound )
-        {
-        LOGSTRING( "Error in the XML!" );
-        User::Leave( KErrArgument );
-        }
-
-    // Only key requests for PnP-MS or HelpDeskConnect
-    // keys (parameters) allowed with this PAOS parser
-    switch( aPaosStatus )
-        {
-    case EPaosStatusRequestingPnPKeys:
-        ConstructPnPPaosResponseL();
-        break;
-    case EPaosStatusRequestingHdcKeys:
-        ConstructHdcPaosResponseL();
-        break;
-    default:
-        LOGSTRING( "Invalid PAOS request!" );
-        User::Leave( KErrArgument );
-        break;
-        }
-
-#ifdef LOGGING_ENABLED
-    for( TInt i(0); i < iPaosResponse->Length(); i += 128 )
-        {
-        TPtrC8 logText = iPaosResponse->Right( iPaosResponse->Length() - i );
-        LOGTEXT( logText );
-        }
-#endif
-
-    // Reset state variables
-    iPaosStatus = EPaosStatusUnknown;
-    iErrorFound = EFalse;
-    iCurrentElement = EElementUnrecognized;
-
-    LOGSTRING("CPnpPaosXml::ParseL - done()");
-    }
-
-TBool CPnpPaosXml::CollectResponseBodyL( MHTTPDataSupplier& aBody )
-    {
-    LOGSTRING( "CPnpPaosXml::CollectResponseBodyL" );
-
-    // Store incoming body part
-    TPtrC8 dataChunk;
-    TBool returnValue = aBody.GetNextDataPart( dataChunk );
-
-#ifdef LOGGING_ENABLED
-    for( TInt i(0); i < dataChunk.Length(); i += 128 )
-        {
-        LOGSTRING( "CPnpPaosXml: MHTTPDataSupplier:" );
-        TPtrC8 logText = dataChunk.Right( dataChunk.Length() - i );
-        LOGTEXT( logText );
-        }
-#endif
-
-    if( !iPaosRequest )
-        {
-        iPaosRequest = HBufC8::NewL( dataChunk.Length() );
-        }
-
-    TPtr8 paosRequestPtr = iPaosRequest->Des();
-    if( paosRequestPtr.MaxLength() < ( iPaosRequest->Length() + dataChunk.Length() ) )
-        {
-        LOGSTRING( "Re-allocate response buffer" );
-        iPaosRequest = iPaosRequest->ReAllocL( iPaosRequest->Length() + dataChunk.Length() );
-        paosRequestPtr.Set( iPaosRequest->Des() );
-        }
-    paosRequestPtr.Append( dataChunk );
-
-    LOGSTRING( "CPnpPaosXml::CollectResponseBodyL - done" );
-    return returnValue;
-    }
-/*
-#ifndef __SERIES60_ 
-TPtrC8 CPnpPaosXml::ResponseBodyL()
-    {
-    LOGSTRING( "CPnpPaosXml::ResponseBodyL" );
-    if( !iPaosRequest ) 
-        {
-        User::Leave( KErrNotFound );
-        }
-    return *iPaosRequest;
-    }
-#endif
-*/
-void CPnpPaosXml::ConstructHdcPaosResponseL()
-    {
-    LOGSTRING( "CPnpPaosXml::ConstructHdcPaosResponseL" );
-
-    // give empty parameter values in case there is no DLL for HelpDeskConnect
-    // -> The service may then make the following assumptions:
-    // 1. If there is no PAOS header in the first HTTP GET request -> link: "install HDC"
-    // 2. If there is PAOS headers but PAOS response contains empty parameter values -> link: "install HDC"
-    // 3. PAOS header and a valid PAOS response -> HDC installed OK, proceed to a HDC trigger file
-
-    RLibrary library;
-    const TUidType uid( KNullUid, KNullUid, KHdcUtilDllUid );
-    TInt result = library.Load( KHdcDllFileName, uid );
-    if( result != KErrNone )
-        {
-        // if the dll is not found the response should be empty
-        LOGSTRING2( "err in loading HDC dll: %i", result );
-        ConstructPaosResponseL( KHdcPaosResponse );
-        return;
-        }
-    CleanupClosePushL( library );
-    // Function at ordinal 1 is NewLC
-    TLibraryFunction entry = library.Lookup(1);
-    // Call the function to create new hdc dll object
-    CHdcToPaosInterface* hdcUtil = ( CHdcToPaosInterface* ) entry();
-
-    // HDC-nonce
-    // create new nonce
-    TBuf8<KHdcNonceLength> nonce;
-    hdcUtil->CreateNewNonceL( nonce );
-
-    // HDC-version
-    TBuf8<KMaxHdcVersionStringLength> version;
-    hdcUtil->Version( version );
-
-    // List of key-infos
-    HdcKeyInfoList keyInfoList;
-    hdcUtil->HdcKeyInfos( keyInfoList );
-    TInt keyInfoCount = keyInfoList.Count();
-
-    HBufC8* keyInfos = HBufC8::NewLC(
-        keyInfoCount * KMaxHdcKeyInfoLength +            /* space for keyinfos */
-        keyInfoCount * KHdcKeyInfoElement().Length() );    /* space for XML elements */
-    TPtr8 keyInfosPtr = keyInfos->Des();
-    for( TInt i(0); i < keyInfoCount; i++ )
-        {
-        TBuf8<KMaxHdcKeyInfoLength + KHdcKeyInfoElementLength> keyInfoXmlElement;
-        keyInfoXmlElement.Format( KHdcKeyInfoElement, &( keyInfoList[i] ) );
-        keyInfosPtr.Append( keyInfoXmlElement );
-        }
-
-    LOGSTRING( "CPnpPaosXml::ConstructHdcPaosResponseL format response" );
-    // 1. KPaosResponseMessageIds
-    // 2. List of KHdcKeyInfoElement's
-    // 3. HDC nonce
-    // 4. HDC version
-    ConstructPaosResponseL( KHdcPaosResponse, *keyInfos, nonce, version );
-    LOGSTRING( "CPnpPaosXml::ConstructHdcPaosResponseL response formatted" );
-
-    // RArray must be closed before destructing
-    keyInfoList.Close();
-
-    CleanupStack::PopAndDestroy( keyInfos );
-    CleanupStack::PopAndDestroy( hdcUtil );
-    CleanupStack::PopAndDestroy(); // library.Close()
-    }
-
-void CPnpPaosXml::ConstructPnPPaosResponseL()
-    {
-    LOGSTRING( "CPnpPaosXml::ConstructPnPPaosResponseL" );
-
-    // Dynamically load the pnp util DLL,
-    const TUidType uid( KNullUid, KNullUid, KPnpUtilDllUid );
-    RLibrary pnpLibrary;
-    TInt result = pnpLibrary.Load( KPnpUtilDllFileName, uid );
-    if( result != KErrNone )
-        {
-        // if the dll is not found the response should be empty
-        LOGSTRING2( "err in loading pnp util dll: %i", result );
-        ConstructPaosResponseL( KPnpPaosResponse );
-        return;
-        }
-    CleanupClosePushL( pnpLibrary );
-
-    // Function at ordinal 1 is NewPnpUtilLC
-    //TLibraryFunction entry = pnpLibrary.Lookup(1);
-    // Call the function to create new Pnp util object
-    //MPnpToPaosInterface* pnpUtil = ( MPnpToPaosInterface* ) entry();
-
-    CPnpUtilImpl *pnpUtil = CPnpUtilImpl::NewLC();
-
-    // check version
-    TBuf8<KMaxVersionStringLength> version;
-    TBuf<KMaxVersionStringLength> version16;
-    pnpUtil->Version( version16 );
-    version.Copy( version16 );
-    LOGTEXT( version );
-    // BC break between versions NPnPS60-0.10 and newer ones; Version function 
-    // should be binary compatible, though.
-    // (older versions of pnputil should not be a problem as updating PAOS filter
-    // without updating PnP-MS components should be possible only by installing
-    // HelpDeskConnect With PAOS filter)
-    if( version.Compare( _L8("NPnPS60-0.10") ) == 0 )
-        {
-        // if the dll is not compatible give an empty response
-        LOGSTRING( "Too old version of PnpUtil installed" );
-        ConstructPaosResponseL( KPnpPaosResponse );
-        CleanupStack::PopAndDestroy( pnpUtil );
-        CleanupStack::PopAndDestroy(); // pnpLibrary.Close();
-        return;
-        }
-
-    LOGSTRING( "CPnpPaosXml::ConstructPnPPaosResponseL 2" );
-
-    // MNCs and MCCs
-    LOGSTRING( "CPnpPaosXml::ConstructPnPPaosResponseL 2.01" );
-    pnpUtil->FetchHomeNetworkInfoL();
-    LOGSTRING( "CPnpPaosXml::ConstructPnPPaosResponseL 2.1" );
-    TRAPD( err, pnpUtil->FetchNetworkInfoL() );
-    if( err != KErrNone )
-        {
-        LOGSTRING2( "CPnpPaosXml::Could not fetch network info %i", err );
-        pnpUtil->SetNetworkMccL( _L("") );
-        pnpUtil->SetNetworkMncL( _L("") );
-        }
-
-    LOGSTRING( "CPnpPaosXml::ConstructPnPPaosResponseL 2.2" );
-    RMobilePhone::TMobilePhoneNetworkCountryCode homeMcc = pnpUtil->HomeMccL();
-    LOGSTRING( "CPnpPaosXml::ConstructPnPPaosResponseL 2.3" );
-    RMobilePhone::TMobilePhoneNetworkIdentity homeMnc = pnpUtil->HomeMncL();
-    LOGSTRING( "CPnpPaosXml::ConstructPnPPaosResponseL 2.4" );
-    RMobilePhone::TMobilePhoneNetworkCountryCode networkMcc = pnpUtil->NetworkMccL();
-    LOGSTRING( "CPnpPaosXml::ConstructPnPPaosResponseL 2.5" );
-    RMobilePhone::TMobilePhoneNetworkIdentity networkMnc = pnpUtil->NetworkMncL();
-    LOGSTRING( "CPnpPaosXml::ConstructPnPPaosResponseL 2.6" );
-    TBuf8<4> hmcc;
-    TBuf8<8> hmnc;
-    TBuf8<4> nmcc;
-    TBuf8<8> nmnc;
-    hmcc.Copy( homeMcc );
-    hmnc.Copy( homeMnc );
-    nmcc.Copy( networkMcc );
-    nmnc.Copy( networkMnc );
-
-    LOGSTRING( "CPnpPaosXml::ConstructPnPPaosResponseL 3" );
-    // keyinfo, nonce
-    TBuf8<KMaxKeyInfoLength> keyInfo;
-    pnpUtil->GetKeyInfoL( keyInfo );
-    TBuf8<KNonceLength> nonce;
-    TInt timeout(0);
-    pnpUtil->CreateNewNonceL( timeout, nonce );
-    
-    LOGSTRING( "CPnpPaosXml::ConstructPnPPaosResponseL 4" );
-    // product model
-    TBuf8<KSysUtilVersionTextLength> deviceinfo;
-    FetchProductModelL( deviceinfo );
-
-	// Clear all service activation data in case if service 
-	// activation fails
-	// This will avoid displaying service specific notes for
-	// example email service activation when help-portal service required
-	// As of now only Help-portal server sends PAOS request 
-	// and NSA server(which provides email service activation) is not 
-	// supporting PAOS.
-	// If NSA server provides PAOS then these resetting of
-	// service activation data to be commented
-		
-    CPnpProvUtil* prov = CPnpProvUtil::NewLC();
-    
-    const TUint32 uidval = 0;
-    prov->SetApplicationUidL(uidval);
-	
-	
-    TBuf<2> buf(_L(""));
-    prov->SetProvAdapterAppIdL(buf);
-
-    CleanupStack::PopAndDestroy();
-
-    LOGSTRING( "CPnpPaosXml::ConstructPnPPaosResponseL format response" );
-    // 1. Keyinfo
-    // 2. Nonce
-    // 3. Home MCC
-    // 4. Home MNC
-    // 5. Network (current) MCC
-    // 6. Network MNC
-    // 7. Version
-    // 8. deviceinfo
-    ConstructPaosResponseL( KPnpPaosResponse, keyInfo, nonce, hmcc, hmnc, nmcc, nmnc, version, deviceinfo );
-    LOGSTRING( "CPnpPaosXml::ConstructPnPPaosResponseL response formatted" );
-    
-    LOGSTRING( "CleanupStack::PopAndDestroy( pnpUtil )" );
-    CleanupStack::PopAndDestroy( pnpUtil );
-    LOGSTRING( "pnpLibrary.Close()" );
-    CleanupStack::PopAndDestroy(); // pnpLibrary.Close()
-    LOGSTRING( "CPnpPaosXml::ConstructPnPPaosResponseL - done" );
-    }
-
-void CPnpPaosXml::ConstructPaosResponseL(
-    const TDesC8& aResponse,
-    const TDesC8& aParameter1,
-    const TDesC8& aParameter2,
-    const TDesC8& aParameter3,
-    const TDesC8& aParameter4,
-    const TDesC8& aParameter5,
-    const TDesC8& aParameter6,
-    const TDesC8& aParameter7,
-    const TDesC8& aParameter8
-    )
-    {
-    // Construct PAOS message id element if reference message id is available
-    HBufC8* messageIds(0);
-    if( iReferenceMessageId->Length() )
-        {
-        LOGSTRING( "iMessageId:" );
-        LOGTEXT( *iMessageId );
-        LOGSTRING( "iReferenceMessageId:" );
-        LOGTEXT( *iReferenceMessageId );
-
-        messageIds = HBufC8::NewLC(
-            KPaosResponseMessageIds().Length() +
-            iMessageId->Length() +
-            iReferenceMessageId->Length() );
-        messageIds->Des().Format( KPaosResponseMessageIds, iMessageId, iReferenceMessageId );
-        }
-
-    LOGSTRING( "CPnpPaosXml::ConstructPaosResponseL" );
-    // Construct a new PAOS response
-    TInt responseLength(
-        aResponse.Length() +
-        aParameter1.Length() +
-        aParameter2.Length() +
-        aParameter3.Length() +
-        aParameter4.Length() +
-        aParameter5.Length() +
-        aParameter6.Length() +
-        aParameter7.Length() +
-        aParameter8.Length()
-        );
-
-    // Add the length of messageIds buffer to responseLength
-    if( messageIds )
-        responseLength += messageIds->Length();
-
-    // Expand buffer if needed
-    if( iPaosResponse->Des().MaxSize() < responseLength )
-        iPaosResponse = iPaosResponse->ReAllocL( responseLength );
-
-    LOGSTRING( "CPnpPaosXml::ConstructPaosResponseL - format" );
-    if( messageIds )
-        {
-        iPaosResponse->Des().Format(
-            aResponse,
-            messageIds, /* The first parameter in aResponse is assumed to be messageids */
-            &aParameter1,
-            &aParameter2,
-            &aParameter3,
-            &aParameter4,
-            &aParameter5,
-            &aParameter6,
-            &aParameter7,
-            &aParameter8
-            );
-        LOGSTRING( "CleanupStack::PopAndDestroy( messageIds )" );
-        CleanupStack::PopAndDestroy( messageIds );
-        }
-    else
-        {
-        iPaosResponse->Des().Format(
-            aResponse,
-            &KNullDesC8(),
-            &aParameter1,
-            &aParameter2,
-            &aParameter3,
-            &aParameter4,
-            &aParameter5,
-            &aParameter6,
-            &aParameter7,
-            &aParameter8
-            );
-        }
-    LOGSTRING( "CPnpPaosXml::ConstructPaosResponseL - done" );
-    }
-
-void CPnpPaosXml::ResetPaosRequest()
-    {
-    delete iPaosRequest;
-    iPaosRequest = 0;
-    }
-
-TBool CPnpPaosXml::GetNextDataPart( TPtrC8& aDataPart )
-    {
-    LOGSTRING("CPnpPaosXml::GetNextDataPart");
-
-    if( !iPaosResponse )
-        {
-        LOGSTRING( "empty response!" );
-        // Panics are not shown (on browser process), the browser is just closed
-        __ASSERT_ALWAYS( EFalse, User::Panic( KResponseEmpty, KErrNotFound ) );
-        }
-    aDataPart.Set( *iPaosResponse  );
-    return ETrue;
-    }
-
-void CPnpPaosXml::ReleaseData()
-    {
-    LOGSTRING("CPnpPaosXml::ReleaseData");
-    // No need to delete our data
-    // They are deleted in the destructor and reallocated when needed
-    iPaosResponse->Des().Zero();
-    iMessageId->Des().Zero();
-    iReferenceMessageId->Des().Zero();
-    iPaosPostUrlPath->Des().Zero();
-    }
-
-TInt CPnpPaosXml::OverallDataSize()
-    {
-    LOGSTRING("CPnpPaosXml::OverallDataSize");
-    if( !iPaosResponse )
-        {
-        LOGSTRING( "empty response!" );
-        // Panics are not shown (on browser process), the browser is just closed
-        __ASSERT_ALWAYS( EFalse, User::Panic( KResponseEmpty, KErrNotFound ) );
-        }
-    return iPaosResponse->Length();
-    }
-
-TInt CPnpPaosXml::Reset()
-    {
-    LOGSTRING("CPnpPaosXml::Reset");
-    return KErrNone;
-    }
-
-void CPnpPaosXml::OnStartDocumentL( const RDocumentParameters& aDocParam, TInt aErrorCode )
-    {
-    LOGSTRING2( "CPnpPaosXml::OnStartDocumentL: %i", aErrorCode );
-    if( aErrorCode != KErrNone )
-        {
-        User::Leave( KErrArgument );
-        }
-    // Keep compiler happy
-    (void)aDocParam;
-    LOGRSTRING( "CharSet: %S", aDocParam.CharacterSetName() );
-    }
-
-void CPnpPaosXml::OnEndDocumentL( TInt aErrorCode )
-    {
-    LOGSTRING2( "CPnpPaosXml::OnEndDocumentL: %i", aErrorCode );
-    if( aErrorCode != KErrNone )
-        {
-        User::Leave( KErrArgument );
-        }
-    }
-
-void CPnpPaosXml::OnStartElementL( const RTagInfo& aElement, const RAttributeArray& aAttributes, 
-                             TInt aErrorCode )
-    {
-    LOGSTRING2( "CPnpPaosXml::OnStartElementL: %i", aErrorCode );
-    if( aErrorCode != KErrNone )
-        {
-        User::Leave( KErrArgument );
-        }
-
-    RString uri = aElement.Uri();
-    RString localName = aElement.LocalName();
-
-#ifdef LOGGING_ENABLED
-    RString prefix = aElement.Prefix();
-#endif
-    LOGRSTRING( "uri: %S", uri );
-    LOGRSTRING( "localName: %S", localName );
-    LOGRSTRING( "prefix: %S", prefix );
-
-    if( iCurrentElement == EElementKeyRequest )
-        {
-        if( localName.DesC().Compare( KElementGetKey ) == 0 )
-            {
-            LOGSTRING( "setting iCurrentElement = EElementGetKey" );
-            iCurrentElement = EElementGetKey;
-            }
-        }
-    else if( uri.DesC().Compare( KPnpMsNokiaUri ) == 0 )
-        {
-        if( localName.DesC().Compare( KKeyRequest ) == 0 )
-            {
-            LOGSTRING( "setting iCurrentElement = EElementKeyRequest" );
-            iCurrentElement = EElementKeyRequest;
-            }
-        }
-    
-
-    for( TInt i(0); i < aAttributes.Count(); i++ )
-        {
-        RAttribute attribute = aAttributes[i];
-        RTagInfo tagInfo = attribute.Attribute();
-        RString attributeLocalName = tagInfo.LocalName();
-        RString value = attribute.Value();
-
-#ifdef LOGGING_ENABLED
-        RString attributeUri = tagInfo.Uri();
-        RString attributePrefix = tagInfo.Prefix();
-#endif
-        LOGRSTRING( "attribute uri: %S", attributeUri );
-        LOGRSTRING( "attribute localName: %S", attributeLocalName );
-        LOGRSTRING( "attribute prefix: %S", attributePrefix );
-        LOGRSTRING( "value: %S", value );
-
-        // According to PAOS spec: "SOAP request message that (provided that the
-        // SOAP processor wishes to use the PAOS binding) MUST contain a <paos:Request>
-        // SOAP header block."
-        // For some reason Futurice uses prefix ns1 (ns1:Request) for a SOAP request.
-        // So we allow any prefix for a SOAP request instead of only allowing "paos"
- 
-        if( localName.DesC().Compare( KLocalNameRequest ) == 0 &&
-            uri.DesC().Compare( KUriPaosLiberty ) == 0 )
-            {
-            LOGSTRING("uri PAOS found");
-            const TDesC8& strAttributeLocalName = attributeLocalName.DesC();
-            const TDesC8& strValue = value.DesC();
-
-            if( strAttributeLocalName.Compare( KAttributeResponseConsumerUrl ) == 0 )
-                {
-                LOGSTRING( "PAOS post url found" );
-                if( iPaosPostUrlPath->Des().MaxLength() < strValue.Length() )
-                    {
-                    iPaosPostUrlPath = iPaosPostUrlPath->ReAllocL( strValue.Length() );
-                    }
-                iPaosPostUrlPath->Des().Copy( strValue );
-                LOGSTRING( "iResponseConsumerUrlFound = ETrue" );
-                iResponseConsumerUrlFound = ETrue;
-                }
-            else if( attributeLocalName.DesC().Compare( KAttributeMessageId ) == 0)
-                {
-                LOGSTRING("messageID found");
-                const TDesC8& strValue = value.DesC();
-                if( iReferenceMessageId->Des().MaxLength() < strValue.Length() )
-                    {
-                    iReferenceMessageId = iReferenceMessageId->ReAllocL( strValue.Length() );
-                    }
-                iReferenceMessageId->Des().Copy( strValue );
-                // Generate a random character string for our own messageID
-                TPtr8 messageIdPtr = iMessageId->Des();
-                GenerateNonceString( messageIdPtr );
-                }
-            }
-        else if( localName.DesC().Compare( KLocalNameCorrelation ) == 0 &&
-            uri.DesC().Compare( KUriSbLiberty ) == 0 )
-            {
-            LOGSTRING("uri SB found");
-            if( attributeLocalName.DesC().Compare( KAttributeMessageId ) == 0)
-                {
-                LOGSTRING("messageID found");
-                const TDesC8& strValue = value.DesC();
-                iReferenceMessageId = iReferenceMessageId->ReAllocL( strValue.Length() );
-                iReferenceMessageId->Des().Copy( strValue );
-                // Generate a random character string for our own messageID
-                TPtr8 messageIdPtr = iMessageId->Des();
-                GenerateNonceString( messageIdPtr );
-                }
-            }
-        }
-    LOGSTRING("CPnpPaosXml::OnStartElementL - done");
-    }
-
-void CPnpPaosXml::GenerateNonceString( TDes8& aString )
-    {
-    LOGSTRING("CPnpPaosXml::GenerateNonceString");
-    aString.Zero();
-
-    _LIT8( KTemp, "123456abcdef");
-    if( aString.MaxLength() <= KTemp().Length() )
-        {
-        aString.Copy( KTemp().Left( aString.MaxLength() ) );
-        }
-    else
-        {
-        aString.Copy( KTemp );
-        }
-
-    LOGSTRING("CPnpPaosXml::GenerateNonceString - done");
-    }
-
-void CPnpPaosXml::OnEndElementL( const RTagInfo& aElement, TInt aErrorCode )
-    {
-    LOGSTRING2( "CPnpPaosXml::OnEndElementL: %i", aErrorCode );
-    if( aErrorCode != KErrNone )
-        {
-        User::Leave( KErrArgument );
-        }
-
-    RString uri = aElement.Uri();
-    RString localName = aElement.LocalName();
-    RString prefix = aElement.Prefix();
-
-    TBuf<255> buff;
-    buff.Copy( uri.DesC().Left(255) );
-    LOGSTRING2( "uri: %S", &buff );
-    buff.Copy( localName.DesC().Left(255) );
-    LOGSTRING2( "localName: %S", &buff );
-    buff.Copy( prefix.DesC().Left(255) );
-    LOGSTRING2( "prefix: %S", &buff );
-
-    if( iCurrentElement == EElementGetKey )
-        {
-        // Ending Get key element?
-        if( localName.DesC().Compare( KElementGetKey ) == 0 )
-            {
-            LOGSTRING( "setting iCurrentElement = EElementKeyRequest" );
-            // Must be inside key request
-            iCurrentElement = EElementKeyRequest;
-            }
-        }
-    else if( iCurrentElement == EElementKeyRequest )
-        {
-        // Ending Key request element?
-        if( uri.DesC().Compare( KPnpMsNokiaUri ) == 0 )
-            {
-            if( localName.DesC().Compare( KKeyRequest ) == 0 )
-                {
-                LOGSTRING( "setting iCurrentElement = EElementUnrecognized" );
-                iCurrentElement = EElementUnrecognized;
-                }
-            }
-        }
-    }
-
-void CPnpPaosXml::OnContentL( const TDesC8& aBytes, TInt aErrorCode )
-    {
-    LOGSTRING2( "CPnpPaosXml::OnContentL: %i", aErrorCode );
-    if( aErrorCode != KErrNone )
-        {
-        User::Leave( KErrArgument );
-        }
-    LOGTEXT( aBytes );
-
-    if( iCurrentElement == EElementGetKey )
-        {
-        LOGSTRING( "Element GetKey" );
-        if( aBytes.Compare( KContentSetOfKeys ) == 0 )
-            {
-            LOGSTRING("EPaosStatusRequestingPnPKeys");
-            iPaosStatus = EPaosStatusRequestingPnPKeys;
-            }
-        else if( aBytes.Compare( KContentHdcSetOfKeys ) == 0 || aBytes.Compare( KContentHdcSetOfKeys2 ) == 0 )
-            {
-            LOGSTRING("EPaosStatusRequestingHdcKeys");
-            iPaosStatus = EPaosStatusRequestingHdcKeys;
-            }
-        }
-    }
-
-void CPnpPaosXml::OnStartPrefixMappingL( const RString& /*aPrefix*/, const RString& /*aUri*/,
-                                   TInt aErrorCode )
-    {
-    LOGSTRING2( "CPnpPaosXml::OnStartPrefixMappingL: %i", aErrorCode );
-    if( aErrorCode != KErrNone )
-        {
-        User::Leave( KErrArgument );
-        }
-    }
-
-void CPnpPaosXml::OnEndPrefixMappingL( const RString& /*aPrefix*/, TInt aErrorCode )
-    {
-    LOGSTRING2( "CPnpPaosXml::OnEndPrefixMappingL: %i", aErrorCode );
-    if( aErrorCode != KErrNone )
-        {
-        User::Leave( KErrArgument );
-        }
-    }
-
-void CPnpPaosXml::OnIgnorableWhiteSpaceL( const TDesC8& aBytes, TInt aErrorCode )
-    {
-    LOGSTRING2( "CPnpPaosXml::OnIgnorableWhiteSpaceL: %i", aErrorCode );
-    if( aErrorCode != KErrNone )
-        {
-        User::Leave( KErrArgument );
-        }
-    LOGTEXT( aBytes );
-    // Keep compiler happy
-    (void)aBytes;
-    }
-
-void CPnpPaosXml::OnSkippedEntityL( const RString& aName, TInt aErrorCode )
-    {
-    LOGSTRING2( "CPnpPaosXml::OnSkippedEntityL: %i", aErrorCode );
-    if( aErrorCode != KErrNone )
-        {
-        User::Leave( KErrArgument );
-        }
-    LOGRSTRING( "name: %S", aName );
-    // Keep compiler happy
-    (void)aName;
-    }
-
-void CPnpPaosXml::OnProcessingInstructionL( const TDesC8& aTarget, const TDesC8& aData, 
-                                      TInt aErrorCode )
-    {
-    LOGSTRING2( "CPnpPaosXml::OnProcessingInstructionL: %i", aErrorCode );
-    if( aErrorCode != KErrNone )
-        {
-        User::Leave( KErrArgument );
-        }
-    // Keep compiler happy
-    (void)aTarget;
-    (void)aData;
-    LOGSTRING( "target:" );
-    LOGTEXT( aTarget );
-    LOGSTRING( "data:" );
-    LOGTEXT( aData );
-    }
-
-void CPnpPaosXml::OnError( TInt aErrorCode )
-    {
-    LOGSTRING2( "CPnpPaosXml::OnError: %i", aErrorCode );
-    if( aErrorCode != KErrNone )
-        {
-        iErrorFound = ETrue;
-        }
-    }
-
-TAny* CPnpPaosXml::GetExtendedInterface( const TInt32 aUid )
-    {
-    LOGSTRING2( "CPnpPaosXml::GetExtendedInterface: %i", aUid );
-    // Keep compiler happy
-    (void)aUid;
-    return 0;
-    }
-    
-void CPnpPaosXml::FetchProductModelL( TDes8& aModel )
-    {
-    HBufC* tmpVersion = HBufC::NewLC( KSysUtilVersionTextLength );
-    TPtr ptr( tmpVersion->Des() );
-    User::LeaveIfError( SysUtil::GetSWVersion( ptr ) );
-    LOGTEXT(ptr);
-
-    _LIT(KVerStrStart,"V ");
-    _LIT(KVerStrEnd,"\n");
-
-    TInt pos1 = tmpVersion->Find(KVerStrStart);
-    TInt pos2 = tmpVersion->Find(KVerStrEnd);
-    TInt verlen = ((TDesC)(KVerStrStart)).Length();
-    
-    if( pos1==KErrNotFound) // Version does not start with "V "
-        {
-        pos1=0;
-        verlen=0;
-        }
-
-    if(    (pos1!=KErrNotFound) 
-        && (pos2!=KErrNotFound) 
-        && (pos2 > (pos1 + verlen) ) 
-      )
-        {
-        TPtrC ptrSeek(ptr);
-        pos1 = ptrSeek.Find(KVerStrEnd);
-        if(pos1>=0)
-            {
-            ptrSeek.Set(ptrSeek.Mid(pos1+1));
-            pos1 = ptrSeek.Find(KVerStrEnd);
-            if( pos1 >= 0 )
-                {
-                ptrSeek.Set(ptrSeek.Mid(pos1+1));
-                pos1 = ptrSeek.Find(KVerStrEnd);
-                if( pos1 < 0 )
-                    {
-                    ptrSeek.Set(ptrSeek.Mid(1));
-                    aModel.Copy(ptrSeek);
-                    }
-                else if( pos1 > 0 )
-                    {
-                    ptrSeek.Set(ptrSeek.Mid(1,pos1-1));
-                    aModel.Copy(ptrSeek);
-                    }
-                LOGTEXT(aModel);
-                }
-            }
-        }
-    CleanupStack::PopAndDestroy();
-    }
-// End of File  
--- a/pnpmobileservices/pnpms/PnpPaosFilter/src/PnpPaosXml.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,343 +0,0 @@
-/*
-* Copyright (c) 2005-2006 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:  For checking a PAOS XML document
-*
-*/
-
-
-
-#ifndef PNP_PAOS_XML_H
-#define PNP_PAOS_XML_H
-
-#include <e32std.h>
-#include <sysutil.h>
-#include <xml/parser.h>         // for XML parser
-#include <xml/contenthandler.h> // for MContentHandler
-#include <http/mhttpdatasupplier.h>
-#include <PnpUtilImpl.h>
-
-
-using namespace Xml;
-
-class CPnpUtil;
-
-
-/**
-For checking a PAOS XML document. Checks that the XML is of right format.
-Currently only a request for "SetOfKeys" is allowed.
-*/
-
-class CPnpPaosXml :
-    public CBase,
-    public MContentHandler,
-    public MHTTPDataSupplier /* to set the body of a http request*/
-    {
-public:
-    /**
-    Possible PAOS request states, currently only ERequestingKeys is available.
-    */
-    enum TPaosStates
-        {
-        EPaosStatusUnknown = 0,
-        EPaosStatusRequestingPnPKeys,    /* Received a PAOS request for PnP-MS parameters */
-        EPaosStatusRequestingHdcKeys    /* Received a PAOS request for HelpDeskConnect parameters */
-        };
-
-    static CPnpPaosXml* NewL();
-    ~CPnpPaosXml();
-
-    /**
-    Construct a response to the PnP PAOS request received,
-    the response is put into iPaosResponse buffer.
-    */
-    void     ConstructPnPPaosResponseL();
-
-    /**
-    Construct a response to the HelpDeskConnect PAOS request received,
-    the response is put into iPaosResponse buffer.
-    */
-    void     ConstructHdcPaosResponseL();
-
-    /**
-    Construct a response to a PAOS request. The response is put into
-    iPaosResponse buffer.
-    @param aResponse The literal used in formatting the response. It is assumed
-    to have %S directives to be replaced by the given parameter values. Maximum
-    number of the directives is 8 as the first occurrence is always replaced by
-    XML that contains PAOS message ids.
-    @param aParameter1 Descriptor that replaces the second occurrence of %S directive in aResponse.
-                        The default value is an empty descriptor.
-    @param aParameter2 Descriptor that replaces the third occurrence of %S directive in aResponse.
-                        The default value is an empty descriptor.
-    @param aParameter3 And so on...
-    */
-    void ConstructPaosResponseL(
-        const TDesC8& aResponse,
-        const TDesC8& aParameter1 = KNullDesC8,
-        const TDesC8& aParameter2 = KNullDesC8,
-        const TDesC8& aParameter3 = KNullDesC8,
-        const TDesC8& aParameter4 = KNullDesC8,
-        const TDesC8& aParameter5 = KNullDesC8,
-        const TDesC8& aParameter6 = KNullDesC8,
-        const TDesC8& aParameter7 = KNullDesC8,
-        const TDesC8& aParameter8 = KNullDesC8
-        );
-
-    /**
-    Goes through the PAOS request received from the server. Leaves with 
-    KErrArgument if the XML document was not correctly formatted.
-    */
-    void ParseL( TPaosStates& aPaosRequest );
-
-    /**
-    For storing the PAOS request piece by piece.
-    @return ETrue if this was the last data part from MHTTPDataSupplier.
-    */
-    TBool CollectResponseBodyL( MHTTPDataSupplier& aBody );
-
-//#ifndef __SERIES60_ 
-    /**
-    @return A pointer to a descriptor containing response body.
-    */
-//    TPtrC8 ResponseBodyL();
-//#endif
-
-    /**
-    Returns the parameter responseConsumerUrl of the previous PAOS request parsed.
-    */
-    const TDesC8& GetPaosPostUrlL(){ return *iPaosPostUrlPath; };
-
-    /**
-    Returns the parameter referenceMessageId for the constructed PAOS response message
-    */
-    const TDesC8& GetReferenceMessageId(){ return *iReferenceMessageId; };
-    
-    /**
-    Resets the PAOS request.
-    */
-    void ResetPaosRequest();
-
-public: // from MContentHandler
-
-    /**
-    This method is a callback to indicate the start of the document.
-    @param      aDocParam Specifies the various parameters of the document.
-    @arg        aDocParam.iCharacterSetName The character encoding of the document.
-    @param      aErrorCode is the error code. 
-                If this is not KErrNone then special action may be required.
-    */
-    void OnStartDocumentL( const RDocumentParameters& aDocParam, TInt aErrorCode );
-
-    /**
-    This method is a callback to indicate the end of the document.
-    @param      aErrorCode is the error code. 
-                If this is not KErrNone then special action may be required.
-    */
-    void OnEndDocumentL( TInt aErrorCode );
-
-    /**
-    This method is a callback to indicate an element has been parsed.
-    @param      aElement is a handle to the element's details.
-    @param      aAttributes contains the attributes for the element.
-    @param      aErrorCode is the error code.
-                If this is not KErrNone then special action may be required.
-    */
-    void OnStartElementL( const RTagInfo& aElement,
-        const RAttributeArray& aAttributes, TInt aErrorCode );
-
-    /**
-    This method is a callback to indicate the end of the element has been reached.
-    @param      aElement is a handle to the element's details.
-    @param      aErrorCode is the error code.
-                If this is not KErrNone then special action may be required.
-    */
-    void OnEndElementL( const RTagInfo& aElement, TInt aErrorCode );
-
-
-    /**
-    This method is a callback that sends the content of the element.
-    Not all the content may be returned in one go. The data may be sent in chunks.
-    When an OnEndElementL is received this means there is no more content to be sent.
-    @param      aBytes is the raw content data for the element. 
-                The client is responsible for converting the data to the
-                required character set if necessary.
-                In some instances the content may be binary and must not be converted.
-    @param      aErrorCode is the error code.
-                If this is not KErrNone then special action may be required.
-    */
-    void OnContentL( const TDesC8& aBytes, TInt aErrorCode );
-
-
-    /**
-    This method is a notification of the beginning of the scope of
-    a prefix-URI Namespace mapping.
-    This method is always called before the corresponding OnStartElementL method.
-    @param      aPrefix is the Namespace prefix being declared.
-    @param      aUri is the Namespace URI the prefix is mapped to.
-    @param      aErrorCode is the error code.
-                If this is not KErrNone then special action may be required.
-    */
-    void OnStartPrefixMappingL( const RString& aPrefix, const RString& aUri,
-                                       TInt aErrorCode );
-
-    /**
-    This method is a notification of the end of the scope of a prefix-URI mapping.
-    This method is called after the corresponding DoEndElementL method.
-    @param      aPrefix is the Namespace prefix that was mapped.
-    @param      aErrorCode is the error code.
-                If this is not KErrNone then special action may be required.
-    */
-    void OnEndPrefixMappingL( const RString& aPrefix, TInt aErrorCode );
-
-    /**
-    This method is a notification of ignorable whitespace in element content.
-    @param      aBytes are the ignored bytes from the document being parsed.
-    @param      aErrorCode is the error code.
-                If this is not KErrNone then special action may be required.
-    */
-    void OnIgnorableWhiteSpaceL( const TDesC8& aBytes, TInt aErrorCode );
-
-
-    /**
-    This method is a notification of a skipped entity. If the parser encounters an 
-    external entity it does not need to expand it - it can return the entity as aName 
-    for the client to deal with.
-    @param      aName is the name of the skipped entity.
-    @param      aErrorCode is the error code.
-                If this is not KErrNone then special action may be required.
-    */
-    void OnSkippedEntityL( const RString& aName, TInt aErrorCode );
-
-    /**
-    This method is a receive notification of a processing instruction.
-    @param      aTarget is the processing instruction target.
-    @param      aData is the processing instruction data. If empty none was supplied.
-    @param      aErrorCode is the error code.
-                If this is not KErrNone then special action may be required.
-    */
-    void OnProcessingInstructionL( const TDesC8& aTarget, const TDesC8& aData,
-                                          TInt aErrorCode );
-
-    /**
-    This method indicates an error has occurred.
-    @param      aError is the error code
-    */
-    void OnError( TInt aErrorCode );
-
-    /**
-    This method obtains the interface matching the specified uid.
-    @return     0 if no interface matching the uid is found.
-                Otherwise, the this pointer cast to that interface.
-    @param      aUid the uid identifying the required interface.
-    */
-    TAny* GetExtendedInterface( const TInt32 aUid );
-    
-    /**
-    This method is indicates there is no more data in the data supplier to parse.
-    If there is more data to parse the Start method should be called once there
-    is more data in the supplier to continue parsing.
-    */
-    virtual void OnOutOfData();
-
-public: // From MHTTPDataSupplier
-    /**
-    From MHTTPDataSupplier.
-
-    Obtains a data part from the supplier.
-    The data is guaranteed to survive until a call is made to ReleaseData().
-
-    @param      aDataPart The data part
-    @return     ETrue if this is the last part, EFalse otherwise
-    */
-    virtual TBool GetNextDataPart( TPtrC8& aDataPart );
-
-    /**
-    From MHTTPDataSupplier.
-
-    Releases the current data part being held at the data supplier.
-    This call indicates to the supplier that the part is no longer needed,
-    and another one can be supplied, if appropriate.
-    */
-    virtual void ReleaseData();
-
-    /**
-    From MHTTPDataSupplier.
-
-    Obtains the overall size of the data being supplied, if known to the
-    supplier. Where a body of data is supplied in several parts, this size is
-    the sum of all the part sizes. If the size is not known, KErrNotFound is 
-    returned; in this case the caller must use the return code of
-    GetNextDataPart() to find out when the data is complete.
-    @return     A size in bytes, or KErrNotFound if the size is not known.
-    */
-    virtual TInt OverallDataSize();
-
-    /**
-    From MHTTPDataSupplier.
-    Resets the data supplier. 
-    
-    This indicates to the data supplier that it should return to the first part
-    of the data. This could be used in a situation where the data consumer has
-    encountered an error and needs the data to be supplied afresh. Even if the
-    last part has been supplied (i.e. GetNextDataPart() has returned ETrue),
-    the data supplier should reset to the first part.
-    
-    @return     If the supplier cannot reset, it should return an error code,
-                otherwise it should return KErrNone, where the reset will be
-                assumed to have succeeded.
-    */
-    virtual TInt Reset();
-
-private:
-    CPnpPaosXml();
-    void ConstructL();
-
-    /**
-    Generates a random character string. The original descriptor contents is lost.
-    */
-    void GenerateNonceString( TDes8& aString );
-    
-    /**
-    * Fetch product model
-    * @since 2.0
-    * @return void
-    */ 
-    void FetchProductModelL( TDes8& aModel );
-
-    /** For parsing XML */
-    CParser* iParser;
-
-    /** Buffer for storing a http response (PAOS request) */
-    HBufC8* iPaosRequest;
-    /** Buffer for storing a http request (PAOS response) */
-    HBufC8* iPaosResponse;
-    /** The path for posting PAOS response to (responseConsumerURL) */
-    HBufC8* iPaosPostUrlPath;
-    /** messageID parameter PAOS spec:
-    "RECOMMENDED that the value of this attribute have nonce characteristic" */
-    HBufC8* iMessageId;
-    /** refToMessageID parameter; references to the messageID of the PAOS query received.
-    PAOS spec: "RECOMMENDED that the value of this attribute have nonce characteristic" */
-    HBufC8* iReferenceMessageId;
-    TPaosStates iPaosStatus;
-    /** ETrue if there was the parameter responseConsumerURL in the xml,
-    EFalse otherwise */
-    TBool iResponseConsumerUrlFound;
-    /** Set to ETrue if parsing the XML caused a call to MContentHandler::OnError */
-    TBool iErrorFound;
-    /** An enum value for storing the current xml element */
-    TInt iCurrentElement;
-};
-
-#endif // PNP_PAOS_XML_H
--- a/pnpmobileservices/pnpms/ServiceHelpPlugin/Group/ServiceHelpPlugin.mmp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,82 +0,0 @@
-/*
-* Copyright (c) 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:  Project specification file for ServiceHelpPlugin.
-*
-*/
-
-#include <data_caging_paths.hrh>    //this is needed for RESOURCE_FILES_DIR
-
-// To get the MW_LAYER_SYSTEMINCLUDE-definition
-#include <platform_paths.hrh>
-
-
-
-CAPABILITY          CAP_ECOM_PLUGIN
-TARGET              servicehelpplugin.dll
-TARGETTYPE          PLUGIN
-UID                 0x10009D8D 0x20019597
-VENDORID            VID_DEFAULT
-
-SOURCEPATH          ../src
-
-
-SOURCE              ServiceHelpPlugin.cpp
-SOURCE              ServiceHelpPluginImplementationTable.cpp 
-
-USERINCLUDE         ../data ../../group
-USERINCLUDE         ../inc
-
-
-
-SYSTEMINCLUDE       .
-SYSTEMINCLUDE       /epoc32/include/cshelp
-SYSTEMINCLUDE       /epoc32/include/ecom
-// Default system include paths for middleware layer modules.
-APP_LAYER_SYSTEMINCLUDE
-
-
-SOURCEPATH          ../data
-
-//ECOM resource definition
-START RESOURCE      20019597.rss
-TARGET              servicehelpplugin.rsc
-TARGETPATH          ECOM_RESOURCE_DIR
-END                 //  ECOM resource definition
-
-LIBRARY             aknskins.lib // AknsUtils.h
-LIBRARY             avkon.lib 
-LIBRARY             bafl.lib
-LIBRARY             commonengine.lib // RConeResourceLoader
-LIBRARY             cone.lib
-LIBRARY             ecom.lib
-LIBRARY             efsrv.lib
-LIBRARY             egul.lib // CGulIcon
-LIBRARY             gsecomplugin.lib
-LIBRARY             gsframework.lib // Base classes
-LIBRARY		    akncapserverclient.lib  
-LIBRARY             aknicon.lib 
-LIBRARY             pnp.lib
-LIBRARY             eikcoctl.lib
-LIBRARY             eikcore.lib
-LIBRARY             euser.lib
-LIBRARY             ws32.lib
-LIBRARY             apparc.lib
-LIBRARY         featmgr.lib
-DEBUGLIBRARY    flogger.lib     // for logging
-
-
-
-SMPSAFE
-// End of File
-
--- a/pnpmobileservices/pnpms/ServiceHelpPlugin/Group/ServiceHelpPluginIcons.mk	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +0,0 @@
-#
-# Copyright (c) 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:  Icons for ServiceHelpPlugin
-#
-
-ifeq (WINS,$(findstring WINS, $(PLATFORM)))
-ZDIR=\epoc32\release\$(PLATFORM)\$(CFG)\Z
-else
-ZDIR=\epoc32\data\z
-endif
-
-# ----------------------------------------------------------------------------
-# Configure these
-# ----------------------------------------------------------------------------
-
-TARGETDIR=$(ZDIR)\resource\apps
-HEADERDIR=\epoc32\include
-ICONTARGETFILENAME=$(TARGETDIR)\ServiceHelpPlugin.mif
-HEADERFILENAME=$(HEADERDIR)\ServiceHelpPlugin.mbg
-
-do_nothing :
-	@rem do_nothing
-
-MAKMAKE : do_nothing
-
-BLD : do_nothing
-
-CLEAN : do_nothing
-
-LIB : do_nothing
-
-CLEANLIB : do_nothing
-
-# ----------------------------------------------------------------------------
-# Configure these.
-#
-# NOTE 1: DO NOT DEFINE MASK FILE NAMES! They are included automatically by
-# MifConv if the mask detph is defined.
-#
-# NOTE 2: Usually, source paths should not be included in the bitmap
-# definitions. MifConv searches for the icons in all icon directories in a
-# predefined order, which is currently \s60\icons, \s60\bitmaps2, \s60\bitmaps.
-# The directory \s60\icons is included in the search only if the feature flag
-# __SCALABLE_ICONS is defined.
-# ----------------------------------------------------------------------------
-
-RESOURCE :
-	mifconv $(ICONTARGETFILENAME) /h$(HEADERFILENAME) \
-		/c8,8 qgn_prop_set_apps_wml.svg
-
-FREEZE : do_nothing
-
-SAVESPACE : do_nothing
-
-RELEASABLES :
-	@echo $(HEADERFILENAME)&& \
-	@echo $(ICONTARGETFILENAME)
-
-FINAL : do_nothing
--- a/pnpmobileservices/pnpms/ServiceHelpPlugin/Group/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-/*
-* 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:  Information required for building ServiceHelpPlugin
-*
-*/
-
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-
-PRJ_MMPFILES
-
-
-ServiceHelpPlugin.mmp
-
-PRJ_EXTENSIONS
-
-START EXTENSION s60/mifconv
-OPTION TARGETFILE ServiceHelpPlugin.mif
-OPTION HEADERFILE ServiceHelpPlugin.mbg
-OPTION SOURCES -c8,8 qgn_prop_set_apps_wml
-END
-
-
-
-PRJ_TESTMMPFILES
-
-//  End of File
--- a/pnpmobileservices/pnpms/ServiceHelpPlugin/data/20019597.rss	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-/*
-* Copyright (c) 2001 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:  ECOM plugin resource file for ServiceHelpPlugin.
-*
-*/
-
-#include <ecom/registryinfo.rh>
-
-RESOURCE REGISTRY_INFO theInfo
-    {
-    dll_uid     = 0x20019597;
-    interfaces  =
-        {
-        INTERFACE_INFO
-            {
-            interface_uid   = 0x10207236;
-            implementations =
-                {
-                IMPLEMENTATION_INFO
-                    {
-			implementation_uid  = 0x20019598;
-                        version_no          = 1;
-                        display_name        = "ServiceHelp Plugin";
-                        default_data        = "0x10283317 "; //CP Plugin id of Device Management
-                		opaque_data         = "45";         // Order number 
-
-                    
-                    }
-                };
-            }
-        };
-    }
-
--- a/pnpmobileservices/pnpms/ServiceHelpPlugin/inc/ServiceHelpPlugin.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,178 +0,0 @@
-/*
-* Copyright (c) 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:  ServiceHelpPlugin implementation.
-*
-*/
-
-#ifndef ServiceHelpPlugin_H
-#define ServiceHelpPlugin_H
-
-// User includes
-
-// System includes
-#include <gsplugininterface.h>
-#include <aknview.h>
-#include <ConeResLoader.h>
-#include <eikclb.h>
-#include <AknServerApp.h>
-#include <AknCapServerClient.h>
-#include <gsbasecontainer.h>
-
-// Classes referenced
-class CAknNavigationDecorator;
-class CAknViewAppUi;
-
-// Constants
-const TUid KServiceHelpPluginUID       = { 0x20019598 };
-_LIT( KOperatorLogoResourceFileName, "z:PnpProvisioning.rsc" );
-_LIT( KServiceHelpPluginIconDirAndName, "z:ServiceHelpPlugin.mif"); // Use KDC_BITMAP_DIR
-
-
-
-// CLASS DECLARATION
-
-
-/**
-* CServiceHelpPlugin.
-*
-* This class handles state and application logic of OperatorLogo settings.
-* The plugin is a type of EGSItemTypeSettingDialog and therefore the GS FW will
-* call HandleSelection() instead of DoActivate(). No CAknView functionality is
-* supported even though the base class is CAknView derived via
-* CGSPluginInterface.
-*
-*/
-class CServiceHelpPlugin : public CGSPluginInterface,
-                        public MAknServerAppExitObserver// Embedding
-    {
-    public: // Constructors and destructor
-
-        /**
-        * Symbian OS two-phased constructor
-        * @return
-        */
-        static CServiceHelpPlugin* NewL( TAny* aInitParams );
-
-        /**
-        * Destructor.
-        */
-        ~CServiceHelpPlugin();
-
-    public: // From CAknView
-
-        /**
-        * See base class.
-        */
-        TUid Id() const;
-
-    public: // From CGSPluginInterface
-
-        /**
-        * See base class.
-        */
-        void GetCaptionL( TDes& aCaption ) const;
-
-        /**
-        * See base class.
-        */
-        TInt PluginProviderCategory() const;
-
-        /**
-        * See base class.
-        */
-        TGSListboxItemTypes ItemType();
-
-        /**
-        * See base class.
-        */
-        void GetValue( const TGSPluginValueKeys aKey,
-                       TDes& aValue );
-
-        /**
-        * See base class.
-        */
-        void HandleSelection( const TGSSelectionTypes aSelectionType );
-        
-        /**
-        * See base class.
-        */
-        CGulIcon* CreateIconL( const TUid aIconType );
-
-	/**
-	 *Launch Online Support 
-         */
-	void LaunchOnlineSupportL();
-  	
-	
-        
-    protected: // New
-
-        /**
-        * C++ default constructor.
-        */
-        CServiceHelpPlugin();
-
-        /**
-        * Symbian OS default constructor.
-        */
-        void ConstructL();
-
-    protected: // From CAknView
-
-        /**
-        * This implementation is empty because this class, being just a dialog,
-        * does not implement the CAknView finctionality.
-        */
-        void DoActivateL( const TVwsViewId& aPrevViewId,
-                          TUid aCustomMessageId,
-                          const TDesC8& aCustomMessage );
-
-        /**
-        * This implementation is empty because this class, being just a dialog,
-        * does not implement the CAknView finctionality.
-        */
-        void DoDeactivate();
-
-    private: // New
-
-        /**
-        * Opens localized resource file.
-        */
-        void OpenLocalizedResourceFileL(
-            const TDesC& aResourceFileName,
-            RConeResourceLoader& aResourceLoader );
-
-        
-	  /**
-    	    * Suppress the menu/app key when reminder dialog is displayed
-	    * @param ETrue to Suppress, else EFalse
-	    * @return None
-    	    */
-	
-	void SuppressAppKey(TBool aValue);
-
-	private:	//data
-		
-    	//Holds the state of menu/app key supress
-	TBool iIsAppKeySuppressed;
-        
-      protected: // Data
-     
-        // Resource loader.
-        RConeResourceLoader iResources;        
-        
-    };
-
-#endif // ServiceHelpPlugin_H
-// End of File
--- a/pnpmobileservices/pnpms/ServiceHelpPlugin/inc/ServicePluginLogger.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,152 +0,0 @@
-/*
-* 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:  This file defines logging interface macros
-*
-*/
-
-
-#ifndef __LOGGER_H__
-#define __LOGGER_H__
-
-// Set logging on only for debug builds as Paos filter is a critical component
-// when considering browser performance
-#ifdef _DEBUG
-    #define LOGGING_ENABLED
-#endif
-#ifdef LOGGING_ENABLED          // This must be enabled to use logging system
-
-#define LOGGER_LOGGING          // Log to Logger
-
-
-
-#ifdef LOGGER_LOGGING
-
-//  INCLUDES
-#include <flogger.h>
-
-// LOG SETTINGS 
-_LIT( KLogFolder, "PnP" );
-_LIT( KLogFile, "ServicePlugin.TXT" );
-
-#endif
-
-// CONSTANTS  
-// None.
-
-// MACROS
-/*
------------------------------------------------------------------------------
-
-    INTERNAL MACROs. 
-
-    DO NOT USE THESE DIRECTLY !!! 
-    SEE EXTERNAL MACROS
-
------------------------------------------------------------------------------
-*/
-
-#ifdef LOGGER_LOGGING
-
-
-#define INTRLOGTEXT( AAA )                                                                                        \
-    {                                                                                                            \
-    RFileLogger::Write( KLogFolder(), KLogFile(), EFileLoggingModeAppend, AAA );            \
-    }
-#define INTRLOGSTRING( AAA )                                                                                    \
-    {                                                                                                            \
-    _LIT( tempLogDes, AAA );                                                                                    \
-    RFileLogger::Write( KLogFolder(), KLogFile(), EFileLoggingModeAppend, tempLogDes() );    \
-    }
-#define INTRLOGSTRING2( AAA, BBB )                                                                                \
-    {                                                                                                            \
-    _LIT( tempLogDes, AAA );                                                                                    \
-    RFileLogger::WriteFormat( KLogFolder(), KLogFile(), EFileLoggingModeAppend, TRefByValue<const TDesC>( tempLogDes()), BBB ); \
-    }
-#define INTRLOGSTRING3( AAA, BBB, CCC )                                                                            \
-    {                                                                                                            \
-    _LIT( tempLogDes, AAA );                                                                                    \
-    RFileLogger::WriteFormat( KLogFolder(), KLogFile(), EFileLoggingModeAppend, TRefByValue<const TDesC>( tempLogDes()), BBB, CCC ); \
-    }
-
-#define INTRLOGRSTRING( AAA, BBB ) \
-    { \
-    TPtrC8 string8 = BBB.DesC(); \
-    HBufC* buf = HBufC::NewLC( string8.Length() ); \
-    buf->Des().Copy( string8 ); \
-    LOGSTRING2( AAA, buf ); \
-    CleanupStack::PopAndDestroy( buf ); \
-    }
-
-#else
-#define INTRLOGTEXT( AAA )
-#define INTRLOGSTRING( AAA )
-#define INTRLOGSTRING2( AAA, BBB )
-#define INTRLOGSTRING3( AAA, BBB, CCC )
-#define INTRLOGRSTRING( AAA, BBB )
-#endif
-
-/*
------------------------------------------------------------------------------
-
-    EXTERNAL MACROs
-
-    USE THESE MACROS IN YOUR CODE !
-
------------------------------------------------------------------------------
-*/
-
-
-#define LOGTEXT( AAA )                { \
-                                    INTRLOGTEXT( AAA ); \
-                                    }   // Example: LOGTEXT( own_desc );
-
-#define LOGSTRING( AAA )            { \
-                                    INTRLOGSTRING( AAA ); \
-                                    }   // Example: LOGSTRING( "Test" );
-
-#define LOGSTRING2( AAA, BBB )        { \
-                                    INTRLOGSTRING2( AAA, BBB ); \
-                                    }  // Example: LOGSTRING( "Test %i", aValue );
-
-#define LOGSTRING3( AAA, BBB, CCC )    { \
-                                    INTRLOGSTRING3( AAA, BBB, CCC ); \
-                                    } // Example: LOGSTRING( "Test %i %i", aValue1, aValue2 );
-
-#define LOGRSTRING( AAA, BBB )    { \
-                                    INTRLOGRSTRING( AAA, BBB ); \
-                                    } // Example: LOGRSTRING( "Test %i", RString1 );
-
-#else   // LOGGING_ENABLED
-
-#define LOGTEXT( AAA ) 
-#define LOGSTRING( AAA ) 
-#define LOGSTRING2( AAA, BBB )    
-#define LOGSTRING3( AAA, BBB, CCC )    
-#define LOGRSTRING( AAA, BBB )
-
-#endif  // LOGGING_ENABLED
-
-// DATA TYPES
-// None.
-
-// FUNCTION PROTOTYPES
-// None.
-
-// FORWARD DECLARATIONS
-// None.
-
-// CLASS DECLARATION
-// None.
-
-#endif  // __LOGGER_H__
--- a/pnpmobileservices/pnpms/ServiceHelpPlugin/src/ServiceHelpPlugin.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,293 +0,0 @@
-/*
-* Copyright (c) 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:  ServiceHelpPlugin implementation.
-*
-*/
-
-
-// User includes
-#include    "ServiceHelpPlugin.h"
-
-#include    <gsparentplugin.h>
-#include    <gscommon.hrh>
-#include    <PnpProvisioning.rsg>
-#include    <ServiceHelpPlugin.mbg>
-#include    <gsprivatepluginproviderids.h>
-#include    <gsfwviewuids.h>
-#include    <gsbaseview.h>
-
-// System includes
-#include    <AknWaitDialog.h>
-#include    <aknViewAppUi.h>
-#include    <bautils.h>
-#include    <StringLoader.h>
-#include    <badesca.h>
-#include    <PnpProvUtil.h>
-#include    <featmgr.h>
-#include    "ServicePluginLogger.h"
-
-
-
-// ========================= MEMBER FUNCTIONS ================================
-
-// ---------------------------------------------------------------------------
-// CServiceHelpPlugin::CServiceHelpPlugin()
-// Constructor
-// ---------------------------------------------------------------------------
-//
-CServiceHelpPlugin::CServiceHelpPlugin()
-    : iResources( *iCoeEnv )
-    {
-    }
-
-
-// ---------------------------------------------------------------------------
-// CServiceHelpPlugin::~CServiceHelpPlugin()
-// Destructor
-// ---------------------------------------------------------------------------
-//
-CServiceHelpPlugin::~CServiceHelpPlugin()
-    {
-    iResources.Close();
-
-    
-    }
-
-
-// ---------------------------------------------------------------------------
-// CServiceHelpPlugin::ConstructL(const TRect& aRect)
-// Symbian OS two-phased constructor
-// ---------------------------------------------------------------------------
-//
-void CServiceHelpPlugin::ConstructL()
-    {	
-       LOGSTRING("ContructL");
-     
-	OpenLocalizedResourceFileL( KOperatorLogoResourceFileName, iResources );
-    
-     
-    }
-
-
-// ---------------------------------------------------------------------------
-// CServiceHelpPlugin::NewL()
-// Static constructor
-// ---------------------------------------------------------------------------
-//
-CServiceHelpPlugin* CServiceHelpPlugin::NewL( TAny* /*aInitParams*/ )
-    {
- 
-    
-    LOGSTRING("NewL - CServiceHelpPlugin ");
-    CServiceHelpPlugin* self = new( ELeave ) CServiceHelpPlugin();
-    CleanupStack::PushL(self);
-    self->ConstructL();
-    CleanupStack::Pop(self);
-    return self;
-
-    
-    }
-
-
-// -----------------------------------------------------------------------------
-// CServiceHelpPlugin::Id
-// -----------------------------------------------------------------------------
-//
-TUid CServiceHelpPlugin::Id() const
-    {
-    return KServiceHelpPluginUID;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CServiceHelpPlugin::DoActivateL
-// -----------------------------------------------------------------------------
-//
-void CServiceHelpPlugin::DoActivateL( const TVwsViewId& /*aPrevViewId*/,
-                                  TUid /*aCustomMessageId*/,
-                                  const TDesC8& /*aCustomMessage*/ )
-    {
-
-    }
-
-
-// -----------------------------------------------------------------------------
-// CServiceHelpPlugin::DoDeactivate
-// -----------------------------------------------------------------------------
-//
-void CServiceHelpPlugin::DoDeactivate()
-    {
-
-
-    }
-
-
-// ========================= From CGSPluginInterface ==================
-
-
-// -----------------------------------------------------------------------------
-// CServiceHelpPlugin::GetCaptionL
-// -----------------------------------------------------------------------------
-//
-void CServiceHelpPlugin::GetCaptionL( TDes& aCaption ) const
-    {    
-
-    LOGSTRING("NewL - GetCaptionL ");
-    HBufC* result = StringLoader::LoadL( R_TEXT_PLUGIN_CAPTION );
-    aCaption.Copy( *result );
-    delete result;
-
-    LOGSTRING("NewL - GetCaptionL - Done");
-    
-    }
-
-
-// -----------------------------------------------------------------------------
-// CServiceHelpPlugin::PluginProviderCategory
-// -----------------------------------------------------------------------------
-//
-TInt CServiceHelpPlugin::PluginProviderCategory() const
-    {
-    return KGSPluginProviderInternal;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CServiceHelpPlugin::ItemType()
-// -----------------------------------------------------------------------------
-//
-TGSListboxItemTypes CServiceHelpPlugin::ItemType()
-    {
-    return EGSItemTypeSettingDialog;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CServiceHelpPlugin::GetValue()
-// -----------------------------------------------------------------------------
-//
-void CServiceHelpPlugin::GetValue( const TGSPluginValueKeys /*aKey*/,
-                                      TDes& /*aValue*/ )
-    {
-    }
-
-
-// -----------------------------------------------------------------------------
-// CServiceHelpPlugin::HandleSelection()
-// -----------------------------------------------------------------------------
-//
-void CServiceHelpPlugin::HandleSelection(
-    const TGSSelectionTypes /*aSelectionType*/ )
-    {
-    
-    TRAP_IGNORE(  LaunchOnlineSupportL() );
-   
-    }
-
-
-
-// ---------------------------------------------------------------------------
-// CServiceHelpPlugin::CreateIconL
-// ---------------------------------------------------------------------------
-//
-CGulIcon* CServiceHelpPlugin::CreateIconL( const TUid aIconType )
-    {
-   
-    LOGSTRING("NewL - CreateIconL ");
-   //EMbm<Mbm_file_name><Bitmap_name>
-    CGulIcon* icon;
-    TParse* fp = new( ELeave ) TParse();
-    CleanupStack::PushL( fp );
-    fp->Set( KServiceHelpPluginIconDirAndName, &KDC_BITMAP_DIR, NULL );
-
-    if ( aIconType == KGSIconTypeLbxItem )
-        {
-        icon = AknsUtils::CreateGulIconL(
-        AknsUtils::SkinInstance(),
-        KAknsIIDQgnPropSetAppsWml,
-        fp->FullName(),//qgn_prop_set_apps_wml.svg
-        EMbmServicehelppluginQgn_prop_set_apps_wml,
-        EMbmServicehelppluginQgn_prop_set_apps_wml_mask );
-        }    
-    else
-        {
-        icon = CGSPluginInterface::CreateIconL( aIconType );
-        }
-        
-    CleanupStack::PopAndDestroy( fp );
-
-    LOGSTRING("NewL - CreateIconL - Done ");
-    return icon;
-	
-   }
-
-
-// -----------------------------------------------------------------------------
-// CServiceHelpPlugin::OpenLocalizedResourceFileL()
-// -----------------------------------------------------------------------------
-//
-void CServiceHelpPlugin::OpenLocalizedResourceFileL(
-    const TDesC& aResourceFileName,
-    RConeResourceLoader& aResourceLoader )
-    {
-    
-    LOGSTRING("NewL - OpenLocalizedResourceFileL ");
-
-    RFs fsSession;
-    User::LeaveIfError( fsSession.Connect() );
-
-    CleanupClosePushL(fsSession);
-
-    // Find the resource file:
-    TParse parse;
-    parse.Set( aResourceFileName, &KDC_APP_RESOURCE_DIR, NULL );
-    TFileName fileName( parse.FullName() );
-
-    // Get language of resource file:
-    BaflUtils::NearestLanguageFile( fsSession, fileName );
-
-    // Open resource file:
-    aResourceLoader.OpenL( fileName );
-
-    
-    CleanupStack::PopAndDestroy(); //fssession
-
-    LOGSTRING("NewL - OpenLocalizedResourceFileL End ");
-
-    }
-    
-// -----------------------------------------------------------------------------
-// CServiceHelpPlugin::LaunchonlinesupportL()
-// -----------------------------------------------------------------------------
-//
-
-void CServiceHelpPlugin::LaunchOnlineSupportL()
-    {
-
-      LOGSTRING("NewL - LaunchOnlineSupportL ");
-
-      // To Launch online suppport Use PNPMS Provisioning utilities for PNPMS services
-      TBufC<1> Nullval(_L(""));
-      
-      CPnpProvUtil *prov = CPnpProvUtil::NewLC();
-      TRAP_IGNORE(prov->LaunchOnlineSupportL(Nullval, EUserTriggered, EStartInteractive,  EFalse, Nullval)); 
-      CleanupStack::PopAndDestroy();
-
-       LOGSTRING("NewL - LaunchOnlineSupportL END ");
-
-    }
-
-
-
-// End of file
--- a/pnpmobileservices/pnpms/ServiceHelpPlugin/src/ServiceHelpPluginImplementationTable.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-/*
-* Copyright (c) 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:  ECOM proxy table for ServiceHelpPlugin.
-*
-*/
-
-
-// User includes
-#include "ServiceHelpPlugin.h"
-
-// System includes
-#include <e32std.h>
-#include <implementationproxy.h>
-
-
-// Constants
-const TImplementationProxy KServiceHelpPluginImplementationTable[] =
-    {
-    IMPLEMENTATION_PROXY_ENTRY( 0x20019598,  CServiceHelpPlugin::NewL )
-    };
-
-
-// ---------------------------------------------------------------------------
-// ImplementationGroupProxy
-// Gate/factory function
-//
-// ---------------------------------------------------------------------------
-//
-
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy(
-    TInt& aTableCount )
-    {
-    aTableCount = sizeof( KServiceHelpPluginImplementationTable )
-        / sizeof( TImplementationProxy );
-    return KServiceHelpPluginImplementationTable;
-    }
-
-// End of File
Binary file pnpmobileservices/pnpms/cenrep/keys_pnpms.xls has changed
Binary file pnpmobileservices/pnpms/conf/pnpms.confml has changed
Binary file pnpmobileservices/pnpms/conf/pnpms_10204338.crml has changed
Binary file pnpmobileservices/pnpms/conf/pnpms_1020433A.crml has changed
Binary file pnpmobileservices/pnpms/conf/pnpms_10272D33.crml has changed
--- a/pnpmobileservices/pnpms/eabi/NHwrParser.DEF	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-EXPORTS
-	_ZN19CNHeadWrapperParser4NewLERK6TPtrC8 @ 1 NONAME
-	_ZN19CNHeadWrapperParser5ParseEv @ 2 NONAME
-	_ZN19CNHeadWrapperParserD0Ev @ 3 NONAME
-	_ZN19CNHeadWrapperParserD1Ev @ 4 NONAME
-	_ZN19CNHeadWrapperParserD2Ev @ 5 NONAME
-	_ZNK19CNHeadWrapperParser11GetContentLEv @ 6 NONAME
-	_ZNK19CNHeadWrapperParser11GetHeadersLEv @ 7 NONAME
-	_ZNK19CNHeadWrapperParser13GetReportUrlLEv @ 8 NONAME
-	_ZNK19CNHeadWrapperParser15GetContentTypeLEv @ 9 NONAME
-	_ZNK19CNHeadWrapperParser18GetUserInteractionEv @ 10 NONAME
-	_ZNK19CNHeadWrapperParser25GetProvisioningActivationEv @ 11 NONAME
-	_ZTI16CHttpProvContent @ 12 NONAME ; #<TI>#
-	_ZTI16CHttpProvHeaders @ 13 NONAME ; #<TI>#
-	_ZTI19CNHeadWrapperParser @ 14 NONAME ; #<TI>#
-	_ZTI20CHttpProvContentType @ 15 NONAME ; #<TI>#
-	_ZTV16CHttpProvContent @ 16 NONAME ; #<VT>#
-	_ZTV16CHttpProvHeaders @ 17 NONAME ; #<VT>#
-	_ZTV19CNHeadWrapperParser @ 18 NONAME ; #<VT>#
-	_ZTV20CHttpProvContentType @ 19 NONAME ; #<VT>#
-
--- a/pnpmobileservices/pnpms/eabi/PnP.DEF	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-EXPORTS
-	_Z12NewPnpUtilLCv @ 1 NONAME
-	_ZN12CPnpUtilImpl11GetKeyInfoLER5TDes8 @ 2 NONAME
-	_ZN12CPnpUtilImpl11SetHomeMccLE4TBufILi4EE @ 3 NONAME
-	_ZN12CPnpUtilImpl11SetHomeMncLE4TBufILi8EE @ 4 NONAME
-	_ZN12CPnpUtilImpl13GetTokenValueERi @ 5 NONAME
-	_ZN12CPnpUtilImpl14CreateNewTokenEmRi @ 6 NONAME
-	_ZN12CPnpUtilImpl14SetNetworkMccLE4TBufILi4EE @ 7 NONAME
-	_ZN12CPnpUtilImpl14SetNetworkMncLE4TBufILi8EE @ 8 NONAME
-	_ZN12CPnpUtilImpl15CreateNewNonceLEjR5TDes8 @ 9 NONAME
-	_ZN12CPnpUtilImpl16OperatorLongNameER4TBufILi20EE @ 10 NONAME
-	_ZN12CPnpUtilImpl16StoreAccessPointEm @ 11 NONAME
-	_ZN12CPnpUtilImpl16VerifySignatureLERK6TDesC8S2_S2_S2_ @ 12 NONAME
-	_ZN12CPnpUtilImpl17FetchNetworkInfoLEv @ 13 NONAME
-	_ZN12CPnpUtilImpl20GetTokenValidityTimeEv @ 14 NONAME
-	_ZN12CPnpUtilImpl21FetchHomeNetworkInfoLEv @ 15 NONAME
-	_ZN12CPnpUtilImpl21GetNonceValidityTimeLEv @ 16 NONAME
-	_ZN12CPnpUtilImpl24RegisteredInHomeNetworkLEv @ 17 NONAME
-	_ZN12CPnpUtilImpl5NewLCEv @ 18 NONAME
-	_ZN12CPnpUtilImpl7VersionER6TDes16 @ 19 NONAME
-	_ZN12CPnpUtilImpl9GetNonceLER5TDes8 @ 20 NONAME
-	_ZN12CPnpUtilImplD0Ev @ 21 NONAME
-	_ZN12CPnpUtilImplD1Ev @ 22 NONAME
-	_ZN12CPnpUtilImplD2Ev @ 23 NONAME
-	_ZNK12CPnpUtilImpl11NetworkMccLEv @ 24 NONAME
-	_ZNK12CPnpUtilImpl11NetworkMncLEv @ 25 NONAME
-	_ZNK12CPnpUtilImpl14FormatMncCodeLE4TBufILi4EES0_ILi8EERS2_ @ 26 NONAME
-	_ZNK12CPnpUtilImpl5ImsiLER4TBufILi15EE @ 27 NONAME
-	_ZNK12CPnpUtilImpl8HomeMccLEv @ 28 NONAME
-	_ZNK12CPnpUtilImpl8HomeMncLEv @ 29 NONAME
-	_ZTI12CPnpUtilImpl @ 30 NONAME ; #<TI>#
-	_ZTV12CPnpUtilImpl @ 31 NONAME ; #<VT>#
-	_ZN12CPnpProvUtil18GetApplicationUidLEv @ 32 NONAME
-	_ZN12CPnpProvUtil18SetApplicationUidLEm @ 33 NONAME
-	_ZN12CPnpProvUtil20LaunchOnlineSupportLER7TDesC1614TConnectReason10TStartModeiS1_ @ 34 NONAME
-	_ZN12CPnpProvUtil20SetProvAdapterAppIdLER7TDesC16 @ 35 NONAME
-	_ZN12CPnpProvUtil21GetProvAdapterAppIdsLER13RPointerArrayI7HBufC16E @ 36 NONAME
-	_ZN12CPnpProvUtil24ConstructUriWithPnPUtilLER6TDes168TServers @ 37 NONAME
-	_ZN12CPnpProvUtil5NewLCEv @ 38 NONAME
-	_ZTI12CPnpProvUtil @ 39 NONAME ; #<TI>#
-	_ZTV12CPnpProvUtil @ 40 NONAME ; #<VT>#
-	_ZThn4_N12CPnpUtilImpl11GetKeyInfoLER5TDes8 @ 41 NONAME ; #<thunk>#
-	_ZThn4_N12CPnpUtilImpl14SetNetworkMccLE4TBufILi4EE @ 42 NONAME ; #<thunk>#
-	_ZThn4_N12CPnpUtilImpl14SetNetworkMncLE4TBufILi8EE @ 43 NONAME ; #<thunk>#
-	_ZThn4_N12CPnpUtilImpl15CreateNewNonceLEjR5TDes8 @ 44 NONAME ; #<thunk>#
-	_ZThn4_N12CPnpUtilImpl17FetchNetworkInfoLEv @ 45 NONAME ; #<thunk>#
-	_ZThn4_N12CPnpUtilImpl21FetchHomeNetworkInfoLEv @ 46 NONAME ; #<thunk>#
-	_ZThn4_N12CPnpUtilImpl7VersionER6TDes16 @ 47 NONAME ; #<thunk>#
-	_ZThn4_N12CPnpUtilImpl9GetNonceLER5TDes8 @ 48 NONAME ; #<thunk>#
-	_ZThn4_NK12CPnpUtilImpl11NetworkMccLEv @ 49 NONAME ; #<thunk>#
-	_ZThn4_NK12CPnpUtilImpl11NetworkMncLEv @ 50 NONAME ; #<thunk>#
-	_ZThn4_NK12CPnpUtilImpl8HomeMccLEv @ 51 NONAME ; #<thunk>#
-	_ZThn4_NK12CPnpUtilImpl8HomeMncLEv @ 52 NONAME ; #<thunk>#
-
--- a/pnpmobileservices/pnpms/group/NHwrParser.mmp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-/*
-* Copyright (c) 2005-2006 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 definition file for project NHwrParser
-*
-*/
-
-
-// To get the APP_LAYER_SYSTEMINCLUDE-definition
-#include <platform_paths.hrh>
-#include <data_caging_paths.hrh>
-
-TARGET          nhwrparser.dll
-TARGETTYPE      DLL
-UID             0x10000079 0x10272D36
-
-CAPABILITY      CAP_GENERAL_DLL
-VENDORID        VID_DEFAULT
-
-SOURCEPATH      ../PnP/NHwrParser
-SOURCE          NHeadWrapperParser.cpp
-SOURCE          HttpProvHeaders.cpp
-SOURCE          HttpProvContent.cpp
-SOURCE          HttpProvContentType.cpp
-
-USERINCLUDE     . ../PnP/NHwrParser
-USERINCLUDE     ../PnpPaosFilter/src
-
-// Default system include paths for application layer modules.
-APP_LAYER_SYSTEMINCLUDE
-
-
-LIBRARY         euser.lib
-LIBRARY         hash.lib
-LIBRARY         pnp.lib
-DEBUGLIBRARY    flogger.lib     // for logging
-nostrictdef
-
-SMPSAFE
--- a/pnpmobileservices/pnpms/group/OnlineSupport.mmp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,93 +0,0 @@
-/*
-* Copyright (c) 2003-2006 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 definition file for project ServiceHelp
-*
-*/
-
-
-// To get the APP_LAYER_SYSTEMINCLUDE-definition
-#include <platform_paths.hrh>
-#include <bldvariant.hrh>
-#include <data_caging_paths.hrh>
-
-TARGET		    onlinesupport.exe
-TARGETTYPE	    exe
-EPOCSTACKSIZE	0x5000 //define our own stack as this is no longer provided by apprun
-UID		        0x100039CE 0x10204338
-SECUREID        0x10204338
-VENDORID		VID_DEFAULT
-CAPABILITY		CAP_APPLICATION PowerMgmt AllFiles
-
-
-SOURCEPATH      ../OnlineSupport/src
-SOURCE          CCMApplication.cpp
-SOURCE          CCMAppUi.cpp
-SOURCE          CCMDocument.cpp
-SOURCE          Ccmregistrationmonitor.cpp
-SOURCE          Ccmsocketsengine.cpp
-SOURCE			MiniBrowser.cpp
-SOURCE			ccmdialogmonitor.cpp
-
-
-
-START RESOURCE ../data/OnlineSupport.rss
-HEADER
-TARGETPATH APP_RESOURCE_DIR
-LANGUAGE_IDS
-END // RESOURCE
-
-START RESOURCE  ../aif/OnlineSupport_reg.rss
-DEPENDS onlinesupport.rsg
-// Do not change the UID below.
-TARGETPATH      /private/10003a3f/apps
-END
-
-USERINCLUDE     . ../OnlineSupport/inc
-USERINCLUDE     ../PnP/NHwrParser
-USERINCLUDE     ../PnpPaosFilter/src
-
-// Default system include paths for application layer modules.
-APP_LAYER_SYSTEMINCLUDE
-
-
-LIBRARY	        euser.lib 
-LIBRARY	        apparc.lib 
-LIBRARY	        cone.lib 
-LIBRARY	        eikcore.lib 
-LIBRARY	        avkon.lib
-LIBRARY	        apgrfx.lib
-LIBRARY	        commdb.lib          // for commdb
-LIBRARY	        efsrv.lib 
-LIBRARY	        aknnotify.lib
-LIBRARY	        filelist.lib        // for CFLDFileListContainer
-LIBRARY	        profileeng.lib      // for profileeng
-LIBRARY	        esock.lib           // for sockets
-LIBRARY	        etelmm.lib
-LIBRARY	        etel.lib
-LIBRARY	        inetprotutil.lib 
-LIBRARY	        commonengine.lib
-LIBRARY	        centralrepository.lib
-LIBRARY	        apengine.lib        // for creating new Init Access
-LIBRARY	        sysutil.lib
-LIBRARY	        http.lib            // for RHttpTransaction
-LIBRARY	        bafl.lib            // for RStringPool
-LIBRARY	        nhwrparser.lib
-LIBRARY	        provisioningengine.lib
-LIBRARY	        insock.lib
-LIBRARY	        httpfiltercommon.lib // for HttpFilterCommonStringsExt
-LIBRARY	        pnp.lib             // for CPnpUtilImpl
-LIBRARY	        aknskins.lib        // for CAknsBasicBackgroundControlContext
-DEBUGLIBRARY    flogger.lib         // for logging
-
-SMPSAFE
--- a/pnpmobileservices/pnpms/group/PnpPaosFilter.mmp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-/*
-* Copyright (c) 2005-2006 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 definition file for project PnpPaosFilter
-*
-*/
-
-
-// To get the APP_LAYER_SYSTEMINCLUDE-definition
-#include <platform_paths.hrh>
-
-TARGET          pnppaosfilter.dll
-TARGETTYPE      PLUGIN
-CAPABILITY      CAP_ECOM_PLUGIN
-VENDORID        VID_DEFAULT
-
-// ECom filter UID followed by Unique 3rd UID
-UID             0x10009D8D 0x10272D33
-
-SOURCEPATH      ../PnpPaosFilter/src
-SOURCE          PnpPaosFilter.cpp
-SOURCE          PnpPaosFilterDll.cpp
-SOURCE          PnpPaosXml.cpp
-
-// Default system include paths for application layer modules.
-APP_LAYER_SYSTEMINCLUDE
-
-SYSTEMINCLUDE   /epoc32/include/ecom
-
-START RESOURCE ../data/10272D33.rss
-TARGET pnppaosfilter.rsc
-END
-
-LIBRARY         bafl.lib pnp.lib
-LIBRARY         euser.lib
-LIBRARY         http.lib
-LIBRARY         inetprotutil.lib
-LIBRARY         ecom.lib
-LIBRARY         xmlframework.lib
-LIBRARY         efsrv.lib
-LIBRARY         apgrfx.lib		// RApaLsSession
-LIBRARY         apparc.lib		// CApaCommandLine
-LIBRARY         sysutil.lib
-LIBRARY         centralrepository.lib
-DEBUGLIBRARY    flogger.lib     // for logging
-
-SMPSAFE
--- a/pnpmobileservices/pnpms/group/PnpUtil.mmp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-/*
-* Copyright (c) 2004-2006 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 definition file for project PnpUtil
-*
-*/
-
-
-
-// To get the APP_LAYER_SYSTEMINCLUDE-definition
-#include <platform_paths.hrh>
-#include <data_caging_paths.hrh>
-
-
-TARGET          pnp.dll
-TARGETTYPE      DLL
-UID             0x10000079 0x1020433A
-TARGETPATH      /system/libs
-CAPABILITY      CAP_GENERAL_DLL
-VENDORID        VID_DEFAULT
-
-SOURCEPATH      ../src
-SOURCE          PnpUtil.cpp
-SOURCE          PnpUtilImpl.cpp
-SOURCE          PnpProvUtil.cpp
-
-USERINCLUDE     ../inc
-
-// Default system include paths for application layer modules.
-MW_LAYER_SYSTEMINCLUDE
-
-LIBRARY         euser.lib apparc.lib  apgrfx.lib
-LIBRARY         etelmm.lib
-LIBRARY         etel.lib
-LIBRARY	        cryptography.lib        // For RInteger, CRSASignature, CRSAPKCS1v15Verifier...
-LIBRARY	        hash.lib 
-LIBRARY         centralrepository.lib
-DEBUGLIBRARY    flogger.lib             //for logging
-
-nostrictdef
-
-
-SMPSAFE
--- a/pnpmobileservices/pnpms/group/Pnpprovisioning.mmp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,84 +0,0 @@
-/*
-* Copyright (c) 2004-2006 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 definition file for project PnpProvisioning
-*
-*/
-
-
-// To get the APP_LAYER_SYSTEMINCLUDE-definition
-#include <platform_paths.hrh>
-#include <bldvariant.hrh>
-#include <data_caging_paths.hrh>
-
-
-TARGET          pnpprovisioning.exe
-TARGETTYPE      exe
-EPOCSTACKSIZE	0x5000 //define our own stack as this is no longer provided by apprun
-UID             0x100039CE 0x10204339 
-
-
-VENDORID        VID_DEFAULT
-CAPABILITY      CAP_APPLICATION NetworkControl AllFiles // NetworkControl needed when closing connections
-
-SOURCEPATH      ../PnP/PnpProvisioningAppSrc
-SOURCE          PnpProvisioningApp.cpp 
-SOURCE          PnpProvisioningAppUi.cpp
-SOURCE          PnpProvisioningDocument.cpp
-SOURCE          PnpProvisioningSaver.cpp
-SOURCE          cwaitdialogmonitor.cpp
-SOURCE		PnpServiceActivation.cpp
-
-
-
-
-START RESOURCE ../PnpProvisioningAppData/PnpProvisioning.rss
-HEADER
-TARGETPATH APP_RESOURCE_DIR
-LANGUAGE_IDS
-END // RESOURCE
-
-
-START RESOURCE  ../PnpProvisioningAppAif/PnpProvisioning_reg.rss
-DEPENDS pnpprovisioning.rsg
-// Do not change the UID below.
-TARGETPATH      /private/10003a3f/apps
-LANGUAGE_IDS
-END
-	
-
-USERINCLUDE     . 
-USERINCLUDE     ../PnP/PnpProvisioningAppInc 
-USERINCLUDE     ../PnP/NHwrParser
-
-// Default system include paths for application layer modules.
-APP_LAYER_SYSTEMINCLUDE
-
-
-LIBRARY         euser.lib ws32.lib
-LIBRARY         apparc.lib
-LIBRARY         cone.lib
-LIBRARY         eikcore.lib
-LIBRARY         avkon.lib
-LIBRARY	        aknnotify.lib
-LIBRARY         favouritesengine.lib
-LIBRARY         aknskins.lib
-LIBRARY         commonengine.lib
-LIBRARY         apengine.lib provisioningengine.lib eikctl.lib
-LIBRARY         efsrv.lib hash.lib apgrfx.lib
-LIBRARY         commdb.lib		// for commdb
-LIBRARY         nhwrparser.lib charconv.lib
-LIBRARY         connmon.lib pnp.lib centralrepository.lib
-DEBUGLIBRARY    flogger.lib
-
-SMPSAFE
--- a/pnpmobileservices/pnpms/group/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-/*
-* Copyright (c) 2005-2006 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:  Build information file
-*
-*/
-
-#include <platform_paths.hrh>
-
-PRJ_EXPORTS
-../rom/OnlineSupport.iby						CORE_APP_LAYER_IBY_EXPORT_PATH(onlinesupport.iby)
-../rom/OnlineSupportResources.iby		LANGUAGE_APP_LAYER_IBY_EXPORT_PATH(onlinesupportresources.iby)
-../rom/Pnp.iby											CORE_APP_LAYER_IBY_EXPORT_PATH(pnp.iby)
-//../rom/PnPMS.iby										CORE_APP_LAYER_IBY_EXPORT_PATH(pnpms.iby)
-../rom/PnpPaosFilter.iby						CORE_APP_LAYER_IBY_EXPORT_PATH(pnppaosfilter.iby)
-../rom/PnpResources.iby							LANGUAGE_APP_LAYER_IBY_EXPORT_PATH(pnpresources.iby)
-
-../OnlineSupport/loc/OnlineSupport.loc						APP_LAYER_LOC_EXPORT_PATH(onlinesupport.loc)
-../PnP/loc/pnpprovisioning.loc	APP_LAYER_LOC_EXPORT_PATH(pnpprovisioning.loc)
-
-// Generic configuration interface for component cenrep settings  
-../conf/pnpms.confml                    APP_LAYER_CONFML(pnpms.confml)
-../conf/pnpms_10272D33.crml 	        APP_LAYER_CRML(pnpms_10272D33.crml)
-../conf/pnpms_1020433A.crml 	        APP_LAYER_CRML(pnpms_1020433A.crml)
-../conf/pnpms_10204338.crml 	        APP_LAYER_CRML(pnpms_10204338.crml)
-
-PRJ_PLATFORMS
-DEFAULT
-PRJ_MMPFILES
-
-#include "bld_paos.inf"
-//#include "bld_pnputil.inf"
-#include "bld_pnp.inf"
-#include "bld_servicehelp.inf"
-
-#include "../ServiceHelpPlugin/Group/bld.inf"
-
--- a/pnpmobileservices/pnpms/group/bld_paos.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-/*
-* Copyright (c) 2005-2006 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:  Build information file for project PnpPaosFilter
-*
-*/
-
-
-#include <bldvariant.hrh>
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-PRJ_MMPFILES
-// SIS-stub file
-// gnumakefile ../PnpPaosFilter/group/bld_paos_sis_stub.mk
-
-PnpPaosFilter.mmp
--- a/pnpmobileservices/pnpms/group/bld_pnp.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-/*
-* Copyright (c) 2005-2006 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:  Build information file
-*
-*/
-
-
-#include <bldvariant.hrh>
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-PRJ_MMPFILES
-// gnumakefile ../Pnp/group/icons_dc.mk
-// gnumakefile ../Pnp/group/icons_aif_scalable_dc.mk
-
-Pnpprovisioning.mmp
-recnhwr.mmp
-NHwrParser.mmp
--- a/pnpmobileservices/pnpms/group/bld_pnputil.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-/*
-* Copyright (c) 2005-2006 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:  Build information file for project PnpUtil
-*
-*/
-
-
-#include <bldvariant.hrh>
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-PRJ_MMPFILES
-
-PnpUtil.mmp
--- a/pnpmobileservices/pnpms/group/bld_servicehelp.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-/*
-* Copyright (c) 2005-2006 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:  Build information file for project ServiceHelp
-*
-*/
-
-
-#include <bldvariant.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-PRJ_MMPFILES
-// gnumakefile ../OnlineSupport/group/bldsis.mk
-// gnumakefile ../OnlineSupport/group/icons2_dc.mk
-// gnumakefile ../OnlineSupport/group/icons2_aif_scalable_dc.mk
-
-OnlineSupport.mmp
--- a/pnpmobileservices/pnpms/group/recnhwr.mmp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-/*
-* Copyright (c) 2004-2006 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 definition file for project RecNhwr
-*
-*/
-
-
-// To get the APP_LAYER_SYSTEMINCLUDE-definition
-#include <platform_paths.hrh>
-#include "bldvariant.hrh"
-
-target          recnhwr.dll
-targettype      PLUGIN
-UID             0x10009D8D 0x1020433B
-
-START RESOURCE  ../PnP/recnhwr/1020433B.rss
-TARGET          recnhwr.rsc
-END
-
-CAPABILITY      CAP_RECOGNISER
-VENDORID        VID_DEFAULT
-
-SOURCEPATH      ../PnP/recnhwr
-SOURCE          recnhwr.cpp
-
-USERINCLUDE     ../PnP/recnhwr
-
-// Default system include paths for application layer modules.
-APP_LAYER_SYSTEMINCLUDE
-SYSTEMINCLUDE   /epoc32/include/ecom    // needed by ecom plugins
-
-LIBRARY         euser.lib	
-LIBRARY         apmime.lib
-LIBRARY         efsrv.lib
-DEBUGLIBRARY    flogger.lib
-
-SMPSAFE
--- a/pnpmobileservices/pnpms/install/CentralRepositoryInit.pkg	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-;
-; Copyright (c) 2006-2006 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:  Package file for project PnPMS CentralRepositoryInit
-;
-
-; -------- general --------
-
-;Languages
-&EN
-
-; Package header
-#{"ServiceHelp Data"},(0x10202BE9),1,5,2,TYPE=PU
-
-;Localised Vendor name
-%{"Nokia"}
-
-;Unique Vendor name
-:"Nokia"
-
-; Dependency for S60 3.0
-[0x101F7961], 0, 0, 0, {"Series60ProductID"}
-
-; -------- files --------
-
-"\Epoc32\data\Z\private\10202BE9\10204338.txt"						-"!:\Private\10202BE9\10204338.txt"
-"\Epoc32\data\Z\private\10202BE9\1020433A.txt"						-"!:\private\10202be9\1020433A.txt"
-"\Epoc32\data\Z\private\10202BE9\10272D33.txt"						-"!:\private\10202be9\10272D33.txt"
--- a/pnpmobileservices/pnpms/install/MakeRndSignedFor30.bat	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-rem
-rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-rem All rights reserved.
-rem This component and the accompanying materials are made available
-rem under the terms of "Eclipse Public License v1.0"
-rem which accompanies this distribution, and is available
-rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
-rem
-rem Initial Contributors:
-rem Nokia Corporation - initial contribution.
-rem
-rem Contributors:
-rem
-rem Description: Implementation of PnPMS components
-rem
-
-makesis "PnpPaos_S3-0.pkg"
-signsis "PnpPaos_S3-0.SIS" PnpPaos_S3-0_signed.sis \s60\AppinstUi\internal\RD_RootCA\rd.cer \s60\AppinstUi\internal\RD_RootCA\rd-key.pem
-
-makesis "CentralRepositoryInit.pkg"
-signsis "CentralRepositoryInit.SIS" CentralRepositoryInit_signed.sis \s60\AppinstUi\internal\RD_RootCA\rd.cer \s60\AppinstUi\internal\RD_RootCA\rd-key.pem
-
-makesis "Support_w_Paos_S3-0.pkg"
-signsis "Support_w_Paos_S3-0.SIS" ServiceHelp_RnD_signed.sis \s60\AppinstUi\internal\RD_RootCA\rd.cer \s60\AppinstUi\internal\RD_RootCA\rd-key.pem
-
-del PnpPaos_S3-0.SIS
-del PnpPaos_S3-0_signed.sis
-del CentralRepositoryInit.SIS
-del CentralRepositoryInit_signed.sis
-del Support_w_Paos_S3-0.SIS
\ No newline at end of file
--- a/pnpmobileservices/pnpms/install/MakeRndSignedPatchFor30.bat	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-rem
-rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-rem All rights reserved.
-rem This component and the accompanying materials are made available
-rem under the terms of "Eclipse Public License v1.0"
-rem which accompanies this distribution, and is available
-rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
-rem
-rem Initial Contributors:
-rem Nokia Corporation - initial contribution.
-rem
-rem Contributors:
-rem
-rem Description: Implementation of PnPMS components
-rem
-
-makesis "PnpPaos_S3-0_patch.pkg"
-signsis "PnpPaos_S3-0_patch.SIS" PnpPaos_S3-0_signed.sis \s60\AppinstUi\internal\RD_RootCA\rd.cer \s60\AppinstUi\internal\RD_RootCA\rd-key.pem
-
-makesis "CentralRepositoryInit.pkg"
-signsis "CentralRepositoryInit.SIS" CentralRepositoryInit_signed.sis \s60\AppinstUi\internal\RD_RootCA\rd.cer \s60\AppinstUi\internal\RD_RootCA\rd-key.pem
-
-makesis "Support_w_Paos_S3-0_patch.pkg"
-signsis "Support_w_Paos_S3-0_patch.SIS" ServiceHelp_update_RnD_signed.sis \s60\AppinstUi\internal\RD_RootCA\rd.cer \s60\AppinstUi\internal\RD_RootCA\rd-key.pem
-
-del PnpPaos_S3-0_patch.SIS
-del PnpPaos_S3-0_signed.sis
-del CentralRepositoryInit.SIS
-del CentralRepositoryInit_signed.sis
-del Support_w_Paos_S3-0_patch.SIS
\ No newline at end of file
--- a/pnpmobileservices/pnpms/install/PnPNokiaS2-1.pkg	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +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 "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-;
-; Installation file for PnpNokia application
-;
-;Languages
-&EN
-;
-; UID is the app's UID
-;
-#{"PnpNokia (S2*1)"},(0x10204340),1,1,1
-;
-;Supports Series 60 v 2.0
-;This line indicates that this installation is for the Series 60 platform v2.0
-;This line must appear _exactly_ as shown below in the sis file
-;If this line is missing or incorrect, the sis file will not be able
-;to be installed on Series 60 v2.0 platforms
-(0x101F7960), 0, 0, 0, {"Series60ProductID"} 
-;
-; Files to install
-;
-"\Epoc32\release\thumb\urel\PnpNokia.app"					-"!:\system\apps\PnpNokia\PnpNokia.app"
-"\Epoc32\data\z\system\apps\PnpNokia\PnpNokia.rsc"			-"!:\system\apps\PnpNokia\PnpNokia.rsc"
-"\Epoc32\data\z\system\apps\PnpNokia\PnpNokia_caption.rsc"	-"!:\system\apps\PnpNokia\PnpNokia_caption.rsc"
-"\Epoc32\data\z\system\apps\PnpNokia\PnpNokia.aif"			-"!:\system\apps\PnpNokia\PnpNokia.aif"
-
--- a/pnpmobileservices/pnpms/install/PnpPaos_S3-0.pkg	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +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 "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-;
-; Installation file for OnlineSupport application with PAOS filter
-;
-;Languages
-&EN
-
-; The non-localised, globally unique vendor name (mandatory)
-:"Nokia"
-
-; List of localised vendor names - one per language. At least one must be provided (English [EN]). 
-; List must correspond to list of languages specified elsewhere in the .pkg
-;%{"Vendor-EN", "Vendor-FR"}
-%{"Nokia"}
-
-;
-; UID is the app's UID
-;
-#{"Paos (S3*0)"},(0x10272D33),1,5,3
-;
-
-;
-;Supports Series 60 v 3.0
-;This line indicates that this installation is for the Series 60 platform v3.0
-;This line must appear _exactly_ as shown below in the sis file
-;If this line is missing or incorrect, the sis file will not be able
-;to be installed
-[0x101F7961], 0, 0, 0, {"Series60ProductID"}
-
-;
-; Files to install
-;
-
-"\epoc32\release\armv5\urel\PnpPaosFilter.dll" - "!:\sys\bin\PnpPaosFilter.dll"
-"\epoc32\data\Z\Resource\Plugins\PnPPaosFilter.RSC" - "!:\Resource\plugins\PnPPaosFilter.RSC"
\ No newline at end of file
--- a/pnpmobileservices/pnpms/install/PnpPaos_S3-0_patch.pkg	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +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 "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-;
-; Installation file for OnlineSupport application with PAOS filter
-;
-;Languages
-&EN
-
-; The non-localised, globally unique vendor name (mandatory)
-:"Nokia"
-
-; List of localised vendor names - one per language. At least one must be provided (English [EN]). 
-; List must correspond to list of languages specified elsewhere in the .pkg
-;%{"Vendor-EN", "Vendor-FR"}
-%{"Nokia"}
-
-;
-; UID is the app's UID
-;
-#{"Paos (S3*0)"},(0x10272D33),1,5,3,TYPE=PU
-;
-
-;
-;Supports Series 60 v 3.0
-;This line indicates that this installation is for the Series 60 platform v3.0
-;This line must appear _exactly_ as shown below in the sis file
-;If this line is missing or incorrect, the sis file will not be able
-;to be installed
-[0x101F7961], 0, 0, 0, {"Series60ProductID"}
-
-;
-; Files to install
-;
-
-"\epoc32\release\armv5\urel\PnpPaosFilter.dll" - "!:\sys\bin\PnpPaosFilter.dll"
-"\epoc32\data\Z\Resource\Plugins\PnPPaosFilter.RSC" - "!:\Resource\plugins\PnPPaosFilter.RSC"
\ No newline at end of file
--- a/pnpmobileservices/pnpms/install/PnpPaos_S3-0_stub.pkg	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +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 "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-;
-; Installation file for OnlineSupport application with PAOS filter
-;
-;Languages
-&EN
-
-; The non-localised, globally unique vendor name (mandatory)
-:"Nokia"
-
-; List of localised vendor names - one per language. At least one must be provided (English [EN]). 
-; List must correspond to list of languages specified elsewhere in the .pkg
-;%{"Vendor-EN", "Vendor-FR"}
-%{"Nokia"}
-
-;
-; UID is the app's UID
-;
-#{"Paos (S3*0)"},(0x10272D33),1,5,3
-;
-
-;
-;Supports Series 60 v 3.0
-;This line indicates that this installation is for the Series 60 platform v3.0
-;This line must appear _exactly_ as shown below in the sis file
-;If this line is missing or incorrect, the sis file will not be able
-;to be installed
-[0x101F7961], 0, 0, 0, {"Series60ProductID"}
-
-;
-; Files to install
-;
-
-"\epoc32\release\armv5\urel\PnpPaosFilter.dll" - "!:\sys\bin\PnpPaosFilter.dll"
-"\epoc32\data\Z\Resource\Plugins\PnPPaosFilter.RSC" - "!:\Resource\plugins\PnPPaosFilter.RSC"
\ No newline at end of file
--- a/pnpmobileservices/pnpms/install/Support_S3-0_stub.pkg	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,164 +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 "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-;
-; Installation file for OnlineSupport application with PAOS filter
-;
-;Languages
-&EN
-
-; The non-localised, globally unique vendor name (mandatory)
-:"Nokia"
-
-; List of localised vendor names - one per language. At least one must be provided (English [EN]). 
-; List must correspond to list of languages specified elsewhere in the .pkg
-;%{"Vendor-EN", "Vendor-FR"}
-%{"Nokia"}
-
-;
-; UID is the app's UID
-;
-#{"ServiceHelp (S3*0)"},(0x10272D34),1,5,3
-;
-
-;
-;Supports Series 60 v 3.0
-;This line indicates that this installation is for the Series 60 platform v3.0
-;This line must appear _exactly_ as shown below in the sis file
-;If this line is missing or incorrect, the sis file will not be able
-;to be installed
-[0x101F7961], 0, 0, 0, {"Series60ProductID"}
-
-;
-; Files to install
-;
-
-"\Epoc32\release\armv5\urel\OnlineSupport.exe"						-"!:\sys\bin\OnlineSupport.exe"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r01"			-"!:\Resource\apps\onlinesupport.r01"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r02"			-"!:\Resource\apps\onlinesupport.r02"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r03"			-"!:\Resource\apps\onlinesupport.r03"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r04"			-"!:\Resource\apps\onlinesupport.r04"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r05"			-"!:\Resource\apps\onlinesupport.r05"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r06"			-"!:\Resource\apps\onlinesupport.r06"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r07"			-"!:\Resource\apps\onlinesupport.r07"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r08"			-"!:\Resource\apps\onlinesupport.r08"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r09"			-"!:\Resource\apps\onlinesupport.r09"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r10"			-"!:\Resource\apps\onlinesupport.r10"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r13"			-"!:\Resource\apps\onlinesupport.r13"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r14"			-"!:\Resource\apps\onlinesupport.r14"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r15"			-"!:\Resource\apps\onlinesupport.r15"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r16"			-"!:\Resource\apps\onlinesupport.r16"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r17"			-"!:\Resource\apps\onlinesupport.r17"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r18"			-"!:\Resource\apps\onlinesupport.r18"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r25"			-"!:\Resource\apps\onlinesupport.r25"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r26"			-"!:\Resource\apps\onlinesupport.r26"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r27"			-"!:\Resource\apps\onlinesupport.r27"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r28"			-"!:\Resource\apps\onlinesupport.r28"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r29"			-"!:\Resource\apps\onlinesupport.r29"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r30"			-"!:\Resource\apps\onlinesupport.r30"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r31"			-"!:\Resource\apps\onlinesupport.r31"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r32"			-"!:\Resource\apps\onlinesupport.r32"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r33"			-"!:\Resource\apps\onlinesupport.r33"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r37"			-"!:\Resource\apps\onlinesupport.r37"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r39"			-"!:\Resource\apps\onlinesupport.r39"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r42"			-"!:\Resource\apps\onlinesupport.r42"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r45"			-"!:\Resource\apps\onlinesupport.r45"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r49"			-"!:\Resource\apps\onlinesupport.r49"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r51"			-"!:\Resource\apps\onlinesupport.r51"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r54"			-"!:\Resource\apps\onlinesupport.r54"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r57"			-"!:\Resource\apps\onlinesupport.r57"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r59"			-"!:\Resource\apps\onlinesupport.r59"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r67"			-"!:\Resource\apps\onlinesupport.r67"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r68"			-"!:\Resource\apps\onlinesupport.r68"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r70"			-"!:\Resource\apps\onlinesupport.r70"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r76"			-"!:\Resource\apps\onlinesupport.r76"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r78"			-"!:\Resource\apps\onlinesupport.r78"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r79"			-"!:\Resource\apps\onlinesupport.r79"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r83"			-"!:\Resource\apps\onlinesupport.r83"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r93"			-"!:\Resource\apps\onlinesupport.r93"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r157"			-"!:\Resource\apps\onlinesupport.r157"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r158"			-"!:\Resource\apps\onlinesupport.r158"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r159"			-"!:\Resource\apps\onlinesupport.r159"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r160"			-"!:\Resource\apps\onlinesupport.r160"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r161"			-"!:\Resource\apps\onlinesupport.r161"
-"\Epoc32\data\Z\Private\10003A3F\APPS\OnlineSupport_REG.rsc"            -"!:\Private\10003A3F\import\APPS\OnlineSupport_reg.rsc"
-"\Epoc32\data\Z\Resource\Apps\OnlineSupport_aif.MIF"                    -"!:\Resource\Apps\OnlineSupport_aif.MIF"
-"\Epoc32\data\Z\Resource\Apps\OnlineSupport.MBM"                        -"!:\Resource\Apps\OnlineSupport.MBM"
-
-; no need to update
-;"\Epoc32\data\Z\private\10202BE9\10204338.txt"						-"!:\Private\10202BE9\import\10204338.txt"
-
-
-; PnpProvisioning App
-"\Epoc32\release\armv5\urel\PnpProvisioning.exe"				-"!:\sys\bin\PnpProvisioning.exe"
-"\Epoc32\data\Z\Resource\apps\PnpProvisioning.MBM"					-"!:\Resource\apps\PnpProvisioning.mbm"
-"\Epoc32\data\Z\Resource\apps\PnpProvisioning.MIF"					-"!:\Resource\Apps\PnpProvisioning.MIF"
-"\Epoc32\data\Z\Resource\apps\PnpProvisioning_aif.MBM"			-"!:\Resource\Apps\PnpProvisioning_aif.MBM";
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r01"			-"!:\Resource\apps\pnpprovisioning.r01"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r02"			-"!:\Resource\apps\pnpprovisioning.r02"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r03"			-"!:\Resource\apps\pnpprovisioning.r03"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r04"			-"!:\Resource\apps\pnpprovisioning.r04"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r05"			-"!:\Resource\apps\pnpprovisioning.r05"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r06"			-"!:\Resource\apps\pnpprovisioning.r06"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r07"			-"!:\Resource\apps\pnpprovisioning.r07"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r08"			-"!:\Resource\apps\pnpprovisioning.r08"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r09"			-"!:\Resource\apps\pnpprovisioning.r09"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r10"			-"!:\Resource\apps\pnpprovisioning.r10"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r13"			-"!:\Resource\apps\pnpprovisioning.r13"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r14"			-"!:\Resource\apps\pnpprovisioning.r14"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r15"			-"!:\Resource\apps\pnpprovisioning.r15"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r16"			-"!:\Resource\apps\pnpprovisioning.r16"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r17"			-"!:\Resource\apps\pnpprovisioning.r17"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r18"			-"!:\Resource\apps\pnpprovisioning.r18"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r25"			-"!:\Resource\apps\pnpprovisioning.r25"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r26"			-"!:\Resource\apps\pnpprovisioning.r26"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r27"			-"!:\Resource\apps\pnpprovisioning.r27"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r28"			-"!:\Resource\apps\pnpprovisioning.r28"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r29"			-"!:\Resource\apps\pnpprovisioning.r29"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r30"			-"!:\Resource\apps\pnpprovisioning.r30"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r31"			-"!:\Resource\apps\pnpprovisioning.r31"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r32"			-"!:\Resource\apps\pnpprovisioning.r32"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r33"			-"!:\Resource\apps\pnpprovisioning.r33"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r37"			-"!:\Resource\apps\pnpprovisioning.r37"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r39"			-"!:\Resource\apps\pnpprovisioning.r39"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r42"			-"!:\Resource\apps\pnpprovisioning.r42"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r45"			-"!:\Resource\apps\pnpprovisioning.r45"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r49"			-"!:\Resource\apps\pnpprovisioning.r49"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r51"			-"!:\Resource\apps\pnpprovisioning.r51"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r54"			-"!:\Resource\apps\pnpprovisioning.r54"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r57"			-"!:\Resource\apps\pnpprovisioning.r57"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r59"			-"!:\Resource\apps\pnpprovisioning.r59"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r67"			-"!:\Resource\apps\pnpprovisioning.r67"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r68"			-"!:\Resource\apps\pnpprovisioning.r68"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r70"			-"!:\Resource\apps\pnpprovisioning.r70"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r76"			-"!:\Resource\apps\pnpprovisioning.r76"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r78"			-"!:\Resource\apps\pnpprovisioning.r78"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r79"			-"!:\Resource\apps\pnpprovisioning.r79"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r83"			-"!:\Resource\apps\pnpprovisioning.r83"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r93"			-"!:\Resource\apps\pnpprovisioning.r93"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r157"			-"!:\Resource\apps\pnpprovisioning.r157"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r158"			-"!:\Resource\apps\pnpprovisioning.r158"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r159"			-"!:\Resource\apps\pnpprovisioning.r159"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r160"			-"!:\Resource\apps\pnpprovisioning.r160"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r161"			-"!:\Resource\apps\pnpprovisioning.r161"
-"\Epoc32\data\Z\Private\10003A3F\APPS\PnpProvisioning_REG.rsc"          -"!:\Private\10003A3F\import\APPS\PnpProvisioning_REG.rsc"
-"\epoc32\release\armv5\urel\recnhwr.dll"                                -"!:\sys\bin\recnhwr.dll"
-"\epoc32\data\Z\Resource\Plugins\recnhwr.rsc"                           -"!:\Resource\Plugins\recnhwr.rsc"
-"\Epoc32\release\armv5\urel\PnP.dll"                                    -"!:\sys\bin\PnP.dll"
-"\Epoc32\release\armv5\urel\NHwrParser.dll"                             -"!:\sys\bin\NHwrParser.dll"
-
-; Central Repository initialization file for PnP.dll
-; no need to update
-;"\Epoc32\data\Z\private\10202BE9\1020433A.txt"										-"!:\private\10202be9\import\1020433A.txt"
--- a/pnpmobileservices/pnpms/install/Support_w_Paos_S2-6.pkg	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,112 +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 "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-;
-; Installation file for OnlineSupport application with PAOS filter
-;
-;Languages
-&EN
-;
-; UID is the app's UID
-;
-#{"Online Support wPaos (S2*6)"},(0x10272D34),1,5,2
-;
-
-;Supports Series 60 v 2.6
-(0x10200BAB), 0, 0, 0, {"Series60ProductID"} 
-
-;
-; Files to install
-;
-
-; Online Support
-"\Epoc32\release\thumb\urel\OnlineSupport.app"						-"!:\system\apps\OnlineSupport\OnlineSupport.app"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport.r01"			-"!:\system\apps\OnlineSupport\OnlineSupport.r01"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport_caption.r01"	-"!:\system\apps\OnlineSupport\OnlineSupport_caption.r01"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport.r02"			-"!:\system\apps\OnlineSupport\OnlineSupport.r02"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport_caption.r02"	-"!:\system\apps\OnlineSupport\OnlineSupport_caption.r02"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport.r03"			-"!:\system\apps\OnlineSupport\OnlineSupport.r03"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport_caption.r03"	-"!:\system\apps\OnlineSupport\OnlineSupport_caption.r03"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport.r04"			-"!:\system\apps\OnlineSupport\OnlineSupport.r04"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport_caption.r04"	-"!:\system\apps\OnlineSupport\OnlineSupport_caption.r04"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport.r05"			-"!:\system\apps\OnlineSupport\OnlineSupport.r05"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport_caption.r05"	-"!:\system\apps\OnlineSupport\OnlineSupport_caption.r05"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport.r06"			-"!:\system\apps\OnlineSupport\OnlineSupport.r06"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport_caption.r06"	-"!:\system\apps\OnlineSupport\OnlineSupport_caption.r06"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport.r09"			-"!:\system\apps\OnlineSupport\OnlineSupport.r09"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport_caption.r09"	-"!:\system\apps\OnlineSupport\OnlineSupport_caption.r09"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport.r13"			-"!:\system\apps\OnlineSupport\OnlineSupport.r13"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport_caption.r13"	-"!:\system\apps\OnlineSupport\OnlineSupport_caption.r13"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport.r29"			-"!:\system\apps\OnlineSupport\OnlineSupport.r29"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport_caption.r29"	-"!:\system\apps\OnlineSupport\OnlineSupport_caption.r29"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport.r30"			-"!:\system\apps\OnlineSupport\OnlineSupport.r30"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport_caption.r30"	-"!:\system\apps\OnlineSupport\OnlineSupport_caption.r30"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport.r31"			-"!:\system\apps\OnlineSupport\OnlineSupport.r31"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport_caption.r31"	-"!:\system\apps\OnlineSupport\OnlineSupport_caption.r31"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport.r32"			-"!:\system\apps\OnlineSupport\OnlineSupport.r32"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport_caption.r32"	-"!:\system\apps\OnlineSupport\OnlineSupport_caption.r32"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport.r39"			-"!:\system\apps\OnlineSupport\OnlineSupport.r39"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport_caption.r39"	-"!:\system\apps\OnlineSupport\OnlineSupport_caption.r39"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport.r59"			-"!:\system\apps\OnlineSupport\OnlineSupport.r59"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport_caption.r59"	-"!:\system\apps\OnlineSupport\OnlineSupport_caption.r59"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport.r70"			-"!:\system\apps\OnlineSupport\OnlineSupport.r70"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport_caption.r70"	-"!:\system\apps\OnlineSupport\OnlineSupport_caption.r70"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport.aif"			-"!:\system\apps\OnlineSupport\OnlineSupport.aif"
-"\epoc32\data\Z\System\shareddata\10204338.ini"							-"C:\System\SharedData\10204338.ini"
-
-; PNP provisioning
-"\Epoc32\release\thumb\urel\PnpProvisioning.app"							-"!:\system\apps\PnpProvisioning\PnpProvisioning.app"
-"\Epoc32\data\z\system\apps\PnpProvisioning\PnpProvisioning.r01"			-"!:\system\apps\PnpProvisioning\PnpProvisioning.r01"
-"\Epoc32\data\z\system\apps\PnpProvisioning\PnpProvisioning.r02"			-"!:\system\apps\PnpProvisioning\PnpProvisioning.r02"
-"\Epoc32\data\z\system\apps\PnpProvisioning\PnpProvisioning.r03"			-"!:\system\apps\PnpProvisioning\PnpProvisioning.r03"
-"\Epoc32\data\z\system\apps\PnpProvisioning\PnpProvisioning.r04"			-"!:\system\apps\PnpProvisioning\PnpProvisioning.r04"
-"\Epoc32\data\z\system\apps\PnpProvisioning\PnpProvisioning.r05"			-"!:\system\apps\PnpProvisioning\PnpProvisioning.r05"
-"\Epoc32\data\z\system\apps\PnpProvisioning\PnpProvisioning.r06"			-"!:\system\apps\PnpProvisioning\PnpProvisioning.r06"
-"\Epoc32\data\z\system\apps\PnpProvisioning\PnpProvisioning.r09"			-"!:\system\apps\PnpProvisioning\PnpProvisioning.r09"
-"\Epoc32\data\z\system\apps\PnpProvisioning\PnpProvisioning.r13"			-"!:\system\apps\PnpProvisioning\PnpProvisioning.r13"
-"\Epoc32\data\z\system\apps\PnpProvisioning\PnpProvisioning.r29"			-"!:\system\apps\PnpProvisioning\PnpProvisioning.r29"
-"\Epoc32\data\z\system\apps\PnpProvisioning\PnpProvisioning.r30"			-"!:\system\apps\PnpProvisioning\PnpProvisioning.r30"
-"\Epoc32\data\z\system\apps\PnpProvisioning\PnpProvisioning.r31"			-"!:\system\apps\PnpProvisioning\PnpProvisioning.r31"
-"\Epoc32\data\z\system\apps\PnpProvisioning\PnpProvisioning.r32"			-"!:\system\apps\PnpProvisioning\PnpProvisioning.r32"
-"\Epoc32\data\z\system\apps\PnpProvisioning\PnpProvisioning.r39"			-"!:\system\apps\PnpProvisioning\PnpProvisioning.r39"
-"\Epoc32\data\z\system\apps\PnpProvisioning\PnpProvisioning.r59"			-"!:\system\apps\PnpProvisioning\PnpProvisioning.r59"
-"\Epoc32\data\z\system\apps\PnpProvisioning\PnpProvisioning.r70"			-"!:\system\apps\PnpProvisioning\PnpProvisioning.r70"
-"\Epoc32\data\z\system\apps\PnpProvisioning\PnpProvisioning_caption.r01"			-"!:\system\apps\PnpProvisioning\PnpProvisioning_caption.r01"
-"\Epoc32\data\z\system\apps\PnpProvisioning\PnpProvisioning_caption.r02"			-"!:\system\apps\PnpProvisioning\PnpProvisioning_caption.r02"
-"\Epoc32\data\z\system\apps\PnpProvisioning\PnpProvisioning_caption.r03"			-"!:\system\apps\PnpProvisioning\PnpProvisioning_caption.r03"
-"\Epoc32\data\z\system\apps\PnpProvisioning\PnpProvisioning_caption.r04"			-"!:\system\apps\PnpProvisioning\PnpProvisioning_caption.r04"
-"\Epoc32\data\z\system\apps\PnpProvisioning\PnpProvisioning_caption.r05"			-"!:\system\apps\PnpProvisioning\PnpProvisioning_caption.r05"
-"\Epoc32\data\z\system\apps\PnpProvisioning\PnpProvisioning_caption.r06"			-"!:\system\apps\PnpProvisioning\PnpProvisioning_caption.r06"
-"\Epoc32\data\z\system\apps\PnpProvisioning\PnpProvisioning_caption.r09"			-"!:\system\apps\PnpProvisioning\PnpProvisioning_caption.r09"
-"\Epoc32\data\z\system\apps\PnpProvisioning\PnpProvisioning_caption.r13"			-"!:\system\apps\PnpProvisioning\PnpProvisioning_caption.r13"
-"\Epoc32\data\z\system\apps\PnpProvisioning\PnpProvisioning_caption.r29"			-"!:\system\apps\PnpProvisioning\PnpProvisioning_caption.r29"
-"\Epoc32\data\z\system\apps\PnpProvisioning\PnpProvisioning_caption.r30"			-"!:\system\apps\PnpProvisioning\PnpProvisioning_caption.r30"
-"\Epoc32\data\z\system\apps\PnpProvisioning\PnpProvisioning_caption.r31"			-"!:\system\apps\PnpProvisioning\PnpProvisioning_caption.r31"
-"\Epoc32\data\z\system\apps\PnpProvisioning\PnpProvisioning_caption.r32"			-"!:\system\apps\PnpProvisioning\PnpProvisioning_caption.r32"
-"\Epoc32\data\z\system\apps\PnpProvisioning\PnpProvisioning_caption.r39"			-"!:\system\apps\PnpProvisioning\PnpProvisioning_caption.r39"
-"\Epoc32\data\z\system\apps\PnpProvisioning\PnpProvisioning_caption.r59"			-"!:\system\apps\PnpProvisioning\PnpProvisioning_caption.r59"
-"\Epoc32\data\z\system\apps\PnpProvisioning\PnpProvisioning_caption.r70"			-"!:\system\apps\PnpProvisioning\PnpProvisioning_caption.r70"
-"\Epoc32\data\z\system\apps\PnpProvisioning\PnpProvisioning.aif"			-"!:\system\apps\PnpProvisioning\PnpProvisioning.aif"
-"\epoc32\data\Z\System\shareddata\10204339.ini"							-"C:\System\SharedData\10204339.ini"
-"\epoc32\release\thumb\urel\RECnhwr.MDL"											-"!:\system\recogs\RECnhwr.MDL"
-"\Epoc32\release\thumb\urel\PnP.dll"													-"!:\system\libs\PnP.dll"
-"\epoc32\data\Z\System\shareddata\1020433A.ini"							-"C:\System\SharedData\1020433A.ini"
-"\Epoc32\release\thumb\urel\NHwrParser.dll"										-"!:\system\libs\NHwrParser.dll"
-"\Epoc32\release\thumb\urel\PnPRedirect.exe"											-"!:\system\apps\PnpProvisioning\PnPRedirect.exe"
-
-
-; PAOS
-"\epoc32\release\thumb\urel\PnpPaosFilter.dll" - "!:\System\Libs\Plugins\PnpPaosFilter.dll"
-"\epoc32\data\z\system\Libs\Plugins\10272D33.rsc" - "!:\System\Libs\Plugins\10272D33.rsc"
\ No newline at end of file
--- a/pnpmobileservices/pnpms/install/Support_w_Paos_S2-8.pkg	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,149 +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 "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-;
-; Installation file for OnlineSupport application with PAOS filter
-;
-;Languages
-&EN
-;
-; UID is the app's UID
-;
-#{"Online Support wPaos (S2*8)"},(0x10272D34),1,5,2
-;
-
-;Supports Series 60 v 2.8
-(0x102032BD), 0, 0, 0, {"Series60ProductID"} 
-
-;
-; Files to install
-;
-
-; Online Support
-"\Epoc32\release\thumb\urel\OnlineSupport.app"						-"!:\system\apps\OnlineSupport\OnlineSupport.app"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r01"			-"!:\system\apps\OnlineSupport\onlinesupport.r01"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r02"			-"!:\system\apps\OnlineSupport\onlinesupport.r02"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r03"			-"!:\system\apps\OnlineSupport\onlinesupport.r03"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r04"			-"!:\system\apps\OnlineSupport\onlinesupport.r04"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r05"			-"!:\system\apps\OnlineSupport\onlinesupport.r05"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r06"			-"!:\system\apps\OnlineSupport\onlinesupport.r06"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r07"			-"!:\system\apps\OnlineSupport\onlinesupport.r07"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r08"			-"!:\system\apps\OnlineSupport\onlinesupport.r08"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r09"			-"!:\system\apps\OnlineSupport\onlinesupport.r09"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r10"			-"!:\system\apps\OnlineSupport\onlinesupport.r10"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r13"			-"!:\system\apps\OnlineSupport\onlinesupport.r13"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r14"			-"!:\system\apps\OnlineSupport\onlinesupport.r14"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r15"			-"!:\system\apps\OnlineSupport\onlinesupport.r15"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r16"			-"!:\system\apps\OnlineSupport\onlinesupport.r16"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r17"			-"!:\system\apps\OnlineSupport\onlinesupport.r17"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r18"			-"!:\system\apps\OnlineSupport\onlinesupport.r18"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r25"			-"!:\system\apps\OnlineSupport\onlinesupport.r25"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r26"			-"!:\system\apps\OnlineSupport\onlinesupport.r26"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r27"			-"!:\system\apps\OnlineSupport\onlinesupport.r27"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r28"			-"!:\system\apps\OnlineSupport\onlinesupport.r28"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r29"			-"!:\system\apps\OnlineSupport\onlinesupport.r29"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r30"			-"!:\system\apps\OnlineSupport\onlinesupport.r30"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r31"			-"!:\system\apps\OnlineSupport\onlinesupport.r31"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r32"			-"!:\system\apps\OnlineSupport\onlinesupport.r32"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r33"			-"!:\system\apps\OnlineSupport\onlinesupport.r33"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r37"			-"!:\system\apps\OnlineSupport\onlinesupport.r37"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r39"			-"!:\system\apps\OnlineSupport\onlinesupport.r39"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r42"			-"!:\system\apps\OnlineSupport\onlinesupport.r42"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r45"			-"!:\system\apps\OnlineSupport\onlinesupport.r45"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r49"			-"!:\system\apps\OnlineSupport\onlinesupport.r49"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r51"			-"!:\system\apps\OnlineSupport\onlinesupport.r51"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r54"			-"!:\system\apps\OnlineSupport\onlinesupport.r54"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r57"			-"!:\system\apps\OnlineSupport\onlinesupport.r57"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r59"			-"!:\system\apps\OnlineSupport\onlinesupport.r59"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r67"			-"!:\system\apps\OnlineSupport\onlinesupport.r67"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r68"			-"!:\system\apps\OnlineSupport\onlinesupport.r68"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r70"			-"!:\system\apps\OnlineSupport\onlinesupport.r70"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r76"			-"!:\system\apps\OnlineSupport\onlinesupport.r76"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r78"			-"!:\system\apps\OnlineSupport\onlinesupport.r78"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r79"			-"!:\system\apps\OnlineSupport\onlinesupport.r79"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r83"			-"!:\system\apps\OnlineSupport\onlinesupport.r83"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r93"			-"!:\system\apps\OnlineSupport\onlinesupport.r93"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r157"			-"!:\system\apps\OnlineSupport\onlinesupport.r157"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r158"			-"!:\system\apps\OnlineSupport\onlinesupport.r158"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r159"			-"!:\system\apps\OnlineSupport\onlinesupport.r159"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r160"			-"!:\system\apps\OnlineSupport\onlinesupport.r160"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r161"			-"!:\system\apps\OnlineSupport\onlinesupport.r161"
-"\epoc32\data\Z\PRIVATE\10003A3F\APPS\OnlineSupport_reg.rsc"	-"!:\private\10003A3F\apps\OnlineSupport_reg.rsc"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport_aif.mbm"			-"!:\system\apps\OnlineSupport\OnlineSupport_aif.mbm"
-"\epoc32\data\Z\System\shareddata\10204338.ini"							-"C:\System\SharedData\10204338.ini"
-
-
-; PNP provisioning
-"\Epoc32\release\thumb\urel\PnpProvisioning.app"							-"!:\system\apps\PnpProvisioning\PnpProvisioning.app"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r01"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r01"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r02"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r02"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r03"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r03"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r04"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r04"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r05"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r05"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r06"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r06"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r07"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r07"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r08"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r08"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r09"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r09"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r10"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r10"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r13"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r13"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r14"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r14"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r15"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r15"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r16"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r16"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r17"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r17"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r18"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r18"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r25"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r25"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r26"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r26"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r27"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r27"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r28"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r28"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r29"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r29"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r30"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r30"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r31"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r31"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r32"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r32"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r33"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r33"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r37"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r37"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r39"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r39"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r42"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r42"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r45"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r45"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r49"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r49"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r51"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r51"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r54"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r54"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r57"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r57"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r59"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r59"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r67"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r67"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r68"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r68"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r70"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r70"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r76"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r76"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r78"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r78"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r79"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r79"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r83"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r83"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r93"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r93"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r157"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r157"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r158"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r158"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r159"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r159"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r160"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r160"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r161"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r161"
-"\Epoc32\data\Z\Private\10003A3F\APPS\PnpProvisioning_REG.rsc"			-"!:\Private\10003A3F\APPS\PnpProvisioning_REG.rsc"
-"\Epoc32\data\z\system\apps\PnpProvisioning\PnpProvisioning_aif.mbm"			-"!:\system\apps\PnpProvisioning\PnpProvisioning_aif.mbm"
-"\epoc32\data\Z\System\shareddata\10204339.ini"							-"C:\System\SharedData\10204339.ini"
-"\epoc32\release\thumb\urel\RECnhwr.MDL"											-"!:\system\recogs\RECnhwr.MDL"
-"\Epoc32\release\thumb\urel\PnP.dll"													-"!:\system\libs\PnP.dll"
-"\epoc32\data\Z\System\shareddata\1020433A.ini"							-"C:\System\SharedData\1020433A.ini"
-"\Epoc32\release\thumb\urel\NHwrParser.dll"										-"!:\system\libs\NHwrParser.dll"
-"\Epoc32\release\thumb\urel\PnPRedirect.exe"											-"!:\system\apps\PnpProvisioning\PnPRedirect.exe"
-
-
-; PAOS
-"\epoc32\release\thumb\urel\PnpPaosFilter.dll" - "!:\System\Libs\Plugins\PnpPaosFilter.dll"
-"\epoc32\data\z\system\Libs\Plugins\10272D33.rsc" - "!:\System\Libs\Plugins\10272D33.rsc"
\ No newline at end of file
--- a/pnpmobileservices/pnpms/install/Support_w_Paos_S3-0.pkg	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,162 +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 "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-;
-; Installation file for OnlineSupport application with PAOS filter
-;
-;Languages
-&EN
-
-; The non-localised, globally unique vendor name (mandatory)
-:"Nokia"
-
-; List of localised vendor names - one per language. At least one must be provided (English [EN]). 
-; List must correspond to list of languages specified elsewhere in the .pkg
-;%{"Vendor-EN", "Vendor-FR"}
-%{"Nokia"}
-
-;
-; UID is the app's UID
-;
-#{"ServiceHelp wPaos (S3*0)"},(0x10272D34),1,5,3
-;
-
-;
-;Supports Series 60 v 3.0
-;This line indicates that this installation is for the Series 60 platform v3.0
-;This line must appear _exactly_ as shown below in the sis file
-;If this line is missing or incorrect, the sis file will not be able
-;to be installed
-[0x101F7961], 0, 0, 0, {"Series60ProductID"}
-
-;
-; Files to install
-;
-
-"\Epoc32\release\armv5\urel\OnlineSupport.exe"				-"!:\sys\bin\OnlineSupport.exe"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r01"			-"!:\Resource\apps\onlinesupport.r01"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r02"			-"!:\Resource\apps\onlinesupport.r02"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r03"			-"!:\Resource\apps\onlinesupport.r03"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r04"			-"!:\Resource\apps\onlinesupport.r04"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r05"			-"!:\Resource\apps\onlinesupport.r05"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r06"			-"!:\Resource\apps\onlinesupport.r06"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r07"			-"!:\Resource\apps\onlinesupport.r07"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r08"			-"!:\Resource\apps\onlinesupport.r08"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r09"			-"!:\Resource\apps\onlinesupport.r09"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r10"			-"!:\Resource\apps\onlinesupport.r10"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r13"			-"!:\Resource\apps\onlinesupport.r13"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r14"			-"!:\Resource\apps\onlinesupport.r14"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r15"			-"!:\Resource\apps\onlinesupport.r15"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r16"			-"!:\Resource\apps\onlinesupport.r16"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r17"			-"!:\Resource\apps\onlinesupport.r17"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r18"			-"!:\Resource\apps\onlinesupport.r18"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r25"			-"!:\Resource\apps\onlinesupport.r25"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r26"			-"!:\Resource\apps\onlinesupport.r26"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r27"			-"!:\Resource\apps\onlinesupport.r27"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r28"			-"!:\Resource\apps\onlinesupport.r28"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r29"			-"!:\Resource\apps\onlinesupport.r29"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r30"			-"!:\Resource\apps\onlinesupport.r30"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r31"			-"!:\Resource\apps\onlinesupport.r31"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r32"			-"!:\Resource\apps\onlinesupport.r32"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r33"			-"!:\Resource\apps\onlinesupport.r33"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r37"			-"!:\Resource\apps\onlinesupport.r37"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r39"			-"!:\Resource\apps\onlinesupport.r39"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r42"			-"!:\Resource\apps\onlinesupport.r42"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r45"			-"!:\Resource\apps\onlinesupport.r45"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r49"			-"!:\Resource\apps\onlinesupport.r49"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r51"			-"!:\Resource\apps\onlinesupport.r51"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r54"			-"!:\Resource\apps\onlinesupport.r54"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r57"			-"!:\Resource\apps\onlinesupport.r57"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r59"			-"!:\Resource\apps\onlinesupport.r59"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r67"			-"!:\Resource\apps\onlinesupport.r67"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r68"			-"!:\Resource\apps\onlinesupport.r68"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r70"			-"!:\Resource\apps\onlinesupport.r70"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r76"			-"!:\Resource\apps\onlinesupport.r76"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r78"			-"!:\Resource\apps\onlinesupport.r78"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r79"			-"!:\Resource\apps\onlinesupport.r79"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r83"			-"!:\Resource\apps\onlinesupport.r83"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r93"			-"!:\Resource\apps\onlinesupport.r93"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r157"			-"!:\Resource\apps\onlinesupport.r157"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r158"			-"!:\Resource\apps\onlinesupport.r158"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r159"			-"!:\Resource\apps\onlinesupport.r159"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r160"			-"!:\Resource\apps\onlinesupport.r160"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r161"			-"!:\Resource\apps\onlinesupport.r161"
-"\Epoc32\data\Z\Private\10003A3F\APPS\OnlineSupport_REG.rsc"			-"!:\Private\10003A3F\import\APPS\OnlineSupport_reg.rsc"
-"\Epoc32\data\Z\Resource\Apps\OnlineSupport_aif.MIF"					-"!:\Resource\Apps\OnlineSupport_aif.MIF"
-"\Epoc32\data\Z\Resource\Apps\OnlineSupport.MBM"			-"!:\Resource\Apps\OnlineSupport.MBM"
-
-
-; PnpProvisioning App
-"\Epoc32\release\armv5\urel\PnpProvisioning.exe"				-"!:\sys\bin\PnpProvisioning.exe"
-"\Epoc32\data\Z\Resource\apps\PnpProvisioning.MBM"					-"!:\Resource\apps\PnpProvisioning.mbm"
-"\Epoc32\data\Z\Resource\Apps\PnpProvisioning.MIF"					-"!:\Resource\Apps\PnpProvisioning.MIF"
-"\Epoc32\data\Z\Resource\Apps\PnpProvisioning_aif.MBM"			-"!:\Resource\Apps\PnpProvisioning_aif.MBM";
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r01"			-"!:\Resource\apps\pnpprovisioning.r01"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r02"			-"!:\Resource\apps\pnpprovisioning.r02"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r03"			-"!:\Resource\apps\pnpprovisioning.r03"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r04"			-"!:\Resource\apps\pnpprovisioning.r04"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r05"			-"!:\Resource\apps\pnpprovisioning.r05"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r06"			-"!:\Resource\apps\pnpprovisioning.r06"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r07"			-"!:\Resource\apps\pnpprovisioning.r07"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r08"			-"!:\Resource\apps\pnpprovisioning.r08"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r09"			-"!:\Resource\apps\pnpprovisioning.r09"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r10"			-"!:\Resource\apps\pnpprovisioning.r10"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r13"			-"!:\Resource\apps\pnpprovisioning.r13"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r14"			-"!:\Resource\apps\pnpprovisioning.r14"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r15"			-"!:\Resource\apps\pnpprovisioning.r15"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r16"			-"!:\Resource\apps\pnpprovisioning.r16"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r17"			-"!:\Resource\apps\pnpprovisioning.r17"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r18"			-"!:\Resource\apps\pnpprovisioning.r18"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r25"			-"!:\Resource\apps\pnpprovisioning.r25"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r26"			-"!:\Resource\apps\pnpprovisioning.r26"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r27"			-"!:\Resource\apps\pnpprovisioning.r27"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r28"			-"!:\Resource\apps\pnpprovisioning.r28"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r29"			-"!:\Resource\apps\pnpprovisioning.r29"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r30"			-"!:\Resource\apps\pnpprovisioning.r30"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r31"			-"!:\Resource\apps\pnpprovisioning.r31"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r32"			-"!:\Resource\apps\pnpprovisioning.r32"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r33"			-"!:\Resource\apps\pnpprovisioning.r33"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r37"			-"!:\Resource\apps\pnpprovisioning.r37"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r39"			-"!:\Resource\apps\pnpprovisioning.r39"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r42"			-"!:\Resource\apps\pnpprovisioning.r42"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r45"			-"!:\Resource\apps\pnpprovisioning.r45"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r49"			-"!:\Resource\apps\pnpprovisioning.r49"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r51"			-"!:\Resource\apps\pnpprovisioning.r51"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r54"			-"!:\Resource\apps\pnpprovisioning.r54"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r57"			-"!:\Resource\apps\pnpprovisioning.r57"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r59"			-"!:\Resource\apps\pnpprovisioning.r59"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r67"			-"!:\Resource\apps\pnpprovisioning.r67"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r68"			-"!:\Resource\apps\pnpprovisioning.r68"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r70"			-"!:\Resource\apps\pnpprovisioning.r70"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r76"			-"!:\Resource\apps\pnpprovisioning.r76"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r78"			-"!:\Resource\apps\pnpprovisioning.r78"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r79"			-"!:\Resource\apps\pnpprovisioning.r79"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r83"			-"!:\Resource\apps\pnpprovisioning.r83"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r93"			-"!:\Resource\apps\pnpprovisioning.r93"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r157"			-"!:\Resource\apps\pnpprovisioning.r157"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r158"			-"!:\Resource\apps\pnpprovisioning.r158"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r159"			-"!:\Resource\apps\pnpprovisioning.r159"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r160"			-"!:\Resource\apps\pnpprovisioning.r160"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r161"			-"!:\Resource\apps\pnpprovisioning.r161"
-"\Epoc32\data\Z\Private\10003A3F\APPS\PnpProvisioning_REG.rsc"  -"!:\Private\10003A3F\import\APPS\PnpProvisioning_REG.rsc"
-"\epoc32\release\armv5\urel\recnhwr.dll"                        -"!:\sys\bin\recnhwr.dll"
-"\epoc32\data\Z\Resource\Plugins\recnhwr.rsc"                   -"!:\Resource\Plugins\recnhwr.rsc"
-"\Epoc32\release\armv5\urel\PnP.dll"                            -"!:\sys\bin\PnP.dll"
-"\Epoc32\release\armv5\urel\NHwrParser.dll"                     -"!:\sys\bin\NHwrParser.dll"
-
-; PnpPaosFilter, it has to be included as a sis-file because there
-; is a separate sis-stub file in the ROM for the component
-@"PnpPaos_S3-0_signed.sis",(0x10272D33)
-; @"CentralRepositoryInit_signed.sis",(0x10202BE9)
--- a/pnpmobileservices/pnpms/install/Support_w_Paos_S3-0_patch.pkg	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,168 +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 "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-;
-; Installation file for OnlineSupport application with PAOS filter
-;
-;Languages
-&EN
-
-; The non-localised, globally unique vendor name (mandatory)
-:"Nokia"
-
-; List of localised vendor names - one per language. At least one must be provided (English [EN]). 
-; List must correspond to list of languages specified elsewhere in the .pkg
-;%{"Vendor-EN", "Vendor-FR"}
-%{"Nokia"}
-
-;
-; UID is the app's UID
-;
-#{"ServiceHelp wPaos (S3*0)"},(0x10272D34),1,5,3,TYPE=PU
-;
-
-;
-;Supports Series 60 v 3.0
-;This line indicates that this installation is for the Series 60 platform v3.0
-;This line must appear _exactly_ as shown below in the sis file
-;If this line is missing or incorrect, the sis file will not be able
-;to be installed
-[0x101F7961], 0, 0, 0, {"Series60ProductID"}
-
-;
-; Files to install
-;
-
-"\Epoc32\release\armv5\urel\OnlineSupport.exe"						-"!:\sys\bin\OnlineSupport.exe"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r01"			-"!:\Resource\apps\onlinesupport.r01"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r02"			-"!:\Resource\apps\onlinesupport.r02"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r03"			-"!:\Resource\apps\onlinesupport.r03"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r04"			-"!:\Resource\apps\onlinesupport.r04"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r05"			-"!:\Resource\apps\onlinesupport.r05"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r06"			-"!:\Resource\apps\onlinesupport.r06"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r07"			-"!:\Resource\apps\onlinesupport.r07"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r08"			-"!:\Resource\apps\onlinesupport.r08"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r09"			-"!:\Resource\apps\onlinesupport.r09"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r10"			-"!:\Resource\apps\onlinesupport.r10"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r13"			-"!:\Resource\apps\onlinesupport.r13"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r14"			-"!:\Resource\apps\onlinesupport.r14"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r15"			-"!:\Resource\apps\onlinesupport.r15"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r16"			-"!:\Resource\apps\onlinesupport.r16"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r17"			-"!:\Resource\apps\onlinesupport.r17"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r18"			-"!:\Resource\apps\onlinesupport.r18"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r25"			-"!:\Resource\apps\onlinesupport.r25"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r26"			-"!:\Resource\apps\onlinesupport.r26"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r27"			-"!:\Resource\apps\onlinesupport.r27"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r28"			-"!:\Resource\apps\onlinesupport.r28"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r29"			-"!:\Resource\apps\onlinesupport.r29"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r30"			-"!:\Resource\apps\onlinesupport.r30"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r31"			-"!:\Resource\apps\onlinesupport.r31"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r32"			-"!:\Resource\apps\onlinesupport.r32"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r33"			-"!:\Resource\apps\onlinesupport.r33"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r37"			-"!:\Resource\apps\onlinesupport.r37"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r39"			-"!:\Resource\apps\onlinesupport.r39"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r42"			-"!:\Resource\apps\onlinesupport.r42"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r45"			-"!:\Resource\apps\onlinesupport.r45"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r49"			-"!:\Resource\apps\onlinesupport.r49"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r51"			-"!:\Resource\apps\onlinesupport.r51"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r54"			-"!:\Resource\apps\onlinesupport.r54"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r57"			-"!:\Resource\apps\onlinesupport.r57"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r59"			-"!:\Resource\apps\onlinesupport.r59"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r67"			-"!:\Resource\apps\onlinesupport.r67"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r68"			-"!:\Resource\apps\onlinesupport.r68"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r70"			-"!:\Resource\apps\onlinesupport.r70"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r76"			-"!:\Resource\apps\onlinesupport.r76"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r78"			-"!:\Resource\apps\onlinesupport.r78"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r79"			-"!:\Resource\apps\onlinesupport.r79"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r83"			-"!:\Resource\apps\onlinesupport.r83"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r93"			-"!:\Resource\apps\onlinesupport.r93"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r157"			-"!:\Resource\apps\onlinesupport.r157"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r158"			-"!:\Resource\apps\onlinesupport.r158"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r159"			-"!:\Resource\apps\onlinesupport.r159"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r160"			-"!:\Resource\apps\onlinesupport.r160"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r161"			-"!:\Resource\apps\onlinesupport.r161"
-
-"\Epoc32\data\Z\Private\10003A3F\APPS\OnlineSupport_REG.rsc"			-"!:\Private\10003A3F\import\APPS\OnlineSupport_reg.rsc"
-"\Epoc32\data\Z\Resource\Apps\OnlineSupport_aif.MIF"					-"!:\Resource\Apps\OnlineSupport_aif.MIF"
-"\Epoc32\data\Z\Resource\Apps\OnlineSupport.MBM"			-"!:\Resource\Apps\OnlineSupport.MBM"
-; must use cre files?
-; "\Epoc32\data\Z\private\10202BE9\10204338.txt"						-"!:\Private\10202BE9\import\10204338.txt"
-
-
-; PnpProvisioning App
-"\Epoc32\release\armv5\urel\PnpProvisioning.exe"				-"!:\sys\bin\PnpProvisioning.exe"
-"\Epoc32\data\Z\Resource\apps\PnpProvisioning.MBM"					-"!:\Resource\apps\PnpProvisioning.mbm"
-"\Epoc32\data\Z\Resource\Apps\PnpProvisioning.MIF"					-"!:\Resource\Apps\PnpProvisioning.MIF"
-"\Epoc32\data\Z\Resource\Apps\PnpProvisioning_aif.MBM"			-"!:\Resource\Apps\PnpProvisioning_aif.MBM";
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r01"			-"!:\Resource\apps\pnpprovisioning.r01"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r02"			-"!:\Resource\apps\pnpprovisioning.r02"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r03"			-"!:\Resource\apps\pnpprovisioning.r03"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r04"			-"!:\Resource\apps\pnpprovisioning.r04"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r05"			-"!:\Resource\apps\pnpprovisioning.r05"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r06"			-"!:\Resource\apps\pnpprovisioning.r06"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r07"			-"!:\Resource\apps\pnpprovisioning.r07"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r08"			-"!:\Resource\apps\pnpprovisioning.r08"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r09"			-"!:\Resource\apps\pnpprovisioning.r09"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r10"			-"!:\Resource\apps\pnpprovisioning.r10"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r13"			-"!:\Resource\apps\pnpprovisioning.r13"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r14"			-"!:\Resource\apps\pnpprovisioning.r14"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r15"			-"!:\Resource\apps\pnpprovisioning.r15"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r16"			-"!:\Resource\apps\pnpprovisioning.r16"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r17"			-"!:\Resource\apps\pnpprovisioning.r17"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r18"			-"!:\Resource\apps\pnpprovisioning.r18"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r25"			-"!:\Resource\apps\pnpprovisioning.r25"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r26"			-"!:\Resource\apps\pnpprovisioning.r26"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r27"			-"!:\Resource\apps\pnpprovisioning.r27"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r28"			-"!:\Resource\apps\pnpprovisioning.r28"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r29"			-"!:\Resource\apps\pnpprovisioning.r29"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r30"			-"!:\Resource\apps\pnpprovisioning.r30"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r31"			-"!:\Resource\apps\pnpprovisioning.r31"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r32"			-"!:\Resource\apps\pnpprovisioning.r32"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r33"			-"!:\Resource\apps\pnpprovisioning.r33"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r37"			-"!:\Resource\apps\pnpprovisioning.r37"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r39"			-"!:\Resource\apps\pnpprovisioning.r39"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r42"			-"!:\Resource\apps\pnpprovisioning.r42"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r45"			-"!:\Resource\apps\pnpprovisioning.r45"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r49"			-"!:\Resource\apps\pnpprovisioning.r49"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r51"			-"!:\Resource\apps\pnpprovisioning.r51"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r54"			-"!:\Resource\apps\pnpprovisioning.r54"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r57"			-"!:\Resource\apps\pnpprovisioning.r57"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r59"			-"!:\Resource\apps\pnpprovisioning.r59"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r67"			-"!:\Resource\apps\pnpprovisioning.r67"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r68"			-"!:\Resource\apps\pnpprovisioning.r68"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r70"			-"!:\Resource\apps\pnpprovisioning.r70"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r76"			-"!:\Resource\apps\pnpprovisioning.r76"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r78"			-"!:\Resource\apps\pnpprovisioning.r78"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r79"			-"!:\Resource\apps\pnpprovisioning.r79"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r83"			-"!:\Resource\apps\pnpprovisioning.r83"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r93"			-"!:\Resource\apps\pnpprovisioning.r93"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r157"			-"!:\Resource\apps\pnpprovisioning.r157"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r158"			-"!:\Resource\apps\pnpprovisioning.r158"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r159"			-"!:\Resource\apps\pnpprovisioning.r159"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r160"			-"!:\Resource\apps\pnpprovisioning.r160"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r161"			-"!:\Resource\apps\pnpprovisioning.r161"
-"\Epoc32\data\Z\Private\10003A3F\APPS\PnpProvisioning_REG.rsc"      -"!:\Private\10003A3F\import\APPS\PnpProvisioning_REG.rsc"
-"\epoc32\release\armv5\urel\recnhwr.dll"                            -"!:\sys\bin\recnhwr.dll"
-"\epoc32\data\Z\Resource\Plugins\recnhwr.rsc"                       -"!:\Resource\Plugins\recnhwr.rsc"
-"\Epoc32\release\armv5\urel\PnP.dll"                                -"!:\sys\bin\PnP.dll"
-"\Epoc32\release\armv5\urel\NHwrParser.dll"                         -"!:\sys\bin\NHwrParser.dll"
-
-; Central Repository initialization file for PnP.dll
-; must use cre files?
-;"\Epoc32\data\Z\private\10202BE9\1020433A.txt"                     -"!:\private\10202be9\import\1020433A.txt"
-
-; PnpPaosFilter, it has to be included as a sis-file because there
-; is a separate sis-stub file in the ROM for the component
-@"PnpPaos_S3-0_signed.sis",(0x10272D33)
\ No newline at end of file
--- a/pnpmobileservices/pnpms/install/compile_localization_resources.bat	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,122 +0,0 @@
-rem
-rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-rem All rights reserved.
-rem This component and the accompanying materials are made available
-rem under the terms of "Eclipse Public License v1.0"
-rem which accompanies this distribution, and is available
-rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
-rem
-rem Initial Contributors:
-rem Nokia Corporation - initial contribution.
-rem
-rem Contributors:
-rem
-rem Description: Implementation of PnPMS components
-rem
-
-set EROOT=\epoc32
-set RESOURCE_PATH=%EROOT%\data\z\resource\APPS\
-
-rem PnP PROVISIONING
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_00 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\PnP\PnPProvisioningAppInc "..\PnP\PnpProvisioningAppData\PnPProvisioning.rss" -o%RESOURCE_PATH%pnpprovisioning.r00
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_01 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\PnP\PnPProvisioningAppInc "..\PnP\PnpProvisioningAppData\PnPProvisioning.rss" -o%RESOURCE_PATH%pnpprovisioning.r01
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_02 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\PnP\PnPProvisioningAppInc "..\PnP\PnpProvisioningAppData\PnPProvisioning.rss" -o%RESOURCE_PATH%pnpprovisioning.r02
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_03 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\PnP\PnPProvisioningAppInc "..\PnP\PnpProvisioningAppData\PnPProvisioning.rss" -o%RESOURCE_PATH%pnpprovisioning.r03
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_04 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\PnP\PnPProvisioningAppInc "..\PnP\PnpProvisioningAppData\PnPProvisioning.rss" -o%RESOURCE_PATH%pnpprovisioning.r04
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_05 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\PnP\PnPProvisioningAppInc "..\PnP\PnpProvisioningAppData\PnPProvisioning.rss" -o%RESOURCE_PATH%pnpprovisioning.r05
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_06 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\PnP\PnPProvisioningAppInc "..\PnP\PnpProvisioningAppData\PnPProvisioning.rss" -o%RESOURCE_PATH%pnpprovisioning.r06
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_07 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\PnP\PnPProvisioningAppInc "..\PnP\PnpProvisioningAppData\PnPProvisioning.rss" -o%RESOURCE_PATH%pnpprovisioning.r07
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_08 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\PnP\PnPProvisioningAppInc "..\PnP\PnpProvisioningAppData\PnPProvisioning.rss" -o%RESOURCE_PATH%pnpprovisioning.r08
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_09 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\PnP\PnPProvisioningAppInc "..\PnP\PnpProvisioningAppData\PnPProvisioning.rss" -o%RESOURCE_PATH%pnpprovisioning.r09
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_10 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\PnP\PnPProvisioningAppInc "..\PnP\PnpProvisioningAppData\PnPProvisioning.rss" -o%RESOURCE_PATH%pnpprovisioning.r10
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_13 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\PnP\PnPProvisioningAppInc "..\PnP\PnpProvisioningAppData\PnPProvisioning.rss" -o%RESOURCE_PATH%pnpprovisioning.r13
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_14 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\PnP\PnPProvisioningAppInc "..\PnP\PnpProvisioningAppData\PnPProvisioning.rss" -o%RESOURCE_PATH%pnpprovisioning.r14
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_15 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\PnP\PnPProvisioningAppInc "..\PnP\PnpProvisioningAppData\PnPProvisioning.rss" -o%RESOURCE_PATH%pnpprovisioning.r15
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_16 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\PnP\PnPProvisioningAppInc "..\PnP\PnpProvisioningAppData\PnPProvisioning.rss" -o%RESOURCE_PATH%pnpprovisioning.r16
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_17 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\PnP\PnPProvisioningAppInc "..\PnP\PnpProvisioningAppData\PnPProvisioning.rss" -o%RESOURCE_PATH%pnpprovisioning.r17
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_18 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\PnP\PnPProvisioningAppInc "..\PnP\PnpProvisioningAppData\PnPProvisioning.rss" -o%RESOURCE_PATH%pnpprovisioning.r18
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_25 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\PnP\PnPProvisioningAppInc "..\PnP\PnpProvisioningAppData\PnPProvisioning.rss" -o%RESOURCE_PATH%pnpprovisioning.r25
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_26 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\PnP\PnPProvisioningAppInc "..\PnP\PnpProvisioningAppData\PnPProvisioning.rss" -o%RESOURCE_PATH%pnpprovisioning.r26
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_27 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\PnP\PnPProvisioningAppInc "..\PnP\PnpProvisioningAppData\PnPProvisioning.rss" -o%RESOURCE_PATH%pnpprovisioning.r27
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_28 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\PnP\PnPProvisioningAppInc "..\PnP\PnpProvisioningAppData\PnPProvisioning.rss" -o%RESOURCE_PATH%pnpprovisioning.r28
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_29 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\PnP\PnPProvisioningAppInc "..\PnP\PnpProvisioningAppData\PnPProvisioning.rss" -o%RESOURCE_PATH%pnpprovisioning.r29
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_30 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\PnP\PnPProvisioningAppInc "..\PnP\PnpProvisioningAppData\PnPProvisioning.rss" -o%RESOURCE_PATH%pnpprovisioning.r30
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_31 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\PnP\PnPProvisioningAppInc "..\PnP\PnpProvisioningAppData\PnPProvisioning.rss" -o%RESOURCE_PATH%pnpprovisioning.r31
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_32 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\PnP\PnPProvisioningAppInc "..\PnP\PnpProvisioningAppData\PnPProvisioning.rss" -o%RESOURCE_PATH%pnpprovisioning.r32
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_33 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\PnP\PnPProvisioningAppInc "..\PnP\PnpProvisioningAppData\PnPProvisioning.rss" -o%RESOURCE_PATH%pnpprovisioning.r33
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_37 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\PnP\PnPProvisioningAppInc "..\PnP\PnpProvisioningAppData\PnPProvisioning.rss" -o%RESOURCE_PATH%pnpprovisioning.r37
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_39 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\PnP\PnPProvisioningAppInc "..\PnP\PnpProvisioningAppData\PnPProvisioning.rss" -o%RESOURCE_PATH%pnpprovisioning.r39
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_42 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\PnP\PnPProvisioningAppInc "..\PnP\PnpProvisioningAppData\PnPProvisioning.rss" -o%RESOURCE_PATH%pnpprovisioning.r42
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_45 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\PnP\PnPProvisioningAppInc "..\PnP\PnpProvisioningAppData\PnPProvisioning.rss" -o%RESOURCE_PATH%pnpprovisioning.r45
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_49 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\PnP\PnPProvisioningAppInc "..\PnP\PnpProvisioningAppData\PnPProvisioning.rss" -o%RESOURCE_PATH%pnpprovisioning.r49
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_51 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\PnP\PnPProvisioningAppInc "..\PnP\PnpProvisioningAppData\PnPProvisioning.rss" -o%RESOURCE_PATH%pnpprovisioning.r51
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_54 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\PnP\PnPProvisioningAppInc "..\PnP\PnpProvisioningAppData\PnPProvisioning.rss" -o%RESOURCE_PATH%pnpprovisioning.r54
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_57 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\PnP\PnPProvisioningAppInc "..\PnP\PnpProvisioningAppData\PnPProvisioning.rss" -o%RESOURCE_PATH%pnpprovisioning.r57
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_59 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\PnP\PnPProvisioningAppInc "..\PnP\PnpProvisioningAppData\PnPProvisioning.rss" -o%RESOURCE_PATH%pnpprovisioning.r59
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_67 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\PnP\PnPProvisioningAppInc "..\PnP\PnpProvisioningAppData\PnPProvisioning.rss" -o%RESOURCE_PATH%pnpprovisioning.r67
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_68 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\PnP\PnPProvisioningAppInc "..\PnP\PnpProvisioningAppData\PnPProvisioning.rss" -o%RESOURCE_PATH%pnpprovisioning.r68
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_70 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\PnP\PnPProvisioningAppInc "..\PnP\PnpProvisioningAppData\PnPProvisioning.rss" -o%RESOURCE_PATH%pnpprovisioning.r70
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_76 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\PnP\PnPProvisioningAppInc "..\PnP\PnpProvisioningAppData\PnPProvisioning.rss" -o%RESOURCE_PATH%pnpprovisioning.r76
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_78 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\PnP\PnPProvisioningAppInc "..\PnP\PnpProvisioningAppData\PnPProvisioning.rss" -o%RESOURCE_PATH%pnpprovisioning.r78
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_79 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\PnP\PnPProvisioningAppInc "..\PnP\PnpProvisioningAppData\PnPProvisioning.rss" -o%RESOURCE_PATH%pnpprovisioning.r79
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_83 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\PnP\PnPProvisioningAppInc "..\PnP\PnpProvisioningAppData\PnPProvisioning.rss" -o%RESOURCE_PATH%pnpprovisioning.r83
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_93 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\PnP\PnPProvisioningAppInc "..\PnP\PnpProvisioningAppData\PnPProvisioning.rss" -o%RESOURCE_PATH%pnpprovisioning.r93
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_157 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\PnP\PnPProvisioningAppInc "..\PnP\PnpProvisioningAppData\PnPProvisioning.rss" -o%RESOURCE_PATH%pnpprovisioning.r157
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_158 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\PnP\PnPProvisioningAppInc "..\PnP\PnpProvisioningAppData\PnPProvisioning.rss" -o%RESOURCE_PATH%pnpprovisioning.r158
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_159 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\PnP\PnPProvisioningAppInc "..\PnP\PnpProvisioningAppData\PnPProvisioning.rss" -o%RESOURCE_PATH%pnpprovisioning.r159
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_160 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\PnP\PnPProvisioningAppInc "..\PnP\PnpProvisioningAppData\PnPProvisioning.rss" -o%RESOURCE_PATH%pnpprovisioning.r160
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_161 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\PnP\PnPProvisioningAppInc "..\PnP\PnpProvisioningAppData\PnPProvisioning.rss" -o%RESOURCE_PATH%pnpprovisioning.r161
-
-
-rem ONLINE SUPPORT
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_00 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\OnlineSupport\inc -I..\OnlineSupport\inc\LocalizedFiles "..\OnlineSupport\inc\LocalizedFiles\OnlineSupport.rss" -o%RESOURCE_PATH%onlinesupport.r00
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_01 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\OnlineSupport\inc -I..\OnlineSupport\inc\LocalizedFiles "..\OnlineSupport\inc\LocalizedFiles\OnlineSupport.rss" -o%RESOURCE_PATH%onlinesupport.r01
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_02 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\OnlineSupport\inc -I..\OnlineSupport\inc\LocalizedFiles "..\OnlineSupport\inc\LocalizedFiles\OnlineSupport.rss" -o%RESOURCE_PATH%onlinesupport.r02
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_03 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\OnlineSupport\inc -I..\OnlineSupport\inc\LocalizedFiles "..\OnlineSupport\inc\LocalizedFiles\OnlineSupport.rss" -o%RESOURCE_PATH%onlinesupport.r03
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_04 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\OnlineSupport\inc -I..\OnlineSupport\inc\LocalizedFiles "..\OnlineSupport\inc\LocalizedFiles\OnlineSupport.rss" -o%RESOURCE_PATH%onlinesupport.r04
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_05 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\OnlineSupport\inc -I..\OnlineSupport\inc\LocalizedFiles "..\OnlineSupport\inc\LocalizedFiles\OnlineSupport.rss" -o%RESOURCE_PATH%onlinesupport.r05
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_06 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\OnlineSupport\inc -I..\OnlineSupport\inc\LocalizedFiles "..\OnlineSupport\inc\LocalizedFiles\OnlineSupport.rss" -o%RESOURCE_PATH%onlinesupport.r06
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_07 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\OnlineSupport\inc -I..\OnlineSupport\inc\LocalizedFiles "..\OnlineSupport\inc\LocalizedFiles\OnlineSupport.rss" -o%RESOURCE_PATH%onlinesupport.r07
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_08 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\OnlineSupport\inc -I..\OnlineSupport\inc\LocalizedFiles "..\OnlineSupport\inc\LocalizedFiles\OnlineSupport.rss" -o%RESOURCE_PATH%onlinesupport.r08
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_09 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\OnlineSupport\inc -I..\OnlineSupport\inc\LocalizedFiles "..\OnlineSupport\inc\LocalizedFiles\OnlineSupport.rss" -o%RESOURCE_PATH%onlinesupport.r09
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_10 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\OnlineSupport\inc -I..\OnlineSupport\inc\LocalizedFiles "..\OnlineSupport\inc\LocalizedFiles\OnlineSupport.rss" -o%RESOURCE_PATH%onlinesupport.r10
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_13 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\OnlineSupport\inc -I..\OnlineSupport\inc\LocalizedFiles "..\OnlineSupport\inc\LocalizedFiles\OnlineSupport.rss" -o%RESOURCE_PATH%onlinesupport.r13
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_14 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\OnlineSupport\inc -I..\OnlineSupport\inc\LocalizedFiles "..\OnlineSupport\inc\LocalizedFiles\OnlineSupport.rss" -o%RESOURCE_PATH%onlinesupport.r14
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_15 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\OnlineSupport\inc -I..\OnlineSupport\inc\LocalizedFiles "..\OnlineSupport\inc\LocalizedFiles\OnlineSupport.rss" -o%RESOURCE_PATH%onlinesupport.r15
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_16 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\OnlineSupport\inc -I..\OnlineSupport\inc\LocalizedFiles "..\OnlineSupport\inc\LocalizedFiles\OnlineSupport.rss" -o%RESOURCE_PATH%onlinesupport.r16
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_17 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\OnlineSupport\inc -I..\OnlineSupport\inc\LocalizedFiles "..\OnlineSupport\inc\LocalizedFiles\OnlineSupport.rss" -o%RESOURCE_PATH%onlinesupport.r17
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_18 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\OnlineSupport\inc -I..\OnlineSupport\inc\LocalizedFiles "..\OnlineSupport\inc\LocalizedFiles\OnlineSupport.rss" -o%RESOURCE_PATH%onlinesupport.r18
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_25 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\OnlineSupport\inc -I..\OnlineSupport\inc\LocalizedFiles "..\OnlineSupport\inc\LocalizedFiles\OnlineSupport.rss" -o%RESOURCE_PATH%onlinesupport.r25
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_26 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\OnlineSupport\inc -I..\OnlineSupport\inc\LocalizedFiles "..\OnlineSupport\inc\LocalizedFiles\OnlineSupport.rss" -o%RESOURCE_PATH%onlinesupport.r26
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_27 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\OnlineSupport\inc -I..\OnlineSupport\inc\LocalizedFiles "..\OnlineSupport\inc\LocalizedFiles\OnlineSupport.rss" -o%RESOURCE_PATH%onlinesupport.r27
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_28 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\OnlineSupport\inc -I..\OnlineSupport\inc\LocalizedFiles "..\OnlineSupport\inc\LocalizedFiles\OnlineSupport.rss" -o%RESOURCE_PATH%onlinesupport.r28
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_29 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\OnlineSupport\inc -I..\OnlineSupport\inc\LocalizedFiles "..\OnlineSupport\inc\LocalizedFiles\OnlineSupport.rss" -o%RESOURCE_PATH%onlinesupport.r29
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_30 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\OnlineSupport\inc -I..\OnlineSupport\inc\LocalizedFiles "..\OnlineSupport\inc\LocalizedFiles\OnlineSupport.rss" -o%RESOURCE_PATH%onlinesupport.r30
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_31 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\OnlineSupport\inc -I..\OnlineSupport\inc\LocalizedFiles "..\OnlineSupport\inc\LocalizedFiles\OnlineSupport.rss" -o%RESOURCE_PATH%onlinesupport.r31
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_32 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\OnlineSupport\inc -I..\OnlineSupport\inc\LocalizedFiles "..\OnlineSupport\inc\LocalizedFiles\OnlineSupport.rss" -o%RESOURCE_PATH%onlinesupport.r32
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_33 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\OnlineSupport\inc -I..\OnlineSupport\inc\LocalizedFiles "..\OnlineSupport\inc\LocalizedFiles\OnlineSupport.rss" -o%RESOURCE_PATH%onlinesupport.r33
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_37 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\OnlineSupport\inc -I..\OnlineSupport\inc\LocalizedFiles "..\OnlineSupport\inc\LocalizedFiles\OnlineSupport.rss" -o%RESOURCE_PATH%onlinesupport.r37
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_39 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\OnlineSupport\inc -I..\OnlineSupport\inc\LocalizedFiles "..\OnlineSupport\inc\LocalizedFiles\OnlineSupport.rss" -o%RESOURCE_PATH%onlinesupport.r39
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_42 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\OnlineSupport\inc -I..\OnlineSupport\inc\LocalizedFiles "..\OnlineSupport\inc\LocalizedFiles\OnlineSupport.rss" -o%RESOURCE_PATH%onlinesupport.r42
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_45 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\OnlineSupport\inc -I..\OnlineSupport\inc\LocalizedFiles "..\OnlineSupport\inc\LocalizedFiles\OnlineSupport.rss" -o%RESOURCE_PATH%onlinesupport.r45
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_49 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\OnlineSupport\inc -I..\OnlineSupport\inc\LocalizedFiles "..\OnlineSupport\inc\LocalizedFiles\OnlineSupport.rss" -o%RESOURCE_PATH%onlinesupport.r49
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_51 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\OnlineSupport\inc -I..\OnlineSupport\inc\LocalizedFiles "..\OnlineSupport\inc\LocalizedFiles\OnlineSupport.rss" -o%RESOURCE_PATH%onlinesupport.r51
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_54 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\OnlineSupport\inc -I..\OnlineSupport\inc\LocalizedFiles "..\OnlineSupport\inc\LocalizedFiles\OnlineSupport.rss" -o%RESOURCE_PATH%onlinesupport.r54
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_57 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\OnlineSupport\inc -I..\OnlineSupport\inc\LocalizedFiles "..\OnlineSupport\inc\LocalizedFiles\OnlineSupport.rss" -o%RESOURCE_PATH%onlinesupport.r57
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_59 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\OnlineSupport\inc -I..\OnlineSupport\inc\LocalizedFiles "..\OnlineSupport\inc\LocalizedFiles\OnlineSupport.rss" -o%RESOURCE_PATH%onlinesupport.r59
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_67 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\OnlineSupport\inc -I..\OnlineSupport\inc\LocalizedFiles "..\OnlineSupport\inc\LocalizedFiles\OnlineSupport.rss" -o%RESOURCE_PATH%onlinesupport.r67
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_68 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\OnlineSupport\inc -I..\OnlineSupport\inc\LocalizedFiles "..\OnlineSupport\inc\LocalizedFiles\OnlineSupport.rss" -o%RESOURCE_PATH%onlinesupport.r68
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_70 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\OnlineSupport\inc -I..\OnlineSupport\inc\LocalizedFiles "..\OnlineSupport\inc\LocalizedFiles\OnlineSupport.rss" -o%RESOURCE_PATH%onlinesupport.r70
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_76 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\OnlineSupport\inc -I..\OnlineSupport\inc\LocalizedFiles "..\OnlineSupport\inc\LocalizedFiles\OnlineSupport.rss" -o%RESOURCE_PATH%onlinesupport.r76
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_78 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\OnlineSupport\inc -I..\OnlineSupport\inc\LocalizedFiles "..\OnlineSupport\inc\LocalizedFiles\OnlineSupport.rss" -o%RESOURCE_PATH%onlinesupport.r78
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_79 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\OnlineSupport\inc -I..\OnlineSupport\inc\LocalizedFiles "..\OnlineSupport\inc\LocalizedFiles\OnlineSupport.rss" -o%RESOURCE_PATH%onlinesupport.r79
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_83 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\OnlineSupport\inc -I..\OnlineSupport\inc\LocalizedFiles "..\OnlineSupport\inc\LocalizedFiles\OnlineSupport.rss" -o%RESOURCE_PATH%onlinesupport.r83
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_93 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\OnlineSupport\inc -I..\OnlineSupport\inc\LocalizedFiles "..\OnlineSupport\inc\LocalizedFiles\OnlineSupport.rss" -o%RESOURCE_PATH%onlinesupport.r93
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_157 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\OnlineSupport\inc -I..\OnlineSupport\inc\LocalizedFiles "..\OnlineSupport\inc\LocalizedFiles\OnlineSupport.rss" -o%RESOURCE_PATH%onlinesupport.r157
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_158 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\OnlineSupport\inc -I..\OnlineSupport\inc\LocalizedFiles "..\OnlineSupport\inc\LocalizedFiles\OnlineSupport.rss" -o%RESOURCE_PATH%onlinesupport.r158
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_159 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\OnlineSupport\inc -I..\OnlineSupport\inc\LocalizedFiles "..\OnlineSupport\inc\LocalizedFiles\OnlineSupport.rss" -o%RESOURCE_PATH%onlinesupport.r159
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_160 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\OnlineSupport\inc -I..\OnlineSupport\inc\LocalizedFiles "..\OnlineSupport\inc\LocalizedFiles\OnlineSupport.rss" -o%RESOURCE_PATH%onlinesupport.r160
-perl -S epocrc.pl -u -m045,046,047 -DLANGUAGE_161 -DSIS_RESOURCE_COMPILATION -I%EROOT%\include -I..\OnlineSupport\inc -I..\OnlineSupport\inc\LocalizedFiles "..\OnlineSupport\inc\LocalizedFiles\OnlineSupport.rss" -o%RESOURCE_PATH%onlinesupport.r161
-
-rem -hOnlineSupport.rsg 
-
--- a/pnpmobileservices/pnpms/install/old/Support w PnPDemo S2-1.pkg	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +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 "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-;
-; Description: Implementation of PnPMS components
-;
-;Languages
-&EN
-;
-; UID is the app's UID
-;
-#{"Online Support wDemo (S2*1)"},(0x10204340),1,1,2
-;
-;Supports Series 60 v 2.0
-;This line indicates that this installation is for the Series 60 platform v2.0
-;This line must appear _exactly_ as shown below in the sis file
-;If this line is missing or incorrect, the sis file will not be able
-;to be installed on Series 60 v2.0 platforms
-(0x101F7960), 0, 0, 0, {"Series60ProductID"} 
-
-;
-; Files to install
-;
-
-;  ..\install so that makesis can be called from either group dir or the install dir 
-@"..\install\Support S2-1.SIS",(0x10204338) 
-@"..\..\PnP_Demo\install\PnPDemo S2-1.sis",(0x1020433C)
\ No newline at end of file
--- a/pnpmobileservices/pnpms/install/old/Support w PnPDemo S2-6.pkg	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +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 "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-;
-; Description: Implementation of PnPMS components
-;
-;Languages
-&EN
-;
-; UID is the app's UID
-;
-#{"Online Support wDemo (S2*6)"},(0x10204340),1,1,2
-;
-;Supports Series 60 v 2.0
-;This line indicates that this installation is for the Series 60 platform v2.0
-;This line must appear _exactly_ as shown below in the sis file
-;If this line is missing or incorrect, the sis file will not be able
-;to be installed on Series 60 v2.0 platforms
-(0x101F7960), 0, 0, 0, {"Series60ProductID"} 
-;
-; Files to install
-;
-@"..\install\Support S2-6.SIS",(0x10204338) 
-@"..\..\PnP_Demo\install\PnPDemo S2-1.sis",(0x1020433C)
\ No newline at end of file
--- a/pnpmobileservices/pnpms/install/old/Support_S2-1.pkg	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +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 "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-;
-; Description: Implementation of PnPMS components
-;
-;Languages
-&EN
-;
-; UID is the app's UID
-;
-#{"Online Support wProvisioning (S2*1)"},(0x10204341),1,5,2
-;
-;Supports Series 60 v 2.0
-;This line indicates that this installation is for the Series 60 platform v2.0
-;This line must appear _exactly_ as shown below in the sis file
-;If this line is missing or incorrect, the sis file will not be able
-;to be installed on Series 60 v2.0 platforms
-(0x101F7960), 0, 0, 0, {"Series60ProductID"} 
-;
-; Files to install
-;
-;@"..\..\Pnp\install\Support S2-1.SIS",(0x10204338) 
-
-"\Epoc32\release\thumb\urel\OnlineSupport.app"							-"!:\system\apps\OnlineSupport\OnlineSupport.app"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport.r01"			-"!:\system\apps\OnlineSupport\OnlineSupport.r01"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport_caption.r01"	-"!:\system\apps\OnlineSupport\OnlineSupport_caption.r01"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport.r02"			-"!:\system\apps\OnlineSupport\OnlineSupport.r02"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport_caption.r02"	-"!:\system\apps\OnlineSupport\OnlineSupport_caption.r02"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport.r03"			-"!:\system\apps\OnlineSupport\OnlineSupport.r03"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport_caption.r03"	-"!:\system\apps\OnlineSupport\OnlineSupport_caption.r03"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport.r04"			-"!:\system\apps\OnlineSupport\OnlineSupport.r04"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport_caption.r04"	-"!:\system\apps\OnlineSupport\OnlineSupport_caption.r04"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport.r05"			-"!:\system\apps\OnlineSupport\OnlineSupport.r05"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport_caption.r05"	-"!:\system\apps\OnlineSupport\OnlineSupport_caption.r05"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport.r06"			-"!:\system\apps\OnlineSupport\OnlineSupport.r06"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport_caption.r06"	-"!:\system\apps\OnlineSupport\OnlineSupport_caption.r06"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport.r09"			-"!:\system\apps\OnlineSupport\OnlineSupport.r09"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport_caption.r09"	-"!:\system\apps\OnlineSupport\OnlineSupport_caption.r09"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport.r13"			-"!:\system\apps\OnlineSupport\OnlineSupport.r13"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport_caption.r13"	-"!:\system\apps\OnlineSupport\OnlineSupport_caption.r13"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport.r29"			-"!:\system\apps\OnlineSupport\OnlineSupport.r29"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport_caption.r29"	-"!:\system\apps\OnlineSupport\OnlineSupport_caption.r29"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport.r30"			-"!:\system\apps\OnlineSupport\OnlineSupport.r30"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport_caption.r30"	-"!:\system\apps\OnlineSupport\OnlineSupport_caption.r30"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport.r31"			-"!:\system\apps\OnlineSupport\OnlineSupport.r31"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport_caption.r31"	-"!:\system\apps\OnlineSupport\OnlineSupport_caption.r31"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport.r32"			-"!:\system\apps\OnlineSupport\OnlineSupport.r32"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport_caption.r32"	-"!:\system\apps\OnlineSupport\OnlineSupport_caption.r32"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport.aif"			-"!:\system\apps\OnlineSupport\OnlineSupport.aif"
-"\epoc32\release\thumb\urel\RECnhwr.MDL"									-"!:\system\recogs\RECnhwr.MDL"
-"\Epoc32\release\thumb\urel\PnP.dll"										-"!:\system\libs\PnP.dll"
-"\epoc32\data\Z\System\shareddata\1020433A.ini"							-"C:\System\SharedData\1020433A.ini"
-"\Epoc32\release\thumb\urel\PnPRedirect.exe"									-"!:\system\apps\OnlineSupport\PnPRedirect.exe"
-
-"\epoc32\data\Z\System\shareddata\10204339.ini"							-"C:\System\SharedData\10204339.ini"
-@"..\..\PnP\install\PnPProv S2-1.sis",(0x10204339)
\ No newline at end of file
--- a/pnpmobileservices/pnpms/install/test/MakeSignedSisFor30_PnPPaosFilter.bat	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-rem
-rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-rem All rights reserved.
-rem This component and the accompanying materials are made available
-rem under the terms of "Eclipse Public License v1.0"
-rem which accompanies this distribution, and is available
-rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
-rem
-rem Initial Contributors:
-rem Nokia Corporation - initial contribution.
-rem
-rem Contributors:
-rem
-rem Description: Implementation of PnPMS components
-rem
-
-makesis "PnpPaosFilter S3-0.pkg"
-
-signsis "PnpPaosFilter S3-0.sis" PnpPaosFilter_signed_S3-0.sis \s60\AppinstUi\internal\RD_RootCA\rd.cer \s60\AppinstUi\internal\RD_RootCA\rd-key.pem
\ No newline at end of file
--- a/pnpmobileservices/pnpms/install/test/MakeSignedSisFor30_PnPProv.bat	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-rem
-rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-rem All rights reserved.
-rem This component and the accompanying materials are made available
-rem under the terms of "Eclipse Public License v1.0"
-rem which accompanies this distribution, and is available
-rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
-rem
-rem Initial Contributors:
-rem Nokia Corporation - initial contribution.
-rem
-rem Contributors:
-rem
-rem Description: Implementation of PnPMS components
-rem
-
-makesis "PnPProv_S3_0.pkg"
-
-signsis "PnPProv_S3_0.sis" PnpProv_signed.sis \s60\AppinstUi\internal\RD_RootCA\rd.cer \s60\AppinstUi\internal\RD_RootCA\rd-key.pem
\ No newline at end of file
--- a/pnpmobileservices/pnpms/install/test/PnPProv S2-1.pkg	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +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 "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-;
-; Installation file for PnpProvisioning application
-;
-;Languages
-&EN
-;
-; UID is the app's UID
-;
-#{"PnPProv (S2*1)"},(0x10204339),1,4,2
-;
-;Supports Series 60 v 2.0
-;This line indicates that this installation is for the Series 60 platform v2.0
-;This line must appear _exactly_ as shown below in the sis file
-;If this line is missing or incorrect, the sis file will not be able
-;to be installed on Series 60 v2.0 platforms
-(0x101F7960), 0, 0, 0, {"Series60ProductID"} 
-;
-; Files to install
-;
-"\Epoc32\release\thumb\urel\PnpProvisioning.app"							-"!:\system\apps\PnpProvisioning\PnpProvisioning.app"
-"\Epoc32\data\z\system\apps\PnpProvisioning\PnpProvisioning.rsc"			-"!:\system\apps\PnpProvisioning\PnpProvisioning.rsc"
-"\Epoc32\data\z\system\apps\PnpProvisioning\PnpProvisioning_caption.rsc"	-"!:\system\apps\PnpProvisioning\PnpProvisioning_caption.rsc"
-"\Epoc32\data\z\system\apps\PnpProvisioning\PnpProvisioning.aif"			-"!:\system\apps\PnpProvisioning\PnpProvisioning.aif"
-"\epoc32\release\thumb\urel\RECnhwr.MDL"									-"!:\system\recogs\RECnhwr.MDL"
-"\Epoc32\release\thumb\urel\PnP.dll"										-"!:\system\libs\PnP.dll"
-"\Epoc32\release\thumb\urel\NHwrParser.dll"							-"!:\system\libs\NHwrParser.dll"
-"\Epoc32\release\thumb\urel\PnPRedirect.exe"									-"!:\system\apps\PnpProvisioning\PnPRedirect.exe"
--- a/pnpmobileservices/pnpms/install/test/PnPProv S2-8.pkg	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +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 "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-;
-; Installation file for PnpProvisioning application
-;
-;Languages
-&EN
-;
-; UID is the app's UID
-;
-#{"PnPProv (S2*8)"},(0x10204339),1,4,3
-;
-;Supports Series 60 v 2.8
-;This line indicates that this installation is for the Series 60 platform v2.8
-;This line must appear _exactly_ as shown below in the sis file
-;If this line is missing or incorrect, the sis file will not be able
-;to be installed on Series 60 v2.8 platforms
-(0x102032BD), 0, 0, 0, {"Series60ProductID"} 
-;
-; Files to install
-;
-"\Epoc32\release\thumb\urel\PnpProvisioning.app"							-"!:\system\apps\PnpProvisioning\PnpProvisioning.app"
-"\Epoc32\data\z\system\apps\PnpProvisioning\PnpProvisioning.r01"			-"!:\system\apps\PnpProvisioning\PnpProvisioning.r01"
-"\Epoc32\data\z\system\apps\PnpProvisioning\PnpProvisioning.r02"			-"!:\system\apps\PnpProvisioning\PnpProvisioning.r02"
-"\Epoc32\data\z\system\apps\PnpProvisioning\PnpProvisioning.r03"			-"!:\system\apps\PnpProvisioning\PnpProvisioning.r03"
-"\Epoc32\data\z\system\apps\PnpProvisioning\PnpProvisioning.r04"			-"!:\system\apps\PnpProvisioning\PnpProvisioning.r04"
-"\Epoc32\data\z\system\apps\PnpProvisioning\PnpProvisioning.r05"			-"!:\system\apps\PnpProvisioning\PnpProvisioning.r05"
-"\Epoc32\data\z\system\apps\PnpProvisioning\PnpProvisioning.r06"			-"!:\system\apps\PnpProvisioning\PnpProvisioning.r06"
-"\Epoc32\data\z\system\apps\PnpProvisioning\PnpProvisioning.r09"			-"!:\system\apps\PnpProvisioning\PnpProvisioning.r09"
-"\Epoc32\data\z\system\apps\PnpProvisioning\PnpProvisioning.r13"			-"!:\system\apps\PnpProvisioning\PnpProvisioning.r13"
-"\Epoc32\data\z\system\apps\PnpProvisioning\PnpProvisioning.r29"			-"!:\system\apps\PnpProvisioning\PnpProvisioning.r29"
-"\Epoc32\data\z\system\apps\PnpProvisioning\PnpProvisioning.r30"			-"!:\system\apps\PnpProvisioning\PnpProvisioning.r30"
-"\Epoc32\data\z\system\apps\PnpProvisioning\PnpProvisioning.r31"			-"!:\system\apps\PnpProvisioning\PnpProvisioning.r31"
-"\Epoc32\data\z\system\apps\PnpProvisioning\PnpProvisioning.r32"			-"!:\system\apps\PnpProvisioning\PnpProvisioning.r32"
-"\Epoc32\data\z\system\apps\PnpProvisioning\PnpProvisioning.r39"			-"!:\system\apps\PnpProvisioning\PnpProvisioning.r39"
-"\Epoc32\data\z\system\apps\PnpProvisioning\PnpProvisioning.r59"			-"!:\system\apps\PnpProvisioning\PnpProvisioning.r59"
-"\Epoc32\data\z\system\apps\PnpProvisioning\PnpProvisioning.r70"			-"!:\system\apps\PnpProvisioning\PnpProvisioning.r70"
-"\Epoc32\data\Z\Private\10003A3F\APPS\PnpProvisioning_REG.rsc"			-"!:\Private\10003A3F\APPS\PnpProvisioning_REG.rsc"
-"\Epoc32\data\z\system\apps\PnpProvisioning\PnpProvisioning.aif"			-"!:\system\apps\PnpProvisioning\PnpProvisioning.aif"
-"\Epoc32\data\z\system\apps\PnpProvisioning\PnpProvisioning_aif.mbm"			-"!:\system\apps\PnpProvisioning\PnpProvisioning_aif.mbm"
-
-"\epoc32\release\thumb\urel\RECnhwr.MDL"									-"!:\system\recogs\RECnhwr.MDL"
-"\Epoc32\release\thumb\urel\PnP.dll"										-"!:\system\libs\PnP.dll"
-"\Epoc32\release\thumb\urel\NHwrParser.dll"							-"!:\system\libs\NHwrParser.dll"
-"\Epoc32\release\thumb\urel\PnPRedirect.exe"									-"!:\system\apps\PnpProvisioning\PnPRedirect.exe"
--- a/pnpmobileservices/pnpms/install/test/PnPProv_S3_0.pkg	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,83 +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 "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-;
-; Installation file for PnpProvisioning application
-;
-;Languages
-&EN
-
-; The non-localised, globally unique vendor name (mandatory)
-:"Nokia"
-
-; List of localised vendor names - one per language. At least one must be provided (English [EN]). 
-; List must correspond to list of languages specified elsewhere in the .pkg
-;%{"Vendor-EN", "Vendor-FR"}
-%{"Nokia"}
-
-;
-; UID is the app's UID
-;
-#{"PnPProv (S3*0)"},(0x10204339),1,4,2
-;
-;Supports Series 60 v 3.0
-;This line indicates that this installation is for the Series 60 platform v3.0
-;This line must appear _exactly_ as shown below in the sis file
-;If this line is missing or incorrect, the sis file will not be able
-;to be installed
-[0x101F7961], 0, 0, 0, {"Series60ProductID"}
-
-
-; Files to install
-;
-
-; PnpProvisioning App
-"\Epoc32\release\armv5\urel\PnpProvisioning.exe"				-"!:\sys\bin\PnpProvisioning.exe"
-"\Epoc32\data\Z\Resource\apps\PnpProvisioning.MBM"					-"!:\Resource\apps\PnpProvisioning.mbm"
-"\Epoc32\data\Z\Resource\Apps\PnpProvisioning.MIF"					-"!:\Resource\Apps\PnpProvisioning.MIF"
-"\Epoc32\data\Z\Resource\Apps\PnpProvisioning_aif.MBM"			-"!:\Resource\Apps\PnpProvisioning_aif.MBM";
-
-; App Resources
-"\Epoc32\data\z\Resource\apps\PnpProvisioning.r01"			-"!:\Resource\apps\PnpProvisioning.r01"
-"\Epoc32\data\z\Resource\apps\PnpProvisioning.r02"			-"!:\Resource\apps\PnpProvisioning.r02"
-"\Epoc32\data\z\Resource\apps\PnpProvisioning.r03"			-"!:\Resource\apps\PnpProvisioning.r03"
-"\Epoc32\data\z\Resource\apps\PnpProvisioning.r04"			-"!:\Resource\apps\PnpProvisioning.r04"
-"\Epoc32\data\z\Resource\apps\PnpProvisioning.r05"			-"!:\Resource\apps\PnpProvisioning.r05"
-"\Epoc32\data\z\Resource\apps\PnpProvisioning.r06"			-"!:\Resource\apps\PnpProvisioning.r06"
-"\Epoc32\data\z\Resource\apps\PnpProvisioning.r09"			-"!:\Resource\apps\PnpProvisioning.r09"
-"\Epoc32\data\z\Resource\apps\PnpProvisioning.r13"			-"!:\Resource\apps\PnpProvisioning.r13"
-"\Epoc32\data\z\Resource\apps\PnpProvisioning.r29"			-"!:\Resource\apps\PnpProvisioning.r29"
-"\Epoc32\data\z\Resource\apps\PnpProvisioning.r30"			-"!:\Resource\apps\PnpProvisioning.r30"
-"\Epoc32\data\z\Resource\apps\PnpProvisioning.r31"			-"!:\Resource\apps\PnpProvisioning.r31"
-"\Epoc32\data\z\Resource\apps\PnpProvisioning.r32"			-"!:\Resource\apps\PnpProvisioning.r32"
-"\Epoc32\data\z\Resource\apps\PnpProvisioning.r39"			-"!:\Resource\apps\PnpProvisioning.r39"
-"\Epoc32\data\z\Resource\apps\PnpProvisioning.r59"			-"!:\Resource\apps\PnpProvisioning.r59"
-"\Epoc32\data\z\Resource\apps\PnpProvisioning.r70"			-"!:\Resource\apps\PnpProvisioning.r70"
-"\Epoc32\data\Z\Private\10003A3F\APPS\PnpProvisioning_REG.rsc"			-"!:\Private\10003A3F\APPS\PnpProvisioning_REG.rsc"
-
-; Recognizer
-"\epoc32\release\armv5\urel\RECnhwr.dll" - "!:\sys\bin\RECnhwr.dll"
-"\epoc32\data\Z\Resource\Plugins\RECnhwr.RSC" - "!:\Resource\Plugins\RECnhwr.RSC"
-
-; Pnp Util dll
-"\Epoc32\release\armv5\urel\PnP.dll"							-"!:\sys\bin\PnP.dll"
-"\Epoc32\release\armv5\urel\NHwrParser.dll"				-"!:\sys\bin\NHwrParser.dll"
-
-; Central Repository initialization file for PnP.dll
-; "Currently there is no way to install new repositories."
-;"..\PnpUtil\1020433A.txt"										-"!:\private\10202be9\import\1020433A.txt"
-
-; Redirect EXE
-"\Epoc32\release\armv5\urel\PnPRedirect.exe"						-"!:\sys\bin\PnPRedirect.exe"
--- a/pnpmobileservices/pnpms/install/test/PnpPaosFilter S2-8.pkg	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +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 "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description: Implementation of PnPMS components
-;
-
-;Languages
-&EN
-
-; UID is the app's UID
-#{"PnpPaosFilter"},(0x10272D33),1,0,1
-
-;Supports Series 60 v 2.8
-(0x102032BD), 0, 0, 0, {"Series60ProductID"} 
-
-; Requisites
-; PnpUtil -dll is needed
-(0x10204339),1,4,3, {"PnpProvisioning"}
-
-; Own files
-
-"\epoc32\release\thumb\urel\PnpPaosFilter.dll"
- - "C:\System\Libs\Plugins\PnpPaosFilter.dll"
-"\epoc32\data\z\system\Libs\Plugins\10272D33.rsc"
- - "C:\System\Libs\Plugins\10272D33.rsc"
\ No newline at end of file
--- a/pnpmobileservices/pnpms/install/test/PnpPaosFilter S3-0.pkg	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +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 "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description: Implementation of PnPMS components
-;
-
-;Languages
-&EN
-
-; The non-localised, globally unique vendor name (mandatory)
-:"Nokia"
-
-; List of localised vendor names - one per language. At least one must be provided (English [EN]). 
-; List must correspond to list of languages specified elsewhere in the .pkg
-;%{"Vendor-EN", "Vendor-FR"}
-%{"Nokia"}
-
-; UID is the app's UID
-#{"PnpPaosFilter"},(0x10272D33),1,0,0
-
-;Supports Series 60 v 3.0
-;This line indicates that this installation is for the Series 60 platform v3.0
-;This line must appear _exactly_ as shown below in the sis file
-;If this line is missing or incorrect, the sis file will not be able
-;to be installed
-[0x101F7961], 0, 0, 0, {"Series60ProductID"}
-
-; Own files
-
-"\epoc32\release\armv5\urel\PnpPaosFilter.dll"
- - "!:\sys\bin\PnpPaosFilter.dll"
-"\epoc32\data\Z\Resource\Plugins\PnPPaosFilter.RSC"
- - "!:\Resource\plugins\PnPPaosFilter.RSC"
\ No newline at end of file
--- a/pnpmobileservices/pnpms/install/test/PnpPaosFilter.pkg	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +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 "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description: Implementation of PnPMS components
-;
-
-;Languages
-&EN
-
-; UID is the app's UID
-#{"PnpPaosFilter"},(0x10272D33),1,0,0
-
-; Supports Series 60 v2.0
-(0x101F7960), 0, 0, 0, {"Series60ProductID"}
-
-; Own files
-
-"\epoc32\release\thumb\urel\PnpPaosFilter.dll"
- - "C:\System\Libs\Plugins\PnpPaosFilter.dll"
-"\epoc32\data\z\system\Libs\Plugins\10272D33.rsc"
- - "C:\System\Libs\Plugins\10272D33.rsc"
\ No newline at end of file
--- a/pnpmobileservices/pnpms/install/test/Support S2-1.pkg	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +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 "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-;
-; Installation file for OMenuSet application
-;
-;Languages
-&EN
-;
-; UID is the app's UID
-;
-#{"Online Support (S2*1)"},(0x10204338),1,4,2
-;
-;Supports Series 60 v 2.0
-;This line indicates that this installation is for the Series 60 platform v2.0
-;This line must appear _exactly_ as shown below in the sis file
-;If this line is missing or incorrect, the sis file will not be able
-;to be installed on Series 60 v2.0 platforms
-(0x101F7960), 0, 0, 0, {"Series60ProductID"} 
-;
-; Files to install
-;
-"\Epoc32\release\thumb\urel\OnlineSupport.app"						-"!:\system\apps\OnlineSupport\OnlineSupport.app"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport.r01"			-"!:\system\apps\OnlineSupport\OnlineSupport.r01"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport_caption.r01"	-"!:\system\apps\OnlineSupport\OnlineSupport_caption.r01"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport.r02"			-"!:\system\apps\OnlineSupport\OnlineSupport.r02"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport_caption.r02"	-"!:\system\apps\OnlineSupport\OnlineSupport_caption.r02"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport.r03"			-"!:\system\apps\OnlineSupport\OnlineSupport.r03"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport_caption.r03"	-"!:\system\apps\OnlineSupport\OnlineSupport_caption.r03"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport.r04"			-"!:\system\apps\OnlineSupport\OnlineSupport.r04"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport_caption.r04"	-"!:\system\apps\OnlineSupport\OnlineSupport_caption.r04"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport.r05"			-"!:\system\apps\OnlineSupport\OnlineSupport.r05"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport_caption.r05"	-"!:\system\apps\OnlineSupport\OnlineSupport_caption.r05"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport.r06"			-"!:\system\apps\OnlineSupport\OnlineSupport.r06"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport_caption.r06"	-"!:\system\apps\OnlineSupport\OnlineSupport_caption.r06"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport.r09"			-"!:\system\apps\OnlineSupport\OnlineSupport.r09"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport_caption.r09"	-"!:\system\apps\OnlineSupport\OnlineSupport_caption.r09"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport.r13"			-"!:\system\apps\OnlineSupport\OnlineSupport.r13"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport_caption.r13"	-"!:\system\apps\OnlineSupport\OnlineSupport_caption.r13"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport.r29"			-"!:\system\apps\OnlineSupport\OnlineSupport.r29"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport_caption.r29"	-"!:\system\apps\OnlineSupport\OnlineSupport_caption.r29"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport.r30"			-"!:\system\apps\OnlineSupport\OnlineSupport.r30"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport_caption.r30"	-"!:\system\apps\OnlineSupport\OnlineSupport_caption.r30"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport.r31"			-"!:\system\apps\OnlineSupport\OnlineSupport.r31"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport_caption.r31"	-"!:\system\apps\OnlineSupport\OnlineSupport_caption.r31"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport.r32"			-"!:\system\apps\OnlineSupport\OnlineSupport.r32"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport_caption.r32"	-"!:\system\apps\OnlineSupport\OnlineSupport_caption.r32"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport.aif"			-"!:\system\apps\OnlineSupport\OnlineSupport.aif"
-"..\Data\10204338.ini"							-"C:\System\SharedData\10204338.ini"
\ No newline at end of file
--- a/pnpmobileservices/pnpms/install/test/Support S2-6.pkg	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +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 "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-;
-; Installation file for OMenuSet application
-;
-;Languages
-&EN
-;
-; UID is the app's UID
-;
-#{"Online Support (S2*6)"},(0x10204338),1,4,2
-;
-;Supports Series 60 v 2.0
-;This line indicates that this installation is for the Series 60 platform v2.0
-;This line must appear _exactly_ as shown below in the sis file
-;If this line is missing or incorrect, the sis file will not be able
-;to be installed on Series 60 v2.0 platforms
-(0x101F7960), 0, 0, 0, {"Series60ProductID"} 
-;
-; Files to install
-;
-"\Epoc32\release\thumb\urel\OnlineSupport.app"						-"!:\system\apps\OnlineSupport\OnlineSupport.app"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport.r01"			-"!:\system\apps\OnlineSupport\OnlineSupport.r01"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport_caption.r01"	-"!:\system\apps\OnlineSupport\OnlineSupport_caption.r01"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport.r02"			-"!:\system\apps\OnlineSupport\OnlineSupport.r02"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport_caption.r02"	-"!:\system\apps\OnlineSupport\OnlineSupport_caption.r02"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport.r03"			-"!:\system\apps\OnlineSupport\OnlineSupport.r03"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport_caption.r03"	-"!:\system\apps\OnlineSupport\OnlineSupport_caption.r03"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport.r04"			-"!:\system\apps\OnlineSupport\OnlineSupport.r04"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport_caption.r04"	-"!:\system\apps\OnlineSupport\OnlineSupport_caption.r04"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport.r05"			-"!:\system\apps\OnlineSupport\OnlineSupport.r05"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport_caption.r05"	-"!:\system\apps\OnlineSupport\OnlineSupport_caption.r05"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport.r06"			-"!:\system\apps\OnlineSupport\OnlineSupport.r06"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport_caption.r06"	-"!:\system\apps\OnlineSupport\OnlineSupport_caption.r06"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport.r09"			-"!:\system\apps\OnlineSupport\OnlineSupport.r09"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport_caption.r09"	-"!:\system\apps\OnlineSupport\OnlineSupport_caption.r09"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport.r13"			-"!:\system\apps\OnlineSupport\OnlineSupport.r13"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport_caption.r13"	-"!:\system\apps\OnlineSupport\OnlineSupport_caption.r13"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport.r29"			-"!:\system\apps\OnlineSupport\OnlineSupport.r29"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport_caption.r29"	-"!:\system\apps\OnlineSupport\OnlineSupport_caption.r29"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport.r30"			-"!:\system\apps\OnlineSupport\OnlineSupport.r30"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport_caption.r30"	-"!:\system\apps\OnlineSupport\OnlineSupport_caption.r30"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport.r31"			-"!:\system\apps\OnlineSupport\OnlineSupport.r31"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport_caption.r31"	-"!:\system\apps\OnlineSupport\OnlineSupport_caption.r31"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport.r32"			-"!:\system\apps\OnlineSupport\OnlineSupport.r32"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport_caption.r32"	-"!:\system\apps\OnlineSupport\OnlineSupport_caption.r32"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport.aif"			-"!:\system\apps\OnlineSupport\OnlineSupport.aif"
-"..\Data\10204338.ini"							-"C:\System\SharedData\10204338.ini"
\ No newline at end of file
--- a/pnpmobileservices/pnpms/install/test/Support S2-8.pkg	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +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 "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-;
-; Installation file for OMenuSet application
-;
-;Languages
-&EN
-;
-; UID is the app's UID
-;
-#{"Online Support (S2*8)"},(0x10204338),1,4,3
-
-;
-;Supports Series 60 v 2.8
-(0x102032BD), 0, 0, 0, {"Series60ProductID"} 
-
-; Requisites
-; PnpUtil -dll is needed
-(0x10204339),1,4,3, {"PnpProvisioning"}
-
-;
-; Files to install
-;
-"\Epoc32\release\thumb\urel\OnlineSupport.app"										-"!:\system\apps\OnlineSupport\OnlineSupport.app"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport.r01"			-"!:\system\apps\OnlineSupport\OnlineSupport.r01"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport.r02"			-"!:\system\apps\OnlineSupport\OnlineSupport.r02"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport.r03"			-"!:\system\apps\OnlineSupport\OnlineSupport.r03"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport.r04"			-"!:\system\apps\OnlineSupport\OnlineSupport.r04"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport.r05"			-"!:\system\apps\OnlineSupport\OnlineSupport.r05"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport.r06"			-"!:\system\apps\OnlineSupport\OnlineSupport.r06"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport.r09"			-"!:\system\apps\OnlineSupport\OnlineSupport.r09"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport.r13"			-"!:\system\apps\OnlineSupport\OnlineSupport.r13"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport.r29"			-"!:\system\apps\OnlineSupport\OnlineSupport.r29"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport.r30"			-"!:\system\apps\OnlineSupport\OnlineSupport.r30"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport.r31"			-"!:\system\apps\OnlineSupport\OnlineSupport.r31"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport.r32"			-"!:\system\apps\OnlineSupport\OnlineSupport.r32"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport.r39"			-"!:\system\apps\OnlineSupport\OnlineSupport.r39"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport.r59"			-"!:\system\apps\OnlineSupport\OnlineSupport.r59"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport.r70"			-"!:\system\apps\OnlineSupport\OnlineSupport.r70"
-"\epoc32\data\Z\PRIVATE\10003A3F\APPS\OnlineSupport_reg.rsc"			-"!:\private\10003A3F\apps\OnlineSupport_reg.rsc"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport_aif.mbm"	-"!:\system\apps\OnlineSupport\OnlineSupport_aif.mbm"
-"..\Data\10204338.ini"																						-"C:\System\SharedData\10204338.ini"
\ No newline at end of file
--- a/pnpmobileservices/pnpms/install/test/Support S3-0.pkg	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +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 "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-;
-; Installation file for OMenuSet application
-;
-;Languages
-&EN
-;
-; UID is the app's UID
-;
-#{"Online Support (S2*6)"},(0x10204338),1,4,2
-;
-;Supports Series 60 v 2.0
-;This line indicates that this installation is for the Series 60 platform v2.0
-;This line must appear _exactly_ as shown below in the sis file
-;If this line is missing or incorrect, the sis file will not be able
-;to be installed on Series 60 v2.0 platforms
-(0x101F7960), 0, 0, 0, {"Series60ProductID"} 
-
-; The non-localised, globally unique vendor name (mandatory)
-:"Nokia"
-
-;
-; Files to install
-;
-"\epoc32\RELEASE\armv5\UREL\OnlineSupport.exe"-"!:\sys\bin\OnlineSupport.exe"
-"\epoc32\data\Z\Resource\apps\OnlineSupport.MBM"			-"!:\Resource\apps\OnlineSupport.mbm"
-
-"\Epoc32\data\z\Resource\apps\OnlineSupport.r01"			-"!:\system\apps\OnlineSupport\OnlineSupport.r01"
-"\Epoc32\data\z\Resource\apps\OnlineSupport_caption.r01"	-"!:\system\apps\OnlineSupport\OnlineSupport_caption.r01"
-"\Epoc32\data\z\Resource\apps\OnlineSupport.r02"			-"!:\system\apps\OnlineSupport\OnlineSupport.r02"
-"\Epoc32\data\z\Resource\apps\OnlineSupport_caption.r02"	-"!:\system\apps\OnlineSupport\OnlineSupport_caption.r02"
-"\Epoc32\data\z\Resource\apps\OnlineSupport.r03"			-"!:\system\apps\OnlineSupport\OnlineSupport.r03"
-"\Epoc32\data\z\Resource\apps\OnlineSupport_caption.r03"	-"!:\system\apps\OnlineSupport\OnlineSupport_caption.r03"
-"\Epoc32\data\z\Resource\apps\OnlineSupport.r04"			-"!:\system\apps\OnlineSupport\OnlineSupport.r04"
-"\Epoc32\data\z\Resource\apps\OnlineSupport_caption.r04"	-"!:\system\apps\OnlineSupport\OnlineSupport_caption.r04"
-"\Epoc32\data\z\Resource\apps\OnlineSupport.r05"			-"!:\system\apps\OnlineSupport\OnlineSupport.r05"
-"\Epoc32\data\z\Resource\apps\OnlineSupport_caption.r05"	-"!:\system\apps\OnlineSupport\OnlineSupport_caption.r05"
-"\Epoc32\data\z\Resource\apps\OnlineSupport.r06"			-"!:\system\apps\OnlineSupport\OnlineSupport.r06"
-"\Epoc32\data\z\Resource\apps\OnlineSupport_caption.r06"	-"!:\system\apps\OnlineSupport\OnlineSupport_caption.r06"
-"\Epoc32\data\z\Resource\apps\OnlineSupport.r09"			-"!:\system\apps\OnlineSupport\OnlineSupport.r09"
-"\Epoc32\data\z\Resource\apps\OnlineSupport_caption.r09"	-"!:\system\apps\OnlineSupport\OnlineSupport_caption.r09"
-"\Epoc32\data\z\Resource\apps\OnlineSupport.r13"			-"!:\system\apps\OnlineSupport\OnlineSupport.r13"
-"\Epoc32\data\z\Resource\apps\OnlineSupport_caption.r13"	-"!:\system\apps\OnlineSupport\OnlineSupport_caption.r13"
-"\Epoc32\data\z\Resource\apps\OnlineSupport.r29"			-"!:\system\apps\OnlineSupport\OnlineSupport.r29"
-"\Epoc32\data\z\Resource\apps\OnlineSupport_caption.r29"	-"!:\system\apps\OnlineSupport\OnlineSupport_caption.r29"
-"\Epoc32\data\z\Resource\apps\OnlineSupport.r30"			-"!:\system\apps\OnlineSupport\OnlineSupport.r30"
-"\Epoc32\data\z\Resource\apps\OnlineSupport_caption.r30"	-"!:\system\apps\OnlineSupport\OnlineSupport_caption.r30"
-"\Epoc32\data\z\Resource\apps\OnlineSupport.r31"			-"!:\system\apps\OnlineSupport\OnlineSupport.r31"
-"\Epoc32\data\z\Resource\apps\OnlineSupport_caption.r31"	-"!:\system\apps\OnlineSupport\OnlineSupport_caption.r31"
-"\Epoc32\data\z\Resource\apps\OnlineSupport.r32"			-"!:\system\apps\OnlineSupport\OnlineSupport.r32"
-"\Epoc32\data\z\Resource\apps\OnlineSupport_caption.r32"	-"!:\system\apps\OnlineSupport\OnlineSupport_caption.r32"
-
-"\Epoc32\data\z\private\10003a3f\apps\OnlineSupport_reg.RSC"			-"!:\system\apps\OnlineSupport\OnlineSupport.aif"
-;"\Epoc32\data\z\Resource\apps\OnlineSupport.aif"			-"!:\system\apps\OnlineSupport\OnlineSupport.aif"
-
-"..\Data\10204338.txt"							-"C:\private\10202be9\import\10204338.txt"
\ No newline at end of file
--- a/pnpmobileservices/pnpms/install/udeb/CentralRepositoryInit.pkg	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-;
-; Copyright (c) 2006-2006 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:  Package file for project PnPMS CentralRepositoryInit
-;
-
-; -------- general --------
-
-;Languages
-&EN
-
-; Package header
-#{"ServiceHelp Data"},(0x10202BE9),1,5,2,TYPE=PU
-
-;Localised Vendor name
-%{"Nokia"}
-
-;Unique Vendor name
-:"Nokia"
-
-; Dependency for S60 3.0
-[0x101F7961], 0, 0, 0, {"Series60ProductID"}
-
-; -------- files --------
-
-"\Epoc32\data\Z\private\10202BE9\10204338.txt"						-"!:\Private\10202BE9\10204338.txt"
-"\Epoc32\data\Z\private\10202BE9\1020433A.txt"						-"!:\private\10202be9\1020433A.txt"
-"\Epoc32\data\Z\private\10202BE9\10272D33.txt"						-"!:\private\10202be9\10272D33.txt"
--- a/pnpmobileservices/pnpms/install/udeb/MakeRndSignedFor30.bat	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-rem
-rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-rem All rights reserved.
-rem This component and the accompanying materials are made available
-rem under the terms of "Eclipse Public License v1.0"
-rem which accompanies this distribution, and is available
-rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
-rem
-rem Initial Contributors:
-rem Nokia Corporation - initial contribution.
-rem
-rem Contributors:
-rem
-rem Description: Implementation of PnPMS components
-rem
-
-makesis "PnpPaos_S3-0_udeb.pkg"
-signsis "PnpPaos_S3-0_udeb.SIS" PnpPaos_S3-0_signed.sis \s60\AppinstUi\internal\RD_RootCA\rd.cer \s60\AppinstUi\internal\RD_RootCA\rd-key.pem
-
-makesis "CentralRepositoryInit.pkg"
-signsis "CentralRepositoryInit.SIS" CentralRepositoryInit_signed.sis \s60\AppinstUi\internal\RD_RootCA\rd.cer \s60\AppinstUi\internal\RD_RootCA\rd-key.pem
-
-makesis "Support_w_Paos_S3-0_udeb.pkg"
-signsis "Support_w_Paos_S3-0_udeb.SIS" ServiceHelp_RnD_udeb_signed.sis \s60\AppinstUi\internal\RD_RootCA\rd.cer \s60\AppinstUi\internal\RD_RootCA\rd-key.pem
-
-del PnpPaos_S3-0_udeb.SIS
-del PnpPaos_S3-0_signed.sis
-del CentralRepositoryInit.SIS
-del CentralRepositoryInit_signed.sis
-del Support_w_Paos_S3-0_udeb.SIS
\ No newline at end of file
--- a/pnpmobileservices/pnpms/install/udeb/MakeRndSignedPatchFor30.bat	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-rem
-rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-rem All rights reserved.
-rem This component and the accompanying materials are made available
-rem under the terms of "Eclipse Public License v1.0"
-rem which accompanies this distribution, and is available
-rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
-rem
-rem Initial Contributors:
-rem Nokia Corporation - initial contribution.
-rem
-rem Contributors:
-rem
-rem Description: Implementation of PnPMS components
-rem
-
-makesis "PnpPaos_S3-0_patch_udeb.pkg"
-signsis "PnpPaos_S3-0_patch_udeb.SIS" PnpPaos_S3-0_signed.sis \s60\AppinstUi\internal\RD_RootCA\rd.cer \s60\AppinstUi\internal\RD_RootCA\rd-key.pem
-
-makesis "CentralRepositoryInit.pkg"
-signsis "CentralRepositoryInit.SIS" CentralRepositoryInit_signed.sis \s60\AppinstUi\internal\RD_RootCA\rd.cer \s60\AppinstUi\internal\RD_RootCA\rd-key.pem
-
-makesis "Support_w_Paos_S3-0_patch_udeb.pkg"
-signsis "Support_w_Paos_S3-0_patch_udeb.SIS" ServiceHelp_update_udeb__RnD_signed.sis \s60\AppinstUi\internal\RD_RootCA\rd.cer \s60\AppinstUi\internal\RD_RootCA\rd-key.pem
-
-del PnpPaos_S3-0_patch_udeb.SIS
-del PnpPaos_S3-0_signed.sis
-del CentralRepositoryInit.SIS
-del CentralRepositoryInit_signed.sis
-del Support_w_Paos_S3-0_patch_udeb.SIS
\ No newline at end of file
--- a/pnpmobileservices/pnpms/install/udeb/PnpPaos_S3-0_patch_udeb.pkg	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +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 "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-;
-; Installation file for OnlineSupport application with PAOS filter
-;
-;Languages
-&EN
-
-; The non-localised, globally unique vendor name (mandatory)
-:"Nokia"
-
-; List of localised vendor names - one per language. At least one must be provided (English [EN]). 
-; List must correspond to list of languages specified elsewhere in the .pkg
-;%{"Vendor-EN", "Vendor-FR"}
-%{"Nokia"}
-
-;
-; UID is the app's UID
-;
-#{"Paos (S3*0)"},(0x10272D33),1,5,3,TYPE=PU
-;
-
-;
-;Supports Series 60 v 3.0
-;This line indicates that this installation is for the Series 60 platform v3.0
-;This line must appear _exactly_ as shown below in the sis file
-;If this line is missing or incorrect, the sis file will not be able
-;to be installed
-[0x101F7961], 0, 0, 0, {"Series60ProductID"}
-
-;
-; Files to install
-;
-
-"\epoc32\release\armv5\udeb\PnpPaosFilter.dll" - "!:\sys\bin\PnpPaosFilter.dll"
-"\epoc32\data\Z\Resource\Plugins\PnPPaosFilter.RSC" - "!:\Resource\plugins\PnPPaosFilter.RSC"
\ No newline at end of file
--- a/pnpmobileservices/pnpms/install/udeb/PnpPaos_S3-0_stub_udeb.pkg	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +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 "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-;
-; Installation file for OnlineSupport application with PAOS filter
-;
-;Languages
-&EN
-
-; The non-localised, globally unique vendor name (mandatory)
-:"Nokia"
-
-; List of localised vendor names - one per language. At least one must be provided (English [EN]). 
-; List must correspond to list of languages specified elsewhere in the .pkg
-;%{"Vendor-EN", "Vendor-FR"}
-%{"Nokia"}
-
-;
-; UID is the app's UID
-;
-#{"Paos (S3*0)"},(0x10272D33),1,5,3
-;
-
-;
-;Supports Series 60 v 3.0
-;This line indicates that this installation is for the Series 60 platform v3.0
-;This line must appear _exactly_ as shown below in the sis file
-;If this line is missing or incorrect, the sis file will not be able
-;to be installed
-[0x101F7961], 0, 0, 0, {"Series60ProductID"}
-
-;
-; Files to install
-;
-
-"\epoc32\release\armv5\udeb\PnpPaosFilter.dll" - "!:\sys\bin\PnpPaosFilter.dll"
-"\epoc32\data\Z\Resource\Plugins\PnPPaosFilter.RSC" - "!:\Resource\plugins\PnPPaosFilter.RSC"
\ No newline at end of file
--- a/pnpmobileservices/pnpms/install/udeb/PnpPaos_S3-0_udeb.pkg	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +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 "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-;
-; Installation file for OnlineSupport application with PAOS filter
-;
-;Languages
-&EN
-
-; The non-localised, globally unique vendor name (mandatory)
-:"Nokia"
-
-; List of localised vendor names - one per language. At least one must be provided (English [EN]). 
-; List must correspond to list of languages specified elsewhere in the .pkg
-;%{"Vendor-EN", "Vendor-FR"}
-%{"Nokia"}
-
-;
-; UID is the app's UID
-;
-#{"Paos (S3*0)"},(0x10272D33),1,5,3
-;
-
-;
-;Supports Series 60 v 3.0
-;This line indicates that this installation is for the Series 60 platform v3.0
-;This line must appear _exactly_ as shown below in the sis file
-;If this line is missing or incorrect, the sis file will not be able
-;to be installed
-[0x101F7961], 0, 0, 0, {"Series60ProductID"}
-
-;
-; Files to install
-;
-
-"\epoc32\release\armv5\udeb\PnpPaosFilter.dll" - "!:\sys\bin\PnpPaosFilter.dll"
-"\epoc32\data\Z\Resource\Plugins\PnPPaosFilter.RSC" - "!:\Resource\plugins\PnPPaosFilter.RSC"
\ No newline at end of file
--- a/pnpmobileservices/pnpms/install/udeb/Support_S3-0_stub_udeb.pkg	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,161 +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 "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-;
-; Installation file for OnlineSupport application with PAOS filter
-;
-;Languages
-&EN
-
-; The non-localised, globally unique vendor name (mandatory)
-:"Nokia"
-
-; List of localised vendor names - one per language. At least one must be provided (English [EN]). 
-; List must correspond to list of languages specified elsewhere in the .pkg
-;%{"Vendor-EN", "Vendor-FR"}
-%{"Nokia"}
-
-;
-; UID is the app's UID
-;
-#{"ServiceHelp (S3*0)"},(0x10272D34),1,5,3
-;
-
-;
-;Supports Series 60 v 3.0
-;This line indicates that this installation is for the Series 60 platform v3.0
-;This line must appear _exactly_ as shown below in the sis file
-;If this line is missing or incorrect, the sis file will not be able
-;to be installed
-[0x101F7961], 0, 0, 0, {"Series60ProductID"}
-
-;
-; Files to install
-;
-
-"\Epoc32\release\armv5\udeb\OnlineSupport.exe"                                  -"!:\sys\bin\OnlineSupport.exe"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r01"			-"!:\Resource\apps\onlinesupport.r01"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r02"			-"!:\Resource\apps\onlinesupport.r02"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r03"			-"!:\Resource\apps\onlinesupport.r03"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r04"			-"!:\Resource\apps\onlinesupport.r04"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r05"			-"!:\Resource\apps\onlinesupport.r05"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r06"			-"!:\Resource\apps\onlinesupport.r06"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r07"			-"!:\Resource\apps\onlinesupport.r07"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r08"			-"!:\Resource\apps\onlinesupport.r08"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r09"			-"!:\Resource\apps\onlinesupport.r09"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r10"			-"!:\Resource\apps\onlinesupport.r10"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r13"			-"!:\Resource\apps\onlinesupport.r13"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r14"			-"!:\Resource\apps\onlinesupport.r14"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r15"			-"!:\Resource\apps\onlinesupport.r15"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r16"			-"!:\Resource\apps\onlinesupport.r16"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r17"			-"!:\Resource\apps\onlinesupport.r17"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r18"			-"!:\Resource\apps\onlinesupport.r18"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r25"			-"!:\Resource\apps\onlinesupport.r25"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r26"			-"!:\Resource\apps\onlinesupport.r26"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r27"			-"!:\Resource\apps\onlinesupport.r27"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r28"			-"!:\Resource\apps\onlinesupport.r28"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r29"			-"!:\Resource\apps\onlinesupport.r29"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r30"			-"!:\Resource\apps\onlinesupport.r30"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r31"			-"!:\Resource\apps\onlinesupport.r31"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r32"			-"!:\Resource\apps\onlinesupport.r32"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r33"			-"!:\Resource\apps\onlinesupport.r33"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r37"			-"!:\Resource\apps\onlinesupport.r37"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r39"			-"!:\Resource\apps\onlinesupport.r39"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r42"			-"!:\Resource\apps\onlinesupport.r42"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r45"			-"!:\Resource\apps\onlinesupport.r45"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r49"			-"!:\Resource\apps\onlinesupport.r49"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r51"			-"!:\Resource\apps\onlinesupport.r51"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r54"			-"!:\Resource\apps\onlinesupport.r54"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r57"			-"!:\Resource\apps\onlinesupport.r57"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r59"			-"!:\Resource\apps\onlinesupport.r59"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r67"			-"!:\Resource\apps\onlinesupport.r67"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r68"			-"!:\Resource\apps\onlinesupport.r68"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r70"			-"!:\Resource\apps\onlinesupport.r70"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r76"			-"!:\Resource\apps\onlinesupport.r76"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r78"			-"!:\Resource\apps\onlinesupport.r78"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r79"			-"!:\Resource\apps\onlinesupport.r79"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r83"			-"!:\Resource\apps\onlinesupport.r83"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r93"			-"!:\Resource\apps\onlinesupport.r93"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r157"			-"!:\Resource\apps\onlinesupport.r157"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r158"			-"!:\Resource\apps\onlinesupport.r158"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r159"			-"!:\Resource\apps\onlinesupport.r159"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r160"			-"!:\Resource\apps\onlinesupport.r160"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\onlinesupport.r161"			-"!:\Resource\apps\onlinesupport.r161"
-"\Epoc32\data\Z\Private\10003A3F\APPS\OnlineSupport_REG.rsc"            -"!:\Private\10003A3F\import\APPS\OnlineSupport_reg.rsc"
-"\Epoc32\data\Z\Resource\Apps\OnlineSupport_aif.MIF"                    -"!:\Resource\Apps\OnlineSupport_aif.MIF"
-"\Epoc32\data\Z\Resource\Apps\OnlineSupport.MBM"                        -"!:\Resource\Apps\OnlineSupport.MBM"
-; "\Epoc32\data\Z\private\10202BE9\10204338.txt"						-"!:\Private\10202BE9\import\10204338.txt"
-
-
-; PnpProvisioning App
-"\Epoc32\release\armv5\udeb\PnpProvisioning.exe"				-"!:\sys\bin\PnpProvisioning.exe"
-"\Epoc32\data\Z\Resource\apps\PnpProvisioning.MBM"					-"!:\Resource\apps\PnpProvisioning.mbm"
-"\Epoc32\data\Z\Resource\apps\PnpProvisioning.MIF"					-"!:\Resource\Apps\PnpProvisioning.MIF"
-"\Epoc32\data\Z\Resource\apps\PnpProvisioning_aif.MBM"			-"!:\Resource\Apps\PnpProvisioning_aif.MBM";
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r01"			-"!:\Resource\apps\pnpprovisioning.r01"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r02"			-"!:\Resource\apps\pnpprovisioning.r02"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r03"			-"!:\Resource\apps\pnpprovisioning.r03"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r04"			-"!:\Resource\apps\pnpprovisioning.r04"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r05"			-"!:\Resource\apps\pnpprovisioning.r05"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r06"			-"!:\Resource\apps\pnpprovisioning.r06"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r07"			-"!:\Resource\apps\pnpprovisioning.r07"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r08"			-"!:\Resource\apps\pnpprovisioning.r08"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r09"			-"!:\Resource\apps\pnpprovisioning.r09"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r10"			-"!:\Resource\apps\pnpprovisioning.r10"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r13"			-"!:\Resource\apps\pnpprovisioning.r13"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r14"			-"!:\Resource\apps\pnpprovisioning.r14"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r15"			-"!:\Resource\apps\pnpprovisioning.r15"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r16"			-"!:\Resource\apps\pnpprovisioning.r16"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r17"			-"!:\Resource\apps\pnpprovisioning.r17"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r18"			-"!:\Resource\apps\pnpprovisioning.r18"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r25"			-"!:\Resource\apps\pnpprovisioning.r25"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r26"			-"!:\Resource\apps\pnpprovisioning.r26"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r27"			-"!:\Resource\apps\pnpprovisioning.r27"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r28"			-"!:\Resource\apps\pnpprovisioning.r28"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r29"			-"!:\Resource\apps\pnpprovisioning.r29"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r30"			-"!:\Resource\apps\pnpprovisioning.r30"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r31"			-"!:\Resource\apps\pnpprovisioning.r31"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r32"			-"!:\Resource\apps\pnpprovisioning.r32"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r33"			-"!:\Resource\apps\pnpprovisioning.r33"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r37"			-"!:\Resource\apps\pnpprovisioning.r37"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r39"			-"!:\Resource\apps\pnpprovisioning.r39"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r42"			-"!:\Resource\apps\pnpprovisioning.r42"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r45"			-"!:\Resource\apps\pnpprovisioning.r45"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r49"			-"!:\Resource\apps\pnpprovisioning.r49"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r51"			-"!:\Resource\apps\pnpprovisioning.r51"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r54"			-"!:\Resource\apps\pnpprovisioning.r54"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r57"			-"!:\Resource\apps\pnpprovisioning.r57"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r59"			-"!:\Resource\apps\pnpprovisioning.r59"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r67"			-"!:\Resource\apps\pnpprovisioning.r67"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r68"			-"!:\Resource\apps\pnpprovisioning.r68"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r70"			-"!:\Resource\apps\pnpprovisioning.r70"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r76"			-"!:\Resource\apps\pnpprovisioning.r76"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r78"			-"!:\Resource\apps\pnpprovisioning.r78"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r79"			-"!:\Resource\apps\pnpprovisioning.r79"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r83"			-"!:\Resource\apps\pnpprovisioning.r83"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r93"			-"!:\Resource\apps\pnpprovisioning.r93"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r157"			-"!:\Resource\apps\pnpprovisioning.r157"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r158"			-"!:\Resource\apps\pnpprovisioning.r158"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r159"			-"!:\Resource\apps\pnpprovisioning.r159"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r160"			-"!:\Resource\apps\pnpprovisioning.r160"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\pnpprovisioning.r161"			-"!:\Resource\apps\pnpprovisioning.r161"
-"\Epoc32\data\Z\Private\10003A3F\APPS\PnpProvisioning_REG.rsc"          -"!:\Private\10003A3F\import\APPS\PnpProvisioning_REG.rsc"
-"\epoc32\release\armv5\udeb\recnhwr.dll"                                -"!:\sys\bin\recnhwr.dll"
-"\epoc32\data\Z\Resource\Plugins\recnhwr.rsc"                           -"!:\Resource\Plugins\recnhwr.rsc"
-"\Epoc32\release\armv5\udeb\PnP.dll"                                    -"!:\sys\bin\PnP.dll"
-"\Epoc32\release\armv5\udeb\NHwrParser.dll"                             -"!:\sys\bin\NHwrParser.dll"
-
-; Central Repository initialization file for PnP.dll
-; "\Epoc32\data\Z\private\10202BE9\1020433A.txt"										-"!:\private\10202be9\import\1020433A.txt"
--- a/pnpmobileservices/pnpms/install/udeb/Support_w_Paos_S2-8_udeb.pkg	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,149 +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 "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-;
-; Installation file for OnlineSupport application with PAOS filter
-;
-;Languages
-&EN
-;
-; UID is the app's UID
-;
-#{"Online Support wPaos (S2*8)"},(0x10272D34),1,5,3
-;
-
-;Supports Series 60 v 2.8
-(0x102032BD), 0, 0, 0, {"Series60ProductID"} 
-
-;
-; Files to install
-;
-
-; Online Support
-"\Epoc32\release\thumb\udeb\OnlineSupport.app"						-"!:\system\apps\OnlineSupport\OnlineSupport.app"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r01"			-"!:\system\apps\OnlineSupport\onlinesupport.r01"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r02"			-"!:\system\apps\OnlineSupport\onlinesupport.r02"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r03"			-"!:\system\apps\OnlineSupport\onlinesupport.r03"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r04"			-"!:\system\apps\OnlineSupport\onlinesupport.r04"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r05"			-"!:\system\apps\OnlineSupport\onlinesupport.r05"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r06"			-"!:\system\apps\OnlineSupport\onlinesupport.r06"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r07"			-"!:\system\apps\OnlineSupport\onlinesupport.r07"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r08"			-"!:\system\apps\OnlineSupport\onlinesupport.r08"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r09"			-"!:\system\apps\OnlineSupport\onlinesupport.r09"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r10"			-"!:\system\apps\OnlineSupport\onlinesupport.r10"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r13"			-"!:\system\apps\OnlineSupport\onlinesupport.r13"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r14"			-"!:\system\apps\OnlineSupport\onlinesupport.r14"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r15"			-"!:\system\apps\OnlineSupport\onlinesupport.r15"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r16"			-"!:\system\apps\OnlineSupport\onlinesupport.r16"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r17"			-"!:\system\apps\OnlineSupport\onlinesupport.r17"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r18"			-"!:\system\apps\OnlineSupport\onlinesupport.r18"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r25"			-"!:\system\apps\OnlineSupport\onlinesupport.r25"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r26"			-"!:\system\apps\OnlineSupport\onlinesupport.r26"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r27"			-"!:\system\apps\OnlineSupport\onlinesupport.r27"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r28"			-"!:\system\apps\OnlineSupport\onlinesupport.r28"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r29"			-"!:\system\apps\OnlineSupport\onlinesupport.r29"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r30"			-"!:\system\apps\OnlineSupport\onlinesupport.r30"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r31"			-"!:\system\apps\OnlineSupport\onlinesupport.r31"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r32"			-"!:\system\apps\OnlineSupport\onlinesupport.r32"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r33"			-"!:\system\apps\OnlineSupport\onlinesupport.r33"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r37"			-"!:\system\apps\OnlineSupport\onlinesupport.r37"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r39"			-"!:\system\apps\OnlineSupport\onlinesupport.r39"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r42"			-"!:\system\apps\OnlineSupport\onlinesupport.r42"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r45"			-"!:\system\apps\OnlineSupport\onlinesupport.r45"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r49"			-"!:\system\apps\OnlineSupport\onlinesupport.r49"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r51"			-"!:\system\apps\OnlineSupport\onlinesupport.r51"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r54"			-"!:\system\apps\OnlineSupport\onlinesupport.r54"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r57"			-"!:\system\apps\OnlineSupport\onlinesupport.r57"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r59"			-"!:\system\apps\OnlineSupport\onlinesupport.r59"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r67"			-"!:\system\apps\OnlineSupport\onlinesupport.r67"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r68"			-"!:\system\apps\OnlineSupport\onlinesupport.r68"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r70"			-"!:\system\apps\OnlineSupport\onlinesupport.r70"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r76"			-"!:\system\apps\OnlineSupport\onlinesupport.r76"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r78"			-"!:\system\apps\OnlineSupport\onlinesupport.r78"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r79"			-"!:\system\apps\OnlineSupport\onlinesupport.r79"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r83"			-"!:\system\apps\OnlineSupport\onlinesupport.r83"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r93"			-"!:\system\apps\OnlineSupport\onlinesupport.r93"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r157"			-"!:\system\apps\OnlineSupport\onlinesupport.r157"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r158"			-"!:\system\apps\OnlineSupport\onlinesupport.r158"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r159"			-"!:\system\apps\OnlineSupport\onlinesupport.r159"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r160"			-"!:\system\apps\OnlineSupport\onlinesupport.r160"
-"\Epoc32\data\z\system\apps\OnlineSupport\onlinesupport.r161"			-"!:\system\apps\OnlineSupport\onlinesupport.r161"
-"\epoc32\data\Z\PRIVATE\10003A3F\APPS\OnlineSupport_reg.rsc"	-"!:\private\10003A3F\apps\OnlineSupport_reg.rsc"
-"\Epoc32\data\z\system\apps\OnlineSupport\OnlineSupport_aif.mbm"			-"!:\system\apps\OnlineSupport\OnlineSupport_aif.mbm"
-"\epoc32\data\Z\System\shareddata\10204338.ini"							-"C:\System\SharedData\10204338.ini"
-
-
-; PNP provisioning
-"\Epoc32\release\thumb\udeb\PnpProvisioning.app"							-"!:\system\apps\PnpProvisioning\PnpProvisioning.app"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r01"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r01"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r02"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r02"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r03"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r03"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r04"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r04"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r05"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r05"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r06"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r06"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r07"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r07"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r08"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r08"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r09"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r09"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r10"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r10"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r13"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r13"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r14"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r14"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r15"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r15"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r16"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r16"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r17"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r17"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r18"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r18"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r25"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r25"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r26"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r26"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r27"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r27"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r28"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r28"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r29"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r29"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r30"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r30"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r31"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r31"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r32"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r32"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r33"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r33"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r37"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r37"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r39"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r39"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r42"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r42"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r45"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r45"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r49"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r49"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r51"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r51"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r54"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r54"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r57"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r57"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r59"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r59"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r67"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r67"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r68"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r68"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r70"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r70"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r76"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r76"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r78"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r78"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r79"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r79"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r83"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r83"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r93"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r93"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r157"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r157"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r158"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r158"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r159"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r159"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r160"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r160"
-"\Epoc32\data\z\system\apps\PnpProvisioning\pnpprovisioning.r161"			-"!:\system\apps\PnpProvisioning\pnpprovisioning.r161"
-"\Epoc32\data\Z\Private\10003A3F\APPS\PnpProvisioning_REG.rsc"			-"!:\Private\10003A3F\APPS\PnpProvisioning_REG.rsc"
-"\Epoc32\data\z\system\apps\PnpProvisioning\PnpProvisioning_aif.mbm"			-"!:\system\apps\PnpProvisioning\PnpProvisioning_aif.mbm"
-"\epoc32\data\Z\System\shareddata\10204339.ini"							-"C:\System\SharedData\10204339.ini"
-"\epoc32\release\thumb\udeb\RECnhwr.MDL"											-"!:\system\recogs\RECnhwr.MDL"
-"\Epoc32\release\thumb\udeb\PnP.dll"													-"!:\system\libs\PnP.dll"
-"\epoc32\data\Z\System\shareddata\1020433A.ini"							-"C:\System\SharedData\1020433A.ini"
-"\Epoc32\release\thumb\udeb\NHwrParser.dll"										-"!:\system\libs\NHwrParser.dll"
-"\Epoc32\release\thumb\udeb\PnPRedirect.exe"											-"!:\system\apps\PnpProvisioning\PnPRedirect.exe"
-
-
-; PAOS
-"\epoc32\release\thumb\udeb\PnpPaosFilter.dll" - "!:\System\Libs\Plugins\PnpPaosFilter.dll"
-"\epoc32\data\z\system\Libs\Plugins\10272D33.rsc" - "!:\System\Libs\Plugins\10272D33.rsc"
\ No newline at end of file
--- a/pnpmobileservices/pnpms/install/udeb/Support_w_Paos_S3-0_patch_udeb.pkg	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,172 +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 "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-;
-; Installation file for OnlineSupport application with PAOS filter
-;
-;Languages
-&EN
-
-; The non-localised, globally unique vendor name (mandatory)
-:"Nokia"
-
-; List of localised vendor names - one per language. At least one must be provided (English [EN]). 
-; List must correspond to list of languages specified elsewhere in the .pkg
-;%{"Vendor-EN", "Vendor-FR"}
-%{"Nokia"}
-
-;
-; UID is the app's UID
-;
-#{"ServiceHelp wPaos (S3*0)"},(0x10272D34),1,5,3,TYPE=PU
-;
-
-;
-;Supports Series 60 v 3.0
-;This line indicates that this installation is for the Series 60 platform v3.0
-;This line must appear _exactly_ as shown below in the sis file
-;If this line is missing or incorrect, the sis file will not be able
-;to be installed
-[0x101F7961], 0, 0, 0, {"Series60ProductID"}
-
-;
-; Files to install
-;
-
-"\Epoc32\release\armv5\udeb\OnlineSupport.exe"				-"!:\sys\bin\OnlineSupport.exe"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r01"			-"!:\Resource\apps\onlinesupport.r01"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r02"			-"!:\Resource\apps\onlinesupport.r02"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r03"			-"!:\Resource\apps\onlinesupport.r03"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r04"			-"!:\Resource\apps\onlinesupport.r04"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r05"			-"!:\Resource\apps\onlinesupport.r05"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r06"			-"!:\Resource\apps\onlinesupport.r06"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r07"			-"!:\Resource\apps\onlinesupport.r07"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r08"			-"!:\Resource\apps\onlinesupport.r08"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r09"			-"!:\Resource\apps\onlinesupport.r09"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r10"			-"!:\Resource\apps\onlinesupport.r10"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r13"			-"!:\Resource\apps\onlinesupport.r13"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r14"			-"!:\Resource\apps\onlinesupport.r14"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r15"			-"!:\Resource\apps\onlinesupport.r15"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r16"			-"!:\Resource\apps\onlinesupport.r16"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r17"			-"!:\Resource\apps\onlinesupport.r17"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r18"			-"!:\Resource\apps\onlinesupport.r18"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r25"			-"!:\Resource\apps\onlinesupport.r25"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r26"			-"!:\Resource\apps\onlinesupport.r26"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r27"			-"!:\Resource\apps\onlinesupport.r27"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r28"			-"!:\Resource\apps\onlinesupport.r28"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r29"			-"!:\Resource\apps\onlinesupport.r29"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r30"			-"!:\Resource\apps\onlinesupport.r30"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r31"			-"!:\Resource\apps\onlinesupport.r31"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r32"			-"!:\Resource\apps\onlinesupport.r32"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r33"			-"!:\Resource\apps\onlinesupport.r33"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r37"			-"!:\Resource\apps\onlinesupport.r37"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r39"			-"!:\Resource\apps\onlinesupport.r39"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r42"			-"!:\Resource\apps\onlinesupport.r42"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r45"			-"!:\Resource\apps\onlinesupport.r45"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r49"			-"!:\Resource\apps\onlinesupport.r49"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r51"			-"!:\Resource\apps\onlinesupport.r51"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r54"			-"!:\Resource\apps\onlinesupport.r54"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r57"			-"!:\Resource\apps\onlinesupport.r57"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r59"			-"!:\Resource\apps\onlinesupport.r59"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r67"			-"!:\Resource\apps\onlinesupport.r67"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r68"			-"!:\Resource\apps\onlinesupport.r68"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r70"			-"!:\Resource\apps\onlinesupport.r70"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r76"			-"!:\Resource\apps\onlinesupport.r76"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r78"			-"!:\Resource\apps\onlinesupport.r78"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r79"			-"!:\Resource\apps\onlinesupport.r79"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r83"			-"!:\Resource\apps\onlinesupport.r83"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r93"			-"!:\Resource\apps\onlinesupport.r93"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r157"			-"!:\Resource\apps\onlinesupport.r157"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r158"			-"!:\Resource\apps\onlinesupport.r158"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r159"			-"!:\Resource\apps\onlinesupport.r159"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r160"			-"!:\Resource\apps\onlinesupport.r160"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r161"			-"!:\Resource\apps\onlinesupport.r161"
-"\Epoc32\data\Z\Private\10003A3F\APPS\OnlineSupport_REG.rsc"	-"!:\Private\10003A3F\import\APPS\OnlineSupport_reg.rsc"
-"\Epoc32\data\Z\Resource\Apps\OnlineSupport_aif.MIF"			-"!:\Resource\Apps\OnlineSupport_aif.MIF"
-"\Epoc32\data\Z\Resource\Apps\OnlineSupport.MBM"			    -"!:\Resource\Apps\OnlineSupport.MBM"
-
-
-; PnpProvisioning App
-"\Epoc32\release\armv5\udeb\PnpProvisioning.exe"			-"!:\sys\bin\PnpProvisioning.exe"
-"\Epoc32\data\Z\Resource\apps\PnpProvisioning.MBM"			-"!:\Resource\apps\PnpProvisioning.mbm"
-"\Epoc32\data\Z\Resource\Apps\PnpProvisioning.MIF"			-"!:\Resource\Apps\PnpProvisioning.MIF"
-"\Epoc32\data\Z\Resource\Apps\PnpProvisioning_aif.MBM"	    -"!:\Resource\Apps\PnpProvisioning_aif.MBM";
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r01"			-"!:\Resource\apps\pnpprovisioning.r01"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r02"			-"!:\Resource\apps\pnpprovisioning.r02"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r03"			-"!:\Resource\apps\pnpprovisioning.r03"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r04"			-"!:\Resource\apps\pnpprovisioning.r04"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r05"			-"!:\Resource\apps\pnpprovisioning.r05"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r06"			-"!:\Resource\apps\pnpprovisioning.r06"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r07"			-"!:\Resource\apps\pnpprovisioning.r07"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r08"			-"!:\Resource\apps\pnpprovisioning.r08"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r09"			-"!:\Resource\apps\pnpprovisioning.r09"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r10"			-"!:\Resource\apps\pnpprovisioning.r10"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r13"			-"!:\Resource\apps\pnpprovisioning.r13"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r14"			-"!:\Resource\apps\pnpprovisioning.r14"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r15"			-"!:\Resource\apps\pnpprovisioning.r15"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r16"			-"!:\Resource\apps\pnpprovisioning.r16"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r17"			-"!:\Resource\apps\pnpprovisioning.r17"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r18"			-"!:\Resource\apps\pnpprovisioning.r18"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r25"			-"!:\Resource\apps\pnpprovisioning.r25"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r26"			-"!:\Resource\apps\pnpprovisioning.r26"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r27"			-"!:\Resource\apps\pnpprovisioning.r27"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r28"			-"!:\Resource\apps\pnpprovisioning.r28"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r29"			-"!:\Resource\apps\pnpprovisioning.r29"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r30"			-"!:\Resource\apps\pnpprovisioning.r30"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r31"			-"!:\Resource\apps\pnpprovisioning.r31"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r32"			-"!:\Resource\apps\pnpprovisioning.r32"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r33"			-"!:\Resource\apps\pnpprovisioning.r33"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r37"			-"!:\Resource\apps\pnpprovisioning.r37"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r39"			-"!:\Resource\apps\pnpprovisioning.r39"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r42"			-"!:\Resource\apps\pnpprovisioning.r42"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r45"			-"!:\Resource\apps\pnpprovisioning.r45"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r49"			-"!:\Resource\apps\pnpprovisioning.r49"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r51"			-"!:\Resource\apps\pnpprovisioning.r51"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r54"			-"!:\Resource\apps\pnpprovisioning.r54"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r57"			-"!:\Resource\apps\pnpprovisioning.r57"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r59"			-"!:\Resource\apps\pnpprovisioning.r59"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r67"			-"!:\Resource\apps\pnpprovisioning.r67"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r68"			-"!:\Resource\apps\pnpprovisioning.r68"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r70"			-"!:\Resource\apps\pnpprovisioning.r70"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r76"			-"!:\Resource\apps\pnpprovisioning.r76"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r78"			-"!:\Resource\apps\pnpprovisioning.r78"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r79"			-"!:\Resource\apps\pnpprovisioning.r79"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r83"			-"!:\Resource\apps\pnpprovisioning.r83"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r93"			-"!:\Resource\apps\pnpprovisioning.r93"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r157"			-"!:\Resource\apps\pnpprovisioning.r157"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r158"			-"!:\Resource\apps\pnpprovisioning.r158"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r159"			-"!:\Resource\apps\pnpprovisioning.r159"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r160"			-"!:\Resource\apps\pnpprovisioning.r160"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r161"			-"!:\Resource\apps\pnpprovisioning.r161"
-"\Epoc32\data\Z\Private\10003A3F\APPS\PnpProvisioning_REG.rsc"  -"!:\Private\10003A3F\import\APPS\PnpProvisioning_REG.rsc"
-"\epoc32\release\armv5\udeb\recnhwr.dll"                        -"!:\sys\bin\recnhwr.dll"
-"\epoc32\data\Z\Resource\Plugins\recnhwr.rsc"                   -"!:\Resource\Plugins\recnhwr.rsc"
-"\Epoc32\release\armv5\udeb\PnP.dll"                            -"!:\sys\bin\PnP.dll"
-"\Epoc32\release\armv5\udeb\NHwrParser.dll"                     -"!:\sys\bin\NHwrParser.dll"
-
-; Central Repository initialization file for ServiceHelp app
-; "\Epoc32\data\Z\private\10202BE9\10204338.txt"                  -"!:\Private\10202BE9\import\10204338.txt"
-
-; Central Repository initialization file for Pnp paos filter
-; "\Epoc32\data\Z\private\10202BE9\10272D33.txt"                  -"!:\Private\10202BE9\import\10272D33.txt"
-
-; Central Repository initialization file for PnP.dll
-; "\Epoc32\data\Z\private\10202BE9\1020433A.txt"                  -"!:\private\10202be9\import\1020433A.txt"
-
-
-; PnpPaosFilter, it has to be included as a sis-file because there
-; is a separate sis-stub file in the ROM for the component
-@"PnpPaos_S3-0_signed.sis",(0x10272D33)
-;@"CentralRepositoryInit_signed.sis",(0x10202BE9)    txt-files already in rom, can't install CentralRepositoryInit_signed.sis
--- a/pnpmobileservices/pnpms/install/udeb/Support_w_Paos_S3-0_udeb.pkg	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,162 +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 "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-;
-; Installation file for OnlineSupport application with PAOS filter
-;
-;Languages
-&EN
-
-; The non-localised, globally unique vendor name (mandatory)
-:"Nokia"
-
-; List of localised vendor names - one per language. At least one must be provided (English [EN]). 
-; List must correspond to list of languages specified elsewhere in the .pkg
-;%{"Vendor-EN", "Vendor-FR"}
-%{"Nokia"}
-
-;
-; UID is the app's UID
-;
-#{"ServiceHelp wPaos (S3*0)"},(0x10272D34),1,5,3
-;
-
-;
-;Supports Series 60 v 3.0
-;This line indicates that this installation is for the Series 60 platform v3.0
-;This line must appear _exactly_ as shown below in the sis file
-;If this line is missing or incorrect, the sis file will not be able
-;to be installed
-[0x101F7961], 0, 0, 0, {"Series60ProductID"}
-
-;
-; Files to install
-;
-
-"\Epoc32\release\armv5\udeb\OnlineSupport.exe"						-"!:\sys\bin\OnlineSupport.exe"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r01"			-"!:\Resource\apps\onlinesupport.r01"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r02"			-"!:\Resource\apps\onlinesupport.r02"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r03"			-"!:\Resource\apps\onlinesupport.r03"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r04"			-"!:\Resource\apps\onlinesupport.r04"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r05"			-"!:\Resource\apps\onlinesupport.r05"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r06"			-"!:\Resource\apps\onlinesupport.r06"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r07"			-"!:\Resource\apps\onlinesupport.r07"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r08"			-"!:\Resource\apps\onlinesupport.r08"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r09"			-"!:\Resource\apps\onlinesupport.r09"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r10"			-"!:\Resource\apps\onlinesupport.r10"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r13"			-"!:\Resource\apps\onlinesupport.r13"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r14"			-"!:\Resource\apps\onlinesupport.r14"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r15"			-"!:\Resource\apps\onlinesupport.r15"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r16"			-"!:\Resource\apps\onlinesupport.r16"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r17"			-"!:\Resource\apps\onlinesupport.r17"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r18"			-"!:\Resource\apps\onlinesupport.r18"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r25"			-"!:\Resource\apps\onlinesupport.r25"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r26"			-"!:\Resource\apps\onlinesupport.r26"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r27"			-"!:\Resource\apps\onlinesupport.r27"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r28"			-"!:\Resource\apps\onlinesupport.r28"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r29"			-"!:\Resource\apps\onlinesupport.r29"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r30"			-"!:\Resource\apps\onlinesupport.r30"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r31"			-"!:\Resource\apps\onlinesupport.r31"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r32"			-"!:\Resource\apps\onlinesupport.r32"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r33"			-"!:\Resource\apps\onlinesupport.r33"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r37"			-"!:\Resource\apps\onlinesupport.r37"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r39"			-"!:\Resource\apps\onlinesupport.r39"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r42"			-"!:\Resource\apps\onlinesupport.r42"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r45"			-"!:\Resource\apps\onlinesupport.r45"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r49"			-"!:\Resource\apps\onlinesupport.r49"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r51"			-"!:\Resource\apps\onlinesupport.r51"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r54"			-"!:\Resource\apps\onlinesupport.r54"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r57"			-"!:\Resource\apps\onlinesupport.r57"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r59"			-"!:\Resource\apps\onlinesupport.r59"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r67"			-"!:\Resource\apps\onlinesupport.r67"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r68"			-"!:\Resource\apps\onlinesupport.r68"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r70"			-"!:\Resource\apps\onlinesupport.r70"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r76"			-"!:\Resource\apps\onlinesupport.r76"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r78"			-"!:\Resource\apps\onlinesupport.r78"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r79"			-"!:\Resource\apps\onlinesupport.r79"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r83"			-"!:\Resource\apps\onlinesupport.r83"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r93"			-"!:\Resource\apps\onlinesupport.r93"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r157"			-"!:\Resource\apps\onlinesupport.r157"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r158"			-"!:\Resource\apps\onlinesupport.r158"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r159"			-"!:\Resource\apps\onlinesupport.r159"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r160"			-"!:\Resource\apps\onlinesupport.r160"
-"\Epoc32\data\z\Resource\apps\onlinesupport.r161"			-"!:\Resource\apps\onlinesupport.r161"
-"\Epoc32\data\Z\Private\10003A3F\APPS\OnlineSupport_REG.rsc"			-"!:\Private\10003A3F\import\APPS\OnlineSupport_reg.rsc"
-"\Epoc32\data\Z\Resource\Apps\OnlineSupport_aif.MIF"					-"!:\Resource\Apps\OnlineSupport_aif.MIF"
-"\Epoc32\data\Z\Resource\Apps\OnlineSupport.MBM"			-"!:\Resource\Apps\OnlineSupport.MBM"
-
-
-; PnpProvisioning App
-"\Epoc32\release\armv5\udeb\PnpProvisioning.exe"				-"!:\sys\bin\PnpProvisioning.exe"
-"\Epoc32\data\Z\Resource\apps\PnpProvisioning.MBM"					-"!:\Resource\apps\PnpProvisioning.mbm"
-"\Epoc32\data\Z\Resource\Apps\PnpProvisioning.MIF"					-"!:\Resource\Apps\PnpProvisioning.MIF"
-"\Epoc32\data\Z\Resource\Apps\PnpProvisioning_aif.MBM"			-"!:\Resource\Apps\PnpProvisioning_aif.MBM";
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r01"			-"!:\Resource\apps\pnpprovisioning.r01"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r02"			-"!:\Resource\apps\pnpprovisioning.r02"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r03"			-"!:\Resource\apps\pnpprovisioning.r03"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r04"			-"!:\Resource\apps\pnpprovisioning.r04"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r05"			-"!:\Resource\apps\pnpprovisioning.r05"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r06"			-"!:\Resource\apps\pnpprovisioning.r06"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r07"			-"!:\Resource\apps\pnpprovisioning.r07"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r08"			-"!:\Resource\apps\pnpprovisioning.r08"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r09"			-"!:\Resource\apps\pnpprovisioning.r09"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r10"			-"!:\Resource\apps\pnpprovisioning.r10"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r13"			-"!:\Resource\apps\pnpprovisioning.r13"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r14"			-"!:\Resource\apps\pnpprovisioning.r14"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r15"			-"!:\Resource\apps\pnpprovisioning.r15"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r16"			-"!:\Resource\apps\pnpprovisioning.r16"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r17"			-"!:\Resource\apps\pnpprovisioning.r17"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r18"			-"!:\Resource\apps\pnpprovisioning.r18"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r25"			-"!:\Resource\apps\pnpprovisioning.r25"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r26"			-"!:\Resource\apps\pnpprovisioning.r26"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r27"			-"!:\Resource\apps\pnpprovisioning.r27"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r28"			-"!:\Resource\apps\pnpprovisioning.r28"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r29"			-"!:\Resource\apps\pnpprovisioning.r29"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r30"			-"!:\Resource\apps\pnpprovisioning.r30"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r31"			-"!:\Resource\apps\pnpprovisioning.r31"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r32"			-"!:\Resource\apps\pnpprovisioning.r32"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r33"			-"!:\Resource\apps\pnpprovisioning.r33"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r37"			-"!:\Resource\apps\pnpprovisioning.r37"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r39"			-"!:\Resource\apps\pnpprovisioning.r39"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r42"			-"!:\Resource\apps\pnpprovisioning.r42"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r45"			-"!:\Resource\apps\pnpprovisioning.r45"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r49"			-"!:\Resource\apps\pnpprovisioning.r49"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r51"			-"!:\Resource\apps\pnpprovisioning.r51"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r54"			-"!:\Resource\apps\pnpprovisioning.r54"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r57"			-"!:\Resource\apps\pnpprovisioning.r57"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r59"			-"!:\Resource\apps\pnpprovisioning.r59"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r67"			-"!:\Resource\apps\pnpprovisioning.r67"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r68"			-"!:\Resource\apps\pnpprovisioning.r68"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r70"			-"!:\Resource\apps\pnpprovisioning.r70"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r76"			-"!:\Resource\apps\pnpprovisioning.r76"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r78"			-"!:\Resource\apps\pnpprovisioning.r78"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r79"			-"!:\Resource\apps\pnpprovisioning.r79"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r83"			-"!:\Resource\apps\pnpprovisioning.r83"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r93"			-"!:\Resource\apps\pnpprovisioning.r93"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r157"			-"!:\Resource\apps\pnpprovisioning.r157"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r158"			-"!:\Resource\apps\pnpprovisioning.r158"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r159"			-"!:\Resource\apps\pnpprovisioning.r159"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r160"			-"!:\Resource\apps\pnpprovisioning.r160"
-"\Epoc32\data\z\Resource\apps\pnpprovisioning.r161"			-"!:\Resource\apps\pnpprovisioning.r161"
-"\Epoc32\data\Z\Private\10003A3F\APPS\PnpProvisioning_REG.rsc"  -"!:\Private\10003A3F\import\APPS\PnpProvisioning_REG.rsc"
-"\epoc32\release\armv5\udeb\recnhwr.dll"                        -"!:\sys\bin\recnhwr.dll"
-"\epoc32\data\Z\Resource\Plugins\recnhwr.rsc"                   -"!:\Resource\Plugins\recnhwr.rsc"
-"\Epoc32\release\armv5\udeb\PnP.dll"                            -"!:\sys\bin\PnP.dll"
-"\Epoc32\release\armv5\udeb\NHwrParser.dll"                     -"!:\sys\bin\NHwrParser.dll"
-
-; PnpPaosFilter, it has to be included as a sis-file because there
-; is a separate sis-stub file in the ROM for the component
-@"PnpPaos_S3-0_signed.sis",(0x10272D33)
-; @"CentralRepositoryInit_signed.sis",(0x10202BE9)
--- a/pnpmobileservices/pnpms/install/wins/MakeRndSignedPatchFor30.bat	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-rem
-rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-rem All rights reserved.
-rem This component and the accompanying materials are made available
-rem under the terms of "Eclipse Public License v1.0"
-rem which accompanies this distribution, and is available
-rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
-rem
-rem Initial Contributors:
-rem Nokia Corporation - initial contribution.
-rem
-rem Contributors:
-rem
-rem Description: Implementation of PnPMS components
-rem
-
-makesis "PnpPaos_S3-0_patch_winscw_udeb.pkg"
-signsis "PnpPaos_S3-0_patch_winscw_udeb.SIS" PnpPaos_S3-0_signed.sis \s60\AppinstUi\internal\RD_RootCA\rd.cer \s60\AppinstUi\internal\RD_RootCA\rd-key.pem
-
-makesis "Support_w_Paos_S3-0_patch_winscw_udeb.pkg"
-signsis "Support_w_Paos_S3-0_patch_winscw_udeb.SIS" SupportWPaosPatch_RnD_signed.sis \s60\AppinstUi\internal\RD_RootCA\rd.cer \s60\AppinstUi\internal\RD_RootCA\rd-key.pem
\ No newline at end of file
--- a/pnpmobileservices/pnpms/install/wins/PnpPaos_S3-0_patch_winscw_udeb.pkg	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +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 "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-;
-; Installation file for OnlineSupport application with PAOS filter
-;
-;Languages
-&EN
-
-; The non-localised, globally unique vendor name (mandatory)
-:"Nokia"
-
-; List of localised vendor names - one per language. At least one must be provided (English [EN]). 
-; List must correspond to list of languages specified elsewhere in the .pkg
-;%{"Vendor-EN", "Vendor-FR"}
-%{"Nokia"}
-
-;
-; UID is the app's UID
-;
-#{"Paos (S3*0)"},(0x10272D33),1,5,2,TYPE=PU
-;
-
-;
-;Supports Series 60 v 3.0
-;This line indicates that this installation is for the Series 60 platform v3.0
-;This line must appear _exactly_ as shown below in the sis file
-;If this line is missing or incorrect, the sis file will not be able
-;to be installed
-[0x101F7961], 0, 0, 0, {"Series60ProductID"}
-
-;
-; Files to install
-;
-
-"\epoc32\release\winscw\udeb\PnpPaosFilter.dll" - "!:\sys\bin\PnpPaosFilter.dll"
-"\epoc32\data\Z\Resource\Plugins\PnPPaosFilter.RSC" - "!:\Resource\plugins\PnPPaosFilter.RSC"
\ No newline at end of file
--- a/pnpmobileservices/pnpms/install/wins/PnpPaos_S3-0_stub_winscw_udeb.pkg	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +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 "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-;
-; Installation file for OnlineSupport application with PAOS filter
-;
-;Languages
-&EN
-
-; The non-localised, globally unique vendor name (mandatory)
-:"Nokia"
-
-; List of localised vendor names - one per language. At least one must be provided (English [EN]). 
-; List must correspond to list of languages specified elsewhere in the .pkg
-;%{"Vendor-EN", "Vendor-FR"}
-%{"Nokia"}
-
-;
-; UID is the app's UID
-;
-#{"Paos (S3*0)"},(0x10272D33),1,5,2
-;
-
-;
-;Supports Series 60 v 3.0
-;This line indicates that this installation is for the Series 60 platform v3.0
-;This line must appear _exactly_ as shown below in the sis file
-;If this line is missing or incorrect, the sis file will not be able
-;to be installed
-[0x101F7961], 0, 0, 0, {"Series60ProductID"}
-
-;
-; Files to install
-;
-
-"\epoc32\release\winscw\udeb\PnpPaosFilter.dll" - "!:\sys\bin\PnpPaosFilter.dll"
-"\epoc32\data\Z\Resource\Plugins\PnPPaosFilter.RSC" - "!:\Resource\plugins\PnPPaosFilter.RSC"
\ No newline at end of file
--- a/pnpmobileservices/pnpms/install/wins/Support_S3-0_stub_winscw_udeb.pkg	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,97 +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 "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-;
-; Installation file for OnlineSupport application with PAOS filter
-;
-;Languages
-&EN
-
-; The non-localised, globally unique vendor name (mandatory)
-:"Nokia"
-
-; List of localised vendor names - one per language. At least one must be provided (English [EN]). 
-; List must correspond to list of languages specified elsewhere in the .pkg
-;%{"Vendor-EN", "Vendor-FR"}
-%{"Nokia"}
-
-;
-; UID is the app's UID
-;
-#{"Online Support (S3*0)"},(0x10272D34),1,5,2
-;
-
-;
-;Supports Series 60 v 3.0
-;This line indicates that this installation is for the Series 60 platform v3.0
-;This line must appear _exactly_ as shown below in the sis file
-;If this line is missing or incorrect, the sis file will not be able
-;to be installed
-[0x101F7961], 0, 0, 0, {"Series60ProductID"}
-
-;
-; Files to install
-;
-
-"\Epoc32\release\winscw\udeb\OnlineSupport.exe"						-"!:\sys\bin\OnlineSupport.exe"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\OnlineSupport.r01"			-"!:\Resource\apps\OnlineSupport.r01"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\OnlineSupport.r02"			-"!:\Resource\apps\OnlineSupport.r02"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\OnlineSupport.r03"			-"!:\Resource\apps\OnlineSupport.r03"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\OnlineSupport.r04"			-"!:\Resource\apps\OnlineSupport.r04"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\OnlineSupport.r05"			-"!:\Resource\apps\OnlineSupport.r05"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\OnlineSupport.r06"			-"!:\Resource\apps\OnlineSupport.r06"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\OnlineSupport.r09"			-"!:\Resource\apps\OnlineSupport.r09"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\OnlineSupport.r13"			-"!:\Resource\apps\OnlineSupport.r13"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\OnlineSupport.r29"			-"!:\Resource\apps\OnlineSupport.r29"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\OnlineSupport.r30"			-"!:\Resource\apps\OnlineSupport.r30"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\OnlineSupport.r31"			-"!:\Resource\apps\OnlineSupport.r31"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\OnlineSupport.r32"			-"!:\Resource\apps\OnlineSupport.r32"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\OnlineSupport.r39"			-"!:\Resource\apps\OnlineSupport.r39"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\OnlineSupport.r59"			-"!:\Resource\apps\OnlineSupport.r59"
-"\Epoc32\data\z\Resource\apps\PnPMS_Temporary_dir\OnlineSupport.r70"			-"!:\Resource\apps\OnlineSupport.r70"
-"\Epoc32\data\Z\Private\10003A3F\APPS\OnlineSupport_REG.rsc"			-"!:\Private\10003A3F\import\APPS\OnlineSupport_reg.rsc"
-"\Epoc32\data\Z\Resource\Apps\OnlineSupport_aif.MIF"					-"!:\Resource\Apps\OnlineSupport_aif.MIF"
-"\Epoc32\data\Z\Resource\Apps\OnlineSupport.MBM"			-"!:\Resource\Apps\OnlineSupport.MBM"
-; "\Epoc32\data\Z\private\10202BE9\10204338.txt"						-"!:\Private\10202BE9\import\10204338.txt"
-
-
-; PnpProvisioning App
-"\Epoc32\release\winscw\udeb\PnpProvisioning.exe"				-"!:\sys\bin\PnpProvisioning.exe"
-"\Epoc32\data\Z\Resource\apps\PnpProvisioning.MBM"					-"!:\Resource\apps\PnpProvisioning.mbm"
-"\Epoc32\data\Z\Resource\Apps\PnpProvisioning.MIF"					-"!:\Resource\Apps\PnpProvisioning.MIF"
-"\Epoc32\data\Z\Resource\Apps\PnpProvisioning_aif.MBM"			-"!:\Resource\Apps\PnpProvisioning_aif.MBM";
-"\Epoc32\data\Z\Resource\apps\PnPMS_Temporary_dir\PnpProvisioning.r01"			-"!:\Resource\apps\PnpProvisioning.r01"
-"\Epoc32\data\Z\Resource\apps\PnPMS_Temporary_dir\PnpProvisioning.r02"			-"!:\Resource\apps\PnpProvisioning.r02"
-"\Epoc32\data\Z\Resource\apps\PnPMS_Temporary_dir\PnpProvisioning.r03"			-"!:\Resource\apps\PnpProvisioning.r03"
-"\Epoc32\data\Z\Resource\apps\PnPMS_Temporary_dir\PnpProvisioning.r04"			-"!:\Resource\apps\PnpProvisioning.r04"
-"\Epoc32\data\Z\Resource\apps\PnPMS_Temporary_dir\PnpProvisioning.r05"			-"!:\Resource\apps\PnpProvisioning.r05"
-"\Epoc32\data\Z\Resource\apps\PnPMS_Temporary_dir\PnpProvisioning.r06"			-"!:\Resource\apps\PnpProvisioning.r06"
-"\Epoc32\data\Z\Resource\apps\PnPMS_Temporary_dir\PnpProvisioning.r09"			-"!:\Resource\apps\PnpProvisioning.r09"
-"\Epoc32\data\Z\Resource\apps\PnPMS_Temporary_dir\PnpProvisioning.r13"			-"!:\Resource\apps\PnpProvisioning.r13"
-"\Epoc32\data\Z\Resource\apps\PnPMS_Temporary_dir\PnpProvisioning.r29"			-"!:\Resource\apps\PnpProvisioning.r29"
-"\Epoc32\data\Z\Resource\apps\PnPMS_Temporary_dir\PnpProvisioning.r30"			-"!:\Resource\apps\PnpProvisioning.r30"
-"\Epoc32\data\Z\Resource\apps\PnPMS_Temporary_dir\PnpProvisioning.r31"			-"!:\Resource\apps\PnpProvisioning.r31"
-"\Epoc32\data\Z\Resource\apps\PnPMS_Temporary_dir\PnpProvisioning.r32"			-"!:\Resource\apps\PnpProvisioning.r32"
-"\Epoc32\data\Z\Resource\apps\PnPMS_Temporary_dir\PnpProvisioning.r39"			-"!:\Resource\apps\PnpProvisioning.r39"
-"\Epoc32\data\Z\Resource\apps\PnPMS_Temporary_dir\PnpProvisioning.r59"			-"!:\Resource\apps\PnpProvisioning.r59"
-"\Epoc32\data\Z\Resource\apps\PnPMS_Temporary_dir\PnpProvisioning.r70"			-"!:\Resource\apps\PnpProvisioning.r70"
-"\Epoc32\data\Z\Private\10003A3F\APPS\PnpProvisioning_REG.rsc"			-"!:\Private\10003A3F\import\APPS\PnpProvisioning_REG.rsc"
-"\epoc32\release\winscw\udeb\recnhwr.dll" 								-"!:\sys\bin\recnhwr.dll"
-"\epoc32\data\Z\Resource\Plugins\recnhwr.rsc" 					-"!:\Resource\Plugins\recnhwr.rsc"
-"\Epoc32\release\winscw\udeb\PnP.dll"										-"!:\sys\bin\PnP.dll"
-"\Epoc32\release\winscw\udeb\NHwrParser.dll"							-"!:\sys\bin\NHwrParser.dll"
-
-; Central Repository initialization file for PnP.dll
-; "\Epoc32\data\Z\private\10202BE9\1020433A.txt"										-"!:\private\10202be9\import\1020433A.txt"
--- a/pnpmobileservices/pnpms/install/wins/Support_w_Paos_S3-0_patch_winscw_udeb.pkg	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,101 +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 "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-;
-; Installation file for OnlineSupport application with PAOS filter
-;
-;Languages
-&EN
-
-; The non-localised, globally unique vendor name (mandatory)
-:"Nokia"
-
-; List of localised vendor names - one per language. At least one must be provided (English [EN]). 
-; List must correspond to list of languages specified elsewhere in the .pkg
-;%{"Vendor-EN", "Vendor-FR"}
-%{"Nokia"}
-
-;
-; UID is the app's UID
-;
-#{"Online Support wPaos (S3*0)"},(0x10272D34),1,5,2,TYPE=PU
-;
-
-;
-;Supports Series 60 v 3.0
-;This line indicates that this installation is for the Series 60 platform v3.0
-;This line must appear _exactly_ as shown below in the sis file
-;If this line is missing or incorrect, the sis file will not be able
-;to be installed
-[0x101F7961], 0, 0, 0, {"Series60ProductID"}
-
-;
-; Files to install
-;
-
-"\Epoc32\release\winscw\udeb\OnlineSupport.exe"						-"!:\sys\bin\OnlineSupport.exe"
-"\Epoc32\data\z\Resource\apps\OnlineSupport.r01"			-"!:\Resource\apps\OnlineSupport.r01"
-"\Epoc32\data\z\Resource\apps\OnlineSupport.r02"			-"!:\Resource\apps\OnlineSupport.r02"
-"\Epoc32\data\z\Resource\apps\OnlineSupport.r03"			-"!:\Resource\apps\OnlineSupport.r03"
-"\Epoc32\data\z\Resource\apps\OnlineSupport.r04"			-"!:\Resource\apps\OnlineSupport.r04"
-"\Epoc32\data\z\Resource\apps\OnlineSupport.r05"			-"!:\Resource\apps\OnlineSupport.r05"
-"\Epoc32\data\z\Resource\apps\OnlineSupport.r06"			-"!:\Resource\apps\OnlineSupport.r06"
-"\Epoc32\data\z\Resource\apps\OnlineSupport.r09"			-"!:\Resource\apps\OnlineSupport.r09"
-"\Epoc32\data\z\Resource\apps\OnlineSupport.r13"			-"!:\Resource\apps\OnlineSupport.r13"
-"\Epoc32\data\z\Resource\apps\OnlineSupport.r29"			-"!:\Resource\apps\OnlineSupport.r29"
-"\Epoc32\data\z\Resource\apps\OnlineSupport.r30"			-"!:\Resource\apps\OnlineSupport.r30"
-"\Epoc32\data\z\Resource\apps\OnlineSupport.r31"			-"!:\Resource\apps\OnlineSupport.r31"
-"\Epoc32\data\z\Resource\apps\OnlineSupport.r32"			-"!:\Resource\apps\OnlineSupport.r32"
-"\Epoc32\data\z\Resource\apps\OnlineSupport.r39"			-"!:\Resource\apps\OnlineSupport.r39"
-"\Epoc32\data\z\Resource\apps\OnlineSupport.r59"			-"!:\Resource\apps\OnlineSupport.r59"
-"\Epoc32\data\z\Resource\apps\OnlineSupport.r70"			-"!:\Resource\apps\OnlineSupport.r70"
-"\Epoc32\data\Z\Private\10003A3F\APPS\OnlineSupport_REG.rsc"			-"!:\Private\10003A3F\import\APPS\OnlineSupport_reg.rsc"
-"\Epoc32\data\Z\Resource\Apps\OnlineSupport_aif.MIF"					-"!:\Resource\Apps\OnlineSupport_aif.MIF"
-"\Epoc32\data\Z\Resource\Apps\OnlineSupport.MBM"			-"!:\Resource\Apps\OnlineSupport.MBM"
-; "\Epoc32\data\Z\private\10202BE9\10204338.txt"						-"!:\Private\10202BE9\import\10204338.txt"
-
-
-; PnpProvisioning App
-"\Epoc32\release\winscw\udeb\PnpProvisioning.exe"				-"!:\sys\bin\PnpProvisioning.exe"
-"\Epoc32\data\Z\Resource\apps\PnpProvisioning.MBM"					-"!:\Resource\apps\PnpProvisioning.mbm"
-"\Epoc32\data\Z\Resource\Apps\PnpProvisioning.MIF"					-"!:\Resource\Apps\PnpProvisioning.MIF"
-"\Epoc32\data\Z\Resource\Apps\PnpProvisioning_aif.MBM"			-"!:\Resource\Apps\PnpProvisioning_aif.MBM";
-"\Epoc32\data\z\Resource\apps\PnpProvisioning.r01"			-"!:\Resource\apps\PnpProvisioning.r01"
-"\Epoc32\data\z\Resource\apps\PnpProvisioning.r02"			-"!:\Resource\apps\PnpProvisioning.r02"
-"\Epoc32\data\z\Resource\apps\PnpProvisioning.r03"			-"!:\Resource\apps\PnpProvisioning.r03"
-"\Epoc32\data\z\Resource\apps\PnpProvisioning.r04"			-"!:\Resource\apps\PnpProvisioning.r04"
-"\Epoc32\data\z\Resource\apps\PnpProvisioning.r05"			-"!:\Resource\apps\PnpProvisioning.r05"
-"\Epoc32\data\z\Resource\apps\PnpProvisioning.r06"			-"!:\Resource\apps\PnpProvisioning.r06"
-"\Epoc32\data\z\Resource\apps\PnpProvisioning.r09"			-"!:\Resource\apps\PnpProvisioning.r09"
-"\Epoc32\data\z\Resource\apps\PnpProvisioning.r13"			-"!:\Resource\apps\PnpProvisioning.r13"
-"\Epoc32\data\z\Resource\apps\PnpProvisioning.r29"			-"!:\Resource\apps\PnpProvisioning.r29"
-"\Epoc32\data\z\Resource\apps\PnpProvisioning.r30"			-"!:\Resource\apps\PnpProvisioning.r30"
-"\Epoc32\data\z\Resource\apps\PnpProvisioning.r31"			-"!:\Resource\apps\PnpProvisioning.r31"
-"\Epoc32\data\z\Resource\apps\PnpProvisioning.r32"			-"!:\Resource\apps\PnpProvisioning.r32"
-"\Epoc32\data\z\Resource\apps\PnpProvisioning.r39"			-"!:\Resource\apps\PnpProvisioning.r39"
-"\Epoc32\data\z\Resource\apps\PnpProvisioning.r59"			-"!:\Resource\apps\PnpProvisioning.r59"
-"\Epoc32\data\z\Resource\apps\PnpProvisioning.r70"			-"!:\Resource\apps\PnpProvisioning.r70"
-"\Epoc32\data\Z\Private\10003A3F\APPS\PnpProvisioning_REG.rsc"			-"!:\Private\10003A3F\import\APPS\PnpProvisioning_REG.rsc"
-"\epoc32\release\winscw\udeb\recnhwr.dll" 								-"!:\sys\bin\recnhwr.dll"
-"\epoc32\data\Z\Resource\Plugins\recnhwr.rsc" 					-"!:\Resource\Plugins\recnhwr.rsc"
-"\Epoc32\release\winscw\udeb\PnP.dll"										-"!:\sys\bin\PnP.dll"
-"\Epoc32\release\winscw\udeb\NHwrParser.dll"							-"!:\sys\bin\NHwrParser.dll"
-
-; Central Repository initialization file for PnP.dll
-; "\Epoc32\data\Z\private\10202BE9\1020433A.txt"										-"!:\private\10202be9\import\1020433A.txt"
-
-; PnpPaosFilter, it has to be included as a sis-file because there
-; is a separate sis-stub file in the ROM for the component
-@"PnpPaos_S3-0_signed.sis",(0x10272D33)
\ No newline at end of file
--- a/pnpmobileservices/pnpms/rom/OnlineSupport.iby	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-/*
-* Copyright (c) 2003-2006 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:  Image description file for project ServiceHelp
-*
-*/
-
-
-
-#ifndef ONLINESUPPORT_IBY
-#define ONLINESUPPORT_IBY
-
-#ifdef __PLUG_AND_PLAY_MOBILE_SERVICES
-    S60_APP_EXE( OnlineSupport )
-//    SCALABLE_IMAGE( APP_BITMAP_DIR, APP_BITMAP_DIR, OnlineSupport )
-//    S60_APP_AIF_ICONS( OnlineSupport )
-    
-    // _reg.rsc has to be in "import" folder to allow updating application exe with a SISX-file
-    data=\EPOC32\DATA\Z\private\10003a3f\apps\OnlineSupport_reg.RSC \private\10003a3f\import\apps\OnlineSupport_reg.RSC
-
-#endif // __PLUG_AND_PLAY_MOBILE_SERVICES
-
-#endif // ONLINESUPPORT_IBY
-
-//  End of File
--- a/pnpmobileservices/pnpms/rom/OnlineSupportResources.iby	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-/*
-* Copyright (c) 2003-2006 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:  Image description file for project OnlineSupport
-*
-*/
-
-
-#ifndef ONLINESUPPORTRESOURCES_IBY
-#define ONLINESUPPORTRESOURCES_IBY
-
-#ifdef __PLUG_AND_PLAY_MOBILE_SERVICES
-    S60_APP_RESOURCE( OnlineSupport )
-#endif // __PLUG_AND_PLAY_MOBILE_SERVICES
-
-#endif // ONLINESUPPORTRESOURCES_IBY
-
-//  End of File  
\ No newline at end of file
--- a/pnpmobileservices/pnpms/rom/PnPMS.iby	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-/*
-* Copyright (c) 2002-2006 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:  Image description file for project PnPMS
-*
-*/
-
-
-#ifndef PNPMS_IBY
-#define PNPMS_IBY
-
-#ifdef __PLUG_AND_PLAY_MOBILE_SERVICES
-    #include <OnlineSupport.iby>
-    #include <OnlineSupportResources.iby>
-    #include <Pnp.iby>
-    #include <PnpResources.iby>
-    #include <PnpPaosFilter.iby>
-#endif // __PLUG_AND_PLAY_MOBILE_SERVICES
-
-#endif // PNPMS_IBY
--- a/pnpmobileservices/pnpms/rom/Pnp.iby	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-/*
-* Copyright (c) 2005-2006 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:  Image description file for project PnPMS
-*
-*/
-
-
-
-#ifndef PNP_IBY
-#define PNP_IBY
-
-#ifdef __PLUG_AND_PLAY_MOBILE_SERVICES
-    S60_APP_EXE( PnpProvisioning )
-//    SCALABLE_IMAGE( APP_BITMAP_DIR, APP_BITMAP_DIR, PnpProvisioning )
-//		S60_APP_AIF_ICONS( PnpProvisioning )
-    
-    // _reg.rsc has to be in "import" folder to allow updating application exe with a SISX-file
-    data=\EPOC32\DATA\Z\private\10003a3f\apps\pnpprovisioning_reg.RSC \private\10003a3f\import\apps\pnpprovisioning_reg.RSC
-    
-    
-    file=ABI_DIR\BUILD_DIR\NHwrParser.dll		                    SHARED_LIB_DIR\NHwrParser.dll
-    
-    ECOM_PLUGIN( recnhwr.dll, 1020433B.rsc )
-
-#ifdef FF_PNPMS_SERVICE_HELP_PLUGIN
-ECOM_PLUGIN( ServiceHelpPlugin.dll, 20019597.rsc )
-SCALABLE_IMAGE( APP_BITMAP_DIR, APP_BITMAP_DIR, ServiceHelpPlugin )
-#endif
-
-#endif // __PLUG_AND_PLAY_MOBILE_SERVICES
-
-#endif // PNP_IBY
-//  End of File
--- a/pnpmobileservices/pnpms/rom/PnpPaosFilter.iby	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-/*
-* Copyright (c) 2005-2006 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:  Image description file for project PnpPaosFilter
-*
-*/
-
-
-#ifndef PNP_PAOS_FILTER_IBY
-#define PNP_PAOS_FILTER_IBY
-
-#ifdef __PLUG_AND_PLAY_MOBILE_SERVICES
-
-    ECOM_PLUGIN( PnpPaosFilter.dll, 10272D33.rsc )
-
-#endif // __PLUG_AND_PLAY_MOBILE_SERVICES
-
-#endif // PNP_PAOS_FILTER_IBY
-//  End of File
--- a/pnpmobileservices/pnpms/rom/PnpResources.iby	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-/*
-* Copyright (c) 2003 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:  iby file for Configuration Manager Application
-*
-*/
-
-
-#ifndef PNPRESOURCES_IBY
-#define PNPRESOURCES_IBY
-
-#ifdef __PLUG_AND_PLAY_MOBILE_SERVICES
-
-    S60_APP_RESOURCE( pnpprovisioning )
-
-#endif // __PLUG_AND_PLAY_MOBILE_SERVICES
-
-#endif // PNPRESOURCES_IBY
-
-//  End of File  
\ No newline at end of file
--- a/pnpmobileservices/pnpms/tsrc/Bmarm/TestPnpUtilu.def	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	LibEntryL__FR13CTestModuleIf @ 1 NONAME R3UNUSED ; LibEntryL(CTestModuleIf &)
-
--- a/pnpmobileservices/pnpms/tsrc/Bwins/TestPnpUtilu.def	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	?LibEntryL@@YAPAVCScriptBase@@AAVCTestModuleIf@@@Z @ 1 NONAME ; class CScriptBase * __cdecl LibEntryL(class CTestModuleIf &)
-
--- a/pnpmobileservices/pnpms/tsrc/conf/ui_ImumDomainApi.cfg	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,225 +0,0 @@
-
-[Test]
-title  PnPUtilNewL#1
-create TestPnpUtil foobar
-foobar PnPUtilNewL
-delete foobar
-[Endtest]
-
-[Test]
-title  PnPUtilNewLC#2
-create TestPnpUtil foobar
-foobar PnPUtilNewLC
-delete foobar
-[Endtest]
-
-[Test]
-title  PnPUtilVersionL#3
-create TestPnpUtil foobar
-foobar PnPUtilVersionL
-delete foobar
-[Endtest]
-
-[Test]
-title  PnPUtilCreateNewTokenL#4
-create TestPnpUtil foobar
-foobar PnPUtilCreateNewTokenL
-delete foobar
-[Endtest]
-
-[Test]
-title  PnPUtilGetTokenValidityTimeL#5
-create TestPnpUtil foobar
-foobar PnPUtilGetTokenValidityTimeL
-delete foobar
-[Endtest]
-
-[Test]
-title  PnPUtilGetTokenValueL#6
-create TestPnpUtil foobar
-foobar PnPUtilGetTokenValueL
-delete foobar
-[Endtest]
-
-[Test]
-title  PnPUtilCreateNewNonceL#7
-create TestPnpUtil foobar
-foobar PnPUtilCreateNewNonceL
-delete foobar
-[Endtest]
-
-[Test]
-title  PnPUtilGetNonceValidityTimeL#8
-create TestPnpUtil foobar
-foobar PnPUtilGetNonceValidityTimeL
-delete foobar
-[Endtest]
-
-[Test]
-title  PnPUtilGetNonceL#9
-create TestPnpUtil foobar
-foobar PnPUtilGetNonceL
-delete foobar
-[Endtest]
-
-[Test]
-title  PnPUtilGetKeyInfoL#10
-create TestPnpUtil foobar
-foobar PnPUtilGetKeyInfoL
-delete foobar
-[Endtest]
-
-[Test]
-title  PnPUtilImsiL#11
-create TestPnpUtil foobar
-foobar PnPUtilImsiL
-delete foobar
-[Endtest]
-
-[Test]
-title  PnPUtilFetchHomeNetworkInfoL#12
-create TestPnpUtil foobar
-foobar PnPUtilFetchHomeNetworkInfoL
-delete foobar
-[Endtest]
-
-[Test]
-title  PnPUtilFetchNetworkInfoL#13
-create TestPnpUtil foobar
-foobar PnPUtilFetchNetworkInfoL
-delete foobar
-[Endtest]
-
-[Test]
-title  GetAndSetHomeMccL#14
-create TestPnpUtil foobar
-foobar GetAndSetHomeMccL
-delete foobar
-[Endtest]
-
-[Test]
-title  GetAndSetHomeMncL#15
-create TestPnpUtil foobar
-foobar GetAndSetHomeMncL
-delete foobar
-[Endtest]
-
-[Test]
-title  GetAndSetNetworkMccL#16
-create TestPnpUtil foobar
-foobar GetAndSetNetworkMncL
-delete foobar
-[Endtest]
-
-[Test]
-title  GetAndSetNetworkMncL#17
-create TestPnpUtil foobar
-foobar GetAndSetNetworkMncL
-delete foobar
-[Endtest]
-
-[Test]
-title  PnPUtilRegisteredInHomeNetworkL#18
-create TestPnpUtil foobar
-foobar PnPUtilRegisteredInHomeNetworkL
-delete foobar
-[Endtest]
-
-[Test]
-title  PnPUtilOperatorLongNameL#19
-create TestPnpUtil foobar
-foobar PnPUtilOperatorLongNameL
-delete foobar
-[Endtest]
-
-[Test]
-title  PnPUtilStoreAccessPointL#20
-create TestPnpUtil foobar
-foobar PnPUtilStoreAccessPointL
-delete foobar
-[Endtest]
-
-
-[Test]
-title  PnPUtilFormatMncCodeL#21
-create TestPnpUtil foobar
-foobar PnPUtilFormatMncCodeL
-delete foobar
-[Endtest]
-
-[Test]
-title  ProvNewLC#22
-create TestPnpUtil foobar
-foobar ProvNewLC
-delete foobar
-[Endtest]
-
-[Test]
-title  PnpSetApplicationUidL#23
-create TestPnpUtil foobar
-foobar PnpSetApplicationUidL
-delete foobar
-[Endtest]
-
-[Test]
-title  PnpGetApplicationUidL#24
-create TestPnpUtil foobar
-foobar PnpGetApplicationUidL
-delete foobar
-[Endtest]
-
-[Test]
-title  SetProvAdapvalueL#25
-create TestPnpUtil foobar
-foobar SetProvAdapvalueL
-delete foobar
-[Endtest]
-
-[Test]
-title  GetProvAdapvalueL#26
-create TestPnpUtil foobar
-foobar GetProvAdapvalueL
-delete foobar
-[Endtest]
-
-
-[Test]
-title PressKeyLeft#27
-pause 8000
-presskey global EKeyDevice0
-[Endtest] 
-
-[Test] 
-title LaunchOnlineSupportTestL#28
-create TestPnpUtil foobar
-bringtoforeground
-foobar LaunchOnlineSupportTestL
-sendtobackground
-delete foobar
-[Endtest]
-
-[Test]
-title  ConstructUriParamL#29
-create TestPnpUtil foobar
-foobar ConstructUriParamL
-delete foobar
-[Endtest]
-
-[Test]
-title  PnPUtilVerifySignatureL#30
-create TestPnpUtil foobar
-foobar PnPUtilVerifySignatureL
-delete foobar
-[Endtest]
-
-[Test]
-title  pnpDocHandlerL#31
-create TestPnpUtil foobar
-foobar pnpDocHandlerL
-delete foobar
-[Endtest]
-
-
-
-
- 
--- a/pnpmobileservices/pnpms/tsrc/conf/ui_ImumDomainApiTest.cfg	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,152 +0,0 @@
-
-[Test]
-title  PnPUtilNewL
-run testscripter c:\TestFramework\ui_ImumDomainApi.cfg 1
-[Endtest]
-
-[Test]
-title  PnPUtilNewLC
-run testscripter c:\TestFramework\ui_ImumDomainApi.cfg 2
-[Endtest]
-
-[Test]
-title  PnPUtilVersionL
-run testscripter c:\TestFramework\ui_ImumDomainApi.cfg 3
-[Endtest]
-
-[Test]
-title  PnPUtilCreateNewTokenL
-run testscripter c:\TestFramework\ui_ImumDomainApi.cfg 4
-[Endtest]
-
-[Test]
-title  PnPUtilGetTokenValidityTimeL
-run testscripter c:\TestFramework\ui_ImumDomainApi.cfg 5
-[Endtest]
-
-[Test]
-title  PnPUtilGetTokenValueL
-run testscripter c:\TestFramework\ui_ImumDomainApi.cfg 6
-[Endtest]
-
-[Test]
-title  PnPUtilCreateNewNonceL
-run testscripter c:\TestFramework\ui_ImumDomainApi.cfg 7
-[Endtest]
-
-[Test]
-title  PnPUtilGetNonceValidityTimeL
-run testscripter c:\TestFramework\ui_ImumDomainApi.cfg 8
-[Endtest]
-
-[Test]
-title  PnPUtilGetNonceL
-run testscripter c:\TestFramework\ui_ImumDomainApi.cfg 9
-[Endtest]
-
-[Test]
-title  PnPUtilGetKeyInfoL
-run testscripter c:\TestFramework\ui_ImumDomainApi.cfg 10
-[Endtest]
-
-[Test]
-title  PnPUtilImsiL
-run testscripter c:\TestFramework\ui_ImumDomainApi.cfg 11
-[Endtest]
-
-[Test]
-title  PnPUtilFetchHomeNetworkInfoL
-run testscripter c:\TestFramework\ui_ImumDomainApi.cfg 12
-[Endtest]
-
-[Test]
-title  PnPUtilFetchNetworkInfoL
-run testscripter c:\TestFramework\ui_ImumDomainApi.cfg 13
-[Endtest]
-
-[Test]
-title  GetAndSetHomeMccL
-run testscripter c:\TestFramework\ui_ImumDomainApi.cfg 14
-[Endtest]
-
-[Test]
-title  GetAndSetHomeMncL
-run testscripter c:\TestFramework\ui_ImumDomainApi.cfg 15
-[Endtest]
-
-[Test]
-title  GetAndSetNetworkMccL
-run testscripter c:\TestFramework\ui_ImumDomainApi.cfg 16
-[Endtest] 
-
-[Test]
-title  GetAndSetNetworkMncL
-run testscripter c:\TestFramework\ui_ImumDomainApi.cfg 17
-[Endtest]
-
-[Test]
-title  PnPUtilRegisteredInHomeNetworkL
-run testscripter c:\TestFramework\ui_ImumDomainApi.cfg 18
-[Endtest]
-
-[Test]
-title  PnPUtilOperatorLongNameL
-run testscripter c:\TestFramework\ui_ImumDomainApi.cfg 19
-[Endtest]
-
-[Test]
-title  PnPUtilStoreAccessPointL
-run testscripter c:\TestFramework\ui_ImumDomainApi.cfg 20
-[Endtest]
-
-[Test]
-title  PnPUtilFormatMncCodeL
-run testscripter c:\TestFramework\ui_ImumDomainApi.cfg 21
-[Endtest]
-
-[Test]
-title  ProvNewLC
-run testscripter c:\TestFramework\ui_ImumDomainApi.cfg 22
-[Endtest]
-
-[Test]
-title  PnpSetApplicationUidL
-run testscripter c:\TestFramework\ui_ImumDomainApi.cfg 23
-[Endtest]
-
-[Test]
-title  PnpGetApplicationUidL
-run testscripter c:\TestFramework\ui_ImumDomainApi.cfg 24
-[Endtest]
-
-[Test]
-title  SetProvAdapvalueL
-run testscripter c:\TestFramework\ui_ImumDomainApi.cfg 25
-[Endtest]
-
-[Test]
-title  GetProvAdapvalueL
-run testscripter c:\TestFramework\ui_ImumDomainApi.cfg 26
-[Endtest]
-
-[Test]
-title  LaunchOnlineSupportTestL
-run testscripter c:\TestFramework\ui_ImumDomainApi.cfg 27
-run testscripter c:\TestFramework\ui_ImumDomainApi.cfg 28
-[Endtest]
-
-[Test]
-title  ConstructUriParamL
-run testscripter c:\TestFramework\ui_ImumDomainApi.cfg 29
-[Endtest]
-
-[Test]
-title  PnPUtilVerifySignatureL
-run testscripter c:\TestFramework\ui_ImumDomainApi.cfg 30
-[Endtest]
-
-[Test]
-title  pnpDocHandlerL
-run testscripter c:\TestFramework\ui_ImumDomainApi.cfg 31
-[Endtest]
-
Binary file pnpmobileservices/pnpms/tsrc/data/Pnpprovisioningfile has changed
--- a/pnpmobileservices/pnpms/tsrc/eabi/TestPnpUtilu.def	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	_Z9LibEntryLR13CTestModuleIf @ 1 NONAME
-
--- a/pnpmobileservices/pnpms/tsrc/group/TestPnpUtil.mmp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,113 +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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: TestPnpUtil.mmp
-*
-*/
-
-
-#if defined(__S60_)
-        // To get the OSEXT_LAYER_SYSTEMINCLUDE-definition
-        #include <platform_paths.hrh>
-#endif
-#include <data_caging_paths.hrh>
-
-TARGET          TestPnpUtil.dll
-TARGETTYPE      dll
-UID             0x1000008D 0x101FB3E3
-
-CAPABILITY      ALL -TCB
-/* Remove comments and replace 0x00000000 with correct vendor id */
-// VENDORID     0x00000000
-/* Remove comments and replace 0x00000000 with correct secure id */
-// SECUREID     0x00000000
-
-//TARGETPATH      ?target_path
-//DEFFILE         TestPnpUtil.def
-
-#ifdef SBSV2
-USERINCLUDE     ../inc 
-
-	#if defined(__S60_)
-	    OSEXT_LAYER_SYSTEMINCLUDE
-	#else // __S60_ not defined
-SYSTEMINCLUDE   /epoc32/include 
-SYSTEMINCLUDE   /epoc32/include/internal
-	#endif // __S60_
-
-SOURCEPATH      ../src
-#else // SBSV2 not defined
-USERINCLUDE     ../inc 
-
-	#if defined(__S60_)
-OSEXT_LAYER_SYSTEMINCLUDE
-	#else // __S60_ not defined
-SYSTEMINCLUDE   /epoc32/include 
-SYSTEMINCLUDE   /epoc32/include/internal
-	#endif // __S60_
-
-APP_LAYER_SYSTEMINCLUDE
-MW_LAYER_SYSTEMINCLUDE
-
-#endif // SBSV2
-APP_LAYER_SYSTEMINCLUDE
-MW_LAYER_SYSTEMINCLUDE
-
-SOURCE          ../src/TestPnpUtil.cpp
-SOURCE          ../src/TestPnpUtilBlocks.cpp
-
-
-LIBRARY	    pnp.lib
-LIBRARY	    euser.lib
-LIBRARY     stiftestinterface.lib
-LIBRARY     stiftestengine.lib
-LIBRARY     etelmm.lib
-LIBRARY     etel.lib
-LIBRARY	    cryptography.lib   
-LIBRARY     commonui.lib
-LIBRARY     efsrv.lib
-LIBRARY     apmime.lib 
-LIBRARY	    centralrepository.lib  
-LIBRARY	    eikcoctl.lib
-LIBRARY     xmlframework.lib
-LIBRARY	    flogger.lib
-LIBRARY     Sysutil.lib
-LIBRARY     bafl.lib
-LANG        SC
-
-/*
-START WINS      
-?wins_specific_information
-END
-
-START MARM
-?marm_specific_information
-END
-*/
-// Other possible keywords:
- 
-// DOCUMENT     ?file, that is not compiled, but added to MSVC project workspace (i.e. release notes)
-/*
-START BITMAP ?target
-TARGETPATH   ?emulated_path_on_target_machine
-HEADER
-SOURCE       ?color_depth ?source_bitmap
-END
-*/
-// DEFFILE ?filename
-// AIF ?filename
-
-
-SMPSAFE
-// End of File
-
--- a/pnpmobileservices/pnpms/tsrc/group/TestPnpUtil.pkg	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +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 "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description: TestPnpUtil.pkg
-;
-
-; Languages
-&EN
-
-; Provide value for uid
-#{"STIF"},(0x00000000),1,1,0,TYPE=SA
-
-; Series60 product id for S60 3.0
-[0x101F7961], 0, 0, 0, {"Series60ProductID"}
-
-; Localised Vendor name
-%{"Nokia"}
-
-; Unique Vendor name
-:"Nokia"
-
-; Logo
-; None
-
-; Package signature - Optional
-; None
-
-; Start of Package body
-
-; Condition blocks
-; None
-
-; Options list
-; None
-
-; Install files
-"\epoc32\release\armv5\udeb\TestPnpUtil.dll" -"C:\Sys\Bin\TestPnpUtil.dll"
-"..\conf\ui_ImumDomainApi.cfg" -"C:\TestFramework\ui_ImumDomainApi.cfg"
-"..\conf\ui_ImumDomainApiTest.cfg" -"C:\TestFramework\ui_ImumDomainApiTest.cfg"
-"..\init\TestFramework.ini" -"C:\TestFramework\TestFramework.ini"
-"..\data\Pnpprovisioningfile" -"C:\data\Pnpprovisioningfile"
-  
-; Embedded SIS 
-; None
-
-; End of Package body
-
-; PKG dependencies
-; None
-
-; PKG capabilities
-; None
--- a/pnpmobileservices/pnpms/tsrc/group/bld.inf	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-/*
-* Copyright (c) 2002 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:   bld.inf
-*
-*/
-
-
-
-
-PRJ_PLATFORMS
-// specify the platforms your component needs to be built for here
-// defaults to WINS MARM so you can ignore this if you just build these
-DEFAULT
-
-PRJ_TESTEXPORTS
-// NOTE: If using ARS requirements all export operations should be done under this.
-// 'abld test export'
-
-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
-// Example: 
-/*
-/agnmodel/inc/AGMCOMON.H
-*/
-
-PRJ_MMPFILES
- 
-// Specify the .mmp files required for building the important component
-// releasables.
-//
-// Specify "tidy" if the component you need to build doesn't need to be
-// released. Specify "ignore" if the MMP file exists but should be
-// ignored.
-// Example:
-/*
-/agnmodel/group/agnmodel.mmp
-#if defined(MARM)
-/agnmodel/group/agsvexe.mmp
-#endif
-*/
-
-PRJ_TESTMMPFILES
-TestPnpUtil.mmp
-
-//  End of File
--- a/pnpmobileservices/pnpms/tsrc/inc/TestPnpUtil.h	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,211 +0,0 @@
-/*
-* Copyright (c) 2002 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:        TestPnPUtil.h
-*
-*/
-
-#ifndef TESTPNPUTIL_H
-#define TESTPNPUTIL_H
-
-//  INCLUDES
-#include <StifLogger.h>
-#include <TestScripterInternal.h>
-#include <StifTestModule.h>
-#include <TestclassAssert.h>
-#include <PnpUtilImpl.h>
-#include <PnpProvUtil.h>
-#include <e32base.h>
-#include <apmstd.h>
-
-// CONSTANTS
-
-// MACROS
-#define TEST_CLASS_VERSION_MAJOR 0
-#define TEST_CLASS_VERSION_MINOR 0
-#define TEST_CLASS_VERSION_BUILD 0
-
-// Logging path
-_LIT( KTestPnpUtilLogPath, "\\logs\\testframework\\TestPnpUtil\\" ); 
-// Log file
-_LIT( KTestPnpUtilLogFile, "TestPnpUtil.txt" ); 
-_LIT( KTestPnpUtilLogFileWithTitle, "TestPnpUtil_[%S].txt" );
-
-// FUNCTION PROTOTYPES
-
-
-// FORWARD DECLARATIONS
-class CTestPnpUtil;
-class TDataType;
-
-// CLASS DECLARATION
-
-/**
-*  CTestPnpUtil test class for STIF Test Framework TestScripter.
-*  other_description_lines
-*
-*  @lib ?library
-*  @since ?Series60_version
-*/
-NONSHARABLE_CLASS(CTestPnpUtil) :public CScriptBase
-    {
-    public:  // Constructors and destructor
-
-        /**
-        * Two-phased constructor.
-        */
-        static CTestPnpUtil* NewL( CTestModuleIf& aTestModuleIf );
-
-        /**
-        * Destructor.
-        */
-        virtual ~CTestPnpUtil();
-
-    public: // New functions
-
-        /**
-        * ?member_description.
-        * @since ?Series60_version
-        * @param ?arg1 ?description
-        * @return ?description
-        */
-        
-
-    public: // Functions from base classes
-
-        /**
-        * From CScriptBase Runs a script line.
-        * @since ?Series60_version
-        * @param aItem Script line containing method name and parameters
-        * @return Symbian OS error code
-        */
-        virtual TInt RunMethodL( CStifItemParser& aItem );
-
-    protected:  // New functions
-
-        /**
-        * ?member_description.
-        * @since ?Series60_version
-        * @param ?arg1 ?description
-        * @return ?description
-        */
-        
-
-    protected:  // Functions from base classes
-
-        /**
-        * From ?base_class ?member_description
-        */
-        
-
-    private:
-
-        /**
-        * C++ default constructor.
-        */
-        CTestPnpUtil( CTestModuleIf& aTestModuleIf );
-
-        /**
-        * By default Symbian 2nd phase constructor is private.
-        */
-        void ConstructL();
-
-        // Prohibit copy constructor if not deriving from CBase.
-        // Prohibit assigment operator if not deriving from CBase.
-        
-        /**
-        * Frees all resources allocated from test methods.
-        * @since ?Series60_version
-        */
-        void Delete();
-
-        /**
-        * Test methods are listed below. 
-        */
-
-        /**
-        * Example test method.
-        * @since ?Series60_version
-        * @param aItem Script line containing parameters.
-        * @return Symbian OS error code.
-        */
-        virtual TInt pnpDocHandlerL();
-                TInt PnPUtilVerifySignatureL();
-		TInt ConstructUriParamL();
-		TInt LaunchOnlineSupportTestL();
-		TInt GetProvAdapvalueL();
-		TInt SetProvAdapvalueL();
-		TInt PnpGetApplicationUidL();
-		TInt PnpSetApplicationUidL();
-		TInt ProvNewLC();
-		TInt PnPUtilFormatMncCodeL();
-		TInt PnPUtilStoreAccessPointL();
-		TInt PnPUtilOperatorLongNameL();
-		TInt PnPUtilRegisteredInHomeNetworkL();
-		TInt GetAndSetNetworkMncL();
-		TInt GetAndSetNetworkMccL();
-		TInt GetAndSetHomeMncL();
-		TInt GetAndSetHomeMccL();
-		TInt PnPUtilFetchNetworkInfoL();
-		TInt PnPUtilFetchHomeNetworkInfoL();
-		TInt PnPUtilImsiL();
-		TInt PnPUtilGetKeyInfoL();
-		TInt PnPUtilGetNonceL();
-		TInt PnPUtilGetNonceValidityTimeL();
-		TInt PnPUtilCreateNewNonceL();
-		TInt PnPUtilGetTokenValueL();
-		TInt PnPUtilGetTokenValidityTimeL();
-		TInt PnPUtilCreateNewTokenL();
-		TInt PnPUtilVersionL();
-		TInt PnPUtilNewLC();
-		TInt PnPUtilNewL();
-        
-        /**
-         * Method used to log version of test class
-         */
-        void SendTestClassVersion();
-
-        //ADD NEW METHOD DEC HERE
-        //[TestMethods] - Do not remove
-
-    public:     // Data
-        // ?one_line_short_description_of_data
-        //?data_declaration;
-
-    protected:  // Data
-        // ?one_line_short_description_of_data
-        //?data_declaration;
-
-    private:    // Data
-        
-        // ?one_line_short_description_of_data
-        //?data_declaration;
-
-        // Reserved pointer for future extension
-        
-
-    public:     // Friend classes
-        //?friend_class_declaration;
-    protected:  // Friend classes
-        //?friend_class_declaration;
-    private:    // Friend classes
-        //?friend_class_declaration;
-        
-    private:
-    	CPnpUtilImpl *pnputil;
-
-    };
-
-#endif      // TESTPNPUTIL_H
-
-// End of File
--- a/pnpmobileservices/pnpms/tsrc/init/TestFramework.ini	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,202 +0,0 @@
-#
-# This is STIF initialization file
-# Comment lines start with '#'-character.
-# See STIF TestFramework users guide.doc for instructions
-
-# NOTE: This file should be placed in under folder \epoc32\winscw\c\TestFramework\
-#  in order to run the test cases
-
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-# Set following test engine settings:
-#	- Set Test Reporting mode. TestReportMode's possible values are:
-#		+ 'Summary': Summary of the tested test cases.
-#		+ 'Environment': Hardware and software info.
-#		+ 'TestCases': Test case report.
-#		+ 'FullReport': Set of all above ones.
-#		+ Example 'TestReportMode= Summary TestCases'
-#
-# 	- CreateTestReport setting controls report creation mode
-#		+ YES, Test report will created.
-#		+ NO, No Test report.
-#
-# 	- File path indicates the base path of the test report.
-# 	- File name indicates the name of the test report.
-#
-# 	- File format indicates the type of the test report.
-#		+ TXT, Test report file will be txt type, for example 'TestReport.txt'.
-#		+ HTML, Test report will be html type, for example 'TestReport.html'.
-#
-# 	- File output indicates output source of the test report.
-#		+ FILE, Test report logging to file.
-#		+ RDEBUG, Test report logging to using rdebug.
-#
-# 	- File Creation Mode indicates test report overwriting if file exist.
-#		+ OVERWRITE, Overwrites if the Test report file exist.
-#		+ APPEND, Continue logging after the old Test report information if
-#                 report exist.
-# 	- Sets a device reset module's dll name(Reboot).
-#		+ If Nokia specific reset module is not available or it is not correct one
-#		  StifHWResetStub module may use as a template for user specific reset
-#		  module.
-# 	- Sets STIF test measurement disable options. e.g. pluging1 and pluging2 disablation
-#		DisableMeasurement= stifmeasurementplugin01 stifmeasurementplugin02
-#
-
-[Engine_Defaults]
-
-TestReportMode= FullReport		# Possible values are: 'Empty', 'Summary', 'Environment',
-                                                               'TestCases' or 'FullReport'
-
-CreateTestReport= YES			# Possible values: YES or NO
-
-TestReportFilePath= C:\LOGS\TestFramework\
-TestReportFileName= TestReport
-
-TestReportFormat= TXT			# Possible values: TXT or HTML
-TestReportOutput= FILE			# Possible values: FILE or RDEBUG
-TestReportFileCreationMode= OVERWRITE	# Possible values: OVERWRITE or APPEND
-
-DeviceResetDllName= StifResetForNokia.dll # e.g. 'StifHWResetStub.dll' for user specific reseting
-
-DisableMeasurement= stifmeasurementdisablenone	# Possible values are:
-						# 'stifmeasurementdisablenone', 'stifmeasurementdisableall'
-					  	# 'stifmeasurementplugin01', 'stifmeasurementplugin02',
-					  	# 'stifmeasurementplugin03', 'stifmeasurementplugin04',
-					  	# 'stifmeasurementplugin05' or 'stifbappeaprofiler'
-
-Timeout= 0                              # Default timeout value for each test case. In milliseconds
-
-UITestingSupport= Yes
-
-[End_Defaults]
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-
-
-
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-# Module configurations start
-# Modules are added between module tags
-# tags. Module name is specified after ModuleName= tag, like
-# ModuleName= XXXXXXXXX
-# Modules might have initialisation file, specified as
-# IniFile= c:\testframework\YYYYYY
-# Modules might have several configuration files, like
-# TestCaseFile= c:\testframework\NormalCases.txt
-# TestCaseFile= c:\testframework\SmokeCases.txt
-# TestCaseFile= c:\testframework\ManualCases.txt
-
-# (TestCaseFile is synonym for old term ConfigFile)
-
-# Following case specifies demo module settings. Demo module
-# does not read any settings from file, so tags 
-# IniFile and TestCaseFile are not used.
-# In the simplest case it is enough to specify only the
-# name of the test module when adding new test module
-
-[New_Module]
-ModuleName= testcombiner
-TestCaseFile= c:\testframework\ui_ImumDomainApiTest.cfg
-[End_Module]
-
-
-# Load testmoduleXXX, optionally with initialization file and/or test case files
-#[New_Module]
-#ModuleName= testmodulexxx
-
-#TestModuleXXX used initialization file
-#IniFile= c:\testframework\init.txt
-
-#TestModuleXXX used configuration file(s)
-#TestCaseFile= c:\testframework\testcases1.cfg
-#TestCaseFile= c:\testframework\testcases2.cfg
-#TestCaseFile= c:\testframework\manualtestcases.cfg
-
-#[End_Module]
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-
-
-
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-# Set STIF logging overwrite parameters for Logger.
-# 	Hardware and emulator environment logging path and styles can
-# 	be configured from here to overwrite the Logger's implemented values.
-#	
-#	Settings description:
-#	- Indicates option for creation log directory/directories. If log directory/directories
-#         is/are not created by user they will make by software.
-#		+ YES, Create log directory/directories if not allready exist.
-#		+ NO, Log directory/directories not created. Only created one is used.
-#
-#	- Overwrite emulator path setting.
-#		+ Example: If 'EmulatorBasePath= C:\LOGS\TestFramework\' and in code is defined 
-#		           Logger's path 'D:\\LOGS\\Module\\' with those definition the path
-#		           will be 'C:\LOGS\TestFramework\LOGS\Module\'
-#
-#	- Overwrite emulator's logging format.
-#		+ TXT, Log file(s) will be txt type(s), for example 'Module.txt'.
-#		+ HTML, Log file(s) will be html type(s), for example 'Module.html'.
-#
-#	- Overwrited emulator logging output source.
-#		+ FILE, Logging to file(s).
-#		+ RDEBUG, Logging to using rdebug(s).
-#
-#	- Overwrite hardware path setting (Same description as above in emulator path).
-#	- Overwrite hardware's logging format(Same description as above in emulator format).
-#	- Overwrite hardware's logging output source(Same description as above in emulator output).
-#
-#	- File Creation Mode indicates file overwriting if file exist.
-#		+ OVERWRITE, Overwrites if file(s) exist.
-#		+ APPEND, Continue logging after the old logging information if file(s) exist.
-#
-#	- Will thread id include to the log filename.
-#		+ YES, Thread id to log file(s) name, Example filename 'Module_b9.txt'.
-#		+ NO, No thread id to log file(s), Example filename 'Module.txt'.
-#
-#	- Will time stamps include the to log file.
-#		+ YES, Time stamp added to each line in log file(s). Time stamp is 
-#                 for example'12.Nov.2003 115958    LOGGING INFO'
-#		+ NO, No time stamp(s).
-#
-#	- Will line breaks include to the log file.
-#		+ YES, Each logging event includes line break and next log event is in own line.
-#		+ NO, No line break(s).
-#
-#	- Will event ranking include to the log file.
-#		+ YES, Event ranking number added to each line in log file(s). Ranking number
-#                 depends on environment's tics, for example(includes time stamp also)
-#                 '012   12.Nov.2003 115958    LOGGING INFO'
-#		+ NO, No event ranking.
-#
-#	- Will write log file in unicode format.
-#		+ YES, Log file will be written in unicode format
-#		+ NO, Log will be written as normal, not unicode, file.
-#
-
-[Logger_Defaults]
-
-#NOTE: If you want to set Logger using next setting(s) remove comment(s)'#'
-#NOTE: TestEngine and TestServer logging settings cannot change here
-
-#CreateLogDirectories= YES    # Possible values: YES or NO
-
-#EmulatorBasePath= C:\LOGS\TestFramework\
-#EmulatorFormat= HTML         # Possible values: TXT or HTML
-#EmulatorOutput= FILE         # Possible values: FILE or RDEBUG
-
-#HardwareBasePath= D:\LOGS\TestFramework\
-#HardwareFormat= HTML         # Possible values: TXT or HTML
-#HardwareOutput= FILE         # Possible values: FILE or RDEBUG
-
-#FileCreationMode= OVERWRITE  # Possible values: OVERWRITE or APPEND
-
-#ThreadIdToLogFile= YES       # Possible values: YES or NO
-#WithTimeStamp= YES           # Possible values: YES or NO
-#WithLineBreak= YES           # Possible values: YES or NO
-#WithEventRanking= YES        # Possible values: YES or NO
-
-#FileUnicode= YES             # Possible values: YES or NO
-#AddTestCaseTitle= YES        # Possible values: YES or NO
-[End_Logger_Defaults]
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-
-# End of file
--- a/pnpmobileservices/pnpms/tsrc/src/TestPnpUtil.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,209 +0,0 @@
-/*
-* Copyright (c) 2002 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:        TestPnPUtil.cpp
-*
-*/
-
-
-
-// INCLUDE FILES
-#include <Stiftestinterface.h>
-#include "TestPnpUtil.h"
-#include <SettingServerClient.h>
-
-
-// EXTERNAL DATA STRUCTURES
-//extern  ?external_data;
-
-// EXTERNAL FUNCTION PROTOTYPES  
-
-// CONSTANTS
-
-// MACROS
-//#define ?macro ?macro_def
-
-// LOCAL CONSTANTS AND MACROS
-
-//#define ?macro_name ?macro_def
-
-// MODULE DATA STRUCTURES
-//enum ?declaration
-//typedef ?declaration
-
-// LOCAL FUNCTION PROTOTYPES
-
-
-// FORWARD DECLARATIONS
-//class ?FORWARD_CLASSNAME;
-
-// ============================= LOCAL FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// ?function_name ?description.
-// ?description
-// Returns: ?value_1: ?description
-//          ?value_n: ?description_line1
-//                    ?description_line2
-// -----------------------------------------------------------------------------
-//
-/*
-?type ?function_name(
-    ?arg_type arg,  // ?description
-    ?arg_type arg)  // ?description
-    {
-
-    ?code  // ?comment
-
-    // ?comment
-    ?code
-    }
-*/
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CTestPnpUtil::CTestPnpUtil
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CTestPnpUtil::CTestPnpUtil( 
-    CTestModuleIf& aTestModuleIf ):
-        CScriptBase( aTestModuleIf )
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// CTestPnpUtil::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CTestPnpUtil::ConstructL()
-    {
-    //Read logger settings to check whether test case name is to be
-    //appended to log file name.
-    RSettingServer settingServer;
-    TInt ret = settingServer.Connect();
-    if(ret != KErrNone)
-        {
-        User::Leave(ret);
-        }
-    // Struct to StifLogger settigs.
-    TLoggerSettings loggerSettings; 
-    // Parse StifLogger defaults from STIF initialization file.
-    ret = settingServer.GetLoggerSettings(loggerSettings);
-    if(ret != KErrNone)
-        {
-        User::Leave(ret);
-        } 
-    // Close Setting server session
-    settingServer.Close();
-
-    TFileName logFileName;
-    
-    if(loggerSettings.iAddTestCaseTitle)
-        {
-        TName title;
-        TestModuleIf().GetTestCaseTitleL(title);
-        logFileName.Format(KTestPnpUtilLogFileWithTitle, &title);
-        }
-    else
-        {
-        logFileName.Copy(KTestPnpUtilLogFile);
-        }
-
-    iLog = CStifLogger::NewL( KTestPnpUtilLogPath, 
-                          logFileName,
-                          CStifLogger::ETxt,
-                          CStifLogger::EFile,
-                          EFalse );
-    
-    SendTestClassVersion();
-    
-    
-    }
-
-// -----------------------------------------------------------------------------
-// CTestPnpUtil::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CTestPnpUtil* CTestPnpUtil::NewL( 
-    CTestModuleIf& aTestModuleIf )
-    {
-    CTestPnpUtil* self = new (ELeave) CTestPnpUtil( aTestModuleIf );
-
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop(self);
-
-    return self;
-
-    }
-// -----------------------------------------------------------------------------
-// CTestPnpUtil::~CTestPnpUtil
-// Destructor
-// -----------------------------------------------------------------------------
-//
-CTestPnpUtil::~CTestPnpUtil()
-    { 
-
-    // Delete resources allocated from test methods
-    Delete();
-
-    // Delete logger
-    delete iLog; 
-    
-    //delete PnPUtil;
-    
-    
-
-    }
-
-//-----------------------------------------------------------------------------
-// CTestPnpUtil::SendTestClassVersion
-// Method used to send version of test class
-//-----------------------------------------------------------------------------
-//
-void CTestPnpUtil::SendTestClassVersion()
-	{
-	TVersion moduleVersion;
-	moduleVersion.iMajor = TEST_CLASS_VERSION_MAJOR;
-	moduleVersion.iMinor = TEST_CLASS_VERSION_MINOR;
-	moduleVersion.iBuild = TEST_CLASS_VERSION_BUILD;
-	
-	TFileName moduleName;
-	moduleName = _L("TestPnpUtil.dll");
-
-	TBool newVersionOfMethod = ETrue;
-	TestModuleIf().SendTestModuleVersion(moduleVersion, moduleName, newVersionOfMethod);
-	}
-
-// ========================== OTHER EXPORTED FUNCTIONS =========================
-
-// -----------------------------------------------------------------------------
-// LibEntryL is a polymorphic Dll entry point.
-// Returns: CScriptBase: New CScriptBase derived object
-// -----------------------------------------------------------------------------
-//
-EXPORT_C CScriptBase* LibEntryL( 
-    CTestModuleIf& aTestModuleIf ) // Backpointer to STIF Test Framework
-    {
-
-    return ( CScriptBase* ) CTestPnpUtil::NewL( aTestModuleIf );
-
-    }
-
-
-//  End of File
--- a/pnpmobileservices/pnpms/tsrc/src/TestPnpUtilBlocks.cpp	Tue Feb 02 00:03:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,896 +0,0 @@
-/*
-* Copyright (c) 2002 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:      TestPnPUtilBlocks.cpp
-*
-*/
-
-
-
-
-
-
-// [INCLUDE FILES] - do not remove
-#include <e32svr.h>
-#include <StifParser.h>
-#include <Stiftestinterface.h>
-#include "TestPnpUtil.h"
-#include <ETELMM.H>
-#include <DocumentHandler.h>
-#include <e32std.h>
-
-// EXTERNAL DATA STRUCTURES
-//extern  ?external_data;
-
-// EXTERNAL FUNCTION PROTOTYPES  
-
-// CONSTANTS
-//const ?type ?constant_var = ?constant;
-
-// MACROS
-//#define ?macro ?macro_def
-
-// LOCAL CONSTANTS AND MACROS
-//#define ?macro_name ?macro_def
-
-// MODULE DATA STRUCTURES
-//enum ?declaration
-//typedef ?declaration
-
-// LOCAL FUNCTION PROTOTYPES
-
-// FORWARD DECLARATIONS
-//class ?FORWARD_CLASSNAME;
-
-const static TInt KMaxLength = 256;
-const static TInt KMinLength = 5;
-
-
-void CTestPnpUtil::Delete() 
-    {
-
-    }
-
-// -----------------------------------------------------------------------------
-// CTestPnpUtil::RunMethodL
-// Run specified method. Contains also table of test mothods and their names.
-// -----------------------------------------------------------------------------
-//
-TInt CTestPnpUtil::RunMethodL( 
-    CStifItemParser& aItem ) 
-    {
-
-   TStifFunctionInfo const KFunctions[] =
-        {  
-        // Copy this line for every implemented function.
-        // First string is the function name used in TestScripter script file.
-        // Second is the actual implementation member function. 
-        
-        ENTRY( "PnPUtilNewL", CTestPnpUtil::PnPUtilNewL ),
-        ENTRY( "PnPUtilNewLC", CTestPnpUtil::PnPUtilNewLC ),
-        ENTRY( "PnPUtilVersionL", CTestPnpUtil::PnPUtilVersionL ),
-        ENTRY( "PnPUtilCreateNewTokenL", CTestPnpUtil::PnPUtilCreateNewTokenL ),
-        ENTRY( "PnPUtilGetTokenValidityTimeL", CTestPnpUtil::PnPUtilGetTokenValidityTimeL ),
-        ENTRY( "PnPUtilGetTokenValueL", CTestPnpUtil::PnPUtilGetTokenValueL ),
-        ENTRY( "PnPUtilCreateNewNonceL", CTestPnpUtil::PnPUtilCreateNewNonceL ),
-        ENTRY( "PnPUtilGetNonceValidityTimeL", CTestPnpUtil::PnPUtilGetNonceValidityTimeL ),
-        ENTRY( "PnPUtilGetNonceL", CTestPnpUtil::PnPUtilGetNonceL ),
-        ENTRY( "PnPUtilGetKeyInfoL", CTestPnpUtil::PnPUtilGetKeyInfoL ),
-        ENTRY( "PnPUtilImsiL", CTestPnpUtil::PnPUtilImsiL ),
-        ENTRY( "PnPUtilFetchHomeNetworkInfoL", CTestPnpUtil::PnPUtilFetchHomeNetworkInfoL ),
-        ENTRY( "PnPUtilFetchNetworkInfoL", CTestPnpUtil::PnPUtilFetchNetworkInfoL ),
-        ENTRY( "GetAndSetHomeMccL", CTestPnpUtil::GetAndSetHomeMccL ),
-        ENTRY( "GetAndSetHomeMncL", CTestPnpUtil::GetAndSetHomeMncL ),
-	ENTRY( "GetAndSetNetworkMccL", CTestPnpUtil::GetAndSetNetworkMccL ),
-        ENTRY( "GetAndSetNetworkMncL", CTestPnpUtil::GetAndSetNetworkMncL ),
-        ENTRY( "PnPUtilRegisteredInHomeNetworkL", CTestPnpUtil::PnPUtilRegisteredInHomeNetworkL ),
-        ENTRY( "PnPUtilOperatorLongNameL", CTestPnpUtil::PnPUtilOperatorLongNameL ),
-        ENTRY( "PnPUtilStoreAccessPointL", CTestPnpUtil::PnPUtilStoreAccessPointL ),
-        ENTRY( "PnPUtilFormatMncCodeL", CTestPnpUtil::PnPUtilFormatMncCodeL ),
-        ENTRY( "ProvNewLC", CTestPnpUtil::ProvNewLC ),
-        ENTRY( "PnpSetApplicationUidL", CTestPnpUtil::PnpSetApplicationUidL ),
-        ENTRY( "PnpGetApplicationUidL", CTestPnpUtil::PnpGetApplicationUidL ),
-        ENTRY( "SetProvAdapvalueL", CTestPnpUtil::SetProvAdapvalueL ),
-        ENTRY( "GetProvAdapvalueL", CTestPnpUtil::GetProvAdapvalueL ),
-        ENTRY( "LaunchOnlineSupportTestL", CTestPnpUtil::LaunchOnlineSupportTestL ),
-        ENTRY( "ConstructUriParamL", CTestPnpUtil::ConstructUriParamL ),
-        ENTRY( "PnPUtilVerifySignatureL", CTestPnpUtil::PnPUtilVerifySignatureL ),
-        ENTRY( "pnpDocHandlerL", CTestPnpUtil::pnpDocHandlerL)
-	        
-               //ADD NEW ENTRY HERE
-        // [test cases entries] - Do not remove
-
-        };
-
-    const TInt count = sizeof( KFunctions ) / 
-                        sizeof( TStifFunctionInfo );
-
-    return RunInternalL( KFunctions, count, aItem );
-
-    }
-
-// -----------------------------------------------------------------------------
-// CTestPnpUtil::PnPUtilNewL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//  
-TInt CTestPnpUtil::PnPUtilNewL()
-{
-    CPnpUtilImpl* pnptest = CPnpUtilImpl::NewLC();
-    CleanupStack::PopAndDestroy(pnptest);
-    
-    return KErrNone;
-}
-
-// -----------------------------------------------------------------------------
-// CTestPnpUtil::PnPUtilNewLC
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-// 
-
-TInt CTestPnpUtil::PnPUtilNewLC()
-{
-    CPnpUtilImpl* pnptest = CPnpUtilImpl::NewLC();
-    CleanupStack::PopAndDestroy(pnptest);
-    return KErrNone;
-}
-
-// -----------------------------------------------------------------------------
-// CTestPnpUtil::PnPUtilVersionL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-// 
-TInt CTestPnpUtil::PnPUtilVersionL()
-{
-
-    CPnpUtilImpl* pnputil = CPnpUtilImpl::NewLC();
-    
-    TBuf<KMaxLength> bufversion;
-    TInt err = pnputil -> Version(bufversion);
-    
-    TBuf<KMinLength> bufversionmin;
-    TInt err1 = pnputil -> Version(bufversionmin);
-    
-    
-    CleanupStack::PopAndDestroy(pnputil);
-    
-    if(err == KErrNone && err1 == KErrArgument)
-    return KErrNone;
-    else
-    return KErrGeneral;
-}
-
-// -----------------------------------------------------------------------------
-// CTestPnpUtil::PnPUtilCreateNewTokenL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-// 
-TInt CTestPnpUtil::PnPUtilCreateNewTokenL()
-{
-
-
-    CPnpUtilImpl* pnputil = CPnpUtilImpl::NewLC();
-    
-    TInt timevalid = 0;
-    TInt timeinvalid = 999999; 
-    
-    TInt token;
-    TInt err = pnputil -> CreateNewToken(timevalid, token);
-    
-    TInt tokeninvalid;
-    TInt err1 = pnputil -> CreateNewToken(timeinvalid, tokeninvalid);
-    
-    CleanupStack::PopAndDestroy(pnputil);
-    
-    if(err == KErrNone && err1 == KErrArgument)
-    return KErrNone;
-    else
-    return KErrGeneral;
-}
-
-// -----------------------------------------------------------------------------
-// CTestPnpUtil::PnPUtilGetTokenValidityTimeL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-// 
-TInt CTestPnpUtil::PnPUtilGetTokenValidityTimeL()
-{
-    
-    CPnpUtilImpl* pnputil = CPnpUtilImpl::NewLC();
-    
-    const TInt KTokenValidityTime = 600;
-    
-    TInt tokenvalidaitytime = pnputil -> GetTokenValidityTime();
-    
-    CleanupStack::PopAndDestroy(pnputil);
-    
-    if(tokenvalidaitytime == KTokenValidityTime)
-    return KErrNone;
-    else
-    return KErrGeneral;
-    
-    
-}
-
-
-// -----------------------------------------------------------------------------
-// CTestPnpUtil::PnPUtilGetTokenValueL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-TInt CTestPnpUtil::PnPUtilGetTokenValueL()
-{
-
-
-    CPnpUtilImpl* pnputil = CPnpUtilImpl::NewLC();
-    
-    TInt tokenval;
-    TInt timevalid = 600;
-    TInt token;
-    TInt err = pnputil -> CreateNewToken(timevalid, token);
-    
-    err = pnputil ->GetTokenValue(tokenval);
-    
-    CleanupStack::PopAndDestroy(pnputil);
-    
-    return err;  
-}
-
-// -----------------------------------------------------------------------------
-// CTestPnpUtil::PnPUtilCreateNewNonceL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-TInt CTestPnpUtil::PnPUtilCreateNewNonceL()
-{
-
-
-    CPnpUtilImpl* pnputil = CPnpUtilImpl::NewLC();
-
-    TUint32 timeout =0;
-    TBuf8<KMaxLength> bufversion;
-    TRAPD( err, pnputil -> CreateNewNonceL(timeout, bufversion));
-    
-    TBuf8<KMinLength> bufversionmin;
-    TRAPD (err1 , pnputil -> CreateNewNonceL(timeout, bufversionmin));
-    
-    
-    CleanupStack::PopAndDestroy(pnputil);
-    
-    if(err == KErrNone && err1 == KErrArgument)
-    return KErrNone;
-    else
-    return KErrGeneral;
-}
-
-// -----------------------------------------------------------------------------
-// CTestPnpUtil::PnPUtilGetNonceValidityTimeL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-TInt CTestPnpUtil::PnPUtilGetNonceValidityTimeL()
-{
-    
-    CPnpUtilImpl* pnputil = CPnpUtilImpl::NewLC();
-    
-    TRAPD(err, pnputil->GetNonceValidityTimeL());
-    
-    CleanupStack::PopAndDestroy(pnputil);
-    
-    if(err == KErrNotSupported)
-    return KErrNone;
-    else
-    return KErrGeneral;
-    
-    
-}
-
-// -----------------------------------------------------------------------------
-// CTestPnpUtil::PnPUtilGetNonceL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-TInt CTestPnpUtil::PnPUtilGetNonceL()
-{
-
-
-    CPnpUtilImpl* pnputil = CPnpUtilImpl::NewLC();
-    
-    TBuf8<KMaxLength> nonce;
-    TRAPD(err, pnputil->GetNonceL(nonce));
-    
-    TBuf8<KMinLength> nonce1;
-    TRAPD(err1, pnputil->GetNonceL(nonce1));
-    
-    CleanupStack::PopAndDestroy(pnputil);
-    
-    if(err==KErrNone && err1==KErrArgument)
-    return KErrNone;
-    else
-    return KErrGeneral;
-}
-
-// -----------------------------------------------------------------------------
-// CTestPnpUtil::PnPUtilGetKeyInfoL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-TInt CTestPnpUtil::PnPUtilGetKeyInfoL()
-{
-
-    CPnpUtilImpl* pnputil = CPnpUtilImpl::NewLC();
-    
-    TBuf8<KMaxLength> key;
-    TRAPD(err, pnputil->GetKeyInfoL(key));
-    
-    TBuf8<KMinLength> key1;
-    TRAPD(err1, pnputil->GetKeyInfoL(key1));
-    
-    CleanupStack::PopAndDestroy(pnputil);
-    
-    if(err == KErrNone && err1 == KErrArgument)
-    return KErrNone;
-    else
-    return KErrGeneral;
-}
-
-// -----------------------------------------------------------------------------
-// CTestPnpUtil::PnPUtilImsiL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-TInt CTestPnpUtil::PnPUtilImsiL()
-{
-    CPnpUtilImpl* pnputil = CPnpUtilImpl::NewLC();
-    
-    RMobilePhone::TMobilePhoneSubscriberId aImsi;
-    
-    TRAPD(err, pnputil->ImsiL(aImsi));
-    
-    CleanupStack::PopAndDestroy(pnputil);
-    
-    return err;
-    
-}
-
-
-// -----------------------------------------------------------------------------
-// CTestPnpUtil::PnPUtilFetchHomeNetworkInfoL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-TInt CTestPnpUtil::PnPUtilFetchHomeNetworkInfoL()
-{
-    
-    CPnpUtilImpl* pnputil = CPnpUtilImpl::NewLC();
-    
-    TRAPD(err, pnputil->FetchHomeNetworkInfoL());
-    
-    CleanupStack::PopAndDestroy(pnputil);
-    
-    return err;
-}
-
-
-// -----------------------------------------------------------------------------
-// CTestPnpUtil::PnPUtilFetchNetworkInfoL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-TInt CTestPnpUtil::PnPUtilFetchNetworkInfoL()
-{
-    CPnpUtilImpl* pnputil = CPnpUtilImpl::NewLC();
-    
-        TRAPD(err, pnputil->FetchNetworkInfoL());
-    
-    CleanupStack::PopAndDestroy(pnputil);
-    return err;
- }
-
-
-// -----------------------------------------------------------------------------
-// CTestPnpUtil::GetAndSetHomeMccL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-TInt CTestPnpUtil::GetAndSetHomeMccL()
-{
-    
-    
-    CPnpUtilImpl* pnputil = CPnpUtilImpl::NewLC();
-    
-    RMobilePhone::TMobilePhoneNetworkInfoV1 info;
-    RMobilePhone::TMobilePhoneNetworkInfoV1Pckg infoPckg( info );
-
-    info.iCountryCode.Copy( _L("244") );
-    
-    TRAPD(err, pnputil->SetHomeMccL( info.iCountryCode ));
-    if(err!=KErrNone)
-    return err;
-    
-    RMobilePhone::TMobilePhoneNetworkCountryCode getmcc;
-    
-    TRAPD(err1, getmcc = pnputil->HomeMccL());    
-    
-    CleanupStack::PopAndDestroy(pnputil);
-    
-    if(err1!=KErrNone)
-    return err1;
-    
-    if(info.iCountryCode == getmcc)
-    return KErrNone;
-    else
-    return KErrGeneral;
-}
-
-
-// -----------------------------------------------------------------------------
-// CTestPnpUtil::GetAndSetHomeMncL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-TInt CTestPnpUtil::GetAndSetHomeMncL()
-{
-
-    CPnpUtilImpl* pnputil = CPnpUtilImpl::NewLC();
-    
-    RMobilePhone::TMobilePhoneNetworkInfoV1 info;
-    RMobilePhone::TMobilePhoneNetworkInfoV1Pckg infoPckg( info );
-
-    info.iNetworkId.Copy( _L("05") );
-    
-    TRAPD(err, pnputil->SetHomeMncL( info.iNetworkId));
-    if(err!=KErrNone)
-    return err;
-    
-    
-    RMobilePhone::TMobilePhoneNetworkIdentity getmnc;
-    TRAP(err, getmnc = pnputil->HomeMncL());    
-    
-    
-    CleanupStack::PopAndDestroy(pnputil);
-    
-    if(err!=KErrNone)
-    return err;
-    
-    if(info.iNetworkId == getmnc)
-    return KErrNone;
-    else
-    return KErrGeneral;
-}
-
-// -----------------------------------------------------------------------------
-// CTestPnpUtil::GetAndSetNetworkMccL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-TInt CTestPnpUtil::GetAndSetNetworkMccL()
-{
-
-    CPnpUtilImpl* pnputil = CPnpUtilImpl::NewLC();
-
-    RMobilePhone::TMobilePhoneNetworkInfoV1 info;
-    RMobilePhone::TMobilePhoneNetworkInfoV1Pckg infoPckg( info );
-
-    info.iCountryCode.Copy( _L("244") );
-    
-    TRAPD(err, pnputil->SetNetworkMccL( info.iCountryCode ));
-    if(err!=KErrNone)
-    return err;
-    
-    RMobilePhone::TMobilePhoneNetworkCountryCode getmcc;
-    TRAP(err, getmcc = pnputil->NetworkMccL());    
-    
-    CleanupStack::PopAndDestroy(pnputil);
-    
-    if(err!=KErrNone)
-    return err;
-    
-    if(info.iCountryCode == getmcc)
-    return KErrNone;
-    else
-    return KErrGeneral;
-}
-
-// -----------------------------------------------------------------------------
-// CTestPnpUtil::GetAndSetNetworkMncL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-TInt CTestPnpUtil::GetAndSetNetworkMncL()
-{
-    
-    CPnpUtilImpl* pnputil = CPnpUtilImpl::NewLC();
-    
-    RMobilePhone::TMobilePhoneNetworkInfoV1 info;
-    RMobilePhone::TMobilePhoneNetworkInfoV1Pckg infoPckg( info );
-
-    info.iNetworkId.Copy( _L("05") );
-    
-    TRAPD(err, pnputil->SetNetworkMncL( info.iNetworkId));
-    if(err!=KErrNone)
-    return err;
-    
-    RMobilePhone::TMobilePhoneNetworkIdentity getmnc;
-    TRAP(err, getmnc = pnputil->NetworkMncL());   
-    
-    CleanupStack::PopAndDestroy(pnputil);
-     
-    if(err!=KErrNone)
-    return err;
-    
-    if(info.iNetworkId == getmnc)
-    return KErrNone;
-    else
-    return KErrGeneral;
-}
-
-// -----------------------------------------------------------------------------
-// CTestPnpUtil::GetAndSetNetworkMncL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-TInt CTestPnpUtil::PnPUtilRegisteredInHomeNetworkL()
-{
-
-    CPnpUtilImpl* pnputil = CPnpUtilImpl::NewLC();
-
-    TRAPD(err, pnputil->RegisteredInHomeNetworkL());
-    
-    CleanupStack::PopAndDestroy(pnputil);
-    
-    if(err!=KErrNone)
-    return err;
-    
-    return KErrNone;
-}
-
-// -----------------------------------------------------------------------------
-// CTestPnpUtil::OperatorLongNameL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-TInt CTestPnpUtil::PnPUtilOperatorLongNameL()
-{
-    CPnpUtilImpl* pnputil = CPnpUtilImpl::NewLC();
-
-    RMobilePhone::TMobilePhoneNetworkLongName name(KNullDesC);
-    TInt err = pnputil->OperatorLongName(name);
-    
-    CleanupStack::PopAndDestroy(pnputil);
-    
-    if(err!=KErrNone || name.Compare(KNullDesC)!=0)
-    return err;
-    
-    return KErrNone;
-}
-
-// -----------------------------------------------------------------------------
-// CTestPnpUtil::OperatorLongNameL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-TInt CTestPnpUtil::PnPUtilStoreAccessPointL()
-{
-
-    CPnpUtilImpl* pnputil = CPnpUtilImpl::NewLC();
-    
-    TUint32 value =0;
-    TInt err = pnputil->StoreAccessPoint(value);
-    
-    CleanupStack::PopAndDestroy(pnputil);
-    
-    if(err == KErrNotSupported)
-    return KErrNone;
-    else
-    return err;
-}
-
-
-// -----------------------------------------------------------------------------
-// CTestPnpUtil::PnPUtilFormatMncCodeL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-TInt CTestPnpUtil::PnPUtilFormatMncCodeL()
-{
-   CPnpUtilImpl* pnputil = CPnpUtilImpl::NewLC();
-   
-    RMobilePhone::TMobilePhoneNetworkInfoV1 info;
-    RMobilePhone::TMobilePhoneNetworkInfoV1Pckg infoPckg( info );
-
-    info.iCountryCode.Copy( _L("244") );
-    info.iNetworkId.Copy( _L("05") );
-
-
-    RMobilePhone::TMobilePhoneNetworkIdentity formattedMnc;
-    TRAPD(err, pnputil->FormatMncCodeL( info.iCountryCode, info.iNetworkId, formattedMnc ));
-    
-    CleanupStack::PopAndDestroy(pnputil);
-    
-    if(err!=KErrNone)
-    return err;
-    
-    return KErrNone;
-}
-
-// -----------------------------------------------------------------------------
-// CTestPnpUtil::ProvNewLC
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-
-TInt CTestPnpUtil::ProvNewLC()
-    {
-    CPnpProvUtil *prov = CPnpProvUtil::NewLC();
-    CleanupStack::PopAndDestroy(prov);
-
-    return KErrNone;
-
-    }
-    
-    
-// -----------------------------------------------------------------------------
-// CTestPnpUtil::PnpSetApplicationUidL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-
-
-TInt CTestPnpUtil::PnpSetApplicationUidL()
-{
-    CPnpProvUtil *prov = CPnpProvUtil::NewLC();
-    TUint32 value = 0x100058C5;
-    
-    prov->SetApplicationUidL(value);
-
-    CleanupStack::PopAndDestroy(prov);
-
-    return KErrNone;
-    
-}
-
-
-// -----------------------------------------------------------------------------
-// CTestPnpUtil::PnpGetApplicationUidL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-
-
-TInt CTestPnpUtil::PnpGetApplicationUidL()
-{
-    CPnpProvUtil *prov = CPnpProvUtil::NewLC();
-    TUint32 value = 0x100058C5;
-    TUint32 valuezero = 0;
-    
-    prov->SetApplicationUidL(value);
-
-    TUint32 retvalue = prov->GetApplicationUidL();
-    
-    prov->SetApplicationUidL(valuezero);
-
-    TUint32 valueretzero = prov->GetApplicationUidL();
-    
-    
-    CleanupStack::PopAndDestroy(prov);
-
-    if(retvalue == value && valueretzero == valuezero)
-     return KErrNone;
-    else
-     return KErrGeneral;
-
-}
-
-// -----------------------------------------------------------------------------
-// CTestPnpUtil::SetProvAdapvalue
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-
-
-
-TInt CTestPnpUtil::SetProvAdapvalueL()
-{
-    CPnpProvUtil *prov = CPnpProvUtil::NewLC();
-    
-
-    _LIT(KNull, "");
-    TBuf<2> buf(KNull);
-
-    prov->SetProvAdapterAppIdL(buf);
-        
-    _LIT(KName1, "name1");
-    TBuf<KMinLength> buf1(KName1);
-    prov->SetProvAdapterAppIdL(buf1);
-
-    _LIT(KName2, "name2");
-    TBuf<KMinLength> buf2(KName2);
-    prov->SetProvAdapterAppIdL(buf2);
-
-    CleanupStack::PopAndDestroy(prov);
-
-    return KErrNone;
-
-}
-
-
-// -----------------------------------------------------------------------------
-// CTestPnpUtil::GetProvAdapvalue
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-
-
-TInt CTestPnpUtil::GetProvAdapvalueL()
-{
-
-    CPnpProvUtil *prov = CPnpProvUtil::NewLC();
-    RPointerArray<HBufC> array;
-
-    TInt flag =0;
-    
-    _LIT(KNull, "");
-    TBuf<2> buf(KNull);
-
-    prov->SetProvAdapterAppIdL(buf);
-        
-    _LIT(KName1, "name1");
-    TBuf<KMinLength> buf1(KName1);
-    prov->SetProvAdapterAppIdL(buf1);
-
-    _LIT(KName2, "name2");
-    TBuf<KMinLength> buf2(KName2);
-    prov->SetProvAdapterAppIdL(buf2);
-
-    prov->GetProvAdapterAppIdsL(array);
-
-    if(array.Count() == 2)
-    flag = 1;
-
-    array.ResetAndDestroy();
-    CleanupStack::PopAndDestroy(prov);
-
-    if(flag == 1)
-     return KErrNone;
-    else
-     return KErrGeneral;     
-
-}
-
-
-// -----------------------------------------------------------------------------
-// CTestPnpUtil::LaunchOnlineSupportTestL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-
-
-TInt CTestPnpUtil::LaunchOnlineSupportTestL()
-{
-
-    TBufC<1> Nullval(_L(""));
-      
-    CPnpProvUtil *prov = CPnpProvUtil::NewLC();
-    TRAPD(err, prov->LaunchOnlineSupportL(Nullval, EUserTriggered, 
-                     EStartInteractive,  EFalse, Nullval)); 
-    CleanupStack::PopAndDestroy(prov);
-    
-    if(err!=KErrNone)
-    return err;
-      else
-    return KErrNone;
-
-}
-
-// -----------------------------------------------------------------------------
-// CTestPnpUtil::ConstructUriParamL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-
-TInt CTestPnpUtil::ConstructUriParamL()
-{
-    TBuf<1> Nullval(_L(""));    
-
-    CPnpProvUtil *prov = CPnpProvUtil::NewLC();
-    TRAPD(err, prov->ConstructUriWithPnPUtilL(Nullval, EHelpPortal ));
-
-    CleanupStack::PopAndDestroy(prov);
-    if(err==KErrNotSupported || err == KErrNone)
-    return KErrNone;
-    else
-    return err;
-}
-
-// -----------------------------------------------------------------------------
-// CTestPnpUtil::PnPUtilVerifySignatureL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-
-
-TInt CTestPnpUtil::PnPUtilVerifySignatureL()
-{
-     
-    CPnpUtilImpl* pnputil = CPnpUtilImpl::NewLC();
-   
-   _LIT8(KDigestvalue,"S7jZw+uR9yT70PpcFehwmonmSBI=");
-   _LIT8(KSignatureValue,"XnbpqUL6UPdxDOPJ3+htw1vBwKiND13ttYMdjWnUqC039ftsI3pFqbQkl017xJlw+3F00PHsyhtQkSGQAZFxrCNp9lIStAv1qjcfR3ltLBUcAuHNviAzC2qcnvjJ4gMNtgyrr8sE0IFRwHWV9sNRkqC0CGVmK6amUHFtuplZeLw=");
-   _LIT8(KData,"");
-   _LIT8(KNonce,"iP674Twe");
-    
-   TRAPD(err, pnputil->VerifySignatureL(KDigestvalue,KSignatureValue, KData, KNonce ));
-   CleanupStack::PopAndDestroy();
-   
-   if(err!=KErrNone)
-   return KErrGeneral;
-   else
-   return KErrNone;
-   
-}
-
-// -----------------------------------------------------------------------------
-// CTestPnpUtil::pnpDocHandlerL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-
-TInt CTestPnpUtil::pnpDocHandlerL() 
-    
-    {
-     
-    _LIT8(KPnPContentType, "application/vnd.nokia.headwrapper" );
-    _LIT(Kfn,"C:\\data\\Pnpprovisioningfile");
-
-    RFs fs;
-    User::LeaveIfError(fs.Connect());
-    CleanupClosePushL(fs);
-    TInt err = fs.MkDir( Kfn);
-
-    if( err != KErrNone && err != KErrAlreadyExists )
-        {
-        User::Leave( err ); 
-        }
-
-    RFile file;
-    TPtrC8 dataChunk;
- 
-    TFileName fullPath(Kfn);
-    RFile sharableFile;
-    
-    
-    CDocumentHandler *iDocHandler = CDocumentHandler::NewLC();
-     
-    iDocHandler->OpenTempFileL(fullPath, sharableFile);
-    
-    TBool ret(EFalse);
-    TDataType dataType(KPnPContentType);
-    ret = iDocHandler->OpenFileEmbeddedL(sharableFile,dataType);
-    
-    CleanupClosePushL(file);
-    CleanupClosePushL(sharableFile);
-    
-    
-    CleanupStack::Pop(&sharableFile);
-    CleanupStack::Pop(&file);
-    CleanupStack::PopAndDestroy(iDocHandler);
-    CleanupStack::Pop(&fs);
-    
-    
-    if(ret==KErrNone)
-    return KErrNone;
-    else
-    return KErrGeneral;
-}
-
--- a/sysdef_1_4_0.dtd	Tue Feb 02 00:03:17 2010 +0200
+++ /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	Fri Apr 16 14:53:31 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>